diff --git a/CMakeLists.txt b/CMakeLists.txt index d87aee021a..92b0a2d849 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,7 +21,6 @@ option(TRY_X11 "Enables X11 Support" ON) option(USE_SHARED_ENET "Use shared libenet if found rather than Dolphin's soon-to-compatibly-diverge version" OFF) option(USE_UPNP "Enables UPnP port mapping support" ON) option(ENABLE_QT2 "Enable Qt (Default)" ON) -option(ENABLE_WX "Enable wxWidgets (Legacy)" ON) option(ENABLE_LTO "Enables Link Time Optimization" OFF) option(ENABLE_GENERIC "Enables generic build that should run on any little-endian host" OFF) option(ENABLE_HEADLESS "Enables running Dolphin as a headless variant" OFF) @@ -365,7 +364,6 @@ if(ANDROID) set(USE_X11 0) set(USE_UPNP 0) set(USE_EGL 1) - set(ENABLE_WX 0) set(ENABLE_QT2 0) set(USE_DISCORD_PRESENCE 0) @@ -388,7 +386,6 @@ if(ENABLE_HEADLESS) set(USE_EGL 1) endif() set(USE_X11 0) - set(ENABLE_WX 0) set(ENABLE_QT2 0) set(USE_DISCORD_PRESENCE 0) add_definitions(-DUSE_HEADLESS) @@ -695,35 +692,11 @@ if(NOT ANDROID) endif() endif() -if(ENABLE_WX) - find_package(wxWidgets 3.1.0 COMPONENTS core aui adv) - - if(_ARCH_32) - add_definitions(-DwxSIZE_T_IS_UINT) - endif() - - if(wxWidgets_FOUND) - message(STATUS "wxWidgets found") - if(NOT TARGET wxWidgets::wxWidgets) - add_library(wxWidgets::wxWidgets INTERFACE IMPORTED) - set_target_properties(wxWidgets::wxWidgets PROPERTIES - INTERFACE_LINK_LIBRARIES "${wxWidgets_LIBRARIES}" - INTERFACE_INCLUDE_DIRECTORIES "${wxWidgets_INCLUDE_DIRS}" - INTERFACE_COMPILE_DEFINITIONS "${wxWidgets_DEFINITIONS}" - INTERFACE_COMPILE_OPTIONS "${wxWidgets_CXX_FLAGS}" - ) - endif() - else() - message(STATUS "Using static wxWidgets from Externals") - add_subdirectory(Externals/wxWidgets3) - set(wxWidgets_FOUND TRUE) - endif() -endif() if(USE_DISCORD_PRESENCE) message(STATUS "Using static DiscordRPC from Externals") add_subdirectory(Externals/discord-rpc) -endif() +endif() find_package(Libsystemd) if(SYSTEMD_FOUND) diff --git a/Externals/wxWidgets3/CMakeLists.txt b/Externals/wxWidgets3/CMakeLists.txt deleted file mode 100644 index 563f522618..0000000000 --- a/Externals/wxWidgets3/CMakeLists.txt +++ /dev/null @@ -1,898 +0,0 @@ -# gtk, msw, osx and shared files as of 81570ae070b35c9d52de47b1f14897f3ff1a66c7 - -set(SRCS_AUI - "src/aui/auibar.cpp" - "src/aui/auibook.cpp" - "src/aui/dockart.cpp" - "src/aui/floatpane.cpp" - "src/aui/framemanager.cpp" - "src/aui/tabart.cpp" - "src/aui/tabmdi.cpp") - -set(SRCS_COMMON - "src/common/accelcmn.cpp" - #"src/common/accesscmn.cpp" - "src/common/addremovectrl.cpp" - "src/common/affinematrix2d.cpp" - "src/common/anidecod.cpp" - "src/common/animatecmn.cpp" - "src/common/any.cpp" - "src/common/appbase.cpp" - "src/common/appcmn.cpp" - "src/common/arcall.cpp" - "src/common/arcfind.cpp" - "src/common/archive.cpp" - "src/common/arrstr.cpp" - "src/common/artprov.cpp" - "src/common/artstd.cpp" - "src/common/arttango.cpp" - "src/common/base64.cpp" - "src/common/bmpbase.cpp" - "src/common/bmpbtncmn.cpp" - "src/common/bmpcboxcmn.cpp" - "src/common/bookctrl.cpp" - "src/common/btncmn.cpp" - "src/common/cairo.cpp" - "src/common/calctrlcmn.cpp" - "src/common/checkboxcmn.cpp" - "src/common/checklstcmn.cpp" - "src/common/choiccmn.cpp" - "src/common/clipcmn.cpp" - "src/common/clntdata.cpp" - "src/common/clrpickercmn.cpp" - "src/common/cmdline.cpp" - "src/common/cmdproc.cpp" - "src/common/cmndata.cpp" - "src/common/colourcmn.cpp" - "src/common/colourdata.cpp" - "src/common/combocmn.cpp" - "src/common/config.cpp" - "src/common/containr.cpp" - "src/common/convauto.cpp" - "src/common/cshelp.cpp" - "src/common/ctrlcmn.cpp" - "src/common/ctrlsub.cpp" - "src/common/datavcmn.cpp" - "src/common/datetime.cpp" - "src/common/datetimefmt.cpp" - "src/common/datstrm.cpp" - "src/common/dcbase.cpp" - "src/common/dcbufcmn.cpp" - "src/common/dcgraph.cpp" - "src/common/dcsvg.cpp" - "src/common/debugrpt.cpp" - "src/common/dircmn.cpp" - "src/common/dirctrlcmn.cpp" - "src/common/dlgcmn.cpp" - "src/common/dndcmn.cpp" - "src/common/dobjcmn.cpp" - "src/common/docmdi.cpp" - "src/common/docview.cpp" - "src/common/dpycmn.cpp" - "src/common/dseldlg.cpp" - "src/common/dynarray.cpp" - "src/common/dynlib.cpp" - "src/common/dynload.cpp" - #"src/common/effects.cpp" - "src/common/encconv.cpp" - "src/common/event.cpp" - "src/common/evtloopcmn.cpp" - "src/common/extended.c" - "src/common/fddlgcmn.cpp" - "src/common/fdiodispatcher.cpp" - "src/common/ffile.cpp" - "src/common/file.cpp" - "src/common/fileback.cpp" - "src/common/fileconf.cpp" - "src/common/filectrlcmn.cpp" - "src/common/filefn.cpp" - "src/common/filehistorycmn.cpp" - "src/common/filename.cpp" - "src/common/filepickercmn.cpp" - "src/common/filesys.cpp" - "src/common/filtall.cpp" - "src/common/filtfind.cpp" - "src/common/fldlgcmn.cpp" - "src/common/fmapbase.cpp" - "src/common/fontcmn.cpp" - "src/common/fontdata.cpp" - "src/common/fontenumcmn.cpp" - "src/common/fontmap.cpp" - #"src/common/fontmgrcmn.cpp" - "src/common/fontpickercmn.cpp" - "src/common/fontutilcmn.cpp" - "src/common/framecmn.cpp" - "src/common/fs_arc.cpp" - "src/common/fs_filter.cpp" - "src/common/fs_inet.cpp" - "src/common/fs_mem.cpp" - #"src/common/fswatchercmn.cpp" - "src/common/ftp.cpp" - "src/common/gaugecmn.cpp" - "src/common/gbsizer.cpp" - "src/common/gdicmn.cpp" - "src/common/geometry.cpp" - "src/common/gifdecod.cpp" - "src/common/glcmn.cpp" - "src/common/graphcmn.cpp" - "src/common/gridcmn.cpp" - "src/common/hash.cpp" - "src/common/hashmap.cpp" - "src/common/headercolcmn.cpp" - "src/common/headerctrlcmn.cpp" - "src/common/helpbase.cpp" - "src/common/http.cpp" - "src/common/hyperlnkcmn.cpp" - "src/common/iconbndl.cpp" - "src/common/imagall.cpp" - "src/common/imagbmp.cpp" - "src/common/image.cpp" - "src/common/imagfill.cpp" - #"src/common/imaggif.cpp" - #"src/common/imagiff.cpp" - #"src/common/imagjpeg.cpp" - #"src/common/imagpcx.cpp" - "src/common/imagpng.cpp" - #"src/common/imagpnm.cpp" - #"src/common/imagtga.cpp" - #"src/common/imagtiff.cpp" - #"src/common/imagxpm.cpp" - "src/common/init.cpp" - "src/common/intl.cpp" - "src/common/ipcbase.cpp" - "src/common/languageinfo.cpp" - "src/common/layout.cpp" - "src/common/lboxcmn.cpp" - "src/common/list.cpp" - "src/common/listctrlcmn.cpp" - "src/common/log.cpp" - "src/common/longlong.cpp" - #"src/common/markupparser.cpp" - "src/common/matrix.cpp" - #"src/common/mediactrlcmn.cpp" - #"src/common/memory.cpp" - "src/common/menucmn.cpp" - "src/common/mimecmn.cpp" - "src/common/modalhook.cpp" - "src/common/module.cpp" - "src/common/mousemanager.cpp" - "src/common/msgout.cpp" - "src/common/mstream.cpp" - "src/common/nbkbase.cpp" - "src/common/notifmsgcmn.cpp" - "src/common/numformatter.cpp" - "src/common/object.cpp" - "src/common/odcombocmn.cpp" - "src/common/overlaycmn.cpp" - "src/common/ownerdrwcmn.cpp" - "src/common/panelcmn.cpp" - "src/common/paper.cpp" - "src/common/persist.cpp" - "src/common/pickerbase.cpp" - "src/common/platinfo.cpp" - "src/common/popupcmn.cpp" - "src/common/powercmn.cpp" - "src/common/preferencescmn.cpp" - "src/common/prntbase.cpp" - "src/common/process.cpp" - "src/common/protocol.cpp" - "src/common/quantize.cpp" - "src/common/radiobtncmn.cpp" - "src/common/radiocmn.cpp" - "src/common/rearrangectrl.cpp" - #"src/common/regex.cpp" - "src/common/rendcmn.cpp" - "src/common/rgncmn.cpp" - "src/common/sckaddr.cpp" - "src/common/sckfile.cpp" - "src/common/sckipc.cpp" - "src/common/sckstrm.cpp" - "src/common/scrolbarcmn.cpp" - "src/common/selectdispatcher.cpp" - "src/common/settcmn.cpp" - "src/common/sizer.cpp" - "src/common/slidercmn.cpp" - "src/common/socket.cpp" - "src/common/socketiohandler.cpp" - "src/common/spinbtncmn.cpp" - "src/common/spinctrlcmn.cpp" - "src/common/srchcmn.cpp" - "src/common/sstream.cpp" - "src/common/statbar.cpp" - "src/common/statbmpcmn.cpp" - "src/common/statboxcmn.cpp" - "src/common/statlinecmn.cpp" - "src/common/stattextcmn.cpp" - "src/common/stdpbase.cpp" - "src/common/stdstream.cpp" - "src/common/stockitem.cpp" - "src/common/stopwatch.cpp" - "src/common/strconv.cpp" - "src/common/stream.cpp" - "src/common/string.cpp" - "src/common/stringimpl.cpp" - "src/common/stringops.cpp" - "src/common/strvararg.cpp" - "src/common/sysopt.cpp" - "src/common/tarstrm.cpp" - "src/common/taskbarcmn.cpp" - "src/common/tbarbase.cpp" - "src/common/textbuf.cpp" - "src/common/textcmn.cpp" - "src/common/textentrycmn.cpp" - "src/common/textfile.cpp" - "src/common/textmeasurecmn.cpp" - "src/common/threadinfo.cpp" - "src/common/time.cpp" - "src/common/timercmn.cpp" - "src/common/timerimpl.cpp" - "src/common/tokenzr.cpp" - "src/common/toplvcmn.cpp" - "src/common/translation.cpp" - "src/common/treebase.cpp" - "src/common/txtstrm.cpp" - "src/common/uiactioncmn.cpp" - "src/common/unichar.cpp" - "src/common/uri.cpp" - "src/common/url.cpp" - "src/common/ustring.cpp" - "src/common/utilscmn.cpp" - "src/common/valgen.cpp" - "src/common/validate.cpp" - "src/common/valnum.cpp" - "src/common/valtext.cpp" - "src/common/variant.cpp" - #"src/common/webview.cpp" - #"src/common/webviewfshandler.cpp" - "src/common/wfstream.cpp" - "src/common/wincmn.cpp" - "src/common/windowid.cpp" - "src/common/wrapsizer.cpp" - "src/common/wxcrt.cpp" - "src/common/wxprintf.cpp" - "src/common/xlocale.cpp" - "src/common/xpmdecod.cpp" - #"src/common/xti.cpp" - #"src/common/xtistrm.cpp" - #"src/common/xtixml.cpp" - "src/common/zipstrm.cpp" - "src/common/zstream.cpp") - -set(SRCS_GENERIC - "src/generic/aboutdlgg.cpp" - "src/generic/bannerwindow.cpp" - "src/generic/bmpcboxg.cpp" - "src/generic/busyinfo.cpp" - "src/generic/buttonbar.cpp" - "src/generic/calctrlg.cpp" - #"src/generic/caret.cpp" - "src/generic/choicbkg.cpp" - "src/generic/choicdgg.cpp" - "src/generic/collheaderctrlg.cpp" - #"src/generic/colour.cpp" - "src/generic/combog.cpp" - "src/generic/commandlinkbuttong.cpp" - "src/generic/datavgen.cpp" - "src/generic/datectlg.cpp" - #"src/generic/dbgrptg.cpp" - "src/generic/dcpsg.cpp" - "src/generic/dirctrlg.cpp" - "src/generic/dragimgg.cpp" - "src/generic/editlbox.cpp" - #"src/generic/fdrepdlg.cpp" - "src/generic/filectrlg.cpp" - "src/generic/filepickerg.cpp" - "src/generic/fontdlgg.cpp" - #"src/generic/fswatcherg.cpp" - "src/generic/graphicc.cpp" - "src/generic/grid.cpp" - "src/generic/gridctrl.cpp" - "src/generic/grideditors.cpp" - "src/generic/gridsel.cpp" - "src/generic/headerctrlg.cpp" - "src/generic/helpext.cpp" - #"src/generic/htmllbox.cpp" - "src/generic/hyperlinkg.cpp" - "src/generic/infobar.cpp" - "src/generic/laywin.cpp" - "src/generic/listbkg.cpp" - - "src/generic/logg.cpp" - #"src/generic/markuptext.cpp" - #"src/generic/mask.cpp" - "src/generic/mdig.cpp" - "src/generic/msgdlgg.cpp" - #"src/generic/notebook.cpp" - "src/generic/notifmsgg.cpp" - "src/generic/numdlgg.cpp" - "src/generic/odcombo.cpp" - "src/generic/printps.cpp" - "src/generic/prntdlgg.cpp" - "src/generic/progdlgg.cpp" - "src/generic/propdlg.cpp" - #"src/generic/regiong.cpp" - "src/generic/renderg.cpp" - "src/generic/richmsgdlgg.cpp" - "src/generic/sashwin.cpp" - "src/generic/scrlwing.cpp" - "src/generic/selstore.cpp" - "src/generic/spinctlg.cpp" - "src/generic/splash.cpp" - "src/generic/splitter.cpp" - "src/generic/srchctlg.cpp" - "src/generic/statbmpg.cpp" - #"src/generic/statline.cpp" - "src/generic/stattextg.cpp" - "src/generic/statusbr.cpp" - "src/generic/tabg.cpp" - "src/generic/textdlgg.cpp" - "src/generic/textmeasure.cpp" - "src/generic/timectrlg.cpp" - #"src/generic/timer.cpp" - "src/generic/tipdlg.cpp" - "src/generic/tipwin.cpp" - "src/generic/toolbkg.cpp" - "src/generic/treebkg.cpp" - "src/generic/treectlg.cpp" - "src/generic/treelist.cpp" - "src/generic/vlbox.cpp" - "src/generic/vscroll.cpp" - "src/generic/wizard.cpp") - -set(SRCS_GENERICGTK - "src/generic/accel.cpp" - "src/generic/activityindicator.cpp" - "src/generic/icon.cpp" - "src/generic/imaglist.cpp" - "src/generic/listctrl.cpp" - "src/generic/paletteg.cpp" - "src/generic/preferencesg.cpp") - -set(SRCS_GENERICMSW - "src/generic/activityindicator.cpp" - "src/generic/collpaneg.cpp") - -set(SRCS_GENERICOSX - "src/generic/animateg.cpp" - "src/generic/clrpickerg.cpp" - "src/generic/collpaneg.cpp" - "src/generic/colrdlgg.cpp" - "src/generic/dirdlgg.cpp" - "src/generic/filedlgg.cpp" - "src/generic/fontpickerg.cpp" - "src/generic/listctrl.cpp") - -set(SRCS_GTK - "src/aui/tabartgtk.cpp" - "src/gtk/aboutdlg.cpp" - "src/gtk/activityindicator.cpp" - "src/gtk/animate.cpp" - "src/gtk/anybutton.cpp" - "src/gtk/app.cpp" - "src/gtk/artgtk.cpp" - "src/gtk/assertdlg_gtk.cpp" - "src/gtk/bitmap.cpp" - "src/gtk/bmpbuttn.cpp" - "src/gtk/bmpcbox.cpp" - "src/gtk/brush.cpp" - "src/gtk/button.cpp" - "src/gtk/calctrl.cpp" - "src/gtk/checkbox.cpp" - "src/gtk/checklst.cpp" - "src/gtk/choice.cpp" - "src/gtk/clipbrd.cpp" - "src/gtk/clrpicker.cpp" - "src/gtk/collpane.cpp" - "src/gtk/colordlg.cpp" - "src/gtk/colour.cpp" - "src/gtk/combobox.cpp" - "src/gtk/control.cpp" - "src/gtk/cursor.cpp" - "src/gtk/dataobj.cpp" - "src/gtk/dataview.cpp" - "src/gtk/dc.cpp" - "src/gtk/dcclient.cpp" - "src/gtk/dcmemory.cpp" - "src/gtk/dcscreen.cpp" - "src/gtk/dialog.cpp" - "src/gtk/dirdlg.cpp" - "src/gtk/display.cpp" - "src/gtk/dnd.cpp" - "src/gtk/eggtrayicon.c" - "src/gtk/evtloop.cpp" - "src/gtk/filectrl.cpp" - "src/gtk/filedlg.cpp" - "src/gtk/filehistory.cpp" - "src/gtk/filepicker.cpp" - "src/gtk/font.cpp" - "src/gtk/fontdlg.cpp" - "src/gtk/fontpicker.cpp" - "src/gtk/frame.cpp" - "src/gtk/gauge.cpp" - "src/gtk/glcanvas.cpp" - #"src/gtk/gnome/gvfs.cpp" - "src/gtk/hyperlink.cpp" - "src/gtk/infobar.cpp" - "src/gtk/listbox.cpp" - "src/gtk/mdi.cpp" - "src/gtk/menu.cpp" - "src/gtk/minifram.cpp" - "src/gtk/mnemonics.cpp" - "src/gtk/msgdlg.cpp" - "src/gtk/nativewin.cpp" - "src/gtk/nonownedwnd.cpp" - "src/gtk/notebook.cpp" - "src/gtk/notifmsg.cpp" - "src/gtk/pen.cpp" - "src/gtk/popupwin.cpp" - #"src/gtk/print.cpp" - "src/gtk/private.cpp" - "src/gtk/radiobox.cpp" - "src/gtk/radiobut.cpp" - "src/gtk/region.cpp" - "src/gtk/renderer.cpp" - "src/gtk/scrolbar.cpp" - "src/gtk/scrolwin.cpp" - "src/gtk/settings.cpp" - "src/gtk/slider.cpp" - "src/gtk/sockgtk.cpp" - "src/gtk/spinbutt.cpp" - "src/gtk/spinctrl.cpp" - "src/gtk/statbmp.cpp" - "src/gtk/statbox.cpp" - "src/gtk/statline.cpp" - "src/gtk/stattext.cpp" - "src/gtk/taskbar.cpp" - "src/gtk/textctrl.cpp" - "src/gtk/textentry.cpp" - "src/gtk/textmeasure.cpp" - "src/gtk/tglbtn.cpp" - "src/gtk/timer.cpp" - "src/gtk/toolbar.cpp" - "src/gtk/tooltip.cpp" - "src/gtk/toplevel.cpp" - "src/gtk/treeentry_gtk.c" - "src/gtk/utilsgtk.cpp" - #"src/gtk/webview_webkit.cpp" - "src/gtk/win_gtk.cpp" - "src/gtk/window.cpp") - -set(SRCS_MSW - "src/aui/barartmsw.cpp" - "src/aui/tabartmsw.cpp" - "src/msw/aboutdlg.cpp" - "src/msw/accel.cpp" - "src/msw/anybutton.cpp" - "src/msw/app.cpp" - "src/msw/appprogress.cpp" - "src/msw/artmsw.cpp" - "src/msw/basemsw.cpp" - "src/msw/bitmap.cpp" - "src/msw/bmpbuttn.cpp" - "src/msw/bmpcbox.cpp" - "src/msw/brush.cpp" - "src/msw/button.cpp" - "src/msw/calctrl.cpp" - "src/msw/caret.cpp" - "src/msw/checkbox.cpp" - "src/msw/checklst.cpp" - "src/msw/choice.cpp" - "src/msw/clipbrd.cpp" - "src/msw/colordlg.cpp" - "src/msw/colour.cpp" - "src/msw/combo.cpp" - "src/msw/combobox.cpp" - "src/msw/commandlinkbutton.cpp" - "src/msw/control.cpp" - #"src/msw/crashrpt.cpp" - "src/msw/cursor.cpp" - #"src/msw/data.cpp" - "src/msw/datecontrols.cpp" - "src/msw/datectrl.cpp" - "src/msw/datetimectrl.cpp" - "src/msw/dc.cpp" - "src/msw/dcclient.cpp" - "src/msw/dcmemory.cpp" - #"src/msw/dcprint.cpp" - "src/msw/dcscreen.cpp" - "src/msw/dde.cpp" - "src/msw/debughlp.cpp" - "src/msw/dialog.cpp" - #"src/msw/dialup.cpp" - "src/msw/dib.cpp" - "src/msw/dir.cpp" - "src/msw/dirdlg.cpp" - "src/msw/display.cpp" - "src/msw/dlmsw.cpp" - "src/msw/dragimag.cpp" - #"src/msw/enhmeta.cpp" - "src/msw/evtloop.cpp" - "src/msw/evtloopconsole.cpp" - "src/msw/fdrepdlg.cpp" - "src/msw/filedlg.cpp" - "src/msw/font.cpp" - "src/msw/fontdlg.cpp" - "src/msw/fontenum.cpp" - "src/msw/fontutil.cpp" - "src/msw/frame.cpp" - #"src/msw/fswatcher.cpp" - "src/msw/gauge.cpp" - "src/msw/gdiimage.cpp" - #"src/msw/gdiobj.cpp" - "src/msw/gdiplus.cpp" - #"src/msw/glcanvas.cpp" - "src/msw/graphics.cpp" - #"src/msw/graphicsd2d.cpp" - "src/msw/headerctrl.cpp" - #"src/msw/helpbest.cpp" - #"src/msw/helpchm.cpp" - "src/msw/helpwin.cpp" - "src/msw/hyperlink.cpp" - "src/msw/icon.cpp" - "src/msw/imaglist.cpp" - #"src/msw/iniconf.cpp" - #"src/msw/joystick.cpp" - "src/msw/listbox.cpp" - "src/msw/listctrl.cpp" - "src/msw/main.cpp" - "src/msw/mdi.cpp" - #"src/msw/mediactrl_am.cpp" - #"src/msw/mediactrl_qt.cpp" - #"src/msw/mediactrl_wmp10.cpp" - "src/msw/menu.cpp" - "src/msw/menuitem.cpp" - #"src/msw/metafile.cpp" - "src/msw/mimetype.cpp" - "src/msw/minifram.cpp" - "src/msw/msgdlg.cpp" - "src/msw/nativdlg.cpp" - "src/msw/nativewin.cpp" - "src/msw/nonownedwnd.cpp" - "src/msw/notebook.cpp" - "src/msw/notifmsg.cpp" - "src/msw/ole/access.cpp" - "src/msw/ole/activex.cpp" - "src/msw/ole/automtn.cpp" - "src/msw/ole/dataobj.cpp" - "src/msw/ole/dropsrc.cpp" - "src/msw/ole/droptgt.cpp" - "src/msw/ole/oleutils.cpp" - "src/msw/ole/safearray.cpp" - "src/msw/ole/uuid.cpp" - "src/msw/ownerdrw.cpp" - "src/msw/palette.cpp" - "src/msw/panel.cpp" - "src/msw/pen.cpp" - "src/msw/popupwin.cpp" - "src/msw/power.cpp" - #"src/msw/printdlg.cpp" - #"src/msw/printwin.cpp" - "src/msw/progdlg.cpp" - "src/msw/radiobox.cpp" - "src/msw/radiobut.cpp" - "src/msw/regconf.cpp" - "src/msw/region.cpp" - "src/msw/registry.cpp" - "src/msw/renderer.cpp" - "src/msw/richmsgdlg.cpp" - "src/msw/scrolbar.cpp" - "src/msw/settings.cpp" - "src/msw/slider.cpp" - "src/msw/snglinst.cpp" - "src/msw/sockmsw.cpp" - "src/msw/sound.cpp" - "src/msw/spinbutt.cpp" - "src/msw/spinctrl.cpp" - "src/msw/stackwalk.cpp" - "src/msw/statbmp.cpp" - "src/msw/statbox.cpp" - "src/msw/statline.cpp" - "src/msw/stattext.cpp" - "src/msw/statusbar.cpp" - "src/msw/stdpaths.cpp" - "src/msw/systhemectrl.cpp" - "src/msw/taskbar.cpp" - "src/msw/taskbarbutton.cpp" - "src/msw/textctrl.cpp" - "src/msw/textentry.cpp" - "src/msw/textmeasure.cpp" - "src/msw/tglbtn.cpp" - "src/msw/thread.cpp" - "src/msw/timectrl.cpp" - "src/msw/timer.cpp" - "src/msw/toolbar.cpp" - "src/msw/tooltip.cpp" - "src/msw/toplevel.cpp" - "src/msw/treectrl.cpp" - "src/msw/uiaction.cpp" - #"src/msw/urlmsw.cpp" - "src/msw/utils.cpp" - "src/msw/utilsexc.cpp" - "src/msw/utilsgui.cpp" - "src/msw/utilswin.cpp" - "src/msw/uxtheme.cpp" - #"src/msw/version.rc" - "src/msw/volume.cpp" - #"src/msw/webview_ie.cpp" - "src/msw/window.cpp" - #"src/msw/winestub.c" - #"src/msw/rt/notifmsgrt.cpp" - #"src/msw/rt/utilsrt.cpp" - ) - -set(SRCS_OSX - "src/osx/accel.cpp" - "src/osx/anybutton_osx.cpp" - "src/osx/artmac.cpp" - "src/osx/bmpbuttn_osx.cpp" - "src/osx/brush.cpp" - "src/osx/button_osx.cpp" - "src/osx/checkbox_osx.cpp" - "src/osx/checklst_osx.cpp" - "src/osx/choice_osx.cpp" - "src/osx/combobox_osx.cpp" - "src/osx/dataview_osx.cpp" - "src/osx/datectrl_osx.cpp" - "src/osx/datetimectrl_osx.cpp" - "src/osx/dialog_osx.cpp" - "src/osx/dnd_osx.cpp" - "src/osx/fontutil.cpp" - #"src/osx/fswatcher_fsevents.cpp" - "src/osx/gauge_osx.cpp" - #"src/osx/glcanvas_osx.cpp" - "src/osx/imaglist.cpp" - "src/osx/listbox_osx.cpp" - "src/osx/menu_osx.cpp" - "src/osx/menuitem_osx.cpp" - "src/osx/minifram.cpp" - "src/osx/nonownedwnd_osx.cpp" - "src/osx/notebook_osx.cpp" - "src/osx/palette.cpp" - "src/osx/pen.cpp" - "src/osx/printdlg_osx.cpp" - "src/osx/radiobox_osx.cpp" - "src/osx/radiobut_osx.cpp" - "src/osx/scrolbar_osx.cpp" - "src/osx/slider_osx.cpp" - "src/osx/sound_osx.cpp" - "src/osx/spinbutt_osx.cpp" - "src/osx/srchctrl_osx.cpp" - "src/osx/statbox_osx.cpp" - "src/osx/statline_osx.cpp" - "src/osx/stattext_osx.cpp" - "src/osx/textctrl_osx.cpp" - "src/osx/textentry_osx.cpp" - "src/osx/tglbtn_osx.cpp" - "src/osx/timectrl_osx.cpp" - "src/osx/toolbar_osx.cpp" - "src/osx/toplevel_osx.cpp" - "src/osx/uiaction_osx.cpp" - "src/osx/utils_osx.cpp" - #"src/osx/webview_webkit.mm" - "src/osx/window_osx.cpp" - "src/osx/carbon/app.cpp" - "src/osx/carbon/clipbrd.cpp" - #"src/osx/carbon/colordlg.cpp" - "src/osx/carbon/colordlgosx.mm" - "src/osx/carbon/control.cpp" - "src/osx/carbon/cursor.cpp" - "src/osx/carbon/dataobj.cpp" - "src/osx/carbon/dcclient.cpp" - "src/osx/carbon/dcprint.cpp" - "src/osx/carbon/dcscreen.cpp" - "src/osx/carbon/font.cpp" - "src/osx/carbon/fontdlg.cpp" - "src/osx/carbon/fontdlgosx.mm" - "src/osx/carbon/frame.cpp" - "src/osx/carbon/gdiobj.cpp" - "src/osx/carbon/graphics.cpp" - "src/osx/carbon/icon.cpp" - #"src/osx/carbon/main.cpp" - "src/osx/carbon/mdi.cpp" - "src/osx/carbon/metafile.cpp" - #"src/osx/carbon/overlay.cpp" - "src/osx/carbon/popupwin.cpp" - "src/osx/carbon/region.cpp" - "src/osx/carbon/renderer.cpp" - #"src/osx/carbon/sound.cpp" - "src/osx/carbon/statbrma.cpp" - #"src/osx/carbon/thread.cpp" - #"src/osx/carbon/timer.cpp" - "src/osx/carbon/utilscocoa.mm" - "src/osx/cocoa/aboutdlg.mm" - "src/osx/cocoa/activityindicator.mm" - "src/osx/cocoa/anybutton.mm" - "src/osx/cocoa/appprogress.mm" - "src/osx/cocoa/button.mm" - "src/osx/cocoa/checkbox.mm" - "src/osx/cocoa/choice.mm" - "src/osx/cocoa/colour.mm" - "src/osx/cocoa/combobox.mm" - "src/osx/cocoa/dataview.mm" - "src/osx/cocoa/datetimectrl.mm" - "src/osx/cocoa/dialog.mm" - "src/osx/cocoa/dirdlg.mm" - "src/osx/cocoa/dnd.mm" - "src/osx/cocoa/evtloop.mm" - "src/osx/cocoa/filedlg.mm" - "src/osx/cocoa/gauge.mm" - "src/osx/cocoa/glcanvas.mm" - "src/osx/cocoa/listbox.mm" - #"src/osx/cocoa/mediactrl.mm" - "src/osx/cocoa/menu.mm" - "src/osx/cocoa/menuitem.mm" - "src/osx/cocoa/msgdlg.mm" - "src/osx/cocoa/nativewin.mm" - "src/osx/cocoa/nonownedwnd.mm" - "src/osx/cocoa/notebook.mm" - "src/osx/cocoa/notifmsg.mm" - "src/osx/cocoa/overlay.mm" - "src/osx/cocoa/power.mm" - "src/osx/cocoa/printdlg.mm" - "src/osx/cocoa/radiobut.mm" - "src/osx/cocoa/scrolbar.mm" - "src/osx/cocoa/settings.mm" - "src/osx/cocoa/slider.mm" - "src/osx/cocoa/spinbutt.mm" - "src/osx/cocoa/srchctrl.mm" - "src/osx/cocoa/statbox.mm" - "src/osx/cocoa/statline.mm" - "src/osx/cocoa/stattext.mm" - "src/osx/cocoa/stdpaths.mm" - "src/osx/cocoa/taskbar.mm" - "src/osx/cocoa/textctrl.mm" - "src/osx/cocoa/tglbtn.mm" - "src/osx/cocoa/toolbar.mm" - "src/osx/cocoa/tooltip.mm" - "src/osx/cocoa/utils.mm" - "src/osx/cocoa/utils_base.mm" - "src/osx/cocoa/window.mm" - "src/osx/core/bitmap.cpp" - "src/osx/core/cfstring.cpp" - "src/osx/core/colour.cpp" - "src/osx/core/dcmemory.cpp" - "src/osx/core/display.cpp" - "src/osx/core/evtloop_cf.cpp" - "src/osx/core/fontenum.cpp" - "src/osx/core/hid.cpp" - #"src/osx/core/hidjoystick.cpp" - "src/osx/core/mimetype.cpp" - "src/osx/core/printmac.cpp" - "src/osx/core/sockosx.cpp" - "src/osx/core/sound.cpp" - "src/osx/core/strconv_cf.cpp" - "src/osx/core/timer.cpp" - "src/osx/core/utilsexc_base.cpp" - "src/osx/core/utilsexc_cf.cpp" - #"src/osx/iphone/button.mm" - #"src/osx/iphone/checkbox.mm" - #"src/osx/iphone/dialog.mm" - #"src/osx/iphone/evtloop.mm" - #"src/osx/iphone/gauge.mm" - #"src/osx/iphone/glcanvas.mm" - #"src/osx/iphone/msgdlg.mm" - #"src/osx/iphone/nonownedwnd.mm" - #"src/osx/iphone/scrolbar.mm" - #"src/osx/iphone/settings.mm" - #"src/osx/iphone/slider.mm" - #"src/osx/iphone/stattext.mm" - #"src/osx/iphone/textctrl.mm" - #"src/osx/iphone/toolbar.mm" - #"src/osx/iphone/utils.mm" - #"src/osx/iphone/window.mm" -) - -set(SRCS_UNIX - "src/unix/apptraits.cpp" - "src/unix/appunix.cpp" - "src/unix/dir.cpp" - "src/unix/dlunix.cpp" - #"src/unix/epolldispatcher.cpp" - "src/unix/evtloopunix.cpp" - "src/unix/fdiounix.cpp" - #"src/unix/fswatcher_kqueue.cpp" - #"src/unix/net.cpp" - "src/unix/snglinst.cpp" - "src/unix/sockunix.cpp" - "src/unix/stackwalk.cpp" - "src/unix/threadpsx.cpp" - "src/unix/timerunx.cpp" - "src/unix/utilsunx.cpp" - "src/unix/wakeuppipe.cpp") - -set(SRCS_UNIXGTK - "src/unix/dialup.cpp" - "src/unix/displayx11.cpp" - "src/unix/fontenum.cpp" - "src/unix/fontutil.cpp" - #"src/unix/fswatcher_inotify.cpp" - #"src/unix/glx11.cpp" - #"src/unix/joystick.cpp" - #"src/unix/mediactrl.cpp" - #"src/unix/mediactrl_gstplayer.cpp" - "src/unix/mimetype.cpp" - "src/unix/sound.cpp" - #"src/unix/sound_sdl.cpp" - "src/unix/stdpaths.cpp" - #"src/unix/taskbarx11.cpp" - "src/unix/uiactionx11.cpp" - "src/unix/utilsx11.cpp") - -add_library(wx STATIC ${SRCS_AUI} ${SRCS_COMMON} ${SRCS_GENERIC}) -target_include_directories(wx PUBLIC . include) -target_compile_definitions(wx PRIVATE "WXBUILDING") -# wxWidgets warnings are not our problem. -target_compile_options(wx PRIVATE "-w") - -if(APPLE) - target_compile_definitions(wx PRIVATE "__WXOSX_COCOA__" "__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=1") - target_sources(wx PRIVATE - ${SRCS_GENERICOSX} - ${SRCS_OSX} - ${SRCS_UNIX} - ) - target_link_libraries(wx PRIVATE - png - iconv - ${APPKIT_LIBRARY} - ${APPSERV_LIBRARY} - ${CARBON_LIBRARY} - ${COCOA_LIBRARY} - ${COREFUND_LIBRARY} - ${CORESERV_LIBRARY} - ${IOK_LIBRARY} - ${OPENGL_LIBRARY} - ) -elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD") - target_compile_options(wx PRIVATE "$<$:-std=gnu++11>") - if(CMAKE_SYSTEM_NAME STREQUAL "Linux") - target_compile_definitions(wx PRIVATE "__LINUX__=1") - else() - target_compile_definitions(wx PRIVATE "__BSD__=1") - endif() - target_compile_definitions(wx PRIVATE "__WXGTK__") - target_sources(wx PRIVATE - ${SRCS_GENERICGTK} - ${SRCS_GTK} - ${SRCS_UNIX} - ${SRCS_UNIXGTK} - ) - if (NOT X11_xf86vmode_FOUND OR NOT X11_Xinerama_FOUND) - message(FATAL_ERROR "wxGTK2 needs Xinerama and Xxf86vm") - endif() - - find_package(GTK2 REQUIRED) - check_lib(GTHREAD2 gthread-2.0 gthread-2.0 glib/gthread.h REQUIRED) - check_lib(PANGOCAIRO pangocairo pangocairo pango/pangocairo.h REQUIRED) - # On Linux "backtrace" is part of glibc. FreeBSD has a separate library. - # Required for wxUSE_STACKWALKER in Externals/wxWidgets3/wx/wxgtk.h - find_package(Backtrace REQUIRED) - - target_include_directories(wx PUBLIC ${GTK2_INCLUDE_DIRS}) - target_link_libraries(wx PRIVATE - png - ${GTHREAD2_LIBRARIES} - ${PANGOCAIRO_LIBRARIES} - ${GTK2_LIBRARIES} - ${Backtrace_LIBRARY} - ${X11_X11_LIB} - ${X11_Xxf86vm_LIB} - ${X11_Xinerama_LIB} - ) -elseif(WIN32) - remove_definitions(-DWIN32_LEAN_AND_MEAN) - target_compile_definitions(wx PRIVATE "__WXMSW__" "NOPCH") - target_sources(wx PRIVATE - ${SRCS_GENERICMSW} - ${SRCS_MSW} - ) - target_link_libraries(wx PRIVATE - Comctl32.lib - Rpcrt4.lib - ${OPENGL_LIBRARIES} - ) -else() - message(FATAL_ERROR "wxWidgets in Externals is not compatible with your platform") -endif() - -add_library(wxWidgets::wxWidgets ALIAS wx) diff --git a/Externals/wxWidgets3/art/addbookm.xpm b/Externals/wxWidgets3/art/addbookm.xpm deleted file mode 100644 index 0b4f695c2c..0000000000 --- a/Externals/wxWidgets3/art/addbookm.xpm +++ /dev/null @@ -1,24 +0,0 @@ -/* XPM */ -static const char *const addbookm_xpm[] = { -/* columns rows colors chars-per-pixel */ -"16 15 3 1", -". c Black", -"X c #00C000", -" c None", -/* pixels */ -" ....... ", -" .XXXXX. ", -" .. .XXXXX. ", -" .. .XXXXX. ", -" ...... .XXXXX. ", -" ...... .XXXXX. ", -" .. .XXXXX. ", -" .. .XXXXX. ", -" .XXXXX. ", -" .XXXXX. ", -" .XXXXX. ", -" .XXXXX. ", -" .XX.XX. ", -" .X. .X. ", -" .. .. " -}; diff --git a/Externals/wxWidgets3/art/back.xpm b/Externals/wxWidgets3/art/back.xpm deleted file mode 100644 index d5c1de519d..0000000000 --- a/Externals/wxWidgets3/art/back.xpm +++ /dev/null @@ -1,21 +0,0 @@ -/* XPM */ -static const char *const back_xpm[] = { -"16 15 3 1", -" c None", -". c Black", -"X c Gray100", -" ", -" ", -" . ", -" .. ", -" .X. ", -" .XX........ ", -" .XXXXXXXXXX. ", -" .XXXXXXXXXXX. ", -" .XXXXXXXXXXX. ", -" .XXXXXXXXXX. ", -" .XX........ ", -" .X. ", -" .. ", -" . ", -" "}; diff --git a/Externals/wxWidgets3/art/cdrom.xpm b/Externals/wxWidgets3/art/cdrom.xpm deleted file mode 100644 index e3bc19b96b..0000000000 --- a/Externals/wxWidgets3/art/cdrom.xpm +++ /dev/null @@ -1,57 +0,0 @@ -/* XPM */ -static const char *const cdrom_xpm[] = { -/* columns rows colors chars-per-pixel */ -"16 15 36 1", -"= c #9BACC2", -"y c #547B99", -"$ c #FFFFFF", -"@ c #839CB5", -"o c #547897", -"4 c #4D7492", -"% c #F1F4F7", -"X c #5A809C", -"< c #8497A5", -"0 c #7898AD", -"+ c #CAD2DC", -"r c #ACAEB2", -"2 c #BECAD9", -"* c #65839D", -"e c #DCE2EA", -"- c #ADBED2", -"t c #597B9A", -" c None", -"1 c #467291", -"9 c #D6DFE7", -"O c #7393AB", -"u c #49708B", -"5 c #A0BACB", -"& c #AABFCD", -"8 c #B9CBD5", -"; c #B4C4D3", -": c #6F90A6", -"3 c #A8B6CA", -"# c #ADBACE", -"w c #E4E9ED", -". c #8EA9BC", -"> c #B3BFD1", -", c #C2CBDB", -"6 c #C0D1DC", -"7 c #A2B3C5", -"q c #5D7C93", -/* pixels */ -" .XooOo+ ", -" X@#$$$%o& ", -" *=-;$$$$$o+ ", -" +O#;-$$$$$$: ", -" o=>,-<1<$2-o ", -" o3>--1$122-* ", -" o=--$<4<22-X ", -" o5$$$$$26;7* ", -" X%$$$$2;-X8 ", -" 90*9$$$-7Xqo ", -" wXwe@O44X422222<<*4", -" ttyyyoo4441uuuo", -" t>$$$$$$$$$$$>o", -" XXXtyyyoo44411u" -}; diff --git a/Externals/wxWidgets3/art/close.xpm b/Externals/wxWidgets3/art/close.xpm deleted file mode 100644 index d79030228c..0000000000 --- a/Externals/wxWidgets3/art/close.xpm +++ /dev/null @@ -1,16 +0,0 @@ -/* XPM */ -static const char * const close_xpm[] = { -"12 10 2 1", -" c None", -"X c black", -" ", -" XX XX ", -" XX XX ", -" XXXX ", -" XX ", -" XXXX ", -" XX XX ", -" XX XX ", -" ", -" "}; - diff --git a/Externals/wxWidgets3/art/copy.xpm b/Externals/wxWidgets3/art/copy.xpm deleted file mode 100644 index f393cd23e6..0000000000 --- a/Externals/wxWidgets3/art/copy.xpm +++ /dev/null @@ -1,44 +0,0 @@ -/* XPM */ -static const char *const copy_xpm[] = { -/* columns rows colors chars-per-pixel */ -"16 15 23 1", -"o c #97C4E7", -"* c #FFFFFF", -"@ c #60A9DA", -"= c #D1E5F5", -"& c #C3DDF1", -". c #7EA6C0", -" c None", -"X c #2F93CD", -"O c #85BBE2", -", c #EFF6FC", -"; c #DEEDF8", -"+ c #72B2DD", -"3 c #F7FBFD", -"4 c #FAFCFE", -": c #DAEAF7", -"< c #E9F3FA", -"1 c #E2EFF8", -"- c #FDFDFE", -"% c #B6D5EE", -"$ c #A5CCEA", -"> c #E5F0F9", -"# c #AFD1EC", -"2 c #F4F9FD", -/* pixels */ -" .....XX ", -" .oO+@X#X ", -" .$oO+X##X ", -" .%$o........ ", -" .&%$.*=&#o.-. ", -" .=&%.*;=&#.--. ", -" .:=&.*>;=&.... ", -" .>:=.*,>;=&#o. ", -" .<1:.*2,>:=&#. ", -" .2<1.*32,>:=&. ", -" .32<.*432,>:=. ", -" .32<.*-432,>:. ", -" .....**-432,>. ", -" .***-432,. ", -" .......... " -}; diff --git a/Externals/wxWidgets3/art/cross.xpm b/Externals/wxWidgets3/art/cross.xpm deleted file mode 100644 index 407fa9bfa1..0000000000 --- a/Externals/wxWidgets3/art/cross.xpm +++ /dev/null @@ -1,17 +0,0 @@ -/* XPM */ -static const char *const cross_xpm[] = { -/* columns rows colors chars-per-pixel */ -"10 10 2 1", -" c Gray0", -"# c None", -/* pixels */ -" ######## ", -" #### ", -"# ## #", -"## ##", -"### ###", -"### ###", -"## ##", -"# ## #", -" #### ", -" ###### "}; diff --git a/Externals/wxWidgets3/art/cut.xpm b/Externals/wxWidgets3/art/cut.xpm deleted file mode 100644 index e638157f59..0000000000 --- a/Externals/wxWidgets3/art/cut.xpm +++ /dev/null @@ -1,46 +0,0 @@ -/* XPM */ -static const char *const cut_xpm[] = { -/* columns rows colors chars-per-pixel */ -"16 15 25 1", -"6 c #D8BDC0", -": c #C3C3C4", -"- c #FFFFFF", -". c #6C6D70", -"2 c #AD3A45", -"o c #DBDBDB", -"# c #939495", -"< c #E42234", -"& c #C3C5C8", -"; c #C6CCD3", -"% c #B7B7B8", -" c None", -"* c #DFE0E2", -"5 c #B69596", -"3 c #9C2A35", -"1 c #CFCFD0", -", c #AB5C64", -"+ c #D2D3D4", -"$ c #BCBDBE", -"@ c #C6C8CA", -"> c #CDC0C1", -"O c #826F72", -"X c #979BA0", -"4 c #9B8687", -"= c #9FA0A0", -/* pixels */ -" .X .o ", -" O.+ @. ", -" O. .. ", -" O#$ %.& ", -" O.*.. ", -" #%#.. ", -" O=-.. ", -" #%#;. ", -" OO:=O ", -" >,,<, ,<,,1 ", -" ><23<1 1<32<1 ", -" ,2 4< <5 2, ", -" <, ,2 2, ,< ", -" 23,<5 5<,32 ", -" 6225 522> " -}; diff --git a/Externals/wxWidgets3/art/deffile.xpm b/Externals/wxWidgets3/art/deffile.xpm deleted file mode 100644 index d7546a53f4..0000000000 --- a/Externals/wxWidgets3/art/deffile.xpm +++ /dev/null @@ -1,54 +0,0 @@ -/* XPM */ -static const char *const deffile_xpm[] = { -/* columns rows colors chars-per-pixel */ -"16 16 32 1", -"= c #97C4E7", -": c #72A8D2", -"1 c #FFFFFF", -"w c #839CB5", -"X c #6B98B8", -". c #5A89A6", -"@ c #3A749C", -", c #D1E5F5", -"< c #67A1CF", -"> c #F1F4F7", -"e c #85A7BC", -"% c #C3DDF1", -"0 c #749BB4", -"2 c #7EA6C0", -"; c #5F9BC8", -" c None", -"O c #538DB3", -"- c #85BBE2", -"$ c #D6DFE7", -"9 c #EFF6FC", -"o c #6591AE", -"4 c #F7FBFD", -"8 c #FAFCFE", -"6 c #DAEAF7", -"7 c #E9F3FA", -"q c #FDFDFE", -"3 c #E2EFF8", -"# c #8EA9BC", -"& c #B6D5EE", -"* c #A5CCEA", -"5 c #F4F9FD", -"+ c #4581AA", -/* pixels */ -" ..XooO+@#$ ", -" .%%&*=-;:;> ", -" .,,%&*=<1=X> ", -" #%%%%&*211=X ", -" #3----- c #5A7BB4", -"% c #5F7FB5", -/* pixels */ -" ", -" .Xo OO ", -" +@#. $@% ", -" &@@X .*@*o ", -" =@= .*@*. ", -" -@@X*@*. ", -" .#@@@$. ", -" ;@@: ", -" ;@@@+ ", -" .>@#%@@. ", -" o*@*oO@@, ", -" <#@*. .@@= ", -"&@@$ :@@1 ", -";#& 2#>. ", -" " -}; diff --git a/Externals/wxWidgets3/art/dir_up.xpm b/Externals/wxWidgets3/art/dir_up.xpm deleted file mode 100644 index dd85ff25cd..0000000000 --- a/Externals/wxWidgets3/art/dir_up.xpm +++ /dev/null @@ -1,52 +0,0 @@ -/* XPM */ -static const char *const dir_up_xpm[] = { -/* columns rows colors chars-per-pixel */ -"16 15 31 1", -"6 c #9BACC2", -"o c #9AEA53", -"7 c #94A5BD", -"8 c #547897", -"5 c #839CB5", -"@ c #376485", -"$ c #5A809C", -"# c #7F99B4", -": c #D1D9E5", -"< c #EAEDF3", -"& c #446A8C", -"q c #65839D", -"> c #DCE2EA", -", c #E1E6EE", -"2 c #F5F6F7", -"O c #8DA0B9", -" c None", -"% c #467291", -". c #305F81", -"X c #7393AB", -"+ c #6A89A2", -"4 c #A8B6CA", -"1 c #EEF1F3", -"3 c #F8F9FA", -"0 c #215579", -"9 c #7F97B0", -"* c #B3BFD1", -"w c #7A90AC", -"- c #C2CBDB", -"; c #CAD6E1", -"= c #BBC4D6", -/* pixels */ -" .. ", -" X.o. ", -".... X.ooo. ", -".OO+....ooooo. ", -".OOOOOO@@ooo.. ", -".OOOO#OO@ooo.$ ", -".OOOOOOO@ooo.$ ", -".O%............&", -".O&*=-;:>,<1231.", -".+.4*=-;:>,<12$.", -"..564*=-;:>,<1. ", -".@O764*=-;:>,<. ", -".89O764*=-;:>$$ ", -"0qw9O764*=-;:. ", -"0............. " -}; diff --git a/Externals/wxWidgets3/art/down.xpm b/Externals/wxWidgets3/art/down.xpm deleted file mode 100644 index 5a0e4c98fb..0000000000 --- a/Externals/wxWidgets3/art/down.xpm +++ /dev/null @@ -1,21 +0,0 @@ -/* XPM */ -static const char *const down_xpm[] = { -"16 15 3 1", -" c None", -". c Black", -"X c Gray100", -" ", -" ...... ", -" .XXXX. ", -" .XXXX. ", -" .XXXX. ", -" .XXXX. ", -" .XXXX. ", -" .XXXX. ", -" ....XXXX.... ", -" .XXXXXXXX. ", -" .XXXXXX. ", -" .XXXX. ", -" .XX. ", -" .. ", -" "}; diff --git a/Externals/wxWidgets3/art/edit.xpm b/Externals/wxWidgets3/art/edit.xpm deleted file mode 100644 index 83d684ab3b..0000000000 --- a/Externals/wxWidgets3/art/edit.xpm +++ /dev/null @@ -1,22 +0,0 @@ -/* XPM */ -static const char* const edit_xpm[] = { -"16 16 3 1", -" c None", -". c #000000", -"+ c #00007F", -" ", -" ", -" .. .. ", -" . ", -" . ", -" ++++ . ++++ ", -" ++ . ++ ++", -" +++++ . ++++++", -" ++ ++ . ++ ", -" ++ ++ . ++ ++", -" +++++ . ++++ ", -" . ", -" . ", -" .. .. ", -" ", -" "}; diff --git a/Externals/wxWidgets3/art/exefile.xpm b/Externals/wxWidgets3/art/exefile.xpm deleted file mode 100644 index 54a5e49c33..0000000000 --- a/Externals/wxWidgets3/art/exefile.xpm +++ /dev/null @@ -1,73 +0,0 @@ -/* XPM */ -static const char *const exefile_xpm[] = { -/* columns rows colors chars-per-pixel */ -"16 16 51 1", -"% c #E8E8EC", -"= c #E8E8ED", -"z c #CACAD4", -"8 c #D9D9E1", -"p c #D2D2DA", -"u c #E1E1E7", -"a c #D2D2DB", -"< c #E9E9ED", -"q c #DADAE1", -"+ c #F1F1F4", -"g c #D3D3DB", -"1 c #E2E2E8", -"x c #D3D3DC", -"5 c #00A5FF", -"$ c #EAEAEE", -"4 c #DBDBE2", -"h c #CCCCD6", -"y c #D4D4DC", -"r c #E3E3E9", -"d c #D4D4DD", -"7 c #DCDCE2", -": c #EBEBEF", -"0 c #DCDCE3", -" c None", -"O c #F3F3F5", -"> c #E4E4E9", -"& c #F3F3F6", -"j c #D5D5DD", -"6 c #E4E4EA", -". c #C6C6D5", -"# c #ECECF0", -"f c #CECED7", -"l c #CECED8", -"e c #D6D6DE", -"; c #EDEDF0", -"3 c #DEDEE4", -", c #EDEDF1", -"c c #CFCFD8", -"o c #F5F5F7", -"- c #E6E6EB", -"w c #D7D7DF", -"v c #C8C8D3", -"i c #DFDFE5", -"@ c #EEEEF2", -"s c #D0D0D9", -"X c #9494AD", -"9 c #D8D8DF", -"t c #D8D8E0", -"* c #EFEFF2", -"2 c #E0E0E6", -"k c #D1D1DA", -/* pixels */ -" ........X ", -" .oO+@#$%XX ", -" .&+*#$=-XXX ", -" .+*;:=->XXXX ", -" .*,:<->1234X ", -" .,5:5612378X ", -" 5,5559530qwX ", -" 55555550q9eX ", -" 5555r5555teyX ", -" 55rui559eypX ", -" 5555i5555yasX ", -" 5555555dasfX ", -" 5355595gsfhX ", -" .3595jgklhzX ", -" .0qwjxkchzvX ", -" XXXXXXXXXXXX " -}; diff --git a/Externals/wxWidgets3/art/fileopen.xpm b/Externals/wxWidgets3/art/fileopen.xpm deleted file mode 100644 index 997efdea19..0000000000 --- a/Externals/wxWidgets3/art/fileopen.xpm +++ /dev/null @@ -1,57 +0,0 @@ -/* XPM */ -static const char *const fileopen_xpm[] = { -/* columns rows colors chars-per-pixel */ -"16 15 36 1", -"6 c #9BACC2", -"< c #9AEA53", -"9 c #94A5BD", -"5 c #839CB5", -"; c #4D7492", -". c #376485", -"$ c #7F99B4", -"r c #D1D9E5", -"7 c #EAEDF3", -"@ c #CAD2DC", -"% c #718BA7", -"t c #BECAD9", -"& c #65839D", -"0 c #DCE2EA", -"4 c #F5F6F7", -"w c #597B9A", -"O c #8DA0B9", -" c None", -"+ c #467291", -"u c #305F81", -"= c #B4C4D3", -"# c #CAE2AA", -"1 c #FAFCFE", -"3 c #A8B6CA", -"q c #E4E9ED", -"8 c #EEF1F3", -"X c #215579", -"2 c #7F97B0", -": c #B3BFD1", -"y c #7A90AC", -", c #C2CBDB", -"- c #ADD668", -"* c #B6D791", -"e c #CAD6E1", -"o c #DFF0D0", -"> c #BBC4D6", -/* pixels */ -" ", -" .... ", -"XXXXX .oo. ", -"XOOOO+@.#o. ", -"XOOOO$%&.*oXXX ", -"XOOOOOOO.*oX=X ", -"XOXXXX...-oXXXX;", -"XOX:>,.<<<<,.<<>.>.X0q7; ", -"Xw2O963:>>er0t; ", -"X&y2O963:>,er; ", -"uXXXXXXXXXXXX; ", -" " -}; diff --git a/Externals/wxWidgets3/art/filesave.xpm b/Externals/wxWidgets3/art/filesave.xpm deleted file mode 100644 index f571025cd6..0000000000 --- a/Externals/wxWidgets3/art/filesave.xpm +++ /dev/null @@ -1,42 +0,0 @@ -/* XPM */ -static const char *const filesave_xpm[] = { -/* columns rows colors chars-per-pixel */ -"16 15 21 1", -"O c #FFFFFF", -"> c #D5D6D8", -"; c #446A8C", -"1 c #CAD2DC", -": c #C0C7D1", -" c #5F666D", -"% c #A5B0BA", -"o c #65839D", -", c #DCE2EA", -"< c #C3C5C8", -"- c #E1E6EE", -"* c #C6CCD3", -". c None", -"$ c #305F81", -"2 c #D6DFE7", -"= c #D2D9E0", -"& c #B7BFC7", -"X c #1B4467", -"# c #BCBDBE", -"@ c #7A90AC", -"+ c #5D7C93", -/* pixels */ -" .", -" XoOOOOOOOOO+X .", -" @oO#######O+@ .", -" @oOOOOOOOOO+@ .", -" @oO#######O+@ .", -" @oOOOOOOOOO+@ .", -" @@+++++++++@@ .", -" @@@@@@@@@@@@@ .", -" @@@$$$$$$$$@@ .", -" @@$%%%&*=-O$@ .", -" @@$%X;;*=-O$@ .", -" @@$%X;;:>,O$@ .", -" @@$%X;;<12O$@ .", -" @@$<<2OOOOO$@ .", -". .." -}; diff --git a/Externals/wxWidgets3/art/filesaveas.xpm b/Externals/wxWidgets3/art/filesaveas.xpm deleted file mode 100644 index 7562f4cc47..0000000000 --- a/Externals/wxWidgets3/art/filesaveas.xpm +++ /dev/null @@ -1,44 +0,0 @@ -/* XPM */ -static const char *const filesaveas_xpm[] = { -/* columns rows colors chars-per-pixel */ -"16 15 23 1", -"X c Black", -"+ c #FFFFFF", -"< c #D5D6D8", -"> c #446A8C", -"3 c #CAD2DC", -", c #C0C7D1", -" c #5F666D", -"* c #A5B0BA", -"O c #65839D", -"1 c #DCE2EA", -"2 c #C3C5C8", -": c #E1E6EE", -". c #FFFF00", -"- c #C6CCD3", -"@ c None", -"& c #305F81", -"4 c #D6DFE7", -"; c #D2D9E0", -"= c #B7BFC7", -"o c #1B4467", -"$ c #BCBDBE", -"# c #7A90AC", -"% c #5D7C93", -/* pixels */ -" .X .XX.", -" oO+++++++.X.X.@", -" #O+$$$$$XX...XX", -" #O++++++.......", -" #O+$$$$$XX...XX", -" #O+++++++.X.X.@", -" ##%%%%%%.X%.X .", -" ############# @", -" ###&&&&&&&&## @", -" ##&***=-;:+&# @", -" ##&*o>>-;:+&# @", -" ##&*o>>,<1+&# @", -" ##&*o>>234+&# @", -" ##&224+++++&# @", -"@ @@" -}; diff --git a/Externals/wxWidgets3/art/find.xpm b/Externals/wxWidgets3/art/find.xpm deleted file mode 100644 index a31ecde63f..0000000000 --- a/Externals/wxWidgets3/art/find.xpm +++ /dev/null @@ -1,62 +0,0 @@ -/* XPM */ -static const char *const find_xpm[] = { -/* columns rows colors chars-per-pixel */ -"16 15 41 1", -"y c #A06959", -"9 c #A7DAF2", -"$ c #B5CAD7", -"> c #35B4E1", -"t c #6B98B8", -"w c #B6E0F4", -"q c #AEC9D7", -"1 c #5A89A6", -"+ c #98B3C6", -"4 c #EAF6FC", -"3 c #DEF1FA", -"= c #4CBCE3", -"d c #DB916B", -"X c #85A7BC", -"s c #D8BCA4", -"o c #749BB4", -"e c #BCD9EF", -"* c #62B4DD", -"< c #91D2EF", -"a c #E6DED2", -"0 c #E9F4FB", -" c None", -"@ c #A0BACB", -"O c #AABFCD", -"i c #6591AE", -": c #B9CBD5", -"- c #71C5E7", -"5 c #D3ECF8", -"% c #81A3B9", -"6 c #8AD0EE", -"8 c #FDFDFE", -"p c #8EA9BC", -"r c #B6D5EE", -", c #81CCEB", -". c #ACC4D3", -"; c #AFD1DE", -"7 c #EFF8FC", -"u c #C2CBDB", -"# c #C0D1DC", -"2 c #CAD6E1", -"& c #8FB0C3", -/* pixels */ -" .XooXO ", -" +@###$+% ", -" .&#*==-;@@ ", -" o:*>,<--:X ", -" 12>-345-#% ", -" 12>678392% ", -" %$*,3059q& ", -" @Oq,wwer@@ ", -" t@q22q&+ ", -" yyui+%o%p ", -" yasy ", -" yasdy ", -" yasdy ", -" ysdy ", -" yy " -}; diff --git a/Externals/wxWidgets3/art/findrepl.xpm b/Externals/wxWidgets3/art/findrepl.xpm deleted file mode 100644 index 5d688ba4bc..0000000000 --- a/Externals/wxWidgets3/art/findrepl.xpm +++ /dev/null @@ -1,63 +0,0 @@ -/* XPM */ -static const char *const findrepl_xpm[] = { -/* columns rows colors chars-per-pixel */ -"16 15 42 1", -"y c #A06959", -"9 c #A7DAF2", -"$ c #B5CAD7", -"> c #35B4E1", -"t c #6B98B8", -"w c #B6E0F4", -"q c #AEC9D7", -"1 c #5A89A6", -"+ c #98B3C6", -"4 c #EAF6FC", -"d c #008000", -"3 c #DEF1FA", -"= c #4CBCE3", -"f c #DB916B", -"X c #85A7BC", -"s c #D8BCA4", -"o c #749BB4", -"e c #BCD9EF", -"* c #62B4DD", -"< c #91D2EF", -"a c #E6DED2", -"0 c #E9F4FB", -" c None", -"@ c #A0BACB", -"O c #AABFCD", -"i c #6591AE", -": c #B9CBD5", -"- c #71C5E7", -"5 c #D3ECF8", -"% c #81A3B9", -"6 c #8AD0EE", -"8 c #FDFDFE", -"p c #8EA9BC", -"r c #B6D5EE", -", c #81CCEB", -". c #ACC4D3", -"; c #AFD1DE", -"7 c #EFF8FC", -"u c #C2CBDB", -"# c #C0D1DC", -"2 c #CAD6E1", -"& c #8FB0C3", -/* pixels */ -" .XooXO ", -" +@###$+% ", -" .&#*==-;@@ ", -" o:*>,<--:X ", -" 12>-345-#% ", -" 12>678392% ", -" %$*,3059q& ", -" @Oq,wwer@@ ", -" t@q22q&+ ", -" yyui+%o%p ", -" yasy d d ", -" yasfy dd dd ", -"yasfy ddddddddd", -"ysfy dd dd ", -" yy d d " -}; diff --git a/Externals/wxWidgets3/art/first.xpm b/Externals/wxWidgets3/art/first.xpm deleted file mode 100644 index 6660af49e6..0000000000 --- a/Externals/wxWidgets3/art/first.xpm +++ /dev/null @@ -1,22 +0,0 @@ -/* XPM */ -static const char *const first_xpm[] = { -"16 16 3 1", -" c None", -". c Black", -"X c Gray100", -" ", -" ", -"... . ", -"... .. ", -"... .X. ", -"... .XX........ ", -"....XXXXXXXXXX. ", -"...XXXXXXXXXXX. ", -"...XXXXXXXXXXX. ", -"....XXXXXXXXXX. ", -"... .XX........ ", -"... .X. ", -"... .. ", -"... . ", -" ", -" "}; diff --git a/Externals/wxWidgets3/art/floppy.xpm b/Externals/wxWidgets3/art/floppy.xpm deleted file mode 100644 index f6057b14fa..0000000000 --- a/Externals/wxWidgets3/art/floppy.xpm +++ /dev/null @@ -1,39 +0,0 @@ -/* XPM */ -static const char *const floppy_xpm[] = { -/* columns rows colors chars-per-pixel */ -"16 15 18 1", -"& c #E3E4E6", -"+ c #FFFFFF", -". c #446A8C", -"o c #697787", -"> c #5F666D", -"* c #B2B3B3", -" c None", -", c #4B4C4D", -"= c #DCDBDA", -"$ c #1B4467", -": c #E4E9ED", -"@ c #979BA0", -"X c #203646", -"O c #215579", -"- c #545B63", -"; c #636465", -"# c #CAD6E1", -"% c #7F8286", -/* pixels */ -" .XoooooooXO ", -" .o+++++++.O ", -" .o+OOOOO+.O ", -" .o+++++++.O ", -" .o@@@@@@@.O ", -" ..........O ", -" ..#+++++#.O ", -" ..+$O+++#.O ", -" ..+$O+++#.O ", -" %&.........*% ", -"%=+++++++++++&% ", -"--------------; ", -"-:::::::::::::- ", -"-:X:XXXXXXXXX:> ", -"-*************, " -}; diff --git a/Externals/wxWidgets3/art/folder.xpm b/Externals/wxWidgets3/art/folder.xpm deleted file mode 100644 index 98e52a70b8..0000000000 --- a/Externals/wxWidgets3/art/folder.xpm +++ /dev/null @@ -1,43 +0,0 @@ -/* XPM */ -static const char *const folder_xpm[] = { -/* columns rows colors chars-per-pixel */ -"16 15 22 1", -"> c #9BACC2", -". c #547897", -"1 c #7F99B4", -"X c #D1D9E5", -"< c #EAEDF3", -"+ c #CAD2DC", -"3 c #718BA7", -"O c #BECAD9", -"$ c #E1E6EE", -"* c #F5F6F7", -", c #8DA0B9", -" c None", -"# c #D6DFE7", -"@ c #D2D9E0", -"- c #FAFCFE", -"; c #ADBACE", -"& c #EEF1F3", -"= c #F8F9FA", -"o c #B3BFD1", -"2 c #7A90AC", -": c #A2B3C5", -"% c #E5EAF1", -/* pixels */ -" ", -" ..... ", -" .XXXX. ", -" ............. ", -" .oO+@#$%&*=-. ", -" .oO+@#$%&*=-. ", -" .;oO+X#$%&*=. ", -" .:;oO+X#$%&*. ", -" .>:;oO+X#$%&. ", -" .,>:;oO+X#$<. ", -" .1,>:;oO+X#$. ", -" .21,>:;oO+X#. ", -" .321,>:;oO+X. ", -" ............. ", -" " -}; diff --git a/Externals/wxWidgets3/art/folder_open.xpm b/Externals/wxWidgets3/art/folder_open.xpm deleted file mode 100644 index 154441d2a9..0000000000 --- a/Externals/wxWidgets3/art/folder_open.xpm +++ /dev/null @@ -1,52 +0,0 @@ -/* XPM */ -static const char *const folder_open_xpm[] = { -/* columns rows colors chars-per-pixel */ -"16 15 31 1", -"6 c #9BACC2", -"w c #547B99", -"5 c #94A5BD", -". c #376485", -"; c #F1F4F7", -"o c #7F99B4", -"2 c #D1D9E5", -"- c #EAEDF3", -"O c #718BA7", -"0 c #65839D", -"* c #DCE2EA", -": c #F5F6F7", -"7 c #597B9A", -"X c #8DA0B9", -" c None", -"+ c #467291", -"q c #305F81", -"& c #D6DFE7", -"3 c #6A89A2", -"1 c #A8B6CA", -"= c #E4E9ED", -"> c #F8F9FA", -", c #FDFDFE", -"9 c #215579", -"8 c #7F97B0", -"@ c #B3BFD1", -"< c #7A90AC", -"$ c #C2CBDB", -"4 c #A2B3C5", -"% c #CAD6E1", -"# c #BBC4D6", -/* pixels */ -" ", -"..... ", -".XXXo. ", -".XXXXO........ ", -".XXXXXXXXXXXX. ", -".XXXXXXXXXXXX. ", -".X++++++++++++++", -".X+@#$%&*=-;:>,+", -".<.1@#$%2*=-;:23", -"..X41@#$%2*=-;3 ", -"..X561@#$%2*=-3 ", -".78X561@#$%2*%3 ", -"90<8X561@#$%23 ", -"q++++++++++++w ", -" " -}; diff --git a/Externals/wxWidgets3/art/forward.xpm b/Externals/wxWidgets3/art/forward.xpm deleted file mode 100644 index 81f62b0344..0000000000 --- a/Externals/wxWidgets3/art/forward.xpm +++ /dev/null @@ -1,21 +0,0 @@ -/* XPM */ -static const char *const forward_xpm[] = { -"16 15 3 1", -" c None", -". c Black", -"X c Gray100", -" ", -" ", -" . ", -" .. ", -" .X. ", -" ........XX. ", -" .XXXXXXXXXX. ", -" .XXXXXXXXXXX. ", -" .XXXXXXXXXXX. ", -" .XXXXXXXXXX. ", -" ........XX. ", -" .X. ", -" .. ", -" . ", -" "}; diff --git a/Externals/wxWidgets3/art/fullscreen.xpm b/Externals/wxWidgets3/art/fullscreen.xpm deleted file mode 100644 index e9923646e6..0000000000 --- a/Externals/wxWidgets3/art/fullscreen.xpm +++ /dev/null @@ -1,70 +0,0 @@ -/* XPM */ -static const char *const fullscreen_xpm[] = { -/* columns rows colors chars-per-pixel */ -"16 16 48 1", -" c #82837F", -". c #3465A4", -"X c #3566A4", -"o c #3767A5", -"O c #3B6AA7", -"+ c #406EA9", -"@ c #4370AA", -"# c #4672AB", -"$ c #4B76AE", -"% c #4E78AE", -"& c #577FB2", -"* c #5F84B4", -"= c #678BB9", -"- c #6F91BD", -"; c #7A98C0", -": c #848681", -"> c #888A85", -", c #8BA6C9", -"< c #90AACA", -"1 c #99B0CC", -"2 c #9EB5D1", -"3 c #A0B4CF", -"4 c #A2B6CF", -"5 c #A6BAD4", -"6 c #B7C7DB", -"7 c #B9C7D8", -"8 c #BDCBDC", -"9 c #C7D2DF", -"0 c #C9D3E0", -"q c #CCD7E3", -"w c #D3DBE6", -"e c #D9E1EA", -"r c #DBE2EA", -"t c #EFEEEC", -"y c #EFEFED", -"u c #F0F0EF", -"i c #F2F2F0", -"p c #F3F3F1", -"a c #F4F3F2", -"s c #F4F4F2", -"d c #F4F5F4", -"f c #F7F6F6", -"g c #F8F8F7", -"h c #F8F9F8", -"j c #FBFAFA", -"k c #FBFBFA", -"l c #FCFCFD", -"z c #FFFFFF", -/* pixels */ -">>>>>>>>>>>>>>>>", -">zzzzzzzzzzzzzz>", -">z..X.ttyy....z>", -">z..Xttyyyy...z>", -">z..#*uuss%+..z>", -">z.y&,4uu1-&sOz>", -">zuuy470w82asiz>", -">zuiuu9usqsddsz>", -">zsssfqsfrfhhfz>", -">zhff<6wr95jjjz>", -">z.h%=,fj4-$j.z>", -">z..O#hhjj+O.Xz>", -">z...jhhjjj...z>", -">z....jjzl....z>", -">zzzzzzzzzzzzzz>", -":>>>>>>>>>>>>>> " -}; diff --git a/Externals/wxWidgets3/art/gtk/error.xpm b/Externals/wxWidgets3/art/gtk/error.xpm deleted file mode 100644 index 559715c64c..0000000000 --- a/Externals/wxWidgets3/art/gtk/error.xpm +++ /dev/null @@ -1,58 +0,0 @@ -/* XPM */ -static const char *const error_xpm[] = { -/* columns rows colors chars-per-pixel */ -"48 48 4 1", -" c None", -"X c #242424", -"o c #DCDF00", -". c #C00000", -/* pixels */ -" ", -" ", -" ", -" ", -" ", -" ..... ", -" ............. ", -" ................. ", -" ................... ", -" ....................... ", -" ......................... ", -" ........................... ", -" ...........................X ", -" .............................X ", -" ............................... ", -" ...............................X ", -" .................................X ", -" .................................X ", -" .................................XX ", -" ...ooooooooooooooooooooooooooo...XX ", -" ....ooooooooooooooooooooooooooo....X ", -" ....ooooooooooooooooooooooooooo....X ", -" ....ooooooooooooooooooooooooooo....XX ", -" ....ooooooooooooooooooooooooooo....XX ", -" ....ooooooooooooooooooooooooooo....XX ", -" ...ooooooooooooooooooooooooooo...XXX ", -" ...ooooooooooooooooooooooooooo...XXX ", -" .................................XX ", -" .................................XX ", -" ...............................XXX ", -" ...............................XXX ", -" .............................XXX ", -" ...........................XXXX ", -" ...........................XXX ", -" .........................XXX ", -" .......................XXXX ", -" X...................XXXXX ", -" X.................XXXXX ", -" X.............XXXXX ", -" XXXX.....XXXXXXXX ", -" XXXXXXXXXXXXX ", -" XXXXX ", -" ", -" ", -" ", -" ", -" ", -" " -}; diff --git a/Externals/wxWidgets3/art/gtk/info.xpm b/Externals/wxWidgets3/art/gtk/info.xpm deleted file mode 100644 index fe32e61982..0000000000 --- a/Externals/wxWidgets3/art/gtk/info.xpm +++ /dev/null @@ -1,63 +0,0 @@ -/* XPM */ -static const char *const info_xpm[] = { -/* columns rows colors chars-per-pixel */ -"48 48 9 1", -"$ c Black", -"O c #FFFFFF", -"@ c #808080", -"+ c #000080", -"o c #E8EB01", -" c None", -"X c #FFFF40", -"# c #C0C0C0", -". c #ABAD01", -/* pixels */ -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ..... ", -" ..XXXXX.. ", -" ..XXXXXXXXo.. ", -" .XXXOXXXXXXXoo. ", -" .XOOXXX+XXXXXo. ", -" .XOOOXX+++XXXXoo. ", -" .XOOXXX+++XXXXXo. ", -" .XOOOXXX+++XXXXXXo. ", -" .XOOXXXX+++XXXXXXo. ", -" .XXXXXXX+++XXXXXXX. ", -" .XXXXXXX+++XXXXXXo. ", -" .XXXXXXX+++XXXXXoo. ", -" .XXXXXX+++XXXXXo. ", -" .XXXXXXX+XXXXXXo. ", -" .XXXXXXXXXXXXo. ", -" .XXXXX+++XXXoo. ", -" .XXXX+++XXoo. ", -" .XXXXXXXXo. ", -" ..XXXXXXo.. ", -" .XXXXXo.. ", -" @#######@ ", -" @@@@@@@@@ ", -" @#######@ ", -" @@@@@@@@@ ", -" @#######@ ", -" @@@@@@@ ", -" ### ", -" $$$ ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" " -}; diff --git a/Externals/wxWidgets3/art/gtk/question.xpm b/Externals/wxWidgets3/art/gtk/question.xpm deleted file mode 100644 index cb0001ec80..0000000000 --- a/Externals/wxWidgets3/art/gtk/question.xpm +++ /dev/null @@ -1,75 +0,0 @@ -/* XPM */ -static const char *const question_xpm[] = { -/* columns rows colors chars-per-pixel */ -"48 48 21 1", -". c Black", -"> c #696969", -"O c #1F1F00", -"+ c #181818", -"o c #F6F900", -"; c #3F3F00", -"$ c #111111", -" c None", -"& c #202020", -"X c #AAAA00", -"@ c #949400", -": c #303030", -"1 c #383838", -"% c #2A2A00", -", c #404040", -"= c #B4B400", -"- c #484848", -"# c #151500", -"< c #9F9F00", -"2 c #6A6A00", -"* c #353500", -/* pixels */ -" ", -" ", -" ", -" ", -" ......... ", -" ...XXXXXXX.. ", -" ..XXXXoooooXXXO+ ", -" ..XXooooooooooooX@.. ", -" ..XoooooooooooooooXX#. ", -" $%XoooooooooooooooooXX#. ", -" &.XoooooooXXXXXXooooooXX.. ", -" .XooooooXX.$...$XXoooooX*. ", -" $.XoooooX%.$ .*oooooo=.. ", -" .XooooooX.. -.XoooooX.. ", -" .XoooooX..+ .XoooooX;. ", -" ...XXXX..: .XoooooX;. ", -" ........ >.XoooooX;. ", -" +.XoooooX.. ", -" ,.Xoooooo<.. ", -" 1#XooooooXO.. ", -" &#XooooooX2.. ", -" $%XooooooXX.. ", -" $%XooooooXX.. ", -" $%XooooooXX.. ", -" &.XooooooXX.. ", -" .XooooooXX.. ", -" &.XoooooXX.. ", -" ..XooooXX.. ", -" ..XooooX... ", -" ..XXooXX..& ", -" ...XXXXX.. ", -" ........ ", -" ", -" ", -" ....... ", -" ..XXXXX.. ", -" ..XXoooXX.. ", -" ..XoooooX.. ", -" ..XoooooX.. ", -" ..XXoooXX.. ", -" ..XXXXX.. ", -" ....... ", -" ", -" ", -" ", -" ", -" ", -" " -}; diff --git a/Externals/wxWidgets3/art/gtk/warning.xpm b/Externals/wxWidgets3/art/gtk/warning.xpm deleted file mode 100644 index 58aee153fe..0000000000 --- a/Externals/wxWidgets3/art/gtk/warning.xpm +++ /dev/null @@ -1,63 +0,0 @@ -/* XPM */ -static const char *const warning_xpm[] = { -/* columns rows colors chars-per-pixel */ -"48 48 9 1", -"@ c Black", -"o c #A6A800", -"+ c #8A8C00", -"$ c #B8BA00", -" c None", -"O c #6E7000", -"X c #DCDF00", -". c #C00000", -"# c #373800", -/* pixels */ -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" . ", -" ... ", -" ... ", -" ..... ", -" ...X.. ", -" ..XXX.. ", -" ...XXX... ", -" ..XXXXX.. ", -" ..XXXXXX... ", -" ...XXoO+XX.. ", -" ..XXXO@#XXX.. ", -" ..XXXXO@#XXX... ", -" ...XXXXO@#XXXX.. ", -" ..XXXXXO@#XXXX... ", -" ...XXXXXo@OXXXXX.. ", -" ...XXXXXXo@OXXXXXX.. ", -" ..XXXXXXX$@OXXXXXX... ", -" ...XXXXXXXX@XXXXXXXX.. ", -" ...XXXXXXXXXXXXXXXXXX... ", -" ..XXXXXXXXXXOXXXXXXXXX.. ", -" ...XXXXXXXXXO@#XXXXXXXXX.. ", -" ..XXXXXXXXXXX#XXXXXXXXXX... ", -" ...XXXXXXXXXXXXXXXXXXXXXXX.. ", -" ...XXXXXXXXXXXXXXXXXXXXXXXX... ", -" .............................. ", -" .............................. ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" " -}; diff --git a/Externals/wxWidgets3/art/harddisk.xpm b/Externals/wxWidgets3/art/harddisk.xpm deleted file mode 100644 index d21ebf3c3b..0000000000 --- a/Externals/wxWidgets3/art/harddisk.xpm +++ /dev/null @@ -1,60 +0,0 @@ -/* XPM */ -static const char *const harddisk_xpm[] = { -/* columns rows colors chars-per-pixel */ -"16 15 39 1", -"7 c #E3E4E6", -"4 c #FFFFFF", -"5 c #839CB5", -". c #547897", -"1 c #4D7492", -"@ c #376485", -"o c #7A92A3", -"u c #D1D9E5", -"y c #446A8C", -"i c #51B03D", -"> c #CAD2DC", -"O c #718BA7", -"2 c #65839D", -"6 c #DCE2EA", -"0 c #C3C5C8", -"9 c #F5F6F7", -": c #EBEBEC", -"< c #597B9A", -"t c #C6CCD3", -" c None", -"* c #DFE0E2", -"e c #467291", -"a c #526E8B", -", c #7393AB", -"p c #130A0B", -"# c #AABFCD", -"r c #B4C4D3", -"; c #CFCFD0", -"X c #6F90A6", -"+ c #6A89A2", -"- c #D2D3D4", -"= c #DCDBDA", -"w c #E4E9ED", -"q c #C6C8CA", -"% c #215579", -"$ c #E7E7E7", -"3 c #7F97B0", -"8 c #C0D1DC", -"& c #5D7C93", -/* pixels */ -" ", -" .XoooXO+@ ", -" #$$%%%%$$$X ", -" &$*==-;$$$& ", -" &:>+,<1234o5 ", -" ###+67;;78242 ", -" &4,49*0q*9we4. ", -" &4+49*,,*9wo4. ", -"&4%r,67;;782t%4.", -"&44468rrrr84444,", -"y11111111111111e", -"1uu1:::::::::::1", -"1uu1::::::::ip:1", -"auu&:::::::::::1", -"1111111111111111" -}; diff --git a/Externals/wxWidgets3/art/helpicon.xpm b/Externals/wxWidgets3/art/helpicon.xpm deleted file mode 100644 index 9b4cd44450..0000000000 --- a/Externals/wxWidgets3/art/helpicon.xpm +++ /dev/null @@ -1,44 +0,0 @@ -/* XPM */ -static const char *const helpicon_xpm[] = { -/* columns rows colors chars-per-pixel */ -"32 32 6 1", -" c Gray0", -". c Blue", -"X c #808080808080", -"o c #c0c0c0c0c0c0", -"O c Gray100", -"+ c None", -/* pixels */ -"+++++++++++XXXXXXXX+++++++++++++", -"++++++++XXXoOOOOOOoXXX++++++++++", -"++++++XXoOOOOOOOOOOOOoXX++++++++", -"+++++XoOOOOOOOOOOOOOOOOoX+++++++", -"++++XOOOOOOOOOOOOOOOOOOOO ++++++", -"+++XOOOOOOOo......oOOOOOOO +++++", -"++XOOOOOOOo.oOO....oOOOOOOO ++++", -"+XoOOOOOOO..OOOO....OOOOOOOo +++", -"+XOOOOOOOO....OO....OOOOOOOO X++", -"XoOOOOOOOO....Oo....OOOOOOOOo X+", -"XOOOOOOOOOo..oO....OOOOOOOOOO X+", -"XOOOOOOOOOOOOOo...OOOOOOOOOOO XX", -"XOOOOOOOOOOOOO...OOOOOOOOOOOO XX", -"XOOOOOOOOOOOOO..oOOOOOOOOOOOO XX", -"XOOOOOOOOOOOOO..OOOOOOOOOOOOO XX", -"XoOOOOOOOOOOOOOOOOOOOOOOOOOOo XX", -"+XOOOOOOOOOOOo..oOOOOOOOOOOO XXX", -"+XoOOOOOOOOOO....OOOOOOOOOOo XXX", -"++XOOOOOOOOOO....OOOOOOOOOO XXX+", -"+++ OOOOOOOOOo..oOOOOOOOOO XXXX+", -"++++ OOOOOOOOOOOOOOOOOOOO XXXX++", -"+++++ oOOOOOOOOOOOOOOOOo XXXX+++", -"++++++ oOOOOOOOOOOOOo XXXX++++", -"+++++++X oOOOOOOo XXXXX+++++", -"++++++++XXX oOOO XXXXXXX++++++", -"++++++++++XXXX OOO XXXXX++++++++", -"+++++++++++++X OOO XX+++++++++++", -"+++++++++++++++ OO XX+++++++++++", -"++++++++++++++++ O XX+++++++++++", -"+++++++++++++++++ XX+++++++++++", -"++++++++++++++++++XXX+++++++++++", -"+++++++++++++++++++XX+++++++++++" -}; diff --git a/Externals/wxWidgets3/art/home.xpm b/Externals/wxWidgets3/art/home.xpm deleted file mode 100644 index d0da8d26b8..0000000000 --- a/Externals/wxWidgets3/art/home.xpm +++ /dev/null @@ -1,24 +0,0 @@ -/* XPM */ -static const char *const home_xpm[] = { -/* columns rows colors chars-per-pixel */ -"16 15 3 1", -". c Black", -"X c #FFFFFF", -" c None", -/* pixels */ -" .... ", -" .XXXX. ", -" .XXXXXX. ", -" .XXXXXXXX. ", -" .XXXXXXXXXX. ", -" .............. ", -" .XXXXXXXXXXXX. ", -" .XXXXXXXXXXXX. ", -" .XXXXXXXXXXXX. ", -" .X.....X....X. ", -" .X. .X. .X. ", -" .X. .X. .X. ", -" .X.....X. .X. ", -" .XXXXXXX. .X. ", -" ......... ... " -}; diff --git a/Externals/wxWidgets3/art/htmbook.xpm b/Externals/wxWidgets3/art/htmbook.xpm deleted file mode 100644 index d0456ee6d5..0000000000 --- a/Externals/wxWidgets3/art/htmbook.xpm +++ /dev/null @@ -1,25 +0,0 @@ -/* XPM */ -static const char *const htmbook_xpm[] = { -"16 16 6 1", -" c None", -". c Black", -"X c #000080", -"o c #c0c0c0", -"O c #808080", -"+ c Gray100", -" ", -" .. ", -" ..XX. ", -" ..XXXXX. ", -" ..XXXXXXXX. ", -".oXXXXXXXXXX. ", -".XoXXXXXXXXXX. ", -".XXoXXXXXXXXXX. ", -".XXXoXXXXXXXXX..", -".XXXXoXXXXXX..O ", -" .XXXXoXXX..O+O ", -" .XXXXo..O++o..", -" .XXX.O+++o.. ", -" .XX.o+o.. ", -" .X.o.. ", -" ... "}; diff --git a/Externals/wxWidgets3/art/htmfoldr.xpm b/Externals/wxWidgets3/art/htmfoldr.xpm deleted file mode 100644 index 4f84e8aeff..0000000000 --- a/Externals/wxWidgets3/art/htmfoldr.xpm +++ /dev/null @@ -1,25 +0,0 @@ -/* XPM */ -static const char *const htmfoldr_xpm[] = { -"16 16 6 1", -" c None", -". c Black", -"X c #000080", -"o c #c0c0c0", -"O c #808080", -"+ c Gray100", -" ", -" .. ", -" ..XX. ", -" ..XXXXX. ", -" ..XXXXXXXX. ", -".oXXXXXXXXXX. ", -".XoXXXXXXXXXX. ", -".XXoXXXXXXXXXX. ", -".XXXoXXXXXXXXX..", -".XXXXoXXXXXX..O ", -" .XXXXoXXX..O+O ", -" .XXXXo..O++o..", -" .XXX.O+++o.. ", -" .XX.o+o.. ", -" .X.o.. ", -" ... "}; diff --git a/Externals/wxWidgets3/art/htmoptns.xpm b/Externals/wxWidgets3/art/htmoptns.xpm deleted file mode 100644 index 0d178ab2e1..0000000000 --- a/Externals/wxWidgets3/art/htmoptns.xpm +++ /dev/null @@ -1,20 +0,0 @@ -/* XPM */ -static const char *const htmoptns_xpm[] = { -"16 15 2 1", -" c None", -". c #000000", -" ", -" .. ", -" ... ", -" .... ", -" . ... ", -" .. ... ", -" . .. ", -" .. ... ", -" . .. ", -" ......... ", -" .. ... ", -" . ... ", -" .. ... ", -" .... ....... ", -" "}; diff --git a/Externals/wxWidgets3/art/htmpage.xpm b/Externals/wxWidgets3/art/htmpage.xpm deleted file mode 100644 index f7d9f472ab..0000000000 --- a/Externals/wxWidgets3/art/htmpage.xpm +++ /dev/null @@ -1,23 +0,0 @@ -/* XPM */ -static const char *const htmpage_xpm[] = { -"16 16 4 1", -" c None", -". c #808080", -"X c Gray100", -"o c Black", -" ", -" .......... ", -" .XXXXXXXX.. ", -" .XXXXXXXXooo ", -" .X......XXXo ", -" .XXXXXXXXXXo ", -" .X........Xo ", -" .XXXXXXXXXXo ", -" .X........Xo ", -" .XXXXXXXXXXo ", -" .X........Xo ", -" .XXXXXXXXXXo ", -" .X........Xo ", -" .XXXXXXXXXXo ", -" .XXXXXXXXXXo ", -" oooooooooooo "}; diff --git a/Externals/wxWidgets3/art/htmsidep.xpm b/Externals/wxWidgets3/art/htmsidep.xpm deleted file mode 100644 index 19bb863730..0000000000 --- a/Externals/wxWidgets3/art/htmsidep.xpm +++ /dev/null @@ -1,27 +0,0 @@ -/* XPM */ -static const char *const htmsidep_xpm[] = { -/* columns rows colors chars-per-pixel */ -"16 15 6 1", -". c Black", -"X c #FFFFFF", -"+ c #808080", -" c None", -"O c #0000C0", -"o c #C0C0C0", -/* pixels */ -" ", -" .............. ", -" .XXXX.ooooooo. ", -" .XOXX.oo...oo. ", -" .XXOX.ooooooo. ", -" .OOOO.o...+.o. ", -" .XXOX.ooooooo. ", -" .XOXX.ooooooo. ", -" .XXXX.o..+ooo. ", -" .XXOX.ooooooo. ", -" .XOXX.o...+.o. ", -" .OOOO.ooooooo. ", -" .XOXX.o.+...o. ", -" .XXOX.ooooooo. ", -" .............. " -}; diff --git a/Externals/wxWidgets3/art/last.xpm b/Externals/wxWidgets3/art/last.xpm deleted file mode 100644 index 66c3bd3382..0000000000 --- a/Externals/wxWidgets3/art/last.xpm +++ /dev/null @@ -1,22 +0,0 @@ -/* XPM */ -static const char *const last_xpm[] = { -"16 16 3 1", -" c None", -". c Black", -"X c Gray100", -" ", -" ", -" . ...", -" .. ...", -" .X. ...", -" ........XX. ...", -" .XXXXXXXXXX....", -" .XXXXXXXXXXX...", -" .XXXXXXXXXXX...", -" .XXXXXXXXXX....", -" ........XX. ...", -" .X. ...", -" .. ...", -" . ...", -" ", -" "}; diff --git a/Externals/wxWidgets3/art/listview.xpm b/Externals/wxWidgets3/art/listview.xpm deleted file mode 100644 index 2d8afc4198..0000000000 --- a/Externals/wxWidgets3/art/listview.xpm +++ /dev/null @@ -1,25 +0,0 @@ -/* XPM */ -static const char *const listview_xpm[] = { -/* columns rows colors chars-per-pixel */ -"16 15 4 1", -" c Black", -". c #FFFFFF", -"X c #000084", -"o c #848484", -/* pixels */ -" ", -" .............. ", -" .XXX.......... ", -" .XXX. o o . ", -" .XXX.......... ", -" .............. ", -" .XXX.......... ", -" .XXX. o . ", -" .XXX.......... ", -" .............. ", -" .XXX.......... ", -" .XXX. o o . ", -" .XXX.......... ", -" .............. ", -" " -}; diff --git a/Externals/wxWidgets3/art/minus.xpm b/Externals/wxWidgets3/art/minus.xpm deleted file mode 100644 index d8cc34f362..0000000000 --- a/Externals/wxWidgets3/art/minus.xpm +++ /dev/null @@ -1,22 +0,0 @@ -/* XPM */ -static const char *const minus_xpm[] = { -"16 16 3 1", -" c None", -". c Black", -"X c Gray100", -" ", -" ", -" ", -" ", -" ", -" ", -" .............. ", -" .XXXXXXXXXXXX. ", -" .XXXXXXXXXXXX. ", -" .............. ", -" ", -" ", -" ", -" ", -" ", -" "}; diff --git a/Externals/wxWidgets3/art/missimg.xpm b/Externals/wxWidgets3/art/missimg.xpm deleted file mode 100644 index 599aca7896..0000000000 --- a/Externals/wxWidgets3/art/missimg.xpm +++ /dev/null @@ -1,43 +0,0 @@ -/* XPM */ -static const char *const missimg_xpm[] = { -/* columns rows colors chars-per-pixel */ -"32 32 5 1", -"X c Black", -"o c #FFFFFF", -" c None", -". c #C0C0C0", -"O c #E0E0E0", -/* pixels */ -" .............................X ", -" .ooooooooooooooooooooooooooooX ", -" .ooooooooooooooooooooooooooooX ", -" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ", -" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ", -" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ", -" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ", -" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ", -" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ", -" .ooOOOOOOOXOOOOOOOOOOOOOOOOooX ", -" XXXOOOOOXX XOOOOOOOOOOOOOOOooX ", -" XXXXX XOOOOOOOOOOOOOOooX ", -" XOOOXXXOOOOOOOooX ", -" XXX XXOOOOOooX ", -" XOOOOooX ", -" . XOOOooX ", -" .. XXOooX ", -" .o.. XooX ", -" .ooO... XXX ", -" .ooOOOO.......... ", -" .ooOOOOOOOOOOOOOO.. ", -" .ooOOOOOOOOOOOOOOOO.. ", -" .ooOOOOOOOOOOOOOOOOOO......... ", -" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ", -" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ", -" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ", -" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ", -" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ", -" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ", -" .ooooooooooooooooooooooooooooX ", -" .ooooooooooooooooooooooooooooX ", -" XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX " -}; diff --git a/Externals/wxWidgets3/art/motif/error.xpm b/Externals/wxWidgets3/art/motif/error.xpm deleted file mode 100644 index 559715c64c..0000000000 --- a/Externals/wxWidgets3/art/motif/error.xpm +++ /dev/null @@ -1,58 +0,0 @@ -/* XPM */ -static const char *const error_xpm[] = { -/* columns rows colors chars-per-pixel */ -"48 48 4 1", -" c None", -"X c #242424", -"o c #DCDF00", -". c #C00000", -/* pixels */ -" ", -" ", -" ", -" ", -" ", -" ..... ", -" ............. ", -" ................. ", -" ................... ", -" ....................... ", -" ......................... ", -" ........................... ", -" ...........................X ", -" .............................X ", -" ............................... ", -" ...............................X ", -" .................................X ", -" .................................X ", -" .................................XX ", -" ...ooooooooooooooooooooooooooo...XX ", -" ....ooooooooooooooooooooooooooo....X ", -" ....ooooooooooooooooooooooooooo....X ", -" ....ooooooooooooooooooooooooooo....XX ", -" ....ooooooooooooooooooooooooooo....XX ", -" ....ooooooooooooooooooooooooooo....XX ", -" ...ooooooooooooooooooooooooooo...XXX ", -" ...ooooooooooooooooooooooooooo...XXX ", -" .................................XX ", -" .................................XX ", -" ...............................XXX ", -" ...............................XXX ", -" .............................XXX ", -" ...........................XXXX ", -" ...........................XXX ", -" .........................XXX ", -" .......................XXXX ", -" X...................XXXXX ", -" X.................XXXXX ", -" X.............XXXXX ", -" XXXX.....XXXXXXXX ", -" XXXXXXXXXXXXX ", -" XXXXX ", -" ", -" ", -" ", -" ", -" ", -" " -}; diff --git a/Externals/wxWidgets3/art/motif/info.xpm b/Externals/wxWidgets3/art/motif/info.xpm deleted file mode 100644 index fe32e61982..0000000000 --- a/Externals/wxWidgets3/art/motif/info.xpm +++ /dev/null @@ -1,63 +0,0 @@ -/* XPM */ -static const char *const info_xpm[] = { -/* columns rows colors chars-per-pixel */ -"48 48 9 1", -"$ c Black", -"O c #FFFFFF", -"@ c #808080", -"+ c #000080", -"o c #E8EB01", -" c None", -"X c #FFFF40", -"# c #C0C0C0", -". c #ABAD01", -/* pixels */ -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ..... ", -" ..XXXXX.. ", -" ..XXXXXXXXo.. ", -" .XXXOXXXXXXXoo. ", -" .XOOXXX+XXXXXo. ", -" .XOOOXX+++XXXXoo. ", -" .XOOXXX+++XXXXXo. ", -" .XOOOXXX+++XXXXXXo. ", -" .XOOXXXX+++XXXXXXo. ", -" .XXXXXXX+++XXXXXXX. ", -" .XXXXXXX+++XXXXXXo. ", -" .XXXXXXX+++XXXXXoo. ", -" .XXXXXX+++XXXXXo. ", -" .XXXXXXX+XXXXXXo. ", -" .XXXXXXXXXXXXo. ", -" .XXXXX+++XXXoo. ", -" .XXXX+++XXoo. ", -" .XXXXXXXXo. ", -" ..XXXXXXo.. ", -" .XXXXXo.. ", -" @#######@ ", -" @@@@@@@@@ ", -" @#######@ ", -" @@@@@@@@@ ", -" @#######@ ", -" @@@@@@@ ", -" ### ", -" $$$ ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" " -}; diff --git a/Externals/wxWidgets3/art/motif/question.xpm b/Externals/wxWidgets3/art/motif/question.xpm deleted file mode 100644 index cb0001ec80..0000000000 --- a/Externals/wxWidgets3/art/motif/question.xpm +++ /dev/null @@ -1,75 +0,0 @@ -/* XPM */ -static const char *const question_xpm[] = { -/* columns rows colors chars-per-pixel */ -"48 48 21 1", -". c Black", -"> c #696969", -"O c #1F1F00", -"+ c #181818", -"o c #F6F900", -"; c #3F3F00", -"$ c #111111", -" c None", -"& c #202020", -"X c #AAAA00", -"@ c #949400", -": c #303030", -"1 c #383838", -"% c #2A2A00", -", c #404040", -"= c #B4B400", -"- c #484848", -"# c #151500", -"< c #9F9F00", -"2 c #6A6A00", -"* c #353500", -/* pixels */ -" ", -" ", -" ", -" ", -" ......... ", -" ...XXXXXXX.. ", -" ..XXXXoooooXXXO+ ", -" ..XXooooooooooooX@.. ", -" ..XoooooooooooooooXX#. ", -" $%XoooooooooooooooooXX#. ", -" &.XoooooooXXXXXXooooooXX.. ", -" .XooooooXX.$...$XXoooooX*. ", -" $.XoooooX%.$ .*oooooo=.. ", -" .XooooooX.. -.XoooooX.. ", -" .XoooooX..+ .XoooooX;. ", -" ...XXXX..: .XoooooX;. ", -" ........ >.XoooooX;. ", -" +.XoooooX.. ", -" ,.Xoooooo<.. ", -" 1#XooooooXO.. ", -" &#XooooooX2.. ", -" $%XooooooXX.. ", -" $%XooooooXX.. ", -" $%XooooooXX.. ", -" &.XooooooXX.. ", -" .XooooooXX.. ", -" &.XoooooXX.. ", -" ..XooooXX.. ", -" ..XooooX... ", -" ..XXooXX..& ", -" ...XXXXX.. ", -" ........ ", -" ", -" ", -" ....... ", -" ..XXXXX.. ", -" ..XXoooXX.. ", -" ..XoooooX.. ", -" ..XoooooX.. ", -" ..XXoooXX.. ", -" ..XXXXX.. ", -" ....... ", -" ", -" ", -" ", -" ", -" ", -" " -}; diff --git a/Externals/wxWidgets3/art/motif/warning.xpm b/Externals/wxWidgets3/art/motif/warning.xpm deleted file mode 100644 index 58aee153fe..0000000000 --- a/Externals/wxWidgets3/art/motif/warning.xpm +++ /dev/null @@ -1,63 +0,0 @@ -/* XPM */ -static const char *const warning_xpm[] = { -/* columns rows colors chars-per-pixel */ -"48 48 9 1", -"@ c Black", -"o c #A6A800", -"+ c #8A8C00", -"$ c #B8BA00", -" c None", -"O c #6E7000", -"X c #DCDF00", -". c #C00000", -"# c #373800", -/* pixels */ -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" . ", -" ... ", -" ... ", -" ..... ", -" ...X.. ", -" ..XXX.. ", -" ...XXX... ", -" ..XXXXX.. ", -" ..XXXXXX... ", -" ...XXoO+XX.. ", -" ..XXXO@#XXX.. ", -" ..XXXXO@#XXX... ", -" ...XXXXO@#XXXX.. ", -" ..XXXXXO@#XXXX... ", -" ...XXXXXo@OXXXXX.. ", -" ...XXXXXXo@OXXXXXX.. ", -" ..XXXXXXX$@OXXXXXX... ", -" ...XXXXXXXX@XXXXXXXX.. ", -" ...XXXXXXXXXXXXXXXXXX... ", -" ..XXXXXXXXXXOXXXXXXXXX.. ", -" ...XXXXXXXXXO@#XXXXXXXXX.. ", -" ..XXXXXXXXXXX#XXXXXXXXXX... ", -" ...XXXXXXXXXXXXXXXXXXXXXXX.. ", -" ...XXXXXXXXXXXXXXXXXXXXXXXX... ", -" .............................. ", -" .............................. ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" " -}; diff --git a/Externals/wxWidgets3/art/new.xpm b/Externals/wxWidgets3/art/new.xpm deleted file mode 100644 index 15826c8d22..0000000000 --- a/Externals/wxWidgets3/art/new.xpm +++ /dev/null @@ -1,50 +0,0 @@ -/* XPM */ -static const char *const new_xpm[] = { -/* columns rows colors chars-per-pixel */ -"16 15 29 1", -"* c #97C4E7", -"- c #72A8D2", -": c #FFFFFF", -"9 c #839CB5", -"o c #6B98B8", -"X c #5A89A6", -"# c #3A749C", -", c #D1E5F5", -"0 c #85A7BC", -"$ c #C3DDF1", -"8 c #749BB4", -"; c #5F9BC8", -" c None", -"+ c #538DB3", -"= c #85BBE2", -"3 c #EFF6FC", -"O c #6591AE", -"5 c #F7FBFD", -"7 c #FAFCFE", -"< c #DAEAF7", -"4 c #E9F3FA", -"6 c #FDFDFE", -"1 c #E2EFF8", -". c #8EA9BC", -"% c #B6D5EE", -"& c #A5CCEA", -"> c #ACE95B", -"2 c #F4F9FD", -"@ c #4581AA", -/* pixels */ -" .XoOO+@#. ", -" .$$%&*=O-; ", -" @@@@$%&*O:*o ", -" @>>@$$%&O::*o ", -"@@@>>@@@$%OOoO+ ", -"@>>>>>>@,$%&*=+ ", -"@>>>>>>@<,$%&*+ ", -"@@@>>@@@1<,$%&O ", -" @>>@2341<,$%O ", -" @@@@52341<,$o ", -" .:6752341<,8 ", -" .::6752341<8 ", -" .:::67523419 ", -" .::::6752340 ", -" ............ " -}; diff --git a/Externals/wxWidgets3/art/new_dir.xpm b/Externals/wxWidgets3/art/new_dir.xpm deleted file mode 100644 index f49515e71b..0000000000 --- a/Externals/wxWidgets3/art/new_dir.xpm +++ /dev/null @@ -1,43 +0,0 @@ -/* XPM */ -static const char *const new_dir_xpm[] = { -/* columns rows colors chars-per-pixel */ -"16 15 22 1", -"X c Black", -"> c #9BACC2", -"o c #547897", -"1 c #7F99B4", -"O c #D1D9E5", -"< c #EAEDF3", -"# c #CAD2DC", -"3 c #718BA7", -"@ c #BECAD9", -"& c #E1E6EE", -"; c #F5F6F7", -". c #FFFF00", -", c #8DA0B9", -" c None", -"% c #D6DFE7", -"$ c #D2D9E0", -"- c #ADBACE", -"= c #EEF1F3", -"+ c #B3BFD1", -"2 c #7A90AC", -": c #A2B3C5", -"* c #E5EAF1", -/* pixels */ -" .X .XX.", -" ooooo .X.X. ", -" oOOOOo XX...XX", -" oooooooo.......", -" o+@#$%&*XX...XX", -" o+@#$%&*=.X.X. ", -" o-+@#O%&.X;.X .", -" o:-+@#O%&*=;o ", -" o>:-+@#O%&*=o ", -" o,>:-+@#O%&:-+@#O%&o ", -" o21,>:-+@#O%o ", -" o321,>:-+@#Oo ", -" ooooooooooooo ", -" " -}; diff --git a/Externals/wxWidgets3/art/paste.xpm b/Externals/wxWidgets3/art/paste.xpm deleted file mode 100644 index a2155a3e9b..0000000000 --- a/Externals/wxWidgets3/art/paste.xpm +++ /dev/null @@ -1,46 +0,0 @@ -/* XPM */ -static const char *const paste_xpm[] = { -/* columns rows colors chars-per-pixel */ -"16 15 25 1", -"< c #FEECE4", -"> c #FEE3D7", -"O c #FFFFFF", -"o c #7B767D", -"% c #F79586", -"& c #CAE1F3", -"@ c #F08B62", -"# c #FCCBB8", -"- c #FDD8C9", -"4 c #FFF8F4", -"5 c #FFF5F0", -" c None", -"$ c #F8AA8F", -", c #EFF6FC", -"1 c #F7FBFD", -"2 c #FAFCFE", -"; c #DAEAF7", -": c #E9F3FA", -"6 c #FFFAF8", -". c #3C78A6", -"3 c #FFF1ED", -"X c #9B8687", -"+ c #FBBCA4", -"* c #B6D5EE", -"= c #F4F9FD", -/* pixels */ -" ...... ", -" .XoOOOOoo. ", -".+XOOOOOOX@. ", -".+XXXXXXXX@. ", -".#++$$%@..... ", -".##++$$%.&*.=. ", -".-##++$$.;&.==. ", -".--##++$.:;.... ", -".>--##++.,:;&*. ", -".<>--##+.1,:;&. ", -".<<>--##.21,:;. ", -".3<<>--#.O21=:. ", -".45<<>--....... ", -".6453<>----. ", -"............ " -}; diff --git a/Externals/wxWidgets3/art/plus.xpm b/Externals/wxWidgets3/art/plus.xpm deleted file mode 100644 index 25d299b305..0000000000 --- a/Externals/wxWidgets3/art/plus.xpm +++ /dev/null @@ -1,22 +0,0 @@ -/* XPM */ -static const char *const plus_xpm[] = { -"16 16 3 1", -" c None", -". c Black", -"X c Gray100", -" ", -" ", -" .... ", -" .XX. ", -" .XX. ", -" .XX. ", -" ......XX...... ", -" .XXXXXXXXXXXX. ", -" .XXXXXXXXXXXX. ", -" ......XX...... ", -" .XX. ", -" .XX. ", -" .XX. ", -" .... ", -" ", -" "}; diff --git a/Externals/wxWidgets3/art/print.xpm b/Externals/wxWidgets3/art/print.xpm deleted file mode 100644 index 9afe540134..0000000000 --- a/Externals/wxWidgets3/art/print.xpm +++ /dev/null @@ -1,60 +0,0 @@ -/* XPM */ -static const char *const print_xpm[] = { -/* columns rows colors chars-per-pixel */ -"16 15 39 1", -"< c #E3E4E6", -"+ c #C3C3C4", -"i c #FFFFFF", -": c #74879B", -"# c #5A89A6", -"a c #F1F4F7", -"r c #5A809C", -"@ c #BDCCD9", -"e c #7A92A4", -"% c #3F6F93", -"t c #9FA2A6", -"3 c #939495", -"w c #5F666D", -"9 c #65839E", -"5 c #4A7291", -"$ c #4B7F9E", -" c None", -"O c #DFE0E2", -"o c #F3F3F3", -"; c #84A5BB", -"& c #467291", -". c #7897AD", -"* c #407598", -"4 c #CFCFD0", -"7 c #6F90A6", -"y c #6A89A2", -"0 c #AAADB2", -"1 c #D2D3D4", -"u c #4F7592", -", c #BCBDBE", -"p c #57778E", -"q c #979BA0", -"2 c #ABABAC", -"- c #E7E7E7", -"= c #D6DEE6", -"> c #9FA0A0", -"8 c #829EB5", -"X c #8FB0C3", -"6 c #5D7C93", -/* pixels */ -" .XXXXXXXX ", -" .oooooooX ", -" .OOOOOOOX ", -" .+++++++X ", -"@##$%&&&&&%*##@ ", -"$=-;:>,<123$-=$ ", -".44.5678.96$44. ", -"7,,,,,,,,,,,,,7 ", -"900qwwwwwwwe009 ", -"rtt9ryyyyyyuttr ", -"6qq6iiiiiii%qq6 ", -"633paiiiiii%336 ", -"XXX*iiiiiii%XXX ", -" 6iiiiiii% ", -" $XXXXXXX# " -}; diff --git a/Externals/wxWidgets3/art/quit.xpm b/Externals/wxWidgets3/art/quit.xpm deleted file mode 100644 index df8abd675d..0000000000 --- a/Externals/wxWidgets3/art/quit.xpm +++ /dev/null @@ -1,90 +0,0 @@ -/* XPM */ -static const char *const quit_xpm[] = { -/* columns rows colors chars-per-pixel */ -"16 15 69 1", -"@ c Black", -"i c #9AEA53", -"D c #7E9BB1", -"H c #839FB4", -", c #B7C7D3", -"8 c #BCCBD6", -"7 c #C1CFDA", -"v c #92ABBD", -"- c #D0DBE2", -"O c #547897", -"+ c #376485", -"L c #7090A8", -"t c #AEC0CE", -"g c #B3C4D1", -"S c #84A0B4", -"G c #89A4B8", -"> c #BDCCD7", -"F c #5A809C", -"2 c #C2D0DA", -"k c #93ACBE", -"= c #D6E0E6", -"* c #446A8C", -"z c #A5B9C8", -"# c #DEE5EB", -"0 c #AFC1CE", -"r c #B4C5D2", -"p c #B9C9D5", -"A c #8AA5B8", -"M c #92AABD", -"j c #A6BAC9", -"K c #7796AC", -"l c #ABBECC", -"o c #E4EAEF", -"9 c #B5C6D2", -" c None", -"; c #C9D6DF", -"X c #305F81", -"m c #98AFC0", -"V c #9DB3C3", -"% c #D1DBE3", -"u c #A2B7C6", -"y c #A7BBCA", -"h c #ACBFCD", -"4 c #B6C7D3", -"w c #C0CFD9", -"d c #982106", -"B c #85A0B5", -"6 c #C8D4DE", -"c c #99B0C1", -"x c #9EB4C4", -"$ c #D7E0E7", -"q c #A8BCCA", -"s c #ADC0CD", -"3 c #BCCCD7", -"N c #8BA5B9", -": c #C4D1DB", -"1 c #C9D5DE", -"f c #9AB1C2", -"n c #A4B9C8", -"a c #B3C5D1", -". c #215579", -"J c #7D9AB0", -"& c #829EB5", -"e c #BBCAD6", -"b c #8CA6B9", -"Z c #91AABC", -"C c #96AEC0", -"< c #CFDAE2", -"5 c #AFC2CF", -/* pixels */ -" ..XXXXXXXXXX ", -" XoO+X@@@@@@X ", -" X#$%&X*@@@@X ", -" X=-;:>,X@@@X ", -" X<12345X@@@X ", -" X67890qX@XXX ", -" XwertyuX@XiX ", -" XpasddfX++iiX ", -" XghjddkXiiiiiX ", -" XlzxcvbXiiiiiiX", -" XnxmMNBXiiiiiX ", -" XVCZASDXXXiiX ", -" XXFGHJKX XiX ", -" FXXFLX XX ", -" XX* " -}; diff --git a/Externals/wxWidgets3/art/redo.xpm b/Externals/wxWidgets3/art/redo.xpm deleted file mode 100644 index d20afdcc8c..0000000000 --- a/Externals/wxWidgets3/art/redo.xpm +++ /dev/null @@ -1,58 +0,0 @@ -/* XPM */ -static const char *const redo_xpm[] = { -/* columns rows colors chars-per-pixel */ -"16 15 37 1", -"4 c #9BACC2", -"; c #4C7398", -"3 c #547B99", -"* c #547897", -"# c #5A89A6", -"8 c #3A749C", -"5 c #5A809C", -", c #7F99B4", -"& c #3F6F93", -"9 c #85A7BC", -"+ c #749BB4", -"> c #718BA7", -"e c #A5B3C8", -"w c #BECAD9", -": c #65839D", -"u c #E1E6EE", -"o c #236289", -"r c #ADBED2", -"= c #597B9A", -"2 c #8DA0B9", -" c None", -"% c #467291", -"1 c #7393AB", -"i c #4C809F", -"- c #A0BACB", -"O c #6591AE", -"X c #407598", -"6 c #6F90A6", -"t c #D2D9E0", -"7 c #ADBACE", -"@ c #326A8F", -"0 c #467A9C", -". c #ACC4D3", -"< c #7F97B0", -"y c #B3BFD1", -"q c #A2B3C5", -"$ c #8FB0C3", -/* pixels */ -" .XoooO ", -" +o@@@@@o# +", -" $@%%&@&%%&@ +o", -" X*=@+-+@*=;@#&@", -" @:=+ @=:=*:@", -" &>:$ @:>>>@", -" &,,,,&", -" +123 @<2222&", -" X44X #@56<44X", -" O1748 .9#&o", -" 0qwe8 ", -" 8rty8 ", -" 8wu+ ", -" i## ", -" " -}; diff --git a/Externals/wxWidgets3/art/removable.xpm b/Externals/wxWidgets3/art/removable.xpm deleted file mode 100644 index 5b1d46b7dd..0000000000 --- a/Externals/wxWidgets3/art/removable.xpm +++ /dev/null @@ -1,44 +0,0 @@ -/* XPM */ -static const char *const removable_xpm[] = { -/* columns rows colors chars-per-pixel */ -"16 15 23 1", -"@ c #C3C3C4", -"4 c #FFFFFF", -"o c #D5D6D8", -"> c #7A92A3", -". c #8497A5", -"% c #ACAEB2", -"2 c #4A7898", -": c #DCE2EA", -", c #F5F6F7", -"= c #EBEBEC", -"$ c #B7B7B8", -" c None", -"X c #DFE0E2", -"* c #A6A8AD", -"1 c #4C809F", -"3 c #407598", -"O c #CFCFD0", -"; c #9EA2A8", -"# c #BCBDBE", -"+ c #C6C8CA", -"- c #979BA0", -"& c #E7E7E7", -"< c #8FB0C3", -/* pixels */ -" ......... ", -" .XoO+@#$%. ", -" .XoO+@#$%. ", -" .&XoO+@#$%*. ", -" .&XoO+@#$%*. ", -" .=&XoO+@#$%*-. ", -" .=&XoO+@#$%*;. ", -".:=&XoO+@#$%*;>.", -".,=&XoO+@#$%*;-.", -"<..............<", -"<,=&XoO+@#$%%%%.", -" c #718BA7", -"0 c #A5B3C8", -"q c #BECAD9", -": c #65839D", -"u c #E1E6EE", -"X c #236289", -"y c #ADBED2", -"= c #597B9A", -"1 c #8DA0B9", -" c None", -"% c #467291", -"3 c #7393AB", -"i c #4C809F", -"; c #A0BACB", -". c #6591AE", -"o c #407598", -"5 c #6F90A6", -"t c #D2D9E0", -"9 c #ADBACE", -"# c #326A8F", -"e c #467A9C", -"O c #ACC4D3", -"< c #7F97B0", -"r c #B3BFD1", -"w c #A2B3C5", -"& c #8FB0C3", -/* pixels */ -" .XXXoO ", -"+ @X#####X+ ", -"X+ #$%%$#$%%#& ", -"#$@#*=-#+;+#=-o ", -"#:-=:=# +=:# ", -"#>>>:# &:>$ ", -"$,,,>o o<,$ ", -"$1111<# 213+ ", -"o44<56#@ o44o ", -"X$@7O 8493. ", -" 80qwe ", -" 8rty8 ", -" +uq8 ", -" @@i ", -" " -}; diff --git a/Externals/wxWidgets3/art/up.xpm b/Externals/wxWidgets3/art/up.xpm deleted file mode 100644 index a93009f95c..0000000000 --- a/Externals/wxWidgets3/art/up.xpm +++ /dev/null @@ -1,21 +0,0 @@ -/* XPM */ -static const char *const up_xpm[] = { -"16 15 3 1", -" c None", -". c Black", -"X c Gray100", -" ", -" .. ", -" .XX. ", -" .XXXX. ", -" .XXXXXX. ", -" .XXXXXXXX. ", -" ....XXXX.... ", -" .XXXX. ", -" .XXXX. ", -" .XXXX. ", -" .XXXX. ", -" .XXXX. ", -" .XXXX. ", -" ...... ", -" "}; diff --git a/Externals/wxWidgets3/art/wxwin.ico b/Externals/wxWidgets3/art/wxwin.ico deleted file mode 100644 index 0893f8c636..0000000000 Binary files a/Externals/wxWidgets3/art/wxwin.ico and /dev/null differ diff --git a/Externals/wxWidgets3/art/wxwin16x16.png b/Externals/wxWidgets3/art/wxwin16x16.png deleted file mode 100644 index 93e2ec1729..0000000000 Binary files a/Externals/wxWidgets3/art/wxwin16x16.png and /dev/null differ diff --git a/Externals/wxWidgets3/art/wxwin16x16.xpm b/Externals/wxWidgets3/art/wxwin16x16.xpm deleted file mode 100644 index ed1848ea75..0000000000 --- a/Externals/wxWidgets3/art/wxwin16x16.xpm +++ /dev/null @@ -1,161 +0,0 @@ -/* XPM */ -static const char *const wxwin16x16_xpm[] = { -"16 16 142 2", -" c None", -". c #7171C0", -"+ c #7D7DC7", -"@ c #8181CE", -"# c #7979CE", -"$ c #7171CE", -"% c #6868CD", -"& c #5050C0", -"* c #7C7CCB", -"= c #D3D3FC", -"- c #C0C0FF", -"; c #B1B1FF", -"> c #A4A4FF", -", c #9696FF", -"' c #6B6BE3", -") c #3E3EC0", -"! c #7B7BD3", -"~ c #CFCFFF", -"{ c #A7A7FF", -"] c #8989FF", -"^ c #7B7BFF", -"/ c #5E5EEB", -"( c #3333BF", -"_ c #6969D3", -": c #BEBEFF", -"< c #8E8EFF", -"[ c #5E5EFF", -"} c #4C4CFD", -"| c #6464C6", -"1 c #A4A478", -"2 c #BFBF63", -"3 c #BFBF5C", -"4 c #BFBF56", -"5 c #BFBF51", -"6 c #C17474", -"7 c #BF7070", -"8 c #BF6969", -"9 c #BF6363", -"0 c #544AC7", -"a c #A8A8FF", -"b c #7070FF", -"c c #5050FF", -"d c #3F3FFF", -"e c #8C8CBA", -"f c #F6F6C8", -"g c #FBFBBB", -"h c #FBFBAE", -"i c #FBFBA1", -"j c #F9F993", -"k c #D7D760", -"l c #D28D8D", -"m c #EEB8B8", -"n c #EFAAAA", -"o c #EF9E9E", -"p c #7C5ABC", -"q c #8D8DFF", -"r c #4747FF", -"s c #3535FF", -"t c #2B2BFF", -"u c #AAAAA7", -"v c #FFFFD2", -"w c #FFFFA9", -"x c #FFFF9A", -"y c #FFFF8D", -"z c #FFFF80", -"A c #E4E45B", -"B c #E39F9F", -"C c #FFCCCC", -"D c #FFA9A9", -"E c #FF9C9C", -"F c #B469A0", -"G c #3E3DE7", -"H c #2828EF", -"I c #1E1EEF", -"J c #1515EF", -"K c #A5A595", -"L c #FFFFC2", -"M c #FFFF8F", -"N c #F7F765", -"O c #F2F251", -"P c #DBDB3A", -"Q c #E48E8E", -"R c #FFBABA", -"S c #FF8E8E", -"T c #FF8181", -"U c #FF6868", -"V c #E54D60", -"W c #AC2E56", -"X c #0B0BBF", -"Y c #0606BF", -"Z c #C8C85D", -"` c #FEFEB1", -" . c #FEFE74", -".. c #F4F456", -"+. c #EFEF42", -"@. c #EFEF38", -"#. c #D7D725", -"$. c #E47676", -"%. c #FFA8A8", -"&. c #FF7373", -"*. c #FF5555", -"=. c #FF4343", -"-. c #FF3939", -";. c #DA2323", -">. c #CFCF3C", -",. c #F6F694", -"'. c #F0F047", -"). c #EFEF2E", -"!. c #EFEF24", -"~. c #D7D715", -"{. c #E45757", -"]. c #FF8888", -"^. c #FF4646", -"/. c #FF2F2F", -"(. c #FF2525", -"_. c #DA1414", -":. c #C3C328", -"<. c #EBEB55", -"[. c #ECEC2F", -"}. c #ECEC24", -"|. c #ECEC1A", -"1. c #EBEB10", -"2. c #CDCD06", -"3. c #DD3A3A", -"4. c #FF6060", -"5. c #FF1B1B", -"6. c #FE1111", -"7. c #D10707", -"8. c #B8B819", -"9. c #B7B715", -"0. c #B7B710", -"a. c #B7B70B", -"b. c #B7B706", -"c. c #B7B701", -"d. c #B7B700", -"e. c #BF1A1A", -"f. c #CC1919", -"g. c #CE1414", -"h. c #CE0E0E", -"i. c #CE0808", -"j. c #C90202", -"k. c #C00000", -" ", -" ", -" . + @ # $ % & ", -" * = - ; > , ' ) ", -" ! ~ { , ] ^ / ( ", -" _ : < ^ [ } | 1 2 3 4 5 ", -"6 7 8 9 0 a b c d e f g h i j k ", -"l m n o p q r s t u v w x y z A ", -"B C D E F G H I J K L M z N O P ", -"Q R S T U V W X Y Z ` ...+.@.#.", -"$.%.&.*.=.-.;. >.,.'.@.).!.~.", -"{.].^.-./.(._. :.<.[.}.|.1.2.", -"3.4./.(.5.6.7. 8.9.0.a.b.c.d.", -"e.f.g.h.i.j.k. ", -" ", -" "}; diff --git a/Externals/wxWidgets3/art/wxwin32x32.png b/Externals/wxWidgets3/art/wxwin32x32.png deleted file mode 100644 index 42e4fd97f7..0000000000 Binary files a/Externals/wxWidgets3/art/wxwin32x32.png and /dev/null differ diff --git a/Externals/wxWidgets3/art/wxwin32x32.xpm b/Externals/wxWidgets3/art/wxwin32x32.xpm deleted file mode 100644 index 25aed5e590..0000000000 --- a/Externals/wxWidgets3/art/wxwin32x32.xpm +++ /dev/null @@ -1,442 +0,0 @@ -/* XPM */ -static const char *const wxwin32x32_xpm[] = { -"32 32 407 2", -" c None", -". c #7373C1", -"+ c #6E6EBF", -"@ c #6B6BBF", -"# c #6868BF", -"$ c #6464BF", -"% c #6161BF", -"& c #5E5EBF", -"* c #5A5ABF", -"= c #5959C0", -"- c #7171C0", -"; c #7272C1", -"> c #8686CE", -", c #8686D0", -"' c #8282D0", -") c #7D7DD0", -"! c #7979D0", -"~ c #7575D0", -"{ c #7171D0", -"] c #6D6DD0", -"^ c #6666CD", -"/ c #5151C1", -"( c #4C4CBF", -"_ c #7171C1", -": c #7272C2", -"< c #C1C1F2", -"[ c #D7D7FF", -"} c #C9C9FF", -"| c #C2C2FF", -"1 c #BBBBFF", -"2 c #B4B4FF", -"3 c #AEAEFF", -"4 c #A7A7FF", -"5 c #A0A0FF", -"6 c #9A9AFF", -"7 c #8484F2", -"8 c #4949C2", -"9 c #4444C1", -"0 c #6A6AC0", -"a c #8989D4", -"b c #DADAFF", -"c c #C0C0FF", -"d c #9393FF", -"e c #8C8CFF", -"f c #8686FF", -"g c #5454D4", -"h c #3E3EC0", -"i c #6363BF", -"j c #8686D8", -"k c #D4D4FF", -"l c #D2D2FF", -"m c #7F7FFF", -"n c #7878FF", -"o c #4F4FD7", -"p c #3737BF", -"q c #5C5CBF", -"r c #7D7DD8", -"s c #CCCCFF", -"t c #CACAFF", -"u c #A8A8FF", -"v c #7070FF", -"w c #6B6BFF", -"x c #4545D7", -"y c #3030BF", -"z c #5555BF", -"A c #7373D8", -"B c #C3C3FF", -"C c #9C9CFF", -"D c #8D8DFF", -"E c #7777FF", -"F c #6262FF", -"G c #5252FF", -"H c #4B4BFF", -"I c #4848FF", -"J c #3232D7", -"K c #2626BF", -"L c #4E4EBF", -"M c #6A6AD8", -"N c #B9B9FF", -"O c #9090FF", -"P c #6F6FFF", -"Q c #5555FF", -"R c #4646FF", -"S c #4B4BF5", -"T c #8282B4", -"U c #93938E", -"V c #B1B173", -"W c #BFBF68", -"X c #BFBF65", -"Y c #BFBF62", -"Z c #BFBF5E", -"` c #BFBF5B", -" . c #BFBF57", -".. c #BFBF54", -"+. c #BFBF51", -"@. c #5858D8", -"#. c #B2B2FF", -"$. c #B1B1FF", -"%. c #8484FF", -"&. c #7272FF", -"*. c #6767FF", -"=. c #4F4FFF", -"-. c #4747FF", -";. c #4242FF", -">. c #4141FA", -",. c #ABAB8A", -"'. c #E4E4AA", -"). c #F5F5C3", -"!. c #F6F6BE", -"~. c #F6F6B7", -"{. c #F6F6B1", -"]. c #F6F6AB", -"^. c #F6F6A5", -"/. c #F6F69E", -"(. c #F6F698", -"_. c #F1F18C", -":. c #D0D05F", -"<. c #BFBF48", -"[. c #C17474", -"}. c #C07171", -"|. c #BF6E6E", -"1. c #BF6B6B", -"2. c #BF6868", -"3. c #BF6464", -"4. c #BF6161", -"5. c #7C498C", -"6. c #4242D8", -"7. c #A4A4FF", -"8. c #5959FF", -"9. c #3D3DFF", -"0. c #3838FF", -"a. c #6666CA", -"b. c #DCDC98", -"c. c #FFFFDD", -"d. c #FFFFD7", -"e. c #FFFFC0", -"f. c #FFFFB8", -"g. c #FFFFB2", -"h. c #FFFFAB", -"i. c #FFFFA4", -"j. c #FFFF9D", -"k. c #FFFF97", -"l. c #FFFF90", -"m. c #FBFB85", -"n. c #C2C244", -"o. c #C37676", -"p. c #DA9B9B", -"q. c #DF9F9F", -"r. c #DF9A9A", -"s. c #DF9494", -"t. c #DF8F8F", -"u. c #DF8A8A", -"v. c #B47094", -"w. c #3B3BD8", -"x. c #9292FF", -"y. c #5656FF", -"z. c #3333FF", -"A. c #2E2EFF", -"B. c #7070B6", -"C. c #E7E79F", -"D. c #FFFFDE", -"E. c #FFFFCF", -"F. c #FFFFB5", -"G. c #FFFF9E", -"H. c #FFFF8A", -"I. c #FFFF83", -"J. c #FFFF7C", -"K. c #C8C843", -"L. c #C06D6D", -"M. c #F1BEBE", -"N. c #FFDBDB", -"O. c #FFCBCB", -"P. c #FFC0C0", -"Q. c #FFBABA", -"R. c #FFB3B3", -"S. c #FFACAC", -"T. c #CE89AC", -"U. c #3333D7", -"V. c #8787FF", -"W. c #4D4DFF", -"X. c #2929FF", -"Y. c #2424FF", -"Z. c #6B6BB3", -"`. c #E7E795", -" + c #FFFFC6", -".+ c #FFFFA8", -"++ c #FFFF76", -"@+ c #FFFF6F", -"#+ c #C8C83C", -"$+ c #C77474", -"%+ c #FFD3D3", -"&+ c #FFDEDE", -"*+ c #FFC4C4", -"=+ c #FFA6A6", -"-+ c #FF9F9F", -";+ c #F3929A", -">+ c #2F29C3", -",+ c #4C4CFB", -"'+ c #6868FF", -")+ c #3939FF", -"!+ c #1F1FFF", -"~+ c #1A1AFF", -"{+ c #6666B0", -"]+ c #E7E78A", -"^+ c #FFFFD0", -"/+ c #FFFFBD", -"(+ c #FFFF9B", -"_+ c #FFFF91", -":+ c #FAFA6E", -"<+ c #F5F55F", -"[+ c #F5F558", -"}+ c #F7F756", -"|+ c #C7C732", -"1+ c #C86E6E", -"2+ c #FFC9C9", -"3+ c #FFD7D7", -"4+ c #FFB8B8", -"5+ c #FF9898", -"6+ c #FF9292", -"7+ c #FF8B8B", -"8+ c #B16098", -"9+ c #2420C6", -"0+ c #2222DD", -"a+ c #1F1FDF", -"b+ c #1B1BDF", -"c+ c #1818DF", -"d+ c #1414DF", -"e+ c #1010DF", -"f+ c #0C0CDF", -"g+ c #5F5F9C", -"h+ c #E7E77F", -"i+ c #FFFFC9", -"j+ c #FFFFB4", -"k+ c #FFFF8E", -"l+ c #FFFF7D", -"m+ c #FEFE75", -"n+ c #F4F45D", -"o+ c #EFEF4F", -"p+ c #EFEF4A", -"q+ c #EFEF44", -"r+ c #EFEF3F", -"s+ c #BFBF22", -"t+ c #C86666", -"u+ c #FFBFBF", -"v+ c #FFD0D0", -"w+ c #FFADAD", -"x+ c #FF8484", -"y+ c #FF7E7E", -"z+ c #FF7373", -"A+ c #E75F70", -"B+ c #B0457F", -"C+ c #9A3776", -"D+ c #5F1D7C", -"E+ c #0C0CBF", -"F+ c #0909BF", -"G+ c #0707BF", -"H+ c #0404BF", -"I+ c #878766", -"J+ c #E6E674", -"K+ c #FFFFC2", -"L+ c #FFFF82", -"M+ c #FEFE6E", -"N+ c #F3F355", -"O+ c #EFEF45", -"P+ c #EFEF40", -"Q+ c #EFEF3B", -"R+ c #EFEF36", -"S+ c #BFBF1C", -"T+ c #C85F5F", -"U+ c #FFB4B4", -"V+ c #FFA2A2", -"W+ c #FF7575", -"X+ c #FF5E5E", -"Y+ c #FF5050", -"Z+ c #FF4A4A", -"`+ c #FF4545", -" @ c #E73535", -".@ c #BF2121", -"+@ c #B7B733", -"@@ c #DCDC55", -"#@ c #FDFDB7", -"$@ c #FFFFA2", -"%@ c #FFFF75", -"&@ c #FCFC64", -"*@ c #F2F24E", -"=@ c #EFEF31", -"-@ c #EFEF2C", -";@ c #BFBF16", -">@ c #C85656", -",@ c #FFAAAA", -"'@ c #FFC2C2", -")@ c #FF9797", -"!@ c #FF7777", -"~@ c #FF6E6E", -"{@ c #FF5454", -"]@ c #FF4040", -"^@ c #FF3B3B", -"/@ c #E72C2C", -"(@ c #BF1919", -"_@ c #B7B72E", -":@ c #DADA48", -"<@ c #F7F7A6", -"[@ c #F6F689", -"}@ c #F2F254", -"|@ c #EFEF27", -"1@ c #EFEF22", -"2@ c #BFBF10", -"3@ c #C84040", -"4@ c #FF9A9A", -"5@ c #FFBBBB", -"6@ c #FF7171", -"7@ c #FF6666", -"8@ c #FF4E4E", -"9@ c #FF4646", -"0@ c #FF4141", -"a@ c #FF3C3C", -"b@ c #FF3737", -"c@ c #FF3232", -"d@ c #E72424", -"e@ c #BF1414", -"f@ c #B7B729", -"g@ c #DADA3F", -"h@ c #F7F7A1", -"i@ c #F4F480", -"j@ c #F0F047", -"k@ c #EFEF1D", -"l@ c #EFEF18", -"m@ c #BFBF0B", -"n@ c #C83636", -"o@ c #FFABAB", -"p@ c #FF7676", -"q@ c #FF2D2D", -"r@ c #FF2828", -"s@ c #E71C1C", -"t@ c #BF0F0F", -"u@ c #B7B724", -"v@ c #D1D132", -"w@ c #F4F478", -"x@ c #EFEF13", -"y@ c #ECEC0E", -"z@ c #BABA05", -"A@ c #C83030", -"B@ c #FF6161", -"C@ c #FF2323", -"D@ c #FF1E1E", -"E@ c #E71414", -"F@ c #BF0A0A", -"G@ c #B8B820", -"H@ c #B9B91F", -"I@ c #DADA2C", -"J@ c #E9E931", -"K@ c #EAEA2A", -"L@ c #EAEA25", -"M@ c #EAEA20", -"N@ c #EAEA1C", -"O@ c #EAEA17", -"P@ c #EAEA12", -"Q@ c #EAEA0D", -"R@ c #E5E508", -"S@ c #C7C703", -"T@ c #B7B701", -"U@ c #C52929", -"V@ c #FF5858", -"W@ c #FF1919", -"X@ c #FF1414", -"Y@ c #E30C0C", -"Z@ c #BF0606", -"`@ c #B8B819", -" # c #B7B717", -".# c #B7B714", -"+# c #B7B711", -"@# c #B7B70F", -"## c #B7B70C", -"$# c #B7B70A", -"%# c #B7B707", -"&# c #B7B705", -"*# c #B7B702", -"=# c #B7B700", -"-# c #BF2020", -";# c #E63131", -"># c #FF5555", -",# c #FF3A3A", -"'# c #FF0F0F", -")# c #FA0A0A", -"!# c #C90303", -"~# c #C00202", -"{# c #C01C1C", -"]# c #CB1B1B", -"^# c #D01A1A", -"/# c #D01616", -"(# c #D01313", -"_# c #D01010", -":# c #D00D0D", -"<# c #D00A0A", -"[# c #D00707", -"}# c #CF0303", -"|# c #C30101", -"1# c #C00000", -"2# c #C21414", -"3# c #BF1111", -"4# c #BF0E0E", -"5# c #BF0C0C", -"6# c #BF0909", -"7# c #BF0707", -"8# c #BF0404", -"9# c #BF0202", -"0# c #C50000", -" ", -" ", -" ", -" ", -" . + @ # $ % & * = ", -" - ; > , ' ) ! ~ { ] ^ / ( ", -" _ : < [ } | 1 2 3 4 5 6 7 8 9 ", -" 0 a b b c 2 3 4 5 6 d e f g h ", -" i j k l 2 4 5 6 d e f m n o p ", -" q r s t u 6 d e f m n v w x y ", -" z A B | C D f m E F G H I J K ", -" L M 1 N O m n P Q H R S T U V W X Y Z ` ...+. ", -" p @.#.$.%.&.*.=.-.;.>.,.'.).!.~.{.].^./.(._.:.<.", -" [.}.|.1.2.3.4.5.6.6 7.&.8.I ;.9.0.a.b.c.d.e.f.g.h.i.j.k.l.m.n.", -"}.o.p.q.r.s.t.u.v.w.O x.y.;.9.0.z.A.B.C.D.E.F.h.i.G.k.l.H.I.J.K.", -"L.M.N.O.P.Q.R.S.T.U.V.e W.0.z.A.X.Y.Z.`.d. +.+G.k.l.H.I.J.++@+#+", -"$+%+&+*+R.S.=+-+;+>+,+'+)+A.X.Y.!+~+{+]+^+/+(+_+H.I.J.:+<+[+}+|+", -"1+2+3+4+=+-+5+6+7+8+9+0+a+b+c+d+e+f+g+h+i+j+k+I.l+m+n+o+p+q+r+s+", -"t+u+v+w+5+6+7+x+y+z+A+B+C+D+E+F+G+H+I+J+K+h.L+++M+N+p+O+P+Q+R+S+", -"T+U+2+V+7+x+y+W+X+Y+Z+`+ @.@ +@@@#@$@%@&@*@O+P+Q+R+=@-@;@", -">@,@'@)@y+!@~@{@Z+`+]@^@/@(@ _@:@<@[@}@O+P+Q+R+=@-@|@1@2@", -"3@4@5@7+6@7@8@9@0@a@b@c@d@e@ f@g@h@i@j@Q+R+=@-@|@1@k@l@m@", -"n@y+o@p@{@9@0@a@b@c@q@r@s@t@ u@v@i@w@Q+=@-@|@1@k@l@x@y@z@", -"A@p@-+B@0@a@b@c@q@r@C@D@E@F@ G@H@I@J@K@L@M@N@O@P@Q@R@S@T@", -"U@7@4@V@b@c@q@r@C@D@W@X@Y@Z@ `@ #.#+#@###$#%#&#*#=#=# ", -"-#;#>#,#q@r@C@D@W@X@'#)#!#~# ", -"{#(@]#^#/#(#_#:#<#[#}#|#1# ", -" 2#3#4#5#6#7#8#9#1#0# ", -" ", -" ", -" ", -" "}; diff --git a/Externals/wxWidgets3/build/msw/wx_base.vcxproj b/Externals/wxWidgets3/build/msw/wx_base.vcxproj deleted file mode 100644 index 1e2bd889e9..0000000000 --- a/Externals/wxWidgets3/build/msw/wx_base.vcxproj +++ /dev/null @@ -1,1410 +0,0 @@ - - - - - Debug - x64 - - - Release - x64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - true - - - - - - - - - - - - - true - - - - - - true - - - - - - - - - - - - - - - - - - - - - - - true - - - - - - - - - - - - true - - - - - - - - - - - - - - - - - - - - true - - - - - - - - - - - - Create - - - - - - true - - - - - - true - - - NotUsing - - - - - - - - - - - - - - - - - - - - - - - true - - - - true - - - - true - - - - - true - - - - true - - - - - - - - true - - - - - - - - - - true - - - - - - - - true - - - true - - - true - - - true - - - true - - - - true - - - true - - - true - - - true - - - - - - - - - - - - - true - - - - true - - - true - - - - - - - - - - - - - - - - - - true - - - - - - - - - true - - - - true - - - - - - - true - - - - - - true - - - true - - - true - - - true - - - - true - - - - - - true - - - true - - - - - - - - - - - - - - - - - - - - true - - - - - - - - - - - - - - - - - - - - - - - - - true - - - - - - - - - - true - - - true - - - true - - - - - - - - true - - - - - true - - - true - - - true - - - - - - - - - true - - - - true - - - - - - - - - - true - - - - - - true - - - true - - - - - - - - - - - - true - - - - - - - - true - - - - true - - - - - - - - true - - - true - - - - - - - - true - - - true - - - true - - - - - true - - - - - - - - - - - - - - - - - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - - true - - - - - - - - - true - - - - - true - - - - true - - - - - - - - - true - - - - - - - - - - - - true - - - - - true - - - - true - - - - true - - - - true - - - true - - - - - - - true - - - true - - - - - - - true - - - true - - - true - - - - - true - - - - - - - - - - - true - - - true - - - - - - - - - - - - - - - - true - - - true - - - true - - - - - - - - - - - - - - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - - - - - - - true - - - - true - - - - - - - - - true - - - - wxWidgets - {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} - 10.0.15063.0 - - - - StaticLibrary - v141 - Unicode - - - true - - - false - - - - - - - - - - - - - - __WXDEBUG__;%(PreprocessorDefinitions) - - - - - {4C9F135B-A85E-430C-BAD4-4C67EF5FC12C} - - - {ff213b23-2c26-4214-9f88-85271e557e87} - - - - - - \ No newline at end of file diff --git a/Externals/wxWidgets3/build/msw/wx_base.vcxproj.filters b/Externals/wxWidgets3/build/msw/wx_base.vcxproj.filters deleted file mode 100644 index 225e069276..0000000000 --- a/Externals/wxWidgets3/build/msw/wx_base.vcxproj.filters +++ /dev/null @@ -1,3512 +0,0 @@ - - - - - {ea19c29f-6825-47dc-b54d-ee464810b353} - - - {e1077817-0cf8-4a28-b86f-34e85984db45} - - - {887bf107-6891-4a1f-a32f-5be1aafc0535} - - - {303d663d-e46a-4394-9423-5d6bd35169f9} - - - {dab87ac5-435c-4c4c-a685-966df965635c} - - - {dd338b6e-5f9c-42f6-b1c3-e4db2c484490} - - - {7a3796f6-d621-4a89-a785-d0ec354b9652} - - - {3112ece1-9900-49c2-b90d-7e9c956d3cfb} - - - {6f4ef8f1-41e1-4bd6-8940-ac03c6b9218c} - - - {c4049f2a-35bb-494f-a789-c83ed28f18f1} - - - {302035ca-b308-4626-83f9-60c08f3015c9} - - - {73f456f5-1828-4572-86a5-6dc15050fb79} - - - {f6d51fb6-68c8-4855-8b5c-ef3717f3e1d3} - - - - - Setup Headers - - - Setup Headers - - - Setup Headers - - - Setup Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW\private - - - Headers\MSW - - - Headers\MSW\private - - - Headers\MSW\private - - - Headers\MSW\private - - - Headers\MSW\private - - - Headers\MSW\private - - - Headers\MSW\private - - - Headers\MSW\private - - - Headers\MSW - - - Headers\MSW\private - - - Headers\MSW - - - Headers\MSW\private - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\Generic - - - Headers\MSW\ole - - - Headers\MSW\ole - - - Headers\MSW\ole - - - Headers\MSW\ole - - - Headers\MSW\ole - - - Headers\MSW\ole - - - Headers\MSW\ole - - - Headers\MSW\ole - - - Headers\MSW\ole - - - Headers\MSW\ole - - - Headers - - - Headers - - - Headers - - - Headers - - - Headers\Generic - - - Headers\Generic - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW - - - Headers\MSW\private - - - Headers\AUI - - - Headers\AUI - - - Headers\AUI - - - Headers\AUI - - - Headers\AUI - - - Headers\AUI - - - Headers\AUI - - - Headers\AUI - - - Headers\AUI - - - Headers\AUI - - - Headers\AUI - - - Headers\Generic\private - - - Headers\Generic\private - - - Headers\Generic\private - - - Headers\Generic\private - - - Headers\Generic\private - - - Headers\Generic\private - - - Headers\Generic\private - - - Headers\Generic\private - - - Headers\Generic\private - - - - - AUI - - - AUI - - - AUI - - - AUI - - - AUI - - - AUI - - - AUI - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - Generic - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW - - - MSW\ole - - - MSW\ole - - - MSW\ole - - - MSW\ole - - - MSW\ole - - - MSW\ole - - - MSW\ole - - - MSW\ole - - - - - - AUI - - - AUI - - - AUI - - - Common - - - Common - - - Generic - - - Generic - - - MSW - - - MSW - - - MSW - - - MSW - - - - - Common - - - - - - MSW - - - \ No newline at end of file diff --git a/Externals/wxWidgets3/build_wx.sh b/Externals/wxWidgets3/build_wx.sh deleted file mode 100755 index 89a74094a9..0000000000 --- a/Externals/wxWidgets3/build_wx.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -#svn co -r 75363 http://svn.wxwidgets.org/svn/wx/wxWidgets/trunk wxWidgets -git clone https://github.com/wxWidgets/wxWidgets.git -cd wxWidgets -git checkout cbb799b1ae3f309c99beb0d287e9bb3b62ea405c - -case $OSTYPE in -darwin*) -export CC=clang CXX=clang++ CFLAGS="-stdlib=libc++" CXXFLAGS="-stdlib=libc++" CPPFLAGS="-stdlib=libc++" -BACKEND="osx_cocoa" -ADD_OPTS=--with-macosx-version-min=10.7 --enable-stl -;; -linux*) -BACKEND="gtk" -ADD_OPTS=--without-gtkprint -;; -esac - -mkdir build-local -cd build-local - -../configure --with-$BACKEND --disable-shared --enable-unicode --disable-compat28 --disable-exceptions --disable-fswatcher --without-regex --without-expat --disable-xml --disable-ribbon --disable-propgrid --disable-stc --disable-html --disable-richtext --without-libjpeg --without-libtiff --disable-webview --disable-markup --without-opengl --disable-printarch --disable-mediactrl --disable-htmlhelp --disable-dialupman --enable-ipv6 $ADD_OPTS -make diff --git a/Externals/wxWidgets3/include/msvc/wx/setup.h b/Externals/wxWidgets3/include/msvc/wx/setup.h deleted file mode 100644 index 3d2f068fd8..0000000000 --- a/Externals/wxWidgets3/include/msvc/wx/setup.h +++ /dev/null @@ -1,263 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: msvc/wx/setup.h -// Purpose: wrapper around the real wx/setup.h for Visual C++ -// Author: Vadim Zeitlin -// Modified by: -// Created: 2004-12-12 -// Copyright: (c) 2004 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _MSC_VER - #error "This file should only be included when using Microsoft Visual C++" -#endif - -// VC++ IDE predefines _DEBUG and _UNICODE for the new projects itself, but -// the other symbols (WXUSINGDLL, __WXUNIVERSAL__, ...) should be defined -// explicitly! - -#include "wx/version.h" -#include "wx/cpp.h" - -// notice that wxSUFFIX_DEBUG is a string but wxSUFFIX itself must be an -// identifier as string concatenation is not done inside #include where we -// need it -#ifdef _DEBUG - #define wxSUFFIX_DEBUG "d" - #ifdef _UNICODE - #define wxSUFFIX ud - #else // !_UNICODE - #define wxSUFFIX d - #endif // _UNICODE/!_UNICODE -#else - #define wxSUFFIX_DEBUG "" - #ifdef _UNICODE - #define wxSUFFIX u - #else // !_UNICODE - // don't define wxSUFFIX at all as preprocessor operations don't work - // with empty values so we need to check for this case specially below - #endif // _UNICODE/!_UNICODE -#endif - -// compiler-specific prefix: by default it's always just "vc" for compatibility -// reasons but if you use multiple MSVC versions you probably build them with -// COMPILER_PREFIX=vcXX and in this case you may want to either predefine -// wxMSVC_VERSION as "XX" or define wxMSVC_VERSION_AUTO to use the appropriate -// version depending on the compiler used -#ifdef wxMSVC_VERSION - #define wxCOMPILER_PREFIX wxCONCAT(vc, wxMSVC_VERSION) -#elif defined(wxMSVC_VERSION_AUTO) - #if _MSC_VER == 1200 - #define wxCOMPILER_PREFIX vc60 - #elif _MSC_VER == 1300 - #define wxCOMPILER_PREFIX vc70 - #elif _MSC_VER == 1310 - #define wxCOMPILER_PREFIX vc71 - #elif _MSC_VER == 1400 - #define wxCOMPILER_PREFIX vc80 - #elif _MSC_VER == 1500 - #define wxCOMPILER_PREFIX vc90 - #elif _MSC_VER == 1600 - #define wxCOMPILER_PREFIX vc100 - #elif _MSC_VER == 1700 - #define wxCOMPILER_PREFIX vc110 - #elif _MSC_VER == 1800 - #define wxCOMPILER_PREFIX vc120 - #elif _MSC_VER == 1900 - #define wxCOMPILER_PREFIX vc140 - #else - #error "Unknown MSVC compiler version, please report to wx-dev." - #endif -#else - #define wxCOMPILER_PREFIX vc -#endif - -// architecture-specific part: not used (again, for compatibility), for x86 -#if defined(_M_X64) - #define wxARCH_SUFFIX _x64 -#elif defined(_M_IA64) - #define wxARCH_SUFFIX _ia64 -#else // assume _M_IX86 - #define wxARCH_SUFFIX -#endif - -// Ensure the library configuration is defined -#ifndef wxCFG - #define wxCFG -#endif - -// Construct the path for the subdirectory under /lib/ that the included setup.h -// will be used from -#ifdef WXUSINGDLL - #define wxLIB_SUBDIR \ - wxCONCAT4(wxCOMPILER_PREFIX, wxARCH_SUFFIX, _dll, wxCFG) -#else // !DLL - #define wxLIB_SUBDIR \ - wxCONCAT4(wxCOMPILER_PREFIX, wxARCH_SUFFIX, _lib, wxCFG) -#endif // DLL/!DLL - -// The user can predefine a different prefix if not using the default MSW port -// with MSVC. -#ifndef wxTOOLKIT_PREFIX - #if defined(__WXGTK__) - #define wxTOOLKIT_PREFIX gtk2 - #else - #define wxTOOLKIT_PREFIX msw - #endif -#endif // wxTOOLKIT_PREFIX - -// the real setup.h header file we need is in the build-specific directory, -// construct the path to it -#ifdef wxSUFFIX - #define wxSETUPH_PATH \ - wxCONCAT6(../../../lib/, wxLIB_SUBDIR, /, wxTOOLKIT_PREFIX, wxSUFFIX, /wx/setup.h) -#else // suffix is empty - #define wxSETUPH_PATH \ - wxCONCAT5(../../../lib/, wxLIB_SUBDIR, /, wxTOOLKIT_PREFIX, /wx/setup.h) -#endif - -#define wxSETUPH_PATH_STR wxSTRINGIZE(wxSETUPH_PATH) - -#include wxSETUPH_PATH_STR - - -// the library names depend on the build, these macro builds the correct -// library name for the given base name -#ifdef wxSUFFIX - #define wxSUFFIX_STR wxSTRINGIZE(wxSUFFIX) -#else // suffix is empty - #define wxSUFFIX_STR "" -#endif -#define wxSHORT_VERSION_STRING \ - wxSTRINGIZE(wxMAJOR_VERSION) wxSTRINGIZE(wxMINOR_VERSION) - -#define wxWX_LIB_NAME(name, subname) \ - "wx" name wxSHORT_VERSION_STRING wxSUFFIX_STR subname - -#define wxBASE_LIB_NAME(name) wxWX_LIB_NAME("base", "_" name) -#define wxTOOLKIT_LIB_NAME(name) wxWX_LIB_NAME(wxSTRINGIZE(wxTOOLKIT_PREFIX), "_" name) - -// This one is for 3rd party libraries: they don't have the version number -// in their names and usually exist in ANSI version only (except for regex) -// -// 3rd party libraries are also are not linked in when using DLLs as they're -// embedded inside our own DLLs and don't need to be linked with the user code. -#define wx3RD_PARTY_LIB_NAME(name) "wx" name wxSUFFIX_DEBUG - -// special version for regex as it does have a Unicode version -#define wx3RD_PARTY_LIB_NAME_U(name) "wx" name wxSUFFIX_STR - -#pragma comment(lib, wxWX_LIB_NAME("base", "")) - -#ifndef wxNO_NET_LIB - #ifndef WXUSINGDLL - #pragma comment(lib, "wsock32") - #endif - #pragma comment(lib, wxBASE_LIB_NAME("net")) -#endif -#if wxUSE_XML && !defined(wxNO_XML_LIB) - #pragma comment(lib, wxBASE_LIB_NAME("xml")) - #if !defined(wxNO_EXPAT_LIB) && !defined(WXUSINGDLL) - #pragma comment(lib, wx3RD_PARTY_LIB_NAME("expat")) - #endif -#endif -#if wxUSE_REGEX && !defined(wxNO_REGEX_LIB) && !defined(WXUSINGDLL) - #pragma comment(lib, wx3RD_PARTY_LIB_NAME_U("regex")) -#endif -#if wxUSE_ZLIB && !defined(wxNO_ZLIB_LIB) && !defined(WXUSINGDLL) - #pragma comment(lib, wx3RD_PARTY_LIB_NAME("zlib")) -#endif - -#if wxUSE_GUI - #if wxUSE_LIBJPEG && !defined(wxNO_JPEG_LIB) && !defined(WXUSINGDLL) - #pragma comment(lib, wx3RD_PARTY_LIB_NAME("jpeg")) - #endif - #if wxUSE_LIBPNG && !defined(wxNO_PNG_LIB) && !defined(WXUSINGDLL) - #pragma comment(lib, wx3RD_PARTY_LIB_NAME("png")) - #endif - #if wxUSE_LIBTIFF && !defined(wxNO_TIFF_LIB) && !defined(WXUSINGDLL) - #pragma comment(lib, wx3RD_PARTY_LIB_NAME("tiff")) - #endif - - #pragma comment(lib, wxTOOLKIT_LIB_NAME("core")) - - #ifndef wxNO_ADV_LIB - #pragma comment(lib, wxTOOLKIT_LIB_NAME("adv")) - #endif - - #if wxUSE_HTML && !defined(wxNO_HTML_LIB) - #pragma comment(lib, wxTOOLKIT_LIB_NAME("html")) - #endif - #if wxUSE_GLCANVAS && !defined(wxNO_GL_LIB) - #pragma comment(lib, wxTOOLKIT_LIB_NAME("gl")) - #endif - #if wxUSE_DEBUGREPORT && !defined(wxNO_QA_LIB) - #pragma comment(lib, wxTOOLKIT_LIB_NAME("qa")) - #endif - #if wxUSE_XRC && !defined(wxNO_XRC_LIB) - #pragma comment(lib, wxTOOLKIT_LIB_NAME("xrc")) - #endif - #if wxUSE_AUI && !defined(wxNO_AUI_LIB) - #pragma comment(lib, wxTOOLKIT_LIB_NAME("aui")) - #endif - #if wxUSE_PROPGRID && !defined(wxNO_PROPGRID_LIB) - #pragma comment(lib, wxTOOLKIT_LIB_NAME("propgrid")) - #endif - #if wxUSE_RIBBON && !defined(wxNO_RIBBON_LIB) - #pragma comment(lib, wxTOOLKIT_LIB_NAME("ribbon")) - #endif - #if wxUSE_RICHTEXT && !defined(wxNO_RICHTEXT_LIB) - #pragma comment(lib, wxTOOLKIT_LIB_NAME("richtext")) - #endif - #if wxUSE_MEDIACTRL && !defined(wxNO_MEDIA_LIB) - #pragma comment(lib, wxTOOLKIT_LIB_NAME("media")) - #endif - #if wxUSE_STC && !defined(wxNO_STC_LIB) - #pragma comment(lib, wxTOOLKIT_LIB_NAME("stc")) - #ifndef WXUSINGDLL - #pragma comment(lib, wx3RD_PARTY_LIB_NAME("scintilla")) - #endif - #endif - #if wxUSE_WEBVIEW && !defined(wxNO_WEBVIEW_LIB) - #pragma comment(lib, wxTOOLKIT_LIB_NAME("webview")) - #endif -#endif // wxUSE_GUI - - -#ifndef WXUSINGDLL - // Make sure all required system libraries are added to the linker too when - // using static libraries. - #pragma comment(lib, "kernel32") - #pragma comment(lib, "user32") - #pragma comment(lib, "gdi32") - #pragma comment(lib, "comdlg32") - #pragma comment(lib, "winspool") - #pragma comment(lib, "winmm") - #pragma comment(lib, "shell32") - #pragma comment(lib, "comctl32") - #pragma comment(lib, "ole32") - #pragma comment(lib, "oleaut32") - #pragma comment(lib, "uuid") - #pragma comment(lib, "rpcrt4") - #pragma comment(lib, "advapi32") - #if wxUSE_URL_NATIVE - #pragma comment(lib, "wininet") - #endif - - #ifdef __WXGTK__ - #ifdef __WXGTK3__ - #pragma comment(lib, "libgtk-3.dll.a") - #pragma comment(lib, "libgdk-3.dll.a") - #else - #pragma comment(lib, "gtk-win32-2.0.lib") - #pragma comment(lib, "gdk-win32-2.0.lib") - #endif - #pragma comment(lib, "pangocairo-1.0.lib") - #pragma comment(lib, "gdk_pixbuf-2.0.lib") - #pragma comment(lib, "cairo.lib") - #pragma comment(lib, "pango-1.0.lib") - #pragma comment(lib, "gobject-2.0.lib") - #pragma comment(lib, "gthread-2.0.lib") - #pragma comment(lib, "glib-2.0.lib") - #endif -#endif // !WXUSINGDLL diff --git a/Externals/wxWidgets3/include/wx/aboutdlg.h b/Externals/wxWidgets3/include/wx/aboutdlg.h deleted file mode 100644 index 975b5def27..0000000000 --- a/Externals/wxWidgets3/include/wx/aboutdlg.h +++ /dev/null @@ -1,169 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/aboutdlg.h -// Purpose: declaration of wxAboutDialog class -// Author: Vadim Zeitlin -// Created: 2006-10-07 -// Copyright: (c) 2006 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_ABOUTDLG_H_ -#define _WX_ABOUTDLG_H_ - -#include "wx/defs.h" - -#if wxUSE_ABOUTDLG - -#include "wx/app.h" -#include "wx/icon.h" - -// ---------------------------------------------------------------------------- -// wxAboutDialogInfo: information shown by the standard "About" dialog -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxAboutDialogInfo -{ -public: - // all fields are initially uninitialized - wxAboutDialogInfo() { } - - // accessors for various simply fields - // ----------------------------------- - - // name of the program, if not used defaults to wxApp::GetAppDisplayName() - void SetName(const wxString& name) { m_name = name; } - wxString GetName() const - { return m_name.empty() ? wxTheApp->GetAppDisplayName() : m_name; } - - // version should contain program version without "version" word (e.g., - // "1.2" or "RC2") while longVersion may contain the full version including - // "version" word (e.g., "Version 1.2" or "Release Candidate 2") - // - // if longVersion is empty, it is automatically constructed from version - // - // generic and gtk native: use short version only, as a suffix to the - // program name msw and osx native: use long version - void SetVersion(const wxString& version, - const wxString& longVersion = wxString()); - - bool HasVersion() const { return !m_version.empty(); } - const wxString& GetVersion() const { return m_version; } - const wxString& GetLongVersion() const { return m_longVersion; } - - // brief, but possibly multiline, description of the program - void SetDescription(const wxString& desc) { m_description = desc; } - bool HasDescription() const { return !m_description.empty(); } - const wxString& GetDescription() const { return m_description; } - - // short string containing the program copyright information - void SetCopyright(const wxString& copyright) { m_copyright = copyright; } - bool HasCopyright() const { return !m_copyright.empty(); } - const wxString& GetCopyright() const { return m_copyright; } - - // long, multiline string containing the text of the program licence - void SetLicence(const wxString& licence) { m_licence = licence; } - void SetLicense(const wxString& licence) { m_licence = licence; } - bool HasLicence() const { return !m_licence.empty(); } - const wxString& GetLicence() const { return m_licence; } - - // icon to be shown in the dialog, defaults to the main frame icon - void SetIcon(const wxIcon& icon) { m_icon = icon; } - bool HasIcon() const { return m_icon.IsOk(); } - wxIcon GetIcon() const; - - // web site for the program and its description (defaults to URL itself if - // empty) - void SetWebSite(const wxString& url, const wxString& desc = wxEmptyString) - { - m_url = url; - m_urlDesc = desc.empty() ? url : desc; - } - - bool HasWebSite() const { return !m_url.empty(); } - - const wxString& GetWebSiteURL() const { return m_url; } - const wxString& GetWebSiteDescription() const { return m_urlDesc; } - - // accessors for the arrays - // ------------------------ - - // the list of developers of the program - void SetDevelopers(const wxArrayString& developers) - { m_developers = developers; } - void AddDeveloper(const wxString& developer) - { m_developers.push_back(developer); } - - bool HasDevelopers() const { return !m_developers.empty(); } - const wxArrayString& GetDevelopers() const { return m_developers; } - - // the list of documentation writers - void SetDocWriters(const wxArrayString& docwriters) - { m_docwriters = docwriters; } - void AddDocWriter(const wxString& docwriter) - { m_docwriters.push_back(docwriter); } - - bool HasDocWriters() const { return !m_docwriters.empty(); } - const wxArrayString& GetDocWriters() const { return m_docwriters; } - - // the list of artists for the program art - void SetArtists(const wxArrayString& artists) - { m_artists = artists; } - void AddArtist(const wxString& artist) - { m_artists.push_back(artist); } - - bool HasArtists() const { return !m_artists.empty(); } - const wxArrayString& GetArtists() const { return m_artists; } - - // the list of translators - void SetTranslators(const wxArrayString& translators) - { m_translators = translators; } - void AddTranslator(const wxString& translator) - { m_translators.push_back(translator); } - - bool HasTranslators() const { return !m_translators.empty(); } - const wxArrayString& GetTranslators() const { return m_translators; } - - - // implementation only - // ------------------- - - // "simple" about dialog shows only textual information (with possibly - // default icon but without hyperlink nor any long texts such as the - // licence text) - bool IsSimple() const - { return !HasWebSite() && !HasIcon() && !HasLicence(); } - - // get the description and credits (i.e. all of developers, doc writers, - // artists and translators) as a one long multiline string - wxString GetDescriptionAndCredits() const; - - // returns the copyright with the (C) string substituted by the Unicode - // character U+00A9 - wxString GetCopyrightToDisplay() const; - -private: - wxString m_name, - m_version, - m_longVersion, - m_description, - m_copyright, - m_licence; - - wxIcon m_icon; - - wxString m_url, - m_urlDesc; - - wxArrayString m_developers, - m_docwriters, - m_artists, - m_translators; -}; - -// functions to show the about dialog box -WXDLLIMPEXP_ADV void wxAboutBox(const wxAboutDialogInfo& info, wxWindow* parent = NULL); - -#endif // wxUSE_ABOUTDLG - -#endif // _WX_ABOUTDLG_H_ - diff --git a/Externals/wxWidgets3/include/wx/accel.h b/Externals/wxWidgets3/include/wx/accel.h deleted file mode 100644 index 604039561f..0000000000 --- a/Externals/wxWidgets3/include/wx/accel.h +++ /dev/null @@ -1,176 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/accel.h -// Purpose: wxAcceleratorEntry and wxAcceleratorTable classes -// Author: Julian Smart, Robert Roebling, Vadim Zeitlin -// Modified by: -// Created: 31.05.01 (extracted from other files) -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_ACCEL_H_BASE_ -#define _WX_ACCEL_H_BASE_ - -#include "wx/defs.h" - -#if wxUSE_ACCEL - -#include "wx/object.h" - -class WXDLLIMPEXP_FWD_CORE wxAcceleratorTable; -class WXDLLIMPEXP_FWD_CORE wxMenuItem; -class WXDLLIMPEXP_FWD_CORE wxKeyEvent; - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -// wxAcceleratorEntry flags -enum wxAcceleratorEntryFlags -{ - wxACCEL_NORMAL = 0x0000, // no modifiers - wxACCEL_ALT = 0x0001, // hold Alt key down - wxACCEL_CTRL = 0x0002, // hold Ctrl key down - wxACCEL_SHIFT = 0x0004, // hold Shift key down -#if defined(__WXMAC__) - wxACCEL_RAW_CTRL= 0x0008, // -#else - wxACCEL_RAW_CTRL= wxACCEL_CTRL, -#endif - wxACCEL_CMD = wxACCEL_CTRL -}; - -// ---------------------------------------------------------------------------- -// an entry in wxAcceleratorTable corresponds to one accelerator -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxAcceleratorEntry -{ -public: - wxAcceleratorEntry(int flags = 0, int keyCode = 0, int cmd = 0, - wxMenuItem *item = NULL) - : m_flags(flags) - , m_keyCode(keyCode) - , m_command(cmd) - , m_item(item) - { } - - wxAcceleratorEntry(const wxAcceleratorEntry& entry) - : m_flags(entry.m_flags) - , m_keyCode(entry.m_keyCode) - , m_command(entry.m_command) - , m_item(entry.m_item) - { } - - // create accelerator corresponding to the specified string, return NULL if - // string couldn't be parsed or a pointer to be deleted by the caller - static wxAcceleratorEntry *Create(const wxString& str); - - wxAcceleratorEntry& operator=(const wxAcceleratorEntry& entry) - { - if (&entry != this) - Set(entry.m_flags, entry.m_keyCode, entry.m_command, entry.m_item); - return *this; - } - - void Set(int flags, int keyCode, int cmd, wxMenuItem *item = NULL) - { - m_flags = flags; - m_keyCode = keyCode; - m_command = cmd; - m_item = item; - } - - void SetMenuItem(wxMenuItem *item) { m_item = item; } - - int GetFlags() const { return m_flags; } - int GetKeyCode() const { return m_keyCode; } - int GetCommand() const { return m_command; } - - wxMenuItem *GetMenuItem() const { return m_item; } - - bool operator==(const wxAcceleratorEntry& entry) const - { - return m_flags == entry.m_flags && - m_keyCode == entry.m_keyCode && - m_command == entry.m_command && - m_item == entry.m_item; - } - - bool operator!=(const wxAcceleratorEntry& entry) const - { return !(*this == entry); } - -#if defined(__WXMOTIF__) - // Implementation use only - bool MatchesEvent(const wxKeyEvent& event) const; -#endif - - bool IsOk() const - { - return m_keyCode != 0; - } - - - // string <-> wxAcceleratorEntry conversion - // ---------------------------------------- - - // returns a wxString for the this accelerator. - // this function formats it using the - format - // where maybe a hyphen-separated list of "shift|alt|ctrl" - wxString ToString() const { return AsPossiblyLocalizedString(true); } - - // same as above but without translating, useful if the string is meant to - // be stored in a file or otherwise stored, instead of being shown to the - // user - wxString ToRawString() const { return AsPossiblyLocalizedString(false); } - - // returns true if the given string correctly initialized this object - // (i.e. if IsOk() returns true after this call) - bool FromString(const wxString& str); - - -private: - wxString AsPossiblyLocalizedString(bool localized) const; - - // common part of Create() and FromString() - static bool ParseAccel(const wxString& str, int *flags, int *keycode); - - - int m_flags; // combination of wxACCEL_XXX constants - int m_keyCode; // ASCII or virtual keycode - int m_command; // Command id to generate - - // the menu item this entry corresponds to, may be NULL - wxMenuItem *m_item; - - // for compatibility with old code, use accessors now! - friend class WXDLLIMPEXP_FWD_CORE wxMenu; -}; - -// ---------------------------------------------------------------------------- -// include wxAcceleratorTable class declaration, it is only used by the library -// and so doesn't have any published user visible interface -// ---------------------------------------------------------------------------- - -#if defined(__WXUNIVERSAL__) - #include "wx/generic/accel.h" -#elif defined(__WXMSW__) - #include "wx/msw/accel.h" -#elif defined(__WXMOTIF__) - #include "wx/motif/accel.h" -#elif defined(__WXGTK20__) - #include "wx/gtk/accel.h" -#elif defined(__WXGTK__) - #include "wx/gtk1/accel.h" -#elif defined(__WXMAC__) - #include "wx/osx/accel.h" -#elif defined(__WXQT__) - #include "wx/qt/accel.h" -#endif - -extern WXDLLIMPEXP_DATA_CORE(wxAcceleratorTable) wxNullAcceleratorTable; - -#endif // wxUSE_ACCEL - -#endif - // _WX_ACCEL_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/access.h b/Externals/wxWidgets3/include/wx/access.h deleted file mode 100644 index 7eb041730b..0000000000 --- a/Externals/wxWidgets3/include/wx/access.h +++ /dev/null @@ -1,376 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/access.h -// Purpose: Accessibility classes -// Author: Julian Smart -// Modified by: -// Created: 2003-02-12 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_ACCESSBASE_H_ -#define _WX_ACCESSBASE_H_ - -// ---------------------------------------------------------------------------- -// headers we have to include here -// ---------------------------------------------------------------------------- - -#include "wx/defs.h" - -#if wxUSE_ACCESSIBILITY - -#include "wx/variant.h" - -enum wxAccStatus -{ - wxACC_FAIL, - wxACC_FALSE, - wxACC_OK, - wxACC_NOT_IMPLEMENTED, - wxACC_NOT_SUPPORTED -}; - -// Child ids are integer identifiers from 1 up. -// So zero represents 'this' object. -#define wxACC_SELF 0 - -// Navigation constants - -enum wxNavDir -{ - wxNAVDIR_DOWN, - wxNAVDIR_FIRSTCHILD, - wxNAVDIR_LASTCHILD, - wxNAVDIR_LEFT, - wxNAVDIR_NEXT, - wxNAVDIR_PREVIOUS, - wxNAVDIR_RIGHT, - wxNAVDIR_UP -}; - -// Role constants - -enum wxAccRole { - wxROLE_NONE, - wxROLE_SYSTEM_ALERT, - wxROLE_SYSTEM_ANIMATION, - wxROLE_SYSTEM_APPLICATION, - wxROLE_SYSTEM_BORDER, - wxROLE_SYSTEM_BUTTONDROPDOWN, - wxROLE_SYSTEM_BUTTONDROPDOWNGRID, - wxROLE_SYSTEM_BUTTONMENU, - wxROLE_SYSTEM_CARET, - wxROLE_SYSTEM_CELL, - wxROLE_SYSTEM_CHARACTER, - wxROLE_SYSTEM_CHART, - wxROLE_SYSTEM_CHECKBUTTON, - wxROLE_SYSTEM_CLIENT, - wxROLE_SYSTEM_CLOCK, - wxROLE_SYSTEM_COLUMN, - wxROLE_SYSTEM_COLUMNHEADER, - wxROLE_SYSTEM_COMBOBOX, - wxROLE_SYSTEM_CURSOR, - wxROLE_SYSTEM_DIAGRAM, - wxROLE_SYSTEM_DIAL, - wxROLE_SYSTEM_DIALOG, - wxROLE_SYSTEM_DOCUMENT, - wxROLE_SYSTEM_DROPLIST, - wxROLE_SYSTEM_EQUATION, - wxROLE_SYSTEM_GRAPHIC, - wxROLE_SYSTEM_GRIP, - wxROLE_SYSTEM_GROUPING, - wxROLE_SYSTEM_HELPBALLOON, - wxROLE_SYSTEM_HOTKEYFIELD, - wxROLE_SYSTEM_INDICATOR, - wxROLE_SYSTEM_LINK, - wxROLE_SYSTEM_LIST, - wxROLE_SYSTEM_LISTITEM, - wxROLE_SYSTEM_MENUBAR, - wxROLE_SYSTEM_MENUITEM, - wxROLE_SYSTEM_MENUPOPUP, - wxROLE_SYSTEM_OUTLINE, - wxROLE_SYSTEM_OUTLINEITEM, - wxROLE_SYSTEM_PAGETAB, - wxROLE_SYSTEM_PAGETABLIST, - wxROLE_SYSTEM_PANE, - wxROLE_SYSTEM_PROGRESSBAR, - wxROLE_SYSTEM_PROPERTYPAGE, - wxROLE_SYSTEM_PUSHBUTTON, - wxROLE_SYSTEM_RADIOBUTTON, - wxROLE_SYSTEM_ROW, - wxROLE_SYSTEM_ROWHEADER, - wxROLE_SYSTEM_SCROLLBAR, - wxROLE_SYSTEM_SEPARATOR, - wxROLE_SYSTEM_SLIDER, - wxROLE_SYSTEM_SOUND, - wxROLE_SYSTEM_SPINBUTTON, - wxROLE_SYSTEM_STATICTEXT, - wxROLE_SYSTEM_STATUSBAR, - wxROLE_SYSTEM_TABLE, - wxROLE_SYSTEM_TEXT, - wxROLE_SYSTEM_TITLEBAR, - wxROLE_SYSTEM_TOOLBAR, - wxROLE_SYSTEM_TOOLTIP, - wxROLE_SYSTEM_WHITESPACE, - wxROLE_SYSTEM_WINDOW -}; - -// Object types - -enum wxAccObject { - wxOBJID_WINDOW = 0x00000000, - wxOBJID_SYSMENU = 0xFFFFFFFF, - wxOBJID_TITLEBAR = 0xFFFFFFFE, - wxOBJID_MENU = 0xFFFFFFFD, - wxOBJID_CLIENT = 0xFFFFFFFC, - wxOBJID_VSCROLL = 0xFFFFFFFB, - wxOBJID_HSCROLL = 0xFFFFFFFA, - wxOBJID_SIZEGRIP = 0xFFFFFFF9, - wxOBJID_CARET = 0xFFFFFFF8, - wxOBJID_CURSOR = 0xFFFFFFF7, - wxOBJID_ALERT = 0xFFFFFFF6, - wxOBJID_SOUND = 0xFFFFFFF5 -}; - -// Accessible states - -#define wxACC_STATE_SYSTEM_ALERT_HIGH 0x00000001 -#define wxACC_STATE_SYSTEM_ALERT_MEDIUM 0x00000002 -#define wxACC_STATE_SYSTEM_ALERT_LOW 0x00000004 -#define wxACC_STATE_SYSTEM_ANIMATED 0x00000008 -#define wxACC_STATE_SYSTEM_BUSY 0x00000010 -#define wxACC_STATE_SYSTEM_CHECKED 0x00000020 -#define wxACC_STATE_SYSTEM_COLLAPSED 0x00000040 -#define wxACC_STATE_SYSTEM_DEFAULT 0x00000080 -#define wxACC_STATE_SYSTEM_EXPANDED 0x00000100 -#define wxACC_STATE_SYSTEM_EXTSELECTABLE 0x00000200 -#define wxACC_STATE_SYSTEM_FLOATING 0x00000400 -#define wxACC_STATE_SYSTEM_FOCUSABLE 0x00000800 -#define wxACC_STATE_SYSTEM_FOCUSED 0x00001000 -#define wxACC_STATE_SYSTEM_HOTTRACKED 0x00002000 -#define wxACC_STATE_SYSTEM_INVISIBLE 0x00004000 -#define wxACC_STATE_SYSTEM_MARQUEED 0x00008000 -#define wxACC_STATE_SYSTEM_MIXED 0x00010000 -#define wxACC_STATE_SYSTEM_MULTISELECTABLE 0x00020000 -#define wxACC_STATE_SYSTEM_OFFSCREEN 0x00040000 -#define wxACC_STATE_SYSTEM_PRESSED 0x00080000 -#define wxACC_STATE_SYSTEM_PROTECTED 0x00100000 -#define wxACC_STATE_SYSTEM_READONLY 0x00200000 -#define wxACC_STATE_SYSTEM_SELECTABLE 0x00400000 -#define wxACC_STATE_SYSTEM_SELECTED 0x00800000 -#define wxACC_STATE_SYSTEM_SELFVOICING 0x01000000 -#define wxACC_STATE_SYSTEM_UNAVAILABLE 0x02000000 - -// Selection flag - -enum wxAccSelectionFlags -{ - wxACC_SEL_NONE = 0, - wxACC_SEL_TAKEFOCUS = 1, - wxACC_SEL_TAKESELECTION = 2, - wxACC_SEL_EXTENDSELECTION = 4, - wxACC_SEL_ADDSELECTION = 8, - wxACC_SEL_REMOVESELECTION = 16 -}; - -// Accessibility event identifiers - -#define wxACC_EVENT_SYSTEM_SOUND 0x0001 -#define wxACC_EVENT_SYSTEM_ALERT 0x0002 -#define wxACC_EVENT_SYSTEM_FOREGROUND 0x0003 -#define wxACC_EVENT_SYSTEM_MENUSTART 0x0004 -#define wxACC_EVENT_SYSTEM_MENUEND 0x0005 -#define wxACC_EVENT_SYSTEM_MENUPOPUPSTART 0x0006 -#define wxACC_EVENT_SYSTEM_MENUPOPUPEND 0x0007 -#define wxACC_EVENT_SYSTEM_CAPTURESTART 0x0008 -#define wxACC_EVENT_SYSTEM_CAPTUREEND 0x0009 -#define wxACC_EVENT_SYSTEM_MOVESIZESTART 0x000A -#define wxACC_EVENT_SYSTEM_MOVESIZEEND 0x000B -#define wxACC_EVENT_SYSTEM_CONTEXTHELPSTART 0x000C -#define wxACC_EVENT_SYSTEM_CONTEXTHELPEND 0x000D -#define wxACC_EVENT_SYSTEM_DRAGDROPSTART 0x000E -#define wxACC_EVENT_SYSTEM_DRAGDROPEND 0x000F -#define wxACC_EVENT_SYSTEM_DIALOGSTART 0x0010 -#define wxACC_EVENT_SYSTEM_DIALOGEND 0x0011 -#define wxACC_EVENT_SYSTEM_SCROLLINGSTART 0x0012 -#define wxACC_EVENT_SYSTEM_SCROLLINGEND 0x0013 -#define wxACC_EVENT_SYSTEM_SWITCHSTART 0x0014 -#define wxACC_EVENT_SYSTEM_SWITCHEND 0x0015 -#define wxACC_EVENT_SYSTEM_MINIMIZESTART 0x0016 -#define wxACC_EVENT_SYSTEM_MINIMIZEEND 0x0017 -#define wxACC_EVENT_OBJECT_CREATE 0x8000 -#define wxACC_EVENT_OBJECT_DESTROY 0x8001 -#define wxACC_EVENT_OBJECT_SHOW 0x8002 -#define wxACC_EVENT_OBJECT_HIDE 0x8003 -#define wxACC_EVENT_OBJECT_REORDER 0x8004 -#define wxACC_EVENT_OBJECT_FOCUS 0x8005 -#define wxACC_EVENT_OBJECT_SELECTION 0x8006 -#define wxACC_EVENT_OBJECT_SELECTIONADD 0x8007 -#define wxACC_EVENT_OBJECT_SELECTIONREMOVE 0x8008 -#define wxACC_EVENT_OBJECT_SELECTIONWITHIN 0x8009 -#define wxACC_EVENT_OBJECT_STATECHANGE 0x800A -#define wxACC_EVENT_OBJECT_LOCATIONCHANGE 0x800B -#define wxACC_EVENT_OBJECT_NAMECHANGE 0x800C -#define wxACC_EVENT_OBJECT_DESCRIPTIONCHANGE 0x800D -#define wxACC_EVENT_OBJECT_VALUECHANGE 0x800E -#define wxACC_EVENT_OBJECT_PARENTCHANGE 0x800F -#define wxACC_EVENT_OBJECT_HELPCHANGE 0x8010 -#define wxACC_EVENT_OBJECT_DEFACTIONCHANGE 0x8011 -#define wxACC_EVENT_OBJECT_ACCELERATORCHANGE 0x8012 - -// ---------------------------------------------------------------------------- -// wxAccessible -// All functions return an indication of success, failure, or not implemented. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxAccessible; -class WXDLLIMPEXP_FWD_CORE wxWindow; -class WXDLLIMPEXP_FWD_CORE wxPoint; -class WXDLLIMPEXP_FWD_CORE wxRect; -class WXDLLIMPEXP_CORE wxAccessibleBase : public wxObject -{ - wxDECLARE_NO_COPY_CLASS(wxAccessibleBase); - -public: - wxAccessibleBase(wxWindow* win): m_window(win) {} - virtual ~wxAccessibleBase() {} - -// Overridables - - // Can return either a child object, or an integer - // representing the child element, starting from 1. - // pt is in screen coordinates. - virtual wxAccStatus HitTest(const wxPoint& WXUNUSED(pt), int* WXUNUSED(childId), wxAccessible** WXUNUSED(childObject)) - { return wxACC_NOT_IMPLEMENTED; } - - // Returns the rectangle for this object (id = 0) or a child element (id > 0). - // rect is in screen coordinates. - virtual wxAccStatus GetLocation(wxRect& WXUNUSED(rect), int WXUNUSED(elementId)) - { return wxACC_NOT_IMPLEMENTED; } - - // Navigates from fromId to toId/toObject. - virtual wxAccStatus Navigate(wxNavDir WXUNUSED(navDir), int WXUNUSED(fromId), - int* WXUNUSED(toId), wxAccessible** WXUNUSED(toObject)) - { return wxACC_NOT_IMPLEMENTED; } - - // Gets the name of the specified object. - virtual wxAccStatus GetName(int WXUNUSED(childId), wxString* WXUNUSED(name)) - { return wxACC_NOT_IMPLEMENTED; } - - // Gets the number of children. - virtual wxAccStatus GetChildCount(int* WXUNUSED(childCount)) - { return wxACC_NOT_IMPLEMENTED; } - - // Gets the specified child (starting from 1). - // If *child is NULL and return value is wxACC_OK, - // this means that the child is a simple element and - // not an accessible object. - virtual wxAccStatus GetChild(int WXUNUSED(childId), wxAccessible** WXUNUSED(child)) - { return wxACC_NOT_IMPLEMENTED; } - - // Gets the parent, or NULL. - virtual wxAccStatus GetParent(wxAccessible** WXUNUSED(parent)) - { return wxACC_NOT_IMPLEMENTED; } - - // Performs the default action. childId is 0 (the action for this object) - // or > 0 (the action for a child). - // Return wxACC_NOT_SUPPORTED if there is no default action for this - // window (e.g. an edit control). - virtual wxAccStatus DoDefaultAction(int WXUNUSED(childId)) - { return wxACC_NOT_IMPLEMENTED; } - - // Gets the default action for this object (0) or > 0 (the action for a child). - // Return wxACC_OK even if there is no action. actionName is the action, or the empty - // string if there is no action. - // The retrieved string describes the action that is performed on an object, - // not what the object does as a result. For example, a toolbar button that prints - // a document has a default action of "Press" rather than "Prints the current document." - virtual wxAccStatus GetDefaultAction(int WXUNUSED(childId), wxString* WXUNUSED(actionName)) - { return wxACC_NOT_IMPLEMENTED; } - - // Returns the description for this object or a child. - virtual wxAccStatus GetDescription(int WXUNUSED(childId), wxString* WXUNUSED(description)) - { return wxACC_NOT_IMPLEMENTED; } - - // Returns help text for this object or a child, similar to tooltip text. - virtual wxAccStatus GetHelpText(int WXUNUSED(childId), wxString* WXUNUSED(helpText)) - { return wxACC_NOT_IMPLEMENTED; } - - // Returns the keyboard shortcut for this object or child. - // Return e.g. ALT+K - virtual wxAccStatus GetKeyboardShortcut(int WXUNUSED(childId), wxString* WXUNUSED(shortcut)) - { return wxACC_NOT_IMPLEMENTED; } - - // Returns a role constant. - virtual wxAccStatus GetRole(int WXUNUSED(childId), wxAccRole* WXUNUSED(role)) - { return wxACC_NOT_IMPLEMENTED; } - - // Returns a state constant. - virtual wxAccStatus GetState(int WXUNUSED(childId), long* WXUNUSED(state)) - { return wxACC_NOT_IMPLEMENTED; } - - // Returns a localized string representing the value for the object - // or child. - virtual wxAccStatus GetValue(int WXUNUSED(childId), wxString* WXUNUSED(strValue)) - { return wxACC_NOT_IMPLEMENTED; } - - // Selects the object or child. - virtual wxAccStatus Select(int WXUNUSED(childId), wxAccSelectionFlags WXUNUSED(selectFlags)) - { return wxACC_NOT_IMPLEMENTED; } - - // Gets the window with the keyboard focus. - // If childId is 0 and child is NULL, no object in - // this subhierarchy has the focus. - // If this object has the focus, child should be 'this'. - virtual wxAccStatus GetFocus(int* WXUNUSED(childId), wxAccessible** WXUNUSED(child)) - { return wxACC_NOT_IMPLEMENTED; } - -#if wxUSE_VARIANT - // Gets a variant representing the selected children - // of this object. - // Acceptable values: - // - a null variant (IsNull() returns TRUE) - // - a list variant (GetType() == wxT("list")) - // - an integer representing the selected child element, - // or 0 if this object is selected (GetType() == wxT("long")) - // - a "void*" pointer to a wxAccessible child object - virtual wxAccStatus GetSelections(wxVariant* WXUNUSED(selections)) - { return wxACC_NOT_IMPLEMENTED; } -#endif // wxUSE_VARIANT - -// Accessors - - // Returns the window associated with this object. - - wxWindow* GetWindow() { return m_window; } - - // Sets the window associated with this object. - - void SetWindow(wxWindow* window) { m_window = window; } - -// Operations - - // Each platform's implementation must define this - // static void NotifyEvent(int eventType, wxWindow* window, wxAccObject objectType, - // int objectId); - -private: - -// Data members - - wxWindow* m_window; -}; - - -// ---------------------------------------------------------------------------- -// now include the declaration of the real class -// ---------------------------------------------------------------------------- - -#if defined(__WXMSW__) - #include "wx/msw/ole/access.h" -#endif - -#endif // wxUSE_ACCESSIBILITY - -#endif // _WX_ACCESSBASE_H_ - diff --git a/Externals/wxWidgets3/include/wx/activityindicator.h b/Externals/wxWidgets3/include/wx/activityindicator.h deleted file mode 100644 index 2d01bdb6cf..0000000000 --- a/Externals/wxWidgets3/include/wx/activityindicator.h +++ /dev/null @@ -1,60 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/activityindicator.h -// Purpose: wxActivityIndicator declaration. -// Author: Vadim Zeitlin -// Created: 2015-03-05 -// Copyright: (c) 2015 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_ACTIVITYINDICATOR_H_ -#define _WX_ACTIVITYINDICATOR_H_ - -#include "wx/defs.h" - -#if wxUSE_ACTIVITYINDICATOR - -#include "wx/control.h" - -#define wxActivityIndicatorNameStr wxS("activityindicator") - -// ---------------------------------------------------------------------------- -// wxActivityIndicator: small animated indicator of some application activity. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxActivityIndicatorBase : public wxControl -{ -public: - // Start or stop the activity animation (it is stopped initially). - virtual void Start() = 0; - virtual void Stop() = 0; - - // Return true if the control is currently showing activity. - virtual bool IsRunning() const = 0; - - // Override some base class virtual methods. - virtual bool AcceptsFocus() const wxOVERRIDE { return false; } - virtual bool HasTransparentBackground() wxOVERRIDE { return true; } - -protected: - // choose the default border for this window - virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } -}; - -#ifndef __WXUNIVERSAL__ -#if defined(__WXGTK220__) - #define wxHAS_NATIVE_ACTIVITYINDICATOR - #include "wx/gtk/activityindicator.h" -#elif defined(__WXOSX_COCOA__) - #define wxHAS_NATIVE_ACTIVITYINDICATOR - #include "wx/osx/activityindicator.h" -#endif -#endif // !__WXUNIVERSAL__ - -#ifndef wxHAS_NATIVE_ACTIVITYINDICATOR - #include "wx/generic/activityindicator.h" -#endif - -#endif // wxUSE_ACTIVITYINDICATOR - -#endif // _WX_ACTIVITYINDICATOR_H_ diff --git a/Externals/wxWidgets3/include/wx/addremovectrl.h b/Externals/wxWidgets3/include/wx/addremovectrl.h deleted file mode 100644 index 78a34e7073..0000000000 --- a/Externals/wxWidgets3/include/wx/addremovectrl.h +++ /dev/null @@ -1,109 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/addremovectrl.h -// Purpose: wxAddRemoveCtrl declaration. -// Author: Vadim Zeitlin -// Created: 2015-01-29 -// Copyright: (c) 2015 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_ADDREMOVECTRL_H_ -#define _WX_ADDREMOVECTRL_H_ - -#include "wx/panel.h" - -#if wxUSE_ADDREMOVECTRL - -extern WXDLLIMPEXP_DATA_ADV(const char) wxAddRemoveCtrlNameStr[]; - -// ---------------------------------------------------------------------------- -// wxAddRemoveAdaptor: used by wxAddRemoveCtrl to work with the list control -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxAddRemoveAdaptor -{ -public: - // Default ctor and trivial but virtual dtor. - wxAddRemoveAdaptor() { } - virtual ~wxAddRemoveAdaptor() { } - - // Override to return the associated control. - virtual wxWindow* GetItemsCtrl() const = 0; - - // Override to return whether a new item can be added to the control. - virtual bool CanAdd() const = 0; - - // Override to return whether the currently selected item (if any) can be - // removed from the control. - virtual bool CanRemove() const = 0; - - // Called when an item should be added, can only be called if CanAdd() - // currently returns true. - virtual void OnAdd() = 0; - - // Called when the current item should be removed, can only be called if - // CanRemove() currently returns true. - virtual void OnRemove() = 0; - -private: - wxDECLARE_NO_COPY_CLASS(wxAddRemoveAdaptor); -}; - -// ---------------------------------------------------------------------------- -// wxAddRemoveCtrl: a list-like control combined with add/remove buttons -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxAddRemoveCtrl : public wxPanel -{ -public: - wxAddRemoveCtrl() - { - Init(); - } - - wxAddRemoveCtrl(wxWindow* parent, - wxWindowID winid = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxAddRemoveCtrlNameStr) - { - Init(); - - Create(parent, winid, pos, size, style, name); - } - - bool Create(wxWindow* parent, - wxWindowID winid = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxAddRemoveCtrlNameStr); - - virtual ~wxAddRemoveCtrl(); - - // Must be called for the control to be usable, takes ownership of the - // pointer. - void SetAdaptor(wxAddRemoveAdaptor* adaptor); - - // Set tooltips to use for the add and remove buttons. - void SetButtonsToolTips(const wxString& addtip, const wxString& removetip); - -protected: - virtual wxSize DoGetBestClientSize() const wxOVERRIDE; - -private: - // Common part of all ctors. - void Init() - { - m_impl = NULL; - } - - class wxAddRemoveImpl* m_impl; - - wxDECLARE_NO_COPY_CLASS(wxAddRemoveCtrl); -}; - -#endif // wxUSE_ADDREMOVECTRL - -#endif // _WX_ADDREMOVECTRL_H_ diff --git a/Externals/wxWidgets3/include/wx/affinematrix2d.h b/Externals/wxWidgets3/include/wx/affinematrix2d.h deleted file mode 100644 index ce383a96ac..0000000000 --- a/Externals/wxWidgets3/include/wx/affinematrix2d.h +++ /dev/null @@ -1,51 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/affinematrix2d.h -// Purpose: wxAffineMatrix2D class. -// Author: Based on wxTransformMatrix by Chris Breeze, Julian Smart -// Created: 2011-04-05 -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_AFFINEMATRIX2D_H_ -#define _WX_AFFINEMATRIX2D_H_ - -#include "wx/defs.h" - -#if wxUSE_GEOMETRY - -#include "wx/affinematrix2dbase.h" - -// A simple implementation of wxAffineMatrix2DBase interface done entirely in -// wxWidgets. -class WXDLLIMPEXP_CORE wxAffineMatrix2D : public wxAffineMatrix2DBase -{ -public: - wxAffineMatrix2D() : m_11(1), m_12(0), - m_21(0), m_22(1), - m_tx(0), m_ty(0) - { - } - - // Implement base class pure virtual methods. - virtual void Set(const wxMatrix2D& mat2D, const wxPoint2DDouble& tr) wxOVERRIDE; - virtual void Get(wxMatrix2D* mat2D, wxPoint2DDouble* tr) const wxOVERRIDE; - virtual void Concat(const wxAffineMatrix2DBase& t) wxOVERRIDE; - virtual bool Invert() wxOVERRIDE; - virtual bool IsIdentity() const wxOVERRIDE; - virtual bool IsEqual(const wxAffineMatrix2DBase& t) const wxOVERRIDE; - virtual void Translate(wxDouble dx, wxDouble dy) wxOVERRIDE; - virtual void Scale(wxDouble xScale, wxDouble yScale) wxOVERRIDE; - virtual void Rotate(wxDouble cRadians) wxOVERRIDE; - -protected: - virtual wxPoint2DDouble DoTransformPoint(const wxPoint2DDouble& p) const wxOVERRIDE; - virtual wxPoint2DDouble DoTransformDistance(const wxPoint2DDouble& p) const wxOVERRIDE; - -private: - wxDouble m_11, m_12, m_21, m_22, m_tx, m_ty; -}; - -#endif // wxUSE_GEOMETRY - -#endif // _WX_AFFINEMATRIX2D_H_ diff --git a/Externals/wxWidgets3/include/wx/affinematrix2dbase.h b/Externals/wxWidgets3/include/wx/affinematrix2dbase.h deleted file mode 100644 index 94b1955aa3..0000000000 --- a/Externals/wxWidgets3/include/wx/affinematrix2dbase.h +++ /dev/null @@ -1,127 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/affinematrix2dbase.h -// Purpose: Common interface for 2D transformation matrices. -// Author: Catalin Raceanu -// Created: 2011-04-06 -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_AFFINEMATRIX2DBASE_H_ -#define _WX_AFFINEMATRIX2DBASE_H_ - -#include "wx/defs.h" - -#if wxUSE_GEOMETRY - -#include "wx/geometry.h" - -struct wxMatrix2D -{ - wxMatrix2D(wxDouble v11 = 1, - wxDouble v12 = 0, - wxDouble v21 = 0, - wxDouble v22 = 1) - { - m_11 = v11; m_12 = v12; - m_21 = v21; m_22 = v22; - } - - wxDouble m_11, m_12, m_21, m_22; -}; - -// A 2x3 matrix representing an affine 2D transformation. -// -// This is an abstract base class implemented by wxAffineMatrix2D only so far, -// but in the future we also plan to derive wxGraphicsMatrix from it (it should -// also be documented then as currently only wxAffineMatrix2D itself is). -class WXDLLIMPEXP_CORE wxAffineMatrix2DBase -{ -public: - wxAffineMatrix2DBase() {} - virtual ~wxAffineMatrix2DBase() {} - - // sets the matrix to the respective values - virtual void Set(const wxMatrix2D& mat2D, const wxPoint2DDouble& tr) = 0; - - // gets the component valuess of the matrix - virtual void Get(wxMatrix2D* mat2D, wxPoint2DDouble* tr) const = 0; - - // concatenates the matrix - virtual void Concat(const wxAffineMatrix2DBase& t) = 0; - - // makes this the inverse matrix - virtual bool Invert() = 0; - - // return true if this is the identity matrix - virtual bool IsIdentity() const = 0; - - // returns true if the elements of the transformation matrix are equal ? - virtual bool IsEqual(const wxAffineMatrix2DBase& t) const = 0; - bool operator==(const wxAffineMatrix2DBase& t) const { return IsEqual(t); } - bool operator!=(const wxAffineMatrix2DBase& t) const { return !IsEqual(t); } - - - // - // transformations - // - - // add the translation to this matrix - virtual void Translate(wxDouble dx, wxDouble dy) = 0; - - // add the scale to this matrix - virtual void Scale(wxDouble xScale, wxDouble yScale) = 0; - - // add the rotation to this matrix (counter clockwise, radians) - virtual void Rotate(wxDouble ccRadians) = 0; - - // add mirroring to this matrix - void Mirror(int direction = wxHORIZONTAL) - { - wxDouble x = (direction & wxHORIZONTAL) ? -1 : 1; - wxDouble y = (direction & wxVERTICAL) ? -1 : 1; - Scale(x, y); - } - - - // applies that matrix to the point - wxPoint2DDouble TransformPoint(const wxPoint2DDouble& src) const - { - return DoTransformPoint(src); - } - - void TransformPoint(wxDouble* x, wxDouble* y) const - { - wxCHECK_RET( x && y, "Can't be NULL" ); - - const wxPoint2DDouble dst = DoTransformPoint(wxPoint2DDouble(*x, *y)); - *x = dst.m_x; - *y = dst.m_y; - } - - // applies the matrix except for translations - wxPoint2DDouble TransformDistance(const wxPoint2DDouble& src) const - { - return DoTransformDistance(src); - } - - void TransformDistance(wxDouble* dx, wxDouble* dy) const - { - wxCHECK_RET( dx && dy, "Can't be NULL" ); - - const wxPoint2DDouble - dst = DoTransformDistance(wxPoint2DDouble(*dx, *dy)); - *dx = dst.m_x; - *dy = dst.m_y; - } - -protected: - virtual - wxPoint2DDouble DoTransformPoint(const wxPoint2DDouble& p) const = 0; - virtual - wxPoint2DDouble DoTransformDistance(const wxPoint2DDouble& p) const = 0; -}; - -#endif // wxUSE_GEOMETRY - -#endif // _WX_AFFINEMATRIX2DBASE_H_ diff --git a/Externals/wxWidgets3/include/wx/afterstd.h b/Externals/wxWidgets3/include/wx/afterstd.h deleted file mode 100644 index 1c89d14758..0000000000 --- a/Externals/wxWidgets3/include/wx/afterstd.h +++ /dev/null @@ -1,27 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/afterstd.h -// Purpose: #include after STL headers -// Author: Vadim Zeitlin -// Modified by: -// Created: 07/07/03 -// Copyright: (c) 2003 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -/** - See the comments in beforestd.h. - */ - -#if defined(__WINDOWS__) - #include "wx/msw/winundef.h" -#endif - -// undo what we did in wx/beforestd.h -#if defined(__VISUALC__) && __VISUALC__ <= 1201 - #pragma warning(pop) -#endif - -// see beforestd.h for explanation -#if defined(HAVE_VISIBILITY) && defined(HAVE_BROKEN_LIBSTDCXX_VISIBILITY) - #pragma GCC visibility pop -#endif diff --git a/Externals/wxWidgets3/include/wx/anidecod.h b/Externals/wxWidgets3/include/wx/anidecod.h deleted file mode 100644 index 4a112410c8..0000000000 --- a/Externals/wxWidgets3/include/wx/anidecod.h +++ /dev/null @@ -1,80 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/anidecod.h -// Purpose: wxANIDecoder, ANI reader for wxImage and wxAnimation -// Author: Francesco Montorsi -// Copyright: (c) 2006 Francesco Montorsi -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_ANIDECOD_H -#define _WX_ANIDECOD_H - -#include "wx/defs.h" - -#if wxUSE_STREAMS && (wxUSE_ICO_CUR || wxUSE_GIF) - -#include "wx/stream.h" -#include "wx/image.h" -#include "wx/animdecod.h" -#include "wx/dynarray.h" - - -class /*WXDLLIMPEXP_CORE*/ wxANIFrameInfo; // private implementation detail - -WX_DECLARE_EXPORTED_OBJARRAY(wxANIFrameInfo, wxANIFrameInfoArray); -WX_DECLARE_EXPORTED_OBJARRAY(wxImage, wxImageArray); - -// -------------------------------------------------------------------------- -// wxANIDecoder class -// -------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxANIDecoder : public wxAnimationDecoder -{ -public: - // constructor, destructor, etc. - wxANIDecoder(); - ~wxANIDecoder(); - - - virtual wxSize GetFrameSize(unsigned int frame) const wxOVERRIDE; - virtual wxPoint GetFramePosition(unsigned int frame) const wxOVERRIDE; - virtual wxAnimationDisposal GetDisposalMethod(unsigned int frame) const wxOVERRIDE; - virtual long GetDelay(unsigned int frame) const wxOVERRIDE; - virtual wxColour GetTransparentColour(unsigned int frame) const wxOVERRIDE; - - // implementation of wxAnimationDecoder's pure virtuals - - virtual bool Load( wxInputStream& stream ) wxOVERRIDE; - - bool ConvertToImage(unsigned int frame, wxImage *image) const wxOVERRIDE; - - wxAnimationDecoder *Clone() const wxOVERRIDE - { return new wxANIDecoder; } - wxAnimationType GetType() const wxOVERRIDE - { return wxANIMATION_TYPE_ANI; } - -private: - // wxAnimationDecoder pure virtual: - virtual bool DoCanRead( wxInputStream& stream ) const wxOVERRIDE; - // modifies current stream position (see wxAnimationDecoder::CanRead) - - // frames stored as wxImage(s): ANI files are meant to be used mostly for animated - // cursors and thus they do not use any optimization to encode differences between - // two frames: they are just a list of images to display sequentially. - wxImageArray m_images; - - // the info about each image stored in m_images. - // NB: m_info.GetCount() may differ from m_images.GetCount()! - wxANIFrameInfoArray m_info; - - // this is the wxCURHandler used to load the ICON chunk of the ANI files - static wxCURHandler sm_handler; - - - wxDECLARE_NO_COPY_CLASS(wxANIDecoder); -}; - - -#endif // wxUSE_STREAMS && (wxUSE_ICO_CUR || wxUSE_GIF) - -#endif // _WX_ANIDECOD_H diff --git a/Externals/wxWidgets3/include/wx/animate.h b/Externals/wxWidgets3/include/wx/animate.h deleted file mode 100644 index 77ec3bf4f0..0000000000 --- a/Externals/wxWidgets3/include/wx/animate.h +++ /dev/null @@ -1,125 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/animate.h -// Purpose: wxAnimation and wxAnimationCtrl -// Author: Julian Smart and Guillermo Rodriguez Garcia -// Modified by: Francesco Montorsi -// Created: 13/8/99 -// Copyright: (c) Julian Smart and Guillermo Rodriguez Garcia -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_ANIMATE_H_ -#define _WX_ANIMATE_H_ - -#include "wx/defs.h" - -#if wxUSE_ANIMATIONCTRL - -#include "wx/animdecod.h" -#include "wx/control.h" -#include "wx/timer.h" -#include "wx/bitmap.h" - -class WXDLLIMPEXP_FWD_ADV wxAnimation; - -extern WXDLLIMPEXP_DATA_ADV(wxAnimation) wxNullAnimation; -extern WXDLLIMPEXP_DATA_ADV(const char) wxAnimationCtrlNameStr[]; - - -// ---------------------------------------------------------------------------- -// wxAnimationBase -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxAnimationBase : public wxObject -{ -public: - wxAnimationBase() {} - - virtual bool IsOk() const = 0; - - // can be -1 - virtual int GetDelay(unsigned int frame) const = 0; - - virtual unsigned int GetFrameCount() const = 0; - virtual wxImage GetFrame(unsigned int frame) const = 0; - virtual wxSize GetSize() const = 0; - - virtual bool LoadFile(const wxString& name, - wxAnimationType type = wxANIMATION_TYPE_ANY) = 0; - virtual bool Load(wxInputStream& stream, - wxAnimationType type = wxANIMATION_TYPE_ANY) = 0; - -protected: - wxDECLARE_ABSTRACT_CLASS(wxAnimationBase); -}; - - - -// ---------------------------------------------------------------------------- -// wxAnimationCtrlBase -// ---------------------------------------------------------------------------- - -// do not autoresize to the animation's size when SetAnimation() is called -#define wxAC_NO_AUTORESIZE (0x0010) - -// default style does not include wxAC_NO_AUTORESIZE, that is, the control -// auto-resizes by default to fit the new animation when SetAnimation() is called -#define wxAC_DEFAULT_STYLE (wxBORDER_NONE) - -class WXDLLIMPEXP_ADV wxAnimationCtrlBase : public wxControl -{ -public: - wxAnimationCtrlBase() { } - - // public API - virtual bool LoadFile(const wxString& filename, - wxAnimationType type = wxANIMATION_TYPE_ANY) = 0; - virtual bool Load(wxInputStream& stream, - wxAnimationType type = wxANIMATION_TYPE_ANY) = 0; - - virtual void SetAnimation(const wxAnimation &anim) = 0; - virtual wxAnimation GetAnimation() const = 0; - - virtual bool Play() = 0; - virtual void Stop() = 0; - - virtual bool IsPlaying() const = 0; - - virtual void SetInactiveBitmap(const wxBitmap &bmp); - - // always return the original bitmap set in this control - wxBitmap GetInactiveBitmap() const - { return m_bmpStatic; } - -protected: - // the inactive bitmap as it was set by the user - wxBitmap m_bmpStatic; - - // the inactive bitmap currently shown in the control - // (may differ in the size from m_bmpStatic) - wxBitmap m_bmpStaticReal; - - // updates m_bmpStaticReal from m_bmpStatic if needed - virtual void UpdateStaticImage(); - - // called by SetInactiveBitmap - virtual void DisplayStaticImage() = 0; - -private: - wxDECLARE_ABSTRACT_CLASS(wxAnimationCtrlBase); -}; - - -// ---------------------------------------------------------------------------- -// include the platform-specific version of the wxAnimationCtrl class -// ---------------------------------------------------------------------------- - -#if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__) - #include "wx/gtk/animate.h" -#else - #include "wx/generic/animate.h" -#endif - -#endif // wxUSE_ANIMATIONCTRL - -#endif // _WX_ANIMATE_H_ diff --git a/Externals/wxWidgets3/include/wx/animdecod.h b/Externals/wxWidgets3/include/wx/animdecod.h deleted file mode 100644 index 58177e68fd..0000000000 --- a/Externals/wxWidgets3/include/wx/animdecod.h +++ /dev/null @@ -1,170 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/animdecod.h -// Purpose: wxAnimationDecoder -// Author: Francesco Montorsi -// Copyright: (c) 2006 Francesco Montorsi -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_ANIMDECOD_H -#define _WX_ANIMDECOD_H - -#include "wx/defs.h" - -#if wxUSE_STREAMS - -#include "wx/colour.h" -#include "wx/gdicmn.h" -#include "wx/log.h" -#include "wx/stream.h" - -class WXDLLIMPEXP_FWD_CORE wxImage; - -/* - - Differences between a wxAnimationDecoder and a wxImageHandler: - - 1) wxImageHandlers always load an input stream directly into a given wxImage - object converting from the format-specific data representation to the - wxImage native format (RGB24). - wxAnimationDecoders always load an input stream using some optimized format - to store it which is format-depedent. This allows to store a (possibly big) - animation using a format which is a good compromise between required memory - and time required to blit it on the screen. - - 2) wxAnimationDecoders contain the animation data in some internal variable. - That's why they derive from wxObjectRefData: they are data which can be shared. - - 3) wxAnimationDecoders can be used by a wxImageHandler to retrieve a frame - in wxImage format; the viceversa cannot be done. - - 4) wxAnimationDecoders are decoders only, thus they do not support save features. - - 5) wxAnimationDecoders are directly used by wxAnimation (generic implementation) - as wxObjectRefData while they need to be 'wrapped' by a wxImageHandler for - wxImage uses. - -*/ - - -// -------------------------------------------------------------------------- -// Constants -// -------------------------------------------------------------------------- - -// NB: the values of these enum items are not casual but coincide with the -// GIF disposal codes. Do not change them !! -enum wxAnimationDisposal -{ - // No disposal specified. The decoder is not required to take any action. - wxANIM_UNSPECIFIED = -1, - - // Do not dispose. The graphic is to be left in place. - wxANIM_DONOTREMOVE = 0, - - // Restore to background color. The area used by the graphic must be - // restored to the background color. - wxANIM_TOBACKGROUND = 1, - - // Restore to previous. The decoder is required to restore the area - // overwritten by the graphic with what was there prior to rendering the graphic. - wxANIM_TOPREVIOUS = 2 -}; - -enum wxAnimationType -{ - wxANIMATION_TYPE_INVALID, - wxANIMATION_TYPE_GIF, - wxANIMATION_TYPE_ANI, - - wxANIMATION_TYPE_ANY -}; - - -// -------------------------------------------------------------------------- -// wxAnimationDecoder class -// -------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxAnimationDecoder : public wxObjectRefData -{ -public: - wxAnimationDecoder() - { - m_nFrames = 0; - } - - virtual bool Load( wxInputStream& stream ) = 0; - - bool CanRead( wxInputStream& stream ) const - { - // NOTE: this code is the same of wxImageHandler::CallDoCanRead - - if ( !stream.IsSeekable() ) - return false; // can't test unseekable stream - - wxFileOffset posOld = stream.TellI(); - bool ok = DoCanRead(stream); - - // restore the old position to be able to test other formats and so on - if ( stream.SeekI(posOld) == wxInvalidOffset ) - { - wxLogDebug(wxT("Failed to rewind the stream in wxAnimationDecoder!")); - - // reading would fail anyhow as we're not at the right position - return false; - } - - return ok; - } - - virtual wxAnimationDecoder *Clone() const = 0; - virtual wxAnimationType GetType() const = 0; - - // convert given frame to wxImage - virtual bool ConvertToImage(unsigned int frame, wxImage *image) const = 0; - - - // frame specific data getters - - // not all frames may be of the same size; e.g. GIF allows to - // specify that between two frames only a smaller portion of the - // entire animation has changed. - virtual wxSize GetFrameSize(unsigned int frame) const = 0; - - // the position of this frame in case it's not as big as m_szAnimation - // or wxPoint(0,0) otherwise. - virtual wxPoint GetFramePosition(unsigned int frame) const = 0; - - // what should be done after displaying this frame. - virtual wxAnimationDisposal GetDisposalMethod(unsigned int frame) const = 0; - - // the number of milliseconds this frame should be displayed. - // if returns -1 then the frame must be displayed forever. - virtual long GetDelay(unsigned int frame) const = 0; - - // the transparent colour for this frame if any or wxNullColour. - virtual wxColour GetTransparentColour(unsigned int frame) const = 0; - - // get global data - wxSize GetAnimationSize() const { return m_szAnimation; } - wxColour GetBackgroundColour() const { return m_background; } - unsigned int GetFrameCount() const { return m_nFrames; } - -protected: - // checks the signature of the data in the given stream and returns true if it - // appears to be a valid animation format recognized by the animation decoder; - // this function should modify the stream current position without taking care - // of restoring it since CanRead() will do it. - virtual bool DoCanRead(wxInputStream& stream) const = 0; - - wxSize m_szAnimation; - unsigned int m_nFrames; - - // this is the colour to use for the wxANIM_TOBACKGROUND disposal. - // if not specified by the animation, it's set to wxNullColour - wxColour m_background; -}; - -#endif // wxUSE_STREAMS - -#endif // _WX_ANIMDECOD_H - diff --git a/Externals/wxWidgets3/include/wx/any.h b/Externals/wxWidgets3/include/wx/any.h deleted file mode 100644 index 2b37bafa5e..0000000000 --- a/Externals/wxWidgets3/include/wx/any.h +++ /dev/null @@ -1,1120 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/any.h -// Purpose: wxAny class -// Author: Jaakko Salli -// Modified by: -// Created: 07/05/2009 -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_ANY_H_ -#define _WX_ANY_H_ - -#include "wx/defs.h" - -#if wxUSE_ANY - -#include // for placement new -#include "wx/string.h" -#include "wx/meta/if.h" -#include "wx/typeinfo.h" -#include "wx/list.h" - -// Size of the wxAny value buffer. -enum -{ - WX_ANY_VALUE_BUFFER_SIZE = 16 -}; - -union wxAnyValueBuffer -{ - union Alignment - { - #if wxHAS_INT64 - wxInt64 m_int64; - #endif - long double m_longDouble; - void ( *m_funcPtr )(void); - void ( wxAnyValueBuffer::*m_mFuncPtr )(void); - } m_alignment; - - void* m_ptr; - wxByte m_buffer[WX_ANY_VALUE_BUFFER_SIZE]; -}; - -// -// wxAnyValueType is base class for value type functionality for C++ data -// types used with wxAny. Usually the default template (wxAnyValueTypeImpl<>) -// will create a satisfactory wxAnyValueType implementation for a data type. -// -class WXDLLIMPEXP_BASE wxAnyValueType -{ - WX_DECLARE_ABSTRACT_TYPEINFO(wxAnyValueType) -public: - /** - Default constructor. - */ - wxAnyValueType() - { - } - - /** - Destructor. - */ - virtual ~wxAnyValueType() - { - } - - /** - This function is used for internal type matching. - */ - virtual bool IsSameType(const wxAnyValueType* otherType) const = 0; - - /** - This function is called every time the data in wxAny - buffer needs to be freed. - */ - virtual void DeleteValue(wxAnyValueBuffer& buf) const = 0; - - /** - Implement this for buffer-to-buffer copy. - - @param src - This is the source data buffer. - - @param dst - This is the destination data buffer that is in either - uninitialized or freed state. - */ - virtual void CopyBuffer(const wxAnyValueBuffer& src, - wxAnyValueBuffer& dst) const = 0; - - /** - Convert value into buffer of different type. Return false if - not possible. - */ - virtual bool ConvertValue(const wxAnyValueBuffer& src, - wxAnyValueType* dstType, - wxAnyValueBuffer& dst) const = 0; - - /** - Use this template function for checking if wxAnyValueType represents - a specific C++ data type. - - @see wxAny::CheckType() - */ - template - bool CheckType() const; - -#if wxUSE_EXTENDED_RTTI - virtual const wxTypeInfo* GetTypeInfo() const = 0; -#endif -private: -}; - - -// -// We need to allocate wxAnyValueType instances in heap, and need to use -// scoped ptr to properly deallocate them in dynamic library use cases. -// Here we have a minimal specialized scoped ptr implementation to deal -// with various compiler-specific problems with template class' static -// member variable of template type with explicit constructor which -// is initialized in global scope. -// -class wxAnyValueTypeScopedPtr -{ -public: - wxAnyValueTypeScopedPtr(wxAnyValueType* ptr) : m_ptr(ptr) { } - ~wxAnyValueTypeScopedPtr() { delete m_ptr; } - wxAnyValueType* get() const { return m_ptr; } -private: - wxAnyValueType* m_ptr; -}; - - -// Deprecated macro for checking the type which was originally introduced for -// MSVC6 compatibility and is not needed any longer now that this compiler is -// not supported any more. -#define wxANY_VALUE_TYPE_CHECK_TYPE(valueTypePtr, T) \ - wxAnyValueTypeImpl::IsSameClass(valueTypePtr) - - -/** - Helper macro for defining user value types. - - Even though C++ RTTI would be fully available to use, we'd have to to - facilitate sub-type system which allows, for instance, wxAny with - signed short '15' to be treated equal to wxAny with signed long long '15'. - Having sm_instance is important here. - - NB: We really need to have wxAnyValueType instances allocated - in heap. They are stored as static template member variables, - and with them we just can't be too careful (eg. not allocating - them in heap broke the type identification in GCC). -*/ -#define WX_DECLARE_ANY_VALUE_TYPE(CLS) \ - friend class wxAny; \ - WX_DECLARE_TYPEINFO_INLINE(CLS) \ -public: \ - static bool IsSameClass(const wxAnyValueType* otherType) \ - { \ - return AreSameClasses(*sm_instance.get(), *otherType); \ - } \ - virtual bool IsSameType(const wxAnyValueType* otherType) const wxOVERRIDE \ - { \ - return IsSameClass(otherType); \ - } \ -private: \ - static bool AreSameClasses(const wxAnyValueType& a, const wxAnyValueType& b) \ - { \ - return wxTypeId(a) == wxTypeId(b); \ - } \ - static wxAnyValueTypeScopedPtr sm_instance; \ -public: \ - static wxAnyValueType* GetInstance() \ - { \ - return sm_instance.get(); \ - } - - -#define WX_IMPLEMENT_ANY_VALUE_TYPE(CLS) \ -wxAnyValueTypeScopedPtr CLS::sm_instance(new CLS()); - - -/** - Following are helper classes for the wxAnyValueTypeImplBase. -*/ -namespace wxPrivate -{ - -template -class wxAnyValueTypeOpsInplace -{ -public: - static void DeleteValue(wxAnyValueBuffer& buf) - { - GetValue(buf).~T(); - } - - static void SetValue(const T& value, - wxAnyValueBuffer& buf) - { - // Use placement new - void* const place = buf.m_buffer; - ::new(place) T(value); - } - - static const T& GetValue(const wxAnyValueBuffer& buf) - { - // Use a union to avoid undefined behaviour (and gcc -Wstrict-alias - // warnings about it) which would occur if we just casted a wxByte - // pointer to a T one. - union - { - const T* ptr; - const wxByte *buf; - } u; - u.buf = buf.m_buffer; - - return *u.ptr; - } -}; - - -template -class wxAnyValueTypeOpsGeneric -{ -public: - template - class DataHolder - { - public: - DataHolder(const T2& value) - { - m_value = value; - } - virtual ~DataHolder() { } - - T2 m_value; - private: - wxDECLARE_NO_COPY_CLASS(DataHolder); - }; - - static void DeleteValue(wxAnyValueBuffer& buf) - { - DataHolder* holder = static_cast*>(buf.m_ptr); - delete holder; - } - - static void SetValue(const T& value, - wxAnyValueBuffer& buf) - { - DataHolder* holder = new DataHolder(value); - buf.m_ptr = holder; - } - - static const T& GetValue(const wxAnyValueBuffer& buf) - { - DataHolder* holder = static_cast*>(buf.m_ptr); - return holder->m_value; - } -}; - - -template -struct wxAnyAsImpl; - -} // namespace wxPrivate - - -/** - Intermediate template for the generic value type implementation. - We can derive from this same value type for multiple actual types - (for instance, we can have wxAnyValueTypeImplInt for all signed - integer types), and also easily implement specialized templates - with specific dynamic type conversion. -*/ -template -class wxAnyValueTypeImplBase : public wxAnyValueType -{ - typedef typename wxIf< sizeof(T) <= WX_ANY_VALUE_BUFFER_SIZE, - wxPrivate::wxAnyValueTypeOpsInplace, - wxPrivate::wxAnyValueTypeOpsGeneric >::value - Ops; - -public: - wxAnyValueTypeImplBase() : wxAnyValueType() { } - virtual ~wxAnyValueTypeImplBase() { } - - virtual void DeleteValue(wxAnyValueBuffer& buf) const wxOVERRIDE - { - Ops::DeleteValue(buf); - } - - virtual void CopyBuffer(const wxAnyValueBuffer& src, - wxAnyValueBuffer& dst) const wxOVERRIDE - { - Ops::SetValue(Ops::GetValue(src), dst); - } - - /** - It is important to reimplement this in any specialized template - classes that inherit from wxAnyValueTypeImplBase. - */ - static void SetValue(const T& value, - wxAnyValueBuffer& buf) - { - Ops::SetValue(value, buf); - } - - /** - It is important to reimplement this in any specialized template - classes that inherit from wxAnyValueTypeImplBase. - */ - static const T& GetValue(const wxAnyValueBuffer& buf) - { - return Ops::GetValue(buf); - } -#if wxUSE_EXTENDED_RTTI - virtual const wxTypeInfo* GetTypeInfo() const - { - return wxGetTypeInfo((T*)NULL); - } -#endif -}; - - -/* - Generic value type template. Note that bulk of the implementation - resides in wxAnyValueTypeImplBase. -*/ -template -class wxAnyValueTypeImpl : public wxAnyValueTypeImplBase -{ - WX_DECLARE_ANY_VALUE_TYPE(wxAnyValueTypeImpl) -public: - wxAnyValueTypeImpl() : wxAnyValueTypeImplBase() { } - virtual ~wxAnyValueTypeImpl() { } - - virtual bool ConvertValue(const wxAnyValueBuffer& src, - wxAnyValueType* dstType, - wxAnyValueBuffer& dst) const wxOVERRIDE - { - wxUnusedVar(src); - wxUnusedVar(dstType); - wxUnusedVar(dst); - return false; - } -}; - -template -wxAnyValueTypeScopedPtr wxAnyValueTypeImpl::sm_instance = new wxAnyValueTypeImpl(); - - -// -// Helper macro for using same base value type implementation for multiple -// actual C++ data types. -// -#define _WX_ANY_DEFINE_SUB_TYPE(T, CLSTYPE) \ -template<> \ -class wxAnyValueTypeImpl : public wxAnyValueTypeImpl##CLSTYPE \ -{ \ - typedef wxAnyBase##CLSTYPE##Type UseDataType; \ -public: \ - wxAnyValueTypeImpl() : wxAnyValueTypeImpl##CLSTYPE() { } \ - virtual ~wxAnyValueTypeImpl() { } \ - static void SetValue(const T& value, wxAnyValueBuffer& buf) \ - { \ - void* voidPtr = reinterpret_cast(&buf.m_buffer[0]); \ - UseDataType* dptr = reinterpret_cast(voidPtr); \ - *dptr = static_cast(value); \ - } \ - static T GetValue(const wxAnyValueBuffer& buf) \ - { \ - const void* voidPtr = \ - reinterpret_cast(&buf.m_buffer[0]); \ - const UseDataType* sptr = \ - reinterpret_cast(voidPtr); \ - return static_cast(*sptr); \ - } - -#if wxUSE_EXTENDED_RTTI -#define WX_ANY_DEFINE_SUB_TYPE(T, CLSTYPE) \ -_WX_ANY_DEFINE_SUB_TYPE(T, CLSTYPE)\ - virtual const wxTypeInfo* GetTypeInfo() const \ - { \ - return wxGetTypeInfo((T*)NULL); \ - } \ -}; -#else -#define WX_ANY_DEFINE_SUB_TYPE(T, CLSTYPE) \ -_WX_ANY_DEFINE_SUB_TYPE(T, CLSTYPE)\ -}; -#endif - -// -// Integer value types -// - -#ifdef wxLongLong_t - typedef wxLongLong_t wxAnyBaseIntType; - typedef wxULongLong_t wxAnyBaseUintType; -#else - typedef long wxAnyBaseIntType; - typedef unsigned long wxAnyBaseUintType; -#endif - - -class WXDLLIMPEXP_BASE wxAnyValueTypeImplInt : - public wxAnyValueTypeImplBase -{ - WX_DECLARE_ANY_VALUE_TYPE(wxAnyValueTypeImplInt) -public: - wxAnyValueTypeImplInt() : - wxAnyValueTypeImplBase() { } - virtual ~wxAnyValueTypeImplInt() { } - - virtual bool ConvertValue(const wxAnyValueBuffer& src, - wxAnyValueType* dstType, - wxAnyValueBuffer& dst) const wxOVERRIDE; -}; - - -class WXDLLIMPEXP_BASE wxAnyValueTypeImplUint : - public wxAnyValueTypeImplBase -{ - WX_DECLARE_ANY_VALUE_TYPE(wxAnyValueTypeImplUint) -public: - wxAnyValueTypeImplUint() : - wxAnyValueTypeImplBase() { } - virtual ~wxAnyValueTypeImplUint() { } - - virtual bool ConvertValue(const wxAnyValueBuffer& src, - wxAnyValueType* dstType, - wxAnyValueBuffer& dst) const wxOVERRIDE; -}; - - -WX_ANY_DEFINE_SUB_TYPE(signed long, Int) -WX_ANY_DEFINE_SUB_TYPE(signed int, Int) -WX_ANY_DEFINE_SUB_TYPE(signed short, Int) -WX_ANY_DEFINE_SUB_TYPE(signed char, Int) -#ifdef wxLongLong_t -WX_ANY_DEFINE_SUB_TYPE(wxLongLong_t, Int) -#endif - -WX_ANY_DEFINE_SUB_TYPE(unsigned long, Uint) -WX_ANY_DEFINE_SUB_TYPE(unsigned int, Uint) -WX_ANY_DEFINE_SUB_TYPE(unsigned short, Uint) -WX_ANY_DEFINE_SUB_TYPE(unsigned char, Uint) -#ifdef wxLongLong_t -WX_ANY_DEFINE_SUB_TYPE(wxULongLong_t, Uint) -#endif - - -// -// This macro is used in header, but then in source file we must have: -// WX_IMPLEMENT_ANY_VALUE_TYPE(wxAnyValueTypeImpl##TYPENAME) -// -#define _WX_ANY_DEFINE_CONVERTIBLE_TYPE(T, TYPENAME, CONVFUNC, GV) \ -class WXDLLIMPEXP_BASE wxAnyValueTypeImpl##TYPENAME : \ - public wxAnyValueTypeImplBase \ -{ \ - WX_DECLARE_ANY_VALUE_TYPE(wxAnyValueTypeImpl##TYPENAME) \ -public: \ - wxAnyValueTypeImpl##TYPENAME() : \ - wxAnyValueTypeImplBase() { } \ - virtual ~wxAnyValueTypeImpl##TYPENAME() { } \ - virtual bool ConvertValue(const wxAnyValueBuffer& src, \ - wxAnyValueType* dstType, \ - wxAnyValueBuffer& dst) const wxOVERRIDE \ - { \ - GV value = GetValue(src); \ - return CONVFUNC(value, dstType, dst); \ - } \ -}; \ -template<> \ -class wxAnyValueTypeImpl : public wxAnyValueTypeImpl##TYPENAME \ -{ \ -public: \ - wxAnyValueTypeImpl() : wxAnyValueTypeImpl##TYPENAME() { } \ - virtual ~wxAnyValueTypeImpl() { } \ -}; - -#define WX_ANY_DEFINE_CONVERTIBLE_TYPE(T, TYPENAME, CONVFUNC, BT) \ -_WX_ANY_DEFINE_CONVERTIBLE_TYPE(T, TYPENAME, CONVFUNC, BT) \ - -#define WX_ANY_DEFINE_CONVERTIBLE_TYPE_BASE(T, TYPENAME, CONVFUNC) \ -_WX_ANY_DEFINE_CONVERTIBLE_TYPE(T, TYPENAME, \ - CONVFUNC, const T&) \ - -// -// String value type -// - -// Convert wxString to destination wxAny value type -extern WXDLLIMPEXP_BASE bool wxAnyConvertString(const wxString& value, - wxAnyValueType* dstType, - wxAnyValueBuffer& dst); - -WX_ANY_DEFINE_CONVERTIBLE_TYPE_BASE(wxString, wxString, wxAnyConvertString) -WX_ANY_DEFINE_CONVERTIBLE_TYPE(const char*, ConstCharPtr, - wxAnyConvertString, wxString) -WX_ANY_DEFINE_CONVERTIBLE_TYPE(const wchar_t*, ConstWchar_tPtr, - wxAnyConvertString, wxString) - -// -// Bool value type -// -template<> -class WXDLLIMPEXP_BASE wxAnyValueTypeImpl : - public wxAnyValueTypeImplBase -{ - WX_DECLARE_ANY_VALUE_TYPE(wxAnyValueTypeImpl) -public: - wxAnyValueTypeImpl() : - wxAnyValueTypeImplBase() { } - virtual ~wxAnyValueTypeImpl() { } - - virtual bool ConvertValue(const wxAnyValueBuffer& src, - wxAnyValueType* dstType, - wxAnyValueBuffer& dst) const wxOVERRIDE; -}; - -// -// Floating point value type -// -class WXDLLIMPEXP_BASE wxAnyValueTypeImplDouble : - public wxAnyValueTypeImplBase -{ - WX_DECLARE_ANY_VALUE_TYPE(wxAnyValueTypeImplDouble) -public: - wxAnyValueTypeImplDouble() : - wxAnyValueTypeImplBase() { } - virtual ~wxAnyValueTypeImplDouble() { } - - virtual bool ConvertValue(const wxAnyValueBuffer& src, - wxAnyValueType* dstType, - wxAnyValueBuffer& dst) const wxOVERRIDE; -}; - -// WX_ANY_DEFINE_SUB_TYPE requires this -typedef double wxAnyBaseDoubleType; - -WX_ANY_DEFINE_SUB_TYPE(float, Double) -WX_ANY_DEFINE_SUB_TYPE(double, Double) - - -// -// Defines a dummy wxAnyValueTypeImpl<> with given export -// declaration. This is needed if a class is used with -// wxAny in both user shared library and application. -// -#define wxDECLARE_ANY_TYPE(CLS, DECL) \ -template<> \ -class DECL wxAnyValueTypeImpl : \ - public wxAnyValueTypeImplBase \ -{ \ - WX_DECLARE_ANY_VALUE_TYPE(wxAnyValueTypeImpl) \ -public: \ - wxAnyValueTypeImpl() : \ - wxAnyValueTypeImplBase() { } \ - virtual ~wxAnyValueTypeImpl() { } \ - \ - virtual bool ConvertValue(const wxAnyValueBuffer& src, \ - wxAnyValueType* dstType, \ - wxAnyValueBuffer& dst) const wxOVERRIDE \ - { \ - wxUnusedVar(src); \ - wxUnusedVar(dstType); \ - wxUnusedVar(dst); \ - return false; \ - } \ -}; - - -// Make sure some of wx's own types get the right wxAnyValueType export -// (this is needed only for types that are referred to from wxBase. -// currently we may not use any of these types from there, but let's -// use the macro on at least one to make sure it compiles since we can't -// really test it properly in unit tests since a separate DLL would -// be needed). -#if wxUSE_DATETIME - #include "wx/datetime.h" - wxDECLARE_ANY_TYPE(wxDateTime, WXDLLIMPEXP_BASE) -#endif - -//#include "wx/object.h" -//wxDECLARE_ANY_TYPE(wxObject*, WXDLLIMPEXP_BASE) - -//#include "wx/arrstr.h" -//wxDECLARE_ANY_TYPE(wxArrayString, WXDLLIMPEXP_BASE) - - -#if wxUSE_VARIANT - -class WXDLLIMPEXP_FWD_BASE wxAnyToVariantRegistration; - -// Because of header inter-dependencies, cannot include this earlier -#include "wx/variant.h" - -// -// wxVariantData* data type implementation. For cases when appropriate -// wxAny<->wxVariant conversion code is missing. -// - -class WXDLLIMPEXP_BASE wxAnyValueTypeImplVariantData : - public wxAnyValueTypeImplBase -{ - WX_DECLARE_ANY_VALUE_TYPE(wxAnyValueTypeImplVariantData) -public: - wxAnyValueTypeImplVariantData() : - wxAnyValueTypeImplBase() { } - virtual ~wxAnyValueTypeImplVariantData() { } - - virtual void DeleteValue(wxAnyValueBuffer& buf) const wxOVERRIDE - { - wxVariantData* data = static_cast(buf.m_ptr); - if ( data ) - data->DecRef(); - } - - virtual void CopyBuffer(const wxAnyValueBuffer& src, - wxAnyValueBuffer& dst) const wxOVERRIDE - { - wxVariantData* data = static_cast(src.m_ptr); - if ( data ) - data->IncRef(); - dst.m_ptr = data; - } - - static void SetValue(wxVariantData* value, - wxAnyValueBuffer& buf) - { - value->IncRef(); - buf.m_ptr = value; - } - - static wxVariantData* GetValue(const wxAnyValueBuffer& buf) - { - return static_cast(buf.m_ptr); - } - - virtual bool ConvertValue(const wxAnyValueBuffer& src, - wxAnyValueType* dstType, - wxAnyValueBuffer& dst) const wxOVERRIDE - { - wxUnusedVar(src); - wxUnusedVar(dstType); - wxUnusedVar(dst); - return false; - } -}; - -template<> -class wxAnyValueTypeImpl : - public wxAnyValueTypeImplVariantData -{ -public: - wxAnyValueTypeImpl() : wxAnyValueTypeImplVariantData() { } - virtual ~wxAnyValueTypeImpl() { } -}; - -#endif // wxUSE_VARIANT - - -/* - Let's define a discrete Null value so we don't have to really - ever check if wxAny.m_type pointer is NULL or not. This is an - optimization, mostly. Implementation of this value type is - "hidden" in the source file. -*/ -extern WXDLLIMPEXP_DATA_BASE(wxAnyValueType*) wxAnyNullValueType; - - -// -// We need to implement custom signed/unsigned int equals operators -// for signed/unsigned (eg. wxAny(128UL) == 128L) comparisons to work. -#define WXANY_IMPLEMENT_INT_EQ_OP(TS, TUS) \ -bool operator==(TS value) const \ -{ \ - if ( wxAnyValueTypeImpl::IsSameClass(m_type) ) \ - return (value == static_cast \ - (wxAnyValueTypeImpl::GetValue(m_buffer))); \ - if ( wxAnyValueTypeImpl::IsSameClass(m_type) ) \ - return (value == static_cast \ - (wxAnyValueTypeImpl::GetValue(m_buffer))); \ - return false; \ -} \ -bool operator==(TUS value) const \ -{ \ - if ( wxAnyValueTypeImpl::IsSameClass(m_type) ) \ - return (value == static_cast \ - (wxAnyValueTypeImpl::GetValue(m_buffer))); \ - if ( wxAnyValueTypeImpl::IsSameClass(m_type) ) \ - return (value == static_cast \ - (wxAnyValueTypeImpl::GetValue(m_buffer))); \ - return false; \ -} - - -#if wxUSE_VARIANT - -// Note that the following functions are implemented outside wxAny class -// so that it can reside entirely in header and lack the export declaration. - -// Helper function used to associate wxAnyValueType with a wxVariantData. -extern WXDLLIMPEXP_BASE void -wxPreRegisterAnyToVariant(wxAnyToVariantRegistration* reg); - -// This function performs main wxAny to wxVariant conversion duties. -extern WXDLLIMPEXP_BASE bool -wxConvertAnyToVariant(const wxAny& any, wxVariant* variant); - -#endif // wxUSE_VARIANT - -// -// The wxAny class represents a container for any type. A variant's value -// can be changed at run time, possibly to a different type of value. -// -// As standard, wxAny can store value of almost any type, in a fairly -// optimal manner even. -// -class wxAny -{ -public: - /** - Default constructor. - */ - wxAny() - { - m_type = wxAnyNullValueType; - } - - /** - Destructor. - */ - ~wxAny() - { - m_type->DeleteValue(m_buffer); - } - - //@{ - /** - Various constructors. - */ - template - wxAny(const T& value) - { - m_type = wxAnyValueTypeImpl::sm_instance.get(); - wxAnyValueTypeImpl::SetValue(value, m_buffer); - } - - // These two constructors are needed to deal with string literals - wxAny(const char* value) - { - m_type = wxAnyValueTypeImpl::sm_instance.get(); - wxAnyValueTypeImpl::SetValue(value, m_buffer); - } - wxAny(const wchar_t* value) - { - m_type = wxAnyValueTypeImpl::sm_instance.get(); - wxAnyValueTypeImpl::SetValue(value, m_buffer); - } - - wxAny(const wxAny& any) - { - m_type = wxAnyNullValueType; - AssignAny(any); - } - -#if wxUSE_VARIANT - wxAny(const wxVariant& variant) - { - m_type = wxAnyNullValueType; - AssignVariant(variant); - } -#endif - - //@} - - /** - Use this template function for checking if this wxAny holds - a specific C++ data type. - - @see wxAnyValueType::CheckType() - */ - template - bool CheckType() const - { - return m_type->CheckType(); - } - - /** - Returns the value type as wxAnyValueType instance. - - @remarks You cannot reliably test whether two wxAnys are of - same value type by simply comparing return values - of wxAny::GetType(). Instead, use wxAny::HasSameType(). - - @see HasSameType() - */ - const wxAnyValueType* GetType() const - { - return m_type; - } - - /** - Returns @true if this and another wxAny have the same - value type. - */ - bool HasSameType(const wxAny& other) const - { - return GetType()->IsSameType(other.GetType()); - } - - /** - Tests if wxAny is null (that is, whether there is no data). - */ - bool IsNull() const - { - return (m_type == wxAnyNullValueType); - } - - /** - Makes wxAny null (that is, clears it). - */ - void MakeNull() - { - m_type->DeleteValue(m_buffer); - m_type = wxAnyNullValueType; - } - - //@{ - /** - Assignment operators. - */ - template - wxAny& operator=(const T &value) - { - m_type->DeleteValue(m_buffer); - m_type = wxAnyValueTypeImpl::sm_instance.get(); - wxAnyValueTypeImpl::SetValue(value, m_buffer); - return *this; - } - - wxAny& operator=(const wxAny &any) - { - if (this != &any) - AssignAny(any); - return *this; - } - -#if wxUSE_VARIANT - wxAny& operator=(const wxVariant &variant) - { - AssignVariant(variant); - return *this; - } -#endif - - // These two operators are needed to deal with string literals - wxAny& operator=(const char* value) - { - Assign(value); - return *this; - } - wxAny& operator=(const wchar_t* value) - { - Assign(value); - return *this; - } - - //@{ - /** - Equality operators. - */ - bool operator==(const wxString& value) const - { - wxString value2; - if ( !GetAs(&value2) ) - return false; - return value == value2; - } - - bool operator==(const char* value) const - { return (*this) == wxString(value); } - bool operator==(const wchar_t* value) const - { return (*this) == wxString(value); } - - // - // We need to implement custom signed/unsigned int equals operators - // for signed/unsigned (eg. wxAny(128UL) == 128L) comparisons to work. - WXANY_IMPLEMENT_INT_EQ_OP(signed char, unsigned char) - WXANY_IMPLEMENT_INT_EQ_OP(signed short, unsigned short) - WXANY_IMPLEMENT_INT_EQ_OP(signed int, unsigned int) - WXANY_IMPLEMENT_INT_EQ_OP(signed long, unsigned long) -#ifdef wxLongLong_t - WXANY_IMPLEMENT_INT_EQ_OP(wxLongLong_t, wxULongLong_t) -#endif - - wxGCC_WARNING_SUPPRESS(float-equal) - - bool operator==(float value) const - { - if ( !wxAnyValueTypeImpl::IsSameClass(m_type) ) - return false; - - return value == - static_cast - (wxAnyValueTypeImpl::GetValue(m_buffer)); - } - - bool operator==(double value) const - { - if ( !wxAnyValueTypeImpl::IsSameClass(m_type) ) - return false; - - return value == - static_cast - (wxAnyValueTypeImpl::GetValue(m_buffer)); - } - - wxGCC_WARNING_RESTORE(float-equal) - - bool operator==(bool value) const - { - if ( !wxAnyValueTypeImpl::IsSameClass(m_type) ) - return false; - - return value == (wxAnyValueTypeImpl::GetValue(m_buffer)); - } - - //@} - - //@{ - /** - Inequality operators (implement as template). - */ - template - bool operator!=(const T& value) const - { return !((*this) == value); } - //@} - - /** - This template function converts wxAny into given type. In most cases - no type conversion is performed, so if the type is incorrect an - assertion failure will occur. - - @remarks For convenience, conversion is done when T is wxString. This - is useful when a string literal (which are treated as - const char* and const wchar_t*) has been assigned to wxAny. - */ - template - T As(T* = NULL) const - { - return wxPrivate::wxAnyAsImpl::DoAs(*this); - } - - // Semi private helper: get the value without coercion, for all types. - template - T RawAs() const - { - if ( !wxAnyValueTypeImpl::IsSameClass(m_type) ) - { - wxFAIL_MSG("Incorrect or non-convertible data type"); - } - - return static_cast(wxAnyValueTypeImpl::GetValue(m_buffer)); - } - -#if wxUSE_EXTENDED_RTTI - const wxTypeInfo* GetTypeInfo() const - { - return m_type->GetTypeInfo(); - } -#endif - /** - Template function that retrieves and converts the value of this - variant to the type that T* value is. - - @return Returns @true if conversion was successful. - */ - template - bool GetAs(T* value) const - { - if ( !wxAnyValueTypeImpl::IsSameClass(m_type) ) - { - wxAnyValueType* otherType = - wxAnyValueTypeImpl::sm_instance.get(); - wxAnyValueBuffer temp_buf; - - if ( !m_type->ConvertValue(m_buffer, otherType, temp_buf) ) - return false; - - *value = - static_cast(wxAnyValueTypeImpl::GetValue(temp_buf)); - otherType->DeleteValue(temp_buf); - - return true; - } - *value = static_cast(wxAnyValueTypeImpl::GetValue(m_buffer)); - return true; - } - -#if wxUSE_VARIANT - // GetAs() wxVariant specialization - bool GetAs(wxVariant* value) const - { - return wxConvertAnyToVariant(*this, value); - } -#endif - -private: - // Assignment functions - void AssignAny(const wxAny& any) - { - // Must delete value - CopyBuffer() never does that - m_type->DeleteValue(m_buffer); - - wxAnyValueType* newType = any.m_type; - - if ( !newType->IsSameType(m_type) ) - m_type = newType; - - newType->CopyBuffer(any.m_buffer, m_buffer); - } - -#if wxUSE_VARIANT - void AssignVariant(const wxVariant& variant) - { - wxVariantData* data = variant.GetData(); - - if ( data && data->GetAsAny(this) ) - return; - - m_type->DeleteValue(m_buffer); - - if ( variant.IsNull() ) - { - // Init as Null - m_type = wxAnyNullValueType; - } - else - { - // If everything else fails, wrap the whole wxVariantData - m_type = wxAnyValueTypeImpl::sm_instance.get(); - wxAnyValueTypeImpl::SetValue(data, m_buffer); - } - } -#endif - - template - void Assign(const T &value) - { - m_type->DeleteValue(m_buffer); - m_type = wxAnyValueTypeImpl::sm_instance.get(); - wxAnyValueTypeImpl::SetValue(value, m_buffer); - } - - // Data - wxAnyValueBuffer m_buffer; - wxAnyValueType* m_type; -}; - - -namespace wxPrivate -{ - -// Dispatcher for template wxAny::As() implementation which is different for -// wxString and all the other types: the generic implementation check if the -// value is of the right type and returns it. -template -struct wxAnyAsImpl -{ - static T DoAs(const wxAny& any) - { - return any.RawAs(); - } -}; - -// Specialization for wxString does coercion. -template <> -struct wxAnyAsImpl -{ - static wxString DoAs(const wxAny& any) - { - wxString value; - if ( !any.GetAs(&value) ) - { - wxFAIL_MSG("Incorrect or non-convertible data type"); - } - return value; - } -}; - -} - -// See comment for wxANY_VALUE_TYPE_CHECK_TYPE. -#define wxANY_CHECK_TYPE(any, T) \ - wxANY_VALUE_TYPE_CHECK_TYPE((any).GetType(), T) - - -// This macro shouldn't be used any longer for the same reasons as -// wxANY_VALUE_TYPE_CHECK_TYPE(), just call As() directly. -#define wxANY_AS(any, T) \ - (any).As(static_cast(NULL)) - - -template -inline bool wxAnyValueType::CheckType() const -{ - return wxAnyValueTypeImpl::IsSameClass(this); -} - -WX_DECLARE_LIST_WITH_DECL(wxAny, wxAnyList, class WXDLLIMPEXP_BASE); - -#endif // wxUSE_ANY - -#endif // _WX_ANY_H_ diff --git a/Externals/wxWidgets3/include/wx/anybutton.h b/Externals/wxWidgets3/include/wx/anybutton.h deleted file mode 100644 index ff41ce999c..0000000000 --- a/Externals/wxWidgets3/include/wx/anybutton.h +++ /dev/null @@ -1,204 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/anybutton.h -// Purpose: wxAnyButtonBase class -// Author: Vadim Zeitlin -// Created: 2000-08-15 (extracted from button.h) -// Copyright: (c) Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_ANYBUTTON_H_BASE_ -#define _WX_ANYBUTTON_H_BASE_ - -#include "wx/defs.h" - -#ifdef wxHAS_ANY_BUTTON - -// ---------------------------------------------------------------------------- -// wxAnyButton specific flags -// ---------------------------------------------------------------------------- - -// These flags affect label alignment -#define wxBU_LEFT 0x0040 -#define wxBU_TOP 0x0080 -#define wxBU_RIGHT 0x0100 -#define wxBU_BOTTOM 0x0200 -#define wxBU_ALIGN_MASK ( wxBU_LEFT | wxBU_TOP | wxBU_RIGHT | wxBU_BOTTOM ) - -// These two flags are obsolete -#define wxBU_NOAUTODRAW 0x0000 -#define wxBU_AUTODRAW 0x0004 - -// by default, the buttons will be created with some (system dependent) -// minimal size to make them look nicer, giving this style will make them as -// small as possible -#define wxBU_EXACTFIT 0x0001 - -// this flag can be used to disable using the text label in the button: it is -// mostly useful when creating buttons showing bitmap and having stock id as -// without it both the standard label corresponding to the stock id and the -// bitmap would be shown -#define wxBU_NOTEXT 0x0002 - - -#include "wx/bitmap.h" -#include "wx/control.h" - -// ---------------------------------------------------------------------------- -// wxAnyButton: common button functionality -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxAnyButtonBase : public wxControl -{ -public: - wxAnyButtonBase() { } - - // show the image in the button in addition to the label: this method is - // supported on all (major) platforms - void SetBitmap(const wxBitmap& bitmap, wxDirection dir = wxLEFT) - { - SetBitmapLabel(bitmap); - SetBitmapPosition(dir); - } - - wxBitmap GetBitmap() const { return DoGetBitmap(State_Normal); } - - // Methods for setting individual images for different states: normal, - // selected (meaning pushed or pressed), focused (meaning normal state for - // a focused button), disabled or hover (a.k.a. hot or current). - // - // Remember that SetBitmap() itself must be called before any other - // SetBitmapXXX() methods (except for SetBitmapLabel() which is a synonym - // for it anyhow) and that all bitmaps passed to these functions should be - // of the same size. - void SetBitmapLabel(const wxBitmap& bitmap) - { DoSetBitmap(bitmap, State_Normal); } - void SetBitmapPressed(const wxBitmap& bitmap) - { DoSetBitmap(bitmap, State_Pressed); } - void SetBitmapDisabled(const wxBitmap& bitmap) - { DoSetBitmap(bitmap, State_Disabled); } - void SetBitmapCurrent(const wxBitmap& bitmap) - { DoSetBitmap(bitmap, State_Current); } - void SetBitmapFocus(const wxBitmap& bitmap) - { DoSetBitmap(bitmap, State_Focused); } - - wxBitmap GetBitmapLabel() const { return DoGetBitmap(State_Normal); } - wxBitmap GetBitmapPressed() const { return DoGetBitmap(State_Pressed); } - wxBitmap GetBitmapDisabled() const { return DoGetBitmap(State_Disabled); } - wxBitmap GetBitmapCurrent() const { return DoGetBitmap(State_Current); } - wxBitmap GetBitmapFocus() const { return DoGetBitmap(State_Focused); } - - - // set the margins around the image - void SetBitmapMargins(wxCoord x, wxCoord y) { DoSetBitmapMargins(x, y); } - void SetBitmapMargins(const wxSize& sz) { DoSetBitmapMargins(sz.x, sz.y); } - wxSize GetBitmapMargins() { return DoGetBitmapMargins(); } - - // set the image position relative to the text, i.e. wxLEFT means that the - // image is to the left of the text (this is the default) - void SetBitmapPosition(wxDirection dir); - - - // Buttons on MSW can look bad if they are not native colours, because - // then they become owner-drawn and not theme-drawn. Disable it here - // in wxAnyButtonBase to make it consistent. - virtual bool ShouldInheritColours() const wxOVERRIDE { return false; } - - // wxUniv-compatible and deprecated equivalents to SetBitmapXXX() -#if WXWIN_COMPATIBILITY_2_8 - void SetImageLabel(const wxBitmap& bitmap) { SetBitmap(bitmap); } - void SetImageMargins(wxCoord x, wxCoord y) { SetBitmapMargins(x, y); } -#endif // WXWIN_COMPATIBILITY_2_8 - - // backwards compatible names for pressed/current bitmaps: they're not - // deprecated as there is nothing really wrong with using them and no real - // advantage to using the new names but the new names are still preferred - wxBitmap GetBitmapSelected() const { return GetBitmapPressed(); } - wxBitmap GetBitmapHover() const { return GetBitmapCurrent(); } - - void SetBitmapSelected(const wxBitmap& bitmap) { SetBitmapPressed(bitmap); } - void SetBitmapHover(const wxBitmap& bitmap) { SetBitmapCurrent(bitmap); } - - - // this enum is not part of wx public API, it is public because it is used - // in non wxAnyButton-derived classes internally - // - // also notice that MSW code relies on the values of the enum elements, do - // not change them without revising src/msw/button.cpp - enum State - { - State_Normal, - State_Current, // a.k.a. hot or "hovering" - State_Pressed, // a.k.a. "selected" in public API for some reason - State_Disabled, - State_Focused, - State_Max - }; - - // return the current setting for the "normal" state of the button, it can - // be different from State_Normal for a wxToggleButton - virtual State GetNormalState() const - { - return State_Normal; - } - - // return true if this button shouldn't show the text label, either because - // it doesn't have it or because it was explicitly disabled with wxBU_NOTEXT - bool DontShowLabel() const - { - return HasFlag(wxBU_NOTEXT) || GetLabel().empty(); - } - - // return true if we do show the label - bool ShowsLabel() const - { - return !DontShowLabel(); - } - -protected: - // choose the default border for this window - virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } - - virtual wxBitmap DoGetBitmap(State WXUNUSED(which)) const - { return wxBitmap(); } - virtual void DoSetBitmap(const wxBitmap& WXUNUSED(bitmap), - State WXUNUSED(which)) - { } - - virtual wxSize DoGetBitmapMargins() const - { return wxSize(0, 0); } - - virtual void DoSetBitmapMargins(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y)) - { } - - virtual void DoSetBitmapPosition(wxDirection WXUNUSED(dir)) - { } - - virtual bool DoGetAuthNeeded() const { return false; } - virtual void DoSetAuthNeeded(bool WXUNUSED(show)) { } - - - wxDECLARE_NO_COPY_CLASS(wxAnyButtonBase); -}; - -#if defined(__WXUNIVERSAL__) - #include "wx/univ/anybutton.h" -#elif defined(__WXMSW__) - #include "wx/msw/anybutton.h" -//#elif defined(__WXMOTIF__) -// #include "wx/motif/anybutton.h" -#elif defined(__WXGTK20__) - #include "wx/gtk/anybutton.h" -//#elif defined(__WXGTK__) -// #include "wx/gtk1/anybutton.h" -#elif defined(__WXMAC__) - #include "wx/osx/anybutton.h" -#elif defined(__WXQT__) - #include "wx/qt/anybutton.h" -#else - typedef wxAnyButtonBase wxAnyButton; -#endif - -#endif // wxHAS_ANY_BUTTON - -#endif // _WX_ANYBUTTON_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/anystr.h b/Externals/wxWidgets3/include/wx/anystr.h deleted file mode 100644 index 082d83f151..0000000000 --- a/Externals/wxWidgets3/include/wx/anystr.h +++ /dev/null @@ -1,139 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/anystr.h -// Purpose: wxAnyStrPtr class declaration -// Author: Vadim Zeitlin -// Created: 2009-03-23 -// Copyright: (c) 2008 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_ANYSTR_H_ -#define _WX_ANYSTR_H_ - -#include "wx/string.h" - -// ---------------------------------------------------------------------------- -// wxAnyStrPtr -// -// Notice that this is an internal and intentionally not documented class. It -// is only used by wxWidgets itself to ensure compatibility with previous -// versions and shouldn't be used by user code. When you see a function -// returning it you should just know that you can treat it as a string pointer. -// ---------------------------------------------------------------------------- - -// This is a helper class convertible to either narrow or wide string pointer. -// It is similar to wxCStrData but, unlike it, can be NULL which is required to -// represent the return value of wxDateTime::ParseXXX() methods for example. -// -// NB: this class is fully inline and so doesn't need to be DLL-exported -class wxAnyStrPtr -{ -public: - // ctors: this class must be created from the associated string or using - // its default ctor for an invalid NULL-like object; notice that it is - // immutable after creation. - - // ctor for invalid pointer - wxAnyStrPtr() - : m_str(NULL) - { - } - - // ctor for valid pointer into the given string (whose lifetime must be - // greater than ours and which should remain constant while we're used) - wxAnyStrPtr(const wxString& str, const wxString::const_iterator& iter) - : m_str(&str), - m_iter(iter) - { - } - - // default copy ctor is ok and so is default dtor, in particular we do not - // free the string - - - // various operators meant to make this class look like a superposition of - // char* and wchar_t* - - // this one is needed to allow boolean expressions involving these objects, - // e.g. "if ( FuncReturningAnyStrPtr() && ... )" (unfortunately using - // unspecified_bool_type here wouldn't help with ambiguity between all the - // different conversions to pointers) - operator bool() const { return m_str != NULL; } - - // at least VC7 also needs this one or it complains about ambiguity - // for !anystr expressions - bool operator!() const { return !((bool)*this); } - - - // and these are the conversions operator which allow to assign the result - // of FuncReturningAnyStrPtr() to either char* or wxChar* (i.e. wchar_t*) - operator const char *() const - { - if ( !m_str ) - return NULL; - - // check if the string is convertible to char at all - // - // notice that this pointer points into wxString internal buffer - // containing its char* representation and so it can be kept for as - // long as wxString is not modified -- which is long enough for our - // needs - const char *p = m_str->c_str().AsChar(); - if ( *p ) - { - // find the offset of the character corresponding to this iterator - // position in bytes: we don't have any direct way to do it so we - // need to redo the conversion again for the part of the string - // before the iterator to find its length in bytes in current - // locale - // - // NB: conversion won't fail as it succeeded for the entire string - p += strlen(wxString(m_str->begin(), m_iter).mb_str()); - } - //else: conversion failed, return "" as we can't do anything else - - return p; - } - - operator const wchar_t *() const - { - if ( !m_str ) - return NULL; - - // no complications with wide strings (as long as we discount - // surrogates as we do for now) - // - // just remember that this works as long as wxString keeps an internal - // buffer with its wide wide char representation, just as with AsChar() - // above - return m_str->c_str().AsWChar() + (m_iter - m_str->begin()); - } - - // Because the objects of this class are only used as return type for - // functions which can return NULL we can skip providing dereferencing - // operators: the code using this class must test it for NULL first and if - // it does anything else with it it has to assign it to either char* or - // wchar_t* itself, before dereferencing. - // - // IOW this - // - // if ( *FuncReturningAnyStrPtr() ) - // - // is invalid because it could crash. And this - // - // const char *p = FuncReturningAnyStrPtr(); - // if ( p && *p ) - // - // already works fine. - -private: - // the original string and the position in it we correspond to, if the - // string is NULL this object is NULL pointer-like - const wxString * const m_str; - const wxString::const_iterator m_iter; - - wxDECLARE_NO_ASSIGN_CLASS(wxAnyStrPtr); -}; - -#endif // _WX_ANYSTR_H_ - diff --git a/Externals/wxWidgets3/include/wx/app.h b/Externals/wxWidgets3/include/wx/app.h deleted file mode 100644 index bc17b94b93..0000000000 --- a/Externals/wxWidgets3/include/wx/app.h +++ /dev/null @@ -1,900 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/app.h -// Purpose: wxAppBase class and macros used for declaration of wxApp -// derived class in the user code -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_APP_H_BASE_ -#define _WX_APP_H_BASE_ - -// ---------------------------------------------------------------------------- -// headers we have to include here -// ---------------------------------------------------------------------------- - -#include "wx/event.h" // for the base class -#include "wx/eventfilter.h" // (and another one) -#include "wx/build.h" -#include "wx/cmdargs.h" // for wxCmdLineArgsArray used by wxApp::argv -#include "wx/init.h" // we must declare wxEntry() -#include "wx/intl.h" // for wxLayoutDirection -#include "wx/log.h" // for wxDISABLE_DEBUG_LOGGING_IN_RELEASE_BUILD() - -class WXDLLIMPEXP_FWD_BASE wxAppConsole; -class WXDLLIMPEXP_FWD_BASE wxAppTraits; -class WXDLLIMPEXP_FWD_BASE wxCmdLineParser; -class WXDLLIMPEXP_FWD_BASE wxEventLoopBase; -class WXDLLIMPEXP_FWD_BASE wxMessageOutput; - -#if wxUSE_GUI - struct WXDLLIMPEXP_FWD_CORE wxVideoMode; - class WXDLLIMPEXP_FWD_CORE wxWindow; -#endif - -// this macro should be used in any main() or equivalent functions defined in wx -#define wxDISABLE_DEBUG_SUPPORT() \ - wxDISABLE_ASSERTS_IN_RELEASE_BUILD(); \ - wxDISABLE_DEBUG_LOGGING_IN_RELEASE_BUILD() - -// ---------------------------------------------------------------------------- -// typedefs -// ---------------------------------------------------------------------------- - -// the type of the function used to create a wxApp object on program start up -typedef wxAppConsole* (*wxAppInitializerFunction)(); - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -enum -{ - wxPRINT_WINDOWS = 1, - wxPRINT_POSTSCRIPT = 2 -}; - -// ---------------------------------------------------------------------------- -// global variables -// ---------------------------------------------------------------------------- - -// use of this list is strongly deprecated, use wxApp ScheduleForDestruction() -// and IsScheduledForDestruction() methods instead of this list directly, it -// is here for compatibility purposes only -extern WXDLLIMPEXP_DATA_BASE(wxList) wxPendingDelete; - -// ---------------------------------------------------------------------------- -// wxAppConsoleBase: wxApp for non-GUI applications -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxAppConsoleBase : public wxEvtHandler, - public wxEventFilter -{ -public: - // ctor and dtor - wxAppConsoleBase(); - virtual ~wxAppConsoleBase(); - - - // the virtual functions which may/must be overridden in the derived class - // ----------------------------------------------------------------------- - - // This is the very first function called for a newly created wxApp object, - // it is used by the library to do the global initialization. If, for some - // reason, you must override it (instead of just overriding OnInit(), as - // usual, for app-specific initializations), do not forget to call the base - // class version! - virtual bool Initialize(int& argc, wxChar **argv); - - // This gives wxCocoa a chance to call OnInit() with a memory pool in place - virtual bool CallOnInit() { return OnInit(); } - - // Called before OnRun(), this is a good place to do initialization -- if - // anything fails, return false from here to prevent the program from - // continuing. The command line is normally parsed here, call the base - // class OnInit() to do it. - virtual bool OnInit(); - - // This is the replacement for the normal main(): all program work should - // be done here. When OnRun() returns, the programs starts shutting down. - virtual int OnRun(); - - // Called before the first events are handled, called from within MainLoop() - virtual void OnLaunched(); - - // This is called by wxEventLoopBase::SetActive(): you should put the code - // which needs an active event loop here. - // Note that this function is called whenever an event loop is activated; - // you may want to use wxEventLoopBase::IsMain() to perform initialization - // specific for the app's main event loop. - virtual void OnEventLoopEnter(wxEventLoopBase* WXUNUSED(loop)) {} - - // This is only called if OnInit() returned true so it's a good place to do - // any cleanup matching the initializations done there. - virtual int OnExit(); - - // This is called by wxEventLoopBase::OnExit() for each event loop which - // is exited. - virtual void OnEventLoopExit(wxEventLoopBase* WXUNUSED(loop)) {} - - // This is the very last function called on wxApp object before it is - // destroyed. If you override it (instead of overriding OnExit() as usual) - // do not forget to call the base class version! - virtual void CleanUp(); - - // Called when a fatal exception occurs, this function should take care not - // to do anything which might provoke a nested exception! It may be - // overridden if you wish to react somehow in non-default way (core dump - // under Unix, application crash under Windows) to fatal program errors, - // however extreme care should be taken if you don't want this function to - // crash. - virtual void OnFatalException() { } - - // Called from wxExit() function, should terminate the application a.s.a.p. - virtual void Exit(); - - - // application info: name, description, vendor - // ------------------------------------------- - - // NB: all these should be set by the application itself, there are no - // reasonable default except for the application name which is taken to - // be argv[0] - - // set/get the application name - wxString GetAppName() const; - void SetAppName(const wxString& name) { m_appName = name; } - - // set/get the application display name: the display name is the name - // shown to the user in titles, reports, etc while the app name is - // used for paths, config, and other places the user doesn't see - // - // by default the display name is the same as app name or a capitalized - // version of the program if app name was not set neither but it's - // usually better to set it explicitly to something nicer - wxString GetAppDisplayName() const; - - void SetAppDisplayName(const wxString& name) { m_appDisplayName = name; } - - // set/get the app class name - wxString GetClassName() const { return m_className; } - void SetClassName(const wxString& name) { m_className = name; } - - // set/get the vendor name - const wxString& GetVendorName() const { return m_vendorName; } - void SetVendorName(const wxString& name) { m_vendorName = name; } - - // set/get the vendor display name: the display name is shown - // in titles/reports/dialogs to the user, while the vendor name - // is used in some areas such as wxConfig, wxStandardPaths, etc - const wxString& GetVendorDisplayName() const - { - return m_vendorDisplayName.empty() ? GetVendorName() - : m_vendorDisplayName; - } - void SetVendorDisplayName(const wxString& name) - { - m_vendorDisplayName = name; - } - - - // cmd line parsing stuff - // ---------------------- - - // all of these methods may be overridden in the derived class to - // customize the command line parsing (by default only a few standard - // options are handled) - // - // you also need to call wxApp::OnInit() from YourApp::OnInit() for all - // this to work - -#if wxUSE_CMDLINE_PARSER - // this one is called from OnInit() to add all supported options - // to the given parser (don't forget to call the base class version if you - // override it!) - virtual void OnInitCmdLine(wxCmdLineParser& parser); - - // called after successfully parsing the command line, return true - // to continue and false to exit (don't forget to call the base class - // version if you override it!) - virtual bool OnCmdLineParsed(wxCmdLineParser& parser); - - // called if "--help" option was specified, return true to continue - // and false to exit - virtual bool OnCmdLineHelp(wxCmdLineParser& parser); - - // called if incorrect command line options were given, return - // false to abort and true to continue - virtual bool OnCmdLineError(wxCmdLineParser& parser); -#endif // wxUSE_CMDLINE_PARSER - - - // miscellaneous customization functions - // ------------------------------------- - - // create the app traits object to which we delegate for everything which - // either should be configurable by the user (then he can change the - // default behaviour simply by overriding CreateTraits() and returning his - // own traits object) or which is GUI/console dependent as then wxAppTraits - // allows us to abstract the differences behind the common facade - wxAppTraits *GetTraits(); - - // this function provides safer access to traits object than - // wxTheApp->GetTraits() during startup or termination when the global - // application object itself may be unavailable - // - // of course, it still returns NULL in this case and the caller must check - // for it - static wxAppTraits *GetTraitsIfExists(); - - // Return some valid traits object. - // - // This method checks if we have wxTheApp and returns its traits if it does - // exist and the traits are non-NULL, similarly to GetTraitsIfExists(), but - // falls back to wxConsoleAppTraits to ensure that it always returns - // something valid. - static wxAppTraits& GetValidTraits(); - - // returns the main event loop instance, i.e. the event loop which is started - // by OnRun() and which dispatches all events sent from the native toolkit - // to the application (except when new event loops are temporarily set-up). - // The returned value maybe NULL. Put initialization code which needs a - // non-NULL main event loop into OnEventLoopEnter(). - wxEventLoopBase* GetMainLoop() const - { return m_mainLoop; } - - // This function sets the C locale to the default locale for the current - // environment. It is advised to call this to ensure that the underlying - // toolkit uses the locale in which the numbers and monetary amounts are - // shown in the format expected by user and so on. - // - // Notice that this does _not_ change the global C++ locale, you need to do - // it explicitly if you want. - // - // Finally, notice that while this function is virtual, it is not supposed - // to be overridden outside of the library itself. - virtual void SetCLocale(); - - - // event processing functions - // -------------------------- - - // Implement the inherited wxEventFilter method but just return -1 from it - // to indicate that default processing should take place. - virtual int FilterEvent(wxEvent& event) wxOVERRIDE; - - // return true if we're running event loop, i.e. if the events can - // (already) be dispatched - static bool IsMainLoopRunning(); - -#if wxUSE_EXCEPTIONS - // execute the functor to handle the given event - // - // this is a generalization of HandleEvent() below and the base class - // implementation of CallEventHandler() still calls HandleEvent() for - // compatibility for functors which are just wxEventFunctions (i.e. methods - // of wxEvtHandler) - virtual void CallEventHandler(wxEvtHandler *handler, - wxEventFunctor& functor, - wxEvent& event) const; - - // call the specified handler on the given object with the given event - // - // this method only exists to allow catching the exceptions thrown by any - // event handler, it would lead to an extra (useless) virtual function call - // if the exceptions were not used, so it doesn't even exist in that case - virtual void HandleEvent(wxEvtHandler *handler, - wxEventFunction func, - wxEvent& event) const; - - // Called when an unhandled C++ exception occurs inside OnRun(): note that - // the main event loop has already terminated by now and the program will - // exit, if you need to really handle the exceptions you need to override - // OnExceptionInMainLoop() - virtual void OnUnhandledException(); - - // Function called if an uncaught exception is caught inside the main - // event loop: it may return true to continue running the event loop or - // false to stop it. If this function rethrows the exception, as it does by - // default, simply because there is no general way to handle exceptions, - // StoreCurrentException() will be called to store it because in any case - // the exception can't be allowed to escape. - virtual bool OnExceptionInMainLoop(); - - // This function can be overridden to store the current exception, in view - // of rethrowing it later when RethrowStoredException() is called. If the - // exception was stored, return true. If the exception can't be stored, - // i.e. if this function returns false, the program will abort after - // calling OnUnhandledException(). - // - // The default implementation of this function when using C++98 compiler - // just returns false, as there is no generic way to store an arbitrary - // exception in C++98 and each application must do it on its own for the - // exceptions it uses in its overridden version. When using C++11, the - // default implementation uses std::current_exception() and returns true, - // so it's normally not necessary to override this method when using C++11. - virtual bool StoreCurrentException(); - - // If StoreCurrentException() is overridden, this function should be - // overridden as well to rethrow the exceptions stored by it when the - // control gets back to our code, i.e. when it's safe to do it. - // - // The default version does nothing when using C++98 and uses - // std::rethrow_exception() in C++11. - virtual void RethrowStoredException(); -#endif // wxUSE_EXCEPTIONS - - - // pending events - // -------------- - - // IMPORTANT: all these methods conceptually belong to wxEventLoopBase - // but for many reasons we need to allow queuing of events - // even when there's no event loop (e.g. in wxApp::OnInit); - // this feature is used e.g. to queue events on secondary threads - // or in wxPython to use wx.CallAfter before the GUI is initialized - - // process all events in the m_handlersWithPendingEvents list -- it is necessary - // to call this function to process posted events. This happens during each - // event loop iteration in GUI mode but if there is no main loop, it may be - // also called directly. - virtual void ProcessPendingEvents(); - - // check if there are pending events on global pending event list - bool HasPendingEvents() const; - - // temporary suspends processing of the pending events - void SuspendProcessingOfPendingEvents(); - - // resume processing of the pending events previously stopped because of a - // call to SuspendProcessingOfPendingEvents() - void ResumeProcessingOfPendingEvents(); - - // called by ~wxEvtHandler to (eventually) remove the handler from the list of - // the handlers with pending events - void RemovePendingEventHandler(wxEvtHandler* toRemove); - - // adds an event handler to the list of the handlers with pending events - void AppendPendingEventHandler(wxEvtHandler* toAppend); - - // moves the event handler from the list of the handlers with pending events - //to the list of the handlers with _delayed_ pending events - void DelayPendingEventHandler(wxEvtHandler* toDelay); - - // deletes the current pending events - void DeletePendingEvents(); - - - // delayed destruction - // ------------------- - - // If an object may have pending events for it, it shouldn't be deleted - // immediately as this would result in a crash when trying to handle these - // events: instead, it should be scheduled for destruction and really - // destroyed only after processing all pending events. - // - // Notice that this is only possible if we have a running event loop, - // otherwise the object is just deleted directly by ScheduleForDestruction() - // and IsScheduledForDestruction() always returns false. - - // schedule the object for destruction in the near future - void ScheduleForDestruction(wxObject *object); - - // return true if the object is scheduled for destruction - bool IsScheduledForDestruction(wxObject *object) const; - - - // wxEventLoop-related methods - // --------------------------- - - // all these functions are forwarded to the corresponding methods of the - // currently active event loop -- and do nothing if there is none - virtual bool Pending(); - virtual bool Dispatch(); - - virtual int MainLoop(); - virtual void ExitMainLoop(); - - bool Yield(bool onlyIfNeeded = false); - - virtual void WakeUpIdle(); - - // this method is called by the active event loop when there are no events - // to process - // - // by default it generates the idle events and if you override it in your - // derived class you should call the base class version to ensure that idle - // events are still sent out - virtual bool ProcessIdle(); - - // this virtual function is overridden in GUI wxApp to always return true - // as GUI applications always have an event loop -- but console ones may - // have it or not, so it simply returns true if already have an event loop - // running but false otherwise - virtual bool UsesEventLoop() const; - - - // debugging support - // ----------------- - - // this function is called when an assert failure occurs, the base class - // version does the normal processing (i.e. shows the usual assert failure - // dialog box) - // - // the arguments are the location of the failed assert (func may be empty - // if the compiler doesn't support C99 __FUNCTION__), the text of the - // assert itself and the user-specified message - virtual void OnAssertFailure(const wxChar *file, - int line, - const wxChar *func, - const wxChar *cond, - const wxChar *msg); - - // old version of the function without func parameter, for compatibility - // only, override OnAssertFailure() in the new code - virtual void OnAssert(const wxChar *file, - int line, - const wxChar *cond, - const wxChar *msg); - - // check that the wxBuildOptions object (constructed in the application - // itself, usually the one from wxIMPLEMENT_APP() macro) matches the build - // options of the library and abort if it doesn't - static bool CheckBuildOptions(const char *optionsSignature, - const char *componentName); - - // implementation only from now on - // ------------------------------- - - // helpers for dynamic wxApp construction - static void SetInitializerFunction(wxAppInitializerFunction fn) - { ms_appInitFn = fn; } - static wxAppInitializerFunction GetInitializerFunction() - { return ms_appInitFn; } - - // accessors for ms_appInstance field (external code might wish to modify - // it, this is why we provide a setter here as well, but you should really - // know what you're doing if you call it), wxTheApp is usually used instead - // of GetInstance() - static wxAppConsole *GetInstance() { return ms_appInstance; } - static void SetInstance(wxAppConsole *app) { ms_appInstance = app; } - - - // command line arguments (public for backwards compatibility) - int argc; - - // this object is implicitly convertible to either "char**" (traditional - // type of argv parameter of main()) or to "wchar_t **" (for compatibility - // with Unicode build in previous wx versions and because the command line - // can, in pr -#if wxUSE_UNICODE - wxCmdLineArgsArray argv; -#else - char **argv; -#endif - -protected: - // delete all objects in wxPendingDelete list - // - // called from ProcessPendingEvents() - void DeletePendingObjects(); - - // the function which creates the traits object when GetTraits() needs it - // for the first time - virtual wxAppTraits *CreateTraits(); - - // function used for dynamic wxApp creation - static wxAppInitializerFunction ms_appInitFn; - - // the one and only global application object - static wxAppConsole *ms_appInstance; - - // create main loop from AppTraits or return NULL if - // there is no main loop implementation - wxEventLoopBase *CreateMainLoop(); - - // application info (must be set from the user code) - wxString m_vendorName, // vendor name ("acme") - m_vendorDisplayName, // vendor display name (e.g. "ACME Inc") - m_appName, // app name ("myapp") - m_appDisplayName, // app display name ("My Application") - m_className; // class name - - // the class defining the application behaviour, NULL initially and created - // by GetTraits() when first needed - wxAppTraits *m_traits; - - // the main event loop of the application (may be NULL if the loop hasn't - // been started yet or has already terminated) - wxEventLoopBase *m_mainLoop; - - - // pending events management vars: - - // the array of the handlers with pending events which needs to be processed - // inside ProcessPendingEvents() - wxEvtHandlerArray m_handlersWithPendingEvents; - - // helper array used by ProcessPendingEvents() to store the event handlers - // which have pending events but of these events none can be processed right now - // (because of a call to wxEventLoop::YieldFor() which asked to selectively process - // pending events) - wxEvtHandlerArray m_handlersWithPendingDelayedEvents; - -#if wxUSE_THREADS - // this critical section protects both the lists above - wxCriticalSection m_handlersWithPendingEventsLocker; -#endif - - // flag modified by Suspend/ResumeProcessingOfPendingEvents() - bool m_bDoPendingEventProcessing; - - friend class WXDLLIMPEXP_FWD_BASE wxEvtHandler; - - // the application object is a singleton anyhow, there is no sense in - // copying it - wxDECLARE_NO_COPY_CLASS(wxAppConsoleBase); -}; - -#if defined(__UNIX__) && !defined(__WINDOWS__) - #include "wx/unix/app.h" -#else - // this has to be a class and not a typedef as we forward declare it - class wxAppConsole : public wxAppConsoleBase { }; -#endif - -// ---------------------------------------------------------------------------- -// wxAppBase: the common part of wxApp implementations for all platforms -// ---------------------------------------------------------------------------- - -#if wxUSE_GUI - -class WXDLLIMPEXP_CORE wxAppBase : public wxAppConsole -{ -public: - wxAppBase(); - virtual ~wxAppBase(); - - // the virtual functions which may/must be overridden in the derived class - // ----------------------------------------------------------------------- - - // very first initialization function - // - // Override: very rarely - virtual bool Initialize(int& argc, wxChar **argv) wxOVERRIDE; - - // a platform-dependent version of OnInit(): the code here is likely to - // depend on the toolkit. default version does nothing. - // - // Override: rarely. - virtual bool OnInitGui(); - - // called to start program execution - the default version just enters - // the main GUI loop in which events are received and processed until - // the last window is not deleted (if GetExitOnFrameDelete) or - // ExitMainLoop() is called. In console mode programs, the execution - // of the program really starts here - // - // Override: rarely in GUI applications, always in console ones. - virtual int OnRun() wxOVERRIDE; - - // a matching function for OnInit() - virtual int OnExit() wxOVERRIDE; - - // very last clean up function - // - // Override: very rarely - virtual void CleanUp() wxOVERRIDE; - - - // the worker functions - usually not used directly by the user code - // ----------------------------------------------------------------- - - // safer alternatives to Yield(), using wxWindowDisabler - virtual bool SafeYield(wxWindow *win, bool onlyIfNeeded); - virtual bool SafeYieldFor(wxWindow *win, long eventsToProcess); - - // this virtual function is called in the GUI mode when the application - // becomes idle and normally just sends wxIdleEvent to all interested - // parties - // - // it should return true if more idle events are needed, false if not - virtual bool ProcessIdle() wxOVERRIDE; - - // override base class version: GUI apps always use an event loop - virtual bool UsesEventLoop() const wxOVERRIDE { return true; } - - - // top level window functions - // -------------------------- - - // return true if our app has focus - virtual bool IsActive() const { return m_isActive; } - - // set the "main" top level window - void SetTopWindow(wxWindow *win) { m_topWindow = win; } - - // return the "main" top level window (if it hadn't been set previously - // with SetTopWindow(), will return just some top level window and, if - // there are none, will return NULL) - virtual wxWindow *GetTopWindow() const; - - // control the exit behaviour: by default, the program will exit the - // main loop (and so, usually, terminate) when the last top-level - // program window is deleted. Beware that if you disable this behaviour - // (with SetExitOnFrameDelete(false)), you'll have to call - // ExitMainLoop() explicitly from somewhere. - void SetExitOnFrameDelete(bool flag) - { m_exitOnFrameDelete = flag ? Yes : No; } - bool GetExitOnFrameDelete() const - { return m_exitOnFrameDelete == Yes; } - - - // display mode, visual, printing mode, ... - // ------------------------------------------------------------------------ - - // Get display mode that is used use. This is only used in framebuffer - // wxWin ports such as wxDFB. - virtual wxVideoMode GetDisplayMode() const; - // Set display mode to use. This is only used in framebuffer wxWin - // ports such as wxDFB. This method should be called from - // wxApp::OnInitGui - virtual bool SetDisplayMode(const wxVideoMode& WXUNUSED(info)) { return true; } - - // set use of best visual flag (see below) - void SetUseBestVisual( bool flag, bool forceTrueColour = false ) - { m_useBestVisual = flag; m_forceTrueColour = forceTrueColour; } - bool GetUseBestVisual() const { return m_useBestVisual; } - - // set/get printing mode: see wxPRINT_XXX constants. - // - // default behaviour is the normal one for Unix: always use PostScript - // printing. - virtual void SetPrintMode(int WXUNUSED(mode)) { } - int GetPrintMode() const { return wxPRINT_POSTSCRIPT; } - - // Return the layout direction for the current locale or wxLayout_Default - // if it's unknown - virtual wxLayoutDirection GetLayoutDirection() const; - - // Change the theme used by the application, return true on success. - virtual bool SetNativeTheme(const wxString& WXUNUSED(theme)) { return false; } - - - // command line parsing (GUI-specific) - // ------------------------------------------------------------------------ - -#if wxUSE_CMDLINE_PARSER - virtual bool OnCmdLineParsed(wxCmdLineParser& parser) wxOVERRIDE; - virtual void OnInitCmdLine(wxCmdLineParser& parser) wxOVERRIDE; -#endif - - // miscellaneous other stuff - // ------------------------------------------------------------------------ - - // called by toolkit-specific code to set the app status: active (we have - // focus) or not and also the last window which had focus before we were - // deactivated - virtual void SetActive(bool isActive, wxWindow *lastFocus); - -protected: - // override base class method to use GUI traits - virtual wxAppTraits *CreateTraits() wxOVERRIDE; - - - // the main top level window (may be NULL) - wxWindow *m_topWindow; - - // if Yes, exit the main loop when the last top level window is deleted, if - // No don't do it and if Later -- only do it once we reach our OnRun() - // - // the explanation for using this strange scheme is given in appcmn.cpp - enum - { - Later = -1, - No, - Yes - } m_exitOnFrameDelete; - - // true if the app wants to use the best visual on systems where - // more than one are available (Sun, SGI, XFree86 4.0 ?) - bool m_useBestVisual; - // force TrueColour just in case "best" isn't TrueColour - bool m_forceTrueColour; - - // does any of our windows have focus? - bool m_isActive; - - wxDECLARE_NO_COPY_CLASS(wxAppBase); -}; - -// ---------------------------------------------------------------------------- -// now include the declaration of the real class -// ---------------------------------------------------------------------------- - -#if defined(__WXMSW__) - #include "wx/msw/app.h" -#elif defined(__WXMOTIF__) - #include "wx/motif/app.h" -#elif defined(__WXDFB__) - #include "wx/dfb/app.h" -#elif defined(__WXGTK20__) - #include "wx/gtk/app.h" -#elif defined(__WXGTK__) - #include "wx/gtk1/app.h" -#elif defined(__WXX11__) - #include "wx/x11/app.h" -#elif defined(__WXMAC__) - #include "wx/osx/app.h" -#elif defined(__WXQT__) - #include "wx/qt/app.h" -#endif - -#else // !GUI - -// wxApp is defined in core and we cannot define another one in wxBase, -// so use the preprocessor to allow using wxApp in console programs too -#define wxApp wxAppConsole - -#endif // GUI/!GUI - -// ---------------------------------------------------------------------------- -// the global data -// ---------------------------------------------------------------------------- - -// for compatibility, we define this macro to access the global application -// object of type wxApp -// -// note that instead of using of wxTheApp in application code you should -// consider using wxDECLARE_APP() after which you may call wxGetApp() which will -// return the object of the correct type (i.e. MyApp and not wxApp) -// -// the cast is safe as in GUI build we only use wxApp, not wxAppConsole, and in -// console mode it does nothing at all -#define wxTheApp static_cast(wxApp::GetInstance()) - -// ---------------------------------------------------------------------------- -// global functions -// ---------------------------------------------------------------------------- - -// event loop related functions only work in GUI programs -// ------------------------------------------------------ - -// Force an exit from main loop -WXDLLIMPEXP_BASE void wxExit(); - -// avoid redeclaring this function here if it had been already declared by -// wx/utils.h, this results in warnings from g++ with -Wredundant-decls -#ifndef wx_YIELD_DECLARED -#define wx_YIELD_DECLARED - -// Yield to other apps/messages -WXDLLIMPEXP_CORE bool wxYield(); - -#endif // wx_YIELD_DECLARED - -// Yield to other apps/messages -WXDLLIMPEXP_BASE void wxWakeUpIdle(); - -// ---------------------------------------------------------------------------- -// macros for dynamic creation of the application object -// ---------------------------------------------------------------------------- - -// Having a global instance of this class allows wxApp to be aware of the app -// creator function. wxApp can then call this function to create a new app -// object. Convoluted, but necessary. - -class WXDLLIMPEXP_BASE wxAppInitializer -{ -public: - wxAppInitializer(wxAppInitializerFunction fn) - { wxApp::SetInitializerFunction(fn); } -}; - -// the code below defines a wxIMPLEMENT_WXWIN_MAIN macro which you can use if -// your compiler really, really wants main() to be in your main program (e.g. -// hello.cpp). Now wxIMPLEMENT_APP should add this code if required. - -// For compilers that support it, prefer to use wmain() as this ensures any -// Unicode strings can be passed as command line parameters and not just those -// representable in the current locale. -#if wxUSE_UNICODE && defined(__VISUALC__) - #define wxIMPLEMENT_WXWIN_MAIN_CONSOLE \ - int wmain(int argc, wchar_t **argv) \ - { \ - wxDISABLE_DEBUG_SUPPORT(); \ - \ - return wxEntry(argc, argv); \ - } -#else // Use standard main() - #define wxIMPLEMENT_WXWIN_MAIN_CONSOLE \ - int main(int argc, char **argv) \ - { \ - wxDISABLE_DEBUG_SUPPORT(); \ - \ - return wxEntry(argc, argv); \ - } -#endif - -// port-specific header could have defined it already in some special way -#ifndef wxIMPLEMENT_WXWIN_MAIN - #define wxIMPLEMENT_WXWIN_MAIN wxIMPLEMENT_WXWIN_MAIN_CONSOLE -#endif // defined(wxIMPLEMENT_WXWIN_MAIN) - -#ifdef __WXUNIVERSAL__ - #include "wx/univ/theme.h" - - #ifdef wxUNIV_DEFAULT_THEME - #define wxIMPLEMENT_WX_THEME_SUPPORT \ - WX_USE_THEME(wxUNIV_DEFAULT_THEME); - #else - #define wxIMPLEMENT_WX_THEME_SUPPORT - #endif -#else - #define wxIMPLEMENT_WX_THEME_SUPPORT -#endif - -// Use this macro if you want to define your own main() or WinMain() function -// and call wxEntry() from there. -#define wxIMPLEMENT_APP_NO_MAIN(appname) \ - appname& wxGetApp() { return *static_cast(wxApp::GetInstance()); } \ - wxAppConsole *wxCreateApp() \ - { \ - wxAppConsole::CheckBuildOptions(WX_BUILD_OPTIONS_SIGNATURE, \ - "your program"); \ - return new appname; \ - } \ - wxAppInitializer \ - wxTheAppInitializer((wxAppInitializerFunction) wxCreateApp) - -// Same as wxIMPLEMENT_APP() normally but doesn't include themes support in -// wxUniversal builds -#define wxIMPLEMENT_APP_NO_THEMES(appname) \ - wxIMPLEMENT_WXWIN_MAIN \ - wxIMPLEMENT_APP_NO_MAIN(appname) - -// Use this macro exactly once, the argument is the name of the wxApp-derived -// class which is the class of your application. -#define wxIMPLEMENT_APP(appname) \ - wxIMPLEMENT_WX_THEME_SUPPORT \ - wxIMPLEMENT_APP_NO_THEMES(appname) - -// Same as wxIMPLEMENT_APP(), but for console applications. -#define wxIMPLEMENT_APP_CONSOLE(appname) \ - wxIMPLEMENT_WXWIN_MAIN_CONSOLE \ - wxIMPLEMENT_APP_NO_MAIN(appname) - -// this macro can be used multiple times and just allows you to use wxGetApp() -// function -#define wxDECLARE_APP(appname) \ - extern appname& wxGetApp() - - -// declare the stuff defined by wxIMPLEMENT_APP() macro, it's not really needed -// anywhere else but at the very least it suppresses icc warnings about -// defining extern symbols without prior declaration, and it shouldn't do any -// harm -extern wxAppConsole *wxCreateApp(); -extern wxAppInitializer wxTheAppInitializer; - -// ---------------------------------------------------------------------------- -// Compatibility macro aliases -// ---------------------------------------------------------------------------- - -// deprecated variants _not_ requiring a semicolon after them -// (note that also some wx-prefixed macro do _not_ require a semicolon because -// it's not always possible to force the compiler to require it) - -#define IMPLEMENT_WXWIN_MAIN_CONSOLE wxIMPLEMENT_WXWIN_MAIN_CONSOLE -#define IMPLEMENT_WXWIN_MAIN wxIMPLEMENT_WXWIN_MAIN -#define IMPLEMENT_WX_THEME_SUPPORT wxIMPLEMENT_WX_THEME_SUPPORT -#define IMPLEMENT_APP_NO_MAIN(app) wxIMPLEMENT_APP_NO_MAIN(app); -#define IMPLEMENT_APP_NO_THEMES(app) wxIMPLEMENT_APP_NO_THEMES(app); -#define IMPLEMENT_APP(app) wxIMPLEMENT_APP(app); -#define IMPLEMENT_APP_CONSOLE(app) wxIMPLEMENT_APP_CONSOLE(app); -#define DECLARE_APP(app) wxDECLARE_APP(app); - -#endif // _WX_APP_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/appprogress.h b/Externals/wxWidgets3/include/wx/appprogress.h deleted file mode 100644 index 63bd6e5a14..0000000000 --- a/Externals/wxWidgets3/include/wx/appprogress.h +++ /dev/null @@ -1,54 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/appprogress.h -// Purpose: wxAppProgressIndicator interface. -// Author: Chaobin Zhang -// Created: 2014-09-05 -// Copyright: (c) 2014 wxWidgets development team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_APPPROG_H_ -#define _WX_APPPROG_H_ - -#include "wx/defs.h" - -class WXDLLIMPEXP_CORE wxAppProgressIndicatorBase -{ -public: - wxAppProgressIndicatorBase() {} - virtual ~wxAppProgressIndicatorBase() {} - - virtual bool IsAvailable() const = 0; - - virtual void SetValue(int value) = 0; - virtual void SetRange(int range) = 0; - virtual void Pulse() = 0; - virtual void Reset() = 0; - -private: - wxDECLARE_NO_COPY_CLASS(wxAppProgressIndicatorBase); -}; - -#if defined(__WXMSW__) && wxUSE_TASKBARBUTTON - #include "wx/msw/appprogress.h" -#elif defined(__WXOSX_COCOA__) - #include "wx/osx/appprogress.h" -#else - class wxAppProgressIndicator : public wxAppProgressIndicatorBase - { - public: - wxAppProgressIndicator(wxWindow* WXUNUSED(parent) = NULL, - int WXUNUSED(maxValue) = 100) - { - } - - virtual bool IsAvailable() const wxOVERRIDE { return false; } - - virtual void SetValue(int WXUNUSED(value)) wxOVERRIDE { } - virtual void SetRange(int WXUNUSED(range)) wxOVERRIDE { } - virtual void Pulse() wxOVERRIDE { } - virtual void Reset() wxOVERRIDE { } - }; -#endif - -#endif // _WX_APPPROG_H_ diff --git a/Externals/wxWidgets3/include/wx/apptrait.h b/Externals/wxWidgets3/include/wx/apptrait.h deleted file mode 100644 index 51168eb5d6..0000000000 --- a/Externals/wxWidgets3/include/wx/apptrait.h +++ /dev/null @@ -1,286 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/apptrait.h -// Purpose: declaration of wxAppTraits and derived classes -// Author: Vadim Zeitlin -// Modified by: -// Created: 19.06.2003 -// Copyright: (c) 2003 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_APPTRAIT_H_ -#define _WX_APPTRAIT_H_ - -#include "wx/string.h" -#include "wx/platinfo.h" - -class WXDLLIMPEXP_FWD_BASE wxArrayString; -class WXDLLIMPEXP_FWD_BASE wxConfigBase; -class WXDLLIMPEXP_FWD_BASE wxEventLoopBase; -#if wxUSE_FONTMAP - class WXDLLIMPEXP_FWD_CORE wxFontMapper; -#endif // wxUSE_FONTMAP -class WXDLLIMPEXP_FWD_BASE wxLog; -class WXDLLIMPEXP_FWD_BASE wxMessageOutput; -class WXDLLIMPEXP_FWD_BASE wxObject; -class WXDLLIMPEXP_FWD_CORE wxRendererNative; -class WXDLLIMPEXP_FWD_BASE wxStandardPaths; -class WXDLLIMPEXP_FWD_BASE wxString; -class WXDLLIMPEXP_FWD_BASE wxTimer; -class WXDLLIMPEXP_FWD_BASE wxTimerImpl; - -class wxSocketManager; - - -// ---------------------------------------------------------------------------- -// wxAppTraits: this class defines various configurable aspects of wxApp -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxAppTraitsBase -{ -public: - // needed since this class declares virtual members - virtual ~wxAppTraitsBase() { } - - // hooks for working with the global objects, may be overridden by the user - // ------------------------------------------------------------------------ - -#if wxUSE_CONFIG - // create the default configuration object (base class version is - // implemented in config.cpp and creates wxRegConfig for wxMSW and - // wxFileConfig for all the other platforms) - virtual wxConfigBase *CreateConfig(); -#endif // wxUSE_CONFIG - -#if wxUSE_LOG - // create the default log target - virtual wxLog *CreateLogTarget() = 0; -#endif // wxUSE_LOG - - // create the global object used for printing out messages - virtual wxMessageOutput *CreateMessageOutput() = 0; - -#if wxUSE_FONTMAP - // create the global font mapper object used for encodings/charset mapping - virtual wxFontMapper *CreateFontMapper() = 0; -#endif // wxUSE_FONTMAP - - // get the renderer to use for drawing the generic controls (return value - // may be NULL in which case the default renderer for the current platform - // is used); this is used in GUI only and always returns NULL in console - // - // NB: returned pointer will be deleted by the caller - virtual wxRendererNative *CreateRenderer() = 0; - - // wxStandardPaths object is normally the same for wxBase and wxGUI - virtual wxStandardPaths& GetStandardPaths(); - - - // functions abstracting differences between GUI and console modes - // ------------------------------------------------------------------------ - - // show the assert dialog with the specified message in GUI or just print - // the string to stderr in console mode - // - // base class version has an implementation (in spite of being pure - // virtual) in base/appbase.cpp which can be called as last resort. - // - // return true to suppress subsequent asserts, false to continue as before - virtual bool ShowAssertDialog(const wxString& msg) = 0; - - // return true if fprintf(stderr) goes somewhere, false otherwise - virtual bool HasStderr() = 0; - -#if wxUSE_SOCKETS - // this function is used by wxNet library to set the default socket manager - // to use: doing it like this allows us to keep all socket-related code in - // wxNet instead of having to pull it in wxBase itself as we'd have to do - // if we really implemented wxSocketManager here - // - // we don't take ownership of this pointer, it should have a lifetime - // greater than that of any socket (e.g. be a pointer to a static object) - static void SetDefaultSocketManager(wxSocketManager *manager) - { - ms_manager = manager; - } - - // return socket manager: this is usually different for console and GUI - // applications (although some ports use the same implementation for both) - virtual wxSocketManager *GetSocketManager() { return ms_manager; } -#endif - - // create a new, port specific, instance of the event loop used by wxApp - virtual wxEventLoopBase *CreateEventLoop() = 0; - -#if wxUSE_TIMER - // return platform and toolkit dependent wxTimer implementation - virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer) = 0; -#endif - -#if wxUSE_THREADS - virtual void MutexGuiEnter(); - virtual void MutexGuiLeave(); -#endif - - // functions returning port-specific information - // ------------------------------------------------------------------------ - - // return information about the (native) toolkit currently used and its - // runtime (not compile-time) version. - // returns wxPORT_BASE for console applications and one of the remaining - // wxPORT_* values for GUI applications. - virtual wxPortId GetToolkitVersion(int *majVer = NULL, - int *minVer = NULL, - int *microVer = NULL) const = 0; - - // return true if the port is using wxUniversal for the GUI, false if not - virtual bool IsUsingUniversalWidgets() const = 0; - - // return the name of the Desktop Environment such as - // "KDE" or "GNOME". May return an empty string. - virtual wxString GetDesktopEnvironment() const = 0; - - // returns a short string to identify the block of the standard command - // line options parsed automatically by current port: if this string is - // empty, there are no such options, otherwise the function also fills - // passed arrays with the names and the descriptions of those options. - virtual wxString GetStandardCmdLineOptions(wxArrayString& names, - wxArrayString& desc) const - { - wxUnusedVar(names); - wxUnusedVar(desc); - - return wxEmptyString; - } - - -protected: -#if wxUSE_STACKWALKER - // utility function: returns the stack frame as a plain wxString - virtual wxString GetAssertStackTrace(); -#endif - -private: - static wxSocketManager *ms_manager; -}; - -// ---------------------------------------------------------------------------- -// include the platform-specific version of the class -// ---------------------------------------------------------------------------- - -// NB: test for __UNIX__ before __WXMAC__ as under Darwin we want to use the -// Unix code (and otherwise __UNIX__ wouldn't be defined) -// ABX: check __WIN32__ instead of __WXMSW__ for the same MSWBase in any Win32 port -#if defined(__WIN32__) - #include "wx/msw/apptbase.h" -#elif defined(__UNIX__) - #include "wx/unix/apptbase.h" -#else // no platform-specific methods to add to wxAppTraits - // wxAppTraits must be a class because it was forward declared as class - class WXDLLIMPEXP_BASE wxAppTraits : public wxAppTraitsBase - { - }; -#endif // platform - -// ============================================================================ -// standard traits for console and GUI applications -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxConsoleAppTraitsBase: wxAppTraits implementation for the console apps -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxConsoleAppTraitsBase : public wxAppTraits -{ -public: -#if !wxUSE_CONSOLE_EVENTLOOP - virtual wxEventLoopBase *CreateEventLoop() { return NULL; } -#endif // !wxUSE_CONSOLE_EVENTLOOP - -#if wxUSE_LOG - virtual wxLog *CreateLogTarget() wxOVERRIDE; -#endif // wxUSE_LOG - virtual wxMessageOutput *CreateMessageOutput() wxOVERRIDE; -#if wxUSE_FONTMAP - virtual wxFontMapper *CreateFontMapper() wxOVERRIDE; -#endif // wxUSE_FONTMAP - virtual wxRendererNative *CreateRenderer() wxOVERRIDE; - - virtual bool ShowAssertDialog(const wxString& msg) wxOVERRIDE; - virtual bool HasStderr() wxOVERRIDE; - - // the GetToolkitVersion for console application is always the same - wxPortId GetToolkitVersion(int *verMaj = NULL, - int *verMin = NULL, - int *verMicro = NULL) const wxOVERRIDE - { - // no toolkits (wxBase is for console applications without GUI support) - // NB: zero means "no toolkit", -1 means "not initialized yet" - // so we must use zero here! - if (verMaj) *verMaj = 0; - if (verMin) *verMin = 0; - if (verMicro) *verMicro = 0; - return wxPORT_BASE; - } - - virtual bool IsUsingUniversalWidgets() const wxOVERRIDE { return false; } - virtual wxString GetDesktopEnvironment() const wxOVERRIDE { return wxEmptyString; } -}; - -// ---------------------------------------------------------------------------- -// wxGUIAppTraitsBase: wxAppTraits implementation for the GUI apps -// ---------------------------------------------------------------------------- - -#if wxUSE_GUI - -class WXDLLIMPEXP_CORE wxGUIAppTraitsBase : public wxAppTraits -{ -public: -#if wxUSE_LOG - virtual wxLog *CreateLogTarget() wxOVERRIDE; -#endif // wxUSE_LOG - virtual wxMessageOutput *CreateMessageOutput() wxOVERRIDE; -#if wxUSE_FONTMAP - virtual wxFontMapper *CreateFontMapper() wxOVERRIDE; -#endif // wxUSE_FONTMAP - virtual wxRendererNative *CreateRenderer() wxOVERRIDE; - - virtual bool ShowAssertDialog(const wxString& msg) wxOVERRIDE; - virtual bool HasStderr() wxOVERRIDE; - - virtual bool IsUsingUniversalWidgets() const wxOVERRIDE - { - #ifdef __WXUNIVERSAL__ - return true; - #else - return false; - #endif - } - - virtual wxString GetDesktopEnvironment() const wxOVERRIDE { return wxEmptyString; } -}; - -#endif // wxUSE_GUI - -// ---------------------------------------------------------------------------- -// include the platform-specific version of the classes above -// ---------------------------------------------------------------------------- - -// ABX: check __WIN32__ instead of __WXMSW__ for the same MSWBase in any Win32 port -#if defined(__WIN32__) - #include "wx/msw/apptrait.h" -#elif defined(__UNIX__) - #include "wx/unix/apptrait.h" -#else - #if wxUSE_GUI - class wxGUIAppTraits : public wxGUIAppTraitsBase - { - }; - #endif // wxUSE_GUI - class wxConsoleAppTraits: public wxConsoleAppTraitsBase - { - }; -#endif // platform - -#endif // _WX_APPTRAIT_H_ - diff --git a/Externals/wxWidgets3/include/wx/archive.h b/Externals/wxWidgets3/include/wx/archive.h deleted file mode 100644 index 1d0b45e2fb..0000000000 --- a/Externals/wxWidgets3/include/wx/archive.h +++ /dev/null @@ -1,378 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/archive.h -// Purpose: Streams for archive formats -// Author: Mike Wetherell -// Copyright: (c) 2004 Mike Wetherell -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_ARCHIVE_H__ -#define _WX_ARCHIVE_H__ - -#include "wx/defs.h" - -#if wxUSE_STREAMS && wxUSE_ARCHIVE_STREAMS - -#include "wx/stream.h" -#include "wx/filename.h" - - -///////////////////////////////////////////////////////////////////////////// -// wxArchiveNotifier - -class WXDLLIMPEXP_BASE wxArchiveNotifier -{ -public: - virtual ~wxArchiveNotifier() { } - - virtual void OnEntryUpdated(class wxArchiveEntry& entry) = 0; -}; - - -///////////////////////////////////////////////////////////////////////////// -// wxArchiveEntry -// -// Holds an entry's meta data, such as filename and timestamp. - -class WXDLLIMPEXP_BASE wxArchiveEntry : public wxObject -{ -public: - virtual ~wxArchiveEntry() { } - - virtual wxDateTime GetDateTime() const = 0; - virtual wxFileOffset GetSize() const = 0; - virtual wxFileOffset GetOffset() const = 0; - virtual bool IsDir() const = 0; - virtual bool IsReadOnly() const = 0; - virtual wxString GetInternalName() const = 0; - virtual wxPathFormat GetInternalFormat() const = 0; - virtual wxString GetName(wxPathFormat format = wxPATH_NATIVE) const = 0; - - virtual void SetDateTime(const wxDateTime& dt) = 0; - virtual void SetSize(wxFileOffset size) = 0; - virtual void SetIsDir(bool isDir = true) = 0; - virtual void SetIsReadOnly(bool isReadOnly = true) = 0; - virtual void SetName(const wxString& name, - wxPathFormat format = wxPATH_NATIVE) = 0; - - wxArchiveEntry *Clone() const { return DoClone(); } - - void SetNotifier(wxArchiveNotifier& notifier); - virtual void UnsetNotifier() { m_notifier = NULL; } - -protected: - wxArchiveEntry() : m_notifier(NULL) { } - wxArchiveEntry(const wxArchiveEntry& e) : wxObject(e), m_notifier(NULL) { } - - virtual void SetOffset(wxFileOffset offset) = 0; - virtual wxArchiveEntry* DoClone() const = 0; - - wxArchiveNotifier *GetNotifier() const { return m_notifier; } - wxArchiveEntry& operator=(const wxArchiveEntry& entry); - -private: - wxArchiveNotifier *m_notifier; - - wxDECLARE_ABSTRACT_CLASS(wxArchiveEntry); -}; - - -///////////////////////////////////////////////////////////////////////////// -// wxArchiveInputStream -// -// GetNextEntry() returns an wxArchiveEntry object containing the meta-data -// for the next entry in the archive (and gives away ownership). Reading from -// the wxArchiveInputStream then returns the entry's data. Eof() becomes true -// after an attempt has been made to read past the end of the entry's data. -// -// When there are no more entries, GetNextEntry() returns NULL and sets Eof(). - -class WXDLLIMPEXP_BASE wxArchiveInputStream : public wxFilterInputStream -{ -public: - typedef wxArchiveEntry entry_type; - - virtual ~wxArchiveInputStream() { } - - virtual bool OpenEntry(wxArchiveEntry& entry) = 0; - virtual bool CloseEntry() = 0; - - wxArchiveEntry *GetNextEntry() { return DoGetNextEntry(); } - - virtual char Peek() wxOVERRIDE { return wxInputStream::Peek(); } - -protected: - wxArchiveInputStream(wxInputStream& stream, wxMBConv& conv); - wxArchiveInputStream(wxInputStream *stream, wxMBConv& conv); - - virtual wxArchiveEntry *DoGetNextEntry() = 0; - - wxMBConv& GetConv() const { return m_conv; } - -private: - wxMBConv& m_conv; -}; - - -///////////////////////////////////////////////////////////////////////////// -// wxArchiveOutputStream -// -// PutNextEntry is used to create a new entry in the output archive, then -// the entry's data is written to the wxArchiveOutputStream. -// -// Only one entry can be open for output at a time; another call to -// PutNextEntry closes the current entry and begins the next. -// -// The overload 'bool PutNextEntry(wxArchiveEntry *entry)' takes ownership -// of the entry object. - -class WXDLLIMPEXP_BASE wxArchiveOutputStream : public wxFilterOutputStream -{ -public: - virtual ~wxArchiveOutputStream() { } - - virtual bool PutNextEntry(wxArchiveEntry *entry) = 0; - - virtual bool PutNextEntry(const wxString& name, - const wxDateTime& dt = wxDateTime::Now(), - wxFileOffset size = wxInvalidOffset) = 0; - - virtual bool PutNextDirEntry(const wxString& name, - const wxDateTime& dt = wxDateTime::Now()) = 0; - - virtual bool CopyEntry(wxArchiveEntry *entry, - wxArchiveInputStream& stream) = 0; - - virtual bool CopyArchiveMetaData(wxArchiveInputStream& stream) = 0; - - virtual bool CloseEntry() = 0; - -protected: - wxArchiveOutputStream(wxOutputStream& stream, wxMBConv& conv); - wxArchiveOutputStream(wxOutputStream *stream, wxMBConv& conv); - - wxMBConv& GetConv() const { return m_conv; } - -private: - wxMBConv& m_conv; -}; - - -///////////////////////////////////////////////////////////////////////////// -// wxArchiveIterator -// -// An input iterator that can be used to transfer an archive's catalog to -// a container. - -#if wxUSE_STL || defined WX_TEST_ARCHIVE_ITERATOR -#include -#include - -template inline -void _wxSetArchiveIteratorValue( - X& val, Y entry, void *WXUNUSED(d)) -{ - val = X(entry); -} -template inline -void _wxSetArchiveIteratorValue( - std::pair& val, Z entry, Z WXUNUSED(d)) -{ - val = std::make_pair(X(entry->GetInternalName()), Y(entry)); -} - -template -class wxArchiveIterator -{ -public: - typedef std::input_iterator_tag iterator_category; - typedef T value_type; - typedef ptrdiff_t difference_type; - typedef T* pointer; - typedef T& reference; - - wxArchiveIterator() : m_rep(NULL) { } - - wxArchiveIterator(Arc& arc) { - typename Arc::entry_type* entry = arc.GetNextEntry(); - m_rep = entry ? new Rep(arc, entry) : NULL; - } - - wxArchiveIterator(const wxArchiveIterator& it) : m_rep(it.m_rep) { - if (m_rep) - m_rep->AddRef(); - } - - ~wxArchiveIterator() { - if (m_rep) - m_rep->UnRef(); - } - - const T& operator *() const { - return m_rep->GetValue(); - } - - const T* operator ->() const { - return &**this; - } - - wxArchiveIterator& operator =(const wxArchiveIterator& it) { - if (it.m_rep) - it.m_rep.AddRef(); - if (m_rep) - this->m_rep.UnRef(); - m_rep = it.m_rep; - return *this; - } - - wxArchiveIterator& operator ++() { - m_rep = m_rep->Next(); - return *this; - } - - wxArchiveIterator operator ++(int) { - wxArchiveIterator it(*this); - ++(*this); - return it; - } - - bool operator ==(const wxArchiveIterator& j) const { - return m_rep == j.m_rep; - } - - bool operator !=(const wxArchiveIterator& j) const { - return !(*this == j); - } - -private: - class Rep { - Arc& m_arc; - typename Arc::entry_type* m_entry; - T m_value; - int m_ref; - - public: - Rep(Arc& arc, typename Arc::entry_type* entry) - : m_arc(arc), m_entry(entry), m_value(), m_ref(1) { } - ~Rep() - { delete m_entry; } - - void AddRef() { - m_ref++; - } - - void UnRef() { - if (--m_ref == 0) - delete this; - } - - Rep *Next() { - typename Arc::entry_type* entry = m_arc.GetNextEntry(); - if (!entry) { - UnRef(); - return NULL; - } - if (m_ref > 1) { - m_ref--; - return new Rep(m_arc, entry); - } - delete m_entry; - m_entry = entry; - m_value = T(); - return this; - } - - const T& GetValue() { - if (m_entry) { - _wxSetArchiveIteratorValue(m_value, m_entry, m_entry); - m_entry = NULL; - } - return m_value; - } - } *m_rep; -}; - -typedef wxArchiveIterator wxArchiveIter; -typedef wxArchiveIterator > wxArchivePairIter; - -#endif // wxUSE_STL || defined WX_TEST_ARCHIVE_ITERATOR - - -///////////////////////////////////////////////////////////////////////////// -// wxArchiveClassFactory -// -// A wxArchiveClassFactory instance for a particular archive type allows -// the creation of the other classes that may be needed. - -void WXDLLIMPEXP_BASE wxUseArchiveClasses(); - -class WXDLLIMPEXP_BASE wxArchiveClassFactory : public wxFilterClassFactoryBase -{ -public: - typedef wxArchiveEntry entry_type; - typedef wxArchiveInputStream instream_type; - typedef wxArchiveOutputStream outstream_type; - typedef wxArchiveNotifier notifier_type; -#if wxUSE_STL || defined WX_TEST_ARCHIVE_ITERATOR - typedef wxArchiveIter iter_type; - typedef wxArchivePairIter pairiter_type; -#endif - - virtual ~wxArchiveClassFactory() { } - - wxArchiveEntry *NewEntry() const - { return DoNewEntry(); } - wxArchiveInputStream *NewStream(wxInputStream& stream) const - { return DoNewStream(stream); } - wxArchiveOutputStream *NewStream(wxOutputStream& stream) const - { return DoNewStream(stream); } - wxArchiveInputStream *NewStream(wxInputStream *stream) const - { return DoNewStream(stream); } - wxArchiveOutputStream *NewStream(wxOutputStream *stream) const - { return DoNewStream(stream); } - - virtual wxString GetInternalName( - const wxString& name, - wxPathFormat format = wxPATH_NATIVE) const = 0; - - // FIXME-UTF8: remove these from this file, they are used for ANSI - // build only - void SetConv(wxMBConv& conv) { m_pConv = &conv; } - wxMBConv& GetConv() const - { if (m_pConv) return *m_pConv; else return wxConvLocal; } - - static const wxArchiveClassFactory *Find(const wxString& protocol, - wxStreamProtocolType type - = wxSTREAM_PROTOCOL); - - static const wxArchiveClassFactory *GetFirst(); - const wxArchiveClassFactory *GetNext() const { return m_next; } - - void PushFront() { Remove(); m_next = sm_first; sm_first = this; } - void Remove(); - -protected: - // old compilers don't support covarient returns, so 'Do' methods are - // used to simulate them - virtual wxArchiveEntry *DoNewEntry() const = 0; - virtual wxArchiveInputStream *DoNewStream(wxInputStream& stream) const = 0; - virtual wxArchiveOutputStream *DoNewStream(wxOutputStream& stream) const = 0; - virtual wxArchiveInputStream *DoNewStream(wxInputStream *stream) const = 0; - virtual wxArchiveOutputStream *DoNewStream(wxOutputStream *stream) const = 0; - - wxArchiveClassFactory() : m_pConv(NULL), m_next(this) { } - wxArchiveClassFactory& operator=(const wxArchiveClassFactory& WXUNUSED(f)) - { return *this; } - -private: - wxMBConv *m_pConv; - static wxArchiveClassFactory *sm_first; - wxArchiveClassFactory *m_next; - - wxDECLARE_ABSTRACT_CLASS(wxArchiveClassFactory); -}; - -#endif // wxUSE_STREAMS && wxUSE_ARCHIVE_STREAMS - -#endif // _WX_ARCHIVE_H__ diff --git a/Externals/wxWidgets3/include/wx/arrimpl.cpp b/Externals/wxWidgets3/include/wx/arrimpl.cpp deleted file mode 100644 index 0ef9e74890..0000000000 --- a/Externals/wxWidgets3/include/wx/arrimpl.cpp +++ /dev/null @@ -1,119 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/arrimpl.cpp -// Purpose: helper file for implementation of dynamic lists -// Author: Vadim Zeitlin -// Modified by: -// Created: 16.10.97 -// Copyright: (c) 1997 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -/***************************************************************************** - * Purpose: implements methods of "template" class declared in * - * DECLARE_OBJARRAY macro and which couldn't be implemented inline * - * (because they need the full definition of type T in scope) * - * * - * Usage: 1) #include dynarray.h * - * 2) WX_DECLARE_OBJARRAY * - * 3) #include arrimpl.cpp * - * 4) WX_DEFINE_OBJARRAY * - *****************************************************************************/ - -// needed to resolve the conflict between global T and macro parameter T - -#define _WX_ERROR_REMOVE2(x) wxT("bad index in ") wxT(#x) wxT("::RemoveAt()") - -// macro implements remaining (not inline) methods of template list -// (it's private to this file) -#undef _DEFINE_OBJARRAY -#define _DEFINE_OBJARRAY(T, name) \ -name::~name() \ -{ \ - Empty(); \ -} \ - \ -void name::DoCopy(const name& src) \ -{ \ - for ( size_t ui = 0; ui < src.size(); ui++ ) \ - Add(src[ui]); \ -} \ - \ -name& name::operator=(const name& src) \ -{ \ - Empty(); \ - DoCopy(src); \ - \ - return *this; \ -} \ - \ -name::name(const name& src) : wxArrayPtrVoid() \ -{ \ - DoCopy(src); \ -} \ - \ -void name::DoEmpty() \ -{ \ - for ( size_t ui = 0; ui < size(); ui++ ) \ - delete (T*)base_array::operator[](ui); \ -} \ - \ -void name::RemoveAt(size_t uiIndex, size_t nRemove) \ -{ \ - wxCHECK_RET( uiIndex < size(), _WX_ERROR_REMOVE2(name) ); \ - \ - for (size_t i = 0; i < nRemove; i++ ) \ - delete (T*)base_array::operator[](uiIndex + i); \ - \ - base_array::erase(begin() + uiIndex, begin() + uiIndex + nRemove); \ -} \ - \ -void name::Add(const T& item, size_t nInsert) \ -{ \ - if (nInsert == 0) \ - return; \ - T* pItem = new T(item); \ - size_t nOldSize = size(); \ - if ( pItem != NULL ) \ - base_array::insert(end(), nInsert, pItem); \ - for (size_t i = 1; i < nInsert; i++) \ - base_array::operator[](nOldSize + i) = new T(item); \ -} \ - \ -void name::Insert(const T& item, size_t uiIndex, size_t nInsert) \ -{ \ - if (nInsert == 0) \ - return; \ - T* pItem = new T(item); \ - if ( pItem != NULL ) \ - base_array::insert(begin() + uiIndex, nInsert, pItem); \ - for (size_t i = 1; i < nInsert; i++) \ - base_array::operator[](uiIndex + i) = new T(item); \ -} \ - \ -int name::Index(const T& item, bool bFromEnd) const \ -{ \ - if ( bFromEnd ) { \ - if ( size() > 0 ) { \ - size_t ui = size() - 1; \ - do { \ - if ( (T*)base_array::operator[](ui) == &item ) \ - return static_cast(ui); \ - ui--; \ - } \ - while ( ui != 0 ); \ - } \ - } \ - else { \ - for( size_t ui = 0; ui < size(); ui++ ) { \ - if( (T*)base_array::operator[](ui) == &item ) \ - return static_cast(ui); \ - } \ - } \ - \ - return wxNOT_FOUND; \ -} - -// redefine the macro so that now it will generate the class implementation -// old value would provoke a compile-time error if this file is not included -#undef WX_DEFINE_OBJARRAY -#define WX_DEFINE_OBJARRAY(name) _DEFINE_OBJARRAY(_wxObjArray##name, name) diff --git a/Externals/wxWidgets3/include/wx/arrstr.h b/Externals/wxWidgets3/include/wx/arrstr.h deleted file mode 100644 index 8b2a6325c9..0000000000 --- a/Externals/wxWidgets3/include/wx/arrstr.h +++ /dev/null @@ -1,536 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/arrstr.h -// Purpose: wxArrayString class -// Author: Mattia Barbon and Vadim Zeitlin -// Modified by: -// Created: 07/07/03 -// Copyright: (c) 2003 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_ARRSTR_H -#define _WX_ARRSTR_H - -#include "wx/defs.h" -#include "wx/string.h" - -#if wxUSE_STD_CONTAINERS_COMPATIBLY - #include -#endif - -// these functions are only used in STL build now but we define them in any -// case for compatibility with the existing code outside of the library which -// could be using them -inline int wxCMPFUNC_CONV wxStringSortAscending(const wxString& s1, const wxString& s2) -{ - return s1.Cmp(s2); -} - -inline int wxCMPFUNC_CONV wxStringSortDescending(const wxString& s1, const wxString& s2) -{ - return wxStringSortAscending(s2, s1); -} - -// This comparison function ignores case when comparing strings differing not -// in case only, i.e. this ensures that "Aa" comes before "AB", unlike with -// wxStringSortAscending(). -inline int wxCMPFUNC_CONV -wxDictionaryStringSortAscending(const wxString& s1, const wxString& s2) -{ - const int cmp = s1.CmpNoCase(s2); - return cmp ? cmp : s1.Cmp(s2); -} - -inline int wxCMPFUNC_CONV -wxDictionaryStringSortDescending(const wxString& s1, const wxString& s2) -{ - return wxDictionaryStringSortAscending(s2, s1); -} - -#if wxUSE_STD_CONTAINERS - -#include "wx/dynarray.h" - -typedef int (wxCMPFUNC_CONV *CMPFUNCwxString)(wxString*, wxString*); -typedef wxString _wxArraywxBaseArrayStringBase; -_WX_DECLARE_BASEARRAY_2(_wxArraywxBaseArrayStringBase, wxBaseArrayStringBase, - wxArray_SortFunction, - class WXDLLIMPEXP_BASE); -WX_DEFINE_USER_EXPORTED_TYPEARRAY(wxString, wxArrayStringBase, - wxBaseArrayStringBase, WXDLLIMPEXP_BASE); - -class WXDLLIMPEXP_BASE wxArrayString : public wxArrayStringBase -{ -public: - // type of function used by wxArrayString::Sort() - typedef int (wxCMPFUNC_CONV *CompareFunction)(const wxString& first, - const wxString& second); - - wxArrayString() { } - wxArrayString(const wxArrayString& a) : wxArrayStringBase(a) { } - wxArrayString(size_t sz, const char** a); - wxArrayString(size_t sz, const wchar_t** a); - wxArrayString(size_t sz, const wxString* a); - - int Index(const wxString& str, bool bCase = true, bool bFromEnd = false) const; - - void Sort(bool reverseOrder = false); - void Sort(CompareFunction function); - void Sort(CMPFUNCwxString function) { wxArrayStringBase::Sort(function); } - - size_t Add(const wxString& string, size_t copies = 1) - { - wxArrayStringBase::Add(string, copies); - return size() - copies; - } -}; - -_WX_DEFINE_SORTED_TYPEARRAY_2(wxString, wxSortedArrayStringBase, - wxBaseArrayStringBase, = wxStringSortAscending, - class WXDLLIMPEXP_BASE, wxArrayString::CompareFunction); - -class WXDLLIMPEXP_BASE wxSortedArrayString : public wxSortedArrayStringBase -{ -public: - wxSortedArrayString() : wxSortedArrayStringBase(wxStringSortAscending) - { } - wxSortedArrayString(const wxSortedArrayString& array) - : wxSortedArrayStringBase(array) - { } - wxSortedArrayString(const wxArrayString& src) - : wxSortedArrayStringBase(wxStringSortAscending) - { - reserve(src.size()); - - for ( size_t n = 0; n < src.size(); n++ ) - Add(src[n]); - } - wxEXPLICIT wxSortedArrayString(wxArrayString::CompareFunction compareFunction) - : wxSortedArrayStringBase(compareFunction) - { } - - int Index(const wxString& str, bool bCase = true, bool bFromEnd = false) const; - -private: - void Insert() - { - wxFAIL_MSG( "wxSortedArrayString::Insert() is not to be used" ); - } - - void Sort() - { - wxFAIL_MSG( "wxSortedArrayString::Sort() is not to be used" ); - } -}; - -#else // if !wxUSE_STD_CONTAINERS - -#include "wx/beforestd.h" -#include -#include "wx/afterstd.h" - -class WXDLLIMPEXP_BASE wxArrayString -{ -public: - // type of function used by wxArrayString::Sort() - typedef int (wxCMPFUNC_CONV *CompareFunction)(const wxString& first, - const wxString& second); - // type of function used by wxArrayString::Sort(), for compatibility with - // wxArray - typedef int (wxCMPFUNC_CONV *CompareFunction2)(wxString* first, - wxString* second); - - // constructors and destructor - // default ctor - wxArrayString() { Init(false); } - // if autoSort is true, the array is always sorted (in alphabetical order) - // - // NB: the reason for using int and not bool is that like this we can avoid - // using this ctor for implicit conversions from "const char *" (which - // we'd like to be implicitly converted to wxString instead!). This - // wouldn't be needed if the 'explicit' keyword was supported by all - // compilers, or if this was protected ctor for wxSortedArrayString, - // but we're stuck with it now. - wxEXPLICIT wxArrayString(int autoSort) { Init(autoSort != 0); } - // C string array ctor - wxArrayString(size_t sz, const char** a); - wxArrayString(size_t sz, const wchar_t** a); - // wxString string array ctor - wxArrayString(size_t sz, const wxString* a); - // copy ctor - wxArrayString(const wxArrayString& array); - // assignment operator - wxArrayString& operator=(const wxArrayString& src); - // not virtual, this class should not be derived from - ~wxArrayString(); - - // memory management - // empties the list, but doesn't release memory - void Empty(); - // empties the list and releases memory - void Clear(); - // preallocates memory for given number of items - void Alloc(size_t nCount); - // minimizes the memory usage (by freeing all extra memory) - void Shrink(); - - // simple accessors - // number of elements in the array - size_t GetCount() const { return m_nCount; } - // is it empty? - bool IsEmpty() const { return m_nCount == 0; } - // number of elements in the array (GetCount is preferred API) - size_t Count() const { return m_nCount; } - - // items access (range checking is done in debug version) - // get item at position uiIndex - wxString& Item(size_t nIndex) - { - wxASSERT_MSG( nIndex < m_nCount, - wxT("wxArrayString: index out of bounds") ); - - return m_pItems[nIndex]; - } - const wxString& Item(size_t nIndex) const { return const_cast(this)->Item(nIndex); } - - // same as Item() - wxString& operator[](size_t nIndex) { return Item(nIndex); } - const wxString& operator[](size_t nIndex) const { return Item(nIndex); } - // get last item - wxString& Last() - { - wxASSERT_MSG( !IsEmpty(), - wxT("wxArrayString: index out of bounds") ); - return Item(GetCount() - 1); - } - const wxString& Last() const { return const_cast(this)->Last(); } - - - // item management - // Search the element in the array, starting from the beginning if - // bFromEnd is false or from end otherwise. If bCase, comparison is case - // sensitive (default). Returns index of the first item matched or - // wxNOT_FOUND - int Index (const wxString& str, bool bCase = true, bool bFromEnd = false) const; - // add new element at the end (if the array is not sorted), return its - // index - size_t Add(const wxString& str, size_t nInsert = 1); - // add new element at given position - void Insert(const wxString& str, size_t uiIndex, size_t nInsert = 1); - // expand the array to have count elements - void SetCount(size_t count); - // remove first item matching this value - void Remove(const wxString& sz); - // remove item by index - void RemoveAt(size_t nIndex, size_t nRemove = 1); - - // sorting - // sort array elements in alphabetical order (or reversed alphabetical - // order if reverseOrder parameter is true) - void Sort(bool reverseOrder = false); - // sort array elements using specified comparison function - void Sort(CompareFunction compareFunction); - void Sort(CompareFunction2 compareFunction); - - // comparison - // compare two arrays case sensitively - bool operator==(const wxArrayString& a) const; - // compare two arrays case sensitively - bool operator!=(const wxArrayString& a) const { return !(*this == a); } - - // STL-like interface - typedef wxString value_type; - typedef value_type* pointer; - typedef const value_type* const_pointer; - typedef value_type* iterator; - typedef const value_type* const_iterator; - typedef value_type& reference; - typedef const value_type& const_reference; - typedef int difference_type; - typedef size_t size_type; - - // TODO: this code duplicates the one in dynarray.h - class reverse_iterator - { - typedef wxString value_type; - typedef value_type* pointer; - typedef value_type& reference; - typedef reverse_iterator itor; - friend itor operator+(int o, const itor& it); - friend itor operator+(const itor& it, int o); - friend itor operator-(const itor& it, int o); - friend difference_type operator -(const itor& i1, const itor& i2); - public: - pointer m_ptr; - reverse_iterator() : m_ptr(NULL) { } - wxEXPLICIT reverse_iterator(pointer ptr) : m_ptr(ptr) { } - reverse_iterator(const itor& it) : m_ptr(it.m_ptr) { } - reference operator*() const { return *m_ptr; } - pointer operator->() const { return m_ptr; } - itor& operator++() { --m_ptr; return *this; } - const itor operator++(int) - { reverse_iterator tmp = *this; --m_ptr; return tmp; } - itor& operator--() { ++m_ptr; return *this; } - const itor operator--(int) { itor tmp = *this; ++m_ptr; return tmp; } - bool operator ==(const itor& it) const { return m_ptr == it.m_ptr; } - bool operator !=(const itor& it) const { return m_ptr != it.m_ptr; } - }; - - class const_reverse_iterator - { - typedef wxString value_type; - typedef const value_type* pointer; - typedef const value_type& reference; - typedef const_reverse_iterator itor; - friend itor operator+(int o, const itor& it); - friend itor operator+(const itor& it, int o); - friend itor operator-(const itor& it, int o); - friend difference_type operator -(const itor& i1, const itor& i2); - public: - pointer m_ptr; - const_reverse_iterator() : m_ptr(NULL) { } - wxEXPLICIT const_reverse_iterator(pointer ptr) : m_ptr(ptr) { } - const_reverse_iterator(const itor& it) : m_ptr(it.m_ptr) { } - const_reverse_iterator(const reverse_iterator& it) : m_ptr(it.m_ptr) { } - reference operator*() const { return *m_ptr; } - pointer operator->() const { return m_ptr; } - itor& operator++() { --m_ptr; return *this; } - const itor operator++(int) - { itor tmp = *this; --m_ptr; return tmp; } - itor& operator--() { ++m_ptr; return *this; } - const itor operator--(int) { itor tmp = *this; ++m_ptr; return tmp; } - bool operator ==(const itor& it) const { return m_ptr == it.m_ptr; } - bool operator !=(const itor& it) const { return m_ptr != it.m_ptr; } - }; - - wxArrayString(const_iterator first, const_iterator last) - { Init(false); assign(first, last); } - wxArrayString(size_type n, const_reference v) { Init(false); assign(n, v); } - - template - void assign(Iterator first, Iterator last) - { - clear(); - reserve(std::distance(first, last)); - for(; first != last; ++first) - push_back(*first); - } - - void assign(size_type n, const_reference v) - { clear(); Add(v, n); } - reference back() { return *(end() - 1); } - const_reference back() const { return *(end() - 1); } - iterator begin() { return m_pItems; } - const_iterator begin() const { return m_pItems; } - size_type capacity() const { return m_nSize; } - void clear() { Clear(); } - bool empty() const { return IsEmpty(); } - iterator end() { return begin() + GetCount(); } - const_iterator end() const { return begin() + GetCount(); } - iterator erase(iterator first, iterator last) - { - size_t idx = first - begin(); - RemoveAt(idx, last - first); - return begin() + idx; - } - iterator erase(iterator it) { return erase(it, it + 1); } - reference front() { return *begin(); } - const_reference front() const { return *begin(); } - void insert(iterator it, size_type n, const_reference v) - { Insert(v, it - begin(), n); } - iterator insert(iterator it, const_reference v = value_type()) - { size_t idx = it - begin(); Insert(v, idx); return begin() + idx; } - void insert(iterator it, const_iterator first, const_iterator last); - size_type max_size() const { return INT_MAX; } - void pop_back() { RemoveAt(GetCount() - 1); } - void push_back(const_reference v) { Add(v); } - reverse_iterator rbegin() { return reverse_iterator(end() - 1); } - const_reverse_iterator rbegin() const - { return const_reverse_iterator(end() - 1); } - reverse_iterator rend() { return reverse_iterator(begin() - 1); } - const_reverse_iterator rend() const - { return const_reverse_iterator(begin() - 1); } - void reserve(size_type n) /* base::reserve*/; - void resize(size_type n, value_type v = value_type()); - size_type size() const { return GetCount(); } - void swap(wxArrayString& other) - { - wxSwap(m_nSize, other.m_nSize); - wxSwap(m_nCount, other.m_nCount); - wxSwap(m_pItems, other.m_pItems); - wxSwap(m_autoSort, other.m_autoSort); - } - -protected: - void Init(bool autoSort); // common part of all ctors - void Copy(const wxArrayString& src); // copies the contents of another array - - CompareFunction m_compareFunction; // set only from wxSortedArrayString - -private: - // Allocate the new buffer big enough to hold m_nCount + nIncrement items and - // return the pointer to the old buffer, which must be deleted by the caller - // (if the old buffer is big enough, just return NULL). - wxString *Grow(size_t nIncrement); - - size_t m_nSize, // current size of the array - m_nCount; // current number of elements - - wxString *m_pItems; // pointer to data - - bool m_autoSort; // if true, keep the array always sorted -}; - -class WXDLLIMPEXP_BASE wxSortedArrayString : public wxArrayString -{ -public: - wxSortedArrayString() : wxArrayString(true) - { } - wxSortedArrayString(const wxArrayString& array) : wxArrayString(true) - { Copy(array); } - - wxEXPLICIT wxSortedArrayString(CompareFunction compareFunction) - : wxArrayString(true) - { m_compareFunction = compareFunction; } -}; - -#endif // !wxUSE_STD_CONTAINERS - -// this class provides a temporary wxString* from a -// wxArrayString -class WXDLLIMPEXP_BASE wxCArrayString -{ -public: - wxCArrayString( const wxArrayString& array ) - : m_array( array ), m_strings( NULL ) - { } - ~wxCArrayString() { delete[] m_strings; } - - size_t GetCount() const { return m_array.GetCount(); } - wxString* GetStrings() - { - if( m_strings ) return m_strings; - size_t count = m_array.GetCount(); - m_strings = new wxString[count]; - for( size_t i = 0; i < count; ++i ) - m_strings[i] = m_array[i]; - return m_strings; - } - - wxString* Release() - { - wxString *r = GetStrings(); - m_strings = NULL; - return r; - } - -private: - const wxArrayString& m_array; - wxString* m_strings; -}; - - -// ---------------------------------------------------------------------------- -// helper functions for working with arrays -// ---------------------------------------------------------------------------- - -// by default, these functions use the escape character to escape the -// separators occurring inside the string to be joined, this can be disabled by -// passing '\0' as escape - -WXDLLIMPEXP_BASE wxString wxJoin(const wxArrayString& arr, - const wxChar sep, - const wxChar escape = wxT('\\')); - -WXDLLIMPEXP_BASE wxArrayString wxSplit(const wxString& str, - const wxChar sep, - const wxChar escape = wxT('\\')); - - -// ---------------------------------------------------------------------------- -// This helper class allows to pass both C array of wxStrings or wxArrayString -// using the same interface. -// -// Use it when you have two methods taking wxArrayString or (int, wxString[]), -// that do the same thing. This class lets you iterate over input data in the -// same way whether it is a raw array of strings or wxArrayString. -// -// The object does not take ownership of the data -- internally it keeps -// pointers to the data, therefore the data must be disposed of by user -// and only after this object is destroyed. Usually it is not a problem as -// only temporary objects of this class are used. -// ---------------------------------------------------------------------------- - -class wxArrayStringsAdapter -{ -public: - // construct an adapter from a wxArrayString - wxArrayStringsAdapter(const wxArrayString& strings) - : m_type(wxSTRING_ARRAY), m_size(strings.size()) - { - m_data.array = &strings; - } - - // construct an adapter from a wxString[] - wxArrayStringsAdapter(unsigned int n, const wxString *strings) - : m_type(wxSTRING_POINTER), m_size(n) - { - m_data.ptr = strings; - } - -#if wxUSE_STD_CONTAINERS_COMPATIBLY - // construct an adapter from a vector of strings (of any type) - template - wxArrayStringsAdapter(const std::vector& strings) - : m_type(wxSTRING_POINTER), m_size(strings.size()) - { - m_data.ptr = &strings[0]; - } -#endif // wxUSE_STD_CONTAINERS_COMPATIBLY - - // construct an adapter from a single wxString - wxArrayStringsAdapter(const wxString& s) - : m_type(wxSTRING_POINTER), m_size(1) - { - m_data.ptr = &s; - } - - // default copy constructor is ok - - // iteration interface - size_t GetCount() const { return m_size; } - bool IsEmpty() const { return GetCount() == 0; } - const wxString& operator[] (unsigned int i) const - { - wxASSERT_MSG( i < GetCount(), wxT("index out of bounds") ); - if(m_type == wxSTRING_POINTER) - return m_data.ptr[i]; - return m_data.array->Item(i); - } - wxArrayString AsArrayString() const - { - if(m_type == wxSTRING_ARRAY) - return *m_data.array; - return wxArrayString(GetCount(), m_data.ptr); - } - -private: - // type of the data being held - enum wxStringContainerType - { - wxSTRING_ARRAY, // wxArrayString - wxSTRING_POINTER // wxString[] - }; - - wxStringContainerType m_type; - size_t m_size; - union - { - const wxString * ptr; - const wxArrayString * array; - } m_data; - - wxDECLARE_NO_ASSIGN_CLASS(wxArrayStringsAdapter); -}; - -#endif // _WX_ARRSTR_H diff --git a/Externals/wxWidgets3/include/wx/artprov.h b/Externals/wxWidgets3/include/wx/artprov.h deleted file mode 100644 index 29e0c71b26..0000000000 --- a/Externals/wxWidgets3/include/wx/artprov.h +++ /dev/null @@ -1,255 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/artprov.h -// Purpose: wxArtProvider class -// Author: Vaclav Slavik -// Modified by: -// Created: 18/03/2002 -// Copyright: (c) Vaclav Slavik -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_ARTPROV_H_ -#define _WX_ARTPROV_H_ - -#include "wx/string.h" -#include "wx/bitmap.h" -#include "wx/icon.h" -#include "wx/iconbndl.h" - -class WXDLLIMPEXP_FWD_CORE wxArtProvidersList; -class WXDLLIMPEXP_FWD_CORE wxArtProviderCache; -class wxArtProviderModule; - -// ---------------------------------------------------------------------------- -// Types -// ---------------------------------------------------------------------------- - -typedef wxString wxArtClient; -typedef wxString wxArtID; - -#define wxART_MAKE_CLIENT_ID_FROM_STR(id) ((id) + "_C") -#define wxART_MAKE_CLIENT_ID(id) (#id "_C") -#define wxART_MAKE_ART_ID_FROM_STR(id) (id) -#define wxART_MAKE_ART_ID(id) (#id) - -// ---------------------------------------------------------------------------- -// Art clients -// ---------------------------------------------------------------------------- - -#define wxART_TOOLBAR wxART_MAKE_CLIENT_ID(wxART_TOOLBAR) -#define wxART_MENU wxART_MAKE_CLIENT_ID(wxART_MENU) -#define wxART_FRAME_ICON wxART_MAKE_CLIENT_ID(wxART_FRAME_ICON) - -#define wxART_CMN_DIALOG wxART_MAKE_CLIENT_ID(wxART_CMN_DIALOG) -#define wxART_HELP_BROWSER wxART_MAKE_CLIENT_ID(wxART_HELP_BROWSER) -#define wxART_MESSAGE_BOX wxART_MAKE_CLIENT_ID(wxART_MESSAGE_BOX) -#define wxART_BUTTON wxART_MAKE_CLIENT_ID(wxART_BUTTON) -#define wxART_LIST wxART_MAKE_CLIENT_ID(wxART_LIST) - -#define wxART_OTHER wxART_MAKE_CLIENT_ID(wxART_OTHER) - -// ---------------------------------------------------------------------------- -// Art IDs -// ---------------------------------------------------------------------------- - -#define wxART_ADD_BOOKMARK wxART_MAKE_ART_ID(wxART_ADD_BOOKMARK) -#define wxART_DEL_BOOKMARK wxART_MAKE_ART_ID(wxART_DEL_BOOKMARK) -#define wxART_HELP_SIDE_PANEL wxART_MAKE_ART_ID(wxART_HELP_SIDE_PANEL) -#define wxART_HELP_SETTINGS wxART_MAKE_ART_ID(wxART_HELP_SETTINGS) -#define wxART_HELP_BOOK wxART_MAKE_ART_ID(wxART_HELP_BOOK) -#define wxART_HELP_FOLDER wxART_MAKE_ART_ID(wxART_HELP_FOLDER) -#define wxART_HELP_PAGE wxART_MAKE_ART_ID(wxART_HELP_PAGE) -#define wxART_GO_BACK wxART_MAKE_ART_ID(wxART_GO_BACK) -#define wxART_GO_FORWARD wxART_MAKE_ART_ID(wxART_GO_FORWARD) -#define wxART_GO_UP wxART_MAKE_ART_ID(wxART_GO_UP) -#define wxART_GO_DOWN wxART_MAKE_ART_ID(wxART_GO_DOWN) -#define wxART_GO_TO_PARENT wxART_MAKE_ART_ID(wxART_GO_TO_PARENT) -#define wxART_GO_HOME wxART_MAKE_ART_ID(wxART_GO_HOME) -#define wxART_GOTO_FIRST wxART_MAKE_ART_ID(wxART_GOTO_FIRST) -#define wxART_GOTO_LAST wxART_MAKE_ART_ID(wxART_GOTO_LAST) -#define wxART_FILE_OPEN wxART_MAKE_ART_ID(wxART_FILE_OPEN) -#define wxART_FILE_SAVE wxART_MAKE_ART_ID(wxART_FILE_SAVE) -#define wxART_FILE_SAVE_AS wxART_MAKE_ART_ID(wxART_FILE_SAVE_AS) -#define wxART_PRINT wxART_MAKE_ART_ID(wxART_PRINT) -#define wxART_HELP wxART_MAKE_ART_ID(wxART_HELP) -#define wxART_TIP wxART_MAKE_ART_ID(wxART_TIP) -#define wxART_REPORT_VIEW wxART_MAKE_ART_ID(wxART_REPORT_VIEW) -#define wxART_LIST_VIEW wxART_MAKE_ART_ID(wxART_LIST_VIEW) -#define wxART_NEW_DIR wxART_MAKE_ART_ID(wxART_NEW_DIR) -#define wxART_HARDDISK wxART_MAKE_ART_ID(wxART_HARDDISK) -#define wxART_FLOPPY wxART_MAKE_ART_ID(wxART_FLOPPY) -#define wxART_CDROM wxART_MAKE_ART_ID(wxART_CDROM) -#define wxART_REMOVABLE wxART_MAKE_ART_ID(wxART_REMOVABLE) -#define wxART_FOLDER wxART_MAKE_ART_ID(wxART_FOLDER) -#define wxART_FOLDER_OPEN wxART_MAKE_ART_ID(wxART_FOLDER_OPEN) -#define wxART_GO_DIR_UP wxART_MAKE_ART_ID(wxART_GO_DIR_UP) -#define wxART_EXECUTABLE_FILE wxART_MAKE_ART_ID(wxART_EXECUTABLE_FILE) -#define wxART_NORMAL_FILE wxART_MAKE_ART_ID(wxART_NORMAL_FILE) -#define wxART_TICK_MARK wxART_MAKE_ART_ID(wxART_TICK_MARK) -#define wxART_CROSS_MARK wxART_MAKE_ART_ID(wxART_CROSS_MARK) -#define wxART_ERROR wxART_MAKE_ART_ID(wxART_ERROR) -#define wxART_QUESTION wxART_MAKE_ART_ID(wxART_QUESTION) -#define wxART_WARNING wxART_MAKE_ART_ID(wxART_WARNING) -#define wxART_INFORMATION wxART_MAKE_ART_ID(wxART_INFORMATION) -#define wxART_MISSING_IMAGE wxART_MAKE_ART_ID(wxART_MISSING_IMAGE) - -#define wxART_COPY wxART_MAKE_ART_ID(wxART_COPY) -#define wxART_CUT wxART_MAKE_ART_ID(wxART_CUT) -#define wxART_PASTE wxART_MAKE_ART_ID(wxART_PASTE) -#define wxART_DELETE wxART_MAKE_ART_ID(wxART_DELETE) -#define wxART_NEW wxART_MAKE_ART_ID(wxART_NEW) - -#define wxART_UNDO wxART_MAKE_ART_ID(wxART_UNDO) -#define wxART_REDO wxART_MAKE_ART_ID(wxART_REDO) - -#define wxART_PLUS wxART_MAKE_ART_ID(wxART_PLUS) -#define wxART_MINUS wxART_MAKE_ART_ID(wxART_MINUS) - -#define wxART_CLOSE wxART_MAKE_ART_ID(wxART_CLOSE) -#define wxART_QUIT wxART_MAKE_ART_ID(wxART_QUIT) - -#define wxART_FIND wxART_MAKE_ART_ID(wxART_FIND) -#define wxART_FIND_AND_REPLACE wxART_MAKE_ART_ID(wxART_FIND_AND_REPLACE) - -#define wxART_FULL_SCREEN wxART_MAKE_ART_ID(wxART_FULL_SCREEN) - -#define wxART_EDIT wxART_MAKE_ART_ID(wxART_EDIT) - -// ---------------------------------------------------------------------------- -// wxArtProvider class -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxArtProvider : public wxObject -{ -public: - // Dtor removes the provider from providers stack if it's still on it - virtual ~wxArtProvider(); - - // Does this platform implement native icons theme? - static bool HasNativeProvider(); - - // Add new provider to the top of providers stack (i.e. the provider will - // be queried first of all). - static void Push(wxArtProvider *provider); - - // Add new provider to the bottom of providers stack (i.e. the provider - // will be queried as the last one). - static void PushBack(wxArtProvider *provider); - -#if WXWIN_COMPATIBILITY_2_8 - // use PushBack(), it's the same thing - static wxDEPRECATED( void Insert(wxArtProvider *provider) ); -#endif - - // Remove latest added provider and delete it. - static bool Pop(); - - // Remove provider from providers stack but don't delete it. - static bool Remove(wxArtProvider *provider); - - // Delete the given provider and remove it from the providers stack. - static bool Delete(wxArtProvider *provider); - - - // Query the providers for bitmap with given ID and return it. Return - // wxNullBitmap if no provider provides it. - static wxBitmap GetBitmap(const wxArtID& id, - const wxArtClient& client = wxART_OTHER, - const wxSize& size = wxDefaultSize); - - // Query the providers for icon with given ID and return it. Return - // wxNullIcon if no provider provides it. - static wxIcon GetIcon(const wxArtID& id, - const wxArtClient& client = wxART_OTHER, - const wxSize& size = wxDefaultSize); - - // Helper used by GetMessageBoxIcon(): return the art id corresponding to - // the standard wxICON_INFORMATION/WARNING/ERROR/QUESTION flags (only one - // can be set) - static wxArtID GetMessageBoxIconId(int flags); - - // Helper used by several generic classes: return the icon corresponding to - // the standard wxICON_INFORMATION/WARNING/ERROR/QUESTION flags (only one - // can be set) - static wxIcon GetMessageBoxIcon(int flags) - { - return GetIcon(GetMessageBoxIconId(flags), wxART_MESSAGE_BOX); - } - - // Query the providers for iconbundle with given ID and return it. Return - // wxNullIconBundle if no provider provides it. - static wxIconBundle GetIconBundle(const wxArtID& id, - const wxArtClient& client = wxART_OTHER); - - // Gets native size for given 'client' or wxDefaultSize if it doesn't - // have native equivalent - static wxSize GetNativeSizeHint(const wxArtClient& client); - - // Get the size hint of an icon from a specific wxArtClient, queries - // the topmost provider if platform_dependent = false - static wxSize GetSizeHint(const wxArtClient& client, bool platform_dependent = false); - - // Rescale bitmap (used internally if requested size is other than the available). - static void RescaleBitmap(wxBitmap& bmp, const wxSize& sizeNeeded); - -protected: - friend class wxArtProviderModule; -#if wxUSE_ARTPROVIDER_STD - // Initializes default provider - static void InitStdProvider(); -#endif // wxUSE_ARTPROVIDER_STD - // Initializes Tango-based icon provider -#if wxUSE_ARTPROVIDER_TANGO - static void InitTangoProvider(); -#endif // wxUSE_ARTPROVIDER_TANGO - // Initializes platform's native provider, if available (e.g. GTK2) - static void InitNativeProvider(); - // Destroy caches & all providers - static void CleanUpProviders(); - - // Get the default size of an icon for a specific client - virtual wxSize DoGetSizeHint(const wxArtClient& client) - { - return GetSizeHint(client, true); - } - - // Derived classes must override CreateBitmap or CreateIconBundle - // (or both) to create requested art resource. This method is called - // only once per instance's lifetime for each requested wxArtID. - virtual wxBitmap CreateBitmap(const wxArtID& WXUNUSED(id), - const wxArtClient& WXUNUSED(client), - const wxSize& WXUNUSED(size)) - { - return wxNullBitmap; - } - - virtual wxIconBundle CreateIconBundle(const wxArtID& WXUNUSED(id), - const wxArtClient& WXUNUSED(client)) - { - return wxNullIconBundle; - } - -private: - static void CommonAddingProvider(); - static wxIconBundle DoGetIconBundle(const wxArtID& id, - const wxArtClient& client); - -private: - // list of providers: - static wxArtProvidersList *sm_providers; - // art resources cache (so that CreateXXX is not called that often): - static wxArtProviderCache *sm_cache; - - wxDECLARE_ABSTRACT_CLASS(wxArtProvider); -}; - - -#if !defined(__WXUNIVERSAL__) && \ - ((defined(__WXGTK__) && defined(__WXGTK20__)) || defined(__WXMSW__) || \ - defined(__WXMAC__)) - // *some* (partial) native implementation of wxArtProvider exists; this is - // not the same as wxArtProvider::HasNativeProvider()! - #define wxHAS_NATIVE_ART_PROVIDER_IMPL -#endif - -#endif // _WX_ARTPROV_H_ diff --git a/Externals/wxWidgets3/include/wx/atomic.h b/Externals/wxWidgets3/include/wx/atomic.h deleted file mode 100644 index 25bd049834..0000000000 --- a/Externals/wxWidgets3/include/wx/atomic.h +++ /dev/null @@ -1,159 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/atomic.h -// Purpose: functions to manipulate atomically integers and pointers -// Author: Armel Asselin -// Created: 12/13/2006 -// Copyright: (c) Armel Asselin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_ATOMIC_H_ -#define _WX_ATOMIC_H_ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// get the value of wxUSE_THREADS configuration flag -#include "wx/defs.h" - -// constraints on the various functions: -// - wxAtomicDec must return a zero value if the value is zero once -// decremented else it must return any non-zero value (the true value is OK -// but not necessary). - -#if wxUSE_THREADS - -#if defined(HAVE_GCC_ATOMIC_BUILTINS) - -// NB: we intentionally don't use Linux's asm/atomic.h header, because it's -// an internal kernel header that doesn't always work in userspace: -// http://bugs.mysql.com/bug.php?id=28456 -// http://golubenco.org/blog/atomic-operations/ - -inline void wxAtomicInc (wxUint32 &value) -{ - __sync_fetch_and_add(&value, 1); -} - -inline wxUint32 wxAtomicDec (wxUint32 &value) -{ - return __sync_sub_and_fetch(&value, 1); -} - - -#elif defined(__WINDOWS__) - -// include standard Windows headers -#include "wx/msw/wrapwin.h" - -inline void wxAtomicInc (wxUint32 &value) -{ - InterlockedIncrement ((LONG*)&value); -} - -inline wxUint32 wxAtomicDec (wxUint32 &value) -{ - return InterlockedDecrement ((LONG*)&value); -} - -#elif defined(__DARWIN__) - -#include "libkern/OSAtomic.h" -inline void wxAtomicInc (wxUint32 &value) -{ - OSAtomicIncrement32 ((int32_t*)&value); -} - -inline wxUint32 wxAtomicDec (wxUint32 &value) -{ - return OSAtomicDecrement32 ((int32_t*)&value); -} - -#elif defined (__SOLARIS__) - -#include - -inline void wxAtomicInc (wxUint32 &value) -{ - atomic_add_32 ((uint32_t*)&value, 1); -} - -inline wxUint32 wxAtomicDec (wxUint32 &value) -{ - return atomic_add_32_nv ((uint32_t*)&value, (uint32_t)-1); -} - -#else // unknown platform - -// it will result in inclusion if the generic implementation code a bit later in this page -#define wxNEEDS_GENERIC_ATOMIC_OPS - -#endif // unknown platform - -#else // else of wxUSE_THREADS -// if no threads are used we can safely use simple ++/-- - -inline void wxAtomicInc (wxUint32 &value) { ++value; } -inline wxUint32 wxAtomicDec (wxUint32 &value) { return --value; } - -#endif // !wxUSE_THREADS - -// ---------------------------------------------------------------------------- -// proxies to actual implementations, but for various other types with same -// behaviour -// ---------------------------------------------------------------------------- - -#ifdef wxNEEDS_GENERIC_ATOMIC_OPS - -#include "wx/thread.h" // for wxCriticalSection - -class wxAtomicInt32 -{ -public: - wxAtomicInt32() { } // non initialized for consistency with basic int type - wxAtomicInt32(wxInt32 v) : m_value(v) { } - wxAtomicInt32(const wxAtomicInt32& a) : m_value(a.m_value) {} - - operator wxInt32() const { return m_value; } - operator volatile wxInt32&() { return m_value; } - - wxAtomicInt32& operator=(wxInt32 v) { m_value = v; return *this; } - - void Inc() - { - wxCriticalSectionLocker lock(m_locker); - ++m_value; - } - - wxInt32 Dec() - { - wxCriticalSectionLocker lock(m_locker); - return --m_value; - } - -private: - volatile wxInt32 m_value; - wxCriticalSection m_locker; -}; - -inline void wxAtomicInc(wxAtomicInt32 &value) { value.Inc(); } -inline wxInt32 wxAtomicDec(wxAtomicInt32 &value) { return value.Dec(); } - -#else // !wxNEEDS_GENERIC_ATOMIC_OPS - -#define wxHAS_ATOMIC_OPS - -inline void wxAtomicInc(wxInt32 &value) { wxAtomicInc((wxUint32&)value); } -inline wxInt32 wxAtomicDec(wxInt32 &value) { return wxAtomicDec((wxUint32&)value); } - -typedef wxInt32 wxAtomicInt32; - -#endif // wxNEEDS_GENERIC_ATOMIC_OPS - -// all the native implementations use 32 bits currently -// for a 64 bits implementation we could use (a future) wxAtomicInt64 as -// default type -typedef wxAtomicInt32 wxAtomicInt; - -#endif // _WX_ATOMIC_H_ diff --git a/Externals/wxWidgets3/include/wx/aui/aui.h b/Externals/wxWidgets3/include/wx/aui/aui.h deleted file mode 100644 index df3a9166a1..0000000000 --- a/Externals/wxWidgets3/include/wx/aui/aui.h +++ /dev/null @@ -1,22 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/aui/aui.h -// Purpose: wxaui: wx advanced user interface - docking window manager -// Author: Benjamin I. Williams -// Modified by: -// Created: 2005-05-17 -// Copyright: (C) Copyright 2005, Kirix Corporation, All Rights Reserved. -// Licence: wxWindows Library Licence, Version 3.1 -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_AUI_H_ -#define _WX_AUI_H_ - -#include "wx/aui/framemanager.h" -#include "wx/aui/dockart.h" -#include "wx/aui/floatpane.h" -#include "wx/aui/auibar.h" -#include "wx/aui/auibook.h" -#include "wx/aui/tabmdi.h" - -#endif // _WX_AUI_H_ - diff --git a/Externals/wxWidgets3/include/wx/aui/auibar.h b/Externals/wxWidgets3/include/wx/aui/auibar.h deleted file mode 100644 index c37787d993..0000000000 --- a/Externals/wxWidgets3/include/wx/aui/auibar.h +++ /dev/null @@ -1,765 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/aui/toolbar.h -// Purpose: wxaui: wx advanced user interface - docking window manager -// Author: Benjamin I. Williams -// Modified by: -// Created: 2008-08-04 -// Copyright: (C) Copyright 2005, Kirix Corporation, All Rights Reserved. -// Licence: wxWindows Library Licence, Version 3.1 -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_AUIBAR_H_ -#define _WX_AUIBAR_H_ - -#include "wx/defs.h" - -#if wxUSE_AUI - -#include "wx/control.h" -#include "wx/sizer.h" -#include "wx/pen.h" - -class WXDLLIMPEXP_FWD_CORE wxClientDC; -class WXDLLIMPEXP_FWD_AUI wxAuiPaneInfo; - -enum wxAuiToolBarStyle -{ - wxAUI_TB_TEXT = 1 << 0, - wxAUI_TB_NO_TOOLTIPS = 1 << 1, - wxAUI_TB_NO_AUTORESIZE = 1 << 2, - wxAUI_TB_GRIPPER = 1 << 3, - wxAUI_TB_OVERFLOW = 1 << 4, - // using this style forces the toolbar to be vertical and - // be only dockable to the left or right sides of the window - // whereas by default it can be horizontal or vertical and - // be docked anywhere - wxAUI_TB_VERTICAL = 1 << 5, - wxAUI_TB_HORZ_LAYOUT = 1 << 6, - // analogous to wxAUI_TB_VERTICAL, but forces the toolbar - // to be horizontal - wxAUI_TB_HORIZONTAL = 1 << 7, - wxAUI_TB_PLAIN_BACKGROUND = 1 << 8, - wxAUI_TB_HORZ_TEXT = (wxAUI_TB_HORZ_LAYOUT | wxAUI_TB_TEXT), - wxAUI_ORIENTATION_MASK = (wxAUI_TB_VERTICAL | wxAUI_TB_HORIZONTAL), - wxAUI_TB_DEFAULT_STYLE = 0 -}; - -enum wxAuiToolBarArtSetting -{ - wxAUI_TBART_SEPARATOR_SIZE = 0, - wxAUI_TBART_GRIPPER_SIZE = 1, - wxAUI_TBART_OVERFLOW_SIZE = 2 -}; - -enum wxAuiToolBarToolTextOrientation -{ - wxAUI_TBTOOL_TEXT_LEFT = 0, // unused/unimplemented - wxAUI_TBTOOL_TEXT_RIGHT = 1, - wxAUI_TBTOOL_TEXT_TOP = 2, // unused/unimplemented - wxAUI_TBTOOL_TEXT_BOTTOM = 3 -}; - - -// aui toolbar event class - -class WXDLLIMPEXP_AUI wxAuiToolBarEvent : public wxNotifyEvent -{ -public: - wxAuiToolBarEvent(wxEventType commandType = wxEVT_NULL, - int winId = 0) - : wxNotifyEvent(commandType, winId) - { - m_isDropdownClicked = false; - m_clickPt = wxPoint(-1, -1); - m_rect = wxRect(-1,-1, 0, 0); - m_toolId = -1; - } -#ifndef SWIG - wxAuiToolBarEvent(const wxAuiToolBarEvent& c) : wxNotifyEvent(c) - { - m_isDropdownClicked = c.m_isDropdownClicked; - m_clickPt = c.m_clickPt; - m_rect = c.m_rect; - m_toolId = c.m_toolId; - } -#endif - wxEvent *Clone() const wxOVERRIDE { return new wxAuiToolBarEvent(*this); } - - bool IsDropDownClicked() const { return m_isDropdownClicked; } - void SetDropDownClicked(bool c) { m_isDropdownClicked = c; } - - wxPoint GetClickPoint() const { return m_clickPt; } - void SetClickPoint(const wxPoint& p) { m_clickPt = p; } - - wxRect GetItemRect() const { return m_rect; } - void SetItemRect(const wxRect& r) { m_rect = r; } - - int GetToolId() const { return m_toolId; } - void SetToolId(int toolId) { m_toolId = toolId; } - -private: - - bool m_isDropdownClicked; - wxPoint m_clickPt; - wxRect m_rect; - int m_toolId; - -private: - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxAuiToolBarEvent); -}; - - -class WXDLLIMPEXP_AUI wxAuiToolBarItem -{ - friend class wxAuiToolBar; - -public: - - wxAuiToolBarItem() - { - m_window = NULL; - m_sizerItem = NULL; - m_spacerPixels = 0; - m_toolId = 0; - m_kind = wxITEM_NORMAL; - m_state = 0; // normal, enabled - m_proportion = 0; - m_active = true; - m_dropDown = true; - m_sticky = true; - m_userData = 0; - m_alignment = wxALIGN_CENTER; - } - - wxAuiToolBarItem(const wxAuiToolBarItem& c) - { - Assign(c); - } - - wxAuiToolBarItem& operator=(const wxAuiToolBarItem& c) - { - Assign(c); - return *this; - } - - void Assign(const wxAuiToolBarItem& c) - { - m_window = c.m_window; - m_label = c.m_label; - m_bitmap = c.m_bitmap; - m_disabledBitmap = c.m_disabledBitmap; - m_hoverBitmap = c.m_hoverBitmap; - m_shortHelp = c.m_shortHelp; - m_longHelp = c.m_longHelp; - m_sizerItem = c.m_sizerItem; - m_minSize = c.m_minSize; - m_spacerPixels = c.m_spacerPixels; - m_toolId = c.m_toolId; - m_kind = c.m_kind; - m_state = c.m_state; - m_proportion = c.m_proportion; - m_active = c.m_active; - m_dropDown = c.m_dropDown; - m_sticky = c.m_sticky; - m_userData = c.m_userData; - m_alignment = c.m_alignment; - } - - - void SetWindow(wxWindow* w) { m_window = w; } - wxWindow* GetWindow() { return m_window; } - - void SetId(int newId) { m_toolId = newId; } - int GetId() const { return m_toolId; } - - void SetKind(int newKind) { m_kind = newKind; } - int GetKind() const { return m_kind; } - - void SetState(int newState) { m_state = newState; } - int GetState() const { return m_state; } - - void SetSizerItem(wxSizerItem* s) { m_sizerItem = s; } - wxSizerItem* GetSizerItem() const { return m_sizerItem; } - - void SetLabel(const wxString& s) { m_label = s; } - const wxString& GetLabel() const { return m_label; } - - void SetBitmap(const wxBitmap& bmp) { m_bitmap = bmp; } - const wxBitmap& GetBitmap() const { return m_bitmap; } - - void SetDisabledBitmap(const wxBitmap& bmp) { m_disabledBitmap = bmp; } - const wxBitmap& GetDisabledBitmap() const { return m_disabledBitmap; } - - void SetHoverBitmap(const wxBitmap& bmp) { m_hoverBitmap = bmp; } - const wxBitmap& GetHoverBitmap() const { return m_hoverBitmap; } - - void SetShortHelp(const wxString& s) { m_shortHelp = s; } - const wxString& GetShortHelp() const { return m_shortHelp; } - - void SetLongHelp(const wxString& s) { m_longHelp = s; } - const wxString& GetLongHelp() const { return m_longHelp; } - - void SetMinSize(const wxSize& s) { m_minSize = s; } - const wxSize& GetMinSize() const { return m_minSize; } - - void SetSpacerPixels(int s) { m_spacerPixels = s; } - int GetSpacerPixels() const { return m_spacerPixels; } - - void SetProportion(int p) { m_proportion = p; } - int GetProportion() const { return m_proportion; } - - void SetActive(bool b) { m_active = b; } - bool IsActive() const { return m_active; } - - void SetHasDropDown(bool b) - { - wxCHECK_RET( !b || m_kind == wxITEM_NORMAL, - wxS("Only normal tools can have drop downs") ); - - m_dropDown = b; - } - - bool HasDropDown() const { return m_dropDown; } - - void SetSticky(bool b) { m_sticky = b; } - bool IsSticky() const { return m_sticky; } - - void SetUserData(long l) { m_userData = l; } - long GetUserData() const { return m_userData; } - - void SetAlignment(int l) { m_alignment = l; } - int GetAlignment() const { return m_alignment; } - -private: - - wxWindow* m_window; // item's associated window - wxString m_label; // label displayed on the item - wxBitmap m_bitmap; // item's bitmap - wxBitmap m_disabledBitmap; // item's disabled bitmap - wxBitmap m_hoverBitmap; // item's hover bitmap - wxString m_shortHelp; // short help (for tooltip) - wxString m_longHelp; // long help (for status bar) - wxSizerItem* m_sizerItem; // sizer item - wxSize m_minSize; // item's minimum size - int m_spacerPixels; // size of a spacer - int m_toolId; // item's id - int m_kind; // item's kind - int m_state; // state - int m_proportion; // proportion - bool m_active; // true if the item is currently active - bool m_dropDown; // true if the item has a dropdown button - bool m_sticky; // overrides button states if true (always active) - long m_userData; // user-specified data - int m_alignment; // sizer alignment flag, defaults to wxCENTER, may be wxEXPAND or any other -}; - -#ifndef SWIG -WX_DECLARE_USER_EXPORTED_OBJARRAY(wxAuiToolBarItem, wxAuiToolBarItemArray, WXDLLIMPEXP_AUI); -#endif - - - - -// tab art class - -class WXDLLIMPEXP_AUI wxAuiToolBarArt -{ -public: - - wxAuiToolBarArt() { } - virtual ~wxAuiToolBarArt() { } - - virtual wxAuiToolBarArt* Clone() = 0; - virtual void SetFlags(unsigned int flags) = 0; - virtual unsigned int GetFlags() = 0; - virtual void SetFont(const wxFont& font) = 0; - virtual wxFont GetFont() = 0; - virtual void SetTextOrientation(int orientation) = 0; - virtual int GetTextOrientation() = 0; - - virtual void DrawBackground( - wxDC& dc, - wxWindow* wnd, - const wxRect& rect) = 0; - - virtual void DrawPlainBackground( - wxDC& dc, - wxWindow* wnd, - const wxRect& rect) = 0; - - virtual void DrawLabel( - wxDC& dc, - wxWindow* wnd, - const wxAuiToolBarItem& item, - const wxRect& rect) = 0; - - virtual void DrawButton( - wxDC& dc, - wxWindow* wnd, - const wxAuiToolBarItem& item, - const wxRect& rect) = 0; - - virtual void DrawDropDownButton( - wxDC& dc, - wxWindow* wnd, - const wxAuiToolBarItem& item, - const wxRect& rect) = 0; - - virtual void DrawControlLabel( - wxDC& dc, - wxWindow* wnd, - const wxAuiToolBarItem& item, - const wxRect& rect) = 0; - - virtual void DrawSeparator( - wxDC& dc, - wxWindow* wnd, - const wxRect& rect) = 0; - - virtual void DrawGripper( - wxDC& dc, - wxWindow* wnd, - const wxRect& rect) = 0; - - virtual void DrawOverflowButton( - wxDC& dc, - wxWindow* wnd, - const wxRect& rect, - int state) = 0; - - virtual wxSize GetLabelSize( - wxDC& dc, - wxWindow* wnd, - const wxAuiToolBarItem& item) = 0; - - virtual wxSize GetToolSize( - wxDC& dc, - wxWindow* wnd, - const wxAuiToolBarItem& item) = 0; - - virtual int GetElementSize(int elementId) = 0; - virtual void SetElementSize(int elementId, int size) = 0; - - virtual int ShowDropDown( - wxWindow* wnd, - const wxAuiToolBarItemArray& items) = 0; -}; - - - -class WXDLLIMPEXP_AUI wxAuiGenericToolBarArt : public wxAuiToolBarArt -{ - -public: - - wxAuiGenericToolBarArt(); - virtual ~wxAuiGenericToolBarArt(); - - virtual wxAuiToolBarArt* Clone() wxOVERRIDE; - virtual void SetFlags(unsigned int flags) wxOVERRIDE; - virtual unsigned int GetFlags() wxOVERRIDE; - virtual void SetFont(const wxFont& font) wxOVERRIDE; - virtual wxFont GetFont() wxOVERRIDE; - virtual void SetTextOrientation(int orientation) wxOVERRIDE; - virtual int GetTextOrientation() wxOVERRIDE; - - virtual void DrawBackground( - wxDC& dc, - wxWindow* wnd, - const wxRect& rect) wxOVERRIDE; - - virtual void DrawPlainBackground(wxDC& dc, - wxWindow* wnd, - const wxRect& rect) wxOVERRIDE; - - virtual void DrawLabel( - wxDC& dc, - wxWindow* wnd, - const wxAuiToolBarItem& item, - const wxRect& rect) wxOVERRIDE; - - virtual void DrawButton( - wxDC& dc, - wxWindow* wnd, - const wxAuiToolBarItem& item, - const wxRect& rect) wxOVERRIDE; - - virtual void DrawDropDownButton( - wxDC& dc, - wxWindow* wnd, - const wxAuiToolBarItem& item, - const wxRect& rect) wxOVERRIDE; - - virtual void DrawControlLabel( - wxDC& dc, - wxWindow* wnd, - const wxAuiToolBarItem& item, - const wxRect& rect) wxOVERRIDE; - - virtual void DrawSeparator( - wxDC& dc, - wxWindow* wnd, - const wxRect& rect) wxOVERRIDE; - - virtual void DrawGripper( - wxDC& dc, - wxWindow* wnd, - const wxRect& rect) wxOVERRIDE; - - virtual void DrawOverflowButton( - wxDC& dc, - wxWindow* wnd, - const wxRect& rect, - int state) wxOVERRIDE; - - virtual wxSize GetLabelSize( - wxDC& dc, - wxWindow* wnd, - const wxAuiToolBarItem& item) wxOVERRIDE; - - virtual wxSize GetToolSize( - wxDC& dc, - wxWindow* wnd, - const wxAuiToolBarItem& item) wxOVERRIDE; - - virtual int GetElementSize(int element) wxOVERRIDE; - virtual void SetElementSize(int elementId, int size) wxOVERRIDE; - - virtual int ShowDropDown(wxWindow* wnd, - const wxAuiToolBarItemArray& items) wxOVERRIDE; - -protected: - - wxBitmap m_buttonDropDownBmp; - wxBitmap m_disabledButtonDropDownBmp; - wxBitmap m_overflowBmp; - wxBitmap m_disabledOverflowBmp; - wxColour m_baseColour; - wxColour m_highlightColour; - wxFont m_font; - unsigned int m_flags; - int m_textOrientation; - - wxPen m_gripperPen1; - wxPen m_gripperPen2; - wxPen m_gripperPen3; - - int m_separatorSize; - int m_gripperSize; - int m_overflowSize; -}; - - - - -class WXDLLIMPEXP_AUI wxAuiToolBar : public wxControl -{ -public: - wxAuiToolBar() { Init(); } - - wxAuiToolBar(wxWindow* parent, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxAUI_TB_DEFAULT_STYLE) - { - Init(); - Create(parent, id, pos, size, style); - } - - virtual ~wxAuiToolBar(); - - bool Create(wxWindow* parent, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxAUI_TB_DEFAULT_STYLE); - - virtual void SetWindowStyleFlag(long style) wxOVERRIDE; - - void SetArtProvider(wxAuiToolBarArt* art); - wxAuiToolBarArt* GetArtProvider() const; - - bool SetFont(const wxFont& font) wxOVERRIDE; - - - wxAuiToolBarItem* AddTool(int toolId, - const wxString& label, - const wxBitmap& bitmap, - const wxString& shortHelpString = wxEmptyString, - wxItemKind kind = wxITEM_NORMAL); - - wxAuiToolBarItem* AddTool(int toolId, - const wxString& label, - const wxBitmap& bitmap, - const wxBitmap& disabledBitmap, - wxItemKind kind, - const wxString& shortHelpString, - const wxString& longHelpString, - wxObject* clientData); - - wxAuiToolBarItem* AddTool(int toolId, - const wxBitmap& bitmap, - const wxBitmap& disabledBitmap, - bool toggle = false, - wxObject* clientData = NULL, - const wxString& shortHelpString = wxEmptyString, - const wxString& longHelpString = wxEmptyString) - { - return AddTool(toolId, - wxEmptyString, - bitmap, - disabledBitmap, - toggle ? wxITEM_CHECK : wxITEM_NORMAL, - shortHelpString, - longHelpString, - clientData); - } - - wxAuiToolBarItem* AddLabel(int toolId, - const wxString& label = wxEmptyString, - const int width = -1); - wxAuiToolBarItem* AddControl(wxControl* control, - const wxString& label = wxEmptyString); - wxAuiToolBarItem* AddSeparator(); - wxAuiToolBarItem* AddSpacer(int pixels); - wxAuiToolBarItem* AddStretchSpacer(int proportion = 1); - - bool Realize(); - - wxControl* FindControl(int windowId); - wxAuiToolBarItem* FindToolByPosition(wxCoord x, wxCoord y) const; - wxAuiToolBarItem* FindToolByIndex(int idx) const; - wxAuiToolBarItem* FindTool(int toolId) const; - - void ClearTools() { Clear() ; } - void Clear(); - bool DeleteTool(int toolId); - bool DeleteByIndex(int toolId); - - size_t GetToolCount() const; - int GetToolPos(int toolId) const { return GetToolIndex(toolId); } - int GetToolIndex(int toolId) const; - bool GetToolFits(int toolId) const; - wxRect GetToolRect(int toolId) const; - bool GetToolFitsByIndex(int toolId) const; - bool GetToolBarFits() const; - - void SetMargins(const wxSize& size) { SetMargins(size.x, size.x, size.y, size.y); } - void SetMargins(int x, int y) { SetMargins(x, x, y, y); } - void SetMargins(int left, int right, int top, int bottom); - - void SetToolBitmapSize(const wxSize& size); - wxSize GetToolBitmapSize() const; - - bool GetOverflowVisible() const; - void SetOverflowVisible(bool visible); - - bool GetGripperVisible() const; - void SetGripperVisible(bool visible); - - void ToggleTool(int toolId, bool state); - bool GetToolToggled(int toolId) const; - - void EnableTool(int toolId, bool state); - bool GetToolEnabled(int toolId) const; - - void SetToolDropDown(int toolId, bool dropdown); - bool GetToolDropDown(int toolId) const; - - void SetToolBorderPadding(int padding); - int GetToolBorderPadding() const; - - void SetToolTextOrientation(int orientation); - int GetToolTextOrientation() const; - - void SetToolPacking(int packing); - int GetToolPacking() const; - - void SetToolProportion(int toolId, int proportion); - int GetToolProportion(int toolId) const; - - void SetToolSeparation(int separation); - int GetToolSeparation() const; - - void SetToolSticky(int toolId, bool sticky); - bool GetToolSticky(int toolId) const; - - wxString GetToolLabel(int toolId) const; - void SetToolLabel(int toolId, const wxString& label); - - wxBitmap GetToolBitmap(int toolId) const; - void SetToolBitmap(int toolId, const wxBitmap& bitmap); - - wxString GetToolShortHelp(int toolId) const; - void SetToolShortHelp(int toolId, const wxString& helpString); - - wxString GetToolLongHelp(int toolId) const; - void SetToolLongHelp(int toolId, const wxString& helpString); - - void SetCustomOverflowItems(const wxAuiToolBarItemArray& prepend, - const wxAuiToolBarItemArray& append); - - // get size of hint rectangle for a particular dock location - wxSize GetHintSize(int dockDirection) const; - bool IsPaneValid(const wxAuiPaneInfo& pane) const; - - // Override to call DoIdleUpdate(). - virtual void UpdateWindowUI(long flags = wxUPDATE_UI_NONE) wxOVERRIDE; - -protected: - void Init(); - - virtual void OnCustomRender(wxDC& WXUNUSED(dc), - const wxAuiToolBarItem& WXUNUSED(item), - const wxRect& WXUNUSED(rect)) { } - -protected: - - void DoIdleUpdate(); - void SetOrientation(int orientation); - void SetHoverItem(wxAuiToolBarItem* item); - void SetPressedItem(wxAuiToolBarItem* item); - void RefreshOverflowState(); - - int GetOverflowState() const; - wxRect GetOverflowRect() const; - wxSize GetLabelSize(const wxString& label); - wxAuiToolBarItem* FindToolByPositionWithPacking(wxCoord x, wxCoord y) const; - - void DoSetSize(int x, - int y, - int width, - int height, - int sizeFlags = wxSIZE_AUTO) wxOVERRIDE; - -protected: // handlers - - void OnSize(wxSizeEvent& evt); - void OnIdle(wxIdleEvent& evt); - void OnPaint(wxPaintEvent& evt); - void OnEraseBackground(wxEraseEvent& evt); - void OnLeftDown(wxMouseEvent& evt); - void OnLeftUp(wxMouseEvent& evt); - void OnRightDown(wxMouseEvent& evt); - void OnRightUp(wxMouseEvent& evt); - void OnMiddleDown(wxMouseEvent& evt); - void OnMiddleUp(wxMouseEvent& evt); - void OnMotion(wxMouseEvent& evt); - void OnLeaveWindow(wxMouseEvent& evt); - void OnCaptureLost(wxMouseCaptureLostEvent& evt); - void OnSetCursor(wxSetCursorEvent& evt); - -protected: - - wxAuiToolBarItemArray m_items; // array of toolbar items - wxAuiToolBarArt* m_art; // art provider - wxBoxSizer* m_sizer; // main sizer for toolbar - wxAuiToolBarItem* m_actionItem; // item that's being acted upon (pressed) - wxAuiToolBarItem* m_tipItem; // item that has its tooltip shown - wxBitmap m_bitmap; // double-buffer bitmap - wxSizerItem* m_gripperSizerItem; - wxSizerItem* m_overflowSizerItem; - wxSize m_absoluteMinSize; - wxPoint m_actionPos; // position of left-mouse down - wxAuiToolBarItemArray m_customOverflowPrepend; - wxAuiToolBarItemArray m_customOverflowAppend; - - int m_buttonWidth; - int m_buttonHeight; - int m_sizerElementCount; - int m_leftPadding; - int m_rightPadding; - int m_topPadding; - int m_bottomPadding; - int m_toolPacking; - int m_toolBorderPadding; - int m_toolTextOrientation; - int m_overflowState; - bool m_dragging; - bool m_gripperVisible; - bool m_overflowVisible; - - bool RealizeHelper(wxClientDC& dc, bool horizontal); - static bool IsPaneValid(long style, const wxAuiPaneInfo& pane); - bool IsPaneValid(long style) const; - void SetArtFlags() const; - wxOrientation m_orientation; - wxSize m_horzHintSize; - wxSize m_vertHintSize; - -private: - // Common part of OnLeaveWindow() and OnCaptureLost(). - void DoResetMouseState(); - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_CLASS(wxAuiToolBar); -}; - - - - -// wx event machinery - -#ifndef SWIG - -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_AUI, wxEVT_AUITOOLBAR_TOOL_DROPDOWN, wxAuiToolBarEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_AUI, wxEVT_AUITOOLBAR_OVERFLOW_CLICK, wxAuiToolBarEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_AUI, wxEVT_AUITOOLBAR_RIGHT_CLICK, wxAuiToolBarEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_AUI, wxEVT_AUITOOLBAR_MIDDLE_CLICK, wxAuiToolBarEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_AUI, wxEVT_AUITOOLBAR_BEGIN_DRAG, wxAuiToolBarEvent ); - -typedef void (wxEvtHandler::*wxAuiToolBarEventFunction)(wxAuiToolBarEvent&); - -#define wxAuiToolBarEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxAuiToolBarEventFunction, func) - -#define EVT_AUITOOLBAR_TOOL_DROPDOWN(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_AUITOOLBAR_TOOL_DROPDOWN, winid, wxAuiToolBarEventHandler(fn)) -#define EVT_AUITOOLBAR_OVERFLOW_CLICK(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_AUITOOLBAR_OVERFLOW_CLICK, winid, wxAuiToolBarEventHandler(fn)) -#define EVT_AUITOOLBAR_RIGHT_CLICK(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_AUITOOLBAR_RIGHT_CLICK, winid, wxAuiToolBarEventHandler(fn)) -#define EVT_AUITOOLBAR_MIDDLE_CLICK(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_AUITOOLBAR_MIDDLE_CLICK, winid, wxAuiToolBarEventHandler(fn)) -#define EVT_AUITOOLBAR_BEGIN_DRAG(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_AUITOOLBAR_BEGIN_DRAG, winid, wxAuiToolBarEventHandler(fn)) - -#else - -// wxpython/swig event work -%constant wxEventType wxEVT_AUITOOLBAR_TOOL_DROPDOWN; -%constant wxEventType wxEVT_AUITOOLBAR_OVERFLOW_CLICK; -%constant wxEventType wxEVT_AUITOOLBAR_RIGHT_CLICK; -%constant wxEventType wxEVT_AUITOOLBAR_MIDDLE_CLICK; -%constant wxEventType wxEVT_AUITOOLBAR_BEGIN_DRAG; - -%pythoncode { - EVT_AUITOOLBAR_TOOL_DROPDOWN = wx.PyEventBinder( wxEVT_AUITOOLBAR_TOOL_DROPDOWN, 1 ) - EVT_AUITOOLBAR_OVERFLOW_CLICK = wx.PyEventBinder( wxEVT_AUITOOLBAR_OVERFLOW_CLICK, 1 ) - EVT_AUITOOLBAR_RIGHT_CLICK = wx.PyEventBinder( wxEVT_AUITOOLBAR_RIGHT_CLICK, 1 ) - EVT_AUITOOLBAR_MIDDLE_CLICK = wx.PyEventBinder( wxEVT_AUITOOLBAR_MIDDLE_CLICK, 1 ) - EVT_AUITOOLBAR_BEGIN_DRAG = wx.PyEventBinder( wxEVT_AUITOOLBAR_BEGIN_DRAG, 1 ) -} -#endif // SWIG - -// old wxEVT_COMMAND_* constants -#define wxEVT_COMMAND_AUITOOLBAR_TOOL_DROPDOWN wxEVT_AUITOOLBAR_TOOL_DROPDOWN -#define wxEVT_COMMAND_AUITOOLBAR_OVERFLOW_CLICK wxEVT_AUITOOLBAR_OVERFLOW_CLICK -#define wxEVT_COMMAND_AUITOOLBAR_RIGHT_CLICK wxEVT_AUITOOLBAR_RIGHT_CLICK -#define wxEVT_COMMAND_AUITOOLBAR_MIDDLE_CLICK wxEVT_AUITOOLBAR_MIDDLE_CLICK -#define wxEVT_COMMAND_AUITOOLBAR_BEGIN_DRAG wxEVT_AUITOOLBAR_BEGIN_DRAG - -#ifdef __WXMSW__ - #define wxHAS_NATIVE_TOOLBAR_ART - #include "wx/aui/barartmsw.h" - #define wxAuiDefaultToolBarArt wxAuiMSWToolBarArt -#endif - -#ifndef wxHAS_NATIVE_TOOLBAR_ART - #define wxAuiDefaultToolBarArt wxAuiGenericToolBarArt -#endif - -#endif // wxUSE_AUI -#endif // _WX_AUIBAR_H_ - diff --git a/Externals/wxWidgets3/include/wx/aui/auibook.h b/Externals/wxWidgets3/include/wx/aui/auibook.h deleted file mode 100644 index c6d232e48d..0000000000 --- a/Externals/wxWidgets3/include/wx/aui/auibook.h +++ /dev/null @@ -1,559 +0,0 @@ -////////////////////////////////////////////////////////////////////////////// -// Name: wx/aui/auibook.h -// Purpose: wxaui: wx advanced user interface - notebook -// Author: Benjamin I. Williams -// Modified by: Jens Lody -// Created: 2006-06-28 -// Copyright: (C) Copyright 2006, Kirix Corporation, All Rights Reserved. -// Licence: wxWindows Library Licence, Version 3.1 -/////////////////////////////////////////////////////////////////////////////// - - - -#ifndef _WX_AUINOTEBOOK_H_ -#define _WX_AUINOTEBOOK_H_ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/defs.h" - -#if wxUSE_AUI - -#include "wx/aui/tabart.h" -#include "wx/aui/framemanager.h" -#include "wx/bookctrl.h" -#include "wx/containr.h" - - -class wxAuiNotebook; - - -enum wxAuiNotebookOption -{ - wxAUI_NB_TOP = 1 << 0, - wxAUI_NB_LEFT = 1 << 1, // not implemented yet - wxAUI_NB_RIGHT = 1 << 2, // not implemented yet - wxAUI_NB_BOTTOM = 1 << 3, - wxAUI_NB_TAB_SPLIT = 1 << 4, - wxAUI_NB_TAB_MOVE = 1 << 5, - wxAUI_NB_TAB_EXTERNAL_MOVE = 1 << 6, - wxAUI_NB_TAB_FIXED_WIDTH = 1 << 7, - wxAUI_NB_SCROLL_BUTTONS = 1 << 8, - wxAUI_NB_WINDOWLIST_BUTTON = 1 << 9, - wxAUI_NB_CLOSE_BUTTON = 1 << 10, - wxAUI_NB_CLOSE_ON_ACTIVE_TAB = 1 << 11, - wxAUI_NB_CLOSE_ON_ALL_TABS = 1 << 12, - wxAUI_NB_MIDDLE_CLICK_CLOSE = 1 << 13, - - wxAUI_NB_DEFAULT_STYLE = wxAUI_NB_TOP | - wxAUI_NB_TAB_SPLIT | - wxAUI_NB_TAB_MOVE | - wxAUI_NB_SCROLL_BUTTONS | - wxAUI_NB_CLOSE_ON_ACTIVE_TAB | - wxAUI_NB_MIDDLE_CLICK_CLOSE -}; - - - - -// aui notebook event class - -class WXDLLIMPEXP_AUI wxAuiNotebookEvent : public wxBookCtrlEvent -{ -public: - wxAuiNotebookEvent(wxEventType commandType = wxEVT_NULL, - int winId = 0) - : wxBookCtrlEvent(commandType, winId) - { - m_dragSource = NULL; - } -#ifndef SWIG - wxAuiNotebookEvent(const wxAuiNotebookEvent& c) : wxBookCtrlEvent(c) - { - m_dragSource = c.m_dragSource; - } -#endif - wxEvent *Clone() const wxOVERRIDE { return new wxAuiNotebookEvent(*this); } - - void SetDragSource(wxAuiNotebook* s) { m_dragSource = s; } - wxAuiNotebook* GetDragSource() const { return m_dragSource; } - -private: - wxAuiNotebook* m_dragSource; - -#ifndef SWIG -private: - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxAuiNotebookEvent); -#endif -}; - - -class WXDLLIMPEXP_AUI wxAuiNotebookPage -{ -public: - wxWindow* window; // page's associated window - wxString caption; // caption displayed on the tab - wxString tooltip; // tooltip displayed when hovering over tab title - wxBitmap bitmap; // tab's bitmap - wxRect rect; // tab's hit rectangle - bool active; // true if the page is currently active - bool hover; // true if mouse hovering over tab -}; - -class WXDLLIMPEXP_AUI wxAuiTabContainerButton -{ -public: - - int id; // button's id - int curState; // current state (normal, hover, pressed, etc.) - int location; // buttons location (wxLEFT, wxRIGHT, or wxCENTER) - wxBitmap bitmap; // button's hover bitmap - wxBitmap disBitmap; // button's disabled bitmap - wxRect rect; // button's hit rectangle -}; - - -#ifndef SWIG -WX_DECLARE_USER_EXPORTED_OBJARRAY(wxAuiNotebookPage, wxAuiNotebookPageArray, WXDLLIMPEXP_AUI); -WX_DECLARE_USER_EXPORTED_OBJARRAY(wxAuiTabContainerButton, wxAuiTabContainerButtonArray, WXDLLIMPEXP_AUI); -#endif - - -class WXDLLIMPEXP_AUI wxAuiTabContainer -{ -public: - - wxAuiTabContainer(); - virtual ~wxAuiTabContainer(); - - void SetArtProvider(wxAuiTabArt* art); - wxAuiTabArt* GetArtProvider() const; - - void SetFlags(unsigned int flags); - unsigned int GetFlags() const; - - bool AddPage(wxWindow* page, const wxAuiNotebookPage& info); - bool InsertPage(wxWindow* page, const wxAuiNotebookPage& info, size_t idx); - bool MovePage(wxWindow* page, size_t newIdx); - bool RemovePage(wxWindow* page); - bool SetActivePage(wxWindow* page); - bool SetActivePage(size_t page); - void SetNoneActive(); - int GetActivePage() const; - bool TabHitTest(int x, int y, wxWindow** hit) const; - bool ButtonHitTest(int x, int y, wxAuiTabContainerButton** hit) const; - wxWindow* GetWindowFromIdx(size_t idx) const; - int GetIdxFromWindow(wxWindow* page) const; - size_t GetPageCount() const; - wxAuiNotebookPage& GetPage(size_t idx); - const wxAuiNotebookPage& GetPage(size_t idx) const; - wxAuiNotebookPageArray& GetPages(); - void SetNormalFont(const wxFont& normalFont); - void SetSelectedFont(const wxFont& selectedFont); - void SetMeasuringFont(const wxFont& measuringFont); - void SetColour(const wxColour& colour); - void SetActiveColour(const wxColour& colour); - void DoShowHide(); - void SetRect(const wxRect& rect); - - void RemoveButton(int id); - void AddButton(int id, - int location, - const wxBitmap& normalBitmap = wxNullBitmap, - const wxBitmap& disabledBitmap = wxNullBitmap); - - size_t GetTabOffset() const; - void SetTabOffset(size_t offset); - - // Is the tab visible? - bool IsTabVisible(int tabPage, int tabOffset, wxDC* dc, wxWindow* wnd); - - // Make the tab visible if it wasn't already - void MakeTabVisible(int tabPage, wxWindow* win); - -protected: - - virtual void Render(wxDC* dc, wxWindow* wnd); - -protected: - - wxAuiTabArt* m_art; - wxAuiNotebookPageArray m_pages; - wxAuiTabContainerButtonArray m_buttons; - wxAuiTabContainerButtonArray m_tabCloseButtons; - wxRect m_rect; - size_t m_tabOffset; - unsigned int m_flags; -}; - - - -class WXDLLIMPEXP_AUI wxAuiTabCtrl : public wxControl, - public wxAuiTabContainer -{ -public: - - wxAuiTabCtrl(wxWindow* parent, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0); - - ~wxAuiTabCtrl(); - - bool IsDragging() const { return m_isDragging; } - -protected: - // choose the default border for this window - virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } - - void OnPaint(wxPaintEvent& evt); - void OnEraseBackground(wxEraseEvent& evt); - void OnSize(wxSizeEvent& evt); - void OnLeftDown(wxMouseEvent& evt); - void OnLeftDClick(wxMouseEvent& evt); - void OnLeftUp(wxMouseEvent& evt); - void OnMiddleDown(wxMouseEvent& evt); - void OnMiddleUp(wxMouseEvent& evt); - void OnRightDown(wxMouseEvent& evt); - void OnRightUp(wxMouseEvent& evt); - void OnMotion(wxMouseEvent& evt); - void OnLeaveWindow(wxMouseEvent& evt); - void OnButton(wxAuiNotebookEvent& evt); - void OnSetFocus(wxFocusEvent& event); - void OnKillFocus(wxFocusEvent& event); - void OnChar(wxKeyEvent& event); - void OnCaptureLost(wxMouseCaptureLostEvent& evt); - -protected: - - wxPoint m_clickPt; - wxWindow* m_clickTab; - bool m_isDragging; - wxAuiTabContainerButton* m_hoverButton; - wxAuiTabContainerButton* m_pressedButton; - - void SetHoverTab(wxWindow* wnd); - -#ifndef SWIG - wxDECLARE_CLASS(wxAuiTabCtrl); - wxDECLARE_EVENT_TABLE(); -#endif -}; - - - - -class WXDLLIMPEXP_AUI wxAuiNotebook : public wxNavigationEnabled -{ - -public: - - wxAuiNotebook() { Init(); } - - wxAuiNotebook(wxWindow* parent, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxAUI_NB_DEFAULT_STYLE) - { - Init(); - Create(parent, id, pos, size, style); - } - - virtual ~wxAuiNotebook(); - - bool Create(wxWindow* parent, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0); - - void SetWindowStyleFlag(long style) wxOVERRIDE; - void SetArtProvider(wxAuiTabArt* art); - wxAuiTabArt* GetArtProvider() const; - - virtual void SetUniformBitmapSize(const wxSize& size); - virtual void SetTabCtrlHeight(int height); - - bool AddPage(wxWindow* page, - const wxString& caption, - bool select = false, - const wxBitmap& bitmap = wxNullBitmap); - - bool InsertPage(size_t pageIdx, - wxWindow* page, - const wxString& caption, - bool select = false, - const wxBitmap& bitmap = wxNullBitmap); - - bool DeletePage(size_t page) wxOVERRIDE; - bool RemovePage(size_t page) wxOVERRIDE; - - virtual size_t GetPageCount() const wxOVERRIDE; - virtual wxWindow* GetPage(size_t pageIdx) const wxOVERRIDE; - int GetPageIndex(wxWindow* pageWnd) const; - - bool SetPageText(size_t page, const wxString& text) wxOVERRIDE; - wxString GetPageText(size_t pageIdx) const wxOVERRIDE; - - bool SetPageToolTip(size_t page, const wxString& text); - wxString GetPageToolTip(size_t pageIdx) const; - - bool SetPageBitmap(size_t page, const wxBitmap& bitmap); - wxBitmap GetPageBitmap(size_t pageIdx) const; - - int SetSelection(size_t newPage) wxOVERRIDE; - int GetSelection() const wxOVERRIDE; - - virtual void Split(size_t page, int direction); - - const wxAuiManager& GetAuiManager() const { return m_mgr; } - - // Sets the normal font - void SetNormalFont(const wxFont& font); - - // Sets the selected tab font - void SetSelectedFont(const wxFont& font); - - // Sets the measuring font - void SetMeasuringFont(const wxFont& font); - - // Sets the tab font - virtual bool SetFont(const wxFont& font) wxOVERRIDE; - - // Gets the tab control height - int GetTabCtrlHeight() const; - - // Gets the height of the notebook for a given page height - int GetHeightForPageHeight(int pageHeight); - - // Shows the window menu - bool ShowWindowMenu(); - - // we do have multiple pages - virtual bool HasMultiplePages() const wxOVERRIDE { return true; } - - // we don't want focus for ourselves - // virtual bool AcceptsFocus() const { return false; } - - //wxBookCtrlBase functions - - virtual void SetPageSize (const wxSize &size) wxOVERRIDE; - virtual int HitTest (const wxPoint &pt, long *flags=NULL) const wxOVERRIDE; - - virtual int GetPageImage(size_t n) const wxOVERRIDE; - virtual bool SetPageImage(size_t n, int imageId) wxOVERRIDE; - - virtual int ChangeSelection(size_t n) wxOVERRIDE; - - virtual bool AddPage(wxWindow *page, const wxString &text, bool select, - int imageId) wxOVERRIDE; - virtual bool DeleteAllPages() wxOVERRIDE; - virtual bool InsertPage(size_t index, wxWindow *page, const wxString &text, - bool select, int imageId) wxOVERRIDE; - -protected: - // Common part of all ctors. - void Init(); - - // choose the default border for this window - virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } - - // Redo sizing after thawing - virtual void DoThaw() wxOVERRIDE; - - // these can be overridden - - // update the height, return true if it was done or false if the new height - // calculated by CalculateTabCtrlHeight() is the same as the old one - virtual bool UpdateTabCtrlHeight(); - - virtual int CalculateTabCtrlHeight(); - virtual wxSize CalculateNewSplitSize(); - - // remove the page and return a pointer to it - virtual wxWindow *DoRemovePage(size_t WXUNUSED(page)) wxOVERRIDE { return NULL; } - - //A general selection function - virtual int DoModifySelection(size_t n, bool events); - -protected: - - void DoSizing(); - void InitNotebook(long style); - wxAuiTabCtrl* GetTabCtrlFromPoint(const wxPoint& pt); - wxWindow* GetTabFrameFromTabCtrl(wxWindow* tabCtrl); - wxAuiTabCtrl* GetActiveTabCtrl(); - bool FindTab(wxWindow* page, wxAuiTabCtrl** ctrl, int* idx); - void RemoveEmptyTabFrames(); - void UpdateHintWindowSize(); - -protected: - - void OnChildFocusNotebook(wxChildFocusEvent& evt); - void OnRender(wxAuiManagerEvent& evt); - void OnSize(wxSizeEvent& evt); - void OnTabClicked(wxAuiNotebookEvent& evt); - void OnTabBeginDrag(wxAuiNotebookEvent& evt); - void OnTabDragMotion(wxAuiNotebookEvent& evt); - void OnTabEndDrag(wxAuiNotebookEvent& evt); - void OnTabCancelDrag(wxAuiNotebookEvent& evt); - void OnTabButton(wxAuiNotebookEvent& evt); - void OnTabMiddleDown(wxAuiNotebookEvent& evt); - void OnTabMiddleUp(wxAuiNotebookEvent& evt); - void OnTabRightDown(wxAuiNotebookEvent& evt); - void OnTabRightUp(wxAuiNotebookEvent& evt); - void OnTabBgDClick(wxAuiNotebookEvent& evt); - void OnNavigationKeyNotebook(wxNavigationKeyEvent& event); - - // set selection to the given window (which must be non-NULL and be one of - // our pages, otherwise an assert is raised) - void SetSelectionToWindow(wxWindow *win); - void SetSelectionToPage(const wxAuiNotebookPage& page) - { - SetSelectionToWindow(page.window); - } - -protected: - - wxAuiManager m_mgr; - wxAuiTabContainer m_tabs; - int m_curPage; - int m_tabIdCounter; - wxWindow* m_dummyWnd; - - wxSize m_requestedBmpSize; - int m_requestedTabCtrlHeight; - wxFont m_selectedFont; - wxFont m_normalFont; - int m_tabCtrlHeight; - - int m_lastDragX; - unsigned int m_flags; - -#ifndef SWIG - wxDECLARE_CLASS(wxAuiNotebook); - wxDECLARE_EVENT_TABLE(); -#endif -}; - - - - -// wx event machinery - -#ifndef SWIG - -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_AUINOTEBOOK_PAGE_CLOSE, wxAuiNotebookEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_AUINOTEBOOK_PAGE_CHANGED, wxAuiNotebookEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_AUINOTEBOOK_PAGE_CHANGING, wxAuiNotebookEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_AUINOTEBOOK_PAGE_CLOSED, wxAuiNotebookEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_AUINOTEBOOK_BUTTON, wxAuiNotebookEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_AUINOTEBOOK_BEGIN_DRAG, wxAuiNotebookEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_AUINOTEBOOK_END_DRAG, wxAuiNotebookEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_AUINOTEBOOK_DRAG_MOTION, wxAuiNotebookEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_AUINOTEBOOK_ALLOW_DND, wxAuiNotebookEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_AUINOTEBOOK_TAB_MIDDLE_DOWN, wxAuiNotebookEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_AUINOTEBOOK_TAB_MIDDLE_UP, wxAuiNotebookEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_AUINOTEBOOK_TAB_RIGHT_DOWN, wxAuiNotebookEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_AUINOTEBOOK_TAB_RIGHT_UP, wxAuiNotebookEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_AUINOTEBOOK_DRAG_DONE, wxAuiNotebookEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_AUINOTEBOOK_BG_DCLICK, wxAuiNotebookEvent); - -typedef void (wxEvtHandler::*wxAuiNotebookEventFunction)(wxAuiNotebookEvent&); - -#define wxAuiNotebookEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxAuiNotebookEventFunction, func) - -#define EVT_AUINOTEBOOK_PAGE_CLOSE(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_AUINOTEBOOK_PAGE_CLOSE, winid, wxAuiNotebookEventHandler(fn)) -#define EVT_AUINOTEBOOK_PAGE_CLOSED(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_AUINOTEBOOK_PAGE_CLOSED, winid, wxAuiNotebookEventHandler(fn)) -#define EVT_AUINOTEBOOK_PAGE_CHANGED(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_AUINOTEBOOK_PAGE_CHANGED, winid, wxAuiNotebookEventHandler(fn)) -#define EVT_AUINOTEBOOK_PAGE_CHANGING(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_AUINOTEBOOK_PAGE_CHANGING, winid, wxAuiNotebookEventHandler(fn)) -#define EVT_AUINOTEBOOK_BUTTON(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_AUINOTEBOOK_BUTTON, winid, wxAuiNotebookEventHandler(fn)) -#define EVT_AUINOTEBOOK_BEGIN_DRAG(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_AUINOTEBOOK_BEGIN_DRAG, winid, wxAuiNotebookEventHandler(fn)) -#define EVT_AUINOTEBOOK_END_DRAG(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_AUINOTEBOOK_END_DRAG, winid, wxAuiNotebookEventHandler(fn)) -#define EVT_AUINOTEBOOK_DRAG_MOTION(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_AUINOTEBOOK_DRAG_MOTION, winid, wxAuiNotebookEventHandler(fn)) -#define EVT_AUINOTEBOOK_ALLOW_DND(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_AUINOTEBOOK_ALLOW_DND, winid, wxAuiNotebookEventHandler(fn)) -#define EVT_AUINOTEBOOK_DRAG_DONE(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_AUINOTEBOOK_DRAG_DONE, winid, wxAuiNotebookEventHandler(fn)) -#define EVT_AUINOTEBOOK_TAB_MIDDLE_DOWN(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_AUINOTEBOOK_TAB_MIDDLE_DOWN, winid, wxAuiNotebookEventHandler(fn)) -#define EVT_AUINOTEBOOK_TAB_MIDDLE_UP(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_AUINOTEBOOK_TAB_MIDDLE_UP, winid, wxAuiNotebookEventHandler(fn)) -#define EVT_AUINOTEBOOK_TAB_RIGHT_DOWN(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_AUINOTEBOOK_TAB_RIGHT_DOWN, winid, wxAuiNotebookEventHandler(fn)) -#define EVT_AUINOTEBOOK_TAB_RIGHT_UP(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_AUINOTEBOOK_TAB_RIGHT_UP, winid, wxAuiNotebookEventHandler(fn)) -#define EVT_AUINOTEBOOK_BG_DCLICK(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_AUINOTEBOOK_BG_DCLICK, winid, wxAuiNotebookEventHandler(fn)) -#else - -// wxpython/swig event work -%constant wxEventType wxEVT_AUINOTEBOOK_PAGE_CLOSE; -%constant wxEventType wxEVT_AUINOTEBOOK_PAGE_CLOSED; -%constant wxEventType wxEVT_AUINOTEBOOK_PAGE_CHANGED; -%constant wxEventType wxEVT_AUINOTEBOOK_PAGE_CHANGING; -%constant wxEventType wxEVT_AUINOTEBOOK_BUTTON; -%constant wxEventType wxEVT_AUINOTEBOOK_BEGIN_DRAG; -%constant wxEventType wxEVT_AUINOTEBOOK_END_DRAG; -%constant wxEventType wxEVT_AUINOTEBOOK_DRAG_MOTION; -%constant wxEventType wxEVT_AUINOTEBOOK_ALLOW_DND; -%constant wxEventType wxEVT_AUINOTEBOOK_DRAG_DONE; -%constant wxEventType wxEVT_AUINOTEBOOK_TAB_MIDDLE_DOWN; -%constant wxEventType wxEVT_AUINOTEBOOK_TAB_MIDDLE_UP; -%constant wxEventType wxEVT_AUINOTEBOOK_TAB_RIGHT_DOWN; -%constant wxEventType wxEVT_AUINOTEBOOK_TAB_RIGHT_UP; -%constant wxEventType wxEVT_AUINOTEBOOK_BG_DCLICK; - -%pythoncode { - EVT_AUINOTEBOOK_PAGE_CLOSE = wx.PyEventBinder( wxEVT_AUINOTEBOOK_PAGE_CLOSE, 1 ) - EVT_AUINOTEBOOK_PAGE_CLOSED = wx.PyEventBinder( wxEVT_AUINOTEBOOK_PAGE_CLOSED, 1 ) - EVT_AUINOTEBOOK_PAGE_CHANGED = wx.PyEventBinder( wxEVT_AUINOTEBOOK_PAGE_CHANGED, 1 ) - EVT_AUINOTEBOOK_PAGE_CHANGING = wx.PyEventBinder( wxEVT_AUINOTEBOOK_PAGE_CHANGING, 1 ) - EVT_AUINOTEBOOK_BUTTON = wx.PyEventBinder( wxEVT_AUINOTEBOOK_BUTTON, 1 ) - EVT_AUINOTEBOOK_BEGIN_DRAG = wx.PyEventBinder( wxEVT_AUINOTEBOOK_BEGIN_DRAG, 1 ) - EVT_AUINOTEBOOK_END_DRAG = wx.PyEventBinder( wxEVT_AUINOTEBOOK_END_DRAG, 1 ) - EVT_AUINOTEBOOK_DRAG_MOTION = wx.PyEventBinder( wxEVT_AUINOTEBOOK_DRAG_MOTION, 1 ) - EVT_AUINOTEBOOK_ALLOW_DND = wx.PyEventBinder( wxEVT_AUINOTEBOOK_ALLOW_DND, 1 ) - EVT_AUINOTEBOOK_DRAG_DONE = wx.PyEventBinder( wxEVT_AUINOTEBOOK_DRAG_DONE, 1 ) - EVT__AUINOTEBOOK_TAB_MIDDLE_DOWN = wx.PyEventBinder( wxEVT_AUINOTEBOOK_TAB_MIDDLE_DOWN, 1 ) - EVT__AUINOTEBOOK_TAB_MIDDLE_UP = wx.PyEventBinder( wxEVT_AUINOTEBOOK_TAB_MIDDLE_UP, 1 ) - EVT__AUINOTEBOOK_TAB_RIGHT_DOWN = wx.PyEventBinder( wxEVT_AUINOTEBOOK_TAB_RIGHT_DOWN, 1 ) - EVT__AUINOTEBOOK_TAB_RIGHT_UP = wx.PyEventBinder( wxEVT_AUINOTEBOOK_TAB_RIGHT_UP, 1 ) - EVT_AUINOTEBOOK_BG_DCLICK = wx.PyEventBinder( wxEVT_AUINOTEBOOK_BG_DCLICK, 1 ) -} -#endif - - -// old wxEVT_COMMAND_* constants -#define wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE wxEVT_AUINOTEBOOK_PAGE_CLOSE -#define wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSED wxEVT_AUINOTEBOOK_PAGE_CLOSED -#define wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED wxEVT_AUINOTEBOOK_PAGE_CHANGED -#define wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING wxEVT_AUINOTEBOOK_PAGE_CHANGING -#define wxEVT_COMMAND_AUINOTEBOOK_BUTTON wxEVT_AUINOTEBOOK_BUTTON -#define wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG wxEVT_AUINOTEBOOK_BEGIN_DRAG -#define wxEVT_COMMAND_AUINOTEBOOK_END_DRAG wxEVT_AUINOTEBOOK_END_DRAG -#define wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION wxEVT_AUINOTEBOOK_DRAG_MOTION -#define wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND wxEVT_AUINOTEBOOK_ALLOW_DND -#define wxEVT_COMMAND_AUINOTEBOOK_DRAG_DONE wxEVT_AUINOTEBOOK_DRAG_DONE -#define wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_DOWN wxEVT_AUINOTEBOOK_TAB_MIDDLE_DOWN -#define wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_UP wxEVT_AUINOTEBOOK_TAB_MIDDLE_UP -#define wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_DOWN wxEVT_AUINOTEBOOK_TAB_RIGHT_DOWN -#define wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_UP wxEVT_AUINOTEBOOK_TAB_RIGHT_UP -#define wxEVT_COMMAND_AUINOTEBOOK_BG_DCLICK wxEVT_AUINOTEBOOK_BG_DCLICK -#define wxEVT_COMMAND_AUINOTEBOOK_CANCEL_DRAG wxEVT_AUINOTEBOOK_CANCEL_DRAG - -#endif // wxUSE_AUI -#endif // _WX_AUINOTEBOOK_H_ diff --git a/Externals/wxWidgets3/include/wx/aui/barartmsw.h b/Externals/wxWidgets3/include/wx/aui/barartmsw.h deleted file mode 100644 index 59602f0098..0000000000 --- a/Externals/wxWidgets3/include/wx/aui/barartmsw.h +++ /dev/null @@ -1,86 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/aui/barartmsw.h -// Purpose: Interface of wxAuiMSWToolBarArt -// Author: Tobias Taschner -// Created: 2015-09-22 -// Copyright: (c) 2015 wxWidgets development team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_AUI_BARART_MSW_H_ -#define _WX_AUI_BARART_MSW_H_ - -class WXDLLIMPEXP_AUI wxAuiMSWToolBarArt : public wxAuiGenericToolBarArt -{ -public: - wxAuiMSWToolBarArt(); - - virtual wxAuiToolBarArt* Clone() wxOVERRIDE; - - virtual void DrawBackground( - wxDC& dc, - wxWindow* wnd, - const wxRect& rect) wxOVERRIDE; - - virtual void DrawLabel( - wxDC& dc, - wxWindow* wnd, - const wxAuiToolBarItem& item, - const wxRect& rect) wxOVERRIDE; - - virtual void DrawButton( - wxDC& dc, - wxWindow* wnd, - const wxAuiToolBarItem& item, - const wxRect& rect) wxOVERRIDE; - - virtual void DrawDropDownButton( - wxDC& dc, - wxWindow* wnd, - const wxAuiToolBarItem& item, - const wxRect& rect) wxOVERRIDE; - - virtual void DrawControlLabel( - wxDC& dc, - wxWindow* wnd, - const wxAuiToolBarItem& item, - const wxRect& rect) wxOVERRIDE; - - virtual void DrawSeparator( - wxDC& dc, - wxWindow* wnd, - const wxRect& rect) wxOVERRIDE; - - virtual void DrawGripper( - wxDC& dc, - wxWindow* wnd, - const wxRect& rect) wxOVERRIDE; - - virtual void DrawOverflowButton( - wxDC& dc, - wxWindow* wnd, - const wxRect& rect, - int state) wxOVERRIDE; - - virtual wxSize GetLabelSize( - wxDC& dc, - wxWindow* wnd, - const wxAuiToolBarItem& item) wxOVERRIDE; - - virtual wxSize GetToolSize( - wxDC& dc, - wxWindow* wnd, - const wxAuiToolBarItem& item) wxOVERRIDE; - - virtual int GetElementSize(int element) wxOVERRIDE; - virtual void SetElementSize(int elementId, int size) wxOVERRIDE; - - virtual int ShowDropDown(wxWindow* wnd, - const wxAuiToolBarItemArray& items) wxOVERRIDE; - -private: - bool m_themed; - wxSize m_buttonSize; -}; - -#endif // _WX_AUI_BARART_MSW_H_ diff --git a/Externals/wxWidgets3/include/wx/aui/dockart.h b/Externals/wxWidgets3/include/wx/aui/dockart.h deleted file mode 100644 index 744cad56c4..0000000000 --- a/Externals/wxWidgets3/include/wx/aui/dockart.h +++ /dev/null @@ -1,178 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/aui/dockart.h -// Purpose: wxaui: wx advanced user interface - docking window manager -// Author: Benjamin I. Williams -// Modified by: -// Created: 2005-05-17 -// Copyright: (C) Copyright 2005, Kirix Corporation, All Rights Reserved. -// Licence: wxWindows Library Licence, Version 3.1 -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DOCKART_H_ -#define _WX_DOCKART_H_ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/defs.h" - -#if wxUSE_AUI - -#include "wx/pen.h" -#include "wx/brush.h" -#include "wx/bitmap.h" -#include "wx/colour.h" - -// dock art provider code - a dock provider provides all drawing -// functionality to the wxAui dock manager. This allows the dock -// manager to have plugable look-and-feels - -class WXDLLIMPEXP_AUI wxAuiDockArt -{ -public: - - wxAuiDockArt() { } - virtual ~wxAuiDockArt() { } - - virtual int GetMetric(int id) = 0; - virtual void SetMetric(int id, int newVal) = 0; - virtual void SetFont(int id, const wxFont& font) = 0; - virtual wxFont GetFont(int id) = 0; - virtual wxColour GetColour(int id) = 0; - virtual void SetColour(int id, const wxColor& colour) = 0; - wxColour GetColor(int id) { return GetColour(id); } - void SetColor(int id, const wxColour& color) { SetColour(id, color); } - - virtual void DrawSash(wxDC& dc, - wxWindow* window, - int orientation, - const wxRect& rect) = 0; - - virtual void DrawBackground(wxDC& dc, - wxWindow* window, - int orientation, - const wxRect& rect) = 0; - - virtual void DrawCaption(wxDC& dc, - wxWindow* window, - const wxString& text, - const wxRect& rect, - wxAuiPaneInfo& pane) = 0; - - virtual void DrawGripper(wxDC& dc, - wxWindow* window, - const wxRect& rect, - wxAuiPaneInfo& pane) = 0; - - virtual void DrawBorder(wxDC& dc, - wxWindow* window, - const wxRect& rect, - wxAuiPaneInfo& pane) = 0; - - virtual void DrawPaneButton(wxDC& dc, - wxWindow* window, - int button, - int buttonState, - const wxRect& rect, - wxAuiPaneInfo& pane) = 0; -}; - - -// this is the default art provider for wxAuiManager. Dock art -// can be customized by creating a class derived from this one, -// or replacing this class entirely - -class WXDLLIMPEXP_AUI wxAuiDefaultDockArt : public wxAuiDockArt -{ -public: - - wxAuiDefaultDockArt(); - - int GetMetric(int metricId); - void SetMetric(int metricId, int newVal); - wxColour GetColour(int id); - void SetColour(int id, const wxColor& colour); - void SetFont(int id, const wxFont& font); - wxFont GetFont(int id); - - void DrawSash(wxDC& dc, - wxWindow *window, - int orientation, - const wxRect& rect); - - void DrawBackground(wxDC& dc, - wxWindow *window, - int orientation, - const wxRect& rect); - - void DrawCaption(wxDC& dc, - wxWindow *window, - const wxString& text, - const wxRect& rect, - wxAuiPaneInfo& pane); - - void DrawGripper(wxDC& dc, - wxWindow *window, - const wxRect& rect, - wxAuiPaneInfo& pane); - - void DrawBorder(wxDC& dc, - wxWindow *window, - const wxRect& rect, - wxAuiPaneInfo& pane); - - void DrawPaneButton(wxDC& dc, - wxWindow *window, - int button, - int buttonState, - const wxRect& rect, - wxAuiPaneInfo& pane); - - void DrawIcon(wxDC& dc, - const wxRect& rect, - wxAuiPaneInfo& pane); - -protected: - - void DrawCaptionBackground(wxDC& dc, const wxRect& rect, bool active); - - void InitBitmaps(); - -protected: - - wxPen m_borderPen; - wxBrush m_sashBrush; - wxBrush m_backgroundBrush; - wxBrush m_gripperBrush; - wxFont m_captionFont; - wxBitmap m_inactiveCloseBitmap; - wxBitmap m_inactivePinBitmap; - wxBitmap m_inactiveMaximizeBitmap; - wxBitmap m_inactiveRestoreBitmap; - wxBitmap m_activeCloseBitmap; - wxBitmap m_activePinBitmap; - wxBitmap m_activeMaximizeBitmap; - wxBitmap m_activeRestoreBitmap; - wxPen m_gripperPen1; - wxPen m_gripperPen2; - wxPen m_gripperPen3; - wxColour m_baseColour; - wxColour m_activeCaptionColour; - wxColour m_activeCaptionGradientColour; - wxColour m_activeCaptionTextColour; - wxColour m_inactiveCaptionColour; - wxColour m_inactiveCaptionGradientColour; - wxColour m_inactiveCaptionTextColour; - int m_borderSize; - int m_captionSize; - int m_sashSize; - int m_buttonSize; - int m_gripperSize; - int m_gradientType; -}; - - - -#endif // wxUSE_AUI -#endif //_WX_DOCKART_H_ diff --git a/Externals/wxWidgets3/include/wx/aui/floatpane.h b/Externals/wxWidgets3/include/wx/aui/floatpane.h deleted file mode 100644 index 889d2deb73..0000000000 --- a/Externals/wxWidgets3/include/wx/aui/floatpane.h +++ /dev/null @@ -1,83 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/aui/floatpane.h -// Purpose: wxaui: wx advanced user interface - docking window manager -// Author: Benjamin I. Williams -// Modified by: -// Created: 2005-05-17 -// Copyright: (C) Copyright 2005, Kirix Corporation, All Rights Reserved. -// Licence: wxWindows Library Licence, Version 3.1 -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_FLOATPANE_H_ -#define _WX_FLOATPANE_H_ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/defs.h" -#include "wx/weakref.h" - -#if wxUSE_AUI - -#if wxUSE_MINIFRAME - #include "wx/minifram.h" - #define wxAuiFloatingFrameBaseClass wxMiniFrame -#else - #include "wx/frame.h" - #define wxAuiFloatingFrameBaseClass wxFrame -#endif - -class WXDLLIMPEXP_AUI wxAuiFloatingFrame : public wxAuiFloatingFrameBaseClass -{ -public: - wxAuiFloatingFrame(wxWindow* parent, - wxAuiManager* ownerMgr, - const wxAuiPaneInfo& pane, - wxWindowID id = wxID_ANY, - long style = wxRESIZE_BORDER | wxSYSTEM_MENU | wxCAPTION | - wxFRAME_NO_TASKBAR | wxFRAME_FLOAT_ON_PARENT | - wxCLIP_CHILDREN - ); - virtual ~wxAuiFloatingFrame(); - void SetPaneWindow(const wxAuiPaneInfo& pane); - wxAuiManager* GetOwnerManager() const; - - // Allow processing accelerators to the parent frame - virtual bool IsTopNavigationDomain(NavigationKind kind) const wxOVERRIDE; - -protected: - virtual void OnMoveStart(); - virtual void OnMoving(const wxRect& windowRect, wxDirection dir); - virtual void OnMoveFinished(); - -private: - void OnSize(wxSizeEvent& event); - void OnClose(wxCloseEvent& event); - void OnMoveEvent(wxMoveEvent& event); - void OnIdle(wxIdleEvent& event); - void OnActivate(wxActivateEvent& event); - static bool isMouseDown(); - -private: - wxWindow* m_paneWindow; // pane window being managed - bool m_solidDrag; // true if system uses solid window drag - bool m_moving; - wxRect m_lastRect; - wxRect m_last2Rect; - wxRect m_last3Rect; - wxSize m_lastSize; - wxDirection m_lastDirection; - - wxWeakRef m_ownerMgr; - wxAuiManager m_mgr; - -#ifndef SWIG - wxDECLARE_EVENT_TABLE(); - wxDECLARE_CLASS(wxAuiFloatingFrame); -#endif // SWIG -}; - -#endif // wxUSE_AUI -#endif //_WX_FLOATPANE_H_ - diff --git a/Externals/wxWidgets3/include/wx/aui/framemanager.h b/Externals/wxWidgets3/include/wx/aui/framemanager.h deleted file mode 100644 index fdf29d4f8e..0000000000 --- a/Externals/wxWidgets3/include/wx/aui/framemanager.h +++ /dev/null @@ -1,890 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/aui/framemanager.h -// Purpose: wxaui: wx advanced user interface - docking window manager -// Author: Benjamin I. Williams -// Modified by: -// Created: 2005-05-17 -// Copyright: (C) Copyright 2005, Kirix Corporation, All Rights Reserved. -// Licence: wxWindows Library Licence, Version 3.1 -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_FRAMEMANAGER_H_ -#define _WX_FRAMEMANAGER_H_ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/defs.h" - -#if wxUSE_AUI - -#include "wx/dynarray.h" -#include "wx/gdicmn.h" -#include "wx/window.h" -#include "wx/timer.h" -#include "wx/sizer.h" -#include "wx/bitmap.h" - -enum wxAuiManagerDock -{ - wxAUI_DOCK_NONE = 0, - wxAUI_DOCK_TOP = 1, - wxAUI_DOCK_RIGHT = 2, - wxAUI_DOCK_BOTTOM = 3, - wxAUI_DOCK_LEFT = 4, - wxAUI_DOCK_CENTER = 5, - wxAUI_DOCK_CENTRE = wxAUI_DOCK_CENTER -}; - -enum wxAuiManagerOption -{ - wxAUI_MGR_ALLOW_FLOATING = 1 << 0, - wxAUI_MGR_ALLOW_ACTIVE_PANE = 1 << 1, - wxAUI_MGR_TRANSPARENT_DRAG = 1 << 2, - wxAUI_MGR_TRANSPARENT_HINT = 1 << 3, - wxAUI_MGR_VENETIAN_BLINDS_HINT = 1 << 4, - wxAUI_MGR_RECTANGLE_HINT = 1 << 5, - wxAUI_MGR_HINT_FADE = 1 << 6, - wxAUI_MGR_NO_VENETIAN_BLINDS_FADE = 1 << 7, - wxAUI_MGR_LIVE_RESIZE = 1 << 8, - - wxAUI_MGR_DEFAULT = wxAUI_MGR_ALLOW_FLOATING | - wxAUI_MGR_TRANSPARENT_HINT | - wxAUI_MGR_HINT_FADE | - wxAUI_MGR_NO_VENETIAN_BLINDS_FADE -}; - - -enum wxAuiPaneDockArtSetting -{ - wxAUI_DOCKART_SASH_SIZE = 0, - wxAUI_DOCKART_CAPTION_SIZE = 1, - wxAUI_DOCKART_GRIPPER_SIZE = 2, - wxAUI_DOCKART_PANE_BORDER_SIZE = 3, - wxAUI_DOCKART_PANE_BUTTON_SIZE = 4, - wxAUI_DOCKART_BACKGROUND_COLOUR = 5, - wxAUI_DOCKART_SASH_COLOUR = 6, - wxAUI_DOCKART_ACTIVE_CAPTION_COLOUR = 7, - wxAUI_DOCKART_ACTIVE_CAPTION_GRADIENT_COLOUR = 8, - wxAUI_DOCKART_INACTIVE_CAPTION_COLOUR = 9, - wxAUI_DOCKART_INACTIVE_CAPTION_GRADIENT_COLOUR = 10, - wxAUI_DOCKART_ACTIVE_CAPTION_TEXT_COLOUR = 11, - wxAUI_DOCKART_INACTIVE_CAPTION_TEXT_COLOUR = 12, - wxAUI_DOCKART_BORDER_COLOUR = 13, - wxAUI_DOCKART_GRIPPER_COLOUR = 14, - wxAUI_DOCKART_CAPTION_FONT = 15, - wxAUI_DOCKART_GRADIENT_TYPE = 16 -}; - -enum wxAuiPaneDockArtGradients -{ - wxAUI_GRADIENT_NONE = 0, - wxAUI_GRADIENT_VERTICAL = 1, - wxAUI_GRADIENT_HORIZONTAL = 2 -}; - -enum wxAuiPaneButtonState -{ - wxAUI_BUTTON_STATE_NORMAL = 0, - wxAUI_BUTTON_STATE_HOVER = 1 << 1, - wxAUI_BUTTON_STATE_PRESSED = 1 << 2, - wxAUI_BUTTON_STATE_DISABLED = 1 << 3, - wxAUI_BUTTON_STATE_HIDDEN = 1 << 4, - wxAUI_BUTTON_STATE_CHECKED = 1 << 5 -}; - -enum wxAuiButtonId -{ - wxAUI_BUTTON_CLOSE = 101, - wxAUI_BUTTON_MAXIMIZE_RESTORE = 102, - wxAUI_BUTTON_MINIMIZE = 103, - wxAUI_BUTTON_PIN = 104, - wxAUI_BUTTON_OPTIONS = 105, - wxAUI_BUTTON_WINDOWLIST = 106, - wxAUI_BUTTON_LEFT = 107, - wxAUI_BUTTON_RIGHT = 108, - wxAUI_BUTTON_UP = 109, - wxAUI_BUTTON_DOWN = 110, - wxAUI_BUTTON_CUSTOM1 = 201, - wxAUI_BUTTON_CUSTOM2 = 202, - wxAUI_BUTTON_CUSTOM3 = 203 -}; - -enum wxAuiPaneInsertLevel -{ - wxAUI_INSERT_PANE = 0, - wxAUI_INSERT_ROW = 1, - wxAUI_INSERT_DOCK = 2 -}; - - - - -// forwards and array declarations -class wxAuiDockUIPart; -class wxAuiPaneButton; -class wxAuiPaneInfo; -class wxAuiDockInfo; -class wxAuiDockArt; -class wxAuiManagerEvent; - -#ifndef SWIG -WX_DECLARE_USER_EXPORTED_OBJARRAY(wxAuiDockInfo, wxAuiDockInfoArray, WXDLLIMPEXP_AUI); -WX_DECLARE_USER_EXPORTED_OBJARRAY(wxAuiDockUIPart, wxAuiDockUIPartArray, WXDLLIMPEXP_AUI); -WX_DECLARE_USER_EXPORTED_OBJARRAY(wxAuiPaneButton, wxAuiPaneButtonArray, WXDLLIMPEXP_AUI); -WX_DECLARE_USER_EXPORTED_OBJARRAY(wxAuiPaneInfo, wxAuiPaneInfoArray, WXDLLIMPEXP_AUI); -WX_DEFINE_USER_EXPORTED_ARRAY_PTR(wxAuiPaneInfo*, wxAuiPaneInfoPtrArray, class WXDLLIMPEXP_AUI); -WX_DEFINE_USER_EXPORTED_ARRAY_PTR(wxAuiDockInfo*, wxAuiDockInfoPtrArray, class WXDLLIMPEXP_AUI); -#endif // SWIG - -extern WXDLLIMPEXP_AUI wxAuiDockInfo wxAuiNullDockInfo; -extern WXDLLIMPEXP_AUI wxAuiPaneInfo wxAuiNullPaneInfo; - - - -class WXDLLIMPEXP_AUI wxAuiPaneInfo -{ -public: - - wxAuiPaneInfo() - { - window = NULL; - frame = NULL; - state = 0; - dock_direction = wxAUI_DOCK_LEFT; - dock_layer = 0; - dock_row = 0; - dock_pos = 0; - floating_pos = wxDefaultPosition; - floating_size = wxDefaultSize; - best_size = wxDefaultSize; - min_size = wxDefaultSize; - max_size = wxDefaultSize; - dock_proportion = 0; - - DefaultPane(); - } - - ~wxAuiPaneInfo() {} - -#ifndef SWIG - wxAuiPaneInfo(const wxAuiPaneInfo& c) - { - name = c.name; - caption = c.caption; - icon = c.icon; - window = c.window; - frame = c.frame; - state = c.state; - dock_direction = c.dock_direction; - dock_layer = c.dock_layer; - dock_row = c.dock_row; - dock_pos = c.dock_pos; - best_size = c.best_size; - min_size = c.min_size; - max_size = c.max_size; - floating_pos = c.floating_pos; - floating_size = c.floating_size; - dock_proportion = c.dock_proportion; - buttons = c.buttons; - rect = c.rect; - } - - wxAuiPaneInfo& operator=(const wxAuiPaneInfo& c) - { - name = c.name; - caption = c.caption; - window = c.window; - frame = c.frame; - state = c.state; - dock_direction = c.dock_direction; - dock_layer = c.dock_layer; - dock_row = c.dock_row; - dock_pos = c.dock_pos; - best_size = c.best_size; - min_size = c.min_size; - max_size = c.max_size; - floating_pos = c.floating_pos; - floating_size = c.floating_size; - dock_proportion = c.dock_proportion; - buttons = c.buttons; - rect = c.rect; - return *this; - } -#endif // SWIG - - // Write the safe parts of a newly loaded PaneInfo structure "source" into "this" - // used on loading perspectives etc. - void SafeSet(wxAuiPaneInfo source) - { - // note source is not passed by reference so we can overwrite, to keep the - // unsafe bits of "dest" - source.window = window; - source.frame = frame; - source.buttons = buttons; - wxCHECK_RET(source.IsValid(), - "window settings and pane settings are incompatible"); - // now assign - *this = source; - } - - bool IsOk() const { return window != NULL; } - bool IsFixed() const { return !HasFlag(optionResizable); } - bool IsResizable() const { return HasFlag(optionResizable); } - bool IsShown() const { return !HasFlag(optionHidden); } - bool IsFloating() const { return HasFlag(optionFloating); } - bool IsDocked() const { return !HasFlag(optionFloating); } - bool IsToolbar() const { return HasFlag(optionToolbar); } - bool IsTopDockable() const { return HasFlag(optionTopDockable); } - bool IsBottomDockable() const { return HasFlag(optionBottomDockable); } - bool IsLeftDockable() const { return HasFlag(optionLeftDockable); } - bool IsRightDockable() const { return HasFlag(optionRightDockable); } - bool IsDockable() const - { - return HasFlag(optionTopDockable | optionBottomDockable | - optionLeftDockable | optionRightDockable); - } - bool IsFloatable() const { return HasFlag(optionFloatable); } - bool IsMovable() const { return HasFlag(optionMovable); } - bool IsDestroyOnClose() const { return HasFlag(optionDestroyOnClose); } - bool IsMaximized() const { return HasFlag(optionMaximized); } - bool HasCaption() const { return HasFlag(optionCaption); } - bool HasGripper() const { return HasFlag(optionGripper); } - bool HasBorder() const { return HasFlag(optionPaneBorder); } - bool HasCloseButton() const { return HasFlag(buttonClose); } - bool HasMaximizeButton() const { return HasFlag(buttonMaximize); } - bool HasMinimizeButton() const { return HasFlag(buttonMinimize); } - bool HasPinButton() const { return HasFlag(buttonPin); } - bool HasGripperTop() const { return HasFlag(optionGripperTop); } - -#ifdef SWIG - %typemap(out) wxAuiPaneInfo& { $result = $self; Py_INCREF($result); } -#endif - wxAuiPaneInfo& Window(wxWindow* w) - { - wxAuiPaneInfo test(*this); - test.window = w; - wxCHECK_MSG(test.IsValid(), *this, - "window settings and pane settings are incompatible"); - *this = test; - return *this; - } - wxAuiPaneInfo& Name(const wxString& n) { name = n; return *this; } - wxAuiPaneInfo& Caption(const wxString& c) { caption = c; return *this; } - wxAuiPaneInfo& Icon(const wxBitmap& b) { icon = b; return *this; } - wxAuiPaneInfo& Left() { dock_direction = wxAUI_DOCK_LEFT; return *this; } - wxAuiPaneInfo& Right() { dock_direction = wxAUI_DOCK_RIGHT; return *this; } - wxAuiPaneInfo& Top() { dock_direction = wxAUI_DOCK_TOP; return *this; } - wxAuiPaneInfo& Bottom() { dock_direction = wxAUI_DOCK_BOTTOM; return *this; } - wxAuiPaneInfo& Center() { dock_direction = wxAUI_DOCK_CENTER; return *this; } - wxAuiPaneInfo& Centre() { dock_direction = wxAUI_DOCK_CENTRE; return *this; } - wxAuiPaneInfo& Direction(int direction) { dock_direction = direction; return *this; } - wxAuiPaneInfo& Layer(int layer) { dock_layer = layer; return *this; } - wxAuiPaneInfo& Row(int row) { dock_row = row; return *this; } - wxAuiPaneInfo& Position(int pos) { dock_pos = pos; return *this; } - wxAuiPaneInfo& BestSize(const wxSize& size) { best_size = size; return *this; } - wxAuiPaneInfo& MinSize(const wxSize& size) { min_size = size; return *this; } - wxAuiPaneInfo& MaxSize(const wxSize& size) { max_size = size; return *this; } - wxAuiPaneInfo& BestSize(int x, int y) { best_size.Set(x,y); return *this; } - wxAuiPaneInfo& MinSize(int x, int y) { min_size.Set(x,y); return *this; } - wxAuiPaneInfo& MaxSize(int x, int y) { max_size.Set(x,y); return *this; } - wxAuiPaneInfo& FloatingPosition(const wxPoint& pos) { floating_pos = pos; return *this; } - wxAuiPaneInfo& FloatingPosition(int x, int y) { floating_pos.x = x; floating_pos.y = y; return *this; } - wxAuiPaneInfo& FloatingSize(const wxSize& size) { floating_size = size; return *this; } - wxAuiPaneInfo& FloatingSize(int x, int y) { floating_size.Set(x,y); return *this; } - wxAuiPaneInfo& Fixed() { return SetFlag(optionResizable, false); } - wxAuiPaneInfo& Resizable(bool resizable = true) { return SetFlag(optionResizable, resizable); } - wxAuiPaneInfo& Dock() { return SetFlag(optionFloating, false); } - wxAuiPaneInfo& Float() { return SetFlag(optionFloating, true); } - wxAuiPaneInfo& Hide() { return SetFlag(optionHidden, true); } - wxAuiPaneInfo& Show(bool show = true) { return SetFlag(optionHidden, !show); } - wxAuiPaneInfo& CaptionVisible(bool visible = true) { return SetFlag(optionCaption, visible); } - wxAuiPaneInfo& Maximize() { return SetFlag(optionMaximized, true); } - wxAuiPaneInfo& Restore() { return SetFlag(optionMaximized, false); } - wxAuiPaneInfo& PaneBorder(bool visible = true) { return SetFlag(optionPaneBorder, visible); } - wxAuiPaneInfo& Gripper(bool visible = true) { return SetFlag(optionGripper, visible); } - wxAuiPaneInfo& GripperTop(bool attop = true) { return SetFlag(optionGripperTop, attop); } - wxAuiPaneInfo& CloseButton(bool visible = true) { return SetFlag(buttonClose, visible); } - wxAuiPaneInfo& MaximizeButton(bool visible = true) { return SetFlag(buttonMaximize, visible); } - wxAuiPaneInfo& MinimizeButton(bool visible = true) { return SetFlag(buttonMinimize, visible); } - wxAuiPaneInfo& PinButton(bool visible = true) { return SetFlag(buttonPin, visible); } - wxAuiPaneInfo& DestroyOnClose(bool b = true) { return SetFlag(optionDestroyOnClose, b); } - wxAuiPaneInfo& TopDockable(bool b = true) { return SetFlag(optionTopDockable, b); } - wxAuiPaneInfo& BottomDockable(bool b = true) { return SetFlag(optionBottomDockable, b); } - wxAuiPaneInfo& LeftDockable(bool b = true) { return SetFlag(optionLeftDockable, b); } - wxAuiPaneInfo& RightDockable(bool b = true) { return SetFlag(optionRightDockable, b); } - wxAuiPaneInfo& Floatable(bool b = true) { return SetFlag(optionFloatable, b); } - wxAuiPaneInfo& Movable(bool b = true) { return SetFlag(optionMovable, b); } - wxAuiPaneInfo& DockFixed(bool b = true) { return SetFlag(optionDockFixed, b); } - - wxAuiPaneInfo& Dockable(bool b = true) - { - return TopDockable(b).BottomDockable(b).LeftDockable(b).RightDockable(b); - } - - wxAuiPaneInfo& DefaultPane() - { - wxAuiPaneInfo test(*this); - test.state |= optionTopDockable | optionBottomDockable | - optionLeftDockable | optionRightDockable | - optionFloatable | optionMovable | optionResizable | - optionCaption | optionPaneBorder | buttonClose; - wxCHECK_MSG(test.IsValid(), *this, - "window settings and pane settings are incompatible"); - *this = test; - return *this; - } - - wxAuiPaneInfo& CentrePane() { return CenterPane(); } - wxAuiPaneInfo& CenterPane() - { - state = 0; - return Center().PaneBorder().Resizable(); - } - - wxAuiPaneInfo& ToolbarPane() - { - DefaultPane(); - state |= (optionToolbar | optionGripper); - state &= ~(optionResizable | optionCaption); - if (dock_layer == 0) - dock_layer = 10; - return *this; - } - - wxAuiPaneInfo& SetFlag(int flag, bool option_state) - { - wxAuiPaneInfo test(*this); - if (option_state) - test.state |= flag; - else - test.state &= ~flag; - wxCHECK_MSG(test.IsValid(), *this, - "window settings and pane settings are incompatible"); - *this = test; - return *this; - } - - bool HasFlag(int flag) const - { - return (state & flag) != 0; - } - -#ifdef SWIG - %typemap(out) wxAuiPaneInfo& ; -#endif - -public: - - // NOTE: You can add and subtract flags from this list, - // but do not change the values of the flags, because - // they are stored in a binary integer format in the - // perspective string. If you really need to change the - // values around, you'll have to ensure backwards-compatibility - // in the perspective loading code. - enum wxAuiPaneState - { - optionFloating = 1 << 0, - optionHidden = 1 << 1, - optionLeftDockable = 1 << 2, - optionRightDockable = 1 << 3, - optionTopDockable = 1 << 4, - optionBottomDockable = 1 << 5, - optionFloatable = 1 << 6, - optionMovable = 1 << 7, - optionResizable = 1 << 8, - optionPaneBorder = 1 << 9, - optionCaption = 1 << 10, - optionGripper = 1 << 11, - optionDestroyOnClose = 1 << 12, - optionToolbar = 1 << 13, - optionActive = 1 << 14, - optionGripperTop = 1 << 15, - optionMaximized = 1 << 16, - optionDockFixed = 1 << 17, - - buttonClose = 1 << 21, - buttonMaximize = 1 << 22, - buttonMinimize = 1 << 23, - buttonPin = 1 << 24, - - buttonCustom1 = 1 << 26, - buttonCustom2 = 1 << 27, - buttonCustom3 = 1 << 28, - - savedHiddenState = 1 << 30, // used internally - actionPane = 1 << 31 // used internally - }; - -public: - wxString name; // name of the pane - wxString caption; // caption displayed on the window - wxBitmap icon; // icon of the pane, may be invalid - - wxWindow* window; // window that is in this pane - wxFrame* frame; // floating frame window that holds the pane - unsigned int state; // a combination of wxPaneState values - - int dock_direction; // dock direction (top, bottom, left, right, center) - int dock_layer; // layer number (0 = innermost layer) - int dock_row; // row number on the docking bar (0 = first row) - int dock_pos; // position inside the row (0 = first position) - - wxSize best_size; // size that the layout engine will prefer - wxSize min_size; // minimum size the pane window can tolerate - wxSize max_size; // maximum size the pane window can tolerate - - wxPoint floating_pos; // position while floating - wxSize floating_size; // size while floating - int dock_proportion; // proportion while docked - - wxAuiPaneButtonArray buttons; // buttons on the pane - - - wxRect rect; // current rectangle (populated by wxAUI) - - bool IsValid() const; -}; - - - -class WXDLLIMPEXP_FWD_AUI wxAuiFloatingFrame; - -class WXDLLIMPEXP_AUI wxAuiManager : public wxEvtHandler -{ - friend class wxAuiFloatingFrame; - -public: - - wxAuiManager(wxWindow* managedWnd = NULL, - unsigned int flags = wxAUI_MGR_DEFAULT); - virtual ~wxAuiManager(); - void UnInit(); - - void SetFlags(unsigned int flags); - unsigned int GetFlags() const; - - void SetManagedWindow(wxWindow* managedWnd); - wxWindow* GetManagedWindow() const; - - static wxAuiManager* GetManager(wxWindow* window); - - void SetArtProvider(wxAuiDockArt* artProvider); - wxAuiDockArt* GetArtProvider() const; - - wxAuiPaneInfo& GetPane(wxWindow* window); - wxAuiPaneInfo& GetPane(const wxString& name); - wxAuiPaneInfoArray& GetAllPanes(); - - bool AddPane(wxWindow* window, - const wxAuiPaneInfo& paneInfo); - - bool AddPane(wxWindow* window, - const wxAuiPaneInfo& paneInfo, - const wxPoint& dropPos); - - bool AddPane(wxWindow* window, - int direction = wxLEFT, - const wxString& caption = wxEmptyString); - - bool InsertPane(wxWindow* window, - const wxAuiPaneInfo& insertLocation, - int insertLevel = wxAUI_INSERT_PANE); - - bool DetachPane(wxWindow* window); - - void Update(); - - wxString SavePaneInfo(wxAuiPaneInfo& pane); - void LoadPaneInfo(wxString panePart, wxAuiPaneInfo &pane); - wxString SavePerspective(); - bool LoadPerspective(const wxString& perspective, bool update = true); - - void SetDockSizeConstraint(double widthPct, double heightPct); - void GetDockSizeConstraint(double* widthPct, double* heightPct) const; - - void ClosePane(wxAuiPaneInfo& paneInfo); - void MaximizePane(wxAuiPaneInfo& paneInfo); - void RestorePane(wxAuiPaneInfo& paneInfo); - void RestoreMaximizedPane(); - -public: - - virtual wxAuiFloatingFrame* CreateFloatingFrame(wxWindow* parent, const wxAuiPaneInfo& p); - virtual bool CanDockPanel(const wxAuiPaneInfo & p); - - void StartPaneDrag( - wxWindow* paneWindow, - const wxPoint& offset); - - wxRect CalculateHintRect( - wxWindow* paneWindow, - const wxPoint& pt, - const wxPoint& offset); - - void DrawHintRect( - wxWindow* paneWindow, - const wxPoint& pt, - const wxPoint& offset); - - virtual void ShowHint(const wxRect& rect); - virtual void HideHint(); - - void OnHintActivate(wxActivateEvent& event); - -public: - - // deprecated -- please use SetManagedWindow() and - // and GetManagedWindow() instead - - wxDEPRECATED( void SetFrame(wxFrame* frame) ); - wxDEPRECATED( wxFrame* GetFrame() const ); - -protected: - - void UpdateHintWindowConfig(); - - void DoFrameLayout(); - - void LayoutAddPane(wxSizer* container, - wxAuiDockInfo& dock, - wxAuiPaneInfo& pane, - wxAuiDockUIPartArray& uiparts, - bool spacerOnly); - - void LayoutAddDock(wxSizer* container, - wxAuiDockInfo& dock, - wxAuiDockUIPartArray& uiParts, - bool spacerOnly); - - wxSizer* LayoutAll(wxAuiPaneInfoArray& panes, - wxAuiDockInfoArray& docks, - wxAuiDockUIPartArray & uiParts, - bool spacerOnly = false); - - virtual bool ProcessDockResult(wxAuiPaneInfo& target, - const wxAuiPaneInfo& newPos); - - bool DoDrop(wxAuiDockInfoArray& docks, - wxAuiPaneInfoArray& panes, - wxAuiPaneInfo& drop, - const wxPoint& pt, - const wxPoint& actionOffset = wxPoint(0,0)); - - wxAuiDockUIPart* HitTest(int x, int y); - wxAuiDockUIPart* GetPanePart(wxWindow* pane); - int GetDockPixelOffset(wxAuiPaneInfo& test); - void OnFloatingPaneMoveStart(wxWindow* window); - void OnFloatingPaneMoving(wxWindow* window, wxDirection dir ); - void OnFloatingPaneMoved(wxWindow* window, wxDirection dir); - void OnFloatingPaneActivated(wxWindow* window); - void OnFloatingPaneClosed(wxWindow* window, wxCloseEvent& evt); - void OnFloatingPaneResized(wxWindow* window, const wxRect& rect); - void Render(wxDC* dc); - void Repaint(wxDC* dc = NULL); - void ProcessMgrEvent(wxAuiManagerEvent& event); - void UpdateButtonOnScreen(wxAuiDockUIPart* buttonUiPart, - const wxMouseEvent& event); - void GetPanePositionsAndSizes(wxAuiDockInfo& dock, - wxArrayInt& positions, - wxArrayInt& sizes); - - /// Ends a resize action, or for live update, resizes the sash - bool DoEndResizeAction(wxMouseEvent& event); - - void SetActivePane(wxWindow* active_pane); - -public: - - // public events (which can be invoked externally) - void OnRender(wxAuiManagerEvent& evt); - void OnPaneButton(wxAuiManagerEvent& evt); - -protected: - - // protected events - void OnPaint(wxPaintEvent& evt); - void OnEraseBackground(wxEraseEvent& evt); - void OnSize(wxSizeEvent& evt); - void OnSetCursor(wxSetCursorEvent& evt); - void OnLeftDown(wxMouseEvent& evt); - void OnLeftUp(wxMouseEvent& evt); - void OnMotion(wxMouseEvent& evt); - void OnCaptureLost(wxMouseCaptureLostEvent& evt); - void OnLeaveWindow(wxMouseEvent& evt); - void OnChildFocus(wxChildFocusEvent& evt); - void OnHintFadeTimer(wxTimerEvent& evt); - void OnFindManager(wxAuiManagerEvent& evt); - -protected: - - enum - { - actionNone = 0, - actionResize, - actionClickButton, - actionClickCaption, - actionDragToolbarPane, - actionDragFloatingPane - }; - -protected: - - wxWindow* m_frame; // the window being managed - wxAuiDockArt* m_art; // dock art object which does all drawing - unsigned int m_flags; // manager flags wxAUI_MGR_* - - wxAuiPaneInfoArray m_panes; // array of panes structures - wxAuiDockInfoArray m_docks; // array of docks structures - wxAuiDockUIPartArray m_uiParts; // array of UI parts (captions, buttons, etc) - - int m_action; // current mouse action - wxPoint m_actionStart; // position where the action click started - wxPoint m_actionOffset; // offset from upper left of the item clicked - wxAuiDockUIPart* m_actionPart; // ptr to the part the action happened to - wxWindow* m_actionWindow; // action frame or window (NULL if none) - wxRect m_actionHintRect; // hint rectangle for the action - wxRect m_lastRect; - wxAuiDockUIPart* m_hoverButton;// button uipart being hovered over - wxRect m_lastHint; // last hint rectangle - wxPoint m_lastMouseMove; // last mouse move position (see OnMotion) - int m_currentDragItem; - bool m_skipping; - bool m_hasMaximized; - - double m_dockConstraintX; // 0.0 .. 1.0; max pct of window width a dock can consume - double m_dockConstraintY; // 0.0 .. 1.0; max pct of window height a dock can consume - - wxFrame* m_hintWnd; // transparent hint window, if supported by platform - wxTimer m_hintFadeTimer; // transparent fade timer - wxByte m_hintFadeAmt; // transparent fade amount - wxByte m_hintFadeMax; // maximum value of hint fade - - void* m_reserved; - -#ifndef SWIG - wxDECLARE_EVENT_TABLE(); - wxDECLARE_CLASS(wxAuiManager); -#endif // SWIG -}; - - - -// event declarations/classes - -class WXDLLIMPEXP_AUI wxAuiManagerEvent : public wxEvent -{ -public: - wxAuiManagerEvent(wxEventType type=wxEVT_NULL) : wxEvent(0, type) - { - manager = NULL; - pane = NULL; - button = 0; - veto_flag = false; - canveto_flag = true; - dc = NULL; - } -#ifndef SWIG - wxAuiManagerEvent(const wxAuiManagerEvent& c) : wxEvent(c) - { - manager = c.manager; - pane = c.pane; - button = c.button; - veto_flag = c.veto_flag; - canveto_flag = c.canveto_flag; - dc = c.dc; - } -#endif - wxEvent *Clone() const wxOVERRIDE { return new wxAuiManagerEvent(*this); } - - void SetManager(wxAuiManager* mgr) { manager = mgr; } - void SetPane(wxAuiPaneInfo* p) { pane = p; } - void SetButton(int b) { button = b; } - void SetDC(wxDC* pdc) { dc = pdc; } - - wxAuiManager* GetManager() const { return manager; } - wxAuiPaneInfo* GetPane() const { return pane; } - int GetButton() const { return button; } - wxDC* GetDC() const { return dc; } - - void Veto(bool veto = true) { veto_flag = veto; } - bool GetVeto() const { return veto_flag; } - void SetCanVeto(bool can_veto) { canveto_flag = can_veto; } - bool CanVeto() const { return canveto_flag && veto_flag; } - -public: - wxAuiManager* manager; - wxAuiPaneInfo* pane; - int button; - bool veto_flag; - bool canveto_flag; - wxDC* dc; - -#ifndef SWIG -private: - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxAuiManagerEvent); -#endif -}; - - -class WXDLLIMPEXP_AUI wxAuiDockInfo -{ -public: - wxAuiDockInfo() - { - dock_direction = 0; - dock_layer = 0; - dock_row = 0; - size = 0; - min_size = 0; - resizable = true; - fixed = false; - toolbar = false; - reserved1 = false; - } - -#ifndef SWIG - wxAuiDockInfo(const wxAuiDockInfo& c) - { - dock_direction = c.dock_direction; - dock_layer = c.dock_layer; - dock_row = c.dock_row; - size = c.size; - min_size = c.min_size; - resizable = c.resizable; - fixed = c.fixed; - toolbar = c.toolbar; - panes = c.panes; - rect = c.rect; - reserved1 = c.reserved1; - } - - wxAuiDockInfo& operator=(const wxAuiDockInfo& c) - { - dock_direction = c.dock_direction; - dock_layer = c.dock_layer; - dock_row = c.dock_row; - size = c.size; - min_size = c.min_size; - resizable = c.resizable; - fixed = c.fixed; - toolbar = c.toolbar; - panes = c.panes; - rect = c.rect; - reserved1 = c.reserved1; - return *this; - } -#endif // SWIG - - bool IsOk() const { return dock_direction != 0; } - bool IsHorizontal() const { return dock_direction == wxAUI_DOCK_TOP || - dock_direction == wxAUI_DOCK_BOTTOM; } - bool IsVertical() const { return dock_direction == wxAUI_DOCK_LEFT || - dock_direction == wxAUI_DOCK_RIGHT || - dock_direction == wxAUI_DOCK_CENTER; } -public: - wxAuiPaneInfoPtrArray panes; // array of panes - wxRect rect; // current rectangle - int dock_direction; // dock direction (top, bottom, left, right, center) - int dock_layer; // layer number (0 = innermost layer) - int dock_row; // row number on the docking bar (0 = first row) - int size; // size of the dock - int min_size; // minimum size of a dock (0 if there is no min) - bool resizable; // flag indicating whether the dock is resizable - bool toolbar; // flag indicating dock contains only toolbars - bool fixed; // flag indicating that the dock operates on - // absolute coordinates as opposed to proportional - bool reserved1; -}; - - -class WXDLLIMPEXP_AUI wxAuiDockUIPart -{ -public: - enum - { - typeCaption, - typeGripper, - typeDock, - typeDockSizer, - typePane, - typePaneSizer, - typeBackground, - typePaneBorder, - typePaneButton - }; - - int type; // ui part type (see enum above) - int orientation; // orientation (either wxHORIZONTAL or wxVERTICAL) - wxAuiDockInfo* dock; // which dock the item is associated with - wxAuiPaneInfo* pane; // which pane the item is associated with - wxAuiPaneButton* button; // which pane button the item is associated with - wxSizer* cont_sizer; // the part's containing sizer - wxSizerItem* sizer_item; // the sizer item of the part - wxRect rect; // client coord rectangle of the part itself -}; - - -class WXDLLIMPEXP_AUI wxAuiPaneButton -{ -public: - int button_id; // id of the button (e.g. buttonClose) -}; - - - -#ifndef SWIG - -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_AUI, wxEVT_AUI_PANE_BUTTON, wxAuiManagerEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_AUI, wxEVT_AUI_PANE_CLOSE, wxAuiManagerEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_AUI, wxEVT_AUI_PANE_MAXIMIZE, wxAuiManagerEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_AUI, wxEVT_AUI_PANE_RESTORE, wxAuiManagerEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_AUI, wxEVT_AUI_PANE_ACTIVATED, wxAuiManagerEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_AUI, wxEVT_AUI_RENDER, wxAuiManagerEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_AUI, wxEVT_AUI_FIND_MANAGER, wxAuiManagerEvent ); - -typedef void (wxEvtHandler::*wxAuiManagerEventFunction)(wxAuiManagerEvent&); - -#define wxAuiManagerEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxAuiManagerEventFunction, func) - -#define EVT_AUI_PANE_BUTTON(func) \ - wx__DECLARE_EVT0(wxEVT_AUI_PANE_BUTTON, wxAuiManagerEventHandler(func)) -#define EVT_AUI_PANE_CLOSE(func) \ - wx__DECLARE_EVT0(wxEVT_AUI_PANE_CLOSE, wxAuiManagerEventHandler(func)) -#define EVT_AUI_PANE_MAXIMIZE(func) \ - wx__DECLARE_EVT0(wxEVT_AUI_PANE_MAXIMIZE, wxAuiManagerEventHandler(func)) -#define EVT_AUI_PANE_RESTORE(func) \ - wx__DECLARE_EVT0(wxEVT_AUI_PANE_RESTORE, wxAuiManagerEventHandler(func)) -#define EVT_AUI_PANE_ACTIVATED(func) \ - wx__DECLARE_EVT0(wxEVT_AUI_PANE_ACTIVATED, wxAuiManagerEventHandler(func)) -#define EVT_AUI_RENDER(func) \ - wx__DECLARE_EVT0(wxEVT_AUI_RENDER, wxAuiManagerEventHandler(func)) -#define EVT_AUI_FIND_MANAGER(func) \ - wx__DECLARE_EVT0(wxEVT_AUI_FIND_MANAGER, wxAuiManagerEventHandler(func)) - -#else - -%constant wxEventType wxEVT_AUI_PANE_BUTTON; -%constant wxEventType wxEVT_AUI_PANE_CLOSE; -%constant wxEventType wxEVT_AUI_PANE_MAXIMIZE; -%constant wxEventType wxEVT_AUI_PANE_RESTORE; -%constant wxEventType wxEVT_AUI_PANE_ACTIVATED; -%constant wxEventType wxEVT_AUI_RENDER; -%constant wxEventType wxEVT_AUI_FIND_MANAGER; - -%pythoncode { - EVT_AUI_PANE_BUTTON = wx.PyEventBinder( wxEVT_AUI_PANE_BUTTON ) - EVT_AUI_PANE_CLOSE = wx.PyEventBinder( wxEVT_AUI_PANE_CLOSE ) - EVT_AUI_PANE_MAXIMIZE = wx.PyEventBinder( wxEVT_AUI_PANE_MAXIMIZE ) - EVT_AUI_PANE_RESTORE = wx.PyEventBinder( wxEVT_AUI_PANE_RESTORE ) - EVT_AUI_PANE_ACTIVATED = wx.PyEventBinder( wxEVT_AUI_PANE_ACTIVATED ) - EVT_AUI_RENDER = wx.PyEventBinder( wxEVT_AUI_RENDER ) - EVT_AUI_FIND_MANAGER = wx.PyEventBinder( wxEVT_AUI_FIND_MANAGER ) -} -#endif // SWIG - -#endif // wxUSE_AUI -#endif //_WX_FRAMEMANAGER_H_ - diff --git a/Externals/wxWidgets3/include/wx/aui/tabart.h b/Externals/wxWidgets3/include/wx/aui/tabart.h deleted file mode 100644 index 11d919384b..0000000000 --- a/Externals/wxWidgets3/include/wx/aui/tabart.h +++ /dev/null @@ -1,330 +0,0 @@ -////////////////////////////////////////////////////////////////////////////// -// Name: wx/aui/tabart.h -// Purpose: wxaui: wx advanced user interface - notebook -// Author: Benjamin I. Williams -// Modified by: Jens Lody (extracted from wx/aui/auibook.h) -// Created: 2012-03-21 -// Copyright: (C) Copyright 2006, Kirix Corporation, All Rights Reserved. -// Licence: wxWindows Library Licence, Version 3.1 -/////////////////////////////////////////////////////////////////////////////// - - -#ifndef _WX_AUI_TABART_H_ -#define _WX_AUI_TABART_H_ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/defs.h" - -#if wxUSE_AUI - -#include "wx/colour.h" -#include "wx/gdicmn.h" -#include "wx/font.h" -#include "wx/pen.h" -#include "wx/brush.h" -#include "wx/bitmap.h" - - -class wxAuiNotebookPage; -class wxAuiNotebookPageArray; -class wxWindow; -class wxDC; - - -// tab art class - -class WXDLLIMPEXP_AUI wxAuiTabArt -{ -public: - - wxAuiTabArt() { } - virtual ~wxAuiTabArt() { } - - virtual wxAuiTabArt* Clone() = 0; - virtual void SetFlags(unsigned int flags) = 0; - - virtual void SetSizingInfo(const wxSize& tabCtrlSize, - size_t tabCount) = 0; - - virtual void SetNormalFont(const wxFont& font) = 0; - virtual void SetSelectedFont(const wxFont& font) = 0; - virtual void SetMeasuringFont(const wxFont& font) = 0; - virtual void SetColour(const wxColour& colour) = 0; - virtual void SetActiveColour(const wxColour& colour) = 0; - - virtual void DrawBorder( - wxDC& dc, - wxWindow* wnd, - const wxRect& rect) = 0; - - virtual void DrawBackground( - wxDC& dc, - wxWindow* wnd, - const wxRect& rect) = 0; - - virtual void DrawTab(wxDC& dc, - wxWindow* wnd, - const wxAuiNotebookPage& pane, - const wxRect& inRect, - int closeButtonState, - wxRect* outTabRect, - wxRect* outButtonRect, - int* xExtent) = 0; - - virtual void DrawButton( - wxDC& dc, - wxWindow* wnd, - const wxRect& inRect, - int bitmapId, - int buttonState, - int orientation, - wxRect* outRect) = 0; - - virtual wxSize GetTabSize( - wxDC& dc, - wxWindow* wnd, - const wxString& caption, - const wxBitmap& bitmap, - bool active, - int closeButtonState, - int* xExtent) = 0; - - virtual int ShowDropDown( - wxWindow* wnd, - const wxAuiNotebookPageArray& items, - int activeIdx) = 0; - - virtual int GetIndentSize() = 0; - - virtual int GetBorderWidth( - wxWindow* wnd) = 0; - - virtual int GetAdditionalBorderSpace( - wxWindow* wnd) = 0; - - virtual int GetBestTabCtrlSize( - wxWindow* wnd, - const wxAuiNotebookPageArray& pages, - const wxSize& requiredBmpSize) = 0; -}; - - -class WXDLLIMPEXP_AUI wxAuiGenericTabArt : public wxAuiTabArt -{ - -public: - - wxAuiGenericTabArt(); - virtual ~wxAuiGenericTabArt(); - - wxAuiTabArt* Clone() wxOVERRIDE; - void SetFlags(unsigned int flags) wxOVERRIDE; - void SetSizingInfo(const wxSize& tabCtrlSize, - size_t tabCount) wxOVERRIDE; - - void SetNormalFont(const wxFont& font) wxOVERRIDE; - void SetSelectedFont(const wxFont& font) wxOVERRIDE; - void SetMeasuringFont(const wxFont& font) wxOVERRIDE; - void SetColour(const wxColour& colour) wxOVERRIDE; - void SetActiveColour(const wxColour& colour) wxOVERRIDE; - - void DrawBorder( - wxDC& dc, - wxWindow* wnd, - const wxRect& rect) wxOVERRIDE; - - void DrawBackground( - wxDC& dc, - wxWindow* wnd, - const wxRect& rect) wxOVERRIDE; - - void DrawTab(wxDC& dc, - wxWindow* wnd, - const wxAuiNotebookPage& pane, - const wxRect& inRect, - int closeButtonState, - wxRect* outTabRect, - wxRect* outButtonRect, - int* xExtent) wxOVERRIDE; - - void DrawButton( - wxDC& dc, - wxWindow* wnd, - const wxRect& inRect, - int bitmapId, - int buttonState, - int orientation, - wxRect* outRect) wxOVERRIDE; - - int GetIndentSize() wxOVERRIDE; - - int GetBorderWidth( - wxWindow* wnd) wxOVERRIDE; - - int GetAdditionalBorderSpace( - wxWindow* wnd) wxOVERRIDE; - - wxSize GetTabSize( - wxDC& dc, - wxWindow* wnd, - const wxString& caption, - const wxBitmap& bitmap, - bool active, - int closeButtonState, - int* xExtent) wxOVERRIDE; - - int ShowDropDown( - wxWindow* wnd, - const wxAuiNotebookPageArray& items, - int activeIdx) wxOVERRIDE; - - int GetBestTabCtrlSize(wxWindow* wnd, - const wxAuiNotebookPageArray& pages, - const wxSize& requiredBmpSize) wxOVERRIDE; - -protected: - - wxFont m_normalFont; - wxFont m_selectedFont; - wxFont m_measuringFont; - wxColour m_baseColour; - wxPen m_baseColourPen; - wxPen m_borderPen; - wxBrush m_baseColourBrush; - wxColour m_activeColour; - wxBitmap m_activeCloseBmp; - wxBitmap m_disabledCloseBmp; - wxBitmap m_activeLeftBmp; - wxBitmap m_disabledLeftBmp; - wxBitmap m_activeRightBmp; - wxBitmap m_disabledRightBmp; - wxBitmap m_activeWindowListBmp; - wxBitmap m_disabledWindowListBmp; - - int m_fixedTabWidth; - int m_tabCtrlHeight; - unsigned int m_flags; -}; - - -class WXDLLIMPEXP_AUI wxAuiSimpleTabArt : public wxAuiTabArt -{ - -public: - - wxAuiSimpleTabArt(); - virtual ~wxAuiSimpleTabArt(); - - wxAuiTabArt* Clone() wxOVERRIDE; - void SetFlags(unsigned int flags) wxOVERRIDE; - - void SetSizingInfo(const wxSize& tabCtrlSize, - size_t tabCount) wxOVERRIDE; - - void SetNormalFont(const wxFont& font) wxOVERRIDE; - void SetSelectedFont(const wxFont& font) wxOVERRIDE; - void SetMeasuringFont(const wxFont& font) wxOVERRIDE; - void SetColour(const wxColour& colour) wxOVERRIDE; - void SetActiveColour(const wxColour& colour) wxOVERRIDE; - - void DrawBorder( - wxDC& dc, - wxWindow* wnd, - const wxRect& rect) wxOVERRIDE; - - void DrawBackground( - wxDC& dc, - wxWindow* wnd, - const wxRect& rect) wxOVERRIDE; - - void DrawTab(wxDC& dc, - wxWindow* wnd, - const wxAuiNotebookPage& pane, - const wxRect& inRect, - int closeButtonState, - wxRect* outTabRect, - wxRect* outButtonRect, - int* xExtent) wxOVERRIDE; - - void DrawButton( - wxDC& dc, - wxWindow* wnd, - const wxRect& inRect, - int bitmapId, - int buttonState, - int orientation, - wxRect* outRect) wxOVERRIDE; - - int GetIndentSize() wxOVERRIDE; - - int GetBorderWidth( - wxWindow* wnd) wxOVERRIDE; - - int GetAdditionalBorderSpace( - wxWindow* wnd) wxOVERRIDE; - - wxSize GetTabSize( - wxDC& dc, - wxWindow* wnd, - const wxString& caption, - const wxBitmap& bitmap, - bool active, - int closeButtonState, - int* xExtent) wxOVERRIDE; - - int ShowDropDown( - wxWindow* wnd, - const wxAuiNotebookPageArray& items, - int activeIdx) wxOVERRIDE; - - int GetBestTabCtrlSize(wxWindow* wnd, - const wxAuiNotebookPageArray& pages, - const wxSize& requiredBmpSize) wxOVERRIDE; - -protected: - - wxFont m_normalFont; - wxFont m_selectedFont; - wxFont m_measuringFont; - wxColour m_normalTextColour; - wxColour m_selectedTextColour; - wxPen m_normalBkPen; - wxPen m_selectedBkPen; - wxBrush m_normalBkBrush; - wxBrush m_selectedBkBrush; - wxBrush m_bkBrush; - wxBitmap m_activeCloseBmp; - wxBitmap m_disabledCloseBmp; - wxBitmap m_activeLeftBmp; - wxBitmap m_disabledLeftBmp; - wxBitmap m_activeRightBmp; - wxBitmap m_disabledRightBmp; - wxBitmap m_activeWindowListBmp; - wxBitmap m_disabledWindowListBmp; - - int m_fixedTabWidth; - unsigned int m_flags; -}; - -#ifndef __WXUNIVERSAL__ - #if defined(__WXGTK20__) && !defined(__WXGTK3__) - #define wxHAS_NATIVE_TABART - #include "wx/aui/tabartgtk.h" - #define wxAuiDefaultTabArt wxAuiGtkTabArt - #elif defined(__WXMSW__) - #define wxHAS_NATIVE_TABART - #include "wx/aui/tabartmsw.h" - #define wxAuiDefaultTabArt wxAuiMSWTabArt - #endif -#endif // !__WXUNIVERSAL__ - -#ifndef wxHAS_NATIVE_TABART - #define wxAuiDefaultTabArt wxAuiGenericTabArt -#endif - -#endif // wxUSE_AUI - -#endif // _WX_AUI_TABART_H_ diff --git a/Externals/wxWidgets3/include/wx/aui/tabartgtk.h b/Externals/wxWidgets3/include/wx/aui/tabartgtk.h deleted file mode 100644 index 13f42cb4a8..0000000000 --- a/Externals/wxWidgets3/include/wx/aui/tabartgtk.h +++ /dev/null @@ -1,58 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: include/wx/aui/tabartgtk.h -// Purpose: declaration of the wxAuiGTKTabArt -// Author: Jens Lody and Teodor Petrov -// Modified by: -// Created: 2012-03-23 -// Copyright: (c) 2012 Jens Lody -// and Teodor Petrov -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_AUI_TABARTGTK_H_ -#define _WX_AUI_TABARTGTK_H_ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/defs.h" - -#if wxUSE_AUI - -#include "wx/aui/tabart.h" -#include "wx/gdicmn.h" - -class wxWindow; -class wxDC; - -class WXDLLIMPEXP_AUI wxAuiGtkTabArt : public wxAuiGenericTabArt -{ -public: - wxAuiGtkTabArt(); - - virtual wxAuiTabArt* Clone() wxOVERRIDE; - virtual void DrawBorder(wxDC& dc, wxWindow* wnd, const wxRect& rect) wxOVERRIDE; - virtual void DrawBackground(wxDC& dc, wxWindow* wnd, const wxRect& rect) wxOVERRIDE; - virtual void DrawTab(wxDC& dc, - wxWindow* wnd, - const wxAuiNotebookPage& page, - const wxRect& in_rect, - int close_button_state, - wxRect* out_tab_rect, - wxRect* out_button_rect, - int* x_extent) wxOVERRIDE; - void DrawButton(wxDC& dc, wxWindow* wnd, const wxRect& in_rect, int bitmap_id, - int button_state, int orientation, wxRect* out_rect) wxOVERRIDE; - int GetBestTabCtrlSize(wxWindow* wnd, const wxAuiNotebookPageArray& pages, - const wxSize& required_bmp_size) wxOVERRIDE; - int GetBorderWidth(wxWindow* wnd) wxOVERRIDE; - int GetAdditionalBorderSpace(wxWindow* wnd) wxOVERRIDE; - virtual wxSize GetTabSize(wxDC& dc, wxWindow* wnd, const wxString& caption, - const wxBitmap& bitmap, bool active, - int close_button_state, int* x_extent) wxOVERRIDE; -}; - -#endif // wxUSE_AUI - -#endif // _WX_AUI_TABARTGTK_H_ diff --git a/Externals/wxWidgets3/include/wx/aui/tabartmsw.h b/Externals/wxWidgets3/include/wx/aui/tabartmsw.h deleted file mode 100644 index 41a47b267f..0000000000 --- a/Externals/wxWidgets3/include/wx/aui/tabartmsw.h +++ /dev/null @@ -1,90 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/aui/tabartmsw.h -// Purpose: wxAuiMSWTabArt declaration -// Author: Tobias Taschner -// Created: 2015-09-26 -// Copyright: (c) 2015 wxWidgets development team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_AUI_TABARTMSW_H_ -#define _WX_AUI_TABARTMSW_H_ - -class WXDLLIMPEXP_AUI wxAuiMSWTabArt : public wxAuiGenericTabArt -{ - -public: - - wxAuiMSWTabArt(); - virtual ~wxAuiMSWTabArt(); - - wxAuiTabArt* Clone() wxOVERRIDE; - void SetSizingInfo(const wxSize& tabCtrlSize, - size_t tabCount) wxOVERRIDE; - - void DrawBorder( - wxDC& dc, - wxWindow* wnd, - const wxRect& rect) wxOVERRIDE; - - void DrawBackground( - wxDC& dc, - wxWindow* wnd, - const wxRect& rect) wxOVERRIDE; - - void DrawTab(wxDC& dc, - wxWindow* wnd, - const wxAuiNotebookPage& pane, - const wxRect& inRect, - int closeButtonState, - wxRect* outTabRect, - wxRect* outButtonRect, - int* xExtent) wxOVERRIDE; - - void DrawButton( - wxDC& dc, - wxWindow* wnd, - const wxRect& inRect, - int bitmapId, - int buttonState, - int orientation, - wxRect* outRect) wxOVERRIDE; - - int GetIndentSize() wxOVERRIDE; - - int GetBorderWidth( - wxWindow* wnd) wxOVERRIDE; - - int GetAdditionalBorderSpace( - wxWindow* wnd) wxOVERRIDE; - - wxSize GetTabSize( - wxDC& dc, - wxWindow* wnd, - const wxString& caption, - const wxBitmap& bitmap, - bool active, - int closeButtonState, - int* xExtent) wxOVERRIDE; - - int ShowDropDown( - wxWindow* wnd, - const wxAuiNotebookPageArray& items, - int activeIdx) wxOVERRIDE; - - int GetBestTabCtrlSize(wxWindow* wnd, - const wxAuiNotebookPageArray& pages, - const wxSize& requiredBmpSize) wxOVERRIDE; - -private: - bool m_themed; - wxSize m_closeBtnSize; - wxSize m_tabSize; - int m_maxTabHeight; - - void InitSizes(wxWindow* wnd, wxDC& dc); - - bool IsThemed() const; -}; - -#endif // _WX_AUI_TABARTMSW_H_ diff --git a/Externals/wxWidgets3/include/wx/aui/tabmdi.h b/Externals/wxWidgets3/include/wx/aui/tabmdi.h deleted file mode 100644 index 2922d3a84b..0000000000 --- a/Externals/wxWidgets3/include/wx/aui/tabmdi.h +++ /dev/null @@ -1,270 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/aui/tabmdi.h -// Purpose: Generic MDI (Multiple Document Interface) classes -// Author: Hans Van Leemputten -// Modified by: Benjamin I. Williams / Kirix Corporation -// Created: 29/07/2002 -// Copyright: (c) Hans Van Leemputten -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_AUITABMDI_H_ -#define _WX_AUITABMDI_H_ - -#if wxUSE_AUI - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/frame.h" -#include "wx/panel.h" -#include "wx/notebook.h" -#include "wx/icon.h" -#include "wx/aui/auibook.h" - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_AUI wxAuiMDIParentFrame; -class WXDLLIMPEXP_FWD_AUI wxAuiMDIClientWindow; -class WXDLLIMPEXP_FWD_AUI wxAuiMDIChildFrame; - -//----------------------------------------------------------------------------- -// wxAuiMDIParentFrame -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_AUI wxAuiMDIParentFrame : public wxFrame -{ -public: - wxAuiMDIParentFrame(); - wxAuiMDIParentFrame(wxWindow *parent, - wxWindowID winid, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL, - const wxString& name = wxFrameNameStr); - - ~wxAuiMDIParentFrame(); - - bool Create(wxWindow *parent, - wxWindowID winid, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL, - const wxString& name = wxFrameNameStr ); - - void SetArtProvider(wxAuiTabArt* provider); - wxAuiTabArt* GetArtProvider(); - wxAuiNotebook* GetNotebook() const; - -#if wxUSE_MENUS - wxMenu* GetWindowMenu() const { return m_pWindowMenu; } - void SetWindowMenu(wxMenu* pMenu); - - virtual void SetMenuBar(wxMenuBar *pMenuBar) wxOVERRIDE; -#endif // wxUSE_MENUS - - void SetChildMenuBar(wxAuiMDIChildFrame *pChild); - - wxAuiMDIChildFrame *GetActiveChild() const; - void SetActiveChild(wxAuiMDIChildFrame* pChildFrame); - - wxAuiMDIClientWindow *GetClientWindow() const; - virtual wxAuiMDIClientWindow *OnCreateClient(); - - virtual void Cascade() { /* Has no effect */ } - virtual void Tile(wxOrientation orient = wxHORIZONTAL); - virtual void ArrangeIcons() { /* Has no effect */ } - virtual void ActivateNext(); - virtual void ActivatePrevious(); - -protected: - wxAuiMDIClientWindow* m_pClientWindow; - wxEvent* m_pLastEvt; - -#if wxUSE_MENUS - wxMenu *m_pWindowMenu; - wxMenuBar *m_pMyMenuBar; -#endif // wxUSE_MENUS - -protected: - void Init(); - -#if wxUSE_MENUS - void RemoveWindowMenu(wxMenuBar *pMenuBar); - void AddWindowMenu(wxMenuBar *pMenuBar); - - void DoHandleMenu(wxCommandEvent &event); - void DoHandleUpdateUI(wxUpdateUIEvent &event); -#endif // wxUSE_MENUS - - virtual bool ProcessEvent(wxEvent& event) wxOVERRIDE; - - virtual void DoGetClientSize(int *width, int *height) const wxOVERRIDE; - -private: - wxDECLARE_EVENT_TABLE(); - wxDECLARE_DYNAMIC_CLASS(wxAuiMDIParentFrame); -}; - -//----------------------------------------------------------------------------- -// wxAuiMDIChildFrame -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_AUI wxAuiMDIChildFrame : public wxPanel -{ -public: - wxAuiMDIChildFrame(); - wxAuiMDIChildFrame(wxAuiMDIParentFrame *parent, - wxWindowID winid, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr); - - virtual ~wxAuiMDIChildFrame(); - bool Create(wxAuiMDIParentFrame *parent, - wxWindowID winid, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr); - -#if wxUSE_MENUS - virtual void SetMenuBar(wxMenuBar *menuBar); - virtual wxMenuBar *GetMenuBar() const; -#endif // wxUSE_MENUS - - virtual void SetTitle(const wxString& title); - virtual wxString GetTitle() const; - - virtual void SetIcons(const wxIconBundle& icons); - virtual const wxIconBundle& GetIcons() const; - - virtual void SetIcon(const wxIcon& icon); - virtual const wxIcon& GetIcon() const; - - virtual void Activate(); - virtual bool Destroy() wxOVERRIDE; - - virtual bool Show(bool show = true) wxOVERRIDE; - -#if wxUSE_STATUSBAR - // no status bars - virtual wxStatusBar* CreateStatusBar(int WXUNUSED(number) = 1, - long WXUNUSED(style) = 1, - wxWindowID WXUNUSED(winid) = 1, - const wxString& WXUNUSED(name) = wxEmptyString) - { return NULL; } - - virtual wxStatusBar *GetStatusBar() const { return NULL; } - virtual void SetStatusText( const wxString &WXUNUSED(text), int WXUNUSED(number)=0 ) {} - virtual void SetStatusWidths( int WXUNUSED(n), const int WXUNUSED(widths_field)[] ) {} -#endif - -#if wxUSE_TOOLBAR - // no toolbar bars - virtual wxToolBar* CreateToolBar(long WXUNUSED(style), - wxWindowID WXUNUSED(winid), - const wxString& WXUNUSED(name)) - { return NULL; } - virtual wxToolBar *GetToolBar() const { return NULL; } -#endif - - - // no maximize etc - virtual void Maximize(bool WXUNUSED(maximize) = true) { /* Has no effect */ } - virtual void Restore() { /* Has no effect */ } - virtual void Iconize(bool WXUNUSED(iconize) = true) { /* Has no effect */ } - virtual bool IsMaximized() const { return true; } - virtual bool IsIconized() const { return false; } - virtual bool ShowFullScreen(bool WXUNUSED(show), long WXUNUSED(style)) { return false; } - virtual bool IsFullScreen() const { return false; } - - virtual bool IsTopLevel() const wxOVERRIDE { return false; } - - void OnMenuHighlight(wxMenuEvent& evt); - void OnActivate(wxActivateEvent& evt); - void OnCloseWindow(wxCloseEvent& evt); - - void SetMDIParentFrame(wxAuiMDIParentFrame* parent); - wxAuiMDIParentFrame* GetMDIParentFrame() const; - -protected: - void Init(); - virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags) wxOVERRIDE; - virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE; - - // no size hints - virtual void DoSetSizeHints(int WXUNUSED(minW), int WXUNUSED(minH), - int WXUNUSED(maxW), int WXUNUSED(maxH), - int WXUNUSED(incW), int WXUNUSED(incH)) wxOVERRIDE {} -public: - // This function needs to be called when a size change is confirmed, - // we needed this function to prevent anybody from the outside - // changing the panel... it messes the UI layout when we would allow it. - void ApplyMDIChildFrameRect(); - void DoShow(bool show); - -protected: - wxAuiMDIParentFrame* m_pMDIParentFrame; - wxRect m_mdiNewRect; - wxRect m_mdiCurRect; - wxString m_title; - wxIcon m_icon; - wxIconBundle m_iconBundle; - bool m_activateOnCreate; - -#if wxUSE_MENUS - wxMenuBar* m_pMenuBar; -#endif // wxUSE_MENUS - - - -private: - wxDECLARE_DYNAMIC_CLASS(wxAuiMDIChildFrame); - wxDECLARE_EVENT_TABLE(); - - friend class wxAuiMDIClientWindow; -}; - -//----------------------------------------------------------------------------- -// wxAuiMDIClientWindow -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_AUI wxAuiMDIClientWindow : public wxAuiNotebook -{ -public: - wxAuiMDIClientWindow(); - wxAuiMDIClientWindow(wxAuiMDIParentFrame *parent, long style = 0); - - virtual bool CreateClient(wxAuiMDIParentFrame *parent, - long style = wxVSCROLL | wxHSCROLL); - - virtual int SetSelection(size_t page) wxOVERRIDE; - virtual wxAuiMDIChildFrame* GetActiveChild(); - virtual void SetActiveChild(wxAuiMDIChildFrame* pChildFrame) - { - SetSelection(GetPageIndex(pChildFrame)); - } - -protected: - - void PageChanged(int oldSelection, int newSelection); - void OnPageClose(wxAuiNotebookEvent& evt); - void OnPageChanged(wxAuiNotebookEvent& evt); - void OnSize(wxSizeEvent& evt); - -private: - wxDECLARE_DYNAMIC_CLASS(wxAuiMDIClientWindow); - wxDECLARE_EVENT_TABLE(); -}; -#endif // wxUSE_AUI - -#endif // _WX_AUITABMDI_H_ diff --git a/Externals/wxWidgets3/include/wx/bannerwindow.h b/Externals/wxWidgets3/include/wx/bannerwindow.h deleted file mode 100644 index c65f801fd8..0000000000 --- a/Externals/wxWidgets3/include/wx/bannerwindow.h +++ /dev/null @@ -1,144 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/bannerwindow.h -// Purpose: wxBannerWindow class declaration -// Author: Vadim Zeitlin -// Created: 2011-08-16 -// Copyright: (c) 2011 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_BANNERWINDOW_H_ -#define _WX_BANNERWINDOW_H_ - -#include "wx/defs.h" - -#if wxUSE_BANNERWINDOW - -#include "wx/bitmap.h" -#include "wx/event.h" -#include "wx/window.h" - -class WXDLLIMPEXP_FWD_CORE wxBitmap; -class WXDLLIMPEXP_FWD_CORE wxColour; -class WXDLLIMPEXP_FWD_CORE wxDC; - -extern WXDLLIMPEXP_DATA_ADV(const char) wxBannerWindowNameStr[]; - -// ---------------------------------------------------------------------------- -// A simple banner window showing either a bitmap or text. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxBannerWindow : public wxWindow -{ -public: - // Default constructor, use Create() later. - wxBannerWindow() { Init(); } - - // Convenient constructor that should be used in the majority of cases. - // - // The banner orientation changes how the text in it is displayed and also - // defines where is the bitmap truncated if it's too big to fit but doesn't - // do anything for the banner position, this is supposed to be taken care - // of in the usual way, e.g. using sizers. - wxBannerWindow(wxWindow* parent, wxDirection dir = wxLEFT) - { - Init(); - - Create(parent, wxID_ANY, dir); - } - - // Full constructor provided for consistency with the other classes only. - wxBannerWindow(wxWindow* parent, - wxWindowID winid, - wxDirection dir = wxLEFT, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxBannerWindowNameStr) - { - Init(); - - Create(parent, winid, dir, pos, size, style, name); - } - - // Can be only called on objects created with the default constructor. - bool Create(wxWindow* parent, - wxWindowID winid, - wxDirection dir = wxLEFT, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxBannerWindowNameStr); - - - // Provide an existing bitmap to show. For wxLEFT orientation the bitmap is - // truncated from the top, for wxTOP and wxBOTTOM -- from the right and for - // wxRIGHT -- from the bottom, so put the most important part of the bitmap - // information in the opposite direction. - void SetBitmap(const wxBitmap& bmp); - - // Set the text to display. This is mutually exclusive with SetBitmap(). - // Title is rendered in bold and should be single line, message can have - // multiple lines but is not wrapped automatically. - void SetText(const wxString& title, const wxString& message); - - // Set the colours between which the gradient runs. This can be combined - // with SetText() but not SetBitmap(). - void SetGradient(const wxColour& start, const wxColour& end); - -protected: - virtual wxSize DoGetBestClientSize() const wxOVERRIDE; - -private: - // Common part of all constructors. - void Init(); - - // Fully invalidates the window. - void OnSize(wxSizeEvent& event); - - // Redraws the window using either m_bitmap or m_title/m_message. - void OnPaint(wxPaintEvent& event); - - // Helper of OnPaint(): draw the bitmap at the correct position depending - // on our orientation. - void DrawBitmapBackground(wxDC& dc); - - // Helper of OnPaint(): draw the text in the appropriate direction. - void DrawBannerTextLine(wxDC& dc, const wxString& str, const wxPoint& pos); - - // Return the font to use for the title. Currently this is hardcoded as a - // larger bold version of the standard window font but could be made - // configurable in the future. - wxFont GetTitleFont() const; - - // Return the colour to use for extending the bitmap. Non-const as it - // updates m_colBitmapBg if needed. - wxColour GetBitmapBg(); - - - // The window side along which the banner is laid out. - wxDirection m_direction; - - // If valid, this bitmap is drawn as is. - wxBitmap m_bitmap; - - // If bitmap is valid, this is the colour we use to extend it if the bitmap - // is smaller than this window. It is computed on demand by GetBitmapBg(). - wxColour m_colBitmapBg; - - // The title and main message to draw, used if m_bitmap is invalid. - wxString m_title, - m_message; - - // Start and stop gradient colours, only used when drawing text. - wxColour m_colStart, - m_colEnd; - - wxDECLARE_EVENT_TABLE(); - - wxDECLARE_NO_COPY_CLASS(wxBannerWindow); -}; - -#endif // wxUSE_BANNERWINDOW - -#endif // _WX_BANNERWINDOW_H_ diff --git a/Externals/wxWidgets3/include/wx/base64.h b/Externals/wxWidgets3/include/wx/base64.h deleted file mode 100644 index 14aaf7d83f..0000000000 --- a/Externals/wxWidgets3/include/wx/base64.h +++ /dev/null @@ -1,123 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/base64.h -// Purpose: declaration of BASE64 encoding/decoding functionality -// Author: Charles Reimers, Vadim Zeitlin -// Created: 2007-06-18 -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_BASE64_H_ -#define _WX_BASE64_H_ - -#include "wx/defs.h" - -#if wxUSE_BASE64 - -#include "wx/string.h" -#include "wx/buffer.h" - -// ---------------------------------------------------------------------------- -// encoding functions -// ---------------------------------------------------------------------------- - -// return the size needed for the buffer containing the encoded representation -// of a buffer of given length -inline size_t wxBase64EncodedSize(size_t len) { return 4*((len+2)/3); } - -// raw base64 encoding function which encodes the contents of a buffer of the -// specified length into the buffer of the specified size -// -// returns the length of the encoded data or wxCONV_FAILED if the buffer is not -// large enough; to determine the needed size you can either allocate a buffer -// of wxBase64EncodedSize(srcLen) size or call the function with NULL buffer in -// which case the required size will be returned -WXDLLIMPEXP_BASE size_t -wxBase64Encode(char *dst, size_t dstLen, const void *src, size_t srcLen); - -// encode the contents of the given buffer using base64 and return as string -// (there is no error return) -inline wxString wxBase64Encode(const void *src, size_t srcLen) -{ - const size_t dstLen = wxBase64EncodedSize(srcLen); - wxCharBuffer dst(dstLen); - wxBase64Encode(dst.data(), dstLen, src, srcLen); - - return dst; -} - -inline wxString wxBase64Encode(const wxMemoryBuffer& buf) -{ - return wxBase64Encode(buf.GetData(), buf.GetDataLen()); -} - -// ---------------------------------------------------------------------------- -// decoding functions -// ---------------------------------------------------------------------------- - -// elements of this enum specify the possible behaviours of wxBase64Decode() -// when an invalid character is encountered -enum wxBase64DecodeMode -{ - // normal behaviour: stop at any invalid characters - wxBase64DecodeMode_Strict, - - // skip whitespace characters - wxBase64DecodeMode_SkipWS, - - // the most lenient behaviour: simply ignore all invalid characters - wxBase64DecodeMode_Relaxed -}; - -// return the buffer size necessary for decoding a base64 string of the given -// length -inline size_t wxBase64DecodedSize(size_t srcLen) { return 3*srcLen/4; } - -// raw decoding function which decodes the contents of the string of specified -// length (or NUL-terminated by default) into the provided buffer of the given -// size -// -// the function normally stops at any character invalid inside a base64-encoded -// string (i.e. not alphanumeric nor '+' nor '/') but can be made to skip the -// whitespace or all invalid characters using its mode argument -// -// returns the length of the decoded data or wxCONV_FAILED if an error occurs -// such as the buffer is too small or the encoded string is invalid; in the -// latter case the posErr is filled with the position where the decoding -// stopped if it is not NULL -WXDLLIMPEXP_BASE size_t -wxBase64Decode(void *dst, size_t dstLen, - const char *src, size_t srcLen = wxNO_LEN, - wxBase64DecodeMode mode = wxBase64DecodeMode_Strict, - size_t *posErr = NULL); - -inline size_t -wxBase64Decode(void *dst, size_t dstLen, - const wxString& src, - wxBase64DecodeMode mode = wxBase64DecodeMode_Strict, - size_t *posErr = NULL) -{ - // don't use str.length() here as the ASCII buffer is shorter than it for - // strings with embedded NULs - return wxBase64Decode(dst, dstLen, src.ToAscii(), wxNO_LEN, mode, posErr); -} - -// decode the contents of the given string; the returned buffer is empty if an -// error occurs during decoding -WXDLLIMPEXP_BASE wxMemoryBuffer -wxBase64Decode(const char *src, size_t srcLen = wxNO_LEN, - wxBase64DecodeMode mode = wxBase64DecodeMode_Strict, - size_t *posErr = NULL); - -inline wxMemoryBuffer -wxBase64Decode(const wxString& src, - wxBase64DecodeMode mode = wxBase64DecodeMode_Strict, - size_t *posErr = NULL) -{ - // don't use str.length() here as the ASCII buffer is shorter than it for - // strings with embedded NULs - return wxBase64Decode(src.ToAscii(), wxNO_LEN, mode, posErr); -} - -#endif // wxUSE_BASE64 - -#endif // _WX_BASE64_H_ diff --git a/Externals/wxWidgets3/include/wx/beforestd.h b/Externals/wxWidgets3/include/wx/beforestd.h deleted file mode 100644 index 45c5b5bcba..0000000000 --- a/Externals/wxWidgets3/include/wx/beforestd.h +++ /dev/null @@ -1,58 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/beforestd.h -// Purpose: #include before STL headers -// Author: Vadim Zeitlin -// Modified by: -// Created: 07/07/03 -// Copyright: (c) 2003 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -/** - Unfortunately, when compiling at maximum warning level, the standard - headers themselves may generate warnings -- and really lots of them. So - before including them, this header should be included to temporarily - suppress the warnings and after this the header afterstd.h should be - included to enable them back again. - - Note that there are intentionally no inclusion guards in this file, because - it can be included several times. - */ - -// VC 7.x isn't as bad as VC6 and doesn't give these warnings but eVC (which -// defines _MSC_VER as 1201) does need to be included as it's VC6-like -#if defined(__VISUALC__) && __VISUALC__ <= 1201 - // these warning have to be disabled and not just temporarily disabled - // because they will be given at the end of the compilation of the - // current source and there is absolutely nothing we can do about them so - // disable them before warning(push) below - - // 'foo': unreferenced inline function has been removed - #pragma warning(disable:4514) - - // 'function' : function not inlined - #pragma warning(disable:4710) - - // 'id': identifier was truncated to 'num' characters in the debug info - #pragma warning(disable:4786) - - // we have to disable (and reenable in afterstd.h) this one because, - // even though it is of level 4, it is not disabled by warning(push, 1) - // below for VC7.1! - - // unreachable code - #pragma warning(disable:4702) - - #pragma warning(push, 1) -#endif // VC++ < 7 - -/** - GCC's visibility support is broken for libstdc++ in some older versions - (namely Debian/Ubuntu's GCC 4.1, see - https://bugs.launchpad.net/ubuntu/+source/gcc-4.1/+bug/109262). We fix it - here by mimicking newer versions' behaviour of using default visibility - for libstdc++ code. - */ -#if defined(HAVE_VISIBILITY) && defined(HAVE_BROKEN_LIBSTDCXX_VISIBILITY) - #pragma GCC visibility push(default) -#endif diff --git a/Externals/wxWidgets3/include/wx/bitmap.h b/Externals/wxWidgets3/include/wx/bitmap.h deleted file mode 100644 index 9032097bfe..0000000000 --- a/Externals/wxWidgets3/include/wx/bitmap.h +++ /dev/null @@ -1,321 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/bitmap.h -// Purpose: wxBitmap class interface -// Author: Vaclav Slavik -// Modified by: -// Created: 22.04.01 -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_BITMAP_H_BASE_ -#define _WX_BITMAP_H_BASE_ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/string.h" -#include "wx/gdicmn.h" // for wxBitmapType -#include "wx/colour.h" -#include "wx/image.h" - -class WXDLLIMPEXP_FWD_CORE wxBitmap; -class WXDLLIMPEXP_FWD_CORE wxBitmapHandler; -class WXDLLIMPEXP_FWD_CORE wxIcon; -class WXDLLIMPEXP_FWD_CORE wxMask; -class WXDLLIMPEXP_FWD_CORE wxPalette; -class WXDLLIMPEXP_FWD_CORE wxDC; - -// ---------------------------------------------------------------------------- -// wxVariant support -// ---------------------------------------------------------------------------- - -#if wxUSE_VARIANT -#include "wx/variant.h" -DECLARE_VARIANT_OBJECT_EXPORTED(wxBitmap,WXDLLIMPEXP_CORE) -#endif - -// ---------------------------------------------------------------------------- -// wxMask represents the transparent area of the bitmap -// ---------------------------------------------------------------------------- - -// TODO: all implementation of wxMask, except the generic one, -// do not derive from wxMaskBase,,, they should -class WXDLLIMPEXP_CORE wxMaskBase : public wxObject -{ -public: - // create the mask from bitmap pixels of the given colour - bool Create(const wxBitmap& bitmap, const wxColour& colour); - -#if wxUSE_PALETTE - // create the mask from bitmap pixels with the given palette index - bool Create(const wxBitmap& bitmap, int paletteIndex); -#endif // wxUSE_PALETTE - - // create the mask from the given mono bitmap - bool Create(const wxBitmap& bitmap); - -protected: - // this function is called from Create() to free the existing mask data - virtual void FreeData() = 0; - - // these functions must be overridden to implement the corresponding public - // Create() methods, they shouldn't call FreeData() as it's already called - // by the public wrappers - virtual bool InitFromColour(const wxBitmap& bitmap, - const wxColour& colour) = 0; - virtual bool InitFromMonoBitmap(const wxBitmap& bitmap) = 0; -}; - -#if defined(__WXDFB__) || \ - defined(__WXMAC__) || \ - defined(__WXGTK__) || \ - defined(__WXMOTIF__) || \ - defined(__WXX11__) || \ - defined(__WXQT__) - #define wxUSE_BITMAP_BASE 1 -#else - #define wxUSE_BITMAP_BASE 0 -#endif - -// a more readable way to tell -#define wxBITMAP_SCREEN_DEPTH (-1) - - -// ---------------------------------------------------------------------------- -// wxBitmapHelpers: container for various bitmap methods common to all ports. -// ---------------------------------------------------------------------------- - -// Unfortunately, currently wxBitmap does not inherit from wxBitmapBase on all -// platforms and this is not easy to fix. So we extract at least some common -// methods into this class from which both wxBitmapBase (and hence wxBitmap on -// all platforms where it does inherit from it) and wxBitmap in wxMSW and other -// exceptional ports (only wxPM and old wxCocoa) inherit. -class WXDLLIMPEXP_CORE wxBitmapHelpers -{ -public: - // Create a new wxBitmap from the PNG data in the given buffer. - static wxBitmap NewFromPNGData(const void* data, size_t size); -}; - - -// All ports except wxMSW use wxBitmapHandler and wxBitmapBase as -// base class for wxBitmapHandler; wxMSW uses wxGDIImageHandler as -// base class since it allows some code reuse there. -#if wxUSE_BITMAP_BASE - -// ---------------------------------------------------------------------------- -// wxBitmapHandler: class which knows how to create/load/save bitmaps in -// different formats -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxBitmapHandler : public wxObject -{ -public: - wxBitmapHandler() { m_type = wxBITMAP_TYPE_INVALID; } - virtual ~wxBitmapHandler() { } - - // NOTE: the following functions should be pure virtuals, but they aren't - // because otherwise almost all ports would have to implement - // them as "return false"... - - virtual bool Create(wxBitmap *WXUNUSED(bitmap), const void* WXUNUSED(data), - wxBitmapType WXUNUSED(type), int WXUNUSED(width), int WXUNUSED(height), - int WXUNUSED(depth) = 1) - { return false; } - - virtual bool LoadFile(wxBitmap *WXUNUSED(bitmap), const wxString& WXUNUSED(name), - wxBitmapType WXUNUSED(type), int WXUNUSED(desiredWidth), - int WXUNUSED(desiredHeight)) - { return false; } - - virtual bool SaveFile(const wxBitmap *WXUNUSED(bitmap), const wxString& WXUNUSED(name), - wxBitmapType WXUNUSED(type), const wxPalette *WXUNUSED(palette) = NULL) const - { return false; } - - void SetName(const wxString& name) { m_name = name; } - void SetExtension(const wxString& ext) { m_extension = ext; } - void SetType(wxBitmapType type) { m_type = type; } - const wxString& GetName() const { return m_name; } - const wxString& GetExtension() const { return m_extension; } - wxBitmapType GetType() const { return m_type; } - -private: - wxString m_name; - wxString m_extension; - wxBitmapType m_type; - - wxDECLARE_ABSTRACT_CLASS(wxBitmapHandler); -}; - -// ---------------------------------------------------------------------------- -// wxBitmap: class which represents platform-dependent bitmap (unlike wxImage) -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxBitmapBase : public wxGDIObject, - public wxBitmapHelpers -{ -public: - /* - Derived class must implement these: - - wxBitmap(); - wxBitmap(const wxBitmap& bmp); - wxBitmap(const char bits[], int width, int height, int depth = 1); - wxBitmap(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH); - wxBitmap(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH); - wxBitmap(const char* const* bits); - wxBitmap(const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM); - wxBitmap(const wxImage& image, int depth = wxBITMAP_SCREEN_DEPTH); - - static void InitStandardHandlers(); - */ - - virtual bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH) = 0; - virtual bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH) = 0; - virtual bool CreateScaled(int w, int h, int d, double logicalScale) - { return Create(wxRound(w*logicalScale), wxRound(h*logicalScale), d); } - - virtual int GetHeight() const = 0; - virtual int GetWidth() const = 0; - virtual int GetDepth() const = 0; - - wxSize GetSize() const - { return wxSize(GetWidth(), GetHeight()); } - - // support for scaled bitmaps - virtual double GetScaleFactor() const { return 1.0; } - virtual double GetScaledWidth() const { return GetWidth() / GetScaleFactor(); } - virtual double GetScaledHeight() const { return GetHeight() / GetScaleFactor(); } - virtual wxSize GetScaledSize() const - { return wxSize(wxRound(GetScaledWidth()), wxRound(GetScaledHeight())); } - -#if wxUSE_IMAGE - virtual wxImage ConvertToImage() const = 0; - - // Convert to disabled (dimmed) bitmap. - wxBitmap ConvertToDisabled(unsigned char brightness = 255) const; -#endif // wxUSE_IMAGE - - virtual wxMask *GetMask() const = 0; - virtual void SetMask(wxMask *mask) = 0; - - virtual wxBitmap GetSubBitmap(const wxRect& rect) const = 0; - - virtual bool SaveFile(const wxString &name, wxBitmapType type, - const wxPalette *palette = NULL) const = 0; - virtual bool LoadFile(const wxString &name, wxBitmapType type) = 0; - - /* - If raw bitmap access is supported (see wx/rawbmp.h), the following - methods should be implemented: - - virtual bool GetRawData(wxRawBitmapData *data) = 0; - virtual void UngetRawData(wxRawBitmapData *data) = 0; - */ - -#if wxUSE_PALETTE - virtual wxPalette *GetPalette() const = 0; - virtual void SetPalette(const wxPalette& palette) = 0; -#endif // wxUSE_PALETTE - - // copies the contents and mask of the given (colour) icon to the bitmap - virtual bool CopyFromIcon(const wxIcon& icon) = 0; - - // implementation: - virtual void SetHeight(int height) = 0; - virtual void SetWidth(int width) = 0; - virtual void SetDepth(int depth) = 0; - - // Format handling - static inline wxList& GetHandlers() { return sm_handlers; } - static void AddHandler(wxBitmapHandler *handler); - static void InsertHandler(wxBitmapHandler *handler); - static bool RemoveHandler(const wxString& name); - static wxBitmapHandler *FindHandler(const wxString& name); - static wxBitmapHandler *FindHandler(const wxString& extension, wxBitmapType bitmapType); - static wxBitmapHandler *FindHandler(wxBitmapType bitmapType); - - //static void InitStandardHandlers(); - // (wxBitmap must implement this one) - - static void CleanUpHandlers(); - - // this method is only used by the generic implementation of wxMask - // currently but could be useful elsewhere in the future: it can be - // overridden to quantize the colour to correspond to bitmap colour depth - // if necessary; default implementation simply returns the colour as is - virtual wxColour QuantizeColour(const wxColour& colour) const - { - return colour; - } - -protected: - static wxList sm_handlers; - - wxDECLARE_ABSTRACT_CLASS(wxBitmapBase); -}; - -#endif // wxUSE_BITMAP_BASE - - -// the wxBITMAP_DEFAULT_TYPE constant defines the default argument value -// for wxBitmap's ctor and wxBitmap::LoadFile() functions. -#if defined(__WXMSW__) - #define wxBITMAP_DEFAULT_TYPE wxBITMAP_TYPE_BMP_RESOURCE - #include "wx/msw/bitmap.h" -#elif defined(__WXMOTIF__) - #define wxBITMAP_DEFAULT_TYPE wxBITMAP_TYPE_XPM - #include "wx/x11/bitmap.h" -#elif defined(__WXGTK20__) - #ifdef __WINDOWS__ - #define wxBITMAP_DEFAULT_TYPE wxBITMAP_TYPE_BMP_RESOURCE - #else - #define wxBITMAP_DEFAULT_TYPE wxBITMAP_TYPE_XPM - #endif - #include "wx/gtk/bitmap.h" -#elif defined(__WXGTK__) - #define wxBITMAP_DEFAULT_TYPE wxBITMAP_TYPE_XPM - #include "wx/gtk1/bitmap.h" -#elif defined(__WXX11__) - #define wxBITMAP_DEFAULT_TYPE wxBITMAP_TYPE_XPM - #include "wx/x11/bitmap.h" -#elif defined(__WXDFB__) - #define wxBITMAP_DEFAULT_TYPE wxBITMAP_TYPE_BMP_RESOURCE - #include "wx/dfb/bitmap.h" -#elif defined(__WXMAC__) - #define wxBITMAP_DEFAULT_TYPE wxBITMAP_TYPE_PICT_RESOURCE - #include "wx/osx/bitmap.h" -#elif defined(__WXQT__) - #define wxBITMAP_DEFAULT_TYPE wxBITMAP_TYPE_XPM - #include "wx/qt/bitmap.h" -#endif - -#if wxUSE_IMAGE -inline -wxBitmap -#if wxUSE_BITMAP_BASE -wxBitmapBase:: -#else -wxBitmap:: -#endif -ConvertToDisabled(unsigned char brightness) const -{ - const wxImage imgDisabled = ConvertToImage().ConvertToDisabled(brightness); - return wxBitmap(imgDisabled, -1, GetScaleFactor()); -} -#endif // wxUSE_IMAGE - -// we must include generic mask.h after wxBitmap definition -#if defined(__WXDFB__) - #define wxUSE_GENERIC_MASK 1 -#else - #define wxUSE_GENERIC_MASK 0 -#endif - -#if wxUSE_GENERIC_MASK - #include "wx/generic/mask.h" -#endif - -#endif // _WX_BITMAP_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/bmpbuttn.h b/Externals/wxWidgets3/include/wx/bmpbuttn.h deleted file mode 100644 index 2aec670359..0000000000 --- a/Externals/wxWidgets3/include/wx/bmpbuttn.h +++ /dev/null @@ -1,132 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/bmpbuttn.h -// Purpose: wxBitmapButton class interface -// Author: Vadim Zeitlin -// Modified by: -// Created: 25.08.00 -// Copyright: (c) 2000 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_BMPBUTTON_H_BASE_ -#define _WX_BMPBUTTON_H_BASE_ - -#include "wx/defs.h" - -#if wxUSE_BMPBUTTON - -#include "wx/button.h" - -// FIXME: right now only wxMSW, wxGTK and wxOSX implement bitmap support in wxButton -// itself, this shouldn't be used for the other platforms neither -// when all of them do it -#if (defined(__WXMSW__) || defined(__WXGTK20__) || defined(__WXOSX__) || defined(__WXQT__)) && !defined(__WXUNIVERSAL__) - #define wxHAS_BUTTON_BITMAP -#endif - -class WXDLLIMPEXP_FWD_CORE wxBitmapButton; - -// ---------------------------------------------------------------------------- -// wxBitmapButton: a button which shows bitmaps instead of the usual string. -// It has different bitmaps for different states (focused/disabled/pressed) -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxBitmapButtonBase : public wxButton -{ -public: - wxBitmapButtonBase() - { -#ifndef wxHAS_BUTTON_BITMAP - m_marginX = - m_marginY = 0; -#endif // wxHAS_BUTTON_BITMAP - } - - bool Create(wxWindow *parent, - wxWindowID winid, - const wxPoint& pos, - const wxSize& size, - long style, - const wxValidator& validator, - const wxString& name) - { - // We use wxBU_NOTEXT to let the base class Create() know that we are - // not going to show the label: this is a hack needed for wxGTK where - // we can show both label and bitmap only with GTK 2.6+ but we always - // can show just one of them and this style allows us to choose which - // one we need. - // - // And we also use wxBU_EXACTFIT to avoid being resized up to the - // standard button size as this doesn't make sense for bitmap buttons - // which are not standard anyhow and should fit their bitmap size. - return wxButton::Create(parent, winid, "", - pos, size, - style | wxBU_NOTEXT | wxBU_EXACTFIT, - validator, name); - } - - // Special creation function for a standard "Close" bitmap. It allows to - // simply create a close button with the image appropriate for the current - // platform. - static wxBitmapButton* NewCloseButton(wxWindow* parent, wxWindowID winid); - - - // set/get the margins around the button - virtual void SetMargins(int x, int y) - { - DoSetBitmapMargins(x, y); - } - - int GetMarginX() const { return DoGetBitmapMargins().x; } - int GetMarginY() const { return DoGetBitmapMargins().y; } - -protected: -#ifndef wxHAS_BUTTON_BITMAP - // function called when any of the bitmaps changes - virtual void OnSetBitmap() { InvalidateBestSize(); Refresh(); } - - virtual wxBitmap DoGetBitmap(State which) const { return m_bitmaps[which]; } - virtual void DoSetBitmap(const wxBitmap& bitmap, State which) - { m_bitmaps[which] = bitmap; OnSetBitmap(); } - - virtual wxSize DoGetBitmapMargins() const - { - return wxSize(m_marginX, m_marginY); - } - - virtual void DoSetBitmapMargins(int x, int y) - { - m_marginX = x; - m_marginY = y; - } - - // the bitmaps for various states - wxBitmap m_bitmaps[State_Max]; - - // the margins around the bitmap - int m_marginX, - m_marginY; -#endif // !wxHAS_BUTTON_BITMAP - - wxDECLARE_NO_COPY_CLASS(wxBitmapButtonBase); -}; - -#if defined(__WXUNIVERSAL__) - #include "wx/univ/bmpbuttn.h" -#elif defined(__WXMSW__) - #include "wx/msw/bmpbuttn.h" -#elif defined(__WXMOTIF__) - #include "wx/motif/bmpbuttn.h" -#elif defined(__WXGTK20__) - #include "wx/gtk/bmpbuttn.h" -#elif defined(__WXGTK__) - #include "wx/gtk1/bmpbuttn.h" -#elif defined(__WXMAC__) - #include "wx/osx/bmpbuttn.h" -#elif defined(__WXQT__) - #include "wx/qt/bmpbuttn.h" -#endif - -#endif // wxUSE_BMPBUTTON - -#endif // _WX_BMPBUTTON_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/bmpcbox.h b/Externals/wxWidgets3/include/wx/bmpcbox.h deleted file mode 100644 index a5b9beeedb..0000000000 --- a/Externals/wxWidgets3/include/wx/bmpcbox.h +++ /dev/null @@ -1,125 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/bmpcbox.h -// Purpose: wxBitmapComboBox base header -// Author: Jaakko Salli -// Modified by: -// Created: Aug-31-2006 -// Copyright: (c) Jaakko Salli -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_BMPCBOX_H_BASE_ -#define _WX_BMPCBOX_H_BASE_ - - -#include "wx/defs.h" - -#if wxUSE_BITMAPCOMBOBOX - -#include "wx/bitmap.h" -#include "wx/dynarray.h" - -class WXDLLIMPEXP_FWD_CORE wxWindow; -class WXDLLIMPEXP_FWD_CORE wxItemContainer; - -// Define wxBITMAPCOMBOBOX_OWNERDRAWN_BASED for platforms which -// wxBitmapComboBox implementation utilizes ownerdrawn combobox -// (either native or generic). -#if !defined(__WXGTK20__) || defined(__WXUNIVERSAL__) - #define wxBITMAPCOMBOBOX_OWNERDRAWN_BASED - -class WXDLLIMPEXP_FWD_CORE wxDC; -#endif - -extern WXDLLIMPEXP_DATA_ADV(const char) wxBitmapComboBoxNameStr[]; - - -class WXDLLIMPEXP_ADV wxBitmapComboBoxBase -{ -public: - // ctors and such - wxBitmapComboBoxBase() { Init(); } - - virtual ~wxBitmapComboBoxBase() { } - - // Sets the image for the given item. - virtual void SetItemBitmap(unsigned int n, const wxBitmap& bitmap) = 0; - -#if !defined(wxBITMAPCOMBOBOX_OWNERDRAWN_BASED) - - // Returns the image of the item with the given index. - virtual wxBitmap GetItemBitmap(unsigned int n) const = 0; - - // Returns size of the image used in list - virtual wxSize GetBitmapSize() const = 0; - -private: - void Init() {} - -#else // wxBITMAPCOMBOBOX_OWNERDRAWN_BASED - - // Returns the image of the item with the given index. - virtual wxBitmap GetItemBitmap(unsigned int n) const; - - // Returns size of the image used in list - virtual wxSize GetBitmapSize() const - { - return m_usedImgSize; - } - -protected: - - // Returns pointer to the combobox item container - virtual wxItemContainer* GetItemContainer() = 0; - - // Return pointer to the owner-drawn combobox control - virtual wxWindow* GetControl() = 0; - - // wxItemContainer functions - void BCBDoClear(); - void BCBDoDeleteOneItem(unsigned int n); - - void DoSetItemBitmap(unsigned int n, const wxBitmap& bitmap); - - void DrawBackground(wxDC& dc, const wxRect& rect, int item, int flags) const; - void DrawItem(wxDC& dc, const wxRect& rect, int item, const wxString& text, - int flags) const; - wxCoord MeasureItem(size_t item) const; - - // Returns true if image size was affected - virtual bool OnAddBitmap(const wxBitmap& bitmap); - - // Recalculates amount of empty space needed in front of text - // in control itself. Returns number that can be passed to - // wxOwnerDrawnComboBox::SetCustomPaintWidth() and similar - // functions. - virtual int DetermineIndent(); - - void UpdateInternals(); - - wxArrayPtrVoid m_bitmaps; // Images associated with items - wxSize m_usedImgSize; // Size of bitmaps - - int m_imgAreaWidth; // Width and height of area next to text field - int m_fontHeight; - int m_indent; - -private: - void Init(); -#endif // !wxBITMAPCOMBOBOX_OWNERDRAWN_BASED/wxBITMAPCOMBOBOX_OWNERDRAWN_BASED -}; - - -#if defined(__WXUNIVERSAL__) - #include "wx/generic/bmpcbox.h" -#elif defined(__WXMSW__) - #include "wx/msw/bmpcbox.h" -#elif defined(__WXGTK20__) - #include "wx/gtk/bmpcbox.h" -#else - #include "wx/generic/bmpcbox.h" -#endif - -#endif // wxUSE_BITMAPCOMBOBOX - -#endif // _WX_BMPCBOX_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/bookctrl.h b/Externals/wxWidgets3/include/wx/bookctrl.h deleted file mode 100644 index 35d7bb45e9..0000000000 --- a/Externals/wxWidgets3/include/wx/bookctrl.h +++ /dev/null @@ -1,437 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/bookctrl.h -// Purpose: wxBookCtrlBase: common base class for wxList/Tree/Notebook -// Author: Vadim Zeitlin -// Modified by: -// Created: 19.08.03 -// Copyright: (c) 2003 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_BOOKCTRL_H_ -#define _WX_BOOKCTRL_H_ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/defs.h" - -#if wxUSE_BOOKCTRL - -#include "wx/control.h" -#include "wx/dynarray.h" -#include "wx/withimages.h" - -WX_DEFINE_EXPORTED_ARRAY_PTR(wxWindow *, wxArrayPages); - -class WXDLLIMPEXP_FWD_CORE wxImageList; -class WXDLLIMPEXP_FWD_CORE wxBookCtrlEvent; - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -// wxBookCtrl hit results -enum -{ - wxBK_HITTEST_NOWHERE = 1, // not on tab - wxBK_HITTEST_ONICON = 2, // on icon - wxBK_HITTEST_ONLABEL = 4, // on label - wxBK_HITTEST_ONITEM = 16, // on tab control but not on its icon or label - wxBK_HITTEST_ONPAGE = 8 // not on tab control, but over the selected page -}; - -// wxBookCtrl flags (common for wxNotebook, wxListbook, wxChoicebook, wxTreebook) -#define wxBK_DEFAULT 0x0000 -#define wxBK_TOP 0x0010 -#define wxBK_BOTTOM 0x0020 -#define wxBK_LEFT 0x0040 -#define wxBK_RIGHT 0x0080 -#define wxBK_ALIGN_MASK (wxBK_TOP | wxBK_BOTTOM | wxBK_LEFT | wxBK_RIGHT) - -// ---------------------------------------------------------------------------- -// wxBookCtrlBase -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxBookCtrlBase : public wxControl, - public wxWithImages -{ -public: - // construction - // ------------ - - wxBookCtrlBase() - { - Init(); - } - - wxBookCtrlBase(wxWindow *parent, - wxWindowID winid, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxEmptyString) - { - Init(); - - (void)Create(parent, winid, pos, size, style, name); - } - - // quasi ctor - bool Create(wxWindow *parent, - wxWindowID winid, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxEmptyString); - - - // accessors - // --------- - - // get number of pages in the dialog - virtual size_t GetPageCount() const { return m_pages.size(); } - - // get the panel which represents the given page - virtual wxWindow *GetPage(size_t n) const { return m_pages[n]; } - - // get the current page or NULL if none - wxWindow *GetCurrentPage() const - { - const int n = GetSelection(); - return n == wxNOT_FOUND ? NULL : GetPage(n); - } - - // get the currently selected page or wxNOT_FOUND if none - virtual int GetSelection() const { return m_selection; } - - // set/get the title of a page - virtual bool SetPageText(size_t n, const wxString& strText) = 0; - virtual wxString GetPageText(size_t n) const = 0; - - - // image list stuff: each page may have an image associated with it (all - // images belong to the same image list) - // --------------------------------------------------------------------- - - // sets/returns item's image index in the current image list - virtual int GetPageImage(size_t n) const = 0; - virtual bool SetPageImage(size_t n, int imageId) = 0; - - - // geometry - // -------- - - // resize the notebook so that all pages will have the specified size - virtual void SetPageSize(const wxSize& size); - - // return the size of the area needed to accommodate the controller - wxSize GetControllerSize() const; - - // calculate the size of the control from the size of its page - // - // by default this simply returns size enough to fit both the page and the - // controller - virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const; - - // get/set size of area between book control area and page area - unsigned int GetInternalBorder() const { return m_internalBorder; } - void SetInternalBorder(unsigned int border) { m_internalBorder = border; } - - // Sets/gets the margin around the controller - void SetControlMargin(int margin) { m_controlMargin = margin; } - int GetControlMargin() const { return m_controlMargin; } - - // returns true if we have wxBK_TOP or wxBK_BOTTOM style - bool IsVertical() const { return HasFlag(wxBK_BOTTOM | wxBK_TOP); } - - // set/get option to shrink to fit current page - void SetFitToCurrentPage(bool fit) { m_fitToCurrentPage = fit; } - bool GetFitToCurrentPage() const { return m_fitToCurrentPage; } - - // returns the sizer containing the control, if any - wxSizer* GetControlSizer() const { return m_controlSizer; } - - - // operations - // ---------- - - // remove one page from the control and delete it - virtual bool DeletePage(size_t n); - - // remove one page from the notebook, without deleting it - virtual bool RemovePage(size_t n) - { - DoInvalidateBestSize(); - return DoRemovePage(n) != NULL; - } - - // remove all pages and delete them - virtual bool DeleteAllPages() - { - m_selection = wxNOT_FOUND; - DoInvalidateBestSize(); - WX_CLEAR_ARRAY(m_pages); - return true; - } - - // adds a new page to the control - virtual bool AddPage(wxWindow *page, - const wxString& text, - bool bSelect = false, - int imageId = NO_IMAGE) - { - DoInvalidateBestSize(); - return InsertPage(GetPageCount(), page, text, bSelect, imageId); - } - - // the same as AddPage(), but adds the page at the specified position - virtual bool InsertPage(size_t n, - wxWindow *page, - const wxString& text, - bool bSelect = false, - int imageId = NO_IMAGE) = 0; - - // set the currently selected page, return the index of the previously - // selected one (or wxNOT_FOUND on error) - // - // NB: this function will generate PAGE_CHANGING/ED events - virtual int SetSelection(size_t n) = 0; - - // acts as SetSelection but does not generate events - virtual int ChangeSelection(size_t n) = 0; - - - // cycle thru the pages - void AdvanceSelection(bool forward = true) - { - int nPage = GetNextPage(forward); - if ( nPage != wxNOT_FOUND ) - { - // cast is safe because of the check above - SetSelection((size_t)nPage); - } - } - - // return the index of the given page or wxNOT_FOUND - int FindPage(const wxWindow* page) const; - - // hit test: returns which page is hit and, optionally, where (icon, label) - virtual int HitTest(const wxPoint& WXUNUSED(pt), - long * WXUNUSED(flags) = NULL) const - { - return wxNOT_FOUND; - } - - - // we do have multiple pages - virtual bool HasMultiplePages() const wxOVERRIDE { return true; } - - // we don't want focus for ourselves - virtual bool AcceptsFocus() const wxOVERRIDE { return false; } - - // returns true if the platform should explicitly apply a theme border - virtual bool CanApplyThemeBorder() const wxOVERRIDE { return false; } - -protected: - // flags for DoSetSelection() - enum - { - SetSelection_SendEvent = 1 - }; - - // choose the default border for this window - virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } - - // After the insertion of the page in the method InsertPage, calling this - // method sets the selection to the given page or the first one if there is - // still no selection. The "selection changed" event is sent only if - // bSelect is true, so when it is false, no event is sent even if the - // selection changed from wxNOT_FOUND to 0 when inserting the first page. - // - // Returns true if the selection was set to the specified page (explicitly - // because of bSelect == true or implicitly because it's the first page) or - // false otherwise. - bool DoSetSelectionAfterInsertion(size_t n, bool bSelect); - - // Update the selection after removing the page at the given index, - // typically called from the derived class overridden DoRemovePage(). - void DoSetSelectionAfterRemoval(size_t n); - - // set the selection to the given page, sending the events (which can - // possibly prevent the page change from taking place) if SendEvent flag is - // included - virtual int DoSetSelection(size_t nPage, int flags = 0); - - // if the derived class uses DoSetSelection() for implementing - // [Set|Change]Selection, it must override UpdateSelectedPage(), - // CreatePageChangingEvent() and MakeChangedEvent(), but as it might not - // use it, these functions are not pure virtual - - // called to notify the control about a new current page - virtual void UpdateSelectedPage(size_t WXUNUSED(newsel)) - { wxFAIL_MSG(wxT("Override this function!")); } - - // create a new "page changing" event - virtual wxBookCtrlEvent* CreatePageChangingEvent() const - { wxFAIL_MSG(wxT("Override this function!")); return NULL; } - - // modify the event created by CreatePageChangingEvent() to "page changed" - // event, usually by just calling SetEventType() on it - virtual void MakeChangedEvent(wxBookCtrlEvent& WXUNUSED(event)) - { wxFAIL_MSG(wxT("Override this function!")); } - - - // The derived class also may override the following method, also called - // from DoSetSelection(), to show/hide pages differently. - virtual void DoShowPage(wxWindow* page, bool show) { page->Show(show); } - - - // Should we accept NULL page pointers in Add/InsertPage()? - // - // Default is no but derived classes may override it if they can treat NULL - // pages in some sensible way (e.g. wxTreebook overrides this to allow - // having nodes without any associated page) - virtual bool AllowNullPage() const { return false; } - - // Remove the page and return a pointer to it. - // - // It also needs to update the current selection if necessary, i.e. if the - // page being removed comes before the selected one and the helper method - // DoSetSelectionAfterRemoval() can be used for this. - virtual wxWindow *DoRemovePage(size_t page) = 0; - - // our best size is the size which fits all our pages - virtual wxSize DoGetBestSize() const wxOVERRIDE; - - // helper: get the next page wrapping if we reached the end - int GetNextPage(bool forward) const; - - // Lay out controls - virtual void DoSize(); - - // This method also invalidates the size of the controller and should be - // called instead of just InvalidateBestSize() whenever pages are added or - // removed as this also affects the controller - void DoInvalidateBestSize(); - -#if wxUSE_HELP - // Show the help for the corresponding page - void OnHelp(wxHelpEvent& event); -#endif // wxUSE_HELP - - - // the array of all pages of this control - wxArrayPages m_pages; - - // get the page area - virtual wxRect GetPageRect() const; - - // event handlers - void OnSize(wxSizeEvent& event); - - // controller buddy if available, NULL otherwise (usually for native book controls like wxNotebook) - wxControl *m_bookctrl; - - // Whether to shrink to fit current page - bool m_fitToCurrentPage; - - // the sizer containing the choice control - wxSizer *m_controlSizer; - - // the margin around the choice control - int m_controlMargin; - - // The currently selected page (in range 0..m_pages.size()-1 inclusive) or - // wxNOT_FOUND if none (this can normally only be the case for an empty - // control without any pages). - int m_selection; - -private: - - // common part of all ctors - void Init(); - - // internal border - unsigned int m_internalBorder; - - wxDECLARE_ABSTRACT_CLASS(wxBookCtrlBase); - wxDECLARE_NO_COPY_CLASS(wxBookCtrlBase); - - wxDECLARE_EVENT_TABLE(); -}; - -// ---------------------------------------------------------------------------- -// wxBookCtrlEvent: page changing events generated by book classes -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxBookCtrlEvent : public wxNotifyEvent -{ -public: - wxBookCtrlEvent(wxEventType commandType = wxEVT_NULL, int winid = 0, - int nSel = wxNOT_FOUND, int nOldSel = wxNOT_FOUND) - : wxNotifyEvent(commandType, winid) - { - m_nSel = nSel; - m_nOldSel = nOldSel; - } - - wxBookCtrlEvent(const wxBookCtrlEvent& event) - : wxNotifyEvent(event) - { - m_nSel = event.m_nSel; - m_nOldSel = event.m_nOldSel; - } - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxBookCtrlEvent(*this); } - - // accessors - // the currently selected page (wxNOT_FOUND if none) - int GetSelection() const { return m_nSel; } - void SetSelection(int nSel) { m_nSel = nSel; } - // the page that was selected before the change (wxNOT_FOUND if none) - int GetOldSelection() const { return m_nOldSel; } - void SetOldSelection(int nOldSel) { m_nOldSel = nOldSel; } - -private: - int m_nSel, // currently selected page - m_nOldSel; // previously selected page - - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxBookCtrlEvent); -}; - -typedef void (wxEvtHandler::*wxBookCtrlEventFunction)(wxBookCtrlEvent&); - -#define wxBookCtrlEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxBookCtrlEventFunction, func) - -// obsolete name, defined for compatibility only -#define wxBookCtrlBaseEvent wxBookCtrlEvent - -// make a default book control for given platform -#if wxUSE_NOTEBOOK - // dedicated to majority of desktops - #include "wx/notebook.h" - #define wxBookCtrl wxNotebook - #define wxEVT_BOOKCTRL_PAGE_CHANGED wxEVT_NOTEBOOK_PAGE_CHANGED - #define wxEVT_BOOKCTRL_PAGE_CHANGING wxEVT_NOTEBOOK_PAGE_CHANGING - #define EVT_BOOKCTRL_PAGE_CHANGED(id, fn) EVT_NOTEBOOK_PAGE_CHANGED(id, fn) - #define EVT_BOOKCTRL_PAGE_CHANGING(id, fn) EVT_NOTEBOOK_PAGE_CHANGING(id, fn) -#else - // dedicated to Smartphones - #include "wx/choicebk.h" - #define wxBookCtrl wxChoicebook - #define wxEVT_BOOKCTRL_PAGE_CHANGED wxEVT_CHOICEBOOK_PAGE_CHANGED - #define wxEVT_BOOKCTRL_PAGE_CHANGING wxEVT_CHOICEBOOK_PAGE_CHANGING - #define EVT_BOOKCTRL_PAGE_CHANGED(id, fn) EVT_CHOICEBOOK_PAGE_CHANGED(id, fn) - #define EVT_BOOKCTRL_PAGE_CHANGING(id, fn) EVT_CHOICEBOOK_PAGE_CHANGING(id, fn) -#endif - -// old wxEVT_COMMAND_* constants -#define wxEVT_COMMAND_BOOKCTRL_PAGE_CHANGED wxEVT_BOOKCTRL_PAGE_CHANGED -#define wxEVT_COMMAND_BOOKCTRL_PAGE_CHANGING wxEVT_BOOKCTRL_PAGE_CHANGING - -#endif // wxUSE_BOOKCTRL - -#endif // _WX_BOOKCTRL_H_ diff --git a/Externals/wxWidgets3/include/wx/brush.h b/Externals/wxWidgets3/include/wx/brush.h deleted file mode 100644 index c4fb1da273..0000000000 --- a/Externals/wxWidgets3/include/wx/brush.h +++ /dev/null @@ -1,127 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/brush.h -// Purpose: Includes platform-specific wxBrush file -// Author: Julian Smart -// Modified by: -// Created: -// Copyright: Julian Smart -// Licence: wxWindows Licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_BRUSH_H_BASE_ -#define _WX_BRUSH_H_BASE_ - -#include "wx/defs.h" -#include "wx/object.h" -#include "wx/gdiobj.h" -#include "wx/gdicmn.h" // for wxGDIObjListBase - -// NOTE: these values cannot be combined together! -enum wxBrushStyle -{ - wxBRUSHSTYLE_INVALID = -1, - - wxBRUSHSTYLE_SOLID = wxSOLID, - wxBRUSHSTYLE_TRANSPARENT = wxTRANSPARENT, - wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE = wxSTIPPLE_MASK_OPAQUE, - wxBRUSHSTYLE_STIPPLE_MASK = wxSTIPPLE_MASK, - wxBRUSHSTYLE_STIPPLE = wxSTIPPLE, - wxBRUSHSTYLE_BDIAGONAL_HATCH = wxHATCHSTYLE_BDIAGONAL, - wxBRUSHSTYLE_CROSSDIAG_HATCH = wxHATCHSTYLE_CROSSDIAG, - wxBRUSHSTYLE_FDIAGONAL_HATCH = wxHATCHSTYLE_FDIAGONAL, - wxBRUSHSTYLE_CROSS_HATCH = wxHATCHSTYLE_CROSS, - wxBRUSHSTYLE_HORIZONTAL_HATCH = wxHATCHSTYLE_HORIZONTAL, - wxBRUSHSTYLE_VERTICAL_HATCH = wxHATCHSTYLE_VERTICAL, - wxBRUSHSTYLE_FIRST_HATCH = wxHATCHSTYLE_FIRST, - wxBRUSHSTYLE_LAST_HATCH = wxHATCHSTYLE_LAST -}; - - -// wxBrushBase -class WXDLLIMPEXP_CORE wxBrushBase: public wxGDIObject -{ -public: - virtual ~wxBrushBase() { } - - virtual void SetColour(const wxColour& col) = 0; - virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) = 0; - virtual void SetStyle(wxBrushStyle style) = 0; - virtual void SetStipple(const wxBitmap& stipple) = 0; - - virtual wxColour GetColour() const = 0; - virtual wxBrushStyle GetStyle() const = 0; - virtual wxBitmap *GetStipple() const = 0; - - virtual bool IsHatch() const - { return (GetStyle()>=wxBRUSHSTYLE_FIRST_HATCH) && (GetStyle()<=wxBRUSHSTYLE_LAST_HATCH); } - - // Convenient helpers for testing whether the brush is a transparent one: - // unlike GetStyle() == wxBRUSHSTYLE_TRANSPARENT, they work correctly even - // if the brush is invalid (they both return false in this case). - bool IsTransparent() const - { - return IsOk() && GetStyle() == wxBRUSHSTYLE_TRANSPARENT; - } - - bool IsNonTransparent() const - { - return IsOk() && GetStyle() != wxBRUSHSTYLE_TRANSPARENT; - } -}; - -#if defined(__WXMSW__) - #include "wx/msw/brush.h" -#elif defined(__WXMOTIF__) || defined(__WXX11__) - #include "wx/x11/brush.h" -#elif defined(__WXGTK20__) - #include "wx/gtk/brush.h" -#elif defined(__WXGTK__) - #include "wx/gtk1/brush.h" -#elif defined(__WXDFB__) - #include "wx/dfb/brush.h" -#elif defined(__WXMAC__) - #include "wx/osx/brush.h" -#elif defined(__WXQT__) - #include "wx/qt/brush.h" -#endif - -class WXDLLIMPEXP_CORE wxBrushList: public wxGDIObjListBase -{ -public: - wxBrush *FindOrCreateBrush(const wxColour& colour, - wxBrushStyle style = wxBRUSHSTYLE_SOLID); - - wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants") - wxBrush *FindOrCreateBrush(const wxColour& colour, int style) - { return FindOrCreateBrush(colour, (wxBrushStyle)style); } -}; - -extern WXDLLIMPEXP_DATA_CORE(wxBrushList*) wxTheBrushList; - -// provide comparison operators to allow code such as -// -// if ( brush.GetStyle() == wxTRANSPARENT ) -// -// to compile without warnings which it would otherwise provoke from some -// compilers as it compares elements of different enums - -// Unfortunately some compilers have ambiguity issues when enum comparisons are -// overloaded so we have to disable the overloads in this case, see -// wxCOMPILER_NO_OVERLOAD_ON_ENUM definition in wx/platform.h for more details. -#ifndef wxCOMPILER_NO_OVERLOAD_ON_ENUM - -wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants only") -inline bool operator==(wxBrushStyle s, wxDeprecatedGUIConstants t) -{ - return static_cast(s) == static_cast(t); -} - -wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants only") -inline bool operator!=(wxBrushStyle s, wxDeprecatedGUIConstants t) -{ - return static_cast(s) != static_cast(t); -} - -#endif // wxCOMPILER_NO_OVERLOAD_ON_ENUM - -#endif // _WX_BRUSH_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/buffer.h b/Externals/wxWidgets3/include/wx/buffer.h deleted file mode 100644 index ca6b340084..0000000000 --- a/Externals/wxWidgets3/include/wx/buffer.h +++ /dev/null @@ -1,622 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/buffer.h -// Purpose: auto buffer classes: buffers which automatically free memory -// Author: Vadim Zeitlin -// Modified by: -// Created: 12.04.99 -// Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_BUFFER_H -#define _WX_BUFFER_H - -#include "wx/chartype.h" -#include "wx/wxcrtbase.h" - -#include // malloc() and free() - -class WXDLLIMPEXP_FWD_BASE wxCStrData; - -// ---------------------------------------------------------------------------- -// Special classes for (wide) character strings: they use malloc/free instead -// of new/delete -// ---------------------------------------------------------------------------- - -// helpers used by wxCharTypeBuffer -namespace wxPrivate -{ - -struct UntypedBufferData -{ - enum Kind - { - Owned, - NonOwned - }; - - UntypedBufferData(void *str, size_t len, Kind kind = Owned) - : m_str(str), m_length(len), m_ref(1), m_owned(kind == Owned) {} - - ~UntypedBufferData() - { - if ( m_owned ) - free(m_str); - } - - void *m_str; - size_t m_length; - - // "short" to have sizeof(Data)=12 on 32bit archs - unsigned short m_ref; - - bool m_owned; -}; - -// NB: this is defined in string.cpp and not the (non-existent) buffer.cpp -WXDLLIMPEXP_BASE UntypedBufferData * GetUntypedNullData(); - -} // namespace wxPrivate - - -// Reference-counted character buffer for storing string data. The buffer -// is only valid for as long as the "parent" object that provided the data -// is valid; see wxCharTypeBuffer for persistent variant. -template -class wxScopedCharTypeBuffer -{ -public: - typedef T CharType; - - wxScopedCharTypeBuffer() - { - m_data = GetNullData(); - } - - // Creates "non-owned" buffer, i.e. 'str' is not owned by the buffer - // and doesn't get freed by dtor. Used e.g. to point to wxString's internal - // storage. - static - const wxScopedCharTypeBuffer CreateNonOwned(const CharType *str, - size_t len = wxNO_LEN) - { - if ( len == wxNO_LEN ) - len = wxStrlen(str); - - wxScopedCharTypeBuffer buf; - if ( str ) - buf.m_data = new Data(const_cast(str), len, Data::NonOwned); - return buf; - } - - // Creates "owned" buffer, i.e. takes over ownership of 'str' and frees it - // in dtor (if ref.count reaches 0). - static - const wxScopedCharTypeBuffer CreateOwned(CharType *str, - size_t len = wxNO_LEN ) - { - if ( len == wxNO_LEN ) - len = wxStrlen(str); - - wxScopedCharTypeBuffer buf; - if ( str ) - buf.m_data = new Data(str, len); - return buf; - } - - wxScopedCharTypeBuffer(const wxScopedCharTypeBuffer& src) - { - m_data = src.m_data; - IncRef(); - } - - wxScopedCharTypeBuffer& operator=(const wxScopedCharTypeBuffer& src) - { - if ( &src == this ) - return *this; - - DecRef(); - m_data = src.m_data; - IncRef(); - - return *this; - } - - ~wxScopedCharTypeBuffer() - { - DecRef(); - } - - // NB: this method is only const for backward compatibility. It used to - // be needed for auto_ptr-like semantics of the copy ctor, but now - // that ref-counting is used, it's not really needed. - CharType *release() const - { - if ( m_data == GetNullData() ) - return NULL; - - wxASSERT_MSG( m_data->m_owned, wxT("can't release non-owned buffer") ); - wxASSERT_MSG( m_data->m_ref == 1, wxT("can't release shared buffer") ); - - CharType * const p = m_data->Get(); - - wxScopedCharTypeBuffer *self = const_cast(this); - self->m_data->Set(NULL, 0); - self->DecRef(); - - return p; - } - - void reset() - { - DecRef(); - } - - CharType *data() { return m_data->Get(); } - const CharType *data() const { return m_data->Get(); } - operator const CharType *() const { return data(); } - CharType operator[](size_t n) const { return data()[n]; } - - size_t length() const { return m_data->m_length; } - -protected: - // reference-counted data - struct Data : public wxPrivate::UntypedBufferData - { - Data(CharType *str, size_t len, Kind kind = Owned) - : wxPrivate::UntypedBufferData(str, len, kind) - { - } - - CharType *Get() const { return static_cast(m_str); } - void Set(CharType *str, size_t len) - { - m_str = str; - m_length = len; - } - }; - - // placeholder for NULL string, to simplify this code - static Data *GetNullData() - { - return static_cast(wxPrivate::GetUntypedNullData()); - } - - void IncRef() - { - if ( m_data == GetNullData() ) // exception, not ref-counted - return; - m_data->m_ref++; - } - - void DecRef() - { - if ( m_data == GetNullData() ) // exception, not ref-counted - return; - if ( --m_data->m_ref == 0 ) - delete m_data; - m_data = GetNullData(); - } - - // sets this object to a be copy of 'other'; if 'src' is non-owned, - // a deep copy is made and 'this' will contain new instance of the data - void MakeOwnedCopyOf(const wxScopedCharTypeBuffer& src) - { - this->DecRef(); - - if ( src.m_data == this->GetNullData() ) - { - this->m_data = this->GetNullData(); - } - else if ( src.m_data->m_owned ) - { - this->m_data = src.m_data; - this->IncRef(); - } - else - { - // if the scoped buffer had non-owned data, we have to make - // a copy here, because src.m_data->m_str is valid only for as long - // as 'src' exists - this->m_data = new Data - ( - StrCopy(src.data(), src.length()), - src.length() - ); - } - } - - static CharType *StrCopy(const CharType *src, size_t len) - { - CharType *dst = (CharType*)malloc(sizeof(CharType) * (len + 1)); - if ( dst ) - memcpy(dst, src, sizeof(CharType) * (len + 1)); - return dst; - } - -protected: - Data *m_data; -}; - -typedef wxScopedCharTypeBuffer wxScopedCharBuffer; -typedef wxScopedCharTypeBuffer wxScopedWCharBuffer; - - -// this buffer class always stores data in "owned" (persistent) manner -template -class wxCharTypeBuffer : public wxScopedCharTypeBuffer -{ -protected: - typedef typename wxScopedCharTypeBuffer::Data Data; - -public: - typedef T CharType; - - wxCharTypeBuffer(const CharType *str = NULL, size_t len = wxNO_LEN) - { - if ( str ) - { - if ( len == wxNO_LEN ) - len = wxStrlen(str); - this->m_data = new Data(this->StrCopy(str, len), len); - } - else - { - this->m_data = this->GetNullData(); - } - } - - wxCharTypeBuffer(size_t len) - { - CharType* const str = (CharType *)malloc((len + 1)*sizeof(CharType)); - if ( str ) - { - str[len] = (CharType)0; - - // There is a potential memory leak here if new throws because it - // fails to allocate Data, we ought to use new(nothrow) here, but - // this might fail to compile under some platforms so until this - // can be fully tested, just live with this (rather unlikely, as - // Data is a small object) potential leak. - this->m_data = new Data(str, len); - } - else - { - this->m_data = this->GetNullData(); - } - } - - wxCharTypeBuffer(const wxCharTypeBuffer& src) - : wxScopedCharTypeBuffer(src) {} - - wxCharTypeBuffer& operator=(const CharType *str) - { - this->DecRef(); - - if ( str ) - this->m_data = new Data(wxStrdup(str), wxStrlen(str)); - return *this; - } - - wxCharTypeBuffer& operator=(const wxCharTypeBuffer& src) - { - wxScopedCharTypeBuffer::operator=(src); - return *this; - } - - wxCharTypeBuffer(const wxScopedCharTypeBuffer& src) - { - this->MakeOwnedCopyOf(src); - } - - wxCharTypeBuffer& operator=(const wxScopedCharTypeBuffer& src) - { - MakeOwnedCopyOf(src); - return *this; - } - - bool extend(size_t len) - { - wxASSERT_MSG( this->m_data->m_owned, "cannot extend non-owned buffer" ); - wxASSERT_MSG( this->m_data->m_ref == 1, "can't extend shared buffer" ); - - CharType *str = - (CharType *)realloc(this->data(), (len + 1) * sizeof(CharType)); - if ( !str ) - return false; - - // For consistency with the ctor taking just the length, NUL-terminate - // the buffer. - str[len] = (CharType)0; - - if ( this->m_data == this->GetNullData() ) - { - this->m_data = new Data(str, len); - } - else - { - this->m_data->Set(str, len); - this->m_data->m_owned = true; - } - - return true; - } - - void shrink(size_t len) - { - wxASSERT_MSG( this->m_data->m_owned, "cannot shrink non-owned buffer" ); - wxASSERT_MSG( this->m_data->m_ref == 1, "can't shrink shared buffer" ); - - wxASSERT( len <= this->length() ); - - this->m_data->m_length = len; - this->data()[len] = 0; - } -}; - -class wxCharBuffer : public wxCharTypeBuffer -{ -public: - typedef wxCharTypeBuffer wxCharTypeBufferBase; - typedef wxScopedCharTypeBuffer wxScopedCharTypeBufferBase; - - wxCharBuffer(const wxCharTypeBufferBase& buf) - : wxCharTypeBufferBase(buf) {} - wxCharBuffer(const wxScopedCharTypeBufferBase& buf) - : wxCharTypeBufferBase(buf) {} - - wxCharBuffer(const CharType *str = NULL) : wxCharTypeBufferBase(str) {} - wxCharBuffer(size_t len) : wxCharTypeBufferBase(len) {} - - wxCharBuffer(const wxCStrData& cstr); -}; - -class wxWCharBuffer : public wxCharTypeBuffer -{ -public: - typedef wxCharTypeBuffer wxCharTypeBufferBase; - typedef wxScopedCharTypeBuffer wxScopedCharTypeBufferBase; - - wxWCharBuffer(const wxCharTypeBufferBase& buf) - : wxCharTypeBufferBase(buf) {} - wxWCharBuffer(const wxScopedCharTypeBufferBase& buf) - : wxCharTypeBufferBase(buf) {} - - wxWCharBuffer(const CharType *str = NULL) : wxCharTypeBufferBase(str) {} - wxWCharBuffer(size_t len) : wxCharTypeBufferBase(len) {} - - wxWCharBuffer(const wxCStrData& cstr); -}; - -// wxCharTypeBuffer implicitly convertible to T* -template -class wxWritableCharTypeBuffer : public wxCharTypeBuffer -{ -public: - typedef typename wxScopedCharTypeBuffer::CharType CharType; - - wxWritableCharTypeBuffer(const wxScopedCharTypeBuffer& src) - : wxCharTypeBuffer(src) {} - // FIXME-UTF8: this won't be needed after converting mb_str()/wc_str() to - // always return a buffer - // + we should derive this class from wxScopedCharTypeBuffer - // then - wxWritableCharTypeBuffer(const CharType *str = NULL) - : wxCharTypeBuffer(str) {} - - operator CharType*() { return this->data(); } -}; - -typedef wxWritableCharTypeBuffer wxWritableCharBuffer; -typedef wxWritableCharTypeBuffer wxWritableWCharBuffer; - - -#if wxUSE_UNICODE - #define wxWxCharBuffer wxWCharBuffer - - #define wxMB2WXbuf wxWCharBuffer - #define wxWX2MBbuf wxCharBuffer - #if wxUSE_UNICODE_WCHAR - #define wxWC2WXbuf wxChar* - #define wxWX2WCbuf wxChar* - #elif wxUSE_UNICODE_UTF8 - #define wxWC2WXbuf wxWCharBuffer - #define wxWX2WCbuf wxWCharBuffer - #endif -#else // ANSI - #define wxWxCharBuffer wxCharBuffer - - #define wxMB2WXbuf wxChar* - #define wxWX2MBbuf wxChar* - #define wxWC2WXbuf wxCharBuffer - #define wxWX2WCbuf wxWCharBuffer -#endif // Unicode/ANSI - -// ---------------------------------------------------------------------------- -// A class for holding growable data buffers (not necessarily strings) -// ---------------------------------------------------------------------------- - -// This class manages the actual data buffer pointer and is ref-counted. -class wxMemoryBufferData -{ -public: - // the initial size and also the size added by ResizeIfNeeded() - enum { DefBufSize = 1024 }; - - friend class wxMemoryBuffer; - - // everything is private as it can only be used by wxMemoryBuffer -private: - wxMemoryBufferData(size_t size = wxMemoryBufferData::DefBufSize) - : m_data(size ? malloc(size) : NULL), m_size(size), m_len(0), m_ref(0) - { - } - ~wxMemoryBufferData() { free(m_data); } - - - void ResizeIfNeeded(size_t newSize) - { - if (newSize > m_size) - { - void* const data = realloc(m_data, newSize + wxMemoryBufferData::DefBufSize); - if ( !data ) - { - // It's better to crash immediately dereferencing a null - // pointer in the function calling us than overflowing the - // buffer which couldn't be made big enough. - free(release()); - return; - } - - m_data = data; - m_size = newSize + wxMemoryBufferData::DefBufSize; - } - } - - void IncRef() { m_ref += 1; } - void DecRef() - { - m_ref -= 1; - if (m_ref == 0) // are there no more references? - delete this; - } - - void *release() - { - if ( m_data == NULL ) - return NULL; - - wxASSERT_MSG( m_ref == 1, "can't release shared buffer" ); - - void *p = m_data; - m_data = NULL; - m_len = - m_size = 0; - - return p; - } - - - // the buffer containing the data - void *m_data; - - // the size of the buffer - size_t m_size; - - // the amount of data currently in the buffer - size_t m_len; - - // the reference count - size_t m_ref; - - wxDECLARE_NO_COPY_CLASS(wxMemoryBufferData); -}; - - -class wxMemoryBuffer -{ -public: - // ctor and dtor - wxMemoryBuffer(size_t size = wxMemoryBufferData::DefBufSize) - { - m_bufdata = new wxMemoryBufferData(size); - m_bufdata->IncRef(); - } - - ~wxMemoryBuffer() { m_bufdata->DecRef(); } - - - // copy and assignment - wxMemoryBuffer(const wxMemoryBuffer& src) - : m_bufdata(src.m_bufdata) - { - m_bufdata->IncRef(); - } - - wxMemoryBuffer& operator=(const wxMemoryBuffer& src) - { - if (&src != this) - { - m_bufdata->DecRef(); - m_bufdata = src.m_bufdata; - m_bufdata->IncRef(); - } - return *this; - } - - - // Accessors - void *GetData() const { return m_bufdata->m_data; } - size_t GetBufSize() const { return m_bufdata->m_size; } - size_t GetDataLen() const { return m_bufdata->m_len; } - - bool IsEmpty() const { return GetDataLen() == 0; } - - void SetBufSize(size_t size) { m_bufdata->ResizeIfNeeded(size); } - void SetDataLen(size_t len) - { - wxASSERT(len <= m_bufdata->m_size); - m_bufdata->m_len = len; - } - - void Clear() { SetDataLen(0); } - - // Ensure the buffer is big enough and return a pointer to it - void *GetWriteBuf(size_t sizeNeeded) - { - m_bufdata->ResizeIfNeeded(sizeNeeded); - return m_bufdata->m_data; - } - - // Update the length after the write - void UngetWriteBuf(size_t sizeUsed) { SetDataLen(sizeUsed); } - - // Like the above, but appends to the buffer - void *GetAppendBuf(size_t sizeNeeded) - { - m_bufdata->ResizeIfNeeded(m_bufdata->m_len + sizeNeeded); - return (char*)m_bufdata->m_data + m_bufdata->m_len; - } - - // Update the length after the append - void UngetAppendBuf(size_t sizeUsed) - { - SetDataLen(m_bufdata->m_len + sizeUsed); - } - - // Other ways to append to the buffer - void AppendByte(char data) - { - wxCHECK_RET( m_bufdata->m_data, wxT("invalid wxMemoryBuffer") ); - - m_bufdata->ResizeIfNeeded(m_bufdata->m_len + 1); - *(((char*)m_bufdata->m_data) + m_bufdata->m_len) = data; - m_bufdata->m_len += 1; - } - - void AppendData(const void *data, size_t len) - { - memcpy(GetAppendBuf(len), data, len); - UngetAppendBuf(len); - } - - operator const char *() const { return (const char*)GetData(); } - - // gives up ownership of data, returns the pointer; after this call, - // data isn't freed by the buffer and its content is resent to empty - void *release() - { - return m_bufdata->release(); - } - -private: - wxMemoryBufferData* m_bufdata; -}; - -// ---------------------------------------------------------------------------- -// template class for any kind of data -// ---------------------------------------------------------------------------- - -// TODO - -#endif // _WX_BUFFER_H diff --git a/Externals/wxWidgets3/include/wx/build.h b/Externals/wxWidgets3/include/wx/build.h deleted file mode 100644 index 241314c23e..0000000000 --- a/Externals/wxWidgets3/include/wx/build.h +++ /dev/null @@ -1,128 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/build.h -// Purpose: Runtime build options checking -// Author: Vadim Zeitlin, Vaclav Slavik -// Modified by: -// Created: 07.05.02 -// Copyright: (c) 2002 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_BUILD_H_ -#define _WX_BUILD_H_ - -#include "wx/version.h" - -// NB: This file contains macros for checking binary compatibility of libraries -// in multilib builds, plugins and user components. -// The WX_BUILD_OPTIONS_SIGNATURE macro expands into string that should -// uniquely identify binary compatible builds: i.e. if two builds of the -// library are binary compatible, their signature string should be the -// same; if two builds are binary incompatible, their signatures should -// be different. -// -// Therefore, wxUSE_XXX flags that affect binary compatibility (vtables, -// function signatures) should be accounted for here. So should compilers -// and compiler versions (but note that binary compatible compiler versions -// such as gcc-2.95.2 and gcc-2.95.3 should have same signature!). - -// ---------------------------------------------------------------------------- -// WX_BUILD_OPTIONS_SIGNATURE -// ---------------------------------------------------------------------------- - -#define __WX_BO_STRINGIZE(x) __WX_BO_STRINGIZE0(x) -#define __WX_BO_STRINGIZE0(x) #x - -#if (wxMINOR_VERSION % 2) == 0 - #define __WX_BO_VERSION(x,y,z) \ - __WX_BO_STRINGIZE(x) "." __WX_BO_STRINGIZE(y) -#else - #define __WX_BO_VERSION(x,y,z) \ - __WX_BO_STRINGIZE(x) "." __WX_BO_STRINGIZE(y) "." __WX_BO_STRINGIZE(z) -#endif - -#if wxUSE_UNICODE_UTF8 - #define __WX_BO_UNICODE "UTF-8" -#elif wxUSE_UNICODE_WCHAR - #define __WX_BO_UNICODE "wchar_t" -#else - #define __WX_BO_UNICODE "ANSI" -#endif - -// GCC and Intel C++ share same C++ ABI (and possibly others in the future), -// check if compiler versions are compatible: -#if defined(__GXX_ABI_VERSION) - // The changes between ABI versions 1002 through 1010 (documented at - // https://gcc.gnu.org/onlinedocs/gcc/C_002b_002b-Dialect-Options.html - // under -fabi-version) don't affect wxWidgets, so we allow a library - // and an application to differ within that range. - #if ((__GXX_ABI_VERSION >= 1002) && (__GXX_ABI_VERSION <= 1010)) - #define wxGXX_EFFECTIVE_ABI_VERSION 1002 - #else - #define wxGXX_EFFECTIVE_ABI_VERSION __GXX_ABI_VERSION - #endif - #define __WX_BO_COMPILER \ - ",compiler with C++ ABI " __WX_BO_STRINGIZE(wxGXX_EFFECTIVE_ABI_VERSION) -#elif defined(__GNUG__) - #define __WX_BO_COMPILER ",GCC " \ - __WX_BO_STRINGIZE(__GNUC__) "." __WX_BO_STRINGIZE(__GNUC_MINOR__) -#elif defined(__VISUALC__) - #define __WX_BO_COMPILER ",Visual C++ " __WX_BO_STRINGIZE(_MSC_VER) -#elif defined(__INTEL_COMPILER) - // Notice that this must come after MSVC check as ICC under Windows is - // ABI-compatible with the corresponding version of the MSVC and we want to - // allow using it compile the application code using MSVC-built DLLs. - #define __WX_BO_COMPILER ",Intel C++" -#elif defined(__BORLANDC__) - #define __WX_BO_COMPILER ",Borland C++" -#else - #define __WX_BO_COMPILER -#endif - -// WXWIN_COMPATIBILITY macros affect presence of virtual functions -#if WXWIN_COMPATIBILITY_2_8 - #define __WX_BO_WXWIN_COMPAT_2_8 ",compatible with 2.8" -#else - #define __WX_BO_WXWIN_COMPAT_2_8 -#endif -#if WXWIN_COMPATIBILITY_3_0 - #define __WX_BO_WXWIN_COMPAT_3_0 ",compatible with 3.0" -#else - #define __WX_BO_WXWIN_COMPAT_3_0 -#endif - -// deriving wxWin containers from STL ones changes them completely: -#if wxUSE_STD_CONTAINERS - #define __WX_BO_STL ",STL containers" -#else - #define __WX_BO_STL ",wx containers" -#endif - -// This macro is passed as argument to wxAppConsole::CheckBuildOptions() -#define WX_BUILD_OPTIONS_SIGNATURE \ - __WX_BO_VERSION(wxMAJOR_VERSION, wxMINOR_VERSION, wxRELEASE_NUMBER) \ - " (" __WX_BO_UNICODE \ - __WX_BO_COMPILER \ - __WX_BO_STL \ - __WX_BO_WXWIN_COMPAT_2_8 __WX_BO_WXWIN_COMPAT_3_0 \ - ")" - - -// ---------------------------------------------------------------------------- -// WX_CHECK_BUILD_OPTIONS -// ---------------------------------------------------------------------------- - -// Use this macro to check build options. Adding it to a file in DLL will -// ensure that the DLL checks build options in same way wxIMPLEMENT_APP() does. -#define WX_CHECK_BUILD_OPTIONS(libName) \ - static struct wxBuildOptionsChecker \ - { \ - wxBuildOptionsChecker() \ - { \ - wxAppConsole::CheckBuildOptions(WX_BUILD_OPTIONS_SIGNATURE, \ - libName); \ - } \ - } gs_buildOptionsCheck; - - -#endif // _WX_BUILD_H_ diff --git a/Externals/wxWidgets3/include/wx/busyinfo.h b/Externals/wxWidgets3/include/wx/busyinfo.h deleted file mode 100644 index 94f8fabdcc..0000000000 --- a/Externals/wxWidgets3/include/wx/busyinfo.h +++ /dev/null @@ -1,78 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/busyinfo.h -// Purpose: Information window (when app is busy) -// Author: Vaclav Slavik -// Copyright: (c) 1999 Vaclav Slavik -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __BUSYINFO_H_BASE__ -#define __BUSYINFO_H_BASE__ - -#include "wx/defs.h" - -#if wxUSE_BUSYINFO - -#include "wx/colour.h" -#include "wx/icon.h" - -class WXDLLIMPEXP_FWD_CORE wxWindow; - -// This class is used to pass all the various parameters to wxBusyInfo ctor. -// According to the usual naming conventions (see wxAboutDialogInfo, -// wxFontInfo, ...) it would be called wxBusyInfoInfo, but this would have been -// rather strange, so we call it wxBusyInfoFlags instead. -// -// Methods are mostly self-explanatory except for the difference between "Text" -// and "Label": the former can contain markup, while the latter is just plain -// string which is not parsed in any way. -class wxBusyInfoFlags -{ -public: - wxBusyInfoFlags() - { - m_parent = NULL; - m_alpha = wxALPHA_OPAQUE; - } - - wxBusyInfoFlags& Parent(wxWindow* parent) - { m_parent = parent; return *this; } - - wxBusyInfoFlags& Icon(const wxIcon& icon) - { m_icon = icon; return *this; } - wxBusyInfoFlags& Title(const wxString& title) - { m_title = title; return *this; } - wxBusyInfoFlags& Text(const wxString& text) - { m_text = text; return *this; } - wxBusyInfoFlags& Label(const wxString& label) - { m_label = label; return *this; } - - wxBusyInfoFlags& Foreground(const wxColour& foreground) - { m_foreground = foreground; return *this; } - wxBusyInfoFlags& Background(const wxColour& background) - { m_background = background; return *this; } - - wxBusyInfoFlags& Transparency(wxByte alpha) - { m_alpha = alpha; return *this; } - -private: - wxWindow* m_parent; - - wxIcon m_icon; - wxString m_title, - m_text, - m_label; - - wxColour m_foreground, - m_background; - - wxByte m_alpha; - - friend class wxBusyInfo; -}; - -#include "wx/generic/busyinfo.h" - -#endif // wxUSE_BUSYINFO - -#endif // __BUSYINFO_H_BASE__ diff --git a/Externals/wxWidgets3/include/wx/button.h b/Externals/wxWidgets3/include/wx/button.h deleted file mode 100644 index f31166413e..0000000000 --- a/Externals/wxWidgets3/include/wx/button.h +++ /dev/null @@ -1,67 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/button.h -// Purpose: wxButtonBase class -// Author: Vadim Zeitlin -// Modified by: -// Created: 15.08.00 -// Copyright: (c) Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_BUTTON_H_BASE_ -#define _WX_BUTTON_H_BASE_ - -#include "wx/defs.h" - -#if wxUSE_BUTTON - -#include "wx/anybutton.h" - -extern WXDLLIMPEXP_DATA_CORE(const char) wxButtonNameStr[]; - -// ---------------------------------------------------------------------------- -// wxButton: a push button -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxButtonBase : public wxAnyButton -{ -public: - wxButtonBase() { } - - // show the authentication needed symbol on the button: this is currently - // only implemented on Windows Vista and newer (on which it shows the UAC - // shield symbol) - void SetAuthNeeded(bool show = true) { DoSetAuthNeeded(show); } - bool GetAuthNeeded() const { return DoGetAuthNeeded(); } - - // make this button the default button in its top level window - // - // returns the old default item (possibly NULL) - virtual wxWindow *SetDefault(); - - // returns the default button size for this platform - static wxSize GetDefaultSize(); - -protected: - wxDECLARE_NO_COPY_CLASS(wxButtonBase); -}; - -#if defined(__WXUNIVERSAL__) - #include "wx/univ/button.h" -#elif defined(__WXMSW__) - #include "wx/msw/button.h" -#elif defined(__WXMOTIF__) - #include "wx/motif/button.h" -#elif defined(__WXGTK20__) - #include "wx/gtk/button.h" -#elif defined(__WXGTK__) - #include "wx/gtk1/button.h" -#elif defined(__WXMAC__) - #include "wx/osx/button.h" -#elif defined(__WXQT__) - #include "wx/qt/button.h" -#endif - -#endif // wxUSE_BUTTON - -#endif // _WX_BUTTON_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/calctrl.h b/Externals/wxWidgets3/include/wx/calctrl.h deleted file mode 100644 index de8881187e..0000000000 --- a/Externals/wxWidgets3/include/wx/calctrl.h +++ /dev/null @@ -1,399 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/calctrl.h -// Purpose: date-picker control -// Author: Vadim Zeitlin -// Modified by: -// Created: 29.12.99 -// Copyright: (c) 1999 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_CALCTRL_H_ -#define _WX_CALCTRL_H_ - -#include "wx/defs.h" - -#if wxUSE_CALENDARCTRL - -#include "wx/dateevt.h" -#include "wx/colour.h" -#include "wx/font.h" -#include "wx/control.h" - -// ---------------------------------------------------------------------------- -// wxCalendarCtrl flags -// ---------------------------------------------------------------------------- - -enum -{ - // show Sunday as the first day of the week (default) - wxCAL_SUNDAY_FIRST = 0x0000, - - // show Monday as the first day of the week - wxCAL_MONDAY_FIRST = 0x0001, - - // highlight holidays - wxCAL_SHOW_HOLIDAYS = 0x0002, - - // disable the year change control, show only the month change one - // deprecated - wxCAL_NO_YEAR_CHANGE = 0x0004, - - // don't allow changing neither month nor year (implies - // wxCAL_NO_YEAR_CHANGE) - wxCAL_NO_MONTH_CHANGE = 0x000c, - - // use MS-style month-selection instead of combo-spin combination - wxCAL_SEQUENTIAL_MONTH_SELECTION = 0x0010, - - // show the neighbouring weeks in the previous and next month - wxCAL_SHOW_SURROUNDING_WEEKS = 0x0020, - - // show week numbers on the left side of the calendar. - wxCAL_SHOW_WEEK_NUMBERS = 0x0040 -}; - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -// return values for the HitTest() method -enum wxCalendarHitTestResult -{ - wxCAL_HITTEST_NOWHERE, // outside of anything - wxCAL_HITTEST_HEADER, // on the header (weekdays) - wxCAL_HITTEST_DAY, // on a day in the calendar - wxCAL_HITTEST_INCMONTH, - wxCAL_HITTEST_DECMONTH, - wxCAL_HITTEST_SURROUNDING_WEEK, - wxCAL_HITTEST_WEEK -}; - -// border types for a date -enum wxCalendarDateBorder -{ - wxCAL_BORDER_NONE, // no border (default) - wxCAL_BORDER_SQUARE, // a rectangular border - wxCAL_BORDER_ROUND // a round border -}; - -// ---------------------------------------------------------------------------- -// wxCalendarDateAttr: custom attributes for a calendar date -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxCalendarDateAttr -{ -public: - // ctors - wxCalendarDateAttr(const wxColour& colText = wxNullColour, - const wxColour& colBack = wxNullColour, - const wxColour& colBorder = wxNullColour, - const wxFont& font = wxNullFont, - wxCalendarDateBorder border = wxCAL_BORDER_NONE) - : m_colText(colText), m_colBack(colBack), - m_colBorder(colBorder), m_font(font) - { - Init(border); - } - wxCalendarDateAttr(wxCalendarDateBorder border, - const wxColour& colBorder = wxNullColour) - : m_colBorder(colBorder) - { - Init(border); - } - - // setters - void SetTextColour(const wxColour& colText) { m_colText = colText; } - void SetBackgroundColour(const wxColour& colBack) { m_colBack = colBack; } - void SetBorderColour(const wxColour& col) { m_colBorder = col; } - void SetFont(const wxFont& font) { m_font = font; } - void SetBorder(wxCalendarDateBorder border) { m_border = border; } - void SetHoliday(bool holiday) { m_holiday = holiday; } - - // accessors - bool HasTextColour() const { return m_colText.IsOk(); } - bool HasBackgroundColour() const { return m_colBack.IsOk(); } - bool HasBorderColour() const { return m_colBorder.IsOk(); } - bool HasFont() const { return m_font.IsOk(); } - bool HasBorder() const { return m_border != wxCAL_BORDER_NONE; } - - bool IsHoliday() const { return m_holiday; } - - const wxColour& GetTextColour() const { return m_colText; } - const wxColour& GetBackgroundColour() const { return m_colBack; } - const wxColour& GetBorderColour() const { return m_colBorder; } - const wxFont& GetFont() const { return m_font; } - wxCalendarDateBorder GetBorder() const { return m_border; } - - // get or change the "mark" attribute, i.e. the one used for the items - // marked with wxCalendarCtrl::Mark() - static const wxCalendarDateAttr& GetMark() { return m_mark; } - static void SetMark(wxCalendarDateAttr const& m) { m_mark = m; } - -protected: - void Init(wxCalendarDateBorder border = wxCAL_BORDER_NONE) - { - m_border = border; - m_holiday = false; - } - -private: - static wxCalendarDateAttr m_mark; - - wxColour m_colText, - m_colBack, - m_colBorder; - wxFont m_font; - wxCalendarDateBorder m_border; - bool m_holiday; -}; - -// ---------------------------------------------------------------------------- -// wxCalendarCtrl events -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_ADV wxCalendarCtrl; - -class WXDLLIMPEXP_ADV wxCalendarEvent : public wxDateEvent -{ -public: - wxCalendarEvent() : m_wday(wxDateTime::Inv_WeekDay) { } - wxCalendarEvent(wxWindow *win, const wxDateTime& dt, wxEventType type) - : wxDateEvent(win, dt, type), - m_wday(wxDateTime::Inv_WeekDay) { } - wxCalendarEvent(const wxCalendarEvent& event) - : wxDateEvent(event), m_wday(event.m_wday) { } - - void SetWeekDay(wxDateTime::WeekDay wd) { m_wday = wd; } - wxDateTime::WeekDay GetWeekDay() const { return m_wday; } - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxCalendarEvent(*this); } - -private: - wxDateTime::WeekDay m_wday; - - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxCalendarEvent); -}; - -// ---------------------------------------------------------------------------- -// wxCalendarCtrlBase -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxCalendarCtrlBase : public wxControl -{ -public: - // do we allow changing the month/year? - bool AllowMonthChange() const { return !HasFlag(wxCAL_NO_MONTH_CHANGE); } - - // get/set the current date - virtual wxDateTime GetDate() const = 0; - virtual bool SetDate(const wxDateTime& date) = 0; - - - // restricting the dates shown by the control to the specified range: only - // implemented in the generic and MSW versions for now - - // if either date is set, the corresponding limit will be enforced and true - // returned; if none are set, the existing restrictions are removed and - // false is returned - virtual bool - SetDateRange(const wxDateTime& WXUNUSED(lowerdate) = wxDefaultDateTime, - const wxDateTime& WXUNUSED(upperdate) = wxDefaultDateTime) - { - return false; - } - - // retrieves the limits currently in use (wxDefaultDateTime if none) in the - // provided pointers (which may be NULL) and returns true if there are any - // limits or false if none - virtual bool - GetDateRange(wxDateTime *lowerdate, wxDateTime *upperdate) const - { - if ( lowerdate ) - *lowerdate = wxDefaultDateTime; - if ( upperdate ) - *upperdate = wxDefaultDateTime; - return false; - } - - // returns one of wxCAL_HITTEST_XXX constants and fills either date or wd - // with the corresponding value (none for NOWHERE, the date for DAY and wd - // for HEADER) - // - // notice that this is not implemented in all versions - virtual wxCalendarHitTestResult - HitTest(const wxPoint& WXUNUSED(pos), - wxDateTime* WXUNUSED(date) = NULL, - wxDateTime::WeekDay* WXUNUSED(wd) = NULL) - { - return wxCAL_HITTEST_NOWHERE; - } - - // allow or disable changing the current month (and year), return true if - // the value of this option really changed or false if it was already set - // to the required value - // - // NB: we provide implementation for this pure virtual function, derived - // classes should call it - virtual bool EnableMonthChange(bool enable = true) = 0; - - - // an item without custom attributes is drawn with the default colours and - // font and without border, setting custom attributes allows to modify this - // - // the day parameter should be in 1..31 range, for days 29, 30, 31 the - // corresponding attribute is just unused if there is no such day in the - // current month - // - // notice that currently arbitrary attributes are supported only in the - // generic version, the native controls only support Mark() which assigns - // some special appearance (which can be customized using SetMark() for the - // generic version) to the given day - - virtual void Mark(size_t day, bool mark) = 0; - - virtual wxCalendarDateAttr *GetAttr(size_t WXUNUSED(day)) const - { return NULL; } - virtual void SetAttr(size_t WXUNUSED(day), wxCalendarDateAttr *attr) - { delete attr; } - virtual void ResetAttr(size_t WXUNUSED(day)) { } - - - // holidays support - // - // currently only the generic version implements all functions in this - // section; wxMSW implements simple support for holidays (they can be - // just enabled or disabled) and wxGTK doesn't support them at all - - // equivalent to changing wxCAL_SHOW_HOLIDAYS flag but should be called - // instead of just changing it - virtual void EnableHolidayDisplay(bool display = true); - - // set/get the colours to use for holidays (if they're enabled) - virtual void SetHolidayColours(const wxColour& WXUNUSED(colFg), - const wxColour& WXUNUSED(colBg)) { } - - virtual const wxColour& GetHolidayColourFg() const { return wxNullColour; } - virtual const wxColour& GetHolidayColourBg() const { return wxNullColour; } - - // mark the given day of the current month as being a holiday - virtual void SetHoliday(size_t WXUNUSED(day)) { } - - - // customizing the colours of the controls - // - // most of the methods in this section are only implemented by the native - // version of the control and do nothing in the native ones - - // set/get the colours to use for the display of the week day names at the - // top of the controls - virtual void SetHeaderColours(const wxColour& WXUNUSED(colFg), - const wxColour& WXUNUSED(colBg)) { } - - virtual const wxColour& GetHeaderColourFg() const { return wxNullColour; } - virtual const wxColour& GetHeaderColourBg() const { return wxNullColour; } - - // set/get the colours used for the currently selected date - virtual void SetHighlightColours(const wxColour& WXUNUSED(colFg), - const wxColour& WXUNUSED(colBg)) { } - - virtual const wxColour& GetHighlightColourFg() const { return wxNullColour; } - virtual const wxColour& GetHighlightColourBg() const { return wxNullColour; } - - - // implementation only from now on - - // generate the given calendar event, return true if it was processed - // - // NB: this is public because it's used from GTK+ callbacks - bool GenerateEvent(wxEventType type) - { - wxCalendarEvent event(this, GetDate(), type); - return HandleWindowEvent(event); - } - -protected: - // generate all the events for the selection change from dateOld to current - // date: SEL_CHANGED, PAGE_CHANGED if necessary and also one of (deprecated) - // YEAR/MONTH/DAY_CHANGED ones - // - // returns true if page changed event was generated, false if the new date - // is still in the same month as before - bool GenerateAllChangeEvents(const wxDateTime& dateOld); - - // call SetHoliday() for all holidays in the current month - // - // should be called on month change, does nothing if wxCAL_SHOW_HOLIDAYS is - // not set and returns false in this case, true if we do show them - bool SetHolidayAttrs(); - - // called by SetHolidayAttrs() to forget the previously set holidays - virtual void ResetHolidayAttrs() { } - - // called by EnableHolidayDisplay() - virtual void RefreshHolidays() { } -}; - -// ---------------------------------------------------------------------------- -// wxCalendarCtrl -// ---------------------------------------------------------------------------- - -#define wxCalendarNameStr "CalendarCtrl" - -#ifndef __WXUNIVERSAL__ - #if defined(__WXGTK20__) - #define wxHAS_NATIVE_CALENDARCTRL - #include "wx/gtk/calctrl.h" - #define wxCalendarCtrl wxGtkCalendarCtrl - #elif defined(__WXMSW__) - #define wxHAS_NATIVE_CALENDARCTRL - #include "wx/msw/calctrl.h" - #elif defined(__WXQT__) - #define wxHAS_NATIVE_CALENDARCTRL - #include "wx/qt/calctrl.h" - #endif -#endif // !__WXUNIVERSAL__ - -#ifndef wxHAS_NATIVE_CALENDARCTRL - #include "wx/generic/calctrlg.h" - #define wxCalendarCtrl wxGenericCalendarCtrl -#endif - -// ---------------------------------------------------------------------------- -// calendar event types and macros for handling them -// ---------------------------------------------------------------------------- - -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_CALENDAR_SEL_CHANGED, wxCalendarEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_CALENDAR_PAGE_CHANGED, wxCalendarEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_CALENDAR_DOUBLECLICKED, wxCalendarEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_CALENDAR_WEEKDAY_CLICKED, wxCalendarEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_CALENDAR_WEEK_CLICKED, wxCalendarEvent ); - -// deprecated events -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_CALENDAR_DAY_CHANGED, wxCalendarEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_CALENDAR_MONTH_CHANGED, wxCalendarEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_CALENDAR_YEAR_CHANGED, wxCalendarEvent ); - -typedef void (wxEvtHandler::*wxCalendarEventFunction)(wxCalendarEvent&); - -#define wxCalendarEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxCalendarEventFunction, func) - -#define wx__DECLARE_CALEVT(evt, id, fn) \ - wx__DECLARE_EVT1(wxEVT_CALENDAR_ ## evt, id, wxCalendarEventHandler(fn)) - -#define EVT_CALENDAR(id, fn) wx__DECLARE_CALEVT(DOUBLECLICKED, id, fn) -#define EVT_CALENDAR_SEL_CHANGED(id, fn) wx__DECLARE_CALEVT(SEL_CHANGED, id, fn) -#define EVT_CALENDAR_PAGE_CHANGED(id, fn) wx__DECLARE_CALEVT(PAGE_CHANGED, id, fn) -#define EVT_CALENDAR_WEEKDAY_CLICKED(id, fn) wx__DECLARE_CALEVT(WEEKDAY_CLICKED, id, fn) -#define EVT_CALENDAR_WEEK_CLICKED(id, fn) wx__DECLARE_CALEVT(WEEK_CLICKED, id, fn) - -// deprecated events -#define EVT_CALENDAR_DAY(id, fn) wx__DECLARE_CALEVT(DAY_CHANGED, id, fn) -#define EVT_CALENDAR_MONTH(id, fn) wx__DECLARE_CALEVT(MONTH_CHANGED, id, fn) -#define EVT_CALENDAR_YEAR(id, fn) wx__DECLARE_CALEVT(YEAR_CHANGED, id, fn) - -#endif // wxUSE_CALENDARCTRL - -#endif // _WX_CALCTRL_H_ - diff --git a/Externals/wxWidgets3/include/wx/caret.h b/Externals/wxWidgets3/include/wx/caret.h deleted file mode 100644 index e6e9728ff8..0000000000 --- a/Externals/wxWidgets3/include/wx/caret.h +++ /dev/null @@ -1,251 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/caret.h -// Purpose: wxCaretBase class - the interface of wxCaret -// Author: Vadim Zeitlin -// Modified by: -// Created: 23.05.99 -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_CARET_H_BASE_ -#define _WX_CARET_H_BASE_ - -#include "wx/defs.h" - -#if wxUSE_CARET - -// --------------------------------------------------------------------------- -// forward declarations -// --------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxWindow; -class WXDLLIMPEXP_FWD_CORE wxWindowBase; - -// ---------------------------------------------------------------------------- -// headers we have to include -// ---------------------------------------------------------------------------- - -#include "wx/gdicmn.h" // for wxPoint, wxSize - -// ---------------------------------------------------------------------------- -// A caret is a blinking cursor showing the position where the typed text will -// appear. It can be either a solid block or a custom bitmap (TODO) -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxCaretBase -{ -public: - // ctors - // ----- - // default - use Create - wxCaretBase() { Init(); } - // create the caret of given (in pixels) width and height and associate - // with the given window - wxCaretBase(wxWindowBase *window, int width, int height) - { - Init(); - - (void)Create(window, width, height); - } - // same as above - wxCaretBase(wxWindowBase *window, const wxSize& size) - { - Init(); - - (void)Create(window, size); - } - - // a virtual dtor has been provided since this class has virtual members - virtual ~wxCaretBase() { } - - // Create() functions - same as ctor but returns the success code - // -------------------------------------------------------------- - - // same as ctor - bool Create(wxWindowBase *window, int width, int height) - { return DoCreate(window, width, height); } - // same as ctor - bool Create(wxWindowBase *window, const wxSize& size) - { return DoCreate(window, size.x, size.y); } - - // accessors - // --------- - - // is the caret valid? - bool IsOk() const { return m_width != 0 && m_height != 0; } - - // is the caret currently shown? - bool IsVisible() const { return m_countVisible > 0; } - - // get the caret position - void GetPosition(int *x, int *y) const - { - if ( x ) *x = m_x; - if ( y ) *y = m_y; - } - wxPoint GetPosition() const { return wxPoint(m_x, m_y); } - - // get the caret size - void GetSize(int *width, int *height) const - { - if ( width ) *width = m_width; - if ( height ) *height = m_height; - } - wxSize GetSize() const { return wxSize(m_width, m_height); } - - // get the window we're associated with - wxWindow *GetWindow() const { return (wxWindow *)m_window; } - - // change the size of the caret - void SetSize(int width, int height) { - m_width = width; - m_height = height; - DoSize(); - } - void SetSize(const wxSize& size) { SetSize(size.x, size.y); } - - - // operations - // ---------- - - // move the caret to given position (in logical coords) - void Move(int x, int y) { m_x = x; m_y = y; DoMove(); } - void Move(const wxPoint& pt) { m_x = pt.x; m_y = pt.y; DoMove(); } - - // show/hide the caret (should be called by wxWindow when needed): - // Show() must be called as many times as Hide() + 1 to make the caret - // visible - virtual void Show(bool show = true) - { - if ( show ) - { - if ( m_countVisible++ == 0 ) - DoShow(); - } - else - { - if ( --m_countVisible == 0 ) - DoHide(); - } - } - virtual void Hide() { Show(false); } - - // blink time is measured in milliseconds and is the time elapsed - // between 2 inversions of the caret (blink time of the caret is common - // to all carets in the Universe, so these functions are static) - static int GetBlinkTime(); - static void SetBlinkTime(int milliseconds); - - // implementation from now on - // -------------------------- - - // these functions should be called by wxWindow when the window gets/loses - // the focus - we create/show and hide/destroy the caret here - virtual void OnSetFocus() { } - virtual void OnKillFocus() { } - -protected: - // these functions may be overridden in the derived classes, but they - // should call the base class version first - virtual bool DoCreate(wxWindowBase *window, int width, int height) - { - m_window = window; - m_width = width; - m_height = height; - - return true; - } - - // pure virtuals to implement in the derived class - virtual void DoShow() = 0; - virtual void DoHide() = 0; - virtual void DoMove() = 0; - virtual void DoSize() { } - - // the common initialization - void Init() - { - m_window = NULL; - m_x = m_y = 0; - m_width = m_height = 0; - m_countVisible = 0; - } - - // the size of the caret - int m_width, m_height; - - // the position of the caret - int m_x, m_y; - - // the window we're associated with - wxWindowBase *m_window; - - // visibility count: the caret is visible only if it's positive - int m_countVisible; - -private: - wxDECLARE_NO_COPY_CLASS(wxCaretBase); -}; - -// --------------------------------------------------------------------------- -// now include the real thing -// --------------------------------------------------------------------------- - -#if defined(__WXMSW__) - #include "wx/msw/caret.h" -#else - #include "wx/generic/caret.h" -#endif // platform - -// ---------------------------------------------------------------------------- -// wxCaretSuspend: a simple class which hides the caret in its ctor and -// restores it in the dtor, this should be used when drawing on the screen to -// avoid overdrawing the caret -// ---------------------------------------------------------------------------- - -#ifdef wxHAS_CARET_USING_OVERLAYS - -// we don't need to hide the caret if it's rendered using overlays -class WXDLLIMPEXP_CORE wxCaretSuspend -{ -public: - wxCaretSuspend(wxWindow *WXUNUSED(win)) {} - - wxDECLARE_NO_COPY_CLASS(wxCaretSuspend); -}; - -#else // !wxHAS_CARET_USING_OVERLAYS - -class WXDLLIMPEXP_CORE wxCaretSuspend -{ -public: - wxCaretSuspend(wxWindow *win) - { - m_caret = win->GetCaret(); - m_show = false; - if ( m_caret && m_caret->IsVisible() ) - { - m_caret->Hide(); - m_show = true; - } - } - - ~wxCaretSuspend() - { - if ( m_caret && m_show ) - m_caret->Show(); - } - -private: - wxCaret *m_caret; - bool m_show; - - wxDECLARE_NO_COPY_CLASS(wxCaretSuspend); -}; - -#endif // wxHAS_CARET_USING_OVERLAYS/!wxHAS_CARET_USING_OVERLAYS - -#endif // wxUSE_CARET - -#endif // _WX_CARET_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/chartype.h b/Externals/wxWidgets3/include/wx/chartype.h deleted file mode 100644 index e8ccb35f05..0000000000 --- a/Externals/wxWidgets3/include/wx/chartype.h +++ /dev/null @@ -1,276 +0,0 @@ -/* - * Name: wx/chartype.h - * Purpose: Declarations of wxChar and related types - * Author: Joel Farley, Ove Kåven - * Modified by: Vadim Zeitlin, Robert Roebling, Ron Lee - * Created: 1998/06/12 - * Copyright: (c) 1998-2006 wxWidgets dev team - * Licence: wxWindows licence - */ - -/* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */ - -#ifndef _WX_WXCHARTYPE_H_ -#define _WX_WXCHARTYPE_H_ - -/* defs.h indirectly includes this file, so don't include it here */ -#include "wx/platform.h" - -/* check whether we have wchar_t and which size it is if we do */ -#if !defined(wxUSE_WCHAR_T) - #if defined(__UNIX__) - #if defined(HAVE_WCSTR_H) || defined(HAVE_WCHAR_H) || defined(__FreeBSD__) || defined(__DARWIN__) - #define wxUSE_WCHAR_T 1 - #else - #define wxUSE_WCHAR_T 0 - #endif - #elif defined(__GNUWIN32__) && !defined(__MINGW32__) - #define wxUSE_WCHAR_T 0 - #else - /* add additional compiler checks if this fails */ - #define wxUSE_WCHAR_T 1 - #endif -#endif /* !defined(wxUSE_WCHAR_T) */ - -/* Unicode support requires wchar_t */ -#if !wxUSE_WCHAR_T - #error "wchar_t must be available" -#endif /* Unicode */ - -/* - non Unix compilers which do have wchar.h (but not tchar.h which is included - below and which includes wchar.h anyhow). - - Actually MinGW has tchar.h, but it does not include wchar.h - */ -#if defined(__MINGW32__) - #ifndef HAVE_WCHAR_H - #define HAVE_WCHAR_H - #endif -#endif - -#ifdef HAVE_WCHAR_H - /* the current (as of Nov 2002) version of cygwin has a bug in its */ - /* wchar.h -- there is no extern "C" around the declarations in it */ - /* and this results in linking errors later; also, at least on some */ - /* Cygwin versions, wchar.h requires sys/types.h */ - #ifdef __CYGWIN__ - #include - #ifdef __cplusplus - extern "C" { - #endif - #endif /* Cygwin */ - - #include - - #if defined(__CYGWIN__) && defined(__cplusplus) - } - #endif /* Cygwin and C++ */ - - /* the current (as of Mar 2014) version of Android (up to api level 19) */ - /* doesn't include some declarations (wscdup, wcslen, wcscasecmp, etc.) */ - /* (moved out from __CYGWIN__ block) */ - #if defined(__WXQT__) && !defined(wcsdup) && defined(__ANDROID__) - #ifdef __cplusplus - extern "C" { - #endif - extern wchar_t *wcsdup(const wchar_t *); - extern size_t wcslen (const wchar_t *); - extern size_t wcsnlen (const wchar_t *, size_t ); - extern int wcscasecmp (const wchar_t *, const wchar_t *); - extern int wcsncasecmp (const wchar_t *, const wchar_t *, size_t); - #ifdef __cplusplus - } - #endif - #endif /* Android */ - -#elif defined(HAVE_WCSTR_H) - /* old compilers have relevant declarations here */ - #include -#elif defined(__FreeBSD__) || defined(__DARWIN__) - /* include stdlib.h for wchar_t */ - #include -#endif /* HAVE_WCHAR_H */ - -#ifdef HAVE_WIDEC_H - #include -#endif - -/* -------------------------------------------------------------------------- */ -/* define wxHAVE_TCHAR_SUPPORT for the compilers which support the TCHAR type */ -/* mapped to either char or wchar_t depending on the ASCII/Unicode mode and */ -/* have the function mapping _tfoo() -> foo() or wfoo() */ -/* -------------------------------------------------------------------------- */ - -/* VC++ and BC++ starting with 5.2 have TCHAR support */ -#ifdef __VISUALC__ - #define wxHAVE_TCHAR_SUPPORT -#elif defined(__BORLANDC__) && (__BORLANDC__ >= 0x520) - #define wxHAVE_TCHAR_SUPPORT - #include -#elif defined(__MINGW32__) && wxCHECK_W32API_VERSION( 1, 0 ) - #define wxHAVE_TCHAR_SUPPORT - #include - #include - #include -#endif /* compilers with (good) TCHAR support */ - -#ifdef wxHAVE_TCHAR_SUPPORT - /* get TCHAR definition if we've got it */ - #include - - /* we surely do have wchar_t if we have TCHAR */ - #ifndef wxUSE_WCHAR_T - #define wxUSE_WCHAR_T 1 - #endif /* !defined(wxUSE_WCHAR_T) */ -#endif /* wxHAVE_TCHAR_SUPPORT */ - -/* ------------------------------------------------------------------------- */ -/* define wxChar type */ -/* ------------------------------------------------------------------------- */ - -/* TODO: define wxCharInt to be equal to either int or wint_t? */ - -#if !wxUSE_UNICODE - typedef char wxChar; - typedef signed char wxSChar; - typedef unsigned char wxUChar; -#else - /* VZ: note that VC++ defines _T[SU]CHAR simply as wchar_t and not as */ - /* signed/unsigned version of it which (a) makes sense to me (unlike */ - /* char wchar_t is always unsigned) and (b) was how the previous */ - /* definitions worked so keep it like this */ - typedef wchar_t wxChar; - typedef wchar_t wxSChar; - typedef wchar_t wxUChar; -#endif /* ASCII/Unicode */ - -/* ------------------------------------------------------------------------- */ -/* define wxStringCharType */ -/* ------------------------------------------------------------------------- */ - -/* depending on the platform, Unicode build can either store wxStrings as - wchar_t* or UTF-8 encoded char*: */ -#if wxUSE_UNICODE - /* FIXME-UTF8: what would be better place for this? */ - #if defined(wxUSE_UTF8_LOCALE_ONLY) && !defined(wxUSE_UNICODE_UTF8) - #error "wxUSE_UTF8_LOCALE_ONLY only makes sense with wxUSE_UNICODE_UTF8" - #endif - #ifndef wxUSE_UTF8_LOCALE_ONLY - #define wxUSE_UTF8_LOCALE_ONLY 0 - #endif - - #ifndef wxUSE_UNICODE_UTF8 - #define wxUSE_UNICODE_UTF8 0 - #endif - - #if wxUSE_UNICODE_UTF8 - #define wxUSE_UNICODE_WCHAR 0 - #else - #define wxUSE_UNICODE_WCHAR 1 - #endif -#else - #define wxUSE_UNICODE_WCHAR 0 - #define wxUSE_UNICODE_UTF8 0 - #define wxUSE_UTF8_LOCALE_ONLY 0 -#endif - -/* define char type used by wxString internal representation: */ -#if wxUSE_UNICODE_WCHAR - typedef wchar_t wxStringCharType; -#else /* wxUSE_UNICODE_UTF8 || ANSI */ - typedef char wxStringCharType; -#endif - - -/* ------------------------------------------------------------------------- */ -/* define wxT() and related macros */ -/* ------------------------------------------------------------------------- */ - -/* BSD systems define _T() to be something different in ctype.h, override it */ -#if defined(__FreeBSD__) || defined(__DARWIN__) - #include - #undef _T -#endif - -/* - wxT ("wx text") macro turns a literal string constant into a wide char - constant. It is mostly unnecessary with wx 2.9 but defined for - compatibility. - */ -#ifndef wxT - #if !wxUSE_UNICODE - #define wxT(x) x - #else /* Unicode */ - /* - Notice that we use an intermediate macro to allow x to be expanded - if it's a macro itself. - */ - #ifndef wxCOMPILER_BROKEN_CONCAT_OPER - #define wxT(x) wxCONCAT_HELPER(L, x) - #else - #define wxT(x) wxPREPEND_L(x) - #endif - #endif /* ASCII/Unicode */ -#endif /* !defined(wxT) */ - -/* - wxT_2 exists only for compatibility with wx 2.x and is the same as wxT() in - that version but nothing in the newer ones. - */ -#define wxT_2(x) x - -/* - wxS ("wx string") macro can be used to create literals using the same - representation as wxString does internally, i.e. wchar_t in Unicode build - under Windows or char in UTF-8-based Unicode builds and (deprecated) ANSI - builds everywhere (see wxStringCharType definition above). - */ -#if wxUSE_UNICODE_WCHAR - /* - As above with wxT(), wxS() argument is expanded if it's a macro. - */ - #ifndef wxCOMPILER_BROKEN_CONCAT_OPER - #define wxS(x) wxCONCAT_HELPER(L, x) - #else - #define wxS(x) wxPREPEND_L(x) - #endif -#else /* wxUSE_UNICODE_UTF8 || ANSI */ - #define wxS(x) x -#endif - -/* - _T() is a synonym for wxT() familiar to Windows programmers. As this macro - has even higher risk of conflicting with system headers, its use is - discouraged and you may predefine wxNO__T to disable it. Additionally, we - do it ourselves for Sun CC which is known to use it in its standard headers - (see #10660). - */ -#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) - #ifndef wxNO__T - #define wxNO__T - #endif -#endif - -#if !defined(_T) && !defined(wxNO__T) - #define _T(x) wxT(x) -#endif - -/* a helper macro allowing to make another macro Unicode-friendly, see below */ -#define wxAPPLY_T(x) wxT(x) - -/* Unicode-friendly __FILE__, __DATE__ and __TIME__ analogs */ -#ifndef __TFILE__ - #define __TFILE__ wxAPPLY_T(__FILE__) -#endif - -#ifndef __TDATE__ - #define __TDATE__ wxAPPLY_T(__DATE__) -#endif - -#ifndef __TTIME__ - #define __TTIME__ wxAPPLY_T(__TIME__) -#endif - -#endif /* _WX_WXCHARTYPE_H_ */ - diff --git a/Externals/wxWidgets3/include/wx/checkbox.h b/Externals/wxWidgets3/include/wx/checkbox.h deleted file mode 100644 index 00e73dca9e..0000000000 --- a/Externals/wxWidgets3/include/wx/checkbox.h +++ /dev/null @@ -1,187 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/checkbox.h -// Purpose: wxCheckBox class interface -// Author: Vadim Zeitlin -// Modified by: -// Created: 07.09.00 -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_CHECKBOX_H_BASE_ -#define _WX_CHECKBOX_H_BASE_ - -#include "wx/defs.h" - -#if wxUSE_CHECKBOX - -#include "wx/control.h" - - -/* - * wxCheckBox style flags - * (Using wxCHK_* because wxCB_* is used by wxComboBox). - * Determine whether to use a 3-state or 2-state - * checkbox. 3-state enables to differentiate - * between 'unchecked', 'checked' and 'undetermined'. - * - * In addition to the styles here it is also possible to specify just 0 which - * is treated the same as wxCHK_2STATE for compatibility (but using explicit - * flag is preferred). - */ -#define wxCHK_2STATE 0x4000 -#define wxCHK_3STATE 0x1000 - -/* - * If this style is set the user can set the checkbox to the - * undetermined state. If not set the undetermined set can only - * be set programmatically. - * This style can only be used with 3 state checkboxes. - */ -#define wxCHK_ALLOW_3RD_STATE_FOR_USER 0x2000 - -extern WXDLLIMPEXP_DATA_CORE(const char) wxCheckBoxNameStr[]; - -// ---------------------------------------------------------------------------- -// wxCheckBox: a control which shows a label and a box which may be checked -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxCheckBoxBase : public wxControl -{ -public: - wxCheckBoxBase() { } - - // set/get the checked status of the listbox - virtual void SetValue(bool value) = 0; - virtual bool GetValue() const = 0; - - bool IsChecked() const - { - wxASSERT_MSG( !Is3State(), wxT("Calling IsChecked() doesn't make sense for") - wxT(" a three state checkbox, Use Get3StateValue() instead") ); - - return GetValue(); - } - - wxCheckBoxState Get3StateValue() const - { - wxCheckBoxState state = DoGet3StateValue(); - - if ( state == wxCHK_UNDETERMINED && !Is3State() ) - { - // Undetermined state with a 2-state checkbox?? - wxFAIL_MSG( wxT("DoGet3StateValue() says the 2-state checkbox is ") - wxT("in an undetermined/third state") ); - - state = wxCHK_UNCHECKED; - } - - return state; - } - - void Set3StateValue(wxCheckBoxState state) - { - if ( state == wxCHK_UNDETERMINED && !Is3State() ) - { - wxFAIL_MSG(wxT("Setting a 2-state checkbox to undetermined state")); - state = wxCHK_UNCHECKED; - } - - DoSet3StateValue(state); - } - - bool Is3State() const { return HasFlag(wxCHK_3STATE); } - - bool Is3rdStateAllowedForUser() const - { - return HasFlag(wxCHK_ALLOW_3RD_STATE_FOR_USER); - } - - virtual bool HasTransparentBackground() wxOVERRIDE { return true; } - - // wxCheckBox-specific processing after processing the update event - virtual void DoUpdateWindowUI(wxUpdateUIEvent& event) wxOVERRIDE - { - wxControl::DoUpdateWindowUI(event); - - if ( event.GetSetChecked() ) - SetValue(event.GetChecked()); - } - -protected: - // choose the default border for this window - virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } - - virtual void DoSet3StateValue(wxCheckBoxState WXUNUSED(state)) { wxFAIL; } - - virtual wxCheckBoxState DoGet3StateValue() const - { - wxFAIL; - return wxCHK_UNCHECKED; - } - - // Helper function to be called from derived classes Create() - // implementations: it checks that the style doesn't contain any - // incompatible bits and modifies it to be sane if it does. - static void WXValidateStyle(long *stylePtr) - { - long& style = *stylePtr; - - if ( !(style & (wxCHK_2STATE | wxCHK_3STATE)) ) - { - // For compatibility we use absence of style flags as wxCHK_2STATE - // because wxCHK_2STATE used to have the value of 0 and some - // existing code uses 0 instead of it. Moreover, some code even - // uses some non-0 style, e.g. wxBORDER_XXX, but doesn't specify - // neither wxCHK_2STATE nor wxCHK_3STATE -- to avoid breaking it, - // assume (much more common) 2 state checkbox by default. - style |= wxCHK_2STATE; - } - - if ( style & wxCHK_3STATE ) - { - if ( style & wxCHK_2STATE ) - { - wxFAIL_MSG( "wxCHK_2STATE and wxCHK_3STATE can't be used " - "together" ); - style &= ~wxCHK_3STATE; - } - } - else // No wxCHK_3STATE - { - if ( style & wxCHK_ALLOW_3RD_STATE_FOR_USER ) - { - wxFAIL_MSG( "wxCHK_ALLOW_3RD_STATE_FOR_USER doesn't make sense " - "without wxCHK_3STATE" ); - style &= ~wxCHK_ALLOW_3RD_STATE_FOR_USER; - } - } - } - -private: - wxDECLARE_NO_COPY_CLASS(wxCheckBoxBase); -}; - -// Most ports support 3 state checkboxes so define this by default. -#define wxHAS_3STATE_CHECKBOX - -#if defined(__WXUNIVERSAL__) - #include "wx/univ/checkbox.h" -#elif defined(__WXMSW__) - #include "wx/msw/checkbox.h" -#elif defined(__WXMOTIF__) - #include "wx/motif/checkbox.h" -#elif defined(__WXGTK20__) - #include "wx/gtk/checkbox.h" -#elif defined(__WXGTK__) - #undef wxHAS_3STATE_CHECKBOX - #include "wx/gtk1/checkbox.h" -#elif defined(__WXMAC__) - #include "wx/osx/checkbox.h" -#elif defined(__WXQT__) - #include "wx/qt/checkbox.h" -#endif - -#endif // wxUSE_CHECKBOX - -#endif // _WX_CHECKBOX_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/checkeddelete.h b/Externals/wxWidgets3/include/wx/checkeddelete.h deleted file mode 100644 index fd295faf8b..0000000000 --- a/Externals/wxWidgets3/include/wx/checkeddelete.h +++ /dev/null @@ -1,44 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/checkeddelete.h -// Purpose: wxCHECKED_DELETE() macro -// Author: Vadim Zeitlin -// Created: 2009-02-03 -// Copyright: (c) 2002-2009 wxWidgets dev team -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_CHECKEDDELETE_H_ -#define _WX_CHECKEDDELETE_H_ - -#include "wx/cpp.h" - -// TODO: provide wxCheckedDelete[Array]() template functions too - -// ---------------------------------------------------------------------------- -// wxCHECKED_DELETE and wxCHECKED_DELETE_ARRAY macros -// ---------------------------------------------------------------------------- - -/* - checked deleters are used to make sure that the type being deleted is really - a complete type.: otherwise sizeof() would result in a compile-time error - - do { ... } while ( 0 ) construct is used to have an anonymous scope - (otherwise we could have name clashes between different "complete"s) but - still force a semicolon after the macro -*/ - -#define wxCHECKED_DELETE(ptr) \ - wxSTATEMENT_MACRO_BEGIN \ - typedef char complete[sizeof(*ptr)] WX_ATTRIBUTE_UNUSED; \ - delete ptr; \ - wxSTATEMENT_MACRO_END - -#define wxCHECKED_DELETE_ARRAY(ptr) \ - wxSTATEMENT_MACRO_BEGIN \ - typedef char complete[sizeof(*ptr)] WX_ATTRIBUTE_UNUSED; \ - delete [] ptr; \ - wxSTATEMENT_MACRO_END - - -#endif // _WX_CHECKEDDELETE_H_ - diff --git a/Externals/wxWidgets3/include/wx/checklst.h b/Externals/wxWidgets3/include/wx/checklst.h deleted file mode 100644 index 1b06f34c08..0000000000 --- a/Externals/wxWidgets3/include/wx/checklst.h +++ /dev/null @@ -1,57 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/checklst.h -// Purpose: wxCheckListBox class interface -// Author: Vadim Zeitlin -// Modified by: -// Created: 12.09.00 -// Copyright: (c) Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_CHECKLST_H_BASE_ -#define _WX_CHECKLST_H_BASE_ - -#include "wx/defs.h" - -#if wxUSE_CHECKLISTBOX - -#include "wx/listbox.h" - -// ---------------------------------------------------------------------------- -// wxCheckListBox: a listbox whose items may be checked -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxCheckListBoxBase : public wxListBox -{ -public: - wxCheckListBoxBase() { } - - // check list box specific methods - virtual bool IsChecked(unsigned int item) const = 0; - virtual void Check(unsigned int item, bool check = true) = 0; - - virtual unsigned int GetCheckedItems(wxArrayInt& checkedItems) const; - - wxDECLARE_NO_COPY_CLASS(wxCheckListBoxBase); -}; - -#if defined(__WXUNIVERSAL__) - #include "wx/univ/checklst.h" -#elif defined(__WXMSW__) - #include "wx/msw/checklst.h" -#elif defined(__WXMOTIF__) - #include "wx/motif/checklst.h" -#elif defined(__WXGTK20__) - #include "wx/gtk/checklst.h" -#elif defined(__WXGTK__) - #include "wx/gtk1/checklst.h" -#elif defined(__WXMAC__) - #include "wx/osx/checklst.h" -#elif defined(__WXQT__) - #include "wx/qt/checklst.h" -#endif - -#endif // wxUSE_CHECKLISTBOX - -#endif - // _WX_CHECKLST_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/chkconf.h b/Externals/wxWidgets3/include/wx/chkconf.h deleted file mode 100644 index 0e4814216d..0000000000 --- a/Externals/wxWidgets3/include/wx/chkconf.h +++ /dev/null @@ -1,2327 +0,0 @@ -/* - * Name: wx/chkconf.h - * Purpose: check the config settings for consistency - * Author: Vadim Zeitlin - * Modified by: - * Created: 09.08.00 - * Copyright: (c) 2000 Vadim Zeitlin - * Licence: wxWindows licence - */ - -/* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */ -#ifndef _WX_CHKCONF_H_ -#define _WX_CHKCONF_H_ - -/* - ************************************************** - PLEASE READ THIS IF YOU GET AN ERROR IN THIS FILE! - ************************************************** - - If you get an error saying "wxUSE_FOO must be defined", it means that you - are not using the correct up-to-date version of setup.h. This happens most - often when using git or snapshots and a new symbol was added to setup0.h - and you haven't updated your local setup.h to reflect it. If this is the - case, you need to propagate the changes from setup0.h to your setup.h and, - if using makefiles under MSW, also remove setup.h under the build directory - (lib/$(COMPILER)_{lib,dll}/msw[u][d][dll]/wx) so that the new setup.h is - copied there. - - If you get an error of the form "wxFoo requires wxBar", then the settings - in your setup.h are inconsistent. You have the choice between correcting - them manually or commenting out #define wxABORT_ON_CONFIG_ERROR below to - try to correct the problems automatically (not really recommended but - might work). - */ - -/* - This file has the following sections: - 1. checks that all wxUSE_XXX symbols we use are defined - a) first the non-GUI ones - b) then the GUI-only ones - 2. platform-specific checks done in the platform headers - 3. generic consistency checks - a) first the non-GUI ones - b) then the GUI-only ones - */ - -/* - this global setting determines what should we do if the setting FOO - requires BAR and BAR is not set: we can either silently unset FOO as well - (do this if you're trying to build the smallest possible library) or give an - error and abort (default as leads to least surprising behaviour) - */ -#define wxABORT_ON_CONFIG_ERROR - -/* - global features - */ - -/* - If we're compiling without support for threads/exceptions we have to - disable the corresponding features. - */ -#ifdef wxNO_THREADS -# undef wxUSE_THREADS -# define wxUSE_THREADS 0 -#endif /* wxNO_THREADS */ - -#ifdef wxNO_EXCEPTIONS -# undef wxUSE_EXCEPTIONS -# define wxUSE_EXCEPTIONS 0 -#endif /* wxNO_EXCEPTIONS */ - -/* we also must disable exceptions if compiler doesn't support them */ -#if defined(_MSC_VER) && !defined(_CPPUNWIND) -# undef wxUSE_EXCEPTIONS -# define wxUSE_EXCEPTIONS 0 -#endif /* VC++ without exceptions support */ - - -/* - Section 1a: tests for non GUI features. - - please keep the options in alphabetical order! - */ - -#ifndef wxUSE_ANY -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_ANY must be defined, please read comment near the top of this file." -# else -# define wxUSE_ANY 0 -# endif -#endif /* wxUSE_ANY */ - -#ifndef wxUSE_COMPILER_TLS -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_COMPILER_TLS must be defined, please read comment near the top of this file." -# else -# define wxUSE_COMPILER_TLS 0 -# endif -#endif /* !defined(wxUSE_COMPILER_TLS) */ - -#ifndef wxUSE_CONSOLE_EVENTLOOP -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_CONSOLE_EVENTLOOP must be defined, please read comment near the top of this file." -# else -# define wxUSE_CONSOLE_EVENTLOOP 0 -# endif -#endif /* !defined(wxUSE_CONSOLE_EVENTLOOP) */ - -#ifndef wxUSE_DYNLIB_CLASS -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_DYNLIB_CLASS must be defined, please read comment near the top of this file." -# else -# define wxUSE_DYNLIB_CLASS 0 -# endif -#endif /* !defined(wxUSE_DYNLIB_CLASS) */ - -#ifndef wxUSE_EXCEPTIONS -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_EXCEPTIONS must be defined, please read comment near the top of this file." -# else -# define wxUSE_EXCEPTIONS 0 -# endif -#endif /* !defined(wxUSE_EXCEPTIONS) */ - -#ifndef wxUSE_FILE_HISTORY -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_FILE_HISTORY must be defined, please read comment near the top of this file." -# else -# define wxUSE_FILE_HISTORY 0 -# endif -#endif /* !defined(wxUSE_FILE_HISTORY) */ - -#ifndef wxUSE_FILESYSTEM -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_FILESYSTEM must be defined, please read comment near the top of this file." -# else -# define wxUSE_FILESYSTEM 0 -# endif -#endif /* !defined(wxUSE_FILESYSTEM) */ - -#ifndef wxUSE_FS_ARCHIVE -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_FS_ARCHIVE must be defined, please read comment near the top of this file." -# else -# define wxUSE_FS_ARCHIVE 0 -# endif -#endif /* !defined(wxUSE_FS_ARCHIVE) */ - -#ifndef wxUSE_FSVOLUME -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_FSVOLUME must be defined, please read comment near the top of this file." -# else -# define wxUSE_FSVOLUME 0 -# endif -#endif /* !defined(wxUSE_FSVOLUME) */ - -#ifndef wxUSE_FSWATCHER -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_FSWATCHER must be defined, please read comment near the top of this file." -# else -# define wxUSE_FSWATCHER 0 -# endif -#endif /* !defined(wxUSE_FSWATCHER) */ - -#ifndef wxUSE_DYNAMIC_LOADER -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_DYNAMIC_LOADER must be defined, please read comment near the top of this file." -# else -# define wxUSE_DYNAMIC_LOADER 0 -# endif -#endif /* !defined(wxUSE_DYNAMIC_LOADER) */ - -#ifndef wxUSE_INTL -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_INTL must be defined, please read comment near the top of this file." -# else -# define wxUSE_INTL 0 -# endif -#endif /* !defined(wxUSE_INTL) */ - -#ifndef wxUSE_IPV6 -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_IPV6 must be defined, please read comment near the top of this file." -# else -# define wxUSE_IPV6 0 -# endif -#endif /* !defined(wxUSE_IPV6) */ - -#ifndef wxUSE_LOG -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_LOG must be defined, please read comment near the top of this file." -# else -# define wxUSE_LOG 0 -# endif -#endif /* !defined(wxUSE_LOG) */ - -#ifndef wxUSE_LONGLONG -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_LONGLONG must be defined, please read comment near the top of this file." -# else -# define wxUSE_LONGLONG 0 -# endif -#endif /* !defined(wxUSE_LONGLONG) */ - -#ifndef wxUSE_MIMETYPE -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_MIMETYPE must be defined, please read comment near the top of this file." -# else -# define wxUSE_MIMETYPE 0 -# endif -#endif /* !defined(wxUSE_MIMETYPE) */ - -#ifndef wxUSE_ON_FATAL_EXCEPTION -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_ON_FATAL_EXCEPTION must be defined, please read comment near the top of this file." -# else -# define wxUSE_ON_FATAL_EXCEPTION 0 -# endif -#endif /* !defined(wxUSE_ON_FATAL_EXCEPTION) */ - -#ifndef wxUSE_PRINTF_POS_PARAMS -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_PRINTF_POS_PARAMS must be defined, please read comment near the top of this file." -# else -# define wxUSE_PRINTF_POS_PARAMS 0 -# endif -#endif /* !defined(wxUSE_PRINTF_POS_PARAMS) */ - -#ifndef wxUSE_PROTOCOL -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_PROTOCOL must be defined, please read comment near the top of this file." -# else -# define wxUSE_PROTOCOL 0 -# endif -#endif /* !defined(wxUSE_PROTOCOL) */ - -/* we may not define wxUSE_PROTOCOL_XXX if wxUSE_PROTOCOL is set to 0 */ -#if !wxUSE_PROTOCOL -# undef wxUSE_PROTOCOL_HTTP -# undef wxUSE_PROTOCOL_FTP -# undef wxUSE_PROTOCOL_FILE -# define wxUSE_PROTOCOL_HTTP 0 -# define wxUSE_PROTOCOL_FTP 0 -# define wxUSE_PROTOCOL_FILE 0 -#endif /* wxUSE_PROTOCOL */ - -#ifndef wxUSE_PROTOCOL_HTTP -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_PROTOCOL_HTTP must be defined, please read comment near the top of this file." -# else -# define wxUSE_PROTOCOL_HTTP 0 -# endif -#endif /* !defined(wxUSE_PROTOCOL_HTTP) */ - -#ifndef wxUSE_PROTOCOL_FTP -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_PROTOCOL_FTP must be defined, please read comment near the top of this file." -# else -# define wxUSE_PROTOCOL_FTP 0 -# endif -#endif /* !defined(wxUSE_PROTOCOL_FTP) */ - -#ifndef wxUSE_PROTOCOL_FILE -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_PROTOCOL_FILE must be defined, please read comment near the top of this file." -# else -# define wxUSE_PROTOCOL_FILE 0 -# endif -#endif /* !defined(wxUSE_PROTOCOL_FILE) */ - -#ifndef wxUSE_REGEX -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_REGEX must be defined, please read comment near the top of this file." -# else -# define wxUSE_REGEX 0 -# endif -#endif /* !defined(wxUSE_REGEX) */ - -#ifndef wxUSE_STDPATHS -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_STDPATHS must be defined, please read comment near the top of this file." -# else -# define wxUSE_STDPATHS 1 -# endif -#endif /* !defined(wxUSE_STDPATHS) */ - -#ifndef wxUSE_XML -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_XML must be defined, please read comment near the top of this file." -# else -# define wxUSE_XML 0 -# endif -#endif /* !defined(wxUSE_XML) */ - -#ifndef wxUSE_SOCKETS -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_SOCKETS must be defined, please read comment near the top of this file." -# else -# define wxUSE_SOCKETS 0 -# endif -#endif /* !defined(wxUSE_SOCKETS) */ - -#ifndef wxUSE_STD_CONTAINERS -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_STD_CONTAINERS must be defined, please read comment near the top of this file." -# else -# define wxUSE_STD_CONTAINERS 0 -# endif -#endif /* !defined(wxUSE_STD_CONTAINERS) */ - -#ifndef wxUSE_STD_CONTAINERS_COMPATIBLY -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_STD_CONTAINERS_COMPATIBLY must be defined, please read comment near the top of this file." -# else -# define wxUSE_STD_CONTAINERS_COMPATIBLY 0 -# endif -#endif /* !defined(wxUSE_STD_CONTAINERS_COMPATIBLY) */ - -#ifndef wxUSE_STD_STRING_CONV_IN_WXSTRING -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_STD_STRING_CONV_IN_WXSTRING must be defined, please read comment near the top of this file." -# else -# define wxUSE_STD_STRING_CONV_IN_WXSTRING 0 -# endif -#endif /* !defined(wxUSE_STD_STRING_CONV_IN_WXSTRING) */ - -#ifndef wxUSE_STREAMS -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_STREAMS must be defined, please read comment near the top of this file." -# else -# define wxUSE_STREAMS 0 -# endif -#endif /* !defined(wxUSE_STREAMS) */ - -#ifndef wxUSE_STOPWATCH -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_STOPWATCH must be defined, please read comment near the top of this file." -# else -# define wxUSE_STOPWATCH 0 -# endif -#endif /* !defined(wxUSE_STOPWATCH) */ - -#ifndef wxUSE_TEXTBUFFER -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_TEXTBUFFER must be defined, please read comment near the top of this file." -# else -# define wxUSE_TEXTBUFFER 0 -# endif -#endif /* !defined(wxUSE_TEXTBUFFER) */ - -#ifndef wxUSE_TEXTFILE -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_TEXTFILE must be defined, please read comment near the top of this file." -# else -# define wxUSE_TEXTFILE 0 -# endif -#endif /* !defined(wxUSE_TEXTFILE) */ - -#ifndef wxUSE_UNICODE -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_UNICODE must be defined, please read comment near the top of this file." -# else -# define wxUSE_UNICODE 0 -# endif -#endif /* !defined(wxUSE_UNICODE) */ - -#ifndef wxUSE_URL -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_URL must be defined, please read comment near the top of this file." -# else -# define wxUSE_URL 0 -# endif -#endif /* !defined(wxUSE_URL) */ - -#ifndef wxUSE_VARIANT -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_VARIANT must be defined, please read comment near the top of this file." -# else -# define wxUSE_VARIANT 0 -# endif -#endif /* wxUSE_VARIANT */ - -#ifndef wxUSE_XLOCALE -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_XLOCALE must be defined, please read comment near the top of this file." -# else -# define wxUSE_XLOCALE 0 -# endif -#endif /* !defined(wxUSE_XLOCALE) */ - -/* - Section 1b: all these tests are for GUI only. - - please keep the options in alphabetical order! - */ -#if wxUSE_GUI - -/* - all of the settings tested below must be defined or we'd get an error from - preprocessor about invalid integer expression - */ - -#ifndef wxUSE_ABOUTDLG -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_ABOUTDLG must be defined, please read comment near the top of this file." -# else -# define wxUSE_ABOUTDLG 0 -# endif -#endif /* !defined(wxUSE_ABOUTDLG) */ - -#ifndef wxUSE_ACCEL -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_ACCEL must be defined, please read comment near the top of this file." -# else -# define wxUSE_ACCEL 0 -# endif -#endif /* !defined(wxUSE_ACCEL) */ - -#ifndef wxUSE_ACCESSIBILITY -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_ACCESSIBILITY must be defined, please read comment near the top of this file." -# else -# define wxUSE_ACCESSIBILITY 0 -# endif -#endif /* !defined(wxUSE_ACCESSIBILITY) */ - -#ifndef wxUSE_ADDREMOVECTRL -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_ADDREMOVECTRL must be defined, please read comment near the top of this file." -# else -# define wxUSE_ADDREMOVECTRL 0 -# endif -#endif /* !defined(wxUSE_ADDREMOVECTRL) */ - -#ifndef wxUSE_ACTIVITYINDICATOR -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_ACTIVITYINDICATOR must be defined, please read comment near the top of this file." -# else -# define wxUSE_ACTIVITYINDICATOR 0 -# endif -#endif /* !defined(wxUSE_ACTIVITYINDICATOR) */ - -#ifndef wxUSE_ANIMATIONCTRL -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_ANIMATIONCTRL must be defined, please read comment near the top of this file." -# else -# define wxUSE_ANIMATIONCTRL 0 -# endif -#endif /* !defined(wxUSE_ANIMATIONCTRL) */ - -#ifndef wxUSE_ARTPROVIDER_STD -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_ARTPROVIDER_STD must be defined, please read comment near the top of this file." -# else -# define wxUSE_ARTPROVIDER_STD 0 -# endif -#endif /* !defined(wxUSE_ARTPROVIDER_STD) */ - -#ifndef wxUSE_ARTPROVIDER_TANGO -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_ARTPROVIDER_TANGO must be defined, please read comment near the top of this file." -# else -# define wxUSE_ARTPROVIDER_TANGO 0 -# endif -#endif /* !defined(wxUSE_ARTPROVIDER_TANGO) */ - -#ifndef wxUSE_AUTOID_MANAGEMENT -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_AUTOID_MANAGEMENT must be defined, please read comment near the top of this file." -# else -# define wxUSE_AUTOID_MANAGEMENT 0 -# endif -#endif /* !defined(wxUSE_AUTOID_MANAGEMENT) */ - -#ifndef wxUSE_BITMAPCOMBOBOX -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_BITMAPCOMBOBOX must be defined, please read comment near the top of this file." -# else -# define wxUSE_BITMAPCOMBOBOX 0 -# endif -#endif /* !defined(wxUSE_BITMAPCOMBOBOX) */ - -#ifndef wxUSE_BMPBUTTON -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_BMPBUTTON must be defined, please read comment near the top of this file." -# else -# define wxUSE_BMPBUTTON 0 -# endif -#endif /* !defined(wxUSE_BMPBUTTON) */ - -#ifndef wxUSE_BUTTON -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_BUTTON must be defined, please read comment near the top of this file." -# else -# define wxUSE_BUTTON 0 -# endif -#endif /* !defined(wxUSE_BUTTON) */ - -#ifndef wxUSE_CAIRO -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_CAIRO must be defined, please read comment near the top of this file." -# else -# define wxUSE_CAIRO 0 -# endif -#endif /* !defined(wxUSE_CAIRO) */ - -#ifndef wxUSE_CALENDARCTRL -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_CALENDARCTRL must be defined, please read comment near the top of this file." -# else -# define wxUSE_CALENDARCTRL 0 -# endif -#endif /* !defined(wxUSE_CALENDARCTRL) */ - -#ifndef wxUSE_CARET -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_CARET must be defined, please read comment near the top of this file." -# else -# define wxUSE_CARET 0 -# endif -#endif /* !defined(wxUSE_CARET) */ - -#ifndef wxUSE_CHECKBOX -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_CHECKBOX must be defined, please read comment near the top of this file." -# else -# define wxUSE_CHECKBOX 0 -# endif -#endif /* !defined(wxUSE_CHECKBOX) */ - -#ifndef wxUSE_CHECKLISTBOX -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_CHECKLISTBOX must be defined, please read comment near the top of this file." -# else -# define wxUSE_CHECKLISTBOX 0 -# endif -#endif /* !defined(wxUSE_CHECKLISTBOX) */ - -#ifndef wxUSE_CHOICE -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_CHOICE must be defined, please read comment near the top of this file." -# else -# define wxUSE_CHOICE 0 -# endif -#endif /* !defined(wxUSE_CHOICE) */ - -#ifndef wxUSE_CHOICEBOOK -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_CHOICEBOOK must be defined, please read comment near the top of this file." -# else -# define wxUSE_CHOICEBOOK 0 -# endif -#endif /* !defined(wxUSE_CHOICEBOOK) */ - -#ifndef wxUSE_CHOICEDLG -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_CHOICEDLG must be defined, please read comment near the top of this file." -# else -# define wxUSE_CHOICEDLG 0 -# endif -#endif /* !defined(wxUSE_CHOICEDLG) */ - -#ifndef wxUSE_CLIPBOARD -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_CLIPBOARD must be defined, please read comment near the top of this file." -# else -# define wxUSE_CLIPBOARD 0 -# endif -#endif /* !defined(wxUSE_CLIPBOARD) */ - -#ifndef wxUSE_COLLPANE -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_COLLPANE must be defined, please read comment near the top of this file." -# else -# define wxUSE_COLLPANE 0 -# endif -#endif /* !defined(wxUSE_COLLPANE) */ - -#ifndef wxUSE_COLOURDLG -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_COLOURDLG must be defined, please read comment near the top of this file." -# else -# define wxUSE_COLOURDLG 0 -# endif -#endif /* !defined(wxUSE_COLOURDLG) */ - -#ifndef wxUSE_COLOURPICKERCTRL -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_COLOURPICKERCTRL must be defined, please read comment near the top of this file." -# else -# define wxUSE_COLOURPICKERCTRL 0 -# endif -#endif /* !defined(wxUSE_COLOURPICKERCTRL) */ - -#ifndef wxUSE_COMBOBOX -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_COMBOBOX must be defined, please read comment near the top of this file." -# else -# define wxUSE_COMBOBOX 0 -# endif -#endif /* !defined(wxUSE_COMBOBOX) */ - -#ifndef wxUSE_COMMANDLINKBUTTON -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_COMMANDLINKBUTTON must be defined, please read comment near the top of this file." -# else -# define wxUSE_COMMANDLINKBUTTON 0 -# endif -#endif /* !defined(wxUSE_COMMANDLINKBUTTON) */ - -#ifndef wxUSE_COMBOCTRL -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_COMBOCTRL must be defined, please read comment near the top of this file." -# else -# define wxUSE_COMBOCTRL 0 -# endif -#endif /* !defined(wxUSE_COMBOCTRL) */ - -#ifndef wxUSE_DATAOBJ -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_DATAOBJ must be defined, please read comment near the top of this file." -# else -# define wxUSE_DATAOBJ 0 -# endif -#endif /* !defined(wxUSE_DATAOBJ) */ - -#ifndef wxUSE_DATAVIEWCTRL -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_DATAVIEWCTRL must be defined, please read comment near the top of this file." -# else -# define wxUSE_DATAVIEWCTRL 0 -# endif -#endif /* !defined(wxUSE_DATAVIEWCTRL) */ - -#ifndef wxUSE_DATEPICKCTRL -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_DATEPICKCTRL must be defined, please read comment near the top of this file." -# else -# define wxUSE_DATEPICKCTRL 0 -# endif -#endif /* !defined(wxUSE_DATEPICKCTRL) */ - -#ifndef wxUSE_DC_TRANSFORM_MATRIX -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_DC_TRANSFORM_MATRIX must be defined, please read comment near the top of this file." -# else -# define wxUSE_DC_TRANSFORM_MATRIX 1 -# endif -#endif /* wxUSE_DC_TRANSFORM_MATRIX */ - -#ifndef wxUSE_DIRPICKERCTRL -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_DIRPICKERCTRL must be defined, please read comment near the top of this file." -# else -# define wxUSE_DIRPICKERCTRL 0 -# endif -#endif /* !defined(wxUSE_DIRPICKERCTRL) */ - -#ifndef wxUSE_DISPLAY -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_DISPLAY must be defined, please read comment near the top of this file." -# else -# define wxUSE_DISPLAY 0 -# endif -#endif /* !defined(wxUSE_DISPLAY) */ - -#ifndef wxUSE_DOC_VIEW_ARCHITECTURE -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_DOC_VIEW_ARCHITECTURE must be defined, please read comment near the top of this file." -# else -# define wxUSE_DOC_VIEW_ARCHITECTURE 0 -# endif -#endif /* !defined(wxUSE_DOC_VIEW_ARCHITECTURE) */ - -#ifndef wxUSE_FILECTRL -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_FILECTRL must be defined, please read comment near the top of this file." -# else -# define wxUSE_FILECTRL 0 -# endif -#endif /* !defined(wxUSE_FILECTRL) */ - -#ifndef wxUSE_FILEDLG -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_FILEDLG must be defined, please read comment near the top of this file." -# else -# define wxUSE_FILEDLG 0 -# endif -#endif /* !defined(wxUSE_FILEDLG) */ - -#ifndef wxUSE_FILEPICKERCTRL -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_FILEPICKERCTRL must be defined, please read comment near the top of this file." -# else -# define wxUSE_FILEPICKERCTRL 0 -# endif -#endif /* !defined(wxUSE_FILEPICKERCTRL) */ - -#ifndef wxUSE_FONTDLG -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_FONTDLG must be defined, please read comment near the top of this file." -# else -# define wxUSE_FONTDLG 0 -# endif -#endif /* !defined(wxUSE_FONTDLG) */ - -#ifndef wxUSE_FONTMAP -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_FONTMAP must be defined, please read comment near the top of this file." -# else -# define wxUSE_FONTMAP 0 -# endif -#endif /* !defined(wxUSE_FONTMAP) */ - -#ifndef wxUSE_FONTPICKERCTRL -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_FONTPICKERCTRL must be defined, please read comment near the top of this file." -# else -# define wxUSE_FONTPICKERCTRL 0 -# endif -#endif /* !defined(wxUSE_FONTPICKERCTRL) */ - -#ifndef wxUSE_GAUGE -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_GAUGE must be defined, please read comment near the top of this file." -# else -# define wxUSE_GAUGE 0 -# endif -#endif /* !defined(wxUSE_GAUGE) */ - -#ifndef wxUSE_GRAPHICS_CONTEXT -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_GRAPHICS_CONTEXT must be defined, please read comment near the top of this file." -# else -# define wxUSE_GRAPHICS_CONTEXT 0 -# endif -#endif /* !defined(wxUSE_GRAPHICS_CONTEXT) */ - - -#ifndef wxUSE_GRID -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_GRID must be defined, please read comment near the top of this file." -# else -# define wxUSE_GRID 0 -# endif -#endif /* !defined(wxUSE_GRID) */ - -#ifndef wxUSE_HEADERCTRL -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_HEADERCTRL must be defined, please read comment near the top of this file." -# else -# define wxUSE_HEADERCTRL 0 -# endif -#endif /* !defined(wxUSE_HEADERCTRL) */ - -#ifndef wxUSE_HELP -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_HELP must be defined, please read comment near the top of this file." -# else -# define wxUSE_HELP 0 -# endif -#endif /* !defined(wxUSE_HELP) */ - -#ifndef wxUSE_HYPERLINKCTRL -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_HYPERLINKCTRL must be defined, please read comment near the top of this file." -# else -# define wxUSE_HYPERLINKCTRL 0 -# endif -#endif /* !defined(wxUSE_HYPERLINKCTRL) */ - -#ifndef wxUSE_HTML -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_HTML must be defined, please read comment near the top of this file." -# else -# define wxUSE_HTML 0 -# endif -#endif /* !defined(wxUSE_HTML) */ - -#ifndef wxUSE_LIBMSPACK -# if !defined(__UNIX__) - /* set to 0 on platforms that don't have libmspack */ -# define wxUSE_LIBMSPACK 0 -# else -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_LIBMSPACK must be defined, please read comment near the top of this file." -# else -# define wxUSE_LIBMSPACK 0 -# endif -# endif -#endif /* !defined(wxUSE_LIBMSPACK) */ - -#ifndef wxUSE_ICO_CUR -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_ICO_CUR must be defined, please read comment near the top of this file." -# else -# define wxUSE_ICO_CUR 0 -# endif -#endif /* !defined(wxUSE_ICO_CUR) */ - -#ifndef wxUSE_IFF -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_IFF must be defined, please read comment near the top of this file." -# else -# define wxUSE_IFF 0 -# endif -#endif /* !defined(wxUSE_IFF) */ - -#ifndef wxUSE_IMAGLIST -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_IMAGLIST must be defined, please read comment near the top of this file." -# else -# define wxUSE_IMAGLIST 0 -# endif -#endif /* !defined(wxUSE_IMAGLIST) */ - -#ifndef wxUSE_INFOBAR -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_INFOBAR must be defined, please read comment near the top of this file." -# else -# define wxUSE_INFOBAR 0 -# endif -#endif /* !defined(wxUSE_INFOBAR) */ - -#ifndef wxUSE_JOYSTICK -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_JOYSTICK must be defined, please read comment near the top of this file." -# else -# define wxUSE_JOYSTICK 0 -# endif -#endif /* !defined(wxUSE_JOYSTICK) */ - -#ifndef wxUSE_LISTBOOK -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_LISTBOOK must be defined, please read comment near the top of this file." -# else -# define wxUSE_LISTBOOK 0 -# endif -#endif /* !defined(wxUSE_LISTBOOK) */ - -#ifndef wxUSE_LISTBOX -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_LISTBOX must be defined, please read comment near the top of this file." -# else -# define wxUSE_LISTBOX 0 -# endif -#endif /* !defined(wxUSE_LISTBOX) */ - -#ifndef wxUSE_LISTCTRL -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_LISTCTRL must be defined, please read comment near the top of this file." -# else -# define wxUSE_LISTCTRL 0 -# endif -#endif /* !defined(wxUSE_LISTCTRL) */ - -#ifndef wxUSE_LOGGUI -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_LOGGUI must be defined, please read comment near the top of this file." -# else -# define wxUSE_LOGGUI 0 -# endif -#endif /* !defined(wxUSE_LOGGUI) */ - -#ifndef wxUSE_LOGWINDOW -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_LOGWINDOW must be defined, please read comment near the top of this file." -# else -# define wxUSE_LOGWINDOW 0 -# endif -#endif /* !defined(wxUSE_LOGWINDOW) */ - -#ifndef wxUSE_LOG_DIALOG -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_LOG_DIALOG must be defined, please read comment near the top of this file." -# else -# define wxUSE_LOG_DIALOG 0 -# endif -#endif /* !defined(wxUSE_LOG_DIALOG) */ - -#ifndef wxUSE_MARKUP -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_MARKUP must be defined, please read comment near the top of this file." -# else -# define wxUSE_MARKUP 0 -# endif -#endif /* !defined(wxUSE_MARKUP) */ - -#ifndef wxUSE_MDI -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_MDI must be defined, please read comment near the top of this file." -# else -# define wxUSE_MDI 0 -# endif -#endif /* !defined(wxUSE_MDI) */ - -#ifndef wxUSE_MDI_ARCHITECTURE -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_MDI_ARCHITECTURE must be defined, please read comment near the top of this file." -# else -# define wxUSE_MDI_ARCHITECTURE 0 -# endif -#endif /* !defined(wxUSE_MDI_ARCHITECTURE) */ - -#ifndef wxUSE_MENUS -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_MENUS must be defined, please read comment near the top of this file." -# else -# define wxUSE_MENUS 0 -# endif -#endif /* !defined(wxUSE_MENUS) */ - -#ifndef wxUSE_MSGDLG -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_MSGDLG must be defined, please read comment near the top of this file." -# else -# define wxUSE_MSGDLG 0 -# endif -#endif /* !defined(wxUSE_MSGDLG) */ - -#ifndef wxUSE_NOTEBOOK -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_NOTEBOOK must be defined, please read comment near the top of this file." -# else -# define wxUSE_NOTEBOOK 0 -# endif -#endif /* !defined(wxUSE_NOTEBOOK) */ - -#ifndef wxUSE_NOTIFICATION_MESSAGE -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_NOTIFICATION_MESSAGE must be defined, please read comment near the top of this file." -# else -# define wxUSE_NOTIFICATION_MESSAGE 0 -# endif -#endif /* !defined(wxUSE_NOTIFICATION_MESSAGE) */ - -#ifndef wxUSE_ODCOMBOBOX -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_ODCOMBOBOX must be defined, please read comment near the top of this file." -# else -# define wxUSE_ODCOMBOBOX 0 -# endif -#endif /* !defined(wxUSE_ODCOMBOBOX) */ - -#ifndef wxUSE_PALETTE -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_PALETTE must be defined, please read comment near the top of this file." -# else -# define wxUSE_PALETTE 0 -# endif -#endif /* !defined(wxUSE_PALETTE) */ - -#ifndef wxUSE_POPUPWIN -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_POPUPWIN must be defined, please read comment near the top of this file." -# else -# define wxUSE_POPUPWIN 0 -# endif -#endif /* !defined(wxUSE_POPUPWIN) */ - -#ifndef wxUSE_PREFERENCES_EDITOR -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_PREFERENCES_EDITOR must be defined, please read comment near the top of this file." -# else -# define wxUSE_PREFERENCES_EDITOR 0 -# endif -#endif /* !defined(wxUSE_PREFERENCES_EDITOR) */ - -#ifndef wxUSE_PRINTING_ARCHITECTURE -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_PRINTING_ARCHITECTURE must be defined, please read comment near the top of this file." -# else -# define wxUSE_PRINTING_ARCHITECTURE 0 -# endif -#endif /* !defined(wxUSE_PRINTING_ARCHITECTURE) */ - -#ifndef wxUSE_RADIOBOX -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_RADIOBOX must be defined, please read comment near the top of this file." -# else -# define wxUSE_RADIOBOX 0 -# endif -#endif /* !defined(wxUSE_RADIOBOX) */ - -#ifndef wxUSE_RADIOBTN -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_RADIOBTN must be defined, please read comment near the top of this file." -# else -# define wxUSE_RADIOBTN 0 -# endif -#endif /* !defined(wxUSE_RADIOBTN) */ - -#ifndef wxUSE_REARRANGECTRL -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_REARRANGECTRL must be defined, please read comment near the top of this file." -# else -# define wxUSE_REARRANGECTRL 0 -# endif -#endif /* !defined(wxUSE_REARRANGECTRL) */ - -#ifndef wxUSE_RIBBON -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_RIBBON must be defined, please read comment near the top of this file." -# else -# define wxUSE_RIBBON 0 -# endif -#endif /* !defined(wxUSE_RIBBON) */ - -#ifndef wxUSE_RICHMSGDLG -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_RICHMSGDLG must be defined, please read comment near the top of this file." -# else -# define wxUSE_RICHMSGDLG 0 -# endif -#endif /* !defined(wxUSE_RICHMSGDLG) */ - -#ifndef wxUSE_RICHTOOLTIP -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_RICHTOOLTIP must be defined, please read comment near the top of this file." -# else -# define wxUSE_RICHTOOLTIP 0 -# endif -#endif /* !defined(wxUSE_RICHTOOLTIP) */ - -#ifndef wxUSE_SASH -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_SASH must be defined, please read comment near the top of this file." -# else -# define wxUSE_SASH 0 -# endif -#endif /* !defined(wxUSE_SASH) */ - -#ifndef wxUSE_SCROLLBAR -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_SCROLLBAR must be defined, please read comment near the top of this file." -# else -# define wxUSE_SCROLLBAR 0 -# endif -#endif /* !defined(wxUSE_SCROLLBAR) */ - -#ifndef wxUSE_SLIDER -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_SLIDER must be defined, please read comment near the top of this file." -# else -# define wxUSE_SLIDER 0 -# endif -#endif /* !defined(wxUSE_SLIDER) */ - -#ifndef wxUSE_SOUND -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_SOUND must be defined, please read comment near the top of this file." -# else -# define wxUSE_SOUND 0 -# endif -#endif /* !defined(wxUSE_SOUND) */ - -#ifndef wxUSE_SPINBTN -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_SPINBTN must be defined, please read comment near the top of this file." -# else -# define wxUSE_SPINBTN 0 -# endif -#endif /* !defined(wxUSE_SPINBTN) */ - -#ifndef wxUSE_SPINCTRL -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_SPINCTRL must be defined, please read comment near the top of this file." -# else -# define wxUSE_SPINCTRL 0 -# endif -#endif /* !defined(wxUSE_SPINCTRL) */ - -#ifndef wxUSE_SPLASH -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_SPLASH must be defined, please read comment near the top of this file." -# else -# define wxUSE_SPLASH 0 -# endif -#endif /* !defined(wxUSE_SPLASH) */ - -#ifndef wxUSE_SPLITTER -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_SPLITTER must be defined, please read comment near the top of this file." -# else -# define wxUSE_SPLITTER 0 -# endif -#endif /* !defined(wxUSE_SPLITTER) */ - -#ifndef wxUSE_STATBMP -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_STATBMP must be defined, please read comment near the top of this file." -# else -# define wxUSE_STATBMP 0 -# endif -#endif /* !defined(wxUSE_STATBMP) */ - -#ifndef wxUSE_STATBOX -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_STATBOX must be defined, please read comment near the top of this file." -# else -# define wxUSE_STATBOX 0 -# endif -#endif /* !defined(wxUSE_STATBOX) */ - -#ifndef wxUSE_STATLINE -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_STATLINE must be defined, please read comment near the top of this file." -# else -# define wxUSE_STATLINE 0 -# endif -#endif /* !defined(wxUSE_STATLINE) */ - -#ifndef wxUSE_STATTEXT -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_STATTEXT must be defined, please read comment near the top of this file." -# else -# define wxUSE_STATTEXT 0 -# endif -#endif /* !defined(wxUSE_STATTEXT) */ - -#ifndef wxUSE_STATUSBAR -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_STATUSBAR must be defined, please read comment near the top of this file." -# else -# define wxUSE_STATUSBAR 0 -# endif -#endif /* !defined(wxUSE_STATUSBAR) */ - -#ifndef wxUSE_TASKBARICON -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_TASKBARICON must be defined, please read comment near the top of this file." -# else -# define wxUSE_TASKBARICON 0 -# endif -#endif /* !defined(wxUSE_TASKBARICON) */ - -#ifndef wxUSE_TEXTCTRL -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_TEXTCTRL must be defined, please read comment near the top of this file." -# else -# define wxUSE_TEXTCTRL 0 -# endif -#endif /* !defined(wxUSE_TEXTCTRL) */ - -#ifndef wxUSE_TIMEPICKCTRL -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_TIMEPICKCTRL must be defined, please read comment near the top of this file." -# else -# define wxUSE_TIMEPICKCTRL 0 -# endif -#endif /* !defined(wxUSE_TIMEPICKCTRL) */ - -#ifndef wxUSE_TIPWINDOW -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_TIPWINDOW must be defined, please read comment near the top of this file." -# else -# define wxUSE_TIPWINDOW 0 -# endif -#endif /* !defined(wxUSE_TIPWINDOW) */ - -#ifndef wxUSE_TOOLBAR -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_TOOLBAR must be defined, please read comment near the top of this file." -# else -# define wxUSE_TOOLBAR 0 -# endif -#endif /* !defined(wxUSE_TOOLBAR) */ - -#ifndef wxUSE_TOOLTIPS -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_TOOLTIPS must be defined, please read comment near the top of this file." -# else -# define wxUSE_TOOLTIPS 0 -# endif -#endif /* !defined(wxUSE_TOOLTIPS) */ - -#ifndef wxUSE_TREECTRL -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_TREECTRL must be defined, please read comment near the top of this file." -# else -# define wxUSE_TREECTRL 0 -# endif -#endif /* !defined(wxUSE_TREECTRL) */ - -#ifndef wxUSE_TREELISTCTRL -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_TREELISTCTRL must be defined, please read comment near the top of this file." -# else -# define wxUSE_TREELISTCTRL 0 -# endif -#endif /* !defined(wxUSE_TREELISTCTRL) */ - -#ifndef wxUSE_UIACTIONSIMULATOR -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_UIACTIONSIMULATOR must be defined, please read comment near the top of this file." -# else -# define wxUSE_UIACTIONSIMULATOR 0 -# endif -#endif /* !defined(wxUSE_UIACTIONSIMULATOR) */ - -#ifndef wxUSE_VALIDATORS -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_VALIDATORS must be defined, please read comment near the top of this file." -# else -# define wxUSE_VALIDATORS 0 -# endif -#endif /* !defined(wxUSE_VALIDATORS) */ - -#ifndef wxUSE_WEBVIEW -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_WEBVIEW must be defined, please read comment near the top of this file." -# else -# define wxUSE_WEBVIEW 0 -# endif -#endif /* !defined(wxUSE_WEBVIEW) */ - -#ifndef wxUSE_WXHTML_HELP -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_WXHTML_HELP must be defined, please read comment near the top of this file." -# else -# define wxUSE_WXHTML_HELP 0 -# endif -#endif /* !defined(wxUSE_WXHTML_HELP) */ - -#ifndef wxUSE_XRC -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_XRC must be defined, please read comment near the top of this file." -# else -# define wxUSE_XRC 0 -# endif -#endif /* !defined(wxUSE_XRC) */ - -#endif /* wxUSE_GUI */ - -/* - Section 2: platform-specific checks. - - This must be done after checking that everything is defined as the platform - checks use wxUSE_XXX symbols in #if tests. - */ - -#if defined(__WINDOWS__) -# include "wx/msw/chkconf.h" -# if defined(__WXGTK__) -# include "wx/gtk/chkconf.h" -# endif -#elif defined(__WXGTK__) -# include "wx/gtk/chkconf.h" -#elif defined(__WXMAC__) -# include "wx/osx/chkconf.h" -#elif defined(__WXDFB__) -# include "wx/dfb/chkconf.h" -#elif defined(__WXMOTIF__) -# include "wx/motif/chkconf.h" -#elif defined(__WXX11__) -# include "wx/x11/chkconf.h" -#elif defined(__WXANDROID__) -# include "wx/android/chkconf.h" -#endif - -/* - __UNIX__ is also defined under Cygwin but we shouldn't perform these checks - there if we're building Windows ports. - */ -#if defined(__UNIX__) && !defined(__WINDOWS__) -# include "wx/unix/chkconf.h" -#endif - -#ifdef __WXUNIVERSAL__ -# include "wx/univ/chkconf.h" -#endif - -/* - Section 3a: check consistency of the non-GUI settings. - */ - -#if WXWIN_COMPATIBILITY_2_8 -# if !WXWIN_COMPATIBILITY_3_0 -# ifdef wxABORT_ON_CONFIG_ERROR -# error "2.8.X compatibility requires 3.0.X compatibility" -# else -# undef WXWIN_COMPATIBILITY_3_0 -# define WXWIN_COMPATIBILITY_3_0 1 -# endif -# endif -#endif /* WXWIN_COMPATIBILITY_2_8 */ - -#if wxUSE_ARCHIVE_STREAMS -# if !wxUSE_DATETIME -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxArchive requires wxUSE_DATETIME" -# else -# undef wxUSE_ARCHIVE_STREAMS -# define wxUSE_ARCHIVE_STREAMS 0 -# endif -# endif -#endif /* wxUSE_ARCHIVE_STREAMS */ - -#if wxUSE_PROTOCOL_FILE || wxUSE_PROTOCOL_FTP || wxUSE_PROTOCOL_HTTP -# if !wxUSE_PROTOCOL -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_PROTOCOL_XXX requires wxUSE_PROTOCOL" -# else -# undef wxUSE_PROTOCOL -# define wxUSE_PROTOCOL 1 -# endif -# endif -#endif /* wxUSE_PROTOCOL_XXX */ - -#if wxUSE_URL -# if !wxUSE_PROTOCOL -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_URL requires wxUSE_PROTOCOL" -# else -# undef wxUSE_PROTOCOL -# define wxUSE_PROTOCOL 1 -# endif -# endif -#endif /* wxUSE_URL */ - -#if wxUSE_PROTOCOL -# if !wxUSE_SOCKETS -# if wxUSE_PROTOCOL_HTTP || wxUSE_PROTOCOL_FTP -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_PROTOCOL_FTP/HTTP requires wxUSE_SOCKETS" -# else -# undef wxUSE_SOCKETS -# define wxUSE_SOCKETS 1 -# endif -# endif -# endif - -# if !wxUSE_STREAMS -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_PROTOCOL requires wxUSE_STREAMS" -# else -# undef wxUSE_STREAMS -# define wxUSE_STREAMS 1 -# endif -# endif -#endif /* wxUSE_PROTOCOL */ - -/* have to test for wxUSE_HTML before wxUSE_FILESYSTEM */ -#if wxUSE_HTML -# if !wxUSE_FILESYSTEM -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxHTML requires wxFileSystem" -# else -# undef wxUSE_FILESYSTEM -# define wxUSE_FILESYSTEM 1 -# endif -# endif -#endif /* wxUSE_HTML */ - -#if wxUSE_FS_ARCHIVE -# if !wxUSE_FILESYSTEM -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxArchiveFSHandler requires wxFileSystem" -# else -# undef wxUSE_FILESYSTEM -# define wxUSE_FILESYSTEM 1 -# endif -# endif -# if !wxUSE_ARCHIVE_STREAMS -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxArchiveFSHandler requires wxArchive" -# else -# undef wxUSE_ARCHIVE_STREAMS -# define wxUSE_ARCHIVE_STREAMS 1 -# endif -# endif -#endif /* wxUSE_FS_ARCHIVE */ - -#if wxUSE_FILESYSTEM -# if !wxUSE_STREAMS -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_FILESYSTEM requires wxUSE_STREAMS" -# else -# undef wxUSE_STREAMS -# define wxUSE_STREAMS 1 -# endif -# endif -# if !wxUSE_FILE && !wxUSE_FFILE -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_FILESYSTEM requires either wxUSE_FILE or wxUSE_FFILE" -# else -# undef wxUSE_FILE -# define wxUSE_FILE 1 -# undef wxUSE_FFILE -# define wxUSE_FFILE 1 -# endif -# endif -#endif /* wxUSE_FILESYSTEM */ - -#if wxUSE_FS_INET -# if !wxUSE_PROTOCOL -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_FS_INET requires wxUSE_PROTOCOL" -# else -# undef wxUSE_PROTOCOL -# define wxUSE_PROTOCOL 1 -# endif -# endif -#endif /* wxUSE_FS_INET */ - -#if wxUSE_STOPWATCH || wxUSE_DATETIME -# if !wxUSE_LONGLONG -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_STOPWATCH and wxUSE_DATETIME require wxUSE_LONGLONG" -# else -# undef wxUSE_LONGLONG -# define wxUSE_LONGLONG 1 -# endif -# endif -#endif /* wxUSE_STOPWATCH */ - -#if wxUSE_MIMETYPE && !wxUSE_TEXTFILE -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_MIMETYPE requires wxUSE_TEXTFILE" -# else -# undef wxUSE_TEXTFILE -# define wxUSE_TEXTFILE 1 -# endif -#endif /* wxUSE_MIMETYPE */ - -#if wxUSE_TEXTFILE && !wxUSE_TEXTBUFFER -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_TEXTFILE requires wxUSE_TEXTBUFFER" -# else -# undef wxUSE_TEXTBUFFER -# define wxUSE_TEXTBUFFER 1 -# endif -#endif /* wxUSE_TEXTFILE */ - -#if wxUSE_TEXTFILE && !wxUSE_FILE -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_TEXTFILE requires wxUSE_FILE" -# else -# undef wxUSE_FILE -# define wxUSE_FILE 1 -# endif -#endif /* wxUSE_TEXTFILE */ - -#if !wxUSE_DYNLIB_CLASS -# if wxUSE_DYNAMIC_LOADER -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_DYNAMIC_LOADER requires wxUSE_DYNLIB_CLASS." -# else -# define wxUSE_DYNLIB_CLASS 1 -# endif -# endif -#endif /* wxUSE_DYNLIB_CLASS */ - -#if wxUSE_ZIPSTREAM -# if !wxUSE_ZLIB -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxZip requires wxZlib" -# else -# undef wxUSE_ZLIB -# define wxUSE_ZLIB 1 -# endif -# endif -# if !wxUSE_ARCHIVE_STREAMS -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxZip requires wxArchive" -# else -# undef wxUSE_ARCHIVE_STREAMS -# define wxUSE_ARCHIVE_STREAMS 1 -# endif -# endif -#endif /* wxUSE_ZIPSTREAM */ - -#if wxUSE_TARSTREAM -# if !wxUSE_ARCHIVE_STREAMS -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxTar requires wxArchive" -# else -# undef wxUSE_ARCHIVE_STREAMS -# define wxUSE_ARCHIVE_STREAMS 1 -# endif -# endif -#endif /* wxUSE_TARSTREAM */ - -/* - Section 3b: the tests for the GUI settings only. - */ -#if wxUSE_GUI - -#if wxUSE_ACCESSIBILITY && !defined(__WXMSW__) -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_ACCESSIBILITY is currently only supported under wxMSW" -# else -# undef wxUSE_ACCESSIBILITY -# define wxUSE_ACCESSIBILITY 0 -# endif -#endif /* wxUSE_ACCESSIBILITY */ - -#if wxUSE_BUTTON || \ - wxUSE_CALENDARCTRL || \ - wxUSE_CARET || \ - wxUSE_COMBOBOX || \ - wxUSE_BMPBUTTON || \ - wxUSE_CHECKBOX || \ - wxUSE_CHECKLISTBOX || \ - wxUSE_CHOICE || \ - wxUSE_GAUGE || \ - wxUSE_GRID || \ - wxUSE_HEADERCTRL || \ - wxUSE_LISTBOX || \ - wxUSE_LISTCTRL || \ - wxUSE_NOTEBOOK || \ - wxUSE_RADIOBOX || \ - wxUSE_RADIOBTN || \ - wxUSE_REARRANGECTRL || \ - wxUSE_SCROLLBAR || \ - wxUSE_SLIDER || \ - wxUSE_SPINBTN || \ - wxUSE_SPINCTRL || \ - wxUSE_STATBMP || \ - wxUSE_STATBOX || \ - wxUSE_STATLINE || \ - wxUSE_STATTEXT || \ - wxUSE_STATUSBAR || \ - wxUSE_TEXTCTRL || \ - wxUSE_TOOLBAR || \ - wxUSE_TREECTRL || \ - wxUSE_TREELISTCTRL -# if !wxUSE_CONTROLS -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_CONTROLS unset but some controls used" -# else -# undef wxUSE_CONTROLS -# define wxUSE_CONTROLS 1 -# endif -# endif -#endif /* controls */ - -#if wxUSE_ADDREMOVECTRL -# if !wxUSE_BMPBUTTON -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_ADDREMOVECTRL requires wxUSE_BMPBUTTON" -# else -# undef wxUSE_ADDREMOVECTRL -# define wxUSE_ADDREMOVECTRL 0 -# endif -# endif -#endif /* wxUSE_ADDREMOVECTRL */ - -#if wxUSE_ANIMATIONCTRL -# if !wxUSE_STREAMS -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_ANIMATIONCTRL requires wxUSE_STREAMS" -# else -# undef wxUSE_ANIMATIONCTRL -# define wxUSE_ANIMATIONCTRL 0 -# endif -# endif -#endif /* wxUSE_ANIMATIONCTRL */ - -#if wxUSE_BMPBUTTON -# if !wxUSE_BUTTON -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_BMPBUTTON requires wxUSE_BUTTON" -# else -# undef wxUSE_BUTTON -# define wxUSE_BUTTON 1 -# endif -# endif -#endif /* wxUSE_BMPBUTTON */ - -#if wxUSE_COMMANDLINKBUTTON -# if !wxUSE_BUTTON -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_COMMANDLINKBUTTON requires wxUSE_BUTTON" -# else -# undef wxUSE_BUTTON -# define wxUSE_BUTTON 1 -# endif -# endif -#endif /* wxUSE_COMMANDLINKBUTTON */ - -/* - wxUSE_BOOKCTRL should be only used if any of the controls deriving from it - are used - */ -#ifdef wxUSE_BOOKCTRL -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_BOOKCTRL is defined automatically, don't define it" -# else -# undef wxUSE_BOOKCTRL -# endif -#endif - -#define wxUSE_BOOKCTRL (wxUSE_AUI || \ - wxUSE_NOTEBOOK || \ - wxUSE_LISTBOOK || \ - wxUSE_CHOICEBOOK || \ - wxUSE_TOOLBOOK || \ - wxUSE_TREEBOOK) - -#if wxUSE_COLLPANE -# if !wxUSE_BUTTON || !wxUSE_STATLINE -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_COLLPANE requires wxUSE_BUTTON and wxUSE_STATLINE" -# else -# undef wxUSE_COLLPANE -# define wxUSE_COLLPANE 0 -# endif -# endif -#endif /* wxUSE_COLLPANE */ - -#if wxUSE_LISTBOOK -# if !wxUSE_LISTCTRL -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxListbook requires wxListCtrl" -# else -# undef wxUSE_LISTCTRL -# define wxUSE_LISTCTRL 1 -# endif -# endif -#endif /* wxUSE_LISTBOOK */ - -#if wxUSE_CHOICEBOOK -# if !wxUSE_CHOICE -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxChoicebook requires wxChoice" -# else -# undef wxUSE_CHOICE -# define wxUSE_CHOICE 1 -# endif -# endif -#endif /* wxUSE_CHOICEBOOK */ - -#if wxUSE_TOOLBOOK -# if !wxUSE_TOOLBAR -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxToolbook requires wxToolBar" -# else -# undef wxUSE_TOOLBAR -# define wxUSE_TOOLBAR 1 -# endif -# endif -#endif /* wxUSE_TOOLBOOK */ - -#if !wxUSE_ODCOMBOBOX -# if wxUSE_BITMAPCOMBOBOX -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxBitmapComboBox requires wxOwnerDrawnComboBox" -# else -# undef wxUSE_BITMAPCOMBOBOX -# define wxUSE_BITMAPCOMBOBOX 0 -# endif -# endif -#endif /* !wxUSE_ODCOMBOBOX */ - -#if !wxUSE_HEADERCTRL -# if wxUSE_DATAVIEWCTRL || wxUSE_GRID -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxDataViewCtrl and wxGrid require wxHeaderCtrl" -# else -# undef wxUSE_HEADERCTRL -# define wxUSE_HEADERCTRL 1 -# endif -# endif -#endif /* !wxUSE_HEADERCTRL */ - -#if wxUSE_REARRANGECTRL -# if !wxUSE_CHECKLISTBOX -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxRearrangeCtrl requires wxCheckListBox" -# else -# undef wxUSE_REARRANGECTRL -# define wxUSE_REARRANGECTRL 0 -# endif -# endif -#endif /* wxUSE_REARRANGECTRL */ - -#if wxUSE_RICHMSGDLG -# if !wxUSE_MSGDLG -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_RICHMSGDLG requires wxUSE_MSGDLG" -# else -# undef wxUSE_MSGDLG -# define wxUSE_MSGDLG 1 -# endif -# endif -#endif /* wxUSE_RICHMSGDLG */ - -/* don't attempt to use native status bar on the platforms not having it */ -#ifndef wxUSE_NATIVE_STATUSBAR -# define wxUSE_NATIVE_STATUSBAR 0 -#elif wxUSE_NATIVE_STATUSBAR -# if defined(__WXUNIVERSAL__) || !(defined(__WXMSW__) || defined(__WXMAC__)) -# undef wxUSE_NATIVE_STATUSBAR -# define wxUSE_NATIVE_STATUSBAR 0 -# endif -#endif - -#if wxUSE_GRAPHICS_CONTEXT && !wxUSE_GEOMETRY -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_GRAPHICS_CONTEXT requires wxUSE_GEOMETRY" -# else -# undef wxUSE_GRAPHICS_CONTEXT -# define wxUSE_GRAPHICS_CONTEXT 0 -# endif -#endif /* wxUSE_GRAPHICS_CONTEXT */ - - -/* generic controls dependencies */ -#if !defined(__WXMSW__) || defined(__WXUNIVERSAL__) -# if wxUSE_FONTDLG || wxUSE_FILEDLG || wxUSE_CHOICEDLG - /* all common controls are needed by these dialogs */ -# if !defined(wxUSE_CHOICE) || \ - !defined(wxUSE_TEXTCTRL) || \ - !defined(wxUSE_BUTTON) || \ - !defined(wxUSE_CHECKBOX) || \ - !defined(wxUSE_STATTEXT) -# ifdef wxABORT_ON_CONFIG_ERROR -# error "These common controls are needed by common dialogs" -# else -# undef wxUSE_CHOICE -# define wxUSE_CHOICE 1 -# undef wxUSE_TEXTCTRL -# define wxUSE_TEXTCTRL 1 -# undef wxUSE_BUTTON -# define wxUSE_BUTTON 1 -# undef wxUSE_CHECKBOX -# define wxUSE_CHECKBOX 1 -# undef wxUSE_STATTEXT -# define wxUSE_STATTEXT 1 -# endif -# endif -# endif -#endif /* !wxMSW || wxUniv */ - -/* generic file dialog depends on (generic) file control */ -#if wxUSE_FILEDLG && !wxUSE_FILECTRL && \ - (defined(__WXUNIVERSAL__) || defined(__WXGTK__)) -# ifdef wxABORT_ON_CONFIG_ERROR -# error "Generic wxFileDialog requires wxFileCtrl" -# else -# undef wxUSE_FILECTRL -# define wxUSE_FILECTRL 1 -# endif -#endif /* wxUSE_FILEDLG */ - -/* common dependencies */ -#if wxUSE_ARTPROVIDER_TANGO -# if !(wxUSE_STREAMS && wxUSE_IMAGE && wxUSE_LIBPNG) -# ifdef wxABORT_ON_CONFIG_ERROR -# error "Tango art provider requires wxImage with streams and PNG support" -# else -# undef wxUSE_ARTPROVIDER_TANGO -# define wxUSE_ARTPROVIDER_TANGO 0 -# endif -# endif -#endif /* wxUSE_ARTPROVIDER_TANGO */ - -#if wxUSE_CALENDARCTRL -# if !(wxUSE_SPINBTN && wxUSE_COMBOBOX) -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxCalendarCtrl requires wxSpinButton and wxComboBox" -# else -# undef wxUSE_SPINBTN -# undef wxUSE_COMBOBOX -# define wxUSE_SPINBTN 1 -# define wxUSE_COMBOBOX 1 -# endif -# endif - -# if !wxUSE_DATETIME -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxCalendarCtrl requires wxUSE_DATETIME" -# else -# undef wxUSE_DATETIME -# define wxUSE_DATETIME 1 -# endif -# endif -#endif /* wxUSE_CALENDARCTRL */ - -#if wxUSE_DATEPICKCTRL - /* Only the generic implementation, not used under MSW and OSX, needs - * wxComboCtrl. */ -# if !wxUSE_COMBOCTRL && (defined(__WXUNIVERSAL__) || \ - !(defined(__WXMSW__) || defined(__WXOSX_COCOA__))) -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxDatePickerCtrl requires wxUSE_COMBOCTRL" -# else -# undef wxUSE_COMBOCTRL -# define wxUSE_COMBOCTRL 1 -# endif -# endif -#endif /* wxUSE_DATEPICKCTRL */ - -#if wxUSE_DATEPICKCTRL || wxUSE_TIMEPICKCTRL -# if !wxUSE_DATETIME -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxDatePickerCtrl and wxTimePickerCtrl requires wxUSE_DATETIME" -# else -# undef wxUSE_DATETIME -# define wxUSE_DATETIME 1 -# endif -# endif -#endif /* wxUSE_DATEPICKCTRL || wxUSE_TIMEPICKCTRL */ - -#if wxUSE_CHECKLISTBOX -# if !wxUSE_LISTBOX -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxCheckListBox requires wxListBox" -# else -# undef wxUSE_LISTBOX -# define wxUSE_LISTBOX 1 -# endif -# endif -#endif /* wxUSE_CHECKLISTBOX */ - -#if wxUSE_CHOICEDLG -# if !wxUSE_LISTBOX -# ifdef wxABORT_ON_CONFIG_ERROR -# error "Choice dialogs requires wxListBox" -# else -# undef wxUSE_LISTBOX -# define wxUSE_LISTBOX 1 -# endif -# endif -#endif /* wxUSE_CHOICEDLG */ - -#if wxUSE_FILECTRL -# if !wxUSE_DATETIME -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxFileCtrl requires wxDateTime" -# else -# undef wxUSE_DATETIME -# define wxUSE_DATETIME 1 -# endif -# endif -#endif /* wxUSE_FILECTRL */ - -#if wxUSE_HELP -# if !wxUSE_BMPBUTTON -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_HELP requires wxUSE_BMPBUTTON" -# else -# undef wxUSE_BMPBUTTON -# define wxUSE_BMPBUTTON 1 -# endif -# endif - -# if !wxUSE_CHOICEDLG -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_HELP requires wxUSE_CHOICEDLG" -# else -# undef wxUSE_CHOICEDLG -# define wxUSE_CHOICEDLG 1 -# endif -# endif -#endif /* wxUSE_HELP */ - -#if wxUSE_MS_HTML_HELP - /* - this doesn't make sense for platforms other than MSW but we still - define it in wx/setup_inc.h so don't complain if it happens to be - defined under another platform but just silently fix it. - */ -# ifndef __WXMSW__ -# undef wxUSE_MS_HTML_HELP -# define wxUSE_MS_HTML_HELP 0 -# endif -#endif /* wxUSE_MS_HTML_HELP */ - -#if wxUSE_WXHTML_HELP -# if !wxUSE_HELP || !wxUSE_HTML || !wxUSE_COMBOBOX || !wxUSE_NOTEBOOK || !wxUSE_SPINCTRL -# ifdef wxABORT_ON_CONFIG_ERROR -# error "Built in help controller can't be compiled" -# else -# undef wxUSE_HELP -# define wxUSE_HELP 1 -# undef wxUSE_HTML -# define wxUSE_HTML 1 -# undef wxUSE_COMBOBOX -# define wxUSE_COMBOBOX 1 -# undef wxUSE_NOTEBOOK -# define wxUSE_NOTEBOOK 1 -# undef wxUSE_SPINCTRL -# define wxUSE_SPINCTRL 1 -# endif -# endif -#endif /* wxUSE_WXHTML_HELP */ - -#if !wxUSE_IMAGE -/* - The default wxUSE_IMAGE setting is 1, so if it's set to 0 we assume the - user explicitly wants this and disable all other features that require - wxUSE_IMAGE. - */ -# if wxUSE_DRAGIMAGE -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_DRAGIMAGE requires wxUSE_IMAGE" -# else -# undef wxUSE_DRAGIMAGE -# define wxUSE_DRAGIMAGE 0 -# endif -# endif - -# if wxUSE_LIBPNG -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_LIBPNG requires wxUSE_IMAGE" -# else -# undef wxUSE_LIBPNG -# define wxUSE_LIBPNG 0 -# endif -# endif - -# if wxUSE_LIBJPEG -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_LIBJPEG requires wxUSE_IMAGE" -# else -# undef wxUSE_LIBJPEG -# define wxUSE_LIBJPEG 0 -# endif -# endif - -# if wxUSE_LIBTIFF -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_LIBTIFF requires wxUSE_IMAGE" -# else -# undef wxUSE_LIBTIFF -# define wxUSE_LIBTIFF 0 -# endif -# endif - -# if wxUSE_GIF -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_GIF requires wxUSE_IMAGE" -# else -# undef wxUSE_GIF -# define wxUSE_GIF 0 -# endif -# endif - -# if wxUSE_PNM -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_PNM requires wxUSE_IMAGE" -# else -# undef wxUSE_PNM -# define wxUSE_PNM 0 -# endif -# endif - -# if wxUSE_PCX -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_PCX requires wxUSE_IMAGE" -# else -# undef wxUSE_PCX -# define wxUSE_PCX 0 -# endif -# endif - -# if wxUSE_IFF -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_IFF requires wxUSE_IMAGE" -# else -# undef wxUSE_IFF -# define wxUSE_IFF 0 -# endif -# endif - -# if wxUSE_TOOLBAR -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_TOOLBAR requires wxUSE_IMAGE" -# else -# undef wxUSE_TOOLBAR -# define wxUSE_TOOLBAR 0 -# endif -# endif - -# if wxUSE_XPM -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_XPM requires wxUSE_IMAGE" -# else -# undef wxUSE_XPM -# define wxUSE_XPM 0 -# endif -# endif - -#endif /* !wxUSE_IMAGE */ - -#if wxUSE_DOC_VIEW_ARCHITECTURE -# if !wxUSE_MENUS -# ifdef wxABORT_ON_CONFIG_ERROR -# error "DocView requires wxUSE_MENUS" -# else -# undef wxUSE_MENUS -# define wxUSE_MENUS 1 -# endif -# endif - -# if !wxUSE_CHOICEDLG -# ifdef wxABORT_ON_CONFIG_ERROR -# error "DocView requires wxUSE_CHOICEDLG" -# else -# undef wxUSE_CHOICEDLG -# define wxUSE_CHOICEDLG 1 -# endif -# endif - -# if !wxUSE_STREAMS && !wxUSE_STD_IOSTREAM -# ifdef wxABORT_ON_CONFIG_ERROR -# error "DocView requires wxUSE_STREAMS or wxUSE_STD_IOSTREAM" -# else -# undef wxUSE_STREAMS -# define wxUSE_STREAMS 1 -# endif -# endif - -# if !wxUSE_FILE_HISTORY -# ifdef wxABORT_ON_CONFIG_ERROR -# error "DocView requires wxUSE_FILE_HISTORY" -# else -# undef wxUSE_FILE_HISTORY -# define wxUSE_FILE_HISTORY 1 -# endif -# endif -#endif /* wxUSE_DOC_VIEW_ARCHITECTURE */ - -#if wxUSE_PRINTING_ARCHITECTURE -# if !wxUSE_COMBOBOX -# ifdef wxABORT_ON_CONFIG_ERROR -# error "Print dialog requires wxUSE_COMBOBOX" -# else -# undef wxUSE_COMBOBOX -# define wxUSE_COMBOBOX 1 -# endif -# endif -#endif /* wxUSE_PRINTING_ARCHITECTURE */ - -#if wxUSE_MDI_ARCHITECTURE -# if !wxUSE_MDI -# ifdef wxABORT_ON_CONFIG_ERROR -# error "MDI requires wxUSE_MDI" -# else -# undef wxUSE_MDI -# define wxUSE_MDI 1 -# endif -# endif - -# if !wxUSE_DOC_VIEW_ARCHITECTURE -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_MDI_ARCHITECTURE requires wxUSE_DOC_VIEW_ARCHITECTURE" -# else -# undef wxUSE_DOC_VIEW_ARCHITECTURE -# define wxUSE_DOC_VIEW_ARCHITECTURE 1 -# endif -# endif -#endif /* wxUSE_MDI_ARCHITECTURE */ - -#if !wxUSE_FILEDLG -# if wxUSE_DOC_VIEW_ARCHITECTURE || wxUSE_WXHTML_HELP -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_FILEDLG is required by wxUSE_DOC_VIEW_ARCHITECTURE and wxUSE_WXHTML_HELP!" -# else -# undef wxUSE_FILEDLG -# define wxUSE_FILEDLG 1 -# endif -# endif -#endif /* wxUSE_FILEDLG */ - -#if !wxUSE_GAUGE || !wxUSE_BUTTON -# if wxUSE_PROGRESSDLG -# ifdef wxABORT_ON_CONFIG_ERROR -# error "Generic progress dialog requires wxUSE_GAUGE and wxUSE_BUTTON" -# else -# undef wxUSE_GAUGE -# undef wxUSE_BUTTON -# define wxUSE_GAUGE 1 -# define wxUSE_BUTTON 1 -# endif -# endif -#endif /* !wxUSE_GAUGE */ - -#if !wxUSE_BUTTON -# if wxUSE_FONTDLG || \ - wxUSE_FILEDLG || \ - wxUSE_CHOICEDLG || \ - wxUSE_NUMBERDLG || \ - wxUSE_TEXTDLG || \ - wxUSE_DIRDLG || \ - wxUSE_STARTUP_TIPS || \ - wxUSE_WIZARDDLG -# ifdef wxABORT_ON_CONFIG_ERROR -# error "Common and generic dialogs require wxUSE_BUTTON" -# else -# undef wxUSE_BUTTON -# define wxUSE_BUTTON 1 -# endif -# endif -#endif /* !wxUSE_BUTTON */ - -#if !wxUSE_TOOLBAR -# if wxUSE_TOOLBAR_NATIVE -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_TOOLBAR is set to 0 but wxUSE_TOOLBAR_NATIVE is set to 1" -# else -# undef wxUSE_TOOLBAR_NATIVE -# define wxUSE_TOOLBAR_NATIVE 0 -# endif -# endif -#endif - -#if !wxUSE_IMAGLIST -# if wxUSE_TREECTRL || wxUSE_NOTEBOOK || wxUSE_LISTCTRL || wxUSE_TREELISTCTRL -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxImageList must be compiled as well" -# else -# undef wxUSE_IMAGLIST -# define wxUSE_IMAGLIST 1 -# endif -# endif -#endif /* !wxUSE_IMAGLIST */ - -#if wxUSE_RADIOBOX -# if !wxUSE_RADIOBTN -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_RADIOBOX requires wxUSE_RADIOBTN" -# else -# undef wxUSE_RADIOBTN -# define wxUSE_RADIOBTN 1 -# endif -# endif -# if !wxUSE_STATBOX -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_RADIOBOX requires wxUSE_STATBOX" -# else -# undef wxUSE_STATBOX -# define wxUSE_STATBOX 1 -# endif -# endif -#endif /* wxUSE_RADIOBOX */ - -#if wxUSE_LOGWINDOW -# if !wxUSE_TEXTCTRL -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_LOGWINDOW requires wxUSE_TEXTCTRL" -# else -# undef wxUSE_TEXTCTRL -# define wxUSE_TEXTCTRL 1 -# endif -# endif -#endif /* wxUSE_LOGWINDOW */ - -#if wxUSE_LOG_DIALOG -# if !wxUSE_LISTCTRL || !wxUSE_BUTTON -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_LOG_DIALOG requires wxUSE_LISTCTRL and wxUSE_BUTTON" -# else -# undef wxUSE_LISTCTRL -# define wxUSE_LISTCTRL 1 -# undef wxUSE_BUTTON -# define wxUSE_BUTTON 1 -# endif -# endif -#endif /* wxUSE_LOG_DIALOG */ - -#if wxUSE_CLIPBOARD && !wxUSE_DATAOBJ -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxClipboard requires wxDataObject" -# else -# undef wxUSE_DATAOBJ -# define wxUSE_DATAOBJ 1 -# endif -#endif /* wxUSE_CLIPBOARD */ - -#if wxUSE_XRC && !wxUSE_XML -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_XRC requires wxUSE_XML" -# else -# undef wxUSE_XRC -# define wxUSE_XRC 0 -# endif -#endif /* wxUSE_XRC */ - -#if wxUSE_SOCKETS && !wxUSE_STOPWATCH -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_SOCKETS requires wxUSE_STOPWATCH" -# else -# undef wxUSE_SOCKETS -# define wxUSE_SOCKETS 0 -# endif -#endif /* wxUSE_SOCKETS */ - -#if wxUSE_SVG && !wxUSE_STREAMS -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_SVG requires wxUSE_STREAMS" -# else -# undef wxUSE_SVG -# define wxUSE_SVG 0 -# endif -#endif /* wxUSE_SVG */ - -#if wxUSE_SVG && !wxUSE_IMAGE -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_SVG requires wxUSE_IMAGE" -# else -# undef wxUSE_SVG -# define wxUSE_SVG 0 -# endif -#endif /* wxUSE_SVG */ - -#if wxUSE_SVG && !wxUSE_LIBPNG -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_SVG requires wxUSE_LIBPNG" -# else -# undef wxUSE_SVG -# define wxUSE_SVG 0 -# endif -#endif /* wxUSE_SVG */ - -#if wxUSE_TASKBARICON && !wxUSE_MENUS -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_TASKBARICON requires wxUSE_MENUS" -# else -# undef wxUSE_TASKBARICON -# define wxUSE_TASKBARICON 0 -# endif -#endif /* wxUSE_TASKBARICON */ - -#if !wxUSE_VARIANT -# if wxUSE_DATAVIEWCTRL -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxDataViewCtrl requires wxVariant" -# else -# undef wxUSE_DATAVIEWCTRL -# define wxUSE_DATAVIEWCTRL 0 -# endif -# endif -#endif /* wxUSE_VARIANT */ - -#if wxUSE_TREELISTCTRL && !wxUSE_DATAVIEWCTRL -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_TREELISTCTRL requires wxDataViewCtrl" -# else -# undef wxUSE_TREELISTCTRL -# define wxUSE_TREELISTCTRL 0 -# endif -#endif /* wxUSE_TREELISTCTRL */ - -#if wxUSE_WEBVIEW && !(wxUSE_WEBVIEW_WEBKIT || wxUSE_WEBVIEW_IE) -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_WEBVIEW requires at least one backend" -# else -# undef wxUSE_WEBVIEW -# define wxUSE_WEBVIEW 0 -# endif -#endif /* wxUSE_WEBVIEW && !any web view backend */ - -#if wxUSE_PREFERENCES_EDITOR - /* - We can use either a generic implementation, using wxNotebook, or a - native one under wxOSX/Cocoa but then we must be using the native - toolbar. - */ -# if !wxUSE_NOTEBOOK -# ifdef __WXOSX_COCOA__ -# if !wxUSE_TOOLBAR || !wxOSX_USE_NATIVE_TOOLBAR -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_PREFERENCES_EDITOR requires native toolbar in wxOSX" -# else -# undef wxUSE_PREFERENCES_EDITOR -# define wxUSE_PREFERENCES_EDITOR 0 -# endif -# endif -# else -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_PREFERENCES_EDITOR requires wxNotebook" -# else -# undef wxUSE_PREFERENCES_EDITOR -# define wxUSE_PREFERENCES_EDITOR 0 -# endif -# endif -# endif -#endif /* wxUSE_PREFERENCES_EDITOR */ - -#if wxUSE_MEDIACTRL -# if !wxUSE_LONGLONG -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxMediaCtrl requires wxUSE_LONLONG" -# else -# undef wxUSE_LONLONG -# define wxUSE_LONLONG 1 -# endif -# endif -#endif /* wxUSE_MEDIACTRL */ - -#if wxUSE_STC -# if !wxUSE_STOPWATCH -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxStyledTextCtrl requires wxUSE_STOPWATCH" -# else -# undef wxUSE_STC -# define wxUSE_STC 0 -# endif -# endif -#endif /* wxUSE_STC */ - -#if wxUSE_RICHTEXT -# if !wxUSE_HTML -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxRichTextCtrl requires wxUSE_HTML" -# else -# undef wxUSE_RICHTEXT -# define wxUSE_RICHTEXT 0 -# endif -# endif -# if !wxUSE_LONGLONG -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxRichTextCtrl requires wxUSE_LONLONG" -# else -# undef wxUSE_LONLONG -# define wxUSE_LONLONG 1 -# endif -# endif -#endif /* wxUSE_RICHTEXT */ - -#endif /* wxUSE_GUI */ - -#endif /* _WX_CHKCONF_H_ */ diff --git a/Externals/wxWidgets3/include/wx/choicdlg.h b/Externals/wxWidgets3/include/wx/choicdlg.h deleted file mode 100644 index 0ab4c076d6..0000000000 --- a/Externals/wxWidgets3/include/wx/choicdlg.h +++ /dev/null @@ -1,22 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/choicdlg.h -// Purpose: Includes generic choice dialog file -// Author: Julian Smart -// Modified by: -// Created: -// Copyright: Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_CHOICDLG_H_BASE_ -#define _WX_CHOICDLG_H_BASE_ - -#include "wx/defs.h" - -#if wxUSE_CHOICEDLG - -#include "wx/generic/choicdgg.h" - -#endif - -#endif // _WX_CHOICDLG_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/choice.h b/Externals/wxWidgets3/include/wx/choice.h deleted file mode 100644 index b5bfac3b1a..0000000000 --- a/Externals/wxWidgets3/include/wx/choice.h +++ /dev/null @@ -1,93 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/choice.h -// Purpose: wxChoice class interface -// Author: Vadim Zeitlin -// Modified by: -// Created: 26.07.99 -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_CHOICE_H_BASE_ -#define _WX_CHOICE_H_BASE_ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/defs.h" - -#if wxUSE_CHOICE - -#include "wx/ctrlsub.h" // the base class - -// ---------------------------------------------------------------------------- -// global data -// ---------------------------------------------------------------------------- - -extern WXDLLIMPEXP_DATA_CORE(const char) wxChoiceNameStr[]; - -// ---------------------------------------------------------------------------- -// wxChoice allows to select one of a non-modifiable list of strings -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxChoiceBase : public wxControlWithItems -{ -public: - wxChoiceBase() { } - virtual ~wxChoiceBase(); - - // all generic methods are in wxControlWithItems - - // get the current selection: this can only be different from the normal - // selection if the popup items list is currently opened and the user - // selected some item in it but didn't close the list yet; otherwise (and - // currently always on platforms other than MSW) this is the same as - // GetSelection() - virtual int GetCurrentSelection() const { return GetSelection(); } - - // set/get the number of columns in the control (as they're not supported on - // most platforms, they do nothing by default) - virtual void SetColumns(int WXUNUSED(n) = 1 ) { } - virtual int GetColumns() const { return 1 ; } - - // emulate selecting the item event.GetInt() - void Command(wxCommandEvent& event) wxOVERRIDE; - - // override wxItemContainer::IsSorted - virtual bool IsSorted() const wxOVERRIDE { return HasFlag(wxCB_SORT); } - -protected: - // The generic implementation doesn't determine the height correctly and - // doesn't account for the width of the arrow but does take into account - // the string widths, so the derived classes should override it and set the - // height and add the arrow width to the size returned by this version. - virtual wxSize DoGetBestSize() const wxOVERRIDE; - -private: - wxDECLARE_NO_COPY_CLASS(wxChoiceBase); -}; - -// ---------------------------------------------------------------------------- -// include the platform-dependent class definition -// ---------------------------------------------------------------------------- - -#if defined(__WXUNIVERSAL__) - #include "wx/univ/choice.h" -#elif defined(__WXMSW__) - #include "wx/msw/choice.h" -#elif defined(__WXMOTIF__) - #include "wx/motif/choice.h" -#elif defined(__WXGTK20__) - #include "wx/gtk/choice.h" -#elif defined(__WXGTK__) - #include "wx/gtk1/choice.h" -#elif defined(__WXMAC__) - #include "wx/osx/choice.h" -#elif defined(__WXQT__) - #include "wx/qt/choice.h" -#endif - -#endif // wxUSE_CHOICE - -#endif // _WX_CHOICE_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/choicebk.h b/Externals/wxWidgets3/include/wx/choicebk.h deleted file mode 100644 index c56916f903..0000000000 --- a/Externals/wxWidgets3/include/wx/choicebk.h +++ /dev/null @@ -1,130 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/choicebk.h -// Purpose: wxChoicebook: wxChoice and wxNotebook combination -// Author: Vadim Zeitlin -// Modified by: Wlodzimierz ABX Skiba from wx/listbook.h -// Created: 15.09.04 -// Copyright: (c) Vadim Zeitlin, Wlodzimierz Skiba -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_CHOICEBOOK_H_ -#define _WX_CHOICEBOOK_H_ - -#include "wx/defs.h" - -#if wxUSE_CHOICEBOOK - -#include "wx/bookctrl.h" -#include "wx/choice.h" -#include "wx/containr.h" - -class WXDLLIMPEXP_FWD_CORE wxChoice; - -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_CHOICEBOOK_PAGE_CHANGED, wxBookCtrlEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_CHOICEBOOK_PAGE_CHANGING, wxBookCtrlEvent ); - -// wxChoicebook flags -#define wxCHB_DEFAULT wxBK_DEFAULT -#define wxCHB_TOP wxBK_TOP -#define wxCHB_BOTTOM wxBK_BOTTOM -#define wxCHB_LEFT wxBK_LEFT -#define wxCHB_RIGHT wxBK_RIGHT -#define wxCHB_ALIGN_MASK wxBK_ALIGN_MASK - -// ---------------------------------------------------------------------------- -// wxChoicebook -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxChoicebook : public wxNavigationEnabled -{ -public: - wxChoicebook() { } - - wxChoicebook(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxEmptyString) - { - (void)Create(parent, id, pos, size, style, name); - } - - // quasi ctor - bool Create(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxEmptyString); - - - virtual bool SetPageText(size_t n, const wxString& strText) wxOVERRIDE; - virtual wxString GetPageText(size_t n) const wxOVERRIDE; - virtual int GetPageImage(size_t n) const wxOVERRIDE; - virtual bool SetPageImage(size_t n, int imageId) wxOVERRIDE; - virtual bool InsertPage(size_t n, - wxWindow *page, - const wxString& text, - bool bSelect = false, - int imageId = NO_IMAGE) wxOVERRIDE; - virtual int SetSelection(size_t n) wxOVERRIDE - { return DoSetSelection(n, SetSelection_SendEvent); } - virtual int ChangeSelection(size_t n) wxOVERRIDE { return DoSetSelection(n); } - virtual void SetImageList(wxImageList *imageList) wxOVERRIDE; - - virtual bool DeleteAllPages() wxOVERRIDE; - - // returns the choice control - wxChoice* GetChoiceCtrl() const { return (wxChoice*)m_bookctrl; } - - // Override this to return true because the part of parent window - // background between our controlling wxChoice and the page area should - // show through. - virtual bool HasTransparentBackground() wxOVERRIDE { return true; } - -protected: - virtual void DoSetWindowVariant(wxWindowVariant variant) wxOVERRIDE; - - virtual wxWindow *DoRemovePage(size_t page) wxOVERRIDE; - - void UpdateSelectedPage(size_t newsel) wxOVERRIDE - { - m_selection = static_cast(newsel); - GetChoiceCtrl()->Select(m_selection); - } - - wxBookCtrlEvent* CreatePageChangingEvent() const wxOVERRIDE; - void MakeChangedEvent(wxBookCtrlEvent &event) wxOVERRIDE; - - // event handlers - void OnChoiceSelected(wxCommandEvent& event); - -private: - wxDECLARE_EVENT_TABLE(); - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxChoicebook); -}; - -// ---------------------------------------------------------------------------- -// choicebook event class and related stuff -// ---------------------------------------------------------------------------- - -// wxChoicebookEvent is obsolete and defined for compatibility only -#define wxChoicebookEvent wxBookCtrlEvent -typedef wxBookCtrlEventFunction wxChoicebookEventFunction; -#define wxChoicebookEventHandler(func) wxBookCtrlEventHandler(func) - -#define EVT_CHOICEBOOK_PAGE_CHANGED(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_CHOICEBOOK_PAGE_CHANGED, winid, wxBookCtrlEventHandler(fn)) - -#define EVT_CHOICEBOOK_PAGE_CHANGING(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_CHOICEBOOK_PAGE_CHANGING, winid, wxBookCtrlEventHandler(fn)) - -// old wxEVT_COMMAND_* constants -#define wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED wxEVT_CHOICEBOOK_PAGE_CHANGED -#define wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING wxEVT_CHOICEBOOK_PAGE_CHANGING - -#endif // wxUSE_CHOICEBOOK - -#endif // _WX_CHOICEBOOK_H_ diff --git a/Externals/wxWidgets3/include/wx/clipbrd.h b/Externals/wxWidgets3/include/wx/clipbrd.h deleted file mode 100644 index 2c37937c58..0000000000 --- a/Externals/wxWidgets3/include/wx/clipbrd.h +++ /dev/null @@ -1,202 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/clipbrd.h -// Purpose: wxClipboad class and clipboard functions -// Author: Vadim Zeitlin -// Modified by: -// Created: 19.10.99 -// Copyright: (c) wxWidgets Team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_CLIPBRD_H_BASE_ -#define _WX_CLIPBRD_H_BASE_ - -#include "wx/defs.h" - -#if wxUSE_CLIPBOARD - - -#include "wx/event.h" -#include "wx/chartype.h" -#include "wx/dataobj.h" // for wxDataFormat -#include "wx/vector.h" - -class WXDLLIMPEXP_FWD_CORE wxClipboard; - -// ---------------------------------------------------------------------------- -// wxClipboard represents the system clipboard. Normally, you should use -// wxTheClipboard which is a global pointer to the (unique) clipboard. -// -// Clipboard can be used to copy data to/paste data from. It works together -// with wxDataObject. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxClipboardBase : public wxObject -{ -public: - wxClipboardBase() { m_usePrimary = false; } - - // open the clipboard before Add/SetData() and GetData() - virtual bool Open() = 0; - - // close the clipboard after Add/SetData() and GetData() - virtual void Close() = 0; - - // query whether the clipboard is opened - virtual bool IsOpened() const = 0; - - // add to the clipboard data - // - // NB: the clipboard owns the pointer and will delete it, so data must be - // allocated on the heap - virtual bool AddData( wxDataObject *data ) = 0; - - // set the clipboard data, this is the same as Clear() followed by - // AddData() - virtual bool SetData( wxDataObject *data ) = 0; - - // ask if data in correct format is available - virtual bool IsSupported( const wxDataFormat& format ) = 0; - - // ask if data in correct format is available - virtual bool IsSupportedAsync( wxEvtHandler *sink ); - - // fill data with data on the clipboard (if available) - virtual bool GetData( wxDataObject& data ) = 0; - - // clears wxTheClipboard and the system's clipboard if possible - virtual void Clear() = 0; - - // flushes the clipboard: this means that the data which is currently on - // clipboard will stay available even after the application exits (possibly - // eating memory), otherwise the clipboard will be emptied on exit - virtual bool Flush() { return false; } - - // this allows to choose whether we work with CLIPBOARD (default) or - // PRIMARY selection on X11-based systems - // - // on the other ones, working with primary selection does nothing: this - // allows to write code which sets the primary selection when something is - // selected without any ill effects (i.e. without overwriting the - // clipboard which would be wrong on the platforms without X11 PRIMARY) - virtual void UsePrimarySelection(bool usePrimary = false) - { - m_usePrimary = usePrimary; - } - - // return true if we're using primary selection - bool IsUsingPrimarySelection() const { return m_usePrimary; } - - // Returns global instance (wxTheClipboard) of the object: - static wxClipboard *Get(); - - - // don't use this directly, it is public for compatibility with some ports - // (wxX11, wxMotif, ...) only - bool m_usePrimary; -}; - -// ---------------------------------------------------------------------------- -// asynchronous clipboard event -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxClipboardEvent : public wxEvent -{ -public: - wxClipboardEvent(wxEventType evtType = wxEVT_NULL) - : wxEvent(0, evtType) - { - } - - wxClipboardEvent(const wxClipboardEvent& event) - : wxEvent(event), - m_formats(event.m_formats) - { - } - - bool SupportsFormat(const wxDataFormat& format) const; - void AddFormat(const wxDataFormat& format); - - virtual wxEvent *Clone() const wxOVERRIDE - { - return new wxClipboardEvent(*this); - } - - -protected: - wxVector m_formats; - - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxClipboardEvent); -}; - -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_CLIPBOARD_CHANGED, wxClipboardEvent ); - -typedef void (wxEvtHandler::*wxClipboardEventFunction)(wxClipboardEvent&); - -#define wxClipboardEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxClipboardEventFunction, func) - -#define EVT_CLIPBOARD_CHANGED(func) wx__DECLARE_EVT0(wxEVT_CLIPBOARD_CHANGED, wxClipboardEventHandler(func)) - -// ---------------------------------------------------------------------------- -// globals -// ---------------------------------------------------------------------------- - -// The global clipboard object - backward compatible access macro: -#define wxTheClipboard (wxClipboard::Get()) - -// ---------------------------------------------------------------------------- -// include platform-specific class declaration -// ---------------------------------------------------------------------------- - -#if defined(__WXMSW__) - #include "wx/msw/clipbrd.h" -#elif defined(__WXMOTIF__) - #include "wx/motif/clipbrd.h" -#elif defined(__WXGTK20__) - #include "wx/gtk/clipbrd.h" -#elif defined(__WXGTK__) - #include "wx/gtk1/clipbrd.h" -#elif defined(__WXX11__) - #include "wx/x11/clipbrd.h" -#elif defined(__WXMAC__) - #include "wx/osx/clipbrd.h" -#elif defined(__WXQT__) - #include "wx/qt/clipbrd.h" -#endif - -// ---------------------------------------------------------------------------- -// helpful class for opening the clipboard and automatically closing it -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxClipboardLocker -{ -public: - wxClipboardLocker(wxClipboard *clipboard = NULL) - { - m_clipboard = clipboard ? clipboard : wxTheClipboard; - if ( m_clipboard ) - { - m_clipboard->Open(); - } - } - - bool operator!() const { return !m_clipboard->IsOpened(); } - - ~wxClipboardLocker() - { - if ( m_clipboard ) - { - m_clipboard->Close(); - } - } - -private: - wxClipboard *m_clipboard; - - wxDECLARE_NO_COPY_CLASS(wxClipboardLocker); -}; - -#endif // wxUSE_CLIPBOARD - -#endif // _WX_CLIPBRD_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/clntdata.h b/Externals/wxWidgets3/include/wx/clntdata.h deleted file mode 100644 index a41ccc0ea9..0000000000 --- a/Externals/wxWidgets3/include/wx/clntdata.h +++ /dev/null @@ -1,162 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/clntdata.h -// Purpose: A mixin class for holding a wxClientData or void pointer -// Author: Robin Dunn -// Modified by: -// Created: 9-Oct-2001 -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_CLNTDATAH__ -#define _WX_CLNTDATAH__ - -#include "wx/defs.h" -#include "wx/string.h" -#include "wx/hashmap.h" - -typedef int (*wxShadowObjectMethod)(void*, void*); -WX_DECLARE_STRING_HASH_MAP_WITH_DECL( - wxShadowObjectMethod, - wxShadowObjectMethods, - class WXDLLIMPEXP_BASE -); -WX_DECLARE_STRING_HASH_MAP_WITH_DECL( - void *, - wxShadowObjectFields, - class WXDLLIMPEXP_BASE -); - -class WXDLLIMPEXP_BASE wxShadowObject -{ -public: - wxShadowObject() { } - - void AddMethod( const wxString &name, wxShadowObjectMethod method ) - { - wxShadowObjectMethods::iterator it = m_methods.find( name ); - if (it == m_methods.end()) - m_methods[ name ] = method; - else - it->second = method; - } - - bool InvokeMethod( const wxString &name, void* window, void* param, int* returnValue ) - { - wxShadowObjectMethods::iterator it = m_methods.find( name ); - if (it == m_methods.end()) - return false; - wxShadowObjectMethod method = it->second; - int ret = (*method)(window, param); - if (returnValue) - *returnValue = ret; - return true; - } - - void AddField( const wxString &name, void* initialValue = NULL ) - { - wxShadowObjectFields::iterator it = m_fields.find( name ); - if (it == m_fields.end()) - m_fields[ name ] = initialValue; - else - it->second = initialValue; - } - - void SetField( const wxString &name, void* value ) - { - wxShadowObjectFields::iterator it = m_fields.find( name ); - if (it == m_fields.end()) - return; - it->second = value; - } - - void* GetField( const wxString &name, void *defaultValue = NULL ) - { - wxShadowObjectFields::iterator it = m_fields.find( name ); - if (it == m_fields.end()) - return defaultValue; - return it->second; - } - -private: - wxShadowObjectMethods m_methods; - wxShadowObjectFields m_fields; -}; - - -// ---------------------------------------------------------------------------- - -// what kind of client data do we have? -enum wxClientDataType -{ - wxClientData_None, // we don't know yet because we don't have it at all - wxClientData_Object, // our client data is typed and we own it - wxClientData_Void // client data is untyped and we don't own it -}; - -class WXDLLIMPEXP_BASE wxClientData -{ -public: - wxClientData() { } - virtual ~wxClientData() { } -}; - -class WXDLLIMPEXP_BASE wxStringClientData : public wxClientData -{ -public: - wxStringClientData() : m_data() { } - wxStringClientData( const wxString &data ) : m_data(data) { } - void SetData( const wxString &data ) { m_data = data; } - const wxString& GetData() const { return m_data; } - -private: - wxString m_data; -}; - -// This class is a mixin that provides storage and management of "client -// data." The client data stored can either be a pointer to a wxClientData -// object in which case it is managed by the container (i.e. it will delete -// the data when it's destroyed) or an untyped pointer which won't be deleted -// by the container - but not both of them -// -// NOTE: This functionality is currently duplicated in wxEvtHandler in order -// to avoid having more than one vtable in that class hierarchy. - -class WXDLLIMPEXP_BASE wxClientDataContainer -{ -public: - wxClientDataContainer(); - virtual ~wxClientDataContainer(); - - void SetClientObject( wxClientData *data ) { DoSetClientObject(data); } - wxClientData *GetClientObject() const { return DoGetClientObject(); } - - void SetClientData( void *data ) { DoSetClientData(data); } - void *GetClientData() const { return DoGetClientData(); } - -protected: - // The user data: either an object which will be deleted by the container - // when it's deleted or some raw pointer which we do nothing with. Only - // one type of data can be used with the given window, i.e. you cannot set - // the void data and then associate the container with wxClientData or vice - // versa. - union - { - wxClientData *m_clientObject; - void *m_clientData; - }; - - // client data accessors - virtual void DoSetClientObject( wxClientData *data ); - virtual wxClientData *DoGetClientObject() const; - - virtual void DoSetClientData( void *data ); - virtual void *DoGetClientData() const; - - // what kind of data do we have? - wxClientDataType m_clientDataType; - -}; - -#endif // _WX_CLNTDATAH__ - diff --git a/Externals/wxWidgets3/include/wx/clrpicker.h b/Externals/wxWidgets3/include/wx/clrpicker.h deleted file mode 100644 index 840e0b1123..0000000000 --- a/Externals/wxWidgets3/include/wx/clrpicker.h +++ /dev/null @@ -1,206 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/clrpicker.h -// Purpose: wxColourPickerCtrl base header -// Author: Francesco Montorsi (based on Vadim Zeitlin's code) -// Modified by: -// Created: 14/4/2006 -// Copyright: (c) Vadim Zeitlin, Francesco Montorsi -// Licence: wxWindows Licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_CLRPICKER_H_BASE_ -#define _WX_CLRPICKER_H_BASE_ - -#include "wx/defs.h" - - -#if wxUSE_COLOURPICKERCTRL - -#include "wx/pickerbase.h" - - -class WXDLLIMPEXP_FWD_CORE wxColourPickerEvent; - -extern WXDLLIMPEXP_DATA_CORE(const char) wxColourPickerWidgetNameStr[]; -extern WXDLLIMPEXP_DATA_CORE(const char) wxColourPickerCtrlNameStr[]; - -// show the colour in HTML form (#AABBCC) as colour button label -#define wxCLRBTN_SHOW_LABEL 100 - -// the default style -#define wxCLRBTN_DEFAULT_STYLE (wxCLRBTN_SHOW_LABEL) - - - -// ---------------------------------------------------------------------------- -// wxColourPickerWidgetBase: a generic abstract interface which must be -// implemented by controls used by wxColourPickerCtrl -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxColourPickerWidgetBase -{ -public: - wxColourPickerWidgetBase() { m_colour = *wxBLACK; } - virtual ~wxColourPickerWidgetBase() {} - - wxColour GetColour() const - { return m_colour; } - virtual void SetColour(const wxColour &col) - { m_colour = col; UpdateColour(); } - virtual void SetColour(const wxString &col) - { m_colour.Set(col); UpdateColour(); } - -protected: - - virtual void UpdateColour() = 0; - - // the current colour (may be invalid if none) - wxColour m_colour; -}; - - -// Styles which must be supported by all controls implementing wxColourPickerWidgetBase -// NB: these styles must be defined to carefully-chosen values to -// avoid conflicts with wxButton's styles - -// show the colour in HTML form (#AABBCC) as colour button label -// (instead of no label at all) -// NOTE: this style is supported just by wxColourButtonGeneric and -// thus is not exposed in wxColourPickerCtrl -#define wxCLRP_SHOW_LABEL 0x0008 -#define wxCLRP_SHOW_ALPHA 0x0010 - -// map platform-dependent controls which implement the wxColourPickerWidgetBase -// under the name "wxColourPickerWidget". -// NOTE: wxColourPickerCtrl allocates a wxColourPickerWidget and relies on the -// fact that all classes being mapped as wxColourPickerWidget have the -// same prototype for their contructor (and also explains why we use -// define instead of a typedef) -// since GTK > 2.4, there is GtkColorButton -#if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__) - #include "wx/gtk/clrpicker.h" - #define wxColourPickerWidget wxColourButton -#elif defined(__WXQT__) && !defined(__WXUNIVERSAL__) - #include "wx/qt/clrpicker.h" -#else - #include "wx/generic/clrpickerg.h" - #define wxColourPickerWidget wxGenericColourButton -#endif - - -// ---------------------------------------------------------------------------- -// wxColourPickerCtrl: platform-independent class which embeds a -// platform-dependent wxColourPickerWidget and, if wxCLRP_USE_TEXTCTRL style is -// used, a textctrl next to it. -// ---------------------------------------------------------------------------- - -#define wxCLRP_USE_TEXTCTRL (wxPB_USE_TEXTCTRL) -#define wxCLRP_DEFAULT_STYLE 0 - -class WXDLLIMPEXP_CORE wxColourPickerCtrl : public wxPickerBase -{ -public: - wxColourPickerCtrl() {} - virtual ~wxColourPickerCtrl() {} - - - wxColourPickerCtrl(wxWindow *parent, wxWindowID id, - const wxColour& col = *wxBLACK, const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = wxCLRP_DEFAULT_STYLE, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxColourPickerCtrlNameStr) - { Create(parent, id, col, pos, size, style, validator, name); } - - bool Create(wxWindow *parent, wxWindowID id, - const wxColour& col = *wxBLACK, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxCLRP_DEFAULT_STYLE, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxColourPickerCtrlNameStr); - - -public: // public API - - // get the colour chosen - wxColour GetColour() const - { return ((wxColourPickerWidget *)m_picker)->GetColour(); } - - // set currently displayed color - void SetColour(const wxColour& col); - - // set colour using RGB(r,g,b) syntax or considering given text as a colour name; - // returns true if the given text was successfully recognized. - bool SetColour(const wxString& text); - - -public: // internal functions - - // update the button colour to match the text control contents - void UpdatePickerFromTextCtrl() wxOVERRIDE; - - // update the text control to match the button's colour - void UpdateTextCtrlFromPicker() wxOVERRIDE; - - // event handler for our picker - void OnColourChange(wxColourPickerEvent &); - -protected: - virtual long GetPickerStyle(long style) const wxOVERRIDE - { return (style & (wxCLRP_SHOW_LABEL | wxCLRP_SHOW_ALPHA)); } - -private: - wxDECLARE_DYNAMIC_CLASS(wxColourPickerCtrl); -}; - - -// ---------------------------------------------------------------------------- -// wxColourPickerEvent: used by wxColourPickerCtrl only -// ---------------------------------------------------------------------------- - -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COLOURPICKER_CHANGED, wxColourPickerEvent ); - -class WXDLLIMPEXP_CORE wxColourPickerEvent : public wxCommandEvent -{ -public: - wxColourPickerEvent() {} - wxColourPickerEvent(wxObject *generator, int id, const wxColour &col) - : wxCommandEvent(wxEVT_COLOURPICKER_CHANGED, id), - m_colour(col) - { - SetEventObject(generator); - } - - wxColour GetColour() const { return m_colour; } - void SetColour(const wxColour &c) { m_colour = c; } - - - // default copy ctor, assignment operator and dtor are ok - virtual wxEvent *Clone() const wxOVERRIDE { return new wxColourPickerEvent(*this); } - -private: - wxColour m_colour; - - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxColourPickerEvent); -}; - -// ---------------------------------------------------------------------------- -// event types and macros -// ---------------------------------------------------------------------------- - -typedef void (wxEvtHandler::*wxColourPickerEventFunction)(wxColourPickerEvent&); - -#define wxColourPickerEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxColourPickerEventFunction, func) - -#define EVT_COLOURPICKER_CHANGED(id, fn) \ - wx__DECLARE_EVT1(wxEVT_COLOURPICKER_CHANGED, id, wxColourPickerEventHandler(fn)) - - -// old wxEVT_COMMAND_* constant -#define wxEVT_COMMAND_COLOURPICKER_CHANGED wxEVT_COLOURPICKER_CHANGED - -#endif // wxUSE_COLOURPICKERCTRL - -#endif // _WX_CLRPICKER_H_BASE_ - diff --git a/Externals/wxWidgets3/include/wx/cmdargs.h b/Externals/wxWidgets3/include/wx/cmdargs.h deleted file mode 100644 index e34ba52a98..0000000000 --- a/Externals/wxWidgets3/include/wx/cmdargs.h +++ /dev/null @@ -1,152 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/cmdargs.h -// Purpose: declaration of wxCmdLineArgsArray helper class -// Author: Vadim Zeitlin -// Created: 2007-11-12 -// Copyright: (c) 2007 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_CMDARGS_H_ -#define _WX_CMDARGS_H_ - -#include "wx/arrstr.h" - -// ---------------------------------------------------------------------------- -// wxCmdLineArgsArray: helper class used by wxApp::argv -// ---------------------------------------------------------------------------- - -#if wxUSE_UNICODE - -// this class is used instead of either "char **" or "wchar_t **" (neither of -// which would be backwards compatible with all the existing code) for argv -// field of wxApp -// -// as it's used for compatibility, it tries to look as much as traditional -// (char **) argv as possible, in particular it provides implicit conversions -// to "char **" and also array-like operator[] -class WXDLLIMPEXP_BASE wxCmdLineArgsArray -{ -public: - wxCmdLineArgsArray() { m_argsA = NULL; m_argsW = NULL; } - - template - wxCmdLineArgsArray& operator=(T **argv) - { - FreeArgs(); - - m_args.clear(); - - if ( argv ) - { - while ( *argv ) - m_args.push_back(*argv++); - } - - return *this; - } - - operator char**() const - { - if ( !m_argsA ) - { - const size_t count = m_args.size(); - m_argsA = new char *[count]; - for ( size_t n = 0; n < count; n++ ) - m_argsA[n] = wxStrdup(m_args[n].ToAscii()); - } - - return m_argsA; - } - - operator wchar_t**() const - { - if ( !m_argsW ) - { - const size_t count = m_args.size(); - m_argsW = new wchar_t *[count]; - for ( size_t n = 0; n < count; n++ ) - m_argsW[n] = wxStrdup(m_args[n].wc_str()); - } - - return m_argsW; - } - - // existing code does checks like "if ( argv )" and we want it to continue - // to compile, so provide this conversion even if it is pretty dangerous - operator bool() const - { - return !m_args.empty(); - } - - // and the same for "if ( !argv )" checks - bool operator!() const - { - return m_args.empty(); - } - - wxString operator[](size_t n) const - { - return m_args[n]; - } - - // we must provide this overload for g++ 3.4 which can't choose between - // our operator[](size_t) and ::operator[](char**, int) otherwise - wxString operator[](int n) const - { - return m_args[n]; - } - - - // convenience methods, i.e. not existing only for backwards compatibility - - // do we have any arguments at all? - bool IsEmpty() const { return m_args.empty(); } - - // access the arguments as a convenient array of wxStrings - const wxArrayString& GetArguments() const { return m_args; } - - ~wxCmdLineArgsArray() - { - FreeArgs(); - } - -private: - template - void Free(T**& args) - { - if ( !args ) - return; - - const size_t count = m_args.size(); - for ( size_t n = 0; n < count; n++ ) - free(args[n]); - - delete [] args; - args = NULL; - } - - void FreeArgs() - { - Free(m_argsA); - Free(m_argsW); - } - - wxArrayString m_args; - mutable char **m_argsA; - mutable wchar_t **m_argsW; - - wxDECLARE_NO_COPY_CLASS(wxCmdLineArgsArray); -}; - -// provide global operator overload for compatibility with the existing code -// doing things like "if ( condition && argv )" -inline bool operator&&(bool cond, const wxCmdLineArgsArray& array) -{ - return cond && !array.IsEmpty(); -} - -#endif // wxUSE_UNICODE - -#endif // _WX_CMDARGS_H_ - diff --git a/Externals/wxWidgets3/include/wx/cmdline.h b/Externals/wxWidgets3/include/wx/cmdline.h deleted file mode 100644 index 2b7000fb28..0000000000 --- a/Externals/wxWidgets3/include/wx/cmdline.h +++ /dev/null @@ -1,387 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/cmdline.h -// Purpose: wxCmdLineParser and related classes for parsing the command -// line options -// Author: Vadim Zeitlin -// Modified by: -// Created: 04.01.00 -// Copyright: (c) 2000 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_CMDLINE_H_ -#define _WX_CMDLINE_H_ - -#include "wx/defs.h" - -#include "wx/string.h" -#include "wx/arrstr.h" -#include "wx/cmdargs.h" - -// determines ConvertStringToArgs() behaviour -enum wxCmdLineSplitType -{ - wxCMD_LINE_SPLIT_DOS, - wxCMD_LINE_SPLIT_UNIX -}; - -#if wxUSE_CMDLINE_PARSER - -class WXDLLIMPEXP_FWD_BASE wxCmdLineParser; -class WXDLLIMPEXP_FWD_BASE wxDateTime; - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -// by default, options are optional (sic) and each call to AddParam() allows -// one more parameter - this may be changed by giving non-default flags to it -enum wxCmdLineEntryFlags -{ - wxCMD_LINE_OPTION_MANDATORY = 0x01, // this option must be given - wxCMD_LINE_PARAM_OPTIONAL = 0x02, // the parameter may be omitted - wxCMD_LINE_PARAM_MULTIPLE = 0x04, // the parameter may be repeated - wxCMD_LINE_OPTION_HELP = 0x08, // this option is a help request - wxCMD_LINE_NEEDS_SEPARATOR = 0x10, // must have sep before the value - wxCMD_LINE_SWITCH_NEGATABLE = 0x20 // this switch can be negated (e.g. /S-) -}; - -// an option value or parameter may be a string (the most common case), a -// number or a date -enum wxCmdLineParamType -{ - wxCMD_LINE_VAL_STRING, // should be 0 (default) - wxCMD_LINE_VAL_NUMBER, - wxCMD_LINE_VAL_DATE, - wxCMD_LINE_VAL_DOUBLE, - wxCMD_LINE_VAL_NONE -}; - -// for constructing the cmd line description using Init() -enum wxCmdLineEntryType -{ - wxCMD_LINE_SWITCH, - wxCMD_LINE_OPTION, - wxCMD_LINE_PARAM, - wxCMD_LINE_USAGE_TEXT, - wxCMD_LINE_NONE // to terminate the list -}; - -// Possible return values of wxCmdLineParser::FoundSwitch() -enum wxCmdLineSwitchState -{ - wxCMD_SWITCH_OFF = -1, // Found but turned off/negated. - wxCMD_SWITCH_NOT_FOUND, // Not found at all. - wxCMD_SWITCH_ON // Found in normal state. -}; - -// ---------------------------------------------------------------------------- -// wxCmdLineEntryDesc is a description of one command line -// switch/option/parameter -// ---------------------------------------------------------------------------- - -struct wxCmdLineEntryDesc -{ - wxCmdLineEntryType kind; - const char *shortName; - const char *longName; - const char *description; - wxCmdLineParamType type; - int flags; -}; - -// the list of wxCmdLineEntryDesc objects should be terminated with this one -#define wxCMD_LINE_DESC_END \ - { wxCMD_LINE_NONE, NULL, NULL, NULL, wxCMD_LINE_VAL_NONE, 0x0 } - -// ---------------------------------------------------------------------------- -// wxCmdLineArg contains the value for one command line argument -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxCmdLineArg -{ -public: - virtual ~wxCmdLineArg() {} - - virtual double GetDoubleVal() const = 0; - virtual long GetLongVal() const = 0; - virtual const wxString& GetStrVal() const = 0; -#if wxUSE_DATETIME - virtual const wxDateTime& GetDateVal() const = 0; -#endif // wxUSE_DATETIME - - virtual bool IsNegated() const = 0; - - virtual wxCmdLineEntryType GetKind() const = 0; - virtual wxString GetShortName() const = 0; - virtual wxString GetLongName() const = 0; - virtual wxCmdLineParamType GetType() const = 0; -}; - -// ---------------------------------------------------------------------------- -// wxCmdLineArgs is a container of command line arguments actually parsed and -// allows enumerating them using the standard iterator-based approach. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxCmdLineArgs -{ -public: - class WXDLLIMPEXP_BASE const_iterator - { - public: - typedef int difference_type; - typedef wxCmdLineArg value_type; - typedef const wxCmdLineArg* pointer; - typedef const wxCmdLineArg& reference; - -// We avoid dependency on standard library by default but if we do use -// std::string, then it's ok to use iterator tags as well. -#if wxUSE_STD_STRING - typedef std::bidirectional_iterator_tag iterator_category; -#endif // wx_USE_STD_STRING - - const_iterator() : m_parser(NULL), m_index(0) {} - reference operator *() const; - pointer operator ->() const; - const_iterator &operator ++ (); - const_iterator operator ++ (int); - const_iterator &operator -- (); - const_iterator operator -- (int); - - bool operator == (const const_iterator &other) const { - return m_parser==other.m_parser && m_index==other.m_index; - } - bool operator != (const const_iterator &other) const { - return !operator==(other); - } - - private: - const_iterator (const wxCmdLineParser& parser, size_t index) - : m_parser(&parser), m_index(index) { - } - - const wxCmdLineParser* m_parser; - size_t m_index; - - friend class wxCmdLineArgs; - }; - - wxCmdLineArgs (const wxCmdLineParser& parser) : m_parser(parser) {} - - const_iterator begin() const { return const_iterator(m_parser, 0); } - const_iterator end() const { return const_iterator(m_parser, size()); } - - size_t size() const; - -private: - const wxCmdLineParser& m_parser; - wxDECLARE_NO_ASSIGN_CLASS(wxCmdLineArgs); -}; - -// ---------------------------------------------------------------------------- -// wxCmdLineParser is a class for parsing command line. -// -// It has the following features: -// -// 1. distinguishes options, switches and parameters; allows option grouping -// 2. allows both short and long options -// 3. automatically generates the usage message from the cmd line description -// 4. does type checks on the options values (number, date, ...) -// -// To use it you should: -// -// 1. construct it giving it the cmd line to parse and optionally its desc -// 2. construct the cmd line description using AddXXX() if not done in (1) -// 3. call Parse() -// 4. use GetXXX() to retrieve the parsed info -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxCmdLineParser -{ -public: - // ctors and initializers - // ---------------------- - - // default ctor or ctor giving the cmd line in either Unix or Win form - wxCmdLineParser() { Init(); } - wxCmdLineParser(int argc, char **argv) { Init(); SetCmdLine(argc, argv); } -#if wxUSE_UNICODE - wxCmdLineParser(int argc, wxChar **argv) { Init(); SetCmdLine(argc, argv); } - wxCmdLineParser(int argc, const wxCmdLineArgsArray& argv) - { Init(); SetCmdLine(argc, argv); } -#endif // wxUSE_UNICODE - wxCmdLineParser(const wxString& cmdline) { Init(); SetCmdLine(cmdline); } - - // the same as above, but also gives the cmd line description - otherwise, - // use AddXXX() later - wxCmdLineParser(const wxCmdLineEntryDesc *desc) - { Init(); SetDesc(desc); } - wxCmdLineParser(const wxCmdLineEntryDesc *desc, int argc, char **argv) - { Init(); SetCmdLine(argc, argv); SetDesc(desc); } -#if wxUSE_UNICODE - wxCmdLineParser(const wxCmdLineEntryDesc *desc, int argc, wxChar **argv) - { Init(); SetCmdLine(argc, argv); SetDesc(desc); } - wxCmdLineParser(const wxCmdLineEntryDesc *desc, - int argc, - const wxCmdLineArgsArray& argv) - { Init(); SetCmdLine(argc, argv); SetDesc(desc); } -#endif // wxUSE_UNICODE - wxCmdLineParser(const wxCmdLineEntryDesc *desc, const wxString& cmdline) - { Init(); SetCmdLine(cmdline); SetDesc(desc); } - - // set cmd line to parse after using one of the ctors which don't do it - void SetCmdLine(int argc, char **argv); -#if wxUSE_UNICODE - void SetCmdLine(int argc, wxChar **argv); - void SetCmdLine(int argc, const wxCmdLineArgsArray& argv); -#endif // wxUSE_UNICODE - void SetCmdLine(const wxString& cmdline); - - // not virtual, don't use this class polymorphically - ~wxCmdLineParser(); - - // set different parser options - // ---------------------------- - - // by default, '-' is switch char under Unix, '-' or '/' under Win: - // switchChars contains all characters with which an option or switch may - // start - void SetSwitchChars(const wxString& switchChars); - - // long options are not POSIX-compliant, this option allows to disable them - void EnableLongOptions(bool enable = true); - void DisableLongOptions() { EnableLongOptions(false); } - - bool AreLongOptionsEnabled() const; - - // extra text may be shown by Usage() method if set by this function - void SetLogo(const wxString& logo); - - // construct the cmd line description - // ---------------------------------- - - // take the cmd line description from the wxCMD_LINE_NONE terminated table - void SetDesc(const wxCmdLineEntryDesc *desc); - - // a switch: i.e. an option without value - void AddSwitch(const wxString& name, const wxString& lng = wxEmptyString, - const wxString& desc = wxEmptyString, - int flags = 0); - void AddLongSwitch(const wxString& lng, - const wxString& desc = wxEmptyString, - int flags = 0) - { - AddSwitch(wxString(), lng, desc, flags); - } - - // an option taking a value of the given type - void AddOption(const wxString& name, const wxString& lng = wxEmptyString, - const wxString& desc = wxEmptyString, - wxCmdLineParamType type = wxCMD_LINE_VAL_STRING, - int flags = 0); - void AddLongOption(const wxString& lng, - const wxString& desc = wxEmptyString, - wxCmdLineParamType type = wxCMD_LINE_VAL_STRING, - int flags = 0) - { - AddOption(wxString(), lng, desc, type, flags); - } - - // a parameter - void AddParam(const wxString& desc = wxEmptyString, - wxCmdLineParamType type = wxCMD_LINE_VAL_STRING, - int flags = 0); - - // add an explanatory text to be shown to the user in help - void AddUsageText(const wxString& text); - - // actions - // ------- - - // parse the command line, return 0 if ok, -1 if "-h" or "--help" option - // was encountered and the help message was given or a positive value if a - // syntax error occurred - // - // if showUsage is true, Usage() is called in case of syntax error or if - // help was requested - int Parse(bool showUsage = true); - - // give the usage message describing all program options - void Usage() const; - - // return the usage string, call Usage() to directly show it to the user - wxString GetUsageString() const; - - // get the command line arguments - // ------------------------------ - - // returns true if the given switch was found - bool Found(const wxString& name) const; - - // Returns wxCMD_SWITCH_NOT_FOUND if the switch was not found at all, - // wxCMD_SWITCH_ON if it was found in normal state and wxCMD_SWITCH_OFF if - // it was found but negated (i.e. followed by "-", this can only happen for - // the switches with wxCMD_LINE_SWITCH_NEGATABLE flag). - wxCmdLineSwitchState FoundSwitch(const wxString& name) const; - - // returns true if an option taking a string value was found and stores the - // value in the provided pointer - bool Found(const wxString& name, wxString *value) const; - - // returns true if an option taking an integer value was found and stores - // the value in the provided pointer - bool Found(const wxString& name, long *value) const; - - // returns true if an option taking a double value was found and stores - // the value in the provided pointer - bool Found(const wxString& name, double *value) const; - -#if wxUSE_DATETIME - // returns true if an option taking a date value was found and stores the - // value in the provided pointer - bool Found(const wxString& name, wxDateTime *value) const; -#endif // wxUSE_DATETIME - - // gets the number of parameters found - size_t GetParamCount() const; - - // gets the value of Nth parameter (as string only for now) - wxString GetParam(size_t n = 0u) const; - - // returns a reference to the container of all command line arguments - wxCmdLineArgs GetArguments() const { return wxCmdLineArgs(*this); } - - // Resets switches and options - void Reset(); - - // break down the command line in arguments - static wxArrayString - ConvertStringToArgs(const wxString& cmdline, - wxCmdLineSplitType type = wxCMD_LINE_SPLIT_DOS); - -private: - // common part of all ctors - void Init(); - - struct wxCmdLineParserData *m_data; - - friend class wxCmdLineArgs; - friend class wxCmdLineArgs::const_iterator; - wxDECLARE_NO_COPY_CLASS(wxCmdLineParser); -}; - -#else // !wxUSE_CMDLINE_PARSER - -// this function is always available (even if !wxUSE_CMDLINE_PARSER) because it -// is used by wxWin itself under Windows -class WXDLLIMPEXP_BASE wxCmdLineParser -{ -public: - static wxArrayString - ConvertStringToArgs(const wxString& cmdline, - wxCmdLineSplitType type = wxCMD_LINE_SPLIT_DOS); -}; - -#endif // wxUSE_CMDLINE_PARSER/!wxUSE_CMDLINE_PARSER - -#endif // _WX_CMDLINE_H_ diff --git a/Externals/wxWidgets3/include/wx/cmdproc.h b/Externals/wxWidgets3/include/wx/cmdproc.h deleted file mode 100644 index 8f9656c5c3..0000000000 --- a/Externals/wxWidgets3/include/wx/cmdproc.h +++ /dev/null @@ -1,140 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/cmdproc.h -// Purpose: undo/redo capable command processing framework -// Author: Julian Smart (extracted from docview.h by VZ) -// Modified by: -// Created: 05.11.00 -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_CMDPROC_H_ -#define _WX_CMDPROC_H_ - -#include "wx/defs.h" -#include "wx/object.h" -#include "wx/list.h" - -class WXDLLIMPEXP_FWD_CORE wxMenu; - -// ---------------------------------------------------------------------------- -// wxCommand: a single command capable of performing itself -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxCommand : public wxObject -{ -public: - wxCommand(bool canUndoIt = false, const wxString& name = wxEmptyString); - virtual ~wxCommand(){} - - // Override this to perform a command - virtual bool Do() = 0; - - // Override this to undo a command - virtual bool Undo() = 0; - - virtual bool CanUndo() const { return m_canUndo; } - virtual wxString GetName() const { return m_commandName; } - -protected: - bool m_canUndo; - wxString m_commandName; - -private: - wxDECLARE_CLASS(wxCommand); -}; - -// ---------------------------------------------------------------------------- -// wxCommandProcessor: wxCommand manager -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxCommandProcessor : public wxObject -{ -public: - // if max number of commands is -1, it is unlimited - wxCommandProcessor(int maxCommands = -1); - virtual ~wxCommandProcessor(); - - // Pass a command to the processor. The processor calls Do(); if - // successful, is appended to the command history unless storeIt is false. - virtual bool Submit(wxCommand *command, bool storeIt = true); - - // just store the command without executing it - virtual void Store(wxCommand *command); - - virtual bool Undo(); - virtual bool Redo(); - virtual bool CanUndo() const; - virtual bool CanRedo() const; - - // Initialises the current command and menu strings. - virtual void Initialize(); - - // Sets the Undo/Redo menu strings for the current menu. - virtual void SetMenuStrings(); - - // Gets the current Undo menu label. - wxString GetUndoMenuLabel() const; - - // Gets the current Undo menu label. - wxString GetRedoMenuLabel() const; - -#if wxUSE_MENUS - // Call this to manage an edit menu. - void SetEditMenu(wxMenu *menu) { m_commandEditMenu = menu; } - wxMenu *GetEditMenu() const { return m_commandEditMenu; } -#endif // wxUSE_MENUS - - // command list access - wxList& GetCommands() { return m_commands; } - const wxList& GetCommands() const { return m_commands; } - wxCommand *GetCurrentCommand() const - { - return (wxCommand *)(m_currentCommand ? m_currentCommand->GetData() : NULL); - } - int GetMaxCommands() const { return m_maxNoCommands; } - virtual void ClearCommands(); - - // Has the current project been changed? - virtual bool IsDirty() const; - - // Mark the current command as the one where the last save took place - void MarkAsSaved() - { - m_lastSavedCommand = m_currentCommand; - } - - - // By default, the accelerators are "\tCtrl+Z" and "\tCtrl+Y" - const wxString& GetUndoAccelerator() const { return m_undoAccelerator; } - const wxString& GetRedoAccelerator() const { return m_redoAccelerator; } - - void SetUndoAccelerator(const wxString& accel) { m_undoAccelerator = accel; } - void SetRedoAccelerator(const wxString& accel) { m_redoAccelerator = accel; } - -protected: - // for further flexibility, command processor doesn't call wxCommand::Do() - // and Undo() directly but uses these functions which can be overridden in - // the derived class - virtual bool DoCommand(wxCommand& cmd); - virtual bool UndoCommand(wxCommand& cmd); - - int m_maxNoCommands; - wxList m_commands; - wxList::compatibility_iterator m_currentCommand, - m_lastSavedCommand; - -#if wxUSE_MENUS - wxMenu* m_commandEditMenu; -#endif // wxUSE_MENUS - - wxString m_undoAccelerator; - wxString m_redoAccelerator; - -private: - wxDECLARE_DYNAMIC_CLASS(wxCommandProcessor); - wxDECLARE_NO_COPY_CLASS(wxCommandProcessor); -}; - -#endif // _WX_CMDPROC_H_ - diff --git a/Externals/wxWidgets3/include/wx/cmndata.h b/Externals/wxWidgets3/include/wx/cmndata.h deleted file mode 100644 index db647824d7..0000000000 --- a/Externals/wxWidgets3/include/wx/cmndata.h +++ /dev/null @@ -1,310 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cmndata.h -// Purpose: Common GDI data classes -// Author: Julian Smart and others -// Modified by: -// Created: 01/02/97 -// Copyright: (c) -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_CMNDATA_H_BASE_ -#define _WX_CMNDATA_H_BASE_ - -#include "wx/defs.h" - -#if wxUSE_PRINTING_ARCHITECTURE - -#include "wx/gdicmn.h" - -#if wxUSE_STREAMS -#include "wx/stream.h" -#endif - -class WXDLLIMPEXP_FWD_CORE wxPrintNativeDataBase; - -/* - * wxPrintData - * Encapsulates printer information (not printer dialog information) - */ - -enum wxPrintBin -{ - wxPRINTBIN_DEFAULT, - - wxPRINTBIN_ONLYONE, - wxPRINTBIN_LOWER, - wxPRINTBIN_MIDDLE, - wxPRINTBIN_MANUAL, - wxPRINTBIN_ENVELOPE, - wxPRINTBIN_ENVMANUAL, - wxPRINTBIN_AUTO, - wxPRINTBIN_TRACTOR, - wxPRINTBIN_SMALLFMT, - wxPRINTBIN_LARGEFMT, - wxPRINTBIN_LARGECAPACITY, - wxPRINTBIN_CASSETTE, - wxPRINTBIN_FORMSOURCE, - - wxPRINTBIN_USER -}; - -const int wxPRINTMEDIA_DEFAULT = 0; - -class WXDLLIMPEXP_CORE wxPrintData: public wxObject -{ -public: - wxPrintData(); - wxPrintData(const wxPrintData& printData); - virtual ~wxPrintData(); - - int GetNoCopies() const { return m_printNoCopies; } - bool GetCollate() const { return m_printCollate; } - wxPrintOrientation GetOrientation() const { return m_printOrientation; } - bool IsOrientationReversed() const { return m_printOrientationReversed; } - - // Is this data OK for showing the print dialog? - bool Ok() const { return IsOk(); } - bool IsOk() const ; - - const wxString& GetPrinterName() const { return m_printerName; } - bool GetColour() const { return m_colour; } - wxDuplexMode GetDuplex() const { return m_duplexMode; } - wxPaperSize GetPaperId() const { return m_paperId; } - const wxSize& GetPaperSize() const { return m_paperSize; } - wxPrintQuality GetQuality() const { return m_printQuality; } - wxPrintBin GetBin() const { return m_bin; } - wxPrintMode GetPrintMode() const { return m_printMode; } - int GetMedia() const { return m_media; } - - void SetNoCopies(int v) { m_printNoCopies = v; } - void SetCollate(bool flag) { m_printCollate = flag; } - - // Please use the overloaded method below - wxDEPRECATED_INLINE(void SetOrientation(int orient), - m_printOrientation = (wxPrintOrientation)orient; ) - void SetOrientation(wxPrintOrientation orient) { m_printOrientation = orient; } - void SetOrientationReversed(bool reversed) { m_printOrientationReversed = reversed; } - - void SetPrinterName(const wxString& name) { m_printerName = name; } - void SetColour(bool colour) { m_colour = colour; } - void SetDuplex(wxDuplexMode duplex) { m_duplexMode = duplex; } - void SetPaperId(wxPaperSize sizeId) { m_paperId = sizeId; } - void SetPaperSize(const wxSize& sz) { m_paperSize = sz; } - void SetQuality(wxPrintQuality quality) { m_printQuality = quality; } - void SetBin(wxPrintBin bin) { m_bin = bin; } - void SetMedia(int media) { m_media = media; } - void SetPrintMode(wxPrintMode printMode) { m_printMode = printMode; } - - wxString GetFilename() const { return m_filename; } - void SetFilename( const wxString &filename ) { m_filename = filename; } - - wxPrintData& operator=(const wxPrintData& data); - - char* GetPrivData() const { return m_privData; } - int GetPrivDataLen() const { return m_privDataLen; } - void SetPrivData( char *privData, int len ); - - - // Convert between wxPrintData and native data - void ConvertToNative(); - void ConvertFromNative(); - // Holds the native print data - wxPrintNativeDataBase *GetNativeData() const { return m_nativeData; } - -private: - wxPrintBin m_bin; - int m_media; - wxPrintMode m_printMode; - - int m_printNoCopies; - wxPrintOrientation m_printOrientation; - bool m_printOrientationReversed; - bool m_printCollate; - - wxString m_printerName; - bool m_colour; - wxDuplexMode m_duplexMode; - wxPrintQuality m_printQuality; - wxPaperSize m_paperId; - wxSize m_paperSize; - - wxString m_filename; - - char* m_privData; - int m_privDataLen; - - wxPrintNativeDataBase *m_nativeData; - -private: - wxDECLARE_DYNAMIC_CLASS(wxPrintData); -}; - -/* - * wxPrintDialogData - * Encapsulates information displayed and edited in the printer dialog box. - * Contains a wxPrintData object which is filled in according to the values retrieved - * from the dialog. - */ - -class WXDLLIMPEXP_CORE wxPrintDialogData: public wxObject -{ -public: - wxPrintDialogData(); - wxPrintDialogData(const wxPrintDialogData& dialogData); - wxPrintDialogData(const wxPrintData& printData); - virtual ~wxPrintDialogData(); - - int GetFromPage() const { return m_printFromPage; } - int GetToPage() const { return m_printToPage; } - int GetMinPage() const { return m_printMinPage; } - int GetMaxPage() const { return m_printMaxPage; } - int GetNoCopies() const { return m_printNoCopies; } - bool GetAllPages() const { return m_printAllPages; } - bool GetSelection() const { return m_printSelection; } - bool GetCollate() const { return m_printCollate; } - bool GetPrintToFile() const { return m_printToFile; } - - void SetFromPage(int v) { m_printFromPage = v; } - void SetToPage(int v) { m_printToPage = v; } - void SetMinPage(int v) { m_printMinPage = v; } - void SetMaxPage(int v) { m_printMaxPage = v; } - void SetNoCopies(int v) { m_printNoCopies = v; } - void SetAllPages(bool flag) { m_printAllPages = flag; } - void SetSelection(bool flag) { m_printSelection = flag; } - void SetCollate(bool flag) { m_printCollate = flag; } - void SetPrintToFile(bool flag) { m_printToFile = flag; } - - void EnablePrintToFile(bool flag) { m_printEnablePrintToFile = flag; } - void EnableSelection(bool flag) { m_printEnableSelection = flag; } - void EnablePageNumbers(bool flag) { m_printEnablePageNumbers = flag; } - void EnableHelp(bool flag) { m_printEnableHelp = flag; } - - bool GetEnablePrintToFile() const { return m_printEnablePrintToFile; } - bool GetEnableSelection() const { return m_printEnableSelection; } - bool GetEnablePageNumbers() const { return m_printEnablePageNumbers; } - bool GetEnableHelp() const { return m_printEnableHelp; } - - // Is this data OK for showing the print dialog? - bool Ok() const { return IsOk(); } - bool IsOk() const { return m_printData.IsOk() ; } - - wxPrintData& GetPrintData() { return m_printData; } - void SetPrintData(const wxPrintData& printData) { m_printData = printData; } - - void operator=(const wxPrintDialogData& data); - void operator=(const wxPrintData& data); // Sets internal m_printData member - -private: - int m_printFromPage; - int m_printToPage; - int m_printMinPage; - int m_printMaxPage; - int m_printNoCopies; - bool m_printAllPages; - bool m_printCollate; - bool m_printToFile; - bool m_printSelection; - bool m_printEnableSelection; - bool m_printEnablePageNumbers; - bool m_printEnableHelp; - bool m_printEnablePrintToFile; - wxPrintData m_printData; - -private: - wxDECLARE_DYNAMIC_CLASS(wxPrintDialogData); -}; - -/* -* This is the data used (and returned) by the wxPageSetupDialog. -*/ - -// Compatibility with old name -#define wxPageSetupData wxPageSetupDialogData - -class WXDLLIMPEXP_CORE wxPageSetupDialogData: public wxObject -{ -public: - wxPageSetupDialogData(); - wxPageSetupDialogData(const wxPageSetupDialogData& dialogData); - wxPageSetupDialogData(const wxPrintData& printData); - virtual ~wxPageSetupDialogData(); - - wxSize GetPaperSize() const { return m_paperSize; } - wxPaperSize GetPaperId() const { return m_printData.GetPaperId(); } - wxPoint GetMinMarginTopLeft() const { return m_minMarginTopLeft; } - wxPoint GetMinMarginBottomRight() const { return m_minMarginBottomRight; } - wxPoint GetMarginTopLeft() const { return m_marginTopLeft; } - wxPoint GetMarginBottomRight() const { return m_marginBottomRight; } - - bool GetDefaultMinMargins() const { return m_defaultMinMargins; } - bool GetEnableMargins() const { return m_enableMargins; } - bool GetEnableOrientation() const { return m_enableOrientation; } - bool GetEnablePaper() const { return m_enablePaper; } - bool GetEnablePrinter() const { return m_enablePrinter; } - bool GetDefaultInfo() const { return m_getDefaultInfo; } - bool GetEnableHelp() const { return m_enableHelp; } - - // Is this data OK for showing the page setup dialog? - bool Ok() const { return IsOk(); } - bool IsOk() const { return m_printData.IsOk() ; } - - // If a corresponding paper type is found in the paper database, will set the m_printData - // paper size id member as well. - void SetPaperSize(const wxSize& sz); - - void SetPaperId(wxPaperSize id) { m_printData.SetPaperId(id); } - - // Sets the wxPrintData id, plus the paper width/height if found in the paper database. - void SetPaperSize(wxPaperSize id); - - void SetMinMarginTopLeft(const wxPoint& pt) { m_minMarginTopLeft = pt; } - void SetMinMarginBottomRight(const wxPoint& pt) { m_minMarginBottomRight = pt; } - void SetMarginTopLeft(const wxPoint& pt) { m_marginTopLeft = pt; } - void SetMarginBottomRight(const wxPoint& pt) { m_marginBottomRight = pt; } - void SetDefaultMinMargins(bool flag) { m_defaultMinMargins = flag; } - void SetDefaultInfo(bool flag) { m_getDefaultInfo = flag; } - - void EnableMargins(bool flag) { m_enableMargins = flag; } - void EnableOrientation(bool flag) { m_enableOrientation = flag; } - void EnablePaper(bool flag) { m_enablePaper = flag; } - void EnablePrinter(bool flag) { m_enablePrinter = flag; } - void EnableHelp(bool flag) { m_enableHelp = flag; } - - // Use paper size defined in this object to set the wxPrintData - // paper id - void CalculateIdFromPaperSize(); - - // Use paper id in wxPrintData to set this object's paper size - void CalculatePaperSizeFromId(); - - wxPageSetupDialogData& operator=(const wxPageSetupDialogData& data); - wxPageSetupDialogData& operator=(const wxPrintData& data); - - wxPrintData& GetPrintData() { return m_printData; } - const wxPrintData& GetPrintData() const { return m_printData; } - void SetPrintData(const wxPrintData& printData); - -private: - wxSize m_paperSize; // The dimensions selected by the user (on return, same as in wxPrintData?) - wxPoint m_minMarginTopLeft; - wxPoint m_minMarginBottomRight; - wxPoint m_marginTopLeft; - wxPoint m_marginBottomRight; - bool m_defaultMinMargins; - bool m_enableMargins; - bool m_enableOrientation; - bool m_enablePaper; - bool m_enablePrinter; - bool m_getDefaultInfo; // Equiv. to PSD_RETURNDEFAULT - bool m_enableHelp; - wxPrintData m_printData; - -private: - wxDECLARE_DYNAMIC_CLASS(wxPageSetupDialogData); -}; - -#endif // wxUSE_PRINTING_ARCHITECTURE - -#endif -// _WX_CMNDATA_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/collheaderctrl.h b/Externals/wxWidgets3/include/wx/collheaderctrl.h deleted file mode 100644 index 2364218d8e..0000000000 --- a/Externals/wxWidgets3/include/wx/collheaderctrl.h +++ /dev/null @@ -1,106 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/collheaderctrl.h -// Purpose: wxCollapsibleHeaderCtrl -// Author: Tobias Taschner -// Created: 2015-09-19 -// Copyright: (c) 2015 wxWidgets development team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_COLLAPSIBLEHEADER_CTRL_H_ -#define _WX_COLLAPSIBLEHEADER_CTRL_H_ - -#include "wx/defs.h" - -#if wxUSE_COLLPANE - -#include "wx/control.h" - -// class name -extern WXDLLIMPEXP_DATA_CORE(const char) wxCollapsibleHeaderCtrlNameStr[]; - -// -// wxGenericCollapsibleHeaderCtrl -// - -class WXDLLIMPEXP_CORE wxCollapsibleHeaderCtrlBase : public wxControl -{ -public: - wxCollapsibleHeaderCtrlBase() { } - - wxCollapsibleHeaderCtrlBase(wxWindow *parent, - wxWindowID id, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxBORDER_NONE, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxCollapsibleHeaderCtrlNameStr) - { - Create(parent, id, label, pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxBORDER_NONE, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxCollapsibleHeaderCtrlNameStr) - { - if ( !wxControl::Create(parent, id, pos, size, style, validator, name) ) - return false; - - SetLabel(label); - - return true; - } - - virtual void SetCollapsed(bool collapsed = true) = 0; - - virtual bool IsCollapsed() const = 0; - -private: - - wxDECLARE_NO_COPY_CLASS(wxCollapsibleHeaderCtrlBase); -}; - -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COLLAPSIBLEHEADER_CHANGED, wxCommandEvent); - -#define wxCollapsibleHeaderChangedHandler(func) \ - wxEVENT_HANDLER_CAST(wxCommandEventFunction, func) - -#define EVT_COLLAPSIBLEHEADER_CHANGED(id, fn) \ - wx__DECLARE_EVT1(wxEVT_COLLAPSIBLEHEADER_CHANGED, id, wxCollapsibleHeaderChangedHandler(fn)) - -// Currently there is only the native implementation, use it for all ports. - -#include "wx/generic/collheaderctrl.h" - -class WXDLLIMPEXP_CORE wxCollapsibleHeaderCtrl - : public wxGenericCollapsibleHeaderCtrl -{ -public: - wxCollapsibleHeaderCtrl() { } - - wxCollapsibleHeaderCtrl(wxWindow *parent, - wxWindowID id, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxBORDER_NONE, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxCollapsibleHeaderCtrlNameStr) - { - Create(parent, id, label, pos, size, style, validator, name); - } - -private: - - wxDECLARE_NO_COPY_CLASS(wxCollapsibleHeaderCtrl); -}; - -#endif // wxUSE_COLLPANE - -#endif // _WX_COLLAPSIBLEHEADER_CTRL_H_ diff --git a/Externals/wxWidgets3/include/wx/collpane.h b/Externals/wxWidgets3/include/wx/collpane.h deleted file mode 100644 index 4a66f124f9..0000000000 --- a/Externals/wxWidgets3/include/wx/collpane.h +++ /dev/null @@ -1,108 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/collpane.h -// Purpose: wxCollapsiblePane -// Author: Francesco Montorsi -// Modified by: -// Created: 8/10/2006 -// Copyright: (c) Francesco Montorsi -// Licence: wxWindows Licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_COLLAPSABLE_PANE_H_BASE_ -#define _WX_COLLAPSABLE_PANE_H_BASE_ - -#include "wx/defs.h" - - -#if wxUSE_COLLPANE - -#include "wx/control.h" - -// class name -extern WXDLLIMPEXP_DATA_CORE(const char) wxCollapsiblePaneNameStr[]; - -// ---------------------------------------------------------------------------- -// wxCollapsiblePaneBase: interface for wxCollapsiblePane -// ---------------------------------------------------------------------------- - -#define wxCP_DEFAULT_STYLE (wxTAB_TRAVERSAL | wxNO_BORDER) -#define wxCP_NO_TLW_RESIZE (0x0002) - -class WXDLLIMPEXP_CORE wxCollapsiblePaneBase : public wxControl -{ -public: - wxCollapsiblePaneBase() {} - - virtual void Collapse(bool collapse = true) = 0; - void Expand() { Collapse(false); } - - virtual bool IsCollapsed() const = 0; - bool IsExpanded() const { return !IsCollapsed(); } - - virtual wxWindow *GetPane() const = 0; - - virtual wxString GetLabel() const = 0; - virtual void SetLabel(const wxString& label) = 0; -}; - - -// ---------------------------------------------------------------------------- -// event types and macros -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxCollapsiblePaneEvent; - -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COLLAPSIBLEPANE_CHANGED, wxCollapsiblePaneEvent ); - -class WXDLLIMPEXP_CORE wxCollapsiblePaneEvent : public wxCommandEvent -{ -public: - wxCollapsiblePaneEvent() {} - wxCollapsiblePaneEvent(wxObject *generator, int id, bool collapsed) - : wxCommandEvent(wxEVT_COLLAPSIBLEPANE_CHANGED, id), - m_bCollapsed(collapsed) - { - SetEventObject(generator); - } - - bool GetCollapsed() const { return m_bCollapsed; } - void SetCollapsed(bool c) { m_bCollapsed = c; } - - - // default copy ctor, assignment operator and dtor are ok - virtual wxEvent *Clone() const wxOVERRIDE { return new wxCollapsiblePaneEvent(*this); } - -private: - bool m_bCollapsed; - - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxCollapsiblePaneEvent); -}; - -// ---------------------------------------------------------------------------- -// event types and macros -// ---------------------------------------------------------------------------- - -typedef void (wxEvtHandler::*wxCollapsiblePaneEventFunction)(wxCollapsiblePaneEvent&); - -#define wxCollapsiblePaneEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxCollapsiblePaneEventFunction, func) - -#define EVT_COLLAPSIBLEPANE_CHANGED(id, fn) \ - wx__DECLARE_EVT1(wxEVT_COLLAPSIBLEPANE_CHANGED, id, wxCollapsiblePaneEventHandler(fn)) - - -#if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__) - #include "wx/gtk/collpane.h" -#else - #include "wx/generic/collpaneg.h" - - // use #define and not a typedef to allow forward declaring the class - #define wxCollapsiblePane wxGenericCollapsiblePane -#endif - -// old wxEVT_COMMAND_* constant -#define wxEVT_COMMAND_COLLPANE_CHANGED wxEVT_COLLAPSIBLEPANE_CHANGED - -#endif // wxUSE_COLLPANE - -#endif // _WX_COLLAPSABLE_PANE_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/colordlg.h b/Externals/wxWidgets3/include/wx/colordlg.h deleted file mode 100644 index 7eb7cc9a42..0000000000 --- a/Externals/wxWidgets3/include/wx/colordlg.h +++ /dev/null @@ -1,43 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/colordlg.h -// Purpose: wxColourDialog -// Author: Vadim Zeitlin -// Modified by: -// Created: 01/02/97 -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_COLORDLG_H_BASE_ -#define _WX_COLORDLG_H_BASE_ - -#include "wx/defs.h" - -#if wxUSE_COLOURDLG - -#include "wx/colourdata.h" - -#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) - #include "wx/msw/colordlg.h" -#elif defined(__WXMAC__) && !defined(__WXUNIVERSAL__) - #include "wx/osx/colordlg.h" -#elif defined(__WXGTK20__) && !defined(__WXUNIVERSAL__) - #include "wx/gtk/colordlg.h" -#elif defined(__WXQT__) - #include "wx/qt/colordlg.h" -#else - #include "wx/generic/colrdlgg.h" - - #define wxColourDialog wxGenericColourDialog -#endif - -// get the colour from user and return it -WXDLLIMPEXP_CORE wxColour wxGetColourFromUser(wxWindow *parent = NULL, - const wxColour& colInit = wxNullColour, - const wxString& caption = wxEmptyString, - wxColourData *data = NULL); - -#endif // wxUSE_COLOURDLG - -#endif - // _WX_COLORDLG_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/colour.h b/Externals/wxWidgets3/include/wx/colour.h deleted file mode 100644 index 1651f63d44..0000000000 --- a/Externals/wxWidgets3/include/wx/colour.h +++ /dev/null @@ -1,228 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/colour.h -// Purpose: wxColourBase definition -// Author: Julian Smart -// Modified by: Francesco Montorsi -// Created: -// Copyright: Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_COLOUR_H_BASE_ -#define _WX_COLOUR_H_BASE_ - -#include "wx/defs.h" -#include "wx/gdiobj.h" - -class WXDLLIMPEXP_FWD_CORE wxColour; - -// A macro to define the standard wxColour constructors: -// -// It avoids the need to repeat these lines across all colour.h files, since -// Set() is a virtual function and thus cannot be called by wxColourBase ctors -#define DEFINE_STD_WXCOLOUR_CONSTRUCTORS \ - wxColour() { Init(); } \ - wxColour(ChannelType red, \ - ChannelType green, \ - ChannelType blue, \ - ChannelType alpha = wxALPHA_OPAQUE) \ - { Init(); Set(red, green, blue, alpha); } \ - wxColour(unsigned long colRGB) { Init(); Set(colRGB ); } \ - wxColour(const wxString& colourName) { Init(); Set(colourName); } \ - wxColour(const char *colourName) { Init(); Set(colourName); } \ - wxColour(const wchar_t *colourName) { Init(); Set(colourName); } - - -// flags for wxColour -> wxString conversion (see wxColour::GetAsString) -enum { - wxC2S_NAME = 1, // return colour name, when possible - wxC2S_CSS_SYNTAX = 2, // return colour in rgb(r,g,b) syntax - wxC2S_HTML_SYNTAX = 4 // return colour in #rrggbb syntax -}; - -const unsigned char wxALPHA_TRANSPARENT = 0; -const unsigned char wxALPHA_OPAQUE = 0xff; - -// a valid but fully transparent colour -#define wxTransparentColour wxColour(0, 0, 0, wxALPHA_TRANSPARENT) -#define wxTransparentColor wxTransparentColour - -// ---------------------------------------------------------------------------- -// wxVariant support -// ---------------------------------------------------------------------------- - -#if wxUSE_VARIANT -#include "wx/variant.h" -DECLARE_VARIANT_OBJECT_EXPORTED(wxColour,WXDLLIMPEXP_CORE) -#endif - -//----------------------------------------------------------------------------- -// wxColourBase: this class has no data members, just some functions to avoid -// code redundancy in all native wxColour implementations -//----------------------------------------------------------------------------- - -/* Transition from wxGDIObject to wxObject is incomplete. If your port does - not need the wxGDIObject machinery to handle colors, please add it to the - list of ports which do not need it. - */ -#if defined( __WXMAC__ ) || defined( __WXMSW__ ) -#define wxCOLOUR_IS_GDIOBJECT 0 -#else -#define wxCOLOUR_IS_GDIOBJECT 1 -#endif - -class WXDLLIMPEXP_CORE wxColourBase : public -#if wxCOLOUR_IS_GDIOBJECT - wxGDIObject -#else - wxObject -#endif -{ -public: - // type of a single colour component - typedef unsigned char ChannelType; - - wxColourBase() {} - virtual ~wxColourBase() {} - - - // Set() functions - // --------------- - - void Set(ChannelType red, - ChannelType green, - ChannelType blue, - ChannelType alpha = wxALPHA_OPAQUE) - { InitRGBA(red, green, blue, alpha); } - - // implemented in colourcmn.cpp - bool Set(const wxString &str) - { return FromString(str); } - - void Set(unsigned long colRGB) - { - // we don't need to know sizeof(long) here because we assume that the three - // least significant bytes contain the R, G and B values - Set((ChannelType)(0xFF & colRGB), - (ChannelType)(0xFF & (colRGB >> 8)), - (ChannelType)(0xFF & (colRGB >> 16))); - } - - - - // accessors - // --------- - - virtual ChannelType Red() const = 0; - virtual ChannelType Green() const = 0; - virtual ChannelType Blue() const = 0; - virtual ChannelType Alpha() const - { return wxALPHA_OPAQUE ; } - - // implemented in colourcmn.cpp - virtual wxString GetAsString(long flags = wxC2S_NAME | wxC2S_CSS_SYNTAX) const; - - void SetRGB(wxUint32 colRGB) - { - Set((ChannelType)(0xFF & colRGB), - (ChannelType)(0xFF & (colRGB >> 8)), - (ChannelType)(0xFF & (colRGB >> 16))); - } - - void SetRGBA(wxUint32 colRGBA) - { - Set((ChannelType)(0xFF & colRGBA), - (ChannelType)(0xFF & (colRGBA >> 8)), - (ChannelType)(0xFF & (colRGBA >> 16)), - (ChannelType)(0xFF & (colRGBA >> 24))); - } - - wxUint32 GetRGB() const - { return Red() | (Green() << 8) | (Blue() << 16); } - - wxUint32 GetRGBA() const - { return Red() | (Green() << 8) | (Blue() << 16) | (Alpha() << 24); } - -#if !wxCOLOUR_IS_GDIOBJECT - virtual bool IsOk() const= 0; - - // older version, for backwards compatibility only (but not deprecated - // because it's still widely used) - bool Ok() const { return IsOk(); } -#endif - - // manipulation - // ------------ - - // These methods are static because they are mostly used - // within tight loops (where we don't want to instantiate wxColour's) - - static void MakeMono (unsigned char* r, unsigned char* g, unsigned char* b, bool on); - static void MakeDisabled(unsigned char* r, unsigned char* g, unsigned char* b, unsigned char brightness = 255); - static void MakeGrey (unsigned char* r, unsigned char* g, unsigned char* b); // integer version - static void MakeGrey (unsigned char* r, unsigned char* g, unsigned char* b, - double weight_r, double weight_g, double weight_b); // floating point version - static unsigned char AlphaBlend (unsigned char fg, unsigned char bg, double alpha); - static void ChangeLightness(unsigned char* r, unsigned char* g, unsigned char* b, int ialpha); - - wxColour ChangeLightness(int ialpha) const; - wxColour& MakeDisabled(unsigned char brightness = 255); - -protected: - // Some ports need Init() and while we don't, provide a stub so that the - // ports which don't need it are not forced to define it - void Init() { } - - virtual void - InitRGBA(ChannelType r, ChannelType g, ChannelType b, ChannelType a) = 0; - - virtual bool FromString(const wxString& s); - -#if wxCOLOUR_IS_GDIOBJECT - // wxColour doesn't use reference counted data (at least not in all ports) - // so provide stubs for the functions which need to be defined if we do use - // them - virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE - { - wxFAIL_MSG( "must be overridden if used" ); - - return NULL; - } - - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *WXUNUSED(data)) const wxOVERRIDE - { - wxFAIL_MSG( "must be overridden if used" ); - - return NULL; - } -#endif -}; - - -// wxColour <-> wxString utilities, used by wxConfig, defined in colourcmn.cpp -WXDLLIMPEXP_CORE wxString wxToString(const wxColourBase& col); -WXDLLIMPEXP_CORE bool wxFromString(const wxString& str, wxColourBase* col); - - - -#if defined(__WXMSW__) - #include "wx/msw/colour.h" -#elif defined(__WXMOTIF__) - #include "wx/motif/colour.h" -#elif defined(__WXGTK20__) - #include "wx/gtk/colour.h" -#elif defined(__WXGTK__) - #include "wx/gtk1/colour.h" -#elif defined(__WXDFB__) - #include "wx/generic/colour.h" -#elif defined(__WXX11__) - #include "wx/x11/colour.h" -#elif defined(__WXMAC__) - #include "wx/osx/colour.h" -#elif defined(__WXQT__) - #include "wx/qt/colour.h" -#endif - -#define wxColor wxColour - -#endif // _WX_COLOUR_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/colourdata.h b/Externals/wxWidgets3/include/wx/colourdata.h deleted file mode 100644 index d05a9a37b4..0000000000 --- a/Externals/wxWidgets3/include/wx/colourdata.h +++ /dev/null @@ -1,56 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/colourdata.h -// Author: Julian Smart -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_COLOURDATA_H_ -#define _WX_COLOURDATA_H_ - -#include "wx/colour.h" - -class WXDLLIMPEXP_CORE wxColourData : public wxObject -{ -public: - // number of custom colours we store - enum - { - NUM_CUSTOM = 16 - }; - - wxColourData(); - wxColourData(const wxColourData& data); - wxColourData& operator=(const wxColourData& data); - virtual ~wxColourData(); - - void SetChooseFull(bool flag) { m_chooseFull = flag; } - bool GetChooseFull() const { return m_chooseFull; } - void SetChooseAlpha(bool flag) { m_chooseAlpha = flag; } - bool GetChooseAlpha() const { return m_chooseAlpha; } - void SetColour(const wxColour& colour) { m_dataColour = colour; } - const wxColour& GetColour() const { return m_dataColour; } - wxColour& GetColour() { return m_dataColour; } - - // SetCustomColour() modifies colours in an internal array of NUM_CUSTOM - // custom colours; - void SetCustomColour(int i, const wxColour& colour); - wxColour GetCustomColour(int i) const; - - // Serialize the object to a string and restore it from it - wxString ToString() const; - bool FromString(const wxString& str); - - - // public for backwards compatibility only: don't use directly - wxColour m_dataColour; - wxColour m_custColours[NUM_CUSTOM]; - bool m_chooseFull; - -protected: - bool m_chooseAlpha; - - wxDECLARE_DYNAMIC_CLASS(wxColourData); -}; - -#endif // _WX_COLOURDATA_H_ diff --git a/Externals/wxWidgets3/include/wx/combo.h b/Externals/wxWidgets3/include/wx/combo.h deleted file mode 100644 index 29cd02e819..0000000000 --- a/Externals/wxWidgets3/include/wx/combo.h +++ /dev/null @@ -1,883 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/combo.h -// Purpose: wxComboCtrl declaration -// Author: Jaakko Salli -// Modified by: -// Created: Apr-30-2006 -// Copyright: (c) Jaakko Salli -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_COMBOCONTROL_H_BASE_ -#define _WX_COMBOCONTROL_H_BASE_ - - -/* - A few words about all the classes defined in this file are probably in - order: why do we need extra wxComboCtrl and wxComboPopup classes? - - This is because a traditional combobox is a combination of a text control - (with a button allowing to open the pop down list) with a listbox and - wxComboBox class is exactly such control, however we want to also have other - combinations - in fact, we want to allow anything at all to be used as pop - down list, not just a wxListBox. - - So we define a base wxComboCtrl which can use any control as pop down - list and wxComboBox deriving from it which implements the standard wxWidgets - combobox API. wxComboCtrl needs to be told somehow which control to use - and this is done by SetPopupControl(). However, we need something more than - just a wxControl in this method as, for example, we need to call - SetSelection("initial text value") and wxControl doesn't have such method. - So we also need a wxComboPopup which is just a very simple interface which - must be implemented by a control to be usable as a popup. - - We couldn't derive wxComboPopup from wxControl as this would make it - impossible to have a class deriving from both wxListBx and from it, so - instead it is just a mix-in. - */ - - -#include "wx/defs.h" - -#if wxUSE_COMBOCTRL - -#include "wx/control.h" -#include "wx/renderer.h" // this is needed for wxCONTROL_XXX flags -#include "wx/bitmap.h" // wxBitmap used by-value -#include "wx/textentry.h" -#include "wx/time.h" // needed for wxMilliClock_t - -class WXDLLIMPEXP_FWD_CORE wxTextCtrl; -class WXDLLIMPEXP_FWD_CORE wxComboPopup; - -// -// New window styles for wxComboCtrlBase -// -enum -{ - // Double-clicking a read-only combo triggers call to popup's OnComboPopup. - // In wxOwnerDrawnComboBox, for instance, it cycles item. - wxCC_SPECIAL_DCLICK = 0x0100, - - // Dropbutton acts like standard push button. - wxCC_STD_BUTTON = 0x0200 -}; - - -// wxComboCtrl internal flags -enum -{ - // First those that can be passed to Customize. - // It is Windows style for all flags to be clear. - - // Button is preferred outside the border (GTK style) - wxCC_BUTTON_OUTSIDE_BORDER = 0x0001, - // Show popup on mouse up instead of mouse down (which is the Windows style) - wxCC_POPUP_ON_MOUSE_UP = 0x0002, - // All text is not automatically selected on click - wxCC_NO_TEXT_AUTO_SELECT = 0x0004, - // Drop-button stays down as long as popup is displayed. - wxCC_BUTTON_STAYS_DOWN = 0x0008, - // Drop-button covers the entire control. - wxCC_FULL_BUTTON = 0x0010, - // Drop-button goes over the custom-border (used under WinVista). - wxCC_BUTTON_COVERS_BORDER = 0x0020, - - // Internal use: signals creation is complete - wxCC_IFLAG_CREATED = 0x0100, - // Internal use: really put button outside - wxCC_IFLAG_BUTTON_OUTSIDE = 0x0200, - // Internal use: SetMargins has been successfully called - wxCC_IFLAG_LEFT_MARGIN_SET = 0x0400, - // Internal use: Set wxTAB_TRAVERSAL to parent when popup is dismissed - wxCC_IFLAG_PARENT_TAB_TRAVERSAL = 0x0800, - // Internal use: Secondary popup window type should be used (if available). - wxCC_IFLAG_USE_ALT_POPUP = 0x1000, - // Internal use: Skip popup animation. - wxCC_IFLAG_DISABLE_POPUP_ANIM = 0x2000, - // Internal use: Drop-button is a bitmap button or has non-default size - // (but can still be on either side of the control), regardless whether - // specified by the platform or the application. - wxCC_IFLAG_HAS_NONSTANDARD_BUTTON = 0x4000 -}; - - -// Flags used by PreprocessMouseEvent and HandleButtonMouseEvent -enum -{ - wxCC_MF_ON_BUTTON = 0x0001, // cursor is on dropbutton area - wxCC_MF_ON_CLICK_AREA = 0x0002 // cursor is on dropbutton or other area - // that can be clicked to show the popup. -}; - - -// Namespace for wxComboCtrl feature flags -struct wxComboCtrlFeatures -{ - enum - { - MovableButton = 0x0001, // Button can be on either side of control - BitmapButton = 0x0002, // Button may be replaced with bitmap - ButtonSpacing = 0x0004, // Button can have spacing from the edge - // of the control - TextIndent = 0x0008, // SetMargins can be used to control - // left margin. - PaintControl = 0x0010, // Combo control itself can be custom painted - PaintWritable = 0x0020, // A variable-width area in front of writable - // combo control's textctrl can be custom - // painted - Borderless = 0x0040, // wxNO_BORDER window style works - - // There are no feature flags for... - // PushButtonBitmapBackground - if its in wxRendererNative, then it should be - // not an issue to have it automatically under the bitmap. - - All = MovableButton|BitmapButton| - ButtonSpacing|TextIndent| - PaintControl|PaintWritable| - Borderless - }; -}; - - -class WXDLLIMPEXP_CORE wxComboCtrlBase : public wxControl, - public wxTextEntry -{ - friend class wxComboPopup; - friend class wxComboPopupEvtHandler; -public: - // ctors and such - wxComboCtrlBase() : wxControl(), wxTextEntry() { Init(); } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& value, - const wxPoint& pos, - const wxSize& size, - long style, - const wxValidator& validator, - const wxString& name); - - virtual ~wxComboCtrlBase(); - - // Show/hide popup window (wxComboBox-compatible methods) - virtual void Popup(); - virtual void Dismiss() - { - HidePopup(true); - } - - // Show/hide popup window. - // TODO: Maybe deprecate in favor of Popup()/Dismiss(). - // However, these functions are still called internally - // so it is not straightforward. - virtual void ShowPopup(); - virtual void HidePopup(bool generateEvent=false); - - // Override for totally custom combo action - virtual void OnButtonClick(); - - // return true if the popup is currently shown - bool IsPopupShown() const { return m_popupWinState == Visible; } - - // set interface class instance derived from wxComboPopup - // NULL popup can be used to indicate default in a derived class - void SetPopupControl( wxComboPopup* popup ) - { - DoSetPopupControl(popup); - } - - // get interface class instance derived from wxComboPopup - wxComboPopup* GetPopupControl() - { - EnsurePopupControl(); - return m_popupInterface; - } - - // get the popup window containing the popup control - wxWindow *GetPopupWindow() const { return m_winPopup; } - - // Get the text control which is part of the combobox. - wxTextCtrl *GetTextCtrl() const { return m_text; } - - // get the dropdown button which is part of the combobox - // note: its not necessarily a wxButton or wxBitmapButton - wxWindow *GetButton() const { return m_btn; } - - // forward these methods to all subcontrols - virtual bool Enable(bool enable = true) wxOVERRIDE; - virtual bool Show(bool show = true) wxOVERRIDE; - virtual bool SetFont(const wxFont& font) wxOVERRIDE; - - // - // wxTextEntry methods - // - // NB: We basically need to override all of them because there is - // no guarantee how platform-specific wxTextEntry is implemented. - // - virtual void SetValue(const wxString& value) wxOVERRIDE - { wxTextEntryBase::SetValue(value); } - virtual void ChangeValue(const wxString& value) wxOVERRIDE - { wxTextEntryBase::ChangeValue(value); } - - virtual void WriteText(const wxString& text) wxOVERRIDE; - virtual void AppendText(const wxString& text) wxOVERRIDE - { wxTextEntryBase::AppendText(text); } - - virtual wxString GetValue() const wxOVERRIDE - { return wxTextEntryBase::GetValue(); } - - virtual wxString GetRange(long from, long to) const wxOVERRIDE - { return wxTextEntryBase::GetRange(from, to); } - - // Replace() and DoSetValue() need to be fully re-implemented since - // EventSuppressor utility class does not work with the way - // wxComboCtrl is implemented. - virtual void Replace(long from, long to, const wxString& value) wxOVERRIDE; - - virtual void Remove(long from, long to) wxOVERRIDE; - - virtual void Copy() wxOVERRIDE; - virtual void Cut() wxOVERRIDE; - virtual void Paste() wxOVERRIDE; - - virtual void Undo() wxOVERRIDE; - virtual void Redo() wxOVERRIDE; - virtual bool CanUndo() const wxOVERRIDE; - virtual bool CanRedo() const wxOVERRIDE; - - virtual void SetInsertionPoint(long pos) wxOVERRIDE; - virtual long GetInsertionPoint() const wxOVERRIDE; - virtual long GetLastPosition() const wxOVERRIDE; - - virtual void SetSelection(long from, long to) wxOVERRIDE; - virtual void GetSelection(long *from, long *to) const wxOVERRIDE; - - virtual bool IsEditable() const wxOVERRIDE; - virtual void SetEditable(bool editable) wxOVERRIDE; - - virtual bool SetHint(const wxString& hint) wxOVERRIDE; - virtual wxString GetHint() const wxOVERRIDE; - - // This method sets the text without affecting list selection - // (ie. wxComboPopup::SetStringValue doesn't get called). - void SetText(const wxString& value); - - // This method sets value and also optionally sends EVT_TEXT - // (needed by combo popups) - wxDEPRECATED( void SetValueWithEvent(const wxString& value, - bool withEvent = true) ); - - // Changes value of the control as if user had done it by selecting an - // item from a combo box drop-down list. Needs to be public so that - // derived popup classes can call it. - void SetValueByUser(const wxString& value); - - // - // Popup customization methods - // - - // Sets minimum width of the popup. If wider than combo control, it will extend to the left. - // Remarks: - // * Value -1 indicates the default. - // * Custom popup may choose to ignore this (wxOwnerDrawnComboBox does not). - void SetPopupMinWidth( int width ) - { - m_widthMinPopup = width; - } - - // Sets preferred maximum height of the popup. - // Remarks: - // * Value -1 indicates the default. - // * Custom popup may choose to ignore this (wxOwnerDrawnComboBox does not). - void SetPopupMaxHeight( int height ) - { - m_heightPopup = height; - } - - // Extends popup size horizontally, relative to the edges of the combo control. - // Remarks: - // * Popup minimum width may override extLeft (ie. it has higher precedence). - // * Values 0 indicate default. - // * Custom popup may not take this fully into account (wxOwnerDrawnComboBox takes). - void SetPopupExtents( int extLeft, int extRight ) - { - m_extLeft = extLeft; - m_extRight = extRight; - } - - // Set width, in pixels, of custom paint area in writable combo. - // In read-only, used to indicate area that is not covered by the - // focus rectangle (which may or may not be drawn, depending on the - // popup type). - void SetCustomPaintWidth( int width ); - int GetCustomPaintWidth() const { return m_widthCustomPaint; } - - // Set side of the control to which the popup will align itself. - // Valid values are wxLEFT, wxRIGHT and 0. The default value 0 wmeans - // that the side of the button will be used. - void SetPopupAnchor( int anchorSide ) - { - m_anchorSide = anchorSide; - } - - // Set position of dropdown button. - // width: button width. <= 0 for default. - // height: button height. <= 0 for default. - // side: wxLEFT or wxRIGHT, indicates on which side the button will be placed. - // spacingX: empty space on sides of the button. Default is 0. - // Remarks: - // There is no spacingY - the button will be centered vertically. - void SetButtonPosition( int width = -1, - int height = -1, - int side = wxRIGHT, - int spacingX = 0 ); - - // Returns current size of the dropdown button. - wxSize GetButtonSize(); - - // - // Sets dropbutton to be drawn with custom bitmaps. - // - // bmpNormal: drawn when cursor is not on button - // pushButtonBg: Draw push button background below the image. - // NOTE! This is usually only properly supported on platforms with appropriate - // method in wxRendererNative. - // bmpPressed: drawn when button is depressed - // bmpHover: drawn when cursor hovers on button. This is ignored on platforms - // that do not generally display hover differently. - // bmpDisabled: drawn when combobox is disabled. - void SetButtonBitmaps( const wxBitmap& bmpNormal, - bool pushButtonBg = false, - const wxBitmap& bmpPressed = wxNullBitmap, - const wxBitmap& bmpHover = wxNullBitmap, - const wxBitmap& bmpDisabled = wxNullBitmap ); - -#if WXWIN_COMPATIBILITY_2_8 - // - // This will set the space in pixels between left edge of the control and the - // text, regardless whether control is read-only (ie. no wxTextCtrl) or not. - // Platform-specific default can be set with value-1. - // Remarks - // * This method may do nothing on some native implementations. - wxDEPRECATED( void SetTextIndent( int indent ) ); - - // Returns actual indentation in pixels. - wxDEPRECATED( wxCoord GetTextIndent() const ); -#endif - - // Returns area covered by the text field. - const wxRect& GetTextRect() const - { - return m_tcArea; - } - - // Call with enable as true to use a type of popup window that guarantees ability - // to focus the popup control, and normal function of common native controls. - // This alternative popup window is usually a wxDialog, and as such it's parent - // frame will appear as if the focus has been lost from it. - void UseAltPopupWindow( bool enable = true ) - { - wxASSERT_MSG( !m_winPopup, - wxT("call this only before SetPopupControl") ); - - if ( enable ) - m_iFlags |= wxCC_IFLAG_USE_ALT_POPUP; - else - m_iFlags &= ~wxCC_IFLAG_USE_ALT_POPUP; - } - - // Call with false to disable popup animation, if any. - void EnablePopupAnimation( bool enable = true ) - { - if ( enable ) - m_iFlags &= ~wxCC_IFLAG_DISABLE_POPUP_ANIM; - else - m_iFlags |= wxCC_IFLAG_DISABLE_POPUP_ANIM; - } - - // - // Utilies needed by the popups or native implementations - // - - // Returns true if given key combination should toggle the popup. - // NB: This is a separate from other keyboard handling because: - // 1) Replaceability. - // 2) Centralized code (otherwise it'd be split up between - // wxComboCtrl key handler and wxVListBoxComboPopup's - // key handler). - virtual bool IsKeyPopupToggle(const wxKeyEvent& event) const = 0; - - // Prepare background of combo control or an item in a dropdown list - // in a way typical on platform. This includes painting the focus/disabled - // background and setting the clipping region. - // Unless you plan to paint your own focus indicator, you should always call this - // in your wxComboPopup::PaintComboControl implementation. - // In addition, it sets pen and text colour to what looks good and proper - // against the background. - // flags: wxRendererNative flags: wxCONTROL_ISSUBMENU: is drawing a list item instead of combo control - // wxCONTROL_SELECTED: list item is selected - // wxCONTROL_DISABLED: control/item is disabled - virtual void PrepareBackground( wxDC& dc, const wxRect& rect, int flags ) const; - - // Returns true if focus indicator should be drawn in the control. - bool ShouldDrawFocus() const - { - const wxWindow* curFocus = FindFocus(); - return ( IsPopupWindowState(Hidden) && - (curFocus == m_mainCtrlWnd || (m_btn && curFocus == m_btn)) && - (m_windowStyle & wxCB_READONLY) ); - } - - // These methods return references to appropriate dropbutton bitmaps - const wxBitmap& GetBitmapNormal() const { return m_bmpNormal; } - const wxBitmap& GetBitmapPressed() const { return m_bmpPressed; } - const wxBitmap& GetBitmapHover() const { return m_bmpHover; } - const wxBitmap& GetBitmapDisabled() const { return m_bmpDisabled; } - - // Set custom style flags for embedded wxTextCtrl. Usually must be used - // with two-step creation, before Create() call. - void SetTextCtrlStyle( int style ); - - // Return internal flags - wxUint32 GetInternalFlags() const { return m_iFlags; } - - // Return true if Create has finished - bool IsCreated() const { return m_iFlags & wxCC_IFLAG_CREATED ? true : false; } - - // Need to override to return text area background colour - wxColour GetBackgroundColour() const; - - // common code to be called on popup hide/dismiss - void OnPopupDismiss(bool generateEvent); - - // PopupShown states - enum - { - Hidden = 0, - //Closing = 1, - Animating = 2, - Visible = 3 - }; - - bool IsPopupWindowState( int state ) const { return (state == m_popupWinState) ? true : false; } - - wxByte GetPopupWindowState() const { return m_popupWinState; } - - // Set value returned by GetMainWindowOfCompositeControl - void SetCtrlMainWnd( wxWindow* wnd ) { m_mainCtrlWnd = wnd; } - - // This is public so we can access it from wxComboCtrlTextCtrl - virtual wxWindow *GetMainWindowOfCompositeControl() wxOVERRIDE - { return m_mainCtrlWnd; } - - // also set the embedded wxTextCtrl colours - virtual bool SetForegroundColour(const wxColour& colour) wxOVERRIDE; - virtual bool SetBackgroundColour(const wxColour& colour) wxOVERRIDE; - -protected: - - // Returns true if hint text should be drawn in the control - bool ShouldUseHintText(int flags = 0) const - { - return ( !m_text && - !(flags & wxCONTROL_ISSUBMENU) && - !m_valueString.length() && - m_hintText.length() && - !ShouldDrawFocus() ); - } - - // - // Override these for customization purposes - // - - // called from wxSizeEvent handler - virtual void OnResize() = 0; - - // Return native text identation - // (i.e. text margin, for pure text, not textctrl) - virtual wxCoord GetNativeTextIndent() const; - - // Called in syscolourchanged handler and base create - virtual void OnThemeChange(); - - // Creates wxTextCtrl. - // extraStyle: Extra style parameters - void CreateTextCtrl( int extraStyle ); - - // Called when text was changed programmatically - // (e.g. from WriteText()) - void OnSetValue(const wxString& value); - - // Installs standard input handler to combo (and optionally to the textctrl) - void InstallInputHandlers(); - - // Flags for DrawButton - enum - { - Button_PaintBackground = 0x0001, // Paints control background below the button - Button_BitmapOnly = 0x0002 // Only paints the bitmap - }; - - // Draws dropbutton. Using wxRenderer or bitmaps, as appropriate. - // Flags are defined above. - virtual void DrawButton( wxDC& dc, const wxRect& rect, int flags = Button_PaintBackground ); - - // Call if cursor is on button area or mouse is captured for the button. - //bool HandleButtonMouseEvent( wxMouseEvent& event, bool isInside ); - bool HandleButtonMouseEvent( wxMouseEvent& event, int flags ); - - // returns true if event was consumed or filtered (event type is also set to 0 in this case) - bool PreprocessMouseEvent( wxMouseEvent& event, int flags ); - - // - // This will handle left_down and left_dclick events outside button in a Windows-like manner. - // If you need alternate behaviour, it is recommended you manipulate and filter events to it - // instead of building your own handling routine (for reference, on wxEVT_LEFT_DOWN it will - // toggle popup and on wxEVT_LEFT_DCLICK it will do the same or run the popup's dclick method, - // if defined - you should pass events of other types of it for common processing). - void HandleNormalMouseEvent( wxMouseEvent& event ); - - // Creates popup window, calls interface->Create(), etc - void CreatePopup(); - - // Destroy popup window and all related constructs - void DestroyPopup(); - - // override the base class virtuals involved in geometry calculations - // The common version only sets a default width, so the derived classes - // should override it and set the height and change the width as needed. - virtual wxSize DoGetBestSize() const wxOVERRIDE; - virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const wxOVERRIDE; - - // NULL popup can be used to indicate default in a derived class - virtual void DoSetPopupControl(wxComboPopup* popup); - - // ensures there is atleast the default popup - void EnsurePopupControl(); - - // Recalculates button and textctrl areas. Called when size or button setup change. - // btnWidth: default/calculated width of the dropbutton. 0 means unchanged, - // just recalculate. - void CalculateAreas( int btnWidth = 0 ); - - // Standard textctrl positioning routine. Just give it platform-dependent - // textctrl coordinate adjustment. - virtual void PositionTextCtrl( int textCtrlXAdjust = 0, - int textCtrlYAdjust = 0); - - // event handlers - void OnSizeEvent( wxSizeEvent& event ); - void OnFocusEvent(wxFocusEvent& event); - void OnIdleEvent(wxIdleEvent& event); - void OnTextCtrlEvent(wxCommandEvent& event); - void OnSysColourChanged(wxSysColourChangedEvent& event); - void OnKeyEvent(wxKeyEvent& event); - void OnCharEvent(wxKeyEvent& event); - - // Set customization flags (directs how wxComboCtrlBase helpers behave) - void Customize( wxUint32 flags ) { m_iFlags |= flags; } - - // Dispatches size event and refreshes - void RecalcAndRefresh(); - - // Flags for DoShowPopup and AnimateShow - enum - { - ShowBelow = 0x0000, // Showing popup below the control - ShowAbove = 0x0001, // Showing popup above the control - CanDeferShow = 0x0002 // Can only return true from AnimateShow if this is set - }; - - // Shows and positions the popup. - virtual void DoShowPopup( const wxRect& rect, int flags ); - - // Implement in derived class to create a drop-down animation. - // Return true if finished immediately. Otherwise popup is only - // shown when the derived class call DoShowPopup. - // Flags are same as for DoShowPopup. - virtual bool AnimateShow( const wxRect& rect, int flags ); - -#if wxUSE_TOOLTIPS - virtual void DoSetToolTip( wxToolTip *tip ) wxOVERRIDE; -#endif - - // protected wxTextEntry methods - virtual void DoSetValue(const wxString& value, int flags) wxOVERRIDE; - virtual wxString DoGetValue() const wxOVERRIDE; - virtual wxWindow *GetEditableWindow() wxOVERRIDE { return this; } - - // margins functions - virtual bool DoSetMargins(const wxPoint& pt) wxOVERRIDE; - virtual wxPoint DoGetMargins() const wxOVERRIDE; - - // This is used when m_text is hidden (readonly). - wxString m_valueString; - - // This is used when control is unfocused and m_valueString is empty - wxString m_hintText; - - // the text control and button we show all the time - wxTextCtrl* m_text; - wxWindow* m_btn; - - // wxPopupWindow or similar containing the window managed by the interface. - wxWindow* m_winPopup; - - // the popup control/panel - wxWindow* m_popup; - - // popup interface - wxComboPopup* m_popupInterface; - - // this is input etc. handler for the text control - wxEvtHandler* m_textEvtHandler; - - // this is for the top level window - wxEvtHandler* m_toplevEvtHandler; - - // this is for the control in popup - wxEvtHandler* m_popupEvtHandler; - - // this is for the popup window - wxEvtHandler* m_popupWinEvtHandler; - - // main (ie. topmost) window of a composite control (default = this) - wxWindow* m_mainCtrlWnd; - - // used to prevent immediate re-popupping in case closed popup - // by clicking on the combo control (needed because of inconsistent - // transient implementation across platforms). - wxMilliClock_t m_timeCanAcceptClick; - - // how much popup should expand to the left/right of the control - wxCoord m_extLeft; - wxCoord m_extRight; - - // minimum popup width - wxCoord m_widthMinPopup; - - // preferred popup height - wxCoord m_heightPopup; - - // how much of writable combo is custom-paint by callback? - // also used to indicate area that is not covered by "blue" - // selection indicator. - wxCoord m_widthCustomPaint; - - // left margin, in pixels - wxCoord m_marginLeft; - - // side on which the popup is aligned - int m_anchorSide; - - // Width of the "fake" border - wxCoord m_widthCustomBorder; - - // The button and textctrl click/paint areas - wxRect m_tcArea; - wxRect m_btnArea; - - // Colour of the text area, in case m_text is NULL - wxColour m_tcBgCol; - - // current button state (uses renderer flags) - int m_btnState; - - // button position - int m_btnWid; - int m_btnHei; - int m_btnSide; - int m_btnSpacingX; - - // last default button width - int m_btnWidDefault; - - // custom dropbutton bitmaps - wxBitmap m_bmpNormal; - wxBitmap m_bmpPressed; - wxBitmap m_bmpHover; - wxBitmap m_bmpDisabled; - - // area used by the button - wxSize m_btnSize; - - // platform-dependent customization and other flags - wxUint32 m_iFlags; - - // custom style for m_text - int m_textCtrlStyle; - - // draw blank button background under bitmap? - bool m_blankButtonBg; - - // is the popup window currenty shown? - wxByte m_popupWinState; - - // should the focus be reset to the textctrl in idle time? - bool m_resetFocus; - - // is the text-area background colour overridden? - bool m_hasTcBgCol; - -private: - void Init(); - - wxByte m_ignoreEvtText; // Number of next EVT_TEXTs to ignore - - // Is popup window wxPopupTransientWindow, wxPopupWindow or wxDialog? - wxByte m_popupWinType; - - wxDECLARE_EVENT_TABLE(); - - wxDECLARE_ABSTRACT_CLASS(wxComboCtrlBase); -}; - - -// ---------------------------------------------------------------------------- -// wxComboPopup is the interface which must be implemented by a control to be -// used as a popup by wxComboCtrl -// ---------------------------------------------------------------------------- - - -// wxComboPopup internal flags -enum -{ - wxCP_IFLAG_CREATED = 0x0001 // Set by wxComboCtrlBase after Create is called -}; - -class WXDLLIMPEXP_FWD_CORE wxComboCtrl; - - -class WXDLLIMPEXP_CORE wxComboPopup -{ - friend class wxComboCtrlBase; -public: - wxComboPopup() - { - m_combo = NULL; - m_iFlags = 0; - } - - // This is called immediately after construction finishes. m_combo member - // variable has been initialized before the call. - // NOTE: It is not in constructor so the derived class doesn't need to redefine - // a default constructor of its own. - virtual void Init() { } - - virtual ~wxComboPopup(); - - // Create the popup child control. - // Return true for success. - virtual bool Create(wxWindow* parent) = 0; - - // Calls Destroy() for the popup control (i.e. one returned by - // GetControl()) and makes sure that 'this' is deleted at the end. - // Default implementation works for both cases where popup control - // class is multiple inherited or created on heap as a separate - // object. - virtual void DestroyPopup(); - - // We must have an associated control which is subclassed by the combobox. - virtual wxWindow *GetControl() = 0; - - // Called immediately after the popup is shown - virtual void OnPopup(); - - // Called when popup is dismissed - virtual void OnDismiss(); - - // Called just prior to displaying popup. - // Default implementation does nothing. - virtual void SetStringValue( const wxString& value ); - - // Gets displayed string representation of the value. - virtual wxString GetStringValue() const = 0; - - // Called to check if the popup - when an item container - actually - // has matching item. Case-sensitivity checking etc. is up to the - // implementation. If the found item matched the string, but is - // different, it should be written back to pItem. Default implementation - // always return true and does not alter trueItem. - virtual bool FindItem(const wxString& item, wxString* trueItem=NULL); - - // This is called to custom paint in the combo control itself (ie. not the popup). - // Default implementation draws value as string. - virtual void PaintComboControl( wxDC& dc, const wxRect& rect ); - - // Receives wxEVT_KEY_DOWN key events from the parent wxComboCtrl. - // Events not handled should be skipped, as usual. - virtual void OnComboKeyEvent( wxKeyEvent& event ); - - // Receives wxEVT_CHAR key events from the parent wxComboCtrl. - // Events not handled should be skipped, as usual. - virtual void OnComboCharEvent( wxKeyEvent& event ); - - // Implement if you need to support special action when user - // double-clicks on the parent wxComboCtrl. - virtual void OnComboDoubleClick(); - - // Return final size of popup. Called on every popup, just prior to OnShow. - // minWidth = preferred minimum width for window - // prefHeight = preferred height. Only applies if > 0, - // maxHeight = max height for window, as limited by screen size - // and should only be rounded down, if necessary. - virtual wxSize GetAdjustedSize( int minWidth, int prefHeight, int maxHeight ); - - // Return true if you want delay call to Create until the popup is shown - // for the first time. It is more efficient, but note that it is often - // more convenient to have the control created immediately. - // Default returns false. - virtual bool LazyCreate(); - - // - // Utilies - // - - // Hides the popup - void Dismiss(); - - // Returns true if Create has been called. - bool IsCreated() const - { - return (m_iFlags & wxCP_IFLAG_CREATED) ? true : false; - } - - // Returns pointer to the associated parent wxComboCtrl. - wxComboCtrl* GetComboCtrl() const; - - // Default PaintComboControl behaviour - static void DefaultPaintComboControl( wxComboCtrlBase* combo, - wxDC& dc, - const wxRect& rect ); - -protected: - wxComboCtrlBase* m_combo; - wxUint32 m_iFlags; - -private: - // Called in wxComboCtrlBase::SetPopupControl - void InitBase(wxComboCtrlBase *combo) - { - m_combo = combo; - } -}; - - -// ---------------------------------------------------------------------------- -// include the platform-dependent header defining the real class -// ---------------------------------------------------------------------------- - -#if defined(__WXUNIVERSAL__) - // No native universal (but it must still be first in the list) -#elif defined(__WXMSW__) - #include "wx/msw/combo.h" -#endif - -// Any ports may need generic as an alternative -#include "wx/generic/combo.h" - -#endif // wxUSE_COMBOCTRL - -#endif - // _WX_COMBOCONTROL_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/combobox.h b/Externals/wxWidgets3/include/wx/combobox.h deleted file mode 100644 index 4e9b64fdc8..0000000000 --- a/Externals/wxWidgets3/include/wx/combobox.h +++ /dev/null @@ -1,90 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/combobox.h -// Purpose: wxComboBox declaration -// Author: Vadim Zeitlin -// Modified by: -// Created: 24.12.00 -// Copyright: (c) 1996-2000 wxWidgets team -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_COMBOBOX_H_BASE_ -#define _WX_COMBOBOX_H_BASE_ - -#include "wx/defs.h" - -#if wxUSE_COMBOBOX - -// For compatibility with 2.8 include this header to allow using wxTE_XXX -// styles with wxComboBox without explicitly including it in the user code. -#include "wx/textctrl.h" - -extern WXDLLIMPEXP_DATA_CORE(const char) wxComboBoxNameStr[]; - -// ---------------------------------------------------------------------------- -// wxComboBoxBase: this interface defines the methods wxComboBox must implement -// ---------------------------------------------------------------------------- - -#include "wx/ctrlsub.h" -#include "wx/textentry.h" - -class WXDLLIMPEXP_CORE wxComboBoxBase : public wxItemContainer, - public wxTextEntry -{ -public: - // override these methods to disambiguate between two base classes versions - virtual void Clear() wxOVERRIDE - { - wxTextEntry::Clear(); - wxItemContainer::Clear(); - } - - // IsEmpty() is ambiguous because we inherit it from both wxItemContainer - // and wxTextEntry, and even if defined it here to help the compiler with - // choosing one of them, it would still be confusing for the human users of - // this class. So instead define the clearly named methods below and leave - // IsEmpty() ambiguous to trigger a compilation error if it's used. - bool IsListEmpty() const { return wxItemContainer::IsEmpty(); } - bool IsTextEmpty() const { return wxTextEntry::IsEmpty(); } - - // also bring in GetSelection() versions of both base classes in scope - // - // NB: GetSelection(from, to) could be already implemented in wxTextEntry - // but still make it pure virtual because for some platforms it's not - // implemented there and also because the derived class has to override - // it anyhow to avoid ambiguity with the other GetSelection() - virtual int GetSelection() const wxOVERRIDE = 0; - virtual void GetSelection(long *from, long *to) const wxOVERRIDE = 0; - - virtual void Popup() { wxFAIL_MSG( wxT("Not implemented") ); } - virtual void Dismiss() { wxFAIL_MSG( wxT("Not implemented") ); } - - // may return value different from GetSelection() when the combobox - // dropdown is shown and the user selected, but not yet accepted, a value - // different from the old one in it - virtual int GetCurrentSelection() const { return GetSelection(); } -}; - -// ---------------------------------------------------------------------------- -// include the platform-dependent header defining the real class -// ---------------------------------------------------------------------------- - -#if defined(__WXUNIVERSAL__) - #include "wx/univ/combobox.h" -#elif defined(__WXMSW__) - #include "wx/msw/combobox.h" -#elif defined(__WXMOTIF__) - #include "wx/motif/combobox.h" -#elif defined(__WXGTK20__) - #include "wx/gtk/combobox.h" -#elif defined(__WXGTK__) - #include "wx/gtk1/combobox.h" -#elif defined(__WXMAC__) - #include "wx/osx/combobox.h" -#elif defined(__WXQT__) - #include "wx/qt/combobox.h" -#endif - -#endif // wxUSE_COMBOBOX - -#endif // _WX_COMBOBOX_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/commandlinkbutton.h b/Externals/wxWidgets3/include/wx/commandlinkbutton.h deleted file mode 100644 index bd4b5d2e23..0000000000 --- a/Externals/wxWidgets3/include/wx/commandlinkbutton.h +++ /dev/null @@ -1,169 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/commandlinkbutton.h -// Purpose: wxCommandLinkButtonBase and wxGenericCommandLinkButton classes -// Author: Rickard Westerlund -// Created: 2010-06-11 -// Copyright: (c) 2010 wxWidgets team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_COMMANDLINKBUTTON_H_ -#define _WX_COMMANDLINKBUTTON_H_ - -#include "wx/defs.h" - -#if wxUSE_COMMANDLINKBUTTON - -#include "wx/button.h" - -// ---------------------------------------------------------------------------- -// Command link button common base class -// ---------------------------------------------------------------------------- - -// This class has separate "main label" (title-like string) and (possibly -// multiline) "note" which can be set and queried separately but can also be -// set both at once by joining them with a new line and setting them as a -// label and queried by breaking the label into the parts before the first new -// line and after it. - -class WXDLLIMPEXP_ADV wxCommandLinkButtonBase : public wxButton -{ -public: - wxCommandLinkButtonBase() : wxButton() { } - - wxCommandLinkButtonBase(wxWindow *parent, - wxWindowID id, - const wxString& mainLabel = wxEmptyString, - const wxString& note = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = - wxDefaultValidator, - const wxString& name = wxButtonNameStr) - : wxButton(parent, - id, - mainLabel + '\n' + note, - pos, - size, - style, - validator, - name) - { } - - virtual void SetMainLabelAndNote(const wxString& mainLabel, - const wxString& note) = 0; - - virtual void SetMainLabel(const wxString& mainLabel) - { - SetMainLabelAndNote(mainLabel, GetNote()); - } - - virtual void SetNote(const wxString& note) - { - SetMainLabelAndNote(GetMainLabel(), note); - } - - virtual wxString GetMainLabel() const - { - return GetLabel().BeforeFirst('\n'); - } - - virtual wxString GetNote() const - { - return GetLabel().AfterFirst('\n'); - } - -protected: - virtual bool HasNativeBitmap() const { return false; } - -private: - wxDECLARE_NO_COPY_CLASS(wxCommandLinkButtonBase); -}; - -// ---------------------------------------------------------------------------- -// Generic command link button -// ---------------------------------------------------------------------------- - -// Trivial generic implementation simply using a multiline label to show both -// the main label and the note. - -class WXDLLIMPEXP_ADV wxGenericCommandLinkButton - : public wxCommandLinkButtonBase -{ -public: - wxGenericCommandLinkButton() : wxCommandLinkButtonBase() { } - - - wxGenericCommandLinkButton(wxWindow *parent, - wxWindowID id, - const wxString& mainLabel = wxEmptyString, - const wxString& note = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr) - : wxCommandLinkButtonBase() - { - Create(parent, id, mainLabel, note, pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& mainLabel = wxEmptyString, - const wxString& note = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr); - - virtual void SetMainLabelAndNote(const wxString& mainLabel, - const wxString& note) wxOVERRIDE - { - wxButton::SetLabel(mainLabel + '\n' + note); - } - -private: - void SetDefaultBitmap(); - - wxDECLARE_NO_COPY_CLASS(wxGenericCommandLinkButton); -}; - -#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) - #include "wx/msw/commandlinkbutton.h" -#else - class WXDLLIMPEXP_ADV wxCommandLinkButton : public wxGenericCommandLinkButton - { - public: - wxCommandLinkButton() : wxGenericCommandLinkButton() { } - - wxCommandLinkButton(wxWindow *parent, - wxWindowID id, - const wxString& mainLabel = wxEmptyString, - const wxString& note = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr) - : wxGenericCommandLinkButton(parent, - id, - mainLabel, - note, - pos, - size, - style, - validator, - name) - { } - - private: - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxCommandLinkButton); - }; -#endif // __WXMSW__/!__WXMSW__ - -#endif // wxUSE_COMMANDLINKBUTTON - -#endif // _WX_COMMANDLINKBUTTON_H_ diff --git a/Externals/wxWidgets3/include/wx/compiler.h b/Externals/wxWidgets3/include/wx/compiler.h deleted file mode 100644 index dfab0a25b4..0000000000 --- a/Externals/wxWidgets3/include/wx/compiler.h +++ /dev/null @@ -1,126 +0,0 @@ -/* - * Name: wx/compiler.h - * Purpose: Compiler-specific macro definitions. - * Author: Vadim Zeitlin - * Created: 2013-07-13 (extracted from wx/platform.h) - * Copyright: (c) 1997-2013 Vadim Zeitlin - * Licence: wxWindows licence - */ - -/* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */ - -#ifndef _WX_COMPILER_H_ -#define _WX_COMPILER_H_ - -/* - Compiler detection and related helpers. - */ - -/* - Notice that Intel compiler can be used as Microsoft Visual C++ add-on and - so we should define both __INTELC__ and __VISUALC__ for it. -*/ -#ifdef __INTEL_COMPILER -# define __INTELC__ -#endif - -#if defined(_MSC_VER) - /* - define another standard symbol for Microsoft Visual C++: the standard - one (_MSC_VER) is also defined by some other compilers. - */ -# define __VISUALC__ _MSC_VER - - /* - define special symbols for different VC version instead of writing tests - for magic numbers such as 1200, 1300 &c repeatedly - */ -#if __VISUALC__ < 1300 -# error "This Visual C++ version is not supported any longer (at least MSVC 2003 required)." -#elif __VISUALC__ < 1400 -# define __VISUALC7__ -#elif __VISUALC__ < 1500 -# define __VISUALC8__ -#elif __VISUALC__ < 1600 -# define __VISUALC9__ -#elif __VISUALC__ < 1700 -# define __VISUALC10__ -#elif __VISUALC__ < 1800 -# define __VISUALC11__ -#elif __VISUALC__ < 1900 -# define __VISUALC12__ -#elif __VISUALC__ < 2000 - /* There is no __VISUALC13__! */ -# define __VISUALC14__ -#else - /* - Don't forget to update include/msvc/wx/setup.h as well when adding - support for a newer MSVC version here. - */ -# pragma message("Please update wx/compiler.h to recognize this VC++ version") -#endif - -#elif defined(__BCPLUSPLUS__) && !defined(__BORLANDC__) -# define __BORLANDC__ -#elif defined(__SUNPRO_CC) -# ifndef __SUNCC__ -# define __SUNCC__ __SUNPRO_CC -# endif /* Sun CC */ -#endif /* compiler */ - -/* - Macros for checking compiler version. -*/ - -/* - This macro can be used to test the gcc version and can be used like this: - -# if wxCHECK_GCC_VERSION(3, 1) - ... we have gcc 3.1 or later ... -# else - ... no gcc at all or gcc < 3.1 ... -# endif -*/ -#if defined(__GNUC__) && defined(__GNUC_MINOR__) - #define wxCHECK_GCC_VERSION( major, minor ) \ - ( ( __GNUC__ > (major) ) \ - || ( __GNUC__ == (major) && __GNUC_MINOR__ >= (minor) ) ) -#else - #define wxCHECK_GCC_VERSION( major, minor ) 0 -#endif - -/* - This macro can be used to test the Visual C++ version. -*/ -#ifndef __VISUALC__ -# define wxVISUALC_VERSION(major) 0 -# define wxCHECK_VISUALC_VERSION(major) 0 -#else - /* - Things used to be simple with the _MSC_VER value and the version number - increasing in lock step, but _MSC_VER value of 1900 is VC14 and not the - non existing (presumably for the superstitious reasons) VC13, so we now - need to account for this with an extra offset. - */ -# define wxVISUALC_VERSION(major) ( (6 + (major >= 14 ? 1 : 0) + major) * 100 ) -# define wxCHECK_VISUALC_VERSION(major) ( __VISUALC__ >= wxVISUALC_VERSION(major) ) -#endif - -/** - This is similar to wxCHECK_GCC_VERSION but for Sun CC compiler. - */ -#ifdef __SUNCC__ - /* - __SUNCC__ is 0xVRP where V is major version, R release and P patch level - */ - #define wxCHECK_SUNCC_VERSION(maj, min) (__SUNCC__ >= (((maj)<<8) | ((min)<<4))) -#else - #define wxCHECK_SUNCC_VERSION(maj, min) (0) -#endif - -/* - wxCHECK_MINGW32_VERSION() is defined in wx/msw/gccpriv.h which is included - later, see comments there. - */ - -#endif // _WX_COMPILER_H_ diff --git a/Externals/wxWidgets3/include/wx/compositewin.h b/Externals/wxWidgets3/include/wx/compositewin.h deleted file mode 100644 index 0a9bbdff81..0000000000 --- a/Externals/wxWidgets3/include/wx/compositewin.h +++ /dev/null @@ -1,231 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/compositewin.h -// Purpose: wxCompositeWindow<> declaration -// Author: Vadim Zeitlin -// Created: 2011-01-02 -// Copyright: (c) 2011 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_COMPOSITEWIN_H_ -#define _WX_COMPOSITEWIN_H_ - -#include "wx/window.h" -#include "wx/containr.h" - -class WXDLLIMPEXP_FWD_CORE wxToolTip; - -// NB: This is an experimental and, as for now, undocumented class used only by -// wxWidgets itself internally. Don't use it in your code until its API is -// officially stabilized unless you are ready to change it with the next -// wxWidgets release. - -// ---------------------------------------------------------------------------- -// wxCompositeWindow is a helper for implementing composite windows: to define -// a class using subwindows, simply inherit from it specialized with the real -// base class name and implement GetCompositeWindowParts() pure virtual method. -// ---------------------------------------------------------------------------- - -// The template parameter W must be a wxWindow-derived class. -template -class wxCompositeWindow : public W -{ -public: - typedef W BaseWindowClass; - - // Default ctor doesn't do anything. - wxCompositeWindow() - { - this->Connect - ( - wxEVT_CREATE, - wxWindowCreateEventHandler(wxCompositeWindow::OnWindowCreate) - ); - - } - - // Override all wxWindow methods which must be forwarded to the composite - // window parts. - - // Attribute setters group. - // - // NB: Unfortunately we can't factor out the call for the setter itself - // into DoSetForAllParts() because we can't call the function passed to - // it non-virtually and we need to do this to avoid infinite recursion, - // so we work around this by calling the method of this object itself - // manually in each function. - virtual bool SetForegroundColour(const wxColour& colour) - { - if ( !BaseWindowClass::SetForegroundColour(colour) ) - return false; - - SetForAllParts(&wxWindowBase::SetForegroundColour, colour); - - return true; - } - - virtual bool SetBackgroundColour(const wxColour& colour) - { - if ( !BaseWindowClass::SetBackgroundColour(colour) ) - return false; - - SetForAllParts(&wxWindowBase::SetBackgroundColour, colour); - - return true; - } - - virtual bool SetFont(const wxFont& font) - { - if ( !BaseWindowClass::SetFont(font) ) - return false; - - SetForAllParts(&wxWindowBase::SetFont, font); - - return true; - } - - virtual bool SetCursor(const wxCursor& cursor) - { - if ( !BaseWindowClass::SetCursor(cursor) ) - return false; - - SetForAllParts(&wxWindowBase::SetCursor, cursor); - - return true; - } - - virtual void SetLayoutDirection(wxLayoutDirection dir) - { - BaseWindowClass::SetLayoutDirection(dir); - - SetForAllParts(&wxWindowBase::SetLayoutDirection, dir); - - // The child layout almost invariably depends on the layout direction, - // so redo it when it changes. - // - // However avoid doing it when we're called from wxWindow::Create() in - // wxGTK as the derived window is not fully created yet and calling its - // SetSize() may be unexpected. This does mean that any future calls to - // SetLayoutDirection(wxLayout_Default) wouldn't result in a re-layout - // neither, but then we're not supposed to be called with it at all. - if ( dir != wxLayout_Default ) - this->SetSize(-1, -1, -1, -1, wxSIZE_AUTO | wxSIZE_FORCE); - } - -#if wxUSE_TOOLTIPS - virtual void DoSetToolTipText(const wxString &tip) - { - BaseWindowClass::DoSetToolTipText(tip); - - // Use a variable to disambiguate between SetToolTip() overloads. - void (wxWindowBase::*func)(const wxString&) = &wxWindowBase::SetToolTip; - - SetForAllParts(func, tip); - } - - virtual void DoSetToolTip(wxToolTip *tip) - { - BaseWindowClass::DoSetToolTip(tip); - - SetForAllParts(&wxWindowBase::CopyToolTip, tip); - } -#endif // wxUSE_TOOLTIPS - - virtual void SetFocus() - { - wxSetFocusToChild(this, NULL); - } - -private: - // Must be implemented by the derived class to return all children to which - // the public methods we override should forward to. - virtual wxWindowList GetCompositeWindowParts() const = 0; - - void OnWindowCreate(wxWindowCreateEvent& event) - { - event.Skip(); - - // Attach a few event handlers to all parts of the composite window. - // This makes the composite window behave more like a simple control - // and allows other code (such as wxDataViewCtrl's inline editing - // support) to hook into its event processing. - - wxWindow *child = event.GetWindow(); - if ( child == this ) - return; // not a child, we don't want to Connect() to ourselves - - // Always capture wxEVT_KILL_FOCUS: - child->Connect(wxEVT_KILL_FOCUS, - wxFocusEventHandler(wxCompositeWindow::OnKillFocus), - NULL, this); - - // Some events should be only handled for non-toplevel children. For - // example, we want to close the control in wxDataViewCtrl when Enter - // is pressed in the inline editor, but not when it's pressed in a - // popup dialog it opens. - wxWindow *win = child; - while ( win && win != this ) - { - if ( win->IsTopLevel() ) - return; - win = win->GetParent(); - } - - child->Connect(wxEVT_CHAR, - wxKeyEventHandler(wxCompositeWindow::OnChar), - NULL, this); - } - - void OnChar(wxKeyEvent& event) - { - if ( !this->ProcessWindowEvent(event) ) - event.Skip(); - } - - void OnKillFocus(wxFocusEvent& event) - { - // Ignore focus changes within the composite control: - wxWindow *win = event.GetWindow(); - while ( win ) - { - if ( win == this ) - { - event.Skip(); - return; - } - - // Note that we don't use IsTopLevel() check here, because we do - // want to ignore focus changes going to toplevel window that have - // the composite control as its parent; these would typically be - // some kind of control's popup window. - win = win->GetParent(); - } - - // The event shouldn't be ignored, forward it to the main control: - if ( !this->ProcessWindowEvent(event) ) - event.Skip(); - } - - template - void SetForAllParts(R (wxWindowBase::*func)(TArg), T arg) - { - // Simply call the setters for all parts of this composite window. - const wxWindowList parts = GetCompositeWindowParts(); - for ( wxWindowList::const_iterator i = parts.begin(); - i != parts.end(); - ++i ) - { - wxWindow * const child = *i; - - // Allow NULL elements in the list, this makes the code of derived - // composite controls which may have optionally shown children - // simpler and it doesn't cost us much here. - if ( child ) - (child->*func)(arg); - } - } - - wxDECLARE_NO_COPY_TEMPLATE_CLASS(wxCompositeWindow, W); -}; - -#endif // _WX_COMPOSITEWIN_H_ diff --git a/Externals/wxWidgets3/include/wx/confbase.h b/Externals/wxWidgets3/include/wx/confbase.h deleted file mode 100644 index 714e3d0092..0000000000 --- a/Externals/wxWidgets3/include/wx/confbase.h +++ /dev/null @@ -1,456 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/confbase.h -// Purpose: declaration of the base class of all config implementations -// (see also: fileconf.h and msw/regconf.h and iniconf.h) -// Author: Karsten Ballueder & Vadim Zeitlin -// Modified by: -// Created: 07.04.98 (adapted from appconf.h) -// Copyright: (c) 1997 Karsten Ballueder Ballueder@usa.net -// Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_CONFBASE_H_ -#define _WX_CONFBASE_H_ - -#include "wx/defs.h" -#include "wx/string.h" -#include "wx/object.h" -#include "wx/base64.h" - -class WXDLLIMPEXP_FWD_BASE wxArrayString; - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -/// shall we be case sensitive in parsing variable names? -#ifndef wxCONFIG_CASE_SENSITIVE - #define wxCONFIG_CASE_SENSITIVE 0 -#endif - -/// separates group and entry names (probably shouldn't be changed) -#ifndef wxCONFIG_PATH_SEPARATOR - #define wxCONFIG_PATH_SEPARATOR wxT('/') -#endif - -/// introduces immutable entries -// (i.e. the ones which can't be changed from the local config file) -#ifndef wxCONFIG_IMMUTABLE_PREFIX - #define wxCONFIG_IMMUTABLE_PREFIX wxT('!') -#endif - -#if wxUSE_CONFIG - -/// should we use registry instead of configuration files under Windows? -// (i.e. whether wxConfigBase::Create() will create a wxFileConfig (if it's -// false) or wxRegConfig (if it's true and we're under Win32)) -#ifndef wxUSE_CONFIG_NATIVE - #define wxUSE_CONFIG_NATIVE 1 -#endif - -// not all compilers can deal with template Read/Write() methods, define this -// symbol if the template functions are available -#if !defined( __VMS ) && \ - !(defined(__HP_aCC) && defined(__hppa)) - #define wxHAS_CONFIG_TEMPLATE_RW -#endif - -// Style flags for constructor style parameter -enum -{ - wxCONFIG_USE_LOCAL_FILE = 1, - wxCONFIG_USE_GLOBAL_FILE = 2, - wxCONFIG_USE_RELATIVE_PATH = 4, - wxCONFIG_USE_NO_ESCAPE_CHARACTERS = 8, - wxCONFIG_USE_SUBDIR = 16 -}; - -// ---------------------------------------------------------------------------- -// abstract base class wxConfigBase which defines the interface for derived -// classes -// -// wxConfig organizes the items in a tree-like structure (modelled after the -// Unix/Dos filesystem). There are groups (directories) and keys (files). -// There is always one current group given by the current path. -// -// Keys are pairs "key_name = value" where value may be of string or integer -// (long) type (TODO doubles and other types such as wxDate coming soon). -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxConfigBase : public wxObject -{ -public: - // constants - // the type of an entry - enum EntryType - { - Type_Unknown, - Type_String, - Type_Boolean, - Type_Integer, // use Read(long *) - Type_Float // use Read(double *) - }; - - // static functions - // sets the config object, returns the previous pointer - static wxConfigBase *Set(wxConfigBase *pConfig); - // get the config object, creates it on demand unless DontCreateOnDemand - // was called - static wxConfigBase *Get(bool createOnDemand = true) - { if ( createOnDemand && (!ms_pConfig) ) Create(); return ms_pConfig; } - // create a new config object: this function will create the "best" - // implementation of wxConfig available for the current platform, see - // comments near definition wxUSE_CONFIG_NATIVE for details. It returns - // the created object and also sets it as ms_pConfig. - static wxConfigBase *Create(); - // should Get() try to create a new log object if the current one is NULL? - static void DontCreateOnDemand() { ms_bAutoCreate = false; } - - // ctor & virtual dtor - // ctor (can be used as default ctor too) - // - // Not all args will always be used by derived classes, but including - // them all in each class ensures compatibility. If appName is empty, - // uses wxApp name - wxConfigBase(const wxString& appName = wxEmptyString, - const wxString& vendorName = wxEmptyString, - const wxString& localFilename = wxEmptyString, - const wxString& globalFilename = wxEmptyString, - long style = 0); - - // empty but ensures that dtor of all derived classes is virtual - virtual ~wxConfigBase(); - - // path management - // set current path: if the first character is '/', it's the absolute path, - // otherwise it's a relative path. '..' is supported. If the strPath - // doesn't exist it is created. - virtual void SetPath(const wxString& strPath) = 0; - // retrieve the current path (always as absolute path) - virtual const wxString& GetPath() const = 0; - - // enumeration: all functions here return false when there are no more items. - // you must pass the same lIndex to GetNext and GetFirst (don't modify it) - // enumerate subgroups - virtual bool GetFirstGroup(wxString& str, long& lIndex) const = 0; - virtual bool GetNextGroup (wxString& str, long& lIndex) const = 0; - // enumerate entries - virtual bool GetFirstEntry(wxString& str, long& lIndex) const = 0; - virtual bool GetNextEntry (wxString& str, long& lIndex) const = 0; - // get number of entries/subgroups in the current group, with or without - // it's subgroups - virtual size_t GetNumberOfEntries(bool bRecursive = false) const = 0; - virtual size_t GetNumberOfGroups(bool bRecursive = false) const = 0; - - // tests of existence - // returns true if the group by this name exists - virtual bool HasGroup(const wxString& strName) const = 0; - // same as above, but for an entry - virtual bool HasEntry(const wxString& strName) const = 0; - // returns true if either a group or an entry with a given name exist - bool Exists(const wxString& strName) const - { return HasGroup(strName) || HasEntry(strName); } - - // get the entry type - virtual EntryType GetEntryType(const wxString& name) const - { - // by default all entries are strings - return HasEntry(name) ? Type_String : Type_Unknown; - } - - // key access: returns true if value was really read, false if default used - // (and if the key is not found the default value is returned.) - - // read a string from the key - bool Read(const wxString& key, wxString *pStr) const; - bool Read(const wxString& key, wxString *pStr, const wxString& defVal) const; - - // read a number (long) - bool Read(const wxString& key, long *pl) const; - bool Read(const wxString& key, long *pl, long defVal) const; - - // read an int (wrapper around `long' version) - bool Read(const wxString& key, int *pi) const; - bool Read(const wxString& key, int *pi, int defVal) const; - - // read a double - bool Read(const wxString& key, double* val) const; - bool Read(const wxString& key, double* val, double defVal) const; - - // read a float - bool Read(const wxString& key, float* val) const; - bool Read(const wxString& key, float* val, float defVal) const; - - // read a bool - bool Read(const wxString& key, bool* val) const; - bool Read(const wxString& key, bool* val, bool defVal) const; - -#if wxUSE_BASE64 - // read a binary data block - bool Read(const wxString& key, wxMemoryBuffer* data) const - { return DoReadBinary(key, data); } - // no default version since it does not make sense for binary data -#endif // wxUSE_BASE64 - -#ifdef wxHAS_CONFIG_TEMPLATE_RW - // read other types, for which wxFromString is defined - template - bool Read(const wxString& key, T* value) const - { - wxString s; - if ( !Read(key, &s) ) - return false; - return wxFromString(s, value); - } - - template - bool Read(const wxString& key, T* value, const T& defVal) const - { - const bool found = Read(key, value); - if ( !found ) - { - if (IsRecordingDefaults()) - ((wxConfigBase *)this)->Write(key, defVal); - *value = defVal; - } - return found; - } -#endif // wxHAS_CONFIG_TEMPLATE_RW - - // convenience functions returning directly the value - wxString Read(const wxString& key, - const wxString& defVal = wxEmptyString) const - { wxString s; (void)Read(key, &s, defVal); return s; } - - // we have to provide a separate version for C strings as otherwise the - // template Read() would be used - wxString Read(const wxString& key, const char* defVal) const - { return Read(key, wxString(defVal)); } - wxString Read(const wxString& key, const wchar_t* defVal) const - { return Read(key, wxString(defVal)); } - - long ReadLong(const wxString& key, long defVal) const - { long l; (void)Read(key, &l, defVal); return l; } - - double ReadDouble(const wxString& key, double defVal) const - { double d; (void)Read(key, &d, defVal); return d; } - - bool ReadBool(const wxString& key, bool defVal) const - { bool b; (void)Read(key, &b, defVal); return b; } - - template - T ReadObject(const wxString& key, T const& defVal) const - { T t; (void)Read(key, &t, defVal); return t; } - - // for compatibility with wx 2.8 - long Read(const wxString& key, long defVal) const - { return ReadLong(key, defVal); } - - - // write the value (return true on success) - bool Write(const wxString& key, const wxString& value) - { return DoWriteString(key, value); } - - bool Write(const wxString& key, long value) - { return DoWriteLong(key, value); } - - bool Write(const wxString& key, double value) - { return DoWriteDouble(key, value); } - - bool Write(const wxString& key, bool value) - { return DoWriteBool(key, value); } - -#if wxUSE_BASE64 - bool Write(const wxString& key, const wxMemoryBuffer& buf) - { return DoWriteBinary(key, buf); } -#endif // wxUSE_BASE64 - - // we have to provide a separate version for C strings as otherwise they - // would be converted to bool and not to wxString as expected! - bool Write(const wxString& key, const char *value) - { return Write(key, wxString(value)); } - bool Write(const wxString& key, const unsigned char *value) - { return Write(key, wxString(value)); } - bool Write(const wxString& key, const wchar_t *value) - { return Write(key, wxString(value)); } - - - // we also have to provide specializations for other types which we want to - // handle using the specialized DoWriteXXX() instead of the generic template - // version below - bool Write(const wxString& key, char value) - { return DoWriteLong(key, value); } - - bool Write(const wxString& key, unsigned char value) - { return DoWriteLong(key, value); } - - bool Write(const wxString& key, short value) - { return DoWriteLong(key, value); } - - bool Write(const wxString& key, unsigned short value) - { return DoWriteLong(key, value); } - - bool Write(const wxString& key, unsigned int value) - { return DoWriteLong(key, value); } - - bool Write(const wxString& key, int value) - { return DoWriteLong(key, value); } - - bool Write(const wxString& key, unsigned long value) - { return DoWriteLong(key, value); } - - bool Write(const wxString& key, float value) - { return DoWriteDouble(key, value); } - - // Causes ambiguities in under OpenVMS -#if !defined( __VMS ) - // for other types, use wxToString() - template - bool Write(const wxString& key, T const& value) - { return Write(key, wxToString(value)); } -#endif - - // permanently writes all changes - virtual bool Flush(bool bCurrentOnly = false) = 0; - - // renaming, all functions return false on failure (probably because the new - // name is already taken by an existing entry) - // rename an entry - virtual bool RenameEntry(const wxString& oldName, - const wxString& newName) = 0; - // rename a group - virtual bool RenameGroup(const wxString& oldName, - const wxString& newName) = 0; - - // delete entries/groups - // deletes the specified entry and the group it belongs to if - // it was the last key in it and the second parameter is true - virtual bool DeleteEntry(const wxString& key, - bool bDeleteGroupIfEmpty = true) = 0; - // delete the group (with all subgroups) - virtual bool DeleteGroup(const wxString& key) = 0; - // delete the whole underlying object (disk file, registry key, ...) - // primarily for use by uninstallation routine. - virtual bool DeleteAll() = 0; - - // options - // we can automatically expand environment variables in the config entries - // (this option is on by default, you can turn it on/off at any time) - bool IsExpandingEnvVars() const { return m_bExpandEnvVars; } - void SetExpandEnvVars(bool bDoIt = true) { m_bExpandEnvVars = bDoIt; } - // recording of default values - void SetRecordDefaults(bool bDoIt = true) { m_bRecordDefaults = bDoIt; } - bool IsRecordingDefaults() const { return m_bRecordDefaults; } - // does expansion only if needed - wxString ExpandEnvVars(const wxString& str) const; - - // misc accessors - wxString GetAppName() const { return m_appName; } - wxString GetVendorName() const { return m_vendorName; } - - // Used wxIniConfig to set members in constructor - void SetAppName(const wxString& appName) { m_appName = appName; } - void SetVendorName(const wxString& vendorName) { m_vendorName = vendorName; } - - void SetStyle(long style) { m_style = style; } - long GetStyle() const { return m_style; } - -protected: - static bool IsImmutable(const wxString& key) - { return !key.IsEmpty() && key[0] == wxCONFIG_IMMUTABLE_PREFIX; } - - // return the path without trailing separator, if any: this should be called - // to sanitize paths referring to the group names before passing them to - // wxConfigPathChanger as "/foo/bar/" should be the same as "/foo/bar" and it - // isn't interpreted in the same way by it (and this can't be changed there - // as it's not the same for the entries names) - static wxString RemoveTrailingSeparator(const wxString& key); - - // do read/write the values of different types - virtual bool DoReadString(const wxString& key, wxString *pStr) const = 0; - virtual bool DoReadLong(const wxString& key, long *pl) const = 0; - virtual bool DoReadDouble(const wxString& key, double* val) const; - virtual bool DoReadBool(const wxString& key, bool* val) const; -#if wxUSE_BASE64 - virtual bool DoReadBinary(const wxString& key, wxMemoryBuffer* buf) const = 0; -#endif // wxUSE_BASE64 - - virtual bool DoWriteString(const wxString& key, const wxString& value) = 0; - virtual bool DoWriteLong(const wxString& key, long value) = 0; - virtual bool DoWriteDouble(const wxString& key, double value); - virtual bool DoWriteBool(const wxString& key, bool value); -#if wxUSE_BASE64 - virtual bool DoWriteBinary(const wxString& key, const wxMemoryBuffer& buf) = 0; -#endif // wxUSE_BASE64 - -private: - // are we doing automatic environment variable expansion? - bool m_bExpandEnvVars; - // do we record default values? - bool m_bRecordDefaults; - - // static variables - static wxConfigBase *ms_pConfig; - static bool ms_bAutoCreate; - - // Application name and organisation name - wxString m_appName; - wxString m_vendorName; - - // Style flag - long m_style; - - wxDECLARE_ABSTRACT_CLASS(wxConfigBase); -}; - -// a handy little class which changes current path to the path of given entry -// and restores it in dtor: so if you declare a local variable of this type, -// you work in the entry directory and the path is automatically restored -// when the function returns -// Taken out of wxConfig since not all compilers can cope with nested classes. -class WXDLLIMPEXP_BASE wxConfigPathChanger -{ -public: - // ctor/dtor do path changing/restoring of the path - wxConfigPathChanger(const wxConfigBase *pContainer, const wxString& strEntry); - ~wxConfigPathChanger(); - - // get the key name - const wxString& Name() const { return m_strName; } - - // this method must be called if the original path (i.e. the current path at - // the moment of creation of this object) could have been deleted to prevent - // us from restoring the not existing (any more) path - // - // if the original path doesn't exist any more, the path will be restored to - // the deepest still existing component of the old path - void UpdateIfDeleted(); - -private: - wxConfigBase *m_pContainer; // object we live in - wxString m_strName, // name of entry (i.e. name only) - m_strOldPath; // saved path - bool m_bChanged; // was the path changed? - - wxDECLARE_NO_COPY_CLASS(wxConfigPathChanger); -}; - - -#endif // wxUSE_CONFIG - -/* - Replace environment variables ($SOMETHING) with their values. The format is - $VARNAME or ${VARNAME} where VARNAME contains alphanumeric characters and - '_' only. '$' must be escaped ('\$') in order to be taken literally. -*/ - -WXDLLIMPEXP_BASE wxString wxExpandEnvVars(const wxString &sz); - -/* - Split path into parts removing '..' in progress - */ -WXDLLIMPEXP_BASE void wxSplitPath(wxArrayString& aParts, const wxString& path); - -#endif // _WX_CONFBASE_H_ - diff --git a/Externals/wxWidgets3/include/wx/config.h b/Externals/wxWidgets3/include/wx/config.h deleted file mode 100644 index 2a28e0715a..0000000000 --- a/Externals/wxWidgets3/include/wx/config.h +++ /dev/null @@ -1,34 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/config.h -// Purpose: wxConfig base header -// Author: Julian Smart -// Modified by: -// Created: -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_CONFIG_H_BASE_ -#define _WX_CONFIG_H_BASE_ - -#include "wx/confbase.h" - -#if wxUSE_CONFIG - -// ---------------------------------------------------------------------------- -// define the native wxConfigBase implementation -// ---------------------------------------------------------------------------- - -// under Windows we prefer to use the native implementation but can be forced -// to use the file-based one -#if defined(__WINDOWS__) && wxUSE_CONFIG_NATIVE - #include "wx/msw/regconf.h" - #define wxConfig wxRegConfig -#else // either we're under Unix or wish to always use config files - #include "wx/fileconf.h" - #define wxConfig wxFileConfig -#endif - -#endif // wxUSE_CONFIG - -#endif // _WX_CONFIG_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/containr.h b/Externals/wxWidgets3/include/wx/containr.h deleted file mode 100644 index 784ff2fcd7..0000000000 --- a/Externals/wxWidgets3/include/wx/containr.h +++ /dev/null @@ -1,414 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/containr.h -// Purpose: wxControlContainer and wxNavigationEnabled declarations -// Author: Vadim Zeitlin -// Modified by: -// Created: 06.08.01 -// Copyright: (c) 2001, 2011 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_CONTAINR_H_ -#define _WX_CONTAINR_H_ - -#include "wx/defs.h" - -#ifndef wxHAS_NATIVE_TAB_TRAVERSAL - // We need wxEVT_XXX declarations in this case. - #include "wx/event.h" -#endif - -class WXDLLIMPEXP_FWD_CORE wxWindow; -class WXDLLIMPEXP_FWD_CORE wxWindowBase; - -/* - This header declares wxControlContainer class however it's not a real - container of controls but rather just a helper used to implement TAB - navigation among the window children. You should rarely need to use it - directly, derive from the documented public wxNavigationEnabled<> class to - implement TAB navigation in a custom composite window. - */ - -// ---------------------------------------------------------------------------- -// wxControlContainerBase: common part used in both native and generic cases -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxControlContainerBase -{ -public: - // default ctor, SetContainerWindow() must be called later - wxControlContainerBase() - { - m_winParent = NULL; - - // By default, we accept focus ourselves. - m_acceptsFocusSelf = true; - - // But we don't have any children accepting it yet. - m_acceptsFocusChildren = false; - - m_inSetFocus = false; - m_winLastFocused = NULL; - } - virtual ~wxControlContainerBase() {} - - void SetContainerWindow(wxWindow *winParent) - { - wxASSERT_MSG( !m_winParent, wxT("shouldn't be called twice") ); - - m_winParent = winParent; - } - - // This can be called by the window to indicate that it never wants to have - // the focus for itself. - void DisableSelfFocus() - { m_acceptsFocusSelf = false; UpdateParentCanFocus(); } - - // This can be called to undo the effect of a previous DisableSelfFocus() - // (otherwise calling it is not necessary as the window does accept focus - // by default). - void EnableSelfFocus() - { m_acceptsFocusSelf = true; UpdateParentCanFocus(); } - - // should be called from SetFocus(), returns false if we did nothing with - // the focus and the default processing should take place - bool DoSetFocus(); - - // returns whether we should accept focus ourselves or not - bool AcceptsFocus() const; - - // Returns whether we or one of our children accepts focus. - bool AcceptsFocusRecursively() const - { return AcceptsFocus() || - (m_acceptsFocusChildren && HasAnyChildrenAcceptingFocus()); } - - // We accept focus from keyboard if we accept it at all. - bool AcceptsFocusFromKeyboard() const { return AcceptsFocusRecursively(); } - - // Call this when the number of children of the window changes. - // - // Returns true if we have any focusable children, false otherwise. - bool UpdateCanFocusChildren(); - -protected: - // set the focus to the child which had it the last time - virtual bool SetFocusToChild(); - - // return true if we have any children accepting focus - bool HasAnyFocusableChildren() const; - - // return true if we have any children that do accept focus right now - bool HasAnyChildrenAcceptingFocus() const; - - - // the parent window we manage the children for - wxWindow *m_winParent; - - // the child which had the focus last time this panel was activated - wxWindow *m_winLastFocused; - -private: - // Update the window status to reflect whether it is getting focus or not. - void UpdateParentCanFocus(); - - // Indicates whether the associated window can ever have focus itself. - // - // Usually this is the case, e.g. a wxPanel can be used either as a - // container for its children or just as a normal window which can be - // focused. But sometimes, e.g. for wxStaticBox, we can never have focus - // ourselves and can only get it if we have any focusable children. - bool m_acceptsFocusSelf; - - // Cached value remembering whether we have any children accepting focus. - bool m_acceptsFocusChildren; - - // a guard against infinite recursion - bool m_inSetFocus; -}; - -#ifdef wxHAS_NATIVE_TAB_TRAVERSAL - -// ---------------------------------------------------------------------------- -// wxControlContainer for native TAB navigation -// ---------------------------------------------------------------------------- - -// this must be a real class as we forward-declare it elsewhere -class WXDLLIMPEXP_CORE wxControlContainer : public wxControlContainerBase -{ -protected: - // set the focus to the child which had it the last time - virtual bool SetFocusToChild() wxOVERRIDE; -}; - -#else // !wxHAS_NATIVE_TAB_TRAVERSAL - -// ---------------------------------------------------------------------------- -// wxControlContainer for TAB navigation implemented in wx itself -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxControlContainer : public wxControlContainerBase -{ -public: - // default ctor, SetContainerWindow() must be called later - wxControlContainer(); - - // the methods to be called from the window event handlers - void HandleOnNavigationKey(wxNavigationKeyEvent& event); - void HandleOnFocus(wxFocusEvent& event); - void HandleOnWindowDestroy(wxWindowBase *child); - - // called from OnChildFocus() handler, i.e. when one of our (grand) - // children gets the focus - void SetLastFocus(wxWindow *win); - -protected: - - wxDECLARE_NO_COPY_CLASS(wxControlContainer); -}; - -#endif // wxHAS_NATIVE_TAB_TRAVERSAL/!wxHAS_NATIVE_TAB_TRAVERSAL - -// this function is for wxWidgets internal use only -extern WXDLLIMPEXP_CORE bool wxSetFocusToChild(wxWindow *win, wxWindow **child); - -// ---------------------------------------------------------------------------- -// wxNavigationEnabled: Derive from this class to support keyboard navigation -// among window children in a wxWindow-derived class. The details of this class -// don't matter, you just need to derive from it to make navigation work. -// ---------------------------------------------------------------------------- - -// The template parameter W must be a wxWindow-derived class. -template -class wxNavigationEnabled : public W -{ -public: - typedef W BaseWindowClass; - - wxNavigationEnabled() - { - m_container.SetContainerWindow(this); - -#ifndef wxHAS_NATIVE_TAB_TRAVERSAL - BaseWindowClass::Connect(wxEVT_NAVIGATION_KEY, - wxNavigationKeyEventHandler(wxNavigationEnabled::OnNavigationKey)); - - BaseWindowClass::Connect(wxEVT_SET_FOCUS, - wxFocusEventHandler(wxNavigationEnabled::OnFocus)); - - BaseWindowClass::Connect(wxEVT_CHILD_FOCUS, - wxChildFocusEventHandler(wxNavigationEnabled::OnChildFocus)); -#endif // !wxHAS_NATIVE_TAB_TRAVERSAL - } - - WXDLLIMPEXP_INLINE_CORE virtual bool AcceptsFocus() const - { - return m_container.AcceptsFocus(); - } - - WXDLLIMPEXP_INLINE_CORE virtual bool AcceptsFocusRecursively() const - { - return m_container.AcceptsFocusRecursively(); - } - - WXDLLIMPEXP_INLINE_CORE virtual bool AcceptsFocusFromKeyboard() const - { - return m_container.AcceptsFocusFromKeyboard(); - } - - WXDLLIMPEXP_INLINE_CORE virtual void AddChild(wxWindowBase *child) - { - BaseWindowClass::AddChild(child); - - if ( m_container.UpdateCanFocusChildren() ) - { - // Under MSW we must have wxTAB_TRAVERSAL style for TAB navigation - // to work. - if ( !BaseWindowClass::HasFlag(wxTAB_TRAVERSAL) ) - BaseWindowClass::ToggleWindowStyle(wxTAB_TRAVERSAL); - } - } - - WXDLLIMPEXP_INLINE_CORE virtual void RemoveChild(wxWindowBase *child) - { -#ifndef wxHAS_NATIVE_TAB_TRAVERSAL - m_container.HandleOnWindowDestroy(child); -#endif // !wxHAS_NATIVE_TAB_TRAVERSAL - - BaseWindowClass::RemoveChild(child); - - // We could reset wxTAB_TRAVERSAL here but it doesn't seem to do any - // harm to keep it. - m_container.UpdateCanFocusChildren(); - } - - WXDLLIMPEXP_INLINE_CORE virtual void SetFocus() - { - if ( !m_container.DoSetFocus() ) - BaseWindowClass::SetFocus(); - } - - void SetFocusIgnoringChildren() - { - BaseWindowClass::SetFocus(); - } - -protected: -#ifndef wxHAS_NATIVE_TAB_TRAVERSAL - void OnNavigationKey(wxNavigationKeyEvent& event) - { - m_container.HandleOnNavigationKey(event); - } - - void OnFocus(wxFocusEvent& event) - { - m_container.HandleOnFocus(event); - } - - void OnChildFocus(wxChildFocusEvent& event) - { - m_container.SetLastFocus(event.GetWindow()); - event.Skip(); - } -#endif // !wxHAS_NATIVE_TAB_TRAVERSAL - - wxControlContainer m_container; - - - wxDECLARE_NO_COPY_TEMPLATE_CLASS(wxNavigationEnabled, W); -}; - -// ---------------------------------------------------------------------------- -// Compatibility macros from now on, do NOT use them and preferably do not even -// look at them. -// ---------------------------------------------------------------------------- - -#if WXWIN_COMPATIBILITY_2_8 - -// common part of WX_DECLARE_CONTROL_CONTAINER in the native and generic cases, -// it should be used in the wxWindow-derived class declaration -#define WX_DECLARE_CONTROL_CONTAINER_BASE() \ -public: \ - virtual bool AcceptsFocus() const; \ - virtual bool AcceptsFocusRecursively() const; \ - virtual bool AcceptsFocusFromKeyboard() const; \ - virtual void AddChild(wxWindowBase *child); \ - virtual void RemoveChild(wxWindowBase *child); \ - virtual void SetFocus(); \ - void SetFocusIgnoringChildren(); \ - \ -protected: \ - wxControlContainer m_container - -// this macro must be used in the derived class ctor -#define WX_INIT_CONTROL_CONTAINER() \ - m_container.SetContainerWindow(this) - -// common part of WX_DELEGATE_TO_CONTROL_CONTAINER in the native and generic -// cases, must be used in the wxWindow-derived class implementation -#define WX_DELEGATE_TO_CONTROL_CONTAINER_BASE(classname, basename) \ - void classname::AddChild(wxWindowBase *child) \ - { \ - basename::AddChild(child); \ - \ - m_container.UpdateCanFocusChildren(); \ - } \ - \ - bool classname::AcceptsFocusRecursively() const \ - { \ - return m_container.AcceptsFocusRecursively(); \ - } \ - \ - void classname::SetFocus() \ - { \ - if ( !m_container.DoSetFocus() ) \ - basename::SetFocus(); \ - } \ - \ - bool classname::AcceptsFocus() const \ - { \ - return m_container.AcceptsFocus(); \ - } \ - \ - bool classname::AcceptsFocusFromKeyboard() const \ - { \ - return m_container.AcceptsFocusFromKeyboard(); \ - } - - -#ifdef wxHAS_NATIVE_TAB_TRAVERSAL - -#define WX_EVENT_TABLE_CONTROL_CONTAINER(classname) - -#define WX_DECLARE_CONTROL_CONTAINER WX_DECLARE_CONTROL_CONTAINER_BASE - -#define WX_DELEGATE_TO_CONTROL_CONTAINER(classname, basename) \ - WX_DELEGATE_TO_CONTROL_CONTAINER_BASE(classname, basename) \ - \ - void classname::RemoveChild(wxWindowBase *child) \ - { \ - basename::RemoveChild(child); \ - \ - m_container.UpdateCanFocusChildren(); \ - } \ - \ - void classname::SetFocusIgnoringChildren() \ - { \ - basename::SetFocus(); \ - } - -#else // !wxHAS_NATIVE_TAB_TRAVERSAL - -// declare the methods to be forwarded -#define WX_DECLARE_CONTROL_CONTAINER() \ - WX_DECLARE_CONTROL_CONTAINER_BASE(); \ - \ -public: \ - void OnNavigationKey(wxNavigationKeyEvent& event); \ - void OnFocus(wxFocusEvent& event); \ - virtual void OnChildFocus(wxChildFocusEvent& event) - -// implement the event table entries for wxControlContainer -#define WX_EVENT_TABLE_CONTROL_CONTAINER(classname) \ - EVT_SET_FOCUS(classname::OnFocus) \ - EVT_CHILD_FOCUS(classname::OnChildFocus) \ - EVT_NAVIGATION_KEY(classname::OnNavigationKey) - -// implement the methods forwarding to the wxControlContainer -#define WX_DELEGATE_TO_CONTROL_CONTAINER(classname, basename) \ - WX_DELEGATE_TO_CONTROL_CONTAINER_BASE(classname, basename) \ - \ - void classname::RemoveChild(wxWindowBase *child) \ - { \ - m_container.HandleOnWindowDestroy(child); \ - \ - basename::RemoveChild(child); \ - \ - m_container.UpdateCanFocusChildren(); \ - } \ - \ - void classname::OnNavigationKey( wxNavigationKeyEvent& event ) \ - { \ - m_container.HandleOnNavigationKey(event); \ - } \ - \ - void classname::SetFocusIgnoringChildren() \ - { \ - basename::SetFocus(); \ - } \ - \ - void classname::OnChildFocus(wxChildFocusEvent& event) \ - { \ - m_container.SetLastFocus(event.GetWindow()); \ - event.Skip(); \ - } \ - \ - void classname::OnFocus(wxFocusEvent& event) \ - { \ - m_container.HandleOnFocus(event); \ - } - -#endif // wxHAS_NATIVE_TAB_TRAVERSAL/!wxHAS_NATIVE_TAB_TRAVERSAL - -#endif // WXWIN_COMPATIBILITY_2_8 - -#endif // _WX_CONTAINR_H_ diff --git a/Externals/wxWidgets3/include/wx/control.h b/Externals/wxWidgets3/include/wx/control.h deleted file mode 100644 index 86563645e0..0000000000 --- a/Externals/wxWidgets3/include/wx/control.h +++ /dev/null @@ -1,223 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/control.h -// Purpose: wxControl common interface -// Author: Vadim Zeitlin -// Modified by: -// Created: 26.07.99 -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_CONTROL_H_BASE_ -#define _WX_CONTROL_H_BASE_ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/defs.h" - -#if wxUSE_CONTROLS - -#include "wx/window.h" // base class -#include "wx/gdicmn.h" // wxEllipsize... - -extern WXDLLIMPEXP_DATA_CORE(const char) wxControlNameStr[]; - - -// ---------------------------------------------------------------------------- -// wxControl is the base class for all controls -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxControlBase : public wxWindow -{ -public: - wxControlBase() { } - - virtual ~wxControlBase(); - - // Create() function adds the validator parameter - bool Create(wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxControlNameStr); - - // get the control alignment (left/right/centre, top/bottom/centre) - int GetAlignment() const { return m_windowStyle & wxALIGN_MASK; } - - // set label with mnemonics - virtual void SetLabel(const wxString& label) wxOVERRIDE - { - m_labelOrig = label; - - InvalidateBestSize(); - - wxWindow::SetLabel(label); - } - - // return the original string, as it was passed to SetLabel() - // (i.e. with wx-style mnemonics) - virtual wxString GetLabel() const wxOVERRIDE { return m_labelOrig; } - - // set label text (mnemonics will be escaped) - virtual void SetLabelText(const wxString& text) - { - SetLabel(EscapeMnemonics(text)); - } - - // get just the text of the label, without mnemonic characters ('&') - virtual wxString GetLabelText() const { return GetLabelText(GetLabel()); } - - -#if wxUSE_MARKUP - // Set the label with markup (and mnemonics). Markup is a simple subset of - // HTML with tags such as , and . By default it is not - // supported i.e. all the markup is simply stripped and SetLabel() is - // called but some controls in some ports do support this already and in - // the future most of them should. - // - // Notice that, being HTML-like, markup also supports XML entities so '<' - // should be encoded as "<" and so on, a bare '<' in the input will - // likely result in an error. As an exception, a bare '&' is allowed and - // indicates that the next character is a mnemonic. To insert a literal '&' - // in the control you need to use "&" in the input string. - // - // Returns true if the label was set, even if the markup in it was ignored. - // False is only returned if we failed to parse the label. - bool SetLabelMarkup(const wxString& markup) - { - return DoSetLabelMarkup(markup); - } -#endif // wxUSE_MARKUP - - - // controls by default inherit the colours of their parents, if a - // particular control class doesn't want to do it, it can override - // ShouldInheritColours() to return false - virtual bool ShouldInheritColours() const wxOVERRIDE { return true; } - - - // WARNING: this doesn't work for all controls nor all platforms! - // - // simulates the event of given type (i.e. wxButton::Command() is just as - // if the button was clicked) - virtual void Command(wxCommandEvent &event); - - virtual bool SetFont(const wxFont& font) wxOVERRIDE; - - // wxControl-specific processing after processing the update event - virtual void DoUpdateWindowUI(wxUpdateUIEvent& event) wxOVERRIDE; - - wxSize GetSizeFromTextSize(int xlen, int ylen = -1) const - { return DoGetSizeFromTextSize(xlen, ylen); } - wxSize GetSizeFromTextSize(const wxSize& tsize) const - { return DoGetSizeFromTextSize(tsize.x, tsize.y); } - - - // static utilities for mnemonics char (&) handling - // ------------------------------------------------ - - // returns the given string without mnemonic characters ('&') - static wxString GetLabelText(const wxString& label); - - // returns the given string without mnemonic characters ('&') - // this function is identic to GetLabelText() and is provided for clarity - // and for symmetry with the wxStaticText::RemoveMarkup() function. - static wxString RemoveMnemonics(const wxString& str); - - // escapes (by doubling them) the mnemonics - static wxString EscapeMnemonics(const wxString& str); - - - // miscellaneous static utilities - // ------------------------------ - - // replaces parts of the given (multiline) string with an ellipsis if needed - static wxString Ellipsize(const wxString& label, const wxDC& dc, - wxEllipsizeMode mode, int maxWidth, - int flags = wxELLIPSIZE_FLAGS_DEFAULT); - - // return the accel index in the string or -1 if none and puts the modified - // string into second parameter if non NULL - static int FindAccelIndex(const wxString& label, - wxString *labelOnly = NULL); - - // this is a helper for the derived class GetClassDefaultAttributes() - // implementation: it returns the right colours for the classes which - // contain something else (e.g. wxListBox, wxTextCtrl, ...) instead of - // being simple controls (such as wxButton, wxCheckBox, ...) - static wxVisualAttributes - GetCompositeControlsDefaultAttributes(wxWindowVariant variant); - -protected: - // choose the default border for this window - virtual wxBorder GetDefaultBorder() const wxOVERRIDE; - - // creates the control (calls wxWindowBase::CreateBase inside) and adds it - // to the list of parents children - bool CreateControl(wxWindowBase *parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style, - const wxValidator& validator, - const wxString& name); - -#if wxUSE_MARKUP - // This function may be overridden in the derived classes to implement - // support for labels with markup. The base class version simply strips the - // markup and calls SetLabel() with the remaining text. - virtual bool DoSetLabelMarkup(const wxString& markup); -#endif // wxUSE_MARKUP - - // override this to return the total control's size from a string size - virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const; - - // initialize the common fields of wxCommandEvent - void InitCommandEvent(wxCommandEvent& event) const; - - // Ellipsize() helper: - static wxString DoEllipsizeSingleLine(const wxString& label, const wxDC& dc, - wxEllipsizeMode mode, int maxWidth, - int replacementWidth); - -#if wxUSE_MARKUP - // Remove markup from the given string, returns empty string on error i.e. - // if markup was syntactically invalid. - static wxString RemoveMarkup(const wxString& markup); -#endif // wxUSE_MARKUP - - - // this field contains the label in wx format, i.e. with '&' mnemonics, - // as it was passed to the last SetLabel() call - wxString m_labelOrig; - - wxDECLARE_NO_COPY_CLASS(wxControlBase); -}; - -// ---------------------------------------------------------------------------- -// include platform-dependent wxControl declarations -// ---------------------------------------------------------------------------- - -#if defined(__WXUNIVERSAL__) - #include "wx/univ/control.h" -#elif defined(__WXMSW__) - #include "wx/msw/control.h" -#elif defined(__WXMOTIF__) - #include "wx/motif/control.h" -#elif defined(__WXGTK20__) - #include "wx/gtk/control.h" -#elif defined(__WXGTK__) - #include "wx/gtk1/control.h" -#elif defined(__WXMAC__) - #include "wx/osx/control.h" -#elif defined(__WXQT__) - #include "wx/qt/control.h" -#endif - -#endif // wxUSE_CONTROLS - -#endif - // _WX_CONTROL_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/convauto.h b/Externals/wxWidgets3/include/wx/convauto.h deleted file mode 100644 index 3da6c6adc4..0000000000 --- a/Externals/wxWidgets3/include/wx/convauto.h +++ /dev/null @@ -1,155 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/convauto.h -// Purpose: wxConvAuto class declaration -// Author: Vadim Zeitlin -// Created: 2006-04-03 -// Copyright: (c) 2006 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_CONVAUTO_H_ -#define _WX_CONVAUTO_H_ - -#include "wx/strconv.h" -#include "wx/fontenc.h" - -// ---------------------------------------------------------------------------- -// wxConvAuto: uses BOM to automatically detect input encoding -// ---------------------------------------------------------------------------- - -// All currently recognized BOM values. -enum wxBOM -{ - wxBOM_Unknown = -1, - wxBOM_None, - wxBOM_UTF32BE, - wxBOM_UTF32LE, - wxBOM_UTF16BE, - wxBOM_UTF16LE, - wxBOM_UTF8 -}; - -class WXDLLIMPEXP_BASE wxConvAuto : public wxMBConv -{ -public: - // default ctor, the real conversion will be created on demand - wxConvAuto(wxFontEncoding enc = wxFONTENCODING_DEFAULT) - { - Init(); - - m_encDefault = enc; - } - - // copy ctor doesn't initialize anything neither as conversion can only be - // deduced on first use - wxConvAuto(const wxConvAuto& other) : wxMBConv() - { - Init(); - - m_encDefault = other.m_encDefault; - } - - virtual ~wxConvAuto() - { - if ( m_ownsConv ) - delete m_conv; - } - - // get/set the fall-back encoding used when the input text doesn't have BOM - // and isn't UTF-8 - // - // special values are wxFONTENCODING_MAX meaning not to use any fall back - // at all (but just fail to convert in this case) and wxFONTENCODING_SYSTEM - // meaning to use the encoding of the system locale - static wxFontEncoding GetFallbackEncoding() { return ms_defaultMBEncoding; } - static void SetFallbackEncoding(wxFontEncoding enc); - static void DisableFallbackEncoding() - { - SetFallbackEncoding(wxFONTENCODING_MAX); - } - - - // override the base class virtual function(s) to use our m_conv - virtual size_t ToWChar(wchar_t *dst, size_t dstLen, - const char *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE; - - virtual size_t FromWChar(char *dst, size_t dstLen, - const wchar_t *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE; - - virtual size_t GetMBNulLen() const wxOVERRIDE { return m_conv->GetMBNulLen(); } - - virtual wxMBConv *Clone() const wxOVERRIDE { return new wxConvAuto(*this); } - - // return the BOM type of this buffer - static wxBOM DetectBOM(const char *src, size_t srcLen); - - // return the characters composing the given BOM. - static const char* GetBOMChars(wxBOM bomType, size_t* count); - - wxBOM GetBOM() const - { - return m_bomType; - } - -private: - // common part of all ctors - void Init() - { - // We don't initialize m_encDefault here as different ctors do it - // differently. - m_conv = NULL; - m_bomType = wxBOM_Unknown; - m_ownsConv = false; - m_consumedBOM = false; - } - - // initialize m_conv with the UTF-8 conversion - void InitWithUTF8() - { - m_conv = &wxConvUTF8; - m_ownsConv = false; - } - - // create the correct conversion object for the given BOM type - void InitFromBOM(wxBOM bomType); - - // create the correct conversion object for the BOM present in the - // beginning of the buffer - // - // return false if the buffer is too short to allow us to determine if we - // have BOM or not - bool InitFromInput(const char *src, size_t len); - - // adjust src and len to skip over the BOM (identified by m_bomType) at the - // start of the buffer - void SkipBOM(const char **src, size_t *len) const; - - - // fall-back multibyte encoding to use, may be wxFONTENCODING_SYSTEM or - // wxFONTENCODING_MAX but not wxFONTENCODING_DEFAULT - static wxFontEncoding ms_defaultMBEncoding; - - // conversion object which we really use, NULL until the first call to - // either ToWChar() or FromWChar() - wxMBConv *m_conv; - - // the multibyte encoding to use by default if input isn't Unicode - wxFontEncoding m_encDefault; - - // our BOM type - wxBOM m_bomType; - - // true if we allocated m_conv ourselves, false if we just use an existing - // global conversion - bool m_ownsConv; - - // true if we already skipped BOM when converting (and not just calculating - // the size) - bool m_consumedBOM; - - - wxDECLARE_NO_ASSIGN_CLASS(wxConvAuto); -}; - -#endif // _WX_CONVAUTO_H_ - diff --git a/Externals/wxWidgets3/include/wx/cpp.h b/Externals/wxWidgets3/include/wx/cpp.h deleted file mode 100644 index 2c881c3591..0000000000 --- a/Externals/wxWidgets3/include/wx/cpp.h +++ /dev/null @@ -1,196 +0,0 @@ -/* - * Name: wx/cpp.h - * Purpose: Various preprocessor helpers - * Author: Vadim Zeitlin - * Created: 2006-09-30 - * Copyright: (c) 2006 Vadim Zeitlin - * Licence: wxWindows licence - */ - -/* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */ - -#ifndef _WX_CPP_H_ -#define _WX_CPP_H_ - -#include "wx/compiler.h" /* wxCHECK_XXX_VERSION() macros */ - -/* wxCONCAT works like preprocessor ## operator but also works with macros */ -#define wxCONCAT_HELPER(text, line) text ## line - -#define wxCONCAT(x1, x2) \ - wxCONCAT_HELPER(x1, x2) -#define wxCONCAT3(x1, x2, x3) \ - wxCONCAT(wxCONCAT(x1, x2), x3) -#define wxCONCAT4(x1, x2, x3, x4) \ - wxCONCAT(wxCONCAT3(x1, x2, x3), x4) -#define wxCONCAT5(x1, x2, x3, x4, x5) \ - wxCONCAT(wxCONCAT4(x1, x2, x3, x4), x5) -#define wxCONCAT6(x1, x2, x3, x4, x5, x6) \ - wxCONCAT(wxCONCAT5(x1, x2, x3, x4, x5), x6) -#define wxCONCAT7(x1, x2, x3, x4, x5, x6, x7) \ - wxCONCAT(wxCONCAT6(x1, x2, x3, x4, x5, x6), x7) -#define wxCONCAT8(x1, x2, x3, x4, x5, x6, x7, x8) \ - wxCONCAT(wxCONCAT7(x1, x2, x3, x4, x5, x6, x7), x8) -#define wxCONCAT9(x1, x2, x3, x4, x5, x6, x7, x8, x9) \ - wxCONCAT(wxCONCAT8(x1, x2, x3, x4, x5, x6, x7, x8), x9) - -/* wxSTRINGIZE works as the preprocessor # operator but also works with macros */ -#define wxSTRINGIZE_HELPER(x) #x -#define wxSTRINGIZE(x) wxSTRINGIZE_HELPER(x) - -/* a Unicode-friendly version of wxSTRINGIZE_T */ -#define wxSTRINGIZE_T(x) wxAPPLY_T(wxSTRINGIZE(x)) - -/* - Special workarounds for compilers with broken "##" operator. For all the - other ones we can just use it directly. - */ -#ifdef wxCOMPILER_BROKEN_CONCAT_OPER - #define wxPREPEND_L(x) L ## x - #define wxAPPEND_i64(x) x ## i64 - #define wxAPPEND_ui64(x) x ## ui64 -#endif /* wxCOMPILER_BROKEN_CONCAT_OPER */ - -/* - Helper macros for wxMAKE_UNIQUE_NAME: normally this works by appending the - current line number to the given identifier to reduce the probability of the - conflict (it may still happen if this is used in the headers, hence you - should avoid doing it or provide unique prefixes then) but we have to do it - differently for VC++ - */ -#if defined(__VISUALC__) - /* - __LINE__ handling is completely broken in VC++ when using "Edit and - Continue" (/ZI option) and results in preprocessor errors if we use it - inside the macros. Luckily VC7 has another standard macro which can be - used like this and is even better than __LINE__ because it is globally - unique. - */ -# define wxCONCAT_LINE(text) wxCONCAT(text, __COUNTER__) -#else /* normal compilers */ -# define wxCONCAT_LINE(text) wxCONCAT(text, __LINE__) -#endif - -/* Create a "unique" name with the given prefix */ -#define wxMAKE_UNIQUE_NAME(text) wxCONCAT_LINE(text) - -/* - This macro can be passed as argument to another macro when you don't have - anything to pass in fact. - */ -#define wxEMPTY_PARAMETER_VALUE /* Fake macro parameter value */ - -/* - Helpers for defining macros that expand into a single statement. - - The standard solution is to use "do { ... } while (0)" statement but MSVC - generates a C4127 "condition expression is constant" warning for it so we - use something which is just complicated enough to not be recognized as a - constant but still simple enough to be optimized away. - - Another solution would be to use __pragma() to temporarily disable C4127. - - Notice that wxASSERT_ARG_TYPE in wx/strvargarg.h relies on these macros - creating some kind of a loop because it uses "break". - */ -#define wxSTATEMENT_MACRO_BEGIN do { -#define wxSTATEMENT_MACRO_END } while ( (void)0, 0 ) - -/* - Define __WXFUNCTION__ which is like standard __FUNCTION__ but defined as - NULL for the compilers which don't support the latter. - */ -#ifndef __WXFUNCTION__ - #if defined(__GNUC__) || \ - defined(__VISUALC__) || \ - defined(__FUNCTION__) - #define __WXFUNCTION__ __FUNCTION__ - #else - /* still define __WXFUNCTION__ to avoid #ifdefs elsewhere */ - #define __WXFUNCTION__ (NULL) - #endif -#endif /* __WXFUNCTION__ already defined */ - - -/* Auto-detect variadic macros support unless explicitly disabled. */ -#if !defined(HAVE_VARIADIC_MACROS) && !defined(wxNO_VARIADIC_MACROS) - /* Any C99 or C++11 compiler should have them. */ - #if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || \ - (defined(__cplusplus) && __cplusplus >= 201103L) - #define HAVE_VARIADIC_MACROS 1 - #elif defined(__GNUC__) - #define HAVE_VARIADIC_MACROS 1 - #elif wxCHECK_VISUALC_VERSION(8) - #define HAVE_VARIADIC_MACROS 1 - #endif -#endif /* !HAVE_VARIADIC_MACROS */ - - - -#ifdef HAVE_VARIADIC_MACROS - -/* - This is a hack to make it possible to use variadic macros with g++ 3.x even - when using -pedantic[-errors] option: without this, it would complain that - - "anonymous variadic macros were introduced in C99" - - and the option disabling this warning (-Wno-variadic-macros) is only - available in gcc 4.0 and later, so until then this hack is the only thing we - can do. - */ -#if defined(__GNUC__) && __GNUC__ == 3 - #pragma GCC system_header -#endif /* gcc-3.x */ - -/* - wxCALL_FOR_EACH(what, ...) calls the macro from its first argument, what(pos, x), - for every remaining argument 'x', with 'pos' being its 1-based index in - *reverse* order (with the last argument being numbered 1). - - For example, wxCALL_FOR_EACH(test, a, b, c) expands into this: - - test(3, a) \ - test(2, b) \ - test(1, c) - - Up to eight arguments are supported. - - (With thanks to https://groups.google.com/d/topic/comp.std.c/d-6Mj5Lko_s/discussion - and http://stackoverflow.com/questions/1872220/is-it-possible-to-iterate-over-arguments-in-variadic-macros) -*/ -#define wxCALL_FOR_EACH_NARG(...) wxCALL_FOR_EACH_NARG_((__VA_ARGS__, wxCALL_FOR_EACH_RSEQ_N())) -#define wxCALL_FOR_EACH_NARG_(args) wxCALL_FOR_EACH_ARG_N args -#define wxCALL_FOR_EACH_ARG_N(_1, _2, _3, _4, _5, _6, _7, _8, N, ...) N -#define wxCALL_FOR_EACH_RSEQ_N() 8, 7, 6, 5, 4, 3, 2, 1, 0 - -#define wxCALL_FOR_EACH_1_(args) wxCALL_FOR_EACH_1 args -#define wxCALL_FOR_EACH_2_(args) wxCALL_FOR_EACH_2 args -#define wxCALL_FOR_EACH_3_(args) wxCALL_FOR_EACH_3 args -#define wxCALL_FOR_EACH_4_(args) wxCALL_FOR_EACH_4 args -#define wxCALL_FOR_EACH_5_(args) wxCALL_FOR_EACH_5 args -#define wxCALL_FOR_EACH_6_(args) wxCALL_FOR_EACH_6 args -#define wxCALL_FOR_EACH_7_(args) wxCALL_FOR_EACH_7 args -#define wxCALL_FOR_EACH_8_(args) wxCALL_FOR_EACH_8 args - -#define wxCALL_FOR_EACH_1(what, x) what(1, x) -#define wxCALL_FOR_EACH_2(what, x, ...) what(2, x) wxCALL_FOR_EACH_1_((what, __VA_ARGS__)) -#define wxCALL_FOR_EACH_3(what, x, ...) what(3, x) wxCALL_FOR_EACH_2_((what, __VA_ARGS__)) -#define wxCALL_FOR_EACH_4(what, x, ...) what(4, x) wxCALL_FOR_EACH_3_((what, __VA_ARGS__)) -#define wxCALL_FOR_EACH_5(what, x, ...) what(5, x) wxCALL_FOR_EACH_4_((what, __VA_ARGS__)) -#define wxCALL_FOR_EACH_6(what, x, ...) what(6, x) wxCALL_FOR_EACH_5_((what, __VA_ARGS__)) -#define wxCALL_FOR_EACH_7(what, x, ...) what(7, x) wxCALL_FOR_EACH_6_((what, __VA_ARGS__)) -#define wxCALL_FOR_EACH_8(what, x, ...) what(8, x) wxCALL_FOR_EACH_7_((what, __VA_ARGS__)) - -#define wxCALL_FOR_EACH_(N, args) \ - wxCONCAT(wxCALL_FOR_EACH_, N) args - -#define wxCALL_FOR_EACH(what, ...) \ - wxCALL_FOR_EACH_(wxCALL_FOR_EACH_NARG(__VA_ARGS__), (what, __VA_ARGS__)) - -#else - #define wxCALL_FOR_EACH Error_wx_CALL_FOR_EACH_requires_variadic_macros_support -#endif /* HAVE_VARIADIC_MACROS */ - -#endif /* _WX_CPP_H_ */ - diff --git a/Externals/wxWidgets3/include/wx/cppunit.h b/Externals/wxWidgets3/include/wx/cppunit.h deleted file mode 100644 index 70ccd97784..0000000000 --- a/Externals/wxWidgets3/include/wx/cppunit.h +++ /dev/null @@ -1,260 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cppunit.h -// Purpose: wrapper header for CppUnit headers -// Author: Vadim Zeitlin -// Created: 15.02.04 -// Copyright: (c) 2004 Vadim Zeitlin -// Licence: wxWindows Licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_CPPUNIT_H_ -#define _WX_CPPUNIT_H_ - -/////////////////////////////////////////////////////////////////////////////// -// using CPPUNIT_TEST() macro results in this warning, disable it as there is -// no other way to get rid of it and it's not very useful anyhow -#ifdef __VISUALC__ - // typedef-name 'foo' used as synonym for class-name 'bar' - #pragma warning(disable:4097) - - // unreachable code: we don't care about warnings in CppUnit headers - #pragma warning(disable:4702) - - // 'id': identifier was truncated to 'num' characters in the debug info - #pragma warning(disable:4786) -#endif // __VISUALC__ - -#ifdef __BORLANDC__ - #pragma warn -8022 -#endif - -#ifndef CPPUNIT_STD_NEED_ALLOCATOR - #define CPPUNIT_STD_NEED_ALLOCATOR 0 -#endif - -/////////////////////////////////////////////////////////////////////////////// -// Set the default format for the errors, which can be used by an IDE to jump -// to the error location. This default gets overridden by the cppunit headers -// for some compilers (e.g. VC++). - -#ifndef CPPUNIT_COMPILER_LOCATION_FORMAT - #define CPPUNIT_COMPILER_LOCATION_FORMAT "%p:%l:" -#endif - - -/////////////////////////////////////////////////////////////////////////////// -// Include all needed cppunit headers. -// - -#include "wx/beforestd.h" -#ifdef __VISUALC__ - #pragma warning(push) - - // with cppunit 1.12 we get many bogus warnings 4701 (local variable may be - // used without having been initialized) in TestAssert.h - #pragma warning(disable:4701) - - // and also 4100 (unreferenced formal parameter) in extensions/ - // ExceptionTestCaseDecorator.h - #pragma warning(disable:4100) -#endif - -#include -#include -#include -#include -#include - -#ifdef __VISUALC__ - #pragma warning(pop) -#endif -#include "wx/afterstd.h" - -#include "wx/string.h" - - -/////////////////////////////////////////////////////////////////////////////// -// Set of helpful test macros. -// - -// Base macro for wrapping CPPUNIT_TEST macros and so making them conditional -// tests, meaning that the test only get registered and thus run when a given -// runtime condition is true. -// In case the condition is evaluated as false a skip message is logged -// (the message will only be shown in verbose mode). -#define WXTEST_ANY_WITH_CONDITION(suiteName, Condition, testMethod, anyTest) \ - if (Condition) \ - { anyTest; } \ - else \ - wxLogInfo(wxString::Format(wxT("skipping: %s.%s\n reason: %s equals false\n"), \ - wxString(suiteName, wxConvUTF8).c_str(), \ - wxString(#testMethod, wxConvUTF8).c_str(), \ - wxString(#Condition, wxConvUTF8).c_str())) - -// Conditional CPPUNIT_TEST macro. -#define WXTEST_WITH_CONDITION(suiteName, Condition, testMethod) \ - WXTEST_ANY_WITH_CONDITION(suiteName, Condition, testMethod, CPPUNIT_TEST(testMethod)) -// Conditional CPPUNIT_TEST_FAIL macro. -#define WXTEST_FAIL_WITH_CONDITION(suiteName, Condition, testMethod) \ - WXTEST_ANY_WITH_CONDITION(suiteName, Condition, testMethod, CPPUNIT_TEST_FAIL(testMethod)) - -CPPUNIT_NS_BEGIN - -// provide an overload of cppunit assertEquals(T, T) which can be used to -// compare wxStrings directly with C strings -inline void -assertEquals(const char *expected, - const char *actual, - CppUnit::SourceLine sourceLine, - const std::string& message) -{ - assertEquals(wxString(expected), wxString(actual), sourceLine, message); -} - -inline void -assertEquals(const char *expected, - const wxString& actual, - CppUnit::SourceLine sourceLine, - const std::string& message) -{ - assertEquals(wxString(expected), actual, sourceLine, message); -} - -inline void -assertEquals(const wxString& expected, - const char *actual, - CppUnit::SourceLine sourceLine, - const std::string& message) -{ - assertEquals(expected, wxString(actual), sourceLine, message); -} - -inline void -assertEquals(const wchar_t *expected, - const wxString& actual, - CppUnit::SourceLine sourceLine, - const std::string& message) -{ - assertEquals(wxString(expected), actual, sourceLine, message); -} - -inline void -assertEquals(const wxString& expected, - const wchar_t *actual, - CppUnit::SourceLine sourceLine, - const std::string& message) -{ - assertEquals(expected, wxString(actual), sourceLine, message); -} - -CPPUNIT_NS_END - -// define an assertEquals() overload for the given types, this is a helper used -// by WX_CPPUNIT_ALLOW_EQUALS_TO_INT() below -#define WX_CPPUNIT_ASSERT_EQUALS(T1, T2) \ - inline void \ - assertEquals(T1 expected, \ - T2 actual, \ - CppUnit::SourceLine sourceLine, \ - const std::string& message) \ - { \ - if ( !assertion_traits::equal(expected,actual) ) \ - { \ - Asserter::failNotEqual( assertion_traits::toString(expected), \ - assertion_traits::toString(actual), \ - sourceLine, \ - message ); \ - } \ - } - -// this macro allows us to specify (usually literal) ints as expected values -// for functions returning integral types different from "int" -#define WX_CPPUNIT_ALLOW_EQUALS_TO_INT(T) \ - CPPUNIT_NS_BEGIN \ - WX_CPPUNIT_ASSERT_EQUALS(int, T) \ - WX_CPPUNIT_ASSERT_EQUALS(T, int) \ - CPPUNIT_NS_END - -WX_CPPUNIT_ALLOW_EQUALS_TO_INT(long) -WX_CPPUNIT_ALLOW_EQUALS_TO_INT(short) -WX_CPPUNIT_ALLOW_EQUALS_TO_INT(unsigned) -WX_CPPUNIT_ALLOW_EQUALS_TO_INT(unsigned long) - -#if defined( __VMS ) && defined( __ia64 ) -WX_CPPUNIT_ALLOW_EQUALS_TO_INT(std::basic_streambuf::pos_type); -#endif - -#ifdef wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG -WX_CPPUNIT_ALLOW_EQUALS_TO_INT(wxLongLong_t) -WX_CPPUNIT_ALLOW_EQUALS_TO_INT(unsigned wxLongLong_t) -#endif // wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG - -// Use this macro to compare a wxArrayString with the pipe-separated elements -// of the given string -// -// NB: it's a macro and not a function to have the correct line numbers in the -// test failure messages -#define WX_ASSERT_STRARRAY_EQUAL(s, a) \ - { \ - wxArrayString expected(wxSplit(s, '|', '\0')); \ - \ - CPPUNIT_ASSERT_EQUAL( expected.size(), a.size() ); \ - \ - for ( size_t n = 0; n < a.size(); n++ ) \ - { \ - CPPUNIT_ASSERT_EQUAL( expected[n], a[n] ); \ - } \ - } - -// Use this macro to assert with the given formatted message (it should contain -// the format string and arguments in a separate pair of parentheses) -#define WX_ASSERT_MESSAGE(msg, cond) \ - CPPUNIT_ASSERT_MESSAGE(std::string(wxString::Format msg .mb_str()), (cond)) - -#define WX_ASSERT_EQUAL_MESSAGE(msg, expected, actual) \ - CPPUNIT_ASSERT_EQUAL_MESSAGE(std::string(wxString::Format msg .mb_str()), \ - (expected), (actual)) - -/////////////////////////////////////////////////////////////////////////////// -// define stream inserter for wxString if it's not defined in the main library, -// we need it to output the test failures involving wxString -#if !wxUSE_STD_IOSTREAM - -#include "wx/string.h" - -#include - -inline std::ostream& operator<<(std::ostream& o, const wxString& s) -{ -#if wxUSE_UNICODE - return o << (const char *)wxSafeConvertWX2MB(s.wc_str()); -#else - return o << s.c_str(); -#endif -} - -#endif // !wxUSE_STD_IOSTREAM - -/////////////////////////////////////////////////////////////////////////////// -// Some more compiler warning tweaking and auto linking. -// - -#ifdef __BORLANDC__ - #pragma warn .8022 -#endif - -#ifdef _MSC_VER - #pragma warning(default:4702) -#endif // _MSC_VER - -// for VC++ automatically link in cppunit library -#ifdef __VISUALC__ - #ifdef NDEBUG - #pragma comment(lib, "cppunit.lib") - #else // Debug - #pragma comment(lib, "cppunitd.lib") - #endif // Release/Debug -#endif - -#endif // _WX_CPPUNIT_H_ - diff --git a/Externals/wxWidgets3/include/wx/crt.h b/Externals/wxWidgets3/include/wx/crt.h deleted file mode 100644 index 9b939fd0f9..0000000000 --- a/Externals/wxWidgets3/include/wx/crt.h +++ /dev/null @@ -1,22 +0,0 @@ -////////////////////////////////////////////////////////////////////////////// -// Name: wx/crt.h -// Purpose: Header to include all headers with wrappers for CRT functions -// Author: Robert Roebling -// Created: 2007-05-30 -// Copyright: (c) 2007 wxWidgets dev team -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_CRT_H_ -#define _WX_CRT_H_ - -#include "wx/defs.h" - -// include wxChar type definition: -#include "wx/chartype.h" - -// and wrappers for CRT functions: -#include "wx/wxcrt.h" -#include "wx/wxcrtvararg.h" - -#endif // _WX_CRT_H_ diff --git a/Externals/wxWidgets3/include/wx/cshelp.h b/Externals/wxWidgets3/include/wx/cshelp.h deleted file mode 100644 index c521d454bc..0000000000 --- a/Externals/wxWidgets3/include/wx/cshelp.h +++ /dev/null @@ -1,256 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cshelp.h -// Purpose: Context-sensitive help support classes -// Author: Julian Smart, Vadim Zeitlin -// Modified by: -// Created: 08/09/2000 -// Copyright: (c) 2000 Julian Smart, Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_CSHELP_H_ -#define _WX_CSHELP_H_ - -#include "wx/defs.h" - -#if wxUSE_HELP - -#include "wx/help.h" - -#include "wx/hashmap.h" -#if wxUSE_BMPBUTTON -#include "wx/bmpbuttn.h" -#endif - -#include "wx/event.h" - -// ---------------------------------------------------------------------------- -// classes used to implement context help UI -// ---------------------------------------------------------------------------- - -/* - * wxContextHelp - * Invokes context-sensitive help. When the user - * clicks on a window, a wxEVT_HELP event will be sent to that - * window for the application to display help for. - */ - -class WXDLLIMPEXP_CORE wxContextHelp : public wxObject -{ -public: - wxContextHelp(wxWindow* win = NULL, bool beginHelp = true); - virtual ~wxContextHelp(); - - bool BeginContextHelp(wxWindow* win); - bool EndContextHelp(); - - bool EventLoop(); - bool DispatchEvent(wxWindow* win, const wxPoint& pt); - - void SetStatus(bool status) { m_status = status; } - -protected: - bool m_inHelp; - bool m_status; // true if the user left-clicked - -private: - wxDECLARE_DYNAMIC_CLASS(wxContextHelp); -}; - -#if wxUSE_BMPBUTTON -/* - * wxContextHelpButton - * You can add this to your dialogs (especially on non-Windows platforms) - * to put the application into context help mode. - */ - -class WXDLLIMPEXP_CORE wxContextHelpButton : public wxBitmapButton -{ -public: - wxContextHelpButton() {} - - wxContextHelpButton(wxWindow* parent, - wxWindowID id = wxID_CONTEXT_HELP, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxBU_AUTODRAW) - { - Create(parent, id, pos, size, style); - } - - - bool Create(wxWindow* parent, - wxWindowID id = wxID_CONTEXT_HELP, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxBU_AUTODRAW); - - - void OnContextHelp(wxCommandEvent& event); - -private: - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxContextHelpButton); - wxDECLARE_EVENT_TABLE(); -}; - -#endif - -// ---------------------------------------------------------------------------- -// classes used to implement context help support -// ---------------------------------------------------------------------------- - -// wxHelpProvider is an abstract class used by the program implementing context help to -// show the help text (or whatever: it may be HTML page or anything else) for -// the given window. -// -// The current help provider must be explicitly set by the application using -// wxHelpProvider::Set(). -// -// Special note about ShowHelpAtPoint() and ShowHelp(): we want to be able to -// override ShowHelpAtPoint() when we need to use different help messages for -// different parts of the window, but it should also be possible to override -// just ShowHelp() both for backwards compatibility and just because most -// often the help does not, in fact, depend on the position and so -// implementing just ShowHelp() is simpler and more natural, so by default -// ShowHelpAtPoint() forwards to ShowHelp(). But this means that -// wxSimpleHelpProvider has to override ShowHelp() and not ShowHelpAtPoint() -// for backwards compatibility as otherwise the existing code deriving from it -// and overriding ShowHelp() but calling the base class version wouldn't work -// any more, which forces us to use a rather ugly hack and pass the extra -// parameters of ShowHelpAtPoint() to ShowHelp() via member variables. -class WXDLLIMPEXP_CORE wxHelpProvider -{ -public: - // get/set the current (application-global) help provider (Set() returns - // the previous one) - static wxHelpProvider *Set(wxHelpProvider *helpProvider) - { - wxHelpProvider *helpProviderOld = ms_helpProvider; - ms_helpProvider = helpProvider; - return helpProviderOld; - } - - // unlike some other class, the help provider is not created on demand, - // this must be explicitly done by the application - static wxHelpProvider *Get() { return ms_helpProvider; } - - // get the help string (whose interpretation is help provider dependent - // except that empty string always means that no help is associated with - // the window) for this window - virtual wxString GetHelp(const wxWindowBase *window) = 0; - - // do show help for the given window (uses window->GetHelpAtPoint() - // internally if applicable), return true if it was done or false - // if no help available for this window - virtual bool ShowHelpAtPoint(wxWindowBase *window, - const wxPoint& pt, - wxHelpEvent::Origin origin) - { - wxCHECK_MSG( window, false, wxT("window must not be NULL") ); - - m_helptextAtPoint = pt; - m_helptextOrigin = origin; - - return ShowHelp(window); - } - - // show help for the given window, see ShowHelpAtPoint() above - virtual bool ShowHelp(wxWindowBase * WXUNUSED(window)) { return false; } - - // associate the text with the given window or id: although all help - // providers have these functions to allow making wxWindow::SetHelpText() - // work, not all of them implement them - virtual void AddHelp(wxWindowBase *window, const wxString& text); - - // this version associates the given text with all window with this id - // (may be used to set the same help string for all [Cancel] buttons in - // the application, for example) - virtual void AddHelp(wxWindowID id, const wxString& text); - - // removes the association - virtual void RemoveHelp(wxWindowBase* window); - - // virtual dtor for any base class - virtual ~wxHelpProvider(); - -protected: - wxHelpProvider() - : m_helptextAtPoint(wxDefaultPosition), - m_helptextOrigin(wxHelpEvent::Origin_Unknown) - { - } - - // helper method used by ShowHelp(): returns the help string to use by - // using m_helptextAtPoint/m_helptextOrigin if they're set or just GetHelp - // otherwise - wxString GetHelpTextMaybeAtPoint(wxWindowBase *window); - - - // parameters of the last ShowHelpAtPoint() call, used by ShowHelp() - wxPoint m_helptextAtPoint; - wxHelpEvent::Origin m_helptextOrigin; - -private: - static wxHelpProvider *ms_helpProvider; -}; - -WX_DECLARE_EXPORTED_HASH_MAP( wxUIntPtr, wxString, wxIntegerHash, - wxIntegerEqual, wxSimpleHelpProviderHashMap ); - -// wxSimpleHelpProvider is an implementation of wxHelpProvider which supports -// only plain text help strings and shows the string associated with the -// control (if any) in a tooltip -class WXDLLIMPEXP_CORE wxSimpleHelpProvider : public wxHelpProvider -{ -public: - // implement wxHelpProvider methods - virtual wxString GetHelp(const wxWindowBase *window) wxOVERRIDE; - - // override ShowHelp() and not ShowHelpAtPoint() as explained above - virtual bool ShowHelp(wxWindowBase *window) wxOVERRIDE; - - virtual void AddHelp(wxWindowBase *window, const wxString& text) wxOVERRIDE; - virtual void AddHelp(wxWindowID id, const wxString& text) wxOVERRIDE; - virtual void RemoveHelp(wxWindowBase* window) wxOVERRIDE; - -protected: - // we use 2 hashes for storing the help strings associated with windows - // and the ids - wxSimpleHelpProviderHashMap m_hashWindows, - m_hashIds; -}; - -// wxHelpControllerHelpProvider is an implementation of wxHelpProvider which supports -// both context identifiers and plain text help strings. If the help text is an integer, -// it is passed to wxHelpController::DisplayContextPopup. Otherwise, it shows the string -// in a tooltip as per wxSimpleHelpProvider. -class WXDLLIMPEXP_CORE wxHelpControllerHelpProvider : public wxSimpleHelpProvider -{ -public: - // Note that it doesn't own the help controller. The help controller - // should be deleted separately. - wxHelpControllerHelpProvider(wxHelpControllerBase* hc = NULL); - - // implement wxHelpProvider methods - - // again (see above): this should be ShowHelpAtPoint() but we need to - // override ShowHelp() to avoid breaking existing code - virtual bool ShowHelp(wxWindowBase *window) wxOVERRIDE; - - // Other accessors - void SetHelpController(wxHelpControllerBase* hc) { m_helpController = hc; } - wxHelpControllerBase* GetHelpController() const { return m_helpController; } - -protected: - wxHelpControllerBase* m_helpController; - - wxDECLARE_NO_COPY_CLASS(wxHelpControllerHelpProvider); -}; - -// Convenience function for turning context id into wxString -WXDLLIMPEXP_CORE wxString wxContextId(int id); - -#endif // wxUSE_HELP - -#endif // _WX_CSHELP_H_ - diff --git a/Externals/wxWidgets3/include/wx/ctrlsub.h b/Externals/wxWidgets3/include/wx/ctrlsub.h deleted file mode 100644 index b934d2376f..0000000000 --- a/Externals/wxWidgets3/include/wx/ctrlsub.h +++ /dev/null @@ -1,502 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/ctrlsub.h (read: "wxConTRoL with SUBitems") -// Purpose: wxControlWithItems interface -// Author: Vadim Zeitlin -// Modified by: -// Created: 22.10.99 -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_CTRLSUB_H_BASE_ -#define _WX_CTRLSUB_H_BASE_ - -#include "wx/defs.h" - -#if wxUSE_CONTROLS - -#include "wx/arrstr.h" -#include "wx/control.h" // base class - -#if wxUSE_STD_CONTAINERS_COMPATIBLY -#include -#endif // wxUSE_STD_CONTAINERS_COMPATIBLY - -// ---------------------------------------------------------------------------- -// wxItemContainer defines an interface which is implemented by all controls -// which have string subitems each of which may be selected. -// -// It is decomposed in wxItemContainerImmutable which omits all methods -// adding/removing items and is used by wxRadioBox and wxItemContainer itself. -// -// Examples: wxListBox, wxCheckListBox, wxChoice and wxComboBox (which -// implements an extended interface deriving from this one) -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxItemContainerImmutable -{ -public: - wxItemContainerImmutable() { } - virtual ~wxItemContainerImmutable(); - - // accessing strings - // ----------------- - - virtual unsigned int GetCount() const = 0; - bool IsEmpty() const { return GetCount() == 0; } - - virtual wxString GetString(unsigned int n) const = 0; - wxArrayString GetStrings() const; - virtual void SetString(unsigned int n, const wxString& s) = 0; - - // finding string natively is either case sensitive or insensitive - // but never both so fall back to this base version for not - // supported search type - virtual int FindString(const wxString& s, bool bCase = false) const - { - unsigned int count = GetCount(); - - for ( unsigned int i = 0; i < count ; ++i ) - { - if (GetString(i).IsSameAs( s , bCase )) - return (int)i; - } - - return wxNOT_FOUND; - } - - - // selection - // --------- - - virtual void SetSelection(int n) = 0; - virtual int GetSelection() const = 0; - - // set selection to the specified string, return false if not found - bool SetStringSelection(const wxString& s); - - // return the selected string or empty string if none - virtual wxString GetStringSelection() const; - - // this is the same as SetSelection( for single-selection controls but - // reads better for multi-selection ones - void Select(int n) { SetSelection(n); } - - -protected: - // check that the index is valid - bool IsValid(unsigned int n) const { return n < GetCount(); } - bool IsValidInsert(unsigned int n) const { return n <= GetCount(); } -}; - -// ---------------------------------------------------------------------------- -// wxItemContainer extends wxItemContainerImmutable interface with methods -// for adding/removing items. -// -// Classes deriving from this one must override DoInsertItems() to implement -// adding items to the control. This can often be implemented more efficiently -// than simply looping over the elements and inserting them but if this is not -// the case, the generic DoInsertItemsInLoop can be used in implementation, but -// in this case DoInsertItem() needs to be overridden. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxItemContainer : public wxItemContainerImmutable -{ -private: - // AppendItems() and InsertItems() helpers just call DoAppend/InsertItems() - // after doing some checks - // - // NB: they're defined here so that they're inlined when used in public part - int AppendItems(const wxArrayStringsAdapter& items, - void **clientData, - wxClientDataType type) - { - if ( items.IsEmpty() ) - return wxNOT_FOUND; - - return DoAppendItems(items, clientData, type); - } - - int AppendItems(const wxArrayStringsAdapter& items) - { - return AppendItems(items, NULL, wxClientData_None); - } - - int AppendItems(const wxArrayStringsAdapter& items, void **clientData) - { - wxASSERT_MSG( GetClientDataType() != wxClientData_Object, - wxT("can't mix different types of client data") ); - - return AppendItems(items, clientData, wxClientData_Void); - } - - int AppendItems(const wxArrayStringsAdapter& items, - wxClientData **clientData) - { - wxASSERT_MSG( GetClientDataType() != wxClientData_Void, - wxT("can't mix different types of client data") ); - - return AppendItems(items, reinterpret_cast(clientData), - wxClientData_Object); - } - - int InsertItems(const wxArrayStringsAdapter& items, - unsigned int pos, - void **clientData, - wxClientDataType type) - { - wxASSERT_MSG( !IsSorted(), wxT("can't insert items in sorted control") ); - - wxCHECK_MSG( pos <= GetCount(), wxNOT_FOUND, - wxT("position out of range") ); - - // not all derived classes handle empty arrays correctly in - // DoInsertItems() and besides it really doesn't make much sense to do - // this (for append it could correspond to creating an initially empty - // control but why would anybody need to insert 0 items?) - wxCHECK_MSG( !items.IsEmpty(), wxNOT_FOUND, - wxT("need something to insert") ); - - return DoInsertItems(items, pos, clientData, type); - } - - int InsertItems(const wxArrayStringsAdapter& items, unsigned int pos) - { - return InsertItems(items, pos, NULL, wxClientData_None); - } - - int InsertItems(const wxArrayStringsAdapter& items, - unsigned int pos, - void **clientData) - { - wxASSERT_MSG( GetClientDataType() != wxClientData_Object, - wxT("can't mix different types of client data") ); - - return InsertItems(items, pos, clientData, wxClientData_Void); - } - - int InsertItems(const wxArrayStringsAdapter& items, - unsigned int pos, - wxClientData **clientData) - { - wxASSERT_MSG( GetClientDataType() != wxClientData_Void, - wxT("can't mix different types of client data") ); - - return InsertItems(items, pos, - reinterpret_cast(clientData), - wxClientData_Object); - } - -public: - wxItemContainer() { m_clientDataItemsType = wxClientData_None; } - virtual ~wxItemContainer(); - - // adding items - // ------------ - - // append single item, return its position in the control (which can be - // different from the last one if the control is sorted) - int Append(const wxString& item) - { return AppendItems(item); } - int Append(const wxString& item, void *clientData) - { return AppendItems(item, &clientData); } - int Append(const wxString& item, wxClientData *clientData) - { return AppendItems(item, &clientData); } - - // append several items at once to the control, return the position of the - // last item appended - int Append(const wxArrayString& items) - { return AppendItems(items); } - int Append(const wxArrayString& items, void **clientData) - { return AppendItems(items, clientData); } - int Append(const wxArrayString& items, wxClientData **clientData) - { return AppendItems(items, clientData); } - int Append(unsigned int n, const wxString *items) - { return AppendItems(wxArrayStringsAdapter(n, items)); } - int Append(unsigned int n, const wxString *items, void **clientData) - { return AppendItems(wxArrayStringsAdapter(n, items), clientData); } - int Append(unsigned int n, - const wxString *items, - wxClientData **clientData) - { return AppendItems(wxArrayStringsAdapter(n, items), clientData); } - -#if wxUSE_STD_CONTAINERS_COMPATIBLY - template - int Append(const std::vector& items) - { return AppendItems(items); } -#endif // wxUSE_STD_CONTAINERS_COMPATIBLY - - // only for RTTI needs (separate name) - void AppendString(const wxString& item) - { Append(item); } - - - // inserting items: not for sorted controls! - // ----------------------------------------- - - // insert single item at the given position, return its effective position - int Insert(const wxString& item, unsigned int pos) - { return InsertItems(item, pos); } - int Insert(const wxString& item, unsigned int pos, void *clientData) - { return InsertItems(item, pos, &clientData); } - int Insert(const wxString& item, unsigned int pos, wxClientData *clientData) - { return InsertItems(item, pos, &clientData); } - - // insert several items at once into the control, return the index of the - // last item inserted - int Insert(const wxArrayString& items, unsigned int pos) - { return InsertItems(items, pos); } - int Insert(const wxArrayString& items, unsigned int pos, void **clientData) - { return InsertItems(items, pos, clientData); } - int Insert(const wxArrayString& items, - unsigned int pos, - wxClientData **clientData) - { return InsertItems(items, pos, clientData); } - int Insert(unsigned int n, const wxString *items, unsigned int pos) - { return InsertItems(wxArrayStringsAdapter(n, items), pos); } - int Insert(unsigned int n, - const wxString *items, - unsigned int pos, - void **clientData) - { return InsertItems(wxArrayStringsAdapter(n, items), pos, clientData); } - int Insert(unsigned int n, - const wxString *items, - unsigned int pos, - wxClientData **clientData) - { return InsertItems(wxArrayStringsAdapter(n, items), pos, clientData); } - -#if wxUSE_STD_CONTAINERS_COMPATIBLY - template - int Insert(const std::vector& items, unsigned int pos) - { return InsertItems(items, pos); } -#endif // wxUSE_STD_CONTAINERS_COMPATIBLY - - // replacing items - // --------------- - - void Set(const wxArrayString& items) - { Clear(); Append(items); } - void Set(const wxArrayString& items, void **clientData) - { Clear(); Append(items, clientData); } - void Set(const wxArrayString& items, wxClientData **clientData) - { Clear(); Append(items, clientData); } - void Set(unsigned int n, const wxString *items) - { Clear(); Append(n, items); } - void Set(unsigned int n, const wxString *items, void **clientData) - { Clear(); Append(n, items, clientData); } - void Set(unsigned int n, const wxString *items, wxClientData **clientData) - { Clear(); Append(n, items, clientData); } - -#if wxUSE_STD_CONTAINERS_COMPATIBLY - template - void Set(const std::vector& items) - { Clear(); Append(items); } -#endif // wxUSE_STD_CONTAINERS_COMPATIBLY - - // deleting items - // -------------- - - virtual void Clear(); - void Delete(unsigned int pos); - - - // various accessors - // ----------------- - - // The control may maintain its items in a sorted order in which case - // items are automatically inserted at the right position when they are - // inserted or appended. Derived classes have to override this method if - // they implement sorting, typically by returning HasFlag(wxXX_SORT) - virtual bool IsSorted() const { return false; } - - - // client data stuff - // ----------------- - - void SetClientData(unsigned int n, void* clientData); - void* GetClientData(unsigned int n) const; - - // SetClientObject() takes ownership of the pointer, GetClientObject() - // returns it but keeps the ownership while DetachClientObject() expects - // the caller to delete the pointer and also resets the internally stored - // one to NULL for this item - void SetClientObject(unsigned int n, wxClientData* clientData); - wxClientData* GetClientObject(unsigned int n) const; - wxClientData* DetachClientObject(unsigned int n); - - // return the type of client data stored in this control: usually it just - // returns m_clientDataItemsType but must be overridden in the controls - // which delegate their client data storage to another one (e.g. wxChoice - // in wxUniv which stores data in wxListBox which it uses anyhow); don't - // forget to override SetClientDataType() if you override this one - // - // NB: for this to work no code should ever access m_clientDataItemsType - // directly but only via this function! - virtual wxClientDataType GetClientDataType() const - { return m_clientDataItemsType; } - - bool HasClientData() const - { return GetClientDataType() != wxClientData_None; } - bool HasClientObjectData() const - { return GetClientDataType() == wxClientData_Object; } - bool HasClientUntypedData() const - { return GetClientDataType() == wxClientData_Void; } - -protected: - // there is usually no need to override this method but you can do it if it - // is more convenient to only do "real" insertions in DoInsertItems() and - // to implement items appending here (in which case DoInsertItems() should - // call this method if pos == GetCount() as it can still be called in this - // case if public Insert() is called with such position) - virtual int DoAppendItems(const wxArrayStringsAdapter& items, - void **clientData, - wxClientDataType type) - { - return DoInsertItems(items, GetCount(), clientData, type); - } - - // this method must be implemented to insert the items into the control at - // position pos which can be GetCount() meaning that the items should be - // appended; for the sorted controls the position can be ignored - // - // the derived classes typically use AssignNewItemClientData() to - // associate the data with the items as they're being inserted - // - // the method should return the index of the position the last item was - // inserted into or wxNOT_FOUND if an error occurred - virtual int DoInsertItems(const wxArrayStringsAdapter & items, - unsigned int pos, - void **clientData, - wxClientDataType type) = 0; - - // before the client data is set for the first time for the control which - // hadn't had it before, DoInitItemClientData() is called which gives the - // derived class the possibility to initialize its client data storage only - // when client data is really used - virtual void DoInitItemClientData() { } - virtual void DoSetItemClientData(unsigned int n, void *clientData) = 0; - virtual void *DoGetItemClientData(unsigned int n) const = 0; - - virtual void DoClear() = 0; - virtual void DoDeleteOneItem(unsigned int pos) = 0; - - - // methods useful for the derived classes which don't have any better way - // of adding multiple items to the control than doing it one by one: such - // classes should call DoInsertItemsInLoop() from their DoInsert() and - // override DoInsertOneItem() to perform the real insertion - virtual int DoInsertOneItem(const wxString& item, unsigned int pos); - int DoInsertItemsInLoop(const wxArrayStringsAdapter& items, - unsigned int pos, - void **clientData, - wxClientDataType type); - - - // helper for DoInsertItems(): n is the index into clientData, pos is the - // position of the item in the control - void AssignNewItemClientData(unsigned int pos, - void **clientData, - unsigned int n, - wxClientDataType type); - - // free the client object associated with the item at given position and - // set it to NULL (must only be called if HasClientObjectData()) - void ResetItemClientObject(unsigned int n); - - // set the type of the client data stored in this control: override this if - // you override GetClientDataType() - virtual void SetClientDataType(wxClientDataType clientDataItemsType) - { - m_clientDataItemsType = clientDataItemsType; - } - -private: - // the type of the client data for the items - wxClientDataType m_clientDataItemsType; -}; - -// Inheriting directly from a wxWindow-derived class and wxItemContainer -// unfortunately introduces an ambiguity for all GetClientXXX() methods as they -// are inherited twice: the "global" versions from wxWindow and the per-item -// versions taking the index from wxItemContainer. -// -// So we need to explicitly resolve them and this helper template class is -// provided to do it. To use it, simply inherit from wxWindowWithItems instead of Window and Container interface directly. -template -class wxWindowWithItems : public W, public C -{ -public: - typedef W BaseWindowClass; - typedef C BaseContainerInterface; - - wxWindowWithItems() { } - - void SetClientData(void *data) - { BaseWindowClass::SetClientData(data); } - void *GetClientData() const - { return BaseWindowClass::GetClientData(); } - void SetClientObject(wxClientData *data) - { BaseWindowClass::SetClientObject(data); } - wxClientData *GetClientObject() const - { return BaseWindowClass::GetClientObject(); } - - void SetClientData(unsigned int n, void* clientData) - { wxItemContainer::SetClientData(n, clientData); } - void* GetClientData(unsigned int n) const - { return wxItemContainer::GetClientData(n); } - void SetClientObject(unsigned int n, wxClientData* clientData) - { wxItemContainer::SetClientObject(n, clientData); } - wxClientData* GetClientObject(unsigned int n) const - { return wxItemContainer::GetClientObject(n); } -}; - -class WXDLLIMPEXP_CORE wxControlWithItemsBase : - public wxWindowWithItems -{ -public: - wxControlWithItemsBase() { } - - // usually the controls like list/combo boxes have their own background - // colour - virtual bool ShouldInheritColours() const wxOVERRIDE { return false; } - - - // Implementation only from now on. - - // Generate an event of the given type for the selection change. - void SendSelectionChangedEvent(wxEventType eventType); - -protected: - // fill in the client object or data field of the event as appropriate - // - // calls InitCommandEvent() and, if n != wxNOT_FOUND, also sets the per - // item client data - void InitCommandEventWithItems(wxCommandEvent& event, int n); - -private: - wxDECLARE_NO_COPY_CLASS(wxControlWithItemsBase); -}; - -// define the platform-specific wxControlWithItems class -#if defined(__WXMSW__) - #include "wx/msw/ctrlsub.h" -#elif defined(__WXMOTIF__) - #include "wx/motif/ctrlsub.h" -#elif defined(__WXQT__) - #include "wx/qt/ctrlsub.h" -#else - class WXDLLIMPEXP_CORE wxControlWithItems : public wxControlWithItemsBase - { - public: - wxControlWithItems() { } - - private: - wxDECLARE_ABSTRACT_CLASS(wxControlWithItems); - wxDECLARE_NO_COPY_CLASS(wxControlWithItems); - }; -#endif - -#endif // wxUSE_CONTROLS - -#endif // _WX_CTRLSUB_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/cursor.h b/Externals/wxWidgets3/include/wx/cursor.h deleted file mode 100644 index df0c57423e..0000000000 --- a/Externals/wxWidgets3/include/wx/cursor.h +++ /dev/null @@ -1,113 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cursor.h -// Purpose: wxCursor base header -// Author: Julian Smart, Vadim Zeitlin -// Created: -// Copyright: (c) Julian Smart -// (c) 2014 Vadim Zeitlin (wxCursorBase) -// Licence: wxWindows Licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_CURSOR_H_BASE_ -#define _WX_CURSOR_H_BASE_ - -#include "wx/gdiobj.h" -#include "wx/gdicmn.h" - -// Under most ports, wxCursor derives directly from wxGDIObject, but in wxMSW -// there is an intermediate wxGDIImage class. -#ifdef __WXMSW__ - #include "wx/msw/gdiimage.h" -#else - typedef wxGDIObject wxGDIImage; -#endif - -class WXDLLIMPEXP_CORE wxCursorBase : public wxGDIImage -{ -public: -/* - wxCursor classes should provide the following ctors: - - wxCursor(); - wxCursor(const wxImage& image); - wxCursor(const wxString& name, - wxBitmapType type = wxCURSOR_DEFAULT_TYPE, - int hotSpotX = 0, int hotSpotY = 0); - wxCursor(wxStockCursor id) { InitFromStock(id); } -#if WXWIN_COMPATIBILITY_2_8 - wxCursor(int id) { InitFromStock((wxStockCursor)id); } -#endif -*/ - - virtual wxPoint GetHotSpot() const { return wxDefaultPosition; } -}; - -#if defined(__WXMSW__) - #define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_CUR_RESOURCE - #include "wx/msw/cursor.h" -#elif defined(__WXMOTIF__) - #define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_XBM - #include "wx/motif/cursor.h" -#elif defined(__WXGTK20__) - #ifdef __WINDOWS__ - #define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_CUR_RESOURCE - #else - #define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_XPM - #endif - #include "wx/gtk/cursor.h" -#elif defined(__WXGTK__) - #define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_XPM - #include "wx/gtk1/cursor.h" -#elif defined(__WXX11__) - #define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_XPM - #include "wx/x11/cursor.h" -#elif defined(__WXDFB__) - #define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_CUR_RESOURCE - #include "wx/dfb/cursor.h" -#elif defined(__WXMAC__) - #define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_MACCURSOR_RESOURCE - #include "wx/osx/cursor.h" -#elif defined(__WXQT__) - #define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_CUR - #include "wx/qt/cursor.h" -#endif - -#include "wx/utils.h" - -/* This is a small class which can be used by all ports - to temporarily suspend the busy cursor. Useful in modal - dialogs. - - Actually that is not (any longer) quite true.. currently it is - only used in wxGTK Dialog::ShowModal() and now uses static - wxBusyCursor methods that are only implemented for wxGTK so far. - The BusyCursor handling code should probably be implemented in - common code somewhere instead of the separate implementations we - currently have. Also the name BusyCursorSuspender is a little - misleading since it doesn't actually suspend the BusyCursor, just - masks one that is already showing. - If another call to wxBeginBusyCursor is made while this is active - the Busy Cursor will again be shown. But at least now it doesn't - interfere with the state of wxIsBusy() -- RL - -*/ -class wxBusyCursorSuspender -{ -public: - wxBusyCursorSuspender() - { - if( wxIsBusy() ) - { - wxSetCursor( wxBusyCursor::GetStoredCursor() ); - } - } - ~wxBusyCursorSuspender() - { - if( wxIsBusy() ) - { - wxSetCursor( wxBusyCursor::GetBusyCursor() ); - } - } -}; -#endif - // _WX_CURSOR_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/custombgwin.h b/Externals/wxWidgets3/include/wx/custombgwin.h deleted file mode 100644 index 329589c7f2..0000000000 --- a/Externals/wxWidgets3/include/wx/custombgwin.h +++ /dev/null @@ -1,56 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/custombgwin.h -// Purpose: Class adding support for custom window backgrounds. -// Author: Vadim Zeitlin -// Created: 2011-10-10 -// Copyright: (c) 2011 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_CUSTOMBGWIN_H_ -#define _WX_CUSTOMBGWIN_H_ - -#include "wx/defs.h" - -class WXDLLIMPEXP_FWD_CORE wxBitmap; - -// ---------------------------------------------------------------------------- -// wxCustomBackgroundWindow: Adds support for custom backgrounds to any -// wxWindow-derived class. -// ---------------------------------------------------------------------------- - -class wxCustomBackgroundWindowBase -{ -public: - // Trivial default ctor. - wxCustomBackgroundWindowBase() { } - - // Also a trivial but virtual -- to suppress g++ warnings -- dtor. - virtual ~wxCustomBackgroundWindowBase() { } - - // Use the given bitmap to tile the background of this window. This bitmap - // will show through any transparent children. - // - // Notice that you must not prevent the base class EVT_ERASE_BACKGROUND - // handler from running (i.e. not to handle this event yourself) for this - // to work. - void SetBackgroundBitmap(const wxBitmap& bmp) - { - DoSetBackgroundBitmap(bmp); - } - -protected: - virtual void DoSetBackgroundBitmap(const wxBitmap& bmp) = 0; - - wxDECLARE_NO_COPY_CLASS(wxCustomBackgroundWindowBase); -}; - -#if defined(__WXUNIVERSAL__) - #include "wx/univ/custombgwin.h" -#elif defined(__WXMSW__) - #include "wx/msw/custombgwin.h" -#else - #include "wx/generic/custombgwin.h" -#endif - -#endif // _WX_CUSTOMBGWIN_H_ diff --git a/Externals/wxWidgets3/include/wx/dataobj.h b/Externals/wxWidgets3/include/wx/dataobj.h deleted file mode 100644 index 2caee94243..0000000000 --- a/Externals/wxWidgets3/include/wx/dataobj.h +++ /dev/null @@ -1,583 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/dataobj.h -// Purpose: common data object classes -// Author: Vadim Zeitlin, Robert Roebling -// Modified by: -// Created: 26.05.99 -// Copyright: (c) wxWidgets Team -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DATAOBJ_H_BASE_ -#define _WX_DATAOBJ_H_BASE_ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- -#include "wx/defs.h" - -#if wxUSE_DATAOBJ - -#include "wx/string.h" -#include "wx/bitmap.h" -#include "wx/list.h" -#include "wx/arrstr.h" - -// ============================================================================ -/* - Generic data transfer related classes. The class hierarchy is as follows: - - - wxDataObject- - / \ - / \ - wxDataObjectSimple wxDataObjectComposite - / | \ - / | \ - wxTextDataObject | wxBitmapDataObject - | - wxCustomDataObject - -*/ -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxDataFormat class is declared in platform-specific headers: it represents -// a format for data which may be either one of the standard ones (text, -// bitmap, ...) or a custom one which is then identified by a unique string. -// ---------------------------------------------------------------------------- - -/* the class interface looks like this (pseudo code): - -class wxDataFormat -{ -public: - typedef NativeFormat; - - wxDataFormat(NativeFormat format = wxDF_INVALID); - wxDataFormat(const wxString& format); - - wxDataFormat& operator=(NativeFormat format); - wxDataFormat& operator=(const wxDataFormat& format); - - bool operator==(NativeFormat format) const; - bool operator!=(NativeFormat format) const; - - void SetType(NativeFormat format); - NativeFormat GetType() const; - - wxString GetId() const; - void SetId(const wxString& format); -}; - -*/ - -#if defined(__WXMSW__) - #include "wx/msw/ole/dataform.h" -#elif defined(__WXMOTIF__) - #include "wx/motif/dataform.h" -#elif defined(__WXGTK20__) - #include "wx/gtk/dataform.h" -#elif defined(__WXGTK__) - #include "wx/gtk1/dataform.h" -#elif defined(__WXX11__) - #include "wx/x11/dataform.h" -#elif defined(__WXMAC__) - #include "wx/osx/dataform.h" -#elif defined(__WXQT__) - #include "wx/qt/dataform.h" -#endif - -// the value for default argument to some functions (corresponds to -// wxDF_INVALID) -extern WXDLLIMPEXP_CORE const wxDataFormat& wxFormatInvalid; - -// ---------------------------------------------------------------------------- -// wxDataObject represents a piece of data which knows which formats it -// supports and knows how to render itself in each of them - GetDataHere(), -// and how to restore data from the buffer (SetData()). -// -// Although this class may be used directly (i.e. custom classes may be -// derived from it), in many cases it might be simpler to use either -// wxDataObjectSimple or wxDataObjectComposite classes. -// -// A data object may be "read only", i.e. support only GetData() functions or -// "read-write", i.e. support both GetData() and SetData() (in principle, it -// might be "write only" too, but this is rare). Moreover, it doesn't have to -// support the same formats in Get() and Set() directions: for example, a data -// object containing JPEG image might accept BMPs in GetData() because JPEG -// image may be easily transformed into BMP but not in SetData(). Accordingly, -// all methods dealing with formats take an additional "direction" argument -// which is either SET or GET and which tells the function if the format needs -// to be supported by SetData() or GetDataHere(). -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxDataObjectBase -{ -public: - enum Direction - { - Get = 0x01, // format is supported by GetDataHere() - Set = 0x02, // format is supported by SetData() - Both = 0x03 // format is supported by both (unused currently) - }; - - // this class is polymorphic, hence it needs a virtual dtor - virtual ~wxDataObjectBase(); - - // get the best suited format for rendering our data - virtual wxDataFormat GetPreferredFormat(Direction dir = Get) const = 0; - - // get the number of formats we support - virtual size_t GetFormatCount(Direction dir = Get) const = 0; - - // return all formats in the provided array (of size GetFormatCount()) - virtual void GetAllFormats(wxDataFormat *formats, - Direction dir = Get) const = 0; - - // get the (total) size of data for the given format - virtual size_t GetDataSize(const wxDataFormat& format) const = 0; - - // copy raw data (in the specified format) to the provided buffer, return - // true if data copied successfully, false otherwise - virtual bool GetDataHere(const wxDataFormat& format, void *buf) const = 0; - - // get data from the buffer of specified length (in the given format), - // return true if the data was read successfully, false otherwise - virtual bool SetData(const wxDataFormat& WXUNUSED(format), - size_t WXUNUSED(len), const void * WXUNUSED(buf)) - { - return false; - } - - // returns true if this format is supported - bool IsSupported(const wxDataFormat& format, Direction dir = Get) const; -}; - -// ---------------------------------------------------------------------------- -// include the platform-specific declarations of wxDataObject -// ---------------------------------------------------------------------------- - -#if defined(__WXMSW__) - #include "wx/msw/ole/dataobj.h" -#elif defined(__WXMOTIF__) - #include "wx/motif/dataobj.h" -#elif defined(__WXX11__) - #include "wx/x11/dataobj.h" -#elif defined(__WXGTK20__) - #include "wx/gtk/dataobj.h" -#elif defined(__WXGTK__) - #include "wx/gtk1/dataobj.h" -#elif defined(__WXMAC__) - #include "wx/osx/dataobj.h" -#elif defined(__WXQT__) - #include "wx/qt/dataobj.h" -#endif - -// ---------------------------------------------------------------------------- -// wxDataObjectSimple is a wxDataObject which only supports one format (in -// both Get and Set directions, but you may return false from GetDataHere() or -// SetData() if one of them is not supported). This is the simplest possible -// wxDataObject implementation. -// -// This is still an "abstract base class" (although it doesn't have any pure -// virtual functions), to use it you should derive from it and implement -// GetDataSize(), GetDataHere() and SetData() functions because the base class -// versions don't do anything - they just return "not implemented". -// -// This class should be used when you provide data in only one format (no -// conversion to/from other formats), either a standard or a custom one. -// Otherwise, you should use wxDataObjectComposite or wxDataObject directly. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxDataObjectSimple : public wxDataObject -{ -public: - // ctor takes the format we support, but it can also be set later with - // SetFormat() - wxDataObjectSimple(const wxDataFormat& format = wxFormatInvalid) - : m_format(format) - { - } - - // get/set the format we support - const wxDataFormat& GetFormat() const { return m_format; } - void SetFormat(const wxDataFormat& format) { m_format = format; } - - // virtual functions to override in derived class (the base class versions - // just return "not implemented") - // ----------------------------------------------------------------------- - - // get the size of our data - virtual size_t GetDataSize() const - { return 0; } - - // copy our data to the buffer - virtual bool GetDataHere(void *WXUNUSED(buf)) const - { return false; } - - // copy data from buffer to our data - virtual bool SetData(size_t WXUNUSED(len), const void *WXUNUSED(buf)) - { return false; } - - // implement base class pure virtuals - // ---------------------------------- - virtual wxDataFormat GetPreferredFormat(wxDataObjectBase::Direction WXUNUSED(dir) = Get) const wxOVERRIDE - { return m_format; } - virtual size_t GetFormatCount(wxDataObjectBase::Direction WXUNUSED(dir) = Get) const wxOVERRIDE - { return 1; } - virtual void GetAllFormats(wxDataFormat *formats, - wxDataObjectBase::Direction WXUNUSED(dir) = Get) const wxOVERRIDE - { *formats = m_format; } - virtual size_t GetDataSize(const wxDataFormat& WXUNUSED(format)) const wxOVERRIDE - { return GetDataSize(); } - virtual bool GetDataHere(const wxDataFormat& WXUNUSED(format), - void *buf) const wxOVERRIDE - { return GetDataHere(buf); } - virtual bool SetData(const wxDataFormat& WXUNUSED(format), - size_t len, const void *buf) wxOVERRIDE - { return SetData(len, buf); } - -private: - // the one and only format we support - wxDataFormat m_format; - - wxDECLARE_NO_COPY_CLASS(wxDataObjectSimple); -}; - -// ---------------------------------------------------------------------------- -// wxDataObjectComposite is the simplest way to implement wxDataObject -// supporting multiple formats. It contains several wxDataObjectSimple and -// supports all formats supported by any of them. -// -// This class shouldn't be (normally) derived from, but may be used directly. -// If you need more flexibility than what it provides, you should probably use -// wxDataObject directly. -// ---------------------------------------------------------------------------- - -WX_DECLARE_EXPORTED_LIST(wxDataObjectSimple, wxSimpleDataObjectList); - -class WXDLLIMPEXP_CORE wxDataObjectComposite : public wxDataObject -{ -public: - // ctor - wxDataObjectComposite(); - virtual ~wxDataObjectComposite(); - - // add data object (it will be deleted by wxDataObjectComposite, hence it - // must be allocated on the heap) whose format will become the preferred - // one if preferred == true - void Add(wxDataObjectSimple *dataObject, bool preferred = false); - - // Report the format passed to the SetData method. This should be the - // format of the data object within the composite that received data from - // the clipboard or the DnD operation. You can use this method to find - // out what kind of data object was received. - wxDataFormat GetReceivedFormat() const; - - // Returns the pointer to the object which supports this format or NULL. - // The returned pointer is owned by wxDataObjectComposite and must - // therefore not be destroyed by the caller. - wxDataObjectSimple *GetObject(const wxDataFormat& format, - wxDataObjectBase::Direction dir = Get) const; - - // implement base class pure virtuals - // ---------------------------------- - virtual wxDataFormat GetPreferredFormat(wxDataObjectBase::Direction dir = Get) const wxOVERRIDE; - virtual size_t GetFormatCount(wxDataObjectBase::Direction dir = Get) const wxOVERRIDE; - virtual void GetAllFormats(wxDataFormat *formats, wxDataObjectBase::Direction dir = Get) const wxOVERRIDE; - virtual size_t GetDataSize(const wxDataFormat& format) const wxOVERRIDE; - virtual bool GetDataHere(const wxDataFormat& format, void *buf) const wxOVERRIDE; - virtual bool SetData(const wxDataFormat& format, size_t len, const void *buf) wxOVERRIDE; -#if defined(__WXMSW__) - virtual const void* GetSizeFromBuffer( const void* buffer, size_t* size, - const wxDataFormat& format ); - virtual void* SetSizeInBuffer( void* buffer, size_t size, - const wxDataFormat& format ); - virtual size_t GetBufferOffset( const wxDataFormat& format ); -#endif - -private: - // the list of all (simple) data objects whose formats we support - wxSimpleDataObjectList m_dataObjects; - - // the index of the preferred one (0 initially, so by default the first - // one is the preferred) - size_t m_preferred; - - wxDataFormat m_receivedFormat; - - wxDECLARE_NO_COPY_CLASS(wxDataObjectComposite); -}; - -// ============================================================================ -// Standard implementations of wxDataObjectSimple which can be used directly -// (i.e. without having to derive from them) for standard data type transfers. -// -// Note that although all of them can work with provided data, you can also -// override their virtual GetXXX() functions to only provide data on demand. -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxTextDataObject contains text data -// ---------------------------------------------------------------------------- - -#if wxUSE_UNICODE - #if defined(__WXGTK20__) || defined(__WXX11__) - #define wxNEEDS_UTF8_FOR_TEXT_DATAOBJ - #elif defined(__WXMAC__) - #define wxNEEDS_UTF16_FOR_TEXT_DATAOBJ - #endif -#endif // wxUSE_UNICODE - -class WXDLLIMPEXP_CORE wxHTMLDataObject : public wxDataObjectSimple -{ -public: - // ctor: you can specify the text here or in SetText(), or override - // GetText() - wxHTMLDataObject(const wxString& html = wxEmptyString) - : wxDataObjectSimple(wxDF_HTML), - m_html(html) - { - } - - // virtual functions which you may override if you want to provide text on - // demand only - otherwise, the trivial default versions will be used - virtual size_t GetLength() const { return m_html.Len() + 1; } - virtual wxString GetHTML() const { return m_html; } - virtual void SetHTML(const wxString& html) { m_html = html; } - - virtual size_t GetDataSize() const wxOVERRIDE; - virtual bool GetDataHere(void *buf) const wxOVERRIDE; - virtual bool SetData(size_t len, const void *buf) wxOVERRIDE; - - // Must provide overloads to avoid hiding them (and warnings about it) - virtual size_t GetDataSize(const wxDataFormat&) const wxOVERRIDE - { - return GetDataSize(); - } - virtual bool GetDataHere(const wxDataFormat&, void *buf) const wxOVERRIDE - { - return GetDataHere(buf); - } - virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) wxOVERRIDE - { - return SetData(len, buf); - } - -private: - wxString m_html; -}; - -class WXDLLIMPEXP_CORE wxTextDataObject : public wxDataObjectSimple -{ -public: - // ctor: you can specify the text here or in SetText(), or override - // GetText() - wxTextDataObject(const wxString& text = wxEmptyString) - : wxDataObjectSimple( -#if wxUSE_UNICODE - wxDF_UNICODETEXT -#else - wxDF_TEXT -#endif - ), - m_text(text) - { - } - - // virtual functions which you may override if you want to provide text on - // demand only - otherwise, the trivial default versions will be used - virtual size_t GetTextLength() const { return m_text.Len() + 1; } - virtual wxString GetText() const { return m_text; } - virtual void SetText(const wxString& text) { m_text = text; } - - // implement base class pure virtuals - // ---------------------------------- - - // some platforms have 2 and not 1 format for text data -#if defined(wxNEEDS_UTF8_FOR_TEXT_DATAOBJ) || defined(wxNEEDS_UTF16_FOR_TEXT_DATAOBJ) - virtual size_t GetFormatCount(Direction WXUNUSED(dir) = Get) const wxOVERRIDE { return 2; } - virtual void GetAllFormats(wxDataFormat *formats, - wxDataObjectBase::Direction WXUNUSED(dir) = Get) const wxOVERRIDE; - - virtual size_t GetDataSize() const wxOVERRIDE { return GetDataSize(GetPreferredFormat()); } - virtual bool GetDataHere(void *buf) const wxOVERRIDE { return GetDataHere(GetPreferredFormat(), buf); } - virtual bool SetData(size_t len, const void *buf) wxOVERRIDE { return SetData(GetPreferredFormat(), len, buf); } - - size_t GetDataSize(const wxDataFormat& format) const wxOVERRIDE; - bool GetDataHere(const wxDataFormat& format, void *pBuf) const wxOVERRIDE; - bool SetData(const wxDataFormat& format, size_t nLen, const void* pBuf) wxOVERRIDE; -#else // !wxNEEDS_UTF{8,16}_FOR_TEXT_DATAOBJ - virtual size_t GetDataSize() const; - virtual bool GetDataHere(void *buf) const; - virtual bool SetData(size_t len, const void *buf); - // Must provide overloads to avoid hiding them (and warnings about it) - virtual size_t GetDataSize(const wxDataFormat&) const - { - return GetDataSize(); - } - virtual bool GetDataHere(const wxDataFormat&, void *buf) const - { - return GetDataHere(buf); - } - virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) - { - return SetData(len, buf); - } -#endif // different wxTextDataObject implementations - -private: - wxString m_text; - - wxDECLARE_NO_COPY_CLASS(wxTextDataObject); -}; - -// ---------------------------------------------------------------------------- -// wxBitmapDataObject contains a bitmap -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxBitmapDataObjectBase : public wxDataObjectSimple -{ -public: - // ctor: you can specify the bitmap here or in SetBitmap(), or override - // GetBitmap() - wxBitmapDataObjectBase(const wxBitmap& bitmap = wxNullBitmap) - : wxDataObjectSimple(wxDF_BITMAP), m_bitmap(bitmap) - { - } - - // virtual functions which you may override if you want to provide data on - // demand only - otherwise, the trivial default versions will be used - virtual wxBitmap GetBitmap() const { return m_bitmap; } - virtual void SetBitmap(const wxBitmap& bitmap) { m_bitmap = bitmap; } - -protected: - wxBitmap m_bitmap; - - wxDECLARE_NO_COPY_CLASS(wxBitmapDataObjectBase); -}; - -// ---------------------------------------------------------------------------- -// wxFileDataObject contains a list of filenames -// -// NB: notice that this is a "write only" object, it can only be filled with -// data from drag and drop operation. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxFileDataObjectBase : public wxDataObjectSimple -{ -public: - // ctor: use AddFile() later to fill the array - wxFileDataObjectBase() : wxDataObjectSimple(wxDF_FILENAME) { } - - // get a reference to our array - const wxArrayString& GetFilenames() const { return m_filenames; } - -protected: - wxArrayString m_filenames; - - wxDECLARE_NO_COPY_CLASS(wxFileDataObjectBase); -}; - -// ---------------------------------------------------------------------------- -// wxCustomDataObject contains arbitrary untyped user data. -// -// It is understood that this data can be copied bitwise. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxCustomDataObject : public wxDataObjectSimple -{ -public: - // if you don't specify the format in the ctor, you can still use - // SetFormat() later - wxCustomDataObject(const wxDataFormat& format = wxFormatInvalid); - - // the dtor calls Free() - virtual ~wxCustomDataObject(); - - // you can call SetData() to set m_data: it will make a copy of the data - // you pass - or you can use TakeData() which won't copy anything, but - // will take ownership of data (i.e. will call Free() on it later) - void TakeData(size_t size, void *data); - - // this function is called to allocate "size" bytes of memory from - // SetData(). The default version uses operator new[]. - virtual void *Alloc(size_t size); - - // this function is called when the data is freed, you may override it to - // anything you want (or may be nothing at all). The default version calls - // operator delete[] on m_data - virtual void Free(); - - // get data: you may override these functions if you wish to provide data - // only when it's requested - virtual size_t GetSize() const { return m_size; } - virtual void *GetData() const { return m_data; } - - // implement base class pure virtuals - // ---------------------------------- - virtual size_t GetDataSize() const wxOVERRIDE; - virtual bool GetDataHere(void *buf) const wxOVERRIDE; - virtual bool SetData(size_t size, const void *buf) wxOVERRIDE; - // Must provide overloads to avoid hiding them (and warnings about it) - virtual size_t GetDataSize(const wxDataFormat&) const wxOVERRIDE - { - return GetDataSize(); - } - virtual bool GetDataHere(const wxDataFormat&, void *buf) const wxOVERRIDE - { - return GetDataHere(buf); - } - virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) wxOVERRIDE - { - return SetData(len, buf); - } - -private: - size_t m_size; - void *m_data; - - wxDECLARE_NO_COPY_CLASS(wxCustomDataObject); -}; - -// ---------------------------------------------------------------------------- -// include platform-specific declarations of wxXXXBase classes -// ---------------------------------------------------------------------------- - -#if defined(__WXMSW__) - #include "wx/msw/ole/dataobj2.h" - // wxURLDataObject defined in msw/ole/dataobj2.h -#elif defined(__WXGTK20__) - #include "wx/gtk/dataobj2.h" - // wxURLDataObject defined in msw/ole/dataobj2.h - -#else - #if defined(__WXGTK__) - #include "wx/gtk1/dataobj2.h" - #elif defined(__WXX11__) - #include "wx/x11/dataobj2.h" - #elif defined(__WXMOTIF__) - #include "wx/motif/dataobj2.h" - #elif defined(__WXMAC__) - #include "wx/osx/dataobj2.h" - #elif defined(__WXQT__) - #include "wx/qt/dataobj2.h" - #endif - - // wxURLDataObject is simply wxTextDataObject with a different name - class WXDLLIMPEXP_CORE wxURLDataObject : public wxTextDataObject - { - public: - wxURLDataObject(const wxString& url = wxEmptyString) - : wxTextDataObject(url) - { - } - - wxString GetURL() const { return GetText(); } - void SetURL(const wxString& url) { SetText(url); } - }; -#endif - -#endif // wxUSE_DATAOBJ - -#endif // _WX_DATAOBJ_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/dataview.h b/Externals/wxWidgets3/include/wx/dataview.h deleted file mode 100644 index 8364cdbd78..0000000000 --- a/Externals/wxWidgets3/include/wx/dataview.h +++ /dev/null @@ -1,1374 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/dataview.h -// Purpose: wxDataViewCtrl base classes -// Author: Robert Roebling -// Modified by: Bo Yang -// Created: 08.01.06 -// Copyright: (c) Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DATAVIEW_H_BASE_ -#define _WX_DATAVIEW_H_BASE_ - -#include "wx/defs.h" - -#if wxUSE_DATAVIEWCTRL - -#include "wx/textctrl.h" -#include "wx/headercol.h" -#include "wx/variant.h" -#include "wx/dnd.h" // For wxDragResult declaration only. -#include "wx/dynarray.h" -#include "wx/icon.h" -#include "wx/itemid.h" -#include "wx/weakref.h" -#include "wx/vector.h" -#include "wx/dataobj.h" -#include "wx/withimages.h" -#include "wx/systhemectrl.h" - -class WXDLLIMPEXP_FWD_CORE wxImageList; - -#if !(defined(__WXGTK20__) || defined(__WXOSX__) ) || defined(__WXUNIVERSAL__) -// #if !(defined(__WXOSX__)) || defined(__WXUNIVERSAL__) - #define wxHAS_GENERIC_DATAVIEWCTRL -#endif - -#ifdef wxHAS_GENERIC_DATAVIEWCTRL - // this symbol doesn't follow the convention for wxUSE_XXX symbols which - // are normally always defined as either 0 or 1, so its use is deprecated - // and it only exists for backwards compatibility, don't use it any more - // and use wxHAS_GENERIC_DATAVIEWCTRL instead - #define wxUSE_GENERICDATAVIEWCTRL -#endif - -// ---------------------------------------------------------------------------- -// wxDataViewCtrl globals -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_ADV wxDataViewModel; -class WXDLLIMPEXP_FWD_ADV wxDataViewCtrl; -class WXDLLIMPEXP_FWD_ADV wxDataViewColumn; -class WXDLLIMPEXP_FWD_ADV wxDataViewRenderer; -class WXDLLIMPEXP_FWD_ADV wxDataViewModelNotifier; - -extern WXDLLIMPEXP_DATA_ADV(const char) wxDataViewCtrlNameStr[]; - -// ---------------------------------------------------------------------------- -// wxDataViewCtrl flags -// ---------------------------------------------------------------------------- - -// size of a wxDataViewRenderer without contents: -#define wxDVC_DEFAULT_RENDERER_SIZE 20 - -// the default width of new (text) columns: -#define wxDVC_DEFAULT_WIDTH 80 - -// the default width of new toggle columns: -#define wxDVC_TOGGLE_DEFAULT_WIDTH 30 - -// the default minimal width of the columns: -#define wxDVC_DEFAULT_MINWIDTH 30 - -// The default alignment of wxDataViewRenderers is to take -// the alignment from the column it owns. -#define wxDVR_DEFAULT_ALIGNMENT -1 - - -// --------------------------------------------------------- -// wxDataViewItem -// --------------------------------------------------------- - -// Make it a class and not a typedef to allow forward declaring it. -class wxDataViewItem : public wxItemId -{ -public: - wxDataViewItem() : wxItemId() { } - wxEXPLICIT wxDataViewItem(void* pItem) : wxItemId(pItem) { } -}; - -WX_DEFINE_ARRAY(wxDataViewItem, wxDataViewItemArray); - -// --------------------------------------------------------- -// wxDataViewModelNotifier -// --------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDataViewModelNotifier -{ -public: - wxDataViewModelNotifier() { m_owner = NULL; } - virtual ~wxDataViewModelNotifier() { m_owner = NULL; } - - virtual bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item ) = 0; - virtual bool ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item ) = 0; - virtual bool ItemChanged( const wxDataViewItem &item ) = 0; - virtual bool ItemsAdded( const wxDataViewItem &parent, const wxDataViewItemArray &items ); - virtual bool ItemsDeleted( const wxDataViewItem &parent, const wxDataViewItemArray &items ); - virtual bool ItemsChanged( const wxDataViewItemArray &items ); - virtual bool ValueChanged( const wxDataViewItem &item, unsigned int col ) = 0; - virtual bool Cleared() = 0; - - // some platforms, such as GTK+, may need a two step procedure for ::Reset() - virtual bool BeforeReset() { return true; } - virtual bool AfterReset() { return Cleared(); } - - virtual void Resort() = 0; - - void SetOwner( wxDataViewModel *owner ) { m_owner = owner; } - wxDataViewModel *GetOwner() const { return m_owner; } - -private: - wxDataViewModel *m_owner; -}; - - - -// ---------------------------------------------------------------------------- -// wxDataViewItemAttr: a structure containing the visual attributes of an item -// ---------------------------------------------------------------------------- - -// TODO: this should be renamed to wxItemAttr or something general like this - -class WXDLLIMPEXP_ADV wxDataViewItemAttr -{ -public: - // ctors - wxDataViewItemAttr() - { - m_bold = false; - m_italic = false; - } - - // setters - void SetColour(const wxColour& colour) { m_colour = colour; } - void SetBold( bool set ) { m_bold = set; } - void SetItalic( bool set ) { m_italic = set; } - void SetBackgroundColour(const wxColour& colour) { m_bgColour = colour; } - - // accessors - bool HasColour() const { return m_colour.IsOk(); } - const wxColour& GetColour() const { return m_colour; } - - bool HasFont() const { return m_bold || m_italic; } - bool GetBold() const { return m_bold; } - bool GetItalic() const { return m_italic; } - - bool HasBackgroundColour() const { return m_bgColour.IsOk(); } - const wxColour& GetBackgroundColour() const { return m_bgColour; } - - bool IsDefault() const { return !(HasColour() || HasFont() || HasBackgroundColour()); } - - // Return the font based on the given one with this attribute applied to it. - wxFont GetEffectiveFont(const wxFont& font) const; - -private: - wxColour m_colour; - bool m_bold; - bool m_italic; - wxColour m_bgColour; -}; - - -// --------------------------------------------------------- -// wxDataViewModel -// --------------------------------------------------------- - -WX_DECLARE_LIST_WITH_DECL(wxDataViewModelNotifier, wxDataViewModelNotifiers, - class WXDLLIMPEXP_ADV); - -class WXDLLIMPEXP_ADV wxDataViewModel: public wxRefCounter -{ -public: - wxDataViewModel(); - - virtual unsigned int GetColumnCount() const = 0; - - // return type as reported by wxVariant - virtual wxString GetColumnType( unsigned int col ) const = 0; - - // get value into a wxVariant - virtual void GetValue( wxVariant &variant, - const wxDataViewItem &item, unsigned int col ) const = 0; - - // return true if the given item has a value to display in the given - // column: this is always true except for container items which by default - // only show their label in the first column (but see HasContainerColumns()) - bool HasValue(const wxDataViewItem& item, unsigned col) const - { - return col == 0 || !IsContainer(item) || HasContainerColumns(item); - } - - // usually ValueChanged() should be called after changing the value in the - // model to update the control, ChangeValue() does it on its own while - // SetValue() does not -- so while you will override SetValue(), you should - // be usually calling ChangeValue() - virtual bool SetValue(const wxVariant &variant, - const wxDataViewItem &item, - unsigned int col) = 0; - - bool ChangeValue(const wxVariant& variant, - const wxDataViewItem& item, - unsigned int col) - { - return SetValue(variant, item, col) && ValueChanged(item, col); - } - - // Get text attribute, return false of default attributes should be used - virtual bool GetAttr(const wxDataViewItem &WXUNUSED(item), - unsigned int WXUNUSED(col), - wxDataViewItemAttr &WXUNUSED(attr)) const - { - return false; - } - - // Override this if you want to disable specific items - virtual bool IsEnabled(const wxDataViewItem &WXUNUSED(item), - unsigned int WXUNUSED(col)) const - { - return true; - } - - // define hierarchy - virtual wxDataViewItem GetParent( const wxDataViewItem &item ) const = 0; - virtual bool IsContainer( const wxDataViewItem &item ) const = 0; - // Is the container just a header or an item with all columns - virtual bool HasContainerColumns(const wxDataViewItem& WXUNUSED(item)) const - { return false; } - virtual unsigned int GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const = 0; - - // delegated notifiers - bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item ); - bool ItemsAdded( const wxDataViewItem &parent, const wxDataViewItemArray &items ); - bool ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item ); - bool ItemsDeleted( const wxDataViewItem &parent, const wxDataViewItemArray &items ); - bool ItemChanged( const wxDataViewItem &item ); - bool ItemsChanged( const wxDataViewItemArray &items ); - bool ValueChanged( const wxDataViewItem &item, unsigned int col ); - bool Cleared(); - - // some platforms, such as GTK+, may need a two step procedure for ::Reset() - bool BeforeReset(); - bool AfterReset(); - - - // delegated action - virtual void Resort(); - - void AddNotifier( wxDataViewModelNotifier *notifier ); - void RemoveNotifier( wxDataViewModelNotifier *notifier ); - - // default compare function - virtual int Compare( const wxDataViewItem &item1, const wxDataViewItem &item2, - unsigned int column, bool ascending ) const; - virtual bool HasDefaultCompare() const { return false; } - - // internal - virtual bool IsListModel() const { return false; } - virtual bool IsVirtualListModel() const { return false; } - -protected: - // the user should not delete this class directly: he should use DecRef() instead! - virtual ~wxDataViewModel() { } - - wxDataViewModelNotifiers m_notifiers; -}; - -// ---------------------------------------------------------------------------- -// wxDataViewListModel: a model of a list, i.e. flat data structure without any -// branches/containers, used as base class by wxDataViewIndexListModel and -// wxDataViewVirtualListModel -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDataViewListModel : public wxDataViewModel -{ -public: - // derived classes should override these methods instead of - // {Get,Set}Value() and GetAttr() inherited from the base class - - virtual void GetValueByRow(wxVariant &variant, - unsigned row, unsigned col) const = 0; - - virtual bool SetValueByRow(const wxVariant &variant, - unsigned row, unsigned col) = 0; - - virtual bool - GetAttrByRow(unsigned WXUNUSED(row), unsigned WXUNUSED(col), - wxDataViewItemAttr &WXUNUSED(attr)) const - { - return false; - } - - virtual bool IsEnabledByRow(unsigned int WXUNUSED(row), - unsigned int WXUNUSED(col)) const - { - return true; - } - - - // helper methods provided by list models only - virtual unsigned GetRow( const wxDataViewItem &item ) const = 0; - - // returns the number of rows - virtual unsigned int GetCount() const = 0; - - // implement some base class pure virtual directly - virtual wxDataViewItem - GetParent( const wxDataViewItem & WXUNUSED(item) ) const wxOVERRIDE - { - // items never have valid parent in this model - return wxDataViewItem(); - } - - virtual bool IsContainer( const wxDataViewItem &item ) const wxOVERRIDE - { - // only the invisible (and invalid) root item has children - return !item.IsOk(); - } - - // and implement some others by forwarding them to our own ones - virtual void GetValue( wxVariant &variant, - const wxDataViewItem &item, unsigned int col ) const wxOVERRIDE - { - GetValueByRow(variant, GetRow(item), col); - } - - virtual bool SetValue( const wxVariant &variant, - const wxDataViewItem &item, unsigned int col ) wxOVERRIDE - { - return SetValueByRow( variant, GetRow(item), col ); - } - - virtual bool GetAttr(const wxDataViewItem &item, unsigned int col, - wxDataViewItemAttr &attr) const wxOVERRIDE - { - return GetAttrByRow( GetRow(item), col, attr ); - } - - virtual bool IsEnabled(const wxDataViewItem &item, unsigned int col) const wxOVERRIDE - { - return IsEnabledByRow( GetRow(item), col ); - } - - - virtual bool IsListModel() const wxOVERRIDE { return true; } -}; - -// --------------------------------------------------------- -// wxDataViewIndexListModel -// --------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDataViewIndexListModel: public wxDataViewListModel -{ -public: - wxDataViewIndexListModel( unsigned int initial_size = 0 ); - - void RowPrepended(); - void RowInserted( unsigned int before ); - void RowAppended(); - void RowDeleted( unsigned int row ); - void RowsDeleted( const wxArrayInt &rows ); - void RowChanged( unsigned int row ); - void RowValueChanged( unsigned int row, unsigned int col ); - void Reset( unsigned int new_size ); - - // convert to/from row/wxDataViewItem - - virtual unsigned GetRow( const wxDataViewItem &item ) const wxOVERRIDE; - wxDataViewItem GetItem( unsigned int row ) const; - - // implement base methods - virtual unsigned int GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const wxOVERRIDE; - - unsigned int GetCount() const wxOVERRIDE { return m_hash.GetCount(); } - -private: - wxDataViewItemArray m_hash; - unsigned int m_nextFreeID; - bool m_ordered; -}; - -// --------------------------------------------------------- -// wxDataViewVirtualListModel -// --------------------------------------------------------- - -#ifdef __WXMAC__ -// better than nothing -typedef wxDataViewIndexListModel wxDataViewVirtualListModel; -#else - -class WXDLLIMPEXP_ADV wxDataViewVirtualListModel: public wxDataViewListModel -{ -public: - wxDataViewVirtualListModel( unsigned int initial_size = 0 ); - - void RowPrepended(); - void RowInserted( unsigned int before ); - void RowAppended(); - void RowDeleted( unsigned int row ); - void RowsDeleted( const wxArrayInt &rows ); - void RowChanged( unsigned int row ); - void RowValueChanged( unsigned int row, unsigned int col ); - void Reset( unsigned int new_size ); - - // convert to/from row/wxDataViewItem - - virtual unsigned GetRow( const wxDataViewItem &item ) const wxOVERRIDE; - wxDataViewItem GetItem( unsigned int row ) const; - - // compare based on index - - virtual int Compare( const wxDataViewItem &item1, const wxDataViewItem &item2, - unsigned int column, bool ascending ) const wxOVERRIDE; - virtual bool HasDefaultCompare() const wxOVERRIDE; - - // implement base methods - virtual unsigned int GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const wxOVERRIDE; - - unsigned int GetCount() const wxOVERRIDE { return m_size; } - - // internal - virtual bool IsVirtualListModel() const wxOVERRIDE { return true; } - -private: - unsigned int m_size; -}; -#endif - -// ---------------------------------------------------------------------------- -// wxDataViewRenderer and related classes -// ---------------------------------------------------------------------------- - -#include "wx/dvrenderers.h" - -// --------------------------------------------------------- -// wxDataViewColumnBase -// --------------------------------------------------------- - -// for compatibility only, do not use -enum wxDataViewColumnFlags -{ - wxDATAVIEW_COL_RESIZABLE = wxCOL_RESIZABLE, - wxDATAVIEW_COL_SORTABLE = wxCOL_SORTABLE, - wxDATAVIEW_COL_REORDERABLE = wxCOL_REORDERABLE, - wxDATAVIEW_COL_HIDDEN = wxCOL_HIDDEN -}; - -class WXDLLIMPEXP_ADV wxDataViewColumnBase : public wxSettableHeaderColumn -{ -public: - // ctor for the text columns: takes ownership of renderer - wxDataViewColumnBase(wxDataViewRenderer *renderer, - unsigned int model_column) - { - Init(renderer, model_column); - } - - // ctor for the bitmap columns - wxDataViewColumnBase(const wxBitmap& bitmap, - wxDataViewRenderer *renderer, - unsigned int model_column) - : m_bitmap(bitmap) - { - Init(renderer, model_column); - } - - virtual ~wxDataViewColumnBase(); - - // setters: - virtual void SetOwner( wxDataViewCtrl *owner ) - { m_owner = owner; } - - // getters: - unsigned int GetModelColumn() const { return static_cast(m_model_column); } - wxDataViewCtrl *GetOwner() const { return m_owner; } - wxDataViewRenderer* GetRenderer() const { return m_renderer; } - - // implement some of base class pure virtuals (the rest is port-dependent - // and done differently in generic and native versions) - virtual void SetBitmap( const wxBitmap& bitmap ) wxOVERRIDE { m_bitmap = bitmap; } - virtual wxBitmap GetBitmap() const wxOVERRIDE { return m_bitmap; } - -protected: - wxDataViewRenderer *m_renderer; - int m_model_column; - wxBitmap m_bitmap; - wxDataViewCtrl *m_owner; - -private: - // common part of all ctors - void Init(wxDataViewRenderer *renderer, unsigned int model_column); -}; - -// --------------------------------------------------------- -// wxDataViewCtrlBase -// --------------------------------------------------------- - -#define wxDV_SINGLE 0x0000 // for convenience -#define wxDV_MULTIPLE 0x0001 // can select multiple items - -#define wxDV_NO_HEADER 0x0002 // column titles not visible -#define wxDV_HORIZ_RULES 0x0004 // light horizontal rules between rows -#define wxDV_VERT_RULES 0x0008 // light vertical rules between columns - -#define wxDV_ROW_LINES 0x0010 // alternating colour in rows -#define wxDV_VARIABLE_LINE_HEIGHT 0x0020 // variable line height - -class WXDLLIMPEXP_ADV wxDataViewCtrlBase: public wxSystemThemedControl -{ -public: - wxDataViewCtrlBase(); - virtual ~wxDataViewCtrlBase(); - - // model - // ----- - - virtual bool AssociateModel( wxDataViewModel *model ); - wxDataViewModel* GetModel(); - const wxDataViewModel* GetModel() const; - - - // column management - // ----------------- - - wxDataViewColumn *PrependTextColumn( const wxString &label, unsigned int model_column, - wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = -1, - wxAlignment align = wxALIGN_NOT, - int flags = wxDATAVIEW_COL_RESIZABLE ); - wxDataViewColumn *PrependIconTextColumn( const wxString &label, unsigned int model_column, - wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = -1, - wxAlignment align = wxALIGN_NOT, - int flags = wxDATAVIEW_COL_RESIZABLE ); - wxDataViewColumn *PrependToggleColumn( const wxString &label, unsigned int model_column, - wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = wxDVC_TOGGLE_DEFAULT_WIDTH, - wxAlignment align = wxALIGN_CENTER, - int flags = wxDATAVIEW_COL_RESIZABLE ); - wxDataViewColumn *PrependProgressColumn( const wxString &label, unsigned int model_column, - wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = wxDVC_DEFAULT_WIDTH, - wxAlignment align = wxALIGN_CENTER, - int flags = wxDATAVIEW_COL_RESIZABLE ); - wxDataViewColumn *PrependDateColumn( const wxString &label, unsigned int model_column, - wxDataViewCellMode mode = wxDATAVIEW_CELL_ACTIVATABLE, int width = -1, - wxAlignment align = wxALIGN_NOT, - int flags = wxDATAVIEW_COL_RESIZABLE ); - wxDataViewColumn *PrependBitmapColumn( const wxString &label, unsigned int model_column, - wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = -1, - wxAlignment align = wxALIGN_CENTER, - int flags = wxDATAVIEW_COL_RESIZABLE ); - wxDataViewColumn *PrependTextColumn( const wxBitmap &label, unsigned int model_column, - wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = -1, - wxAlignment align = wxALIGN_NOT, - int flags = wxDATAVIEW_COL_RESIZABLE ); - wxDataViewColumn *PrependIconTextColumn( const wxBitmap &label, unsigned int model_column, - wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = -1, - wxAlignment align = wxALIGN_NOT, - int flags = wxDATAVIEW_COL_RESIZABLE ); - wxDataViewColumn *PrependToggleColumn( const wxBitmap &label, unsigned int model_column, - wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = wxDVC_TOGGLE_DEFAULT_WIDTH, - wxAlignment align = wxALIGN_CENTER, - int flags = wxDATAVIEW_COL_RESIZABLE ); - wxDataViewColumn *PrependProgressColumn( const wxBitmap &label, unsigned int model_column, - wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = wxDVC_DEFAULT_WIDTH, - wxAlignment align = wxALIGN_CENTER, - int flags = wxDATAVIEW_COL_RESIZABLE ); - wxDataViewColumn *PrependDateColumn( const wxBitmap &label, unsigned int model_column, - wxDataViewCellMode mode = wxDATAVIEW_CELL_ACTIVATABLE, int width = -1, - wxAlignment align = wxALIGN_NOT, - int flags = wxDATAVIEW_COL_RESIZABLE ); - wxDataViewColumn *PrependBitmapColumn( const wxBitmap &label, unsigned int model_column, - wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = -1, - wxAlignment align = wxALIGN_CENTER, - int flags = wxDATAVIEW_COL_RESIZABLE ); - - wxDataViewColumn *AppendTextColumn( const wxString &label, unsigned int model_column, - wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = -1, - wxAlignment align = wxALIGN_NOT, - int flags = wxDATAVIEW_COL_RESIZABLE ); - wxDataViewColumn *AppendIconTextColumn( const wxString &label, unsigned int model_column, - wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = -1, - wxAlignment align = wxALIGN_NOT, - int flags = wxDATAVIEW_COL_RESIZABLE ); - wxDataViewColumn *AppendToggleColumn( const wxString &label, unsigned int model_column, - wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = wxDVC_TOGGLE_DEFAULT_WIDTH, - wxAlignment align = wxALIGN_CENTER, - int flags = wxDATAVIEW_COL_RESIZABLE ); - wxDataViewColumn *AppendProgressColumn( const wxString &label, unsigned int model_column, - wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = wxDVC_DEFAULT_WIDTH, - wxAlignment align = wxALIGN_CENTER, - int flags = wxDATAVIEW_COL_RESIZABLE ); - wxDataViewColumn *AppendDateColumn( const wxString &label, unsigned int model_column, - wxDataViewCellMode mode = wxDATAVIEW_CELL_ACTIVATABLE, int width = -1, - wxAlignment align = wxALIGN_NOT, - int flags = wxDATAVIEW_COL_RESIZABLE ); - wxDataViewColumn *AppendBitmapColumn( const wxString &label, unsigned int model_column, - wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = -1, - wxAlignment align = wxALIGN_CENTER, - int flags = wxDATAVIEW_COL_RESIZABLE ); - wxDataViewColumn *AppendTextColumn( const wxBitmap &label, unsigned int model_column, - wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = -1, - wxAlignment align = wxALIGN_NOT, - int flags = wxDATAVIEW_COL_RESIZABLE ); - wxDataViewColumn *AppendIconTextColumn( const wxBitmap &label, unsigned int model_column, - wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = -1, - wxAlignment align = wxALIGN_NOT, - int flags = wxDATAVIEW_COL_RESIZABLE ); - wxDataViewColumn *AppendToggleColumn( const wxBitmap &label, unsigned int model_column, - wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = wxDVC_TOGGLE_DEFAULT_WIDTH, - wxAlignment align = wxALIGN_CENTER, - int flags = wxDATAVIEW_COL_RESIZABLE ); - wxDataViewColumn *AppendProgressColumn( const wxBitmap &label, unsigned int model_column, - wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = wxDVC_DEFAULT_WIDTH, - wxAlignment align = wxALIGN_CENTER, - int flags = wxDATAVIEW_COL_RESIZABLE ); - wxDataViewColumn *AppendDateColumn( const wxBitmap &label, unsigned int model_column, - wxDataViewCellMode mode = wxDATAVIEW_CELL_ACTIVATABLE, int width = -1, - wxAlignment align = wxALIGN_NOT, - int flags = wxDATAVIEW_COL_RESIZABLE ); - wxDataViewColumn *AppendBitmapColumn( const wxBitmap &label, unsigned int model_column, - wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = -1, - wxAlignment align = wxALIGN_CENTER, - int flags = wxDATAVIEW_COL_RESIZABLE ); - - virtual bool PrependColumn( wxDataViewColumn *col ); - virtual bool InsertColumn( unsigned int pos, wxDataViewColumn *col ); - virtual bool AppendColumn( wxDataViewColumn *col ); - - virtual unsigned int GetColumnCount() const = 0; - virtual wxDataViewColumn* GetColumn( unsigned int pos ) const = 0; - virtual int GetColumnPosition( const wxDataViewColumn *column ) const = 0; - - virtual bool DeleteColumn( wxDataViewColumn *column ) = 0; - virtual bool ClearColumns() = 0; - - void SetExpanderColumn( wxDataViewColumn *col ) - { m_expander_column = col ; DoSetExpanderColumn(); } - wxDataViewColumn *GetExpanderColumn() const - { return m_expander_column; } - - virtual wxDataViewColumn *GetSortingColumn() const = 0; - virtual wxVector GetSortingColumns() const - { - wxVector columns; - if ( wxDataViewColumn* col = GetSortingColumn() ) - columns.push_back(col); - return columns; - } - - // This must be overridden to return true if the control does allow sorting - // by more than one column, which is not the case by default. - virtual bool AllowMultiColumnSort(bool allow) - { - // We can still return true when disabling multi-column sort. - return !allow; - } - - // This should also be overridden to actually use the specified column for - // sorting if using multiple columns is supported. - virtual void ToggleSortByColumn(int WXUNUSED(column)) { } - - - // items management - // ---------------- - - void SetIndent( int indent ) - { m_indent = indent ; DoSetIndent(); } - int GetIndent() const - { return m_indent; } - - // Current item is the one used by the keyboard navigation, it is the same - // as the (unique) selected item in single selection mode so these - // functions are mostly useful for controls with wxDV_MULTIPLE style. - wxDataViewItem GetCurrentItem() const; - void SetCurrentItem(const wxDataViewItem& item); - - // Currently focused column of the current item or NULL if no column has focus - virtual wxDataViewColumn *GetCurrentColumn() const = 0; - - // Selection: both GetSelection() and GetSelections() can be used for the - // controls both with and without wxDV_MULTIPLE style. For single selection - // controls GetSelections() is not very useful however. And for multi - // selection controls GetSelection() returns an invalid item if more than - // one item is selected. Use GetSelectedItemsCount() or HasSelection() to - // check if any items are selected at all. - virtual int GetSelectedItemsCount() const = 0; - bool HasSelection() const { return GetSelectedItemsCount() != 0; } - wxDataViewItem GetSelection() const; - virtual int GetSelections( wxDataViewItemArray & sel ) const = 0; - virtual void SetSelections( const wxDataViewItemArray & sel ) = 0; - virtual void Select( const wxDataViewItem & item ) = 0; - virtual void Unselect( const wxDataViewItem & item ) = 0; - virtual bool IsSelected( const wxDataViewItem & item ) const = 0; - - virtual void SelectAll() = 0; - virtual void UnselectAll() = 0; - - virtual void Expand( const wxDataViewItem & item ) = 0; - virtual void ExpandAncestors( const wxDataViewItem & item ); - virtual void Collapse( const wxDataViewItem & item ) = 0; - virtual bool IsExpanded( const wxDataViewItem & item ) const = 0; - - virtual void EnsureVisible( const wxDataViewItem & item, - const wxDataViewColumn *column = NULL ) = 0; - virtual void HitTest( const wxPoint & point, wxDataViewItem &item, wxDataViewColumn* &column ) const = 0; - virtual wxRect GetItemRect( const wxDataViewItem & item, const wxDataViewColumn *column = NULL ) const = 0; - - virtual bool SetRowHeight( int WXUNUSED(rowHeight) ) { return false; } - - virtual void EditItem(const wxDataViewItem& item, const wxDataViewColumn *column) = 0; - - // Use EditItem() instead - wxDEPRECATED( void StartEditor(const wxDataViewItem& item, unsigned int column) ); - -#if wxUSE_DRAG_AND_DROP - virtual bool EnableDragSource(const wxDataFormat& WXUNUSED(format)) - { return false; } - virtual bool EnableDropTarget(const wxDataFormat& WXUNUSED(format)) - { return false; } -#endif // wxUSE_DRAG_AND_DROP - - // define control visual attributes - // -------------------------------- - - virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE - { - return GetClassDefaultAttributes(GetWindowVariant()); - } - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL) - { - return wxControl::GetCompositeControlsDefaultAttributes(variant); - } - -protected: - virtual void DoSetExpanderColumn() = 0 ; - virtual void DoSetIndent() = 0; - -private: - // Implementation of the public Set/GetCurrentItem() methods which are only - // called in multi selection case (for single selection controls their - // implementation is trivial and is done in the base class itself). - virtual wxDataViewItem DoGetCurrentItem() const = 0; - virtual void DoSetCurrentItem(const wxDataViewItem& item) = 0; - - wxDataViewModel *m_model; - wxDataViewColumn *m_expander_column; - int m_indent ; - -protected: - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCtrlBase); -}; - -// ---------------------------------------------------------------------------- -// wxDataViewEvent - the event class for the wxDataViewCtrl notifications -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDataViewEvent : public wxNotifyEvent -{ -public: - wxDataViewEvent(wxEventType commandType = wxEVT_NULL, int winid = 0) - : wxNotifyEvent(commandType, winid), - m_item(0), - m_col(-1), - m_model(NULL), - m_value(wxNullVariant), - m_column(NULL), - m_pos(-1,-1), - m_cacheFrom(0), - m_cacheTo(0), - m_editCancelled(false) -#if wxUSE_DRAG_AND_DROP - , m_dataObject(NULL), - m_dataBuffer(NULL), - m_dataSize(0), - m_dragFlags(0), - m_dropEffect(wxDragNone) -#endif - { } - - wxDataViewEvent(const wxDataViewEvent& event) - : wxNotifyEvent(event), - m_item(event.m_item), - m_col(event.m_col), - m_model(event.m_model), - m_value(event.m_value), - m_column(event.m_column), - m_pos(event.m_pos), - m_cacheFrom(event.m_cacheFrom), - m_cacheTo(event.m_cacheTo), - m_editCancelled(event.m_editCancelled) -#if wxUSE_DRAG_AND_DROP - , m_dataObject(event.m_dataObject), - m_dataFormat(event.m_dataFormat), - m_dataBuffer(event.m_dataBuffer), - m_dataSize(event.m_dataSize), - m_dragFlags(event.m_dragFlags), - m_dropEffect(event.m_dropEffect) -#endif - { } - - wxDataViewItem GetItem() const { return m_item; } - void SetItem( const wxDataViewItem &item ) { m_item = item; } - - int GetColumn() const { return m_col; } - void SetColumn( int col ) { m_col = col; } - - wxDataViewModel* GetModel() const { return m_model; } - void SetModel( wxDataViewModel *model ) { m_model = model; } - - const wxVariant &GetValue() const { return m_value; } - void SetValue( const wxVariant &value ) { m_value = value; } - - // for wxEVT_DATAVIEW_ITEM_EDITING_DONE only - bool IsEditCancelled() const { return m_editCancelled; } - void SetEditCanceled(bool editCancelled) { m_editCancelled = editCancelled; } - - // for wxEVT_DATAVIEW_COLUMN_HEADER_CLICKED only - void SetDataViewColumn( wxDataViewColumn *col ) { m_column = col; } - wxDataViewColumn *GetDataViewColumn() const { return m_column; } - - // for wxEVT_DATAVIEW_CONTEXT_MENU only - wxPoint GetPosition() const { return m_pos; } - void SetPosition( int x, int y ) { m_pos.x = x; m_pos.y = y; } - - // For wxEVT_DATAVIEW_CACHE_HINT - int GetCacheFrom() const { return m_cacheFrom; } - int GetCacheTo() const { return m_cacheTo; } - void SetCache(int from, int to) { m_cacheFrom = from; m_cacheTo = to; } - - -#if wxUSE_DRAG_AND_DROP - // For drag operations - void SetDataObject( wxDataObject *obj ) { m_dataObject = obj; } - wxDataObject *GetDataObject() const { return m_dataObject; } - - // For drop operations - void SetDataFormat( const wxDataFormat &format ) { m_dataFormat = format; } - wxDataFormat GetDataFormat() const { return m_dataFormat; } - void SetDataSize( size_t size ) { m_dataSize = size; } - size_t GetDataSize() const { return m_dataSize; } - void SetDataBuffer( void* buf ) { m_dataBuffer = buf;} - void *GetDataBuffer() const { return m_dataBuffer; } - void SetDragFlags( int flags ) { m_dragFlags = flags; } - int GetDragFlags() const { return m_dragFlags; } - void SetDropEffect( wxDragResult effect ) { m_dropEffect = effect; } - wxDragResult GetDropEffect() const { return m_dropEffect; } -#endif // wxUSE_DRAG_AND_DROP - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxDataViewEvent(*this); } - -protected: - wxDataViewItem m_item; - int m_col; - wxDataViewModel *m_model; - wxVariant m_value; - wxDataViewColumn *m_column; - wxPoint m_pos; - int m_cacheFrom; - int m_cacheTo; - bool m_editCancelled; - -#if wxUSE_DRAG_AND_DROP - wxDataObject *m_dataObject; - - wxDataFormat m_dataFormat; - void* m_dataBuffer; - size_t m_dataSize; - - int m_dragFlags; - wxDragResult m_dropEffect; -#endif // wxUSE_DRAG_AND_DROP - -private: - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxDataViewEvent); -}; - -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_SELECTION_CHANGED, wxDataViewEvent ); - -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_ITEM_ACTIVATED, wxDataViewEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_ITEM_COLLAPSED, wxDataViewEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_ITEM_EXPANDED, wxDataViewEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_ITEM_COLLAPSING, wxDataViewEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_ITEM_EXPANDING, wxDataViewEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_ITEM_START_EDITING, wxDataViewEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_ITEM_EDITING_STARTED, wxDataViewEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_ITEM_EDITING_DONE, wxDataViewEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_ITEM_VALUE_CHANGED, wxDataViewEvent ); - -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_ITEM_CONTEXT_MENU, wxDataViewEvent ); - -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_COLUMN_HEADER_CLICK, wxDataViewEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK, wxDataViewEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_COLUMN_SORTED, wxDataViewEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_COLUMN_REORDERED, wxDataViewEvent ); - -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_CACHE_HINT, wxDataViewEvent ); - -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_ITEM_BEGIN_DRAG, wxDataViewEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_ITEM_DROP_POSSIBLE, wxDataViewEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_ITEM_DROP, wxDataViewEvent ); - -typedef void (wxEvtHandler::*wxDataViewEventFunction)(wxDataViewEvent&); - -#define wxDataViewEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxDataViewEventFunction, func) - -#define wx__DECLARE_DATAVIEWEVT(evt, id, fn) \ - wx__DECLARE_EVT1(wxEVT_DATAVIEW_ ## evt, id, wxDataViewEventHandler(fn)) - -#define EVT_DATAVIEW_SELECTION_CHANGED(id, fn) wx__DECLARE_DATAVIEWEVT(SELECTION_CHANGED, id, fn) - -#define EVT_DATAVIEW_ITEM_ACTIVATED(id, fn) wx__DECLARE_DATAVIEWEVT(ITEM_ACTIVATED, id, fn) -#define EVT_DATAVIEW_ITEM_COLLAPSING(id, fn) wx__DECLARE_DATAVIEWEVT(ITEM_COLLAPSING, id, fn) -#define EVT_DATAVIEW_ITEM_COLLAPSED(id, fn) wx__DECLARE_DATAVIEWEVT(ITEM_COLLAPSED, id, fn) -#define EVT_DATAVIEW_ITEM_EXPANDING(id, fn) wx__DECLARE_DATAVIEWEVT(ITEM_EXPANDING, id, fn) -#define EVT_DATAVIEW_ITEM_EXPANDED(id, fn) wx__DECLARE_DATAVIEWEVT(ITEM_EXPANDED, id, fn) -#define EVT_DATAVIEW_ITEM_START_EDITING(id, fn) wx__DECLARE_DATAVIEWEVT(ITEM_START_EDITING, id, fn) -#define EVT_DATAVIEW_ITEM_EDITING_STARTED(id, fn) wx__DECLARE_DATAVIEWEVT(ITEM_EDITING_STARTED, id, fn) -#define EVT_DATAVIEW_ITEM_EDITING_DONE(id, fn) wx__DECLARE_DATAVIEWEVT(ITEM_EDITING_DONE, id, fn) -#define EVT_DATAVIEW_ITEM_VALUE_CHANGED(id, fn) wx__DECLARE_DATAVIEWEVT(ITEM_VALUE_CHANGED, id, fn) - -#define EVT_DATAVIEW_ITEM_CONTEXT_MENU(id, fn) wx__DECLARE_DATAVIEWEVT(ITEM_CONTEXT_MENU, id, fn) - -#define EVT_DATAVIEW_COLUMN_HEADER_CLICK(id, fn) wx__DECLARE_DATAVIEWEVT(COLUMN_HEADER_CLICK, id, fn) -#define EVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK(id, fn) wx__DECLARE_DATAVIEWEVT(COLUMN_HEADER_RIGHT_CLICK, id, fn) -#define EVT_DATAVIEW_COLUMN_SORTED(id, fn) wx__DECLARE_DATAVIEWEVT(COLUMN_SORTED, id, fn) -#define EVT_DATAVIEW_COLUMN_REORDERED(id, fn) wx__DECLARE_DATAVIEWEVT(COLUMN_REORDERED, id, fn) -#define EVT_DATAVIEW_CACHE_HINT(id, fn) wx__DECLARE_DATAVIEWEVT(CACHE_HINT, id, fn) - -#define EVT_DATAVIEW_ITEM_BEGIN_DRAG(id, fn) wx__DECLARE_DATAVIEWEVT(ITEM_BEGIN_DRAG, id, fn) -#define EVT_DATAVIEW_ITEM_DROP_POSSIBLE(id, fn) wx__DECLARE_DATAVIEWEVT(ITEM_DROP_POSSIBLE, id, fn) -#define EVT_DATAVIEW_ITEM_DROP(id, fn) wx__DECLARE_DATAVIEWEVT(ITEM_DROP, id, fn) - -// Old and not documented synonym, don't use. -#define EVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICKED(id, fn) EVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK(id, fn) - -#ifdef wxHAS_GENERIC_DATAVIEWCTRL - #include "wx/generic/dataview.h" -#elif defined(__WXGTK20__) - #include "wx/gtk/dataview.h" -#elif defined(__WXMAC__) - #include "wx/osx/dataview.h" -#elif defined(__WXQT__) - #include "wx/qt/dataview.h" -#else - #error "unknown native wxDataViewCtrl implementation" -#endif - -//----------------------------------------------------------------------------- -// wxDataViewListStore -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDataViewListStoreLine -{ -public: - wxDataViewListStoreLine( wxUIntPtr data = 0 ) - { - m_data = data; - } - - void SetData( wxUIntPtr data ) - { m_data = data; } - wxUIntPtr GetData() const - { return m_data; } - - wxVector m_values; - -private: - wxUIntPtr m_data; -}; - - -class WXDLLIMPEXP_ADV wxDataViewListStore: public wxDataViewIndexListModel -{ -public: - wxDataViewListStore(); - ~wxDataViewListStore(); - - void PrependColumn( const wxString &varianttype ); - void InsertColumn( unsigned int pos, const wxString &varianttype ); - void AppendColumn( const wxString &varianttype ); - - void AppendItem( const wxVector &values, wxUIntPtr data = 0 ); - void PrependItem( const wxVector &values, wxUIntPtr data = 0 ); - void InsertItem( unsigned int row, const wxVector &values, wxUIntPtr data = 0 ); - void DeleteItem( unsigned int pos ); - void DeleteAllItems(); - void ClearColumns(); - - unsigned int GetItemCount() const; - - void SetItemData( const wxDataViewItem& item, wxUIntPtr data ); - wxUIntPtr GetItemData( const wxDataViewItem& item ) const; - - // override base virtuals - - virtual unsigned int GetColumnCount() const wxOVERRIDE; - - virtual wxString GetColumnType( unsigned int col ) const wxOVERRIDE; - - virtual void GetValueByRow( wxVariant &value, - unsigned int row, unsigned int col ) const wxOVERRIDE; - - virtual bool SetValueByRow( const wxVariant &value, - unsigned int row, unsigned int col ) wxOVERRIDE; - - -public: - wxVector m_data; - wxArrayString m_cols; -}; - -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDataViewListCtrl: public wxDataViewCtrl -{ -public: - wxDataViewListCtrl(); - wxDataViewListCtrl( wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = wxDV_ROW_LINES, - const wxValidator& validator = wxDefaultValidator ); - ~wxDataViewListCtrl(); - - bool Create( wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = wxDV_ROW_LINES, - const wxValidator& validator = wxDefaultValidator ); - - wxDataViewListStore *GetStore() - { return (wxDataViewListStore*) GetModel(); } - const wxDataViewListStore *GetStore() const - { return (const wxDataViewListStore*) GetModel(); } - - int ItemToRow(const wxDataViewItem &item) const - { return item.IsOk() ? (int)GetStore()->GetRow(item) : wxNOT_FOUND; } - wxDataViewItem RowToItem(int row) const - { return row == wxNOT_FOUND ? wxDataViewItem() : GetStore()->GetItem(row); } - - int GetSelectedRow() const - { return ItemToRow(GetSelection()); } - void SelectRow(unsigned row) - { Select(RowToItem(row)); } - void UnselectRow(unsigned row) - { Unselect(RowToItem(row)); } - bool IsRowSelected(unsigned row) const - { return IsSelected(RowToItem(row)); } - - bool AppendColumn( wxDataViewColumn *column, const wxString &varianttype ); - bool PrependColumn( wxDataViewColumn *column, const wxString &varianttype ); - bool InsertColumn( unsigned int pos, wxDataViewColumn *column, const wxString &varianttype ); - - // overridden from base class - virtual bool PrependColumn( wxDataViewColumn *col ) wxOVERRIDE; - virtual bool InsertColumn( unsigned int pos, wxDataViewColumn *col ) wxOVERRIDE; - virtual bool AppendColumn( wxDataViewColumn *col ) wxOVERRIDE; - virtual bool ClearColumns() wxOVERRIDE; - - wxDataViewColumn *AppendTextColumn( const wxString &label, - wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, - int width = -1, wxAlignment align = wxALIGN_LEFT, int flags = wxDATAVIEW_COL_RESIZABLE ); - wxDataViewColumn *AppendToggleColumn( const wxString &label, - wxDataViewCellMode mode = wxDATAVIEW_CELL_ACTIVATABLE, - int width = -1, wxAlignment align = wxALIGN_LEFT, int flags = wxDATAVIEW_COL_RESIZABLE ); - wxDataViewColumn *AppendProgressColumn( const wxString &label, - wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, - int width = -1, wxAlignment align = wxALIGN_LEFT, int flags = wxDATAVIEW_COL_RESIZABLE ); - wxDataViewColumn *AppendIconTextColumn( const wxString &label, - wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, - int width = -1, wxAlignment align = wxALIGN_LEFT, int flags = wxDATAVIEW_COL_RESIZABLE ); - - void AppendItem( const wxVector &values, wxUIntPtr data = 0 ) - { GetStore()->AppendItem( values, data ); } - void PrependItem( const wxVector &values, wxUIntPtr data = 0 ) - { GetStore()->PrependItem( values, data ); } - void InsertItem( unsigned int row, const wxVector &values, wxUIntPtr data = 0 ) - { GetStore()->InsertItem( row, values, data ); } - void DeleteItem( unsigned row ) - { GetStore()->DeleteItem( row ); } - void DeleteAllItems() - { GetStore()->DeleteAllItems(); } - - void SetValue( const wxVariant &value, unsigned int row, unsigned int col ) - { GetStore()->SetValueByRow( value, row, col ); - GetStore()->RowValueChanged( row, col); } - void GetValue( wxVariant &value, unsigned int row, unsigned int col ) - { GetStore()->GetValueByRow( value, row, col ); } - - void SetTextValue( const wxString &value, unsigned int row, unsigned int col ) - { GetStore()->SetValueByRow( value, row, col ); - GetStore()->RowValueChanged( row, col); } - wxString GetTextValue( unsigned int row, unsigned int col ) const - { wxVariant value; GetStore()->GetValueByRow( value, row, col ); return value.GetString(); } - - void SetToggleValue( bool value, unsigned int row, unsigned int col ) - { GetStore()->SetValueByRow( value, row, col ); - GetStore()->RowValueChanged( row, col); } - bool GetToggleValue( unsigned int row, unsigned int col ) const - { wxVariant value; GetStore()->GetValueByRow( value, row, col ); return value.GetBool(); } - - void SetItemData( const wxDataViewItem& item, wxUIntPtr data ) - { GetStore()->SetItemData( item, data ); } - wxUIntPtr GetItemData( const wxDataViewItem& item ) const - { return GetStore()->GetItemData( item ); } - - int GetItemCount() const - { return GetStore()->GetItemCount(); } - - void OnSize( wxSizeEvent &event ); - -private: - wxDECLARE_EVENT_TABLE(); - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxDataViewListCtrl); -}; - -//----------------------------------------------------------------------------- -// wxDataViewTreeStore -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDataViewTreeStoreNode -{ -public: - wxDataViewTreeStoreNode( wxDataViewTreeStoreNode *parent, - const wxString &text, const wxIcon &icon = wxNullIcon, wxClientData *data = NULL ); - virtual ~wxDataViewTreeStoreNode(); - - void SetText( const wxString &text ) - { m_text = text; } - wxString GetText() const - { return m_text; } - void SetIcon( const wxIcon &icon ) - { m_icon = icon; } - const wxIcon &GetIcon() const - { return m_icon; } - void SetData( wxClientData *data ) - { if (m_data) delete m_data; m_data = data; } - wxClientData *GetData() const - { return m_data; } - - wxDataViewItem GetItem() const - { return wxDataViewItem( (void*) this ); } - - virtual bool IsContainer() - { return false; } - - wxDataViewTreeStoreNode *GetParent() - { return m_parent; } - -private: - wxDataViewTreeStoreNode *m_parent; - wxString m_text; - wxIcon m_icon; - wxClientData *m_data; -}; - -WX_DECLARE_LIST_WITH_DECL(wxDataViewTreeStoreNode, wxDataViewTreeStoreNodeList, - class WXDLLIMPEXP_ADV); - -class WXDLLIMPEXP_ADV wxDataViewTreeStoreContainerNode: public wxDataViewTreeStoreNode -{ -public: - wxDataViewTreeStoreContainerNode( wxDataViewTreeStoreNode *parent, - const wxString &text, const wxIcon &icon = wxNullIcon, const wxIcon &expanded = wxNullIcon, - wxClientData *data = NULL ); - virtual ~wxDataViewTreeStoreContainerNode(); - - const wxDataViewTreeStoreNodeList &GetChildren() const - { return m_children; } - wxDataViewTreeStoreNodeList &GetChildren() - { return m_children; } - - void SetExpandedIcon( const wxIcon &icon ) - { m_iconExpanded = icon; } - const wxIcon &GetExpandedIcon() const - { return m_iconExpanded; } - - void SetExpanded( bool expanded = true ) - { m_isExpanded = expanded; } - bool IsExpanded() const - { return m_isExpanded; } - - virtual bool IsContainer() wxOVERRIDE - { return true; } - -private: - wxDataViewTreeStoreNodeList m_children; - wxIcon m_iconExpanded; - bool m_isExpanded; -}; - -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDataViewTreeStore: public wxDataViewModel -{ -public: - wxDataViewTreeStore(); - ~wxDataViewTreeStore(); - - wxDataViewItem AppendItem( const wxDataViewItem& parent, - const wxString &text, const wxIcon &icon = wxNullIcon, wxClientData *data = NULL ); - wxDataViewItem PrependItem( const wxDataViewItem& parent, - const wxString &text, const wxIcon &icon = wxNullIcon, wxClientData *data = NULL ); - wxDataViewItem InsertItem( const wxDataViewItem& parent, const wxDataViewItem& previous, - const wxString &text, const wxIcon &icon = wxNullIcon, wxClientData *data = NULL ); - - wxDataViewItem PrependContainer( const wxDataViewItem& parent, - const wxString &text, const wxIcon &icon = wxNullIcon, const wxIcon &expanded = wxNullIcon, - wxClientData *data = NULL ); - wxDataViewItem AppendContainer( const wxDataViewItem& parent, - const wxString &text, const wxIcon &icon = wxNullIcon, const wxIcon &expanded = wxNullIcon, - wxClientData *data = NULL ); - wxDataViewItem InsertContainer( const wxDataViewItem& parent, const wxDataViewItem& previous, - const wxString &text, const wxIcon &icon = wxNullIcon, const wxIcon &expanded = wxNullIcon, - wxClientData *data = NULL ); - - wxDataViewItem GetNthChild( const wxDataViewItem& parent, unsigned int pos ) const; - int GetChildCount( const wxDataViewItem& parent ) const; - - void SetItemText( const wxDataViewItem& item, const wxString &text ); - wxString GetItemText( const wxDataViewItem& item ) const; - void SetItemIcon( const wxDataViewItem& item, const wxIcon &icon ); - const wxIcon &GetItemIcon( const wxDataViewItem& item ) const; - void SetItemExpandedIcon( const wxDataViewItem& item, const wxIcon &icon ); - const wxIcon &GetItemExpandedIcon( const wxDataViewItem& item ) const; - void SetItemData( const wxDataViewItem& item, wxClientData *data ); - wxClientData *GetItemData( const wxDataViewItem& item ) const; - - void DeleteItem( const wxDataViewItem& item ); - void DeleteChildren( const wxDataViewItem& item ); - void DeleteAllItems(); - - // implement base methods - - virtual void GetValue( wxVariant &variant, - const wxDataViewItem &item, unsigned int col ) const wxOVERRIDE; - virtual bool SetValue( const wxVariant &variant, - const wxDataViewItem &item, unsigned int col ) wxOVERRIDE; - virtual wxDataViewItem GetParent( const wxDataViewItem &item ) const wxOVERRIDE; - virtual bool IsContainer( const wxDataViewItem &item ) const wxOVERRIDE; - virtual unsigned int GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const wxOVERRIDE; - - virtual int Compare( const wxDataViewItem &item1, const wxDataViewItem &item2, - unsigned int column, bool ascending ) const wxOVERRIDE; - - virtual bool HasDefaultCompare() const wxOVERRIDE - { return true; } - virtual unsigned int GetColumnCount() const wxOVERRIDE - { return 1; } - virtual wxString GetColumnType( unsigned int WXUNUSED(col) ) const wxOVERRIDE - { return wxT("wxDataViewIconText"); } - - wxDataViewTreeStoreNode *FindNode( const wxDataViewItem &item ) const; - wxDataViewTreeStoreContainerNode *FindContainerNode( const wxDataViewItem &item ) const; - wxDataViewTreeStoreNode *GetRoot() const { return m_root; } - -public: - wxDataViewTreeStoreNode *m_root; -}; - -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDataViewTreeCtrl: public wxDataViewCtrl, - public wxWithImages -{ -public: - wxDataViewTreeCtrl() { } - wxDataViewTreeCtrl(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDV_NO_HEADER | wxDV_ROW_LINES, - const wxValidator& validator = wxDefaultValidator) - { - Create(parent, id, pos, size, style, validator); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDV_NO_HEADER | wxDV_ROW_LINES, - const wxValidator& validator = wxDefaultValidator); - - wxDataViewTreeStore *GetStore() - { return (wxDataViewTreeStore*) GetModel(); } - const wxDataViewTreeStore *GetStore() const - { return (const wxDataViewTreeStore*) GetModel(); } - - bool IsContainer( const wxDataViewItem& item ) const - { return GetStore()->IsContainer(item); } - - wxDataViewItem AppendItem( const wxDataViewItem& parent, - const wxString &text, int icon = NO_IMAGE, wxClientData *data = NULL ); - wxDataViewItem PrependItem( const wxDataViewItem& parent, - const wxString &text, int icon = NO_IMAGE, wxClientData *data = NULL ); - wxDataViewItem InsertItem( const wxDataViewItem& parent, const wxDataViewItem& previous, - const wxString &text, int icon = NO_IMAGE, wxClientData *data = NULL ); - - wxDataViewItem PrependContainer( const wxDataViewItem& parent, - const wxString &text, int icon = NO_IMAGE, int expanded = NO_IMAGE, - wxClientData *data = NULL ); - wxDataViewItem AppendContainer( const wxDataViewItem& parent, - const wxString &text, int icon = NO_IMAGE, int expanded = NO_IMAGE, - wxClientData *data = NULL ); - wxDataViewItem InsertContainer( const wxDataViewItem& parent, const wxDataViewItem& previous, - const wxString &text, int icon = NO_IMAGE, int expanded = NO_IMAGE, - wxClientData *data = NULL ); - - wxDataViewItem GetNthChild( const wxDataViewItem& parent, unsigned int pos ) const - { return GetStore()->GetNthChild(parent, pos); } - int GetChildCount( const wxDataViewItem& parent ) const - { return GetStore()->GetChildCount(parent); } - - void SetItemText( const wxDataViewItem& item, const wxString &text ); - wxString GetItemText( const wxDataViewItem& item ) const - { return GetStore()->GetItemText(item); } - void SetItemIcon( const wxDataViewItem& item, const wxIcon &icon ); - const wxIcon &GetItemIcon( const wxDataViewItem& item ) const - { return GetStore()->GetItemIcon(item); } - void SetItemExpandedIcon( const wxDataViewItem& item, const wxIcon &icon ); - const wxIcon &GetItemExpandedIcon( const wxDataViewItem& item ) const - { return GetStore()->GetItemExpandedIcon(item); } - void SetItemData( const wxDataViewItem& item, wxClientData *data ) - { GetStore()->SetItemData(item,data); } - wxClientData *GetItemData( const wxDataViewItem& item ) const - { return GetStore()->GetItemData(item); } - - void DeleteItem( const wxDataViewItem& item ); - void DeleteChildren( const wxDataViewItem& item ); - void DeleteAllItems(); - - void OnExpanded( wxDataViewEvent &event ); - void OnCollapsed( wxDataViewEvent &event ); - void OnSize( wxSizeEvent &event ); - -private: - wxDECLARE_EVENT_TABLE(); - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxDataViewTreeCtrl); -}; - -// old wxEVT_COMMAND_* constants -#define wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED wxEVT_DATAVIEW_SELECTION_CHANGED -#define wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED wxEVT_DATAVIEW_ITEM_ACTIVATED -#define wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED wxEVT_DATAVIEW_ITEM_COLLAPSED -#define wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED wxEVT_DATAVIEW_ITEM_EXPANDED -#define wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING wxEVT_DATAVIEW_ITEM_COLLAPSING -#define wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING wxEVT_DATAVIEW_ITEM_EXPANDING -#define wxEVT_COMMAND_DATAVIEW_ITEM_START_EDITING wxEVT_DATAVIEW_ITEM_START_EDITING -#define wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED wxEVT_DATAVIEW_ITEM_EDITING_STARTED -#define wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE wxEVT_DATAVIEW_ITEM_EDITING_DONE -#define wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED wxEVT_DATAVIEW_ITEM_VALUE_CHANGED -#define wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU wxEVT_DATAVIEW_ITEM_CONTEXT_MENU -#define wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK wxEVT_DATAVIEW_COLUMN_HEADER_CLICK -#define wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK wxEVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK -#define wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED wxEVT_DATAVIEW_COLUMN_SORTED -#define wxEVT_COMMAND_DATAVIEW_COLUMN_REORDERED wxEVT_DATAVIEW_COLUMN_REORDERED -#define wxEVT_COMMAND_DATAVIEW_CACHE_HINT wxEVT_DATAVIEW_CACHE_HINT -#define wxEVT_COMMAND_DATAVIEW_ITEM_BEGIN_DRAG wxEVT_DATAVIEW_ITEM_BEGIN_DRAG -#define wxEVT_COMMAND_DATAVIEW_ITEM_DROP_POSSIBLE wxEVT_DATAVIEW_ITEM_DROP_POSSIBLE -#define wxEVT_COMMAND_DATAVIEW_ITEM_DROP wxEVT_DATAVIEW_ITEM_DROP - -#endif // wxUSE_DATAVIEWCTRL - -#endif - // _WX_DATAVIEW_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/datectrl.h b/Externals/wxWidgets3/include/wx/datectrl.h deleted file mode 100644 index a3c236781a..0000000000 --- a/Externals/wxWidgets3/include/wx/datectrl.h +++ /dev/null @@ -1,113 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/datectrl.h -// Purpose: implements wxDatePickerCtrl -// Author: Vadim Zeitlin -// Modified by: -// Created: 2005-01-09 -// Copyright: (c) 2005 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DATECTRL_H_ -#define _WX_DATECTRL_H_ - -#include "wx/defs.h" - -#if wxUSE_DATEPICKCTRL - -#include "wx/datetimectrl.h" // the base class - -#define wxDatePickerCtrlNameStr wxT("datectrl") - -// wxDatePickerCtrl styles -enum -{ - // default style on this platform, either wxDP_SPIN or wxDP_DROPDOWN - wxDP_DEFAULT = 0, - - // a spin control-like date picker (not supported in generic version) - wxDP_SPIN = 1, - - // a combobox-like date picker (not supported in mac version) - wxDP_DROPDOWN = 2, - - // always show century in the default date display (otherwise it depends on - // the system date format which may include the century or not) - wxDP_SHOWCENTURY = 4, - - // allow not having any valid date in the control (by default it always has - // some date, today initially if no valid date specified in ctor) - wxDP_ALLOWNONE = 8 -}; - -// ---------------------------------------------------------------------------- -// wxDatePickerCtrl: allow the user to enter the date -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDatePickerCtrlBase : public wxDateTimePickerCtrl -{ -public: - /* - The derived classes should implement ctor and Create() method with the - following signature: - - bool Create(wxWindow *parent, - wxWindowID id, - const wxDateTime& dt = wxDefaultDateTime, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDP_DEFAULT | wxDP_SHOWCENTURY, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxDatePickerCtrlNameStr); - */ - - /* - We inherit the methods to set/get the date from the base class. - - virtual void SetValue(const wxDateTime& dt) = 0; - virtual wxDateTime GetValue() const = 0; - */ - - // And add methods to set/get the allowed valid range for the dates. If - // either/both of them are invalid, there is no corresponding limit and if - // neither is set, GetRange() returns false. - virtual void SetRange(const wxDateTime& dt1, const wxDateTime& dt2) = 0; - virtual bool GetRange(wxDateTime *dt1, wxDateTime *dt2) const = 0; -}; - -#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) - #include "wx/msw/datectrl.h" - - #define wxHAS_NATIVE_DATEPICKCTRL -#elif defined(__WXOSX_COCOA__) && !defined(__WXUNIVERSAL__) - #include "wx/osx/datectrl.h" - - #define wxHAS_NATIVE_DATEPICKCTRL -#else - #include "wx/generic/datectrl.h" - - class WXDLLIMPEXP_ADV wxDatePickerCtrl : public wxDatePickerCtrlGeneric - { - public: - wxDatePickerCtrl() { } - wxDatePickerCtrl(wxWindow *parent, - wxWindowID id, - const wxDateTime& date = wxDefaultDateTime, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDP_DEFAULT | wxDP_SHOWCENTURY, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxDatePickerCtrlNameStr) - : wxDatePickerCtrlGeneric(parent, id, date, pos, size, style, validator, name) - { - } - - private: - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDatePickerCtrl); - }; -#endif - -#endif // wxUSE_DATEPICKCTRL - -#endif // _WX_DATECTRL_H_ - diff --git a/Externals/wxWidgets3/include/wx/dateevt.h b/Externals/wxWidgets3/include/wx/dateevt.h deleted file mode 100644 index 2032d89a71..0000000000 --- a/Externals/wxWidgets3/include/wx/dateevt.h +++ /dev/null @@ -1,64 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/dateevt.h -// Purpose: declares wxDateEvent class -// Author: Vadim Zeitlin -// Modified by: -// Created: 2005-01-10 -// Copyright: (c) 2005 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DATEEVT_H_ -#define _WX_DATEEVT_H_ - -#include "wx/event.h" -#include "wx/datetime.h" -#include "wx/window.h" - -// ---------------------------------------------------------------------------- -// wxDateEvent: used by wxCalendarCtrl, wxDatePickerCtrl and wxTimePickerCtrl. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDateEvent : public wxCommandEvent -{ -public: - wxDateEvent() { } - wxDateEvent(wxWindow *win, const wxDateTime& dt, wxEventType type) - : wxCommandEvent(type, win->GetId()), - m_date(dt) - { - SetEventObject(win); - } - - const wxDateTime& GetDate() const { return m_date; } - void SetDate(const wxDateTime &date) { m_date = date; } - - // default copy ctor, assignment operator and dtor are ok - virtual wxEvent *Clone() const wxOVERRIDE { return new wxDateEvent(*this); } - -private: - wxDateTime m_date; - - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxDateEvent); -}; - -// ---------------------------------------------------------------------------- -// event types and macros for handling them -// ---------------------------------------------------------------------------- - -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_ADV, wxEVT_DATE_CHANGED, wxDateEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_ADV, wxEVT_TIME_CHANGED, wxDateEvent); - -typedef void (wxEvtHandler::*wxDateEventFunction)(wxDateEvent&); - -#define wxDateEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxDateEventFunction, func) - -#define EVT_DATE_CHANGED(id, fn) \ - wx__DECLARE_EVT1(wxEVT_DATE_CHANGED, id, wxDateEventHandler(fn)) - -#define EVT_TIME_CHANGED(id, fn) \ - wx__DECLARE_EVT1(wxEVT_TIME_CHANGED, id, wxDateEventHandler(fn)) - -#endif // _WX_DATEEVT_H_ - diff --git a/Externals/wxWidgets3/include/wx/datetime.h b/Externals/wxWidgets3/include/wx/datetime.h deleted file mode 100644 index d35667246f..0000000000 --- a/Externals/wxWidgets3/include/wx/datetime.h +++ /dev/null @@ -1,2163 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/datetime.h -// Purpose: declarations of time/date related classes (wxDateTime, -// wxTimeSpan) -// Author: Vadim Zeitlin -// Modified by: -// Created: 10.02.99 -// Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DATETIME_H -#define _WX_DATETIME_H - -#include "wx/defs.h" - -#if wxUSE_DATETIME - -#include - -#include // for INT_MIN - -#include "wx/longlong.h" -#include "wx/anystr.h" - -class WXDLLIMPEXP_FWD_BASE wxDateTime; -class WXDLLIMPEXP_FWD_BASE wxTimeSpan; -class WXDLLIMPEXP_FWD_BASE wxDateSpan; -#ifdef __WINDOWS__ -struct _SYSTEMTIME; -#endif - -#include "wx/dynarray.h" - -// not all c-runtimes are based on 1/1/1970 being (time_t) 0 -// set this to the corresponding value in seconds 1/1/1970 has on your -// systems c-runtime - -#define WX_TIME_BASE_OFFSET 0 - -/* - * TODO - * - * + 1. Time zones with minutes (make TimeZone a class) - * ? 2. getdate() function like under Solaris - * + 3. text conversion for wxDateSpan - * + 4. pluggable modules for the workdays calculations - * 5. wxDateTimeHolidayAuthority for Easter and other christian feasts - */ - -/* - The three (main) classes declared in this header represent: - - 1. An absolute moment in the time (wxDateTime) - 2. A difference between two moments in the time, positive or negative - (wxTimeSpan) - 3. A logical difference between two dates expressed in - years/months/weeks/days (wxDateSpan) - - The following arithmetic operations are permitted (all others are not): - - addition - -------- - - wxDateTime + wxTimeSpan = wxDateTime - wxDateTime + wxDateSpan = wxDateTime - wxTimeSpan + wxTimeSpan = wxTimeSpan - wxDateSpan + wxDateSpan = wxDateSpan - - subtraction - ------------ - wxDateTime - wxDateTime = wxTimeSpan - wxDateTime - wxTimeSpan = wxDateTime - wxDateTime - wxDateSpan = wxDateTime - wxTimeSpan - wxTimeSpan = wxTimeSpan - wxDateSpan - wxDateSpan = wxDateSpan - - multiplication - -------------- - wxTimeSpan * number = wxTimeSpan - number * wxTimeSpan = wxTimeSpan - wxDateSpan * number = wxDateSpan - number * wxDateSpan = wxDateSpan - - unitary minus - ------------- - -wxTimeSpan = wxTimeSpan - -wxDateSpan = wxDateSpan - - For each binary operation OP (+, -, *) we have the following operatorOP=() as - a method and the method with a symbolic name OPER (Add, Subtract, Multiply) - as a synonym for it and another const method with the same name which returns - the changed copy of the object and operatorOP() as a global function which is - implemented in terms of the const version of OPEN. For the unary - we have - operator-() as a method, Neg() as synonym for it and Negate() which returns - the copy of the object with the changed sign. -*/ - -// an invalid/default date time object which may be used as the default -// argument for arguments of type wxDateTime; it is also returned by all -// functions returning wxDateTime on failure (this is why it is also called -// wxInvalidDateTime) -class WXDLLIMPEXP_FWD_BASE wxDateTime; - -extern WXDLLIMPEXP_DATA_BASE(const char) wxDefaultDateTimeFormat[]; -extern WXDLLIMPEXP_DATA_BASE(const char) wxDefaultTimeSpanFormat[]; -extern WXDLLIMPEXP_DATA_BASE(const wxDateTime) wxDefaultDateTime; - -#define wxInvalidDateTime wxDefaultDateTime - - -// ---------------------------------------------------------------------------- -// conditional compilation -// ---------------------------------------------------------------------------- - -// if configure detected strftime(), we have it too -#ifdef HAVE_STRFTIME - #define wxHAS_STRFTIME -// suppose everyone else has strftime -#else - #define wxHAS_STRFTIME -#endif - -// ---------------------------------------------------------------------------- -// wxDateTime represents an absolute moment in the time -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxDateTime -{ -public: - // types - // ------------------------------------------------------------------------ - - // a small unsigned integer type for storing things like minutes, - // seconds &c. It should be at least short (i.e. not char) to contain - // the number of milliseconds - it may also be 'int' because there is - // no size penalty associated with it in our code, we don't store any - // data in this format - typedef unsigned short wxDateTime_t; - - // constants - // ------------------------------------------------------------------------ - - // the timezones - enum TZ - { - // the time in the current time zone - Local, - - // zones from GMT (= Greenwich Mean Time): they're guaranteed to be - // consequent numbers, so writing something like `GMT0 + offset' is - // safe if abs(offset) <= 12 - - // underscore stands for minus - GMT_12, GMT_11, GMT_10, GMT_9, GMT_8, GMT_7, - GMT_6, GMT_5, GMT_4, GMT_3, GMT_2, GMT_1, - GMT0, - GMT1, GMT2, GMT3, GMT4, GMT5, GMT6, - GMT7, GMT8, GMT9, GMT10, GMT11, GMT12, GMT13, - // Note that GMT12 and GMT_12 are not the same: there is a difference - // of exactly one day between them - - // some symbolic names for TZ - - // Europe - WET = GMT0, // Western Europe Time - WEST = GMT1, // Western Europe Summer Time - CET = GMT1, // Central Europe Time - CEST = GMT2, // Central Europe Summer Time - EET = GMT2, // Eastern Europe Time - EEST = GMT3, // Eastern Europe Summer Time - MSK = GMT3, // Moscow Time - MSD = GMT4, // Moscow Summer Time - - // US and Canada - AST = GMT_4, // Atlantic Standard Time - ADT = GMT_3, // Atlantic Daylight Time - EST = GMT_5, // Eastern Standard Time - EDT = GMT_4, // Eastern Daylight Saving Time - CST = GMT_6, // Central Standard Time - CDT = GMT_5, // Central Daylight Saving Time - MST = GMT_7, // Mountain Standard Time - MDT = GMT_6, // Mountain Daylight Saving Time - PST = GMT_8, // Pacific Standard Time - PDT = GMT_7, // Pacific Daylight Saving Time - HST = GMT_10, // Hawaiian Standard Time - AKST = GMT_9, // Alaska Standard Time - AKDT = GMT_8, // Alaska Daylight Saving Time - - // Australia - - A_WST = GMT8, // Western Standard Time - A_CST = GMT13 + 1, // Central Standard Time (+9.5) - A_EST = GMT10, // Eastern Standard Time - A_ESST = GMT11, // Eastern Summer Time - - // New Zealand - NZST = GMT12, // Standard Time - NZDT = GMT13, // Daylight Saving Time - - // TODO add more symbolic timezone names here - - // Universal Coordinated Time = the new and politically correct name - // for GMT - UTC = GMT0 - }; - - // the calendar systems we know about: notice that it's valid (for - // this classes purpose anyhow) to work with any of these calendars - // even with the dates before the historical appearance of the - // calendar - enum Calendar - { - Gregorian, // current calendar - Julian // calendar in use since -45 until the 1582 (or later) - - // TODO Hebrew, Chinese, Maya, ... (just kidding) (or then may be not?) - }; - - // the country parameter is used so far for calculating the start and - // the end of DST period and for deciding whether the date is a work - // day or not - // - // TODO move this to intl.h - - enum Country - { - Country_Unknown, // no special information for this country - Country_Default, // set the default country with SetCountry() method - // or use the default country with any other - - // TODO add more countries (for this we must know about DST and/or - // holidays for this country) - - // Western European countries: we assume that they all follow the same - // DST rules (true or false?) - Country_WesternEurope_Start, - Country_EEC = Country_WesternEurope_Start, - France, - Germany, - UK, - Country_WesternEurope_End = UK, - - Russia, - USA - }; - // symbolic names for the months - enum Month - { - Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec, Inv_Month - }; - - // symbolic names for the weekdays - enum WeekDay - { - Sun, Mon, Tue, Wed, Thu, Fri, Sat, Inv_WeekDay - }; - - // invalid value for the year - enum Year - { - Inv_Year = SHRT_MIN // should hold in wxDateTime_t - }; - - // flags for GetWeekDayName and GetMonthName - enum NameFlags - { - Name_Full = 0x01, // return full name - Name_Abbr = 0x02 // return abbreviated name - }; - - // flags for GetWeekOfYear and GetWeekOfMonth - enum WeekFlags - { - Default_First, // Sunday_First for US, Monday_First for the rest - Monday_First, // week starts with a Monday - Sunday_First // week starts with a Sunday - }; - - // helper classes - // ------------------------------------------------------------------------ - - // a class representing a time zone: basically, this is just an offset - // (in seconds) from GMT - class WXDLLIMPEXP_BASE TimeZone - { - public: - TimeZone(TZ tz); - - // create time zone object with the given offset - TimeZone(long offset = 0) { m_offset = offset; } - - static TimeZone Make(long offset) - { - TimeZone tz; - tz.m_offset = offset; - return tz; - } - - long GetOffset() const { return m_offset; } - - private: - // offset for this timezone from GMT in seconds - long m_offset; - }; - - // standard struct tm is limited to the years from 1900 (because - // tm_year field is the offset from 1900), so we use our own struct - // instead to represent broken down time - // - // NB: this struct should always be kept normalized (i.e. mon should - // be < 12, 1 <= day <= 31 &c), so use AddMonths(), AddDays() - // instead of modifying the member fields directly! - struct WXDLLIMPEXP_BASE Tm - { - wxDateTime_t msec, sec, min, hour, - mday, // Day of the month in 1..31 range. - yday; // Day of the year in 0..365 range. - Month mon; - int year; - - // default ctor inits the object to an invalid value - Tm(); - - // ctor from struct tm and the timezone - Tm(const struct tm& tm, const TimeZone& tz); - - // check that the given date/time is valid (in Gregorian calendar) - bool IsValid() const; - - // get the week day - WeekDay GetWeekDay() // not const because wday may be changed - { - if ( wday == Inv_WeekDay ) - ComputeWeekDay(); - - return (WeekDay)wday; - } - - // add the given number of months to the date keeping it normalized - void AddMonths(int monDiff); - - // add the given number of months to the date keeping it normalized - void AddDays(int dayDiff); - - private: - // compute the weekday from other fields - void ComputeWeekDay(); - - // the timezone we correspond to - TimeZone m_tz; - - // This value can only be accessed via GetWeekDay() and not directly - // because it's not always computed when creating this object and may - // need to be calculated on demand. - wxDateTime_t wday; - }; - - // static methods - // ------------------------------------------------------------------------ - - // set the current country - static void SetCountry(Country country); - // get the current country - static Country GetCountry(); - - // return true if the country is a West European one (in practice, - // this means that the same DST rules as for EEC apply) - static bool IsWestEuropeanCountry(Country country = Country_Default); - - // return the current year - static int GetCurrentYear(Calendar cal = Gregorian); - - // convert the year as returned by wxDateTime::GetYear() to a year - // suitable for BC/AD notation. The difference is that BC year 1 - // corresponds to the year 0 (while BC year 0 didn't exist) and AD - // year N is just year N. - static int ConvertYearToBC(int year); - - // return the current month - static Month GetCurrentMonth(Calendar cal = Gregorian); - - // returns true if the given year is a leap year in the given calendar - static bool IsLeapYear(int year = Inv_Year, Calendar cal = Gregorian); - - // get the century (19 for 1999, 20 for 2000 and -5 for 492 BC) - static int GetCentury(int year); - - // returns the number of days in this year (356 or 355 for Gregorian - // calendar usually :-) - static wxDateTime_t GetNumberOfDays(int year, Calendar cal = Gregorian); - - // get the number of the days in the given month (default value for - // the year means the current one) - static wxDateTime_t GetNumberOfDays(Month month, - int year = Inv_Year, - Calendar cal = Gregorian); - - - // get the full (default) or abbreviated month name in the current - // locale, returns empty string on error - static wxString GetMonthName(Month month, - NameFlags flags = Name_Full); - - // get the standard English full (default) or abbreviated month name - static wxString GetEnglishMonthName(Month month, - NameFlags flags = Name_Full); - - // get the full (default) or abbreviated weekday name in the current - // locale, returns empty string on error - static wxString GetWeekDayName(WeekDay weekday, - NameFlags flags = Name_Full); - - // get the standard English full (default) or abbreviated weekday name - static wxString GetEnglishWeekDayName(WeekDay weekday, - NameFlags flags = Name_Full); - - // get the AM and PM strings in the current locale (may be empty) - static void GetAmPmStrings(wxString *am, wxString *pm); - - // return true if the given country uses DST for this year - static bool IsDSTApplicable(int year = Inv_Year, - Country country = Country_Default); - - // get the beginning of DST for this year, will return invalid object - // if no DST applicable in this year. The default value of the - // parameter means to take the current year. - static wxDateTime GetBeginDST(int year = Inv_Year, - Country country = Country_Default); - // get the end of DST for this year, will return invalid object - // if no DST applicable in this year. The default value of the - // parameter means to take the current year. - static wxDateTime GetEndDST(int year = Inv_Year, - Country country = Country_Default); - - // return the wxDateTime object for the current time - static inline wxDateTime Now(); - - // return the wxDateTime object for the current time with millisecond - // precision (if available on this platform) - static wxDateTime UNow(); - - // return the wxDateTime object for today midnight: i.e. as Now() but - // with time set to 0 - static inline wxDateTime Today(); - - // constructors: you should test whether the constructor succeeded with - // IsValid() function. The values Inv_Month and Inv_Year for the - // parameters mean take current month and/or year values. - // ------------------------------------------------------------------------ - - // default ctor does not initialize the object, use Set()! - wxDateTime() { m_time = wxLongLong(wxINT32_MIN, 0); } - - // from time_t: seconds since the Epoch 00:00:00 UTC, Jan 1, 1970) - inline wxDateTime(time_t timet); - // from broken down time/date (only for standard Unix range) - inline wxDateTime(const struct tm& tm); - // from broken down time/date (any range) - inline wxDateTime(const Tm& tm); - - // from JDN (beware of rounding errors) - inline wxDateTime(double jdn); - - // from separate values for each component, date set to today - inline wxDateTime(wxDateTime_t hour, - wxDateTime_t minute = 0, - wxDateTime_t second = 0, - wxDateTime_t millisec = 0); - // from separate values for each component with explicit date - inline wxDateTime(wxDateTime_t day, // day of the month - Month month, - int year = Inv_Year, // 1999, not 99 please! - wxDateTime_t hour = 0, - wxDateTime_t minute = 0, - wxDateTime_t second = 0, - wxDateTime_t millisec = 0); -#ifdef __WINDOWS__ - wxDateTime(const struct _SYSTEMTIME& st) - { - SetFromMSWSysTime(st); - } -#endif - - // default copy ctor ok - - // no dtor - - // assignment operators and Set() functions: all non const methods return - // the reference to this object. IsValid() should be used to test whether - // the function succeeded. - // ------------------------------------------------------------------------ - - // set to the current time - inline wxDateTime& SetToCurrent(); - - // set to given time_t value - inline wxDateTime& Set(time_t timet); - - // set to given broken down time/date - wxDateTime& Set(const struct tm& tm); - - // set to given broken down time/date - inline wxDateTime& Set(const Tm& tm); - - // set to given JDN (beware of rounding errors) - wxDateTime& Set(double jdn); - - // set to given time, date = today - wxDateTime& Set(wxDateTime_t hour, - wxDateTime_t minute = 0, - wxDateTime_t second = 0, - wxDateTime_t millisec = 0); - - // from separate values for each component with explicit date - // (defaults for month and year are the current values) - wxDateTime& Set(wxDateTime_t day, - Month month, - int year = Inv_Year, // 1999, not 99 please! - wxDateTime_t hour = 0, - wxDateTime_t minute = 0, - wxDateTime_t second = 0, - wxDateTime_t millisec = 0); - - // resets time to 00:00:00, doesn't change the date - wxDateTime& ResetTime(); - - // get the date part of this object only, i.e. the object which has the - // same date as this one but time of 00:00:00 - wxDateTime GetDateOnly() const; - - // the following functions don't change the values of the other - // fields, i.e. SetMinute() won't change either hour or seconds value - - // set the year - wxDateTime& SetYear(int year); - // set the month - wxDateTime& SetMonth(Month month); - // set the day of the month - wxDateTime& SetDay(wxDateTime_t day); - // set hour - wxDateTime& SetHour(wxDateTime_t hour); - // set minute - wxDateTime& SetMinute(wxDateTime_t minute); - // set second - wxDateTime& SetSecond(wxDateTime_t second); - // set millisecond - wxDateTime& SetMillisecond(wxDateTime_t millisecond); - - // assignment operator from time_t - wxDateTime& operator=(time_t timet) { return Set(timet); } - - // assignment operator from broken down time/date - wxDateTime& operator=(const struct tm& tm) { return Set(tm); } - - // assignment operator from broken down time/date - wxDateTime& operator=(const Tm& tm) { return Set(tm); } - - // default assignment operator is ok - - // calendar calculations (functions which set the date only leave the time - // unchanged, e.g. don't explicitly zero it): SetXXX() functions modify the - // object itself, GetXXX() ones return a new object. - // ------------------------------------------------------------------------ - - // set to the given week day in the same week as this one - wxDateTime& SetToWeekDayInSameWeek(WeekDay weekday, - WeekFlags flags = Monday_First); - inline wxDateTime GetWeekDayInSameWeek(WeekDay weekday, - WeekFlags flags = Monday_First) const; - - // set to the next week day following this one - wxDateTime& SetToNextWeekDay(WeekDay weekday); - inline wxDateTime GetNextWeekDay(WeekDay weekday) const; - - // set to the previous week day before this one - wxDateTime& SetToPrevWeekDay(WeekDay weekday); - inline wxDateTime GetPrevWeekDay(WeekDay weekday) const; - - // set to Nth occurrence of given weekday in the given month of the - // given year (time is set to 0), return true on success and false on - // failure. n may be positive (1..5) or negative to count from the end - // of the month (see helper function SetToLastWeekDay()) - bool SetToWeekDay(WeekDay weekday, - int n = 1, - Month month = Inv_Month, - int year = Inv_Year); - inline wxDateTime GetWeekDay(WeekDay weekday, - int n = 1, - Month month = Inv_Month, - int year = Inv_Year) const; - - // sets to the last weekday in the given month, year - inline bool SetToLastWeekDay(WeekDay weekday, - Month month = Inv_Month, - int year = Inv_Year); - inline wxDateTime GetLastWeekDay(WeekDay weekday, - Month month = Inv_Month, - int year = Inv_Year); - - // returns the date corresponding to the given week day of the given - // week (in ISO notation) of the specified year - static wxDateTime SetToWeekOfYear(int year, - wxDateTime_t numWeek, - WeekDay weekday = Mon); - - // sets the date to the last day of the given (or current) month or the - // given (or current) year - wxDateTime& SetToLastMonthDay(Month month = Inv_Month, - int year = Inv_Year); - inline wxDateTime GetLastMonthDay(Month month = Inv_Month, - int year = Inv_Year) const; - - // sets to the given year day (1..365 or 366) - wxDateTime& SetToYearDay(wxDateTime_t yday); - inline wxDateTime GetYearDay(wxDateTime_t yday) const; - - // The definitions below were taken verbatim from - // - // http://www.capecod.net/~pbaum/date/date0.htm - // - // (Peter Baum's home page) - // - // definition: The Julian Day Number, Julian Day, or JD of a - // particular instant of time is the number of days and fractions of a - // day since 12 hours Universal Time (Greenwich mean noon) on January - // 1 of the year -4712, where the year is given in the Julian - // proleptic calendar. The idea of using this reference date was - // originally proposed by Joseph Scalizer in 1582 to count years but - // it was modified by 19th century astronomers to count days. One - // could have equivalently defined the reference time to be noon of - // November 24, -4713 if were understood that Gregorian calendar rules - // were applied. Julian days are Julian Day Numbers and are not to be - // confused with Julian dates. - // - // definition: The Rata Die number is a date specified as the number - // of days relative to a base date of December 31 of the year 0. Thus - // January 1 of the year 1 is Rata Die day 1. - - // get the Julian Day number (the fractional part specifies the time of - // the day, related to noon - beware of rounding errors!) - double GetJulianDayNumber() const; - double GetJDN() const { return GetJulianDayNumber(); } - - // get the Modified Julian Day number: it is equal to JDN - 2400000.5 - // and so integral MJDs correspond to the midnights (and not noons). - // MJD 0 is Nov 17, 1858 - double GetModifiedJulianDayNumber() const { return GetJDN() - 2400000.5; } - double GetMJD() const { return GetModifiedJulianDayNumber(); } - - // get the Rata Die number - double GetRataDie() const; - - // TODO algorithms for calculating some important dates, such as - // religious holidays (Easter...) or moon/solar eclipses? Some - // algorithms can be found in the calendar FAQ - - - // Timezone stuff: a wxDateTime object constructed using given - // day/month/year/hour/min/sec values is interpreted as this moment in - // local time. Using the functions below, it may be converted to another - // time zone (e.g., the Unix epoch is wxDateTime(1, Jan, 1970).ToGMT()). - // - // These functions try to handle DST internally, but there is no magical - // way to know all rules for it in all countries in the world, so if the - // program can handle it itself (or doesn't want to handle it at all for - // whatever reason), the DST handling can be disabled with noDST. - // ------------------------------------------------------------------------ - - // transform to any given timezone - inline wxDateTime ToTimezone(const TimeZone& tz, bool noDST = false) const; - wxDateTime& MakeTimezone(const TimeZone& tz, bool noDST = false); - - // interpret current value as being in another timezone and transform - // it to local one - inline wxDateTime FromTimezone(const TimeZone& tz, bool noDST = false) const; - wxDateTime& MakeFromTimezone(const TimeZone& tz, bool noDST = false); - - // transform to/from GMT/UTC - wxDateTime ToUTC(bool noDST = false) const { return ToTimezone(UTC, noDST); } - wxDateTime& MakeUTC(bool noDST = false) { return MakeTimezone(UTC, noDST); } - - wxDateTime ToGMT(bool noDST = false) const { return ToUTC(noDST); } - wxDateTime& MakeGMT(bool noDST = false) { return MakeUTC(noDST); } - - wxDateTime FromUTC(bool noDST = false) const - { return FromTimezone(UTC, noDST); } - wxDateTime& MakeFromUTC(bool noDST = false) - { return MakeFromTimezone(UTC, noDST); } - - // is daylight savings time in effect at this moment according to the - // rules of the specified country? - // - // Return value is > 0 if DST is in effect, 0 if it is not and -1 if - // the information is not available (this is compatible with ANSI C) - int IsDST(Country country = Country_Default) const; - - - // accessors: many of them take the timezone parameter which indicates the - // timezone for which to make the calculations and the default value means - // to do it for the current timezone of this machine (even if the function - // only operates with the date it's necessary because a date may wrap as - // result of timezone shift) - // ------------------------------------------------------------------------ - - // is the date valid? - inline bool IsValid() const { return m_time != wxInvalidDateTime.m_time; } - - // get the broken down date/time representation in the given timezone - // - // If you wish to get several time components (day, month and year), - // consider getting the whole Tm strcuture first and retrieving the - // value from it - this is much more efficient - Tm GetTm(const TimeZone& tz = Local) const; - - // get the number of seconds since the Unix epoch - returns (time_t)-1 - // if the value is out of range - inline time_t GetTicks() const; - - // get the century, same as GetCentury(GetYear()) - int GetCentury(const TimeZone& tz = Local) const - { return GetCentury(GetYear(tz)); } - // get the year (returns Inv_Year if date is invalid) - int GetYear(const TimeZone& tz = Local) const - { return GetTm(tz).year; } - // get the month (Inv_Month if date is invalid) - Month GetMonth(const TimeZone& tz = Local) const - { return (Month)GetTm(tz).mon; } - // get the month day (in 1..31 range, 0 if date is invalid) - wxDateTime_t GetDay(const TimeZone& tz = Local) const - { return GetTm(tz).mday; } - // get the day of the week (Inv_WeekDay if date is invalid) - WeekDay GetWeekDay(const TimeZone& tz = Local) const - { return GetTm(tz).GetWeekDay(); } - // get the hour of the day - wxDateTime_t GetHour(const TimeZone& tz = Local) const - { return GetTm(tz).hour; } - // get the minute - wxDateTime_t GetMinute(const TimeZone& tz = Local) const - { return GetTm(tz).min; } - // get the second - wxDateTime_t GetSecond(const TimeZone& tz = Local) const - { return GetTm(tz).sec; } - // get milliseconds - wxDateTime_t GetMillisecond(const TimeZone& tz = Local) const - { return GetTm(tz).msec; } - - // get the day since the year start (1..366, 0 if date is invalid) - wxDateTime_t GetDayOfYear(const TimeZone& tz = Local) const; - // get the week number since the year start (1..52 or 53, 0 if date is - // invalid) - wxDateTime_t GetWeekOfYear(WeekFlags flags = Monday_First, - const TimeZone& tz = Local) const; - // get the year to which the number returned from GetWeekOfYear() - // belongs - int GetWeekBasedYear(const TimeZone& tz = Local) const; - // get the week number since the month start (1..5, 0 if date is - // invalid) - wxDateTime_t GetWeekOfMonth(WeekFlags flags = Monday_First, - const TimeZone& tz = Local) const; - - // is this date a work day? This depends on a country, of course, - // because the holidays are different in different countries - bool IsWorkDay(Country country = Country_Default) const; - - // dos date and time format - // ------------------------------------------------------------------------ - - // set from the DOS packed format - wxDateTime& SetFromDOS(unsigned long ddt); - - // pack the date in DOS format - unsigned long GetAsDOS() const; - - // SYSTEMTIME format - // ------------------------------------------------------------------------ -#ifdef __WINDOWS__ - // convert SYSTEMTIME to wxDateTime - wxDateTime& SetFromMSWSysTime(const struct _SYSTEMTIME& st); - - // convert wxDateTime to SYSTEMTIME - void GetAsMSWSysTime(struct _SYSTEMTIME* st) const; - - // same as above but only take date part into account, time is always zero - wxDateTime& SetFromMSWSysDate(const struct _SYSTEMTIME& st); - void GetAsMSWSysDate(struct _SYSTEMTIME* st) const; -#endif // __WINDOWS__ - - // comparison (see also functions below for operator versions) - // ------------------------------------------------------------------------ - - // returns true if the two moments are strictly identical - inline bool IsEqualTo(const wxDateTime& datetime) const; - - // returns true if the date is strictly earlier than the given one - inline bool IsEarlierThan(const wxDateTime& datetime) const; - - // returns true if the date is strictly later than the given one - inline bool IsLaterThan(const wxDateTime& datetime) const; - - // returns true if the date is strictly in the given range - inline bool IsStrictlyBetween(const wxDateTime& t1, - const wxDateTime& t2) const; - - // returns true if the date is in the given range - inline bool IsBetween(const wxDateTime& t1, const wxDateTime& t2) const; - - // do these two objects refer to the same date? - inline bool IsSameDate(const wxDateTime& dt) const; - - // do these two objects have the same time? - inline bool IsSameTime(const wxDateTime& dt) const; - - // are these two objects equal up to given timespan? - inline bool IsEqualUpTo(const wxDateTime& dt, const wxTimeSpan& ts) const; - - inline bool operator<(const wxDateTime& dt) const - { - wxASSERT_MSG( IsValid() && dt.IsValid(), wxT("invalid wxDateTime") ); - return GetValue() < dt.GetValue(); - } - - inline bool operator<=(const wxDateTime& dt) const - { - wxASSERT_MSG( IsValid() && dt.IsValid(), wxT("invalid wxDateTime") ); - return GetValue() <= dt.GetValue(); - } - - inline bool operator>(const wxDateTime& dt) const - { - wxASSERT_MSG( IsValid() && dt.IsValid(), wxT("invalid wxDateTime") ); - return GetValue() > dt.GetValue(); - } - - inline bool operator>=(const wxDateTime& dt) const - { - wxASSERT_MSG( IsValid() && dt.IsValid(), wxT("invalid wxDateTime") ); - return GetValue() >= dt.GetValue(); - } - - inline bool operator==(const wxDateTime& dt) const - { - wxASSERT_MSG( IsValid() && dt.IsValid(), wxT("invalid wxDateTime") ); - return GetValue() == dt.GetValue(); - } - - inline bool operator!=(const wxDateTime& dt) const - { - wxASSERT_MSG( IsValid() && dt.IsValid(), wxT("invalid wxDateTime") ); - return GetValue() != dt.GetValue(); - } - - // arithmetics with dates (see also below for more operators) - // ------------------------------------------------------------------------ - - // return the sum of the date with a time span (positive or negative) - inline wxDateTime Add(const wxTimeSpan& diff) const; - // add a time span (positive or negative) - inline wxDateTime& Add(const wxTimeSpan& diff); - // add a time span (positive or negative) - inline wxDateTime& operator+=(const wxTimeSpan& diff); - inline wxDateTime operator+(const wxTimeSpan& ts) const - { - wxDateTime dt(*this); - dt.Add(ts); - return dt; - } - - // return the difference of the date with a time span - inline wxDateTime Subtract(const wxTimeSpan& diff) const; - // subtract a time span (positive or negative) - inline wxDateTime& Subtract(const wxTimeSpan& diff); - // subtract a time span (positive or negative) - inline wxDateTime& operator-=(const wxTimeSpan& diff); - inline wxDateTime operator-(const wxTimeSpan& ts) const - { - wxDateTime dt(*this); - dt.Subtract(ts); - return dt; - } - - // return the sum of the date with a date span - inline wxDateTime Add(const wxDateSpan& diff) const; - // add a date span (positive or negative) - wxDateTime& Add(const wxDateSpan& diff); - // add a date span (positive or negative) - inline wxDateTime& operator+=(const wxDateSpan& diff); - inline wxDateTime operator+(const wxDateSpan& ds) const - { - wxDateTime dt(*this); - dt.Add(ds); - return dt; - } - - // return the difference of the date with a date span - inline wxDateTime Subtract(const wxDateSpan& diff) const; - // subtract a date span (positive or negative) - inline wxDateTime& Subtract(const wxDateSpan& diff); - // subtract a date span (positive or negative) - inline wxDateTime& operator-=(const wxDateSpan& diff); - inline wxDateTime operator-(const wxDateSpan& ds) const - { - wxDateTime dt(*this); - dt.Subtract(ds); - return dt; - } - - // return the difference between two dates - inline wxTimeSpan Subtract(const wxDateTime& dt) const; - inline wxTimeSpan operator-(const wxDateTime& dt2) const; - - wxDateSpan DiffAsDateSpan(const wxDateTime& dt) const; - - // conversion to/from text - // ------------------------------------------------------------------------ - - // all conversions functions return true to indicate whether parsing - // succeeded or failed and fill in the provided end iterator, which must - // not be NULL, with the location of the character where the parsing - // stopped (this will be end() of the passed string if everything was - // parsed) - - // parse a string in RFC 822 format (found e.g. in mail headers and - // having the form "Wed, 10 Feb 1999 19:07:07 +0100") - bool ParseRfc822Date(const wxString& date, - wxString::const_iterator *end); - - // parse a date/time in the given format (see strptime(3)), fill in - // the missing (in the string) fields with the values of dateDef (by - // default, they will not change if they had valid values or will - // default to Today() otherwise) - bool ParseFormat(const wxString& date, - const wxString& format, - const wxDateTime& dateDef, - wxString::const_iterator *end); - - bool ParseFormat(const wxString& date, - const wxString& format, - wxString::const_iterator *end) - { - return ParseFormat(date, format, wxDefaultDateTime, end); - } - - bool ParseFormat(const wxString& date, - wxString::const_iterator *end) - { - return ParseFormat(date, wxDefaultDateTimeFormat, wxDefaultDateTime, end); - } - - // parse a string containing date, time or both in ISO 8601 format - // - // notice that these functions are new in wx 3.0 and so we don't - // provide compatibility overloads for them - bool ParseISODate(const wxString& date) - { - wxString::const_iterator end; - return ParseFormat(date, wxS("%Y-%m-%d"), &end) && end == date.end(); - } - - bool ParseISOTime(const wxString& time) - { - wxString::const_iterator end; - return ParseFormat(time, wxS("%H:%M:%S"), &end) && end == time.end(); - } - - bool ParseISOCombined(const wxString& datetime, char sep = 'T') - { - wxString::const_iterator end; - const wxString fmt = wxS("%Y-%m-%d") + wxString(sep) + wxS("%H:%M:%S"); - return ParseFormat(datetime, fmt, &end) && end == datetime.end(); - } - - // parse a string containing the date/time in "free" format, this - // function will try to make an educated guess at the string contents - bool ParseDateTime(const wxString& datetime, - wxString::const_iterator *end); - - // parse a string containing the date only in "free" format (less - // flexible than ParseDateTime) - bool ParseDate(const wxString& date, - wxString::const_iterator *end); - - // parse a string containing the time only in "free" format - bool ParseTime(const wxString& time, - wxString::const_iterator *end); - - - // this function accepts strftime()-like format string (default - // argument corresponds to the preferred date and time representation - // for the current locale) and returns the string containing the - // resulting text representation - wxString Format(const wxString& format = wxDefaultDateTimeFormat, - const TimeZone& tz = Local) const; - // preferred date representation for the current locale - wxString FormatDate() const { return Format(wxS("%x")); } - // preferred time representation for the current locale - wxString FormatTime() const { return Format(wxS("%X")); } - // returns the string representing the date in ISO 8601 format - // (YYYY-MM-DD) - wxString FormatISODate() const { return Format(wxS("%Y-%m-%d")); } - // returns the string representing the time in ISO 8601 format - // (HH:MM:SS) - wxString FormatISOTime() const { return Format(wxS("%H:%M:%S")); } - // return the combined date time representation in ISO 8601 format; the - // separator character should be 'T' according to the standard but it - // can also be useful to set it to ' ' - wxString FormatISOCombined(char sep = 'T') const - { return FormatISODate() + sep + FormatISOTime(); } - - - // backwards compatible versions of the parsing functions: they return an - // object representing the next character following the date specification - // (i.e. the one where the scan had to stop) or a special NULL-like object - // on failure - // - // they're not deprecated because a lot of existing code uses them and - // there is no particular harm in keeping them but you should still prefer - // the versions above in the new code - wxAnyStrPtr ParseRfc822Date(const wxString& date) - { - wxString::const_iterator end; - return ParseRfc822Date(date, &end) ? wxAnyStrPtr(date, end) - : wxAnyStrPtr(); - } - - wxAnyStrPtr ParseFormat(const wxString& date, - const wxString& format = wxDefaultDateTimeFormat, - const wxDateTime& dateDef = wxDefaultDateTime) - { - wxString::const_iterator end; - return ParseFormat(date, format, dateDef, &end) ? wxAnyStrPtr(date, end) - : wxAnyStrPtr(); - } - - wxAnyStrPtr ParseDateTime(const wxString& datetime) - { - wxString::const_iterator end; - return ParseDateTime(datetime, &end) ? wxAnyStrPtr(datetime, end) - : wxAnyStrPtr(); - } - - wxAnyStrPtr ParseDate(const wxString& date) - { - wxString::const_iterator end; - return ParseDate(date, &end) ? wxAnyStrPtr(date, end) - : wxAnyStrPtr(); - } - - wxAnyStrPtr ParseTime(const wxString& time) - { - wxString::const_iterator end; - return ParseTime(time, &end) ? wxAnyStrPtr(time, end) - : wxAnyStrPtr(); - } - - // In addition to wxAnyStrPtr versions above we also must provide the - // overloads for C strings as we must return a pointer into the original - // string and not inside a temporary wxString which would have been created - // if the overloads above were used. - // - // And then we also have to provide the overloads for wxCStrData, as usual. - // Unfortunately those ones can't return anything as we don't have any - // sufficiently long-lived wxAnyStrPtr to return from them: any temporary - // strings it would point to would be destroyed when this function returns - // making it impossible to dereference the return value. So we just don't - // return anything from here which at least allows to keep compatibility - // with the code not testing the return value. Other uses of this method - // need to be converted to use one of the new bool-returning overloads - // above. - void ParseRfc822Date(const wxCStrData& date) - { ParseRfc822Date(wxString(date)); } - const char* ParseRfc822Date(const char* date); - const wchar_t* ParseRfc822Date(const wchar_t* date); - - void ParseFormat(const wxCStrData& date, - const wxString& format = wxDefaultDateTimeFormat, - const wxDateTime& dateDef = wxDefaultDateTime) - { ParseFormat(wxString(date), format, dateDef); } - const char* ParseFormat(const char* date, - const wxString& format = wxDefaultDateTimeFormat, - const wxDateTime& dateDef = wxDefaultDateTime); - const wchar_t* ParseFormat(const wchar_t* date, - const wxString& format = wxDefaultDateTimeFormat, - const wxDateTime& dateDef = wxDefaultDateTime); - - void ParseDateTime(const wxCStrData& datetime) - { ParseDateTime(wxString(datetime)); } - const char* ParseDateTime(const char* datetime); - const wchar_t* ParseDateTime(const wchar_t* datetime); - - void ParseDate(const wxCStrData& date) - { ParseDate(wxString(date)); } - const char* ParseDate(const char* date); - const wchar_t* ParseDate(const wchar_t* date); - - void ParseTime(const wxCStrData& time) - { ParseTime(wxString(time)); } - const char* ParseTime(const char* time); - const wchar_t* ParseTime(const wchar_t* time); - - - // implementation - // ------------------------------------------------------------------------ - - // construct from internal representation - wxDateTime(const wxLongLong& time) { m_time = time; } - - // get the internal representation - inline wxLongLong GetValue() const; - - // a helper function to get the current time_t - static time_t GetTimeNow() { return time(NULL); } - - // another one to get the current time broken down - static struct tm *GetTmNow() - { - static struct tm l_CurrentTime; - return GetTmNow(&l_CurrentTime); - } - - // get current time using thread-safe function - static struct tm *GetTmNow(struct tm *tmstruct); - -private: - // the current country - as it's the same for all program objects (unless - // it runs on a _really_ big cluster system :-), this is a static member: - // see SetCountry() and GetCountry() - static Country ms_country; - - // this constant is used to transform a time_t value to the internal - // representation, as time_t is in seconds and we use milliseconds it's - // fixed to 1000 - static const long TIME_T_FACTOR; - - // returns true if we fall in range in which we can use standard ANSI C - // functions - inline bool IsInStdRange() const; - - // the internal representation of the time is the amount of milliseconds - // elapsed since the origin which is set by convention to the UNIX/C epoch - // value: the midnight of January 1, 1970 (UTC) - wxLongLong m_time; -}; - -// ---------------------------------------------------------------------------- -// This class contains a difference between 2 wxDateTime values, so it makes -// sense to add it to wxDateTime and it is the result of subtraction of 2 -// objects of that class. See also wxDateSpan. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxTimeSpan -{ -public: - // constructors - // ------------------------------------------------------------------------ - - // return the timespan for the given number of milliseconds - static wxTimeSpan Milliseconds(wxLongLong ms) { return wxTimeSpan(0, 0, 0, ms); } - static wxTimeSpan Millisecond() { return Milliseconds(1); } - - // return the timespan for the given number of seconds - static wxTimeSpan Seconds(wxLongLong sec) { return wxTimeSpan(0, 0, sec); } - static wxTimeSpan Second() { return Seconds(1); } - - // return the timespan for the given number of minutes - static wxTimeSpan Minutes(long min) { return wxTimeSpan(0, min, 0 ); } - static wxTimeSpan Minute() { return Minutes(1); } - - // return the timespan for the given number of hours - static wxTimeSpan Hours(long hours) { return wxTimeSpan(hours, 0, 0); } - static wxTimeSpan Hour() { return Hours(1); } - - // return the timespan for the given number of days - static wxTimeSpan Days(long days) { return Hours(24 * days); } - static wxTimeSpan Day() { return Days(1); } - - // return the timespan for the given number of weeks - static wxTimeSpan Weeks(long days) { return Days(7 * days); } - static wxTimeSpan Week() { return Weeks(1); } - - // default ctor constructs the 0 time span - wxTimeSpan() { } - - // from separate values for each component, date set to 0 (hours are - // not restricted to 0..24 range, neither are minutes, seconds or - // milliseconds) - inline wxTimeSpan(long hours, - long minutes = 0, - wxLongLong seconds = 0, - wxLongLong milliseconds = 0); - - // default copy ctor is ok - - // no dtor - - // arithmetics with time spans (see also below for more operators) - // ------------------------------------------------------------------------ - - // return the sum of two timespans - inline wxTimeSpan Add(const wxTimeSpan& diff) const; - // add two timespans together - inline wxTimeSpan& Add(const wxTimeSpan& diff); - // add two timespans together - wxTimeSpan& operator+=(const wxTimeSpan& diff) { return Add(diff); } - inline wxTimeSpan operator+(const wxTimeSpan& ts) const - { - return wxTimeSpan(GetValue() + ts.GetValue()); - } - - // return the difference of two timespans - inline wxTimeSpan Subtract(const wxTimeSpan& diff) const; - // subtract another timespan - inline wxTimeSpan& Subtract(const wxTimeSpan& diff); - // subtract another timespan - wxTimeSpan& operator-=(const wxTimeSpan& diff) { return Subtract(diff); } - inline wxTimeSpan operator-(const wxTimeSpan& ts) - { - return wxTimeSpan(GetValue() - ts.GetValue()); - } - - // multiply timespan by a scalar - inline wxTimeSpan Multiply(int n) const; - // multiply timespan by a scalar - inline wxTimeSpan& Multiply(int n); - // multiply timespan by a scalar - wxTimeSpan& operator*=(int n) { return Multiply(n); } - inline wxTimeSpan operator*(int n) const - { - return wxTimeSpan(*this).Multiply(n); - } - - // return this timespan with opposite sign - wxTimeSpan Negate() const { return wxTimeSpan(-GetValue()); } - // negate the value of the timespan - wxTimeSpan& Neg() { m_diff = -GetValue(); return *this; } - // negate the value of the timespan - wxTimeSpan& operator-() { return Neg(); } - - // return the absolute value of the timespan: does _not_ modify the - // object - inline wxTimeSpan Abs() const; - - // there is intentionally no division because we don't want to - // introduce rounding errors in time calculations - - // comparaison (see also operator versions below) - // ------------------------------------------------------------------------ - - // is the timespan null? - bool IsNull() const { return m_diff == 0l; } - // returns true if the timespan is null - bool operator!() const { return !IsNull(); } - - // is the timespan positive? - bool IsPositive() const { return m_diff > 0l; } - - // is the timespan negative? - bool IsNegative() const { return m_diff < 0l; } - - // are two timespans equal? - inline bool IsEqualTo(const wxTimeSpan& ts) const; - // compare two timestamps: works with the absolute values, i.e. -2 - // hours is longer than 1 hour. Also, it will return false if the - // timespans are equal in absolute value. - inline bool IsLongerThan(const wxTimeSpan& ts) const; - // compare two timestamps: works with the absolute values, i.e. 1 - // hour is shorter than -2 hours. Also, it will return false if the - // timespans are equal in absolute value. - bool IsShorterThan(const wxTimeSpan& t) const; - - inline bool operator<(const wxTimeSpan &ts) const - { - return GetValue() < ts.GetValue(); - } - - inline bool operator<=(const wxTimeSpan &ts) const - { - return GetValue() <= ts.GetValue(); - } - - inline bool operator>(const wxTimeSpan &ts) const - { - return GetValue() > ts.GetValue(); - } - - inline bool operator>=(const wxTimeSpan &ts) const - { - return GetValue() >= ts.GetValue(); - } - - inline bool operator==(const wxTimeSpan &ts) const - { - return GetValue() == ts.GetValue(); - } - - inline bool operator!=(const wxTimeSpan &ts) const - { - return GetValue() != ts.GetValue(); - } - - // breaking into days, hours, minutes and seconds - // ------------------------------------------------------------------------ - - // get the max number of weeks in this timespan - inline int GetWeeks() const; - // get the max number of days in this timespan - inline int GetDays() const; - // get the max number of hours in this timespan - inline int GetHours() const; - // get the max number of minutes in this timespan - inline int GetMinutes() const; - // get the max number of seconds in this timespan - inline wxLongLong GetSeconds() const; - // get the number of milliseconds in this timespan - wxLongLong GetMilliseconds() const { return m_diff; } - - // conversion to text - // ------------------------------------------------------------------------ - - // this function accepts strftime()-like format string (default - // argument corresponds to the preferred date and time representation - // for the current locale) and returns the string containing the - // resulting text representation. Notice that only some of format - // specifiers valid for wxDateTime are valid for wxTimeSpan: hours, - // minutes and seconds make sense, but not "PM/AM" string for example. - wxString Format(const wxString& format = wxDefaultTimeSpanFormat) const; - - // implementation - // ------------------------------------------------------------------------ - - // construct from internal representation - wxTimeSpan(const wxLongLong& diff) { m_diff = diff; } - - // get the internal representation - wxLongLong GetValue() const { return m_diff; } - -private: - // the (signed) time span in milliseconds - wxLongLong m_diff; -}; - -// ---------------------------------------------------------------------------- -// This class is a "logical time span" and is useful for implementing program -// logic for such things as "add one month to the date" which, in general, -// doesn't mean to add 60*60*24*31 seconds to it, but to take the same date -// the next month (to understand that this is indeed different consider adding -// one month to Feb, 15 - we want to get Mar, 15, of course). -// -// When adding a month to the date, all lesser components (days, hours, ...) -// won't be changed unless the resulting date would be invalid: for example, -// Jan 31 + 1 month will be Feb 28, not (non existing) Feb 31. -// -// Because of this feature, adding and subtracting back again the same -// wxDateSpan will *not*, in general give back the original date: Feb 28 - 1 -// month will be Jan 28, not Jan 31! -// -// wxDateSpan can be either positive or negative. They may be -// multiplied by scalars which multiply all deltas by the scalar: i.e. 2*(1 -// month and 1 day) is 2 months and 2 days. They can be added together and -// with wxDateTime or wxTimeSpan, but the type of result is different for each -// case. -// -// Beware about weeks: if you specify both weeks and days, the total number of -// days added will be 7*weeks + days! See also GetTotalDays() function. -// -// Equality operators are defined for wxDateSpans. Two datespans are equal if -// they both give the same target date when added to *every* source date. -// Thus wxDateSpan::Months(1) is not equal to wxDateSpan::Days(30), because -// they not give the same date when added to 1 Feb. But wxDateSpan::Days(14) is -// equal to wxDateSpan::Weeks(2) -// -// Finally, notice that for adding hours, minutes &c you don't need this -// class: wxTimeSpan will do the job because there are no subtleties -// associated with those. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxDateSpan -{ -public: - // constructors - // ------------------------------------------------------------------------ - - // this many years/months/weeks/days - wxDateSpan(int years = 0, int months = 0, int weeks = 0, int days = 0) - { - m_years = years; - m_months = months; - m_weeks = weeks; - m_days = days; - } - - // get an object for the given number of days - static wxDateSpan Days(int days) { return wxDateSpan(0, 0, 0, days); } - static wxDateSpan Day() { return Days(1); } - - // get an object for the given number of weeks - static wxDateSpan Weeks(int weeks) { return wxDateSpan(0, 0, weeks, 0); } - static wxDateSpan Week() { return Weeks(1); } - - // get an object for the given number of months - static wxDateSpan Months(int mon) { return wxDateSpan(0, mon, 0, 0); } - static wxDateSpan Month() { return Months(1); } - - // get an object for the given number of years - static wxDateSpan Years(int years) { return wxDateSpan(years, 0, 0, 0); } - static wxDateSpan Year() { return Years(1); } - - // default copy ctor is ok - - // no dtor - - // accessors (all SetXXX() return the (modified) wxDateSpan object) - // ------------------------------------------------------------------------ - - // set number of years - wxDateSpan& SetYears(int n) { m_years = n; return *this; } - // set number of months - wxDateSpan& SetMonths(int n) { m_months = n; return *this; } - // set number of weeks - wxDateSpan& SetWeeks(int n) { m_weeks = n; return *this; } - // set number of days - wxDateSpan& SetDays(int n) { m_days = n; return *this; } - - // get number of years - int GetYears() const { return m_years; } - // get number of months - int GetMonths() const { return m_months; } - // returns 12*GetYears() + GetMonths() - int GetTotalMonths() const { return 12*m_years + m_months; } - // get number of weeks - int GetWeeks() const { return m_weeks; } - // get number of days - int GetDays() const { return m_days; } - // returns 7*GetWeeks() + GetDays() - int GetTotalDays() const { return 7*m_weeks + m_days; } - - // arithmetics with date spans (see also below for more operators) - // ------------------------------------------------------------------------ - - // return sum of two date spans - inline wxDateSpan Add(const wxDateSpan& other) const; - // add another wxDateSpan to us - inline wxDateSpan& Add(const wxDateSpan& other); - // add another wxDateSpan to us - inline wxDateSpan& operator+=(const wxDateSpan& other); - inline wxDateSpan operator+(const wxDateSpan& ds) const - { - return wxDateSpan(GetYears() + ds.GetYears(), - GetMonths() + ds.GetMonths(), - GetWeeks() + ds.GetWeeks(), - GetDays() + ds.GetDays()); - } - - // return difference of two date spans - inline wxDateSpan Subtract(const wxDateSpan& other) const; - // subtract another wxDateSpan from us - inline wxDateSpan& Subtract(const wxDateSpan& other); - // subtract another wxDateSpan from us - inline wxDateSpan& operator-=(const wxDateSpan& other); - inline wxDateSpan operator-(const wxDateSpan& ds) const - { - return wxDateSpan(GetYears() - ds.GetYears(), - GetMonths() - ds.GetMonths(), - GetWeeks() - ds.GetWeeks(), - GetDays() - ds.GetDays()); - } - - // return a copy of this time span with changed sign - inline wxDateSpan Negate() const; - // inverse the sign of this timespan - inline wxDateSpan& Neg(); - // inverse the sign of this timespan - wxDateSpan& operator-() { return Neg(); } - - // return the date span proportional to this one with given factor - inline wxDateSpan Multiply(int factor) const; - // multiply all components by a (signed) number - inline wxDateSpan& Multiply(int factor); - // multiply all components by a (signed) number - inline wxDateSpan& operator*=(int factor) { return Multiply(factor); } - inline wxDateSpan operator*(int n) const - { - return wxDateSpan(*this).Multiply(n); - } - - // ds1 == d2 if and only if for every wxDateTime t t + ds1 == t + ds2 - inline bool operator==(const wxDateSpan& ds) const - { - return GetYears() == ds.GetYears() && - GetMonths() == ds.GetMonths() && - GetTotalDays() == ds.GetTotalDays(); - } - - inline bool operator!=(const wxDateSpan& ds) const - { - return !(*this == ds); - } - -private: - int m_years, - m_months, - m_weeks, - m_days; -}; - -// ---------------------------------------------------------------------------- -// wxDateTimeArray: array of dates. -// ---------------------------------------------------------------------------- - -WX_DECLARE_USER_EXPORTED_OBJARRAY(wxDateTime, wxDateTimeArray, WXDLLIMPEXP_BASE); - -// ---------------------------------------------------------------------------- -// wxDateTimeHolidayAuthority: an object of this class will decide whether a -// given date is a holiday and is used by all functions working with "work -// days". -// -// NB: the base class is an ABC, derived classes must implement the pure -// virtual methods to work with the holidays they correspond to. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_BASE wxDateTimeHolidayAuthority; -WX_DEFINE_USER_EXPORTED_ARRAY_PTR(wxDateTimeHolidayAuthority *, - wxHolidayAuthoritiesArray, - class WXDLLIMPEXP_BASE); - -class wxDateTimeHolidaysModule; -class WXDLLIMPEXP_BASE wxDateTimeHolidayAuthority -{ -friend class wxDateTimeHolidaysModule; -public: - // returns true if the given date is a holiday - static bool IsHoliday(const wxDateTime& dt); - - // fills the provided array with all holidays in the given range, returns - // the number of them - static size_t GetHolidaysInRange(const wxDateTime& dtStart, - const wxDateTime& dtEnd, - wxDateTimeArray& holidays); - - // clear the list of holiday authorities - static void ClearAllAuthorities(); - - // add a new holiday authority (the pointer will be deleted by - // wxDateTimeHolidayAuthority) - static void AddAuthority(wxDateTimeHolidayAuthority *auth); - - // the base class must have a virtual dtor - virtual ~wxDateTimeHolidayAuthority(); - -protected: - // this function is called to determine whether a given day is a holiday - virtual bool DoIsHoliday(const wxDateTime& dt) const = 0; - - // this function should fill the array with all holidays between the two - // given dates - it is implemented in the base class, but in a very - // inefficient way (it just iterates over all days and uses IsHoliday() for - // each of them), so it must be overridden in the derived class where the - // base class version may be explicitly used if needed - // - // returns the number of holidays in the given range and fills holidays - // array - virtual size_t DoGetHolidaysInRange(const wxDateTime& dtStart, - const wxDateTime& dtEnd, - wxDateTimeArray& holidays) const = 0; - -private: - // all holiday authorities - static wxHolidayAuthoritiesArray ms_authorities; -}; - -// the holidays for this class are all Saturdays and Sundays -class WXDLLIMPEXP_BASE wxDateTimeWorkDays : public wxDateTimeHolidayAuthority -{ -protected: - virtual bool DoIsHoliday(const wxDateTime& dt) const wxOVERRIDE; - virtual size_t DoGetHolidaysInRange(const wxDateTime& dtStart, - const wxDateTime& dtEnd, - wxDateTimeArray& holidays) const wxOVERRIDE; -}; - -// ============================================================================ -// inline functions implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// private macros -// ---------------------------------------------------------------------------- - -#define MILLISECONDS_PER_DAY 86400000l - -// some broken compilers (HP-UX CC) refuse to compile the "normal" version, but -// using a temp variable always might prevent other compilers from optimising -// it away - hence use of this ugly macro -#ifndef __HPUX__ - #define MODIFY_AND_RETURN(op) return wxDateTime(*this).op -#else - #define MODIFY_AND_RETURN(op) wxDateTime dt(*this); dt.op; return dt -#endif - -// ---------------------------------------------------------------------------- -// wxDateTime construction -// ---------------------------------------------------------------------------- - -inline bool wxDateTime::IsInStdRange() const -{ - // currently we don't know what is the real type of time_t so prefer to err - // on the safe side and limit it to 32 bit values which is safe everywhere - return m_time >= 0l && (m_time / TIME_T_FACTOR) < wxINT32_MAX; -} - -/* static */ -inline wxDateTime wxDateTime::Now() -{ - struct tm tmstruct; - return wxDateTime(*GetTmNow(&tmstruct)); -} - -/* static */ -inline wxDateTime wxDateTime::Today() -{ - wxDateTime dt(Now()); - dt.ResetTime(); - - return dt; -} - -inline wxDateTime& wxDateTime::Set(time_t timet) -{ - if ( timet == (time_t)-1 ) - { - m_time = wxInvalidDateTime.m_time; - } - else - { - // assign first to avoid long multiplication overflow! - m_time = timet - WX_TIME_BASE_OFFSET; - m_time *= TIME_T_FACTOR; - } - - return *this; -} - -inline wxDateTime& wxDateTime::SetToCurrent() -{ - *this = Now(); - return *this; -} - -inline wxDateTime::wxDateTime(time_t timet) -{ - Set(timet); -} - -inline wxDateTime::wxDateTime(const struct tm& tm) -{ - Set(tm); -} - -inline wxDateTime::wxDateTime(const Tm& tm) -{ - Set(tm); -} - -inline wxDateTime::wxDateTime(double jdn) -{ - Set(jdn); -} - -inline wxDateTime& wxDateTime::Set(const Tm& tm) -{ - wxASSERT_MSG( tm.IsValid(), wxT("invalid broken down date/time") ); - - return Set(tm.mday, (Month)tm.mon, tm.year, - tm.hour, tm.min, tm.sec, tm.msec); -} - -inline wxDateTime::wxDateTime(wxDateTime_t hour, - wxDateTime_t minute, - wxDateTime_t second, - wxDateTime_t millisec) -{ - Set(hour, minute, second, millisec); -} - -inline wxDateTime::wxDateTime(wxDateTime_t day, - Month month, - int year, - wxDateTime_t hour, - wxDateTime_t minute, - wxDateTime_t second, - wxDateTime_t millisec) -{ - Set(day, month, year, hour, minute, second, millisec); -} - -// ---------------------------------------------------------------------------- -// wxDateTime accessors -// ---------------------------------------------------------------------------- - -inline wxLongLong wxDateTime::GetValue() const -{ - wxASSERT_MSG( IsValid(), wxT("invalid wxDateTime")); - - return m_time; -} - -inline time_t wxDateTime::GetTicks() const -{ - wxASSERT_MSG( IsValid(), wxT("invalid wxDateTime")); - if ( !IsInStdRange() ) - { - return (time_t)-1; - } - - return (time_t)((m_time / (long)TIME_T_FACTOR).ToLong()) + WX_TIME_BASE_OFFSET; -} - -inline bool wxDateTime::SetToLastWeekDay(WeekDay weekday, - Month month, - int year) -{ - return SetToWeekDay(weekday, -1, month, year); -} - -inline wxDateTime -wxDateTime::GetWeekDayInSameWeek(WeekDay weekday, - WeekFlags WXUNUSED(flags)) const -{ - MODIFY_AND_RETURN( SetToWeekDayInSameWeek(weekday) ); -} - -inline wxDateTime wxDateTime::GetNextWeekDay(WeekDay weekday) const -{ - MODIFY_AND_RETURN( SetToNextWeekDay(weekday) ); -} - -inline wxDateTime wxDateTime::GetPrevWeekDay(WeekDay weekday) const -{ - MODIFY_AND_RETURN( SetToPrevWeekDay(weekday) ); -} - -inline wxDateTime wxDateTime::GetWeekDay(WeekDay weekday, - int n, - Month month, - int year) const -{ - wxDateTime dt(*this); - - return dt.SetToWeekDay(weekday, n, month, year) ? dt : wxInvalidDateTime; -} - -inline wxDateTime wxDateTime::GetLastWeekDay(WeekDay weekday, - Month month, - int year) -{ - wxDateTime dt(*this); - - return dt.SetToLastWeekDay(weekday, month, year) ? dt : wxInvalidDateTime; -} - -inline wxDateTime wxDateTime::GetLastMonthDay(Month month, int year) const -{ - MODIFY_AND_RETURN( SetToLastMonthDay(month, year) ); -} - -inline wxDateTime wxDateTime::GetYearDay(wxDateTime_t yday) const -{ - MODIFY_AND_RETURN( SetToYearDay(yday) ); -} - -// ---------------------------------------------------------------------------- -// wxDateTime comparison -// ---------------------------------------------------------------------------- - -inline bool wxDateTime::IsEqualTo(const wxDateTime& datetime) const -{ - wxASSERT_MSG( IsValid() && datetime.IsValid(), wxT("invalid wxDateTime")); - - return m_time == datetime.m_time; -} - -inline bool wxDateTime::IsEarlierThan(const wxDateTime& datetime) const -{ - wxASSERT_MSG( IsValid() && datetime.IsValid(), wxT("invalid wxDateTime")); - - return m_time < datetime.m_time; -} - -inline bool wxDateTime::IsLaterThan(const wxDateTime& datetime) const -{ - wxASSERT_MSG( IsValid() && datetime.IsValid(), wxT("invalid wxDateTime")); - - return m_time > datetime.m_time; -} - -inline bool wxDateTime::IsStrictlyBetween(const wxDateTime& t1, - const wxDateTime& t2) const -{ - // no need for assert, will be checked by the functions we call - return IsLaterThan(t1) && IsEarlierThan(t2); -} - -inline bool wxDateTime::IsBetween(const wxDateTime& t1, - const wxDateTime& t2) const -{ - // no need for assert, will be checked by the functions we call - return IsEqualTo(t1) || IsEqualTo(t2) || IsStrictlyBetween(t1, t2); -} - -inline bool wxDateTime::IsSameDate(const wxDateTime& dt) const -{ - Tm tm1 = GetTm(), - tm2 = dt.GetTm(); - - return tm1.year == tm2.year && - tm1.mon == tm2.mon && - tm1.mday == tm2.mday; -} - -inline bool wxDateTime::IsSameTime(const wxDateTime& dt) const -{ - // notice that we can't do something like this: - // - // m_time % MILLISECONDS_PER_DAY == dt.m_time % MILLISECONDS_PER_DAY - // - // because we have also to deal with (possibly) different DST settings! - Tm tm1 = GetTm(), - tm2 = dt.GetTm(); - - return tm1.hour == tm2.hour && - tm1.min == tm2.min && - tm1.sec == tm2.sec && - tm1.msec == tm2.msec; -} - -inline bool wxDateTime::IsEqualUpTo(const wxDateTime& dt, - const wxTimeSpan& ts) const -{ - return IsBetween(dt.Subtract(ts), dt.Add(ts)); -} - -// ---------------------------------------------------------------------------- -// wxDateTime arithmetics -// ---------------------------------------------------------------------------- - -inline wxDateTime wxDateTime::Add(const wxTimeSpan& diff) const -{ - wxASSERT_MSG( IsValid(), wxT("invalid wxDateTime")); - - return wxDateTime(m_time + diff.GetValue()); -} - -inline wxDateTime& wxDateTime::Add(const wxTimeSpan& diff) -{ - wxASSERT_MSG( IsValid(), wxT("invalid wxDateTime")); - - m_time += diff.GetValue(); - - return *this; -} - -inline wxDateTime& wxDateTime::operator+=(const wxTimeSpan& diff) -{ - return Add(diff); -} - -inline wxDateTime wxDateTime::Subtract(const wxTimeSpan& diff) const -{ - wxASSERT_MSG( IsValid(), wxT("invalid wxDateTime")); - - return wxDateTime(m_time - diff.GetValue()); -} - -inline wxDateTime& wxDateTime::Subtract(const wxTimeSpan& diff) -{ - wxASSERT_MSG( IsValid(), wxT("invalid wxDateTime")); - - m_time -= diff.GetValue(); - - return *this; -} - -inline wxDateTime& wxDateTime::operator-=(const wxTimeSpan& diff) -{ - return Subtract(diff); -} - -inline wxTimeSpan wxDateTime::Subtract(const wxDateTime& datetime) const -{ - wxASSERT_MSG( IsValid() && datetime.IsValid(), wxT("invalid wxDateTime")); - - return wxTimeSpan(GetValue() - datetime.GetValue()); -} - -inline wxTimeSpan wxDateTime::operator-(const wxDateTime& dt2) const -{ - return this->Subtract(dt2); -} - -inline wxDateTime wxDateTime::Add(const wxDateSpan& diff) const -{ - return wxDateTime(*this).Add(diff); -} - -inline wxDateTime& wxDateTime::Subtract(const wxDateSpan& diff) -{ - return Add(diff.Negate()); -} - -inline wxDateTime wxDateTime::Subtract(const wxDateSpan& diff) const -{ - return wxDateTime(*this).Subtract(diff); -} - -inline wxDateTime& wxDateTime::operator-=(const wxDateSpan& diff) -{ - return Subtract(diff); -} - -inline wxDateTime& wxDateTime::operator+=(const wxDateSpan& diff) -{ - return Add(diff); -} - -// ---------------------------------------------------------------------------- -// wxDateTime and timezones -// ---------------------------------------------------------------------------- - -inline wxDateTime -wxDateTime::ToTimezone(const wxDateTime::TimeZone& tz, bool noDST) const -{ - MODIFY_AND_RETURN( MakeTimezone(tz, noDST) ); -} - -inline wxDateTime -wxDateTime::FromTimezone(const wxDateTime::TimeZone& tz, bool noDST) const -{ - MODIFY_AND_RETURN( MakeFromTimezone(tz, noDST) ); -} - -// ---------------------------------------------------------------------------- -// wxTimeSpan construction -// ---------------------------------------------------------------------------- - -inline wxTimeSpan::wxTimeSpan(long hours, - long minutes, - wxLongLong seconds, - wxLongLong milliseconds) -{ - // assign first to avoid precision loss - m_diff = hours; - m_diff *= 60l; - m_diff += minutes; - m_diff *= 60l; - m_diff += seconds; - m_diff *= 1000l; - m_diff += milliseconds; -} - -// ---------------------------------------------------------------------------- -// wxTimeSpan accessors -// ---------------------------------------------------------------------------- - -inline wxLongLong wxTimeSpan::GetSeconds() const -{ - return m_diff / 1000l; -} - -inline int wxTimeSpan::GetMinutes() const -{ - // For compatibility, this method (and the other accessors) return int, - // even though GetLo() actually returns unsigned long with greater range. - return static_cast((GetSeconds() / 60l).GetLo()); -} - -inline int wxTimeSpan::GetHours() const -{ - return GetMinutes() / 60; -} - -inline int wxTimeSpan::GetDays() const -{ - return GetHours() / 24; -} - -inline int wxTimeSpan::GetWeeks() const -{ - return GetDays() / 7; -} - -// ---------------------------------------------------------------------------- -// wxTimeSpan arithmetics -// ---------------------------------------------------------------------------- - -inline wxTimeSpan wxTimeSpan::Add(const wxTimeSpan& diff) const -{ - return wxTimeSpan(m_diff + diff.GetValue()); -} - -inline wxTimeSpan& wxTimeSpan::Add(const wxTimeSpan& diff) -{ - m_diff += diff.GetValue(); - - return *this; -} - -inline wxTimeSpan wxTimeSpan::Subtract(const wxTimeSpan& diff) const -{ - return wxTimeSpan(m_diff - diff.GetValue()); -} - -inline wxTimeSpan& wxTimeSpan::Subtract(const wxTimeSpan& diff) -{ - m_diff -= diff.GetValue(); - - return *this; -} - -inline wxTimeSpan& wxTimeSpan::Multiply(int n) -{ - m_diff *= (long)n; - - return *this; -} - -inline wxTimeSpan wxTimeSpan::Multiply(int n) const -{ - return wxTimeSpan(m_diff * (long)n); -} - -inline wxTimeSpan wxTimeSpan::Abs() const -{ - return wxTimeSpan(GetValue().Abs()); -} - -inline bool wxTimeSpan::IsEqualTo(const wxTimeSpan& ts) const -{ - return GetValue() == ts.GetValue(); -} - -inline bool wxTimeSpan::IsLongerThan(const wxTimeSpan& ts) const -{ - return GetValue().Abs() > ts.GetValue().Abs(); -} - -inline bool wxTimeSpan::IsShorterThan(const wxTimeSpan& ts) const -{ - return GetValue().Abs() < ts.GetValue().Abs(); -} - -// ---------------------------------------------------------------------------- -// wxDateSpan -// ---------------------------------------------------------------------------- - -inline wxDateSpan& wxDateSpan::operator+=(const wxDateSpan& other) -{ - m_years += other.m_years; - m_months += other.m_months; - m_weeks += other.m_weeks; - m_days += other.m_days; - - return *this; -} - -inline wxDateSpan& wxDateSpan::Add(const wxDateSpan& other) -{ - return *this += other; -} - -inline wxDateSpan wxDateSpan::Add(const wxDateSpan& other) const -{ - wxDateSpan ds(*this); - ds.Add(other); - return ds; -} - -inline wxDateSpan& wxDateSpan::Multiply(int factor) -{ - m_years *= factor; - m_months *= factor; - m_weeks *= factor; - m_days *= factor; - - return *this; -} - -inline wxDateSpan wxDateSpan::Multiply(int factor) const -{ - wxDateSpan ds(*this); - ds.Multiply(factor); - return ds; -} - -inline wxDateSpan wxDateSpan::Negate() const -{ - return wxDateSpan(-m_years, -m_months, -m_weeks, -m_days); -} - -inline wxDateSpan& wxDateSpan::Neg() -{ - m_years = -m_years; - m_months = -m_months; - m_weeks = -m_weeks; - m_days = -m_days; - - return *this; -} - -inline wxDateSpan& wxDateSpan::operator-=(const wxDateSpan& other) -{ - return *this += other.Negate(); -} - -inline wxDateSpan& wxDateSpan::Subtract(const wxDateSpan& other) -{ - return *this -= other; -} - -inline wxDateSpan wxDateSpan::Subtract(const wxDateSpan& other) const -{ - wxDateSpan ds(*this); - ds.Subtract(other); - return ds; -} - -#undef MILLISECONDS_PER_DAY - -#undef MODIFY_AND_RETURN - -// ============================================================================ -// binary operators -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxTimeSpan operators -// ---------------------------------------------------------------------------- - -wxTimeSpan WXDLLIMPEXP_BASE operator*(int n, const wxTimeSpan& ts); - -// ---------------------------------------------------------------------------- -// wxDateSpan -// ---------------------------------------------------------------------------- - -wxDateSpan WXDLLIMPEXP_BASE operator*(int n, const wxDateSpan& ds); - -// ============================================================================ -// other helper functions -// ============================================================================ - -// ---------------------------------------------------------------------------- -// iteration helpers: can be used to write a for loop over enum variable like -// this: -// for ( m = wxDateTime::Jan; m < wxDateTime::Inv_Month; wxNextMonth(m) ) -// ---------------------------------------------------------------------------- - -WXDLLIMPEXP_BASE void wxNextMonth(wxDateTime::Month& m); -WXDLLIMPEXP_BASE void wxPrevMonth(wxDateTime::Month& m); -WXDLLIMPEXP_BASE void wxNextWDay(wxDateTime::WeekDay& wd); -WXDLLIMPEXP_BASE void wxPrevWDay(wxDateTime::WeekDay& wd); - -#endif // wxUSE_DATETIME - -#endif // _WX_DATETIME_H diff --git a/Externals/wxWidgets3/include/wx/datetimectrl.h b/Externals/wxWidgets3/include/wx/datetimectrl.h deleted file mode 100644 index 30f23dfffe..0000000000 --- a/Externals/wxWidgets3/include/wx/datetimectrl.h +++ /dev/null @@ -1,47 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/timectrl.h -// Purpose: Declaration of wxDateTimePickerCtrl class. -// Author: Vadim Zeitlin -// Created: 2011-09-22 -// Copyright: (c) 2011 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DATETIME_CTRL_H_ -#define _WX_DATETIME_CTRL_H_ - -#include "wx/defs.h" - -#if wxUSE_DATEPICKCTRL || wxUSE_TIMEPICKCTRL - -#define wxNEEDS_DATETIMEPICKCTRL - -#include "wx/control.h" // the base class - -#include "wx/datetime.h" - -// ---------------------------------------------------------------------------- -// wxDateTimePickerCtrl: Private common base class of wx{Date,Time}PickerCtrl. -// ---------------------------------------------------------------------------- - -// This class is an implementation detail and should not be used directly, only -// use the documented API of wxDateTimePickerCtrl and wxTimePickerCtrl. -class WXDLLIMPEXP_ADV wxDateTimePickerCtrlBase : public wxControl -{ -public: - // Set/get the date or time (in the latter case, time part is ignored). - virtual void SetValue(const wxDateTime& dt) = 0; - virtual wxDateTime GetValue() const = 0; -}; - -#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) - #include "wx/msw/datetimectrl.h" -#elif defined(__WXOSX_COCOA__) && !defined(__WXUNIVERSAL__) - #include "wx/osx/datetimectrl.h" -#else - typedef wxDateTimePickerCtrlBase wxDateTimePickerCtrl; -#endif - -#endif // wxUSE_DATEPICKCTRL || wxUSE_TIMEPICKCTRL - -#endif // _WX_DATETIME_CTRL_H_ diff --git a/Externals/wxWidgets3/include/wx/datstrm.h b/Externals/wxWidgets3/include/wx/datstrm.h deleted file mode 100644 index 477da30ec6..0000000000 --- a/Externals/wxWidgets3/include/wx/datstrm.h +++ /dev/null @@ -1,204 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/datstrm.h -// Purpose: Data stream classes -// Author: Guilhem Lavaux -// Modified by: Mickael Gilabert -// Created: 28/06/1998 -// Copyright: (c) Guilhem Lavaux -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DATSTREAM_H_ -#define _WX_DATSTREAM_H_ - -#include "wx/stream.h" -#include "wx/longlong.h" -#include "wx/convauto.h" - -#if wxUSE_STREAMS - -// Common wxDataInputStream and wxDataOutputStream parameters. -class WXDLLIMPEXP_BASE wxDataStreamBase -{ -public: - void BigEndianOrdered(bool be_order) { m_be_order = be_order; } - - // By default we use extended precision (80 bit) format for both float and - // doubles. Call this function to switch to alternative representation in - // which IEEE 754 single precision (32 bits) is used for floats and double - // precision (64 bits) is used for doubles. - void UseBasicPrecisions() - { -#if wxUSE_APPLE_IEEE - m_useExtendedPrecision = false; -#endif // wxUSE_APPLE_IEEE - } - - // UseExtendedPrecision() is not very useful as it corresponds to the - // default value, only call it in your code if you want the compilation - // fail with the error when using wxWidgets library compiled without - // extended precision support. -#if wxUSE_APPLE_IEEE - void UseExtendedPrecision() - { - m_useExtendedPrecision = true; - } -#endif // wxUSE_APPLE_IEEE - -#if wxUSE_UNICODE - void SetConv( const wxMBConv &conv ); - wxMBConv *GetConv() const { return m_conv; } -#endif - -protected: - // Ctor and dtor are both protected, this class is never used directly but - // only by its derived classes. - wxDataStreamBase(const wxMBConv& conv); - ~wxDataStreamBase(); - - - bool m_be_order; - -#if wxUSE_APPLE_IEEE - bool m_useExtendedPrecision; -#endif // wxUSE_APPLE_IEEE - -#if wxUSE_UNICODE - wxMBConv *m_conv; -#endif - - wxDECLARE_NO_COPY_CLASS(wxDataStreamBase); -}; - - -class WXDLLIMPEXP_BASE wxDataInputStream : public wxDataStreamBase -{ -public: - wxDataInputStream(wxInputStream& s, const wxMBConv& conv = wxConvUTF8); - - bool IsOk() { return m_input->IsOk(); } - -#if wxHAS_INT64 - wxUint64 Read64(); -#endif -#if wxUSE_LONGLONG - wxLongLong ReadLL(); -#endif - wxUint32 Read32(); - wxUint16 Read16(); - wxUint8 Read8(); - double ReadDouble(); - float ReadFloat(); - wxString ReadString(); - -#if wxHAS_INT64 - void Read64(wxUint64 *buffer, size_t size); - void Read64(wxInt64 *buffer, size_t size); -#endif -#if defined(wxLongLong_t) && wxUSE_LONGLONG - void Read64(wxULongLong *buffer, size_t size); - void Read64(wxLongLong *buffer, size_t size); -#endif -#if wxUSE_LONGLONG - void ReadLL(wxULongLong *buffer, size_t size); - void ReadLL(wxLongLong *buffer, size_t size); -#endif - void Read32(wxUint32 *buffer, size_t size); - void Read16(wxUint16 *buffer, size_t size); - void Read8(wxUint8 *buffer, size_t size); - void ReadDouble(double *buffer, size_t size); - void ReadFloat(float *buffer, size_t size); - - wxDataInputStream& operator>>(wxString& s); - wxDataInputStream& operator>>(wxInt8& c); - wxDataInputStream& operator>>(wxInt16& i); - wxDataInputStream& operator>>(wxInt32& i); - wxDataInputStream& operator>>(wxUint8& c); - wxDataInputStream& operator>>(wxUint16& i); - wxDataInputStream& operator>>(wxUint32& i); -#if wxHAS_INT64 - wxDataInputStream& operator>>(wxUint64& i); - wxDataInputStream& operator>>(wxInt64& i); -#endif -#if defined(wxLongLong_t) && wxUSE_LONGLONG - wxDataInputStream& operator>>(wxULongLong& i); - wxDataInputStream& operator>>(wxLongLong& i); -#endif - wxDataInputStream& operator>>(double& d); - wxDataInputStream& operator>>(float& f); - -protected: - wxInputStream *m_input; - - wxDECLARE_NO_COPY_CLASS(wxDataInputStream); -}; - -class WXDLLIMPEXP_BASE wxDataOutputStream : public wxDataStreamBase -{ -public: - wxDataOutputStream(wxOutputStream& s, const wxMBConv& conv = wxConvUTF8); - - bool IsOk() { return m_output->IsOk(); } - -#if wxHAS_INT64 - void Write64(wxUint64 i); - void Write64(wxInt64 i); -#endif -#if wxUSE_LONGLONG - void WriteLL(const wxLongLong &ll); - void WriteLL(const wxULongLong &ll); -#endif - void Write32(wxUint32 i); - void Write16(wxUint16 i); - void Write8(wxUint8 i); - void WriteDouble(double d); - void WriteFloat(float f); - void WriteString(const wxString& string); - -#if wxHAS_INT64 - void Write64(const wxUint64 *buffer, size_t size); - void Write64(const wxInt64 *buffer, size_t size); -#endif -#if defined(wxLongLong_t) && wxUSE_LONGLONG - void Write64(const wxULongLong *buffer, size_t size); - void Write64(const wxLongLong *buffer, size_t size); -#endif -#if wxUSE_LONGLONG - void WriteLL(const wxULongLong *buffer, size_t size); - void WriteLL(const wxLongLong *buffer, size_t size); -#endif - void Write32(const wxUint32 *buffer, size_t size); - void Write16(const wxUint16 *buffer, size_t size); - void Write8(const wxUint8 *buffer, size_t size); - void WriteDouble(const double *buffer, size_t size); - void WriteFloat(const float *buffer, size_t size); - - wxDataOutputStream& operator<<(const wxString& string); - wxDataOutputStream& operator<<(wxInt8 c); - wxDataOutputStream& operator<<(wxInt16 i); - wxDataOutputStream& operator<<(wxInt32 i); - wxDataOutputStream& operator<<(wxUint8 c); - wxDataOutputStream& operator<<(wxUint16 i); - wxDataOutputStream& operator<<(wxUint32 i); -#if wxHAS_INT64 - wxDataOutputStream& operator<<(wxUint64 i); - wxDataOutputStream& operator<<(wxInt64 i); -#endif -#if defined(wxLongLong_t) && wxUSE_LONGLONG - wxDataOutputStream& operator<<(const wxULongLong &i); - wxDataOutputStream& operator<<(const wxLongLong &i); -#endif - wxDataOutputStream& operator<<(double d); - wxDataOutputStream& operator<<(float f); - -protected: - wxOutputStream *m_output; - - wxDECLARE_NO_COPY_CLASS(wxDataOutputStream); -}; - -#endif - // wxUSE_STREAMS - -#endif - // _WX_DATSTREAM_H_ diff --git a/Externals/wxWidgets3/include/wx/dc.h b/Externals/wxWidgets3/include/wx/dc.h deleted file mode 100644 index 2637b5a828..0000000000 --- a/Externals/wxWidgets3/include/wx/dc.h +++ /dev/null @@ -1,1487 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/dc.h -// Purpose: wxDC class -// Author: Vadim Zeitlin -// Modified by: -// Created: 05/25/99 -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DC_H_BASE_ -#define _WX_DC_H_BASE_ - -// ---------------------------------------------------------------------------- -// headers which we must include here -// ---------------------------------------------------------------------------- - -#include "wx/object.h" // the base class - -#include "wx/intl.h" // for wxLayoutDirection -#include "wx/colour.h" // we have member variables of these classes -#include "wx/font.h" // so we can't do without them -#include "wx/bitmap.h" // for wxNullBitmap -#include "wx/brush.h" -#include "wx/pen.h" -#include "wx/palette.h" -#include "wx/dynarray.h" -#include "wx/math.h" -#include "wx/image.h" -#include "wx/region.h" -#include "wx/affinematrix2d.h" - -#define wxUSE_NEW_DC 1 - -class WXDLLIMPEXP_FWD_CORE wxDC; -class WXDLLIMPEXP_FWD_CORE wxClientDC; -class WXDLLIMPEXP_FWD_CORE wxPaintDC; -class WXDLLIMPEXP_FWD_CORE wxWindowDC; -class WXDLLIMPEXP_FWD_CORE wxScreenDC; -class WXDLLIMPEXP_FWD_CORE wxMemoryDC; -class WXDLLIMPEXP_FWD_CORE wxPrinterDC; -class WXDLLIMPEXP_FWD_CORE wxPrintData; -class WXDLLIMPEXP_FWD_CORE wxWindow; - -#if wxUSE_GRAPHICS_CONTEXT -class WXDLLIMPEXP_FWD_CORE wxGraphicsContext; -#endif - -// Logical ops -enum wxRasterOperationMode -{ - wxCLEAR, // 0 - wxXOR, // src XOR dst - wxINVERT, // NOT dst - wxOR_REVERSE, // src OR (NOT dst) - wxAND_REVERSE, // src AND (NOT dst) - wxCOPY, // src - wxAND, // src AND dst - wxAND_INVERT, // (NOT src) AND dst - wxNO_OP, // dst - wxNOR, // (NOT src) AND (NOT dst) - wxEQUIV, // (NOT src) XOR dst - wxSRC_INVERT, // (NOT src) - wxOR_INVERT, // (NOT src) OR dst - wxNAND, // (NOT src) OR (NOT dst) - wxOR, // src OR dst - wxSET // 1 -#if WXWIN_COMPATIBILITY_2_8 - ,wxROP_BLACK = wxCLEAR, - wxBLIT_BLACKNESS = wxCLEAR, - wxROP_XORPEN = wxXOR, - wxBLIT_SRCINVERT = wxXOR, - wxROP_NOT = wxINVERT, - wxBLIT_DSTINVERT = wxINVERT, - wxROP_MERGEPENNOT = wxOR_REVERSE, - wxBLIT_00DD0228 = wxOR_REVERSE, - wxROP_MASKPENNOT = wxAND_REVERSE, - wxBLIT_SRCERASE = wxAND_REVERSE, - wxROP_COPYPEN = wxCOPY, - wxBLIT_SRCCOPY = wxCOPY, - wxROP_MASKPEN = wxAND, - wxBLIT_SRCAND = wxAND, - wxROP_MASKNOTPEN = wxAND_INVERT, - wxBLIT_00220326 = wxAND_INVERT, - wxROP_NOP = wxNO_OP, - wxBLIT_00AA0029 = wxNO_OP, - wxROP_NOTMERGEPEN = wxNOR, - wxBLIT_NOTSRCERASE = wxNOR, - wxROP_NOTXORPEN = wxEQUIV, - wxBLIT_00990066 = wxEQUIV, - wxROP_NOTCOPYPEN = wxSRC_INVERT, - wxBLIT_NOTSCRCOPY = wxSRC_INVERT, - wxROP_MERGENOTPEN = wxOR_INVERT, - wxBLIT_MERGEPAINT = wxOR_INVERT, - wxROP_NOTMASKPEN = wxNAND, - wxBLIT_007700E6 = wxNAND, - wxROP_MERGEPEN = wxOR, - wxBLIT_SRCPAINT = wxOR, - wxROP_WHITE = wxSET, - wxBLIT_WHITENESS = wxSET -#endif //WXWIN_COMPATIBILITY_2_8 -}; - -// Flood styles -enum wxFloodFillStyle -{ - wxFLOOD_SURFACE = 1, - wxFLOOD_BORDER -}; - -// Mapping modes -enum wxMappingMode -{ - wxMM_TEXT = 1, - wxMM_METRIC, - wxMM_LOMETRIC, - wxMM_TWIPS, - wxMM_POINTS -}; - -// Description of text characteristics. -struct wxFontMetrics -{ - wxFontMetrics() - { - height = - ascent = - descent = - internalLeading = - externalLeading = - averageWidth = 0; - } - - int height, // Total character height. - ascent, // Part of the height above the baseline. - descent, // Part of the height below the baseline. - internalLeading, // Intra-line spacing. - externalLeading, // Inter-line spacing. - averageWidth; // Average font width, a.k.a. "x-width". -}; - -#if WXWIN_COMPATIBILITY_2_8 - -//----------------------------------------------------------------------------- -// wxDrawObject helper class -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxDrawObject -{ -public: - wxDEPRECATED_CONSTRUCTOR(wxDrawObject)() - : m_isBBoxValid(false) - , m_minX(0), m_minY(0), m_maxX(0), m_maxY(0) - { } - - virtual ~wxDrawObject() { } - - virtual void Draw(wxDC&) const { } - - virtual void CalcBoundingBox(wxCoord x, wxCoord y) - { - if ( m_isBBoxValid ) - { - if ( x < m_minX ) m_minX = x; - if ( y < m_minY ) m_minY = y; - if ( x > m_maxX ) m_maxX = x; - if ( y > m_maxY ) m_maxY = y; - } - else - { - m_isBBoxValid = true; - - m_minX = x; - m_minY = y; - m_maxX = x; - m_maxY = y; - } - } - - void ResetBoundingBox() - { - m_isBBoxValid = false; - - m_minX = m_maxX = m_minY = m_maxY = 0; - } - - // Get the final bounding box of the PostScript or Metafile picture. - - wxCoord MinX() const { return m_minX; } - wxCoord MaxX() const { return m_maxX; } - wxCoord MinY() const { return m_minY; } - wxCoord MaxY() const { return m_maxY; } - - //to define the type of object for derived objects - virtual int GetType()=0; - -protected: - //for boundingbox calculation - bool m_isBBoxValid:1; - //for boundingbox calculation - wxCoord m_minX, m_minY, m_maxX, m_maxY; -}; - -#endif // WXWIN_COMPATIBILITY_2_8 - - -//----------------------------------------------------------------------------- -// wxDCFactory -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxDCImpl; - -class WXDLLIMPEXP_CORE wxDCFactory -{ -public: - wxDCFactory() {} - virtual ~wxDCFactory() {} - - virtual wxDCImpl* CreateWindowDC( wxWindowDC *owner, wxWindow *window ) = 0; - virtual wxDCImpl* CreateClientDC( wxClientDC *owner, wxWindow *window ) = 0; - virtual wxDCImpl* CreatePaintDC( wxPaintDC *owner, wxWindow *window ) = 0; - virtual wxDCImpl* CreateMemoryDC( wxMemoryDC *owner ) = 0; - virtual wxDCImpl* CreateMemoryDC( wxMemoryDC *owner, wxBitmap &bitmap ) = 0; - virtual wxDCImpl* CreateMemoryDC( wxMemoryDC *owner, wxDC *dc ) = 0; - virtual wxDCImpl* CreateScreenDC( wxScreenDC *owner ) = 0; -#if wxUSE_PRINTING_ARCHITECTURE - virtual wxDCImpl* CreatePrinterDC( wxPrinterDC *owner, const wxPrintData &data ) = 0; -#endif - - static void Set(wxDCFactory *factory); - static wxDCFactory *Get(); - -private: - static wxDCFactory *m_factory; -}; - -//----------------------------------------------------------------------------- -// wxNativeDCFactory -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxNativeDCFactory: public wxDCFactory -{ -public: - wxNativeDCFactory() {} - - virtual wxDCImpl* CreateWindowDC( wxWindowDC *owner, wxWindow *window ) wxOVERRIDE; - virtual wxDCImpl* CreateClientDC( wxClientDC *owner, wxWindow *window ) wxOVERRIDE; - virtual wxDCImpl* CreatePaintDC( wxPaintDC *owner, wxWindow *window ) wxOVERRIDE; - virtual wxDCImpl* CreateMemoryDC( wxMemoryDC *owner ) wxOVERRIDE; - virtual wxDCImpl* CreateMemoryDC( wxMemoryDC *owner, wxBitmap &bitmap ) wxOVERRIDE; - virtual wxDCImpl* CreateMemoryDC( wxMemoryDC *owner, wxDC *dc ) wxOVERRIDE; - virtual wxDCImpl* CreateScreenDC( wxScreenDC *owner ) wxOVERRIDE; -#if wxUSE_PRINTING_ARCHITECTURE - virtual wxDCImpl* CreatePrinterDC( wxPrinterDC *owner, const wxPrintData &data ) wxOVERRIDE; -#endif -}; - -//----------------------------------------------------------------------------- -// wxDCImpl -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxDCImpl: public wxObject -{ -public: - wxDCImpl( wxDC *owner ); - virtual ~wxDCImpl(); - - wxDC *GetOwner() const { return m_owner; } - - wxWindow* GetWindow() const { return m_window; } - - virtual bool IsOk() const { return m_ok; } - - // query capabilities - - virtual bool CanDrawBitmap() const = 0; - virtual bool CanGetTextExtent() const = 0; - - // get Cairo context - virtual void* GetCairoContext() const - { - return NULL; - } - - virtual void* GetHandle() const { return NULL; } - - // query dimension, colour deps, resolution - - virtual void DoGetSize(int *width, int *height) const = 0; - void GetSize(int *width, int *height) const - { - DoGetSize(width, height); - return ; - } - - wxSize GetSize() const - { - int w, h; - DoGetSize(&w, &h); - return wxSize(w, h); - } - - virtual void DoGetSizeMM(int* width, int* height) const = 0; - - virtual int GetDepth() const = 0; - virtual wxSize GetPPI() const = 0; - - // Right-To-Left (RTL) modes - - virtual void SetLayoutDirection(wxLayoutDirection WXUNUSED(dir)) { } - virtual wxLayoutDirection GetLayoutDirection() const { return wxLayout_Default; } - - // page and document - - virtual bool StartDoc(const wxString& WXUNUSED(message)) { return true; } - virtual void EndDoc() { } - - virtual void StartPage() { } - virtual void EndPage() { } - - // flushing the content of this dc immediately eg onto screen - virtual void Flush() { } - - // bounding box - - virtual void CalcBoundingBox(wxCoord x, wxCoord y) - { - if ( m_isBBoxValid ) - { - if ( x < m_minX ) m_minX = x; - if ( y < m_minY ) m_minY = y; - if ( x > m_maxX ) m_maxX = x; - if ( y > m_maxY ) m_maxY = y; - } - else - { - m_isBBoxValid = true; - - m_minX = x; - m_minY = y; - m_maxX = x; - m_maxY = y; - } - } - void ResetBoundingBox() - { - m_isBBoxValid = false; - - m_minX = m_maxX = m_minY = m_maxY = 0; - } - - wxCoord MinX() const { return m_minX; } - wxCoord MaxX() const { return m_maxX; } - wxCoord MinY() const { return m_minY; } - wxCoord MaxY() const { return m_maxY; } - - // setters and getters - - virtual void SetFont(const wxFont& font) = 0; - virtual const wxFont& GetFont() const { return m_font; } - - virtual void SetPen(const wxPen& pen) = 0; - virtual const wxPen& GetPen() const { return m_pen; } - - virtual void SetBrush(const wxBrush& brush) = 0; - virtual const wxBrush& GetBrush() const { return m_brush; } - - virtual void SetBackground(const wxBrush& brush) = 0; - virtual const wxBrush& GetBackground() const { return m_backgroundBrush; } - - virtual void SetBackgroundMode(int mode) = 0; - virtual int GetBackgroundMode() const { return m_backgroundMode; } - - virtual void SetTextForeground(const wxColour& colour) - { m_textForegroundColour = colour; } - virtual const wxColour& GetTextForeground() const - { return m_textForegroundColour; } - - virtual void SetTextBackground(const wxColour& colour) - { m_textBackgroundColour = colour; } - virtual const wxColour& GetTextBackground() const - { return m_textBackgroundColour; } - -#if wxUSE_PALETTE - virtual void SetPalette(const wxPalette& palette) = 0; -#endif // wxUSE_PALETTE - - // inherit the DC attributes (font and colours) from the given window - // - // this is called automatically when a window, client or paint DC is - // created - virtual void InheritAttributes(wxWindow *win); - - - // logical functions - - virtual void SetLogicalFunction(wxRasterOperationMode function) = 0; - virtual wxRasterOperationMode GetLogicalFunction() const - { return m_logicalFunction; } - - // text measurement - - virtual wxCoord GetCharHeight() const = 0; - virtual wxCoord GetCharWidth() const = 0; - - // The derived classes should really override DoGetFontMetrics() to return - // the correct values in the future but for now provide a default - // implementation in terms of DoGetTextExtent() to avoid breaking the - // compilation of all other ports as wxMSW is the only one to implement it. - virtual void DoGetFontMetrics(int *height, - int *ascent, - int *descent, - int *internalLeading, - int *externalLeading, - int *averageWidth) const; - - virtual void DoGetTextExtent(const wxString& string, - wxCoord *x, wxCoord *y, - wxCoord *descent = NULL, - wxCoord *externalLeading = NULL, - const wxFont *theFont = NULL) const = 0; - virtual void GetMultiLineTextExtent(const wxString& string, - wxCoord *width, - wxCoord *height, - wxCoord *heightLine = NULL, - const wxFont *font = NULL) const; - virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const; - - // clearing - - virtual void Clear() = 0; - - // clipping - - // Note that this pure virtual method has an implementation that updates - // the values returned by DoGetClippingBox() and so can be called from the - // derived class overridden version if it makes sense (i.e. if the clipping - // box coordinates are not already updated in some other way). - virtual void DoSetClippingRegion(wxCoord x, wxCoord y, - wxCoord w, wxCoord h) = 0; - - // NB: this function works with device coordinates, not the logical ones! - virtual void DoSetDeviceClippingRegion(const wxRegion& region) = 0; - - virtual void DoGetClippingBox(wxCoord *x, wxCoord *y, - wxCoord *w, wxCoord *h) const - { - if ( x ) - *x = m_clipX1; - if ( y ) - *y = m_clipY1; - if ( w ) - *w = m_clipX2 - m_clipX1; - if ( h ) - *h = m_clipY2 - m_clipY1; - } - - virtual void DestroyClippingRegion() { ResetClipping(); } - - - // coordinates conversions and transforms - - virtual wxCoord DeviceToLogicalX(wxCoord x) const; - virtual wxCoord DeviceToLogicalY(wxCoord y) const; - virtual wxCoord DeviceToLogicalXRel(wxCoord x) const; - virtual wxCoord DeviceToLogicalYRel(wxCoord y) const; - virtual wxCoord LogicalToDeviceX(wxCoord x) const; - virtual wxCoord LogicalToDeviceY(wxCoord y) const; - virtual wxCoord LogicalToDeviceXRel(wxCoord x) const; - virtual wxCoord LogicalToDeviceYRel(wxCoord y) const; - - virtual void SetMapMode(wxMappingMode mode); - virtual wxMappingMode GetMapMode() const { return m_mappingMode; } - - virtual void SetUserScale(double x, double y); - virtual void GetUserScale(double *x, double *y) const - { - if ( x ) *x = m_userScaleX; - if ( y ) *y = m_userScaleY; - } - - virtual void SetLogicalScale(double x, double y); - virtual void GetLogicalScale(double *x, double *y) const - { - if ( x ) *x = m_logicalScaleX; - if ( y ) *y = m_logicalScaleY; - } - - virtual void SetLogicalOrigin(wxCoord x, wxCoord y); - virtual void DoGetLogicalOrigin(wxCoord *x, wxCoord *y) const - { - if ( x ) *x = m_logicalOriginX; - if ( y ) *y = m_logicalOriginY; - } - - virtual void SetDeviceOrigin(wxCoord x, wxCoord y); - virtual void DoGetDeviceOrigin(wxCoord *x, wxCoord *y) const - { - if ( x ) *x = m_deviceOriginX; - if ( y ) *y = m_deviceOriginY; - } - -#if wxUSE_DC_TRANSFORM_MATRIX - // Transform matrix support is not available in most ports right now - // (currently only wxMSW provides it) so do nothing in these methods by - // default. - virtual bool CanUseTransformMatrix() const - { return false; } - virtual bool SetTransformMatrix(const wxAffineMatrix2D& WXUNUSED(matrix)) - { return false; } - virtual wxAffineMatrix2D GetTransformMatrix() const - { return wxAffineMatrix2D(); } - virtual void ResetTransformMatrix() - { } -#endif // wxUSE_DC_TRANSFORM_MATRIX - - virtual void SetDeviceLocalOrigin( wxCoord x, wxCoord y ); - - virtual void ComputeScaleAndOrigin(); - - // this needs to overidden if the axis is inverted - virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp); - - virtual double GetContentScaleFactor() const { return m_contentScaleFactor; } - -#ifdef __WXMSW__ - // Native Windows functions using the underlying HDC don't honour GDI+ - // transformations which may be applied to it. Using this function we can - // transform the coordinates manually before passing them to such functions - // (as in e.g. wxRendererMSW code). It doesn't do anything if this is not a - // wxGCDC. - virtual wxRect MSWApplyGDIPlusTransform(const wxRect& r) const - { - return r; - } -#endif // __WXMSW__ - - - // --------------------------------------------------------- - // the actual drawing API - - virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, - wxFloodFillStyle style = wxFLOOD_SURFACE) = 0; - - virtual void DoGradientFillLinear(const wxRect& rect, - const wxColour& initialColour, - const wxColour& destColour, - wxDirection nDirection = wxEAST); - - virtual void DoGradientFillConcentric(const wxRect& rect, - const wxColour& initialColour, - const wxColour& destColour, - const wxPoint& circleCenter); - - virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const = 0; - - virtual void DoDrawPoint(wxCoord x, wxCoord y) = 0; - virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) = 0; - - virtual void DoDrawArc(wxCoord x1, wxCoord y1, - wxCoord x2, wxCoord y2, - wxCoord xc, wxCoord yc) = 0; - virtual void DoDrawCheckMark(wxCoord x, wxCoord y, - wxCoord width, wxCoord height); - virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h, - double sa, double ea) = 0; - - virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) = 0; - virtual void DoDrawRoundedRectangle(wxCoord x, wxCoord y, - wxCoord width, wxCoord height, - double radius) = 0; - virtual void DoDrawEllipse(wxCoord x, wxCoord y, - wxCoord width, wxCoord height) = 0; - - virtual void DoCrossHair(wxCoord x, wxCoord y) = 0; - - virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y) = 0; - virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y, - bool useMask = false) = 0; - - virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y) = 0; - virtual void DoDrawRotatedText(const wxString& text, - wxCoord x, wxCoord y, double angle) = 0; - - virtual bool DoBlit(wxCoord xdest, wxCoord ydest, - wxCoord width, wxCoord height, - wxDC *source, - wxCoord xsrc, wxCoord ysrc, - wxRasterOperationMode rop = wxCOPY, - bool useMask = false, - wxCoord xsrcMask = wxDefaultCoord, - wxCoord ysrcMask = wxDefaultCoord) = 0; - - virtual bool DoStretchBlit(wxCoord xdest, wxCoord ydest, - wxCoord dstWidth, wxCoord dstHeight, - wxDC *source, - wxCoord xsrc, wxCoord ysrc, - wxCoord srcWidth, wxCoord srcHeight, - wxRasterOperationMode rop = wxCOPY, - bool useMask = false, - wxCoord xsrcMask = wxDefaultCoord, - wxCoord ysrcMask = wxDefaultCoord); - - virtual wxBitmap DoGetAsBitmap(const wxRect *WXUNUSED(subrect)) const - { return wxNullBitmap; } - - - virtual void DoDrawLines(int n, const wxPoint points[], - wxCoord xoffset, wxCoord yoffset ) = 0; - virtual void DrawLines(const wxPointList *list, - wxCoord xoffset, wxCoord yoffset ); - - virtual void DoDrawPolygon(int n, const wxPoint points[], - wxCoord xoffset, wxCoord yoffset, - wxPolygonFillMode fillStyle = wxODDEVEN_RULE) = 0; - virtual void DoDrawPolyPolygon(int n, const int count[], const wxPoint points[], - wxCoord xoffset, wxCoord yoffset, - wxPolygonFillMode fillStyle); - void DrawPolygon(const wxPointList *list, - wxCoord xoffset, wxCoord yoffset, - wxPolygonFillMode fillStyle ); - - -#if wxUSE_SPLINES - void DrawSpline(wxCoord x1, wxCoord y1, - wxCoord x2, wxCoord y2, - wxCoord x3, wxCoord y3); - void DrawSpline(int n, const wxPoint points[]); - void DrawSpline(const wxPointList *points) { DoDrawSpline(points); } - - virtual void DoDrawSpline(const wxPointList *points); -#endif - - // --------------------------------------------------------- - // wxMemoryDC Impl API - - virtual void DoSelect(const wxBitmap& WXUNUSED(bmp)) - { } - - virtual const wxBitmap& GetSelectedBitmap() const - { return wxNullBitmap; } - virtual wxBitmap& GetSelectedBitmap() - { return wxNullBitmap; } - - // --------------------------------------------------------- - // wxPrinterDC Impl API - - virtual wxRect GetPaperRect() const - { int w = 0; int h = 0; DoGetSize( &w, &h ); return wxRect(0,0,w,h); } - - virtual int GetResolution() const - { return -1; } - -#if wxUSE_GRAPHICS_CONTEXT - virtual wxGraphicsContext* GetGraphicsContext() const - { return NULL; } - virtual void SetGraphicsContext( wxGraphicsContext* WXUNUSED(ctx) ) - {} -#endif - -private: - wxDC *m_owner; - -protected: - // unset clipping variables (after clipping region was destroyed) - void ResetClipping() - { - m_clipping = false; - - m_clipX1 = m_clipX2 = m_clipY1 = m_clipY2 = 0; - } - - // returns adjustment factor for converting wxFont "point size"; in wx - // it is point size on screen and needs to be multiplied by this value - // for rendering on higher-resolution DCs such as printer ones - static float GetFontPointSizeAdjustment(float dpi); - - // window on which the DC draws or NULL - wxWindow *m_window; - - // flags - bool m_colour:1; - bool m_ok:1; - bool m_clipping:1; - bool m_isInteractive:1; - bool m_isBBoxValid:1; - - // coordinate system variables - - wxCoord m_logicalOriginX, m_logicalOriginY; - wxCoord m_deviceOriginX, m_deviceOriginY; // Usually 0,0, can be change by user - - wxCoord m_deviceLocalOriginX, m_deviceLocalOriginY; // non-zero if native top-left corner - // is not at 0,0. This was the case under - // Mac's GrafPorts (coordinate system - // used toplevel window's origin) and - // e.g. for Postscript, where the native - // origin in the bottom left corner. - double m_logicalScaleX, m_logicalScaleY; - double m_userScaleX, m_userScaleY; - double m_scaleX, m_scaleY; // calculated from logical scale and user scale - - int m_signX, m_signY; // Used by SetAxisOrientation() to invert the axes - - double m_contentScaleFactor; // used by high resolution displays (retina) - - // what is a mm on a screen you don't know the size of? - double m_mm_to_pix_x, - m_mm_to_pix_y; - - // bounding and clipping boxes - wxCoord m_minX, m_minY, m_maxX, m_maxY; - wxCoord m_clipX1, m_clipY1, m_clipX2, m_clipY2; - - wxRasterOperationMode m_logicalFunction; - int m_backgroundMode; - wxMappingMode m_mappingMode; - - wxPen m_pen; - wxBrush m_brush; - wxBrush m_backgroundBrush; - wxColour m_textForegroundColour; - wxColour m_textBackgroundColour; - wxFont m_font; - -#if wxUSE_PALETTE - wxPalette m_palette; - bool m_hasCustomPalette; -#endif // wxUSE_PALETTE - -private: - wxDECLARE_ABSTRACT_CLASS(wxDCImpl); -}; - - -class WXDLLIMPEXP_CORE wxDC : public wxObject -{ -public: - // copy attributes (font, colours and writing direction) from another DC - void CopyAttributes(const wxDC& dc); - - virtual ~wxDC() { delete m_pimpl; } - - wxDCImpl *GetImpl() - { return m_pimpl; } - const wxDCImpl *GetImpl() const - { return m_pimpl; } - - wxWindow *GetWindow() const - { return m_pimpl->GetWindow(); } - - void *GetHandle() const - { return m_pimpl->GetHandle(); } - - bool IsOk() const - { return m_pimpl && m_pimpl->IsOk(); } - - // query capabilities - - bool CanDrawBitmap() const - { return m_pimpl->CanDrawBitmap(); } - bool CanGetTextExtent() const - { return m_pimpl->CanGetTextExtent(); } - - // query dimension, colour deps, resolution - - void GetSize(int *width, int *height) const - { m_pimpl->DoGetSize(width, height); } - wxSize GetSize() const - { return m_pimpl->GetSize(); } - - void GetSizeMM(int* width, int* height) const - { m_pimpl->DoGetSizeMM(width, height); } - wxSize GetSizeMM() const - { - int w, h; - m_pimpl->DoGetSizeMM(&w, &h); - return wxSize(w, h); - } - - int GetDepth() const - { return m_pimpl->GetDepth(); } - wxSize GetPPI() const - { return m_pimpl->GetPPI(); } - - virtual int GetResolution() const - { return m_pimpl->GetResolution(); } - - double GetContentScaleFactor() const - { return m_pimpl->GetContentScaleFactor(); } - - // Right-To-Left (RTL) modes - - void SetLayoutDirection(wxLayoutDirection dir) - { m_pimpl->SetLayoutDirection( dir ); } - wxLayoutDirection GetLayoutDirection() const - { return m_pimpl->GetLayoutDirection(); } - - // page and document - - bool StartDoc(const wxString& message) - { return m_pimpl->StartDoc(message); } - void EndDoc() - { m_pimpl->EndDoc(); } - - void StartPage() - { m_pimpl->StartPage(); } - void EndPage() - { m_pimpl->EndPage(); } - - // bounding box - - void CalcBoundingBox(wxCoord x, wxCoord y) - { m_pimpl->CalcBoundingBox(x,y); } - void ResetBoundingBox() - { m_pimpl->ResetBoundingBox(); } - - wxCoord MinX() const - { return m_pimpl->MinX(); } - wxCoord MaxX() const - { return m_pimpl->MaxX(); } - wxCoord MinY() const - { return m_pimpl->MinY(); } - wxCoord MaxY() const - { return m_pimpl->MaxY(); } - - // setters and getters - - void SetFont(const wxFont& font) - { m_pimpl->SetFont( font ); } - const wxFont& GetFont() const - { return m_pimpl->GetFont(); } - - void SetPen(const wxPen& pen) - { m_pimpl->SetPen( pen ); } - const wxPen& GetPen() const - { return m_pimpl->GetPen(); } - - void SetBrush(const wxBrush& brush) - { m_pimpl->SetBrush( brush ); } - const wxBrush& GetBrush() const - { return m_pimpl->GetBrush(); } - - void SetBackground(const wxBrush& brush) - { m_pimpl->SetBackground( brush ); } - const wxBrush& GetBackground() const - { return m_pimpl->GetBackground(); } - - void SetBackgroundMode(int mode) - { m_pimpl->SetBackgroundMode( mode ); } - int GetBackgroundMode() const - { return m_pimpl->GetBackgroundMode(); } - - void SetTextForeground(const wxColour& colour) - { m_pimpl->SetTextForeground(colour); } - const wxColour& GetTextForeground() const - { return m_pimpl->GetTextForeground(); } - - void SetTextBackground(const wxColour& colour) - { m_pimpl->SetTextBackground(colour); } - const wxColour& GetTextBackground() const - { return m_pimpl->GetTextBackground(); } - -#if wxUSE_PALETTE - void SetPalette(const wxPalette& palette) - { m_pimpl->SetPalette(palette); } -#endif // wxUSE_PALETTE - - // logical functions - - void SetLogicalFunction(wxRasterOperationMode function) - { m_pimpl->SetLogicalFunction(function); } - wxRasterOperationMode GetLogicalFunction() const - { return m_pimpl->GetLogicalFunction(); } - - // text measurement - - wxCoord GetCharHeight() const - { return m_pimpl->GetCharHeight(); } - wxCoord GetCharWidth() const - { return m_pimpl->GetCharWidth(); } - - wxFontMetrics GetFontMetrics() const - { - wxFontMetrics fm; - m_pimpl->DoGetFontMetrics(&fm.height, &fm.ascent, &fm.descent, - &fm.internalLeading, &fm.externalLeading, - &fm.averageWidth); - return fm; - } - - void GetTextExtent(const wxString& string, - wxCoord *x, wxCoord *y, - wxCoord *descent = NULL, - wxCoord *externalLeading = NULL, - const wxFont *theFont = NULL) const - { m_pimpl->DoGetTextExtent(string, x, y, descent, externalLeading, theFont); } - - wxSize GetTextExtent(const wxString& string) const - { - wxCoord w, h; - m_pimpl->DoGetTextExtent(string, &w, &h); - return wxSize(w, h); - } - - void GetMultiLineTextExtent(const wxString& string, - wxCoord *width, - wxCoord *height, - wxCoord *heightLine = NULL, - const wxFont *font = NULL) const - { m_pimpl->GetMultiLineTextExtent( string, width, height, heightLine, font ); } - - wxSize GetMultiLineTextExtent(const wxString& string) const - { - wxCoord w, h; - m_pimpl->GetMultiLineTextExtent(string, &w, &h); - return wxSize(w, h); - } - - bool GetPartialTextExtents(const wxString& text, wxArrayInt& widths) const - { return m_pimpl->DoGetPartialTextExtents(text, widths); } - - // clearing - - void Clear() - { m_pimpl->Clear(); } - - // clipping - - void SetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height) - { m_pimpl->DoSetClippingRegion(x, y, width, height); } - void SetClippingRegion(const wxPoint& pt, const wxSize& sz) - { m_pimpl->DoSetClippingRegion(pt.x, pt.y, sz.x, sz.y); } - void SetClippingRegion(const wxRect& rect) - { m_pimpl->DoSetClippingRegion(rect.x, rect.y, rect.width, rect.height); } - - // unlike the functions above, the coordinates of the region used in this - // one are in device coordinates, not the logical ones - void SetDeviceClippingRegion(const wxRegion& region) - { m_pimpl->DoSetDeviceClippingRegion(region); } - - // this function is deprecated because its name is confusing: you may - // expect it to work with logical coordinates but, in fact, it does exactly - // the same thing as SetDeviceClippingRegion() - // - // please review the code using it and either replace it with calls to - // SetDeviceClippingRegion() or correct it if it was [wrongly] passing - // logical coordinates to this function - wxDEPRECATED_INLINE(void SetClippingRegion(const wxRegion& region), - SetDeviceClippingRegion(region); ) - - void DestroyClippingRegion() - { m_pimpl->DestroyClippingRegion(); } - - void GetClippingBox(wxCoord *x, wxCoord *y, wxCoord *w, wxCoord *h) const - { m_pimpl->DoGetClippingBox(x, y, w, h); } - void GetClippingBox(wxRect& rect) const - { m_pimpl->DoGetClippingBox(&rect.x, &rect.y, &rect.width, &rect.height); } - - // coordinates conversions and transforms - - wxCoord DeviceToLogicalX(wxCoord x) const - { return m_pimpl->DeviceToLogicalX(x); } - wxCoord DeviceToLogicalY(wxCoord y) const - { return m_pimpl->DeviceToLogicalY(y); } - wxCoord DeviceToLogicalXRel(wxCoord x) const - { return m_pimpl->DeviceToLogicalXRel(x); } - wxCoord DeviceToLogicalYRel(wxCoord y) const - { return m_pimpl->DeviceToLogicalYRel(y); } - wxCoord LogicalToDeviceX(wxCoord x) const - { return m_pimpl->LogicalToDeviceX(x); } - wxCoord LogicalToDeviceY(wxCoord y) const - { return m_pimpl->LogicalToDeviceY(y); } - wxCoord LogicalToDeviceXRel(wxCoord x) const - { return m_pimpl->LogicalToDeviceXRel(x); } - wxCoord LogicalToDeviceYRel(wxCoord y) const - { return m_pimpl->LogicalToDeviceYRel(y); } - - void SetMapMode(wxMappingMode mode) - { m_pimpl->SetMapMode(mode); } - wxMappingMode GetMapMode() const - { return m_pimpl->GetMapMode(); } - - void SetUserScale(double x, double y) - { m_pimpl->SetUserScale(x,y); } - void GetUserScale(double *x, double *y) const - { m_pimpl->GetUserScale( x, y ); } - - void SetLogicalScale(double x, double y) - { m_pimpl->SetLogicalScale( x, y ); } - void GetLogicalScale(double *x, double *y) const - { m_pimpl->GetLogicalScale( x, y ); } - - void SetLogicalOrigin(wxCoord x, wxCoord y) - { m_pimpl->SetLogicalOrigin(x,y); } - void GetLogicalOrigin(wxCoord *x, wxCoord *y) const - { m_pimpl->DoGetLogicalOrigin(x, y); } - wxPoint GetLogicalOrigin() const - { wxCoord x, y; m_pimpl->DoGetLogicalOrigin(&x, &y); return wxPoint(x, y); } - - void SetDeviceOrigin(wxCoord x, wxCoord y) - { m_pimpl->SetDeviceOrigin( x, y); } - void GetDeviceOrigin(wxCoord *x, wxCoord *y) const - { m_pimpl->DoGetDeviceOrigin(x, y); } - wxPoint GetDeviceOrigin() const - { wxCoord x, y; m_pimpl->DoGetDeviceOrigin(&x, &y); return wxPoint(x, y); } - - void SetAxisOrientation(bool xLeftRight, bool yBottomUp) - { m_pimpl->SetAxisOrientation(xLeftRight, yBottomUp); } - -#if wxUSE_DC_TRANSFORM_MATRIX - bool CanUseTransformMatrix() const - { return m_pimpl->CanUseTransformMatrix(); } - - bool SetTransformMatrix(const wxAffineMatrix2D &matrix) - { return m_pimpl->SetTransformMatrix(matrix); } - - wxAffineMatrix2D GetTransformMatrix() const - { return m_pimpl->GetTransformMatrix(); } - - void ResetTransformMatrix() - { m_pimpl->ResetTransformMatrix(); } -#endif // wxUSE_DC_TRANSFORM_MATRIX - - // mostly internal - void SetDeviceLocalOrigin( wxCoord x, wxCoord y ) - { m_pimpl->SetDeviceLocalOrigin( x, y ); } - - - // ----------------------------------------------- - // the actual drawing API - - bool FloodFill(wxCoord x, wxCoord y, const wxColour& col, - wxFloodFillStyle style = wxFLOOD_SURFACE) - { return m_pimpl->DoFloodFill(x, y, col, style); } - bool FloodFill(const wxPoint& pt, const wxColour& col, - wxFloodFillStyle style = wxFLOOD_SURFACE) - { return m_pimpl->DoFloodFill(pt.x, pt.y, col, style); } - - // fill the area specified by rect with a radial gradient, starting from - // initialColour in the centre of the cercle and fading to destColour. - void GradientFillConcentric(const wxRect& rect, - const wxColour& initialColour, - const wxColour& destColour) - { m_pimpl->DoGradientFillConcentric( rect, initialColour, destColour, - wxPoint(rect.GetWidth() / 2, - rect.GetHeight() / 2)); } - - void GradientFillConcentric(const wxRect& rect, - const wxColour& initialColour, - const wxColour& destColour, - const wxPoint& circleCenter) - { m_pimpl->DoGradientFillConcentric(rect, initialColour, destColour, circleCenter); } - - // fill the area specified by rect with a linear gradient - void GradientFillLinear(const wxRect& rect, - const wxColour& initialColour, - const wxColour& destColour, - wxDirection nDirection = wxEAST) - { m_pimpl->DoGradientFillLinear(rect, initialColour, destColour, nDirection); } - - bool GetPixel(wxCoord x, wxCoord y, wxColour *col) const - { return m_pimpl->DoGetPixel(x, y, col); } - bool GetPixel(const wxPoint& pt, wxColour *col) const - { return m_pimpl->DoGetPixel(pt.x, pt.y, col); } - - void DrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) - { m_pimpl->DoDrawLine(x1, y1, x2, y2); } - void DrawLine(const wxPoint& pt1, const wxPoint& pt2) - { m_pimpl->DoDrawLine(pt1.x, pt1.y, pt2.x, pt2.y); } - - void CrossHair(wxCoord x, wxCoord y) - { m_pimpl->DoCrossHair(x, y); } - void CrossHair(const wxPoint& pt) - { m_pimpl->DoCrossHair(pt.x, pt.y); } - - void DrawArc(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, - wxCoord xc, wxCoord yc) - { m_pimpl->DoDrawArc(x1, y1, x2, y2, xc, yc); } - void DrawArc(const wxPoint& pt1, const wxPoint& pt2, const wxPoint& centre) - { m_pimpl->DoDrawArc(pt1.x, pt1.y, pt2.x, pt2.y, centre.x, centre.y); } - - void DrawCheckMark(wxCoord x, wxCoord y, - wxCoord width, wxCoord height) - { m_pimpl->DoDrawCheckMark(x, y, width, height); } - void DrawCheckMark(const wxRect& rect) - { m_pimpl->DoDrawCheckMark(rect.x, rect.y, rect.width, rect.height); } - - void DrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h, - double sa, double ea) - { m_pimpl->DoDrawEllipticArc(x, y, w, h, sa, ea); } - void DrawEllipticArc(const wxPoint& pt, const wxSize& sz, - double sa, double ea) - { m_pimpl->DoDrawEllipticArc(pt.x, pt.y, sz.x, sz.y, sa, ea); } - - void DrawPoint(wxCoord x, wxCoord y) - { m_pimpl->DoDrawPoint(x, y); } - void DrawPoint(const wxPoint& pt) - { m_pimpl->DoDrawPoint(pt.x, pt.y); } - - void DrawLines(int n, const wxPoint points[], - wxCoord xoffset = 0, wxCoord yoffset = 0) - { m_pimpl->DoDrawLines(n, points, xoffset, yoffset); } - void DrawLines(const wxPointList *list, - wxCoord xoffset = 0, wxCoord yoffset = 0) - { m_pimpl->DrawLines( list, xoffset, yoffset ); } -#if WXWIN_COMPATIBILITY_2_8 - wxDEPRECATED( void DrawLines(const wxList *list, - wxCoord xoffset = 0, wxCoord yoffset = 0) ); -#endif // WXWIN_COMPATIBILITY_2_8 - - void DrawPolygon(int n, const wxPoint points[], - wxCoord xoffset = 0, wxCoord yoffset = 0, - wxPolygonFillMode fillStyle = wxODDEVEN_RULE) - { m_pimpl->DoDrawPolygon(n, points, xoffset, yoffset, fillStyle); } - void DrawPolygon(const wxPointList *list, - wxCoord xoffset = 0, wxCoord yoffset = 0, - wxPolygonFillMode fillStyle = wxODDEVEN_RULE) - { m_pimpl->DrawPolygon( list, xoffset, yoffset, fillStyle ); } - void DrawPolyPolygon(int n, const int count[], const wxPoint points[], - wxCoord xoffset = 0, wxCoord yoffset = 0, - wxPolygonFillMode fillStyle = wxODDEVEN_RULE) - { m_pimpl->DoDrawPolyPolygon(n, count, points, xoffset, yoffset, fillStyle); } -#if WXWIN_COMPATIBILITY_2_8 - wxDEPRECATED( void DrawPolygon(const wxList *list, - wxCoord xoffset = 0, wxCoord yoffset = 0, - wxPolygonFillMode fillStyle = wxODDEVEN_RULE) ); -#endif // WXWIN_COMPATIBILITY_2_8 - - void DrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) - { m_pimpl->DoDrawRectangle(x, y, width, height); } - void DrawRectangle(const wxPoint& pt, const wxSize& sz) - { m_pimpl->DoDrawRectangle(pt.x, pt.y, sz.x, sz.y); } - void DrawRectangle(const wxRect& rect) - { m_pimpl->DoDrawRectangle(rect.x, rect.y, rect.width, rect.height); } - - void DrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, - double radius) - { m_pimpl->DoDrawRoundedRectangle(x, y, width, height, radius); } - void DrawRoundedRectangle(const wxPoint& pt, const wxSize& sz, - double radius) - { m_pimpl->DoDrawRoundedRectangle(pt.x, pt.y, sz.x, sz.y, radius); } - void DrawRoundedRectangle(const wxRect& r, double radius) - { m_pimpl->DoDrawRoundedRectangle(r.x, r.y, r.width, r.height, radius); } - - void DrawCircle(wxCoord x, wxCoord y, wxCoord radius) - { m_pimpl->DoDrawEllipse(x - radius, y - radius, 2*radius, 2*radius); } - void DrawCircle(const wxPoint& pt, wxCoord radius) - { m_pimpl->DoDrawEllipse(pt.x - radius, pt.y - radius, 2*radius, 2*radius); } - - void DrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) - { m_pimpl->DoDrawEllipse(x, y, width, height); } - void DrawEllipse(const wxPoint& pt, const wxSize& sz) - { m_pimpl->DoDrawEllipse(pt.x, pt.y, sz.x, sz.y); } - void DrawEllipse(const wxRect& rect) - { m_pimpl->DoDrawEllipse(rect.x, rect.y, rect.width, rect.height); } - - void DrawIcon(const wxIcon& icon, wxCoord x, wxCoord y) - { m_pimpl->DoDrawIcon(icon, x, y); } - void DrawIcon(const wxIcon& icon, const wxPoint& pt) - { m_pimpl->DoDrawIcon(icon, pt.x, pt.y); } - - void DrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y, - bool useMask = false) - { m_pimpl->DoDrawBitmap(bmp, x, y, useMask); } - void DrawBitmap(const wxBitmap &bmp, const wxPoint& pt, - bool useMask = false) - { m_pimpl->DoDrawBitmap(bmp, pt.x, pt.y, useMask); } - - void DrawText(const wxString& text, wxCoord x, wxCoord y) - { m_pimpl->DoDrawText(text, x, y); } - void DrawText(const wxString& text, const wxPoint& pt) - { m_pimpl->DoDrawText(text, pt.x, pt.y); } - - void DrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle) - { m_pimpl->DoDrawRotatedText(text, x, y, angle); } - void DrawRotatedText(const wxString& text, const wxPoint& pt, double angle) - { m_pimpl->DoDrawRotatedText(text, pt.x, pt.y, angle); } - - // this version puts both optional bitmap and the text into the given - // rectangle and aligns is as specified by alignment parameter; it also - // will emphasize the character with the given index if it is != -1 and - // return the bounding rectangle if required - void DrawLabel(const wxString& text, - const wxBitmap& image, - const wxRect& rect, - int alignment = wxALIGN_LEFT | wxALIGN_TOP, - int indexAccel = -1, - wxRect *rectBounding = NULL); - - void DrawLabel(const wxString& text, const wxRect& rect, - int alignment = wxALIGN_LEFT | wxALIGN_TOP, - int indexAccel = -1) - { DrawLabel(text, wxNullBitmap, rect, alignment, indexAccel); } - - bool Blit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, - wxDC *source, wxCoord xsrc, wxCoord ysrc, - wxRasterOperationMode rop = wxCOPY, bool useMask = false, - wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord) - { - return m_pimpl->DoBlit(xdest, ydest, width, height, - source, xsrc, ysrc, rop, useMask, xsrcMask, ysrcMask); - } - bool Blit(const wxPoint& destPt, const wxSize& sz, - wxDC *source, const wxPoint& srcPt, - wxRasterOperationMode rop = wxCOPY, bool useMask = false, - const wxPoint& srcPtMask = wxDefaultPosition) - { - return m_pimpl->DoBlit(destPt.x, destPt.y, sz.x, sz.y, - source, srcPt.x, srcPt.y, rop, useMask, srcPtMask.x, srcPtMask.y); - } - - bool StretchBlit(wxCoord dstX, wxCoord dstY, - wxCoord dstWidth, wxCoord dstHeight, - wxDC *source, - wxCoord srcX, wxCoord srcY, - wxCoord srcWidth, wxCoord srcHeight, - wxRasterOperationMode rop = wxCOPY, bool useMask = false, - wxCoord srcMaskX = wxDefaultCoord, wxCoord srcMaskY = wxDefaultCoord) - { - return m_pimpl->DoStretchBlit(dstX, dstY, dstWidth, dstHeight, - source, srcX, srcY, srcWidth, srcHeight, rop, useMask, srcMaskX, srcMaskY); - } - bool StretchBlit(const wxPoint& dstPt, const wxSize& dstSize, - wxDC *source, const wxPoint& srcPt, const wxSize& srcSize, - wxRasterOperationMode rop = wxCOPY, bool useMask = false, - const wxPoint& srcMaskPt = wxDefaultPosition) - { - return m_pimpl->DoStretchBlit(dstPt.x, dstPt.y, dstSize.x, dstSize.y, - source, srcPt.x, srcPt.y, srcSize.x, srcSize.y, rop, useMask, srcMaskPt.x, srcMaskPt.y); - } - - wxBitmap GetAsBitmap(const wxRect *subrect = (const wxRect *) NULL) const - { - return m_pimpl->DoGetAsBitmap(subrect); - } - -#if wxUSE_SPLINES - void DrawSpline(wxCoord x1, wxCoord y1, - wxCoord x2, wxCoord y2, - wxCoord x3, wxCoord y3) - { m_pimpl->DrawSpline(x1,y1,x2,y2,x3,y3); } - void DrawSpline(int n, const wxPoint points[]) - { m_pimpl->DrawSpline(n,points); } - void DrawSpline(const wxPointList *points) - { m_pimpl->DrawSpline(points); } -#endif // wxUSE_SPLINES - - -#if WXWIN_COMPATIBILITY_2_8 - // for compatibility with the old code when wxCoord was long everywhere - wxDEPRECATED( void GetTextExtent(const wxString& string, - long *x, long *y, - long *descent = NULL, - long *externalLeading = NULL, - const wxFont *theFont = NULL) const ); - wxDEPRECATED( void GetLogicalOrigin(long *x, long *y) const ); - wxDEPRECATED( void GetDeviceOrigin(long *x, long *y) const ); - wxDEPRECATED( void GetClippingBox(long *x, long *y, long *w, long *h) const ); - - wxDEPRECATED( void DrawObject(wxDrawObject* drawobject) ); -#endif // WXWIN_COMPATIBILITY_2_8 - -#ifdef __WXMSW__ - // GetHDC() is the simplest way to retrieve an HDC From a wxDC but only - // works if this wxDC is GDI-based and fails for GDI+ contexts (and - // anything else without HDC, e.g. wxPostScriptDC) - WXHDC GetHDC() const; - - // don't use these methods manually, use GetTempHDC() instead - virtual WXHDC AcquireHDC() { return GetHDC(); } - virtual void ReleaseHDC(WXHDC WXUNUSED(hdc)) { } - - // helper class holding the result of GetTempHDC() with std::auto_ptr<>-like - // semantics, i.e. it is moved when copied - class TempHDC - { - public: - TempHDC(wxDC& dc) - : m_dc(dc), - m_hdc(dc.AcquireHDC()) - { - } - - TempHDC(const TempHDC& thdc) - : m_dc(thdc.m_dc), - m_hdc(thdc.m_hdc) - { - const_cast(thdc).m_hdc = 0; - } - - ~TempHDC() - { - if ( m_hdc ) - m_dc.ReleaseHDC(m_hdc); - } - - WXHDC GetHDC() const { return m_hdc; } - - private: - wxDC& m_dc; - WXHDC m_hdc; - - wxDECLARE_NO_ASSIGN_CLASS(TempHDC); - }; - - // GetTempHDC() also works for wxGCDC (but still not for wxPostScriptDC &c) - TempHDC GetTempHDC() { return TempHDC(*this); } -#endif // __WXMSW__ - -#if wxUSE_GRAPHICS_CONTEXT - virtual wxGraphicsContext* GetGraphicsContext() const - { - return m_pimpl->GetGraphicsContext(); - } - virtual void SetGraphicsContext( wxGraphicsContext* ctx ) - { - m_pimpl->SetGraphicsContext(ctx); - } -#endif - -protected: - // ctor takes ownership of the pointer - wxDC(wxDCImpl *pimpl) : m_pimpl(pimpl) { } - - wxDCImpl * const m_pimpl; - -private: - wxDECLARE_ABSTRACT_CLASS(wxDC); - wxDECLARE_NO_COPY_CLASS(wxDC); -}; - -// ---------------------------------------------------------------------------- -// helper class: you can use it to temporarily change the DC text colour and -// restore it automatically when the object goes out of scope -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxDCTextColourChanger -{ -public: - wxDCTextColourChanger(wxDC& dc) : m_dc(dc), m_colFgOld() { } - - wxDCTextColourChanger(wxDC& dc, const wxColour& col) : m_dc(dc) - { - Set(col); - } - - ~wxDCTextColourChanger() - { - if ( m_colFgOld.IsOk() ) - m_dc.SetTextForeground(m_colFgOld); - } - - void Set(const wxColour& col) - { - if ( !m_colFgOld.IsOk() ) - m_colFgOld = m_dc.GetTextForeground(); - m_dc.SetTextForeground(col); - } - -private: - wxDC& m_dc; - - wxColour m_colFgOld; - - wxDECLARE_NO_COPY_CLASS(wxDCTextColourChanger); -}; - -// ---------------------------------------------------------------------------- -// helper class: you can use it to temporarily change the DC pen and -// restore it automatically when the object goes out of scope -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxDCPenChanger -{ -public: - wxDCPenChanger(wxDC& dc, const wxPen& pen) : m_dc(dc), m_penOld(dc.GetPen()) - { - m_dc.SetPen(pen); - } - - ~wxDCPenChanger() - { - if ( m_penOld.IsOk() ) - m_dc.SetPen(m_penOld); - } - -private: - wxDC& m_dc; - - wxPen m_penOld; - - wxDECLARE_NO_COPY_CLASS(wxDCPenChanger); -}; - -// ---------------------------------------------------------------------------- -// helper class: you can use it to temporarily change the DC brush and -// restore it automatically when the object goes out of scope -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxDCBrushChanger -{ -public: - wxDCBrushChanger(wxDC& dc, const wxBrush& brush) : m_dc(dc), m_brushOld(dc.GetBrush()) - { - m_dc.SetBrush(brush); - } - - ~wxDCBrushChanger() - { - if ( m_brushOld.IsOk() ) - m_dc.SetBrush(m_brushOld); - } - -private: - wxDC& m_dc; - - wxBrush m_brushOld; - - wxDECLARE_NO_COPY_CLASS(wxDCBrushChanger); -}; - -// ---------------------------------------------------------------------------- -// another small helper class: sets the clipping region in its ctor and -// destroys it in the dtor -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxDCClipper -{ -public: - wxDCClipper(wxDC& dc, const wxRegion& r) : m_dc(dc) - { dc.SetClippingRegion(r.GetBox()); } - wxDCClipper(wxDC& dc, const wxRect& r) : m_dc(dc) - { dc.SetClippingRegion(r.x, r.y, r.width, r.height); } - wxDCClipper(wxDC& dc, wxCoord x, wxCoord y, wxCoord w, wxCoord h) : m_dc(dc) - { dc.SetClippingRegion(x, y, w, h); } - - ~wxDCClipper() { m_dc.DestroyClippingRegion(); } - -private: - wxDC& m_dc; - - wxDECLARE_NO_COPY_CLASS(wxDCClipper); -}; - -// ---------------------------------------------------------------------------- -// helper class: you can use it to temporarily change the DC font and -// restore it automatically when the object goes out of scope -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxDCFontChanger -{ -public: - wxDCFontChanger(wxDC& dc) - : m_dc(dc), m_fontOld() - { - } - - wxDCFontChanger(wxDC& dc, const wxFont& font) - : m_dc(dc), m_fontOld(dc.GetFont()) - { - m_dc.SetFont(font); - } - - void Set(const wxFont& font) - { - if ( !m_fontOld.IsOk() ) - m_fontOld = m_dc.GetFont(); - m_dc.SetFont(font); - } - - ~wxDCFontChanger() - { - if ( m_fontOld.IsOk() ) - m_dc.SetFont(m_fontOld); - } - -private: - wxDC& m_dc; - - wxFont m_fontOld; - - wxDECLARE_NO_COPY_CLASS(wxDCFontChanger); -}; - - -#endif // _WX_DC_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/dcbuffer.h b/Externals/wxWidgets3/include/wx/dcbuffer.h deleted file mode 100644 index fb912f6e24..0000000000 --- a/Externals/wxWidgets3/include/wx/dcbuffer.h +++ /dev/null @@ -1,248 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/dcbuffer.h -// Purpose: wxBufferedDC class -// Author: Ron Lee -// Modified by: Vadim Zeitlin (refactored, added bg preservation) -// Created: 16/03/02 -// Copyright: (c) Ron Lee -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DCBUFFER_H_ -#define _WX_DCBUFFER_H_ - -#include "wx/dcmemory.h" -#include "wx/dcclient.h" -#include "wx/window.h" - -// Split platforms into two groups - those which have well-working -// double-buffering by default, and those which do not. -#if defined(__WXMAC__) || defined(__WXGTK20__) || defined(__WXDFB__) || defined(__WXQT__) - #define wxALWAYS_NATIVE_DOUBLE_BUFFER 1 -#else - #define wxALWAYS_NATIVE_DOUBLE_BUFFER 0 -#endif - - -// ---------------------------------------------------------------------------- -// Double buffering helper. -// ---------------------------------------------------------------------------- - -// Assumes the buffer bitmap covers the entire scrolled window, -// and prepares the window DC accordingly -#define wxBUFFER_VIRTUAL_AREA 0x01 - -// Assumes the buffer bitmap only covers the client area; -// does not prepare the window DC -#define wxBUFFER_CLIENT_AREA 0x02 - -// Set when not using specific buffer bitmap. Note that this -// is private style and not returned by GetStyle. -#define wxBUFFER_USES_SHARED_BUFFER 0x04 - -class WXDLLIMPEXP_CORE wxBufferedDC : public wxMemoryDC -{ -public: - // Default ctor, must subsequently call Init for two stage construction. - wxBufferedDC() - : m_dc(NULL), - m_buffer(NULL), - m_style(0) - { - } - - // Construct a wxBufferedDC using a user supplied buffer. - wxBufferedDC(wxDC *dc, - wxBitmap& buffer = wxNullBitmap, - int style = wxBUFFER_CLIENT_AREA) - : m_dc(NULL), m_buffer(NULL) - { - Init(dc, buffer, style); - } - - // Construct a wxBufferedDC with an internal buffer of 'area' - // (where area is usually something like the size of the window - // being buffered) - wxBufferedDC(wxDC *dc, const wxSize& area, int style = wxBUFFER_CLIENT_AREA) - : m_dc(NULL), m_buffer(NULL) - { - Init(dc, area, style); - } - - // The usually desired action in the dtor is to blit the buffer. - virtual ~wxBufferedDC() - { - if ( m_dc ) - UnMask(); - } - - // These reimplement the actions of the ctors for two stage creation - void Init(wxDC *dc, - wxBitmap& buffer = wxNullBitmap, - int style = wxBUFFER_CLIENT_AREA) - { - InitCommon(dc, style); - - m_buffer = &buffer; - - UseBuffer(); - } - - void Init(wxDC *dc, const wxSize &area, int style = wxBUFFER_CLIENT_AREA) - { - InitCommon(dc, style); - - UseBuffer(area.x, area.y); - } - - // Blits the buffer to the dc, and detaches the dc from the buffer (so it - // can be effectively used once only). - // - // Usually called in the dtor or by the dtor of derived classes if the - // BufferedDC must blit before the derived class (which may own the dc it's - // blitting to) is destroyed. - void UnMask(); - - // Set and get the style - void SetStyle(int style) { m_style = style; } - int GetStyle() const { return m_style & ~wxBUFFER_USES_SHARED_BUFFER; } - -private: - // common part of Init()s - void InitCommon(wxDC *dc, int style) - { - wxASSERT_MSG( !m_dc, wxT("wxBufferedDC already initialised") ); - - m_dc = dc; - m_style = style; - } - - // check that the bitmap is valid and use it - void UseBuffer(wxCoord w = -1, wxCoord h = -1); - - // the underlying DC to which we copy everything drawn on this one in - // UnMask() - // - // NB: Without the existence of a wxNullDC, this must be a pointer, else it - // could probably be a reference. - wxDC *m_dc; - - // the buffer (selected in this DC), initially invalid - wxBitmap *m_buffer; - - // the buffering style - int m_style; - - wxSize m_area; - - wxDECLARE_DYNAMIC_CLASS(wxBufferedDC); - wxDECLARE_NO_COPY_CLASS(wxBufferedDC); -}; - - -// ---------------------------------------------------------------------------- -// Double buffered PaintDC. -// ---------------------------------------------------------------------------- - -// Creates a double buffered wxPaintDC, optionally allowing the -// user to specify their own buffer to use. -class WXDLLIMPEXP_CORE wxBufferedPaintDC : public wxBufferedDC -{ -public: - // If no bitmap is supplied by the user, a temporary one will be created. - wxBufferedPaintDC(wxWindow *window, wxBitmap& buffer, int style = wxBUFFER_CLIENT_AREA) - : m_paintdc(window) - { - // If we're buffering the virtual window, scale the paint DC as well - if (style & wxBUFFER_VIRTUAL_AREA) - window->PrepareDC( m_paintdc ); - - if( buffer.IsOk() ) - Init(&m_paintdc, buffer, style); - else - Init(&m_paintdc, GetBufferedSize(window, style), style); - } - - // If no bitmap is supplied by the user, a temporary one will be created. - wxBufferedPaintDC(wxWindow *window, int style = wxBUFFER_CLIENT_AREA) - : m_paintdc(window) - { - // If we're using the virtual window, scale the paint DC as well - if (style & wxBUFFER_VIRTUAL_AREA) - window->PrepareDC( m_paintdc ); - - Init(&m_paintdc, GetBufferedSize(window, style), style); - } - - // default copy ctor ok. - - virtual ~wxBufferedPaintDC() - { - // We must UnMask here, else by the time the base class - // does it, the PaintDC will have already been destroyed. - UnMask(); - } - -protected: - // return the size needed by the buffer: this depends on whether we're - // buffering just the currently shown part or the total (scrolled) window - static wxSize GetBufferedSize(wxWindow *window, int style) - { - return style & wxBUFFER_VIRTUAL_AREA ? window->GetVirtualSize() - : window->GetClientSize(); - } - -private: - wxPaintDC m_paintdc; - - wxDECLARE_ABSTRACT_CLASS(wxBufferedPaintDC); - wxDECLARE_NO_COPY_CLASS(wxBufferedPaintDC); -}; - - - -// -// wxAutoBufferedPaintDC is a wxPaintDC in toolkits which have double- -// buffering by default. Otherwise it is a wxBufferedPaintDC. Thus, -// you can only expect it work with a simple constructor that -// accepts single wxWindow* argument. -// -#if wxALWAYS_NATIVE_DOUBLE_BUFFER - #define wxAutoBufferedPaintDCBase wxPaintDC -#else - #define wxAutoBufferedPaintDCBase wxBufferedPaintDC -#endif - -class WXDLLIMPEXP_CORE wxAutoBufferedPaintDC : public wxAutoBufferedPaintDCBase -{ -public: - - wxAutoBufferedPaintDC(wxWindow* win) - : wxAutoBufferedPaintDCBase(win) - { - wxASSERT_MSG( win->GetBackgroundStyle() == wxBG_STYLE_PAINT, - "You need to call SetBackgroundStyle(wxBG_STYLE_PAINT) in ctor, " - "and also, if needed, paint the background in wxEVT_PAINT handler." - ); - } - - virtual ~wxAutoBufferedPaintDC() { } - -private: - wxDECLARE_NO_COPY_CLASS(wxAutoBufferedPaintDC); -}; - - - -// Check if the window is natively double buffered and will return a wxPaintDC -// if it is, a wxBufferedPaintDC otherwise. It is the caller's responsibility -// to delete the wxDC pointer when finished with it. -inline wxDC* wxAutoBufferedPaintDCFactory(wxWindow* window) -{ - if ( window->IsDoubleBuffered() ) - return new wxPaintDC(window); - else - return new wxBufferedPaintDC(window); -} - -#endif // _WX_DCBUFFER_H_ diff --git a/Externals/wxWidgets3/include/wx/dcclient.h b/Externals/wxWidgets3/include/wx/dcclient.h deleted file mode 100644 index 28391d1266..0000000000 --- a/Externals/wxWidgets3/include/wx/dcclient.h +++ /dev/null @@ -1,62 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/dcclient.h -// Purpose: wxClientDC base header -// Author: Julian Smart -// Copyright: (c) Julian Smart -// Licence: wxWindows Licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DCCLIENT_H_BASE_ -#define _WX_DCCLIENT_H_BASE_ - -#include "wx/dc.h" - -//----------------------------------------------------------------------------- -// wxWindowDC -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxWindowDC : public wxDC -{ -public: - wxWindowDC(wxWindow *win); - -protected: - wxWindowDC(wxDCImpl *impl) : wxDC(impl) { } - -private: - wxDECLARE_ABSTRACT_CLASS(wxWindowDC); -}; - -//----------------------------------------------------------------------------- -// wxClientDC -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxClientDC : public wxWindowDC -{ -public: - wxClientDC(wxWindow *win); - -protected: - wxClientDC(wxDCImpl *impl) : wxWindowDC(impl) { } - -private: - wxDECLARE_ABSTRACT_CLASS(wxClientDC); -}; - -//----------------------------------------------------------------------------- -// wxPaintDC -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxPaintDC : public wxClientDC -{ -public: - wxPaintDC(wxWindow *win); - -protected: - wxPaintDC(wxDCImpl *impl) : wxClientDC(impl) { } - -private: - wxDECLARE_ABSTRACT_CLASS(wxPaintDC); -}; - -#endif // _WX_DCCLIENT_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/dcgraph.h b/Externals/wxWidgets3/include/wx/dcgraph.h deleted file mode 100644 index 612bd1c089..0000000000 --- a/Externals/wxWidgets3/include/wx/dcgraph.h +++ /dev/null @@ -1,223 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/dcgraph.h -// Purpose: graphics context device bridge header -// Author: Stefan Csomor -// Modified by: -// Created: -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GRAPHICS_DC_H_ -#define _WX_GRAPHICS_DC_H_ - -#if wxUSE_GRAPHICS_CONTEXT - -#include "wx/dc.h" -#include "wx/geometry.h" -#include "wx/graphics.h" - -class WXDLLIMPEXP_FWD_CORE wxWindowDC; - - -class WXDLLIMPEXP_CORE wxGCDC: public wxDC -{ -public: - wxGCDC( const wxWindowDC& dc ); - wxGCDC( const wxMemoryDC& dc ); -#if wxUSE_PRINTING_ARCHITECTURE - wxGCDC( const wxPrinterDC& dc ); -#endif -#if defined(__WXMSW__) && wxUSE_ENH_METAFILE - wxGCDC( const wxEnhMetaFileDC& dc ); -#endif - wxGCDC(wxGraphicsContext* context); - - wxGCDC(); - virtual ~wxGCDC(); - -#ifdef __WXMSW__ - // override wxDC virtual functions to provide access to HDC associated with - // this Graphics object (implemented in src/msw/graphics.cpp) - virtual WXHDC AcquireHDC(); - virtual void ReleaseHDC(WXHDC hdc); -#endif // __WXMSW__ - -private: - wxDECLARE_DYNAMIC_CLASS(wxGCDC); - wxDECLARE_NO_COPY_CLASS(wxGCDC); -}; - - -class WXDLLIMPEXP_CORE wxGCDCImpl: public wxDCImpl -{ -public: - wxGCDCImpl( wxDC *owner, const wxWindowDC& dc ); - wxGCDCImpl( wxDC *owner, const wxMemoryDC& dc ); -#if wxUSE_PRINTING_ARCHITECTURE - wxGCDCImpl( wxDC *owner, const wxPrinterDC& dc ); -#endif -#if defined(__WXMSW__) && wxUSE_ENH_METAFILE - wxGCDCImpl( wxDC *owner, const wxEnhMetaFileDC& dc ); -#endif - wxGCDCImpl( wxDC *owner ); - - virtual ~wxGCDCImpl(); - - // implement base class pure virtuals - // ---------------------------------- - - virtual void Clear() wxOVERRIDE; - - virtual bool StartDoc( const wxString& message ) wxOVERRIDE; - virtual void EndDoc() wxOVERRIDE; - - virtual void StartPage() wxOVERRIDE; - virtual void EndPage() wxOVERRIDE; - - // flushing the content of this dc immediately onto screen - virtual void Flush() wxOVERRIDE; - - virtual void SetFont(const wxFont& font) wxOVERRIDE; - virtual void SetPen(const wxPen& pen) wxOVERRIDE; - virtual void SetBrush(const wxBrush& brush) wxOVERRIDE; - virtual void SetBackground(const wxBrush& brush) wxOVERRIDE; - virtual void SetBackgroundMode(int mode) wxOVERRIDE; - virtual void SetPalette(const wxPalette& palette) wxOVERRIDE; - - virtual void DestroyClippingRegion() wxOVERRIDE; - - virtual wxCoord GetCharHeight() const wxOVERRIDE; - virtual wxCoord GetCharWidth() const wxOVERRIDE; - - virtual bool CanDrawBitmap() const wxOVERRIDE; - virtual bool CanGetTextExtent() const wxOVERRIDE; - virtual int GetDepth() const wxOVERRIDE; - virtual wxSize GetPPI() const wxOVERRIDE; - - virtual void SetLogicalFunction(wxRasterOperationMode function) wxOVERRIDE; - - virtual void SetTextForeground(const wxColour& colour) wxOVERRIDE; - virtual void SetTextBackground(const wxColour& colour) wxOVERRIDE; - - virtual void ComputeScaleAndOrigin() wxOVERRIDE; - - wxGraphicsContext* GetGraphicsContext() const wxOVERRIDE { return m_graphicContext; } - virtual void SetGraphicsContext( wxGraphicsContext* ctx ) wxOVERRIDE; - - virtual void* GetHandle() const wxOVERRIDE; - - // the true implementations - virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, - wxFloodFillStyle style = wxFLOOD_SURFACE) wxOVERRIDE; - - virtual void DoGradientFillLinear(const wxRect& rect, - const wxColour& initialColour, - const wxColour& destColour, - wxDirection nDirection = wxEAST) wxOVERRIDE; - - virtual void DoGradientFillConcentric(const wxRect& rect, - const wxColour& initialColour, - const wxColour& destColour, - const wxPoint& circleCenter) wxOVERRIDE; - - virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const wxOVERRIDE; - - virtual void DoDrawPoint(wxCoord x, wxCoord y) wxOVERRIDE; - -#if wxUSE_SPLINES - virtual void DoDrawSpline(const wxPointList *points) wxOVERRIDE; -#endif - - virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) wxOVERRIDE; - - virtual void DoDrawArc(wxCoord x1, wxCoord y1, - wxCoord x2, wxCoord y2, - wxCoord xc, wxCoord yc) wxOVERRIDE; - - virtual void DoDrawCheckMark(wxCoord x, wxCoord y, - wxCoord width, wxCoord height) wxOVERRIDE; - - virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h, - double sa, double ea) wxOVERRIDE; - - virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) wxOVERRIDE; - virtual void DoDrawRoundedRectangle(wxCoord x, wxCoord y, - wxCoord width, wxCoord height, - double radius) wxOVERRIDE; - virtual void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) wxOVERRIDE; - - virtual void DoCrossHair(wxCoord x, wxCoord y) wxOVERRIDE; - - virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y) wxOVERRIDE; - virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y, - bool useMask = false) wxOVERRIDE; - - virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y) wxOVERRIDE; - virtual void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, - double angle) wxOVERRIDE; - - virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, - wxDC *source, wxCoord xsrc, wxCoord ysrc, - wxRasterOperationMode rop = wxCOPY, bool useMask = false, - wxCoord xsrcMask = -1, wxCoord ysrcMask = -1) wxOVERRIDE; - - virtual bool DoStretchBlit(wxCoord xdest, wxCoord ydest, - wxCoord dstWidth, wxCoord dstHeight, - wxDC *source, - wxCoord xsrc, wxCoord ysrc, - wxCoord srcWidth, wxCoord srcHeight, - wxRasterOperationMode = wxCOPY, bool useMask = false, - wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord) wxOVERRIDE; - - virtual void DoGetSize(int *,int *) const wxOVERRIDE; - virtual void DoGetSizeMM(int* width, int* height) const wxOVERRIDE; - - virtual void DoDrawLines(int n, const wxPoint points[], - wxCoord xoffset, wxCoord yoffset) wxOVERRIDE; - virtual void DoDrawPolygon(int n, const wxPoint points[], - wxCoord xoffset, wxCoord yoffset, - wxPolygonFillMode fillStyle = wxODDEVEN_RULE) wxOVERRIDE; - virtual void DoDrawPolyPolygon(int n, const int count[], const wxPoint points[], - wxCoord xoffset, wxCoord yoffset, - wxPolygonFillMode fillStyle) wxOVERRIDE; - - virtual void DoSetDeviceClippingRegion(const wxRegion& region) wxOVERRIDE; - virtual void DoSetClippingRegion(wxCoord x, wxCoord y, - wxCoord width, wxCoord height) wxOVERRIDE; - - virtual void DoGetTextExtent(const wxString& string, - wxCoord *x, wxCoord *y, - wxCoord *descent = NULL, - wxCoord *externalLeading = NULL, - const wxFont *theFont = NULL) const wxOVERRIDE; - - virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const wxOVERRIDE; - -#ifdef __WXMSW__ - virtual wxRect MSWApplyGDIPlusTransform(const wxRect& r) const; -#endif // __WXMSW__ - -protected: - // unused int parameter distinguishes this version, which does not create a - // wxGraphicsContext, in the expectation that the derived class will do it - wxGCDCImpl(wxDC* owner, int); - - // scaling variables - bool m_logicalFunctionSupported; - wxGraphicsMatrix m_matrixOriginal; - wxGraphicsMatrix m_matrixCurrent; - - double m_formerScaleX, m_formerScaleY; - - wxGraphicsContext* m_graphicContext; - -private: - void Init(wxGraphicsContext*); - - wxDECLARE_CLASS(wxGCDCImpl); - wxDECLARE_NO_COPY_CLASS(wxGCDCImpl); -}; - -#endif // wxUSE_GRAPHICS_CONTEXT -#endif // _WX_GRAPHICS_DC_H_ diff --git a/Externals/wxWidgets3/include/wx/dcmemory.h b/Externals/wxWidgets3/include/wx/dcmemory.h deleted file mode 100644 index 573da75ce0..0000000000 --- a/Externals/wxWidgets3/include/wx/dcmemory.h +++ /dev/null @@ -1,44 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/dcmemory.h -// Purpose: wxMemoryDC base header -// Author: Julian Smart -// Modified by: -// Created: -// Copyright: (c) Julian Smart -// Licence: wxWindows Licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DCMEMORY_H_BASE_ -#define _WX_DCMEMORY_H_BASE_ - -#include "wx/dc.h" -#include "wx/bitmap.h" - -//----------------------------------------------------------------------------- -// wxMemoryDC -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxMemoryDC: public wxDC -{ -public: - wxMemoryDC(); - wxMemoryDC( wxBitmap& bitmap ); - wxMemoryDC( wxDC *dc ); - - // select the given bitmap to draw on it - void SelectObject(wxBitmap& bmp); - - // select the given bitmap for read-only - void SelectObjectAsSource(const wxBitmap& bmp); - - // get selected bitmap - const wxBitmap& GetSelectedBitmap() const; - wxBitmap& GetSelectedBitmap(); - -private: - wxDECLARE_DYNAMIC_CLASS(wxMemoryDC); -}; - - -#endif - // _WX_DCMEMORY_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/dcmirror.h b/Externals/wxWidgets3/include/wx/dcmirror.h deleted file mode 100644 index 4bbd27e777..0000000000 --- a/Externals/wxWidgets3/include/wx/dcmirror.h +++ /dev/null @@ -1,299 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/dcmirror.h -// Purpose: wxMirrorDC class -// Author: Vadim Zeitlin -// Modified by: -// Created: 21.07.2003 -// Copyright: (c) 2003 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DCMIRROR_H_ -#define _WX_DCMIRROR_H_ - -#include "wx/dc.h" - -// ---------------------------------------------------------------------------- -// wxMirrorDC allows to write the same code for horz/vertical layout -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxMirrorDCImpl : public wxDCImpl -{ -public: - // constructs a mirror DC associated with the given real DC - // - // if mirror parameter is true, all vertical and horizontal coordinates are - // exchanged, otherwise this class behaves in exactly the same way as a - // plain DC - wxMirrorDCImpl(wxDC *owner, wxDCImpl& dc, bool mirror) - : wxDCImpl(owner), - m_dc(dc) - { - m_mirror = mirror; - } - - // wxDCBase operations - virtual void Clear() wxOVERRIDE { m_dc.Clear(); } - virtual void SetFont(const wxFont& font) wxOVERRIDE { m_dc.SetFont(font); } - virtual void SetPen(const wxPen& pen) wxOVERRIDE { m_dc.SetPen(pen); } - virtual void SetBrush(const wxBrush& brush) wxOVERRIDE { m_dc.SetBrush(brush); } - virtual void SetBackground(const wxBrush& brush) wxOVERRIDE - { m_dc.SetBackground(brush); } - virtual void SetBackgroundMode(int mode) wxOVERRIDE { m_dc.SetBackgroundMode(mode); } -#if wxUSE_PALETTE - virtual void SetPalette(const wxPalette& palette) wxOVERRIDE - { m_dc.SetPalette(palette); } -#endif // wxUSE_PALETTE - virtual void DestroyClippingRegion() wxOVERRIDE { m_dc.DestroyClippingRegion(); } - virtual wxCoord GetCharHeight() const wxOVERRIDE { return m_dc.GetCharHeight(); } - virtual wxCoord GetCharWidth() const wxOVERRIDE { return m_dc.GetCharWidth(); } - virtual bool CanDrawBitmap() const wxOVERRIDE { return m_dc.CanDrawBitmap(); } - virtual bool CanGetTextExtent() const wxOVERRIDE { return m_dc.CanGetTextExtent(); } - virtual int GetDepth() const wxOVERRIDE { return m_dc.GetDepth(); } - virtual wxSize GetPPI() const wxOVERRIDE { return m_dc.GetPPI(); } - virtual bool IsOk() const wxOVERRIDE { return m_dc.IsOk(); } - virtual void SetMapMode(wxMappingMode mode) wxOVERRIDE { m_dc.SetMapMode(mode); } - virtual void SetUserScale(double x, double y) wxOVERRIDE - { m_dc.SetUserScale(GetX(x, y), GetY(x, y)); } - virtual void SetLogicalOrigin(wxCoord x, wxCoord y) wxOVERRIDE - { m_dc.SetLogicalOrigin(GetX(x, y), GetY(x, y)); } - virtual void SetDeviceOrigin(wxCoord x, wxCoord y) wxOVERRIDE - { m_dc.SetDeviceOrigin(GetX(x, y), GetY(x, y)); } - virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp) wxOVERRIDE - { m_dc.SetAxisOrientation(GetX(xLeftRight, yBottomUp), - GetY(xLeftRight, yBottomUp)); } - virtual void SetLogicalFunction(wxRasterOperationMode function) wxOVERRIDE - { m_dc.SetLogicalFunction(function); } - - virtual void* GetHandle() const wxOVERRIDE - { return m_dc.GetHandle(); } - -protected: - // returns x and y if not mirroring or y and x if mirroring - wxCoord GetX(wxCoord x, wxCoord y) const { return m_mirror ? y : x; } - wxCoord GetY(wxCoord x, wxCoord y) const { return m_mirror ? x : y; } - double GetX(double x, double y) const { return m_mirror ? y : x; } - double GetY(double x, double y) const { return m_mirror ? x : y; } - bool GetX(bool x, bool y) const { return m_mirror ? y : x; } - bool GetY(bool x, bool y) const { return m_mirror ? x : y; } - - // same thing but for pointers - wxCoord *GetX(wxCoord *x, wxCoord *y) const { return m_mirror ? y : x; } - wxCoord *GetY(wxCoord *x, wxCoord *y) const { return m_mirror ? x : y; } - - // exchange x and y components of all points in the array if necessary - wxPoint* Mirror(int n, const wxPoint*& points) const - { - wxPoint* points_alloc = NULL; - if ( m_mirror ) - { - points_alloc = new wxPoint[n]; - for ( int i = 0; i < n; i++ ) - { - points_alloc[i].x = points[i].y; - points_alloc[i].y = points[i].x; - } - points = points_alloc; - } - return points_alloc; - } - - // wxDCBase functions - virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, - wxFloodFillStyle style = wxFLOOD_SURFACE) wxOVERRIDE - { - return m_dc.DoFloodFill(GetX(x, y), GetY(x, y), col, style); - } - - virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const wxOVERRIDE - { - return m_dc.DoGetPixel(GetX(x, y), GetY(x, y), col); - } - - - virtual void DoDrawPoint(wxCoord x, wxCoord y) wxOVERRIDE - { - m_dc.DoDrawPoint(GetX(x, y), GetY(x, y)); - } - - virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) wxOVERRIDE - { - m_dc.DoDrawLine(GetX(x1, y1), GetY(x1, y1), GetX(x2, y2), GetY(x2, y2)); - } - - virtual void DoDrawArc(wxCoord x1, wxCoord y1, - wxCoord x2, wxCoord y2, - wxCoord xc, wxCoord yc) wxOVERRIDE - { - wxFAIL_MSG( wxT("this is probably wrong") ); - - m_dc.DoDrawArc(GetX(x1, y1), GetY(x1, y1), - GetX(x2, y2), GetY(x2, y2), - xc, yc); - } - - virtual void DoDrawCheckMark(wxCoord x, wxCoord y, - wxCoord w, wxCoord h) wxOVERRIDE - { - m_dc.DoDrawCheckMark(GetX(x, y), GetY(x, y), - GetX(w, h), GetY(w, h)); - } - - virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h, - double sa, double ea) wxOVERRIDE - { - wxFAIL_MSG( wxT("this is probably wrong") ); - - m_dc.DoDrawEllipticArc(GetX(x, y), GetY(x, y), - GetX(w, h), GetY(w, h), - sa, ea); - } - - virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord w, wxCoord h) wxOVERRIDE - { - m_dc.DoDrawRectangle(GetX(x, y), GetY(x, y), GetX(w, h), GetY(w, h)); - } - - virtual void DoDrawRoundedRectangle(wxCoord x, wxCoord y, - wxCoord w, wxCoord h, - double radius) wxOVERRIDE - { - m_dc.DoDrawRoundedRectangle(GetX(x, y), GetY(x, y), - GetX(w, h), GetY(w, h), - radius); - } - - virtual void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord w, wxCoord h) wxOVERRIDE - { - m_dc.DoDrawEllipse(GetX(x, y), GetY(x, y), GetX(w, h), GetY(w, h)); - } - - virtual void DoCrossHair(wxCoord x, wxCoord y) wxOVERRIDE - { - m_dc.DoCrossHair(GetX(x, y), GetY(x, y)); - } - - virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y) wxOVERRIDE - { - m_dc.DoDrawIcon(icon, GetX(x, y), GetY(x, y)); - } - - virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y, - bool useMask = false) wxOVERRIDE - { - m_dc.DoDrawBitmap(bmp, GetX(x, y), GetY(x, y), useMask); - } - - virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y) wxOVERRIDE - { - // this is never mirrored - m_dc.DoDrawText(text, x, y); - } - - virtual void DoDrawRotatedText(const wxString& text, - wxCoord x, wxCoord y, double angle) wxOVERRIDE - { - // this is never mirrored - m_dc.DoDrawRotatedText(text, x, y, angle); - } - - virtual bool DoBlit(wxCoord xdest, wxCoord ydest, - wxCoord w, wxCoord h, - wxDC *source, wxCoord xsrc, wxCoord ysrc, - wxRasterOperationMode rop = wxCOPY, - bool useMask = false, - wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord) wxOVERRIDE - { - return m_dc.DoBlit(GetX(xdest, ydest), GetY(xdest, ydest), - GetX(w, h), GetY(w, h), - source, GetX(xsrc, ysrc), GetY(xsrc, ysrc), - rop, useMask, - GetX(xsrcMask, ysrcMask), GetX(xsrcMask, ysrcMask)); - } - - virtual void DoGetSize(int *w, int *h) const wxOVERRIDE - { - m_dc.DoGetSize(GetX(w, h), GetY(w, h)); - } - - virtual void DoGetSizeMM(int *w, int *h) const wxOVERRIDE - { - m_dc.DoGetSizeMM(GetX(w, h), GetY(w, h)); - } - - virtual void DoDrawLines(int n, const wxPoint points[], - wxCoord xoffset, wxCoord yoffset) wxOVERRIDE - { - wxPoint* points_alloc = Mirror(n, points); - - m_dc.DoDrawLines(n, points, - GetX(xoffset, yoffset), GetY(xoffset, yoffset)); - - delete[] points_alloc; - } - - virtual void DoDrawPolygon(int n, const wxPoint points[], - wxCoord xoffset, wxCoord yoffset, - wxPolygonFillMode fillStyle = wxODDEVEN_RULE) wxOVERRIDE - { - wxPoint* points_alloc = Mirror(n, points); - - m_dc.DoDrawPolygon(n, points, - GetX(xoffset, yoffset), GetY(xoffset, yoffset), - fillStyle); - - delete[] points_alloc; - } - - virtual void DoSetDeviceClippingRegion(const wxRegion& WXUNUSED(region)) wxOVERRIDE - { - wxFAIL_MSG( wxT("not implemented") ); - } - - virtual void DoSetClippingRegion(wxCoord x, wxCoord y, - wxCoord w, wxCoord h) wxOVERRIDE - { - m_dc.DoSetClippingRegion(GetX(x, y), GetY(x, y), GetX(w, h), GetY(w, h)); - } - - virtual void DoGetTextExtent(const wxString& string, - wxCoord *x, wxCoord *y, - wxCoord *descent = NULL, - wxCoord *externalLeading = NULL, - const wxFont *theFont = NULL) const wxOVERRIDE - { - // never mirrored - m_dc.DoGetTextExtent(string, x, y, descent, externalLeading, theFont); - } - -private: - wxDCImpl& m_dc; - - bool m_mirror; - - wxDECLARE_NO_COPY_CLASS(wxMirrorDCImpl); -}; - -class WXDLLIMPEXP_CORE wxMirrorDC : public wxDC -{ -public: - wxMirrorDC(wxDC& dc, bool mirror) - : wxDC(new wxMirrorDCImpl(this, *dc.GetImpl(), mirror)) - { - m_mirror = mirror; - } - - // helper functions which may be useful for the users of this class - wxSize Reflect(const wxSize& sizeOrig) - { - return m_mirror ? wxSize(sizeOrig.y, sizeOrig.x) : sizeOrig; - } - -private: - bool m_mirror; - - wxDECLARE_NO_COPY_CLASS(wxMirrorDC); -}; - -#endif // _WX_DCMIRROR_H_ - diff --git a/Externals/wxWidgets3/include/wx/dcprint.h b/Externals/wxWidgets3/include/wx/dcprint.h deleted file mode 100644 index 2e98c7e43b..0000000000 --- a/Externals/wxWidgets3/include/wx/dcprint.h +++ /dev/null @@ -1,42 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/dcprint.h -// Purpose: wxPrinterDC base header -// Author: Julian Smart -// Modified by: -// Created: -// Copyright: (c) Julian Smart -// Licence: wxWindows Licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DCPRINT_H_BASE_ -#define _WX_DCPRINT_H_BASE_ - -#include "wx/defs.h" - -#if wxUSE_PRINTING_ARCHITECTURE - -#include "wx/dc.h" - -//----------------------------------------------------------------------------- -// wxPrinterDC -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxPrinterDC : public wxDC -{ -public: - wxPrinterDC(); - wxPrinterDC(const wxPrintData& data); - - wxRect GetPaperRect() const; - int GetResolution() const wxOVERRIDE; - -protected: - wxPrinterDC(wxDCImpl *impl) : wxDC(impl) { } - -private: - wxDECLARE_DYNAMIC_CLASS(wxPrinterDC); -}; - -#endif // wxUSE_PRINTING_ARCHITECTURE - -#endif // _WX_DCPRINT_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/dcps.h b/Externals/wxWidgets3/include/wx/dcps.h deleted file mode 100644 index 659eb595f1..0000000000 --- a/Externals/wxWidgets3/include/wx/dcps.h +++ /dev/null @@ -1,17 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/dcps.h -// Purpose: wxPostScriptDC base header -// Author: Julian Smart -// Modified by: -// Created: -// Copyright: (c) Julian Smart -// Licence: wxWindows Licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DCPS_H_BASE_ -#define _WX_DCPS_H_BASE_ - -#include "wx/generic/dcpsg.h" - -#endif - diff --git a/Externals/wxWidgets3/include/wx/dcscreen.h b/Externals/wxWidgets3/include/wx/dcscreen.h deleted file mode 100644 index fb60309da0..0000000000 --- a/Externals/wxWidgets3/include/wx/dcscreen.h +++ /dev/null @@ -1,35 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/dcscreen.h -// Purpose: wxScreenDC base header -// Author: Julian Smart -// Modified by: -// Created: -// Copyright: (c) Julian Smart -// Licence: wxWindows Licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DCSCREEN_H_BASE_ -#define _WX_DCSCREEN_H_BASE_ - -#include "wx/defs.h" -#include "wx/dc.h" - -class WXDLLIMPEXP_CORE wxScreenDC : public wxDC -{ -public: - wxScreenDC(); - - static bool StartDrawingOnTop(wxWindow * WXUNUSED(window)) - { return true; } - static bool StartDrawingOnTop(wxRect * WXUNUSED(rect) = NULL) - { return true; } - static bool EndDrawingOnTop() - { return true; } - -private: - wxDECLARE_DYNAMIC_CLASS(wxScreenDC); -}; - - -#endif - // _WX_DCSCREEN_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/dcsvg.h b/Externals/wxWidgets3/include/wx/dcsvg.h deleted file mode 100644 index 3f7bd5a5fd..0000000000 --- a/Externals/wxWidgets3/include/wx/dcsvg.h +++ /dev/null @@ -1,268 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/dcsvg.h -// Purpose: wxSVGFileDC -// Author: Chris Elliott -// Modified by: -// Created: -// Copyright: (c) Chris Elliott -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DCSVG_H_ -#define _WX_DCSVG_H_ - -#include "wx/string.h" -#include "wx/dc.h" - -#if wxUSE_SVG - -#define wxSVGVersion wxT("v0100") - -#ifdef __BORLANDC__ -#pragma warn -8008 -#pragma warn -8066 -#endif - -class WXDLLIMPEXP_FWD_BASE wxFileOutputStream; - -class WXDLLIMPEXP_FWD_CORE wxSVGFileDC; - -// Base class for bitmap handlers used by wxSVGFileDC, used by the standard -// "embed" and "link" handlers below but can also be used to create a custom -// handler. -class WXDLLIMPEXP_CORE wxSVGBitmapHandler -{ -public: - // Write the representation of the given bitmap, appearing at the specified - // position, to the provided stream. - virtual bool ProcessBitmap(const wxBitmap& bitmap, - wxCoord x, wxCoord y, - wxOutputStream& stream) const = 0; - - virtual ~wxSVGBitmapHandler() {} -}; - -// Predefined standard bitmap handler: creates a file, stores the bitmap in -// this file and uses the file URI in the generated SVG. -class WXDLLIMPEXP_CORE wxSVGBitmapFileHandler : public wxSVGBitmapHandler -{ -public: - virtual bool ProcessBitmap(const wxBitmap& bitmap, - wxCoord x, wxCoord y, - wxOutputStream& stream) const wxOVERRIDE; -}; - -// Predefined handler which embeds the bitmap (base64-encoding it) inside the -// generated SVG file. -class WXDLLIMPEXP_CORE wxSVGBitmapEmbedHandler : public wxSVGBitmapHandler -{ -public: - virtual bool ProcessBitmap(const wxBitmap& bitmap, - wxCoord x, wxCoord y, - wxOutputStream& stream) const wxOVERRIDE; -}; - -class WXDLLIMPEXP_CORE wxSVGFileDCImpl : public wxDCImpl -{ -public: - wxSVGFileDCImpl( wxSVGFileDC *owner, const wxString &filename, - int width=320, int height=240, double dpi=72.0 ); - - virtual ~wxSVGFileDCImpl(); - - bool IsOk() const wxOVERRIDE { return m_OK; } - - virtual bool CanDrawBitmap() const wxOVERRIDE { return true; } - virtual bool CanGetTextExtent() const wxOVERRIDE { return true; } - - virtual int GetDepth() const wxOVERRIDE - { - wxFAIL_MSG(wxT("wxSVGFILEDC::GetDepth Call not implemented")); - return -1; - } - - virtual void Clear() wxOVERRIDE - { - wxFAIL_MSG(wxT("wxSVGFILEDC::Clear() Call not implemented \nNot sensible for an output file?")); - } - - virtual void DestroyClippingRegion() wxOVERRIDE; - - virtual wxCoord GetCharHeight() const wxOVERRIDE; - virtual wxCoord GetCharWidth() const wxOVERRIDE; - - virtual void SetClippingRegion(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), - wxCoord WXUNUSED(w), wxCoord WXUNUSED(h)) - { - wxFAIL_MSG(wxT("wxSVGFILEDC::SetClippingRegion not implemented")); - } - - virtual void SetPalette(const wxPalette& WXUNUSED(palette)) wxOVERRIDE - { - wxFAIL_MSG(wxT("wxSVGFILEDC::SetPalette not implemented")); - } - - virtual void GetClippingBox(wxCoord *WXUNUSED(x), wxCoord *WXUNUSED(y), - wxCoord *WXUNUSED(w), wxCoord *WXUNUSED(h)) - { - wxFAIL_MSG(wxT("wxSVGFILEDC::GetClippingBox not implemented")); - } - - virtual void SetLogicalFunction(wxRasterOperationMode WXUNUSED(function)) wxOVERRIDE - { - wxFAIL_MSG(wxT("wxSVGFILEDC::SetLogicalFunction Call not implemented")); - } - - virtual wxRasterOperationMode GetLogicalFunction() const wxOVERRIDE - { - wxFAIL_MSG(wxT("wxSVGFILEDC::GetLogicalFunction() not implemented")); - return wxCOPY; - } - - virtual void SetBackground( const wxBrush &brush ) wxOVERRIDE; - virtual void SetBackgroundMode( int mode ) wxOVERRIDE; - virtual void SetBrush(const wxBrush& brush) wxOVERRIDE; - virtual void SetFont(const wxFont& font) wxOVERRIDE; - virtual void SetPen(const wxPen& pen) wxOVERRIDE; - - virtual void* GetHandle() const wxOVERRIDE { return NULL; } - - void SetBitmapHandler(wxSVGBitmapHandler* handler); - -private: - virtual bool DoGetPixel(wxCoord, wxCoord, wxColour *) const wxOVERRIDE - { - wxFAIL_MSG(wxT("wxSVGFILEDC::DoGetPixel Call not implemented")); - return true; - } - - virtual bool DoBlit(wxCoord, wxCoord, wxCoord, wxCoord, wxDC *, - wxCoord, wxCoord, wxRasterOperationMode = wxCOPY, - bool = 0, int = -1, int = -1) wxOVERRIDE; - - virtual void DoCrossHair(wxCoord, wxCoord) wxOVERRIDE - { - wxFAIL_MSG(wxT("wxSVGFILEDC::CrossHair Call not implemented")); - } - - virtual void DoDrawArc(wxCoord, wxCoord, wxCoord, wxCoord, wxCoord, wxCoord) wxOVERRIDE; - - virtual void DoDrawBitmap(const wxBitmap &, wxCoord, wxCoord, bool = false) wxOVERRIDE; - - virtual void DoDrawCheckMark(wxCoord x, wxCoord y, wxCoord w, wxCoord h) wxOVERRIDE; - - virtual void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord w, wxCoord h) wxOVERRIDE; - - virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h, - double sa, double ea) wxOVERRIDE; - - virtual void DoDrawIcon(const wxIcon &, wxCoord, wxCoord) wxOVERRIDE; - - virtual void DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) wxOVERRIDE; - - virtual void DoDrawLines(int n, const wxPoint points[], - wxCoord xoffset = 0, wxCoord yoffset = 0) wxOVERRIDE; - - virtual void DoDrawPoint(wxCoord, wxCoord) wxOVERRIDE; - - virtual void DoDrawPolygon(int n, const wxPoint points[], - wxCoord xoffset, wxCoord yoffset, - wxPolygonFillMode fillStyle) wxOVERRIDE; - - virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord w, wxCoord h) wxOVERRIDE; - - virtual void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, - double angle) wxOVERRIDE; - - virtual void DoDrawRoundedRectangle(wxCoord x, wxCoord y, - wxCoord w, wxCoord h, - double radius = 20) wxOVERRIDE ; - - virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y) wxOVERRIDE; - - virtual bool DoFloodFill(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), - const wxColour& WXUNUSED(col), - wxFloodFillStyle WXUNUSED(style) = wxFLOOD_SURFACE) wxOVERRIDE - { - wxFAIL_MSG(wxT("wxSVGFILEDC::DoFloodFill Call not implemented")); - return false; - } - - virtual void DoGetSize(int * x, int *y) const wxOVERRIDE - { - if ( x ) - *x = m_width; - if ( y ) - *y = m_height; - } - - virtual void DoGetTextExtent(const wxString& string, wxCoord *w, wxCoord *h, - wxCoord *descent = NULL, - wxCoord *externalLeading = NULL, - const wxFont *font = NULL) const wxOVERRIDE; - - virtual void DoSetDeviceClippingRegion(const wxRegion& WXUNUSED(region)) wxOVERRIDE - { - wxFAIL_MSG(wxT("wxSVGFILEDC::DoSetDeviceClippingRegion not yet implemented")); - } - - virtual void DoSetClippingRegion(int x, int y, int width, int height) wxOVERRIDE; - - virtual void DoGetSizeMM( int *width, int *height ) const wxOVERRIDE; - - virtual wxSize GetPPI() const wxOVERRIDE; - - void Init (const wxString &filename, int width, int height, double dpi); - - void write( const wxString &s ); - -private: - // If m_graphics_changed is true, close the current element and start a - // new one for the last pen/brush change. - void NewGraphicsIfNeeded(); - - // Open a new graphics group setting up all the attributes according to - // their current values in wxDC. - void DoStartNewGraphics(); - - wxFileOutputStream *m_outfile; - wxString m_filename; - int m_sub_images; // number of png format images we have - bool m_OK; - bool m_graphics_changed; // set by Set{Brush,Pen}() - int m_width, m_height; - double m_dpi; - wxSVGBitmapHandler* m_bmp_handler; // class to handle bitmaps - - // The clipping nesting level is incremented by every call to - // SetClippingRegion() and reset when DestroyClippingRegion() is called. - size_t m_clipNestingLevel; - - // Unique ID for every clipping graphics group: this is simply always - // incremented in each SetClippingRegion() call. - size_t m_clipUniqueId; - - wxDECLARE_ABSTRACT_CLASS(wxSVGFileDCImpl); -}; - - -class WXDLLIMPEXP_CORE wxSVGFileDC : public wxDC -{ -public: - wxSVGFileDC(const wxString& filename, - int width = 320, - int height = 240, - double dpi = 72.0) - : wxDC(new wxSVGFileDCImpl(this, filename, width, height, dpi)) - { - } - - // wxSVGFileDC-specific methods: - - // Use a custom bitmap handler: takes ownership of the handler. - void SetBitmapHandler(wxSVGBitmapHandler* handler); -}; - -#endif // wxUSE_SVG - -#endif // _WX_DCSVG_H_ diff --git a/Externals/wxWidgets3/include/wx/dde.h b/Externals/wxWidgets3/include/wx/dde.h deleted file mode 100644 index d6524e1ff6..0000000000 --- a/Externals/wxWidgets3/include/wx/dde.h +++ /dev/null @@ -1,31 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/dde.h -// Purpose: DDE base header -// Author: Julian Smart -// Modified by: -// Created: -// Copyright: (c) Julian Smart -// Licence: wxWindows Licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DDE_H_BASE_ -#define _WX_DDE_H_BASE_ - -#include "wx/list.h" - -class WXDLLIMPEXP_FWD_BASE wxDDEClient; -class WXDLLIMPEXP_FWD_BASE wxDDEServer; -class WXDLLIMPEXP_FWD_BASE wxDDEConnection; - -WX_DECLARE_USER_EXPORTED_LIST(wxDDEClient, wxDDEClientList, WXDLLIMPEXP_BASE); -WX_DECLARE_USER_EXPORTED_LIST(wxDDEServer, wxDDEServerList, WXDLLIMPEXP_BASE); -WX_DECLARE_USER_EXPORTED_LIST(wxDDEConnection, wxDDEConnectionList, WXDLLIMPEXP_BASE); - -#if defined(__WINDOWS__) - #include "wx/msw/dde.h" -#else - #error DDE is only supported under Windows -#endif - -#endif - // _WX_DDE_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/debug.h b/Externals/wxWidgets3/include/wx/debug.h deleted file mode 100644 index 13f3cb7d55..0000000000 --- a/Externals/wxWidgets3/include/wx/debug.h +++ /dev/null @@ -1,504 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/debug.h -// Purpose: Misc debug functions and macros -// Author: Vadim Zeitlin -// Created: 29/01/98 -// Copyright: (c) 1998-2009 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DEBUG_H_ -#define _WX_DEBUG_H_ - -#include - -#include // for CHAR_BIT used below - -#include "wx/chartype.h" // for __TFILE__ and wxChar -#include "wx/cpp.h" // for __WXFUNCTION__ -#include "wx/dlimpexp.h" // for WXDLLIMPEXP_FWD_BASE - -class WXDLLIMPEXP_FWD_BASE wxString; -class WXDLLIMPEXP_FWD_BASE wxCStrData; - -// ---------------------------------------------------------------------------- -// Defines controlling the debugging macros -// ---------------------------------------------------------------------------- - -/* - wxWidgets can be built with several different levels of debug support - specified by the value of wxDEBUG_LEVEL constant: - - 0: No assertion macros at all, this should only be used when optimizing - for resource-constrained systems (typically embedded ones). - 1: Default level, most of the assertions are enabled. - 2: Maximal (at least for now): asserts which are "expensive" - (performance-wise) or only make sense for finding errors in wxWidgets - itself, as opposed to bugs in applications using it, are also enabled. - */ - -// unless wxDEBUG_LEVEL is predefined (by configure or via wx/setup.h under -// Windows), use the default -#if !defined(wxDEBUG_LEVEL) - #define wxDEBUG_LEVEL 1 -#endif // !defined(wxDEBUG_LEVEL) - -/* - __WXDEBUG__ is defined when wxDEBUG_LEVEL != 0. This is done mostly for - compatibility but it also provides a simpler way to check if asserts and - debug logging is enabled at all. - */ -#if wxDEBUG_LEVEL > 0 - #ifndef __WXDEBUG__ - #define __WXDEBUG__ - #endif -#else - #undef __WXDEBUG__ -#endif - -// Finally there is also a very old WXDEBUG macro not used anywhere at all, it -// is only defined for compatibility. -#ifdef __WXDEBUG__ - #if !defined(WXDEBUG) || !WXDEBUG - #undef WXDEBUG - #define WXDEBUG 1 - #endif // !WXDEBUG -#endif // __WXDEBUG__ - -// ---------------------------------------------------------------------------- -// Handling assertion failures -// ---------------------------------------------------------------------------- - -/* - Type for the function called in case of assert failure, see - wxSetAssertHandler(). - */ -typedef void (*wxAssertHandler_t)(const wxString& file, - int line, - const wxString& func, - const wxString& cond, - const wxString& msg); - -#if wxDEBUG_LEVEL - -// the global assert handler function, if it is NULL asserts don't check their -// conditions -extern WXDLLIMPEXP_DATA_BASE(wxAssertHandler_t) wxTheAssertHandler; - -/* - Sets the function to be called in case of assertion failure. - - The default assert handler forwards to wxApp::OnAssertFailure() whose - default behaviour is, in turn, to show the standard assertion failure - dialog if a wxApp object exists or shows the same dialog itself directly - otherwise. - - While usually it is enough -- and more convenient -- to just override - OnAssertFailure(), to handle all assertion failures, including those - occurring even before wxApp object creation or after its destruction you - need to provide your assertion handler function. - - This function also provides a simple way to disable all asserts: simply - pass NULL pointer to it. Doing this will result in not even evaluating - assert conditions at all, avoiding almost all run-time cost of asserts. - - Notice that this function is not MT-safe, so you should call it before - starting any other threads. - - The return value of this function is the previous assertion handler. It can - be called after any pre-processing by your handler and can also be restored - later if you uninstall your handler. - */ -inline wxAssertHandler_t wxSetAssertHandler(wxAssertHandler_t handler) -{ - const wxAssertHandler_t old = wxTheAssertHandler; - wxTheAssertHandler = handler; - return old; -} - -/* - Reset the default assert handler. - - This may be used to enable asserts, which are disabled by default in this - case, for programs built in release build (NDEBUG defined). - */ -extern void WXDLLIMPEXP_BASE wxSetDefaultAssertHandler(); - -#else // !wxDEBUG_LEVEL - -// provide empty stubs in case assertions are completely disabled -// -// NB: can't use WXUNUSED() here as we're included from wx/defs.h before it is -// defined -inline wxAssertHandler_t wxSetAssertHandler(wxAssertHandler_t /* handler */) -{ - return NULL; -} - -inline void wxSetDefaultAssertHandler() { } - -#endif // wxDEBUG_LEVEL/!wxDEBUG_LEVEL - -// simply a synonym for wxSetAssertHandler(NULL) -inline void wxDisableAsserts() { wxSetAssertHandler(NULL); } - -/* - A macro which disables asserts for applications compiled in release build. - - By default, wxIMPLEMENT_APP (or rather wxIMPLEMENT_WXWIN_MAIN) disable the - asserts in the applications compiled in the release build by calling this. - It does nothing if NDEBUG is not defined. - */ -#ifdef NDEBUG - #define wxDISABLE_ASSERTS_IN_RELEASE_BUILD() wxDisableAsserts() -#else - #define wxDISABLE_ASSERTS_IN_RELEASE_BUILD() -#endif - -#if wxDEBUG_LEVEL - -/* - wxOnAssert() is used by the debugging macros defined below. Different - overloads are needed because these macros can be used with or without wxT(). - - All of them are implemented in src/common/appcmn.cpp and unconditionally - call wxTheAssertHandler so the caller must check that it is non-NULL - (assert macros do it). - */ - -#if wxUSE_UNICODE - -// these overloads are the ones typically used by debugging macros: we have to -// provide wxChar* msg version because it's common to use wxT() in the macros -// and finally, we can't use const wx(char)* msg = NULL, because that would -// be ambiguous -// -// also notice that these functions can't be inline as wxString is not defined -// yet (and can't be as wxString code itself may use assertions) -extern WXDLLIMPEXP_BASE void wxOnAssert(const char *file, - int line, - const char *func, - const char *cond); - -extern WXDLLIMPEXP_BASE void wxOnAssert(const char *file, - int line, - const char *func, - const char *cond, - const char *msg); - -extern WXDLLIMPEXP_BASE void wxOnAssert(const char *file, - int line, - const char *func, - const char *cond, - const wxChar *msg) ; -#endif /* wxUSE_UNICODE */ - -// this version is for compatibility with wx 2.8 Unicode build only, we don't -// use it ourselves any more except in ANSI-only build in which case it is all -// we need -extern WXDLLIMPEXP_BASE void wxOnAssert(const wxChar *file, - int line, - const char *func, - const wxChar *cond, - const wxChar *msg = NULL); - -// these overloads work when msg passed to debug macro is a string and we -// also have to provide wxCStrData overload to resolve ambiguity which would -// otherwise arise from wxASSERT( s.c_str() ) -extern WXDLLIMPEXP_BASE void wxOnAssert(const wxString& file, - int line, - const wxString& func, - const wxString& cond, - const wxString& msg); - -extern WXDLLIMPEXP_BASE void wxOnAssert(const wxString& file, - int line, - const wxString& func, - const wxString& cond); - -extern WXDLLIMPEXP_BASE void wxOnAssert(const char *file, - int line, - const char *func, - const char *cond, - const wxCStrData& msg); - -extern WXDLLIMPEXP_BASE void wxOnAssert(const char *file, - int line, - const char *func, - const char *cond, - const wxString& msg); - -#endif // wxDEBUG_LEVEL - - -// ---------------------------------------------------------------------------- -// Debugging macros -// ---------------------------------------------------------------------------- - -/* - Assertion macros: check if the condition is true and call assert handler - (which will by default notify the user about failure) if it isn't. - - wxASSERT and wxFAIL macros as well as wxTrap() function do nothing at all - if wxDEBUG_LEVEL is 0 however they do check their conditions at default - debug level 1, unlike the previous wxWidgets versions. - - wxASSERT_LEVEL_2 is meant to be used for "expensive" asserts which should - normally be disabled because they have a big impact on performance and so - this macro only does anything if wxDEBUG_LEVEL >= 2. - */ -#if wxDEBUG_LEVEL - // wxTrap() can be used to break into the debugger unconditionally - // (assuming the program is running under debugger, of course). - // - // If possible, we prefer to define it as a macro rather than as a function - // to open the debugger at the position where we trapped and not inside the - // trap function itself which is not very useful. - #ifdef __VISUALC__ - #define wxTrap() __debugbreak() - #elif defined(__GNUC__) - #if defined(__i386) || defined(__x86_64) - #define wxTrap() asm volatile ("int $3") - #endif - #endif - - #ifndef wxTrap - // For all the other cases, use a generic function. - extern WXDLLIMPEXP_BASE void wxTrap(); - #endif - - // Global flag used to indicate that assert macros should call wxTrap(): it - // is set by the default assert handler if the user answers yes to the - // question of whether to trap. - extern WXDLLIMPEXP_DATA_BASE(bool) wxTrapInAssert; - - // This macro checks if the condition is true and calls the assert handler - // with the provided message if it isn't and finally traps if the special - // flag indicating that it should do it was set by the handler. - // - // Notice that we don't use the handler return value for compatibility - // reasons (if we changed its return type, we'd need to change wxApp:: - // OnAssertFailure() too which would break user code overriding it), hence - // the need for the ugly global flag. - #define wxASSERT_MSG_AT(cond, msg, file, line, func) \ - wxSTATEMENT_MACRO_BEGIN \ - if ( wxTheAssertHandler && !(cond) && \ - (wxOnAssert(file, line, func, #cond, msg), \ - wxTrapInAssert) ) \ - { \ - wxTrapInAssert = false; \ - wxTrap(); \ - } \ - wxSTATEMENT_MACRO_END - - // A version asserting at the current location. - #define wxASSERT_MSG(cond, msg) \ - wxASSERT_MSG_AT(cond, msg, __FILE__, __LINE__, __WXFUNCTION__) - - // a version without any additional message, don't use unless condition - // itself is fully self-explanatory - #define wxASSERT(cond) wxASSERT_MSG(cond, (const char*)NULL) - - // wxFAIL is a special form of assert: it always triggers (and so is - // usually used in normally unreachable code) - #define wxFAIL_COND_MSG_AT(cond, msg, file, line, func) \ - wxSTATEMENT_MACRO_BEGIN \ - if ( wxTheAssertHandler && \ - (wxOnAssert(file, line, func, #cond, msg), \ - wxTrapInAssert) ) \ - { \ - wxTrapInAssert = false; \ - wxTrap(); \ - } \ - wxSTATEMENT_MACRO_END - - #define wxFAIL_MSG_AT(msg, file, line, func) \ - wxFAIL_COND_MSG_AT("Assert failure", msg, file, line, func) - - #define wxFAIL_COND_MSG(cond, msg) \ - wxFAIL_COND_MSG_AT(cond, msg, __FILE__, __LINE__, __WXFUNCTION__) - - #define wxFAIL_MSG(msg) wxFAIL_COND_MSG("Assert failure", msg) - #define wxFAIL wxFAIL_MSG((const char*)NULL) -#else // !wxDEBUG_LEVEL - #define wxTrap() - - #define wxASSERT(cond) - #define wxASSERT_MSG(cond, msg) - #define wxFAIL - #define wxFAIL_MSG(msg) - #define wxFAIL_COND_MSG(cond, msg) -#endif // wxDEBUG_LEVEL - -#if wxDEBUG_LEVEL >= 2 - #define wxASSERT_LEVEL_2_MSG(cond, msg) wxASSERT_MSG(cond, msg) - #define wxASSERT_LEVEL_2(cond) wxASSERT(cond) -#else // wxDEBUG_LEVEL < 2 - #define wxASSERT_LEVEL_2_MSG(cond, msg) - #define wxASSERT_LEVEL_2(cond) -#endif - -// This is simply a wrapper for the standard abort() which is not available -// under all platforms. -// -// It isn't really debug-related but there doesn't seem to be any better place -// for it, so declare it here and define it in appbase.cpp, together with -// wxTrap(). -extern void WXDLLIMPEXP_BASE wxAbort(); - -/* - wxCHECK macros always check their conditions, setting debug level to 0 only - makes them silent in case of failure, otherwise -- including at default - debug level 1 -- they call the assert handler if the condition is false - - They are supposed to be used only in invalid situation: for example, an - invalid parameter (e.g. a NULL pointer) is passed to a function. Instead of - dereferencing it and causing core dump the function might use - - wxCHECK_RET( p != NULL, "pointer can't be NULL" ) -*/ - -// the generic macro: takes the condition to check, the statement to be executed -// in case the condition is false and the message to pass to the assert handler -#define wxCHECK2_MSG(cond, op, msg) \ - if ( cond ) \ - {} \ - else \ - { \ - wxFAIL_COND_MSG(#cond, msg); \ - op; \ - } \ - struct wxDummyCheckStruct /* just to force a semicolon */ - -// check which returns with the specified return code if the condition fails -#define wxCHECK_MSG(cond, rc, msg) wxCHECK2_MSG(cond, return rc, msg) - -// check that expression is true, "return" if not (also FAILs in debug mode) -#define wxCHECK(cond, rc) wxCHECK_MSG(cond, rc, (const char*)NULL) - -// check that expression is true, perform op if not -#define wxCHECK2(cond, op) wxCHECK2_MSG(cond, op, (const char*)NULL) - -// special form of wxCHECK2: as wxCHECK, but for use in void functions -// -// NB: there is only one form (with msg parameter) and it's intentional: -// there is no other way to tell the caller what exactly went wrong -// from the void function (of course, the function shouldn't be void -// to begin with...) -#define wxCHECK_RET(cond, msg) wxCHECK2_MSG(cond, return, msg) - - -// ---------------------------------------------------------------------------- -// Compile time asserts -// -// Unlike the normal assert and related macros above which are checked during -// the program run-time the macros below will result in a compilation error if -// the condition they check is false. This is usually used to check the -// expressions containing sizeof()s which cannot be tested with the -// preprocessor. If you can use the #if's, do use them as you can give a more -// detailed error message then. -// ---------------------------------------------------------------------------- - -/* - How this works (you don't have to understand it to be able to use the - macros): we rely on the fact that it is invalid to define a named bit field - in a struct of width 0. All the rest are just the hacks to minimize the - possibility of the compiler warnings when compiling this macro: in - particular, this is why we define a struct and not an object (which would - result in a warning about unused variable) and a named struct (otherwise we'd - get a warning about an unnamed struct not used to define an object!). - */ - -#define wxMAKE_UNIQUE_ASSERT_NAME wxMAKE_UNIQUE_NAME(wxAssert_) - -/* - The second argument of this macro must be a valid C++ identifier and not a - string. I.e. you should use it like this: - - wxCOMPILE_TIME_ASSERT( sizeof(int) >= 2, YourIntsAreTooSmall ); - - It may be used both within a function and in the global scope. -*/ -#if defined( __VMS ) -namespace wxdebug{ - -// HP aCC cannot deal with missing names for template value parameters -template struct STATIC_ASSERTION_FAILURE; - -template <> struct STATIC_ASSERTION_FAILURE { enum { value = 1 }; }; - -// HP aCC cannot deal with missing names for template value parameters -template struct static_assert_test{}; - -} - #define WX_JOIN( X, Y ) X##Y - #define WX_STATIC_ASSERT_BOOL_CAST(x) (bool)(x) - #define wxCOMPILE_TIME_ASSERT(expr, msg) \ - typedef ::wxdebug::static_assert_test<\ - sizeof(::wxdebug::STATIC_ASSERTION_FAILURE< WX_STATIC_ASSERT_BOOL_CAST( expr ) >)>\ - WX_JOIN(wx_static_assert_typedef_, __LINE__) -#else - #define wxCOMPILE_TIME_ASSERT(expr, msg) \ - struct wxMAKE_UNIQUE_ASSERT_NAME { unsigned int msg: expr; } -#endif - -/* - When using VC++ 6 with "Edit and Continue" on, the compiler completely - mishandles __LINE__ and so wxCOMPILE_TIME_ASSERT() doesn't work, provide a - way to make "unique" assert names by specifying a unique prefix explicitly - */ -#define wxMAKE_UNIQUE_ASSERT_NAME2(text) wxCONCAT(wxAssert_, text) - -#define wxCOMPILE_TIME_ASSERT2(expr, msg, text) \ - struct wxMAKE_UNIQUE_ASSERT_NAME2(text) { unsigned int msg: expr; } - -// helpers for wxCOMPILE_TIME_ASSERT below, for private use only -#define wxMAKE_BITSIZE_MSG(type, size) type ## SmallerThan ## size ## Bits - -// a special case of compile time assert: check that the size of the given type -// is at least the given number of bits -#define wxASSERT_MIN_BITSIZE(type, size) \ - wxCOMPILE_TIME_ASSERT(sizeof(type) * CHAR_BIT >= size, \ - wxMAKE_BITSIZE_MSG(type, size)) - - -// ---------------------------------------------------------------------------- -// other miscellaneous debugger-related functions -// ---------------------------------------------------------------------------- - -/* - Return true if we're running under debugger. - - Currently only really works under Win32 and just returns false elsewhere. - */ -#if defined(__WIN32__) - extern bool WXDLLIMPEXP_BASE wxIsDebuggerRunning(); -#else // !Mac - inline bool wxIsDebuggerRunning() { return false; } -#endif // Mac/!Mac - -// An assert helper used to avoid warning when testing constant expressions, -// i.e. wxASSERT( sizeof(int) == 4 ) can generate a compiler warning about -// expression being always true, but not using -// wxASSERT( wxAssertIsEqual(sizeof(int), 4) ) -// -// NB: this is made obsolete by wxCOMPILE_TIME_ASSERT() and should no -// longer be used. -extern bool WXDLLIMPEXP_BASE wxAssertIsEqual(int x, int y); - -// Use of wxFalse instead of false suppresses compiler warnings about testing -// constant expression -extern WXDLLIMPEXP_DATA_BASE(const bool) wxFalse; - -#define wxAssertFailure wxFalse - -// This is similar to WXUNUSED() and useful for parameters which are only used -// in assertions. -#if wxDEBUG_LEVEL - #define WXUNUSED_UNLESS_DEBUG(param) param -#else - #define WXUNUSED_UNLESS_DEBUG(param) WXUNUSED(param) -#endif - - -#endif // _WX_DEBUG_H_ diff --git a/Externals/wxWidgets3/include/wx/debugrpt.h b/Externals/wxWidgets3/include/wx/debugrpt.h deleted file mode 100644 index 17e0b899a4..0000000000 --- a/Externals/wxWidgets3/include/wx/debugrpt.h +++ /dev/null @@ -1,247 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/debugrpt.h -// Purpose: declaration of wxDebugReport class -// Author: Vadim Zeitlin -// Created: 2005-01-17 -// Copyright: (c) 2005 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DEBUGRPT_H_ -#define _WX_DEBUGRPT_H_ - -#include "wx/defs.h" - -#if wxUSE_DEBUGREPORT && wxUSE_XML - -#include "wx/string.h" -#include "wx/arrstr.h" - -class WXDLLIMPEXP_FWD_XML wxXmlNode; - -// ---------------------------------------------------------------------------- -// wxDebugReport: generate a debug report, processing is done in derived class -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_QA wxDebugReport -{ -public: - // this is used for the functions which may report either the current state - // or the state during the last (fatal) exception - enum Context { Context_Current, Context_Exception }; - - - // ctor creates a temporary directory where we create the files which will - // be included in the report, use IsOk() to check for errors - wxDebugReport(); - - // dtor normally destroys the temporary directory created in the ctor (with - // all the files it contains), call Reset() to prevent this from happening - virtual ~wxDebugReport(); - - // return the name of the directory used for this report - const wxString& GetDirectory() const { return m_dir; } - - // return true if the object was successfully initialized - bool IsOk() const { return !GetDirectory().empty(); } - - // reset the directory name we use, the object can't be used any more after - // this as it becomes invalid/uninitialized - void Reset() { m_dir.clear(); } - - - // add another file to the report: the file must already exist, its name - // can be either absolute in which case it is copied to the debug report - // directory or relative to GetDirectory() - // - // description is shown to the user in the report summary - virtual void AddFile(const wxString& filename, const wxString& description); - - // convenience function: write the given text to a file with the given name - // and then add it to the report (the difference with AddFile() is that the - // file will be created by this function and doesn't have to already exist) - bool AddText(const wxString& filename, - const wxString& text, - const wxString& description); - -#if wxUSE_STACKWALKER - // add an XML file containing the current or exception context and the - // stack trace - bool AddCurrentContext() { return AddContext(Context_Current); } - bool AddExceptionContext() { return AddContext(Context_Exception); } - virtual bool AddContext(Context ctx); -#endif - -#if wxUSE_CRASHREPORT - // add a file with crash report - bool AddCurrentDump() { return AddDump(Context_Current); } - bool AddExceptionDump() { return AddDump(Context_Exception); } - virtual bool AddDump(Context ctx); -#endif // wxUSE_CRASHREPORT - - // add all available information to the report - void AddAll(Context context = Context_Exception); - - - // process this report: the base class simply notifies the user that the - // report has been generated, this is usually not enough -- instead you - // should override this method to do something more useful to you - bool Process(); - - // get the name used as base name for various files, by default - // wxApp::GetName() - virtual wxString GetReportName() const; - - // get the files in this report - size_t GetFilesCount() const { return m_files.GetCount(); } - bool GetFile(size_t n, wxString *name, wxString *desc) const; - - // remove the file from report: this is used by wxDebugReportPreview to - // allow the user to remove files potentially containing private - // information from the report - void RemoveFile(const wxString& name); - -protected: -#if wxUSE_STACKWALKER - // used by AddContext() - virtual bool DoAddSystemInfo(wxXmlNode *nodeSystemInfo); - virtual bool DoAddLoadedModules(wxXmlNode *nodeModules); - virtual bool DoAddExceptionInfo(wxXmlNode *nodeContext); - virtual void DoAddCustomContext(wxXmlNode * WXUNUSED(nodeRoot)) { } -#endif - - // used by Process() - virtual bool DoProcess(); - -private: - // name of the report directory - wxString m_dir; - - // the arrays of files in this report and their descriptions - wxArrayString m_files, - m_descriptions; -}; - -#if wxUSE_ZIPSTREAM - -// ---------------------------------------------------------------------------- -// wxDebugReportCompress: compress all files of this debug report in a .ZIP -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_QA wxDebugReportCompress : public wxDebugReport -{ -public: - wxDebugReportCompress() { } - - // you can optionally specify the directory and/or name of the file where - // the debug report should be generated, a default location under the - // directory containing temporary files will be used if you don't - // - // both of these functions should be called before Process()ing the report - // if they're called at all - void SetCompressedFileDirectory(const wxString& dir); - void SetCompressedFileBaseName(const wxString& name); - - // returns the full path of the compressed file (empty if creation failed) - const wxString& GetCompressedFileName() const { return m_zipfile; } - -protected: - virtual bool DoProcess() wxOVERRIDE; - -private: - // user-specified file directory/base name, use defaults if empty - wxString m_zipDir, - m_zipName; - - // full path to the ZIP file we created - wxString m_zipfile; -}; - -// ---------------------------------------------------------------------------- -// wxDebugReportUploader: uploads compressed file using HTTP POST request -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_QA wxDebugReportUpload : public wxDebugReportCompress -{ -public: - // this class will upload the compressed file created by its base class to - // an HTML multipart/form-data form at the specified address - // - // the URL is the base address, input is the name of the "type=file" - // control on the form used for the file name and action is the value of - // the form action field - wxDebugReportUpload(const wxString& url, - const wxString& input, - const wxString& action, - const wxString& curl = wxT("curl")); - -protected: - virtual bool DoProcess() wxOVERRIDE; - - // this function may be overridden in a derived class to show the output - // from curl: this may be an HTML page or anything else that the server - // returned - // - // return value becomes the return value of Process() - virtual bool OnServerReply(const wxArrayString& WXUNUSED(reply)) - { - return true; - } - -private: - // the full URL to use with HTTP POST request - wxString m_uploadURL; - - // the name of the input field containing the file name in the form at - // above URL - wxString m_inputField; - - // the curl command (by default it is just "curl" but could be full path to - // curl or a wrapper script with curl-compatible syntax) - wxString m_curlCmd; -}; - -#endif // wxUSE_ZIPSTREAM - - -// ---------------------------------------------------------------------------- -// wxDebugReportPreview: presents the debug report to the user and allows him -// to veto report entirely or remove some parts of it -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_QA wxDebugReportPreview -{ -public: - // ctor is trivial - wxDebugReportPreview() { } - - // present the report to the user and allow him to modify it by removing - // some or all of the files and, potentially, adding some notes - // - // return true if the report should be processed or false if the user chose - // to cancel report generation or removed all files from it - virtual bool Show(wxDebugReport& dbgrpt) const = 0; - - // dtor is trivial as well but should be virtual for a base class - virtual ~wxDebugReportPreview() { } -}; - -#if wxUSE_GUI - -// ---------------------------------------------------------------------------- -// wxDebugReportPreviewStd: standard debug report preview window -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_QA wxDebugReportPreviewStd : public wxDebugReportPreview -{ -public: - wxDebugReportPreviewStd() { } - - virtual bool Show(wxDebugReport& dbgrpt) const wxOVERRIDE; -}; - -#endif // wxUSE_GUI - -#endif // wxUSE_DEBUGREPORT && wxUSE_XML - -#endif // _WX_DEBUGRPT_H_ diff --git a/Externals/wxWidgets3/include/wx/defs.h b/Externals/wxWidgets3/include/wx/defs.h deleted file mode 100644 index 98262ba07a..0000000000 --- a/Externals/wxWidgets3/include/wx/defs.h +++ /dev/null @@ -1,3423 +0,0 @@ -/* - * Name: wx/defs.h - * Purpose: Declarations/definitions common to all wx source files - * Author: Julian Smart and others - * Modified by: Ryan Norton (Converted to C) - * Created: 01/02/97 - * Copyright: (c) Julian Smart - * Licence: wxWindows licence - */ - -/* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */ - -#ifndef _WX_DEFS_H_ -#define _WX_DEFS_H_ - -/* ---------------------------------------------------------------------------- */ -/* compiler and OS identification */ -/* ---------------------------------------------------------------------------- */ - -#include "wx/platform.h" - -#ifdef __cplusplus -/* Make sure the environment is set correctly */ -# if defined(__WXMSW__) && defined(__X__) -# error "Target can't be both X and MSW" -# elif !defined(__WXMOTIF__) && \ - !defined(__WXMSW__) && \ - !defined(__WXGTK__) && \ - !defined(__WXOSX_COCOA__) && \ - !defined(__WXOSX_IPHONE__) && \ - !defined(__X__) && \ - !defined(__WXDFB__) && \ - !defined(__WXX11__) && \ - !defined(__WXQT__) && \ - wxUSE_GUI -# ifdef __UNIX__ -# error "No Target! You should use wx-config program for compilation flags!" -# else /* !Unix */ -# error "No Target! You should use supplied makefiles for compilation!" -# endif /* Unix/!Unix */ -# endif -#endif /*__cplusplus*/ - -#ifndef __WXWINDOWS__ - #define __WXWINDOWS__ 1 -#endif - -#ifndef wxUSE_BASE - /* by default consider that this is a monolithic build */ - #define wxUSE_BASE 1 -#endif - -#if !wxUSE_GUI && !defined(__WXBASE__) - #define __WXBASE__ -#endif - -/* suppress some Visual C++ warnings */ -#ifdef __VISUALC__ - /* the only "real" warning here is 4244 but there are just too many of them */ - /* in our code... one day someone should go and fix them but until then... */ -# pragma warning(disable:4097) /* typedef used as class */ -# pragma warning(disable:4201) /* nonstandard extension used: nameless struct/union */ -# pragma warning(disable:4244) /* conversion from double to float */ -# pragma warning(disable:4355) /* 'this' used in base member initializer list */ -# pragma warning(disable:4511) /* copy ctor couldn't be generated */ -# pragma warning(disable:4512) /* operator=() couldn't be generated */ -# pragma warning(disable:4514) /* unreferenced inline func has been removed */ -# pragma warning(disable:4710) /* function not inlined */ - - /* - TODO: this warning should really be enabled as it can be genuinely - useful, check where does it occur in wxWidgets - */ - #pragma warning(disable: 4127) /* conditional expression is constant */ - - /* There are too many false positivies for this one, particularly when - using templates like wxVector */ - /* class 'foo' needs to have dll-interface to be used by clients of - class 'bar'" */ -# pragma warning(disable:4251) - - /* - This is a similar warning which occurs when deriving from standard - containers. MSDN even mentions that it can be ignored in this case - (albeit only in debug build while the warning is the same in release - too and seems equally harmless). - */ -#if wxUSE_STD_CONTAINERS -# pragma warning(disable:4275) -#endif /* wxUSE_STD_CONTAINERS */ - -# ifdef __VISUALC5__ - /* For VC++ 5.0 for release mode, the warning 'C4702: unreachable code */ - /* is buggy, and occurs for code that does actually get executed */ -# ifndef __WXDEBUG__ -# pragma warning(disable:4702) /* unreachable code */ -# endif - - /* The VC++ 5.0 warning 'C4003: not enough actual parameters for macro' - * is incompatible with the wxWidgets headers since it is given when - * parameters are empty but not missing. */ -# pragma warning(disable:4003) /* not enough actual parameters for macro */ -# endif - - /* - When compiling with VC++ 7 /Wp64 option we get thousands of warnings for - conversion from size_t to int or long. Some precious few of them might - be worth looking into but unfortunately it seems infeasible to fix all - the other, harmless ones (e.g. inserting static_cast(s.length()) - everywhere this method is used though we are quite sure that using >4GB - strings is a bad idea anyhow) so just disable it globally for now. - */ - #if wxCHECK_VISUALC_VERSION(7) - /* conversion from 'size_t' to 'unsigned long', possible loss of data */ - #pragma warning(disable:4267) - #endif /* VC++ 7 or later */ - - /* - VC++ 8 gives a warning when using standard functions such as sprintf, - localtime, ... -- stop this madness, unless the user had already done it - */ - #if wxCHECK_VISUALC_VERSION(8) - #ifndef _CRT_SECURE_NO_DEPRECATE - #define _CRT_SECURE_NO_DEPRECATE 1 - #endif - #ifndef _CRT_NON_CONFORMING_SWPRINTFS - #define _CRT_NON_CONFORMING_SWPRINTFS 1 - #endif - #ifndef _SCL_SECURE_NO_WARNINGS - #define _SCL_SECURE_NO_WARNINGS 1 - #endif - #endif /* VC++ 8 */ -#endif /* __VISUALC__ */ - -/* suppress some Borland C++ warnings */ -#ifdef __BORLANDC__ -# pragma warn -inl /* Functions containing reserved words and certain constructs are not expanded inline */ -#endif /* __BORLANDC__ */ - -/* - g++ gives a warning when a class has private dtor if it has no friends but - this is a perfectly valid situation for a ref-counted class which destroys - itself when its ref count drops to 0, so provide a macro to suppress this - warning - */ -#ifdef __GNUG__ -# define wxSUPPRESS_GCC_PRIVATE_DTOR_WARNING(name) \ - friend class wxDummyFriendFor ## name; -#else /* !g++ */ -# define wxSUPPRESS_GCC_PRIVATE_DTOR_WARNING(name) -#endif - -/* - Clang Support - */ - -#ifndef WX_HAS_CLANG_FEATURE -# ifndef __has_feature -# define WX_HAS_CLANG_FEATURE(x) 0 -# else -# define WX_HAS_CLANG_FEATURE(x) __has_feature(x) -# endif -#endif - -/* ---------------------------------------------------------------------------- */ -/* wxWidgets version and compatibility defines */ -/* ---------------------------------------------------------------------------- */ - -#include "wx/version.h" - -/* ============================================================================ */ -/* non portable C++ features */ -/* ============================================================================ */ - -/* ---------------------------------------------------------------------------- */ -/* compiler defects workarounds */ -/* ---------------------------------------------------------------------------- */ - -/* - Digital Unix C++ compiler only defines this symbol for .cxx and .hxx files, - so define it ourselves (newer versions do it for all files, though, and - don't allow it to be redefined) - */ -#if defined(__DECCXX) && !defined(__VMS) && !defined(__cplusplus) -#define __cplusplus -#endif /* __DECCXX */ - -/* Resolves linking problems under HP-UX when compiling with gcc/g++ */ -#if defined(__HPUX__) && defined(__GNUG__) -#define va_list __gnuc_va_list -#endif /* HP-UX */ - -/* Prevents conflicts between sys/types.h and winsock.h with Cygwin, */ -/* when using Windows sockets. */ -#if defined(__CYGWIN__) && defined(__WINDOWS__) -#define __USE_W32_SOCKETS -#endif - -/* ---------------------------------------------------------------------------- */ -/* check for native bool type and TRUE/FALSE constants */ -/* ---------------------------------------------------------------------------- */ - -/* for backwards compatibility, also define TRUE and FALSE */ -/* */ -/* note that these definitions should work both in C++ and C code, so don't */ -/* use true/false below */ -#ifndef TRUE - #define TRUE 1 -#endif - -#ifndef FALSE - #define FALSE 0 -#endif - -typedef short int WXTYPE; - - -/* ---------------------------------------------------------------------------- */ -/* other feature tests */ -/* ---------------------------------------------------------------------------- */ - -#ifdef __cplusplus - -/* Every ride down a slippery slope begins with a single step.. */ -/* */ -/* Yes, using nested classes is indeed against our coding standards in */ -/* general, but there are places where you can use them to advantage */ -/* without totally breaking ports that cannot use them. If you do, then */ -/* wrap it in this guard, but such cases should still be relatively rare. */ -#define wxUSE_NESTED_CLASSES 1 - -/* check for explicit keyword support */ -#ifndef HAVE_EXPLICIT - #if defined(__VISUALC__) - #define HAVE_EXPLICIT - #elif defined(__GNUC__) - #define HAVE_EXPLICIT - #elif defined(__BORLANDC__) && (__BORLANDC__ >= 0x0520) - /* BC++ 4.52 doesn't support explicit, CBuilder 1 does */ - #define HAVE_EXPLICIT - #endif -#endif /* !HAVE_EXPLICIT */ - -#ifdef HAVE_EXPLICIT - #define wxEXPLICIT explicit -#else /* !HAVE_EXPLICIT */ - #define wxEXPLICIT -#endif /* HAVE_EXPLICIT/!HAVE_EXPLICIT */ - -/* check for override keyword support */ -#ifndef HAVE_OVERRIDE - #if __cplusplus >= 201103L - /* All C++11 compilers should have it. */ - #define HAVE_OVERRIDE - #elif wxCHECK_VISUALC_VERSION(11) - /* - VC++ supports override keyword since version 8 but doesn't define - __cplusplus as indicating C++11 support (at least up to and - including 12), so handle its case specially. - - Also note that while the keyword is supported, using it with - versions 8, 9 and 10 results in C4481 compiler warning ("nonstandard - extension used") and so we avoid using it there, you could disable - this warning and predefine HAVE_OVERRIDE if you don't care about it. - */ - #define HAVE_OVERRIDE - #elif WX_HAS_CLANG_FEATURE(cxx_override_control) - #define HAVE_OVERRIDE - #endif -#endif /* !HAVE_OVERRIDE */ - -#ifdef HAVE_OVERRIDE - #define wxOVERRIDE override -#else /* !HAVE_OVERRIDE */ - #define wxOVERRIDE -#endif /* HAVE_OVERRIDE/!HAVE_EXPLICIT */ - -/* wxFALLTHROUGH is used to notate explicit fallthroughs in switch statements */ - -#if __cplusplus >= 201103L && defined(__has_warning) - #if WX_HAS_CLANG_FEATURE(cxx_attributes) - #define wxFALLTHROUGH [[clang::fallthrough]] - #endif -#endif - -#ifndef wxFALLTHROUGH - #define wxFALLTHROUGH ((void)0) -#endif - -/* these macros are obsolete, use the standard C++ casts directly now */ -#define wx_static_cast(t, x) static_cast(x) -#define wx_const_cast(t, x) const_cast(x) -#define wx_reinterpret_cast(t, x) reinterpret_cast(x) - -/* - This one is a wx invention: like static cast but used when we intentionally - truncate from a larger to smaller type, static_cast<> can't be used for it - as it results in warnings when using some compilers (SGI mipspro for example) - */ -#if defined(__INTELC__) - template - inline T wx_truncate_cast_impl(X x) - { - #pragma warning(push) - /* implicit conversion of a 64-bit integral type to a smaller integral type */ - #pragma warning(disable: 1682) - /* conversion from "X" to "T" may lose significant bits */ - #pragma warning(disable: 810) - /* non-pointer conversion from "foo" to "bar" may lose significant bits */ - #pragma warning(disable: 2259) - - return x; - - #pragma warning(pop) - } - - #define wx_truncate_cast(t, x) wx_truncate_cast_impl(x) - -#elif defined(__VISUALC__) && __VISUALC__ >= 1310 - template - inline T wx_truncate_cast_impl(X x) - { - #pragma warning(push) - /* conversion from 'size_t' to 'type', possible loss of data */ - #pragma warning(disable: 4267) - /* conversion from 'type1' to 'type2', possible loss of data */ - #pragma warning(disable: 4242) - - return x; - - #pragma warning(pop) - } - - #define wx_truncate_cast(t, x) wx_truncate_cast_impl(x) -#else - #define wx_truncate_cast(t, x) ((t)(x)) -#endif - -/* for consistency with wxStatic/DynamicCast defined in wx/object.h */ -#define wxConstCast(obj, className) wx_const_cast(className *, obj) - -#ifndef HAVE_STD_WSTRING - #if __cplusplus >= 201103L - #define HAVE_STD_WSTRING - #elif defined(__VISUALC__) - #define HAVE_STD_WSTRING - #elif defined(__MINGW32__) - #define HAVE_STD_WSTRING - #endif -#endif - -#ifndef HAVE_STD_STRING_COMPARE - #if __cplusplus >= 201103L - #define HAVE_STD_STRING_COMPARE - #elif defined(__VISUALC__) - #define HAVE_STD_STRING_COMPARE - #elif defined(__MINGW32__) || defined(__CYGWIN32__) - #define HAVE_STD_STRING_COMPARE - #endif -#endif - -#ifndef HAVE_TR1_TYPE_TRAITS - #if defined(__VISUALC__) && (_MSC_FULL_VER >= 150030729) - #define HAVE_TR1_TYPE_TRAITS - #endif -#endif - -/* - Check for C++11 compilers, it is important to do it before the - __has_include() checks because at least g++ 4.9.2+ __has_include() returns - true for C++11 headers which can't be compiled in non-C++11 mode. - */ -#if __cplusplus >= 201103L || wxCHECK_VISUALC_VERSION(10) - #ifndef HAVE_TYPE_TRAITS - #define HAVE_TYPE_TRAITS - #endif - #ifndef HAVE_STD_UNORDERED_MAP - #define HAVE_STD_UNORDERED_MAP - #endif - #ifndef HAVE_STD_UNORDERED_SET - #define HAVE_STD_UNORDERED_SET - #endif -#elif defined(__has_include) - /* - We're in non-C++11 mode here, so only test for pre-C++11 headers. As - mentioned above, using __has_include() to test for C++11 would wrongly - detect them even though they can't be used in this case, don't do it. - */ - #if !defined(HAVE_TR1_TYPE_TRAITS) && __has_include() - #define HAVE_TR1_TYPE_TRAITS - #endif - - #if !defined(HAVE_TR1_UNORDERED_MAP) && __has_include() - #define HAVE_TR1_UNORDERED_MAP - #endif - - #if !defined(HAVE_TR1_UNORDERED_SET) && __has_include() - #define HAVE_TR1_UNORDERED_SET - #endif -#endif /* defined(__has_include) */ - -#endif /* __cplusplus */ - -/* provide replacement for C99 va_copy() if the compiler doesn't have it */ - -/* could be already defined by configure or the user */ -#ifndef wxVaCopy - /* if va_copy is a macro or configure detected that we have it, use it */ - #if defined(va_copy) || defined(HAVE_VA_COPY) - #define wxVaCopy va_copy - #else /* no va_copy, try to provide a replacement */ - /* - configure tries to determine whether va_list is an array or struct - type, but it may not be used under Windows, so deal with a few - special cases. - */ - - #if defined(__PPC__) && (defined(_CALL_SYSV) || defined (_WIN32)) - /* - PPC using SysV ABI and NT/PPC are special in that they use an - extra level of indirection. - */ - #define VA_LIST_IS_POINTER - #endif /* SysV or Win32 on __PPC__ */ - - /* - note that we use memmove(), not memcpy(), in case anybody tries - to do wxVaCopy(ap, ap) - */ - #if defined(VA_LIST_IS_POINTER) - #define wxVaCopy(d, s) memmove(*(d), *(s), sizeof(va_list)) - #elif defined(VA_LIST_IS_ARRAY) - #define wxVaCopy(d, s) memmove((d), (s), sizeof(va_list)) - #else /* we can only hope that va_lists are simple lvalues */ - #define wxVaCopy(d, s) ((d) = (s)) - #endif - #endif /* va_copy/!va_copy */ -#endif /* wxVaCopy */ - -#ifndef HAVE_WOSTREAM - /* - Mingw <= 3.4 and all versions of Cygwin don't have std::wostream - */ - #if (defined(__MINGW32__) && !wxCHECK_GCC_VERSION(4, 0)) || \ - defined(__CYGWIN__) - #define wxNO_WOSTREAM - #endif - - /* VC++ doesn't have it in the old iostream library */ - #if defined(__VISUALC__) && wxUSE_IOSTREAMH - #define wxNO_WOSTREAM - #endif - - #ifndef wxNO_WOSTREAM - #define HAVE_WOSTREAM - #endif - - #undef wxNO_WOSTREAM -#endif /* HAVE_WOSTREAM */ - -/* ---------------------------------------------------------------------------- */ -/* other C++ features */ -/* ---------------------------------------------------------------------------- */ - -#ifndef HAVE_PARTIAL_SPECIALIZATION - /* be optimistic by default */ - #define HAVE_PARTIAL_SPECIALIZATION -#endif - -#ifdef __VISUALC__ - #if __VISUALC__ < 1310 - #undef HAVE_PARTIAL_SPECIALIZATION - #endif -#endif /* __VISUALC__ */ - - -#ifndef HAVE_TEMPLATE_OVERLOAD_RESOLUTION - /* assume the compiler can use type or const expressions as template - arguments if it supports partial specialization -- except if it's a - Borland one which can't */ - #if defined(HAVE_PARTIAL_SPECIALIZATION) && !defined(__BORLANDC__) - #define HAVE_TEMPLATE_OVERLOAD_RESOLUTION - #endif /* (HAVE_PARTIAL_SPECIALIZATION) && !defined(__BORLANDC__) */ -#endif /* !defined(HAVE_TEMPLATE_OVERLOAD_RESOLUTION) */ - -/* ---------------------------------------------------------------------------- */ -/* portable calling conventions macros */ -/* ---------------------------------------------------------------------------- */ - -/* stdcall is used for all functions called by Windows under Windows */ -#if defined(__WINDOWS__) - #if defined(__GNUWIN32__) - #define wxSTDCALL __attribute__((stdcall)) - #else - /* both VC++ and Borland understand this */ - #define wxSTDCALL _stdcall - #endif - -#else /* Win */ - /* no such stupidness under Unix */ - #define wxSTDCALL -#endif /* platform */ - -/* LINKAGEMODE mode is empty for everything except OS/2 */ -#ifndef LINKAGEMODE - #define LINKAGEMODE -#endif /* LINKAGEMODE */ - -/* wxCALLBACK should be used for the functions which are called back by */ -/* Windows (such as compare function for wxListCtrl) */ -#if defined(__WIN32__) - #define wxCALLBACK wxSTDCALL -#else - /* no stdcall under Unix nor Win16 */ - #define wxCALLBACK -#endif /* platform */ - -/* generic calling convention for the extern "C" functions */ - -#if defined(__VISUALC__) - #define wxC_CALLING_CONV _cdecl -#else /* !Visual C++ */ - #define wxC_CALLING_CONV -#endif /* compiler */ - -/* callling convention for the qsort(3) callback */ -#define wxCMPFUNC_CONV wxC_CALLING_CONV - -/* compatibility :-( */ -#define CMPFUNC_CONV wxCMPFUNC_CONV - -/* DLL import/export declarations */ -#include "wx/dlimpexp.h" - -/* ---------------------------------------------------------------------------- */ -/* Very common macros */ -/* ---------------------------------------------------------------------------- */ - -/* Printf-like attribute definitions to obtain warnings with GNU C/C++ */ -#ifndef WX_ATTRIBUTE_PRINTF -# if defined(__GNUC__) && !wxUSE_UNICODE -# define WX_ATTRIBUTE_PRINTF(m, n) __attribute__ ((__format__ (__printf__, m, n))) -# else -# define WX_ATTRIBUTE_PRINTF(m, n) -# endif - -# define WX_ATTRIBUTE_PRINTF_1 WX_ATTRIBUTE_PRINTF(1, 2) -# define WX_ATTRIBUTE_PRINTF_2 WX_ATTRIBUTE_PRINTF(2, 3) -# define WX_ATTRIBUTE_PRINTF_3 WX_ATTRIBUTE_PRINTF(3, 4) -# define WX_ATTRIBUTE_PRINTF_4 WX_ATTRIBUTE_PRINTF(4, 5) -# define WX_ATTRIBUTE_PRINTF_5 WX_ATTRIBUTE_PRINTF(5, 6) -#endif /* !defined(WX_ATTRIBUTE_PRINTF) */ - -#ifndef WX_ATTRIBUTE_NORETURN -# if WX_HAS_CLANG_FEATURE(attribute_analyzer_noreturn) -# define WX_ATTRIBUTE_NORETURN __attribute__((analyzer_noreturn)) -# elif defined( __GNUC__ ) -# define WX_ATTRIBUTE_NORETURN __attribute__ ((noreturn)) -# elif defined(__VISUALC__) -# define WX_ATTRIBUTE_NORETURN __declspec(noreturn) -# else -# define WX_ATTRIBUTE_NORETURN -# endif -#endif - -#if defined(__GNUC__) - #define WX_ATTRIBUTE_UNUSED __attribute__ ((unused)) -#else - #define WX_ATTRIBUTE_UNUSED -#endif - -/* - Macros for marking functions as being deprecated. - - The preferred macro in the new code is wxDEPRECATED_MSG() which allows to - explain why is the function deprecated. Almost all the existing code uses - the older wxDEPRECATED() or its variants currently, but this will hopefully - change in the future. - */ - -/* The basic compiler-specific construct to generate a deprecation warning. */ -#ifdef __clang__ - #define wxDEPRECATED_DECL __attribute__((deprecated)) -#elif defined(__GNUC__) - #define wxDEPRECATED_DECL __attribute__((deprecated)) -#elif defined(__VISUALC__) - #define wxDEPRECATED_DECL __declspec(deprecated) -#else - #define wxDEPRECATED_DECL -#endif - -/* - Macro taking the deprecation message. It applies to the next declaration. - - If the compiler doesn't support showing the message, this degrades to a - simple wxDEPRECATED(), i.e. at least gives a warning, if possible. - */ -#if defined(__clang__) && defined(__has_extension) - #if __has_extension(attribute_deprecated_with_message) - #define wxDEPRECATED_MSG(msg) __attribute__((deprecated(msg))) - #else - #define wxDEPRECATED_MSG(msg) __attribute__((deprecated)) - #endif -#elif wxCHECK_GCC_VERSION(4, 5) - #define wxDEPRECATED_MSG(msg) __attribute__((deprecated(msg))) -#elif wxCHECK_VISUALC_VERSION(8) - #define wxDEPRECATED_MSG(msg) __declspec(deprecated("deprecated: " msg)) -#else - #define wxDEPRECATED_MSG(msg) wxDEPRECATED_DECL -#endif - -/* - Macro taking the declaration that it deprecates. Prefer to use - wxDEPRECATED_MSG() instead as it's simpler (wrapping the entire declaration - makes the code unclear) and allows to specify the explanation. - */ -#define wxDEPRECATED(x) wxDEPRECATED_DECL x - -#if defined(__GNUC__) && !wxCHECK_GCC_VERSION(3, 4) - /* - We need to add dummy "inline" to allow gcc < 3.4 to handle the - deprecation attribute on the constructors. - */ - #define wxDEPRECATED_CONSTRUCTOR(x) wxDEPRECATED( inline x) -#else - #define wxDEPRECATED_CONSTRUCTOR(x) wxDEPRECATED(x) -#endif - -/* - Macro which marks the function as being deprecated but also defines it - inline. - - Currently it's defined in the same trivial way in all cases but it could - need a special definition with some other compilers in the future which - explains why do we have it. - */ -#define wxDEPRECATED_INLINE(func, body) wxDEPRECATED(func) { body } - -/* - A macro to define a simple deprecated accessor. - */ -#define wxDEPRECATED_ACCESSOR(func, what) wxDEPRECATED_INLINE(func, return what;) - -/* - Special variant of the macro above which should be used for the functions - which are deprecated but called by wx itself: this often happens with - deprecated virtual functions which are called by the library. - */ -#ifdef WXBUILDING -# define wxDEPRECATED_BUT_USED_INTERNALLY(x) x -#else -# define wxDEPRECATED_BUT_USED_INTERNALLY(x) wxDEPRECATED(x) -#endif - -/* - Macros to suppress and restore gcc warnings, requires g++ >= 4.6 and don't - do anything otherwise. - - Example of use: - - wxGCC_WARNING_SUPPRESS(float-equal) - inline bool wxIsSameDouble(double x, double y) { return x == y; } - wxGCC_WARNING_RESTORE(float-equal) - */ -#if defined(__clang__) || wxCHECK_GCC_VERSION(4, 6) -# define wxGCC_WARNING_SUPPRESS(x) \ - _Pragma (wxSTRINGIZE(GCC diagnostic push)) \ - _Pragma (wxSTRINGIZE(GCC diagnostic ignored wxSTRINGIZE(wxCONCAT(-W,x)))) -# define wxGCC_WARNING_RESTORE(x) \ - _Pragma (wxSTRINGIZE(GCC diagnostic pop)) -#else /* gcc < 4.6 or not gcc and not clang at all */ -# define wxGCC_WARNING_SUPPRESS(x) -# define wxGCC_WARNING_RESTORE(x) -#endif - -/* - Macros to suppress and restore clang warning only when it is valid. - - Example: - wxCLANG_WARNING_SUPPRESS(inconsistent-missing-override) - virtual wxClassInfo *GetClassInfo() const - wxCLANG_WARNING_RESTORE(inconsistent-missing-override) -*/ -#if defined(__has_warning) -# define wxCLANG_HAS_WARNING(x) __has_warning(x) /* allow macro expansion for the warning name */ -# define wxCLANG_IF_VALID_WARNING(x,y) \ - wxCONCAT(wxCLANG_IF_VALID_WARNING_,wxCLANG_HAS_WARNING(wxSTRINGIZE(wxCONCAT(-W,x))))(y) -# define wxCLANG_IF_VALID_WARNING_0(x) -# define wxCLANG_IF_VALID_WARNING_1(x) x -# define wxCLANG_WARNING_SUPPRESS(x) \ - wxCLANG_IF_VALID_WARNING(x,wxGCC_WARNING_SUPPRESS(x)) -# define wxCLANG_WARNING_RESTORE(x) \ - wxCLANG_IF_VALID_WARNING(x,wxGCC_WARNING_RESTORE(x)) -#else -# define wxCLANG_WARNING_SUPPRESS(x) -# define wxCLANG_WARNING_RESTORE(x) -#endif - -/* - Combination of the two variants above: should be used for deprecated - functions which are defined inline and are used by wxWidgets itself. - */ -#ifdef WXBUILDING -# define wxDEPRECATED_BUT_USED_INTERNALLY_INLINE(func, body) func { body } -#else -# define wxDEPRECATED_BUT_USED_INTERNALLY_INLINE(func, body) \ - wxDEPRECATED(func) { body } -#endif - -/* NULL declaration: it must be defined as 0 for C++ programs (in particular, */ -/* it must not be defined as "(void *)0" which is standard for C but completely */ -/* breaks C++ code) */ -#include - -#ifdef __cplusplus - -// everybody gets the assert and other debug macros -#include "wx/debug.h" - - // delete pointer if it is not NULL and NULL it afterwards - template - inline void wxDELETE(T*& ptr) - { - typedef char TypeIsCompleteCheck[sizeof(T)] WX_ATTRIBUTE_UNUSED; - - if ( ptr != NULL ) - { - delete ptr; - ptr = NULL; - } - } - - // delete an array and NULL it (see comments above) - template - inline void wxDELETEA(T*& ptr) - { - typedef char TypeIsCompleteCheck[sizeof(T)] WX_ATTRIBUTE_UNUSED; - - if ( ptr != NULL ) - { - delete [] ptr; - ptr = NULL; - } - } - - // trivial implementation of std::swap() for primitive types - template - inline void wxSwap(T& first, T& second) - { - T tmp(first); - first = second; - second = tmp; - } -#endif /*__cplusplus*/ - -/* size of statically declared array */ -#define WXSIZEOF(array) (sizeof(array)/sizeof(array[0])) - -/* symbolic constant used by all Find()-like functions returning positive */ -/* integer on success as failure indicator */ -#define wxNOT_FOUND (-1) - -/* the default value for some length parameters meaning that the string is */ -/* NUL-terminated */ -#define wxNO_LEN ((size_t)-1) - -/* ---------------------------------------------------------------------------- */ -/* macros dealing with comparison operators */ -/* ---------------------------------------------------------------------------- */ - -/* - Expands into m(op, args...) for each op in the set { ==, !=, <, <=, >, >= }. - */ -#define wxFOR_ALL_COMPARISONS(m) \ - m(==) m(!=) m(>=) m(<=) m(>) m(<) - -#define wxFOR_ALL_COMPARISONS_1(m, x) \ - m(==,x) m(!=,x) m(>=,x) m(<=,x) m(>,x) m(<,x) - -#define wxFOR_ALL_COMPARISONS_2(m, x, y) \ - m(==,x,y) m(!=,x,y) m(>=,x,y) m(<=,x,y) m(>,x,y) m(<,x,y) - -#define wxFOR_ALL_COMPARISONS_3(m, x, y, z) \ - m(==,x,y,z) m(!=,x,y,z) m(>=,x,y,z) m(<=,x,y,z) m(>,x,y,z) m(<,x,y,z) - -/* - These are only used with wxDEFINE_COMPARISON_[BY_]REV: they pass both the - normal and the reversed comparison operators to the macro. - */ -#define wxFOR_ALL_COMPARISONS_2_REV(m, x, y) \ - m(==,x,y,==) m(!=,x,y,!=) m(>=,x,y,<=) \ - m(<=,x,y,>=) m(>,x,y,<) m(<,x,y,>) - -#define wxFOR_ALL_COMPARISONS_3_REV(m, x, y, z) \ - m(==,x,y,z,==) m(!=,x,y,z,!=) m(>=,x,y,z,<=) \ - m(<=,x,y,z,>=) m(>,x,y,z,<) m(<,x,y,z,>) - - -#define wxDEFINE_COMPARISON(op, T1, T2, cmp) \ - inline bool operator op(T1 x, T2 y) { return cmp(x, y, op); } - -#define wxDEFINE_COMPARISON_REV(op, T1, T2, cmp, oprev) \ - inline bool operator op(T2 y, T1 x) { return cmp(x, y, oprev); } - -#define wxDEFINE_COMPARISON_BY_REV(op, T1, T2, oprev) \ - inline bool operator op(T1 x, T2 y) { return y oprev x; } - -/* - Define all 6 comparison operators (==, !=, <, <=, >, >=) for the given - types in the specified order. The implementation is provided by the cmp - macro. Normally wxDEFINE_ALL_COMPARISONS should be used as comparison - operators are usually symmetric. - */ -#define wxDEFINE_COMPARISONS(T1, T2, cmp) \ - wxFOR_ALL_COMPARISONS_3(wxDEFINE_COMPARISON, T1, T2, cmp) - -/* - Define all 6 comparison operators (==, !=, <, <=, >, >=) for the given - types in the specified order, implemented in terms of existing operators - for the reverse order. - */ -#define wxDEFINE_COMPARISONS_BY_REV(T1, T2) \ - wxFOR_ALL_COMPARISONS_2_REV(wxDEFINE_COMPARISON_BY_REV, T1, T2) - -/* - This macro allows to define all 12 comparison operators (6 operators for - both orders of arguments) for the given types using the provided "cmp" - macro to implement the actual comparison: the macro is called with the 2 - arguments names, the first of type T1 and the second of type T2, and the - comparison operator being implemented. - */ -#define wxDEFINE_ALL_COMPARISONS(T1, T2, cmp) \ - wxFOR_ALL_COMPARISONS_3(wxDEFINE_COMPARISON, T1, T2, cmp) \ - wxFOR_ALL_COMPARISONS_3_REV(wxDEFINE_COMPARISON_REV, T1, T2, cmp) - -/* ---------------------------------------------------------------------------- */ -/* macros to avoid compiler warnings */ -/* ---------------------------------------------------------------------------- */ - -/* Macro to cut down on compiler warnings. */ -#if 1 /* there should be no more any compilers needing the "#else" version */ - #define WXUNUSED(identifier) /* identifier */ -#else /* stupid, broken compiler */ - #define WXUNUSED(identifier) identifier -#endif - -/* some arguments are not used in unicode mode */ -#if wxUSE_UNICODE - #define WXUNUSED_IN_UNICODE(param) WXUNUSED(param) -#else - #define WXUNUSED_IN_UNICODE(param) param -#endif - -/* unused parameters in non stream builds */ -#if wxUSE_STREAMS - #define WXUNUSED_UNLESS_STREAMS(param) param -#else - #define WXUNUSED_UNLESS_STREAMS(param) WXUNUSED(param) -#endif - -/* some compilers give warning about a possibly unused variable if it is */ -/* initialized in both branches of if/else and shut up if it is initialized */ -/* when declared, but other compilers then give warnings about unused variable */ -/* value -- this should satisfy both of them */ -#if defined(__VISUALC__) - #define wxDUMMY_INITIALIZE(val) = val -#else - #define wxDUMMY_INITIALIZE(val) -#endif - -/* sometimes the value of a variable is *really* not used, to suppress the */ -/* resulting warning you may pass it to this function */ -#ifdef __cplusplus -# ifdef __BORLANDC__ -# define wxUnusedVar(identifier) identifier -# else - template - inline void wxUnusedVar(const T& WXUNUSED(t)) { } -# endif -#endif - -/* ---------------------------------------------------------------------------- */ -/* compiler specific settings */ -/* ---------------------------------------------------------------------------- */ - -/* where should i put this? we need to make sure of this as it breaks */ -/* the code. */ -#if !wxUSE_IOSTREAMH && defined(__WXDEBUG__) -# undef wxUSE_DEBUG_NEW_ALWAYS -# define wxUSE_DEBUG_NEW_ALWAYS 0 -#endif - -/* ---------------------------------------------------------------------------- */ -/* standard wxWidgets types */ -/* ---------------------------------------------------------------------------- */ - -/* the type for screen and DC coordinates */ -typedef int wxCoord; - -enum { wxDefaultCoord = -1 }; - -/* ---------------------------------------------------------------------------- */ -/* define fixed length types */ -/* ---------------------------------------------------------------------------- */ - -#if defined(__MINGW32__) - #include -#endif - -/* chars are always one byte (by definition), shorts are always two (in */ -/* practice) */ - -/* 8bit */ -typedef signed char wxInt8; -typedef unsigned char wxUint8; -typedef wxUint8 wxByte; - - -/* 16bit */ -#ifdef SIZEOF_SHORT - #if SIZEOF_SHORT != 2 - #error "wxWidgets assumes sizeof(short) == 2, please fix the code" - #endif -#else - #define SIZEOF_SHORT 2 -#endif - -typedef signed short wxInt16; -typedef unsigned short wxUint16; - -typedef wxUint16 wxWord; - -/* - things are getting more interesting with ints, longs and pointers - - there are several different standard data models described by this table: - - +-----------+----------------------------+ - |type\model | LP64 ILP64 LLP64 ILP32 LP32| - +-----------+----------------------------+ - |char | 8 8 8 8 8 | - |short | 16 16 16 16 16 | - |int | 32 64 32 32 16 | - |long | 64 64 32 32 32 | - |long long | 64 64 64 -- -- | - |void * | 64 64 64 32 32 | - +-----------+----------------------------+ - - Win16 used LP32 (but we don't support it any longer), Win32 obviously used - ILP32 and Win64 uses LLP64 (a.k.a. P64) - - Under Unix LP64 is the most widely used (the only I've ever seen, in fact) - */ - -/* 32bit */ -#if defined(__WINDOWS__) - #if defined(__WIN32__) - typedef int wxInt32; - typedef unsigned int wxUint32; - - /* - Win64 uses LLP64 model and so ints and longs have the same size as - in Win32. - */ - #ifndef SIZEOF_INT - #define SIZEOF_INT 4 - #endif - - #ifndef SIZEOF_LONG - #define SIZEOF_LONG 4 - #endif - - #ifndef SIZEOF_LONG_LONG - #define SIZEOF_LONG_LONG 8 - #endif - - #ifndef SIZEOF_WCHAR_T - /* Windows uses UTF-16 */ - #define SIZEOF_WCHAR_T 2 - #endif - - #ifndef SIZEOF_SIZE_T - /* - Under Win64 sizeof(size_t) == 8 and so it is neither unsigned - int nor unsigned long! - */ - #ifdef __WIN64__ - #define SIZEOF_SIZE_T 8 - - #undef wxSIZE_T_IS_UINT - #else /* Win32 */ - #define SIZEOF_SIZE_T 4 - - #define wxSIZE_T_IS_UINT - #endif - #undef wxSIZE_T_IS_ULONG - #endif - - #ifndef SIZEOF_VOID_P - #ifdef __WIN64__ - #define SIZEOF_VOID_P 8 - #else /* Win32 */ - #define SIZEOF_VOID_P 4 - #endif /* Win64/32 */ - #endif - #else - #error "Unsupported Windows version" - #endif -#else /* !Windows */ - /* SIZEOF_XXX are normally defined by configure */ - #ifdef SIZEOF_INT - #if SIZEOF_INT == 8 - /* must be ILP64 data model, there is normally a special 32 bit */ - /* type in it but we don't know what it is... */ - #error "No 32bit int type on this platform" - #elif SIZEOF_INT == 4 - typedef int wxInt32; - typedef unsigned int wxUint32; - #elif SIZEOF_INT == 2 - /* must be LP32 */ - #if SIZEOF_LONG != 4 - #error "No 32bit int type on this platform" - #endif - - typedef long wxInt32; - typedef unsigned long wxUint32; - #else - /* wxWidgets is not ready for 128bit systems yet... */ - #error "Unknown sizeof(int) value, what are you compiling for?" - #endif - #else /* !defined(SIZEOF_INT) */ - /* assume default 32bit machine -- what else can we do? */ - wxCOMPILE_TIME_ASSERT( sizeof(int) == 4, IntMustBeExactly4Bytes); - wxCOMPILE_TIME_ASSERT( sizeof(size_t) == 4, SizeTMustBeExactly4Bytes); - wxCOMPILE_TIME_ASSERT( sizeof(void *) == 4, PtrMustBeExactly4Bytes); - - #define SIZEOF_INT 4 - #define SIZEOF_SIZE_T 4 - #define SIZEOF_VOID_P 4 - - typedef int wxInt32; - typedef unsigned int wxUint32; - - #if defined(__MACH__) && !defined(SIZEOF_WCHAR_T) - #define SIZEOF_WCHAR_T 4 - #endif - #if !defined(SIZEOF_WCHAR_T) - /* also assume that sizeof(wchar_t) == 2 (under Unix the most */ - /* common case is 4 but there configure would have defined */ - /* SIZEOF_WCHAR_T for us) */ - /* the most common case */ - wxCOMPILE_TIME_ASSERT( sizeof(wchar_t) == 2, - Wchar_tMustBeExactly2Bytes); - - #define SIZEOF_WCHAR_T 2 - #endif /* !defined(SIZEOF_WCHAR_T) */ - #endif -#endif /* Win/!Win */ - -#ifndef SIZEOF_WCHAR_T - #error "SIZEOF_WCHAR_T must be defined, but isn't" -#endif - -/* also define C99-like sized MIN/MAX constants */ -#define wxINT8_MIN CHAR_MIN -#define wxINT8_MAX CHAR_MAX -#define wxUINT8_MAX UCHAR_MAX - -#define wxINT16_MIN SHRT_MIN -#define wxINT16_MAX SHRT_MAX -#define wxUINT16_MAX USHRT_MAX - -#if SIZEOF_INT == 4 - #define wxINT32_MIN INT_MIN - #define wxINT32_MAX INT_MAX - #define wxUINT32_MAX UINT_MAX -#elif SIZEOF_LONG == 4 - #define wxINT32_MIN LONG_MIN - #define wxINT32_MAX LONG_MAX - #define wxUINT32_MAX ULONG_MAX -#else - #error "Unknown 32 bit type" -#endif - -typedef wxUint32 wxDword; - -#ifdef LLONG_MAX - #define wxINT64_MIN LLONG_MIN - #define wxINT64_MAX LLONG_MAX - #define wxUINT64_MAX ULLONG_MAX -#else - #define wxINT64_MIN (wxLL(-9223372036854775807)-1) - #define wxINT64_MAX wxLL(9223372036854775807) - #define wxUINT64_MAX wxULL(0xFFFFFFFFFFFFFFFF) -#endif - -/* 64 bit */ - -/* NB: we #define and not typedef wxLongLong_t because we use "#ifdef */ -/* wxLongLong_t" in wx/longlong.h */ - -/* wxULongLong_t is set later (usually to unsigned wxLongLong_t) */ - -/* to avoid compilation problems on 64bit machines with ambiguous method calls */ -/* we will need to define this */ -#undef wxLongLongIsLong - -/* - First check for specific compilers which have known 64 bit integer types, - this avoids clashes with SIZEOF_LONG[_LONG] being defined incorrectly for - e.g. MSVC builds (Python.h defines it as 8 even for MSVC). - - Also notice that we check for "long long" before checking for 64 bit long as - we still want to use "long long" and not "long" for wxLongLong_t on 64 bit - architectures to be able to pass wxLongLong_t to the standard functions - prototyped as taking "long long" such as strtoll(). - */ -#if (defined(__VISUALC__) || defined(__INTELC__)) && defined(__WIN32__) - #define wxLongLong_t __int64 - #define wxLongLongSuffix i64 - #define wxLongLongFmtSpec "I64" -#elif defined(__BORLANDC__) && defined(__WIN32__) && (__BORLANDC__ >= 0x520) - #define wxLongLong_t __int64 - #define wxLongLongSuffix i64 - #define wxLongLongFmtSpec "L" -#elif defined(__MINGW32__) - #define wxLongLong_t long long - #define wxLongLongSuffix ll - #define wxLongLongFmtSpec "I64" -#elif (defined(SIZEOF_LONG_LONG) && SIZEOF_LONG_LONG >= 8) || \ - defined(__GNUC__) || \ - defined(__CYGWIN__) - #define wxLongLong_t long long - #define wxLongLongSuffix ll - #define wxLongLongFmtSpec "ll" -#elif defined(SIZEOF_LONG) && (SIZEOF_LONG == 8) - #define wxLongLong_t long - #define wxLongLongSuffix l - #define wxLongLongFmtSpec "l" - #define wxLongLongIsLong -#endif - - -#ifdef wxLongLong_t - #define wxULongLong_t unsigned wxLongLong_t - - /* - wxLL() and wxULL() macros allow to define 64 bit constants in a - portable way. - */ - #ifndef wxCOMPILER_BROKEN_CONCAT_OPER - #define wxLL(x) wxCONCAT(x, wxLongLongSuffix) - #define wxULL(x) wxCONCAT(x, wxCONCAT(u, wxLongLongSuffix)) - #else - /* - Currently only Borland compiler has broken concatenation operator - and this compiler is known to use [u]i64 suffix. - */ - #define wxLL(x) wxAPPEND_i64(x) - #define wxULL(x) wxAPPEND_ui64(x) - #endif - - typedef wxLongLong_t wxInt64; - typedef wxULongLong_t wxUint64; - - #define wxHAS_INT64 1 - - #ifndef wxLongLongIsLong - #define wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG - #endif -#elif wxUSE_LONGLONG - /* these macros allow to define 64 bit constants in a portable way */ - #define wxLL(x) wxLongLong(x) - #define wxULL(x) wxULongLong(x) - - #define wxInt64 wxLongLong - #define wxUint64 wxULongLong - - #define wxHAS_INT64 1 - -#else /* !wxUSE_LONGLONG */ - - #define wxHAS_INT64 0 - -#endif - -/* - Helper macro for conditionally compiling some code only if wxLongLong_t is - available and is a type different from the other integer types (i.e. not - long). - */ -#ifdef wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG - #define wxIF_LONG_LONG_TYPE(x) x -#else - #define wxIF_LONG_LONG_TYPE(x) -#endif - -#ifdef _SSIZE_T_DEFINED -#define HAVE_SSIZE_T -#endif - - -/* Make sure ssize_t is defined (a signed type the same size as size_t). */ -/* (HAVE_SSIZE_T is not already defined by configure) */ -#ifndef HAVE_SSIZE_T -#ifdef __MINGW32__ - #if defined(_SSIZE_T_) || defined(_SSIZE_T_DEFINED) - #define HAVE_SSIZE_T - #endif -#endif -#endif /* !HAVE_SSIZE_T */ - -/* If we really don't have ssize_t, provide our own version. */ -#ifdef HAVE_SSIZE_T - #ifdef __UNIX__ - #include - #endif -#else /* !HAVE_SSIZE_T */ - #if SIZEOF_SIZE_T == 4 - typedef wxInt32 ssize_t; - #elif SIZEOF_SIZE_T == 8 - typedef wxInt64 ssize_t; - #else - #error "error defining ssize_t, size_t is not 4 or 8 bytes" - #endif - - /* prevent ssize_t redefinitions in other libraries */ - #define HAVE_SSIZE_T -#endif - -/* - We can't rely on Windows _W64 being defined as windows.h may not be - included so define our own equivalent: this should be used with types - like WXLPARAM or WXWPARAM which are 64 bit under Win64 to avoid warnings - each time we cast it to a pointer or a handle (which results in hundreds - of warnings as Win32 API often passes pointers in them) - */ -// XXX: Dolphin. Causes unnecessary build warnings. -#if 0 - #define wxW64 __w64 -#else - #define wxW64 -#endif - -/* - Define signed and unsigned integral types big enough to contain all of long, - size_t and void *. - */ -#if SIZEOF_LONG >= SIZEOF_VOID_P - /* - Normal case when long is the largest integral type. - */ - typedef long wxIntPtr; - typedef unsigned long wxUIntPtr; -#elif SIZEOF_SIZE_T >= SIZEOF_VOID_P - /* - Win64 case: size_t is the only integral type big enough for "void *". - - Notice that we must use __w64 to avoid warnings about casting pointers - to wxIntPtr (which we do often as this is what it is defined for) in 32 - bit build with MSVC. - */ - typedef wxW64 ssize_t wxIntPtr; - typedef size_t wxUIntPtr; -#else - /* - This should never happen for the current architectures but if you're - using one where it does, please contact wx-dev@googlegroups.com. - */ - #error "Pointers can't be stored inside integer types." -#endif - -#ifdef __cplusplus -/* And also define a couple of simple functions to cast pointer to/from it. */ -inline wxUIntPtr wxPtrToUInt(const void *p) -{ - /* - VC++ 7.1 gives warnings about casts such as below even when they're - explicit with /Wp64 option, suppress them as we really know what we're - doing here. Same thing with icc with -Wall. - */ -#ifdef __VISUALC__ - #pragma warning(push) - /* pointer truncation from '' to '' */ - #pragma warning(disable: 4311) -#elif defined(__INTELC__) - #pragma warning(push) - /* conversion from pointer to same-sized integral type */ - #pragma warning(disable: 1684) -#endif - - return wx_reinterpret_cast(wxUIntPtr, p); - -#if defined(__VISUALC__) || defined(__INTELC__) - #pragma warning(pop) -#endif -} - -inline void *wxUIntToPtr(wxUIntPtr p) -{ -#ifdef __VISUALC__ - #pragma warning(push) - /* conversion to type of greater size */ - #pragma warning(disable: 4312) -#elif defined(__INTELC__) - #pragma warning(push) - /* invalid type conversion: "wxUIntPtr={unsigned long}" to "void *" */ - #pragma warning(disable: 171) -#endif - - return wx_reinterpret_cast(void *, p); - -#if defined(__VISUALC__) || defined(__INTELC__) - #pragma warning(pop) -#endif -} -#endif /*__cplusplus*/ - - - -/* base floating point types */ -/* wxFloat32: 32 bit IEEE float ( 1 sign, 8 exponent bits, 23 fraction bits ) */ -/* wxFloat64: 64 bit IEEE float ( 1 sign, 11 exponent bits, 52 fraction bits ) */ -/* wxDouble: native fastest representation that has at least wxFloat64 */ -/* precision, so use the IEEE types for storage, and this for */ -/* calculations */ - -typedef float wxFloat32; -typedef double wxFloat64; - -typedef double wxDouble; - -/* - Some (non standard) compilers typedef wchar_t as an existing type instead - of treating it as a real fundamental type, set wxWCHAR_T_IS_REAL_TYPE to 0 - for them and to 1 for all the others. - */ -#ifndef wxWCHAR_T_IS_REAL_TYPE - /* - VC++ typedefs wchar_t as unsigned short by default until VC8, that is - unless /Za or /Zc:wchar_t option is used in which case _WCHAR_T_DEFINED - is defined. - */ -# if defined(__VISUALC__) && !defined(_NATIVE_WCHAR_T_DEFINED) -# define wxWCHAR_T_IS_REAL_TYPE 0 -# else /* compiler having standard-conforming wchar_t */ -# define wxWCHAR_T_IS_REAL_TYPE 1 -# endif -#endif /* !defined(wxWCHAR_T_IS_REAL_TYPE) */ - -/* Helper macro for doing something dependent on whether wchar_t is or isn't a - typedef inside another macro. */ -#if wxWCHAR_T_IS_REAL_TYPE - #define wxIF_WCHAR_T_TYPE(x) x -#else /* !wxWCHAR_T_IS_REAL_TYPE */ - #define wxIF_WCHAR_T_TYPE(x) -#endif /* wxWCHAR_T_IS_REAL_TYPE/!wxWCHAR_T_IS_REAL_TYPE */ - -/* - This constant should be used instead of NULL in vararg functions taking - wxChar* arguments: passing NULL (which is the same as 0, unless the compiler - defines it specially, e.g. like gcc does with its __null built-in) doesn't - work in this case as va_arg() wouldn't interpret the integer 0 correctly - when trying to convert it to a pointer on architectures where sizeof(int) is - strictly less than sizeof(void *). - - Examples of places where this must be used include wxFileTypeInfo ctor. - */ -#define wxNullPtr ((void *)NULL) - - -/* Define wxChar16 and wxChar32 */ - -#if SIZEOF_WCHAR_T == 2 - #define wxWCHAR_T_IS_WXCHAR16 - typedef wchar_t wxChar16; -#else - typedef wxUint16 wxChar16; -#endif - -#if SIZEOF_WCHAR_T == 4 - #define wxWCHAR_T_IS_WXCHAR32 - typedef wchar_t wxChar32; -#else - typedef wxUint32 wxChar32; -#endif - - -/* - Helper macro expanding into the given "m" macro invoked with each of the - integer types as parameter (notice that this does not include char/unsigned - char and bool but does include wchar_t). - */ -#define wxDO_FOR_INT_TYPES(m) \ - m(short) \ - m(unsigned short) \ - m(int) \ - m(unsigned int) \ - m(long) \ - m(unsigned long) \ - wxIF_LONG_LONG_TYPE( m(wxLongLong_t) ) \ - wxIF_LONG_LONG_TYPE( m(wxULongLong_t) ) \ - wxIF_WCHAR_T_TYPE( m(wchar_t) ) - -/* - Same as wxDO_FOR_INT_TYPES() but does include char and unsigned char. - - Notice that we use "char" and "unsigned char" here but not "signed char" - which would be more correct as "char" could be unsigned by default. But - wxWidgets code currently supposes that char is signed and we'd need to - clean up assumptions about it, notably in wx/unichar.h, to be able to use - "signed char" here. - */ -#define wxDO_FOR_CHAR_INT_TYPES(m) \ - m(char) \ - m(unsigned char) \ - wxDO_FOR_INT_TYPES(m) - -/* - Same as wxDO_FOR_INT_TYPES() above except that m macro takes the - type as the first argument and some extra argument, passed from this macro - itself, as the second one. - */ -#define wxDO_FOR_INT_TYPES_1(m, arg) \ - m(short, arg) \ - m(unsigned short, arg) \ - m(int, arg) \ - m(unsigned int, arg) \ - m(long, arg) \ - m(unsigned long, arg) \ - wxIF_LONG_LONG_TYPE( m(wxLongLong_t, arg) ) \ - wxIF_LONG_LONG_TYPE( m(wxULongLong_t, arg) ) \ - wxIF_WCHAR_T_TYPE( m(wchar_t, arg) ) - -/* - Combination of wxDO_FOR_CHAR_INT_TYPES() and wxDO_FOR_INT_TYPES_1(): - invokes the given macro with the specified argument as its second parameter - for all char and int types. - */ -#define wxDO_FOR_CHAR_INT_TYPES_1(m, arg) \ - m(char, arg) \ - m(unsigned char, arg) \ - wxDO_FOR_INT_TYPES_1(m, arg) - - -/* ---------------------------------------------------------------------------- */ -/* byte ordering related definition and macros */ -/* ---------------------------------------------------------------------------- */ - -/* byte sex */ - -#define wxBIG_ENDIAN 4321 -#define wxLITTLE_ENDIAN 1234 -#define wxPDP_ENDIAN 3412 - -#ifdef WORDS_BIGENDIAN -#define wxBYTE_ORDER wxBIG_ENDIAN -#else -#define wxBYTE_ORDER wxLITTLE_ENDIAN -#endif - -/* byte swapping */ - -#define wxUINT16_SWAP_ALWAYS(val) \ - ((wxUint16) ( \ - (((wxUint16) (val) & (wxUint16) 0x00ffU) << 8) | \ - (((wxUint16) (val) & (wxUint16) 0xff00U) >> 8))) - -#define wxINT16_SWAP_ALWAYS(val) \ - ((wxInt16) ( \ - (((wxUint16) (val) & (wxUint16) 0x00ffU) << 8) | \ - (((wxUint16) (val) & (wxUint16) 0xff00U) >> 8))) - -#define wxUINT32_SWAP_ALWAYS(val) \ - ((wxUint32) ( \ - (((wxUint32) (val) & (wxUint32) 0x000000ffU) << 24) | \ - (((wxUint32) (val) & (wxUint32) 0x0000ff00U) << 8) | \ - (((wxUint32) (val) & (wxUint32) 0x00ff0000U) >> 8) | \ - (((wxUint32) (val) & (wxUint32) 0xff000000U) >> 24))) - -#define wxINT32_SWAP_ALWAYS(val) \ - ((wxInt32) ( \ - (((wxUint32) (val) & (wxUint32) 0x000000ffU) << 24) | \ - (((wxUint32) (val) & (wxUint32) 0x0000ff00U) << 8) | \ - (((wxUint32) (val) & (wxUint32) 0x00ff0000U) >> 8) | \ - (((wxUint32) (val) & (wxUint32) 0xff000000U) >> 24))) -/* machine specific byte swapping */ - -#ifdef wxLongLong_t - #define wxUINT64_SWAP_ALWAYS(val) \ - ((wxUint64) ( \ - (((wxUint64) (val) & (wxUint64) wxULL(0x00000000000000ff)) << 56) | \ - (((wxUint64) (val) & (wxUint64) wxULL(0x000000000000ff00)) << 40) | \ - (((wxUint64) (val) & (wxUint64) wxULL(0x0000000000ff0000)) << 24) | \ - (((wxUint64) (val) & (wxUint64) wxULL(0x00000000ff000000)) << 8) | \ - (((wxUint64) (val) & (wxUint64) wxULL(0x000000ff00000000)) >> 8) | \ - (((wxUint64) (val) & (wxUint64) wxULL(0x0000ff0000000000)) >> 24) | \ - (((wxUint64) (val) & (wxUint64) wxULL(0x00ff000000000000)) >> 40) | \ - (((wxUint64) (val) & (wxUint64) wxULL(0xff00000000000000)) >> 56))) - - #define wxINT64_SWAP_ALWAYS(val) \ - ((wxInt64) ( \ - (((wxUint64) (val) & (wxUint64) wxULL(0x00000000000000ff)) << 56) | \ - (((wxUint64) (val) & (wxUint64) wxULL(0x000000000000ff00)) << 40) | \ - (((wxUint64) (val) & (wxUint64) wxULL(0x0000000000ff0000)) << 24) | \ - (((wxUint64) (val) & (wxUint64) wxULL(0x00000000ff000000)) << 8) | \ - (((wxUint64) (val) & (wxUint64) wxULL(0x000000ff00000000)) >> 8) | \ - (((wxUint64) (val) & (wxUint64) wxULL(0x0000ff0000000000)) >> 24) | \ - (((wxUint64) (val) & (wxUint64) wxULL(0x00ff000000000000)) >> 40) | \ - (((wxUint64) (val) & (wxUint64) wxULL(0xff00000000000000)) >> 56))) -#elif wxUSE_LONGLONG /* !wxLongLong_t */ - #define wxUINT64_SWAP_ALWAYS(val) \ - ((wxUint64) ( \ - ((wxULongLong(val) & wxULongLong(0L, 0x000000ffU)) << 56) | \ - ((wxULongLong(val) & wxULongLong(0L, 0x0000ff00U)) << 40) | \ - ((wxULongLong(val) & wxULongLong(0L, 0x00ff0000U)) << 24) | \ - ((wxULongLong(val) & wxULongLong(0L, 0xff000000U)) << 8) | \ - ((wxULongLong(val) & wxULongLong(0x000000ffL, 0U)) >> 8) | \ - ((wxULongLong(val) & wxULongLong(0x0000ff00L, 0U)) >> 24) | \ - ((wxULongLong(val) & wxULongLong(0x00ff0000L, 0U)) >> 40) | \ - ((wxULongLong(val) & wxULongLong(0xff000000L, 0U)) >> 56))) - - #define wxINT64_SWAP_ALWAYS(val) \ - ((wxInt64) ( \ - ((wxLongLong(val) & wxLongLong(0L, 0x000000ffU)) << 56) | \ - ((wxLongLong(val) & wxLongLong(0L, 0x0000ff00U)) << 40) | \ - ((wxLongLong(val) & wxLongLong(0L, 0x00ff0000U)) << 24) | \ - ((wxLongLong(val) & wxLongLong(0L, 0xff000000U)) << 8) | \ - ((wxLongLong(val) & wxLongLong(0x000000ffL, 0U)) >> 8) | \ - ((wxLongLong(val) & wxLongLong(0x0000ff00L, 0U)) >> 24) | \ - ((wxLongLong(val) & wxLongLong(0x00ff0000L, 0U)) >> 40) | \ - ((wxLongLong(val) & wxLongLong(0xff000000L, 0U)) >> 56))) -#endif /* wxLongLong_t/!wxLongLong_t */ - -#ifdef WORDS_BIGENDIAN - #define wxUINT16_SWAP_ON_BE(val) wxUINT16_SWAP_ALWAYS(val) - #define wxINT16_SWAP_ON_BE(val) wxINT16_SWAP_ALWAYS(val) - #define wxUINT16_SWAP_ON_LE(val) (val) - #define wxINT16_SWAP_ON_LE(val) (val) - #define wxUINT32_SWAP_ON_BE(val) wxUINT32_SWAP_ALWAYS(val) - #define wxINT32_SWAP_ON_BE(val) wxINT32_SWAP_ALWAYS(val) - #define wxUINT32_SWAP_ON_LE(val) (val) - #define wxINT32_SWAP_ON_LE(val) (val) - #if wxHAS_INT64 - #define wxUINT64_SWAP_ON_BE(val) wxUINT64_SWAP_ALWAYS(val) - #define wxUINT64_SWAP_ON_LE(val) (val) - #define wxINT64_SWAP_ON_BE(val) wxINT64_SWAP_ALWAYS(val) - #define wxINT64_SWAP_ON_LE(val) (val) - - #define wxUINT64_SWAP_ON_BE_IN_PLACE(val) val = wxUINT64_SWAP_ALWAYS(val) - #define wxINT64_SWAP_ON_BE_IN_PLACE(val) val = wxINT64_SWAP_ALWAYS(val) - #define wxUINT64_SWAP_ON_LE_IN_PLACE(val) - #define wxINT64_SWAP_ON_LE_IN_PLACE(val) - #endif - - #define wxUINT16_SWAP_ON_BE_IN_PLACE(val) val = wxUINT16_SWAP_ALWAYS(val) - #define wxINT16_SWAP_ON_BE_IN_PLACE(val) val = wxINT16_SWAP_ALWAYS(val) - #define wxUINT16_SWAP_ON_LE_IN_PLACE(val) - #define wxINT16_SWAP_ON_LE_IN_PLACE(val) - #define wxUINT32_SWAP_ON_BE_IN_PLACE(val) val = wxUINT32_SWAP_ALWAYS(val) - #define wxINT32_SWAP_ON_BE_IN_PLACE(val) val = wxINT32_SWAP_ALWAYS(val) - #define wxUINT32_SWAP_ON_LE_IN_PLACE(val) - #define wxINT32_SWAP_ON_LE_IN_PLACE(val) -#else - #define wxUINT16_SWAP_ON_LE(val) wxUINT16_SWAP_ALWAYS(val) - #define wxINT16_SWAP_ON_LE(val) wxINT16_SWAP_ALWAYS(val) - #define wxUINT16_SWAP_ON_BE(val) (val) - #define wxINT16_SWAP_ON_BE(val) (val) - #define wxUINT32_SWAP_ON_LE(val) wxUINT32_SWAP_ALWAYS(val) - #define wxINT32_SWAP_ON_LE(val) wxINT32_SWAP_ALWAYS(val) - #define wxUINT32_SWAP_ON_BE(val) (val) - #define wxINT32_SWAP_ON_BE(val) (val) - #if wxHAS_INT64 - #define wxUINT64_SWAP_ON_LE(val) wxUINT64_SWAP_ALWAYS(val) - #define wxUINT64_SWAP_ON_BE(val) (val) - #define wxINT64_SWAP_ON_LE(val) wxINT64_SWAP_ALWAYS(val) - #define wxINT64_SWAP_ON_BE(val) (val) - #define wxUINT64_SWAP_ON_BE_IN_PLACE(val) - #define wxINT64_SWAP_ON_BE_IN_PLACE(val) - #define wxUINT64_SWAP_ON_LE_IN_PLACE(val) val = wxUINT64_SWAP_ALWAYS(val) - #define wxINT64_SWAP_ON_LE_IN_PLACE(val) val = wxINT64_SWAP_ALWAYS(val) - #endif - - #define wxUINT16_SWAP_ON_BE_IN_PLACE(val) - #define wxINT16_SWAP_ON_BE_IN_PLACE(val) - #define wxUINT16_SWAP_ON_LE_IN_PLACE(val) val = wxUINT16_SWAP_ALWAYS(val) - #define wxINT16_SWAP_ON_LE_IN_PLACE(val) val = wxINT16_SWAP_ALWAYS(val) - #define wxUINT32_SWAP_ON_BE_IN_PLACE(val) - #define wxINT32_SWAP_ON_BE_IN_PLACE(val) - #define wxUINT32_SWAP_ON_LE_IN_PLACE(val) val = wxUINT32_SWAP_ALWAYS(val) - #define wxINT32_SWAP_ON_LE_IN_PLACE(val) val = wxINT32_SWAP_ALWAYS(val) -#endif - -/* ---------------------------------------------------------------------------- */ -/* Geometric flags */ -/* ---------------------------------------------------------------------------- */ - -enum wxGeometryCentre -{ - wxCENTRE = 0x0001, - wxCENTER = wxCENTRE -}; - -/* centering into frame rather than screen (obsolete) */ -#define wxCENTER_FRAME 0x0000 -/* centre on screen rather than parent */ -#define wxCENTRE_ON_SCREEN 0x0002 -#define wxCENTER_ON_SCREEN wxCENTRE_ON_SCREEN - -enum wxOrientation -{ - /* don't change the values of these elements, they are used elsewhere */ - wxHORIZONTAL = 0x0004, - wxVERTICAL = 0x0008, - - wxBOTH = wxVERTICAL | wxHORIZONTAL, - - /* a mask to extract orientation from the combination of flags */ - wxORIENTATION_MASK = wxBOTH -}; - -enum wxDirection -{ - wxLEFT = 0x0010, - wxRIGHT = 0x0020, - wxUP = 0x0040, - wxDOWN = 0x0080, - - wxTOP = wxUP, - wxBOTTOM = wxDOWN, - - wxNORTH = wxUP, - wxSOUTH = wxDOWN, - wxWEST = wxLEFT, - wxEAST = wxRIGHT, - - wxALL = (wxUP | wxDOWN | wxRIGHT | wxLEFT), - - /* a mask to extract direction from the combination of flags */ - wxDIRECTION_MASK = wxALL -}; - -enum wxAlignment -{ - /* - 0 is a valid wxAlignment value (both wxALIGN_LEFT and wxALIGN_TOP - use it) so define a symbolic name for an invalid alignment value - which can be assumed to be different from anything else - */ - wxALIGN_INVALID = -1, - - wxALIGN_NOT = 0x0000, - wxALIGN_CENTER_HORIZONTAL = 0x0100, - wxALIGN_CENTRE_HORIZONTAL = wxALIGN_CENTER_HORIZONTAL, - wxALIGN_LEFT = wxALIGN_NOT, - wxALIGN_TOP = wxALIGN_NOT, - wxALIGN_RIGHT = 0x0200, - wxALIGN_BOTTOM = 0x0400, - wxALIGN_CENTER_VERTICAL = 0x0800, - wxALIGN_CENTRE_VERTICAL = wxALIGN_CENTER_VERTICAL, - - wxALIGN_CENTER = (wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL), - wxALIGN_CENTRE = wxALIGN_CENTER, - - /* a mask to extract alignment from the combination of flags */ - wxALIGN_MASK = 0x0f00 -}; - -/* misc. flags for wxSizer items */ -enum wxSizerFlagBits -{ - /* - wxADJUST_MINSIZE doesn't do anything any more but we still define - it for compatibility. Notice that it may be also predefined (as 0, - hopefully) in the user code in order to use it even in - !WXWIN_COMPATIBILITY_2_8 builds so don't redefine it in such case. - */ -#if WXWIN_COMPATIBILITY_2_8 && !defined(wxADJUST_MINSIZE) - wxADJUST_MINSIZE = 0, -#endif - wxFIXED_MINSIZE = 0x8000, - wxRESERVE_SPACE_EVEN_IF_HIDDEN = 0x0002, - - /* a mask to extract wxSizerFlagBits from combination of flags */ - wxSIZER_FLAG_BITS_MASK = 0x8002 -}; - -enum wxStretch -{ - wxSTRETCH_NOT = 0x0000, - wxSHRINK = 0x1000, - wxGROW = 0x2000, - wxEXPAND = wxGROW, - wxSHAPED = 0x4000, - wxTILE = wxSHAPED | wxFIXED_MINSIZE, - - /* a mask to extract stretch from the combination of flags */ - wxSTRETCH_MASK = 0x7000 /* sans wxTILE */ -}; - -/* border flags: the values are chosen for backwards compatibility */ -enum wxBorder -{ - /* this is different from wxBORDER_NONE as by default the controls do have */ - /* border */ - wxBORDER_DEFAULT = 0, - - wxBORDER_NONE = 0x00200000, - wxBORDER_STATIC = 0x01000000, - wxBORDER_SIMPLE = 0x02000000, - wxBORDER_RAISED = 0x04000000, - wxBORDER_SUNKEN = 0x08000000, - wxBORDER_DOUBLE = 0x10000000, /* deprecated */ - wxBORDER_THEME = wxBORDER_DOUBLE, - - /* a mask to extract border style from the combination of flags */ - wxBORDER_MASK = 0x1f200000 -}; - -/* This makes it easier to specify a 'normal' border for a control */ -#define wxDEFAULT_CONTROL_BORDER wxBORDER_SUNKEN - -/* ---------------------------------------------------------------------------- */ -/* Window style flags */ -/* ---------------------------------------------------------------------------- */ - -/* - * Values are chosen so they can be |'ed in a bit list. - * Some styles are used across more than one group, - * so the values mustn't clash with others in the group. - * Otherwise, numbers can be reused across groups. - */ - -/* - Summary of the bits used by various styles. - - High word, containing styles which can be used with many windows: - - +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ - |31|30|29|28|27|26|25|24|23|22|21|20|19|18|17|16| - +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ - | | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | \_ wxFULL_REPAINT_ON_RESIZE - | | | | | | | | | | | | | | \____ wxPOPUP_WINDOW - | | | | | | | | | | | | | \_______ wxWANTS_CHARS - | | | | | | | | | | | | \__________ wxTAB_TRAVERSAL - | | | | | | | | | | | \_____________ wxTRANSPARENT_WINDOW - | | | | | | | | | | \________________ wxBORDER_NONE - | | | | | | | | | \___________________ wxCLIP_CHILDREN - | | | | | | | | \______________________ wxALWAYS_SHOW_SB - | | | | | | | \_________________________ wxBORDER_STATIC - | | | | | | \____________________________ wxBORDER_SIMPLE - | | | | | \_______________________________ wxBORDER_RAISED - | | | | \__________________________________ wxBORDER_SUNKEN - | | | \_____________________________________ wxBORDER_{DOUBLE,THEME} - | | \________________________________________ wxCAPTION/wxCLIP_SIBLINGS - | \___________________________________________ wxHSCROLL - \______________________________________________ wxVSCROLL - - - Low word style bits is class-specific meaning that the same bit can have - different meanings for different controls (e.g. 0x10 is wxCB_READONLY - meaning that the control can't be modified for wxComboBox but wxLB_SORT - meaning that the control should be kept sorted for wxListBox, while - wxLB_SORT has a different value -- and this is just fine). - */ - -/* - * Window (Frame/dialog/subwindow/panel item) style flags - */ - -/* The cast is needed to avoid g++ -Wnarrowing warnings when initializing - * values of int type with wxVSCROLL on 32 bit platforms, where its value is - * greater than INT_MAX. - */ -#define wxVSCROLL ((int)0x80000000) -#define wxHSCROLL 0x40000000 -#define wxCAPTION 0x20000000 - -/* New styles (border styles are now in their own enum) */ -#define wxDOUBLE_BORDER wxBORDER_DOUBLE -#define wxSUNKEN_BORDER wxBORDER_SUNKEN -#define wxRAISED_BORDER wxBORDER_RAISED -#define wxBORDER wxBORDER_SIMPLE -#define wxSIMPLE_BORDER wxBORDER_SIMPLE -#define wxSTATIC_BORDER wxBORDER_STATIC -#define wxNO_BORDER wxBORDER_NONE - -/* wxALWAYS_SHOW_SB: instead of hiding the scrollbar when it is not needed, */ -/* disable it - but still show (see also wxLB_ALWAYS_SB style) */ -/* */ -/* NB: as this style is only supported by wxUniversal and wxMSW so far */ -#define wxALWAYS_SHOW_SB 0x00800000 - -/* Clip children when painting, which reduces flicker in e.g. frames and */ -/* splitter windows, but can't be used in a panel where a static box must be */ -/* 'transparent' (panel paints the background for it) */ -#define wxCLIP_CHILDREN 0x00400000 - -/* Note we're reusing the wxCAPTION style because we won't need captions */ -/* for subwindows/controls */ -#define wxCLIP_SIBLINGS 0x20000000 - -#define wxTRANSPARENT_WINDOW 0x00100000 - -/* Add this style to a panel to get tab traversal working outside of dialogs */ -/* (on by default for wxPanel, wxDialog, wxScrolledWindow) */ -#define wxTAB_TRAVERSAL 0x00080000 - -/* Add this style if the control wants to get all keyboard messages (under */ -/* Windows, it won't normally get the dialog navigation key events) */ -#define wxWANTS_CHARS 0x00040000 - -/* Make window retained (Motif only, see src/generic/scrolwing.cpp) - * This is non-zero only under wxMotif, to avoid a clash with wxPOPUP_WINDOW - * on other platforms - */ - -#ifdef __WXMOTIF__ -#define wxRETAINED 0x00020000 -#else -#define wxRETAINED 0x00000000 -#endif -#define wxBACKINGSTORE wxRETAINED - -/* set this flag to create a special popup window: it will be always shown on */ -/* top of other windows, will capture the mouse and will be dismissed when the */ -/* mouse is clicked outside of it or if it loses focus in any other way */ -#define wxPOPUP_WINDOW 0x00020000 - -/* force a full repaint when the window is resized (instead of repainting just */ -/* the invalidated area) */ -#define wxFULL_REPAINT_ON_RESIZE 0x00010000 - -/* obsolete: now this is the default behaviour */ -/* */ -/* don't invalidate the whole window (resulting in a PAINT event) when the */ -/* window is resized (currently, makes sense for wxMSW only) */ -#define wxNO_FULL_REPAINT_ON_RESIZE 0 - -/* A mask which can be used to filter (out) all wxWindow-specific styles. - */ -#define wxWINDOW_STYLE_MASK \ - (wxVSCROLL|wxHSCROLL|wxBORDER_MASK|wxALWAYS_SHOW_SB|wxCLIP_CHILDREN| \ - wxCLIP_SIBLINGS|wxTRANSPARENT_WINDOW|wxTAB_TRAVERSAL|wxWANTS_CHARS| \ - wxRETAINED|wxPOPUP_WINDOW|wxFULL_REPAINT_ON_RESIZE) - -/* - * Extra window style flags (use wxWS_EX prefix to make it clear that they - * should be passed to wxWindow::SetExtraStyle(), not SetWindowStyle()) - */ - -/* This flag is obsolete as recursive validation is now the default (and only - * possible) behaviour. Simply don't use it any more in the new code. */ -#define wxWS_EX_VALIDATE_RECURSIVELY 0x00000000 /* used to be 1 */ - -/* wxCommandEvents and the objects of the derived classes are forwarded to the */ -/* parent window and so on recursively by default. Using this flag for the */ -/* given window allows to block this propagation at this window, i.e. prevent */ -/* the events from being propagated further upwards. The dialogs have this */ -/* flag on by default. */ -#define wxWS_EX_BLOCK_EVENTS 0x00000002 - -/* don't use this window as an implicit parent for the other windows: this must */ -/* be used with transient windows as otherwise there is the risk of creating a */ -/* dialog/frame with this window as a parent which would lead to a crash if the */ -/* parent is destroyed before the child */ -#define wxWS_EX_TRANSIENT 0x00000004 - -/* don't paint the window background, we'll assume it will */ -/* be done by a theming engine. This is not yet used but could */ -/* possibly be made to work in the future, at least on Windows */ -#define wxWS_EX_THEMED_BACKGROUND 0x00000008 - -/* this window should always process idle events */ -#define wxWS_EX_PROCESS_IDLE 0x00000010 - -/* this window should always process UI update events */ -#define wxWS_EX_PROCESS_UI_UPDATES 0x00000020 - -/* Draw the window in a metal theme on Mac */ -#define wxFRAME_EX_METAL 0x00000040 -#define wxDIALOG_EX_METAL 0x00000040 - -/* Use this style to add a context-sensitive help to the window (currently for */ -/* Win32 only and it doesn't work if wxMINIMIZE_BOX or wxMAXIMIZE_BOX are used) */ -#define wxWS_EX_CONTEXTHELP 0x00000080 - -/* synonyms for wxWS_EX_CONTEXTHELP for compatibility */ -#define wxFRAME_EX_CONTEXTHELP wxWS_EX_CONTEXTHELP -#define wxDIALOG_EX_CONTEXTHELP wxWS_EX_CONTEXTHELP - -/* Create a window which is attachable to another top level window */ -#define wxFRAME_DRAWER 0x0020 - -/* - * MDI parent frame style flags - * Can overlap with some of the above. - */ - -#define wxFRAME_NO_WINDOW_MENU 0x0100 - -/* - * wxMenuBar style flags - */ -/* use native docking */ -#define wxMB_DOCKABLE 0x0001 - -/* - * wxMenu style flags - */ -#define wxMENU_TEAROFF 0x0001 - -/* - * Apply to all panel items - */ -#define wxCOLOURED 0x0800 -#define wxFIXED_LENGTH 0x0400 - -/* - * Styles for wxListBox - */ -#define wxLB_SORT 0x0010 -#define wxLB_SINGLE 0x0020 -#define wxLB_MULTIPLE 0x0040 -#define wxLB_EXTENDED 0x0080 -/* wxLB_OWNERDRAW is Windows-only */ -#define wxLB_NEEDED_SB 0x0000 -#define wxLB_OWNERDRAW 0x0100 -#define wxLB_ALWAYS_SB 0x0200 -#define wxLB_NO_SB 0x0400 -#define wxLB_HSCROLL wxHSCROLL -/* always show an entire number of rows */ -#define wxLB_INT_HEIGHT 0x0800 - -/* - * wxComboBox style flags - */ -#define wxCB_SIMPLE 0x0004 -#define wxCB_SORT 0x0008 -#define wxCB_READONLY 0x0010 -#define wxCB_DROPDOWN 0x0020 - -/* - * wxRadioBox style flags - */ -/* should we number the items from left to right or from top to bottom in a 2d */ -/* radiobox? */ -#define wxRA_LEFTTORIGHT 0x0001 -#define wxRA_TOPTOBOTTOM 0x0002 - -/* New, more intuitive names to specify majorDim argument */ -#define wxRA_SPECIFY_COLS wxHORIZONTAL -#define wxRA_SPECIFY_ROWS wxVERTICAL - -/* Old names for compatibility */ -#define wxRA_HORIZONTAL wxHORIZONTAL -#define wxRA_VERTICAL wxVERTICAL - -/* - * wxRadioButton style flag - */ -#define wxRB_GROUP 0x0004 -#define wxRB_SINGLE 0x0008 - -/* - * wxScrollBar flags - */ -#define wxSB_HORIZONTAL wxHORIZONTAL -#define wxSB_VERTICAL wxVERTICAL - -/* - * wxSpinButton flags. - * Note that a wxSpinCtrl is sometimes defined as a wxTextCtrl, and so the - * flags shouldn't overlap with wxTextCtrl flags that can be used for a single - * line controls (currently we reuse wxTE_CHARWRAP and wxTE_RICH2 neither of - * which makes sense for them). - */ -#define wxSP_HORIZONTAL wxHORIZONTAL /* 4 */ -#define wxSP_VERTICAL wxVERTICAL /* 8 */ -#define wxSP_ARROW_KEYS 0x4000 -#define wxSP_WRAP 0x8000 - -/* - * wxTabCtrl flags - */ -#define wxTC_RIGHTJUSTIFY 0x0010 -#define wxTC_FIXEDWIDTH 0x0020 -#define wxTC_TOP 0x0000 /* default */ -#define wxTC_LEFT 0x0020 -#define wxTC_RIGHT 0x0040 -#define wxTC_BOTTOM 0x0080 -#define wxTC_MULTILINE 0x0200 /* == wxNB_MULTILINE */ -#define wxTC_OWNERDRAW 0x0400 - -/* - * wxStaticBitmap flags - */ -#define wxBI_EXPAND wxEXPAND - -/* - * wxStaticLine flags - */ -#define wxLI_HORIZONTAL wxHORIZONTAL -#define wxLI_VERTICAL wxVERTICAL - - -/* - * extended dialog specifiers. these values are stored in a different - * flag and thus do not overlap with other style flags. note that these - * values do not correspond to the return values of the dialogs (for - * those values, look at the wxID_XXX defines). - */ - -/* wxCENTRE already defined as 0x00000001 */ -#define wxYES 0x00000002 -#define wxOK 0x00000004 -#define wxNO 0x00000008 -#define wxYES_NO (wxYES | wxNO) -#define wxCANCEL 0x00000010 -#define wxAPPLY 0x00000020 -#define wxCLOSE 0x00000040 - -#define wxOK_DEFAULT 0x00000000 /* has no effect (default) */ -#define wxYES_DEFAULT 0x00000000 /* has no effect (default) */ -#define wxNO_DEFAULT 0x00000080 /* only valid with wxYES_NO */ -#define wxCANCEL_DEFAULT 0x80000000 /* only valid with wxCANCEL */ - -#define wxICON_WARNING 0x00000100 -#define wxICON_ERROR 0x00000200 -#define wxICON_QUESTION 0x00000400 -#define wxICON_INFORMATION 0x00000800 -#define wxICON_EXCLAMATION wxICON_WARNING -#define wxICON_HAND wxICON_ERROR -#define wxICON_STOP wxICON_ERROR -#define wxICON_ASTERISK wxICON_INFORMATION - -#define wxHELP 0x00001000 -#define wxFORWARD 0x00002000 -#define wxBACKWARD 0x00004000 -#define wxRESET 0x00008000 -#define wxMORE 0x00010000 -#define wxSETUP 0x00020000 -#define wxICON_NONE 0x00040000 -#define wxICON_AUTH_NEEDED 0x00080000 - -#define wxICON_MASK \ - (wxICON_EXCLAMATION|wxICON_HAND|wxICON_QUESTION|wxICON_INFORMATION|wxICON_NONE|wxICON_AUTH_NEEDED) - -/* - * Background styles. See wxWindow::SetBackgroundStyle - */ -enum wxBackgroundStyle -{ - /* - background is erased in the EVT_ERASE_BACKGROUND handler or using - the system default background if no such handler is defined (this - is the default style) - */ - wxBG_STYLE_ERASE, - - /* - background is erased by the system, no EVT_ERASE_BACKGROUND event - is generated at all - */ - wxBG_STYLE_SYSTEM, - - /* - background is erased in EVT_PAINT handler and not erased at all - before it, this should be used if the paint handler paints over - the entire window to avoid flicker - */ - wxBG_STYLE_PAINT, - - /* - Indicates that the window background is not erased, letting the parent - window show through. - */ - wxBG_STYLE_TRANSPARENT, - - /* this style is deprecated and doesn't do anything, don't use */ - wxBG_STYLE_COLOUR, - - /* - this style is deprecated and is synonymous with - wxBG_STYLE_PAINT, use the new name - */ - wxBG_STYLE_CUSTOM = wxBG_STYLE_PAINT -}; - -/* - * Key types used by (old style) lists and hashes. - */ -enum wxKeyType -{ - wxKEY_NONE, - wxKEY_INTEGER, - wxKEY_STRING -}; - -/* ---------------------------------------------------------------------------- */ -/* standard IDs */ -/* ---------------------------------------------------------------------------- */ - -/* Standard menu IDs */ -enum wxStandardID -{ - /* - These ids delimit the range used by automatically-generated ids - (i.e. those used when wxID_ANY is specified during construction). - */ -#if defined(__WXMSW__) || wxUSE_AUTOID_MANAGEMENT - /* - On MSW the range is always restricted no matter if id management - is used or not because the native window ids are limited to short - range. On other platforms the range is only restricted if id - management is used so the reference count buffer won't be so big. - */ - wxID_AUTO_LOWEST = -32000, - wxID_AUTO_HIGHEST = -2000, -#else - wxID_AUTO_LOWEST = -1000000, - wxID_AUTO_HIGHEST = -2000, -#endif - - /* no id matches this one when compared to it */ - wxID_NONE = -3, - - /* id for a separator line in the menu (invalid for normal item) */ - wxID_SEPARATOR = -2, - - /* any id: means that we don't care about the id, whether when installing - * an event handler or when creating a new window */ - wxID_ANY = -1, - - - /* all predefined ids are between wxID_LOWEST and wxID_HIGHEST */ - wxID_LOWEST = 4999, - - wxID_OPEN, - wxID_CLOSE, - wxID_NEW, - wxID_SAVE, - wxID_SAVEAS, - wxID_REVERT, - wxID_EXIT, - wxID_UNDO, - wxID_REDO, - wxID_HELP, - wxID_PRINT, - wxID_PRINT_SETUP, - wxID_PAGE_SETUP, - wxID_PREVIEW, - wxID_ABOUT, - wxID_HELP_CONTENTS, - wxID_HELP_INDEX, - wxID_HELP_SEARCH, - wxID_HELP_COMMANDS, - wxID_HELP_PROCEDURES, - wxID_HELP_CONTEXT, - wxID_CLOSE_ALL, - wxID_PREFERENCES, - - wxID_EDIT = 5030, - wxID_CUT, - wxID_COPY, - wxID_PASTE, - wxID_CLEAR, - wxID_FIND, - wxID_DUPLICATE, - wxID_SELECTALL, - wxID_DELETE, - wxID_REPLACE, - wxID_REPLACE_ALL, - wxID_PROPERTIES, - - wxID_VIEW_DETAILS, - wxID_VIEW_LARGEICONS, - wxID_VIEW_SMALLICONS, - wxID_VIEW_LIST, - wxID_VIEW_SORTDATE, - wxID_VIEW_SORTNAME, - wxID_VIEW_SORTSIZE, - wxID_VIEW_SORTTYPE, - - wxID_FILE = 5050, - wxID_FILE1, - wxID_FILE2, - wxID_FILE3, - wxID_FILE4, - wxID_FILE5, - wxID_FILE6, - wxID_FILE7, - wxID_FILE8, - wxID_FILE9, - - /* Standard button and menu IDs */ - wxID_OK = 5100, - wxID_CANCEL, - wxID_APPLY, - wxID_YES, - wxID_NO, - wxID_STATIC, - wxID_FORWARD, - wxID_BACKWARD, - wxID_DEFAULT, - wxID_MORE, - wxID_SETUP, - wxID_RESET, - wxID_CONTEXT_HELP, - wxID_YESTOALL, - wxID_NOTOALL, - wxID_ABORT, - wxID_RETRY, - wxID_IGNORE, - wxID_ADD, - wxID_REMOVE, - - wxID_UP, - wxID_DOWN, - wxID_HOME, - wxID_REFRESH, - wxID_STOP, - wxID_INDEX, - - wxID_BOLD, - wxID_ITALIC, - wxID_JUSTIFY_CENTER, - wxID_JUSTIFY_FILL, - wxID_JUSTIFY_RIGHT, - wxID_JUSTIFY_LEFT, - wxID_UNDERLINE, - wxID_INDENT, - wxID_UNINDENT, - wxID_ZOOM_100, - wxID_ZOOM_FIT, - wxID_ZOOM_IN, - wxID_ZOOM_OUT, - wxID_UNDELETE, - wxID_REVERT_TO_SAVED, - wxID_CDROM, - wxID_CONVERT, - wxID_EXECUTE, - wxID_FLOPPY, - wxID_HARDDISK, - wxID_BOTTOM, - wxID_FIRST, - wxID_LAST, - wxID_TOP, - wxID_INFO, - wxID_JUMP_TO, - wxID_NETWORK, - wxID_SELECT_COLOR, - wxID_SELECT_FONT, - wxID_SORT_ASCENDING, - wxID_SORT_DESCENDING, - wxID_SPELL_CHECK, - wxID_STRIKETHROUGH, - - /* System menu IDs (used by wxUniv): */ - wxID_SYSTEM_MENU = 5200, - wxID_CLOSE_FRAME, - wxID_MOVE_FRAME, - wxID_RESIZE_FRAME, - wxID_MAXIMIZE_FRAME, - wxID_ICONIZE_FRAME, - wxID_RESTORE_FRAME, - - /* MDI window menu ids */ - wxID_MDI_WINDOW_FIRST = 5230, - wxID_MDI_WINDOW_CASCADE = wxID_MDI_WINDOW_FIRST, - wxID_MDI_WINDOW_TILE_HORZ, - wxID_MDI_WINDOW_TILE_VERT, - wxID_MDI_WINDOW_ARRANGE_ICONS, - wxID_MDI_WINDOW_PREV, - wxID_MDI_WINDOW_NEXT, - wxID_MDI_WINDOW_LAST = wxID_MDI_WINDOW_NEXT, - - /* OS X system menu ids */ - wxID_OSX_MENU_FIRST = 5250, - wxID_OSX_HIDE = wxID_OSX_MENU_FIRST, - wxID_OSX_HIDEOTHERS, - wxID_OSX_SHOWALL, -#if wxABI_VERSION >= 30001 - wxID_OSX_SERVICES, - wxID_OSX_MENU_LAST = wxID_OSX_SERVICES, -#else - wxID_OSX_MENU_LAST = wxID_OSX_SHOWALL, -#endif - - /* IDs used by generic file dialog (13 consecutive starting from this value) */ - wxID_FILEDLGG = 5900, - - /* IDs used by generic file ctrl (4 consecutive starting from this value) */ - wxID_FILECTRL = 5950, - - wxID_HIGHEST = 5999 -}; - -/* ---------------------------------------------------------------------------- */ -/* wxWindowID type */ -/* ---------------------------------------------------------------------------- */ - -/* - * wxWindowID used to be just a typedef defined here, now it's a class, but we - * still continue to define it here for compatibility, so that the code using - * it continues to compile even if it includes just wx/defs.h. - * - * Notice that wx/windowid.h can only be included after wxID_XYZ definitions - * (as it uses them). - */ -#if defined(__cplusplus) && wxUSE_GUI - #include "wx/windowid.h" -#endif - -/* ---------------------------------------------------------------------------- */ -/* other constants */ -/* ---------------------------------------------------------------------------- */ - -/* menu and toolbar item kinds */ -enum wxItemKind -{ - wxITEM_SEPARATOR = -1, - wxITEM_NORMAL, - wxITEM_CHECK, - wxITEM_RADIO, - wxITEM_DROPDOWN, - wxITEM_MAX -}; - -/* - * The possible states of a 3-state checkbox (Compatible - * with the 2-state checkbox). - */ -enum wxCheckBoxState -{ - wxCHK_UNCHECKED, - wxCHK_CHECKED, - wxCHK_UNDETERMINED /* 3-state checkbox only */ -}; - - -/* hit test results */ -enum wxHitTest -{ - wxHT_NOWHERE, - - /* scrollbar */ - wxHT_SCROLLBAR_FIRST = wxHT_NOWHERE, - wxHT_SCROLLBAR_ARROW_LINE_1, /* left or upper arrow to scroll by line */ - wxHT_SCROLLBAR_ARROW_LINE_2, /* right or down */ - wxHT_SCROLLBAR_ARROW_PAGE_1, /* left or upper arrow to scroll by page */ - wxHT_SCROLLBAR_ARROW_PAGE_2, /* right or down */ - wxHT_SCROLLBAR_THUMB, /* on the thumb */ - wxHT_SCROLLBAR_BAR_1, /* bar to the left/above the thumb */ - wxHT_SCROLLBAR_BAR_2, /* bar to the right/below the thumb */ - wxHT_SCROLLBAR_LAST, - - /* window */ - wxHT_WINDOW_OUTSIDE, /* not in this window at all */ - wxHT_WINDOW_INSIDE, /* in the client area */ - wxHT_WINDOW_VERT_SCROLLBAR, /* on the vertical scrollbar */ - wxHT_WINDOW_HORZ_SCROLLBAR, /* on the horizontal scrollbar */ - wxHT_WINDOW_CORNER, /* on the corner between 2 scrollbars */ - - wxHT_MAX -}; - -/* ---------------------------------------------------------------------------- */ -/* Possible SetSize flags */ -/* ---------------------------------------------------------------------------- */ - -/* Use internally-calculated width if -1 */ -#define wxSIZE_AUTO_WIDTH 0x0001 -/* Use internally-calculated height if -1 */ -#define wxSIZE_AUTO_HEIGHT 0x0002 -/* Use internally-calculated width and height if each is -1 */ -#define wxSIZE_AUTO (wxSIZE_AUTO_WIDTH|wxSIZE_AUTO_HEIGHT) -/* Ignore missing (-1) dimensions (use existing). */ -/* For readability only: test for wxSIZE_AUTO_WIDTH/HEIGHT in code. */ -#define wxSIZE_USE_EXISTING 0x0000 -/* Allow -1 as a valid position */ -#define wxSIZE_ALLOW_MINUS_ONE 0x0004 -/* Don't do parent client adjustments (for implementation only) */ -#define wxSIZE_NO_ADJUSTMENTS 0x0008 -/* Change the window position even if it seems to be already correct */ -#define wxSIZE_FORCE 0x0010 -/* Emit size event even if size didn't change */ -#define wxSIZE_FORCE_EVENT 0x0020 - -/* ---------------------------------------------------------------------------- */ -/* GDI descriptions */ -/* ---------------------------------------------------------------------------- */ - -// Hatch styles used by both pen and brush styles. -// -// NB: Do not use these constants directly, they're for internal use only, use -// wxBRUSHSTYLE_XXX_HATCH and wxPENSTYLE_XXX_HATCH instead. -enum wxHatchStyle -{ - wxHATCHSTYLE_INVALID = -1, - - /* - The value of the first style is chosen to fit with - wxDeprecatedGUIConstants values below, don't change it. - */ - wxHATCHSTYLE_FIRST = 111, - wxHATCHSTYLE_BDIAGONAL = wxHATCHSTYLE_FIRST, - wxHATCHSTYLE_CROSSDIAG, - wxHATCHSTYLE_FDIAGONAL, - wxHATCHSTYLE_CROSS, - wxHATCHSTYLE_HORIZONTAL, - wxHATCHSTYLE_VERTICAL, - wxHATCHSTYLE_LAST = wxHATCHSTYLE_VERTICAL -}; - -/* - WARNING: the following styles are deprecated; use the - wxFontFamily, wxFontStyle, wxFontWeight, wxBrushStyle, - wxPenStyle, wxPenCap, wxPenJoin enum values instead! -*/ - -/* don't use any elements of this enum in the new code */ -enum wxDeprecatedGUIConstants -{ - /* Text font families */ - wxDEFAULT = 70, - wxDECORATIVE, - wxROMAN, - wxSCRIPT, - wxSWISS, - wxMODERN, - wxTELETYPE, /* @@@@ */ - - /* Proportional or Fixed width fonts (not yet used) */ - wxVARIABLE = 80, - wxFIXED, - - wxNORMAL = 90, - wxLIGHT, - wxBOLD, - /* Also wxNORMAL for normal (non-italic text) */ - wxITALIC, - wxSLANT, - - /* Pen styles */ - wxSOLID = 100, - wxDOT, - wxLONG_DASH, - wxSHORT_DASH, - wxDOT_DASH, - wxUSER_DASH, - - wxTRANSPARENT, - - /* Brush & Pen Stippling. Note that a stippled pen cannot be dashed!! */ - /* Note also that stippling a Pen IS meaningful, because a Line is */ - wxSTIPPLE_MASK_OPAQUE, /* mask is used for blitting monochrome using text fore and back ground colors */ - wxSTIPPLE_MASK, /* mask is used for masking areas in the stipple bitmap (TO DO) */ - /* drawn with a Pen, and without any Brush -- and it can be stippled. */ - wxSTIPPLE = 110, - - wxBDIAGONAL_HATCH = wxHATCHSTYLE_BDIAGONAL, - wxCROSSDIAG_HATCH = wxHATCHSTYLE_CROSSDIAG, - wxFDIAGONAL_HATCH = wxHATCHSTYLE_FDIAGONAL, - wxCROSS_HATCH = wxHATCHSTYLE_CROSS, - wxHORIZONTAL_HATCH = wxHATCHSTYLE_HORIZONTAL, - wxVERTICAL_HATCH = wxHATCHSTYLE_VERTICAL, - wxFIRST_HATCH = wxHATCHSTYLE_FIRST, - wxLAST_HATCH = wxHATCHSTYLE_LAST -}; - -/* ToolPanel in wxFrame (VZ: unused?) */ -enum -{ - wxTOOL_TOP = 1, - wxTOOL_BOTTOM, - wxTOOL_LEFT, - wxTOOL_RIGHT -}; - -/* the values of the format constants should be the same as corresponding */ -/* CF_XXX constants in Windows API */ -enum wxDataFormatId -{ - wxDF_INVALID = 0, - wxDF_TEXT = 1, /* CF_TEXT */ - wxDF_BITMAP = 2, /* CF_BITMAP */ - wxDF_METAFILE = 3, /* CF_METAFILEPICT */ - wxDF_SYLK = 4, - wxDF_DIF = 5, - wxDF_TIFF = 6, - wxDF_OEMTEXT = 7, /* CF_OEMTEXT */ - wxDF_DIB = 8, /* CF_DIB */ - wxDF_PALETTE = 9, - wxDF_PENDATA = 10, - wxDF_RIFF = 11, - wxDF_WAVE = 12, - wxDF_UNICODETEXT = 13, - wxDF_ENHMETAFILE = 14, - wxDF_FILENAME = 15, /* CF_HDROP */ - wxDF_LOCALE = 16, - wxDF_PRIVATE = 20, - wxDF_HTML = 30, /* Note: does not correspond to CF_ constant */ - wxDF_MAX -}; - -/* Key codes */ -enum wxKeyCode -{ - WXK_NONE = 0, - - WXK_CONTROL_A = 1, - WXK_CONTROL_B, - WXK_CONTROL_C, - WXK_CONTROL_D, - WXK_CONTROL_E, - WXK_CONTROL_F, - WXK_CONTROL_G, - WXK_CONTROL_H, - WXK_CONTROL_I, - WXK_CONTROL_J, - WXK_CONTROL_K, - WXK_CONTROL_L, - WXK_CONTROL_M, - WXK_CONTROL_N, - WXK_CONTROL_O, - WXK_CONTROL_P, - WXK_CONTROL_Q, - WXK_CONTROL_R, - WXK_CONTROL_S, - WXK_CONTROL_T, - WXK_CONTROL_U, - WXK_CONTROL_V, - WXK_CONTROL_W, - WXK_CONTROL_X, - WXK_CONTROL_Y, - WXK_CONTROL_Z, - - WXK_BACK = 8, /* backspace */ - WXK_TAB = 9, - WXK_RETURN = 13, - WXK_ESCAPE = 27, - - /* values from 33 to 126 are reserved for the standard ASCII characters */ - - WXK_SPACE = 32, - WXK_DELETE = 127, - - /* values from 128 to 255 are reserved for ASCII extended characters - (note that there isn't a single fixed standard for the meaning - of these values; avoid them in portable apps!) */ - - /* These are not compatible with unicode characters. - If you want to get a unicode character from a key event, use - wxKeyEvent::GetUnicodeKey */ - WXK_START = 300, - WXK_LBUTTON, - WXK_RBUTTON, - WXK_CANCEL, - WXK_MBUTTON, - WXK_CLEAR, - WXK_SHIFT, - WXK_ALT, - WXK_CONTROL, - WXK_MENU, - WXK_PAUSE, - WXK_CAPITAL, - WXK_END, - WXK_HOME, - WXK_LEFT, - WXK_UP, - WXK_RIGHT, - WXK_DOWN, - WXK_SELECT, - WXK_PRINT, - WXK_EXECUTE, - WXK_SNAPSHOT, - WXK_INSERT, - WXK_HELP, - WXK_NUMPAD0, - WXK_NUMPAD1, - WXK_NUMPAD2, - WXK_NUMPAD3, - WXK_NUMPAD4, - WXK_NUMPAD5, - WXK_NUMPAD6, - WXK_NUMPAD7, - WXK_NUMPAD8, - WXK_NUMPAD9, - WXK_MULTIPLY, - WXK_ADD, - WXK_SEPARATOR, - WXK_SUBTRACT, - WXK_DECIMAL, - WXK_DIVIDE, - WXK_F1, - WXK_F2, - WXK_F3, - WXK_F4, - WXK_F5, - WXK_F6, - WXK_F7, - WXK_F8, - WXK_F9, - WXK_F10, - WXK_F11, - WXK_F12, - WXK_F13, - WXK_F14, - WXK_F15, - WXK_F16, - WXK_F17, - WXK_F18, - WXK_F19, - WXK_F20, - WXK_F21, - WXK_F22, - WXK_F23, - WXK_F24, - WXK_NUMLOCK, - WXK_SCROLL, - WXK_PAGEUP, - WXK_PAGEDOWN, - WXK_NUMPAD_SPACE, - WXK_NUMPAD_TAB, - WXK_NUMPAD_ENTER, - WXK_NUMPAD_F1, - WXK_NUMPAD_F2, - WXK_NUMPAD_F3, - WXK_NUMPAD_F4, - WXK_NUMPAD_HOME, - WXK_NUMPAD_LEFT, - WXK_NUMPAD_UP, - WXK_NUMPAD_RIGHT, - WXK_NUMPAD_DOWN, - WXK_NUMPAD_PAGEUP, - WXK_NUMPAD_PAGEDOWN, - WXK_NUMPAD_END, - WXK_NUMPAD_BEGIN, - WXK_NUMPAD_INSERT, - WXK_NUMPAD_DELETE, - WXK_NUMPAD_EQUAL, - WXK_NUMPAD_MULTIPLY, - WXK_NUMPAD_ADD, - WXK_NUMPAD_SEPARATOR, - WXK_NUMPAD_SUBTRACT, - WXK_NUMPAD_DECIMAL, - WXK_NUMPAD_DIVIDE, - - WXK_WINDOWS_LEFT, - WXK_WINDOWS_RIGHT, - WXK_WINDOWS_MENU , -#ifdef __WXOSX__ - WXK_RAW_CONTROL, -#else - WXK_RAW_CONTROL = WXK_CONTROL, -#endif - WXK_COMMAND = WXK_CONTROL, - - /* Hardware-specific buttons */ - WXK_SPECIAL1 = WXK_WINDOWS_MENU + 2, /* Skip WXK_RAW_CONTROL if necessary */ - WXK_SPECIAL2, - WXK_SPECIAL3, - WXK_SPECIAL4, - WXK_SPECIAL5, - WXK_SPECIAL6, - WXK_SPECIAL7, - WXK_SPECIAL8, - WXK_SPECIAL9, - WXK_SPECIAL10, - WXK_SPECIAL11, - WXK_SPECIAL12, - WXK_SPECIAL13, - WXK_SPECIAL14, - WXK_SPECIAL15, - WXK_SPECIAL16, - WXK_SPECIAL17, - WXK_SPECIAL18, - WXK_SPECIAL19, - WXK_SPECIAL20, - - WXK_BROWSER_BACK, - WXK_BROWSER_FORWARD, - WXK_BROWSER_REFRESH, - WXK_BROWSER_STOP, - WXK_BROWSER_SEARCH, - WXK_BROWSER_FAVORITES, - WXK_BROWSER_HOME, - WXK_VOLUME_MUTE, - WXK_VOLUME_DOWN, - WXK_VOLUME_UP, - WXK_MEDIA_NEXT_TRACK, - WXK_MEDIA_PREV_TRACK, - WXK_MEDIA_STOP, - WXK_MEDIA_PLAY_PAUSE, - WXK_LAUNCH_MAIL, - WXK_LAUNCH_APP1, - WXK_LAUNCH_APP2 -}; - -/* This enum contains bit mask constants used in wxKeyEvent */ -enum wxKeyModifier -{ - wxMOD_NONE = 0x0000, - wxMOD_ALT = 0x0001, - wxMOD_CONTROL = 0x0002, - wxMOD_ALTGR = wxMOD_ALT | wxMOD_CONTROL, - wxMOD_SHIFT = 0x0004, - wxMOD_META = 0x0008, - wxMOD_WIN = wxMOD_META, -#if defined(__WXMAC__) - wxMOD_RAW_CONTROL = 0x0010, -#else - wxMOD_RAW_CONTROL = wxMOD_CONTROL, -#endif - wxMOD_CMD = wxMOD_CONTROL, - wxMOD_ALL = 0xffff -}; - -/* Shortcut for easier dialog-unit-to-pixel conversion */ -#define wxDLG_UNIT(parent, pt) parent->ConvertDialogToPixels(pt) - -/* Paper types */ -enum wxPaperSize -{ - wxPAPER_NONE, /* Use specific dimensions */ - wxPAPER_LETTER, /* Letter, 8 1/2 by 11 inches */ - wxPAPER_LEGAL, /* Legal, 8 1/2 by 14 inches */ - wxPAPER_A4, /* A4 Sheet, 210 by 297 millimeters */ - wxPAPER_CSHEET, /* C Sheet, 17 by 22 inches */ - wxPAPER_DSHEET, /* D Sheet, 22 by 34 inches */ - wxPAPER_ESHEET, /* E Sheet, 34 by 44 inches */ - wxPAPER_LETTERSMALL, /* Letter Small, 8 1/2 by 11 inches */ - wxPAPER_TABLOID, /* Tabloid, 11 by 17 inches */ - wxPAPER_LEDGER, /* Ledger, 17 by 11 inches */ - wxPAPER_STATEMENT, /* Statement, 5 1/2 by 8 1/2 inches */ - wxPAPER_EXECUTIVE, /* Executive, 7 1/4 by 10 1/2 inches */ - wxPAPER_A3, /* A3 sheet, 297 by 420 millimeters */ - wxPAPER_A4SMALL, /* A4 small sheet, 210 by 297 millimeters */ - wxPAPER_A5, /* A5 sheet, 148 by 210 millimeters */ - wxPAPER_B4, /* B4 sheet, 250 by 354 millimeters */ - wxPAPER_B5, /* B5 sheet, 182-by-257-millimeter paper */ - wxPAPER_FOLIO, /* Folio, 8-1/2-by-13-inch paper */ - wxPAPER_QUARTO, /* Quarto, 215-by-275-millimeter paper */ - wxPAPER_10X14, /* 10-by-14-inch sheet */ - wxPAPER_11X17, /* 11-by-17-inch sheet */ - wxPAPER_NOTE, /* Note, 8 1/2 by 11 inches */ - wxPAPER_ENV_9, /* #9 Envelope, 3 7/8 by 8 7/8 inches */ - wxPAPER_ENV_10, /* #10 Envelope, 4 1/8 by 9 1/2 inches */ - wxPAPER_ENV_11, /* #11 Envelope, 4 1/2 by 10 3/8 inches */ - wxPAPER_ENV_12, /* #12 Envelope, 4 3/4 by 11 inches */ - wxPAPER_ENV_14, /* #14 Envelope, 5 by 11 1/2 inches */ - wxPAPER_ENV_DL, /* DL Envelope, 110 by 220 millimeters */ - wxPAPER_ENV_C5, /* C5 Envelope, 162 by 229 millimeters */ - wxPAPER_ENV_C3, /* C3 Envelope, 324 by 458 millimeters */ - wxPAPER_ENV_C4, /* C4 Envelope, 229 by 324 millimeters */ - wxPAPER_ENV_C6, /* C6 Envelope, 114 by 162 millimeters */ - wxPAPER_ENV_C65, /* C65 Envelope, 114 by 229 millimeters */ - wxPAPER_ENV_B4, /* B4 Envelope, 250 by 353 millimeters */ - wxPAPER_ENV_B5, /* B5 Envelope, 176 by 250 millimeters */ - wxPAPER_ENV_B6, /* B6 Envelope, 176 by 125 millimeters */ - wxPAPER_ENV_ITALY, /* Italy Envelope, 110 by 230 millimeters */ - wxPAPER_ENV_MONARCH, /* Monarch Envelope, 3 7/8 by 7 1/2 inches */ - wxPAPER_ENV_PERSONAL, /* 6 3/4 Envelope, 3 5/8 by 6 1/2 inches */ - wxPAPER_FANFOLD_US, /* US Std Fanfold, 14 7/8 by 11 inches */ - wxPAPER_FANFOLD_STD_GERMAN, /* German Std Fanfold, 8 1/2 by 12 inches */ - wxPAPER_FANFOLD_LGL_GERMAN, /* German Legal Fanfold, 8 1/2 by 13 inches */ - - wxPAPER_ISO_B4, /* B4 (ISO) 250 x 353 mm */ - wxPAPER_JAPANESE_POSTCARD, /* Japanese Postcard 100 x 148 mm */ - wxPAPER_9X11, /* 9 x 11 in */ - wxPAPER_10X11, /* 10 x 11 in */ - wxPAPER_15X11, /* 15 x 11 in */ - wxPAPER_ENV_INVITE, /* Envelope Invite 220 x 220 mm */ - wxPAPER_LETTER_EXTRA, /* Letter Extra 9 \275 x 12 in */ - wxPAPER_LEGAL_EXTRA, /* Legal Extra 9 \275 x 15 in */ - wxPAPER_TABLOID_EXTRA, /* Tabloid Extra 11.69 x 18 in */ - wxPAPER_A4_EXTRA, /* A4 Extra 9.27 x 12.69 in */ - wxPAPER_LETTER_TRANSVERSE, /* Letter Transverse 8 \275 x 11 in */ - wxPAPER_A4_TRANSVERSE, /* A4 Transverse 210 x 297 mm */ - wxPAPER_LETTER_EXTRA_TRANSVERSE, /* Letter Extra Transverse 9\275 x 12 in */ - wxPAPER_A_PLUS, /* SuperA/SuperA/A4 227 x 356 mm */ - wxPAPER_B_PLUS, /* SuperB/SuperB/A3 305 x 487 mm */ - wxPAPER_LETTER_PLUS, /* Letter Plus 8.5 x 12.69 in */ - wxPAPER_A4_PLUS, /* A4 Plus 210 x 330 mm */ - wxPAPER_A5_TRANSVERSE, /* A5 Transverse 148 x 210 mm */ - wxPAPER_B5_TRANSVERSE, /* B5 (JIS) Transverse 182 x 257 mm */ - wxPAPER_A3_EXTRA, /* A3 Extra 322 x 445 mm */ - wxPAPER_A5_EXTRA, /* A5 Extra 174 x 235 mm */ - wxPAPER_B5_EXTRA, /* B5 (ISO) Extra 201 x 276 mm */ - wxPAPER_A2, /* A2 420 x 594 mm */ - wxPAPER_A3_TRANSVERSE, /* A3 Transverse 297 x 420 mm */ - wxPAPER_A3_EXTRA_TRANSVERSE, /* A3 Extra Transverse 322 x 445 mm */ - - wxPAPER_DBL_JAPANESE_POSTCARD,/* Japanese Double Postcard 200 x 148 mm */ - wxPAPER_A6, /* A6 105 x 148 mm */ - wxPAPER_JENV_KAKU2, /* Japanese Envelope Kaku #2 */ - wxPAPER_JENV_KAKU3, /* Japanese Envelope Kaku #3 */ - wxPAPER_JENV_CHOU3, /* Japanese Envelope Chou #3 */ - wxPAPER_JENV_CHOU4, /* Japanese Envelope Chou #4 */ - wxPAPER_LETTER_ROTATED, /* Letter Rotated 11 x 8 1/2 in */ - wxPAPER_A3_ROTATED, /* A3 Rotated 420 x 297 mm */ - wxPAPER_A4_ROTATED, /* A4 Rotated 297 x 210 mm */ - wxPAPER_A5_ROTATED, /* A5 Rotated 210 x 148 mm */ - wxPAPER_B4_JIS_ROTATED, /* B4 (JIS) Rotated 364 x 257 mm */ - wxPAPER_B5_JIS_ROTATED, /* B5 (JIS) Rotated 257 x 182 mm */ - wxPAPER_JAPANESE_POSTCARD_ROTATED,/* Japanese Postcard Rotated 148 x 100 mm */ - wxPAPER_DBL_JAPANESE_POSTCARD_ROTATED,/* Double Japanese Postcard Rotated 148 x 200 mm */ - wxPAPER_A6_ROTATED, /* A6 Rotated 148 x 105 mm */ - wxPAPER_JENV_KAKU2_ROTATED, /* Japanese Envelope Kaku #2 Rotated */ - wxPAPER_JENV_KAKU3_ROTATED, /* Japanese Envelope Kaku #3 Rotated */ - wxPAPER_JENV_CHOU3_ROTATED, /* Japanese Envelope Chou #3 Rotated */ - wxPAPER_JENV_CHOU4_ROTATED, /* Japanese Envelope Chou #4 Rotated */ - wxPAPER_B6_JIS, /* B6 (JIS) 128 x 182 mm */ - wxPAPER_B6_JIS_ROTATED, /* B6 (JIS) Rotated 182 x 128 mm */ - wxPAPER_12X11, /* 12 x 11 in */ - wxPAPER_JENV_YOU4, /* Japanese Envelope You #4 */ - wxPAPER_JENV_YOU4_ROTATED, /* Japanese Envelope You #4 Rotated */ - wxPAPER_P16K, /* PRC 16K 146 x 215 mm */ - wxPAPER_P32K, /* PRC 32K 97 x 151 mm */ - wxPAPER_P32KBIG, /* PRC 32K(Big) 97 x 151 mm */ - wxPAPER_PENV_1, /* PRC Envelope #1 102 x 165 mm */ - wxPAPER_PENV_2, /* PRC Envelope #2 102 x 176 mm */ - wxPAPER_PENV_3, /* PRC Envelope #3 125 x 176 mm */ - wxPAPER_PENV_4, /* PRC Envelope #4 110 x 208 mm */ - wxPAPER_PENV_5, /* PRC Envelope #5 110 x 220 mm */ - wxPAPER_PENV_6, /* PRC Envelope #6 120 x 230 mm */ - wxPAPER_PENV_7, /* PRC Envelope #7 160 x 230 mm */ - wxPAPER_PENV_8, /* PRC Envelope #8 120 x 309 mm */ - wxPAPER_PENV_9, /* PRC Envelope #9 229 x 324 mm */ - wxPAPER_PENV_10, /* PRC Envelope #10 324 x 458 mm */ - wxPAPER_P16K_ROTATED, /* PRC 16K Rotated */ - wxPAPER_P32K_ROTATED, /* PRC 32K Rotated */ - wxPAPER_P32KBIG_ROTATED, /* PRC 32K(Big) Rotated */ - wxPAPER_PENV_1_ROTATED, /* PRC Envelope #1 Rotated 165 x 102 mm */ - wxPAPER_PENV_2_ROTATED, /* PRC Envelope #2 Rotated 176 x 102 mm */ - wxPAPER_PENV_3_ROTATED, /* PRC Envelope #3 Rotated 176 x 125 mm */ - wxPAPER_PENV_4_ROTATED, /* PRC Envelope #4 Rotated 208 x 110 mm */ - wxPAPER_PENV_5_ROTATED, /* PRC Envelope #5 Rotated 220 x 110 mm */ - wxPAPER_PENV_6_ROTATED, /* PRC Envelope #6 Rotated 230 x 120 mm */ - wxPAPER_PENV_7_ROTATED, /* PRC Envelope #7 Rotated 230 x 160 mm */ - wxPAPER_PENV_8_ROTATED, /* PRC Envelope #8 Rotated 309 x 120 mm */ - wxPAPER_PENV_9_ROTATED, /* PRC Envelope #9 Rotated 324 x 229 mm */ - wxPAPER_PENV_10_ROTATED, /* PRC Envelope #10 Rotated 458 x 324 m */ - wxPAPER_A0, /* A0 Sheet 841 x 1189 mm */ - wxPAPER_A1 /* A1 Sheet 594 x 841 mm */ -}; - -/* Printing orientation */ -enum wxPrintOrientation -{ - wxPORTRAIT = 1, - wxLANDSCAPE -}; - -/* Duplex printing modes - */ - -enum wxDuplexMode -{ - wxDUPLEX_SIMPLEX, /* Non-duplex */ - wxDUPLEX_HORIZONTAL, - wxDUPLEX_VERTICAL -}; - -/* Print quality. - */ - -#define wxPRINT_QUALITY_HIGH -1 -#define wxPRINT_QUALITY_MEDIUM -2 -#define wxPRINT_QUALITY_LOW -3 -#define wxPRINT_QUALITY_DRAFT -4 - -typedef int wxPrintQuality; - -/* Print mode (currently PostScript only) - */ - -enum wxPrintMode -{ - wxPRINT_MODE_NONE = 0, - wxPRINT_MODE_PREVIEW = 1, /* Preview in external application */ - wxPRINT_MODE_FILE = 2, /* Print to file */ - wxPRINT_MODE_PRINTER = 3, /* Send to printer */ - wxPRINT_MODE_STREAM = 4 /* Send postscript data into a stream */ -}; - -/* ---------------------------------------------------------------------------- */ -/* UpdateWindowUI flags */ -/* ---------------------------------------------------------------------------- */ - -enum wxUpdateUI -{ - wxUPDATE_UI_NONE = 0x0000, - wxUPDATE_UI_RECURSE = 0x0001, - wxUPDATE_UI_FROMIDLE = 0x0002 /* Invoked from On(Internal)Idle */ -}; - - -/* ---------------------------------------------------------------------------- */ -/* wxList types */ -/* ---------------------------------------------------------------------------- */ - -/* type of compare function for list sort operation (as in 'qsort'): it should - return a negative value, 0 or positive value if the first element is less - than, equal or greater than the second */ - -typedef int (* LINKAGEMODE wxSortCompareFunction)(const void *elem1, const void *elem2); - -/* wxList iterator function */ -typedef int (* LINKAGEMODE wxListIterateFunction)(void *current); - - -/* ---------------------------------------------------------------------------- */ -/* miscellaneous */ -/* ---------------------------------------------------------------------------- */ - -/* define this macro if font handling is done using the X font names */ -#if (defined(__WXGTK__) && !defined(__WXGTK20__)) || defined(__X__) - #define _WX_X_FONTLIKE -#endif - -/* macro to specify "All Files" on different platforms */ -#if defined(__WXMSW__) -# define wxALL_FILES_PATTERN wxT("*.*") -# define wxALL_FILES gettext_noop("All files (*.*)|*.*") -#else -# define wxALL_FILES_PATTERN wxT("*") -# define wxALL_FILES gettext_noop("All files (*)|*") -#endif - -#if defined(__CYGWIN__) && defined(__WXMSW__) -# if wxUSE_STD_CONTAINERS || defined(wxUSE_STD_STRING) - /* - NASTY HACK because the gethostname in sys/unistd.h which the gnu - stl includes and wx builds with by default clash with each other - (windows version 2nd param is int, sys/unistd.h version is unsigned - int). - */ -# define gethostname gethostnameHACK -# include -# undef gethostname -# endif -#endif - -/* --------------------------------------------------------------------------- */ -/* macros that enable wxWidgets apps to be compiled in absence of the */ -/* system headers, although some platform specific types are used in the */ -/* platform specific (implementation) parts of the headers */ -/* --------------------------------------------------------------------------- */ - -#ifdef __DARWIN__ -#define DECLARE_WXOSX_OPAQUE_CFREF( name ) typedef struct __##name* name##Ref; -#define DECLARE_WXOSX_OPAQUE_CONST_CFREF( name ) typedef const struct __##name* name##Ref; -#endif - -#ifdef __WXMAC__ - -#define WX_OPAQUE_TYPE( name ) struct wxOpaque##name - -typedef void* WXHBITMAP; -typedef void* WXHCURSOR; -typedef void* WXRECTPTR; -typedef void* WXPOINTPTR; -typedef void* WXHWND; -typedef void* WXEVENTREF; -typedef void* WXEVENTHANDLERREF; -typedef void* WXEVENTHANDLERCALLREF; -typedef void* WXAPPLEEVENTREF; - -typedef unsigned int WXUINT; -typedef unsigned long WXDWORD; -typedef unsigned short WXWORD; - -typedef WX_OPAQUE_TYPE(PicHandle ) * WXHMETAFILE ; - -typedef void* WXDisplay; - -/* - * core frameworks - */ - -typedef const void * CFTypeRef; - -/* typedef const struct __CFString * CFStringRef; */ - -DECLARE_WXOSX_OPAQUE_CONST_CFREF( CFString ) -typedef struct __CFString * CFMutableStringRef; - -DECLARE_WXOSX_OPAQUE_CFREF( CFRunLoopSource ) -DECLARE_WXOSX_OPAQUE_CONST_CFREF( CTFont ) -DECLARE_WXOSX_OPAQUE_CONST_CFREF( CTFontDescriptor ) - -#define DECLARE_WXOSX_OPAQUE_CGREF( name ) typedef struct name* name##Ref; - -DECLARE_WXOSX_OPAQUE_CGREF( CGColor ) -DECLARE_WXOSX_OPAQUE_CGREF( CGImage ) -DECLARE_WXOSX_OPAQUE_CGREF( CGContext ) -DECLARE_WXOSX_OPAQUE_CGREF( CGFont ) - -typedef CGColorRef WXCOLORREF; -typedef CGImageRef WXCGIMAGEREF; -typedef CGContextRef WXHDC; - -/* - * carbon - */ - -typedef const struct __HIShape * HIShapeRef; -typedef struct __HIShape * HIMutableShapeRef; - -#define DECLARE_WXMAC_OPAQUE_REF( name ) typedef struct Opaque##name* name; - -DECLARE_WXMAC_OPAQUE_REF( PasteboardRef ) -DECLARE_WXMAC_OPAQUE_REF( IconRef ) -DECLARE_WXMAC_OPAQUE_REF( MenuRef ) - -typedef IconRef WXHICON ; -typedef HIShapeRef WXHRGN; - -#endif - -#if defined(__WXMAC__) - -/* Definitions of 32-bit/64-bit types - * These are typedef'd exactly the same way in newer OS X headers so - * redefinition when real headers are included should not be a problem. If - * it is, the types are being defined wrongly here. - * The purpose of these types is so they can be used from public wx headers. - * and also because the older (pre-Leopard) headers don't define them. - */ - -/* NOTE: We don't pollute namespace with CGFLOAT_MIN/MAX/IS_DOUBLE macros - * since they are unlikely to be needed in a public header. - */ -#if defined(__LP64__) && __LP64__ - typedef double CGFloat; -#else - typedef float CGFloat; -#endif - -#if (defined(__LP64__) && __LP64__) || (defined(NS_BUILD_32_LIKE_64) && NS_BUILD_32_LIKE_64) -typedef long NSInteger; -typedef unsigned long NSUInteger; -#else -typedef int NSInteger; -typedef unsigned int NSUInteger; -#endif - -/* Objective-C type declarations. - * These are to be used in public headers in lieu of NSSomething* because - * Objective-C class names are not available in C/C++ code. - */ - -/* NOTE: This ought to work with other compilers too, but I'm being cautious */ -#if (defined(__GNUC__) && defined(__APPLE__)) -/* It's desirable to have type safety for Objective-C(++) code as it does -at least catch typos of method names among other things. However, it -is not possible to declare an Objective-C class from plain old C or C++ -code. Furthermore, because of C++ name mangling, the type name must -be the same for both C++ and Objective-C++ code. Therefore, we define -what should be a pointer to an Objective-C class as a pointer to a plain -old C struct with the same name. Unfortunately, because the compiler -does not see a struct as an Objective-C class we cannot declare it -as a struct in Objective-C(++) mode. -*/ -#if defined(__OBJC__) -#define DECLARE_WXCOCOA_OBJC_CLASS(klass) \ -@class klass; \ -typedef klass *WX_##klass -#else /* not defined(__OBJC__) */ -#define DECLARE_WXCOCOA_OBJC_CLASS(klass) \ -typedef struct klass *WX_##klass -#endif /* defined(__OBJC__) */ - -#else /* not Apple's gcc */ -#warning "Objective-C types will not be checked by the compiler." -/* NOTE: typedef struct objc_object *id; */ -/* IOW, we're declaring these using the id type without using that name, */ -/* since "id" is used extensively not only within wxWidgets itself, but */ -/* also in wxWidgets application code. The following works fine when */ -/* compiling C(++) code, and works without typesafety for Obj-C(++) code */ -#define DECLARE_WXCOCOA_OBJC_CLASS(klass) \ -typedef struct objc_object *WX_##klass - -#endif /* (defined(__GNUC__) && defined(__APPLE__)) */ - -DECLARE_WXCOCOA_OBJC_CLASS(NSApplication); -DECLARE_WXCOCOA_OBJC_CLASS(NSBitmapImageRep); -DECLARE_WXCOCOA_OBJC_CLASS(NSBox); -DECLARE_WXCOCOA_OBJC_CLASS(NSButton); -DECLARE_WXCOCOA_OBJC_CLASS(NSColor); -DECLARE_WXCOCOA_OBJC_CLASS(NSColorPanel); -DECLARE_WXCOCOA_OBJC_CLASS(NSControl); -DECLARE_WXCOCOA_OBJC_CLASS(NSCursor); -DECLARE_WXCOCOA_OBJC_CLASS(NSEvent); -DECLARE_WXCOCOA_OBJC_CLASS(NSFont); -DECLARE_WXCOCOA_OBJC_CLASS(NSFontDescriptor); -DECLARE_WXCOCOA_OBJC_CLASS(NSFontPanel); -DECLARE_WXCOCOA_OBJC_CLASS(NSImage); -DECLARE_WXCOCOA_OBJC_CLASS(NSLayoutManager); -DECLARE_WXCOCOA_OBJC_CLASS(NSMenu); -DECLARE_WXCOCOA_OBJC_CLASS(NSMenuExtra); -DECLARE_WXCOCOA_OBJC_CLASS(NSMenuItem); -DECLARE_WXCOCOA_OBJC_CLASS(NSMutableArray); -DECLARE_WXCOCOA_OBJC_CLASS(NSNotification); -DECLARE_WXCOCOA_OBJC_CLASS(NSObject); -DECLARE_WXCOCOA_OBJC_CLASS(NSPanel); -DECLARE_WXCOCOA_OBJC_CLASS(NSResponder); -DECLARE_WXCOCOA_OBJC_CLASS(NSScrollView); -DECLARE_WXCOCOA_OBJC_CLASS(NSSound); -DECLARE_WXCOCOA_OBJC_CLASS(NSStatusItem); -DECLARE_WXCOCOA_OBJC_CLASS(NSTableColumn); -DECLARE_WXCOCOA_OBJC_CLASS(NSTableView); -DECLARE_WXCOCOA_OBJC_CLASS(NSTextContainer); -DECLARE_WXCOCOA_OBJC_CLASS(NSTextField); -DECLARE_WXCOCOA_OBJC_CLASS(NSTextStorage); -DECLARE_WXCOCOA_OBJC_CLASS(NSThread); -DECLARE_WXCOCOA_OBJC_CLASS(NSWindow); -DECLARE_WXCOCOA_OBJC_CLASS(NSView); -DECLARE_WXCOCOA_OBJC_CLASS(NSOpenGLContext); -DECLARE_WXCOCOA_OBJC_CLASS(NSOpenGLPixelFormat); -DECLARE_WXCOCOA_OBJC_CLASS( NSPrintInfo ); -#endif /* __WXMAC__ &__DARWIN__ */ - -#ifdef __WXMAC__ - -DECLARE_WXCOCOA_OBJC_CLASS(NSString); - -#if wxOSX_USE_COCOA - -typedef WX_NSWindow WXWindow; -typedef WX_NSView WXWidget; -typedef WX_NSMenu WXHMENU; -typedef WX_NSOpenGLPixelFormat WXGLPixelFormat; -typedef WX_NSOpenGLContext WXGLContext; - -#elif wxOSX_USE_IPHONE - -DECLARE_WXCOCOA_OBJC_CLASS(UIWindow); -DECLARE_WXCOCOA_OBJC_CLASS(UIView); -DECLARE_WXCOCOA_OBJC_CLASS(UIFont); -DECLARE_WXCOCOA_OBJC_CLASS(UIImage); -DECLARE_WXCOCOA_OBJC_CLASS(UIEvent); -DECLARE_WXCOCOA_OBJC_CLASS(NSSet); -DECLARE_WXCOCOA_OBJC_CLASS(EAGLContext); -DECLARE_WXCOCOA_OBJC_CLASS(UIWebView); - -typedef WX_UIWindow WXWindow; -typedef WX_UIView WXWidget; -typedef WX_EAGLContext WXGLContext; -typedef WX_NSString* WXGLPixelFormat; -typedef WX_UIWebView OSXWebViewPtr; - -#endif - -#if wxOSX_USE_COCOA_OR_CARBON -DECLARE_WXCOCOA_OBJC_CLASS(WebView); -typedef WX_WebView OSXWebViewPtr; -#endif - - -#endif /* __WXMAC__ */ - -/* ABX: check __WIN32__ instead of __WXMSW__ for the same MSWBase in any Win32 port */ -#if defined(__WIN32__) - -/* Stand-ins for Windows types to avoid #including all of windows.h */ - -#ifndef NO_STRICT - #define WX_MSW_DECLARE_HANDLE(type) typedef struct type##__ * WX##type -#else - #define WX_MSW_DECLARE_HANDLE(type) typedef void * WX##type -#endif - -typedef void* WXHANDLE; -WX_MSW_DECLARE_HANDLE(HWND); -WX_MSW_DECLARE_HANDLE(HICON); -WX_MSW_DECLARE_HANDLE(HFONT); -WX_MSW_DECLARE_HANDLE(HMENU); -WX_MSW_DECLARE_HANDLE(HPEN); -WX_MSW_DECLARE_HANDLE(HBRUSH); -WX_MSW_DECLARE_HANDLE(HPALETTE); -WX_MSW_DECLARE_HANDLE(HCURSOR); -WX_MSW_DECLARE_HANDLE(HRGN); -WX_MSW_DECLARE_HANDLE(RECTPTR); -WX_MSW_DECLARE_HANDLE(HACCEL); -WX_MSW_DECLARE_HANDLE(HINSTANCE); -WX_MSW_DECLARE_HANDLE(HBITMAP); -WX_MSW_DECLARE_HANDLE(HIMAGELIST); -WX_MSW_DECLARE_HANDLE(HGLOBAL); -WX_MSW_DECLARE_HANDLE(HDC); -typedef WXHINSTANCE WXHMODULE; - -#undef WX_MSW_DECLARE_HANDLE - -typedef unsigned int WXUINT; -typedef unsigned long WXDWORD; -typedef unsigned short WXWORD; - -typedef unsigned long WXCOLORREF; -typedef void * WXRGNDATA; -typedef struct tagMSG WXMSG; -typedef void * WXHCONV; -typedef void * WXHKEY; -typedef void * WXHTREEITEM; - -typedef void * WXDRAWITEMSTRUCT; -typedef void * WXMEASUREITEMSTRUCT; -typedef void * WXLPCREATESTRUCT; - -#ifdef __WXMSW__ -typedef WXHWND WXWidget; -#endif - -#ifdef __WIN64__ -typedef wxUint64 WXWPARAM; -typedef wxInt64 WXLPARAM; -typedef wxInt64 WXLRESULT; -#else -typedef wxW64 unsigned int WXWPARAM; -typedef wxW64 long WXLPARAM; -typedef wxW64 long WXLRESULT; -#endif - -#if defined(__GNUWIN32__) -typedef int (*WXFARPROC)(); -#else -typedef int (__stdcall *WXFARPROC)(); -#endif -#endif /* __WIN32__ */ - - -#if defined(__WXMOTIF__) || defined(__WXX11__) -/* Stand-ins for X/Xt/Motif types */ -typedef void* WXWindow; -typedef void* WXWidget; -typedef void* WXAppContext; -typedef void* WXColormap; -typedef void* WXColor; -typedef void WXDisplay; -typedef void WXEvent; -typedef void* WXCursor; -typedef void* WXPixmap; -typedef void* WXFontStructPtr; -typedef void* WXGC; -typedef void* WXRegion; -typedef void* WXFont; -typedef void* WXImage; -typedef void* WXFontList; -typedef void* WXFontSet; -typedef void* WXRendition; -typedef void* WXRenderTable; -typedef void* WXFontType; /* either a XmFontList or XmRenderTable */ -typedef void* WXString; - -typedef unsigned long Atom; /* this might fail on a few architectures */ -typedef long WXPixel; /* safety catch in src/motif/colour.cpp */ - -#endif /* Motif */ - -#ifdef __WXGTK__ - -/* Stand-ins for GLIB types */ -typedef struct _GSList GSList; - -/* Stand-ins for GDK types */ -typedef struct _GdkColor GdkColor; -typedef struct _GdkCursor GdkCursor; -typedef struct _GdkDragContext GdkDragContext; - -#if defined(__WXGTK20__) - typedef struct _GdkAtom* GdkAtom; -#else - typedef unsigned long GdkAtom; -#endif - -#if !defined(__WXGTK3__) - typedef struct _GdkColormap GdkColormap; - typedef struct _GdkFont GdkFont; - typedef struct _GdkGC GdkGC; - typedef struct _GdkRegion GdkRegion; -#endif - -#if defined(__WXGTK3__) - typedef struct _GdkWindow GdkWindow; -#elif defined(__WXGTK20__) - typedef struct _GdkDrawable GdkWindow; - typedef struct _GdkDrawable GdkPixmap; -#else - typedef struct _GdkWindow GdkWindow; - typedef struct _GdkWindow GdkBitmap; - typedef struct _GdkWindow GdkPixmap; -#endif - -/* Stand-ins for GTK types */ -typedef struct _GtkWidget GtkWidget; -typedef struct _GtkRcStyle GtkRcStyle; -typedef struct _GtkAdjustment GtkAdjustment; -typedef struct _GtkToolbar GtkToolbar; -typedef struct _GtkNotebook GtkNotebook; -typedef struct _GtkNotebookPage GtkNotebookPage; -typedef struct _GtkAccelGroup GtkAccelGroup; -typedef struct _GtkSelectionData GtkSelectionData; -typedef struct _GtkTextBuffer GtkTextBuffer; -typedef struct _GtkRange GtkRange; -typedef struct _GtkCellRenderer GtkCellRenderer; - -typedef GtkWidget *WXWidget; - -#ifndef __WXGTK20__ -#define GTK_OBJECT_GET_CLASS(object) (GTK_OBJECT(object)->klass) -#define GTK_CLASS_TYPE(klass) ((klass)->type) -#endif - -#endif /* __WXGTK__ */ - -#if defined(__WXGTK20__) || (defined(__WXX11__) && wxUSE_UNICODE) -#define wxUSE_PANGO 1 -#else -#define wxUSE_PANGO 0 -#endif - -#if wxUSE_PANGO -/* Stand-ins for Pango types */ -typedef struct _PangoContext PangoContext; -typedef struct _PangoLayout PangoLayout; -typedef struct _PangoFontDescription PangoFontDescription; -#endif - -#ifdef __WXDFB__ -/* DirectFB doesn't have the concept of non-TLW window, so use - something arbitrary */ -typedef const void* WXWidget; -#endif /* DFB */ - -#ifdef __WXQT__ -#include "wx/qt/defs.h" -#endif - -/* This is required because of clashing macros in windows.h, which may be */ -/* included before or after wxWidgets classes, and therefore must be */ -/* disabled here before any significant wxWidgets headers are included. */ -#ifdef __cplusplus -#ifdef __WINDOWS__ -#include "wx/msw/winundef.h" -#endif /* __WINDOWS__ */ -#endif /* __cplusplus */ - - -/* include the feature test macros */ -#include "wx/features.h" - -/* --------------------------------------------------------------------------- */ -/* macros to define a class without copy ctor nor assignment operator */ -/* --------------------------------------------------------------------------- */ - -#define wxDECLARE_NO_COPY_CLASS(classname) \ - private: \ - classname(const classname&); \ - classname& operator=(const classname&) - -#define wxDECLARE_NO_COPY_TEMPLATE_CLASS(classname, arg) \ - private: \ - classname(const classname&); \ - classname& operator=(const classname&) - -#define wxDECLARE_NO_COPY_TEMPLATE_CLASS_2(classname, arg1, arg2) \ - private: \ - classname(const classname&); \ - classname& operator=(const classname&) - -#define wxDECLARE_NO_ASSIGN_CLASS(classname) \ - private: \ - classname& operator=(const classname&) - -/* deprecated variants _not_ requiring a semicolon after them */ -#define DECLARE_NO_COPY_CLASS(classname) \ - wxDECLARE_NO_COPY_CLASS(classname); -#define DECLARE_NO_COPY_TEMPLATE_CLASS(classname, arg) \ - wxDECLARE_NO_COPY_TEMPLATE_CLASS(classname, arg); -#define DECLARE_NO_ASSIGN_CLASS(classname) \ - wxDECLARE_NO_ASSIGN_CLASS(classname); - -/* --------------------------------------------------------------------------- */ -/* If a manifest is being automatically generated, add common controls 6 to it */ -/* --------------------------------------------------------------------------- */ - -#if wxUSE_GUI && \ - (!defined wxUSE_NO_MANIFEST || wxUSE_NO_MANIFEST == 0 ) && \ - ( defined _MSC_FULL_VER && _MSC_FULL_VER >= 140040130 ) - -#define WX_CC_MANIFEST(cpu) \ - "/manifestdependency:\"type='win32' \ - name='Microsoft.Windows.Common-Controls' \ - version='6.0.0.0' \ - processorArchitecture='" cpu "' \ - publicKeyToken='6595b64144ccf1df' \ - language='*'\"" - -#if defined _M_IX86 - #pragma comment(linker, WX_CC_MANIFEST("x86")) -#elif defined _M_X64 - #pragma comment(linker, WX_CC_MANIFEST("amd64")) -#elif defined _M_IA64 - #pragma comment(linker, WX_CC_MANIFEST("ia64")) -#else - #pragma comment(linker, WX_CC_MANIFEST("*")) -#endif - -#endif /* !wxUSE_NO_MANIFEST && _MSC_FULL_VER >= 140040130 */ - -/* wxThread and wxProcess priorities */ -enum -{ - wxPRIORITY_MIN = 0u, /* lowest possible priority */ - wxPRIORITY_DEFAULT = 50u, /* normal priority */ - wxPRIORITY_MAX = 100u /* highest possible priority */ -}; - -#endif - /* _WX_DEFS_H_ */ diff --git a/Externals/wxWidgets3/include/wx/dialog.h b/Externals/wxWidgets3/include/wx/dialog.h deleted file mode 100644 index 1150fbdbf3..0000000000 --- a/Externals/wxWidgets3/include/wx/dialog.h +++ /dev/null @@ -1,431 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/dialog.h -// Purpose: wxDialogBase class -// Author: Vadim Zeitlin -// Modified by: -// Created: 29.06.99 -// Copyright: (c) Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DIALOG_H_BASE_ -#define _WX_DIALOG_H_BASE_ - -#include "wx/toplevel.h" -#include "wx/containr.h" -#include "wx/sharedptr.h" - -class WXDLLIMPEXP_FWD_CORE wxSizer; -class WXDLLIMPEXP_FWD_CORE wxStdDialogButtonSizer; -class WXDLLIMPEXP_FWD_CORE wxBoxSizer; -class WXDLLIMPEXP_FWD_CORE wxDialogLayoutAdapter; -class WXDLLIMPEXP_FWD_CORE wxDialog; -class WXDLLIMPEXP_FWD_CORE wxButton; -class WXDLLIMPEXP_FWD_CORE wxScrolledWindow; -class wxTextSizerWrapper; - -// Also see the bit summary table in wx/toplevel.h. - -#define wxDIALOG_NO_PARENT 0x00000020 // Don't make owned by apps top window - -#define wxDEFAULT_DIALOG_STYLE (wxCAPTION | wxSYSTEM_MENU | wxCLOSE_BOX) - -// Layout adaptation levels, for SetLayoutAdaptationLevel - -// Don't do any layout adaptation -#define wxDIALOG_ADAPTATION_NONE 0 - -// Only look for wxStdDialogButtonSizer for non-scrolling part -#define wxDIALOG_ADAPTATION_STANDARD_SIZER 1 - -// Also look for any suitable sizer for non-scrolling part -#define wxDIALOG_ADAPTATION_ANY_SIZER 2 - -// Also look for 'loose' standard buttons for non-scrolling part -#define wxDIALOG_ADAPTATION_LOOSE_BUTTONS 3 - -// Layout adaptation mode, for SetLayoutAdaptationMode -enum wxDialogLayoutAdaptationMode -{ - wxDIALOG_ADAPTATION_MODE_DEFAULT = 0, // use global adaptation enabled status - wxDIALOG_ADAPTATION_MODE_ENABLED = 1, // enable this dialog overriding global status - wxDIALOG_ADAPTATION_MODE_DISABLED = 2 // disable this dialog overriding global status -}; - -enum wxDialogModality -{ - wxDIALOG_MODALITY_NONE = 0, - wxDIALOG_MODALITY_WINDOW_MODAL = 1, - wxDIALOG_MODALITY_APP_MODAL = 2 -}; - -extern WXDLLIMPEXP_DATA_CORE(const char) wxDialogNameStr[]; - -class WXDLLIMPEXP_CORE wxDialogBase : public wxNavigationEnabled -{ -public: - wxDialogBase(); - virtual ~wxDialogBase() { } - - // define public wxDialog methods to be implemented by the derived classes - virtual int ShowModal() = 0; - virtual void EndModal(int retCode) = 0; - virtual bool IsModal() const = 0; - // show the dialog frame-modally (needs a parent), using app-modal - // dialogs on platforms that don't support it - virtual void ShowWindowModal () ; - virtual void SendWindowModalDialogEvent ( wxEventType type ); - - template - void ShowWindowModalThenDo(const Functor& onEndModal); - - // Modal dialogs have a return code - usually the id of the last - // pressed button - void SetReturnCode(int returnCode) { m_returnCode = returnCode; } - int GetReturnCode() const { return m_returnCode; } - - // Set the identifier for the affirmative button: this button will close - // the dialog after validating data and calling TransferDataFromWindow() - void SetAffirmativeId(int affirmativeId); - int GetAffirmativeId() const { return m_affirmativeId; } - - // Set identifier for Esc key translation: the button with this id will - // close the dialog without doing anything else; special value wxID_NONE - // means to not handle Esc at all while wxID_ANY means to map Esc to - // wxID_CANCEL if present and GetAffirmativeId() otherwise - void SetEscapeId(int escapeId); - int GetEscapeId() const { return m_escapeId; } - - // Find the parent to use for modal dialog: try to use the specified parent - // but fall back to the current active window or main application window as - // last resort if it is unsuitable. - // - // As this function is often called from the ctor, the window style may be - // not set yet and hence must be passed explicitly to it so that we could - // check whether it contains wxDIALOG_NO_PARENT bit. - // - // This function always returns a valid top level window or NULL. - wxWindow *GetParentForModalDialog(wxWindow *parent, long style) const; - - // This overload can only be used for already initialized windows, i.e. not - // from the ctor. It uses the current window parent and style. - wxWindow *GetParentForModalDialog() const - { - return GetParentForModalDialog(GetParent(), GetWindowStyle()); - } - -#if wxUSE_STATTEXT // && wxUSE_TEXTCTRL - // splits text up at newlines and places the lines into a vertical - // wxBoxSizer - wxSizer *CreateTextSizer( const wxString& message ); - - // same as above but uses a customized wxTextSizerWrapper to create - // non-standard controls for the lines - wxSizer *CreateTextSizer( const wxString& message, - wxTextSizerWrapper& wrapper ); -#endif // wxUSE_STATTEXT // && wxUSE_TEXTCTRL - - // returns a horizontal wxBoxSizer containing the given buttons - // - // notice that the returned sizer can be NULL if no buttons are put in the - // sizer (this mostly happens under smart phones and other atypical - // platforms which have hardware buttons replacing OK/Cancel and such) - wxSizer *CreateButtonSizer(long flags); - - // returns a sizer containing the given one and a static line separating it - // from the preceding elements if it's appropriate for the current platform - wxSizer *CreateSeparatedSizer(wxSizer *sizer); - - // returns the sizer containing CreateButtonSizer() below a separating - // static line for the platforms which use static lines for items - // separation (i.e. not Mac) - // - // this is just a combination of CreateButtonSizer() and - // CreateSeparatedSizer() - wxSizer *CreateSeparatedButtonSizer(long flags); - -#if wxUSE_BUTTON - wxStdDialogButtonSizer *CreateStdDialogButtonSizer( long flags ); -#endif // wxUSE_BUTTON - - // Do layout adaptation - virtual bool DoLayoutAdaptation(); - - // Can we do layout adaptation? - virtual bool CanDoLayoutAdaptation(); - - // Returns a content window if there is one. This can be used by the layout adapter, for - // example to make the pages of a book control into scrolling windows - virtual wxWindow* GetContentWindow() const { return NULL; } - - // Add an id to the list of main button identifiers that should be in the button sizer - void AddMainButtonId(wxWindowID id) { m_mainButtonIds.Add((int) id); } - wxArrayInt& GetMainButtonIds() { return m_mainButtonIds; } - - // Is this id in the main button id array? - bool IsMainButtonId(wxWindowID id) const { return (m_mainButtonIds.Index((int) id) != wxNOT_FOUND); } - - // Level of adaptation, from none (Level 0) to full (Level 3). To disable adaptation, - // set level 0, for example in your dialog constructor. You might - // do this if you know that you are displaying on a large screen and you don't want the - // dialog changed. - void SetLayoutAdaptationLevel(int level) { m_layoutAdaptationLevel = level; } - int GetLayoutAdaptationLevel() const { return m_layoutAdaptationLevel; } - - /// Override global adaptation enabled/disabled status - void SetLayoutAdaptationMode(wxDialogLayoutAdaptationMode mode) { m_layoutAdaptationMode = mode; } - wxDialogLayoutAdaptationMode GetLayoutAdaptationMode() const { return m_layoutAdaptationMode; } - - // Returns true if the adaptation has been done - void SetLayoutAdaptationDone(bool adaptationDone) { m_layoutAdaptationDone = adaptationDone; } - bool GetLayoutAdaptationDone() const { return m_layoutAdaptationDone; } - - // Set layout adapter class, returning old adapter - static wxDialogLayoutAdapter* SetLayoutAdapter(wxDialogLayoutAdapter* adapter); - static wxDialogLayoutAdapter* GetLayoutAdapter() { return sm_layoutAdapter; } - - // Global switch for layout adaptation - static bool IsLayoutAdaptationEnabled() { return sm_layoutAdaptation; } - static void EnableLayoutAdaptation(bool enable) { sm_layoutAdaptation = enable; } - - // modality kind - virtual wxDialogModality GetModality() const; -protected: - // emulate click of a button with the given id if it's present in the dialog - // - // return true if button was "clicked" or false if we don't have it - bool EmulateButtonClickIfPresent(int id); - - // this function is used by OnCharHook() to decide whether the given key - // should close the dialog - // - // for most platforms the default implementation (which just checks for - // Esc) is sufficient, but Mac port also adds Cmd-. here and other ports - // could do something different if needed - virtual bool IsEscapeKey(const wxKeyEvent& event); - - // end either modal or modeless dialog, for the modal dialog rc is used as - // the dialog return code - void EndDialog(int rc); - - // call Validate() and TransferDataFromWindow() and close dialog with - // wxID_OK return code - void AcceptAndClose(); - - // The return code from modal dialog - int m_returnCode; - - // The identifier for the affirmative button (usually wxID_OK) - int m_affirmativeId; - - // The identifier for cancel button (usually wxID_CANCEL) - int m_escapeId; - - // Flags whether layout adaptation has been done for this dialog - bool m_layoutAdaptationDone; - - // Extra button identifiers to be taken as 'main' button identifiers - // to be placed in the non-scrolling area - wxArrayInt m_mainButtonIds; - - // Adaptation level - int m_layoutAdaptationLevel; - - // Local override for global adaptation enabled status - wxDialogLayoutAdaptationMode m_layoutAdaptationMode; - - // Global layout adapter - static wxDialogLayoutAdapter* sm_layoutAdapter; - - // Global adaptation switch - static bool sm_layoutAdaptation; - -private: - // helper of GetParentForModalDialog(): returns the passed in window if it - // can be used as our parent or NULL if it can't - wxWindow *CheckIfCanBeUsedAsParent(wxWindow *parent) const; - - // Helper of OnCharHook() and OnCloseWindow(): find the appropriate button - // for closing the dialog and send a click event for it. - // - // Return true if we found a button to close the dialog and "clicked" it or - // false otherwise. - bool SendCloseButtonClickEvent(); - - // handle Esc key presses - void OnCharHook(wxKeyEvent& event); - - // handle closing the dialog window - void OnCloseWindow(wxCloseEvent& event); - - // handle the standard buttons - void OnButton(wxCommandEvent& event); - - // update the background colour - void OnSysColourChanged(wxSysColourChangedEvent& event); - - - wxDECLARE_NO_COPY_CLASS(wxDialogBase); - wxDECLARE_EVENT_TABLE(); -}; - -/*! - * Base class for layout adapters - code that, for example, turns a dialog into a - * scrolling dialog if there isn't enough screen space. You can derive further - * adapter classes to do any other kind of adaptation, such as applying a watermark, or adding - * a help mechanism. - */ - -class WXDLLIMPEXP_CORE wxDialogLayoutAdapter: public wxObject -{ - wxDECLARE_CLASS(wxDialogLayoutAdapter); -public: - wxDialogLayoutAdapter() {} - - // Override this function to indicate that adaptation should be done - virtual bool CanDoLayoutAdaptation(wxDialog* dialog) = 0; - - // Override this function to do the adaptation - virtual bool DoLayoutAdaptation(wxDialog* dialog) = 0; -}; - -/*! - * Standard adapter. Does scrolling adaptation for paged and regular dialogs. - * - */ - -class WXDLLIMPEXP_CORE wxStandardDialogLayoutAdapter: public wxDialogLayoutAdapter -{ - wxDECLARE_CLASS(wxStandardDialogLayoutAdapter); -public: - wxStandardDialogLayoutAdapter() {} - -// Overrides - - // Indicate that adaptation should be done - virtual bool CanDoLayoutAdaptation(wxDialog* dialog) wxOVERRIDE; - - // Do layout adaptation - virtual bool DoLayoutAdaptation(wxDialog* dialog) wxOVERRIDE; - -// Implementation - - // Create the scrolled window - virtual wxScrolledWindow* CreateScrolledWindow(wxWindow* parent); - -#if wxUSE_BUTTON - // Find a standard or horizontal box sizer - virtual wxSizer* FindButtonSizer(bool stdButtonSizer, wxDialog* dialog, wxSizer* sizer, int& retBorder, int accumlatedBorder = 0); - - // Check if this sizer contains standard buttons, and so can be repositioned in the dialog - virtual bool IsOrdinaryButtonSizer(wxDialog* dialog, wxBoxSizer* sizer); - - // Check if this is a standard button - virtual bool IsStandardButton(wxDialog* dialog, wxButton* button); - - // Find 'loose' main buttons in the existing layout and add them to the standard dialog sizer - virtual bool FindLooseButtons(wxDialog* dialog, wxStdDialogButtonSizer* buttonSizer, wxSizer* sizer, int& count); -#endif // wxUSE_BUTTON - - // Reparent the controls to the scrolled window, except those in buttonSizer - virtual void ReparentControls(wxWindow* parent, wxWindow* reparentTo, wxSizer* buttonSizer = NULL); - static void DoReparentControls(wxWindow* parent, wxWindow* reparentTo, wxSizer* buttonSizer = NULL); - - // A function to fit the dialog around its contents, and then adjust for screen size. - // If scrolled windows are passed, scrolling is enabled in the required orientation(s). - virtual bool FitWithScrolling(wxDialog* dialog, wxScrolledWindow* scrolledWindow); - virtual bool FitWithScrolling(wxDialog* dialog, wxWindowList& windows); - static bool DoFitWithScrolling(wxDialog* dialog, wxScrolledWindow* scrolledWindow); - static bool DoFitWithScrolling(wxDialog* dialog, wxWindowList& windows); - - // Find whether scrolling will be necessary for the dialog, returning wxVERTICAL, wxHORIZONTAL or both - virtual int MustScroll(wxDialog* dialog, wxSize& windowSize, wxSize& displaySize); - static int DoMustScroll(wxDialog* dialog, wxSize& windowSize, wxSize& displaySize); -}; - -#if defined(__WXUNIVERSAL__) - #include "wx/univ/dialog.h" -#else - #if defined(__WXMSW__) - #include "wx/msw/dialog.h" - #elif defined(__WXMOTIF__) - #include "wx/motif/dialog.h" - #elif defined(__WXGTK20__) - #include "wx/gtk/dialog.h" - #elif defined(__WXGTK__) - #include "wx/gtk1/dialog.h" - #elif defined(__WXMAC__) - #include "wx/osx/dialog.h" - #elif defined(__WXQT__) - #include "wx/qt/dialog.h" - #endif -#endif - -class WXDLLIMPEXP_CORE wxWindowModalDialogEvent : public wxCommandEvent -{ -public: - wxWindowModalDialogEvent (wxEventType commandType = wxEVT_NULL, int id = 0) - : wxCommandEvent(commandType, id) { } - - wxDialog *GetDialog() const - { return wxStaticCast(GetEventObject(), wxDialog); } - - int GetReturnCode() const - { return GetDialog()->GetReturnCode(); } - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxWindowModalDialogEvent (*this); } - -private: - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxWindowModalDialogEvent); -}; - -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_WINDOW_MODAL_DIALOG_CLOSED , wxWindowModalDialogEvent ); - -typedef void (wxEvtHandler::*wxWindowModalDialogEventFunction)(wxWindowModalDialogEvent &); - -#define wxWindowModalDialogEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxWindowModalDialogEventFunction, func) - -#define EVT_WINDOW_MODAL_DIALOG_CLOSED(winid, func) \ - wx__DECLARE_EVT1(wxEVT_WINDOW_MODAL_DIALOG_CLOSED, winid, wxWindowModalDialogEventHandler(func)) - -template -class wxWindowModalDialogEventFunctor -{ -public: - wxWindowModalDialogEventFunctor(const Functor& f) - : m_f(new Functor(f)) - {} - - void operator()(wxWindowModalDialogEvent& event) - { - if ( m_f ) - { - // We only want to call this handler once. Also, by deleting - // the functor here, its data (such as wxWindowPtr pointing to - // the dialog) are freed immediately after exiting this operator(). - wxSharedPtr functor(m_f); - m_f.reset(); - - (*functor)(event.GetReturnCode()); - } - else // was already called once - { - event.Skip(); - } - } - -private: - wxSharedPtr m_f; -}; - -template -void wxDialogBase::ShowWindowModalThenDo(const Functor& onEndModal) -{ - Bind(wxEVT_WINDOW_MODAL_DIALOG_CLOSED, - wxWindowModalDialogEventFunctor(onEndModal)); - ShowWindowModal(); -} - -#endif - // _WX_DIALOG_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/dialup.h b/Externals/wxWidgets3/include/wx/dialup.h deleted file mode 100644 index 7688d4a1f8..0000000000 --- a/Externals/wxWidgets3/include/wx/dialup.h +++ /dev/null @@ -1,200 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/dialup.h -// Purpose: Network related wxWidgets classes and functions -// Author: Vadim Zeitlin -// Modified by: -// Created: 07.07.99 -// Copyright: (c) Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DIALUP_H -#define _WX_DIALUP_H - -#if wxUSE_DIALUP_MANAGER - -#include "wx/event.h" - -// ---------------------------------------------------------------------------- -// misc -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_BASE wxArrayString; - -#define WXDIALUP_MANAGER_DEFAULT_BEACONHOST wxT("www.yahoo.com") - -// ---------------------------------------------------------------------------- -// A class which groups functions dealing with connecting to the network from a -// workstation using dial-up access to the net. There is at most one instance -// of this class in the program accessed via GetDialUpManager(). -// ---------------------------------------------------------------------------- - -/* TODO - * - * 1. more configurability for Unix: i.e. how to initiate the connection, how - * to check for online status, &c. - * 2. a function to enumerate all connections (ISPs) and show a dialog in - * Dial() allowing to choose between them if no ISP given - * 3. add an async version of dialing functions which notify the caller about - * the progress (or may be even start another thread to monitor it) - * 4. the static creation/accessor functions are not MT-safe - but is this - * really crucial? I think we may suppose they're always called from the - * main thread? - */ - -class WXDLLIMPEXP_CORE wxDialUpManager -{ -public: - // this function should create and return the object of the - // platform-specific class derived from wxDialUpManager. It's implemented - // in the platform-specific source files. - static wxDialUpManager *Create(); - - // could the dialup manager be initialized correctly? If this function - // returns false, no other functions will work neither, so it's a good idea - // to call this function and check its result before calling any other - // wxDialUpManager methods - virtual bool IsOk() const = 0; - - // virtual dtor for any base class - virtual ~wxDialUpManager() { } - - // operations - // ---------- - - // fills the array with the names of all possible values for the first - // parameter to Dial() on this machine and returns their number (may be 0) - virtual size_t GetISPNames(wxArrayString& names) const = 0; - - // dial the given ISP, use username and password to authentificate - // - // if no nameOfISP is given, the function will select the default one - // - // if no username/password are given, the function will try to do without - // them, but will ask the user if really needed - // - // if async parameter is false, the function waits until the end of dialing - // and returns true upon successful completion. - // if async is true, the function only initiates the connection and returns - // immediately - the result is reported via events (an event is sent - // anyhow, but if dialing failed it will be a DISCONNECTED one) - virtual bool Dial(const wxString& nameOfISP = wxEmptyString, - const wxString& username = wxEmptyString, - const wxString& password = wxEmptyString, - bool async = true) = 0; - - // returns true if (async) dialing is in progress - virtual bool IsDialing() const = 0; - - // cancel dialing the number initiated with Dial(async = true) - // NB: this won't result in DISCONNECTED event being sent - virtual bool CancelDialing() = 0; - - // hang up the currently active dial up connection - virtual bool HangUp() = 0; - - // online status - // ------------- - - // returns true if the computer has a permanent network connection (i.e. is - // on a LAN) and so there is no need to use Dial() function to go online - // - // NB: this functions tries to guess the result and it is not always - // guaranteed to be correct, so it's better to ask user for - // confirmation or give him a possibility to override it - virtual bool IsAlwaysOnline() const = 0; - - // returns true if the computer is connected to the network: under Windows, - // this just means that a RAS connection exists, under Unix we check that - // the "well-known host" (as specified by SetWellKnownHost) is reachable - virtual bool IsOnline() const = 0; - - // sometimes the built-in logic for determining the online status may fail, - // so, in general, the user should be allowed to override it. This function - // allows to forcefully set the online status - whatever our internal - // algorithm may think about it. - virtual void SetOnlineStatus(bool isOnline = true) = 0; - - // set misc wxDialUpManager options - // -------------------------------- - - // enable automatical checks for the connection status and sending of - // wxEVT_DIALUP_CONNECTED/wxEVT_DIALUP_DISCONNECTED events. The interval - // parameter is only for Unix where we do the check manually: under - // Windows, the notification about the change of connection status is - // instantenous. - // - // Returns false if couldn't set up automatic check for online status. - virtual bool EnableAutoCheckOnlineStatus(size_t nSeconds = 60) = 0; - - // disable automatic check for connection status change - notice that the - // wxEVT_DIALUP_XXX events won't be sent any more neither. - virtual void DisableAutoCheckOnlineStatus() = 0; - - // additional Unix-only configuration - // ---------------------------------- - - // under Unix, the value of well-known host is used to check whether we're - // connected to the internet. It's unused under Windows, but this function - // is always safe to call. The default value is www.yahoo.com. - virtual void SetWellKnownHost(const wxString& hostname, - int portno = 80) = 0; - - // Sets the commands to start up the network and to hang up again. Used by - // the Unix implementations only. - virtual void - SetConnectCommand(const wxString& commandDial = wxT("/usr/bin/pon"), - const wxString& commandHangup = wxT("/usr/bin/poff")) = 0; -}; - -// ---------------------------------------------------------------------------- -// wxDialUpManager events -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxDialUpEvent; - -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_DIALUP_CONNECTED, wxDialUpEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_DIALUP_DISCONNECTED, wxDialUpEvent ); - -// the event class for the dialup events -class WXDLLIMPEXP_CORE wxDialUpEvent : public wxEvent -{ -public: - wxDialUpEvent(bool isConnected, bool isOwnEvent) : wxEvent(isOwnEvent) - { - SetEventType(isConnected ? wxEVT_DIALUP_CONNECTED - : wxEVT_DIALUP_DISCONNECTED); - } - - // is this a CONNECTED or DISCONNECTED event? - bool IsConnectedEvent() const - { return GetEventType() == wxEVT_DIALUP_CONNECTED; } - - // does this event come from wxDialUpManager::Dial() or from some external - // process (i.e. does it result from our own attempt to establish the - // connection)? - bool IsOwnEvent() const { return m_id != 0; } - - // implement the base class pure virtual - virtual wxEvent *Clone() const { return new wxDialUpEvent(*this); } - -private: - wxDECLARE_NO_ASSIGN_CLASS(wxDialUpEvent); -}; - -// the type of dialup event handler function -typedef void (wxEvtHandler::*wxDialUpEventFunction)(wxDialUpEvent&); - -#define wxDialUpEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxDialUpEventFunction, func) - -// macros to catch dialup events -#define EVT_DIALUP_CONNECTED(func) \ - wx__DECLARE_EVT0(wxEVT_DIALUP_CONNECTED, wxDialUpEventHandler(func)) -#define EVT_DIALUP_DISCONNECTED(func) \ - wx__DECLARE_EVT0(wxEVT_DIALUP_DISCONNECTED, wxDialUpEventHandler(func)) - - -#endif // wxUSE_DIALUP_MANAGER - -#endif // _WX_DIALUP_H diff --git a/Externals/wxWidgets3/include/wx/dir.h b/Externals/wxWidgets3/include/wx/dir.h deleted file mode 100644 index f23862e0a9..0000000000 --- a/Externals/wxWidgets3/include/wx/dir.h +++ /dev/null @@ -1,186 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/dir.h -// Purpose: wxDir is a class for enumerating the files in a directory -// Author: Vadim Zeitlin -// Modified by: -// Created: 08.12.99 -// Copyright: (c) 1999 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DIR_H_ -#define _WX_DIR_H_ - -#include "wx/longlong.h" -#include "wx/string.h" -#include "wx/filefn.h" // for wxS_DIR_DEFAULT - -class WXDLLIMPEXP_FWD_BASE wxArrayString; - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -// These flags affect the behaviour of GetFirst/GetNext() and Traverse(). -// They define what types are included in the list of items they produce. -// Note that wxDIR_NO_FOLLOW is relevant only on Unix and ignored under systems -// not supporting symbolic links. -enum wxDirFlags -{ - wxDIR_FILES = 0x0001, // include files - wxDIR_DIRS = 0x0002, // include directories - wxDIR_HIDDEN = 0x0004, // include hidden files - wxDIR_DOTDOT = 0x0008, // include '.' and '..' - wxDIR_NO_FOLLOW = 0x0010, // don't dereference any symlink - - // by default, enumerate everything except '.' and '..' - wxDIR_DEFAULT = wxDIR_FILES | wxDIR_DIRS | wxDIR_HIDDEN -}; - -// these constants are possible return value of wxDirTraverser::OnDir() -enum wxDirTraverseResult -{ - wxDIR_IGNORE = -1, // ignore this directory but continue with others - wxDIR_STOP, // stop traversing - wxDIR_CONTINUE // continue into this directory -}; - -// ---------------------------------------------------------------------------- -// wxDirTraverser: helper class for wxDir::Traverse() -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxDirTraverser -{ -public: - /// a virtual dtor has been provided since this class has virtual members - virtual ~wxDirTraverser() { } - // called for each file found by wxDir::Traverse() - // - // return wxDIR_STOP or wxDIR_CONTINUE from here (wxDIR_IGNORE doesn't - // make sense) - virtual wxDirTraverseResult OnFile(const wxString& filename) = 0; - - // called for each directory found by wxDir::Traverse() - // - // return one of the enum elements defined above - virtual wxDirTraverseResult OnDir(const wxString& dirname) = 0; - - // called for each directory which we couldn't open during our traversal - // of the directory tree - // - // this method can also return either wxDIR_STOP, wxDIR_IGNORE or - // wxDIR_CONTINUE but the latter is treated specially: it means to retry - // opening the directory and so may lead to infinite loop if it is - // returned unconditionally, be careful with this! - // - // the base class version always returns wxDIR_IGNORE - virtual wxDirTraverseResult OnOpenError(const wxString& dirname); -}; - -// ---------------------------------------------------------------------------- -// wxDir: portable equivalent of {open/read/close}dir functions -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_BASE wxDirData; - -class WXDLLIMPEXP_BASE wxDir -{ -public: - - // ctors - // ----- - - // default, use Open() - wxDir() { m_data = NULL; } - - // opens the directory for enumeration, use IsOpened() to test success - wxDir(const wxString& dir); - - // dtor calls Close() automatically - ~wxDir() { Close(); } - - // open the directory for enumerating - bool Open(const wxString& dir); - - // close the directory, Open() can be called again later - void Close(); - - // returns true if the directory was successfully opened - bool IsOpened() const; - - // get the full name of the directory (without '/' at the end) - wxString GetName() const; - - // Same as GetName() but does include the trailing separator, unless the - // string is empty (only for invalid directories). - wxString GetNameWithSep() const; - - - // file enumeration routines - // ------------------------- - - // start enumerating all files matching filespec (or all files if it is - // empty) and flags, return true on success - bool GetFirst(wxString *filename, - const wxString& filespec = wxEmptyString, - int flags = wxDIR_DEFAULT) const; - - // get next file in the enumeration started with GetFirst() - bool GetNext(wxString *filename) const; - - // return true if this directory has any files in it - bool HasFiles(const wxString& spec = wxEmptyString) const; - - // return true if this directory has any subdirectories - bool HasSubDirs(const wxString& spec = wxEmptyString) const; - - // enumerate all files in this directory and its subdirectories - // - // return the number of files found - size_t Traverse(wxDirTraverser& sink, - const wxString& filespec = wxEmptyString, - int flags = wxDIR_DEFAULT) const; - - // simplest version of Traverse(): get the names of all files under this - // directory into filenames array, return the number of files - static size_t GetAllFiles(const wxString& dirname, - wxArrayString *files, - const wxString& filespec = wxEmptyString, - int flags = wxDIR_DEFAULT); - - // check if there any files matching the given filespec under the given - // directory (i.e. searches recursively), return the file path if found or - // empty string otherwise - static wxString FindFirst(const wxString& dirname, - const wxString& filespec, - int flags = wxDIR_DEFAULT); - -#if wxUSE_LONGLONG - // returns the size of all directories recursively found in given path - static wxULongLong GetTotalSize(const wxString &dir, wxArrayString *filesSkipped = NULL); -#endif // wxUSE_LONGLONG - - - // static utilities for directory management - // (alias to wxFileName's functions for dirs) - // ----------------------------------------- - - // test for existence of a directory with the given name - static bool Exists(const wxString& dir); - - static bool Make(const wxString &dir, int perm = wxS_DIR_DEFAULT, - int flags = 0); - - static bool Remove(const wxString &dir, int flags = 0); - - -private: - friend class wxDirData; - - wxDirData *m_data; - - wxDECLARE_NO_COPY_CLASS(wxDir); -}; - -#endif // _WX_DIR_H_ - diff --git a/Externals/wxWidgets3/include/wx/dirctrl.h b/Externals/wxWidgets3/include/wx/dirctrl.h deleted file mode 100644 index 1d9d1ba186..0000000000 --- a/Externals/wxWidgets3/include/wx/dirctrl.h +++ /dev/null @@ -1,17 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/dirctrl.h -// Purpose: Directory control base header -// Author: Julian Smart -// Modified by: -// Created: -// Copyright: (c) Julian Smart -// Licence: wxWindows Licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DIRCTRL_H_BASE_ -#define _WX_DIRCTRL_H_BASE_ - -#include "wx/generic/dirctrlg.h" - -#endif - // _WX_DIRCTRL_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/dirdlg.h b/Externals/wxWidgets3/include/wx/dirdlg.h deleted file mode 100644 index dfdbffc737..0000000000 --- a/Externals/wxWidgets3/include/wx/dirdlg.h +++ /dev/null @@ -1,123 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/dirdlg.h -// Purpose: wxDirDialog base class -// Author: Robert Roebling -// Modified by: -// Created: -// Copyright: (c) Robert Roebling -// Licence: wxWindows Licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DIRDLG_H_BASE_ -#define _WX_DIRDLG_H_BASE_ - -#include "wx/defs.h" - -#if wxUSE_DIRDLG - -#include "wx/dialog.h" - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -extern WXDLLIMPEXP_DATA_CORE(const char) wxDirDialogNameStr[]; -extern WXDLLIMPEXP_DATA_CORE(const char) wxDirDialogDefaultFolderStr[]; -extern WXDLLIMPEXP_DATA_CORE(const char) wxDirSelectorPromptStr[]; - -#define wxDD_CHANGE_DIR 0x0100 -#define wxDD_DIR_MUST_EXIST 0x0200 - -// deprecated, on by default now, use wxDD_DIR_MUST_EXIST to disable it -#define wxDD_NEW_DIR_BUTTON 0 - -#define wxDD_DEFAULT_STYLE (wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER) - -//------------------------------------------------------------------------- -// wxDirDialogBase -//------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxDirDialogBase : public wxDialog -{ -public: - wxDirDialogBase() {} - wxDirDialogBase(wxWindow *parent, - const wxString& title = wxDirSelectorPromptStr, - const wxString& defaultPath = wxEmptyString, - long style = wxDD_DEFAULT_STYLE, - const wxPoint& pos = wxDefaultPosition, - const wxSize& sz = wxDefaultSize, - const wxString& name = wxDirDialogNameStr) - { - Create(parent, title, defaultPath, style, pos, sz, name); - } - - virtual ~wxDirDialogBase() {} - - - bool Create(wxWindow *parent, - const wxString& title = wxDirSelectorPromptStr, - const wxString& defaultPath = wxEmptyString, - long style = wxDD_DEFAULT_STYLE, - const wxPoint& pos = wxDefaultPosition, - const wxSize& sz = wxDefaultSize, - const wxString& name = wxDirDialogNameStr) - { - if (!wxDialog::Create(parent, wxID_ANY, title, pos, sz, style, name)) - return false; - m_path = defaultPath; - m_message = title; - return true; - } - - virtual void SetMessage(const wxString& message) { m_message = message; } - virtual void SetPath(const wxString& path) { m_path = path; } - - virtual wxString GetMessage() const { return m_message; } - virtual wxString GetPath() const { return m_path; } - -protected: - wxString m_message; - wxString m_path; -}; - - -// Universal and non-port related switches with need for generic implementation -#if defined(__WXUNIVERSAL__) - #include "wx/generic/dirdlgg.h" - #define wxDirDialog wxGenericDirDialog -#elif defined(__WXMSW__) && !wxUSE_OLE - #include "wx/generic/dirdlgg.h" - #define wxDirDialog wxGenericDirDialog -#elif defined(__WXMSW__) - #include "wx/msw/dirdlg.h" // Native MSW -#elif defined(__WXGTK20__) - #include "wx/gtk/dirdlg.h" // Native GTK for gtk2.4 -#elif defined(__WXGTK__) - #include "wx/generic/dirdlgg.h" - #define wxDirDialog wxGenericDirDialog -#elif defined(__WXMAC__) - #include "wx/osx/dirdlg.h" // Native Mac -#elif defined(__WXMOTIF__) || \ - defined(__WXX11__) - #include "wx/generic/dirdlgg.h" // Other ports use generic implementation - #define wxDirDialog wxGenericDirDialog -#elif defined(__WXQT__) - #include "wx/qt/dirdlg.h" -#endif - -// ---------------------------------------------------------------------------- -// common ::wxDirSelector() function -// ---------------------------------------------------------------------------- - -WXDLLIMPEXP_CORE wxString -wxDirSelector(const wxString& message = wxDirSelectorPromptStr, - const wxString& defaultPath = wxEmptyString, - long style = wxDD_DEFAULT_STYLE, - const wxPoint& pos = wxDefaultPosition, - wxWindow *parent = NULL); - -#endif // wxUSE_DIRDLG - -#endif - // _WX_DIRDLG_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/display.h b/Externals/wxWidgets3/include/wx/display.h deleted file mode 100644 index 4678672138..0000000000 --- a/Externals/wxWidgets3/include/wx/display.h +++ /dev/null @@ -1,127 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/display.h -// Purpose: wxDisplay class -// Author: Royce Mitchell III, Vadim Zeitlin -// Created: 06/21/02 -// Copyright: (c) 2002-2006 wxWidgets team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DISPLAY_H_BASE_ -#define _WX_DISPLAY_H_BASE_ - -// NB: no #if wxUSE_DISPLAY here, the display geometry part of this class (but -// not the video mode stuff) is always available but if wxUSE_DISPLAY == 0 -// it becomes just a trivial wrapper around the old wxDisplayXXX() functions - -#if wxUSE_DISPLAY - #include "wx/dynarray.h" - #include "wx/vidmode.h" - - WX_DECLARE_EXPORTED_OBJARRAY(wxVideoMode, wxArrayVideoModes); - - // default, uninitialized, video mode object - extern WXDLLIMPEXP_DATA_CORE(const wxVideoMode) wxDefaultVideoMode; -#endif // wxUSE_DISPLAY - -class WXDLLIMPEXP_FWD_CORE wxWindow; -class WXDLLIMPEXP_FWD_CORE wxPoint; -class WXDLLIMPEXP_FWD_CORE wxRect; -class WXDLLIMPEXP_FWD_BASE wxString; - -class WXDLLIMPEXP_FWD_CORE wxDisplayFactory; -class WXDLLIMPEXP_FWD_CORE wxDisplayImpl; - -// ---------------------------------------------------------------------------- -// wxDisplay: represents a display/monitor attached to the system -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxDisplay -{ -public: - // initialize the object containing all information about the given - // display - // - // the displays are numbered from 0 to GetCount() - 1, 0 is always the - // primary display and the only one which is always supported - wxDisplay(unsigned n = 0); - - // dtor is not virtual as this is a concrete class not meant to be derived - // from - ~wxDisplay(); - - - // return the number of available displays, valid parameters to - // wxDisplay ctor are from 0 up to this number - static unsigned GetCount(); - - // find the display where the given point lies, return wxNOT_FOUND if - // it doesn't belong to any display - static int GetFromPoint(const wxPoint& pt); - - // find the display where the given window lies, return wxNOT_FOUND if it - // is not shown at all - static int GetFromWindow(const wxWindow *window); - - - // return true if the object was initialized successfully - bool IsOk() const { return m_impl != NULL; } - - // get the full display size - wxRect GetGeometry() const; - - // get the client area of the display, i.e. without taskbars and such - wxRect GetClientArea() const; - - // name may be empty - wxString GetName() const; - - // display 0 is usually the primary display - bool IsPrimary() const; - - -#if wxUSE_DISPLAY - // enumerate all video modes supported by this display matching the given - // one (in the sense of wxVideoMode::Match()) - // - // as any mode matches the default value of the argument and there is - // always at least one video mode supported by display, the returned array - // is only empty for the default value of the argument if this function is - // not supported at all on this platform - wxArrayVideoModes - GetModes(const wxVideoMode& mode = wxDefaultVideoMode) const; - - // get current video mode - wxVideoMode GetCurrentMode() const; - - // change current mode, return true if succeeded, false otherwise - // - // for the default value of the argument restores the video mode to default - bool ChangeMode(const wxVideoMode& mode = wxDefaultVideoMode); - - // restore the default video mode (just a more readable synonym) - void ResetMode() { (void)ChangeMode(); } -#endif // wxUSE_DISPLAY - -private: - // returns the factory used to implement our static methods and create new - // displays - static wxDisplayFactory& Factory(); - - // creates the factory object, called by Factory() when it is called for - // the first time and should return a pointer allocated with new (the - // caller will delete it) - // - // this method must be implemented in platform-specific code if - // wxUSE_DISPLAY == 1 (if it is 0 we provide the stub in common code) - static wxDisplayFactory *CreateFactory(); - - - // the real implementation - wxDisplayImpl *m_impl; - - - wxDECLARE_NO_COPY_CLASS(wxDisplay); -}; - -#endif // _WX_DISPLAY_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/display_impl.h b/Externals/wxWidgets3/include/wx/display_impl.h deleted file mode 100644 index b6674ebfad..0000000000 --- a/Externals/wxWidgets3/include/wx/display_impl.h +++ /dev/null @@ -1,109 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/display_impl.h -// Purpose: wxDisplayImpl class declaration -// Author: Vadim Zeitlin -// Created: 2006-03-15 -// Copyright: (c) 2002-2006 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DISPLAY_IMPL_H_BASE_ -#define _WX_DISPLAY_IMPL_H_BASE_ - -#include "wx/gdicmn.h" // for wxRect - -// ---------------------------------------------------------------------------- -// wxDisplayFactory: allows to create wxDisplay objects -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxDisplayFactory -{ -public: - wxDisplayFactory() { } - virtual ~wxDisplayFactory() { } - - // create a new display object - // - // it can return a NULL pointer if the display creation failed - virtual wxDisplayImpl *CreateDisplay(unsigned n) = 0; - - // get the total number of displays - virtual unsigned GetCount() = 0; - - // return the display for the given point or wxNOT_FOUND - virtual int GetFromPoint(const wxPoint& pt) = 0; - - // return the display for the given window or wxNOT_FOUND - // - // the window pointer must not be NULL (i.e. caller should check it) - virtual int GetFromWindow(const wxWindow *window); -}; - -// ---------------------------------------------------------------------------- -// wxDisplayImpl: base class for all wxDisplay implementations -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxDisplayImpl -{ -public: - // virtual dtor for this base class - virtual ~wxDisplayImpl() { } - - - // return the full area of this display - virtual wxRect GetGeometry() const = 0; - - // return the area of the display available for normal windows - virtual wxRect GetClientArea() const { return GetGeometry(); } - - // return the name (may be empty) - virtual wxString GetName() const = 0; - - // return the index of this display - unsigned GetIndex() const { return m_index; } - - // return true if this is the primary monitor (usually one with index 0) - virtual bool IsPrimary() const { return GetIndex() == 0; } - - -#if wxUSE_DISPLAY - // implements wxDisplay::GetModes() - virtual wxArrayVideoModes GetModes(const wxVideoMode& mode) const = 0; - - // get current video mode - virtual wxVideoMode GetCurrentMode() const = 0; - - // change current mode, return true if succeeded, false otherwise - virtual bool ChangeMode(const wxVideoMode& mode) = 0; -#endif // wxUSE_DISPLAY - -protected: - // create the object providing access to the display with the given index - wxDisplayImpl(unsigned n) : m_index(n) { } - - - // the index of this display (0 is always the primary one) - const unsigned m_index; - - - friend class wxDisplayFactory; - - wxDECLARE_NO_COPY_CLASS(wxDisplayImpl); -}; - -// ---------------------------------------------------------------------------- -// wxDisplayFactorySingle -// ---------------------------------------------------------------------------- - -// this is a stub implementation using single/main display only, it is -// available even if wxUSE_DISPLAY == 0 -class WXDLLIMPEXP_CORE wxDisplayFactorySingle : public wxDisplayFactory -{ -public: - virtual wxDisplayImpl *CreateDisplay(unsigned n); - virtual unsigned GetCount() { return 1; } - virtual int GetFromPoint(const wxPoint& pt); -}; - -#endif // _WX_DISPLAY_IMPL_H_BASE_ - diff --git a/Externals/wxWidgets3/include/wx/dlimpexp.h b/Externals/wxWidgets3/include/wx/dlimpexp.h deleted file mode 100644 index 3412137fdf..0000000000 --- a/Externals/wxWidgets3/include/wx/dlimpexp.h +++ /dev/null @@ -1,316 +0,0 @@ -/* - * Name: wx/dlimpexp.h - * Purpose: Macros for declaring DLL-imported/exported functions - * Author: Vadim Zeitlin - * Modified by: - * Created: 16.10.2003 (extracted from wx/defs.h) - * Copyright: (c) 2003 Vadim Zeitlin - * Licence: wxWindows licence - */ - -/* - This is a C file, not C++ one, do not use C++ comments here! - */ - -#ifndef _WX_DLIMPEXP_H_ -#define _WX_DLIMPEXP_H_ - -#if defined(HAVE_VISIBILITY) -# define WXEXPORT __attribute__ ((visibility("default"))) -# define WXIMPORT __attribute__ ((visibility("default"))) -#elif defined(__WINDOWS__) - /* - __declspec works in BC++ 5 and later as well as VC++. - */ -# if defined(__VISUALC__) || defined(__BORLANDC__) -# define WXEXPORT __declspec(dllexport) -# define WXIMPORT __declspec(dllimport) - /* - While gcc also supports __declspec(dllexport), it created unusably huge - DLL files in gcc 4.[56] (while taking horribly long amounts of time), - see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43601. Because of this - we rely on binutils auto export/import support which seems to work - quite well for 4.5+. However the problem was fixed in 4.7 and later and - not exporting everything creates smaller DLLs (~8% size difference), so - do use the explicit attributes again for the newer versions. - */ -# elif defined(__GNUC__) && \ - (!wxCHECK_GCC_VERSION(4, 5) || wxCHECK_GCC_VERSION(4, 7)) - /* - __declspec could be used here too but let's use the native - __attribute__ instead for clarity. - */ -# define WXEXPORT __attribute__((dllexport)) -# define WXIMPORT __attribute__((dllimport)) -# endif -#elif defined(__CYGWIN__) -# define WXEXPORT __declspec(dllexport) -# define WXIMPORT __declspec(dllimport) -#endif - -/* for other platforms/compilers we don't anything */ -#ifndef WXEXPORT -# define WXEXPORT -# define WXIMPORT -#endif - -/* - We support building wxWidgets as a set of several libraries but we don't - support arbitrary combinations of libs/DLLs: either we build all of them as - DLLs (in which case WXMAKINGDLL is defined) or none (it isn't). - - However we have a problem because we need separate WXDLLIMPEXP versions for - different libraries as, for example, wxString class should be dllexported - when compiled in wxBase and dllimported otherwise, so we do define separate - WXMAKING/USINGDLL_XYZ constants for each component XYZ. - */ -#ifdef WXMAKINGDLL -# if wxUSE_BASE -# define WXMAKINGDLL_BASE -# endif - -# define WXMAKINGDLL_NET -# define WXMAKINGDLL_CORE -# define WXMAKINGDLL_ADV -# define WXMAKINGDLL_QA -# define WXMAKINGDLL_HTML -# define WXMAKINGDLL_GL -# define WXMAKINGDLL_XML -# define WXMAKINGDLL_XRC -# define WXMAKINGDLL_AUI -# define WXMAKINGDLL_PROPGRID -# define WXMAKINGDLL_RIBBON -# define WXMAKINGDLL_RICHTEXT -# define WXMAKINGDLL_MEDIA -# define WXMAKINGDLL_STC -# define WXMAKINGDLL_WEBVIEW -#endif /* WXMAKINGDLL */ - -/* - WXDLLIMPEXP_CORE maps to export declaration when building the DLL, to import - declaration if using it or to nothing at all if we don't use wxWin as DLL - */ -#ifdef WXMAKINGDLL_BASE -# define WXDLLIMPEXP_BASE WXEXPORT -# define WXDLLIMPEXP_DATA_BASE(type) WXEXPORT type -# if defined(HAVE_VISIBILITY) -# define WXDLLIMPEXP_INLINE_BASE WXEXPORT -# else -# define WXDLLIMPEXP_INLINE_BASE -# endif -#elif defined(WXUSINGDLL) -# define WXDLLIMPEXP_BASE WXIMPORT -# define WXDLLIMPEXP_DATA_BASE(type) WXIMPORT type -# if defined(HAVE_VISIBILITY) -# define WXDLLIMPEXP_INLINE_BASE WXIMPORT -# else -# define WXDLLIMPEXP_INLINE_BASE -# endif -#else /* not making nor using DLL */ -# define WXDLLIMPEXP_BASE -# define WXDLLIMPEXP_DATA_BASE(type) type -# define WXDLLIMPEXP_INLINE_BASE -#endif - -#ifdef WXMAKINGDLL_NET -# define WXDLLIMPEXP_NET WXEXPORT -# define WXDLLIMPEXP_DATA_NET(type) WXEXPORT type -#elif defined(WXUSINGDLL) -# define WXDLLIMPEXP_NET WXIMPORT -# define WXDLLIMPEXP_DATA_NET(type) WXIMPORT type -#else /* not making nor using DLL */ -# define WXDLLIMPEXP_NET -# define WXDLLIMPEXP_DATA_NET(type) type -#endif - -#ifdef WXMAKINGDLL_CORE -# define WXDLLIMPEXP_CORE WXEXPORT -# define WXDLLIMPEXP_DATA_CORE(type) WXEXPORT type -# if defined(HAVE_VISIBILITY) -# define WXDLLIMPEXP_INLINE_CORE WXEXPORT -# else -# define WXDLLIMPEXP_INLINE_CORE -# endif -#elif defined(WXUSINGDLL) -# define WXDLLIMPEXP_CORE WXIMPORT -# define WXDLLIMPEXP_DATA_CORE(type) WXIMPORT type -# if defined(HAVE_VISIBILITY) -# define WXDLLIMPEXP_INLINE_CORE WXIMPORT -# else -# define WXDLLIMPEXP_INLINE_CORE -# endif -#else /* not making nor using DLL */ -# define WXDLLIMPEXP_CORE -# define WXDLLIMPEXP_DATA_CORE(type) type -# define WXDLLIMPEXP_INLINE_CORE -#endif - -#ifdef WXMAKINGDLL_ADV -# define WXDLLIMPEXP_ADV WXEXPORT -# define WXDLLIMPEXP_DATA_ADV(type) WXEXPORT type -#elif defined(WXUSINGDLL) -# define WXDLLIMPEXP_ADV WXIMPORT -# define WXDLLIMPEXP_DATA_ADV(type) WXIMPORT type -#else /* not making nor using DLL */ -# define WXDLLIMPEXP_ADV -# define WXDLLIMPEXP_DATA_ADV(type) type -#endif - -#ifdef WXMAKINGDLL_QA -# define WXDLLIMPEXP_QA WXEXPORT -# define WXDLLIMPEXP_DATA_QA(type) WXEXPORT type -#elif defined(WXUSINGDLL) -# define WXDLLIMPEXP_QA WXIMPORT -# define WXDLLIMPEXP_DATA_QA(type) WXIMPORT type -#else /* not making nor using DLL */ -# define WXDLLIMPEXP_QA -# define WXDLLIMPEXP_DATA_QA(type) type -#endif - -#ifdef WXMAKINGDLL_HTML -# define WXDLLIMPEXP_HTML WXEXPORT -# define WXDLLIMPEXP_DATA_HTML(type) WXEXPORT type -#elif defined(WXUSINGDLL) -# define WXDLLIMPEXP_HTML WXIMPORT -# define WXDLLIMPEXP_DATA_HTML(type) WXIMPORT type -#else /* not making nor using DLL */ -# define WXDLLIMPEXP_HTML -# define WXDLLIMPEXP_DATA_HTML(type) type -#endif - -#ifdef WXMAKINGDLL_GL -# define WXDLLIMPEXP_GL WXEXPORT -#elif defined(WXUSINGDLL) -# define WXDLLIMPEXP_GL WXIMPORT -#else /* not making nor using DLL */ -# define WXDLLIMPEXP_GL -#endif - -#ifdef WXMAKINGDLL_XML -# define WXDLLIMPEXP_XML WXEXPORT -#elif defined(WXUSINGDLL) -# define WXDLLIMPEXP_XML WXIMPORT -#else /* not making nor using DLL */ -# define WXDLLIMPEXP_XML -#endif - -#ifdef WXMAKINGDLL_XRC -# define WXDLLIMPEXP_XRC WXEXPORT -#elif defined(WXUSINGDLL) -# define WXDLLIMPEXP_XRC WXIMPORT -#else /* not making nor using DLL */ -# define WXDLLIMPEXP_XRC -#endif - -#ifdef WXMAKINGDLL_AUI -# define WXDLLIMPEXP_AUI WXEXPORT -#elif defined(WXUSINGDLL) -# define WXDLLIMPEXP_AUI WXIMPORT -#else /* not making nor using DLL */ -# define WXDLLIMPEXP_AUI -#endif - -#ifdef WXMAKINGDLL_PROPGRID -# define WXDLLIMPEXP_PROPGRID WXEXPORT -# define WXDLLIMPEXP_DATA_PROPGRID(type) WXEXPORT type -#elif defined(WXUSINGDLL) -# define WXDLLIMPEXP_PROPGRID WXIMPORT -# define WXDLLIMPEXP_DATA_PROPGRID(type) WXIMPORT type -#else /* not making nor using DLL */ -# define WXDLLIMPEXP_PROPGRID -# define WXDLLIMPEXP_DATA_PROPGRID(type) type -#endif - -#ifdef WXMAKINGDLL_RIBBON -# define WXDLLIMPEXP_RIBBON WXEXPORT -#elif defined(WXUSINGDLL) -# define WXDLLIMPEXP_RIBBON WXIMPORT -#else /* not making nor using DLL */ -# define WXDLLIMPEXP_RIBBON -#endif - -#ifdef WXMAKINGDLL_RICHTEXT -# define WXDLLIMPEXP_RICHTEXT WXEXPORT -#elif defined(WXUSINGDLL) -# define WXDLLIMPEXP_RICHTEXT WXIMPORT -#else /* not making nor using DLL */ -# define WXDLLIMPEXP_RICHTEXT -#endif - -#ifdef WXMAKINGDLL_MEDIA -# define WXDLLIMPEXP_MEDIA WXEXPORT -#elif defined(WXUSINGDLL) -# define WXDLLIMPEXP_MEDIA WXIMPORT -#else /* not making nor using DLL */ -# define WXDLLIMPEXP_MEDIA -#endif - -#ifdef WXMAKINGDLL_STC -# define WXDLLIMPEXP_STC WXEXPORT -# define WXDLLIMPEXP_DATA_STC(type) WXEXPORT type -#elif defined(WXUSINGDLL) -# define WXDLLIMPEXP_STC WXIMPORT -# define WXDLLIMPEXP_DATA_STC(type) WXIMPORT type -#else /* not making nor using DLL */ -# define WXDLLIMPEXP_STC -# define WXDLLIMPEXP_DATA_STC(type) type -#endif - -#ifdef WXMAKINGDLL_WEBVIEW -# define WXDLLIMPEXP_WEBVIEW WXEXPORT -# define WXDLLIMPEXP_DATA_WEBVIEW(type) WXEXPORT type -#elif defined(WXUSINGDLL) -# define WXDLLIMPEXP_WEBVIEW WXIMPORT -# define WXDLLIMPEXP_DATA_WEBVIEW(type) WXIMPORT type -#else /* not making nor using DLL */ -# define WXDLLIMPEXP_WEBVIEW -# define WXDLLIMPEXP_DATA_WEBVIEW(type) type -#endif - -/* - GCC warns about using __attribute__ (and also __declspec in mingw32 case) on - forward declarations while MSVC complains about forward declarations without - __declspec for the classes later declared with it, so we need a separate set - of macros for forward declarations to hide this difference: - */ -#if defined(HAVE_VISIBILITY) || (defined(__WINDOWS__) && defined(__GNUC__)) - #define WXDLLIMPEXP_FWD_BASE - #define WXDLLIMPEXP_FWD_NET - #define WXDLLIMPEXP_FWD_CORE - #define WXDLLIMPEXP_FWD_ADV - #define WXDLLIMPEXP_FWD_QA - #define WXDLLIMPEXP_FWD_HTML - #define WXDLLIMPEXP_FWD_GL - #define WXDLLIMPEXP_FWD_XML - #define WXDLLIMPEXP_FWD_XRC - #define WXDLLIMPEXP_FWD_AUI - #define WXDLLIMPEXP_FWD_PROPGRID - #define WXDLLIMPEXP_FWD_RIBBON - #define WXDLLIMPEXP_FWD_RICHTEXT - #define WXDLLIMPEXP_FWD_MEDIA - #define WXDLLIMPEXP_FWD_STC - #define WXDLLIMPEXP_FWD_WEBVIEW -#else - #define WXDLLIMPEXP_FWD_BASE WXDLLIMPEXP_BASE - #define WXDLLIMPEXP_FWD_NET WXDLLIMPEXP_NET - #define WXDLLIMPEXP_FWD_CORE WXDLLIMPEXP_CORE - #define WXDLLIMPEXP_FWD_ADV WXDLLIMPEXP_ADV - #define WXDLLIMPEXP_FWD_QA WXDLLIMPEXP_QA - #define WXDLLIMPEXP_FWD_HTML WXDLLIMPEXP_HTML - #define WXDLLIMPEXP_FWD_GL WXDLLIMPEXP_GL - #define WXDLLIMPEXP_FWD_XML WXDLLIMPEXP_XML - #define WXDLLIMPEXP_FWD_XRC WXDLLIMPEXP_XRC - #define WXDLLIMPEXP_FWD_AUI WXDLLIMPEXP_AUI - #define WXDLLIMPEXP_FWD_PROPGRID WXDLLIMPEXP_PROPGRID - #define WXDLLIMPEXP_FWD_RIBBON WXDLLIMPEXP_RIBBON - #define WXDLLIMPEXP_FWD_RICHTEXT WXDLLIMPEXP_RICHTEXT - #define WXDLLIMPEXP_FWD_MEDIA WXDLLIMPEXP_MEDIA - #define WXDLLIMPEXP_FWD_STC WXDLLIMPEXP_STC - #define WXDLLIMPEXP_FWD_WEBVIEW WXDLLIMPEXP_WEBVIEW -#endif - -/* for backwards compatibility, define suffix-less versions too */ -#define WXDLLEXPORT WXDLLIMPEXP_CORE -#define WXDLLEXPORT_DATA WXDLLIMPEXP_DATA_CORE - -#endif /* _WX_DLIMPEXP_H_ */ diff --git a/Externals/wxWidgets3/include/wx/dlist.h b/Externals/wxWidgets3/include/wx/dlist.h deleted file mode 100644 index e0d23106e0..0000000000 --- a/Externals/wxWidgets3/include/wx/dlist.h +++ /dev/null @@ -1,848 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/dlist.h -// Purpose: wxDList which is a template version of wxList -// Author: Robert Roebling -// Created: 18.09.2008 -// Copyright: (c) 2008 wxWidgets team -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DLIST_H_ -#define _WX_DLIST_H_ - -#include "wx/defs.h" -#include "wx/utils.h" - -#if wxUSE_STD_CONTAINERS - -#include "wx/beforestd.h" -#include -#include -#include -#include "wx/afterstd.h" - -template -class wxDList: public std::list -{ -private: - bool m_destroy; - typedef std::list BaseListType; - typedef wxDList ListType; - -public: - typedef typename BaseListType::iterator iterator; - - class compatibility_iterator - { - private: - friend class wxDList; - - iterator m_iter; - ListType *m_list; - - public: - compatibility_iterator() - : m_iter(), m_list( NULL ) {} - compatibility_iterator( ListType* li, iterator i ) - : m_iter( i ), m_list( li ) {} - compatibility_iterator( const ListType* li, iterator i ) - : m_iter( i ), m_list( const_cast(li) ) {} - - compatibility_iterator* operator->() { return this; } - const compatibility_iterator* operator->() const { return this; } - - bool operator==(const compatibility_iterator& i) const - { - wxASSERT_MSG( m_list && i.m_list, - "comparing invalid iterators is illegal" ); - return (m_list == i.m_list) && (m_iter == i.m_iter); - } - bool operator!=(const compatibility_iterator& i) const - { return !( operator==( i ) ); } - operator bool() const - { return m_list ? m_iter != m_list->end() : false; } - bool operator !() const - { return !( operator bool() ); } - - T* GetData() const { return *m_iter; } - void SetData( T* e ) { *m_iter = e; } - - compatibility_iterator GetNext() const - { - iterator i = m_iter; - return compatibility_iterator( m_list, ++i ); - } - - compatibility_iterator GetPrevious() const - { - if ( m_iter == m_list->begin() ) - return compatibility_iterator(); - - iterator i = m_iter; - return compatibility_iterator( m_list, --i ); - } - - int IndexOf() const - { - return *this ? std::distance( m_list->begin(), m_iter ) - : wxNOT_FOUND; - } - }; - -public: - wxDList() : m_destroy( false ) {} - - ~wxDList() { Clear(); } - - compatibility_iterator Find( const T* e ) const - { - return compatibility_iterator( this, - std::find( const_cast(this)->begin(), - const_cast(this)->end(), e ) ); - } - - bool IsEmpty() const - { return this->empty(); } - size_t GetCount() const - { return this->size(); } - - compatibility_iterator Item( size_t idx ) const - { - iterator i = const_cast(this)->begin(); - std::advance( i, idx ); - return compatibility_iterator( this, i ); - } - - T* operator[](size_t idx) const - { - return Item(idx).GetData(); - } - - compatibility_iterator GetFirst() const - { - return compatibility_iterator( this, const_cast(this)->begin() ); - } - compatibility_iterator GetLast() const - { - iterator i = const_cast(this)->end(); - return compatibility_iterator( this, !(this->empty()) ? --i : i ); - } - compatibility_iterator Member( T* e ) const - { return Find( e ); } - compatibility_iterator Nth( int n ) const - { return Item( n ); } - int IndexOf( T* e ) const - { return Find( e ).IndexOf(); } - - compatibility_iterator Append( T* e ) - { - this->push_back( e ); - return GetLast(); - } - - compatibility_iterator Insert( T* e ) - { - this->push_front( e ); - return compatibility_iterator( this, this->begin() ); - } - - compatibility_iterator Insert( compatibility_iterator & i, T* e ) - { - return compatibility_iterator( this, this->insert( i.m_iter, e ) ); - } - - compatibility_iterator Insert( size_t idx, T* e ) - { - return compatibility_iterator( this, - this->insert( Item( idx ).m_iter, e ) ); - } - - void DeleteContents( bool destroy ) - { m_destroy = destroy; } - - bool GetDeleteContents() const - { return m_destroy; } - - void Erase( const compatibility_iterator& i ) - { - if ( m_destroy ) - delete i->GetData(); - this->erase( i.m_iter ); - } - - bool DeleteNode( const compatibility_iterator& i ) - { - if( i ) - { - Erase( i ); - return true; - } - return false; - } - - bool DeleteObject( T* e ) - { - return DeleteNode( Find( e ) ); - } - - void Clear() - { - if ( m_destroy ) - { - iterator it, en; - for ( it = this->begin(), en = this->end(); it != en; ++it ) - delete *it; - } - this->clear(); - } -}; - -#else // !wxUSE_STD_CONTAINERS - -template -class wxDList -{ -public: - class Node - { - public: - Node(wxDList *list = NULL, - Node *previous = NULL, - Node *next = NULL, - T *data = NULL) - { - m_list = list; - m_previous = previous; - m_next = next; - m_data = data; - if (previous) - previous->m_next = this; - if (next) - next->m_previous = this; - } - - ~Node() - { - // handle the case when we're being deleted from the list by - // the user (i.e. not by the list itself from DeleteNode) - - // we must do it for compatibility with old code - if (m_list != NULL) - m_list->DetachNode(this); - } - - void DeleteData() - { - delete m_data; - } - - Node *GetNext() const { return m_next; } - Node *GetPrevious() const { return m_previous; } - T *GetData() const { return m_data; } - T **GetDataPtr() const { return &(wx_const_cast(nodetype*,this)->m_data); } - void SetData( T *data ) { m_data = data; } - - int IndexOf() const - { - wxCHECK_MSG( m_list, wxNOT_FOUND, - "node doesn't belong to a list in IndexOf" ); - - int i; - Node *prev = m_previous; - for( i = 0; prev; i++ ) - prev = prev->m_previous; - return i; - } - - private: - T *m_data; // user data - Node *m_next, // next and previous nodes in the list - *m_previous; - wxDList *m_list; // list we belong to - - friend class wxDList; - }; - - typedef Node nodetype; - - class compatibility_iterator - { - public: - compatibility_iterator(nodetype *ptr = NULL) : m_ptr(ptr) { } - nodetype *operator->() const { return m_ptr; } - operator nodetype *() const { return m_ptr; } - - private: - nodetype *m_ptr; - }; - -private: - void Init() - { - m_nodeFirst = - m_nodeLast = NULL; - m_count = 0; - m_destroy = false; - } - - void DoDeleteNode( nodetype *node ) - { - if ( m_destroy ) - node->DeleteData(); - // so that the node knows that it's being deleted by the list - node->m_list = NULL; - delete node; - } - - size_t m_count; // number of elements in the list - bool m_destroy; // destroy user data when deleting list items? - nodetype *m_nodeFirst, // pointers to the head and tail of the list - *m_nodeLast; - -public: - wxDList() - { - Init(); - } - - wxDList( const wxDList& list ) - { - Init(); - Assign(list); - } - - wxDList( size_t count, T *elements[] ) - { - Init(); - size_t n; - for (n = 0; n < count; n++) - Append( elements[n] ); - } - - wxDList& operator=( const wxDList& list ) - { - if (&list != this) - Assign(list); - return *this; - } - - ~wxDList() - { - nodetype *each = m_nodeFirst; - while ( each != NULL ) - { - nodetype *next = each->GetNext(); - DoDeleteNode(each); - each = next; - } - } - - void Assign(const wxDList &list) - { - wxASSERT_MSG( !list.m_destroy, - "copying list which owns it's elements is a bad idea" ); - Clear(); - m_destroy = list.m_destroy; - m_nodeFirst = NULL; - m_nodeLast = NULL; - nodetype* node; - for (node = list.GetFirst(); node; node = node->GetNext() ) - Append(node->GetData()); - wxASSERT_MSG( m_count == list.m_count, "logic error in Assign()" ); - } - - nodetype *Append( T *object ) - { - nodetype *node = new nodetype( this, m_nodeLast, NULL, object ); - - if ( !m_nodeFirst ) - { - m_nodeFirst = node; - m_nodeLast = m_nodeFirst; - } - else - { - m_nodeLast->m_next = node; - m_nodeLast = node; - } - m_count++; - return node; - } - - nodetype *Insert( T* object ) - { - return Insert( NULL, object ); - } - - nodetype *Insert( size_t pos, T* object ) - { - if (pos == m_count) - return Append( object ); - else - return Insert( Item(pos), object ); - } - - nodetype *Insert( nodetype *position, T* object ) - { - wxCHECK_MSG( !position || position->m_list == this, NULL, - "can't insert before a node from another list" ); - - // previous and next node for the node being inserted - nodetype *prev, *next; - if ( position ) - { - prev = position->GetPrevious(); - next = position; - } - else - { - // inserting in the beginning of the list - prev = NULL; - next = m_nodeFirst; - } - nodetype *node = new nodetype( this, prev, next, object ); - if ( !m_nodeFirst ) - m_nodeLast = node; - if ( prev == NULL ) - m_nodeFirst = node; - m_count++; - return node; - } - - nodetype *GetFirst() const { return m_nodeFirst; } - nodetype *GetLast() const { return m_nodeLast; } - size_t GetCount() const { return m_count; } - bool IsEmpty() const { return m_count == 0; } - - void DeleteContents(bool destroy) { m_destroy = destroy; } - bool GetDeleteContents() const { return m_destroy; } - - nodetype *Item(size_t index) const - { - for ( nodetype *current = GetFirst(); current; current = current->GetNext() ) - { - if ( index-- == 0 ) - return current; - } - wxFAIL_MSG( "invalid index in Item()" ); - return NULL; - } - - T *operator[](size_t index) const - { - nodetype *node = Item(index); - return node ? node->GetData() : NULL; - } - - nodetype *DetachNode( nodetype *node ) - { - wxCHECK_MSG( node, NULL, "detaching NULL wxNodeBase" ); - wxCHECK_MSG( node->m_list == this, NULL, - "detaching node which is not from this list" ); - // update the list - nodetype **prevNext = node->GetPrevious() ? &node->GetPrevious()->m_next - : &m_nodeFirst; - nodetype **nextPrev = node->GetNext() ? &node->GetNext()->m_previous - : &m_nodeLast; - *prevNext = node->GetNext(); - *nextPrev = node->GetPrevious(); - m_count--; - // mark the node as not belonging to this list any more - node->m_list = NULL; - return node; - } - - void Erase( nodetype *node ) - { - DeleteNode(node); - } - - bool DeleteNode( nodetype *node ) - { - if ( !DetachNode(node) ) - return false; - DoDeleteNode(node); - return true; - } - - bool DeleteObject( T *object ) - { - for ( nodetype *current = GetFirst(); current; current = current->GetNext() ) - { - if ( current->GetData() == object ) - { - DeleteNode(current); - return true; - } - } - // not found - return false; - } - - nodetype *Find(const T *object) const - { - for ( nodetype *current = GetFirst(); current; current = current->GetNext() ) - { - if ( current->GetData() == object ) - return current; - } - // not found - return NULL; - } - - int IndexOf(const T *object) const - { - int n = 0; - for ( nodetype *current = GetFirst(); current; current = current->GetNext() ) - { - if ( current->GetData() == object ) - return n; - n++; - } - return wxNOT_FOUND; - } - - void Clear() - { - nodetype *current = m_nodeFirst; - while ( current ) - { - nodetype *next = current->GetNext(); - DoDeleteNode(current); - current = next; - } - m_nodeFirst = - m_nodeLast = NULL; - m_count = 0; - } - - void Reverse() - { - nodetype * node = m_nodeFirst; - nodetype* tmp; - while (node) - { - // swap prev and next pointers - tmp = node->m_next; - node->m_next = node->m_previous; - node->m_previous = tmp; - // this is the node that was next before swapping - node = tmp; - } - // swap first and last node - tmp = m_nodeFirst; m_nodeFirst = m_nodeLast; m_nodeLast = tmp; - } - - void DeleteNodes(nodetype* first, nodetype* last) - { - nodetype * node = first; - while (node != last) - { - nodetype* next = node->GetNext(); - DeleteNode(node); - node = next; - } - } - - void ForEach(wxListIterateFunction F) - { - for ( nodetype *current = GetFirst(); current; current = current->GetNext() ) - (*F)(current->GetData()); - } - - T *FirstThat(wxListIterateFunction F) - { - for ( nodetype *current = GetFirst(); current; current = current->GetNext() ) - { - if ( (*F)(current->GetData()) ) - return current->GetData(); - } - return NULL; - } - - T *LastThat(wxListIterateFunction F) - { - for ( nodetype *current = GetLast(); current; current = current->GetPrevious() ) - { - if ( (*F)(current->GetData()) ) - return current->GetData(); - } - return NULL; - } - - /* STL interface */ -public: - typedef size_t size_type; - typedef int difference_type; - typedef T* value_type; - typedef value_type& reference; - typedef const value_type& const_reference; - - class iterator - { - public: - typedef nodetype Node; - typedef iterator itor; - typedef T* value_type; - typedef value_type* ptr_type; - typedef value_type& reference; - - Node* m_node; - Node* m_init; - public: - typedef reference reference_type; - typedef ptr_type pointer_type; - - iterator(Node* node, Node* init) : m_node(node), m_init(init) {} - iterator() : m_node(NULL), m_init(NULL) { } - reference_type operator*() const - { return *m_node->GetDataPtr(); } - // ptrop - itor& operator++() { m_node = m_node->GetNext(); return *this; } - const itor operator++(int) - { itor tmp = *this; m_node = m_node->GetNext(); return tmp; } - itor& operator--() - { - m_node = m_node ? m_node->GetPrevious() : m_init; - return *this; - } - const itor operator--(int) - { - itor tmp = *this; - m_node = m_node ? m_node->GetPrevious() : m_init; - return tmp; - } - bool operator!=(const itor& it) const - { return it.m_node != m_node; } - bool operator==(const itor& it) const - { return it.m_node == m_node; } - }; - class const_iterator - { - public: - typedef nodetype Node; - typedef T* value_type; - typedef const value_type& const_reference; - typedef const_iterator itor; - typedef value_type* ptr_type; - - Node* m_node; - Node* m_init; - public: - typedef const_reference reference_type; - typedef const ptr_type pointer_type; - - const_iterator(Node* node, Node* init) - : m_node(node), m_init(init) { } - const_iterator() : m_node(NULL), m_init(NULL) { } - const_iterator(const iterator& it) - : m_node(it.m_node), m_init(it.m_init) { } - reference_type operator*() const - { return *m_node->GetDataPtr(); } - // ptrop - itor& operator++() { m_node = m_node->GetNext(); return *this; } - const itor operator++(int) - { itor tmp = *this; m_node = m_node->GetNext(); return tmp; } - itor& operator--() - { - m_node = m_node ? m_node->GetPrevious() : m_init; - return *this; - } - const itor operator--(int) - { - itor tmp = *this; - m_node = m_node ? m_node->GetPrevious() : m_init; - return tmp; - } - bool operator!=(const itor& it) const - { return it.m_node != m_node; } - bool operator==(const itor& it) const - { return it.m_node == m_node; } - }; - - class reverse_iterator - { - public: - typedef nodetype Node; - typedef T* value_type; - typedef reverse_iterator itor; - typedef value_type* ptr_type; - typedef value_type& reference; - - Node* m_node; - Node* m_init; - public: - typedef reference reference_type; - typedef ptr_type pointer_type; - - reverse_iterator(Node* node, Node* init) - : m_node(node), m_init(init) { } - reverse_iterator() : m_node(NULL), m_init(NULL) { } - reference_type operator*() const - { return *m_node->GetDataPtr(); } - // ptrop - itor& operator++() - { m_node = m_node->GetPrevious(); return *this; } - const itor operator++(int) - { itor tmp = *this; m_node = m_node->GetPrevious(); return tmp; } - itor& operator--() - { m_node = m_node ? m_node->GetNext() : m_init; return *this; } - const itor operator--(int) - { - itor tmp = *this; - m_node = m_node ? m_node->GetNext() : m_init; - return tmp; - } - bool operator!=(const itor& it) const - { return it.m_node != m_node; } - bool operator==(const itor& it) const - { return it.m_node == m_node; } - }; - - class const_reverse_iterator - { - public: - typedef nodetype Node; - typedef T* value_type; - typedef const_reverse_iterator itor; - typedef value_type* ptr_type; - typedef const value_type& const_reference; - - Node* m_node; - Node* m_init; - public: - typedef const_reference reference_type; - typedef const ptr_type pointer_type; - - const_reverse_iterator(Node* node, Node* init) - : m_node(node), m_init(init) { } - const_reverse_iterator() : m_node(NULL), m_init(NULL) { } - const_reverse_iterator(const reverse_iterator& it) - : m_node(it.m_node), m_init(it.m_init) { } - reference_type operator*() const - { return *m_node->GetDataPtr(); } - // ptrop - itor& operator++() - { m_node = m_node->GetPrevious(); return *this; } - const itor operator++(int) - { itor tmp = *this; m_node = m_node->GetPrevious(); return tmp; } - itor& operator--() - { m_node = m_node ? m_node->GetNext() : m_init; return *this;} - const itor operator--(int) - { - itor tmp = *this; - m_node = m_node ? m_node->GetNext() : m_init; - return tmp; - } - bool operator!=(const itor& it) const - { return it.m_node != m_node; } - bool operator==(const itor& it) const - { return it.m_node == m_node; } - }; - - wxEXPLICIT wxDList(size_type n, const_reference v = value_type()) - { assign(n, v); } - wxDList(const const_iterator& first, const const_iterator& last) - { assign(first, last); } - iterator begin() { return iterator(GetFirst(), GetLast()); } - const_iterator begin() const - { return const_iterator(GetFirst(), GetLast()); } - iterator end() { return iterator(NULL, GetLast()); } - const_iterator end() const { return const_iterator(NULL, GetLast()); } - reverse_iterator rbegin() - { return reverse_iterator(GetLast(), GetFirst()); } - const_reverse_iterator rbegin() const - { return const_reverse_iterator(GetLast(), GetFirst()); } - reverse_iterator rend() { return reverse_iterator(NULL, GetFirst()); } - const_reverse_iterator rend() const - { return const_reverse_iterator(NULL, GetFirst()); } - void resize(size_type n, value_type v = value_type()) - { - while (n < size()) - pop_back(); - while (n > size()) - push_back(v); - } - size_type size() const { return GetCount(); } - size_type max_size() const { return INT_MAX; } - bool empty() const { return IsEmpty(); } - reference front() { return *begin(); } - const_reference front() const { return *begin(); } - reference back() { iterator tmp = end(); return *--tmp; } - const_reference back() const { const_iterator tmp = end(); return *--tmp; } - void push_front(const_reference v = value_type()) - { Insert(GetFirst(), v); } - void pop_front() { DeleteNode(GetFirst()); } - void push_back(const_reference v = value_type()) - { Append( v ); } - void pop_back() { DeleteNode(GetLast()); } - void assign(const_iterator first, const const_iterator& last) - { - clear(); - for(; first != last; ++first) - Append(*first); - } - void assign(size_type n, const_reference v = value_type()) - { - clear(); - for(size_type i = 0; i < n; ++i) - Append(v); - } - iterator insert(const iterator& it, const_reference v) - { - if (it == end()) - Append( v ); - else - Insert(it.m_node,v); - iterator itprev(it); - return itprev--; - } - void insert(const iterator& it, size_type n, const_reference v) - { - for(size_type i = 0; i < n; ++i) - Insert(it.m_node, v); - } - void insert(const iterator& it, const_iterator first, const const_iterator& last) - { - for(; first != last; ++first) - Insert(it.m_node, *first); - } - iterator erase(const iterator& it) - { - iterator next = iterator(it.m_node->GetNext(), GetLast()); - DeleteNode(it.m_node); return next; - } - iterator erase(const iterator& first, const iterator& last) - { - iterator next = last; ++next; - DeleteNodes(first.m_node, last.m_node); - return next; - } - void clear() { Clear(); } - void splice(const iterator& it, wxDList& l, const iterator& first, const iterator& last) - { insert(it, first, last); l.erase(first, last); } - void splice(const iterator& it, wxDList& l) - { splice(it, l, l.begin(), l.end() ); } - void splice(const iterator& it, wxDList& l, const iterator& first) - { - iterator tmp = first; ++tmp; - if(it == first || it == tmp) return; - insert(it, *first); - l.erase(first); - } - void remove(const_reference v) - { DeleteObject(v); } - void reverse() - { Reverse(); } - /* void swap(list& l) - { - { size_t t = m_count; m_count = l.m_count; l.m_count = t; } - { bool t = m_destroy; m_destroy = l.m_destroy; l.m_destroy = t; } - { wxNodeBase* t = m_nodeFirst; m_nodeFirst = l.m_nodeFirst; l.m_nodeFirst = t; } - { wxNodeBase* t = m_nodeLast; m_nodeLast = l.m_nodeLast; l.m_nodeLast = t; } - { wxKeyType t = m_keyType; m_keyType = l.m_keyType; l.m_keyType = t; } - } */ -}; - -#endif // wxUSE_STD_CONTAINERS/!wxUSE_STD_CONTAINERS - -#endif // _WX_DLIST_H_ diff --git a/Externals/wxWidgets3/include/wx/dnd.h b/Externals/wxWidgets3/include/wx/dnd.h deleted file mode 100644 index 2f3f333329..0000000000 --- a/Externals/wxWidgets3/include/wx/dnd.h +++ /dev/null @@ -1,266 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/dnd.h -// Purpose: Drag and drop classes declarations -// Author: Vadim Zeitlin, Robert Roebling -// Modified by: -// Created: 26.05.99 -// Copyright: (c) wxWidgets Team -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DND_H_BASE_ -#define _WX_DND_H_BASE_ - -#include "wx/defs.h" - -#if wxUSE_DRAG_AND_DROP - -#include "wx/dataobj.h" -#include "wx/cursor.h" - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -// flags for wxDropSource::DoDragDrop() -// -// NB: wxDrag_CopyOnly must be 0 (== FALSE) and wxDrag_AllowMove must be 1 -// (== TRUE) for compatibility with the old DoDragDrop(bool) method! -enum -{ - wxDrag_CopyOnly = 0, // allow only copying - wxDrag_AllowMove = 1, // allow moving (copying is always allowed) - wxDrag_DefaultMove = 3 // the default operation is move, not copy -}; - -// result of wxDropSource::DoDragDrop() call -enum wxDragResult -{ - wxDragError, // error prevented the d&d operation from completing - wxDragNone, // drag target didn't accept the data - wxDragCopy, // the data was successfully copied - wxDragMove, // the data was successfully moved (MSW only) - wxDragLink, // operation is a drag-link - wxDragCancel // the operation was cancelled by user (not an error) -}; - -// return true if res indicates that something was done during a dnd operation, -// i.e. is neither error nor none nor cancel -WXDLLIMPEXP_CORE bool wxIsDragResultOk(wxDragResult res); - -// ---------------------------------------------------------------------------- -// wxDropSource is the object you need to create (and call DoDragDrop on it) -// to initiate a drag-and-drop operation -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxDropSourceBase -{ -public: - wxDropSourceBase(const wxCursor &cursorCopy = wxNullCursor, - const wxCursor &cursorMove = wxNullCursor, - const wxCursor &cursorStop = wxNullCursor) - : m_cursorCopy(cursorCopy), - m_cursorMove(cursorMove), - m_cursorStop(cursorStop) - { m_data = NULL; } - virtual ~wxDropSourceBase() { } - - // set the data which is transferred by drag and drop - void SetData(wxDataObject& data) - { m_data = &data; } - - wxDataObject *GetDataObject() - { return m_data; } - - // set the icon corresponding to given drag result - void SetCursor(wxDragResult res, const wxCursor& cursor) - { - if ( res == wxDragCopy ) - m_cursorCopy = cursor; - else if ( res == wxDragMove ) - m_cursorMove = cursor; - else - m_cursorStop = cursor; - } - - // start drag action, see enum wxDragResult for return value description - // - // if flags contains wxDrag_AllowMove, moving (and only copying) data is - // allowed, if it contains wxDrag_DefaultMove (which includes the previous - // flag), it is even the default operation - virtual wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly) = 0; - - // override to give feedback depending on the current operation result - // "effect" and return true if you did something, false to let the library - // give the default feedback - virtual bool GiveFeedback(wxDragResult WXUNUSED(effect)) { return false; } - -protected: - const wxCursor& GetCursor(wxDragResult res) const - { - if ( res == wxDragCopy ) - return m_cursorCopy; - else if ( res == wxDragMove ) - return m_cursorMove; - else - return m_cursorStop; - } - - // the data we're dragging - wxDataObject *m_data; - - // the cursors to use for feedback - wxCursor m_cursorCopy, - m_cursorMove, - m_cursorStop; - - wxDECLARE_NO_COPY_CLASS(wxDropSourceBase); -}; - -// ---------------------------------------------------------------------------- -// wxDropTarget should be associated with a window if it wants to be able to -// receive data via drag and drop. -// -// To use this class, you should derive from wxDropTarget and implement -// OnData() pure virtual method. You may also wish to override OnDrop() if you -// want to accept the data only inside some region of the window (this may -// avoid having to copy the data to this application which happens only when -// OnData() is called) -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxDropTargetBase -{ -public: - // ctor takes a pointer to heap-allocated wxDataObject which will be owned - // by wxDropTarget and deleted by it automatically. If you don't give it - // here, you can use SetDataObject() later. - wxDropTargetBase(wxDataObject *dataObject = NULL) - { m_dataObject = dataObject; m_defaultAction = wxDragNone; } - // dtor deletes our data object - virtual ~wxDropTargetBase() - { delete m_dataObject; } - - // get/set the associated wxDataObject - wxDataObject *GetDataObject() const - { return m_dataObject; } - void SetDataObject(wxDataObject *dataObject) - { if (m_dataObject) delete m_dataObject; - m_dataObject = dataObject; } - - // these functions are called when data is moved over position (x, y) and - // may return either wxDragCopy, wxDragMove or wxDragNone depending on - // what would happen if the data were dropped here. - // - // the last parameter is what would happen by default and is determined by - // the platform-specific logic (for example, under Windows it's wxDragCopy - // if Ctrl key is pressed and wxDragMove otherwise) except that it will - // always be wxDragNone if the carried data is in an unsupported format. - - // called when the mouse enters the window (only once until OnLeave()) - virtual wxDragResult OnEnter(wxCoord x, wxCoord y, wxDragResult def) - { return OnDragOver(x, y, def); } - - // called when the mouse moves in the window - shouldn't take long to - // execute or otherwise mouse movement would be too slow - virtual wxDragResult OnDragOver(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), - wxDragResult def) - { return def; } - - // called when mouse leaves the window: might be used to remove the - // feedback which was given in OnEnter() - virtual void OnLeave() { } - - // this function is called when data is dropped at position (x, y) - if it - // returns true, OnData() will be called immediately afterwards which will - // allow to retrieve the data dropped. - virtual bool OnDrop(wxCoord x, wxCoord y) = 0; - - // called after OnDrop() returns TRUE: you will usually just call - // GetData() from here and, probably, also refresh something to update the - // new data and, finally, return the code indicating how did the operation - // complete (returning default value in case of success and wxDragError on - // failure is usually ok) - virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def) = 0; - - // may be called *only* from inside OnData() and will fill m_dataObject - // with the data from the drop source if it returns true - virtual bool GetData() = 0; - - // sets the default action for drag and drop: - // use wxDragMove or wxDragCopy to set deafult action to move or copy - // and use wxDragNone (default) to set default action specified by - // initialization of draging (see wxDropSourceBase::DoDragDrop()) - void SetDefaultAction(wxDragResult action) - { m_defaultAction = action; } - - // returns default action for drag and drop or - // wxDragNone if this not specified - wxDragResult GetDefaultAction() - { return m_defaultAction; } - -protected: - wxDataObject *m_dataObject; - wxDragResult m_defaultAction; - - wxDECLARE_NO_COPY_CLASS(wxDropTargetBase); -}; - -// ---------------------------------------------------------------------------- -// include platform dependent class declarations -// ---------------------------------------------------------------------------- - -#if defined(__WXMSW__) - #include "wx/msw/ole/dropsrc.h" - #include "wx/msw/ole/droptgt.h" -#elif defined(__WXMOTIF__) - #include "wx/motif/dnd.h" -#elif defined(__WXX11__) - #include "wx/x11/dnd.h" -#elif defined(__WXGTK20__) - #include "wx/gtk/dnd.h" -#elif defined(__WXGTK__) - #include "wx/gtk1/dnd.h" -#elif defined(__WXMAC__) - #include "wx/osx/dnd.h" -#elif defined(__WXQT__) - #include "wx/qt/dnd.h" -#endif - -// ---------------------------------------------------------------------------- -// standard wxDropTarget implementations (implemented in common/dobjcmn.cpp) -// ---------------------------------------------------------------------------- - -// A simple wxDropTarget derived class for text data: you only need to -// override OnDropText() to get something working -class WXDLLIMPEXP_CORE wxTextDropTarget : public wxDropTarget -{ -public: - wxTextDropTarget(); - - virtual bool OnDropText(wxCoord x, wxCoord y, const wxString& text) = 0; - - virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def) wxOVERRIDE; - -private: - wxDECLARE_NO_COPY_CLASS(wxTextDropTarget); -}; - -// A drop target which accepts files (dragged from File Manager or Explorer) -class WXDLLIMPEXP_CORE wxFileDropTarget : public wxDropTarget -{ -public: - wxFileDropTarget(); - - // parameters are the number of files and the array of file names - virtual bool OnDropFiles(wxCoord x, wxCoord y, - const wxArrayString& filenames) = 0; - - virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def) wxOVERRIDE; - -private: - wxDECLARE_NO_COPY_CLASS(wxFileDropTarget); -}; - -#endif // wxUSE_DRAG_AND_DROP - -#endif // _WX_DND_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/docmdi.h b/Externals/wxWidgets3/include/wx/docmdi.h deleted file mode 100644 index 4ffd2e7509..0000000000 --- a/Externals/wxWidgets3/include/wx/docmdi.h +++ /dev/null @@ -1,88 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/docmdi.h -// Purpose: Frame classes for MDI document/view applications -// Author: Julian Smart -// Created: 01/02/97 -// Copyright: (c) 1997 Julian Smart -// (c) 2010 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DOCMDI_H_ -#define _WX_DOCMDI_H_ - -#include "wx/defs.h" - -#if wxUSE_MDI_ARCHITECTURE - -#include "wx/docview.h" -#include "wx/mdi.h" - -// Define MDI versions of the doc-view frame classes. Note that we need to -// define them as classes for wxRTTI, otherwise we could simply define them as -// typedefs. - -// ---------------------------------------------------------------------------- -// An MDI document parent frame -// ---------------------------------------------------------------------------- - -typedef - wxDocParentFrameAny wxDocMDIParentFrameBase; - -class WXDLLIMPEXP_CORE wxDocMDIParentFrame : public wxDocMDIParentFrameBase -{ -public: - wxDocMDIParentFrame() : wxDocMDIParentFrameBase() { } - - wxDocMDIParentFrame(wxDocManager *manager, - wxFrame *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr) - : wxDocMDIParentFrameBase(manager, - parent, id, title, pos, size, style, name) - { - } - -private: - wxDECLARE_CLASS(wxDocMDIParentFrame); - wxDECLARE_NO_COPY_CLASS(wxDocMDIParentFrame); -}; - -// ---------------------------------------------------------------------------- -// An MDI document child frame -// ---------------------------------------------------------------------------- - -typedef - wxDocChildFrameAny wxDocMDIChildFrameBase; - -class WXDLLIMPEXP_CORE wxDocMDIChildFrame : public wxDocMDIChildFrameBase -{ -public: - wxDocMDIChildFrame() { } - - wxDocMDIChildFrame(wxDocument *doc, - wxView *view, - wxMDIParentFrame *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr) - : wxDocMDIChildFrameBase(doc, view, - parent, id, title, pos, size, style, name) - { - } - -private: - wxDECLARE_CLASS(wxDocMDIChildFrame); - wxDECLARE_NO_COPY_CLASS(wxDocMDIChildFrame); -}; - -#endif // wxUSE_MDI_ARCHITECTURE - -#endif // _WX_DOCMDI_H_ diff --git a/Externals/wxWidgets3/include/wx/docview.h b/Externals/wxWidgets3/include/wx/docview.h deleted file mode 100644 index 45cfc585c9..0000000000 --- a/Externals/wxWidgets3/include/wx/docview.h +++ /dev/null @@ -1,1028 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/docview.h -// Purpose: Doc/View classes -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DOCH__ -#define _WX_DOCH__ - -#include "wx/defs.h" - -#if wxUSE_DOC_VIEW_ARCHITECTURE - -#include "wx/list.h" -#include "wx/dlist.h" -#include "wx/string.h" -#include "wx/frame.h" -#include "wx/filehistory.h" -#include "wx/vector.h" - -#if wxUSE_PRINTING_ARCHITECTURE - #include "wx/print.h" -#endif - -class WXDLLIMPEXP_FWD_CORE wxWindow; -class WXDLLIMPEXP_FWD_CORE wxDocument; -class WXDLLIMPEXP_FWD_CORE wxView; -class WXDLLIMPEXP_FWD_CORE wxDocTemplate; -class WXDLLIMPEXP_FWD_CORE wxDocManager; -class WXDLLIMPEXP_FWD_CORE wxPrintInfo; -class WXDLLIMPEXP_FWD_CORE wxCommandProcessor; -class WXDLLIMPEXP_FWD_BASE wxConfigBase; - -class wxDocChildFrameAnyBase; - -#if wxUSE_STD_IOSTREAM - #include "wx/iosfwrap.h" -#else - #include "wx/stream.h" -#endif - -// Flags for wxDocManager (can be combined). -enum -{ - wxDOC_NEW = 1, - wxDOC_SILENT = 2 -}; - -// Document template flags -enum -{ - wxTEMPLATE_VISIBLE = 1, - wxTEMPLATE_INVISIBLE = 2, - wxDEFAULT_TEMPLATE_FLAGS = wxTEMPLATE_VISIBLE -}; - -#define wxMAX_FILE_HISTORY 9 - -typedef wxVector wxDocVector; -typedef wxVector wxViewVector; -typedef wxVector wxDocTemplateVector; - -class WXDLLIMPEXP_CORE wxDocument : public wxEvtHandler -{ -public: - wxDocument(wxDocument *parent = NULL); - virtual ~wxDocument(); - - // accessors - void SetFilename(const wxString& filename, bool notifyViews = false); - wxString GetFilename() const { return m_documentFile; } - - void SetTitle(const wxString& title) { m_documentTitle = title; } - wxString GetTitle() const { return m_documentTitle; } - - void SetDocumentName(const wxString& name) { m_documentTypeName = name; } - wxString GetDocumentName() const { return m_documentTypeName; } - - // access the flag indicating whether this document had been already saved, - // SetDocumentSaved() is only used internally, don't call it - bool GetDocumentSaved() const { return m_savedYet; } - void SetDocumentSaved(bool saved = true) { m_savedYet = saved; } - - // activate the first view of the document if any - void Activate(); - - // return true if the document hasn't been modified since the last time it - // was saved (implying that it returns false if it was never saved, even if - // the document is not modified) - bool AlreadySaved() const { return !IsModified() && GetDocumentSaved(); } - - virtual bool Close(); - virtual bool Save(); - virtual bool SaveAs(); - virtual bool Revert(); - -#if wxUSE_STD_IOSTREAM - virtual wxSTD ostream& SaveObject(wxSTD ostream& stream); - virtual wxSTD istream& LoadObject(wxSTD istream& stream); -#else - virtual wxOutputStream& SaveObject(wxOutputStream& stream); - virtual wxInputStream& LoadObject(wxInputStream& stream); -#endif - - // Called by wxWidgets - virtual bool OnSaveDocument(const wxString& filename); - virtual bool OnOpenDocument(const wxString& filename); - virtual bool OnNewDocument(); - virtual bool OnCloseDocument(); - - // Prompts for saving if about to close a modified document. Returns true - // if ok to close the document (may have saved in the meantime, or set - // modified to false) - virtual bool OnSaveModified(); - - // if you override, remember to call the default - // implementation (wxDocument::OnChangeFilename) - virtual void OnChangeFilename(bool notifyViews); - - // Called by framework if created automatically by the default document - // manager: gives document a chance to initialise and (usually) create a - // view - virtual bool OnCreate(const wxString& path, long flags); - - // By default, creates a base wxCommandProcessor. - virtual wxCommandProcessor *OnCreateCommandProcessor(); - virtual wxCommandProcessor *GetCommandProcessor() const - { return m_commandProcessor; } - virtual void SetCommandProcessor(wxCommandProcessor *proc) - { m_commandProcessor = proc; } - - // Called after a view is added or removed. The default implementation - // deletes the document if this is there are no more views. - virtual void OnChangedViewList(); - - // Called from OnCloseDocument(), does nothing by default but may be - // overridden. Return value is ignored. - virtual bool DeleteContents(); - - virtual bool Draw(wxDC&); - virtual bool IsModified() const { return m_documentModified; } - virtual void Modify(bool mod); - - virtual bool AddView(wxView *view); - virtual bool RemoveView(wxView *view); - - wxViewVector GetViewsVector() const; - - wxList& GetViews() { return m_documentViews; } - const wxList& GetViews() const { return m_documentViews; } - - wxView *GetFirstView() const; - - virtual void UpdateAllViews(wxView *sender = NULL, wxObject *hint = NULL); - virtual void NotifyClosing(); - - // Remove all views (because we're closing the document) - virtual bool DeleteAllViews(); - - // Other stuff - virtual wxDocManager *GetDocumentManager() const; - virtual wxDocTemplate *GetDocumentTemplate() const - { return m_documentTemplate; } - virtual void SetDocumentTemplate(wxDocTemplate *temp) - { m_documentTemplate = temp; } - - // Get the document name to be shown to the user: the title if there is - // any, otherwise the filename if the document was saved and, finally, - // "unnamed" otherwise - virtual wxString GetUserReadableName() const; - -#if WXWIN_COMPATIBILITY_2_8 - // use GetUserReadableName() instead - wxDEPRECATED_BUT_USED_INTERNALLY( - virtual bool GetPrintableName(wxString& buf) const - ); -#endif // WXWIN_COMPATIBILITY_2_8 - - // Returns a window that can be used as a parent for document-related - // dialogs. Override if necessary. - virtual wxWindow *GetDocumentWindow() const; - - // Returns true if this document is a child document corresponding to a - // part of the parent document and not a disk file as usual. - bool IsChildDocument() const { return m_documentParent != NULL; } - -protected: - wxList m_documentViews; - wxString m_documentFile; - wxString m_documentTitle; - wxString m_documentTypeName; - wxDocTemplate* m_documentTemplate; - bool m_documentModified; - - // if the document parent is non-NULL, it's a pseudo-document corresponding - // to a part of the parent document which can't be saved or loaded - // independently of its parent and is always closed when its parent is - wxDocument* m_documentParent; - - wxCommandProcessor* m_commandProcessor; - bool m_savedYet; - - // Called by OnSaveDocument and OnOpenDocument to implement standard - // Save/Load behaviour. Re-implement in derived class for custom - // behaviour. - virtual bool DoSaveDocument(const wxString& file); - virtual bool DoOpenDocument(const wxString& file); - - // the default implementation of GetUserReadableName() - wxString DoGetUserReadableName() const; - -private: - // list of all documents whose m_documentParent is this one - typedef wxDList DocsList; - DocsList m_childDocuments; - - wxDECLARE_ABSTRACT_CLASS(wxDocument); - wxDECLARE_NO_COPY_CLASS(wxDocument); -}; - -class WXDLLIMPEXP_CORE wxView: public wxEvtHandler -{ -public: - wxView(); - virtual ~wxView(); - - wxDocument *GetDocument() const { return m_viewDocument; } - virtual void SetDocument(wxDocument *doc); - - wxString GetViewName() const { return m_viewTypeName; } - void SetViewName(const wxString& name) { m_viewTypeName = name; } - - wxWindow *GetFrame() const { return m_viewFrame ; } - void SetFrame(wxWindow *frame) { m_viewFrame = frame; } - - virtual void OnActivateView(bool activate, - wxView *activeView, - wxView *deactiveView); - virtual void OnDraw(wxDC *dc) = 0; - virtual void OnPrint(wxDC *dc, wxObject *info); - virtual void OnUpdate(wxView *sender, wxObject *hint = NULL); - virtual void OnClosingDocument() {} - virtual void OnChangeFilename(); - - // Called by framework if created automatically by the default document - // manager class: gives view a chance to initialise - virtual bool OnCreate(wxDocument *WXUNUSED(doc), long WXUNUSED(flags)) - { return true; } - - // Checks if the view is the last one for the document; if so, asks user - // to confirm save data (if modified). If ok, deletes itself and returns - // true. - virtual bool Close(bool deleteWindow = true); - - // Override to do cleanup/veto close - virtual bool OnClose(bool deleteWindow); - - // A view's window can call this to notify the view it is (in)active. - // The function then notifies the document manager. - virtual void Activate(bool activate); - - wxDocManager *GetDocumentManager() const - { return m_viewDocument->GetDocumentManager(); } - -#if wxUSE_PRINTING_ARCHITECTURE - virtual wxPrintout *OnCreatePrintout(); -#endif - - // implementation only - // ------------------- - - // set the associated frame, it is used to reset its view when we're - // destroyed - void SetDocChildFrame(wxDocChildFrameAnyBase *docChildFrame); - - // get the associated frame, may be NULL during destruction - wxDocChildFrameAnyBase* GetDocChildFrame() const { return m_docChildFrame; } - -protected: - // hook the document into event handlers chain here - virtual bool TryBefore(wxEvent& event) wxOVERRIDE; - - wxDocument* m_viewDocument; - wxString m_viewTypeName; - wxWindow* m_viewFrame; - - wxDocChildFrameAnyBase *m_docChildFrame; - -private: - wxDECLARE_ABSTRACT_CLASS(wxView); - wxDECLARE_NO_COPY_CLASS(wxView); -}; - -// Represents user interface (and other) properties of documents and views -class WXDLLIMPEXP_CORE wxDocTemplate: public wxObject -{ - -friend class WXDLLIMPEXP_FWD_CORE wxDocManager; - -public: - // Associate document and view types. They're for identifying what view is - // associated with what template/document type - wxDocTemplate(wxDocManager *manager, - const wxString& descr, - const wxString& filter, - const wxString& dir, - const wxString& ext, - const wxString& docTypeName, - const wxString& viewTypeName, - wxClassInfo *docClassInfo = NULL, - wxClassInfo *viewClassInfo = NULL, - long flags = wxDEFAULT_TEMPLATE_FLAGS); - - virtual ~wxDocTemplate(); - - // By default, these two member functions dynamically creates document and - // view using dynamic instance construction. Override these if you need a - // different method of construction. - virtual wxDocument *CreateDocument(const wxString& path, long flags = 0); - virtual wxView *CreateView(wxDocument *doc, long flags = 0); - - // Helper method for CreateDocument; also allows you to do your own document - // creation - virtual bool InitDocument(wxDocument* doc, - const wxString& path, - long flags = 0); - - wxString GetDefaultExtension() const { return m_defaultExt; } - wxString GetDescription() const { return m_description; } - wxString GetDirectory() const { return m_directory; } - wxDocManager *GetDocumentManager() const { return m_documentManager; } - void SetDocumentManager(wxDocManager *manager) - { m_documentManager = manager; } - wxString GetFileFilter() const { return m_fileFilter; } - long GetFlags() const { return m_flags; } - virtual wxString GetViewName() const { return m_viewTypeName; } - virtual wxString GetDocumentName() const { return m_docTypeName; } - - void SetFileFilter(const wxString& filter) { m_fileFilter = filter; } - void SetDirectory(const wxString& dir) { m_directory = dir; } - void SetDescription(const wxString& descr) { m_description = descr; } - void SetDefaultExtension(const wxString& ext) { m_defaultExt = ext; } - void SetFlags(long flags) { m_flags = flags; } - - bool IsVisible() const { return (m_flags & wxTEMPLATE_VISIBLE) != 0; } - - wxClassInfo* GetDocClassInfo() const { return m_docClassInfo; } - wxClassInfo* GetViewClassInfo() const { return m_viewClassInfo; } - - virtual bool FileMatchesTemplate(const wxString& path); - -protected: - long m_flags; - wxString m_fileFilter; - wxString m_directory; - wxString m_description; - wxString m_defaultExt; - wxString m_docTypeName; - wxString m_viewTypeName; - wxDocManager* m_documentManager; - - // For dynamic creation of appropriate instances. - wxClassInfo* m_docClassInfo; - wxClassInfo* m_viewClassInfo; - - // Called by CreateDocument and CreateView to create the actual - // document/view object. - // - // By default uses the ClassInfo provided to the constructor. Override - // these functions to provide a different method of creation. - virtual wxDocument *DoCreateDocument(); - virtual wxView *DoCreateView(); - -private: - wxDECLARE_CLASS(wxDocTemplate); - wxDECLARE_NO_COPY_CLASS(wxDocTemplate); -}; - -// One object of this class may be created in an application, to manage all -// the templates and documents. -class WXDLLIMPEXP_CORE wxDocManager: public wxEvtHandler -{ -public: - // NB: flags are unused, don't pass wxDOC_XXX to this ctor - wxDocManager(long flags = 0, bool initialize = true); - virtual ~wxDocManager(); - - virtual bool Initialize(); - - // Handlers for common user commands - void OnFileClose(wxCommandEvent& event); - void OnFileCloseAll(wxCommandEvent& event); - void OnFileNew(wxCommandEvent& event); - void OnFileOpen(wxCommandEvent& event); - void OnFileRevert(wxCommandEvent& event); - void OnFileSave(wxCommandEvent& event); - void OnFileSaveAs(wxCommandEvent& event); - void OnMRUFile(wxCommandEvent& event); -#if wxUSE_PRINTING_ARCHITECTURE - void OnPrint(wxCommandEvent& event); - void OnPreview(wxCommandEvent& event); - void OnPageSetup(wxCommandEvent& event); -#endif // wxUSE_PRINTING_ARCHITECTURE - void OnUndo(wxCommandEvent& event); - void OnRedo(wxCommandEvent& event); - - // Handlers for UI update commands - void OnUpdateFileOpen(wxUpdateUIEvent& event); - void OnUpdateDisableIfNoDoc(wxUpdateUIEvent& event); - void OnUpdateFileRevert(wxUpdateUIEvent& event); - void OnUpdateFileNew(wxUpdateUIEvent& event); - void OnUpdateFileSave(wxUpdateUIEvent& event); - void OnUpdateFileSaveAs(wxUpdateUIEvent& event); - void OnUpdateUndo(wxUpdateUIEvent& event); - void OnUpdateRedo(wxUpdateUIEvent& event); - - // called when file format detection didn't work, can be overridden to do - // something in this case - virtual void OnOpenFileFailure() { } - - virtual wxDocument *CreateDocument(const wxString& path, long flags = 0); - - // wrapper around CreateDocument() with a more clear name - wxDocument *CreateNewDocument() - { return CreateDocument(wxString(), wxDOC_NEW); } - - virtual wxView *CreateView(wxDocument *doc, long flags = 0); - virtual void DeleteTemplate(wxDocTemplate *temp, long flags = 0); - virtual bool FlushDoc(wxDocument *doc); - virtual wxDocTemplate *MatchTemplate(const wxString& path); - virtual wxDocTemplate *SelectDocumentPath(wxDocTemplate **templates, - int noTemplates, wxString& path, long flags, bool save = false); - virtual wxDocTemplate *SelectDocumentType(wxDocTemplate **templates, - int noTemplates, bool sort = false); - virtual wxDocTemplate *SelectViewType(wxDocTemplate **templates, - int noTemplates, bool sort = false); - virtual wxDocTemplate *FindTemplateForPath(const wxString& path); - - void AssociateTemplate(wxDocTemplate *temp); - void DisassociateTemplate(wxDocTemplate *temp); - - // Find template from document class info, may return NULL. - wxDocTemplate* FindTemplate(const wxClassInfo* documentClassInfo); - - // Find document from file name, may return NULL. - wxDocument* FindDocumentByPath(const wxString& path) const; - - wxDocument *GetCurrentDocument() const; - - void SetMaxDocsOpen(int n) { m_maxDocsOpen = n; } - int GetMaxDocsOpen() const { return m_maxDocsOpen; } - - // Add and remove a document from the manager's list - void AddDocument(wxDocument *doc); - void RemoveDocument(wxDocument *doc); - - // closes all currently open documents - bool CloseDocuments(bool force = true); - - // closes the specified document - bool CloseDocument(wxDocument* doc, bool force = false); - - // Clear remaining documents and templates - bool Clear(bool force = true); - - // Views or windows should inform the document manager - // when a view is going in or out of focus - virtual void ActivateView(wxView *view, bool activate = true); - virtual wxView *GetCurrentView() const { return m_currentView; } - - // This method tries to find an active view harder than GetCurrentView(): - // if the latter is NULL, it also checks if we don't have just a single - // view and returns it then. - wxView *GetAnyUsableView() const; - - - wxDocVector GetDocumentsVector() const; - wxDocTemplateVector GetTemplatesVector() const; - - wxList& GetDocuments() { return m_docs; } - wxList& GetTemplates() { return m_templates; } - - // Return the default name for a new document (by default returns strings - // in the form "unnamed " but can be overridden) - virtual wxString MakeNewDocumentName(); - - // Make a frame title (override this to do something different) - virtual wxString MakeFrameTitle(wxDocument* doc); - - virtual wxFileHistory *OnCreateFileHistory(); - virtual wxFileHistory *GetFileHistory() const { return m_fileHistory; } - - // File history management - virtual void AddFileToHistory(const wxString& file); - virtual void RemoveFileFromHistory(size_t i); - virtual size_t GetHistoryFilesCount() const; - virtual wxString GetHistoryFile(size_t i) const; - virtual void FileHistoryUseMenu(wxMenu *menu); - virtual void FileHistoryRemoveMenu(wxMenu *menu); -#if wxUSE_CONFIG - virtual void FileHistoryLoad(const wxConfigBase& config); - virtual void FileHistorySave(wxConfigBase& config); -#endif // wxUSE_CONFIG - - virtual void FileHistoryAddFilesToMenu(); - virtual void FileHistoryAddFilesToMenu(wxMenu* menu); - - wxString GetLastDirectory() const; - void SetLastDirectory(const wxString& dir) { m_lastDirectory = dir; } - - // Get the current document manager - static wxDocManager* GetDocumentManager() { return sm_docManager; } - -#if wxUSE_PRINTING_ARCHITECTURE - wxPageSetupDialogData& GetPageSetupDialogData() - { return m_pageSetupDialogData; } - const wxPageSetupDialogData& GetPageSetupDialogData() const - { return m_pageSetupDialogData; } -#endif // wxUSE_PRINTING_ARCHITECTURE - -#if WXWIN_COMPATIBILITY_2_8 - // deprecated, override GetDefaultName() instead - wxDEPRECATED_BUT_USED_INTERNALLY( - virtual bool MakeDefaultName(wxString& buf) - ); -#endif - -protected: - // Called when a file selected from the MRU list doesn't exist any more. - // The default behaviour is to remove the file from the MRU and notify the - // user about it but this method can be overridden to customize it. - virtual void OnMRUFileNotExist(unsigned n, const wxString& filename); - - // Open the MRU file with the given index in our associated file history. - void DoOpenMRUFile(unsigned n); -#if wxUSE_PRINTING_ARCHITECTURE - virtual wxPreviewFrame* CreatePreviewFrame(wxPrintPreviewBase* preview, - wxWindow *parent, - const wxString& title); -#endif // wxUSE_PRINTING_ARCHITECTURE - - // hook the currently active view into event handlers chain here - virtual bool TryBefore(wxEvent& event) wxOVERRIDE; - - // return the command processor for the current document, if any - wxCommandProcessor *GetCurrentCommandProcessor() const; - - int m_defaultDocumentNameCounter; - int m_maxDocsOpen; - wxList m_docs; - wxList m_templates; - wxView* m_currentView; - wxFileHistory* m_fileHistory; - wxString m_lastDirectory; - static wxDocManager* sm_docManager; - -#if wxUSE_PRINTING_ARCHITECTURE - wxPageSetupDialogData m_pageSetupDialogData; -#endif // wxUSE_PRINTING_ARCHITECTURE - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_DYNAMIC_CLASS(wxDocManager); - wxDECLARE_NO_COPY_CLASS(wxDocManager); -}; - -// ---------------------------------------------------------------------------- -// Base class for child frames -- this is what wxView renders itself into -// -// Notice that this is a mix-in class so it doesn't derive from wxWindow, only -// wxDocChildFrameAny does -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxDocChildFrameAnyBase -{ -public: - // default ctor, use Create() after it - wxDocChildFrameAnyBase() - { - m_childDocument = NULL; - m_childView = NULL; - m_win = NULL; - m_lastEvent = NULL; - } - - // full ctor equivalent to using the default one and Create() - wxDocChildFrameAnyBase(wxDocument *doc, wxView *view, wxWindow *win) - { - Create(doc, view, win); - } - - // method which must be called for an object created using the default ctor - // - // note that it returns bool just for consistency with Create() methods in - // other classes, we never return false from here - bool Create(wxDocument *doc, wxView *view, wxWindow *win) - { - m_childDocument = doc; - m_childView = view; - m_win = win; - - if ( view ) - view->SetDocChildFrame(this); - - return true; - } - - // dtor doesn't need to be virtual, an object should never be destroyed via - // a pointer to this class - ~wxDocChildFrameAnyBase() - { - // prevent the view from deleting us if we're being deleted directly - // (and not via Close() + Destroy()) - if ( m_childView ) - m_childView->SetDocChildFrame(NULL); - } - - wxDocument *GetDocument() const { return m_childDocument; } - wxView *GetView() const { return m_childView; } - void SetDocument(wxDocument *doc) { m_childDocument = doc; } - void SetView(wxView *view) { m_childView = view; } - - wxWindow *GetWindow() const { return m_win; } - - // implementation only - - // Check if this event had been just processed in this frame. - bool HasAlreadyProcessed(wxEvent& event) const - { - return m_lastEvent == &event; - } - -protected: - // we're not a wxEvtHandler but we provide this wxEvtHandler-like function - // which is called from TryBefore() of the derived classes to give our view - // a chance to process the message before the frame event handlers are used - bool TryProcessEvent(wxEvent& event); - - // called from EVT_CLOSE handler in the frame: check if we can close and do - // cleanup if so; veto the event otherwise - bool CloseView(wxCloseEvent& event); - - - wxDocument* m_childDocument; - wxView* m_childView; - - // the associated window: having it here is not terribly elegant but it - // allows us to avoid having any virtual functions in this class - wxWindow* m_win; - -private: - // Pointer to the last processed event used to avoid sending the same event - // twice to wxDocManager, from here and from wxDocParentFrameAnyBase. - wxEvent* m_lastEvent; - - wxDECLARE_NO_COPY_CLASS(wxDocChildFrameAnyBase); -}; - -// ---------------------------------------------------------------------------- -// Template implementing child frame concept using the given wxFrame-like class -// -// This is used to define wxDocChildFrame and wxDocMDIChildFrame: ChildFrame is -// a wxFrame or wxMDIChildFrame (although in theory it could be any wxWindow- -// derived class as long as it provided a ctor with the same signature as -// wxFrame and OnActivate() method) and ParentFrame is either wxFrame or -// wxMDIParentFrame. -// ---------------------------------------------------------------------------- - -template -class WXDLLIMPEXP_CORE wxDocChildFrameAny : public ChildFrame, - public wxDocChildFrameAnyBase -{ -public: - typedef ChildFrame BaseClass; - - // default ctor, use Create after it - wxDocChildFrameAny() { } - - // ctor for a frame showing the given view of the specified document - wxDocChildFrameAny(wxDocument *doc, - wxView *view, - ParentFrame *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr) - { - Create(doc, view, parent, id, title, pos, size, style, name); - } - - bool Create(wxDocument *doc, - wxView *view, - ParentFrame *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr) - { - if ( !wxDocChildFrameAnyBase::Create(doc, view, this) ) - return false; - - if ( !BaseClass::Create(parent, id, title, pos, size, style, name) ) - return false; - - this->Connect(wxEVT_ACTIVATE, - wxActivateEventHandler(wxDocChildFrameAny::OnActivate)); - this->Connect(wxEVT_CLOSE_WINDOW, - wxCloseEventHandler(wxDocChildFrameAny::OnCloseWindow)); - - return true; - } - - virtual bool Destroy() - { - // FIXME: why exactly do we do this? to avoid activation events during - // destructions maybe? - m_childView = NULL; - return BaseClass::Destroy(); - } - -protected: - // hook the child view into event handlers chain here - virtual bool TryBefore(wxEvent& event) - { - return TryProcessEvent(event) || BaseClass::TryBefore(event); - } - -private: - void OnActivate(wxActivateEvent& event) - { - BaseClass::OnActivate(event); - - if ( m_childView ) - m_childView->Activate(event.GetActive()); - } - - void OnCloseWindow(wxCloseEvent& event) - { - if ( CloseView(event) ) - Destroy(); - //else: vetoed - } - - wxDECLARE_NO_COPY_TEMPLATE_CLASS_2(wxDocChildFrameAny, - ChildFrame, ParentFrame); -}; - -// ---------------------------------------------------------------------------- -// A default child frame: we need to define it as a class just for wxRTTI, -// otherwise we could simply typedef it -// ---------------------------------------------------------------------------- - -typedef wxDocChildFrameAny wxDocChildFrameBase; - -class WXDLLIMPEXP_CORE wxDocChildFrame : public wxDocChildFrameBase -{ -public: - wxDocChildFrame() - { - } - - wxDocChildFrame(wxDocument *doc, - wxView *view, - wxFrame *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr) - : wxDocChildFrameBase(doc, view, - parent, id, title, pos, size, style, name) - { - } - - bool Create(wxDocument *doc, - wxView *view, - wxFrame *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr) - { - return wxDocChildFrameBase::Create - ( - doc, view, - parent, id, title, pos, size, style, name - ); - } - -private: - wxDECLARE_CLASS(wxDocChildFrame); - wxDECLARE_NO_COPY_CLASS(wxDocChildFrame); -}; - -// ---------------------------------------------------------------------------- -// wxDocParentFrame and related classes. -// -// As with wxDocChildFrame we define a template base class used by both normal -// and MDI versions -// ---------------------------------------------------------------------------- - -// Base class containing type-independent code of wxDocParentFrameAny -// -// Similarly to wxDocChildFrameAnyBase, this class is a mix-in and doesn't -// derive from wxWindow. -class WXDLLIMPEXP_CORE wxDocParentFrameAnyBase -{ -public: - wxDocParentFrameAnyBase(wxWindow* frame) - : m_frame(frame) - { - m_docManager = NULL; - } - - wxDocManager *GetDocumentManager() const { return m_docManager; } - -protected: - // This is similar to wxDocChildFrameAnyBase method with the same name: - // while we're not an event handler ourselves and so can't override - // TryBefore(), we provide a helper that the derived template class can use - // from its TryBefore() implementation. - bool TryProcessEvent(wxEvent& event); - - wxWindow* const m_frame; - wxDocManager *m_docManager; - - wxDECLARE_NO_COPY_CLASS(wxDocParentFrameAnyBase); -}; - -// This is similar to wxDocChildFrameAny and is used to provide common -// implementation for both wxDocParentFrame and wxDocMDIParentFrame -template -class WXDLLIMPEXP_CORE wxDocParentFrameAny : public BaseFrame, - public wxDocParentFrameAnyBase -{ -public: - wxDocParentFrameAny() : wxDocParentFrameAnyBase(this) { } - wxDocParentFrameAny(wxDocManager *manager, - wxFrame *frame, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr) - : wxDocParentFrameAnyBase(this) - { - Create(manager, frame, id, title, pos, size, style, name); - } - - bool Create(wxDocManager *manager, - wxFrame *frame, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr) - { - m_docManager = manager; - - if ( !BaseFrame::Create(frame, id, title, pos, size, style, name) ) - return false; - - this->Connect(wxID_EXIT, wxEVT_MENU, - wxCommandEventHandler(wxDocParentFrameAny::OnExit)); - this->Connect(wxEVT_CLOSE_WINDOW, - wxCloseEventHandler(wxDocParentFrameAny::OnCloseWindow)); - - return true; - } - -protected: - // hook the document manager into event handling chain here - virtual bool TryBefore(wxEvent& event) - { - // It is important to send the event to the base class first as - // wxMDIParentFrame overrides its TryBefore() to send the menu events - // to the currently active child frame and the child must get them - // before our own TryProcessEvent() is executed, not afterwards. - return BaseFrame::TryBefore(event) || TryProcessEvent(event); - } - -private: - void OnExit(wxCommandEvent& WXUNUSED(event)) - { - this->Close(); - } - - void OnCloseWindow(wxCloseEvent& event) - { - if ( m_docManager && !m_docManager->Clear(!event.CanVeto()) ) - { - // The user decided not to close finally, abort. - event.Veto(); - } - else - { - // Just skip the event, base class handler will destroy the window. - event.Skip(); - } - } - - - wxDECLARE_NO_COPY_CLASS(wxDocParentFrameAny); -}; - -typedef wxDocParentFrameAny wxDocParentFrameBase; - -class WXDLLIMPEXP_CORE wxDocParentFrame : public wxDocParentFrameBase -{ -public: - wxDocParentFrame() : wxDocParentFrameBase() { } - - wxDocParentFrame(wxDocManager *manager, - wxFrame *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr) - : wxDocParentFrameBase(manager, - parent, id, title, pos, size, style, name) - { - } - - bool Create(wxDocManager *manager, - wxFrame *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr) - { - return wxDocParentFrameBase::Create(manager, - parent, id, title, - pos, size, style, name); - } - -private: - wxDECLARE_CLASS(wxDocParentFrame); - wxDECLARE_NO_COPY_CLASS(wxDocParentFrame); -}; - -// ---------------------------------------------------------------------------- -// Provide simple default printing facilities -// ---------------------------------------------------------------------------- - -#if wxUSE_PRINTING_ARCHITECTURE -class WXDLLIMPEXP_CORE wxDocPrintout : public wxPrintout -{ -public: - wxDocPrintout(wxView *view = NULL, const wxString& title = wxString()); - - // implement wxPrintout methods - virtual bool OnPrintPage(int page) wxOVERRIDE; - virtual bool HasPage(int page) wxOVERRIDE; - virtual bool OnBeginDocument(int startPage, int endPage) wxOVERRIDE; - virtual void GetPageInfo(int *minPage, int *maxPage, - int *selPageFrom, int *selPageTo) wxOVERRIDE; - - virtual wxView *GetView() { return m_printoutView; } - -protected: - wxView* m_printoutView; - -private: - wxDECLARE_DYNAMIC_CLASS(wxDocPrintout); - wxDECLARE_NO_COPY_CLASS(wxDocPrintout); -}; -#endif // wxUSE_PRINTING_ARCHITECTURE - -// For compatibility with existing file formats: -// converts from/to a stream to/from a temporary file. -#if wxUSE_STD_IOSTREAM -bool WXDLLIMPEXP_CORE -wxTransferFileToStream(const wxString& filename, wxSTD ostream& stream); -bool WXDLLIMPEXP_CORE -wxTransferStreamToFile(wxSTD istream& stream, const wxString& filename); -#else -bool WXDLLIMPEXP_CORE -wxTransferFileToStream(const wxString& filename, wxOutputStream& stream); -bool WXDLLIMPEXP_CORE -wxTransferStreamToFile(wxInputStream& stream, const wxString& filename); -#endif // wxUSE_STD_IOSTREAM - - -// these flags are not used anywhere by wxWidgets and kept only for an unlikely -// case of existing user code using them for its own purposes -#if WXWIN_COMPATIBILITY_2_8 -enum -{ - wxDOC_SDI = 1, - wxDOC_MDI, - wxDEFAULT_DOCMAN_FLAGS = wxDOC_SDI -}; -#endif // WXWIN_COMPATIBILITY_2_8 - -inline wxViewVector wxDocument::GetViewsVector() const -{ - return m_documentViews.AsVector(); -} - -inline wxDocVector wxDocManager::GetDocumentsVector() const -{ - return m_docs.AsVector(); -} - -inline wxDocTemplateVector wxDocManager::GetTemplatesVector() const -{ - return m_templates.AsVector(); -} - -#endif // wxUSE_DOC_VIEW_ARCHITECTURE - -#endif // _WX_DOCH__ diff --git a/Externals/wxWidgets3/include/wx/dragimag.h b/Externals/wxWidgets3/include/wx/dragimag.h deleted file mode 100644 index 4f8bc6a717..0000000000 --- a/Externals/wxWidgets3/include/wx/dragimag.h +++ /dev/null @@ -1,53 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/dragimag.h -// Purpose: wxDragImage base header -// Author: Julian Smart -// Modified by: -// Created: -// Copyright: (c) Julian Smart -// Licence: wxWindows Licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DRAGIMAG_H_BASE_ -#define _WX_DRAGIMAG_H_BASE_ - -#if wxUSE_DRAGIMAGE - -class WXDLLIMPEXP_FWD_CORE wxRect; -class WXDLLIMPEXP_FWD_CORE wxMemoryDC; -class WXDLLIMPEXP_FWD_CORE wxDC; - -#if defined(__WXMSW__) -# if defined(__WXUNIVERSAL__) -# include "wx/generic/dragimgg.h" -# define wxDragImage wxGenericDragImage -# else -# include "wx/msw/dragimag.h" -# endif - -#elif defined(__WXMOTIF__) -# include "wx/generic/dragimgg.h" -# define wxDragImage wxGenericDragImage - -#elif defined(__WXGTK__) -# include "wx/generic/dragimgg.h" -# define wxDragImage wxGenericDragImage - -#elif defined(__WXX11__) -# include "wx/generic/dragimgg.h" -# define wxDragImage wxGenericDragImage - -#elif defined(__WXMAC__) -# include "wx/generic/dragimgg.h" -# define wxDragImage wxGenericDragImage - -#elif defined(__WXQT__) -# include "wx/generic/dragimgg.h" -# define wxDragImage wxGenericDragImage - -#endif - -#endif // wxUSE_DRAGIMAGE - -#endif - // _WX_DRAGIMAG_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/dvrenderers.h b/Externals/wxWidgets3/include/wx/dvrenderers.h deleted file mode 100644 index 69ed7817d7..0000000000 --- a/Externals/wxWidgets3/include/wx/dvrenderers.h +++ /dev/null @@ -1,478 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/dvrenderers.h -// Purpose: Declare all wxDataViewCtrl classes -// Author: Robert Roebling, Vadim Zeitlin -// Created: 2009-11-08 (extracted from wx/dataview.h) -// Copyright: (c) 2006 Robert Roebling -// (c) 2009 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DVRENDERERS_H_ -#define _WX_DVRENDERERS_H_ - -/* - Note about the structure of various headers: they're organized in a more - complicated way than usual because of the various dependencies which are - different for different ports. In any case the only public header, i.e. the - one which can be included directly is wx/dataview.h. It, in turn, includes - this one to define all the renderer classes. - - We define the base wxDataViewRendererBase class first and then include a - port-dependent wx/xxx/dvrenderer.h which defines wxDataViewRenderer itself. - After this we can define wxDataViewRendererCustomBase (and maybe in the - future base classes for other renderers if the need arises, i.e. if there - is any non-trivial code or API which it makes sense to keep in common code) - and include wx/xxx/dvrenderers.h (notice the plural) which defines all the - rest of the renderer classes. - */ - -class WXDLLIMPEXP_FWD_ADV wxDataViewCustomRenderer; - -// ---------------------------------------------------------------------------- -// wxDataViewIconText: helper class used by wxDataViewIconTextRenderer -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDataViewIconText : public wxObject -{ -public: - wxDataViewIconText( const wxString &text = wxEmptyString, - const wxIcon& icon = wxNullIcon ) - : m_text(text), - m_icon(icon) - { } - - wxDataViewIconText( const wxDataViewIconText &other ) - : wxObject(), - m_text(other.m_text), - m_icon(other.m_icon) - { } - - void SetText( const wxString &text ) { m_text = text; } - wxString GetText() const { return m_text; } - void SetIcon( const wxIcon &icon ) { m_icon = icon; } - const wxIcon &GetIcon() const { return m_icon; } - - bool IsSameAs(const wxDataViewIconText& other) const - { - return m_text == other.m_text && m_icon.IsSameAs(other.m_icon); - } - - bool operator==(const wxDataViewIconText& other) const - { - return IsSameAs(other); - } - - bool operator!=(const wxDataViewIconText& other) const - { - return !IsSameAs(other); - } - -private: - wxString m_text; - wxIcon m_icon; - - wxDECLARE_DYNAMIC_CLASS(wxDataViewIconText); -}; - -DECLARE_VARIANT_OBJECT_EXPORTED(wxDataViewIconText, WXDLLIMPEXP_ADV) - -// ---------------------------------------------------------------------------- -// wxDataViewRendererBase -// ---------------------------------------------------------------------------- - -enum wxDataViewCellMode -{ - wxDATAVIEW_CELL_INERT, - wxDATAVIEW_CELL_ACTIVATABLE, - wxDATAVIEW_CELL_EDITABLE -}; - -enum wxDataViewCellRenderState -{ - wxDATAVIEW_CELL_SELECTED = 1, - wxDATAVIEW_CELL_PRELIT = 2, - wxDATAVIEW_CELL_INSENSITIVE = 4, - wxDATAVIEW_CELL_FOCUSED = 8 -}; - -class WXDLLIMPEXP_ADV wxDataViewRendererBase: public wxObject -{ -public: - wxDataViewRendererBase( const wxString &varianttype, - wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, - int alignment = wxDVR_DEFAULT_ALIGNMENT ); - virtual ~wxDataViewRendererBase(); - - virtual bool Validate( wxVariant& WXUNUSED(value) ) - { return true; } - - void SetOwner( wxDataViewColumn *owner ) { m_owner = owner; } - wxDataViewColumn* GetOwner() const { return m_owner; } - - // renderer value and attributes: SetValue() and SetAttr() are called - // before a cell is rendered using this renderer - virtual bool SetValue(const wxVariant& value) = 0; - virtual bool GetValue(wxVariant& value) const = 0; - - wxString GetVariantType() const { return m_variantType; } - - // Prepare for rendering the value of the corresponding item in the given - // column taken from the provided non-null model. - // - // Notice that the column must be the same as GetOwner()->GetModelColumn(), - // it is only passed to this method because the existing code already has - // it and should probably be removed in the future. - // - // Return true if this cell is non-empty or false otherwise (and also if - // the model returned a value of the wrong, i.e. different from our - // GetVariantType(), type, in which case a debug error is also logged). - bool PrepareForItem(const wxDataViewModel *model, - const wxDataViewItem& item, - unsigned column); - - // renderer properties: - virtual void SetMode( wxDataViewCellMode mode ) = 0; - virtual wxDataViewCellMode GetMode() const = 0; - - // NOTE: Set/GetAlignment do not take/return a wxAlignment enum but - // rather an "int"; that's because for rendering cells it's allowed - // to combine alignment flags (e.g. wxALIGN_LEFT|wxALIGN_BOTTOM) - virtual void SetAlignment( int align ) = 0; - virtual int GetAlignment() const = 0; - - // enable or disable (if called with wxELLIPSIZE_NONE) replacing parts of - // the item text (hence this only makes sense for renderers showing - // text...) with ellipsis in order to make it fit the column width - virtual void EnableEllipsize(wxEllipsizeMode mode = wxELLIPSIZE_MIDDLE) = 0; - void DisableEllipsize() { EnableEllipsize(wxELLIPSIZE_NONE); } - - virtual wxEllipsizeMode GetEllipsizeMode() const = 0; - - // in-place editing - virtual bool HasEditorCtrl() const - { return false; } - virtual wxWindow* CreateEditorCtrl(wxWindow * WXUNUSED(parent), - wxRect WXUNUSED(labelRect), - const wxVariant& WXUNUSED(value)) - { return NULL; } - virtual bool GetValueFromEditorCtrl(wxWindow * WXUNUSED(editor), - wxVariant& WXUNUSED(value)) - { return false; } - - virtual bool StartEditing( const wxDataViewItem &item, wxRect labelRect ); - virtual void CancelEditing(); - virtual bool FinishEditing(); - - wxWindow *GetEditorCtrl() const { return m_editorCtrl; } - - virtual bool IsCustomRenderer() const { return false; } - - - // Implementation only from now on. - - // Return the alignment of this renderer if it's specified (i.e. has value - // different from the default wxDVR_DEFAULT_ALIGNMENT) or the alignment of - // the column it is used for otherwise. - // - // Unlike GetAlignment(), this always returns a valid combination of - // wxALIGN_XXX flags (although possibly wxALIGN_NOT) and never returns - // wxDVR_DEFAULT_ALIGNMENT. - int GetEffectiveAlignment() const; - - // Send wxEVT_DATAVIEW_ITEM_EDITING_STARTED event. - void NotifyEditingStarted(const wxDataViewItem& item); - -protected: - // These methods are called from PrepareForItem() and should do whatever is - // needed for the current platform to ensure that the item is rendered - // using the given attributes and enabled/disabled state. - virtual void SetAttr(const wxDataViewItemAttr& attr) = 0; - virtual void SetEnabled(bool enabled) = 0; - - // Called from {Cancel,Finish}Editing() to cleanup m_editorCtrl - void DestroyEditControl(); - - // Helper of PrepareForItem() also used in StartEditing(): returns the - // value checking that its type matches our GetVariantType(). - wxVariant CheckedGetValue(const wxDataViewModel* model, - const wxDataViewItem& item, - unsigned column) const; - - wxString m_variantType; - wxDataViewColumn *m_owner; - wxWeakRef m_editorCtrl; - wxDataViewItem m_item; // Item being currently edited, if valid. - - // internal utility, may be used anywhere the window associated with the - // renderer is required - wxDataViewCtrl* GetView() const; - -protected: - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewRendererBase); -}; - -// include the real wxDataViewRenderer declaration for the native ports -#ifdef wxHAS_GENERIC_DATAVIEWCTRL - // in the generic implementation there is no real wxDataViewRenderer, all - // renderers are custom so it's the same as wxDataViewCustomRenderer and - // wxDataViewCustomRendererBase derives from wxDataViewRendererBase directly - // - // this is a rather ugly hack but unfortunately it just doesn't seem to be - // possible to have the same class hierarchy in all ports and avoid - // duplicating the entire wxDataViewCustomRendererBase in the generic - // wxDataViewRenderer class (well, we could use a mix-in but this would - // make classes hierarchy non linear and arguably even more complex) - #define wxDataViewCustomRendererRealBase wxDataViewRendererBase -#else - #if defined(__WXGTK20__) - #include "wx/gtk/dvrenderer.h" - #elif defined(__WXMAC__) - #include "wx/osx/dvrenderer.h" - #elif defined(__WXQT__) - #include "wx/qt/dvrenderer.h" - #else - #error "unknown native wxDataViewCtrl implementation" - #endif - #define wxDataViewCustomRendererRealBase wxDataViewRenderer -#endif - -// ---------------------------------------------------------------------------- -// wxDataViewCustomRendererBase -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDataViewCustomRendererBase - : public wxDataViewCustomRendererRealBase -{ -public: - // Constructor must specify the usual renderer parameters which we simply - // pass to the base class - wxDataViewCustomRendererBase(const wxString& varianttype = "string", - wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, - int align = wxDVR_DEFAULT_ALIGNMENT) - : wxDataViewCustomRendererRealBase(varianttype, mode, align) - { - } - - - // Render the item using the current value (returned by GetValue()). - virtual bool Render(wxRect cell, wxDC *dc, int state) = 0; - - // Return the size of the item appropriate to its current value. - virtual wxSize GetSize() const = 0; - - // Define virtual function which are called when a key is pressed on the - // item, clicked or the user starts to drag it: by default they all simply - // return false indicating that the events are not handled - - virtual bool ActivateCell(const wxRect& cell, - wxDataViewModel *model, - const wxDataViewItem & item, - unsigned int col, - const wxMouseEvent* mouseEvent); - - // Deprecated, use (and override) ActivateCell() instead - wxDEPRECATED_BUT_USED_INTERNALLY_INLINE( - virtual bool Activate(wxRect WXUNUSED(cell), - wxDataViewModel *WXUNUSED(model), - const wxDataViewItem & WXUNUSED(item), - unsigned int WXUNUSED(col)), - return false; ) - - // Deprecated, use (and override) ActivateCell() instead - wxDEPRECATED_BUT_USED_INTERNALLY_INLINE( - virtual bool LeftClick(wxPoint WXUNUSED(cursor), - wxRect WXUNUSED(cell), - wxDataViewModel *WXUNUSED(model), - const wxDataViewItem & WXUNUSED(item), - unsigned int WXUNUSED(col)), - return false; ) - - virtual bool StartDrag(const wxPoint& WXUNUSED(cursor), - const wxRect& WXUNUSED(cell), - wxDataViewModel *WXUNUSED(model), - const wxDataViewItem & WXUNUSED(item), - unsigned int WXUNUSED(col) ) - { return false; } - - - // Helper which can be used by Render() implementation in the derived - // classes: it will draw the text in the same manner as the standard - // renderers do. - virtual void RenderText(const wxString& text, - int xoffset, - wxRect cell, - wxDC *dc, - int state); - - - // Override the base class virtual method to simply store the attribute so - // that it can be accessed using GetAttr() from Render() if needed. - virtual void SetAttr(const wxDataViewItemAttr& attr) wxOVERRIDE { m_attr = attr; } - const wxDataViewItemAttr& GetAttr() const { return m_attr; } - - // Store the enabled state of the item so that it can be accessed from - // Render() via GetEnabled() if needed. - virtual void SetEnabled(bool enabled) wxOVERRIDE; - bool GetEnabled() const { return m_enabled; } - - - // Implementation only from now on - - // Retrieve the DC to use for drawing. This is implemented in derived - // platform-specific classes. - virtual wxDC *GetDC() = 0; - - // To draw background use the background colour in wxDataViewItemAttr - virtual void RenderBackground(wxDC* dc, const wxRect& rect); - - // Prepare DC to use attributes and call Render(). - void WXCallRender(wxRect rect, wxDC *dc, int state); - - virtual bool IsCustomRenderer() const wxOVERRIDE { return true; } - -protected: - // helper for GetSize() implementations, respects attributes - wxSize GetTextExtent(const wxString& str) const; - -private: - wxDataViewItemAttr m_attr; - bool m_enabled; - - wxDECLARE_NO_COPY_CLASS(wxDataViewCustomRendererBase); -}; - -// include the declaration of all the other renderers to get the real -// wxDataViewCustomRenderer from which we need to inherit below -#ifdef wxHAS_GENERIC_DATAVIEWCTRL - // because of the different renderer classes hierarchy in the generic - // version, as explained above, we can include the header defining - // wxDataViewRenderer only here and not before wxDataViewCustomRendererBase - // declaration as for the native ports - #include "wx/generic/dvrenderer.h" - #include "wx/generic/dvrenderers.h" -#elif defined(__WXGTK20__) - #include "wx/gtk/dvrenderers.h" -#elif defined(__WXMAC__) - #include "wx/osx/dvrenderers.h" -#elif defined(__WXQT__) - #include "wx/qt/dvrenderers.h" -#else - #error "unknown native wxDataViewCtrl implementation" -#endif - -#if wxUSE_SPINCTRL - -// ---------------------------------------------------------------------------- -// wxDataViewSpinRenderer -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDataViewSpinRenderer: public wxDataViewCustomRenderer -{ -public: - wxDataViewSpinRenderer( int min, int max, - wxDataViewCellMode mode = wxDATAVIEW_CELL_EDITABLE, - int alignment = wxDVR_DEFAULT_ALIGNMENT ); - virtual bool HasEditorCtrl() const wxOVERRIDE { return true; } - virtual wxWindow* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ) wxOVERRIDE; - virtual bool GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value ) wxOVERRIDE; - virtual bool Render( wxRect rect, wxDC *dc, int state ) wxOVERRIDE; - virtual wxSize GetSize() const wxOVERRIDE; - virtual bool SetValue( const wxVariant &value ) wxOVERRIDE; - virtual bool GetValue( wxVariant &value ) const wxOVERRIDE; - -private: - long m_data; - long m_min,m_max; -}; - -#endif // wxUSE_SPINCTRL - -#if defined(wxHAS_GENERIC_DATAVIEWCTRL) - -// ---------------------------------------------------------------------------- -// wxDataViewChoiceRenderer -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDataViewChoiceRenderer: public wxDataViewCustomRenderer -{ -public: - wxDataViewChoiceRenderer( const wxArrayString &choices, - wxDataViewCellMode mode = wxDATAVIEW_CELL_EDITABLE, - int alignment = wxDVR_DEFAULT_ALIGNMENT ); - virtual bool HasEditorCtrl() const { return true; } - virtual wxWindow* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ); - virtual bool GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value ); - virtual bool Render( wxRect rect, wxDC *dc, int state ); - virtual wxSize GetSize() const; - virtual bool SetValue( const wxVariant &value ); - virtual bool GetValue( wxVariant &value ) const; - - wxString GetChoice(size_t index) const { return m_choices[index]; } - const wxArrayString& GetChoices() const { return m_choices; } - -private: - wxArrayString m_choices; - wxString m_data; -}; - -// ---------------------------------------------------------------------------- -// wxDataViewChoiceByIndexRenderer -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDataViewChoiceByIndexRenderer: public wxDataViewChoiceRenderer -{ -public: - wxDataViewChoiceByIndexRenderer( const wxArrayString &choices, - wxDataViewCellMode mode = wxDATAVIEW_CELL_EDITABLE, - int alignment = wxDVR_DEFAULT_ALIGNMENT ); - - virtual wxWindow* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ); - virtual bool GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value ); - - virtual bool SetValue( const wxVariant &value ); - virtual bool GetValue( wxVariant &value ) const; -}; - - -#endif // generic version - -#if defined(wxHAS_GENERIC_DATAVIEWCTRL) || defined(__WXGTK__) - -// ---------------------------------------------------------------------------- -// wxDataViewDateRenderer -// ---------------------------------------------------------------------------- - -#if wxUSE_DATEPICKCTRL -class WXDLLIMPEXP_ADV wxDataViewDateRenderer: public wxDataViewCustomRenderer -{ -public: - static wxString GetDefaultType() { return wxS("datetime"); } - - wxDataViewDateRenderer(const wxString &varianttype = GetDefaultType(), - wxDataViewCellMode mode = wxDATAVIEW_CELL_EDITABLE, - int align = wxDVR_DEFAULT_ALIGNMENT); - - virtual bool HasEditorCtrl() const wxOVERRIDE { return true; } - virtual wxWindow *CreateEditorCtrl(wxWindow *parent, wxRect labelRect, const wxVariant &value) wxOVERRIDE; - virtual bool GetValueFromEditorCtrl(wxWindow* editor, wxVariant &value) wxOVERRIDE; - virtual bool SetValue(const wxVariant &value) wxOVERRIDE; - virtual bool GetValue(wxVariant& value) const wxOVERRIDE; - virtual bool Render( wxRect cell, wxDC *dc, int state ) wxOVERRIDE; - virtual wxSize GetSize() const wxOVERRIDE; - -private: - wxDateTime m_date; -}; -#else // !wxUSE_DATEPICKCTRL -typedef wxDataViewTextRenderer wxDataViewDateRenderer; -#endif - -#endif // generic or GTK+ versions - -// this class is obsolete, its functionality was merged in -// wxDataViewTextRenderer itself now, don't use it any more -#define wxDataViewTextRendererAttr wxDataViewTextRenderer - -#endif // _WX_DVRENDERERS_H_ - diff --git a/Externals/wxWidgets3/include/wx/dynarray.h b/Externals/wxWidgets3/include/wx/dynarray.h deleted file mode 100644 index a15936c394..0000000000 --- a/Externals/wxWidgets3/include/wx/dynarray.h +++ /dev/null @@ -1,1072 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/dynarray.h -// Purpose: auto-resizable (i.e. dynamic) array support -// Author: Vadim Zeitlin -// Modified by: -// Created: 12.09.97 -// Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _DYNARRAY_H -#define _DYNARRAY_H - -#include "wx/defs.h" - -#if wxUSE_STD_CONTAINERS - #include "wx/beforestd.h" - #include - #include - #include "wx/afterstd.h" -#endif - -/* - This header defines the dynamic arrays and object arrays (i.e. arrays which - own their elements). Dynamic means that the arrays grow automatically as - needed. - - These macros are ugly (especially if you look in the sources ;-), but they - allow us to define "template" classes without actually using templates and so - this works with all compilers (and may be also much faster to compile even - with a compiler which does support templates). The arrays defined with these - macros are type-safe. - - Range checking is performed in debug build for both arrays and objarrays but - not in release build - so using an invalid index will just lead to a crash - then. - - Note about memory usage: arrays never shrink automatically (although you may - use Shrink() function explicitly), they only grow, so loading 10 millions in - an array only to delete them 2 lines below might be a bad idea if the array - object is not going to be destroyed soon. However, as it does free memory - when destroyed, it is ok if the array is a local variable. - */ - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -/* - The initial size by which an array grows when an element is added default - value avoids allocate one or two bytes when the array is created which is - rather inefficient -*/ -#define WX_ARRAY_DEFAULT_INITIAL_SIZE (16) - -#define _WX_ERROR_REMOVE "removing inexistent element in wxArray::Remove" - -// ---------------------------------------------------------------------------- -// types -// ---------------------------------------------------------------------------- - -/* - Callback compare function for quick sort. - - It must return negative value, 0 or positive value if the first item is - less than, equal to or greater than the second one. - */ -extern "C" -{ -typedef int (wxCMPFUNC_CONV *CMPFUNC)(const void* pItem1, const void* pItem2); -} - -// ---------------------------------------------------------------------------- -// Base class managing data having size of type 'long' (not used directly) -// -// NB: for efficiency this often used class has no virtual functions (hence no -// virtual table), even dtor is *not* virtual. If used as expected it -// won't create any problems because ARRAYs from DEFINE_ARRAY have no dtor -// at all, so it's not too important if it's not called (this happens when -// you cast "SomeArray *" as "BaseArray *" and then delete it) -// ---------------------------------------------------------------------------- - -#if wxUSE_STD_CONTAINERS - -template -class wxArray_SortFunction -{ -public: - typedef int (wxCMPFUNC_CONV *CMPFUNC)(T* pItem1, T* pItem2); - - wxArray_SortFunction(CMPFUNC f) : m_f(f) { } - bool operator()(const T& i1, const T& i2) - { return m_f((T*)&i1, (T*)&i2) < 0; } -private: - CMPFUNC m_f; -}; - -template -class wxSortedArray_SortFunction -{ -public: - typedef F CMPFUNC; - - wxSortedArray_SortFunction(CMPFUNC f) : m_f(f) { } - bool operator()(const T& i1, const T& i2) - { return m_f(i1, i2) < 0; } -private: - CMPFUNC m_f; -}; - -#define _WX_DECLARE_BASEARRAY(T, name, classexp) \ - typedef int (wxCMPFUNC_CONV *CMPFUN##name)(T pItem1, T pItem2); \ - typedef wxSortedArray_SortFunction name##_Predicate; \ - _WX_DECLARE_BASEARRAY_2(T, name, name##_Predicate, classexp) - -#define _WX_DECLARE_BASEARRAY_2(T, name, predicate, classexp) \ -class name : public std::vector \ -{ \ - typedef predicate Predicate; \ - typedef predicate::CMPFUNC SCMPFUNC; \ -public: \ - typedef wxArray_SortFunction::CMPFUNC CMPFUNC; \ - \ -public: \ - typedef T base_type; \ - \ - name() : std::vector() { } \ - name(size_type n) : std::vector(n) { } \ - name(size_type n, const_reference v) : std::vector(n, v) { } \ - template \ - name(InputIterator first, InputIterator last) : std::vector(first, last) { } \ - \ - void Empty() { clear(); } \ - void Clear() { clear(); } \ - void Alloc(size_t uiSize) { reserve(uiSize); } \ - void Shrink() { name tmp(*this); swap(tmp); } \ - \ - size_t GetCount() const { return size(); } \ - void SetCount(size_t n, T v = T()) { resize(n, v); } \ - bool IsEmpty() const { return empty(); } \ - size_t Count() const { return size(); } \ - \ - T& Item(size_t uiIndex) const \ - { wxASSERT( uiIndex < size() ); return (T&)operator[](uiIndex); } \ - T& Last() const { return Item(size() - 1); } \ - \ - int Index(T item, bool bFromEnd = false) const \ - { \ - if ( bFromEnd ) \ - { \ - const const_reverse_iterator b = rbegin(), \ - e = rend(); \ - for ( const_reverse_iterator i = b; i != e; ++i ) \ - if ( *i == item ) \ - return (int)(e - i - 1); \ - } \ - else \ - { \ - const const_iterator b = begin(), \ - e = end(); \ - for ( const_iterator i = b; i != e; ++i ) \ - if ( *i == item ) \ - return (int)(i - b); \ - } \ - \ - return wxNOT_FOUND; \ - } \ - int Index(T lItem, CMPFUNC fnCompare) const \ - { \ - Predicate p((SCMPFUNC)fnCompare); \ - const_iterator i = std::lower_bound(begin(), end(), lItem, p);\ - return i != end() && !p(lItem, *i) ? (int)(i - begin()) \ - : wxNOT_FOUND; \ - } \ - size_t IndexForInsert(T lItem, CMPFUNC fnCompare) const \ - { \ - Predicate p((SCMPFUNC)fnCompare); \ - const_iterator i = std::lower_bound(begin(), end(), lItem, p);\ - return i - begin(); \ - } \ - void Add(T lItem, size_t nInsert = 1) \ - { insert(end(), nInsert, lItem); } \ - size_t Add(T lItem, CMPFUNC fnCompare) \ - { \ - size_t n = IndexForInsert(lItem, fnCompare); \ - Insert(lItem, n); \ - return n; \ - } \ - void Insert(T lItem, size_t uiIndex, size_t nInsert = 1) \ - { insert(begin() + uiIndex, nInsert, lItem); } \ - void Remove(T lItem) \ - { \ - int n = Index(lItem); \ - wxCHECK_RET( n != wxNOT_FOUND, _WX_ERROR_REMOVE ); \ - RemoveAt((size_t)n); \ - } \ - void RemoveAt(size_t uiIndex, size_t nRemove = 1) \ - { erase(begin() + uiIndex, begin() + uiIndex + nRemove); } \ - \ - void Sort(CMPFUNC fCmp) \ - { \ - wxArray_SortFunction p(fCmp); \ - std::sort(begin(), end(), p); \ - } \ -} - -#else // if !wxUSE_STD_CONTAINERS - -#define _WX_DECLARE_BASEARRAY(T, name, classexp) \ -classexp name \ -{ \ - typedef CMPFUNC SCMPFUNC; /* for compatibility wuth wxUSE_STD_CONTAINERS */ \ -public: \ - name(); \ - name(const name& array); \ - name& operator=(const name& src); \ - ~name(); \ - \ - void Empty() { m_nCount = 0; } \ - void Clear(); \ - void Alloc(size_t n) { if ( n > m_nSize ) Realloc(n); } \ - void Shrink(); \ - \ - size_t GetCount() const { return m_nCount; } \ - void SetCount(size_t n, T defval = T()); \ - bool IsEmpty() const { return m_nCount == 0; } \ - size_t Count() const { return m_nCount; } \ - \ - typedef T base_type; \ - \ -protected: \ - T& Item(size_t uiIndex) const \ - { wxASSERT( uiIndex < m_nCount ); return m_pItems[uiIndex]; } \ - T& operator[](size_t uiIndex) const { return Item(uiIndex); } \ - \ - int Index(T lItem, bool bFromEnd = false) const; \ - int Index(T lItem, CMPFUNC fnCompare) const; \ - size_t IndexForInsert(T lItem, CMPFUNC fnCompare) const; \ - void Add(T lItem, size_t nInsert = 1); \ - size_t Add(T lItem, CMPFUNC fnCompare); \ - void Insert(T lItem, size_t uiIndex, size_t nInsert = 1); \ - void Remove(T lItem); \ - void RemoveAt(size_t uiIndex, size_t nRemove = 1); \ - \ - void Sort(CMPFUNC fnCompare); \ - \ - /* *minimal* STL-ish interface, for derived classes */ \ - typedef T value_type; \ - typedef value_type* iterator; \ - typedef const value_type* const_iterator; \ - typedef value_type& reference; \ - typedef const value_type& const_reference; \ - typedef ptrdiff_t difference_type; \ - typedef size_t size_type; \ - \ - void assign(const_iterator first, const_iterator last); \ - void assign(size_type n, const_reference v); \ - size_type capacity() const { return m_nSize; } \ - iterator erase(iterator first, iterator last) \ - { \ - size_type idx = first - begin(); \ - RemoveAt(idx, last - first); \ - return begin() + idx; \ - } \ - iterator erase(iterator it) { return erase(it, it + 1); } \ - void insert(iterator it, size_type n, const value_type& v) \ - { Insert(v, it - begin(), n); } \ - iterator insert(iterator it, const value_type& v = value_type()) \ - { \ - size_type idx = it - begin(); \ - Insert(v, idx); \ - return begin() + idx; \ - } \ - void insert(iterator it, const_iterator first, const_iterator last);\ - void pop_back() { RemoveAt(size() - 1); } \ - void push_back(const value_type& v) { Add(v); } \ - void reserve(size_type n) { Alloc(n); } \ - void resize(size_type count, value_type defval = value_type()) \ - { \ - if ( count < m_nCount ) \ - m_nCount = count; \ - else \ - SetCount(count, defval); \ - } \ - \ - iterator begin() { return m_pItems; } \ - iterator end() { return m_pItems + m_nCount; } \ - const_iterator begin() const { return m_pItems; } \ - const_iterator end() const { return m_pItems + m_nCount; } \ - \ - void swap(name& other) \ - { \ - wxSwap(m_nSize, other.m_nSize); \ - wxSwap(m_nCount, other.m_nCount); \ - wxSwap(m_pItems, other.m_pItems); \ - } \ - \ - /* the following functions may be made directly public because */ \ - /* they don't use the type of the elements at all */ \ -public: \ - void clear() { Clear(); } \ - bool empty() const { return IsEmpty(); } \ - size_type max_size() const { return INT_MAX; } \ - size_type size() const { return GetCount(); } \ - \ -private: \ - void Grow(size_t nIncrement = 0); \ - bool Realloc(size_t nSize); \ - \ - size_t m_nSize, \ - m_nCount; \ - \ - T *m_pItems; \ -} - -#endif // !wxUSE_STD_CONTAINERS - -// ============================================================================ -// The private helper macros containing the core of the array classes -// ============================================================================ - -// Implementation notes: -// -// JACS: Salford C++ doesn't like 'var->operator=' syntax, as in: -// { ((wxBaseArray *)this)->operator=((const wxBaseArray&)src); -// so using a temporary variable instead. -// -// The classes need a (even trivial) ~name() to link under Mac X - -// ---------------------------------------------------------------------------- -// _WX_DEFINE_TYPEARRAY: array for simple types -// ---------------------------------------------------------------------------- - -#if wxUSE_STD_CONTAINERS - -// in STL case we don't need the entire base arrays hack as standard container -// don't suffer from alignment/storage problems as our home-grown do -#define _WX_DEFINE_TYPEARRAY(T, name, base, classexp) \ - _WX_DECLARE_BASEARRAY(T, name, classexp) - -#define _WX_DEFINE_TYPEARRAY_PTR(T, name, base, classexp) \ - _WX_DEFINE_TYPEARRAY(T, name, base, classexp) - -#else // if !wxUSE_STD_CONTAINERS - -// common declaration used by both _WX_DEFINE_TYPEARRAY and -// _WX_DEFINE_TYPEARRAY_PTR -#define _WX_DEFINE_TYPEARRAY_HELPER(T, name, base, classexp, ptrop) \ -wxCOMPILE_TIME_ASSERT2(sizeof(T) <= sizeof(base::base_type), \ - TypeTooBigToBeStoredIn##base, \ - name); \ -typedef int (CMPFUNC_CONV *CMPFUNC##T)(T *pItem1, T *pItem2); \ -classexp name : public base \ -{ \ -public: \ - name() { } \ - ~name() { } \ - \ - T& operator[](size_t uiIndex) const \ - { return (T&)(base::operator[](uiIndex)); } \ - T& Item(size_t uiIndex) const \ - { return (T&)(base::operator[](uiIndex)); } \ - T& Last() const \ - { return (T&)(base::operator[](GetCount() - 1)); } \ - \ - int Index(T lItem, bool bFromEnd = false) const \ - { return base::Index((base_type)lItem, bFromEnd); } \ - \ - void Add(T lItem, size_t nInsert = 1) \ - { base::Add((base_type)lItem, nInsert); } \ - void Insert(T lItem, size_t uiIndex, size_t nInsert = 1) \ - { base::Insert((base_type)lItem, uiIndex, nInsert) ; } \ - \ - void RemoveAt(size_t uiIndex, size_t nRemove = 1) \ - { base::RemoveAt(uiIndex, nRemove); } \ - void Remove(T lItem) \ - { int iIndex = Index(lItem); \ - wxCHECK_RET( iIndex != wxNOT_FOUND, _WX_ERROR_REMOVE); \ - base::RemoveAt((size_t)iIndex); } \ - \ - void Sort(CMPFUNC##T fCmp) { base::Sort((CMPFUNC)fCmp); } \ - \ - /* STL-like interface */ \ -private: \ - typedef base::iterator biterator; \ - typedef base::const_iterator bconst_iterator; \ - typedef base::value_type bvalue_type; \ - typedef base::const_reference bconst_reference; \ -public: \ - typedef T value_type; \ - typedef value_type* pointer; \ - typedef const value_type* const_pointer; \ - typedef value_type* iterator; \ - typedef const value_type* const_iterator; \ - typedef value_type& reference; \ - typedef const value_type& const_reference; \ - typedef base::difference_type difference_type; \ - typedef base::size_type size_type; \ - \ - class reverse_iterator \ - { \ - typedef T value_type; \ - typedef value_type& reference; \ - typedef value_type* pointer; \ - typedef reverse_iterator itor; \ - friend inline itor operator+(int o, const itor& it) \ - { return it.m_ptr - o; } \ - friend inline itor operator+(const itor& it, int o) \ - { return it.m_ptr - o; } \ - friend inline itor operator-(const itor& it, int o) \ - { return it.m_ptr + o; } \ - friend inline difference_type operator-(const itor& i1, \ - const itor& i2) \ - { return i1.m_ptr - i2.m_ptr; } \ - \ - public: \ - pointer m_ptr; \ - reverse_iterator() : m_ptr(NULL) { } \ - reverse_iterator(pointer ptr) : m_ptr(ptr) { } \ - reverse_iterator(const itor& it) : m_ptr(it.m_ptr) { } \ - reference operator*() const { return *m_ptr; } \ - ptrop \ - itor& operator++() { --m_ptr; return *this; } \ - const itor operator++(int) \ - { reverse_iterator tmp = *this; --m_ptr; return tmp; } \ - itor& operator--() { ++m_ptr; return *this; } \ - const itor operator--(int) { itor tmp = *this; ++m_ptr; return tmp; }\ - bool operator ==(const itor& it) const { return m_ptr == it.m_ptr; }\ - bool operator !=(const itor& it) const { return m_ptr != it.m_ptr; }\ - }; \ - \ - class const_reverse_iterator \ - { \ - typedef T value_type; \ - typedef const value_type& reference; \ - typedef const value_type* pointer; \ - typedef const_reverse_iterator itor; \ - friend inline itor operator+(int o, const itor& it) \ - { return it.m_ptr - o; } \ - friend inline itor operator+(const itor& it, int o) \ - { return it.m_ptr - o; } \ - friend inline itor operator-(const itor& it, int o) \ - { return it.m_ptr + o; } \ - friend inline difference_type operator-(const itor& i1, \ - const itor& i2) \ - { return i1.m_ptr - i2.m_ptr; } \ - \ - public: \ - pointer m_ptr; \ - const_reverse_iterator() : m_ptr(NULL) { } \ - const_reverse_iterator(pointer ptr) : m_ptr(ptr) { } \ - const_reverse_iterator(const itor& it) : m_ptr(it.m_ptr) { } \ - const_reverse_iterator(const reverse_iterator& it) : m_ptr(it.m_ptr) { }\ - reference operator*() const { return *m_ptr; } \ - ptrop \ - itor& operator++() { --m_ptr; return *this; } \ - const itor operator++(int) \ - { itor tmp = *this; --m_ptr; return tmp; } \ - itor& operator--() { ++m_ptr; return *this; } \ - const itor operator--(int) { itor tmp = *this; ++m_ptr; return tmp; }\ - bool operator ==(const itor& it) const { return m_ptr == it.m_ptr; }\ - bool operator !=(const itor& it) const { return m_ptr != it.m_ptr; }\ - }; \ - \ - name(size_type n) { assign(n, value_type()); } \ - name(size_type n, const_reference v) { assign(n, v); } \ - name(const_iterator first, const_iterator last) \ - { assign(first, last); } \ - void assign(const_iterator first, const_iterator last) \ - { base::assign((bconst_iterator)first, (bconst_iterator)last); } \ - void assign(size_type n, const_reference v) \ - { base::assign(n, (bconst_reference)v); } \ - reference back() { return *(end() - 1); } \ - const_reference back() const { return *(end() - 1); } \ - iterator begin() { return (iterator)base::begin(); } \ - const_iterator begin() const { return (const_iterator)base::begin(); }\ - size_type capacity() const { return base::capacity(); } \ - iterator end() { return (iterator)base::end(); } \ - const_iterator end() const { return (const_iterator)base::end(); } \ - iterator erase(iterator first, iterator last) \ - { return (iterator)base::erase((biterator)first, (biterator)last); }\ - iterator erase(iterator it) \ - { return (iterator)base::erase((biterator)it); } \ - reference front() { return *begin(); } \ - const_reference front() const { return *begin(); } \ - void insert(iterator it, size_type n, const_reference v) \ - { base::insert((biterator)it, n, (bconst_reference)v); } \ - iterator insert(iterator it, const_reference v = value_type()) \ - { return (iterator)base::insert((biterator)it, (bconst_reference)v); }\ - void insert(iterator it, const_iterator first, const_iterator last) \ - { base::insert((biterator)it, (bconst_iterator)first, \ - (bconst_iterator)last); } \ - void pop_back() { base::pop_back(); } \ - void push_back(const_reference v) \ - { base::push_back((bconst_reference)v); } \ - reverse_iterator rbegin() { return reverse_iterator(end() - 1); } \ - const_reverse_iterator rbegin() const; \ - reverse_iterator rend() { return reverse_iterator(begin() - 1); } \ - const_reverse_iterator rend() const; \ - void reserve(size_type n) { base::reserve(n); } \ - void resize(size_type n, value_type v = value_type()) \ - { base::resize(n, v); } \ - void swap(name& other) { base::swap(other); } \ -} - -#define _WX_PTROP pointer operator->() const { return m_ptr; } -#define _WX_PTROP_NONE - -#define _WX_DEFINE_TYPEARRAY(T, name, base, classexp) \ - _WX_DEFINE_TYPEARRAY_HELPER(T, name, base, classexp, _WX_PTROP) -#define _WX_DEFINE_TYPEARRAY_PTR(T, name, base, classexp) \ - _WX_DEFINE_TYPEARRAY_HELPER(T, name, base, classexp, _WX_PTROP_NONE) - -#endif // !wxUSE_STD_CONTAINERS - -// ---------------------------------------------------------------------------- -// _WX_DEFINE_SORTED_TYPEARRAY: sorted array for simple data types -// cannot handle types with size greater than pointer because of sorting -// ---------------------------------------------------------------------------- - -#define _WX_DEFINE_SORTED_TYPEARRAY_2(T, name, base, defcomp, classexp, comptype)\ -wxCOMPILE_TIME_ASSERT2(sizeof(T) <= sizeof(base::base_type), \ - TypeTooBigToBeStoredInSorted##base, \ - name); \ -classexp name : public base \ -{ \ - typedef comptype SCMPFUNC; \ -public: \ - name(comptype fn defcomp) { m_fnCompare = fn; } \ - \ - name& operator=(const name& src) \ - { base* temp = (base*) this; \ - (*temp) = ((const base&)src); \ - m_fnCompare = src.m_fnCompare; \ - return *this; } \ - \ - T& operator[](size_t uiIndex) const \ - { return (T&)(base::operator[](uiIndex)); } \ - T& Item(size_t uiIndex) const \ - { return (T&)(base::operator[](uiIndex)); } \ - T& Last() const \ - { return (T&)(base::operator[](size() - 1)); } \ - \ - int Index(T lItem) const \ - { return base::Index(lItem, (CMPFUNC)m_fnCompare); } \ - \ - size_t IndexForInsert(T lItem) const \ - { return base::IndexForInsert(lItem, (CMPFUNC)m_fnCompare); } \ - \ - void AddAt(T item, size_t index) \ - { base::insert(begin() + index, item); } \ - \ - size_t Add(T lItem) \ - { return base::Add(lItem, (CMPFUNC)m_fnCompare); } \ - void push_back(T lItem) \ - { Add(lItem); } \ - \ - void RemoveAt(size_t uiIndex, size_t nRemove = 1) \ - { base::erase(begin() + uiIndex, begin() + uiIndex + nRemove); } \ - void Remove(T lItem) \ - { int iIndex = Index(lItem); \ - wxCHECK_RET( iIndex != wxNOT_FOUND, _WX_ERROR_REMOVE ); \ - base::erase(begin() + iIndex); } \ - \ -private: \ - comptype m_fnCompare; \ -} - - -// ---------------------------------------------------------------------------- -// _WX_DECLARE_OBJARRAY: an array for pointers to type T with owning semantics -// ---------------------------------------------------------------------------- - -#define _WX_DECLARE_OBJARRAY(T, name, base, classexp) \ -typedef int (CMPFUNC_CONV *CMPFUNC##T)(T **pItem1, T **pItem2); \ -classexp name : protected base \ -{ \ -typedef int (CMPFUNC_CONV *CMPFUNC##base)(void **pItem1, void **pItem2); \ -typedef base base_array; \ -public: \ - name() { } \ - name(const name& src); \ - name& operator=(const name& src); \ - \ - ~name(); \ - \ - void Alloc(size_t count) { base::reserve(count); } \ - void reserve(size_t count) { base::reserve(count); } \ - size_t GetCount() const { return base_array::size(); } \ - size_t size() const { return base_array::size(); } \ - bool IsEmpty() const { return base_array::empty(); } \ - bool empty() const { return base_array::empty(); } \ - size_t Count() const { return base_array::size(); } \ - void Shrink() { base::Shrink(); } \ - \ - T& operator[](size_t uiIndex) const \ - { return *(T*)base::operator[](uiIndex); } \ - T& Item(size_t uiIndex) const \ - { return *(T*)base::operator[](uiIndex); } \ - T& Last() const \ - { return *(T*)(base::operator[](size() - 1)); } \ - \ - int Index(const T& lItem, bool bFromEnd = false) const; \ - \ - void Add(const T& lItem, size_t nInsert = 1); \ - void Add(const T* pItem) \ - { base::push_back((T*)pItem); } \ - void push_back(const T* pItem) \ - { base::push_back((T*)pItem); } \ - void push_back(const T& lItem) \ - { Add(lItem); } \ - \ - void Insert(const T& lItem, size_t uiIndex, size_t nInsert = 1); \ - void Insert(const T* pItem, size_t uiIndex) \ - { base::insert(begin() + uiIndex, (T*)pItem); } \ - \ - void Empty() { DoEmpty(); base::clear(); } \ - void Clear() { DoEmpty(); base::clear(); } \ - \ - T* Detach(size_t uiIndex) \ - { T* p = (T*)base::operator[](uiIndex); \ - base::erase(begin() + uiIndex); return p; } \ - void RemoveAt(size_t uiIndex, size_t nRemove = 1); \ - \ - void Sort(CMPFUNC##T fCmp) { base::Sort((CMPFUNC##base)fCmp); } \ - \ -private: \ - void DoEmpty(); \ - void DoCopy(const name& src); \ -} - -// ============================================================================ -// The public macros for declaration and definition of the dynamic arrays -// ============================================================================ - -// Please note that for each macro WX_FOO_ARRAY we also have -// WX_FOO_EXPORTED_ARRAY and WX_FOO_USER_EXPORTED_ARRAY which are exactly the -// same except that they use an additional __declspec(dllexport) or equivalent -// under Windows if needed. -// -// The first (just EXPORTED) macros do it if wxWidgets was compiled as a DLL -// and so must be used used inside the library. The second kind (USER_EXPORTED) -// allow the user code to do it when it wants. This is needed if you have a dll -// that wants to export a wxArray daubed with your own import/export goo. -// -// Finally, you can define the macro below as something special to modify the -// arrays defined by a simple WX_FOO_ARRAY as well. By default is empty. -#define wxARRAY_DEFAULT_EXPORT - -// ---------------------------------------------------------------------------- -// WX_DECLARE_BASEARRAY(T, name) declare an array class named "name" containing -// the elements of type T -// ---------------------------------------------------------------------------- - -#define WX_DECLARE_BASEARRAY(T, name) \ - WX_DECLARE_USER_EXPORTED_BASEARRAY(T, name, wxARRAY_DEFAULT_EXPORT) - -#define WX_DECLARE_EXPORTED_BASEARRAY(T, name) \ - WX_DECLARE_USER_EXPORTED_BASEARRAY(T, name, WXDLLIMPEXP_CORE) - -#define WX_DECLARE_USER_EXPORTED_BASEARRAY(T, name, expmode) \ - typedef T _wxArray##name; \ - _WX_DECLARE_BASEARRAY(_wxArray##name, name, class expmode) - -// ---------------------------------------------------------------------------- -// WX_DEFINE_TYPEARRAY(T, name, base) define an array class named "name" deriving -// from class "base" containing the elements of type T -// -// Note that the class defined has only inline function and doesn't take any -// space at all so there is no size penalty for defining multiple array classes -// ---------------------------------------------------------------------------- - -#define WX_DEFINE_TYPEARRAY(T, name, base) \ - WX_DEFINE_TYPEARRAY_WITH_DECL(T, name, base, class wxARRAY_DEFAULT_EXPORT) - -#define WX_DEFINE_TYPEARRAY_PTR(T, name, base) \ - WX_DEFINE_TYPEARRAY_WITH_DECL_PTR(T, name, base, class wxARRAY_DEFAULT_EXPORT) - -#define WX_DEFINE_EXPORTED_TYPEARRAY(T, name, base) \ - WX_DEFINE_TYPEARRAY_WITH_DECL(T, name, base, class WXDLLIMPEXP_CORE) - -#define WX_DEFINE_EXPORTED_TYPEARRAY_PTR(T, name, base) \ - WX_DEFINE_TYPEARRAY_WITH_DECL_PTR(T, name, base, class WXDLLIMPEXP_CORE) - -#define WX_DEFINE_USER_EXPORTED_TYPEARRAY(T, name, base, expdecl) \ - WX_DEFINE_TYPEARRAY_WITH_DECL(T, name, base, class expdecl) - -#define WX_DEFINE_USER_EXPORTED_TYPEARRAY_PTR(T, name, base, expdecl) \ - WX_DEFINE_TYPEARRAY_WITH_DECL_PTR(T, name, base, class expdecl) - -#define WX_DEFINE_TYPEARRAY_WITH_DECL(T, name, base, classdecl) \ - typedef T _wxArray##name; \ - _WX_DEFINE_TYPEARRAY(_wxArray##name, name, base, classdecl) - -#define WX_DEFINE_TYPEARRAY_WITH_DECL_PTR(T, name, base, classdecl) \ - typedef T _wxArray##name; \ - _WX_DEFINE_TYPEARRAY_PTR(_wxArray##name, name, base, classdecl) - -// ---------------------------------------------------------------------------- -// WX_DEFINE_SORTED_TYPEARRAY: this is the same as the previous macro, but it -// defines a sorted array. -// -// Differences: -// 1) it must be given a COMPARE function in ctor which takes 2 items of type -// T* and should return -1, 0 or +1 if the first one is less/greater -// than/equal to the second one. -// 2) the Add() method inserts the item in such was that the array is always -// sorted (it uses the COMPARE function) -// 3) it has no Sort() method because it's always sorted -// 4) Index() method is much faster (the sorted arrays use binary search -// instead of linear one), but Add() is slower. -// 5) there is no Insert() method because you can't insert an item into the -// given position in a sorted array but there is IndexForInsert()/AddAt() -// pair which may be used to optimize a common operation of "insert only if -// not found" -// -// Note that you have to specify the comparison function when creating the -// objects of this array type. If, as in 99% of cases, the comparison function -// is the same for all objects of a class, WX_DEFINE_SORTED_TYPEARRAY_CMP below -// is more convenient. -// -// Summary: use this class when the speed of Index() function is important, use -// the normal arrays otherwise. -// ---------------------------------------------------------------------------- - -// we need a macro which expands to nothing to pass correct number of -// parameters to a nested macro invocation even when we don't have anything to -// pass it -#define wxARRAY_EMPTY - -#define WX_DEFINE_SORTED_TYPEARRAY(T, name, base) \ - WX_DEFINE_SORTED_USER_EXPORTED_TYPEARRAY(T, name, base, \ - wxARRAY_DEFAULT_EXPORT) - -#define WX_DEFINE_SORTED_EXPORTED_TYPEARRAY(T, name, base) \ - WX_DEFINE_SORTED_USER_EXPORTED_TYPEARRAY(T, name, base, WXDLLIMPEXP_CORE) - -#define WX_DEFINE_SORTED_USER_EXPORTED_TYPEARRAY(T, name, base, expmode) \ - typedef T _wxArray##name; \ - typedef int (CMPFUNC_CONV *SCMPFUNC##name)(T pItem1, T pItem2); \ - _WX_DEFINE_SORTED_TYPEARRAY_2(_wxArray##name, name, base, \ - wxARRAY_EMPTY, class expmode, SCMPFUNC##name) - -// ---------------------------------------------------------------------------- -// WX_DEFINE_SORTED_TYPEARRAY_CMP: exactly the same as above but the comparison -// function is provided by this macro and the objects of this class have a -// default constructor which just uses it. -// -// The arguments are: the element type, the comparison function and the array -// name -// -// NB: this is, of course, how WX_DEFINE_SORTED_TYPEARRAY() should have worked -// from the very beginning - unfortunately I didn't think about this earlier -// ---------------------------------------------------------------------------- - -#define WX_DEFINE_SORTED_TYPEARRAY_CMP(T, cmpfunc, name, base) \ - WX_DEFINE_SORTED_USER_EXPORTED_TYPEARRAY_CMP(T, cmpfunc, name, base, \ - wxARRAY_DEFAULT_EXPORT) - -#define WX_DEFINE_SORTED_EXPORTED_TYPEARRAY_CMP(T, cmpfunc, name, base) \ - WX_DEFINE_SORTED_USER_EXPORTED_TYPEARRAY_CMP(T, cmpfunc, name, base, \ - WXDLLIMPEXP_CORE) - -#define WX_DEFINE_SORTED_USER_EXPORTED_TYPEARRAY_CMP(T, cmpfunc, name, base, \ - expmode) \ - typedef T _wxArray##name; \ - typedef int (CMPFUNC_CONV *SCMPFUNC##name)(T pItem1, T pItem2); \ - _WX_DEFINE_SORTED_TYPEARRAY_2(_wxArray##name, name, base, = cmpfunc, \ - class expmode, SCMPFUNC##name) - -// ---------------------------------------------------------------------------- -// WX_DECLARE_OBJARRAY(T, name): this macro generates a new array class -// named "name" which owns the objects of type T it contains, i.e. it will -// delete them when it is destroyed. -// -// An element is of type T*, but arguments of type T& are taken (see below!) -// and T& is returned. -// -// Don't use this for simple types such as "int" or "long"! -// -// Note on Add/Insert functions: -// 1) function(T*) gives the object to the array, i.e. it will delete the -// object when it's removed or in the array's dtor -// 2) function(T&) will create a copy of the object and work with it -// -// Also: -// 1) Remove() will delete the object after removing it from the array -// 2) Detach() just removes the object from the array (returning pointer to it) -// -// NB1: Base type T should have an accessible copy ctor if Add(T&) is used -// NB2: Never ever cast a array to it's base type: as dtor is not virtual -// and so you risk having at least the memory leaks and probably worse -// -// Some functions of this class are not inline, so it takes some space to -// define new class from this template even if you don't use it - which is not -// the case for the simple (non-object) array classes -// -// To use an objarray class you must -// #include "dynarray.h" -// WX_DECLARE_OBJARRAY(element_type, list_class_name) -// #include "arrimpl.cpp" -// WX_DEFINE_OBJARRAY(list_class_name) // name must be the same as above! -// -// This is necessary because at the moment of DEFINE_OBJARRAY class parsing the -// element_type must be fully defined (i.e. forward declaration is not -// enough), while WX_DECLARE_OBJARRAY may be done anywhere. The separation of -// two allows to break cicrcular dependencies with classes which have member -// variables of objarray type. -// ---------------------------------------------------------------------------- - -#define WX_DECLARE_OBJARRAY(T, name) \ - WX_DECLARE_USER_EXPORTED_OBJARRAY(T, name, wxARRAY_DEFAULT_EXPORT) - -#define WX_DECLARE_EXPORTED_OBJARRAY(T, name) \ - WX_DECLARE_USER_EXPORTED_OBJARRAY(T, name, WXDLLIMPEXP_CORE) - -#define WX_DECLARE_OBJARRAY_WITH_DECL(T, name, decl) \ - typedef T _wxObjArray##name; \ - _WX_DECLARE_OBJARRAY(_wxObjArray##name, name, wxArrayPtrVoid, decl) - -#define WX_DECLARE_USER_EXPORTED_OBJARRAY(T, name, expmode) \ - WX_DECLARE_OBJARRAY_WITH_DECL(T, name, class expmode) - -// WX_DEFINE_OBJARRAY is going to be redefined when arrimpl.cpp is included, -// try to provoke a human-understandable error if it used incorrectly. -// -// there is no real need for 3 different macros in the DEFINE case but do it -// anyhow for consistency -#define WX_DEFINE_OBJARRAY(name) DidYouIncludeArrimplCpp -#define WX_DEFINE_EXPORTED_OBJARRAY(name) WX_DEFINE_OBJARRAY(name) -#define WX_DEFINE_USER_EXPORTED_OBJARRAY(name) WX_DEFINE_OBJARRAY(name) - -// ---------------------------------------------------------------------------- -// Some commonly used predefined base arrays -// ---------------------------------------------------------------------------- - -WX_DECLARE_USER_EXPORTED_BASEARRAY(const void *, wxBaseArrayPtrVoid, - WXDLLIMPEXP_BASE); -WX_DECLARE_USER_EXPORTED_BASEARRAY(char, wxBaseArrayChar, WXDLLIMPEXP_BASE); -WX_DECLARE_USER_EXPORTED_BASEARRAY(short, wxBaseArrayShort, WXDLLIMPEXP_BASE); -WX_DECLARE_USER_EXPORTED_BASEARRAY(int, wxBaseArrayInt, WXDLLIMPEXP_BASE); -WX_DECLARE_USER_EXPORTED_BASEARRAY(long, wxBaseArrayLong, WXDLLIMPEXP_BASE); -WX_DECLARE_USER_EXPORTED_BASEARRAY(size_t, wxBaseArraySizeT, WXDLLIMPEXP_BASE); -WX_DECLARE_USER_EXPORTED_BASEARRAY(double, wxBaseArrayDouble, WXDLLIMPEXP_BASE); - -// ---------------------------------------------------------------------------- -// Convenience macros to define arrays from base arrays -// ---------------------------------------------------------------------------- - -#define WX_DEFINE_ARRAY(T, name) \ - WX_DEFINE_TYPEARRAY(T, name, wxBaseArrayPtrVoid) -#define WX_DEFINE_ARRAY_PTR(T, name) \ - WX_DEFINE_TYPEARRAY_PTR(T, name, wxBaseArrayPtrVoid) -#define WX_DEFINE_EXPORTED_ARRAY(T, name) \ - WX_DEFINE_EXPORTED_TYPEARRAY(T, name, wxBaseArrayPtrVoid) -#define WX_DEFINE_EXPORTED_ARRAY_PTR(T, name) \ - WX_DEFINE_EXPORTED_TYPEARRAY_PTR(T, name, wxBaseArrayPtrVoid) -#define WX_DEFINE_ARRAY_WITH_DECL_PTR(T, name, decl) \ - WX_DEFINE_TYPEARRAY_WITH_DECL_PTR(T, name, wxBaseArrayPtrVoid, decl) -#define WX_DEFINE_USER_EXPORTED_ARRAY(T, name, expmode) \ - WX_DEFINE_TYPEARRAY_WITH_DECL(T, name, wxBaseArrayPtrVoid, wxARRAY_EMPTY expmode) -#define WX_DEFINE_USER_EXPORTED_ARRAY_PTR(T, name, expmode) \ - WX_DEFINE_TYPEARRAY_WITH_DECL_PTR(T, name, wxBaseArrayPtrVoid, wxARRAY_EMPTY expmode) - -#define WX_DEFINE_ARRAY_CHAR(T, name) \ - WX_DEFINE_TYPEARRAY_PTR(T, name, wxBaseArrayChar) -#define WX_DEFINE_EXPORTED_ARRAY_CHAR(T, name) \ - WX_DEFINE_EXPORTED_TYPEARRAY_PTR(T, name, wxBaseArrayChar) -#define WX_DEFINE_USER_EXPORTED_ARRAY_CHAR(T, name, expmode) \ - WX_DEFINE_TYPEARRAY_WITH_DECL_PTR(T, name, wxBaseArrayChar, wxARRAY_EMPTY expmode) - -#define WX_DEFINE_ARRAY_SHORT(T, name) \ - WX_DEFINE_TYPEARRAY_PTR(T, name, wxBaseArrayShort) -#define WX_DEFINE_EXPORTED_ARRAY_SHORT(T, name) \ - WX_DEFINE_EXPORTED_TYPEARRAY_PTR(T, name, wxBaseArrayShort) -#define WX_DEFINE_USER_EXPORTED_ARRAY_SHORT(T, name, expmode) \ - WX_DEFINE_TYPEARRAY_WITH_DECL_PTR(T, name, wxBaseArrayShort, wxARRAY_EMPTY expmode) - -#define WX_DEFINE_ARRAY_INT(T, name) \ - WX_DEFINE_TYPEARRAY_PTR(T, name, wxBaseArrayInt) -#define WX_DEFINE_EXPORTED_ARRAY_INT(T, name) \ - WX_DEFINE_EXPORTED_TYPEARRAY_PTR(T, name, wxBaseArrayInt) -#define WX_DEFINE_USER_EXPORTED_ARRAY_INT(T, name, expmode) \ - WX_DEFINE_TYPEARRAY_WITH_DECL_PTR(T, name, wxBaseArrayInt, wxARRAY_EMPTY expmode) - -#define WX_DEFINE_ARRAY_LONG(T, name) \ - WX_DEFINE_TYPEARRAY_PTR(T, name, wxBaseArrayLong) -#define WX_DEFINE_EXPORTED_ARRAY_LONG(T, name) \ - WX_DEFINE_EXPORTED_TYPEARRAY_PTR(T, name, wxBaseArrayLong) -#define WX_DEFINE_USER_EXPORTED_ARRAY_LONG(T, name, expmode) \ - WX_DEFINE_TYPEARRAY_WITH_DECL_PTR(T, name, wxBaseArrayLong, wxARRAY_EMPTY expmode) - -#define WX_DEFINE_ARRAY_SIZE_T(T, name) \ - WX_DEFINE_TYPEARRAY_PTR(T, name, wxBaseArraySizeT) -#define WX_DEFINE_EXPORTED_ARRAY_SIZE_T(T, name) \ - WX_DEFINE_EXPORTED_TYPEARRAY_PTR(T, name, wxBaseArraySizeT) -#define WX_DEFINE_USER_EXPORTED_ARRAY_SIZE_T(T, name, expmode) \ - WX_DEFINE_TYPEARRAY_WITH_DECL_PTR(T, name, wxBaseArraySizeT, wxARRAY_EMPTY expmode) - -#define WX_DEFINE_ARRAY_DOUBLE(T, name) \ - WX_DEFINE_TYPEARRAY_PTR(T, name, wxBaseArrayDouble) -#define WX_DEFINE_EXPORTED_ARRAY_DOUBLE(T, name) \ - WX_DEFINE_EXPORTED_TYPEARRAY_PTR(T, name, wxBaseArrayDouble) -#define WX_DEFINE_USER_EXPORTED_ARRAY_DOUBLE(T, name, expmode) \ - WX_DEFINE_TYPEARRAY_WITH_DECL_PTR(T, name, wxBaseArrayDouble, wxARRAY_EMPTY expmode) - -// ---------------------------------------------------------------------------- -// Convenience macros to define sorted arrays from base arrays -// ---------------------------------------------------------------------------- - -#define WX_DEFINE_SORTED_ARRAY(T, name) \ - WX_DEFINE_SORTED_TYPEARRAY(T, name, wxBaseArrayPtrVoid) -#define WX_DEFINE_SORTED_EXPORTED_ARRAY(T, name) \ - WX_DEFINE_SORTED_EXPORTED_TYPEARRAY(T, name, wxBaseArrayPtrVoid) -#define WX_DEFINE_SORTED_USER_EXPORTED_ARRAY(T, name, expmode) \ - WX_DEFINE_SORTED_USER_EXPORTED_TYPEARRAY(T, name, wxBaseArrayPtrVoid, wxARRAY_EMPTY expmode) - -#define WX_DEFINE_SORTED_ARRAY_CHAR(T, name) \ - WX_DEFINE_SORTED_TYPEARRAY(T, name, wxBaseArrayChar) -#define WX_DEFINE_SORTED_EXPORTED_ARRAY_CHAR(T, name) \ - WX_DEFINE_SORTED_EXPORTED_TYPEARRAY(T, name, wxBaseArrayChar) -#define WX_DEFINE_SORTED_USER_EXPORTED_ARRAY_CHAR(T, name, expmode) \ - WX_DEFINE_SORTED_USER_EXPORTED_TYPEARRAY(T, name, wxBaseArrayChar, wxARRAY_EMPTY expmode) - -#define WX_DEFINE_SORTED_ARRAY_SHORT(T, name) \ - WX_DEFINE_SORTED_TYPEARRAY(T, name, wxBaseArrayShort) -#define WX_DEFINE_SORTED_EXPORTED_ARRAY_SHORT(T, name) \ - WX_DEFINE_SORTED_EXPORTED_TYPEARRAY(T, name, wxBaseArrayShort) -#define WX_DEFINE_SORTED_USER_EXPORTED_ARRAY_SHORT(T, name, expmode) \ - WX_DEFINE_SORTED_USER_EXPORTED_TYPEARRAY(T, name, wxBaseArrayShort, wxARRAY_EMPTY expmode) - -#define WX_DEFINE_SORTED_ARRAY_INT(T, name) \ - WX_DEFINE_SORTED_TYPEARRAY(T, name, wxBaseArrayInt) -#define WX_DEFINE_SORTED_EXPORTED_ARRAY_INT(T, name) \ - WX_DEFINE_SORTED_EXPORTED_TYPEARRAY(T, name, wxBaseArrayInt) -#define WX_DEFINE_SORTED_USER_EXPORTED_ARRAY_INT(T, name, expmode) \ - WX_DEFINE_SORTED_USER_EXPORTED_TYPEARRAY(T, name, wxBaseArrayInt, expmode) - -#define WX_DEFINE_SORTED_ARRAY_LONG(T, name) \ - WX_DEFINE_SORTED_TYPEARRAY(T, name, wxBaseArrayLong) -#define WX_DEFINE_SORTED_EXPORTED_ARRAY_LONG(T, name) \ - WX_DEFINE_SORTED_EXPORTED_TYPEARRAY(T, name, wxBaseArrayLong) -#define WX_DEFINE_SORTED_USER_EXPORTED_ARRAY_LONG(T, name, expmode) \ - WX_DEFINE_SORTED_USER_EXPORTED_TYPEARRAY(T, name, wxBaseArrayLong, expmode) - -#define WX_DEFINE_SORTED_ARRAY_SIZE_T(T, name) \ - WX_DEFINE_SORTED_TYPEARRAY(T, name, wxBaseArraySizeT) -#define WX_DEFINE_SORTED_EXPORTED_ARRAY_SIZE_T(T, name) \ - WX_DEFINE_SORTED_EXPORTED_TYPEARRAY(T, name, wxBaseArraySizeT) -#define WX_DEFINE_SORTED_USER_EXPORTED_ARRAY_SIZE_T(T, name, expmode) \ - WX_DEFINE_SORTED_USER_EXPORTED_TYPEARRAY(T, name, wxBaseArraySizeT, wxARRAY_EMPTY expmode) - -// ---------------------------------------------------------------------------- -// Convenience macros to define sorted arrays from base arrays -// ---------------------------------------------------------------------------- - -#define WX_DEFINE_SORTED_ARRAY_CMP(T, cmpfunc, name) \ - WX_DEFINE_SORTED_TYPEARRAY_CMP(T, cmpfunc, name, wxBaseArrayPtrVoid) -#define WX_DEFINE_SORTED_EXPORTED_ARRAY_CMP(T, cmpfunc, name) \ - WX_DEFINE_SORTED_EXPORTED_TYPEARRAY_CMP(T, cmpfunc, name, wxBaseArrayPtrVoid) -#define WX_DEFINE_SORTED_USER_EXPORTED_ARRAY_CMP(T, cmpfunc, \ - name, expmode) \ - WX_DEFINE_SORTED_USER_EXPORTED_TYPEARRAY_CMP(T, cmpfunc, name, \ - wxBaseArrayPtrVoid, \ - wxARRAY_EMPTY expmode) - -#define WX_DEFINE_SORTED_ARRAY_CMP_CHAR(T, cmpfunc, name) \ - WX_DEFINE_SORTED_TYPEARRAY_CMP(T, cmpfunc, name, wxBaseArrayChar) -#define WX_DEFINE_SORTED_EXPORTED_ARRAY_CMP_CHAR(T, cmpfunc, name) \ - WX_DEFINE_SORTED_EXPORTED_TYPEARRAY_CMP(T, cmpfunc, name, wxBaseArrayChar) -#define WX_DEFINE_SORTED_USER_EXPORTED_ARRAY_CMP_CHAR(T, cmpfunc, \ - name, expmode) \ - WX_DEFINE_SORTED_USER_EXPORTED_TYPEARRAY_CMP(T, cmpfunc, name, \ - wxBaseArrayChar, \ - wxARRAY_EMPTY expmode) - -#define WX_DEFINE_SORTED_ARRAY_CMP_SHORT(T, cmpfunc, name) \ - WX_DEFINE_SORTED_TYPEARRAY_CMP(T, cmpfunc, name, wxBaseArrayShort) -#define WX_DEFINE_SORTED_EXPORTED_ARRAY_CMP_SHORT(T, cmpfunc, name) \ - WX_DEFINE_SORTED_EXPORTED_TYPEARRAY_CMP(T, cmpfunc, name, wxBaseArrayShort) -#define WX_DEFINE_SORTED_USER_EXPORTED_ARRAY_CMP_SHORT(T, cmpfunc, \ - name, expmode) \ - WX_DEFINE_SORTED_USER_EXPORTED_TYPEARRAY_CMP(T, cmpfunc, name, \ - wxBaseArrayShort, \ - wxARRAY_EMPTY expmode) - -#define WX_DEFINE_SORTED_ARRAY_CMP_INT(T, cmpfunc, name) \ - WX_DEFINE_SORTED_TYPEARRAY_CMP(T, cmpfunc, name, wxBaseArrayInt) -#define WX_DEFINE_SORTED_EXPORTED_ARRAY_CMP_INT(T, cmpfunc, name) \ - WX_DEFINE_SORTED_EXPORTED_TYPEARRAY_CMP(T, cmpfunc, name, wxBaseArrayInt) -#define WX_DEFINE_SORTED_USER_EXPORTED_ARRAY_CMP_INT(T, cmpfunc, \ - name, expmode) \ - WX_DEFINE_SORTED_USER_EXPORTED_TYPEARRAY_CMP(T, cmpfunc, name, \ - wxBaseArrayInt, \ - wxARRAY_EMPTY expmode) - -#define WX_DEFINE_SORTED_ARRAY_CMP_LONG(T, cmpfunc, name) \ - WX_DEFINE_SORTED_TYPEARRAY_CMP(T, cmpfunc, name, wxBaseArrayLong) -#define WX_DEFINE_SORTED_EXPORTED_ARRAY_CMP_LONG(T, cmpfunc, name) \ - WX_DEFINE_SORTED_EXPORTED_TYPEARRAY_CMP(T, cmpfunc, name, wxBaseArrayLong) -#define WX_DEFINE_SORTED_USER_EXPORTED_ARRAY_CMP_LONG(T, cmpfunc, \ - name, expmode) \ - WX_DEFINE_SORTED_USER_EXPORTED_TYPEARRAY_CMP(T, cmpfunc, name, \ - wxBaseArrayLong, \ - wxARRAY_EMPTY expmode) - -#define WX_DEFINE_SORTED_ARRAY_CMP_SIZE_T(T, cmpfunc, name) \ - WX_DEFINE_SORTED_TYPEARRAY_CMP(T, cmpfunc, name, wxBaseArraySizeT) -#define WX_DEFINE_SORTED_EXPORTED_ARRAY_CMP_SIZE_T(T, cmpfunc, name) \ - WX_DEFINE_SORTED_EXPORTED_TYPEARRAY_CMP(T, cmpfunc, name, wxBaseArraySizeT) -#define WX_DEFINE_SORTED_USER_EXPORTED_ARRAY_CMP_SIZE_T(T, cmpfunc, \ - name, expmode) \ - WX_DEFINE_SORTED_USER_EXPORTED_TYPEARRAY_CMP(T, cmpfunc, name, \ - wxBaseArraySizeT, \ - wxARRAY_EMPTY expmode) - -// ---------------------------------------------------------------------------- -// Some commonly used predefined arrays -// ---------------------------------------------------------------------------- - -WX_DEFINE_USER_EXPORTED_ARRAY_SHORT(short, wxArrayShort, class WXDLLIMPEXP_BASE); -WX_DEFINE_USER_EXPORTED_ARRAY_INT(int, wxArrayInt, class WXDLLIMPEXP_BASE); -WX_DEFINE_USER_EXPORTED_ARRAY_DOUBLE(double, wxArrayDouble, class WXDLLIMPEXP_BASE); -WX_DEFINE_USER_EXPORTED_ARRAY_LONG(long, wxArrayLong, class WXDLLIMPEXP_BASE); -WX_DEFINE_USER_EXPORTED_ARRAY_PTR(void *, wxArrayPtrVoid, class WXDLLIMPEXP_BASE); - -// ----------------------------------------------------------------------------- -// convenience macros -// ----------------------------------------------------------------------------- - -// prepend all element of one array to another one; e.g. if first array contains -// elements X,Y,Z and the second contains A,B,C (in those orders), then the -// first array will be result as A,B,C,X,Y,Z -#define WX_PREPEND_ARRAY(array, other) \ - { \ - size_t wxAAcnt = (other).size(); \ - (array).reserve(wxAAcnt); \ - for ( size_t wxAAn = 0; wxAAn < wxAAcnt; wxAAn++ ) \ - { \ - (array).Insert((other)[wxAAn], wxAAn); \ - } \ - } - -// append all element of one array to another one -#define WX_APPEND_ARRAY(array, other) \ - { \ - size_t wxAAcnt = (other).size(); \ - (array).reserve(wxAAcnt); \ - for ( size_t wxAAn = 0; wxAAn < wxAAcnt; wxAAn++ ) \ - { \ - (array).push_back((other)[wxAAn]); \ - } \ - } - -// delete all array elements -// -// NB: the class declaration of the array elements must be visible from the -// place where you use this macro, otherwise the proper destructor may not -// be called (a decent compiler should give a warning about it, but don't -// count on it)! -#define WX_CLEAR_ARRAY(array) \ - { \ - size_t wxAAcnt = (array).size(); \ - for ( size_t wxAAn = 0; wxAAn < wxAAcnt; wxAAn++ ) \ - { \ - delete (array)[wxAAn]; \ - } \ - \ - (array).clear(); \ - } - -#endif // _DYNARRAY_H diff --git a/Externals/wxWidgets3/include/wx/dynlib.h b/Externals/wxWidgets3/include/wx/dynlib.h deleted file mode 100644 index 0f035d904f..0000000000 --- a/Externals/wxWidgets3/include/wx/dynlib.h +++ /dev/null @@ -1,417 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/dynlib.h -// Purpose: Dynamic library loading classes -// Author: Guilhem Lavaux, Vadim Zeitlin, Vaclav Slavik -// Modified by: -// Created: 20/07/98 -// Copyright: (c) 1998 Guilhem Lavaux -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DYNLIB_H__ -#define _WX_DYNLIB_H__ - -#include "wx/defs.h" - -#if wxUSE_DYNLIB_CLASS - -#include "wx/string.h" -#include "wx/dynarray.h" - -// note that we have our own dlerror() implementation under Darwin -#if defined(HAVE_DLERROR) || defined(__DARWIN__) - #define wxHAVE_DYNLIB_ERROR -#endif - -class WXDLLIMPEXP_FWD_BASE wxDynamicLibraryDetailsCreator; - -// ---------------------------------------------------------------------------- -// conditional compilation -// ---------------------------------------------------------------------------- - -#if defined(__WINDOWS__) - typedef WXHMODULE wxDllType; -#elif defined(__DARWIN__) - // Don't include dlfcn.h on Darwin, we may be using our own replacements. - typedef void *wxDllType; -#elif defined(HAVE_DLOPEN) - #include - typedef void *wxDllType; -#elif defined(HAVE_SHL_LOAD) - #include - typedef shl_t wxDllType; -#elif defined(__WXMAC__) - #include - typedef CFragConnectionID wxDllType; -#else - #error "Dynamic Loading classes can't be compiled on this platform, sorry." -#endif - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -enum wxDLFlags -{ - wxDL_LAZY = 0x00000001, // resolve undefined symbols at first use - // (only works on some Unix versions) - wxDL_NOW = 0x00000002, // resolve undefined symbols on load - // (default, always the case under Win32) - wxDL_GLOBAL = 0x00000004, // export extern symbols to subsequently - // loaded libs. - wxDL_VERBATIM = 0x00000008, // attempt to load the supplied library - // name without appending the usual dll - // filename extension. - - // this flag is obsolete, don't use - wxDL_NOSHARE = 0x00000010, // load new DLL, don't reuse already loaded - // (only for wxPluginManager) - - wxDL_QUIET = 0x00000020, // don't log an error if failed to load - - // this flag is dangerous, for internal use of wxMSW only, don't use at all - // and especially don't use directly, use wxLoadedDLL instead if you really - // do need it - wxDL_GET_LOADED = 0x00000040, // Win32 only: return handle of already - // loaded DLL or NULL otherwise; Unload() - // should not be called so don't forget to - // Detach() if you use this function - - wxDL_DEFAULT = wxDL_NOW // default flags correspond to Win32 -}; - -enum wxDynamicLibraryCategory -{ - wxDL_LIBRARY, // standard library - wxDL_MODULE // loadable module/plugin -}; - -enum wxPluginCategory -{ - wxDL_PLUGIN_GUI, // plugin that uses GUI classes - wxDL_PLUGIN_BASE // wxBase-only plugin -}; - -// ---------------------------------------------------------------------------- -// macros -// ---------------------------------------------------------------------------- - -// when loading a function from a DLL you always have to cast the returned -// "void *" pointer to the correct type and, even more annoyingly, you have to -// repeat this type twice if you want to declare and define a function pointer -// all in one line -// -// this macro makes this slightly less painful by allowing you to specify the -// type only once, as the first parameter, and creating a variable of this type -// called "pfn" initialized with the "name" from the "dynlib" -#define wxDYNLIB_FUNCTION(type, name, dynlib) \ - type pfn ## name = (type)(dynlib).GetSymbol(wxT(#name)) - - -// a more convenient function replacing wxDYNLIB_FUNCTION above -// -// it uses the convention that the type of the function is its name suffixed -// with "_t" but it doesn't define a variable but just assigns the loaded value -// to it and also allows to pass it the prefix to be used instead of hardcoding -// "pfn" (the prefix can be "m_" or "gs_pfn" or whatever) -// -// notice that this function doesn't generate error messages if the symbol -// couldn't be loaded, the caller should generate the appropriate message -#define wxDL_INIT_FUNC(pfx, name, dynlib) \ - pfx ## name = (name ## _t)(dynlib).RawGetSymbol(#name) - -#ifdef __WINDOWS__ - -// same as wxDL_INIT_FUNC() but appends 'A' or 'W' to the function name, see -// wxDynamicLibrary::GetSymbolAorW() -#define wxDL_INIT_FUNC_AW(pfx, name, dynlib) \ - pfx ## name = (name ## _t)(dynlib).GetSymbolAorW(#name) - -#endif // __WINDOWS__ - -// the following macros can be used to redirect a whole library to a class and -// check at run-time if the library is present and contains all required -// methods -// -// notice that they are supposed to be used inside a class which has "m_ok" -// member variable indicating if the library had been successfully loaded - -// helper macros constructing the name of the variable storing the function -// pointer and the name of its type from the function name -#define wxDL_METHOD_NAME(name) m_pfn ## name -#define wxDL_METHOD_TYPE(name) name ## _t - -// parameters are: -// - rettype: return type of the function, e.g. "int" -// - name: name of the function, e.g. "foo" -// - args: function signature in parentheses, e.g. "(int x, int y)" -// - argnames: the names of the parameters in parentheses, e.g. "(x, y)" -// - defret: the value to return if the library wasn't successfully loaded -#define wxDL_METHOD_DEFINE( rettype, name, args, argnames, defret ) \ - typedef rettype (* wxDL_METHOD_TYPE(name)) args ; \ - wxDL_METHOD_TYPE(name) wxDL_METHOD_NAME(name); \ - rettype name args \ - { return m_ok ? wxDL_METHOD_NAME(name) argnames : defret; } - -#define wxDL_VOIDMETHOD_DEFINE( name, args, argnames ) \ - typedef void (* wxDL_METHOD_TYPE(name)) args ; \ - wxDL_METHOD_TYPE(name) wxDL_METHOD_NAME(name); \ - void name args \ - { if ( m_ok ) wxDL_METHOD_NAME(name) argnames ; } - -#define wxDL_METHOD_LOAD(lib, name) \ - wxDL_METHOD_NAME(name) = \ - (wxDL_METHOD_TYPE(name)) lib.GetSymbol(#name, &m_ok); \ - if ( !m_ok ) return false - -// ---------------------------------------------------------------------------- -// wxDynamicLibraryDetails: contains details about a loaded wxDynamicLibrary -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxDynamicLibraryDetails -{ -public: - // ctor, normally never used as these objects are only created by - // wxDynamicLibrary::ListLoaded() - wxDynamicLibraryDetails() { m_address = NULL; m_length = 0; } - - // get the (base) name - wxString GetName() const { return m_name; } - - // get the full path of this object - wxString GetPath() const { return m_path; } - - // get the load address and the extent, return true if this information is - // available - bool GetAddress(void **addr, size_t *len) const - { - if ( !m_address ) - return false; - - if ( addr ) - *addr = m_address; - if ( len ) - *len = m_length; - - return true; - } - - // return the version of the DLL (may be empty if no version info) - wxString GetVersion() const - { - return m_version; - } - -private: - wxString m_name, - m_path, - m_version; - - void *m_address; - size_t m_length; - - friend class wxDynamicLibraryDetailsCreator; -}; - -WX_DECLARE_USER_EXPORTED_OBJARRAY(wxDynamicLibraryDetails, - wxDynamicLibraryDetailsArray, - WXDLLIMPEXP_BASE); - -// ---------------------------------------------------------------------------- -// wxDynamicLibrary: represents a handle to a DLL/shared object -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxDynamicLibrary -{ -public: - // return a valid handle for the main program itself or NULL if back - // linking is not supported by the current platform (e.g. Win32) - static wxDllType GetProgramHandle(); - - // return the platform standard DLL extension (with leading dot) - static wxString GetDllExt(wxDynamicLibraryCategory cat = wxDL_LIBRARY); - - wxDynamicLibrary() : m_handle(0) { } - wxDynamicLibrary(const wxString& libname, int flags = wxDL_DEFAULT) - : m_handle(0) - { - Load(libname, flags); - } - - // NOTE: this class is (deliberately) not virtual, do not attempt - // to use it polymorphically. - ~wxDynamicLibrary() { Unload(); } - - // return true if the library was loaded successfully - bool IsLoaded() const { return m_handle != 0; } - - // load the library with the given name (full or not), return true if ok - bool Load(const wxString& libname, int flags = wxDL_DEFAULT); - - // raw function for loading dynamic libs: always behaves as if - // wxDL_VERBATIM were specified and doesn't log error message if the - // library couldn't be loaded but simply returns NULL - static wxDllType RawLoad(const wxString& libname, int flags = wxDL_DEFAULT); - - // detach the library object from its handle, i.e. prevent the object from - // unloading the library in its dtor -- the caller is now responsible for - // doing this - wxDllType Detach() { wxDllType h = m_handle; m_handle = 0; return h; } - - // unload the given library handle (presumably returned by Detach() before) - static void Unload(wxDllType handle); - - // unload the library, also done automatically in dtor - void Unload() { if ( IsLoaded() ) { Unload(m_handle); m_handle = 0; } } - - // Return the raw handle from dlopen and friends. - wxDllType GetLibHandle() const { return m_handle; } - - // check if the given symbol is present in the library, useful to verify if - // a loadable module is our plugin, for example, without provoking error - // messages from GetSymbol() - bool HasSymbol(const wxString& name) const - { - bool ok; - DoGetSymbol(name, &ok); - return ok; - } - - // resolve a symbol in a loaded DLL, such as a variable or function name. - // 'name' is the (possibly mangled) name of the symbol. (use extern "C" to - // export unmangled names) - // - // Since it is perfectly valid for the returned symbol to actually be NULL, - // that is not always indication of an error. Pass and test the parameter - // 'success' for a true indication of success or failure to load the - // symbol. - // - // Returns a pointer to the symbol on success, or NULL if an error occurred - // or the symbol wasn't found. - void *GetSymbol(const wxString& name, bool *success = NULL) const; - - // low-level version of GetSymbol() - static void *RawGetSymbol(wxDllType handle, const wxString& name); - void *RawGetSymbol(const wxString& name) const - { - return RawGetSymbol(m_handle, name); - } - -#ifdef __WINDOWS__ - // this function is useful for loading functions from the standard Windows - // DLLs: such functions have an 'A' (in ANSI build) or 'W' (in Unicode, or - // wide character build) suffix if they take string parameters - static void *RawGetSymbolAorW(wxDllType handle, const wxString& name) - { - return RawGetSymbol - ( - handle, - name + -#if wxUSE_UNICODE - L'W' -#else - 'A' -#endif - ); - } - - void *GetSymbolAorW(const wxString& name) const - { - return RawGetSymbolAorW(m_handle, name); - } -#endif // __WINDOWS__ - - // return all modules/shared libraries in the address space of this process - // - // returns an empty array if not implemented or an error occurred - static wxDynamicLibraryDetailsArray ListLoaded(); - - // return platform-specific name of dynamic library with proper extension - // and prefix (e.g. "foo.dll" on Windows or "libfoo.so" on Linux) - static wxString CanonicalizeName(const wxString& name, - wxDynamicLibraryCategory cat = wxDL_LIBRARY); - - // return name of wxWidgets plugin (adds compiler and version info - // to the filename): - static wxString - CanonicalizePluginName(const wxString& name, - wxPluginCategory cat = wxDL_PLUGIN_GUI); - - // return plugin directory on platforms where it makes sense and empty - // string on others: - static wxString GetPluginsDirectory(); - - // Return the load address of the module containing the given address or - // NULL if not found. - // - // If path output parameter is non-NULL, fill it with the full path to this - // module disk file on success. - static void* GetModuleFromAddress(const void* addr, wxString* path = NULL); - -#ifdef __WINDOWS__ - // return the handle (HMODULE/HINSTANCE) of the DLL with the given name - // and/or containing the specified address: for XP and later systems only - // the address is used and the name is ignored but for the previous systems - // only the name (which may be either a full path to the DLL or just its - // base name, possibly even without extension) is used - // - // the returned handle reference count is not incremented so it doesn't - // need to be freed using FreeLibrary() but it also means that it can - // become invalid if the DLL is unloaded - static WXHMODULE MSWGetModuleHandle(const wxString& name, void *addr); -#endif // __WINDOWS__ - -protected: - // common part of GetSymbol() and HasSymbol() - void *DoGetSymbol(const wxString& name, bool *success = 0) const; - -#ifdef wxHAVE_DYNLIB_ERROR - // log the error after a dlxxx() function failure - static void Error(); -#endif // wxHAVE_DYNLIB_ERROR - - - // the handle to DLL or NULL - wxDllType m_handle; - - // no copy ctor/assignment operators (or we'd try to unload the library - // twice) - wxDECLARE_NO_COPY_CLASS(wxDynamicLibrary); -}; - -#ifdef __WINDOWS__ - -// ---------------------------------------------------------------------------- -// wxLoadedDLL is a MSW-only internal helper class allowing to dynamically bind -// to a DLL already loaded into the project address space -// ---------------------------------------------------------------------------- - -class wxLoadedDLL : public wxDynamicLibrary -{ -public: - wxLoadedDLL(const wxString& dllname) - : wxDynamicLibrary(dllname, wxDL_GET_LOADED | wxDL_VERBATIM | wxDL_QUIET) - { - } - - ~wxLoadedDLL() - { - Detach(); - } -}; - -#endif // __WINDOWS__ - -// ---------------------------------------------------------------------------- -// Interesting defines -// ---------------------------------------------------------------------------- - -#define WXDLL_ENTRY_FUNCTION() \ -extern "C" WXEXPORT const wxClassInfo *wxGetClassFirst(); \ -const wxClassInfo *wxGetClassFirst() { \ - return wxClassInfo::GetFirst(); \ -} - -#endif // wxUSE_DYNLIB_CLASS - -#endif // _WX_DYNLIB_H__ diff --git a/Externals/wxWidgets3/include/wx/dynload.h b/Externals/wxWidgets3/include/wx/dynload.h deleted file mode 100644 index 7cb4d25bac..0000000000 --- a/Externals/wxWidgets3/include/wx/dynload.h +++ /dev/null @@ -1,155 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/dynload.h -// Purpose: Dynamic loading framework -// Author: Ron Lee, David Falkinder, Vadim Zeitlin and a cast of 1000's -// (derived in part from dynlib.cpp (c) 1998 Guilhem Lavaux) -// Modified by: -// Created: 03/12/01 -// Copyright: (c) 2001 Ron Lee -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DYNAMICLOADER_H__ -#define _WX_DYNAMICLOADER_H__ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/defs.h" - -#if wxUSE_DYNAMIC_LOADER - -#include "wx/dynlib.h" -#include "wx/hashmap.h" -#include "wx/module.h" - -class WXDLLIMPEXP_FWD_BASE wxPluginLibrary; - - -WX_DECLARE_STRING_HASH_MAP_WITH_DECL(wxPluginLibrary *, wxDLManifest, - class WXDLLIMPEXP_BASE); -typedef wxDLManifest wxDLImports; - -// --------------------------------------------------------------------------- -// wxPluginLibrary -// --------------------------------------------------------------------------- - -// NOTE: Do not attempt to use a base class pointer to this class. -// wxDL is not virtual and we deliberately hide some of it's -// methods here. -// -// Unless you know exacty why you need to, you probably shouldn't -// instantiate this class directly anyway, use wxPluginManager -// instead. - -class WXDLLIMPEXP_BASE wxPluginLibrary : public wxDynamicLibrary -{ -public: - - static wxDLImports* ms_classes; // Static hash of all imported classes. - - wxPluginLibrary( const wxString &libname, int flags = wxDL_DEFAULT ); - ~wxPluginLibrary(); - - wxPluginLibrary *RefLib(); - bool UnrefLib(); - - // These two are called by the PluginSentinel on (PLUGGABLE) object - // creation/destruction. There is usually no reason for the user to - // call them directly. We have to separate this from the link count, - // since the two are not interchangeable. - - // FIXME: for even better debugging PluginSentinel should register - // the name of the class created too, then we can state - // exactly which object was not destroyed which may be - // difficult to find otherwise. Also this code should - // probably only be active in DEBUG mode, but let's just - // get it right first. - - void RefObj() { ++m_objcount; } - void UnrefObj() - { - wxASSERT_MSG( m_objcount > 0, wxT("Too many objects deleted??") ); - --m_objcount; - } - - // Override/hide some base class methods - - bool IsLoaded() const { return m_linkcount > 0; } - void Unload() { UnrefLib(); } - -private: - - // These pointers may be NULL but if they are not, then m_ourLast follows - // m_ourFirst in the linked list, i.e. can be found by calling GetNext() a - // sufficient number of times. - const wxClassInfo *m_ourFirst; // first class info in this plugin - const wxClassInfo *m_ourLast; // ..and the last one - - size_t m_linkcount; // Ref count of library link calls - size_t m_objcount; // ..and (pluggable) object instantiations. - wxModuleList m_wxmodules; // any wxModules that we initialised. - - void UpdateClasses(); // Update ms_classes - void RestoreClasses(); // Removes this library from ms_classes - void RegisterModules(); // Init any wxModules in the lib. - void UnregisterModules(); // Cleanup any wxModules we installed. - - wxDECLARE_NO_COPY_CLASS(wxPluginLibrary); -}; - - -class WXDLLIMPEXP_BASE wxPluginManager -{ -public: - - // Static accessors. - - static wxPluginLibrary *LoadLibrary( const wxString &libname, - int flags = wxDL_DEFAULT ); - static bool UnloadLibrary(const wxString &libname); - - // Instance methods. - - wxPluginManager() : m_entry(NULL) {} - wxPluginManager(const wxString &libname, int flags = wxDL_DEFAULT) - { - Load(libname, flags); - } - ~wxPluginManager() { if ( IsLoaded() ) Unload(); } - - bool Load(const wxString &libname, int flags = wxDL_DEFAULT); - void Unload(); - - bool IsLoaded() const { return m_entry && m_entry->IsLoaded(); } - void *GetSymbol(const wxString &symbol, bool *success = 0) - { - return m_entry->GetSymbol( symbol, success ); - } - - static void CreateManifest() { ms_manifest = new wxDLManifest(wxKEY_STRING); } - static void ClearManifest() { delete ms_manifest; ms_manifest = NULL; } - -private: - // return the pointer to the entry for the library with given name in - // ms_manifest or NULL if none - static wxPluginLibrary *FindByName(const wxString& name) - { - const wxDLManifest::iterator i = ms_manifest->find(name); - - return i == ms_manifest->end() ? NULL : i->second; - } - - static wxDLManifest* ms_manifest; // Static hash of loaded libs. - wxPluginLibrary* m_entry; // Cache our entry in the manifest. - - // We could allow this class to be copied if we really - // wanted to, but not without modification. - wxDECLARE_NO_COPY_CLASS(wxPluginManager); -}; - - -#endif // wxUSE_DYNAMIC_LOADER -#endif // _WX_DYNAMICLOADER_H__ - diff --git a/Externals/wxWidgets3/include/wx/editlbox.h b/Externals/wxWidgets3/include/wx/editlbox.h deleted file mode 100644 index c264c4c886..0000000000 --- a/Externals/wxWidgets3/include/wx/editlbox.h +++ /dev/null @@ -1,99 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/editlbox.h -// Purpose: ListBox with editable items -// Author: Vaclav Slavik -// Copyright: (c) Vaclav Slavik -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - - -#ifndef __WX_EDITLBOX_H__ -#define __WX_EDITLBOX_H__ - -#include "wx/defs.h" - -#if wxUSE_EDITABLELISTBOX - -#include "wx/panel.h" - -class WXDLLIMPEXP_FWD_CORE wxBitmapButton; -class WXDLLIMPEXP_FWD_CORE wxListCtrl; -class WXDLLIMPEXP_FWD_CORE wxListEvent; - -#define wxEL_ALLOW_NEW 0x0100 -#define wxEL_ALLOW_EDIT 0x0200 -#define wxEL_ALLOW_DELETE 0x0400 -#define wxEL_NO_REORDER 0x0800 -#define wxEL_DEFAULT_STYLE (wxEL_ALLOW_NEW | wxEL_ALLOW_EDIT | wxEL_ALLOW_DELETE) - -extern WXDLLIMPEXP_DATA_ADV(const char) wxEditableListBoxNameStr[]; - -// This class provides a composite control that lets the -// user easily enter list of strings - -class WXDLLIMPEXP_ADV wxEditableListBox : public wxPanel -{ -public: - wxEditableListBox() { Init(); } - - wxEditableListBox(wxWindow *parent, wxWindowID id, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxEL_DEFAULT_STYLE, - const wxString& name = wxEditableListBoxNameStr) - { - Init(); - Create(parent, id, label, pos, size, style, name); - } - - bool Create(wxWindow *parent, wxWindowID id, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxEL_DEFAULT_STYLE, - const wxString& name = wxEditableListBoxNameStr); - - void SetStrings(const wxArrayString& strings); - void GetStrings(wxArrayString& strings) const; - - wxListCtrl* GetListCtrl() { return m_listCtrl; } - wxBitmapButton* GetDelButton() { return m_bDel; } - wxBitmapButton* GetNewButton() { return m_bNew; } - wxBitmapButton* GetUpButton() { return m_bUp; } - wxBitmapButton* GetDownButton() { return m_bDown; } - wxBitmapButton* GetEditButton() { return m_bEdit; } - -protected: - wxBitmapButton *m_bDel, *m_bNew, *m_bUp, *m_bDown, *m_bEdit; - wxListCtrl *m_listCtrl; - int m_selection; - long m_style; - - void Init() - { - m_style = 0; - m_selection = 0; - m_bEdit = m_bNew = m_bDel = m_bUp = m_bDown = NULL; - m_listCtrl = NULL; - } - - void OnItemSelected(wxListEvent& event); - void OnEndLabelEdit(wxListEvent& event); - void OnNewItem(wxCommandEvent& event); - void OnDelItem(wxCommandEvent& event); - void OnEditItem(wxCommandEvent& event); - void OnUpItem(wxCommandEvent& event); - void OnDownItem(wxCommandEvent& event); - - wxDECLARE_CLASS(wxEditableListBox); - wxDECLARE_EVENT_TABLE(); - -private: - void SwapItems(long i1, long i2); - -}; - -#endif // wxUSE_EDITABLELISTBOX - -#endif // __WX_EDITLBOX_H__ diff --git a/Externals/wxWidgets3/include/wx/effects.h b/Externals/wxWidgets3/include/wx/effects.h deleted file mode 100644 index b0e1b574b6..0000000000 --- a/Externals/wxWidgets3/include/wx/effects.h +++ /dev/null @@ -1,90 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/effects.h -// Purpose: wxEffects class -// Draws 3D effects. -// Author: Julian Smart et al -// Modified by: -// Created: 25/4/2000 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_EFFECTS_H_ -#define _WX_EFFECTS_H_ - -// this class is deprecated and will be removed in the next wx version -// -// please use wxRenderer::DrawBorder() instead of DrawSunkenEdge(); there is no -// replacement for TileBitmap() but it doesn't seem to be very useful anyhow -#if WXWIN_COMPATIBILITY_2_8 - -/* - * wxEffects: various 3D effects - */ - -#include "wx/object.h" -#include "wx/colour.h" -#include "wx/gdicmn.h" -#include "wx/dc.h" - -class WXDLLIMPEXP_CORE wxEffectsImpl: public wxObject -{ -public: - // Assume system colours - wxEffectsImpl() ; - // Going from lightest to darkest - wxEffectsImpl(const wxColour& highlightColour, const wxColour& lightShadow, - const wxColour& faceColour, const wxColour& mediumShadow, - const wxColour& darkShadow) ; - - // Accessors - wxColour GetHighlightColour() const { return m_highlightColour; } - wxColour GetLightShadow() const { return m_lightShadow; } - wxColour GetFaceColour() const { return m_faceColour; } - wxColour GetMediumShadow() const { return m_mediumShadow; } - wxColour GetDarkShadow() const { return m_darkShadow; } - - void SetHighlightColour(const wxColour& c) { m_highlightColour = c; } - void SetLightShadow(const wxColour& c) { m_lightShadow = c; } - void SetFaceColour(const wxColour& c) { m_faceColour = c; } - void SetMediumShadow(const wxColour& c) { m_mediumShadow = c; } - void SetDarkShadow(const wxColour& c) { m_darkShadow = c; } - - void Set(const wxColour& highlightColour, const wxColour& lightShadow, - const wxColour& faceColour, const wxColour& mediumShadow, - const wxColour& darkShadow) - { - SetHighlightColour(highlightColour); - SetLightShadow(lightShadow); - SetFaceColour(faceColour); - SetMediumShadow(mediumShadow); - SetDarkShadow(darkShadow); - } - - // Draw a sunken edge - void DrawSunkenEdge(wxDC& dc, const wxRect& rect, int borderSize = 1); - - // Tile a bitmap - bool TileBitmap(const wxRect& rect, wxDC& dc, const wxBitmap& bitmap); - -protected: - wxColour m_highlightColour; // Usually white - wxColour m_lightShadow; // Usually light grey - wxColour m_faceColour; // Usually grey - wxColour m_mediumShadow; // Usually dark grey - wxColour m_darkShadow; // Usually black - - wxDECLARE_CLASS(wxEffectsImpl); -}; - -// current versions of g++ don't generate deprecation warnings for classes -// declared deprecated, so define wxEffects as a typedef instead: this does -// generate warnings with both g++ and VC (which also has no troubles with -// directly deprecating the classes...) -// -// note that this g++ bug (16370) is supposed to be fixed in g++ 4.3.0 -typedef wxEffectsImpl wxDEPRECATED(wxEffects); - -#endif // WXWIN_COMPATIBILITY_2_8 - -#endif // _WX_EFFECTS_H_ diff --git a/Externals/wxWidgets3/include/wx/encconv.h b/Externals/wxWidgets3/include/wx/encconv.h deleted file mode 100644 index 7c49465f51..0000000000 --- a/Externals/wxWidgets3/include/wx/encconv.h +++ /dev/null @@ -1,152 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/encconv.h -// Purpose: wxEncodingConverter class for converting between different -// font encodings -// Author: Vaclav Slavik -// Copyright: (c) 1999 Vaclav Slavik -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_ENCCONV_H_ -#define _WX_ENCCONV_H_ - -#include "wx/defs.h" - -#include "wx/object.h" -#include "wx/fontenc.h" -#include "wx/dynarray.h" - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -enum -{ - wxCONVERT_STRICT, - wxCONVERT_SUBSTITUTE -}; - - -enum -{ - wxPLATFORM_CURRENT = -1, - - wxPLATFORM_UNIX = 0, - wxPLATFORM_WINDOWS, - wxPLATFORM_MAC -}; - -// ---------------------------------------------------------------------------- -// types -// ---------------------------------------------------------------------------- - -WX_DEFINE_ARRAY_INT(wxFontEncoding, wxFontEncodingArray); - -//-------------------------------------------------------------------------------- -// wxEncodingConverter -// This class is capable of converting strings between any two -// 8bit encodings/charsets. It can also convert from/to Unicode -//-------------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxEncodingConverter : public wxObject -{ - public: - - wxEncodingConverter(); - virtual ~wxEncodingConverter() { if (m_Table) delete[] m_Table; } - - // Initialize conversion. Both output or input encoding may - // be wxFONTENCODING_UNICODE. - // - // All subsequent calls to Convert() will interpret it's argument - // as a string in input_enc encoding and will output string in - // output_enc encoding. - // - // You must call this method before calling Convert. You may call - // it more than once in order to switch to another conversion - // - // Method affects behaviour of Convert() in case input character - // cannot be converted because it does not exist in output encoding: - // wxCONVERT_STRICT -- - // follow behaviour of GNU Recode - just copy unconvertable - // characters to output and don't change them (it's integer - // value will stay the same) - // wxCONVERT_SUBSTITUTE -- - // try some (lossy) substitutions - e.g. replace - // unconvertable latin capitals with acute by ordinary - // capitals, replace en-dash or em-dash by '-' etc. - // both modes guarantee that output string will have same length - // as input string - // - // Returns false if given conversion is impossible, true otherwise - // (conversion may be impossible either if you try to convert - // to Unicode with non-Unicode build of wxWidgets or if input - // or output encoding is not supported.) - bool Init(wxFontEncoding input_enc, wxFontEncoding output_enc, int method = wxCONVERT_STRICT); - - // Convert input string according to settings passed to Init. - // Note that you must call Init before using Convert! - bool Convert(const char* input, char* output) const; - bool Convert(char* str) const { return Convert(str, str); } - wxString Convert(const wxString& input) const; - - bool Convert(const char* input, wchar_t* output) const; - bool Convert(const wchar_t* input, char* output) const; - bool Convert(const wchar_t* input, wchar_t* output) const; - bool Convert(wchar_t* str) const { return Convert(str, str); } - - // Return equivalent(s) for given font that are used - // under given platform. wxPLATFORM_CURRENT means the plaform - // this binary was compiled for - // - // Examples: - // current platform enc returned value - // ----------------------------------------------------- - // unix CP1250 {ISO8859_2} - // unix ISO8859_2 {} - // windows ISO8859_2 {CP1250} - // - // Equivalence is defined in terms of convertibility: - // 2 encodings are equivalent if you can convert text between - // then without losing information (it may - and will - happen - // that you lose special chars like quotation marks or em-dashes - // but you shouldn't lose any diacritics and language-specific - // characters when converting between equivalent encodings). - // - // Convert() method is not limited to converting between - // equivalent encodings, it can convert between arbitrary - // two encodings! - // - // Remember that this function does _NOT_ check for presence of - // fonts in system. It only tells you what are most suitable - // encodings. (It usually returns only one encoding) - // - // Note that argument enc itself may be present in returned array! - // (so that you can -- as a side effect -- detect whether the - // encoding is native for this platform or not) - static wxFontEncodingArray GetPlatformEquivalents(wxFontEncoding enc, int platform = wxPLATFORM_CURRENT); - - // Similar to GetPlatformEquivalent, but this one will return ALL - // equivalent encodings, regardless the platform, including itself. - static wxFontEncodingArray GetAllEquivalents(wxFontEncoding enc); - - // Return true if [any text in] one multibyte encoding can be - // converted to another one losslessly. - // - // Do not call this with wxFONTENCODING_UNICODE, it doesn't make - // sense (always works in one sense and always depends on the text - // to convert in the other) - static bool CanConvert(wxFontEncoding encIn, wxFontEncoding encOut) - { - return GetAllEquivalents(encIn).Index(encOut) != wxNOT_FOUND; - } - - private: - wchar_t *m_Table; - bool m_UnicodeInput, m_UnicodeOutput; - bool m_JustCopy; - - wxDECLARE_NO_COPY_CLASS(wxEncodingConverter); -}; - -#endif // _WX_ENCCONV_H_ diff --git a/Externals/wxWidgets3/include/wx/encinfo.h b/Externals/wxWidgets3/include/wx/encinfo.h deleted file mode 100644 index 66b00034e5..0000000000 --- a/Externals/wxWidgets3/include/wx/encinfo.h +++ /dev/null @@ -1,65 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/encinfo.h -// Purpose: declares wxNativeEncodingInfo struct -// Author: Vadim Zeitlin -// Modified by: -// Created: 19.09.2003 (extracted from wx/fontenc.h) -// Copyright: (c) 2003 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_ENCINFO_H_ -#define _WX_ENCINFO_H_ - -#include "wx/string.h" - -// ---------------------------------------------------------------------------- -// wxNativeEncodingInfo contains all encoding parameters for this platform -// ---------------------------------------------------------------------------- - -// This private structure specifies all the parameters needed to create a font -// with the given encoding on this platform. -// -// Under X, it contains the last 2 elements of the font specifications -// (registry and encoding). -// -// Under Windows, it contains a number which is one of predefined CHARSET_XXX -// values. -// -// Under all platforms it also contains a facename string which should be -// used, if not empty, to create fonts in this encoding (this is the only way -// to create a font of non-standard encoding (like KOI8) under Windows - the -// facename specifies the encoding then) - -struct WXDLLIMPEXP_CORE wxNativeEncodingInfo -{ - wxString facename; // may be empty meaning "any" - wxFontEncoding encoding; // so that we know what this struct represents - -#if defined(__WXMSW__) || \ - defined(__WXMAC__) || \ - defined(__WXQT__) - - wxNativeEncodingInfo() - : facename() - , encoding(wxFONTENCODING_SYSTEM) - , charset(0) /* ANSI_CHARSET */ - { } - - int charset; -#elif defined(_WX_X_FONTLIKE) - wxString xregistry, - xencoding; -#elif defined(wxHAS_UTF8_FONTS) - // ports using UTF-8 for text don't need encoding information for fonts -#else - #error "Unsupported toolkit" -#endif - // this struct is saved in config by wxFontMapper, so it should know to - // serialise itself (implemented in platform-specific code) - bool FromString(const wxString& s); - wxString ToString() const; -}; - -#endif // _WX_ENCINFO_H_ - diff --git a/Externals/wxWidgets3/include/wx/event.h b/Externals/wxWidgets3/include/wx/event.h deleted file mode 100644 index c70f159f6e..0000000000 --- a/Externals/wxWidgets3/include/wx/event.h +++ /dev/null @@ -1,4456 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/event.h -// Purpose: Event classes -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_EVENT_H_ -#define _WX_EVENT_H_ - -#include "wx/defs.h" -#include "wx/cpp.h" -#include "wx/object.h" -#include "wx/clntdata.h" - -#if wxUSE_GUI - #include "wx/gdicmn.h" - #include "wx/cursor.h" - #include "wx/mousestate.h" -#endif - -#include "wx/dynarray.h" -#include "wx/thread.h" -#include "wx/tracker.h" -#include "wx/typeinfo.h" -#include "wx/any.h" -#include "wx/vector.h" - -#include "wx/meta/convertible.h" - -// Currently VC7 is known to not be able to compile CallAfter() code, so -// disable it for it (FIXME-VC7). -#if !defined(__VISUALC__) || wxCHECK_VISUALC_VERSION(8) - #include "wx/meta/removeref.h" - - #define wxHAS_CALL_AFTER -#endif - -// ---------------------------------------------------------------------------- -// forward declarations -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_BASE wxList; -class WXDLLIMPEXP_FWD_BASE wxEvent; -class WXDLLIMPEXP_FWD_BASE wxEventFilter; -#if wxUSE_GUI - class WXDLLIMPEXP_FWD_CORE wxDC; - class WXDLLIMPEXP_FWD_CORE wxMenu; - class WXDLLIMPEXP_FWD_CORE wxWindow; - class WXDLLIMPEXP_FWD_CORE wxWindowBase; -#endif // wxUSE_GUI - -// We operate with pointer to members of wxEvtHandler (such functions are used -// as event handlers in the event tables or as arguments to Connect()) but by -// default MSVC uses a restricted (but more efficient) representation of -// pointers to members which can't deal with multiple base classes. To avoid -// mysterious (as the compiler is not good enough to detect this and give a -// sensible error message) errors in the user code as soon as it defines -// classes inheriting from both wxEvtHandler (possibly indirectly, e.g. via -// wxWindow) and something else (including our own wxTrackable but not limited -// to it), we use the special MSVC keyword telling the compiler to use a more -// general pointer to member representation for the classes inheriting from -// wxEvtHandler. -#ifdef __VISUALC__ - #define wxMSVC_FWD_MULTIPLE_BASES __multiple_inheritance -#else - #define wxMSVC_FWD_MULTIPLE_BASES -#endif - -class WXDLLIMPEXP_FWD_BASE wxMSVC_FWD_MULTIPLE_BASES wxEvtHandler; -class wxEventConnectionRef; - -// ---------------------------------------------------------------------------- -// Event types -// ---------------------------------------------------------------------------- - -typedef int wxEventType; - -#define wxEVT_ANY ((wxEventType)-1) - -// this is used to make the event table entry type safe, so that for an event -// handler only a function with proper parameter list can be given. See also -// the wxEVENT_HANDLER_CAST-macro. -#define wxStaticCastEvent(type, val) static_cast(val) - -#define wxDECLARE_EVENT_TABLE_ENTRY(type, winid, idLast, fn, obj) \ - wxEventTableEntry(type, winid, idLast, wxNewEventTableFunctor(type, fn), obj) - -#define wxDECLARE_EVENT_TABLE_TERMINATOR() \ - wxEventTableEntry(wxEVT_NULL, 0, 0, 0, 0) - -// generate a new unique event type -extern WXDLLIMPEXP_BASE wxEventType wxNewEventType(); - -// events are represented by an instance of wxEventTypeTag and the -// corresponding type must be specified for type-safety checks - -// define a new custom event type, can be used alone or after event -// declaration in the header using one of the macros below -#define wxDEFINE_EVENT( name, type ) \ - const wxEventTypeTag< type > name( wxNewEventType() ) - -// the general version allowing exporting the event type from DLL, used by -// wxWidgets itself -#define wxDECLARE_EXPORTED_EVENT( expdecl, name, type ) \ - extern const expdecl wxEventTypeTag< type > name - -// this is the version which will normally be used in the user code -#define wxDECLARE_EVENT( name, type ) \ - wxDECLARE_EXPORTED_EVENT( wxEMPTY_PARAMETER_VALUE, name, type ) - - -// these macros are only used internally for backwards compatibility and -// allow to define an alias for an existing event type (this is used by -// wxEVT_SPIN_XXX) -#define wxDEFINE_EVENT_ALIAS( name, type, value ) \ - const wxEventTypeTag< type > name( value ) - -#define wxDECLARE_EXPORTED_EVENT_ALIAS( expdecl, name, type ) \ - extern const expdecl wxEventTypeTag< type > name - -// Try to cast the given event handler to the correct handler type: - -#define wxEVENT_HANDLER_CAST( functype, func ) \ - ( wxObjectEventFunction )( wxEventFunction )wxStaticCastEvent( functype, &func ) - - -// The tag is a type associated to the event type (which is an integer itself, -// in spite of its name) value. It exists in order to be used as a template -// parameter and provide a mapping between the event type values and their -// corresponding wxEvent-derived classes. -template -class wxEventTypeTag -{ -public: - // The class of wxEvent-derived class carried by the events of this type. - typedef T EventClass; - - wxEventTypeTag(wxEventType type) { m_type = type; } - - // Return a wxEventType reference for the initialization of the static - // event tables. See wxEventTableEntry::m_eventType for a more thorough - // explanation. - operator const wxEventType&() const { return m_type; } - -private: - wxEventType m_type; -}; - -// These are needed for the functor definitions -typedef void (wxEvtHandler::*wxEventFunction)(wxEvent&); - -// We had some trouble (specifically with eVC for ARM WinCE build) with using -// wxEventFunction in the past so we had introduced wxObjectEventFunction which -// used to be a typedef for a member of wxObject and not wxEvtHandler to work -// around this but as eVC is not really supported any longer we now only keep -// this for backwards compatibility and, despite its name, this is a typedef -// for wxEvtHandler member now -- but if we have the same problem with another -// compiler we can restore its old definition for it. -typedef wxEventFunction wxObjectEventFunction; - -// The event functor which is stored in the static and dynamic event tables: -class WXDLLIMPEXP_BASE wxEventFunctor -{ -public: - virtual ~wxEventFunctor(); - - // Invoke the actual event handler: - virtual void operator()(wxEvtHandler *, wxEvent&) = 0; - - // this function tests whether this functor is matched, for the purpose of - // finding it in an event table in Unbind(), by the given functor: - virtual bool IsMatching(const wxEventFunctor& functor) const = 0; - - // If the functor holds an wxEvtHandler, then get access to it and track - // its lifetime with wxEventConnectionRef: - virtual wxEvtHandler *GetEvtHandler() const - { return NULL; } - - // This is only used to maintain backward compatibility in - // wxAppConsoleBase::CallEventHandler and ensures that an overwritten - // wxAppConsoleBase::HandleEvent is still called for functors which hold an - // wxEventFunction: - virtual wxEventFunction GetEvtMethod() const - { return NULL; } - -private: - WX_DECLARE_ABSTRACT_TYPEINFO(wxEventFunctor) -}; - -// A plain method functor for the untyped legacy event types: -class WXDLLIMPEXP_BASE wxObjectEventFunctor : public wxEventFunctor -{ -public: - wxObjectEventFunctor(wxObjectEventFunction method, wxEvtHandler *handler) - : m_handler( handler ), m_method( method ) - { } - - virtual void operator()(wxEvtHandler *handler, wxEvent& event) wxOVERRIDE; - - virtual bool IsMatching(const wxEventFunctor& functor) const wxOVERRIDE - { - if ( wxTypeId(functor) == wxTypeId(*this) ) - { - const wxObjectEventFunctor &other = - static_cast< const wxObjectEventFunctor & >( functor ); - - return ( m_method == other.m_method || !other.m_method ) && - ( m_handler == other.m_handler || !other.m_handler ); - } - else - return false; - } - - virtual wxEvtHandler *GetEvtHandler() const wxOVERRIDE - { return m_handler; } - - virtual wxEventFunction GetEvtMethod() const wxOVERRIDE - { return m_method; } - -private: - wxEvtHandler *m_handler; - wxEventFunction m_method; - - // Provide a dummy default ctor for type info purposes - wxObjectEventFunctor() { } - - WX_DECLARE_TYPEINFO_INLINE(wxObjectEventFunctor) -}; - -// Create a functor for the legacy events: used by Connect() -inline wxObjectEventFunctor * -wxNewEventFunctor(const wxEventType& WXUNUSED(evtType), - wxObjectEventFunction method, - wxEvtHandler *handler) -{ - return new wxObjectEventFunctor(method, handler); -} - -// This version is used by wxDECLARE_EVENT_TABLE_ENTRY() -inline wxObjectEventFunctor * -wxNewEventTableFunctor(const wxEventType& WXUNUSED(evtType), - wxObjectEventFunction method) -{ - return new wxObjectEventFunctor(method, NULL); -} - -inline wxObjectEventFunctor -wxMakeEventFunctor(const wxEventType& WXUNUSED(evtType), - wxObjectEventFunction method, - wxEvtHandler *handler) -{ - return wxObjectEventFunctor(method, handler); -} - -namespace wxPrivate -{ - -// helper template defining nested "type" typedef as the event class -// corresponding to the given event type -template struct EventClassOf; - -// the typed events provide the information about the class of the events they -// carry themselves: -template -struct EventClassOf< wxEventTypeTag > -{ - typedef typename wxEventTypeTag::EventClass type; -}; - -// for the old untyped events we don't have information about the exact event -// class carried by them -template <> -struct EventClassOf -{ - typedef wxEvent type; -}; - - -// helper class defining operations different for method functors using an -// object of wxEvtHandler-derived class as handler and the others -template struct HandlerImpl; - -// specialization for handlers deriving from wxEvtHandler -template -struct HandlerImpl -{ - static bool IsEvtHandler() - { return true; } - static T *ConvertFromEvtHandler(wxEvtHandler *p) - { return static_cast(p); } - static wxEvtHandler *ConvertToEvtHandler(T *p) - { return p; } - static wxEventFunction ConvertToEvtMethod(void (T::*f)(A&)) - { return static_cast( - reinterpret_cast(f)); } -}; - -// specialization for handlers not deriving from wxEvtHandler -template -struct HandlerImpl -{ - static bool IsEvtHandler() - { return false; } - static T *ConvertFromEvtHandler(wxEvtHandler *) - { return NULL; } - static wxEvtHandler *ConvertToEvtHandler(T *) - { return NULL; } - static wxEventFunction ConvertToEvtMethod(void (T::*)(A&)) - { return NULL; } -}; - -} // namespace wxPrivate - -// functor forwarding the event to a method of the given object -// -// notice that the object class may be different from the class in which the -// method is defined but it must be convertible to this class -// -// also, the type of the handler parameter doesn't need to be exactly the same -// as EventTag::EventClass but it must be its base class -- this is explicitly -// allowed to handle different events in the same handler taking wxEvent&, for -// example -template - -class wxEventFunctorMethod - : public wxEventFunctor, - private wxPrivate::HandlerImpl - < - Class, - EventArg, - wxConvertibleTo::value != 0 - > -{ -private: - static void CheckHandlerArgument(EventArg *) { } - -public: - // the event class associated with the given event tag - typedef typename wxPrivate::EventClassOf::type EventClass; - - - wxEventFunctorMethod(void (Class::*method)(EventArg&), EventHandler *handler) - : m_handler( handler ), m_method( method ) - { - wxASSERT_MSG( handler || this->IsEvtHandler(), - "handlers defined in non-wxEvtHandler-derived classes " - "must be connected with a valid sink object" ); - - // if you get an error here it means that the signature of the handler - // you're trying to use is not compatible with (i.e. is not the same as - // or a base class of) the real event class used for this event type - CheckHandlerArgument(static_cast(NULL)); - } - - virtual void operator()(wxEvtHandler *handler, wxEvent& event) - { - Class * realHandler = m_handler; - if ( !realHandler ) - { - realHandler = this->ConvertFromEvtHandler(handler); - - // this is not supposed to happen but check for it nevertheless - wxCHECK_RET( realHandler, "invalid event handler" ); - } - - // the real (run-time) type of event is EventClass and we checked in - // the ctor that EventClass can be converted to EventArg, so this cast - // is always valid - (realHandler->*m_method)(static_cast(event)); - } - - virtual bool IsMatching(const wxEventFunctor& functor) const - { - if ( wxTypeId(functor) != wxTypeId(*this) ) - return false; - - typedef wxEventFunctorMethod - ThisFunctor; - - // the cast is valid because wxTypeId()s matched above - const ThisFunctor& other = static_cast(functor); - - return (m_method == other.m_method || other.m_method == NULL) && - (m_handler == other.m_handler || other.m_handler == NULL); - } - - virtual wxEvtHandler *GetEvtHandler() const - { return this->ConvertToEvtHandler(m_handler); } - - virtual wxEventFunction GetEvtMethod() const - { return this->ConvertToEvtMethod(m_method); } - -private: - EventHandler *m_handler; - void (Class::*m_method)(EventArg&); - - // Provide a dummy default ctor for type info purposes - wxEventFunctorMethod() { } - - typedef wxEventFunctorMethod thisClass; - WX_DECLARE_TYPEINFO_INLINE(thisClass) -}; - - -// functor forwarding the event to function (function, static method) -template -class wxEventFunctorFunction : public wxEventFunctor -{ -private: - static void CheckHandlerArgument(EventArg *) { } - -public: - // the event class associated with the given event tag - typedef typename wxPrivate::EventClassOf::type EventClass; - - wxEventFunctorFunction( void ( *handler )( EventArg & )) - : m_handler( handler ) - { - // if you get an error here it means that the signature of the handler - // you're trying to use is not compatible with (i.e. is not the same as - // or a base class of) the real event class used for this event type - CheckHandlerArgument(static_cast(NULL)); - } - - virtual void operator()(wxEvtHandler *WXUNUSED(handler), wxEvent& event) wxOVERRIDE - { - // If you get an error here like "must use .* or ->* to call - // pointer-to-member function" then you probably tried to call - // Bind/Unbind with a method pointer but without a handler pointer or - // NULL as a handler e.g.: - // Unbind( wxEVT_XXX, &EventHandler::method ); - // or - // Unbind( wxEVT_XXX, &EventHandler::method, NULL ) - m_handler(static_cast(event)); - } - - virtual bool IsMatching(const wxEventFunctor &functor) const wxOVERRIDE - { - if ( wxTypeId(functor) != wxTypeId(*this) ) - return false; - - typedef wxEventFunctorFunction ThisFunctor; - - const ThisFunctor& other = static_cast( functor ); - - return m_handler == other.m_handler; - } - -private: - void (*m_handler)(EventArg&); - - // Provide a dummy default ctor for type info purposes - wxEventFunctorFunction() { } - - typedef wxEventFunctorFunction thisClass; - WX_DECLARE_TYPEINFO_INLINE(thisClass) -}; - - -template -class wxEventFunctorFunctor : public wxEventFunctor -{ -public: - typedef typename EventTag::EventClass EventArg; - - wxEventFunctorFunctor(const Functor& handler) - : m_handler(handler), m_handlerAddr(&handler) - { } - - virtual void operator()(wxEvtHandler *WXUNUSED(handler), wxEvent& event) wxOVERRIDE - { - // If you get an error here like "must use '.*' or '->*' to call - // pointer-to-member function" then you probably tried to call - // Bind/Unbind with a method pointer but without a handler pointer or - // NULL as a handler e.g.: - // Unbind( wxEVT_XXX, &EventHandler::method ); - // or - // Unbind( wxEVT_XXX, &EventHandler::method, NULL ) - m_handler(static_cast(event)); - } - - virtual bool IsMatching(const wxEventFunctor &functor) const wxOVERRIDE - { - if ( wxTypeId(functor) != wxTypeId(*this) ) - return false; - - typedef wxEventFunctorFunctor FunctorThis; - - const FunctorThis& other = static_cast(functor); - - // The only reliable/portable way to compare two functors is by - // identity: - return m_handlerAddr == other.m_handlerAddr; - } - -private: - // Store a copy of the functor to prevent using/calling an already - // destroyed instance: - Functor m_handler; - - // Use the address of the original functor for comparison in IsMatching: - const void *m_handlerAddr; - - // Provide a dummy default ctor for type info purposes - wxEventFunctorFunctor() { } - - typedef wxEventFunctorFunctor thisClass; - WX_DECLARE_TYPEINFO_INLINE(thisClass) -}; - -// Create functors for the templatized events, either allocated on the heap for -// wxNewXXX() variants (this is needed in wxEvtHandler::Bind<>() to store them -// in dynamic event table) or just by returning them as temporary objects (this -// is enough for Unbind<>() and we avoid unnecessary heap allocation like this). - - -// Create functors wrapping functions: -template -inline wxEventFunctorFunction * -wxNewEventFunctor(const EventTag&, void (*func)(EventArg &)) -{ - return new wxEventFunctorFunction(func); -} - -template -inline wxEventFunctorFunction -wxMakeEventFunctor(const EventTag&, void (*func)(EventArg &)) -{ - return wxEventFunctorFunction(func); -} - -// Create functors wrapping other functors: -template -inline wxEventFunctorFunctor * -wxNewEventFunctor(const EventTag&, const Functor &func) -{ - return new wxEventFunctorFunctor(func); -} - -template -inline wxEventFunctorFunctor -wxMakeEventFunctor(const EventTag&, const Functor &func) -{ - return wxEventFunctorFunctor(func); -} - -// Create functors wrapping methods: -template - -inline wxEventFunctorMethod * -wxNewEventFunctor(const EventTag&, - void (Class::*method)(EventArg&), - EventHandler *handler) -{ - return new wxEventFunctorMethod( - method, handler); -} - -template - -inline wxEventFunctorMethod -wxMakeEventFunctor(const EventTag&, - void (Class::*method)(EventArg&), - EventHandler *handler) -{ - return wxEventFunctorMethod( - method, handler); -} - -// Create an event functor for the event table via wxDECLARE_EVENT_TABLE_ENTRY: -// in this case we don't have the handler (as it's always the same as the -// object which generated the event) so we must use Class as its type -template -inline wxEventFunctorMethod * -wxNewEventTableFunctor(const EventTag&, void (Class::*method)(EventArg&)) -{ - return new wxEventFunctorMethod( - method, NULL); -} - - -// many, but not all, standard event types - - // some generic events -extern WXDLLIMPEXP_BASE const wxEventType wxEVT_NULL; -extern WXDLLIMPEXP_BASE const wxEventType wxEVT_FIRST; -extern WXDLLIMPEXP_BASE const wxEventType wxEVT_USER_FIRST; - - // Need events declared to do this -class WXDLLIMPEXP_FWD_BASE wxIdleEvent; -class WXDLLIMPEXP_FWD_BASE wxThreadEvent; -class WXDLLIMPEXP_FWD_BASE wxAsyncMethodCallEvent; -class WXDLLIMPEXP_FWD_CORE wxCommandEvent; -class WXDLLIMPEXP_FWD_CORE wxMouseEvent; -class WXDLLIMPEXP_FWD_CORE wxFocusEvent; -class WXDLLIMPEXP_FWD_CORE wxChildFocusEvent; -class WXDLLIMPEXP_FWD_CORE wxKeyEvent; -class WXDLLIMPEXP_FWD_CORE wxNavigationKeyEvent; -class WXDLLIMPEXP_FWD_CORE wxSetCursorEvent; -class WXDLLIMPEXP_FWD_CORE wxScrollEvent; -class WXDLLIMPEXP_FWD_CORE wxSpinEvent; -class WXDLLIMPEXP_FWD_CORE wxScrollWinEvent; -class WXDLLIMPEXP_FWD_CORE wxSizeEvent; -class WXDLLIMPEXP_FWD_CORE wxMoveEvent; -class WXDLLIMPEXP_FWD_CORE wxCloseEvent; -class WXDLLIMPEXP_FWD_CORE wxActivateEvent; -class WXDLLIMPEXP_FWD_CORE wxWindowCreateEvent; -class WXDLLIMPEXP_FWD_CORE wxWindowDestroyEvent; -class WXDLLIMPEXP_FWD_CORE wxShowEvent; -class WXDLLIMPEXP_FWD_CORE wxIconizeEvent; -class WXDLLIMPEXP_FWD_CORE wxMaximizeEvent; -class WXDLLIMPEXP_FWD_CORE wxMouseCaptureChangedEvent; -class WXDLLIMPEXP_FWD_CORE wxMouseCaptureLostEvent; -class WXDLLIMPEXP_FWD_CORE wxPaintEvent; -class WXDLLIMPEXP_FWD_CORE wxEraseEvent; -class WXDLLIMPEXP_FWD_CORE wxNcPaintEvent; -class WXDLLIMPEXP_FWD_CORE wxMenuEvent; -class WXDLLIMPEXP_FWD_CORE wxContextMenuEvent; -class WXDLLIMPEXP_FWD_CORE wxSysColourChangedEvent; -class WXDLLIMPEXP_FWD_CORE wxDisplayChangedEvent; -class WXDLLIMPEXP_FWD_CORE wxQueryNewPaletteEvent; -class WXDLLIMPEXP_FWD_CORE wxPaletteChangedEvent; -class WXDLLIMPEXP_FWD_CORE wxJoystickEvent; -class WXDLLIMPEXP_FWD_CORE wxDropFilesEvent; -class WXDLLIMPEXP_FWD_CORE wxInitDialogEvent; -class WXDLLIMPEXP_FWD_CORE wxUpdateUIEvent; -class WXDLLIMPEXP_FWD_CORE wxClipboardTextEvent; -class WXDLLIMPEXP_FWD_CORE wxHelpEvent; - - - // Command events -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_BUTTON, wxCommandEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_CHECKBOX, wxCommandEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_CHOICE, wxCommandEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_LISTBOX, wxCommandEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_LISTBOX_DCLICK, wxCommandEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_CHECKLISTBOX, wxCommandEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MENU, wxCommandEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SLIDER, wxCommandEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_RADIOBOX, wxCommandEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_RADIOBUTTON, wxCommandEvent); - -// wxEVT_SCROLLBAR is deprecated, use wxEVT_SCROLL... events -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLLBAR, wxCommandEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_VLBOX, wxCommandEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMBOBOX, wxCommandEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_TOOL_RCLICKED, wxCommandEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_TOOL_DROPDOWN, wxCommandEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_TOOL_ENTER, wxCommandEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMBOBOX_DROPDOWN, wxCommandEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMBOBOX_CLOSEUP, wxCommandEvent); - - // Thread and asynchronous method call events -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_BASE, wxEVT_THREAD, wxThreadEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_BASE, wxEVT_ASYNC_METHOD_CALL, wxAsyncMethodCallEvent); - - // Mouse event types -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_LEFT_DOWN, wxMouseEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_LEFT_UP, wxMouseEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MIDDLE_DOWN, wxMouseEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MIDDLE_UP, wxMouseEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_RIGHT_DOWN, wxMouseEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_RIGHT_UP, wxMouseEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MOTION, wxMouseEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_ENTER_WINDOW, wxMouseEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_LEAVE_WINDOW, wxMouseEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_LEFT_DCLICK, wxMouseEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MIDDLE_DCLICK, wxMouseEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_RIGHT_DCLICK, wxMouseEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SET_FOCUS, wxFocusEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_KILL_FOCUS, wxFocusEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_CHILD_FOCUS, wxChildFocusEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MOUSEWHEEL, wxMouseEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_AUX1_DOWN, wxMouseEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_AUX1_UP, wxMouseEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_AUX1_DCLICK, wxMouseEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_AUX2_DOWN, wxMouseEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_AUX2_UP, wxMouseEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_AUX2_DCLICK, wxMouseEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MAGNIFY, wxMouseEvent); - - // Character input event type -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_CHAR, wxKeyEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_CHAR_HOOK, wxKeyEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_NAVIGATION_KEY, wxNavigationKeyEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_KEY_DOWN, wxKeyEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_KEY_UP, wxKeyEvent); -#if wxUSE_HOTKEY -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_HOTKEY, wxKeyEvent); -#endif -// This is a private event used by wxMSW code only and subject to change or -// disappear in the future. Don't use. -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_AFTER_CHAR, wxKeyEvent); - - // Set cursor event -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SET_CURSOR, wxSetCursorEvent); - - // wxScrollBar and wxSlider event identifiers -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLL_TOP, wxScrollEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLL_BOTTOM, wxScrollEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLL_LINEUP, wxScrollEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLL_LINEDOWN, wxScrollEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLL_PAGEUP, wxScrollEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLL_PAGEDOWN, wxScrollEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLL_THUMBTRACK, wxScrollEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLL_THUMBRELEASE, wxScrollEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLL_CHANGED, wxScrollEvent); - -// Due to a bug in older wx versions, wxSpinEvents were being sent with type of -// wxEVT_SCROLL_LINEUP, wxEVT_SCROLL_LINEDOWN and wxEVT_SCROLL_THUMBTRACK. But -// with the type-safe events in place, these event types are associated with -// wxScrollEvent. To allow handling of spin events, new event types have been -// defined in spinbutt.h/spinnbuttcmn.cpp. To maintain backward compatibility -// the spin event types are being initialized with the scroll event types. - -#if wxUSE_SPINBTN - -wxDECLARE_EXPORTED_EVENT_ALIAS( WXDLLIMPEXP_CORE, wxEVT_SPIN_UP, wxSpinEvent ); -wxDECLARE_EXPORTED_EVENT_ALIAS( WXDLLIMPEXP_CORE, wxEVT_SPIN_DOWN, wxSpinEvent ); -wxDECLARE_EXPORTED_EVENT_ALIAS( WXDLLIMPEXP_CORE, wxEVT_SPIN, wxSpinEvent ); - -#endif - - // Scroll events from wxWindow -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLLWIN_TOP, wxScrollWinEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLLWIN_BOTTOM, wxScrollWinEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLLWIN_LINEUP, wxScrollWinEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLLWIN_LINEDOWN, wxScrollWinEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLLWIN_PAGEUP, wxScrollWinEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLLWIN_PAGEDOWN, wxScrollWinEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLLWIN_THUMBTRACK, wxScrollWinEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLLWIN_THUMBRELEASE, wxScrollWinEvent); - - // System events -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SIZE, wxSizeEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MOVE, wxMoveEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_CLOSE_WINDOW, wxCloseEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_END_SESSION, wxCloseEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_QUERY_END_SESSION, wxCloseEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_ACTIVATE_APP, wxActivateEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_ACTIVATE, wxActivateEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_CREATE, wxWindowCreateEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_DESTROY, wxWindowDestroyEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SHOW, wxShowEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_ICONIZE, wxIconizeEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MAXIMIZE, wxMaximizeEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MOUSE_CAPTURE_CHANGED, wxMouseCaptureChangedEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MOUSE_CAPTURE_LOST, wxMouseCaptureLostEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_PAINT, wxPaintEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_ERASE_BACKGROUND, wxEraseEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_NC_PAINT, wxNcPaintEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MENU_OPEN, wxMenuEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MENU_CLOSE, wxMenuEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MENU_HIGHLIGHT, wxMenuEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_CONTEXT_MENU, wxContextMenuEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SYS_COLOUR_CHANGED, wxSysColourChangedEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_DISPLAY_CHANGED, wxDisplayChangedEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_QUERY_NEW_PALETTE, wxQueryNewPaletteEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_PALETTE_CHANGED, wxPaletteChangedEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_JOY_BUTTON_DOWN, wxJoystickEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_JOY_BUTTON_UP, wxJoystickEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_JOY_MOVE, wxJoystickEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_JOY_ZMOVE, wxJoystickEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_DROP_FILES, wxDropFilesEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_INIT_DIALOG, wxInitDialogEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_BASE, wxEVT_IDLE, wxIdleEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_UPDATE_UI, wxUpdateUIEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SIZING, wxSizeEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MOVING, wxMoveEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MOVE_START, wxMoveEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MOVE_END, wxMoveEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_HIBERNATE, wxActivateEvent); - - // Clipboard events -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_TEXT_COPY, wxClipboardTextEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_TEXT_CUT, wxClipboardTextEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_TEXT_PASTE, wxClipboardTextEvent); - - // Generic command events - // Note: a click is a higher-level event than button down/up -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_LEFT_CLICK, wxCommandEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_LEFT_DCLICK, wxCommandEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_RIGHT_CLICK, wxCommandEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_RIGHT_DCLICK, wxCommandEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_SET_FOCUS, wxCommandEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_KILL_FOCUS, wxCommandEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_ENTER, wxCommandEvent); - - // Help events -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_HELP, wxHelpEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_DETAILED_HELP, wxHelpEvent); - -// these 2 events are the same -#define wxEVT_TOOL wxEVT_MENU - -// ---------------------------------------------------------------------------- -// Compatibility -// ---------------------------------------------------------------------------- - -// this event is also used by wxComboBox and wxSpinCtrl which don't include -// wx/textctrl.h in all ports [yet], so declare it here as well -// -// still, any new code using it should include wx/textctrl.h explicitly -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_TEXT, wxCommandEvent); - - -// ---------------------------------------------------------------------------- -// wxEvent(-derived) classes -// ---------------------------------------------------------------------------- - -// the predefined constants for the number of times we propagate event -// upwards window child-parent chain -enum wxEventPropagation -{ - // don't propagate it at all - wxEVENT_PROPAGATE_NONE = 0, - - // propagate it until it is processed - wxEVENT_PROPAGATE_MAX = INT_MAX -}; - -// The different categories for a wxEvent; see wxEvent::GetEventCategory. -// NOTE: they are used as OR-combinable flags by wxEventLoopBase::YieldFor -enum wxEventCategory -{ - // this is the category for those events which are generated to update - // the appearance of the GUI but which (usually) do not comport data - // processing, i.e. which do not provide input or output data - // (e.g. size events, scroll events, etc). - // They are events NOT directly generated by the user's input devices. - wxEVT_CATEGORY_UI = 1, - - // this category groups those events which are generated directly from the - // user through input devices like mouse and keyboard and usually result in - // data to be processed from the application. - // (e.g. mouse clicks, key presses, etc) - wxEVT_CATEGORY_USER_INPUT = 2, - - // this category is for wxSocketEvent - wxEVT_CATEGORY_SOCKET = 4, - - // this category is for wxTimerEvent - wxEVT_CATEGORY_TIMER = 8, - - // this category is for any event used to send notifications from the - // secondary threads to the main one or in general for notifications among - // different threads (which may or may not be user-generated) - wxEVT_CATEGORY_THREAD = 16, - - - // implementation only - - // used in the implementations of wxEventLoopBase::YieldFor - wxEVT_CATEGORY_UNKNOWN = 32, - - // a special category used as an argument to wxEventLoopBase::YieldFor to indicate that - // Yield() should leave all wxEvents on the queue while emptying the native event queue - // (native events will be processed but the wxEvents they generate will be queued) - wxEVT_CATEGORY_CLIPBOARD = 64, - - - // shortcut masks - - // this category groups those events which are emitted in response to - // events of the native toolkit and which typically are not-"delayable". - wxEVT_CATEGORY_NATIVE_EVENTS = wxEVT_CATEGORY_UI|wxEVT_CATEGORY_USER_INPUT, - - // used in wxEventLoopBase::YieldFor to specify all event categories should be processed: - wxEVT_CATEGORY_ALL = - wxEVT_CATEGORY_UI|wxEVT_CATEGORY_USER_INPUT|wxEVT_CATEGORY_SOCKET| \ - wxEVT_CATEGORY_TIMER|wxEVT_CATEGORY_THREAD|wxEVT_CATEGORY_UNKNOWN| \ - wxEVT_CATEGORY_CLIPBOARD -}; - -/* - * wxWidgets events, covering all interesting things that might happen - * (button clicking, resizing, setting text in widgets, etc.). - * - * For each completely new event type, derive a new event class. - * An event CLASS represents a C++ class defining a range of similar event TYPES; - * examples are canvas events, panel item command events. - * An event TYPE is a unique identifier for a particular system event, - * such as a button press or a listbox deselection. - * - */ - -class WXDLLIMPEXP_BASE wxEvent : public wxObject -{ -public: - wxEvent(int winid = 0, wxEventType commandType = wxEVT_NULL ); - - void SetEventType(wxEventType typ) { m_eventType = typ; } - wxEventType GetEventType() const { return m_eventType; } - - wxObject *GetEventObject() const { return m_eventObject; } - void SetEventObject(wxObject *obj) { m_eventObject = obj; } - - long GetTimestamp() const { return m_timeStamp; } - void SetTimestamp(long ts = 0) { m_timeStamp = ts; } - - int GetId() const { return m_id; } - void SetId(int Id) { m_id = Id; } - - // Returns the user data optionally associated with the event handler when - // using Connect() or Bind(). - wxObject *GetEventUserData() const { return m_callbackUserData; } - - // Can instruct event processor that we wish to ignore this event - // (treat as if the event table entry had not been found): this must be done - // to allow the event processing by the base classes (calling event.Skip() - // is the analog of calling the base class version of a virtual function) - void Skip(bool skip = true) { m_skipped = skip; } - bool GetSkipped() const { return m_skipped; } - - // This function is used to create a copy of the event polymorphically and - // all derived classes must implement it because otherwise wxPostEvent() - // for them wouldn't work (it needs to do a copy of the event) - virtual wxEvent *Clone() const = 0; - - // this function is used to selectively process events in wxEventLoopBase::YieldFor - // NOTE: by default it returns wxEVT_CATEGORY_UI just because the major - // part of wxWidgets events belong to that category. - virtual wxEventCategory GetEventCategory() const - { return wxEVT_CATEGORY_UI; } - - // Implementation only: this test is explicitly anti OO and this function - // exists only for optimization purposes. - bool IsCommandEvent() const { return m_isCommandEvent; } - - // Determine if this event should be propagating to the parent window. - bool ShouldPropagate() const - { return m_propagationLevel != wxEVENT_PROPAGATE_NONE; } - - // Stop an event from propagating to its parent window, returns the old - // propagation level value - int StopPropagation() - { - int propagationLevel = m_propagationLevel; - m_propagationLevel = wxEVENT_PROPAGATE_NONE; - return propagationLevel; - } - - // Resume the event propagation by restoring the propagation level - // (returned by StopPropagation()) - void ResumePropagation(int propagationLevel) - { - m_propagationLevel = propagationLevel; - } - - // This method is for internal use only and allows to get the object that - // is propagating this event upwards the window hierarchy, if any. - wxEvtHandler* GetPropagatedFrom() const { return m_propagatedFrom; } - - // This is for internal use only and is only called by - // wxEvtHandler::ProcessEvent() to check whether it's the first time this - // event is being processed - bool WasProcessed() - { - if ( m_wasProcessed ) - return true; - - m_wasProcessed = true; - - return false; - } - - // This is for internal use only and is used for setting, testing and - // resetting of m_willBeProcessedAgain flag. - void SetWillBeProcessedAgain() - { - m_willBeProcessedAgain = true; - } - - bool WillBeProcessedAgain() - { - if ( m_willBeProcessedAgain ) - { - m_willBeProcessedAgain = false; - return true; - } - - return false; - } - - // This is also used only internally by ProcessEvent() to check if it - // should process the event normally or only restrict the search for the - // event handler to this object itself. - bool ShouldProcessOnlyIn(wxEvtHandler *h) const - { - return h == m_handlerToProcessOnlyIn; - } - - // Called to indicate that the result of ShouldProcessOnlyIn() wasn't taken - // into account. The existence of this function may seem counterintuitive - // but unfortunately it's needed by wxScrollHelperEvtHandler, see comments - // there. Don't even think of using this in your own code, this is a gross - // hack and is only needed because of wx complicated history and should - // never be used anywhere else. - void DidntHonourProcessOnlyIn() - { - m_handlerToProcessOnlyIn = NULL; - } - -protected: - wxObject* m_eventObject; - wxEventType m_eventType; - long m_timeStamp; - int m_id; - -public: - // m_callbackUserData is for internal usage only - wxObject* m_callbackUserData; - -private: - // If this handler - wxEvtHandler *m_handlerToProcessOnlyIn; - -protected: - // the propagation level: while it is positive, we propagate the event to - // the parent window (if any) - int m_propagationLevel; - - // The object that the event is being propagated from, initially NULL and - // only set by wxPropagateOnce. - wxEvtHandler* m_propagatedFrom; - - bool m_skipped; - bool m_isCommandEvent; - - // initially false but becomes true as soon as WasProcessed() is called for - // the first time, as this is done only by ProcessEvent() it explains the - // variable name: it becomes true after ProcessEvent() was called at least - // once for this event - bool m_wasProcessed; - - // This one is initially false too, but can be set to true to indicate that - // the event will be passed to another handler if it's not processed in - // this one. - bool m_willBeProcessedAgain; - -protected: - wxEvent(const wxEvent&); // for implementing Clone() - wxEvent& operator=(const wxEvent&); // for derived classes operator=() - -private: - // It needs to access our m_propagationLevel and m_propagatedFrom fields. - friend class WXDLLIMPEXP_FWD_BASE wxPropagateOnce; - - // and this one needs to access our m_handlerToProcessOnlyIn - friend class WXDLLIMPEXP_FWD_BASE wxEventProcessInHandlerOnly; - - - wxDECLARE_ABSTRACT_CLASS(wxEvent); -}; - -/* - * Helper class to temporarily change an event not to propagate. - */ -class WXDLLIMPEXP_BASE wxPropagationDisabler -{ -public: - wxPropagationDisabler(wxEvent& event) : m_event(event) - { - m_propagationLevelOld = m_event.StopPropagation(); - } - - ~wxPropagationDisabler() - { - m_event.ResumePropagation(m_propagationLevelOld); - } - -private: - wxEvent& m_event; - int m_propagationLevelOld; - - wxDECLARE_NO_COPY_CLASS(wxPropagationDisabler); -}; - -/* - * Helper used to indicate that an event is propagated upwards the window - * hierarchy by the given window. - */ -class WXDLLIMPEXP_BASE wxPropagateOnce -{ -public: - // The handler argument should normally be non-NULL to allow the parent - // event handler to know that it's being used to process an event coming - // from the child, it's only NULL by default for backwards compatibility. - wxPropagateOnce(wxEvent& event, wxEvtHandler* handler = NULL) - : m_event(event), - m_propagatedFromOld(event.m_propagatedFrom) - { - wxASSERT_MSG( m_event.m_propagationLevel > 0, - wxT("shouldn't be used unless ShouldPropagate()!") ); - - m_event.m_propagationLevel--; - m_event.m_propagatedFrom = handler; - } - - ~wxPropagateOnce() - { - m_event.m_propagatedFrom = m_propagatedFromOld; - m_event.m_propagationLevel++; - } - -private: - wxEvent& m_event; - wxEvtHandler* const m_propagatedFromOld; - - wxDECLARE_NO_COPY_CLASS(wxPropagateOnce); -}; - -// A helper object used to temporarily make wxEvent::ShouldProcessOnlyIn() -// return true for the handler passed to its ctor. -class wxEventProcessInHandlerOnly -{ -public: - wxEventProcessInHandlerOnly(wxEvent& event, wxEvtHandler *handler) - : m_event(event), - m_handlerToProcessOnlyInOld(event.m_handlerToProcessOnlyIn) - { - m_event.m_handlerToProcessOnlyIn = handler; - } - - ~wxEventProcessInHandlerOnly() - { - m_event.m_handlerToProcessOnlyIn = m_handlerToProcessOnlyInOld; - } - -private: - wxEvent& m_event; - wxEvtHandler * const m_handlerToProcessOnlyInOld; - - wxDECLARE_NO_COPY_CLASS(wxEventProcessInHandlerOnly); -}; - - -class WXDLLIMPEXP_BASE wxEventBasicPayloadMixin -{ -public: - wxEventBasicPayloadMixin() - : m_commandInt(0), - m_extraLong(0) - { - } - - void SetString(const wxString& s) { m_cmdString = s; } - const wxString& GetString() const { return m_cmdString; } - - void SetInt(int i) { m_commandInt = i; } - int GetInt() const { return m_commandInt; } - - void SetExtraLong(long extraLong) { m_extraLong = extraLong; } - long GetExtraLong() const { return m_extraLong; } - -protected: - // Note: these variables have "cmd" or "command" in their name for backward compatibility: - // they used to be part of wxCommandEvent, not this mixin. - wxString m_cmdString; // String event argument - int m_commandInt; - long m_extraLong; // Additional information (e.g. select/deselect) - - wxDECLARE_NO_ASSIGN_CLASS(wxEventBasicPayloadMixin); -}; - -class WXDLLIMPEXP_BASE wxEventAnyPayloadMixin : public wxEventBasicPayloadMixin -{ -public: - wxEventAnyPayloadMixin() : wxEventBasicPayloadMixin() {} - -#if wxUSE_ANY - template - void SetPayload(const T& payload) - { - m_payload = payload; - } - - template - T GetPayload() const - { - return m_payload.As(); - } - -protected: - wxAny m_payload; -#endif // wxUSE_ANY - - wxDECLARE_NO_ASSIGN_CLASS(wxEventBasicPayloadMixin); -}; - - -// Idle event -/* - wxEVT_IDLE - */ - -// Whether to always send idle events to windows, or -// to only send update events to those with the -// wxWS_EX_PROCESS_IDLE style. - -enum wxIdleMode -{ - // Send idle events to all windows - wxIDLE_PROCESS_ALL, - - // Send idle events to windows that have - // the wxWS_EX_PROCESS_IDLE flag specified - wxIDLE_PROCESS_SPECIFIED -}; - -class WXDLLIMPEXP_BASE wxIdleEvent : public wxEvent -{ -public: - wxIdleEvent() - : wxEvent(0, wxEVT_IDLE), - m_requestMore(false) - { } - wxIdleEvent(const wxIdleEvent& event) - : wxEvent(event), - m_requestMore(event.m_requestMore) - { } - - void RequestMore(bool needMore = true) { m_requestMore = needMore; } - bool MoreRequested() const { return m_requestMore; } - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxIdleEvent(*this); } - - // Specify how wxWidgets will send idle events: to - // all windows, or only to those which specify that they - // will process the events. - static void SetMode(wxIdleMode mode) { sm_idleMode = mode; } - - // Returns the idle event mode - static wxIdleMode GetMode() { return sm_idleMode; } - -protected: - bool m_requestMore; - static wxIdleMode sm_idleMode; - -private: - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxIdleEvent); -}; - - -// Thread event - -class WXDLLIMPEXP_BASE wxThreadEvent : public wxEvent, - public wxEventAnyPayloadMixin -{ -public: - wxThreadEvent(wxEventType eventType = wxEVT_THREAD, int id = wxID_ANY) - : wxEvent(id, eventType) - { } - - wxThreadEvent(const wxThreadEvent& event) - : wxEvent(event), - wxEventAnyPayloadMixin(event) - { - // make sure our string member (which uses COW, aka refcounting) is not - // shared by other wxString instances: - SetString(GetString().Clone()); - } - - virtual wxEvent *Clone() const wxOVERRIDE - { - return new wxThreadEvent(*this); - } - - // this is important to avoid that calling wxEventLoopBase::YieldFor thread events - // gets processed when this is unwanted: - virtual wxEventCategory GetEventCategory() const wxOVERRIDE - { return wxEVT_CATEGORY_THREAD; } - -private: - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxThreadEvent); -}; - - -// Asynchronous method call events: these event are processed by wxEvtHandler -// itself and result in a call to its Execute() method which simply calls the -// specified method. The difference with a simple method call is that this is -// done asynchronously, i.e. at some later time, instead of immediately when -// the event object is constructed. - -#ifdef wxHAS_CALL_AFTER - -// This is a base class used to process all method calls. -class wxAsyncMethodCallEvent : public wxEvent -{ -public: - wxAsyncMethodCallEvent(wxObject* object) - : wxEvent(wxID_ANY, wxEVT_ASYNC_METHOD_CALL) - { - SetEventObject(object); - } - - wxAsyncMethodCallEvent(const wxAsyncMethodCallEvent& other) - : wxEvent(other) - { - } - - virtual void Execute() = 0; -}; - -// This is a version for calling methods without parameters. -template -class wxAsyncMethodCallEvent0 : public wxAsyncMethodCallEvent -{ -public: - typedef T ObjectType; - typedef void (ObjectType::*MethodType)(); - - wxAsyncMethodCallEvent0(ObjectType* object, - MethodType method) - : wxAsyncMethodCallEvent(object), - m_object(object), - m_method(method) - { - } - - wxAsyncMethodCallEvent0(const wxAsyncMethodCallEvent0& other) - : wxAsyncMethodCallEvent(other), - m_object(other.m_object), - m_method(other.m_method) - { - } - - virtual wxEvent *Clone() const wxOVERRIDE - { - return new wxAsyncMethodCallEvent0(*this); - } - - virtual void Execute() wxOVERRIDE - { - (m_object->*m_method)(); - } - -private: - ObjectType* const m_object; - const MethodType m_method; -}; - -// This is a version for calling methods with a single parameter. -template -class wxAsyncMethodCallEvent1 : public wxAsyncMethodCallEvent -{ -public: - typedef T ObjectType; - typedef void (ObjectType::*MethodType)(T1 x1); - typedef typename wxRemoveRef::type ParamType1; - - wxAsyncMethodCallEvent1(ObjectType* object, - MethodType method, - const ParamType1& x1) - : wxAsyncMethodCallEvent(object), - m_object(object), - m_method(method), - m_param1(x1) - { - } - - wxAsyncMethodCallEvent1(const wxAsyncMethodCallEvent1& other) - : wxAsyncMethodCallEvent(other), - m_object(other.m_object), - m_method(other.m_method), - m_param1(other.m_param1) - { - } - - virtual wxEvent *Clone() const wxOVERRIDE - { - return new wxAsyncMethodCallEvent1(*this); - } - - virtual void Execute() wxOVERRIDE - { - (m_object->*m_method)(m_param1); - } - -private: - ObjectType* const m_object; - const MethodType m_method; - const ParamType1 m_param1; -}; - -// This is a version for calling methods with two parameters. -template -class wxAsyncMethodCallEvent2 : public wxAsyncMethodCallEvent -{ -public: - typedef T ObjectType; - typedef void (ObjectType::*MethodType)(T1 x1, T2 x2); - typedef typename wxRemoveRef::type ParamType1; - typedef typename wxRemoveRef::type ParamType2; - - wxAsyncMethodCallEvent2(ObjectType* object, - MethodType method, - const ParamType1& x1, - const ParamType2& x2) - : wxAsyncMethodCallEvent(object), - m_object(object), - m_method(method), - m_param1(x1), - m_param2(x2) - { - } - - wxAsyncMethodCallEvent2(const wxAsyncMethodCallEvent2& other) - : wxAsyncMethodCallEvent(other), - m_object(other.m_object), - m_method(other.m_method), - m_param1(other.m_param1), - m_param2(other.m_param2) - { - } - - virtual wxEvent *Clone() const wxOVERRIDE - { - return new wxAsyncMethodCallEvent2(*this); - } - - virtual void Execute() wxOVERRIDE - { - (m_object->*m_method)(m_param1, m_param2); - } - -private: - ObjectType* const m_object; - const MethodType m_method; - const ParamType1 m_param1; - const ParamType2 m_param2; -}; - -// This is a version for calling any functors -template -class wxAsyncMethodCallEventFunctor : public wxAsyncMethodCallEvent -{ -public: - typedef T FunctorType; - - wxAsyncMethodCallEventFunctor(wxObject *object, const FunctorType& fn) - : wxAsyncMethodCallEvent(object), - m_fn(fn) - { - } - - wxAsyncMethodCallEventFunctor(const wxAsyncMethodCallEventFunctor& other) - : wxAsyncMethodCallEvent(other), - m_fn(other.m_fn) - { - } - - virtual wxEvent *Clone() const wxOVERRIDE - { - return new wxAsyncMethodCallEventFunctor(*this); - } - - virtual void Execute() wxOVERRIDE - { - m_fn(); - } - -private: - FunctorType m_fn; -}; - -#endif // wxHAS_CALL_AFTER - - -#if wxUSE_GUI - - -// Item or menu event class -/* - wxEVT_BUTTON - wxEVT_CHECKBOX - wxEVT_CHOICE - wxEVT_LISTBOX - wxEVT_LISTBOX_DCLICK - wxEVT_TEXT - wxEVT_TEXT_ENTER - wxEVT_MENU - wxEVT_SLIDER - wxEVT_RADIOBOX - wxEVT_RADIOBUTTON - wxEVT_SCROLLBAR - wxEVT_VLBOX - wxEVT_COMBOBOX - wxEVT_TOGGLEBUTTON -*/ - -class WXDLLIMPEXP_CORE wxCommandEvent : public wxEvent, - public wxEventBasicPayloadMixin -{ -public: - wxCommandEvent(wxEventType commandType = wxEVT_NULL, int winid = 0) - : wxEvent(winid, commandType) - { - m_clientData = NULL; - m_clientObject = NULL; - m_isCommandEvent = true; - - // the command events are propagated upwards by default - m_propagationLevel = wxEVENT_PROPAGATE_MAX; - } - - wxCommandEvent(const wxCommandEvent& event) - : wxEvent(event), - wxEventBasicPayloadMixin(event), - m_clientData(event.m_clientData), - m_clientObject(event.m_clientObject) - { - // Because GetString() can retrieve the string text only on demand, we - // need to copy it explicitly. - if ( m_cmdString.empty() ) - m_cmdString = event.GetString(); - } - - // Set/Get client data from controls - void SetClientData(void* clientData) { m_clientData = clientData; } - void *GetClientData() const { return m_clientData; } - - // Set/Get client object from controls - void SetClientObject(wxClientData* clientObject) { m_clientObject = clientObject; } - wxClientData *GetClientObject() const { return m_clientObject; } - - // Note: this shadows wxEventBasicPayloadMixin::GetString(), because it does some - // GUI-specific hacks - wxString GetString() const; - - // Get listbox selection if single-choice - int GetSelection() const { return m_commandInt; } - - // Get checkbox value - bool IsChecked() const { return m_commandInt != 0; } - - // true if the listbox event was a selection. - bool IsSelection() const { return (m_extraLong != 0); } - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxCommandEvent(*this); } - virtual wxEventCategory GetEventCategory() const wxOVERRIDE { return wxEVT_CATEGORY_USER_INPUT; } - -protected: - void* m_clientData; // Arbitrary client data - wxClientData* m_clientObject; // Arbitrary client object - -private: - - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxCommandEvent); -}; - -// this class adds a possibility to react (from the user) code to a control -// notification: allow or veto the operation being reported. -class WXDLLIMPEXP_CORE wxNotifyEvent : public wxCommandEvent -{ -public: - wxNotifyEvent(wxEventType commandType = wxEVT_NULL, int winid = 0) - : wxCommandEvent(commandType, winid) - { m_bAllow = true; } - - wxNotifyEvent(const wxNotifyEvent& event) - : wxCommandEvent(event) - { m_bAllow = event.m_bAllow; } - - // veto the operation (usually it's allowed by default) - void Veto() { m_bAllow = false; } - - // allow the operation if it was disabled by default - void Allow() { m_bAllow = true; } - - // for implementation code only: is the operation allowed? - bool IsAllowed() const { return m_bAllow; } - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxNotifyEvent(*this); } - -private: - bool m_bAllow; - -private: - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxNotifyEvent); -}; - - -// Scroll event class, derived form wxCommandEvent. wxScrollEvents are -// sent by wxSlider and wxScrollBar. -/* - wxEVT_SCROLL_TOP - wxEVT_SCROLL_BOTTOM - wxEVT_SCROLL_LINEUP - wxEVT_SCROLL_LINEDOWN - wxEVT_SCROLL_PAGEUP - wxEVT_SCROLL_PAGEDOWN - wxEVT_SCROLL_THUMBTRACK - wxEVT_SCROLL_THUMBRELEASE - wxEVT_SCROLL_CHANGED -*/ - -class WXDLLIMPEXP_CORE wxScrollEvent : public wxCommandEvent -{ -public: - wxScrollEvent(wxEventType commandType = wxEVT_NULL, - int winid = 0, int pos = 0, int orient = 0); - - int GetOrientation() const { return (int) m_extraLong; } - int GetPosition() const { return m_commandInt; } - void SetOrientation(int orient) { m_extraLong = (long) orient; } - void SetPosition(int pos) { m_commandInt = pos; } - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxScrollEvent(*this); } - -private: - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxScrollEvent); -}; - -// ScrollWin event class, derived fom wxEvent. wxScrollWinEvents -// are sent by wxWindow. -/* - wxEVT_SCROLLWIN_TOP - wxEVT_SCROLLWIN_BOTTOM - wxEVT_SCROLLWIN_LINEUP - wxEVT_SCROLLWIN_LINEDOWN - wxEVT_SCROLLWIN_PAGEUP - wxEVT_SCROLLWIN_PAGEDOWN - wxEVT_SCROLLWIN_THUMBTRACK - wxEVT_SCROLLWIN_THUMBRELEASE -*/ - -class WXDLLIMPEXP_CORE wxScrollWinEvent : public wxEvent -{ -public: - wxScrollWinEvent(wxEventType commandType = wxEVT_NULL, - int pos = 0, int orient = 0); - wxScrollWinEvent(const wxScrollWinEvent& event) : wxEvent(event) - { m_commandInt = event.m_commandInt; - m_extraLong = event.m_extraLong; } - - int GetOrientation() const { return (int) m_extraLong; } - int GetPosition() const { return m_commandInt; } - void SetOrientation(int orient) { m_extraLong = (long) orient; } - void SetPosition(int pos) { m_commandInt = pos; } - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxScrollWinEvent(*this); } - -protected: - int m_commandInt; - long m_extraLong; - -private: - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxScrollWinEvent); -}; - - - -// Mouse event class - -/* - wxEVT_LEFT_DOWN - wxEVT_LEFT_UP - wxEVT_MIDDLE_DOWN - wxEVT_MIDDLE_UP - wxEVT_RIGHT_DOWN - wxEVT_RIGHT_UP - wxEVT_MOTION - wxEVT_ENTER_WINDOW - wxEVT_LEAVE_WINDOW - wxEVT_LEFT_DCLICK - wxEVT_MIDDLE_DCLICK - wxEVT_RIGHT_DCLICK -*/ - -enum wxMouseWheelAxis -{ - wxMOUSE_WHEEL_VERTICAL, - wxMOUSE_WHEEL_HORIZONTAL -}; - -class WXDLLIMPEXP_CORE wxMouseEvent : public wxEvent, - public wxMouseState -{ -public: - wxMouseEvent(wxEventType mouseType = wxEVT_NULL); - wxMouseEvent(const wxMouseEvent& event) - : wxEvent(event), - wxMouseState(event) - { - Assign(event); - } - - // Was it a button event? (*doesn't* mean: is any button *down*?) - bool IsButton() const { return Button(wxMOUSE_BTN_ANY); } - - // Was it a down event from this (or any) button? - bool ButtonDown(int but = wxMOUSE_BTN_ANY) const; - - // Was it a dclick event from this (or any) button? - bool ButtonDClick(int but = wxMOUSE_BTN_ANY) const; - - // Was it a up event from this (or any) button? - bool ButtonUp(int but = wxMOUSE_BTN_ANY) const; - - // Was this event generated by the given button? - bool Button(int but) const; - - // Get the button which is changing state (wxMOUSE_BTN_NONE if none) - int GetButton() const; - - // Find which event was just generated - bool LeftDown() const { return (m_eventType == wxEVT_LEFT_DOWN); } - bool MiddleDown() const { return (m_eventType == wxEVT_MIDDLE_DOWN); } - bool RightDown() const { return (m_eventType == wxEVT_RIGHT_DOWN); } - bool Aux1Down() const { return (m_eventType == wxEVT_AUX1_DOWN); } - bool Aux2Down() const { return (m_eventType == wxEVT_AUX2_DOWN); } - - bool LeftUp() const { return (m_eventType == wxEVT_LEFT_UP); } - bool MiddleUp() const { return (m_eventType == wxEVT_MIDDLE_UP); } - bool RightUp() const { return (m_eventType == wxEVT_RIGHT_UP); } - bool Aux1Up() const { return (m_eventType == wxEVT_AUX1_UP); } - bool Aux2Up() const { return (m_eventType == wxEVT_AUX2_UP); } - - bool LeftDClick() const { return (m_eventType == wxEVT_LEFT_DCLICK); } - bool MiddleDClick() const { return (m_eventType == wxEVT_MIDDLE_DCLICK); } - bool RightDClick() const { return (m_eventType == wxEVT_RIGHT_DCLICK); } - bool Aux1DClick() const { return (m_eventType == wxEVT_AUX1_DCLICK); } - bool Aux2DClick() const { return (m_eventType == wxEVT_AUX2_DCLICK); } - - bool Magnify() const { return (m_eventType == wxEVT_MAGNIFY); } - - // True if a button is down and the mouse is moving - bool Dragging() const - { - return (m_eventType == wxEVT_MOTION) && ButtonIsDown(wxMOUSE_BTN_ANY); - } - - // True if the mouse is moving, and no button is down - bool Moving() const - { - return (m_eventType == wxEVT_MOTION) && !ButtonIsDown(wxMOUSE_BTN_ANY); - } - - // True if the mouse is just entering the window - bool Entering() const { return (m_eventType == wxEVT_ENTER_WINDOW); } - - // True if the mouse is just leaving the window - bool Leaving() const { return (m_eventType == wxEVT_LEAVE_WINDOW); } - - // Returns the number of mouse clicks associated with this event. - int GetClickCount() const { return m_clickCount; } - - // Find the logical position of the event given the DC - wxPoint GetLogicalPosition(const wxDC& dc) const; - - // Get wheel rotation, positive or negative indicates direction of - // rotation. Current devices all send an event when rotation is equal to - // +/-WheelDelta, but this allows for finer resolution devices to be - // created in the future. Because of this you shouldn't assume that one - // event is equal to 1 line or whatever, but you should be able to either - // do partial line scrolling or wait until +/-WheelDelta rotation values - // have been accumulated before scrolling. - int GetWheelRotation() const { return m_wheelRotation; } - - // Get wheel delta, normally 120. This is the threshold for action to be - // taken, and one such action (for example, scrolling one increment) - // should occur for each delta. - int GetWheelDelta() const { return m_wheelDelta; } - - // Gets the axis the wheel operation concerns; wxMOUSE_WHEEL_VERTICAL - // (most common case) or wxMOUSE_WHEEL_HORIZONTAL (for horizontal scrolling - // using e.g. a trackpad). - wxMouseWheelAxis GetWheelAxis() const { return m_wheelAxis; } - - // Returns the configured number of lines (or whatever) to be scrolled per - // wheel action. Defaults to three. - int GetLinesPerAction() const { return m_linesPerAction; } - - // Returns the configured number of columns (or whatever) to be scrolled per - // wheel action. Defaults to three. - int GetColumnsPerAction() const { return m_columnsPerAction; } - - // Is the system set to do page scrolling? - bool IsPageScroll() const { return ((unsigned int)m_linesPerAction == UINT_MAX); } - - float GetMagnification() const { return m_magnification; } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxMouseEvent(*this); } - virtual wxEventCategory GetEventCategory() const wxOVERRIDE { return wxEVT_CATEGORY_USER_INPUT; } - - wxMouseEvent& operator=(const wxMouseEvent& event) - { - if (&event != this) - Assign(event); - return *this; - } - -public: - int m_clickCount; - - wxMouseWheelAxis m_wheelAxis; - int m_wheelRotation; - int m_wheelDelta; - int m_linesPerAction; - int m_columnsPerAction; - float m_magnification; - -protected: - void Assign(const wxMouseEvent& evt); - -private: - wxDECLARE_DYNAMIC_CLASS(wxMouseEvent); -}; - -// Cursor set event - -/* - wxEVT_SET_CURSOR - */ - -class WXDLLIMPEXP_CORE wxSetCursorEvent : public wxEvent -{ -public: - wxSetCursorEvent(wxCoord x = 0, wxCoord y = 0) - : wxEvent(0, wxEVT_SET_CURSOR), - m_x(x), m_y(y), m_cursor() - { } - - wxSetCursorEvent(const wxSetCursorEvent& event) - : wxEvent(event), - m_x(event.m_x), - m_y(event.m_y), - m_cursor(event.m_cursor) - { } - - wxCoord GetX() const { return m_x; } - wxCoord GetY() const { return m_y; } - - void SetCursor(const wxCursor& cursor) { m_cursor = cursor; } - const wxCursor& GetCursor() const { return m_cursor; } - bool HasCursor() const { return m_cursor.IsOk(); } - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxSetCursorEvent(*this); } - -private: - wxCoord m_x, m_y; - wxCursor m_cursor; - -private: - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxSetCursorEvent); -}; - -// Keyboard input event class - -/* - wxEVT_CHAR - wxEVT_CHAR_HOOK - wxEVT_KEY_DOWN - wxEVT_KEY_UP - wxEVT_HOTKEY - */ - -// key categories: the bit flags for IsKeyInCategory() function -// -// the enum values used may change in future version of wx -// use the named constants only, or bitwise combinations thereof -enum wxKeyCategoryFlags -{ - // arrow keys, on and off numeric keypads - WXK_CATEGORY_ARROW = 1, - - // page up and page down keys, on and off numeric keypads - WXK_CATEGORY_PAGING = 2, - - // home and end keys, on and off numeric keypads - WXK_CATEGORY_JUMP = 4, - - // tab key, on and off numeric keypads - WXK_CATEGORY_TAB = 8, - - // backspace and delete keys, on and off numeric keypads - WXK_CATEGORY_CUT = 16, - - // all keys usually used for navigation - WXK_CATEGORY_NAVIGATION = WXK_CATEGORY_ARROW | - WXK_CATEGORY_PAGING | - WXK_CATEGORY_JUMP -}; - -class WXDLLIMPEXP_CORE wxKeyEvent : public wxEvent, - public wxKeyboardState -{ -public: - wxKeyEvent(wxEventType keyType = wxEVT_NULL); - - // Normal copy ctor and a ctor creating a new event for the same key as the - // given one but a different event type (this is used in implementation - // code only, do not use outside of the library). - wxKeyEvent(const wxKeyEvent& evt); - wxKeyEvent(wxEventType eventType, const wxKeyEvent& evt); - - // get the key code: an ASCII7 char or an element of wxKeyCode enum - int GetKeyCode() const { return (int)m_keyCode; } - - // returns true iff this event's key code is of a certain type - bool IsKeyInCategory(int category) const; - -#if wxUSE_UNICODE - // get the Unicode character corresponding to this key - wxChar GetUnicodeKey() const { return m_uniChar; } -#endif // wxUSE_UNICODE - - // get the raw key code (platform-dependent) - wxUint32 GetRawKeyCode() const { return m_rawCode; } - - // get the raw key flags (platform-dependent) - wxUint32 GetRawKeyFlags() const { return m_rawFlags; } - - // Find the position of the event - void GetPosition(wxCoord *xpos, wxCoord *ypos) const - { - if (xpos) - *xpos = GetX(); - if (ypos) - *ypos = GetY(); - } - - // This version if provided only for backwards compatiblity, don't use. - void GetPosition(long *xpos, long *ypos) const - { - if (xpos) - *xpos = GetX(); - if (ypos) - *ypos = GetY(); - } - - wxPoint GetPosition() const - { return wxPoint(GetX(), GetY()); } - - // Get X position - wxCoord GetX() const; - - // Get Y position - wxCoord GetY() const; - - // Can be called from wxEVT_CHAR_HOOK handler to allow generation of normal - // key events even though the event had been handled (by default they would - // not be generated in this case). - void DoAllowNextEvent() { m_allowNext = true; } - - // Return the value of the "allow next" flag, for internal use only. - bool IsNextEventAllowed() const { return m_allowNext; } - - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxKeyEvent(*this); } - virtual wxEventCategory GetEventCategory() const wxOVERRIDE { return wxEVT_CATEGORY_USER_INPUT; } - - // we do need to copy wxKeyEvent sometimes (in wxTreeCtrl code, for - // example) - wxKeyEvent& operator=(const wxKeyEvent& evt) - { - if ( &evt != this ) - { - wxEvent::operator=(evt); - - // Borland C++ 5.82 doesn't compile an explicit call to an - // implicitly defined operator=() so need to do it this way: - *static_cast(this) = evt; - - DoAssignMembers(evt); - } - return *this; - } - -public: - // Do not use these fields directly, they are initialized on demand, so - // call GetX() and GetY() or GetPosition() instead. - wxCoord m_x, m_y; - - long m_keyCode; - -#if wxUSE_UNICODE - // This contains the full Unicode character - // in a character events in Unicode mode - wxChar m_uniChar; -#endif - - // these fields contain the platform-specific information about - // key that was pressed - wxUint32 m_rawCode; - wxUint32 m_rawFlags; - -private: - // Set the event to propagate if necessary, i.e. if it's of wxEVT_CHAR_HOOK - // type. This is used by all ctors. - void InitPropagation() - { - if ( m_eventType == wxEVT_CHAR_HOOK ) - m_propagationLevel = wxEVENT_PROPAGATE_MAX; - - m_allowNext = false; - } - - // Copy only the event data present in this class, this is used by - // AssignKeyData() and copy ctor. - void DoAssignMembers(const wxKeyEvent& evt) - { - m_x = evt.m_x; - m_y = evt.m_y; - m_hasPosition = evt.m_hasPosition; - - m_keyCode = evt.m_keyCode; - - m_rawCode = evt.m_rawCode; - m_rawFlags = evt.m_rawFlags; -#if wxUSE_UNICODE - m_uniChar = evt.m_uniChar; -#endif - } - - // Initialize m_x and m_y using the current mouse cursor position if - // necessary. - void InitPositionIfNecessary() const; - - // If this flag is true, the normal key events should still be generated - // even if wxEVT_CHAR_HOOK had been handled. By default it is false as - // handling wxEVT_CHAR_HOOK suppresses all the subsequent events. - bool m_allowNext; - - // If true, m_x and m_y were already initialized. If false, try to get them - // when they're requested. - bool m_hasPosition; - - wxDECLARE_DYNAMIC_CLASS(wxKeyEvent); -}; - -// Size event class -/* - wxEVT_SIZE - */ - -class WXDLLIMPEXP_CORE wxSizeEvent : public wxEvent -{ -public: - wxSizeEvent() : wxEvent(0, wxEVT_SIZE) - { } - wxSizeEvent(const wxSize& sz, int winid = 0) - : wxEvent(winid, wxEVT_SIZE), - m_size(sz) - { } - wxSizeEvent(const wxSizeEvent& event) - : wxEvent(event), - m_size(event.m_size), m_rect(event.m_rect) - { } - wxSizeEvent(const wxRect& rect, int id = 0) - : m_size(rect.GetSize()), m_rect(rect) - { m_eventType = wxEVT_SIZING; m_id = id; } - - wxSize GetSize() const { return m_size; } - void SetSize(wxSize size) { m_size = size; } - wxRect GetRect() const { return m_rect; } - void SetRect(const wxRect& rect) { m_rect = rect; } - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxSizeEvent(*this); } - -public: - // For internal usage only. Will be converted to protected members. - wxSize m_size; - wxRect m_rect; // Used for wxEVT_SIZING - -private: - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxSizeEvent); -}; - -// Move event class - -/* - wxEVT_MOVE - */ - -class WXDLLIMPEXP_CORE wxMoveEvent : public wxEvent -{ -public: - wxMoveEvent() - : wxEvent(0, wxEVT_MOVE) - { } - wxMoveEvent(const wxPoint& pos, int winid = 0) - : wxEvent(winid, wxEVT_MOVE), - m_pos(pos) - { } - wxMoveEvent(const wxMoveEvent& event) - : wxEvent(event), - m_pos(event.m_pos) - { } - wxMoveEvent(const wxRect& rect, int id = 0) - : m_pos(rect.GetPosition()), m_rect(rect) - { m_eventType = wxEVT_MOVING; m_id = id; } - - wxPoint GetPosition() const { return m_pos; } - void SetPosition(const wxPoint& pos) { m_pos = pos; } - wxRect GetRect() const { return m_rect; } - void SetRect(const wxRect& rect) { m_rect = rect; } - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxMoveEvent(*this); } - -protected: - wxPoint m_pos; - wxRect m_rect; - -private: - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxMoveEvent); -}; - -// Paint event class -/* - wxEVT_PAINT - wxEVT_NC_PAINT - */ - -#if wxDEBUG_LEVEL && defined(__WXMSW__) - #define wxHAS_PAINT_DEBUG - - // see comments in src/msw/dcclient.cpp where g_isPainting is defined - extern WXDLLIMPEXP_CORE int g_isPainting; -#endif // debug - -class WXDLLIMPEXP_CORE wxPaintEvent : public wxEvent -{ -public: - wxPaintEvent(int Id = 0) - : wxEvent(Id, wxEVT_PAINT) - { -#ifdef wxHAS_PAINT_DEBUG - // set the internal flag for the duration of redrawing - g_isPainting++; -#endif // debug - } - - // default copy ctor and dtor are normally fine, we only need them to keep - // g_isPainting updated in debug build -#ifdef wxHAS_PAINT_DEBUG - wxPaintEvent(const wxPaintEvent& event) - : wxEvent(event) - { - g_isPainting++; - } - - virtual ~wxPaintEvent() - { - g_isPainting--; - } -#endif // debug - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxPaintEvent(*this); } - -private: - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxPaintEvent); -}; - -class WXDLLIMPEXP_CORE wxNcPaintEvent : public wxEvent -{ -public: - wxNcPaintEvent(int winid = 0) - : wxEvent(winid, wxEVT_NC_PAINT) - { } - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxNcPaintEvent(*this); } - -private: - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxNcPaintEvent); -}; - -// Erase background event class -/* - wxEVT_ERASE_BACKGROUND - */ - -class WXDLLIMPEXP_CORE wxEraseEvent : public wxEvent -{ -public: - wxEraseEvent(int Id = 0, wxDC *dc = NULL) - : wxEvent(Id, wxEVT_ERASE_BACKGROUND), - m_dc(dc) - { } - - wxEraseEvent(const wxEraseEvent& event) - : wxEvent(event), - m_dc(event.m_dc) - { } - - wxDC *GetDC() const { return m_dc; } - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxEraseEvent(*this); } - -protected: - wxDC *m_dc; - -private: - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxEraseEvent); -}; - -// Focus event class -/* - wxEVT_SET_FOCUS - wxEVT_KILL_FOCUS - */ - -class WXDLLIMPEXP_CORE wxFocusEvent : public wxEvent -{ -public: - wxFocusEvent(wxEventType type = wxEVT_NULL, int winid = 0) - : wxEvent(winid, type) - { m_win = NULL; } - - wxFocusEvent(const wxFocusEvent& event) - : wxEvent(event) - { m_win = event.m_win; } - - // The window associated with this event is the window which had focus - // before for SET event and the window which will have focus for the KILL - // one. NB: it may be NULL in both cases! - wxWindow *GetWindow() const { return m_win; } - void SetWindow(wxWindow *win) { m_win = win; } - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxFocusEvent(*this); } - -private: - wxWindow *m_win; - -private: - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxFocusEvent); -}; - -// wxChildFocusEvent notifies the parent that a child has got the focus: unlike -// wxFocusEvent it is propagated upwards the window chain -class WXDLLIMPEXP_CORE wxChildFocusEvent : public wxCommandEvent -{ -public: - wxChildFocusEvent(wxWindow *win = NULL); - - wxWindow *GetWindow() const { return (wxWindow *)GetEventObject(); } - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxChildFocusEvent(*this); } - -private: - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxChildFocusEvent); -}; - -// Activate event class -/* - wxEVT_ACTIVATE - wxEVT_ACTIVATE_APP - wxEVT_HIBERNATE - */ - -class WXDLLIMPEXP_CORE wxActivateEvent : public wxEvent -{ -public: - // Type of activation. For now we can only detect if it was by mouse or by - // some other method and even this is only available under wxMSW. - enum Reason - { - Reason_Mouse, - Reason_Unknown - }; - - wxActivateEvent(wxEventType type = wxEVT_NULL, bool active = true, - int Id = 0, Reason activationReason = Reason_Unknown) - : wxEvent(Id, type), - m_activationReason(activationReason) - { - m_active = active; - } - wxActivateEvent(const wxActivateEvent& event) - : wxEvent(event) - { - m_active = event.m_active; - m_activationReason = event.m_activationReason; - } - - bool GetActive() const { return m_active; } - Reason GetActivationReason() const { return m_activationReason;} - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxActivateEvent(*this); } - -private: - bool m_active; - Reason m_activationReason; - -private: - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxActivateEvent); -}; - -// InitDialog event class -/* - wxEVT_INIT_DIALOG - */ - -class WXDLLIMPEXP_CORE wxInitDialogEvent : public wxEvent -{ -public: - wxInitDialogEvent(int Id = 0) - : wxEvent(Id, wxEVT_INIT_DIALOG) - { } - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxInitDialogEvent(*this); } - -private: - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxInitDialogEvent); -}; - -// Miscellaneous menu event class -/* - wxEVT_MENU_OPEN, - wxEVT_MENU_CLOSE, - wxEVT_MENU_HIGHLIGHT, -*/ - -class WXDLLIMPEXP_CORE wxMenuEvent : public wxEvent -{ -public: - wxMenuEvent(wxEventType type = wxEVT_NULL, int winid = 0, wxMenu* menu = NULL) - : wxEvent(winid, type) - { m_menuId = winid; m_menu = menu; } - wxMenuEvent(const wxMenuEvent& event) - : wxEvent(event) - { m_menuId = event.m_menuId; m_menu = event.m_menu; } - - // only for wxEVT_MENU_HIGHLIGHT - int GetMenuId() const { return m_menuId; } - - // only for wxEVT_MENU_OPEN/CLOSE - bool IsPopup() const { return m_menuId == wxID_ANY; } - - // only for wxEVT_MENU_OPEN/CLOSE - wxMenu* GetMenu() const { return m_menu; } - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxMenuEvent(*this); } - -private: - int m_menuId; - wxMenu* m_menu; - - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxMenuEvent); -}; - -// Window close or session close event class -/* - wxEVT_CLOSE_WINDOW, - wxEVT_END_SESSION, - wxEVT_QUERY_END_SESSION - */ - -class WXDLLIMPEXP_CORE wxCloseEvent : public wxEvent -{ -public: - wxCloseEvent(wxEventType type = wxEVT_NULL, int winid = 0) - : wxEvent(winid, type), - m_loggingOff(true), - m_veto(false), // should be false by default - m_canVeto(true) {} - - wxCloseEvent(const wxCloseEvent& event) - : wxEvent(event), - m_loggingOff(event.m_loggingOff), - m_veto(event.m_veto), - m_canVeto(event.m_canVeto) {} - - void SetLoggingOff(bool logOff) { m_loggingOff = logOff; } - bool GetLoggingOff() const - { - // m_loggingOff flag is only used by wxEVT_[QUERY_]END_SESSION, it - // doesn't make sense for wxEVT_CLOSE_WINDOW - wxASSERT_MSG( m_eventType != wxEVT_CLOSE_WINDOW, - wxT("this flag is for end session events only") ); - - return m_loggingOff; - } - - void Veto(bool veto = true) - { - // GetVeto() will return false anyhow... - wxCHECK_RET( m_canVeto, - wxT("call to Veto() ignored (can't veto this event)") ); - - m_veto = veto; - } - void SetCanVeto(bool canVeto) { m_canVeto = canVeto; } - bool CanVeto() const { return m_canVeto; } - bool GetVeto() const { return m_canVeto && m_veto; } - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxCloseEvent(*this); } - -protected: - bool m_loggingOff, - m_veto, - m_canVeto; - -private: - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxCloseEvent); -}; - -/* - wxEVT_SHOW - */ - -class WXDLLIMPEXP_CORE wxShowEvent : public wxEvent -{ -public: - wxShowEvent(int winid = 0, bool show = false) - : wxEvent(winid, wxEVT_SHOW) - { m_show = show; } - wxShowEvent(const wxShowEvent& event) - : wxEvent(event) - { m_show = event.m_show; } - - void SetShow(bool show) { m_show = show; } - - // return true if the window was shown, false if hidden - bool IsShown() const { return m_show; } - -#if WXWIN_COMPATIBILITY_2_8 - wxDEPRECATED( bool GetShow() const { return IsShown(); } ) -#endif - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxShowEvent(*this); } - -protected: - bool m_show; - -private: - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxShowEvent); -}; - -/* - wxEVT_ICONIZE - */ - -class WXDLLIMPEXP_CORE wxIconizeEvent : public wxEvent -{ -public: - wxIconizeEvent(int winid = 0, bool iconized = true) - : wxEvent(winid, wxEVT_ICONIZE) - { m_iconized = iconized; } - wxIconizeEvent(const wxIconizeEvent& event) - : wxEvent(event) - { m_iconized = event.m_iconized; } - -#if WXWIN_COMPATIBILITY_2_8 - wxDEPRECATED( bool Iconized() const { return IsIconized(); } ) -#endif - // return true if the frame was iconized, false if restored - bool IsIconized() const { return m_iconized; } - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxIconizeEvent(*this); } - -protected: - bool m_iconized; - -private: - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxIconizeEvent); -}; -/* - wxEVT_MAXIMIZE - */ - -class WXDLLIMPEXP_CORE wxMaximizeEvent : public wxEvent -{ -public: - wxMaximizeEvent(int winid = 0) - : wxEvent(winid, wxEVT_MAXIMIZE) - { } - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxMaximizeEvent(*this); } - -private: - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxMaximizeEvent); -}; - -// Joystick event class -/* - wxEVT_JOY_BUTTON_DOWN, - wxEVT_JOY_BUTTON_UP, - wxEVT_JOY_MOVE, - wxEVT_JOY_ZMOVE -*/ - -// Which joystick? Same as Windows ids so no conversion necessary. -enum -{ - wxJOYSTICK1, - wxJOYSTICK2 -}; - -// Which button is down? -enum -{ - wxJOY_BUTTON_ANY = -1, - wxJOY_BUTTON1 = 1, - wxJOY_BUTTON2 = 2, - wxJOY_BUTTON3 = 4, - wxJOY_BUTTON4 = 8 -}; - -class WXDLLIMPEXP_CORE wxJoystickEvent : public wxEvent -{ -protected: - wxPoint m_pos; - int m_zPosition; - int m_buttonChange; // Which button changed? - int m_buttonState; // Which buttons are down? - int m_joyStick; // Which joystick? - -public: - wxJoystickEvent(wxEventType type = wxEVT_NULL, - int state = 0, - int joystick = wxJOYSTICK1, - int change = 0) - : wxEvent(0, type), - m_pos(), - m_zPosition(0), - m_buttonChange(change), - m_buttonState(state), - m_joyStick(joystick) - { - } - wxJoystickEvent(const wxJoystickEvent& event) - : wxEvent(event), - m_pos(event.m_pos), - m_zPosition(event.m_zPosition), - m_buttonChange(event.m_buttonChange), - m_buttonState(event.m_buttonState), - m_joyStick(event.m_joyStick) - { } - - wxPoint GetPosition() const { return m_pos; } - int GetZPosition() const { return m_zPosition; } - int GetButtonState() const { return m_buttonState; } - int GetButtonChange() const { return m_buttonChange; } - int GetJoystick() const { return m_joyStick; } - - void SetJoystick(int stick) { m_joyStick = stick; } - void SetButtonState(int state) { m_buttonState = state; } - void SetButtonChange(int change) { m_buttonChange = change; } - void SetPosition(const wxPoint& pos) { m_pos = pos; } - void SetZPosition(int zPos) { m_zPosition = zPos; } - - // Was it a button event? (*doesn't* mean: is any button *down*?) - bool IsButton() const { return ((GetEventType() == wxEVT_JOY_BUTTON_DOWN) || - (GetEventType() == wxEVT_JOY_BUTTON_UP)); } - - // Was it a move event? - bool IsMove() const { return (GetEventType() == wxEVT_JOY_MOVE); } - - // Was it a zmove event? - bool IsZMove() const { return (GetEventType() == wxEVT_JOY_ZMOVE); } - - // Was it a down event from button 1, 2, 3, 4 or any? - bool ButtonDown(int but = wxJOY_BUTTON_ANY) const - { return ((GetEventType() == wxEVT_JOY_BUTTON_DOWN) && - ((but == wxJOY_BUTTON_ANY) || (but == m_buttonChange))); } - - // Was it a up event from button 1, 2, 3 or any? - bool ButtonUp(int but = wxJOY_BUTTON_ANY) const - { return ((GetEventType() == wxEVT_JOY_BUTTON_UP) && - ((but == wxJOY_BUTTON_ANY) || (but == m_buttonChange))); } - - // Was the given button 1,2,3,4 or any in Down state? - bool ButtonIsDown(int but = wxJOY_BUTTON_ANY) const - { return (((but == wxJOY_BUTTON_ANY) && (m_buttonState != 0)) || - ((m_buttonState & but) == but)); } - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxJoystickEvent(*this); } - -private: - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxJoystickEvent); -}; - -// Drop files event class -/* - wxEVT_DROP_FILES - */ - -class WXDLLIMPEXP_CORE wxDropFilesEvent : public wxEvent -{ -public: - int m_noFiles; - wxPoint m_pos; - wxString* m_files; - - wxDropFilesEvent(wxEventType type = wxEVT_NULL, - int noFiles = 0, - wxString *files = NULL) - : wxEvent(0, type), - m_noFiles(noFiles), - m_pos(), - m_files(files) - { } - - // we need a copy ctor to avoid deleting m_files pointer twice - wxDropFilesEvent(const wxDropFilesEvent& other) - : wxEvent(other), - m_noFiles(other.m_noFiles), - m_pos(other.m_pos), - m_files(NULL) - { - m_files = new wxString[m_noFiles]; - for ( int n = 0; n < m_noFiles; n++ ) - { - m_files[n] = other.m_files[n]; - } - } - - virtual ~wxDropFilesEvent() - { - delete [] m_files; - } - - wxPoint GetPosition() const { return m_pos; } - int GetNumberOfFiles() const { return m_noFiles; } - wxString *GetFiles() const { return m_files; } - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxDropFilesEvent(*this); } - -private: - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxDropFilesEvent); -}; - -// Update UI event -/* - wxEVT_UPDATE_UI - */ - -// Whether to always send update events to windows, or -// to only send update events to those with the -// wxWS_EX_PROCESS_UI_UPDATES style. - -enum wxUpdateUIMode -{ - // Send UI update events to all windows - wxUPDATE_UI_PROCESS_ALL, - - // Send UI update events to windows that have - // the wxWS_EX_PROCESS_UI_UPDATES flag specified - wxUPDATE_UI_PROCESS_SPECIFIED -}; - -class WXDLLIMPEXP_CORE wxUpdateUIEvent : public wxCommandEvent -{ -public: - wxUpdateUIEvent(wxWindowID commandId = 0) - : wxCommandEvent(wxEVT_UPDATE_UI, commandId) - { - m_checked = - m_enabled = - m_shown = - m_setEnabled = - m_setShown = - m_setText = - m_setChecked = false; - } - wxUpdateUIEvent(const wxUpdateUIEvent& event) - : wxCommandEvent(event), - m_checked(event.m_checked), - m_enabled(event.m_enabled), - m_shown(event.m_shown), - m_setEnabled(event.m_setEnabled), - m_setShown(event.m_setShown), - m_setText(event.m_setText), - m_setChecked(event.m_setChecked), - m_text(event.m_text) - { } - - bool GetChecked() const { return m_checked; } - bool GetEnabled() const { return m_enabled; } - bool GetShown() const { return m_shown; } - wxString GetText() const { return m_text; } - bool GetSetText() const { return m_setText; } - bool GetSetChecked() const { return m_setChecked; } - bool GetSetEnabled() const { return m_setEnabled; } - bool GetSetShown() const { return m_setShown; } - - void Check(bool check) { m_checked = check; m_setChecked = true; } - void Enable(bool enable) { m_enabled = enable; m_setEnabled = true; } - void Show(bool show) { m_shown = show; m_setShown = true; } - void SetText(const wxString& text) { m_text = text; m_setText = true; } - - // Sets the interval between updates in milliseconds. - // Set to -1 to disable updates, or to 0 to update as frequently as possible. - static void SetUpdateInterval(long updateInterval) { sm_updateInterval = updateInterval; } - - // Returns the current interval between updates in milliseconds - static long GetUpdateInterval() { return sm_updateInterval; } - - // Can we update this window? - static bool CanUpdate(wxWindowBase *win); - - // Reset the update time to provide a delay until the next - // time we should update - static void ResetUpdateTime(); - - // Specify how wxWidgets will send update events: to - // all windows, or only to those which specify that they - // will process the events. - static void SetMode(wxUpdateUIMode mode) { sm_updateMode = mode; } - - // Returns the UI update mode - static wxUpdateUIMode GetMode() { return sm_updateMode; } - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxUpdateUIEvent(*this); } - -protected: - bool m_checked; - bool m_enabled; - bool m_shown; - bool m_setEnabled; - bool m_setShown; - bool m_setText; - bool m_setChecked; - wxString m_text; -#if wxUSE_LONGLONG - static wxLongLong sm_lastUpdate; -#endif - static long sm_updateInterval; - static wxUpdateUIMode sm_updateMode; - -private: - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxUpdateUIEvent); -}; - -/* - wxEVT_SYS_COLOUR_CHANGED - */ - -// TODO: shouldn't all events record the window ID? -class WXDLLIMPEXP_CORE wxSysColourChangedEvent : public wxEvent -{ -public: - wxSysColourChangedEvent() - : wxEvent(0, wxEVT_SYS_COLOUR_CHANGED) - { } - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxSysColourChangedEvent(*this); } - -private: - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxSysColourChangedEvent); -}; - -/* - wxEVT_MOUSE_CAPTURE_CHANGED - The window losing the capture receives this message - (even if it released the capture itself). - */ - -class WXDLLIMPEXP_CORE wxMouseCaptureChangedEvent : public wxEvent -{ -public: - wxMouseCaptureChangedEvent(wxWindowID winid = 0, wxWindow* gainedCapture = NULL) - : wxEvent(winid, wxEVT_MOUSE_CAPTURE_CHANGED), - m_gainedCapture(gainedCapture) - { } - - wxMouseCaptureChangedEvent(const wxMouseCaptureChangedEvent& event) - : wxEvent(event), - m_gainedCapture(event.m_gainedCapture) - { } - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxMouseCaptureChangedEvent(*this); } - - wxWindow* GetCapturedWindow() const { return m_gainedCapture; } - -private: - wxWindow* m_gainedCapture; - - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxMouseCaptureChangedEvent); -}; - -/* - wxEVT_MOUSE_CAPTURE_LOST - The window losing the capture receives this message, unless it released it - it itself or unless wxWindow::CaptureMouse was called on another window - (and so capture will be restored when the new capturer releases it). - */ - -class WXDLLIMPEXP_CORE wxMouseCaptureLostEvent : public wxEvent -{ -public: - wxMouseCaptureLostEvent(wxWindowID winid = 0) - : wxEvent(winid, wxEVT_MOUSE_CAPTURE_LOST) - {} - - wxMouseCaptureLostEvent(const wxMouseCaptureLostEvent& event) - : wxEvent(event) - {} - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxMouseCaptureLostEvent(*this); } - - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxMouseCaptureLostEvent); -}; - -/* - wxEVT_DISPLAY_CHANGED - */ -class WXDLLIMPEXP_CORE wxDisplayChangedEvent : public wxEvent -{ -private: - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxDisplayChangedEvent); - -public: - wxDisplayChangedEvent() - : wxEvent(0, wxEVT_DISPLAY_CHANGED) - { } - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxDisplayChangedEvent(*this); } -}; - -/* - wxEVT_PALETTE_CHANGED - */ - -class WXDLLIMPEXP_CORE wxPaletteChangedEvent : public wxEvent -{ -public: - wxPaletteChangedEvent(wxWindowID winid = 0) - : wxEvent(winid, wxEVT_PALETTE_CHANGED), - m_changedWindow(NULL) - { } - - wxPaletteChangedEvent(const wxPaletteChangedEvent& event) - : wxEvent(event), - m_changedWindow(event.m_changedWindow) - { } - - void SetChangedWindow(wxWindow* win) { m_changedWindow = win; } - wxWindow* GetChangedWindow() const { return m_changedWindow; } - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxPaletteChangedEvent(*this); } - -protected: - wxWindow* m_changedWindow; - -private: - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxPaletteChangedEvent); -}; - -/* - wxEVT_QUERY_NEW_PALETTE - Indicates the window is getting keyboard focus and should re-do its palette. - */ - -class WXDLLIMPEXP_CORE wxQueryNewPaletteEvent : public wxEvent -{ -public: - wxQueryNewPaletteEvent(wxWindowID winid = 0) - : wxEvent(winid, wxEVT_QUERY_NEW_PALETTE), - m_paletteRealized(false) - { } - wxQueryNewPaletteEvent(const wxQueryNewPaletteEvent& event) - : wxEvent(event), - m_paletteRealized(event.m_paletteRealized) - { } - - // App sets this if it changes the palette. - void SetPaletteRealized(bool realized) { m_paletteRealized = realized; } - bool GetPaletteRealized() const { return m_paletteRealized; } - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxQueryNewPaletteEvent(*this); } - -protected: - bool m_paletteRealized; - -private: - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxQueryNewPaletteEvent); -}; - -/* - Event generated by dialog navigation keys - wxEVT_NAVIGATION_KEY - */ -// NB: don't derive from command event to avoid being propagated to the parent -class WXDLLIMPEXP_CORE wxNavigationKeyEvent : public wxEvent -{ -public: - wxNavigationKeyEvent() - : wxEvent(0, wxEVT_NAVIGATION_KEY), - m_flags(IsForward | FromTab), // defaults are for TAB - m_focus(NULL) - { - m_propagationLevel = wxEVENT_PROPAGATE_NONE; - } - - wxNavigationKeyEvent(const wxNavigationKeyEvent& event) - : wxEvent(event), - m_flags(event.m_flags), - m_focus(event.m_focus) - { } - - // direction: forward (true) or backward (false) - bool GetDirection() const - { return (m_flags & IsForward) != 0; } - void SetDirection(bool bForward) - { if ( bForward ) m_flags |= IsForward; else m_flags &= ~IsForward; } - - // it may be a window change event (MDI, notebook pages...) or a control - // change event - bool IsWindowChange() const - { return (m_flags & WinChange) != 0; } - void SetWindowChange(bool bIs) - { if ( bIs ) m_flags |= WinChange; else m_flags &= ~WinChange; } - - // Set to true under MSW if the event was generated using the tab key. - // This is required for proper navogation over radio buttons - bool IsFromTab() const - { return (m_flags & FromTab) != 0; } - void SetFromTab(bool bIs) - { if ( bIs ) m_flags |= FromTab; else m_flags &= ~FromTab; } - - // the child which has the focus currently (may be NULL - use - // wxWindow::FindFocus then) - wxWindow* GetCurrentFocus() const { return m_focus; } - void SetCurrentFocus(wxWindow *win) { m_focus = win; } - - // Set flags - void SetFlags(long flags) { m_flags = flags; } - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxNavigationKeyEvent(*this); } - - enum wxNavigationKeyEventFlags - { - IsBackward = 0x0000, - IsForward = 0x0001, - WinChange = 0x0002, - FromTab = 0x0004 - }; - - long m_flags; - wxWindow *m_focus; - -private: - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxNavigationKeyEvent); -}; - -// Window creation/destruction events: the first is sent as soon as window is -// created (i.e. the underlying GUI object exists), but when the C++ object is -// fully initialized (so virtual functions may be called). The second, -// wxEVT_DESTROY, is sent right before the window is destroyed - again, it's -// still safe to call virtual functions at this moment -/* - wxEVT_CREATE - wxEVT_DESTROY - */ - -class WXDLLIMPEXP_CORE wxWindowCreateEvent : public wxCommandEvent -{ -public: - wxWindowCreateEvent(wxWindow *win = NULL); - - wxWindow *GetWindow() const { return (wxWindow *)GetEventObject(); } - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxWindowCreateEvent(*this); } - -private: - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxWindowCreateEvent); -}; - -class WXDLLIMPEXP_CORE wxWindowDestroyEvent : public wxCommandEvent -{ -public: - wxWindowDestroyEvent(wxWindow *win = NULL); - - wxWindow *GetWindow() const { return (wxWindow *)GetEventObject(); } - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxWindowDestroyEvent(*this); } - -private: - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxWindowDestroyEvent); -}; - -// A help event is sent when the user clicks on a window in context-help mode. -/* - wxEVT_HELP - wxEVT_DETAILED_HELP -*/ - -class WXDLLIMPEXP_CORE wxHelpEvent : public wxCommandEvent -{ -public: - // how was this help event generated? - enum Origin - { - Origin_Unknown, // unrecognized event source - Origin_Keyboard, // event generated from F1 key press - Origin_HelpButton // event from [?] button on the title bar (Windows) - }; - - wxHelpEvent(wxEventType type = wxEVT_NULL, - wxWindowID winid = 0, - const wxPoint& pt = wxDefaultPosition, - Origin origin = Origin_Unknown) - : wxCommandEvent(type, winid), - m_pos(pt), - m_origin(GuessOrigin(origin)) - { } - wxHelpEvent(const wxHelpEvent& event) - : wxCommandEvent(event), - m_pos(event.m_pos), - m_target(event.m_target), - m_link(event.m_link), - m_origin(event.m_origin) - { } - - // Position of event (in screen coordinates) - const wxPoint& GetPosition() const { return m_pos; } - void SetPosition(const wxPoint& pos) { m_pos = pos; } - - // Optional link to further help - const wxString& GetLink() const { return m_link; } - void SetLink(const wxString& link) { m_link = link; } - - // Optional target to display help in. E.g. a window specification - const wxString& GetTarget() const { return m_target; } - void SetTarget(const wxString& target) { m_target = target; } - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxHelpEvent(*this); } - - // optional indication of the event source - Origin GetOrigin() const { return m_origin; } - void SetOrigin(Origin origin) { m_origin = origin; } - -protected: - wxPoint m_pos; - wxString m_target; - wxString m_link; - Origin m_origin; - - // we can try to guess the event origin ourselves, even if none is - // specified in the ctor - static Origin GuessOrigin(Origin origin); - -private: - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxHelpEvent); -}; - -// A Clipboard Text event is sent when a window intercepts text copy/cut/paste -// message, i.e. the user has cut/copied/pasted data from/into a text control -// via ctrl-C/X/V, ctrl/shift-del/insert, a popup menu command, etc. -// NOTE : under windows these events are *NOT* generated automatically -// for a Rich Edit text control. -/* -wxEVT_TEXT_COPY -wxEVT_TEXT_CUT -wxEVT_TEXT_PASTE -*/ - -class WXDLLIMPEXP_CORE wxClipboardTextEvent : public wxCommandEvent -{ -public: - wxClipboardTextEvent(wxEventType type = wxEVT_NULL, - wxWindowID winid = 0) - : wxCommandEvent(type, winid) - { } - wxClipboardTextEvent(const wxClipboardTextEvent& event) - : wxCommandEvent(event) - { } - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxClipboardTextEvent(*this); } - -private: - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxClipboardTextEvent); -}; - -// A Context event is sent when the user right clicks on a window or -// presses Shift-F10 -// NOTE : Under windows this is a repackaged WM_CONTETXMENU message -// Under other systems it may have to be generated from a right click event -/* - wxEVT_CONTEXT_MENU -*/ - -class WXDLLIMPEXP_CORE wxContextMenuEvent : public wxCommandEvent -{ -public: - wxContextMenuEvent(wxEventType type = wxEVT_NULL, - wxWindowID winid = 0, - const wxPoint& pt = wxDefaultPosition) - : wxCommandEvent(type, winid), - m_pos(pt) - { } - wxContextMenuEvent(const wxContextMenuEvent& event) - : wxCommandEvent(event), - m_pos(event.m_pos) - { } - - // Position of event (in screen coordinates) - const wxPoint& GetPosition() const { return m_pos; } - void SetPosition(const wxPoint& pos) { m_pos = pos; } - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxContextMenuEvent(*this); } - -protected: - wxPoint m_pos; - -private: - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxContextMenuEvent); -}; - - -/* TODO - wxEVT_MOUSE_CAPTURE_CHANGED, - wxEVT_SETTING_CHANGED, // WM_WININICHANGE (NT) / WM_SETTINGCHANGE (Win95) -// wxEVT_FONT_CHANGED, // WM_FONTCHANGE: roll into wxEVT_SETTING_CHANGED, but remember to propagate - // wxEVT_FONT_CHANGED to all other windows (maybe). - wxEVT_DRAW_ITEM, // Leave these three as virtual functions in wxControl?? Platform-specific. - wxEVT_MEASURE_ITEM, - wxEVT_COMPARE_ITEM -*/ - -#endif // wxUSE_GUI - - -// ============================================================================ -// event handler and related classes -// ============================================================================ - - -// struct containing the members common to static and dynamic event tables -// entries -struct WXDLLIMPEXP_BASE wxEventTableEntryBase -{ - wxEventTableEntryBase(int winid, int idLast, - wxEventFunctor* fn, wxObject *data) - : m_id(winid), - m_lastId(idLast), - m_fn(fn), - m_callbackUserData(data) - { - wxASSERT_MSG( idLast == wxID_ANY || winid <= idLast, - "invalid IDs range: lower bound > upper bound" ); - } - - wxEventTableEntryBase( const wxEventTableEntryBase &entry ) - : m_id( entry.m_id ), - m_lastId( entry.m_lastId ), - m_fn( entry.m_fn ), - m_callbackUserData( entry.m_callbackUserData ) - { - // This is a 'hack' to ensure that only one instance tries to delete - // the functor pointer. It is safe as long as the only place where the - // copy constructor is being called is when the static event tables are - // being initialized (a temporary instance is created and then this - // constructor is called). - - const_cast( entry ).m_fn = NULL; - } - - ~wxEventTableEntryBase() - { - delete m_fn; - } - - // the range of ids for this entry: if m_lastId == wxID_ANY, the range - // consists only of m_id, otherwise it is m_id..m_lastId inclusive - int m_id, - m_lastId; - - // function/method/functor to call - wxEventFunctor* m_fn; - - // arbitrary user data associated with the callback - wxObject* m_callbackUserData; - -private: - wxDECLARE_NO_ASSIGN_CLASS(wxEventTableEntryBase); -}; - -// an entry from a static event table -struct WXDLLIMPEXP_BASE wxEventTableEntry : public wxEventTableEntryBase -{ - wxEventTableEntry(const int& evType, int winid, int idLast, - wxEventFunctor* fn, wxObject *data) - : wxEventTableEntryBase(winid, idLast, fn, data), - m_eventType(evType) - { } - - // the reference to event type: this allows us to not care about the - // (undefined) order in which the event table entries and the event types - // are initialized: initially the value of this reference might be - // invalid, but by the time it is used for the first time, all global - // objects will have been initialized (including the event type constants) - // and so it will have the correct value when it is needed - const int& m_eventType; - -private: - wxDECLARE_NO_ASSIGN_CLASS(wxEventTableEntry); -}; - -// an entry used in dynamic event table managed by wxEvtHandler::Connect() -struct WXDLLIMPEXP_BASE wxDynamicEventTableEntry : public wxEventTableEntryBase -{ - wxDynamicEventTableEntry(int evType, int winid, int idLast, - wxEventFunctor* fn, wxObject *data) - : wxEventTableEntryBase(winid, idLast, fn, data), - m_eventType(evType) - { } - - // not a reference here as we can't keep a reference to a temporary int - // created to wrap the constant value typically passed to Connect() - nor - // do we need it - int m_eventType; - -private: - wxDECLARE_NO_ASSIGN_CLASS(wxDynamicEventTableEntry); -}; - -// ---------------------------------------------------------------------------- -// wxEventTable: an array of event entries terminated with {0, 0, 0, 0, 0} -// ---------------------------------------------------------------------------- - -struct WXDLLIMPEXP_BASE wxEventTable -{ - const wxEventTable *baseTable; // base event table (next in chain) - const wxEventTableEntry *entries; // bottom of entry array -}; - -// ---------------------------------------------------------------------------- -// wxEventHashTable: a helper of wxEvtHandler to speed up wxEventTable lookups. -// ---------------------------------------------------------------------------- - -WX_DEFINE_ARRAY_PTR(const wxEventTableEntry*, wxEventTableEntryPointerArray); - -class WXDLLIMPEXP_BASE wxEventHashTable -{ -private: - // Internal data structs - struct EventTypeTable - { - wxEventType eventType; - wxEventTableEntryPointerArray eventEntryTable; - }; - typedef EventTypeTable* EventTypeTablePointer; - -public: - // Constructor, needs the event table it needs to hash later on. - // Note: hashing of the event table is not done in the constructor as it - // can be that the event table is not yet full initialize, the hash - // will gets initialized when handling the first event look-up request. - wxEventHashTable(const wxEventTable &table); - // Destructor. - ~wxEventHashTable(); - - // Handle the given event, in other words search the event table hash - // and call self->ProcessEvent() if a match was found. - bool HandleEvent(wxEvent& event, wxEvtHandler *self); - - // Clear table - void Clear(); - -#if wxUSE_MEMORY_TRACING - // Clear all tables: only used to work around problems in memory tracing - // code - static void ClearAll(); -#endif // wxUSE_MEMORY_TRACING - -protected: - // Init the hash table with the entries of the static event table. - void InitHashTable(); - // Helper function of InitHashTable() to insert 1 entry into the hash table. - void AddEntry(const wxEventTableEntry &entry); - // Allocate and init with null pointers the base hash table. - void AllocEventTypeTable(size_t size); - // Grow the hash table in size and transfer all items currently - // in the table to the correct location in the new table. - void GrowEventTypeTable(); - -protected: - const wxEventTable &m_table; - bool m_rebuildHash; - - size_t m_size; - EventTypeTablePointer *m_eventTypeTable; - - static wxEventHashTable* sm_first; - wxEventHashTable* m_previous; - wxEventHashTable* m_next; - - wxDECLARE_NO_COPY_CLASS(wxEventHashTable); -}; - -// ---------------------------------------------------------------------------- -// wxEvtHandler: the base class for all objects handling wxWidgets events -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxEvtHandler : public wxObject - , public wxTrackable -{ -public: - wxEvtHandler(); - virtual ~wxEvtHandler(); - - - // Event handler chain - // ------------------- - - wxEvtHandler *GetNextHandler() const { return m_nextHandler; } - wxEvtHandler *GetPreviousHandler() const { return m_previousHandler; } - virtual void SetNextHandler(wxEvtHandler *handler) { m_nextHandler = handler; } - virtual void SetPreviousHandler(wxEvtHandler *handler) { m_previousHandler = handler; } - - void SetEvtHandlerEnabled(bool enabled) { m_enabled = enabled; } - bool GetEvtHandlerEnabled() const { return m_enabled; } - - void Unlink(); - bool IsUnlinked() const; - - - // Global event filters - // -------------------- - - // Add an event filter whose FilterEvent() method will be called for each - // and every event processed by wxWidgets. The filters are called in LIFO - // order and wxApp is registered as an event filter by default. The pointer - // must remain valid until it's removed with RemoveFilter() and is not - // deleted by wxEvtHandler. - static void AddFilter(wxEventFilter* filter); - - // Remove a filter previously installed with AddFilter(). - static void RemoveFilter(wxEventFilter* filter); - - - // Event queuing and processing - // ---------------------------- - - // Process an event right now: this can only be called from the main - // thread, use QueueEvent() for scheduling the events for - // processing from other threads. - virtual bool ProcessEvent(wxEvent& event); - - // Process an event by calling ProcessEvent and handling any exceptions - // thrown by event handlers. It's mostly useful when processing wx events - // when called from C code (e.g. in GTK+ callback) when the exception - // wouldn't correctly propagate to wxEventLoop. - bool SafelyProcessEvent(wxEvent& event); - // NOTE: uses ProcessEvent() - - // This method tries to process the event in this event handler, including - // any preprocessing done by TryBefore() and all the handlers chained to - // it, but excluding the post-processing done in TryAfter(). - // - // It is meant to be called from ProcessEvent() only and is not virtual, - // additional event handlers can be hooked into the normal event processing - // logic using TryBefore() and TryAfter() hooks. - // - // You can also call it yourself to forward an event to another handler but - // without propagating it upwards if it's unhandled (this is usually - // unwanted when forwarding as the original handler would already do it if - // needed normally). - bool ProcessEventLocally(wxEvent& event); - - // Schedule the given event to be processed later. It takes ownership of - // the event pointer, i.e. it will be deleted later. This is safe to call - // from multiple threads although you still need to ensure that wxString - // fields of the event object are deep copies and not use the same string - // buffer as other wxString objects in this thread. - virtual void QueueEvent(wxEvent *event); - - // Add an event to be processed later: notice that this function is not - // safe to call from threads other than main, use QueueEvent() - virtual void AddPendingEvent(const wxEvent& event) - { - // notice that the thread-safety problem comes from the fact that - // Clone() doesn't make deep copies of wxString fields of wxEvent - // object and so the same wxString could be used from both threads when - // the event object is destroyed in this one -- QueueEvent() avoids - // this problem as the event pointer is not used any more in this - // thread at all after it is called. - QueueEvent(event.Clone()); - } - - void ProcessPendingEvents(); - // NOTE: uses ProcessEvent() - - void DeletePendingEvents(); - -#if wxUSE_THREADS - bool ProcessThreadEvent(const wxEvent& event); - // NOTE: uses AddPendingEvent(); call only from secondary threads -#endif - -#ifdef wxHAS_CALL_AFTER - // Asynchronous method calls: these methods schedule the given method - // pointer for a later call (during the next idle event loop iteration). - // - // Notice that the method is called on this object itself, so the object - // CallAfter() is called on must have the correct dynamic type. - // - // These method can be used from another thread. - - template - void CallAfter(void (T::*method)()) - { - QueueEvent( - new wxAsyncMethodCallEvent0(static_cast(this), method) - ); - } - - // Notice that we use P1 and not T1 for the parameter to allow passing - // parameters that are convertible to the type taken by the method - // instead of being exactly the same, to be closer to the usual method call - // semantics. - template - void CallAfter(void (T::*method)(T1 x1), P1 x1) - { - QueueEvent( - new wxAsyncMethodCallEvent1( - static_cast(this), method, x1) - ); - } - - template - void CallAfter(void (T::*method)(T1 x1, T2 x2), P1 x1, P2 x2) - { - QueueEvent( - new wxAsyncMethodCallEvent2( - static_cast(this), method, x1, x2) - ); - } - - template - void CallAfter(const T& fn) - { - QueueEvent(new wxAsyncMethodCallEventFunctor(this, fn)); - } -#endif // wxHAS_CALL_AFTER - - - // Connecting and disconnecting - // ---------------------------- - - // These functions are used for old, untyped, event handlers and don't - // check that the type of the function passed to them actually matches the - // type of the event. They also only allow connecting events to methods of - // wxEvtHandler-derived classes. - // - // The template Connect() methods below are safer and allow connecting - // events to arbitrary functions or functors -- but require compiler - // support for templates. - - // Dynamic association of a member function handler with the event handler, - // winid and event type - void Connect(int winid, - int lastId, - wxEventType eventType, - wxObjectEventFunction func, - wxObject *userData = NULL, - wxEvtHandler *eventSink = NULL) - { - DoBind(winid, lastId, eventType, - wxNewEventFunctor(eventType, func, eventSink), - userData); - } - - // Convenience function: take just one id - void Connect(int winid, - wxEventType eventType, - wxObjectEventFunction func, - wxObject *userData = NULL, - wxEvtHandler *eventSink = NULL) - { Connect(winid, wxID_ANY, eventType, func, userData, eventSink); } - - // Even more convenient: without id (same as using id of wxID_ANY) - void Connect(wxEventType eventType, - wxObjectEventFunction func, - wxObject *userData = NULL, - wxEvtHandler *eventSink = NULL) - { Connect(wxID_ANY, wxID_ANY, eventType, func, userData, eventSink); } - - bool Disconnect(int winid, - int lastId, - wxEventType eventType, - wxObjectEventFunction func = NULL, - wxObject *userData = NULL, - wxEvtHandler *eventSink = NULL) - { - return DoUnbind(winid, lastId, eventType, - wxMakeEventFunctor(eventType, func, eventSink), - userData ); - } - - bool Disconnect(int winid = wxID_ANY, - wxEventType eventType = wxEVT_NULL, - wxObjectEventFunction func = NULL, - wxObject *userData = NULL, - wxEvtHandler *eventSink = NULL) - { return Disconnect(winid, wxID_ANY, eventType, func, userData, eventSink); } - - bool Disconnect(wxEventType eventType, - wxObjectEventFunction func, - wxObject *userData = NULL, - wxEvtHandler *eventSink = NULL) - { return Disconnect(wxID_ANY, eventType, func, userData, eventSink); } - - // Bind functions to an event: - template - void Bind(const EventTag& eventType, - void (*function)(EventArg &), - int winid = wxID_ANY, - int lastId = wxID_ANY, - wxObject *userData = NULL) - { - DoBind(winid, lastId, eventType, - wxNewEventFunctor(eventType, function), - userData); - } - - - template - bool Unbind(const EventTag& eventType, - void (*function)(EventArg &), - int winid = wxID_ANY, - int lastId = wxID_ANY, - wxObject *userData = NULL) - { - return DoUnbind(winid, lastId, eventType, - wxMakeEventFunctor(eventType, function), - userData); - } - - // Bind functors to an event: - template - void Bind(const EventTag& eventType, - const Functor &functor, - int winid = wxID_ANY, - int lastId = wxID_ANY, - wxObject *userData = NULL) - { - DoBind(winid, lastId, eventType, - wxNewEventFunctor(eventType, functor), - userData); - } - - - template - bool Unbind(const EventTag& eventType, - const Functor &functor, - int winid = wxID_ANY, - int lastId = wxID_ANY, - wxObject *userData = NULL) - { - return DoUnbind(winid, lastId, eventType, - wxMakeEventFunctor(eventType, functor), - userData); - } - - - // Bind a method of a class (called on the specified handler which must - // be convertible to this class) object to an event: - - template - void Bind(const EventTag &eventType, - void (Class::*method)(EventArg &), - EventHandler *handler, - int winid = wxID_ANY, - int lastId = wxID_ANY, - wxObject *userData = NULL) - { - DoBind(winid, lastId, eventType, - wxNewEventFunctor(eventType, method, handler), - userData); - } - - template - bool Unbind(const EventTag &eventType, - void (Class::*method)(EventArg&), - EventHandler *handler, - int winid = wxID_ANY, - int lastId = wxID_ANY, - wxObject *userData = NULL ) - { - return DoUnbind(winid, lastId, eventType, - wxMakeEventFunctor(eventType, method, handler), - userData); - } - - // User data can be associated with each wxEvtHandler - void SetClientObject( wxClientData *data ) { DoSetClientObject(data); } - wxClientData *GetClientObject() const { return DoGetClientObject(); } - - void SetClientData( void *data ) { DoSetClientData(data); } - void *GetClientData() const { return DoGetClientData(); } - - - // implementation from now on - // -------------------------- - - // check if the given event table entry matches this event by id (the check - // for the event type should be done by caller) and call the handler if it - // does - // - // return true if the event was processed, false otherwise (no match or the - // handler decided to skip the event) - static bool ProcessEventIfMatchesId(const wxEventTableEntryBase& tableEntry, - wxEvtHandler *handler, - wxEvent& event); - - // Allow iterating over all connected dynamic event handlers: you must pass - // the same "cookie" to GetFirst() and GetNext() and call them until null - // is returned. - // - // These functions are for internal use only. - wxDynamicEventTableEntry* GetFirstDynamicEntry(size_t& cookie) const; - wxDynamicEventTableEntry* GetNextDynamicEntry(size_t& cookie) const; - - virtual bool SearchEventTable(wxEventTable& table, wxEvent& event); - bool SearchDynamicEventTable( wxEvent& event ); - - // Avoid problems at exit by cleaning up static hash table gracefully - void ClearEventHashTable() { GetEventHashTable().Clear(); } - void OnSinkDestroyed( wxEvtHandler *sink ); - - -private: - void DoBind(int winid, - int lastId, - wxEventType eventType, - wxEventFunctor *func, - wxObject* userData = NULL); - - bool DoUnbind(int winid, - int lastId, - wxEventType eventType, - const wxEventFunctor& func, - wxObject *userData = NULL); - - static const wxEventTableEntry sm_eventTableEntries[]; - -protected: - // hooks for wxWindow used by ProcessEvent() - // ----------------------------------------- - - // this one is called before trying our own event table to allow plugging - // in the event handlers overriding the default logic, this is used by e.g. - // validators. - virtual bool TryBefore(wxEvent& event); - - // This one is not a hook but just a helper which looks up the handler in - // this object itself. - // - // It is called from ProcessEventLocally() and normally shouldn't be called - // directly as doing it would ignore any chained event handlers - bool TryHereOnly(wxEvent& event); - - // Another helper which simply calls pre-processing hook and then tries to - // handle the event at this handler level. - bool TryBeforeAndHere(wxEvent& event) - { - return TryBefore(event) || TryHereOnly(event); - } - - // this one is called after failing to find the event handle in our own - // table to give a chance to the other windows to process it - // - // base class implementation passes the event to wxTheApp - virtual bool TryAfter(wxEvent& event); - -#if WXWIN_COMPATIBILITY_2_8 - // deprecated method: override TryBefore() instead of this one - wxDEPRECATED_BUT_USED_INTERNALLY_INLINE( - virtual bool TryValidator(wxEvent& WXUNUSED(event)), return false; ) - - wxDEPRECATED_BUT_USED_INTERNALLY_INLINE( - virtual bool TryParent(wxEvent& event), return DoTryApp(event); ) -#endif // WXWIN_COMPATIBILITY_2_8 - - // Overriding this method allows filtering the event handlers dynamically - // connected to this object. If this method returns false, the handler is - // not connected at all. If it returns true, it is connected using the - // possibly modified fields of the given entry. - virtual bool OnDynamicBind(wxDynamicEventTableEntry& WXUNUSED(entry)) - { - return true; - } - - - static const wxEventTable sm_eventTable; - virtual const wxEventTable *GetEventTable() const; - - static wxEventHashTable sm_eventHashTable; - virtual wxEventHashTable& GetEventHashTable() const; - - wxEvtHandler* m_nextHandler; - wxEvtHandler* m_previousHandler; - - typedef wxVector DynamicEvents; - DynamicEvents* m_dynamicEvents; - - wxList* m_pendingEvents; - -#if wxUSE_THREADS - // critical section protecting m_pendingEvents - wxCriticalSection m_pendingEventsLock; -#endif // wxUSE_THREADS - - // Is event handler enabled? - bool m_enabled; - - - // The user data: either an object which will be deleted by the container - // when it's deleted or some raw pointer which we do nothing with - only - // one type of data can be used with the given window (i.e. you cannot set - // the void data and then associate the container with wxClientData or vice - // versa) - union - { - wxClientData *m_clientObject; - void *m_clientData; - }; - - // what kind of data do we have? - wxClientDataType m_clientDataType; - - // client data accessors - virtual void DoSetClientObject( wxClientData *data ); - virtual wxClientData *DoGetClientObject() const; - - virtual void DoSetClientData( void *data ); - virtual void *DoGetClientData() const; - - // Search tracker objects for event connection with this sink - wxEventConnectionRef *FindRefInTrackerList(wxEvtHandler *handler); - -private: - // pass the event to wxTheApp instance, called from TryAfter() - bool DoTryApp(wxEvent& event); - - // try to process events in all handlers chained to this one - bool DoTryChain(wxEvent& event); - - // Head of the event filter linked list. - static wxEventFilter* ms_filterList; - - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxEvtHandler); -}; - -WX_DEFINE_ARRAY_WITH_DECL_PTR(wxEvtHandler *, wxEvtHandlerArray, class WXDLLIMPEXP_BASE); - - -// Define an inline method of wxObjectEventFunctor which couldn't be defined -// before wxEvtHandler declaration: at least Sun CC refuses to compile function -// calls through pointer to member for forward-declared classes (see #12452). -inline void wxObjectEventFunctor::operator()(wxEvtHandler *handler, wxEvent& event) -{ - wxEvtHandler * const realHandler = m_handler ? m_handler : handler; - - (realHandler->*m_method)(event); -} - -// ---------------------------------------------------------------------------- -// wxEventConnectionRef represents all connections between two event handlers -// and enables automatic disconnect when an event handler sink goes out of -// scope. Each connection/disconnect increases/decreases ref count, and -// when it reaches zero the node goes out of scope. -// ---------------------------------------------------------------------------- - -class wxEventConnectionRef : public wxTrackerNode -{ -public: - wxEventConnectionRef() : m_src(NULL), m_sink(NULL), m_refCount(0) { } - wxEventConnectionRef(wxEvtHandler *src, wxEvtHandler *sink) - : m_src(src), m_sink(sink), m_refCount(1) - { - m_sink->AddNode(this); - } - - // The sink is being destroyed - virtual void OnObjectDestroy( ) wxOVERRIDE - { - if ( m_src ) - m_src->OnSinkDestroyed( m_sink ); - delete this; - } - - virtual wxEventConnectionRef *ToEventConnection() wxOVERRIDE { return this; } - - void IncRef() { m_refCount++; } - void DecRef() - { - if ( !--m_refCount ) - { - // The sink holds the only external pointer to this object - if ( m_sink ) - m_sink->RemoveNode(this); - delete this; - } - } - -private: - wxEvtHandler *m_src, - *m_sink; - int m_refCount; - - friend class wxEvtHandler; - - wxDECLARE_NO_ASSIGN_CLASS(wxEventConnectionRef); -}; - -// Post a message to the given event handler which will be processed during the -// next event loop iteration. -// -// Notice that this one is not thread-safe, use wxQueueEvent() -inline void wxPostEvent(wxEvtHandler *dest, const wxEvent& event) -{ - wxCHECK_RET( dest, "need an object to post event to" ); - - dest->AddPendingEvent(event); -} - -// Wrapper around wxEvtHandler::QueueEvent(): adds an event for later -// processing, unlike wxPostEvent it is safe to use from different thread even -// for events with wxString members -inline void wxQueueEvent(wxEvtHandler *dest, wxEvent *event) -{ - wxCHECK_RET( dest, "need an object to queue event for" ); - - dest->QueueEvent(event); -} - -typedef void (wxEvtHandler::*wxEventFunction)(wxEvent&); -typedef void (wxEvtHandler::*wxIdleEventFunction)(wxIdleEvent&); -typedef void (wxEvtHandler::*wxThreadEventFunction)(wxThreadEvent&); - -#define wxEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxEventFunction, func) -#define wxIdleEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxIdleEventFunction, func) -#define wxThreadEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxThreadEventFunction, func) - -#if wxUSE_GUI - -// ---------------------------------------------------------------------------- -// wxEventBlocker: helper class to temporarily disable event handling for a window -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxEventBlocker : public wxEvtHandler -{ -public: - wxEventBlocker(wxWindow *win, wxEventType type = wxEVT_ANY); - virtual ~wxEventBlocker(); - - void Block(wxEventType type) - { - m_eventsToBlock.push_back(type); - } - - virtual bool ProcessEvent(wxEvent& event) wxOVERRIDE; - -protected: - wxArrayInt m_eventsToBlock; - wxWindow *m_window; - - wxDECLARE_NO_COPY_CLASS(wxEventBlocker); -}; - -typedef void (wxEvtHandler::*wxCommandEventFunction)(wxCommandEvent&); -typedef void (wxEvtHandler::*wxScrollEventFunction)(wxScrollEvent&); -typedef void (wxEvtHandler::*wxScrollWinEventFunction)(wxScrollWinEvent&); -typedef void (wxEvtHandler::*wxSizeEventFunction)(wxSizeEvent&); -typedef void (wxEvtHandler::*wxMoveEventFunction)(wxMoveEvent&); -typedef void (wxEvtHandler::*wxPaintEventFunction)(wxPaintEvent&); -typedef void (wxEvtHandler::*wxNcPaintEventFunction)(wxNcPaintEvent&); -typedef void (wxEvtHandler::*wxEraseEventFunction)(wxEraseEvent&); -typedef void (wxEvtHandler::*wxMouseEventFunction)(wxMouseEvent&); -typedef void (wxEvtHandler::*wxCharEventFunction)(wxKeyEvent&); -typedef void (wxEvtHandler::*wxFocusEventFunction)(wxFocusEvent&); -typedef void (wxEvtHandler::*wxChildFocusEventFunction)(wxChildFocusEvent&); -typedef void (wxEvtHandler::*wxActivateEventFunction)(wxActivateEvent&); -typedef void (wxEvtHandler::*wxMenuEventFunction)(wxMenuEvent&); -typedef void (wxEvtHandler::*wxJoystickEventFunction)(wxJoystickEvent&); -typedef void (wxEvtHandler::*wxDropFilesEventFunction)(wxDropFilesEvent&); -typedef void (wxEvtHandler::*wxInitDialogEventFunction)(wxInitDialogEvent&); -typedef void (wxEvtHandler::*wxSysColourChangedEventFunction)(wxSysColourChangedEvent&); -typedef void (wxEvtHandler::*wxDisplayChangedEventFunction)(wxDisplayChangedEvent&); -typedef void (wxEvtHandler::*wxUpdateUIEventFunction)(wxUpdateUIEvent&); -typedef void (wxEvtHandler::*wxCloseEventFunction)(wxCloseEvent&); -typedef void (wxEvtHandler::*wxShowEventFunction)(wxShowEvent&); -typedef void (wxEvtHandler::*wxIconizeEventFunction)(wxIconizeEvent&); -typedef void (wxEvtHandler::*wxMaximizeEventFunction)(wxMaximizeEvent&); -typedef void (wxEvtHandler::*wxNavigationKeyEventFunction)(wxNavigationKeyEvent&); -typedef void (wxEvtHandler::*wxPaletteChangedEventFunction)(wxPaletteChangedEvent&); -typedef void (wxEvtHandler::*wxQueryNewPaletteEventFunction)(wxQueryNewPaletteEvent&); -typedef void (wxEvtHandler::*wxWindowCreateEventFunction)(wxWindowCreateEvent&); -typedef void (wxEvtHandler::*wxWindowDestroyEventFunction)(wxWindowDestroyEvent&); -typedef void (wxEvtHandler::*wxSetCursorEventFunction)(wxSetCursorEvent&); -typedef void (wxEvtHandler::*wxNotifyEventFunction)(wxNotifyEvent&); -typedef void (wxEvtHandler::*wxHelpEventFunction)(wxHelpEvent&); -typedef void (wxEvtHandler::*wxContextMenuEventFunction)(wxContextMenuEvent&); -typedef void (wxEvtHandler::*wxMouseCaptureChangedEventFunction)(wxMouseCaptureChangedEvent&); -typedef void (wxEvtHandler::*wxMouseCaptureLostEventFunction)(wxMouseCaptureLostEvent&); -typedef void (wxEvtHandler::*wxClipboardTextEventFunction)(wxClipboardTextEvent&); - - -#define wxCommandEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxCommandEventFunction, func) -#define wxScrollEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxScrollEventFunction, func) -#define wxScrollWinEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxScrollWinEventFunction, func) -#define wxSizeEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxSizeEventFunction, func) -#define wxMoveEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxMoveEventFunction, func) -#define wxPaintEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxPaintEventFunction, func) -#define wxNcPaintEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxNcPaintEventFunction, func) -#define wxEraseEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxEraseEventFunction, func) -#define wxMouseEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxMouseEventFunction, func) -#define wxCharEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxCharEventFunction, func) -#define wxKeyEventHandler(func) wxCharEventHandler(func) -#define wxFocusEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxFocusEventFunction, func) -#define wxChildFocusEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxChildFocusEventFunction, func) -#define wxActivateEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxActivateEventFunction, func) -#define wxMenuEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxMenuEventFunction, func) -#define wxJoystickEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxJoystickEventFunction, func) -#define wxDropFilesEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxDropFilesEventFunction, func) -#define wxInitDialogEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxInitDialogEventFunction, func) -#define wxSysColourChangedEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxSysColourChangedEventFunction, func) -#define wxDisplayChangedEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxDisplayChangedEventFunction, func) -#define wxUpdateUIEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxUpdateUIEventFunction, func) -#define wxCloseEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxCloseEventFunction, func) -#define wxShowEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxShowEventFunction, func) -#define wxIconizeEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxIconizeEventFunction, func) -#define wxMaximizeEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxMaximizeEventFunction, func) -#define wxNavigationKeyEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxNavigationKeyEventFunction, func) -#define wxPaletteChangedEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxPaletteChangedEventFunction, func) -#define wxQueryNewPaletteEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxQueryNewPaletteEventFunction, func) -#define wxWindowCreateEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxWindowCreateEventFunction, func) -#define wxWindowDestroyEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxWindowDestroyEventFunction, func) -#define wxSetCursorEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxSetCursorEventFunction, func) -#define wxNotifyEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxNotifyEventFunction, func) -#define wxHelpEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxHelpEventFunction, func) -#define wxContextMenuEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxContextMenuEventFunction, func) -#define wxMouseCaptureChangedEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxMouseCaptureChangedEventFunction, func) -#define wxMouseCaptureLostEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxMouseCaptureLostEventFunction, func) -#define wxClipboardTextEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxClipboardTextEventFunction, func) - -#endif // wxUSE_GUI - -// N.B. In GNU-WIN32, you *have* to take the address of a member function -// (use &) or the compiler crashes... - -#define wxDECLARE_EVENT_TABLE() \ - private: \ - static const wxEventTableEntry sm_eventTableEntries[]; \ - protected: \ - wxCLANG_WARNING_SUPPRESS(inconsistent-missing-override) \ - const wxEventTable* GetEventTable() const; \ - wxEventHashTable& GetEventHashTable() const; \ - wxCLANG_WARNING_RESTORE(inconsistent-missing-override) \ - static const wxEventTable sm_eventTable; \ - static wxEventHashTable sm_eventHashTable - -// N.B.: when building DLL with Borland C++ 5.5 compiler, you must initialize -// sm_eventTable before using it in GetEventTable() or the compiler gives -// E2233 (see http://groups.google.com/groups?selm=397dcc8a%241_2%40dnews) - -#define wxBEGIN_EVENT_TABLE(theClass, baseClass) \ - const wxEventTable theClass::sm_eventTable = \ - { &baseClass::sm_eventTable, &theClass::sm_eventTableEntries[0] }; \ - const wxEventTable *theClass::GetEventTable() const \ - { return &theClass::sm_eventTable; } \ - wxEventHashTable theClass::sm_eventHashTable(theClass::sm_eventTable); \ - wxEventHashTable &theClass::GetEventHashTable() const \ - { return theClass::sm_eventHashTable; } \ - const wxEventTableEntry theClass::sm_eventTableEntries[] = { \ - -#define wxBEGIN_EVENT_TABLE_TEMPLATE1(theClass, baseClass, T1) \ - template \ - const wxEventTable theClass::sm_eventTable = \ - { &baseClass::sm_eventTable, &theClass::sm_eventTableEntries[0] }; \ - template \ - const wxEventTable *theClass::GetEventTable() const \ - { return &theClass::sm_eventTable; } \ - template \ - wxEventHashTable theClass::sm_eventHashTable(theClass::sm_eventTable); \ - template \ - wxEventHashTable &theClass::GetEventHashTable() const \ - { return theClass::sm_eventHashTable; } \ - template \ - const wxEventTableEntry theClass::sm_eventTableEntries[] = { \ - -#define wxBEGIN_EVENT_TABLE_TEMPLATE2(theClass, baseClass, T1, T2) \ - template \ - const wxEventTable theClass::sm_eventTable = \ - { &baseClass::sm_eventTable, &theClass::sm_eventTableEntries[0] }; \ - template \ - const wxEventTable *theClass::GetEventTable() const \ - { return &theClass::sm_eventTable; } \ - template \ - wxEventHashTable theClass::sm_eventHashTable(theClass::sm_eventTable); \ - template \ - wxEventHashTable &theClass::GetEventHashTable() const \ - { return theClass::sm_eventHashTable; } \ - template \ - const wxEventTableEntry theClass::sm_eventTableEntries[] = { \ - -#define wxBEGIN_EVENT_TABLE_TEMPLATE3(theClass, baseClass, T1, T2, T3) \ - template \ - const wxEventTable theClass::sm_eventTable = \ - { &baseClass::sm_eventTable, &theClass::sm_eventTableEntries[0] }; \ - template \ - const wxEventTable *theClass::GetEventTable() const \ - { return &theClass::sm_eventTable; } \ - template \ - wxEventHashTable theClass::sm_eventHashTable(theClass::sm_eventTable); \ - template \ - wxEventHashTable &theClass::GetEventHashTable() const \ - { return theClass::sm_eventHashTable; } \ - template \ - const wxEventTableEntry theClass::sm_eventTableEntries[] = { \ - -#define wxBEGIN_EVENT_TABLE_TEMPLATE4(theClass, baseClass, T1, T2, T3, T4) \ - template \ - const wxEventTable theClass::sm_eventTable = \ - { &baseClass::sm_eventTable, &theClass::sm_eventTableEntries[0] }; \ - template \ - const wxEventTable *theClass::GetEventTable() const \ - { return &theClass::sm_eventTable; } \ - template \ - wxEventHashTable theClass::sm_eventHashTable(theClass::sm_eventTable); \ - template \ - wxEventHashTable &theClass::GetEventHashTable() const \ - { return theClass::sm_eventHashTable; } \ - template \ - const wxEventTableEntry theClass::sm_eventTableEntries[] = { \ - -#define wxBEGIN_EVENT_TABLE_TEMPLATE5(theClass, baseClass, T1, T2, T3, T4, T5) \ - template \ - const wxEventTable theClass::sm_eventTable = \ - { &baseClass::sm_eventTable, &theClass::sm_eventTableEntries[0] }; \ - template \ - const wxEventTable *theClass::GetEventTable() const \ - { return &theClass::sm_eventTable; } \ - template \ - wxEventHashTable theClass::sm_eventHashTable(theClass::sm_eventTable); \ - template \ - wxEventHashTable &theClass::GetEventHashTable() const \ - { return theClass::sm_eventHashTable; } \ - template \ - const wxEventTableEntry theClass::sm_eventTableEntries[] = { \ - -#define wxBEGIN_EVENT_TABLE_TEMPLATE7(theClass, baseClass, T1, T2, T3, T4, T5, T6, T7) \ - template \ - const wxEventTable theClass::sm_eventTable = \ - { &baseClass::sm_eventTable, &theClass::sm_eventTableEntries[0] }; \ - template \ - const wxEventTable *theClass::GetEventTable() const \ - { return &theClass::sm_eventTable; } \ - template \ - wxEventHashTable theClass::sm_eventHashTable(theClass::sm_eventTable); \ - template \ - wxEventHashTable &theClass::GetEventHashTable() const \ - { return theClass::sm_eventHashTable; } \ - template \ - const wxEventTableEntry theClass::sm_eventTableEntries[] = { \ - -#define wxBEGIN_EVENT_TABLE_TEMPLATE8(theClass, baseClass, T1, T2, T3, T4, T5, T6, T7, T8) \ - template \ - const wxEventTable theClass::sm_eventTable = \ - { &baseClass::sm_eventTable, &theClass::sm_eventTableEntries[0] }; \ - template \ - const wxEventTable *theClass::GetEventTable() const \ - { return &theClass::sm_eventTable; } \ - template \ - wxEventHashTable theClass::sm_eventHashTable(theClass::sm_eventTable); \ - template \ - wxEventHashTable &theClass::GetEventHashTable() const \ - { return theClass::sm_eventHashTable; } \ - template \ - const wxEventTableEntry theClass::sm_eventTableEntries[] = { \ - -#define wxEND_EVENT_TABLE() \ - wxDECLARE_EVENT_TABLE_TERMINATOR() }; - -/* - * Event table macros - */ - -// helpers for writing shorter code below: declare an event macro taking 2, 1 -// or none ids (the missing ids default to wxID_ANY) -// -// macro arguments: -// - evt one of wxEVT_XXX constants -// - id1, id2 ids of the first/last id -// - fn the function (should be cast to the right type) -#define wx__DECLARE_EVT2(evt, id1, id2, fn) \ - wxDECLARE_EVENT_TABLE_ENTRY(evt, id1, id2, fn, NULL), -#define wx__DECLARE_EVT1(evt, id, fn) \ - wx__DECLARE_EVT2(evt, id, wxID_ANY, fn) -#define wx__DECLARE_EVT0(evt, fn) \ - wx__DECLARE_EVT1(evt, wxID_ANY, fn) - - -// Generic events -#define EVT_CUSTOM(event, winid, func) \ - wx__DECLARE_EVT1(event, winid, wxEventHandler(func)) -#define EVT_CUSTOM_RANGE(event, id1, id2, func) \ - wx__DECLARE_EVT2(event, id1, id2, wxEventHandler(func)) - -// EVT_COMMAND -#define EVT_COMMAND(winid, event, func) \ - wx__DECLARE_EVT1(event, winid, wxCommandEventHandler(func)) - -#define EVT_COMMAND_RANGE(id1, id2, event, func) \ - wx__DECLARE_EVT2(event, id1, id2, wxCommandEventHandler(func)) - -#define EVT_NOTIFY(event, winid, func) \ - wx__DECLARE_EVT1(event, winid, wxNotifyEventHandler(func)) - -#define EVT_NOTIFY_RANGE(event, id1, id2, func) \ - wx__DECLARE_EVT2(event, id1, id2, wxNotifyEventHandler(func)) - -// Miscellaneous -#define EVT_SIZE(func) wx__DECLARE_EVT0(wxEVT_SIZE, wxSizeEventHandler(func)) -#define EVT_SIZING(func) wx__DECLARE_EVT0(wxEVT_SIZING, wxSizeEventHandler(func)) -#define EVT_MOVE(func) wx__DECLARE_EVT0(wxEVT_MOVE, wxMoveEventHandler(func)) -#define EVT_MOVING(func) wx__DECLARE_EVT0(wxEVT_MOVING, wxMoveEventHandler(func)) -#define EVT_MOVE_START(func) wx__DECLARE_EVT0(wxEVT_MOVE_START, wxMoveEventHandler(func)) -#define EVT_MOVE_END(func) wx__DECLARE_EVT0(wxEVT_MOVE_END, wxMoveEventHandler(func)) -#define EVT_CLOSE(func) wx__DECLARE_EVT0(wxEVT_CLOSE_WINDOW, wxCloseEventHandler(func)) -#define EVT_END_SESSION(func) wx__DECLARE_EVT0(wxEVT_END_SESSION, wxCloseEventHandler(func)) -#define EVT_QUERY_END_SESSION(func) wx__DECLARE_EVT0(wxEVT_QUERY_END_SESSION, wxCloseEventHandler(func)) -#define EVT_PAINT(func) wx__DECLARE_EVT0(wxEVT_PAINT, wxPaintEventHandler(func)) -#define EVT_NC_PAINT(func) wx__DECLARE_EVT0(wxEVT_NC_PAINT, wxNcPaintEventHandler(func)) -#define EVT_ERASE_BACKGROUND(func) wx__DECLARE_EVT0(wxEVT_ERASE_BACKGROUND, wxEraseEventHandler(func)) -#define EVT_CHAR(func) wx__DECLARE_EVT0(wxEVT_CHAR, wxCharEventHandler(func)) -#define EVT_KEY_DOWN(func) wx__DECLARE_EVT0(wxEVT_KEY_DOWN, wxKeyEventHandler(func)) -#define EVT_KEY_UP(func) wx__DECLARE_EVT0(wxEVT_KEY_UP, wxKeyEventHandler(func)) -#if wxUSE_HOTKEY -#define EVT_HOTKEY(winid, func) wx__DECLARE_EVT1(wxEVT_HOTKEY, winid, wxCharEventHandler(func)) -#endif -#define EVT_CHAR_HOOK(func) wx__DECLARE_EVT0(wxEVT_CHAR_HOOK, wxCharEventHandler(func)) -#define EVT_MENU_OPEN(func) wx__DECLARE_EVT0(wxEVT_MENU_OPEN, wxMenuEventHandler(func)) -#define EVT_MENU_CLOSE(func) wx__DECLARE_EVT0(wxEVT_MENU_CLOSE, wxMenuEventHandler(func)) -#define EVT_MENU_HIGHLIGHT(winid, func) wx__DECLARE_EVT1(wxEVT_MENU_HIGHLIGHT, winid, wxMenuEventHandler(func)) -#define EVT_MENU_HIGHLIGHT_ALL(func) wx__DECLARE_EVT0(wxEVT_MENU_HIGHLIGHT, wxMenuEventHandler(func)) -#define EVT_SET_FOCUS(func) wx__DECLARE_EVT0(wxEVT_SET_FOCUS, wxFocusEventHandler(func)) -#define EVT_KILL_FOCUS(func) wx__DECLARE_EVT0(wxEVT_KILL_FOCUS, wxFocusEventHandler(func)) -#define EVT_CHILD_FOCUS(func) wx__DECLARE_EVT0(wxEVT_CHILD_FOCUS, wxChildFocusEventHandler(func)) -#define EVT_ACTIVATE(func) wx__DECLARE_EVT0(wxEVT_ACTIVATE, wxActivateEventHandler(func)) -#define EVT_ACTIVATE_APP(func) wx__DECLARE_EVT0(wxEVT_ACTIVATE_APP, wxActivateEventHandler(func)) -#define EVT_HIBERNATE(func) wx__DECLARE_EVT0(wxEVT_HIBERNATE, wxActivateEventHandler(func)) -#define EVT_END_SESSION(func) wx__DECLARE_EVT0(wxEVT_END_SESSION, wxCloseEventHandler(func)) -#define EVT_QUERY_END_SESSION(func) wx__DECLARE_EVT0(wxEVT_QUERY_END_SESSION, wxCloseEventHandler(func)) -#define EVT_DROP_FILES(func) wx__DECLARE_EVT0(wxEVT_DROP_FILES, wxDropFilesEventHandler(func)) -#define EVT_INIT_DIALOG(func) wx__DECLARE_EVT0(wxEVT_INIT_DIALOG, wxInitDialogEventHandler(func)) -#define EVT_SYS_COLOUR_CHANGED(func) wx__DECLARE_EVT0(wxEVT_SYS_COLOUR_CHANGED, wxSysColourChangedEventHandler(func)) -#define EVT_DISPLAY_CHANGED(func) wx__DECLARE_EVT0(wxEVT_DISPLAY_CHANGED, wxDisplayChangedEventHandler(func)) -#define EVT_SHOW(func) wx__DECLARE_EVT0(wxEVT_SHOW, wxShowEventHandler(func)) -#define EVT_MAXIMIZE(func) wx__DECLARE_EVT0(wxEVT_MAXIMIZE, wxMaximizeEventHandler(func)) -#define EVT_ICONIZE(func) wx__DECLARE_EVT0(wxEVT_ICONIZE, wxIconizeEventHandler(func)) -#define EVT_NAVIGATION_KEY(func) wx__DECLARE_EVT0(wxEVT_NAVIGATION_KEY, wxNavigationKeyEventHandler(func)) -#define EVT_PALETTE_CHANGED(func) wx__DECLARE_EVT0(wxEVT_PALETTE_CHANGED, wxPaletteChangedEventHandler(func)) -#define EVT_QUERY_NEW_PALETTE(func) wx__DECLARE_EVT0(wxEVT_QUERY_NEW_PALETTE, wxQueryNewPaletteEventHandler(func)) -#define EVT_WINDOW_CREATE(func) wx__DECLARE_EVT0(wxEVT_CREATE, wxWindowCreateEventHandler(func)) -#define EVT_WINDOW_DESTROY(func) wx__DECLARE_EVT0(wxEVT_DESTROY, wxWindowDestroyEventHandler(func)) -#define EVT_SET_CURSOR(func) wx__DECLARE_EVT0(wxEVT_SET_CURSOR, wxSetCursorEventHandler(func)) -#define EVT_MOUSE_CAPTURE_CHANGED(func) wx__DECLARE_EVT0(wxEVT_MOUSE_CAPTURE_CHANGED, wxMouseCaptureChangedEventHandler(func)) -#define EVT_MOUSE_CAPTURE_LOST(func) wx__DECLARE_EVT0(wxEVT_MOUSE_CAPTURE_LOST, wxMouseCaptureLostEventHandler(func)) - -// Mouse events -#define EVT_LEFT_DOWN(func) wx__DECLARE_EVT0(wxEVT_LEFT_DOWN, wxMouseEventHandler(func)) -#define EVT_LEFT_UP(func) wx__DECLARE_EVT0(wxEVT_LEFT_UP, wxMouseEventHandler(func)) -#define EVT_MIDDLE_DOWN(func) wx__DECLARE_EVT0(wxEVT_MIDDLE_DOWN, wxMouseEventHandler(func)) -#define EVT_MIDDLE_UP(func) wx__DECLARE_EVT0(wxEVT_MIDDLE_UP, wxMouseEventHandler(func)) -#define EVT_RIGHT_DOWN(func) wx__DECLARE_EVT0(wxEVT_RIGHT_DOWN, wxMouseEventHandler(func)) -#define EVT_RIGHT_UP(func) wx__DECLARE_EVT0(wxEVT_RIGHT_UP, wxMouseEventHandler(func)) -#define EVT_MOTION(func) wx__DECLARE_EVT0(wxEVT_MOTION, wxMouseEventHandler(func)) -#define EVT_LEFT_DCLICK(func) wx__DECLARE_EVT0(wxEVT_LEFT_DCLICK, wxMouseEventHandler(func)) -#define EVT_MIDDLE_DCLICK(func) wx__DECLARE_EVT0(wxEVT_MIDDLE_DCLICK, wxMouseEventHandler(func)) -#define EVT_RIGHT_DCLICK(func) wx__DECLARE_EVT0(wxEVT_RIGHT_DCLICK, wxMouseEventHandler(func)) -#define EVT_LEAVE_WINDOW(func) wx__DECLARE_EVT0(wxEVT_LEAVE_WINDOW, wxMouseEventHandler(func)) -#define EVT_ENTER_WINDOW(func) wx__DECLARE_EVT0(wxEVT_ENTER_WINDOW, wxMouseEventHandler(func)) -#define EVT_MOUSEWHEEL(func) wx__DECLARE_EVT0(wxEVT_MOUSEWHEEL, wxMouseEventHandler(func)) -#define EVT_MOUSE_AUX1_DOWN(func) wx__DECLARE_EVT0(wxEVT_AUX1_DOWN, wxMouseEventHandler(func)) -#define EVT_MOUSE_AUX1_UP(func) wx__DECLARE_EVT0(wxEVT_AUX1_UP, wxMouseEventHandler(func)) -#define EVT_MOUSE_AUX1_DCLICK(func) wx__DECLARE_EVT0(wxEVT_AUX1_DCLICK, wxMouseEventHandler(func)) -#define EVT_MOUSE_AUX2_DOWN(func) wx__DECLARE_EVT0(wxEVT_AUX2_DOWN, wxMouseEventHandler(func)) -#define EVT_MOUSE_AUX2_UP(func) wx__DECLARE_EVT0(wxEVT_AUX2_UP, wxMouseEventHandler(func)) -#define EVT_MOUSE_AUX2_DCLICK(func) wx__DECLARE_EVT0(wxEVT_AUX2_DCLICK, wxMouseEventHandler(func)) -#define EVT_MAGNIFY(func) wx__DECLARE_EVT0(wxEVT_MAGNIFY, wxMouseEventHandler(func)) - -// All mouse events -#define EVT_MOUSE_EVENTS(func) \ - EVT_LEFT_DOWN(func) \ - EVT_LEFT_UP(func) \ - EVT_LEFT_DCLICK(func) \ - EVT_MIDDLE_DOWN(func) \ - EVT_MIDDLE_UP(func) \ - EVT_MIDDLE_DCLICK(func) \ - EVT_RIGHT_DOWN(func) \ - EVT_RIGHT_UP(func) \ - EVT_RIGHT_DCLICK(func) \ - EVT_MOUSE_AUX1_DOWN(func) \ - EVT_MOUSE_AUX1_UP(func) \ - EVT_MOUSE_AUX1_DCLICK(func) \ - EVT_MOUSE_AUX2_DOWN(func) \ - EVT_MOUSE_AUX2_UP(func) \ - EVT_MOUSE_AUX2_DCLICK(func) \ - EVT_MOTION(func) \ - EVT_LEAVE_WINDOW(func) \ - EVT_ENTER_WINDOW(func) \ - EVT_MOUSEWHEEL(func) \ - EVT_MAGNIFY(func) - -// Scrolling from wxWindow (sent to wxScrolledWindow) -#define EVT_SCROLLWIN_TOP(func) wx__DECLARE_EVT0(wxEVT_SCROLLWIN_TOP, wxScrollWinEventHandler(func)) -#define EVT_SCROLLWIN_BOTTOM(func) wx__DECLARE_EVT0(wxEVT_SCROLLWIN_BOTTOM, wxScrollWinEventHandler(func)) -#define EVT_SCROLLWIN_LINEUP(func) wx__DECLARE_EVT0(wxEVT_SCROLLWIN_LINEUP, wxScrollWinEventHandler(func)) -#define EVT_SCROLLWIN_LINEDOWN(func) wx__DECLARE_EVT0(wxEVT_SCROLLWIN_LINEDOWN, wxScrollWinEventHandler(func)) -#define EVT_SCROLLWIN_PAGEUP(func) wx__DECLARE_EVT0(wxEVT_SCROLLWIN_PAGEUP, wxScrollWinEventHandler(func)) -#define EVT_SCROLLWIN_PAGEDOWN(func) wx__DECLARE_EVT0(wxEVT_SCROLLWIN_PAGEDOWN, wxScrollWinEventHandler(func)) -#define EVT_SCROLLWIN_THUMBTRACK(func) wx__DECLARE_EVT0(wxEVT_SCROLLWIN_THUMBTRACK, wxScrollWinEventHandler(func)) -#define EVT_SCROLLWIN_THUMBRELEASE(func) wx__DECLARE_EVT0(wxEVT_SCROLLWIN_THUMBRELEASE, wxScrollWinEventHandler(func)) - -#define EVT_SCROLLWIN(func) \ - EVT_SCROLLWIN_TOP(func) \ - EVT_SCROLLWIN_BOTTOM(func) \ - EVT_SCROLLWIN_LINEUP(func) \ - EVT_SCROLLWIN_LINEDOWN(func) \ - EVT_SCROLLWIN_PAGEUP(func) \ - EVT_SCROLLWIN_PAGEDOWN(func) \ - EVT_SCROLLWIN_THUMBTRACK(func) \ - EVT_SCROLLWIN_THUMBRELEASE(func) - -// Scrolling from wxSlider and wxScrollBar -#define EVT_SCROLL_TOP(func) wx__DECLARE_EVT0(wxEVT_SCROLL_TOP, wxScrollEventHandler(func)) -#define EVT_SCROLL_BOTTOM(func) wx__DECLARE_EVT0(wxEVT_SCROLL_BOTTOM, wxScrollEventHandler(func)) -#define EVT_SCROLL_LINEUP(func) wx__DECLARE_EVT0(wxEVT_SCROLL_LINEUP, wxScrollEventHandler(func)) -#define EVT_SCROLL_LINEDOWN(func) wx__DECLARE_EVT0(wxEVT_SCROLL_LINEDOWN, wxScrollEventHandler(func)) -#define EVT_SCROLL_PAGEUP(func) wx__DECLARE_EVT0(wxEVT_SCROLL_PAGEUP, wxScrollEventHandler(func)) -#define EVT_SCROLL_PAGEDOWN(func) wx__DECLARE_EVT0(wxEVT_SCROLL_PAGEDOWN, wxScrollEventHandler(func)) -#define EVT_SCROLL_THUMBTRACK(func) wx__DECLARE_EVT0(wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler(func)) -#define EVT_SCROLL_THUMBRELEASE(func) wx__DECLARE_EVT0(wxEVT_SCROLL_THUMBRELEASE, wxScrollEventHandler(func)) -#define EVT_SCROLL_CHANGED(func) wx__DECLARE_EVT0(wxEVT_SCROLL_CHANGED, wxScrollEventHandler(func)) - -#define EVT_SCROLL(func) \ - EVT_SCROLL_TOP(func) \ - EVT_SCROLL_BOTTOM(func) \ - EVT_SCROLL_LINEUP(func) \ - EVT_SCROLL_LINEDOWN(func) \ - EVT_SCROLL_PAGEUP(func) \ - EVT_SCROLL_PAGEDOWN(func) \ - EVT_SCROLL_THUMBTRACK(func) \ - EVT_SCROLL_THUMBRELEASE(func) \ - EVT_SCROLL_CHANGED(func) - -// Scrolling from wxSlider and wxScrollBar, with an id -#define EVT_COMMAND_SCROLL_TOP(winid, func) wx__DECLARE_EVT1(wxEVT_SCROLL_TOP, winid, wxScrollEventHandler(func)) -#define EVT_COMMAND_SCROLL_BOTTOM(winid, func) wx__DECLARE_EVT1(wxEVT_SCROLL_BOTTOM, winid, wxScrollEventHandler(func)) -#define EVT_COMMAND_SCROLL_LINEUP(winid, func) wx__DECLARE_EVT1(wxEVT_SCROLL_LINEUP, winid, wxScrollEventHandler(func)) -#define EVT_COMMAND_SCROLL_LINEDOWN(winid, func) wx__DECLARE_EVT1(wxEVT_SCROLL_LINEDOWN, winid, wxScrollEventHandler(func)) -#define EVT_COMMAND_SCROLL_PAGEUP(winid, func) wx__DECLARE_EVT1(wxEVT_SCROLL_PAGEUP, winid, wxScrollEventHandler(func)) -#define EVT_COMMAND_SCROLL_PAGEDOWN(winid, func) wx__DECLARE_EVT1(wxEVT_SCROLL_PAGEDOWN, winid, wxScrollEventHandler(func)) -#define EVT_COMMAND_SCROLL_THUMBTRACK(winid, func) wx__DECLARE_EVT1(wxEVT_SCROLL_THUMBTRACK, winid, wxScrollEventHandler(func)) -#define EVT_COMMAND_SCROLL_THUMBRELEASE(winid, func) wx__DECLARE_EVT1(wxEVT_SCROLL_THUMBRELEASE, winid, wxScrollEventHandler(func)) -#define EVT_COMMAND_SCROLL_CHANGED(winid, func) wx__DECLARE_EVT1(wxEVT_SCROLL_CHANGED, winid, wxScrollEventHandler(func)) - -#define EVT_COMMAND_SCROLL(winid, func) \ - EVT_COMMAND_SCROLL_TOP(winid, func) \ - EVT_COMMAND_SCROLL_BOTTOM(winid, func) \ - EVT_COMMAND_SCROLL_LINEUP(winid, func) \ - EVT_COMMAND_SCROLL_LINEDOWN(winid, func) \ - EVT_COMMAND_SCROLL_PAGEUP(winid, func) \ - EVT_COMMAND_SCROLL_PAGEDOWN(winid, func) \ - EVT_COMMAND_SCROLL_THUMBTRACK(winid, func) \ - EVT_COMMAND_SCROLL_THUMBRELEASE(winid, func) \ - EVT_COMMAND_SCROLL_CHANGED(winid, func) - -// Convenience macros for commonly-used commands -#define EVT_CHECKBOX(winid, func) wx__DECLARE_EVT1(wxEVT_CHECKBOX, winid, wxCommandEventHandler(func)) -#define EVT_CHOICE(winid, func) wx__DECLARE_EVT1(wxEVT_CHOICE, winid, wxCommandEventHandler(func)) -#define EVT_LISTBOX(winid, func) wx__DECLARE_EVT1(wxEVT_LISTBOX, winid, wxCommandEventHandler(func)) -#define EVT_LISTBOX_DCLICK(winid, func) wx__DECLARE_EVT1(wxEVT_LISTBOX_DCLICK, winid, wxCommandEventHandler(func)) -#define EVT_MENU(winid, func) wx__DECLARE_EVT1(wxEVT_MENU, winid, wxCommandEventHandler(func)) -#define EVT_MENU_RANGE(id1, id2, func) wx__DECLARE_EVT2(wxEVT_MENU, id1, id2, wxCommandEventHandler(func)) -#define EVT_BUTTON(winid, func) wx__DECLARE_EVT1(wxEVT_BUTTON, winid, wxCommandEventHandler(func)) -#define EVT_SLIDER(winid, func) wx__DECLARE_EVT1(wxEVT_SLIDER, winid, wxCommandEventHandler(func)) -#define EVT_RADIOBOX(winid, func) wx__DECLARE_EVT1(wxEVT_RADIOBOX, winid, wxCommandEventHandler(func)) -#define EVT_RADIOBUTTON(winid, func) wx__DECLARE_EVT1(wxEVT_RADIOBUTTON, winid, wxCommandEventHandler(func)) -// EVT_SCROLLBAR is now obsolete since we use EVT_COMMAND_SCROLL... events -#define EVT_SCROLLBAR(winid, func) wx__DECLARE_EVT1(wxEVT_SCROLLBAR, winid, wxCommandEventHandler(func)) -#define EVT_VLBOX(winid, func) wx__DECLARE_EVT1(wxEVT_VLBOX, winid, wxCommandEventHandler(func)) -#define EVT_COMBOBOX(winid, func) wx__DECLARE_EVT1(wxEVT_COMBOBOX, winid, wxCommandEventHandler(func)) -#define EVT_TOOL(winid, func) wx__DECLARE_EVT1(wxEVT_TOOL, winid, wxCommandEventHandler(func)) -#define EVT_TOOL_DROPDOWN(winid, func) wx__DECLARE_EVT1(wxEVT_TOOL_DROPDOWN, winid, wxCommandEventHandler(func)) -#define EVT_TOOL_RANGE(id1, id2, func) wx__DECLARE_EVT2(wxEVT_TOOL, id1, id2, wxCommandEventHandler(func)) -#define EVT_TOOL_RCLICKED(winid, func) wx__DECLARE_EVT1(wxEVT_TOOL_RCLICKED, winid, wxCommandEventHandler(func)) -#define EVT_TOOL_RCLICKED_RANGE(id1, id2, func) wx__DECLARE_EVT2(wxEVT_TOOL_RCLICKED, id1, id2, wxCommandEventHandler(func)) -#define EVT_TOOL_ENTER(winid, func) wx__DECLARE_EVT1(wxEVT_TOOL_ENTER, winid, wxCommandEventHandler(func)) -#define EVT_CHECKLISTBOX(winid, func) wx__DECLARE_EVT1(wxEVT_CHECKLISTBOX, winid, wxCommandEventHandler(func)) -#define EVT_COMBOBOX_DROPDOWN(winid, func) wx__DECLARE_EVT1(wxEVT_COMBOBOX_DROPDOWN, winid, wxCommandEventHandler(func)) -#define EVT_COMBOBOX_CLOSEUP(winid, func) wx__DECLARE_EVT1(wxEVT_COMBOBOX_CLOSEUP, winid, wxCommandEventHandler(func)) - -// Generic command events -#define EVT_COMMAND_LEFT_CLICK(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_LEFT_CLICK, winid, wxCommandEventHandler(func)) -#define EVT_COMMAND_LEFT_DCLICK(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_LEFT_DCLICK, winid, wxCommandEventHandler(func)) -#define EVT_COMMAND_RIGHT_CLICK(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_RIGHT_CLICK, winid, wxCommandEventHandler(func)) -#define EVT_COMMAND_RIGHT_DCLICK(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_RIGHT_DCLICK, winid, wxCommandEventHandler(func)) -#define EVT_COMMAND_SET_FOCUS(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_SET_FOCUS, winid, wxCommandEventHandler(func)) -#define EVT_COMMAND_KILL_FOCUS(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_KILL_FOCUS, winid, wxCommandEventHandler(func)) -#define EVT_COMMAND_ENTER(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_ENTER, winid, wxCommandEventHandler(func)) - -// Joystick events - -#define EVT_JOY_BUTTON_DOWN(func) wx__DECLARE_EVT0(wxEVT_JOY_BUTTON_DOWN, wxJoystickEventHandler(func)) -#define EVT_JOY_BUTTON_UP(func) wx__DECLARE_EVT0(wxEVT_JOY_BUTTON_UP, wxJoystickEventHandler(func)) -#define EVT_JOY_MOVE(func) wx__DECLARE_EVT0(wxEVT_JOY_MOVE, wxJoystickEventHandler(func)) -#define EVT_JOY_ZMOVE(func) wx__DECLARE_EVT0(wxEVT_JOY_ZMOVE, wxJoystickEventHandler(func)) - -// All joystick events -#define EVT_JOYSTICK_EVENTS(func) \ - EVT_JOY_BUTTON_DOWN(func) \ - EVT_JOY_BUTTON_UP(func) \ - EVT_JOY_MOVE(func) \ - EVT_JOY_ZMOVE(func) - -// Idle event -#define EVT_IDLE(func) wx__DECLARE_EVT0(wxEVT_IDLE, wxIdleEventHandler(func)) - -// Update UI event -#define EVT_UPDATE_UI(winid, func) wx__DECLARE_EVT1(wxEVT_UPDATE_UI, winid, wxUpdateUIEventHandler(func)) -#define EVT_UPDATE_UI_RANGE(id1, id2, func) wx__DECLARE_EVT2(wxEVT_UPDATE_UI, id1, id2, wxUpdateUIEventHandler(func)) - -// Help events -#define EVT_HELP(winid, func) wx__DECLARE_EVT1(wxEVT_HELP, winid, wxHelpEventHandler(func)) -#define EVT_HELP_RANGE(id1, id2, func) wx__DECLARE_EVT2(wxEVT_HELP, id1, id2, wxHelpEventHandler(func)) -#define EVT_DETAILED_HELP(winid, func) wx__DECLARE_EVT1(wxEVT_DETAILED_HELP, winid, wxHelpEventHandler(func)) -#define EVT_DETAILED_HELP_RANGE(id1, id2, func) wx__DECLARE_EVT2(wxEVT_DETAILED_HELP, id1, id2, wxHelpEventHandler(func)) - -// Context Menu Events -#define EVT_CONTEXT_MENU(func) wx__DECLARE_EVT0(wxEVT_CONTEXT_MENU, wxContextMenuEventHandler(func)) -#define EVT_COMMAND_CONTEXT_MENU(winid, func) wx__DECLARE_EVT1(wxEVT_CONTEXT_MENU, winid, wxContextMenuEventHandler(func)) - -// Clipboard text Events -#define EVT_TEXT_CUT(winid, func) wx__DECLARE_EVT1(wxEVT_TEXT_CUT, winid, wxClipboardTextEventHandler(func)) -#define EVT_TEXT_COPY(winid, func) wx__DECLARE_EVT1(wxEVT_TEXT_COPY, winid, wxClipboardTextEventHandler(func)) -#define EVT_TEXT_PASTE(winid, func) wx__DECLARE_EVT1(wxEVT_TEXT_PASTE, winid, wxClipboardTextEventHandler(func)) - -// Thread events -#define EVT_THREAD(id, func) wx__DECLARE_EVT1(wxEVT_THREAD, id, wxThreadEventHandler(func)) - -// ---------------------------------------------------------------------------- -// Helper functions -// ---------------------------------------------------------------------------- - -#if wxUSE_GUI - -// Find a window with the focus, that is also a descendant of the given window. -// This is used to determine the window to initially send commands to. -WXDLLIMPEXP_CORE wxWindow* wxFindFocusDescendant(wxWindow* ancestor); - -#endif // wxUSE_GUI - - -// ---------------------------------------------------------------------------- -// Compatibility macro aliases -// ---------------------------------------------------------------------------- - -// deprecated variants _not_ requiring a semicolon after them and without wx prefix -// (note that also some wx-prefixed macro do _not_ require a semicolon because -// it's not always possible to force the compiler to require it) - -#define DECLARE_EVENT_TABLE_ENTRY(type, winid, idLast, fn, obj) \ - wxDECLARE_EVENT_TABLE_ENTRY(type, winid, idLast, fn, obj) -#define DECLARE_EVENT_TABLE_TERMINATOR() wxDECLARE_EVENT_TABLE_TERMINATOR() -#define DECLARE_EVENT_TABLE() wxDECLARE_EVENT_TABLE(); -#define BEGIN_EVENT_TABLE(a,b) wxBEGIN_EVENT_TABLE(a,b) -#define BEGIN_EVENT_TABLE_TEMPLATE1(a,b,c) wxBEGIN_EVENT_TABLE_TEMPLATE1(a,b,c) -#define BEGIN_EVENT_TABLE_TEMPLATE2(a,b,c,d) wxBEGIN_EVENT_TABLE_TEMPLATE2(a,b,c,d) -#define BEGIN_EVENT_TABLE_TEMPLATE3(a,b,c,d,e) wxBEGIN_EVENT_TABLE_TEMPLATE3(a,b,c,d,e) -#define BEGIN_EVENT_TABLE_TEMPLATE4(a,b,c,d,e,f) wxBEGIN_EVENT_TABLE_TEMPLATE4(a,b,c,d,e,f) -#define BEGIN_EVENT_TABLE_TEMPLATE5(a,b,c,d,e,f,g) wxBEGIN_EVENT_TABLE_TEMPLATE5(a,b,c,d,e,f,g) -#define BEGIN_EVENT_TABLE_TEMPLATE6(a,b,c,d,e,f,g,h) wxBEGIN_EVENT_TABLE_TEMPLATE6(a,b,c,d,e,f,g,h) -#define END_EVENT_TABLE() wxEND_EVENT_TABLE() - -// other obsolete event declaration/definition macros; we don't need them any longer -// but we keep them for compatibility as it doesn't cost us anything anyhow -#define BEGIN_DECLARE_EVENT_TYPES() -#define END_DECLARE_EVENT_TYPES() -#define DECLARE_EXPORTED_EVENT_TYPE(expdecl, name, value) \ - extern expdecl const wxEventType name; -#define DECLARE_EVENT_TYPE(name, value) \ - DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_CORE, name, value) -#define DECLARE_LOCAL_EVENT_TYPE(name, value) \ - DECLARE_EXPORTED_EVENT_TYPE(wxEMPTY_PARAMETER_VALUE, name, value) -#define DEFINE_EVENT_TYPE(name) const wxEventType name = wxNewEventType(); -#define DEFINE_LOCAL_EVENT_TYPE(name) DEFINE_EVENT_TYPE(name) - -// alias for backward compatibility with 2.9.0: -#define wxEVT_COMMAND_THREAD wxEVT_THREAD -// other old wxEVT_COMMAND_* constants -#define wxEVT_COMMAND_BUTTON_CLICKED wxEVT_BUTTON -#define wxEVT_COMMAND_CHECKBOX_CLICKED wxEVT_CHECKBOX -#define wxEVT_COMMAND_CHOICE_SELECTED wxEVT_CHOICE -#define wxEVT_COMMAND_LISTBOX_SELECTED wxEVT_LISTBOX -#define wxEVT_COMMAND_LISTBOX_DOUBLECLICKED wxEVT_LISTBOX_DCLICK -#define wxEVT_COMMAND_CHECKLISTBOX_TOGGLED wxEVT_CHECKLISTBOX -#define wxEVT_COMMAND_MENU_SELECTED wxEVT_MENU -#define wxEVT_COMMAND_TOOL_CLICKED wxEVT_TOOL -#define wxEVT_COMMAND_SLIDER_UPDATED wxEVT_SLIDER -#define wxEVT_COMMAND_RADIOBOX_SELECTED wxEVT_RADIOBOX -#define wxEVT_COMMAND_RADIOBUTTON_SELECTED wxEVT_RADIOBUTTON -#define wxEVT_COMMAND_SCROLLBAR_UPDATED wxEVT_SCROLLBAR -#define wxEVT_COMMAND_VLBOX_SELECTED wxEVT_VLBOX -#define wxEVT_COMMAND_COMBOBOX_SELECTED wxEVT_COMBOBOX -#define wxEVT_COMMAND_TOOL_RCLICKED wxEVT_TOOL_RCLICKED -#define wxEVT_COMMAND_TOOL_DROPDOWN_CLICKED wxEVT_TOOL_DROPDOWN -#define wxEVT_COMMAND_TOOL_ENTER wxEVT_TOOL_ENTER -#define wxEVT_COMMAND_COMBOBOX_DROPDOWN wxEVT_COMBOBOX_DROPDOWN -#define wxEVT_COMMAND_COMBOBOX_CLOSEUP wxEVT_COMBOBOX_CLOSEUP -#define wxEVT_COMMAND_TEXT_COPY wxEVT_TEXT_COPY -#define wxEVT_COMMAND_TEXT_CUT wxEVT_TEXT_CUT -#define wxEVT_COMMAND_TEXT_PASTE wxEVT_TEXT_PASTE -#define wxEVT_COMMAND_TEXT_UPDATED wxEVT_TEXT - -#endif // _WX_EVENT_H_ diff --git a/Externals/wxWidgets3/include/wx/eventfilter.h b/Externals/wxWidgets3/include/wx/eventfilter.h deleted file mode 100644 index 30eac4d363..0000000000 --- a/Externals/wxWidgets3/include/wx/eventfilter.h +++ /dev/null @@ -1,71 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/eventfilter.h -// Purpose: wxEventFilter class declaration. -// Author: Vadim Zeitlin -// Created: 2011-11-21 -// Copyright: (c) 2011 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_EVENTFILTER_H_ -#define _WX_EVENTFILTER_H_ - -#include "wx/defs.h" - -class WXDLLIMPEXP_FWD_BASE wxEvent; -class WXDLLIMPEXP_FWD_BASE wxEvtHandler; - -// ---------------------------------------------------------------------------- -// wxEventFilter is used with wxEvtHandler::AddFilter() and ProcessEvent(). -// ---------------------------------------------------------------------------- - -class wxEventFilter -{ -public: - // Possible return values for FilterEvent(). - // - // Notice that the values of these enum elements are fixed due to backwards - // compatibility constraints. - enum - { - // Process event as usual. - Event_Skip = -1, - - // Don't process the event normally at all. - Event_Ignore = 0, - - // Event was already handled, don't process it normally. - Event_Processed = 1 - }; - - wxEventFilter() - { - m_next = NULL; - } - - virtual ~wxEventFilter() - { - wxASSERT_MSG( !m_next, "Forgot to call wxEvtHandler::RemoveFilter()?" ); - } - - // This method allows to filter all the events processed by the program, so - // you should try to return quickly from it to avoid slowing down the - // program to a crawl. - // - // Return value should be -1 to continue with the normal event processing, - // or true or false to stop further processing and pretend that the event - // had been already processed or won't be processed at all, respectively. - virtual int FilterEvent(wxEvent& event) = 0; - -private: - // Objects of this class are made to be stored in a linked list in - // wxEvtHandler so put the next node ponter directly in the class itself. - wxEventFilter* m_next; - - // And provide access to it for wxEvtHandler [only]. - friend class wxEvtHandler; - - wxDECLARE_NO_COPY_CLASS(wxEventFilter); -}; - -#endif // _WX_EVENTFILTER_H_ diff --git a/Externals/wxWidgets3/include/wx/evtloop.h b/Externals/wxWidgets3/include/wx/evtloop.h deleted file mode 100644 index 00e6d097d5..0000000000 --- a/Externals/wxWidgets3/include/wx/evtloop.h +++ /dev/null @@ -1,452 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/evtloop.h -// Purpose: declares wxEventLoop class -// Author: Vadim Zeitlin -// Modified by: -// Created: 01.06.01 -// Copyright: (c) 2001 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_EVTLOOP_H_ -#define _WX_EVTLOOP_H_ - -#include "wx/event.h" -#include "wx/utils.h" - -// TODO: implement wxEventLoopSource for MSW (it should wrap a HANDLE and be -// monitored using MsgWaitForMultipleObjects()) -#if defined(__WXOSX__) || (defined(__UNIX__) && !defined(__WINDOWS__)) - #define wxUSE_EVENTLOOP_SOURCE 1 -#else - #define wxUSE_EVENTLOOP_SOURCE 0 -#endif - -#if wxUSE_EVENTLOOP_SOURCE - class wxEventLoopSource; - class wxEventLoopSourceHandler; -#endif - -/* - NOTE ABOUT wxEventLoopBase::YieldFor LOGIC - ------------------------------------------ - - The YieldFor() function helps to avoid re-entrancy problems and problems - caused by out-of-order event processing - (see "wxYield-like problems" and "wxProgressDialog+threading BUG" wx-dev threads). - - The logic behind YieldFor() is simple: it analyzes the queue of the native - events generated by the underlying GUI toolkit and picks out and processes - only those matching the given mask. - - It's important to note that YieldFor() is used to selectively process the - events generated by the NATIVE toolkit. - Events syntethized by wxWidgets code or by user code are instead selectively - processed thanks to the logic built into wxEvtHandler::ProcessPendingEvents(). - In fact, when wxEvtHandler::ProcessPendingEvents gets called from inside a - YieldFor() call, wxEventLoopBase::IsEventAllowedInsideYield is used to decide - if the pending events for that event handler can be processed. - If all the pending events associated with that event handler result as "not processable", - the event handler "delays" itself calling wxEventLoopBase::DelayPendingEventHandler - (so it's moved: m_handlersWithPendingEvents => m_handlersWithPendingDelayedEvents). - Last, wxEventLoopBase::ProcessPendingEvents() before exiting moves the delayed - event handlers back into the list of handlers with pending events - (m_handlersWithPendingDelayedEvents => m_handlersWithPendingEvents) so that - a later call to ProcessPendingEvents() (possibly outside the YieldFor() call) - will process all pending events as usual. -*/ - -// ---------------------------------------------------------------------------- -// wxEventLoopBase: interface for wxEventLoop -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxEventLoopBase -{ -public: - // trivial, but needed (because of wxEventLoopBase) ctor - wxEventLoopBase(); - - // dtor - virtual ~wxEventLoopBase() { } - - // use this to check whether the event loop was successfully created before - // using it - virtual bool IsOk() const { return true; } - - // returns true if this is the main loop - bool IsMain() const; - -#if wxUSE_EVENTLOOP_SOURCE - // create a new event loop source wrapping the given file descriptor and - // monitor it for events occurring on this descriptor in all event loops - static wxEventLoopSource * - AddSourceForFD(int fd, wxEventLoopSourceHandler *handler, int flags); -#endif // wxUSE_EVENTLOOP_SOURCE - - // dispatch&processing - // ------------------- - - // start the event loop, return the exit code when it is finished - // - // notice that wx ports should override DoRun(), this method is virtual - // only to allow overriding it in the user code for custom event loops - virtual int Run(); - - // is this event loop running now? - // - // notice that even if this event loop hasn't terminated yet but has just - // spawned a nested (e.g. modal) event loop, this would return false - bool IsRunning() const; - - // exit from the loop with the given exit code - // - // this can be only used to exit the currently running loop, use - // ScheduleExit() if this might not be the case - virtual void Exit(int rc = 0); - - // ask the event loop to exit with the given exit code, can be used even if - // this loop is not running right now but the loop must have been started, - // i.e. Run() should have been already called - virtual void ScheduleExit(int rc = 0) = 0; - - // return true if any events are available - virtual bool Pending() const = 0; - - // dispatch a single event, return false if we should exit from the loop - virtual bool Dispatch() = 0; - - // same as Dispatch() but doesn't wait for longer than the specified (in - // ms) timeout, return true if an event was processed, false if we should - // exit the loop or -1 if timeout expired - virtual int DispatchTimeout(unsigned long timeout) = 0; - - // implement this to wake up the loop: usually done by posting a dummy event - // to it (can be called from non main thread) - virtual void WakeUp() = 0; - - - // idle handling - // ------------- - - // make sure that idle events are sent again - virtual void WakeUpIdle(); - - // this virtual function is called when the application - // becomes idle and by default it forwards to wxApp::ProcessIdle() and - // while it can be overridden in a custom event loop, you must call the - // base class version to ensure that idle events are still generated - // - // it should return true if more idle events are needed, false if not - virtual bool ProcessIdle(); - - - // Yield-related hooks - // ------------------- - - // process all currently pending events right now - // - // if onlyIfNeeded is true, returns false without doing anything else if - // we're already inside Yield() - // - // WARNING: this function is dangerous as it can lead to unexpected - // reentrancies (i.e. when called from an event handler it - // may result in calling the same event handler again), use - // with _extreme_ care or, better, don't use at all! - bool Yield(bool onlyIfNeeded = false); - - // more selective version of Yield() - // - // notice that it is virtual for backwards-compatibility but new code - // should override DoYieldFor() and not YieldFor() itself - virtual bool YieldFor(long eventsToProcess); - - // returns true if the main thread is inside a Yield() call - virtual bool IsYielding() const - { return m_yieldLevel != 0; } - - // returns true if events of the given event category should be immediately - // processed inside a wxApp::Yield() call or rather should be queued for - // later processing by the main event loop - virtual bool IsEventAllowedInsideYield(wxEventCategory cat) const - { return (m_eventsToProcessInsideYield & cat) != 0; } - - // no SafeYield hooks since it uses wxWindow which is not available when wxUSE_GUI=0 - - - // active loop - // ----------- - - // return currently active (running) event loop, may be NULL - static wxEventLoopBase *GetActive() { return ms_activeLoop; } - - // set currently active (running) event loop - static void SetActive(wxEventLoopBase* loop); - - -protected: - // real implementation of Run() - virtual int DoRun() = 0; - - // And the real, port-specific, implementation of YieldFor(). - // - // The base class version is pure virtual to ensure that it is overridden - // in the derived classes but does have an implementation which processes - // pending events in wxApp if eventsToProcess allows it, and so should be - // called from the overridden version at an appropriate place (i.e. after - // processing the native events but before doing anything else that could - // be affected by pending events dispatching). - virtual void DoYieldFor(long eventsToProcess) = 0; - - // this function should be called before the event loop terminates, whether - // this happens normally (because of Exit() call) or abnormally (because of - // an exception thrown from inside the loop) - virtual void OnExit(); - - // Return true if we're currently inside our Run(), even if another nested - // event loop is currently running, unlike IsRunning() (which should have - // been really called IsActive() but it's too late to change this now). - bool IsInsideRun() const { return m_isInsideRun; } - - - // the pointer to currently active loop - static wxEventLoopBase *ms_activeLoop; - - // should we exit the loop? - bool m_shouldExit; - - // incremented each time on entering Yield() and decremented on leaving it - int m_yieldLevel; - - // the argument of the last call to YieldFor() - long m_eventsToProcessInsideYield; - -private: - // this flag is set on entry into Run() and reset before leaving it - bool m_isInsideRun; - - wxDECLARE_NO_COPY_CLASS(wxEventLoopBase); -}; - -#if defined(__WINDOWS__) || defined(__WXMAC__) || defined(__WXDFB__) || (defined(__UNIX__) && !defined(__WXOSX__)) - -// this class can be used to implement a standard event loop logic using -// Pending() and Dispatch() -// -// it also handles idle processing automatically -class WXDLLIMPEXP_BASE wxEventLoopManual : public wxEventLoopBase -{ -public: - wxEventLoopManual(); - - // sets the "should exit" flag and wakes up the loop so that it terminates - // soon - virtual void ScheduleExit(int rc = 0) wxOVERRIDE; - -protected: - // enters a loop calling OnNextIteration(), Pending() and Dispatch() and - // terminating when Exit() is called - virtual int DoRun() wxOVERRIDE; - - // may be overridden to perform some action at the start of each new event - // loop iteration - virtual void OnNextIteration() { } - - - // the loop exit code - int m_exitcode; - -private: - // process all already pending events and dispatch a new one (blocking - // until it appears in the event queue if necessary) - // - // returns the return value of Dispatch() - bool ProcessEvents(); - - wxDECLARE_NO_COPY_CLASS(wxEventLoopManual); -}; - -#endif // platforms using "manual" loop - -// we're moving away from old m_impl wxEventLoop model as otherwise the user -// code doesn't have access to platform-specific wxEventLoop methods and this -// can sometimes be very useful (e.g. under MSW this is necessary for -// integration with MFC) but currently this is not done for all ports yet (e.g. -// wxX11) so fall back to the old wxGUIEventLoop definition below for them - -#if defined(__DARWIN__) - // CoreFoundation-based event loop is currently in wxBase so include it in - // any case too (although maybe it actually shouldn't be there at all) - #include "wx/osx/core/evtloop.h" -#endif - -// include the header defining wxConsoleEventLoop -#if defined(__UNIX__) && !defined(__WINDOWS__) - #include "wx/unix/evtloop.h" -#elif defined(__WINDOWS__) - #include "wx/msw/evtloopconsole.h" -#endif - -#if wxUSE_GUI - -// include the appropriate header defining wxGUIEventLoop - -#if defined(__WXMSW__) - #include "wx/msw/evtloop.h" -#elif defined(__WXOSX__) - #include "wx/osx/evtloop.h" -#elif defined(__WXDFB__) - #include "wx/dfb/evtloop.h" -#elif defined(__WXGTK20__) - #include "wx/gtk/evtloop.h" - #elif defined(__WXQT__) - #include "wx/qt/evtloop.h" -#else // other platform - -#include "wx/stopwatch.h" // for wxMilliClock_t - -class WXDLLIMPEXP_FWD_CORE wxEventLoopImpl; - -class WXDLLIMPEXP_CORE wxGUIEventLoop : public wxEventLoopBase -{ -public: - wxGUIEventLoop() { m_impl = NULL; } - virtual ~wxGUIEventLoop(); - - virtual void ScheduleExit(int rc = 0); - virtual bool Pending() const; - virtual bool Dispatch(); - virtual int DispatchTimeout(unsigned long timeout) - { - // TODO: this is, of course, horribly inefficient and a proper wait with - // timeout should be implemented for all ports natively... - const wxMilliClock_t timeEnd = wxGetLocalTimeMillis() + timeout; - for ( ;; ) - { - if ( Pending() ) - return Dispatch(); - - if ( wxGetLocalTimeMillis() >= timeEnd ) - return -1; - } - } - virtual void WakeUp() { } - -protected: - virtual int DoRun(); - virtual void DoYieldFor(long eventsToProcess); - - // the pointer to the port specific implementation class - wxEventLoopImpl *m_impl; - - wxDECLARE_NO_COPY_CLASS(wxGUIEventLoop); -}; - -#endif // platforms - -#endif // wxUSE_GUI - -#if wxUSE_GUI - // we use a class rather than a typedef because wxEventLoop is - // forward-declared in many places - class wxEventLoop : public wxGUIEventLoop { }; -#else // !wxUSE_GUI - // we can't define wxEventLoop differently in GUI and base libraries so use - // a #define to still allow writing wxEventLoop in the user code - #if wxUSE_CONSOLE_EVENTLOOP && (defined(__WINDOWS__) || defined(__UNIX__)) - #define wxEventLoop wxConsoleEventLoop - #else // we still must define it somehow for the code below... - #define wxEventLoop wxEventLoopBase - #endif -#endif - -inline bool wxEventLoopBase::IsRunning() const { return GetActive() == this; } - -#if wxUSE_GUI && !defined(__WXOSX__) -// ---------------------------------------------------------------------------- -// wxModalEventLoop -// ---------------------------------------------------------------------------- - -// this is a naive generic implementation which uses wxWindowDisabler to -// implement modality, we will surely need platform-specific implementations -// too, this generic implementation is here only temporarily to see how it -// works -class WXDLLIMPEXP_CORE wxModalEventLoop : public wxGUIEventLoop -{ -public: - wxModalEventLoop(wxWindow *winModal) - { - m_windowDisabler = new wxWindowDisabler(winModal); - } - -protected: - virtual void OnExit() wxOVERRIDE - { - delete m_windowDisabler; - m_windowDisabler = NULL; - - wxGUIEventLoop::OnExit(); - } - -private: - wxWindowDisabler *m_windowDisabler; -}; - -#endif //wxUSE_GUI - -// ---------------------------------------------------------------------------- -// wxEventLoopActivator: helper class for wxEventLoop implementations -// ---------------------------------------------------------------------------- - -// this object sets the wxEventLoop given to the ctor as the currently active -// one and unsets it in its dtor, this is especially useful in presence of -// exceptions but is more tidy even when we don't use them -class wxEventLoopActivator -{ -public: - wxEventLoopActivator(wxEventLoopBase *evtLoop) - { - m_evtLoopOld = wxEventLoopBase::GetActive(); - wxEventLoopBase::SetActive(evtLoop); - } - - ~wxEventLoopActivator() - { - // restore the previously active event loop - wxEventLoopBase::SetActive(m_evtLoopOld); - } - -private: - wxEventLoopBase *m_evtLoopOld; -}; - -#if wxUSE_GUI || wxUSE_CONSOLE_EVENTLOOP - -class wxEventLoopGuarantor -{ -public: - wxEventLoopGuarantor() - { - m_evtLoopNew = NULL; - if (!wxEventLoop::GetActive()) - { - m_evtLoopNew = new wxEventLoop; - wxEventLoop::SetActive(m_evtLoopNew); - } - } - - ~wxEventLoopGuarantor() - { - if (m_evtLoopNew) - { - wxEventLoop::SetActive(NULL); - delete m_evtLoopNew; - } - } - -private: - wxEventLoop *m_evtLoopNew; -}; - -#endif // wxUSE_GUI || wxUSE_CONSOLE_EVENTLOOP - -#endif // _WX_EVTLOOP_H_ diff --git a/Externals/wxWidgets3/include/wx/evtloopsrc.h b/Externals/wxWidgets3/include/wx/evtloopsrc.h deleted file mode 100644 index 6b7f2b1fdd..0000000000 --- a/Externals/wxWidgets3/include/wx/evtloopsrc.h +++ /dev/null @@ -1,104 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/evtloopsrc.h -// Purpose: declaration of wxEventLoopSource class -// Author: Vadim Zeitlin -// Created: 2009-10-21 -// Copyright: (c) 2009 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_EVTLOOPSRC_H_ -#define _WX_EVTLOOPSRC_H_ - -// Include the header to get wxUSE_EVENTLOOP_SOURCE definition from it. -#include "wx/evtloop.h" -// ---------------------------------------------------------------------------- -// wxEventLoopSource: a source of events which may be added to wxEventLoop -// ---------------------------------------------------------------------------- - -// TODO: refactor wxSocket under Unix to reuse wxEventLoopSource instead of -// duplicating much of its logic -// -// TODO: freeze the API and document it - -#if wxUSE_EVENTLOOP_SOURCE - -#define wxTRACE_EVT_SOURCE "EventSource" - -// handler used to process events on event loop sources -class wxEventLoopSourceHandler -{ -public: - // called when descriptor is available for non-blocking read - virtual void OnReadWaiting() = 0; - - // called when descriptor is available for non-blocking write - virtual void OnWriteWaiting() = 0; - - // called when there is exception on descriptor - virtual void OnExceptionWaiting() = 0; - - // virtual dtor for the base class - virtual ~wxEventLoopSourceHandler() { } -}; - -// flags describing which kind of IO events we're interested in -enum -{ - wxEVENT_SOURCE_INPUT = 0x01, - wxEVENT_SOURCE_OUTPUT = 0x02, - wxEVENT_SOURCE_EXCEPTION = 0x04, - wxEVENT_SOURCE_ALL = wxEVENT_SOURCE_INPUT | - wxEVENT_SOURCE_OUTPUT | - wxEVENT_SOURCE_EXCEPTION -}; - -// wxEventLoopSource itself is an ABC and can't be created directly, currently -// the only way to create it is by using wxEventLoop::AddSourceForFD(). -class wxEventLoopSource -{ -public: - // dtor is pure virtual because it must be overridden to remove the source - // from the event loop monitoring it - virtual ~wxEventLoopSource() = 0; - - void SetHandler(wxEventLoopSourceHandler* handler) { m_handler = handler; } - wxEventLoopSourceHandler* GetHandler() const { return m_handler; } - - void SetFlags(int flags) { m_flags = flags; } - int GetFlags() const { return m_flags; } - -protected: - // ctor is only used by the derived classes - wxEventLoopSource(wxEventLoopSourceHandler *handler, int flags) - : m_handler(handler), - m_flags(flags) - { - } - - wxEventLoopSourceHandler* m_handler; - int m_flags; - - wxDECLARE_NO_COPY_CLASS(wxEventLoopSource); -}; - -inline wxEventLoopSource::~wxEventLoopSource() { } - -#if defined(__UNIX__) - #include "wx/unix/evtloopsrc.h" -#endif // __UNIX__ - -#if defined(__WXGTK20__) - #include "wx/gtk/evtloopsrc.h" -#endif - -#if defined(__DARWIN__) - #include "wx/osx/evtloopsrc.h" -#elif defined(__WXQT__) - #include "wx/unix/evtloopsrc.h" -#endif - -#endif // wxUSE_EVENTLOOP_SOURCE - -#endif // _WX_EVTLOOPSRC_H_ - diff --git a/Externals/wxWidgets3/include/wx/except.h b/Externals/wxWidgets3/include/wx/except.h deleted file mode 100644 index 75589163e3..0000000000 --- a/Externals/wxWidgets3/include/wx/except.h +++ /dev/null @@ -1,40 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/except.h -// Purpose: C++ exception related stuff -// Author: Vadim Zeitlin -// Modified by: -// Created: 17.09.2003 -// Copyright: (c) 2003 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_EXCEPT_H_ -#define _WX_EXCEPT_H_ - -#include "wx/defs.h" - -// ---------------------------------------------------------------------------- -// macros working whether wxUSE_EXCEPTIONS is 0 or 1 -// ---------------------------------------------------------------------------- - -// even if the library itself was compiled with exceptions support, the user -// code using it might be compiling with a compiler switch disabling them in -// which cases we shouldn't use try/catch in the headers -- this results in -// compilation errors in e.g. wx/scopeguard.h with at least g++ 4 -#if !wxUSE_EXCEPTIONS || \ - (defined(__GNUG__) && !defined(__EXCEPTIONS)) - #ifndef wxNO_EXCEPTIONS - #define wxNO_EXCEPTIONS - #endif -#endif - -#ifdef wxNO_EXCEPTIONS - #define wxTRY - #define wxCATCH_ALL(code) -#else // do use exceptions - #define wxTRY try - #define wxCATCH_ALL(code) catch ( ... ) { code } -#endif // wxNO_EXCEPTIONS/!wxNO_EXCEPTIONS - -#endif // _WX_EXCEPT_H_ - diff --git a/Externals/wxWidgets3/include/wx/fdrepdlg.h b/Externals/wxWidgets3/include/wx/fdrepdlg.h deleted file mode 100644 index 1c7f46f55e..0000000000 --- a/Externals/wxWidgets3/include/wx/fdrepdlg.h +++ /dev/null @@ -1,203 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/fdrepdlg.h -// Purpose: wxFindReplaceDialog class -// Author: Markus Greither and Vadim Zeitlin -// Modified by: -// Created: 23/03/2001 -// Copyright: (c) Markus Greither -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_FINDREPLACEDLG_H_ -#define _WX_FINDREPLACEDLG_H_ - -#include "wx/defs.h" - -#if wxUSE_FINDREPLDLG - -#include "wx/dialog.h" - -class WXDLLIMPEXP_FWD_CORE wxFindDialogEvent; -class WXDLLIMPEXP_FWD_CORE wxFindReplaceDialog; -class WXDLLIMPEXP_FWD_CORE wxFindReplaceData; -class WXDLLIMPEXP_FWD_CORE wxFindReplaceDialogImpl; - -// ---------------------------------------------------------------------------- -// Flags for wxFindReplaceData.Flags -// ---------------------------------------------------------------------------- - -// flages used by wxFindDialogEvent::GetFlags() -enum wxFindReplaceFlags -{ - // downward search/replace selected (otherwise - upwards) - wxFR_DOWN = 1, - - // whole word search/replace selected - wxFR_WHOLEWORD = 2, - - // case sensitive search/replace selected (otherwise - case insensitive) - wxFR_MATCHCASE = 4 -}; - -// these flags can be specified in wxFindReplaceDialog ctor or Create() -enum wxFindReplaceDialogStyles -{ - // replace dialog (otherwise find dialog) - wxFR_REPLACEDIALOG = 1, - - // don't allow changing the search direction - wxFR_NOUPDOWN = 2, - - // don't allow case sensitive searching - wxFR_NOMATCHCASE = 4, - - // don't allow whole word searching - wxFR_NOWHOLEWORD = 8 -}; - -// ---------------------------------------------------------------------------- -// wxFindReplaceData: holds Setup Data/Feedback Data for wxFindReplaceDialog -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxFindReplaceData : public wxObject -{ -public: - wxFindReplaceData() { Init(); } - wxFindReplaceData(wxUint32 flags) { Init(); SetFlags(flags); } - - // accessors - const wxString& GetFindString() const { return m_FindWhat; } - const wxString& GetReplaceString() const { return m_ReplaceWith; } - - int GetFlags() const { return m_Flags; } - - // setters: may only be called before showing the dialog, no effect later - void SetFlags(wxUint32 flags) { m_Flags = flags; } - - void SetFindString(const wxString& str) { m_FindWhat = str; } - void SetReplaceString(const wxString& str) { m_ReplaceWith = str; } - -protected: - void Init(); - -private: - wxUint32 m_Flags; - wxString m_FindWhat, - m_ReplaceWith; - - friend class wxFindReplaceDialogBase; -}; - -// ---------------------------------------------------------------------------- -// wxFindReplaceDialogBase -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxFindReplaceDialogBase : public wxDialog -{ -public: - // ctors and such - wxFindReplaceDialogBase() { m_FindReplaceData = NULL; } - wxFindReplaceDialogBase(wxWindow * WXUNUSED(parent), - wxFindReplaceData *data, - const wxString& WXUNUSED(title), - int WXUNUSED(style) = 0) - { - m_FindReplaceData = data; - } - - virtual ~wxFindReplaceDialogBase(); - - // find dialog data access - const wxFindReplaceData *GetData() const { return m_FindReplaceData; } - void SetData(wxFindReplaceData *data) { m_FindReplaceData = data; } - - // implementation only, don't use - void Send(wxFindDialogEvent& event); - -protected: - wxFindReplaceData *m_FindReplaceData; - - // the last string we searched for - wxString m_lastSearch; - - wxDECLARE_NO_COPY_CLASS(wxFindReplaceDialogBase); -}; - -// include wxFindReplaceDialog declaration -#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) - #include "wx/msw/fdrepdlg.h" -#else - #define wxGenericFindReplaceDialog wxFindReplaceDialog - - #include "wx/generic/fdrepdlg.h" -#endif - -// ---------------------------------------------------------------------------- -// wxFindReplaceDialog events -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxFindDialogEvent : public wxCommandEvent -{ -public: - wxFindDialogEvent(wxEventType commandType = wxEVT_NULL, int id = 0) - : wxCommandEvent(commandType, id) { } - wxFindDialogEvent(const wxFindDialogEvent& event) - : wxCommandEvent(event), m_strReplace(event.m_strReplace) { } - - int GetFlags() const { return GetInt(); } - wxString GetFindString() const { return GetString(); } - const wxString& GetReplaceString() const { return m_strReplace; } - - wxFindReplaceDialog *GetDialog() const - { return wxStaticCast(GetEventObject(), wxFindReplaceDialog); } - - // implementation only - void SetFlags(int flags) { SetInt(flags); } - void SetFindString(const wxString& str) { SetString(str); } - void SetReplaceString(const wxString& str) { m_strReplace = str; } - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxFindDialogEvent(*this); } - -private: - wxString m_strReplace; - - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxFindDialogEvent); -}; - -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_FIND, wxFindDialogEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_FIND_NEXT, wxFindDialogEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_FIND_REPLACE, wxFindDialogEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_FIND_REPLACE_ALL, wxFindDialogEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_FIND_CLOSE, wxFindDialogEvent ); - -typedef void (wxEvtHandler::*wxFindDialogEventFunction)(wxFindDialogEvent&); - -#define wxFindDialogEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxFindDialogEventFunction, func) - -#define EVT_FIND(id, fn) \ - wx__DECLARE_EVT1(wxEVT_FIND, id, wxFindDialogEventHandler(fn)) - -#define EVT_FIND_NEXT(id, fn) \ - wx__DECLARE_EVT1(wxEVT_FIND_NEXT, id, wxFindDialogEventHandler(fn)) - -#define EVT_FIND_REPLACE(id, fn) \ - wx__DECLARE_EVT1(wxEVT_FIND_REPLACE, id, wxFindDialogEventHandler(fn)) - -#define EVT_FIND_REPLACE_ALL(id, fn) \ - wx__DECLARE_EVT1(wxEVT_FIND_REPLACE_ALL, id, wxFindDialogEventHandler(fn)) - -#define EVT_FIND_CLOSE(id, fn) \ - wx__DECLARE_EVT1(wxEVT_FIND_CLOSE, id, wxFindDialogEventHandler(fn)) - -// old wxEVT_COMMAND_* constants -#define wxEVT_COMMAND_FIND wxEVT_FIND -#define wxEVT_COMMAND_FIND_NEXT wxEVT_FIND_NEXT -#define wxEVT_COMMAND_FIND_REPLACE wxEVT_FIND_REPLACE -#define wxEVT_COMMAND_FIND_REPLACE_ALL wxEVT_FIND_REPLACE_ALL -#define wxEVT_COMMAND_FIND_CLOSE wxEVT_FIND_CLOSE - -#endif // wxUSE_FINDREPLDLG - -#endif - // _WX_FDREPDLG_H diff --git a/Externals/wxWidgets3/include/wx/features.h b/Externals/wxWidgets3/include/wx/features.h deleted file mode 100644 index 46ac758cd7..0000000000 --- a/Externals/wxWidgets3/include/wx/features.h +++ /dev/null @@ -1,111 +0,0 @@ -/** -* Name: wx/features.h -* Purpose: test macros for the features which might be available in some -* wxWidgets ports but not others -* Author: Vadim Zeitlin -* Modified by: Ryan Norton (Converted to C) -* Created: 18.03.02 -* Copyright: (c) 2002 Vadim Zeitlin -* Licence: wxWindows licence -*/ - -/* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */ - -#ifndef _WX_FEATURES_H_ -#define _WX_FEATURES_H_ - -/* radio menu items are currently not implemented in wxMotif, use this - symbol (kept for compatibility from the time when they were not implemented - under other platforms as well) to test for this */ -#if !defined(__WXMOTIF__) - #define wxHAS_RADIO_MENU_ITEMS -#else - #undef wxHAS_RADIO_MENU_ITEMS -#endif - -/* the raw keyboard codes are generated under wxGTK and wxMSW only */ -#if defined(__WXGTK__) || defined(__WXMSW__) || defined(__WXMAC__) \ - || defined(__WXDFB__) - #define wxHAS_RAW_KEY_CODES -#else - #undef wxHAS_RAW_KEY_CODES -#endif - -/* taskbar is implemented in the major ports */ -#if defined(__WXMSW__) \ - || defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXX11__) \ - || defined(__WXOSX_MAC__) || defined(__WXQT__) - #define wxHAS_TASK_BAR_ICON -#else - #undef wxUSE_TASKBARICON - #define wxUSE_TASKBARICON 0 - #undef wxHAS_TASK_BAR_ICON -#endif - -/* wxIconLocation appeared in the middle of 2.5.0 so it's handy to have a */ -/* separate define for it */ -#define wxHAS_ICON_LOCATION - -/* same for wxCrashReport */ -#ifdef __WXMSW__ - #define wxHAS_CRASH_REPORT -#else - #undef wxHAS_CRASH_REPORT -#endif - -/* wxRE_ADVANCED is not always available, depending on regex library used - * (it's unavailable only if compiling via configure against system library) */ -#ifndef WX_NO_REGEX_ADVANCED - #define wxHAS_REGEX_ADVANCED -#else - #undef wxHAS_REGEX_ADVANCED -#endif - -/* Pango-based ports and wxDFB use UTF-8 for text and font encodings - * internally and so their fonts can handle any encodings: */ -#if wxUSE_PANGO || defined(__WXDFB__) - #define wxHAS_UTF8_FONTS -#endif - -/* This is defined when the underlying toolkit handles tab traversal natively. - Otherwise we implement it ourselves in wxControlContainer. */ -#if defined(__WXGTK20__) || defined(__WXQT__) - #define wxHAS_NATIVE_TAB_TRAVERSAL -#endif - -/* This is defined when the compiler provides some type of extended locale - functions. Otherwise, we implement them ourselves to only support the - 'C' locale */ -#if defined(HAVE_LOCALE_T) || \ - (wxCHECK_VISUALC_VERSION(8)) - #define wxHAS_XLOCALE_SUPPORT -#else - #undef wxHAS_XLOCALE_SUPPORT -#endif - -/* Direct access to bitmap data is not implemented in all ports yet */ -#if defined(__WXGTK20__) || defined(__WXMAC__) || defined(__WXDFB__) || \ - defined(__WXMSW__) || defined(__WXQT__) - - /* - HP aCC for PA-RISC can't deal with templates in wx/rawbmp.h. - */ - #if !(defined(__HP_aCC) && defined(__hppa)) - #define wxHAS_RAW_BITMAP - #endif -#endif - -/* also define deprecated synonym which exists for compatibility only */ -#ifdef wxHAS_RAW_BITMAP - #define wxHAVE_RAW_BITMAP -#endif - - -// Previously this symbol wasn't defined for all compilers as Bind() couldn't -// be implemented for some of them (notably MSVC 6), but this is not the case -// any more and Bind() is always implemented when using any currently supported -// compiler, so this symbol exists purely for compatibility. -#define wxHAS_EVENT_BIND - -#endif /* _WX_FEATURES_H_ */ - diff --git a/Externals/wxWidgets3/include/wx/ffile.h b/Externals/wxWidgets3/include/wx/ffile.h deleted file mode 100644 index 91a7c28ed4..0000000000 --- a/Externals/wxWidgets3/include/wx/ffile.h +++ /dev/null @@ -1,109 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/ffile.h -// Purpose: wxFFile - encapsulates "FILE *" stream -// Author: Vadim Zeitlin -// Modified by: -// Created: 14.07.99 -// Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_FFILE_H_ -#define _WX_FFILE_H_ - -#include "wx/defs.h" // for wxUSE_FFILE - -#if wxUSE_FFILE - -#include "wx/string.h" -#include "wx/filefn.h" -#include "wx/convauto.h" - -#include - -// ---------------------------------------------------------------------------- -// class wxFFile: standard C stream library IO -// -// NB: for space efficiency this class has no virtual functions, including -// dtor which is _not_ virtual, so it shouldn't be used as a base class. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxFFile -{ -public: - // ctors - // ----- - // def ctor - wxFFile() { m_fp = NULL; } - // open specified file (may fail, use IsOpened()) - wxFFile(const wxString& filename, const wxString& mode = wxT("r")); - // attach to (already opened) file - wxFFile(FILE *lfp) { m_fp = lfp; } - - // open/close - // open a file (existing or not - the mode controls what happens) - bool Open(const wxString& filename, const wxString& mode = wxT("r")); - // closes the opened file (this is a NOP if not opened) - bool Close(); - - // assign an existing file descriptor and get it back from wxFFile object - void Attach(FILE *lfp, const wxString& name = wxEmptyString) - { Close(); m_fp = lfp; m_name = name; } - FILE* Detach() { FILE* fpOld = m_fp; m_fp = NULL; return fpOld; } - FILE *fp() const { return m_fp; } - - // read/write (unbuffered) - // read all data from the file into a string (useful for text files) - bool ReadAll(wxString *str, const wxMBConv& conv = wxConvAuto()); - // returns number of bytes read - use Eof() and Error() to see if an error - // occurred or not - size_t Read(void *pBuf, size_t nCount); - // returns the number of bytes written - size_t Write(const void *pBuf, size_t nCount); - // returns true on success - bool Write(const wxString& s, const wxMBConv& conv = wxConvAuto()); - // flush data not yet written - bool Flush(); - - // file pointer operations (return ofsInvalid on failure) - // move ptr ofs bytes related to start/current pos/end of file - bool Seek(wxFileOffset ofs, wxSeekMode mode = wxFromStart); - // move ptr to ofs bytes before the end - bool SeekEnd(wxFileOffset ofs = 0) { return Seek(ofs, wxFromEnd); } - // get current position in the file - wxFileOffset Tell() const; - // get current file length - wxFileOffset Length() const; - - // simple accessors: note that Eof() and Error() may only be called if - // IsOpened()! - // is file opened? - bool IsOpened() const { return m_fp != NULL; } - // is end of file reached? - bool Eof() const { return feof(m_fp) != 0; } - // has an error occurred? - bool Error() const { return ferror(m_fp) != 0; } - // get the file name - const wxString& GetName() const { return m_name; } - // type such as disk or pipe - wxFileKind GetKind() const { return wxGetFileKind(m_fp); } - - // dtor closes the file if opened - ~wxFFile() { Close(); } - -private: - // copy ctor and assignment operator are private because it doesn't make - // sense to copy files this way: attempt to do it will provoke a compile-time - // error. - wxFFile(const wxFFile&); - wxFFile& operator=(const wxFFile&); - - FILE *m_fp; // IO stream or NULL if not opened - - wxString m_name; // the name of the file (for diagnostic messages) -}; - -#endif // wxUSE_FFILE - -#endif // _WX_FFILE_H_ - diff --git a/Externals/wxWidgets3/include/wx/file.h b/Externals/wxWidgets3/include/wx/file.h deleted file mode 100644 index 00ac471abf..0000000000 --- a/Externals/wxWidgets3/include/wx/file.h +++ /dev/null @@ -1,190 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/file.h -// Purpose: wxFile - encapsulates low-level "file descriptor" -// wxTempFile - safely replace the old file -// Author: Vadim Zeitlin -// Modified by: -// Created: 29/01/98 -// Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_FILEH__ -#define _WX_FILEH__ - -#include "wx/defs.h" - -#if wxUSE_FILE - -#include "wx/string.h" -#include "wx/filefn.h" -#include "wx/convauto.h" - -// ---------------------------------------------------------------------------- -// class wxFile: raw file IO -// -// NB: for space efficiency this class has no virtual functions, including -// dtor which is _not_ virtual, so it shouldn't be used as a base class. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxFile -{ -public: - // more file constants - // ------------------- - // opening mode - enum OpenMode { read, write, read_write, write_append, write_excl }; - // standard values for file descriptor - enum { fd_invalid = -1, fd_stdin, fd_stdout, fd_stderr }; - - // static functions - // ---------------- - // check whether a regular file by this name exists - static bool Exists(const wxString& name); - // check whether we can access the given file in given mode - // (only read and write make sense here) - static bool Access(const wxString& name, OpenMode mode); - - // ctors - // ----- - // def ctor - wxFile() { m_fd = fd_invalid; m_lasterror = 0; } - // open specified file (may fail, use IsOpened()) - wxFile(const wxString& fileName, OpenMode mode = read); - // attach to (already opened) file - wxFile(int lfd) { m_fd = lfd; m_lasterror = 0; } - - // open/close - // create a new file (with the default value of bOverwrite, it will fail if - // the file already exists, otherwise it will overwrite it and succeed) - bool Create(const wxString& fileName, bool bOverwrite = false, - int access = wxS_DEFAULT); - bool Open(const wxString& fileName, OpenMode mode = read, - int access = wxS_DEFAULT); - bool Close(); // Close is a NOP if not opened - - // assign an existing file descriptor and get it back from wxFile object - void Attach(int lfd) { Close(); m_fd = lfd; m_lasterror = 0; } - int Detach() { int fdOld = m_fd; m_fd = fd_invalid; return fdOld; } - int fd() const { return m_fd; } - - // read/write (unbuffered) - // read all data from the file into a string (useful for text files) - bool ReadAll(wxString *str, const wxMBConv& conv = wxConvAuto()); - // returns number of bytes read or wxInvalidOffset on error - ssize_t Read(void *pBuf, size_t nCount); - // returns the number of bytes written - size_t Write(const void *pBuf, size_t nCount); - // returns true on success - bool Write(const wxString& s, const wxMBConv& conv = wxConvAuto()); - // flush data not yet written - bool Flush(); - - // file pointer operations (return wxInvalidOffset on failure) - // move ptr ofs bytes related to start/current offset/end of file - wxFileOffset Seek(wxFileOffset ofs, wxSeekMode mode = wxFromStart); - // move ptr to ofs bytes before the end - wxFileOffset SeekEnd(wxFileOffset ofs = 0) { return Seek(ofs, wxFromEnd); } - // get current offset - wxFileOffset Tell() const; - // get current file length - wxFileOffset Length() const; - - // simple accessors - // is file opened? - bool IsOpened() const { return m_fd != fd_invalid; } - // is end of file reached? - bool Eof() const; - // has an error occurred? - bool Error() const { return m_lasterror != 0; } - // get last errno - int GetLastError() const { return m_lasterror; } - // reset error state - void ClearLastError() { m_lasterror = 0; } - // type such as disk or pipe - wxFileKind GetKind() const { return wxGetFileKind(m_fd); } - - - // dtor closes the file if opened - ~wxFile() { Close(); } - -private: - // copy ctor and assignment operator are private because - // it doesn't make sense to copy files this way: - // attempt to do it will provoke a compile-time error. - wxFile(const wxFile&); - wxFile& operator=(const wxFile&); - - // Copy the value of errno into m_lasterror if rc == -1 and return true in - // this case (indicating that we've got an error). Otherwise return false. - // - // Notice that we use the possibly 64 bit wxFileOffset instead of int here so - // that it works for checking the result of functions such as tell() too. - bool CheckForError(wxFileOffset rc) const; - - - int m_fd; // file descriptor or INVALID_FD if not opened - int m_lasterror; // errno value of last error -}; - -// ---------------------------------------------------------------------------- -// class wxTempFile: if you want to replace another file, create an instance -// of wxTempFile passing the name of the file to be replaced to the ctor. Then -// you can write to wxTempFile and call Commit() function to replace the old -// file (and close this one) or call Discard() to cancel the modification. If -// you call neither of them, dtor will call Discard(). -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxTempFile -{ -public: - // ctors - // default - wxTempFile() { } - // associates the temp file with the file to be replaced and opens it - wxTempFile(const wxString& strName); - - // open the temp file (strName is the name of file to be replaced) - bool Open(const wxString& strName); - - // is the file opened? - bool IsOpened() const { return m_file.IsOpened(); } - // get current file length - wxFileOffset Length() const { return m_file.Length(); } - // move ptr ofs bytes related to start/current offset/end of file - wxFileOffset Seek(wxFileOffset ofs, wxSeekMode mode = wxFromStart) - { return m_file.Seek(ofs, mode); } - // get current offset - wxFileOffset Tell() const { return m_file.Tell(); } - - // I/O (both functions return true on success, false on failure) - bool Write(const void *p, size_t n) { return m_file.Write(p, n) == n; } - bool Write(const wxString& str, const wxMBConv& conv = wxMBConvUTF8()) - { return m_file.Write(str, conv); } - - // flush data: can be called before closing file to ensure that data was - // correctly written out - bool Flush() { return m_file.Flush(); } - - // different ways to close the file - // validate changes and delete the old file of name m_strName - bool Commit(); - // discard changes - void Discard(); - - // dtor calls Discard() if file is still opened - ~wxTempFile(); - -private: - // no copy ctor/assignment operator - wxTempFile(const wxTempFile&); - wxTempFile& operator=(const wxTempFile&); - - wxString m_strName, // name of the file to replace in Commit() - m_strTemp; // temporary file name - wxFile m_file; // the temporary file -}; - -#endif // wxUSE_FILE - -#endif // _WX_FILEH__ diff --git a/Externals/wxWidgets3/include/wx/fileconf.h b/Externals/wxWidgets3/include/wx/fileconf.h deleted file mode 100644 index a15468cfd7..0000000000 --- a/Externals/wxWidgets3/include/wx/fileconf.h +++ /dev/null @@ -1,263 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/fileconf.h -// Purpose: wxFileConfig derivation of wxConfigBase -// Author: Vadim Zeitlin -// Modified by: -// Created: 07.04.98 (adapted from appconf.cpp) -// Copyright: (c) 1997 Karsten Ballueder & Vadim Zeitlin -// Ballueder@usa.net -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _FILECONF_H -#define _FILECONF_H - -#include "wx/defs.h" - -#if wxUSE_CONFIG - -#include "wx/textfile.h" -#include "wx/string.h" -#include "wx/confbase.h" -#include "wx/filename.h" - -// ---------------------------------------------------------------------------- -// wxFileConfig -// ---------------------------------------------------------------------------- - -/* - wxFileConfig derives from base Config and implements file based config class, - i.e. it uses ASCII disk files to store the information. These files are - alternatively called INI, .conf or .rc in the documentation. They are - organized in groups or sections, which can nest (i.e. a group contains - subgroups, which contain their own subgroups &c). Each group has some - number of entries, which are "key = value" pairs. More precisely, the format - is: - - # comments are allowed after either ';' or '#' (Win/UNIX standard) - - # blank lines (as above) are ignored - - # global entries are members of special (no name) top group - written_for = Windows - platform = Linux - - # the start of the group 'Foo' - [Foo] # may put comments like this also - # following 3 lines are entries - key = value - another_key = " strings with spaces in the beginning should be quoted, \ - otherwise the spaces are lost" - last_key = but you don't have to put " normally (nor quote them, like here) - - # subgroup of the group 'Foo' - # (order is not important, only the name is: separator is '/', as in paths) - [Foo/Bar] - # entries prefixed with "!" are immutable, i.e. can't be changed if they are - # set in the system-wide config file - !special_key = value - bar_entry = whatever - - [Foo/Bar/Fubar] # depth is (theoretically :-) unlimited - # may have the same name as key in another section - bar_entry = whatever not - - You have {read/write/delete}Entry functions (guess what they do) and also - setCurrentPath to select current group. enum{Subgroups/Entries} allow you - to get all entries in the config file (in the current group). Finally, - flush() writes immediately all changed entries to disk (otherwise it would - be done automatically in dtor) - - wxFileConfig manages not less than 2 config files for each program: global - and local (or system and user if you prefer). Entries are read from both of - them and the local entries override the global ones unless the latter is - immutable (prefixed with '!') in which case a warning message is generated - and local value is ignored. Of course, the changes are always written to local - file only. - - The names of these files can be specified in a number of ways. First of all, - you can use the standard convention: using the ctor which takes 'strAppName' - parameter will probably be sufficient for 90% of cases. If, for whatever - reason you wish to use the files with some other names, you can always use the - second ctor. - - wxFileConfig also may automatically expand the values of environment variables - in the entries it reads: for example, if you have an entry - score_file = $HOME/.score - a call to Read(&str, "score_file") will return a complete path to .score file - unless the expansion was previously disabled with SetExpandEnvVars(false) call - (it's on by default, the current status can be retrieved with - IsExpandingEnvVars function). -*/ -class WXDLLIMPEXP_FWD_BASE wxFileConfigGroup; -class WXDLLIMPEXP_FWD_BASE wxFileConfigEntry; -class WXDLLIMPEXP_FWD_BASE wxFileConfigLineList; - -#if wxUSE_STREAMS -class WXDLLIMPEXP_FWD_BASE wxInputStream; -class WXDLLIMPEXP_FWD_BASE wxOutputStream; -#endif // wxUSE_STREAMS - -class WXDLLIMPEXP_BASE wxFileConfig : public wxConfigBase -{ -public: - // construct the "standard" full name for global (system-wide) and - // local (user-specific) config files from the base file name. - // - // the following are the filenames returned by this functions: - // global local - // Unix /etc/file.ext ~/.file - // Win %windir%\file.ext %USERPROFILE%\file.ext - // - // where file is the basename of szFile, ext is its extension - // or .conf (Unix) or .ini (Win) if it has none - static wxFileName GetGlobalFile(const wxString& szFile); - static wxFileName GetLocalFile(const wxString& szFile, int style = 0); - - static wxString GetGlobalFileName(const wxString& szFile) - { - return GetGlobalFile(szFile).GetFullPath(); - } - - static wxString GetLocalFileName(const wxString& szFile, int style = 0) - { - return GetLocalFile(szFile, style).GetFullPath(); - } - - // ctor & dtor - // New constructor: one size fits all. Specify wxCONFIG_USE_LOCAL_FILE or - // wxCONFIG_USE_GLOBAL_FILE to say which files should be used. - wxFileConfig(const wxString& appName = wxEmptyString, - const wxString& vendorName = wxEmptyString, - const wxString& localFilename = wxEmptyString, - const wxString& globalFilename = wxEmptyString, - long style = wxCONFIG_USE_LOCAL_FILE | wxCONFIG_USE_GLOBAL_FILE, - const wxMBConv& conv = wxConvAuto()); - -#if wxUSE_STREAMS - // ctor that takes an input stream. - wxFileConfig(wxInputStream &inStream, const wxMBConv& conv = wxConvAuto()); -#endif // wxUSE_STREAMS - - // dtor will save unsaved data - virtual ~wxFileConfig(); - - // under Unix, set the umask to be used for the file creation, do nothing - // under other systems -#ifdef __UNIX__ - void SetUmask(int mode) { m_umask = mode; } -#else // !__UNIX__ - void SetUmask(int WXUNUSED(mode)) { } -#endif // __UNIX__/!__UNIX__ - - // implement inherited pure virtual functions - virtual void SetPath(const wxString& strPath) wxOVERRIDE; - virtual const wxString& GetPath() const wxOVERRIDE; - - virtual bool GetFirstGroup(wxString& str, long& lIndex) const wxOVERRIDE; - virtual bool GetNextGroup (wxString& str, long& lIndex) const wxOVERRIDE; - virtual bool GetFirstEntry(wxString& str, long& lIndex) const wxOVERRIDE; - virtual bool GetNextEntry (wxString& str, long& lIndex) const wxOVERRIDE; - - virtual size_t GetNumberOfEntries(bool bRecursive = false) const wxOVERRIDE; - virtual size_t GetNumberOfGroups(bool bRecursive = false) const wxOVERRIDE; - - virtual bool HasGroup(const wxString& strName) const wxOVERRIDE; - virtual bool HasEntry(const wxString& strName) const wxOVERRIDE; - - virtual bool Flush(bool bCurrentOnly = false) wxOVERRIDE; - - virtual bool RenameEntry(const wxString& oldName, const wxString& newName) wxOVERRIDE; - virtual bool RenameGroup(const wxString& oldName, const wxString& newName) wxOVERRIDE; - - virtual bool DeleteEntry(const wxString& key, bool bGroupIfEmptyAlso = true) wxOVERRIDE; - virtual bool DeleteGroup(const wxString& szKey) wxOVERRIDE; - virtual bool DeleteAll() wxOVERRIDE; - - // additional, wxFileConfig-specific, functionality -#if wxUSE_STREAMS - // save the entire config file text to the given stream, note that the text - // won't be saved again in dtor when Flush() is called if you use this method - // as it won't be "changed" any more - virtual bool Save(wxOutputStream& os, const wxMBConv& conv = wxConvAuto()); -#endif // wxUSE_STREAMS - -public: - // functions to work with this list - wxFileConfigLineList *LineListAppend(const wxString& str); - wxFileConfigLineList *LineListInsert(const wxString& str, - wxFileConfigLineList *pLine); // NULL => Prepend() - void LineListRemove(wxFileConfigLineList *pLine); - bool LineListIsEmpty(); - -protected: - virtual bool DoReadString(const wxString& key, wxString *pStr) const wxOVERRIDE; - virtual bool DoReadLong(const wxString& key, long *pl) const wxOVERRIDE; -#if wxUSE_BASE64 - virtual bool DoReadBinary(const wxString& key, wxMemoryBuffer* buf) const wxOVERRIDE; -#endif // wxUSE_BASE64 - - virtual bool DoWriteString(const wxString& key, const wxString& szValue) wxOVERRIDE; - virtual bool DoWriteLong(const wxString& key, long lValue) wxOVERRIDE; -#if wxUSE_BASE64 - virtual bool DoWriteBinary(const wxString& key, const wxMemoryBuffer& buf) wxOVERRIDE; -#endif // wxUSE_BASE64 - -private: - // GetXXXFileName helpers: return ('/' terminated) directory names - static wxString GetGlobalDir(); - static wxString GetLocalDir(int style = 0); - - // common part of all ctors (assumes that m_str{Local|Global}File are already - // initialized - void Init(); - - // common part of from dtor and DeleteAll - void CleanUp(); - - // parse the whole file - void Parse(const wxTextBuffer& buffer, bool bLocal); - - // the same as SetPath("/") - void SetRootPath(); - - // real SetPath() implementation, returns true if path could be set or false - // if path doesn't exist and createMissingComponents == false - bool DoSetPath(const wxString& strPath, bool createMissingComponents); - - // set/test the dirty flag - void SetDirty() { m_isDirty = true; } - void ResetDirty() { m_isDirty = false; } - bool IsDirty() const { return m_isDirty; } - - - // member variables - // ---------------- - wxFileConfigLineList *m_linesHead, // head of the linked list - *m_linesTail; // tail - - wxFileName m_fnLocalFile, // local file name passed to ctor - m_fnGlobalFile; // global - wxString m_strPath; // current path (not '/' terminated) - - wxFileConfigGroup *m_pRootGroup, // the top (unnamed) group - *m_pCurrentGroup; // the current group - - wxMBConv *m_conv; - -#ifdef __UNIX__ - int m_umask; // the umask to use for file creation -#endif // __UNIX__ - - bool m_isDirty; // if true, we have unsaved changes - - wxDECLARE_NO_COPY_CLASS(wxFileConfig); - wxDECLARE_ABSTRACT_CLASS(wxFileConfig); -}; - -#endif - // wxUSE_CONFIG - -#endif - //_FILECONF_H - diff --git a/Externals/wxWidgets3/include/wx/filectrl.h b/Externals/wxWidgets3/include/wx/filectrl.h deleted file mode 100644 index c8c3d49a57..0000000000 --- a/Externals/wxWidgets3/include/wx/filectrl.h +++ /dev/null @@ -1,145 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/filectrl.h -// Purpose: Header for wxFileCtrlBase and other common functions used by -// platform-specific wxFileCtrl's -// Author: Diaa M. Sami -// Modified by: -// Created: Jul-07-2007 -// Copyright: (c) Diaa M. Sami -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_FILECTRL_H_BASE_ -#define _WX_FILECTRL_H_BASE_ - -#include "wx/defs.h" - -#if wxUSE_FILECTRL - -#include "wx/string.h" -#include "wx/event.h" - -enum -{ - wxFC_OPEN = 0x0001, - wxFC_SAVE = 0x0002, - wxFC_MULTIPLE = 0x0004, - wxFC_NOSHOWHIDDEN = 0x0008 -}; - -#define wxFC_DEFAULT_STYLE wxFC_OPEN -extern WXDLLIMPEXP_DATA_CORE(const char) wxFileCtrlNameStr[]; // in filectrlcmn.cpp - -class WXDLLIMPEXP_CORE wxFileCtrlBase -{ -public: - virtual ~wxFileCtrlBase() {} - - virtual void SetWildcard( const wxString& wildCard ) = 0; - virtual void SetFilterIndex( int filterindex ) = 0; - virtual bool SetDirectory( const wxString& dir ) = 0; - - // Selects a certain file. - // In case the filename specified isn't found/couldn't be shown with - // currently selected filter, false is returned and nothing happens - virtual bool SetFilename( const wxString& name ) = 0; - - // chdirs to a certain directory and selects a certain file. - // In case the filename specified isn't found/couldn't be shown with - // currently selected filter, false is returned and if directory exists - // it's chdir'ed to - virtual bool SetPath( const wxString& path ) = 0; - - virtual wxString GetFilename() const = 0; - virtual wxString GetDirectory() const = 0; - virtual wxString GetWildcard() const = 0; - virtual wxString GetPath() const = 0; - virtual void GetPaths( wxArrayString& paths ) const = 0; - virtual void GetFilenames( wxArrayString& files ) const = 0; - virtual int GetFilterIndex() const = 0; - - virtual bool HasMultipleFileSelection() const = 0; - virtual void ShowHidden(bool show) = 0; -}; - -void GenerateFilterChangedEvent( wxFileCtrlBase *fileCtrl, wxWindow *wnd ); -void GenerateFolderChangedEvent( wxFileCtrlBase *fileCtrl, wxWindow *wnd ); -void GenerateSelectionChangedEvent( wxFileCtrlBase *fileCtrl, wxWindow *wnd ); -void GenerateFileActivatedEvent( wxFileCtrlBase *fileCtrl, wxWindow *wnd, const wxString& filename = wxEmptyString ); - -#if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__) - #define wxFileCtrl wxGtkFileCtrl - #include "wx/gtk/filectrl.h" -#else - #define wxFileCtrl wxGenericFileCtrl - #include "wx/generic/filectrlg.h" -#endif - -// Some documentation -// On wxEVT_FILECTRL_FILTERCHANGED, only the value returned by GetFilterIndex is -// valid and it represents the (new) current filter index for the wxFileCtrl. -// On wxEVT_FILECTRL_FOLDERCHANGED, only the value returned by GetDirectory is -// valid and it represents the (new) current directory for the wxFileCtrl. -// On wxEVT_FILECTRL_FILEACTIVATED, GetDirectory returns the current directory -// for the wxFileCtrl and GetFiles returns the names of the file(s) activated. -// On wxEVT_FILECTRL_SELECTIONCHANGED, GetDirectory returns the current directory -// for the wxFileCtrl and GetFiles returns the names of the currently selected -// file(s). -// In wxGTK, after each wxEVT_FILECTRL_FOLDERCHANGED, wxEVT_FILECTRL_SELECTIONCHANGED -// is fired automatically once or more with 0 files. -class WXDLLIMPEXP_CORE wxFileCtrlEvent : public wxCommandEvent -{ -public: - wxFileCtrlEvent() {} - wxFileCtrlEvent( wxEventType type, wxObject *evtObject, int id ) - : wxCommandEvent( type, id ) - { - SetEventObject( evtObject ); - } - - // no need for the copy constructor as the default one will be fine. - virtual wxEvent *Clone() const wxOVERRIDE { return new wxFileCtrlEvent( *this ); } - - void SetFiles( const wxArrayString &files ) { m_files = files; } - void SetDirectory( const wxString &directory ) { m_directory = directory; } - void SetFilterIndex( int filterIndex ) { m_filterIndex = filterIndex; } - - wxArrayString GetFiles() const { return m_files; } - wxString GetDirectory() const { return m_directory; } - int GetFilterIndex() const { return m_filterIndex; } - - wxString GetFile() const; - -protected: - int m_filterIndex; - wxString m_directory; - wxArrayString m_files; - - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxFileCtrlEvent); -}; - -typedef void ( wxEvtHandler::*wxFileCtrlEventFunction )( wxFileCtrlEvent& ); - -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_FILECTRL_SELECTIONCHANGED, wxFileCtrlEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_FILECTRL_FILEACTIVATED, wxFileCtrlEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_FILECTRL_FOLDERCHANGED, wxFileCtrlEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_FILECTRL_FILTERCHANGED, wxFileCtrlEvent ); - -#define wxFileCtrlEventHandler(func) \ - wxEVENT_HANDLER_CAST( wxFileCtrlEventFunction, func ) - -#define EVT_FILECTRL_FILEACTIVATED(id, fn) \ - wx__DECLARE_EVT1(wxEVT_FILECTRL_FILEACTIVATED, id, wxFileCtrlEventHandler(fn)) - -#define EVT_FILECTRL_SELECTIONCHANGED(id, fn) \ - wx__DECLARE_EVT1(wxEVT_FILECTRL_SELECTIONCHANGED, id, wxFileCtrlEventHandler(fn)) - -#define EVT_FILECTRL_FOLDERCHANGED(id, fn) \ - wx__DECLARE_EVT1(wxEVT_FILECTRL_FOLDERCHANGED, id, wxFileCtrlEventHandler(fn)) - -#define EVT_FILECTRL_FILTERCHANGED(id, fn) \ - wx__DECLARE_EVT1(wxEVT_FILECTRL_FILTERCHANGED, id, wxFileCtrlEventHandler(fn)) - -#endif // wxUSE_FILECTRL - -#endif // _WX_FILECTRL_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/filedlg.h b/Externals/wxWidgets3/include/wx/filedlg.h deleted file mode 100644 index b068129ae2..0000000000 --- a/Externals/wxWidgets3/include/wx/filedlg.h +++ /dev/null @@ -1,235 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/filedlg.h -// Purpose: wxFileDialog base header -// Author: Robert Roebling -// Modified by: -// Created: 8/17/99 -// Copyright: (c) Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_FILEDLG_H_BASE_ -#define _WX_FILEDLG_H_BASE_ - -#include "wx/defs.h" - -#if wxUSE_FILEDLG - -#include "wx/dialog.h" -#include "wx/arrstr.h" - -// this symbol is defined for the platforms which support multiple -// ('|'-separated) filters in the file dialog -#if defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXMAC__) - #define wxHAS_MULTIPLE_FILEDLG_FILTERS -#endif - -//---------------------------------------------------------------------------- -// wxFileDialog data -//---------------------------------------------------------------------------- - -/* - The flags below must coexist with the following flags in m_windowStyle - #define wxCAPTION 0x20000000 - #define wxMAXIMIZE 0x00002000 - #define wxCLOSE_BOX 0x00001000 - #define wxSYSTEM_MENU 0x00000800 - wxBORDER_NONE = 0x00200000 - #define wxRESIZE_BORDER 0x00000040 - #define wxDIALOG_NO_PARENT 0x00000020 -*/ - -enum -{ - wxFD_OPEN = 0x0001, - wxFD_SAVE = 0x0002, - wxFD_OVERWRITE_PROMPT = 0x0004, - wxFD_NO_FOLLOW = 0x0008, - wxFD_FILE_MUST_EXIST = 0x0010, - wxFD_CHANGE_DIR = 0x0080, - wxFD_PREVIEW = 0x0100, - wxFD_MULTIPLE = 0x0200 -}; - -#define wxFD_DEFAULT_STYLE wxFD_OPEN - -extern WXDLLIMPEXP_DATA_CORE(const char) wxFileDialogNameStr[]; -extern WXDLLIMPEXP_DATA_CORE(const char) wxFileSelectorPromptStr[]; -extern WXDLLIMPEXP_DATA_CORE(const char) wxFileSelectorDefaultWildcardStr[]; - -//---------------------------------------------------------------------------- -// wxFileDialogBase -//---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxFileDialogBase: public wxDialog -{ -public: - wxFileDialogBase () { Init(); } - - wxFileDialogBase(wxWindow *parent, - const wxString& message = wxFileSelectorPromptStr, - const wxString& defaultDir = wxEmptyString, - const wxString& defaultFile = wxEmptyString, - const wxString& wildCard = wxFileSelectorDefaultWildcardStr, - long style = wxFD_DEFAULT_STYLE, - const wxPoint& pos = wxDefaultPosition, - const wxSize& sz = wxDefaultSize, - const wxString& name = wxFileDialogNameStr) - { - Init(); - Create(parent, message, defaultDir, defaultFile, wildCard, style, pos, sz, name); - } - - virtual ~wxFileDialogBase() {} - - - bool Create(wxWindow *parent, - const wxString& message = wxFileSelectorPromptStr, - const wxString& defaultDir = wxEmptyString, - const wxString& defaultFile = wxEmptyString, - const wxString& wildCard = wxFileSelectorDefaultWildcardStr, - long style = wxFD_DEFAULT_STYLE, - const wxPoint& pos = wxDefaultPosition, - const wxSize& sz = wxDefaultSize, - const wxString& name = wxFileDialogNameStr); - - bool HasFdFlag(int flag) const { return HasFlag(flag); } - - virtual void SetMessage(const wxString& message) { m_message = message; } - virtual void SetPath(const wxString& path); - virtual void SetDirectory(const wxString& dir); - virtual void SetFilename(const wxString& name); - virtual void SetWildcard(const wxString& wildCard) { m_wildCard = wildCard; } - virtual void SetFilterIndex(int filterIndex) { m_filterIndex = filterIndex; } - - virtual wxString GetMessage() const { return m_message; } - virtual wxString GetPath() const { return m_path; } - virtual void GetPaths(wxArrayString& paths) const { paths.Empty(); paths.Add(m_path); } - virtual wxString GetDirectory() const { return m_dir; } - virtual wxString GetFilename() const { return m_fileName; } - virtual void GetFilenames(wxArrayString& files) const { files.Empty(); files.Add(m_fileName); } - virtual wxString GetWildcard() const { return m_wildCard; } - virtual int GetFilterIndex() const { return m_filterIndex; } - - virtual wxString GetCurrentlySelectedFilename() const - { return m_currentlySelectedFilename; } - - // this function is called with wxFileDialog as parameter and should - // create the window containing the extra controls we want to show in it - typedef wxWindow *(*ExtraControlCreatorFunction)(wxWindow*); - - virtual bool SupportsExtraControl() const { return false; } - - bool SetExtraControlCreator(ExtraControlCreatorFunction creator); - wxWindow *GetExtraControl() const { return m_extraControl; } - - // Utility functions - - // Append first extension to filePath from a ';' separated extensionList - // if filePath = "path/foo.bar" just return it as is - // if filePath = "foo[.]" and extensionList = "*.jpg;*.png" return "foo.jpg" - // if the extension is "*.j?g" (has wildcards) or "jpg" then return filePath - static wxString AppendExtension(const wxString &filePath, - const wxString &extensionList); - - // Set the filter index to match the given extension. - // - // This is always valid to call, even if the extension is empty or the - // filter list doesn't contain it, the function will just do nothing in - // these cases. - void SetFilterIndexFromExt(const wxString& ext); - -protected: - wxString m_message; - wxString m_dir; - wxString m_path; // Full path - wxString m_fileName; - wxString m_wildCard; - int m_filterIndex; - - // Currently selected, but not yet necessarily accepted by the user, file. - // This should be updated whenever the selection in the control changes by - // the platform-specific code to provide a useful implementation of - // GetCurrentlySelectedFilename(). - wxString m_currentlySelectedFilename; - - wxWindow* m_extraControl; - - // returns true if control is created (if it already exists returns false) - bool CreateExtraControl(); - // return true if SetExtraControlCreator() was called - bool HasExtraControlCreator() const - { return m_extraControlCreator != NULL; } - // get the size of the extra control by creating and deleting it - wxSize GetExtraControlSize(); - -private: - ExtraControlCreatorFunction m_extraControlCreator; - - void Init(); - wxDECLARE_DYNAMIC_CLASS(wxFileDialogBase); - wxDECLARE_NO_COPY_CLASS(wxFileDialogBase); -}; - - -//---------------------------------------------------------------------------- -// wxFileDialog convenience functions -//---------------------------------------------------------------------------- - -// File selector - backward compatibility -WXDLLIMPEXP_CORE wxString -wxFileSelector(const wxString& message = wxFileSelectorPromptStr, - const wxString& default_path = wxEmptyString, - const wxString& default_filename = wxEmptyString, - const wxString& default_extension = wxEmptyString, - const wxString& wildcard = wxFileSelectorDefaultWildcardStr, - int flags = 0, - wxWindow *parent = NULL, - int x = wxDefaultCoord, int y = wxDefaultCoord); - -// An extended version of wxFileSelector -WXDLLIMPEXP_CORE wxString -wxFileSelectorEx(const wxString& message = wxFileSelectorPromptStr, - const wxString& default_path = wxEmptyString, - const wxString& default_filename = wxEmptyString, - int *indexDefaultExtension = NULL, - const wxString& wildcard = wxFileSelectorDefaultWildcardStr, - int flags = 0, - wxWindow *parent = NULL, - int x = wxDefaultCoord, int y = wxDefaultCoord); - -// Ask for filename to load -WXDLLIMPEXP_CORE wxString -wxLoadFileSelector(const wxString& what, - const wxString& extension, - const wxString& default_name = wxEmptyString, - wxWindow *parent = NULL); - -// Ask for filename to save -WXDLLIMPEXP_CORE wxString -wxSaveFileSelector(const wxString& what, - const wxString& extension, - const wxString& default_name = wxEmptyString, - wxWindow *parent = NULL); - - -#if defined (__WXUNIVERSAL__) - #define wxHAS_GENERIC_FILEDIALOG - #include "wx/generic/filedlgg.h" -#elif defined(__WXMSW__) - #include "wx/msw/filedlg.h" -#elif defined(__WXMOTIF__) - #include "wx/motif/filedlg.h" -#elif defined(__WXGTK20__) - #include "wx/gtk/filedlg.h" // GTK+ > 2.4 has native version -#elif defined(__WXGTK__) - #include "wx/gtk1/filedlg.h" -#elif defined(__WXMAC__) - #include "wx/osx/filedlg.h" -#elif defined(__WXQT__) - #include "wx/qt/filedlg.h" -#endif - -#endif // wxUSE_FILEDLG - -#endif // _WX_FILEDLG_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/filefn.h b/Externals/wxWidgets3/include/wx/filefn.h deleted file mode 100644 index 5a585bd9e5..0000000000 --- a/Externals/wxWidgets3/include/wx/filefn.h +++ /dev/null @@ -1,718 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/filefn.h -// Purpose: File- and directory-related functions -// Author: Julian Smart -// Modified by: -// Created: 29/01/98 -// Copyright: (c) 1998 Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _FILEFN_H_ -#define _FILEFN_H_ - -#include "wx/list.h" -#include "wx/arrstr.h" - -#include - -#include -#include - -#if defined(__UNIX__) - #include - #include -#endif - -#if defined(__WINDOWS__) -#if !defined( __GNUWIN32__ ) && !defined(__CYGWIN__) - #include - #include - #include -#endif // __WINDOWS__ -#endif // native Win compiler - -#ifdef __BORLANDC__ // Please someone tell me which version of Borland needs - // this (3.1 I believe) and how to test for it. - // If this works for Borland 4.0 as well, then no worries. - #include -#endif - -#include // O_RDONLY &c - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -// MSVC doesn't define mode_t, so do it ourselves unless someone else -// had already predefined it. -#if defined(__VISUALC__) && !defined(wxHAS_MODE_T) - #define wxHAS_MODE_T - typedef int mode_t; -#endif - -// define off_t -#include - -#if defined(__VISUALC__) - typedef _off_t off_t; -#endif - -enum wxSeekMode -{ - wxFromStart, - wxFromCurrent, - wxFromEnd -}; - -enum wxFileKind -{ - wxFILE_KIND_UNKNOWN, - wxFILE_KIND_DISK, // a file supporting seeking to arbitrary offsets - wxFILE_KIND_TERMINAL, // a tty - wxFILE_KIND_PIPE // a pipe -}; - -// we redefine these constants here because S_IREAD &c are _not_ standard -// however, we do assume that the values correspond to the Unix umask bits -enum wxPosixPermissions -{ - // standard Posix names for these permission flags: - wxS_IRUSR = 00400, - wxS_IWUSR = 00200, - wxS_IXUSR = 00100, - - wxS_IRGRP = 00040, - wxS_IWGRP = 00020, - wxS_IXGRP = 00010, - - wxS_IROTH = 00004, - wxS_IWOTH = 00002, - wxS_IXOTH = 00001, - - // longer but more readable synonyms for the constants above: - wxPOSIX_USER_READ = wxS_IRUSR, - wxPOSIX_USER_WRITE = wxS_IWUSR, - wxPOSIX_USER_EXECUTE = wxS_IXUSR, - - wxPOSIX_GROUP_READ = wxS_IRGRP, - wxPOSIX_GROUP_WRITE = wxS_IWGRP, - wxPOSIX_GROUP_EXECUTE = wxS_IXGRP, - - wxPOSIX_OTHERS_READ = wxS_IROTH, - wxPOSIX_OTHERS_WRITE = wxS_IWOTH, - wxPOSIX_OTHERS_EXECUTE = wxS_IXOTH, - - // default mode for the new files: allow reading/writing them to everybody but - // the effective file mode will be set after anding this value with umask and - // so won't include wxS_IW{GRP,OTH} for the default 022 umask value - wxS_DEFAULT = (wxPOSIX_USER_READ | wxPOSIX_USER_WRITE | \ - wxPOSIX_GROUP_READ | wxPOSIX_GROUP_WRITE | \ - wxPOSIX_OTHERS_READ | wxPOSIX_OTHERS_WRITE), - - // default mode for the new directories (see wxFileName::Mkdir): allow - // reading/writing/executing them to everybody, but just like wxS_DEFAULT - // the effective directory mode will be set after anding this value with umask - wxS_DIR_DEFAULT = (wxPOSIX_USER_READ | wxPOSIX_USER_WRITE | wxPOSIX_USER_EXECUTE | \ - wxPOSIX_GROUP_READ | wxPOSIX_GROUP_WRITE | wxPOSIX_GROUP_EXECUTE | \ - wxPOSIX_OTHERS_READ | wxPOSIX_OTHERS_WRITE | wxPOSIX_OTHERS_EXECUTE) -}; - -// ---------------------------------------------------------------------------- -// declare our versions of low level file functions: some compilers prepend -// underscores to the usual names, some also have Unicode versions of them -// ---------------------------------------------------------------------------- - -#if defined(__WINDOWS__) && \ - ( \ - defined(__VISUALC__) || \ - defined(__MINGW64_TOOLCHAIN__) || \ - (defined(__MINGW32__) && !defined(__WINE__) && \ - wxCHECK_W32API_VERSION(0, 5)) || \ - defined(__BORLANDC__) \ - ) - - // temporary defines just used immediately below - #undef wxHAS_HUGE_FILES - #undef wxHAS_HUGE_STDIO_FILES - - // detect compilers which have support for huge files - #if defined(__VISUALC__) - #define wxHAS_HUGE_FILES 1 - #elif defined(__MINGW32__) - #define wxHAS_HUGE_FILES 1 - #elif defined(_LARGE_FILES) - #define wxHAS_HUGE_FILES 1 - #endif - - // detect compilers which have support for huge stdio files - #if wxCHECK_VISUALC_VERSION(8) - #define wxHAS_HUGE_STDIO_FILES - #define wxFseek _fseeki64 - #define wxFtell _ftelli64 - #elif wxCHECK_MINGW32_VERSION(3, 5) // mingw-runtime version (not gcc) - #define wxHAS_HUGE_STDIO_FILES - - wxDECL_FOR_STRICT_MINGW32(int, fseeko64, (FILE*, long long, int)) - #define wxFseek fseeko64 - - #ifdef wxNEEDS_STRICT_ANSI_WORKAROUNDS - // Unfortunately ftello64() is not defined in the library for - // whatever reason but as an inline function, so define wxFtell() - // here similarly. - inline long long wxFtell(FILE* fp) - { - fpos_t pos; - return fgetpos(fp, &pos) == 0 ? pos : -1LL; - } - #else - #define wxFtell ftello64 - #endif - #endif - - // other Windows compilers (Borland) don't have huge file support (or at - // least not all functions needed for it by wx) currently - - // types - - #ifdef wxHAS_HUGE_FILES - typedef wxLongLong_t wxFileOffset; - #define wxFileOffsetFmtSpec wxLongLongFmtSpec - #else - typedef off_t wxFileOffset; - #endif - - // at least Borland 5.5 doesn't like "struct ::stat" so don't use the scope - // resolution operator present in wxPOSIX_IDENT for it - #ifdef __BORLANDC__ - #define wxPOSIX_STRUCT(s) struct s - #else - #define wxPOSIX_STRUCT(s) struct wxPOSIX_IDENT(s) - #endif - - // Borland is special in that it uses _stat with Unicode functions (for - // MSVC compatibility?) but stat with ANSI ones - #ifdef __BORLANDC__ - #if wxHAS_HUGE_FILES - #define wxStructStat struct stati64 - #else - #if wxUSE_UNICODE - #define wxStructStat struct _stat - #else - #define wxStructStat struct stat - #endif - #endif - #else // !__BORLANDC__ - #ifdef wxHAS_HUGE_FILES - #define wxStructStat struct _stati64 - #else - #define wxStructStat struct _stat - #endif - #endif // __BORLANDC__/!__BORLANDC__ - - - // functions - - // MSVC and compatible compilers prepend underscores to the POSIX function - // names, other compilers don't and even if their later versions usually do - // define the versions with underscores for MSVC compatibility, it's better - // to avoid using them as they're not present in earlier versions and - // always using the native functions spelling is easier than testing for - // the versions - #if defined(__BORLANDC__) || defined(__MINGW64_TOOLCHAIN__) - #define wxPOSIX_IDENT(func) ::func - #else // by default assume MSVC-compatible names - #define wxPOSIX_IDENT(func) _ ## func - #define wxHAS_UNDERSCORES_IN_POSIX_IDENTS - #endif - - // first functions not working with strings, i.e. without ANSI/Unicode - // complications - #define wxClose wxPOSIX_IDENT(close) - - #define wxRead wxPOSIX_IDENT(read) - #define wxWrite wxPOSIX_IDENT(write) - - #ifdef wxHAS_HUGE_FILES - #ifndef __MINGW64_TOOLCHAIN__ - #define wxSeek wxPOSIX_IDENT(lseeki64) - #define wxLseek wxPOSIX_IDENT(lseeki64) - #define wxTell wxPOSIX_IDENT(telli64) - #else - // unfortunately, mingw-W64 is somewhat inconsistent... - #define wxSeek _lseeki64 - #define wxLseek _lseeki64 - #define wxTell _telli64 - #endif - #else // !wxHAS_HUGE_FILES - #define wxSeek wxPOSIX_IDENT(lseek) - #define wxLseek wxPOSIX_IDENT(lseek) - #define wxTell wxPOSIX_IDENT(tell) - #endif // wxHAS_HUGE_FILES/!wxHAS_HUGE_FILES - - #if !defined(__BORLANDC__) || (__BORLANDC__ > 0x540) - // NB: this one is not POSIX and always has the underscore - #define wxFsync _commit - - // could be already defined by configure (Cygwin) - #ifndef HAVE_FSYNC - #define HAVE_FSYNC - #endif - #endif // BORLANDC - - #define wxEof wxPOSIX_IDENT(eof) - - // then the functions taking strings - - // first the ANSI versions - #define wxCRT_OpenA wxPOSIX_IDENT(open) - #define wxCRT_AccessA wxPOSIX_IDENT(access) - #define wxCRT_ChmodA wxPOSIX_IDENT(chmod) - #define wxCRT_MkDirA wxPOSIX_IDENT(mkdir) - #define wxCRT_RmDirA wxPOSIX_IDENT(rmdir) - #ifdef wxHAS_HUGE_FILES - // MinGW-64 provides underscore-less versions of all file functions - // except for this one. - #ifdef __MINGW64_TOOLCHAIN__ - #define wxCRT_StatA _stati64 - #else - #define wxCRT_StatA wxPOSIX_IDENT(stati64) - #endif - #else - #define wxCRT_StatA wxPOSIX_IDENT(stat) - #endif - - // then wide char ones - #if wxUSE_UNICODE - // special workaround for buggy wopen() in bcc 5.5 - #if defined(__BORLANDC__) && \ - (__BORLANDC__ >= 0x550 && __BORLANDC__ <= 0x551) - WXDLLIMPEXP_BASE int wxCRT_OpenW(const wxChar *pathname, - int flags, mode_t mode); - #else - #define wxCRT_OpenW _wopen - #endif - - wxDECL_FOR_STRICT_MINGW32(int, _wmkdir, (const wchar_t*)) - wxDECL_FOR_STRICT_MINGW32(int, _wrmdir, (const wchar_t*)) - - #define wxCRT_AccessW _waccess - #define wxCRT_ChmodW _wchmod - #define wxCRT_MkDirW _wmkdir - #define wxCRT_RmDirW _wrmdir - #ifdef wxHAS_HUGE_FILES - #define wxCRT_StatW _wstati64 - #else - #define wxCRT_StatW _wstat - #endif - #endif // wxUSE_UNICODE - - - // finally the default char-type versions - #if wxUSE_UNICODE - #define wxCRT_Open wxCRT_OpenW - #define wxCRT_Access wxCRT_AccessW - #define wxCRT_Chmod wxCRT_ChmodW - #define wxCRT_MkDir wxCRT_MkDirW - #define wxCRT_RmDir wxCRT_RmDirW - #define wxCRT_Stat wxCRT_StatW - #else // !wxUSE_UNICODE - #define wxCRT_Open wxCRT_OpenA - #define wxCRT_Access wxCRT_AccessA - #define wxCRT_Chmod wxCRT_ChmodA - #define wxCRT_MkDir wxCRT_MkDirA - #define wxCRT_RmDir wxCRT_RmDirA - #define wxCRT_Stat wxCRT_StatA - #endif // wxUSE_UNICODE/!wxUSE_UNICODE - - - // constants (unless already defined by the user code) - #ifdef wxHAS_UNDERSCORES_IN_POSIX_IDENTS - #ifndef O_RDONLY - #define O_RDONLY _O_RDONLY - #define O_WRONLY _O_WRONLY - #define O_RDWR _O_RDWR - #define O_EXCL _O_EXCL - #define O_CREAT _O_CREAT - #define O_BINARY _O_BINARY - #endif - - #ifndef S_IFMT - #define S_IFMT _S_IFMT - #define S_IFDIR _S_IFDIR - #define S_IFREG _S_IFREG - #endif - #endif // wxHAS_UNDERSCORES_IN_POSIX_IDENTS - - #ifdef wxHAS_HUGE_FILES - // wxFile is present and supports large files. - #if wxUSE_FILE - #define wxHAS_LARGE_FILES - #endif - // wxFFile is present and supports large files - #if wxUSE_FFILE && defined wxHAS_HUGE_STDIO_FILES - #define wxHAS_LARGE_FFILES - #endif - #endif - - // private defines, undefine so that nobody gets tempted to use - #undef wxHAS_HUGE_FILES - #undef wxHAS_HUGE_STDIO_FILES -#else // Unix or Windows using unknown compiler, assume POSIX supported - typedef off_t wxFileOffset; - #ifdef HAVE_LARGEFILE_SUPPORT - #define wxFileOffsetFmtSpec wxLongLongFmtSpec - wxCOMPILE_TIME_ASSERT( sizeof(off_t) == sizeof(wxLongLong_t), - BadFileSizeType ); - // wxFile is present and supports large files - #if wxUSE_FILE - #define wxHAS_LARGE_FILES - #endif - // wxFFile is present and supports large files - #if wxUSE_FFILE && (SIZEOF_LONG == 8 || defined HAVE_FSEEKO) - #define wxHAS_LARGE_FFILES - #endif - #ifdef HAVE_FSEEKO - #define wxFseek fseeko - #define wxFtell ftello - #endif - #else - #define wxFileOffsetFmtSpec wxT("") - #endif - // functions - #define wxClose close - #define wxRead ::read - #define wxWrite ::write - #define wxLseek lseek - #define wxSeek lseek - #define wxFsync fsync - #define wxEof eof - #define wxCRT_MkDir mkdir - #define wxCRT_RmDir rmdir - - #define wxTell(fd) lseek(fd, 0, SEEK_CUR) - - #define wxStructStat struct stat - - #define wxCRT_Open open - #define wxCRT_Stat stat - #define wxCRT_Lstat lstat - #define wxCRT_Access access - #define wxCRT_Chmod chmod - - #define wxHAS_NATIVE_LSTAT -#endif // platforms - -// if the platform doesn't have symlinks, define wxCRT_Lstat to be the same as -// wxCRT_Stat to avoid #ifdefs in the code using it -#ifndef wxHAS_NATIVE_LSTAT - #define wxCRT_Lstat wxCRT_Stat -#endif - -// define wxFseek/wxFtell to large file versions if available (done above) or -// to fseek/ftell if not, to save ifdefs in using code -#ifndef wxFseek - #define wxFseek fseek -#endif -#ifndef wxFtell - #define wxFtell ftell -#endif - -inline int wxAccess(const wxString& path, mode_t mode) - { return wxCRT_Access(path.fn_str(), mode); } -inline int wxChmod(const wxString& path, mode_t mode) - { return wxCRT_Chmod(path.fn_str(), mode); } -inline int wxOpen(const wxString& path, int flags, mode_t mode) - { return wxCRT_Open(path.fn_str(), flags, mode); } - -inline int wxStat(const wxString& path, wxStructStat *buf) - { return wxCRT_Stat(path.fn_str(), buf); } -inline int wxLstat(const wxString& path, wxStructStat *buf) - { return wxCRT_Lstat(path.fn_str(), buf); } -inline int wxRmDir(const wxString& path) - { return wxCRT_RmDir(path.fn_str()); } -#if (defined(__WINDOWS__) && !defined(__CYGWIN__)) -inline int wxMkDir(const wxString& path, mode_t WXUNUSED(mode) = 0) - { return wxCRT_MkDir(path.fn_str()); } -#else -inline int wxMkDir(const wxString& path, mode_t mode) - { return wxCRT_MkDir(path.fn_str(), mode); } -#endif - -#ifdef O_BINARY - #define wxO_BINARY O_BINARY -#else - #define wxO_BINARY 0 -#endif - -const int wxInvalidOffset = -1; - -// ---------------------------------------------------------------------------- -// functions -// ---------------------------------------------------------------------------- -WXDLLIMPEXP_BASE bool wxFileExists(const wxString& filename); - -// does the path exist? (may have or not '/' or '\\' at the end) -WXDLLIMPEXP_BASE bool wxDirExists(const wxString& pathName); - -WXDLLIMPEXP_BASE bool wxIsAbsolutePath(const wxString& filename); - -// Get filename -WXDLLIMPEXP_BASE wxChar* wxFileNameFromPath(wxChar *path); -WXDLLIMPEXP_BASE wxString wxFileNameFromPath(const wxString& path); - -// Get directory -WXDLLIMPEXP_BASE wxString wxPathOnly(const wxString& path); - -// all deprecated functions below are deprecated in favour of wxFileName's methods -#if WXWIN_COMPATIBILITY_2_8 - -wxDEPRECATED( WXDLLIMPEXP_BASE void wxDos2UnixFilename(char *s) ); -wxDEPRECATED( WXDLLIMPEXP_BASE void wxDos2UnixFilename(wchar_t *s) ); - -wxDEPRECATED_BUT_USED_INTERNALLY( - WXDLLIMPEXP_BASE void wxUnix2DosFilename(char *s) ); -wxDEPRECATED_BUT_USED_INTERNALLY( - WXDLLIMPEXP_BASE void wxUnix2DosFilename(wchar_t *s) ); - -// Strip the extension, in situ -// Deprecated in favour of wxFileName::StripExtension() but notice that their -// behaviour is slightly different, see the manual -wxDEPRECATED( WXDLLIMPEXP_BASE void wxStripExtension(char *buffer) ); -wxDEPRECATED( WXDLLIMPEXP_BASE void wxStripExtension(wchar_t *buffer) ); -wxDEPRECATED( WXDLLIMPEXP_BASE void wxStripExtension(wxString& buffer) ); - -// Get a temporary filename -wxDEPRECATED_BUT_USED_INTERNALLY( WXDLLIMPEXP_BASE wxChar* wxGetTempFileName(const wxString& prefix, wxChar *buf = NULL) ); -wxDEPRECATED_BUT_USED_INTERNALLY( WXDLLIMPEXP_BASE bool wxGetTempFileName(const wxString& prefix, wxString& buf) ); - -// Expand file name (~/ and ${OPENWINHOME}/ stuff) -wxDEPRECATED_BUT_USED_INTERNALLY( WXDLLIMPEXP_BASE char* wxExpandPath(char *dest, const wxString& path) ); -wxDEPRECATED_BUT_USED_INTERNALLY( WXDLLIMPEXP_BASE wchar_t* wxExpandPath(wchar_t *dest, const wxString& path) ); - // DEPRECATED: use wxFileName::Normalize(wxPATH_NORM_ENV_VARS) - -// Contract w.r.t environment ( -> ${OPENWINHOME}/lib) -// and make (if under the home tree) relative to home -// [caller must copy-- volatile] -wxDEPRECATED( -WXDLLIMPEXP_BASE wxChar* wxContractPath(const wxString& filename, - const wxString& envname = wxEmptyString, - const wxString& user = wxEmptyString) ); - // DEPRECATED: use wxFileName::ReplaceEnvVariable and wxFileName::ReplaceHomeDir - -// Destructive removal of /./ and /../ stuff -wxDEPRECATED_BUT_USED_INTERNALLY( WXDLLIMPEXP_BASE char* wxRealPath(char *path) ); -wxDEPRECATED_BUT_USED_INTERNALLY( WXDLLIMPEXP_BASE wchar_t* wxRealPath(wchar_t *path) ); -wxDEPRECATED_BUT_USED_INTERNALLY( WXDLLIMPEXP_BASE wxString wxRealPath(const wxString& path) ); - // DEPRECATED: use wxFileName::Normalize instead - -// Allocate a copy of the full absolute path -wxDEPRECATED( WXDLLIMPEXP_BASE wxChar* wxCopyAbsolutePath(const wxString& path) ); - // DEPRECATED: use wxFileName::MakeAbsolute instead -#endif - -// Get first file name matching given wild card. -// Flags are reserved for future use. -#define wxFILE 1 -#define wxDIR 2 -WXDLLIMPEXP_BASE wxString wxFindFirstFile(const wxString& spec, int flags = wxFILE); -WXDLLIMPEXP_BASE wxString wxFindNextFile(); - -// Does the pattern contain wildcards? -WXDLLIMPEXP_BASE bool wxIsWild(const wxString& pattern); - -// Does the pattern match the text (usually a filename)? -// If dot_special is true, doesn't match * against . (eliminating -// `hidden' dot files) -WXDLLIMPEXP_BASE bool wxMatchWild(const wxString& pattern, const wxString& text, bool dot_special = true); - -// Concatenate two files to form third -WXDLLIMPEXP_BASE bool wxConcatFiles(const wxString& file1, const wxString& file2, const wxString& file3); - -// Copy file1 to file2 -WXDLLIMPEXP_BASE bool wxCopyFile(const wxString& file1, const wxString& file2, - bool overwrite = true); - -// Remove file -WXDLLIMPEXP_BASE bool wxRemoveFile(const wxString& file); - -// Rename file -WXDLLIMPEXP_BASE bool wxRenameFile(const wxString& file1, const wxString& file2, bool overwrite = true); - -// Get current working directory. -WXDLLIMPEXP_BASE wxString wxGetCwd(); - -// Set working directory -WXDLLIMPEXP_BASE bool wxSetWorkingDirectory(const wxString& d); - -// Make directory -WXDLLIMPEXP_BASE bool wxMkdir(const wxString& dir, int perm = wxS_DIR_DEFAULT); - -// Remove directory. Flags reserved for future use. -WXDLLIMPEXP_BASE bool wxRmdir(const wxString& dir, int flags = 0); - -// Return the type of an open file -WXDLLIMPEXP_BASE wxFileKind wxGetFileKind(int fd); -WXDLLIMPEXP_BASE wxFileKind wxGetFileKind(FILE *fp); - -// permissions; these functions work both on files and directories: -WXDLLIMPEXP_BASE bool wxIsWritable(const wxString &path); -WXDLLIMPEXP_BASE bool wxIsReadable(const wxString &path); -WXDLLIMPEXP_BASE bool wxIsExecutable(const wxString &path); - -// ---------------------------------------------------------------------------- -// separators in file names -// ---------------------------------------------------------------------------- - -// between file name and extension -#define wxFILE_SEP_EXT wxT('.') - -// between drive/volume name and the path -#define wxFILE_SEP_DSK wxT(':') - -// between the path components -#define wxFILE_SEP_PATH_DOS wxT('\\') -#define wxFILE_SEP_PATH_UNIX wxT('/') -#define wxFILE_SEP_PATH_MAC wxT(':') -#define wxFILE_SEP_PATH_VMS wxT('.') // VMS also uses '[' and ']' - -// separator in the path list (as in PATH environment variable) -// there is no PATH variable in Classic Mac OS so just use the -// semicolon (it must be different from the file name separator) -// NB: these are strings and not characters on purpose! -#define wxPATH_SEP_DOS wxT(";") -#define wxPATH_SEP_UNIX wxT(":") -#define wxPATH_SEP_MAC wxT(";") - -// platform independent versions -#if defined(__UNIX__) - // CYGWIN also uses UNIX settings - #define wxFILE_SEP_PATH wxFILE_SEP_PATH_UNIX - #define wxPATH_SEP wxPATH_SEP_UNIX -#elif defined(__MAC__) - #define wxFILE_SEP_PATH wxFILE_SEP_PATH_MAC - #define wxPATH_SEP wxPATH_SEP_MAC -#else // Windows and OS/2 - #define wxFILE_SEP_PATH wxFILE_SEP_PATH_DOS - #define wxPATH_SEP wxPATH_SEP_DOS -#endif // Unix/Windows - -// this is useful for wxString::IsSameAs(): to compare two file names use -// filename1.IsSameAs(filename2, wxARE_FILENAMES_CASE_SENSITIVE) -#if defined(__UNIX__) && !defined(__DARWIN__) - #define wxARE_FILENAMES_CASE_SENSITIVE true -#else // Windows, Mac OS and OS/2 - #define wxARE_FILENAMES_CASE_SENSITIVE false -#endif // Unix/Windows - -// is the char a path separator? -inline bool wxIsPathSeparator(wxChar c) -{ - // under DOS/Windows we should understand both Unix and DOS file separators -#if defined(__UNIX__) || defined(__MAC__) - return c == wxFILE_SEP_PATH; -#else - return c == wxFILE_SEP_PATH_DOS || c == wxFILE_SEP_PATH_UNIX; -#endif -} - -// does the string ends with path separator? -WXDLLIMPEXP_BASE bool wxEndsWithPathSeparator(const wxString& filename); - -#if WXWIN_COMPATIBILITY_2_8 -// split the full path into path (including drive for DOS), name and extension -// (understands both '/' and '\\') -// Deprecated in favour of wxFileName::SplitPath -wxDEPRECATED( WXDLLIMPEXP_BASE void wxSplitPath(const wxString& fileName, - wxString *pstrPath, - wxString *pstrName, - wxString *pstrExt) ); -#endif - -// find a file in a list of directories, returns false if not found -WXDLLIMPEXP_BASE bool wxFindFileInPath(wxString *pStr, const wxString& szPath, const wxString& szFile); - -// Get the OS directory if appropriate (such as the Windows directory). -// On non-Windows platform, probably just return the empty string. -WXDLLIMPEXP_BASE wxString wxGetOSDirectory(); - -#if wxUSE_DATETIME - -// Get file modification time -WXDLLIMPEXP_BASE time_t wxFileModificationTime(const wxString& filename); - -#endif // wxUSE_DATETIME - -// Parses the wildCard, returning the number of filters. -// Returns 0 if none or if there's a problem, -// The arrays will contain an equal number of items found before the error. -// wildCard is in the form: -// "All files (*)|*|Image Files (*.jpeg *.png)|*.jpg;*.png" -WXDLLIMPEXP_BASE int wxParseCommonDialogsFilter(const wxString& wildCard, wxArrayString& descriptions, wxArrayString& filters); - -// ---------------------------------------------------------------------------- -// classes -// ---------------------------------------------------------------------------- - -#ifdef __UNIX__ - -// set umask to the given value in ctor and reset it to the old one in dtor -class WXDLLIMPEXP_BASE wxUmaskChanger -{ -public: - // change the umask to the given one if it is not -1: this allows to write - // the same code whether you really want to change umask or not, as is in - // wxFileConfig::Flush() for example - wxUmaskChanger(int umaskNew) - { - m_umaskOld = umaskNew == -1 ? -1 : (int)umask((mode_t)umaskNew); - } - - ~wxUmaskChanger() - { - if ( m_umaskOld != -1 ) - umask((mode_t)m_umaskOld); - } - -private: - int m_umaskOld; -}; - -// this macro expands to an "anonymous" wxUmaskChanger object under Unix and -// nothing elsewhere -#define wxCHANGE_UMASK(m) wxUmaskChanger wxMAKE_UNIQUE_NAME(umaskChanger_)(m) - -#else // !__UNIX__ - -#define wxCHANGE_UMASK(m) - -#endif // __UNIX__/!__UNIX__ - - -// Path searching -class WXDLLIMPEXP_BASE wxPathList : public wxArrayString -{ -public: - wxPathList() {} - wxPathList(const wxArrayString &arr) - { Add(arr); } - - // Adds all paths in environment variable - void AddEnvList(const wxString& envVariable); - - // Adds given path to this list - bool Add(const wxString& path); - void Add(const wxArrayString &paths); - - // Find the first full path for which the file exists - wxString FindValidPath(const wxString& filename) const; - - // Find the first full path for which the file exists; ensure it's an - // absolute path that gets returned. - wxString FindAbsoluteValidPath(const wxString& filename) const; - - // Given full path and filename, add path to list - bool EnsureFileAccessible(const wxString& path); -}; - -#endif // _WX_FILEFN_H_ diff --git a/Externals/wxWidgets3/include/wx/filehistory.h b/Externals/wxWidgets3/include/wx/filehistory.h deleted file mode 100644 index 9cd4be4034..0000000000 --- a/Externals/wxWidgets3/include/wx/filehistory.h +++ /dev/null @@ -1,103 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/filehistory.h -// Purpose: wxFileHistory class -// Author: Julian Smart, Vaclav Slavik -// Created: 2010-05-03 -// Copyright: (c) Julian Smart, Vaclav Slavik -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_FILEHISTORY_H_ -#define _WX_FILEHISTORY_H_ - -#include "wx/defs.h" - -#if wxUSE_FILE_HISTORY - -#include "wx/windowid.h" -#include "wx/object.h" -#include "wx/list.h" -#include "wx/string.h" -#include "wx/arrstr.h" - -class WXDLLIMPEXP_FWD_CORE wxMenu; -class WXDLLIMPEXP_FWD_BASE wxConfigBase; -class WXDLLIMPEXP_FWD_BASE wxFileName; - -// ---------------------------------------------------------------------------- -// File history management -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxFileHistoryBase : public wxObject -{ -public: - wxFileHistoryBase(size_t maxFiles = 9, wxWindowID idBase = wxID_FILE1); - - // Operations - virtual void AddFileToHistory(const wxString& file); - virtual void RemoveFileFromHistory(size_t i); - virtual int GetMaxFiles() const { return (int)m_fileMaxFiles; } - virtual void UseMenu(wxMenu *menu); - - // Remove menu from the list (MDI child may be closing) - virtual void RemoveMenu(wxMenu *menu); - -#if wxUSE_CONFIG - virtual void Load(const wxConfigBase& config); - virtual void Save(wxConfigBase& config); -#endif // wxUSE_CONFIG - - virtual void AddFilesToMenu(); - virtual void AddFilesToMenu(wxMenu* menu); // Single menu - - // Accessors - virtual wxString GetHistoryFile(size_t i) const { return m_fileHistory[i]; } - virtual size_t GetCount() const { return m_fileHistory.GetCount(); } - - const wxList& GetMenus() const { return m_fileMenus; } - - // Set/get base id - void SetBaseId(wxWindowID baseId) { m_idBase = baseId; } - wxWindowID GetBaseId() const { return m_idBase; } - -protected: - // Last n files - wxArrayString m_fileHistory; - - // Menus to maintain (may need several for an MDI app) - wxList m_fileMenus; - - // Max files to maintain - size_t m_fileMaxFiles; - -private: - // The ID of the first history menu item (Doesn't have to be wxID_FILE1) - wxWindowID m_idBase; - - // Normalize a file name to canonical form. We have a special function for - // this to ensure the same normalization is used everywhere. - static wxString NormalizeFileName(const wxFileName& filename); - - // Remove any existing entries from the associated menus. - void RemoveExistingHistory(); - - wxDECLARE_NO_COPY_CLASS(wxFileHistoryBase); -}; - -#if defined(__WXGTK20__) - #include "wx/gtk/filehistory.h" -#else - // no platform-specific implementation of wxFileHistory yet - class WXDLLIMPEXP_CORE wxFileHistory : public wxFileHistoryBase - { - public: - wxFileHistory(size_t maxFiles = 9, wxWindowID idBase = wxID_FILE1) - : wxFileHistoryBase(maxFiles, idBase) {} - - wxDECLARE_DYNAMIC_CLASS(wxFileHistory); - }; -#endif - -#endif // wxUSE_FILE_HISTORY - -#endif // _WX_FILEHISTORY_H_ diff --git a/Externals/wxWidgets3/include/wx/filename.h b/Externals/wxWidgets3/include/wx/filename.h deleted file mode 100644 index e2b05ec13e..0000000000 --- a/Externals/wxWidgets3/include/wx/filename.h +++ /dev/null @@ -1,630 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/filename.h -// Purpose: wxFileName - encapsulates a file path -// Author: Robert Roebling, Vadim Zeitlin -// Modified by: -// Created: 28.12.00 -// Copyright: (c) 2000 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_FILENAME_H_ -#define _WX_FILENAME_H_ - -#include "wx/arrstr.h" -#include "wx/filefn.h" -#include "wx/datetime.h" -#include "wx/intl.h" -#include "wx/longlong.h" -#include "wx/file.h" - -#if wxUSE_FILE -class WXDLLIMPEXP_FWD_BASE wxFile; -#endif - -#if wxUSE_FFILE -class WXDLLIMPEXP_FWD_BASE wxFFile; -#endif - -// this symbol is defined for the platforms where file systems use volumes in -// paths -#if defined(__WINDOWS__) - #define wxHAS_FILESYSTEM_VOLUMES -#endif - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -// the various values for the path format: this mainly affects the path -// separator but also whether or not the path has the drive part (as under -// Windows) -enum wxPathFormat -{ - wxPATH_NATIVE = 0, // the path format for the current platform - wxPATH_UNIX, - wxPATH_BEOS = wxPATH_UNIX, - wxPATH_MAC, - wxPATH_DOS, - wxPATH_WIN = wxPATH_DOS, - wxPATH_OS2 = wxPATH_DOS, - wxPATH_VMS, - - wxPATH_MAX // Not a valid value for specifying path format -}; - -// different conventions that may be used with GetHumanReadableSize() -enum wxSizeConvention -{ - wxSIZE_CONV_TRADITIONAL, // 1024 bytes = 1 KB - wxSIZE_CONV_IEC, // 1024 bytes = 1 KiB - wxSIZE_CONV_SI // 1000 bytes = 1 KB -}; - -// the kind of normalization to do with the file name: these values can be -// or'd together to perform several operations at once -enum wxPathNormalize -{ - wxPATH_NORM_ENV_VARS = 0x0001, // replace env vars with their values - wxPATH_NORM_DOTS = 0x0002, // squeeze all .. and . - wxPATH_NORM_TILDE = 0x0004, // Unix only: replace ~ and ~user - wxPATH_NORM_CASE = 0x0008, // if case insensitive => tolower - wxPATH_NORM_ABSOLUTE = 0x0010, // make the path absolute - wxPATH_NORM_LONG = 0x0020, // make the path the long form - wxPATH_NORM_SHORTCUT = 0x0040, // resolve the shortcut, if it is a shortcut - wxPATH_NORM_ALL = 0x00ff & ~wxPATH_NORM_CASE -}; - -// what exactly should GetPath() return? -enum -{ - wxPATH_NO_SEPARATOR = 0x0000, // for symmetry with wxPATH_GET_SEPARATOR - wxPATH_GET_VOLUME = 0x0001, // include the volume if applicable - wxPATH_GET_SEPARATOR = 0x0002 // terminate the path with the separator -}; - -// Mkdir flags -enum -{ - wxPATH_MKDIR_FULL = 0x0001 // create directories recursively -}; - -// Rmdir flags -enum -{ - wxPATH_RMDIR_FULL = 0x0001, // delete with subdirectories if empty - wxPATH_RMDIR_RECURSIVE = 0x0002 // delete all recursively (dangerous!) -}; - -// FileExists flags -enum -{ - wxFILE_EXISTS_REGULAR = 0x0001, // check for existence of a regular file - wxFILE_EXISTS_DIR = 0x0002, // check for existence of a directory - wxFILE_EXISTS_SYMLINK = 0x1004, // check for existence of a symbolic link; - // also sets wxFILE_EXISTS_NO_FOLLOW as - // it would never be satisfied otherwise - wxFILE_EXISTS_DEVICE = 0x0008, // check for existence of a device - wxFILE_EXISTS_FIFO = 0x0016, // check for existence of a FIFO - wxFILE_EXISTS_SOCKET = 0x0032, // check for existence of a socket - // gap for future types - wxFILE_EXISTS_NO_FOLLOW = 0x1000, // don't dereference a contained symlink - wxFILE_EXISTS_ANY = 0x1FFF // check for existence of anything -}; - -#if wxUSE_LONGLONG -// error code of wxFileName::GetSize() -extern WXDLLIMPEXP_DATA_BASE(const wxULongLong) wxInvalidSize; -#endif // wxUSE_LONGLONG - - - -// ---------------------------------------------------------------------------- -// wxFileName: encapsulates a file path -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxFileName -{ -public: - // constructors and assignment - - // the usual stuff - wxFileName() { Clear(); } - wxFileName(const wxFileName& filepath) { Assign(filepath); } - - // from a full filename: if it terminates with a '/', a directory path - // is contructed (the name will be empty), otherwise a file name and - // extension are extracted from it - wxFileName( const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE ) - { Assign( fullpath, format ); m_dontFollowLinks = false; } - - // from a directory name and a file name - wxFileName(const wxString& path, - const wxString& name, - wxPathFormat format = wxPATH_NATIVE) - { Assign(path, name, format); m_dontFollowLinks = false; } - - // from a volume, directory name, file base name and extension - wxFileName(const wxString& volume, - const wxString& path, - const wxString& name, - const wxString& ext, - wxPathFormat format = wxPATH_NATIVE) - { Assign(volume, path, name, ext, format); m_dontFollowLinks = false; } - - // from a directory name, file base name and extension - wxFileName(const wxString& path, - const wxString& name, - const wxString& ext, - wxPathFormat format = wxPATH_NATIVE) - { Assign(path, name, ext, format); m_dontFollowLinks = false; } - - // the same for delayed initialization - - void Assign(const wxFileName& filepath); - - void Assign(const wxString& fullpath, - wxPathFormat format = wxPATH_NATIVE); - - void Assign(const wxString& volume, - const wxString& path, - const wxString& name, - const wxString& ext, - bool hasExt, - wxPathFormat format = wxPATH_NATIVE); - - void Assign(const wxString& volume, - const wxString& path, - const wxString& name, - const wxString& ext, - wxPathFormat format = wxPATH_NATIVE) - { Assign(volume, path, name, ext, !ext.empty(), format); } - - void Assign(const wxString& path, - const wxString& name, - wxPathFormat format = wxPATH_NATIVE); - - void Assign(const wxString& path, - const wxString& name, - const wxString& ext, - wxPathFormat format = wxPATH_NATIVE); - - void AssignDir(const wxString& dir, wxPathFormat format = wxPATH_NATIVE); - - // assorted assignment operators - - wxFileName& operator=(const wxFileName& filename) - { if (this != &filename) Assign(filename); return *this; } - - wxFileName& operator=(const wxString& filename) - { Assign(filename); return *this; } - - // reset all components to default, uninitialized state - void Clear(); - - // static pseudo constructors - static wxFileName FileName(const wxString& file, - wxPathFormat format = wxPATH_NATIVE); - static wxFileName DirName(const wxString& dir, - wxPathFormat format = wxPATH_NATIVE); - - // file tests - - // is the filename valid at all? - bool IsOk() const - { - // we're fine if we have the path or the name or if we're a root dir - return m_dirs.size() != 0 || !m_name.empty() || !m_relative || - !m_ext.empty() || m_hasExt; - } - - // does the file with this name exist? - bool FileExists() const; - static bool FileExists( const wxString &file ); - - // does the directory with this name exist? - bool DirExists() const; - static bool DirExists( const wxString &dir ); - - // does anything at all with this name (i.e. file, directory or some - // other file system object such as a device, socket, ...) exist? - bool Exists(int flags = wxFILE_EXISTS_ANY) const; - static bool Exists(const wxString& path, int flags = wxFILE_EXISTS_ANY); - - - // checks on most common flags for files/directories; - // more platform-specific features (like e.g. Unix permissions) are not - // available in wxFileName - - bool IsDirWritable() const { return wxIsWritable(GetPath()); } - static bool IsDirWritable(const wxString &path) { return wxDirExists(path) && wxIsWritable(path); } - - bool IsDirReadable() const { return wxIsReadable(GetPath()); } - static bool IsDirReadable(const wxString &path) { return wxDirExists(path) && wxIsReadable(path); } - - // NOTE: IsDirExecutable() is not present because the meaning of "executable" - // directory is very platform-dependent and also not so useful - - bool IsFileWritable() const { return wxIsWritable(GetFullPath()); } - static bool IsFileWritable(const wxString &path) { return wxFileExists(path) && wxIsWritable(path); } - - bool IsFileReadable() const { return wxIsReadable(GetFullPath()); } - static bool IsFileReadable(const wxString &path) { return wxFileExists(path) && wxIsReadable(path); } - - bool IsFileExecutable() const { return wxIsExecutable(GetFullPath()); } - static bool IsFileExecutable(const wxString &path) { return wxFileExists(path) && wxIsExecutable(path); } - - // set the file permissions to a combination of wxPosixPermissions enum - // values - bool SetPermissions(int permissions); - - - // time functions -#if wxUSE_DATETIME - // set the file last access/mod and creation times - // (any of the pointers may be NULL) - bool SetTimes(const wxDateTime *dtAccess, - const wxDateTime *dtMod, - const wxDateTime *dtCreate) const; - - // set the access and modification times to the current moment - bool Touch() const; - - // return the last access, last modification and create times - // (any of the pointers may be NULL) - bool GetTimes(wxDateTime *dtAccess, - wxDateTime *dtMod, - wxDateTime *dtCreate) const; - - // convenience wrapper: get just the last mod time of the file - wxDateTime GetModificationTime() const - { - wxDateTime dtMod; - (void)GetTimes(NULL, &dtMod, NULL); - return dtMod; - } -#endif // wxUSE_DATETIME - - // various file/dir operations - - // retrieve the value of the current working directory - void AssignCwd(const wxString& volume = wxEmptyString); - static wxString GetCwd(const wxString& volume = wxEmptyString); - - // change the current working directory - bool SetCwd() const; - static bool SetCwd( const wxString &cwd ); - - // get the value of user home (Unix only mainly) - void AssignHomeDir(); - static wxString GetHomeDir(); - - // get the system temporary directory - static wxString GetTempDir(); - -#if wxUSE_FILE || wxUSE_FFILE - // get a temp file name starting with the specified prefix - void AssignTempFileName(const wxString& prefix); - static wxString CreateTempFileName(const wxString& prefix); -#endif // wxUSE_FILE - -#if wxUSE_FILE - // get a temp file name starting with the specified prefix and open the - // file passed to us using this name for writing (atomically if - // possible) - void AssignTempFileName(const wxString& prefix, wxFile *fileTemp); - static wxString CreateTempFileName(const wxString& prefix, - wxFile *fileTemp); -#endif // wxUSE_FILE - -#if wxUSE_FFILE - // get a temp file name starting with the specified prefix and open the - // file passed to us using this name for writing (atomically if - // possible) - void AssignTempFileName(const wxString& prefix, wxFFile *fileTemp); - static wxString CreateTempFileName(const wxString& prefix, - wxFFile *fileTemp); -#endif // wxUSE_FFILE - - // directory creation and removal. - bool Mkdir(int perm = wxS_DIR_DEFAULT, int flags = 0) const; - static bool Mkdir(const wxString &dir, int perm = wxS_DIR_DEFAULT, - int flags = 0); - - bool Rmdir(int flags = 0) const; - static bool Rmdir(const wxString &dir, int flags = 0); - - // operations on the path - - // normalize the path: with the default flags value, the path will be - // made absolute, without any ".." and "." and all environment - // variables will be expanded in it - // - // this may be done using another (than current) value of cwd - bool Normalize(int flags = wxPATH_NORM_ALL, - const wxString& cwd = wxEmptyString, - wxPathFormat format = wxPATH_NATIVE); - - // get a path path relative to the given base directory, i.e. opposite - // of Normalize - // - // pass an empty string to get a path relative to the working directory - // - // returns true if the file name was modified, false if we failed to do - // anything with it (happens when the file is on a different volume, - // for example) - bool MakeRelativeTo(const wxString& pathBase = wxEmptyString, - wxPathFormat format = wxPATH_NATIVE); - - // make the path absolute - // - // this may be done using another (than current) value of cwd - bool MakeAbsolute(const wxString& cwd = wxEmptyString, - wxPathFormat format = wxPATH_NATIVE) - { return Normalize(wxPATH_NORM_DOTS | wxPATH_NORM_ABSOLUTE | - wxPATH_NORM_TILDE, cwd, format); } - - - // If the path is a symbolic link (Unix-only), indicate that all - // filesystem operations on this path should be performed on the link - // itself and not on the file it points to, as is the case by default. - // - // No effect if this is not a symbolic link. - void DontFollowLink() - { - m_dontFollowLinks = true; - } - - // If the path is a symbolic link (Unix-only), returns whether various - // file operations should act on the link itself, or on its target. - // - // This does not test if the path is really a symlink or not. - bool ShouldFollowLink() const - { - return !m_dontFollowLinks; - } - -#if defined(__WIN32__) && wxUSE_OLE - // if the path is a shortcut, return the target and optionally, - // the arguments - bool GetShortcutTarget(const wxString& shortcutPath, - wxString& targetFilename, - wxString* arguments = NULL) const; -#endif - - // if the path contains the value of the environment variable named envname - // then this function replaces it with the string obtained from - // wxString::Format(replacementFmtString, value_of_envname_variable) - // - // Example: - // wxFileName fn("/usr/openwin/lib/someFile"); - // fn.ReplaceEnvVariable("OPENWINHOME"); - // // now fn.GetFullPath() == "$OPENWINHOME/lib/someFile" - bool ReplaceEnvVariable(const wxString& envname, - const wxString& replacementFmtString = "$%s", - wxPathFormat format = wxPATH_NATIVE); - - // replaces, if present in the path, the home directory for the given user - // (see wxGetHomeDir) with a tilde - bool ReplaceHomeDir(wxPathFormat format = wxPATH_NATIVE); - - - // Comparison - - // compares with the rules of the given platforms format - bool SameAs(const wxFileName& filepath, - wxPathFormat format = wxPATH_NATIVE) const; - - // compare with another filename object - bool operator==(const wxFileName& filename) const - { return SameAs(filename); } - bool operator!=(const wxFileName& filename) const - { return !SameAs(filename); } - - // compare with a filename string interpreted as a native file name - bool operator==(const wxString& filename) const - { return SameAs(wxFileName(filename)); } - bool operator!=(const wxString& filename) const - { return !SameAs(wxFileName(filename)); } - - // are the file names of this type cases sensitive? - static bool IsCaseSensitive( wxPathFormat format = wxPATH_NATIVE ); - - // is this filename absolute? - bool IsAbsolute(wxPathFormat format = wxPATH_NATIVE) const; - - // is this filename relative? - bool IsRelative(wxPathFormat format = wxPATH_NATIVE) const - { return !IsAbsolute(format); } - - // Returns the characters that aren't allowed in filenames - // on the specified platform. - static wxString GetForbiddenChars(wxPathFormat format = wxPATH_NATIVE); - - // Information about path format - - // get the string separating the volume from the path for this format, - // return an empty string if this format doesn't support the notion of - // volumes at all - static wxString GetVolumeSeparator(wxPathFormat format = wxPATH_NATIVE); - - // get the string of path separators for this format - static wxString GetPathSeparators(wxPathFormat format = wxPATH_NATIVE); - - // get the string of path terminators, i.e. characters which terminate the - // path - static wxString GetPathTerminators(wxPathFormat format = wxPATH_NATIVE); - - // get the canonical path separator for this format - static wxUniChar GetPathSeparator(wxPathFormat format = wxPATH_NATIVE) - { return GetPathSeparators(format)[0u]; } - - // is the char a path separator for this format? - static bool IsPathSeparator(wxChar ch, wxPathFormat format = wxPATH_NATIVE); - - // is this is a DOS path which beings with a windows unique volume name - // ('\\?\Volume{guid}\')? - static bool IsMSWUniqueVolumeNamePath(const wxString& path, - wxPathFormat format = wxPATH_NATIVE); - - // Dir accessors - size_t GetDirCount() const { return m_dirs.size(); } - bool AppendDir(const wxString& dir); - void PrependDir(const wxString& dir); - bool InsertDir(size_t before, const wxString& dir); - void RemoveDir(size_t pos); - void RemoveLastDir() { RemoveDir(GetDirCount() - 1); } - - // Other accessors - void SetExt( const wxString &ext ) { m_ext = ext; m_hasExt = !m_ext.empty(); } - void ClearExt() { m_ext.clear(); m_hasExt = false; } - void SetEmptyExt() { m_ext.clear(); m_hasExt = true; } - wxString GetExt() const { return m_ext; } - bool HasExt() const { return m_hasExt; } - - void SetName( const wxString &name ) { m_name = name; } - wxString GetName() const { return m_name; } - bool HasName() const { return !m_name.empty(); } - - void SetVolume( const wxString &volume ) { m_volume = volume; } - wxString GetVolume() const { return m_volume; } - bool HasVolume() const { return !m_volume.empty(); } - - // full name is the file name + extension (but without the path) - void SetFullName(const wxString& fullname); - wxString GetFullName() const; - - const wxArrayString& GetDirs() const { return m_dirs; } - - // flags are combination of wxPATH_GET_XXX flags - wxString GetPath(int flags = wxPATH_GET_VOLUME, - wxPathFormat format = wxPATH_NATIVE) const; - - // Replace current path with this one - void SetPath( const wxString &path, wxPathFormat format = wxPATH_NATIVE ); - - // Construct full path with name and ext - wxString GetFullPath( wxPathFormat format = wxPATH_NATIVE ) const; - - // Return the short form of the path (returns identity on non-Windows platforms) - wxString GetShortPath() const; - - // Return the long form of the path (returns identity on non-Windows platforms) - wxString GetLongPath() const; - - // Is this a file or directory (not necessarily an existing one) - bool IsDir() const { return m_name.empty() && m_ext.empty(); } - - // various helpers - - // get the canonical path format for this platform - static wxPathFormat GetFormat( wxPathFormat format = wxPATH_NATIVE ); - - // split a fullpath into the volume, path, (base) name and extension - // (all of the pointers can be NULL) - static void SplitPath(const wxString& fullpath, - wxString *volume, - wxString *path, - wxString *name, - wxString *ext, - bool *hasExt = NULL, - wxPathFormat format = wxPATH_NATIVE); - - static void SplitPath(const wxString& fullpath, - wxString *volume, - wxString *path, - wxString *name, - wxString *ext, - wxPathFormat format) - { - SplitPath(fullpath, volume, path, name, ext, NULL, format); - } - - // compatibility version: volume is part of path - static void SplitPath(const wxString& fullpath, - wxString *path, - wxString *name, - wxString *ext, - wxPathFormat format = wxPATH_NATIVE); - - // split a path into volume and pure path part - static void SplitVolume(const wxString& fullpathWithVolume, - wxString *volume, - wxString *path, - wxPathFormat format = wxPATH_NATIVE); - - // strip the file extension: "foo.bar" => "foo" (but ".baz" => ".baz") - static wxString StripExtension(const wxString& fullpath); - -#ifdef wxHAS_FILESYSTEM_VOLUMES - // return the string representing a file system volume, or drive - static wxString GetVolumeString(char drive, int flags = wxPATH_GET_SEPARATOR); -#endif // wxHAS_FILESYSTEM_VOLUMES - - // File size - -#if wxUSE_LONGLONG - // returns the size of the given filename - wxULongLong GetSize() const; - static wxULongLong GetSize(const wxString &file); - - // returns the size in a human readable form - wxString - GetHumanReadableSize(const wxString& nullsize = wxGetTranslation("Not available"), - int precision = 1, - wxSizeConvention conv = wxSIZE_CONV_TRADITIONAL) const; - static wxString - GetHumanReadableSize(const wxULongLong& sz, - const wxString& nullsize = wxGetTranslation("Not available"), - int precision = 1, - wxSizeConvention conv = wxSIZE_CONV_TRADITIONAL); -#endif // wxUSE_LONGLONG - - - // deprecated methods, don't use any more - // -------------------------------------- - - wxString GetPath( bool withSep, wxPathFormat format = wxPATH_NATIVE ) const - { return GetPath(withSep ? wxPATH_GET_SEPARATOR : 0, format); } - wxString GetPathWithSep(wxPathFormat format = wxPATH_NATIVE ) const - { return GetPath(wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR, format); } - -private: - // check whether this dir is valid for Append/Prepend/InsertDir() - static bool IsValidDirComponent(const wxString& dir); - - // the drive/volume/device specification (always empty for Unix) - wxString m_volume; - - // the path components of the file - wxArrayString m_dirs; - - // the file name and extension (empty for directories) - wxString m_name, - m_ext; - - // when m_dirs is empty it may mean either that we have no path at all or - // that our path is '/', i.e. the root directory - // - // we use m_relative to distinguish between these two cases, it will be - // true in the former and false in the latter - // - // NB: the path is not absolute just because m_relative is false, it still - // needs the drive (i.e. volume) in some formats (Windows) - bool m_relative; - - // when m_ext is empty, it may be because we don't have any extension or - // because we have an empty extension - // - // the difference is important as file with name "foo" and without - // extension has full name "foo" while with empty extension it is "foo." - bool m_hasExt; - - // by default, symlinks are dereferenced but this flag can be set with - // DontFollowLink() to change this and make different operations work on - // this file path itself instead of the target of the symlink - bool m_dontFollowLinks; -}; - -#endif // _WX_FILENAME_H_ - diff --git a/Externals/wxWidgets3/include/wx/filepicker.h b/Externals/wxWidgets3/include/wx/filepicker.h deleted file mode 100644 index 6c9b3f85a7..0000000000 --- a/Externals/wxWidgets3/include/wx/filepicker.h +++ /dev/null @@ -1,420 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/filepicker.h -// Purpose: wxFilePickerCtrl, wxDirPickerCtrl base header -// Author: Francesco Montorsi -// Modified by: -// Created: 14/4/2006 -// Copyright: (c) Francesco Montorsi -// Licence: wxWindows Licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_FILEDIRPICKER_H_BASE_ -#define _WX_FILEDIRPICKER_H_BASE_ - -#include "wx/defs.h" - -#if wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL - -#include "wx/pickerbase.h" -#include "wx/filename.h" - -class WXDLLIMPEXP_FWD_CORE wxDialog; -class WXDLLIMPEXP_FWD_CORE wxFileDirPickerEvent; - -extern WXDLLIMPEXP_DATA_CORE(const char) wxFilePickerWidgetLabel[]; -extern WXDLLIMPEXP_DATA_CORE(const char) wxFilePickerWidgetNameStr[]; -extern WXDLLIMPEXP_DATA_CORE(const char) wxFilePickerCtrlNameStr[]; -extern WXDLLIMPEXP_DATA_CORE(const char) wxFileSelectorPromptStr[]; - -extern WXDLLIMPEXP_DATA_CORE(const char) wxDirPickerWidgetLabel[]; -extern WXDLLIMPEXP_DATA_CORE(const char) wxDirPickerWidgetNameStr[]; -extern WXDLLIMPEXP_DATA_CORE(const char) wxDirPickerCtrlNameStr[]; -extern WXDLLIMPEXP_DATA_CORE(const char) wxDirSelectorPromptStr[]; - -// ---------------------------------------------------------------------------- -// wxFileDirPickerEvent: used by wxFilePickerCtrl and wxDirPickerCtrl only -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxFileDirPickerEvent : public wxCommandEvent -{ -public: - wxFileDirPickerEvent() {} - wxFileDirPickerEvent(wxEventType type, wxObject *generator, int id, const wxString &path) - : wxCommandEvent(type, id), - m_path(path) - { - SetEventObject(generator); - } - - wxString GetPath() const { return m_path; } - void SetPath(const wxString &p) { m_path = p; } - - // default copy ctor, assignment operator and dtor are ok - virtual wxEvent *Clone() const wxOVERRIDE { return new wxFileDirPickerEvent(*this); } - -private: - wxString m_path; - - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxFileDirPickerEvent); -}; - -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_FILEPICKER_CHANGED, wxFileDirPickerEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_DIRPICKER_CHANGED, wxFileDirPickerEvent ); - -// ---------------------------------------------------------------------------- -// event types and macros -// ---------------------------------------------------------------------------- - -typedef void (wxEvtHandler::*wxFileDirPickerEventFunction)(wxFileDirPickerEvent&); - -#define wxFileDirPickerEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxFileDirPickerEventFunction, func) - -#define EVT_FILEPICKER_CHANGED(id, fn) \ - wx__DECLARE_EVT1(wxEVT_FILEPICKER_CHANGED, id, wxFileDirPickerEventHandler(fn)) -#define EVT_DIRPICKER_CHANGED(id, fn) \ - wx__DECLARE_EVT1(wxEVT_DIRPICKER_CHANGED, id, wxFileDirPickerEventHandler(fn)) - -// ---------------------------------------------------------------------------- -// wxFileDirPickerWidgetBase: a generic abstract interface which must be -// implemented by controls used by wxFileDirPickerCtrlBase -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxFileDirPickerWidgetBase -{ -public: - wxFileDirPickerWidgetBase() { } - virtual ~wxFileDirPickerWidgetBase() { } - - // Path here is the name of the selected file or directory. - wxString GetPath() const { return m_path; } - virtual void SetPath(const wxString &str) { m_path=str; } - - // Set the directory to open the file browse dialog at initially. - virtual void SetInitialDirectory(const wxString& dir) = 0; - - // returns the picker widget cast to wxControl - virtual wxControl *AsControl() = 0; - -protected: - virtual void UpdateDialogPath(wxDialog *) = 0; - virtual void UpdatePathFromDialog(wxDialog *) = 0; - - wxString m_path; -}; - -// Styles which must be supported by all controls implementing wxFileDirPickerWidgetBase -// NB: these styles must be defined to carefully-chosen values to -// avoid conflicts with wxButton's styles - -#define wxFLP_OPEN 0x0400 -#define wxFLP_SAVE 0x0800 -#define wxFLP_OVERWRITE_PROMPT 0x1000 -#define wxFLP_FILE_MUST_EXIST 0x2000 -#define wxFLP_CHANGE_DIR 0x4000 -#define wxFLP_SMALL wxPB_SMALL - -// NOTE: wxMULTIPLE is not supported ! - - -#define wxDIRP_DIR_MUST_EXIST 0x0008 -#define wxDIRP_CHANGE_DIR 0x0010 -#define wxDIRP_SMALL wxPB_SMALL - - -// map platform-dependent controls which implement the wxFileDirPickerWidgetBase -// under the name "wxFilePickerWidget" and "wxDirPickerWidget". -// NOTE: wxFileDirPickerCtrlBase will allocate a wx{File|Dir}PickerWidget and this -// requires that all classes being mapped as wx{File|Dir}PickerWidget have the -// same prototype for the contructor... -// since GTK >= 2.6, there is GtkFileButton -#if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__) - #include "wx/gtk/filepicker.h" - #define wxFilePickerWidget wxFileButton - #define wxDirPickerWidget wxDirButton -#else - #include "wx/generic/filepickerg.h" - #define wxFilePickerWidget wxGenericFileButton - #define wxDirPickerWidget wxGenericDirButton -#endif - - - -// ---------------------------------------------------------------------------- -// wxFileDirPickerCtrlBase -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxFileDirPickerCtrlBase : public wxPickerBase -{ -public: - wxFileDirPickerCtrlBase() {} - -protected: - // NB: no default values since this function will never be used - // directly by the user and derived classes wouldn't use them - bool CreateBase(wxWindow *parent, - wxWindowID id, - const wxString& path, - const wxString &message, - const wxString &wildcard, - const wxPoint& pos, - const wxSize& size, - long style, - const wxValidator& validator, - const wxString& name); - -public: // public API - - wxString GetPath() const; - void SetPath(const wxString &str); - - // Set the directory to open the file browse dialog at initially. - void SetInitialDirectory(const wxString& dir) - { - m_pickerIface->SetInitialDirectory(dir); - } - -public: // internal functions - - void UpdatePickerFromTextCtrl() wxOVERRIDE; - void UpdateTextCtrlFromPicker() wxOVERRIDE; - - // event handler for our picker - void OnFileDirChange(wxFileDirPickerEvent &); - - // TRUE if any textctrl change should update the current working directory - virtual bool IsCwdToUpdate() const = 0; - - // Returns the event type sent by this picker - virtual wxEventType GetEventType() const = 0; - - virtual void DoConnect( wxControl *sender, wxFileDirPickerCtrlBase *eventSink ) = 0; - - // Returns the filtered value currently placed in the text control (if present). - virtual wxString GetTextCtrlValue() const = 0; - -protected: - // creates the picker control - virtual - wxFileDirPickerWidgetBase *CreatePicker(wxWindow *parent, - const wxString& path, - const wxString& message, - const wxString& wildcard) = 0; - -protected: - - // m_picker object as wxFileDirPickerWidgetBase interface - wxFileDirPickerWidgetBase *m_pickerIface; -}; - -#endif // wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL - - -#if wxUSE_FILEPICKERCTRL - -// ---------------------------------------------------------------------------- -// wxFilePickerCtrl: platform-independent class which embeds the -// platform-dependent wxFilePickerWidget and, if wxFLP_USE_TEXTCTRL style is -// used, a textctrl next to it. -// ---------------------------------------------------------------------------- - -#define wxFLP_USE_TEXTCTRL (wxPB_USE_TEXTCTRL) - -#ifdef __WXGTK__ - // GTK apps usually don't have a textctrl next to the picker - #define wxFLP_DEFAULT_STYLE (wxFLP_OPEN|wxFLP_FILE_MUST_EXIST) -#else - #define wxFLP_DEFAULT_STYLE (wxFLP_USE_TEXTCTRL|wxFLP_OPEN|wxFLP_FILE_MUST_EXIST) -#endif - -class WXDLLIMPEXP_CORE wxFilePickerCtrl : public wxFileDirPickerCtrlBase -{ -public: - wxFilePickerCtrl() {} - - wxFilePickerCtrl(wxWindow *parent, - wxWindowID id, - const wxString& path = wxEmptyString, - const wxString& message = wxFileSelectorPromptStr, - const wxString& wildcard = wxFileSelectorDefaultWildcardStr, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxFLP_DEFAULT_STYLE, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxFilePickerCtrlNameStr) - { - Create(parent, id, path, message, wildcard, pos, size, style, - validator, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& path = wxEmptyString, - const wxString& message = wxFileSelectorPromptStr, - const wxString& wildcard = wxFileSelectorDefaultWildcardStr, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxFLP_DEFAULT_STYLE, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxFilePickerCtrlNameStr); - - void SetFileName(const wxFileName &filename) - { SetPath(filename.GetFullPath()); } - - wxFileName GetFileName() const - { return wxFileName(GetPath()); } - -public: // overrides - - // return the text control value in canonical form - wxString GetTextCtrlValue() const wxOVERRIDE; - - bool IsCwdToUpdate() const wxOVERRIDE - { return HasFlag(wxFLP_CHANGE_DIR); } - - wxEventType GetEventType() const wxOVERRIDE - { return wxEVT_FILEPICKER_CHANGED; } - - virtual void DoConnect( wxControl *sender, wxFileDirPickerCtrlBase *eventSink ) wxOVERRIDE - { - sender->Connect( wxEVT_FILEPICKER_CHANGED, - wxFileDirPickerEventHandler( wxFileDirPickerCtrlBase::OnFileDirChange ), - NULL, eventSink ); - } - - -protected: - virtual - wxFileDirPickerWidgetBase *CreatePicker(wxWindow *parent, - const wxString& path, - const wxString& message, - const wxString& wildcard) wxOVERRIDE - { - return new wxFilePickerWidget(parent, wxID_ANY, - wxGetTranslation(wxFilePickerWidgetLabel), - path, message, wildcard, - wxDefaultPosition, wxDefaultSize, - GetPickerStyle(GetWindowStyle())); - } - - // extracts the style for our picker from wxFileDirPickerCtrlBase's style - long GetPickerStyle(long style) const wxOVERRIDE - { - return style & (wxFLP_OPEN | - wxFLP_SAVE | - wxFLP_OVERWRITE_PROMPT | - wxFLP_FILE_MUST_EXIST | - wxFLP_CHANGE_DIR | - wxFLP_USE_TEXTCTRL | - wxFLP_SMALL); - } - -private: - wxDECLARE_DYNAMIC_CLASS(wxFilePickerCtrl); -}; - -#endif // wxUSE_FILEPICKERCTRL - - -#if wxUSE_DIRPICKERCTRL - -// ---------------------------------------------------------------------------- -// wxDirPickerCtrl: platform-independent class which embeds the -// platform-dependent wxDirPickerWidget and eventually a textctrl -// (see wxDIRP_USE_TEXTCTRL) next to it. -// ---------------------------------------------------------------------------- - -#define wxDIRP_USE_TEXTCTRL (wxPB_USE_TEXTCTRL) - -#ifdef __WXGTK__ - // GTK apps usually don't have a textctrl next to the picker - #define wxDIRP_DEFAULT_STYLE (wxDIRP_DIR_MUST_EXIST) -#else - #define wxDIRP_DEFAULT_STYLE (wxDIRP_USE_TEXTCTRL|wxDIRP_DIR_MUST_EXIST) -#endif - -class WXDLLIMPEXP_CORE wxDirPickerCtrl : public wxFileDirPickerCtrlBase -{ -public: - wxDirPickerCtrl() {} - - wxDirPickerCtrl(wxWindow *parent, wxWindowID id, - const wxString& path = wxEmptyString, - const wxString& message = wxDirSelectorPromptStr, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDIRP_DEFAULT_STYLE, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxDirPickerCtrlNameStr) - { - Create(parent, id, path, message, pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, wxWindowID id, - const wxString& path = wxEmptyString, - const wxString& message = wxDirSelectorPromptStr, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDIRP_DEFAULT_STYLE, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxDirPickerCtrlNameStr); - - void SetDirName(const wxFileName &dirname) - { SetPath(dirname.GetPath()); } - - wxFileName GetDirName() const - { return wxFileName::DirName(GetPath()); } - -public: // overrides - - wxString GetTextCtrlValue() const wxOVERRIDE; - - bool IsCwdToUpdate() const wxOVERRIDE - { return HasFlag(wxDIRP_CHANGE_DIR); } - - wxEventType GetEventType() const wxOVERRIDE - { return wxEVT_DIRPICKER_CHANGED; } - - virtual void DoConnect( wxControl *sender, wxFileDirPickerCtrlBase *eventSink ) wxOVERRIDE - { - sender->Connect( wxEVT_DIRPICKER_CHANGED, - wxFileDirPickerEventHandler( wxFileDirPickerCtrlBase::OnFileDirChange ), - NULL, eventSink ); - } - - -protected: - virtual - wxFileDirPickerWidgetBase *CreatePicker(wxWindow *parent, - const wxString& path, - const wxString& message, - const wxString& WXUNUSED(wildcard)) wxOVERRIDE - { - return new wxDirPickerWidget(parent, wxID_ANY, - wxGetTranslation(wxDirPickerWidgetLabel), - path, message, - wxDefaultPosition, wxDefaultSize, - GetPickerStyle(GetWindowStyle())); - } - - // extracts the style for our picker from wxFileDirPickerCtrlBase's style - long GetPickerStyle(long style) const wxOVERRIDE - { - return style & (wxDIRP_DIR_MUST_EXIST | - wxDIRP_CHANGE_DIR | - wxDIRP_USE_TEXTCTRL | - wxDIRP_SMALL); - } - -private: - wxDECLARE_DYNAMIC_CLASS(wxDirPickerCtrl); -}; - -#endif // wxUSE_DIRPICKERCTRL - -// old wxEVT_COMMAND_* constants -#define wxEVT_COMMAND_FILEPICKER_CHANGED wxEVT_FILEPICKER_CHANGED -#define wxEVT_COMMAND_DIRPICKER_CHANGED wxEVT_DIRPICKER_CHANGED - -#endif // _WX_FILEDIRPICKER_H_BASE_ - diff --git a/Externals/wxWidgets3/include/wx/filesys.h b/Externals/wxWidgets3/include/wx/filesys.h deleted file mode 100644 index eb9a794e80..0000000000 --- a/Externals/wxWidgets3/include/wx/filesys.h +++ /dev/null @@ -1,314 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/filesys.h -// Purpose: class for opening files - virtual file system -// Author: Vaclav Slavik -// Copyright: (c) 1999 Vaclav Slavik -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __FILESYS_H__ -#define __FILESYS_H__ - -#include "wx/defs.h" - -#if wxUSE_FILESYSTEM - -#if !wxUSE_STREAMS -#error You cannot compile virtual file systems without wxUSE_STREAMS -#endif - -#if wxUSE_HTML && !wxUSE_FILESYSTEM -#error You cannot compile wxHTML without virtual file systems -#endif - -#include "wx/stream.h" -#include "wx/datetime.h" -#include "wx/filename.h" -#include "wx/hashmap.h" - -class WXDLLIMPEXP_FWD_BASE wxFSFile; -class WXDLLIMPEXP_FWD_BASE wxFileSystemHandler; -class WXDLLIMPEXP_FWD_BASE wxFileSystem; - -//-------------------------------------------------------------------------------- -// wxFSFile -// This class is a file opened using wxFileSystem. It consists of -// input stream, location, mime type & optional anchor -// (in 'index.htm#chapter2', 'chapter2' is anchor) -//-------------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxFSFile : public wxObject -{ -public: - wxFSFile(wxInputStream *stream, const wxString& loc, - const wxString& mimetype, const wxString& anchor -#if wxUSE_DATETIME - , wxDateTime modif -#endif // wxUSE_DATETIME - ) - { - m_Stream = stream; - m_Location = loc; - m_MimeType = mimetype.Lower(); - m_Anchor = anchor; -#if wxUSE_DATETIME - m_Modif = modif; -#endif // wxUSE_DATETIME - } - - virtual ~wxFSFile() { delete m_Stream; } - - // returns stream. This doesn't give away ownership of the stream object. - wxInputStream *GetStream() const { return m_Stream; } - - // gives away the ownership of the current stream. - wxInputStream *DetachStream() - { - wxInputStream *stream = m_Stream; - m_Stream = NULL; - return stream; - } - - // deletes the current stream and takes ownership of another. - void SetStream(wxInputStream *stream) - { - delete m_Stream; - m_Stream = stream; - } - - // returns file's mime type - const wxString& GetMimeType() const; - - // returns the original location (aka filename) of the file - const wxString& GetLocation() const { return m_Location; } - - const wxString& GetAnchor() const { return m_Anchor; } - -#if wxUSE_DATETIME - wxDateTime GetModificationTime() const { return m_Modif; } -#endif // wxUSE_DATETIME - -private: - wxInputStream *m_Stream; - wxString m_Location; - wxString m_MimeType; - wxString m_Anchor; -#if wxUSE_DATETIME - wxDateTime m_Modif; -#endif // wxUSE_DATETIME - - wxDECLARE_ABSTRACT_CLASS(wxFSFile); - wxDECLARE_NO_COPY_CLASS(wxFSFile); -}; - - - - - -//-------------------------------------------------------------------------------- -// wxFileSystemHandler -// This class is FS handler for wxFileSystem. It provides -// interface to access certain -// kinds of files (HTPP, FTP, local, tar.gz etc..) -//-------------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxFileSystemHandler : public wxObject -{ -public: - wxFileSystemHandler() : wxObject() {} - - // returns true if this handler is able to open given location - virtual bool CanOpen(const wxString& location) = 0; - - // opens given file and returns pointer to input stream. - // Returns NULL if opening failed. - // The location is always absolute path. - virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location) = 0; - - // Finds first/next file that matches spec wildcard. flags can be wxDIR for restricting - // the query to directories or wxFILE for files only or 0 for either. - // Returns filename or empty string if no more matching file exists - virtual wxString FindFirst(const wxString& spec, int flags = 0); - virtual wxString FindNext(); - - // Returns MIME type of the file - w/o need to open it - // (default behaviour is that it returns type based on extension) - static wxString GetMimeTypeFromExt(const wxString& location); - -protected: - // returns protocol ("file", "http", "tar" etc.) The last (most right) - // protocol is used: - // {it returns "tar" for "file:subdir/archive.tar.gz#tar:/README.txt"} - static wxString GetProtocol(const wxString& location); - - // returns left part of address: - // {it returns "file:subdir/archive.tar.gz" for "file:subdir/archive.tar.gz#tar:/README.txt"} - static wxString GetLeftLocation(const wxString& location); - - // returns anchor part of address: - // {it returns "anchor" for "file:subdir/archive.tar.gz#tar:/README.txt#anchor"} - // NOTE: anchor is NOT a part of GetLeftLocation()'s return value - static wxString GetAnchor(const wxString& location); - - // returns right part of address: - // {it returns "/README.txt" for "file:subdir/archive.tar.gz#tar:/README.txt"} - static wxString GetRightLocation(const wxString& location); - - wxDECLARE_ABSTRACT_CLASS(wxFileSystemHandler); -}; - - - - -//-------------------------------------------------------------------------------- -// wxFileSystem -// This class provides simple interface for opening various -// kinds of files (HTPP, FTP, local, tar.gz etc..) -//-------------------------------------------------------------------------------- - -// Open Bit Flags -enum wxFileSystemOpenFlags -{ - wxFS_READ = 1, // Open for reading - wxFS_SEEKABLE = 4 // Returned stream will be seekable -}; - -WX_DECLARE_VOIDPTR_HASH_MAP_WITH_DECL(wxFileSystemHandler*, wxFSHandlerHash, class WXDLLIMPEXP_BASE); - -class WXDLLIMPEXP_BASE wxFileSystem : public wxObject -{ -public: - wxFileSystem() : wxObject() { m_FindFileHandler = NULL;} - virtual ~wxFileSystem(); - - // sets the current location. Every call to OpenFile is - // relative to this location. - // NOTE !! - // unless is_dir = true 'location' is *not* the directory but - // file contained in this directory - // (so ChangePathTo("dir/subdir/xh.htm") sets m_Path to "dir/subdir/") - void ChangePathTo(const wxString& location, bool is_dir = false); - - wxString GetPath() const {return m_Path;} - - // opens given file and returns pointer to input stream. - // Returns NULL if opening failed. - // It first tries to open the file in relative scope - // (based on ChangePathTo()'s value) and then as an absolute - // path. - wxFSFile* OpenFile(const wxString& location, int flags = wxFS_READ); - - // Finds first/next file that matches spec wildcard. flags can be wxDIR for restricting - // the query to directories or wxFILE for files only or 0 for either. - // Returns filename or empty string if no more matching file exists - wxString FindFirst(const wxString& spec, int flags = 0); - wxString FindNext(); - - // find a file in a list of directories, returns false if not found - bool FindFileInPath(wxString *pStr, - const wxString& path, const wxString& file); - - // Adds FS handler. - // In fact, this class is only front-end to the FS handlers :-) - static void AddHandler(wxFileSystemHandler *handler); - - // Removes FS handler - static wxFileSystemHandler* RemoveHandler(wxFileSystemHandler *handler); - - // Returns true if there is a handler which can open the given location. - static bool HasHandlerForPath(const wxString& location); - - // remove all items from the m_Handlers list - static void CleanUpHandlers(); - - // Returns the native path for a file URL - static wxFileName URLToFileName(const wxString& url); - - // Returns the file URL for a native path - static wxString FileNameToURL(const wxFileName& filename); - - -protected: - wxFileSystemHandler *MakeLocal(wxFileSystemHandler *h); - - wxString m_Path; - // the path (location) we are currently in - // this is path, not file! - // (so if you opened test/demo.htm, it is - // "test/", not "test/demo.htm") - wxString m_LastName; - // name of last opened file (full path) - static wxList m_Handlers; - // list of FS handlers - wxFileSystemHandler *m_FindFileHandler; - // handler that succeed in FindFirst query - wxFSHandlerHash m_LocalHandlers; - // Handlers local to this instance - - wxDECLARE_DYNAMIC_CLASS(wxFileSystem); - wxDECLARE_NO_COPY_CLASS(wxFileSystem); -}; - - -/* - -'location' syntax: - -To determine FS type, we're using standard KDE notation: -file:/absolute/path/file.htm -file:relative_path/xxxxx.html -/some/path/x.file ('file:' is default) -http://www.gnome.org -file:subdir/archive.tar.gz#tar:/README.txt - -special characters : - ':' - FS identificator is before this char - '#' - separator. It can be either HTML anchor ("index.html#news") - (in case there is no ':' in the string to the right from it) - or FS separator - (example : http://www.wxhtml.org/wxhtml-0.1.tar.gz#tar:/include/wxhtml/filesys.h" - this would access tgz archive stored on web) - '/' - directory (path) separator. It is used to determine upper-level path. - HEY! Don't use \ even if you're on Windows! - -*/ - - -class WXDLLIMPEXP_BASE wxLocalFSHandler : public wxFileSystemHandler -{ -public: - virtual bool CanOpen(const wxString& location) wxOVERRIDE; - virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location) wxOVERRIDE; - virtual wxString FindFirst(const wxString& spec, int flags = 0) wxOVERRIDE; - virtual wxString FindNext() wxOVERRIDE; - - // wxLocalFSHandler will prefix all filenames with 'root' before accessing - // files on disk. This effectively makes 'root' the top-level directory - // and prevents access to files outside this directory. - // (This is similar to Unix command 'chroot'.) - static void Chroot(const wxString& root) { ms_root = root; } - -protected: - static wxString ms_root; -}; - -// Stream reading data from wxFSFile: this allows to use virtual files with any -// wx functions accepting streams. -class WXDLLIMPEXP_BASE wxFSInputStream : public wxWrapperInputStream -{ -public: - // Notice that wxFS_READ is implied in flags. - wxFSInputStream(const wxString& filename, int flags = 0); - virtual ~wxFSInputStream(); - -private: - wxFSFile* m_file; - - wxDECLARE_NO_COPY_CLASS(wxFSInputStream); -}; - -#endif - // wxUSE_FILESYSTEM - -#endif - // __FILESYS_H__ diff --git a/Externals/wxWidgets3/include/wx/flags.h b/Externals/wxWidgets3/include/wx/flags.h deleted file mode 100644 index c45bafabdc..0000000000 --- a/Externals/wxWidgets3/include/wx/flags.h +++ /dev/null @@ -1,176 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/flags.h -// Purpose: a bitset suited for replacing the current style flags -// Author: Stefan Csomor -// Modified by: -// Created: 27/07/03 -// Copyright: (c) 2003 Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_SETH__ -#define _WX_SETH__ - -// wxBitset should be applied to an enum, then this can be used like -// bitwise operators but keeps the type safety and information, the -// enums must be in a sequence , their value determines the bit position -// that they represent -// The api is made as close as possible to - -template class wxBitset -{ - friend class wxEnumData ; -public: - // creates a wxBitset<> object with all flags initialized to 0 - wxBitset() { m_data = 0; } - - // created a wxBitset<> object initialized according to the bits of the - // integral value val - wxBitset(unsigned long val) { m_data = val ; } - - // copies the content in the new wxBitset<> object from another one - wxBitset(const wxBitset &src) { m_data = src.m_data; } - - // creates a wxBitset<> object that has the specific flag set - wxBitset(const T el) { m_data |= 1 << el; } - - // returns the integral value that the bits of this object represent - unsigned long to_ulong() const { return m_data ; } - - // assignment - wxBitset &operator =(const wxBitset &rhs) - { - m_data = rhs.m_data; - return *this; - } - - // bitwise or operator, sets all bits that are in rhs and leaves - // the rest unchanged - wxBitset &operator |=(const wxBitset &rhs) - { - m_data |= rhs.m_data; - return *this; - } - - // bitwsie exclusive-or operator, toggles the value of all bits - // that are set in bits and leaves all others unchanged - wxBitset &operator ^=(const wxBitset &rhs) // difference - { - m_data ^= rhs.m_data; - return *this; - } - - // bitwise and operator, resets all bits that are not in rhs and leaves - // all others unchanged - wxBitset &operator &=(const wxBitset &rhs) // intersection - { - m_data &= rhs.m_data; - return *this; - } - - // bitwise or operator, returns a new bitset that has all bits set that set are in - // bitset2 or in this bitset - wxBitset operator |(const wxBitset &bitset2) const // union - { - wxBitset s; - s.m_data = m_data | bitset2.m_data; - return s; - } - - // bitwise exclusive-or operator, returns a new bitset that has all bits set that are set either in - // bitset2 or in this bitset but not in both - wxBitset operator ^(const wxBitset &bitset2) const // difference - { - wxBitset s; - s.m_data = m_data ^ bitset2.m_data; - return s; - } - - // bitwise and operator, returns a new bitset that has all bits set that are set both in - // bitset2 and in this bitset - wxBitset operator &(const wxBitset &bitset2) const // intersection - { - wxBitset s; - s.m_data = m_data & bitset2.m_data; - return s; - } - - // sets appropriate the bit to true - wxBitset& set(const T el) //Add element - { - m_data |= 1 << el; - return *this; - } - - // clears the appropriate flag to false - wxBitset& reset(const T el) //remove element - { - m_data &= ~(1 << el); - return *this; - } - - // clear all flags - wxBitset& reset() - { - m_data = 0; - return *this; - } - - // true if this flag is set - bool test(const T el) const - { - return (m_data & (1 << el)) ? true : false; - } - - // true if no flag is set - bool none() const - { - return m_data == 0; - } - - // true if any flag is set - bool any() const - { - return m_data != 0; - } - - // true if both have the same flags - bool operator ==(const wxBitset &rhs) const - { - return m_data == rhs.m_data; - } - - // true if both differ in their flags set - bool operator !=(const wxBitset &rhs) const - { - return !operator==(rhs); - } - - bool operator[] (const T el) const { return test(el) ; } - -private : - unsigned long m_data; -}; - -#if wxUSE_EXTENDED_RTTI - -#define wxDEFINE_FLAGS( flags ) \ - class WXDLLIMPEXP_BASE flags \ - {\ - public : \ - flags(long data=0) :m_data(data) {} \ - long m_data ;\ - bool operator ==(const flags &rhs) const { return m_data == rhs.m_data; }\ - } ; - -#else - -#define wxDEFINE_FLAGS( flags ) - -#endif - -#if WXWIN_COMPATIBILITY_2_8 - #define WX_DEFINE_FLAGS wxDEFINE_FLAGS -#endif - -#endif diff --git a/Externals/wxWidgets3/include/wx/fmappriv.h b/Externals/wxWidgets3/include/wx/fmappriv.h deleted file mode 100644 index 6637088626..0000000000 --- a/Externals/wxWidgets3/include/wx/fmappriv.h +++ /dev/null @@ -1,73 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/fmappriv.h -// Purpose: private wxFontMapper stuff, not to be used by the library users -// Author: Vadim Zeitlin -// Modified by: -// Created: 21.06.2003 (extracted from common/fontmap.cpp) -// Copyright: (c) 1999-2003 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_FMAPPRIV_H_ -#define _WX_FMAPPRIV_H_ - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -// a special pseudo encoding which means "don't ask me about this charset -// any more" -- we need it to avoid driving the user crazy with asking him -// time after time about the same charset which he [presumably] doesn't -// have the fonts for -enum { wxFONTENCODING_UNKNOWN = -2 }; - -// the config paths we use -#if wxUSE_CONFIG - -#define FONTMAPPER_ROOT_PATH wxT("/wxWindows/FontMapper") -#define FONTMAPPER_CHARSET_PATH wxT("Charsets") -#define FONTMAPPER_CHARSET_ALIAS_PATH wxT("Aliases") - -#endif // wxUSE_CONFIG - -// ---------------------------------------------------------------------------- -// wxFontMapperPathChanger: change the config path during our lifetime -// ---------------------------------------------------------------------------- - -#if wxUSE_CONFIG && wxUSE_FILECONFIG - -class wxFontMapperPathChanger -{ -public: - wxFontMapperPathChanger(wxFontMapperBase *fontMapper, const wxString& path) - { - m_fontMapper = fontMapper; - m_ok = m_fontMapper->ChangePath(path, &m_pathOld); - } - - bool IsOk() const { return m_ok; } - - ~wxFontMapperPathChanger() - { - if ( IsOk() ) - m_fontMapper->RestorePath(m_pathOld); - } - -private: - // the fontmapper object we're working with - wxFontMapperBase *m_fontMapper; - - // the old path to be restored if m_ok - wxString m_pathOld; - - // have we changed the path successfully? - bool m_ok; - - - wxDECLARE_NO_COPY_CLASS(wxFontMapperPathChanger); -}; - -#endif // wxUSE_CONFIG - -#endif // _WX_FMAPPRIV_H_ - diff --git a/Externals/wxWidgets3/include/wx/font.h b/Externals/wxWidgets3/include/wx/font.h deleted file mode 100644 index cbd3cada8f..0000000000 --- a/Externals/wxWidgets3/include/wx/font.h +++ /dev/null @@ -1,593 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/font.h -// Purpose: wxFontBase class: the interface of wxFont -// Author: Vadim Zeitlin -// Modified by: -// Created: 20.09.99 -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_FONT_H_BASE_ -#define _WX_FONT_H_BASE_ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/defs.h" // for wxDEFAULT &c -#include "wx/fontenc.h" // the font encoding constants -#include "wx/gdiobj.h" // the base class -#include "wx/gdicmn.h" // for wxGDIObjListBase - -// ---------------------------------------------------------------------------- -// forward declarations -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxFont; - -// ---------------------------------------------------------------------------- -// font constants -// ---------------------------------------------------------------------------- - -// standard font families: these may be used only for the font creation, it -// doesn't make sense to query an existing font for its font family as, -// especially if the font had been created from a native font description, it -// may be unknown -enum wxFontFamily -{ - wxFONTFAMILY_DEFAULT = wxDEFAULT, - wxFONTFAMILY_DECORATIVE = wxDECORATIVE, - wxFONTFAMILY_ROMAN = wxROMAN, - wxFONTFAMILY_SCRIPT = wxSCRIPT, - wxFONTFAMILY_SWISS = wxSWISS, - wxFONTFAMILY_MODERN = wxMODERN, - wxFONTFAMILY_TELETYPE = wxTELETYPE, - wxFONTFAMILY_MAX, - wxFONTFAMILY_UNKNOWN = wxFONTFAMILY_MAX -}; - -// font styles -enum wxFontStyle -{ - wxFONTSTYLE_NORMAL = wxNORMAL, - wxFONTSTYLE_ITALIC = wxITALIC, - wxFONTSTYLE_SLANT = wxSLANT, - wxFONTSTYLE_MAX -}; - -// font weights -enum wxFontWeight -{ - wxFONTWEIGHT_NORMAL = wxNORMAL, - wxFONTWEIGHT_LIGHT = wxLIGHT, - wxFONTWEIGHT_BOLD = wxBOLD, - wxFONTWEIGHT_MAX -}; - -// Symbolic font sizes as defined in CSS specification. -enum wxFontSymbolicSize -{ - wxFONTSIZE_XX_SMALL = -3, - wxFONTSIZE_X_SMALL, - wxFONTSIZE_SMALL, - wxFONTSIZE_MEDIUM, - wxFONTSIZE_LARGE, - wxFONTSIZE_X_LARGE, - wxFONTSIZE_XX_LARGE -}; - -// the font flag bits for the new font ctor accepting one combined flags word -enum wxFontFlag -{ - // no special flags: font with default weight/slant/anti-aliasing - wxFONTFLAG_DEFAULT = 0, - - // slant flags (default: no slant) - wxFONTFLAG_ITALIC = 1 << 0, - wxFONTFLAG_SLANT = 1 << 1, - - // weight flags (default: medium) - wxFONTFLAG_LIGHT = 1 << 2, - wxFONTFLAG_BOLD = 1 << 3, - - // anti-aliasing flag: force on or off (default: the current system default) - wxFONTFLAG_ANTIALIASED = 1 << 4, - wxFONTFLAG_NOT_ANTIALIASED = 1 << 5, - - // underlined/strikethrough flags (default: no lines) - wxFONTFLAG_UNDERLINED = 1 << 6, - wxFONTFLAG_STRIKETHROUGH = 1 << 7, - - // the mask of all currently used flags - wxFONTFLAG_MASK = wxFONTFLAG_ITALIC | - wxFONTFLAG_SLANT | - wxFONTFLAG_LIGHT | - wxFONTFLAG_BOLD | - wxFONTFLAG_ANTIALIASED | - wxFONTFLAG_NOT_ANTIALIASED | - wxFONTFLAG_UNDERLINED | - wxFONTFLAG_STRIKETHROUGH -}; - -// ---------------------------------------------------------------------------- -// wxFontInfo describes a wxFont -// ---------------------------------------------------------------------------- - -class wxFontInfo -{ -public: - // Default ctor uses the default font size appropriate for the current - // platform. - wxFontInfo() - { InitPointSize(-1); } - - // These ctors specify the font size, either in points or in pixels. - wxEXPLICIT wxFontInfo(int pointSize) - { InitPointSize(pointSize); } - wxEXPLICIT wxFontInfo(const wxSize& pixelSize) : m_pixelSize(pixelSize) - { Init(); } - - // Setters for the various attributes. All of them return the object itself - // so that the calls to them could be chained. - wxFontInfo& Family(wxFontFamily family) - { m_family = family; return *this; } - wxFontInfo& FaceName(const wxString& faceName) - { m_faceName = faceName; return *this; } - - wxFontInfo& Bold(bool bold = true) - { SetFlag(wxFONTFLAG_BOLD, bold); return *this; } - wxFontInfo& Light(bool light = true) - { SetFlag(wxFONTFLAG_LIGHT, light); return *this; } - - wxFontInfo& Italic(bool italic = true) - { SetFlag(wxFONTFLAG_ITALIC, italic); return *this; } - wxFontInfo& Slant(bool slant = true) - { SetFlag(wxFONTFLAG_SLANT, slant); return *this; } - - wxFontInfo& AntiAliased(bool antiAliased = true) - { SetFlag(wxFONTFLAG_ANTIALIASED, antiAliased); return *this; } - wxFontInfo& Underlined(bool underlined = true) - { SetFlag(wxFONTFLAG_UNDERLINED, underlined); return *this; } - wxFontInfo& Strikethrough(bool strikethrough = true) - { SetFlag(wxFONTFLAG_STRIKETHROUGH, strikethrough); return *this; } - - wxFontInfo& Encoding(wxFontEncoding encoding) - { m_encoding = encoding; return *this; } - - - // Set all flags at once. - wxFontInfo& AllFlags(int flags) - { m_flags = flags; return *this; } - - - // Accessors are mostly meant to be used by wxFont itself to extract the - // various pieces of the font description. - - bool IsUsingSizeInPixels() const { return m_pixelSize != wxDefaultSize; } - int GetPointSize() const { return m_pointSize; } - wxSize GetPixelSize() const { return m_pixelSize; } - wxFontFamily GetFamily() const { return m_family; } - const wxString& GetFaceName() const { return m_faceName; } - - wxFontStyle GetStyle() const - { - return m_flags & wxFONTFLAG_ITALIC - ? wxFONTSTYLE_ITALIC - : m_flags & wxFONTFLAG_SLANT - ? wxFONTSTYLE_SLANT - : wxFONTSTYLE_NORMAL; - } - - wxFontWeight GetWeight() const - { - return m_flags & wxFONTFLAG_LIGHT - ? wxFONTWEIGHT_LIGHT - : m_flags & wxFONTFLAG_BOLD - ? wxFONTWEIGHT_BOLD - : wxFONTWEIGHT_NORMAL; - } - - bool IsAntiAliased() const - { - return (m_flags & wxFONTFLAG_ANTIALIASED) != 0; - } - - bool IsUnderlined() const - { - return (m_flags & wxFONTFLAG_UNDERLINED) != 0; - } - - bool IsStrikethrough() const - { - return (m_flags & wxFONTFLAG_STRIKETHROUGH) != 0; - } - - wxFontEncoding GetEncoding() const { return m_encoding; } - - - // Default copy ctor, assignment operator and dtor are OK. - -private: - // Common part of all ctor, initializing everything except the size (which - // is initialized by the ctors themselves). - void Init() - { - m_family = wxFONTFAMILY_DEFAULT; - m_flags = wxFONTFLAG_DEFAULT; - m_encoding = wxFONTENCODING_DEFAULT; - } - - void InitPointSize(int pointSize) - { - Init(); - - m_pointSize = pointSize; - m_pixelSize = wxDefaultSize; - } - - // Turn on or off the given bit in m_flags depending on the value of the - // boolean argument. - void SetFlag(int flag, bool on) - { - if ( on ) - m_flags |= flag; - else - m_flags &= ~flag; - } - - // The size information: if m_pixelSize is valid (!= wxDefaultSize), then - // it is used. Otherwise m_pointSize is used, taking into account that if - // it is == -1, it means that the platform dependent font size should be - // used. - int m_pointSize; - wxSize m_pixelSize; - - wxFontFamily m_family; - wxString m_faceName; - int m_flags; - wxFontEncoding m_encoding; -}; - -// ---------------------------------------------------------------------------- -// wxFontBase represents a font object -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxNativeFontInfo; - -class WXDLLIMPEXP_CORE wxFontBase : public wxGDIObject -{ -public: - /* - derived classes should provide the following ctors: - - wxFont(); - wxFont(const wxFontInfo& info); - wxFont(const wxString& nativeFontInfoString); - wxFont(const wxNativeFontInfo& info); - wxFont(int size, - wxFontFamily family, - wxFontStyle style, - wxFontWeight weight, - bool underlined = false, - const wxString& face = wxEmptyString, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT); - wxFont(const wxSize& pixelSize, - wxFontFamily family, - wxFontStyle style, - wxFontWeight weight, - bool underlined = false, - const wxString& face = wxEmptyString, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT); - */ - - // creator function - virtual ~wxFontBase(); - - - // from the font components - static wxFont *New( - int pointSize, // size of the font in points - wxFontFamily family, // see wxFontFamily enum - wxFontStyle style, // see wxFontStyle enum - wxFontWeight weight, // see wxFontWeight enum - bool underlined = false, // not underlined by default - const wxString& face = wxEmptyString, // facename - wxFontEncoding encoding = wxFONTENCODING_DEFAULT); // ISO8859-X, ... - - // from the font components - static wxFont *New( - const wxSize& pixelSize, // size of the font in pixels - wxFontFamily family, // see wxFontFamily enum - wxFontStyle style, // see wxFontStyle enum - wxFontWeight weight, // see wxFontWeight enum - bool underlined = false, // not underlined by default - const wxString& face = wxEmptyString, // facename - wxFontEncoding encoding = wxFONTENCODING_DEFAULT); // ISO8859-X, ... - - // from the font components but using the font flags instead of separate - // parameters for each flag - static wxFont *New(int pointSize, - wxFontFamily family, - int flags = wxFONTFLAG_DEFAULT, - const wxString& face = wxEmptyString, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT); - - - // from the font components but using the font flags instead of separate - // parameters for each flag - static wxFont *New(const wxSize& pixelSize, - wxFontFamily family, - int flags = wxFONTFLAG_DEFAULT, - const wxString& face = wxEmptyString, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT); - - // from the (opaque) native font description object - static wxFont *New(const wxNativeFontInfo& nativeFontDesc); - - // from the string representation of wxNativeFontInfo - static wxFont *New(const wxString& strNativeFontDesc); - - // comparison - bool operator==(const wxFont& font) const; - bool operator!=(const wxFont& font) const { return !(*this == font); } - - // accessors: get the font characteristics - virtual int GetPointSize() const = 0; - virtual wxSize GetPixelSize() const; - virtual bool IsUsingSizeInPixels() const; - wxFontFamily GetFamily() const; - virtual wxFontStyle GetStyle() const = 0; - virtual wxFontWeight GetWeight() const = 0; - virtual bool GetUnderlined() const = 0; - virtual bool GetStrikethrough() const { return false; } - virtual wxString GetFaceName() const = 0; - virtual wxFontEncoding GetEncoding() const = 0; - virtual const wxNativeFontInfo *GetNativeFontInfo() const = 0; - - virtual bool IsFixedWidth() const; - - wxString GetNativeFontInfoDesc() const; - wxString GetNativeFontInfoUserDesc() const; - - // change the font characteristics - virtual void SetPointSize( int pointSize ) = 0; - virtual void SetPixelSize( const wxSize& pixelSize ); - virtual void SetFamily( wxFontFamily family ) = 0; - virtual void SetStyle( wxFontStyle style ) = 0; - virtual void SetWeight( wxFontWeight weight ) = 0; - - virtual void SetUnderlined( bool underlined ) = 0; - virtual void SetStrikethrough( bool WXUNUSED(strikethrough) ) {} - virtual void SetEncoding(wxFontEncoding encoding) = 0; - virtual bool SetFaceName( const wxString& faceName ); - void SetNativeFontInfo(const wxNativeFontInfo& info) - { DoSetNativeFontInfo(info); } - - bool SetNativeFontInfo(const wxString& info); - bool SetNativeFontInfoUserDesc(const wxString& info); - - // Symbolic font sizes support: set the font size to "large" or "very - // small" either absolutely (i.e. compared to the default font size) or - // relatively to the given font size. - void SetSymbolicSize(wxFontSymbolicSize size); - void SetSymbolicSizeRelativeTo(wxFontSymbolicSize size, int base) - { - SetPointSize(AdjustToSymbolicSize(size, base)); - } - - // Adjust the base size in points according to symbolic size. - static int AdjustToSymbolicSize(wxFontSymbolicSize size, int base); - - - // translate the fonts into human-readable string (i.e. GetStyleString() - // will return "wxITALIC" for an italic font, ...) - wxString GetFamilyString() const; - wxString GetStyleString() const; - wxString GetWeightString() const; - - // the default encoding is used for creating all fonts with default - // encoding parameter - static wxFontEncoding GetDefaultEncoding() { return ms_encodingDefault; } - static void SetDefaultEncoding(wxFontEncoding encoding); - - // this doesn't do anything and is kept for compatibility only -#if WXWIN_COMPATIBILITY_2_8 - wxDEPRECATED_INLINE(void SetNoAntiAliasing(bool no = true), wxUnusedVar(no);) - wxDEPRECATED_INLINE(bool GetNoAntiAliasing() const, return false;) -#endif // WXWIN_COMPATIBILITY_2_8 - - // from the font components - wxDEPRECATED_MSG("use wxFONT{FAMILY,STYLE,WEIGHT}_XXX constants") - static wxFont *New( - int pointSize, // size of the font in points - int family, // see wxFontFamily enum - int style, // see wxFontStyle enum - int weight, // see wxFontWeight enum - bool underlined = false, // not underlined by default - const wxString& face = wxEmptyString, // facename - wxFontEncoding encoding = wxFONTENCODING_DEFAULT) // ISO8859-X, ... - { return New(pointSize, (wxFontFamily)family, (wxFontStyle)style, - (wxFontWeight)weight, underlined, face, encoding); } - - // from the font components - wxDEPRECATED_MSG("use wxFONT{FAMILY,STYLE,WEIGHT}_XXX constants") - static wxFont *New( - const wxSize& pixelSize, // size of the font in pixels - int family, // see wxFontFamily enum - int style, // see wxFontStyle enum - int weight, // see wxFontWeight enum - bool underlined = false, // not underlined by default - const wxString& face = wxEmptyString, // facename - wxFontEncoding encoding = wxFONTENCODING_DEFAULT) // ISO8859-X, ... - { return New(pixelSize, (wxFontFamily)family, (wxFontStyle)style, - (wxFontWeight)weight, underlined, face, encoding); } - - -protected: - // the function called by both overloads of SetNativeFontInfo() - virtual void DoSetNativeFontInfo(const wxNativeFontInfo& info); - - // The function called by public GetFamily(): it can return - // wxFONTFAMILY_UNKNOWN unlike the public method (see comment there). - virtual wxFontFamily DoGetFamily() const = 0; - - - // Helper functions to recover wxFONTSTYLE/wxFONTWEIGHT and underlined flag - // values from flags containing a combination of wxFONTFLAG_XXX. - static wxFontStyle GetStyleFromFlags(int flags) - { - return flags & wxFONTFLAG_ITALIC - ? wxFONTSTYLE_ITALIC - : flags & wxFONTFLAG_SLANT - ? wxFONTSTYLE_SLANT - : wxFONTSTYLE_NORMAL; - } - - static wxFontWeight GetWeightFromFlags(int flags) - { - return flags & wxFONTFLAG_LIGHT - ? wxFONTWEIGHT_LIGHT - : flags & wxFONTFLAG_BOLD - ? wxFONTWEIGHT_BOLD - : wxFONTWEIGHT_NORMAL; - } - - static bool GetUnderlinedFromFlags(int flags) - { - return (flags & wxFONTFLAG_UNDERLINED) != 0; - } - - static bool GetStrikethroughFromFlags(int flags) - { - return (flags & wxFONTFLAG_STRIKETHROUGH) != 0; - } - -private: - // the currently default encoding: by default, it's the default system - // encoding, but may be changed by the application using - // SetDefaultEncoding() to make all subsequent fonts created without - // specifying encoding parameter using this encoding - static wxFontEncoding ms_encodingDefault; -}; - -// wxFontBase <-> wxString utilities, used by wxConfig -WXDLLIMPEXP_CORE wxString wxToString(const wxFontBase& font); -WXDLLIMPEXP_CORE bool wxFromString(const wxString& str, wxFontBase* font); - - -// this macro must be used in all derived wxFont classes declarations -#define wxDECLARE_COMMON_FONT_METHODS() \ - wxDEPRECATED_MSG("use wxFONTFAMILY_XXX constants") \ - void SetFamily(int family) \ - { SetFamily((wxFontFamily)family); } \ - wxDEPRECATED_MSG("use wxFONTSTYLE_XXX constants") \ - void SetStyle(int style) \ - { SetStyle((wxFontStyle)style); } \ - wxDEPRECATED_MSG("use wxFONTWEIGHT_XXX constants") \ - void SetWeight(int weight) \ - { SetWeight((wxFontWeight)weight); } \ - wxDEPRECATED_MSG("use wxFONTFAMILY_XXX constants") \ - void SetFamily(wxDeprecatedGUIConstants family) \ - { SetFamily((wxFontFamily)family); } \ - wxDEPRECATED_MSG("use wxFONTSTYLE_XXX constants") \ - void SetStyle(wxDeprecatedGUIConstants style) \ - { SetStyle((wxFontStyle)style); } \ - wxDEPRECATED_MSG("use wxFONTWEIGHT_XXX constants") \ - void SetWeight(wxDeprecatedGUIConstants weight) \ - { SetWeight((wxFontWeight)weight); } \ - \ - /* functions for modifying font in place */ \ - wxFont& MakeBold(); \ - wxFont& MakeItalic(); \ - wxFont& MakeUnderlined(); \ - wxFont& MakeStrikethrough(); \ - wxFont& MakeLarger() { return Scale(1.2f); } \ - wxFont& MakeSmaller() { return Scale(1/1.2f); } \ - wxFont& Scale(float x); \ - /* functions for creating fonts based on this one */ \ - wxFont Bold() const; \ - wxFont GetBaseFont() const; \ - wxFont Italic() const; \ - wxFont Underlined() const; \ - wxFont Strikethrough() const; \ - wxFont Larger() const { return Scaled(1.2f); } \ - wxFont Smaller() const { return Scaled(1/1.2f); } \ - wxFont Scaled(float x) const - -// include the real class declaration -#if defined(__WXMSW__) - #include "wx/msw/font.h" -#elif defined(__WXMOTIF__) - #include "wx/motif/font.h" -#elif defined(__WXGTK20__) - #include "wx/gtk/font.h" -#elif defined(__WXGTK__) - #include "wx/gtk1/font.h" -#elif defined(__WXX11__) - #include "wx/x11/font.h" -#elif defined(__WXDFB__) - #include "wx/dfb/font.h" -#elif defined(__WXMAC__) - #include "wx/osx/font.h" -#elif defined(__WXQT__) - #include "wx/qt/font.h" -#endif - -class WXDLLIMPEXP_CORE wxFontList: public wxGDIObjListBase -{ -public: - wxFont *FindOrCreateFont(int pointSize, - wxFontFamily family, - wxFontStyle style, - wxFontWeight weight, - bool underline = false, - const wxString& face = wxEmptyString, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT); - - wxDEPRECATED_MSG("use wxFONT{FAMILY,STYLE,WEIGHT}_XXX constants") - wxFont *FindOrCreateFont(int pointSize, int family, int style, int weight, - bool underline = false, - const wxString& face = wxEmptyString, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT) - { return FindOrCreateFont(pointSize, (wxFontFamily)family, (wxFontStyle)style, - (wxFontWeight)weight, underline, face, encoding); } -}; - -extern WXDLLIMPEXP_DATA_CORE(wxFontList*) wxTheFontList; - - -// provide comparison operators to allow code such as -// -// if ( font.GetStyle() == wxFONTSTYLE_SLANT ) -// -// to compile without warnings which it would otherwise provoke from some -// compilers as it compares elements of different enums - -// Unfortunately some compilers have ambiguity issues when enum comparisons are -// overloaded so we have to disable the overloads in this case, see -// wxCOMPILER_NO_OVERLOAD_ON_ENUM definition in wx/platform.h for more details. -#ifndef wxCOMPILER_NO_OVERLOAD_ON_ENUM - -wxDEPRECATED_MSG("use wxFONTFAMILY_XXX constants") \ -inline bool operator==(wxFontFamily s, wxDeprecatedGUIConstants t) - { return static_cast(s) == static_cast(t); } -wxDEPRECATED_MSG("use wxFONTFAMILY_XXX constants") \ -inline bool operator!=(wxFontFamily s, wxDeprecatedGUIConstants t) - { return static_cast(s) != static_cast(t); } -wxDEPRECATED_MSG("use wxFONTSTYLE_XXX constants") \ -inline bool operator==(wxFontStyle s, wxDeprecatedGUIConstants t) - { return static_cast(s) == static_cast(t); } -wxDEPRECATED_MSG("use wxFONTSTYLE_XXX constants") \ -inline bool operator!=(wxFontStyle s, wxDeprecatedGUIConstants t) - { return static_cast(s) != static_cast(t); } -wxDEPRECATED_MSG("use wxFONTWEIGHT_XXX constants") \ -inline bool operator==(wxFontWeight s, wxDeprecatedGUIConstants t) - { return static_cast(s) == static_cast(t); } -wxDEPRECATED_MSG("use wxFONTWEIGHT_XXX constants") \ -inline bool operator!=(wxFontWeight s, wxDeprecatedGUIConstants t) - { return static_cast(s) != static_cast(t); } - -#endif // // wxCOMPILER_NO_OVERLOAD_ON_ENUM - -#endif // _WX_FONT_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/fontdata.h b/Externals/wxWidgets3/include/wx/fontdata.h deleted file mode 100644 index 592e0b6d9b..0000000000 --- a/Externals/wxWidgets3/include/wx/fontdata.h +++ /dev/null @@ -1,70 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/fontdata.h -// Author: Julian Smart -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_FONTDATA_H_ -#define _WX_FONTDATA_H_ - -#include "wx/font.h" -#include "wx/colour.h" -#include "wx/encinfo.h" - -class WXDLLIMPEXP_CORE wxFontData : public wxObject -{ -public: - wxFontData(); - virtual ~wxFontData(); - - wxFontData(const wxFontData& data); - wxFontData& operator=(const wxFontData& data); - - void SetAllowSymbols(bool flag) { m_allowSymbols = flag; } - bool GetAllowSymbols() const { return m_allowSymbols; } - - void SetColour(const wxColour& colour) { m_fontColour = colour; } - const wxColour& GetColour() const { return m_fontColour; } - - void SetShowHelp(bool flag) { m_showHelp = flag; } - bool GetShowHelp() const { return m_showHelp; } - - void EnableEffects(bool flag) { m_enableEffects = flag; } - bool GetEnableEffects() const { return m_enableEffects; } - - void SetInitialFont(const wxFont& font) { m_initialFont = font; } - wxFont GetInitialFont() const { return m_initialFont; } - - void SetChosenFont(const wxFont& font) { m_chosenFont = font; } - wxFont GetChosenFont() const { return m_chosenFont; } - - void SetRange(int minRange, int maxRange) { m_minSize = minRange; m_maxSize = maxRange; } - - // encoding info is split into 2 parts: the logical wxWin encoding - // (wxFontEncoding) and a structure containing the native parameters for - // it (wxNativeEncodingInfo) - wxFontEncoding GetEncoding() const { return m_encoding; } - void SetEncoding(wxFontEncoding encoding) { m_encoding = encoding; } - - wxNativeEncodingInfo& EncodingInfo() { return m_encodingInfo; } - - - // public for backwards compatibility only: don't use directly - wxColour m_fontColour; - bool m_showHelp; - bool m_allowSymbols; - bool m_enableEffects; - wxFont m_initialFont; - wxFont m_chosenFont; - int m_minSize; - int m_maxSize; - -private: - wxFontEncoding m_encoding; - wxNativeEncodingInfo m_encodingInfo; - - wxDECLARE_DYNAMIC_CLASS(wxFontData); -}; - -#endif // _WX_FONTDATA_H_ diff --git a/Externals/wxWidgets3/include/wx/fontdlg.h b/Externals/wxWidgets3/include/wx/fontdlg.h deleted file mode 100644 index 63e7fd4439..0000000000 --- a/Externals/wxWidgets3/include/wx/fontdlg.h +++ /dev/null @@ -1,97 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/fontdlg.h -// Purpose: common interface for different wxFontDialog classes -// Author: Vadim Zeitlin -// Modified by: -// Created: 12.05.02 -// Copyright: (c) 1997-2002 wxWidgets team -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_FONTDLG_H_BASE_ -#define _WX_FONTDLG_H_BASE_ - -#include "wx/defs.h" // for wxUSE_FONTDLG - -#if wxUSE_FONTDLG - -#include "wx/dialog.h" // the base class -#include "wx/fontdata.h" - -// ---------------------------------------------------------------------------- -// wxFontDialog interface -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxFontDialogBase : public wxDialog -{ -public: - // create the font dialog - wxFontDialogBase() { } - wxFontDialogBase(wxWindow *parent) { m_parent = parent; } - wxFontDialogBase(wxWindow *parent, const wxFontData& data) - { m_parent = parent; InitFontData(&data); } - - bool Create(wxWindow *parent) - { return DoCreate(parent); } - bool Create(wxWindow *parent, const wxFontData& data) - { InitFontData(&data); return Create(parent); } - - // retrieve the font data - const wxFontData& GetFontData() const { return m_fontData; } - wxFontData& GetFontData() { return m_fontData; } - -protected: - virtual bool DoCreate(wxWindow *parent) { m_parent = parent; return true; } - - void InitFontData(const wxFontData *data = NULL) - { if ( data ) m_fontData = *data; } - - wxFontData m_fontData; - - wxDECLARE_NO_COPY_CLASS(wxFontDialogBase); -}; - -// ---------------------------------------------------------------------------- -// platform-specific wxFontDialog implementation -// ---------------------------------------------------------------------------- - -#if defined( __WXOSX_MAC__ ) -//set to 1 to use native mac font and color dialogs -#define USE_NATIVE_FONT_DIALOG_FOR_MACOSX 1 -#else -//not supported on these platforms, leave 0 -#define USE_NATIVE_FONT_DIALOG_FOR_MACOSX 0 -#endif - -#if defined(__WXUNIVERSAL__) || \ - defined(__WXMOTIF__) || \ - defined(__WXGPE__) - - #include "wx/generic/fontdlgg.h" - #define wxFontDialog wxGenericFontDialog -#elif defined(__WXMSW__) - #include "wx/msw/fontdlg.h" -#elif defined(__WXGTK20__) - #include "wx/gtk/fontdlg.h" -#elif defined(__WXGTK__) - #include "wx/gtk1/fontdlg.h" -#elif defined(__WXMAC__) - #include "wx/osx/fontdlg.h" -#elif defined(__WXQT__) - #include "wx/qt/fontdlg.h" -#endif - -// ---------------------------------------------------------------------------- -// global public functions -// ---------------------------------------------------------------------------- - -// get the font from user and return it, returns wxNullFont if the dialog was -// cancelled -WXDLLIMPEXP_CORE wxFont wxGetFontFromUser(wxWindow *parent = NULL, - const wxFont& fontInit = wxNullFont, - const wxString& caption = wxEmptyString); - -#endif // wxUSE_FONTDLG - -#endif - // _WX_FONTDLG_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/fontenc.h b/Externals/wxWidgets3/include/wx/fontenc.h deleted file mode 100644 index 5263997ae9..0000000000 --- a/Externals/wxWidgets3/include/wx/fontenc.h +++ /dev/null @@ -1,163 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/fontenc.h -// Purpose: wxFontEncoding constants -// Author: Vadim Zeitlin -// Modified by: -// Created: 29.03.00 -// Copyright: (c) Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_FONTENC_H_ -#define _WX_FONTENC_H_ - -// font encodings -enum wxFontEncoding -{ - wxFONTENCODING_SYSTEM = -1, // system default - wxFONTENCODING_DEFAULT, // current default encoding - - // ISO8859 standard defines a number of single-byte charsets - wxFONTENCODING_ISO8859_1, // West European (Latin1) - wxFONTENCODING_ISO8859_2, // Central and East European (Latin2) - wxFONTENCODING_ISO8859_3, // Esperanto (Latin3) - wxFONTENCODING_ISO8859_4, // Baltic (old) (Latin4) - wxFONTENCODING_ISO8859_5, // Cyrillic - wxFONTENCODING_ISO8859_6, // Arabic - wxFONTENCODING_ISO8859_7, // Greek - wxFONTENCODING_ISO8859_8, // Hebrew - wxFONTENCODING_ISO8859_9, // Turkish (Latin5) - wxFONTENCODING_ISO8859_10, // Variation of Latin4 (Latin6) - wxFONTENCODING_ISO8859_11, // Thai - wxFONTENCODING_ISO8859_12, // doesn't exist currently, but put it - // here anyhow to make all ISO8859 - // consecutive numbers - wxFONTENCODING_ISO8859_13, // Baltic (Latin7) - wxFONTENCODING_ISO8859_14, // Latin8 - wxFONTENCODING_ISO8859_15, // Latin9 (a.k.a. Latin0, includes euro) - wxFONTENCODING_ISO8859_MAX, - - // Cyrillic charset soup (see http://czyborra.com/charsets/cyrillic.html) - wxFONTENCODING_KOI8, // KOI8 Russian - wxFONTENCODING_KOI8_U, // KOI8 Ukrainian - wxFONTENCODING_ALTERNATIVE, // same as MS-DOS CP866 - wxFONTENCODING_BULGARIAN, // used under Linux in Bulgaria - - // what would we do without Microsoft? They have their own encodings - // for DOS - wxFONTENCODING_CP437, // original MS-DOS codepage - wxFONTENCODING_CP850, // CP437 merged with Latin1 - wxFONTENCODING_CP852, // CP437 merged with Latin2 - wxFONTENCODING_CP855, // another cyrillic encoding - wxFONTENCODING_CP866, // and another one - // and for Windows - wxFONTENCODING_CP874, // WinThai - wxFONTENCODING_CP932, // Japanese (shift-JIS) - wxFONTENCODING_CP936, // Chinese simplified (GB) - wxFONTENCODING_CP949, // Korean (Hangul charset, a.k.a. EUC-KR) - wxFONTENCODING_CP950, // Chinese (traditional - Big5) - wxFONTENCODING_CP1250, // WinLatin2 - wxFONTENCODING_CP1251, // WinCyrillic - wxFONTENCODING_CP1252, // WinLatin1 - wxFONTENCODING_CP1253, // WinGreek (8859-7) - wxFONTENCODING_CP1254, // WinTurkish - wxFONTENCODING_CP1255, // WinHebrew - wxFONTENCODING_CP1256, // WinArabic - wxFONTENCODING_CP1257, // WinBaltic (same as Latin 7) - wxFONTENCODING_CP1258, // WinVietnamese - wxFONTENCODING_CP1361, // Johab Korean character set. - wxFONTENCODING_CP12_MAX, - - wxFONTENCODING_UTF7, // UTF-7 Unicode encoding - wxFONTENCODING_UTF8, // UTF-8 Unicode encoding - wxFONTENCODING_EUC_JP, // Extended Unix Codepage for Japanese - wxFONTENCODING_UTF16BE, // UTF-16 Big Endian Unicode encoding - wxFONTENCODING_UTF16LE, // UTF-16 Little Endian Unicode encoding - wxFONTENCODING_UTF32BE, // UTF-32 Big Endian Unicode encoding - wxFONTENCODING_UTF32LE, // UTF-32 Little Endian Unicode encoding - - wxFONTENCODING_MACROMAN, // the standard mac encodings - wxFONTENCODING_MACJAPANESE, - wxFONTENCODING_MACCHINESETRAD, - wxFONTENCODING_MACKOREAN, - wxFONTENCODING_MACARABIC, - wxFONTENCODING_MACHEBREW, - wxFONTENCODING_MACGREEK, - wxFONTENCODING_MACCYRILLIC, - wxFONTENCODING_MACDEVANAGARI, - wxFONTENCODING_MACGURMUKHI, - wxFONTENCODING_MACGUJARATI, - wxFONTENCODING_MACORIYA, - wxFONTENCODING_MACBENGALI, - wxFONTENCODING_MACTAMIL, - wxFONTENCODING_MACTELUGU, - wxFONTENCODING_MACKANNADA, - wxFONTENCODING_MACMALAJALAM, - wxFONTENCODING_MACSINHALESE, - wxFONTENCODING_MACBURMESE, - wxFONTENCODING_MACKHMER, - wxFONTENCODING_MACTHAI, - wxFONTENCODING_MACLAOTIAN, - wxFONTENCODING_MACGEORGIAN, - wxFONTENCODING_MACARMENIAN, - wxFONTENCODING_MACCHINESESIMP, - wxFONTENCODING_MACTIBETAN, - wxFONTENCODING_MACMONGOLIAN, - wxFONTENCODING_MACETHIOPIC, - wxFONTENCODING_MACCENTRALEUR, - wxFONTENCODING_MACVIATNAMESE, - wxFONTENCODING_MACARABICEXT, - wxFONTENCODING_MACSYMBOL, - wxFONTENCODING_MACDINGBATS, - wxFONTENCODING_MACTURKISH, - wxFONTENCODING_MACCROATIAN, - wxFONTENCODING_MACICELANDIC, - wxFONTENCODING_MACROMANIAN, - wxFONTENCODING_MACCELTIC, - wxFONTENCODING_MACGAELIC, - wxFONTENCODING_MACKEYBOARD, - - // more CJK encodings (for historical reasons some are already declared - // above) - wxFONTENCODING_ISO2022_JP, // ISO-2022-JP JIS encoding - - wxFONTENCODING_MAX, // highest enumerated encoding value - - wxFONTENCODING_MACMIN = wxFONTENCODING_MACROMAN , - wxFONTENCODING_MACMAX = wxFONTENCODING_MACKEYBOARD , - - // aliases for endian-dependent UTF encodings -#ifdef WORDS_BIGENDIAN - wxFONTENCODING_UTF16 = wxFONTENCODING_UTF16BE, // native UTF-16 - wxFONTENCODING_UTF32 = wxFONTENCODING_UTF32BE, // native UTF-32 -#else // WORDS_BIGENDIAN - wxFONTENCODING_UTF16 = wxFONTENCODING_UTF16LE, // native UTF-16 - wxFONTENCODING_UTF32 = wxFONTENCODING_UTF32LE, // native UTF-32 -#endif // WORDS_BIGENDIAN - - // alias for the native Unicode encoding on this platform - // (this is used by wxEncodingConverter and wxUTFFile only for now) -#if SIZEOF_WCHAR_T == 2 - wxFONTENCODING_UNICODE = wxFONTENCODING_UTF16, -#else // SIZEOF_WCHAR_T == 4 - wxFONTENCODING_UNICODE = wxFONTENCODING_UTF32, -#endif - - // alternative names for Far Eastern encodings - // Chinese - wxFONTENCODING_GB2312 = wxFONTENCODING_CP936, // Simplified Chinese - wxFONTENCODING_BIG5 = wxFONTENCODING_CP950, // Traditional Chinese - - // Japanese (see http://zsigri.tripod.com/fontboard/cjk/jis.html) - wxFONTENCODING_SHIFT_JIS = wxFONTENCODING_CP932, // Shift JIS - - // Korean (CP 949 not actually the same but close enough) - wxFONTENCODING_EUC_KR = wxFONTENCODING_CP949, - wxFONTENCODING_JOHAB = wxFONTENCODING_CP1361, - - // Vietnamese - wxFONTENCODING_VIETNAMESE = wxFONTENCODING_CP1258 -}; - -#endif // _WX_FONTENC_H_ - diff --git a/Externals/wxWidgets3/include/wx/fontenum.h b/Externals/wxWidgets3/include/wx/fontenum.h deleted file mode 100644 index 782dc7fd9e..0000000000 --- a/Externals/wxWidgets3/include/wx/fontenum.h +++ /dev/null @@ -1,88 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/fontenum.h -// Purpose: wxFontEnumerator class for getting available fonts -// Author: Julian Smart, Vadim Zeitlin -// Modified by: extended to enumerate more than just font facenames and works -// not only on Windows now (VZ) -// Created: 04/01/98 -// Copyright: (c) Julian Smart, Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_FONTENUM_H_ -#define _WX_FONTENUM_H_ - -#include "wx/defs.h" - -#if wxUSE_FONTENUM - -#include "wx/fontenc.h" -#include "wx/arrstr.h" - -// ---------------------------------------------------------------------------- -// wxFontEnumerator enumerates all available fonts on the system or only the -// fonts with given attributes -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxFontEnumerator -{ -public: - wxFontEnumerator() {} - - // virtual dtor for the base class - virtual ~wxFontEnumerator() {} - - // start enumerating font facenames (either all of them or those which - // support the given encoding) - will result in OnFacename() being - // called for each available facename (until they are exhausted or - // OnFacename returns false) - virtual bool EnumerateFacenames - ( - wxFontEncoding encoding = wxFONTENCODING_SYSTEM, // all - bool fixedWidthOnly = false - ); - - // enumerate the different encodings either for given font facename or for - // all facenames - will result in OnFontEncoding() being called for each - // available (facename, encoding) couple - virtual bool EnumerateEncodings(const wxString& facename = wxEmptyString); - - // callbacks which are called after one of EnumerateXXX() functions from - // above is invoked - all of them may return false to stop enumeration or - // true to continue with it - - // called by EnumerateFacenames - virtual bool OnFacename(const wxString& WXUNUSED(facename)) - { return true; } - - // called by EnumerateEncodings - virtual bool OnFontEncoding(const wxString& WXUNUSED(facename), - const wxString& WXUNUSED(encoding)) - { return true; } - - - - // convenience function that returns array of facenames. - static wxArrayString - GetFacenames(wxFontEncoding encoding = wxFONTENCODING_SYSTEM, // all - bool fixedWidthOnly = false); - - // convenience function that returns array of all available encodings. - static wxArrayString GetEncodings(const wxString& facename = wxEmptyString); - - // convenience function that returns true if the given face name exist - // in the user's system - static bool IsValidFacename(const wxString &str); - -private: -#ifdef wxHAS_UTF8_FONTS - // helper for ports that only use UTF-8 encoding natively - bool EnumerateEncodingsUTF8(const wxString& facename); -#endif - - wxDECLARE_NO_COPY_CLASS(wxFontEnumerator); -}; - -#endif // wxUSE_FONTENUM - -#endif // _WX_FONTENUM_H_ diff --git a/Externals/wxWidgets3/include/wx/fontmap.h b/Externals/wxWidgets3/include/wx/fontmap.h deleted file mode 100644 index c640daa83f..0000000000 --- a/Externals/wxWidgets3/include/wx/fontmap.h +++ /dev/null @@ -1,289 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/fontmap.h -// Purpose: wxFontMapper class -// Author: Vadim Zeitlin -// Modified by: -// Created: 04.11.99 -// Copyright: (c) Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_FONTMAPPER_H_ -#define _WX_FONTMAPPER_H_ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#if wxUSE_FONTMAP - -#include "wx/fontenc.h" // for wxFontEncoding - -#if wxUSE_GUI - #include "wx/fontutil.h" // for wxNativeEncodingInfo -#endif // wxUSE_GUI - -#if wxUSE_CONFIG && wxUSE_FILECONFIG - class WXDLLIMPEXP_FWD_BASE wxConfigBase; -#endif // wxUSE_CONFIG - -class WXDLLIMPEXP_FWD_CORE wxFontMapper; - -#if wxUSE_GUI - class WXDLLIMPEXP_FWD_CORE wxWindow; -#endif // wxUSE_GUI - -// ============================================================================ -// wxFontMapper manages user-definable correspondence between wxWidgets font -// encodings and the fonts present on the machine. -// -// This is a singleton class, font mapper objects can only be accessed using -// wxFontMapper::Get(). -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxFontMapperBase: this is a non-interactive class which just uses its built -// in knowledge of the encodings equivalence -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxFontMapperBase -{ -public: - // constructor and such - // --------------------- - - // default ctor - wxFontMapperBase(); - - // virtual dtor for any base class - virtual ~wxFontMapperBase(); - - // return instance of the wxFontMapper singleton - // wxBase code only cares that it's a wxFontMapperBase - // In wxBase, wxFontMapper is only forward declared - // so one cannot implicitly cast from it to wxFontMapperBase. - static wxFontMapperBase *Get(); - - // set the singleton to 'mapper' instance and return previous one - static wxFontMapper *Set(wxFontMapper *mapper); - - // delete the existing font mapper if any - static void Reset(); - - - // translates charset strings to encoding - // -------------------------------------- - - // returns the encoding for the given charset (in the form of RFC 2046) or - // wxFONTENCODING_SYSTEM if couldn't decode it - // - // interactive parameter is ignored in the base class, we behave as if it - // were always false - virtual wxFontEncoding CharsetToEncoding(const wxString& charset, - bool interactive = true); - - // information about supported encodings - // ------------------------------------- - - // get the number of font encodings we know about - static size_t GetSupportedEncodingsCount(); - - // get the n-th supported encoding - static wxFontEncoding GetEncoding(size_t n); - - // return canonical name of this encoding (this is a short string, - // GetEncodingDescription() returns a longer one) - static wxString GetEncodingName(wxFontEncoding encoding); - - // return a list of all names of this encoding (see GetEncodingName) - static const wxChar** GetAllEncodingNames(wxFontEncoding encoding); - - // return user-readable string describing the given encoding - // - // NB: hard-coded now, but might change later (read it from config?) - static wxString GetEncodingDescription(wxFontEncoding encoding); - - // find the encoding corresponding to the given name, inverse of - // GetEncodingName() and less general than CharsetToEncoding() - // - // returns wxFONTENCODING_MAX if the name is not a supported encoding - static wxFontEncoding GetEncodingFromName(const wxString& name); - - - // functions which allow to configure the config object used: by default, - // the global one (from wxConfigBase::Get() will be used) and the default - // root path for the config settings is the string returned by - // GetDefaultConfigPath() - // ---------------------------------------------------------------------- - -#if wxUSE_CONFIG && wxUSE_FILECONFIG - // set the root config path to use (should be an absolute path) - void SetConfigPath(const wxString& prefix); - - // return default config path - static const wxString& GetDefaultConfigPath(); -#endif // wxUSE_CONFIG - - - // returns true for the base class and false for a "real" font mapper object - // (implementation-only) - virtual bool IsDummy() { return true; } - -protected: -#if wxUSE_CONFIG && wxUSE_FILECONFIG - // get the config object we're using -- either the global config object - // or a wxMemoryConfig object created by this class otherwise - wxConfigBase *GetConfig(); - - // gets the root path for our settings -- if it wasn't set explicitly, use - // GetDefaultConfigPath() - const wxString& GetConfigPath(); - - // change to the given (relative) path in the config, return true if ok - // (then GetConfig() will return something !NULL), false if no config - // object - // - // caller should provide a pointer to the string variable which should be - // later passed to RestorePath() - bool ChangePath(const wxString& pathNew, wxString *pathOld); - - // restore the config path after use - void RestorePath(const wxString& pathOld); - - // config object and path (in it) to use - wxConfigBase *m_configDummy; - - wxString m_configRootPath; -#endif // wxUSE_CONFIG - - // the real implementation of the base class version of CharsetToEncoding() - // - // returns wxFONTENCODING_UNKNOWN if encoding is unknown and we shouldn't - // ask the user about it, wxFONTENCODING_SYSTEM if it is unknown but we - // should/could ask the user - int NonInteractiveCharsetToEncoding(const wxString& charset); - -private: - // the global fontmapper object or NULL - static wxFontMapper *sm_instance; - - friend class wxFontMapperPathChanger; - - wxDECLARE_NO_COPY_CLASS(wxFontMapperBase); -}; - -// ---------------------------------------------------------------------------- -// wxFontMapper: interactive extension of wxFontMapperBase -// -// The default implementations of all functions will ask the user if they are -// not capable of finding the answer themselves and store the answer in a -// config file (configurable via SetConfigXXX functions). This behaviour may -// be disabled by giving the value of false to "interactive" parameter. -// However, the functions will always consult the config file to allow the -// user-defined values override the default logic and there is no way to -// disable this -- which shouldn't be ever needed because if "interactive" was -// never true, the config file is never created anyhow. -// ---------------------------------------------------------------------------- - -#if wxUSE_GUI - -class WXDLLIMPEXP_CORE wxFontMapper : public wxFontMapperBase -{ -public: - // default ctor - wxFontMapper(); - - // virtual dtor for a base class - virtual ~wxFontMapper(); - - // working with the encodings - // -------------------------- - - // returns the encoding for the given charset (in the form of RFC 2046) or - // wxFONTENCODING_SYSTEM if couldn't decode it - virtual wxFontEncoding CharsetToEncoding(const wxString& charset, - bool interactive = true); - - // find an alternative for the given encoding (which is supposed to not be - // available on this system). If successful, return true and fill info - // structure with the parameters required to create the font, otherwise - // return false - virtual bool GetAltForEncoding(wxFontEncoding encoding, - wxNativeEncodingInfo *info, - const wxString& facename = wxEmptyString, - bool interactive = true); - - // version better suitable for 'public' use. Returns wxFontEcoding - // that can be used it wxFont ctor - bool GetAltForEncoding(wxFontEncoding encoding, - wxFontEncoding *alt_encoding, - const wxString& facename = wxEmptyString, - bool interactive = true); - - // checks whether given encoding is available in given face or not. - // - // if no facename is given (default), return true if it's available in any - // facename at alll. - virtual bool IsEncodingAvailable(wxFontEncoding encoding, - const wxString& facename = wxEmptyString); - - - // configure the appearance of the dialogs we may popup - // ---------------------------------------------------- - - // the parent window for modal dialogs - void SetDialogParent(wxWindow *parent) { m_windowParent = parent; } - - // the title for the dialogs (note that default is quite reasonable) - void SetDialogTitle(const wxString& title) { m_titleDialog = title; } - - // GUI code needs to know it's a wxFontMapper because there - // are additional methods in the subclass. - static wxFontMapper *Get(); - - // pseudo-RTTI since we aren't a wxObject. - virtual bool IsDummy() { return false; } - -protected: - // GetAltForEncoding() helper: tests for the existence of the given - // encoding and saves the result in config if ok - this results in the - // following (desired) behaviour: when an unknown/unavailable encoding is - // requested for the first time, the user is asked about a replacement, - // but if he doesn't choose any and the default logic finds one, it will - // be saved in the config so that the user won't be asked about it any - // more - bool TestAltEncoding(const wxString& configEntry, - wxFontEncoding encReplacement, - wxNativeEncodingInfo *info); - - // the title for our dialogs - wxString m_titleDialog; - - // the parent window for our dialogs - wxWindow *m_windowParent; - -private: - wxDECLARE_NO_COPY_CLASS(wxFontMapper); -}; - -#endif // wxUSE_GUI - -// ---------------------------------------------------------------------------- -// global variables -// ---------------------------------------------------------------------------- - -// the default font mapper for wxWidgets programs do NOT use! This is for -// backward compatibility, use wxFontMapper::Get() instead -#define wxTheFontMapper (wxFontMapper::Get()) - -#else // !wxUSE_FONTMAP - -#if wxUSE_GUI - // wxEncodingToCodepage (utils.cpp) needs wxGetNativeFontEncoding - #include "wx/fontutil.h" -#endif - -#endif // wxUSE_FONTMAP/!wxUSE_FONTMAP - -#endif // _WX_FONTMAPPER_H_ - diff --git a/Externals/wxWidgets3/include/wx/fontpicker.h b/Externals/wxWidgets3/include/wx/fontpicker.h deleted file mode 100644 index 650c919579..0000000000 --- a/Externals/wxWidgets3/include/wx/fontpicker.h +++ /dev/null @@ -1,235 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/fontpicker.h -// Purpose: wxFontPickerCtrl base header -// Author: Francesco Montorsi -// Modified by: -// Created: 14/4/2006 -// Copyright: (c) Francesco Montorsi -// Licence: wxWindows Licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_FONTPICKER_H_BASE_ -#define _WX_FONTPICKER_H_BASE_ - -#include "wx/defs.h" - - -#if wxUSE_FONTPICKERCTRL - -#include "wx/pickerbase.h" - - -class WXDLLIMPEXP_FWD_CORE wxFontPickerEvent; - -extern WXDLLIMPEXP_DATA_CORE(const char) wxFontPickerWidgetNameStr[]; -extern WXDLLIMPEXP_DATA_CORE(const char) wxFontPickerCtrlNameStr[]; - - -// ---------------------------------------------------------------------------- -// wxFontPickerWidgetBase: a generic abstract interface which must be -// implemented by controls used by wxFontPickerCtrl -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxFontPickerWidgetBase -{ -public: - wxFontPickerWidgetBase() { m_selectedFont = *wxNORMAL_FONT; } - virtual ~wxFontPickerWidgetBase() {} - - wxFont GetSelectedFont() const - { return m_selectedFont; } - virtual void SetSelectedFont(const wxFont &f) - { m_selectedFont = f; UpdateFont(); } - - virtual wxColour GetSelectedColour() const = 0; - virtual void SetSelectedColour(const wxColour &colour) = 0; - -protected: - - virtual void UpdateFont() = 0; - - // the current font (may be invalid if none) - // NOTE: don't call this m_font as wxWindow::m_font already exists - wxFont m_selectedFont; -}; - -// Styles which must be supported by all controls implementing wxFontPickerWidgetBase -// NB: these styles must be defined to carefully-chosen values to -// avoid conflicts with wxButton's styles - - -// keeps the label of the button updated with the fontface name + font size -// E.g. choosing "Times New Roman bold, italic with size 10" from the fontdialog, -// updates the wxFontButtonGeneric's label (overwriting any previous label) -// with the "Times New Roman, 10" text (only fontface + fontsize is displayed -// to avoid extralong labels). -#define wxFNTP_FONTDESC_AS_LABEL 0x0008 - -// uses the currently selected font to draw the label of the button -#define wxFNTP_USEFONT_FOR_LABEL 0x0010 - -#define wxFONTBTN_DEFAULT_STYLE \ - (wxFNTP_FONTDESC_AS_LABEL | wxFNTP_USEFONT_FOR_LABEL) - -// native version currently only exists in wxGTK2 -#if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__) - #include "wx/gtk/fontpicker.h" - #define wxFontPickerWidget wxFontButton -#else - #include "wx/generic/fontpickerg.h" - #define wxFontPickerWidget wxGenericFontButton -#endif - - -// ---------------------------------------------------------------------------- -// wxFontPickerCtrl specific flags -// ---------------------------------------------------------------------------- - -#define wxFNTP_USE_TEXTCTRL (wxPB_USE_TEXTCTRL) -#define wxFNTP_DEFAULT_STYLE (wxFNTP_FONTDESC_AS_LABEL|wxFNTP_USEFONT_FOR_LABEL) - -// not a style but rather the default value of the maximum pointsize allowed -#define wxFNTP_MAXPOINT_SIZE 100 - - -// ---------------------------------------------------------------------------- -// wxFontPickerCtrl: platform-independent class which embeds the -// platform-dependent wxFontPickerWidget andm if wxFNTP_USE_TEXTCTRL style is -// used, a textctrl next to it. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxFontPickerCtrl : public wxPickerBase -{ -public: - wxFontPickerCtrl() - : m_nMaxPointSize(wxFNTP_MAXPOINT_SIZE) - { - } - - virtual ~wxFontPickerCtrl() {} - - - wxFontPickerCtrl(wxWindow *parent, - wxWindowID id, - const wxFont& initial = wxNullFont, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxFNTP_DEFAULT_STYLE, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxFontPickerCtrlNameStr) - : m_nMaxPointSize(wxFNTP_MAXPOINT_SIZE) - { - Create(parent, id, initial, pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxFont& initial = wxNullFont, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxFNTP_DEFAULT_STYLE, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxFontPickerCtrlNameStr); - - -public: // public API - - // get the font chosen - wxFont GetSelectedFont() const - { return GetPickerWidget()->GetSelectedFont(); } - - // sets currently displayed font - void SetSelectedFont(const wxFont& f); - - // returns the selected color - wxColour GetSelectedColour() const - { return GetPickerWidget()->GetSelectedColour(); } - - // sets the currently selected color - void SetSelectedColour(const wxColour& colour) - { GetPickerWidget()->SetSelectedColour(colour); } - - // set/get the max point size - void SetMaxPointSize(unsigned int max) - { m_nMaxPointSize=max; } - unsigned int GetMaxPointSize() const - { return m_nMaxPointSize; } - -public: // internal functions - - void UpdatePickerFromTextCtrl() wxOVERRIDE; - void UpdateTextCtrlFromPicker() wxOVERRIDE; - - // event handler for our picker - void OnFontChange(wxFontPickerEvent &); - - // used to convert wxString <-> wxFont - virtual wxString Font2String(const wxFont &font); - virtual wxFont String2Font(const wxString &font); - -protected: - - // extracts the style for our picker from wxFontPickerCtrl's style - long GetPickerStyle(long style) const wxOVERRIDE - { return (style & (wxFNTP_FONTDESC_AS_LABEL|wxFNTP_USEFONT_FOR_LABEL)); } - - // the maximum pointsize allowed to the user - unsigned int m_nMaxPointSize; - -private: - wxFontPickerWidget* GetPickerWidget() const - { return static_cast(m_picker); } - - wxDECLARE_DYNAMIC_CLASS(wxFontPickerCtrl); -}; - - -// ---------------------------------------------------------------------------- -// wxFontPickerEvent: used by wxFontPickerCtrl only -// ---------------------------------------------------------------------------- - -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_FONTPICKER_CHANGED, wxFontPickerEvent ); - -class WXDLLIMPEXP_CORE wxFontPickerEvent : public wxCommandEvent -{ -public: - wxFontPickerEvent() {} - wxFontPickerEvent(wxObject *generator, int id, const wxFont &f) - : wxCommandEvent(wxEVT_FONTPICKER_CHANGED, id), - m_font(f) - { - SetEventObject(generator); - } - - wxFont GetFont() const { return m_font; } - void SetFont(const wxFont &c) { m_font = c; } - - // default copy ctor, assignment operator and dtor are ok - virtual wxEvent *Clone() const wxOVERRIDE { return new wxFontPickerEvent(*this); } - -private: - wxFont m_font; - - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxFontPickerEvent); -}; - -// ---------------------------------------------------------------------------- -// event types and macros -// ---------------------------------------------------------------------------- - -typedef void (wxEvtHandler::*wxFontPickerEventFunction)(wxFontPickerEvent&); - -#define wxFontPickerEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxFontPickerEventFunction, func) - -#define EVT_FONTPICKER_CHANGED(id, fn) \ - wx__DECLARE_EVT1(wxEVT_FONTPICKER_CHANGED, id, wxFontPickerEventHandler(fn)) - -// old wxEVT_COMMAND_* constants -#define wxEVT_COMMAND_FONTPICKER_CHANGED wxEVT_FONTPICKER_CHANGED - - -#endif // wxUSE_FONTPICKERCTRL - -#endif - // _WX_FONTPICKER_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/fontutil.h b/Externals/wxWidgets3/include/wx/fontutil.h deleted file mode 100644 index d5e1a86ebb..0000000000 --- a/Externals/wxWidgets3/include/wx/fontutil.h +++ /dev/null @@ -1,322 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/fontutil.h -// Purpose: font-related helper functions -// Author: Vadim Zeitlin -// Modified by: -// Created: 05.11.99 -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// General note: this header is private to wxWidgets and is not supposed to be -// included by user code. The functions declared here are implemented in -// msw/fontutil.cpp for Windows, unix/fontutil.cpp for GTK/Motif &c. - -#ifndef _WX_FONTUTIL_H_ -#define _WX_FONTUTIL_H_ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/font.h" // for wxFont and wxFontEncoding - -#if defined(__WXMSW__) - #include "wx/msw/wrapwin.h" -#endif - -#if defined(__WXQT__) - #include -#endif - -class WXDLLIMPEXP_FWD_BASE wxArrayString; -struct WXDLLIMPEXP_FWD_CORE wxNativeEncodingInfo; - -#if defined(_WX_X_FONTLIKE) - -// the symbolic names for the XLFD fields (with examples for their value) -// -// NB: we suppose that the font always starts with the empty token (font name -// registry field) as we never use nor generate it anyhow -enum wxXLFDField -{ - wxXLFD_FOUNDRY, // adobe - wxXLFD_FAMILY, // courier, times, ... - wxXLFD_WEIGHT, // black, bold, demibold, medium, regular, light - wxXLFD_SLANT, // r/i/o (roman/italique/oblique) - wxXLFD_SETWIDTH, // condensed, expanded, ... - wxXLFD_ADDSTYLE, // whatever - usually nothing - wxXLFD_PIXELSIZE, // size in pixels - wxXLFD_POINTSIZE, // size in points - wxXLFD_RESX, // 72, 75, 100, ... - wxXLFD_RESY, - wxXLFD_SPACING, // m/p/c (monospaced/proportional/character cell) - wxXLFD_AVGWIDTH, // average width in 1/10 pixels - wxXLFD_REGISTRY, // iso8859, rawin, koi8, ... - wxXLFD_ENCODING, // 1, r, r, ... - wxXLFD_MAX -}; - -#endif // _WX_X_FONTLIKE - -// ---------------------------------------------------------------------------- -// types -// ---------------------------------------------------------------------------- - -// wxNativeFontInfo is platform-specific font representation: this struct -// should be considered as opaque font description only used by the native -// functions, the user code can only get the objects of this type from -// somewhere and pass it somewhere else (possibly save them somewhere using -// ToString() and restore them using FromString()) - -class WXDLLIMPEXP_CORE wxNativeFontInfo -{ -public: -#if wxUSE_PANGO - PangoFontDescription *description; - - // Pango font description doesn't have these attributes, so we store them - // separately and handle them ourselves in {To,From}String() methods. - bool m_underlined; - bool m_strikethrough; -#elif defined(_WX_X_FONTLIKE) - // the members can't be accessed directly as we only parse the - // xFontName on demand -private: - // the components of the XLFD - wxString fontElements[wxXLFD_MAX]; - - // the full XLFD - wxString xFontName; - - // true until SetXFontName() is called - bool m_isDefault; - - // return true if we have already initialized fontElements - inline bool HasElements() const; - -public: - // init the elements from an XLFD, return true if ok - bool FromXFontName(const wxString& xFontName); - - // return false if we were never initialized with a valid XLFD - bool IsDefault() const { return m_isDefault; } - - // return the XLFD (using the fontElements if necessary) - wxString GetXFontName() const; - - // get the given XFLD component - wxString GetXFontComponent(wxXLFDField field) const; - - // change the font component - void SetXFontComponent(wxXLFDField field, const wxString& value); - - // set the XFLD - void SetXFontName(const wxString& xFontName); -#elif defined(__WXMSW__) - wxNativeFontInfo(const LOGFONT& lf_) : lf(lf_) { } - - LOGFONT lf; -#elif defined(__WXOSX__) -public: - wxNativeFontInfo(const wxNativeFontInfo& info) { Init(info); } - wxNativeFontInfo( int size, - wxFontFamily family, - wxFontStyle style, - wxFontWeight weight, - bool underlined, - bool strikethrough, - const wxString& faceName, - wxFontEncoding encoding) - { - Init(size, family, style, weight, - underlined, strikethrough, - faceName, encoding); - } - - ~wxNativeFontInfo() { Free(); } - - wxNativeFontInfo& operator=(const wxNativeFontInfo& info) - { - if (this != &info) - { - Free(); - Init(info); - } - return *this; - } - - void Init(CTFontDescriptorRef descr); - void Init(const wxNativeFontInfo& info); - void Init(int size, - wxFontFamily family, - wxFontStyle style, - wxFontWeight weight, - bool underlined, - bool strikethrough, - const wxString& faceName , - wxFontEncoding encoding); - - void Free(); - void EnsureValid(); - - static void UpdateNamesMap(const wxString& familyname, CTFontDescriptorRef descr); - static void UpdateNamesMap(const wxString& familyname, CTFontRef font); - - bool m_descriptorValid; - -#if wxOSX_USE_ATSU_TEXT - bool m_atsuFontValid; - // the atsu font ID - wxUint32 m_atsuFontID; - // the qd styles that are not intrinsic to the font above - wxInt16 m_atsuAdditionalQDStyles; -#endif - - int m_pointSize; - wxFontFamily m_family; - wxFontStyle m_style; - wxFontWeight m_weight; - bool m_underlined; - bool m_strikethrough; - wxString m_faceName; - wxFontEncoding m_encoding; -public : -#elif defined(__WXQT__) - QFont m_qtFont; -#else // other platforms - // - // This is a generic implementation that should work on all ports - // without specific support by the port. - // - #define wxNO_NATIVE_FONTINFO - - int pointSize; - wxFontFamily family; - wxFontStyle style; - wxFontWeight weight; - bool underlined; - bool strikethrough; - wxString faceName; - wxFontEncoding encoding; -#endif // platforms - - // default ctor (default copy ctor is ok) - wxNativeFontInfo() { Init(); } - -#if wxUSE_PANGO -private: - void Init(const wxNativeFontInfo& info); - void Free(); - -public: - wxNativeFontInfo(const wxNativeFontInfo& info) { Init(info); } - ~wxNativeFontInfo() { Free(); } - - wxNativeFontInfo& operator=(const wxNativeFontInfo& info) - { - if (this != &info) - { - Free(); - Init(info); - } - return *this; - } -#endif // wxUSE_PANGO - - // reset to the default state - void Init(); - - // init with the parameters of the given font - void InitFromFont(const wxFont& font) - { - // translate all font parameters - SetStyle((wxFontStyle)font.GetStyle()); - SetWeight((wxFontWeight)font.GetWeight()); - SetUnderlined(font.GetUnderlined()); - SetStrikethrough(font.GetStrikethrough()); -#if defined(__WXMSW__) - if ( font.IsUsingSizeInPixels() ) - SetPixelSize(font.GetPixelSize()); - else - SetPointSize(font.GetPointSize()); -#else - SetPointSize(font.GetPointSize()); -#endif - - // set the family/facename - SetFamily((wxFontFamily)font.GetFamily()); - const wxString& facename = font.GetFaceName(); - if ( !facename.empty() ) - { - SetFaceName(facename); - } - - // deal with encoding now (it may override the font family and facename - // so do it after setting them) - SetEncoding(font.GetEncoding()); - } - - // accessors and modifiers for the font elements - int GetPointSize() const; - wxSize GetPixelSize() const; - wxFontStyle GetStyle() const; - wxFontWeight GetWeight() const; - bool GetUnderlined() const; - bool GetStrikethrough() const; - wxString GetFaceName() const; - wxFontFamily GetFamily() const; - wxFontEncoding GetEncoding() const; - - void SetPointSize(int pointsize); - void SetPixelSize(const wxSize& pixelSize); - void SetStyle(wxFontStyle style); - void SetWeight(wxFontWeight weight); - void SetUnderlined(bool underlined); - void SetStrikethrough(bool strikethrough); - bool SetFaceName(const wxString& facename); - void SetFamily(wxFontFamily family); - void SetEncoding(wxFontEncoding encoding); - - // sets the first facename in the given array which is found - // to be valid. If no valid facename is given, sets the - // first valid facename returned by wxFontEnumerator::GetFacenames(). - // Does not return a bool since it cannot fail. - void SetFaceName(const wxArrayString &facenames); - - - // it is important to be able to serialize wxNativeFontInfo objects to be - // able to store them (in config file, for example) - bool FromString(const wxString& s); - wxString ToString() const; - - // we also want to present the native font descriptions to the user in some - // human-readable form (it is not platform independent neither, but can - // hopefully be understood by the user) - bool FromUserString(const wxString& s); - wxString ToUserString() const; -}; - -// ---------------------------------------------------------------------------- -// font-related functions (common) -// ---------------------------------------------------------------------------- - -// translate a wxFontEncoding into native encoding parameter (defined above), -// returning true if an (exact) macth could be found, false otherwise (without -// attempting any substitutions) -WXDLLIMPEXP_CORE bool wxGetNativeFontEncoding(wxFontEncoding encoding, - wxNativeEncodingInfo *info); - -// test for the existence of the font described by this facename/encoding, -// return true if such font(s) exist, false otherwise -WXDLLIMPEXP_CORE bool wxTestFontEncoding(const wxNativeEncodingInfo& info); - -// ---------------------------------------------------------------------------- -// font-related functions (X and GTK) -// ---------------------------------------------------------------------------- - -#ifdef _WX_X_FONTLIKE - #include "wx/unix/fontutil.h" -#endif // X || GDK - -#endif // _WX_FONTUTIL_H_ diff --git a/Externals/wxWidgets3/include/wx/frame.h b/Externals/wxWidgets3/include/wx/frame.h deleted file mode 100644 index c1e1bcfe3d..0000000000 --- a/Externals/wxWidgets3/include/wx/frame.h +++ /dev/null @@ -1,273 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/frame.h -// Purpose: wxFrame class interface -// Author: Vadim Zeitlin -// Modified by: -// Created: 15.11.99 -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_FRAME_H_BASE_ -#define _WX_FRAME_H_BASE_ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/toplevel.h" // the base class -#include "wx/statusbr.h" - -// the default names for various classs -extern WXDLLIMPEXP_DATA_CORE(const char) wxStatusLineNameStr[]; -extern WXDLLIMPEXP_DATA_CORE(const char) wxToolBarNameStr[]; - -class WXDLLIMPEXP_FWD_CORE wxFrame; -class WXDLLIMPEXP_FWD_CORE wxMenuBar; -class WXDLLIMPEXP_FWD_CORE wxMenuItem; -class WXDLLIMPEXP_FWD_CORE wxStatusBar; -class WXDLLIMPEXP_FWD_CORE wxToolBar; - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -// wxFrame-specific (i.e. not for wxDialog) styles -// -// Also see the bit summary table in wx/toplevel.h. -#define wxFRAME_NO_TASKBAR 0x0002 // No taskbar button (MSW only) -#define wxFRAME_TOOL_WINDOW 0x0004 // No taskbar button, no system menu -#define wxFRAME_FLOAT_ON_PARENT 0x0008 // Always above its parent - -// ---------------------------------------------------------------------------- -// wxFrame is a top-level window with optional menubar, statusbar and toolbar -// -// For each of *bars, a frame may have several of them, but only one is -// managed by the frame, i.e. resized/moved when the frame is and whose size -// is accounted for in client size calculations - all others should be taken -// care of manually. The CreateXXXBar() functions create this, main, XXXBar, -// but the actual creation is done in OnCreateXXXBar() functions which may be -// overridden to create custom objects instead of standard ones when -// CreateXXXBar() is called. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxFrameBase : public wxTopLevelWindow -{ -public: - // construction - wxFrameBase(); - virtual ~wxFrameBase(); - - wxFrame *New(wxWindow *parent, - wxWindowID winid, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr); - - // frame state - // ----------- - - // get the origin of the client area (which may be different from (0, 0) - // if the frame has a toolbar) in client coordinates - virtual wxPoint GetClientAreaOrigin() const wxOVERRIDE; - - - // menu bar functions - // ------------------ - -#if wxUSE_MENUS - virtual void SetMenuBar(wxMenuBar *menubar); - virtual wxMenuBar *GetMenuBar() const { return m_frameMenuBar; } - - // find the item by id in the frame menu bar: this is an internal function - // and exists mainly in order to be overridden in the MDI parent frame - // which also looks at its active child menu bar - virtual wxMenuItem *FindItemInMenuBar(int menuId) const; - - // generate menu command corresponding to the given menu item - // - // returns true if processed - bool ProcessCommand(wxMenuItem *item); - - // generate menu command corresponding to the given menu command id - // - // returns true if processed - bool ProcessCommand(int winid); -#else - bool ProcessCommand(int WXUNUSED(winid)) { return false; } -#endif // wxUSE_MENUS - - // status bar functions - // -------------------- -#if wxUSE_STATUSBAR - // create the main status bar by calling OnCreateStatusBar() - virtual wxStatusBar* CreateStatusBar(int number = 1, - long style = wxSTB_DEFAULT_STYLE, - wxWindowID winid = 0, - const wxString& name = wxStatusLineNameStr); - // return a new status bar - virtual wxStatusBar *OnCreateStatusBar(int number, - long style, - wxWindowID winid, - const wxString& name); - // get the main status bar - virtual wxStatusBar *GetStatusBar() const { return m_frameStatusBar; } - - // sets the main status bar - virtual void SetStatusBar(wxStatusBar *statBar); - - // forward these to status bar - virtual void SetStatusText(const wxString &text, int number = 0); - virtual void SetStatusWidths(int n, const int widths_field[]); - void PushStatusText(const wxString &text, int number = 0); - void PopStatusText(int number = 0); - - // set the status bar pane the help will be shown in - void SetStatusBarPane(int n) { m_statusBarPane = n; } - int GetStatusBarPane() const { return m_statusBarPane; } -#endif // wxUSE_STATUSBAR - - // toolbar functions - // ----------------- - -#if wxUSE_TOOLBAR - // create main toolbar bycalling OnCreateToolBar() - virtual wxToolBar* CreateToolBar(long style = -1, - wxWindowID winid = wxID_ANY, - const wxString& name = wxToolBarNameStr); - // return a new toolbar - virtual wxToolBar *OnCreateToolBar(long style, - wxWindowID winid, - const wxString& name ); - - // get/set the main toolbar - virtual wxToolBar *GetToolBar() const { return m_frameToolBar; } - virtual void SetToolBar(wxToolBar *toolbar); -#endif // wxUSE_TOOLBAR - - // implementation only from now on - // ------------------------------- - - // event handlers -#if wxUSE_MENUS -#if wxUSE_STATUSBAR - void OnMenuOpen(wxMenuEvent& event); - void OnMenuClose(wxMenuEvent& event); - void OnMenuHighlight(wxMenuEvent& event); -#endif // wxUSE_STATUSBAR - - // send wxUpdateUIEvents for all menu items in the menubar, - // or just for menu if non-NULL - virtual void DoMenuUpdates(wxMenu* menu = NULL); -#endif // wxUSE_MENUS - - // do the UI update processing for this window - virtual void UpdateWindowUI(long flags = wxUPDATE_UI_NONE) wxOVERRIDE; - - // Implement internal behaviour (menu updating on some platforms) - virtual void OnInternalIdle() wxOVERRIDE; - -#if wxUSE_MENUS || wxUSE_TOOLBAR - // show help text for the currently selected menu or toolbar item - // (typically in the status bar) or hide it and restore the status bar text - // originally shown before the menu was opened if show == false - virtual void DoGiveHelp(const wxString& text, bool show); -#endif - - virtual bool IsClientAreaChild(const wxWindow *child) const wxOVERRIDE - { - return !IsOneOfBars(child) && wxTopLevelWindow::IsClientAreaChild(child); - } - -protected: - // the frame main menu/status/tool bars - // ------------------------------------ - - // this (non virtual!) function should be called from dtor to delete the - // main menubar, statusbar and toolbar (if any) - void DeleteAllBars(); - - // test whether this window makes part of the frame - virtual bool IsOneOfBars(const wxWindow *win) const wxOVERRIDE; - -#if wxUSE_MENUS - // override to update menu bar position when the frame size changes - virtual void PositionMenuBar() { } - - // override to do something special when the menu bar is being removed - // from the frame - virtual void DetachMenuBar(); - - // override to do something special when the menu bar is attached to the - // frame - virtual void AttachMenuBar(wxMenuBar *menubar); - - // Return true if we should update the menu item state from idle event - // handler or false if we should delay it until the menu is opened. - static bool ShouldUpdateMenuFromIdle(); - - wxMenuBar *m_frameMenuBar; -#endif // wxUSE_MENUS - -#if wxUSE_STATUSBAR && (wxUSE_MENUS || wxUSE_TOOLBAR) - // the saved status bar text overwritten by DoGiveHelp() - wxString m_oldStatusText; - - // the last help string we have shown in the status bar - wxString m_lastHelpShown; -#endif - -#if wxUSE_STATUSBAR - // override to update status bar position (or anything else) when - // something changes - virtual void PositionStatusBar() { } - - // show the help string for the given menu item using DoGiveHelp() if the - // given item does have a help string (as determined by FindInMenuBar()), - // return false if there is no help for such item - bool ShowMenuHelp(int helpid); - - wxStatusBar *m_frameStatusBar; -#endif // wxUSE_STATUSBAR - - - int m_statusBarPane; - -#if wxUSE_TOOLBAR - // override to update status bar position (or anything else) when - // something changes - virtual void PositionToolBar() { } - - wxToolBar *m_frameToolBar; -#endif // wxUSE_TOOLBAR - -#if wxUSE_MENUS && wxUSE_STATUSBAR - wxDECLARE_EVENT_TABLE(); -#endif // wxUSE_MENUS && wxUSE_STATUSBAR - - wxDECLARE_NO_COPY_CLASS(wxFrameBase); -}; - -// include the real class declaration -#if defined(__WXUNIVERSAL__) - #include "wx/univ/frame.h" -#else // !__WXUNIVERSAL__ - #if defined(__WXMSW__) - #include "wx/msw/frame.h" - #elif defined(__WXGTK20__) - #include "wx/gtk/frame.h" - #elif defined(__WXGTK__) - #include "wx/gtk1/frame.h" - #elif defined(__WXMOTIF__) - #include "wx/motif/frame.h" - #elif defined(__WXMAC__) - #include "wx/osx/frame.h" - #elif defined(__WXQT__) - #include "wx/qt/frame.h" - #endif -#endif - -#endif - // _WX_FRAME_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/fs_arc.h b/Externals/wxWidgets3/include/wx/fs_arc.h deleted file mode 100644 index 014270d609..0000000000 --- a/Externals/wxWidgets3/include/wx/fs_arc.h +++ /dev/null @@ -1,55 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/fs_arc.h -// Purpose: Archive file system -// Author: Vaclav Slavik, Mike Wetherell -// Copyright: (c) 1999 Vaclav Slavik, (c) 2006 Mike Wetherell -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_FS_ARC_H_ -#define _WX_FS_ARC_H_ - -#include "wx/defs.h" - -#if wxUSE_FS_ARCHIVE - -#include "wx/filesys.h" -#include "wx/hashmap.h" - -WX_DECLARE_STRING_HASH_MAP(int, wxArchiveFilenameHashMap); - -//--------------------------------------------------------------------------- -// wxArchiveFSHandler -//--------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxArchiveFSHandler : public wxFileSystemHandler -{ -public: - wxArchiveFSHandler(); - virtual bool CanOpen(const wxString& location) wxOVERRIDE; - virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location) wxOVERRIDE; - virtual wxString FindFirst(const wxString& spec, int flags = 0) wxOVERRIDE; - virtual wxString FindNext() wxOVERRIDE; - void Cleanup(); - virtual ~wxArchiveFSHandler(); - -private: - class wxArchiveFSCache *m_cache; - wxFileSystem m_fs; - - // these vars are used by FindFirst/Next: - class wxArchiveFSCacheData *m_Archive; - struct wxArchiveFSEntry *m_FindEntry; - wxString m_Pattern, m_BaseDir, m_ZipFile; - bool m_AllowDirs, m_AllowFiles; - wxArchiveFilenameHashMap *m_DirsFound; - - wxString DoFind(); - - wxDECLARE_NO_COPY_CLASS(wxArchiveFSHandler); - wxDECLARE_DYNAMIC_CLASS(wxArchiveFSHandler); -}; - -#endif // wxUSE_FS_ARCHIVE - -#endif // _WX_FS_ARC_H_ diff --git a/Externals/wxWidgets3/include/wx/fs_filter.h b/Externals/wxWidgets3/include/wx/fs_filter.h deleted file mode 100644 index 4391921252..0000000000 --- a/Externals/wxWidgets3/include/wx/fs_filter.h +++ /dev/null @@ -1,40 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/fs_filter.h -// Purpose: Filter file system handler -// Author: Mike Wetherell -// Copyright: (c) 2006 Mike Wetherell -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_FS_FILTER_H_ -#define _WX_FS_FILTER_H_ - -#include "wx/defs.h" - -#if wxUSE_FILESYSTEM - -#include "wx/filesys.h" - -//--------------------------------------------------------------------------- -// wxFilterFSHandler -//--------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxFilterFSHandler : public wxFileSystemHandler -{ -public: - wxFilterFSHandler() : wxFileSystemHandler() { } - virtual ~wxFilterFSHandler() { } - - virtual bool CanOpen(const wxString& location) wxOVERRIDE; - virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location) wxOVERRIDE; - - virtual wxString FindFirst(const wxString& spec, int flags = 0) wxOVERRIDE; - virtual wxString FindNext() wxOVERRIDE; - -private: - wxDECLARE_NO_COPY_CLASS(wxFilterFSHandler); -}; - -#endif // wxUSE_FILESYSTEM - -#endif // _WX_FS_FILTER_H_ diff --git a/Externals/wxWidgets3/include/wx/fs_inet.h b/Externals/wxWidgets3/include/wx/fs_inet.h deleted file mode 100644 index 58b74ab64a..0000000000 --- a/Externals/wxWidgets3/include/wx/fs_inet.h +++ /dev/null @@ -1,33 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/fs_inet.h -// Purpose: HTTP and FTP file system -// Author: Vaclav Slavik -// Copyright: (c) 1999 Vaclav Slavik -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_FS_INET_H_ -#define _WX_FS_INET_H_ - -#include "wx/defs.h" - -#if wxUSE_FILESYSTEM && wxUSE_FS_INET && wxUSE_STREAMS && wxUSE_SOCKETS - -#include "wx/filesys.h" - -// ---------------------------------------------------------------------------- -// wxInternetFSHandler -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_NET wxInternetFSHandler : public wxFileSystemHandler -{ - public: - virtual bool CanOpen(const wxString& location) wxOVERRIDE; - virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location) wxOVERRIDE; -}; - -#endif - // wxUSE_FILESYSTEM && wxUSE_FS_INET && wxUSE_STREAMS && wxUSE_SOCKETS - -#endif // _WX_FS_INET_H_ - diff --git a/Externals/wxWidgets3/include/wx/fs_mem.h b/Externals/wxWidgets3/include/wx/fs_mem.h deleted file mode 100644 index f62d21c2fd..0000000000 --- a/Externals/wxWidgets3/include/wx/fs_mem.h +++ /dev/null @@ -1,140 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/fs_mem.h -// Purpose: in-memory file system -// Author: Vaclav Slavik -// Copyright: (c) 2000 Vaclav Slavik -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_FS_MEM_H_ -#define _WX_FS_MEM_H_ - -#include "wx/defs.h" - -#if wxUSE_FILESYSTEM - -#include "wx/filesys.h" - -#include "wx/hashmap.h" - -class wxMemoryFSFile; -WX_DECLARE_STRING_HASH_MAP(wxMemoryFSFile *, wxMemoryFSHash); - -#if wxUSE_GUI - #include "wx/bitmap.h" -#endif // wxUSE_GUI - -// ---------------------------------------------------------------------------- -// wxMemoryFSHandlerBase -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxMemoryFSHandlerBase : public wxFileSystemHandler -{ -public: - wxMemoryFSHandlerBase(); - virtual ~wxMemoryFSHandlerBase(); - - // Add file to list of files stored in memory. Stored data (bitmap, text or - // raw data) will be copied into private memory stream and available under - // name "memory:" + filename - static void AddFile(const wxString& filename, const wxString& textdata); - static void AddFile(const wxString& filename, const void *binarydata, size_t size); - static void AddFileWithMimeType(const wxString& filename, - const wxString& textdata, - const wxString& mimetype); - static void AddFileWithMimeType(const wxString& filename, - const void *binarydata, size_t size, - const wxString& mimetype); - - // Remove file from memory FS and free occupied memory - static void RemoveFile(const wxString& filename); - - virtual bool CanOpen(const wxString& location) wxOVERRIDE; - virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location) wxOVERRIDE; - virtual wxString FindFirst(const wxString& spec, int flags = 0) wxOVERRIDE; - virtual wxString FindNext() wxOVERRIDE; - -protected: - // check that the given file is not already present in m_Hash; logs an - // error and returns false if it does exist - static bool CheckDoesntExist(const wxString& filename); - - // the hash map indexed by the names of the files stored in the memory FS - static wxMemoryFSHash m_Hash; - - // the file name currently being searched for, i.e. the argument of the - // last FindFirst() call or empty string if FindFirst() hasn't been called - // yet or FindNext() didn't find anything - wxString m_findArgument; - - // iterator into m_Hash used by FindFirst/Next(), possibly m_Hash.end() or - // even invalid (can only be used when m_findArgument is not empty) - wxMemoryFSHash::const_iterator m_findIter; -}; - -// ---------------------------------------------------------------------------- -// wxMemoryFSHandler -// ---------------------------------------------------------------------------- - -#if wxUSE_GUI - -// add GUI-only operations to the base class -class WXDLLIMPEXP_CORE wxMemoryFSHandler : public wxMemoryFSHandlerBase -{ -public: - // bring the base class versions into the scope, otherwise they would be - // inaccessible in wxMemoryFSHandler - // (unfortunately "using" can't be used as gcc 2.95 doesn't have it...) - static void AddFile(const wxString& filename, const wxString& textdata) - { - wxMemoryFSHandlerBase::AddFile(filename, textdata); - } - - static void AddFile(const wxString& filename, - const void *binarydata, - size_t size) - { - wxMemoryFSHandlerBase::AddFile(filename, binarydata, size); - } - static void AddFileWithMimeType(const wxString& filename, - const wxString& textdata, - const wxString& mimetype) - { - wxMemoryFSHandlerBase::AddFileWithMimeType(filename, - textdata, - mimetype); - } - static void AddFileWithMimeType(const wxString& filename, - const void *binarydata, size_t size, - const wxString& mimetype) - { - wxMemoryFSHandlerBase::AddFileWithMimeType(filename, - binarydata, size, - mimetype); - } - -#if wxUSE_IMAGE - static void AddFile(const wxString& filename, - const wxImage& image, - wxBitmapType type); - - static void AddFile(const wxString& filename, - const wxBitmap& bitmap, - wxBitmapType type); -#endif // wxUSE_IMAGE - -}; - -#else // !wxUSE_GUI - -// just the same thing as the base class in wxBase -class WXDLLIMPEXP_BASE wxMemoryFSHandler : public wxMemoryFSHandlerBase -{ -}; - -#endif // wxUSE_GUI/!wxUSE_GUI - -#endif // wxUSE_FILESYSTEM - -#endif // _WX_FS_MEM_H_ - diff --git a/Externals/wxWidgets3/include/wx/fs_zip.h b/Externals/wxWidgets3/include/wx/fs_zip.h deleted file mode 100644 index 197a46a5ef..0000000000 --- a/Externals/wxWidgets3/include/wx/fs_zip.h +++ /dev/null @@ -1,22 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/fs_zip.h -// Purpose: wxZipFSHandler typedef for compatibility -// Author: Mike Wetherell -// Copyright: (c) 2006 Mike Wetherell -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_FS_ZIP_H_ -#define _WX_FS_ZIP_H_ - -#include "wx/defs.h" - -#if wxUSE_FS_ZIP - -#include "wx/fs_arc.h" - -typedef wxArchiveFSHandler wxZipFSHandler; - -#endif // wxUSE_FS_ZIP - -#endif // _WX_FS_ZIP_H_ diff --git a/Externals/wxWidgets3/include/wx/fswatcher.h b/Externals/wxWidgets3/include/wx/fswatcher.h deleted file mode 100644 index a29ff834e6..0000000000 --- a/Externals/wxWidgets3/include/wx/fswatcher.h +++ /dev/null @@ -1,415 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/fswatcher.h -// Purpose: wxFileSystemWatcherBase -// Author: Bartosz Bekier -// Created: 2009-05-23 -// Copyright: (c) 2009 Bartosz Bekier -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_FSWATCHER_BASE_H_ -#define _WX_FSWATCHER_BASE_H_ - -#include "wx/defs.h" - -#if wxUSE_FSWATCHER - -#include "wx/log.h" -#include "wx/event.h" -#include "wx/evtloop.h" -#include "wx/filename.h" -#include "wx/dir.h" -#include "wx/hashmap.h" - -#define wxTRACE_FSWATCHER "fswatcher" - -// ---------------------------------------------------------------------------- -// wxFileSystemWatcherEventType & wxFileSystemWatcherEvent -// ---------------------------------------------------------------------------- - -/** - * Possible types of file system events. - * This is a subset that will work fine an all platforms (actually, we will - * see how it works on Mac). - * - * We got 2 types of error events: - * - warning: these are not fatal and further events can still be generated - * - error: indicates fatal error and causes that no more events will happen - */ -enum -{ - wxFSW_EVENT_CREATE = 0x01, - wxFSW_EVENT_DELETE = 0x02, - wxFSW_EVENT_RENAME = 0x04, - wxFSW_EVENT_MODIFY = 0x08, - wxFSW_EVENT_ACCESS = 0x10, - wxFSW_EVENT_ATTRIB = 0x20, // Currently this is wxGTK-only - - // error events - wxFSW_EVENT_WARNING = 0x40, - wxFSW_EVENT_ERROR = 0x80, - wxFSW_EVENT_ALL = wxFSW_EVENT_CREATE | wxFSW_EVENT_DELETE | - wxFSW_EVENT_RENAME | wxFSW_EVENT_MODIFY | - wxFSW_EVENT_ACCESS | wxFSW_EVENT_ATTRIB | - wxFSW_EVENT_WARNING | wxFSW_EVENT_ERROR -#if defined(wxHAS_INOTIFY) || defined(wxHAVE_FSEVENTS_FILE_NOTIFICATIONS) - ,wxFSW_EVENT_UNMOUNT = 0x2000 -#endif -}; - -// Type of the path watched, used only internally for now. -enum wxFSWPathType -{ - wxFSWPath_None, // Invalid value for an initialized watch. - wxFSWPath_File, // Plain file. - wxFSWPath_Dir, // Watch a directory and the files in it. - wxFSWPath_Tree // Watch a directory and all its children recursively. -}; - -// Type of the warning for the events notifying about them. -enum wxFSWWarningType -{ - wxFSW_WARNING_NONE, - wxFSW_WARNING_GENERAL, - wxFSW_WARNING_OVERFLOW -}; - -/** - * Event containing information about file system change. - */ -class WXDLLIMPEXP_FWD_BASE wxFileSystemWatcherEvent; -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_BASE, wxEVT_FSWATCHER, - wxFileSystemWatcherEvent); - -class WXDLLIMPEXP_BASE wxFileSystemWatcherEvent: public wxEvent -{ -public: - // Constructor for any kind of events, also used as default ctor. - wxFileSystemWatcherEvent(int changeType = 0, int watchid = wxID_ANY) : - wxEvent(watchid, wxEVT_FSWATCHER), - m_changeType(changeType), - m_warningType(wxFSW_WARNING_NONE) - { - } - - // Constructor for the error or warning events. - wxFileSystemWatcherEvent(int changeType, - wxFSWWarningType warningType, - const wxString& errorMsg = wxString(), - int watchid = wxID_ANY) : - wxEvent(watchid, wxEVT_FSWATCHER), - m_changeType(changeType), - m_warningType(warningType), - m_errorMsg(errorMsg) - { - } - - // Constructor for the normal events carrying information about the changes. - wxFileSystemWatcherEvent(int changeType, - const wxFileName& path, const wxFileName& newPath, - int watchid = wxID_ANY) : - wxEvent(watchid, wxEVT_FSWATCHER), - m_changeType(changeType), - m_warningType(wxFSW_WARNING_NONE), - m_path(path), - m_newPath(newPath) - - { - } - - /** - * Returns the path at which the event occurred. - */ - const wxFileName& GetPath() const - { - return m_path; - } - - /** - * Sets the path at which the event occurred - */ - void SetPath(const wxFileName& path) - { - m_path = path; - } - - /** - * In case of rename(move?) events, returns the new path related to the - * event. The "new" means newer in the sense of time. In case of other - * events it returns the same path as GetPath(). - */ - const wxFileName& GetNewPath() const - { - return m_newPath; - } - - /** - * Sets the new path related to the event. See above. - */ - void SetNewPath(const wxFileName& path) - { - m_newPath = path; - } - - /** - * Returns the type of file system event that occurred. - */ - int GetChangeType() const - { - return m_changeType; - } - - virtual wxEvent* Clone() const wxOVERRIDE - { - wxFileSystemWatcherEvent* evt = new wxFileSystemWatcherEvent(*this); - evt->m_errorMsg = m_errorMsg.Clone(); - evt->m_path = wxFileName(m_path.GetFullPath().Clone()); - evt->m_newPath = wxFileName(m_newPath.GetFullPath().Clone()); - evt->m_warningType = m_warningType; - return evt; - } - - virtual wxEventCategory GetEventCategory() const wxOVERRIDE - { - // TODO this has to be merged with "similar" categories and changed - return wxEVT_CATEGORY_UNKNOWN; - } - - /** - * Returns if this error is an error event - */ - bool IsError() const - { - return (m_changeType & (wxFSW_EVENT_ERROR | wxFSW_EVENT_WARNING)) != 0; - } - - wxString GetErrorDescription() const - { - return m_errorMsg; - } - - wxFSWWarningType GetWarningType() const - { - return m_warningType; - } - - /** - * Returns a wxString describing an event useful for debugging or testing - */ - wxString ToString() const; - -protected: - int m_changeType; - wxFSWWarningType m_warningType; - wxFileName m_path; - wxFileName m_newPath; - wxString m_errorMsg; -private: - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxFileSystemWatcherEvent); -}; - -typedef void (wxEvtHandler::*wxFileSystemWatcherEventFunction) - (wxFileSystemWatcherEvent&); - -#define wxFileSystemWatcherEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxFileSystemWatcherEventFunction, func) - -#define EVT_FSWATCHER(winid, func) \ - wx__DECLARE_EVT1(wxEVT_FSWATCHER, winid, wxFileSystemWatcherEventHandler(func)) - -// ---------------------------------------------------------------------------- -// wxFileSystemWatcherBase: interface for wxFileSystemWatcher -// ---------------------------------------------------------------------------- - -// Simple container to store information about one watched path. -class wxFSWatchInfo -{ -public: - wxFSWatchInfo() : - m_events(-1), m_type(wxFSWPath_None), m_refcount(-1) - { - } - - wxFSWatchInfo(const wxString& path, - int events, - wxFSWPathType type, - const wxString& filespec = wxString()) : - m_path(path), m_filespec(filespec), m_events(events), m_type(type), - m_refcount(1) - { - } - - const wxString& GetPath() const - { - return m_path; - } - - const wxString& GetFilespec() const { return m_filespec; } - - int GetFlags() const - { - return m_events; - } - - wxFSWPathType GetType() const - { - return m_type; - } - - // Reference counting of watch entries is used to avoid watching the same - // file system path multiple times (this can happen even accidentally, e.g. - // when you have a recursive watch and then decide to watch some file or - // directory under it separately). - int IncRef() - { - return ++m_refcount; - } - - int DecRef() - { - wxASSERT_MSG( m_refcount > 0, wxS("Trying to decrement a zero count") ); - return --m_refcount; - } - -protected: - wxString m_path; - wxString m_filespec; // For tree watches, holds any filespec to apply - int m_events; - wxFSWPathType m_type; - int m_refcount; -}; - -WX_DECLARE_STRING_HASH_MAP(wxFSWatchInfo, wxFSWatchInfoMap); - -/** - * Encapsulation of platform-specific file system event mechanism - */ -class wxFSWatcherImpl; - -/** - * Main entry point for clients interested in file system events. - * Defines interface that can be used to receive that kind of events. - */ -class WXDLLIMPEXP_BASE wxFileSystemWatcherBase: public wxEvtHandler -{ -public: - wxFileSystemWatcherBase(); - - virtual ~wxFileSystemWatcherBase(); - - /** - * Adds path to currently watched files. Any events concerning this - * particular path will be sent to handler. Optionally a filter can be - * specified to receive only events of particular type. - * - * Please note that when adding a dir, immediate children will be watched - * as well. - */ - virtual bool Add(const wxFileName& path, int events = wxFSW_EVENT_ALL); - - /** - * Like above, but recursively adds every file/dir in the tree rooted in - * path. Additionally a file mask can be specified to include only files - * of particular type. - */ - virtual bool AddTree(const wxFileName& path, int events = wxFSW_EVENT_ALL, - const wxString& filespec = wxEmptyString); - - /** - * Removes path from the list of watched paths. - */ - virtual bool Remove(const wxFileName& path); - - /** - * Same as above, but also removes every file belonging to the tree rooted - * at path. - */ - virtual bool RemoveTree(const wxFileName& path); - - /** - * Clears the list of currently watched paths. - */ - virtual bool RemoveAll(); - - /** - * Returns the number of watched paths - */ - int GetWatchedPathsCount() const; - - /** - * Retrevies all watched paths and places them in wxArrayString. Returns - * the number of paths. - * - * TODO think about API here: we need to return more information (like is - * the path watched recursively) - */ - int GetWatchedPaths(wxArrayString* paths) const; - - wxEvtHandler* GetOwner() const - { - return m_owner; - } - - void SetOwner(wxEvtHandler* handler) - { - if (!handler) - m_owner = this; - else - m_owner = handler; - } - - - // This is a semi-private function used by wxWidgets itself only. - // - // Delegates the real work of adding the path to wxFSWatcherImpl::Add() and - // updates m_watches if the new path was successfully added. - bool AddAny(const wxFileName& path, int events, wxFSWPathType type, - const wxString& filespec = wxString()); - -protected: - - static wxString GetCanonicalPath(const wxFileName& path) - { - wxFileName path_copy = wxFileName(path); - if ( !path_copy.Normalize() ) - { - wxFAIL_MSG(wxString::Format("Unable to normalize path '%s'", - path.GetFullPath())); - return wxEmptyString; - } - - return path_copy.GetFullPath(); - } - - - wxFSWatchInfoMap m_watches; // path=>wxFSWatchInfo map - wxFSWatcherImpl* m_service; // file system events service - wxEvtHandler* m_owner; // handler for file system events - - friend class wxFSWatcherImpl; -}; - -// include the platform specific file defining wxFileSystemWatcher -// inheriting from wxFileSystemWatcherBase - -#ifdef wxHAS_INOTIFY - #include "wx/unix/fswatcher_inotify.h" - #define wxFileSystemWatcher wxInotifyFileSystemWatcher -#elif defined(wxHAS_KQUEUE) && defined(wxHAVE_FSEVENTS_FILE_NOTIFICATIONS) - #include "wx/unix/fswatcher_kqueue.h" - #include "wx/osx/fswatcher_fsevents.h" - #define wxFileSystemWatcher wxFsEventsFileSystemWatcher -#elif defined(wxHAS_KQUEUE) - #include "wx/unix/fswatcher_kqueue.h" - #define wxFileSystemWatcher wxKqueueFileSystemWatcher -#elif defined(__WINDOWS__) - #include "wx/msw/fswatcher.h" - #define wxFileSystemWatcher wxMSWFileSystemWatcher -#else - #include "wx/generic/fswatcher.h" - #define wxFileSystemWatcher wxPollingFileSystemWatcher -#endif - -#endif // wxUSE_FSWATCHER - -#endif /* _WX_FSWATCHER_BASE_H_ */ diff --git a/Externals/wxWidgets3/include/wx/gauge.h b/Externals/wxWidgets3/include/wx/gauge.h deleted file mode 100644 index d89f089131..0000000000 --- a/Externals/wxWidgets3/include/wx/gauge.h +++ /dev/null @@ -1,143 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gauge.h -// Purpose: wxGauge interface -// Author: Vadim Zeitlin -// Modified by: -// Created: 20.02.01 -// Copyright: (c) 1996-2001 wxWidgets team -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GAUGE_H_BASE_ -#define _WX_GAUGE_H_BASE_ - -#include "wx/defs.h" - -#if wxUSE_GAUGE - -#include "wx/control.h" - -// ---------------------------------------------------------------------------- -// wxGauge style flags -// ---------------------------------------------------------------------------- - -#define wxGA_HORIZONTAL wxHORIZONTAL -#define wxGA_VERTICAL wxVERTICAL - -// Available since Windows 7 only. With this style, the value of guage will -// reflect on the taskbar button. -#define wxGA_PROGRESS 0x0010 -// Win32 only, is default (and only) on some other platforms -#define wxGA_SMOOTH 0x0020 -// QT only, display current completed percentage (text default format "%p%") -#define wxGA_TEXT 0x0040 - -// GTK and Mac always have native implementation of the indeterminate mode -// wxMSW has native implementation only if comctl32.dll >= 6.00 -#if !defined(__WXGTK20__) && !defined(__WXMAC__) - #define wxGAUGE_EMULATE_INDETERMINATE_MODE 1 -#else - #define wxGAUGE_EMULATE_INDETERMINATE_MODE 0 -#endif - -extern WXDLLIMPEXP_DATA_CORE(const char) wxGaugeNameStr[]; - -class WXDLLIMPEXP_FWD_CORE wxAppProgressIndicator; - -// ---------------------------------------------------------------------------- -// wxGauge: a progress bar -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxGaugeBase : public wxControl -{ -public: - wxGaugeBase() : m_rangeMax(0), m_gaugePos(0), - m_appProgressIndicator(NULL) { } - - virtual ~wxGaugeBase(); - - bool Create(wxWindow *parent, - wxWindowID id, - int range, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxGA_HORIZONTAL, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxGaugeNameStr); - - // determinate mode API - - // set/get the control range - virtual void SetRange(int range); - virtual int GetRange() const; - - virtual void SetValue(int pos); - virtual int GetValue() const; - - // indeterminate mode API - virtual void Pulse(); - - // simple accessors - bool IsVertical() const { return HasFlag(wxGA_VERTICAL); } - - // overridden base class virtuals - virtual bool AcceptsFocus() const wxOVERRIDE { return false; } - - // Deprecated methods not doing anything since a long time. - wxDEPRECATED_MSG("Remove calls to this method, it doesn't do anything") - void SetShadowWidth(int WXUNUSED(w)) { } - - wxDEPRECATED_MSG("Remove calls to this method, it always returns 0") - int GetShadowWidth() const { return 0; } - - wxDEPRECATED_MSG("Remove calls to this method, it doesn't do anything") - void SetBezelFace(int WXUNUSED(w)) { } - - wxDEPRECATED_MSG("Remove calls to this method, it always returns 0") - int GetBezelFace() const { return 0; } - -protected: - virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } - - // Initialize m_appProgressIndicator if necessary, i.e. if this object has - // wxGA_PROGRESS style. This method is supposed to be called from the - // derived class Create() if it doesn't call the base class Create(), which - // already does it, after initializing the window style and range. - void InitProgressIndicatorIfNeeded(); - - - // the max position - int m_rangeMax; - - // the current position - int m_gaugePos; - -#if wxGAUGE_EMULATE_INDETERMINATE_MODE - int m_nDirection; // can be wxRIGHT or wxLEFT -#endif - - wxAppProgressIndicator *m_appProgressIndicator; - - wxDECLARE_NO_COPY_CLASS(wxGaugeBase); -}; - -#if defined(__WXUNIVERSAL__) - #include "wx/univ/gauge.h" -#elif defined(__WXMSW__) - #include "wx/msw/gauge.h" -#elif defined(__WXMOTIF__) - #include "wx/motif/gauge.h" -#elif defined(__WXGTK20__) - #include "wx/gtk/gauge.h" -#elif defined(__WXGTK__) - #include "wx/gtk1/gauge.h" -#elif defined(__WXMAC__) - #include "wx/osx/gauge.h" -#elif defined(__WXQT__) - #include "wx/qt/gauge.h" -#endif - -#endif // wxUSE_GAUGE - -#endif - // _WX_GAUGE_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/gbsizer.h b/Externals/wxWidgets3/include/wx/gbsizer.h deleted file mode 100644 index 501b5d8188..0000000000 --- a/Externals/wxWidgets3/include/wx/gbsizer.h +++ /dev/null @@ -1,341 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gbsizer.h -// Purpose: wxGridBagSizer: A sizer that can lay out items in a grid, -// with items at specified cells, and with the option of row -// and/or column spanning -// -// Author: Robin Dunn -// Created: 03-Nov-2003 -// Copyright: (c) Robin Dunn -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __WXGBSIZER_H__ -#define __WXGBSIZER_H__ - -#include "wx/sizer.h" - - -//--------------------------------------------------------------------------- -// Classes to represent a position in the grid and a size of an item in the -// grid, IOW, the number of rows and columns it occupies. I chose to use these -// instead of wxPoint and wxSize because they are (x,y) and usually pixel -// oriented while grids and tables are usually thought of as (row,col) so some -// confusion would definitely result in using wxPoint... -// -// NOTE: This should probably be refactored to a common RowCol data type which -// is used for this and also for wxGridCellCoords. -//--------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxGBPosition -{ -public: - wxGBPosition() : m_row(0), m_col(0) {} - wxGBPosition(int row, int col) : m_row(row), m_col(col) {} - - // default copy ctor and assignment operator are okay. - - int GetRow() const { return m_row; } - int GetCol() const { return m_col; } - void SetRow(int row) { m_row = row; } - void SetCol(int col) { m_col = col; } - - bool operator==(const wxGBPosition& p) const { return m_row == p.m_row && m_col == p.m_col; } - bool operator!=(const wxGBPosition& p) const { return !(*this == p); } - -private: - int m_row; - int m_col; -}; - - -class WXDLLIMPEXP_CORE wxGBSpan -{ -public: - wxGBSpan() { Init(); } - wxGBSpan(int rowspan, int colspan) - { - // Initialize the members to valid values as not doing it may result in - // infinite loop in wxGBSizer code if the user passed 0 for any of - // them, see #12934. - Init(); - - SetRowspan(rowspan); - SetColspan(colspan); - } - - // default copy ctor and assignment operator are okay. - - // Factor constructor creating an invalid wxGBSpan: this is mostly supposed - // to be used as return value for functions returning wxGBSpan in case of - // errors. - static wxGBSpan Invalid() - { - return wxGBSpan(NULL); - } - - int GetRowspan() const { return m_rowspan; } - int GetColspan() const { return m_colspan; } - void SetRowspan(int rowspan) - { - wxCHECK_RET( rowspan > 0, "Row span should be strictly positive" ); - - m_rowspan = rowspan; - } - - void SetColspan(int colspan) - { - wxCHECK_RET( colspan > 0, "Column span should be strictly positive" ); - - m_colspan = colspan; - } - - bool operator==(const wxGBSpan& o) const { return m_rowspan == o.m_rowspan && m_colspan == o.m_colspan; } - bool operator!=(const wxGBSpan& o) const { return !(*this == o); } - -private: - // This private ctor is used by Invalid() only. - wxGBSpan(struct InvalidCtorTag*) - { - m_rowspan = - m_colspan = -1; - } - - void Init() - { - m_rowspan = - m_colspan = 1; - } - - int m_rowspan; - int m_colspan; -}; - - -extern WXDLLIMPEXP_DATA_CORE(const wxGBSpan) wxDefaultSpan; - - -//--------------------------------------------------------------------------- -// wxGBSizerItem -//--------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxGridBagSizer; - - -class WXDLLIMPEXP_CORE wxGBSizerItem : public wxSizerItem -{ -public: - // spacer - wxGBSizerItem( int width, - int height, - const wxGBPosition& pos, - const wxGBSpan& span=wxDefaultSpan, - int flag=0, - int border=0, - wxObject* userData=NULL); - - // window - wxGBSizerItem( wxWindow *window, - const wxGBPosition& pos, - const wxGBSpan& span=wxDefaultSpan, - int flag=0, - int border=0, - wxObject* userData=NULL ); - - // subsizer - wxGBSizerItem( wxSizer *sizer, - const wxGBPosition& pos, - const wxGBSpan& span=wxDefaultSpan, - int flag=0, - int border=0, - wxObject* userData=NULL ); - - // default ctor - wxGBSizerItem(); - - - // Get the grid position of the item - wxGBPosition GetPos() const { return m_pos; } - void GetPos(int& row, int& col) const; - - // Get the row and column spanning of the item - wxGBSpan GetSpan() const { return m_span; } - void GetSpan(int& rowspan, int& colspan) const; - - // If the item is already a member of a sizer then first ensure that there - // is no other item that would intersect with this one at the new - // position, then set the new position. Returns true if the change is - // successful and after the next Layout the item will be moved. - bool SetPos( const wxGBPosition& pos ); - - // If the item is already a member of a sizer then first ensure that there - // is no other item that would intersect with this one with its new - // spanning size, then set the new spanning. Returns true if the change - // is successful and after the next Layout the item will be resized. - bool SetSpan( const wxGBSpan& span ); - - // Returns true if this item and the other item intersect - bool Intersects(const wxGBSizerItem& other); - - // Returns true if the given pos/span would intersect with this item. - bool Intersects(const wxGBPosition& pos, const wxGBSpan& span); - - // Get the row and column of the endpoint of this item - void GetEndPos(int& row, int& col); - - - wxGridBagSizer* GetGBSizer() const { return m_gbsizer; } - void SetGBSizer(wxGridBagSizer* sizer) { m_gbsizer = sizer; } - - -protected: - wxGBPosition m_pos; - wxGBSpan m_span; - wxGridBagSizer* m_gbsizer; // so SetPos/SetSpan can check for intersects - - -private: - wxDECLARE_DYNAMIC_CLASS(wxGBSizerItem); - wxDECLARE_NO_COPY_CLASS(wxGBSizerItem); -}; - - -//--------------------------------------------------------------------------- -// wxGridBagSizer -//--------------------------------------------------------------------------- - - -class WXDLLIMPEXP_CORE wxGridBagSizer : public wxFlexGridSizer -{ -public: - wxGridBagSizer(int vgap = 0, int hgap = 0 ); - - // The Add methods return true if the item was successfully placed at the - // given position, false if something was already there. - wxSizerItem* Add( wxWindow *window, - const wxGBPosition& pos, - const wxGBSpan& span = wxDefaultSpan, - int flag = 0, - int border = 0, - wxObject* userData = NULL ); - wxSizerItem* Add( wxSizer *sizer, - const wxGBPosition& pos, - const wxGBSpan& span = wxDefaultSpan, - int flag = 0, - int border = 0, - wxObject* userData = NULL ); - wxSizerItem* Add( int width, - int height, - const wxGBPosition& pos, - const wxGBSpan& span = wxDefaultSpan, - int flag = 0, - int border = 0, - wxObject* userData = NULL ); - wxSizerItem* Add( wxGBSizerItem *item ); - - - // Get/Set the size used for cells in the grid with no item. - wxSize GetEmptyCellSize() const { return m_emptyCellSize; } - void SetEmptyCellSize(const wxSize& sz) { m_emptyCellSize = sz; } - - // Get the size of the specified cell, including hgap and vgap. Only - // valid after a Layout. - wxSize GetCellSize(int row, int col) const; - - // Get the grid position of the specified item (non-recursive) - wxGBPosition GetItemPosition(wxWindow *window); - wxGBPosition GetItemPosition(wxSizer *sizer); - wxGBPosition GetItemPosition(size_t index); - - // Set the grid position of the specified item. Returns true on success. - // If the move is not allowed (because an item is already there) then - // false is returned. (non-recursive) - bool SetItemPosition(wxWindow *window, const wxGBPosition& pos); - bool SetItemPosition(wxSizer *sizer, const wxGBPosition& pos); - bool SetItemPosition(size_t index, const wxGBPosition& pos); - - // Get the row/col spanning of the specified item (non-recursive) - wxGBSpan GetItemSpan(wxWindow *window); - wxGBSpan GetItemSpan(wxSizer *sizer); - wxGBSpan GetItemSpan(size_t index); - - // Set the row/col spanning of the specified item. Returns true on - // success. If the move is not allowed (because an item is already there) - // then false is returned. (non-recursive) - bool SetItemSpan(wxWindow *window, const wxGBSpan& span); - bool SetItemSpan(wxSizer *sizer, const wxGBSpan& span); - bool SetItemSpan(size_t index, const wxGBSpan& span); - - - // Find the sizer item for the given window or subsizer, returns NULL if - // not found. (non-recursive) - wxGBSizerItem* FindItem(wxWindow* window); - wxGBSizerItem* FindItem(wxSizer* sizer); - - - // Return the sizer item for the given grid cell, or NULL if there is no - // item at that position. (non-recursive) - wxGBSizerItem* FindItemAtPosition(const wxGBPosition& pos); - - - // Return the sizer item located at the point given in pt, or NULL if - // there is no item at that point. The (x,y) coordinates in pt correspond - // to the client coordinates of the window using the sizer for - // layout. (non-recursive) - wxGBSizerItem* FindItemAtPoint(const wxPoint& pt); - - - // Return the sizer item that has a matching user data (it only compares - // pointer values) or NULL if not found. (non-recursive) - wxGBSizerItem* FindItemWithData(const wxObject* userData); - - - // These are what make the sizer do size calculations and layout - virtual void RecalcSizes() wxOVERRIDE; - virtual wxSize CalcMin() wxOVERRIDE; - - - // Look at all items and see if any intersect (or would overlap) the given - // item. Returns true if so, false if there would be no overlap. If an - // excludeItem is given then it will not be checked for intersection, for - // example it may be the item we are checking the position of. - bool CheckForIntersection(wxGBSizerItem* item, wxGBSizerItem* excludeItem = NULL); - bool CheckForIntersection(const wxGBPosition& pos, const wxGBSpan& span, wxGBSizerItem* excludeItem = NULL); - - - // The Add base class virtuals should not be used with this class, but - // we'll try to make them automatically select a location for the item - // anyway. - virtual wxSizerItem* Add( wxWindow *window, int proportion = 0, int flag = 0, int border = 0, wxObject* userData = NULL ); - virtual wxSizerItem* Add( wxSizer *sizer, int proportion = 0, int flag = 0, int border = 0, wxObject* userData = NULL ); - virtual wxSizerItem* Add( int width, int height, int proportion = 0, int flag = 0, int border = 0, wxObject* userData = NULL ); - - // The Insert and Prepend base class virtuals that are not appropriate for - // this class and should not be used. Their implementation in this class - // simply fails. - virtual wxSizerItem* Add( wxSizerItem *item ); - virtual wxSizerItem* Insert( size_t index, wxWindow *window, int proportion = 0, int flag = 0, int border = 0, wxObject* userData = NULL ); - virtual wxSizerItem* Insert( size_t index, wxSizer *sizer, int proportion = 0, int flag = 0, int border = 0, wxObject* userData = NULL ); - virtual wxSizerItem* Insert( size_t index, int width, int height, int proportion = 0, int flag = 0, int border = 0, wxObject* userData = NULL ); - virtual wxSizerItem* Insert( size_t index, wxSizerItem *item ) wxOVERRIDE; - virtual wxSizerItem* Prepend( wxWindow *window, int proportion = 0, int flag = 0, int border = 0, wxObject* userData = NULL ); - virtual wxSizerItem* Prepend( wxSizer *sizer, int proportion = 0, int flag = 0, int border = 0, wxObject* userData = NULL ); - virtual wxSizerItem* Prepend( int width, int height, int proportion = 0, int flag = 0, int border = 0, wxObject* userData = NULL ); - virtual wxSizerItem* Prepend( wxSizerItem *item ); - - -protected: - wxGBPosition FindEmptyCell(); - void AdjustForOverflow(); - - wxSize m_emptyCellSize; - - -private: - - wxDECLARE_CLASS(wxGridBagSizer); - wxDECLARE_NO_COPY_CLASS(wxGridBagSizer); -}; - -//--------------------------------------------------------------------------- -#endif diff --git a/Externals/wxWidgets3/include/wx/gdicmn.h b/Externals/wxWidgets3/include/wx/gdicmn.h deleted file mode 100644 index 35f680adea..0000000000 --- a/Externals/wxWidgets3/include/wx/gdicmn.h +++ /dev/null @@ -1,1105 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gdicmn.h -// Purpose: Common GDI classes, types and declarations -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GDICMNH__ -#define _WX_GDICMNH__ - -// --------------------------------------------------------------------------- -// headers -// --------------------------------------------------------------------------- - -#include "wx/defs.h" -#include "wx/list.h" -#include "wx/string.h" -#include "wx/fontenc.h" -#include "wx/hashmap.h" -#include "wx/math.h" - -// --------------------------------------------------------------------------- -// forward declarations -// --------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxBitmap; -class WXDLLIMPEXP_FWD_CORE wxBrush; -class WXDLLIMPEXP_FWD_CORE wxColour; -class WXDLLIMPEXP_FWD_CORE wxCursor; -class WXDLLIMPEXP_FWD_CORE wxFont; -class WXDLLIMPEXP_FWD_CORE wxIcon; -class WXDLLIMPEXP_FWD_CORE wxPalette; -class WXDLLIMPEXP_FWD_CORE wxPen; -class WXDLLIMPEXP_FWD_CORE wxRegion; -class WXDLLIMPEXP_FWD_BASE wxString; -class WXDLLIMPEXP_FWD_CORE wxIconBundle; -class WXDLLIMPEXP_FWD_CORE wxPoint; - -// --------------------------------------------------------------------------- -// constants -// --------------------------------------------------------------------------- - -// Bitmap flags -enum wxBitmapType -{ - wxBITMAP_TYPE_INVALID, // should be == 0 for compatibility! - wxBITMAP_TYPE_BMP, - wxBITMAP_TYPE_BMP_RESOURCE, - wxBITMAP_TYPE_RESOURCE = wxBITMAP_TYPE_BMP_RESOURCE, - wxBITMAP_TYPE_ICO, - wxBITMAP_TYPE_ICO_RESOURCE, - wxBITMAP_TYPE_CUR, - wxBITMAP_TYPE_CUR_RESOURCE, - wxBITMAP_TYPE_XBM, - wxBITMAP_TYPE_XBM_DATA, - wxBITMAP_TYPE_XPM, - wxBITMAP_TYPE_XPM_DATA, - wxBITMAP_TYPE_TIFF, - wxBITMAP_TYPE_TIF = wxBITMAP_TYPE_TIFF, - wxBITMAP_TYPE_TIFF_RESOURCE, - wxBITMAP_TYPE_TIF_RESOURCE = wxBITMAP_TYPE_TIFF_RESOURCE, - wxBITMAP_TYPE_GIF, - wxBITMAP_TYPE_GIF_RESOURCE, - wxBITMAP_TYPE_PNG, - wxBITMAP_TYPE_PNG_RESOURCE, - wxBITMAP_TYPE_JPEG, - wxBITMAP_TYPE_JPEG_RESOURCE, - wxBITMAP_TYPE_PNM, - wxBITMAP_TYPE_PNM_RESOURCE, - wxBITMAP_TYPE_PCX, - wxBITMAP_TYPE_PCX_RESOURCE, - wxBITMAP_TYPE_PICT, - wxBITMAP_TYPE_PICT_RESOURCE, - wxBITMAP_TYPE_ICON, - wxBITMAP_TYPE_ICON_RESOURCE, - wxBITMAP_TYPE_ANI, - wxBITMAP_TYPE_IFF, - wxBITMAP_TYPE_TGA, - wxBITMAP_TYPE_MACCURSOR, - wxBITMAP_TYPE_MACCURSOR_RESOURCE, - - wxBITMAP_TYPE_MAX, - wxBITMAP_TYPE_ANY = 50 -}; - -// Polygon filling mode -enum wxPolygonFillMode -{ - wxODDEVEN_RULE = 1, - wxWINDING_RULE -}; - -// Standard cursors -enum wxStockCursor -{ - wxCURSOR_NONE, // should be 0 - wxCURSOR_ARROW, - wxCURSOR_RIGHT_ARROW, - wxCURSOR_BULLSEYE, - wxCURSOR_CHAR, - wxCURSOR_CROSS, - wxCURSOR_HAND, - wxCURSOR_IBEAM, - wxCURSOR_LEFT_BUTTON, - wxCURSOR_MAGNIFIER, - wxCURSOR_MIDDLE_BUTTON, - wxCURSOR_NO_ENTRY, - wxCURSOR_PAINT_BRUSH, - wxCURSOR_PENCIL, - wxCURSOR_POINT_LEFT, - wxCURSOR_POINT_RIGHT, - wxCURSOR_QUESTION_ARROW, - wxCURSOR_RIGHT_BUTTON, - wxCURSOR_SIZENESW, - wxCURSOR_SIZENS, - wxCURSOR_SIZENWSE, - wxCURSOR_SIZEWE, - wxCURSOR_SIZING, - wxCURSOR_SPRAYCAN, - wxCURSOR_WAIT, - wxCURSOR_WATCH, - wxCURSOR_BLANK, -#ifdef __WXGTK__ - wxCURSOR_DEFAULT, // standard X11 cursor -#endif -#ifdef __WXMAC__ - wxCURSOR_COPY_ARROW , // MacOS Theme Plus arrow -#endif -#ifdef __X__ - // Not yet implemented for Windows - wxCURSOR_CROSS_REVERSE, - wxCURSOR_DOUBLE_ARROW, - wxCURSOR_BASED_ARROW_UP, - wxCURSOR_BASED_ARROW_DOWN, -#endif // X11 - wxCURSOR_ARROWWAIT, -#ifdef __WXMAC__ - wxCURSOR_OPEN_HAND, - wxCURSOR_CLOSED_HAND, -#endif - - wxCURSOR_MAX -}; - -#ifndef __WXGTK__ - #define wxCURSOR_DEFAULT wxCURSOR_ARROW -#endif - -#ifndef __WXMAC__ - // TODO CS supply openhand and closedhand cursors - #define wxCURSOR_OPEN_HAND wxCURSOR_HAND - #define wxCURSOR_CLOSED_HAND wxCURSOR_HAND -#endif - -// ---------------------------------------------------------------------------- -// Ellipsize() constants -// ---------------------------------------------------------------------------- - -enum wxEllipsizeFlags -{ - wxELLIPSIZE_FLAGS_NONE = 0, - wxELLIPSIZE_FLAGS_PROCESS_MNEMONICS = 1, - wxELLIPSIZE_FLAGS_EXPAND_TABS = 2, - - wxELLIPSIZE_FLAGS_DEFAULT = wxELLIPSIZE_FLAGS_PROCESS_MNEMONICS | - wxELLIPSIZE_FLAGS_EXPAND_TABS -}; - -// NB: Don't change the order of these values, they're the same as in -// PangoEllipsizeMode enum. -enum wxEllipsizeMode -{ - wxELLIPSIZE_NONE, - wxELLIPSIZE_START, - wxELLIPSIZE_MIDDLE, - wxELLIPSIZE_END -}; - -// --------------------------------------------------------------------------- -// macros -// --------------------------------------------------------------------------- - -#if defined(__WINDOWS__) - #define wxHAS_IMAGES_IN_RESOURCES -#endif - -/* Useful macro for creating icons portably, for example: - - wxIcon *icon = new wxICON(sample); - - expands into: - - wxIcon *icon = new wxIcon("sample"); // On Windows - wxIcon *icon = new wxIcon(sample_xpm); // On wxGTK/Linux - */ - -#ifdef __WINDOWS__ - // Load from a resource - #define wxICON(X) wxIcon(wxT(#X)) -#elif defined(__WXDFB__) - // Initialize from an included XPM - #define wxICON(X) wxIcon( X##_xpm ) -#elif defined(__WXGTK__) - // Initialize from an included XPM - #define wxICON(X) wxIcon( X##_xpm ) -#elif defined(__WXMAC__) - // Initialize from an included XPM - #define wxICON(X) wxIcon( X##_xpm ) -#elif defined(__WXMOTIF__) - // Initialize from an included XPM - #define wxICON(X) wxIcon( X##_xpm ) -#elif defined(__WXX11__) - // Initialize from an included XPM - #define wxICON(X) wxIcon( X##_xpm ) -#elif defined(__WXQT__) - // Initialize from an included XPM - #define wxICON(X) wxIcon( X##_xpm ) -#else - // This will usually mean something on any platform - #define wxICON(X) wxIcon(wxT(#X)) -#endif // platform - -/* Another macro: this one is for portable creation of bitmaps. We assume that - under Unix bitmaps live in XPMs and under Windows they're in ressources. - */ - -#if defined(__WINDOWS__) - #define wxBITMAP(name) wxBitmap(wxT(#name), wxBITMAP_TYPE_BMP_RESOURCE) -#elif defined(__WXGTK__) || \ - defined(__WXMOTIF__) || \ - defined(__WXX11__) || \ - defined(__WXMAC__) || \ - defined(__WXDFB__) - // Initialize from an included XPM - #define wxBITMAP(name) wxBitmap(name##_xpm) -#else // other platforms - #define wxBITMAP(name) wxBitmap(name##_xpm, wxBITMAP_TYPE_XPM) -#endif // platform - -// Macro for creating wxBitmap from in-memory PNG data. -// -// It reads PNG data from name_png static byte arrays that can be created using -// e.g. misc/scripts/png2c.py. -// -// This macro exists mostly as a helper for wxBITMAP_PNG() below but also -// because it's slightly more convenient to use than NewFromPNGData() directly. -#define wxBITMAP_PNG_FROM_DATA(name) \ - wxBitmap::NewFromPNGData(name##_png, WXSIZEOF(name##_png)) - -// Similar to wxBITMAP but used for the bitmaps in PNG format. -// -// Under Windows they should be embedded into the resource file using RT_RCDATA -// resource type and under OS X the PNG file with the specified name must be -// available in the resource subdirectory of the bundle. Elsewhere, this is -// exactly the same thing as wxBITMAP_PNG_FROM_DATA() described above. -#if defined(__WINDOWS__) || defined(__WXOSX__) - #define wxBITMAP_PNG(name) wxBitmap(wxS(#name), wxBITMAP_TYPE_PNG_RESOURCE) -#else - #define wxBITMAP_PNG(name) wxBITMAP_PNG_FROM_DATA(name) -#endif - -// =========================================================================== -// classes -// =========================================================================== - -// --------------------------------------------------------------------------- -// wxSize -// --------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxSize -{ -public: - // members are public for compatibility, don't use them directly. - int x, y; - - // constructors - wxSize() : x(0), y(0) { } - wxSize(int xx, int yy) : x(xx), y(yy) { } - - // no copy ctor or assignment operator - the defaults are ok - - wxSize& operator+=(const wxSize& sz) { x += sz.x; y += sz.y; return *this; } - wxSize& operator-=(const wxSize& sz) { x -= sz.x; y -= sz.y; return *this; } - wxSize& operator/=(int i) { x /= i; y /= i; return *this; } - wxSize& operator*=(int i) { x *= i; y *= i; return *this; } - wxSize& operator/=(unsigned int i) { x /= i; y /= i; return *this; } - wxSize& operator*=(unsigned int i) { x *= i; y *= i; return *this; } - wxSize& operator/=(long i) { x /= i; y /= i; return *this; } - wxSize& operator*=(long i) { x *= i; y *= i; return *this; } - wxSize& operator/=(unsigned long i) { x /= i; y /= i; return *this; } - wxSize& operator*=(unsigned long i) { x *= i; y *= i; return *this; } - wxSize& operator/=(double i) { x = int(x/i); y = int(y/i); return *this; } - wxSize& operator*=(double i) { x = int(x*i); y = int(y*i); return *this; } - - void IncTo(const wxSize& sz) - { if ( sz.x > x ) x = sz.x; if ( sz.y > y ) y = sz.y; } - void DecTo(const wxSize& sz) - { if ( sz.x < x ) x = sz.x; if ( sz.y < y ) y = sz.y; } - void DecToIfSpecified(const wxSize& sz) - { - if ( sz.x != wxDefaultCoord && sz.x < x ) - x = sz.x; - if ( sz.y != wxDefaultCoord && sz.y < y ) - y = sz.y; - } - - void IncBy(int dx, int dy) { x += dx; y += dy; } - void IncBy(const wxPoint& pt); - void IncBy(const wxSize& sz) { IncBy(sz.x, sz.y); } - void IncBy(int d) { IncBy(d, d); } - - void DecBy(int dx, int dy) { IncBy(-dx, -dy); } - void DecBy(const wxPoint& pt); - void DecBy(const wxSize& sz) { DecBy(sz.x, sz.y); } - void DecBy(int d) { DecBy(d, d); } - - - wxSize& Scale(float xscale, float yscale) - { x = (int)(x*xscale); y = (int)(y*yscale); return *this; } - - // accessors - void Set(int xx, int yy) { x = xx; y = yy; } - void SetWidth(int w) { x = w; } - void SetHeight(int h) { y = h; } - - int GetWidth() const { return x; } - int GetHeight() const { return y; } - - bool IsFullySpecified() const { return x != wxDefaultCoord && y != wxDefaultCoord; } - - // combine this size with the other one replacing the default (i.e. equal - // to wxDefaultCoord) components of this object with those of the other - void SetDefaults(const wxSize& size) - { - if ( x == wxDefaultCoord ) - x = size.x; - if ( y == wxDefaultCoord ) - y = size.y; - } - - // compatibility - int GetX() const { return x; } - int GetY() const { return y; } -}; - -inline bool operator==(const wxSize& s1, const wxSize& s2) -{ - return s1.x == s2.x && s1.y == s2.y; -} - -inline bool operator!=(const wxSize& s1, const wxSize& s2) -{ - return s1.x != s2.x || s1.y != s2.y; -} - -inline wxSize operator+(const wxSize& s1, const wxSize& s2) -{ - return wxSize(s1.x + s2.x, s1.y + s2.y); -} - -inline wxSize operator-(const wxSize& s1, const wxSize& s2) -{ - return wxSize(s1.x - s2.x, s1.y - s2.y); -} - -inline wxSize operator/(const wxSize& s, int i) -{ - return wxSize(s.x / i, s.y / i); -} - -inline wxSize operator*(const wxSize& s, int i) -{ - return wxSize(s.x * i, s.y * i); -} - -inline wxSize operator*(int i, const wxSize& s) -{ - return wxSize(s.x * i, s.y * i); -} - -inline wxSize operator/(const wxSize& s, unsigned int i) -{ - return wxSize(s.x / i, s.y / i); -} - -inline wxSize operator*(const wxSize& s, unsigned int i) -{ - return wxSize(s.x * i, s.y * i); -} - -inline wxSize operator*(unsigned int i, const wxSize& s) -{ - return wxSize(s.x * i, s.y * i); -} - -inline wxSize operator/(const wxSize& s, long i) -{ - return wxSize(s.x / i, s.y / i); -} - -inline wxSize operator*(const wxSize& s, long i) -{ - return wxSize(int(s.x * i), int(s.y * i)); -} - -inline wxSize operator*(long i, const wxSize& s) -{ - return wxSize(int(s.x * i), int(s.y * i)); -} - -inline wxSize operator/(const wxSize& s, unsigned long i) -{ - return wxSize(int(s.x / i), int(s.y / i)); -} - -inline wxSize operator*(const wxSize& s, unsigned long i) -{ - return wxSize(int(s.x * i), int(s.y * i)); -} - -inline wxSize operator*(unsigned long i, const wxSize& s) -{ - return wxSize(int(s.x * i), int(s.y * i)); -} - -inline wxSize operator*(const wxSize& s, double i) -{ - return wxSize(int(s.x * i), int(s.y * i)); -} - -inline wxSize operator*(double i, const wxSize& s) -{ - return wxSize(int(s.x * i), int(s.y * i)); -} - - - -// --------------------------------------------------------------------------- -// Point classes: with real or integer coordinates -// --------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxRealPoint -{ -public: - double x; - double y; - - wxRealPoint() : x(0.0), y(0.0) { } - wxRealPoint(double xx, double yy) : x(xx), y(yy) { } - wxRealPoint(const wxPoint& pt); - - // no copy ctor or assignment operator - the defaults are ok - - //assignment operators - wxRealPoint& operator+=(const wxRealPoint& p) { x += p.x; y += p.y; return *this; } - wxRealPoint& operator-=(const wxRealPoint& p) { x -= p.x; y -= p.y; return *this; } - - wxRealPoint& operator+=(const wxSize& s) { x += s.GetWidth(); y += s.GetHeight(); return *this; } - wxRealPoint& operator-=(const wxSize& s) { x -= s.GetWidth(); y -= s.GetHeight(); return *this; } -}; - - -inline bool operator==(const wxRealPoint& p1, const wxRealPoint& p2) -{ - return wxIsSameDouble(p1.x, p2.x) && wxIsSameDouble(p1.y, p2.y); -} - -inline bool operator!=(const wxRealPoint& p1, const wxRealPoint& p2) -{ - return !(p1 == p2); -} - -inline wxRealPoint operator+(const wxRealPoint& p1, const wxRealPoint& p2) -{ - return wxRealPoint(p1.x + p2.x, p1.y + p2.y); -} - - -inline wxRealPoint operator-(const wxRealPoint& p1, const wxRealPoint& p2) -{ - return wxRealPoint(p1.x - p2.x, p1.y - p2.y); -} - - -inline wxRealPoint operator/(const wxRealPoint& s, int i) -{ - return wxRealPoint(s.x / i, s.y / i); -} - -inline wxRealPoint operator*(const wxRealPoint& s, int i) -{ - return wxRealPoint(s.x * i, s.y * i); -} - -inline wxRealPoint operator*(int i, const wxRealPoint& s) -{ - return wxRealPoint(s.x * i, s.y * i); -} - -inline wxRealPoint operator/(const wxRealPoint& s, unsigned int i) -{ - return wxRealPoint(s.x / i, s.y / i); -} - -inline wxRealPoint operator*(const wxRealPoint& s, unsigned int i) -{ - return wxRealPoint(s.x * i, s.y * i); -} - -inline wxRealPoint operator*(unsigned int i, const wxRealPoint& s) -{ - return wxRealPoint(s.x * i, s.y * i); -} - -inline wxRealPoint operator/(const wxRealPoint& s, long i) -{ - return wxRealPoint(s.x / i, s.y / i); -} - -inline wxRealPoint operator*(const wxRealPoint& s, long i) -{ - return wxRealPoint(s.x * i, s.y * i); -} - -inline wxRealPoint operator*(long i, const wxRealPoint& s) -{ - return wxRealPoint(s.x * i, s.y * i); -} - -inline wxRealPoint operator/(const wxRealPoint& s, unsigned long i) -{ - return wxRealPoint(s.x / i, s.y / i); -} - -inline wxRealPoint operator*(const wxRealPoint& s, unsigned long i) -{ - return wxRealPoint(s.x * i, s.y * i); -} - -inline wxRealPoint operator*(unsigned long i, const wxRealPoint& s) -{ - return wxRealPoint(s.x * i, s.y * i); -} - -inline wxRealPoint operator*(const wxRealPoint& s, double i) -{ - return wxRealPoint(int(s.x * i), int(s.y * i)); -} - -inline wxRealPoint operator*(double i, const wxRealPoint& s) -{ - return wxRealPoint(int(s.x * i), int(s.y * i)); -} - - -// ---------------------------------------------------------------------------- -// wxPoint: 2D point with integer coordinates -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxPoint -{ -public: - int x, y; - - wxPoint() : x(0), y(0) { } - wxPoint(int xx, int yy) : x(xx), y(yy) { } - wxPoint(const wxRealPoint& pt) : x(int(pt.x)), y(int(pt.y)) { } - - // no copy ctor or assignment operator - the defaults are ok - - //assignment operators - wxPoint& operator+=(const wxPoint& p) { x += p.x; y += p.y; return *this; } - wxPoint& operator-=(const wxPoint& p) { x -= p.x; y -= p.y; return *this; } - - wxPoint& operator+=(const wxSize& s) { x += s.GetWidth(); y += s.GetHeight(); return *this; } - wxPoint& operator-=(const wxSize& s) { x -= s.GetWidth(); y -= s.GetHeight(); return *this; } - - // check if both components are set/initialized - bool IsFullySpecified() const { return x != wxDefaultCoord && y != wxDefaultCoord; } - - // fill in the unset components with the values from the other point - void SetDefaults(const wxPoint& pt) - { - if ( x == wxDefaultCoord ) - x = pt.x; - if ( y == wxDefaultCoord ) - y = pt.y; - } -}; - - -// comparison -inline bool operator==(const wxPoint& p1, const wxPoint& p2) -{ - return p1.x == p2.x && p1.y == p2.y; -} - -inline bool operator!=(const wxPoint& p1, const wxPoint& p2) -{ - return !(p1 == p2); -} - - -// arithmetic operations (component wise) -inline wxPoint operator+(const wxPoint& p1, const wxPoint& p2) -{ - return wxPoint(p1.x + p2.x, p1.y + p2.y); -} - -inline wxPoint operator-(const wxPoint& p1, const wxPoint& p2) -{ - return wxPoint(p1.x - p2.x, p1.y - p2.y); -} - -inline wxPoint operator+(const wxPoint& p, const wxSize& s) -{ - return wxPoint(p.x + s.x, p.y + s.y); -} - -inline wxPoint operator-(const wxPoint& p, const wxSize& s) -{ - return wxPoint(p.x - s.x, p.y - s.y); -} - -inline wxPoint operator+(const wxSize& s, const wxPoint& p) -{ - return wxPoint(p.x + s.x, p.y + s.y); -} - -inline wxPoint operator-(const wxSize& s, const wxPoint& p) -{ - return wxPoint(s.x - p.x, s.y - p.y); -} - -inline wxPoint operator-(const wxPoint& p) -{ - return wxPoint(-p.x, -p.y); -} - -inline wxPoint operator/(const wxPoint& s, int i) -{ - return wxPoint(s.x / i, s.y / i); -} - -inline wxPoint operator*(const wxPoint& s, int i) -{ - return wxPoint(s.x * i, s.y * i); -} - -inline wxPoint operator*(int i, const wxPoint& s) -{ - return wxPoint(s.x * i, s.y * i); -} - -inline wxPoint operator/(const wxPoint& s, unsigned int i) -{ - return wxPoint(s.x / i, s.y / i); -} - -inline wxPoint operator*(const wxPoint& s, unsigned int i) -{ - return wxPoint(s.x * i, s.y * i); -} - -inline wxPoint operator*(unsigned int i, const wxPoint& s) -{ - return wxPoint(s.x * i, s.y * i); -} - -inline wxPoint operator/(const wxPoint& s, long i) -{ - return wxPoint(s.x / i, s.y / i); -} - -inline wxPoint operator*(const wxPoint& s, long i) -{ - return wxPoint(int(s.x * i), int(s.y * i)); -} - -inline wxPoint operator*(long i, const wxPoint& s) -{ - return wxPoint(int(s.x * i), int(s.y * i)); -} - -inline wxPoint operator/(const wxPoint& s, unsigned long i) -{ - return wxPoint(s.x / i, s.y / i); -} - -inline wxPoint operator*(const wxPoint& s, unsigned long i) -{ - return wxPoint(int(s.x * i), int(s.y * i)); -} - -inline wxPoint operator*(unsigned long i, const wxPoint& s) -{ - return wxPoint(int(s.x * i), int(s.y * i)); -} - -inline wxPoint operator*(const wxPoint& s, double i) -{ - return wxPoint(int(s.x * i), int(s.y * i)); -} - -inline wxPoint operator*(double i, const wxPoint& s) -{ - return wxPoint(int(s.x * i), int(s.y * i)); -} - -WX_DECLARE_LIST_WITH_DECL(wxPoint, wxPointList, class WXDLLIMPEXP_CORE); - -// --------------------------------------------------------------------------- -// wxRect -// --------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxRect -{ -public: - wxRect() - : x(0), y(0), width(0), height(0) - { } - wxRect(int xx, int yy, int ww, int hh) - : x(xx), y(yy), width(ww), height(hh) - { } - wxRect(const wxPoint& topLeft, const wxPoint& bottomRight); - wxRect(const wxPoint& pt, const wxSize& size) - : x(pt.x), y(pt.y), width(size.x), height(size.y) - { } - wxRect(const wxSize& size) - : x(0), y(0), width(size.x), height(size.y) - { } - - // default copy ctor and assignment operators ok - - int GetX() const { return x; } - void SetX(int xx) { x = xx; } - - int GetY() const { return y; } - void SetY(int yy) { y = yy; } - - int GetWidth() const { return width; } - void SetWidth(int w) { width = w; } - - int GetHeight() const { return height; } - void SetHeight(int h) { height = h; } - - wxPoint GetPosition() const { return wxPoint(x, y); } - void SetPosition( const wxPoint &p ) { x = p.x; y = p.y; } - - wxSize GetSize() const { return wxSize(width, height); } - void SetSize( const wxSize &s ) { width = s.GetWidth(); height = s.GetHeight(); } - - bool IsEmpty() const { return (width <= 0) || (height <= 0); } - - int GetLeft() const { return x; } - int GetTop() const { return y; } - int GetBottom() const { return y + height - 1; } - int GetRight() const { return x + width - 1; } - - void SetLeft(int left) { x = left; } - void SetRight(int right) { width = right - x + 1; } - void SetTop(int top) { y = top; } - void SetBottom(int bottom) { height = bottom - y + 1; } - - wxPoint GetTopLeft() const { return GetPosition(); } - wxPoint GetLeftTop() const { return GetTopLeft(); } - void SetTopLeft(const wxPoint &p) { SetPosition(p); } - void SetLeftTop(const wxPoint &p) { SetTopLeft(p); } - - wxPoint GetBottomRight() const { return wxPoint(GetRight(), GetBottom()); } - wxPoint GetRightBottom() const { return GetBottomRight(); } - void SetBottomRight(const wxPoint &p) { SetRight(p.x); SetBottom(p.y); } - void SetRightBottom(const wxPoint &p) { SetBottomRight(p); } - - wxPoint GetTopRight() const { return wxPoint(GetRight(), GetTop()); } - wxPoint GetRightTop() const { return GetTopRight(); } - void SetTopRight(const wxPoint &p) { SetRight(p.x); SetTop(p.y); } - void SetRightTop(const wxPoint &p) { SetTopRight(p); } - - wxPoint GetBottomLeft() const { return wxPoint(GetLeft(), GetBottom()); } - wxPoint GetLeftBottom() const { return GetBottomLeft(); } - void SetBottomLeft(const wxPoint &p) { SetLeft(p.x); SetBottom(p.y); } - void SetLeftBottom(const wxPoint &p) { SetBottomLeft(p); } - - // operations with rect - wxRect& Inflate(wxCoord dx, wxCoord dy); - wxRect& Inflate(const wxSize& d) { return Inflate(d.x, d.y); } - wxRect& Inflate(wxCoord d) { return Inflate(d, d); } - wxRect Inflate(wxCoord dx, wxCoord dy) const - { - wxRect r = *this; - r.Inflate(dx, dy); - return r; - } - - wxRect& Deflate(wxCoord dx, wxCoord dy) { return Inflate(-dx, -dy); } - wxRect& Deflate(const wxSize& d) { return Inflate(-d.x, -d.y); } - wxRect& Deflate(wxCoord d) { return Inflate(-d); } - wxRect Deflate(wxCoord dx, wxCoord dy) const - { - wxRect r = *this; - r.Deflate(dx, dy); - return r; - } - - void Offset(wxCoord dx, wxCoord dy) { x += dx; y += dy; } - void Offset(const wxPoint& pt) { Offset(pt.x, pt.y); } - - wxRect& Intersect(const wxRect& rect); - wxRect Intersect(const wxRect& rect) const - { - wxRect r = *this; - r.Intersect(rect); - return r; - } - - wxRect& Union(const wxRect& rect); - wxRect Union(const wxRect& rect) const - { - wxRect r = *this; - r.Union(rect); - return r; - } - - // return true if the point is (not strcitly) inside the rect - bool Contains(int x, int y) const; - bool Contains(const wxPoint& pt) const { return Contains(pt.x, pt.y); } - // return true if the rectangle 'rect' is (not strictly) inside this rect - bool Contains(const wxRect& rect) const; - - // return true if the rectangles have a non empty intersection - bool Intersects(const wxRect& rect) const; - - // like Union() but don't ignore empty rectangles - wxRect& operator+=(const wxRect& rect); - - // intersections of two rectrangles not testing for empty rectangles - wxRect& operator*=(const wxRect& rect); - - // centre this rectangle in the given (usually, but not necessarily, - // larger) one - wxRect CentreIn(const wxRect& r, int dir = wxBOTH) const - { - return wxRect(dir & wxHORIZONTAL ? r.x + (r.width - width)/2 : x, - dir & wxVERTICAL ? r.y + (r.height - height)/2 : y, - width, height); - } - - wxRect CenterIn(const wxRect& r, int dir = wxBOTH) const - { - return CentreIn(r, dir); - } - -public: - int x, y, width, height; -}; - - -// compare rectangles -inline bool operator==(const wxRect& r1, const wxRect& r2) -{ - return (r1.x == r2.x) && (r1.y == r2.y) && - (r1.width == r2.width) && (r1.height == r2.height); -} - -inline bool operator!=(const wxRect& r1, const wxRect& r2) -{ - return !(r1 == r2); -} - -// like Union() but don't treat empty rectangles specially -WXDLLIMPEXP_CORE wxRect operator+(const wxRect& r1, const wxRect& r2); - -// intersections of two rectangles -WXDLLIMPEXP_CORE wxRect operator*(const wxRect& r1, const wxRect& r2); - -// define functions which couldn't be defined above because of declarations -// order -inline void wxSize::IncBy(const wxPoint& pt) { IncBy(pt.x, pt.y); } -inline void wxSize::DecBy(const wxPoint& pt) { DecBy(pt.x, pt.y); } - -// --------------------------------------------------------------------------- -// Management of pens, brushes and fonts -// --------------------------------------------------------------------------- - -typedef wxInt8 wxDash; - -class WXDLLIMPEXP_CORE wxGDIObjListBase { -public: - wxGDIObjListBase(); - ~wxGDIObjListBase(); - -protected: - wxList list; -}; - -WX_DECLARE_STRING_HASH_MAP(wxColour*, wxStringToColourHashMap); - -class WXDLLIMPEXP_CORE wxColourDatabase -{ -public: - wxColourDatabase(); - ~wxColourDatabase(); - - // find colour by name or name for the given colour - wxColour Find(const wxString& name) const; - wxString FindName(const wxColour& colour) const; - - // add a new colour to the database - void AddColour(const wxString& name, const wxColour& colour); - -private: - // load the database with the built in colour values when called for the - // first time, do nothing after this - void Initialize(); - - wxStringToColourHashMap *m_map; -}; - -class WXDLLIMPEXP_CORE wxResourceCache: public wxList -{ -public: - wxResourceCache() { } -#if !wxUSE_STD_CONTAINERS - wxResourceCache(unsigned int keyType) : wxList(keyType) { } -#endif - virtual ~wxResourceCache(); -}; - -// --------------------------------------------------------------------------- -// global variables -// --------------------------------------------------------------------------- - - -/* Stock objects - - wxStockGDI creates the stock GDI objects on demand. Pointers to the - created objects are stored in the ms_stockObject array, which is indexed - by the Item enum values. Platorm-specific fonts can be created by - implementing a derived class with an override for the GetFont function. - wxStockGDI operates as a singleton, accessed through the ms_instance - pointer. By default this pointer is set to an instance of wxStockGDI. - A derived class must arrange to set this pointer to an instance of itself. -*/ -class WXDLLIMPEXP_CORE wxStockGDI -{ -public: - enum Item { - BRUSH_BLACK, - BRUSH_BLUE, - BRUSH_CYAN, - BRUSH_GREEN, - BRUSH_YELLOW, - BRUSH_GREY, - BRUSH_LIGHTGREY, - BRUSH_MEDIUMGREY, - BRUSH_RED, - BRUSH_TRANSPARENT, - BRUSH_WHITE, - COLOUR_BLACK, - COLOUR_BLUE, - COLOUR_CYAN, - COLOUR_GREEN, - COLOUR_YELLOW, - COLOUR_LIGHTGREY, - COLOUR_RED, - COLOUR_WHITE, - CURSOR_CROSS, - CURSOR_HOURGLASS, - CURSOR_STANDARD, - FONT_ITALIC, - FONT_NORMAL, - FONT_SMALL, - FONT_SWISS, - PEN_BLACK, - PEN_BLACKDASHED, - PEN_BLUE, - PEN_CYAN, - PEN_GREEN, - PEN_YELLOW, - PEN_GREY, - PEN_LIGHTGREY, - PEN_MEDIUMGREY, - PEN_RED, - PEN_TRANSPARENT, - PEN_WHITE, - ITEMCOUNT - }; - - wxStockGDI(); - virtual ~wxStockGDI(); - static void DeleteAll(); - - static wxStockGDI& instance() { return *ms_instance; } - - static const wxBrush* GetBrush(Item item); - static const wxColour* GetColour(Item item); - static const wxCursor* GetCursor(Item item); - // Can be overridden by platform-specific derived classes - virtual const wxFont* GetFont(Item item); - static const wxPen* GetPen(Item item); - -protected: - static wxStockGDI* ms_instance; - - static wxObject* ms_stockObject[ITEMCOUNT]; - - wxDECLARE_NO_COPY_CLASS(wxStockGDI); -}; - -#define wxITALIC_FONT wxStockGDI::instance().GetFont(wxStockGDI::FONT_ITALIC) -#define wxNORMAL_FONT wxStockGDI::instance().GetFont(wxStockGDI::FONT_NORMAL) -#define wxSMALL_FONT wxStockGDI::instance().GetFont(wxStockGDI::FONT_SMALL) -#define wxSWISS_FONT wxStockGDI::instance().GetFont(wxStockGDI::FONT_SWISS) - -#define wxBLACK_DASHED_PEN wxStockGDI::GetPen(wxStockGDI::PEN_BLACKDASHED) -#define wxBLACK_PEN wxStockGDI::GetPen(wxStockGDI::PEN_BLACK) -#define wxBLUE_PEN wxStockGDI::GetPen(wxStockGDI::PEN_BLUE) -#define wxCYAN_PEN wxStockGDI::GetPen(wxStockGDI::PEN_CYAN) -#define wxGREEN_PEN wxStockGDI::GetPen(wxStockGDI::PEN_GREEN) -#define wxYELLOW_PEN wxStockGDI::GetPen(wxStockGDI::PEN_YELLOW) -#define wxGREY_PEN wxStockGDI::GetPen(wxStockGDI::PEN_GREY) -#define wxLIGHT_GREY_PEN wxStockGDI::GetPen(wxStockGDI::PEN_LIGHTGREY) -#define wxMEDIUM_GREY_PEN wxStockGDI::GetPen(wxStockGDI::PEN_MEDIUMGREY) -#define wxRED_PEN wxStockGDI::GetPen(wxStockGDI::PEN_RED) -#define wxTRANSPARENT_PEN wxStockGDI::GetPen(wxStockGDI::PEN_TRANSPARENT) -#define wxWHITE_PEN wxStockGDI::GetPen(wxStockGDI::PEN_WHITE) - -#define wxBLACK_BRUSH wxStockGDI::GetBrush(wxStockGDI::BRUSH_BLACK) -#define wxBLUE_BRUSH wxStockGDI::GetBrush(wxStockGDI::BRUSH_BLUE) -#define wxCYAN_BRUSH wxStockGDI::GetBrush(wxStockGDI::BRUSH_CYAN) -#define wxGREEN_BRUSH wxStockGDI::GetBrush(wxStockGDI::BRUSH_GREEN) -#define wxYELLOW_BRUSH wxStockGDI::GetBrush(wxStockGDI::BRUSH_YELLOW) -#define wxGREY_BRUSH wxStockGDI::GetBrush(wxStockGDI::BRUSH_GREY) -#define wxLIGHT_GREY_BRUSH wxStockGDI::GetBrush(wxStockGDI::BRUSH_LIGHTGREY) -#define wxMEDIUM_GREY_BRUSH wxStockGDI::GetBrush(wxStockGDI::BRUSH_MEDIUMGREY) -#define wxRED_BRUSH wxStockGDI::GetBrush(wxStockGDI::BRUSH_RED) -#define wxTRANSPARENT_BRUSH wxStockGDI::GetBrush(wxStockGDI::BRUSH_TRANSPARENT) -#define wxWHITE_BRUSH wxStockGDI::GetBrush(wxStockGDI::BRUSH_WHITE) - -#define wxBLACK wxStockGDI::GetColour(wxStockGDI::COLOUR_BLACK) -#define wxBLUE wxStockGDI::GetColour(wxStockGDI::COLOUR_BLUE) -#define wxCYAN wxStockGDI::GetColour(wxStockGDI::COLOUR_CYAN) -#define wxGREEN wxStockGDI::GetColour(wxStockGDI::COLOUR_GREEN) -#define wxYELLOW wxStockGDI::GetColour(wxStockGDI::COLOUR_YELLOW) -#define wxLIGHT_GREY wxStockGDI::GetColour(wxStockGDI::COLOUR_LIGHTGREY) -#define wxRED wxStockGDI::GetColour(wxStockGDI::COLOUR_RED) -#define wxWHITE wxStockGDI::GetColour(wxStockGDI::COLOUR_WHITE) - -#define wxCROSS_CURSOR wxStockGDI::GetCursor(wxStockGDI::CURSOR_CROSS) -#define wxHOURGLASS_CURSOR wxStockGDI::GetCursor(wxStockGDI::CURSOR_HOURGLASS) -#define wxSTANDARD_CURSOR wxStockGDI::GetCursor(wxStockGDI::CURSOR_STANDARD) - -// 'Null' objects -extern WXDLLIMPEXP_DATA_CORE(wxBitmap) wxNullBitmap; -extern WXDLLIMPEXP_DATA_CORE(wxIcon) wxNullIcon; -extern WXDLLIMPEXP_DATA_CORE(wxCursor) wxNullCursor; -extern WXDLLIMPEXP_DATA_CORE(wxPen) wxNullPen; -extern WXDLLIMPEXP_DATA_CORE(wxBrush) wxNullBrush; -extern WXDLLIMPEXP_DATA_CORE(wxPalette) wxNullPalette; -extern WXDLLIMPEXP_DATA_CORE(wxFont) wxNullFont; -extern WXDLLIMPEXP_DATA_CORE(wxColour) wxNullColour; -extern WXDLLIMPEXP_DATA_CORE(wxIconBundle) wxNullIconBundle; - -extern WXDLLIMPEXP_DATA_CORE(wxColourDatabase*) wxTheColourDatabase; - -extern WXDLLIMPEXP_DATA_CORE(const char) wxPanelNameStr[]; - -extern WXDLLIMPEXP_DATA_CORE(const wxSize) wxDefaultSize; -extern WXDLLIMPEXP_DATA_CORE(const wxPoint) wxDefaultPosition; - -// --------------------------------------------------------------------------- -// global functions -// --------------------------------------------------------------------------- - -// resource management -extern void WXDLLIMPEXP_CORE wxInitializeStockLists(); -extern void WXDLLIMPEXP_CORE wxDeleteStockLists(); - -// is the display colour (or monochrome)? -extern bool WXDLLIMPEXP_CORE wxColourDisplay(); - -// Returns depth of screen -extern int WXDLLIMPEXP_CORE wxDisplayDepth(); -#define wxGetDisplayDepth wxDisplayDepth - -// get the display size -extern void WXDLLIMPEXP_CORE wxDisplaySize(int *width, int *height); -extern wxSize WXDLLIMPEXP_CORE wxGetDisplaySize(); -extern void WXDLLIMPEXP_CORE wxDisplaySizeMM(int *width, int *height); -extern wxSize WXDLLIMPEXP_CORE wxGetDisplaySizeMM(); -extern wxSize WXDLLIMPEXP_CORE wxGetDisplayPPI(); - -// Get position and size of the display workarea -extern void WXDLLIMPEXP_CORE wxClientDisplayRect(int *x, int *y, int *width, int *height); -extern wxRect WXDLLIMPEXP_CORE wxGetClientDisplayRect(); - -// set global cursor -extern void WXDLLIMPEXP_CORE wxSetCursor(const wxCursor& cursor); - -#endif - // _WX_GDICMNH__ diff --git a/Externals/wxWidgets3/include/wx/gdiobj.h b/Externals/wxWidgets3/include/wx/gdiobj.h deleted file mode 100644 index 81d1f46a6b..0000000000 --- a/Externals/wxWidgets3/include/wx/gdiobj.h +++ /dev/null @@ -1,92 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gdiobj.h -// Purpose: wxGDIObject base header -// Author: Julian Smart -// Modified by: -// Created: -// Copyright: (c) Julian Smart -// Licence: wxWindows Licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GDIOBJ_H_BASE_ -#define _WX_GDIOBJ_H_BASE_ - -#include "wx/object.h" - -// ---------------------------------------------------------------------------- -// wxGDIRefData is the base class for wxXXXData structures which contain the -// real data for the GDI object and are shared among all wxWin objects sharing -// the same native GDI object -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxGDIRefData : public wxObjectRefData -{ -public: - // Default ctor which needs to be defined just because we use - // wxDECLARE_NO_COPY_CLASS() below. - wxGDIRefData() { } - - // override this in the derived classes to check if this data object is - // really fully initialized - virtual bool IsOk() const { return true; } - -private: - wxDECLARE_NO_COPY_CLASS(wxGDIRefData); -}; - -// ---------------------------------------------------------------------------- -// wxGDIObject: base class for bitmaps, pens, brushes, ... -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxGDIObject : public wxObject -{ -public: - // checks if the object can be used - virtual bool IsOk() const - { - // the cast here is safe because the derived classes always create - // wxGDIRefData objects - return m_refData && static_cast(m_refData)->IsOk(); - } - - // don't use in the new code, use IsOk() instead - bool IsNull() const { return m_refData == NULL; } - - // older version, for backwards compatibility only (but not deprecated - // because it's still widely used) - bool Ok() const { return IsOk(); } - -#if defined(__WXMSW__) - // Creates the resource - virtual bool RealizeResource() { return false; } - - // Frees the resource - virtual bool FreeResource(bool WXUNUSED(force) = false) { return false; } - - virtual bool IsFree() const { return false; } - - // Returns handle. - virtual WXHANDLE GetResourceHandle() const { return 0; } -#endif // defined(__WXMSW__) - -protected: - // replace base class functions using wxObjectRefData with our own which - // use wxGDIRefData to ensure that we always work with data objects of the - // correct type (i.e. derived from wxGDIRefData) - virtual wxObjectRefData *CreateRefData() const wxOVERRIDE - { - return CreateGDIRefData(); - } - - virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const wxOVERRIDE - { - return CloneGDIRefData(static_cast(data)); - } - - virtual wxGDIRefData *CreateGDIRefData() const = 0; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const = 0; - - wxDECLARE_DYNAMIC_CLASS(wxGDIObject); -}; - -#endif // _WX_GDIOBJ_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/generic/aboutdlgg.h b/Externals/wxWidgets3/include/wx/generic/aboutdlgg.h deleted file mode 100644 index 36e0cad438..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/aboutdlgg.h +++ /dev/null @@ -1,102 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/aboutdlgg.h -// Purpose: generic wxAboutBox() implementation -// Author: Vadim Zeitlin -// Created: 2006-10-07 -// Copyright: (c) 2006 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GENERIC_ABOUTDLGG_H_ -#define _WX_GENERIC_ABOUTDLGG_H_ - -#include "wx/defs.h" - -#if wxUSE_ABOUTDLG - -#include "wx/dialog.h" - -class WXDLLIMPEXP_FWD_ADV wxAboutDialogInfo; -class WXDLLIMPEXP_FWD_CORE wxSizer; -class WXDLLIMPEXP_FWD_CORE wxSizerFlags; - -// Under GTK and OS X "About" dialogs are not supposed to be modal, unlike MSW -// and, presumably, all the other platforms. -#ifndef wxUSE_MODAL_ABOUT_DIALOG - #if defined(__WXGTK__) || defined(__WXMAC__) - #define wxUSE_MODAL_ABOUT_DIALOG 0 - #else - #define wxUSE_MODAL_ABOUT_DIALOG 1 - #endif -#endif // wxUSE_MODAL_ABOUT_DIALOG not defined - -// ---------------------------------------------------------------------------- -// wxGenericAboutDialog: generic "About" dialog implementation -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxGenericAboutDialog : public wxDialog -{ -public: - // constructors and Create() method - // -------------------------------- - - // default ctor, you must use Create() to really initialize the dialog - wxGenericAboutDialog() { Init(); } - - // ctor which fully initializes the object - wxGenericAboutDialog(const wxAboutDialogInfo& info, wxWindow* parent = NULL) - { - Init(); - - (void)Create(info, parent); - } - - // this method must be called if and only if the default ctor was used - bool Create(const wxAboutDialogInfo& info, wxWindow* parent = NULL); - -protected: - // this virtual method may be overridden to add some more controls to the - // dialog - // - // notice that for this to work you must call Create() from the derived - // class ctor and not use the base class ctor directly as otherwise the - // virtual function of the derived class wouldn't be called - virtual void DoAddCustomControls() { } - - // add arbitrary control to the text sizer contents with the specified - // flags - void AddControl(wxWindow *win, const wxSizerFlags& flags); - - // add arbitrary control to the text sizer contents and center it - void AddControl(wxWindow *win); - - // add the text, if it's not empty, to the text sizer contents - void AddText(const wxString& text); - -#if wxUSE_COLLPANE - // add a wxCollapsiblePane containing the given text - void AddCollapsiblePane(const wxString& title, const wxString& text); -#endif // wxUSE_COLLPANE - -private: - // common part of all ctors - void Init() { m_sizerText = NULL; } - -#if !wxUSE_MODAL_ABOUT_DIALOG - // An explicit handler for deleting the dialog when it's closed is needed - // when we show it non-modally. - void OnCloseWindow(wxCloseEvent& event); - void OnOK(wxCommandEvent& event); -#endif // !wxUSE_MODAL_ABOUT_DIALOG - - wxSizer *m_sizerText; -}; - -// unlike wxAboutBox which can show either the native or generic about dialog, -// this function always shows the generic one -WXDLLIMPEXP_ADV void wxGenericAboutBox(const wxAboutDialogInfo& info, wxWindow* parent = NULL); - -#endif // wxUSE_ABOUTDLG - -#endif // _WX_GENERIC_ABOUTDLGG_H_ - diff --git a/Externals/wxWidgets3/include/wx/generic/accel.h b/Externals/wxWidgets3/include/wx/generic/accel.h deleted file mode 100644 index 0195f4642b..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/accel.h +++ /dev/null @@ -1,49 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/accel.h -// Purpose: wxAcceleratorTable class -// Author: Robert Roebling -// Copyright: (c) Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GENERIC_ACCEL_H_ -#define _WX_GENERIC_ACCEL_H_ - -class WXDLLIMPEXP_FWD_CORE wxKeyEvent; - -// ---------------------------------------------------------------------------- -// wxAcceleratorTable -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxAcceleratorTable : public wxObject -{ -public: - wxAcceleratorTable(); - wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]); - virtual ~wxAcceleratorTable(); - - bool Ok() const { return IsOk(); } - bool IsOk() const; - - void Add(const wxAcceleratorEntry& entry); - void Remove(const wxAcceleratorEntry& entry); - - // implementation - // -------------- - - wxMenuItem *GetMenuItem(const wxKeyEvent& event) const; - int GetCommand(const wxKeyEvent& event) const; - - const wxAcceleratorEntry *GetEntry(const wxKeyEvent& event) const; - -protected: - // ref counting code - virtual wxObjectRefData *CreateRefData() const wxOVERRIDE; - virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const wxOVERRIDE; - -private: - wxDECLARE_DYNAMIC_CLASS(wxAcceleratorTable); -}; - -#endif // _WX_GENERIC_ACCEL_H_ - diff --git a/Externals/wxWidgets3/include/wx/generic/activityindicator.h b/Externals/wxWidgets3/include/wx/generic/activityindicator.h deleted file mode 100644 index 1fbeb8e624..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/activityindicator.h +++ /dev/null @@ -1,67 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/activityindicator.h -// Purpose: Declaration of wxActivityIndicatorGeneric. -// Author: Vadim Zeitlin -// Created: 2015-03-06 -// Copyright: (c) 2015 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GENERIC_ACTIVITYINDICATOR_H_ -#define _WX_GENERIC_ACTIVITYINDICATOR_H_ - -#ifndef wxHAS_NATIVE_ACTIVITYINDICATOR - // This is the only implementation we have, so call it accordingly. - #define wxActivityIndicatorGeneric wxActivityIndicator -#endif - -// ---------------------------------------------------------------------------- -// wxActivityIndicatorGeneric: built-in generic implementation. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxActivityIndicatorGeneric : public wxActivityIndicatorBase -{ -public: - wxActivityIndicatorGeneric() - { - m_impl = NULL; - } - - explicit - wxActivityIndicatorGeneric(wxWindow* parent, - wxWindowID winid = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxActivityIndicatorNameStr) - { - m_impl = NULL; - - Create(parent, winid, pos, size, style, name); - } - - bool Create(wxWindow* parent, - wxWindowID winid = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxActivityIndicatorNameStr); - - virtual ~wxActivityIndicatorGeneric(); - - virtual void Start() wxOVERRIDE; - virtual void Stop() wxOVERRIDE; - virtual bool IsRunning() const wxOVERRIDE; - -protected: - virtual wxSize DoGetBestClientSize() const wxOVERRIDE; - -private: - class wxActivityIndicatorImpl *m_impl; - -#ifndef wxHAS_NATIVE_ACTIVITYINDICATOR - wxDECLARE_DYNAMIC_CLASS(wxActivityIndicator); -#endif -}; - -#endif // _WX_GENERIC_ACTIVITYINDICATOR_H_ diff --git a/Externals/wxWidgets3/include/wx/generic/animate.h b/Externals/wxWidgets3/include/wx/generic/animate.h deleted file mode 100644 index c9773f44fb..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/animate.h +++ /dev/null @@ -1,177 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/animate.h -// Purpose: wxAnimation and wxAnimationCtrl -// Author: Julian Smart and Guillermo Rodriguez Garcia -// Modified by: Francesco Montorsi -// Created: 13/8/99 -// Copyright: (c) Julian Smart and Guillermo Rodriguez Garcia -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GENERIC_ANIMATEH__ -#define _WX_GENERIC_ANIMATEH__ - -#include "wx/bitmap.h" - -// ---------------------------------------------------------------------------- -// wxAnimation -// ---------------------------------------------------------------------------- - -WX_DECLARE_LIST_WITH_DECL(wxAnimationDecoder, wxAnimationDecoderList, class WXDLLIMPEXP_ADV); - -class WXDLLIMPEXP_ADV wxAnimation : public wxAnimationBase -{ -public: - wxAnimation() {} - wxAnimation(const wxString &name, wxAnimationType type = wxANIMATION_TYPE_ANY) - { LoadFile(name, type); } - - virtual bool IsOk() const - { return m_refData != NULL; } - - virtual unsigned int GetFrameCount() const; - virtual int GetDelay(unsigned int i) const; - virtual wxImage GetFrame(unsigned int i) const; - virtual wxSize GetSize() const; - - virtual bool LoadFile(const wxString& filename, - wxAnimationType type = wxANIMATION_TYPE_ANY); - virtual bool Load(wxInputStream& stream, - wxAnimationType type = wxANIMATION_TYPE_ANY); - - // extended interface used by the generic implementation of wxAnimationCtrl - wxPoint GetFramePosition(unsigned int frame) const; - wxSize GetFrameSize(unsigned int frame) const; - wxAnimationDisposal GetDisposalMethod(unsigned int frame) const; - wxColour GetTransparentColour(unsigned int frame) const; - wxColour GetBackgroundColour() const; - -protected: - static wxAnimationDecoderList sm_handlers; - -public: - static inline wxAnimationDecoderList& GetHandlers() { return sm_handlers; } - static void AddHandler(wxAnimationDecoder *handler); - static void InsertHandler(wxAnimationDecoder *handler); - static const wxAnimationDecoder *FindHandler( wxAnimationType animType ); - - static void CleanUpHandlers(); - static void InitStandardHandlers(); - - wxDECLARE_DYNAMIC_CLASS(wxAnimation); -}; - - -// ---------------------------------------------------------------------------- -// wxAnimationCtrl -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxAnimationCtrl: public wxAnimationCtrlBase -{ -public: - wxAnimationCtrl() { Init(); } - wxAnimationCtrl(wxWindow *parent, - wxWindowID id, - const wxAnimation& anim = wxNullAnimation, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxAC_DEFAULT_STYLE, - const wxString& name = wxAnimationCtrlNameStr) - { - Init(); - - Create(parent, id, anim, pos, size, style, name); - } - - void Init(); - - bool Create(wxWindow *parent, wxWindowID id, - const wxAnimation& anim = wxNullAnimation, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxAC_DEFAULT_STYLE, - const wxString& name = wxAnimationCtrlNameStr); - - ~wxAnimationCtrl(); - -public: - virtual bool LoadFile(const wxString& filename, wxAnimationType type = wxANIMATION_TYPE_ANY) wxOVERRIDE; - virtual bool Load(wxInputStream& stream, wxAnimationType type = wxANIMATION_TYPE_ANY) wxOVERRIDE; - - virtual void Stop() wxOVERRIDE; - virtual bool Play() wxOVERRIDE - { return Play(true /* looped */); } - virtual bool IsPlaying() const wxOVERRIDE - { return m_isPlaying; } - - void SetAnimation(const wxAnimation &animation) wxOVERRIDE; - wxAnimation GetAnimation() const wxOVERRIDE - { return m_animation; } - - virtual void SetInactiveBitmap(const wxBitmap &bmp) wxOVERRIDE; - - // override base class method - virtual bool SetBackgroundColour(const wxColour& col) wxOVERRIDE; - -public: // event handlers - - void OnPaint(wxPaintEvent& event); - void OnTimer(wxTimerEvent& event); - void OnSize(wxSizeEvent& event); - -public: // extended API specific to this implementation of wxAnimateCtrl - - // Specify whether the animation's background colour is to be shown (the default), - // or whether the window background should show through - void SetUseWindowBackgroundColour(bool useWinBackground = true) - { m_useWinBackgroundColour = useWinBackground; } - bool IsUsingWindowBackgroundColour() const - { return m_useWinBackgroundColour; } - - // This overload of Play() lets you specify if the animation must loop or not - bool Play(bool looped); - - // Draw the current frame of the animation into given DC. - // This is fast as current frame is always cached. - void DrawCurrentFrame(wxDC& dc); - - // Returns a wxBitmap with the current frame drawn in it - wxBitmap& GetBackingStore() - { return m_backingStore; } - -protected: // internal utilities - - // resize this control to fit m_animation - void FitToAnimation(); - - // Draw the background; use this when e.g. previous frame had wxANIM_TOBACKGROUND disposal. - void DisposeToBackground(); - void DisposeToBackground(wxDC& dc); - void DisposeToBackground(wxDC& dc, const wxPoint &pos, const wxSize &sz); - - void IncrementalUpdateBackingStore(); - bool RebuildBackingStoreUpToFrame(unsigned int); - void DrawFrame(wxDC &dc, unsigned int); - - virtual void DisplayStaticImage() wxOVERRIDE; - virtual wxSize DoGetBestSize() const wxOVERRIDE; - -protected: - unsigned int m_currentFrame; // Current frame - bool m_looped; // Looped, or not - wxTimer m_timer; // The timer - wxAnimation m_animation; // The animation - - bool m_isPlaying; // Is the animation playing? - bool m_useWinBackgroundColour; // Use animation bg colour or window bg colour? - - wxBitmap m_backingStore; // The frames are drawn here and then blitted - // on the screen - -private: - typedef wxAnimationCtrlBase base_type; - wxDECLARE_DYNAMIC_CLASS(wxAnimationCtrl); - wxDECLARE_EVENT_TABLE(); -}; - -#endif // _WX_GENERIC_ANIMATEH__ diff --git a/Externals/wxWidgets3/include/wx/generic/bmpcbox.h b/Externals/wxWidgets3/include/wx/generic/bmpcbox.h deleted file mode 100644 index 4630a29a72..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/bmpcbox.h +++ /dev/null @@ -1,136 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/bmpcbox.h -// Purpose: wxBitmapComboBox -// Author: Jaakko Salli -// Modified by: -// Created: Aug-30-2006 -// Copyright: (c) Jaakko Salli -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GENERIC_BMPCBOX_H_ -#define _WX_GENERIC_BMPCBOX_H_ - - -#define wxGENERIC_BITMAPCOMBOBOX 1 - -#include "wx/odcombo.h" - -// ---------------------------------------------------------------------------- -// wxBitmapComboBox: a wxComboBox that allows images to be shown -// in front of string items. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxBitmapComboBox : public wxOwnerDrawnComboBox, - public wxBitmapComboBoxBase -{ -public: - - // ctors and such - wxBitmapComboBox() : wxOwnerDrawnComboBox(), wxBitmapComboBoxBase() - { - Init(); - } - - wxBitmapComboBox(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, - const wxString choices[] = NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxBitmapComboBoxNameStr) - : wxOwnerDrawnComboBox(), - wxBitmapComboBoxBase() - { - Init(); - - (void)Create(parent, id, value, pos, size, n, - choices, style, validator, name); - } - - wxBitmapComboBox(wxWindow *parent, - wxWindowID id, - const wxString& value, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxBitmapComboBoxNameStr); - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& value, - const wxPoint& pos, - const wxSize& size, - int n, - const wxString choices[], - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxBitmapComboBoxNameStr); - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& value, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxBitmapComboBoxNameStr); - - virtual ~wxBitmapComboBox(); - - // Adds item with image to the end of the combo box. - int Append(const wxString& item, const wxBitmap& bitmap = wxNullBitmap); - int Append(const wxString& item, const wxBitmap& bitmap, void *clientData); - int Append(const wxString& item, const wxBitmap& bitmap, wxClientData *clientData); - - // Inserts item with image into the list before pos. Not valid for wxCB_SORT - // styles, use Append instead. - int Insert(const wxString& item, const wxBitmap& bitmap, unsigned int pos); - int Insert(const wxString& item, const wxBitmap& bitmap, - unsigned int pos, void *clientData); - int Insert(const wxString& item, const wxBitmap& bitmap, - unsigned int pos, wxClientData *clientData); - - // Sets the image for the given item. - virtual void SetItemBitmap(unsigned int n, const wxBitmap& bitmap) wxOVERRIDE; - virtual bool SetFont(const wxFont& font) wxOVERRIDE; - -protected: - - virtual void OnDrawBackground(wxDC& dc, const wxRect& rect, int item, int flags) const wxOVERRIDE; - virtual void OnDrawItem(wxDC& dc, const wxRect& rect, int item, int flags) const wxOVERRIDE; - virtual wxCoord OnMeasureItem(size_t item) const wxOVERRIDE; - virtual wxCoord OnMeasureItemWidth(size_t item) const wxOVERRIDE; - - // Event handlers - void OnSize(wxSizeEvent& event); - - virtual wxSize DoGetBestSize() const wxOVERRIDE; - - virtual wxItemContainer* GetItemContainer() wxOVERRIDE { return this; } - virtual wxWindow* GetControl() wxOVERRIDE { return this; } - - // wxItemContainer implementation - virtual int DoInsertItems(const wxArrayStringsAdapter & items, - unsigned int pos, - void **clientData, wxClientDataType type) wxOVERRIDE; - virtual void DoClear() wxOVERRIDE; - virtual void DoDeleteOneItem(unsigned int n) wxOVERRIDE; - -private: - bool m_inResize; - - void Init(); - - wxDECLARE_EVENT_TABLE(); - - wxDECLARE_DYNAMIC_CLASS(wxBitmapComboBox); -}; - -#endif // _WX_GENERIC_BMPCBOX_H_ diff --git a/Externals/wxWidgets3/include/wx/generic/busyinfo.h b/Externals/wxWidgets3/include/wx/generic/busyinfo.h deleted file mode 100644 index d910668c86..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/busyinfo.h +++ /dev/null @@ -1,51 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/busyinfo.h -// Purpose: Information window (when app is busy) -// Author: Vaclav Slavik -// Copyright: (c) 1999 Vaclav Slavik -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_BUSYINFO_H_ -#define _WX_BUSYINFO_H_ - -#include "wx/defs.h" - -#if wxUSE_BUSYINFO - -#include "wx/object.h" - -class WXDLLIMPEXP_FWD_CORE wxFrame; -class WXDLLIMPEXP_FWD_CORE wxWindow; - -//-------------------------------------------------------------------------------- -// wxBusyInfo -// Displays progress information -// Can be used in exactly same way as wxBusyCursor -//-------------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxBusyInfo : public wxObject -{ -public: - wxBusyInfo(const wxBusyInfoFlags& flags) - { - Init(flags); - } - - wxBusyInfo(const wxString& message, wxWindow *parent = NULL) - { - Init(wxBusyInfoFlags().Parent(parent).Label(message)); - } - - virtual ~wxBusyInfo(); - -private: - void Init(const wxBusyInfoFlags& flags); - - wxFrame *m_InfoFrame; - - wxDECLARE_NO_COPY_CLASS(wxBusyInfo); -}; - -#endif // wxUSE_BUSYINFO -#endif // _WX_BUSYINFO_H_ diff --git a/Externals/wxWidgets3/include/wx/generic/buttonbar.h b/Externals/wxWidgets3/include/wx/generic/buttonbar.h deleted file mode 100644 index 7a96d4adbe..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/buttonbar.h +++ /dev/null @@ -1,123 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/buttonbar.h -// Purpose: wxButtonToolBar declaration -// Author: Julian Smart, after Robert Roebling, Vadim Zeitlin, SciTech -// Modified by: -// Created: 2006-04-13 -// Copyright: (c) Julian Smart, Robert Roebling, Vadim Zeitlin, -// SciTech Software, Inc. -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_BUTTONBAR_H_ -#define _WX_BUTTONBAR_H_ - -#include "wx/bmpbuttn.h" -#include "wx/toolbar.h" - -class WXDLLIMPEXP_FWD_CORE wxButtonToolBarTool; - -// ---------------------------------------------------------------------------- -// wxButtonToolBar -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxButtonToolBar : public wxToolBarBase -{ -public: - // construction/destruction - wxButtonToolBar() { Init(); } - wxButtonToolBar(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxToolBarNameStr) - { - Init(); - - Create(parent, id, pos, size, style, name); - } - - bool Create( wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxToolBarNameStr ); - - virtual ~wxButtonToolBar(); - - virtual bool Realize() wxOVERRIDE; - - virtual void SetToolShortHelp(int id, const wxString& helpString) wxOVERRIDE; - virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const wxOVERRIDE; - -protected: - // common part of all ctors - void Init(); - - // implement base class pure virtuals - virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool) wxOVERRIDE; - virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool) wxOVERRIDE; - - virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable) wxOVERRIDE; - virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle) wxOVERRIDE; - virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle) wxOVERRIDE; - - virtual wxToolBarToolBase *CreateTool(int id, - const wxString& label, - const wxBitmap& bmpNormal, - const wxBitmap& bmpDisabled, - wxItemKind kind, - wxObject *clientData, - const wxString& shortHelp, - const wxString& longHelp) wxOVERRIDE; - virtual wxToolBarToolBase *CreateTool(wxControl *control, - const wxString& label) wxOVERRIDE; - - virtual wxSize DoGetBestClientSize() const wxOVERRIDE; - - // calculate layout - void DoLayout(); - - // get the bounding rect for the given tool - wxRect GetToolRect(wxToolBarToolBase *tool) const; - - // get the rect limits depending on the orientation: top/bottom for a - // vertical toolbar, left/right for a horizontal one - void GetRectLimits(const wxRect& rect, wxCoord *start, wxCoord *end) const; - - // receives button commands - void OnCommand(wxCommandEvent& event); - - // paints a border - void OnPaint(wxPaintEvent& event); - - // detects mouse clicks outside buttons - void OnLeftUp(wxMouseEvent& event); - -private: - // have we calculated the positions of our tools? - bool m_needsLayout; - - // the width of a separator - wxCoord m_widthSeparator; - - // the total size of all toolbar elements - wxCoord m_maxWidth, - m_maxHeight; - - // the height of a label - int m_labelHeight; - - // the space above the label - int m_labelMargin; - -private: - wxDECLARE_DYNAMIC_CLASS(wxButtonToolBar); - wxDECLARE_EVENT_TABLE(); -}; - -#endif - // _WX_BUTTONBAR_H_ - diff --git a/Externals/wxWidgets3/include/wx/generic/calctrlg.h b/Externals/wxWidgets3/include/wx/generic/calctrlg.h deleted file mode 100644 index 0c2b48b413..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/calctrlg.h +++ /dev/null @@ -1,317 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/calctrlg.h -// Purpose: generic implementation of date-picker control -// Author: Vadim Zeitlin -// Modified by: -// Created: 29.12.99 -// Copyright: (c) 1999 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GENERIC_CALCTRLG_H -#define _WX_GENERIC_CALCTRLG_H - -#include "wx/control.h" // the base class -#include "wx/dcclient.h" // for wxPaintDC - -class WXDLLIMPEXP_FWD_CORE wxComboBox; -class WXDLLIMPEXP_FWD_CORE wxStaticText; -class WXDLLIMPEXP_FWD_CORE wxSpinCtrl; -class WXDLLIMPEXP_FWD_CORE wxSpinEvent; - -// ---------------------------------------------------------------------------- -// wxGenericCalendarCtrl -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxGenericCalendarCtrl : public wxCalendarCtrlBase -{ -public: - // construction - wxGenericCalendarCtrl() { Init(); } - wxGenericCalendarCtrl(wxWindow *parent, - wxWindowID id, - const wxDateTime& date = wxDefaultDateTime, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxCAL_SHOW_HOLIDAYS, - const wxString& name = wxCalendarNameStr); - - bool Create(wxWindow *parent, - wxWindowID id, - const wxDateTime& date = wxDefaultDateTime, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxCAL_SHOW_HOLIDAYS, - const wxString& name = wxCalendarNameStr); - - virtual ~wxGenericCalendarCtrl(); - - virtual bool Destroy() wxOVERRIDE; - - // set/get the current date - // ------------------------ - - virtual bool SetDate(const wxDateTime& date) wxOVERRIDE; - virtual wxDateTime GetDate() const wxOVERRIDE { return m_date; } - - - // set/get the range in which selection can occur - // --------------------------------------------- - - virtual bool SetDateRange(const wxDateTime& lowerdate = wxDefaultDateTime, - const wxDateTime& upperdate = wxDefaultDateTime) wxOVERRIDE; - - virtual bool GetDateRange(wxDateTime *lowerdate, wxDateTime *upperdate) const wxOVERRIDE; - - // these functions are for generic version only, don't use them but use the - // Set/GetDateRange() above instead - bool SetLowerDateLimit(const wxDateTime& date = wxDefaultDateTime); - const wxDateTime& GetLowerDateLimit() const { return m_lowdate; } - bool SetUpperDateLimit(const wxDateTime& date = wxDefaultDateTime); - const wxDateTime& GetUpperDateLimit() const { return m_highdate; } - - - // calendar mode - // ------------- - - // some calendar styles can't be changed after the control creation by - // just using SetWindowStyle() and Refresh() and the functions below - // should be used instead for them - - // corresponds to wxCAL_NO_MONTH_CHANGE bit - virtual bool EnableMonthChange(bool enable = true) wxOVERRIDE; - - // corresponds to wxCAL_NO_YEAR_CHANGE bit, deprecated, generic only - void EnableYearChange(bool enable = true); - - - // customization - // ------------- - - virtual void Mark(size_t day, bool mark) wxOVERRIDE; - - // all other functions in this section are for generic version only - - // header colours are used for painting the weekdays at the top - virtual void SetHeaderColours(const wxColour& colFg, const wxColour& colBg) wxOVERRIDE - { - m_colHeaderFg = colFg; - m_colHeaderBg = colBg; - } - - virtual const wxColour& GetHeaderColourFg() const wxOVERRIDE { return m_colHeaderFg; } - virtual const wxColour& GetHeaderColourBg() const wxOVERRIDE { return m_colHeaderBg; } - - // highlight colour is used for the currently selected date - virtual void SetHighlightColours(const wxColour& colFg, const wxColour& colBg) wxOVERRIDE - { - m_colHighlightFg = colFg; - m_colHighlightBg = colBg; - } - - virtual const wxColour& GetHighlightColourFg() const wxOVERRIDE { return m_colHighlightFg; } - virtual const wxColour& GetHighlightColourBg() const wxOVERRIDE { return m_colHighlightBg; } - - // holiday colour is used for the holidays (if style & wxCAL_SHOW_HOLIDAYS) - virtual void SetHolidayColours(const wxColour& colFg, const wxColour& colBg) wxOVERRIDE - { - m_colHolidayFg = colFg; - m_colHolidayBg = colBg; - } - - virtual const wxColour& GetHolidayColourFg() const wxOVERRIDE { return m_colHolidayFg; } - virtual const wxColour& GetHolidayColourBg() const wxOVERRIDE { return m_colHolidayBg; } - - virtual wxCalendarDateAttr *GetAttr(size_t day) const wxOVERRIDE - { - wxCHECK_MSG( day > 0 && day < 32, NULL, wxT("invalid day") ); - - return m_attrs[day - 1]; - } - - virtual void SetAttr(size_t day, wxCalendarDateAttr *attr) wxOVERRIDE - { - wxCHECK_RET( day > 0 && day < 32, wxT("invalid day") ); - - delete m_attrs[day - 1]; - m_attrs[day - 1] = attr; - } - - virtual void ResetAttr(size_t day) wxOVERRIDE { SetAttr(day, NULL); } - - virtual void SetHoliday(size_t day) wxOVERRIDE; - - virtual wxCalendarHitTestResult HitTest(const wxPoint& pos, - wxDateTime *date = NULL, - wxDateTime::WeekDay *wd = NULL) wxOVERRIDE; - - // implementation only from now on - // ------------------------------- - - // forward these functions to all subcontrols - virtual bool Enable(bool enable = true) wxOVERRIDE; - virtual bool Show(bool show = true) wxOVERRIDE; - - virtual void SetWindowStyleFlag(long style) wxOVERRIDE; - - virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE - { return GetClassDefaultAttributes(GetWindowVariant()); } - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - void OnSysColourChanged(wxSysColourChangedEvent& event); - -protected: - // override some base class virtuals - virtual wxSize DoGetBestSize() const wxOVERRIDE; - virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE; - virtual void DoGetSize(int *width, int *height) const wxOVERRIDE; - -private: - // common part of all ctors - void Init(); - - // startup colours and reinitialization after colour changes in system - void InitColours(); - - // event handlers - void OnPaint(wxPaintEvent& event); - void OnClick(wxMouseEvent& event); - void OnDClick(wxMouseEvent& event); - void OnWheel(wxMouseEvent& event); - void OnChar(wxKeyEvent& event); - void OnMonthChange(wxCommandEvent& event); - - void HandleYearChange(wxCommandEvent& event); - void OnYearChange(wxSpinEvent& event); - void OnYearTextChange(wxCommandEvent& event); - - // (re)calc m_widthCol and m_heightRow - void RecalcGeometry(); - - // set the date and send the notification - void SetDateAndNotify(const wxDateTime& date); - - // get the week (row, in range 1..6) for the given date - size_t GetWeek(const wxDateTime& date) const; - - // get the date from which we start drawing days - wxDateTime GetStartDate() const; - - // get the first/last days of the week corresponding to the current style - wxDateTime::WeekDay GetWeekStart() const - { - return HasFlag(wxCAL_MONDAY_FIRST) ? wxDateTime::Mon - : wxDateTime::Sun; - } - - wxDateTime::WeekDay GetWeekEnd() const - { - return HasFlag(wxCAL_MONDAY_FIRST) ? wxDateTime::Sun - : wxDateTime::Sat; - } - - - // is this date shown? - bool IsDateShown(const wxDateTime& date) const; - - // is this date in the currently allowed range? - bool IsDateInRange(const wxDateTime& date) const; - - // adjust the date to the currently allowed range, return true if it was - // changed - bool AdjustDateToRange(wxDateTime *date) const; - - // redraw the given date - void RefreshDate(const wxDateTime& date); - - // change the date inside the same month/year - void ChangeDay(const wxDateTime& date); - - // deprecated - bool AllowYearChange() const - { - return !(GetWindowStyle() & wxCAL_NO_YEAR_CHANGE); - } - - // show the correct controls - void ShowCurrentControls(); - - // create the month combo and year spin controls - void CreateMonthComboBox(); - void CreateYearSpinCtrl(); - -public: - // get the currently shown control for month/year - wxControl *GetMonthControl() const; - wxControl *GetYearControl() const; - -private: - virtual void ResetHolidayAttrs() wxOVERRIDE; - virtual void RefreshHolidays() wxOVERRIDE { Refresh(); } - - // OnPaint helper-methods - - // Highlight the [fromdate : todate] range using pen and brush - void HighlightRange(wxPaintDC* dc, const wxDateTime& fromdate, const wxDateTime& todate, const wxPen* pen, const wxBrush* brush); - - // Get the "coordinates" for the date relative to the month currently displayed. - // using (day, week): upper left coord is (1, 1), lower right coord is (7, 6) - // if the date isn't visible (-1, -1) is put in (day, week) and false is returned - bool GetDateCoord(const wxDateTime& date, int *day, int *week) const; - - // Set the flag for SetDate(): otherwise it would overwrite the year - // typed in by the user - void SetUserChangedYear() { m_userChangedYear = true; } - - - // the subcontrols - wxStaticText *m_staticMonth; - wxComboBox *m_comboMonth; - - wxStaticText *m_staticYear; - wxSpinCtrl *m_spinYear; - - // the current selection - wxDateTime m_date; - - // the date-range - wxDateTime m_lowdate; - wxDateTime m_highdate; - - // default attributes - wxColour m_colHighlightFg, - m_colHighlightBg, - m_colHolidayFg, - m_colHolidayBg, - m_colHeaderFg, - m_colHeaderBg, - m_colBackground, - m_colSurrounding; - - // the attributes for each of the month days - wxCalendarDateAttr *m_attrs[31]; - - // the width and height of one column/row in the calendar - wxCoord m_widthCol, - m_heightRow, - m_rowOffset, - m_calendarWeekWidth; - - wxRect m_leftArrowRect, - m_rightArrowRect; - - // the week day names - wxString m_weekdays[7]; - - // true if SetDate() is being called as the result of changing the year in - // the year control - bool m_userChangedYear; - - wxDECLARE_DYNAMIC_CLASS(wxGenericCalendarCtrl); - wxDECLARE_EVENT_TABLE(); - wxDECLARE_NO_COPY_CLASS(wxGenericCalendarCtrl); -}; - -#endif // _WX_GENERIC_CALCTRLG_H diff --git a/Externals/wxWidgets3/include/wx/generic/caret.h b/Externals/wxWidgets3/include/wx/generic/caret.h deleted file mode 100644 index de9117c656..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/caret.h +++ /dev/null @@ -1,94 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/caret.h -// Purpose: generic wxCaret class -// Author: Vadim Zeitlin (original code by Robert Roebling) -// Modified by: -// Created: 25.05.99 -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_CARET_H_ -#define _WX_CARET_H_ - -#include "wx/timer.h" -#include "wx/dc.h" -#include "wx/overlay.h" - -#ifdef wxHAS_NATIVE_OVERLAY - #define wxHAS_CARET_USING_OVERLAYS -#endif - -class WXDLLIMPEXP_FWD_CORE wxCaret; - -class WXDLLIMPEXP_CORE wxCaretTimer : public wxTimer -{ -public: - wxCaretTimer(wxCaret *caret); - virtual void Notify() wxOVERRIDE; - -private: - wxCaret *m_caret; -}; - -class WXDLLIMPEXP_CORE wxCaret : public wxCaretBase -{ -public: - // ctors - // ----- - // default - use Create() - wxCaret() : m_timer(this) { InitGeneric(); } - // creates a block caret associated with the given window - wxCaret(wxWindowBase *window, int width, int height) - : wxCaretBase(window, width, height), m_timer(this) { InitGeneric(); } - wxCaret(wxWindowBase *window, const wxSize& size) - : wxCaretBase(window, size), m_timer(this) { InitGeneric(); } - - virtual ~wxCaret(); - - // implementation - // -------------- - - // called by wxWindow (not using the event tables) - virtual void OnSetFocus() wxOVERRIDE; - virtual void OnKillFocus() wxOVERRIDE; - - // called by wxCaretTimer - void OnTimer(); - -protected: - virtual void DoShow() wxOVERRIDE; - virtual void DoHide() wxOVERRIDE; - virtual void DoMove() wxOVERRIDE; - virtual void DoSize() wxOVERRIDE; - - // blink the caret once - void Blink(); - - // refresh the caret - void Refresh(); - - // draw the caret on the given DC - void DoDraw(wxDC *dc, wxWindow* win); - -private: - // GTK specific initialization - void InitGeneric(); - -#ifdef wxHAS_CARET_USING_OVERLAYS - // the overlay for displaying the caret - wxOverlay m_overlay; -#else - // the bitmap holding the part of window hidden by the caret when it was - // at (m_xOld, m_yOld) - wxBitmap m_bmpUnderCaret; - int m_xOld, - m_yOld; -#endif - - wxCaretTimer m_timer; - bool m_blinkedOut, // true => caret hidden right now - m_hasFocus; // true => our window has focus -}; - -#endif // _WX_CARET_H_ diff --git a/Externals/wxWidgets3/include/wx/generic/choicdgg.h b/Externals/wxWidgets3/include/wx/generic/choicdgg.h deleted file mode 100644 index 114d666230..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/choicdgg.h +++ /dev/null @@ -1,454 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/choicdgg.h -// Purpose: Generic choice dialogs -// Author: Julian Smart -// Modified by: 03.11.00: VZ to add wxArrayString and multiple sel functions -// Created: 01/02/97 -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GENERIC_CHOICDGG_H_ -#define _WX_GENERIC_CHOICDGG_H_ - -#include "wx/dynarray.h" -#include "wx/dialog.h" - -class WXDLLIMPEXP_FWD_CORE wxListBoxBase; - -// ---------------------------------------------------------------------------- -// some (ugly...) constants -// ---------------------------------------------------------------------------- - -#define wxCHOICE_HEIGHT 150 -#define wxCHOICE_WIDTH 200 - -#define wxCHOICEDLG_STYLE \ - (wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxOK | wxCANCEL | wxCENTRE) - -// ---------------------------------------------------------------------------- -// wxAnyChoiceDialog: a base class for dialogs containing a listbox -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxAnyChoiceDialog : public wxDialog -{ -public: - wxAnyChoiceDialog() { } - - wxAnyChoiceDialog(wxWindow *parent, - const wxString& message, - const wxString& caption, - int n, const wxString *choices, - long styleDlg = wxCHOICEDLG_STYLE, - const wxPoint& pos = wxDefaultPosition, - long styleLbox = wxLB_ALWAYS_SB) - { - (void)Create(parent, message, caption, n, choices, - styleDlg, pos, styleLbox); - } - wxAnyChoiceDialog(wxWindow *parent, - const wxString& message, - const wxString& caption, - const wxArrayString& choices, - long styleDlg = wxCHOICEDLG_STYLE, - const wxPoint& pos = wxDefaultPosition, - long styleLbox = wxLB_ALWAYS_SB) - { - (void)Create(parent, message, caption, choices, - styleDlg, pos, styleLbox); - } - - bool Create(wxWindow *parent, - const wxString& message, - const wxString& caption, - int n, const wxString *choices, - long styleDlg = wxCHOICEDLG_STYLE, - const wxPoint& pos = wxDefaultPosition, - long styleLbox = wxLB_ALWAYS_SB); - bool Create(wxWindow *parent, - const wxString& message, - const wxString& caption, - const wxArrayString& choices, - long styleDlg = wxCHOICEDLG_STYLE, - const wxPoint& pos = wxDefaultPosition, - long styleLbox = wxLB_ALWAYS_SB); - -protected: - wxListBoxBase *m_listbox; - - virtual wxListBoxBase *CreateList(int n, - const wxString *choices, - long styleLbox); - - wxDECLARE_NO_COPY_CLASS(wxAnyChoiceDialog); -}; - -// ---------------------------------------------------------------------------- -// wxSingleChoiceDialog: a dialog with single selection listbox -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxSingleChoiceDialog : public wxAnyChoiceDialog -{ -public: - wxSingleChoiceDialog() - { - m_selection = -1; - } - - wxSingleChoiceDialog(wxWindow *parent, - const wxString& message, - const wxString& caption, - int n, - const wxString *choices, - void **clientData = NULL, - long style = wxCHOICEDLG_STYLE, - const wxPoint& pos = wxDefaultPosition) - { - Create(parent, message, caption, n, choices, clientData, style, pos); - } - - wxSingleChoiceDialog(wxWindow *parent, - const wxString& message, - const wxString& caption, - const wxArrayString& choices, - void **clientData = NULL, - long style = wxCHOICEDLG_STYLE, - const wxPoint& pos = wxDefaultPosition) - { - Create(parent, message, caption, choices, clientData, style, pos); - } - - bool Create(wxWindow *parent, - const wxString& message, - const wxString& caption, - int n, - const wxString *choices, - void **clientData = NULL, - long style = wxCHOICEDLG_STYLE, - const wxPoint& pos = wxDefaultPosition); - bool Create(wxWindow *parent, - const wxString& message, - const wxString& caption, - const wxArrayString& choices, - void **clientData = NULL, - long style = wxCHOICEDLG_STYLE, - const wxPoint& pos = wxDefaultPosition); - - void SetSelection(int sel); - int GetSelection() const { return m_selection; } - wxString GetStringSelection() const { return m_stringSelection; } - void* GetSelectionData() const { return m_clientData; } - -#if WXWIN_COMPATIBILITY_2_8 - // Deprecated overloads taking "char**" client data. - wxDEPRECATED_CONSTRUCTOR - ( - wxSingleChoiceDialog(wxWindow *parent, - const wxString& message, - const wxString& caption, - int n, - const wxString *choices, - char **clientData, - long style = wxCHOICEDLG_STYLE, - const wxPoint& pos = wxDefaultPosition) - ) - { - Create(parent, message, caption, n, choices, - (void**)clientData, style, pos); - } - - wxDEPRECATED_CONSTRUCTOR - ( - wxSingleChoiceDialog(wxWindow *parent, - const wxString& message, - const wxString& caption, - const wxArrayString& choices, - char **clientData, - long style = wxCHOICEDLG_STYLE, - const wxPoint& pos = wxDefaultPosition) - ) - { - Create(parent, message, caption, choices, - (void**)clientData, style, pos); - } - - wxDEPRECATED_INLINE - ( - bool Create(wxWindow *parent, - const wxString& message, - const wxString& caption, - int n, - const wxString *choices, - char **clientData, - long style = wxCHOICEDLG_STYLE, - const wxPoint& pos = wxDefaultPosition), - return Create(parent, message, caption, n, choices, - (void**)clientData, style, pos); - ) - - wxDEPRECATED_INLINE - ( - bool Create(wxWindow *parent, - const wxString& message, - const wxString& caption, - const wxArrayString& choices, - char **clientData, - long style = wxCHOICEDLG_STYLE, - const wxPoint& pos = wxDefaultPosition), - return Create(parent, message, caption, choices, - (void**)clientData, style, pos); - ) - - // NB: no need to make it return wxChar, it's untyped - wxDEPRECATED_ACCESSOR - ( - char* GetSelectionClientData() const, - (char*)GetSelectionData() - ) -#endif // WXWIN_COMPATIBILITY_2_8 - - // implementation from now on - void OnOK(wxCommandEvent& event); - void OnListBoxDClick(wxCommandEvent& event); - -protected: - int m_selection; - wxString m_stringSelection; - - void DoChoice(); - -private: - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxSingleChoiceDialog); - wxDECLARE_EVENT_TABLE(); -}; - -// ---------------------------------------------------------------------------- -// wxMultiChoiceDialog: a dialog with multi selection listbox -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxMultiChoiceDialog : public wxAnyChoiceDialog -{ -public: - wxMultiChoiceDialog() { } - - wxMultiChoiceDialog(wxWindow *parent, - const wxString& message, - const wxString& caption, - int n, - const wxString *choices, - long style = wxCHOICEDLG_STYLE, - const wxPoint& pos = wxDefaultPosition) - { - (void)Create(parent, message, caption, n, choices, style, pos); - } - wxMultiChoiceDialog(wxWindow *parent, - const wxString& message, - const wxString& caption, - const wxArrayString& choices, - long style = wxCHOICEDLG_STYLE, - const wxPoint& pos = wxDefaultPosition) - { - (void)Create(parent, message, caption, choices, style, pos); - } - - bool Create(wxWindow *parent, - const wxString& message, - const wxString& caption, - int n, - const wxString *choices, - long style = wxCHOICEDLG_STYLE, - const wxPoint& pos = wxDefaultPosition); - bool Create(wxWindow *parent, - const wxString& message, - const wxString& caption, - const wxArrayString& choices, - long style = wxCHOICEDLG_STYLE, - const wxPoint& pos = wxDefaultPosition); - - void SetSelections(const wxArrayInt& selections); - wxArrayInt GetSelections() const { return m_selections; } - - // implementation from now on - virtual bool TransferDataFromWindow() wxOVERRIDE; - -protected: -#if wxUSE_CHECKLISTBOX - virtual wxListBoxBase *CreateList(int n, - const wxString *choices, - long styleLbox) wxOVERRIDE; -#endif // wxUSE_CHECKLISTBOX - - wxArrayInt m_selections; - -private: - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxMultiChoiceDialog); -}; - -// ---------------------------------------------------------------------------- -// wrapper functions which can be used to get selection(s) from the user -// ---------------------------------------------------------------------------- - -// get the user selection as a string -WXDLLIMPEXP_CORE wxString wxGetSingleChoice(const wxString& message, - const wxString& caption, - const wxArrayString& choices, - wxWindow *parent = NULL, - int x = wxDefaultCoord, - int y = wxDefaultCoord, - bool centre = true, - int width = wxCHOICE_WIDTH, - int height = wxCHOICE_HEIGHT, - int initialSelection = 0); - -WXDLLIMPEXP_CORE wxString wxGetSingleChoice(const wxString& message, - const wxString& caption, - int n, const wxString *choices, - wxWindow *parent = NULL, - int x = wxDefaultCoord, - int y = wxDefaultCoord, - bool centre = true, - int width = wxCHOICE_WIDTH, - int height = wxCHOICE_HEIGHT, - int initialSelection = 0); - -WXDLLIMPEXP_CORE wxString wxGetSingleChoice(const wxString& message, - const wxString& caption, - const wxArrayString& choices, - int initialSelection, - wxWindow *parent = NULL); - -WXDLLIMPEXP_CORE wxString wxGetSingleChoice(const wxString& message, - const wxString& caption, - int n, const wxString *choices, - int initialSelection, - wxWindow *parent = NULL); - -// Same as above but gets position in list of strings, instead of string, -// or -1 if no selection -WXDLLIMPEXP_CORE int wxGetSingleChoiceIndex(const wxString& message, - const wxString& caption, - const wxArrayString& choices, - wxWindow *parent = NULL, - int x = wxDefaultCoord, - int y = wxDefaultCoord, - bool centre = true, - int width = wxCHOICE_WIDTH, - int height = wxCHOICE_HEIGHT, - int initialSelection = 0); - -WXDLLIMPEXP_CORE int wxGetSingleChoiceIndex(const wxString& message, - const wxString& caption, - int n, const wxString *choices, - wxWindow *parent = NULL, - int x = wxDefaultCoord, - int y = wxDefaultCoord, - bool centre = true, - int width = wxCHOICE_WIDTH, - int height = wxCHOICE_HEIGHT, - int initialSelection = 0); - -WXDLLIMPEXP_CORE int wxGetSingleChoiceIndex(const wxString& message, - const wxString& caption, - const wxArrayString& choices, - int initialSelection, - wxWindow *parent = NULL); - -WXDLLIMPEXP_CORE int wxGetSingleChoiceIndex(const wxString& message, - const wxString& caption, - int n, const wxString *choices, - int initialSelection, - wxWindow *parent = NULL); - -// Return client data instead or NULL if canceled -WXDLLIMPEXP_CORE void* wxGetSingleChoiceData(const wxString& message, - const wxString& caption, - const wxArrayString& choices, - void **client_data, - wxWindow *parent = NULL, - int x = wxDefaultCoord, - int y = wxDefaultCoord, - bool centre = true, - int width = wxCHOICE_WIDTH, - int height = wxCHOICE_HEIGHT, - int initialSelection = 0); - -WXDLLIMPEXP_CORE void* wxGetSingleChoiceData(const wxString& message, - const wxString& caption, - int n, const wxString *choices, - void **client_data, - wxWindow *parent = NULL, - int x = wxDefaultCoord, - int y = wxDefaultCoord, - bool centre = true, - int width = wxCHOICE_WIDTH, - int height = wxCHOICE_HEIGHT, - int initialSelection = 0); - -WXDLLIMPEXP_CORE void* wxGetSingleChoiceData(const wxString& message, - const wxString& caption, - const wxArrayString& choices, - void **client_data, - int initialSelection, - wxWindow *parent = NULL); - - -WXDLLIMPEXP_CORE void* wxGetSingleChoiceData(const wxString& message, - const wxString& caption, - int n, const wxString *choices, - void **client_data, - int initialSelection, - wxWindow *parent = NULL); - -// fill the array with the indices of the chosen items, it will be empty -// if no items were selected or Cancel was pressed - return the number of -// selections or -1 if cancelled -WXDLLIMPEXP_CORE int wxGetSelectedChoices(wxArrayInt& selections, - const wxString& message, - const wxString& caption, - int n, const wxString *choices, - wxWindow *parent = NULL, - int x = wxDefaultCoord, - int y = wxDefaultCoord, - bool centre = true, - int width = wxCHOICE_WIDTH, - int height = wxCHOICE_HEIGHT); - -WXDLLIMPEXP_CORE int wxGetSelectedChoices(wxArrayInt& selections, - const wxString& message, - const wxString& caption, - const wxArrayString& choices, - wxWindow *parent = NULL, - int x = wxDefaultCoord, - int y = wxDefaultCoord, - bool centre = true, - int width = wxCHOICE_WIDTH, - int height = wxCHOICE_HEIGHT); - -#if WXWIN_COMPATIBILITY_2_8 -// fill the array with the indices of the chosen items, it will be empty -// if no items were selected or Cancel was pressed - return the number of -// selections -wxDEPRECATED( WXDLLIMPEXP_CORE size_t wxGetMultipleChoices(wxArrayInt& selections, - const wxString& message, - const wxString& caption, - int n, const wxString *choices, - wxWindow *parent = NULL, - int x = wxDefaultCoord, - int y = wxDefaultCoord, - bool centre = true, - int width = wxCHOICE_WIDTH, - int height = wxCHOICE_HEIGHT) ); - -wxDEPRECATED( WXDLLIMPEXP_CORE size_t wxGetMultipleChoices(wxArrayInt& selections, - const wxString& message, - const wxString& caption, - const wxArrayString& choices, - wxWindow *parent = NULL, - int x = wxDefaultCoord, - int y = wxDefaultCoord, - bool centre = true, - int width = wxCHOICE_WIDTH, - int height = wxCHOICE_HEIGHT)); -#endif // WXWIN_COMPATIBILITY_2_8 - -#endif // _WX_GENERIC_CHOICDGG_H_ diff --git a/Externals/wxWidgets3/include/wx/generic/clrpickerg.h b/Externals/wxWidgets3/include/wx/generic/clrpickerg.h deleted file mode 100644 index fd12c0e637..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/clrpickerg.h +++ /dev/null @@ -1,82 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/clrpickerg.h -// Purpose: wxGenericColourButton header -// Author: Francesco Montorsi (based on Vadim Zeitlin's code) -// Modified by: -// Created: 14/4/2006 -// Copyright: (c) Vadim Zeitlin, Francesco Montorsi -// Licence: wxWindows Licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_CLRPICKER_H_ -#define _WX_CLRPICKER_H_ - -#include "wx/button.h" -#include "wx/bmpbuttn.h" -#include "wx/colourdata.h" - -//----------------------------------------------------------------------------- -// wxGenericColourButton: a button which brings up a wxColourDialog -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxGenericColourButton : public wxBitmapButton, - public wxColourPickerWidgetBase -{ -public: - wxGenericColourButton() {} - wxGenericColourButton(wxWindow *parent, - wxWindowID id, - const wxColour& col = *wxBLACK, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxCLRBTN_DEFAULT_STYLE, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxColourPickerWidgetNameStr) - { - Create(parent, id, col, pos, size, style, validator, name); - } - - virtual ~wxGenericColourButton() {} - - -public: // API extensions specific for wxGenericColourButton - - // user can override this to init colour data in a different way - virtual void InitColourData(); - - // returns the colour data shown in wxColourDialog - wxColourData *GetColourData() { return &ms_data; } - - -public: - - bool Create(wxWindow *parent, - wxWindowID id, - const wxColour& col = *wxBLACK, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxCLRBTN_DEFAULT_STYLE, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxColourPickerWidgetNameStr); - - void OnButtonClick(wxCommandEvent &); - - -protected: - wxBitmap m_bitmap; - - wxSize DoGetBestSize() const; - - void UpdateColour(); - - // the colour data shown in wxColourPickerCtrlGeneric - // controls. This member is static so that all colour pickers - // in the program share the same set of custom colours. - static wxColourData ms_data; - -private: - wxDECLARE_DYNAMIC_CLASS(wxGenericColourButton); -}; - - -#endif // _WX_CLRPICKER_H_ diff --git a/Externals/wxWidgets3/include/wx/generic/collheaderctrl.h b/Externals/wxWidgets3/include/wx/generic/collheaderctrl.h deleted file mode 100644 index b2dd3582c2..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/collheaderctrl.h +++ /dev/null @@ -1,83 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/collheaderctrl.h -// Purpose: wxGenericCollapsibleHeaderCtrl -// Author: Tobias Taschner -// Created: 2015-09-19 -// Copyright: (c) 2015 wxWidgets development team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GENERIC_COLLAPSIBLEHEADER_CTRL_H_ -#define _WX_GENERIC_COLLAPSIBLEHEADER_CTRL_H_ - -class WXDLLIMPEXP_CORE wxGenericCollapsibleHeaderCtrl - : public wxCollapsibleHeaderCtrlBase -{ -public: - wxGenericCollapsibleHeaderCtrl() { Init(); } - - wxGenericCollapsibleHeaderCtrl(wxWindow *parent, - wxWindowID id, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxBORDER_NONE, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxCollapsibleHeaderCtrlNameStr) - { - Init(); - - Create(parent, id, label, pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxBORDER_NONE, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxCollapsibleHeaderCtrlNameStr); - - virtual void SetCollapsed(bool collapsed = true) wxOVERRIDE; - - virtual bool IsCollapsed() const wxOVERRIDE - { return m_collapsed; } - -protected: - - virtual wxSize DoGetBestClientSize() const wxOVERRIDE; - -private: - bool m_collapsed; - bool m_inWindow; - bool m_mouseDown; - - void Init(); - - void OnPaint(wxPaintEvent& event); - - // Handle set/kill focus events (invalidate for painting focus rect) - void OnFocus(wxFocusEvent& event); - - // Handle click - void OnLeftUp(wxMouseEvent& event); - - // Handle pressed state - void OnLeftDown(wxMouseEvent& event); - - // Handle current state - void OnEnterWindow(wxMouseEvent& event); - - void OnLeaveWindow(wxMouseEvent& event); - - // Toggle on space - void OnChar(wxKeyEvent& event); - - void DoSetCollapsed(bool collapsed); - - wxDECLARE_NO_COPY_CLASS(wxGenericCollapsibleHeaderCtrl); -}; - - -#endif // _WX_GENERIC_COLLAPSIBLEHEADER_CTRL_H_ diff --git a/Externals/wxWidgets3/include/wx/generic/collpaneg.h b/Externals/wxWidgets3/include/wx/generic/collpaneg.h deleted file mode 100644 index 7b14cc1b0e..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/collpaneg.h +++ /dev/null @@ -1,98 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/collpaneg.h -// Purpose: wxGenericCollapsiblePane -// Author: Francesco Montorsi -// Modified by: -// Created: 8/10/2006 -// Copyright: (c) Francesco Montorsi -// Licence: wxWindows Licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_COLLAPSABLE_PANE_H_GENERIC_ -#define _WX_COLLAPSABLE_PANE_H_GENERIC_ - -// forward declared -class WXDLLIMPEXP_FWD_CORE wxCollapsibleHeaderCtrl; -class WXDLLIMPEXP_FWD_CORE wxStaticLine; - -#include "wx/containr.h" - -// ---------------------------------------------------------------------------- -// wxGenericCollapsiblePane -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxGenericCollapsiblePane : - public wxNavigationEnabled -{ -public: - wxGenericCollapsiblePane() { Init(); } - - wxGenericCollapsiblePane(wxWindow *parent, - wxWindowID winid, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxCP_DEFAULT_STYLE, - const wxValidator& val = wxDefaultValidator, - const wxString& name = wxCollapsiblePaneNameStr) - { - Init(); - - Create(parent, winid, label, pos, size, style, val, name); - } - - virtual ~wxGenericCollapsiblePane(); - - bool Create(wxWindow *parent, - wxWindowID winid, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxCP_DEFAULT_STYLE, - const wxValidator& val = wxDefaultValidator, - const wxString& name = wxCollapsiblePaneNameStr); - - // public wxCollapsiblePane API - virtual void Collapse(bool collapse = true) wxOVERRIDE; - virtual void SetLabel(const wxString &label) wxOVERRIDE; - - virtual bool IsCollapsed() const wxOVERRIDE - { return m_pPane==NULL || !m_pPane->IsShown(); } - virtual wxWindow *GetPane() const wxOVERRIDE - { return m_pPane; } - virtual wxString GetLabel() const wxOVERRIDE; - - virtual bool Layout() wxOVERRIDE; - - - // for the generic collapsible pane only: - wxControl* GetControlWidget() const - { return (wxControl*)m_pButton; } - - // implementation only, don't use - void OnStateChange(const wxSize& sizeNew); - -protected: - // overridden methods - virtual wxSize DoGetBestSize() const wxOVERRIDE; - - int GetBorder() const; - - // child controls - wxCollapsibleHeaderCtrl *m_pButton; - wxStaticLine *m_pStaticLine; - wxWindow *m_pPane; - wxSizer *m_sz; - -private: - void Init(); - - // event handlers - void OnButton(wxCommandEvent &ev); - void OnSize(wxSizeEvent &ev); - - wxDECLARE_DYNAMIC_CLASS(wxGenericCollapsiblePane); - wxDECLARE_EVENT_TABLE(); -}; - -#endif // _WX_COLLAPSABLE_PANE_H_GENERIC_ diff --git a/Externals/wxWidgets3/include/wx/generic/colour.h b/Externals/wxWidgets3/include/wx/generic/colour.h deleted file mode 100644 index 8ef0ccb7c6..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/colour.h +++ /dev/null @@ -1,71 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/colour.h -// Purpose: wxColour class -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GENERIC_COLOUR_H_ -#define _WX_GENERIC_COLOUR_H_ - -#include "wx/object.h" - -// Colour -class WXDLLIMPEXP_CORE wxColour: public wxColourBase -{ -public: - // constructors - // ------------ - DEFINE_STD_WXCOLOUR_CONSTRUCTORS - - // copy ctors and assignment operators - wxColour(const wxColour& col) - { - *this = col; - } - - wxColour& operator=(const wxColour& col); - - // accessors - virtual bool IsOk() const { return m_isInit; } - - unsigned char Red() const { return m_red; } - unsigned char Green() const { return m_green; } - unsigned char Blue() const { return m_blue; } - unsigned char Alpha() const { return m_alpha; } - - // comparison - bool operator==(const wxColour& colour) const - { - return (m_red == colour.m_red && - m_green == colour.m_green && - m_blue == colour.m_blue && - m_alpha == colour.m_alpha && - m_isInit == colour.m_isInit); - } - - bool operator!=(const wxColour& colour) const { return !(*this == colour); } - -protected: - - // Helper function - void Init(); - - virtual void - InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a); - -private: - bool m_isInit; - unsigned char m_red; - unsigned char m_blue; - unsigned char m_green; - unsigned char m_alpha; - -private: - wxDECLARE_DYNAMIC_CLASS(wxColour); -}; - -#endif // _WX_GENERIC_COLOUR_H_ diff --git a/Externals/wxWidgets3/include/wx/generic/colrdlgg.h b/Externals/wxWidgets3/include/wx/generic/colrdlgg.h deleted file mode 100644 index 10657529ed..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/colrdlgg.h +++ /dev/null @@ -1,133 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/colrdlgg.h -// Purpose: wxGenericColourDialog -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_COLORDLGG_H_ -#define _WX_COLORDLGG_H_ - -#include "wx/gdicmn.h" -#include "wx/dialog.h" - -#if wxUSE_SLIDER - class WXDLLIMPEXP_FWD_CORE wxSlider; -#endif // wxUSE_SLIDER - -// Preview with opacity is possible only if wxGCDC and wxStaticBitmap are -// available and currently it only works in wxOSX and wxMSW as it uses wxBitmap -// UseAlpha() and HasAlpha() methods which only these ports provide. -#define wxCLRDLGG_USE_PREVIEW_WITH_ALPHA \ - ((wxUSE_GRAPHICS_CONTEXT && wxUSE_STATBMP) && \ - (defined(__WXMSW__) || defined(__WXOSX__))) - -#if wxCLRDLGG_USE_PREVIEW_WITH_ALPHA -class wxStaticBitmap; -#endif // wxCLRDLGG_USE_PREVIEW_WITH_ALPHA - -class WXDLLIMPEXP_CORE wxGenericColourDialog : public wxDialog -{ -public: - wxGenericColourDialog(); - wxGenericColourDialog(wxWindow *parent, - wxColourData *data = NULL); - virtual ~wxGenericColourDialog(); - - bool Create(wxWindow *parent, wxColourData *data = NULL); - - wxColourData &GetColourData() { return m_colourData; } - - virtual int ShowModal() wxOVERRIDE; - - // Internal functions - void OnMouseEvent(wxMouseEvent& event); - void OnPaint(wxPaintEvent& event); -#if wxCLRDLGG_USE_PREVIEW_WITH_ALPHA - void OnCustomColourMouseClick(wxMouseEvent& event); -#endif // wxCLRDLGG_USE_PREVIEW_WITH_ALPHA - - virtual void CalculateMeasurements(); - virtual void CreateWidgets(); - virtual void InitializeColours(); - - virtual void PaintBasicColours(wxDC& dc); -#if !wxCLRDLGG_USE_PREVIEW_WITH_ALPHA - virtual void PaintCustomColours(wxDC& dc, int clrIndex = -1); -#endif // !wxCLRDLGG_USE_PREVIEW_WITH_ALPHA - virtual void PaintCustomColour(wxDC& dc); - virtual void PaintHighlight(wxDC& dc, bool draw); - - virtual void OnBasicColourClick(int which); - virtual void OnCustomColourClick(int which); - - void OnAddCustom(wxCommandEvent& event); - -#if wxUSE_SLIDER - void OnRedSlider(wxCommandEvent& event); - void OnGreenSlider(wxCommandEvent& event); - void OnBlueSlider(wxCommandEvent& event); - void OnAlphaSlider(wxCommandEvent& event); -#endif // wxUSE_SLIDER - - void OnCloseWindow(wxCloseEvent& event); - -#if wxCLRDLGG_USE_PREVIEW_WITH_ALPHA - void DoPreviewBitmap(wxBitmap& bmp, const wxColour& colour); -#endif // wxCLRDLGG_USE_PREVIEW_WITH_ALPHA - -protected: - wxColourData m_colourData; - - // Area reserved for grids of colours - wxRect m_standardColoursRect; - wxRect m_customColoursRect; - wxRect m_singleCustomColourRect; - - // Size of each colour rectangle - wxSize m_smallRectangleSize; - - // Grid spacing (between rectangles) - int m_gridSpacing; - - // Section spacing (between left and right halves of dialog box) - int m_sectionSpacing; - - // 48 'standard' colours - wxColour m_standardColours[48]; - - // 16 'custom' colours - wxColour m_customColours[16]; - - // Which colour is selected? An index into one of the two areas. - int m_colourSelection; - int m_whichKind; // 1 for standard colours, 2 for custom colours, - -#if wxUSE_SLIDER - wxSlider *m_redSlider; - wxSlider *m_greenSlider; - wxSlider *m_blueSlider; - wxSlider *m_alphaSlider; -#endif // wxUSE_SLIDER -#if wxCLRDLGG_USE_PREVIEW_WITH_ALPHA - // Bitmap to preview selected colour (with alpha channel) - wxStaticBitmap *m_customColourBmp; - // Bitmaps to preview custom colours (with alpha channel) - wxStaticBitmap *m_customColoursBmp[16]; -#endif // wxCLRDLGG_USE_PREVIEW_WITH_ALPHA - - int m_buttonY; - - int m_okButtonX; - int m_customButtonX; - - // static bool colourDialogCancelled; - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_DYNAMIC_CLASS(wxGenericColourDialog); -}; - -#endif // _WX_COLORDLGG_H_ diff --git a/Externals/wxWidgets3/include/wx/generic/combo.h b/Externals/wxWidgets3/include/wx/generic/combo.h deleted file mode 100644 index 92b3ff624e..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/combo.h +++ /dev/null @@ -1,170 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/combo.h -// Purpose: Generic wxComboCtrl -// Author: Jaakko Salli -// Modified by: -// Created: Apr-30-2006 -// Copyright: (c) Jaakko Salli -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GENERIC_COMBOCTRL_H_ -#define _WX_GENERIC_COMBOCTRL_H_ - -#if wxUSE_COMBOCTRL - -// Only define generic if native doesn't have all the features -#if !defined(wxCOMBOCONTROL_FULLY_FEATURED) - -// ---------------------------------------------------------------------------- -// Generic wxComboCtrl -// ---------------------------------------------------------------------------- - -#if defined(__WXUNIVERSAL__) - -// all actions of single line text controls are supported - -// popup/dismiss the choice window -#define wxACTION_COMBOBOX_POPUP wxT("popup") -#define wxACTION_COMBOBOX_DISMISS wxT("dismiss") - -#endif - -#include "wx/dcbuffer.h" - -extern WXDLLIMPEXP_DATA_CORE(const char) wxComboBoxNameStr[]; - -class WXDLLIMPEXP_CORE wxGenericComboCtrl : public wxComboCtrlBase -{ -public: - // ctors and such - wxGenericComboCtrl() : wxComboCtrlBase() { Init(); } - - wxGenericComboCtrl(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxComboBoxNameStr) - : wxComboCtrlBase() - { - Init(); - - (void)Create(parent, id, value, pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxComboBoxNameStr); - - virtual ~wxGenericComboCtrl(); - - void SetCustomPaintWidth( int width ); - - virtual bool IsKeyPopupToggle(const wxKeyEvent& event) const wxOVERRIDE; - - static int GetFeatures() { return wxComboCtrlFeatures::All; } - -#if defined(__WXUNIVERSAL__) - // we have our own input handler and our own actions - virtual bool PerformAction(const wxControlAction& action, - long numArg = 0l, - const wxString& strArg = wxEmptyString); -#endif - -protected: - - // Dummies for platform-specific wxTextEntry implementations -#if defined(__WXUNIVERSAL__) - // Looks like there's nothing we need to override here -#elif defined(__WXMOTIF__) - virtual WXWidget GetTextWidget() const { return NULL; } -#elif defined(__WXGTK__) -#if defined(__WXGTK20__) - virtual GtkEditable *GetEditable() const wxOVERRIDE { return NULL; } - virtual GtkEntry *GetEntry() const wxOVERRIDE { return NULL; } -#endif -#elif defined(__WXMAC__) - // Looks like there's nothing we need to override here -#endif - - // For better transparent background rendering - virtual bool HasTransparentBackground() wxOVERRIDE - { - #if wxALWAYS_NATIVE_DOUBLE_BUFFER - #ifdef __WXGTK__ - // Sanity check for GTK+ - return IsDoubleBuffered(); - #else - return true; - #endif - #else - return false; - #endif - } - - // Mandatory virtuals - virtual void OnResize() wxOVERRIDE; - - // Event handlers - void OnPaintEvent( wxPaintEvent& event ); - void OnMouseEvent( wxMouseEvent& event ); - -private: - void Init(); - - wxDECLARE_EVENT_TABLE(); - - wxDECLARE_DYNAMIC_CLASS(wxGenericComboCtrl); -}; - - -#ifndef _WX_COMBOCONTROL_H_ - -// If native wxComboCtrl was not defined, then prepare a simple -// front-end so that wxRTTI works as expected. - -class WXDLLIMPEXP_CORE wxComboCtrl : public wxGenericComboCtrl -{ -public: - wxComboCtrl() : wxGenericComboCtrl() {} - - wxComboCtrl(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxComboBoxNameStr) - : wxGenericComboCtrl() - { - (void)Create(parent, id, value, pos, size, style, validator, name); - } - - virtual ~wxComboCtrl() {} - -protected: - -private: - wxDECLARE_DYNAMIC_CLASS(wxComboCtrl); -}; - -#endif // _WX_COMBOCONTROL_H_ - -#else - -#define wxGenericComboCtrl wxComboCtrl - -#endif // !defined(wxCOMBOCONTROL_FULLY_FEATURED) - -#endif // wxUSE_COMBOCTRL -#endif - // _WX_GENERIC_COMBOCTRL_H_ diff --git a/Externals/wxWidgets3/include/wx/generic/ctrlsub.h b/Externals/wxWidgets3/include/wx/generic/ctrlsub.h deleted file mode 100644 index 0dd113dcf9..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/ctrlsub.h +++ /dev/null @@ -1,122 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/ctrlsub.h -// Purpose: common functionality of wxItemContainer-derived controls -// Author: Vadim Zeitlin -// Created: 2007-07-25 -// Copyright: (c) 2007 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GENERIC_CTRLSUB_H_ -#define _WX_GENERIC_CTRLSUB_H_ - -#include "wx/dynarray.h" - -// ---------------------------------------------------------------------------- -// wxControlWithItemsGeneric: generic implementation of item client data -// ---------------------------------------------------------------------------- - -class wxControlWithItemsGeneric : public wxControlWithItemsBase -{ -public: - wxControlWithItemsGeneric() { } - - virtual void DoInitItemClientData() - { - m_itemsClientData.resize(GetCount(), NULL); - } - - virtual void DoSetItemClientData(unsigned int n, void *clientData) - { - m_itemsClientData[n] = clientData; - } - - virtual void *DoGetItemClientData(unsigned int n) const - { - return m_itemsClientData[n]; - } - - virtual void DoClear() { m_itemsClientData.clear(); } - virtual void DoDeleteOneItem(unsigned int pos) - { - if ( HasClientData() ) - m_itemsClientData.RemoveAt(pos); - } - -protected: - // preallocate memory for numItems new items: this should be called from - // the derived classes DoInsertItems() to speed up appending big numbers of - // items with client data; it is safe to call even if we don't use client - // data at all and does nothing in this case - void AllocClientData(unsigned int numItems) - { - if ( HasClientData() ) - m_itemsClientData.reserve(m_itemsClientData.size() + numItems); - } - - // this must be called by derived classes when a new item is added to the - // control to add storage for the corresponding client data pointer (before - // inserting many items, call AllocClientData()) - void InsertNewItemClientData(unsigned int pos, - void **clientData, - unsigned int n, - wxClientDataType type) - { - if ( InitClientDataIfNeeded(type) ) - m_itemsClientData.Insert(clientData[n], pos); - } - - // the same as InsertNewItemClientData() but for numItems consecutive items - // (this can only be used if the control doesn't support sorting as - // otherwise the items positions wouldn't be consecutive any more) - void InsertNewItemsClientData(unsigned int pos, - unsigned int numItems, - void **clientData, - wxClientDataType type) - { - if ( InitClientDataIfNeeded(type) ) - { - // it's more efficient to insert everything at once and then update - // for big number of items to avoid moving the array contents - // around (which would result in O(N^2) algorithm) - m_itemsClientData.Insert(NULL, pos, numItems); - - for ( unsigned int n = 0; n < numItems; ++n, ++pos ) - m_itemsClientData[pos] = clientData[n]; - } - } - - - // vector containing the client data pointers: it is either empty (if - // client data is not used) or has the same number of elements as the - // control - wxArrayPtrVoid m_itemsClientData; - -private: - // initialize client data if needed, return false if we don't have any - // client data and true otherwise - bool InitClientDataIfNeeded(wxClientDataType type) - { - if ( !HasClientData() ) - { - if ( type == wxClientData_None ) - { - // we didn't have the client data before and are not asked to - // store it now neither - return false; - } - - // this is the first time client data is used with this control - DoInitItemClientData(); - SetClientDataType(type); - } - //else: we already have client data - - return true; - } - - wxDECLARE_NO_COPY_CLASS(wxControlWithItemsGeneric); -}; - -#endif // _WX_GENERIC_CTRLSUB_H_ - diff --git a/Externals/wxWidgets3/include/wx/generic/custombgwin.h b/Externals/wxWidgets3/include/wx/generic/custombgwin.h deleted file mode 100644 index d274313069..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/custombgwin.h +++ /dev/null @@ -1,98 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/custombgwin.h -// Purpose: Generic implementation of wxCustomBackgroundWindow. -// Author: Vadim Zeitlin -// Created: 2011-10-10 -// Copyright: (c) 2011 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GENERIC_CUSTOMBGWIN_H_ -#define _WX_GENERIC_CUSTOMBGWIN_H_ - -#include "wx/bitmap.h" -#include "wx/dc.h" -#include "wx/event.h" -#include "wx/window.h" - -// A helper to avoid template bloat: this class contains all type-independent -// code of wxCustomBackgroundWindow<> below. -class wxCustomBackgroundWindowGenericBase : public wxCustomBackgroundWindowBase -{ -public: - wxCustomBackgroundWindowGenericBase() { } - -protected: - void DoEraseBackground(wxEraseEvent& event, wxWindow* win) - { - wxDC& dc = *event.GetDC(); - - const wxSize clientSize = win->GetClientSize(); - const wxSize bitmapSize = m_bitmapBg.GetSize(); - - for ( int x = 0; x < clientSize.x; x += bitmapSize.x ) - { - for ( int y = 0; y < clientSize.y; y += bitmapSize.y ) - { - dc.DrawBitmap(m_bitmapBg, x, y); - } - } - } - - - // The bitmap used for painting the background if valid. - wxBitmap m_bitmapBg; - - - wxDECLARE_NO_COPY_CLASS(wxCustomBackgroundWindowGenericBase); -}; - -// ---------------------------------------------------------------------------- -// wxCustomBackgroundWindow -// ---------------------------------------------------------------------------- - -template -class wxCustomBackgroundWindow : public W, - public wxCustomBackgroundWindowGenericBase -{ -public: - typedef W BaseWindowClass; - - wxCustomBackgroundWindow() { } - -protected: - virtual void DoSetBackgroundBitmap(const wxBitmap& bmp) - { - m_bitmapBg = bmp; - - if ( m_bitmapBg.IsOk() ) - { - BaseWindowClass::Connect - ( - wxEVT_ERASE_BACKGROUND, - wxEraseEventHandler(wxCustomBackgroundWindow::OnEraseBackground) - ); - } - else - { - BaseWindowClass::Disconnect - ( - wxEVT_ERASE_BACKGROUND, - wxEraseEventHandler(wxCustomBackgroundWindow::OnEraseBackground) - ); - } - } - -private: - // Event handler for erasing the background which is only used when we have - // a valid background bitmap. - void OnEraseBackground(wxEraseEvent& event) - { - DoEraseBackground(event, this); - } - - - wxDECLARE_NO_COPY_TEMPLATE_CLASS(wxCustomBackgroundWindow, W); -}; - -#endif // _WX_GENERIC_CUSTOMBGWIN_H_ diff --git a/Externals/wxWidgets3/include/wx/generic/dataview.h b/Externals/wxWidgets3/include/wx/generic/dataview.h deleted file mode 100644 index c4ec501229..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/dataview.h +++ /dev/null @@ -1,309 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/dataview.h -// Purpose: wxDataViewCtrl generic implementation header -// Author: Robert Roebling -// Modified By: Bo Yang -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __GENERICDATAVIEWCTRLH__ -#define __GENERICDATAVIEWCTRLH__ - -#include "wx/defs.h" -#include "wx/object.h" -#include "wx/list.h" -#include "wx/control.h" -#include "wx/scrolwin.h" -#include "wx/icon.h" -#include "wx/vector.h" - -class WXDLLIMPEXP_FWD_ADV wxDataViewMainWindow; -class WXDLLIMPEXP_FWD_ADV wxDataViewHeaderWindow; - -// --------------------------------------------------------- -// wxDataViewColumn -// --------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDataViewColumn : public wxDataViewColumnBase -{ -public: - wxDataViewColumn(const wxString& title, - wxDataViewRenderer *renderer, - unsigned int model_column, - int width = wxDVC_DEFAULT_WIDTH, - wxAlignment align = wxALIGN_CENTER, - int flags = wxDATAVIEW_COL_RESIZABLE) - : wxDataViewColumnBase(renderer, model_column), - m_title(title) - { - Init(width, align, flags); - } - - wxDataViewColumn(const wxBitmap& bitmap, - wxDataViewRenderer *renderer, - unsigned int model_column, - int width = wxDVC_DEFAULT_WIDTH, - wxAlignment align = wxALIGN_CENTER, - int flags = wxDATAVIEW_COL_RESIZABLE) - : wxDataViewColumnBase(bitmap, renderer, model_column) - { - Init(width, align, flags); - } - - // implement wxHeaderColumnBase methods - virtual void SetTitle(const wxString& title) { m_title = title; UpdateDisplay(); } - virtual wxString GetTitle() const { return m_title; } - - virtual void SetWidth(int width) { m_width = width; UpdateDisplay(); } - virtual int GetWidth() const; - - virtual void SetMinWidth(int minWidth) { m_minWidth = minWidth; UpdateDisplay(); } - virtual int GetMinWidth() const { return m_minWidth; } - - virtual void SetAlignment(wxAlignment align) { m_align = align; UpdateDisplay(); } - virtual wxAlignment GetAlignment() const { return m_align; } - - virtual void SetFlags(int flags) { m_flags = flags; UpdateDisplay(); } - virtual int GetFlags() const { return m_flags; } - - virtual bool IsSortKey() const { return m_sort; } - - virtual void UnsetAsSortKey(); - - virtual void SetSortOrder(bool ascending); - - virtual bool IsSortOrderAscending() const { return m_sortAscending; } - - virtual void SetBitmap( const wxBitmap& bitmap ) { wxDataViewColumnBase::SetBitmap(bitmap); UpdateDisplay(); } - - -private: - // common part of all ctors - void Init(int width, wxAlignment align, int flags); - - void UpdateDisplay(); - - wxString m_title; - int m_width, - m_minWidth; - wxAlignment m_align; - int m_flags; - bool m_sort, - m_sortAscending; - - friend class wxDataViewHeaderWindowBase; - friend class wxDataViewHeaderWindow; - friend class wxDataViewHeaderWindowMSW; -}; - -// --------------------------------------------------------- -// wxDataViewCtrl -// --------------------------------------------------------- - -WX_DECLARE_LIST_WITH_DECL(wxDataViewColumn, wxDataViewColumnList, - class WXDLLIMPEXP_ADV); - -class WXDLLIMPEXP_ADV wxDataViewCtrl : public wxDataViewCtrlBase, - public wxScrollHelper -{ - friend class wxDataViewMainWindow; - friend class wxDataViewHeaderWindowBase; - friend class wxDataViewHeaderWindow; - friend class wxDataViewHeaderWindowMSW; - friend class wxDataViewColumn; - -public: - wxDataViewCtrl() : wxScrollHelper(this) - { - Init(); - } - - wxDataViewCtrl( wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxDataViewCtrlNameStr ) - : wxScrollHelper(this) - { - Create(parent, id, pos, size, style, validator, name); - } - - virtual ~wxDataViewCtrl(); - - void Init(); - - bool Create(wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxDataViewCtrlNameStr); - - virtual bool AssociateModel( wxDataViewModel *model ); - - virtual bool AppendColumn( wxDataViewColumn *col ); - virtual bool PrependColumn( wxDataViewColumn *col ); - virtual bool InsertColumn( unsigned int pos, wxDataViewColumn *col ); - - virtual void DoSetExpanderColumn(); - virtual void DoSetIndent(); - - virtual unsigned int GetColumnCount() const; - virtual wxDataViewColumn* GetColumn( unsigned int pos ) const; - virtual bool DeleteColumn( wxDataViewColumn *column ); - virtual bool ClearColumns(); - virtual int GetColumnPosition( const wxDataViewColumn *column ) const; - - virtual wxDataViewColumn *GetSortingColumn() const; - virtual wxVector GetSortingColumns() const; - - virtual int GetSelectedItemsCount() const; - virtual int GetSelections( wxDataViewItemArray & sel ) const; - virtual void SetSelections( const wxDataViewItemArray & sel ); - virtual void Select( const wxDataViewItem & item ); - virtual void Unselect( const wxDataViewItem & item ); - virtual bool IsSelected( const wxDataViewItem & item ) const; - - virtual void SelectAll(); - virtual void UnselectAll(); - - virtual void EnsureVisible( const wxDataViewItem & item, - const wxDataViewColumn *column = NULL ); - virtual void HitTest( const wxPoint & point, wxDataViewItem & item, - wxDataViewColumn* &column ) const; - virtual wxRect GetItemRect( const wxDataViewItem & item, - const wxDataViewColumn *column = NULL ) const; - - virtual bool SetRowHeight( int rowHeight ); - - virtual void Expand( const wxDataViewItem & item ); - virtual void Collapse( const wxDataViewItem & item ); - virtual bool IsExpanded( const wxDataViewItem & item ) const; - - virtual void SetFocus(); - - virtual bool SetFont(const wxFont & font); - - virtual bool AllowMultiColumnSort(bool allow); - virtual bool IsMultiColumnSortAllowed() { return m_allowMultiColumnSort; } - virtual void ToggleSortByColumn(int column); - -#if wxUSE_DRAG_AND_DROP - virtual bool EnableDragSource( const wxDataFormat &format ); - virtual bool EnableDropTarget( const wxDataFormat &format ); -#endif // wxUSE_DRAG_AND_DROP - - virtual wxBorder GetDefaultBorder() const; - - virtual void EditItem(const wxDataViewItem& item, const wxDataViewColumn *column); - - // These methods are specific to generic wxDataViewCtrl implementation and - // should not be used in portable code. - wxColour GetAlternateRowColour() const { return m_alternateRowColour; } - void SetAlternateRowColour(const wxColour& colour); - -protected: - virtual void EnsureVisible( int row, int column ); - - // Notice that row here may be invalid (i.e. >= GetRowCount()), this is not - // an error and this function simply returns an invalid item in this case. - virtual wxDataViewItem GetItemByRow( unsigned int row ) const; - virtual int GetRowByItem( const wxDataViewItem & item ) const; - - // Mark the column as being used or not for sorting. - void UseColumnForSorting(int idx); - void DontUseColumnForSorting(int idx); - - // Return true if the given column is sorted - bool IsColumnSorted(int idx) const; - - // Reset all columns currently used for sorting. - void ResetAllSortColumns(); - - virtual void DoEnableSystemTheme(bool enable, wxWindow* window) wxOVERRIDE; - -public: // utility functions not part of the API - - // returns the "best" width for the idx-th column - unsigned int GetBestColumnWidth(int idx) const; - - // called by header window after reorder - void ColumnMoved( wxDataViewColumn* col, unsigned int new_pos ); - - // update the display after a change to an individual column - void OnColumnChange(unsigned int idx); - - // update after a change to the number of columns - void OnColumnsCountChanged(); - - wxWindow *GetMainWindow() { return (wxWindow*) m_clientArea; } - - // return the index of the given column in m_cols - int GetColumnIndex(const wxDataViewColumn *column) const; - - // Return the index of the column having the given model index. - int GetModelColumnIndex(unsigned int model_column) const; - - // return the column displayed at the given position in the control - wxDataViewColumn *GetColumnAt(unsigned int pos) const; - - virtual wxDataViewColumn *GetCurrentColumn() const; - - virtual void OnInternalIdle(); - -private: - virtual wxDataViewItem DoGetCurrentItem() const; - virtual void DoSetCurrentItem(const wxDataViewItem& item); - - void InvalidateColBestWidths(); - void InvalidateColBestWidth(int idx); - void UpdateColWidths(); - - wxDataViewColumnList m_cols; - // cached column best widths information, values are for - // respective columns from m_cols and the arrays have same size - struct CachedColWidthInfo - { - CachedColWidthInfo() : width(0), dirty(true) {} - int width; // cached width or 0 if not computed - bool dirty; // column was invalidated, header needs updating - }; - wxVector m_colsBestWidths; - // This indicates that at least one entry in m_colsBestWidths has 'dirty' - // flag set. It's cheaper to check one flag in OnInternalIdle() than to - // iterate over m_colsBestWidths to check if anything needs to be done. - bool m_colsDirty; - - wxDataViewModelNotifier *m_notifier; - wxDataViewMainWindow *m_clientArea; - wxDataViewHeaderWindow *m_headerArea; - - // user defined color to draw row lines, may be invalid - wxColour m_alternateRowColour; - - // columns indices used for sorting, empty if nothing is sorted - wxVector m_sortingColumnIdxs; - - // if true, allow sorting by more than one column - bool m_allowMultiColumnSort; - -private: - void OnSize( wxSizeEvent &event ); - virtual wxSize GetSizeAvailableForScrollTarget(const wxSize& size); - - // we need to return a special WM_GETDLGCODE value to process just the - // arrows but let the other navigation characters through -#ifdef __WXMSW__ - virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); -#endif // __WXMSW__ - - WX_FORWARD_TO_SCROLL_HELPER() - -private: - wxDECLARE_DYNAMIC_CLASS(wxDataViewCtrl); - wxDECLARE_NO_COPY_CLASS(wxDataViewCtrl); - wxDECLARE_EVENT_TABLE(); -}; - - -#endif // __GENERICDATAVIEWCTRLH__ diff --git a/Externals/wxWidgets3/include/wx/generic/datectrl.h b/Externals/wxWidgets3/include/wx/generic/datectrl.h deleted file mode 100644 index 61a4ad18c9..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/datectrl.h +++ /dev/null @@ -1,96 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/datectrl.h -// Purpose: generic wxDatePickerCtrl implementation -// Author: Andreas Pflug -// Modified by: -// Created: 2005-01-19 -// Copyright: (c) 2005 Andreas Pflug -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GENERIC_DATECTRL_H_ -#define _WX_GENERIC_DATECTRL_H_ - -#include "wx/compositewin.h" - -class WXDLLIMPEXP_FWD_CORE wxComboCtrl; - -class WXDLLIMPEXP_FWD_ADV wxCalendarCtrl; -class WXDLLIMPEXP_FWD_ADV wxCalendarComboPopup; - -class WXDLLIMPEXP_ADV wxDatePickerCtrlGeneric - : public wxCompositeWindow -{ -public: - // creating the control - wxDatePickerCtrlGeneric() { Init(); } - virtual ~wxDatePickerCtrlGeneric(); - wxDatePickerCtrlGeneric(wxWindow *parent, - wxWindowID id, - const wxDateTime& date = wxDefaultDateTime, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDP_DEFAULT | wxDP_SHOWCENTURY, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxDatePickerCtrlNameStr) - { - Init(); - - (void)Create(parent, id, date, pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxDateTime& date = wxDefaultDateTime, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDP_DEFAULT | wxDP_SHOWCENTURY, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxDatePickerCtrlNameStr); - - // wxDatePickerCtrl methods - void SetValue(const wxDateTime& date) wxOVERRIDE; - wxDateTime GetValue() const wxOVERRIDE; - - bool GetRange(wxDateTime *dt1, wxDateTime *dt2) const wxOVERRIDE; - void SetRange(const wxDateTime &dt1, const wxDateTime &dt2) wxOVERRIDE; - - bool SetDateRange(const wxDateTime& lowerdate = wxDefaultDateTime, - const wxDateTime& upperdate = wxDefaultDateTime); - - // extra methods available only in this (generic) implementation - wxCalendarCtrl *GetCalendar() const; - - - // implementation only from now on - // ------------------------------- - - // overridden base class methods - virtual bool Destroy() wxOVERRIDE; - -protected: - virtual wxSize DoGetBestSize() const wxOVERRIDE; - -private: - void Init(); - - // return the list of the windows composing this one - virtual wxWindowList GetCompositeWindowParts() const wxOVERRIDE; - - void OnText(wxCommandEvent &event); - void OnSize(wxSizeEvent& event); - void OnFocus(wxFocusEvent& event); - -#ifdef __WXOSX_COCOA__ - virtual void OSXGenerateEvent(const wxDateTime& WXUNUSED(dt)) wxOVERRIDE { } -#endif - - wxComboCtrl* m_combo; - wxCalendarComboPopup* m_popup; - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_NO_COPY_CLASS(wxDatePickerCtrlGeneric); -}; - -#endif // _WX_GENERIC_DATECTRL_H_ - diff --git a/Externals/wxWidgets3/include/wx/generic/dcpsg.h b/Externals/wxWidgets3/include/wx/generic/dcpsg.h deleted file mode 100644 index 5eb3463ee2..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/dcpsg.h +++ /dev/null @@ -1,159 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/dcpsg.h -// Purpose: wxPostScriptDC class -// Author: Julian Smart and others -// Modified by: -// Copyright: (c) Julian Smart and Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DCPSG_H_ -#define _WX_DCPSG_H_ - -#include "wx/defs.h" - -#if wxUSE_PRINTING_ARCHITECTURE && wxUSE_POSTSCRIPT - -#include "wx/dc.h" -#include "wx/dcprint.h" -#include "wx/dialog.h" -#include "wx/module.h" -#include "wx/cmndata.h" -#include "wx/strvararg.h" - -//----------------------------------------------------------------------------- -// wxPostScriptDC -//----------------------------------------------------------------------------- - - -class WXDLLIMPEXP_CORE wxPostScriptDC : public wxDC -{ -public: - wxPostScriptDC(); - - // Recommended constructor - wxPostScriptDC(const wxPrintData& printData); - -private: - wxDECLARE_DYNAMIC_CLASS(wxPostScriptDC); -}; - -class WXDLLIMPEXP_CORE wxPostScriptDCImpl : public wxDCImpl -{ -public: - wxPostScriptDCImpl( wxPrinterDC *owner ); - wxPostScriptDCImpl( wxPrinterDC *owner, const wxPrintData& data ); - wxPostScriptDCImpl( wxPostScriptDC *owner ); - wxPostScriptDCImpl( wxPostScriptDC *owner, const wxPrintData& data ); - - void Init(); - - virtual ~wxPostScriptDCImpl(); - - virtual bool Ok() const { return IsOk(); } - virtual bool IsOk() const wxOVERRIDE; - - bool CanDrawBitmap() const wxOVERRIDE { return true; } - - void Clear() wxOVERRIDE; - void SetFont( const wxFont& font ) wxOVERRIDE; - void SetPen( const wxPen& pen ) wxOVERRIDE; - void SetBrush( const wxBrush& brush ) wxOVERRIDE; - void SetLogicalFunction( wxRasterOperationMode function ) wxOVERRIDE; - void SetBackground( const wxBrush& brush ) wxOVERRIDE; - - void DestroyClippingRegion() wxOVERRIDE; - - bool StartDoc(const wxString& message) wxOVERRIDE; - void EndDoc() wxOVERRIDE; - void StartPage() wxOVERRIDE; - void EndPage() wxOVERRIDE; - - wxCoord GetCharHeight() const wxOVERRIDE; - wxCoord GetCharWidth() const wxOVERRIDE; - bool CanGetTextExtent() const wxOVERRIDE { return true; } - - // Resolution in pixels per logical inch - wxSize GetPPI() const wxOVERRIDE; - - virtual void ComputeScaleAndOrigin() wxOVERRIDE; - - void SetBackgroundMode(int WXUNUSED(mode)) wxOVERRIDE { } - void SetPalette(const wxPalette& WXUNUSED(palette)) wxOVERRIDE { } - - void SetPrintData(const wxPrintData& data); - wxPrintData& GetPrintData() { return m_printData; } - - virtual int GetDepth() const wxOVERRIDE { return 24; } - - void PsPrint( const wxString& psdata ); - - // Overrridden for wxPrinterDC Impl - - virtual int GetResolution() const wxOVERRIDE; - virtual wxRect GetPaperRect() const wxOVERRIDE; - - virtual void* GetHandle() const wxOVERRIDE { return NULL; } - -protected: - bool DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col, - wxFloodFillStyle style = wxFLOOD_SURFACE) wxOVERRIDE; - bool DoGetPixel(wxCoord x1, wxCoord y1, wxColour *col) const wxOVERRIDE; - void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) wxOVERRIDE; - void DoCrossHair(wxCoord x, wxCoord y) wxOVERRIDE ; - void DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2,wxCoord xc,wxCoord yc) wxOVERRIDE; - void DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea) wxOVERRIDE; - void DoDrawPoint(wxCoord x, wxCoord y) wxOVERRIDE; - void DoDrawLines(int n, const wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0) wxOVERRIDE; - void DoDrawPolygon(int n, const wxPoint points[], - wxCoord xoffset = 0, wxCoord yoffset = 0, - wxPolygonFillMode fillStyle = wxODDEVEN_RULE) wxOVERRIDE; - void DoDrawPolyPolygon(int n, const int count[], const wxPoint points[], - wxCoord xoffset = 0, wxCoord yoffset = 0, - wxPolygonFillMode fillStyle = wxODDEVEN_RULE) wxOVERRIDE; - void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) wxOVERRIDE; - void DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius = 20) wxOVERRIDE; - void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) wxOVERRIDE; -#if wxUSE_SPLINES - void DoDrawSpline(const wxPointList *points) wxOVERRIDE; -#endif - bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, - wxDC *source, wxCoord xsrc, wxCoord ysrc, - wxRasterOperationMode rop = wxCOPY, bool useMask = false, - wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord) wxOVERRIDE; - void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y) wxOVERRIDE; - void DoDrawBitmap(const wxBitmap& bitmap, wxCoord x, wxCoord y, bool useMask = false) wxOVERRIDE; - void DoDrawText(const wxString& text, wxCoord x, wxCoord y) wxOVERRIDE; - void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle) wxOVERRIDE; - void DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height) wxOVERRIDE; - void DoSetDeviceClippingRegion( const wxRegion &WXUNUSED(clip)) wxOVERRIDE - { - wxFAIL_MSG( "not implemented" ); - } - void DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y, - wxCoord *descent = NULL, - wxCoord *externalLeading = NULL, - const wxFont *theFont = NULL) const wxOVERRIDE; - void DoGetSize(int* width, int* height) const wxOVERRIDE; - void DoGetSizeMM(int *width, int *height) const wxOVERRIDE; - - FILE* m_pstream; // PostScript output stream - unsigned char m_currentRed; - unsigned char m_currentGreen; - unsigned char m_currentBlue; - int m_pageNumber; - bool m_clipping; - double m_underlinePosition; - double m_underlineThickness; - wxPrintData m_printData; - double m_pageHeight; - -private: - wxDECLARE_DYNAMIC_CLASS(wxPostScriptDCImpl); -}; - -#endif - // wxUSE_POSTSCRIPT && wxUSE_PRINTING_ARCHITECTURE - -#endif - // _WX_DCPSG_H_ diff --git a/Externals/wxWidgets3/include/wx/generic/dirctrlg.h b/Externals/wxWidgets3/include/wx/generic/dirctrlg.h deleted file mode 100644 index 6037c77fce..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/dirctrlg.h +++ /dev/null @@ -1,326 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/dirctrlg.h -// Purpose: wxGenericDirCtrl class -// Builds on wxDirCtrl class written by Robert Roebling for the -// wxFile application, modified by Harm van der Heijden. -// Further modified for Windows. -// Author: Robert Roebling, Harm van der Heijden, Julian Smart et al -// Modified by: -// Created: 21/3/2000 -// Copyright: (c) Robert Roebling, Harm van der Heijden, Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DIRCTRL_H_ -#define _WX_DIRCTRL_H_ - -#if wxUSE_DIRDLG - -#include "wx/treectrl.h" -#include "wx/dialog.h" -#include "wx/dirdlg.h" -#include "wx/choice.h" - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxTextCtrl; -class WXDLLIMPEXP_FWD_BASE wxHashTable; - -//----------------------------------------------------------------------------- -// Extra styles for wxGenericDirCtrl -//----------------------------------------------------------------------------- - -enum -{ - // Only allow directory viewing/selection, no files - wxDIRCTRL_DIR_ONLY = 0x0010, - // When setting the default path, select the first file in the directory - wxDIRCTRL_SELECT_FIRST = 0x0020, - // Show the filter list - wxDIRCTRL_SHOW_FILTERS = 0x0040, - // Use 3D borders on internal controls - wxDIRCTRL_3D_INTERNAL = 0x0080, - // Editable labels - wxDIRCTRL_EDIT_LABELS = 0x0100, - // Allow multiple selection - wxDIRCTRL_MULTIPLE = 0x0200, - - wxDIRCTRL_DEFAULT_STYLE = wxDIRCTRL_3D_INTERNAL -}; - -//----------------------------------------------------------------------------- -// wxDirItemData -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxDirItemData : public wxTreeItemData -{ -public: - wxDirItemData(const wxString& path, const wxString& name, bool isDir); - virtual ~wxDirItemData(){} - void SetNewDirName(const wxString& path); - - bool HasSubDirs() const; - bool HasFiles(const wxString& spec = wxEmptyString) const; - - wxString m_path, m_name; - bool m_isHidden; - bool m_isExpanded; - bool m_isDir; -}; - -//----------------------------------------------------------------------------- -// wxDirCtrl -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxDirFilterListCtrl; - -class WXDLLIMPEXP_CORE wxGenericDirCtrl: public wxControl -{ -public: - wxGenericDirCtrl(); - wxGenericDirCtrl(wxWindow *parent, wxWindowID id = wxID_ANY, - const wxString &dir = wxDirDialogDefaultFolderStr, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDIRCTRL_DEFAULT_STYLE, - const wxString& filter = wxEmptyString, - int defaultFilter = 0, - const wxString& name = wxTreeCtrlNameStr ) - { - Init(); - Create(parent, id, dir, pos, size, style, filter, defaultFilter, name); - } - - bool Create(wxWindow *parent, wxWindowID id = wxID_ANY, - const wxString &dir = wxDirDialogDefaultFolderStr, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDIRCTRL_DEFAULT_STYLE, - const wxString& filter = wxEmptyString, - int defaultFilter = 0, - const wxString& name = wxTreeCtrlNameStr ); - - virtual void Init(); - - virtual ~wxGenericDirCtrl(); - - void OnExpandItem(wxTreeEvent &event ); - void OnCollapseItem(wxTreeEvent &event ); - void OnBeginEditItem(wxTreeEvent &event ); - void OnEndEditItem(wxTreeEvent &event ); - void OnTreeSelChange(wxTreeEvent &event); - void OnItemActivated(wxTreeEvent &event); - void OnSize(wxSizeEvent &event ); - - // Try to expand as much of the given path as possible. - virtual bool ExpandPath(const wxString& path); - // collapse the path - virtual bool CollapsePath(const wxString& path); - - // Accessors - - virtual inline wxString GetDefaultPath() const { return m_defaultPath; } - virtual void SetDefaultPath(const wxString& path) { m_defaultPath = path; } - - // Get dir or filename - virtual wxString GetPath() const; - virtual void GetPaths(wxArrayString& paths) const; - - // Get selected filename path only (else empty string). - // I.e. don't count a directory as a selection - virtual wxString GetFilePath() const; - virtual void GetFilePaths(wxArrayString& paths) const; - virtual void SetPath(const wxString& path); - - virtual void SelectPath(const wxString& path, bool select = true); - virtual void SelectPaths(const wxArrayString& paths); - - virtual void ShowHidden( bool show ); - virtual bool GetShowHidden() { return m_showHidden; } - - virtual wxString GetFilter() const { return m_filter; } - virtual void SetFilter(const wxString& filter); - - virtual int GetFilterIndex() const { return m_currentFilter; } - virtual void SetFilterIndex(int n); - - virtual wxTreeItemId GetRootId() { return m_rootId; } - - virtual wxTreeCtrl* GetTreeCtrl() const { return m_treeCtrl; } - virtual wxDirFilterListCtrl* GetFilterListCtrl() const { return m_filterListCtrl; } - - virtual void UnselectAll(); - - // Helper - virtual void SetupSections(); - - // Find the child that matches the first part of 'path'. - // E.g. if a child path is "/usr" and 'path' is "/usr/include" - // then the child for /usr is returned. - // If the path string has been used (we're at the leaf), done is set to true - virtual wxTreeItemId FindChild(wxTreeItemId parentId, const wxString& path, bool& done); - - wxString GetPath(wxTreeItemId itemId) const; - - // Resize the components of the control - virtual void DoResize(); - - // Collapse & expand the tree, thus re-creating it from scratch: - virtual void ReCreateTree(); - - // Collapse the entire tree - virtual void CollapseTree(); - - // overridden base class methods - virtual void SetFocus() wxOVERRIDE; - -protected: - virtual void ExpandRoot(); - virtual void ExpandDir(wxTreeItemId parentId); - virtual void CollapseDir(wxTreeItemId parentId); - virtual const wxTreeItemId AddSection(const wxString& path, const wxString& name, int imageId = 0); - virtual wxTreeItemId AppendItem (const wxTreeItemId & parent, - const wxString & text, - int image = -1, int selectedImage = -1, - wxTreeItemData * data = NULL); - //void FindChildFiles(wxTreeItemId id, int dirFlags, wxArrayString& filenames); - virtual wxTreeCtrl* CreateTreeCtrl(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long treeStyle); - - // Extract description and actual filter from overall filter string - bool ExtractWildcard(const wxString& filterStr, int n, wxString& filter, wxString& description); - -private: - void PopulateNode(wxTreeItemId node); - wxDirItemData* GetItemData(wxTreeItemId itemId); - - bool m_showHidden; - wxTreeItemId m_rootId; - wxString m_defaultPath; // Starting path - long m_styleEx; // Extended style - wxString m_filter; // Wildcards in same format as per wxFileDialog - int m_currentFilter; // The current filter index - wxString m_currentFilterStr; // Current filter string - wxTreeCtrl* m_treeCtrl; - wxDirFilterListCtrl* m_filterListCtrl; - -private: - wxDECLARE_EVENT_TABLE(); - wxDECLARE_DYNAMIC_CLASS(wxGenericDirCtrl); - wxDECLARE_NO_COPY_CLASS(wxGenericDirCtrl); -}; - -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_DIRCTRL_SELECTIONCHANGED, wxTreeEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_DIRCTRL_FILEACTIVATED, wxTreeEvent ); - -#define wx__DECLARE_DIRCTRL_EVT(evt, id, fn) \ - wx__DECLARE_EVT1(wxEVT_DIRCTRL_ ## evt, id, wxTreeEventHandler(fn)) - -#define EVT_DIRCTRL_SELECTIONCHANGED(id, fn) wx__DECLARE_DIRCTRL_EVT(SELECTIONCHANGED, id, fn) -#define EVT_DIRCTRL_FILEACTIVATED(id, fn) wx__DECLARE_DIRCTRL_EVT(FILEACTIVATED, id, fn) - -//----------------------------------------------------------------------------- -// wxDirFilterListCtrl -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxDirFilterListCtrl: public wxChoice -{ -public: - wxDirFilterListCtrl() { Init(); } - wxDirFilterListCtrl(wxGenericDirCtrl* parent, wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0) - { - Init(); - Create(parent, id, pos, size, style); - } - - bool Create(wxGenericDirCtrl* parent, wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0); - - void Init(); - - virtual ~wxDirFilterListCtrl() {} - - //// Operations - void FillFilterList(const wxString& filter, int defaultFilter); - - //// Events - void OnSelFilter(wxCommandEvent& event); - -protected: - wxGenericDirCtrl* m_dirCtrl; - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_CLASS(wxDirFilterListCtrl); - wxDECLARE_NO_COPY_CLASS(wxDirFilterListCtrl); -}; - -#if !defined(__WXMSW__) && !defined(__WXMAC__) - #define wxDirCtrl wxGenericDirCtrl -#endif - -// Symbols for accessing individual controls -#define wxID_TREECTRL 7000 -#define wxID_FILTERLISTCTRL 7001 - -#endif // wxUSE_DIRDLG - -//------------------------------------------------------------------------- -// wxFileIconsTable - use wxTheFileIconsTable which is created as necessary -//------------------------------------------------------------------------- - -#if wxUSE_DIRDLG || wxUSE_FILEDLG || wxUSE_FILECTRL - -class WXDLLIMPEXP_FWD_CORE wxImageList; - -class WXDLLIMPEXP_CORE wxFileIconsTable -{ -public: - wxFileIconsTable(); - ~wxFileIconsTable(); - - enum iconId_Type - { - folder, - folder_open, - computer, - drive, - cdrom, - floppy, - removeable, - file, - executable - }; - - int GetIconID(const wxString& extension, const wxString& mime = wxEmptyString); - wxImageList *GetSmallImageList(); - - const wxSize& GetSize() const { return m_size; } - void SetSize(const wxSize& sz) { m_size = sz; } - - bool IsOk() const { return m_smallImageList != NULL; } - -protected: - void Create(const wxSize& sz); // create on first use - - wxImageList *m_smallImageList; - wxHashTable *m_HashTable; - wxSize m_size; -}; - -// The global fileicons table -extern WXDLLIMPEXP_DATA_CORE(wxFileIconsTable *) wxTheFileIconsTable; - -#endif // wxUSE_DIRDLG || wxUSE_FILEDLG || wxUSE_FILECTRL - -// old wxEVT_COMMAND_* constants -#define wxEVT_COMMAND_DIRCTRL_SELECTIONCHANGED wxEVT_DIRCTRL_SELECTIONCHANGED -#define wxEVT_COMMAND_DIRCTRL_FILEACTIVATED wxEVT_DIRCTRL_FILEACTIVATED - -#endif - // _WX_DIRCTRLG_H_ diff --git a/Externals/wxWidgets3/include/wx/generic/dirdlgg.h b/Externals/wxWidgets3/include/wx/generic/dirdlgg.h deleted file mode 100644 index 85038afe23..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/dirdlgg.h +++ /dev/null @@ -1,84 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/dirdlgg.h -// Purpose: wxGenericDirCtrl class -// Builds on wxDirCtrl class written by Robert Roebling for the -// wxFile application, modified by Harm van der Heijden. -// Further modified for Windows. -// Author: Robert Roebling, Harm van der Heijden, Julian Smart et al -// Modified by: -// Created: 21/3/2000 -// Copyright: (c) Robert Roebling, Harm van der Heijden, Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DIRDLGG_H_ -#define _WX_DIRDLGG_H_ - -class WXDLLIMPEXP_FWD_CORE wxGenericDirCtrl; -class WXDLLIMPEXP_FWD_CORE wxTextCtrl; -class WXDLLIMPEXP_FWD_CORE wxTreeEvent; - -// we may be included directly as well as from wx/dirdlg.h (FIXME) -extern WXDLLIMPEXP_DATA_CORE(const char) wxDirDialogNameStr[]; -extern WXDLLIMPEXP_DATA_CORE(const char) wxDirSelectorPromptStr[]; - -#ifndef wxDD_DEFAULT_STYLE -#define wxDD_DEFAULT_STYLE (wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER) -#endif - -#include "wx/dialog.h" - -//----------------------------------------------------------------------------- -// wxGenericDirDialog -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxGenericDirDialog : public wxDirDialogBase -{ -public: - wxGenericDirDialog() : wxDirDialogBase() { } - - wxGenericDirDialog(wxWindow* parent, - const wxString& title = wxDirSelectorPromptStr, - const wxString& defaultPath = wxEmptyString, - long style = wxDD_DEFAULT_STYLE, - const wxPoint& pos = wxDefaultPosition, - const wxSize& sz = wxDefaultSize,//Size(450, 550), - const wxString& name = wxDirDialogNameStr); - - bool Create(wxWindow* parent, - const wxString& title = wxDirSelectorPromptStr, - const wxString& defaultPath = wxEmptyString, - long style = wxDD_DEFAULT_STYLE, - const wxPoint& pos = wxDefaultPosition, - const wxSize& sz = wxDefaultSize,//Size(450, 550), - const wxString& name = wxDirDialogNameStr); - - //// Accessors - void SetPath(const wxString& path) wxOVERRIDE; - wxString GetPath() const wxOVERRIDE; - - //// Overrides - virtual int ShowModal() wxOVERRIDE; - virtual void EndModal(int retCode) wxOVERRIDE; - - // this one is specific to wxGenericDirDialog - wxTextCtrl* GetInputCtrl() const { return m_input; } - -protected: - //// Event handlers - void OnCloseWindow(wxCloseEvent& event); - void OnOK(wxCommandEvent& event); - void OnTreeSelected(wxTreeEvent &event); - void OnTreeKeyDown(wxTreeEvent &event); - void OnNew(wxCommandEvent& event); - void OnGoHome(wxCommandEvent& event); - void OnShowHidden(wxCommandEvent& event); - - wxGenericDirCtrl* m_dirCtrl; - wxTextCtrl* m_input; - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_DYNAMIC_CLASS(wxGenericDirDialog); -}; - -#endif // _WX_DIRDLGG_H_ diff --git a/Externals/wxWidgets3/include/wx/generic/dragimgg.h b/Externals/wxWidgets3/include/wx/generic/dragimgg.h deleted file mode 100644 index 71ffd8aef9..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/dragimgg.h +++ /dev/null @@ -1,259 +0,0 @@ -////////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/dragimgg.h -// Purpose: wxDragImage class: a kind of a cursor, that can cope -// with more sophisticated images -// Author: Julian Smart -// Modified by: -// Created: 29/2/2000 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DRAGIMGG_H_ -#define _WX_DRAGIMGG_H_ - -#include "wx/bitmap.h" -#include "wx/icon.h" -#include "wx/cursor.h" -#include "wx/treectrl.h" -#include "wx/listctrl.h" -#include "wx/log.h" -#include "wx/overlay.h" - -/* - To use this class, create a wxDragImage when you start dragging, for example: - - void MyTreeCtrl::OnBeginDrag(wxTreeEvent& event) - { -#ifdef __WXMSW__ - ::UpdateWindow((HWND) GetHWND()); // We need to implement this in wxWidgets -#endif - - CaptureMouse(); - - m_dragImage = new wxDragImage(* this, itemId); - m_dragImage->BeginDrag(wxPoint(0, 0), this); - m_dragImage->Move(pt, this); - m_dragImage->Show(this); - ... - } - - In your OnMouseMove function, hide the image, do any display updating required, - then move and show the image again: - - void MyTreeCtrl::OnMouseMove(wxMouseEvent& event) - { - if (m_dragMode == MY_TREE_DRAG_NONE) - { - event.Skip(); - return; - } - - // Prevent screen corruption by hiding the image - if (m_dragImage) - m_dragImage->Hide(this); - - // Do some updating of the window, such as highlighting the drop target - ... - -#ifdef __WXMSW__ - if (updateWindow) - ::UpdateWindow((HWND) GetHWND()); -#endif - - // Move and show the image again - m_dragImage->Move(event.GetPosition(), this); - m_dragImage->Show(this); - } - - Eventually we end the drag and delete the drag image. - - void MyTreeCtrl::OnLeftUp(wxMouseEvent& event) - { - ... - - // End the drag and delete the drag image - if (m_dragImage) - { - m_dragImage->EndDrag(this); - delete m_dragImage; - m_dragImage = NULL; - } - ReleaseMouse(); - } -*/ - -/* - * wxGenericDragImage - */ - -class WXDLLIMPEXP_CORE wxGenericDragImage: public wxObject -{ -public: - - // Ctors & dtor - //////////////////////////////////////////////////////////////////////////// - - wxGenericDragImage(const wxCursor& cursor = wxNullCursor) - { - Init(); - Create(cursor); - } - - wxGenericDragImage(const wxBitmap& image, const wxCursor& cursor = wxNullCursor) - { - Init(); - - Create(image, cursor); - } - - wxGenericDragImage(const wxIcon& image, const wxCursor& cursor = wxNullCursor) - { - Init(); - - Create(image, cursor); - } - - wxGenericDragImage(const wxString& str, const wxCursor& cursor = wxNullCursor) - { - Init(); - - Create(str, cursor); - } - -#if wxUSE_TREECTRL - wxGenericDragImage(const wxTreeCtrl& treeCtrl, wxTreeItemId& id) - { - Init(); - - Create(treeCtrl, id); - } -#endif - -#if wxUSE_LISTCTRL - wxGenericDragImage(const wxListCtrl& listCtrl, long id) - { - Init(); - - Create(listCtrl, id); - } -#endif - - virtual ~wxGenericDragImage(); - - // Attributes - //////////////////////////////////////////////////////////////////////////// - -#ifdef wxHAS_NATIVE_OVERLAY - // backing store is not used when native overlays are - void SetBackingBitmap(wxBitmap* WXUNUSED(bitmap)) { } -#else - // For efficiency, tell wxGenericDragImage to use a bitmap that's already - // created (e.g. from last drag) - void SetBackingBitmap(wxBitmap* bitmap) { m_pBackingBitmap = bitmap; } -#endif // wxHAS_NATIVE_OVERLAY/!wxHAS_NATIVE_OVERLAY - - // Operations - //////////////////////////////////////////////////////////////////////////// - - // Create a drag image with a virtual image (need to override DoDrawImage, GetImageRect) - bool Create(const wxCursor& cursor = wxNullCursor); - - // Create a drag image from a bitmap and optional cursor - bool Create(const wxBitmap& image, const wxCursor& cursor = wxNullCursor); - - // Create a drag image from an icon and optional cursor - bool Create(const wxIcon& image, const wxCursor& cursor = wxNullCursor); - - // Create a drag image from a string and optional cursor - bool Create(const wxString& str, const wxCursor& cursor = wxNullCursor); - -#if wxUSE_TREECTRL - // Create a drag image for the given tree control item - bool Create(const wxTreeCtrl& treeCtrl, wxTreeItemId& id); -#endif - -#if wxUSE_LISTCTRL - // Create a drag image for the given list control item - bool Create(const wxListCtrl& listCtrl, long id); -#endif - - // Begin drag. hotspot is the location of the drag position relative to the upper-left - // corner of the image. - bool BeginDrag(const wxPoint& hotspot, wxWindow* window, bool fullScreen = false, wxRect* rect = NULL); - - // Begin drag. hotspot is the location of the drag position relative to the upper-left - // corner of the image. This is full screen only. fullScreenRect gives the - // position of the window on the screen, to restrict the drag to. - bool BeginDrag(const wxPoint& hotspot, wxWindow* window, wxWindow* fullScreenRect); - - // End drag - bool EndDrag(); - - // Move the image: call from OnMouseMove. Pt is in window client coordinates if window - // is non-NULL, or in screen coordinates if NULL. - bool Move(const wxPoint& pt); - - // Show the image - bool Show(); - - // Hide the image - bool Hide(); - - // Implementation - //////////////////////////////////////////////////////////////////////////// - - void Init(); - - // Override this if you are using a virtual image (drawing your own image) - virtual wxRect GetImageRect(const wxPoint& pos) const; - - // Override this if you are using a virtual image (drawing your own image) - virtual bool DoDrawImage(wxDC& dc, const wxPoint& pos) const; - - // Override this if you wish to draw the window contents to the backing bitmap - // yourself. This can be desirable if you wish to avoid flicker by not having to - // redraw the window itself before dragging in order to be graphic-minus-dragged-objects. - // Instead, paint the drag image's backing bitmap to be correct, and leave the window - // to be updated only when dragging the objects away (thus giving a smoother appearance). - virtual bool UpdateBackingFromWindow(wxDC& windowDC, wxMemoryDC& destDC, - const wxRect& sourceRect, const wxRect& destRect) const; - - // Erase and redraw simultaneously if possible - virtual bool RedrawImage(const wxPoint& oldPos, const wxPoint& newPos, bool eraseOld, bool drawNew); - -protected: - wxBitmap m_bitmap; - wxIcon m_icon; - wxCursor m_cursor; - wxCursor m_oldCursor; -// wxPoint m_hotspot; - wxPoint m_offset; // The hostpot value passed to BeginDrag - wxPoint m_position; - bool m_isDirty; - bool m_isShown; - wxWindow* m_window; - wxDC* m_windowDC; - -#ifdef wxHAS_NATIVE_OVERLAY - wxOverlay m_overlay; - wxDCOverlay* m_dcOverlay; -#else - // Stores the window contents while we're dragging the image around - wxBitmap m_backingBitmap; - wxBitmap* m_pBackingBitmap; // Pointer to existing backing bitmap - // (pass to wxGenericDragImage as an efficiency measure) - // A temporary bitmap for repairing/redrawing - wxBitmap m_repairBitmap; -#endif // !wxHAS_NATIVE_OVERLAY - - wxRect m_boundingRect; - bool m_fullScreen; - -private: - wxDECLARE_DYNAMIC_CLASS(wxGenericDragImage); - wxDECLARE_NO_COPY_CLASS(wxGenericDragImage); -}; - -#endif - // _WX_DRAGIMGG_H_ diff --git a/Externals/wxWidgets3/include/wx/generic/dvrenderer.h b/Externals/wxWidgets3/include/wx/generic/dvrenderer.h deleted file mode 100644 index 251dc81297..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/dvrenderer.h +++ /dev/null @@ -1,67 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/dvrenderer.h -// Purpose: wxDataViewRenderer for generic wxDataViewCtrl implementation -// Author: Robert Roebling, Vadim Zeitlin -// Created: 2009-11-07 (extracted from wx/generic/dataview.h) -// Copyright: (c) 2006 Robert Roebling -// (c) 2009 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GENERIC_DVRENDERER_H_ -#define _WX_GENERIC_DVRENDERER_H_ - -// ---------------------------------------------------------------------------- -// wxDataViewRenderer -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDataViewRenderer: public wxDataViewCustomRendererBase -{ -public: - wxDataViewRenderer( const wxString &varianttype, - wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, - int align = wxDVR_DEFAULT_ALIGNMENT ); - virtual ~wxDataViewRenderer(); - - virtual wxDC *GetDC(); - - virtual void SetAlignment( int align ); - virtual int GetAlignment() const; - - virtual void EnableEllipsize(wxEllipsizeMode mode = wxELLIPSIZE_MIDDLE) - { m_ellipsizeMode = mode; } - virtual wxEllipsizeMode GetEllipsizeMode() const - { return m_ellipsizeMode; } - - virtual void SetMode( wxDataViewCellMode mode ) - { m_mode = mode; } - virtual wxDataViewCellMode GetMode() const - { return m_mode; } - - // implementation - - // This callback is used by generic implementation of wxDVC itself. It's - // different from the corresponding ActivateCell() method which should only - // be overridable for the custom renderers while the generic implementation - // uses this one for all of them, including the standard ones. - - virtual bool WXActivateCell(const wxRect& WXUNUSED(cell), - wxDataViewModel *WXUNUSED(model), - const wxDataViewItem & WXUNUSED(item), - unsigned int WXUNUSED(col), - const wxMouseEvent* WXUNUSED(mouseEvent)) - { return false; } - -private: - int m_align; - wxDataViewCellMode m_mode; - - wxEllipsizeMode m_ellipsizeMode; - - wxDC *m_dc; - - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewRenderer); -}; - -#endif // _WX_GENERIC_DVRENDERER_H_ - diff --git a/Externals/wxWidgets3/include/wx/generic/dvrenderers.h b/Externals/wxWidgets3/include/wx/generic/dvrenderers.h deleted file mode 100644 index a56beaf034..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/dvrenderers.h +++ /dev/null @@ -1,195 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/dvrenderers.h -// Purpose: All generic wxDataViewCtrl renderer classes -// Author: Robert Roebling, Vadim Zeitlin -// Created: 2009-11-07 (extracted from wx/generic/dataview.h) -// Copyright: (c) 2006 Robert Roebling -// (c) 2009 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GENERIC_DVRENDERERS_H_ -#define _WX_GENERIC_DVRENDERERS_H_ - -// --------------------------------------------------------- -// wxDataViewCustomRenderer -// --------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDataViewCustomRenderer: public wxDataViewRenderer -{ -public: - static wxString GetDefaultType() { return wxS("string"); } - - wxDataViewCustomRenderer( const wxString &varianttype = GetDefaultType(), - wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, - int align = wxDVR_DEFAULT_ALIGNMENT ); - - - // see the explanation of the following WXOnXXX() methods in wx/generic/dvrenderer.h - - virtual bool WXActivateCell(const wxRect& cell, - wxDataViewModel *model, - const wxDataViewItem& item, - unsigned int col, - const wxMouseEvent *mouseEvent) - { - return ActivateCell(cell, model, item, col, mouseEvent); - } - -private: - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCustomRenderer); -}; - - -// --------------------------------------------------------- -// wxDataViewTextRenderer -// --------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDataViewTextRenderer: public wxDataViewRenderer -{ -public: - static wxString GetDefaultType() { return wxS("string"); } - - wxDataViewTextRenderer( const wxString &varianttype = GetDefaultType(), - wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, - int align = wxDVR_DEFAULT_ALIGNMENT ); - - virtual bool SetValue( const wxVariant &value ); - virtual bool GetValue( wxVariant &value ) const; - - virtual bool Render(wxRect cell, wxDC *dc, int state); - virtual wxSize GetSize() const; - - // in-place editing - virtual bool HasEditorCtrl() const; - virtual wxWindow* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, - const wxVariant &value ); - virtual bool GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value ); - -protected: - wxString m_text; - -protected: - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewTextRenderer); -}; - -// --------------------------------------------------------- -// wxDataViewBitmapRenderer -// --------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDataViewBitmapRenderer: public wxDataViewRenderer -{ -public: - static wxString GetDefaultType() { return wxS("wxBitmap"); } - - wxDataViewBitmapRenderer( const wxString &varianttype = GetDefaultType(), - wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, - int align = wxDVR_DEFAULT_ALIGNMENT ); - - virtual bool SetValue( const wxVariant &value ); - virtual bool GetValue( wxVariant &value ) const; - - virtual bool Render( wxRect cell, wxDC *dc, int state ); - virtual wxSize GetSize() const; - -private: - wxIcon m_icon; - wxBitmap m_bitmap; - -protected: - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewBitmapRenderer); -}; - -// --------------------------------------------------------- -// wxDataViewToggleRenderer -// --------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDataViewToggleRenderer: public wxDataViewRenderer -{ -public: - static wxString GetDefaultType() { return wxS("bool"); } - - wxDataViewToggleRenderer( const wxString &varianttype = GetDefaultType(), - wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, - int align = wxDVR_DEFAULT_ALIGNMENT ); - - virtual bool SetValue( const wxVariant &value ); - virtual bool GetValue( wxVariant &value ) const; - - virtual bool Render( wxRect cell, wxDC *dc, int state ); - virtual wxSize GetSize() const; - - // Implementation only, don't use nor override - virtual bool WXActivateCell(const wxRect& cell, - wxDataViewModel *model, - const wxDataViewItem& item, - unsigned int col, - const wxMouseEvent *mouseEvent); -private: - bool m_toggle; - -protected: - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewToggleRenderer); -}; - -// --------------------------------------------------------- -// wxDataViewProgressRenderer -// --------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDataViewProgressRenderer: public wxDataViewRenderer -{ -public: - static wxString GetDefaultType() { return wxS("long"); } - - wxDataViewProgressRenderer( const wxString &label = wxEmptyString, - const wxString &varianttype = GetDefaultType(), - wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, - int align = wxDVR_DEFAULT_ALIGNMENT ); - - virtual bool SetValue( const wxVariant &value ); - virtual bool GetValue( wxVariant& value ) const; - - virtual bool Render(wxRect cell, wxDC *dc, int state); - virtual wxSize GetSize() const; - -private: - wxString m_label; - int m_value; - -protected: - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewProgressRenderer); -}; - -// --------------------------------------------------------- -// wxDataViewIconTextRenderer -// --------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDataViewIconTextRenderer: public wxDataViewRenderer -{ -public: - static wxString GetDefaultType() { return wxS("wxDataViewIconText"); } - - wxDataViewIconTextRenderer( const wxString &varianttype = GetDefaultType(), - wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, - int align = wxDVR_DEFAULT_ALIGNMENT ); - - virtual bool SetValue( const wxVariant &value ); - virtual bool GetValue( wxVariant &value ) const; - - virtual bool Render(wxRect cell, wxDC *dc, int state); - virtual wxSize GetSize() const; - - virtual bool HasEditorCtrl() const { return true; } - virtual wxWindow* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, - const wxVariant &value ); - virtual bool GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value ); - -private: - wxDataViewIconText m_value; - -protected: - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewIconTextRenderer); -}; - -#endif // _WX_GENERIC_DVRENDERERS_H_ - diff --git a/Externals/wxWidgets3/include/wx/generic/fdrepdlg.h b/Externals/wxWidgets3/include/wx/generic/fdrepdlg.h deleted file mode 100644 index 052193c9e2..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/fdrepdlg.h +++ /dev/null @@ -1,70 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/fdrepdlg.h -// Purpose: wxGenericFindReplaceDialog class -// Author: Markus Greither -// Modified by: -// Created: 25/05/2001 -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GENERIC_FDREPDLG_H_ -#define _WX_GENERIC_FDREPDLG_H_ - -class WXDLLIMPEXP_FWD_CORE wxCheckBox; -class WXDLLIMPEXP_FWD_CORE wxRadioBox; -class WXDLLIMPEXP_FWD_CORE wxTextCtrl; - -// ---------------------------------------------------------------------------- -// wxGenericFindReplaceDialog: dialog for searching / replacing text -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxGenericFindReplaceDialog : public wxFindReplaceDialogBase -{ -public: - wxGenericFindReplaceDialog() { Init(); } - - wxGenericFindReplaceDialog(wxWindow *parent, - wxFindReplaceData *data, - const wxString& title, - int style = 0) - { - Init(); - - (void)Create(parent, data, title, style); - } - - bool Create(wxWindow *parent, - wxFindReplaceData *data, - const wxString& title, - int style = 0); - -protected: - void Init(); - - void SendEvent(const wxEventType& evtType); - - void OnFind(wxCommandEvent& event); - void OnReplace(wxCommandEvent& event); - void OnReplaceAll(wxCommandEvent& event); - void OnCancel(wxCommandEvent& event); - - void OnUpdateFindUI(wxUpdateUIEvent& event); - - void OnCloseWindow(wxCloseEvent& event); - - wxCheckBox *m_chkCase, - *m_chkWord; - - wxRadioBox *m_radioDir; - - wxTextCtrl *m_textFind, - *m_textRepl; - -private: - wxDECLARE_DYNAMIC_CLASS(wxGenericFindReplaceDialog); - - wxDECLARE_EVENT_TABLE(); -}; - -#endif // _WX_GENERIC_FDREPDLG_H_ diff --git a/Externals/wxWidgets3/include/wx/generic/filectrlg.h b/Externals/wxWidgets3/include/wx/generic/filectrlg.h deleted file mode 100644 index d460fd3e99..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/filectrlg.h +++ /dev/null @@ -1,303 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/filectrlg.h -// Purpose: wxGenericFileCtrl Header -// Author: Diaa M. Sami -// Modified by: -// Created: Jul-07-2007 -// Copyright: (c) Diaa M. Sami -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GENERIC_FILECTRL_H_ -#define _WX_GENERIC_FILECTRL_H_ - -#if wxUSE_FILECTRL - -#include "wx/containr.h" -#include "wx/listctrl.h" -#include "wx/filectrl.h" -#include "wx/filename.h" - -class WXDLLIMPEXP_FWD_CORE wxCheckBox; -class WXDLLIMPEXP_FWD_CORE wxChoice; -class WXDLLIMPEXP_FWD_CORE wxStaticText; -class WXDLLIMPEXP_FWD_CORE wxTextCtrl; - -extern WXDLLIMPEXP_DATA_CORE(const char) wxFileSelectorDefaultWildcardStr[]; - -//----------------------------------------------------------------------------- -// wxFileData - a class to hold the file info for the wxFileListCtrl -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxFileData -{ -public: - enum fileType - { - is_file = 0x0000, - is_dir = 0x0001, - is_link = 0x0002, - is_exe = 0x0004, - is_drive = 0x0008 - }; - - wxFileData() { Init(); } - // Full copy constructor - wxFileData( const wxFileData& fileData ) { Copy(fileData); } - // Create a filedata from this information - wxFileData( const wxString &filePath, const wxString &fileName, - fileType type, int image_id ); - - // make a full copy of the other wxFileData - void Copy( const wxFileData &other ); - - // (re)read the extra data about the file from the system - void ReadData(); - - // get the name of the file, dir, drive - wxString GetFileName() const { return m_fileName; } - // get the full path + name of the file, dir, path - wxString GetFilePath() const { return m_filePath; } - // Set the path + name and name of the item - void SetNewName( const wxString &filePath, const wxString &fileName ); - - // Get the size of the file in bytes - wxFileOffset GetSize() const { return m_size; } - // Get the type of file, either file extension or , , - wxString GetFileType() const; - // get the last modification time - wxDateTime GetDateTime() const { return m_dateTime; } - // Get the time as a formatted string - wxString GetModificationTime() const; - // in UNIX get rwx for file, in MSW get attributes ARHS - wxString GetPermissions() const { return m_permissions; } - // Get the id of the image used in a wxImageList - int GetImageId() const { return m_image; } - - bool IsFile() const { return !IsDir() && !IsLink() && !IsDrive(); } - bool IsDir() const { return (m_type & is_dir ) != 0; } - bool IsLink() const { return (m_type & is_link ) != 0; } - bool IsExe() const { return (m_type & is_exe ) != 0; } - bool IsDrive() const { return (m_type & is_drive) != 0; } - - // Get/Set the type of file, file/dir/drive/link - int GetType() const { return m_type; } - - // the wxFileListCtrl fields in report view - enum fileListFieldType - { - FileList_Name, - FileList_Size, - FileList_Type, - FileList_Time, -#if defined(__UNIX__) || defined(__WIN32__) - FileList_Perm, -#endif // defined(__UNIX__) || defined(__WIN32__) - FileList_Max - }; - - // Get the entry for report view of wxFileListCtrl - wxString GetEntry( fileListFieldType num ) const; - - // Get a string representation of the file info - wxString GetHint() const; - // initialize a wxListItem attributes - void MakeItem( wxListItem &item ); - - // operators - wxFileData& operator = (const wxFileData& fd) { Copy(fd); return *this; } - -protected: - wxString m_fileName; - wxString m_filePath; - wxFileOffset m_size; - wxDateTime m_dateTime; - wxString m_permissions; - int m_type; - int m_image; - -private: - void Init(); -}; - -//----------------------------------------------------------------------------- -// wxFileListCtrl -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxFileListCtrl : public wxListCtrl -{ -public: - wxFileListCtrl(); - wxFileListCtrl( wxWindow *win, - wxWindowID id, - const wxString &wild, - bool showHidden, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - long style = wxLC_LIST, - const wxValidator &validator = wxDefaultValidator, - const wxString &name = wxT("filelist") ); - virtual ~wxFileListCtrl(); - - virtual void ChangeToListMode(); - virtual void ChangeToReportMode(); - virtual void ChangeToSmallIconMode(); - virtual void ShowHidden( bool show = true ); - bool GetShowHidden() const { return m_showHidden; } - - virtual long Add( wxFileData *fd, wxListItem &item ); - virtual void UpdateItem(const wxListItem &item); - virtual void UpdateFiles(); - virtual void MakeDir(); - virtual void GoToParentDir(); - virtual void GoToHomeDir(); - virtual void GoToDir( const wxString &dir ); - virtual void SetWild( const wxString &wild ); - wxString GetWild() const { return m_wild; } - wxString GetDir() const { return m_dirName; } - - void OnListDeleteItem( wxListEvent &event ); - void OnListDeleteAllItems( wxListEvent &event ); - void OnListEndLabelEdit( wxListEvent &event ); - void OnListColClick( wxListEvent &event ); - - virtual void SortItems(wxFileData::fileListFieldType field, bool forward); - bool GetSortDirection() const { return m_sort_forward; } - wxFileData::fileListFieldType GetSortField() const { return m_sort_field; } - -protected: - void FreeItemData(wxListItem& item); - void FreeAllItemsData(); - - wxString m_dirName; - bool m_showHidden; - wxString m_wild; - - bool m_sort_forward; - wxFileData::fileListFieldType m_sort_field; - -private: - wxDECLARE_DYNAMIC_CLASS(wxFileListCtrl); - wxDECLARE_EVENT_TABLE(); -}; - -class WXDLLIMPEXP_CORE wxGenericFileCtrl : public wxNavigationEnabled, - public wxFileCtrlBase -{ -public: - wxGenericFileCtrl() - { - m_ignoreChanges = false; - } - - wxGenericFileCtrl ( wxWindow *parent, - wxWindowID id, - const wxString& defaultDirectory = wxEmptyString, - const wxString& defaultFilename = wxEmptyString, - const wxString& wildCard = wxFileSelectorDefaultWildcardStr, - long style = wxFC_DEFAULT_STYLE, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - const wxString& name = wxFileCtrlNameStr ) - { - m_ignoreChanges = false; - Create(parent, id, defaultDirectory, defaultFilename, wildCard, - style, pos, size, name ); - } - - virtual ~wxGenericFileCtrl() {} - - bool Create( wxWindow *parent, - wxWindowID id, - const wxString& defaultDirectory = wxEmptyString, - const wxString& defaultFileName = wxEmptyString, - const wxString& wildCard = wxFileSelectorDefaultWildcardStr, - long style = wxFC_DEFAULT_STYLE, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - const wxString& name = wxFileCtrlNameStr ); - - virtual void SetWildcard( const wxString& wildCard ) wxOVERRIDE; - virtual void SetFilterIndex( int filterindex ) wxOVERRIDE; - virtual bool SetDirectory( const wxString& dir ) wxOVERRIDE; - - // Selects a certain file. - // In case the filename specified isn't found/couldn't be shown with - // currently selected filter, false is returned and nothing happens - virtual bool SetFilename( const wxString& name ) wxOVERRIDE; - - // Changes to a certain directory and selects a certain file. - // In case the filename specified isn't found/couldn't be shown with - // currently selected filter, false is returned and if directory exists - // it's chdir'ed to - virtual bool SetPath( const wxString& path ) wxOVERRIDE; - - virtual wxString GetFilename() const wxOVERRIDE; - virtual wxString GetDirectory() const wxOVERRIDE; - virtual wxString GetWildcard() const wxOVERRIDE { return this->m_wildCard; } - virtual wxString GetPath() const wxOVERRIDE; - virtual void GetPaths( wxArrayString& paths ) const wxOVERRIDE; - virtual void GetFilenames( wxArrayString& files ) const wxOVERRIDE; - virtual int GetFilterIndex() const wxOVERRIDE { return m_filterIndex; } - - virtual bool HasMultipleFileSelection() const wxOVERRIDE - { return HasFlag(wxFC_MULTIPLE); } - virtual void ShowHidden(bool show) wxOVERRIDE { m_list->ShowHidden( show ); } - - void GoToParentDir(); - void GoToHomeDir(); - - // get the directory currently shown in the control: this can be different - // from GetDirectory() if the user entered a full path (with a path other - // than the one currently shown in the control) in the text control - // manually - wxString GetShownDirectory() const { return m_list->GetDir(); } - - wxFileListCtrl *GetFileList() { return m_list; } - - void ChangeToReportMode() { m_list->ChangeToReportMode(); } - void ChangeToListMode() { m_list->ChangeToListMode(); } - - -private: - void OnChoiceFilter( wxCommandEvent &event ); - void OnCheck( wxCommandEvent &event ); - void OnActivated( wxListEvent &event ); - void OnTextEnter( wxCommandEvent &WXUNUSED( event ) ); - void OnTextChange( wxCommandEvent &WXUNUSED( event ) ); - void OnSelected( wxListEvent &event ); - void HandleAction( const wxString &fn ); - - void DoSetFilterIndex( int filterindex ); - void UpdateControls(); - - // the first of these methods can only be used for the controls with single - // selection (i.e. without wxFC_MULTIPLE style), the second one in any case - wxFileName DoGetFileName() const; - void DoGetFilenames( wxArrayString& filenames, bool fullPath ) const; - - int m_style; - - wxString m_filterExtension; - wxChoice *m_choice; - wxTextCtrl *m_text; - wxFileListCtrl *m_list; - wxCheckBox *m_check; - wxStaticText *m_static; - - wxString m_dir; - wxString m_fileName; - wxString m_wildCard; // wild card in one string as we got it - - int m_filterIndex; - bool m_inSelected; - bool m_ignoreChanges; - bool m_noSelChgEvent; // suppress selection changed events. - - wxDECLARE_DYNAMIC_CLASS(wxGenericFileCtrl); - wxDECLARE_EVENT_TABLE(); -}; - -#endif // wxUSE_FILECTRL - -#endif // _WX_GENERIC_FILECTRL_H_ diff --git a/Externals/wxWidgets3/include/wx/generic/filedlgg.h b/Externals/wxWidgets3/include/wx/generic/filedlgg.h deleted file mode 100644 index 6c00f2020f..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/filedlgg.h +++ /dev/null @@ -1,160 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/filedlgg.h -// Purpose: wxGenericFileDialog -// Author: Robert Roebling -// Modified by: -// Created: 8/17/99 -// Copyright: (c) Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_FILEDLGG_H_ -#define _WX_FILEDLGG_H_ - -#include "wx/listctrl.h" -#include "wx/datetime.h" -#include "wx/filefn.h" -#include "wx/artprov.h" -#include "wx/filedlg.h" -#include "wx/generic/filectrlg.h" - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxBitmapButton; -class WXDLLIMPEXP_FWD_CORE wxGenericFileCtrl; -class WXDLLIMPEXP_FWD_CORE wxGenericFileDialog; -class WXDLLIMPEXP_FWD_CORE wxFileCtrlEvent; - -//------------------------------------------------------------------------- -// wxGenericFileDialog -//------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxGenericFileDialog: public wxFileDialogBase -{ -public: - wxGenericFileDialog() : wxFileDialogBase() { Init(); } - - wxGenericFileDialog(wxWindow *parent, - const wxString& message = wxFileSelectorPromptStr, - const wxString& defaultDir = wxEmptyString, - const wxString& defaultFile = wxEmptyString, - const wxString& wildCard = wxFileSelectorDefaultWildcardStr, - long style = wxFD_DEFAULT_STYLE, - const wxPoint& pos = wxDefaultPosition, - const wxSize& sz = wxDefaultSize, - const wxString& name = wxFileDialogNameStr, - bool bypassGenericImpl = false ); - - bool Create( wxWindow *parent, - const wxString& message = wxFileSelectorPromptStr, - const wxString& defaultDir = wxEmptyString, - const wxString& defaultFile = wxEmptyString, - const wxString& wildCard = wxFileSelectorDefaultWildcardStr, - long style = wxFD_DEFAULT_STYLE, - const wxPoint& pos = wxDefaultPosition, - const wxSize& sz = wxDefaultSize, - const wxString& name = wxFileDialogNameStr, - bool bypassGenericImpl = false ); - - virtual ~wxGenericFileDialog(); - - virtual void SetDirectory(const wxString& dir) wxOVERRIDE - { m_filectrl->SetDirectory(dir); } - virtual void SetFilename(const wxString& name) wxOVERRIDE - { m_filectrl->SetFilename(name); } - virtual void SetMessage(const wxString& message) wxOVERRIDE { SetTitle(message); } - virtual void SetPath(const wxString& path) wxOVERRIDE - { m_filectrl->SetPath(path); } - virtual void SetFilterIndex(int filterIndex) wxOVERRIDE - { m_filectrl->SetFilterIndex(filterIndex); } - virtual void SetWildcard(const wxString& wildCard) wxOVERRIDE - { m_filectrl->SetWildcard(wildCard); } - - virtual wxString GetPath() const wxOVERRIDE - { return m_filectrl->GetPath(); } - virtual void GetPaths(wxArrayString& paths) const wxOVERRIDE - { m_filectrl->GetPaths(paths); } - virtual wxString GetDirectory() const wxOVERRIDE - { return m_filectrl->GetDirectory(); } - virtual wxString GetFilename() const wxOVERRIDE - { return m_filectrl->GetFilename(); } - virtual void GetFilenames(wxArrayString& files) const wxOVERRIDE - { m_filectrl->GetFilenames(files); } - virtual wxString GetWildcard() const wxOVERRIDE - { return m_filectrl->GetWildcard(); } - virtual int GetFilterIndex() const wxOVERRIDE - { return m_filectrl->GetFilterIndex(); } - virtual bool SupportsExtraControl() const wxOVERRIDE { return true; } - - // implementation only from now on - // ------------------------------- - - virtual int ShowModal() wxOVERRIDE; - virtual bool Show( bool show = true ) wxOVERRIDE; - - void OnList( wxCommandEvent &event ); - void OnReport( wxCommandEvent &event ); - void OnUp( wxCommandEvent &event ); - void OnHome( wxCommandEvent &event ); - void OnOk( wxCommandEvent &event ); - void OnNew( wxCommandEvent &event ); - void OnFileActivated( wxFileCtrlEvent &event); - -private: - // if true, don't use this implementation at all - bool m_bypassGenericImpl; - -protected: - // update the state of m_upDirButton and m_newDirButton depending on the - // currently selected directory - void OnUpdateButtonsUI(wxUpdateUIEvent& event); - - wxString m_filterExtension; - wxGenericFileCtrl *m_filectrl; - wxBitmapButton *m_upDirButton; - wxBitmapButton *m_newDirButton; - -private: - void Init(); - wxBitmapButton* AddBitmapButton( wxWindowID winId, const wxArtID& artId, - const wxString& tip, wxSizer *sizer ); - - wxDECLARE_DYNAMIC_CLASS(wxGenericFileDialog); - wxDECLARE_EVENT_TABLE(); - - // these variables are preserved between wxGenericFileDialog calls - static long ms_lastViewStyle; // list or report? - static bool ms_lastShowHidden; // did we show hidden files? -}; - -#ifdef wxHAS_GENERIC_FILEDIALOG - -class WXDLLIMPEXP_CORE wxFileDialog: public wxGenericFileDialog -{ -public: - wxFileDialog() {} - - wxFileDialog(wxWindow *parent, - const wxString& message = wxFileSelectorPromptStr, - const wxString& defaultDir = wxEmptyString, - const wxString& defaultFile = wxEmptyString, - const wxString& wildCard = wxFileSelectorDefaultWildcardStr, - long style = 0, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize) - :wxGenericFileDialog(parent, message, - defaultDir, defaultFile, wildCard, - style, - pos, size) - { - } - -private: - wxDECLARE_DYNAMIC_CLASS(wxFileDialog); -}; - -#endif // wxHAS_GENERIC_FILEDIALOG - -#endif // _WX_FILEDLGG_H_ diff --git a/Externals/wxWidgets3/include/wx/generic/filepickerg.h b/Externals/wxWidgets3/include/wx/generic/filepickerg.h deleted file mode 100644 index cf4782f8d7..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/filepickerg.h +++ /dev/null @@ -1,221 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/filepickerg.h -// Purpose: wxGenericFileDirButton, wxGenericFileButton, wxGenericDirButton -// Author: Francesco Montorsi -// Modified by: -// Created: 14/4/2006 -// Copyright: (c) Francesco Montorsi -// Licence: wxWindows Licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_FILEDIRPICKER_H_ -#define _WX_FILEDIRPICKER_H_ - -#include "wx/button.h" -#include "wx/filedlg.h" -#include "wx/dirdlg.h" - - -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_DIRPICKER_CHANGED, wxFileDirPickerEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_FILEPICKER_CHANGED, wxFileDirPickerEvent ); - - -//----------------------------------------------------------------------------- -// wxGenericFileDirButton: a button which brings up a wx{File|Dir}Dialog -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxGenericFileDirButton : public wxButton, - public wxFileDirPickerWidgetBase -{ -public: - wxGenericFileDirButton() { Init(); } - wxGenericFileDirButton(wxWindow *parent, - wxWindowID id, - const wxString& label = wxFilePickerWidgetLabel, - const wxString& path = wxEmptyString, - const wxString &message = wxFileSelectorPromptStr, - const wxString &wildcard = wxFileSelectorDefaultWildcardStr, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxFilePickerWidgetNameStr) - { - Init(); - Create(parent, id, label, path, message, wildcard, - pos, size, style, validator, name); - } - - virtual wxControl *AsControl() wxOVERRIDE { return this; } - -public: // overridable - - virtual wxDialog *CreateDialog() = 0; - - virtual wxWindow *GetDialogParent() - { return GetParent(); } - - virtual wxEventType GetEventType() const = 0; - - virtual void SetInitialDirectory(const wxString& dir) wxOVERRIDE; - -public: - - bool Create(wxWindow *parent, wxWindowID id, - const wxString& label = wxFilePickerWidgetLabel, - const wxString& path = wxEmptyString, - const wxString &message = wxFileSelectorPromptStr, - const wxString &wildcard = wxFileSelectorDefaultWildcardStr, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxFilePickerWidgetNameStr); - - // event handler for the click - void OnButtonClick(wxCommandEvent &); - -protected: - wxString m_message, m_wildcard; - - // we just store the style passed to the ctor here instead of passing it to - // wxButton as some of our bits can conflict with wxButton styles and it - // just doesn't make sense to use picker styles for wxButton anyhow - long m_pickerStyle; - - // Initial directory set by SetInitialDirectory() call or empty. - wxString m_initialDir; - -private: - // common part of all ctors - void Init() { m_pickerStyle = -1; } -}; - - -//----------------------------------------------------------------------------- -// wxGenericFileButton: a button which brings up a wxFileDialog -//----------------------------------------------------------------------------- - -#define wxFILEBTN_DEFAULT_STYLE (wxFLP_OPEN) - -class WXDLLIMPEXP_CORE wxGenericFileButton : public wxGenericFileDirButton -{ -public: - wxGenericFileButton() {} - wxGenericFileButton(wxWindow *parent, - wxWindowID id, - const wxString& label = wxFilePickerWidgetLabel, - const wxString& path = wxEmptyString, - const wxString &message = wxFileSelectorPromptStr, - const wxString &wildcard = wxFileSelectorDefaultWildcardStr, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxFILEBTN_DEFAULT_STYLE, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxFilePickerWidgetNameStr) - { - Create(parent, id, label, path, message, wildcard, - pos, size, style, validator, name); - } - -public: // overridable - - virtual long GetDialogStyle() const - { - // the derived class must initialize it if it doesn't use the - // non-default wxGenericFileDirButton ctor - wxASSERT_MSG( m_pickerStyle != -1, - "forgot to initialize m_pickerStyle?" ); - - - long filedlgstyle = 0; - - if ( m_pickerStyle & wxFLP_OPEN ) - filedlgstyle |= wxFD_OPEN; - if ( m_pickerStyle & wxFLP_SAVE ) - filedlgstyle |= wxFD_SAVE; - if ( m_pickerStyle & wxFLP_OVERWRITE_PROMPT ) - filedlgstyle |= wxFD_OVERWRITE_PROMPT; - if ( m_pickerStyle & wxFLP_FILE_MUST_EXIST ) - filedlgstyle |= wxFD_FILE_MUST_EXIST; - if ( m_pickerStyle & wxFLP_CHANGE_DIR ) - filedlgstyle |= wxFD_CHANGE_DIR; - - return filedlgstyle; - } - - virtual wxDialog *CreateDialog() wxOVERRIDE; - - wxEventType GetEventType() const wxOVERRIDE - { return wxEVT_FILEPICKER_CHANGED; } - -protected: - void UpdateDialogPath(wxDialog *p) wxOVERRIDE - { wxStaticCast(p, wxFileDialog)->SetPath(m_path); } - void UpdatePathFromDialog(wxDialog *p) wxOVERRIDE - { m_path = wxStaticCast(p, wxFileDialog)->GetPath(); } - -private: - wxDECLARE_DYNAMIC_CLASS(wxGenericFileButton); -}; - - -//----------------------------------------------------------------------------- -// wxGenericDirButton: a button which brings up a wxDirDialog -//----------------------------------------------------------------------------- - -#define wxDIRBTN_DEFAULT_STYLE 0 - -class WXDLLIMPEXP_CORE wxGenericDirButton : public wxGenericFileDirButton -{ -public: - wxGenericDirButton() {} - wxGenericDirButton(wxWindow *parent, - wxWindowID id, - const wxString& label = wxDirPickerWidgetLabel, - const wxString& path = wxEmptyString, - const wxString &message = wxDirSelectorPromptStr, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDIRBTN_DEFAULT_STYLE, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxDirPickerWidgetNameStr) - { - Create(parent, id, label, path, message, wxEmptyString, - pos, size, style, validator, name); - } - -public: // overridable - - virtual long GetDialogStyle() const - { - long dirdlgstyle = wxDD_DEFAULT_STYLE; - - if ( m_pickerStyle & wxDIRP_DIR_MUST_EXIST ) - dirdlgstyle |= wxDD_DIR_MUST_EXIST; - if ( m_pickerStyle & wxDIRP_CHANGE_DIR ) - dirdlgstyle |= wxDD_CHANGE_DIR; - - return dirdlgstyle; - } - - virtual wxDialog *CreateDialog() wxOVERRIDE; - - wxEventType GetEventType() const wxOVERRIDE - { return wxEVT_DIRPICKER_CHANGED; } - -protected: - void UpdateDialogPath(wxDialog *p) wxOVERRIDE - { wxStaticCast(p, wxDirDialog)->SetPath(m_path); } - void UpdatePathFromDialog(wxDialog *p) wxOVERRIDE - { m_path = wxStaticCast(p, wxDirDialog)->GetPath(); } - -private: - wxDECLARE_DYNAMIC_CLASS(wxGenericDirButton); -}; - -// old wxEVT_COMMAND_* constants -//#define wxEVT_COMMAND_DIRPICKER_CHANGED wxEVT_DIRPICKER_CHANGED -//#define wxEVT_COMMAND_FILEPICKER_CHANGED wxEVT_FILEPICKER_CHANGED - -#endif // _WX_FILEDIRPICKER_H_ diff --git a/Externals/wxWidgets3/include/wx/generic/fontdlgg.h b/Externals/wxWidgets3/include/wx/generic/fontdlgg.h deleted file mode 100644 index 4d01c899e4..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/fontdlgg.h +++ /dev/null @@ -1,93 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/fontdlgg.h -// Purpose: wxGenericFontDialog -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GENERIC_FONTDLGG_H -#define _WX_GENERIC_FONTDLGG_H - -#include "wx/gdicmn.h" -#include "wx/font.h" - -#define USE_SPINCTRL_FOR_POINT_SIZE 0 - -/* - * FONT DIALOG - */ - -class WXDLLIMPEXP_FWD_CORE wxChoice; -class WXDLLIMPEXP_FWD_CORE wxText; -class WXDLLIMPEXP_FWD_CORE wxCheckBox; -class WXDLLIMPEXP_FWD_CORE wxFontPreviewer; - -enum -{ - wxID_FONT_UNDERLINE = 3000, - wxID_FONT_STYLE, - wxID_FONT_WEIGHT, - wxID_FONT_FAMILY, - wxID_FONT_COLOUR, - wxID_FONT_SIZE -}; - -class WXDLLIMPEXP_CORE wxGenericFontDialog : public wxFontDialogBase -{ -public: - wxGenericFontDialog() { Init(); } - wxGenericFontDialog(wxWindow *parent) - : wxFontDialogBase(parent) { Init(); } - wxGenericFontDialog(wxWindow *parent, const wxFontData& data) - : wxFontDialogBase(parent, data) { Init(); } - virtual ~wxGenericFontDialog(); - - virtual int ShowModal() wxOVERRIDE; - - // Internal functions - void OnCloseWindow(wxCloseEvent& event); - - virtual void CreateWidgets(); - virtual void InitializeFont(); - - void OnChangeFont(wxCommandEvent& event); - -#if USE_SPINCTRL_FOR_POINT_SIZE - void OnChangeSize(wxSpinEvent& event); -#endif - -protected: - - virtual bool DoCreate(wxWindow *parent) wxOVERRIDE; - -private: - - // common part of all ctors - void Init(); - - void DoChangeFont(); - - wxFont m_dialogFont; - - wxChoice *m_familyChoice; - wxChoice *m_styleChoice; - wxChoice *m_weightChoice; - wxChoice *m_colourChoice; - wxCheckBox *m_underLineCheckBox; - -#if !USE_SPINCTRL_FOR_POINT_SIZE - wxChoice *m_pointSizeChoice; -#endif - - wxFontPreviewer *m_previewer; - bool m_useEvents; - - // static bool fontDialogCancelled; - wxDECLARE_EVENT_TABLE(); - wxDECLARE_DYNAMIC_CLASS(wxGenericFontDialog); -}; - -#endif // _WX_GENERIC_FONTDLGG_H diff --git a/Externals/wxWidgets3/include/wx/generic/fontpickerg.h b/Externals/wxWidgets3/include/wx/generic/fontpickerg.h deleted file mode 100644 index ea2180ed35..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/fontpickerg.h +++ /dev/null @@ -1,81 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/fontpickerg.h -// Purpose: wxGenericFontButton header -// Author: Francesco Montorsi -// Modified by: -// Created: 14/4/2006 -// Copyright: (c) Francesco Montorsi -// Licence: wxWindows Licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_FONTPICKER_H_ -#define _WX_FONTPICKER_H_ - -#include "wx/button.h" -#include "wx/fontdata.h" - -//----------------------------------------------------------------------------- -// wxGenericFontButton: a button which brings up a wxFontDialog -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxGenericFontButton : public wxButton, - public wxFontPickerWidgetBase -{ -public: - wxGenericFontButton() {} - wxGenericFontButton(wxWindow *parent, - wxWindowID id, - const wxFont &initial = wxNullFont, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxFONTBTN_DEFAULT_STYLE, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxFontPickerWidgetNameStr) - { - Create(parent, id, initial, pos, size, style, validator, name); - } - - virtual wxColour GetSelectedColour() const - { return m_data.GetColour(); } - - virtual void SetSelectedColour(const wxColour &colour) - { m_data.SetColour(colour); UpdateFont(); } - - virtual ~wxGenericFontButton() {} - - -public: // API extensions specific for wxGenericFontButton - - // user can override this to init font data in a different way - virtual void InitFontData(); - - // returns the font data shown in wxFontDialog - wxFontData *GetFontData() { return &m_data; } - - -public: - - bool Create(wxWindow *parent, - wxWindowID id, - const wxFont &initial = *wxNORMAL_FONT, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxFONTBTN_DEFAULT_STYLE, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxFontPickerWidgetNameStr); - - void OnButtonClick(wxCommandEvent &); - - -protected: - - void UpdateFont(); - - wxFontData m_data; - -private: - wxDECLARE_DYNAMIC_CLASS(wxGenericFontButton); -}; - - -#endif // _WX_FONTPICKER_H_ diff --git a/Externals/wxWidgets3/include/wx/generic/fswatcher.h b/Externals/wxWidgets3/include/wx/generic/fswatcher.h deleted file mode 100644 index efd7631b47..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/fswatcher.h +++ /dev/null @@ -1,25 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/fswatcher.h -// Purpose: wxPollingFileSystemWatcher -// Author: Bartosz Bekier -// Created: 2009-05-26 -// Copyright: (c) 2009 Bartosz Bekier -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_FSWATCHER_GENERIC_H_ -#define _WX_FSWATCHER_GENERIC_H_ - -#include "wx/defs.h" - -#if wxUSE_FSWATCHER - -class WXDLLIMPEXP_BASE wxPollingFileSystemWatcher : public wxFileSystemWatcherBase -{ -public: - -}; - -#endif // wxUSE_FSWATCHER - -#endif /* _WX_FSWATCHER_GENERIC_H_ */ diff --git a/Externals/wxWidgets3/include/wx/generic/grid.h b/Externals/wxWidgets3/include/wx/generic/grid.h deleted file mode 100644 index c1adbb0b24..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/grid.h +++ /dev/null @@ -1,2740 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/grid.h -// Purpose: wxGrid and related classes -// Author: Michael Bedward (based on code by Julian Smart, Robin Dunn) -// Modified by: Santiago Palacios -// Created: 1/08/1999 -// Copyright: (c) Michael Bedward -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GENERIC_GRID_H_ -#define _WX_GENERIC_GRID_H_ - -#include "wx/defs.h" - -#if wxUSE_GRID - -#include "wx/hashmap.h" - -#include "wx/scrolwin.h" - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -extern WXDLLIMPEXP_DATA_ADV(const char) wxGridNameStr[]; - -// Default parameters for wxGrid -// -#define WXGRID_DEFAULT_NUMBER_ROWS 10 -#define WXGRID_DEFAULT_NUMBER_COLS 10 -#if defined(__WXMSW__) || defined(__WXGTK20__) -#define WXGRID_DEFAULT_ROW_HEIGHT 25 -#else -#define WXGRID_DEFAULT_ROW_HEIGHT 30 -#endif // __WXMSW__ -#define WXGRID_DEFAULT_COL_WIDTH 80 -#define WXGRID_DEFAULT_COL_LABEL_HEIGHT 32 -#define WXGRID_DEFAULT_ROW_LABEL_WIDTH 82 -#define WXGRID_LABEL_EDGE_ZONE 2 -#define WXGRID_MIN_ROW_HEIGHT 15 -#define WXGRID_MIN_COL_WIDTH 15 -#define WXGRID_DEFAULT_SCROLLBAR_WIDTH 16 - -// type names for grid table values -#define wxGRID_VALUE_STRING wxT("string") -#define wxGRID_VALUE_BOOL wxT("bool") -#define wxGRID_VALUE_NUMBER wxT("long") -#define wxGRID_VALUE_FLOAT wxT("double") -#define wxGRID_VALUE_CHOICE wxT("choice") - -#define wxGRID_VALUE_TEXT wxGRID_VALUE_STRING -#define wxGRID_VALUE_LONG wxGRID_VALUE_NUMBER - -// magic constant which tells (to some functions) to automatically calculate -// the appropriate size -#define wxGRID_AUTOSIZE (-1) - -// many wxGrid methods work either with columns or rows, this enum is used for -// the parameter indicating which one should it be -enum wxGridDirection -{ - wxGRID_COLUMN, - wxGRID_ROW -}; - -// Flags used with wxGrid::Render() to select parts of the grid to draw. -enum wxGridRenderStyle -{ - wxGRID_DRAW_ROWS_HEADER = 0x001, - wxGRID_DRAW_COLS_HEADER = 0x002, - wxGRID_DRAW_CELL_LINES = 0x004, - wxGRID_DRAW_BOX_RECT = 0x008, - wxGRID_DRAW_SELECTION = 0x010, - wxGRID_DRAW_DEFAULT = wxGRID_DRAW_ROWS_HEADER | - wxGRID_DRAW_COLS_HEADER | - wxGRID_DRAW_CELL_LINES | - wxGRID_DRAW_BOX_RECT -}; - -// ---------------------------------------------------------------------------- -// forward declarations -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_ADV wxGrid; -class WXDLLIMPEXP_FWD_ADV wxGridCellAttr; -class WXDLLIMPEXP_FWD_ADV wxGridCellAttrProviderData; -class WXDLLIMPEXP_FWD_ADV wxGridColLabelWindow; -class WXDLLIMPEXP_FWD_ADV wxGridCornerLabelWindow; -class WXDLLIMPEXP_FWD_ADV wxGridRowLabelWindow; -class WXDLLIMPEXP_FWD_ADV wxGridWindow; -class WXDLLIMPEXP_FWD_ADV wxGridTypeRegistry; -class WXDLLIMPEXP_FWD_ADV wxGridSelection; - -class WXDLLIMPEXP_FWD_CORE wxHeaderCtrl; -class WXDLLIMPEXP_FWD_CORE wxCheckBox; -class WXDLLIMPEXP_FWD_CORE wxComboBox; -class WXDLLIMPEXP_FWD_CORE wxTextCtrl; -#if wxUSE_SPINCTRL -class WXDLLIMPEXP_FWD_CORE wxSpinCtrl; -#endif - -class wxGridFixedIndicesSet; - -class wxGridOperations; -class wxGridRowOperations; -class wxGridColumnOperations; -class wxGridDirectionOperations; - - -// ---------------------------------------------------------------------------- -// macros -// ---------------------------------------------------------------------------- - -#define wxSafeIncRef(p) if ( p ) (p)->IncRef() -#define wxSafeDecRef(p) if ( p ) (p)->DecRef() - -// ---------------------------------------------------------------------------- -// wxGridCellWorker: common base class for wxGridCellRenderer and -// wxGridCellEditor -// -// NB: this is more an implementation convenience than a design issue, so this -// class is not documented and is not public at all -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxGridCellWorker : public wxClientDataContainer, public wxRefCounter -{ -public: - wxGridCellWorker() { } - - // interpret renderer parameters: arbitrary string whose interpretation is - // left to the derived classes - virtual void SetParameters(const wxString& params); - -protected: - // virtual dtor for any base class - private because only DecRef() can - // delete us - virtual ~wxGridCellWorker(); - -private: - // suppress the stupid gcc warning about the class having private dtor and - // no friends - friend class wxGridCellWorkerDummyFriend; -}; - -// ---------------------------------------------------------------------------- -// wxGridCellRenderer: this class is responsible for actually drawing the cell -// in the grid. You may pass it to the wxGridCellAttr (below) to change the -// format of one given cell or to wxGrid::SetDefaultRenderer() to change the -// view of all cells. This is an ABC, you will normally use one of the -// predefined derived classes or derive your own class from it. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxGridCellRenderer : public wxGridCellWorker -{ -public: - // draw the given cell on the provided DC inside the given rectangle - // using the style specified by the attribute and the default or selected - // state corresponding to the isSelected value. - // - // this pure virtual function has a default implementation which will - // prepare the DC using the given attribute: it will draw the rectangle - // with the bg colour from attr and set the text colour and font - virtual void Draw(wxGrid& grid, - wxGridCellAttr& attr, - wxDC& dc, - const wxRect& rect, - int row, int col, - bool isSelected) = 0; - - // get the preferred size of the cell for its contents - virtual wxSize GetBestSize(wxGrid& grid, - wxGridCellAttr& attr, - wxDC& dc, - int row, int col) = 0; - - // Get the preferred height for a given width. Override this method if the - // renderer computes height as function of its width, as is the case of the - // standard wxGridCellAutoWrapStringRenderer, for example. - // and vice versa - virtual int GetBestHeight(wxGrid& grid, - wxGridCellAttr& attr, - wxDC& dc, - int row, int col, - int WXUNUSED(width)) - { - return GetBestSize(grid, attr, dc, row, col).GetHeight(); - } - - // Get the preferred width for a given height, this is the symmetric - // version of GetBestHeight(). - virtual int GetBestWidth(wxGrid& grid, - wxGridCellAttr& attr, - wxDC& dc, - int row, int col, - int WXUNUSED(height)) - { - return GetBestSize(grid, attr, dc, row, col).GetWidth(); - } - - // create a new object which is the copy of this one - virtual wxGridCellRenderer *Clone() const = 0; -}; - -// ---------------------------------------------------------------------------- -// wxGridCellEditor: This class is responsible for providing and manipulating -// the in-place edit controls for the grid. Instances of wxGridCellEditor -// (actually, instances of derived classes since it is an ABC) can be -// associated with the cell attributes for individual cells, rows, columns, or -// even for the entire grid. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxGridCellEditor : public wxGridCellWorker -{ -public: - wxGridCellEditor(); - - bool IsCreated() const { return m_control != NULL; } - wxControl* GetControl() const { return m_control; } - void SetControl(wxControl* control) { m_control = control; } - - wxGridCellAttr* GetCellAttr() const { return m_attr; } - void SetCellAttr(wxGridCellAttr* attr) { m_attr = attr; } - - // Creates the actual edit control - virtual void Create(wxWindow* parent, - wxWindowID id, - wxEvtHandler* evtHandler) = 0; - - // Size and position the edit control - virtual void SetSize(const wxRect& rect); - - // Show or hide the edit control, use the specified attributes to set - // colours/fonts for it - virtual void Show(bool show, wxGridCellAttr *attr = NULL); - - // Draws the part of the cell not occupied by the control: the base class - // version just fills it with background colour from the attribute - virtual void PaintBackground(wxDC& dc, - const wxRect& rectCell, - const wxGridCellAttr& attr); - - - // The methods called by wxGrid when a cell is edited: first BeginEdit() is - // called, then EndEdit() is and if it returns true and if the change is - // not vetoed by a user-defined event handler, finally ApplyEdit() is called - - // Fetch the value from the table and prepare the edit control - // to begin editing. Set the focus to the edit control. - virtual void BeginEdit(int row, int col, wxGrid* grid) = 0; - - // Returns false if nothing changed, otherwise returns true and return the - // new value in its string form in the newval output parameter. - // - // This should also store the new value in its real type internally so that - // it could be used by ApplyEdit() but it must not modify the grid as the - // change could still be vetoed. - virtual bool EndEdit(int row, int col, const wxGrid *grid, - const wxString& oldval, wxString *newval) = 0; - - // Complete the editing of the current cell by storing the value saved by - // the previous call to EndEdit() in the grid - virtual void ApplyEdit(int row, int col, wxGrid* grid) = 0; - - - // Reset the value in the control back to its starting value - virtual void Reset() = 0; - - // return true to allow the given key to start editing: the base class - // version only checks that the event has no modifiers. The derived - // classes are supposed to do "if ( base::IsAcceptedKey() && ... )" in - // their IsAcceptedKey() implementation, although, of course, it is not a - // mandatory requirment. - // - // NB: if the key is F2 (special), editing will always start and this - // method will not be called at all (but StartingKey() will) - virtual bool IsAcceptedKey(wxKeyEvent& event); - - // If the editor is enabled by pressing keys on the grid, this will be - // called to let the editor do something about that first key if desired - virtual void StartingKey(wxKeyEvent& event); - - // if the editor is enabled by clicking on the cell, this method will be - // called - virtual void StartingClick(); - - // Some types of controls on some platforms may need some help - // with the Return key. - virtual void HandleReturn(wxKeyEvent& event); - - // Final cleanup - virtual void Destroy(); - - // create a new object which is the copy of this one - virtual wxGridCellEditor *Clone() const = 0; - - // added GetValue so we can get the value which is in the control - virtual wxString GetValue() const = 0; - -protected: - // the dtor is private because only DecRef() can delete us - virtual ~wxGridCellEditor(); - - // the control we show on screen - wxControl* m_control; - - // a temporary pointer to the attribute being edited - wxGridCellAttr* m_attr; - - // if we change the colours/font of the control from the default ones, we - // must restore the default later and we save them here between calls to - // Show(true) and Show(false) - wxColour m_colFgOld, - m_colBgOld; - wxFont m_fontOld; - - // suppress the stupid gcc warning about the class having private dtor and - // no friends - friend class wxGridCellEditorDummyFriend; - - wxDECLARE_NO_COPY_CLASS(wxGridCellEditor); -}; - -// ---------------------------------------------------------------------------- -// wxGridHeaderRenderer and company: like wxGridCellRenderer but for headers -// ---------------------------------------------------------------------------- - -// Base class for corner window renderer: it is the simplest of all renderers -// and only has a single function -class WXDLLIMPEXP_ADV wxGridCornerHeaderRenderer -{ -public: - // Draw the border around the corner window. - virtual void DrawBorder(const wxGrid& grid, - wxDC& dc, - wxRect& rect) const = 0; - - // make the dtor of a class with virtual functions virtual to avoid g++ - // warnings, even though this class is not supposed to be used - // polymorphically - virtual ~wxGridCornerHeaderRenderer() { } -}; - - -// Base class for the row/column header cells renderers -class WXDLLIMPEXP_ADV wxGridHeaderLabelsRenderer - : public wxGridCornerHeaderRenderer -{ -public: - // Draw header cell label - virtual void DrawLabel(const wxGrid& grid, - wxDC& dc, - const wxString& value, - const wxRect& rect, - int horizAlign, - int vertAlign, - int textOrientation) const; -}; - -// Currently the row/column/corner renders don't need any methods other than -// those already in wxGridHeaderLabelsRenderer but still define separate classes -// for them for future extensions and also for better type safety (i.e. to -// avoid inadvertently using a column header renderer for the row headers) -class WXDLLIMPEXP_ADV wxGridRowHeaderRenderer - : public wxGridHeaderLabelsRenderer -{ -}; - -class WXDLLIMPEXP_ADV wxGridColumnHeaderRenderer - : public wxGridHeaderLabelsRenderer -{ -}; - -// Also define the default renderers which are used by wxGridCellAttrProvider -// by default -class WXDLLIMPEXP_ADV wxGridRowHeaderRendererDefault - : public wxGridRowHeaderRenderer -{ -public: - virtual void DrawBorder(const wxGrid& grid, - wxDC& dc, - wxRect& rect) const wxOVERRIDE; -}; - -// Column header cells renderers -class WXDLLIMPEXP_ADV wxGridColumnHeaderRendererDefault - : public wxGridColumnHeaderRenderer -{ -public: - virtual void DrawBorder(const wxGrid& grid, - wxDC& dc, - wxRect& rect) const wxOVERRIDE; -}; - -// Header corner renderer -class WXDLLIMPEXP_ADV wxGridCornerHeaderRendererDefault - : public wxGridCornerHeaderRenderer -{ -public: - virtual void DrawBorder(const wxGrid& grid, - wxDC& dc, - wxRect& rect) const wxOVERRIDE; -}; - - -// ---------------------------------------------------------------------------- -// wxGridCellAttr: this class can be used to alter the cells appearance in -// the grid by changing their colour/font/... from default. An object of this -// class may be returned by wxGridTable::GetAttr(). -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxGridCellAttr : public wxClientDataContainer, public wxRefCounter -{ -public: - enum wxAttrKind - { - Any, - Default, - Cell, - Row, - Col, - Merged - }; - - // ctors - wxGridCellAttr(wxGridCellAttr *attrDefault = NULL) - { - Init(attrDefault); - - SetAlignment(wxALIGN_INVALID, wxALIGN_INVALID); - } - - // VZ: considering the number of members wxGridCellAttr has now, this ctor - // seems to be pretty useless... may be we should just remove it? - wxGridCellAttr(const wxColour& colText, - const wxColour& colBack, - const wxFont& font, - int hAlign, - int vAlign) - : m_colText(colText), m_colBack(colBack), m_font(font) - { - Init(); - SetAlignment(hAlign, vAlign); - } - - // creates a new copy of this object - wxGridCellAttr *Clone() const; - void MergeWith(wxGridCellAttr *mergefrom); - - // setters - void SetTextColour(const wxColour& colText) { m_colText = colText; } - void SetBackgroundColour(const wxColour& colBack) { m_colBack = colBack; } - void SetFont(const wxFont& font) { m_font = font; } - void SetAlignment(int hAlign, int vAlign) - { - m_hAlign = hAlign; - m_vAlign = vAlign; - } - void SetSize(int num_rows, int num_cols); - void SetOverflow(bool allow = true) - { m_overflow = allow ? Overflow : SingleCell; } - void SetReadOnly(bool isReadOnly = true) - { m_isReadOnly = isReadOnly ? ReadOnly : ReadWrite; } - - // takes ownership of the pointer - void SetRenderer(wxGridCellRenderer *renderer) - { wxSafeDecRef(m_renderer); m_renderer = renderer; } - void SetEditor(wxGridCellEditor* editor) - { wxSafeDecRef(m_editor); m_editor = editor; } - - void SetKind(wxAttrKind kind) { m_attrkind = kind; } - - // accessors - bool HasTextColour() const { return m_colText.IsOk(); } - bool HasBackgroundColour() const { return m_colBack.IsOk(); } - bool HasFont() const { return m_font.IsOk(); } - bool HasAlignment() const - { - return m_hAlign != wxALIGN_INVALID || m_vAlign != wxALIGN_INVALID; - } - bool HasRenderer() const { return m_renderer != NULL; } - bool HasEditor() const { return m_editor != NULL; } - bool HasReadWriteMode() const { return m_isReadOnly != Unset; } - bool HasOverflowMode() const { return m_overflow != UnsetOverflow; } - bool HasSize() const { return m_sizeRows != 1 || m_sizeCols != 1; } - - const wxColour& GetTextColour() const; - const wxColour& GetBackgroundColour() const; - const wxFont& GetFont() const; - void GetAlignment(int *hAlign, int *vAlign) const; - - // unlike GetAlignment() which always overwrites its output arguments with - // the alignment values to use, falling back on default alignment if this - // attribute doesn't have any, this function will preserve the values of - // parameters on entry if the corresponding alignment is not set in this - // attribute meaning that they can be initialized to default alignment (and - // also that they must be initialized, unlike with GetAlignment()) - void GetNonDefaultAlignment(int *hAlign, int *vAlign) const; - - void GetSize(int *num_rows, int *num_cols) const; - bool GetOverflow() const - { return m_overflow != SingleCell; } - wxGridCellRenderer *GetRenderer(const wxGrid* grid, int row, int col) const; - wxGridCellEditor *GetEditor(const wxGrid* grid, int row, int col) const; - - bool IsReadOnly() const { return m_isReadOnly == wxGridCellAttr::ReadOnly; } - - wxAttrKind GetKind() { return m_attrkind; } - - void SetDefAttr(wxGridCellAttr* defAttr) { m_defGridAttr = defAttr; } - -protected: - // the dtor is private because only DecRef() can delete us - virtual ~wxGridCellAttr() - { - wxSafeDecRef(m_renderer); - wxSafeDecRef(m_editor); - } - -private: - enum wxAttrReadMode - { - Unset = -1, - ReadWrite, - ReadOnly - }; - - enum wxAttrOverflowMode - { - UnsetOverflow = -1, - Overflow, - SingleCell - }; - - // the common part of all ctors - void Init(wxGridCellAttr *attrDefault = NULL); - - - wxColour m_colText, - m_colBack; - wxFont m_font; - int m_hAlign, - m_vAlign; - int m_sizeRows, - m_sizeCols; - - wxAttrOverflowMode m_overflow; - - wxGridCellRenderer* m_renderer; - wxGridCellEditor* m_editor; - wxGridCellAttr* m_defGridAttr; - - wxAttrReadMode m_isReadOnly; - - wxAttrKind m_attrkind; - - // use Clone() instead - wxDECLARE_NO_COPY_CLASS(wxGridCellAttr); - - // suppress the stupid gcc warning about the class having private dtor and - // no friends - friend class wxGridCellAttrDummyFriend; -}; - -// ---------------------------------------------------------------------------- -// wxGridCellAttrProvider: class used by wxGridTableBase to retrieve/store the -// cell attributes. -// ---------------------------------------------------------------------------- - -// implementation note: we separate it from wxGridTableBase because we wish to -// avoid deriving a new table class if possible, and sometimes it will be -// enough to just derive another wxGridCellAttrProvider instead -// -// the default implementation is reasonably efficient for the generic case, -// but you might still wish to implement your own for some specific situations -// if you have performance problems with the stock one -class WXDLLIMPEXP_ADV wxGridCellAttrProvider : public wxClientDataContainer -{ -public: - wxGridCellAttrProvider(); - virtual ~wxGridCellAttrProvider(); - - // DecRef() must be called on the returned pointer - virtual wxGridCellAttr *GetAttr(int row, int col, - wxGridCellAttr::wxAttrKind kind ) const; - - // all these functions take ownership of the pointer, don't call DecRef() - // on it - virtual void SetAttr(wxGridCellAttr *attr, int row, int col); - virtual void SetRowAttr(wxGridCellAttr *attr, int row); - virtual void SetColAttr(wxGridCellAttr *attr, int col); - - // these functions must be called whenever some rows/cols are deleted - // because the internal data must be updated then - void UpdateAttrRows( size_t pos, int numRows ); - void UpdateAttrCols( size_t pos, int numCols ); - - - // get renderers for the given row/column header label and the corner - // window: unlike cell renderers, these objects are not reference counted - // and are never NULL so they are returned by reference - virtual const wxGridColumnHeaderRenderer& GetColumnHeaderRenderer(int col); - virtual const wxGridRowHeaderRenderer& GetRowHeaderRenderer(int row); - virtual const wxGridCornerHeaderRenderer& GetCornerRenderer(); - -private: - void InitData(); - - wxGridCellAttrProviderData *m_data; - - wxDECLARE_NO_COPY_CLASS(wxGridCellAttrProvider); -}; - -// ---------------------------------------------------------------------------- -// wxGridCellCoords: location of a cell in the grid -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxGridCellCoords -{ -public: - wxGridCellCoords() { m_row = m_col = -1; } - wxGridCellCoords( int r, int c ) { m_row = r; m_col = c; } - - // default copy ctor is ok - - int GetRow() const { return m_row; } - void SetRow( int n ) { m_row = n; } - int GetCol() const { return m_col; } - void SetCol( int n ) { m_col = n; } - void Set( int row, int col ) { m_row = row; m_col = col; } - - wxGridCellCoords& operator=( const wxGridCellCoords& other ) - { - if ( &other != this ) - { - m_row=other.m_row; - m_col=other.m_col; - } - return *this; - } - - bool operator==( const wxGridCellCoords& other ) const - { - return (m_row == other.m_row && m_col == other.m_col); - } - - bool operator!=( const wxGridCellCoords& other ) const - { - return (m_row != other.m_row || m_col != other.m_col); - } - - bool operator!() const - { - return (m_row == -1 && m_col == -1 ); - } - -private: - int m_row; - int m_col; -}; - - -// For comparisons... -// -extern WXDLLIMPEXP_ADV wxGridCellCoords wxGridNoCellCoords; -extern WXDLLIMPEXP_ADV wxRect wxGridNoCellRect; - -// An array of cell coords... -// -WX_DECLARE_OBJARRAY_WITH_DECL(wxGridCellCoords, wxGridCellCoordsArray, - class WXDLLIMPEXP_ADV); - -// ---------------------------------------------------------------------------- -// Grid table classes -// ---------------------------------------------------------------------------- - -// the abstract base class -class WXDLLIMPEXP_ADV wxGridTableBase : public wxObject, - public wxClientDataContainer -{ -public: - wxGridTableBase(); - virtual ~wxGridTableBase(); - - // You must override these functions in a derived table class - // - - // return the number of rows and columns in this table - virtual int GetNumberRows() = 0; - virtual int GetNumberCols() = 0; - - // the methods above are unfortunately non-const even though they should - // have been const -- but changing it now is not possible any longer as it - // would break the existing code overriding them, so instead we provide - // these const synonyms which can be used from const-correct code - int GetRowsCount() const - { return const_cast(this)->GetNumberRows(); } - int GetColsCount() const - { return const_cast(this)->GetNumberCols(); } - - - virtual bool IsEmptyCell( int row, int col ) - { - return GetValue(row, col).empty(); - } - - bool IsEmpty(const wxGridCellCoords& coord) - { - return IsEmptyCell(coord.GetRow(), coord.GetCol()); - } - - virtual wxString GetValue( int row, int col ) = 0; - virtual void SetValue( int row, int col, const wxString& value ) = 0; - - // Data type determination and value access - virtual wxString GetTypeName( int row, int col ); - virtual bool CanGetValueAs( int row, int col, const wxString& typeName ); - virtual bool CanSetValueAs( int row, int col, const wxString& typeName ); - - virtual long GetValueAsLong( int row, int col ); - virtual double GetValueAsDouble( int row, int col ); - virtual bool GetValueAsBool( int row, int col ); - - virtual void SetValueAsLong( int row, int col, long value ); - virtual void SetValueAsDouble( int row, int col, double value ); - virtual void SetValueAsBool( int row, int col, bool value ); - - // For user defined types - virtual void* GetValueAsCustom( int row, int col, const wxString& typeName ); - virtual void SetValueAsCustom( int row, int col, const wxString& typeName, void* value ); - - - // Overriding these is optional - // - virtual void SetView( wxGrid *grid ) { m_view = grid; } - virtual wxGrid * GetView() const { return m_view; } - - virtual void Clear() {} - virtual bool InsertRows( size_t pos = 0, size_t numRows = 1 ); - virtual bool AppendRows( size_t numRows = 1 ); - virtual bool DeleteRows( size_t pos = 0, size_t numRows = 1 ); - virtual bool InsertCols( size_t pos = 0, size_t numCols = 1 ); - virtual bool AppendCols( size_t numCols = 1 ); - virtual bool DeleteCols( size_t pos = 0, size_t numCols = 1 ); - - virtual wxString GetRowLabelValue( int row ); - virtual wxString GetColLabelValue( int col ); - virtual void SetRowLabelValue( int WXUNUSED(row), const wxString& ) {} - virtual void SetColLabelValue( int WXUNUSED(col), const wxString& ) {} - - // Attribute handling - // - - // give us the attr provider to use - we take ownership of the pointer - void SetAttrProvider(wxGridCellAttrProvider *attrProvider); - - // get the currently used attr provider (may be NULL) - wxGridCellAttrProvider *GetAttrProvider() const { return m_attrProvider; } - - // Does this table allow attributes? Default implementation creates - // a wxGridCellAttrProvider if necessary. - virtual bool CanHaveAttributes(); - - // by default forwarded to wxGridCellAttrProvider if any. May be - // overridden to handle attributes directly in the table. - virtual wxGridCellAttr *GetAttr( int row, int col, - wxGridCellAttr::wxAttrKind kind ); - - - // these functions take ownership of the pointer - virtual void SetAttr(wxGridCellAttr* attr, int row, int col); - virtual void SetRowAttr(wxGridCellAttr *attr, int row); - virtual void SetColAttr(wxGridCellAttr *attr, int col); - -private: - wxGrid * m_view; - wxGridCellAttrProvider *m_attrProvider; - - wxDECLARE_ABSTRACT_CLASS(wxGridTableBase); - wxDECLARE_NO_COPY_CLASS(wxGridTableBase); -}; - - -// ---------------------------------------------------------------------------- -// wxGridTableMessage -// ---------------------------------------------------------------------------- - -// IDs for messages sent from grid table to view -// -enum wxGridTableRequest -{ - // The first two requests never did anything, simply don't use them. -#if WXWIN_COMPATIBILITY_3_0 - wxGRIDTABLE_REQUEST_VIEW_GET_VALUES = 2000, - wxGRIDTABLE_REQUEST_VIEW_SEND_VALUES, -#endif // WXWIN_COMPATIBILITY_3_0 - wxGRIDTABLE_NOTIFY_ROWS_INSERTED = 2002, - wxGRIDTABLE_NOTIFY_ROWS_APPENDED, - wxGRIDTABLE_NOTIFY_ROWS_DELETED, - wxGRIDTABLE_NOTIFY_COLS_INSERTED, - wxGRIDTABLE_NOTIFY_COLS_APPENDED, - wxGRIDTABLE_NOTIFY_COLS_DELETED -}; - -class WXDLLIMPEXP_ADV wxGridTableMessage -{ -public: - wxGridTableMessage(); - wxGridTableMessage( wxGridTableBase *table, int id, - int comInt1 = -1, - int comInt2 = -1 ); - - void SetTableObject( wxGridTableBase *table ) { m_table = table; } - wxGridTableBase * GetTableObject() const { return m_table; } - void SetId( int id ) { m_id = id; } - int GetId() { return m_id; } - void SetCommandInt( int comInt1 ) { m_comInt1 = comInt1; } - int GetCommandInt() { return m_comInt1; } - void SetCommandInt2( int comInt2 ) { m_comInt2 = comInt2; } - int GetCommandInt2() { return m_comInt2; } - -private: - wxGridTableBase *m_table; - int m_id; - int m_comInt1; - int m_comInt2; - - wxDECLARE_NO_COPY_CLASS(wxGridTableMessage); -}; - - - -// ------ wxGridStringArray -// A 2-dimensional array of strings for data values -// - -WX_DECLARE_OBJARRAY_WITH_DECL(wxArrayString, wxGridStringArray, - class WXDLLIMPEXP_ADV); - - - -// ------ wxGridStringTable -// -// Simplest type of data table for a grid for small tables of strings -// that are stored in memory -// - -class WXDLLIMPEXP_ADV wxGridStringTable : public wxGridTableBase -{ -public: - wxGridStringTable(); - wxGridStringTable( int numRows, int numCols ); - - // these are pure virtual in wxGridTableBase - // - virtual int GetNumberRows() wxOVERRIDE { return static_cast(m_data.size()); } - virtual int GetNumberCols() wxOVERRIDE { return m_numCols; } - virtual wxString GetValue( int row, int col ) wxOVERRIDE; - virtual void SetValue( int row, int col, const wxString& s ) wxOVERRIDE; - - // overridden functions from wxGridTableBase - // - void Clear() wxOVERRIDE; - bool InsertRows( size_t pos = 0, size_t numRows = 1 ) wxOVERRIDE; - bool AppendRows( size_t numRows = 1 ) wxOVERRIDE; - bool DeleteRows( size_t pos = 0, size_t numRows = 1 ) wxOVERRIDE; - bool InsertCols( size_t pos = 0, size_t numCols = 1 ) wxOVERRIDE; - bool AppendCols( size_t numCols = 1 ) wxOVERRIDE; - bool DeleteCols( size_t pos = 0, size_t numCols = 1 ) wxOVERRIDE; - - void SetRowLabelValue( int row, const wxString& ) wxOVERRIDE; - void SetColLabelValue( int col, const wxString& ) wxOVERRIDE; - wxString GetRowLabelValue( int row ) wxOVERRIDE; - wxString GetColLabelValue( int col ) wxOVERRIDE; - -private: - wxGridStringArray m_data; - - // notice that while we don't need to store the number of our rows as it's - // always equal to the size of m_data array, we do need to store the number - // of our columns as we can't retrieve it from m_data when the number of - // rows is 0 (see #10818) - int m_numCols; - - // These only get used if you set your own labels, otherwise the - // GetRow/ColLabelValue functions return wxGridTableBase defaults - // - wxArrayString m_rowLabels; - wxArrayString m_colLabels; - - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxGridStringTable); -}; - - - -// ============================================================================ -// Grid view classes -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxGridSizesInfo stores information about sizes of the rows or columns. -// -// It assumes that most of the columns or rows have default size and so stores -// the default size separately and uses a hash to map column or row numbers to -// their non default size for those which don't have the default size. -// ---------------------------------------------------------------------------- - -// hash map to store positions as the keys and sizes as the values -WX_DECLARE_HASH_MAP_WITH_DECL( unsigned, int, wxIntegerHash, wxIntegerEqual, - wxUnsignedToIntHashMap, class WXDLLIMPEXP_ADV ); - -struct WXDLLIMPEXP_ADV wxGridSizesInfo -{ - // default ctor, initialize m_sizeDefault and m_customSizes later - wxGridSizesInfo() { } - - // ctor used by wxGrid::Get{Col,Row}Sizes() - wxGridSizesInfo(int defSize, const wxArrayInt& allSizes); - - // default copy ctor, assignment operator and dtor are ok - - // Get the size of the element with the given index - int GetSize(unsigned pos) const; - - - // default size - int m_sizeDefault; - - // position -> size map containing all elements with non-default size - wxUnsignedToIntHashMap m_customSizes; -}; - -// ---------------------------------------------------------------------------- -// wxGrid -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxGrid : public wxScrolledWindow -{ -public: - // possible selection modes - enum wxGridSelectionModes - { - wxGridSelectCells = 0, // allow selecting anything - wxGridSelectRows = 1, // allow selecting only entire rows - wxGridSelectColumns = 2, // allow selecting only entire columns - wxGridSelectRowsOrColumns = wxGridSelectRows | wxGridSelectColumns - }; - - // Different behaviour of the TAB key when the end (or the beginning, for - // Shift-TAB) of the current row is reached: - enum TabBehaviour - { - Tab_Stop, // Do nothing, this is default. - Tab_Wrap, // Move to the next (or previous) row. - Tab_Leave // Move to the next (or previous) control. - }; - - // creation and destruction - // ------------------------ - - // ctor and Create() create the grid window, as with the other controls - wxGrid() { Init(); } - - wxGrid(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxWANTS_CHARS, - const wxString& name = wxGridNameStr) - { - Init(); - - Create(parent, id, pos, size, style, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxWANTS_CHARS, - const wxString& name = wxGridNameStr); - - virtual ~wxGrid(); - - // however to initialize grid data either CreateGrid() or SetTable() must - // be also called - - // this is basically equivalent to - // - // SetTable(new wxGridStringTable(numRows, numCols), true, selmode) - // - bool CreateGrid( int numRows, int numCols, - wxGridSelectionModes selmode = wxGridSelectCells ); - - bool SetTable( wxGridTableBase *table, - bool takeOwnership = false, - wxGridSelectionModes selmode = wxGridSelectCells ); - - bool ProcessTableMessage(wxGridTableMessage&); - - wxGridTableBase *GetTable() const { return m_table; } - - - void SetSelectionMode(wxGridSelectionModes selmode); - wxGridSelectionModes GetSelectionMode() const; - - // ------ grid dimensions - // - int GetNumberRows() const { return m_numRows; } - int GetNumberCols() const { return m_numCols; } - - - // ------ display update functions - // - wxArrayInt CalcRowLabelsExposed( const wxRegion& reg ) const; - - wxArrayInt CalcColLabelsExposed( const wxRegion& reg ) const; - wxGridCellCoordsArray CalcCellsExposed( const wxRegion& reg ) const; - - - void ClearGrid(); - bool InsertRows(int pos = 0, int numRows = 1, bool updateLabels = true) - { - return DoModifyLines(&wxGridTableBase::InsertRows, - pos, numRows, updateLabels); - } - bool InsertCols(int pos = 0, int numCols = 1, bool updateLabels = true) - { - return DoModifyLines(&wxGridTableBase::InsertCols, - pos, numCols, updateLabels); - } - - bool AppendRows(int numRows = 1, bool updateLabels = true) - { - return DoAppendLines(&wxGridTableBase::AppendRows, numRows, updateLabels); - } - bool AppendCols(int numCols = 1, bool updateLabels = true) - { - return DoAppendLines(&wxGridTableBase::AppendCols, numCols, updateLabels); - } - - bool DeleteRows(int pos = 0, int numRows = 1, bool updateLabels = true) - { - return DoModifyLines(&wxGridTableBase::DeleteRows, - pos, numRows, updateLabels); - } - bool DeleteCols(int pos = 0, int numCols = 1, bool updateLabels = true) - { - return DoModifyLines(&wxGridTableBase::DeleteCols, - pos, numCols, updateLabels); - } - - void DrawGridCellArea( wxDC& dc , const wxGridCellCoordsArray& cells ); - void DrawGridSpace( wxDC& dc ); - void DrawCellBorder( wxDC& dc, const wxGridCellCoords& ); - void DrawAllGridLines( wxDC& dc, const wxRegion & reg ); - void DrawCell( wxDC& dc, const wxGridCellCoords& ); - void DrawHighlight(wxDC& dc, const wxGridCellCoordsArray& cells); - - // this function is called when the current cell highlight must be redrawn - // and may be overridden by the user - virtual void DrawCellHighlight( wxDC& dc, const wxGridCellAttr *attr ); - - virtual void DrawRowLabels( wxDC& dc, const wxArrayInt& rows ); - virtual void DrawRowLabel( wxDC& dc, int row ); - - virtual void DrawColLabels( wxDC& dc, const wxArrayInt& cols ); - virtual void DrawColLabel( wxDC& dc, int col ); - - virtual void DrawCornerLabel(wxDC& dc); - - // ------ Cell text drawing functions - // - void DrawTextRectangle( wxDC& dc, const wxString&, const wxRect&, - int horizontalAlignment = wxALIGN_LEFT, - int verticalAlignment = wxALIGN_TOP, - int textOrientation = wxHORIZONTAL ) const; - - void DrawTextRectangle( wxDC& dc, const wxArrayString& lines, const wxRect&, - int horizontalAlignment = wxALIGN_LEFT, - int verticalAlignment = wxALIGN_TOP, - int textOrientation = wxHORIZONTAL ) const; - - // ------ grid render function for printing - // - void Render( wxDC& dc, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - const wxGridCellCoords& topLeft = wxGridCellCoords(-1, -1), - const wxGridCellCoords& bottomRight = wxGridCellCoords(-1, -1), - int style = wxGRID_DRAW_DEFAULT ); - - // Split a string containing newline characters into an array of - // strings and return the number of lines - // - void StringToLines( const wxString& value, wxArrayString& lines ) const; - - void GetTextBoxSize( const wxDC& dc, - const wxArrayString& lines, - long *width, long *height ) const; - - - // ------ - // Code that does a lot of grid modification can be enclosed - // between BeginBatch() and EndBatch() calls to avoid screen - // flicker - // - void BeginBatch() { m_batchCount++; } - void EndBatch(); - - int GetBatchCount() { return m_batchCount; } - - virtual void Refresh(bool eraseb = true, const wxRect* rect = NULL) wxOVERRIDE; - - // Use this, rather than wxWindow::Refresh(), to force an - // immediate repainting of the grid. Has no effect if you are - // already inside a BeginBatch / EndBatch block. - // - // This function is necessary because wxGrid has a minimal OnPaint() - // handler to reduce screen flicker. - // - void ForceRefresh(); - - - // ------ edit control functions - // - bool IsEditable() const { return m_editable; } - void EnableEditing( bool edit ); - - void EnableCellEditControl( bool enable = true ); - void DisableCellEditControl() { EnableCellEditControl(false); } - bool CanEnableCellControl() const; - bool IsCellEditControlEnabled() const; - bool IsCellEditControlShown() const; - - bool IsCurrentCellReadOnly() const; - - void ShowCellEditControl(); - void HideCellEditControl(); - void SaveEditControlValue(); - - - // ------ grid location functions - // Note that all of these functions work with the logical coordinates of - // grid cells and labels so you will need to convert from device - // coordinates for mouse events etc. - // - wxGridCellCoords XYToCell(int x, int y) const; - void XYToCell(int x, int y, wxGridCellCoords& coords) const - { coords = XYToCell(x, y); } - wxGridCellCoords XYToCell(const wxPoint& pos) const - { return XYToCell(pos.x, pos.y); } - - // these functions return the index of the row/columns corresponding to the - // given logical position in pixels - // - // if clipToMinMax is false (default, wxNOT_FOUND is returned if the - // position is outside any row/column, otherwise the first/last element is - // returned in this case - int YToRow( int y, bool clipToMinMax = false ) const; - int XToCol( int x, bool clipToMinMax = false ) const; - - int YToEdgeOfRow( int y ) const; - int XToEdgeOfCol( int x ) const; - - wxRect CellToRect( int row, int col ) const; - wxRect CellToRect( const wxGridCellCoords& coords ) const - { return CellToRect( coords.GetRow(), coords.GetCol() ); } - - int GetGridCursorRow() const { return m_currentCellCoords.GetRow(); } - int GetGridCursorCol() const { return m_currentCellCoords.GetCol(); } - - // check to see if a cell is either wholly visible (the default arg) or - // at least partially visible in the grid window - // - bool IsVisible( int row, int col, bool wholeCellVisible = true ) const; - bool IsVisible( const wxGridCellCoords& coords, bool wholeCellVisible = true ) const - { return IsVisible( coords.GetRow(), coords.GetCol(), wholeCellVisible ); } - void MakeCellVisible( int row, int col ); - void MakeCellVisible( const wxGridCellCoords& coords ) - { MakeCellVisible( coords.GetRow(), coords.GetCol() ); } - - - // ------ grid cursor movement functions - // - void SetGridCursor(int row, int col) { SetCurrentCell(row, col); } - void SetGridCursor(const wxGridCellCoords& c) { SetCurrentCell(c); } - - void GoToCell(int row, int col) - { - if ( SetCurrentCell(row, col) ) - MakeCellVisible(row, col); - } - - void GoToCell(const wxGridCellCoords& coords) - { - if ( SetCurrentCell(coords) ) - MakeCellVisible(coords); - } - - bool MoveCursorUp( bool expandSelection ); - bool MoveCursorDown( bool expandSelection ); - bool MoveCursorLeft( bool expandSelection ); - bool MoveCursorRight( bool expandSelection ); - bool MovePageDown(); - bool MovePageUp(); - bool MoveCursorUpBlock( bool expandSelection ); - bool MoveCursorDownBlock( bool expandSelection ); - bool MoveCursorLeftBlock( bool expandSelection ); - bool MoveCursorRightBlock( bool expandSelection ); - - void SetTabBehaviour(TabBehaviour behaviour) { m_tabBehaviour = behaviour; } - - - // ------ label and gridline formatting - // - int GetDefaultRowLabelSize() const { return WXGRID_DEFAULT_ROW_LABEL_WIDTH; } - int GetRowLabelSize() const { return m_rowLabelWidth; } - int GetDefaultColLabelSize() const { return WXGRID_DEFAULT_COL_LABEL_HEIGHT; } - int GetColLabelSize() const { return m_colLabelHeight; } - wxColour GetLabelBackgroundColour() const { return m_labelBackgroundColour; } - wxColour GetLabelTextColour() const { return m_labelTextColour; } - wxFont GetLabelFont() const { return m_labelFont; } - void GetRowLabelAlignment( int *horiz, int *vert ) const; - void GetColLabelAlignment( int *horiz, int *vert ) const; - int GetColLabelTextOrientation() const; - wxString GetRowLabelValue( int row ) const; - wxString GetColLabelValue( int col ) const; - - wxColour GetCellHighlightColour() const { return m_cellHighlightColour; } - int GetCellHighlightPenWidth() const { return m_cellHighlightPenWidth; } - int GetCellHighlightROPenWidth() const { return m_cellHighlightROPenWidth; } - - // this one will use wxHeaderCtrl for the column labels - void UseNativeColHeader(bool native = true); - - // this one will still draw them manually but using the native renderer - // instead of using the same appearance as for the row labels - void SetUseNativeColLabels( bool native = true ); - - void SetRowLabelSize( int width ); - void SetColLabelSize( int height ); - void HideRowLabels() { SetRowLabelSize( 0 ); } - void HideColLabels() { SetColLabelSize( 0 ); } - void SetLabelBackgroundColour( const wxColour& ); - void SetLabelTextColour( const wxColour& ); - void SetLabelFont( const wxFont& ); - void SetRowLabelAlignment( int horiz, int vert ); - void SetColLabelAlignment( int horiz, int vert ); - void SetColLabelTextOrientation( int textOrientation ); - void SetRowLabelValue( int row, const wxString& ); - void SetColLabelValue( int col, const wxString& ); - void SetCellHighlightColour( const wxColour& ); - void SetCellHighlightPenWidth(int width); - void SetCellHighlightROPenWidth(int width); - - - // interactive grid mouse operations control - // ----------------------------------------- - - // functions globally enabling row/column interactive resizing (enabled by - // default) - void EnableDragRowSize( bool enable = true ); - void DisableDragRowSize() { EnableDragRowSize( false ); } - - void EnableDragColSize( bool enable = true ); - void DisableDragColSize() { EnableDragColSize( false ); } - - // if interactive resizing is enabled, some rows/columns can still have - // fixed size - void DisableRowResize(int row) { DoDisableLineResize(row, m_setFixedRows); } - void DisableColResize(int col) { DoDisableLineResize(col, m_setFixedCols); } - - // these functions return whether the given row/column can be - // effectively resized: for this interactive resizing must be enabled - // and this index must not have been passed to DisableRow/ColResize() - bool CanDragRowSize(int row) const - { return m_canDragRowSize && DoCanResizeLine(row, m_setFixedRows); } - bool CanDragColSize(int col) const - { return m_canDragColSize && DoCanResizeLine(col, m_setFixedCols); } - - // interactive column reordering (disabled by default) - void EnableDragColMove( bool enable = true ); - void DisableDragColMove() { EnableDragColMove( false ); } - bool CanDragColMove() const { return m_canDragColMove; } - - // interactive resizing of grid cells (enabled by default) - void EnableDragGridSize(bool enable = true); - void DisableDragGridSize() { EnableDragGridSize(false); } - bool CanDragGridSize() const { return m_canDragGridSize; } - - // interactive dragging of cells (disabled by default) - void EnableDragCell( bool enable = true ); - void DisableDragCell() { EnableDragCell( false ); } - bool CanDragCell() const { return m_canDragCell; } - - - // grid lines - // ---------- - - // enable or disable drawing of the lines - void EnableGridLines(bool enable = true); - bool GridLinesEnabled() const { return m_gridLinesEnabled; } - - // by default grid lines stop at last column/row, but this may be changed - void ClipHorzGridLines(bool clip) - { DoClipGridLines(m_gridLinesClipHorz, clip); } - void ClipVertGridLines(bool clip) - { DoClipGridLines(m_gridLinesClipVert, clip); } - bool AreHorzGridLinesClipped() const { return m_gridLinesClipHorz; } - bool AreVertGridLinesClipped() const { return m_gridLinesClipVert; } - - // this can be used to change the global grid lines colour - void SetGridLineColour(const wxColour& col); - wxColour GetGridLineColour() const { return m_gridLineColour; } - - // these methods may be overridden to customize individual grid lines - // appearance - virtual wxPen GetDefaultGridLinePen(); - virtual wxPen GetRowGridLinePen(int row); - virtual wxPen GetColGridLinePen(int col); - - - // attributes - // ---------- - - // this sets the specified attribute for this cell or in this row/col - void SetAttr(int row, int col, wxGridCellAttr *attr); - void SetRowAttr(int row, wxGridCellAttr *attr); - void SetColAttr(int col, wxGridCellAttr *attr); - - // the grid can cache attributes for the recently used cells (currently it - // only caches one attribute for the most recently used one) and might - // notice that its value in the attribute provider has changed -- if this - // happens, call this function to force it - void RefreshAttr(int row, int col); - - // returns the attribute we may modify in place: a new one if this cell - // doesn't have any yet or the existing one if it does - // - // DecRef() must be called on the returned pointer, as usual - wxGridCellAttr *GetOrCreateCellAttr(int row, int col) const; - - - // shortcuts for setting the column parameters - - // set the format for the data in the column: default is string - void SetColFormatBool(int col); - void SetColFormatNumber(int col); - void SetColFormatFloat(int col, int width = -1, int precision = -1); - void SetColFormatCustom(int col, const wxString& typeName); - - // ------ row and col formatting - // - int GetDefaultRowSize() const; - int GetRowSize( int row ) const; - bool IsRowShown(int row) const { return GetRowSize(row) != 0; } - int GetDefaultColSize() const; - int GetColSize( int col ) const; - bool IsColShown(int col) const { return GetColSize(col) != 0; } - wxColour GetDefaultCellBackgroundColour() const; - wxColour GetCellBackgroundColour( int row, int col ) const; - wxColour GetDefaultCellTextColour() const; - wxColour GetCellTextColour( int row, int col ) const; - wxFont GetDefaultCellFont() const; - wxFont GetCellFont( int row, int col ) const; - void GetDefaultCellAlignment( int *horiz, int *vert ) const; - void GetCellAlignment( int row, int col, int *horiz, int *vert ) const; - bool GetDefaultCellOverflow() const; - bool GetCellOverflow( int row, int col ) const; - - // this function returns 1 in num_rows and num_cols for normal cells, - // positive numbers for a cell spanning multiple columns/rows (as set with - // SetCellSize()) and _negative_ numbers corresponding to the offset of the - // top left cell of the span from this one for the other cells covered by - // this cell - // - // the return value is CellSpan_None, CellSpan_Main or CellSpan_Inside for - // each of these cases respectively - enum CellSpan - { - CellSpan_Inside = -1, - CellSpan_None = 0, - CellSpan_Main - }; - - CellSpan GetCellSize( int row, int col, int *num_rows, int *num_cols ) const; - - wxSize GetCellSize(const wxGridCellCoords& coords) - { - wxSize s; - GetCellSize(coords.GetRow(), coords.GetCol(), &s.x, &s.y); - return s; - } - - // ------ row and col sizes - void SetDefaultRowSize( int height, bool resizeExistingRows = false ); - void SetRowSize( int row, int height ); - void HideRow(int row) { DoSetRowSize(row, 0); } - void ShowRow(int row) { DoSetRowSize(row, -1); } - - void SetDefaultColSize( int width, bool resizeExistingCols = false ); - void SetColSize( int col, int width ); - void HideCol(int col) { DoSetColSize(col, 0); } - void ShowCol(int col) { DoSetColSize(col, -1); } - - // the row and column sizes can be also set all at once using - // wxGridSizesInfo which holds all of them at once - - wxGridSizesInfo GetColSizes() const - { return wxGridSizesInfo(GetDefaultColSize(), m_colWidths); } - wxGridSizesInfo GetRowSizes() const - { return wxGridSizesInfo(GetDefaultRowSize(), m_rowHeights); } - - void SetColSizes(const wxGridSizesInfo& sizeInfo); - void SetRowSizes(const wxGridSizesInfo& sizeInfo); - - - // ------- columns (only, for now) reordering - - // columns index <-> positions mapping: by default, the position of the - // column is the same as its index, but the columns can also be reordered - // (either by calling SetColPos() explicitly or by the user dragging the - // columns around) in which case their indices don't correspond to their - // positions on display any longer - // - // internally we always work with indices except for the functions which - // have "Pos" in their names (and which work with columns, not pixels) and - // only the display and hit testing code really cares about display - // positions at all - - // set the positions of all columns at once (this method uses the same - // conventions as wxHeaderCtrl::SetColumnsOrder() for the order array) - void SetColumnsOrder(const wxArrayInt& order); - - // return the column index corresponding to the given (valid) position - int GetColAt(int pos) const - { - return m_colAt.empty() ? pos : m_colAt[pos]; - } - - // reorder the columns so that the column with the given index is now shown - // as the position pos - void SetColPos(int idx, int pos); - - // return the position at which the column with the given index is - // displayed: notice that this is a slow operation as we don't maintain the - // reverse mapping currently - int GetColPos(int idx) const - { - if ( m_colAt.IsEmpty() ) - return idx; - - int pos = m_colAt.Index(idx); - wxASSERT_MSG( pos != wxNOT_FOUND, "invalid column index" ); - - return pos; - } - - // reset the columns positions to the default order - void ResetColPos(); - - - // automatically size the column or row to fit to its contents, if - // setAsMin is true, this optimal width will also be set as minimal width - // for this column - void AutoSizeColumn( int col, bool setAsMin = true ) - { AutoSizeColOrRow(col, setAsMin, wxGRID_COLUMN); } - void AutoSizeRow( int row, bool setAsMin = true ) - { AutoSizeColOrRow(row, setAsMin, wxGRID_ROW); } - - // auto size all columns (very ineffective for big grids!) - void AutoSizeColumns( bool setAsMin = true ) - { (void)SetOrCalcColumnSizes(false, setAsMin); } - - void AutoSizeRows( bool setAsMin = true ) - { (void)SetOrCalcRowSizes(false, setAsMin); } - - // auto size the grid, that is make the columns/rows of the "right" size - // and also set the grid size to just fit its contents - void AutoSize(); - - // Note for both AutoSizeRowLabelSize and AutoSizeColLabelSize: - // If col equals to wxGRID_AUTOSIZE value then function autosizes labels column - // instead of data column. Note that this operation may be slow for large - // tables. - // autosize row height depending on label text - void AutoSizeRowLabelSize( int row ); - - // autosize column width depending on label text - void AutoSizeColLabelSize( int col ); - - // column won't be resized to be lesser width - this must be called during - // the grid creation because it won't resize the column if it's already - // narrower than the minimal width - void SetColMinimalWidth( int col, int width ); - void SetRowMinimalHeight( int row, int width ); - - /* These members can be used to query and modify the minimal - * acceptable size of grid rows and columns. Call this function in - * your code which creates the grid if you want to display cells - * with a size smaller than the default acceptable minimum size. - * Like the members SetColMinimalWidth and SetRowMinimalWidth, - * the existing rows or columns will not be checked/resized. - */ - void SetColMinimalAcceptableWidth( int width ); - void SetRowMinimalAcceptableHeight( int width ); - int GetColMinimalAcceptableWidth() const; - int GetRowMinimalAcceptableHeight() const; - - void SetDefaultCellBackgroundColour( const wxColour& ); - void SetCellBackgroundColour( int row, int col, const wxColour& ); - void SetDefaultCellTextColour( const wxColour& ); - - void SetCellTextColour( int row, int col, const wxColour& ); - void SetDefaultCellFont( const wxFont& ); - void SetCellFont( int row, int col, const wxFont& ); - void SetDefaultCellAlignment( int horiz, int vert ); - void SetCellAlignment( int row, int col, int horiz, int vert ); - void SetDefaultCellOverflow( bool allow ); - void SetCellOverflow( int row, int col, bool allow ); - void SetCellSize( int row, int col, int num_rows, int num_cols ); - - // takes ownership of the pointer - void SetDefaultRenderer(wxGridCellRenderer *renderer); - void SetCellRenderer(int row, int col, wxGridCellRenderer *renderer); - wxGridCellRenderer *GetDefaultRenderer() const; - wxGridCellRenderer* GetCellRenderer(int row, int col) const; - - // takes ownership of the pointer - void SetDefaultEditor(wxGridCellEditor *editor); - void SetCellEditor(int row, int col, wxGridCellEditor *editor); - wxGridCellEditor *GetDefaultEditor() const; - wxGridCellEditor* GetCellEditor(int row, int col) const; - - - - // ------ cell value accessors - // - wxString GetCellValue( int row, int col ) const - { - if ( m_table ) - { - return m_table->GetValue( row, col ); - } - else - { - return wxEmptyString; - } - } - - wxString GetCellValue( const wxGridCellCoords& coords ) const - { return GetCellValue( coords.GetRow(), coords.GetCol() ); } - - void SetCellValue( int row, int col, const wxString& s ); - void SetCellValue( const wxGridCellCoords& coords, const wxString& s ) - { SetCellValue( coords.GetRow(), coords.GetCol(), s ); } - - // returns true if the cell can't be edited - bool IsReadOnly(int row, int col) const; - - // make the cell editable/readonly - void SetReadOnly(int row, int col, bool isReadOnly = true); - - // ------ select blocks of cells - // - void SelectRow( int row, bool addToSelected = false ); - void SelectCol( int col, bool addToSelected = false ); - - void SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol, - bool addToSelected = false ); - - void SelectBlock( const wxGridCellCoords& topLeft, - const wxGridCellCoords& bottomRight, - bool addToSelected = false ) - { SelectBlock( topLeft.GetRow(), topLeft.GetCol(), - bottomRight.GetRow(), bottomRight.GetCol(), - addToSelected ); } - - void SelectAll(); - - bool IsSelection() const; - - // ------ deselect blocks or cells - // - void DeselectRow( int row ); - void DeselectCol( int col ); - void DeselectCell( int row, int col ); - - void ClearSelection(); - - bool IsInSelection( int row, int col ) const; - - bool IsInSelection( const wxGridCellCoords& coords ) const - { return IsInSelection( coords.GetRow(), coords.GetCol() ); } - - wxGridCellCoordsArray GetSelectedCells() const; - wxGridCellCoordsArray GetSelectionBlockTopLeft() const; - wxGridCellCoordsArray GetSelectionBlockBottomRight() const; - wxArrayInt GetSelectedRows() const; - wxArrayInt GetSelectedCols() const; - - // This function returns the rectangle that encloses the block of cells - // limited by TopLeft and BottomRight cell in device coords and clipped - // to the client size of the grid window. - // - wxRect BlockToDeviceRect( const wxGridCellCoords & topLeft, - const wxGridCellCoords & bottomRight ) const; - - // Access or update the selection fore/back colours - wxColour GetSelectionBackground() const - { return m_selectionBackground; } - wxColour GetSelectionForeground() const - { return m_selectionForeground; } - - void SetSelectionBackground(const wxColour& c) { m_selectionBackground = c; } - void SetSelectionForeground(const wxColour& c) { m_selectionForeground = c; } - - - // Methods for a registry for mapping data types to Renderers/Editors - void RegisterDataType(const wxString& typeName, - wxGridCellRenderer* renderer, - wxGridCellEditor* editor); - // DJC MAPTEK - virtual wxGridCellEditor* GetDefaultEditorForCell(int row, int col) const; - wxGridCellEditor* GetDefaultEditorForCell(const wxGridCellCoords& c) const - { return GetDefaultEditorForCell(c.GetRow(), c.GetCol()); } - virtual wxGridCellRenderer* GetDefaultRendererForCell(int row, int col) const; - virtual wxGridCellEditor* GetDefaultEditorForType(const wxString& typeName) const; - virtual wxGridCellRenderer* GetDefaultRendererForType(const wxString& typeName) const; - - // grid may occupy more space than needed for its rows/columns, this - // function allows to set how big this extra space is - void SetMargins(int extraWidth, int extraHeight) - { - m_extraWidth = extraWidth; - m_extraHeight = extraHeight; - - CalcDimensions(); - } - - // Accessors for component windows - wxWindow* GetGridWindow() const { return (wxWindow*)m_gridWin; } - wxWindow* GetGridRowLabelWindow() const { return (wxWindow*)m_rowLabelWin; } - wxWindow* GetGridColLabelWindow() const { return m_colWindow; } - wxWindow* GetGridCornerLabelWindow() const { return (wxWindow*)m_cornerLabelWin; } - - // This one can only be called if we are using the native header window - wxHeaderCtrl *GetGridColHeader() const - { - wxASSERT_MSG( m_useNativeHeader, "no column header window" ); - - // static_cast<> doesn't work without the full class declaration in - // view and we prefer to avoid adding more compile-time dependencies - // even at the cost of using reinterpret_cast<> - return reinterpret_cast(m_colWindow); - } - - // Allow adjustment of scroll increment. The default is (15, 15). - void SetScrollLineX(int x) { m_xScrollPixelsPerLine = x; } - void SetScrollLineY(int y) { m_yScrollPixelsPerLine = y; } - int GetScrollLineX() const { return m_xScrollPixelsPerLine; } - int GetScrollLineY() const { return m_yScrollPixelsPerLine; } - - // ------- drag and drop -#if wxUSE_DRAG_AND_DROP - virtual void SetDropTarget(wxDropTarget *dropTarget) wxOVERRIDE; -#endif // wxUSE_DRAG_AND_DROP - - - // ------- sorting support - - // wxGrid doesn't support sorting on its own but it can indicate the sort - // order in the column header (currently only if native header control is - // used though) - - // return the column currently displaying the sort indicator or wxNOT_FOUND - // if none - int GetSortingColumn() const { return m_sortCol; } - - // return true if this column is currently used for sorting - bool IsSortingBy(int col) const { return GetSortingColumn() == col; } - - // return the current sorting order (on GetSortingColumn()): true for - // ascending sort and false for descending; it doesn't make sense to call - // it if GetSortingColumn() returns wxNOT_FOUND - bool IsSortOrderAscending() const { return m_sortIsAscending; } - - // set the sorting column (or unsets any existing one if wxNOT_FOUND) and - // the order in which to sort - void SetSortingColumn(int col, bool ascending = true); - - // unset any existing sorting column - void UnsetSortingColumn() { SetSortingColumn(wxNOT_FOUND); } - -#if WXWIN_COMPATIBILITY_2_8 - // ------ For compatibility with previous wxGrid only... - // - // ************************************************ - // ** Don't use these in new code because they ** - // ** are liable to disappear in a future ** - // ** revision ** - // ************************************************ - // - - wxGrid( wxWindow *parent, - int x, int y, int w = wxDefaultCoord, int h = wxDefaultCoord, - long style = wxWANTS_CHARS, - const wxString& name = wxPanelNameStr ) - { - Init(); - Create(parent, wxID_ANY, wxPoint(x, y), wxSize(w, h), style, name); - } - - void SetCellValue( const wxString& val, int row, int col ) - { SetCellValue( row, col, val ); } - - void UpdateDimensions() - { CalcDimensions(); } - - int GetRows() const { return GetNumberRows(); } - int GetCols() const { return GetNumberCols(); } - int GetCursorRow() const { return GetGridCursorRow(); } - int GetCursorColumn() const { return GetGridCursorCol(); } - - int GetScrollPosX() const { return 0; } - int GetScrollPosY() const { return 0; } - - void SetScrollX( int WXUNUSED(x) ) { } - void SetScrollY( int WXUNUSED(y) ) { } - - void SetColumnWidth( int col, int width ) - { SetColSize( col, width ); } - - int GetColumnWidth( int col ) const - { return GetColSize( col ); } - - void SetRowHeight( int row, int height ) - { SetRowSize( row, height ); } - - // GetRowHeight() is below - - int GetViewHeight() const // returned num whole rows visible - { return 0; } - - int GetViewWidth() const // returned num whole cols visible - { return 0; } - - void SetLabelSize( int orientation, int sz ) - { - if ( orientation == wxHORIZONTAL ) - SetColLabelSize( sz ); - else - SetRowLabelSize( sz ); - } - - int GetLabelSize( int orientation ) const - { - if ( orientation == wxHORIZONTAL ) - return GetColLabelSize(); - else - return GetRowLabelSize(); - } - - void SetLabelAlignment( int orientation, int align ) - { - if ( orientation == wxHORIZONTAL ) - SetColLabelAlignment( align, wxALIGN_INVALID ); - else - SetRowLabelAlignment( align, wxALIGN_INVALID ); - } - - int GetLabelAlignment( int orientation, int WXUNUSED(align) ) const - { - int h, v; - if ( orientation == wxHORIZONTAL ) - { - GetColLabelAlignment( &h, &v ); - return h; - } - else - { - GetRowLabelAlignment( &h, &v ); - return h; - } - } - - void SetLabelValue( int orientation, const wxString& val, int pos ) - { - if ( orientation == wxHORIZONTAL ) - SetColLabelValue( pos, val ); - else - SetRowLabelValue( pos, val ); - } - - wxString GetLabelValue( int orientation, int pos) const - { - if ( orientation == wxHORIZONTAL ) - return GetColLabelValue( pos ); - else - return GetRowLabelValue( pos ); - } - - wxFont GetCellTextFont() const - { return m_defaultCellAttr->GetFont(); } - - wxFont GetCellTextFont(int WXUNUSED(row), int WXUNUSED(col)) const - { return m_defaultCellAttr->GetFont(); } - - void SetCellTextFont(const wxFont& fnt) - { SetDefaultCellFont( fnt ); } - - void SetCellTextFont(const wxFont& fnt, int row, int col) - { SetCellFont( row, col, fnt ); } - - void SetCellTextColour(const wxColour& val, int row, int col) - { SetCellTextColour( row, col, val ); } - - void SetCellTextColour(const wxColour& col) - { SetDefaultCellTextColour( col ); } - - void SetCellBackgroundColour(const wxColour& col) - { SetDefaultCellBackgroundColour( col ); } - - void SetCellBackgroundColour(const wxColour& colour, int row, int col) - { SetCellBackgroundColour( row, col, colour ); } - - bool GetEditable() const { return IsEditable(); } - void SetEditable( bool edit = true ) { EnableEditing( edit ); } - bool GetEditInPlace() const { return IsCellEditControlEnabled(); } - - void SetEditInPlace(bool WXUNUSED(edit) = true) { } - - void SetCellAlignment( int align, int row, int col) - { SetCellAlignment(row, col, align, wxALIGN_CENTER); } - void SetCellAlignment( int WXUNUSED(align) ) {} - void SetCellBitmap(wxBitmap *WXUNUSED(bitmap), int WXUNUSED(row), int WXUNUSED(col)) - { } - void SetDividerPen(const wxPen& WXUNUSED(pen)) { } - wxPen& GetDividerPen() const; - void OnActivate(bool WXUNUSED(active)) {} - - // ******** End of compatibility functions ********** - - - - // ------ control IDs - enum { wxGRID_CELLCTRL = 2000, - wxGRID_TOPCTRL }; - - // ------ control types - enum { wxGRID_TEXTCTRL = 2100, - wxGRID_CHECKBOX, - wxGRID_CHOICE, - wxGRID_COMBOBOX }; - - wxDEPRECATED_INLINE(bool CanDragRowSize() const, return m_canDragRowSize; ) - wxDEPRECATED_INLINE(bool CanDragColSize() const, return m_canDragColSize; ) -#endif // WXWIN_COMPATIBILITY_2_8 - - - // override some base class functions - virtual bool Enable(bool enable = true) wxOVERRIDE; - virtual wxWindow *GetMainWindowOfCompositeControl() wxOVERRIDE - { return (wxWindow*)m_gridWin; } - virtual void Fit() wxOVERRIDE; - - // implementation only - void CancelMouseCapture(); - -protected: - virtual wxSize DoGetBestSize() const wxOVERRIDE; - - bool m_created; - - wxGridWindow *m_gridWin; - wxGridCornerLabelWindow *m_cornerLabelWin; - wxGridRowLabelWindow *m_rowLabelWin; - - // the real type of the column window depends on m_useNativeHeader value: - // if it is true, its dynamic type is wxHeaderCtrl, otherwise it is - // wxGridColLabelWindow, use accessors below when the real type matters - wxWindow *m_colWindow; - - wxGridColLabelWindow *GetColLabelWindow() const - { - wxASSERT_MSG( !m_useNativeHeader, "no column label window" ); - - return reinterpret_cast(m_colWindow); - } - - wxGridTableBase *m_table; - bool m_ownTable; - - int m_numRows; - int m_numCols; - - wxGridCellCoords m_currentCellCoords; - - // the corners of the block being currently selected or wxGridNoCellCoords - wxGridCellCoords m_selectedBlockTopLeft; - wxGridCellCoords m_selectedBlockBottomRight; - - // when selecting blocks of cells (either from the keyboard using Shift - // with cursor keys, or by dragging the mouse), the selection is anchored - // at m_currentCellCoords which defines one of the corners of the rectangle - // being selected -- and this variable defines the other corner, i.e. it's - // either m_selectedBlockTopLeft or m_selectedBlockBottomRight depending on - // which of them is not m_currentCellCoords - // - // if no block selection is in process, it is set to wxGridNoCellCoords - wxGridCellCoords m_selectedBlockCorner; - - wxGridSelection *m_selection; - - wxColour m_selectionBackground; - wxColour m_selectionForeground; - - // NB: *never* access m_row/col arrays directly because they are created - // on demand, *always* use accessor functions instead! - - // init the m_rowHeights/Bottoms arrays with default values - void InitRowHeights(); - - int m_defaultRowHeight; - int m_minAcceptableRowHeight; - wxArrayInt m_rowHeights; - wxArrayInt m_rowBottoms; - - // init the m_colWidths/Rights arrays - void InitColWidths(); - - int m_defaultColWidth; - int m_minAcceptableColWidth; - wxArrayInt m_colWidths; - wxArrayInt m_colRights; - - int m_sortCol; - bool m_sortIsAscending; - - bool m_useNativeHeader, - m_nativeColumnLabels; - - // get the col/row coords - int GetColWidth(int col) const; - int GetColLeft(int col) const; - int GetColRight(int col) const; - - // this function must be public for compatibility... -public: - int GetRowHeight(int row) const; -protected: - - int GetRowTop(int row) const; - int GetRowBottom(int row) const; - - int m_rowLabelWidth; - int m_colLabelHeight; - - // the size of the margin left to the right and bottom of the cell area - int m_extraWidth, - m_extraHeight; - - wxColour m_labelBackgroundColour; - wxColour m_labelTextColour; - wxFont m_labelFont; - - int m_rowLabelHorizAlign; - int m_rowLabelVertAlign; - int m_colLabelHorizAlign; - int m_colLabelVertAlign; - int m_colLabelTextOrientation; - - bool m_defaultRowLabelValues; - bool m_defaultColLabelValues; - - wxColour m_gridLineColour; - bool m_gridLinesEnabled; - bool m_gridLinesClipHorz, - m_gridLinesClipVert; - wxColour m_cellHighlightColour; - int m_cellHighlightPenWidth; - int m_cellHighlightROPenWidth; - - - // common part of AutoSizeColumn/Row() and GetBestSize() - int SetOrCalcColumnSizes(bool calcOnly, bool setAsMin = true); - int SetOrCalcRowSizes(bool calcOnly, bool setAsMin = true); - - // common part of AutoSizeColumn/Row() - void AutoSizeColOrRow(int n, bool setAsMin, wxGridDirection direction); - - // Calculate the minimum acceptable size for labels area - wxCoord CalcColOrRowLabelAreaMinSize(wxGridDirection direction); - - // if a column has a minimal width, it will be the value for it in this - // hash table - wxLongToLongHashMap m_colMinWidths, - m_rowMinHeights; - - // get the minimal width of the given column/row - int GetColMinimalWidth(int col) const; - int GetRowMinimalHeight(int col) const; - - // do we have some place to store attributes in? - bool CanHaveAttributes() const; - - // cell attribute cache (currently we only cache 1, may be will do - // more/better later) - struct CachedAttr - { - int row, col; - wxGridCellAttr *attr; - } m_attrCache; - - // invalidates the attribute cache - void ClearAttrCache(); - - // adds an attribute to cache - void CacheAttr(int row, int col, wxGridCellAttr *attr) const; - - // looks for an attr in cache, returns true if found - bool LookupAttr(int row, int col, wxGridCellAttr **attr) const; - - // looks for the attr in cache, if not found asks the table and caches the - // result - wxGridCellAttr *GetCellAttr(int row, int col) const; - wxGridCellAttr *GetCellAttr(const wxGridCellCoords& coords ) const - { return GetCellAttr( coords.GetRow(), coords.GetCol() ); } - - // the default cell attr object for cells that don't have their own - wxGridCellAttr* m_defaultCellAttr; - - - bool m_inOnKeyDown; - int m_batchCount; - - - wxGridTypeRegistry* m_typeRegistry; - - enum CursorMode - { - WXGRID_CURSOR_SELECT_CELL, - WXGRID_CURSOR_RESIZE_ROW, - WXGRID_CURSOR_RESIZE_COL, - WXGRID_CURSOR_SELECT_ROW, - WXGRID_CURSOR_SELECT_COL, - WXGRID_CURSOR_MOVE_COL - }; - - // this method not only sets m_cursorMode but also sets the correct cursor - // for the given mode and, if captureMouse is not false releases the mouse - // if it was captured and captures it if it must be captured - // - // for this to work, you should always use it and not set m_cursorMode - // directly! - void ChangeCursorMode(CursorMode mode, - wxWindow *win = NULL, - bool captureMouse = true); - - wxWindow *m_winCapture; // the window which captured the mouse - - // this variable is used not for finding the correct current cursor but - // mainly for finding out what is going to happen if the mouse starts being - // dragged right now - // - // by default it is WXGRID_CURSOR_SELECT_CELL meaning that nothing else is - // going on, and it is set to one of RESIZE/SELECT/MOVE values while the - // corresponding operation will be started if the user starts dragging the - // mouse from the current position - CursorMode m_cursorMode; - - - //Column positions - wxArrayInt m_colAt; - - bool m_canDragRowSize; - bool m_canDragColSize; - bool m_canDragColMove; - bool m_canDragGridSize; - bool m_canDragCell; - - // the last position (horizontal or vertical depending on whether the user - // is resizing a column or a row) where a row or column separator line was - // dragged by the user or -1 of there is no drag operation in progress - int m_dragLastPos; - int m_dragRowOrCol; - - // true if a drag operation is in progress; when this is true, - // m_startDragPos is valid, i.e. not wxDefaultPosition - bool m_isDragging; - - // the position (in physical coordinates) where the user started dragging - // the mouse or wxDefaultPosition if mouse isn't being dragged - // - // notice that this can be != wxDefaultPosition while m_isDragging is still - // false because we wait until the mouse is moved some distance away before - // setting m_isDragging to true - wxPoint m_startDragPos; - - bool m_waitForSlowClick; - - wxGridCellCoords m_selectionStart; - - wxCursor m_rowResizeCursor; - wxCursor m_colResizeCursor; - - bool m_editable; // applies to whole grid - bool m_cellEditCtrlEnabled; // is in-place edit currently shown? - - TabBehaviour m_tabBehaviour; // determines how the TAB key behaves - - void Init(); // common part of all ctors - void Create(); - void CreateColumnWindow(); - void CalcDimensions(); - void CalcWindowSizes(); - bool Redimension( wxGridTableMessage& ); - - - // generate the appropriate grid event and return -1 if it was vetoed, 1 if - // it was processed (but not vetoed) and 0 if it wasn't processed - int SendEvent(wxEventType evtType, - int row, int col, - const wxMouseEvent& e); - int SendEvent(wxEventType evtType, - const wxGridCellCoords& coords, - const wxMouseEvent& e) - { return SendEvent(evtType, coords.GetRow(), coords.GetCol(), e); } - int SendEvent(wxEventType evtType, - int row, int col, - const wxString& s = wxString()); - int SendEvent(wxEventType evtType, - const wxGridCellCoords& coords, - const wxString& s = wxString()) - { return SendEvent(evtType, coords.GetRow(), coords.GetCol(), s); } - int SendEvent(wxEventType evtType, const wxString& s = wxString()) - { return SendEvent(evtType, m_currentCellCoords, s); } - - // send wxEVT_GRID_{ROW,COL}_SIZE or wxEVT_GRID_COL_AUTO_SIZE, return true - // if the event was processed, false otherwise - bool SendGridSizeEvent(wxEventType type, - int row, int col, - const wxMouseEvent& mouseEv); - - void OnPaint( wxPaintEvent& ); - void OnSize( wxSizeEvent& ); - void OnKeyDown( wxKeyEvent& ); - void OnKeyUp( wxKeyEvent& ); - void OnChar( wxKeyEvent& ); - void OnEraseBackground( wxEraseEvent& ); - void OnHideEditor( wxCommandEvent& ); - - - bool SetCurrentCell( const wxGridCellCoords& coords ); - bool SetCurrentCell( int row, int col ) - { return SetCurrentCell( wxGridCellCoords(row, col) ); } - - - // this function is called to extend the block being currently selected - // from mouse and keyboard event handlers - void UpdateBlockBeingSelected(int topRow, int leftCol, - int bottomRow, int rightCol); - - void UpdateBlockBeingSelected(const wxGridCellCoords& topLeft, - const wxGridCellCoords& bottomRight) - { UpdateBlockBeingSelected(topLeft.GetRow(), topLeft.GetCol(), - bottomRight.GetRow(), bottomRight.GetCol()); } - - friend class WXDLLIMPEXP_FWD_ADV wxGridSelection; - friend class wxGridRowOperations; - friend class wxGridColumnOperations; - - // they call our private Process{{Corner,Col,Row}Label,GridCell}MouseEvent() - friend class wxGridCornerLabelWindow; - friend class wxGridColLabelWindow; - friend class wxGridRowLabelWindow; - friend class wxGridWindow; - friend class wxGridHeaderRenderer; - - friend class wxGridHeaderCtrl; - -private: - - // implement wxScrolledWindow method to return m_gridWin size - virtual wxSize GetSizeAvailableForScrollTarget(const wxSize& size) wxOVERRIDE; - - // redraw the grid lines, should be called after changing their attributes - void RedrawGridLines(); - - // draw all grid lines in the given cell region (unlike the public - // DrawAllGridLines() which just draws all of them) - void DrawRangeGridLines(wxDC& dc, const wxRegion& reg, - const wxGridCellCoords& topLeft, - const wxGridCellCoords& bottomRight); - - // draw all lines from top to bottom row and left to right column in the - // rectangle determined by (top, left)-(bottom, right) -- but notice that - // the caller must have set up the clipping correctly, this rectangle is - // only used here for optimization - void DoDrawGridLines(wxDC& dc, - int top, int left, - int bottom, int right, - int topRow, int leftCol, - int bottomRight, int rightCol); - - // common part of Clip{Horz,Vert}GridLines - void DoClipGridLines(bool& var, bool clip); - - // update the sorting indicator shown in the specified column (whose index - // must be valid) - // - // this will use GetSortingColumn() and IsSortOrderAscending() to determine - // the sorting indicator to effectively show - void UpdateColumnSortingIndicator(int col); - - // update the grid after changing the columns order (common part of - // SetColPos() and ResetColPos()) - void RefreshAfterColPosChange(); - - - // return the position (not index) of the column at the given logical pixel - // position - // - // this always returns a valid position, even if the coordinate is out of - // bounds (in which case first/last column is returned) - int XToPos(int x) const; - - - // event handlers and their helpers - // -------------------------------- - - // process mouse drag event in WXGRID_CURSOR_SELECT_CELL mode - bool DoGridCellDrag(wxMouseEvent& event, - const wxGridCellCoords& coords, - bool isFirstDrag); - - // process row/column resizing drag event - void DoGridLineDrag(wxMouseEvent& event, const wxGridOperations& oper); - - // process mouse drag event in the grid window - void DoGridDragEvent(wxMouseEvent& event, const wxGridCellCoords& coords); - - // process different clicks on grid cells - void DoGridCellLeftDown(wxMouseEvent& event, - const wxGridCellCoords& coords, - const wxPoint& pos); - void DoGridCellLeftDClick(wxMouseEvent& event, - const wxGridCellCoords& coords, - const wxPoint& pos); - void DoGridCellLeftUp(wxMouseEvent& event, const wxGridCellCoords& coords); - - // process movement (but not dragging) event in the grid cell area - void DoGridMouseMoveEvent(wxMouseEvent& event, - const wxGridCellCoords& coords, - const wxPoint& pos); - - // process mouse events in the grid window - void ProcessGridCellMouseEvent(wxMouseEvent& event); - - // process mouse events in the row/column labels/corner windows - void ProcessRowLabelMouseEvent(wxMouseEvent& event); - void ProcessColLabelMouseEvent(wxMouseEvent& event); - void ProcessCornerLabelMouseEvent(wxMouseEvent& event); - - void DoColHeaderClick(int col); - - void DoStartResizeCol(int col); - void DoUpdateResizeCol(int x); - void DoUpdateResizeColWidth(int w); - void DoStartMoveCol(int col); - - void DoEndDragResizeRow(const wxMouseEvent& event); - void DoEndDragResizeCol(const wxMouseEvent& event); - void DoEndMoveCol(int pos); - - // process a TAB keypress - void DoGridProcessTab(wxKeyboardState& kbdState); - - // common implementations of methods defined for both rows and columns - void DeselectLine(int line, const wxGridOperations& oper); - bool DoEndDragResizeLine(const wxGridOperations& oper); - int PosToLinePos(int pos, bool clipToMinMax, - const wxGridOperations& oper) const; - int PosToLine(int pos, bool clipToMinMax, - const wxGridOperations& oper) const; - int PosToEdgeOfLine(int pos, const wxGridOperations& oper) const; - - bool DoMoveCursor(bool expandSelection, - const wxGridDirectionOperations& diroper); - bool DoMoveCursorByPage(const wxGridDirectionOperations& diroper); - bool DoMoveCursorByBlock(bool expandSelection, - const wxGridDirectionOperations& diroper); - void AdvanceToNextNonEmpty(wxGridCellCoords& coords, - const wxGridDirectionOperations& diroper); - - // common part of {Insert,Delete}{Rows,Cols} - bool DoModifyLines(bool (wxGridTableBase::*funcModify)(size_t, size_t), - int pos, int num, bool updateLabels); - // Append{Rows,Cols} is a bit different because of one less parameter - bool DoAppendLines(bool (wxGridTableBase::*funcAppend)(size_t), - int num, bool updateLabels); - - // common part of Set{Col,Row}Sizes - void DoSetSizes(const wxGridSizesInfo& sizeInfo, - const wxGridOperations& oper); - - // common part of Disable{Row,Col}Resize and CanDrag{Row,Col}Size - void DoDisableLineResize(int line, wxGridFixedIndicesSet *& setFixed); - bool DoCanResizeLine(int line, const wxGridFixedIndicesSet *setFixed) const; - - // Helper of Render(): get grid size, origin offset and fill cell arrays - void GetRenderSizes( const wxGridCellCoords& topLeft, - const wxGridCellCoords& bottomRight, - wxPoint& pointOffSet, wxSize& sizeGrid, - wxGridCellCoordsArray& renderCells, - wxArrayInt& arrayCols, wxArrayInt& arrayRows ); - - // Helper of Render(): set the scale to draw the cells at the right size. - void SetRenderScale( wxDC& dc, const wxPoint& pos, const wxSize& size, - const wxSize& sizeGrid ); - - // Helper of Render(): get render start position from passed parameter - wxPoint GetRenderPosition( wxDC& dc, const wxPoint& position ); - - // Helper of Render(): draws a box around the rendered area - void DoRenderBox( wxDC& dc, const int& style, - const wxPoint& pointOffSet, - const wxSize& sizeCellArea, - const wxGridCellCoords& topLeft, - const wxGridCellCoords& bottomRight ); - - // Implementation of public Set{Row,Col}Size() and {Hide,Show}{Row,Col}(). - // They interpret their height or width parameter slightly different from - // the public methods where -1 in it means "auto fit to the label" for the - // compatibility reasons. Here it means "show a previously hidden row or - // column" while 0 means "hide it" just as in the public methods. And any - // positive values are handled naturally, i.e. they just specify the size. - void DoSetRowSize( int row, int height ); - void DoSetColSize( int col, int width ); - - - // these sets contain the indices of fixed, i.e. non-resizable - // interactively, grid rows or columns and are NULL if there are no fixed - // elements (which is the default) - wxGridFixedIndicesSet *m_setFixedRows, - *m_setFixedCols; - - wxDECLARE_DYNAMIC_CLASS(wxGrid); - wxDECLARE_EVENT_TABLE(); - wxDECLARE_NO_COPY_CLASS(wxGrid); -}; - -// ---------------------------------------------------------------------------- -// wxGridUpdateLocker prevents updates to a grid during its lifetime -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxGridUpdateLocker -{ -public: - // if the pointer is NULL, Create() can be called later - wxGridUpdateLocker(wxGrid *grid = NULL) - { - Init(grid); - } - - // can be called if ctor was used with a NULL pointer, must not be called - // more than once - void Create(wxGrid *grid) - { - wxASSERT_MSG( !m_grid, wxT("shouldn't be called more than once") ); - - Init(grid); - } - - ~wxGridUpdateLocker() - { - if ( m_grid ) - m_grid->EndBatch(); - } - -private: - void Init(wxGrid *grid) - { - m_grid = grid; - if ( m_grid ) - m_grid->BeginBatch(); - } - - wxGrid *m_grid; - - wxDECLARE_NO_COPY_CLASS(wxGridUpdateLocker); -}; - -// ---------------------------------------------------------------------------- -// Grid event class and event types -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxGridEvent : public wxNotifyEvent, - public wxKeyboardState -{ -public: - wxGridEvent() - : wxNotifyEvent() - { - Init(-1, -1, -1, -1, false); - } - - wxGridEvent(int id, - wxEventType type, - wxObject* obj, - int row = -1, int col = -1, - int x = -1, int y = -1, - bool sel = true, - const wxKeyboardState& kbd = wxKeyboardState()) - : wxNotifyEvent(type, id), - wxKeyboardState(kbd) - { - Init(row, col, x, y, sel); - SetEventObject(obj); - } - - // explicitly specifying inline allows gcc < 3.4 to - // handle the deprecation attribute even in the constructor. - wxDEPRECATED_CONSTRUCTOR( - wxGridEvent(int id, - wxEventType type, - wxObject* obj, - int row, int col, - int x, int y, - bool sel, - bool control, - bool shift = false, bool alt = false, bool meta = false)); - - virtual int GetRow() { return m_row; } - virtual int GetCol() { return m_col; } - wxPoint GetPosition() { return wxPoint( m_x, m_y ); } - bool Selecting() { return m_selecting; } - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxGridEvent(*this); } - -protected: - int m_row; - int m_col; - int m_x; - int m_y; - bool m_selecting; - -private: - void Init(int row, int col, int x, int y, bool sel) - { - m_row = row; - m_col = col; - m_x = x; - m_y = y; - m_selecting = sel; - } - - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxGridEvent); -}; - -class WXDLLIMPEXP_ADV wxGridSizeEvent : public wxNotifyEvent, - public wxKeyboardState -{ -public: - wxGridSizeEvent() - : wxNotifyEvent() - { - Init(-1, -1, -1); - } - - wxGridSizeEvent(int id, - wxEventType type, - wxObject* obj, - int rowOrCol = -1, - int x = -1, int y = -1, - const wxKeyboardState& kbd = wxKeyboardState()) - : wxNotifyEvent(type, id), - wxKeyboardState(kbd) - { - Init(rowOrCol, x, y); - - SetEventObject(obj); - } - - wxDEPRECATED_CONSTRUCTOR( - wxGridSizeEvent(int id, - wxEventType type, - wxObject* obj, - int rowOrCol, - int x, int y, - bool control, - bool shift = false, - bool alt = false, - bool meta = false) ); - - int GetRowOrCol() { return m_rowOrCol; } - wxPoint GetPosition() { return wxPoint( m_x, m_y ); } - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxGridSizeEvent(*this); } - -protected: - int m_rowOrCol; - int m_x; - int m_y; - -private: - void Init(int rowOrCol, int x, int y) - { - m_rowOrCol = rowOrCol; - m_x = x; - m_y = y; - } - - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxGridSizeEvent); -}; - - -class WXDLLIMPEXP_ADV wxGridRangeSelectEvent : public wxNotifyEvent, - public wxKeyboardState -{ -public: - wxGridRangeSelectEvent() - : wxNotifyEvent() - { - Init(wxGridNoCellCoords, wxGridNoCellCoords, false); - } - - wxGridRangeSelectEvent(int id, - wxEventType type, - wxObject* obj, - const wxGridCellCoords& topLeft, - const wxGridCellCoords& bottomRight, - bool sel = true, - const wxKeyboardState& kbd = wxKeyboardState()) - : wxNotifyEvent(type, id), - wxKeyboardState(kbd) - { - Init(topLeft, bottomRight, sel); - - SetEventObject(obj); - } - - wxDEPRECATED_CONSTRUCTOR( - wxGridRangeSelectEvent(int id, - wxEventType type, - wxObject* obj, - const wxGridCellCoords& topLeft, - const wxGridCellCoords& bottomRight, - bool sel, - bool control, - bool shift = false, - bool alt = false, - bool meta = false) ); - - wxGridCellCoords GetTopLeftCoords() { return m_topLeft; } - wxGridCellCoords GetBottomRightCoords() { return m_bottomRight; } - int GetTopRow() { return m_topLeft.GetRow(); } - int GetBottomRow() { return m_bottomRight.GetRow(); } - int GetLeftCol() { return m_topLeft.GetCol(); } - int GetRightCol() { return m_bottomRight.GetCol(); } - bool Selecting() { return m_selecting; } - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxGridRangeSelectEvent(*this); } - -protected: - void Init(const wxGridCellCoords& topLeft, - const wxGridCellCoords& bottomRight, - bool selecting) - { - m_topLeft = topLeft; - m_bottomRight = bottomRight; - m_selecting = selecting; - } - - wxGridCellCoords m_topLeft; - wxGridCellCoords m_bottomRight; - bool m_selecting; - - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxGridRangeSelectEvent); -}; - - -class WXDLLIMPEXP_ADV wxGridEditorCreatedEvent : public wxCommandEvent -{ -public: - wxGridEditorCreatedEvent() - : wxCommandEvent() - { - m_row = 0; - m_col = 0; - m_ctrl = NULL; - } - - wxGridEditorCreatedEvent(int id, wxEventType type, wxObject* obj, - int row, int col, wxControl* ctrl); - - int GetRow() { return m_row; } - int GetCol() { return m_col; } - wxControl* GetControl() { return m_ctrl; } - void SetRow(int row) { m_row = row; } - void SetCol(int col) { m_col = col; } - void SetControl(wxControl* ctrl) { m_ctrl = ctrl; } - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxGridEditorCreatedEvent(*this); } - -private: - int m_row; - int m_col; - wxControl* m_ctrl; - - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxGridEditorCreatedEvent); -}; - - -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_GRID_CELL_LEFT_CLICK, wxGridEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_GRID_CELL_LEFT_DCLICK, wxGridEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_GRID_CELL_RIGHT_DCLICK, wxGridEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_GRID_LABEL_LEFT_DCLICK, wxGridEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_GRID_LABEL_RIGHT_DCLICK, wxGridEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_GRID_ROW_SIZE, wxGridSizeEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_GRID_COL_SIZE, wxGridSizeEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_GRID_COL_AUTO_SIZE, wxGridSizeEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_GRID_RANGE_SELECT, wxGridRangeSelectEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_GRID_CELL_CHANGING, wxGridEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_GRID_CELL_CHANGED, wxGridEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_GRID_SELECT_CELL, wxGridEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_GRID_EDITOR_SHOWN, wxGridEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_GRID_EDITOR_HIDDEN, wxGridEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_GRID_EDITOR_CREATED, wxGridEditorCreatedEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_GRID_CELL_BEGIN_DRAG, wxGridEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_GRID_COL_MOVE, wxGridEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_GRID_COL_SORT, wxGridEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_GRID_TABBING, wxGridEvent ); - -typedef void (wxEvtHandler::*wxGridEventFunction)(wxGridEvent&); -typedef void (wxEvtHandler::*wxGridSizeEventFunction)(wxGridSizeEvent&); -typedef void (wxEvtHandler::*wxGridRangeSelectEventFunction)(wxGridRangeSelectEvent&); -typedef void (wxEvtHandler::*wxGridEditorCreatedEventFunction)(wxGridEditorCreatedEvent&); - -#define wxGridEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxGridEventFunction, func) - -#define wxGridSizeEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxGridSizeEventFunction, func) - -#define wxGridRangeSelectEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxGridRangeSelectEventFunction, func) - -#define wxGridEditorCreatedEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxGridEditorCreatedEventFunction, func) - -#define wx__DECLARE_GRIDEVT(evt, id, fn) \ - wx__DECLARE_EVT1(wxEVT_GRID_ ## evt, id, wxGridEventHandler(fn)) - -#define wx__DECLARE_GRIDSIZEEVT(evt, id, fn) \ - wx__DECLARE_EVT1(wxEVT_GRID_ ## evt, id, wxGridSizeEventHandler(fn)) - -#define wx__DECLARE_GRIDRANGESELEVT(evt, id, fn) \ - wx__DECLARE_EVT1(wxEVT_GRID_ ## evt, id, wxGridRangeSelectEventHandler(fn)) - -#define wx__DECLARE_GRIDEDITOREVT(evt, id, fn) \ - wx__DECLARE_EVT1(wxEVT_GRID_ ## evt, id, wxGridEditorCreatedEventHandler(fn)) - -#define EVT_GRID_CMD_CELL_LEFT_CLICK(id, fn) wx__DECLARE_GRIDEVT(CELL_LEFT_CLICK, id, fn) -#define EVT_GRID_CMD_CELL_RIGHT_CLICK(id, fn) wx__DECLARE_GRIDEVT(CELL_RIGHT_CLICK, id, fn) -#define EVT_GRID_CMD_CELL_LEFT_DCLICK(id, fn) wx__DECLARE_GRIDEVT(CELL_LEFT_DCLICK, id, fn) -#define EVT_GRID_CMD_CELL_RIGHT_DCLICK(id, fn) wx__DECLARE_GRIDEVT(CELL_RIGHT_DCLICK, id, fn) -#define EVT_GRID_CMD_LABEL_LEFT_CLICK(id, fn) wx__DECLARE_GRIDEVT(LABEL_LEFT_CLICK, id, fn) -#define EVT_GRID_CMD_LABEL_RIGHT_CLICK(id, fn) wx__DECLARE_GRIDEVT(LABEL_RIGHT_CLICK, id, fn) -#define EVT_GRID_CMD_LABEL_LEFT_DCLICK(id, fn) wx__DECLARE_GRIDEVT(LABEL_LEFT_DCLICK, id, fn) -#define EVT_GRID_CMD_LABEL_RIGHT_DCLICK(id, fn) wx__DECLARE_GRIDEVT(LABEL_RIGHT_DCLICK, id, fn) -#define EVT_GRID_CMD_ROW_SIZE(id, fn) wx__DECLARE_GRIDSIZEEVT(ROW_SIZE, id, fn) -#define EVT_GRID_CMD_COL_SIZE(id, fn) wx__DECLARE_GRIDSIZEEVT(COL_SIZE, id, fn) -#define EVT_GRID_CMD_COL_AUTO_SIZE(id, fn) wx__DECLARE_GRIDSIZEEVT(COL_AUTO_SIZE, id, fn) -#define EVT_GRID_CMD_COL_MOVE(id, fn) wx__DECLARE_GRIDEVT(COL_MOVE, id, fn) -#define EVT_GRID_CMD_COL_SORT(id, fn) wx__DECLARE_GRIDEVT(COL_SORT, id, fn) -#define EVT_GRID_CMD_RANGE_SELECT(id, fn) wx__DECLARE_GRIDRANGESELEVT(RANGE_SELECT, id, fn) -#define EVT_GRID_CMD_CELL_CHANGING(id, fn) wx__DECLARE_GRIDEVT(CELL_CHANGING, id, fn) -#define EVT_GRID_CMD_CELL_CHANGED(id, fn) wx__DECLARE_GRIDEVT(CELL_CHANGED, id, fn) -#define EVT_GRID_CMD_SELECT_CELL(id, fn) wx__DECLARE_GRIDEVT(SELECT_CELL, id, fn) -#define EVT_GRID_CMD_EDITOR_SHOWN(id, fn) wx__DECLARE_GRIDEVT(EDITOR_SHOWN, id, fn) -#define EVT_GRID_CMD_EDITOR_HIDDEN(id, fn) wx__DECLARE_GRIDEVT(EDITOR_HIDDEN, id, fn) -#define EVT_GRID_CMD_EDITOR_CREATED(id, fn) wx__DECLARE_GRIDEDITOREVT(EDITOR_CREATED, id, fn) -#define EVT_GRID_CMD_CELL_BEGIN_DRAG(id, fn) wx__DECLARE_GRIDEVT(CELL_BEGIN_DRAG, id, fn) -#define EVT_GRID_CMD_TABBING(id, fn) wx__DECLARE_GRIDEVT(TABBING, id, fn) - -// same as above but for any id (exists mainly for backwards compatibility but -// then it's also true that you rarely have multiple grid in the same window) -#define EVT_GRID_CELL_LEFT_CLICK(fn) EVT_GRID_CMD_CELL_LEFT_CLICK(wxID_ANY, fn) -#define EVT_GRID_CELL_RIGHT_CLICK(fn) EVT_GRID_CMD_CELL_RIGHT_CLICK(wxID_ANY, fn) -#define EVT_GRID_CELL_LEFT_DCLICK(fn) EVT_GRID_CMD_CELL_LEFT_DCLICK(wxID_ANY, fn) -#define EVT_GRID_CELL_RIGHT_DCLICK(fn) EVT_GRID_CMD_CELL_RIGHT_DCLICK(wxID_ANY, fn) -#define EVT_GRID_LABEL_LEFT_CLICK(fn) EVT_GRID_CMD_LABEL_LEFT_CLICK(wxID_ANY, fn) -#define EVT_GRID_LABEL_RIGHT_CLICK(fn) EVT_GRID_CMD_LABEL_RIGHT_CLICK(wxID_ANY, fn) -#define EVT_GRID_LABEL_LEFT_DCLICK(fn) EVT_GRID_CMD_LABEL_LEFT_DCLICK(wxID_ANY, fn) -#define EVT_GRID_LABEL_RIGHT_DCLICK(fn) EVT_GRID_CMD_LABEL_RIGHT_DCLICK(wxID_ANY, fn) -#define EVT_GRID_ROW_SIZE(fn) EVT_GRID_CMD_ROW_SIZE(wxID_ANY, fn) -#define EVT_GRID_COL_SIZE(fn) EVT_GRID_CMD_COL_SIZE(wxID_ANY, fn) -#define EVT_GRID_COL_AUTO_SIZE(fn) EVT_GRID_CMD_COL_AUTO_SIZE(wxID_ANY, fn) -#define EVT_GRID_COL_MOVE(fn) EVT_GRID_CMD_COL_MOVE(wxID_ANY, fn) -#define EVT_GRID_COL_SORT(fn) EVT_GRID_CMD_COL_SORT(wxID_ANY, fn) -#define EVT_GRID_RANGE_SELECT(fn) EVT_GRID_CMD_RANGE_SELECT(wxID_ANY, fn) -#define EVT_GRID_CELL_CHANGING(fn) EVT_GRID_CMD_CELL_CHANGING(wxID_ANY, fn) -#define EVT_GRID_CELL_CHANGED(fn) EVT_GRID_CMD_CELL_CHANGED(wxID_ANY, fn) -#define EVT_GRID_SELECT_CELL(fn) EVT_GRID_CMD_SELECT_CELL(wxID_ANY, fn) -#define EVT_GRID_EDITOR_SHOWN(fn) EVT_GRID_CMD_EDITOR_SHOWN(wxID_ANY, fn) -#define EVT_GRID_EDITOR_HIDDEN(fn) EVT_GRID_CMD_EDITOR_HIDDEN(wxID_ANY, fn) -#define EVT_GRID_EDITOR_CREATED(fn) EVT_GRID_CMD_EDITOR_CREATED(wxID_ANY, fn) -#define EVT_GRID_CELL_BEGIN_DRAG(fn) EVT_GRID_CMD_CELL_BEGIN_DRAG(wxID_ANY, fn) -#define EVT_GRID_TABBING(fn) EVT_GRID_CMD_TABBING(wxID_ANY, fn) - -// we used to have a single wxEVT_GRID_CELL_CHANGE event but it was split into -// wxEVT_GRID_CELL_CHANGING and CHANGED ones in wx 2.9.0, however the CHANGED -// is basically the same as the old CHANGE event so we keep the name for -// compatibility -#if WXWIN_COMPATIBILITY_2_8 - #define wxEVT_GRID_CELL_CHANGE wxEVT_GRID_CELL_CHANGED - - #define EVT_GRID_CMD_CELL_CHANGE EVT_GRID_CMD_CELL_CHANGED - #define EVT_GRID_CELL_CHANGE EVT_GRID_CELL_CHANGED -#endif // WXWIN_COMPATIBILITY_2_8 - -#if 0 // TODO: implement these ? others ? - -extern const int wxEVT_GRID_CREATE_CELL; -extern const int wxEVT_GRID_CHANGE_LABELS; -extern const int wxEVT_GRID_CHANGE_SEL_LABEL; - -#define EVT_GRID_CREATE_CELL(fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_GRID_CREATE_CELL, wxID_ANY, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxGridEventFunction, &fn ), NULL ), -#define EVT_GRID_CHANGE_LABELS(fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_GRID_CHANGE_LABELS, wxID_ANY, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxGridEventFunction, &fn ), NULL ), -#define EVT_GRID_CHANGE_SEL_LABEL(fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_GRID_CHANGE_SEL_LABEL, wxID_ANY, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxGridEventFunction, &fn ), NULL ), - -#endif - -#endif // wxUSE_GRID -#endif // _WX_GENERIC_GRID_H_ diff --git a/Externals/wxWidgets3/include/wx/generic/gridctrl.h b/Externals/wxWidgets3/include/wx/generic/gridctrl.h deleted file mode 100644 index 044f565382..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/gridctrl.h +++ /dev/null @@ -1,288 +0,0 @@ -/////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/gridctrl.h -// Purpose: wxGrid controls -// Author: Paul Gammans, Roger Gammans -// Modified by: -// Created: 11/04/2001 -// Copyright: (c) The Computer Surgery (paul@compsurg.co.uk) -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GENERIC_GRIDCTRL_H_ -#define _WX_GENERIC_GRIDCTRL_H_ - -#include "wx/grid.h" - -#if wxUSE_GRID - -#define wxGRID_VALUE_CHOICEINT wxT("choiceint") -#define wxGRID_VALUE_DATETIME wxT("datetime") - - -// the default renderer for the cells containing string data -class WXDLLIMPEXP_ADV wxGridCellStringRenderer : public wxGridCellRenderer -{ -public: - // draw the string - virtual void Draw(wxGrid& grid, - wxGridCellAttr& attr, - wxDC& dc, - const wxRect& rect, - int row, int col, - bool isSelected) wxOVERRIDE; - - // return the string extent - virtual wxSize GetBestSize(wxGrid& grid, - wxGridCellAttr& attr, - wxDC& dc, - int row, int col) wxOVERRIDE; - - virtual wxGridCellRenderer *Clone() const wxOVERRIDE - { return new wxGridCellStringRenderer; } - -protected: - // set the text colours before drawing - void SetTextColoursAndFont(const wxGrid& grid, - const wxGridCellAttr& attr, - wxDC& dc, - bool isSelected); - - // calc the string extent for given string/font - wxSize DoGetBestSize(const wxGridCellAttr& attr, - wxDC& dc, - const wxString& text); -}; - -// the default renderer for the cells containing numeric (long) data -class WXDLLIMPEXP_ADV wxGridCellNumberRenderer : public wxGridCellStringRenderer -{ -public: - // draw the string right aligned - virtual void Draw(wxGrid& grid, - wxGridCellAttr& attr, - wxDC& dc, - const wxRect& rect, - int row, int col, - bool isSelected) wxOVERRIDE; - - virtual wxSize GetBestSize(wxGrid& grid, - wxGridCellAttr& attr, - wxDC& dc, - int row, int col) wxOVERRIDE; - - virtual wxGridCellRenderer *Clone() const wxOVERRIDE - { return new wxGridCellNumberRenderer; } - -protected: - wxString GetString(const wxGrid& grid, int row, int col); -}; - -class WXDLLIMPEXP_ADV wxGridCellFloatRenderer : public wxGridCellStringRenderer -{ -public: - wxGridCellFloatRenderer(int width = -1, - int precision = -1, - int format = wxGRID_FLOAT_FORMAT_DEFAULT); - - // get/change formatting parameters - int GetWidth() const { return m_width; } - void SetWidth(int width) { m_width = width; m_format.clear(); } - int GetPrecision() const { return m_precision; } - void SetPrecision(int precision) { m_precision = precision; m_format.clear(); } - int GetFormat() const { return m_style; } - void SetFormat(int format) { m_style = format; m_format.clear(); } - - // draw the string right aligned with given width/precision - virtual void Draw(wxGrid& grid, - wxGridCellAttr& attr, - wxDC& dc, - const wxRect& rect, - int row, int col, - bool isSelected) wxOVERRIDE; - - virtual wxSize GetBestSize(wxGrid& grid, - wxGridCellAttr& attr, - wxDC& dc, - int row, int col) wxOVERRIDE; - - // parameters string format is "width[,precision[,format]]" - // with format being one of f|e|g|E|F|G - virtual void SetParameters(const wxString& params) wxOVERRIDE; - - virtual wxGridCellRenderer *Clone() const wxOVERRIDE; - -protected: - wxString GetString(const wxGrid& grid, int row, int col); - -private: - // formatting parameters - int m_width, - m_precision; - - int m_style; - wxString m_format; -}; - -// renderer for boolean fields -class WXDLLIMPEXP_ADV wxGridCellBoolRenderer : public wxGridCellRenderer -{ -public: - // draw a check mark or nothing - virtual void Draw(wxGrid& grid, - wxGridCellAttr& attr, - wxDC& dc, - const wxRect& rect, - int row, int col, - bool isSelected) wxOVERRIDE; - - // return the checkmark size - virtual wxSize GetBestSize(wxGrid& grid, - wxGridCellAttr& attr, - wxDC& dc, - int row, int col) wxOVERRIDE; - - virtual wxGridCellRenderer *Clone() const wxOVERRIDE - { return new wxGridCellBoolRenderer; } - -private: - static wxSize ms_sizeCheckMark; -}; - - -#if wxUSE_DATETIME - -#include "wx/datetime.h" - -// the default renderer for the cells containing times and dates -class WXDLLIMPEXP_ADV wxGridCellDateTimeRenderer : public wxGridCellStringRenderer -{ -public: - wxGridCellDateTimeRenderer(const wxString& outformat = wxDefaultDateTimeFormat, - const wxString& informat = wxDefaultDateTimeFormat); - - // draw the string right aligned - virtual void Draw(wxGrid& grid, - wxGridCellAttr& attr, - wxDC& dc, - const wxRect& rect, - int row, int col, - bool isSelected) wxOVERRIDE; - - virtual wxSize GetBestSize(wxGrid& grid, - wxGridCellAttr& attr, - wxDC& dc, - int row, int col) wxOVERRIDE; - - virtual wxGridCellRenderer *Clone() const wxOVERRIDE; - - // output strptime()-like format string - virtual void SetParameters(const wxString& params) wxOVERRIDE; - -protected: - wxString GetString(const wxGrid& grid, int row, int col); - - wxString m_iformat; - wxString m_oformat; - wxDateTime m_dateDef; - wxDateTime::TimeZone m_tz; -}; - -#endif // wxUSE_DATETIME - -// renders a number using the corresponding text string -class WXDLLIMPEXP_ADV wxGridCellEnumRenderer : public wxGridCellStringRenderer -{ -public: - wxGridCellEnumRenderer( const wxString& choices = wxEmptyString ); - - // draw the string right aligned - virtual void Draw(wxGrid& grid, - wxGridCellAttr& attr, - wxDC& dc, - const wxRect& rect, - int row, int col, - bool isSelected) wxOVERRIDE; - - virtual wxSize GetBestSize(wxGrid& grid, - wxGridCellAttr& attr, - wxDC& dc, - int row, int col) wxOVERRIDE; - - virtual wxGridCellRenderer *Clone() const wxOVERRIDE; - - // parameters string format is "item1[,item2[...,itemN]]" where itemN will - // be used if the cell value is N-1 - virtual void SetParameters(const wxString& params) wxOVERRIDE; - -protected: - wxString GetString(const wxGrid& grid, int row, int col); - - wxArrayString m_choices; -}; - - -class WXDLLIMPEXP_ADV wxGridCellAutoWrapStringRenderer : public wxGridCellStringRenderer -{ -public: - wxGridCellAutoWrapStringRenderer() : wxGridCellStringRenderer() { } - - virtual void Draw(wxGrid& grid, - wxGridCellAttr& attr, - wxDC& dc, - const wxRect& rect, - int row, int col, - bool isSelected) wxOVERRIDE; - - virtual wxSize GetBestSize(wxGrid& grid, - wxGridCellAttr& attr, - wxDC& dc, - int row, int col) wxOVERRIDE; - - virtual int GetBestHeight(wxGrid& grid, - wxGridCellAttr& attr, - wxDC& dc, - int row, int col, - int width) wxOVERRIDE; - - virtual int GetBestWidth(wxGrid& grid, - wxGridCellAttr& attr, - wxDC& dc, - int row, int col, - int height) wxOVERRIDE; - - virtual wxGridCellRenderer *Clone() const wxOVERRIDE - { return new wxGridCellAutoWrapStringRenderer; } - -private: - wxArrayString GetTextLines( wxGrid& grid, - wxDC& dc, - const wxGridCellAttr& attr, - const wxRect& rect, - int row, int col); - - // Helper methods of GetTextLines() - - // Break a single logical line of text into several physical lines, all of - // which are added to the lines array. The lines are broken at maxWidth and - // the dc is used for measuring text extent only. - void BreakLine(wxDC& dc, - const wxString& logicalLine, - wxCoord maxWidth, - wxArrayString& lines); - - // Break a word, which is supposed to be wider than maxWidth, into several - // lines, which are added to lines array and the last, incomplete, of which - // is returned in line output parameter. - // - // Returns the width of the last line. - wxCoord BreakWord(wxDC& dc, - const wxString& word, - wxCoord maxWidth, - wxArrayString& lines, - wxString& line); - - -}; - -#endif // wxUSE_GRID -#endif // _WX_GENERIC_GRIDCTRL_H_ diff --git a/Externals/wxWidgets3/include/wx/generic/grideditors.h b/Externals/wxWidgets3/include/wx/generic/grideditors.h deleted file mode 100644 index faa1007c65..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/grideditors.h +++ /dev/null @@ -1,378 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/grideditors.h -// Purpose: wxGridCellEditorEvtHandler and wxGrid editors -// Author: Michael Bedward (based on code by Julian Smart, Robin Dunn) -// Modified by: Santiago Palacios -// Created: 1/08/1999 -// Copyright: (c) Michael Bedward -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GENERIC_GRID_EDITORS_H_ -#define _WX_GENERIC_GRID_EDITORS_H_ - -#include "wx/defs.h" - -#if wxUSE_GRID - -#include "wx/scopedptr.h" - -class wxGridCellEditorEvtHandler : public wxEvtHandler -{ -public: - wxGridCellEditorEvtHandler(wxGrid* grid, wxGridCellEditor* editor) - : m_grid(grid), - m_editor(editor), - m_inSetFocus(false) - { - } - - void OnKillFocus(wxFocusEvent& event); - void OnKeyDown(wxKeyEvent& event); - void OnChar(wxKeyEvent& event); - - void SetInSetFocus(bool inSetFocus) { m_inSetFocus = inSetFocus; } - -private: - wxGrid *m_grid; - wxGridCellEditor *m_editor; - - // Work around the fact that a focus kill event can be sent to - // a combobox within a set focus event. - bool m_inSetFocus; - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_DYNAMIC_CLASS(wxGridCellEditorEvtHandler); - wxDECLARE_NO_COPY_CLASS(wxGridCellEditorEvtHandler); -}; - - -#if wxUSE_TEXTCTRL - -// the editor for string/text data -class WXDLLIMPEXP_ADV wxGridCellTextEditor : public wxGridCellEditor -{ -public: - wxEXPLICIT wxGridCellTextEditor(size_t maxChars = 0); - - virtual void Create(wxWindow* parent, - wxWindowID id, - wxEvtHandler* evtHandler) wxOVERRIDE; - virtual void SetSize(const wxRect& rect) wxOVERRIDE; - - virtual void PaintBackground(wxDC& dc, - const wxRect& rectCell, - const wxGridCellAttr& attr) wxOVERRIDE; - - virtual bool IsAcceptedKey(wxKeyEvent& event) wxOVERRIDE; - virtual void BeginEdit(int row, int col, wxGrid* grid) wxOVERRIDE; - virtual bool EndEdit(int row, int col, const wxGrid* grid, - const wxString& oldval, wxString *newval) wxOVERRIDE; - virtual void ApplyEdit(int row, int col, wxGrid* grid) wxOVERRIDE; - - virtual void Reset() wxOVERRIDE; - virtual void StartingKey(wxKeyEvent& event) wxOVERRIDE; - virtual void HandleReturn(wxKeyEvent& event) wxOVERRIDE; - - // parameters string format is "max_width" - virtual void SetParameters(const wxString& params) wxOVERRIDE; -#if wxUSE_VALIDATORS - virtual void SetValidator(const wxValidator& validator); -#endif - - virtual wxGridCellEditor *Clone() const wxOVERRIDE; - - // added GetValue so we can get the value which is in the control - virtual wxString GetValue() const wxOVERRIDE; - -protected: - wxTextCtrl *Text() const { return (wxTextCtrl *)m_control; } - - // parts of our virtual functions reused by the derived classes - void DoCreate(wxWindow* parent, wxWindowID id, wxEvtHandler* evtHandler, - long style = 0); - void DoBeginEdit(const wxString& startValue); - void DoReset(const wxString& startValue); - -private: - size_t m_maxChars; // max number of chars allowed -#if wxUSE_VALIDATORS - wxScopedPtr m_validator; -#endif - wxString m_value; - - wxDECLARE_NO_COPY_CLASS(wxGridCellTextEditor); -}; - -// the editor for numeric (long) data -class WXDLLIMPEXP_ADV wxGridCellNumberEditor : public wxGridCellTextEditor -{ -public: - // allows to specify the range - if min == max == -1, no range checking is - // done - wxGridCellNumberEditor(int min = -1, int max = -1); - - virtual void Create(wxWindow* parent, - wxWindowID id, - wxEvtHandler* evtHandler) wxOVERRIDE; - - virtual bool IsAcceptedKey(wxKeyEvent& event) wxOVERRIDE; - virtual void BeginEdit(int row, int col, wxGrid* grid) wxOVERRIDE; - virtual bool EndEdit(int row, int col, const wxGrid* grid, - const wxString& oldval, wxString *newval) wxOVERRIDE; - virtual void ApplyEdit(int row, int col, wxGrid* grid) wxOVERRIDE; - - virtual void Reset() wxOVERRIDE; - virtual void StartingKey(wxKeyEvent& event) wxOVERRIDE; - - // parameters string format is "min,max" - virtual void SetParameters(const wxString& params) wxOVERRIDE; - - virtual wxGridCellEditor *Clone() const wxOVERRIDE - { return new wxGridCellNumberEditor(m_min, m_max); } - - // added GetValue so we can get the value which is in the control - virtual wxString GetValue() const wxOVERRIDE; - -protected: -#if wxUSE_SPINCTRL - wxSpinCtrl *Spin() const { return (wxSpinCtrl *)m_control; } -#endif - - // if HasRange(), we use wxSpinCtrl - otherwise wxTextCtrl - bool HasRange() const - { -#if wxUSE_SPINCTRL - return m_min != m_max; -#else - return false; -#endif - } - - // string representation of our value - wxString GetString() const - { return wxString::Format(wxT("%ld"), m_value); } - -private: - int m_min, - m_max; - - long m_value; - - wxDECLARE_NO_COPY_CLASS(wxGridCellNumberEditor); -}; - - -enum wxGridCellFloatFormat -{ - // Decimal floating point (%f) - wxGRID_FLOAT_FORMAT_FIXED = 0x0010, - - // Scientific notation (mantise/exponent) using e character (%e) - wxGRID_FLOAT_FORMAT_SCIENTIFIC = 0x0020, - - // Use the shorter of %e or %f (%g) - wxGRID_FLOAT_FORMAT_COMPACT = 0x0040, - - // To use in combination with one of the above formats (%F/%E/%G) - wxGRID_FLOAT_FORMAT_UPPER = 0x0080, - - // Format used by default. - wxGRID_FLOAT_FORMAT_DEFAULT = wxGRID_FLOAT_FORMAT_FIXED, - - // A mask to extract format from the combination of flags. - wxGRID_FLOAT_FORMAT_MASK = wxGRID_FLOAT_FORMAT_FIXED | - wxGRID_FLOAT_FORMAT_SCIENTIFIC | - wxGRID_FLOAT_FORMAT_COMPACT | - wxGRID_FLOAT_FORMAT_UPPER -}; - -// the editor for floating point numbers (double) data -class WXDLLIMPEXP_ADV wxGridCellFloatEditor : public wxGridCellTextEditor -{ -public: - wxGridCellFloatEditor(int width = -1, - int precision = -1, - int format = wxGRID_FLOAT_FORMAT_DEFAULT); - - virtual void Create(wxWindow* parent, - wxWindowID id, - wxEvtHandler* evtHandler) wxOVERRIDE; - - virtual bool IsAcceptedKey(wxKeyEvent& event) wxOVERRIDE; - virtual void BeginEdit(int row, int col, wxGrid* grid) wxOVERRIDE; - virtual bool EndEdit(int row, int col, const wxGrid* grid, - const wxString& oldval, wxString *newval) wxOVERRIDE; - virtual void ApplyEdit(int row, int col, wxGrid* grid) wxOVERRIDE; - - virtual void Reset() wxOVERRIDE; - virtual void StartingKey(wxKeyEvent& event) wxOVERRIDE; - - virtual wxGridCellEditor *Clone() const wxOVERRIDE - { return new wxGridCellFloatEditor(m_width, m_precision); } - - // parameters string format is "width[,precision[,format]]" - // format to choose beween f|e|g|E|G (f is used by default) - virtual void SetParameters(const wxString& params) wxOVERRIDE; - -protected: - // string representation of our value - wxString GetString(); - -private: - int m_width, - m_precision; - double m_value; - - int m_style; - wxString m_format; - - wxDECLARE_NO_COPY_CLASS(wxGridCellFloatEditor); -}; - -#endif // wxUSE_TEXTCTRL - -#if wxUSE_CHECKBOX - -// the editor for boolean data -class WXDLLIMPEXP_ADV wxGridCellBoolEditor : public wxGridCellEditor -{ -public: - wxGridCellBoolEditor() { } - - virtual void Create(wxWindow* parent, - wxWindowID id, - wxEvtHandler* evtHandler) wxOVERRIDE; - - virtual void SetSize(const wxRect& rect) wxOVERRIDE; - virtual void Show(bool show, wxGridCellAttr *attr = NULL) wxOVERRIDE; - - virtual bool IsAcceptedKey(wxKeyEvent& event) wxOVERRIDE; - virtual void BeginEdit(int row, int col, wxGrid* grid) wxOVERRIDE; - virtual bool EndEdit(int row, int col, const wxGrid* grid, - const wxString& oldval, wxString *newval) wxOVERRIDE; - virtual void ApplyEdit(int row, int col, wxGrid* grid) wxOVERRIDE; - - virtual void Reset() wxOVERRIDE; - virtual void StartingClick() wxOVERRIDE; - virtual void StartingKey(wxKeyEvent& event) wxOVERRIDE; - - virtual wxGridCellEditor *Clone() const wxOVERRIDE - { return new wxGridCellBoolEditor; } - - // added GetValue so we can get the value which is in the control, see - // also UseStringValues() - virtual wxString GetValue() const wxOVERRIDE; - - // set the string values returned by GetValue() for the true and false - // states, respectively - static void UseStringValues(const wxString& valueTrue = wxT("1"), - const wxString& valueFalse = wxEmptyString); - - // return true if the given string is equal to the string representation of - // true value which we currently use - static bool IsTrueValue(const wxString& value); - -protected: - wxCheckBox *CBox() const { return (wxCheckBox *)m_control; } - -private: - bool m_value; - - static wxString ms_stringValues[2]; - - wxDECLARE_NO_COPY_CLASS(wxGridCellBoolEditor); -}; - -#endif // wxUSE_CHECKBOX - -#if wxUSE_COMBOBOX - -// the editor for string data allowing to choose from the list of strings -class WXDLLIMPEXP_ADV wxGridCellChoiceEditor : public wxGridCellEditor -{ -public: - // if !allowOthers, user can't type a string not in choices array - wxGridCellChoiceEditor(size_t count = 0, - const wxString choices[] = NULL, - bool allowOthers = false); - wxGridCellChoiceEditor(const wxArrayString& choices, - bool allowOthers = false); - - virtual void Create(wxWindow* parent, - wxWindowID id, - wxEvtHandler* evtHandler) wxOVERRIDE; - - virtual void SetSize(const wxRect& rect) wxOVERRIDE; - - virtual void PaintBackground(wxDC& dc, - const wxRect& rectCell, - const wxGridCellAttr& attr) wxOVERRIDE; - - virtual void BeginEdit(int row, int col, wxGrid* grid) wxOVERRIDE; - virtual bool EndEdit(int row, int col, const wxGrid* grid, - const wxString& oldval, wxString *newval) wxOVERRIDE; - virtual void ApplyEdit(int row, int col, wxGrid* grid) wxOVERRIDE; - - virtual void Reset() wxOVERRIDE; - - // parameters string format is "item1[,item2[...,itemN]]" - virtual void SetParameters(const wxString& params) wxOVERRIDE; - - virtual wxGridCellEditor *Clone() const wxOVERRIDE; - - // added GetValue so we can get the value which is in the control - virtual wxString GetValue() const wxOVERRIDE; - -protected: - wxComboBox *Combo() const { return (wxComboBox *)m_control; } - - wxString m_value; - wxArrayString m_choices; - bool m_allowOthers; - - wxDECLARE_NO_COPY_CLASS(wxGridCellChoiceEditor); -}; - -#endif // wxUSE_COMBOBOX - -#if wxUSE_COMBOBOX - -class WXDLLIMPEXP_ADV wxGridCellEnumEditor : public wxGridCellChoiceEditor -{ -public: - wxGridCellEnumEditor( const wxString& choices = wxEmptyString ); - virtual ~wxGridCellEnumEditor() {} - - virtual wxGridCellEditor* Clone() const wxOVERRIDE; - - virtual void BeginEdit(int row, int col, wxGrid* grid) wxOVERRIDE; - virtual bool EndEdit(int row, int col, const wxGrid* grid, - const wxString& oldval, wxString *newval) wxOVERRIDE; - virtual void ApplyEdit(int row, int col, wxGrid* grid) wxOVERRIDE; - -private: - long m_index; - - wxDECLARE_NO_COPY_CLASS(wxGridCellEnumEditor); -}; - -#endif // wxUSE_COMBOBOX - -class WXDLLIMPEXP_ADV wxGridCellAutoWrapStringEditor : public wxGridCellTextEditor -{ -public: - wxGridCellAutoWrapStringEditor() : wxGridCellTextEditor() { } - virtual void Create(wxWindow* parent, - wxWindowID id, - wxEvtHandler* evtHandler) wxOVERRIDE; - - virtual wxGridCellEditor *Clone() const wxOVERRIDE - { return new wxGridCellAutoWrapStringEditor; } - - wxDECLARE_NO_COPY_CLASS(wxGridCellAutoWrapStringEditor); -}; - -#endif // wxUSE_GRID - -#endif // _WX_GENERIC_GRID_EDITORS_H_ diff --git a/Externals/wxWidgets3/include/wx/generic/gridsel.h b/Externals/wxWidgets3/include/wx/generic/gridsel.h deleted file mode 100644 index 76135532c1..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/gridsel.h +++ /dev/null @@ -1,115 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/gridsel.h -// Purpose: wxGridSelection -// Author: Stefan Neis -// Modified by: -// Created: 20/02/2000 -// Copyright: (c) Stefan Neis -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GENERIC_GRIDSEL_H_ -#define _WX_GENERIC_GRIDSEL_H_ - -#include "wx/defs.h" - -#if wxUSE_GRID - -#include "wx/grid.h" - -class WXDLLIMPEXP_ADV wxGridSelection -{ -public: - wxGridSelection(wxGrid *grid, - wxGrid::wxGridSelectionModes sel = wxGrid::wxGridSelectCells); - - bool IsSelection(); - bool IsInSelection(int row, int col); - bool IsInSelection(const wxGridCellCoords& coords) - { - return IsInSelection(coords.GetRow(), coords.GetCol()); - } - - void SetSelectionMode(wxGrid::wxGridSelectionModes selmode); - wxGrid::wxGridSelectionModes GetSelectionMode() { return m_selectionMode; } - void SelectRow(int row, const wxKeyboardState& kbd = wxKeyboardState()); - void SelectCol(int col, const wxKeyboardState& kbd = wxKeyboardState()); - void SelectBlock(int topRow, int leftCol, - int bottomRow, int rightCol, - const wxKeyboardState& kbd = wxKeyboardState(), - bool sendEvent = true ); - void SelectBlock(const wxGridCellCoords& topLeft, - const wxGridCellCoords& bottomRight, - const wxKeyboardState& kbd = wxKeyboardState(), - bool sendEvent = true ) - { - SelectBlock(topLeft.GetRow(), topLeft.GetCol(), - bottomRight.GetRow(), bottomRight.GetCol(), - kbd, sendEvent); - } - - void SelectCell(int row, int col, - const wxKeyboardState& kbd = wxKeyboardState(), - bool sendEvent = true); - void SelectCell(const wxGridCellCoords& coords, - const wxKeyboardState& kbd = wxKeyboardState(), - bool sendEvent = true) - { - SelectCell(coords.GetRow(), coords.GetCol(), kbd, sendEvent); - } - - void ToggleCellSelection(int row, int col, - const wxKeyboardState& kbd = wxKeyboardState()); - void ToggleCellSelection(const wxGridCellCoords& coords, - const wxKeyboardState& kbd = wxKeyboardState()) - { - ToggleCellSelection(coords.GetRow(), coords.GetCol(), kbd); - } - - void ClearSelection(); - - void UpdateRows( size_t pos, int numRows ); - void UpdateCols( size_t pos, int numCols ); - -private: - int BlockContain( int topRow1, int leftCol1, - int bottomRow1, int rightCol1, - int topRow2, int leftCol2, - int bottomRow2, int rightCol2 ); - // returns 1, if Block1 contains Block2, - // -1, if Block2 contains Block1, - // 0, otherwise - - int BlockContainsCell( int topRow, int leftCol, - int bottomRow, int rightCol, - int row, int col ) - // returns 1, if Block contains Cell, - // 0, otherwise - { - return ( topRow <= row && row <= bottomRow && - leftCol <= col && col <= rightCol ); - } - - void SelectBlockNoEvent(int topRow, int leftCol, - int bottomRow, int rightCol) - { - SelectBlock(topRow, leftCol, bottomRow, rightCol, - wxKeyboardState(), false); - } - - wxGridCellCoordsArray m_cellSelection; - wxGridCellCoordsArray m_blockSelectionTopLeft; - wxGridCellCoordsArray m_blockSelectionBottomRight; - wxArrayInt m_rowSelection; - wxArrayInt m_colSelection; - - wxGrid *m_grid; - wxGrid::wxGridSelectionModes m_selectionMode; - - friend class WXDLLIMPEXP_FWD_ADV wxGrid; - - wxDECLARE_NO_COPY_CLASS(wxGridSelection); -}; - -#endif // wxUSE_GRID -#endif // _WX_GENERIC_GRIDSEL_H_ diff --git a/Externals/wxWidgets3/include/wx/generic/headerctrlg.h b/Externals/wxWidgets3/include/wx/generic/headerctrlg.h deleted file mode 100644 index 8a2a84ca1c..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/headerctrlg.h +++ /dev/null @@ -1,181 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/headerctrlg.h -// Purpose: Generic wxHeaderCtrl implementation -// Author: Vadim Zeitlin -// Created: 2008-12-01 -// Copyright: (c) 2008 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GENERIC_HEADERCTRLG_H_ -#define _WX_GENERIC_HEADERCTRLG_H_ - -#include "wx/event.h" -#include "wx/vector.h" -#include "wx/overlay.h" - -// ---------------------------------------------------------------------------- -// wxHeaderCtrl -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxHeaderCtrl : public wxHeaderCtrlBase -{ -public: - wxHeaderCtrl() - { - Init(); - } - - wxHeaderCtrl(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxHD_DEFAULT_STYLE, - const wxString& name = wxHeaderCtrlNameStr) - { - Init(); - - Create(parent, id, pos, size, style, name); - } - - bool Create(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxHD_DEFAULT_STYLE, - const wxString& name = wxHeaderCtrlNameStr); - - virtual ~wxHeaderCtrl(); - -protected: - virtual wxSize DoGetBestSize() const wxOVERRIDE; - - -private: - // implement base class pure virtuals - virtual void DoSetCount(unsigned int count) wxOVERRIDE; - virtual unsigned int DoGetCount() const wxOVERRIDE; - virtual void DoUpdate(unsigned int idx) wxOVERRIDE; - - virtual void DoScrollHorz(int dx) wxOVERRIDE; - - virtual void DoSetColumnsOrder(const wxArrayInt& order) wxOVERRIDE; - virtual wxArrayInt DoGetColumnsOrder() const wxOVERRIDE; - - // common part of all ctors - void Init(); - - // event handlers - void OnPaint(wxPaintEvent& event); - void OnMouse(wxMouseEvent& event); - void OnKeyDown(wxKeyEvent& event); - void OnCaptureLost(wxMouseCaptureLostEvent& event); - - // move the column with given idx at given position (this doesn't generate - // any events but does refresh the display) - void DoMoveCol(unsigned int idx, unsigned int pos); - - // return the horizontal start position of the given column in physical - // coordinates - int GetColStart(unsigned int idx) const; - - // and the end position - int GetColEnd(unsigned int idx) const; - - // refresh the given column [only]; idx must be valid - void RefreshCol(unsigned int idx); - - // refresh the given column if idx is valid - void RefreshColIfNotNone(unsigned int idx); - - // refresh all the controls starting from (and including) the given one - void RefreshColsAfter(unsigned int idx); - - // return the column at the given position or -1 if it is beyond the - // rightmost column and put true into onSeparator output parameter if the - // position is near the divider at the right end of this column (notice - // that this means that we return column 0 even if the position is over - // column 1 but close enough to the divider separating it from column 0) - unsigned int FindColumnAtPoint(int x, bool *onSeparator = NULL) const; - - // return true if a drag resizing operation is currently in progress - bool IsResizing() const; - - // return true if a drag reordering operation is currently in progress - bool IsReordering() const; - - // return true if any drag operation is currently in progress - bool IsDragging() const { return IsResizing() || IsReordering(); } - - // end any drag operation currently in progress (resizing or reordering) - void EndDragging(); - - // cancel the drag operation currently in progress and generate an event - // about it - void CancelDragging(); - - // start (if m_colBeingResized is -1) or continue resizing the column - // - // this generates wxEVT_HEADER_BEGIN_RESIZE/RESIZING events and can - // cancel the operation if the user handler decides so - void StartOrContinueResizing(unsigned int col, int xPhysical); - - // end the resizing operation currently in progress and generate an event - // about it with its cancelled flag set if xPhysical is -1 - void EndResizing(int xPhysical); - - // same functions as above but for column moving/reordering instead of - // resizing - void StartReordering(unsigned int col, int xPhysical); - - // returns true if we did drag the column somewhere else or false if we - // didn't really move it -- in this case we consider that no reordering - // took place and that a normal column click event should be generated - bool EndReordering(int xPhysical); - - // constrain the given position to be larger than the start position of the - // given column plus its minimal width and return the effective width - int ConstrainByMinWidth(unsigned int col, int& xPhysical); - - // update the information displayed while a column is being moved around - void UpdateReorderingMarker(int xPhysical); - - // clear any overlaid markers - void ClearMarkers(); - - - // number of columns in the control currently - unsigned int m_numColumns; - - // index of the column under mouse or -1 if none - unsigned int m_hover; - - // the column being resized or -1 if there is no resizing operation in - // progress - unsigned int m_colBeingResized; - - // the column being moved or -1 if there is no reordering operation in - // progress - unsigned int m_colBeingReordered; - - // the distance from the start of m_colBeingReordered and the mouse - // position when the user started to drag it - int m_dragOffset; - - // the horizontal scroll offset - int m_scrollOffset; - - // the overlay display used during the dragging operations - wxOverlay m_overlay; - - // the indices of the column appearing at the given position on the display - // (its size is always m_numColumns) - wxArrayInt m_colIndices; - - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_NO_COPY_CLASS(wxHeaderCtrl); -}; - -#endif // _WX_GENERIC_HEADERCTRLG_H_ - diff --git a/Externals/wxWidgets3/include/wx/generic/helpext.h b/Externals/wxWidgets3/include/wx/generic/helpext.h deleted file mode 100644 index b713cd854a..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/helpext.h +++ /dev/null @@ -1,105 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/helpext.h -// Purpose: an external help controller for wxWidgets -// Author: Karsten Ballueder (Ballueder@usa.net) -// Modified by: -// Copyright: (c) Karsten Ballueder 1998 -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_HELPEXT_H_ -#define __WX_HELPEXT_H_ - -#if wxUSE_HELP - - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/helpbase.h" - - -// ---------------------------------------------------------------------------- -// wxExtHelpController -// ---------------------------------------------------------------------------- - -// This class implements help via an external browser. -class WXDLLIMPEXP_ADV wxExtHelpController : public wxHelpControllerBase -{ -public: - wxExtHelpController(wxWindow* parentWindow = NULL); - virtual ~wxExtHelpController(); - -#if WXWIN_COMPATIBILITY_2_8 - wxDEPRECATED(void SetBrowser(const wxString& browsername = wxEmptyString, bool isNetscape = false) ); -#endif - - // Set viewer: new name for SetBrowser - virtual void SetViewer(const wxString& viewer = wxEmptyString, - long flags = wxHELP_NETSCAPE) wxOVERRIDE; - - virtual bool Initialize(const wxString& dir, int WXUNUSED(server)) wxOVERRIDE - { return Initialize(dir); } - - virtual bool Initialize(const wxString& dir) wxOVERRIDE; - virtual bool LoadFile(const wxString& file = wxEmptyString) wxOVERRIDE; - virtual bool DisplayContents(void) wxOVERRIDE; - virtual bool DisplaySection(int sectionNo) wxOVERRIDE; - virtual bool DisplaySection(const wxString& section) wxOVERRIDE; - virtual bool DisplayBlock(long blockNo) wxOVERRIDE; - virtual bool KeywordSearch(const wxString& k, - wxHelpSearchMode mode = wxHELP_SEARCH_ALL) wxOVERRIDE; - - virtual bool Quit(void) wxOVERRIDE; - virtual void OnQuit(void) wxOVERRIDE; - - virtual bool DisplayHelp(const wxString &) ; - - virtual void SetFrameParameters(const wxString& WXUNUSED(title), - const wxSize& WXUNUSED(size), - const wxPoint& WXUNUSED(pos) = wxDefaultPosition, - bool WXUNUSED(newFrameEachTime) = false) wxOVERRIDE - { - // does nothing by default - } - - virtual wxFrame *GetFrameParameters(wxSize *WXUNUSED(size) = NULL, - wxPoint *WXUNUSED(pos) = NULL, - bool *WXUNUSED(newFrameEachTime) = NULL) wxOVERRIDE - { - return NULL; // does nothing by default - } - -protected: - // Filename of currently active map file. - wxString m_helpDir; - - // How many entries do we have in the map file? - int m_NumOfEntries; - - // A list containing all id,url,documentation triples. - wxList *m_MapList; - -private: - // parse a single line of the map file (called by LoadFile()) - // - // return true if the line was valid or false otherwise - bool ParseMapFileLine(const wxString& line); - - // Deletes the list and all objects. - void DeleteList(void); - - - // How to call the html viewer. - wxString m_BrowserName; - - // Is the viewer a variant of netscape? - bool m_BrowserIsNetscape; - - wxDECLARE_CLASS(wxExtHelpController); -}; - -#endif // wxUSE_HELP - -#endif // __WX_HELPEXT_H_ diff --git a/Externals/wxWidgets3/include/wx/generic/hyperlink.h b/Externals/wxWidgets3/include/wx/generic/hyperlink.h deleted file mode 100644 index eb73388869..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/hyperlink.h +++ /dev/null @@ -1,144 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/hyperlink.h -// Purpose: Hyperlink control -// Author: David Norris , Otto Wyss -// Modified by: Ryan Norton, Francesco Montorsi -// Created: 04/02/2005 -// Copyright: (c) 2005 David Norris -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GENERICHYPERLINKCTRL_H_ -#define _WX_GENERICHYPERLINKCTRL_H_ - -// ---------------------------------------------------------------------------- -// wxGenericHyperlinkCtrl -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxGenericHyperlinkCtrl : public wxHyperlinkCtrlBase -{ -public: - // Default constructor (for two-step construction). - wxGenericHyperlinkCtrl() { Init(); } - - // Constructor. - wxGenericHyperlinkCtrl(wxWindow *parent, - wxWindowID id, - const wxString& label, const wxString& url, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxHL_DEFAULT_STYLE, - const wxString& name = wxHyperlinkCtrlNameStr) - { - Init(); - (void) Create(parent, id, label, url, pos, size, style, name); - } - - // Creation function (for two-step construction). - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& label, const wxString& url, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxHL_DEFAULT_STYLE, - const wxString& name = wxHyperlinkCtrlNameStr); - - - // get/set - wxColour GetHoverColour() const { return m_hoverColour; } - void SetHoverColour(const wxColour &colour) { m_hoverColour = colour; } - - wxColour GetNormalColour() const { return m_normalColour; } - void SetNormalColour(const wxColour &colour); - - wxColour GetVisitedColour() const { return m_visitedColour; } - void SetVisitedColour(const wxColour &colour); - - wxString GetURL() const { return m_url; } - void SetURL (const wxString &url) { m_url=url; } - - void SetVisited(bool visited = true) { m_visited=visited; } - bool GetVisited() const { return m_visited; } - - // NOTE: also wxWindow::Set/GetLabel, wxWindow::Set/GetBackgroundColour, - // wxWindow::Get/SetFont, wxWindow::Get/SetCursor are important ! - - -protected: - // Helper used by this class itself and native MSW implementation that - // connects OnRightUp() and OnPopUpCopy() handlers. - void ConnectMenuHandlers(); - - // event handlers - - // Renders the hyperlink. - void OnPaint(wxPaintEvent& event); - - // Handle set/kill focus events (invalidate for painting focus rect) - void OnFocus(wxFocusEvent& event); - - // Fire a HyperlinkEvent on space - void OnChar(wxKeyEvent& event); - - // Returns the wxRect of the label of this hyperlink. - // This is different from the clientsize's rectangle when - // clientsize != bestsize and this rectangle is influenced - // by the alignment of the label (wxHL_ALIGN_*). - wxRect GetLabelRect() const; - - // If the click originates inside the bounding box of the label, - // a flag is set so that an event will be fired when the left - // button is released. - void OnLeftDown(wxMouseEvent& event); - - // If the click both originated and finished inside the bounding box - // of the label, a HyperlinkEvent is fired. - void OnLeftUp(wxMouseEvent& event); - void OnRightUp(wxMouseEvent& event); - - // Changes the cursor to a hand, if the mouse is inside the label's - // bounding box. - void OnMotion(wxMouseEvent& event); - - // Changes the cursor back to the default, if necessary. - void OnLeaveWindow(wxMouseEvent& event); - - // handles "Copy URL" menuitem - void OnPopUpCopy(wxCommandEvent& event); - - // overridden base class virtuals - - // Returns the best size for the window, which is the size needed - // to display the text label. - virtual wxSize DoGetBestClientSize() const; - - // creates a context menu with "Copy URL" menuitem - virtual void DoContextMenu(const wxPoint &); - -private: - // Common part of all ctors. - void Init(); - - // URL associated with the link. This is transmitted inside - // the HyperlinkEvent fired when the user clicks on the label. - wxString m_url; - - // Foreground colours for various link types. - // NOTE: wxWindow::m_backgroundColour is used for background, - // wxWindow::m_foregroundColour is used to render non-visited links - wxColour m_hoverColour; - wxColour m_normalColour; - wxColour m_visitedColour; - - // True if the mouse cursor is inside the label's bounding box. - bool m_rollover; - - // True if the link has been clicked before. - bool m_visited; - - // True if a click is in progress (left button down) and the click - // originated inside the label's bounding box. - bool m_clicking; -}; - -#endif // _WX_GENERICHYPERLINKCTRL_H_ diff --git a/Externals/wxWidgets3/include/wx/generic/icon.h b/Externals/wxWidgets3/include/wx/generic/icon.h deleted file mode 100644 index 0b98032a73..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/icon.h +++ /dev/null @@ -1,62 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/icon.h -// Purpose: wxIcon implementation for ports where it's same as wxBitmap -// Author: Julian Smart -// Modified by: -// Created: 17/09/98 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GENERIC_ICON_H_ -#define _WX_GENERIC_ICON_H_ - -#include "wx/bitmap.h" - -//----------------------------------------------------------------------------- -// wxIcon -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxIcon: public wxBitmap -{ -public: - wxIcon(); - - wxIcon(const char* const* bits); -#ifdef wxNEEDS_CHARPP - wxIcon(char **bits); -#endif - - // For compatibility with wxMSW where desired size is sometimes required to - // distinguish between multiple icons in a resource. - wxIcon( const wxString& filename, - wxBitmapType type = wxICON_DEFAULT_TYPE, - int WXUNUSED(desiredWidth)=-1, int WXUNUSED(desiredHeight)=-1 ) : - wxBitmap(filename, type) - { - } - - wxIcon(const wxIconLocation& loc) - : wxBitmap(loc.GetFileName(), wxBITMAP_TYPE_ANY) - { - } - - bool LoadFile(const wxString& name, wxBitmapType flags, - int WXUNUSED(desiredWidth), int WXUNUSED(desiredHeight)) - { return wxBitmap::LoadFile(name, flags); } - - // unhide the base class version - virtual bool LoadFile(const wxString& name, - wxBitmapType flags = wxICON_DEFAULT_TYPE) wxOVERRIDE - { return wxBitmap::LoadFile(name, flags); } - - // create from bitmap (which should have a mask unless it's monochrome): - // there shouldn't be any implicit bitmap -> icon conversion (i.e. no - // ctors, assignment operators...), but it's ok to have such function - void CopyFromBitmap(const wxBitmap& bmp); - -private: - wxDECLARE_DYNAMIC_CLASS(wxIcon); -}; - -#endif // _WX_GENERIC_ICON_H_ diff --git a/Externals/wxWidgets3/include/wx/generic/imaglist.h b/Externals/wxWidgets3/include/wx/generic/imaglist.h deleted file mode 100644 index f87e19b43c..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/imaglist.h +++ /dev/null @@ -1,80 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/imaglist.h -// Purpose: -// Author: Robert Roebling -// Created: 01/02/97 -// Copyright: (c) 1998 Robert Roebling and Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_IMAGLISTG_H_ -#define _WX_IMAGLISTG_H_ - -#include "wx/gdicmn.h" - -class WXDLLIMPEXP_FWD_CORE wxDC; -class WXDLLIMPEXP_FWD_CORE wxBitmap; -class WXDLLIMPEXP_FWD_CORE wxIcon; -class WXDLLIMPEXP_FWD_CORE wxColour; - - -class WXDLLIMPEXP_CORE wxGenericImageList: public wxObject -{ -public: - wxGenericImageList() { m_width = m_height = 0; } - wxGenericImageList( int width, int height, bool mask = true, int initialCount = 1 ); - virtual ~wxGenericImageList(); - bool Create( int width, int height, bool mask = true, int initialCount = 1 ); - bool Create(); - - virtual int GetImageCount() const; - virtual bool GetSize( int index, int &width, int &height ) const; - virtual wxSize GetSize() const { return wxSize(m_width, m_height); } - - int Add( const wxBitmap& bitmap ); - int Add( const wxBitmap& bitmap, const wxBitmap& mask ); - int Add( const wxBitmap& bitmap, const wxColour& maskColour ); - wxBitmap GetBitmap(int index) const; - wxIcon GetIcon(int index) const; - bool Replace( int index, const wxBitmap &bitmap ); - bool Replace( int index, const wxBitmap &bitmap, const wxBitmap& mask ); - bool Remove( int index ); - bool RemoveAll(); - - virtual bool Draw(int index, wxDC& dc, int x, int y, - int flags = wxIMAGELIST_DRAW_NORMAL, - bool solidBackground = false); - - // Internal use only - const wxBitmap *GetBitmapPtr(int index) const; -private: - wxObjectList m_images; - - int m_width; - int m_height; - - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxGenericImageList); -}; - -#ifndef wxHAS_NATIVE_IMAGELIST - -/* - * wxImageList has to be a real class or we have problems with - * the run-time information. - */ - -class WXDLLIMPEXP_CORE wxImageList: public wxGenericImageList -{ - wxDECLARE_DYNAMIC_CLASS(wxImageList); - -public: - wxImageList() {} - - wxImageList( int width, int height, bool mask = true, int initialCount = 1 ) - : wxGenericImageList(width, height, mask, initialCount) - { - } -}; -#endif // !wxHAS_NATIVE_IMAGELIST - -#endif // _WX_IMAGLISTG_H_ diff --git a/Externals/wxWidgets3/include/wx/generic/infobar.h b/Externals/wxWidgets3/include/wx/generic/infobar.h deleted file mode 100644 index 2fb2312db2..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/infobar.h +++ /dev/null @@ -1,139 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/infobar.h -// Purpose: generic wxInfoBar class declaration -// Author: Vadim Zeitlin -// Created: 2009-07-28 -// Copyright: (c) 2009 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GENERIC_INFOBAR_H_ -#define _WX_GENERIC_INFOBAR_H_ - -class WXDLLIMPEXP_FWD_CORE wxBitmapButton; -class WXDLLIMPEXP_FWD_CORE wxStaticBitmap; -class WXDLLIMPEXP_FWD_CORE wxStaticText; - -// ---------------------------------------------------------------------------- -// wxInfoBar -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxInfoBarGeneric : public wxInfoBarBase -{ -public: - // the usual ctors and Create() but remember that info bar is created - // hidden - wxInfoBarGeneric() { Init(); } - - wxInfoBarGeneric(wxWindow *parent, wxWindowID winid = wxID_ANY) - { - Init(); - Create(parent, winid); - } - - bool Create(wxWindow *parent, wxWindowID winid = wxID_ANY); - - - // implement base class methods - // ---------------------------- - - virtual void ShowMessage(const wxString& msg, - int flags = wxICON_INFORMATION) wxOVERRIDE; - - virtual void Dismiss() wxOVERRIDE; - - virtual void AddButton(wxWindowID btnid, const wxString& label = wxString()) wxOVERRIDE; - - virtual void RemoveButton(wxWindowID btnid) wxOVERRIDE; - - virtual size_t GetButtonCount() const wxOVERRIDE; - virtual wxWindowID GetButtonId(size_t idx) const wxOVERRIDE; - virtual bool HasButtonId(wxWindowID btnid) const wxOVERRIDE; - - // methods specific to this version - // -------------------------------- - - // set the effect(s) to use when showing/hiding the bar, may be - // wxSHOW_EFFECT_NONE to disable any effects entirely - // - // by default, slide to bottom/top is used when it's positioned on the top - // of the window for showing/hiding it and top/bottom when it's positioned - // at the bottom - void SetShowHideEffects(wxShowEffect showEffect, wxShowEffect hideEffect) - { - m_showEffect = showEffect; - m_hideEffect = hideEffect; - } - - // get effect used when showing/hiding the window - wxShowEffect GetShowEffect() const; - wxShowEffect GetHideEffect() const; - - // set the duration of animation used when showing/hiding the bar, in ms - void SetEffectDuration(int duration) { m_effectDuration = duration; } - - // get the currently used effect animation duration - int GetEffectDuration() const { return m_effectDuration; } - - - // overridden base class methods - // ----------------------------- - - // setting the font of this window sets it for the text control inside it - // (default font is a larger and bold version of the normal one) - virtual bool SetFont(const wxFont& font) wxOVERRIDE; - - // same thing with the colour: this affects the text colour - virtual bool SetForegroundColour(const wxColor& colour) wxOVERRIDE; - -protected: - // info bar shouldn't have any border by default, the colour difference - // between it and the main window separates it well enough - virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } - - - // update the parent to take our new or changed size into account (notably - // should be called when we're shown or hidden) - void UpdateParent(); - -private: - // common part of all ctors - void Init(); - - // handler for the close button - void OnButton(wxCommandEvent& event); - - // show/hide the bar - void DoShow(); - void DoHide(); - - // determine the placement of the bar from its position in the containing - // sizer - enum BarPlacement - { - BarPlacement_Top, - BarPlacement_Bottom, - BarPlacement_Unknown - }; - - BarPlacement GetBarPlacement() const; - - - // different controls making up the bar - wxStaticBitmap *m_icon; - wxStaticText *m_text; - wxBitmapButton *m_button; - - // the effects to use when showing/hiding and duration for them: by default - // the effect is determined by the info bar automatically depending on its - // position and the default duration is used - wxShowEffect m_showEffect, - m_hideEffect; - int m_effectDuration; - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_NO_COPY_CLASS(wxInfoBarGeneric); -}; - -#endif // _WX_GENERIC_INFOBAR_H_ - diff --git a/Externals/wxWidgets3/include/wx/generic/laywin.h b/Externals/wxWidgets3/include/wx/generic/laywin.h deleted file mode 100644 index 1e56b5e12c..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/laywin.h +++ /dev/null @@ -1,227 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/laywin.h -// Purpose: Implements a simple layout algorithm, plus -// wxSashLayoutWindow which is an example of a window with -// layout-awareness (via event handlers). This is suited to -// IDE-style window layout. -// Author: Julian Smart -// Modified by: -// Created: 04/01/98 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_LAYWIN_H_G_ -#define _WX_LAYWIN_H_G_ - -#if wxUSE_SASH - #include "wx/sashwin.h" -#endif // wxUSE_SASH - -#include "wx/event.h" - -class WXDLLIMPEXP_FWD_ADV wxQueryLayoutInfoEvent; -class WXDLLIMPEXP_FWD_ADV wxCalculateLayoutEvent; - -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_QUERY_LAYOUT_INFO, wxQueryLayoutInfoEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_CALCULATE_LAYOUT, wxCalculateLayoutEvent ); - -enum wxLayoutOrientation -{ - wxLAYOUT_HORIZONTAL, - wxLAYOUT_VERTICAL -}; - -enum wxLayoutAlignment -{ - wxLAYOUT_NONE, - wxLAYOUT_TOP, - wxLAYOUT_LEFT, - wxLAYOUT_RIGHT, - wxLAYOUT_BOTTOM -}; - -// Not sure this is necessary -// Tell window which dimension we're sizing on -#define wxLAYOUT_LENGTH_Y 0x0008 -#define wxLAYOUT_LENGTH_X 0x0000 - -// Use most recently used length -#define wxLAYOUT_MRU_LENGTH 0x0010 - -// Only a query, so don't actually move it. -#define wxLAYOUT_QUERY 0x0100 - -/* - * This event is used to get information about window alignment, - * orientation and size. - */ - -class WXDLLIMPEXP_ADV wxQueryLayoutInfoEvent: public wxEvent -{ -public: - wxQueryLayoutInfoEvent(wxWindowID id = 0) - { - SetEventType(wxEVT_QUERY_LAYOUT_INFO); - m_requestedLength = 0; - m_flags = 0; - m_id = id; - m_alignment = wxLAYOUT_TOP; - m_orientation = wxLAYOUT_HORIZONTAL; - } - - // Read by the app - void SetRequestedLength(int length) { m_requestedLength = length; } - int GetRequestedLength() const { return m_requestedLength; } - - void SetFlags(int flags) { m_flags = flags; } - int GetFlags() const { return m_flags; } - - // Set by the app - void SetSize(const wxSize& size) { m_size = size; } - wxSize GetSize() const { return m_size; } - - void SetOrientation(wxLayoutOrientation orient) { m_orientation = orient; } - wxLayoutOrientation GetOrientation() const { return m_orientation; } - - void SetAlignment(wxLayoutAlignment align) { m_alignment = align; } - wxLayoutAlignment GetAlignment() const { return m_alignment; } - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxQueryLayoutInfoEvent(*this); } - -protected: - int m_flags; - int m_requestedLength; - wxSize m_size; - wxLayoutOrientation m_orientation; - wxLayoutAlignment m_alignment; - -private: - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxQueryLayoutInfoEvent); -}; - -typedef void (wxEvtHandler::*wxQueryLayoutInfoEventFunction)(wxQueryLayoutInfoEvent&); - -#define wxQueryLayoutInfoEventHandler( func ) \ - wxEVENT_HANDLER_CAST( wxQueryLayoutInfoEventFunction, func ) - -#define EVT_QUERY_LAYOUT_INFO(func) \ - wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_QUERY_LAYOUT_INFO, wxID_ANY, wxID_ANY, wxQueryLayoutInfoEventHandler( func ), NULL ), - -/* - * This event is used to take a bite out of the available client area. - */ - -class WXDLLIMPEXP_ADV wxCalculateLayoutEvent: public wxEvent -{ -public: - wxCalculateLayoutEvent(wxWindowID id = 0) - { - SetEventType(wxEVT_CALCULATE_LAYOUT); - m_flags = 0; - m_id = id; - } - - // Read by the app - void SetFlags(int flags) { m_flags = flags; } - int GetFlags() const { return m_flags; } - - // Set by the app - void SetRect(const wxRect& rect) { m_rect = rect; } - wxRect GetRect() const { return m_rect; } - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxCalculateLayoutEvent(*this); } - -protected: - int m_flags; - wxRect m_rect; - -private: - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxCalculateLayoutEvent); -}; - -typedef void (wxEvtHandler::*wxCalculateLayoutEventFunction)(wxCalculateLayoutEvent&); - -#define wxCalculateLayoutEventHandler( func ) wxEVENT_HANDLER_CAST(wxCalculateLayoutEventFunction, func) - -#define EVT_CALCULATE_LAYOUT(func) \ - wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_CALCULATE_LAYOUT, wxID_ANY, wxID_ANY, wxCalculateLayoutEventHandler( func ), NULL ), - -#if wxUSE_SASH - -// This is window that can remember alignment/orientation, does its own layout, -// and can provide sashes too. Useful for implementing docked windows with sashes in -// an IDE-style interface. -class WXDLLIMPEXP_ADV wxSashLayoutWindow: public wxSashWindow -{ -public: - wxSashLayoutWindow() - { - Init(); - } - - wxSashLayoutWindow(wxWindow *parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = wxSW_3D|wxCLIP_CHILDREN, const wxString& name = wxT("layoutWindow")) - { - Create(parent, id, pos, size, style, name); - } - - bool Create(wxWindow *parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = wxSW_3D|wxCLIP_CHILDREN, const wxString& name = wxT("layoutWindow")); - -// Accessors - inline wxLayoutAlignment GetAlignment() const { return m_alignment; } - inline wxLayoutOrientation GetOrientation() const { return m_orientation; } - - inline void SetAlignment(wxLayoutAlignment align) { m_alignment = align; } - inline void SetOrientation(wxLayoutOrientation orient) { m_orientation = orient; } - - // Give the window default dimensions - inline void SetDefaultSize(const wxSize& size) { m_defaultSize = size; } - -// Event handlers - // Called by layout algorithm to allow window to take a bit out of the - // client rectangle, and size itself if not in wxLAYOUT_QUERY mode. - void OnCalculateLayout(wxCalculateLayoutEvent& event); - - // Called by layout algorithm to retrieve information about the window. - void OnQueryLayoutInfo(wxQueryLayoutInfoEvent& event); - -private: - void Init(); - - wxLayoutAlignment m_alignment; - wxLayoutOrientation m_orientation; - wxSize m_defaultSize; - -private: - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxSashLayoutWindow); - wxDECLARE_EVENT_TABLE(); -}; - -#endif // wxUSE_SASH - -class WXDLLIMPEXP_FWD_CORE wxMDIParentFrame; -class WXDLLIMPEXP_FWD_CORE wxFrame; - -// This class implements the layout algorithm -class WXDLLIMPEXP_ADV wxLayoutAlgorithm: public wxObject -{ -public: - wxLayoutAlgorithm() {} - -#if wxUSE_MDI_ARCHITECTURE - // The MDI client window is sized to whatever's left over. - bool LayoutMDIFrame(wxMDIParentFrame* frame, wxRect* rect = NULL); -#endif // wxUSE_MDI_ARCHITECTURE - - // mainWindow is sized to whatever's left over. This function for backward - // compatibility; use LayoutWindow. - bool LayoutFrame(wxFrame* frame, wxWindow* mainWindow = NULL); - - // mainWindow is sized to whatever's left over. - bool LayoutWindow(wxWindow* frame, wxWindow* mainWindow = NULL); -}; - -#endif - // _WX_LAYWIN_H_G_ diff --git a/Externals/wxWidgets3/include/wx/generic/listctrl.h b/Externals/wxWidgets3/include/wx/generic/listctrl.h deleted file mode 100644 index d706cb813e..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/listctrl.h +++ /dev/null @@ -1,280 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/listctrl.h -// Purpose: Generic list control -// Author: Robert Roebling -// Created: 01/02/97 -// Copyright: (c) 1998 Robert Roebling and Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GENERIC_LISTCTRL_H_ -#define _WX_GENERIC_LISTCTRL_H_ - -#include "wx/containr.h" -#include "wx/scrolwin.h" -#include "wx/textctrl.h" - -#if wxUSE_DRAG_AND_DROP -class WXDLLIMPEXP_FWD_CORE wxDropTarget; -#endif - -//----------------------------------------------------------------------------- -// internal classes -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxListHeaderWindow; -class WXDLLIMPEXP_FWD_CORE wxListMainWindow; - -//----------------------------------------------------------------------------- -// wxListCtrl -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxGenericListCtrl: public wxNavigationEnabled, - public wxScrollHelper -{ -public: - - wxGenericListCtrl() : wxScrollHelper(this) - { - Init(); - } - - wxGenericListCtrl( wxWindow *parent, - wxWindowID winid = wxID_ANY, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - long style = wxLC_ICON, - const wxValidator& validator = wxDefaultValidator, - const wxString &name = wxListCtrlNameStr) - : wxScrollHelper(this) - { - Create(parent, winid, pos, size, style, validator, name); - } - - virtual ~wxGenericListCtrl(); - - void Init(); - - bool Create( wxWindow *parent, - wxWindowID winid = wxID_ANY, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - long style = wxLC_ICON, - const wxValidator& validator = wxDefaultValidator, - const wxString &name = wxListCtrlNameStr); - - bool GetColumn( int col, wxListItem& item ) const wxOVERRIDE; - bool SetColumn( int col, const wxListItem& item ) wxOVERRIDE; - int GetColumnWidth( int col ) const wxOVERRIDE; - bool SetColumnWidth( int col, int width) wxOVERRIDE; - int GetCountPerPage() const; // not the same in wxGLC as in Windows, I think - wxRect GetViewRect() const; - - bool GetItem( wxListItem& info ) const; - bool SetItem( wxListItem& info ) ; - long SetItem( long index, int col, const wxString& label, int imageId = -1 ); - int GetItemState( long item, long stateMask ) const; - bool SetItemState( long item, long state, long stateMask); - bool SetItemImage( long item, int image, int selImage = -1 ); - bool SetItemColumnImage( long item, long column, int image ); - wxString GetItemText( long item, int col = 0 ) const; - void SetItemText( long item, const wxString& str ); - wxUIntPtr GetItemData( long item ) const; - bool SetItemPtrData(long item, wxUIntPtr data); - bool SetItemData(long item, long data) { return SetItemPtrData(item, data); } - bool GetItemRect( long item, wxRect& rect, int code = wxLIST_RECT_BOUNDS ) const; - bool GetSubItemRect( long item, long subItem, wxRect& rect, int code = wxLIST_RECT_BOUNDS ) const; - bool GetItemPosition( long item, wxPoint& pos ) const; - bool SetItemPosition( long item, const wxPoint& pos ); // not supported in wxGLC - int GetItemCount() const; - int GetColumnCount() const wxOVERRIDE; - void SetItemSpacing( int spacing, bool isSmall = false ); - wxSize GetItemSpacing() const; - void SetItemTextColour( long item, const wxColour& col); - wxColour GetItemTextColour( long item ) const; - void SetItemBackgroundColour( long item, const wxColour &col); - wxColour GetItemBackgroundColour( long item ) const; - void SetItemFont( long item, const wxFont &f); - wxFont GetItemFont( long item ) const; - int GetSelectedItemCount() const; - wxColour GetTextColour() const; - void SetTextColour(const wxColour& col); - long GetTopItem() const; - - virtual bool HasCheckboxes() const wxOVERRIDE; - virtual bool EnableCheckboxes(bool enable = true) wxOVERRIDE; - virtual bool IsItemChecked(long item) const wxOVERRIDE; - virtual void CheckItem(long item, bool check) wxOVERRIDE; - - void SetSingleStyle( long style, bool add = true ) ; - void SetWindowStyleFlag( long style ) wxOVERRIDE; - void RecreateWindow() {} - long GetNextItem( long item, int geometry = wxLIST_NEXT_ALL, int state = wxLIST_STATE_DONTCARE ) const; - wxImageList *GetImageList( int which ) const wxOVERRIDE; - void SetImageList( wxImageList *imageList, int which ) wxOVERRIDE; - void AssignImageList( wxImageList *imageList, int which ) wxOVERRIDE; - bool Arrange( int flag = wxLIST_ALIGN_DEFAULT ); // always wxLIST_ALIGN_LEFT in wxGLC - - void ClearAll(); - bool DeleteItem( long item ); - bool DeleteAllItems(); - bool DeleteAllColumns() wxOVERRIDE; - bool DeleteColumn( int col ) wxOVERRIDE; - - void SetItemCount(long count); - - wxTextCtrl *EditLabel(long item, - wxClassInfo* textControlClass = wxCLASSINFO(wxTextCtrl)); - - // End label editing, optionally cancelling the edit - bool EndEditLabel(bool cancel); - - wxTextCtrl* GetEditControl() const; - void Edit( long item ) { EditLabel(item); } - - bool EnsureVisible( long item ); - long FindItem( long start, const wxString& str, bool partial = false ); - long FindItem( long start, wxUIntPtr data ); - long FindItem( long start, const wxPoint& pt, int direction ); // not supported in wxGLC - long HitTest( const wxPoint& point, int& flags, long *pSubItem = NULL ) const; - long InsertItem(wxListItem& info); - long InsertItem( long index, const wxString& label ); - long InsertItem( long index, int imageIndex ); - long InsertItem( long index, const wxString& label, int imageIndex ); - bool ScrollList( int dx, int dy ); - bool SortItems( wxListCtrlCompare fn, wxIntPtr data ); - - // do we have a header window? - bool HasHeader() const - { return InReportView() && !HasFlag(wxLC_NO_HEADER); } - - // refresh items selectively (only useful for virtual list controls) - void RefreshItem(long item); - void RefreshItems(long itemFrom, long itemTo); - - virtual void EnableBellOnNoMatch(bool on = true) wxOVERRIDE; - - // overridden base class virtuals - // ------------------------------ - - virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE - { - return GetClassDefaultAttributes(GetWindowVariant()); - } - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - virtual void Update() wxOVERRIDE; - - - // implementation only from now on - // ------------------------------- - - // generic version extension, don't use in portable code - bool Update( long item ); - - void OnInternalIdle( ) wxOVERRIDE; - - // We have to hand down a few functions - virtual void Refresh(bool eraseBackground = true, - const wxRect *rect = NULL) wxOVERRIDE; - - virtual bool SetBackgroundColour( const wxColour &colour ) wxOVERRIDE; - virtual bool SetForegroundColour( const wxColour &colour ) wxOVERRIDE; - virtual wxColour GetBackgroundColour() const; - virtual wxColour GetForegroundColour() const; - virtual bool SetFont( const wxFont &font ) wxOVERRIDE; - virtual bool SetCursor( const wxCursor &cursor ) wxOVERRIDE; - -#if wxUSE_DRAG_AND_DROP - virtual void SetDropTarget( wxDropTarget *dropTarget ) wxOVERRIDE; - virtual wxDropTarget *GetDropTarget() const wxOVERRIDE; -#endif - - virtual bool ShouldInheritColours() const wxOVERRIDE { return false; } - - // implementation - // -------------- - - wxImageList *m_imageListNormal; - wxImageList *m_imageListSmall; - wxImageList *m_imageListState; // what's that ? - bool m_ownsImageListNormal, - m_ownsImageListSmall, - m_ownsImageListState; - wxListHeaderWindow *m_headerWin; - wxListMainWindow *m_mainWin; - -protected: - // Implement base class pure virtual methods. - long DoInsertColumn(long col, const wxListItem& info) wxOVERRIDE; - - - virtual bool DoPopupMenu( wxMenu *menu, int x, int y ) wxOVERRIDE; - - virtual wxSize DoGetBestClientSize() const wxOVERRIDE; - - // return the text for the given column of the given item - virtual wxString OnGetItemText(long item, long column) const; - - // return the icon for the given item. In report view, OnGetItemImage will - // only be called for the first column. See OnGetItemColumnImage for - // details. - virtual int OnGetItemImage(long item) const; - - // return the icon for the given item and column. - virtual int OnGetItemColumnImage(long item, long column) const; - - // it calls our OnGetXXX() functions - friend class WXDLLIMPEXP_FWD_CORE wxListMainWindow; - - virtual wxBorder GetDefaultBorder() const wxOVERRIDE; - - virtual wxSize GetSizeAvailableForScrollTarget(const wxSize& size) wxOVERRIDE; - -private: - void CreateOrDestroyHeaderWindowAsNeeded(); - void OnScroll( wxScrollWinEvent& event ); - void OnSize( wxSizeEvent &event ); - - // we need to return a special WM_GETDLGCODE value to process just the - // arrows but let the other navigation characters through -#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) - virtual WXLRESULT - MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); -#endif // __WXMSW__ - - WX_FORWARD_TO_SCROLL_HELPER() - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_DYNAMIC_CLASS(wxGenericListCtrl); -}; - -#if (!defined(__WXMSW__) || defined(__WXUNIVERSAL__)) && (!(defined(__WXMAC__) && wxOSX_USE_CARBON) || defined(__WXUNIVERSAL__ )) -/* - * wxListCtrl has to be a real class or we have problems with - * the run-time information. - */ - -class WXDLLIMPEXP_CORE wxListCtrl: public wxGenericListCtrl -{ - wxDECLARE_DYNAMIC_CLASS(wxListCtrl); - -public: - wxListCtrl() {} - - wxListCtrl(wxWindow *parent, wxWindowID winid = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxLC_ICON, - const wxValidator &validator = wxDefaultValidator, - const wxString &name = wxListCtrlNameStr) - : wxGenericListCtrl(parent, winid, pos, size, style, validator, name) - { - } - -}; -#endif // !__WXMSW__ || __WXUNIVERSAL__ - -#endif // _WX_GENERIC_LISTCTRL_H_ diff --git a/Externals/wxWidgets3/include/wx/generic/logg.h b/Externals/wxWidgets3/include/wx/generic/logg.h deleted file mode 100644 index f45731d358..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/logg.h +++ /dev/null @@ -1,152 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/logg.h -// Purpose: Assorted wxLogXXX functions, and wxLog (sink for logs) -// Author: Vadim Zeitlin -// Modified by: -// Created: 29/01/98 -// Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_LOGG_H_ -#define _WX_LOGG_H_ - -#if wxUSE_GUI - -class WXDLLIMPEXP_FWD_CORE wxTextCtrl; -class WXDLLIMPEXP_FWD_CORE wxLogFrame; -class WXDLLIMPEXP_FWD_CORE wxWindow; - -// ---------------------------------------------------------------------------- -// the following log targets are only compiled in if the we're compiling the -// GUI part (andnot just the base one) of the library, they're implemented in -// src/generic/logg.cpp *and not src/common/log.cpp unlike all the rest) -// ---------------------------------------------------------------------------- - -#if wxUSE_TEXTCTRL - -// log everything to a text window (GUI only of course) -class WXDLLIMPEXP_CORE wxLogTextCtrl : public wxLog -{ -public: - wxLogTextCtrl(wxTextCtrl *pTextCtrl); - -protected: - // implement sink function - virtual void DoLogText(const wxString& msg) wxOVERRIDE; - -private: - // the control we use - wxTextCtrl *m_pTextCtrl; - - wxDECLARE_NO_COPY_CLASS(wxLogTextCtrl); -}; - -#endif // wxUSE_TEXTCTRL - -// ---------------------------------------------------------------------------- -// GUI log target, the default one for wxWidgets programs -// ---------------------------------------------------------------------------- - -#if wxUSE_LOGGUI - -class WXDLLIMPEXP_CORE wxLogGui : public wxLog -{ -public: - // ctor - wxLogGui(); - - // show all messages that were logged since the last Flush() - virtual void Flush() wxOVERRIDE; - -protected: - virtual void DoLogRecord(wxLogLevel level, - const wxString& msg, - const wxLogRecordInfo& info) wxOVERRIDE; - - // return the title to be used for the log dialog, depending on m_bErrors - // and m_bWarnings values - wxString GetTitle() const; - - // return the icon (one of wxICON_XXX constants) to be used for the dialog - // depending on m_bErrors/m_bWarnings - int GetSeverityIcon() const; - - // empty everything - void Clear(); - - - wxArrayString m_aMessages; // the log message texts - wxArrayInt m_aSeverity; // one of wxLOG_XXX values - wxArrayLong m_aTimes; // the time of each message - bool m_bErrors, // do we have any errors? - m_bWarnings, // any warnings? - m_bHasMessages; // any messages at all? - -private: - // this method is called to show a single log message, it uses - // wxMessageBox() by default - virtual void DoShowSingleLogMessage(const wxString& message, - const wxString& title, - int style); - - // this method is called to show multiple log messages, it uses wxLogDialog - virtual void DoShowMultipleLogMessages(const wxArrayString& messages, - const wxArrayInt& severities, - const wxArrayLong& times, - const wxString& title, - int style); -}; - -#endif // wxUSE_LOGGUI - -// ---------------------------------------------------------------------------- -// (background) log window: this class forwards all log messages to the log -// target which was active when it was instantiated, but also collects them -// to the log window. This window has its own menu which allows the user to -// close it, clear the log contents or save it to the file. -// ---------------------------------------------------------------------------- - -#if wxUSE_LOGWINDOW - -class WXDLLIMPEXP_CORE wxLogWindow : public wxLogPassThrough -{ -public: - wxLogWindow(wxWindow *pParent, // the parent frame (can be NULL) - const wxString& szTitle, // the title of the frame - bool bShow = true, // show window immediately? - bool bPassToOld = true); // pass messages to the old target? - - virtual ~wxLogWindow(); - - // window operations - // show/hide the log window - void Show(bool bShow = true); - // retrieve the pointer to the frame - wxFrame *GetFrame() const; - - // overridables - // called if the user closes the window interactively, will not be - // called if it is destroyed for another reason (such as when program - // exits) - return true from here to allow the frame to close, false - // to prevent this from happening - virtual bool OnFrameClose(wxFrame *frame); - // called right before the log frame is going to be deleted: will - // always be called unlike OnFrameClose() - virtual void OnFrameDelete(wxFrame *frame); - -protected: - virtual void DoLogTextAtLevel(wxLogLevel level, const wxString& msg) wxOVERRIDE; - -private: - wxLogFrame *m_pLogFrame; // the log frame - - wxDECLARE_NO_COPY_CLASS(wxLogWindow); -}; - -#endif // wxUSE_LOGWINDOW - -#endif // wxUSE_GUI - -#endif // _WX_LOGG_H_ - diff --git a/Externals/wxWidgets3/include/wx/generic/mask.h b/Externals/wxWidgets3/include/wx/generic/mask.h deleted file mode 100644 index 454ba11cda..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/mask.h +++ /dev/null @@ -1,53 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/mask.h -// Purpose: generic implementation of wxMask -// Author: Vadim Zeitlin -// Created: 2006-09-28 -// Copyright: (c) 2006 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GENERIC_MASKG_H_ -#define _WX_GENERIC_MASKG_H_ - -// ---------------------------------------------------------------------------- -// generic wxMask implementation -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxMask : public wxMaskBase -{ -public: - wxMask() { } - wxMask(const wxBitmap& bitmap, const wxColour& colour) - { - InitFromColour(bitmap, colour); - } - -#if wxUSE_PALETTE - wxMask(const wxBitmap& bitmap, int paletteIndex) - { - Create(bitmap, paletteIndex); - } -#endif // wxUSE_PALETTE - - wxMask(const wxBitmap& bitmap) - { - InitFromMonoBitmap(bitmap); - } - - // implementation-only from now on - wxBitmap GetBitmap() const { return m_bitmap; } - -private: - // implement wxMaskBase pure virtuals - virtual void FreeData(); - virtual bool InitFromColour(const wxBitmap& bitmap, const wxColour& colour); - virtual bool InitFromMonoBitmap(const wxBitmap& bitmap); - - wxBitmap m_bitmap; - - wxDECLARE_DYNAMIC_CLASS(wxMask); -}; - -#endif // _WX_GENERIC_MASKG_H_ - diff --git a/Externals/wxWidgets3/include/wx/generic/mdig.h b/Externals/wxWidgets3/include/wx/generic/mdig.h deleted file mode 100644 index d3469069c3..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/mdig.h +++ /dev/null @@ -1,260 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/mdig.h -// Purpose: Generic MDI (Multiple Document Interface) classes -// Author: Hans Van Leemputten -// Modified by: 2008-10-31 Vadim Zeitlin: derive from the base classes -// Created: 29/07/2002 -// Copyright: (c) 2002 Hans Van Leemputten -// (c) 2008 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GENERIC_MDIG_H_ -#define _WX_GENERIC_MDIG_H_ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/panel.h" - -class WXDLLIMPEXP_FWD_CORE wxBookCtrlBase; -class WXDLLIMPEXP_FWD_CORE wxBookCtrlEvent; -class WXDLLIMPEXP_FWD_CORE wxIcon; -class WXDLLIMPEXP_FWD_CORE wxIconBundle; -class WXDLLIMPEXP_FWD_CORE wxNotebook; - -#if wxUSE_GENERIC_MDI_AS_NATIVE - #define wxGenericMDIParentFrame wxMDIParentFrame - #define wxGenericMDIChildFrame wxMDIChildFrame - #define wxGenericMDIClientWindow wxMDIClientWindow -#else // !wxUSE_GENERIC_MDI_AS_NATIVE - class WXDLLIMPEXP_FWD_CORE wxGenericMDIParentFrame; - class WXDLLIMPEXP_FWD_CORE wxGenericMDIChildFrame; - class WXDLLIMPEXP_FWD_CORE wxGenericMDIClientWindow; -#endif // wxUSE_GENERIC_MDI_AS_NATIVE/!wxUSE_GENERIC_MDI_AS_NATIVE - -// ---------------------------------------------------------------------------- -// wxGenericMDIParentFrame -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxGenericMDIParentFrame : public wxMDIParentFrameBase -{ -public: - wxGenericMDIParentFrame() { Init(); } - wxGenericMDIParentFrame(wxWindow *parent, - wxWindowID winid, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL, - const wxString& name = wxFrameNameStr) - { - Init(); - - Create(parent, winid, title, pos, size, style, name); - } - - bool Create(wxWindow *parent, - wxWindowID winid, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL, - const wxString& name = wxFrameNameStr); - - virtual ~wxGenericMDIParentFrame(); - - // implement base class pure virtuals - static bool IsTDI() { return true; } - - virtual void ActivateNext() { AdvanceActive(true); } - virtual void ActivatePrevious() { AdvanceActive(false); } - -#if wxUSE_MENUS - virtual void SetWindowMenu(wxMenu* pMenu); - - virtual void SetMenuBar(wxMenuBar *pMenuBar); -#endif // wxUSE_MENUS - - virtual wxGenericMDIClientWindow *OnCreateGenericClient(); - - - // implementation only from now on - void WXSetChildMenuBar(wxGenericMDIChildFrame *child); - void WXUpdateChildTitle(wxGenericMDIChildFrame *child); - void WXActivateChild(wxGenericMDIChildFrame *child); - void WXRemoveChild(wxGenericMDIChildFrame *child); - bool WXIsActiveChild(wxGenericMDIChildFrame *child) const; - bool WXIsInsideChildHandler(wxGenericMDIChildFrame *child) const; - - // return the book control used by the client window to manage the pages - wxBookCtrlBase *GetBookCtrl() const; - -protected: -#if wxUSE_MENUS - wxMenuBar *m_pMyMenuBar; -#endif // wxUSE_MENUS - - // advance the activation forward or backwards - void AdvanceActive(bool forward); - -private: - void Init(); - -#if wxUSE_MENUS - void RemoveWindowMenu(wxMenuBar *pMenuBar); - void AddWindowMenu(wxMenuBar *pMenuBar); - - void OnWindowMenu(wxCommandEvent& event); -#endif // wxUSE_MENUS - - virtual bool ProcessEvent(wxEvent& event); - - void OnClose(wxCloseEvent& event); - - // return the client window, may be NULL if we hadn't been created yet - wxGenericMDIClientWindow *GetGenericClientWindow() const; - - // close all children, return false if any of them vetoed it - bool CloseAll(); - - - // this pointer is non-NULL if we're currently inside our ProcessEvent() - // and we forwarded the event to this child (as we do with menu events) - wxMDIChildFrameBase *m_childHandler; - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_DYNAMIC_CLASS(wxGenericMDIParentFrame); -}; - -// ---------------------------------------------------------------------------- -// wxGenericMDIChildFrame -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxGenericMDIChildFrame : public wxTDIChildFrame -{ -public: - wxGenericMDIChildFrame() { Init(); } - wxGenericMDIChildFrame(wxGenericMDIParentFrame *parent, - wxWindowID winid, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr) - { - Init(); - - Create(parent, winid, title, pos, size, style, name); - } - - bool Create(wxGenericMDIParentFrame *parent, - wxWindowID winid, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr); - - virtual ~wxGenericMDIChildFrame(); - - // implement MDI operations - virtual void Activate(); - - -#if wxUSE_MENUS - virtual void SetMenuBar( wxMenuBar *menu_bar ); - virtual wxMenuBar *GetMenuBar() const; -#endif // wxUSE_MENUS - - virtual wxString GetTitle() const { return m_title; } - virtual void SetTitle(const wxString& title); - - virtual bool TryAfter(wxEvent& event); - - // implementation only from now on - - wxGenericMDIParentFrame* GetGenericMDIParent() const - { -#if wxUSE_GENERIC_MDI_AS_NATIVE - return GetMDIParent(); -#else // generic != native - return m_mdiParentGeneric; -#endif - } - -protected: - wxString m_title; - -#if wxUSE_MENUS - wxMenuBar *m_pMenuBar; -#endif // wxUSE_MENUS - -#if !wxUSE_GENERIC_MDI_AS_NATIVE - wxGenericMDIParentFrame *m_mdiParentGeneric; -#endif - -protected: - void Init(); - -private: - void OnMenuHighlight(wxMenuEvent& event); - void OnClose(wxCloseEvent& event); - - wxDECLARE_DYNAMIC_CLASS(wxGenericMDIChildFrame); - wxDECLARE_EVENT_TABLE(); - - friend class wxGenericMDIClientWindow; -}; - -// ---------------------------------------------------------------------------- -// wxGenericMDIClientWindow -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxGenericMDIClientWindow : public wxMDIClientWindowBase -{ -public: - wxGenericMDIClientWindow() { } - - // unfortunately we need to provide our own version of CreateClient() - // because of the difference in the type of the first parameter and - // implement the base class pure virtual method in terms of it - // (CreateGenericClient() is virtual itself to allow customizing the client - // window creation by overriding it in the derived classes) - virtual bool CreateGenericClient(wxWindow *parent); - virtual bool CreateClient(wxMDIParentFrame *parent, - long WXUNUSED(style) = wxVSCROLL | wxHSCROLL) - { - return CreateGenericClient(parent); - } - - // implementation only - wxBookCtrlBase *GetBookCtrl() const; - wxGenericMDIChildFrame *GetChild(size_t pos) const; - int FindChild(wxGenericMDIChildFrame *child) const; - -private: - void PageChanged(int OldSelection, int newSelection); - - void OnPageChanged(wxBookCtrlEvent& event); - void OnSize(wxSizeEvent& event); - - // the notebook containing all MDI children as its pages - wxNotebook *m_notebook; - - wxDECLARE_DYNAMIC_CLASS(wxGenericMDIClientWindow); -}; - -// ---------------------------------------------------------------------------- -// inline functions implementation -// ---------------------------------------------------------------------------- - -inline bool -wxGenericMDIParentFrame:: -WXIsInsideChildHandler(wxGenericMDIChildFrame *child) const -{ - return child == m_childHandler; -} - -#endif // _WX_GENERIC_MDIG_H_ diff --git a/Externals/wxWidgets3/include/wx/generic/msgdlgg.h b/Externals/wxWidgets3/include/wx/generic/msgdlgg.h deleted file mode 100644 index a5c3c115bd..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/msgdlgg.h +++ /dev/null @@ -1,55 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/msgdlgg.h -// Purpose: Generic wxMessageDialog -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GENERIC_MSGDLGG_H_ -#define _WX_GENERIC_MSGDLGG_H_ - -class WXDLLIMPEXP_FWD_CORE wxSizer; - -class WXDLLIMPEXP_CORE wxGenericMessageDialog : public wxMessageDialogBase -{ -public: - wxGenericMessageDialog(wxWindow *parent, - const wxString& message, - const wxString& caption = wxMessageBoxCaptionStr, - long style = wxOK|wxCENTRE, - const wxPoint& pos = wxDefaultPosition); - - virtual int ShowModal() wxOVERRIDE; - -protected: - // Creates a message dialog taking any options that have been set after - // object creation into account such as custom labels. - void DoCreateMsgdialog(); - - void OnYes(wxCommandEvent& event); - void OnNo(wxCommandEvent& event); - void OnHelp(wxCommandEvent& event); - void OnCancel(wxCommandEvent& event); - - // can be overridden to provide more contents to the dialog - virtual void AddMessageDialogCheckBox(wxSizer *WXUNUSED(sizer)) { } - virtual void AddMessageDialogDetails(wxSizer *WXUNUSED(sizer)) { } - -private: - // Creates and returns a standard button sizer using the style of this - // dialog and the custom labels, if any. - // - // May return NULL on smart phone platforms not using buttons at all. - wxSizer *CreateMsgDlgButtonSizer(); - - wxPoint m_pos; - bool m_created; - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_DYNAMIC_CLASS(wxGenericMessageDialog); -}; - -#endif // _WX_GENERIC_MSGDLGG_H_ diff --git a/Externals/wxWidgets3/include/wx/generic/notebook.h b/Externals/wxWidgets3/include/wx/generic/notebook.h deleted file mode 100644 index 807baebe2e..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/notebook.h +++ /dev/null @@ -1,155 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/notebook.h -// Purpose: wxNotebook class (a.k.a. property sheet, tabbed dialog) -// Author: Julian Smart -// Modified by: -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_NOTEBOOK_H_ -#define _WX_NOTEBOOK_H_ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- -#include "wx/event.h" -#include "wx/control.h" - -// ---------------------------------------------------------------------------- -// types -// ---------------------------------------------------------------------------- - -// fwd declarations -class WXDLLIMPEXP_FWD_CORE wxImageList; -class WXDLLIMPEXP_FWD_CORE wxWindow; -class WXDLLIMPEXP_FWD_CORE wxTabView; - -// ---------------------------------------------------------------------------- -// wxNotebook -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxNotebook : public wxNotebookBase -{ -public: - // ctors - // ----- - // default for dynamic class - wxNotebook(); - // the same arguments as for wxControl (@@@ any special styles?) - wxNotebook(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxNotebookNameStr); - // Create() function - bool Create(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxNotebookNameStr); - // dtor - virtual ~wxNotebook(); - - // accessors - // --------- - // Find the position of the wxNotebookPage, wxNOT_FOUND if not found. - int FindPagePosition(wxNotebookPage* page) const; - - // set the currently selected page, return the index of the previously - // selected one (or wxNOT_FOUND on error) - // NB: this function will _not_ generate wxEVT_NOTEBOOK_PAGE_xxx events - int SetSelection(size_t nPage); - // cycle thru the tabs - // void AdvanceSelection(bool bForward = true); - - // changes selected page without sending events - int ChangeSelection(size_t nPage); - - // set/get the title of a page - bool SetPageText(size_t nPage, const wxString& strText); - wxString GetPageText(size_t nPage) const; - - // get the number of rows for a control with wxNB_MULTILINE style (not all - // versions support it - they will always return 1 then) - virtual int GetRowCount() const ; - - // sets/returns item's image index in the current image list - int GetPageImage(size_t nPage) const; - bool SetPageImage(size_t nPage, int nImage); - - // control the appearance of the notebook pages - // set the size (the same for all pages) - void SetPageSize(const wxSize& size); - // set the padding between tabs (in pixels) - void SetPadding(const wxSize& padding); - - // Sets the size of the tabs (assumes all tabs are the same size) - void SetTabSize(const wxSize& sz); - - // operations - // ---------- - // remove one page from the notebook, and delete the page. - bool DeletePage(size_t nPage); - bool DeletePage(wxNotebookPage* page); - // remove one page from the notebook, without deleting the page. - bool RemovePage(size_t nPage); - bool RemovePage(wxNotebookPage* page); - virtual wxWindow* DoRemovePage(size_t nPage); - - // remove all pages - bool DeleteAllPages(); - // the same as AddPage(), but adds it at the specified position - bool InsertPage(size_t nPage, - wxNotebookPage *pPage, - const wxString& strText, - bool bSelect = false, - int imageId = NO_IMAGE); - - // callbacks - // --------- - void OnSize(wxSizeEvent& event); - void OnInternalIdle(); - void OnSelChange(wxBookCtrlEvent& event); - void OnSetFocus(wxFocusEvent& event); - void OnNavigationKey(wxNavigationKeyEvent& event); - - // base class virtuals - // ------------------- - virtual void Command(wxCommandEvent& event); - virtual void SetConstraintSizes(bool recurse = true); - virtual bool DoPhase(int nPhase); - - virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const; - - // Implementation - - // wxNotebook on Motif uses a generic wxTabView to implement itself. - wxTabView *GetTabView() const { return m_tabView; } - void SetTabView(wxTabView *v) { m_tabView = v; } - - void OnMouseEvent(wxMouseEvent& event); - void OnPaint(wxPaintEvent& event); - - virtual wxRect GetAvailableClientSize(); - - // Implementation: calculate the layout of the view rect - // and resize the children if required - bool RefreshLayout(bool force = true); - -protected: - // common part of all ctors - void Init(); - - // helper functions - void ChangePage(int nOldSel, int nSel); // change pages - - wxTabView* m_tabView; - - wxDECLARE_DYNAMIC_CLASS(wxNotebook); - wxDECLARE_EVENT_TABLE(); -}; - -#endif // _WX_NOTEBOOK_H_ diff --git a/Externals/wxWidgets3/include/wx/generic/notifmsg.h b/Externals/wxWidgets3/include/wx/generic/notifmsg.h deleted file mode 100644 index ccc55108c5..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/notifmsg.h +++ /dev/null @@ -1,47 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/notifmsg.h -// Purpose: generic implementation of wxGenericNotificationMessage -// Author: Vadim Zeitlin -// Created: 2007-11-24 -// Copyright: (c) 2007 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GENERIC_NOTIFMSG_H_ -#define _WX_GENERIC_NOTIFMSG_H_ - -// ---------------------------------------------------------------------------- -// wxGenericNotificationMessage -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxGenericNotificationMessage : public wxNotificationMessageBase -{ -public: - wxGenericNotificationMessage() - { - Init(); - } - - wxGenericNotificationMessage(const wxString& title, - const wxString& message = wxString(), - wxWindow *parent = NULL, - int flags = wxICON_INFORMATION) - { - Init(); - Create(title, message, parent, flags); - } - - // generic implementation-specific methods - - // get/set the default timeout (used if Timeout_Auto is specified) - static int GetDefaultTimeout(); - static void SetDefaultTimeout(int timeout); - -private: - void Init(); - - wxDECLARE_NO_COPY_CLASS(wxGenericNotificationMessage); -}; - -#endif // _WX_GENERIC_NOTIFMSG_H_ - diff --git a/Externals/wxWidgets3/include/wx/generic/numdlgg.h b/Externals/wxWidgets3/include/wx/generic/numdlgg.h deleted file mode 100644 index 905efee6df..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/numdlgg.h +++ /dev/null @@ -1,93 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/numdlgg.h -// Purpose: wxNumberEntryDialog class -// Author: John Labenski -// Modified by: -// Created: 07.02.04 (extracted from textdlgg.cpp) -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __NUMDLGH_G__ -#define __NUMDLGH_G__ - -#include "wx/defs.h" - -#if wxUSE_NUMBERDLG - -#include "wx/dialog.h" - -#if wxUSE_SPINCTRL - class WXDLLIMPEXP_FWD_CORE wxSpinCtrl; -#else - class WXDLLIMPEXP_FWD_CORE wxTextCtrl; -#endif // wxUSE_SPINCTRL - -// ---------------------------------------------------------------------------- -// wxNumberEntryDialog: a dialog with spin control, [ok] and [cancel] buttons -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxNumberEntryDialog : public wxDialog -{ -public: - wxNumberEntryDialog() - { - m_value = m_min = m_max = 0; - } - - wxNumberEntryDialog(wxWindow *parent, - const wxString& message, - const wxString& prompt, - const wxString& caption, - long value, long min, long max, - const wxPoint& pos = wxDefaultPosition) - { - Create(parent, message, prompt, caption, value, min, max, pos); - } - - bool Create(wxWindow *parent, - const wxString& message, - const wxString& prompt, - const wxString& caption, - long value, long min, long max, - const wxPoint& pos = wxDefaultPosition); - - long GetValue() const { return m_value; } - - // implementation only - void OnOK(wxCommandEvent& event); - void OnCancel(wxCommandEvent& event); - -protected: - -#if wxUSE_SPINCTRL - wxSpinCtrl *m_spinctrl; -#else - wxTextCtrl *m_spinctrl; -#endif // wxUSE_SPINCTRL - - long m_value, m_min, m_max; - -private: - wxDECLARE_EVENT_TABLE(); - wxDECLARE_DYNAMIC_CLASS(wxNumberEntryDialog); - wxDECLARE_NO_COPY_CLASS(wxNumberEntryDialog); -}; - -// ---------------------------------------------------------------------------- -// function to get a number from user -// ---------------------------------------------------------------------------- - -WXDLLIMPEXP_CORE long - wxGetNumberFromUser(const wxString& message, - const wxString& prompt, - const wxString& caption, - long value = 0, - long min = 0, - long max = 100, - wxWindow *parent = NULL, - const wxPoint& pos = wxDefaultPosition); - -#endif // wxUSE_NUMBERDLG - -#endif // __NUMDLGH_G__ diff --git a/Externals/wxWidgets3/include/wx/generic/paletteg.h b/Externals/wxWidgets3/include/wx/generic/paletteg.h deleted file mode 100644 index a475c7d18f..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/paletteg.h +++ /dev/null @@ -1,50 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/paletteg.h -// Purpose: -// Author: Robert Roebling -// Created: 01/02/97 -// Copyright: (c) 1998 Robert Roebling and Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - - -#ifndef __WX_PALETTEG_H__ -#define __WX_PALETTEG_H__ - -#include "wx/defs.h" -#include "wx/object.h" -#include "wx/gdiobj.h" -#include "wx/gdicmn.h" - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxPalette; - -//----------------------------------------------------------------------------- -// wxPalette -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxPalette: public wxPaletteBase -{ -public: - wxPalette(); - wxPalette( int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue ); - virtual ~wxPalette(); - - bool Create( int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue); - int GetPixel( unsigned char red, unsigned char green, unsigned char blue ) const; - bool GetRGB( int pixel, unsigned char *red, unsigned char *green, unsigned char *blue ) const; - - virtual int GetColoursCount() const wxOVERRIDE; - -protected: - virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE; - -private: - wxDECLARE_DYNAMIC_CLASS(wxPalette); -}; - -#endif // __WX_PALETTEG_H__ diff --git a/Externals/wxWidgets3/include/wx/generic/panelg.h b/Externals/wxWidgets3/include/wx/generic/panelg.h deleted file mode 100644 index 5c02cb35d8..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/panelg.h +++ /dev/null @@ -1,48 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/panelg.h -// Purpose: wxPanel: a container for child controls -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GENERIC_PANELG_H_ -#define _WX_GENERIC_PANELG_H_ - -#include "wx/bitmap.h" - -class WXDLLIMPEXP_CORE wxPanel : public wxPanelBase -{ -public: - wxPanel() { } - - // Constructor - wxPanel(wxWindow *parent, - wxWindowID winid = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxTAB_TRAVERSAL | wxNO_BORDER, - const wxString& name = wxPanelNameStr) - { - Create(parent, winid, pos, size, style, name); - } - -#if WXWIN_COMPATIBILITY_2_8 - wxDEPRECATED_CONSTRUCTOR( - wxPanel(wxWindow *parent, - int x, int y, int width, int height, - long style = wxTAB_TRAVERSAL | wxNO_BORDER, - const wxString& name = wxPanelNameStr) - { - Create(parent, wxID_ANY, wxPoint(x, y), wxSize(width, height), style, name); - } - ) -#endif // WXWIN_COMPATIBILITY_2_8 - -private: - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPanel); -}; - -#endif // _WX_GENERIC_PANELG_H_ diff --git a/Externals/wxWidgets3/include/wx/generic/printps.h b/Externals/wxWidgets3/include/wx/generic/printps.h deleted file mode 100644 index 7d83738677..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/printps.h +++ /dev/null @@ -1,67 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/printps.h -// Purpose: wxPostScriptPrinter, wxPostScriptPrintPreview -// wxGenericPageSetupDialog -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __PRINTPSH__ -#define __PRINTPSH__ - -#include "wx/prntbase.h" - -#if wxUSE_PRINTING_ARCHITECTURE && wxUSE_POSTSCRIPT - -// ---------------------------------------------------------------------------- -// Represents the printer: manages printing a wxPrintout object -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxPostScriptPrinter : public wxPrinterBase -{ -public: - wxPostScriptPrinter(wxPrintDialogData *data = NULL); - virtual ~wxPostScriptPrinter(); - - virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = true) wxOVERRIDE; - virtual wxDC* PrintDialog(wxWindow *parent) wxOVERRIDE; - virtual bool Setup(wxWindow *parent) wxOVERRIDE; - -private: - wxDECLARE_DYNAMIC_CLASS(wxPostScriptPrinter); -}; - -// ---------------------------------------------------------------------------- -// wxPrintPreview: programmer creates an object of this class to preview a -// wxPrintout. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxPostScriptPrintPreview : public wxPrintPreviewBase -{ -public: - wxPostScriptPrintPreview(wxPrintout *printout, - wxPrintout *printoutForPrinting = NULL, - wxPrintDialogData *data = NULL); - wxPostScriptPrintPreview(wxPrintout *printout, - wxPrintout *printoutForPrinting, - wxPrintData *data); - - virtual ~wxPostScriptPrintPreview(); - - virtual bool Print(bool interactive) wxOVERRIDE; - virtual void DetermineScaling() wxOVERRIDE; - -private: - void Init(wxPrintout *printout, wxPrintout *printoutForPrinting); - -private: - wxDECLARE_CLASS(wxPostScriptPrintPreview); -}; - -#endif - -#endif -// __PRINTPSH__ diff --git a/Externals/wxWidgets3/include/wx/generic/private/addremovectrl.h b/Externals/wxWidgets3/include/wx/generic/private/addremovectrl.h deleted file mode 100644 index 2eea6fad1d..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/private/addremovectrl.h +++ /dev/null @@ -1,65 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/private/addremovectrl.h -// Purpose: Generic wxAddRemoveImpl implementation, also used in wxMSW -// Author: Vadim Zeitlin -// Created: 2015-02-05 -// Copyright: (c) 2015 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GENERIC_PRIVATE_ADDREMOVECTRL_H_ -#define _WX_GENERIC_PRIVATE_ADDREMOVECTRL_H_ - -// ---------------------------------------------------------------------------- -// wxAddRemoveImpl -// ---------------------------------------------------------------------------- - -class wxAddRemoveImpl : public wxAddRemoveImplWithButtons -{ -public: - wxAddRemoveImpl(wxAddRemoveAdaptor* adaptor, - wxAddRemoveCtrl* parent, - wxWindow* ctrlItems) - : wxAddRemoveImplWithButtons(adaptor, parent, ctrlItems) - { - m_btnAdd = new wxButton(parent, wxID_ADD, GetAddButtonLabel(), - wxDefaultPosition, wxDefaultSize, - wxBU_EXACTFIT | wxBORDER_NONE); - m_btnRemove = new wxButton(parent, wxID_REMOVE, GetRemoveButtonLabel(), - wxDefaultPosition, wxDefaultSize, - wxBU_EXACTFIT | wxBORDER_NONE); - - wxSizer* const sizerBtns = new wxBoxSizer(wxVERTICAL); - sizerBtns->Add(m_btnAdd, wxSizerFlags().Expand()); - sizerBtns->Add(m_btnRemove, wxSizerFlags().Expand()); - - wxSizer* const sizerTop = new wxBoxSizer(wxHORIZONTAL); - sizerTop->Add(ctrlItems, wxSizerFlags(1).Expand()); - sizerTop->Add(sizerBtns, wxSizerFlags().Centre().Border(wxLEFT)); - parent->SetSizer(sizerTop); - - SetUpEvents(); - } - -private: - static wxString GetAddButtonLabel() - { -#if wxUSE_UNICODE - return wchar_t(0xFF0B); // FULLWIDTH PLUS SIGN -#else - return "+"; -#endif - } - - static wxString GetRemoveButtonLabel() - { -#if wxUSE_UNICODE - return wchar_t(0x2012); // FIGURE DASH -#else - return "-"; -#endif - } - -}; - -#endif // _WX_GENERIC_PRIVATE_ADDREMOVECTRL_H_ diff --git a/Externals/wxWidgets3/include/wx/generic/private/grid.h b/Externals/wxWidgets3/include/wx/generic/private/grid.h deleted file mode 100644 index 0fb81f91ac..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/private/grid.h +++ /dev/null @@ -1,948 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/private/grid.h -// Purpose: Private wxGrid structures -// Author: Michael Bedward (based on code by Julian Smart, Robin Dunn) -// Modified by: Santiago Palacios -// Created: 1/08/1999 -// Copyright: (c) Michael Bedward -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GENERIC_GRID_PRIVATE_H_ -#define _WX_GENERIC_GRID_PRIVATE_H_ - -#include "wx/defs.h" - -#if wxUSE_GRID - -// Internally used (and hence intentionally not exported) event telling wxGrid -// to hide the currently shown editor. -wxDECLARE_EVENT( wxEVT_GRID_HIDE_EDITOR, wxCommandEvent ); - -// ---------------------------------------------------------------------------- -// array classes -// ---------------------------------------------------------------------------- - -WX_DEFINE_ARRAY_WITH_DECL_PTR(wxGridCellAttr *, wxArrayAttrs, - class WXDLLIMPEXP_ADV); - -struct wxGridCellWithAttr -{ - wxGridCellWithAttr(int row, int col, wxGridCellAttr *attr_) - : coords(row, col), attr(attr_) - { - wxASSERT( attr ); - } - - wxGridCellWithAttr(const wxGridCellWithAttr& other) - : coords(other.coords), - attr(other.attr) - { - attr->IncRef(); - } - - wxGridCellWithAttr& operator=(const wxGridCellWithAttr& other) - { - coords = other.coords; - if (attr != other.attr) - { - attr->DecRef(); - attr = other.attr; - attr->IncRef(); - } - return *this; - } - - void ChangeAttr(wxGridCellAttr* new_attr) - { - if (attr != new_attr) - { - // "Delete" (i.e. DecRef) the old attribute. - attr->DecRef(); - attr = new_attr; - // Take ownership of the new attribute, i.e. no IncRef. - } - } - - ~wxGridCellWithAttr() - { - attr->DecRef(); - } - - wxGridCellCoords coords; - wxGridCellAttr *attr; -}; - -WX_DECLARE_OBJARRAY_WITH_DECL(wxGridCellWithAttr, wxGridCellWithAttrArray, - class WXDLLIMPEXP_ADV); - - -// ---------------------------------------------------------------------------- -// private classes -// ---------------------------------------------------------------------------- - -// header column providing access to the column information stored in wxGrid -// via wxHeaderColumn interface -class wxGridHeaderColumn : public wxHeaderColumn -{ -public: - wxGridHeaderColumn(wxGrid *grid, int col) - : m_grid(grid), - m_col(col) - { - } - - virtual wxString GetTitle() const wxOVERRIDE { return m_grid->GetColLabelValue(m_col); } - virtual wxBitmap GetBitmap() const wxOVERRIDE { return wxNullBitmap; } - virtual int GetWidth() const wxOVERRIDE { return m_grid->GetColSize(m_col); } - virtual int GetMinWidth() const wxOVERRIDE { return 0; } - virtual wxAlignment GetAlignment() const wxOVERRIDE - { - int horz, - vert; - m_grid->GetColLabelAlignment(&horz, &vert); - - return static_cast(horz); - } - - virtual int GetFlags() const wxOVERRIDE - { - // we can't know in advance whether we can sort by this column or not - // with wxGrid API so suppose we can by default - int flags = wxCOL_SORTABLE; - if ( m_grid->CanDragColSize(m_col) ) - flags |= wxCOL_RESIZABLE; - if ( m_grid->CanDragColMove() ) - flags |= wxCOL_REORDERABLE; - if ( GetWidth() == 0 ) - flags |= wxCOL_HIDDEN; - - return flags; - } - - virtual bool IsSortKey() const wxOVERRIDE - { - return m_grid->IsSortingBy(m_col); - } - - virtual bool IsSortOrderAscending() const wxOVERRIDE - { - return m_grid->IsSortOrderAscending(); - } - -private: - // these really should be const but are not because the column needs to be - // assignable to be used in a wxVector (in STL build, in non-STL build we - // avoid the need for this) - wxGrid *m_grid; - int m_col; -}; - -// header control retreiving column information from the grid -class wxGridHeaderCtrl : public wxHeaderCtrl -{ -public: - wxGridHeaderCtrl(wxGrid *owner) - : wxHeaderCtrl(owner, - wxID_ANY, - wxDefaultPosition, - wxDefaultSize, - wxHD_ALLOW_HIDE | - (owner->CanDragColMove() ? wxHD_ALLOW_REORDER : 0)) - { - } - -protected: - virtual const wxHeaderColumn& GetColumn(unsigned int idx) const wxOVERRIDE - { - return m_columns[idx]; - } - -private: - wxGrid *GetOwner() const { return static_cast(GetParent()); } - - static wxMouseEvent GetDummyMouseEvent() - { - // make up a dummy event for the grid event to use -- unfortunately we - // can't do anything else here - wxMouseEvent e; - e.SetState(wxGetMouseState()); - return e; - } - - // override the base class method to update our m_columns array - virtual void OnColumnCountChanging(unsigned int count) wxOVERRIDE - { - const unsigned countOld = m_columns.size(); - if ( count < countOld ) - { - // just discard the columns which don't exist any more (notice that - // we can't use resize() here as it would require the vector - // value_type, i.e. wxGridHeaderColumn to be default constructible, - // which it is not) - m_columns.erase(m_columns.begin() + count, m_columns.end()); - } - else // new columns added - { - // add columns for the new elements - for ( unsigned n = countOld; n < count; n++ ) - m_columns.push_back(wxGridHeaderColumn(GetOwner(), n)); - } - } - - // override to implement column auto sizing - virtual bool UpdateColumnWidthToFit(unsigned int idx, int widthTitle) wxOVERRIDE - { - // TODO: currently grid doesn't support computing the column best width - // from its contents so we just use the best label width as is - GetOwner()->SetColSize(idx, widthTitle); - - return true; - } - - // overridden to react to the actions using the columns popup menu - virtual void UpdateColumnVisibility(unsigned int idx, bool show) wxOVERRIDE - { - GetOwner()->SetColSize(idx, show ? wxGRID_AUTOSIZE : 0); - - // as this is done by the user we should notify the main program about - // it - GetOwner()->SendGridSizeEvent(wxEVT_GRID_COL_SIZE, -1, idx, - GetDummyMouseEvent()); - } - - // overridden to react to the columns order changes in the customization - // dialog - virtual void UpdateColumnsOrder(const wxArrayInt& order) wxOVERRIDE - { - GetOwner()->SetColumnsOrder(order); - } - - - // event handlers forwarding wxHeaderCtrl events to wxGrid - void OnClick(wxHeaderCtrlEvent& event) - { - GetOwner()->SendEvent(wxEVT_GRID_LABEL_LEFT_CLICK, - -1, event.GetColumn(), - GetDummyMouseEvent()); - - GetOwner()->DoColHeaderClick(event.GetColumn()); - } - - void OnDoubleClick(wxHeaderCtrlEvent& event) - { - if ( !GetOwner()->SendEvent(wxEVT_GRID_LABEL_LEFT_DCLICK, - -1, event.GetColumn(), - GetDummyMouseEvent()) ) - { - event.Skip(); - } - } - - void OnRightClick(wxHeaderCtrlEvent& event) - { - if ( !GetOwner()->SendEvent(wxEVT_GRID_LABEL_RIGHT_CLICK, - -1, event.GetColumn(), - GetDummyMouseEvent()) ) - { - event.Skip(); - } - } - - void OnBeginResize(wxHeaderCtrlEvent& event) - { - GetOwner()->DoStartResizeCol(event.GetColumn()); - - event.Skip(); - } - - void OnResizing(wxHeaderCtrlEvent& event) - { - GetOwner()->DoUpdateResizeColWidth(event.GetWidth()); - } - - void OnEndResize(wxHeaderCtrlEvent& event) - { - // we again need to pass a mouse event to be used for the grid event - // generation but we don't have it here so use a dummy one as in - // UpdateColumnVisibility() - wxMouseEvent e; - e.SetState(wxGetMouseState()); - GetOwner()->DoEndDragResizeCol(e); - - event.Skip(); - } - - void OnBeginReorder(wxHeaderCtrlEvent& event) - { - GetOwner()->DoStartMoveCol(event.GetColumn()); - } - - void OnEndReorder(wxHeaderCtrlEvent& event) - { - GetOwner()->DoEndMoveCol(event.GetNewOrder()); - } - - wxVector m_columns; - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_NO_COPY_CLASS(wxGridHeaderCtrl); -}; - -// common base class for various grid subwindows -class WXDLLIMPEXP_ADV wxGridSubwindow : public wxWindow -{ -public: - wxGridSubwindow(wxGrid *owner, - int additionalStyle = 0, - const wxString& name = wxPanelNameStr) - : wxWindow(owner, wxID_ANY, - wxDefaultPosition, wxDefaultSize, - wxBORDER_NONE | additionalStyle, - name) - { - m_owner = owner; - } - - virtual wxWindow *GetMainWindowOfCompositeControl() wxOVERRIDE { return m_owner; } - - virtual bool AcceptsFocus() const wxOVERRIDE { return false; } - - wxGrid *GetOwner() { return m_owner; } - -protected: - void OnMouseCaptureLost(wxMouseCaptureLostEvent& event); - - wxGrid *m_owner; - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_NO_COPY_CLASS(wxGridSubwindow); -}; - -class WXDLLIMPEXP_ADV wxGridRowLabelWindow : public wxGridSubwindow -{ -public: - wxGridRowLabelWindow(wxGrid *parent) - : wxGridSubwindow(parent) - { - } - - -private: - void OnPaint( wxPaintEvent& event ); - void OnMouseEvent( wxMouseEvent& event ); - void OnMouseWheel( wxMouseEvent& event ); - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_NO_COPY_CLASS(wxGridRowLabelWindow); -}; - - -class WXDLLIMPEXP_ADV wxGridColLabelWindow : public wxGridSubwindow -{ -public: - wxGridColLabelWindow(wxGrid *parent) - : wxGridSubwindow(parent) - { - } - - -private: - void OnPaint( wxPaintEvent& event ); - void OnMouseEvent( wxMouseEvent& event ); - void OnMouseWheel( wxMouseEvent& event ); - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_NO_COPY_CLASS(wxGridColLabelWindow); -}; - - -class WXDLLIMPEXP_ADV wxGridCornerLabelWindow : public wxGridSubwindow -{ -public: - wxGridCornerLabelWindow(wxGrid *parent) - : wxGridSubwindow(parent) - { - } - -private: - void OnMouseEvent( wxMouseEvent& event ); - void OnMouseWheel( wxMouseEvent& event ); - void OnPaint( wxPaintEvent& event ); - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_NO_COPY_CLASS(wxGridCornerLabelWindow); -}; - -class WXDLLIMPEXP_ADV wxGridWindow : public wxGridSubwindow -{ -public: - wxGridWindow(wxGrid *parent) - : wxGridSubwindow(parent, - wxWANTS_CHARS | wxCLIP_CHILDREN, - "GridWindow") - { - } - - - virtual void ScrollWindow( int dx, int dy, const wxRect *rect ) wxOVERRIDE; - - virtual bool AcceptsFocus() const wxOVERRIDE { return true; } - -private: - void OnPaint( wxPaintEvent &event ); - void OnMouseWheel( wxMouseEvent& event ); - void OnMouseEvent( wxMouseEvent& event ); - void OnKeyDown( wxKeyEvent& ); - void OnKeyUp( wxKeyEvent& ); - void OnChar( wxKeyEvent& ); - void OnEraseBackground( wxEraseEvent& ); - void OnFocus( wxFocusEvent& ); - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_NO_COPY_CLASS(wxGridWindow); -}; - -// ---------------------------------------------------------------------------- -// the internal data representation used by wxGridCellAttrProvider -// ---------------------------------------------------------------------------- - -// this class stores attributes set for cells -class WXDLLIMPEXP_ADV wxGridCellAttrData -{ -public: - void SetAttr(wxGridCellAttr *attr, int row, int col); - wxGridCellAttr *GetAttr(int row, int col) const; - void UpdateAttrRows( size_t pos, int numRows ); - void UpdateAttrCols( size_t pos, int numCols ); - -private: - // searches for the attr for given cell, returns wxNOT_FOUND if not found - int FindIndex(int row, int col) const; - - wxGridCellWithAttrArray m_attrs; -}; - -// this class stores attributes set for rows or columns -class WXDLLIMPEXP_ADV wxGridRowOrColAttrData -{ -public: - // empty ctor to suppress warnings - wxGridRowOrColAttrData() {} - ~wxGridRowOrColAttrData(); - - void SetAttr(wxGridCellAttr *attr, int rowOrCol); - wxGridCellAttr *GetAttr(int rowOrCol) const; - void UpdateAttrRowsOrCols( size_t pos, int numRowsOrCols ); - -private: - wxArrayInt m_rowsOrCols; - wxArrayAttrs m_attrs; -}; - -// NB: this is just a wrapper around 3 objects: one which stores cell -// attributes, and 2 others for row/col ones -class WXDLLIMPEXP_ADV wxGridCellAttrProviderData -{ -public: - wxGridCellAttrData m_cellAttrs; - wxGridRowOrColAttrData m_rowAttrs, - m_colAttrs; -}; - -// ---------------------------------------------------------------------------- -// operations classes abstracting the difference between operating on rows and -// columns -// ---------------------------------------------------------------------------- - -// This class allows to write a function only once because by using its methods -// it will apply to both columns and rows. -// -// This is an abstract interface definition, the two concrete implementations -// below should be used when working with rows and columns respectively. -class wxGridOperations -{ -public: - // Returns the operations in the other direction, i.e. wxGridRowOperations - // if this object is a wxGridColumnOperations and vice versa. - virtual wxGridOperations& Dual() const = 0; - - // Return the number of rows or columns. - virtual int GetNumberOfLines(const wxGrid *grid) const = 0; - - // Return the selection mode which allows selecting rows or columns. - virtual wxGrid::wxGridSelectionModes GetSelectionMode() const = 0; - - // Make a wxGridCellCoords from the given components: thisDir is row or - // column and otherDir is column or row - virtual wxGridCellCoords MakeCoords(int thisDir, int otherDir) const = 0; - - // Calculate the scrolled position of the given abscissa or ordinate. - virtual int CalcScrolledPosition(wxGrid *grid, int pos) const = 0; - - // Selects the horizontal or vertical component from the given object. - virtual int Select(const wxGridCellCoords& coords) const = 0; - virtual int Select(const wxPoint& pt) const = 0; - virtual int Select(const wxSize& sz) const = 0; - virtual int Select(const wxRect& r) const = 0; - virtual int& Select(wxRect& r) const = 0; - - // Returns width or height of the rectangle - virtual int& SelectSize(wxRect& r) const = 0; - - // Make a wxSize such that Select() applied to it returns first component - virtual wxSize MakeSize(int first, int second) const = 0; - - // Sets the row or column component of the given cell coordinates - virtual void Set(wxGridCellCoords& coords, int line) const = 0; - - - // Draws a line parallel to the row or column, i.e. horizontal or vertical: - // pos is the horizontal or vertical position of the line and start and end - // are the coordinates of the line extremities in the other direction - virtual void - DrawParallelLine(wxDC& dc, int start, int end, int pos) const = 0; - - // Draw a horizontal or vertical line across the given rectangle - // (this is implemented in terms of above and uses Select() to extract - // start and end from the given rectangle) - void DrawParallelLineInRect(wxDC& dc, const wxRect& rect, int pos) const - { - const int posStart = Select(rect.GetPosition()); - DrawParallelLine(dc, posStart, posStart + Select(rect.GetSize()), pos); - } - - - // Return the index of the row or column at the given pixel coordinate. - virtual int - PosToLine(const wxGrid *grid, int pos, bool clip = false) const = 0; - - // Get the top/left position, in pixels, of the given row or column - virtual int GetLineStartPos(const wxGrid *grid, int line) const = 0; - - // Get the bottom/right position, in pixels, of the given row or column - virtual int GetLineEndPos(const wxGrid *grid, int line) const = 0; - - // Get the height/width of the given row/column - virtual int GetLineSize(const wxGrid *grid, int line) const = 0; - - // Get wxGrid::m_rowBottoms/m_colRights array - virtual const wxArrayInt& GetLineEnds(const wxGrid *grid) const = 0; - - // Get default height row height or column width - virtual int GetDefaultLineSize(const wxGrid *grid) const = 0; - - // Return the minimal acceptable row height or column width - virtual int GetMinimalAcceptableLineSize(const wxGrid *grid) const = 0; - - // Return the minimal row height or column width - virtual int GetMinimalLineSize(const wxGrid *grid, int line) const = 0; - - // Set the row height or column width - virtual void SetLineSize(wxGrid *grid, int line, int size) const = 0; - - // Set the row default height or column default width - virtual void SetDefaultLineSize(wxGrid *grid, int size, bool resizeExisting) const = 0; - - - // Return the index of the line at the given position - // - // NB: currently this is always identity for the rows as reordering is only - // implemented for the lines - virtual int GetLineAt(const wxGrid *grid, int pos) const = 0; - - // Return the display position of the line with the given index. - // - // NB: As GetLineAt(), currently this is always identity for rows. - virtual int GetLinePos(const wxGrid *grid, int line) const = 0; - - // Return the index of the line just before the given one or wxNOT_FOUND. - virtual int GetLineBefore(const wxGrid* grid, int line) const = 0; - - // Get the row or column label window - virtual wxWindow *GetHeaderWindow(wxGrid *grid) const = 0; - - // Get the width or height of the row or column label window - virtual int GetHeaderWindowSize(wxGrid *grid) const = 0; - - - // This class is never used polymorphically but give it a virtual dtor - // anyhow to suppress g++ complaints about it - virtual ~wxGridOperations() { } -}; - -class wxGridRowOperations : public wxGridOperations -{ -public: - virtual wxGridOperations& Dual() const wxOVERRIDE; - - virtual int GetNumberOfLines(const wxGrid *grid) const wxOVERRIDE - { return grid->GetNumberRows(); } - - virtual wxGrid::wxGridSelectionModes GetSelectionMode() const wxOVERRIDE - { return wxGrid::wxGridSelectRows; } - - virtual wxGridCellCoords MakeCoords(int thisDir, int otherDir) const wxOVERRIDE - { return wxGridCellCoords(thisDir, otherDir); } - - virtual int CalcScrolledPosition(wxGrid *grid, int pos) const wxOVERRIDE - { return grid->CalcScrolledPosition(wxPoint(pos, 0)).x; } - - virtual int Select(const wxGridCellCoords& c) const wxOVERRIDE { return c.GetRow(); } - virtual int Select(const wxPoint& pt) const wxOVERRIDE { return pt.x; } - virtual int Select(const wxSize& sz) const wxOVERRIDE { return sz.x; } - virtual int Select(const wxRect& r) const wxOVERRIDE { return r.x; } - virtual int& Select(wxRect& r) const wxOVERRIDE { return r.x; } - virtual int& SelectSize(wxRect& r) const wxOVERRIDE { return r.width; } - virtual wxSize MakeSize(int first, int second) const wxOVERRIDE - { return wxSize(first, second); } - virtual void Set(wxGridCellCoords& coords, int line) const wxOVERRIDE - { coords.SetRow(line); } - - virtual void DrawParallelLine(wxDC& dc, int start, int end, int pos) const wxOVERRIDE - { dc.DrawLine(start, pos, end, pos); } - - virtual int PosToLine(const wxGrid *grid, int pos, bool clip = false) const wxOVERRIDE - { return grid->YToRow(pos, clip); } - virtual int GetLineStartPos(const wxGrid *grid, int line) const wxOVERRIDE - { return grid->GetRowTop(line); } - virtual int GetLineEndPos(const wxGrid *grid, int line) const wxOVERRIDE - { return grid->GetRowBottom(line); } - virtual int GetLineSize(const wxGrid *grid, int line) const wxOVERRIDE - { return grid->GetRowHeight(line); } - virtual const wxArrayInt& GetLineEnds(const wxGrid *grid) const wxOVERRIDE - { return grid->m_rowBottoms; } - virtual int GetDefaultLineSize(const wxGrid *grid) const wxOVERRIDE - { return grid->GetDefaultRowSize(); } - virtual int GetMinimalAcceptableLineSize(const wxGrid *grid) const wxOVERRIDE - { return grid->GetRowMinimalAcceptableHeight(); } - virtual int GetMinimalLineSize(const wxGrid *grid, int line) const wxOVERRIDE - { return grid->GetRowMinimalHeight(line); } - virtual void SetLineSize(wxGrid *grid, int line, int size) const wxOVERRIDE - { grid->SetRowSize(line, size); } - virtual void SetDefaultLineSize(wxGrid *grid, int size, bool resizeExisting) const wxOVERRIDE - { grid->SetDefaultRowSize(size, resizeExisting); } - - virtual int GetLineAt(const wxGrid * WXUNUSED(grid), int pos) const wxOVERRIDE - { return pos; } // TODO: implement row reordering - virtual int GetLinePos(const wxGrid * WXUNUSED(grid), int line) const wxOVERRIDE - { return line; } // TODO: implement row reordering - - virtual int GetLineBefore(const wxGrid* WXUNUSED(grid), int line) const wxOVERRIDE - { return line - 1; } - - virtual wxWindow *GetHeaderWindow(wxGrid *grid) const wxOVERRIDE - { return grid->GetGridRowLabelWindow(); } - virtual int GetHeaderWindowSize(wxGrid *grid) const wxOVERRIDE - { return grid->GetRowLabelSize(); } -}; - -class wxGridColumnOperations : public wxGridOperations -{ -public: - virtual wxGridOperations& Dual() const wxOVERRIDE; - - virtual int GetNumberOfLines(const wxGrid *grid) const wxOVERRIDE - { return grid->GetNumberCols(); } - - virtual wxGrid::wxGridSelectionModes GetSelectionMode() const wxOVERRIDE - { return wxGrid::wxGridSelectColumns; } - - virtual wxGridCellCoords MakeCoords(int thisDir, int otherDir) const wxOVERRIDE - { return wxGridCellCoords(otherDir, thisDir); } - - virtual int CalcScrolledPosition(wxGrid *grid, int pos) const wxOVERRIDE - { return grid->CalcScrolledPosition(wxPoint(0, pos)).y; } - - virtual int Select(const wxGridCellCoords& c) const wxOVERRIDE { return c.GetCol(); } - virtual int Select(const wxPoint& pt) const wxOVERRIDE { return pt.y; } - virtual int Select(const wxSize& sz) const wxOVERRIDE { return sz.y; } - virtual int Select(const wxRect& r) const wxOVERRIDE { return r.y; } - virtual int& Select(wxRect& r) const wxOVERRIDE { return r.y; } - virtual int& SelectSize(wxRect& r) const wxOVERRIDE { return r.height; } - virtual wxSize MakeSize(int first, int second) const wxOVERRIDE - { return wxSize(second, first); } - virtual void Set(wxGridCellCoords& coords, int line) const wxOVERRIDE - { coords.SetCol(line); } - - virtual void DrawParallelLine(wxDC& dc, int start, int end, int pos) const wxOVERRIDE - { dc.DrawLine(pos, start, pos, end); } - - virtual int PosToLine(const wxGrid *grid, int pos, bool clip = false) const wxOVERRIDE - { return grid->XToCol(pos, clip); } - virtual int GetLineStartPos(const wxGrid *grid, int line) const wxOVERRIDE - { return grid->GetColLeft(line); } - virtual int GetLineEndPos(const wxGrid *grid, int line) const wxOVERRIDE - { return grid->GetColRight(line); } - virtual int GetLineSize(const wxGrid *grid, int line) const wxOVERRIDE - { return grid->GetColWidth(line); } - virtual const wxArrayInt& GetLineEnds(const wxGrid *grid) const wxOVERRIDE - { return grid->m_colRights; } - virtual int GetDefaultLineSize(const wxGrid *grid) const wxOVERRIDE - { return grid->GetDefaultColSize(); } - virtual int GetMinimalAcceptableLineSize(const wxGrid *grid) const wxOVERRIDE - { return grid->GetColMinimalAcceptableWidth(); } - virtual int GetMinimalLineSize(const wxGrid *grid, int line) const wxOVERRIDE - { return grid->GetColMinimalWidth(line); } - virtual void SetLineSize(wxGrid *grid, int line, int size) const wxOVERRIDE - { grid->SetColSize(line, size); } - virtual void SetDefaultLineSize(wxGrid *grid, int size, bool resizeExisting) const wxOVERRIDE - { grid->SetDefaultColSize(size, resizeExisting); } - - virtual int GetLineAt(const wxGrid *grid, int pos) const wxOVERRIDE - { return grid->GetColAt(pos); } - virtual int GetLinePos(const wxGrid *grid, int line) const wxOVERRIDE - { return grid->GetColPos(line); } - - virtual int GetLineBefore(const wxGrid* grid, int line) const wxOVERRIDE - { - int posBefore = grid->GetColPos(line) - 1; - return posBefore >= 0 ? grid->GetColAt(posBefore) : wxNOT_FOUND; - } - - virtual wxWindow *GetHeaderWindow(wxGrid *grid) const wxOVERRIDE - { return grid->GetGridColLabelWindow(); } - virtual int GetHeaderWindowSize(wxGrid *grid) const wxOVERRIDE - { return grid->GetColLabelSize(); } -}; - -// This class abstracts the difference between operations going forward -// (down/right) and backward (up/left) and allows to use the same code for -// functions which differ only in the direction of grid traversal. -// -// Notice that all operations in this class work with display positions and not -// internal indices which can be different if the columns were reordered. -// -// Like wxGridOperations it's an ABC with two concrete subclasses below. Unlike -// it, this is a normal object and not just a function dispatch table and has a -// non-default ctor. -// -// Note: the explanation of this discrepancy is the existence of (very useful) -// Dual() method in wxGridOperations which forces us to make wxGridOperations a -// function dispatcher only. -class wxGridDirectionOperations -{ -public: - // The oper parameter to ctor selects whether we work with rows or columns - wxGridDirectionOperations(wxGrid *grid, const wxGridOperations& oper) - : m_grid(grid), - m_oper(oper) - { - } - - // Check if the component of this point in our direction is at the - // boundary, i.e. is the first/last row/column - virtual bool IsAtBoundary(const wxGridCellCoords& coords) const = 0; - - // Increment the component of this point in our direction - virtual void Advance(wxGridCellCoords& coords) const = 0; - - // Find the line at the given distance, in pixels, away from this one - // (this uses clipping, i.e. anything after the last line is counted as the - // last one and anything before the first one as 0) - // - // TODO: Implementation of this method currently doesn't support column - // reordering as it mixes up indices and positions. But this doesn't - // really matter as it's only called for rows (Page Up/Down only work - // vertically) and row reordering is not currently supported. We'd - // need to fix it if this ever changes however. - virtual int MoveByPixelDistance(int line, int distance) const = 0; - - // This class is never used polymorphically but give it a virtual dtor - // anyhow to suppress g++ complaints about it - virtual ~wxGridDirectionOperations() { } - -protected: - // Get the position of the row or column from the given coordinates pair. - // - // This is just a shortcut to avoid repeating m_oper and m_grid multiple - // times in the derived classes code. - int GetLinePos(const wxGridCellCoords& coords) const - { - return m_oper.GetLinePos(m_grid, m_oper.Select(coords)); - } - - // Get the index of the row or column from the position. - int GetLineAt(int pos) const - { - return m_oper.GetLineAt(m_grid, pos); - } - - // Check if the given line is visible, i.e. has non 0 size. - bool IsLineVisible(int line) const - { - return m_oper.GetLineSize(m_grid, line) != 0; - } - - - wxGrid * const m_grid; - const wxGridOperations& m_oper; -}; - -class wxGridBackwardOperations : public wxGridDirectionOperations -{ -public: - wxGridBackwardOperations(wxGrid *grid, const wxGridOperations& oper) - : wxGridDirectionOperations(grid, oper) - { - } - - virtual bool IsAtBoundary(const wxGridCellCoords& coords) const wxOVERRIDE - { - wxASSERT_MSG( m_oper.Select(coords) >= 0, "invalid row/column" ); - - int pos = GetLinePos(coords); - while ( pos ) - { - // Check the previous line. - int line = GetLineAt(--pos); - if ( IsLineVisible(line) ) - { - // There is another visible line before this one, hence it's - // not at boundary. - return false; - } - } - - // We reached the boundary without finding any visible lines. - return true; - } - - virtual void Advance(wxGridCellCoords& coords) const wxOVERRIDE - { - int pos = GetLinePos(coords); - for ( ;; ) - { - // This is not supposed to happen if IsAtBoundary() returned false. - wxCHECK_RET( pos, "can't advance when already at boundary" ); - - int line = GetLineAt(--pos); - if ( IsLineVisible(line) ) - { - m_oper.Set(coords, line); - break; - } - } - } - - virtual int MoveByPixelDistance(int line, int distance) const wxOVERRIDE - { - int pos = m_oper.GetLineStartPos(m_grid, line); - return m_oper.PosToLine(m_grid, pos - distance + 1, true); - } -}; - -// Please refer to the comments above when reading this class code, it's -// absolutely symmetrical to wxGridBackwardOperations. -class wxGridForwardOperations : public wxGridDirectionOperations -{ -public: - wxGridForwardOperations(wxGrid *grid, const wxGridOperations& oper) - : wxGridDirectionOperations(grid, oper), - m_numLines(oper.GetNumberOfLines(grid)) - { - } - - virtual bool IsAtBoundary(const wxGridCellCoords& coords) const wxOVERRIDE - { - wxASSERT_MSG( m_oper.Select(coords) < m_numLines, "invalid row/column" ); - - int pos = GetLinePos(coords); - while ( pos < m_numLines - 1 ) - { - int line = GetLineAt(++pos); - if ( IsLineVisible(line) ) - return false; - } - - return true; - } - - virtual void Advance(wxGridCellCoords& coords) const wxOVERRIDE - { - int pos = GetLinePos(coords); - for ( ;; ) - { - wxCHECK_RET( pos < m_numLines - 1, - "can't advance when already at boundary" ); - - int line = GetLineAt(++pos); - if ( IsLineVisible(line) ) - { - m_oper.Set(coords, line); - break; - } - } - } - - virtual int MoveByPixelDistance(int line, int distance) const wxOVERRIDE - { - int pos = m_oper.GetLineStartPos(m_grid, line); - return m_oper.PosToLine(m_grid, pos + distance, true); - } - -private: - const int m_numLines; -}; - -// ---------------------------------------------------------------------------- -// data structures used for the data type registry -// ---------------------------------------------------------------------------- - -struct wxGridDataTypeInfo -{ - wxGridDataTypeInfo(const wxString& typeName, - wxGridCellRenderer* renderer, - wxGridCellEditor* editor) - : m_typeName(typeName), m_renderer(renderer), m_editor(editor) - {} - - ~wxGridDataTypeInfo() - { - wxSafeDecRef(m_renderer); - wxSafeDecRef(m_editor); - } - - wxString m_typeName; - wxGridCellRenderer* m_renderer; - wxGridCellEditor* m_editor; - - wxDECLARE_NO_COPY_CLASS(wxGridDataTypeInfo); -}; - - -WX_DEFINE_ARRAY_WITH_DECL_PTR(wxGridDataTypeInfo*, wxGridDataTypeInfoArray, - class WXDLLIMPEXP_ADV); - - -class WXDLLIMPEXP_ADV wxGridTypeRegistry -{ -public: - wxGridTypeRegistry() {} - ~wxGridTypeRegistry(); - - void RegisterDataType(const wxString& typeName, - wxGridCellRenderer* renderer, - wxGridCellEditor* editor); - - // find one of already registered data types - int FindRegisteredDataType(const wxString& typeName); - - // try to FindRegisteredDataType(), if this fails and typeName is one of - // standard typenames, register it and return its index - int FindDataType(const wxString& typeName); - - // try to FindDataType(), if it fails see if it is not one of already - // registered data types with some params in which case clone the - // registered data type and set params for it - int FindOrCloneDataType(const wxString& typeName); - - wxGridCellRenderer* GetRenderer(int index); - wxGridCellEditor* GetEditor(int index); - -private: - wxGridDataTypeInfoArray m_typeinfo; -}; - -#endif // wxUSE_GRID -#endif // _WX_GENERIC_GRID_PRIVATE_H_ diff --git a/Externals/wxWidgets3/include/wx/generic/private/listctrl.h b/Externals/wxWidgets3/include/wx/generic/private/listctrl.h deleted file mode 100644 index 9cd50707a8..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/private/listctrl.h +++ /dev/null @@ -1,886 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/private/listctrl.h -// Purpose: private definitions of wxListCtrl helpers -// Author: Robert Roebling -// Vadim Zeitlin (virtual list control support) -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GENERIC_LISTCTRL_PRIVATE_H_ -#define _WX_GENERIC_LISTCTRL_PRIVATE_H_ - -#include "wx/defs.h" - -#if wxUSE_LISTCTRL - -#include "wx/listctrl.h" -#include "wx/selstore.h" -#include "wx/timer.h" -#include "wx/settings.h" - -// ============================================================================ -// private classes -// ============================================================================ - -//----------------------------------------------------------------------------- -// wxColWidthInfo (internal) -//----------------------------------------------------------------------------- - -struct wxColWidthInfo -{ - int nMaxWidth; - bool bNeedsUpdate; // only set to true when an item whose - // width == nMaxWidth is removed - - wxColWidthInfo(int w = 0, bool needsUpdate = false) - { - nMaxWidth = w; - bNeedsUpdate = needsUpdate; - } -}; - -WX_DEFINE_ARRAY_PTR(wxColWidthInfo *, ColWidthArray); - -//----------------------------------------------------------------------------- -// wxListItemData (internal) -//----------------------------------------------------------------------------- - -class wxListItemData -{ -public: - wxListItemData(wxListMainWindow *owner); - ~wxListItemData(); - - void SetItem( const wxListItem &info ); - void SetImage( int image ) { m_image = image; } - void SetData( wxUIntPtr data ) { m_data = data; } - void SetPosition( int x, int y ); - void SetSize( int width, int height ); - - bool HasText() const { return !m_text.empty(); } - const wxString& GetText() const { return m_text; } - void SetText(const wxString& text) { m_text = text; } - - // we can't use empty string for measuring the string width/height, so - // always return something - wxString GetTextForMeasuring() const - { - wxString s = GetText(); - if ( s.empty() ) - s = wxT('H'); - - return s; - } - - bool IsHit( int x, int y ) const; - - int GetX() const; - int GetY() const; - int GetWidth() const; - int GetHeight() const; - - int GetImage() const { return m_image; } - bool HasImage() const { return GetImage() != -1; } - - void GetItem( wxListItem &info ) const; - - void SetAttr(wxListItemAttr *attr) { m_attr = attr; } - wxListItemAttr *GetAttr() const { return m_attr; } - -public: - // the item image or -1 - int m_image; - - // user data associated with the item - wxUIntPtr m_data; - - // the item coordinates are not used in report mode; instead this pointer is - // NULL and the owner window is used to retrieve the item position and size - wxRect *m_rect; - - // the list ctrl we are in - wxListMainWindow *m_owner; - - // custom attributes or NULL - wxListItemAttr *m_attr; - -protected: - // common part of all ctors - void Init(); - - wxString m_text; -}; - -//----------------------------------------------------------------------------- -// wxListHeaderData (internal) -//----------------------------------------------------------------------------- - -class wxListHeaderData : public wxObject -{ -public: - wxListHeaderData(); - wxListHeaderData( const wxListItem &info ); - void SetItem( const wxListItem &item ); - void SetPosition( int x, int y ); - void SetWidth( int w ); - void SetState( int state ); - void SetFormat( int format ); - void SetHeight( int h ); - bool HasImage() const; - - bool HasText() const { return !m_text.empty(); } - const wxString& GetText() const { return m_text; } - void SetText(const wxString& text) { m_text = text; } - - void GetItem( wxListItem &item ); - - bool IsHit( int x, int y ) const; - int GetImage() const; - int GetWidth() const; - int GetFormat() const; - int GetState() const; - -protected: - long m_mask; - int m_image; - wxString m_text; - int m_format; - int m_width; - int m_xpos, - m_ypos; - int m_height; - int m_state; - -private: - void Init(); -}; - -//----------------------------------------------------------------------------- -// wxListLineData (internal) -//----------------------------------------------------------------------------- - -WX_DECLARE_LIST(wxListItemData, wxListItemDataList); - -class wxListLineData -{ -public: - // the list of subitems: only may have more than one item in report mode - wxListItemDataList m_items; - - // this is not used in report view - struct GeometryInfo - { - // total item rect - wxRect m_rectAll; - - // label only - wxRect m_rectLabel; - - // icon only - wxRect m_rectIcon; - - // the part to be highlighted - wxRect m_rectHighlight; - - // extend all our rects to be centered inside the one of given width - void ExtendWidth(wxCoord w) - { - wxASSERT_MSG( m_rectAll.width <= w, - wxT("width can only be increased") ); - - m_rectAll.width = w; - m_rectLabel.x = m_rectAll.x + (w - m_rectLabel.width) / 2; - m_rectIcon.x = m_rectAll.x + (w - m_rectIcon.width) / 2; - m_rectHighlight.x = m_rectAll.x + (w - m_rectHighlight.width) / 2; - } - } - *m_gi; - - // is this item selected? [NB: not used in virtual mode] - bool m_highlighted; - - bool m_checked; - - // back pointer to the list ctrl - wxListMainWindow *m_owner; - -public: - wxListLineData(wxListMainWindow *owner); - - ~wxListLineData() - { - WX_CLEAR_LIST(wxListItemDataList, m_items); - delete m_gi; - } - - // called by the owner when it toggles report view - void SetReportView(bool inReportView) - { - // we only need m_gi when we're not in report view so update as needed - if ( inReportView ) - { - delete m_gi; - m_gi = NULL; - } - else - { - m_gi = new GeometryInfo; - } - } - - // are we in report mode? - inline bool InReportView() const; - - // are we in virtual report mode? - inline bool IsVirtual() const; - - // these 2 methods shouldn't be called for report view controls, in that - // case we determine our position/size ourselves - - // calculate the size of the line - void CalculateSize( wxDC *dc, int spacing ); - - // remember the position this line appears at - void SetPosition( int x, int y, int spacing ); - - // wxListCtrl API - - void SetImage( int image ) { SetImage(0, image); } - int GetImage() const { return GetImage(0); } - void SetImage( int index, int image ); - int GetImage( int index ) const; - - void Check(bool check) { m_checked = check; } - bool IsChecked() { return m_checked; } - - bool HasImage() const { return GetImage() != -1; } - bool HasText() const { return !GetText(0).empty(); } - - void SetItem( int index, const wxListItem &info ); - void GetItem( int index, wxListItem &info ); - - wxString GetText(int index) const; - void SetText( int index, const wxString& s ); - - wxListItemAttr *GetAttr() const; - void SetAttr(wxListItemAttr *attr); - - // return true if the highlighting really changed - bool Highlight( bool on ); - - void ReverseHighlight(); - - bool IsHighlighted() const - { - wxASSERT_MSG( !IsVirtual(), wxT("unexpected call to IsHighlighted") ); - - return m_highlighted; - } - - // draw the line on the given DC in icon/list mode - void Draw( wxDC *dc, bool current ); - - // the same in report mode: it needs more parameters as we don't store - // everything in the item in report mode - void DrawInReportMode( wxDC *dc, - const wxRect& rect, - const wxRect& rectHL, - bool highlighted, - bool current ); - -private: - // set the line to contain num items (only can be > 1 in report mode) - void InitItems( int num ); - - // get the mode (i.e. style) of the list control - inline int GetMode() const; - - // Apply this item attributes to the given DC: set the text font and colour - // and also erase the background appropriately. - void ApplyAttributes(wxDC *dc, - const wxRect& rectHL, - bool highlighted, - bool current); - - // draw the text on the DC with the correct justification; also add an - // ellipsis if the text is too large to fit in the current width - void DrawTextFormatted(wxDC *dc, - const wxString &text, - int col, - int x, - int yMid, // this is middle, not top, of the text - int width); -}; - -WX_DECLARE_OBJARRAY(wxListLineData, wxListLineDataArray); - -//----------------------------------------------------------------------------- -// wxListHeaderWindow (internal) -//----------------------------------------------------------------------------- - -class wxListHeaderWindow : public wxWindow -{ -protected: - wxListMainWindow *m_owner; - const wxCursor *m_currentCursor; - wxCursor *m_resizeCursor; - bool m_isDragging; - - // column being resized or -1 - int m_column; - - // divider line position in logical (unscrolled) coords - int m_currentX; - - // minimal position beyond which the divider line - // can't be dragged in logical coords - int m_minX; - -public: - wxListHeaderWindow(); - - // We provide only Create(), not the ctor, because we need to create the - // C++ object before creating the window, see the explanations in - // CreateOrDestroyHeaderWindowAsNeeded() - bool Create( wxWindow *win, - wxWindowID id, - wxListMainWindow *owner, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - long style = 0, - const wxString &name = wxT("wxlistctrlcolumntitles") ); - - virtual ~wxListHeaderWindow(); - - // We never need focus as we don't have any keyboard interface. - virtual bool AcceptsFocus() const wxOVERRIDE { return false; } - - void DrawCurrent(); - void AdjustDC( wxDC& dc ); - - void OnPaint( wxPaintEvent &event ); - void OnMouse( wxMouseEvent &event ); - - // needs refresh - bool m_dirty; - - // Update main window's column later - bool m_sendSetColumnWidth; - int m_colToSend; - int m_widthToSend; - - virtual void OnInternalIdle() wxOVERRIDE; - -private: - // common part of all ctors - void Init(); - - // generate and process the list event of the given type, return true if - // it wasn't vetoed, i.e. if we should proceed - bool SendListEvent(wxEventType type, const wxPoint& pos); - - wxDECLARE_EVENT_TABLE(); -}; - -//----------------------------------------------------------------------------- -// wxListRenameTimer (internal) -//----------------------------------------------------------------------------- - -class wxListRenameTimer: public wxTimer -{ -private: - wxListMainWindow *m_owner; - -public: - wxListRenameTimer( wxListMainWindow *owner ); - void Notify() wxOVERRIDE; -}; - -//----------------------------------------------------------------------------- -// wxListFindTimer (internal) -//----------------------------------------------------------------------------- - -class wxListFindTimer: public wxTimer -{ -public: - // reset the current prefix after half a second of inactivity - enum { DELAY = 500 }; - - wxListFindTimer( wxListMainWindow *owner ) - : m_owner(owner) - { - } - - virtual void Notify() wxOVERRIDE; - -private: - wxListMainWindow *m_owner; -}; - -//----------------------------------------------------------------------------- -// wxListTextCtrlWrapper: wraps a wxTextCtrl to make it work for inline editing -//----------------------------------------------------------------------------- - -class wxListTextCtrlWrapper : public wxEvtHandler -{ -public: - // NB: text must be a valid object but not Create()d yet - wxListTextCtrlWrapper(wxListMainWindow *owner, - wxTextCtrl *text, - size_t itemEdit); - - wxTextCtrl *GetText() const { return m_text; } - - // Check if the given key event should stop editing and return true if it - // does or false otherwise. - bool CheckForEndEditKey(const wxKeyEvent& event); - - // Different reasons for calling EndEdit(): - // - // It was called because: - enum EndReason - { - End_Accept, // user has accepted the changes. - End_Discard, // user has cancelled editing. - End_Destroy // the entire control is being destroyed. - }; - - void EndEdit(EndReason reason); - -protected: - void OnChar( wxKeyEvent &event ); - void OnKeyUp( wxKeyEvent &event ); - void OnKillFocus( wxFocusEvent &event ); - - bool AcceptChanges(); - void Finish( bool setfocus ); - -private: - wxListMainWindow *m_owner; - wxTextCtrl *m_text; - wxString m_startValue; - size_t m_itemEdited; - bool m_aboutToFinish; - - wxDECLARE_EVENT_TABLE(); -}; - -//----------------------------------------------------------------------------- -// wxListMainWindow (internal) -//----------------------------------------------------------------------------- - -WX_DECLARE_LIST(wxListHeaderData, wxListHeaderDataList); - -class wxListMainWindow : public wxWindow -{ -public: - wxListMainWindow(); - wxListMainWindow( wxWindow *parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size ); - - virtual ~wxListMainWindow(); - - // called by the main control when its mode changes - void SetReportView(bool inReportView); - - // helper to simplify testing for wxLC_XXX flags - bool HasFlag(int flag) const { return m_parent->HasFlag(flag); } - - // return true if this is a virtual list control - bool IsVirtual() const { return HasFlag(wxLC_VIRTUAL); } - - // return true if the control is in report mode - bool InReportView() const { return HasFlag(wxLC_REPORT); } - - // return true if we are in single selection mode, false if multi sel - bool IsSingleSel() const { return HasFlag(wxLC_SINGLE_SEL); } - - // do we have a header window? - bool HasHeader() const - { return InReportView() && !HasFlag(wxLC_NO_HEADER); } - - void HighlightAll( bool on ); - - // all these functions only do something if the line is currently visible - - // change the line "selected" state, return true if it really changed - bool HighlightLine( size_t line, bool highlight = true); - - // as HighlightLine() but do it for the range of lines: this is incredibly - // more efficient for virtual list controls! - // - // NB: unlike HighlightLine() this one does refresh the lines on screen - void HighlightLines( size_t lineFrom, size_t lineTo, bool on = true ); - - // toggle the line state and refresh it - void ReverseHighlight( size_t line ) - { HighlightLine(line, !IsHighlighted(line)); RefreshLine(line); } - - // return true if the line is highlighted - bool IsHighlighted(size_t line) const; - - // refresh one or several lines at once - void RefreshLine( size_t line ); - void RefreshLines( size_t lineFrom, size_t lineTo ); - - // refresh all selected items - void RefreshSelected(); - - // refresh all lines below the given one: the difference with - // RefreshLines() is that the index here might not be a valid one (happens - // when the last line is deleted) - void RefreshAfter( size_t lineFrom ); - - // the methods which are forwarded to wxListLineData itself in list/icon - // modes but are here because the lines don't store their positions in the - // report mode - - // get the bound rect for the entire line - wxRect GetLineRect(size_t line) const; - - // get the bound rect of the label - wxRect GetLineLabelRect(size_t line) const; - - // get the bound rect of the items icon (only may be called if we do have - // an icon!) - wxRect GetLineIconRect(size_t line) const; - - // get the rect to be highlighted when the item has focus - wxRect GetLineHighlightRect(size_t line) const; - - // get the size of the total line rect - wxSize GetLineSize(size_t line) const - { return GetLineRect(line).GetSize(); } - - // return the hit code for the corresponding position (in this line) - long HitTestLine(size_t line, int x, int y) const; - - // bring the selected item into view, scrolling to it if necessary - void MoveToItem(size_t item); - - bool ScrollList( int WXUNUSED(dx), int dy ); - - // bring the current item into view - void MoveToFocus() { MoveToItem(m_current); } - - // start editing the label of the given item - wxTextCtrl *EditLabel(long item, - wxClassInfo* textControlClass = wxCLASSINFO(wxTextCtrl)); - - bool EndEditLabel(bool cancel); - - wxTextCtrl *GetEditControl() const - { - return m_textctrlWrapper ? m_textctrlWrapper->GetText() : NULL; - } - - void ResetTextControl(wxTextCtrl *text) - { - delete text; - m_textctrlWrapper = NULL; - } - - void OnRenameTimer(); - bool OnRenameAccept(size_t itemEdit, const wxString& value); - void OnRenameCancelled(size_t itemEdit); - - void OnFindTimer(); - // set whether or not to ring the find bell - // (does nothing on MSW - bell is always rung) - void EnableBellOnNoMatch( bool on ); - - void OnMouse( wxMouseEvent &event ); - - // called to switch the selection from the current item to newCurrent, - void OnArrowChar( size_t newCurrent, const wxKeyEvent& event ); - - void OnCharHook( wxKeyEvent &event ); - void OnChar( wxKeyEvent &event ); - void OnKeyDown( wxKeyEvent &event ); - void OnKeyUp( wxKeyEvent &event ); - void OnSetFocus( wxFocusEvent &event ); - void OnKillFocus( wxFocusEvent &event ); - void OnScroll( wxScrollWinEvent& event ); - - void OnPaint( wxPaintEvent &event ); - - void OnChildFocus(wxChildFocusEvent& event); - - void DrawImage( int index, wxDC *dc, int x, int y ); - void GetImageSize( int index, int &width, int &height ) const; - - void SetImageList( wxImageList *imageList, int which ); - void SetItemSpacing( int spacing, bool isSmall = false ); - int GetItemSpacing( bool isSmall = false ); - - void SetColumn( int col, const wxListItem &item ); - void SetColumnWidth( int col, int width ); - void GetColumn( int col, wxListItem &item ) const; - int GetColumnWidth( int col ) const; - int GetColumnCount() const { return m_columns.GetCount(); } - - // returns the sum of the heights of all columns - int GetHeaderWidth() const; - - int GetCountPerPage() const; - - void SetItem( wxListItem &item ); - void GetItem( wxListItem &item ) const; - void SetItemState( long item, long state, long stateMask ); - void SetItemStateAll( long state, long stateMask ); - int GetItemState( long item, long stateMask ) const; - bool GetItemRect( long item, wxRect &rect ) const - { - return GetSubItemRect(item, wxLIST_GETSUBITEMRECT_WHOLEITEM, rect); - } - bool GetSubItemRect( long item, long subItem, wxRect& rect ) const; - wxRect GetViewRect() const; - bool GetItemPosition( long item, wxPoint& pos ) const; - int GetSelectedItemCount() const; - - bool HasCheckboxes() const; - bool EnableCheckboxes(bool enable = true); - bool IsItemChecked(long item) const; - void CheckItem(long item, bool check); - - wxString GetItemText(long item, int col = 0) const - { - wxListItem info; - info.m_mask = wxLIST_MASK_TEXT; - info.m_itemId = item; - info.m_col = col; - GetItem( info ); - return info.m_text; - } - - void SetItemText(long item, const wxString& value) - { - wxListItem info; - info.m_mask = wxLIST_MASK_TEXT; - info.m_itemId = item; - info.m_text = value; - SetItem( info ); - } - - wxImageList* GetSmallImageList() const - { return m_small_image_list; } - - // set the scrollbars and update the positions of the items - void RecalculatePositions(bool noRefresh = false); - - // refresh the window and the header - void RefreshAll(); - - long GetNextItem( long item, int geometry, int state ) const; - void DeleteItem( long index ); - void DeleteAllItems(); - void DeleteColumn( int col ); - void DeleteEverything(); - void EnsureVisible( long index ); - long FindItem( long start, const wxString& str, bool partial = false ); - long FindItem( long start, wxUIntPtr data); - long FindItem( const wxPoint& pt ); - long HitTest( int x, int y, int &flags ) const; - void InsertItem( wxListItem &item ); - long InsertColumn( long col, const wxListItem &item ); - int GetItemWidthWithImage(wxListItem * item); - void SortItems( wxListCtrlCompare fn, wxIntPtr data ); - - size_t GetItemCount() const; - bool IsEmpty() const { return GetItemCount() == 0; } - void SetItemCount(long count); - - // change the current (== focused) item, send a notification event - void ChangeCurrent(size_t current); - void ResetCurrent() { ChangeCurrent((size_t)-1); } - bool HasCurrent() const { return m_current != (size_t)-1; } - - // send out a wxListEvent - void SendNotify( size_t line, - wxEventType command, - const wxPoint& point = wxDefaultPosition ); - - // override base class virtual to reset m_lineHeight when the font changes - virtual bool SetFont(const wxFont& font) wxOVERRIDE - { - if ( !wxWindow::SetFont(font) ) - return false; - - m_lineHeight = 0; - - return true; - } - - // these are for wxListLineData usage only - - // get the backpointer to the list ctrl - wxGenericListCtrl *GetListCtrl() const - { - return wxStaticCast(GetParent(), wxGenericListCtrl); - } - - // get the height of all lines (assuming they all do have the same height) - wxCoord GetLineHeight() const; - - // get the y position of the given line (only for report view) - wxCoord GetLineY(size_t line) const; - - // get the brush to use for the item highlighting - wxBrush *GetHighlightBrush() const - { - return m_hasFocus ? m_highlightBrush : m_highlightUnfocusedBrush; - } - - bool HasFocus() const wxOVERRIDE - { - return m_hasFocus; - } - -protected: - // the array of all line objects for a non virtual list control (for the - // virtual list control we only ever use m_lines[0]) - wxListLineDataArray m_lines; - - // the list of column objects - wxListHeaderDataList m_columns; - - // currently focused item or -1 - size_t m_current; - - // the number of lines per page - int m_linesPerPage; - - // this flag is set when something which should result in the window - // redrawing happens (i.e. an item was added or deleted, or its appearance - // changed) and OnPaint() doesn't redraw the window while it is set which - // allows to minimize the number of repaintings when a lot of items are - // being added. The real repainting occurs only after the next OnIdle() - // call - bool m_dirty; - - wxColour *m_highlightColour; - wxImageList *m_small_image_list; - wxImageList *m_normal_image_list; - int m_small_spacing; - int m_normal_spacing; - bool m_hasFocus; - - bool m_lastOnSame; - wxTimer *m_renameTimer; - - // incremental search data - wxString m_findPrefix; - wxTimer *m_findTimer; - // This flag is set to 0 if the bell is disabled, 1 if it is enabled and -1 - // if it is globally enabled but has been temporarily disabled because we - // had already beeped for this particular search. - int m_findBell; - - bool m_isCreated; - int m_dragCount; - wxPoint m_dragStart; - ColWidthArray m_aColWidths; - - // for double click logic - size_t m_lineLastClicked, - m_lineBeforeLastClicked, - m_lineSelectSingleOnUp; - - bool m_hasCheckboxes; - -protected: - wxWindow *GetMainWindowOfCompositeControl() wxOVERRIDE { return GetParent(); } - - // the total count of items in a virtual list control - size_t m_countVirt; - - // the object maintaining the items selection state, only used in virtual - // controls - wxSelectionStore m_selStore; - - // common part of all ctors - void Init(); - - // get the line data for the given index - wxListLineData *GetLine(size_t n) const - { - wxASSERT_MSG( n != (size_t)-1, wxT("invalid line index") ); - - if ( IsVirtual() ) - { - wxConstCast(this, wxListMainWindow)->CacheLineData(n); - n = 0; - } - - return &m_lines[n]; - } - - // get a dummy line which can be used for geometry calculations and such: - // you must use GetLine() if you want to really draw the line - wxListLineData *GetDummyLine() const; - - // cache the line data of the n-th line in m_lines[0] - void CacheLineData(size_t line); - - // get the range of visible lines - void GetVisibleLinesRange(size_t *from, size_t *to); - - // force us to recalculate the range of visible lines - void ResetVisibleLinesRange() { m_lineFrom = (size_t)-1; } - - // find the first item starting with the given prefix after the given item - size_t PrefixFindItem(size_t item, const wxString& prefix) const; - - // get the colour to be used for drawing the rules - wxColour GetRuleColour() const - { - return wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT); - } - -private: - // initialize the current item if needed - void UpdateCurrent(); - - // delete all items but don't refresh: called from dtor - void DoDeleteAllItems(); - - // Compute the minimal width needed to fully display the column header. - int ComputeMinHeaderWidth(const wxListHeaderData* header) const; - - // Check if the given point is inside the checkbox of this item. - // - // Always returns false if there are no checkboxes. - bool IsInsideCheckbox(long item, int x, int y); - - // the height of one line using the current font - wxCoord m_lineHeight; - - // the total header width or 0 if not calculated yet - wxCoord m_headerWidth; - - // the first and last lines being shown on screen right now (inclusive), - // both may be -1 if they must be calculated so never access them directly: - // use GetVisibleLinesRange() above instead - size_t m_lineFrom, - m_lineTo; - - // the brushes to use for item highlighting when we do/don't have focus - wxBrush *m_highlightBrush, - *m_highlightUnfocusedBrush; - - // wrapper around the text control currently used for in place editing or - // NULL if no item is being edited - wxListTextCtrlWrapper *m_textctrlWrapper; - - - wxDECLARE_EVENT_TABLE(); - - friend class wxGenericListCtrl; - friend class wxListCtrlMaxWidthCalculator; -}; - -#endif // wxUSE_LISTCTRL -#endif // _WX_GENERIC_LISTCTRL_PRIVATE_H_ diff --git a/Externals/wxWidgets3/include/wx/generic/private/markuptext.h b/Externals/wxWidgets3/include/wx/generic/private/markuptext.h deleted file mode 100644 index 1d9569229e..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/private/markuptext.h +++ /dev/null @@ -1,77 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/private/markuptext.h -// Purpose: Generic wxMarkupText class for managing text with markup. -// Author: Vadim Zeitlin -// Created: 2011-02-21 -// Copyright: (c) 2011 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GENERIC_PRIVATE_MARKUPTEXT_H_ -#define _WX_GENERIC_PRIVATE_MARKUPTEXT_H_ - -#include "wx/defs.h" - -class WXDLLIMPEXP_FWD_CORE wxDC; -class WXDLLIMPEXP_FWD_CORE wxRect; - -// ---------------------------------------------------------------------------- -// wxMarkupText: allows to measure and draw the text containing markup. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxMarkupText -{ -public: - // Constants for Render() flags. - enum - { - Render_Default = 0, // Don't show mnemonics visually. - Render_ShowAccels = 1 // Underline mnemonics. - }; - - - // Initialize with the given string containing markup (which is supposed to - // be valid, the caller must check for it before constructing this object). - // - // Notice that the usual rules for mnemonics apply to the markup text: if - // it contains any '&' characters they must be escaped by doubling them, - // otherwise they indicate that the next character is the mnemonic for this - // field. - // - // TODO-MULTILINE-MARKUP: Currently only single line labels are supported, - // search for other occurrences of this comment to find the places which - // need to be updated to support multiline labels with markup. - wxMarkupText(const wxString& markup) - : m_markup(markup) - { - } - - // Default copy ctor, assignment operator and dtor are ok. - - // Update the markup string. - // - // The same rules for mnemonics as in the ctor apply to this string. - void SetMarkup(const wxString& markup) { m_markup = markup; } - - - // Return the width and height required by the given string and optionally - // the height of the visible part above the baseline (i.e. ascent minus - // internal leading). - // - // The font currently selected into the DC is used for measuring (notice - // that it is changed by this function but normally -- i.e. if markup is - // valid -- restored to its original value when it returns). - wxSize Measure(wxDC& dc, int *visibleHeight = NULL) const; - - // Render the markup string into the given DC in the specified rectangle. - // - // Notice that while the function uses the provided rectangle for alignment - // (it centers the text in it), no clipping is done by it so use Measure() - // and set the clipping region before rendering if necessary. - void Render(wxDC& dc, const wxRect& rect, int flags); - -private: - wxString m_markup; -}; - -#endif // _WX_GENERIC_PRIVATE_MARKUPTEXT_H_ diff --git a/Externals/wxWidgets3/include/wx/generic/private/notifmsg.h b/Externals/wxWidgets3/include/wx/generic/private/notifmsg.h deleted file mode 100644 index 6c5fd90874..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/private/notifmsg.h +++ /dev/null @@ -1,52 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/private/notifmsg.h -// Purpose: wxGenericNotificationMessage declarations -// Author: Tobias Taschner -// Created: 2015-08-04 -// Copyright: (c) 2015 wxWidgets development team -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GENERIC_PRIVATE_NOTIFMSG_H_ -#define _WX_GENERIC_PRIVATE_NOTIFMSG_H_ - -#include "wx/private/notifmsg.h" - -class wxGenericNotificationMessageImpl : public wxNotificationMessageImpl -{ -public: - wxGenericNotificationMessageImpl(wxNotificationMessageBase* notification); - - virtual ~wxGenericNotificationMessageImpl(); - - virtual bool Show(int timeout) wxOVERRIDE; - - virtual bool Close() wxOVERRIDE; - - virtual void SetTitle(const wxString& title) wxOVERRIDE; - - virtual void SetMessage(const wxString& message) wxOVERRIDE; - - virtual void SetParent(wxWindow *parent) wxOVERRIDE; - - virtual void SetFlags(int flags) wxOVERRIDE; - - virtual void SetIcon(const wxIcon& icon) wxOVERRIDE; - - virtual bool AddAction(wxWindowID actionid, const wxString &label) wxOVERRIDE; - - // get/set the default timeout (used if Timeout_Auto is specified) - static int GetDefaultTimeout() { return ms_timeout; } - static void SetDefaultTimeout(int timeout); - -private: - // default timeout - static int ms_timeout; - - // notification message is represented by a frame in this implementation - class wxNotificationMessageWindow *m_window; - - wxDECLARE_NO_COPY_CLASS(wxGenericNotificationMessageImpl); -}; - -#endif // _WX_GENERIC_PRIVATE_NOTIFMSG_H_ diff --git a/Externals/wxWidgets3/include/wx/generic/private/richtooltip.h b/Externals/wxWidgets3/include/wx/generic/private/richtooltip.h deleted file mode 100644 index ad356f51f8..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/private/richtooltip.h +++ /dev/null @@ -1,64 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/private/richtooltip.h -// Purpose: wxRichToolTipGenericImpl declaration. -// Author: Vadim Zeitlin -// Created: 2011-10-18 -// Copyright: (c) 2011 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GENERIC_PRIVATE_RICHTOOLTIP_H_ -#define _WX_GENERIC_PRIVATE_RICHTOOLTIP_H_ - -#include "wx/icon.h" -#include "wx/colour.h" - -// ---------------------------------------------------------------------------- -// wxRichToolTipGenericImpl: defines generic wxRichToolTip implementation. -// ---------------------------------------------------------------------------- - -class wxRichToolTipGenericImpl : public wxRichToolTipImpl -{ -public: - wxRichToolTipGenericImpl(const wxString& title, const wxString& message) : - m_title(title), - m_message(message) - { - m_tipKind = wxTipKind_Auto; - - // This is pretty arbitrary, we could follow MSW and use some multiple - // of double-click time here. - m_timeout = 5000; - m_delay = 0; - } - - virtual void SetBackgroundColour(const wxColour& col, - const wxColour& colEnd); - virtual void SetCustomIcon(const wxIcon& icon); - virtual void SetStandardIcon(int icon); - virtual void SetTimeout(unsigned milliseconds, - unsigned millisecondsDelay = 0); - virtual void SetTipKind(wxTipKind tipKind); - virtual void SetTitleFont(const wxFont& font); - - virtual void ShowFor(wxWindow* win, const wxRect* rect = NULL); - -protected: - wxString m_title, - m_message; - -private: - wxIcon m_icon; - - wxColour m_colStart, - m_colEnd; - - unsigned m_timeout, - m_delay; - - wxTipKind m_tipKind; - - wxFont m_titleFont; -}; - -#endif // _WX_GENERIC_PRIVATE_RICHTOOLTIP_H_ diff --git a/Externals/wxWidgets3/include/wx/generic/private/textmeasure.h b/Externals/wxWidgets3/include/wx/generic/private/textmeasure.h deleted file mode 100644 index 2b31d02831..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/private/textmeasure.h +++ /dev/null @@ -1,39 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/private/textmeasure.h -// Purpose: Generic wxTextMeasure declaration. -// Author: Vadim Zeitlin -// Created: 2012-10-17 -// Copyright: (c) 1997-2012 wxWidgets team -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GENERIC_PRIVATE_TEXTMEASURE_H_ -#define _WX_GENERIC_PRIVATE_TEXTMEASURE_H_ - -// ---------------------------------------------------------------------------- -// wxTextMeasure for the platforms without native support. -// ---------------------------------------------------------------------------- - -class wxTextMeasure : public wxTextMeasureBase -{ -public: - wxEXPLICIT wxTextMeasure(const wxDC *dc, const wxFont *font = NULL) - : wxTextMeasureBase(dc, font) {} - wxEXPLICIT wxTextMeasure(const wxWindow *win, const wxFont *font = NULL) - : wxTextMeasureBase(win, font) {} - -protected: - virtual void DoGetTextExtent(const wxString& string, - wxCoord *width, - wxCoord *height, - wxCoord *descent = NULL, - wxCoord *externalLeading = NULL); - - virtual bool DoGetPartialTextExtents(const wxString& text, - wxArrayInt& widths, - double scaleX); - - wxDECLARE_NO_COPY_CLASS(wxTextMeasure); -}; - -#endif // _WX_GENERIC_PRIVATE_TEXTMEASURE_H_ diff --git a/Externals/wxWidgets3/include/wx/generic/private/timer.h b/Externals/wxWidgets3/include/wx/generic/private/timer.h deleted file mode 100644 index 6d96389ce8..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/private/timer.h +++ /dev/null @@ -1,45 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/private/timer.h -// Purpose: Generic implementation of wxTimer class -// Author: Vaclav Slavik -// Copyright: (c) Vaclav Slavik -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GENERIC_PRIVATE_TIMER_H_ -#define _WX_GENERIC_PRIVATE_TIMER_H_ - -#if wxUSE_TIMER - -#include "wx/private/timer.h" - -//----------------------------------------------------------------------------- -// wxTimer -//----------------------------------------------------------------------------- - -class wxTimerDesc; - -class WXDLLIMPEXP_BASE wxGenericTimerImpl : public wxTimerImpl -{ -public: - wxGenericTimerImpl(wxTimer* timer) : wxTimerImpl(timer) { Init(); } - virtual ~wxGenericTimerImpl(); - - virtual bool Start(int millisecs = -1, bool oneShot = false); - virtual void Stop(); - - virtual bool IsRunning() const; - - // implementation - static void NotifyTimers(); - -protected: - void Init(); - -private: - wxTimerDesc *m_desc; -}; - -#endif // wxUSE_TIMER - -#endif // _WX_GENERIC_PRIVATE_TIMER_H_ diff --git a/Externals/wxWidgets3/include/wx/generic/private/widthcalc.h b/Externals/wxWidgets3/include/wx/generic/private/widthcalc.h deleted file mode 100644 index cacfbf85f0..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/private/widthcalc.h +++ /dev/null @@ -1,123 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/private/widthcalc.h -// Purpose: wxMaxWidthCalculatorBase helper class. -// Author: Václav Slavík, Kinaou Hervé -// Copyright: (c) 2015 wxWidgets team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GENERIC_PRIVATE_WIDTHCALC_H_ -#define _WX_GENERIC_PRIVATE_WIDTHCALC_H_ - -#include "wx/defs.h" - -#if wxUSE_DATAVIEWCTRL || wxUSE_LISTCTRL - -#include "wx/log.h" -#include "wx/timer.h" - -// ---------------------------------------------------------------------------- -// wxMaxWidthCalculatorBase: base class for calculating max column width -// ---------------------------------------------------------------------------- - -class wxMaxWidthCalculatorBase -{ -public: - // column of which calculate the width - explicit wxMaxWidthCalculatorBase(size_t column) - : m_column(column), - m_width(0) - { - } - - void UpdateWithWidth(int width) - { - m_width = wxMax(m_width, width); - } - - // Update the max with for the expected row - virtual void UpdateWithRow(int row) = 0; - - int GetMaxWidth() const { return m_width; } - size_t GetColumn() const { return m_column; } - - void - ComputeBestColumnWidth(size_t count, - size_t first_visible, - size_t last_visible) - { - // The code below deserves some explanation. For very large controls, we - // simply can't afford to calculate sizes for all items, it takes too - // long. So the best we can do is to check the first and the last N/2 - // items in the control for some sufficiently large N and calculate best - // sizes from that. That can result in the calculated best width being too - // small for some outliers, but it's better to get slightly imperfect - // result than to wait several seconds after every update. To avoid highly - // visible miscalculations, we also include all currently visible items - // no matter what. Finally, the value of N is determined dynamically by - // measuring how much time we spent on the determining item widths so far. - -#if wxUSE_STOPWATCH - size_t top_part_end = count; - static const long CALC_TIMEOUT = 20/*ms*/; - // don't call wxStopWatch::Time() too often - static const unsigned CALC_CHECK_FREQ = 100; - wxStopWatch timer; -#else - // use some hard-coded limit, that's the best we can do without timer - size_t top_part_end = wxMin(500, count); -#endif // wxUSE_STOPWATCH/!wxUSE_STOPWATCH - - size_t row = 0; - - for ( row = 0; row < top_part_end; row++ ) - { -#if wxUSE_STOPWATCH - if ( row % CALC_CHECK_FREQ == CALC_CHECK_FREQ-1 && - timer.Time() > CALC_TIMEOUT ) - break; -#endif // wxUSE_STOPWATCH - UpdateWithRow(row); - } - - // row is the first unmeasured item now; that's our value of N/2 - if ( row < count ) - { - top_part_end = row; - - // add bottom N/2 items now: - const size_t bottom_part_start = wxMax(row, count - row); - for ( row = bottom_part_start; row < count; row++ ) - { - UpdateWithRow(row); - } - - // finally, include currently visible items in the calculation: - first_visible = wxMax(first_visible, top_part_end); - last_visible = wxMin(bottom_part_start, last_visible); - - for ( row = first_visible; row < last_visible; row++ ) - { - UpdateWithRow(row); - } - - wxLogTrace("items container", - "determined best size from %zu top, %zu bottom " - "plus %zu more visible items out of %zu total", - top_part_end, - count - bottom_part_start, - last_visible - first_visible, - count); - } - } - -private: - const size_t m_column; - int m_width; - - wxDECLARE_NO_COPY_CLASS(wxMaxWidthCalculatorBase); -}; - -#endif // wxUSE_DATAVIEWCTRL || wxUSE_LISTCTRL - -#endif // _WX_GENERIC_PRIVATE_WIDTHCALC_H_ diff --git a/Externals/wxWidgets3/include/wx/generic/prntdlgg.h b/Externals/wxWidgets3/include/wx/generic/prntdlgg.h deleted file mode 100644 index 7c4cd1b7fe..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/prntdlgg.h +++ /dev/null @@ -1,256 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/prntdlgg.h -// Purpose: wxGenericPrintDialog, wxGenericPrintSetupDialog, -// wxGenericPageSetupDialog -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __PRINTDLGH_G_ -#define __PRINTDLGH_G_ - -#include "wx/defs.h" - -#if wxUSE_PRINTING_ARCHITECTURE - -#include "wx/dialog.h" -#include "wx/cmndata.h" -#include "wx/prntbase.h" -#include "wx/printdlg.h" -#include "wx/listctrl.h" - -#include "wx/dc.h" -#if wxUSE_POSTSCRIPT - #include "wx/dcps.h" -#endif - -class WXDLLIMPEXP_FWD_CORE wxTextCtrl; -class WXDLLIMPEXP_FWD_CORE wxButton; -class WXDLLIMPEXP_FWD_CORE wxCheckBox; -class WXDLLIMPEXP_FWD_CORE wxComboBox; -class WXDLLIMPEXP_FWD_CORE wxStaticText; -class WXDLLIMPEXP_FWD_CORE wxRadioBox; -class WXDLLIMPEXP_FWD_CORE wxPageSetupDialogData; - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -// This is not clear why all these enums start with 10 or 30 but do not change it -// without good reason to avoid some subtle backwards compatibility breakage - -enum -{ - wxPRINTID_STATIC = 10, - wxPRINTID_RANGE, - wxPRINTID_FROM, - wxPRINTID_TO, - wxPRINTID_COPIES, - wxPRINTID_PRINTTOFILE, - wxPRINTID_SETUP -}; - -enum -{ - wxPRINTID_LEFTMARGIN = 30, - wxPRINTID_RIGHTMARGIN, - wxPRINTID_TOPMARGIN, - wxPRINTID_BOTTOMMARGIN -}; - -enum -{ - wxPRINTID_PRINTCOLOUR = 10, - wxPRINTID_ORIENTATION, - wxPRINTID_COMMAND, - wxPRINTID_OPTIONS, - wxPRINTID_PAPERSIZE, - wxPRINTID_PRINTER -}; - -#if wxUSE_POSTSCRIPT - -//---------------------------------------------------------------------------- -// wxPostScriptNativeData -//---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxPostScriptPrintNativeData: public wxPrintNativeDataBase -{ -public: - wxPostScriptPrintNativeData(); - virtual ~wxPostScriptPrintNativeData(); - - virtual bool TransferTo( wxPrintData &data ) wxOVERRIDE; - virtual bool TransferFrom( const wxPrintData &data ) wxOVERRIDE; - - virtual bool Ok() const wxOVERRIDE { return IsOk(); } - virtual bool IsOk() const wxOVERRIDE { return true; } - - const wxString& GetPrinterCommand() const { return m_printerCommand; } - const wxString& GetPrinterOptions() const { return m_printerOptions; } - const wxString& GetPreviewCommand() const { return m_previewCommand; } - const wxString& GetFontMetricPath() const { return m_afmPath; } - double GetPrinterScaleX() const { return m_printerScaleX; } - double GetPrinterScaleY() const { return m_printerScaleY; } - long GetPrinterTranslateX() const { return m_printerTranslateX; } - long GetPrinterTranslateY() const { return m_printerTranslateY; } - - void SetPrinterCommand(const wxString& command) { m_printerCommand = command; } - void SetPrinterOptions(const wxString& options) { m_printerOptions = options; } - void SetPreviewCommand(const wxString& command) { m_previewCommand = command; } - void SetFontMetricPath(const wxString& path) { m_afmPath = path; } - void SetPrinterScaleX(double x) { m_printerScaleX = x; } - void SetPrinterScaleY(double y) { m_printerScaleY = y; } - void SetPrinterScaling(double x, double y) { m_printerScaleX = x; m_printerScaleY = y; } - void SetPrinterTranslateX(long x) { m_printerTranslateX = x; } - void SetPrinterTranslateY(long y) { m_printerTranslateY = y; } - void SetPrinterTranslation(long x, long y) { m_printerTranslateX = x; m_printerTranslateY = y; } - -#if wxUSE_STREAMS - wxOutputStream *GetOutputStream() { return m_outputStream; } - void SetOutputStream( wxOutputStream *output ) { m_outputStream = output; } -#endif - -private: - wxString m_printerCommand; - wxString m_previewCommand; - wxString m_printerOptions; - wxString m_afmPath; - double m_printerScaleX; - double m_printerScaleY; - long m_printerTranslateX; - long m_printerTranslateY; -#if wxUSE_STREAMS - wxOutputStream *m_outputStream; -#endif - -private: - wxDECLARE_DYNAMIC_CLASS(wxPostScriptPrintNativeData); -}; - -// ---------------------------------------------------------------------------- -// Simulated Print and Print Setup dialogs for non-Windows platforms (and -// Windows using PostScript print/preview) -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxGenericPrintDialog : public wxPrintDialogBase -{ -public: - wxGenericPrintDialog(wxWindow *parent, - wxPrintDialogData* data = NULL); - wxGenericPrintDialog(wxWindow *parent, wxPrintData* data); - - virtual ~wxGenericPrintDialog(); - - void OnSetup(wxCommandEvent& event); - void OnRange(wxCommandEvent& event); - void OnOK(wxCommandEvent& event); - - virtual bool TransferDataFromWindow() wxOVERRIDE; - virtual bool TransferDataToWindow() wxOVERRIDE; - - virtual int ShowModal() wxOVERRIDE; - - wxPrintData& GetPrintData() wxOVERRIDE - { return m_printDialogData.GetPrintData(); } - - wxPrintDialogData& GetPrintDialogData() wxOVERRIDE { return m_printDialogData; } - wxDC *GetPrintDC() wxOVERRIDE; - -public: -// wxStaticText* m_printerMessage; - wxButton* m_setupButton; -// wxButton* m_helpButton; - wxRadioBox* m_rangeRadioBox; - wxTextCtrl* m_fromText; - wxTextCtrl* m_toText; - wxTextCtrl* m_noCopiesText; - wxCheckBox* m_printToFileCheckBox; -// wxCheckBox* m_collateCopiesCheckBox; - - wxPrintDialogData m_printDialogData; - -protected: - void Init(wxWindow *parent); - -private: - wxDECLARE_EVENT_TABLE(); - wxDECLARE_DYNAMIC_CLASS(wxGenericPrintDialog); -}; - -class WXDLLIMPEXP_CORE wxGenericPrintSetupDialog : public wxDialog -{ -public: - // There are no configuration options for the dialog, so we - // just pass the wxPrintData object (no wxPrintSetupDialogData class needed) - wxGenericPrintSetupDialog(wxWindow *parent, wxPrintData* data); - virtual ~wxGenericPrintSetupDialog(); - - void Init(wxPrintData* data); - - void OnPrinter(wxListEvent& event); - - virtual bool TransferDataFromWindow() wxOVERRIDE; - virtual bool TransferDataToWindow() wxOVERRIDE; - - virtual wxComboBox *CreatePaperTypeChoice(); - -public: - wxListCtrl* m_printerListCtrl; - wxRadioBox* m_orientationRadioBox; - wxTextCtrl* m_printerCommandText; - wxTextCtrl* m_printerOptionsText; - wxCheckBox* m_colourCheckBox; - wxComboBox* m_paperTypeChoice; - - wxPrintData m_printData; - wxPrintData& GetPrintData() { return m_printData; } - - // After pressing OK, write data here. - wxPrintData* m_targetData; - -private: - wxDECLARE_EVENT_TABLE(); - wxDECLARE_CLASS(wxGenericPrintSetupDialog); -}; -#endif - // wxUSE_POSTSCRIPT - -class WXDLLIMPEXP_CORE wxGenericPageSetupDialog : public wxPageSetupDialogBase -{ -public: - wxGenericPageSetupDialog(wxWindow *parent = NULL, - wxPageSetupDialogData* data = NULL); - virtual ~wxGenericPageSetupDialog(); - - virtual bool TransferDataFromWindow() wxOVERRIDE; - virtual bool TransferDataToWindow() wxOVERRIDE; - - virtual wxPageSetupDialogData& GetPageSetupDialogData() wxOVERRIDE; - - void OnPrinter(wxCommandEvent& event); - wxComboBox *CreatePaperTypeChoice(int* x, int* y); - -public: - wxButton* m_printerButton; - wxRadioBox* m_orientationRadioBox; - wxTextCtrl* m_marginLeftText; - wxTextCtrl* m_marginTopText; - wxTextCtrl* m_marginRightText; - wxTextCtrl* m_marginBottomText; - wxComboBox* m_paperTypeChoice; - - wxPageSetupDialogData m_pageData; - -private: - wxDECLARE_EVENT_TABLE(); - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxGenericPageSetupDialog); -}; - -#endif - -#endif -// __PRINTDLGH_G_ diff --git a/Externals/wxWidgets3/include/wx/generic/progdlgg.h b/Externals/wxWidgets3/include/wx/generic/progdlgg.h deleted file mode 100644 index 77b90f76f4..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/progdlgg.h +++ /dev/null @@ -1,227 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/progdlgg.h -// Purpose: wxGenericProgressDialog class -// Author: Karsten Ballueder -// Modified by: Francesco Montorsi -// Created: 09.05.1999 -// Copyright: (c) Karsten Ballueder -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef __PROGDLGH_G__ -#define __PROGDLGH_G__ - -#include "wx/dialog.h" - -class WXDLLIMPEXP_FWD_CORE wxButton; -class WXDLLIMPEXP_FWD_CORE wxEventLoop; -class WXDLLIMPEXP_FWD_CORE wxGauge; -class WXDLLIMPEXP_FWD_CORE wxStaticText; -class WXDLLIMPEXP_FWD_CORE wxWindowDisabler; - -/* - Progress dialog which shows a moving progress bar. - Taken from the Mahogany project. -*/ -class WXDLLIMPEXP_CORE wxGenericProgressDialog : public wxDialog -{ -public: - wxGenericProgressDialog(); - wxGenericProgressDialog(const wxString& title, const wxString& message, - int maximum = 100, - wxWindow *parent = NULL, - int style = wxPD_APP_MODAL | wxPD_AUTO_HIDE); - - virtual ~wxGenericProgressDialog(); - - bool Create(const wxString& title, - const wxString& message, - int maximum = 100, - wxWindow *parent = NULL, - int style = wxPD_APP_MODAL | wxPD_AUTO_HIDE); - - virtual bool Update(int value, const wxString& newmsg = wxEmptyString, bool *skip = NULL); - virtual bool Pulse(const wxString& newmsg = wxEmptyString, bool *skip = NULL); - - void Resume(); - - int GetValue() const; - int GetRange() const; - wxString GetMessage() const; - - void SetRange(int maximum); - - // Return whether "Cancel" or "Skip" button was pressed, always return - // false if the corresponding button is not shown. - bool WasCancelled() const; - bool WasSkipped() const; - - // Must provide overload to avoid hiding it (and warnings about it) - virtual void Update() wxOVERRIDE { wxDialog::Update(); } - - virtual bool Show( bool show = true ) wxOVERRIDE; - - // This enum is an implementation detail and should not be used - // by user code. - enum State - { - Uncancelable = -1, // dialog can't be canceled - Canceled, // can be cancelled and, in fact, was - Continue, // can be cancelled but wasn't - Finished, // finished, waiting to be removed from screen - Dismissed // was closed by user after finishing - }; - -protected: - // Update just the m_maximum field, this is used by public SetRange() but, - // unlike it, doesn't update the controls state. This makes it useful for - // both this class and its derived classes that don't use m_gauge to - // display progress. - void SetMaximum(int maximum); - - // Return the labels to use for showing the elapsed/estimated/remaining - // times respectively. - static wxString GetElapsedLabel() { return wxGetTranslation("Elapsed time:"); } - static wxString GetEstimatedLabel() { return wxGetTranslation("Estimated time:"); } - static wxString GetRemainingLabel() { return wxGetTranslation("Remaining time:"); } - - - // Similar to wxWindow::HasFlag() but tests for a presence of a wxPD_XXX - // flag in our (separate) flags instead of using m_windowStyle. - bool HasPDFlag(int flag) const { return (m_pdStyle & flag) != 0; } - - // Return the progress dialog style. Prefer to use HasPDFlag() if possible. - int GetPDStyle() const { return m_pdStyle; } - void SetPDStyle(int pdStyle) { m_pdStyle = pdStyle; } - - // Updates estimated times from a given progress bar value and stores the - // results in provided arguments. - void UpdateTimeEstimates(int value, - unsigned long &elapsedTime, - unsigned long &estimatedTime, - unsigned long &remainingTime); - - // Converts seconds to HH:mm:ss format. - static wxString GetFormattedTime(unsigned long timeInSec); - - // callback for optional abort button - void OnCancel(wxCommandEvent&); - - // callback for optional skip button - void OnSkip(wxCommandEvent&); - - // callback to disable "hard" window closing - void OnClose(wxCloseEvent&); - - // called to disable the other windows while this dialog is shown - void DisableOtherWindows(); - - // must be called to reenable the other windows temporarily disabled while - // the dialog was shown - void ReenableOtherWindows(); - - // Set the top level parent we store from the parent window provided when - // creating the dialog. - void SetTopParent(wxWindow* parent); - - // return the top level parent window of this dialog (may be NULL) - wxWindow *GetTopParent() const { return m_parentTop; } - - - // continue processing or not (return value for Update()) - State m_state; - - // the maximum value - int m_maximum; - -#if defined(__WXMSW__) - // the factor we use to always keep the value in 16 bit range as the native - // control only supports ranges from 0 to 65,535 - size_t m_factor; -#endif // __WXMSW__ - - // time when the dialog was created - unsigned long m_timeStart; - // time when the dialog was closed or cancelled - unsigned long m_timeStop; - // time between the moment the dialog was closed/cancelled and resume - unsigned long m_break; - -private: - // update the label to show the given time (in seconds) - static void SetTimeLabel(unsigned long val, wxStaticText *label); - - // common part of all ctors - void Init(); - - // create the label with given text and another one to show the time nearby - // as the next windows in the sizer, returns the created control - wxStaticText *CreateLabel(const wxString& text, wxSizer *sizer); - - // updates the label message - void UpdateMessage(const wxString &newmsg); - - // common part of Update() and Pulse(), returns true if not cancelled - bool DoBeforeUpdate(bool *skip); - - // common part of Update() and Pulse() - void DoAfterUpdate(); - - // shortcuts for enabling buttons - void EnableClose(); - void EnableSkip(bool enable = true); - void EnableAbort(bool enable = true); - void DisableSkip() { EnableSkip(false); } - void DisableAbort() { EnableAbort(false); } - - // the widget displaying current status (may be NULL) - wxGauge *m_gauge; - // the message displayed - wxStaticText *m_msg; - // displayed elapsed, estimated, remaining time - wxStaticText *m_elapsed, - *m_estimated, - *m_remaining; - - // parent top level window (may be NULL) - wxWindow *m_parentTop; - - // Progress dialog styles: this is not the same as m_windowStyle because - // wxPD_XXX constants clash with the existing TLW styles so to be sure we - // don't have any conflicts we just use a separate variable for storing - // them. - int m_pdStyle; - - // skip some portion - bool m_skip; - - // the abort and skip buttons (or NULL if none) - wxButton *m_btnAbort; - wxButton *m_btnSkip; - - // saves the time when elapsed time was updated so there is only one - // update per second - unsigned long m_last_timeupdate; - - // tells how often a change of the estimated time has to be confirmed - // before it is actually displayed - this reduces the frequency of updates - // of estimated and remaining time - int m_delay; - - // counts the confirmations - int m_ctdelay; - unsigned long m_display_estimated; - - // for wxPD_APP_MODAL case - wxWindowDisabler *m_winDisabler; - - // Temporary event loop created by the dialog itself if there is no - // currently active loop when it is created. - wxEventLoop *m_tempEventLoop; - - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_NO_COPY_CLASS(wxGenericProgressDialog); -}; - -#endif // __PROGDLGH_G__ diff --git a/Externals/wxWidgets3/include/wx/generic/propdlg.h b/Externals/wxWidgets3/include/wx/generic/propdlg.h deleted file mode 100644 index 5072dfdf0a..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/propdlg.h +++ /dev/null @@ -1,162 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/propdlg.h -// Purpose: wxPropertySheetDialog -// Author: Julian Smart -// Modified by: -// Created: 2005-03-12 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PROPDLG_H_ -#define _WX_PROPDLG_H_ - -#include "wx/defs.h" - -#if wxUSE_BOOKCTRL - -#include "wx/dialog.h" - -class WXDLLIMPEXP_FWD_CORE wxBookCtrlBase; - -//----------------------------------------------------------------------------- -// wxPropertySheetDialog -// A platform-independent properties dialog with a notebook and standard -// buttons. -// -// To use this class, call Create from your derived class. -// Then create pages and add to the book control. Finally call CreateButtons and -// LayoutDialog. -// -// For example: -// -// MyPropertySheetDialog::Create(...) -// { -// wxPropertySheetDialog::Create(...); -// -// // Add page -// wxPanel* panel = new wxPanel(GetBookCtrl(), ...); -// GetBookCtrl()->AddPage(panel, wxT("General")); -// -// CreateButtons(); -// LayoutDialog(); -// } -// -// Override CreateBookCtrl and AddBookCtrl to create and add a different -// kind of book control. -//----------------------------------------------------------------------------- - -enum wxPropertySheetDialogFlags -{ - // Use the platform default - wxPROPSHEET_DEFAULT = 0x0001, - - // Use a notebook - wxPROPSHEET_NOTEBOOK = 0x0002, - - // Use a toolbook - wxPROPSHEET_TOOLBOOK = 0x0004, - - // Use a choicebook - wxPROPSHEET_CHOICEBOOK = 0x0008, - - // Use a listbook - wxPROPSHEET_LISTBOOK = 0x0010, - - // Use a wxButtonToolBar toolbook - wxPROPSHEET_BUTTONTOOLBOOK = 0x0020, - - // Use a treebook - wxPROPSHEET_TREEBOOK = 0x0040, - - // Shrink dialog to fit current page - wxPROPSHEET_SHRINKTOFIT = 0x0100 -}; - -class WXDLLIMPEXP_ADV wxPropertySheetDialog : public wxDialog -{ -public: - wxPropertySheetDialog() : wxDialog() { Init(); } - - wxPropertySheetDialog(wxWindow* parent, wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& sz = wxDefaultSize, - long style = wxDEFAULT_DIALOG_STYLE, - const wxString& name = wxDialogNameStr) - { - Init(); - Create(parent, id, title, pos, sz, style, name); - } - - bool Create(wxWindow* parent, wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& sz = wxDefaultSize, - long style = wxDEFAULT_DIALOG_STYLE, - const wxString& name = wxDialogNameStr); - -//// Accessors - - // Set and get the notebook - void SetBookCtrl(wxBookCtrlBase* book) { m_bookCtrl = book; } - wxBookCtrlBase* GetBookCtrl() const { return m_bookCtrl; } - - // Override function in base - virtual wxWindow* GetContentWindow() const wxOVERRIDE; - - // Set and get the inner sizer - void SetInnerSize(wxSizer* sizer) { m_innerSizer = sizer; } - wxSizer* GetInnerSizer() const { return m_innerSizer ; } - - // Set and get the book style - void SetSheetStyle(long sheetStyle) { m_sheetStyle = sheetStyle; } - long GetSheetStyle() const { return m_sheetStyle ; } - - // Set and get the border around the whole dialog - void SetSheetOuterBorder(int border) { m_sheetOuterBorder = border; } - int GetSheetOuterBorder() const { return m_sheetOuterBorder ; } - - // Set and get the border around the book control only - void SetSheetInnerBorder(int border) { m_sheetInnerBorder = border; } - int GetSheetInnerBorder() const { return m_sheetInnerBorder ; } - -/// Operations - - // Creates the buttons - virtual void CreateButtons(int flags = wxOK|wxCANCEL); - - // Lay out the dialog, to be called after pages have been created - virtual void LayoutDialog(int centreFlags = wxBOTH); - -/// Implementation - - // Creates the book control. If you want to use a different kind of - // control, override. - virtual wxBookCtrlBase* CreateBookCtrl(); - - // Adds the book control to the inner sizer. - virtual void AddBookCtrl(wxSizer* sizer); - - // Resize dialog if necessary - void OnIdle(wxIdleEvent& event); - -private: - void Init(); - -protected: - wxBookCtrlBase* m_bookCtrl; - wxSizer* m_innerSizer; // sizer for extra space - long m_sheetStyle; - int m_sheetOuterBorder; - int m_sheetInnerBorder; - int m_selectedPage; - - wxDECLARE_DYNAMIC_CLASS(wxPropertySheetDialog); - wxDECLARE_EVENT_TABLE(); -}; - -#endif // wxUSE_BOOKCTRL - -#endif // _WX_PROPDLG_H_ - diff --git a/Externals/wxWidgets3/include/wx/generic/region.h b/Externals/wxWidgets3/include/wx/generic/region.h deleted file mode 100644 index 1c5048dbf2..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/region.h +++ /dev/null @@ -1,81 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/region.h -// Purpose: generic wxRegion class -// Author: David Elliott -// Modified by: -// Created: 2004/04/12 -// Copyright: (c) 2004 David Elliott -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GENERIC_REGION_H__ -#define _WX_GENERIC_REGION_H__ - -class WXDLLIMPEXP_CORE wxRegionGeneric : public wxRegionBase -{ -public: - wxRegionGeneric(wxCoord x, wxCoord y, wxCoord w, wxCoord h); - wxRegionGeneric(const wxPoint& topLeft, const wxPoint& bottomRight); - wxRegionGeneric(const wxRect& rect); - wxRegionGeneric(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle = wxODDEVEN_RULE); - wxRegionGeneric(const wxBitmap& bmp); - wxRegionGeneric(const wxBitmap& bmp, const wxColour& transp, int tolerance = 0); - wxRegionGeneric(); - virtual ~wxRegionGeneric(); - - // wxRegionBase pure virtuals - virtual void Clear(); - virtual bool IsEmpty() const; - -protected: - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; - - // wxRegionBase pure virtuals - virtual bool DoIsEqual(const wxRegion& region) const; - virtual bool DoGetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const; - virtual wxRegionContain DoContainsPoint(wxCoord x, wxCoord y) const; - virtual wxRegionContain DoContainsRect(const wxRect& rect) const; - - virtual bool DoOffset(wxCoord x, wxCoord y); - virtual bool DoUnionWithRect(const wxRect& rect); - virtual bool DoUnionWithRegion(const wxRegion& region); - virtual bool DoIntersect(const wxRegion& region); - virtual bool DoSubtract(const wxRegion& region); - virtual bool DoXor(const wxRegion& region); - - friend class WXDLLIMPEXP_FWD_CORE wxRegionIteratorGeneric; -}; - -class WXDLLIMPEXP_CORE wxRegionIteratorGeneric : public wxObject -{ -public: - wxRegionIteratorGeneric(); - wxRegionIteratorGeneric(const wxRegionGeneric& region); - wxRegionIteratorGeneric(const wxRegionIteratorGeneric& iterator); - virtual ~wxRegionIteratorGeneric(); - - wxRegionIteratorGeneric& operator=(const wxRegionIteratorGeneric& iterator); - - void Reset() { m_current = 0; } - void Reset(const wxRegionGeneric& region); - - operator bool () const { return HaveRects(); } - bool HaveRects() const; - - wxRegionIteratorGeneric& operator++(); - wxRegionIteratorGeneric operator++(int); - - long GetX() const; - long GetY() const; - long GetW() const; - long GetWidth() const { return GetW(); } - long GetH() const; - long GetHeight() const { return GetH(); } - wxRect GetRect() const; -private: - long m_current; - wxRegionGeneric m_region; -}; - -#endif // _WX_GENERIC_REGION_H__ diff --git a/Externals/wxWidgets3/include/wx/generic/richmsgdlgg.h b/Externals/wxWidgets3/include/wx/generic/richmsgdlgg.h deleted file mode 100644 index ae955d0af0..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/richmsgdlgg.h +++ /dev/null @@ -1,48 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/richmsgdlgg.h -// Purpose: wxGenericRichMessageDialog -// Author: Rickard Westerlund -// Created: 2010-07-04 -// Copyright: (c) 2010 wxWidgets team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GENERIC_RICHMSGDLGG_H_ -#define _WX_GENERIC_RICHMSGDLGG_H_ - -class WXDLLIMPEXP_FWD_CORE wxCheckBox; -class WXDLLIMPEXP_FWD_CORE wxCollapsiblePane; -class WXDLLIMPEXP_FWD_CORE wxCollapsiblePaneEvent; - -class WXDLLIMPEXP_CORE wxGenericRichMessageDialog - : public wxRichMessageDialogBase -{ -public: - wxGenericRichMessageDialog(wxWindow *parent, - const wxString& message, - const wxString& caption = wxMessageBoxCaptionStr, - long style = wxOK | wxCENTRE) - : wxRichMessageDialogBase( parent, message, caption, style ), - m_checkBox(NULL), - m_detailsPane(NULL) - { } - - virtual bool IsCheckBoxChecked() const wxOVERRIDE; - -protected: - wxCheckBox *m_checkBox; - wxCollapsiblePane *m_detailsPane; - - // overrides methods in the base class - virtual void AddMessageDialogCheckBox(wxSizer *sizer) wxOVERRIDE; - virtual void AddMessageDialogDetails(wxSizer *sizer) wxOVERRIDE; - -private: - void OnPaneChanged(wxCollapsiblePaneEvent& event); - - wxDECLARE_EVENT_TABLE(); - - wxDECLARE_NO_COPY_CLASS(wxGenericRichMessageDialog); -}; - -#endif // _WX_GENERIC_RICHMSGDLGG_H_ diff --git a/Externals/wxWidgets3/include/wx/generic/sashwin.h b/Externals/wxWidgets3/include/wx/generic/sashwin.h deleted file mode 100644 index 44cf8861b4..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/sashwin.h +++ /dev/null @@ -1,251 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/sashwin.h -// Purpose: wxSashWindow implementation. A sash window has an optional -// sash on each edge, allowing it to be dragged. An event -// is generated when the sash is released. -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_SASHWIN_H_G_ -#define _WX_SASHWIN_H_G_ - -#if wxUSE_SASH - -#include "wx/defs.h" -#include "wx/window.h" -#include "wx/string.h" - -#define wxSASH_DRAG_NONE 0 -#define wxSASH_DRAG_DRAGGING 1 -#define wxSASH_DRAG_LEFT_DOWN 2 - -enum wxSashEdgePosition { - wxSASH_TOP = 0, - wxSASH_RIGHT, - wxSASH_BOTTOM, - wxSASH_LEFT, - wxSASH_NONE = 100 -}; - -/* - * wxSashEdge represents one of the four edges of a window. - */ - -class WXDLLIMPEXP_ADV wxSashEdge -{ -public: - wxSashEdge() - { m_show = false; - m_margin = 0; } - - bool m_show; // Is the sash showing? - int m_margin; // The margin size -}; - -/* - * wxSashWindow flags - */ - -#define wxSW_NOBORDER 0x0000 -//#define wxSW_3D 0x0010 -#define wxSW_BORDER 0x0020 -#define wxSW_3DSASH 0x0040 -#define wxSW_3DBORDER 0x0080 -#define wxSW_3D (wxSW_3DSASH | wxSW_3DBORDER) - -/* - * wxSashWindow allows any of its edges to have a sash which can be dragged - * to resize the window. The actual content window will be created as a child - * of wxSashWindow. - */ - -class WXDLLIMPEXP_ADV wxSashWindow: public wxWindow -{ -public: - // Default constructor - wxSashWindow() - { - Init(); - } - - // Normal constructor - wxSashWindow(wxWindow *parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = wxSW_3D|wxCLIP_CHILDREN, const wxString& name = wxT("sashWindow")) - { - Init(); - Create(parent, id, pos, size, style, name); - } - - virtual ~wxSashWindow(); - - bool Create(wxWindow *parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = wxSW_3D|wxCLIP_CHILDREN, const wxString& name = wxT("sashWindow")); - - // Set whether there's a sash in this position - void SetSashVisible(wxSashEdgePosition edge, bool sash); - - // Get whether there's a sash in this position - bool GetSashVisible(wxSashEdgePosition edge) const { return m_sashes[edge].m_show; } - - // Get border size - int GetEdgeMargin(wxSashEdgePosition edge) const { return m_sashes[edge].m_margin; } - - // Sets the default sash border size - void SetDefaultBorderSize(int width) { m_borderSize = width; } - - // Gets the default sash border size - int GetDefaultBorderSize() const { return m_borderSize; } - - // Sets the addition border size between child and sash window - void SetExtraBorderSize(int width) { m_extraBorderSize = width; } - - // Gets the addition border size between child and sash window - int GetExtraBorderSize() const { return m_extraBorderSize; } - - virtual void SetMinimumSizeX(int min) { m_minimumPaneSizeX = min; } - virtual void SetMinimumSizeY(int min) { m_minimumPaneSizeY = min; } - virtual int GetMinimumSizeX() const { return m_minimumPaneSizeX; } - virtual int GetMinimumSizeY() const { return m_minimumPaneSizeY; } - - virtual void SetMaximumSizeX(int max) { m_maximumPaneSizeX = max; } - virtual void SetMaximumSizeY(int max) { m_maximumPaneSizeY = max; } - virtual int GetMaximumSizeX() const { return m_maximumPaneSizeX; } - virtual int GetMaximumSizeY() const { return m_maximumPaneSizeY; } - -//////////////////////////////////////////////////////////////////////////// -// Implementation - - // Paints the border and sash - void OnPaint(wxPaintEvent& event); - - // Handles mouse events - void OnMouseEvent(wxMouseEvent& ev); - - // Adjusts the panes - void OnSize(wxSizeEvent& event); - -#if defined(__WXMSW__) || defined(__WXMAC__) - // Handle cursor correctly - void OnSetCursor(wxSetCursorEvent& event); -#endif // wxMSW - - // Draws borders - void DrawBorders(wxDC& dc); - - // Draws the sashes - void DrawSash(wxSashEdgePosition edge, wxDC& dc); - - // Draws the sashes - void DrawSashes(wxDC& dc); - - // Draws the sash tracker (for whilst moving the sash) - void DrawSashTracker(wxSashEdgePosition edge, int x, int y); - - // Tests for x, y over sash - wxSashEdgePosition SashHitTest(int x, int y, int tolerance = 2); - - // Resizes subwindows - void SizeWindows(); - - // Initialize colours - void InitColours(); - -private: - void Init(); - - wxSashEdge m_sashes[4]; - int m_dragMode; - wxSashEdgePosition m_draggingEdge; - int m_oldX; - int m_oldY; - int m_borderSize; - int m_extraBorderSize; - int m_firstX; - int m_firstY; - int m_minimumPaneSizeX; - int m_minimumPaneSizeY; - int m_maximumPaneSizeX; - int m_maximumPaneSizeY; - wxCursor* m_sashCursorWE; - wxCursor* m_sashCursorNS; - wxColour m_lightShadowColour; - wxColour m_mediumShadowColour; - wxColour m_darkShadowColour; - wxColour m_hilightColour; - wxColour m_faceColour; - bool m_mouseCaptured; - wxCursor* m_currentCursor; - -private: - wxDECLARE_DYNAMIC_CLASS(wxSashWindow); - wxDECLARE_EVENT_TABLE(); - wxDECLARE_NO_COPY_CLASS(wxSashWindow); -}; - -class WXDLLIMPEXP_FWD_ADV wxSashEvent; - -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_SASH_DRAGGED, wxSashEvent ); - -enum wxSashDragStatus -{ - wxSASH_STATUS_OK, - wxSASH_STATUS_OUT_OF_RANGE -}; - -class WXDLLIMPEXP_ADV wxSashEvent: public wxCommandEvent -{ -public: - wxSashEvent(int id = 0, wxSashEdgePosition edge = wxSASH_NONE) - { - m_eventType = (wxEventType) wxEVT_SASH_DRAGGED; - m_id = id; - m_edge = edge; - } - - wxSashEvent(const wxSashEvent& event) - : wxCommandEvent(event), - m_edge(event.m_edge), - m_dragRect(event.m_dragRect), - m_dragStatus(event.m_dragStatus) { } - - void SetEdge(wxSashEdgePosition edge) { m_edge = edge; } - wxSashEdgePosition GetEdge() const { return m_edge; } - - //// The rectangle formed by the drag operation - void SetDragRect(const wxRect& rect) { m_dragRect = rect; } - wxRect GetDragRect() const { return m_dragRect; } - - //// Whether the drag caused the rectangle to be reversed (e.g. - //// dragging the top below the bottom) - void SetDragStatus(wxSashDragStatus status) { m_dragStatus = status; } - wxSashDragStatus GetDragStatus() const { return m_dragStatus; } - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxSashEvent(*this); } - -private: - wxSashEdgePosition m_edge; - wxRect m_dragRect; - wxSashDragStatus m_dragStatus; - -private: - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxSashEvent); -}; - -typedef void (wxEvtHandler::*wxSashEventFunction)(wxSashEvent&); - -#define wxSashEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxSashEventFunction, func) - -#define EVT_SASH_DRAGGED(id, fn) \ - wx__DECLARE_EVT1(wxEVT_SASH_DRAGGED, id, wxSashEventHandler(fn)) -#define EVT_SASH_DRAGGED_RANGE(id1, id2, fn) \ - wx__DECLARE_EVT2(wxEVT_SASH_DRAGGED, id1, id2, wxSashEventHandler(fn)) - -#endif // wxUSE_SASH - -#endif - // _WX_SASHWIN_H_G_ diff --git a/Externals/wxWidgets3/include/wx/generic/scrolwin.h b/Externals/wxWidgets3/include/wx/generic/scrolwin.h deleted file mode 100644 index efcbd0445e..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/scrolwin.h +++ /dev/null @@ -1,56 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/scrolwin.h -// Purpose: generic wxScrollHelper -// Author: Vadim Zeitlin -// Created: 2008-12-24 (replacing old file with the same name) -// Copyright: (c) 2008 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GENERIC_SCROLLWIN_H_ -#define _WX_GENERIC_SCROLLWIN_H_ - -#include "wx/recguard.h" - -// ---------------------------------------------------------------------------- -// generic wxScrollHelper implementation -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxScrollHelper : public wxScrollHelperBase -{ -public: - wxScrollHelper(wxWindow *winToScroll); - - // implement base class pure virtuals - virtual void AdjustScrollbars(); - virtual bool IsScrollbarShown(int orient) const; - -protected: - virtual void DoScroll(int x, int y); - virtual void DoShowScrollbars(wxScrollbarVisibility horz, - wxScrollbarVisibility vert); - -private: - // helper of AdjustScrollbars(): does the work for the single scrollbar - // - // notice that the parameters passed by non-const references are modified - // by this function - void DoAdjustScrollbar(int orient, - int clientSize, - int virtSize, - int pixelsPerUnit, - int& scrollUnits, - int& scrollPosition, - int& scrollLinesPerPage, - wxScrollbarVisibility visibility); - - - wxScrollbarVisibility m_xVisibility, - m_yVisibility; - wxRecursionGuardFlag m_adjustScrollFlagReentrancy; - - wxDECLARE_NO_COPY_CLASS(wxScrollHelper); -}; - -#endif // _WX_GENERIC_SCROLLWIN_H_ - diff --git a/Externals/wxWidgets3/include/wx/generic/spinctlg.h b/Externals/wxWidgets3/include/wx/generic/spinctlg.h deleted file mode 100644 index b8c1c73a22..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/spinctlg.h +++ /dev/null @@ -1,429 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/spinctlg.h -// Purpose: generic wxSpinCtrl class -// Author: Vadim Zeitlin -// Modified by: -// Created: 28.10.99 -// Copyright: (c) Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GENERIC_SPINCTRL_H_ -#define _WX_GENERIC_SPINCTRL_H_ - -// ---------------------------------------------------------------------------- -// wxSpinCtrl is a combination of wxSpinButton and wxTextCtrl, so if -// wxSpinButton is available, this is what we do - but if it isn't, we still -// define wxSpinCtrl class which then has the same appearance as wxTextCtrl but -// the different interface. This allows to write programs using wxSpinCtrl -// without tons of #ifdefs. -// ---------------------------------------------------------------------------- - -#if wxUSE_SPINBTN - -#include "wx/compositewin.h" - -class WXDLLIMPEXP_FWD_CORE wxSpinButton; -class WXDLLIMPEXP_FWD_CORE wxTextCtrl; - -class wxSpinCtrlTextGeneric; // wxTextCtrl used for the wxSpinCtrlGenericBase - -// The !wxUSE_SPINBTN version's GetValue() function conflicts with the -// wxTextCtrl's GetValue() and so you have to input a dummy int value. -#define wxSPINCTRL_GETVALUE_FIX - -// ---------------------------------------------------------------------------- -// wxSpinCtrlGeneric is a combination of wxTextCtrl and wxSpinButton -// -// This class manages a double valued generic spinctrl through the DoGet/SetXXX -// functions that are made public as Get/SetXXX functions for int or double -// for the wxSpinCtrl and wxSpinCtrlDouble classes respectively to avoid -// function ambiguity. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxSpinCtrlGenericBase - : public wxNavigationEnabled > -{ -public: - wxSpinCtrlGenericBase() { Init(); } - - bool Create(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT, - double min = 0, double max = 100, double initial = 0, - double inc = 1, - const wxString& name = wxT("wxSpinCtrl")); - - virtual ~wxSpinCtrlGenericBase(); - - // accessors - // T GetValue() const - // T GetMin() const - // T GetMax() const - // T GetIncrement() const - virtual bool GetSnapToTicks() const wxOVERRIDE { return m_snap_to_ticks; } - // unsigned GetDigits() const - wxSpinCtrlDouble only - - // operations - virtual void SetValue(const wxString& text) wxOVERRIDE; - // void SetValue(T val) - // void SetRange(T minVal, T maxVal) - // void SetIncrement(T inc) - virtual void SetSnapToTicks(bool snap_to_ticks) wxOVERRIDE; - // void SetDigits(unsigned digits) - wxSpinCtrlDouble only - - // Select text in the textctrl - void SetSelection(long from, long to) wxOVERRIDE; - - // implementation from now on - - // forward these functions to all subcontrols - virtual bool Enable(bool enable = true) wxOVERRIDE; - virtual bool Show(bool show = true) wxOVERRIDE; - - virtual bool SetBackgroundColour(const wxColour& colour) wxOVERRIDE; - - // get the subcontrols - wxTextCtrl *GetText() const { return m_textCtrl; } - wxSpinButton *GetSpinButton() const { return m_spinButton; } - - // forwarded events from children windows - void OnSpinButton(wxSpinEvent& event); - void OnTextLostFocus(wxFocusEvent& event); - void OnTextChar(wxKeyEvent& event); - - // this window itself is used only as a container for its sub windows so it - // shouldn't accept the focus at all and any attempts to explicitly set - // focus to it should give focus to its text constol part - virtual bool AcceptsFocus() const wxOVERRIDE { return false; } - virtual void SetFocus() wxOVERRIDE; - - friend class wxSpinCtrlTextGeneric; - -protected: - // override the base class virtuals involved into geometry calculations - virtual wxSize DoGetBestSize() const wxOVERRIDE; - virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const wxOVERRIDE; - virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE; - -#ifdef __WXMSW__ - // and, for MSW, enabling this window itself - virtual void DoEnable(bool enable); -#endif // __WXMSW__ - - enum SendEvent - { - SendEvent_None, - SendEvent_Text - }; - - // generic double valued functions - double DoGetValue() const { return m_value; } - bool DoSetValue(double val, SendEvent sendEvent); - void DoSetRange(double min_val, double max_val); - void DoSetIncrement(double inc); - - // update our value to reflect the text control contents (if it has been - // modified by user, do nothing otherwise) - // - // can also change the text control if its value is invalid - // - // return true if our value has changed - bool SyncSpinToText(SendEvent sendEvent); - - // Send the correct event type - virtual void DoSendEvent() = 0; - - // Convert the text to/from the corresponding value. - virtual bool DoTextToValue(const wxString& text, double *val) = 0; - virtual wxString DoValueToText(double val) = 0; - - // check if the value is in range - bool InRange(double n) const { return (n >= m_min) && (n <= m_max); } - - // ensure that the value is in range wrapping it round if necessary - double AdjustToFitInRange(double value) const; - - - double m_value; - double m_min; - double m_max; - double m_increment; - bool m_snap_to_ticks; - - int m_spin_value; - - // the subcontrols - wxTextCtrl *m_textCtrl; - wxSpinButton *m_spinButton; - -private: - // common part of all ctors - void Init(); - - // Implement pure virtual function inherited from wxCompositeWindow. - virtual wxWindowList GetCompositeWindowParts() const wxOVERRIDE; - - wxDECLARE_EVENT_TABLE(); -}; - -#else // !wxUSE_SPINBTN - -#define wxSPINCTRL_GETVALUE_FIX int = 1 - -// ---------------------------------------------------------------------------- -// wxSpinCtrl is just a text control -// ---------------------------------------------------------------------------- - -#include "wx/textctrl.h" - -class WXDLLIMPEXP_CORE wxSpinCtrlGenericBase : public wxTextCtrl -{ -public: - wxSpinCtrlGenericBase() : m_value(0), m_min(0), m_max(100), - m_increment(1), m_snap_to_ticks(false), - m_format(wxT("%g")) { } - - bool Create(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT, - double min = 0, double max = 100, double initial = 0, - double inc = 1, - const wxString& name = wxT("wxSpinCtrl")) - { - m_min = min; - m_max = max; - m_value = initial; - m_increment = inc; - - bool ok = wxTextCtrl::Create(parent, id, value, pos, size, style, - wxDefaultValidator, name); - DoSetValue(initial, SendEvent_None); - - return ok; - } - - // accessors - // T GetValue() const - // T GetMin() const - // T GetMax() const - // T GetIncrement() const - virtual bool GetSnapToTicks() const { return m_snap_to_ticks; } - // unsigned GetDigits() const - wxSpinCtrlDouble only - - // operations - virtual void SetValue(const wxString& text) { wxTextCtrl::SetValue(text); } - // void SetValue(T val) - // void SetRange(T minVal, T maxVal) - // void SetIncrement(T inc) - virtual void SetSnapToTicks(bool snap_to_ticks) - { m_snap_to_ticks = snap_to_ticks; } - // void SetDigits(unsigned digits) - wxSpinCtrlDouble only - - // Select text in the textctrl - //void SetSelection(long from, long to); - -protected: - // generic double valued - double DoGetValue() const - { - double n; - if ( (wxSscanf(wxTextCtrl::GetValue(), wxT("%lf"), &n) != 1) ) - n = INT_MIN; - - return n; - } - - bool DoSetValue(double val, SendEvent sendEvent) - { - wxString str(wxString::Format(m_format, val)); - switch ( sendEvent ) - { - case SendEvent_None: - wxTextCtrl::ChangeValue(str); - break; - - case SendEvent_Text: - wxTextCtrl::SetValue(str); - break; - } - - return true; - } - void DoSetRange(double min_val, double max_val) - { - m_min = min_val; - m_max = max_val; - } - void DoSetIncrement(double inc) { m_increment = inc; } // Note: unused - - double m_value; - double m_min; - double m_max; - double m_increment; - bool m_snap_to_ticks; - wxString m_format; -}; - -#endif // wxUSE_SPINBTN/!wxUSE_SPINBTN - -#if !defined(wxHAS_NATIVE_SPINCTRL) - -//----------------------------------------------------------------------------- -// wxSpinCtrl -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxSpinCtrl : public wxSpinCtrlGenericBase -{ -public: - wxSpinCtrl() { Init(); } - wxSpinCtrl(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT, - int min = 0, int max = 100, int initial = 0, - const wxString& name = wxT("wxSpinCtrl")) - { - Init(); - - Create(parent, id, value, pos, size, style, min, max, initial, name); - } - - bool Create(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT, - int min = 0, int max = 100, int initial = 0, - const wxString& name = wxT("wxSpinCtrl")) - { - return wxSpinCtrlGenericBase::Create(parent, id, value, pos, size, - style, min, max, initial, 1, name); - } - - // accessors - int GetValue(wxSPINCTRL_GETVALUE_FIX) const { return int(DoGetValue()); } - int GetMin() const { return int(m_min); } - int GetMax() const { return int(m_max); } - int GetIncrement() const { return int(m_increment); } - - // operations - void SetValue(const wxString& value) - { wxSpinCtrlGenericBase::SetValue(value); } - void SetValue( int value ) { DoSetValue(value, SendEvent_None); } - void SetRange( int minVal, int maxVal ) { DoSetRange(minVal, maxVal); } - void SetIncrement(int inc) { DoSetIncrement(inc); } - - virtual int GetBase() const { return m_base; } - virtual bool SetBase(int base); - -protected: - virtual void DoSendEvent(); - - virtual bool DoTextToValue(const wxString& text, double *val); - virtual wxString DoValueToText(double val); - -private: - // Common part of all ctors. - void Init() - { - m_base = 10; - } - - int m_base; - - wxDECLARE_DYNAMIC_CLASS(wxSpinCtrl); -}; - -#endif // wxHAS_NATIVE_SPINCTRL - -//----------------------------------------------------------------------------- -// wxSpinCtrlDouble -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxSpinCtrlDouble : public wxSpinCtrlGenericBase -{ -public: - wxSpinCtrlDouble() { Init(); } - wxSpinCtrlDouble(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT, - double min = 0, double max = 100, double initial = 0, - double inc = 1, - const wxString& name = wxT("wxSpinCtrlDouble")) - { - Init(); - - Create(parent, id, value, pos, size, style, - min, max, initial, inc, name); - } - - bool Create(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT, - double min = 0, double max = 100, double initial = 0, - double inc = 1, - const wxString& name = wxT("wxSpinCtrlDouble")) - { - return wxSpinCtrlGenericBase::Create(parent, id, value, pos, size, - style, min, max, initial, - inc, name); - } - - // accessors - double GetValue(wxSPINCTRL_GETVALUE_FIX) const { return DoGetValue(); } - double GetMin() const { return m_min; } - double GetMax() const { return m_max; } - double GetIncrement() const { return m_increment; } - unsigned GetDigits() const { return m_digits; } - - // operations - void SetValue(const wxString& value) - { wxSpinCtrlGenericBase::SetValue(value); } - void SetValue(double value) { DoSetValue(value, SendEvent_None); } - void SetRange(double minVal, double maxVal) { DoSetRange(minVal, maxVal); } - void SetIncrement(double inc) { DoSetIncrement(inc); } - void SetDigits(unsigned digits); - - // We don't implement bases support for floating point numbers, this is not - // very useful in practice. - virtual int GetBase() const { return 10; } - virtual bool SetBase(int WXUNUSED(base)) { return 0; } - -protected: - virtual void DoSendEvent(); - - virtual bool DoTextToValue(const wxString& text, double *val); - virtual wxString DoValueToText(double val); - - unsigned m_digits; - -private: - // Common part of all ctors. - void Init() - { - m_digits = 0; - m_format = wxS("%g"); - } - - wxString m_format; - - wxDECLARE_DYNAMIC_CLASS(wxSpinCtrlDouble); -}; - -#endif // _WX_GENERIC_SPINCTRL_H_ diff --git a/Externals/wxWidgets3/include/wx/generic/splash.h b/Externals/wxWidgets3/include/wx/generic/splash.h deleted file mode 100644 index 48417bb956..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/splash.h +++ /dev/null @@ -1,97 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/splash.h -// Purpose: Splash screen class -// Author: Julian Smart -// Modified by: -// Created: 28/6/2000 -// Copyright: (c) Julian Smart -// Licence: wxWindows Licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_SPLASH_H_ -#define _WX_SPLASH_H_ - -#include "wx/bitmap.h" -#include "wx/eventfilter.h" -#include "wx/frame.h" -#include "wx/timer.h" - - -/* - * A window for displaying a splash screen - */ - -#define wxSPLASH_CENTRE_ON_PARENT 0x01 -#define wxSPLASH_CENTRE_ON_SCREEN 0x02 -#define wxSPLASH_NO_CENTRE 0x00 -#define wxSPLASH_TIMEOUT 0x04 -#define wxSPLASH_NO_TIMEOUT 0x00 - -class WXDLLIMPEXP_FWD_ADV wxSplashScreenWindow; - -/* - * wxSplashScreen - */ - -class WXDLLIMPEXP_ADV wxSplashScreen: public wxFrame, - public wxEventFilter -{ -public: - // for RTTI macros only - wxSplashScreen() { Init(); } - wxSplashScreen(const wxBitmap& bitmap, long splashStyle, int milliseconds, - wxWindow* parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSIMPLE_BORDER|wxFRAME_NO_TASKBAR|wxSTAY_ON_TOP); - virtual ~wxSplashScreen(); - - void OnCloseWindow(wxCloseEvent& event); - void OnNotify(wxTimerEvent& event); - - long GetSplashStyle() const { return m_splashStyle; } - wxSplashScreenWindow* GetSplashWindow() const { return m_window; } - int GetTimeout() const { return m_milliseconds; } - - // Override wxEventFilter method to hide splash screen on any user input. - virtual int FilterEvent(wxEvent& event) wxOVERRIDE; - -protected: - // Common part of all ctors. - void Init(); - - wxSplashScreenWindow* m_window; - long m_splashStyle; - int m_milliseconds; - wxTimer m_timer; - - wxDECLARE_DYNAMIC_CLASS(wxSplashScreen); - wxDECLARE_EVENT_TABLE(); - wxDECLARE_NO_COPY_CLASS(wxSplashScreen); -}; - -/* - * wxSplashScreenWindow - */ - -class WXDLLIMPEXP_ADV wxSplashScreenWindow: public wxWindow -{ -public: - wxSplashScreenWindow(const wxBitmap& bitmap, wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxNO_BORDER); - - void OnPaint(wxPaintEvent& event); - void OnEraseBackground(wxEraseEvent& event); - - void SetBitmap(const wxBitmap& bitmap) { m_bitmap = bitmap; } - wxBitmap& GetBitmap() { return m_bitmap; } - -protected: - wxBitmap m_bitmap; - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_NO_COPY_CLASS(wxSplashScreenWindow); -}; - - -#endif - // _WX_SPLASH_H_ diff --git a/Externals/wxWidgets3/include/wx/generic/splitter.h b/Externals/wxWidgets3/include/wx/generic/splitter.h deleted file mode 100644 index d45cf54eb7..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/splitter.h +++ /dev/null @@ -1,419 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/splitter.h -// Purpose: wxSplitterWindow class -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GENERIC_SPLITTER_H_ -#define _WX_GENERIC_SPLITTER_H_ - -#include "wx/window.h" // base class declaration -#include "wx/containr.h" // wxControlContainer - -class WXDLLIMPEXP_FWD_CORE wxSplitterEvent; - -// --------------------------------------------------------------------------- -// splitter constants -// --------------------------------------------------------------------------- - -enum wxSplitMode -{ - wxSPLIT_HORIZONTAL = 1, - wxSPLIT_VERTICAL -}; - -enum -{ - wxSPLIT_DRAG_NONE, - wxSPLIT_DRAG_DRAGGING, - wxSPLIT_DRAG_LEFT_DOWN -}; - -// --------------------------------------------------------------------------- -// wxSplitterWindow maintains one or two panes, with -// an optional vertical or horizontal split which -// can be used with the mouse or programmatically. -// --------------------------------------------------------------------------- - -// TODO: -// 1) Perhaps make the borders sensitive to dragging in order to create a split. -// The MFC splitter window manages scrollbars as well so is able to -// put sash buttons on the scrollbars, but we probably don't want to go down -// this path. -// 2) for wxWidgets 2.0, we must find a way to set the WS_CLIPCHILDREN style -// to prevent flickering. (WS_CLIPCHILDREN doesn't work in all cases so can't be -// standard). - -class WXDLLIMPEXP_CORE wxSplitterWindow: public wxNavigationEnabled -{ -public: - -//////////////////////////////////////////////////////////////////////////// -// Public API - - // Default constructor - wxSplitterWindow() - { - Init(); - } - - // Normal constructor - wxSplitterWindow(wxWindow *parent, wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSP_3D, - const wxString& name = wxT("splitter")) - { - Init(); - Create(parent, id, pos, size, style, name); - } - - virtual ~wxSplitterWindow(); - - bool Create(wxWindow *parent, wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSP_3D, - const wxString& name = wxT("splitter")); - - // Gets the only or left/top pane - wxWindow *GetWindow1() const { return m_windowOne; } - - // Gets the right/bottom pane - wxWindow *GetWindow2() const { return m_windowTwo; } - - // Sets the split mode - void SetSplitMode(int mode) - { - wxASSERT_MSG( mode == wxSPLIT_VERTICAL || mode == wxSPLIT_HORIZONTAL, - wxT("invalid split mode") ); - - m_splitMode = (wxSplitMode)mode; - } - - // Gets the split mode - wxSplitMode GetSplitMode() const { return m_splitMode; } - - // Initialize with one window - void Initialize(wxWindow *window); - - // Associates the given window with window 2, drawing the appropriate sash - // and changing the split mode. - // Does nothing and returns false if the window is already split. - // A sashPosition of 0 means choose a default sash position, - // negative sashPosition specifies the size of right/lower pane as its - // absolute value rather than the size of left/upper pane. - virtual bool SplitVertically(wxWindow *window1, - wxWindow *window2, - int sashPosition = 0) - { return DoSplit(wxSPLIT_VERTICAL, window1, window2, sashPosition); } - virtual bool SplitHorizontally(wxWindow *window1, - wxWindow *window2, - int sashPosition = 0) - { return DoSplit(wxSPLIT_HORIZONTAL, window1, window2, sashPosition); } - - // Removes the specified (or second) window from the view - // Doesn't actually delete the window. - bool Unsplit(wxWindow *toRemove = NULL); - - // Replaces one of the windows with another one (neither old nor new - // parameter should be NULL) - bool ReplaceWindow(wxWindow *winOld, wxWindow *winNew); - - // Make sure the child window sizes are updated. This is useful - // for reducing flicker by updating the sizes before a - // window is shown, if you know the overall size is correct. - void UpdateSize(); - - // Is the window split? - bool IsSplit() const { return (m_windowTwo != NULL); } - - // Sets the border size - void SetBorderSize(int WXUNUSED(width)) { } - - // Hide or show the sash and test whether it's currently hidden. - void SetSashInvisible(bool invisible = true); - bool IsSashInvisible() const { return HasFlag(wxSP_NOSASH); } - - // Gets the current sash size which may be 0 if it's hidden and the default - // sash size. - int GetSashSize() const; - int GetDefaultSashSize() const; - - // Gets the border size - int GetBorderSize() const; - - // Set the sash position - void SetSashPosition(int position, bool redraw = true); - - // Gets the sash position - int GetSashPosition() const { return m_sashPosition; } - - // Set the sash gravity - void SetSashGravity(double gravity); - - // Gets the sash gravity - double GetSashGravity() const { return m_sashGravity; } - - // If this is zero, we can remove panes by dragging the sash. - void SetMinimumPaneSize(int min); - int GetMinimumPaneSize() const { return m_minimumPaneSize; } - - // NB: the OnXXX() functions below are for backwards compatibility only, - // don't use them in new code but handle the events instead! - - // called when the sash position is about to change, may return a new value - // for the sash or -1 to prevent the change from happening at all - virtual int OnSashPositionChanging(int newSashPosition); - - // Called when the sash position is about to be changed, return - // false from here to prevent the change from taking place. - // Repositions sash to minimum position if pane would be too small. - // newSashPosition here is always positive or zero. - virtual bool OnSashPositionChange(int newSashPosition); - - // If the sash is moved to an extreme position, a subwindow - // is removed from the splitter window, and the app is - // notified. The app should delete or hide the window. - virtual void OnUnsplit(wxWindow *removed); - - // Called when the sash is double-clicked. - // The default behaviour is to remove the sash if the - // minimum pane size is zero. - virtual void OnDoubleClickSash(int x, int y); - -//////////////////////////////////////////////////////////////////////////// -// Implementation - - // Paints the border and sash - void OnPaint(wxPaintEvent& event); - - // Handles mouse events - void OnMouseEvent(wxMouseEvent& ev); - - // Aborts dragging mode - void OnMouseCaptureLost(wxMouseCaptureLostEvent& event); - - // Adjusts the panes - void OnSize(wxSizeEvent& event); - - // In live mode, resize child windows in idle time - void OnInternalIdle() wxOVERRIDE; - - // Draws the sash - virtual void DrawSash(wxDC& dc); - - // Draws the sash tracker (for whilst moving the sash) - virtual void DrawSashTracker(int x, int y); - - // Tests for x, y over sash - virtual bool SashHitTest(int x, int y); - - // Resizes subwindows - virtual void SizeWindows(); - -#ifdef __WXMAC__ - virtual bool MacClipGrandChildren() const wxOVERRIDE { return true ; } -#endif - - // Sets the sash size: this doesn't do anything and shouldn't be used at - // all any more. - wxDEPRECATED_INLINE( void SetSashSize(int WXUNUSED(width)), return; ) - -protected: - // event handlers -#if defined(__WXMSW__) || defined(__WXMAC__) - void OnSetCursor(wxSetCursorEvent& event); -#endif // wxMSW - - // send the given event, return false if the event was processed and vetoed - // by the user code - bool DoSendEvent(wxSplitterEvent& event); - - // common part of all ctors - void Init(); - - // common part of SplitVertically() and SplitHorizontally() - bool DoSplit(wxSplitMode mode, - wxWindow *window1, wxWindow *window2, - int sashPosition); - - // adjusts sash position with respect to min. pane and window sizes - int AdjustSashPosition(int sashPos) const; - - // get either width or height depending on the split mode - int GetWindowSize() const; - - // convert the user specified sash position which may be > 0 (as is), < 0 - // (specifying the size of the right pane) or 0 (use default) to the real - // position to be passed to DoSetSashPosition() - int ConvertSashPosition(int sashPos) const; - - // set the real sash position, sashPos here must be positive - // - // returns true if the sash position has been changed, false otherwise - bool DoSetSashPosition(int sashPos); - - // set the sash position and send an event about it having been changed - void SetSashPositionAndNotify(int sashPos); - - // callbacks executed when we detect that the mouse has entered or left - // the sash - virtual void OnEnterSash(); - virtual void OnLeaveSash(); - - // set the cursor appropriate for the current split mode - void SetResizeCursor(); - - // redraw the splitter if its "hotness" changed if necessary - void RedrawIfHotSensitive(bool isHot); - - // return the best size of the splitter equal to best sizes of its - // subwindows - virtual wxSize DoGetBestSize() const wxOVERRIDE; - - - wxSplitMode m_splitMode; - wxWindow* m_windowOne; - wxWindow* m_windowTwo; - int m_dragMode; - int m_oldX; // current tracker position if not live mode - int m_oldY; // current tracker position if not live mode - int m_sashPosition; // Number of pixels from left or top - double m_sashGravity; - wxSize m_lastSize; - int m_requestedSashPosition; - int m_sashPositionCurrent; // while dragging - wxPoint m_ptStart; // mouse position when dragging started - int m_sashStart; // sash position when dragging started - int m_minimumPaneSize; - wxCursor m_sashCursorWE; - wxCursor m_sashCursorNS; - wxPen *m_sashTrackerPen; - - // when in live mode, set this to true to resize children in idle - bool m_needUpdating:1; - bool m_permitUnsplitAlways:1; - bool m_isHot:1; - -private: - wxDECLARE_DYNAMIC_CLASS(wxSplitterWindow); - wxDECLARE_EVENT_TABLE(); - wxDECLARE_NO_COPY_CLASS(wxSplitterWindow); -}; - -// ---------------------------------------------------------------------------- -// event class and macros -// ---------------------------------------------------------------------------- - -// we reuse the same class for all splitter event types because this is the -// usual wxWin convention, but the three event types have different kind of -// data associated with them, so the accessors can be only used if the real -// event type matches with the one for which the accessors make sense -class WXDLLIMPEXP_CORE wxSplitterEvent : public wxNotifyEvent -{ -public: - wxSplitterEvent(wxEventType type = wxEVT_NULL, - wxSplitterWindow *splitter = NULL) - : wxNotifyEvent(type) - { - SetEventObject(splitter); - if (splitter) m_id = splitter->GetId(); - } - wxSplitterEvent(const wxSplitterEvent& event) - : wxNotifyEvent(event), m_data(event.m_data) { } - - // SASH_POS_CHANGED methods - - // setting the sash position to -1 prevents the change from taking place at - // all - void SetSashPosition(int pos) - { - wxASSERT( GetEventType() == wxEVT_SPLITTER_SASH_POS_CHANGED - || GetEventType() == wxEVT_SPLITTER_SASH_POS_CHANGING); - - m_data.pos = pos; - } - - int GetSashPosition() const - { - wxASSERT( GetEventType() == wxEVT_SPLITTER_SASH_POS_CHANGED - || GetEventType() == wxEVT_SPLITTER_SASH_POS_CHANGING); - - return m_data.pos; - } - - // UNSPLIT event methods - wxWindow *GetWindowBeingRemoved() const - { - wxASSERT( GetEventType() == wxEVT_SPLITTER_UNSPLIT ); - - return m_data.win; - } - - // DCLICK event methods - int GetX() const - { - wxASSERT( GetEventType() == wxEVT_SPLITTER_DOUBLECLICKED ); - - return m_data.pt.x; - } - - int GetY() const - { - wxASSERT( GetEventType() == wxEVT_SPLITTER_DOUBLECLICKED ); - - return m_data.pt.y; - } - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxSplitterEvent(*this); } - -private: - friend class WXDLLIMPEXP_FWD_CORE wxSplitterWindow; - - // data for the different types of event - union - { - int pos; // position for SASH_POS_CHANGED event - wxWindow *win; // window being removed for UNSPLIT event - struct - { - int x, y; - } pt; // position of double click for DCLICK event - } m_data; - - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxSplitterEvent); -}; - -typedef void (wxEvtHandler::*wxSplitterEventFunction)(wxSplitterEvent&); - -#define wxSplitterEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxSplitterEventFunction, func) - -#define wx__DECLARE_SPLITTEREVT(evt, id, fn) \ - wx__DECLARE_EVT1(wxEVT_SPLITTER_ ## evt, id, wxSplitterEventHandler(fn)) - -#define EVT_SPLITTER_SASH_POS_CHANGED(id, fn) \ - wx__DECLARE_SPLITTEREVT(SASH_POS_CHANGED, id, fn) - -#define EVT_SPLITTER_SASH_POS_CHANGING(id, fn) \ - wx__DECLARE_SPLITTEREVT(SASH_POS_CHANGING, id, fn) - -#define EVT_SPLITTER_DCLICK(id, fn) \ - wx__DECLARE_SPLITTEREVT(DOUBLECLICKED, id, fn) - -#define EVT_SPLITTER_UNSPLIT(id, fn) \ - wx__DECLARE_SPLITTEREVT(UNSPLIT, id, fn) - - -// old wxEVT_COMMAND_* constants -#define wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED wxEVT_SPLITTER_SASH_POS_CHANGED -#define wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING wxEVT_SPLITTER_SASH_POS_CHANGING -#define wxEVT_COMMAND_SPLITTER_DOUBLECLICKED wxEVT_SPLITTER_DOUBLECLICKED -#define wxEVT_COMMAND_SPLITTER_UNSPLIT wxEVT_SPLITTER_UNSPLIT - -#endif // _WX_GENERIC_SPLITTER_H_ diff --git a/Externals/wxWidgets3/include/wx/generic/srchctlg.h b/Externals/wxWidgets3/include/wx/generic/srchctlg.h deleted file mode 100644 index 3eb8d21c92..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/srchctlg.h +++ /dev/null @@ -1,279 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/srchctlg.h -// Purpose: generic wxSearchCtrl class -// Author: Vince Harron -// Created: 2006-02-19 -// Copyright: Vince Harron -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GENERIC_SEARCHCTRL_H_ -#define _WX_GENERIC_SEARCHCTRL_H_ - -#if wxUSE_SEARCHCTRL - -#include "wx/bitmap.h" - -class WXDLLIMPEXP_FWD_CORE wxSearchButton; -class WXDLLIMPEXP_FWD_CORE wxSearchTextCtrl; - -// ---------------------------------------------------------------------------- -// wxSearchCtrl is a combination of wxTextCtrl and wxSearchButton -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxSearchCtrl : public wxSearchCtrlBase -{ -public: - // creation - // -------- - - wxSearchCtrl(); - wxSearchCtrl(wxWindow *parent, wxWindowID id, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxSearchCtrlNameStr); - - virtual ~wxSearchCtrl(); - - bool Create(wxWindow *parent, wxWindowID id, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxSearchCtrlNameStr); - -#if wxUSE_MENUS - // get/set search button menu - // -------------------------- - virtual void SetMenu( wxMenu* menu ) wxOVERRIDE; - virtual wxMenu* GetMenu() wxOVERRIDE; -#endif // wxUSE_MENUS - - // get/set search options - // ---------------------- - virtual void ShowSearchButton( bool show ) wxOVERRIDE; - virtual bool IsSearchButtonVisible() const wxOVERRIDE; - - virtual void ShowCancelButton( bool show ) wxOVERRIDE; - virtual bool IsCancelButtonVisible() const wxOVERRIDE; - - // TODO: In 2.9 these should probably be virtual, and declared in the base class... - void SetDescriptiveText(const wxString& text); - wxString GetDescriptiveText() const; - - // accessors - // --------- - - virtual wxString GetRange(long from, long to) const wxOVERRIDE; - - virtual int GetLineLength(long lineNo) const wxOVERRIDE; - virtual wxString GetLineText(long lineNo) const wxOVERRIDE; - virtual int GetNumberOfLines() const wxOVERRIDE; - - virtual bool IsModified() const wxOVERRIDE; - virtual bool IsEditable() const wxOVERRIDE; - - // more readable flag testing methods - virtual bool IsSingleLine() const; - virtual bool IsMultiLine() const; - - // If the return values from and to are the same, there is no selection. - virtual void GetSelection(long* from, long* to) const wxOVERRIDE; - - virtual wxString GetStringSelection() const wxOVERRIDE; - - // operations - // ---------- - - // editing - virtual void Clear() wxOVERRIDE; - virtual void Replace(long from, long to, const wxString& value) wxOVERRIDE; - virtual void Remove(long from, long to) wxOVERRIDE; - - // load/save the controls contents from/to the file - virtual bool LoadFile(const wxString& file); - virtual bool SaveFile(const wxString& file = wxEmptyString); - - // sets/clears the dirty flag - virtual void MarkDirty() wxOVERRIDE; - virtual void DiscardEdits() wxOVERRIDE; - - // set the max number of characters which may be entered in a single line - // text control - virtual void SetMaxLength(unsigned long WXUNUSED(len)) wxOVERRIDE; - - // writing text inserts it at the current position, appending always - // inserts it at the end - virtual void WriteText(const wxString& text) wxOVERRIDE; - virtual void AppendText(const wxString& text) wxOVERRIDE; - - // insert the character which would have resulted from this key event, - // return true if anything has been inserted - virtual bool EmulateKeyPress(const wxKeyEvent& event); - - // text control under some platforms supports the text styles: these - // methods allow to apply the given text style to the given selection or to - // set/get the style which will be used for all appended text - virtual bool SetStyle(long start, long end, const wxTextAttr& style) wxOVERRIDE; - virtual bool GetStyle(long position, wxTextAttr& style) wxOVERRIDE; - virtual bool SetDefaultStyle(const wxTextAttr& style) wxOVERRIDE; - virtual const wxTextAttr& GetDefaultStyle() const wxOVERRIDE; - - // translate between the position (which is just an index in the text ctrl - // considering all its contents as a single strings) and (x, y) coordinates - // which represent column and line. - virtual long XYToPosition(long x, long y) const wxOVERRIDE; - virtual bool PositionToXY(long pos, long *x, long *y) const wxOVERRIDE; - - virtual void ShowPosition(long pos) wxOVERRIDE; - - // find the character at position given in pixels - // - // NB: pt is in device coords (not adjusted for the client area origin nor - // scrolling) - virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const wxOVERRIDE; - virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, - wxTextCoord *col, - wxTextCoord *row) const wxOVERRIDE; - - // Clipboard operations - virtual void Copy() wxOVERRIDE; - virtual void Cut() wxOVERRIDE; - virtual void Paste() wxOVERRIDE; - - virtual bool CanCopy() const wxOVERRIDE; - virtual bool CanCut() const wxOVERRIDE; - virtual bool CanPaste() const wxOVERRIDE; - - // Undo/redo - virtual void Undo() wxOVERRIDE; - virtual void Redo() wxOVERRIDE; - - virtual bool CanUndo() const wxOVERRIDE; - virtual bool CanRedo() const wxOVERRIDE; - - // Insertion point - virtual void SetInsertionPoint(long pos) wxOVERRIDE; - virtual void SetInsertionPointEnd() wxOVERRIDE; - virtual long GetInsertionPoint() const wxOVERRIDE; - virtual wxTextPos GetLastPosition() const wxOVERRIDE; - - virtual void SetSelection(long from, long to) wxOVERRIDE; - virtual void SelectAll() wxOVERRIDE; - virtual void SetEditable(bool editable) wxOVERRIDE; - -#if 0 - - // override streambuf method -#if wxHAS_TEXT_WINDOW_STREAM - int overflow(int i); -#endif // wxHAS_TEXT_WINDOW_STREAM - - // stream-like insertion operators: these are always available, whether we - // were, or not, compiled with streambuf support - wxTextCtrl& operator<<(const wxString& s); - wxTextCtrl& operator<<(int i); - wxTextCtrl& operator<<(long i); - wxTextCtrl& operator<<(float f); - wxTextCtrl& operator<<(double d); - wxTextCtrl& operator<<(wxChar c); -#endif - - // do the window-specific processing after processing the update event - virtual void DoUpdateWindowUI(wxUpdateUIEvent& event) wxOVERRIDE; - - virtual bool ShouldInheritColours() const wxOVERRIDE; - - // wxWindow overrides - virtual bool SetFont(const wxFont& font) wxOVERRIDE; - virtual bool SetBackgroundColour(const wxColour& colour) wxOVERRIDE; - - // search control generic only - void SetSearchBitmap( const wxBitmap& bitmap ); - void SetCancelBitmap( const wxBitmap& bitmap ); -#if wxUSE_MENUS - void SetSearchMenuBitmap( const wxBitmap& bitmap ); -#endif // wxUSE_MENUS - -protected: - virtual void DoSetValue(const wxString& value, int flags) wxOVERRIDE; - virtual wxString DoGetValue() const wxOVERRIDE; - - virtual bool DoLoadFile(const wxString& file, int fileType) wxOVERRIDE; - virtual bool DoSaveFile(const wxString& file, int fileType) wxOVERRIDE; - - // override the base class virtuals involved into geometry calculations - virtual wxSize DoGetBestClientSize() const wxOVERRIDE; - virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE; - - virtual void RecalcBitmaps(); - - void Init(); - - virtual wxBitmap RenderSearchBitmap( int x, int y, bool renderDrop ); - virtual wxBitmap RenderCancelBitmap( int x, int y ); - - void OnCancelButton( wxCommandEvent& event ); - - void OnSetFocus( wxFocusEvent& event ); - void OnSize( wxSizeEvent& event ); - - bool HasMenu() const - { -#if wxUSE_MENUS - return m_menu != NULL; -#else // !wxUSE_MENUS - return false; -#endif // wxUSE_MENUS/!wxUSE_MENUS - } - -private: - friend class wxSearchButton; - - // Implement pure virtual function inherited from wxCompositeWindow. - virtual wxWindowList GetCompositeWindowParts() const wxOVERRIDE; - - // Position the child controls using the current window size. - void LayoutControls(); - -#if wxUSE_MENUS - void PopupSearchMenu(); -#endif // wxUSE_MENUS - - // the subcontrols - wxSearchTextCtrl *m_text; - wxSearchButton *m_searchButton; - wxSearchButton *m_cancelButton; -#if wxUSE_MENUS - wxMenu *m_menu; -#endif // wxUSE_MENUS - - bool m_searchButtonVisible; - bool m_cancelButtonVisible; - - bool m_searchBitmapUser; - bool m_cancelBitmapUser; -#if wxUSE_MENUS - bool m_searchMenuBitmapUser; -#endif // wxUSE_MENUS - - wxBitmap m_searchBitmap; - wxBitmap m_cancelBitmap; -#if wxUSE_MENUS - wxBitmap m_searchMenuBitmap; -#endif // wxUSE_MENUS - -private: - wxDECLARE_DYNAMIC_CLASS(wxSearchCtrl); - - wxDECLARE_EVENT_TABLE(); -}; - -#endif // wxUSE_SEARCHCTRL - -#endif // _WX_GENERIC_SEARCHCTRL_H_ - diff --git a/Externals/wxWidgets3/include/wx/generic/statbmpg.h b/Externals/wxWidgets3/include/wx/generic/statbmpg.h deleted file mode 100644 index e915473420..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/statbmpg.h +++ /dev/null @@ -1,83 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/statbmpg.h -// Purpose: wxGenericStaticBitmap header -// Author: Marcin Wojdyr, Stefan Csomor -// Created: 2008-06-16 -// Copyright: wxWidgets developers -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GENERIC_STATBMP_H_ -#define _WX_GENERIC_STATBMP_H_ - -#include "wx/statbmp.h" - -class WXDLLIMPEXP_CORE wxGenericStaticBitmap : public wxStaticBitmapBase -{ -public: - wxGenericStaticBitmap() {} - wxGenericStaticBitmap(wxWindow *parent, - wxWindowID id, - const wxBitmap& bitmap, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxStaticBitmapNameStr) - { - Create(parent, id, bitmap, pos, size, style, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxBitmap& bitmap, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxStaticBitmapNameStr); - - virtual void SetBitmap(const wxBitmap& bitmap) wxOVERRIDE - { - m_bitmap = bitmap; - SetInitialSize(GetBitmapSize()); - Refresh(); - } - - virtual wxBitmap GetBitmap() const wxOVERRIDE { return m_bitmap; } - - virtual void SetIcon(const wxIcon& icon) wxOVERRIDE - { - m_bitmap.CopyFromIcon(icon); - SetInitialSize(GetBitmapSize()); - Refresh(); - } - -#if defined(__WXGTK20__) || defined(__WXMAC__) - // icons and bitmaps are really the same thing in wxGTK and wxMac - wxIcon GetIcon() const wxOVERRIDE { return (const wxIcon &)m_bitmap; } -#endif - - virtual void SetScaleMode(ScaleMode scaleMode) wxOVERRIDE - { - m_scaleMode = scaleMode; - Refresh(); - } - - virtual ScaleMode GetScaleMode() const wxOVERRIDE { return m_scaleMode; } - -private: - wxSize GetBitmapSize() - { - return m_bitmap.IsOk() ? m_bitmap.GetScaledSize() - : wxSize(16, 16); // this is completely arbitrary - } - - void OnPaint(wxPaintEvent& event); - - wxBitmap m_bitmap; - ScaleMode m_scaleMode; - - wxDECLARE_DYNAMIC_CLASS(wxGenericStaticBitmap); -}; - - -#endif //_WX_GENERIC_STATBMP_H_ diff --git a/Externals/wxWidgets3/include/wx/generic/statline.h b/Externals/wxWidgets3/include/wx/generic/statline.h deleted file mode 100644 index 5cd06f3714..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/statline.h +++ /dev/null @@ -1,61 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/statline.h -// Purpose: a generic wxStaticLine class -// Author: Vadim Zeitlin -// Created: 28.06.99 -// Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GENERIC_STATLINE_H_ -#define _WX_GENERIC_STATLINE_H_ - -class wxStaticBox; - -// ---------------------------------------------------------------------------- -// wxStaticLine -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxStaticLine : public wxStaticLineBase -{ - wxDECLARE_DYNAMIC_CLASS(wxStaticLine); - -public: - // constructors and pseudo-constructors - wxStaticLine() { m_statbox = NULL; } - - wxStaticLine( wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - long style = wxLI_HORIZONTAL, - const wxString &name = wxStaticLineNameStr ) - { - Create(parent, id, pos, size, style, name); - } - - virtual ~wxStaticLine(); - - bool Create( wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - long style = wxLI_HORIZONTAL, - const wxString &name = wxStaticLineNameStr ); - - // it's necessary to override this wxWindow function because we - // will want to return the main widget for m_statbox - // - WXWidget GetMainWidget() const; - - // override wxWindow methods to make things work - virtual void DoSetSize(int x, int y, int width, int height, - int sizeFlags = wxSIZE_AUTO); - virtual void DoMoveWindow(int x, int y, int width, int height); -protected: - // we implement the static line using a static box - wxStaticBox *m_statbox; -}; - -#endif // _WX_GENERIC_STATLINE_H_ - diff --git a/Externals/wxWidgets3/include/wx/generic/stattextg.h b/Externals/wxWidgets3/include/wx/generic/stattextg.h deleted file mode 100644 index 2a85d99c17..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/stattextg.h +++ /dev/null @@ -1,90 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/stattextg.h -// Purpose: wxGenericStaticText header -// Author: Marcin Wojdyr -// Created: 2008-06-26 -// Copyright: Marcin Wojdyr -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GENERIC_STATTEXTG_H_ -#define _WX_GENERIC_STATTEXTG_H_ - -// prevent it from including the platform-specific wxStaticText declaration as -// this is not going to compile if it derives from wxGenericStaticText defined -// below (currently this is only the case in wxUniv but it could also happen -// with other ports) -#define wxNO_PORT_STATTEXT_INCLUDE -#include "wx/stattext.h" -#undef wxNO_PORT_STATTEXT_INCLUDE - -class WXDLLIMPEXP_CORE wxGenericStaticText : public wxStaticTextBase -{ -public: - wxGenericStaticText() { Init(); } - - wxGenericStaticText(wxWindow *parent, - wxWindowID id, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxStaticTextNameStr) - { - Init(); - - Create(parent, id, label, pos, size, style, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxStaticTextNameStr); - - virtual ~wxGenericStaticText(); - - - // overridden base class virtual methods - virtual void SetLabel(const wxString& label) wxOVERRIDE; - virtual bool SetFont(const wxFont &font) wxOVERRIDE; - -protected: - virtual wxSize DoGetBestClientSize() const wxOVERRIDE; - - virtual wxString DoGetLabel() const wxOVERRIDE { return m_label; } - virtual void DoSetLabel(const wxString& label) wxOVERRIDE; - - void DoSetSize(int x, int y, int width, int height, int sizeFlags) wxOVERRIDE; - -#if wxUSE_MARKUP - virtual bool DoSetLabelMarkup(const wxString& markup) wxOVERRIDE; -#endif // wxUSE_MARKUP - -private: - void Init() - { -#if wxUSE_MARKUP - m_markupText = NULL; -#endif // wxUSE_MARKUP - } - - void OnPaint(wxPaintEvent& event); - - void DoDrawLabel(wxDC& dc, const wxRect& rect); - - // These fields are only used if m_markupText == NULL. - wxString m_label; - int m_mnemonic; - -#if wxUSE_MARKUP - class wxMarkupText *m_markupText; -#endif // wxUSE_MARKUP - - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxGenericStaticText); -}; - -#endif // _WX_GENERIC_STATTEXTG_H_ - diff --git a/Externals/wxWidgets3/include/wx/generic/statusbr.h b/Externals/wxWidgets3/include/wx/generic/statusbr.h deleted file mode 100644 index 6d0edd6ec2..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/statusbr.h +++ /dev/null @@ -1,119 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/statusbr.h -// Purpose: wxStatusBarGeneric class -// Author: Julian Smart -// Modified by: VZ at 05.02.00 to derive from wxStatusBarBase -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GENERIC_STATUSBR_H_ -#define _WX_GENERIC_STATUSBR_H_ - -#include "wx/defs.h" - -#if wxUSE_STATUSBAR - -#include "wx/pen.h" -#include "wx/arrstr.h" - - -// ---------------------------------------------------------------------------- -// wxStatusBarGeneric -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxStatusBarGeneric : public wxStatusBarBase -{ -public: - wxStatusBarGeneric() { Init(); } - wxStatusBarGeneric(wxWindow *parent, - wxWindowID winid = wxID_ANY, - long style = wxSTB_DEFAULT_STYLE, - const wxString& name = wxStatusBarNameStr) - { - Init(); - - Create(parent, winid, style, name); - } - - virtual ~wxStatusBarGeneric(); - - bool Create(wxWindow *parent, wxWindowID winid = wxID_ANY, - long style = wxSTB_DEFAULT_STYLE, - const wxString& name = wxStatusBarNameStr); - - // implement base class methods - virtual void SetStatusWidths(int n, const int widths_field[]) wxOVERRIDE; - virtual bool GetFieldRect(int i, wxRect& rect) const wxOVERRIDE; - virtual void SetMinHeight(int height) wxOVERRIDE; - - virtual int GetBorderX() const wxOVERRIDE { return m_borderX; } - virtual int GetBorderY() const wxOVERRIDE { return m_borderY; } - - - // implementation only (not part of wxStatusBar public API): - - int GetFieldFromPoint(const wxPoint& point) const; - -protected: - virtual void DoUpdateStatusText(int number) wxOVERRIDE; - - // event handlers - void OnPaint(wxPaintEvent& event); - void OnSize(wxSizeEvent& event); - - void OnLeftDown(wxMouseEvent& event); - void OnRightDown(wxMouseEvent& event); - - // Responds to colour changes - void OnSysColourChanged(wxSysColourChangedEvent& event); - -protected: - - virtual void DrawFieldText(wxDC& dc, const wxRect& rc, int i, int textHeight); - virtual void DrawField(wxDC& dc, int i, int textHeight); - - void SetBorderX(int x); - void SetBorderY(int y); - - virtual void InitColours(); - - // true if the status bar shows the size grip: for this it must have - // wxSTB_SIZEGRIP style and the window it is attached to must be resizable - // and not maximized - bool ShowsSizeGrip() const; - - // returns the position and the size of the size grip - wxRect GetSizeGripRect() const; - - // common part of all ctors - void Init(); - - // the last known size, fields widths must be updated whenever it's out of - // date - wxSize m_lastClientSize; - - // the absolute widths of the status bar panes in pixels - wxArrayInt m_widthsAbs; - - int m_borderX; - int m_borderY; - - wxPen m_mediumShadowPen; - wxPen m_hilightPen; - - virtual wxSize DoGetBestSize() const wxOVERRIDE; - -private: - // Update m_lastClientSize and m_widthsAbs from the current size. - void DoUpdateFieldWidths(); - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxStatusBarGeneric); -}; - -#endif // wxUSE_STATUSBAR - -#endif - // _WX_GENERIC_STATUSBR_H_ diff --git a/Externals/wxWidgets3/include/wx/generic/tabg.h b/Externals/wxWidgets3/include/wx/generic/tabg.h deleted file mode 100644 index c9c4fe6021..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/tabg.h +++ /dev/null @@ -1,358 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/tabg.h -// Purpose: Generic tabbed dialogs; used by wxMotif's wxNotebook -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __TABGH_G__ -#define __TABGH_G__ - -#define WXTAB_VERSION 1.1 - -#include "wx/hashmap.h" -#include "wx/string.h" -#include "wx/dialog.h" -#include "wx/panel.h" -#include "wx/list.h" - -class WXDLLIMPEXP_FWD_CORE wxTabView; - -/* - * A wxTabControl is the internal and visual representation - * of the tab. - */ - -class WXDLLIMPEXP_CORE wxTabControl: public wxObject -{ - wxDECLARE_DYNAMIC_CLASS(wxTabControl); -public: - wxTabControl(wxTabView *v = NULL); - virtual ~wxTabControl(void); - - virtual void OnDraw(wxDC& dc, bool lastInRow); - void SetLabel(const wxString& str) { m_controlLabel = str; } - wxString GetLabel(void) const { return m_controlLabel; } - - void SetFont(const wxFont& f) { m_labelFont = f; } - wxFont *GetFont(void) const { return (wxFont*) & m_labelFont; } - - void SetSelected(bool sel) { m_isSelected = sel; } - bool IsSelected(void) const { return m_isSelected; } - - void SetPosition(int x, int y) { m_offsetX = x; m_offsetY = y; } - void SetSize(int x, int y) { m_width = x; m_height = y; } - - void SetRowPosition(int r) { m_rowPosition = r; } - int GetRowPosition() const { return m_rowPosition; } - void SetColPosition(int c) { m_colPosition = c; } - int GetColPosition() const { return m_colPosition; } - - int GetX(void) const { return m_offsetX; } - int GetY(void) const { return m_offsetY; } - int GetWidth(void) const { return m_width; } - int GetHeight(void) const { return m_height; } - - int GetId(void) const { return m_id; } - void SetId(int i) { m_id = i; } - - virtual bool HitTest(int x, int y) const ; - -protected: - wxTabView* m_view; - wxString m_controlLabel; - bool m_isSelected; - wxFont m_labelFont; - int m_offsetX; // Offsets from top-left of tab view area (the area below the tabs) - int m_offsetY; - int m_width; - int m_height; - int m_id; - int m_rowPosition; // Position in row from 0 - int m_colPosition; // Position in col from 0 -}; - -/* - * Each wxTabLayer is a list of tabs. E.g. there - * are 3 layers in the MS Word Options dialog. - */ - -class WXDLLIMPEXP_CORE wxTabLayer: public wxList -{ -}; - -/* - * The wxTabView controls and draws the tabbed object - */ - -WX_DECLARE_LIST(wxTabLayer, wxTabLayerList); - -#define wxTAB_STYLE_DRAW_BOX 1 // Draws 3D boxes round tab layers -#define wxTAB_STYLE_COLOUR_INTERIOR 2 // Colours interior of tabs, otherwise draws outline - -class WXDLLIMPEXP_CORE wxTabView: public wxObject -{ - wxDECLARE_DYNAMIC_CLASS(wxTabView); -public: - wxTabView(long style = wxTAB_STYLE_DRAW_BOX | wxTAB_STYLE_COLOUR_INTERIOR); - virtual ~wxTabView(); - - inline int GetNumberOfLayers() const { return m_layers.GetCount(); } - inline wxTabLayerList& GetLayers() { return m_layers; } - - inline void SetWindow(wxWindow* wnd) { m_window = wnd; } - inline wxWindow* GetWindow(void) const { return m_window; } - - // Automatically positions tabs - wxTabControl *AddTab(int id, const wxString& label, wxTabControl *existingTab = NULL); - - // Remove the tab without deleting the window - bool RemoveTab(int id); - - void ClearTabs(bool deleteTabs = true); - - bool SetTabText(int id, const wxString& label); - wxString GetTabText(int id) const; - - // Layout tabs (optional, e.g. if resizing window) - void LayoutTabs(); - - // Draw all tabs - virtual void Draw(wxDC& dc); - - // Process mouse event, return false if we didn't process it - virtual bool OnEvent(wxMouseEvent& event); - - // Called when a tab is activated - virtual void OnTabActivate(int activateId, int deactivateId); - // Allows vetoing - virtual bool OnTabPreActivate(int WXUNUSED(activateId), int WXUNUSED(deactivateId) ) { return true; } - - // Allows use of application-supplied wxTabControl classes. - virtual wxTabControl *OnCreateTabControl(void) { return new wxTabControl(this); } - - void SetHighlightColour(const wxColour& col); - void SetShadowColour(const wxColour& col); - void SetBackgroundColour(const wxColour& col); - inline void SetTextColour(const wxColour& col) { m_textColour = col; } - - inline wxColour GetHighlightColour(void) const { return m_highlightColour; } - inline wxColour GetShadowColour(void) const { return m_shadowColour; } - inline wxColour GetBackgroundColour(void) const { return m_backgroundColour; } - inline wxColour GetTextColour(void) const { return m_textColour; } - inline const wxPen *GetHighlightPen(void) const { return m_highlightPen; } - inline const wxPen *GetShadowPen(void) const { return m_shadowPen; } - inline const wxPen *GetBackgroundPen(void) const { return m_backgroundPen; } - inline const wxBrush *GetBackgroundBrush(void) const { return m_backgroundBrush; } - - inline void SetViewRect(const wxRect& rect) { m_tabViewRect = rect; } - inline wxRect GetViewRect(void) const { return m_tabViewRect; } - - // Calculate tab width to fit to view, and optionally adjust the view - // to fit the tabs exactly. - int CalculateTabWidth(int noTabs, bool adjustView = false); - - inline void SetTabStyle(long style) { m_tabStyle = style; } - inline long GetTabStyle(void) const { return m_tabStyle; } - - inline void SetTabSize(int w, int h) { m_tabWidth = w; m_tabHeight = h; } - inline int GetTabWidth(void) const { return m_tabWidth; } - inline int GetTabHeight(void) const { return m_tabHeight; } - inline void SetTabSelectionHeight(int h) { m_tabSelectionHeight = h; } - inline int GetTabSelectionHeight(void) const { return m_tabSelectionHeight; } - - // Returns the total height of the tabs component -- this may be several - // times the height of a tab, if there are several tab layers (rows). - int GetTotalTabHeight(); - - inline int GetTopMargin(void) const { return m_topMargin; } - inline void SetTopMargin(int margin) { m_topMargin = margin; } - - void SetTabSelection(int sel, bool activateTool = true); - inline int GetTabSelection() const { return m_tabSelection; } - - // Find tab control for id - wxTabControl *FindTabControlForId(int id) const ; - - // Find tab control for layer, position (starting from zero) - wxTabControl *FindTabControlForPosition(int layer, int position) const ; - - inline int GetHorizontalTabOffset() const { return m_tabHorizontalOffset; } - inline int GetHorizontalTabSpacing() const { return m_tabHorizontalSpacing; } - inline void SetHorizontalTabOffset(int sp) { m_tabHorizontalOffset = sp; } - inline void SetHorizontalTabSpacing(int sp) { m_tabHorizontalSpacing = sp; } - - inline void SetVerticalTabTextSpacing(int s) { m_tabVerticalTextSpacing = s; } - inline int GetVerticalTabTextSpacing() const { return m_tabVerticalTextSpacing; } - - inline wxFont *GetTabFont() const { return (wxFont*) & m_tabFont; } - inline void SetTabFont(const wxFont& f) { m_tabFont = f; } - - inline wxFont *GetSelectedTabFont() const { return (wxFont*) & m_tabSelectedFont; } - inline void SetSelectedTabFont(const wxFont& f) { m_tabSelectedFont = f; } - // Find the node and the column at which this control is positioned. - wxList::compatibility_iterator FindTabNodeAndColumn(wxTabControl *control, int *col) const ; - - // Do the necessary to change to this tab - virtual bool ChangeTab(wxTabControl *control); - - // Move the selected tab to the bottom layer, if necessary, - // without calling app activation code - bool MoveSelectionTab(wxTabControl *control); - - inline int GetNumberOfTabs() const { return m_noTabs; } - -protected: - // List of layers, from front to back. - wxTabLayerList m_layers; - - // Selected tab - int m_tabSelection; - - // Usual tab height - int m_tabHeight; - - // The height of the selected tab - int m_tabSelectionHeight; - - // Usual tab width - int m_tabWidth; - - // Space between tabs - int m_tabHorizontalSpacing; - - // Space between top of normal tab and text - int m_tabVerticalTextSpacing; - - // Horizontal offset of each tab row above the first - int m_tabHorizontalOffset; - - // The distance between the bottom of the first tab row - // and the top of the client area (i.e. the margin) - int m_topMargin; - - // The position and size of the view above which the tabs are placed. - // I.e., the internal client area of the sheet. - wxRect m_tabViewRect; - - // Bitlist of styles - long m_tabStyle; - - // Colours - wxColour m_highlightColour; - wxColour m_shadowColour; - wxColour m_backgroundColour; - wxColour m_textColour; - - // Pen and brush cache - const wxPen* m_highlightPen; - const wxPen* m_shadowPen; - const wxPen* m_backgroundPen; - const wxBrush* m_backgroundBrush; - - wxFont m_tabFont; - wxFont m_tabSelectedFont; - - int m_noTabs; - - wxWindow* m_window; -}; - -/* - * A dialog box class that is tab-friendly - */ - -class WXDLLIMPEXP_CORE wxTabbedDialog : public wxDialog -{ - wxDECLARE_DYNAMIC_CLASS(wxTabbedDialog); - -public: - wxTabbedDialog(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long windowStyle = wxDEFAULT_DIALOG_STYLE, - const wxString& name = wxDialogNameStr); - virtual ~wxTabbedDialog(); - - wxTabView *GetTabView() const { return m_tabView; } - void SetTabView(wxTabView *v) { m_tabView = v; } - - void OnCloseWindow(wxCloseEvent& event); - void OnMouseEvent(wxMouseEvent& event); - void OnPaint(wxPaintEvent& event); - -protected: - wxTabView* m_tabView; - -private: - wxDECLARE_EVENT_TABLE(); -}; - -/* - * A panel class that is tab-friendly - */ - -class WXDLLIMPEXP_CORE wxTabbedPanel : public wxPanel -{ - wxDECLARE_DYNAMIC_CLASS(wxTabbedPanel); - -public: - wxTabbedPanel(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long windowStyle = 0, - const wxString& name = wxPanelNameStr); - virtual ~wxTabbedPanel(); - - wxTabView *GetTabView() const { return m_tabView; } - void SetTabView(wxTabView *v) { m_tabView = v; } - - void OnMouseEvent(wxMouseEvent& event); - void OnPaint(wxPaintEvent& event); - -protected: - wxTabView* m_tabView; - -private: - wxDECLARE_EVENT_TABLE(); -}; - -WX_DECLARE_HASH_MAP(int, wxWindow*, wxIntegerHash, wxIntegerEqual, - wxIntToWindowHashMap); - -class WXDLLIMPEXP_CORE wxPanelTabView : public wxTabView -{ - wxDECLARE_DYNAMIC_CLASS(wxPanelTabView); - -public: - wxPanelTabView(wxPanel *pan, long style = wxTAB_STYLE_DRAW_BOX | wxTAB_STYLE_COLOUR_INTERIOR); - virtual ~wxPanelTabView(void); - - // Called when a tab is activated - virtual void OnTabActivate(int activateId, int deactivateId); - - // Specific to this class - void AddTabWindow(int id, wxWindow *window); - wxWindow *GetTabWindow(int id) const ; - void ClearWindows(bool deleteWindows = true); - wxWindow *GetCurrentWindow() const { return m_currentWindow; } - - void ShowWindowForTab(int id); - // wxList& GetWindows() const { return (wxList&) m_tabWindows; } - -protected: - // List of panels, one for each tab. Indexed - // by tab ID. - wxIntToWindowHashMap m_tabWindows; - wxWindow* m_currentWindow; - wxPanel* m_panel; -}; - -#endif - diff --git a/Externals/wxWidgets3/include/wx/generic/textdlgg.h b/Externals/wxWidgets3/include/wx/generic/textdlgg.h deleted file mode 100644 index a3749844fd..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/textdlgg.h +++ /dev/null @@ -1,149 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/textdlgg.h -// Purpose: wxTextEntryDialog class -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_TEXTDLGG_H_ -#define _WX_TEXTDLGG_H_ - -#include "wx/defs.h" - -#if wxUSE_TEXTDLG - -#include "wx/dialog.h" - -#if wxUSE_VALIDATORS -#include "wx/valtext.h" -#include "wx/textctrl.h" -#endif - -class WXDLLIMPEXP_FWD_CORE wxTextCtrl; - -extern WXDLLIMPEXP_DATA_CORE(const char) wxGetTextFromUserPromptStr[]; -extern WXDLLIMPEXP_DATA_CORE(const char) wxGetPasswordFromUserPromptStr[]; - -#define wxTextEntryDialogStyle (wxOK | wxCANCEL | wxCENTRE) - -// ---------------------------------------------------------------------------- -// wxTextEntryDialog: a dialog with text control, [ok] and [cancel] buttons -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxTextEntryDialog : public wxDialog -{ -public: - wxTextEntryDialog() - { - m_textctrl = NULL; - } - - wxTextEntryDialog(wxWindow *parent, - const wxString& message, - const wxString& caption = wxGetTextFromUserPromptStr, - const wxString& value = wxEmptyString, - long style = wxTextEntryDialogStyle, - const wxPoint& pos = wxDefaultPosition) - { - Create(parent, message, caption, value, style, pos); - } - - bool Create(wxWindow *parent, - const wxString& message, - const wxString& caption = wxGetTextFromUserPromptStr, - const wxString& value = wxEmptyString, - long style = wxTextEntryDialogStyle, - const wxPoint& pos = wxDefaultPosition); - - void SetValue(const wxString& val); - wxString GetValue() const { return m_value; } - - void SetMaxLength(unsigned long len); - - void ForceUpper(); - -#if wxUSE_VALIDATORS - void SetTextValidator( const wxTextValidator& validator ); -#if WXWIN_COMPATIBILITY_2_8 - wxDEPRECATED( void SetTextValidator( long style ) ); -#endif - void SetTextValidator( wxTextValidatorStyle style = wxFILTER_NONE ); - wxTextValidator* GetTextValidator() { return (wxTextValidator*)m_textctrl->GetValidator(); } -#endif // wxUSE_VALIDATORS - - virtual bool TransferDataToWindow() wxOVERRIDE; - virtual bool TransferDataFromWindow() wxOVERRIDE; - - // implementation only - void OnOK(wxCommandEvent& event); - -protected: - wxTextCtrl *m_textctrl; - wxString m_value; - long m_dialogStyle; - -private: - wxDECLARE_EVENT_TABLE(); - wxDECLARE_DYNAMIC_CLASS(wxTextEntryDialog); - wxDECLARE_NO_COPY_CLASS(wxTextEntryDialog); -}; - -// ---------------------------------------------------------------------------- -// wxPasswordEntryDialog: dialog with password control, [ok] and [cancel] -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxPasswordEntryDialog : public wxTextEntryDialog -{ -public: - wxPasswordEntryDialog() { } - wxPasswordEntryDialog(wxWindow *parent, - const wxString& message, - const wxString& caption = wxGetPasswordFromUserPromptStr, - const wxString& value = wxEmptyString, - long style = wxTextEntryDialogStyle, - const wxPoint& pos = wxDefaultPosition) - { - Create(parent, message, caption, value, style, pos); - } - - bool Create(wxWindow *parent, - const wxString& message, - const wxString& caption = wxGetPasswordFromUserPromptStr, - const wxString& value = wxEmptyString, - long style = wxTextEntryDialogStyle, - const wxPoint& pos = wxDefaultPosition); - - -private: - wxDECLARE_DYNAMIC_CLASS(wxPasswordEntryDialog); - wxDECLARE_NO_COPY_CLASS(wxPasswordEntryDialog); -}; - -// ---------------------------------------------------------------------------- -// function to get a string from user -// ---------------------------------------------------------------------------- - -WXDLLIMPEXP_CORE wxString - wxGetTextFromUser(const wxString& message, - const wxString& caption = wxGetTextFromUserPromptStr, - const wxString& default_value = wxEmptyString, - wxWindow *parent = NULL, - wxCoord x = wxDefaultCoord, - wxCoord y = wxDefaultCoord, - bool centre = true); - -WXDLLIMPEXP_CORE wxString - wxGetPasswordFromUser(const wxString& message, - const wxString& caption = wxGetPasswordFromUserPromptStr, - const wxString& default_value = wxEmptyString, - wxWindow *parent = NULL, - wxCoord x = wxDefaultCoord, - wxCoord y = wxDefaultCoord, - bool centre = true); - -#endif - // wxUSE_TEXTDLG -#endif // _WX_TEXTDLGG_H_ diff --git a/Externals/wxWidgets3/include/wx/generic/timectrl.h b/Externals/wxWidgets3/include/wx/generic/timectrl.h deleted file mode 100644 index 20b02498bd..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/timectrl.h +++ /dev/null @@ -1,69 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/timectrl.h -// Purpose: Generic implementation of wxTimePickerCtrl. -// Author: Paul Breen, Vadim Zeitlin -// Created: 2011-09-22 -// Copyright: (c) 2011 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GENERIC_TIMECTRL_H_ -#define _WX_GENERIC_TIMECTRL_H_ - -#include "wx/containr.h" -#include "wx/compositewin.h" - -class WXDLLIMPEXP_ADV wxTimePickerCtrlGeneric - : public wxCompositeWindow< wxNavigationEnabled > -{ -public: - typedef wxCompositeWindow< wxNavigationEnabled > Base; - - // Creating the control. - wxTimePickerCtrlGeneric() { Init(); } - virtual ~wxTimePickerCtrlGeneric(); - wxTimePickerCtrlGeneric(wxWindow *parent, - wxWindowID id, - const wxDateTime& date = wxDefaultDateTime, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxTP_DEFAULT, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxTimePickerCtrlNameStr) - { - Init(); - - (void)Create(parent, id, date, pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxDateTime& date = wxDefaultDateTime, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxTP_DEFAULT, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxTimePickerCtrlNameStr); - - // Implement pure virtual wxTimePickerCtrlBase methods. - virtual void SetValue(const wxDateTime& date); - virtual wxDateTime GetValue() const; - -protected: - virtual wxSize DoGetBestSize() const; - - virtual void DoMoveWindow(int x, int y, int width, int height); - -private: - void Init(); - - // Return the list of the windows composing this one. - virtual wxWindowList GetCompositeWindowParts() const; - - // Implementation data. - class wxTimePickerGenericImpl* m_impl; - - wxDECLARE_NO_COPY_CLASS(wxTimePickerCtrlGeneric); -}; - -#endif // _WX_GENERIC_TIMECTRL_H_ diff --git a/Externals/wxWidgets3/include/wx/generic/treectlg.h b/Externals/wxWidgets3/include/wx/generic/treectlg.h deleted file mode 100644 index 4fec700066..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/treectlg.h +++ /dev/null @@ -1,390 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/treectlg.h -// Purpose: wxTreeCtrl class -// Author: Robert Roebling -// Modified by: -// Created: 01/02/97 -// Copyright: (c) 1997,1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _GENERIC_TREECTRL_H_ -#define _GENERIC_TREECTRL_H_ - -#if wxUSE_TREECTRL - -#include "wx/scrolwin.h" -#include "wx/pen.h" - -// ----------------------------------------------------------------------------- -// forward declaration -// ----------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxGenericTreeItem; - -class WXDLLIMPEXP_FWD_CORE wxTreeItemData; - -class WXDLLIMPEXP_FWD_CORE wxTreeRenameTimer; -class WXDLLIMPEXP_FWD_CORE wxTreeFindTimer; -class WXDLLIMPEXP_FWD_CORE wxTreeTextCtrl; -class WXDLLIMPEXP_FWD_CORE wxTextCtrl; - -// ----------------------------------------------------------------------------- -// wxGenericTreeCtrl - the tree control -// ----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxGenericTreeCtrl : public wxTreeCtrlBase, - public wxScrollHelper -{ -public: - // creation - // -------- - - wxGenericTreeCtrl() : wxTreeCtrlBase(), wxScrollHelper(this) { Init(); } - - wxGenericTreeCtrl(wxWindow *parent, wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxTR_DEFAULT_STYLE, - const wxValidator &validator = wxDefaultValidator, - const wxString& name = wxTreeCtrlNameStr) - : wxTreeCtrlBase(), - wxScrollHelper(this) - { - Init(); - Create(parent, id, pos, size, style, validator, name); - } - - virtual ~wxGenericTreeCtrl(); - - bool Create(wxWindow *parent, wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxTR_DEFAULT_STYLE, - const wxValidator &validator = wxDefaultValidator, - const wxString& name = wxTreeCtrlNameStr); - - // implement base class pure virtuals - // ---------------------------------- - - virtual unsigned int GetCount() const wxOVERRIDE; - - virtual unsigned int GetIndent() const wxOVERRIDE { return m_indent; } - virtual void SetIndent(unsigned int indent) wxOVERRIDE; - - - virtual void SetImageList(wxImageList *imageList) wxOVERRIDE; - virtual void SetStateImageList(wxImageList *imageList) wxOVERRIDE; - - virtual wxString GetItemText(const wxTreeItemId& item) const wxOVERRIDE; - virtual int GetItemImage(const wxTreeItemId& item, - wxTreeItemIcon which = wxTreeItemIcon_Normal) const wxOVERRIDE; - virtual wxTreeItemData *GetItemData(const wxTreeItemId& item) const wxOVERRIDE; - virtual wxColour GetItemTextColour(const wxTreeItemId& item) const wxOVERRIDE; - virtual wxColour GetItemBackgroundColour(const wxTreeItemId& item) const wxOVERRIDE; - virtual wxFont GetItemFont(const wxTreeItemId& item) const wxOVERRIDE; - - virtual void SetItemText(const wxTreeItemId& item, const wxString& text) wxOVERRIDE; - virtual void SetItemImage(const wxTreeItemId& item, - int image, - wxTreeItemIcon which = wxTreeItemIcon_Normal) wxOVERRIDE; - virtual void SetItemData(const wxTreeItemId& item, wxTreeItemData *data) wxOVERRIDE; - - virtual void SetItemHasChildren(const wxTreeItemId& item, bool has = true) wxOVERRIDE; - virtual void SetItemBold(const wxTreeItemId& item, bool bold = true) wxOVERRIDE; - virtual void SetItemDropHighlight(const wxTreeItemId& item, bool highlight = true) wxOVERRIDE; - virtual void SetItemTextColour(const wxTreeItemId& item, const wxColour& col) wxOVERRIDE; - virtual void SetItemBackgroundColour(const wxTreeItemId& item, const wxColour& col) wxOVERRIDE; - virtual void SetItemFont(const wxTreeItemId& item, const wxFont& font) wxOVERRIDE; - - virtual bool IsVisible(const wxTreeItemId& item) const wxOVERRIDE; - virtual bool ItemHasChildren(const wxTreeItemId& item) const wxOVERRIDE; - virtual bool IsExpanded(const wxTreeItemId& item) const wxOVERRIDE; - virtual bool IsSelected(const wxTreeItemId& item) const wxOVERRIDE; - virtual bool IsBold(const wxTreeItemId& item) const wxOVERRIDE; - - virtual size_t GetChildrenCount(const wxTreeItemId& item, - bool recursively = true) const wxOVERRIDE; - - // navigation - // ---------- - - virtual wxTreeItemId GetRootItem() const wxOVERRIDE { return m_anchor; } - virtual wxTreeItemId GetSelection() const wxOVERRIDE - { - wxASSERT_MSG( !HasFlag(wxTR_MULTIPLE), - wxT("must use GetSelections() with this control") ); - - return m_current; - } - virtual size_t GetSelections(wxArrayTreeItemIds&) const wxOVERRIDE; - virtual wxTreeItemId GetFocusedItem() const wxOVERRIDE { return m_current; } - - virtual void ClearFocusedItem() wxOVERRIDE; - virtual void SetFocusedItem(const wxTreeItemId& item) wxOVERRIDE; - - virtual wxTreeItemId GetItemParent(const wxTreeItemId& item) const wxOVERRIDE; - virtual wxTreeItemId GetFirstChild(const wxTreeItemId& item, - wxTreeItemIdValue& cookie) const wxOVERRIDE; - virtual wxTreeItemId GetNextChild(const wxTreeItemId& item, - wxTreeItemIdValue& cookie) const wxOVERRIDE; - virtual wxTreeItemId GetLastChild(const wxTreeItemId& item) const wxOVERRIDE; - virtual wxTreeItemId GetNextSibling(const wxTreeItemId& item) const wxOVERRIDE; - virtual wxTreeItemId GetPrevSibling(const wxTreeItemId& item) const wxOVERRIDE; - - virtual wxTreeItemId GetFirstVisibleItem() const wxOVERRIDE; - virtual wxTreeItemId GetNextVisible(const wxTreeItemId& item) const wxOVERRIDE; - virtual wxTreeItemId GetPrevVisible(const wxTreeItemId& item) const wxOVERRIDE; - - - // operations - // ---------- - - virtual wxTreeItemId AddRoot(const wxString& text, - int image = -1, int selectedImage = -1, - wxTreeItemData *data = NULL) wxOVERRIDE; - - virtual void Delete(const wxTreeItemId& item) wxOVERRIDE; - virtual void DeleteChildren(const wxTreeItemId& item) wxOVERRIDE; - virtual void DeleteAllItems() wxOVERRIDE; - - virtual void Expand(const wxTreeItemId& item) wxOVERRIDE; - virtual void Collapse(const wxTreeItemId& item) wxOVERRIDE; - virtual void CollapseAndReset(const wxTreeItemId& item) wxOVERRIDE; - virtual void Toggle(const wxTreeItemId& item) wxOVERRIDE; - - virtual void Unselect() wxOVERRIDE; - virtual void UnselectAll() wxOVERRIDE; - virtual void SelectItem(const wxTreeItemId& item, bool select = true) wxOVERRIDE; - virtual void SelectChildren(const wxTreeItemId& parent) wxOVERRIDE; - - virtual void EnsureVisible(const wxTreeItemId& item) wxOVERRIDE; - virtual void ScrollTo(const wxTreeItemId& item) wxOVERRIDE; - - virtual wxTextCtrl *EditLabel(const wxTreeItemId& item, - wxClassInfo* textCtrlClass = wxCLASSINFO(wxTextCtrl)) wxOVERRIDE; - virtual wxTextCtrl *GetEditControl() const wxOVERRIDE; - virtual void EndEditLabel(const wxTreeItemId& item, - bool discardChanges = false) wxOVERRIDE; - - virtual void EnableBellOnNoMatch(bool on = true) wxOVERRIDE; - - virtual void SortChildren(const wxTreeItemId& item) wxOVERRIDE; - - // items geometry - // -------------- - - virtual bool GetBoundingRect(const wxTreeItemId& item, - wxRect& rect, - bool textOnly = false) const wxOVERRIDE; - - - // this version specific methods - // ----------------------------- - - wxImageList *GetButtonsImageList() const { return m_imageListButtons; } - void SetButtonsImageList(wxImageList *imageList); - void AssignButtonsImageList(wxImageList *imageList); - - void SetDropEffectAboveItem( bool above = false ) { m_dropEffectAboveItem = above; } - bool GetDropEffectAboveItem() const { return m_dropEffectAboveItem; } - - wxTreeItemId GetNext(const wxTreeItemId& item) const; - - // implementation only from now on - - // overridden base class virtuals - virtual bool SetBackgroundColour(const wxColour& colour) wxOVERRIDE; - virtual bool SetForegroundColour(const wxColour& colour) wxOVERRIDE; - - virtual void Refresh(bool eraseBackground = true, const wxRect *rect = NULL) wxOVERRIDE; - - virtual bool SetFont( const wxFont &font ) wxOVERRIDE; - virtual void SetWindowStyleFlag(long styles) wxOVERRIDE; - - // callbacks - void OnPaint( wxPaintEvent &event ); - void OnSetFocus( wxFocusEvent &event ); - void OnKillFocus( wxFocusEvent &event ); - void OnKeyDown( wxKeyEvent &event ); - void OnChar( wxKeyEvent &event ); - void OnMouse( wxMouseEvent &event ); - void OnGetToolTip( wxTreeEvent &event ); - void OnSize( wxSizeEvent &event ); - void OnInternalIdle( ) wxOVERRIDE; - - virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE - { - return GetClassDefaultAttributes(GetWindowVariant()); - } - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - // implementation helpers - void AdjustMyScrollbars(); - - WX_FORWARD_TO_SCROLL_HELPER() - -protected: - friend class wxGenericTreeItem; - friend class wxTreeRenameTimer; - friend class wxTreeFindTimer; - friend class wxTreeTextCtrl; - - wxFont m_normalFont; - wxFont m_boldFont; - - wxGenericTreeItem *m_anchor; - wxGenericTreeItem *m_current, - *m_key_current, - // A hint to select a parent item after deleting a child - *m_select_me; - unsigned short m_indent; - int m_lineHeight; - wxPen m_dottedPen; - wxBrush *m_hilightBrush, - *m_hilightUnfocusedBrush; - bool m_hasFocus; - bool m_dirty; - bool m_ownsImageListButtons; - bool m_isDragging; // true between BEGIN/END drag events - bool m_lastOnSame; // last click on the same item as prev - wxImageList *m_imageListButtons; - - int m_dragCount; - wxPoint m_dragStart; - wxGenericTreeItem *m_dropTarget; - wxCursor m_oldCursor; // cursor is changed while dragging - wxGenericTreeItem *m_oldSelection; - wxGenericTreeItem *m_underMouse; // for visual effects - - enum { NoEffect, BorderEffect, AboveEffect, BelowEffect } m_dndEffect; - wxGenericTreeItem *m_dndEffectItem; - - wxTreeTextCtrl *m_textCtrl; - - - wxTimer *m_renameTimer; - - // incremental search data - wxString m_findPrefix; - wxTimer *m_findTimer; - // This flag is set to 0 if the bell is disabled, 1 if it is enabled and -1 - // if it is globally enabled but has been temporarily disabled because we - // had already beeped for this particular search. - int m_findBell; - - bool m_dropEffectAboveItem; - - // the common part of all ctors - void Init(); - - // overridden wxWindow methods - virtual void DoThaw() wxOVERRIDE; - - // misc helpers - void SendDeleteEvent(wxGenericTreeItem *itemBeingDeleted); - - void DrawBorder(const wxTreeItemId& item); - void DrawLine(const wxTreeItemId& item, bool below); - void DrawDropEffect(wxGenericTreeItem *item); - - void DoSelectItem(const wxTreeItemId& id, - bool unselect_others = true, - bool extended_select = false); - - virtual int DoGetItemState(const wxTreeItemId& item) const wxOVERRIDE; - virtual void DoSetItemState(const wxTreeItemId& item, int state) wxOVERRIDE; - - virtual wxTreeItemId DoInsertItem(const wxTreeItemId& parent, - size_t previous, - const wxString& text, - int image, - int selectedImage, - wxTreeItemData *data) wxOVERRIDE; - virtual wxTreeItemId DoInsertAfter(const wxTreeItemId& parent, - const wxTreeItemId& idPrevious, - const wxString& text, - int image = -1, int selImage = -1, - wxTreeItemData *data = NULL) wxOVERRIDE; - virtual wxTreeItemId DoTreeHitTest(const wxPoint& point, int& flags) const wxOVERRIDE; - - // called by wxTextTreeCtrl when it marks itself for deletion - void ResetTextControl(); - - // find the first item starting with the given prefix after the given item - wxTreeItemId FindItem(const wxTreeItemId& id, const wxString& prefix) const; - - bool HasButtons() const { return HasFlag(wxTR_HAS_BUTTONS); } - - void CalculateLineHeight(); - int GetLineHeight(wxGenericTreeItem *item) const; - void PaintLevel( wxGenericTreeItem *item, wxDC& dc, int level, int &y ); - void PaintItem( wxGenericTreeItem *item, wxDC& dc); - - void CalculateLevel( wxGenericTreeItem *item, wxDC &dc, int level, int &y ); - void CalculatePositions(); - - void RefreshSubtree( wxGenericTreeItem *item ); - void RefreshLine( wxGenericTreeItem *item ); - - // redraw all selected items - void RefreshSelected(); - - // RefreshSelected() recursive helper - void RefreshSelectedUnder(wxGenericTreeItem *item); - - void OnRenameTimer(); - bool OnRenameAccept(wxGenericTreeItem *item, const wxString& value); - void OnRenameCancelled(wxGenericTreeItem *item); - - void FillArray(wxGenericTreeItem*, wxArrayTreeItemIds&) const; - void SelectItemRange( wxGenericTreeItem *item1, wxGenericTreeItem *item2 ); - bool TagAllChildrenUntilLast(wxGenericTreeItem *crt_item, wxGenericTreeItem *last_item, bool select); - bool TagNextChildren(wxGenericTreeItem *crt_item, wxGenericTreeItem *last_item, bool select); - void UnselectAllChildren( wxGenericTreeItem *item ); - void ChildrenClosing(wxGenericTreeItem* item); - - void DoDirtyProcessing(); - - virtual wxSize DoGetBestSize() const wxOVERRIDE; - -private: - // Reset the state of the last find (i.e. keyboard incremental search) - // operation. - void ResetFindState(); - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_DYNAMIC_CLASS(wxGenericTreeCtrl); - wxDECLARE_NO_COPY_CLASS(wxGenericTreeCtrl); -}; - -#if !defined(__WXMSW__) || defined(__WXUNIVERSAL__) -/* - * wxTreeCtrl has to be a real class or we have problems with - * the run-time information. - */ - -class WXDLLIMPEXP_CORE wxTreeCtrl: public wxGenericTreeCtrl -{ - wxDECLARE_DYNAMIC_CLASS(wxTreeCtrl); - -public: - wxTreeCtrl() {} - - wxTreeCtrl(wxWindow *parent, wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxTR_DEFAULT_STYLE, - const wxValidator &validator = wxDefaultValidator, - const wxString& name = wxTreeCtrlNameStr) - : wxGenericTreeCtrl(parent, id, pos, size, style, validator, name) - { - } -}; -#endif // !__WXMSW__ || __WXUNIVERSAL__ - -#endif // wxUSE_TREECTRL - -#endif // _GENERIC_TREECTRL_H_ diff --git a/Externals/wxWidgets3/include/wx/generic/wizard.h b/Externals/wxWidgets3/include/wx/generic/wizard.h deleted file mode 100644 index 3fbe31a466..0000000000 --- a/Externals/wxWidgets3/include/wx/generic/wizard.h +++ /dev/null @@ -1,169 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/wizard.h -// Purpose: declaration of generic wxWizard class -// Author: Vadim Zeitlin -// Modified by: Robert Vazan (sizers) -// Created: 28.09.99 -// Copyright: (c) 1999 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GENERIC_WIZARD_H_ -#define _WX_GENERIC_WIZARD_H_ - -// ---------------------------------------------------------------------------- -// wxWizard -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxButton; -class WXDLLIMPEXP_FWD_CORE wxStaticBitmap; -class WXDLLIMPEXP_FWD_ADV wxWizardEvent; -class WXDLLIMPEXP_FWD_CORE wxBoxSizer; -class WXDLLIMPEXP_FWD_ADV wxWizardSizer; - -class WXDLLIMPEXP_ADV wxWizard : public wxWizardBase -{ -public: - // ctor - wxWizard() { Init(); } - wxWizard(wxWindow *parent, - int id = wxID_ANY, - const wxString& title = wxEmptyString, - const wxBitmap& bitmap = wxNullBitmap, - const wxPoint& pos = wxDefaultPosition, - long style = wxDEFAULT_DIALOG_STYLE) - { - Init(); - Create(parent, id, title, bitmap, pos, style); - } - bool Create(wxWindow *parent, - int id = wxID_ANY, - const wxString& title = wxEmptyString, - const wxBitmap& bitmap = wxNullBitmap, - const wxPoint& pos = wxDefaultPosition, - long style = wxDEFAULT_DIALOG_STYLE); - void Init(); - virtual ~wxWizard(); - - // implement base class pure virtuals - virtual bool RunWizard(wxWizardPage *firstPage) wxOVERRIDE; - virtual wxWizardPage *GetCurrentPage() const wxOVERRIDE; - virtual void SetPageSize(const wxSize& size) wxOVERRIDE; - virtual wxSize GetPageSize() const wxOVERRIDE; - virtual void FitToPage(const wxWizardPage *firstPage) wxOVERRIDE; - virtual wxSizer *GetPageAreaSizer() const wxOVERRIDE; - virtual void SetBorder(int border) wxOVERRIDE; - - /// set/get bitmap - const wxBitmap& GetBitmap() const { return m_bitmap; } - void SetBitmap(const wxBitmap& bitmap); - - // implementation only from now on - // ------------------------------- - - // is the wizard running? - bool IsRunning() const { return m_page != NULL; } - - // show the prev/next page, but call TransferDataFromWindow on the current - // page first and return false without changing the page if - // TransferDataFromWindow() returns false - otherwise, returns true - virtual bool ShowPage(wxWizardPage *page, bool goingForward = true); - - // do fill the dialog with controls - // this is app-overridable to, for example, set help and tooltip text - virtual void DoCreateControls(); - - // Do the adaptation - virtual bool DoLayoutAdaptation() wxOVERRIDE; - - // Set/get bitmap background colour - void SetBitmapBackgroundColour(const wxColour& colour) { m_bitmapBackgroundColour = colour; } - const wxColour& GetBitmapBackgroundColour() const { return m_bitmapBackgroundColour; } - - // Set/get bitmap placement (centred, tiled etc.) - void SetBitmapPlacement(int placement) { m_bitmapPlacement = placement; } - int GetBitmapPlacement() const { return m_bitmapPlacement; } - - // Set/get minimum bitmap width - void SetMinimumBitmapWidth(int w) { m_bitmapMinimumWidth = w; } - int GetMinimumBitmapWidth() const { return m_bitmapMinimumWidth; } - - // Tile bitmap - static bool TileBitmap(const wxRect& rect, wxDC& dc, const wxBitmap& bitmap); - -protected: - // for compatibility only, doesn't do anything any more - void FinishLayout() { } - - // Do fit, and adjust to screen size if necessary - virtual void DoWizardLayout(); - - // Resize bitmap if necessary - virtual bool ResizeBitmap(wxBitmap& bmp); - - // was the dialog really created? - bool WasCreated() const { return m_btnPrev != NULL; } - - // event handlers - void OnCancel(wxCommandEvent& event); - void OnBackOrNext(wxCommandEvent& event); - void OnHelp(wxCommandEvent& event); - - void OnWizEvent(wxWizardEvent& event); - - void AddBitmapRow(wxBoxSizer *mainColumn); - void AddStaticLine(wxBoxSizer *mainColumn); - void AddBackNextPair(wxBoxSizer *buttonRow); - void AddButtonRow(wxBoxSizer *mainColumn); - - // the page size requested by user - wxSize m_sizePage; - - // the dialog position from the ctor - wxPoint m_posWizard; - - // wizard state - wxWizardPage *m_page; // the current page or NULL - wxWizardPage *m_firstpage; // the page RunWizard started on or NULL - wxBitmap m_bitmap; // the default bitmap to show - - // wizard controls - wxButton *m_btnPrev, // the "" or "Finish" button - wxStaticBitmap *m_statbmp; // the control for the bitmap - - // Border around page area sizer requested using SetBorder() - int m_border; - - // Whether RunWizard() was called - bool m_started; - - // Whether was modal (modeless has to be destroyed on finish or cancel) - bool m_wasModal; - - // True if pages are laid out using the sizer - bool m_usingSizer; - - // Page area sizer will be inserted here with padding - wxBoxSizer *m_sizerBmpAndPage; - - // Actual position and size of pages - wxWizardSizer *m_sizerPage; - - // Bitmap background colour if resizing bitmap - wxColour m_bitmapBackgroundColour; - - // Bitmap placement flags - int m_bitmapPlacement; - - // Minimum bitmap width - int m_bitmapMinimumWidth; - - friend class wxWizardSizer; - - wxDECLARE_DYNAMIC_CLASS(wxWizard); - wxDECLARE_EVENT_TABLE(); - wxDECLARE_NO_COPY_CLASS(wxWizard); -}; - -#endif // _WX_GENERIC_WIZARD_H_ diff --git a/Externals/wxWidgets3/include/wx/geometry.h b/Externals/wxWidgets3/include/wx/geometry.h deleted file mode 100644 index 0d9e4551ab..0000000000 --- a/Externals/wxWidgets3/include/wx/geometry.h +++ /dev/null @@ -1,802 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/geometry.h -// Purpose: Common Geometry Classes -// Author: Stefan Csomor -// Modified by: -// Created: 08/05/99 -// Copyright: (c) 1999 Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GEOMETRY_H_ -#define _WX_GEOMETRY_H_ - -#include "wx/defs.h" - -#if wxUSE_GEOMETRY - -#include "wx/utils.h" -#include "wx/gdicmn.h" -#include "wx/math.h" - -class WXDLLIMPEXP_FWD_BASE wxDataInputStream; -class WXDLLIMPEXP_FWD_BASE wxDataOutputStream; - -// clipping from Cohen-Sutherland - -enum wxOutCode -{ - wxInside = 0x00 , - wxOutLeft = 0x01 , - wxOutRight = 0x02 , - wxOutTop = 0x08 , - wxOutBottom = 0x04 -}; - -class WXDLLIMPEXP_CORE wxPoint2DInt -{ -public : - inline wxPoint2DInt(); - inline wxPoint2DInt( wxInt32 x , wxInt32 y ); - inline wxPoint2DInt( const wxPoint2DInt &pt ); - inline wxPoint2DInt( const wxPoint &pt ); - - // noops for this class, just return the coords - inline void GetFloor( wxInt32 *x , wxInt32 *y ) const; - inline void GetRounded( wxInt32 *x , wxInt32 *y ) const; - - inline wxDouble GetVectorLength() const; - wxDouble GetVectorAngle() const; - inline void SetVectorLength( wxDouble length ); - void SetVectorAngle( wxDouble degrees ); - // set the vector length to 1.0, preserving the angle - inline void Normalize(); - - inline wxDouble GetDistance( const wxPoint2DInt &pt ) const; - inline wxDouble GetDistanceSquare( const wxPoint2DInt &pt ) const; - inline wxInt32 GetDotProduct( const wxPoint2DInt &vec ) const; - inline wxInt32 GetCrossProduct( const wxPoint2DInt &vec ) const; - - // the reflection of this point - inline wxPoint2DInt operator-(); - - inline wxPoint2DInt& operator=(const wxPoint2DInt& pt); - inline wxPoint2DInt& operator+=(const wxPoint2DInt& pt); - inline wxPoint2DInt& operator-=(const wxPoint2DInt& pt); - inline wxPoint2DInt& operator*=(const wxPoint2DInt& pt); - inline wxPoint2DInt& operator*=(wxDouble n); - inline wxPoint2DInt& operator*=(wxInt32 n); - inline wxPoint2DInt& operator/=(const wxPoint2DInt& pt); - inline wxPoint2DInt& operator/=(wxDouble n); - inline wxPoint2DInt& operator/=(wxInt32 n); - inline operator wxPoint() const; - inline bool operator==(const wxPoint2DInt& pt) const; - inline bool operator!=(const wxPoint2DInt& pt) const; - -#if wxUSE_STREAMS - void WriteTo( wxDataOutputStream &stream ) const; - void ReadFrom( wxDataInputStream &stream ); -#endif // wxUSE_STREAMS - - wxInt32 m_x; - wxInt32 m_y; -}; - -inline wxPoint2DInt operator+(const wxPoint2DInt& pt1 , const wxPoint2DInt& pt2); -inline wxPoint2DInt operator-(const wxPoint2DInt& pt1 , const wxPoint2DInt& pt2); -inline wxPoint2DInt operator*(const wxPoint2DInt& pt1 , const wxPoint2DInt& pt2); -inline wxPoint2DInt operator*(wxInt32 n , const wxPoint2DInt& pt); -inline wxPoint2DInt operator*(wxDouble n , const wxPoint2DInt& pt); -inline wxPoint2DInt operator*(const wxPoint2DInt& pt , wxInt32 n); -inline wxPoint2DInt operator*(const wxPoint2DInt& pt , wxDouble n); -inline wxPoint2DInt operator/(const wxPoint2DInt& pt1 , const wxPoint2DInt& pt2); -inline wxPoint2DInt operator/(const wxPoint2DInt& pt , wxInt32 n); -inline wxPoint2DInt operator/(const wxPoint2DInt& pt , wxDouble n); - -inline wxPoint2DInt::wxPoint2DInt() -{ - m_x = 0; - m_y = 0; -} - -inline wxPoint2DInt::wxPoint2DInt( wxInt32 x , wxInt32 y ) -{ - m_x = x; - m_y = y; -} - -inline wxPoint2DInt::wxPoint2DInt( const wxPoint2DInt &pt ) -{ - m_x = pt.m_x; - m_y = pt.m_y; -} - -inline wxPoint2DInt::wxPoint2DInt( const wxPoint &pt ) -{ - m_x = pt.x; - m_y = pt.y; -} - -inline void wxPoint2DInt::GetFloor( wxInt32 *x , wxInt32 *y ) const -{ - if ( x ) - *x = m_x; - if ( y ) - *y = m_y; -} - -inline void wxPoint2DInt::GetRounded( wxInt32 *x , wxInt32 *y ) const -{ - GetFloor(x, y); -} - -inline wxDouble wxPoint2DInt::GetVectorLength() const -{ - // cast needed MIPSpro compiler under SGI - return sqrt( (double)(m_x)*(m_x) + (m_y)*(m_y) ); -} - -inline void wxPoint2DInt::SetVectorLength( wxDouble length ) -{ - wxDouble before = GetVectorLength(); - m_x = (wxInt32)(m_x * length / before); - m_y = (wxInt32)(m_y * length / before); -} - -inline void wxPoint2DInt::Normalize() -{ - SetVectorLength( 1 ); -} - -inline wxDouble wxPoint2DInt::GetDistance( const wxPoint2DInt &pt ) const -{ - return sqrt( GetDistanceSquare( pt ) ); -} - -inline wxDouble wxPoint2DInt::GetDistanceSquare( const wxPoint2DInt &pt ) const -{ - return ( (pt.m_x-m_x)*(pt.m_x-m_x) + (pt.m_y-m_y)*(pt.m_y-m_y) ); -} - -inline wxInt32 wxPoint2DInt::GetDotProduct( const wxPoint2DInt &vec ) const -{ - return ( m_x * vec.m_x + m_y * vec.m_y ); -} - -inline wxInt32 wxPoint2DInt::GetCrossProduct( const wxPoint2DInt &vec ) const -{ - return ( m_x * vec.m_y - vec.m_x * m_y ); -} - -inline wxPoint2DInt::operator wxPoint() const -{ - return wxPoint( m_x, m_y); -} - -inline wxPoint2DInt wxPoint2DInt::operator-() -{ - return wxPoint2DInt( -m_x, -m_y); -} - -inline wxPoint2DInt& wxPoint2DInt::operator=(const wxPoint2DInt& pt) -{ - if (this != &pt) - { - m_x = pt.m_x; - m_y = pt.m_y; - } - return *this; -} - -inline wxPoint2DInt& wxPoint2DInt::operator+=(const wxPoint2DInt& pt) -{ - m_x = m_x + pt.m_x; - m_y = m_y + pt.m_y; - return *this; -} - -inline wxPoint2DInt& wxPoint2DInt::operator-=(const wxPoint2DInt& pt) -{ - m_x = m_x - pt.m_x; - m_y = m_y - pt.m_y; - return *this; -} - -inline wxPoint2DInt& wxPoint2DInt::operator*=(const wxPoint2DInt& pt) -{ - m_x = m_x * pt.m_x; - m_y = m_y * pt.m_y; - return *this; -} - -inline wxPoint2DInt& wxPoint2DInt::operator/=(const wxPoint2DInt& pt) -{ - m_x = m_x / pt.m_x; - m_y = m_y / pt.m_y; - return *this; -} - -inline bool wxPoint2DInt::operator==(const wxPoint2DInt& pt) const -{ - return m_x == pt.m_x && m_y == pt.m_y; -} - -inline bool wxPoint2DInt::operator!=(const wxPoint2DInt& pt) const -{ - return m_x != pt.m_x || m_y != pt.m_y; -} - -inline wxPoint2DInt operator+(const wxPoint2DInt& pt1 , const wxPoint2DInt& pt2) -{ - return wxPoint2DInt( pt1.m_x + pt2.m_x , pt1.m_y + pt2.m_y ); -} - -inline wxPoint2DInt operator-(const wxPoint2DInt& pt1 , const wxPoint2DInt& pt2) -{ - return wxPoint2DInt( pt1.m_x - pt2.m_x , pt1.m_y - pt2.m_y ); -} - - -inline wxPoint2DInt operator*(const wxPoint2DInt& pt1 , const wxPoint2DInt& pt2) -{ - return wxPoint2DInt( pt1.m_x * pt2.m_x , pt1.m_y * pt2.m_y ); -} - -inline wxPoint2DInt operator*(wxInt32 n , const wxPoint2DInt& pt) -{ - return wxPoint2DInt( pt.m_x * n , pt.m_y * n ); -} - -inline wxPoint2DInt operator*(wxDouble n , const wxPoint2DInt& pt) -{ - return wxPoint2DInt( static_cast(pt.m_x * n) , - static_cast(pt.m_y * n) ); -} - -inline wxPoint2DInt operator*(const wxPoint2DInt& pt , wxInt32 n) -{ - return wxPoint2DInt( pt.m_x * n , pt.m_y * n ); -} - -inline wxPoint2DInt operator*(const wxPoint2DInt& pt , wxDouble n) -{ - return wxPoint2DInt( static_cast(pt.m_x * n) , - static_cast(pt.m_y * n) ); -} - -inline wxPoint2DInt operator/(const wxPoint2DInt& pt1 , const wxPoint2DInt& pt2) -{ - return wxPoint2DInt( pt1.m_x / pt2.m_x , pt1.m_y / pt2.m_y ); -} - -inline wxPoint2DInt operator/(const wxPoint2DInt& pt , wxInt32 n) -{ - return wxPoint2DInt( pt.m_x / n , pt.m_y / n ); -} - -inline wxPoint2DInt operator/(const wxPoint2DInt& pt , wxDouble n) -{ - return wxPoint2DInt( static_cast(pt.m_x / n) , - static_cast(pt.m_y / n) ); -} - -// wxPoint2Ds represent a point or a vector in a 2d coordinate system - -class WXDLLIMPEXP_CORE wxPoint2DDouble -{ -public : - inline wxPoint2DDouble(); - inline wxPoint2DDouble( wxDouble x , wxDouble y ); - inline wxPoint2DDouble( const wxPoint2DDouble &pt ); - wxPoint2DDouble( const wxPoint2DInt &pt ) - { m_x = (wxDouble) pt.m_x ; m_y = (wxDouble) pt.m_y ; } - wxPoint2DDouble( const wxPoint &pt ) - { m_x = (wxDouble) pt.x ; m_y = (wxDouble) pt.y ; } - - // two different conversions to integers, floor and rounding - inline void GetFloor( wxInt32 *x , wxInt32 *y ) const; - inline void GetRounded( wxInt32 *x , wxInt32 *y ) const; - - inline wxDouble GetVectorLength() const; - wxDouble GetVectorAngle() const ; - void SetVectorLength( wxDouble length ); - void SetVectorAngle( wxDouble degrees ); - // set the vector length to 1.0, preserving the angle - void Normalize(); - - inline wxDouble GetDistance( const wxPoint2DDouble &pt ) const; - inline wxDouble GetDistanceSquare( const wxPoint2DDouble &pt ) const; - inline wxDouble GetDotProduct( const wxPoint2DDouble &vec ) const; - inline wxDouble GetCrossProduct( const wxPoint2DDouble &vec ) const; - - // the reflection of this point - inline wxPoint2DDouble operator-(); - - inline wxPoint2DDouble& operator=(const wxPoint2DDouble& pt); - inline wxPoint2DDouble& operator+=(const wxPoint2DDouble& pt); - inline wxPoint2DDouble& operator-=(const wxPoint2DDouble& pt); - inline wxPoint2DDouble& operator*=(const wxPoint2DDouble& pt); - inline wxPoint2DDouble& operator*=(wxDouble n); - inline wxPoint2DDouble& operator*=(wxInt32 n); - inline wxPoint2DDouble& operator/=(const wxPoint2DDouble& pt); - inline wxPoint2DDouble& operator/=(wxDouble n); - inline wxPoint2DDouble& operator/=(wxInt32 n); - - inline bool operator==(const wxPoint2DDouble& pt) const; - inline bool operator!=(const wxPoint2DDouble& pt) const; - - wxDouble m_x; - wxDouble m_y; -}; - -inline wxPoint2DDouble operator+(const wxPoint2DDouble& pt1 , const wxPoint2DDouble& pt2); -inline wxPoint2DDouble operator-(const wxPoint2DDouble& pt1 , const wxPoint2DDouble& pt2); -inline wxPoint2DDouble operator*(const wxPoint2DDouble& pt1 , const wxPoint2DDouble& pt2); -inline wxPoint2DDouble operator*(wxDouble n , const wxPoint2DDouble& pt); -inline wxPoint2DDouble operator*(wxInt32 n , const wxPoint2DDouble& pt); -inline wxPoint2DDouble operator*(const wxPoint2DDouble& pt , wxDouble n); -inline wxPoint2DDouble operator*(const wxPoint2DDouble& pt , wxInt32 n); -inline wxPoint2DDouble operator/(const wxPoint2DDouble& pt1 , const wxPoint2DDouble& pt2); -inline wxPoint2DDouble operator/(const wxPoint2DDouble& pt , wxDouble n); -inline wxPoint2DDouble operator/(const wxPoint2DDouble& pt , wxInt32 n); - -inline wxPoint2DDouble::wxPoint2DDouble() -{ - m_x = 0.0; - m_y = 0.0; -} - -inline wxPoint2DDouble::wxPoint2DDouble( wxDouble x , wxDouble y ) -{ - m_x = x; - m_y = y; -} - -inline wxPoint2DDouble::wxPoint2DDouble( const wxPoint2DDouble &pt ) -{ - m_x = pt.m_x; - m_y = pt.m_y; -} - -inline void wxPoint2DDouble::GetFloor( wxInt32 *x , wxInt32 *y ) const -{ - *x = (wxInt32) floor( m_x ); - *y = (wxInt32) floor( m_y ); -} - -inline void wxPoint2DDouble::GetRounded( wxInt32 *x , wxInt32 *y ) const -{ - *x = (wxInt32) floor( m_x + 0.5 ); - *y = (wxInt32) floor( m_y + 0.5); -} - -inline wxDouble wxPoint2DDouble::GetVectorLength() const -{ - return sqrt( (m_x)*(m_x) + (m_y)*(m_y) ) ; -} - -inline void wxPoint2DDouble::SetVectorLength( wxDouble length ) -{ - wxDouble before = GetVectorLength() ; - m_x = (m_x * length / before) ; - m_y = (m_y * length / before) ; -} - -inline void wxPoint2DDouble::Normalize() -{ - SetVectorLength( 1 ); -} - -inline wxDouble wxPoint2DDouble::GetDistance( const wxPoint2DDouble &pt ) const -{ - return sqrt( GetDistanceSquare( pt ) ); -} - -inline wxDouble wxPoint2DDouble::GetDistanceSquare( const wxPoint2DDouble &pt ) const -{ - return ( (pt.m_x-m_x)*(pt.m_x-m_x) + (pt.m_y-m_y)*(pt.m_y-m_y) ); -} - -inline wxDouble wxPoint2DDouble::GetDotProduct( const wxPoint2DDouble &vec ) const -{ - return ( m_x * vec.m_x + m_y * vec.m_y ); -} - -inline wxDouble wxPoint2DDouble::GetCrossProduct( const wxPoint2DDouble &vec ) const -{ - return ( m_x * vec.m_y - vec.m_x * m_y ); -} - -inline wxPoint2DDouble wxPoint2DDouble::operator-() -{ - return wxPoint2DDouble( -m_x, -m_y); -} - -inline wxPoint2DDouble& wxPoint2DDouble::operator=(const wxPoint2DDouble& pt) -{ - if (this != &pt) - { - m_x = pt.m_x; - m_y = pt.m_y; - } - return *this; -} - -inline wxPoint2DDouble& wxPoint2DDouble::operator+=(const wxPoint2DDouble& pt) -{ - m_x = m_x + pt.m_x; - m_y = m_y + pt.m_y; - return *this; -} - -inline wxPoint2DDouble& wxPoint2DDouble::operator-=(const wxPoint2DDouble& pt) -{ - m_x = m_x - pt.m_x; - m_y = m_y - pt.m_y; - return *this; -} - -inline wxPoint2DDouble& wxPoint2DDouble::operator*=(const wxPoint2DDouble& pt) -{ - m_x = m_x * pt.m_x; - m_y = m_y * pt.m_y; - return *this; -} - -inline wxPoint2DDouble& wxPoint2DDouble::operator/=(const wxPoint2DDouble& pt) -{ - m_x = m_x / pt.m_x; - m_y = m_y / pt.m_y; - return *this; -} - -inline bool wxPoint2DDouble::operator==(const wxPoint2DDouble& pt) const -{ - return wxIsSameDouble(m_x, pt.m_x) && wxIsSameDouble(m_y, pt.m_y); -} - -inline bool wxPoint2DDouble::operator!=(const wxPoint2DDouble& pt) const -{ - return !(*this == pt); -} - -inline wxPoint2DDouble operator+(const wxPoint2DDouble& pt1 , const wxPoint2DDouble& pt2) -{ - return wxPoint2DDouble( pt1.m_x + pt2.m_x , pt1.m_y + pt2.m_y ); -} - -inline wxPoint2DDouble operator-(const wxPoint2DDouble& pt1 , const wxPoint2DDouble& pt2) -{ - return wxPoint2DDouble( pt1.m_x - pt2.m_x , pt1.m_y - pt2.m_y ); -} - - -inline wxPoint2DDouble operator*(const wxPoint2DDouble& pt1 , const wxPoint2DDouble& pt2) -{ - return wxPoint2DDouble( pt1.m_x * pt2.m_x , pt1.m_y * pt2.m_y ); -} - -inline wxPoint2DDouble operator*(wxDouble n , const wxPoint2DDouble& pt) -{ - return wxPoint2DDouble( pt.m_x * n , pt.m_y * n ); -} - -inline wxPoint2DDouble operator*(wxInt32 n , const wxPoint2DDouble& pt) -{ - return wxPoint2DDouble( pt.m_x * n , pt.m_y * n ); -} - -inline wxPoint2DDouble operator*(const wxPoint2DDouble& pt , wxDouble n) -{ - return wxPoint2DDouble( pt.m_x * n , pt.m_y * n ); -} - -inline wxPoint2DDouble operator*(const wxPoint2DDouble& pt , wxInt32 n) -{ - return wxPoint2DDouble( pt.m_x * n , pt.m_y * n ); -} - -inline wxPoint2DDouble operator/(const wxPoint2DDouble& pt1 , const wxPoint2DDouble& pt2) -{ - return wxPoint2DDouble( pt1.m_x / pt2.m_x , pt1.m_y / pt2.m_y ); -} - -inline wxPoint2DDouble operator/(const wxPoint2DDouble& pt , wxDouble n) -{ - return wxPoint2DDouble( pt.m_x / n , pt.m_y / n ); -} - -inline wxPoint2DDouble operator/(const wxPoint2DDouble& pt , wxInt32 n) -{ - return wxPoint2DDouble( pt.m_x / n , pt.m_y / n ); -} - -// wxRect2Ds are a axis-aligned rectangles, each side of the rect is parallel to the x- or m_y- axis. The rectangle is either defined by the -// top left and bottom right corner, or by the top left corner and size. A point is contained within the rectangle if -// left <= x < right and top <= m_y < bottom , thus it is a half open interval. - -class WXDLLIMPEXP_CORE wxRect2DDouble -{ -public: - wxRect2DDouble() - { m_x = m_y = m_width = m_height = 0; } - wxRect2DDouble(wxDouble x, wxDouble y, wxDouble w, wxDouble h) - { m_x = x; m_y = y; m_width = w; m_height = h; } -/* - wxRect2DDouble(const wxPoint2DDouble& topLeft, const wxPoint2DDouble& bottomRight); - wxRect2DDouble(const wxPoint2DDouble& pos, const wxSize& size); - wxRect2DDouble(const wxRect2DDouble& rect); -*/ - // single attribute accessors - - wxPoint2DDouble GetPosition() const - { return wxPoint2DDouble(m_x, m_y); } - wxSize GetSize() const - { return wxSize((int) m_width, (int) m_height); } - - // for the edge and corner accessors there are two setters counterparts, the Set.. functions keep the other corners at their - // position whenever sensible, the Move.. functions keep the size of the rect and move the other corners appropriately - - inline wxDouble GetLeft() const { return m_x; } - inline void SetLeft( wxDouble n ) { m_width += m_x - n; m_x = n; } - inline void MoveLeftTo( wxDouble n ) { m_x = n; } - inline wxDouble GetTop() const { return m_y; } - inline void SetTop( wxDouble n ) { m_height += m_y - n; m_y = n; } - inline void MoveTopTo( wxDouble n ) { m_y = n; } - inline wxDouble GetBottom() const { return m_y + m_height; } - inline void SetBottom( wxDouble n ) { m_height += n - (m_y+m_height);} - inline void MoveBottomTo( wxDouble n ) { m_y = n - m_height; } - inline wxDouble GetRight() const { return m_x + m_width; } - inline void SetRight( wxDouble n ) { m_width += n - (m_x+m_width) ; } - inline void MoveRightTo( wxDouble n ) { m_x = n - m_width; } - - inline wxPoint2DDouble GetLeftTop() const - { return wxPoint2DDouble( m_x , m_y ); } - inline void SetLeftTop( const wxPoint2DDouble &pt ) - { m_width += m_x - pt.m_x; m_height += m_y - pt.m_y; m_x = pt.m_x; m_y = pt.m_y; } - inline void MoveLeftTopTo( const wxPoint2DDouble &pt ) - { m_x = pt.m_x; m_y = pt.m_y; } - inline wxPoint2DDouble GetLeftBottom() const - { return wxPoint2DDouble( m_x , m_y + m_height ); } - inline void SetLeftBottom( const wxPoint2DDouble &pt ) - { m_width += m_x - pt.m_x; m_height += pt.m_y - (m_y+m_height) ; m_x = pt.m_x; } - inline void MoveLeftBottomTo( const wxPoint2DDouble &pt ) - { m_x = pt.m_x; m_y = pt.m_y - m_height; } - inline wxPoint2DDouble GetRightTop() const - { return wxPoint2DDouble( m_x+m_width , m_y ); } - inline void SetRightTop( const wxPoint2DDouble &pt ) - { m_width += pt.m_x - ( m_x + m_width ); m_height += m_y - pt.m_y; m_y = pt.m_y; } - inline void MoveRightTopTo( const wxPoint2DDouble &pt ) - { m_x = pt.m_x - m_width; m_y = pt.m_y; } - inline wxPoint2DDouble GetRightBottom() const - { return wxPoint2DDouble( m_x+m_width , m_y + m_height ); } - inline void SetRightBottom( const wxPoint2DDouble &pt ) - { m_width += pt.m_x - ( m_x + m_width ); m_height += pt.m_y - (m_y+m_height);} - inline void MoveRightBottomTo( const wxPoint2DDouble &pt ) - { m_x = pt.m_x - m_width; m_y = pt.m_y - m_height; } - inline wxPoint2DDouble GetCentre() const - { return wxPoint2DDouble( m_x+m_width/2 , m_y+m_height/2 ); } - inline void SetCentre( const wxPoint2DDouble &pt ) - { MoveCentreTo( pt ); } // since this is impossible without moving... - inline void MoveCentreTo( const wxPoint2DDouble &pt ) - { m_x += pt.m_x - (m_x+m_width/2) , m_y += pt.m_y -(m_y+m_height/2); } - inline wxOutCode GetOutCode( const wxPoint2DDouble &pt ) const - { return (wxOutCode) (( ( pt.m_x < m_x ) ? wxOutLeft : 0 ) + - ( ( pt.m_x > m_x + m_width ) ? wxOutRight : 0 ) + - ( ( pt.m_y < m_y ) ? wxOutTop : 0 ) + - ( ( pt.m_y > m_y + m_height ) ? wxOutBottom : 0 )); } - inline wxOutCode GetOutcode(const wxPoint2DDouble &pt) const - { return GetOutCode(pt) ; } - inline bool Contains( const wxPoint2DDouble &pt ) const - { return GetOutCode( pt ) == wxInside; } - inline bool Contains( const wxRect2DDouble &rect ) const - { return ( ( ( m_x <= rect.m_x ) && ( rect.m_x + rect.m_width <= m_x + m_width ) ) && - ( ( m_y <= rect.m_y ) && ( rect.m_y + rect.m_height <= m_y + m_height ) ) ); } - inline bool IsEmpty() const - { return m_width <= 0 || m_height <= 0; } - inline bool HaveEqualSize( const wxRect2DDouble &rect ) const - { return wxIsSameDouble(rect.m_width, m_width) && wxIsSameDouble(rect.m_height, m_height); } - - inline void Inset( wxDouble x , wxDouble y ) - { m_x += x; m_y += y; m_width -= 2 * x; m_height -= 2 * y; } - inline void Inset( wxDouble left , wxDouble top ,wxDouble right , wxDouble bottom ) - { m_x += left; m_y += top; m_width -= left + right; m_height -= top + bottom;} - inline void Offset( const wxPoint2DDouble &pt ) - { m_x += pt.m_x; m_y += pt.m_y; } - - void ConstrainTo( const wxRect2DDouble &rect ); - - inline wxPoint2DDouble Interpolate( wxInt32 widthfactor , wxInt32 heightfactor ) - { return wxPoint2DDouble( m_x + m_width * widthfactor , m_y + m_height * heightfactor ); } - - static void Intersect( const wxRect2DDouble &src1 , const wxRect2DDouble &src2 , wxRect2DDouble *dest ); - inline void Intersect( const wxRect2DDouble &otherRect ) - { Intersect( *this , otherRect , this ); } - inline wxRect2DDouble CreateIntersection( const wxRect2DDouble &otherRect ) const - { wxRect2DDouble result; Intersect( *this , otherRect , &result); return result; } - bool Intersects( const wxRect2DDouble &rect ) const; - - static void Union( const wxRect2DDouble &src1 , const wxRect2DDouble &src2 , wxRect2DDouble *dest ); - void Union( const wxRect2DDouble &otherRect ) - { Union( *this , otherRect , this ); } - void Union( const wxPoint2DDouble &pt ); - inline wxRect2DDouble CreateUnion( const wxRect2DDouble &otherRect ) const - { wxRect2DDouble result; Union( *this , otherRect , &result); return result; } - - inline void Scale( wxDouble f ) - { m_x *= f; m_y *= f; m_width *= f; m_height *= f;} - inline void Scale( wxInt32 num , wxInt32 denum ) - { m_x *= ((wxDouble)num)/((wxDouble)denum); m_y *= ((wxDouble)num)/((wxDouble)denum); - m_width *= ((wxDouble)num)/((wxDouble)denum); m_height *= ((wxDouble)num)/((wxDouble)denum);} - - wxRect2DDouble& operator = (const wxRect2DDouble& rect); - inline bool operator == (const wxRect2DDouble& rect) const - { return wxIsSameDouble(m_x, rect.m_x) && wxIsSameDouble(m_y, rect.m_y) && HaveEqualSize(rect); } - inline bool operator != (const wxRect2DDouble& rect) const - { return !(*this == rect); } - - wxDouble m_x; - wxDouble m_y; - wxDouble m_width; - wxDouble m_height; -}; - - -// wxRect2Ds are a axis-aligned rectangles, each side of the rect is parallel to the x- or m_y- axis. The rectangle is either defined by the -// top left and bottom right corner, or by the top left corner and size. A point is contained within the rectangle if -// left <= x < right and top <= m_y < bottom , thus it is a half open interval. - -class WXDLLIMPEXP_CORE wxRect2DInt -{ -public: - wxRect2DInt() { m_x = m_y = m_width = m_height = 0; } - wxRect2DInt( const wxRect& r ) { m_x = r.x ; m_y = r.y ; m_width = r.width ; m_height = r.height ; } - wxRect2DInt(wxInt32 x, wxInt32 y, wxInt32 w, wxInt32 h) { m_x = x; m_y = y; m_width = w; m_height = h; } - wxRect2DInt(const wxPoint2DInt& topLeft, const wxPoint2DInt& bottomRight); - inline wxRect2DInt(const wxPoint2DInt& pos, const wxSize& size); - inline wxRect2DInt(const wxRect2DInt& rect); - - // single attribute accessors - - wxPoint2DInt GetPosition() const { return wxPoint2DInt(m_x, m_y); } - wxSize GetSize() const { return wxSize(m_width, m_height); } - - // for the edge and corner accessors there are two setters counterparts, the Set.. functions keep the other corners at their - // position whenever sensible, the Move.. functions keep the size of the rect and move the other corners appropriately - - inline wxInt32 GetLeft() const { return m_x; } - inline void SetLeft( wxInt32 n ) { m_width += m_x - n; m_x = n; } - inline void MoveLeftTo( wxInt32 n ) { m_x = n; } - inline wxInt32 GetTop() const { return m_y; } - inline void SetTop( wxInt32 n ) { m_height += m_y - n; m_y = n; } - inline void MoveTopTo( wxInt32 n ) { m_y = n; } - inline wxInt32 GetBottom() const { return m_y + m_height; } - inline void SetBottom( wxInt32 n ) { m_height += n - (m_y+m_height);} - inline void MoveBottomTo( wxInt32 n ) { m_y = n - m_height; } - inline wxInt32 GetRight() const { return m_x + m_width; } - inline void SetRight( wxInt32 n ) { m_width += n - (m_x+m_width) ; } - inline void MoveRightTo( wxInt32 n ) { m_x = n - m_width; } - - inline wxPoint2DInt GetLeftTop() const { return wxPoint2DInt( m_x , m_y ); } - inline void SetLeftTop( const wxPoint2DInt &pt ) { m_width += m_x - pt.m_x; m_height += m_y - pt.m_y; m_x = pt.m_x; m_y = pt.m_y; } - inline void MoveLeftTopTo( const wxPoint2DInt &pt ) { m_x = pt.m_x; m_y = pt.m_y; } - inline wxPoint2DInt GetLeftBottom() const { return wxPoint2DInt( m_x , m_y + m_height ); } - inline void SetLeftBottom( const wxPoint2DInt &pt ) { m_width += m_x - pt.m_x; m_height += pt.m_y - (m_y+m_height) ; m_x = pt.m_x; } - inline void MoveLeftBottomTo( const wxPoint2DInt &pt ) { m_x = pt.m_x; m_y = pt.m_y - m_height; } - inline wxPoint2DInt GetRightTop() const { return wxPoint2DInt( m_x+m_width , m_y ); } - inline void SetRightTop( const wxPoint2DInt &pt ) { m_width += pt.m_x - ( m_x + m_width ); m_height += m_y - pt.m_y; m_y = pt.m_y; } - inline void MoveRightTopTo( const wxPoint2DInt &pt ) { m_x = pt.m_x - m_width; m_y = pt.m_y; } - inline wxPoint2DInt GetRightBottom() const { return wxPoint2DInt( m_x+m_width , m_y + m_height ); } - inline void SetRightBottom( const wxPoint2DInt &pt ) { m_width += pt.m_x - ( m_x + m_width ); m_height += pt.m_y - (m_y+m_height);} - inline void MoveRightBottomTo( const wxPoint2DInt &pt ) { m_x = pt.m_x - m_width; m_y = pt.m_y - m_height; } - inline wxPoint2DInt GetCentre() const { return wxPoint2DInt( m_x+m_width/2 , m_y+m_height/2 ); } - inline void SetCentre( const wxPoint2DInt &pt ) { MoveCentreTo( pt ); } // since this is impossible without moving... - inline void MoveCentreTo( const wxPoint2DInt &pt ) { m_x += pt.m_x - (m_x+m_width/2) , m_y += pt.m_y -(m_y+m_height/2); } - inline wxOutCode GetOutCode( const wxPoint2DInt &pt ) const - { return (wxOutCode) (( ( pt.m_x < m_x ) ? wxOutLeft : 0 ) + - ( ( pt.m_x >= m_x + m_width ) ? wxOutRight : 0 ) + - ( ( pt.m_y < m_y ) ? wxOutTop : 0 ) + - ( ( pt.m_y >= m_y + m_height ) ? wxOutBottom : 0 )); } - inline wxOutCode GetOutcode( const wxPoint2DInt &pt ) const - { return GetOutCode( pt ) ; } - inline bool Contains( const wxPoint2DInt &pt ) const - { return GetOutCode( pt ) == wxInside; } - inline bool Contains( const wxRect2DInt &rect ) const - { return ( ( ( m_x <= rect.m_x ) && ( rect.m_x + rect.m_width <= m_x + m_width ) ) && - ( ( m_y <= rect.m_y ) && ( rect.m_y + rect.m_height <= m_y + m_height ) ) ); } - inline bool IsEmpty() const - { return ( m_width <= 0 || m_height <= 0 ); } - inline bool HaveEqualSize( const wxRect2DInt &rect ) const - { return ( rect.m_width == m_width && rect.m_height == m_height ); } - - inline void Inset( wxInt32 x , wxInt32 y ) { m_x += x; m_y += y; m_width -= 2 * x; m_height -= 2 * y; } - inline void Inset( wxInt32 left , wxInt32 top ,wxInt32 right , wxInt32 bottom ) - { m_x += left; m_y += top; m_width -= left + right; m_height -= top + bottom;} - inline void Offset( const wxPoint2DInt &pt ) { m_x += pt.m_x; m_y += pt.m_y; } - void ConstrainTo( const wxRect2DInt &rect ); - inline wxPoint2DInt Interpolate( wxInt32 widthfactor , wxInt32 heightfactor ) { return wxPoint2DInt( m_x + m_width * widthfactor , m_y + m_height * heightfactor ); } - - static void Intersect( const wxRect2DInt &src1 , const wxRect2DInt &src2 , wxRect2DInt *dest ); - inline void Intersect( const wxRect2DInt &otherRect ) { Intersect( *this , otherRect , this ); } - inline wxRect2DInt CreateIntersection( const wxRect2DInt &otherRect ) const { wxRect2DInt result; Intersect( *this , otherRect , &result); return result; } - bool Intersects( const wxRect2DInt &rect ) const; - - static void Union( const wxRect2DInt &src1 , const wxRect2DInt &src2 , wxRect2DInt *dest ); - void Union( const wxRect2DInt &otherRect ) { Union( *this , otherRect , this ); } - void Union( const wxPoint2DInt &pt ); - inline wxRect2DInt CreateUnion( const wxRect2DInt &otherRect ) const { wxRect2DInt result; Union( *this , otherRect , &result); return result; } - - inline void Scale( wxInt32 f ) { m_x *= f; m_y *= f; m_width *= f; m_height *= f;} - inline void Scale( wxInt32 num , wxInt32 denum ) - { m_x *= ((wxInt32)num)/((wxInt32)denum); m_y *= ((wxInt32)num)/((wxInt32)denum); - m_width *= ((wxInt32)num)/((wxInt32)denum); m_height *= ((wxInt32)num)/((wxInt32)denum);} - - wxRect2DInt& operator = (const wxRect2DInt& rect); - bool operator == (const wxRect2DInt& rect) const; - bool operator != (const wxRect2DInt& rect) const; - -#if wxUSE_STREAMS - void WriteTo( wxDataOutputStream &stream ) const; - void ReadFrom( wxDataInputStream &stream ); -#endif // wxUSE_STREAMS - - wxInt32 m_x; - wxInt32 m_y; - wxInt32 m_width; - wxInt32 m_height; -}; - -inline wxRect2DInt::wxRect2DInt( const wxRect2DInt &r ) -{ - m_x = r.m_x; - m_y = r.m_y; - m_width = r.m_width; - m_height = r.m_height; -} - -inline wxRect2DInt::wxRect2DInt( const wxPoint2DInt &a , const wxPoint2DInt &b) -{ - m_x = wxMin( a.m_x , b.m_x ); - m_y = wxMin( a.m_y , b.m_y ); - m_width = abs( a.m_x - b.m_x ); - m_height = abs( a.m_y - b.m_y ); -} - -inline wxRect2DInt::wxRect2DInt( const wxPoint2DInt& pos, const wxSize& size) -{ - m_x = pos.m_x; - m_y = pos.m_y; - m_width = size.x; - m_height = size.y; -} - -inline bool wxRect2DInt::operator == (const wxRect2DInt& rect) const -{ - return (m_x==rect.m_x && m_y==rect.m_y && - m_width==rect.m_width && m_height==rect.m_height); -} - -inline bool wxRect2DInt::operator != (const wxRect2DInt& rect) const -{ - return !(*this == rect); -} - -class WXDLLIMPEXP_CORE wxTransform2D -{ -public : - virtual ~wxTransform2D() { } - virtual void Transform( wxPoint2DInt* pt )const = 0; - virtual void Transform( wxRect2DInt* r ) const; - virtual wxPoint2DInt Transform( const wxPoint2DInt &pt ) const; - virtual wxRect2DInt Transform( const wxRect2DInt &r ) const ; - - virtual void InverseTransform( wxPoint2DInt* pt ) const = 0; - virtual void InverseTransform( wxRect2DInt* r ) const ; - virtual wxPoint2DInt InverseTransform( const wxPoint2DInt &pt ) const ; - virtual wxRect2DInt InverseTransform( const wxRect2DInt &r ) const ; -}; - - -#endif // wxUSE_GEOMETRY - -#endif // _WX_GEOMETRY_H_ diff --git a/Externals/wxWidgets3/include/wx/gifdecod.h b/Externals/wxWidgets3/include/wx/gifdecod.h deleted file mode 100644 index b0de4669e6..0000000000 --- a/Externals/wxWidgets3/include/wx/gifdecod.h +++ /dev/null @@ -1,113 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gifdecod.h -// Purpose: wxGIFDecoder, GIF reader for wxImage and wxAnimation -// Author: Guillermo Rodriguez Garcia -// Version: 3.02 -// Copyright: (c) 1999 Guillermo Rodriguez Garcia -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GIFDECOD_H_ -#define _WX_GIFDECOD_H_ - -#include "wx/defs.h" - -#if wxUSE_STREAMS && wxUSE_GIF - -#include "wx/stream.h" -#include "wx/image.h" -#include "wx/animdecod.h" -#include "wx/dynarray.h" - -// internal utility used to store a frame in 8bit-per-pixel format -class GIFImage; - - -// -------------------------------------------------------------------------- -// Constants -// -------------------------------------------------------------------------- - -// Error codes: -// Note that the error code wxGIF_TRUNCATED means that the image itself -// is most probably OK, but the decoder didn't reach the end of the data -// stream; this means that if it was not reading directly from file, -// the stream will not be correctly positioned. -// -enum wxGIFErrorCode -{ - wxGIF_OK = 0, // everything was OK - wxGIF_INVFORMAT, // error in GIF header - wxGIF_MEMERR, // error allocating memory - wxGIF_TRUNCATED // file appears to be truncated -}; - -// -------------------------------------------------------------------------- -// wxGIFDecoder class -// -------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxGIFDecoder : public wxAnimationDecoder -{ -public: - // constructor, destructor, etc. - wxGIFDecoder(); - ~wxGIFDecoder(); - - // get data of current frame - unsigned char* GetData(unsigned int frame) const; - unsigned char* GetPalette(unsigned int frame) const; - unsigned int GetNcolours(unsigned int frame) const; - int GetTransparentColourIndex(unsigned int frame) const; - wxColour GetTransparentColour(unsigned int frame) const wxOVERRIDE; - - virtual wxSize GetFrameSize(unsigned int frame) const wxOVERRIDE; - virtual wxPoint GetFramePosition(unsigned int frame) const wxOVERRIDE; - virtual wxAnimationDisposal GetDisposalMethod(unsigned int frame) const wxOVERRIDE; - virtual long GetDelay(unsigned int frame) const wxOVERRIDE; - - // GIFs can contain both static images and animations - bool IsAnimation() const - { return m_nFrames > 1; } - - // load function which returns more info than just Load(): - wxGIFErrorCode LoadGIF( wxInputStream& stream ); - - // free all internal frames - void Destroy(); - - // implementation of wxAnimationDecoder's pure virtuals - virtual bool Load( wxInputStream& stream ) wxOVERRIDE - { return LoadGIF(stream) == wxGIF_OK; } - - bool ConvertToImage(unsigned int frame, wxImage *image) const wxOVERRIDE; - - wxAnimationDecoder *Clone() const wxOVERRIDE - { return new wxGIFDecoder; } - wxAnimationType GetType() const wxOVERRIDE - { return wxANIMATION_TYPE_GIF; } - -private: - // wxAnimationDecoder pure virtual - virtual bool DoCanRead( wxInputStream& stream ) const wxOVERRIDE; - // modifies current stream position (see wxAnimationDecoder::CanRead) - - int getcode(wxInputStream& stream, int bits, int abfin); - wxGIFErrorCode dgif(wxInputStream& stream, - GIFImage *img, int interl, int bits); - - - // array of all frames - wxArrayPtrVoid m_frames; - - // decoder state vars - int m_restbits; // remaining valid bits - unsigned int m_restbyte; // remaining bytes in this block - unsigned int m_lastbyte; // last byte read - unsigned char m_buffer[256]; // buffer for reading - unsigned char *m_bufp; // pointer to next byte in buffer - - wxDECLARE_NO_COPY_CLASS(wxGIFDecoder); -}; - -#endif // wxUSE_STREAMS && wxUSE_GIF - -#endif // _WX_GIFDECOD_H_ diff --git a/Externals/wxWidgets3/include/wx/glcanvas.h b/Externals/wxWidgets3/include/wx/glcanvas.h deleted file mode 100644 index 545040d4bc..0000000000 --- a/Externals/wxWidgets3/include/wx/glcanvas.h +++ /dev/null @@ -1,379 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/glcanvas.h -// Purpose: wxGLCanvas base header -// Author: Julian Smart -// Modified by: -// Created: -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GLCANVAS_H_BASE_ -#define _WX_GLCANVAS_H_BASE_ - -#include "wx/defs.h" - -#if wxUSE_GLCANVAS - -#include "wx/app.h" -#include "wx/palette.h" -#include "wx/window.h" - -class WXDLLIMPEXP_FWD_GL wxGLCanvas; -class WXDLLIMPEXP_FWD_GL wxGLContext; - -// ---------------------------------------------------------------------------- -// Constants for attributes list -// ---------------------------------------------------------------------------- - -// Notice that not all implementation support options such as stereo, auxiliary -// buffers, alpha channel, and accumulator buffer, use IsDisplaySupported() to -// check for individual attributes support. -enum -{ - WX_GL_RGBA = 1, // use true color palette (on if no attrs specified) - WX_GL_BUFFER_SIZE, // bits for buffer if not WX_GL_RGBA - WX_GL_LEVEL, // 0 for main buffer, >0 for overlay, <0 for underlay - WX_GL_DOUBLEBUFFER, // use double buffering (on if no attrs specified) - WX_GL_STEREO, // use stereoscopic display - WX_GL_AUX_BUFFERS, // number of auxiliary buffers - WX_GL_MIN_RED, // use red buffer with most bits (> MIN_RED bits) - WX_GL_MIN_GREEN, // use green buffer with most bits (> MIN_GREEN bits) - WX_GL_MIN_BLUE, // use blue buffer with most bits (> MIN_BLUE bits) - WX_GL_MIN_ALPHA, // use alpha buffer with most bits (> MIN_ALPHA bits) - WX_GL_DEPTH_SIZE, // bits for Z-buffer (0,16,32) - WX_GL_STENCIL_SIZE, // bits for stencil buffer - WX_GL_MIN_ACCUM_RED, // use red accum buffer with most bits (> MIN_ACCUM_RED bits) - WX_GL_MIN_ACCUM_GREEN, // use green buffer with most bits (> MIN_ACCUM_GREEN bits) - WX_GL_MIN_ACCUM_BLUE, // use blue buffer with most bits (> MIN_ACCUM_BLUE bits) - WX_GL_MIN_ACCUM_ALPHA, // use alpha buffer with most bits (> MIN_ACCUM_ALPHA bits) - WX_GL_SAMPLE_BUFFERS, // 1 for multisampling support (antialiasing) - WX_GL_SAMPLES, // 4 for 2x2 antialiasing supersampling on most graphics cards - WX_GL_FRAMEBUFFER_SRGB,// capability for sRGB framebuffer - // Context attributes - WX_GL_CORE_PROFILE, // use an OpenGL core profile - WX_GL_MAJOR_VERSION, // major OpenGL version of the core profile - WX_GL_MINOR_VERSION, // minor OpenGL version of the core profile - wx_GL_COMPAT_PROFILE, // use compatible profile (use all versions features) - WX_GL_FORWARD_COMPAT, // forward compatible context. OpenGL >= 3.0 - WX_GL_ES2, // ES or ES2 context. - WX_GL_DEBUG, // create a debug context - WX_GL_ROBUST_ACCESS, // robustness. - WX_GL_NO_RESET_NOTIFY, // never deliver notification of reset events - WX_GL_LOSE_ON_RESET, // if graphics reset, all context state is lost - WX_GL_RESET_ISOLATION, // protect other apps or share contexts from reset side-effects - WX_GL_RELEASE_FLUSH, // on context release, flush pending commands - WX_GL_RELEASE_NONE // on context release, pending commands are not flushed -}; - -#define wxGLCanvasName wxT("GLCanvas") - -// ---------------------------------------------------------------------------- -// wxGLAttribsBase: OpenGL rendering attributes -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_GL wxGLAttribsBase -{ -public: - wxGLAttribsBase() { Reset(); } - - // Setters - void AddAttribute(int attribute) { m_GLValues.push_back(attribute); } - // Search for searchVal and combine the next value with combineVal - void AddAttribBits(int searchVal, int combineVal); - // ARB functions necessity - void SetNeedsARB(bool needsARB = true) { m_needsARB = needsARB; } - - // Delete contents - void Reset() - { - m_GLValues.clear(); - m_needsARB = false; - } - - // Accessors - const int* GetGLAttrs() const - { - return (m_GLValues.empty() || !m_GLValues[0]) ? NULL : &*m_GLValues.begin(); - } - - int GetSize() const { return (int)(m_GLValues.size()); } - - // ARB function (e.g. wglCreateContextAttribsARB) is needed - bool NeedsARB() const { return m_needsARB; } - -private: - wxVector m_GLValues; - bool m_needsARB; -}; - -// ---------------------------------------------------------------------------- -// wxGLContextAttrs: OpenGL rendering context attributes -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_GL wxGLContextAttrs : public wxGLAttribsBase -{ -public: - // Setters, allowing chained calls - wxGLContextAttrs& CoreProfile(); - wxGLContextAttrs& MajorVersion(int val); - wxGLContextAttrs& MinorVersion(int val); - wxGLContextAttrs& OGLVersion(int vmayor, int vminor) - { return MajorVersion(vmayor).MinorVersion(vminor); } - wxGLContextAttrs& CompatibilityProfile(); - wxGLContextAttrs& ForwardCompatible(); - wxGLContextAttrs& ES2(); - wxGLContextAttrs& DebugCtx(); - wxGLContextAttrs& Robust(); - wxGLContextAttrs& NoResetNotify(); - wxGLContextAttrs& LoseOnReset(); - wxGLContextAttrs& ResetIsolation(); - wxGLContextAttrs& ReleaseFlush(int val = 1); //'int' allows future values - wxGLContextAttrs& PlatformDefaults(); - void EndList(); // No more values can be chained - - // Currently only used for X11 context creation - bool x11Direct; // X11 direct render - bool renderTypeRGBA; -}; - -// ---------------------------------------------------------------------------- -// wxGLAttributes: canvas configuration -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_GL wxGLAttributes : public wxGLAttribsBase -{ -public: - // Setters, allowing chained calls - wxGLAttributes& RGBA(); - wxGLAttributes& BufferSize(int val); - wxGLAttributes& Level(int val); - wxGLAttributes& DoubleBuffer(); - wxGLAttributes& Stereo(); - wxGLAttributes& AuxBuffers(int val); - wxGLAttributes& MinRGBA(int mRed, int mGreen, int mBlue, int mAlpha); - wxGLAttributes& Depth(int val); - wxGLAttributes& Stencil(int val); - wxGLAttributes& MinAcumRGBA(int mRed, int mGreen, int mBlue, int mAlpha); - wxGLAttributes& PlatformDefaults(); - wxGLAttributes& Defaults(); - wxGLAttributes& SampleBuffers(int val); - wxGLAttributes& Samplers(int val); - wxGLAttributes& FrameBuffersRGB(); - void EndList(); // No more values can be chained -}; - -// ---------------------------------------------------------------------------- -// wxGLContextBase: OpenGL rendering context -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_GL wxGLContextBase : public wxObject -{ -public: - -// The derived class should provide a ctor with this signature: -// -// wxGLContext(wxGLCanvas *win, -// const wxGLContext *other = NULL, -// const wxGLContextAttrs *ctxAttrs = NULL); - - // set this context as the current one - virtual bool SetCurrent(const wxGLCanvas& win) const = 0; - - bool IsOK() { return m_isOk; } - -protected: - bool m_isOk; -}; - -// ---------------------------------------------------------------------------- -// wxGLCanvasBase: window which can be used for OpenGL rendering -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_GL wxGLCanvasBase : public wxWindow -{ -public: - // default ctor doesn't initialize the window, use Create() later - wxGLCanvasBase(); - - virtual ~wxGLCanvasBase(); - - - /* - The derived class should provide a ctor with this signature: - - wxGLCanvas(wxWindow *parent, - const wxGLAttributes& dispAttrs, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxGLCanvasName, - const wxPalette& palette = wxNullPalette); - */ - - // operations - // ---------- - - // set the given context associated with this window as the current one - bool SetCurrent(const wxGLContext& context) const; - - // flush the back buffer (if we have it) - virtual bool SwapBuffers() = 0; - - - // accessors - // --------- - - // check if the given attributes are supported without creating a canvas - static bool IsDisplaySupported(const wxGLAttributes& dispAttrs); - static bool IsDisplaySupported(const int *attribList); - -#if wxUSE_PALETTE - const wxPalette *GetPalette() const { return &m_palette; } -#endif // wxUSE_PALETTE - - // miscellaneous helper functions - // ------------------------------ - - // call glcolor() for the colour with the given name, return false if - // colour not found - bool SetColour(const wxString& colour); - - // return true if the extension with given name is supported - // - // notice that while this function is implemented for all of GLX, WGL and - // AGL the extensions names are usually not the same for different - // platforms and so the code using it still usually uses conditional - // compilation - static bool IsExtensionSupported(const char *extension); - - // Get the wxGLContextAttrs object filled with the context-related values - // of the list of attributes passed at ctor when no wxGLAttributes is used - // as a parameter - wxGLContextAttrs& GetGLCTXAttrs() { return m_GLCTXAttrs; } - - // deprecated methods using the implicit wxGLContext -#if WXWIN_COMPATIBILITY_2_8 - wxDEPRECATED( wxGLContext* GetContext() const ); - - wxDEPRECATED( void SetCurrent() ); - - wxDEPRECATED( void OnSize(wxSizeEvent& event) ); -#endif // WXWIN_COMPATIBILITY_2_8 - -#ifdef __WXUNIVERSAL__ - // resolve the conflict with wxWindowUniv::SetCurrent() - virtual bool SetCurrent(bool doit) { return wxWindow::SetCurrent(doit); } -#endif - -protected: - // override this to implement SetColour() in GL_INDEX_MODE - // (currently only implemented in wxX11 and wxMotif ports) - virtual int GetColourIndex(const wxColour& WXUNUSED(col)) { return -1; } - - // check if the given extension name is present in the space-separated list - // of extensions supported by the current implementation such as returned - // by glXQueryExtensionsString() or glGetString(GL_EXTENSIONS) - static bool IsExtensionInList(const char *list, const char *extension); - - // For the case of "int* attribList" at ctor is != 0 - wxGLContextAttrs m_GLCTXAttrs; - - // Extract pixel format and context attributes. - // Return false if an unknown attribute is found. - static bool ParseAttribList(const int* attribList, - wxGLAttributes& dispAttrs, - wxGLContextAttrs* ctxAttrs = NULL); - -#if wxUSE_PALETTE - // create default palette if we're not using RGBA mode - // (not supported in most ports) - virtual wxPalette CreateDefaultPalette() { return wxNullPalette; } - - wxPalette m_palette; -#endif // wxUSE_PALETTE - -#if WXWIN_COMPATIBILITY_2_8 - wxGLContext *m_glContext; -#endif // WXWIN_COMPATIBILITY_2_8 -}; - -// ---------------------------------------------------------------------------- -// wxGLApp: a special wxApp subclass for OpenGL applications which must be used -// to select a visual compatible with the given attributes -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_GL wxGLAppBase : public wxApp -{ -public: - wxGLAppBase() : wxApp() { } - - // use this in the constructor of the user-derived wxGLApp class to - // determine if an OpenGL rendering context with these attributes - // is available - returns true if so, false if not. - virtual bool InitGLVisual(const int *attribList) = 0; -}; - -#if defined(__WXMSW__) - #include "wx/msw/glcanvas.h" -#elif defined(__WXMOTIF__) || defined(__WXX11__) - #include "wx/x11/glcanvas.h" -#elif defined(__WXGTK20__) - #include "wx/gtk/glcanvas.h" -#elif defined(__WXGTK__) - #include "wx/gtk1/glcanvas.h" -#elif defined(__WXMAC__) - #include "wx/osx/glcanvas.h" -#elif defined(__WXQT__) - #include "wx/qt/glcanvas.h" -#else - #error "wxGLCanvas not supported in this wxWidgets port" -#endif - -// wxMac and wxMSW don't need anything extra in wxGLAppBase, so declare it here -#ifndef wxGL_APP_DEFINED - -class WXDLLIMPEXP_GL wxGLApp : public wxGLAppBase -{ -public: - wxGLApp() : wxGLAppBase() { } - - virtual bool InitGLVisual(const int *attribList); - -private: - wxDECLARE_DYNAMIC_CLASS(wxGLApp); -}; - -#endif // !wxGL_APP_DEFINED - -// ---------------------------------------------------------------------------- -// wxGLAPI: an API wrapper that allows the use of 'old' APIs even on OpenGL -// platforms that don't support it natively anymore, if the APIs are available -// it's a mere redirect -// ---------------------------------------------------------------------------- - -#ifndef wxUSE_OPENGL_EMULATION - #define wxUSE_OPENGL_EMULATION 0 -#endif - -class WXDLLIMPEXP_GL wxGLAPI : public wxObject -{ -public: - wxGLAPI(); - ~wxGLAPI(); - - static void glFrustum(GLfloat left, GLfloat right, GLfloat bottom, - GLfloat top, GLfloat zNear, GLfloat zFar); - static void glBegin(GLenum mode); - static void glTexCoord2f(GLfloat s, GLfloat t); - static void glVertex3f(GLfloat x, GLfloat y, GLfloat z); - static void glNormal3f(GLfloat nx, GLfloat ny, GLfloat nz); - static void glColor4f(GLfloat r, GLfloat g, GLfloat b, GLfloat a); - static void glColor3f(GLfloat r, GLfloat g, GLfloat b); - static void glEnd(); -}; - -#endif // wxUSE_GLCANVAS - -#endif // _WX_GLCANVAS_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/graphics.h b/Externals/wxWidgets3/include/wx/graphics.h deleted file mode 100644 index f8d016f216..0000000000 --- a/Externals/wxWidgets3/include/wx/graphics.h +++ /dev/null @@ -1,905 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/graphics.h -// Purpose: graphics context header -// Author: Stefan Csomor -// Modified by: -// Created: -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GRAPHICS_H_ -#define _WX_GRAPHICS_H_ - -#include "wx/defs.h" - -#if wxUSE_GRAPHICS_CONTEXT - -#include "wx/affinematrix2d.h" -#include "wx/geometry.h" -#include "wx/colour.h" -#include "wx/dynarray.h" -#include "wx/font.h" -#include "wx/image.h" -#include "wx/vector.h" - -enum wxAntialiasMode -{ - wxANTIALIAS_NONE, // should be 0 - wxANTIALIAS_DEFAULT -}; - -enum wxInterpolationQuality -{ - // default interpolation - wxINTERPOLATION_DEFAULT, - // no interpolation - wxINTERPOLATION_NONE, - // fast interpolation, suited for interactivity - wxINTERPOLATION_FAST, - // better quality - wxINTERPOLATION_GOOD, - // best quality, not suited for interactivity - wxINTERPOLATION_BEST -}; - -enum wxCompositionMode -{ - // R = Result, S = Source, D = Destination, premultiplied with alpha - // Ra, Sa, Da their alpha components - - // classic Porter-Duff compositions - // http://keithp.com/~keithp/porterduff/p253-porter.pdf - - wxCOMPOSITION_INVALID = -1, /* indicates invalid/unsupported mode */ - wxCOMPOSITION_CLEAR, /* R = 0 */ - wxCOMPOSITION_SOURCE, /* R = S */ - wxCOMPOSITION_OVER, /* R = S + D*(1 - Sa) */ - wxCOMPOSITION_IN, /* R = S*Da */ - wxCOMPOSITION_OUT, /* R = S*(1 - Da) */ - wxCOMPOSITION_ATOP, /* R = S*Da + D*(1 - Sa) */ - - wxCOMPOSITION_DEST, /* R = D, essentially a noop */ - wxCOMPOSITION_DEST_OVER, /* R = S*(1 - Da) + D */ - wxCOMPOSITION_DEST_IN, /* R = D*Sa */ - wxCOMPOSITION_DEST_OUT, /* R = D*(1 - Sa) */ - wxCOMPOSITION_DEST_ATOP, /* R = S*(1 - Da) + D*Sa */ - wxCOMPOSITION_XOR, /* R = S*(1 - Da) + D*(1 - Sa) */ - - // mathematical compositions - wxCOMPOSITION_ADD /* R = S + D */ -}; - -class WXDLLIMPEXP_FWD_CORE wxWindowDC; -class WXDLLIMPEXP_FWD_CORE wxMemoryDC; -#if wxUSE_PRINTING_ARCHITECTURE -class WXDLLIMPEXP_FWD_CORE wxPrinterDC; -#endif -#ifdef __WXMSW__ -#if wxUSE_ENH_METAFILE -class WXDLLIMPEXP_FWD_CORE wxEnhMetaFileDC; -#endif -#endif -class WXDLLIMPEXP_FWD_CORE wxGraphicsContext; -class WXDLLIMPEXP_FWD_CORE wxGraphicsPath; -class WXDLLIMPEXP_FWD_CORE wxGraphicsMatrix; -class WXDLLIMPEXP_FWD_CORE wxGraphicsFigure; -class WXDLLIMPEXP_FWD_CORE wxGraphicsRenderer; -class WXDLLIMPEXP_FWD_CORE wxGraphicsPen; -class WXDLLIMPEXP_FWD_CORE wxGraphicsBrush; -class WXDLLIMPEXP_FWD_CORE wxGraphicsFont; -class WXDLLIMPEXP_FWD_CORE wxGraphicsBitmap; - -/* - * notes about the graphics context apis - * - * angles : are measured in radians, 0.0 being in direction of positiv x axis, PI/2 being - * in direction of positive y axis. - */ - -// Base class of all objects used for drawing in the new graphics API, the always point back to their -// originating rendering engine, there is no dynamic unloading of a renderer currently allowed, -// these references are not counted - -// -// The data used by objects like graphics pens etc is ref counted, in order to avoid unnecessary expensive -// duplication. Any operation on a shared instance that results in a modified state, uncouples this -// instance from the other instances that were shared - using copy on write semantics -// - -class WXDLLIMPEXP_FWD_CORE wxGraphicsObjectRefData; -class WXDLLIMPEXP_FWD_CORE wxGraphicsBitmapData; -class WXDLLIMPEXP_FWD_CORE wxGraphicsMatrixData; -class WXDLLIMPEXP_FWD_CORE wxGraphicsPathData; - -class WXDLLIMPEXP_CORE wxGraphicsObject : public wxObject -{ -public: - wxGraphicsObject(); - wxGraphicsObject( wxGraphicsRenderer* renderer ); - virtual ~wxGraphicsObject(); - - bool IsNull() const; - - // returns the renderer that was used to create this instance, or NULL if it has not been initialized yet - wxGraphicsRenderer* GetRenderer() const; - wxGraphicsObjectRefData* GetGraphicsData() const; -protected: - virtual wxObjectRefData* CreateRefData() const wxOVERRIDE; - virtual wxObjectRefData* CloneRefData(const wxObjectRefData* data) const wxOVERRIDE; - - wxDECLARE_DYNAMIC_CLASS(wxGraphicsObject); -}; - -class WXDLLIMPEXP_CORE wxGraphicsPen : public wxGraphicsObject -{ -public: - wxGraphicsPen() {} - virtual ~wxGraphicsPen() {} -private: - wxDECLARE_DYNAMIC_CLASS(wxGraphicsPen); -}; - -extern WXDLLIMPEXP_DATA_CORE(wxGraphicsPen) wxNullGraphicsPen; - -class WXDLLIMPEXP_CORE wxGraphicsBrush : public wxGraphicsObject -{ -public: - wxGraphicsBrush() {} - virtual ~wxGraphicsBrush() {} -private: - wxDECLARE_DYNAMIC_CLASS(wxGraphicsBrush); -}; - -extern WXDLLIMPEXP_DATA_CORE(wxGraphicsBrush) wxNullGraphicsBrush; - -class WXDLLIMPEXP_CORE wxGraphicsFont : public wxGraphicsObject -{ -public: - wxGraphicsFont() {} - virtual ~wxGraphicsFont() {} -private: - wxDECLARE_DYNAMIC_CLASS(wxGraphicsFont); -}; - -extern WXDLLIMPEXP_DATA_CORE(wxGraphicsFont) wxNullGraphicsFont; - -class WXDLLIMPEXP_CORE wxGraphicsBitmap : public wxGraphicsObject -{ -public: - wxGraphicsBitmap() {} - virtual ~wxGraphicsBitmap() {} - - // Convert bitmap to wxImage: this is more efficient than converting to - // wxBitmap first and then to wxImage and also works without X server - // connection under Unix that wxBitmap requires. -#if wxUSE_IMAGE - wxImage ConvertToImage() const; -#endif // wxUSE_IMAGE - - void* GetNativeBitmap() const; - - const wxGraphicsBitmapData* GetBitmapData() const - { return (const wxGraphicsBitmapData*) GetRefData(); } - wxGraphicsBitmapData* GetBitmapData() - { return (wxGraphicsBitmapData*) GetRefData(); } - -private: - wxDECLARE_DYNAMIC_CLASS(wxGraphicsBitmap); -}; - -extern WXDLLIMPEXP_DATA_CORE(wxGraphicsBitmap) wxNullGraphicsBitmap; - -class WXDLLIMPEXP_CORE wxGraphicsMatrix : public wxGraphicsObject -{ -public: - wxGraphicsMatrix() {} - - virtual ~wxGraphicsMatrix() {} - - // concatenates the matrix - virtual void Concat( const wxGraphicsMatrix *t ); - void Concat( const wxGraphicsMatrix &t ) { Concat( &t ); } - - // sets the matrix to the respective values - virtual void Set(wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0, - wxDouble tx=0.0, wxDouble ty=0.0); - - // gets the component valuess of the matrix - virtual void Get(wxDouble* a=NULL, wxDouble* b=NULL, wxDouble* c=NULL, - wxDouble* d=NULL, wxDouble* tx=NULL, wxDouble* ty=NULL) const; - - // makes this the inverse matrix - virtual void Invert(); - - // returns true if the elements of the transformation matrix are equal ? - virtual bool IsEqual( const wxGraphicsMatrix* t) const; - bool IsEqual( const wxGraphicsMatrix& t) const { return IsEqual( &t ); } - - // return true if this is the identity matrix - virtual bool IsIdentity() const; - - // - // transformation - // - - // add the translation to this matrix - virtual void Translate( wxDouble dx , wxDouble dy ); - - // add the scale to this matrix - virtual void Scale( wxDouble xScale , wxDouble yScale ); - - // add the rotation to this matrix (radians) - virtual void Rotate( wxDouble angle ); - - // - // apply the transforms - // - - // applies that matrix to the point - virtual void TransformPoint( wxDouble *x, wxDouble *y ) const; - - // applies the matrix except for translations - virtual void TransformDistance( wxDouble *dx, wxDouble *dy ) const; - - // returns the native representation - virtual void * GetNativeMatrix() const; - - const wxGraphicsMatrixData* GetMatrixData() const - { return (const wxGraphicsMatrixData*) GetRefData(); } - wxGraphicsMatrixData* GetMatrixData() - { return (wxGraphicsMatrixData*) GetRefData(); } - -private: - wxDECLARE_DYNAMIC_CLASS(wxGraphicsMatrix); -}; - -extern WXDLLIMPEXP_DATA_CORE(wxGraphicsMatrix) wxNullGraphicsMatrix; - -class WXDLLIMPEXP_CORE wxGraphicsPath : public wxGraphicsObject -{ -public: - wxGraphicsPath() {} - virtual ~wxGraphicsPath() {} - - // - // These are the path primitives from which everything else can be constructed - // - - // begins a new subpath at (x,y) - virtual void MoveToPoint( wxDouble x, wxDouble y ); - void MoveToPoint( const wxPoint2DDouble& p); - - // adds a straight line from the current point to (x,y) - virtual void AddLineToPoint( wxDouble x, wxDouble y ); - void AddLineToPoint( const wxPoint2DDouble& p); - - // adds a cubic Bezier curve from the current point, using two control points and an end point - virtual void AddCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble cx2, wxDouble cy2, wxDouble x, wxDouble y ); - void AddCurveToPoint( const wxPoint2DDouble& c1, const wxPoint2DDouble& c2, const wxPoint2DDouble& e); - - // adds another path - virtual void AddPath( const wxGraphicsPath& path ); - - // closes the current sub-path - virtual void CloseSubpath(); - - // gets the last point of the current path, (0,0) if not yet set - virtual void GetCurrentPoint( wxDouble* x, wxDouble* y) const; - wxPoint2DDouble GetCurrentPoint() const; - - // adds an arc of a circle centering at (x,y) with radius (r) from startAngle to endAngle - virtual void AddArc( wxDouble x, wxDouble y, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise ); - void AddArc( const wxPoint2DDouble& c, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise); - - // - // These are convenience functions which - if not available natively will be assembled - // using the primitives from above - // - - // adds a quadratic Bezier curve from the current point, using a control point and an end point - virtual void AddQuadCurveToPoint( wxDouble cx, wxDouble cy, wxDouble x, wxDouble y ); - - // appends a rectangle as a new closed subpath - virtual void AddRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h ); - - // appends an ellipsis as a new closed subpath fitting the passed rectangle - virtual void AddCircle( wxDouble x, wxDouble y, wxDouble r ); - - // appends a an arc to two tangents connecting (current) to (x1,y1) and (x1,y1) to (x2,y2), also a straight line from (current) to (x1,y1) - virtual void AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r ); - - // appends an ellipse - virtual void AddEllipse( wxDouble x, wxDouble y, wxDouble w, wxDouble h); - - // appends a rounded rectangle - virtual void AddRoundedRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h, wxDouble radius); - - // returns the native path - virtual void * GetNativePath() const; - - // give the native path returned by GetNativePath() back (there might be some deallocations necessary) - virtual void UnGetNativePath(void *p)const; - - // transforms each point of this path by the matrix - virtual void Transform( const wxGraphicsMatrix& matrix ); - - // gets the bounding box enclosing all points (possibly including control points) - virtual void GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h)const; - wxRect2DDouble GetBox()const; - - virtual bool Contains( wxDouble x, wxDouble y, wxPolygonFillMode fillStyle = wxODDEVEN_RULE)const; - bool Contains( const wxPoint2DDouble& c, wxPolygonFillMode fillStyle = wxODDEVEN_RULE)const; - - const wxGraphicsPathData* GetPathData() const - { return (const wxGraphicsPathData*) GetRefData(); } - wxGraphicsPathData* GetPathData() - { return (wxGraphicsPathData*) GetRefData(); } - -private: - wxDECLARE_DYNAMIC_CLASS(wxGraphicsPath); -}; - -extern WXDLLIMPEXP_DATA_CORE(wxGraphicsPath) wxNullGraphicsPath; - - -// Describes a single gradient stop. -class wxGraphicsGradientStop -{ -public: - wxGraphicsGradientStop(wxColour col = wxTransparentColour, - float pos = 0.) - : m_col(col), - m_pos(pos) - { - } - - // default copy ctor, assignment operator and dtor are ok - - const wxColour& GetColour() const { return m_col; } - void SetColour(const wxColour& col) { m_col = col; } - - float GetPosition() const { return m_pos; } - void SetPosition(float pos) - { - wxASSERT_MSG( pos >= 0 && pos <= 1, "invalid gradient stop position" ); - - m_pos = pos; - } - -private: - // The colour of this gradient band. - wxColour m_col; - - // Its starting position: 0 is the beginning and 1 is the end. - float m_pos; -}; - -// A collection of gradient stops ordered by their positions (from lowest to -// highest). The first stop (index 0, position 0.0) is always the starting -// colour and the last one (index GetCount() - 1, position 1.0) is the end -// colour. -class WXDLLIMPEXP_CORE wxGraphicsGradientStops -{ -public: - wxGraphicsGradientStops(wxColour startCol = wxTransparentColour, - wxColour endCol = wxTransparentColour) - { - // we can't use Add() here as it relies on having start/end stops as - // first/last array elements so do it manually - m_stops.push_back(wxGraphicsGradientStop(startCol, 0.f)); - m_stops.push_back(wxGraphicsGradientStop(endCol, 1.f)); - } - - // default copy ctor, assignment operator and dtor are ok for this class - - - // Add a stop in correct order. - void Add(const wxGraphicsGradientStop& stop); - void Add(wxColour col, float pos) { Add(wxGraphicsGradientStop(col, pos)); } - - // Get the number of stops. - size_t GetCount() const { return m_stops.size(); } - - // Return the stop at the given index (which must be valid). - wxGraphicsGradientStop Item(unsigned n) const { return m_stops.at(n); } - - // Get/set start and end colours. - void SetStartColour(wxColour col) - { m_stops[0].SetColour(col); } - wxColour GetStartColour() const - { return m_stops[0].GetColour(); } - void SetEndColour(wxColour col) - { m_stops[m_stops.size() - 1].SetColour(col); } - wxColour GetEndColour() const - { return m_stops[m_stops.size() - 1].GetColour(); } - -private: - // All the stops stored in ascending order of positions. - wxVector m_stops; -}; - -class WXDLLIMPEXP_CORE wxGraphicsContext : public wxGraphicsObject -{ -public: - wxGraphicsContext(wxGraphicsRenderer* renderer); - - virtual ~wxGraphicsContext(); - - static wxGraphicsContext* Create( const wxWindowDC& dc); - static wxGraphicsContext * Create( const wxMemoryDC& dc); -#if wxUSE_PRINTING_ARCHITECTURE - static wxGraphicsContext * Create( const wxPrinterDC& dc); -#endif -#ifdef __WXMSW__ -#if wxUSE_ENH_METAFILE - static wxGraphicsContext * Create( const wxEnhMetaFileDC& dc); -#endif -#endif - - static wxGraphicsContext* CreateFromNative( void * context ); - - static wxGraphicsContext* CreateFromNativeWindow( void * window ); - - static wxGraphicsContext* Create( wxWindow* window ); - -#if wxUSE_IMAGE - // Create a context for drawing onto a wxImage. The image life time must be - // greater than that of the context itself as when the context is destroyed - // it will copy its contents to the specified image. - static wxGraphicsContext* Create(wxImage& image); -#endif // wxUSE_IMAGE - - // create a context that can be used for measuring texts only, no drawing allowed - static wxGraphicsContext * Create(); - - // begin a new document (relevant only for printing / pdf etc) if there is a progress dialog, message will be shown - virtual bool StartDoc( const wxString& message ); - - // done with that document (relevant only for printing / pdf etc) - virtual void EndDoc(); - - // opens a new page (relevant only for printing / pdf etc) with the given size in points - // (if both are null the default page size will be used) - virtual void StartPage( wxDouble width = 0, wxDouble height = 0 ); - - // ends the current page (relevant only for printing / pdf etc) - virtual void EndPage(); - - // make sure that the current content of this context is immediately visible - virtual void Flush(); - - wxGraphicsPath CreatePath() const; - - virtual wxGraphicsPen CreatePen(const wxPen& pen) const; - - virtual wxGraphicsBrush CreateBrush(const wxBrush& brush ) const; - - // sets the brush to a linear gradient, starting at (x1,y1) and ending at - // (x2,y2) with the given boundary colours or the specified stops - wxGraphicsBrush - CreateLinearGradientBrush(wxDouble x1, wxDouble y1, - wxDouble x2, wxDouble y2, - const wxColour& c1, const wxColour& c2) const; - wxGraphicsBrush - CreateLinearGradientBrush(wxDouble x1, wxDouble y1, - wxDouble x2, wxDouble y2, - const wxGraphicsGradientStops& stops) const; - - // sets the brush to a radial gradient originating at (xo,yc) and ending - // on a circle around (xc,yc) with the given radius; the colours may be - // specified by just the two extremes or the full array of gradient stops - wxGraphicsBrush - CreateRadialGradientBrush(wxDouble xo, wxDouble yo, - wxDouble xc, wxDouble yc, wxDouble radius, - const wxColour& oColor, const wxColour& cColor) const; - - wxGraphicsBrush - CreateRadialGradientBrush(wxDouble xo, wxDouble yo, - wxDouble xc, wxDouble yc, wxDouble radius, - const wxGraphicsGradientStops& stops) const; - - // creates a font - virtual wxGraphicsFont CreateFont( const wxFont &font , const wxColour &col = *wxBLACK ) const; - virtual wxGraphicsFont CreateFont(double sizeInPixels, - const wxString& facename, - int flags = wxFONTFLAG_DEFAULT, - const wxColour& col = *wxBLACK) const; - - // create a native bitmap representation - virtual wxGraphicsBitmap CreateBitmap( const wxBitmap &bitmap ) const; -#if wxUSE_IMAGE - wxGraphicsBitmap CreateBitmapFromImage(const wxImage& image) const; -#endif // wxUSE_IMAGE - - // create a native bitmap representation - virtual wxGraphicsBitmap CreateSubBitmap( const wxGraphicsBitmap &bitmap, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) const; - - // create a 'native' matrix corresponding to these values - virtual wxGraphicsMatrix CreateMatrix( wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0, - wxDouble tx=0.0, wxDouble ty=0.0) const; - - wxGraphicsMatrix CreateMatrix( const wxAffineMatrix2DBase& mat ) const - { - wxMatrix2D mat2D; - wxPoint2DDouble tr; - mat.Get(&mat2D, &tr); - - return CreateMatrix(mat2D.m_11, mat2D.m_12, mat2D.m_21, mat2D.m_22, - tr.m_x, tr.m_y); - } - - // push the current state of the context, ie the transformation matrix on a stack - virtual void PushState() = 0; - - // pops a stored state from the stack - virtual void PopState() = 0; - - // clips drawings to the region intersected with the current clipping region - virtual void Clip( const wxRegion ®ion ) = 0; - - // clips drawings to the rect intersected with the current clipping region - virtual void Clip( wxDouble x, wxDouble y, wxDouble w, wxDouble h ) = 0; - - // resets the clipping to original extent - virtual void ResetClip() = 0; - - // returns the native context - virtual void * GetNativeContext() = 0; - - // returns the current shape antialiasing mode - virtual wxAntialiasMode GetAntialiasMode() const { return m_antialias; } - - // sets the antialiasing mode, returns true if it supported - virtual bool SetAntialiasMode(wxAntialiasMode antialias) = 0; - - // returns the current interpolation quality - virtual wxInterpolationQuality GetInterpolationQuality() const { return m_interpolation; } - - // sets the interpolation quality, returns true if it supported - virtual bool SetInterpolationQuality(wxInterpolationQuality interpolation) = 0; - - // returns the current compositing operator - virtual wxCompositionMode GetCompositionMode() const { return m_composition; } - - // sets the compositing operator, returns true if it supported - virtual bool SetCompositionMode(wxCompositionMode op) = 0; - - // returns the size of the graphics context in device coordinates - void GetSize(wxDouble* width, wxDouble* height) const - { - if ( width ) - *width = m_width; - if ( height ) - *height = m_height; - } - - // returns the resolution of the graphics context in device points per inch - virtual void GetDPI( wxDouble* dpiX, wxDouble* dpiY); - -#if 0 - // sets the current alpha on this context - virtual void SetAlpha( wxDouble alpha ); - - // returns the alpha on this context - virtual wxDouble GetAlpha() const; -#endif - - // all rendering is done into a fully transparent temporary context - virtual void BeginLayer(wxDouble opacity) = 0; - - // composites back the drawings into the context with the opacity given at - // the BeginLayer call - virtual void EndLayer() = 0; - - // - // transformation : changes the current transformation matrix CTM of the context - // - - // translate - virtual void Translate( wxDouble dx , wxDouble dy ) = 0; - - // scale - virtual void Scale( wxDouble xScale , wxDouble yScale ) = 0; - - // rotate (radians) - virtual void Rotate( wxDouble angle ) = 0; - - // concatenates this transform with the current transform of this context - virtual void ConcatTransform( const wxGraphicsMatrix& matrix ) = 0; - - // sets the transform of this context - virtual void SetTransform( const wxGraphicsMatrix& matrix ) = 0; - - // gets the matrix of this context - virtual wxGraphicsMatrix GetTransform() const = 0; - // - // setting the paint - // - - // sets the pen - virtual void SetPen( const wxGraphicsPen& pen ); - - void SetPen( const wxPen& pen ); - - // sets the brush for filling - virtual void SetBrush( const wxGraphicsBrush& brush ); - - void SetBrush( const wxBrush& brush ); - - // sets the font - virtual void SetFont( const wxGraphicsFont& font ); - - void SetFont( const wxFont& font, const wxColour& colour ); - - - // strokes along a path with the current pen - virtual void StrokePath( const wxGraphicsPath& path ) = 0; - - // fills a path with the current brush - virtual void FillPath( const wxGraphicsPath& path, wxPolygonFillMode fillStyle = wxODDEVEN_RULE ) = 0; - - // draws a path by first filling and then stroking - virtual void DrawPath( const wxGraphicsPath& path, wxPolygonFillMode fillStyle = wxODDEVEN_RULE ); - - // - // text - // - - void DrawText( const wxString &str, wxDouble x, wxDouble y ) - { DoDrawText(str, x, y); } - - void DrawText( const wxString &str, wxDouble x, wxDouble y, wxDouble angle ) - { DoDrawRotatedText(str, x, y, angle); } - - void DrawText( const wxString &str, wxDouble x, wxDouble y, - const wxGraphicsBrush& backgroundBrush ) - { DoDrawFilledText(str, x, y, backgroundBrush); } - - void DrawText( const wxString &str, wxDouble x, wxDouble y, - wxDouble angle, const wxGraphicsBrush& backgroundBrush ) - { DoDrawRotatedFilledText(str, x, y, angle, backgroundBrush); } - - - virtual void GetTextExtent( const wxString &text, wxDouble *width, wxDouble *height, - wxDouble *descent = NULL, wxDouble *externalLeading = NULL ) const = 0; - - virtual void GetPartialTextExtents(const wxString& text, wxArrayDouble& widths) const = 0; - - // - // image support - // - - virtual void DrawBitmap( const wxGraphicsBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) = 0; - - virtual void DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) = 0; - - virtual void DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) = 0; - - // - // convenience methods - // - - // strokes a single line - virtual void StrokeLine( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2); - - // stroke lines connecting each of the points - virtual void StrokeLines( size_t n, const wxPoint2DDouble *points); - - // stroke disconnected lines from begin to end points - virtual void StrokeLines( size_t n, const wxPoint2DDouble *beginPoints, const wxPoint2DDouble *endPoints); - - // draws a polygon - virtual void DrawLines( size_t n, const wxPoint2DDouble *points, wxPolygonFillMode fillStyle = wxODDEVEN_RULE ); - - // draws a rectangle - virtual void DrawRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h); - - // draws an ellipse - virtual void DrawEllipse( wxDouble x, wxDouble y, wxDouble w, wxDouble h); - - // draws a rounded rectangle - virtual void DrawRoundedRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h, wxDouble radius); - - // wrappers using wxPoint2DDouble TODO - - // helper to determine if a 0.5 offset should be applied for the drawing operation - virtual bool ShouldOffset() const { return false; } - - // indicates whether the context should try to offset for pixel boundaries, this only makes sense on - // bitmap devices like screen, by default this is turned off - virtual void EnableOffset(bool enable = true); - - void DisableOffset() { EnableOffset(false); } - bool OffsetEnabled() { return m_enableOffset; } - -protected: - // These fields must be initialized in the derived class ctors. - wxDouble m_width, - m_height; - - wxGraphicsPen m_pen; - wxGraphicsBrush m_brush; - wxGraphicsFont m_font; - wxAntialiasMode m_antialias; - wxCompositionMode m_composition; - wxInterpolationQuality m_interpolation; - bool m_enableOffset; - -protected: - // implementations of overloaded public functions: we use different names - // for them to avoid the virtual function hiding problems in the derived - // classes - virtual void DoDrawText(const wxString& str, wxDouble x, wxDouble y) = 0; - virtual void DoDrawRotatedText(const wxString& str, wxDouble x, wxDouble y, - wxDouble angle); - virtual void DoDrawFilledText(const wxString& str, wxDouble x, wxDouble y, - const wxGraphicsBrush& backgroundBrush); - virtual void DoDrawRotatedFilledText(const wxString& str, - wxDouble x, wxDouble y, - wxDouble angle, - const wxGraphicsBrush& backgroundBrush); - - wxDECLARE_NO_COPY_CLASS(wxGraphicsContext); - wxDECLARE_ABSTRACT_CLASS(wxGraphicsContext); -}; - -#if 0 - -// -// A graphics figure allows to cache path, pen etc creations, also will be a basis for layering/grouping elements -// - -class WXDLLIMPEXP_CORE wxGraphicsFigure : public wxGraphicsObject -{ -public: - wxGraphicsFigure(wxGraphicsRenderer* renderer); - - virtual ~wxGraphicsFigure(); - - void SetPath( wxGraphicsMatrix* matrix ); - - void SetMatrix( wxGraphicsPath* path); - - // draws this object on the context - virtual void Draw( wxGraphicsContext* cg ); - - // returns the path of this object - wxGraphicsPath* GetPath() { return m_path; } - - // returns the transformation matrix of this object, may be null if there is no transformation necessary - wxGraphicsMatrix* GetMatrix() { return m_matrix; } - -private: - wxGraphicsMatrix* m_matrix; - wxGraphicsPath* m_path; - - wxDECLARE_DYNAMIC_CLASS(wxGraphicsFigure); -}; - -#endif - -// -// The graphics renderer is the instance corresponding to the rendering engine used, eg there is ONE core graphics renderer -// instance on OSX. This instance is pointed back to by all objects created by it. Therefore you can create eg additional -// paths at any point from a given matrix etc. -// - -class WXDLLIMPEXP_CORE wxGraphicsRenderer : public wxObject -{ -public: - wxGraphicsRenderer() {} - - virtual ~wxGraphicsRenderer() {} - - static wxGraphicsRenderer* GetDefaultRenderer(); - - static wxGraphicsRenderer* GetCairoRenderer(); - -#ifdef __WXMSW__ -#if wxUSE_GRAPHICS_GDIPLUS - static wxGraphicsRenderer* GetGDIPlusRenderer(); -#endif - -#if wxUSE_GRAPHICS_DIRECT2D - static wxGraphicsRenderer* GetDirect2DRenderer(); -#endif -#endif - - // Context - - virtual wxGraphicsContext * CreateContext( const wxWindowDC& dc) = 0; - virtual wxGraphicsContext * CreateContext( const wxMemoryDC& dc) = 0; -#if wxUSE_PRINTING_ARCHITECTURE - virtual wxGraphicsContext * CreateContext( const wxPrinterDC& dc) = 0; -#endif -#ifdef __WXMSW__ -#if wxUSE_ENH_METAFILE - virtual wxGraphicsContext * CreateContext( const wxEnhMetaFileDC& dc) = 0; -#endif -#endif - - virtual wxGraphicsContext * CreateContextFromNativeContext( void * context ) = 0; - - virtual wxGraphicsContext * CreateContextFromNativeWindow( void * window ) = 0; - - virtual wxGraphicsContext * CreateContext( wxWindow* window ) = 0; - -#if wxUSE_IMAGE - virtual wxGraphicsContext * CreateContextFromImage(wxImage& image) = 0; -#endif // wxUSE_IMAGE - - // create a context that can be used for measuring texts only, no drawing allowed - virtual wxGraphicsContext * CreateMeasuringContext() = 0; - - // Path - - virtual wxGraphicsPath CreatePath() = 0; - - // Matrix - - virtual wxGraphicsMatrix CreateMatrix( wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0, - wxDouble tx=0.0, wxDouble ty=0.0) = 0; - - // Paints - - virtual wxGraphicsPen CreatePen(const wxPen& pen) = 0; - - virtual wxGraphicsBrush CreateBrush(const wxBrush& brush ) = 0; - - // Gradient brush creation functions may not honour all the stops specified - // stops and use just its boundary colours (this is currently the case - // under OS X) - virtual wxGraphicsBrush - CreateLinearGradientBrush(wxDouble x1, wxDouble y1, - wxDouble x2, wxDouble y2, - const wxGraphicsGradientStops& stops) = 0; - - virtual wxGraphicsBrush - CreateRadialGradientBrush(wxDouble xo, wxDouble yo, - wxDouble xc, wxDouble yc, - wxDouble radius, - const wxGraphicsGradientStops& stops) = 0; - - // sets the font - virtual wxGraphicsFont CreateFont( const wxFont &font , const wxColour &col = *wxBLACK ) = 0; - virtual wxGraphicsFont CreateFont(double sizeInPixels, - const wxString& facename, - int flags = wxFONTFLAG_DEFAULT, - const wxColour& col = *wxBLACK) = 0; - - // create a native bitmap representation - virtual wxGraphicsBitmap CreateBitmap( const wxBitmap &bitmap ) = 0; -#if wxUSE_IMAGE - virtual wxGraphicsBitmap CreateBitmapFromImage(const wxImage& image) = 0; - virtual wxImage CreateImageFromBitmap(const wxGraphicsBitmap& bmp) = 0; -#endif // wxUSE_IMAGE - - // create a graphics bitmap from a native bitmap - virtual wxGraphicsBitmap CreateBitmapFromNativeBitmap( void* bitmap ) = 0; - - // create a subimage from a native image representation - virtual wxGraphicsBitmap CreateSubBitmap( const wxGraphicsBitmap &bitmap, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) = 0; - - virtual wxString GetName() const = 0; - virtual void - GetVersion(int* major, int* minor = NULL, int* micro = NULL) const = 0; - -private: - wxDECLARE_NO_COPY_CLASS(wxGraphicsRenderer); - wxDECLARE_ABSTRACT_CLASS(wxGraphicsRenderer); -}; - - -#if wxUSE_IMAGE -inline -wxImage wxGraphicsBitmap::ConvertToImage() const -{ - wxGraphicsRenderer* renderer = GetRenderer(); - return renderer ? renderer->CreateImageFromBitmap(*this) : wxNullImage; -} -#endif // wxUSE_IMAGE - -#endif // wxUSE_GRAPHICS_CONTEXT - -#endif // _WX_GRAPHICS_H_ diff --git a/Externals/wxWidgets3/include/wx/grid.h b/Externals/wxWidgets3/include/wx/grid.h deleted file mode 100644 index 02055658ed..0000000000 --- a/Externals/wxWidgets3/include/wx/grid.h +++ /dev/null @@ -1,21 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/grid.h -// Purpose: wxGrid base header -// Author: Julian Smart -// Modified by: -// Created: -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GRID_H_BASE_ -#define _WX_GRID_H_BASE_ - -#include "wx/generic/grid.h" - -// these headers used to be included from the above header but isn't any more, -// still do it from here for compatibility -#include "wx/generic/grideditors.h" -#include "wx/generic/gridctrl.h" - -#endif // _WX_GRID_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/gtk/accel.h b/Externals/wxWidgets3/include/wx/gtk/accel.h deleted file mode 100644 index 09ffb61cc1..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/accel.h +++ /dev/null @@ -1,14 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/accel.h -// Purpose: wxAcceleratorTable redirection file -// Author: Julian Smart -// Modified by: -// Created: -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// VZ: keeping the old file just in case we're going to have a native GTK+ -// wxAcceleratorTable implementation one day, but for now use the generic -// version -#include "wx/generic/accel.h" diff --git a/Externals/wxWidgets3/include/wx/gtk/activityindicator.h b/Externals/wxWidgets3/include/wx/gtk/activityindicator.h deleted file mode 100644 index 72889dfcd0..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/activityindicator.h +++ /dev/null @@ -1,66 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/activityindicator.h -// Purpose: Declaration of wxActivityIndicator for wxGTK. -// Author: Vadim Zeitlin -// Created: 2015-03-05 -// Copyright: (c) 2015 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_ACTIVITYINDICATOR_H_ -#define _WX_GTK_ACTIVITYINDICATOR_H_ - -// With GTK+ 3 we can always be certain that this control is available, so use -// the normal base class. With GTK+ 2 however, we may determine during run-time -// that we need to fall back to the generic implementation because the GTK+ -// version is earlier than 2.20, so we need to inherit from the generic class. -#ifdef __WXGTK3__ - #define wxActivityIndicatorGtkBase wxActivityIndicatorBase -#else - #include "wx/generic/activityindicator.h" - - #define wxActivityIndicatorGtkBase wxActivityIndicatorGeneric -#endif - -// ---------------------------------------------------------------------------- -// wxActivityIndicator: implementation using GtkSpinner. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxActivityIndicator : public wxActivityIndicatorGtkBase -{ -public: - wxActivityIndicator() - { - } - - explicit - wxActivityIndicator(wxWindow* parent, - wxWindowID winid = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxActivityIndicatorNameStr) - { - Create(parent, winid, pos, size, style, name); - } - - bool Create(wxWindow* parent, - wxWindowID winid = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxActivityIndicatorNameStr); - - virtual void Start() wxOVERRIDE; - virtual void Stop() wxOVERRIDE; - virtual bool IsRunning() const wxOVERRIDE; - -protected: - virtual wxSize DoGetBestClientSize() const wxOVERRIDE; - -private: - wxDECLARE_DYNAMIC_CLASS(wxActivityIndicator); - wxDECLARE_NO_COPY_CLASS(wxActivityIndicator); -}; - -#endif // _WX_GTK_ACTIVITYINDICATOR_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/animate.h b/Externals/wxWidgets3/include/wx/gtk/animate.h deleted file mode 100644 index f07fdea939..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/animate.h +++ /dev/null @@ -1,153 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/animate.h -// Purpose: Animation classes -// Author: Julian Smart and Guillermo Rodriguez Garcia -// Modified by: Francesco Montorsi -// Created: 13/8/99 -// Copyright: (c) Julian Smart and Guillermo Rodriguez Garcia -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTKANIMATEH__ -#define _WX_GTKANIMATEH__ - -typedef struct _GdkPixbufAnimation GdkPixbufAnimation; -typedef struct _GdkPixbufAnimationIter GdkPixbufAnimationIter; - -// ---------------------------------------------------------------------------- -// wxAnimation -// Unlike the generic wxAnimation object (see generic\animate.cpp), we won't -// use directly wxAnimationHandlers as gdk-pixbuf already provides the -// concept of handler and will automatically use the available handlers. -// Like generic wxAnimation object, this implementation of wxAnimation is -// refcounted so that assignment is very fast -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxAnimation : public wxAnimationBase -{ -public: - wxAnimation(const wxString &name, wxAnimationType type = wxANIMATION_TYPE_ANY) - : m_pixbuf(NULL) { LoadFile(name, type); } - wxAnimation(GdkPixbufAnimation *p = NULL); - wxAnimation(const wxAnimation&); - ~wxAnimation() { UnRef(); } - - wxAnimation& operator= (const wxAnimation&); - - virtual bool IsOk() const wxOVERRIDE - { return m_pixbuf != NULL; } - - - // unfortunately GdkPixbufAnimation does not expose these info: - - virtual unsigned int GetFrameCount() const wxOVERRIDE { return 0; } - virtual wxImage GetFrame(unsigned int frame) const wxOVERRIDE; - - // we can retrieve the delay for a frame only after building - // a GdkPixbufAnimationIter... - virtual int GetDelay(unsigned int WXUNUSED(frame)) const wxOVERRIDE { return 0; } - - virtual wxSize GetSize() const wxOVERRIDE; - - virtual bool LoadFile(const wxString &name, wxAnimationType type = wxANIMATION_TYPE_ANY) wxOVERRIDE; - virtual bool Load(wxInputStream &stream, wxAnimationType type = wxANIMATION_TYPE_ANY) wxOVERRIDE; - - // Implementation -public: // used by GTK callbacks - - GdkPixbufAnimation *GetPixbuf() const - { return m_pixbuf; } - void SetPixbuf(GdkPixbufAnimation* p); - -protected: - GdkPixbufAnimation *m_pixbuf; - -private: - void UnRef(); - - typedef wxAnimationBase base_type; - wxDECLARE_DYNAMIC_CLASS(wxAnimation); -}; - - -// ---------------------------------------------------------------------------- -// wxAnimationCtrl -// ---------------------------------------------------------------------------- - -// Resize to animation size if this is set -#define wxAN_FIT_ANIMATION 0x0010 - -class WXDLLIMPEXP_ADV wxAnimationCtrl: public wxAnimationCtrlBase -{ -public: - wxAnimationCtrl() { Init(); } - wxAnimationCtrl(wxWindow *parent, - wxWindowID id, - const wxAnimation& anim = wxNullAnimation, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxAC_DEFAULT_STYLE, - const wxString& name = wxAnimationCtrlNameStr) - { - Init(); - - Create(parent, id, anim, pos, size, style, name); - } - - bool Create(wxWindow *parent, wxWindowID id, - const wxAnimation& anim = wxNullAnimation, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxAC_DEFAULT_STYLE, - const wxString& name = wxAnimationCtrlNameStr); - - ~wxAnimationCtrl(); - -public: // event handler - - void OnTimer(wxTimerEvent &); - -public: // public API - - virtual bool LoadFile(const wxString& filename, wxAnimationType type = wxANIMATION_TYPE_ANY) wxOVERRIDE; - virtual bool Load(wxInputStream& stream, wxAnimationType type = wxANIMATION_TYPE_ANY) wxOVERRIDE; - - virtual void SetAnimation(const wxAnimation &anim) wxOVERRIDE; - virtual wxAnimation GetAnimation() const wxOVERRIDE - { return wxAnimation(m_anim); } - - virtual bool Play() wxOVERRIDE; - virtual void Stop() wxOVERRIDE; - - virtual bool IsPlaying() const wxOVERRIDE; - - bool SetBackgroundColour( const wxColour &colour ) wxOVERRIDE; - -protected: - - virtual void DisplayStaticImage() wxOVERRIDE; - virtual wxSize DoGetBestSize() const wxOVERRIDE; - void FitToAnimation(); - void ClearToBackgroundColour(); - - void ResetAnim(); - void ResetIter(); - -protected: // internal vars - - GdkPixbufAnimation *m_anim; - GdkPixbufAnimationIter *m_iter; - - wxTimer m_timer; - bool m_bPlaying; - -private: - typedef wxAnimationCtrlBase base_type; - - void Init(); - - wxDECLARE_DYNAMIC_CLASS(wxAnimationCtrl); - wxDECLARE_EVENT_TABLE(); -}; - -#endif // _WX_GTKANIMATEH__ diff --git a/Externals/wxWidgets3/include/wx/gtk/anybutton.h b/Externals/wxWidgets3/include/wx/gtk/anybutton.h deleted file mode 100644 index ad0357a659..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/anybutton.h +++ /dev/null @@ -1,80 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/anybutton.h -// Purpose: wxGTK wxAnyButton class declaration -// Author: Robert Roebling -// Created: 1998-05-20 (extracted from button.h) -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_ANYBUTTON_H_ -#define _WX_GTK_ANYBUTTON_H_ - -//----------------------------------------------------------------------------- -// wxAnyButton -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxAnyButton : public wxAnyButtonBase -{ -public: - wxAnyButton() - { - m_isCurrent = - m_isPressed = false; - } - - virtual bool Enable( bool enable = true ) wxOVERRIDE; - - // implementation - // -------------- - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - // called from GTK callbacks: they update the button state and call - // GTKUpdateBitmap() - void GTKMouseEnters(); - void GTKMouseLeaves(); - void GTKPressed(); - void GTKReleased(); - -protected: - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE; - - virtual wxBitmap DoGetBitmap(State which) const wxOVERRIDE; - virtual void DoSetBitmap(const wxBitmap& bitmap, State which) wxOVERRIDE; - virtual void DoSetBitmapPosition(wxDirection dir) wxOVERRIDE; - -private: - typedef wxAnyButtonBase base_type; - - // focus event handler: calls GTKUpdateBitmap() - void GTKOnFocus(wxFocusEvent& event); - - // update the bitmap to correspond to the current button state - void GTKUpdateBitmap(); - - // return the state whose bitmap is being currently shown (so this is - // different from the real current state, e.g. it could be State_Normal - // even if the button is pressed if no button was set for State_Pressed) - State GTKGetCurrentBitmapState() const; - - // show the given bitmap (must be valid) - void GTKDoShowBitmap(const wxBitmap& bitmap); - - - // the bitmaps for the different state of the buttons, all of them may be - // invalid and the button only shows a bitmap at all if State_Normal bitmap - // is valid - wxBitmap m_bitmaps[State_Max]; - - // true iff mouse is currently over the button - bool m_isCurrent; - - // true iff the button is in pressed state - bool m_isPressed; - - wxDECLARE_NO_COPY_CLASS(wxAnyButton); -}; - -#endif // _WX_GTK_ANYBUTTON_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/app.h b/Externals/wxWidgets3/include/wx/gtk/app.h deleted file mode 100644 index 2682515592..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/app.h +++ /dev/null @@ -1,80 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/app.h -// Purpose: wxApp definition for wxGTK -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling, Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_APP_H_ -#define _WX_GTK_APP_H_ - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -//----------------------------------------------------------------------------- -// wxApp -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxApp: public wxAppBase -{ -public: - wxApp(); - virtual ~wxApp(); - - /* override for altering the way wxGTK initializes the GUI - * (palette/visual/colorcube). under wxMSW, OnInitGui() does nothing by - * default. when overriding this method, the code in it is likely to be - * platform dependent, otherwise use OnInit(). */ - virtual bool SetNativeTheme(const wxString& theme) wxOVERRIDE; - virtual bool OnInitGui() wxOVERRIDE; - - // override base class (pure) virtuals - virtual void WakeUpIdle() wxOVERRIDE; - - virtual bool Initialize(int& argc, wxChar **argv) wxOVERRIDE; - virtual void CleanUp() wxOVERRIDE; - - virtual void OnAssertFailure(const wxChar *file, - int line, - const wxChar *func, - const wxChar *cond, - const wxChar *msg) wxOVERRIDE; - - // GTK-specific methods - // ------------------- - - // this can be overridden to return a specific visual to be used for GTK+ - // instead of the default one (it's used by wxGLApp) - // - // must return XVisualInfo pointer (it is not freed by caller) - virtual void *GetXVisualInfo() { return NULL; } - - // Check if we're using a global menu. Currently this is only true when - // running under Ubuntu Unity and global menu is not disabled. - // - // This is mostly used in the implementation in order to work around - // various bugs arising due to this. - static bool GTKIsUsingGlobalMenu(); - - // implementation only from now on - // ------------------------------- - - // check for pending events, without interference from our idle source - bool EventsPending(); - bool DoIdle(); - -private: - // true if we're inside an assert modal dialog - bool m_isInAssert; - -#if wxUSE_THREADS - wxMutex m_idleMutex; -#endif - unsigned m_idleSourceId; - - wxDECLARE_DYNAMIC_CLASS(wxApp); -}; - -#endif // _WX_GTK_APP_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/assertdlg_gtk.h b/Externals/wxWidgets3/include/wx/gtk/assertdlg_gtk.h deleted file mode 100644 index 098e9b1123..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/assertdlg_gtk.h +++ /dev/null @@ -1,77 +0,0 @@ -/* /////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/assertdlg_gtk.h -// Purpose: GtkAssertDialog -// Author: Francesco Montorsi -// Copyright: (c) 2006 Francesco Montorsi -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////// */ - -#ifndef _WX_GTK_ASSERTDLG_H_ -#define _WX_GTK_ASSERTDLG_H_ - -#define GTK_TYPE_ASSERT_DIALOG (gtk_assert_dialog_get_type ()) -#define GTK_ASSERT_DIALOG(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GTK_TYPE_ASSERT_DIALOG, GtkAssertDialog)) -#define GTK_ASSERT_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ASSERT_DIALOG, GtkAssertDialogClass)) -#define GTK_IS_ASSERT_DIALOG(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GTK_TYPE_ASSERT_DIALOG)) -#define GTK_IS_ASSERT_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ASSERT_DIALOG)) -#define GTK_ASSERT_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ASSERT_DIALOG, GtkAssertDialogClass)) - -typedef struct _GtkAssertDialog GtkAssertDialog; -typedef struct _GtkAssertDialogClass GtkAssertDialogClass; -typedef void (*GtkAssertDialogStackFrameCallback)(void *); - -struct _GtkAssertDialog -{ - GtkDialog parent_instance; - - /* GtkAssertDialog widgets */ - GtkWidget *expander; - GtkWidget *message; - GtkWidget *treeview; - - GtkWidget *shownexttime; - - /* callback for processing the stack frame */ - GtkAssertDialogStackFrameCallback callback; - void *userdata; -}; - -struct _GtkAssertDialogClass -{ - GtkDialogClass parent_class; -}; - -typedef enum -{ - GTK_ASSERT_DIALOG_STOP, - GTK_ASSERT_DIALOG_CONTINUE, - GTK_ASSERT_DIALOG_CONTINUE_SUPPRESSING -} GtkAssertDialogResponseID; - - - - -GType gtk_assert_dialog_get_type(void); -GtkWidget *gtk_assert_dialog_new(void); - -/* get the assert message */ -gchar *gtk_assert_dialog_get_message(GtkAssertDialog *assertdlg); - -/* set the assert message */ -void gtk_assert_dialog_set_message(GtkAssertDialog *assertdlg, const gchar *msg); - -/* get a string containing all stack frames appended to the dialog */ -gchar *gtk_assert_dialog_get_backtrace(GtkAssertDialog *assertdlg); - -/* sets the callback to use when the user wants to see the stackframe */ -void gtk_assert_dialog_set_backtrace_callback(GtkAssertDialog *assertdlg, - GtkAssertDialogStackFrameCallback callback, - void *userdata); - -/* appends a stack frame to the dialog */ -void gtk_assert_dialog_append_stack_frame(GtkAssertDialog *dlg, - const gchar *function, - const gchar *sourcefile, - guint line_number); - -#endif /* _WX_GTK_ASSERTDLG_H_ */ diff --git a/Externals/wxWidgets3/include/wx/gtk/bitmap.h b/Externals/wxWidgets3/include/wx/gtk/bitmap.h deleted file mode 100644 index 3b3cf99cff..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/bitmap.h +++ /dev/null @@ -1,186 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/bitmap.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_BITMAP_H_ -#define _WX_GTK_BITMAP_H_ - -#ifdef __WXGTK3__ -typedef struct _cairo cairo_t; -typedef struct _cairo_surface cairo_surface_t; -#endif -typedef struct _GdkPixbuf GdkPixbuf; -class WXDLLIMPEXP_FWD_CORE wxPixelDataBase; -class WXDLLIMPEXP_FWD_CORE wxCursor; - -//----------------------------------------------------------------------------- -// wxMask -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxMask: public wxMaskBase -{ -public: - wxMask(); - wxMask(const wxMask& mask); - wxMask( const wxBitmap& bitmap, const wxColour& colour ); -#if wxUSE_PALETTE - wxMask( const wxBitmap& bitmap, int paletteIndex ); -#endif // wxUSE_PALETTE - wxMask( const wxBitmap& bitmap ); - virtual ~wxMask(); - wxBitmap GetBitmap() const; - - // implementation -#ifdef __WXGTK3__ - wxMask(cairo_surface_t*); - operator cairo_surface_t*() const; -#else - wxMask(GdkPixmap*); - operator GdkPixmap*() const; -#endif - -protected: - virtual void FreeData() wxOVERRIDE; - virtual bool InitFromColour(const wxBitmap& bitmap, const wxColour& colour) wxOVERRIDE; - virtual bool InitFromMonoBitmap(const wxBitmap& bitmap) wxOVERRIDE; - -private: -#ifdef __WXGTK3__ - cairo_surface_t* m_bitmap; -#else - GdkPixmap* m_bitmap; -#endif - - wxDECLARE_DYNAMIC_CLASS(wxMask); -}; - -//----------------------------------------------------------------------------- -// wxBitmap -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase -{ -public: - wxBitmap() { } - wxBitmap( int width, int height, int depth = wxBITMAP_SCREEN_DEPTH ) - { Create(width, height, depth); } - wxBitmap( const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH ) - { Create(sz, depth); } - wxBitmap( const char bits[], int width, int height, int depth = 1 ); - wxBitmap( const char* const* bits ); -#ifdef wxNEEDS_CHARPP - // needed for old GCC - wxBitmap(char** data) - { *this = wxBitmap(const_cast(data)); } -#endif - wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_DEFAULT_TYPE ); -#if wxUSE_IMAGE - wxBitmap(const wxImage& image, int depth = wxBITMAP_SCREEN_DEPTH, double scale = 1.0); -#endif // wxUSE_IMAGE - wxBitmap(GdkPixbuf* pixbuf, int depth = 0); - wxEXPLICIT wxBitmap(const wxCursor& cursor); - virtual ~wxBitmap(); - - bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH) wxOVERRIDE; - bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH) wxOVERRIDE - { return Create(sz.GetWidth(), sz.GetHeight(), depth); } - bool Create(int width, int height, const wxDC& WXUNUSED(dc)) - { return Create(width,height); } -#ifdef __WXGTK3__ - virtual bool CreateScaled(int w, int h, int depth, double scale) wxOVERRIDE; - virtual double GetScaleFactor() const wxOVERRIDE; -#endif - - virtual int GetHeight() const wxOVERRIDE; - virtual int GetWidth() const wxOVERRIDE; - virtual int GetDepth() const wxOVERRIDE; - -#if wxUSE_IMAGE - wxImage ConvertToImage() const wxOVERRIDE; -#endif // wxUSE_IMAGE - - // copies the contents and mask of the given (colour) icon to the bitmap - virtual bool CopyFromIcon(const wxIcon& icon) wxOVERRIDE; - - wxMask *GetMask() const wxOVERRIDE; - void SetMask( wxMask *mask ) wxOVERRIDE; - - wxBitmap GetSubBitmap( const wxRect& rect ) const wxOVERRIDE; - - bool SaveFile(const wxString &name, wxBitmapType type, - const wxPalette *palette = NULL) const wxOVERRIDE; - bool LoadFile(const wxString &name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE) wxOVERRIDE; - -#if wxUSE_PALETTE - wxPalette *GetPalette() const wxOVERRIDE; - void SetPalette(const wxPalette& palette) wxOVERRIDE; - wxPalette *GetColourMap() const { return GetPalette(); } -#endif // wxUSE_PALETTE - - static void InitStandardHandlers(); - - // implementation - // -------------- - - void SetHeight( int height ) wxOVERRIDE; - void SetWidth( int width ) wxOVERRIDE; - void SetDepth( int depth ) wxOVERRIDE; - -#ifdef __WXGTK3__ - GdkPixbuf* GetPixbufNoMask() const; - cairo_t* CairoCreate() const; - void Draw(cairo_t* cr, int x, int y, bool useMask = true, const wxColour* fg = NULL, const wxColour* bg = NULL) const; - void SetSourceSurface(cairo_t* cr, int x, int y, const wxColour* fg = NULL, const wxColour* bg = NULL) const; -#else - GdkPixmap *GetPixmap() const; - bool HasPixmap() const; - bool HasPixbuf() const; - wxBitmap(GdkPixmap* pixmap); -#endif - GdkPixbuf *GetPixbuf() const; - - // raw bitmap access support functions - void *GetRawData(wxPixelDataBase& data, int bpp); - void UngetRawData(wxPixelDataBase& data); - - bool HasAlpha() const; - -protected: -#ifndef __WXGTK3__ -#if wxUSE_IMAGE - bool CreateFromImage(const wxImage& image, int depth); -#endif // wxUSE_IMAGE -#endif - - virtual wxGDIRefData* CreateGDIRefData() const wxOVERRIDE; - virtual wxGDIRefData* CloneGDIRefData(const wxGDIRefData* data) const wxOVERRIDE; - -private: -#ifndef __WXGTK3__ - void SetPixmap(GdkPixmap* pixmap); -#if wxUSE_IMAGE - // to be called from CreateFromImage only! - bool CreateFromImageAsPixmap(const wxImage& image, int depth); - bool CreateFromImageAsPixbuf(const wxImage& image); -#endif // wxUSE_IMAGE - -public: - // implementation only - enum Representation - { - Pixmap, - Pixbuf - }; - // removes other representations from memory, keeping only 'keep' - // (wxBitmap may keep same bitmap e.g. as both pixmap and pixbuf): - void PurgeOtherRepresentations(Representation keep); -#endif - - wxDECLARE_DYNAMIC_CLASS(wxBitmap); -}; - -#endif // _WX_GTK_BITMAP_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/bmpbuttn.h b/Externals/wxWidgets3/include/wx/gtk/bmpbuttn.h deleted file mode 100644 index 70b4d4326d..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/bmpbuttn.h +++ /dev/null @@ -1,46 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/bmpbutton.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_BMPBUTTON_H_ -#define _WX_GTK_BMPBUTTON_H_ - -// ---------------------------------------------------------------------------- -// wxBitmapButton -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxBitmapButton : public wxBitmapButtonBase -{ -public: - wxBitmapButton() { } - - wxBitmapButton(wxWindow *parent, - wxWindowID id, - const wxBitmap& bitmap, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr) - { - Create(parent, id, bitmap, pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxBitmap& bitmap, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr); - -private: - wxDECLARE_DYNAMIC_CLASS(wxBitmapButton); -}; - -#endif // _WX_GTK_BMPBUTTON_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/bmpcbox.h b/Externals/wxWidgets3/include/wx/gtk/bmpcbox.h deleted file mode 100644 index 57b464aa81..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/bmpcbox.h +++ /dev/null @@ -1,146 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/bmpcbox.h -// Purpose: wxBitmapComboBox -// Author: Jaakko Salli -// Created: 2008-05-19 -// Copyright: (c) 2008 Jaakko Salli -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_BMPCBOX_H_ -#define _WX_GTK_BMPCBOX_H_ - - -#include "wx/combobox.h" - -// ---------------------------------------------------------------------------- -// wxBitmapComboBox: a wxComboBox that allows images to be shown -// in front of string items. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxBitmapComboBox : public wxComboBox, - public wxBitmapComboBoxBase -{ -public: - // ctors and such - wxBitmapComboBox() : wxComboBox(), wxBitmapComboBoxBase() - { - Init(); - } - - wxBitmapComboBox(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, - const wxString choices[] = NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxBitmapComboBoxNameStr) - : wxComboBox(), - wxBitmapComboBoxBase() - { - Init(); - - (void)Create(parent, id, value, pos, size, n, - choices, style, validator, name); - } - - wxBitmapComboBox(wxWindow *parent, - wxWindowID id, - const wxString& value, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxBitmapComboBoxNameStr); - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& value, - const wxPoint& pos, - const wxSize& size, - int n, - const wxString choices[], - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxBitmapComboBoxNameStr); - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& value, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxBitmapComboBoxNameStr); - - virtual ~wxBitmapComboBox(); - - // Sets the image for the given item. - virtual void SetItemBitmap(unsigned int n, const wxBitmap& bitmap) wxOVERRIDE; - - // Returns the image of the item with the given index. - virtual wxBitmap GetItemBitmap(unsigned int n) const wxOVERRIDE; - - // Returns size of the image used in list - virtual wxSize GetBitmapSize() const wxOVERRIDE - { - return m_bitmapSize; - } - - // Adds item with image to the end of the combo box. - int Append(const wxString& item, const wxBitmap& bitmap = wxNullBitmap); - int Append(const wxString& item, const wxBitmap& bitmap, void *clientData); - int Append(const wxString& item, const wxBitmap& bitmap, wxClientData *clientData); - - // Inserts item with image into the list before pos. Not valid for wxCB_SORT - // styles, use Append instead. - int Insert(const wxString& item, const wxBitmap& bitmap, unsigned int pos); - int Insert(const wxString& item, const wxBitmap& bitmap, - unsigned int pos, void *clientData); - int Insert(const wxString& item, const wxBitmap& bitmap, - unsigned int pos, wxClientData *clientData); - - // Override some wxTextEntry interface. - virtual void WriteText(const wxString& value) wxOVERRIDE; - - virtual wxString GetValue() const wxOVERRIDE; - virtual void Remove(long from, long to) wxOVERRIDE; - - virtual void SetInsertionPoint(long pos) wxOVERRIDE; - virtual long GetInsertionPoint() const wxOVERRIDE; - virtual long GetLastPosition() const wxOVERRIDE; - - virtual void SetSelection(long from, long to) wxOVERRIDE; - virtual void GetSelection(long *from, long *to) const wxOVERRIDE; - - virtual void SetSelection(int n) wxOVERRIDE { wxComboBox::SetSelection(n); } - virtual int GetSelection() const wxOVERRIDE { return wxComboBox::GetSelection(); } - - virtual bool IsEditable() const wxOVERRIDE; - virtual void SetEditable(bool editable) wxOVERRIDE; - - virtual GtkWidget* GetConnectWidget() wxOVERRIDE; - -protected: - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE; - - virtual void GTKCreateComboBoxWidget() wxOVERRIDE; - virtual void GTKInsertComboBoxTextItem( unsigned int n, const wxString& text ) wxOVERRIDE; - - virtual wxSize DoGetBestSize() const wxOVERRIDE; - - wxSize m_bitmapSize; - int m_bitmapCellIndex; - -private: - void Init(); - - wxDECLARE_DYNAMIC_CLASS(wxBitmapComboBox); -}; - -#endif // _WX_GTK_BMPCBOX_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/brush.h b/Externals/wxWidgets3/include/wx/gtk/brush.h deleted file mode 100644 index 7f88eb1aef..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/brush.h +++ /dev/null @@ -1,53 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/brush.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_BRUSH_H_ -#define _WX_GTK_BRUSH_H_ - -class WXDLLIMPEXP_FWD_CORE wxBitmap; -class WXDLLIMPEXP_FWD_CORE wxColour; - -//----------------------------------------------------------------------------- -// wxBrush -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxBrush: public wxBrushBase -{ -public: - wxBrush() { } - - wxBrush( const wxColour &colour, wxBrushStyle style = wxBRUSHSTYLE_SOLID ); - wxBrush( const wxBitmap &stippleBitmap ); - virtual ~wxBrush(); - - bool operator==(const wxBrush& brush) const; - bool operator!=(const wxBrush& brush) const { return !(*this == brush); } - - wxBrushStyle GetStyle() const wxOVERRIDE; - wxColour GetColour() const wxOVERRIDE; - wxBitmap *GetStipple() const wxOVERRIDE; - - void SetColour( const wxColour& col ) wxOVERRIDE; - void SetColour( unsigned char r, unsigned char g, unsigned char b ) wxOVERRIDE; - void SetStyle( wxBrushStyle style ) wxOVERRIDE; - void SetStipple( const wxBitmap& stipple ) wxOVERRIDE; - - wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants") - wxBrush(const wxColour& col, int style); - - wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants") - void SetStyle(int style) { SetStyle((wxBrushStyle)style); } - -protected: - virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE; - - wxDECLARE_DYNAMIC_CLASS(wxBrush); -}; - -#endif // _WX_GTK_BRUSH_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/button.h b/Externals/wxWidgets3/include/wx/gtk/button.h deleted file mode 100644 index 47e43b011e..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/button.h +++ /dev/null @@ -1,73 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/button.h -// Purpose: wxGTK wxButton class declaration -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_BUTTON_H_ -#define _WX_GTK_BUTTON_H_ - -//----------------------------------------------------------------------------- -// wxButton -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxButton : public wxButtonBase -{ -public: - wxButton() {} - wxButton(wxWindow *parent, wxWindowID id, - const wxString& label = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr) - { - Create(parent, id, label, pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, wxWindowID id, - const wxString& label = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr); - - virtual wxWindow *SetDefault() wxOVERRIDE; - virtual void SetLabel( const wxString &label ) wxOVERRIDE; - - // implementation - // -------------- - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - // helper to allow access to protected member from GTK callback - void MoveWindow(int x, int y, int width, int height) { DoMoveWindow(x, y, width, height); } - - // called from GTK callbacks: they update the button state and call - // GTKUpdateBitmap() - void GTKMouseEnters(); - void GTKMouseLeaves(); - void GTKPressed(); - void GTKReleased(); - -protected: - virtual wxSize DoGetBestSize() const wxOVERRIDE; - virtual void DoApplyWidgetStyle(GtkRcStyle *style) wxOVERRIDE; - -#if wxUSE_MARKUP - virtual bool DoSetLabelMarkup(const wxString& markup) wxOVERRIDE; -#endif // wxUSE_MARKUP - -private: - typedef wxButtonBase base_type; - - // Return the GtkLabel used by this button. - GtkLabel *GTKGetLabel() const; - - wxDECLARE_DYNAMIC_CLASS(wxButton); -}; - -#endif // _WX_GTK_BUTTON_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/calctrl.h b/Externals/wxWidgets3/include/wx/gtk/calctrl.h deleted file mode 100644 index 81be1cd638..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/calctrl.h +++ /dev/null @@ -1,69 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/calctrl.h -// Purpose: wxGtkCalendarCtrl control -// Author: Marcin Wojdyr -// Copyright: (C) 2008 Marcin Wojdyr -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef GTK_CALCTRL_H__ -#define GTK_CALCTRL_H__ - -class WXDLLIMPEXP_ADV wxGtkCalendarCtrl : public wxCalendarCtrlBase -{ -public: - wxGtkCalendarCtrl() {} - wxGtkCalendarCtrl(wxWindow *parent, - wxWindowID id, - const wxDateTime& date = wxDefaultDateTime, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxCAL_SHOW_HOLIDAYS, - const wxString& name = wxCalendarNameStr) - { - Create(parent, id, date, pos, size, style, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxDateTime& date = wxDefaultDateTime, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxCAL_SHOW_HOLIDAYS, - const wxString& name = wxCalendarNameStr); - - virtual ~wxGtkCalendarCtrl() {} - - virtual bool SetDate(const wxDateTime& date) wxOVERRIDE; - virtual wxDateTime GetDate() const wxOVERRIDE; - - virtual bool SetDateRange(const wxDateTime& lowerdate = wxDefaultDateTime, - const wxDateTime& upperdate = wxDefaultDateTime) wxOVERRIDE; - virtual bool GetDateRange(wxDateTime *lowerdate, wxDateTime *upperdate) const wxOVERRIDE; - - virtual bool EnableMonthChange(bool enable = true) wxOVERRIDE; - - virtual void Mark(size_t day, bool mark) wxOVERRIDE; - - // implementation - // -------------- - - void GTKGenerateEvent(wxEventType type); - -private: - bool IsInValidRange(const wxDateTime& dt) const; - - // Range of the dates that can be selected by user, either or both may be - // invalid to indicate that no corresponding restriction is set. - wxDateTime m_validStart, - m_validEnd; - - // Last known selected date, may be different from the real selection in - // the control while a handler for day-selected is running. - wxDateTime m_selectedDate; - - wxDECLARE_DYNAMIC_CLASS(wxGtkCalendarCtrl); - wxDECLARE_NO_COPY_CLASS(wxGtkCalendarCtrl); -}; - -#endif // GTK_CALCTRL_H__ diff --git a/Externals/wxWidgets3/include/wx/gtk/checkbox.h b/Externals/wxWidgets3/include/wx/gtk/checkbox.h deleted file mode 100644 index 8068f0b556..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/checkbox.h +++ /dev/null @@ -1,67 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/checkbox.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTKCHECKBOX_H_ -#define _WX_GTKCHECKBOX_H_ - -// ---------------------------------------------------------------------------- -// wxCheckBox -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxCheckBox : public wxCheckBoxBase -{ -public: - wxCheckBox(); - ~wxCheckBox(); - wxCheckBox( wxWindow *parent, wxWindowID id, const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxCheckBoxNameStr) - { - Create(parent, id, label, pos, size, style, validator, name); - } - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxCheckBoxNameStr ); - - void SetValue( bool state ) wxOVERRIDE; - bool GetValue() const wxOVERRIDE; - - virtual void SetLabel( const wxString& label ) wxOVERRIDE; - virtual bool Enable( bool enable = true ) wxOVERRIDE; - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - // implementation - void GTKDisableEvents(); - void GTKEnableEvents(); - -protected: - virtual void DoApplyWidgetStyle(GtkRcStyle *style) wxOVERRIDE; - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE; - - void DoSet3StateValue(wxCheckBoxState state) wxOVERRIDE; - wxCheckBoxState DoGet3StateValue() const wxOVERRIDE; - -private: - typedef wxCheckBoxBase base_type; - - GtkWidget *m_widgetCheckbox; - GtkWidget *m_widgetLabel; - - wxDECLARE_DYNAMIC_CLASS(wxCheckBox); -}; - -#endif // _WX_GTKCHECKBOX_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/checklst.h b/Externals/wxWidgets3/include/wx/gtk/checklst.h deleted file mode 100644 index a12eb180da..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/checklst.h +++ /dev/null @@ -1,48 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/checklst.h -// Purpose: wxCheckListBox class -// Author: Robert Roebling -// Modified by: -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTKCHECKLIST_H_ -#define _WX_GTKCHECKLIST_H_ - -//----------------------------------------------------------------------------- -// wxCheckListBox -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxCheckListBox : public wxCheckListBoxBase -{ -public: - wxCheckListBox(); - wxCheckListBox(wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int nStrings = 0, - const wxString *choices = NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxListBoxNameStr); - wxCheckListBox(wxWindow *parent, wxWindowID id, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxListBoxNameStr); - - virtual bool IsChecked(unsigned int index) const wxOVERRIDE; - virtual void Check(unsigned int index, bool check = true) wxOVERRIDE; - - int GetItemHeight() const; - - void DoCreateCheckList(); - -private: - wxDECLARE_DYNAMIC_CLASS(wxCheckListBox); -}; - -#endif // _WX_GTKCHECKLIST_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/chkconf.h b/Externals/wxWidgets3/include/wx/gtk/chkconf.h deleted file mode 100644 index 84595b256c..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/chkconf.h +++ /dev/null @@ -1,98 +0,0 @@ -/* - * Name: wx/gtk/chkconf.h - * Purpose: wxGTK-specific settings consistency checks - * Author: Vadim Zeitlin - * Created: 2007-07-19 (extracted from wx/chkconf.h) - * Copyright: (c) 2000-2007 Vadim Zeitlin - * Licence: wxWindows licence - */ - -#ifndef __WXUNIVERSAL__ -# if wxUSE_MDI_ARCHITECTURE && !wxUSE_MENUS -# ifdef wxABORT_ON_CONFIG_ERROR -# error "MDI requires wxUSE_MENUS in wxGTK" -# else -# undef wxUSE_MENUS -# define wxUSE_MENUS 1 -# endif -# endif -#endif /* !__WXUNIVERSAL__ */ - -#if wxUSE_JOYSTICK -# if !wxUSE_THREADS -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxJoystick requires threads in wxGTK" -# else -# undef wxUSE_JOYSTICK -# define wxUSE_JOYSTICK 0 -# endif -# endif -#endif /* wxUSE_JOYSTICK */ - -#if wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW && !wxUSE_POSTSCRIPT -# undef wxUSE_POSTSCRIPT -# define wxUSE_POSTSCRIPT 1 -#endif - -#if wxUSE_OWNER_DRAWN -# undef wxUSE_OWNER_DRAWN -# define wxUSE_OWNER_DRAWN 0 -#endif - -#if wxUSE_METAFILE -# undef wxUSE_METAFILE -# define wxUSE_METAFILE 0 -#endif - -#if wxUSE_ENH_METAFILE -# undef wxUSE_ENH_METAFILE -# define wxUSE_ENH_METAFILE 0 -#endif - -#ifndef __UNIX__ - -# undef wxUSE_WEBVIEW -# define wxUSE_WEBVIEW 0 -# undef wxUSE_WEBVIEW_WEBKIT -# define wxUSE_WEBVIEW_WEBKIT 0 - -# undef wxUSE_MEDIACTRL -# define wxUSE_MEDIACTRL 0 - - /* - We could use GDK_WINDOWING_X11 for those but this would require - including gdk/gdk.h and we don't want to do it from here, so assume - we're not using X11 if we're not under Unix. - */ - -# undef wxUSE_UIACTIONSIMULATOR -# define wxUSE_UIACTIONSIMULATOR 0 - -# undef wxUSE_GLCANVAS -# define wxUSE_GLCANVAS 0 - -#endif /* __UNIX__ */ - -/* - We always need Cairo with wxGTK, enable it if necessary (this can only - happen under Windows). - */ -#ifdef __WINDOWS__ - -#if !wxUSE_CAIRO -# undef wxUSE_CAIRO -# define wxUSE_CAIRO 1 -#endif - -#endif /* __WINDOWS__ */ - -#ifdef __WXGTK3__ - #if !wxUSE_GRAPHICS_CONTEXT - #ifdef wxABORT_ON_CONFIG_ERROR - #error "GTK+ 3 support requires wxGraphicsContext" - #else - #undef wxUSE_GRAPHICS_CONTEXT - #define wxUSE_GRAPHICS_CONTEXT 1 - #endif - #endif -#endif diff --git a/Externals/wxWidgets3/include/wx/gtk/choice.h b/Externals/wxWidgets3/include/wx/gtk/choice.h deleted file mode 100644 index ce43533dd3..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/choice.h +++ /dev/null @@ -1,118 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/choice.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_CHOICE_H_ -#define _WX_GTK_CHOICE_H_ - -class WXDLLIMPEXP_FWD_BASE wxSortedArrayString; -class WXDLLIMPEXP_FWD_BASE wxArrayString; - -//----------------------------------------------------------------------------- -// wxChoice -//----------------------------------------------------------------------------- - -class wxGtkCollatedArrayString; - -class WXDLLIMPEXP_CORE wxChoice : public wxChoiceBase -{ -public: - wxChoice() - { - Init(); - } - wxChoice( wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = (const wxString *) NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxChoiceNameStr ) - { - Init(); - Create(parent, id, pos, size, n, choices, style, validator, name); - } - wxChoice( wxWindow *parent, wxWindowID id, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxChoiceNameStr ) - { - Init(); - Create(parent, id, pos, size, choices, style, validator, name); - } - virtual ~wxChoice(); - bool Create( wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxChoiceNameStr ); - bool Create( wxWindow *parent, wxWindowID id, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxChoiceNameStr ); - - int GetSelection() const wxOVERRIDE; - void SetSelection(int n) wxOVERRIDE; - - virtual unsigned int GetCount() const wxOVERRIDE; - virtual int FindString(const wxString& s, bool bCase = false) const wxOVERRIDE; - virtual wxString GetString(unsigned int n) const wxOVERRIDE; - virtual void SetString(unsigned int n, const wxString& string) wxOVERRIDE; - - virtual void SetColumns(int n=1) wxOVERRIDE; - virtual int GetColumns() const wxOVERRIDE; - - virtual void GTKDisableEvents(); - virtual void GTKEnableEvents(); - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - -protected: - // this array is only used for controls with wxCB_SORT style, so only - // allocate it if it's needed (hence using pointer) - wxGtkCollatedArrayString *m_strings; - - // contains the client data for the items - wxArrayPtrVoid m_clientData; - - // index to GtkListStore cell which displays the item text - int m_stringCellIndex; - - virtual wxSize DoGetBestSize() const wxOVERRIDE; - virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const wxOVERRIDE; - virtual int DoInsertItems(const wxArrayStringsAdapter& items, - unsigned int pos, - void **clientData, wxClientDataType type) wxOVERRIDE; - virtual void DoSetItemClientData(unsigned int n, void* clientData) wxOVERRIDE; - virtual void* DoGetItemClientData(unsigned int n) const wxOVERRIDE; - virtual void DoClear() wxOVERRIDE; - virtual void DoDeleteOneItem(unsigned int n) wxOVERRIDE; - - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE; - virtual void DoApplyWidgetStyle(GtkRcStyle *style) wxOVERRIDE; - - // in derived classes, implement this to insert list store entry - // with all items default except text - virtual void GTKInsertComboBoxTextItem( unsigned int n, const wxString& text ); - -private: - void Init(); - - wxDECLARE_DYNAMIC_CLASS(wxChoice); -}; - - -#endif // _WX_GTK_CHOICE_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/clipbrd.h b/Externals/wxWidgets3/include/wx/gtk/clipbrd.h deleted file mode 100644 index b2316067e5..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/clipbrd.h +++ /dev/null @@ -1,135 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/clipbrd.h -// Purpose: wxClipboard for wxGTK -// Author: Robert Roebling, Vadim Zeitlin -// Copyright: (c) 1998 Robert Roebling -// (c) 2007 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_CLIPBOARD_H_ -#define _WX_GTK_CLIPBOARD_H_ - -// ---------------------------------------------------------------------------- -// wxClipboard -// ---------------------------------------------------------------------------- - -#include "wx/weakref.h" - -class WXDLLIMPEXP_CORE wxClipboard : public wxClipboardBase -{ -public: - // there are several clipboards in X11 (and in GDK) - enum Kind - { - Primary, - Clipboard - }; - - wxClipboard(); - virtual ~wxClipboard(); - - // open the clipboard before SetData() and GetData() - virtual bool Open() wxOVERRIDE; - - // close the clipboard after SetData() and GetData() - virtual void Close() wxOVERRIDE; - - // query whether the clipboard is opened - virtual bool IsOpened() const wxOVERRIDE; - - // set the clipboard data. all other formats will be deleted. - virtual bool SetData( wxDataObject *data ) wxOVERRIDE; - - // add to the clipboard data. - virtual bool AddData( wxDataObject *data ) wxOVERRIDE; - - // ask if data in correct format is available - virtual bool IsSupported( const wxDataFormat& format ) wxOVERRIDE; - - // ask if data in correct format is available - virtual bool IsSupportedAsync( wxEvtHandler *sink ) wxOVERRIDE; - - // fill data with data on the clipboard (if available) - virtual bool GetData( wxDataObject& data ) wxOVERRIDE; - - // clears wxTheClipboard and the system's clipboard if possible - virtual void Clear() wxOVERRIDE; - - - - // implementation from now on - // -------------------------- - - // get our clipboard item (depending on m_usePrimary value) - GdkAtom GTKGetClipboardAtom() const; - - // get the data object currently being requested - wxDataObject *GTKGetDataObject( GdkAtom atom ); - - // clear the data for the given clipboard kind - void GTKClearData(Kind kind); - - // called when selection data is received - void GTKOnSelectionReceived(const GtkSelectionData& sel); - - // called when available target information is received - bool GTKOnTargetReceived(const wxDataFormat& format); - -private: - // the data object for the specific selection - wxDataObject *& Data(Kind kind) - { - return kind == Primary ? m_dataPrimary : m_dataClipboard; - } - - // the data object we're currently using - wxDataObject *& Data() - { - return Data(m_usePrimary ? Primary : Clipboard); - } - - - // set or unset selection ownership - bool SetSelectionOwner(bool set = true); - - // add atom to the list of supported targets - void AddSupportedTarget(GdkAtom atom); - - // check if the given format is supported - bool DoIsSupported(const wxDataFormat& format); - - - // both of these pointers can be non-NULL simultaneously but we only use - // one of them at any moment depending on m_usePrimary value, use Data() - // (from inside) or GTKGetDataObject() (from outside) accessors - wxDataObject *m_dataPrimary, - *m_dataClipboard; - - // this is used to temporarily hold the object passed to our GetData() so - // that GTK callbacks could access it - wxDataObject *m_receivedData; - - // used to pass information about the format we need from DoIsSupported() - // to GTKOnTargetReceived() - GdkAtom m_targetRequested; - - GtkWidget *m_clipboardWidget; // for getting and offering data - GtkWidget *m_targetsWidget; // for getting list of supported formats - - // ID of the connection to "selection_get" signal, initially 0. - unsigned long m_idSelectionGetHandler; - - bool m_open; - bool m_formatSupported; - -public: - // async stuff - wxEvtHandlerRef m_sink; -private: - GtkWidget *m_targetsWidgetAsync; // for getting list of supported formats - - wxDECLARE_DYNAMIC_CLASS(wxClipboard); -}; - -#endif // _WX_GTK_CLIPBOARD_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/clrpicker.h b/Externals/wxWidgets3/include/wx/gtk/clrpicker.h deleted file mode 100644 index b9894b5309..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/clrpicker.h +++ /dev/null @@ -1,64 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/clrpicker.h -// Purpose: wxColourButton header -// Author: Francesco Montorsi -// Modified by: -// Created: 14/4/2006 -// Copyright: (c) Francesco Montorsi -// Licence: wxWindows Licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_CLRPICKER_H_ -#define _WX_GTK_CLRPICKER_H_ - -#include "wx/button.h" - -//----------------------------------------------------------------------------- -// wxColourButton -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxColourButton : public wxButton, - public wxColourPickerWidgetBase -{ -public: - wxColourButton() : m_topParent(NULL) {} - wxColourButton(wxWindow *parent, - wxWindowID id, - const wxColour& initial = *wxBLACK, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxCLRBTN_DEFAULT_STYLE, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxColourPickerWidgetNameStr) - : m_topParent(NULL) - { - Create(parent, id, initial, pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxColour& initial = *wxBLACK, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxCLRBTN_DEFAULT_STYLE, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxColourPickerWidgetNameStr); - - virtual ~wxColourButton(); - -protected: - void UpdateColour() wxOVERRIDE; - -public: // used by the GTK callback only - - void GTKSetColour(const wxColour& colour) - { m_colour = colour; } - - wxWindow *m_topParent; - -private: - wxDECLARE_DYNAMIC_CLASS(wxColourButton); -}; - -#endif // _WX_GTK_CLRPICKER_H_ - diff --git a/Externals/wxWidgets3/include/wx/gtk/collpane.h b/Externals/wxWidgets3/include/wx/gtk/collpane.h deleted file mode 100644 index 3942e5b4c8..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/collpane.h +++ /dev/null @@ -1,79 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/collpane.h -// Purpose: wxCollapsiblePane -// Author: Francesco Montorsi -// Modified by: -// Created: 8/10/2006 -// Copyright: (c) Francesco Montorsi -// Licence: wxWindows Licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_COLLAPSABLE_PANEL_H_GTK_ -#define _WX_COLLAPSABLE_PANEL_H_GTK_ - -// ---------------------------------------------------------------------------- -// wxCollapsiblePane -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxCollapsiblePane : public wxCollapsiblePaneBase -{ -public: - wxCollapsiblePane() { Init(); } - - wxCollapsiblePane(wxWindow *parent, - wxWindowID winid, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxCP_DEFAULT_STYLE, - const wxValidator& val = wxDefaultValidator, - const wxString& name = wxCollapsiblePaneNameStr) - { - Init(); - - Create(parent, winid, label, pos, size, style, val, name); - } - - bool Create(wxWindow *parent, - wxWindowID winid, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxCP_DEFAULT_STYLE, - const wxValidator& val = wxDefaultValidator, - const wxString& name = wxCollapsiblePaneNameStr); - - virtual void Collapse(bool collapse = true) wxOVERRIDE; - virtual bool IsCollapsed() const wxOVERRIDE; - virtual void SetLabel(const wxString& str) wxOVERRIDE; - - virtual wxWindow *GetPane() const wxOVERRIDE { return m_pPane; } - virtual wxString GetLabel() const wxOVERRIDE { return m_strLabel; } - -protected: - virtual wxSize DoGetBestSize() const wxOVERRIDE; - -public: // used by GTK callbacks - bool m_bIgnoreNextChange; - wxSize m_szCollapsed; - - wxWindow *m_pPane; - - // the button label without ">>" or "<<" - wxString m_strLabel; - -private: - void Init() - { - m_bIgnoreNextChange = false; - } - - void OnSize(wxSizeEvent&); - virtual void AddChildGTK(wxWindowGTK* child) wxOVERRIDE; - GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE; - - wxDECLARE_DYNAMIC_CLASS(wxCollapsiblePane); - wxDECLARE_EVENT_TABLE(); -}; - -#endif // _WX_COLLAPSABLE_PANEL_H_GTK_ diff --git a/Externals/wxWidgets3/include/wx/gtk/colordlg.h b/Externals/wxWidgets3/include/wx/gtk/colordlg.h deleted file mode 100644 index 784c6545d4..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/colordlg.h +++ /dev/null @@ -1,48 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/colordlg.h -// Purpose: wxColourDialog -// Author: Vaclav Slavik -// Modified by: -// Created: 2004/06/04 -// Copyright: (c) Vaclav Slavik, 2004 -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_COLORDLG_H_ -#define _WX_GTK_COLORDLG_H_ - -#include "wx/dialog.h" - -class WXDLLIMPEXP_CORE wxColourDialog : public wxDialog -{ -public: - wxColourDialog() {} - wxColourDialog(wxWindow *parent, - wxColourData *data = NULL); - virtual ~wxColourDialog() {} - - bool Create(wxWindow *parent, wxColourData *data = NULL); - - wxColourData &GetColourData() { return m_data; } - - virtual int ShowModal() wxOVERRIDE; - -protected: - // implement some base class methods to do nothing to avoid asserts and - // GTK warnings, since this is not a real wxDialog. - virtual void DoSetSize(int WXUNUSED(x), int WXUNUSED(y), - int WXUNUSED(width), int WXUNUSED(height), - int WXUNUSED(sizeFlags) = wxSIZE_AUTO) wxOVERRIDE {} - virtual void DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y), - int WXUNUSED(width), int WXUNUSED(height)) wxOVERRIDE {} - - // copy data between the dialog and m_colourData: - void ColourDataToDialog(); - void DialogToColourData(); - - wxColourData m_data; - - wxDECLARE_DYNAMIC_CLASS(wxColourDialog); -}; - -#endif diff --git a/Externals/wxWidgets3/include/wx/gtk/colour.h b/Externals/wxWidgets3/include/wx/gtk/colour.h deleted file mode 100644 index 86e74e5720..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/colour.h +++ /dev/null @@ -1,59 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/colour.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_COLOUR_H_ -#define _WX_GTK_COLOUR_H_ - -#ifdef __WXGTK3__ -typedef struct _GdkRGBA GdkRGBA; -#endif - -//----------------------------------------------------------------------------- -// wxColour -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxColour : public wxColourBase -{ -public: - // constructors - // ------------ - DEFINE_STD_WXCOLOUR_CONSTRUCTORS - wxColour(const GdkColor& gdkColor); -#ifdef __WXGTK3__ - wxColour(const GdkRGBA& gdkRGBA); -#endif - - virtual ~wxColour(); - - bool operator==(const wxColour& col) const; - bool operator!=(const wxColour& col) const { return !(*this == col); } - - unsigned char Red() const wxOVERRIDE; - unsigned char Green() const wxOVERRIDE; - unsigned char Blue() const wxOVERRIDE; - unsigned char Alpha() const wxOVERRIDE; - - // Implementation part -#ifdef __WXGTK3__ - operator const GdkRGBA*() const; -#else - void CalcPixel( GdkColormap *cmap ); - int GetPixel() const; -#endif - const GdkColor *GetColor() const; - -protected: - virtual void - InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a) wxOVERRIDE; - - virtual bool FromString(const wxString& str) wxOVERRIDE; - - wxDECLARE_DYNAMIC_CLASS(wxColour); -}; - -#endif // _WX_GTK_COLOUR_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/combobox.h b/Externals/wxWidgets3/include/wx/gtk/combobox.h deleted file mode 100644 index 880ec67c8e..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/combobox.h +++ /dev/null @@ -1,162 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/combobox.h -// Purpose: -// Author: Robert Roebling -// Created: 01/02/97 -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_COMBOBOX_H_ -#define _WX_GTK_COMBOBOX_H_ - -#include "wx/choice.h" - -typedef struct _GtkEntry GtkEntry; - -//----------------------------------------------------------------------------- -// wxComboBox -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxComboBox : public wxChoice, - public wxTextEntry -{ -public: - wxComboBox() - : wxChoice(), wxTextEntry() - { - Init(); - } - wxComboBox(wxWindow *parent, - wxWindowID id, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxComboBoxNameStr) - : wxChoice(), wxTextEntry() - { - Init(); - Create(parent, id, value, pos, size, n, choices, style, validator, name); - } - - wxComboBox(wxWindow *parent, wxWindowID id, - const wxString& value, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxComboBoxNameStr) - : wxChoice(), wxTextEntry() - { - Init(); - Create(parent, id, value, pos, size, choices, style, validator, name); - } - ~wxComboBox(); - - bool Create(wxWindow *parent, wxWindowID id, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = (const wxString *) NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxComboBoxNameStr); - bool Create(wxWindow *parent, wxWindowID id, - const wxString& value, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxComboBoxNameStr); - - // Set/GetSelection() from wxTextEntry and wxChoice - - virtual void SetSelection(int n) wxOVERRIDE { wxChoice::SetSelection(n); } - virtual void SetSelection(long from, long to) wxOVERRIDE - { wxTextEntry::SetSelection(from, to); } - - virtual int GetSelection() const wxOVERRIDE { return wxChoice::GetSelection(); } - virtual void GetSelection(long *from, long *to) const wxOVERRIDE - { return wxTextEntry::GetSelection(from, to); } - - virtual wxString GetStringSelection() const wxOVERRIDE - { - return wxItemContainer::GetStringSelection(); - } - - virtual void SetString(unsigned int n, const wxString& string) wxOVERRIDE; - - virtual void Popup(); - virtual void Dismiss(); - - virtual void Clear() wxOVERRIDE; - - // See wxComboBoxBase discussion of IsEmpty(). - bool IsListEmpty() const { return wxItemContainer::IsEmpty(); } - bool IsTextEmpty() const { return wxTextEntry::IsEmpty(); } - - void OnChar( wxKeyEvent &event ); - - virtual void SetValue(const wxString& value) wxOVERRIDE; - - // Standard event handling - void OnCut(wxCommandEvent& event); - void OnCopy(wxCommandEvent& event); - void OnPaste(wxCommandEvent& event); - void OnUndo(wxCommandEvent& event); - void OnRedo(wxCommandEvent& event); - void OnDelete(wxCommandEvent& event); - void OnSelectAll(wxCommandEvent& event); - - void OnUpdateCut(wxUpdateUIEvent& event); - void OnUpdateCopy(wxUpdateUIEvent& event); - void OnUpdatePaste(wxUpdateUIEvent& event); - void OnUpdateUndo(wxUpdateUIEvent& event); - void OnUpdateRedo(wxUpdateUIEvent& event); - void OnUpdateDelete(wxUpdateUIEvent& event); - void OnUpdateSelectAll(wxUpdateUIEvent& event); - - virtual void GTKDisableEvents() wxOVERRIDE; - virtual void GTKEnableEvents() wxOVERRIDE; - GtkWidget* GetConnectWidget() wxOVERRIDE; - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - -protected: - // From wxWindowGTK: - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE; - - // Widgets that use the style->base colour for the BG colour should - // override this and return true. - virtual bool UseGTKStyleBase() const wxOVERRIDE { return true; } - - // Override in derived classes to create combo box widgets with - // custom list stores. - virtual void GTKCreateComboBoxWidget(); - - virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const wxOVERRIDE; - - virtual GtkEntry *GetEntry() const wxOVERRIDE - { return m_entry; } - - GtkEntry* m_entry; - -private: - // From wxTextEntry: - virtual wxWindow *GetEditableWindow() wxOVERRIDE { return this; } - virtual GtkEditable *GetEditable() const wxOVERRIDE; - virtual void EnableTextChangedEvents(bool enable) wxOVERRIDE; - - void Init(); - - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxComboBox); - wxDECLARE_EVENT_TABLE(); -}; - -#endif // _WX_GTK_COMBOBOX_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/control.h b/Externals/wxWidgets3/include/wx/gtk/control.h deleted file mode 100644 index 1171f55919..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/control.h +++ /dev/null @@ -1,93 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/control.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling, Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_CONTROL_H_ -#define _WX_GTK_CONTROL_H_ - -typedef struct _GtkLabel GtkLabel; -typedef struct _GtkFrame GtkFrame; -typedef struct _GtkEntry GtkEntry; - -//----------------------------------------------------------------------------- -// wxControl -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxControl : public wxControlBase -{ - typedef wxControlBase base_type; -public: - wxControl(); - wxControl(wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxControlNameStr) - { - Create(parent, id, pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxControlNameStr); - - virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE; -#ifdef __WXGTK3__ - virtual bool SetFont(const wxFont& font) wxOVERRIDE; -#endif - -protected: - virtual wxSize DoGetBestSize() const wxOVERRIDE; - void PostCreation(const wxSize& size); - - // sets the label to the given string and also sets it for the given widget - void GTKSetLabelForLabel(GtkLabel *w, const wxString& label); -#if wxUSE_MARKUP - void GTKSetLabelWithMarkupForLabel(GtkLabel *w, const wxString& label); -#endif // wxUSE_MARKUP - - // GtkFrame helpers - GtkWidget* GTKCreateFrame(const wxString& label); - void GTKSetLabelForFrame(GtkFrame *w, const wxString& label); - void GTKFrameApplyWidgetStyle(GtkFrame* w, GtkRcStyle* rc); - void GTKFrameSetMnemonicWidget(GtkFrame* w, GtkWidget* widget); - - // remove mnemonics ("&"s) from the label - static wxString GTKRemoveMnemonics(const wxString& label); - - // converts wx label to GTK+ label, i.e. basically replace "&"s with "_"s - static wxString GTKConvertMnemonics(const wxString &label); - - // converts wx label to GTK+ labels preserving Pango markup - static wxString GTKConvertMnemonicsWithMarkup(const wxString& label); - - // These are used by GetDefaultAttributes - static wxVisualAttributes - GetDefaultAttributesFromGTKWidget(GtkWidget* widget, - bool useBase = false, - int state = 0); - - // Widgets that use the style->base colour for the BG colour should - // override this and return true. - virtual bool UseGTKStyleBase() const { return false; } - - // Fix sensitivity due to bug in GTK+ < 2.14 - void GTKFixSensitivity(bool onlyIfUnderMouse = true); - - // Ask GTK+ for preferred size. Use it after setting the font. - wxSize GTKGetPreferredSize(GtkWidget* widget) const; - - // Inner margins in a GtkEntry - wxPoint GTKGetEntryMargins(GtkEntry* entry) const; - -private: - wxDECLARE_DYNAMIC_CLASS(wxControl); -}; - -#endif // _WX_GTK_CONTROL_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/cursor.h b/Externals/wxWidgets3/include/wx/gtk/cursor.h deleted file mode 100644 index 51d106d445..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/cursor.h +++ /dev/null @@ -1,58 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/cursor.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_CURSOR_H_ -#define _WX_GTK_CURSOR_H_ - -class WXDLLIMPEXP_FWD_CORE wxImage; - -//----------------------------------------------------------------------------- -// wxCursor -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxCursor : public wxCursorBase -{ -public: - wxCursor(); - wxCursor(wxStockCursor id) { InitFromStock(id); } -#if WXWIN_COMPATIBILITY_2_8 - wxCursor(int id) { InitFromStock((wxStockCursor)id); } -#endif -#if wxUSE_IMAGE - wxCursor( const wxImage & image ); - wxCursor(const wxString& name, - wxBitmapType type = wxCURSOR_DEFAULT_TYPE, - int hotSpotX = 0, int hotSpotY = 0); -#endif - wxCursor( const char bits[], int width, int height, - int hotSpotX = -1, int hotSpotY = -1, - const char maskBits[] = NULL, - const wxColour* fg = NULL, const wxColour* bg = NULL); - - virtual wxPoint GetHotSpot() const wxOVERRIDE; - - virtual ~wxCursor(); - - // implementation - - GdkCursor *GetCursor() const; - -protected: - void InitFromStock(wxStockCursor); -#if wxUSE_IMAGE - void InitFromImage(const wxImage& image); -#endif - - virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE; - -private: - wxDECLARE_DYNAMIC_CLASS(wxCursor); -}; - -#endif // _WX_GTK_CURSOR_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/dataform.h b/Externals/wxWidgets3/include/wx/gtk/dataform.h deleted file mode 100644 index b7c3be71f3..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/dataform.h +++ /dev/null @@ -1,80 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/dataform.h -// Purpose: declaration of the wxDataFormat class -// Author: Vadim Zeitlin -// Modified by: -// Created: 19.10.99 (extracted from gtk/dataobj.h) -// Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_DATAFORM_H -#define _WX_GTK_DATAFORM_H - -class WXDLLIMPEXP_CORE wxDataFormat -{ -public: - // the clipboard formats under GDK are GdkAtoms - typedef GdkAtom NativeFormat; - - wxDataFormat(); - wxDataFormat( wxDataFormatId type ); - wxDataFormat( NativeFormat format ); - - // we have to provide all the overloads to allow using strings instead of - // data formats (as a lot of existing code does) - wxDataFormat( const wxString& id ) { InitFromString(id); } - wxDataFormat( const char *id ) { InitFromString(id); } - wxDataFormat( const wchar_t *id ) { InitFromString(id); } - wxDataFormat( const wxCStrData& id ) { InitFromString(id); } - - wxDataFormat& operator=(const wxDataFormat& format) - { - if (&format != this) - { - m_type = format.m_type; - m_format = format.m_format; - } - return *this; - } - wxDataFormat& operator=(NativeFormat format) - { SetId(format); return *this; } - - // comparison (must have both versions) - bool operator==(NativeFormat format) const - { return m_format == (NativeFormat)format; } - bool operator!=(NativeFormat format) const - { return m_format != (NativeFormat)format; } - bool operator==(wxDataFormatId format) const - { return m_type == (wxDataFormatId)format; } - bool operator!=(wxDataFormatId format) const - { return m_type != (wxDataFormatId)format; } - - // explicit and implicit conversions to NativeFormat which is one of - // standard data types (implicit conversion is useful for preserving the - // compatibility with old code) - NativeFormat GetFormatId() const { return m_format; } - operator NativeFormat() const { return m_format; } - - void SetId( NativeFormat format ); - - // string ids are used for custom types - this SetId() must be used for - // application-specific formats - wxString GetId() const; - void SetId( const wxString& id ); - - // implementation - wxDataFormatId GetType() const; - void SetType( wxDataFormatId type ); - -private: - // common part of ctors from format name - void InitFromString(const wxString& id); - - wxDataFormatId m_type; - NativeFormat m_format; - - void PrepareFormats(); -}; - -#endif // _WX_GTK_DATAFORM_H diff --git a/Externals/wxWidgets3/include/wx/gtk/dataobj.h b/Externals/wxWidgets3/include/wx/gtk/dataobj.h deleted file mode 100644 index 859093fcb2..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/dataobj.h +++ /dev/null @@ -1,26 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/dataobj.h -// Purpose: declaration of the wxDataObject -// Author: Robert Roebling -// Copyright: (c) 1998, 1999 Vadim Zeitlin, Robert Roebling -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_DATAOBJ_H_ -#define _WX_GTK_DATAOBJ_H_ - -// ---------------------------------------------------------------------------- -// wxDataObject is the same as wxDataObjectBase under wxGTK -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxDataObject : public wxDataObjectBase -{ -public: - wxDataObject(); - virtual ~wxDataObject(); - - virtual bool IsSupportedFormat( const wxDataFormat& format, Direction dir = Get ) const; -}; - -#endif // _WX_GTK_DATAOBJ_H_ - diff --git a/Externals/wxWidgets3/include/wx/gtk/dataobj2.h b/Externals/wxWidgets3/include/wx/gtk/dataobj2.h deleted file mode 100644 index 5e94b4e49c..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/dataobj2.h +++ /dev/null @@ -1,114 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/dataobj2.h -// Purpose: declaration of standard wxDataObjectSimple-derived classes -// Author: Robert Roebling -// Created: 19.10.99 (extracted from gtk/dataobj.h) -// Copyright: (c) 1998, 1999 Vadim Zeitlin, Robert Roebling -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_DATAOBJ2_H_ -#define _WX_GTK_DATAOBJ2_H_ - -// ---------------------------------------------------------------------------- -// wxBitmapDataObject is a specialization of wxDataObject for bitmaps -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxBitmapDataObject : public wxBitmapDataObjectBase -{ -public: - // ctors - wxBitmapDataObject(); - wxBitmapDataObject(const wxBitmap& bitmap); - - // destr - virtual ~wxBitmapDataObject(); - - // override base class virtual to update PNG data too - virtual void SetBitmap(const wxBitmap& bitmap) wxOVERRIDE; - - // implement base class pure virtuals - // ---------------------------------- - - virtual size_t GetDataSize() const wxOVERRIDE { return m_pngSize; } - virtual bool GetDataHere(void *buf) const wxOVERRIDE; - virtual bool SetData(size_t len, const void *buf) wxOVERRIDE; - // Must provide overloads to avoid hiding them (and warnings about it) - virtual size_t GetDataSize(const wxDataFormat&) const wxOVERRIDE - { - return GetDataSize(); - } - virtual bool GetDataHere(const wxDataFormat&, void *buf) const wxOVERRIDE - { - return GetDataHere(buf); - } - virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) wxOVERRIDE - { - return SetData(len, buf); - } - -protected: - void Clear() { free(m_pngData); } - void ClearAll() { Clear(); Init(); } - - size_t m_pngSize; - void *m_pngData; - - void DoConvertToPng(); - -private: - void Init() { m_pngData = NULL; m_pngSize = 0; } -}; - -// ---------------------------------------------------------------------------- -// wxFileDataObject is a specialization of wxDataObject for file names -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxFileDataObject : public wxFileDataObjectBase -{ -public: - // implement base class pure virtuals - // ---------------------------------- - - void AddFile( const wxString &filename ); - - virtual size_t GetDataSize() const wxOVERRIDE; - virtual bool GetDataHere(void *buf) const wxOVERRIDE; - virtual bool SetData(size_t len, const void *buf) wxOVERRIDE; - // Must provide overloads to avoid hiding them (and warnings about it) - virtual size_t GetDataSize(const wxDataFormat&) const wxOVERRIDE - { - return GetDataSize(); - } - virtual bool GetDataHere(const wxDataFormat&, void *buf) const wxOVERRIDE - { - return GetDataHere(buf); - } - virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) wxOVERRIDE - { - return SetData(len, buf); - } -}; - -// ---------------------------------------------------------------------------- -// wxURLDataObject is a specialization of wxDataObject for URLs -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxURLDataObject : public wxDataObjectComposite -{ -public: - wxURLDataObject(const wxString& url = wxEmptyString); - - wxString GetURL() const; - void SetURL(const wxString& url); - -private: - class wxTextURIListDataObject* const m_dobjURIList; - wxTextDataObject* const m_dobjText; - - wxDECLARE_NO_COPY_CLASS(wxURLDataObject); -}; - - -#endif // _WX_GTK_DATAOBJ2_H_ - diff --git a/Externals/wxWidgets3/include/wx/gtk/dataview.h b/Externals/wxWidgets3/include/wx/gtk/dataview.h deleted file mode 100644 index f2064218aa..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/dataview.h +++ /dev/null @@ -1,230 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/dataview.h -// Purpose: wxDataViewCtrl GTK+2 implementation header -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTKDATAVIEWCTRL_H_ -#define _WX_GTKDATAVIEWCTRL_H_ - -#include "wx/list.h" - -class WXDLLIMPEXP_FWD_ADV wxDataViewCtrlInternal; - -struct _GtkTreePath; - -// --------------------------------------------------------- -// wxDataViewColumn -// --------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDataViewColumn: public wxDataViewColumnBase -{ -public: - wxDataViewColumn( const wxString &title, wxDataViewRenderer *renderer, - unsigned int model_column, int width = wxDVC_DEFAULT_WIDTH, - wxAlignment align = wxALIGN_CENTER, - int flags = wxDATAVIEW_COL_RESIZABLE ); - wxDataViewColumn( const wxBitmap &bitmap, wxDataViewRenderer *renderer, - unsigned int model_column, int width = wxDVC_DEFAULT_WIDTH, - wxAlignment align = wxALIGN_CENTER, - int flags = wxDATAVIEW_COL_RESIZABLE ); - - - // setters: - - virtual void SetTitle( const wxString &title ) wxOVERRIDE; - virtual void SetBitmap( const wxBitmap &bitmap ) wxOVERRIDE; - - virtual void SetOwner( wxDataViewCtrl *owner ) wxOVERRIDE; - - virtual void SetAlignment( wxAlignment align ) wxOVERRIDE; - - virtual void SetSortable( bool sortable ) wxOVERRIDE; - virtual void SetSortOrder( bool ascending ) wxOVERRIDE; - - virtual void SetResizeable( bool resizable ) wxOVERRIDE; - virtual void SetHidden( bool hidden ) wxOVERRIDE; - - virtual void SetMinWidth( int minWidth ) wxOVERRIDE; - virtual void SetWidth( int width ) wxOVERRIDE; - - virtual void SetReorderable( bool reorderable ) wxOVERRIDE; - - virtual void SetFlags(int flags) wxOVERRIDE { SetIndividualFlags(flags); } - - // getters: - - virtual wxString GetTitle() const wxOVERRIDE; - virtual wxAlignment GetAlignment() const wxOVERRIDE; - - virtual bool IsSortable() const wxOVERRIDE; - virtual bool IsSortOrderAscending() const wxOVERRIDE; - virtual bool IsSortKey() const wxOVERRIDE; - - virtual bool IsResizeable() const wxOVERRIDE; - virtual bool IsHidden() const wxOVERRIDE; - - virtual int GetWidth() const wxOVERRIDE; - virtual int GetMinWidth() const wxOVERRIDE; - - virtual bool IsReorderable() const wxOVERRIDE; - - virtual int GetFlags() const wxOVERRIDE { return GetFromIndividualFlags(); } - - // implementation - GtkWidget* GetGtkHandle() const { return m_column; } - -private: - // holds the GTK handle - GtkWidget *m_column; - - // holds GTK handles for title/bitmap in the header - GtkWidget *m_image; - GtkWidget *m_label; - - // delayed connection to mouse events - friend class wxDataViewCtrl; - void OnInternalIdle(); - bool m_isConnected; - - void Init(wxAlignment align, int flags, int width); -}; - -WX_DECLARE_LIST_WITH_DECL(wxDataViewColumn, wxDataViewColumnList, - class WXDLLIMPEXP_ADV); - -// --------------------------------------------------------- -// wxDataViewCtrl -// --------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDataViewCtrl: public wxDataViewCtrlBase -{ -public: - wxDataViewCtrl() - { - Init(); - } - - wxDataViewCtrl( wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxDataViewCtrlNameStr ) - { - Init(); - - Create(parent, id, pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxDataViewCtrlNameStr); - - virtual ~wxDataViewCtrl(); - - virtual bool AssociateModel( wxDataViewModel *model ) wxOVERRIDE; - - virtual bool PrependColumn( wxDataViewColumn *col ) wxOVERRIDE; - virtual bool AppendColumn( wxDataViewColumn *col ) wxOVERRIDE; - virtual bool InsertColumn( unsigned int pos, wxDataViewColumn *col ) wxOVERRIDE; - - virtual unsigned int GetColumnCount() const wxOVERRIDE; - virtual wxDataViewColumn* GetColumn( unsigned int pos ) const wxOVERRIDE; - virtual bool DeleteColumn( wxDataViewColumn *column ) wxOVERRIDE; - virtual bool ClearColumns() wxOVERRIDE; - virtual int GetColumnPosition( const wxDataViewColumn *column ) const wxOVERRIDE; - - virtual wxDataViewColumn *GetSortingColumn() const wxOVERRIDE; - - virtual int GetSelectedItemsCount() const wxOVERRIDE; - virtual int GetSelections( wxDataViewItemArray & sel ) const wxOVERRIDE; - virtual void SetSelections( const wxDataViewItemArray & sel ) wxOVERRIDE; - virtual void Select( const wxDataViewItem & item ) wxOVERRIDE; - virtual void Unselect( const wxDataViewItem & item ) wxOVERRIDE; - virtual bool IsSelected( const wxDataViewItem & item ) const wxOVERRIDE; - virtual void SelectAll() wxOVERRIDE; - virtual void UnselectAll() wxOVERRIDE; - - virtual void EnsureVisible( const wxDataViewItem& item, - const wxDataViewColumn *column = NULL ) wxOVERRIDE; - virtual void HitTest( const wxPoint &point, - wxDataViewItem &item, - wxDataViewColumn *&column ) const wxOVERRIDE; - virtual wxRect GetItemRect( const wxDataViewItem &item, - const wxDataViewColumn *column = NULL ) const wxOVERRIDE; - - virtual bool SetRowHeight( int rowHeight ) wxOVERRIDE; - - virtual void EditItem(const wxDataViewItem& item, const wxDataViewColumn *column) wxOVERRIDE; - - virtual void Expand( const wxDataViewItem & item ) wxOVERRIDE; - virtual void Collapse( const wxDataViewItem & item ) wxOVERRIDE; - virtual bool IsExpanded( const wxDataViewItem & item ) const wxOVERRIDE; - - virtual bool EnableDragSource( const wxDataFormat &format ) wxOVERRIDE; - virtual bool EnableDropTarget( const wxDataFormat &format ) wxOVERRIDE; - - virtual wxDataViewColumn *GetCurrentColumn() const wxOVERRIDE; - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - wxWindow *GetMainWindow() { return (wxWindow*) this; } - - GtkWidget *GtkGetTreeView() { return m_treeview; } - wxDataViewCtrlInternal* GtkGetInternal() { return m_internal; } - - // Convert GTK path to our item. Returned item may be invalid if get_iter() - // failed. - wxDataViewItem GTKPathToItem(struct _GtkTreePath *path) const; - - virtual void OnInternalIdle() wxOVERRIDE; - - int GTKGetUniformRowHeight() const { return m_uniformRowHeight; } - -protected: - virtual void DoSetExpanderColumn() wxOVERRIDE; - virtual void DoSetIndent() wxOVERRIDE; - - virtual void DoApplyWidgetStyle(GtkRcStyle *style) wxOVERRIDE; - -private: - void Init(); - - virtual wxDataViewItem DoGetCurrentItem() const wxOVERRIDE; - virtual void DoSetCurrentItem(const wxDataViewItem& item) wxOVERRIDE; - - // Return wxDataViewColumn matching the given GtkTreeViewColumn. - // - // If the input argument is NULL, return NULL too. Otherwise we must find - // the matching column and assert if we didn't. - wxDataViewColumn* FromGTKColumn(GtkTreeViewColumn *gtk_col) const; - - friend class wxDataViewCtrlDCImpl; - friend class wxDataViewColumn; - friend class wxDataViewCtrlInternal; - - GtkWidget *m_treeview; - wxDataViewCtrlInternal *m_internal; - wxDataViewColumnList m_cols; - wxDataViewItem m_ensureVisibleDefered; - - // By default this is set to -1 and the height of the rows is determined by - // GetRect() methods of the renderers but this can be set to a positive - // value to force the height of all rows to the given value. - int m_uniformRowHeight; - - virtual void AddChildGTK(wxWindowGTK* child) wxOVERRIDE; - void GtkEnableSelectionEvents(); - void GtkDisableSelectionEvents(); - - wxDECLARE_DYNAMIC_CLASS(wxDataViewCtrl); - wxDECLARE_NO_COPY_CLASS(wxDataViewCtrl); -}; - - -#endif // _WX_GTKDATAVIEWCTRL_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/dc.h b/Externals/wxWidgets3/include/wx/gtk/dc.h deleted file mode 100644 index 2c08c1f200..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/dc.h +++ /dev/null @@ -1,156 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/dc.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTKDC_H_ -#define _WX_GTKDC_H_ - -#ifdef __WXGTK3__ - -#include "wx/dcgraph.h" - -class wxGTKCairoDCImpl: public wxGCDCImpl -{ - typedef wxGCDCImpl base_type; -public: - wxGTKCairoDCImpl(wxDC* owner); - wxGTKCairoDCImpl(wxDC* owner, int); - wxGTKCairoDCImpl(wxDC* owner, double scaleFactor); - wxGTKCairoDCImpl(wxDC* owner, wxWindow* window); - - virtual void DoDrawBitmap(const wxBitmap& bitmap, int x, int y, bool useMask) wxOVERRIDE; - virtual void DoDrawIcon(const wxIcon& icon, int x, int y) wxOVERRIDE; -#if wxUSE_IMAGE - virtual bool DoFloodFill(int x, int y, const wxColour& col, wxFloodFillStyle style) wxOVERRIDE; -#endif - virtual wxBitmap DoGetAsBitmap(const wxRect* subrect) const wxOVERRIDE; - virtual bool DoGetPixel(int x, int y, wxColour* col) const wxOVERRIDE; - virtual void DoGetSize(int* width, int* height) const wxOVERRIDE; - virtual bool DoStretchBlit(int xdest, int ydest, int dstWidth, int dstHeight, wxDC* source, int xsrc, int ysrc, int srcWidth, int srcHeight, wxRasterOperationMode rop, bool useMask, int xsrcMask, int ysrcMask) wxOVERRIDE; - virtual void* GetCairoContext() const wxOVERRIDE; - -protected: - int m_width, m_height; - - wxDECLARE_NO_COPY_CLASS(wxGTKCairoDCImpl); -}; -//----------------------------------------------------------------------------- - -class wxWindowDCImpl: public wxGTKCairoDCImpl -{ - typedef wxGTKCairoDCImpl base_type; -public: - wxWindowDCImpl(wxWindowDC* owner, wxWindow* window); - - wxDECLARE_NO_COPY_CLASS(wxWindowDCImpl); -}; -//----------------------------------------------------------------------------- - -class wxClientDCImpl: public wxGTKCairoDCImpl -{ - typedef wxGTKCairoDCImpl base_type; -public: - wxClientDCImpl(wxClientDC* owner, wxWindow* window); - - wxDECLARE_NO_COPY_CLASS(wxClientDCImpl); -}; -//----------------------------------------------------------------------------- - -class wxPaintDCImpl: public wxGTKCairoDCImpl -{ - typedef wxGTKCairoDCImpl base_type; -public: - wxPaintDCImpl(wxPaintDC* owner, wxWindow* window); - - wxDECLARE_NO_COPY_CLASS(wxPaintDCImpl); -}; -//----------------------------------------------------------------------------- - -class wxScreenDCImpl: public wxGTKCairoDCImpl -{ - typedef wxGTKCairoDCImpl base_type; -public: - wxScreenDCImpl(wxScreenDC* owner); - - wxDECLARE_NO_COPY_CLASS(wxScreenDCImpl); -}; -//----------------------------------------------------------------------------- - -class wxMemoryDCImpl: public wxGTKCairoDCImpl -{ - typedef wxGTKCairoDCImpl base_type; -public: - wxMemoryDCImpl(wxMemoryDC* owner); - wxMemoryDCImpl(wxMemoryDC* owner, wxBitmap& bitmap); - wxMemoryDCImpl(wxMemoryDC* owner, wxDC* dc); - virtual wxBitmap DoGetAsBitmap(const wxRect* subrect) const wxOVERRIDE; - virtual void DoSelect(const wxBitmap& bitmap) wxOVERRIDE; - virtual const wxBitmap& GetSelectedBitmap() const wxOVERRIDE; - virtual wxBitmap& GetSelectedBitmap() wxOVERRIDE; - -private: - void Setup(); - wxBitmap m_bitmap; - - wxDECLARE_NO_COPY_CLASS(wxMemoryDCImpl); -}; -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxGTKCairoDC: public wxDC -{ - typedef wxDC base_type; -public: - wxGTKCairoDC(cairo_t* cr, wxWindow* window); - - wxDECLARE_NO_COPY_CLASS(wxGTKCairoDC); -}; - -#else - -#include "wx/dc.h" - -//----------------------------------------------------------------------------- -// wxDC -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxGTKDCImpl : public wxDCImpl -{ -public: - wxGTKDCImpl( wxDC *owner ); - virtual ~wxGTKDCImpl(); - -#if wxUSE_PALETTE - void SetColourMap( const wxPalette& palette ) { SetPalette(palette); } -#endif // wxUSE_PALETTE - - // Resolution in pixels per logical inch - virtual wxSize GetPPI() const wxOVERRIDE; - - virtual bool StartDoc( const wxString& WXUNUSED(message) ) wxOVERRIDE { return true; } - virtual void EndDoc() wxOVERRIDE { } - virtual void StartPage() wxOVERRIDE { } - virtual void EndPage() wxOVERRIDE { } - - virtual GdkWindow* GetGDKWindow() const { return NULL; } - virtual void* GetHandle() const wxOVERRIDE { return GetGDKWindow(); } - - // base class pure virtuals implemented here - virtual void DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height) wxOVERRIDE; - virtual void DoGetSizeMM(int* width, int* height) const wxOVERRIDE; - - wxDECLARE_ABSTRACT_CLASS(wxGTKDCImpl); -}; - -// this must be defined when wxDC::Blit() honours the DC origin and needed to -// allow wxUniv code in univ/winuniv.cpp to work with versions of wxGTK -// 2.3.[23] -#ifndef wxHAS_WORKING_GTK_DC_BLIT - #define wxHAS_WORKING_GTK_DC_BLIT -#endif - -#endif -#endif // _WX_GTKDC_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/dcclient.h b/Externals/wxWidgets3/include/wx/gtk/dcclient.h deleted file mode 100644 index 93e80960d0..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/dcclient.h +++ /dev/null @@ -1,161 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/dcclient.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTKDCCLIENT_H_ -#define _WX_GTKDCCLIENT_H_ - -#include "wx/gtk/dc.h" - -//----------------------------------------------------------------------------- -// wxWindowDCImpl -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxWindowDCImpl : public wxGTKDCImpl -{ -public: - wxWindowDCImpl( wxDC *owner ); - wxWindowDCImpl( wxDC *owner, wxWindow *win ); - - virtual ~wxWindowDCImpl(); - - virtual bool CanDrawBitmap() const wxOVERRIDE { return true; } - virtual bool CanGetTextExtent() const wxOVERRIDE { return true; } - - virtual void DoGetSize(int *width, int *height) const wxOVERRIDE; - virtual bool DoFloodFill( wxCoord x, wxCoord y, const wxColour& col, - wxFloodFillStyle style=wxFLOOD_SURFACE ) wxOVERRIDE; - virtual bool DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const wxOVERRIDE; - - virtual void DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 ) wxOVERRIDE; - virtual void DoCrossHair( wxCoord x, wxCoord y ) wxOVERRIDE; - virtual void DoDrawArc( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, - wxCoord xc, wxCoord yc ) wxOVERRIDE; - virtual void DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord width, wxCoord height, - double sa, double ea ) wxOVERRIDE; - virtual void DoDrawPoint( wxCoord x, wxCoord y ) wxOVERRIDE; - - virtual void DoDrawLines(int n, const wxPoint points[], - wxCoord xoffset, wxCoord yoffset) wxOVERRIDE; - virtual void DoDrawPolygon(int n, const wxPoint points[], - wxCoord xoffset, wxCoord yoffset, - wxPolygonFillMode fillStyle = wxODDEVEN_RULE) wxOVERRIDE; - - virtual void DoDrawRectangle( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) wxOVERRIDE; - virtual void DoDrawRoundedRectangle( wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius = 20.0 ) wxOVERRIDE; - virtual void DoDrawEllipse( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) wxOVERRIDE; - - virtual void DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y ) wxOVERRIDE; - virtual void DoDrawBitmap( const wxBitmap &bitmap, wxCoord x, wxCoord y, - bool useMask = false ) wxOVERRIDE; - - virtual bool DoBlit( wxCoord xdest, wxCoord ydest, - wxCoord width, wxCoord height, - wxDC *source, wxCoord xsrc, wxCoord ysrc, - wxRasterOperationMode logical_func = wxCOPY, - bool useMask = false, - wxCoord xsrcMask = -1, wxCoord ysrcMask = -1 ) wxOVERRIDE; - - virtual void DoDrawText( const wxString &text, wxCoord x, wxCoord y ) wxOVERRIDE; - virtual void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, - double angle) wxOVERRIDE; - virtual void DoGetTextExtent( const wxString &string, - wxCoord *width, wxCoord *height, - wxCoord *descent = NULL, - wxCoord *externalLeading = NULL, - const wxFont *theFont = NULL) const wxOVERRIDE; - virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const wxOVERRIDE; - virtual void DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) wxOVERRIDE; - virtual void DoSetDeviceClippingRegion( const wxRegion ®ion ) wxOVERRIDE; - - virtual wxCoord GetCharWidth() const wxOVERRIDE; - virtual wxCoord GetCharHeight() const wxOVERRIDE; - - virtual void Clear() wxOVERRIDE; - - virtual void SetFont( const wxFont &font ) wxOVERRIDE; - virtual void SetPen( const wxPen &pen ) wxOVERRIDE; - virtual void SetBrush( const wxBrush &brush ) wxOVERRIDE; - virtual void SetBackground( const wxBrush &brush ) wxOVERRIDE; - virtual void SetLogicalFunction( wxRasterOperationMode function ) wxOVERRIDE; - virtual void SetTextForeground( const wxColour &col ) wxOVERRIDE; - virtual void SetTextBackground( const wxColour &col ) wxOVERRIDE; - virtual void SetBackgroundMode( int mode ) wxOVERRIDE; - virtual void SetPalette( const wxPalette& palette ) wxOVERRIDE; - - virtual void DestroyClippingRegion() wxOVERRIDE; - - // Resolution in pixels per logical inch - virtual wxSize GetPPI() const wxOVERRIDE; - virtual int GetDepth() const wxOVERRIDE; - - // overrriden here for RTL - virtual void SetDeviceOrigin( wxCoord x, wxCoord y ) wxOVERRIDE; - virtual void SetAxisOrientation( bool xLeftRight, bool yBottomUp ) wxOVERRIDE; - -// protected: - // implementation - // -------------- - - GdkWindow *m_gdkwindow; - GdkGC *m_penGC; - GdkGC *m_brushGC; - GdkGC *m_textGC; - GdkGC *m_bgGC; - GdkColormap *m_cmap; - bool m_isScreenDC; - wxRegion m_currentClippingRegion; - wxRegion m_paintClippingRegion; - - // PangoContext stuff for GTK 2.0 - PangoContext *m_context; - PangoLayout *m_layout; - PangoFontDescription *m_fontdesc; - - void SetUpDC( bool ismem = false ); - void Destroy(); - - virtual void ComputeScaleAndOrigin() wxOVERRIDE; - - virtual GdkWindow *GetGDKWindow() const wxOVERRIDE { return m_gdkwindow; } - -private: - void DrawingSetup(GdkGC*& gc, bool& originChanged); - GdkPixmap* MonoToColor(GdkPixmap* monoPixmap, int x, int y, int w, int h) const; - - wxDECLARE_ABSTRACT_CLASS(wxWindowDCImpl); -}; - -//----------------------------------------------------------------------------- -// wxClientDCImpl -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxClientDCImpl : public wxWindowDCImpl -{ -public: - wxClientDCImpl( wxDC *owner ); - wxClientDCImpl( wxDC *owner, wxWindow *win ); - - virtual void DoGetSize(int *width, int *height) const wxOVERRIDE; - - wxDECLARE_ABSTRACT_CLASS(wxClientDCImpl); -}; - -//----------------------------------------------------------------------------- -// wxPaintDCImpl -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxPaintDCImpl : public wxClientDCImpl -{ -public: - wxPaintDCImpl( wxDC *owner ); - wxPaintDCImpl( wxDC *owner, wxWindow *win ); - - wxDECLARE_ABSTRACT_CLASS(wxPaintDCImpl); -}; - -#endif // _WX_GTKDCCLIENT_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/dcmemory.h b/Externals/wxWidgets3/include/wx/gtk/dcmemory.h deleted file mode 100644 index 3f7e7c057a..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/dcmemory.h +++ /dev/null @@ -1,59 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/dcmemory.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_DCMEMORY_H_ -#define _WX_GTK_DCMEMORY_H_ - -#include "wx/dcmemory.h" -#include "wx/gtk/dcclient.h" - -//----------------------------------------------------------------------------- -// wxMemoryDCImpl -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxMemoryDCImpl : public wxWindowDCImpl -{ -public: - wxMemoryDCImpl( wxMemoryDC *owner ); - wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap ); - wxMemoryDCImpl( wxMemoryDC *owner, wxDC *dc ); - - virtual ~wxMemoryDCImpl(); - - // these get reimplemented for mono-bitmaps to behave - // more like their Win32 couterparts. They now interpret - // wxWHITE, wxWHITE_BRUSH and wxWHITE_PEN as drawing 0 - // and everything else as drawing 1. - virtual void SetPen( const wxPen &pen ) wxOVERRIDE; - virtual void SetBrush( const wxBrush &brush ) wxOVERRIDE; - virtual void SetBackground( const wxBrush &brush ) wxOVERRIDE; - virtual void SetTextForeground( const wxColour &col ) wxOVERRIDE; - virtual void SetTextBackground( const wxColour &col ) wxOVERRIDE; - - // overridden from wxDCImpl - virtual void DoGetSize( int *width, int *height ) const wxOVERRIDE; - virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const wxOVERRIDE; - virtual void* GetHandle() const wxOVERRIDE; - - // overridden for wxMemoryDC Impl - virtual void DoSelect(const wxBitmap& bitmap) wxOVERRIDE; - - virtual const wxBitmap& GetSelectedBitmap() const wxOVERRIDE; - virtual wxBitmap& GetSelectedBitmap() wxOVERRIDE; - -private: - wxBitmap m_selected; - - void Init(); - - wxDECLARE_ABSTRACT_CLASS(wxMemoryDCImpl); -}; - -#endif - // _WX_GTK_DCMEMORY_H_ - diff --git a/Externals/wxWidgets3/include/wx/gtk/dcscreen.h b/Externals/wxWidgets3/include/wx/gtk/dcscreen.h deleted file mode 100644 index f59d6e3636..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/dcscreen.h +++ /dev/null @@ -1,33 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/dcscreen.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTKDCSCREEN_H_ -#define _WX_GTKDCSCREEN_H_ - -#include "wx/dcscreen.h" -#include "wx/gtk/dcclient.h" - -//----------------------------------------------------------------------------- -// wxScreenDCImpl -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxScreenDCImpl : public wxWindowDCImpl -{ -public: - wxScreenDCImpl( wxScreenDC *owner ); - ~wxScreenDCImpl(); - - virtual void DoGetSize(int *width, int *height) const wxOVERRIDE; - -private: - void Init(); - - wxDECLARE_ABSTRACT_CLASS(wxScreenDCImpl); -}; - -#endif // _WX_GTKDCSCREEN_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/dialog.h b/Externals/wxWidgets3/include/wx/gtk/dialog.h deleted file mode 100644 index b64a0dc510..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/dialog.h +++ /dev/null @@ -1,52 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/dialog.h -// Purpose: -// Author: Robert Roebling -// Created: -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTKDIALOG_H_ -#define _WX_GTKDIALOG_H_ - -class WXDLLIMPEXP_FWD_CORE wxGUIEventLoop; - -//----------------------------------------------------------------------------- -// wxDialog -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxDialog: public wxDialogBase -{ -public: - wxDialog() { Init(); } - wxDialog( wxWindow *parent, wxWindowID id, - const wxString &title, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - long style = wxDEFAULT_DIALOG_STYLE, - const wxString &name = wxDialogNameStr ); - bool Create( wxWindow *parent, wxWindowID id, - const wxString &title, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - long style = wxDEFAULT_DIALOG_STYLE, - const wxString &name = wxDialogNameStr ); - virtual ~wxDialog(); - - virtual bool Show( bool show = true ) wxOVERRIDE; - virtual int ShowModal() wxOVERRIDE; - virtual void EndModal( int retCode ) wxOVERRIDE; - virtual bool IsModal() const wxOVERRIDE; - -private: - // common part of all ctors - void Init(); - - bool m_modalShowing; - wxGUIEventLoop *m_modalLoop; - - wxDECLARE_DYNAMIC_CLASS(wxDialog); -}; - -#endif // _WX_GTKDIALOG_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/dirdlg.h b/Externals/wxWidgets3/include/wx/gtk/dirdlg.h deleted file mode 100644 index 1e4473ee66..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/dirdlg.h +++ /dev/null @@ -1,63 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/dirdlg.h -// Purpose: wxDirDialog -// Author: Francesco Montorsi -// Copyright: (c) 2006 Francesco Montorsi -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __GTKDIRDLGH__ -#define __GTKDIRDLGH__ - -//------------------------------------------------------------------------- -// wxDirDialog -//------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxDirDialog : public wxDirDialogBase -{ -public: - wxDirDialog() { } - - wxDirDialog(wxWindow *parent, - const wxString& message = wxDirSelectorPromptStr, - const wxString& defaultPath = wxEmptyString, - long style = wxDD_DEFAULT_STYLE, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - const wxString& name = wxDirDialogNameStr); - bool Create(wxWindow *parent, - const wxString& message = wxDirSelectorPromptStr, - const wxString& defaultPath = wxEmptyString, - long style = wxDD_DEFAULT_STYLE, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - const wxString& name = wxDirDialogNameStr); - virtual ~wxDirDialog() { } - - -public: // overrides from wxGenericDirDialog - - wxString GetPath() const wxOVERRIDE; - void SetPath(const wxString& path) wxOVERRIDE; - - - // Implementation only. - - void GTKOnAccept(); - void GTKOnCancel(); - -protected: - // override this from wxTLW since the native - // form doesn't have any m_wxwindow - virtual void DoSetSize(int x, int y, - int width, int height, - int sizeFlags = wxSIZE_AUTO) wxOVERRIDE; - - -private: - wxString m_selectedDirectory; - - wxDECLARE_DYNAMIC_CLASS(wxDirDialog); -}; - -#endif // __GTKDIRDLGH__ diff --git a/Externals/wxWidgets3/include/wx/gtk/dnd.h b/Externals/wxWidgets3/include/wx/gtk/dnd.h deleted file mode 100644 index 3c771e2f68..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/dnd.h +++ /dev/null @@ -1,124 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/dnd.h -// Purpose: declaration of the wxDropTarget class -// Author: Robert Roebling -// Copyright: (c) 1998 Vadim Zeitlin, Robert Roebling -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_DND_H_ -#define _WX_GTK_DND_H_ - -#include "wx/icon.h" - -// ---------------------------------------------------------------------------- -// macros -// ---------------------------------------------------------------------------- - -// this macro may be used instead for wxDropSource ctor arguments: it will use -// the icon 'name' from an XPM file under GTK, but will expand to something -// else under MSW. If you don't use it, you will have to use #ifdef in the -// application code. -#define wxDROP_ICON(name) wxICON(name) - -//------------------------------------------------------------------------- -// wxDropTarget -//------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxDropTarget: public wxDropTargetBase -{ -public: - wxDropTarget(wxDataObject *dataObject = NULL ); - - virtual wxDragResult OnDragOver(wxCoord x, wxCoord y, wxDragResult def) wxOVERRIDE; - virtual bool OnDrop(wxCoord x, wxCoord y) wxOVERRIDE; - virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def) wxOVERRIDE; - virtual bool GetData() wxOVERRIDE; - - // Can only be called during OnXXX methods. - wxDataFormat GetMatchingPair(); - - // implementation - - GdkAtom GTKGetMatchingPair(bool quiet = false); - wxDragResult GTKFigureOutSuggestedAction(); - - void GtkRegisterWidget( GtkWidget *widget ); - void GtkUnregisterWidget( GtkWidget *widget ); - - GdkDragContext *m_dragContext; - GtkWidget *m_dragWidget; - GtkSelectionData *m_dragData; - unsigned m_dragTime; - bool m_firstMotion; // gdk has no "gdk_drag_enter" event - - void GTKSetDragContext( GdkDragContext *dc ) { m_dragContext = dc; } - void GTKSetDragWidget( GtkWidget *w ) { m_dragWidget = w; } - void GTKSetDragData( GtkSelectionData *sd ) { m_dragData = sd; } - void GTKSetDragTime(unsigned time) { m_dragTime = time; } -}; - -//------------------------------------------------------------------------- -// wxDropSource -//------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxDropSource: public wxDropSourceBase -{ -public: - // constructor. set data later with SetData() - wxDropSource( wxWindow *win = NULL, - const wxIcon © = wxNullIcon, - const wxIcon &move = wxNullIcon, - const wxIcon &none = wxNullIcon); - - // constructor for setting one data object - wxDropSource( wxDataObject& data, - wxWindow *win, - const wxIcon © = wxNullIcon, - const wxIcon &move = wxNullIcon, - const wxIcon &none = wxNullIcon); - - virtual ~wxDropSource(); - - // set the icon corresponding to given drag result - void SetIcon(wxDragResult res, const wxIcon& icon) - { - if ( res == wxDragCopy ) - m_iconCopy = icon; - else if ( res == wxDragMove ) - m_iconMove = icon; - else - m_iconNone = icon; - } - - // start drag action - virtual wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly) wxOVERRIDE; - - void PrepareIcon( int action, GdkDragContext *context ); - - GtkWidget *m_widget; - GtkWidget *m_iconWindow; - GdkDragContext *m_dragContext; - wxWindow *m_window; - - wxDragResult m_retValue; - wxIcon m_iconCopy, - m_iconMove, - m_iconNone; - - bool m_waiting; - -private: - // common part of both ctors - void SetIcons(const wxIcon& copy, - const wxIcon& move, - const wxIcon& none); - - // GTK implementation - void GTKConnectDragSignals(); - void GTKDisconnectDragSignals(); - -}; - -#endif // _WX_GTK_DND_H_ - diff --git a/Externals/wxWidgets3/include/wx/gtk/dvrenderer.h b/Externals/wxWidgets3/include/wx/gtk/dvrenderer.h deleted file mode 100644 index c5d3d74a4e..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/dvrenderer.h +++ /dev/null @@ -1,101 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/dvrenderer.h -// Purpose: wxDataViewRenderer for GTK wxDataViewCtrl implementation -// Author: Robert Roebling, Vadim Zeitlin -// Created: 2009-11-07 (extracted from wx/gtk/dataview.h) -// Copyright: (c) 2006 Robert Roebling -// (c) 2009 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_DVRENDERER_H_ -#define _WX_GTK_DVRENDERER_H_ - -typedef struct _GtkCellRendererText GtkCellRendererText; -typedef struct _GtkTreeViewColumn GtkTreeViewColumn; - -// ---------------------------------------------------------------------------- -// wxDataViewRenderer -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDataViewRenderer: public wxDataViewRendererBase -{ -public: - wxDataViewRenderer( const wxString &varianttype, - wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, - int align = wxDVR_DEFAULT_ALIGNMENT ); - - virtual void SetMode( wxDataViewCellMode mode ) wxOVERRIDE; - virtual wxDataViewCellMode GetMode() const wxOVERRIDE; - - virtual void SetAlignment( int align ) wxOVERRIDE; - virtual int GetAlignment() const wxOVERRIDE; - - virtual void EnableEllipsize(wxEllipsizeMode mode = wxELLIPSIZE_MIDDLE) wxOVERRIDE; - virtual wxEllipsizeMode GetEllipsizeMode() const wxOVERRIDE; - - virtual bool FinishEditing() wxOVERRIDE; - - // GTK-specific implementation - // --------------------------- - - // pack the GTK cell renderers used by this renderer to the given column - // - // by default only a single m_renderer is used but some renderers use more - // than one GTK cell renderer - virtual void GtkPackIntoColumn(GtkTreeViewColumn *column); - - // called when the cell value was edited by user with the new value - // - // it validates the new value and notifies the model about the change by - // calling GtkOnCellChanged() if it was accepted - virtual void GtkOnTextEdited(const char *itempath, const wxString& value); - - GtkCellRenderer* GetGtkHandle() { return m_renderer; } - void GtkInitHandlers(); - void GtkUpdateAlignment() { GtkApplyAlignment(m_renderer); } - - // return the text renderer used by this renderer for setting text cell - // specific attributes: can return NULL if this renderer doesn't render any - // text - virtual GtkCellRendererText *GtkGetTextRenderer() const { return NULL; } - - // return the widget actually used by the renderer for editing, this may be - // different from the editor control widget for the custom renderers - virtual GtkWidget* GtkGetEditorWidget() const; - -private: - // Change the mode at GTK level without touching m_mode, this is useful for - // temporarily making the renderer insensitive but does mean that GetMode() - // may return a value different from the actual GTK renderer mode. - void GtkSetMode(wxDataViewCellMode mode); - -protected: - virtual void SetAttr(const wxDataViewItemAttr& attr) wxOVERRIDE; - virtual void SetEnabled(bool enabled) wxOVERRIDE; - - virtual void GtkOnCellChanged(const wxVariant& value, - const wxDataViewItem& item, - unsigned col); - - // Apply our effective alignment (i.e. m_alignment if specified or the - // associated column alignment by default) to the given renderer. - void GtkApplyAlignment(GtkCellRenderer *renderer); - - GtkCellRenderer *m_renderer; - int m_alignment; - - // We store the renderer mode at wx level as it can differ from the mode of - // the corresponding GTK+ renderer as explained above. - wxDataViewCellMode m_mode; - - // true if we hadn't changed any visual attributes or restored them since - // doing this - bool m_usingDefaultAttrs; - -protected: - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewRenderer); -}; - -#endif // _WX_GTK_DVRENDERER_H_ - diff --git a/Externals/wxWidgets3/include/wx/gtk/dvrenderers.h b/Externals/wxWidgets3/include/wx/gtk/dvrenderers.h deleted file mode 100644 index 68e4d4a980..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/dvrenderers.h +++ /dev/null @@ -1,276 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/dvrenderers.h -// Purpose: All GTK wxDataViewCtrl renderer classes -// Author: Robert Roebling, Vadim Zeitlin -// Created: 2009-11-07 (extracted from wx/gtk/dataview.h) -// Copyright: (c) 2006 Robert Roebling -// (c) 2009 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_DVRENDERERS_H_ -#define _WX_GTK_DVRENDERERS_H_ - -#ifdef __WXGTK3__ - typedef struct _cairo_rectangle_int cairo_rectangle_int_t; - typedef cairo_rectangle_int_t GdkRectangle; -#else - typedef struct _GdkRectangle GdkRectangle; -#endif - -// --------------------------------------------------------- -// wxDataViewTextRenderer -// --------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDataViewTextRenderer: public wxDataViewRenderer -{ -public: - static wxString GetDefaultType() { return wxS("string"); } - - wxDataViewTextRenderer( const wxString &varianttype = GetDefaultType(), - wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, - int align = wxDVR_DEFAULT_ALIGNMENT ); - - virtual bool SetValue( const wxVariant &value ) wxOVERRIDE - { - return SetTextValue(value); - } - - virtual bool GetValue( wxVariant &value ) const wxOVERRIDE - { - wxString str; - if ( !GetTextValue(str) ) - return false; - - value = str; - - return true; - } - - virtual void SetAlignment( int align ) wxOVERRIDE; - - virtual GtkCellRendererText *GtkGetTextRenderer() const wxOVERRIDE; - -protected: - virtual void SetAttr(const wxDataViewItemAttr& attr) wxOVERRIDE; - - // implementation of Set/GetValue() - bool SetTextValue(const wxString& str); - bool GetTextValue(wxString& str) const; - - - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewTextRenderer); -}; - -// --------------------------------------------------------- -// wxDataViewBitmapRenderer -// --------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDataViewBitmapRenderer: public wxDataViewRenderer -{ -public: - static wxString GetDefaultType() { return wxS("wxBitmap"); } - - wxDataViewBitmapRenderer( const wxString &varianttype = GetDefaultType(), - wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, - int align = wxDVR_DEFAULT_ALIGNMENT ); - - bool SetValue( const wxVariant &value ) wxOVERRIDE; - bool GetValue( wxVariant &value ) const wxOVERRIDE; - -protected: - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewBitmapRenderer); -}; - -// --------------------------------------------------------- -// wxDataViewToggleRenderer -// --------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDataViewToggleRenderer: public wxDataViewRenderer -{ -public: - static wxString GetDefaultType() { return wxS("bool"); } - - wxDataViewToggleRenderer( const wxString &varianttype = GetDefaultType(), - wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, - int align = wxDVR_DEFAULT_ALIGNMENT ); - - bool SetValue( const wxVariant &value ) wxOVERRIDE; - bool GetValue( wxVariant &value ) const wxOVERRIDE; - -protected: - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewToggleRenderer); -}; - -// --------------------------------------------------------- -// wxDataViewCustomRenderer -// --------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDataViewCustomRenderer: public wxDataViewCustomRendererBase -{ -public: - static wxString GetDefaultType() { return wxS("string"); } - - wxDataViewCustomRenderer( const wxString &varianttype = GetDefaultType(), - wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, - int align = wxDVR_DEFAULT_ALIGNMENT, - bool no_init = false ); - virtual ~wxDataViewCustomRenderer(); - - - // Create DC on request - virtual wxDC *GetDC() wxOVERRIDE; - - // override the base class function to use GTK text cell renderer - virtual void RenderText(const wxString& text, - int xoffset, - wxRect cell, - wxDC *dc, - int state) wxOVERRIDE; - - struct GTKRenderParams; - - // store GTK render call parameters for possible later use - void GTKSetRenderParams(GTKRenderParams* renderParams) - { - m_renderParams = renderParams; - } - - virtual GtkCellRendererText *GtkGetTextRenderer() const wxOVERRIDE; - virtual GtkWidget* GtkGetEditorWidget() const wxOVERRIDE; - -private: - bool Init(wxDataViewCellMode mode, int align); - - // Called from GtkGetTextRenderer() to really create the renderer if - // necessary. - void GtkInitTextRenderer(); - - wxDC *m_dc; - - GtkCellRendererText *m_text_renderer; - - // parameters of the original render() call stored so that we could pass - // them forward to m_text_renderer if our RenderText() is called - GTKRenderParams* m_renderParams; - - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCustomRenderer); -}; - -// --------------------------------------------------------- -// wxDataViewProgressRenderer -// --------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDataViewProgressRenderer: public wxDataViewCustomRenderer -{ -public: - static wxString GetDefaultType() { return wxS("long"); } - - wxDataViewProgressRenderer( const wxString &label = wxEmptyString, - const wxString &varianttype = GetDefaultType(), - wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, - int align = wxDVR_DEFAULT_ALIGNMENT ); - virtual ~wxDataViewProgressRenderer(); - - bool SetValue( const wxVariant &value ) wxOVERRIDE; - bool GetValue( wxVariant &value ) const wxOVERRIDE; - - virtual bool Render( wxRect cell, wxDC *dc, int state ) wxOVERRIDE; - virtual wxSize GetSize() const wxOVERRIDE; - -private: - void GTKSetLabel(); - - wxString m_label; - int m_value; - -#if !wxUSE_UNICODE - // Flag used to indicate that we need to set the label because we were - // unable to do it in the ctor (see comments there). - bool m_needsToSetLabel; -#endif // !wxUSE_UNICODE - -protected: - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewProgressRenderer); -}; - -// --------------------------------------------------------- -// wxDataViewIconTextRenderer -// --------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDataViewIconTextRenderer: public wxDataViewTextRenderer -{ -public: - static wxString GetDefaultType() { return wxS("wxDataViewIconText"); } - - wxDataViewIconTextRenderer( const wxString &varianttype = GetDefaultType(), - wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, - int align = wxDVR_DEFAULT_ALIGNMENT ); - virtual ~wxDataViewIconTextRenderer(); - - bool SetValue( const wxVariant &value ) wxOVERRIDE; - bool GetValue( wxVariant &value ) const wxOVERRIDE; - - virtual void GtkPackIntoColumn(GtkTreeViewColumn *column) wxOVERRIDE; - -protected: - virtual void GtkOnCellChanged(const wxVariant& value, - const wxDataViewItem& item, - unsigned col) wxOVERRIDE; - -private: - wxDataViewIconText m_value; - - // we use the base class m_renderer for the text and this one for the icon - GtkCellRenderer *m_rendererIcon; - - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewIconTextRenderer); -}; - -// ------------------------------------- -// wxDataViewChoiceRenderer -// ------------------------------------- - -class WXDLLIMPEXP_ADV wxDataViewChoiceRenderer: public wxDataViewCustomRenderer -{ -public: - wxDataViewChoiceRenderer(const wxArrayString &choices, - wxDataViewCellMode mode = wxDATAVIEW_CELL_EDITABLE, - int alignment = wxDVR_DEFAULT_ALIGNMENT ); - virtual bool Render( wxRect rect, wxDC *dc, int state ) wxOVERRIDE; - virtual wxSize GetSize() const wxOVERRIDE; - virtual bool SetValue( const wxVariant &value ) wxOVERRIDE; - virtual bool GetValue( wxVariant &value ) const wxOVERRIDE; - - void SetAlignment( int align ) wxOVERRIDE; - - wxString GetChoice(size_t index) const { return m_choices[index]; } - const wxArrayString& GetChoices() const { return m_choices; } - -private: - wxArrayString m_choices; - wxString m_data; -}; - -// ---------------------------------------------------------------------------- -// wxDataViewChoiceByIndexRenderer -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDataViewChoiceByIndexRenderer: public wxDataViewChoiceRenderer -{ -public: - wxDataViewChoiceByIndexRenderer( const wxArrayString &choices, - wxDataViewCellMode mode = wxDATAVIEW_CELL_EDITABLE, - int alignment = wxDVR_DEFAULT_ALIGNMENT ); - - virtual bool SetValue( const wxVariant &value ) wxOVERRIDE; - virtual bool GetValue( wxVariant &value ) const wxOVERRIDE; - -private: - virtual void GtkOnTextEdited(const char *itempath, const wxString& str) wxOVERRIDE; -}; - - - -#endif // _WX_GTK_DVRENDERERS_H_ - diff --git a/Externals/wxWidgets3/include/wx/gtk/evtloop.h b/Externals/wxWidgets3/include/wx/gtk/evtloop.h deleted file mode 100644 index 0e3c1b15ea..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/evtloop.h +++ /dev/null @@ -1,47 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/evtloop.h -// Purpose: wxGTK event loop implementation -// Author: Vadim Zeitlin -// Created: 2008-12-27 -// Copyright: (c) 2008 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_EVTLOOP_H_ -#define _WX_GTK_EVTLOOP_H_ - -// ---------------------------------------------------------------------------- -// wxGUIEventLoop for wxGTK -// ---------------------------------------------------------------------------- - -typedef union _GdkEvent GdkEvent; - -class WXDLLIMPEXP_CORE wxGUIEventLoop : public wxEventLoopBase -{ -public: - wxGUIEventLoop(); - - virtual void ScheduleExit(int rc = 0) wxOVERRIDE; - virtual bool Pending() const wxOVERRIDE; - virtual bool Dispatch() wxOVERRIDE; - virtual int DispatchTimeout(unsigned long timeout) wxOVERRIDE; - virtual void WakeUp() wxOVERRIDE; - - void StoreGdkEventForLaterProcessing(GdkEvent* ev) - { m_arrGdkEvents.Add(ev); } - -protected: - virtual int DoRun() wxOVERRIDE; - virtual void DoYieldFor(long eventsToProcess) wxOVERRIDE; - -private: - // the exit code of this event loop - int m_exitcode; - - // used to temporarily store events in DoYield() - wxArrayPtrVoid m_arrGdkEvents; - - wxDECLARE_NO_COPY_CLASS(wxGUIEventLoop); -}; - -#endif // _WX_GTK_EVTLOOP_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/evtloopsrc.h b/Externals/wxWidgets3/include/wx/gtk/evtloopsrc.h deleted file mode 100644 index f80523424d..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/evtloopsrc.h +++ /dev/null @@ -1,39 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/evtloopsrc.h -// Purpose: wxGTKEventLoopSource class -// Author: Vadim Zeitlin -// Created: 2009-10-21 -// Copyright: (c) 2009 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_EVTLOOPSRC_H_ -#define _WX_GTK_EVTLOOPSRC_H_ - -// ---------------------------------------------------------------------------- -// wxGTKEventLoopSource: wxEventLoopSource for GTK port -// ---------------------------------------------------------------------------- - -class wxGTKEventLoopSource : public wxEventLoopSource -{ -public: - // sourceId is the id of the watch in GTK context, not the FD of the file - // this source corresponds to - wxGTKEventLoopSource(unsigned sourceId, - wxEventLoopSourceHandler *handler, - int flags) - : wxEventLoopSource(handler, flags), - m_sourceId(sourceId) - { - } - - virtual ~wxGTKEventLoopSource(); - -private: - const unsigned m_sourceId; - - wxDECLARE_NO_COPY_CLASS(wxGTKEventLoopSource); -}; - -#endif // _WX_GTK_EVTLOOPSRC_H_ - diff --git a/Externals/wxWidgets3/include/wx/gtk/filectrl.h b/Externals/wxWidgets3/include/wx/gtk/filectrl.h deleted file mode 100644 index b2fad39cb6..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/filectrl.h +++ /dev/null @@ -1,144 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/filectrl.h -// Purpose: wxGtkFileCtrl Header -// Author: Diaa M. Sami -// Modified by: -// Created: Aug-10-2007 -// Copyright: (c) Diaa M. Sami -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - - -#ifndef _WX_GTK_FILECTRL_H_ -#define _WX_GTK_FILECTRL_H_ - -#include "wx/control.h" -#include "wx/filectrl.h" - -extern WXDLLIMPEXP_DATA_CORE(const char) wxFileSelectorDefaultWildcardStr[]; - -typedef struct _GtkFileChooser GtkFileChooser; - -// [GTK] current problems: -// All methods(e.g. SetFilename(), SetPath(), etc) which change the state of -// the control result in events fired, such events should be suppressed. -// ------ -// Sometimes a selection event(with 0 files) is fired before -// wxEVT_FILECTRL_FOLDERCHANGED, unfortunately this can hardly be detected! - -// A wx wrapper for any Gtk object implementing the interface GtkFileChooser - -class WXDLLIMPEXP_CORE wxGtkFileChooser -{ -public: - wxGtkFileChooser() { m_ignoreNextFilterEvent = false; } - - void SetWidget(GtkFileChooser *w); - - wxString GetPath() const; - void GetPaths( wxArrayString& paths ) const; - wxString GetDirectory() const; - wxString GetFilename() const; - void GetFilenames( wxArrayString& files ) const; - int GetFilterIndex() const; - - bool SetPath( const wxString& path ); - bool SetDirectory( const wxString& dir ); - void SetWildcard( const wxString& wildCard ); - void SetFilterIndex( int filterIndex ); - - bool HasFilterChoice() const; - - bool ShouldIgnoreNextFilterEvent() const { return m_ignoreNextFilterEvent; } - - wxString GetCurrentWildCard() const - { return m_wildcards[GetFilterIndex()]; } - -private: - GtkFileChooser *m_widget; - // First wildcard in filter, to be used when the user - // saves a file without giving an extension. - wxArrayString m_wildcards; - - // If true, ignore the next event because it was generated by us and not - // the user. - bool m_ignoreNextFilterEvent; -}; - -#if wxUSE_FILECTRL - -class WXDLLIMPEXP_CORE wxGtkFileCtrl: public wxControl, - public wxFileCtrlBase -{ -public: - wxGtkFileCtrl () { Init(); } - - wxGtkFileCtrl ( wxWindow *parent, - wxWindowID id, - const wxString& defaultDirectory = wxEmptyString, - const wxString& defaultFilename = wxEmptyString, - const wxString& wildCard = wxFileSelectorDefaultWildcardStr, - long style = wxFC_DEFAULT_STYLE, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - const wxString& name = wxFileCtrlNameStr ) - { - Init(); - Create( parent, id, defaultDirectory, defaultFilename, wildCard, style, pos, size, name ); - } - - virtual ~wxGtkFileCtrl(); - - bool Create( wxWindow *parent, - wxWindowID id, - const wxString& defaultDirectory = wxEmptyString, - const wxString& defaultFileName = wxEmptyString, - const wxString& wildCard = wxFileSelectorDefaultWildcardStr, - long style = wxFC_DEFAULT_STYLE, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - const wxString& name = wxFileCtrlNameStr ); - - virtual void SetWildcard( const wxString& wildCard ) wxOVERRIDE; - virtual void SetFilterIndex( int filterIndex ) wxOVERRIDE; - virtual bool SetDirectory( const wxString& dir ) wxOVERRIDE; - virtual bool SetFilename( const wxString& name ) wxOVERRIDE; - virtual bool SetPath( const wxString& path ) wxOVERRIDE; - - virtual wxString GetFilename() const wxOVERRIDE; - virtual wxString GetDirectory() const wxOVERRIDE; - virtual wxString GetWildcard() const wxOVERRIDE { return this->m_wildCard; } - virtual wxString GetPath() const wxOVERRIDE; - virtual void GetPaths( wxArrayString& paths ) const wxOVERRIDE; - virtual void GetFilenames( wxArrayString& files ) const wxOVERRIDE; - virtual int GetFilterIndex() const wxOVERRIDE { return m_fc.GetFilterIndex(); } - - virtual bool HasMultipleFileSelection() const wxOVERRIDE { return HasFlag( wxFC_MULTIPLE ); } - virtual void ShowHidden(bool show) wxOVERRIDE; - - virtual bool HasFilterChoice() const - { return m_fc.HasFilterChoice(); } - - - // Implementation only from now on. - bool GTKShouldIgnoreNextFilterEvent() const - { return m_fc.ShouldIgnoreNextFilterEvent(); } - - bool m_checkNextSelEvent; - bool m_ignoreNextFolderChangeEvent; - -protected: - GtkFileChooser *m_fcWidget; - wxGtkFileChooser m_fc; - wxString m_wildCard; - -private: - void Init(); - - wxDECLARE_DYNAMIC_CLASS(wxGtkFileCtrl); -}; - -#endif // wxUSE_FILECTRL - -#endif // _WX_GTK_FILECTRL_H_ - diff --git a/Externals/wxWidgets3/include/wx/gtk/filedlg.h b/Externals/wxWidgets3/include/wx/gtk/filedlg.h deleted file mode 100644 index 5db235f5c4..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/filedlg.h +++ /dev/null @@ -1,83 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/filedlg.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTKFILEDLG_H_ -#define _WX_GTKFILEDLG_H_ - -#include "wx/gtk/filectrl.h" // for wxGtkFileChooser - -//------------------------------------------------------------------------- -// wxFileDialog -//------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxFileDialog: public wxFileDialogBase -{ -public: - wxFileDialog() { } - - wxFileDialog(wxWindow *parent, - const wxString& message = wxFileSelectorPromptStr, - const wxString& defaultDir = wxEmptyString, - const wxString& defaultFile = wxEmptyString, - const wxString& wildCard = wxFileSelectorDefaultWildcardStr, - long style = wxFD_DEFAULT_STYLE, - const wxPoint& pos = wxDefaultPosition, - const wxSize& sz = wxDefaultSize, - const wxString& name = wxFileDialogNameStr); - bool Create(wxWindow *parent, - const wxString& message = wxFileSelectorPromptStr, - const wxString& defaultDir = wxEmptyString, - const wxString& defaultFile = wxEmptyString, - const wxString& wildCard = wxFileSelectorDefaultWildcardStr, - long style = wxFD_DEFAULT_STYLE, - const wxPoint& pos = wxDefaultPosition, - const wxSize& sz = wxDefaultSize, - const wxString& name = wxFileDialogNameStr); - virtual ~wxFileDialog(); - - virtual wxString GetPath() const wxOVERRIDE; - virtual void GetPaths(wxArrayString& paths) const wxOVERRIDE; - virtual wxString GetFilename() const wxOVERRIDE; - virtual void GetFilenames(wxArrayString& files) const wxOVERRIDE; - virtual int GetFilterIndex() const wxOVERRIDE; - - virtual void SetMessage(const wxString& message) wxOVERRIDE; - virtual void SetPath(const wxString& path) wxOVERRIDE; - virtual void SetDirectory(const wxString& dir) wxOVERRIDE; - virtual void SetFilename(const wxString& name) wxOVERRIDE; - virtual void SetWildcard(const wxString& wildCard) wxOVERRIDE; - virtual void SetFilterIndex(int filterIndex) wxOVERRIDE; - - virtual int ShowModal() wxOVERRIDE; - - virtual bool SupportsExtraControl() const wxOVERRIDE { return true; } - - // Implementation only. - void GTKSelectionChanged(const wxString& filename); - - -protected: - // override this from wxTLW since the native - // form doesn't have any m_wxwindow - virtual void DoSetSize(int x, int y, - int width, int height, - int sizeFlags = wxSIZE_AUTO) wxOVERRIDE; - - -private: - void OnFakeOk( wxCommandEvent &event ); - void OnSize(wxSizeEvent&); - virtual void AddChildGTK(wxWindowGTK* child) wxOVERRIDE; - - wxGtkFileChooser m_fc; - - wxDECLARE_DYNAMIC_CLASS(wxFileDialog); - wxDECLARE_EVENT_TABLE(); -}; - -#endif // _WX_GTKFILEDLG_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/filehistory.h b/Externals/wxWidgets3/include/wx/gtk/filehistory.h deleted file mode 100644 index edeb175455..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/filehistory.h +++ /dev/null @@ -1,24 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/filehistory.h -// Purpose: GTK+ bits for wxFileHistory -// Author: Vaclav Slavik -// Created: 2010-05-06 -// Copyright: (c) 2010 Vaclav Slavik -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_FILEHISTORY_H_ -#define _WX_GTK_FILEHISTORY_H_ - -class WXDLLIMPEXP_CORE wxFileHistory : public wxFileHistoryBase -{ -public: - wxFileHistory(size_t maxFiles = 9, wxWindowID idBase = wxID_FILE1) - : wxFileHistoryBase(maxFiles, idBase) {} - - virtual void AddFileToHistory(const wxString& file) wxOVERRIDE; - - wxDECLARE_DYNAMIC_CLASS(wxFileHistory); -}; - -#endif // _WX_GTK_FILEHISTORY_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/filepicker.h b/Externals/wxWidgets3/include/wx/gtk/filepicker.h deleted file mode 100644 index 8da628866e..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/filepicker.h +++ /dev/null @@ -1,192 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/filedirpicker.h -// Purpose: wxFileButton, wxDirButton header -// Author: Francesco Montorsi -// Modified by: -// Created: 14/4/2006 -// Copyright: (c) Francesco Montorsi -// Licence: wxWindows Licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_FILEPICKER_H_ -#define _WX_GTK_FILEPICKER_H_ - -// since GtkColorButton is available only for GTK+ >= 2.4, -// we need to use generic versions if we detect (at runtime) -// that GTK+ < 2.4 -#include "wx/generic/filepickerg.h" - -//----------------------------------------------------------------------------- -// wxFileButton and wxDirButton shared code -// (cannot be a base class since they need to derive from wxGenericFileButton -// and from wxGenericDirButton classes !) -//----------------------------------------------------------------------------- - -#define FILEDIRBTN_OVERRIDES \ - /* NULL is because of a problem with destruction order which happens */ \ - /* if we pass GetParent(): in fact, this GTK native implementation */ \ - /* needs to create the dialog in ::Create() and not for each user */ \ - /* request in response to the user click as the generic implementation */ \ - /* does. */ \ - virtual wxWindow *GetDialogParent() wxOVERRIDE \ - { \ - return NULL; \ - } \ - \ - /* even if wx derive from wxGenericFileButton, i.e. from wxButton, our */ \ - /* native GTK+ widget does not derive from GtkButton thus *all* uses */ \ - /* GTK_BUTTON(m_widget) macro done by wxButton must be bypassed to */ \ - /* avoid bunch of GTK+ warnings like: */ \ - /* invalid cast from `GtkFileChooserButton' to `GtkButton' */ \ - /* so, override wxButton::GTKGetWindow and return NULL as GTK+ doesn't */ \ - /* give us access to the internal GdkWindow of a GtkFileChooserButton */ \ -protected: \ - virtual GdkWindow * \ - GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const wxOVERRIDE \ - { return NULL; } - - -//----------------------------------------------------------------------------- -// wxFileButton -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxFileButton : public wxGenericFileButton -{ -public: - wxFileButton() { Init(); } - wxFileButton(wxWindow *parent, - wxWindowID id, - const wxString& label = wxFilePickerWidgetLabel, - const wxString &path = wxEmptyString, - const wxString &message = wxFileSelectorPromptStr, - const wxString &wildcard = wxFileSelectorDefaultWildcardStr, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxFILEBTN_DEFAULT_STYLE, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxFilePickerWidgetNameStr) - { - Init(); - m_pickerStyle = style; - Create(parent, id, label, path, message, wildcard, - pos, size, style, validator, name); - } - - virtual ~wxFileButton(); - - -public: // overrides - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& label = wxFilePickerWidgetLabel, - const wxString &path = wxEmptyString, - const wxString &message = wxFileSelectorPromptStr, - const wxString &wildcard = wxFileSelectorDefaultWildcardStr, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxFilePickerWidgetNameStr); - - // event handler for the click - void OnDialogOK(wxCommandEvent &); - - virtual void SetPath(const wxString &str) wxOVERRIDE; - virtual void SetInitialDirectory(const wxString& dir) wxOVERRIDE; - - // see macro defined above - FILEDIRBTN_OVERRIDES - -protected: - wxDialog *m_dialog; - -private: - // common part of all ctors - void Init() { m_dialog = NULL; } - - wxDECLARE_DYNAMIC_CLASS(wxFileButton); -}; - - -//----------------------------------------------------------------------------- -// wxDirButton -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxDirButton : public wxGenericDirButton -{ -public: - wxDirButton() { Init(); } - wxDirButton(wxWindow *parent, - wxWindowID id, - const wxString& label = wxFilePickerWidgetLabel, - const wxString &path = wxEmptyString, - const wxString &message = wxFileSelectorPromptStr, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDIRBTN_DEFAULT_STYLE, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxFilePickerWidgetNameStr) - { - Init(); - - m_pickerStyle = style; - - Create(parent, id, label, path, message, wxEmptyString, - pos, size, style, validator, name); - } - - virtual ~wxDirButton(); - - -public: // overrides - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& label = wxFilePickerWidgetLabel, - const wxString &path = wxEmptyString, - const wxString &message = wxFileSelectorPromptStr, - const wxString &wildcard = wxFileSelectorDefaultWildcardStr, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxFilePickerWidgetNameStr); - - - // GtkFileChooserButton does not support GTK_FILE_CHOOSER_CREATE_FOLDER - // thus we must ensure that the wxDD_DIR_MUST_EXIST style was given - long GetDialogStyle() const wxOVERRIDE - { - return (wxGenericDirButton::GetDialogStyle() | wxDD_DIR_MUST_EXIST); - } - - virtual void SetPath(const wxString &str) wxOVERRIDE; - virtual void SetInitialDirectory(const wxString& dir) wxOVERRIDE; - - // see macro defined above - FILEDIRBTN_OVERRIDES - -protected: - wxDialog *m_dialog; - -public: // used by the GTK callback only - - bool m_bIgnoreNextChange; - - void GTKUpdatePath(const char *gtkpath); - -private: - void Init() - { - m_dialog = NULL; - m_bIgnoreNextChange = false; - } - - wxDECLARE_DYNAMIC_CLASS(wxDirButton); -}; - -#undef FILEDIRBTN_OVERRIDES - -#endif // _WX_GTK_FILEPICKER_H_ - diff --git a/Externals/wxWidgets3/include/wx/gtk/font.h b/Externals/wxWidgets3/include/wx/gtk/font.h deleted file mode 100644 index d24c807c19..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/font.h +++ /dev/null @@ -1,126 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/font.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_FONT_H_ -#define _WX_GTK_FONT_H_ - -// ---------------------------------------------------------------------------- -// wxFont -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxFont : public wxFontBase -{ -public: - wxFont() { } - - wxFont(const wxFontInfo& info); - - wxFont(const wxString& nativeFontInfoString) - { - Create(nativeFontInfoString); - } - - wxFont(const wxNativeFontInfo& info); - - wxFont(int size, - wxFontFamily family, - wxFontStyle style, - wxFontWeight weight, - bool underlined = false, - const wxString& face = wxEmptyString, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT) - { - Create(size, family, style, weight, underlined, face, encoding); - } - - wxFont(const wxSize& pixelSize, - wxFontFamily family, - wxFontStyle style, - wxFontWeight weight, - bool underlined = false, - const wxString& face = wxEmptyString, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT) - { - Create(10, family, style, weight, underlined, face, encoding); - SetPixelSize(pixelSize); - } - - bool Create(int size, - wxFontFamily family, - wxFontStyle style, - wxFontWeight weight, - bool underlined = false, - const wxString& face = wxEmptyString, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT); - - // wxGTK-specific - bool Create(const wxString& fontname); - - virtual ~wxFont(); - - // implement base class pure virtuals - virtual int GetPointSize() const wxOVERRIDE; - virtual wxFontStyle GetStyle() const wxOVERRIDE; - virtual wxFontWeight GetWeight() const wxOVERRIDE; - virtual wxString GetFaceName() const wxOVERRIDE; - virtual bool GetUnderlined() const wxOVERRIDE; - virtual bool GetStrikethrough() const wxOVERRIDE; - virtual wxFontEncoding GetEncoding() const wxOVERRIDE; - virtual const wxNativeFontInfo *GetNativeFontInfo() const wxOVERRIDE; - virtual bool IsFixedWidth() const wxOVERRIDE; - - virtual void SetPointSize( int pointSize ) wxOVERRIDE; - virtual void SetFamily(wxFontFamily family) wxOVERRIDE; - virtual void SetStyle(wxFontStyle style) wxOVERRIDE; - virtual void SetWeight(wxFontWeight weight) wxOVERRIDE; - virtual bool SetFaceName( const wxString& faceName ) wxOVERRIDE; - virtual void SetUnderlined( bool underlined ) wxOVERRIDE; - virtual void SetStrikethrough(bool strikethrough) wxOVERRIDE; - virtual void SetEncoding(wxFontEncoding encoding) wxOVERRIDE; - - wxDECLARE_COMMON_FONT_METHODS(); - - wxDEPRECATED_MSG("use wxFONT{FAMILY,STYLE,WEIGHT}_XXX constants") - wxFont(int size, - int family, - int style, - int weight, - bool underlined = false, - const wxString& face = wxEmptyString, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT) - { - (void)Create(size, (wxFontFamily)family, (wxFontStyle)style, (wxFontWeight)weight, underlined, face, encoding); - } - - // Set Pango attributes in the specified layout. Currently only - // underlined and strike-through attributes are handled by this function. - // - // If neither of them is specified, returns false, otherwise sets up the - // attributes and returns true. - bool GTKSetPangoAttrs(PangoLayout* layout) const; - - // implementation from now on - void Unshare(); - - // no data :-) - -protected: - virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info ) wxOVERRIDE; - - virtual wxGDIRefData* CreateGDIRefData() const wxOVERRIDE; - virtual wxGDIRefData* CloneGDIRefData(const wxGDIRefData* data) const wxOVERRIDE; - - virtual wxFontFamily DoGetFamily() const wxOVERRIDE; - -private: - void Init(); - - wxDECLARE_DYNAMIC_CLASS(wxFont); -}; - -#endif // _WX_GTK_FONT_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/fontdlg.h b/Externals/wxWidgets3/include/wx/gtk/fontdlg.h deleted file mode 100644 index bab724c904..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/fontdlg.h +++ /dev/null @@ -1,35 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/fontdlg.h -// Purpose: wxFontDialog -// Author: Robert Roebling -// Created: -// Copyright: (c) Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_FONTDLG_H_ -#define _WX_GTK_FONTDLG_H_ - -//----------------------------------------------------------------------------- -// wxFontDialog -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxFontDialog : public wxFontDialogBase -{ -public: - wxFontDialog() : wxFontDialogBase() { /* must be Create()d later */ } - wxFontDialog(wxWindow *parent) - : wxFontDialogBase(parent) { Create(parent); } - wxFontDialog(wxWindow *parent, const wxFontData& data) - : wxFontDialogBase(parent, data) { Create(parent, data); } - - virtual ~wxFontDialog(); - -protected: - // create the GTK dialog - virtual bool DoCreate(wxWindow *parent) wxOVERRIDE; - - wxDECLARE_DYNAMIC_CLASS(wxFontDialog); -}; - -#endif diff --git a/Externals/wxWidgets3/include/wx/gtk/fontpicker.h b/Externals/wxWidgets3/include/wx/gtk/fontpicker.h deleted file mode 100644 index ce56da14d0..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/fontpicker.h +++ /dev/null @@ -1,78 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/fontpicker.h -// Purpose: wxFontButton header -// Author: Francesco Montorsi -// Modified by: -// Created: 14/4/2006 -// Copyright: (c) Francesco Montorsi -// Licence: wxWindows Licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_FONTPICKER_H_ -#define _WX_GTK_FONTPICKER_H_ - -#include "wx/button.h" - -//----------------------------------------------------------------------------- -// wxFontButton -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxFontButton : public wxButton, - public wxFontPickerWidgetBase -{ -public: - wxFontButton() { Init(); } - wxFontButton(wxWindow *parent, - wxWindowID id, - const wxFont& initial = wxNullFont, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxFONTBTN_DEFAULT_STYLE, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxFontPickerWidgetNameStr) - { - Init(); - - Create(parent, id, initial, pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxFont& initial = wxNullFont, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxFONTBTN_DEFAULT_STYLE, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxFontPickerWidgetNameStr); - - virtual wxColour GetSelectedColour() const wxOVERRIDE - { return m_selectedColour; } - - void SetSelectedColour(const wxColour &colour) wxOVERRIDE - { m_selectedColour = colour; } - - virtual ~wxFontButton(); - -protected: - void UpdateFont() wxOVERRIDE; - - -public: // used by the GTK callback only - void SetNativeFontInfo(const char* gtkdescription); - -private: - // Common part of both ctors. - void Init() - { - m_selectedColour = *wxBLACK; - } - - // This can't be changed by the user, but is provided to - // satisfy the wxFontPickerWidgetBase interface. - wxColour m_selectedColour; - - wxDECLARE_DYNAMIC_CLASS(wxFontButton); -}; - -#endif // _WX_GTK_FONTPICKER_H_ - diff --git a/Externals/wxWidgets3/include/wx/gtk/frame.h b/Externals/wxWidgets3/include/wx/gtk/frame.h deleted file mode 100644 index 878ba99732..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/frame.h +++ /dev/null @@ -1,75 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/frame.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling, Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_FRAME_H_ -#define _WX_GTK_FRAME_H_ - -//----------------------------------------------------------------------------- -// wxFrame -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxFrame : public wxFrameBase -{ -public: - // construction - wxFrame() { Init(); } - wxFrame(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr) - { - Init(); - - Create(parent, id, title, pos, size, style, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr); - -#if wxUSE_STATUSBAR - void SetStatusBar(wxStatusBar *statbar) wxOVERRIDE; -#endif // wxUSE_STATUSBAR - -#if wxUSE_TOOLBAR - void SetToolBar(wxToolBar *toolbar) wxOVERRIDE; -#endif // wxUSE_TOOLBAR - - virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) wxOVERRIDE; - wxPoint GetClientAreaOrigin() const wxOVERRIDE { return wxPoint(0, 0); } - - // implementation from now on - // -------------------------- - - virtual bool SendIdleEvents(wxIdleEvent& event) wxOVERRIDE; - -protected: - // override wxWindow methods to take into account tool/menu/statusbars - virtual void DoGetClientSize( int *width, int *height ) const wxOVERRIDE; - -#if wxUSE_MENUS_NATIVE - virtual void DetachMenuBar() wxOVERRIDE; - virtual void AttachMenuBar(wxMenuBar *menubar) wxOVERRIDE; -#endif // wxUSE_MENUS_NATIVE - -private: - void Init(); - - long m_fsSaveFlag; - - wxDECLARE_DYNAMIC_CLASS(wxFrame); -}; - -#endif // _WX_GTK_FRAME_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/gauge.h b/Externals/wxWidgets3/include/wx/gtk/gauge.h deleted file mode 100644 index 1e6ff39202..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/gauge.h +++ /dev/null @@ -1,80 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/gauge.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_GAUGE_H_ -#define _WX_GTK_GAUGE_H_ - -//----------------------------------------------------------------------------- -// wxGauge -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxGauge: public wxControl -{ -public: - wxGauge() { Init(); } - - wxGauge( wxWindow *parent, - wxWindowID id, - int range, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxGA_HORIZONTAL, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxGaugeNameStr ) - { - Init(); - - Create(parent, id, range, pos, size, style, validator, name); - } - - bool Create( wxWindow *parent, - wxWindowID id, int range, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxGA_HORIZONTAL, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxGaugeNameStr ); - - // determinate mode API - void SetRange( int r ); - void SetValue( int pos ); - - int GetRange() const; - int GetValue() const; - - // indeterminate mode API - virtual void Pulse(); - - bool IsVertical() const { return HasFlag(wxGA_VERTICAL); } - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE; - - // implementation - // ------------- - - // the max and current gauge values - int m_rangeMax, - m_gaugePos; - -protected: - // set the gauge value to the value of m_gaugePos - void DoSetGauge(); - - virtual wxSize DoGetBestSize() const wxOVERRIDE; - -private: - void Init() { m_rangeMax = m_gaugePos = 0; } - - wxDECLARE_DYNAMIC_CLASS(wxGauge); -}; - -#endif - // _WX_GTK_GAUGE_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/glcanvas.h b/Externals/wxWidgets3/include/wx/gtk/glcanvas.h deleted file mode 100644 index f194e60f37..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/glcanvas.h +++ /dev/null @@ -1,130 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/glcanvas.h -// Purpose: wxGLCanvas, for using OpenGL/Mesa with wxWidgets and GTK -// Author: Robert Roebling -// Modified by: -// Created: 17/8/98 -// Copyright: (c) Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GLCANVAS_H_ -#define _WX_GLCANVAS_H_ - -#include "wx/unix/glx11.h" - -//--------------------------------------------------------------------------- -// wxGLCanvas -//--------------------------------------------------------------------------- - -class WXDLLIMPEXP_GL wxGLCanvas : public wxGLCanvasX11 -{ -public: - wxGLCanvas(wxWindow *parent, - const wxGLAttributes& dispAttrs, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxGLCanvasName, - const wxPalette& palette = wxNullPalette); - - wxEXPLICIT // avoid implicitly converting a wxWindow* to wxGLCanvas - wxGLCanvas(wxWindow *parent, - wxWindowID id = wxID_ANY, - const int *attribList = NULL, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxGLCanvasName, - const wxPalette& palette = wxNullPalette); - - bool Create(wxWindow *parent, - const wxGLAttributes& dispAttrs, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxGLCanvasName, - const wxPalette& palette = wxNullPalette); - - bool Create(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxGLCanvasName, - const int *attribList = NULL, - const wxPalette& palette = wxNullPalette); - - virtual bool SetBackgroundStyle(wxBackgroundStyle style) wxOVERRIDE; - - // implement wxGLCanvasX11 methods - // -------------------------------- - - virtual Window GetXWindow() const wxOVERRIDE; - - - // deprecated methods - // ------------------ - -#if WXWIN_COMPATIBILITY_2_8 - wxDEPRECATED( - wxGLCanvas(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxGLCanvasName, - const int *attribList = NULL, - const wxPalette& palette = wxNullPalette) - ); - - wxDEPRECATED( - wxGLCanvas(wxWindow *parent, - const wxGLContext *shared, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxGLCanvasName, - const int *attribList = NULL, - const wxPalette& palette = wxNullPalette) - ); - - wxDEPRECATED( - wxGLCanvas(wxWindow *parent, - const wxGLCanvas *shared, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxGLCanvasName, - const int *attribList = NULL, - const wxPalette& palette = wxNullPalette) - ); - - // called from "realized" callback to create the implicit context if needed - void GTKInitImplicitContext(); -#endif // WXWIN_COMPATIBILITY_2_8 - - // implementation from now on - void OnInternalIdle() wxOVERRIDE; - - bool m_exposed; -#ifdef __WXGTK3__ - cairo_t* m_cairoPaintContext; -#endif - -#if WXWIN_COMPATIBILITY_2_8 - wxGLContext *m_sharedContext; - wxGLCanvas *m_sharedContextOf; - const bool m_createImplicitContext; -#endif // WXWIN_COMPATIBILITY_2_8 - -private: - wxDECLARE_CLASS(wxGLCanvas); -}; - -#endif // _WX_GLCANVAS_H_ - diff --git a/Externals/wxWidgets3/include/wx/gtk/gnome/gvfs.h b/Externals/wxWidgets3/include/wx/gtk/gnome/gvfs.h deleted file mode 100644 index 559f14f569..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/gnome/gvfs.h +++ /dev/null @@ -1,52 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/gnome/gvfs.h -// Author: Robert Roebling -// Purpose: GNOME VFS support -// Created: 17/03/06 -// Copyright: Robert Roebling -// Licence: wxWindows Licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_GVFS_H_ -#define _WX_GTK_GVFS_H_ - -#include "wx/defs.h" - -#if wxUSE_MIMETYPE && wxUSE_LIBGNOMEVFS - -#include "wx/string.h" -#include "wx/unix/mimetype.h" - -//---------------------------------------------------------------------------- -// wxGnomeVFSMimeTypesManagerImpl -//---------------------------------------------------------------------------- - -class wxGnomeVFSMimeTypesManagerImpl: public wxMimeTypesManagerImpl -{ -public: - wxGnomeVFSMimeTypesManagerImpl() { } - -protected: - virtual bool DoAssociation(const wxString& strType, - const wxString& strIcon, - wxMimeTypeCommands *entry, - const wxArrayString& strExtensions, - const wxString& strDesc); -}; - -//---------------------------------------------------------------------------- -// wxGnomeVFSMimeTypesManagerFactory -//---------------------------------------------------------------------------- - -class wxGnomeVFSMimeTypesManagerFactory: public wxMimeTypesManagerFactory -{ -public: - wxGnomeVFSMimeTypesManagerFactory() {} - - virtual wxMimeTypesManagerImpl *CreateMimeTypesManagerImpl(); -}; - -#endif - // wxUSE_MIMETYPE - -#endif diff --git a/Externals/wxWidgets3/include/wx/gtk/hyperlink.h b/Externals/wxWidgets3/include/wx/gtk/hyperlink.h deleted file mode 100644 index 16ea5c02c7..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/hyperlink.h +++ /dev/null @@ -1,93 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/hyperlink.h -// Purpose: Hyperlink control -// Author: Francesco Montorsi -// Modified by: -// Created: 14/2/2007 -// Copyright: (c) 2007 Francesco Montorsi -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTKHYPERLINKCTRL_H_ -#define _WX_GTKHYPERLINKCTRL_H_ - -#include "wx/generic/hyperlink.h" - -#include "wx/scopedptr.h" - -#ifdef __WXGTK3__ -class wxHyperlinkCtrlColData; -#endif - -// ---------------------------------------------------------------------------- -// wxHyperlinkCtrl -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxHyperlinkCtrl : public wxGenericHyperlinkCtrl -{ - typedef wxGenericHyperlinkCtrl base_type; -public: - // Constructors (notice that they can't be defined inline for this class - // because of m_colData which uses incomplete wxHyperlinkCtrlColData). - wxHyperlinkCtrl(); - wxHyperlinkCtrl(wxWindow *parent, - wxWindowID id, - const wxString& label, const wxString& url, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxHL_DEFAULT_STYLE, - const wxString& name = wxHyperlinkCtrlNameStr); - - virtual ~wxHyperlinkCtrl(); - - // Creation function (for two-step construction). - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& label, const wxString& url, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxHL_DEFAULT_STYLE, - const wxString& name = wxHyperlinkCtrlNameStr); - - - // get/set - virtual wxColour GetHoverColour() const wxOVERRIDE; - virtual void SetHoverColour(const wxColour &colour) wxOVERRIDE; - - virtual wxColour GetNormalColour() const wxOVERRIDE; - virtual void SetNormalColour(const wxColour &colour) wxOVERRIDE; - - virtual wxColour GetVisitedColour() const wxOVERRIDE; - virtual void SetVisitedColour(const wxColour &colour) wxOVERRIDE; - - virtual wxString GetURL() const wxOVERRIDE; - virtual void SetURL(const wxString &url) wxOVERRIDE; - - virtual void SetVisited(bool visited = true) wxOVERRIDE; - virtual bool GetVisited() const wxOVERRIDE; - - virtual void SetLabel(const wxString &label) wxOVERRIDE; - -protected: - virtual wxSize DoGetBestSize() const wxOVERRIDE; - virtual wxSize DoGetBestClientSize() const wxOVERRIDE; - - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE; - -private: - enum LinkKind - { - Link_Normal, - Link_Visited - }; - - void DoSetLinkColour(LinkKind linkKind, const wxColour& colour); - -#ifdef __WXGTK3__ - wxScopedPtr m_colData; -#endif - - wxDECLARE_DYNAMIC_CLASS(wxHyperlinkCtrl); -}; - -#endif // _WX_GTKHYPERLINKCTRL_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/infobar.h b/Externals/wxWidgets3/include/wx/gtk/infobar.h deleted file mode 100644 index 26653df2f5..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/infobar.h +++ /dev/null @@ -1,77 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/infobar.h -// Purpose: native implementation of wxInfoBar for GTK+ 2.18 and later -// Author: Vadim Zeitlin -// Created: 2009-09-26 -// Copyright: (c) 2009 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_INFOBAR_H_ -#define _WX_GTK_INFOBAR_H_ - -#include "wx/generic/infobar.h" - -// ---------------------------------------------------------------------------- -// wxInfoBar for GTK+ -// ---------------------------------------------------------------------------- - -// notice that the native GTK+ implementation is only available since -// (relatively recent) 2.18 so we inherit from the generic one to be able to -// fall back to it if GTK+ version is determined to be too old during run-time -class WXDLLIMPEXP_CORE wxInfoBar : public wxInfoBarGeneric -{ -public: - wxInfoBar() { Init(); } - - wxInfoBar(wxWindow *parent, wxWindowID winid = wxID_ANY) - { - Init(); - Create(parent, winid); - } - - bool Create(wxWindow *parent, wxWindowID winid = wxID_ANY); - - virtual ~wxInfoBar(); - - // implement base class methods - // ---------------------------- - - virtual void ShowMessage(const wxString& msg, - int flags = wxICON_INFORMATION) wxOVERRIDE; - - virtual void Dismiss() wxOVERRIDE; - - virtual void AddButton(wxWindowID btnid, - const wxString& label = wxString()) wxOVERRIDE; - - virtual void RemoveButton(wxWindowID btnid) wxOVERRIDE; - - virtual size_t GetButtonCount() const wxOVERRIDE; - virtual wxWindowID GetButtonId(size_t idx) const wxOVERRIDE; - virtual bool HasButtonId(wxWindowID btnid) const wxOVERRIDE; - - // implementation only - // ------------------- - - void GTKResponse(int btnid); - -protected: - virtual void DoApplyWidgetStyle(GtkRcStyle *style) wxOVERRIDE; - -private: - void Init() { m_impl = NULL; } - - // add a button with the given id/label and return its widget - GtkWidget *GTKAddButton(wxWindowID btnid, - const wxString& label = wxString()); - - - // only used when the native implementation is really being used - class wxInfoBarGTKImpl *m_impl; - - wxDECLARE_NO_COPY_CLASS(wxInfoBar); -}; - -#endif // _WX_GTK_INFOBAR_H_ - diff --git a/Externals/wxWidgets3/include/wx/gtk/listbox.h b/Externals/wxWidgets3/include/wx/gtk/listbox.h deleted file mode 100644 index a99dca5c43..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/listbox.h +++ /dev/null @@ -1,137 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/listbox.h -// Purpose: wxListBox class declaration -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_LISTBOX_H_ -#define _WX_GTK_LISTBOX_H_ - -struct _wxTreeEntry; -struct _GtkTreeIter; - -//----------------------------------------------------------------------------- -// wxListBox -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxListBox : public wxListBoxBase -{ -public: - // ctors and such - wxListBox() - { - Init(); - } - wxListBox( wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = (const wxString *) NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxListBoxNameStr ) - { - Init(); - Create(parent, id, pos, size, n, choices, style, validator, name); - } - wxListBox( wxWindow *parent, wxWindowID id, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxListBoxNameStr ) - { - Init(); - Create(parent, id, pos, size, choices, style, validator, name); - } - virtual ~wxListBox(); - - bool Create(wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = (const wxString *) NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxListBoxNameStr); - bool Create(wxWindow *parent, wxWindowID id, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxListBoxNameStr); - - virtual unsigned int GetCount() const wxOVERRIDE; - virtual wxString GetString(unsigned int n) const wxOVERRIDE; - virtual void SetString(unsigned int n, const wxString& s) wxOVERRIDE; - virtual int FindString(const wxString& s, bool bCase = false) const wxOVERRIDE; - - virtual bool IsSelected(int n) const wxOVERRIDE; - virtual int GetSelection() const wxOVERRIDE; - virtual int GetSelections(wxArrayInt& aSelections) const wxOVERRIDE; - - virtual void EnsureVisible(int n) wxOVERRIDE; - - virtual int GetTopItem() const wxOVERRIDE; - - virtual void Update() wxOVERRIDE; - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - // implementation from now on - - virtual GtkWidget *GetConnectWidget() wxOVERRIDE; - - struct _GtkTreeView *m_treeview; - struct _GtkListStore *m_liststore; - -#if wxUSE_CHECKLISTBOX - bool m_hasCheckBoxes; -#endif // wxUSE_CHECKLISTBOX - - struct _wxTreeEntry* GTKGetEntry(unsigned pos) const; - - void GTKDisableEvents(); - void GTKEnableEvents(); - - void GTKOnSelectionChanged(); - void GTKOnActivated(int item); - -protected: - virtual void DoClear() wxOVERRIDE; - virtual void DoDeleteOneItem(unsigned int n) wxOVERRIDE; - virtual wxSize DoGetBestSize() const wxOVERRIDE; - virtual void DoApplyWidgetStyle(GtkRcStyle *style) wxOVERRIDE; - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE; - - virtual void DoSetSelection(int n, bool select) wxOVERRIDE; - - virtual int DoInsertItems(const wxArrayStringsAdapter& items, - unsigned int pos, - void **clientData, wxClientDataType type) wxOVERRIDE; - virtual int DoInsertOneItem(const wxString& item, unsigned int pos) wxOVERRIDE; - - virtual void DoSetFirstItem(int n) wxOVERRIDE; - virtual void DoSetItemClientData(unsigned int n, void* clientData) wxOVERRIDE; - virtual void* DoGetItemClientData(unsigned int n) const wxOVERRIDE; - virtual int DoListHitTest(const wxPoint& point) const wxOVERRIDE; - - // get the iterator for the given index, returns false if invalid - bool GTKGetIteratorFor(unsigned pos, _GtkTreeIter *iter) const; - - // get the index for the given iterator, return wxNOT_FOUND on failure - int GTKGetIndexFor(_GtkTreeIter& iter) const; - - // common part of DoSetFirstItem() and EnsureVisible() - void DoScrollToCell(int n, float alignY, float alignX); - -private: - void Init(); //common construction - - wxDECLARE_DYNAMIC_CLASS(wxListBox); -}; - -#endif // _WX_GTK_LISTBOX_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/mdi.h b/Externals/wxWidgets3/include/wx/gtk/mdi.h deleted file mode 100644 index 013c5cf878..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/mdi.h +++ /dev/null @@ -1,153 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/mdi.h -// Purpose: TDI-based MDI implementation for wxGTK -// Author: Robert Roebling -// Modified by: 2008-10-31 Vadim Zeitlin: derive from the base classes -// Copyright: (c) 1998 Robert Roebling -// (c) 2008 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_MDI_H_ -#define _WX_GTK_MDI_H_ - -#include "wx/frame.h" - -class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame; -class WXDLLIMPEXP_FWD_CORE wxMDIClientWindow; - -typedef struct _GtkNotebook GtkNotebook; - -//----------------------------------------------------------------------------- -// wxMDIParentFrame -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxMDIParentFrame : public wxMDIParentFrameBase -{ -public: - wxMDIParentFrame() { Init(); } - wxMDIParentFrame(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL, - const wxString& name = wxFrameNameStr) - { - Init(); - - (void)Create(parent, id, title, pos, size, style, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL, - const wxString& name = wxFrameNameStr); - - // we don't store the active child in m_currentChild unlike the base class - // version so override this method to find it dynamically - virtual wxMDIChildFrame *GetActiveChild() const wxOVERRIDE; - - // implement base class pure virtuals - // ---------------------------------- - - virtual void ActivateNext() wxOVERRIDE; - virtual void ActivatePrevious() wxOVERRIDE; - - static bool IsTDI() { return true; } - - // implementation - - bool m_justInserted; - - virtual void OnInternalIdle() wxOVERRIDE; - -protected: - virtual void DoGetClientSize(int* width, int* height) const wxOVERRIDE; - -private: - friend class wxMDIChildFrame; - void Init(); - - wxDECLARE_DYNAMIC_CLASS(wxMDIParentFrame); -}; - -//----------------------------------------------------------------------------- -// wxMDIChildFrame -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxMDIChildFrame : public wxTDIChildFrame -{ -public: - wxMDIChildFrame() { Init(); } - wxMDIChildFrame(wxMDIParentFrame *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr) - { - Init(); - - Create(parent, id, title, pos, size, style, name); - } - - bool Create(wxMDIParentFrame *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr); - - virtual ~wxMDIChildFrame(); - - virtual void SetMenuBar( wxMenuBar *menu_bar ) wxOVERRIDE; - virtual wxMenuBar *GetMenuBar() const wxOVERRIDE; - - virtual void Activate() wxOVERRIDE; - - virtual void SetTitle(const wxString& title) wxOVERRIDE; - - // implementation - - void OnActivate( wxActivateEvent& event ); - void OnMenuHighlight( wxMenuEvent& event ); - virtual void GTKHandleRealized() wxOVERRIDE; - - wxMenuBar *m_menuBar; - bool m_justInserted; - -private: - void Init(); - - GtkNotebook *GTKGetNotebook() const; - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_DYNAMIC_CLASS(wxMDIChildFrame); -}; - -//----------------------------------------------------------------------------- -// wxMDIClientWindow -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxMDIClientWindow : public wxMDIClientWindowBase -{ -public: - wxMDIClientWindow() { } - ~wxMDIClientWindow(); - - virtual bool CreateClient(wxMDIParentFrame *parent, - long style = wxVSCROLL | wxHSCROLL) wxOVERRIDE; - -private: - virtual void AddChildGTK(wxWindowGTK* child) wxOVERRIDE; - - wxDECLARE_DYNAMIC_CLASS(wxMDIClientWindow); -}; - -#endif // _WX_GTK_MDI_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/menu.h b/Externals/wxWidgets3/include/wx/gtk/menu.h deleted file mode 100644 index 49126e5583..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/menu.h +++ /dev/null @@ -1,110 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/menu.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling, Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTKMENU_H_ -#define _WX_GTKMENU_H_ - -//----------------------------------------------------------------------------- -// wxMenuBar -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxMenuBar : public wxMenuBarBase -{ -public: - // ctors - wxMenuBar(); - wxMenuBar(long style); - wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style = 0); - ~wxMenuBar(); - - // implement base class (pure) virtuals - virtual bool Append( wxMenu *menu, const wxString &title ) wxOVERRIDE; - virtual bool Insert(size_t pos, wxMenu *menu, const wxString& title) wxOVERRIDE; - virtual wxMenu *Replace(size_t pos, wxMenu *menu, const wxString& title) wxOVERRIDE; - virtual wxMenu *Remove(size_t pos) wxOVERRIDE; - - virtual int FindMenuItem(const wxString& menuString, - const wxString& itemString) const wxOVERRIDE; - virtual wxMenuItem* FindItem( int id, wxMenu **menu = NULL ) const wxOVERRIDE; - - virtual void EnableTop( size_t pos, bool flag ) wxOVERRIDE; - virtual bool IsEnabledTop(size_t pos) const wxOVERRIDE; - virtual void SetMenuLabel( size_t pos, const wxString& label ) wxOVERRIDE; - virtual wxString GetMenuLabel( size_t pos ) const wxOVERRIDE; - - void SetLayoutDirection(wxLayoutDirection dir) wxOVERRIDE; - wxLayoutDirection GetLayoutDirection() const wxOVERRIDE; - - virtual void Attach(wxFrame *frame) wxOVERRIDE; - virtual void Detach() wxOVERRIDE; - -private: - // common part of Append and Insert - void GtkAppend(wxMenu* menu, const wxString& title, int pos = -1); - - void Init(size_t n, wxMenu *menus[], const wxString titles[], long style); - - // wxMenuBar is not a top level window but it still doesn't need a parent - // window - virtual bool GTKNeedsParent() const wxOVERRIDE { return false; } - - GtkWidget* m_menubar; - - wxDECLARE_DYNAMIC_CLASS(wxMenuBar); -}; - -//----------------------------------------------------------------------------- -// wxMenu -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxMenu : public wxMenuBase -{ -public: - // ctors & dtor - wxMenu(const wxString& title, long style = 0) - : wxMenuBase(title, style) { Init(); } - - wxMenu(long style = 0) : wxMenuBase(style) { Init(); } - - virtual ~wxMenu(); - - void Attach(wxMenuBarBase *menubar) wxOVERRIDE; - - void SetLayoutDirection(wxLayoutDirection dir); - wxLayoutDirection GetLayoutDirection() const; - - // Returns the title, with mnemonics translated to wx format - wxString GetTitle() const; - - // Sets the title, with mnemonics translated to gtk format - virtual void SetTitle(const wxString& title) wxOVERRIDE; - - // implementation GTK only - GtkWidget *m_menu; // GtkMenu - GtkWidget *m_owner; - GtkAccelGroup *m_accel; - bool m_popupShown; - -protected: - virtual wxMenuItem* DoAppend(wxMenuItem *item) wxOVERRIDE; - virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item) wxOVERRIDE; - virtual wxMenuItem* DoRemove(wxMenuItem *item) wxOVERRIDE; - -private: - // common code for all constructors: - void Init(); - - // common part of Append (if pos == -1) and Insert - void GtkAppend(wxMenuItem* item, int pos = -1); - - - wxDECLARE_DYNAMIC_CLASS(wxMenu); -}; - -#endif - // _WX_GTKMENU_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/menuitem.h b/Externals/wxWidgets3/include/wx/gtk/menuitem.h deleted file mode 100644 index 376959b32e..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/menuitem.h +++ /dev/null @@ -1,61 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/menuitem.h -// Purpose: wxMenuItem class -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTKMENUITEM_H_ -#define _WX_GTKMENUITEM_H_ - -#include "wx/bitmap.h" - -//----------------------------------------------------------------------------- -// wxMenuItem -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxMenuItem : public wxMenuItemBase -{ -public: - wxMenuItem(wxMenu *parentMenu = NULL, - int id = wxID_SEPARATOR, - const wxString& text = wxEmptyString, - const wxString& help = wxEmptyString, - wxItemKind kind = wxITEM_NORMAL, - wxMenu *subMenu = NULL); - virtual ~wxMenuItem(); - - // implement base class virtuals - virtual void SetItemLabel( const wxString& str ) wxOVERRIDE; - virtual void Enable( bool enable = true ) wxOVERRIDE; - virtual void Check( bool check = true ) wxOVERRIDE; - virtual bool IsChecked() const wxOVERRIDE; - virtual void SetBitmap(const wxBitmap& bitmap); - virtual const wxBitmap& GetBitmap() const { return m_bitmap; } - - // implementation - void SetMenuItem(GtkWidget *menuItem); - GtkWidget *GetMenuItem() const { return m_menuItem; } - void SetGtkLabel(); - -#if WXWIN_COMPATIBILITY_2_8 - // compatibility only, don't use in new code - wxDEPRECATED_CONSTRUCTOR( - wxMenuItem(wxMenu *parentMenu, - int id, - const wxString& text, - const wxString& help, - bool isCheckable, - wxMenu *subMenu = NULL) - ); -#endif - -private: - wxBitmap m_bitmap; // Bitmap for menuitem, if any - GtkWidget *m_menuItem; // GtkMenuItem - - wxDECLARE_DYNAMIC_CLASS(wxMenuItem); -}; - -#endif // _WX_GTKMENUITEM_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/minifram.h b/Externals/wxWidgets3/include/wx/gtk/minifram.h deleted file mode 100644 index 57a6f28c3a..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/minifram.h +++ /dev/null @@ -1,63 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/minifram.h -// Purpose: wxMiniFrame class -// Author: Robert Roebling -// Copyright: (c) Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_MINIFRAME_H_ -#define _WX_GTK_MINIFRAME_H_ - -#include "wx/bitmap.h" -#include "wx/frame.h" - -//----------------------------------------------------------------------------- -// wxMiniFrame -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxMiniFrame: public wxFrame -{ - wxDECLARE_DYNAMIC_CLASS(wxMiniFrame); - -public: - wxMiniFrame() {} - wxMiniFrame(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxCAPTION | wxRESIZE_BORDER, - const wxString& name = wxFrameNameStr) - { - Create(parent, id, title, pos, size, style, name); - } - ~wxMiniFrame(); - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxCAPTION | wxRESIZE_BORDER, - const wxString& name = wxFrameNameStr); - - virtual void SetTitle( const wxString &title ) wxOVERRIDE; - -protected: - virtual void DoSetSizeHints( int minW, int minH, - int maxW, int maxH, - int incW, int incH ) wxOVERRIDE; - virtual void DoGetClientSize(int* width, int* height) const wxOVERRIDE; - - // implementation -public: - bool m_isDragging; - int m_oldX,m_oldY; - int m_diffX,m_diffY; - wxBitmap m_closeButton; - int m_miniEdge; - int m_miniTitle; -}; - -#endif // _WX_GTK_MINIFRAME_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/msgdlg.h b/Externals/wxWidgets3/include/wx/gtk/msgdlg.h deleted file mode 100644 index 5a55f32a50..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/msgdlg.h +++ /dev/null @@ -1,51 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/msgdlg.h -// Purpose: wxMessageDialog for GTK+2 -// Author: Vaclav Slavik -// Modified by: -// Created: 2003/02/28 -// Copyright: (c) Vaclav Slavik, 2003 -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_MSGDLG_H_ -#define _WX_GTK_MSGDLG_H_ - -class WXDLLIMPEXP_CORE wxMessageDialog : public wxMessageDialogBase -{ -public: - wxMessageDialog(wxWindow *parent, const wxString& message, - const wxString& caption = wxMessageBoxCaptionStr, - long style = wxOK|wxCENTRE, - const wxPoint& pos = wxDefaultPosition); - - virtual int ShowModal() wxOVERRIDE; - virtual bool Show(bool WXUNUSED(show) = true) wxOVERRIDE { return false; } - -protected: - // implement some base class methods to do nothing to avoid asserts and - // GTK warnings, since this is not a real wxDialog. - virtual void DoSetSize(int WXUNUSED(x), int WXUNUSED(y), - int WXUNUSED(width), int WXUNUSED(height), - int WXUNUSED(sizeFlags) = wxSIZE_AUTO) wxOVERRIDE {} - virtual void DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y), - int WXUNUSED(width), int WXUNUSED(height)) wxOVERRIDE {} - // override to convert wx mnemonics to GTK+ ones and handle stock ids - virtual void DoSetCustomLabel(wxString& var, const ButtonLabel& label) wxOVERRIDE; - -private: - // override to use stock GTK+ defaults instead of just string ones - virtual wxString GetDefaultYesLabel() const wxOVERRIDE; - virtual wxString GetDefaultNoLabel() const wxOVERRIDE; - virtual wxString GetDefaultOKLabel() const wxOVERRIDE; - virtual wxString GetDefaultCancelLabel() const wxOVERRIDE; - virtual wxString GetDefaultHelpLabel() const wxOVERRIDE; - - // create the real GTK+ dialog: this is done from ShowModal() to allow - // changing the message between constructing the dialog and showing it - void GTKCreateMsgDialog(); - - wxDECLARE_DYNAMIC_CLASS(wxMessageDialog); -}; - -#endif // _WX_GTK_MSGDLG_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/nonownedwnd.h b/Externals/wxWidgets3/include/wx/gtk/nonownedwnd.h deleted file mode 100644 index bc4687b5c5..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/nonownedwnd.h +++ /dev/null @@ -1,43 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/nonownedwnd.h -// Purpose: wxGTK-specific wxNonOwnedWindow declaration. -// Author: Vadim Zeitlin -// Created: 2011-10-12 -// Copyright: (c) 2011 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_NONOWNEDWND_H_ -#define _WX_GTK_NONOWNEDWND_H_ - -class wxNonOwnedWindowShapeImpl; - -// ---------------------------------------------------------------------------- -// wxNonOwnedWindow contains code common to wx{Popup,TopLevel}Window in wxGTK. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxNonOwnedWindow : public wxNonOwnedWindowBase -{ -public: - wxNonOwnedWindow() { m_shapeImpl = NULL; } - virtual ~wxNonOwnedWindow(); - - // Overridden to actually set the shape when the window becomes realized. - virtual void GTKHandleRealized() wxOVERRIDE; - -protected: - virtual bool DoClearShape() wxOVERRIDE; - virtual bool DoSetRegionShape(const wxRegion& region) wxOVERRIDE; -#if wxUSE_GRAPHICS_CONTEXT - virtual bool DoSetPathShape(const wxGraphicsPath& path) wxOVERRIDE; -#endif // wxUSE_GRAPHICS_CONTEXT - - -private: - // If non-NULL, contains information about custom window shape. - wxNonOwnedWindowShapeImpl* m_shapeImpl; - - wxDECLARE_NO_COPY_CLASS(wxNonOwnedWindow); -}; - -#endif // _WX_GTK_NONOWNEDWND_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/notebook.h b/Externals/wxWidgets3/include/wx/gtk/notebook.h deleted file mode 100644 index 395927cc69..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/notebook.h +++ /dev/null @@ -1,144 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/notebook.h -// Purpose: wxNotebook class -// Author: Robert Roebling -// Modified by: -// Copyright: (c) Julian Smart and Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTKNOTEBOOK_H_ -#define _WX_GTKNOTEBOOK_H_ - -//----------------------------------------------------------------------------- -// internal class -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxGtkNotebookPage; - -#include "wx/list.h" -WX_DECLARE_LIST(wxGtkNotebookPage, wxGtkNotebookPagesList); - -//----------------------------------------------------------------------------- -// wxNotebook -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxNotebook : public wxNotebookBase -{ -public: - // default for dynamic class - wxNotebook(); - // the same arguments as for wxControl - wxNotebook(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxNotebookNameStr); - // Create() function - bool Create(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxNotebookNameStr); - // dtor - virtual ~wxNotebook(); - - // accessors - // --------- - - // set the currently selected page, return the index of the previously - // selected one (or wxNOT_FOUND on error) - // NB: this function will _not_ generate wxEVT_NOTEBOOK_PAGE_xxx events - int SetSelection(size_t nPage) wxOVERRIDE { return DoSetSelection(nPage, SetSelection_SendEvent); } - // get the currently selected page - int GetSelection() const wxOVERRIDE; - - // changes selected page without sending events - int ChangeSelection(size_t nPage) wxOVERRIDE { return DoSetSelection(nPage); } - - // set/get the title of a page - bool SetPageText(size_t nPage, const wxString& strText) wxOVERRIDE; - wxString GetPageText(size_t nPage) const wxOVERRIDE; - - // sets/returns item's image index in the current image list - int GetPageImage(size_t nPage) const wxOVERRIDE; - bool SetPageImage(size_t nPage, int nImage) wxOVERRIDE; - - // control the appearance of the notebook pages - // set the padding between tabs (in pixels) - void SetPadding(const wxSize& padding) wxOVERRIDE; - // sets the size of the tabs (assumes all tabs are the same size) - void SetTabSize(const wxSize& sz) wxOVERRIDE; - - // geometry - virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const wxOVERRIDE; - virtual int HitTest(const wxPoint& pt, long *flags = NULL) const wxOVERRIDE; - - // operations - // ---------- - // remove all pages - bool DeleteAllPages() wxOVERRIDE; - - // adds a new page to the notebook (it will be deleted by the notebook, - // don't delete it yourself). If bSelect, this page becomes active. - // the same as AddPage(), but adds it at the specified position - bool InsertPage( size_t position, - wxNotebookPage *win, - const wxString& strText, - bool bSelect = false, - int imageId = NO_IMAGE ) wxOVERRIDE; - - // handler for tab navigation - // -------------------------- - void OnNavigationKey(wxNavigationKeyEvent& event); - - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - // implementation - // -------------- - -#if wxUSE_CONSTRAINTS - void SetConstraintSizes(bool recurse) wxOVERRIDE; - bool DoPhase(int phase) wxOVERRIDE; -#endif - - // Called by GTK event handler when the current page is definitely changed. - void GTKOnPageChanged(); - - // helper function - wxGtkNotebookPage* GetNotebookPage(int page) const; - - // the additional page data (the pages themselves are in m_pages array) - wxGtkNotebookPagesList m_pagesData; - - // we need to store the old selection since there - // is no other way to know about it at the time - // of the change selection event - int m_oldSelection; - -protected: - // set all page's attributes - virtual void DoApplyWidgetStyle(GtkRcStyle *style) wxOVERRIDE; - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE; - - // remove one page from the notebook but do not destroy it - virtual wxNotebookPage *DoRemovePage(size_t nPage) wxOVERRIDE; - - int DoSetSelection(size_t nPage, int flags = 0) wxOVERRIDE; - -private: - // the padding set by SetPadding() - int m_padding; - - void Init(); - virtual void AddChildGTK(wxWindowGTK* child) wxOVERRIDE; - - wxDECLARE_DYNAMIC_CLASS(wxNotebook); - wxDECLARE_EVENT_TABLE(); -}; - -#endif // _WX_GTKNOTEBOOK_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/pen.h b/Externals/wxWidgets3/include/wx/gtk/pen.h deleted file mode 100644 index 40f809b5ef..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/pen.h +++ /dev/null @@ -1,63 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/pen.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_PEN_H_ -#define _WX_GTK_PEN_H_ - -typedef signed char wxGTKDash; - -//----------------------------------------------------------------------------- -// wxPen -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxPen: public wxPenBase -{ -public: - wxPen() { } - - wxPen( const wxColour &colour, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID ); - - virtual ~wxPen(); - - bool operator==(const wxPen& pen) const; - bool operator!=(const wxPen& pen) const { return !(*this == pen); } - - void SetColour( const wxColour &colour ) wxOVERRIDE; - void SetColour( unsigned char red, unsigned char green, unsigned char blue ) wxOVERRIDE; - void SetCap( wxPenCap capStyle ) wxOVERRIDE; - void SetJoin( wxPenJoin joinStyle ) wxOVERRIDE; - void SetStyle( wxPenStyle style ) wxOVERRIDE; - void SetWidth( int width ) wxOVERRIDE; - void SetDashes( int number_of_dashes, const wxDash *dash ) wxOVERRIDE; - void SetStipple(const wxBitmap& stipple) wxOVERRIDE; - - wxColour GetColour() const wxOVERRIDE; - wxPenCap GetCap() const wxOVERRIDE; - wxPenJoin GetJoin() const wxOVERRIDE; - wxPenStyle GetStyle() const wxOVERRIDE; - int GetWidth() const wxOVERRIDE; - int GetDashes(wxDash **ptr) const wxOVERRIDE; - int GetDashCount() const; - wxDash* GetDash() const; - wxBitmap *GetStipple() const wxOVERRIDE; - - - wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants") - wxPen(const wxColour& col, int width, int style); - - wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants") - void SetStyle(int style) { SetStyle((wxPenStyle)style); } - -protected: - virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE; - - wxDECLARE_DYNAMIC_CLASS(wxPen); -}; - -#endif // _WX_GTK_PEN_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/popupwin.h b/Externals/wxWidgets3/include/wx/gtk/popupwin.h deleted file mode 100644 index 566a7c05b4..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/popupwin.h +++ /dev/null @@ -1,50 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/popupwin.h -// Purpose: -// Author: Robert Roebling -// Created: -// Copyright: (c) 2001 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_POPUPWIN_H_ -#define _WX_GTK_POPUPWIN_H_ - -//----------------------------------------------------------------------------- -// wxPopUpWindow -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxPopupWindow: public wxPopupWindowBase -{ -public: - wxPopupWindow() { } - virtual ~wxPopupWindow(); - - wxPopupWindow(wxWindow *parent, int flags = wxBORDER_NONE) - { (void)Create(parent, flags); } - bool Create(wxWindow *parent, int flags = wxBORDER_NONE); - - virtual bool Show(bool show = true) wxOVERRIDE; - - virtual void SetFocus() wxOVERRIDE; - - // implementation - // -------------- - - // GTK time when connecting to button_press signal - wxUint32 m_time; - -protected: - virtual void DoSetSize(int x, int y, - int width, int height, - int sizeFlags = wxSIZE_AUTO) wxOVERRIDE; - - virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE; - -#ifdef __WXUNIVERSAL__ - wxDECLARE_EVENT_TABLE(); -#endif - wxDECLARE_DYNAMIC_CLASS(wxPopupWindow); -}; - -#endif // _WX_GTK_POPUPWIN_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/print.h b/Externals/wxWidgets3/include/wx/gtk/print.h deleted file mode 100644 index b01b3cd524..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/print.h +++ /dev/null @@ -1,354 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/print.h -// Author: Anthony Bretaudeau -// Purpose: GTK printing support -// Created: 2007-08-25 -// Copyright: (c) Anthony Bretaudeau -// Licence: wxWindows Licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_PRINT_H_ -#define _WX_GTK_PRINT_H_ - -#include "wx/defs.h" - -#if wxUSE_GTKPRINT - -#include "wx/print.h" -#include "wx/printdlg.h" -#include "wx/prntbase.h" -#include "wx/dc.h" - -typedef struct _GtkPrintOperation GtkPrintOperation; -typedef struct _GtkPrintContext GtkPrintContext; -typedef struct _GtkPrintSettings GtkPrintSettings; -typedef struct _GtkPageSetup GtkPageSetup; - -typedef struct _cairo cairo_t; - -//---------------------------------------------------------------------------- -// wxGtkPrintFactory -//---------------------------------------------------------------------------- - -class wxGtkPrintFactory: public wxPrintFactory -{ -public: - virtual wxPrinterBase *CreatePrinter( wxPrintDialogData *data ) wxOVERRIDE; - - virtual wxPrintPreviewBase *CreatePrintPreview( wxPrintout *preview, - wxPrintout *printout = NULL, - wxPrintDialogData *data = NULL ) wxOVERRIDE; - virtual wxPrintPreviewBase *CreatePrintPreview( wxPrintout *preview, - wxPrintout *printout, - wxPrintData *data ) wxOVERRIDE; - - virtual wxPrintDialogBase *CreatePrintDialog( wxWindow *parent, - wxPrintDialogData *data = NULL ) wxOVERRIDE; - virtual wxPrintDialogBase *CreatePrintDialog( wxWindow *parent, - wxPrintData *data ) wxOVERRIDE; - - virtual wxPageSetupDialogBase *CreatePageSetupDialog( wxWindow *parent, - wxPageSetupDialogData * data = NULL ) wxOVERRIDE; - - virtual wxDCImpl* CreatePrinterDCImpl( wxPrinterDC *owner, const wxPrintData& data ) wxOVERRIDE; - - virtual bool HasPrintSetupDialog() wxOVERRIDE; - virtual wxDialog *CreatePrintSetupDialog( wxWindow *parent, wxPrintData *data ) wxOVERRIDE; - virtual bool HasOwnPrintToFile() wxOVERRIDE; - virtual bool HasPrinterLine() wxOVERRIDE; - virtual wxString CreatePrinterLine() wxOVERRIDE; - virtual bool HasStatusLine() wxOVERRIDE; - virtual wxString CreateStatusLine() wxOVERRIDE; - - virtual wxPrintNativeDataBase *CreatePrintNativeData() wxOVERRIDE; -}; - -//---------------------------------------------------------------------------- -// wxGtkPrintDialog -//---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxGtkPrintDialog: public wxPrintDialogBase -{ -public: - wxGtkPrintDialog( wxWindow *parent, - wxPrintDialogData* data = NULL ); - wxGtkPrintDialog( wxWindow *parent, wxPrintData* data); - virtual ~wxGtkPrintDialog(); - - wxPrintData& GetPrintData() wxOVERRIDE - { return m_printDialogData.GetPrintData(); } - wxPrintDialogData& GetPrintDialogData() wxOVERRIDE - { return m_printDialogData; } - - wxDC *GetPrintDC() wxOVERRIDE { return m_dc; } - void SetPrintDC(wxDC * printDC) { m_dc = printDC; } - - virtual int ShowModal() wxOVERRIDE; - - virtual bool Validate() wxOVERRIDE { return true; } - virtual bool TransferDataToWindow() wxOVERRIDE { return true; } - virtual bool TransferDataFromWindow() wxOVERRIDE { return true; } - - void SetShowDialog(bool show) { m_showDialog = show; } - bool GetShowDialog() { return m_showDialog; } - -protected: - // Implement some base class methods to do nothing to avoid asserts and - // GTK warnings, since this is not a real wxDialog. - virtual void DoSetSize(int WXUNUSED(x), int WXUNUSED(y), - int WXUNUSED(width), int WXUNUSED(height), - int WXUNUSED(sizeFlags) = wxSIZE_AUTO) wxOVERRIDE {} - virtual void DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y), - int WXUNUSED(width), int WXUNUSED(height)) wxOVERRIDE {} - -private: - wxPrintDialogData m_printDialogData; - wxWindow *m_parent; - bool m_showDialog; - wxDC *m_dc; - - wxDECLARE_DYNAMIC_CLASS(wxGtkPrintDialog); -}; - -//---------------------------------------------------------------------------- -// wxGtkPageSetupDialog -//---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxGtkPageSetupDialog: public wxPageSetupDialogBase -{ -public: - wxGtkPageSetupDialog( wxWindow *parent, - wxPageSetupDialogData* data = NULL ); - virtual ~wxGtkPageSetupDialog(); - - virtual wxPageSetupDialogData& GetPageSetupDialogData() wxOVERRIDE { return m_pageDialogData; } - - virtual int ShowModal() wxOVERRIDE; - - virtual bool Validate() wxOVERRIDE { return true; } - virtual bool TransferDataToWindow() wxOVERRIDE { return true; } - virtual bool TransferDataFromWindow() wxOVERRIDE { return true; } - -protected: - // Implement some base class methods to do nothing to avoid asserts and - // GTK warnings, since this is not a real wxDialog. - virtual void DoSetSize(int WXUNUSED(x), int WXUNUSED(y), - int WXUNUSED(width), int WXUNUSED(height), - int WXUNUSED(sizeFlags) = wxSIZE_AUTO) wxOVERRIDE {} - virtual void DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y), - int WXUNUSED(width), int WXUNUSED(height)) wxOVERRIDE {} - -private: - wxPageSetupDialogData m_pageDialogData; - wxWindow *m_parent; - - wxDECLARE_DYNAMIC_CLASS(wxGtkPageSetupDialog); -}; - -//---------------------------------------------------------------------------- -// wxGtkPrinter -//---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxGtkPrinter : public wxPrinterBase -{ -public: - wxGtkPrinter(wxPrintDialogData *data = NULL); - virtual ~wxGtkPrinter(); - - virtual bool Print(wxWindow *parent, - wxPrintout *printout, - bool prompt = true) wxOVERRIDE; - virtual wxDC* PrintDialog(wxWindow *parent) wxOVERRIDE; - virtual bool Setup(wxWindow *parent) wxOVERRIDE; - - GtkPrintContext *GetPrintContext() { return m_gpc; } - void SetPrintContext(GtkPrintContext *context) {m_gpc = context;} - void BeginPrint(wxPrintout *printout, GtkPrintOperation *operation, GtkPrintContext *context); - void DrawPage(wxPrintout *printout, GtkPrintOperation *operation, GtkPrintContext *context, int page_nr); - -private: - GtkPrintContext *m_gpc; - wxDC *m_dc; - - wxDECLARE_DYNAMIC_CLASS(wxGtkPrinter); - wxDECLARE_NO_COPY_CLASS(wxGtkPrinter); -}; - -//---------------------------------------------------------------------------- -// wxGtkPrintNativeData -//---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxGtkPrintNativeData : public wxPrintNativeDataBase -{ -public: - wxGtkPrintNativeData(); - virtual ~wxGtkPrintNativeData(); - - virtual bool TransferTo( wxPrintData &data ) wxOVERRIDE; - virtual bool TransferFrom( const wxPrintData &data ) wxOVERRIDE; - - virtual bool Ok() const wxOVERRIDE { return IsOk(); } - virtual bool IsOk() const wxOVERRIDE { return true; } - - GtkPrintSettings* GetPrintConfig() { return m_config; } - void SetPrintConfig( GtkPrintSettings * config ); - - GtkPrintOperation* GetPrintJob() { return m_job; } - void SetPrintJob(GtkPrintOperation *job) { m_job = job; } - - GtkPrintContext *GetPrintContext() { return m_context; } - void SetPrintContext(GtkPrintContext *context) {m_context = context; } - - - GtkPageSetup* GetPageSetupFromSettings(GtkPrintSettings* settings); - void SetPageSetupToSettings(GtkPrintSettings* settings, GtkPageSetup* page_setup); - -private: - // NB: m_config is created and owned by us, but the other objects are not - // and their accessors don't change their ref count. - GtkPrintSettings *m_config; - GtkPrintOperation *m_job; - GtkPrintContext *m_context; - - wxDECLARE_DYNAMIC_CLASS(wxGtkPrintNativeData); -}; - -//----------------------------------------------------------------------------- -// wxGtkPrinterDC -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxGtkPrinterDCImpl : public wxDCImpl -{ -public: - wxGtkPrinterDCImpl( wxPrinterDC *owner, const wxPrintData& data ); - virtual ~wxGtkPrinterDCImpl(); - - bool Ok() const { return IsOk(); } - bool IsOk() const wxOVERRIDE; - - virtual void* GetCairoContext() const wxOVERRIDE; - virtual void* GetHandle() const wxOVERRIDE; - - bool CanDrawBitmap() const wxOVERRIDE { return true; } - void Clear() wxOVERRIDE; - void SetFont( const wxFont& font ) wxOVERRIDE; - void SetPen( const wxPen& pen ) wxOVERRIDE; - void SetBrush( const wxBrush& brush ) wxOVERRIDE; - void SetLogicalFunction( wxRasterOperationMode function ) wxOVERRIDE; - void SetBackground( const wxBrush& brush ) wxOVERRIDE; - void DestroyClippingRegion() wxOVERRIDE; - bool StartDoc(const wxString& message) wxOVERRIDE; - void EndDoc() wxOVERRIDE; - void StartPage() wxOVERRIDE; - void EndPage() wxOVERRIDE; - wxCoord GetCharHeight() const wxOVERRIDE; - wxCoord GetCharWidth() const wxOVERRIDE; - bool CanGetTextExtent() const wxOVERRIDE { return true; } - wxSize GetPPI() const wxOVERRIDE; - virtual int GetDepth() const wxOVERRIDE { return 24; } - void SetBackgroundMode(int mode) wxOVERRIDE; - void SetPalette(const wxPalette& WXUNUSED(palette)) wxOVERRIDE { } - void SetResolution(int ppi); - - // overridden for wxPrinterDC Impl - virtual int GetResolution() const wxOVERRIDE; - virtual wxRect GetPaperRect() const wxOVERRIDE; - -protected: - bool DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col, - wxFloodFillStyle style=wxFLOOD_SURFACE ) wxOVERRIDE; - void DoGradientFillConcentric(const wxRect& rect, const wxColour& initialColour, const wxColour& destColour, const wxPoint& circleCenter) wxOVERRIDE; - void DoGradientFillLinear(const wxRect& rect, const wxColour& initialColour, const wxColour& destColour, wxDirection nDirection = wxEAST) wxOVERRIDE; - bool DoGetPixel(wxCoord x1, wxCoord y1, wxColour *col) const wxOVERRIDE; - void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) wxOVERRIDE; - void DoCrossHair(wxCoord x, wxCoord y) wxOVERRIDE; - void DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2,wxCoord xc,wxCoord yc) wxOVERRIDE; - void DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea) wxOVERRIDE; - void DoDrawPoint(wxCoord x, wxCoord y) wxOVERRIDE; - void DoDrawLines(int n, const wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0) wxOVERRIDE; - void DoDrawPolygon(int n, const wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0, wxPolygonFillMode fillStyle=wxODDEVEN_RULE) wxOVERRIDE; - void DoDrawPolyPolygon(int n, const int count[], const wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0, wxPolygonFillMode fillStyle=wxODDEVEN_RULE) wxOVERRIDE; - void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) wxOVERRIDE; - void DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius = 20.0) wxOVERRIDE; - void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) wxOVERRIDE; -#if wxUSE_SPLINES - void DoDrawSpline(const wxPointList *points) wxOVERRIDE; -#endif - bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, - wxDC *source, wxCoord xsrc, wxCoord ysrc, - wxRasterOperationMode rop = wxCOPY, bool useMask = false, - wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord) wxOVERRIDE; - void DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y ) wxOVERRIDE; - void DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool useMask = false ) wxOVERRIDE; - void DoDrawText(const wxString& text, wxCoord x, wxCoord y ) wxOVERRIDE; - void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle) wxOVERRIDE; - void DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height) wxOVERRIDE; - void DoSetDeviceClippingRegion( const wxRegion &WXUNUSED(clip) ) wxOVERRIDE - { - wxFAIL_MSG( "not implemented" ); - } - void DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y, - wxCoord *descent = NULL, - wxCoord *externalLeading = NULL, - const wxFont *theFont = NULL ) const wxOVERRIDE; - void DoGetSize(int* width, int* height) const wxOVERRIDE; - void DoGetSizeMM(int *width, int *height) const wxOVERRIDE; - - wxPrintData& GetPrintData() { return m_printData; } - void SetPrintData(const wxPrintData& data); - -private: - wxPrintData m_printData; - PangoContext *m_context; - PangoLayout *m_layout; - PangoFontDescription *m_fontdesc; - cairo_t *m_cairo; - - unsigned char m_currentRed; - unsigned char m_currentGreen; - unsigned char m_currentBlue; - unsigned char m_currentAlpha; - - GtkPrintContext *m_gpc; - int m_resolution; - double m_PS2DEV; - double m_DEV2PS; - - wxDECLARE_DYNAMIC_CLASS(wxGtkPrinterDCImpl); - wxDECLARE_NO_COPY_CLASS(wxGtkPrinterDCImpl); -}; - -// ---------------------------------------------------------------------------- -// wxGtkPrintPreview: programmer creates an object of this class to preview a -// wxPrintout. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxGtkPrintPreview : public wxPrintPreviewBase -{ -public: - wxGtkPrintPreview(wxPrintout *printout, - wxPrintout *printoutForPrinting = NULL, - wxPrintDialogData *data = NULL); - wxGtkPrintPreview(wxPrintout *printout, - wxPrintout *printoutForPrinting, - wxPrintData *data); - - virtual ~wxGtkPrintPreview(); - - virtual bool Print(bool interactive) wxOVERRIDE; - virtual void DetermineScaling() wxOVERRIDE; - -private: - void Init(wxPrintout *printout, - wxPrintout *printoutForPrinting, - wxPrintData *data); - - // resolution to use in DPI - int m_resolution; - - wxDECLARE_CLASS(wxGtkPrintPreview); -}; - -#endif // wxUSE_GTKPRINT - -#endif // _WX_GTK_PRINT_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/private.h b/Externals/wxWidgets3/include/wx/gtk/private.h deleted file mode 100644 index 4c52f53c50..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/private.h +++ /dev/null @@ -1,132 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/private.h -// Purpose: wxGTK private macros, functions &c -// Author: Vadim Zeitlin -// Modified by: -// Created: 12.03.02 -// Copyright: (c) 2002 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_PRIVATE_H_ -#define _WX_GTK_PRIVATE_H_ - -#include - -#include "wx/gtk/private/string.h" -#include "wx/gtk/private/gtk2-compat.h" - -#ifndef G_VALUE_INIT - // introduced in GLib 2.30 - #define G_VALUE_INIT { 0, { { 0 } } } -#endif - -// pango_version_check symbol is quite recent ATM (4/2007)... so we -// use our own wrapper which implements a smart trick. -// Use this function as you'd use pango_version_check: -// -// if (!wx_pango_version_check(1,18,0)) -// ... call to a function available only in pango >= 1.18 ... -// -// and use it only to test for pango versions >= 1.16.0 -extern const gchar *wx_pango_version_check(int major, int minor, int micro); - -#if wxUSE_UNICODE - #define wxGTK_CONV(s) (s).utf8_str() - #define wxGTK_CONV_ENC(s, enc) wxGTK_CONV((s)) - #define wxGTK_CONV_FONT(s, font) wxGTK_CONV((s)) - #define wxGTK_CONV_SYS(s) wxGTK_CONV((s)) - - #define wxGTK_CONV_BACK(s) wxString::FromUTF8Unchecked(s) - #define wxGTK_CONV_BACK_ENC(s, enc) wxGTK_CONV_BACK(s) - #define wxGTK_CONV_BACK_FONT(s, font) wxGTK_CONV_BACK(s) - #define wxGTK_CONV_BACK_SYS(s) wxGTK_CONV_BACK(s) -#else - #include "wx/font.h" - - // convert the text between the given encoding and UTF-8 used by wxGTK - extern WXDLLIMPEXP_CORE wxCharBuffer - wxConvertToGTK(const wxString& s, - wxFontEncoding enc = wxFONTENCODING_SYSTEM); - - extern WXDLLIMPEXP_CORE wxCharBuffer - wxConvertFromGTK(const wxString& s, - wxFontEncoding enc = wxFONTENCODING_SYSTEM); - - // helper: use the encoding of the given font if it's valid - inline wxCharBuffer wxConvertToGTK(const wxString& s, const wxFont& font) - { - return wxConvertToGTK(s, font.IsOk() ? font.GetEncoding() - : wxFONTENCODING_SYSTEM); - } - - inline wxCharBuffer wxConvertFromGTK(const wxString& s, const wxFont& font) - { - return wxConvertFromGTK(s, font.IsOk() ? font.GetEncoding() - : wxFONTENCODING_SYSTEM); - } - - // more helpers: allow passing GTK+ strings directly - inline wxCharBuffer - wxConvertFromGTK(const wxGtkString& gs, - wxFontEncoding enc = wxFONTENCODING_SYSTEM) - { - return wxConvertFromGTK(gs.c_str(), enc); - } - - inline wxCharBuffer - wxConvertFromGTK(const wxGtkString& gs, const wxFont& font) - { - return wxConvertFromGTK(gs.c_str(), font); - } - - #define wxGTK_CONV(s) wxGTK_CONV_FONT((s), m_font) - #define wxGTK_CONV_ENC(s, enc) wxConvertToGTK((s), (enc)) - #define wxGTK_CONV_FONT(s, font) wxConvertToGTK((s), (font)) - #define wxGTK_CONV_SYS(s) wxConvertToGTK((s)) - - #define wxGTK_CONV_BACK(s) wxConvertFromGTK((s), m_font) - #define wxGTK_CONV_BACK_ENC(s, enc) wxConvertFromGTK((s), (enc)) - #define wxGTK_CONV_BACK_FONT(s, font) wxConvertFromGTK((s), (font)) - #define wxGTK_CONV_BACK_SYS(s) wxConvertFromGTK((s)) -#endif - -// Define a macro for converting wxString to char* in appropriate encoding for -// the file names. -#ifdef G_OS_WIN32 - // Under MSW, UTF-8 file name encodings are always used. - #define wxGTK_CONV_FN(s) (s).utf8_str() -#else - // Under Unix use GLib file name encoding (which is also UTF-8 by default - // but may be different from it). - #define wxGTK_CONV_FN(s) (s).fn_str() -#endif - -// ---------------------------------------------------------------------------- -// various private helper functions -// ---------------------------------------------------------------------------- - -namespace wxGTKPrivate -{ - -// these functions create the GTK widgets of the specified types which can then -// used to retrieve their styles, pass them to drawing functions &c -// -// the returned widgets shouldn't be destroyed, this is done automatically on -// shutdown -WXDLLIMPEXP_CORE GtkWidget *GetButtonWidget(); -WXDLLIMPEXP_CORE GtkWidget *GetCheckButtonWidget(); -WXDLLIMPEXP_CORE GtkWidget *GetComboBoxWidget(); -WXDLLIMPEXP_CORE GtkWidget *GetEntryWidget(); -WXDLLIMPEXP_CORE GtkWidget *GetHeaderButtonWidgetFirst(); -WXDLLIMPEXP_CORE GtkWidget *GetHeaderButtonWidgetLast(); -WXDLLIMPEXP_CORE GtkWidget *GetHeaderButtonWidget(); -WXDLLIMPEXP_CORE GtkWidget *GetNotebookWidget(); -WXDLLIMPEXP_CORE GtkWidget *GetRadioButtonWidget(); -WXDLLIMPEXP_CORE GtkWidget *GetSplitterWidget(wxOrientation orient = wxHORIZONTAL); -WXDLLIMPEXP_CORE GtkWidget *GetTextEntryWidget(); -WXDLLIMPEXP_CORE GtkWidget *GetTreeWidget(); - -} // wxGTKPrivate - -#endif // _WX_GTK_PRIVATE_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/private/addremovectrl.h b/Externals/wxWidgets3/include/wx/gtk/private/addremovectrl.h deleted file mode 100644 index 5644801b6e..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/private/addremovectrl.h +++ /dev/null @@ -1,80 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/private/addremovectrl.h -// Purpose: GTK specific wxAddRemoveImpl implementation -// Author: Vadim Zeitlin -// Created: 2015-02-05 -// Copyright: (c) 2015 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_PRIVATE_ADDREMOVECTRL_H_ -#define _WX_GTK_PRIVATE_ADDREMOVECTRL_H_ - -#include "wx/artprov.h" -#include "wx/bmpbuttn.h" -#include "wx/toolbar.h" - -#include - -// ---------------------------------------------------------------------------- -// wxAddRemoveImpl -// ---------------------------------------------------------------------------- - -class wxAddRemoveImpl : public wxAddRemoveImplBase -{ -public: - wxAddRemoveImpl(wxAddRemoveAdaptor* adaptor, - wxAddRemoveCtrl* parent, - wxWindow* ctrlItems) - : wxAddRemoveImplBase(adaptor, parent, ctrlItems), - m_tbar(new wxToolBar(parent, wxID_ANY)) - { - m_tbar->AddTool(wxID_ADD, wxString(), GetNamedBitmap("list-add")); - m_tbar->AddTool(wxID_REMOVE, wxString(), GetNamedBitmap("list-remove")); - -#ifdef __WXGTK3__ - // Tweak the toolbar appearance to correspond to how the toolbars used - // in other GNOME applications for similar purposes look. - GtkToolbar* const toolbar = m_tbar->GTKGetToolbar(); - GtkStyleContext* context = gtk_widget_get_style_context(GTK_WIDGET(toolbar)); - gtk_style_context_add_class(context, GTK_STYLE_CLASS_INLINE_TOOLBAR); - gtk_style_context_set_junction_sides(context, GTK_JUNCTION_TOP); -#endif // GTK+3 - - wxSizer* const sizerTop = new wxBoxSizer(wxVERTICAL); - sizerTop->Add(ctrlItems, wxSizerFlags(1).Expand()); - sizerTop->Add(m_tbar, wxSizerFlags().Expand()); - parent->SetSizer(sizerTop); - - m_tbar->Bind(wxEVT_UPDATE_UI, - &wxAddRemoveImplBase::OnUpdateUIAdd, this, wxID_ADD); - m_tbar->Bind(wxEVT_UPDATE_UI, - &wxAddRemoveImplBase::OnUpdateUIRemove, this, wxID_REMOVE); - - m_tbar->Bind(wxEVT_TOOL, &wxAddRemoveImplBase::OnAdd, this, wxID_ADD); - m_tbar->Bind(wxEVT_TOOL, &wxAddRemoveImplBase::OnRemove, this, wxID_REMOVE); - } - - virtual void SetButtonsToolTips(const wxString& addtip, - const wxString& removetip) wxOVERRIDE - { - m_tbar->SetToolShortHelp(wxID_ADD, addtip); - m_tbar->SetToolShortHelp(wxID_REMOVE, removetip); - } - -private: - static wxBitmap GetNamedBitmap(const wxString& name) - { - // GTK UI guidelines recommend using "symbolic" versions of the icons - // for these buttons, so try them first but fall back to the normal - // ones if symbolic theme is not installed. - wxBitmap bmp = wxArtProvider::GetBitmap(name + "-symbolic", wxART_MENU); - if ( !bmp.IsOk() ) - bmp = wxArtProvider::GetBitmap(name, wxART_MENU); - return bmp; - } - - wxToolBar* const m_tbar; -}; - -#endif // _WX_GTK_PRIVATE_ADDREMOVECTRL_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/private/dialogcount.h b/Externals/wxWidgets3/include/wx/gtk/private/dialogcount.h deleted file mode 100644 index b282e99ca5..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/private/dialogcount.h +++ /dev/null @@ -1,48 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/private/dialogcount.h -// Purpose: Helper for temporarily changing wxOpenModalDialogsCount global. -// Author: Vadim Zeitlin -// Created: 2013-03-21 -// Copyright: (c) 2013 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_PRIVATE_DIALOGCOUNT_H_ -#define _WX_GTK_PRIVATE_DIALOGCOUNT_H_ - -#include "wx/defs.h" - -// This global variable contains the number of currently opened modal dialogs. -// When it is non null, the global menu used in Ubuntu Unity needs to be -// explicitly disabled as this doesn't currently happen on its own due to a bug -// in Unity, see https://bugs.launchpad.net/indicator-appmenu/+bug/674605 -// -// For this to work, all modal dialogs must use wxOpenModalDialogLocker class -// below to increment this variable while they are indeed being modally shown. -// -// This variable is defined in src/gtk/toplevel.cpp -extern int wxOpenModalDialogsCount; - -// ---------------------------------------------------------------------------- -// wxOpenModalDialogLocker: Create an object of this class to increment -// wxOpenModalDialogsCount during its lifetime. -// ---------------------------------------------------------------------------- - -class wxOpenModalDialogLocker -{ -public: - wxOpenModalDialogLocker() - { - wxOpenModalDialogsCount++; - } - - ~wxOpenModalDialogLocker() - { - wxOpenModalDialogsCount--; - } - -private: - wxDECLARE_NO_COPY_CLASS(wxOpenModalDialogLocker); -}; - -#endif // _WX_GTK_PRIVATE_DIALOGCOUNT_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/private/error.h b/Externals/wxWidgets3/include/wx/gtk/private/error.h deleted file mode 100644 index 5432b18bf3..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/private/error.h +++ /dev/null @@ -1,45 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: gtk/private/error.h -// Purpose: Wrapper around GError. -// Author: Vadim Zeitlin -// Created: 2012-07-25 -// Copyright: (c) 2012 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_PRIVATE_ERROR_H_ -#define _WX_GTK_PRIVATE_ERROR_H_ - -// ---------------------------------------------------------------------------- -// wxGtkError wraps GError and releases it automatically. -// ---------------------------------------------------------------------------- - -// Create an object of this class and pass the result of its Out() method to a -// function taking "GError**", then use GetMessage() if the function returned -// false. -class wxGtkError -{ -public: - wxGtkError() { m_error = NULL; } - ~wxGtkError() { if ( m_error ) g_error_free(m_error); } - - GError** Out() - { - // This would result in a GError leak. - wxASSERT_MSG( !m_error, wxS("Can't reuse the same object.") ); - - return &m_error; - } - - wxString GetMessage() const - { - return wxString::FromUTF8(m_error->message); - } - -private: - GError* m_error; - - wxDECLARE_NO_COPY_CLASS(wxGtkError); -}; - -#endif // _WX_GTK_PRIVATE_ERROR_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/private/event.h b/Externals/wxWidgets3/include/wx/gtk/private/event.h deleted file mode 100644 index eda9e6e7f4..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/private/event.h +++ /dev/null @@ -1,79 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/private/event.h -// Purpose: Helper functions for working with GDK and wx events -// Author: Vaclav Slavik -// Created: 2011-10-14 -// Copyright: (c) 2011 Vaclav Slavik -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _GTK_PRIVATE_EVENT_H_ -#define _GTK_PRIVATE_EVENT_H_ - -#if !GTK_CHECK_VERSION(2,10,0) - // GTK+ can reliably detect Meta key state only since 2.10 when - // GDK_META_MASK was introduced -- there wasn't any way to detect it - // in older versions. wxGTK used GDK_MOD2_MASK for this purpose, but - // GDK_MOD2_MASK is documented as: - // - // the fifth modifier key (it depends on the modifier mapping of the X - // server which key is interpreted as this modifier) - // - // In other words, it isn't guaranteed to map to Meta. This is a real - // problem: it is common to map NumLock to it (in fact, it's an exception - // if the X server _doesn't_ use it for NumLock). So the old code caused - // wxKeyEvent::MetaDown() to always return true as long as NumLock was on - // on many systems, which broke all applications using - // wxKeyEvent::GetModifiers() to check modifiers state (see e.g. here: - // http://tinyurl.com/56lsk2). - // - // Because of this, it's better to not detect Meta key state at all than - // to detect it incorrectly. Hence the following #define, which causes - // m_metaDown to be always set to false. - #define GDK_META_MASK 0 -#endif - -namespace wxGTKImpl -{ - -// init wxMouseEvent with the info from GdkEventXXX struct -template void InitMouseEvent(wxWindowGTK *win, - wxMouseEvent& event, - T *gdk_event) -{ - event.m_shiftDown = (gdk_event->state & GDK_SHIFT_MASK) != 0; - event.m_controlDown = (gdk_event->state & GDK_CONTROL_MASK) != 0; - event.m_altDown = (gdk_event->state & GDK_MOD1_MASK) != 0; - event.m_metaDown = (gdk_event->state & GDK_META_MASK) != 0; - event.m_leftDown = (gdk_event->state & GDK_BUTTON1_MASK) != 0; - event.m_middleDown = (gdk_event->state & GDK_BUTTON2_MASK) != 0; - event.m_rightDown = (gdk_event->state & GDK_BUTTON3_MASK) != 0; - - // In gdk/win32 VK_XBUTTON1 is translated to GDK_BUTTON4_MASK - // and VK_XBUTTON2 to GDK_BUTTON5_MASK. In x11/gdk buttons 4/5 - // are wheel rotation and buttons 8/9 don't change the state. - event.m_aux1Down = (gdk_event->state & GDK_BUTTON4_MASK) != 0; - event.m_aux2Down = (gdk_event->state & GDK_BUTTON5_MASK) != 0; - - wxPoint pt = win->GetClientAreaOrigin(); - event.m_x = (wxCoord)gdk_event->x - pt.x; - event.m_y = (wxCoord)gdk_event->y - pt.y; - - if ((win->m_wxwindow) && (win->GetLayoutDirection() == wxLayout_RightToLeft)) - { - // origin in the upper right corner - GtkAllocation a; - gtk_widget_get_allocation(win->m_wxwindow, &a); - int window_width = a.width; - event.m_x = window_width - event.m_x; - } - - event.SetEventObject( win ); - event.SetId( win->GetId() ); - event.SetTimestamp( gdk_event->time ); -} - -} // namespace wxGTKImpl - -#endif // _GTK_PRIVATE_EVENT_H_ - diff --git a/Externals/wxWidgets3/include/wx/gtk/private/eventsdisabler.h b/Externals/wxWidgets3/include/wx/gtk/private/eventsdisabler.h deleted file mode 100644 index 5ca9c7b590..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/private/eventsdisabler.h +++ /dev/null @@ -1,41 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/private/eventsdisabler.h -// Purpose: Helper for temporarily disabling events. -// Author: Vadim Zeitlin -// Created: 2016-02-06 -// Copyright: (c) 2016 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _GTK_PRIVATE_EVENTSDISABLER_H_ -#define _GTK_PRIVATE_EVENTSDISABLER_H_ - -// ---------------------------------------------------------------------------- -// wxGtkEventsDisabler: calls GTKDisableEvents() and GTKEnableEvents() in dtor. -// ---------------------------------------------------------------------------- - -// Template parameter T must be a wxGTK class providing the required methods, -// e.g. wxCheckBox, wxChoice, ... -template -class wxGtkEventsDisabler -{ -public: - // Disable the events for the specified (non-NULL, having lifetime greater - // than ours) window for the lifetime of this object. - explicit wxGtkEventsDisabler(T* win) : m_win(win) - { - m_win->GTKDisableEvents(); - } - - ~wxGtkEventsDisabler() - { - m_win->GTKEnableEvents(); - } - -private: - T* const m_win; - - wxDECLARE_NO_COPY_TEMPLATE_CLASS(wxGtkEventsDisabler, T); -}; - -#endif // _GTK_PRIVATE_EVENTSDISABLER_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/private/gdkconv.h b/Externals/wxWidgets3/include/wx/gtk/private/gdkconv.h deleted file mode 100644 index b63b0c74cd..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/private/gdkconv.h +++ /dev/null @@ -1,32 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/private/gdkconv.h -// Purpose: Helper functions for converting between GDK and wx types -// Author: Vadim Zeitlin -// Created: 2009-11-10 -// Copyright: (c) 2009 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _GTK_PRIVATE_GDKCONV_H_ -#define _GTK_PRIVATE_GDKCONV_H_ - -namespace wxGTKImpl -{ - -inline wxRect wxRectFromGDKRect(const GdkRectangle *r) -{ - return wxRect(r->x, r->y, r->width, r->height); -} - -inline void wxRectToGDKRect(const wxRect& rect, GdkRectangle& r) -{ - r.x = rect.x; - r.y = rect.y; - r.width = rect.width; - r.height = rect.height; -} - -} // namespace wxGTKImpl - -#endif // _GTK_PRIVATE_GDKCONV_H_ - diff --git a/Externals/wxWidgets3/include/wx/gtk/private/gtk2-compat.h b/Externals/wxWidgets3/include/wx/gtk/private/gtk2-compat.h deleted file mode 100644 index a3d45e2d92..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/private/gtk2-compat.h +++ /dev/null @@ -1,534 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/private/compat.h -// Purpose: Compatibility code for older GTK+ versions -// Author: Vaclav Slavik -// Created: 2011-03-25 -// Copyright: (c) 2011 Vaclav Slavik -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_PRIVATE_COMPAT_H_ -#define _WX_GTK_PRIVATE_COMPAT_H_ - -// ---------------------------------------------------------------------------- -// Implementations of new accessors for older GTK+ versions -// ---------------------------------------------------------------------------- - -// GTK+ deprecated direct access to struct members and some other stuff, -// replacing them with simple accessor functions. These aren't available in -// older versions, though, so we have to provide them for compatibility. -// -// Note: wx_ prefix is used to avoid symbol conflicts at runtime -// -// Note 2: We support building against newer GTK+ version and using an older -// one at runtime, so we must provide our implementations of these -// functions even if GTK_CHECK_VERSION would indicate the function is -// already available in GTK+. - -#ifndef __WXGTK3__ - -// ---------------------------------------------------------------------------- -// the following were introduced in GTK+ 2.8 - -static inline GtkWidget* wx_gtk_scrolled_window_get_hscrollbar(GtkScrolledWindow* scrolled_window) -{ - return scrolled_window->hscrollbar; -} -#define gtk_scrolled_window_get_hscrollbar wx_gtk_scrolled_window_get_hscrollbar - -static inline GtkWidget* wx_gtk_scrolled_window_get_vscrollbar(GtkScrolledWindow* scrolled_window) -{ - return scrolled_window->vscrollbar; -} -#define gtk_scrolled_window_get_vscrollbar wx_gtk_scrolled_window_get_vscrollbar - -// ---------------------------------------------------------------------------- -// the following were introduced in GLib 2.10 - -static inline gpointer wx_g_object_ref_sink(gpointer object) -{ - g_object_ref(object); - gtk_object_sink(GTK_OBJECT(object)); - return object; -} -#define g_object_ref_sink wx_g_object_ref_sink - -// ---------------------------------------------------------------------------- -// the following were introduced in GTK+ 2.12 - -static inline void wx_gtk_about_dialog_set_program_name(GtkAboutDialog* about, const gchar* name) -{ - gtk_about_dialog_set_name(about, name); -} -#define gtk_about_dialog_set_program_name wx_gtk_about_dialog_set_program_name - -// ---------------------------------------------------------------------------- -// the following were introduced in GTK+ 2.14 - -static inline gdouble wx_gtk_adjustment_get_lower(GtkAdjustment* adjustment) -{ - return adjustment->lower; -} -#define gtk_adjustment_get_lower wx_gtk_adjustment_get_lower - -static inline gdouble wx_gtk_adjustment_get_page_increment(GtkAdjustment* adjustment) -{ - return adjustment->page_increment; -} -#define gtk_adjustment_get_page_increment wx_gtk_adjustment_get_page_increment - -static inline gdouble wx_gtk_adjustment_get_page_size(GtkAdjustment* adjustment) -{ - return adjustment->page_size; -} -#define gtk_adjustment_get_page_size wx_gtk_adjustment_get_page_size - -static inline gdouble wx_gtk_adjustment_get_step_increment(GtkAdjustment* adjustment) -{ - return adjustment->step_increment; -} -#define gtk_adjustment_get_step_increment wx_gtk_adjustment_get_step_increment - -static inline gdouble wx_gtk_adjustment_get_upper(GtkAdjustment* adjustment) -{ - return adjustment->upper; -} -#define gtk_adjustment_get_upper wx_gtk_adjustment_get_upper - -static inline void wx_gtk_adjustment_set_page_size(GtkAdjustment* adjustment, gdouble page_size) -{ - adjustment->page_size = page_size; -} -#define gtk_adjustment_set_page_size wx_gtk_adjustment_set_page_size - -static inline GtkWidget* wx_gtk_color_selection_dialog_get_color_selection(GtkColorSelectionDialog* csd) -{ - return csd->colorsel; -} -#define gtk_color_selection_dialog_get_color_selection wx_gtk_color_selection_dialog_get_color_selection - -static inline GtkWidget* wx_gtk_dialog_get_content_area(GtkDialog* dialog) -{ - return dialog->vbox; -} -#define gtk_dialog_get_content_area wx_gtk_dialog_get_content_area - -static inline GtkWidget* wx_gtk_dialog_get_action_area(GtkDialog* dialog) -{ - return dialog->action_area; -} -#define gtk_dialog_get_action_area wx_gtk_dialog_get_action_area - -static inline guint16 wx_gtk_entry_get_text_length(GtkEntry* entry) -{ - return entry->text_length; -} -#define gtk_entry_get_text_length wx_gtk_entry_get_text_length - -static inline const guchar* wx_gtk_selection_data_get_data(GtkSelectionData* selection_data) -{ - return selection_data->data; -} -#define gtk_selection_data_get_data wx_gtk_selection_data_get_data - -static inline GdkAtom wx_gtk_selection_data_get_data_type(GtkSelectionData* selection_data) -{ - return selection_data->type; -} -#define gtk_selection_data_get_data_type wx_gtk_selection_data_get_data_type - -static inline gint wx_gtk_selection_data_get_format(GtkSelectionData* selection_data) -{ - return selection_data->format; -} -#define gtk_selection_data_get_format wx_gtk_selection_data_get_format - -static inline gint wx_gtk_selection_data_get_length(GtkSelectionData* selection_data) -{ - return selection_data->length; -} -#define gtk_selection_data_get_length wx_gtk_selection_data_get_length - -static inline GdkAtom wx_gtk_selection_data_get_target(GtkSelectionData* selection_data) -{ - return selection_data->target; -} -#define gtk_selection_data_get_target wx_gtk_selection_data_get_target - -static inline GdkWindow* wx_gtk_widget_get_window(GtkWidget* widget) -{ - return widget->window; -} -#define gtk_widget_get_window wx_gtk_widget_get_window - -static inline GtkWidget* wx_gtk_window_get_default_widget(GtkWindow* window) -{ - return window->default_widget; -} -#define gtk_window_get_default_widget wx_gtk_window_get_default_widget - -// ---------------------------------------------------------------------------- -// the following were introduced in GTK+ 2.16 - -static inline GdkAtom wx_gtk_selection_data_get_selection(GtkSelectionData* selection_data) -{ - return selection_data->selection; -} -#define gtk_selection_data_get_selection wx_gtk_selection_data_get_selection - -// ---------------------------------------------------------------------------- -// the following were introduced in GTK+ 2.18 - -static inline void wx_gtk_cell_renderer_get_alignment(GtkCellRenderer* cell, gfloat* xalign, gfloat* yalign) -{ - *xalign = cell->xalign; - *yalign = cell->yalign; -} -#define gtk_cell_renderer_get_alignment wx_gtk_cell_renderer_get_alignment - -static inline void wx_gtk_cell_renderer_get_padding(GtkCellRenderer* cell, gint* xpad, gint* ypad) -{ - *xpad = cell->xpad; - *ypad = cell->ypad; -} -#define gtk_cell_renderer_get_padding wx_gtk_cell_renderer_get_padding - -static inline void wx_gtk_cell_renderer_set_padding(GtkCellRenderer* cell, gint xpad, gint ypad) -{ - cell->xpad = xpad; - cell->ypad = ypad; -} -#define gtk_cell_renderer_set_padding wx_gtk_cell_renderer_set_padding - -static inline void wx_gtk_widget_get_allocation(GtkWidget* widget, GtkAllocation* allocation) -{ - *allocation = widget->allocation; -} -#define gtk_widget_get_allocation wx_gtk_widget_get_allocation - -inline gboolean wx_gtk_widget_get_has_window(GtkWidget *widget) -{ - return !GTK_WIDGET_NO_WINDOW(widget); -} -#define gtk_widget_get_has_window wx_gtk_widget_get_has_window - - -inline gboolean wx_gtk_widget_get_has_grab(GtkWidget *widget) -{ - return GTK_WIDGET_HAS_GRAB(widget); -} -#define gtk_widget_get_has_grab wx_gtk_widget_get_has_grab - - -inline gboolean wx_gtk_widget_get_visible(GtkWidget *widget) -{ - return GTK_WIDGET_VISIBLE(widget); -} -#define gtk_widget_get_visible wx_gtk_widget_get_visible - - -inline gboolean wx_gtk_widget_get_sensitive(GtkWidget *widget) -{ - return GTK_WIDGET_SENSITIVE(widget); -} -#define gtk_widget_get_sensitive wx_gtk_widget_get_sensitive - - -inline gboolean wx_gtk_widget_is_drawable(GtkWidget *widget) -{ - return GTK_WIDGET_DRAWABLE(widget); -} -#define gtk_widget_is_drawable wx_gtk_widget_is_drawable - - -inline gboolean wx_gtk_widget_get_can_focus(GtkWidget *widget) -{ - return GTK_WIDGET_CAN_FOCUS(widget); -} -#define gtk_widget_get_can_focus wx_gtk_widget_get_can_focus - -inline void wx_gtk_widget_set_can_focus(GtkWidget *widget, gboolean can) -{ - if ( can ) - GTK_WIDGET_SET_FLAGS(widget, GTK_CAN_FOCUS); - else - GTK_WIDGET_UNSET_FLAGS(widget, GTK_CAN_FOCUS); -} -#define gtk_widget_set_can_focus wx_gtk_widget_set_can_focus - - -inline gboolean wx_gtk_widget_get_can_default(GtkWidget *widget) -{ - return GTK_WIDGET_CAN_DEFAULT(widget); -} -#define gtk_widget_get_can_default wx_gtk_widget_get_can_default - -inline void wx_gtk_widget_set_can_default(GtkWidget *widget, gboolean can) -{ - if ( can ) - GTK_WIDGET_SET_FLAGS(widget, GTK_CAN_DEFAULT); - else - GTK_WIDGET_UNSET_FLAGS(widget, GTK_CAN_DEFAULT); -} -#define gtk_widget_set_can_default wx_gtk_widget_set_can_default - - -inline gboolean wx_gtk_widget_has_default(GtkWidget *widget) -{ - return GTK_WIDGET_HAS_DEFAULT(widget); -} -#define gtk_widget_has_default wx_gtk_widget_has_default - - -inline GtkStateType wx_gtk_widget_get_state(GtkWidget *widget) -{ - return (GtkStateType)GTK_WIDGET_STATE(widget); -} -#define gtk_widget_get_state wx_gtk_widget_get_state - - -inline gboolean wx_gtk_widget_get_double_buffered(GtkWidget *widget) -{ - return GTK_WIDGET_DOUBLE_BUFFERED(widget); -} -#define gtk_widget_get_double_buffered wx_gtk_widget_get_double_buffered - -static inline gboolean wx_gtk_widget_has_grab(GtkWidget* widget) -{ - return GTK_WIDGET_HAS_GRAB(widget); -} -#define gtk_widget_has_grab wx_gtk_widget_has_grab - -static inline void wx_gtk_widget_set_allocation(GtkWidget* widget, const GtkAllocation* allocation) -{ - widget->allocation = *allocation; -} -#define gtk_widget_set_allocation wx_gtk_widget_set_allocation - -static inline gboolean wx_gtk_widget_is_toplevel(GtkWidget* widget) -{ - return GTK_WIDGET_TOPLEVEL(widget); -} -#define gtk_widget_is_toplevel wx_gtk_widget_is_toplevel - -// ---------------------------------------------------------------------------- -// the following were introduced in GTK+ 2.20 - -inline gboolean wx_gtk_widget_get_realized(GtkWidget *widget) -{ - return GTK_WIDGET_REALIZED(widget); -} -#define gtk_widget_get_realized wx_gtk_widget_get_realized - - -inline gboolean wx_gtk_widget_get_mapped(GtkWidget *widget) -{ - return GTK_WIDGET_MAPPED(widget); -} -#define gtk_widget_get_mapped wx_gtk_widget_get_mapped - -static inline void wx_gtk_widget_get_requisition(GtkWidget* widget, GtkRequisition* requisition) -{ - *requisition = widget->requisition; -} -#define gtk_widget_get_requisition wx_gtk_widget_get_requisition - -static inline GdkWindow* wx_gtk_entry_get_text_window(GtkEntry* entry) -{ - return entry->text_area; -} -#define gtk_entry_get_text_window wx_gtk_entry_get_text_window - -// ---------------------------------------------------------------------------- -// the following were introduced in GTK+ 2.22 - -static inline GdkWindow* wx_gtk_button_get_event_window(GtkButton* button) -{ - return button->event_window; -} -#define gtk_button_get_event_window wx_gtk_button_get_event_window - -static inline GdkDragAction wx_gdk_drag_context_get_actions(GdkDragContext* context) -{ - return context->actions; -} -#define gdk_drag_context_get_actions wx_gdk_drag_context_get_actions - -static inline GdkDragAction wx_gdk_drag_context_get_selected_action(GdkDragContext* context) -{ - return context->action; -} -#define gdk_drag_context_get_selected_action wx_gdk_drag_context_get_selected_action - -static inline GdkDragAction wx_gdk_drag_context_get_suggested_action(GdkDragContext* context) -{ - return context->suggested_action; -} -#define gdk_drag_context_get_suggested_action wx_gdk_drag_context_get_suggested_action - -static inline GList* wx_gdk_drag_context_list_targets(GdkDragContext* context) -{ - return context->targets; -} -#define gdk_drag_context_list_targets wx_gdk_drag_context_list_targets - -static inline gint wx_gdk_visual_get_depth(GdkVisual* visual) -{ - return visual->depth; -} -#define gdk_visual_get_depth wx_gdk_visual_get_depth - -static inline gboolean wx_gtk_window_has_group(GtkWindow* window) -{ - return window->group != NULL; -} -#define gtk_window_has_group wx_gtk_window_has_group - -// ---------------------------------------------------------------------------- -// the following were introduced in GTK+ 2.24 - -#define gdk_window_get_visual gdk_drawable_get_visual - -static inline GdkDisplay* wx_gdk_window_get_display(GdkWindow* window) -{ - return gdk_drawable_get_display(window); -} -#define gdk_window_get_display wx_gdk_window_get_display - -static inline GdkScreen* wx_gdk_window_get_screen(GdkWindow* window) -{ - return gdk_drawable_get_screen(window); -} -#define gdk_window_get_screen wx_gdk_window_get_screen - -static inline gint wx_gdk_window_get_height(GdkWindow* window) -{ - int h; - gdk_drawable_get_size(window, NULL, &h); - return h; -} -#define gdk_window_get_height wx_gdk_window_get_height - -static inline gint wx_gdk_window_get_width(GdkWindow* window) -{ - int w; - gdk_drawable_get_size(window, &w, NULL); - return w; -} -#define gdk_window_get_width wx_gdk_window_get_width - -#if GTK_CHECK_VERSION(2,10,0) -static inline void wx_gdk_cairo_set_source_window(cairo_t* cr, GdkWindow* window, gdouble x, gdouble y) -{ - gdk_cairo_set_source_pixmap(cr, window, x, y); -} -#define gdk_cairo_set_source_window wx_gdk_cairo_set_source_window -#endif - -// ---------------------------------------------------------------------------- -// the following were introduced in GTK+ 3.0 - -static inline void wx_gdk_window_get_geometry(GdkWindow* window, gint* x, gint* y, gint* width, gint* height) -{ - gdk_window_get_geometry(window, x, y, width, height, NULL); -} -#define gdk_window_get_geometry wx_gdk_window_get_geometry - -static inline GtkWidget* wx_gtk_tree_view_column_get_button(GtkTreeViewColumn* tree_column) -{ - return tree_column->button; -} -#define gtk_tree_view_column_get_button wx_gtk_tree_view_column_get_button - -static inline GtkWidget* wx_gtk_box_new(GtkOrientation orientation, gint spacing) -{ - GtkWidget* widget; - if (orientation == GTK_ORIENTATION_HORIZONTAL) - widget = gtk_hbox_new(false, spacing); - else - widget = gtk_vbox_new(false, spacing); - return widget; -} -#define gtk_box_new wx_gtk_box_new - -static inline GtkWidget* wx_gtk_button_box_new(GtkOrientation orientation) -{ - GtkWidget* widget; - if (orientation == GTK_ORIENTATION_HORIZONTAL) - widget = gtk_hbutton_box_new(); - else - widget = gtk_vbutton_box_new(); - return widget; -} -#define gtk_button_box_new wx_gtk_button_box_new - -static inline GtkWidget* wx_gtk_scale_new(GtkOrientation orientation, GtkAdjustment* adjustment) -{ - GtkWidget* widget; - if (orientation == GTK_ORIENTATION_HORIZONTAL) - widget = gtk_hscale_new(adjustment); - else - widget = gtk_vscale_new(adjustment); - return widget; -} -#define gtk_scale_new wx_gtk_scale_new - -static inline GtkWidget* wx_gtk_scrollbar_new(GtkOrientation orientation, GtkAdjustment* adjustment) -{ - GtkWidget* widget; - if (orientation == GTK_ORIENTATION_HORIZONTAL) - widget = gtk_hscrollbar_new(adjustment); - else - widget = gtk_vscrollbar_new(adjustment); - return widget; -} -#define gtk_scrollbar_new wx_gtk_scrollbar_new - -static inline GtkWidget* wx_gtk_separator_new(GtkOrientation orientation) -{ - GtkWidget* widget; - if (orientation == GTK_ORIENTATION_HORIZONTAL) - widget = gtk_hseparator_new(); - else - widget = gtk_vseparator_new(); - return widget; -} -#define gtk_separator_new wx_gtk_separator_new - -static inline void wx_gtk_widget_get_preferred_height(GtkWidget* widget, gint* minimum, gint* natural) -{ - GtkRequisition req; - gtk_widget_size_request(widget, &req); - if (minimum) - *minimum = req.height; - if (natural) - *natural = req.height; -} -#define gtk_widget_get_preferred_height wx_gtk_widget_get_preferred_height - -static inline void wx_gtk_widget_get_preferred_width(GtkWidget* widget, gint* minimum, gint* natural) -{ - GtkRequisition req; - gtk_widget_size_request(widget, &req); - if (minimum) - *minimum = req.width; - if (natural) - *natural = req.width; -} -#define gtk_widget_get_preferred_width wx_gtk_widget_get_preferred_width - -static inline void wx_gtk_widget_get_preferred_size(GtkWidget* widget, GtkRequisition* minimum, GtkRequisition* natural) -{ - GtkRequisition* req = minimum; - if (req == NULL) - req = natural; - gtk_widget_size_request(widget, req); -} -#define gtk_widget_get_preferred_size wx_gtk_widget_get_preferred_size - -// There is no equivalent in GTK+ 2, but it's not needed there anyhow as the -// backend is determined at compile time in that version. -#define GDK_IS_X11_DISPLAY(dpy) true - -#endif // !__WXGTK3__ -#endif // _WX_GTK_PRIVATE_COMPAT_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/private/gtk3-compat.h b/Externals/wxWidgets3/include/wx/gtk/private/gtk3-compat.h deleted file mode 100644 index 2aa415d544..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/private/gtk3-compat.h +++ /dev/null @@ -1,35 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/private/gtk3-compat.h -// Purpose: Compatibility code for older GTK+ 3 versions -// Author: Paul Cornett -// Created: 2015-10-10 -// Copyright: (c) 2015 Paul Cornett -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_PRIVATE_COMPAT3_H_ -#define _WX_GTK_PRIVATE_COMPAT3_H_ - -#if defined(__WXGTK3__) - -wxGCC_WARNING_SUPPRESS(deprecated-declarations) - -// ---------------------------------------------------------------------------- -// the following were introduced in GTK+ 3.12 - -static inline void wx_gtk_widget_set_margin_start(GtkWidget* widget, gint margin) -{ - gtk_widget_set_margin_left(widget, margin); -} -#define gtk_widget_set_margin_start wx_gtk_widget_set_margin_start - -static inline void wx_gtk_widget_set_margin_end(GtkWidget* widget, gint margin) -{ - gtk_widget_set_margin_right(widget, margin); -} -#define gtk_widget_set_margin_end wx_gtk_widget_set_margin_end - -wxGCC_WARNING_RESTORE() - -#endif // __WXGTK3__ -#endif // _WX_GTK_PRIVATE_COMPAT3_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/private/list.h b/Externals/wxWidgets3/include/wx/gtk/private/list.h deleted file mode 100644 index 15ddf71cae..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/private/list.h +++ /dev/null @@ -1,32 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/private/list.h -// Purpose: wxGtkList class. -// Author: Vadim Zeitlin -// Created: 2011-08-21 -// Copyright: (c) 2011 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_PRIVATE_LIST_H_ -#define _WX_GTK_PRIVATE_LIST_H_ - -// ---------------------------------------------------------------------------- -// Convenience class for calling g_list_free() automatically -// ---------------------------------------------------------------------------- - -class wxGtkList -{ -public: - explicit wxGtkList(GList* list) : m_list(list) { } - ~wxGtkList() { g_list_free(m_list); } - - operator GList *() const { return m_list; } - GList * operator->() const { return m_list; } - -protected: - GList* const m_list; - - wxDECLARE_NO_COPY_CLASS(wxGtkList); -}; - -#endif // _WX_GTK_PRIVATE_LIST_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/private/messagetype.h b/Externals/wxWidgets3/include/wx/gtk/private/messagetype.h deleted file mode 100644 index 2c3a2a5a58..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/private/messagetype.h +++ /dev/null @@ -1,44 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/private/messagetype.h -// Purpose: translate between wx and GtkMessageType -// Author: Vadim Zeitlin -// Created: 2009-09-27 -// Copyright: (c) 2009 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _GTK_PRIVATE_MSGTYPE_H_ -#define _GTK_PRIVATE_MSGTYPE_H_ - -#include - -namespace wxGTKImpl -{ - -// Convert the given wx style to GtkMessageType, return true if succeeded or -// false if failed. -inline bool ConvertMessageTypeFromWX(int style, GtkMessageType *type) -{ -#ifdef __WXGTK210__ - if ( gtk_check_version(2, 10, 0) == NULL && (style & wxICON_NONE)) - *type = GTK_MESSAGE_OTHER; - else -#endif // __WXGTK210__ - if (style & wxICON_EXCLAMATION) - *type = GTK_MESSAGE_WARNING; - else if (style & wxICON_ERROR) - *type = GTK_MESSAGE_ERROR; - else if (style & wxICON_INFORMATION) - *type = GTK_MESSAGE_INFO; - else if (style & wxICON_QUESTION) - *type = GTK_MESSAGE_QUESTION; - else - return false; - - return true; -} - -} // namespace wxGTKImpl - -#endif // _GTK_PRIVATE_MSGTYPE_H_ - diff --git a/Externals/wxWidgets3/include/wx/gtk/private/mnemonics.h b/Externals/wxWidgets3/include/wx/gtk/private/mnemonics.h deleted file mode 100644 index 0b6e4ba45a..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/private/mnemonics.h +++ /dev/null @@ -1,38 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/private/mnemonics.h -// Purpose: helper functions for dealing with GTK+ mnemonics -// Author: Vadim Zeitlin -// Created: 2007-11-12 -// Copyright: (c) 2007 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _GTK_PRIVATE_MNEMONICS_H_ -#define _GTK_PRIVATE_MNEMONICS_H_ - -#if wxUSE_CONTROLS || wxUSE_MENUS - -#include "wx/string.h" - -// ---------------------------------------------------------------------------- -// functions to convert between wxWidgets and GTK+ string containing mnemonics -// ---------------------------------------------------------------------------- - -// remove all mnemonics from a string -wxString wxGTKRemoveMnemonics(const wxString& label); - -// convert a wx string with '&' to GTK+ string with '_'s -wxString wxConvertMnemonicsToGTK(const wxString& label); - -// convert a wx string with '&' to indicate mnemonics as well as HTML entities -// to a GTK+ string with "&" used instead of '&', i.e. suitable for use -// with GTK+ functions using markup strings -wxString wxConvertMnemonicsToGTKMarkup(const wxString& label); - -// convert GTK+ string with '_'s to wx string with '&'s -wxString wxConvertMnemonicsFromGTK(const wxString& label); - -#endif // wxUSE_CONTROLS || wxUSE_MENUS - -#endif // _GTK_PRIVATE_MNEMONICS_H_ - diff --git a/Externals/wxWidgets3/include/wx/gtk/private/object.h b/Externals/wxWidgets3/include/wx/gtk/private/object.h deleted file mode 100644 index 472e4c3ede..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/private/object.h +++ /dev/null @@ -1,35 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/private/object.h -// Purpose: wxGtkObject class declaration -// Author: Vadim Zeitlin -// Created: 2008-08-27 -// Copyright: (c) 2008 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_PRIVATE_OBJECT_H_ -#define _WX_GTK_PRIVATE_OBJECT_H_ - -// ---------------------------------------------------------------------------- -// Convenience class for calling g_object_unref() automatically -// ---------------------------------------------------------------------------- - -template -class wxGtkObject -{ -public: - explicit wxGtkObject(T *p) : m_ptr(p) { } - ~wxGtkObject() { g_object_unref(m_ptr); } - - operator T *() const { return m_ptr; } - -private: - T * const m_ptr; - - // copying could be implemented by using g_object_ref() but for now there - // is no need for it so don't implement it - wxDECLARE_NO_COPY_CLASS(wxGtkObject); -}; - -#endif // _WX_GTK_PRIVATE_OBJECT_H_ - diff --git a/Externals/wxWidgets3/include/wx/gtk/private/string.h b/Externals/wxWidgets3/include/wx/gtk/private/string.h deleted file mode 100644 index bd188d10f8..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/private/string.h +++ /dev/null @@ -1,120 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/private/string.h -// Purpose: wxGtkString class declaration -// Author: Vadim Zeitlin -// Created: 2006-10-19 -// Copyright: (c) 2006 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_PRIVATE_STRING_H_ -#define _WX_GTK_PRIVATE_STRING_H_ - -// ---------------------------------------------------------------------------- -// Convenience class for g_freeing a gchar* on scope exit automatically -// ---------------------------------------------------------------------------- - -class wxGtkString -{ -public: - explicit wxGtkString(gchar *s) : m_str(s) { } - ~wxGtkString() { g_free(m_str); } - - const gchar *c_str() const { return m_str; } - - operator gchar *() const { return m_str; } - -private: - gchar *m_str; - - wxDECLARE_NO_COPY_CLASS(wxGtkString); -}; - - -// ---------------------------------------------------------------------------- -// list for sorting collated strings -// ---------------------------------------------------------------------------- - -#include "wx/string.h" -#include "wx/vector.h" -#include "wx/sharedptr.h" - -class wxGtkCollatableString -{ -public: - wxGtkCollatableString( const wxString &label, gchar *key ) - { - m_label = label; - m_key = key; - } - - ~wxGtkCollatableString() - { - if (m_key) - g_free( m_key ); - } - - wxString m_label; - gchar *m_key; -}; - -class wxGtkCollatedArrayString -{ -public: - wxGtkCollatedArrayString() { } - - int Add( const wxString &new_label ) - { - int index = 0; - - gchar *new_key_lower = g_utf8_casefold( new_label.utf8_str(), -1); - gchar *new_key = g_utf8_collate_key( new_key_lower, -1); - g_free( new_key_lower ); - - wxSharedPtr new_ptr( new wxGtkCollatableString( new_label, new_key ) ); - - wxVector< wxSharedPtr >::iterator iter; - for (iter = m_list.begin(); iter != m_list.end(); ++iter) - { - wxSharedPtr ptr = *iter; - - gchar *key = ptr->m_key; - if (strcmp(key,new_key) >= 0) - { - m_list.insert( iter, new_ptr ); - return index; - } - index ++; - } - - m_list.push_back( new_ptr ); - return index; - } - - size_t GetCount() - { - return m_list.size(); - } - - wxString At( size_t index ) - { - return m_list[index]->m_label; - } - - void Clear() - { - m_list.clear(); - } - - void RemoveAt( size_t index ) - { - m_list.erase( m_list.begin() + index ); - } - -private: - wxVector< wxSharedPtr > m_list; -}; - - -#endif // _WX_GTK_PRIVATE_STRING_H_ - diff --git a/Externals/wxWidgets3/include/wx/gtk/private/textmeasure.h b/Externals/wxWidgets3/include/wx/gtk/private/textmeasure.h deleted file mode 100644 index d27b096f26..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/private/textmeasure.h +++ /dev/null @@ -1,64 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/private/textmeasure.h -// Purpose: wxGTK-specific declaration of wxTextMeasure class -// Author: Manuel Martin -// Created: 2012-10-05 -// Copyright: (c) 1997-2012 wxWidgets team -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_PRIVATE_TEXTMEASURE_H_ -#define _WX_GTK_PRIVATE_TEXTMEASURE_H_ - -// ---------------------------------------------------------------------------- -// wxTextMeasure -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxWindowDCImpl; - -class wxTextMeasure : public wxTextMeasureBase -{ -public: - wxEXPLICIT wxTextMeasure(const wxDC *dc, const wxFont *font = NULL) - : wxTextMeasureBase(dc, font) - { - Init(); - } - - wxEXPLICIT wxTextMeasure(const wxWindow *win, const wxFont *font = NULL) - : wxTextMeasureBase(win, font) - { - Init(); - } - -protected: - // Common part of both ctors. - void Init(); - - virtual void BeginMeasuring(); - virtual void EndMeasuring(); - - virtual void DoGetTextExtent(const wxString& string, - wxCoord *width, - wxCoord *height, - wxCoord *descent = NULL, - wxCoord *externalLeading = NULL); - - virtual bool DoGetPartialTextExtents(const wxString& text, - wxArrayInt& widths, - double scaleX); - - // This class is only used for DC text measuring with GTK+ 2 as GTK+ 3 uses - // Cairo and not Pango for this. However it's still used even with GTK+ 3 - // for window text measuring, so the context and the layout are still - // needed. -#ifndef __WXGTK3__ - wxWindowDCImpl *m_wdc; -#endif // GTK+ < 3 - PangoContext *m_context; - PangoLayout *m_layout; - - wxDECLARE_NO_COPY_CLASS(wxTextMeasure); -}; - -#endif // _WX_GTK_PRIVATE_TEXTMEASURE_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/private/timer.h b/Externals/wxWidgets3/include/wx/gtk/private/timer.h deleted file mode 100644 index 89f1355bba..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/private/timer.h +++ /dev/null @@ -1,35 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/private/timer.h -// Purpose: wxTimerImpl for wxGTK -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_PRIVATE_TIMER_H_ -#define _WX_GTK_PRIVATE_TIMER_H_ - -#if wxUSE_TIMER - -#include "wx/private/timer.h" - -//----------------------------------------------------------------------------- -// wxTimer -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxGTKTimerImpl : public wxTimerImpl -{ -public: - wxGTKTimerImpl(wxTimer* timer) : wxTimerImpl(timer) { m_sourceId = 0; } - - virtual bool Start( int millisecs = -1, bool oneShot = false ); - virtual void Stop(); - virtual bool IsRunning() const { return m_sourceId != 0; } - -protected: - int m_sourceId; -}; - -#endif // wxUSE_TIMER - -#endif // _WX_GTK_PRIVATE_TIMER_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/private/treeentry_gtk.h b/Externals/wxWidgets3/include/wx/gtk/private/treeentry_gtk.h deleted file mode 100644 index 17abe2fc77..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/private/treeentry_gtk.h +++ /dev/null @@ -1,58 +0,0 @@ -/* /////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/private/treeentry_gtk.h -// Purpose: GtkTreeEntry - a string/userdata combo for use with treeview -// Author: Ryan Norton -// Copyright: (c) 2006 Ryan Norton -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////// */ - -#ifndef _WX_GTK_TREE_ENTRY_H_ -#define _WX_GTK_TREE_ENTRY_H_ - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -#include /* for gpointer and gchar* etc. */ - -#define WX_TYPE_TREE_ENTRY wx_tree_entry_get_type() -#define WX_TREE_ENTRY(obj) G_TYPE_CHECK_INSTANCE_CAST(obj, wx_tree_entry_get_type(), wxTreeEntry) -#define WX_IS_TREE_ENTRY(obj) G_TYPE_CHECK_INSTANCE_TYPE(obj, wx_tree_entry_get_type()) - -typedef struct _wxTreeEntry wxTreeEntry; - -typedef void (*wxTreeEntryDestroy)(wxTreeEntry* entry, void* context); - -struct _wxTreeEntry -{ - GObject parent; /* object instance */ - gchar* label; /* label - always copied by this object except on get */ - gchar* collate_key; /* collate key used for string comparisons/sorting */ - gpointer userdata; /* untouched userdata */ - wxTreeEntryDestroy destroy_func; /* called upon destruction - use for freeing userdata etc. */ - gpointer destroy_func_data; /* context passed to destroy_func */ -}; - -wxTreeEntry* wx_tree_entry_new(void); - -GType wx_tree_entry_get_type(void); - -char* wx_tree_entry_get_collate_key(wxTreeEntry* entry); - -char* wx_tree_entry_get_label(wxTreeEntry* entry); - -void* wx_tree_entry_get_userdata(wxTreeEntry* entry); - -void wx_tree_entry_set_label(wxTreeEntry* entry, const char* label); - -void wx_tree_entry_set_userdata(wxTreeEntry* entry, void* userdata); - -void wx_tree_entry_set_destroy_func(wxTreeEntry* entry, - wxTreeEntryDestroy destroy_func, - gpointer destroy_func_data); - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* _WX_GTK_TREE_ENTRY_H_ */ diff --git a/Externals/wxWidgets3/include/wx/gtk/private/treeview.h b/Externals/wxWidgets3/include/wx/gtk/private/treeview.h deleted file mode 100644 index d029a8ff78..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/private/treeview.h +++ /dev/null @@ -1,62 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/private/treeview.h -// Purpose: Private helpers for wxGTK controls using GtkTreeView -// Author: Vadim Zeitlin -// Created: 2016-02-06 (extracted from src/gtk/dataview.cpp) -// Copyright: (c) 2016 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _GTK_PRIVATE_TREEVIEW_H_ -#define _GTK_PRIVATE_TREEVIEW_H_ - -// ---------------------------------------------------------------------------- -// wxGtkTreePath: RAII wrapper for GtkTreePath -// ---------------------------------------------------------------------------- - -// Usually this object is initialized with the associated GtkTreePath -// immediately when it's constructed but it can also be changed later either by -// using Assign() or by getting the pointer to the internally stored pointer -// value using ByRef(). The latter should be avoided but is very convenient -// when using GTK functions with GtkTreePath output parameters. -class wxGtkTreePath -{ -public: - // Ctor takes ownership of the given path and will free it if non-NULL. - wxGtkTreePath(GtkTreePath *path = NULL) : m_path(path) { } - - // Creates a tree path for the given string path. - wxGtkTreePath(const gchar *strpath) - : m_path(gtk_tree_path_new_from_string(strpath)) - { - } - - // Set the stored pointer if not done by ctor. - void Assign(GtkTreePath *path) - { - wxASSERT_MSG( !m_path, "shouldn't be already initialized" ); - - m_path = path; - } - - // Return the pointer to the internally stored pointer. This should only be - // used to initialize the object by passing it to some GTK function. - GtkTreePath **ByRef() - { - wxASSERT_MSG( !m_path, "shouldn't be already initialized" ); - - return &m_path; - } - - - operator GtkTreePath *() const { return m_path; } - - ~wxGtkTreePath() { if ( m_path ) gtk_tree_path_free(m_path); } - -private: - GtkTreePath *m_path; - - wxDECLARE_NO_COPY_CLASS(wxGtkTreePath); -}; - -#endif // _GTK_PRIVATE_TREEVIEW_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/private/value.h b/Externals/wxWidgets3/include/wx/gtk/private/value.h deleted file mode 100644 index e6ce836a2f..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/private/value.h +++ /dev/null @@ -1,43 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/private/value.h -// Purpose: Helper wrapper for working with GValue. -// Author: Vadim Zeitlin -// Created: 2015-03-05 -// Copyright: (c) 2015 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_PRIVATE_VALUE_H_ -#define _WX_GTK_PRIVATE_VALUE_H_ - -// ---------------------------------------------------------------------------- -// wxGtkValue: RAII wrapper for GValue -// ---------------------------------------------------------------------------- - -class wxGtkValue -{ -public: - // Initialize the value of the specified type. - explicit wxGtkValue(GType gtype) - : m_val(G_VALUE_INIT) - { - g_value_init(&m_val, gtype); - } - - ~wxGtkValue() - { - g_value_unset(&m_val); - } - - // Unsafe but convenient access to the real value for GTK+ functions. - operator GValue*() { return &m_val; } - -private: - GValue m_val; - - // For now we just don't support copying at all for simplicity, it could be - // implemented later if needed. - wxDECLARE_NO_COPY_CLASS(wxGtkValue); -}; - -#endif // _WX_GTK_PRIVATE_VALUE_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/private/win_gtk.h b/Externals/wxWidgets3/include/wx/gtk/private/win_gtk.h deleted file mode 100644 index 0fd421f3bc..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/private/win_gtk.h +++ /dev/null @@ -1,35 +0,0 @@ -/* /////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/private/win_gtk.h -// Purpose: native GTK+ widget for wxWindow -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////// */ - -#ifndef _WX_GTK_PIZZA_H_ -#define _WX_GTK_PIZZA_H_ - -#define WX_PIZZA(obj) G_TYPE_CHECK_INSTANCE_CAST(obj, wxPizza::type(), wxPizza) -#define WX_IS_PIZZA(obj) G_TYPE_CHECK_INSTANCE_TYPE(obj, wxPizza::type()) - -struct WXDLLIMPEXP_CORE wxPizza -{ - // borders styles which can be used with wxPizza - enum { BORDER_STYLES = - wxBORDER_SIMPLE | wxBORDER_RAISED | wxBORDER_SUNKEN | wxBORDER_THEME }; - - static GtkWidget* New(long windowStyle = 0); - static GType type(); - void move(GtkWidget* widget, int x, int y, int width, int height); - void put(GtkWidget* widget, int x, int y, int width, int height); - void scroll(int dx, int dy); - void get_border(GtkBorder& border); - - GtkFixed m_fixed; - GList* m_children; - int m_scroll_x; - int m_scroll_y; - int m_windowStyle; -}; - -#endif // _WX_GTK_PIZZA_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/radiobox.h b/Externals/wxWidgets3/include/wx/gtk/radiobox.h deleted file mode 100644 index 9e7df61a93..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/radiobox.h +++ /dev/null @@ -1,153 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/radiobox.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_RADIOBOX_H_ -#define _WX_GTK_RADIOBOX_H_ - -#include "wx/bitmap.h" - -class WXDLLIMPEXP_FWD_CORE wxGTKRadioButtonInfo; - -#include "wx/list.h" - -WX_DECLARE_EXPORTED_LIST(wxGTKRadioButtonInfo, wxRadioBoxButtonsInfoList); - - -//----------------------------------------------------------------------------- -// wxRadioBox -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxRadioBox : public wxControl, - public wxRadioBoxBase -{ -public: - // ctors and dtor - wxRadioBox() { } - wxRadioBox(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, - const wxString choices[] = (const wxString *) NULL, - int majorDim = 0, - long style = wxRA_SPECIFY_COLS, - const wxValidator& val = wxDefaultValidator, - const wxString& name = wxRadioBoxNameStr) - { - Create( parent, id, title, pos, size, n, choices, majorDim, style, val, name ); - } - - wxRadioBox(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - int majorDim = 0, - long style = wxRA_SPECIFY_COLS, - const wxValidator& val = wxDefaultValidator, - const wxString& name = wxRadioBoxNameStr) - { - Create( parent, id, title, pos, size, choices, majorDim, style, val, name ); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, - const wxString choices[] = (const wxString *) NULL, - int majorDim = 0, - long style = wxRA_SPECIFY_COLS, - const wxValidator& val = wxDefaultValidator, - const wxString& name = wxRadioBoxNameStr); - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - int majorDim = 0, - long style = wxRA_SPECIFY_COLS, - const wxValidator& val = wxDefaultValidator, - const wxString& name = wxRadioBoxNameStr); - - virtual ~wxRadioBox(); - - - // implement wxItemContainerImmutable methods - virtual unsigned int GetCount() const wxOVERRIDE; - - virtual wxString GetString(unsigned int n) const wxOVERRIDE; - virtual void SetString(unsigned int n, const wxString& s) wxOVERRIDE; - - virtual void SetSelection(int n) wxOVERRIDE; - virtual int GetSelection() const wxOVERRIDE; - - - // implement wxRadioBoxBase methods - virtual bool Show(unsigned int n, bool show = true) wxOVERRIDE; - virtual bool Enable(unsigned int n, bool enable = true) wxOVERRIDE; - - virtual bool IsItemEnabled(unsigned int n) const wxOVERRIDE; - virtual bool IsItemShown(unsigned int n) const wxOVERRIDE; - - - // override some base class methods to operate on radiobox itself too - virtual bool Show( bool show = true ) wxOVERRIDE; - virtual bool Enable( bool enable = true ) wxOVERRIDE; - - virtual void SetLabel( const wxString& label ) wxOVERRIDE; - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - virtual int GetItemFromPoint( const wxPoint& pt ) const wxOVERRIDE; -#if wxUSE_HELP - // override virtual wxWindow::GetHelpTextAtPoint to use common platform independent - // wxRadioBoxBase::DoGetHelpTextAtPoint from the platform independent - // base class-interface wxRadioBoxBase. - virtual wxString GetHelpTextAtPoint(const wxPoint & pt, wxHelpEvent::Origin origin) const wxOVERRIDE - { - return wxRadioBoxBase::DoGetHelpTextAtPoint( this, pt, origin ); - } -#endif // wxUSE_HELP - - // implementation - // -------------- - - void GtkDisableEvents(); - void GtkEnableEvents(); -#if wxUSE_TOOLTIPS - virtual void GTKApplyToolTip(const char* tip) wxOVERRIDE; -#endif // wxUSE_TOOLTIPS - - wxRadioBoxButtonsInfoList m_buttonsInfo; - -protected: - virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } - -#if wxUSE_TOOLTIPS - virtual void DoSetItemToolTip(unsigned int n, wxToolTip *tooltip) wxOVERRIDE; -#endif - - virtual void DoApplyWidgetStyle(GtkRcStyle *style) wxOVERRIDE; - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE; - - virtual bool GTKNeedsToFilterSameWindowFocus() const wxOVERRIDE { return true; } - - virtual bool GTKWidgetNeedsMnemonic() const wxOVERRIDE; - virtual void GTKWidgetDoSetMnemonic(GtkWidget* w) wxOVERRIDE; - -private: - wxDECLARE_DYNAMIC_CLASS(wxRadioBox); -}; - -#endif // _WX_GTK_RADIOBOX_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/radiobut.h b/Externals/wxWidgets3/include/wx/gtk/radiobut.h deleted file mode 100644 index 340c671c1e..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/radiobut.h +++ /dev/null @@ -1,61 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/radiobut.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_RADIOBUT_H_ -#define _WX_GTK_RADIOBUT_H_ - -//----------------------------------------------------------------------------- -// wxRadioButton -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxRadioButton: public wxControl -{ -public: - wxRadioButton() { } - wxRadioButton( wxWindow *parent, - wxWindowID id, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxRadioButtonNameStr ) - { - Create( parent, id, label, pos, size, style, validator, name ); - } - - bool Create( wxWindow *parent, - wxWindowID id, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxRadioButtonNameStr ); - - virtual void SetLabel(const wxString& label) wxOVERRIDE; - virtual void SetValue(bool val); - virtual bool GetValue() const; - virtual bool Enable( bool enable = true ) wxOVERRIDE; - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - -protected: - virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } - - virtual void DoApplyWidgetStyle(GtkRcStyle *style) wxOVERRIDE; - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE; - -private: - typedef wxControl base_type; - - wxDECLARE_DYNAMIC_CLASS(wxRadioButton); -}; - -#endif // _WX_GTK_RADIOBUT_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/region.h b/Externals/wxWidgets3/include/wx/gtk/region.h deleted file mode 100644 index f8282c6ba8..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/region.h +++ /dev/null @@ -1,138 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/region.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_REGION_H_ -#define _WX_GTK_REGION_H_ - -#ifdef __WXGTK3__ -typedef struct _cairo_region cairo_region_t; -#endif - -// ---------------------------------------------------------------------------- -// wxRegion -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxRegion : public wxRegionBase -{ -public: - wxRegion() { } - - wxRegion( wxCoord x, wxCoord y, wxCoord w, wxCoord h ) - { - InitRect(x, y, w, h); - } - - wxRegion( const wxPoint& topLeft, const wxPoint& bottomRight ) - { - InitRect(topLeft.x, topLeft.y, - bottomRight.x - topLeft.x, bottomRight.y - topLeft.y); - } - - wxRegion( const wxRect& rect ) - { - InitRect(rect.x, rect.y, rect.width, rect.height); - } - - wxRegion( size_t n, const wxPoint *points, - wxPolygonFillMode fillStyle = wxODDEVEN_RULE ); - -#if wxUSE_IMAGE - wxRegion( const wxBitmap& bmp) - { - Union(bmp); - } - wxRegion( const wxBitmap& bmp, - const wxColour& transColour, int tolerance = 0) - { - Union(bmp, transColour, tolerance); - } -#endif // wxUSE_IMAGE - - virtual ~wxRegion(); - - // wxRegionBase methods - virtual void Clear() wxOVERRIDE; - virtual bool IsEmpty() const wxOVERRIDE; - -#ifdef __WXGTK3__ - cairo_region_t* GetRegion() const; -#else - wxRegion(const GdkRegion* region); - GdkRegion *GetRegion() const; -#endif - -protected: - virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE; - - // wxRegionBase pure virtuals - virtual bool DoIsEqual(const wxRegion& region) const wxOVERRIDE; - virtual bool DoGetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const wxOVERRIDE; - virtual wxRegionContain DoContainsPoint(wxCoord x, wxCoord y) const wxOVERRIDE; - virtual wxRegionContain DoContainsRect(const wxRect& rect) const wxOVERRIDE; - - virtual bool DoOffset(wxCoord x, wxCoord y) wxOVERRIDE; - virtual bool DoUnionWithRect(const wxRect& rect) wxOVERRIDE; - virtual bool DoUnionWithRegion(const wxRegion& region) wxOVERRIDE; - virtual bool DoIntersect(const wxRegion& region) wxOVERRIDE; - virtual bool DoSubtract(const wxRegion& region) wxOVERRIDE; - virtual bool DoXor(const wxRegion& region) wxOVERRIDE; - - // common part of ctors for a rectangle region - void InitRect(wxCoord x, wxCoord y, wxCoord w, wxCoord h); - -private: - wxDECLARE_DYNAMIC_CLASS(wxRegion); -}; - -// ---------------------------------------------------------------------------- -// wxRegionIterator: decomposes a region into rectangles -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxRegionIterator: public wxObject -{ -public: - wxRegionIterator(); - wxRegionIterator(const wxRegion& region); - wxRegionIterator(const wxRegionIterator& ri) : wxObject(ri) { Init(); *this = ri; } - ~wxRegionIterator(); - - wxRegionIterator& operator=(const wxRegionIterator& ri); - - void Reset() { m_current = 0u; } - void Reset(const wxRegion& region); - - bool HaveRects() const; - operator bool () const { return HaveRects(); } - - wxRegionIterator& operator ++ (); - wxRegionIterator operator ++ (int); - - wxCoord GetX() const; - wxCoord GetY() const; - wxCoord GetW() const; - wxCoord GetWidth() const { return GetW(); } - wxCoord GetH() const; - wxCoord GetHeight() const { return GetH(); } - wxRect GetRect() const; - -private: - void Init(); - void CreateRects( const wxRegion& r ); - - wxRegion m_region; - wxRect *m_rects; - int m_numRects; - int m_current; - - wxDECLARE_DYNAMIC_CLASS(wxRegionIterator); -}; - - -#endif - // _WX_GTK_REGION_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/scrolbar.h b/Externals/wxWidgets3/include/wx/gtk/scrolbar.h deleted file mode 100644 index ceac3fd209..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/scrolbar.h +++ /dev/null @@ -1,54 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/scrolbar.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_SCROLLBAR_H_ -#define _WX_GTK_SCROLLBAR_H_ - -//----------------------------------------------------------------------------- -// wxScrollBar -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxScrollBar: public wxScrollBarBase -{ -public: - wxScrollBar(); - inline wxScrollBar( wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSB_HORIZONTAL, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxScrollBarNameStr ) - { - Create( parent, id, pos, size, style, validator, name ); - } - bool Create( wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSB_HORIZONTAL, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxScrollBarNameStr ); - virtual ~wxScrollBar(); - int GetThumbPosition() const wxOVERRIDE; - int GetThumbSize() const wxOVERRIDE; - int GetPageSize() const wxOVERRIDE; - int GetRange() const wxOVERRIDE; - virtual void SetThumbPosition( int viewStart ) wxOVERRIDE; - virtual void SetScrollbar( int position, int thumbSize, int range, int pageSize, - bool refresh = true ) wxOVERRIDE; - - void SetThumbSize(int thumbSize); - void SetPageSize( int pageLength ); - void SetRange(int range); - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - wxDECLARE_DYNAMIC_CLASS(wxScrollBar); -}; - -#endif // _WX_GTK_SCROLLBAR_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/scrolwin.h b/Externals/wxWidgets3/include/wx/gtk/scrolwin.h deleted file mode 100644 index c36040ce88..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/scrolwin.h +++ /dev/null @@ -1,79 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/scrolwin.h -// Purpose: wxScrolledWindow class -// Author: Robert Roebling -// Modified by: Vadim Zeitlin (2005-10-10): wxScrolledWindow is now common -// Created: 01/02/97 -// Copyright: (c) Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_SCROLLWIN_H_ -#define _WX_GTK_SCROLLWIN_H_ - -// ---------------------------------------------------------------------------- -// wxScrolledWindow -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxScrollHelper : public wxScrollHelperBase -{ - typedef wxScrollHelperBase base_type; -public: - // default ctor doesn't do anything - wxScrollHelper(wxWindow *win) : wxScrollHelperBase(win) { } - - // implement the base class methods - virtual void SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY, - int noUnitsX, int noUnitsY, - int xPos = 0, int yPos = 0, - bool noRefresh = false); - virtual void AdjustScrollbars(); - - virtual bool IsScrollbarShown(int orient) const; - -protected: - virtual void DoScroll(int x, int y); - virtual void DoShowScrollbars(wxScrollbarVisibility horz, - wxScrollbarVisibility vert); - -private: - // this does (each) half of AdjustScrollbars() work - void DoAdjustScrollbar(GtkRange* range, - int pixelsPerLine, - int winSize, - int virtSize, - int *pos, - int *lines, - int *linesPerPage); - - void DoAdjustHScrollbar(int winSize, int virtSize) - { - DoAdjustScrollbar - ( - m_win->m_scrollBar[wxWindow::ScrollDir_Horz], - m_xScrollPixelsPerLine, winSize, virtSize, - &m_xScrollPosition, &m_xScrollLines, &m_xScrollLinesPerPage - ); - } - - void DoAdjustVScrollbar(int winSize, int virtSize) - { - DoAdjustScrollbar - ( - m_win->m_scrollBar[wxWindow::ScrollDir_Vert], - m_yScrollPixelsPerLine, winSize, virtSize, - &m_yScrollPosition, &m_yScrollLines, &m_yScrollLinesPerPage - ); - } - - // and this does the same for Scroll() - void DoScrollOneDir(int orient, - int pos, - int pixelsPerLine, - int *posOld); - - wxDECLARE_NO_COPY_CLASS(wxScrollHelper); -}; - -#endif // _WX_GTK_SCROLLWIN_H_ - diff --git a/Externals/wxWidgets3/include/wx/gtk/setup0.h b/Externals/wxWidgets3/include/wx/gtk/setup0.h deleted file mode 100644 index c734961a4d..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/setup0.h +++ /dev/null @@ -1,1688 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/setup.h -// Purpose: Configuration for the library -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_SETUP_H_ -#define _WX_SETUP_H_ - -/* --- start common options --- */ -// ---------------------------------------------------------------------------- -// global settings -// ---------------------------------------------------------------------------- - -// define this to 0 when building wxBase library - this can also be done from -// makefile/project file overriding the value here -#ifndef wxUSE_GUI - #define wxUSE_GUI 1 -#endif // wxUSE_GUI - -// ---------------------------------------------------------------------------- -// compatibility settings -// ---------------------------------------------------------------------------- - -// This setting determines the compatibility with 2.8 API: set it to 0 to -// flag all cases of using deprecated functions. -// -// Default is 1 but please try building your code with 0 as the default will -// change to 0 in the next version and the deprecated functions will disappear -// in the version after it completely. -// -// Recommended setting: 0 (please update your code) -#define WXWIN_COMPATIBILITY_2_8 0 - -// This setting determines the compatibility with 3.0 API: set it to 0 to -// flag all cases of using deprecated functions. -// -// Default is 1 but please try building your code with 0 as the default will -// change to 0 in the next version and the deprecated functions will disappear -// in the version after it completely. -// -// Recommended setting: 0 (please update your code) -#define WXWIN_COMPATIBILITY_3_0 1 - -// MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when -// default system font is used for wxWindow::GetCharWidth/Height() instead of -// the current font. -// -// Default is 0 -// -// Recommended setting: 0 -#define wxDIALOG_UNIT_COMPATIBILITY 0 - -// ---------------------------------------------------------------------------- -// debugging settings -// ---------------------------------------------------------------------------- - -// wxDEBUG_LEVEL will be defined as 1 in wx/debug.h so normally there is no -// need to define it here. You may do it for two reasons: either completely -// disable/compile out the asserts in release version (then do it inside #ifdef -// NDEBUG) or, on the contrary, enable more asserts, including the usually -// disabled ones, in the debug build (then do it inside #ifndef NDEBUG) -// -// #ifdef NDEBUG -// #define wxDEBUG_LEVEL 0 -// #else -// #define wxDEBUG_LEVEL 2 -// #endif - -// wxHandleFatalExceptions() may be used to catch the program faults at run -// time and, instead of terminating the program with a usual GPF message box, -// call the user-defined wxApp::OnFatalException() function. If you set -// wxUSE_ON_FATAL_EXCEPTION to 0, wxHandleFatalExceptions() will not work. -// -// This setting is for Win32 only and can only be enabled if your compiler -// supports Win32 structured exception handling (currently only VC++ does) -// -// Default is 1 -// -// Recommended setting: 1 if your compiler supports it. -#define wxUSE_ON_FATAL_EXCEPTION 1 - -// Set this to 1 to be able to generate a human-readable (unlike -// machine-readable minidump created by wxCrashReport::Generate()) stack back -// trace when your program crashes using wxStackWalker -// -// Default is 1 if supported by the compiler. -// -// Recommended setting: 1, set to 0 if your programs never crash -#define wxUSE_STACKWALKER 1 - -// Set this to 1 to compile in wxDebugReport class which allows you to create -// and optionally upload to your web site a debug report consisting of back -// trace of the crash (if wxUSE_STACKWALKER == 1) and other information. -// -// Default is 1 if supported by the compiler. -// -// Recommended setting: 1, it is compiled into a separate library so there -// is no overhead if you don't use it -#define wxUSE_DEBUGREPORT 1 - -// Generic comment about debugging settings: they are very useful if you don't -// use any other memory leak detection tools such as Purify/BoundsChecker, but -// are probably redundant otherwise. Also, Visual C++ CRT has the same features -// as wxWidgets memory debugging subsystem built in since version 5.0 and you -// may prefer to use it instead of built in memory debugging code because it is -// faster and more fool proof. -// -// Using VC++ CRT memory debugging is enabled by default in debug build (_DEBUG -// is defined) if wxUSE_GLOBAL_MEMORY_OPERATORS is *not* enabled (i.e. is 0) -// and if __NO_VC_CRTDBG__ is not defined. - -// The rest of the options in this section are obsolete and not supported, -// enable them at your own risk. - -// If 1, enables wxDebugContext, for writing error messages to file, etc. If -// __WXDEBUG__ is not defined, will still use the normal memory operators. -// -// Default is 0 -// -// Recommended setting: 0 -#define wxUSE_DEBUG_CONTEXT 0 - -// If 1, enables debugging versions of wxObject::new and wxObject::delete *IF* -// __WXDEBUG__ is also defined. -// -// WARNING: this code may not work with all architectures, especially if -// alignment is an issue. This switch is currently ignored for mingw / cygwin -// -// Default is 0 -// -// Recommended setting: 1 if you are not using a memory debugging tool, else 0 -#define wxUSE_MEMORY_TRACING 0 - -// In debug mode, cause new and delete to be redefined globally. -// If this causes problems (e.g. link errors which is a common problem -// especially if you use another library which also redefines the global new -// and delete), set this to 0. -// This switch is currently ignored for mingw / cygwin -// -// Default is 0 -// -// Recommended setting: 0 -#define wxUSE_GLOBAL_MEMORY_OPERATORS 0 - -// In debug mode, causes new to be defined to be WXDEBUG_NEW (see object.h). If -// this causes problems (e.g. link errors), set this to 0. You may need to set -// this to 0 if using templates (at least for VC++). This switch is currently -// ignored for MinGW/Cygwin. -// -// Default is 0 -// -// Recommended setting: 0 -#define wxUSE_DEBUG_NEW_ALWAYS 0 - - -// ---------------------------------------------------------------------------- -// Unicode support -// ---------------------------------------------------------------------------- - -// These settings are obsolete: the library is always built in Unicode mode -// now, only set wxUSE_UNICODE to 0 to compile legacy code in ANSI mode if -// absolutely necessary -- updating it is strongly recommended as the ANSI mode -// will disappear completely in future wxWidgets releases. -#ifndef wxUSE_UNICODE - #define wxUSE_UNICODE 1 -#endif - -// wxUSE_WCHAR_T is required by wxWidgets now, don't change. -#define wxUSE_WCHAR_T 1 - -// ---------------------------------------------------------------------------- -// global features -// ---------------------------------------------------------------------------- - -// Compile library in exception-safe mode? If set to 1, the library will try to -// behave correctly in presence of exceptions (even though it still will not -// use the exceptions itself) and notify the user code about any unhandled -// exceptions. If set to 0, propagation of the exceptions through the library -// code will lead to undefined behaviour -- but the code itself will be -// slightly smaller and faster. -// -// Note that like wxUSE_THREADS this option is automatically set to 0 if -// wxNO_EXCEPTIONS is defined. -// -// Default is 1 -// -// Recommended setting: depends on whether you intend to use C++ exceptions -// in your own code (1 if you do, 0 if you don't) -#define wxUSE_EXCEPTIONS 1 - -// Set wxUSE_EXTENDED_RTTI to 1 to use extended RTTI -// -// Default is 0 -// -// Recommended setting: 0 (this is still work in progress...) -#define wxUSE_EXTENDED_RTTI 0 - -// Support for message/error logging. This includes wxLogXXX() functions and -// wxLog and derived classes. Don't set this to 0 unless you really know what -// you are doing. -// -// Default is 1 -// -// Recommended setting: 1 (always) -#define wxUSE_LOG 1 - -// Recommended setting: 1 -#define wxUSE_LOGWINDOW 1 - -// Recommended setting: 1 -#define wxUSE_LOGGUI 1 - -// Recommended setting: 1 -#define wxUSE_LOG_DIALOG 1 - -// Support for command line parsing using wxCmdLineParser class. -// -// Default is 1 -// -// Recommended setting: 1 (can be set to 0 if you don't use the cmd line) -#define wxUSE_CMDLINE_PARSER 1 - -// Support for multithreaded applications: if 1, compile in thread classes -// (thread.h) and make the library a bit more thread safe. Although thread -// support is quite stable by now, you may still consider recompiling the -// library without it if you have no use for it - this will result in a -// somewhat smaller and faster operation. -// -// Notice that if wxNO_THREADS is defined, wxUSE_THREADS is automatically reset -// to 0 in wx/chkconf.h, so, for example, if you set USE_THREADS to 0 in -// build/msw/config.* file this value will have no effect. -// -// Default is 1 -// -// Recommended setting: 0 unless you do plan to develop MT applications -#define wxUSE_THREADS 1 - -// If enabled, compiles wxWidgets streams classes -// -// wx stream classes are used for image IO, process IO redirection, network -// protocols implementation and much more and so disabling this results in a -// lot of other functionality being lost. -// -// Default is 1 -// -// Recommended setting: 1 as setting it to 0 disables many other things -#define wxUSE_STREAMS 1 - -// Support for positional parameters (e.g. %1$d, %2$s ...) in wxVsnprintf. -// Note that if the system's implementation does not support positional -// parameters, setting this to 1 forces the use of the wxWidgets implementation -// of wxVsnprintf. The standard vsnprintf() supports positional parameters on -// many Unix systems but usually doesn't under Windows. -// -// Positional parameters are very useful when translating a program since using -// them in formatting strings allow translators to correctly reorder the -// translated sentences. -// -// Default is 1 -// -// Recommended setting: 1 if you want to support multiple languages -#define wxUSE_PRINTF_POS_PARAMS 1 - -// Enable the use of compiler-specific thread local storage keyword, if any. -// This is used for wxTLS_XXX() macros implementation and normally should use -// the compiler-provided support as it's simpler and more efficient, but is -// disabled under Windows in wx/msw/chkconf.h as it can't be used if wxWidgets -// is used in a dynamically loaded Win32 DLL (i.e. using LoadLibrary()) under -// XP as this triggers a bug in compiler TLS support that results in crashes -// when any TLS variables are used. -// -// If you're absolutely sure that your build of wxWidgets is never going to be -// used in such situation, either because it's not going to be linked from any -// kind of plugin or because you only target Vista or later systems, you can -// set this to 2 to force the use of compiler TLS even under MSW. -// -// Default is 1 meaning that compiler TLS is used only if it's 100% safe. -// -// Recommended setting: 2 if you want to have maximal performance and don't -// care about the scenario described above. -#define wxUSE_COMPILER_TLS 1 - -// ---------------------------------------------------------------------------- -// Interoperability with the standard library. -// ---------------------------------------------------------------------------- - -// Set wxUSE_STL to 1 to enable maximal interoperability with the standard -// library, even at the cost of backwards compatibility. -// -// Default is 0 -// -// Recommended setting: 0 as the options below already provide a relatively -// good level of interoperability and changing this option arguably isn't worth -// diverging from the official builds of the library. -#define wxUSE_STL 0 - -// This is not a real option but is used as the default value for -// wxUSE_STD_IOSTREAM, wxUSE_STD_STRING and wxUSE_STD_CONTAINERS_COMPATIBLY. -// -// Set it to 0 if you want to disable the use of all standard classes -// completely for some reason. -#define wxUSE_STD_DEFAULT 1 - -// Use standard C++ containers where it can be done without breaking backwards -// compatibility. -// -// This provides better interoperability with the standard library, e.g. with -// this option on it's possible to insert std::vector<> into many wxWidgets -// containers directly. -// -// Default is 1. -// -// Recommended setting is 1 unless you want to avoid all dependencies on the -// standard library. -#define wxUSE_STD_CONTAINERS_COMPATIBLY wxUSE_STD_DEFAULT - -// Use standard C++ containers to implement wxVector<>, wxStack<>, wxDList<> -// and wxHashXXX<> classes. If disabled, wxWidgets own (mostly compatible but -// usually more limited) implementations are used which allows to avoid the -// dependency on the C++ run-time library. -// -// Default is 0 for compatibility reasons. -// -// Recommended setting: 1 unless compatibility with the official wxWidgets -// build and/or the existing code is a concern. -#define wxUSE_STD_CONTAINERS 0 - -// Use standard C++ streams if 1 instead of wx streams in some places. If -// disabled, wx streams are used everywhere and wxWidgets doesn't depend on the -// standard streams library. -// -// Notice that enabling this does not replace wx streams with std streams -// everywhere, in a lot of places wx streams are used no matter what. -// -// Default is 1 if compiler supports it. -// -// Recommended setting: 1 if you use the standard streams anyhow and so -// dependency on the standard streams library is not a -// problem -#define wxUSE_STD_IOSTREAM wxUSE_STD_DEFAULT - -// Enable minimal interoperability with the standard C++ string class if 1. -// "Minimal" means that wxString can be constructed from std::string or -// std::wstring but can't be implicitly converted to them. You need to enable -// the option below for the latter. -// -// Default is 1 for most compilers. -// -// Recommended setting: 1 unless you want to ensure your program doesn't use -// the standard C++ library at all. -#define wxUSE_STD_STRING wxUSE_STD_DEFAULT - -// Make wxString as much interchangeable with std::[w]string as possible, in -// particular allow implicit conversion of wxString to either of these classes. -// This comes at a price (or a benefit, depending on your point of view) of not -// allowing implicit conversion to "const char *" and "const wchar_t *". -// -// Because a lot of existing code relies on these conversions, this option is -// disabled by default but can be enabled for your build if you don't care -// about compatibility. -// -// Default is 0 if wxUSE_STL has its default value or 1 if it is enabled. -// -// Recommended setting: 0 to remain compatible with the official builds of -// wxWidgets. -#define wxUSE_STD_STRING_CONV_IN_WXSTRING wxUSE_STL - -// VC++ 4.2 and above allows and but you can't mix -// them. Set this option to 1 to use , 0 to use . -// -// Note that newer compilers (including VC++ 7.1 and later) don't support -// wxUSE_IOSTREAMH == 1 and so will be used anyhow. -// -// Default is 0. -// -// Recommended setting: 0, only set to 1 if you use a really old compiler -#define wxUSE_IOSTREAMH 0 - - -// ---------------------------------------------------------------------------- -// non GUI features selection -// ---------------------------------------------------------------------------- - -// Set wxUSE_LONGLONG to 1 to compile the wxLongLong class. This is a 64 bit -// integer which is implemented in terms of native 64 bit integers if any or -// uses emulation otherwise. -// -// This class is required by wxDateTime and so you should enable it if you want -// to use wxDateTime. For most modern platforms, it will use the native 64 bit -// integers in which case (almost) all of its functions are inline and it -// almost does not take any space, so there should be no reason to switch it -// off. -// -// Recommended setting: 1 -#define wxUSE_LONGLONG 1 - -// Set wxUSE_BASE64 to 1, to compile in Base64 support. This is required for -// storing binary data in wxConfig on most platforms. -// -// Default is 1. -// -// Recommended setting: 1 (but can be safely disabled if you don't use it) -#define wxUSE_BASE64 1 - -// Set this to 1 to be able to use wxEventLoop even in console applications -// (i.e. using base library only, without GUI). This is mostly useful for -// processing socket events but is also necessary to use timers in console -// applications -// -// Default is 1. -// -// Recommended setting: 1 (but can be safely disabled if you don't use it) -#define wxUSE_CONSOLE_EVENTLOOP 1 - -// Set wxUSE_(F)FILE to 1 to compile wx(F)File classes. wxFile uses low level -// POSIX functions for file access, wxFFile uses ANSI C stdio.h functions. -// -// Default is 1 -// -// Recommended setting: 1 (wxFile is highly recommended as it is required by -// i18n code, wxFileConfig and others) -#define wxUSE_FILE 1 -#define wxUSE_FFILE 1 - -// Use wxFSVolume class providing access to the configured/active mount points -// -// Default is 1 -// -// Recommended setting: 1 (but may be safely disabled if you don't use it) -#define wxUSE_FSVOLUME 1 - -// Use wxStandardPaths class which allows to retrieve some standard locations -// in the file system -// -// Default is 1 -// -// Recommended setting: 1 (may be disabled to save space, but not much) -#define wxUSE_STDPATHS 1 - -// use wxTextBuffer class: required by wxTextFile -#define wxUSE_TEXTBUFFER 1 - -// use wxTextFile class: requires wxFile and wxTextBuffer, required by -// wxFileConfig -#define wxUSE_TEXTFILE 1 - -// i18n support: _() macro, wxLocale class. Requires wxTextFile. -#define wxUSE_INTL 1 - -// Provide wxFoo_l() functions similar to standard foo() functions but taking -// an extra locale parameter. -// -// Notice that this is fully implemented only for the systems providing POSIX -// xlocale support or Microsoft Visual C++ >= 8 (which provides proprietary -// almost-equivalent of xlocale functions), otherwise wxFoo_l() functions will -// only work for the current user locale and "C" locale. You can use -// wxHAS_XLOCALE_SUPPORT to test whether the full support is available. -// -// Default is 1 -// -// Recommended setting: 1 but may be disabled if you are writing programs -// running only in C locale anyhow -#define wxUSE_XLOCALE 1 - -// Set wxUSE_DATETIME to 1 to compile the wxDateTime and related classes which -// allow to manipulate dates, times and time intervals. -// -// Requires: wxUSE_LONGLONG -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_DATETIME 1 - -// Set wxUSE_TIMER to 1 to compile wxTimer class -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_TIMER 1 - -// Use wxStopWatch clas. -// -// Default is 1 -// -// Recommended setting: 1 (needed by wxSocket) -#define wxUSE_STOPWATCH 1 - -// Set wxUSE_FSWATCHER to 1 if you want to enable wxFileSystemWatcher -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_FSWATCHER 1 - -// Setting wxUSE_CONFIG to 1 enables the use of wxConfig and related classes -// which allow the application to store its settings in the persistent -// storage. Setting this to 1 will also enable on-demand creation of the -// global config object in wxApp. -// -// See also wxUSE_CONFIG_NATIVE below. -// -// Recommended setting: 1 -#define wxUSE_CONFIG 1 - -// If wxUSE_CONFIG is 1, you may choose to use either the native config -// classes under Windows (using .INI files under Win16 and the registry under -// Win32) or the portable text file format used by the config classes under -// Unix. -// -// Default is 1 to use native classes. Note that you may still use -// wxFileConfig even if you set this to 1 - just the config object created by -// default for the applications needs will be a wxRegConfig or wxIniConfig and -// not wxFileConfig. -// -// Recommended setting: 1 -#define wxUSE_CONFIG_NATIVE 1 - -// If wxUSE_DIALUP_MANAGER is 1, compile in wxDialUpManager class which allows -// to connect/disconnect from the network and be notified whenever the dial-up -// network connection is established/terminated. Requires wxUSE_DYNAMIC_LOADER. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_DIALUP_MANAGER 1 - -// Compile in classes for run-time DLL loading and function calling. -// Required by wxUSE_DIALUP_MANAGER. -// -// This setting is for Win32 only -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_DYNLIB_CLASS 1 - -// experimental, don't use for now -#define wxUSE_DYNAMIC_LOADER 1 - -// Set to 1 to use socket classes -#define wxUSE_SOCKETS 1 - -// Set to 1 to use ipv6 socket classes (requires wxUSE_SOCKETS) -// -// Notice that currently setting this option under Windows will result in -// programs which can only run on recent OS versions (with ws2_32.dll -// installed) which is why it is disabled by default. -// -// Default is 1. -// -// Recommended setting: 1 if you need IPv6 support -#define wxUSE_IPV6 0 - -// Set to 1 to enable virtual file systems (required by wxHTML) -#define wxUSE_FILESYSTEM 1 - -// Set to 1 to enable virtual ZIP filesystem (requires wxUSE_FILESYSTEM) -#define wxUSE_FS_ZIP 1 - -// Set to 1 to enable virtual archive filesystem (requires wxUSE_FILESYSTEM) -#define wxUSE_FS_ARCHIVE 1 - -// Set to 1 to enable virtual Internet filesystem (requires wxUSE_FILESYSTEM) -#define wxUSE_FS_INET 1 - -// wxArchive classes for accessing archives such as zip and tar -#define wxUSE_ARCHIVE_STREAMS 1 - -// Set to 1 to compile wxZipInput/OutputStream classes. -#define wxUSE_ZIPSTREAM 1 - -// Set to 1 to compile wxTarInput/OutputStream classes. -#define wxUSE_TARSTREAM 1 - -// Set to 1 to compile wxZlibInput/OutputStream classes. Also required by -// wxUSE_LIBPNG -#define wxUSE_ZLIB 1 - -// If enabled, the code written by Apple will be used to write, in a portable -// way, float on the disk. See extended.c for the license which is different -// from wxWidgets one. -// -// Default is 1. -// -// Recommended setting: 1 unless you don't like the license terms (unlikely) -#define wxUSE_APPLE_IEEE 1 - -// Joystick support class -#define wxUSE_JOYSTICK 1 - -// wxFontEnumerator class -#define wxUSE_FONTENUM 1 - -// wxFontMapper class -#define wxUSE_FONTMAP 1 - -// wxMimeTypesManager class -#define wxUSE_MIMETYPE 1 - -// wxProtocol and related classes: if you want to use either of wxFTP, wxHTTP -// or wxURL you need to set this to 1. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_PROTOCOL 1 - -// The settings for the individual URL schemes -#define wxUSE_PROTOCOL_FILE 1 -#define wxUSE_PROTOCOL_FTP 1 -#define wxUSE_PROTOCOL_HTTP 1 - -// Define this to use wxURL class. -#define wxUSE_URL 1 - -// Define this to use native platform url and protocol support. -// Currently valid only for MS-Windows. -// Note: if you set this to 1, you can open ftp/http/gopher sites -// and obtain a valid input stream for these sites -// even when you set wxUSE_PROTOCOL_FTP/HTTP to 0. -// Doing so reduces the code size. -// -// This code is experimental and subject to change. -#define wxUSE_URL_NATIVE 0 - -// Support for wxVariant class used in several places throughout the library, -// notably in wxDataViewCtrl API. -// -// Default is 1. -// -// Recommended setting: 1 unless you want to reduce the library size as much as -// possible in which case setting this to 0 can gain up to 100KB. -#define wxUSE_VARIANT 1 - -// Support for wxAny class, the successor for wxVariant. -// -// Default is 1. -// -// Recommended setting: 1 unless you want to reduce the library size by a small amount, -// or your compiler cannot for some reason cope with complexity of templates used. -#define wxUSE_ANY 1 - -// Support for regular expression matching via wxRegEx class: enable this to -// use POSIX regular expressions in your code. You need to compile regex -// library from src/regex to use it under Windows. -// -// Default is 0 -// -// Recommended setting: 1 if your compiler supports it, if it doesn't please -// contribute us a makefile for src/regex for it -#define wxUSE_REGEX 1 - -// wxSystemOptions class -#define wxUSE_SYSTEM_OPTIONS 1 - -// wxSound class -#define wxUSE_SOUND 1 - -// Use wxMediaCtrl -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_MEDIACTRL 1 - -// Use wxWidget's XRC XML-based resource system. Recommended. -// -// Default is 1 -// -// Recommended setting: 1 (requires wxUSE_XML) -#define wxUSE_XRC 1 - -// XML parsing classes. Note that their API will change in the future, so -// using wxXmlDocument and wxXmlNode in your app is not recommended. -// -// Default is the same as wxUSE_XRC, i.e. 1 by default. -// -// Recommended setting: 1 (required by XRC) -#define wxUSE_XML wxUSE_XRC - -// Use wxWidget's AUI docking system -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_AUI 1 - -// Use wxWidget's Ribbon classes for interfaces -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_RIBBON 1 - -// Use wxPropertyGrid. -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_PROPGRID 1 - -// Use wxStyledTextCtrl, a wxWidgets implementation of Scintilla. -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_STC 1 - -// Use wxWidget's web viewing classes -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_WEBVIEW 1 - -// Use the IE wxWebView backend -// -// Default is 1 on MSW -// -// Recommended setting: 1 -#ifdef __WXMSW__ -#define wxUSE_WEBVIEW_IE 1 -#else -#define wxUSE_WEBVIEW_IE 0 -#endif - -// Use the WebKit wxWebView backend -// -// Default is 1 on GTK and OSX -// -// Recommended setting: 1 -#if defined(__WXGTK__) || defined(__WXOSX__) -#define wxUSE_WEBVIEW_WEBKIT 1 -#else -#define wxUSE_WEBVIEW_WEBKIT 0 -#endif - -// Enable wxGraphicsContext and related classes for a modern 2D drawing API. -// -// Default is 1 except if you're using a non-Microsoft compiler under Windows -// as only MSVC is known to ship with at least gdiplus.h which is required to -// compile GDI+-based implementation of wxGraphicsContext (MSVC10 and later -// versions also include d2d1.h required for Direct2D-based implementation). -// For other compilers (e.g. mingw32) you may need to install the headers (and -// just the headers) yourself. If you do, change the setting below manually. -// -// Recommended setting: 1 if supported by the compilation environment - -// notice that we can't use wxCHECK_VISUALC_VERSION() here as this file is -// included from wx/platform.h before wxCHECK_VISUALC_VERSION() is defined -#ifdef _MSC_VER -# define wxUSE_GRAPHICS_CONTEXT 1 -#else - // Disable support for other Windows compilers, enable it if your compiler - // comes with new enough SDK or you installed the headers manually. - // - // Notice that this will be set by configure under non-Windows platforms - // anyhow so the value there is not important. -# define wxUSE_GRAPHICS_CONTEXT 0 -#endif - -// Enable wxGraphicsContext implementation using Cairo library. -// -// This is not needed under Windows and detected automatically by configure -// under other systems, however you may set this to 1 manually if you installed -// Cairo under Windows yourself and prefer to use it instead the native GDI+ -// implementation. -// -// Default is 0 -// -// Recommended setting: 0 -#define wxUSE_CAIRO 0 - - -// ---------------------------------------------------------------------------- -// Individual GUI controls -// ---------------------------------------------------------------------------- - -// You must set wxUSE_CONTROLS to 1 if you are using any controls at all -// (without it, wxControl class is not compiled) -// -// Default is 1 -// -// Recommended setting: 1 (don't change except for very special programs) -#define wxUSE_CONTROLS 1 - -// Support markup in control labels, i.e. provide wxControl::SetLabelMarkup(). -// Currently markup is supported only by a few controls and only some ports but -// their number will increase with time. -// -// Default is 1 -// -// Recommended setting: 1 (may be set to 0 if you want to save on code size) -#define wxUSE_MARKUP 1 - -// wxPopupWindow class is a top level transient window. It is currently used -// to implement wxTipWindow -// -// Default is 1 -// -// Recommended setting: 1 (may be set to 0 if you don't wxUSE_TIPWINDOW) -#define wxUSE_POPUPWIN 1 - -// wxTipWindow allows to implement the custom tooltips, it is used by the -// context help classes. Requires wxUSE_POPUPWIN. -// -// Default is 1 -// -// Recommended setting: 1 (may be set to 0) -#define wxUSE_TIPWINDOW 1 - -// Each of the settings below corresponds to one wxWidgets control. They are -// all switched on by default but may be disabled if you are sure that your -// program (including any standard dialogs it can show!) doesn't need them and -// if you desperately want to save some space. If you use any of these you must -// set wxUSE_CONTROLS as well. -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_ACTIVITYINDICATOR 1 // wxActivityIndicator -#define wxUSE_ANIMATIONCTRL 1 // wxAnimationCtrl -#define wxUSE_BANNERWINDOW 1 // wxBannerWindow -#define wxUSE_BUTTON 1 // wxButton -#define wxUSE_BMPBUTTON 1 // wxBitmapButton -#define wxUSE_CALENDARCTRL 1 // wxCalendarCtrl -#define wxUSE_CHECKBOX 1 // wxCheckBox -#define wxUSE_CHECKLISTBOX 1 // wxCheckListBox (requires wxUSE_OWNER_DRAWN) -#define wxUSE_CHOICE 1 // wxChoice -#define wxUSE_COLLPANE 1 // wxCollapsiblePane -#define wxUSE_COLOURPICKERCTRL 1 // wxColourPickerCtrl -#define wxUSE_COMBOBOX 1 // wxComboBox -#define wxUSE_COMMANDLINKBUTTON 1 // wxCommandLinkButton -#define wxUSE_DATAVIEWCTRL 1 // wxDataViewCtrl -#define wxUSE_DATEPICKCTRL 1 // wxDatePickerCtrl -#define wxUSE_DIRPICKERCTRL 1 // wxDirPickerCtrl -#define wxUSE_EDITABLELISTBOX 1 // wxEditableListBox -#define wxUSE_FILECTRL 1 // wxFileCtrl -#define wxUSE_FILEPICKERCTRL 1 // wxFilePickerCtrl -#define wxUSE_FONTPICKERCTRL 1 // wxFontPickerCtrl -#define wxUSE_GAUGE 1 // wxGauge -#define wxUSE_HEADERCTRL 1 // wxHeaderCtrl -#define wxUSE_HYPERLINKCTRL 1 // wxHyperlinkCtrl -#define wxUSE_LISTBOX 1 // wxListBox -#define wxUSE_LISTCTRL 1 // wxListCtrl -#define wxUSE_RADIOBOX 1 // wxRadioBox -#define wxUSE_RADIOBTN 1 // wxRadioButton -#define wxUSE_RICHMSGDLG 1 // wxRichMessageDialog -#define wxUSE_SCROLLBAR 1 // wxScrollBar -#define wxUSE_SEARCHCTRL 1 // wxSearchCtrl -#define wxUSE_SLIDER 1 // wxSlider -#define wxUSE_SPINBTN 1 // wxSpinButton -#define wxUSE_SPINCTRL 1 // wxSpinCtrl -#define wxUSE_STATBOX 1 // wxStaticBox -#define wxUSE_STATLINE 1 // wxStaticLine -#define wxUSE_STATTEXT 1 // wxStaticText -#define wxUSE_STATBMP 1 // wxStaticBitmap -#define wxUSE_TEXTCTRL 1 // wxTextCtrl -#define wxUSE_TIMEPICKCTRL 1 // wxTimePickerCtrl -#define wxUSE_TOGGLEBTN 1 // requires wxButton -#define wxUSE_TREECTRL 1 // wxTreeCtrl -#define wxUSE_TREELISTCTRL 1 // wxTreeListCtrl - -// Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR -// below either wxStatusBar95 or a generic wxStatusBar will be used. -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_STATUSBAR 1 - -// Two status bar implementations are available under Win32: the generic one -// or the wrapper around native control. For native look and feel the native -// version should be used. -// -// Default is 1 for the platforms where native status bar is supported. -// -// Recommended setting: 1 (there is no advantage in using the generic one) -#define wxUSE_NATIVE_STATUSBAR 1 - -// wxToolBar related settings: if wxUSE_TOOLBAR is 0, don't compile any toolbar -// classes at all. Otherwise, use the native toolbar class unless -// wxUSE_TOOLBAR_NATIVE is 0. -// -// Default is 1 for all settings. -// -// Recommended setting: 1 for wxUSE_TOOLBAR and wxUSE_TOOLBAR_NATIVE. -#define wxUSE_TOOLBAR 1 -#define wxUSE_TOOLBAR_NATIVE 1 - -// wxNotebook is a control with several "tabs" located on one of its sides. It -// may be used to logically organise the data presented to the user instead of -// putting everything in one huge dialog. It replaces wxTabControl and related -// classes of wxWin 1.6x. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_NOTEBOOK 1 - -// wxListbook control is similar to wxNotebook but uses wxListCtrl instead of -// the tabs -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_LISTBOOK 1 - -// wxChoicebook control is similar to wxNotebook but uses wxChoice instead of -// the tabs -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_CHOICEBOOK 1 - -// wxTreebook control is similar to wxNotebook but uses wxTreeCtrl instead of -// the tabs -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_TREEBOOK 1 - -// wxToolbook control is similar to wxNotebook but uses wxToolBar instead of -// tabs -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_TOOLBOOK 1 - -// wxTaskBarIcon is a small notification icon shown in the system toolbar or -// dock. -// -// Default is 1. -// -// Recommended setting: 1 (but can be set to 0 if you don't need it) -#define wxUSE_TASKBARICON 1 - -// wxGrid class -// -// Default is 1, set to 0 to cut down compilation time and binaries size if you -// don't use it. -// -// Recommended setting: 1 -// -#define wxUSE_GRID 1 - -// wxMiniFrame class: a frame with narrow title bar -// -// Default is 1. -// -// Recommended setting: 1 (it doesn't cost almost anything) -#define wxUSE_MINIFRAME 1 - -// wxComboCtrl and related classes: combobox with custom popup window and -// not necessarily a listbox. -// -// Default is 1. -// -// Recommended setting: 1 but can be safely set to 0 except for wxUniv where it -// it used by wxComboBox -#define wxUSE_COMBOCTRL 1 - -// wxOwnerDrawnComboBox is a custom combobox allowing to paint the combobox -// items. -// -// Default is 1. -// -// Recommended setting: 1 but can be safely set to 0, except where it is -// needed as a base class for generic wxBitmapComboBox. -#define wxUSE_ODCOMBOBOX 1 - -// wxBitmapComboBox is a combobox that can have images in front of text items. -// -// Default is 1. -// -// Recommended setting: 1 but can be safely set to 0 -#define wxUSE_BITMAPCOMBOBOX 1 - -// wxRearrangeCtrl is a wxCheckListBox with two buttons allowing to move items -// up and down in it. It is also used as part of wxRearrangeDialog. -// -// Default is 1. -// -// Recommended setting: 1 but can be safely set to 0 (currently used only by -// wxHeaderCtrl) -#define wxUSE_REARRANGECTRL 1 - -// wxAddRemoveCtrl is a composite control containing a control showing some -// items (e.g. wxListBox, wxListCtrl, wxTreeCtrl, wxDataViewCtrl, ...) and "+"/ -// "-" buttons allowing to add and remove items to/from the control. -// -// Default is 1. -// -// Recommended setting: 1 but can be safely set to 0 if you don't need it (not -// used by the library itself). -#define wxUSE_ADDREMOVECTRL 1 - -// ---------------------------------------------------------------------------- -// Miscellaneous GUI stuff -// ---------------------------------------------------------------------------- - -// wxAcceleratorTable/Entry classes and support for them in wxMenu(Bar) -#define wxUSE_ACCEL 1 - -// Use the standard art provider. The icons returned by this provider are -// embedded into the library as XPMs so disabling it reduces the library size -// somewhat but this should only be done if you use your own custom art -// provider returning the icons or never use any icons not provided by the -// native art provider (which might not be implemented at all for some -// platforms) or by the Tango icons provider (if it's not itself disabled -// below). -// -// Default is 1. -// -// Recommended setting: 1 unless you use your own custom art provider. -#define wxUSE_ARTPROVIDER_STD 1 - -// Use art provider providing Tango icons: this art provider has higher quality -// icons than the default ones using smaller size XPM icons without -// transparency but the embedded PNG icons add to the library size. -// -// Default is 1 under non-GTK ports. Under wxGTK the native art provider using -// the GTK+ stock icons replaces it so it is normally not necessary. -// -// Recommended setting: 1 but can be turned off to reduce the library size. -#define wxUSE_ARTPROVIDER_TANGO 1 - -// Hotkey support (currently Windows only) -#define wxUSE_HOTKEY 1 - -// Use wxCaret: a class implementing a "cursor" in a text control (called caret -// under Windows). -// -// Default is 1. -// -// Recommended setting: 1 (can be safely set to 0, not used by the library) -#define wxUSE_CARET 1 - -// Use wxDisplay class: it allows enumerating all displays on a system and -// their geometries as well as finding the display on which the given point or -// window lies. -// -// Default is 1. -// -// Recommended setting: 1 if you need it, can be safely set to 0 otherwise -#define wxUSE_DISPLAY 1 - -// Miscellaneous geometry code: needed for Canvas library -#define wxUSE_GEOMETRY 1 - -// Use wxImageList. This class is needed by wxNotebook, wxTreeCtrl and -// wxListCtrl. -// -// Default is 1. -// -// Recommended setting: 1 (set it to 0 if you don't use any of the controls -// enumerated above, then this class is mostly useless too) -#define wxUSE_IMAGLIST 1 - -// Use wxInfoBar class. -// -// Default is 1. -// -// Recommended setting: 1 (but can be disabled without problems as nothing -// depends on it) -#define wxUSE_INFOBAR 1 - -// Use wxMenu, wxMenuBar, wxMenuItem. -// -// Default is 1. -// -// Recommended setting: 1 (can't be disabled under MSW) -#define wxUSE_MENUS 1 - -// Use wxNotificationMessage. -// -// wxNotificationMessage allows to show non-intrusive messages to the user -// using balloons, banners, popups or whatever is the appropriate method for -// the current platform. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_NOTIFICATION_MESSAGE 1 - -// wxPreferencesEditor provides a common API for different ways of presenting -// the standard "Preferences" or "Properties" dialog under different platforms -// (e.g. some use modal dialogs, some use modeless ones; some apply the changes -// immediately while others require an explicit "Apply" button). -// -// Default is 1. -// -// Recommended setting: 1 (but can be safely disabled if you don't use it) -#define wxUSE_PREFERENCES_EDITOR 1 - -// wxRichToolTip is a customizable tooltip class which has more functionality -// than the stock (but native, unlike this class) wxToolTip. -// -// Default is 1. -// -// Recommended setting: 1 (but can be safely set to 0 if you don't need it) -#define wxUSE_RICHTOOLTIP 1 - -// Use wxSashWindow class. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_SASH 1 - -// Use wxSplitterWindow class. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_SPLITTER 1 - -// Use wxToolTip and wxWindow::Set/GetToolTip() methods. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_TOOLTIPS 1 - -// wxValidator class and related methods -#define wxUSE_VALIDATORS 1 - -// Use reference counted ID management: this means that wxWidgets will track -// the automatically allocated ids (those used when you use wxID_ANY when -// creating a window, menu or toolbar item &c) instead of just supposing that -// the program never runs out of them. This is mostly useful only under wxMSW -// where the total ids range is limited to SHRT_MIN..SHRT_MAX and where -// long-running programs can run into problems with ids reuse without this. On -// the other platforms, where the ids have the full int range, this shouldn't -// be necessary. -#ifdef __WXMSW__ -#define wxUSE_AUTOID_MANAGEMENT 1 -#else -#define wxUSE_AUTOID_MANAGEMENT 0 -#endif - -// ---------------------------------------------------------------------------- -// common dialogs -// ---------------------------------------------------------------------------- - -// On rare occasions (e.g. using DJGPP) may want to omit common dialogs (e.g. -// file selector, printer dialog). Switching this off also switches off the -// printing architecture and interactive wxPrinterDC. -// -// Default is 1 -// -// Recommended setting: 1 (unless it really doesn't work) -#define wxUSE_COMMON_DIALOGS 1 - -// wxBusyInfo displays window with message when app is busy. Works in same way -// as wxBusyCursor -#define wxUSE_BUSYINFO 1 - -// Use single/multiple choice dialogs. -// -// Default is 1 -// -// Recommended setting: 1 (used in the library itself) -#define wxUSE_CHOICEDLG 1 - -// Use colour picker dialog -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_COLOURDLG 1 - -// wxDirDlg class for getting a directory name from user -#define wxUSE_DIRDLG 1 - -// TODO: setting to choose the generic or native one - -// Use file open/save dialogs. -// -// Default is 1 -// -// Recommended setting: 1 (used in many places in the library itself) -#define wxUSE_FILEDLG 1 - -// Use find/replace dialogs. -// -// Default is 1 -// -// Recommended setting: 1 (but may be safely set to 0) -#define wxUSE_FINDREPLDLG 1 - -// Use font picker dialog -// -// Default is 1 -// -// Recommended setting: 1 (used in the library itself) -#define wxUSE_FONTDLG 1 - -// Use wxMessageDialog and wxMessageBox. -// -// Default is 1 -// -// Recommended setting: 1 (used in the library itself) -#define wxUSE_MSGDLG 1 - -// progress dialog class for lengthy operations -#define wxUSE_PROGRESSDLG 1 - -// Set to 0 to disable the use of the native progress dialog (currently only -// available under MSW and suffering from some bugs there, hence this option). -#define wxUSE_NATIVE_PROGRESSDLG 1 - -// support for startup tips (wxShowTip &c) -#define wxUSE_STARTUP_TIPS 1 - -// text entry dialog and wxGetTextFromUser function -#define wxUSE_TEXTDLG 1 - -// number entry dialog -#define wxUSE_NUMBERDLG 1 - -// splash screen class -#define wxUSE_SPLASH 1 - -// wizards -#define wxUSE_WIZARDDLG 1 - -// Compile in wxAboutBox() function showing the standard "About" dialog. -// -// Default is 1 -// -// Recommended setting: 1 but can be set to 0 to save some space if you don't -// use this function -#define wxUSE_ABOUTDLG 1 - -// wxFileHistory class -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_FILE_HISTORY 1 - -// ---------------------------------------------------------------------------- -// Metafiles support -// ---------------------------------------------------------------------------- - -// Windows supports the graphics format known as metafile which is, though not -// portable, is widely used under Windows and so is supported by wxWin (under -// Windows only, of course). Win16 (Win3.1) used the so-called "Window -// MetaFiles" or WMFs which were replaced with "Enhanced MetaFiles" or EMFs in -// Win32 (Win9x, NT, 2000). Both of these are supported in wxWin and, by -// default, WMFs will be used under Win16 and EMFs under Win32. This may be -// changed by setting wxUSE_WIN_METAFILES_ALWAYS to 1 and/or setting -// wxUSE_ENH_METAFILE to 0. You may also set wxUSE_METAFILE to 0 to not compile -// in any metafile related classes at all. -// -// Default is 1 for wxUSE_ENH_METAFILE and 0 for wxUSE_WIN_METAFILES_ALWAYS. -// -// Recommended setting: default or 0 for everything for portable programs. -#define wxUSE_METAFILE 1 -#define wxUSE_ENH_METAFILE 1 -#define wxUSE_WIN_METAFILES_ALWAYS 0 - -// ---------------------------------------------------------------------------- -// Big GUI components -// ---------------------------------------------------------------------------- - -// Set to 0 to disable MDI support. -// -// Requires wxUSE_NOTEBOOK under platforms other than MSW. -// -// Default is 1. -// -// Recommended setting: 1, can be safely set to 0. -#define wxUSE_MDI 1 - -// Set to 0 to disable document/view architecture -#define wxUSE_DOC_VIEW_ARCHITECTURE 1 - -// Set to 0 to disable MDI document/view architecture -// -// Requires wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE -#define wxUSE_MDI_ARCHITECTURE 1 - -// Set to 0 to disable print/preview architecture code -#define wxUSE_PRINTING_ARCHITECTURE 1 - -// wxHTML sublibrary allows to display HTML in wxWindow programs and much, -// much more. -// -// Default is 1. -// -// Recommended setting: 1 (wxHTML is great!), set to 0 if you want compile a -// smaller library. -#define wxUSE_HTML 1 - -// Setting wxUSE_GLCANVAS to 1 enables OpenGL support. You need to have OpenGL -// headers and libraries to be able to compile the library with wxUSE_GLCANVAS -// set to 1 and, under Windows, also to add opengl32.lib and glu32.lib to the -// list of libraries used to link your application (although this is done -// implicitly for Microsoft Visual C++ users). -// -// Default is 1. -// -// Recommended setting: 1 if you intend to use OpenGL, can be safely set to 0 -// otherwise. -#define wxUSE_GLCANVAS 1 - -// wxRichTextCtrl allows editing of styled text. -// -// Default is 1. -// -// Recommended setting: 1, set to 0 if you want compile a -// smaller library. -#define wxUSE_RICHTEXT 1 - -// ---------------------------------------------------------------------------- -// Data transfer -// ---------------------------------------------------------------------------- - -// Use wxClipboard class for clipboard copy/paste. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_CLIPBOARD 1 - -// Use wxDataObject and related classes. Needed for clipboard and OLE drag and -// drop -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_DATAOBJ 1 - -// Use wxDropTarget and wxDropSource classes for drag and drop (this is -// different from "built in" drag and drop in wxTreeCtrl which is always -// available). Requires wxUSE_DATAOBJ. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_DRAG_AND_DROP 1 - -// Use wxAccessible for enhanced and customisable accessibility. -// Depends on wxUSE_OLE. -// -// Default is 0. -// -// Recommended setting (at present): 0 -#define wxUSE_ACCESSIBILITY 0 - -// ---------------------------------------------------------------------------- -// miscellaneous settings -// ---------------------------------------------------------------------------- - -// wxSingleInstanceChecker class allows to verify at startup if another program -// instance is running. -// -// Default is 1 -// -// Recommended setting: 1 (the class is tiny, disabling it won't save much -// space) -#define wxUSE_SNGLINST_CHECKER 1 - -#define wxUSE_DRAGIMAGE 1 - -#define wxUSE_IPC 1 - // 0 for no interprocess comms -#define wxUSE_HELP 1 - // 0 for no help facility - -// Should we use MS HTML help for wxHelpController? If disabled, neither -// wxCHMHelpController nor wxBestHelpController are available. -// -// Default is 1 under MSW, 0 is always used for the other platforms. -// -// Recommended setting: 1, only set to 0 if you have trouble compiling -// wxCHMHelpController (could be a problem with really ancient compilers) -#define wxUSE_MS_HTML_HELP 1 - - -// Use wxHTML-based help controller? -#define wxUSE_WXHTML_HELP 1 - -#define wxUSE_CONSTRAINTS 1 - // 0 for no window layout constraint system - -#define wxUSE_SPLINES 1 - // 0 for no splines - -#define wxUSE_MOUSEWHEEL 1 - // Include mouse wheel support - -// Compile wxUIActionSimulator class? -#define wxUSE_UIACTIONSIMULATOR 1 - -// ---------------------------------------------------------------------------- -// wxDC classes for various output formats -// ---------------------------------------------------------------------------- - -// Set to 1 for PostScript device context. -#define wxUSE_POSTSCRIPT 0 - -// Set to 1 to use font metric files in GetTextExtent -#define wxUSE_AFM_FOR_POSTSCRIPT 1 - -// Set to 1 to compile in support for wxSVGFileDC, a wxDC subclass which allows -// to create files in SVG (Scalable Vector Graphics) format. -#define wxUSE_SVG 1 - -// Should wxDC provide SetTransformMatrix() and related methods? -// -// Default is 1 but can be set to 0 if this functionality is not used. Notice -// that currently only wxMSW supports this so setting this to 0 doesn't change -// much for non-MSW platforms (although it will still save a few bytes -// probably). -// -// Recommended setting: 1. -#define wxUSE_DC_TRANSFORM_MATRIX 1 - -// ---------------------------------------------------------------------------- -// image format support -// ---------------------------------------------------------------------------- - -// wxImage supports many different image formats which can be configured at -// compile-time. BMP is always supported, others are optional and can be safely -// disabled if you don't plan to use images in such format sometimes saving -// substantial amount of code in the final library. -// -// Some formats require an extra library which is included in wxWin sources -// which is mentioned if it is the case. - -// Set to 1 for wxImage support (recommended). -#define wxUSE_IMAGE 1 - -// Set to 1 for PNG format support (requires libpng). Also requires wxUSE_ZLIB. -#define wxUSE_LIBPNG 1 - -// Set to 1 for JPEG format support (requires libjpeg) -#define wxUSE_LIBJPEG 1 - -// Set to 1 for TIFF format support (requires libtiff) -#define wxUSE_LIBTIFF 1 - -// Set to 1 for TGA format support (loading only) -#define wxUSE_TGA 1 - -// Set to 1 for GIF format support -#define wxUSE_GIF 1 - -// Set to 1 for PNM format support -#define wxUSE_PNM 1 - -// Set to 1 for PCX format support -#define wxUSE_PCX 1 - -// Set to 1 for IFF format support (Amiga format) -#define wxUSE_IFF 0 - -// Set to 1 for XPM format support -#define wxUSE_XPM 1 - -// Set to 1 for MS Icons and Cursors format support -#define wxUSE_ICO_CUR 1 - -// Set to 1 to compile in wxPalette class -#define wxUSE_PALETTE 1 - -// ---------------------------------------------------------------------------- -// wxUniversal-only options -// ---------------------------------------------------------------------------- - -// Set to 1 to enable compilation of all themes, this is the default -#define wxUSE_ALL_THEMES 1 - -// Set to 1 to enable the compilation of individual theme if wxUSE_ALL_THEMES -// is unset, if it is set these options are not used; notice that metal theme -// uses Win32 one -#define wxUSE_THEME_GTK 0 -#define wxUSE_THEME_METAL 0 -#define wxUSE_THEME_MONO 0 -#define wxUSE_THEME_WIN32 0 - - -/* --- end common options --- */ - -/* --- start MSW options --- */ -// ---------------------------------------------------------------------------- -// Graphics backends choices for Windows -// ---------------------------------------------------------------------------- - -// The options here are only taken into account if wxUSE_GRAPHICS_CONTEXT is 1. - -// Enable support for GDI+-based implementation of wxGraphicsContext. -// -// Default is 1. -// -// Recommended setting: 1 if you need to support XP, as Direct2D is not -// available there. -#define wxUSE_GRAPHICS_GDIPLUS wxUSE_GRAPHICS_CONTEXT - -// Enable support for Direct2D-based implementation of wxGraphicsContext. -// -// Default is 1 for compilers which support it, i.e. VC10+ currently. If you -// use an earlier MSVC version or another compiler and installed the necessary -// SDK components manually, you need to change this setting. -// -// Recommended setting: 1 for faster and better quality graphics under Windows -// 7 and later systems (if wxUSE_GRAPHICS_GDIPLUS is also enabled, earlier -// systems will fall back on using GDI+). -#if defined(_MSC_VER) && _MSC_VER >= 1600 - #define wxUSE_GRAPHICS_DIRECT2D wxUSE_GRAPHICS_CONTEXT -#else - #define wxUSE_GRAPHICS_DIRECT2D 0 -#endif - -// ---------------------------------------------------------------------------- -// Windows-only settings -// ---------------------------------------------------------------------------- - -// Set this to 1 for generic OLE support: this is required for drag-and-drop, -// clipboard, OLE Automation. Only set it to 0 if your compiler is very old and -// can't compile/doesn't have the OLE headers. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_OLE 1 - -// Set this to 1 to enable wxAutomationObject class. -// -// Default is 1. -// -// Recommended setting: 1 if you need to control other applications via OLE -// Automation, can be safely set to 0 otherwise -#define wxUSE_OLE_AUTOMATION 1 - -// Set this to 1 to enable wxActiveXContainer class allowing to embed OLE -// controls in wx. -// -// Default is 1. -// -// Recommended setting: 1, required by wxMediaCtrl -#define wxUSE_ACTIVEX 1 - -// Enable WinRT support -// -// Default is 1 for compilers which support it, i.e. VS2012+ currently. If you -// use an earlier MSVC version or another compiler and installed the necessary -// SDK components manually, you need to change this setting. -// -// Recommended setting: 1 -#if defined(_MSC_VER) && _MSC_VER >= 1700 - #define wxUSE_WINRT 1 -#else - #define wxUSE_WINRT 0 -#endif - -// wxDC caching implementation -#define wxUSE_DC_CACHEING 1 - -// Set this to 1 to enable wxDIB class used internally for manipulating -// wxBitmap data. -// -// Default is 1, set it to 0 only if you don't use wxImage neither -// -// Recommended setting: 1 (without it conversion to/from wxImage won't work) -#define wxUSE_WXDIB 1 - -// Set to 0 to disable PostScript print/preview architecture code under Windows -// (just use Windows printing). -#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1 - -// Set this to 1 to compile in wxRegKey class. -// -// Default is 1 -// -// Recommended setting: 1, this is used internally by wx in a few places -#define wxUSE_REGKEY 1 - -// Set this to 1 to use RICHEDIT controls for wxTextCtrl with style wxTE_RICH -// which allows to put more than ~32Kb of text in it even under Win9x (NT -// doesn't have such limitation). -// -// Default is 1 for compilers which support it -// -// Recommended setting: 1, only set it to 0 if your compiler doesn't have -// or can't compile -#define wxUSE_RICHEDIT 1 - -// Set this to 1 to use extra features of richedit v2 and later controls -// -// Default is 1 for compilers which support it -// -// Recommended setting: 1 -#define wxUSE_RICHEDIT2 1 - -// Set this to 1 to enable support for the owner-drawn menu and listboxes. This -// is required by wxUSE_CHECKLISTBOX. -// -// Default is 1. -// -// Recommended setting: 1, set to 0 for a small library size reduction -#define wxUSE_OWNER_DRAWN 1 - -// Set this to 1 to enable MSW-specific wxTaskBarIcon::ShowBalloon() method. It -// is required by native wxNotificationMessage implementation. -// -// Default is 1 but disabled in wx/msw/chkconf.h if SDK is too old to contain -// the necessary declarations. -// -// Recommended setting: 1, set to 0 for a tiny library size reduction -#define wxUSE_TASKBARICON_BALLOONS 1 - -// Set this to 1 to enable following functionality added in Windows 7: thumbnail -// representations, thumbnail toolbars, notification and status overlays, -// progress indicators and jump lists. -// -// Default is 1. -// -// Recommended setting: 1, set to 0 for a tiny library size reduction -#define wxUSE_TASKBARBUTTON 1 - -// Set to 1 to compile MS Windows XP theme engine support -#define wxUSE_UXTHEME 1 - -// Set to 1 to use InkEdit control (Tablet PC), if available -#define wxUSE_INKEDIT 0 - -// Set to 1 to enable .INI files based wxConfig implementation (wxIniConfig) -// -// Default is 0. -// -// Recommended setting: 0, nobody uses .INI files any more -#define wxUSE_INICONF 0 - -// ---------------------------------------------------------------------------- -// Generic versions of native controls -// ---------------------------------------------------------------------------- - -// Set this to 1 to be able to use wxDatePickerCtrlGeneric in addition to the -// native wxDatePickerCtrl -// -// Default is 0. -// -// Recommended setting: 0, this is mainly used for testing -#define wxUSE_DATEPICKCTRL_GENERIC 0 - -// Set this to 1 to be able to use wxTimePickerCtrlGeneric in addition to the -// native wxTimePickerCtrl for the platforms that have the latter (MSW). -// -// Default is 0. -// -// Recommended setting: 0, this is mainly used for testing -#define wxUSE_TIMEPICKCTRL_GENERIC 0 - -// ---------------------------------------------------------------------------- -// Crash debugging helpers -// ---------------------------------------------------------------------------- - -// Set this to 1 to be able to use wxCrashReport::Generate() to create mini -// dumps of your program when it crashes (or at any other moment) -// -// Default is 1 if supported by the compiler (VC++ and recent BC++ only). -// -// Recommended setting: 1, set to 0 if your programs never crash -#define wxUSE_CRASHREPORT 1 -/* --- end MSW options --- */ - -// GTK-specific options used when not using configure. As we can't test for the -// exact GTK version (without including GTK+ headers that we don't want to -// include from our own public headers), just assume a recent GTK 2.x. -#define __WXGTK20__ -#define __WXGTK210__ -#define __WXGTK218__ -//#define __WXGTK3__ - -#endif // _WX_SETUP_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/slider.h b/Externals/wxWidgets3/include/wx/gtk/slider.h deleted file mode 100644 index 7dfc2ac772..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/slider.h +++ /dev/null @@ -1,84 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/slider.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_SLIDER_H_ -#define _WX_GTK_SLIDER_H_ - -// ---------------------------------------------------------------------------- -// wxSlider -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxSlider : public wxSliderBase -{ -public: - wxSlider(); - wxSlider(wxWindow *parent, - wxWindowID id, - int value, int minValue, int maxValue, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSL_HORIZONTAL, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxSliderNameStr) - { - Create( parent, id, value, minValue, maxValue, - pos, size, style, validator, name ); - } - ~wxSlider(); - - bool Create(wxWindow *parent, - wxWindowID id, - int value, int minValue, int maxValue, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSL_HORIZONTAL, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxSliderNameStr); - - // implement the base class pure virtuals - virtual int GetValue() const wxOVERRIDE; - virtual void SetValue(int value) wxOVERRIDE; - - virtual void SetRange(int minValue, int maxValue) wxOVERRIDE; - virtual int GetMin() const wxOVERRIDE; - virtual int GetMax() const wxOVERRIDE; - - virtual void SetLineSize(int lineSize) wxOVERRIDE; - virtual void SetPageSize(int pageSize) wxOVERRIDE; - virtual int GetLineSize() const wxOVERRIDE; - virtual int GetPageSize() const wxOVERRIDE; - - virtual void SetThumbLength(int lenPixels) wxOVERRIDE; - virtual int GetThumbLength() const wxOVERRIDE; - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - // implementation - void GTKDisableEvents(); - void GTKEnableEvents(); - bool GTKEventsDisabled() const; - - double m_pos; - int m_scrollEventType; - bool m_needThumbRelease; - GtkWidget *m_scale; - -protected: - GtkWidget *m_minLabel,*m_maxLabel; - bool m_blockScrollEvent; - - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE; - - // set the slider value unconditionally - void GTKSetValue(int value); - - wxDECLARE_DYNAMIC_CLASS(wxSlider); -}; - -#endif // _WX_GTK_SLIDER_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/spinbutt.h b/Externals/wxWidgets3/include/wx/gtk/spinbutt.h deleted file mode 100644 index ae974200b7..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/spinbutt.h +++ /dev/null @@ -1,65 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/spinbutt.h -// Purpose: wxSpinButton class -// Author: Robert Roebling -// Modified by: -// Copyright: (c) Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_SPINBUTT_H_ -#define _WX_GTK_SPINBUTT_H_ - -//----------------------------------------------------------------------------- -// wxSpinButton -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxSpinButton : public wxSpinButtonBase -{ -public: - wxSpinButton(); - wxSpinButton(wxWindow *parent, - wxWindowID id = -1, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSP_VERTICAL, - const wxString& name = wxSPIN_BUTTON_NAME) - { - Create(parent, id, pos, size, style, name); - } - - bool Create(wxWindow *parent, - wxWindowID id = -1, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSP_VERTICAL, - const wxString& name = wxSPIN_BUTTON_NAME); - - virtual int GetValue() const wxOVERRIDE; - virtual void SetValue( int value ) wxOVERRIDE; - virtual void SetRange( int minVal, int maxVal ) wxOVERRIDE; - virtual int GetMin() const wxOVERRIDE; - virtual int GetMax() const wxOVERRIDE; - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - virtual bool Enable( bool enable = true ) wxOVERRIDE; - - // implementation - int m_pos; - -protected: - void GtkDisableEvents() const; - void GtkEnableEvents() const; - - virtual wxSize DoGetBestSize() const wxOVERRIDE; - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE; - -private: - typedef wxSpinButtonBase base_type; - - wxDECLARE_DYNAMIC_CLASS(wxSpinButton); -}; - -#endif // _WX_GTK_SPINBUTT_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/spinctrl.h b/Externals/wxWidgets3/include/wx/gtk/spinctrl.h deleted file mode 100644 index 4972737cf2..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/spinctrl.h +++ /dev/null @@ -1,205 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/spinctrl.h -// Purpose: wxSpinCtrl class -// Author: Robert Roebling -// Modified by: -// Copyright: (c) Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_SPINCTRL_H_ -#define _WX_GTK_SPINCTRL_H_ - -//----------------------------------------------------------------------------- -// wxSpinCtrlGTKBase - Base class for GTK versions of the wxSpinCtrl[Double] -// -// This class manages a double valued GTK spinctrl through the DoGet/SetXXX -// functions that are made public as Get/SetXXX functions for int or double -// for the wxSpinCtrl and wxSpinCtrlDouble classes respectively to avoid -// function ambiguity. -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxSpinCtrlGTKBase : public wxSpinCtrlBase -{ -public: - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& value, - const wxPoint& pos, - const wxSize& size, - long style, - double min, double max, double initial, - double inc, - const wxString& name); - - // wxSpinCtrl(Double) methods call DoXXX functions of the same name - - // accessors - // T GetValue() const - // T GetMin() const - // T GetMax() const - // T GetIncrement() const - virtual bool GetSnapToTicks() const wxOVERRIDE; - - // operations - virtual void SetValue(const wxString& value) wxOVERRIDE; - // void SetValue(T val) - // void SetRange(T minVal, T maxVal) - // void SetIncrement(T inc) - void SetSnapToTicks( bool snap_to_ticks ) wxOVERRIDE; - - // Select text in the textctrl - void SetSelection(long from, long to) wxOVERRIDE; - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - // implementation - void OnChar( wxKeyEvent &event ); - -protected: - double DoGetValue() const; - double DoGetMin() const; - double DoGetMax() const; - double DoGetIncrement() const; - - void DoSetValue(double val); - void DoSetValue(const wxString& strValue); - void DoSetRange(double min_val, double max_val); - void DoSetIncrement(double inc); - - void GtkDisableEvents() const; - void GtkEnableEvents() const; - - virtual wxSize DoGetBestSize() const wxOVERRIDE; - virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const wxOVERRIDE; - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE; - - // Widgets that use the style->base colour for the BG colour should - // override this and return true. - virtual bool UseGTKStyleBase() const wxOVERRIDE { return true; } - - friend class wxSpinCtrlEventDisabler; - - wxDECLARE_EVENT_TABLE(); -}; - -//----------------------------------------------------------------------------- -// wxSpinCtrl - An integer valued spin control -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxSpinCtrl : public wxSpinCtrlGTKBase -{ -public: - wxSpinCtrl() { Init(); } - wxSpinCtrl(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT, - int min = 0, int max = 100, int initial = 0, - const wxString& name = wxS("wxSpinCtrl")) - { - Init(); - - Create(parent, id, value, pos, size, style, min, max, initial, name); - } - - bool Create(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT, - int min = 0, int max = 100, int initial = 0, - const wxString& name = wxS("wxSpinCtrl")) - { - return wxSpinCtrlGTKBase::Create(parent, id, value, pos, size, - style, min, max, initial, 1, name); - } - - // accessors - int GetValue() const { return int(DoGetValue()); } - int GetMin() const { return int(DoGetMin()); } - int GetMax() const { return int(DoGetMax()); } - int GetIncrement() const { return int(DoGetIncrement()); } - - // operations - void SetValue(const wxString& value) wxOVERRIDE { wxSpinCtrlGTKBase::SetValue(value); } // visibility problem w/ gcc - void SetValue( int value ) { DoSetValue(value); } - void SetRange( int minVal, int maxVal ) { DoSetRange(minVal, maxVal); } - void SetIncrement(int inc) { DoSetIncrement(inc); } - - virtual int GetBase() const wxOVERRIDE { return m_base; } - virtual bool SetBase(int base) wxOVERRIDE; - -private: - // Common part of all ctors. - void Init() - { - m_base = 10; - } - - int m_base; - - wxDECLARE_DYNAMIC_CLASS(wxSpinCtrl); -}; - -//----------------------------------------------------------------------------- -// wxSpinCtrlDouble - a double valued spin control -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxSpinCtrlDouble : public wxSpinCtrlGTKBase -{ -public: - wxSpinCtrlDouble() {} - wxSpinCtrlDouble(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT, - double min = 0, double max = 100, double initial = 0, - double inc = 1, - const wxString& name = wxS("wxSpinCtrlDouble")) - { - Create(parent, id, value, pos, size, style, - min, max, initial, inc, name); - } - - bool Create(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT, - double min = 0, double max = 100, double initial = 0, - double inc = 1, - const wxString& name = wxS("wxSpinCtrlDouble")) - { - return wxSpinCtrlGTKBase::Create(parent, id, value, pos, size, - style, min, max, initial, inc, name); - } - - // accessors - double GetValue() const { return DoGetValue(); } - double GetMin() const { return DoGetMin(); } - double GetMax() const { return DoGetMax(); } - double GetIncrement() const { return DoGetIncrement(); } - unsigned GetDigits() const; - - // operations - void SetValue(const wxString& value) wxOVERRIDE { wxSpinCtrlGTKBase::SetValue(value); } // visibility problem w/ gcc - void SetValue(double value) { DoSetValue(value); } - void SetRange(double minVal, double maxVal) { DoSetRange(minVal, maxVal); } - void SetIncrement(double inc) { DoSetIncrement(inc); } - void SetDigits(unsigned digits); - - virtual int GetBase() const wxOVERRIDE { return 10; } - virtual bool SetBase(int WXUNUSED(base)) wxOVERRIDE { return false; } - - wxDECLARE_DYNAMIC_CLASS(wxSpinCtrlDouble); -}; - -#endif // _WX_GTK_SPINCTRL_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/statbmp.h b/Externals/wxWidgets3/include/wx/gtk/statbmp.h deleted file mode 100644 index e79255ee3a..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/statbmp.h +++ /dev/null @@ -1,58 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/statbmp.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __GTKSTATICBITMAPH__ -#define __GTKSTATICBITMAPH__ - -#include "wx/icon.h" - -//----------------------------------------------------------------------------- -// wxStaticBitmap -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxStaticBitmap : public wxStaticBitmapBase -{ -public: - wxStaticBitmap(); - wxStaticBitmap( wxWindow *parent, - wxWindowID id, - const wxBitmap& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxStaticBitmapNameStr ); - bool Create( wxWindow *parent, - wxWindowID id, - const wxBitmap& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxStaticBitmapNameStr); - - virtual void SetIcon(const wxIcon& icon) wxOVERRIDE { SetBitmap( icon ); } - virtual void SetBitmap( const wxBitmap& bitmap ) wxOVERRIDE; - virtual wxBitmap GetBitmap() const wxOVERRIDE { return m_bitmap; } - - // for compatibility with wxMSW - wxIcon GetIcon() const wxOVERRIDE - { - // don't use wxDynamicCast, icons and bitmaps are really the same thing - // in wxGTK - return (const wxIcon &)m_bitmap; - } - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - -private: - wxBitmap m_bitmap; - - wxDECLARE_DYNAMIC_CLASS(wxStaticBitmap); -}; - -#endif // __GTKSTATICBITMAPH__ diff --git a/Externals/wxWidgets3/include/wx/gtk/statbox.h b/Externals/wxWidgets3/include/wx/gtk/statbox.h deleted file mode 100644 index 7dd72b86ff..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/statbox.h +++ /dev/null @@ -1,57 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/statbox.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTKSTATICBOX_H_ -#define _WX_GTKSTATICBOX_H_ - -//----------------------------------------------------------------------------- -// wxStaticBox -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxStaticBox : public wxStaticBoxBase -{ -public: - wxStaticBox(); - wxStaticBox( wxWindow *parent, - wxWindowID id, - const wxString &label, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - long style = 0, - const wxString &name = wxStaticBoxNameStr ); - bool Create( wxWindow *parent, - wxWindowID id, - const wxString &label, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - long style = 0, - const wxString &name = wxStaticBoxNameStr ); - - virtual void SetLabel( const wxString &label ) wxOVERRIDE; - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - // implementation - - virtual bool GTKIsTransparentForMouse() const wxOVERRIDE { return true; } - - virtual void GetBordersForSizer(int *borderTop, int *borderOther) const wxOVERRIDE; - - virtual void AddChild( wxWindowBase *child ) wxOVERRIDE; - -protected: - virtual bool GTKWidgetNeedsMnemonic() const wxOVERRIDE; - virtual void GTKWidgetDoSetMnemonic(GtkWidget* w) wxOVERRIDE; - - void DoApplyWidgetStyle(GtkRcStyle *style) wxOVERRIDE; - - wxDECLARE_DYNAMIC_CLASS(wxStaticBox); -}; - -#endif // _WX_GTKSTATICBOX_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/statline.h b/Externals/wxWidgets3/include/wx/gtk/statline.h deleted file mode 100644 index 97501d609a..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/statline.h +++ /dev/null @@ -1,48 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/statline.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __GTKSTATICLINEH__ -#define __GTKSTATICLINEH__ - -#include "wx/defs.h" - -#if wxUSE_STATLINE - -// ---------------------------------------------------------------------------- -// wxStaticLine -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxStaticLine : public wxStaticLineBase -{ -public: - wxStaticLine(); - wxStaticLine(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxPoint &pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxLI_HORIZONTAL, - const wxString &name = wxStaticLineNameStr); - bool Create(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxLI_HORIZONTAL, - const wxString &name = wxStaticLineNameStr); - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - -private: - wxDECLARE_DYNAMIC_CLASS(wxStaticLine); -}; - -#endif // wxUSE_STATLINE - -#endif // __GTKSTATICLINEH__ - diff --git a/Externals/wxWidgets3/include/wx/gtk/stattext.h b/Externals/wxWidgets3/include/wx/gtk/stattext.h deleted file mode 100644 index b94f399a50..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/stattext.h +++ /dev/null @@ -1,69 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/stattext.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_STATTEXT_H_ -#define _WX_GTK_STATTEXT_H_ - -//----------------------------------------------------------------------------- -// wxStaticText -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxStaticText : public wxStaticTextBase -{ -public: - wxStaticText(); - wxStaticText(wxWindow *parent, - wxWindowID id, - const wxString &label, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - long style = 0, - const wxString &name = wxStaticTextNameStr ); - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString &label, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - long style = 0, - const wxString &name = wxStaticTextNameStr ); - - void SetLabel( const wxString &label ) wxOVERRIDE; - - bool SetFont( const wxFont &font ) wxOVERRIDE; - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - // implementation - // -------------- - -protected: - virtual bool GTKWidgetNeedsMnemonic() const wxOVERRIDE; - virtual void GTKWidgetDoSetMnemonic(GtkWidget* w) wxOVERRIDE; - - virtual wxSize DoGetBestSize() const wxOVERRIDE; - - virtual wxString DoGetLabel() const wxOVERRIDE; - virtual void DoSetLabel(const wxString& str) wxOVERRIDE; -#if wxUSE_MARKUP - virtual bool DoSetLabelMarkup(const wxString& markup) wxOVERRIDE; -#endif // wxUSE_MARKUP - -private: - // Common part of SetLabel() and DoSetLabelMarkup(). - typedef void (wxStaticText::*GTKLabelSetter)(GtkLabel *, const wxString&); - - void GTKDoSetLabel(GTKLabelSetter setter, const wxString& label); - - - wxDECLARE_DYNAMIC_CLASS(wxStaticText); -}; - -#endif - // _WX_GTK_STATTEXT_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/taskbar.h b/Externals/wxWidgets3/include/wx/gtk/taskbar.h deleted file mode 100644 index d351904c4b..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/taskbar.h +++ /dev/null @@ -1,33 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/taskbar.h -// Purpose: wxTaskBarIcon class for GTK2 -// Author: Paul Cornett -// Created: 2009-02-08 -// Copyright: (c) 2009 Paul Cornett -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_TASKBARICON_H_ -#define _WX_GTK_TASKBARICON_H_ - -class WXDLLIMPEXP_ADV wxTaskBarIcon: public wxTaskBarIconBase -{ -public: - wxTaskBarIcon(wxTaskBarIconType iconType = wxTBI_DEFAULT_TYPE); - ~wxTaskBarIcon(); - virtual bool SetIcon(const wxIcon& icon, const wxString& tooltip = wxString()) wxOVERRIDE; - virtual bool RemoveIcon() wxOVERRIDE; - virtual bool PopupMenu(wxMenu* menu) wxOVERRIDE; - bool IsOk() const { return true; } - bool IsIconInstalled() const; - - class Private; - -private: - Private* m_priv; - - wxDECLARE_DYNAMIC_CLASS(wxTaskBarIcon); - wxDECLARE_NO_COPY_CLASS(wxTaskBarIcon); -}; - -#endif // _WX_GTK_TASKBARICON_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/textctrl.h b/Externals/wxWidgets3/include/wx/gtk/textctrl.h deleted file mode 100644 index 921538b726..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/textctrl.h +++ /dev/null @@ -1,228 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/textctrl.h -// Purpose: -// Author: Robert Roebling -// Created: 01/02/97 -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_TEXTCTRL_H_ -#define _WX_GTK_TEXTCTRL_H_ - -typedef struct _GtkTextMark GtkTextMark; - -//----------------------------------------------------------------------------- -// wxTextCtrl -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxTextCtrl: public wxTextCtrlBase -{ -public: - wxTextCtrl() { Init(); } - wxTextCtrl(wxWindow *parent, - wxWindowID id, - const wxString &value = wxEmptyString, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString &name = wxTextCtrlNameStr); - - virtual ~wxTextCtrl(); - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString &value = wxEmptyString, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString &name = wxTextCtrlNameStr); - - // implement base class pure virtuals - // ---------------------------------- - - virtual void WriteText(const wxString& text) wxOVERRIDE; - virtual wxString GetValue() const wxOVERRIDE; - virtual bool IsEmpty() const; - - virtual int GetLineLength(long lineNo) const wxOVERRIDE; - virtual wxString GetLineText(long lineNo) const wxOVERRIDE; - virtual int GetNumberOfLines() const wxOVERRIDE; - - virtual bool IsModified() const wxOVERRIDE; - virtual bool IsEditable() const wxOVERRIDE; - - virtual void GetSelection(long* from, long* to) const wxOVERRIDE; - - virtual void Remove(long from, long to) wxOVERRIDE; - - virtual void MarkDirty() wxOVERRIDE; - virtual void DiscardEdits() wxOVERRIDE; - - virtual bool SetStyle(long start, long end, const wxTextAttr& style) wxOVERRIDE; - virtual bool GetStyle(long position, wxTextAttr& style) wxOVERRIDE; - - // translate between the position (which is just an index in the text ctrl - // considering all its contents as a single strings) and (x, y) coordinates - // which represent column and line. - virtual long XYToPosition(long x, long y) const wxOVERRIDE; - virtual bool PositionToXY(long pos, long *x, long *y) const wxOVERRIDE; - - virtual void ShowPosition(long pos) wxOVERRIDE; - - virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const wxOVERRIDE; - virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, - wxTextCoord *col, - wxTextCoord *row) const wxOVERRIDE - { - return wxTextCtrlBase::HitTest(pt, col, row); - } - - // Clipboard operations - virtual void Copy() wxOVERRIDE; - virtual void Cut() wxOVERRIDE; - virtual void Paste() wxOVERRIDE; - - // Insertion point - virtual void SetInsertionPoint(long pos) wxOVERRIDE; - virtual long GetInsertionPoint() const wxOVERRIDE; - virtual wxTextPos GetLastPosition() const wxOVERRIDE; - - virtual void SetSelection(long from, long to) wxOVERRIDE; - virtual void SetEditable(bool editable) wxOVERRIDE; - - // Overridden wxWindow methods - virtual void SetWindowStyleFlag( long style ) wxOVERRIDE; - virtual bool Enable( bool enable = true ) wxOVERRIDE; - - // Implementation from now on - void OnDropFiles( wxDropFilesEvent &event ); - void OnChar( wxKeyEvent &event ); - - void OnCut(wxCommandEvent& event); - void OnCopy(wxCommandEvent& event); - void OnPaste(wxCommandEvent& event); - void OnUndo(wxCommandEvent& event); - void OnRedo(wxCommandEvent& event); - - void OnUpdateCut(wxUpdateUIEvent& event); - void OnUpdateCopy(wxUpdateUIEvent& event); - void OnUpdatePaste(wxUpdateUIEvent& event); - void OnUpdateUndo(wxUpdateUIEvent& event); - void OnUpdateRedo(wxUpdateUIEvent& event); - - bool SetFont(const wxFont& font) wxOVERRIDE; - bool SetForegroundColour(const wxColour& colour) wxOVERRIDE; - bool SetBackgroundColour(const wxColour& colour) wxOVERRIDE; - - GtkWidget* GetConnectWidget() wxOVERRIDE; - - void SetUpdateFont(bool WXUNUSED(update)) { } - - // implementation only from now on - - // tell the control to ignore next text changed signal - void IgnoreNextTextUpdate(int n = 1) { m_countUpdatesToIgnore = n; } - - // should we ignore the changed signal? always resets the flag - bool IgnoreTextUpdate(); - - // call this to indicate that the control is about to be changed - // programmatically and so m_modified flag shouldn't be set - void DontMarkDirtyOnNextChange() { m_dontMarkDirty = true; } - - // should we mark the control as dirty? always resets the flag - bool MarkDirtyOnChange(); - - // always let GTK have mouse release events for multiline controls - virtual bool GTKProcessEvent(wxEvent& event) const wxOVERRIDE; - - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - -protected: - // overridden wxWindow virtual methods - virtual wxSize DoGetBestSize() const wxOVERRIDE; - virtual void DoApplyWidgetStyle(GtkRcStyle *style) wxOVERRIDE; - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE; - - virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const wxOVERRIDE; - - virtual void DoFreeze() wxOVERRIDE; - virtual void DoThaw() wxOVERRIDE; - - // Widgets that use the style->base colour for the BG colour should - // override this and return true. - virtual bool UseGTKStyleBase() const wxOVERRIDE { return true; } - - virtual void DoSetValue(const wxString &value, int flags = 0) wxOVERRIDE; - virtual wxString DoGetValue() const wxOVERRIDE; - - // Override this to use either GtkEntry or GtkTextView IME depending on the - // kind of control we are. - virtual int GTKIMFilterKeypress(GdkEventKey* event) const wxOVERRIDE; - - virtual wxPoint DoPositionToCoords(long pos) const wxOVERRIDE; - - // wrappers hiding the differences between functions doing the same thing - // for GtkTextView and GtkEntry (all of them use current window style to - // set the given characteristic) - void GTKSetEditable(); - void GTKSetVisibility(); - void GTKSetActivatesDefault(); - void GTKSetWrapMode(); - void GTKSetJustification(); - -private: - void Init(); - - // overridden wxTextEntry virtual methods - virtual GtkEditable *GetEditable() const wxOVERRIDE; - virtual GtkEntry *GetEntry() const wxOVERRIDE; - virtual void EnableTextChangedEvents(bool enable) wxOVERRIDE; - - // change the font for everything in this control - void ChangeFontGlobally(); - - // get the encoding which is used in this control: this looks at our font - // and default style but not the current style (i.e. the style for the - // current position); returns wxFONTENCODING_SYSTEM if we have no specific - // encoding - wxFontEncoding GetTextEncoding() const; - - // returns either m_text or m_buffer depending on whether the control is - // single- or multi-line; convenient for the GTK+ functions which work with - // both - void *GetTextObject() const - { - return IsMultiLine() ? static_cast(m_buffer) - : static_cast(m_text); - } - - - // the widget used for single line controls - GtkWidget *m_text; - - bool m_modified:1; - bool m_dontMarkDirty:1; - - int m_countUpdatesToIgnore; - - // Our text buffer. Convenient, and holds the buffer while using - // a dummy one when frozen - GtkTextBuffer *m_buffer; - - GtkTextMark* m_showPositionOnThaw; - GSList* m_anonymousMarkList; - - // For wxTE_AUTO_URL - void OnUrlMouseEvent(wxMouseEvent&); - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_DYNAMIC_CLASS(wxTextCtrl); -}; - -#endif // _WX_GTK_TEXTCTRL_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/textentry.h b/Externals/wxWidgets3/include/wx/gtk/textentry.h deleted file mode 100644 index f78dc7b0dd..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/textentry.h +++ /dev/null @@ -1,98 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/textentry.h -// Purpose: wxGTK-specific wxTextEntry implementation -// Author: Vadim Zeitlin -// Created: 2007-09-24 -// Copyright: (c) 2007 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_TEXTENTRY_H_ -#define _WX_GTK_TEXTENTRY_H_ - -typedef struct _GdkEventKey GdkEventKey; -typedef struct _GtkEditable GtkEditable; -typedef struct _GtkEntry GtkEntry; - -// ---------------------------------------------------------------------------- -// wxTextEntry: roughly corresponds to GtkEditable -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxTextEntry : public wxTextEntryBase -{ -public: - wxTextEntry() { m_isUpperCase = false; } - - // implement wxTextEntryBase pure virtual methods - virtual void WriteText(const wxString& text) wxOVERRIDE; - virtual void Remove(long from, long to) wxOVERRIDE; - - virtual void Copy() wxOVERRIDE; - virtual void Cut() wxOVERRIDE; - virtual void Paste() wxOVERRIDE; - - virtual void Undo() wxOVERRIDE; - virtual void Redo() wxOVERRIDE; - virtual bool CanUndo() const wxOVERRIDE; - virtual bool CanRedo() const wxOVERRIDE; - - virtual void SetInsertionPoint(long pos) wxOVERRIDE; - virtual long GetInsertionPoint() const wxOVERRIDE; - virtual long GetLastPosition() const wxOVERRIDE; - - virtual void SetSelection(long from, long to) wxOVERRIDE; - virtual void GetSelection(long *from, long *to) const wxOVERRIDE; - - virtual bool IsEditable() const wxOVERRIDE; - virtual void SetEditable(bool editable) wxOVERRIDE; - - virtual void SetMaxLength(unsigned long len) wxOVERRIDE; - virtual void ForceUpper() wxOVERRIDE; - -#ifdef __WXGTK3__ - virtual bool SetHint(const wxString& hint) wxOVERRIDE; - virtual wxString GetHint() const wxOVERRIDE; -#endif - - // implementation only from now on - void SendMaxLenEvent(); - bool GTKEntryOnInsertText(const char* text); - bool GTKIsUpperCase() const { return m_isUpperCase; } - -protected: - // This method must be called from the derived class Create() to connect - // the handlers for the clipboard (cut/copy/paste) events. - void GTKConnectClipboardSignals(GtkWidget* entry); - - // And this one to connect "insert-text" signal. - void GTKConnectInsertTextSignal(GtkEntry* entry); - - - virtual void DoSetValue(const wxString& value, int flags) wxOVERRIDE; - virtual wxString DoGetValue() const wxOVERRIDE; - - // margins functions - virtual bool DoSetMargins(const wxPoint& pt) wxOVERRIDE; - virtual wxPoint DoGetMargins() const wxOVERRIDE; - - virtual bool DoAutoCompleteStrings(const wxArrayString& choices) wxOVERRIDE; - - // Override the base class method to use GtkEntry IM context. - virtual int GTKIMFilterKeypress(GdkEventKey* event) const; - -private: - // implement this to return the associated GtkEntry or another widget - // implementing GtkEditable - virtual GtkEditable *GetEditable() const = 0; - - // implement this to return the associated GtkEntry - virtual GtkEntry *GetEntry() const = 0; - - bool m_isUpperCase; -}; - -// We don't need the generic version. -#define wxHAS_NATIVE_TEXT_FORCEUPPER - -#endif // _WX_GTK_TEXTENTRY_H_ - diff --git a/Externals/wxWidgets3/include/wx/gtk/tglbtn.h b/Externals/wxWidgets3/include/wx/gtk/tglbtn.h deleted file mode 100644 index 40869c8b2e..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/tglbtn.h +++ /dev/null @@ -1,120 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/tglbtn.h -// Purpose: Declaration of the wxToggleButton class, which implements a -// toggle button under wxGTK. -// Author: John Norris, minor changes by Axel Schlueter -// Modified by: -// Created: 08.02.01 -// Copyright: (c) 2000 Johnny C. Norris II -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_TOGGLEBUTTON_H_ -#define _WX_GTK_TOGGLEBUTTON_H_ - -#include "wx/bitmap.h" - -//----------------------------------------------------------------------------- -// wxToggleButton -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxToggleButton: public wxToggleButtonBase -{ -public: - // construction/destruction - wxToggleButton() {} - wxToggleButton(wxWindow *parent, - wxWindowID id, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxCheckBoxNameStr) - { - Create(parent, id, label, pos, size, style, validator, name); - } - - // Create the control - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxCheckBoxNameStr); - - // Get/set the value - void SetValue(bool state) wxOVERRIDE; - bool GetValue() const wxOVERRIDE; - - // Set the label - void SetLabel(const wxString& label) wxOVERRIDE; - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - void GTKDisableEvents(); - void GTKEnableEvents(); - -protected: - virtual wxSize DoGetBestSize() const wxOVERRIDE; - virtual void DoApplyWidgetStyle(GtkRcStyle *style) wxOVERRIDE; - -#if wxUSE_MARKUP - virtual bool DoSetLabelMarkup(const wxString& markup) wxOVERRIDE; -#endif // wxUSE_MARKUP - -private: - typedef wxToggleButtonBase base_type; - - // Return the GtkLabel used by this toggle button. - GtkLabel *GTKGetLabel() const; - - wxDECLARE_DYNAMIC_CLASS(wxToggleButton); -}; - -//----------------------------------------------------------------------------- -// wxBitmapToggleButton -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxBitmapToggleButton: public wxToggleButton -{ -public: - // construction/destruction - wxBitmapToggleButton() {} - wxBitmapToggleButton(wxWindow *parent, - wxWindowID id, - const wxBitmap& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxCheckBoxNameStr) - { - Create(parent, id, label, pos, size, style, validator, name); - } - - // Create the control - bool Create(wxWindow *parent, - wxWindowID id, - const wxBitmap& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxCheckBoxNameStr); - - // deprecated synonym for SetBitmapLabel() - wxDEPRECATED_INLINE( void SetLabel(const wxBitmap& bitmap), - SetBitmapLabel(bitmap); ) - // prevent virtual function hiding - virtual void SetLabel(const wxString& label) wxOVERRIDE { wxToggleButton::SetLabel(label); } - -private: - typedef wxToggleButtonBase base_type; - - wxDECLARE_DYNAMIC_CLASS(wxBitmapToggleButton); -}; - -#endif // _WX_GTK_TOGGLEBUTTON_H_ - diff --git a/Externals/wxWidgets3/include/wx/gtk/toolbar.h b/Externals/wxWidgets3/include/wx/gtk/toolbar.h deleted file mode 100644 index 8ad323b5f0..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/toolbar.h +++ /dev/null @@ -1,102 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/toolbar.h -// Purpose: GTK toolbar -// Author: Robert Roebling -// Copyright: (c) Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_TOOLBAR_H_ -#define _WX_GTK_TOOLBAR_H_ - -typedef struct _GtkTooltips GtkTooltips; - -// ---------------------------------------------------------------------------- -// wxToolBar -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxToolBar : public wxToolBarBase -{ -public: - // construction/destruction - wxToolBar() { Init(); } - wxToolBar( wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxTB_DEFAULT_STYLE, - const wxString& name = wxToolBarNameStr ) - { - Init(); - - Create(parent, id, pos, size, style, name); - } - - bool Create( wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxTB_DEFAULT_STYLE, - const wxString& name = wxToolBarNameStr ); - - virtual ~wxToolBar(); - - virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const wxOVERRIDE; - - virtual void SetToolShortHelp(int id, const wxString& helpString) wxOVERRIDE; - - virtual void SetWindowStyleFlag( long style ) wxOVERRIDE; - - virtual void SetToolNormalBitmap(int id, const wxBitmap& bitmap) wxOVERRIDE; - virtual void SetToolDisabledBitmap(int id, const wxBitmap& bitmap) wxOVERRIDE; - - virtual bool Realize() wxOVERRIDE; - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - virtual wxToolBarToolBase *CreateTool(int id, - const wxString& label, - const wxBitmap& bitmap1, - const wxBitmap& bitmap2 = wxNullBitmap, - wxItemKind kind = wxITEM_NORMAL, - wxObject *clientData = NULL, - const wxString& shortHelpString = wxEmptyString, - const wxString& longHelpString = wxEmptyString) wxOVERRIDE; - virtual wxToolBarToolBase *CreateTool(wxControl *control, - const wxString& label) wxOVERRIDE; - - // implementation from now on - // -------------------------- - - GtkToolbar* GTKGetToolbar() const { return m_toolbar; } - -protected: - // choose the default border for this window - virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_DEFAULT; } - - virtual wxSize DoGetBestSize() const wxOVERRIDE; - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE; - - // implement base class pure virtuals - virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool) wxOVERRIDE; - virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool) wxOVERRIDE; - - virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable) wxOVERRIDE; - virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle) wxOVERRIDE; - virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle) wxOVERRIDE; - -private: - void Init(); - void GtkSetStyle(); - GSList* GetRadioGroup(size_t pos); - virtual void AddChildGTK(wxWindowGTK* child) wxOVERRIDE; - - GtkToolbar* m_toolbar; - GtkTooltips* m_tooltips; - - wxDECLARE_DYNAMIC_CLASS(wxToolBar); -}; - -#endif - // _WX_GTK_TOOLBAR_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/tooltip.h b/Externals/wxWidgets3/include/wx/gtk/tooltip.h deleted file mode 100644 index dbed48993c..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/tooltip.h +++ /dev/null @@ -1,55 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/tooltip.h -// Purpose: wxToolTip class -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTKTOOLTIP_H_ -#define _WX_GTKTOOLTIP_H_ - -#include "wx/string.h" -#include "wx/object.h" - -//----------------------------------------------------------------------------- -// forward declarations -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxWindow; - -//----------------------------------------------------------------------------- -// wxToolTip -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxToolTip : public wxObject -{ -public: - wxToolTip( const wxString &tip ); - - // globally change the tooltip parameters - static void Enable( bool flag ); - static void SetDelay( long msecs ); - // set the delay after which the tooltip disappears or how long the tooltip remains visible - static void SetAutoPop(long msecs); - // set the delay between subsequent tooltips to appear - static void SetReshow(long msecs); - - // get/set the tooltip text - void SetTip( const wxString &tip ); - wxString GetTip() const { return m_text; } - - wxWindow *GetWindow() const { return m_window; } - - // Implementation - void GTKSetWindow(wxWindow* win); - static void GTKApply(GtkWidget* widget, const char* tip); - -private: - wxString m_text; - wxWindow *m_window; - - wxDECLARE_ABSTRACT_CLASS(wxToolTip); -}; - -#endif // _WX_GTKTOOLTIP_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/toplevel.h b/Externals/wxWidgets3/include/wx/gtk/toplevel.h deleted file mode 100644 index b26ea6d4ad..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/toplevel.h +++ /dev/null @@ -1,167 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/toplevel.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling, Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_TOPLEVEL_H_ -#define _WX_GTK_TOPLEVEL_H_ - -//----------------------------------------------------------------------------- -// wxTopLevelWindowGTK -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxTopLevelWindowGTK : public wxTopLevelWindowBase -{ - typedef wxTopLevelWindowBase base_type; -public: - // construction - wxTopLevelWindowGTK() { Init(); } - wxTopLevelWindowGTK(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr) - { - Init(); - - Create(parent, id, title, pos, size, style, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr); - - virtual ~wxTopLevelWindowGTK(); - - // implement base class pure virtuals - virtual void Maximize(bool maximize = true) wxOVERRIDE; - virtual bool IsMaximized() const wxOVERRIDE; - virtual void Iconize(bool iconize = true) wxOVERRIDE; - virtual bool IsIconized() const wxOVERRIDE; - virtual void SetIcons(const wxIconBundle& icons) wxOVERRIDE; - virtual void Restore() wxOVERRIDE; - - virtual bool EnableCloseButton(bool enable = true) wxOVERRIDE; - - virtual void ShowWithoutActivating() wxOVERRIDE; - virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) wxOVERRIDE; - virtual bool IsFullScreen() const wxOVERRIDE { return m_fsIsShowing; } - - virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO) wxOVERRIDE; - - virtual void SetWindowStyleFlag( long style ) wxOVERRIDE; - - virtual bool Show(bool show = true) wxOVERRIDE; - - virtual void Raise() wxOVERRIDE; - - virtual bool IsActive() wxOVERRIDE; - - virtual void SetTitle( const wxString &title ) wxOVERRIDE; - virtual wxString GetTitle() const wxOVERRIDE { return m_title; } - - virtual void SetLabel(const wxString& label) wxOVERRIDE { SetTitle( label ); } - virtual wxString GetLabel() const wxOVERRIDE { return GetTitle(); } - - - virtual bool SetTransparent(wxByte alpha) wxOVERRIDE; - virtual bool CanSetTransparent() wxOVERRIDE; - - // Experimental, to allow help windows to be - // viewable from within modal dialogs - virtual void AddGrab(); - virtual void RemoveGrab(); - virtual bool IsGrabbed() const { return m_grabbed; } - - - virtual void Refresh( bool eraseBackground = true, - const wxRect *rect = (const wxRect *) NULL ) wxOVERRIDE; - - // implementation from now on - // -------------------------- - - // GTK callbacks - virtual void GTKHandleRealized() wxOVERRIDE; - - void GTKConfigureEvent(int x, int y); - - // do *not* call this to iconize the frame, this is a private function! - void SetIconizeState(bool iconic); - - GtkWidget *m_mainWidget; - - bool m_fsIsShowing; /* full screen */ - int m_fsSaveGdkFunc, m_fsSaveGdkDecor; - wxRect m_fsSaveFrame; - - // m_windowStyle translated to GDK's terms - int m_gdkFunc, - m_gdkDecor; - - // size of WM decorations - struct DecorSize - { - int left, right, top, bottom; - }; - DecorSize m_decorSize; - - // private gtk_timeout_add result for mimicing wxUSER_ATTENTION_INFO and - // wxUSER_ATTENTION_ERROR difference, -2 for no hint, -1 for ERROR hint, rest for GtkTimeout handle. - int m_urgency_hint; - // timer for detecting WM with broken _NET_REQUEST_FRAME_EXTENTS handling - unsigned m_netFrameExtentsTimerId; - - // return the size of the window without WM decorations - void GTKDoGetSize(int *width, int *height) const; - - void GTKUpdateDecorSize(const DecorSize& decorSize); - -protected: - // give hints to the Window Manager for how the size - // of the TLW can be changed by dragging - virtual void DoSetSizeHints( int minW, int minH, - int maxW, int maxH, - int incW, int incH) wxOVERRIDE; - // move the window to the specified location and resize it - virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE; - - // take into account WM decorations here - virtual void DoSetSize(int x, int y, - int width, int height, - int sizeFlags = wxSIZE_AUTO) wxOVERRIDE; - - virtual void DoSetClientSize(int width, int height) wxOVERRIDE; - virtual void DoGetClientSize(int *width, int *height) const wxOVERRIDE; - - // string shown in the title bar - wxString m_title; - - bool m_deferShow; - -private: - void Init(); - DecorSize& GetCachedDecorSize(); - - // size hint increments - int m_incWidth, m_incHeight; - - // is the frame currently iconized? - bool m_isIconized; - - // is the frame currently grabbed explicitly by the application? - bool m_grabbed; - - bool m_updateDecorSize; - bool m_deferShowAllowed; -}; - -#endif // _WX_GTK_TOPLEVEL_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/webview_webkit.h b/Externals/wxWidgets3/include/wx/gtk/webview_webkit.h deleted file mode 100644 index 48518369e6..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/webview_webkit.h +++ /dev/null @@ -1,186 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: include/gtk/wx/webview.h -// Purpose: GTK webkit backend for web view component -// Author: Robert Roebling, Marianne Gagnon -// Copyright: (c) 2010 Marianne Gagnon, 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_WEBKITCTRL_H_ -#define _WX_GTK_WEBKITCTRL_H_ - -#include "wx/defs.h" - -#if wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT && defined(__WXGTK__) - -#include "wx/sharedptr.h" -#include "wx/webview.h" - -typedef struct _WebKitWebView WebKitWebView; - -//----------------------------------------------------------------------------- -// wxWebViewWebKit -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_WEBVIEW wxWebViewWebKit : public wxWebView -{ -public: - wxWebViewWebKit(); - - wxWebViewWebKit(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxString& url = wxWebViewDefaultURLStr, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxString& name = wxWebViewNameStr) - { - Create(parent, id, url, pos, size, style, name); - } - - virtual bool Create(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxString& url = wxWebViewDefaultURLStr, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxString& name = wxWebViewNameStr) wxOVERRIDE; - - virtual ~wxWebViewWebKit(); - - virtual bool Enable( bool enable = true ) wxOVERRIDE; - - // implementation - // -------------- - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - virtual void Stop() wxOVERRIDE; - virtual void LoadURL(const wxString& url) wxOVERRIDE; - virtual void GoBack() wxOVERRIDE; - virtual void GoForward() wxOVERRIDE; - virtual void Reload(wxWebViewReloadFlags flags = wxWEBVIEW_RELOAD_DEFAULT) wxOVERRIDE; - virtual bool CanGoBack() const wxOVERRIDE; - virtual bool CanGoForward() const wxOVERRIDE; - virtual void ClearHistory() wxOVERRIDE; - virtual void EnableContextMenu(bool enable = true) wxOVERRIDE; - virtual void EnableHistory(bool enable = true) wxOVERRIDE; - virtual wxVector > GetBackwardHistory() wxOVERRIDE; - virtual wxVector > GetForwardHistory() wxOVERRIDE; - virtual void LoadHistoryItem(wxSharedPtr item) wxOVERRIDE; - virtual wxString GetCurrentURL() const wxOVERRIDE; - virtual wxString GetCurrentTitle() const wxOVERRIDE; - virtual wxString GetPageSource() const wxOVERRIDE; - virtual wxString GetPageText() const wxOVERRIDE; - virtual void Print() wxOVERRIDE; - virtual bool IsBusy() const wxOVERRIDE; - - void SetZoomType(wxWebViewZoomType) wxOVERRIDE; - wxWebViewZoomType GetZoomType() const wxOVERRIDE; - bool CanSetZoomType(wxWebViewZoomType) const wxOVERRIDE; - virtual wxWebViewZoom GetZoom() const wxOVERRIDE; - virtual void SetZoom(wxWebViewZoom) wxOVERRIDE; - - //Clipboard functions - virtual bool CanCut() const wxOVERRIDE; - virtual bool CanCopy() const wxOVERRIDE; - virtual bool CanPaste() const wxOVERRIDE; - virtual void Cut() wxOVERRIDE; - virtual void Copy() wxOVERRIDE; - virtual void Paste() wxOVERRIDE; - - //Undo / redo functionality - virtual bool CanUndo() const wxOVERRIDE; - virtual bool CanRedo() const wxOVERRIDE; - virtual void Undo() wxOVERRIDE; - virtual void Redo() wxOVERRIDE; - - //Find function - virtual long Find(const wxString& text, int flags = wxWEBVIEW_FIND_DEFAULT) wxOVERRIDE; - - //Editing functions - virtual void SetEditable(bool enable = true) wxOVERRIDE; - virtual bool IsEditable() const wxOVERRIDE; - - //Selection - virtual void DeleteSelection() wxOVERRIDE; - virtual bool HasSelection() const wxOVERRIDE; - virtual void SelectAll() wxOVERRIDE; - virtual wxString GetSelectedText() const wxOVERRIDE; - virtual wxString GetSelectedSource() const wxOVERRIDE; - virtual void ClearSelection() wxOVERRIDE; - - virtual void RunScript(const wxString& javascript) wxOVERRIDE; - - //Virtual Filesystem Support - virtual void RegisterHandler(wxSharedPtr handler) wxOVERRIDE; - virtual wxVector > GetHandlers() { return m_handlerList; } - - virtual void* GetNativeBackend() const wxOVERRIDE { return m_web_view; } - - /** TODO: check if this can be made private - * The native control has a getter to check for busy state, but except in - * very recent versions of webkit this getter doesn't say everything we need - * (namely it seems to stay indefinitely busy when loading is cancelled by - * user) - */ - bool m_busy; - - wxString m_vfsurl; - - //We use this flag to stop recursion when we load a page from the navigation - //callback, mainly when loading a VFS page - bool m_guard; - //This flag is use to indicate when a navigation event is the result of a - //create-web-view signal and so we need to send a new window event - bool m_creating; - -protected: - virtual void DoSetPage(const wxString& html, const wxString& baseUrl) wxOVERRIDE; - - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE; - -private: - - void ZoomIn(); - void ZoomOut(); - void SetWebkitZoom(float level); - float GetWebkitZoom() const; - - //Find helper function - void FindClear(); - - // focus event handler: calls GTKUpdateBitmap() - void GTKOnFocus(wxFocusEvent& event); - - WebKitWebView *m_web_view; - int m_historyLimit; - - wxVector > m_handlerList; - - //variables used for Find() - int m_findFlags; - wxString m_findText; - int m_findPosition; - int m_findCount; - - wxDECLARE_DYNAMIC_CLASS(wxWebViewWebKit); -}; - -class WXDLLIMPEXP_WEBVIEW wxWebViewFactoryWebKit : public wxWebViewFactory -{ -public: - virtual wxWebView* Create() wxOVERRIDE { return new wxWebViewWebKit; } - virtual wxWebView* Create(wxWindow* parent, - wxWindowID id, - const wxString& url = wxWebViewDefaultURLStr, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxWebViewNameStr) wxOVERRIDE - { return new wxWebViewWebKit(parent, id, url, pos, size, style, name); } -}; - - -#endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT && defined(__WXGTK__) - -#endif diff --git a/Externals/wxWidgets3/include/wx/gtk/webviewhistoryitem_webkit.h b/Externals/wxWidgets3/include/wx/gtk/webviewhistoryitem_webkit.h deleted file mode 100644 index a798efdda6..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/webviewhistoryitem_webkit.h +++ /dev/null @@ -1,33 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: include/wx/gtk/webviewhistoryitem.h -// Purpose: wxWebViewHistoryItem header for GTK -// Author: Steven Lamerton -// Copyright: (c) 2011 Steven Lamerton -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_WEBVIEWHISTORYITEM_H_ -#define _WX_GTK_WEBVIEWHISTORYITEM_H_ - -#include "wx/setup.h" - -#if wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT && defined(__WXGTK__) - -class WXDLLIMPEXP_WEBVIEW wxWebViewHistoryItem -{ -public: - wxWebViewHistoryItem(const wxString& url, const wxString& title) : - m_url(url), m_title(title) {} - wxString GetUrl() { return m_url; } - wxString GetTitle() { return m_title; } - - friend class wxWebViewWebKit; - -private: - wxString m_url, m_title; - void* m_histItem; -}; - -#endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT && defined(__WXGTK__) - -#endif // _WX_GTK_WEBVIEWHISTORYITEM_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/window.h b/Externals/wxWidgets3/include/wx/gtk/window.h deleted file mode 100644 index 476b68a76a..0000000000 --- a/Externals/wxWidgets3/include/wx/gtk/window.h +++ /dev/null @@ -1,484 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/window.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_WINDOW_H_ -#define _WX_GTK_WINDOW_H_ - -#include "wx/dynarray.h" - -#ifdef __WXGTK3__ - typedef struct _cairo cairo_t; - typedef struct _GtkStyleProvider GtkStyleProvider; - typedef struct _GtkCssProvider GtkCssProvider; - #define WXUNUSED_IN_GTK2(x) x - #define WXUNUSED_IN_GTK3(x) -#else - #define WXUNUSED_IN_GTK2(x) - #define WXUNUSED_IN_GTK3(x) x -#endif - -typedef struct _GdkEventKey GdkEventKey; -typedef struct _GtkIMContext GtkIMContext; - -WX_DEFINE_EXPORTED_ARRAY_PTR(GdkWindow *, wxArrayGdkWindows); - -extern "C" -{ - -typedef void (*wxGTKCallback)(); - -} - -//----------------------------------------------------------------------------- -// wxWindowGTK -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxWindowGTK : public wxWindowBase -{ -public: - // creating the window - // ------------------- - wxWindowGTK(); - wxWindowGTK(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxPanelNameStr); - bool Create(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxPanelNameStr); - virtual ~wxWindowGTK(); - - // implement base class (pure) virtual methods - // ------------------------------------------- - - virtual void Raise() wxOVERRIDE; - virtual void Lower() wxOVERRIDE; - - virtual bool Show( bool show = true ) wxOVERRIDE; - virtual bool IsShown() const wxOVERRIDE; - - virtual bool IsRetained() const wxOVERRIDE; - - virtual void SetFocus() wxOVERRIDE; - - // hint from wx to native GTK+ tab traversal code - virtual void SetCanFocus(bool canFocus) wxOVERRIDE; - - virtual bool Reparent( wxWindowBase *newParent ) wxOVERRIDE; - - virtual void WarpPointer(int x, int y) wxOVERRIDE; - - virtual void Refresh( bool eraseBackground = true, - const wxRect *rect = (const wxRect *) NULL ) wxOVERRIDE; - virtual void Update() wxOVERRIDE; - virtual void ClearBackground() wxOVERRIDE; - - virtual bool SetBackgroundColour( const wxColour &colour ) wxOVERRIDE; - virtual bool SetForegroundColour( const wxColour &colour ) wxOVERRIDE; - virtual bool SetCursor( const wxCursor &cursor ) wxOVERRIDE; - virtual bool SetFont( const wxFont &font ) wxOVERRIDE; - - virtual bool SetBackgroundStyle(wxBackgroundStyle style) wxOVERRIDE ; - virtual bool IsTransparentBackgroundSupported(wxString* reason = NULL) const wxOVERRIDE; - - virtual int GetCharHeight() const wxOVERRIDE; - virtual int GetCharWidth() const wxOVERRIDE; - virtual double GetContentScaleFactor() const wxOVERRIDE; - - virtual void SetScrollbar( int orient, int pos, int thumbVisible, - int range, bool refresh = true ) wxOVERRIDE; - virtual void SetScrollPos( int orient, int pos, bool refresh = true ) wxOVERRIDE; - virtual int GetScrollPos( int orient ) const wxOVERRIDE; - virtual int GetScrollThumb( int orient ) const wxOVERRIDE; - virtual int GetScrollRange( int orient ) const wxOVERRIDE; - virtual void ScrollWindow( int dx, int dy, - const wxRect* rect = NULL ) wxOVERRIDE; - virtual bool ScrollLines(int lines) wxOVERRIDE; - virtual bool ScrollPages(int pages) wxOVERRIDE; - -#if wxUSE_DRAG_AND_DROP - virtual void SetDropTarget( wxDropTarget *dropTarget ) wxOVERRIDE; -#endif // wxUSE_DRAG_AND_DROP - - virtual void AddChild( wxWindowBase *child ) wxOVERRIDE; - virtual void RemoveChild( wxWindowBase *child ) wxOVERRIDE; - - virtual void SetLayoutDirection(wxLayoutDirection dir) wxOVERRIDE; - virtual wxLayoutDirection GetLayoutDirection() const wxOVERRIDE; - virtual wxCoord AdjustForLayoutDirection(wxCoord x, - wxCoord width, - wxCoord widthTotal) const wxOVERRIDE; - - virtual bool DoIsExposed( int x, int y ) const wxOVERRIDE; - virtual bool DoIsExposed( int x, int y, int w, int h ) const wxOVERRIDE; - - // currently wxGTK2-only - void SetDoubleBuffered(bool on); - virtual bool IsDoubleBuffered() const wxOVERRIDE; - - // SetLabel(), which does nothing in wxWindow - virtual void SetLabel(const wxString& label) wxOVERRIDE { m_gtkLabel = label; } - virtual wxString GetLabel() const wxOVERRIDE { return m_gtkLabel; } - - // implementation - // -------------- - - virtual WXWidget GetHandle() const wxOVERRIDE { return m_widget; } - - // many important things are done here, this function must be called - // regularly - virtual void OnInternalIdle() wxOVERRIDE; - - // For compatibility across platforms (not in event table) - void OnIdle(wxIdleEvent& WXUNUSED(event)) {} - - // Used by all window classes in the widget creation process. - bool PreCreation( wxWindowGTK *parent, const wxPoint &pos, const wxSize &size ); - void PostCreation(); - - // Internal addition of child windows - void DoAddChild(wxWindowGTK *child); - - // This method sends wxPaintEvents to the window. - // It is also responsible for background erase events. -#ifdef __WXGTK3__ - void GTKSendPaintEvents(cairo_t* cr); -#else - void GTKSendPaintEvents(const GdkRegion* region); -#endif - - // The methods below are required because many native widgets - // are composed of several subwidgets and setting a style for - // the widget means setting it for all subwidgets as well. - // also, it is not clear which native widget is the top - // widget where (most of) the input goes. even tooltips have - // to be applied to all subwidgets. - virtual GtkWidget* GetConnectWidget(); - void ConnectWidget( GtkWidget *widget ); - - // Called from several event handlers, if it returns true or false, the - // same value should be immediately returned by the handler without doing - // anything else. If it returns -1, the handler should continue as usual - int GTKCallbackCommonPrologue(struct _GdkEventAny *event) const; - - // Simplified form of GTKCallbackCommonPrologue() which can be used from - // GTK callbacks without return value to check if the event should be - // ignored: if this returns true, the event shouldn't be handled - bool GTKShouldIgnoreEvent() const; - - - // override this if some events should never be consumed by wxWidgets but - // but have to be left for the native control - // - // base version just calls HandleWindowEvent() - virtual bool GTKProcessEvent(wxEvent& event) const; - - // Map GTK widget direction of the given widget to/from wxLayoutDirection - static wxLayoutDirection GTKGetLayout(GtkWidget *widget); - static void GTKSetLayout(GtkWidget *widget, wxLayoutDirection dir); - - // This is called when capture is taken from the window. It will - // fire off capture lost events. - void GTKReleaseMouseAndNotify(); - static void GTKHandleCaptureLost(); - - GdkWindow* GTKGetDrawingWindow() const; - - bool GTKHandleFocusIn(); - bool GTKHandleFocusOut(); - void GTKHandleFocusOutNoDeferring(); - static void GTKHandleDeferredFocusOut(); - - // Called when m_widget becomes realized. Derived classes must call the - // base class method if they override it. - virtual void GTKHandleRealized(); - void GTKHandleUnrealize(); - -protected: - // for controls composed of multiple GTK widgets, return true to eliminate - // spurious focus events if the focus changes between GTK+ children within - // the same wxWindow - virtual bool GTKNeedsToFilterSameWindowFocus() const { return false; } - - // Override GTKWidgetNeedsMnemonic and return true if your - // needs to set its mnemonic widget, such as for a - // GtkLabel for wxStaticText, then do the actual - // setting of the widget inside GTKWidgetDoSetMnemonic - virtual bool GTKWidgetNeedsMnemonic() const; - virtual void GTKWidgetDoSetMnemonic(GtkWidget* w); - - // Get the GdkWindows making part of this window: usually there will be - // only one of them in which case it should be returned directly by this - // function. If there is more than one GdkWindow (can be the case for - // composite widgets), return NULL and fill in the provided array - // - // This is not pure virtual for backwards compatibility but almost - // certainly must be overridden in any wxControl-derived class! - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; - - // Check if the given window makes part of this widget - bool GTKIsOwnWindow(GdkWindow *window) const; - -public: - // Returns the default context which usually is anti-aliased - PangoContext *GTKGetPangoDefaultContext(); - -#if wxUSE_TOOLTIPS - // applies tooltip to the widget (tip must be UTF-8 encoded) - virtual void GTKApplyToolTip(const char* tip); -#endif // wxUSE_TOOLTIPS - - // Called when a window should delay showing itself - // until idle time used in Reparent(). - void GTKShowOnIdle() { m_showOnIdle = true; } - - // This is called from the various OnInternalIdle methods - bool GTKShowFromOnIdle(); - - // is this window transparent for the mouse events (as wxStaticBox is)? - virtual bool GTKIsTransparentForMouse() const { return false; } - - // Common scroll event handling code for wxWindow and wxScrollBar - wxEventType GTKGetScrollEventType(GtkRange* range); - - // position and size of the window - int m_x, m_y; - int m_width, m_height; - int m_clientWidth, m_clientHeight; - // Whether the client size variables above are known to be correct - // (because they have been validated by a size-allocate) and should - // be used to report client size - bool m_useCachedClientSize; - // Whether the GtkAllocation and GdkWindow positions are known to be correct - bool m_isGtkPositionValid; - - // see the docs in src/gtk/window.cpp - GtkWidget *m_widget; // mostly the widget seen by the rest of GTK - GtkWidget *m_wxwindow; // mostly the client area as per wxWidgets - - // label for use with GetLabelSetLabel - wxString m_gtkLabel; - - // return true if the window is of a standard (i.e. not wxWidgets') class - bool IsOfStandardClass() const { return m_wxwindow == NULL; } - - // this widget will be queried for GTK's focus events - GtkWidget *m_focusWidget; - - void GTKDisableFocusOutEvent(); - void GTKEnableFocusOutEvent(); - - - // Input method support - - // The IM context used for generic, i.e. non-native, windows. - // - // It might be a good idea to avoid allocating it unless key events from - // this window are really needed but currently we do it unconditionally. - // - // For native widgets (i.e. those for which IsOfStandardClass() returns - // true) it is NULL. - GtkIMContext* m_imContext; - - // Pointer to the event being currently processed by the IME or NULL if not - // inside key handling. - GdkEventKey* m_imKeyEvent; - - // This method generalizes gtk_im_context_filter_keypress(): for the - // generic windows it does just that but it's overridden by the classes - // wrapping native widgets that use IM themselves and so provide specific - // methods for accessing it such gtk_entry_im_context_filter_keypress(). - virtual int GTKIMFilterKeypress(GdkEventKey* event) const; - - // This method must be called from the derived classes "insert-text" signal - // handlers to check if the text is not being inserted by the IM and, if - // this is the case, generate appropriate wxEVT_CHAR events for it. - // - // Returns true if we did generate and process events corresponding to this - // text or false if we didn't handle it. - bool GTKOnInsertText(const char* text); - - // This is just a helper of GTKOnInsertText() which is also used by GTK+ - // "commit" signal handler. - bool GTKDoInsertTextFromIM(const char* text); - - - // indices for the arrays below - enum ScrollDir { ScrollDir_Horz, ScrollDir_Vert, ScrollDir_Max }; - - // horizontal/vertical scroll bar - GtkRange* m_scrollBar[ScrollDir_Max]; - - // horizontal/vertical scroll position - double m_scrollPos[ScrollDir_Max]; - - // return the scroll direction index corresponding to the given orientation - // (which is wxVERTICAL or wxHORIZONTAL) - static ScrollDir ScrollDirFromOrient(int orient) - { - return orient == wxVERTICAL ? ScrollDir_Vert : ScrollDir_Horz; - } - - // return the orientation for the given scrolling direction - static int OrientFromScrollDir(ScrollDir dir) - { - return dir == ScrollDir_Horz ? wxHORIZONTAL : wxVERTICAL; - } - - // find the direction of the given scrollbar (must be one of ours) - ScrollDir ScrollDirFromRange(GtkRange *range) const; - - void GTKUpdateCursor( - bool isBusyOrGlobalCursor = false, - bool isRealize = false, - const wxCursor* overrideCursor = NULL); - - // extra (wxGTK-specific) flags - bool m_noExpose:1; // wxGLCanvas has its own redrawing - bool m_nativeSizeEvent:1; // wxGLCanvas sends wxSizeEvent upon "alloc_size" - bool m_isScrolling:1; // dragging scrollbar thumb? - bool m_clipPaintRegion:1; // true after ScrollWindow() - bool m_dirtyTabOrder:1; // tab order changed, GTK focus - // chain needs update - bool m_mouseButtonDown:1; - bool m_showOnIdle:1; // postpone showing the window until idle - bool m_needCursorReset:1; - - wxRegion m_nativeUpdateRegion; // not transformed for RTL - -protected: - // implement the base class pure virtuals - virtual void DoGetTextExtent(const wxString& string, - int *x, int *y, - int *descent = NULL, - int *externalLeading = NULL, - const wxFont *font = NULL) const wxOVERRIDE; - virtual void DoClientToScreen( int *x, int *y ) const wxOVERRIDE; - virtual void DoScreenToClient( int *x, int *y ) const wxOVERRIDE; - virtual void DoGetPosition( int *x, int *y ) const wxOVERRIDE; - virtual void DoGetSize( int *width, int *height ) const wxOVERRIDE; - virtual void DoGetClientSize( int *width, int *height ) const wxOVERRIDE; - virtual void DoSetSize(int x, int y, - int width, int height, - int sizeFlags = wxSIZE_AUTO) wxOVERRIDE; - virtual void DoSetClientSize(int width, int height) wxOVERRIDE; - virtual wxSize DoGetBorderSize() const wxOVERRIDE; - virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE; - virtual void DoEnable(bool enable) wxOVERRIDE; - -#if wxUSE_MENUS_NATIVE - virtual bool DoPopupMenu( wxMenu *menu, int x, int y ) wxOVERRIDE; -#endif // wxUSE_MENUS_NATIVE - - virtual void DoCaptureMouse() wxOVERRIDE; - virtual void DoReleaseMouse() wxOVERRIDE; - - virtual void DoFreeze() wxOVERRIDE; - virtual void DoThaw() wxOVERRIDE; - - void GTKConnectFreezeWidget(GtkWidget* widget); - void GTKFreezeWidget(GtkWidget *w); - void GTKThawWidget(GtkWidget *w); - void GTKDisconnect(void* instance); - -#if wxUSE_TOOLTIPS - virtual void DoSetToolTip( wxToolTip *tip ) wxOVERRIDE; -#endif // wxUSE_TOOLTIPS - - // Create a GtkScrolledWindow containing the given widget (usually - // m_wxwindow but not necessarily) and assigns it to m_widget. Also shows - // the widget passed to it. - // - // Can be only called if we have either wxHSCROLL or wxVSCROLL in our - // style. - void GTKCreateScrolledWindowWith(GtkWidget* view); - - virtual void DoMoveInTabOrder(wxWindow *win, WindowOrder move) wxOVERRIDE; - virtual bool DoNavigateIn(int flags) wxOVERRIDE; - - - // Copies m_children tab order to GTK focus chain: - void RealizeTabOrder(); - -#ifdef __WXGTK3__ - // Use the given CSS string for styling the widget. The provider must be - // allocated, and remains owned, by the caller. - void ApplyCssStyle(GtkCssProvider* provider, const char* style); -#else // GTK+ < 3 - // Called by ApplyWidgetStyle (which is called by SetFont() and - // SetXXXColour etc to apply style changed to native widgets) to create - // modified GTK style with non-standard attributes. - GtkRcStyle* GTKCreateWidgetStyle(); -#endif - - void GTKApplyWidgetStyle(bool forceStyle = false); - - // helper function to ease native widgets wrapping, called by - // ApplyWidgetStyle -- override this, not ApplyWidgetStyle - virtual void DoApplyWidgetStyle(GtkRcStyle *style); - - void GTKApplyStyle(GtkWidget* widget, GtkRcStyle* style); - - // sets the border of a given GtkScrolledWindow from a wx style - static void GTKScrolledWindowSetBorder(GtkWidget* w, int style); - - // Connect the given function to the specified signal on m_widget. - // - // This is just a wrapper for g_signal_connect() and returns the handler id - // just as it does. - unsigned long GTKConnectWidget(const char *signal, wxGTKCallback callback); - - void ConstrainSize(); - -#ifdef __WXGTK3__ - static GdkWindow* GTKFindWindow(GtkWidget* widget); - static void GTKFindWindow(GtkWidget* widget, wxArrayGdkWindows& windows); -#endif - -private: - void Init(); - - // return true if this window must have a non-NULL parent, false if it can - // be created without parent (normally only top level windows but in wxGTK - // there is also the exception of wxMenuBar) - virtual bool GTKNeedsParent() const { return !IsTopLevel(); } - - enum ScrollUnit { ScrollUnit_Line, ScrollUnit_Page, ScrollUnit_Max }; - - // common part of ScrollLines() and ScrollPages() and could be used, in the - // future, for horizontal scrolling as well - // - // return true if we scrolled, false otherwise (on error or simply if we - // are already at the end) - bool DoScrollByUnits(ScrollDir dir, ScrollUnit unit, int units); - virtual void AddChildGTK(wxWindowGTK* child); - -#ifdef __WXGTK3__ - // paint context is stashed here so wxPaintDC can use it - cairo_t* m_paintContext; - // style provider for "background-image" - GtkStyleProvider* m_styleProvider; - -public: - cairo_t* GTKPaintContext() const - { - return m_paintContext; - } - void GTKSizeRevalidate(); -#endif - - wxDECLARE_DYNAMIC_CLASS(wxWindowGTK); - wxDECLARE_NO_COPY_CLASS(wxWindowGTK); -}; - -#endif // _WX_GTK_WINDOW_H_ diff --git a/Externals/wxWidgets3/include/wx/hash.h b/Externals/wxWidgets3/include/wx/hash.h deleted file mode 100644 index ea4e3021b2..0000000000 --- a/Externals/wxWidgets3/include/wx/hash.h +++ /dev/null @@ -1,312 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/hash.h -// Purpose: wxHashTable class -// Author: Julian Smart -// Modified by: VZ at 25.02.00: type safe hashes with WX_DECLARE_HASH() -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_HASH_H__ -#define _WX_HASH_H__ - -#include "wx/defs.h" -#include "wx/string.h" - -#if !wxUSE_STD_CONTAINERS - #include "wx/object.h" -#else - class WXDLLIMPEXP_FWD_BASE wxObject; -#endif - -// the default size of the hash -#define wxHASH_SIZE_DEFAULT (1000) - -/* - * A hash table is an array of user-definable size with lists - * of data items hanging off the array positions. Usually there'll - * be a hit, so no search is required; otherwise we'll have to run down - * the list to find the desired item. -*/ - -union wxHashKeyValue -{ - long integer; - wxString *string; -}; - -// for some compilers (AIX xlC), defining it as friend inside the class is not -// enough, so provide a real forward declaration -class WXDLLIMPEXP_FWD_BASE wxHashTableBase; - -class WXDLLIMPEXP_BASE wxHashTableBase_Node -{ - friend class WXDLLIMPEXP_FWD_BASE wxHashTableBase; - typedef class WXDLLIMPEXP_FWD_BASE wxHashTableBase_Node _Node; -public: - wxHashTableBase_Node( long key, void* value, - wxHashTableBase* table ); - wxHashTableBase_Node( const wxString& key, void* value, - wxHashTableBase* table ); - ~wxHashTableBase_Node(); - - long GetKeyInteger() const { return m_key.integer; } - const wxString& GetKeyString() const { return *m_key.string; } - - void* GetData() const { return m_value; } - void SetData( void* data ) { m_value = data; } - -protected: - _Node* GetNext() const { return m_next; } - -protected: - // next node in the chain - wxHashTableBase_Node* m_next; - - // key - wxHashKeyValue m_key; - - // value - void* m_value; - - // pointer to the hash containing the node, used to remove the - // node from the hash when the user deletes the node iterating - // through it - // TODO: move it to wxHashTable_Node (only wxHashTable supports - // iteration) - wxHashTableBase* m_hashPtr; -}; - -class WXDLLIMPEXP_BASE wxHashTableBase -#if !wxUSE_STD_CONTAINERS - : public wxObject -#endif -{ - friend class WXDLLIMPEXP_FWD_BASE wxHashTableBase_Node; -public: - typedef wxHashTableBase_Node Node; - - wxHashTableBase(); - virtual ~wxHashTableBase() { } - - void Create( wxKeyType keyType = wxKEY_INTEGER, - size_t size = wxHASH_SIZE_DEFAULT ); - void Clear(); - void Destroy(); - - size_t GetSize() const { return m_size; } - size_t GetCount() const { return m_count; } - - void DeleteContents( bool flag ) { m_deleteContents = flag; } - - static long MakeKey(const wxString& string); - -protected: - void DoPut( long key, long hash, void* data ); - void DoPut( const wxString& key, long hash, void* data ); - void* DoGet( long key, long hash ) const; - void* DoGet( const wxString& key, long hash ) const; - void* DoDelete( long key, long hash ); - void* DoDelete( const wxString& key, long hash ); - -private: - // Remove the node from the hash, *only called from - // ~wxHashTable*_Node destructor - void DoRemoveNode( wxHashTableBase_Node* node ); - - // destroys data contained in the node if appropriate: - // deletes the key if it is a string and destrys - // the value if m_deleteContents is true - void DoDestroyNode( wxHashTableBase_Node* node ); - - // inserts a node in the table (at the end of the chain) - void DoInsertNode( size_t bucket, wxHashTableBase_Node* node ); - - // removes a node from the table (fiven a pointer to the previous - // but does not delete it (only deletes its contents) - void DoUnlinkNode( size_t bucket, wxHashTableBase_Node* node, - wxHashTableBase_Node* prev ); - - // unconditionally deletes node value (invoking the - // correct destructor) - virtual void DoDeleteContents( wxHashTableBase_Node* node ) = 0; - -protected: - // number of buckets - size_t m_size; - - // number of nodes (key/value pairs) - size_t m_count; - - // table - Node** m_table; - - // key typ (INTEGER/STRING) - wxKeyType m_keyType; - - // delete contents when hash is cleared - bool m_deleteContents; - -private: - wxDECLARE_NO_COPY_CLASS(wxHashTableBase); -}; - -// ---------------------------------------------------------------------------- -// for compatibility only -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxHashTable_Node : public wxHashTableBase_Node -{ - friend class WXDLLIMPEXP_FWD_BASE wxHashTable; -public: - wxHashTable_Node( long key, void* value, - wxHashTableBase* table ) - : wxHashTableBase_Node( key, value, table ) { } - wxHashTable_Node( const wxString& key, void* value, - wxHashTableBase* table ) - : wxHashTableBase_Node( key, value, table ) { } - - wxObject* GetData() const - { return (wxObject*)wxHashTableBase_Node::GetData(); } - void SetData( wxObject* data ) - { wxHashTableBase_Node::SetData( data ); } - - wxHashTable_Node* GetNext() const - { return (wxHashTable_Node*)wxHashTableBase_Node::GetNext(); } -}; - -// should inherit protectedly, but it is public for compatibility in -// order to publicly inherit from wxObject -class WXDLLIMPEXP_BASE wxHashTable : public wxHashTableBase -{ - typedef wxHashTableBase hash; -public: - typedef wxHashTable_Node Node; - typedef wxHashTable_Node* compatibility_iterator; -public: - wxHashTable( wxKeyType keyType = wxKEY_INTEGER, - size_t size = wxHASH_SIZE_DEFAULT ) - : wxHashTableBase() { Create( keyType, size ); BeginFind(); } - wxHashTable( const wxHashTable& table ); - - virtual ~wxHashTable() { Destroy(); } - - const wxHashTable& operator=( const wxHashTable& ); - - // key and value are the same - void Put(long value, wxObject *object) - { DoPut( value, value, object ); } - void Put(long lhash, long value, wxObject *object) - { DoPut( value, lhash, object ); } - void Put(const wxString& value, wxObject *object) - { DoPut( value, MakeKey( value ), object ); } - void Put(long lhash, const wxString& value, wxObject *object) - { DoPut( value, lhash, object ); } - - // key and value are the same - wxObject *Get(long value) const - { return (wxObject*)DoGet( value, value ); } - wxObject *Get(long lhash, long value) const - { return (wxObject*)DoGet( value, lhash ); } - wxObject *Get(const wxString& value) const - { return (wxObject*)DoGet( value, MakeKey( value ) ); } - wxObject *Get(long lhash, const wxString& value) const - { return (wxObject*)DoGet( value, lhash ); } - - // Deletes entry and returns data if found - wxObject *Delete(long key) - { return (wxObject*)DoDelete( key, key ); } - wxObject *Delete(long lhash, long key) - { return (wxObject*)DoDelete( key, lhash ); } - wxObject *Delete(const wxString& key) - { return (wxObject*)DoDelete( key, MakeKey( key ) ); } - wxObject *Delete(long lhash, const wxString& key) - { return (wxObject*)DoDelete( key, lhash ); } - - // Way of iterating through whole hash table (e.g. to delete everything) - // Not necessary, of course, if you're only storing pointers to - // objects maintained separately - void BeginFind() { m_curr = NULL; m_currBucket = 0; } - Node* Next(); - - void Clear() { wxHashTableBase::Clear(); } - - size_t GetCount() const { return wxHashTableBase::GetCount(); } -protected: - // copy helper - void DoCopy( const wxHashTable& copy ); - - // searches the next node starting from bucket bucketStart and sets - // m_curr to it and m_currBucket to its bucket - void GetNextNode( size_t bucketStart ); -private: - virtual void DoDeleteContents( wxHashTableBase_Node* node ) wxOVERRIDE; - - // current node - Node* m_curr; - - // bucket the current node belongs to - size_t m_currBucket; -}; - -// defines a new type safe hash table which stores the elements of type eltype -// in lists of class listclass -#define _WX_DECLARE_HASH(eltype, dummy, hashclass, classexp) \ - classexp hashclass : public wxHashTableBase \ - { \ - public: \ - hashclass(wxKeyType keyType = wxKEY_INTEGER, \ - size_t size = wxHASH_SIZE_DEFAULT) \ - : wxHashTableBase() { Create(keyType, size); } \ - \ - virtual ~hashclass() { Destroy(); } \ - \ - void Put(long key, eltype *data) { DoPut(key, key, (void*)data); } \ - void Put(long lhash, long key, eltype *data) \ - { DoPut(key, lhash, (void*)data); } \ - eltype *Get(long key) const { return (eltype*)DoGet(key, key); } \ - eltype *Get(long lhash, long key) const \ - { return (eltype*)DoGet(key, lhash); } \ - eltype *Delete(long key) { return (eltype*)DoDelete(key, key); } \ - eltype *Delete(long lhash, long key) \ - { return (eltype*)DoDelete(key, lhash); } \ - private: \ - virtual void DoDeleteContents( wxHashTableBase_Node* node ) \ - { delete (eltype*)node->GetData(); } \ - \ - wxDECLARE_NO_COPY_CLASS(hashclass); \ - } - - -// this macro is to be used in the user code -#define WX_DECLARE_HASH(el, list, hash) \ - _WX_DECLARE_HASH(el, list, hash, class) - -// and this one does exactly the same thing but should be used inside the -// library -#define WX_DECLARE_EXPORTED_HASH(el, list, hash) \ - _WX_DECLARE_HASH(el, list, hash, class WXDLLIMPEXP_CORE) - -#define WX_DECLARE_USER_EXPORTED_HASH(el, list, hash, usergoo) \ - _WX_DECLARE_HASH(el, list, hash, class usergoo) - -// delete all hash elements -// -// NB: the class declaration of the hash elements must be visible from the -// place where you use this macro, otherwise the proper destructor may not -// be called (a decent compiler should give a warning about it, but don't -// count on it)! -#define WX_CLEAR_HASH_TABLE(hash) \ - { \ - (hash).BeginFind(); \ - wxHashTable::compatibility_iterator it = (hash).Next(); \ - while( it ) \ - { \ - delete it->GetData(); \ - it = (hash).Next(); \ - } \ - (hash).Clear(); \ - } - -#endif // _WX_HASH_H__ diff --git a/Externals/wxWidgets3/include/wx/hashmap.h b/Externals/wxWidgets3/include/wx/hashmap.h deleted file mode 100644 index 121a1febdc..0000000000 --- a/Externals/wxWidgets3/include/wx/hashmap.h +++ /dev/null @@ -1,752 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/hashmap.h -// Purpose: wxHashMap class -// Author: Mattia Barbon -// Modified by: -// Created: 29/01/2002 -// Copyright: (c) Mattia Barbon -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_HASHMAP_H_ -#define _WX_HASHMAP_H_ - -#include "wx/string.h" -#include "wx/wxcrt.h" - -// In wxUSE_STD_CONTAINERS build we prefer to use the standard hash map class -// but it can be either in non-standard hash_map header (old g++ and some other -// STL implementations) or in C++0x standard unordered_map which can in turn be -// available either in std::tr1 or std namespace itself -// -// To summarize: if std::unordered_map is available use it, otherwise use tr1 -// and finally fall back to non-standard hash_map - -#if (defined(HAVE_EXT_HASH_MAP) || defined(HAVE_HASH_MAP)) \ - && (defined(HAVE_GNU_CXX_HASH_MAP) || defined(HAVE_STD_HASH_MAP)) - #define HAVE_STL_HASH_MAP -#endif - -#if wxUSE_STD_CONTAINERS && \ - (defined(HAVE_STD_UNORDERED_MAP) || defined(HAVE_TR1_UNORDERED_MAP)) - -#if defined(HAVE_STD_UNORDERED_MAP) - #include - #define WX_HASH_MAP_NAMESPACE std -#elif defined(HAVE_TR1_UNORDERED_MAP) - #include - #define WX_HASH_MAP_NAMESPACE std::tr1 -#endif - -#define _WX_DECLARE_HASH_MAP( KEY_T, VALUE_T, HASH_T, KEY_EQ_T, CLASSNAME, CLASSEXP ) \ - typedef WX_HASH_MAP_NAMESPACE::unordered_map< KEY_T, VALUE_T, HASH_T, KEY_EQ_T > CLASSNAME - -#elif wxUSE_STD_CONTAINERS && defined(HAVE_STL_HASH_MAP) - -#if defined(HAVE_EXT_HASH_MAP) - #include -#elif defined(HAVE_HASH_MAP) - #include -#endif - -#if defined(HAVE_GNU_CXX_HASH_MAP) - #define WX_HASH_MAP_NAMESPACE __gnu_cxx -#elif defined(HAVE_STD_HASH_MAP) - #define WX_HASH_MAP_NAMESPACE std -#endif - -#define _WX_DECLARE_HASH_MAP( KEY_T, VALUE_T, HASH_T, KEY_EQ_T, CLASSNAME, CLASSEXP ) \ - typedef WX_HASH_MAP_NAMESPACE::hash_map< KEY_T, VALUE_T, HASH_T, KEY_EQ_T > CLASSNAME - -#else // !wxUSE_STD_CONTAINERS || no std::{hash,unordered}_map class available - -#define wxNEEDS_WX_HASH_MAP - -#include // for ptrdiff_t - -// private -struct WXDLLIMPEXP_BASE _wxHashTable_NodeBase -{ - _wxHashTable_NodeBase() : m_next(NULL) {} - - _wxHashTable_NodeBase* m_next; - -// Cannot do this: -// wxDECLARE_NO_COPY_CLASS(_wxHashTable_NodeBase); -// without rewriting the macros, which require a public copy constructor. -}; - -// private -class WXDLLIMPEXP_BASE _wxHashTableBase2 -{ -public: - typedef void (*NodeDtor)(_wxHashTable_NodeBase*); - typedef unsigned long (*BucketFromNode)(_wxHashTableBase2*,_wxHashTable_NodeBase*); - typedef _wxHashTable_NodeBase* (*ProcessNode)(_wxHashTable_NodeBase*); -protected: - static _wxHashTable_NodeBase* DummyProcessNode(_wxHashTable_NodeBase* node); - static void DeleteNodes( size_t buckets, _wxHashTable_NodeBase** table, - NodeDtor dtor ); - static _wxHashTable_NodeBase* GetFirstNode( size_t buckets, - _wxHashTable_NodeBase** table ) - { - for( size_t i = 0; i < buckets; ++i ) - if( table[i] ) - return table[i]; - return NULL; - } - - // as static const unsigned prime_count = 31 but works with all compilers - enum { prime_count = 31 }; - static const unsigned long ms_primes[prime_count]; - - // returns the first prime in ms_primes greater than n - static unsigned long GetNextPrime( unsigned long n ); - - // returns the first prime in ms_primes smaller than n - // ( or ms_primes[0] if n is very small ) - static unsigned long GetPreviousPrime( unsigned long n ); - - static void CopyHashTable( _wxHashTable_NodeBase** srcTable, - size_t srcBuckets, _wxHashTableBase2* dst, - _wxHashTable_NodeBase** dstTable, - BucketFromNode func, ProcessNode proc ); - - static void** AllocTable( size_t sz ) - { - return (void **)calloc(sz, sizeof(void*)); - } - static void FreeTable(void *table) - { - free(table); - } -}; - -#define _WX_DECLARE_HASHTABLE( VALUE_T, KEY_T, HASH_T, KEY_EX_T, KEY_EQ_T,\ - PTROPERATOR, CLASSNAME, CLASSEXP, \ - SHOULD_GROW, SHOULD_SHRINK ) \ -CLASSEXP CLASSNAME : protected _wxHashTableBase2 \ -{ \ -public: \ - typedef KEY_T key_type; \ - typedef VALUE_T value_type; \ - typedef HASH_T hasher; \ - typedef KEY_EQ_T key_equal; \ - \ - typedef size_t size_type; \ - typedef ptrdiff_t difference_type; \ - typedef value_type* pointer; \ - typedef const value_type* const_pointer; \ - typedef value_type& reference; \ - typedef const value_type& const_reference; \ - /* should these be protected? */ \ - typedef const KEY_T const_key_type; \ - typedef const VALUE_T const_mapped_type; \ -public: \ - typedef KEY_EX_T key_extractor; \ - typedef CLASSNAME Self; \ -protected: \ - _wxHashTable_NodeBase** m_table; \ - size_t m_tableBuckets; \ - size_t m_items; \ - hasher m_hasher; \ - key_equal m_equals; \ - key_extractor m_getKey; \ -public: \ - struct Node:public _wxHashTable_NodeBase \ - { \ - public: \ - Node( const value_type& value ) \ - : m_value( value ) {} \ - Node* next() { return static_cast(m_next); } \ - \ - value_type m_value; \ - }; \ - \ -protected: \ - static void DeleteNode( _wxHashTable_NodeBase* node ) \ - { \ - delete static_cast(node); \ - } \ -public: \ - /* */ \ - /* forward iterator */ \ - /* */ \ - CLASSEXP Iterator \ - { \ - public: \ - Node* m_node; \ - Self* m_ht; \ - \ - Iterator() : m_node(NULL), m_ht(NULL) {} \ - Iterator( Node* node, const Self* ht ) \ - : m_node(node), m_ht(const_cast(ht)) {} \ - bool operator ==( const Iterator& it ) const \ - { return m_node == it.m_node; } \ - bool operator !=( const Iterator& it ) const \ - { return m_node != it.m_node; } \ - protected: \ - Node* GetNextNode() \ - { \ - size_type bucket = GetBucketForNode(m_ht,m_node); \ - for( size_type i = bucket + 1; i < m_ht->m_tableBuckets; ++i ) \ - { \ - if( m_ht->m_table[i] ) \ - return static_cast(m_ht->m_table[i]); \ - } \ - return NULL; \ - } \ - \ - void PlusPlus() \ - { \ - Node* next = m_node->next(); \ - m_node = next ? next : GetNextNode(); \ - } \ - }; \ - friend class Iterator; \ - \ -public: \ - CLASSEXP iterator : public Iterator \ - { \ - public: \ - iterator() : Iterator() {} \ - iterator( Node* node, Self* ht ) : Iterator( node, ht ) {} \ - iterator& operator++() { PlusPlus(); return *this; } \ - iterator operator++(int) { iterator it=*this;PlusPlus();return it; } \ - reference operator *() const { return m_node->m_value; } \ - PTROPERATOR(pointer) \ - }; \ - \ - CLASSEXP const_iterator : public Iterator \ - { \ - public: \ - const_iterator() : Iterator() {} \ - const_iterator(iterator i) : Iterator(i) {} \ - const_iterator( Node* node, const Self* ht ) \ - : Iterator(node, const_cast(ht)) {} \ - const_iterator& operator++() { PlusPlus();return *this; } \ - const_iterator operator++(int) { const_iterator it=*this;PlusPlus();return it; } \ - const_reference operator *() const { return m_node->m_value; } \ - PTROPERATOR(const_pointer) \ - }; \ - \ - CLASSNAME( size_type sz = 10, const hasher& hfun = hasher(), \ - const key_equal& k_eq = key_equal(), \ - const key_extractor& k_ex = key_extractor() ) \ - : m_tableBuckets( GetNextPrime( (unsigned long) sz ) ), \ - m_items( 0 ), \ - m_hasher( hfun ), \ - m_equals( k_eq ), \ - m_getKey( k_ex ) \ - { \ - m_table = (_wxHashTable_NodeBase**)AllocTable(m_tableBuckets); \ - } \ - \ - CLASSNAME( const Self& ht ) \ - : m_table(NULL), \ - m_tableBuckets( 0 ), \ - m_items( ht.m_items ), \ - m_hasher( ht.m_hasher ), \ - m_equals( ht.m_equals ), \ - m_getKey( ht.m_getKey ) \ - { \ - HashCopy( ht ); \ - } \ - \ - const Self& operator=( const Self& ht ) \ - { \ - if (&ht != this) \ - { \ - clear(); \ - m_hasher = ht.m_hasher; \ - m_equals = ht.m_equals; \ - m_getKey = ht.m_getKey; \ - m_items = ht.m_items; \ - HashCopy( ht ); \ - } \ - return *this; \ - } \ - \ - ~CLASSNAME() \ - { \ - clear(); \ - \ - FreeTable(m_table); \ - } \ - \ - hasher hash_funct() { return m_hasher; } \ - key_equal key_eq() { return m_equals; } \ - \ - /* removes all elements from the hash table, but does not */ \ - /* shrink it ( perhaps it should ) */ \ - void clear() \ - { \ - DeleteNodes(m_tableBuckets, m_table, DeleteNode); \ - m_items = 0; \ - } \ - \ - size_type size() const { return m_items; } \ - size_type max_size() const { return size_type(-1); } \ - bool empty() const { return size() == 0; } \ - \ - const_iterator end() const { return const_iterator(NULL, this); } \ - iterator end() { return iterator(NULL, this); } \ - const_iterator begin() const \ - { return const_iterator(static_cast(GetFirstNode(m_tableBuckets, m_table)), this); } \ - iterator begin() \ - { return iterator(static_cast(GetFirstNode(m_tableBuckets, m_table)), this); } \ - \ - size_type erase( const const_key_type& key ) \ - { \ - _wxHashTable_NodeBase** node = GetNodePtr(key); \ - \ - if( !node ) \ - return 0; \ - \ - --m_items; \ - _wxHashTable_NodeBase* temp = (*node)->m_next; \ - delete static_cast(*node); \ - (*node) = temp; \ - if( SHOULD_SHRINK( m_tableBuckets, m_items ) ) \ - ResizeTable( GetPreviousPrime( (unsigned long) m_tableBuckets ) - 1 ); \ - return 1; \ - } \ - \ -protected: \ - static size_type GetBucketForNode( Self* ht, Node* node ) \ - { \ - return ht->m_hasher( ht->m_getKey( node->m_value ) ) \ - % ht->m_tableBuckets; \ - } \ - static Node* CopyNode( Node* node ) { return new Node( *node ); } \ - \ - Node* GetOrCreateNode( const value_type& value, bool& created ) \ - { \ - const const_key_type& key = m_getKey( value ); \ - size_t bucket = m_hasher( key ) % m_tableBuckets; \ - Node* node = static_cast(m_table[bucket]); \ - \ - while( node ) \ - { \ - if( m_equals( m_getKey( node->m_value ), key ) ) \ - { \ - created = false; \ - return node; \ - } \ - node = node->next(); \ - } \ - created = true; \ - return CreateNode( value, bucket); \ - }\ - Node * CreateNode( const value_type& value, size_t bucket ) \ - {\ - Node* node = new Node( value ); \ - node->m_next = m_table[bucket]; \ - m_table[bucket] = node; \ - \ - /* must be after the node is inserted */ \ - ++m_items; \ - if( SHOULD_GROW( m_tableBuckets, m_items ) ) \ - ResizeTable( m_tableBuckets ); \ - \ - return node; \ - } \ - void CreateNode( const value_type& value ) \ - {\ - CreateNode(value, m_hasher( m_getKey(value) ) % m_tableBuckets ); \ - }\ - \ - /* returns NULL if not found */ \ - _wxHashTable_NodeBase** GetNodePtr(const const_key_type& key) const \ - { \ - size_t bucket = m_hasher( key ) % m_tableBuckets; \ - _wxHashTable_NodeBase** node = &m_table[bucket]; \ - \ - while( *node ) \ - { \ - if (m_equals(m_getKey(static_cast(*node)->m_value), key)) \ - return node; \ - node = &(*node)->m_next; \ - } \ - \ - return NULL; \ - } \ - \ - /* returns NULL if not found */ \ - /* expressing it in terms of GetNodePtr is 5-8% slower :-( */ \ - Node* GetNode( const const_key_type& key ) const \ - { \ - size_t bucket = m_hasher( key ) % m_tableBuckets; \ - Node* node = static_cast(m_table[bucket]); \ - \ - while( node ) \ - { \ - if( m_equals( m_getKey( node->m_value ), key ) ) \ - return node; \ - node = node->next(); \ - } \ - \ - return NULL; \ - } \ - \ - void ResizeTable( size_t newSize ) \ - { \ - newSize = GetNextPrime( (unsigned long)newSize ); \ - _wxHashTable_NodeBase** srcTable = m_table; \ - size_t srcBuckets = m_tableBuckets; \ - m_table = (_wxHashTable_NodeBase**)AllocTable( newSize ); \ - m_tableBuckets = newSize; \ - \ - CopyHashTable( srcTable, srcBuckets, \ - this, m_table, \ - (BucketFromNode)GetBucketForNode,\ - (ProcessNode)&DummyProcessNode ); \ - FreeTable(srcTable); \ - } \ - \ - /* this must be called _after_ m_table has been cleaned */ \ - void HashCopy( const Self& ht ) \ - { \ - ResizeTable( ht.size() ); \ - CopyHashTable( ht.m_table, ht.m_tableBuckets, \ - (_wxHashTableBase2*)this, \ - m_table, \ - (BucketFromNode)GetBucketForNode, \ - (ProcessNode)CopyNode ); \ - } \ -}; - -// defines an STL-like pair class CLASSNAME storing two fields: first of type -// KEY_T and second of type VALUE_T -#define _WX_DECLARE_PAIR( KEY_T, VALUE_T, CLASSNAME, CLASSEXP ) \ -CLASSEXP CLASSNAME \ -{ \ -public: \ - typedef KEY_T first_type; \ - typedef VALUE_T second_type; \ - typedef KEY_T t1; \ - typedef VALUE_T t2; \ - typedef const KEY_T const_t1; \ - typedef const VALUE_T const_t2; \ - \ - CLASSNAME(const const_t1& f, const const_t2& s) \ - : first(const_cast(f)), second(const_cast(s)) {} \ - \ - t1 first; \ - t2 second; \ -}; - -// defines the class CLASSNAME returning the key part (of type KEY_T) from a -// pair of type PAIR_T -#define _WX_DECLARE_HASH_MAP_KEY_EX( KEY_T, PAIR_T, CLASSNAME, CLASSEXP ) \ -CLASSEXP CLASSNAME \ -{ \ - typedef KEY_T key_type; \ - typedef PAIR_T pair_type; \ - typedef const key_type const_key_type; \ - typedef const pair_type const_pair_type; \ - typedef const_key_type& const_key_reference; \ - typedef const_pair_type& const_pair_reference; \ -public: \ - CLASSNAME() { } \ - const_key_reference operator()( const_pair_reference pair ) const { return pair.first; }\ - \ - /* the dummy assignment operator is needed to suppress compiler */ \ - /* warnings from hash table class' operator=(): gcc complains about */ \ - /* "statement with no effect" without it */ \ - CLASSNAME& operator=(const CLASSNAME&) { return *this; } \ -}; - -// grow/shrink predicates -inline bool never_grow( size_t, size_t ) { return false; } -inline bool never_shrink( size_t, size_t ) { return false; } -inline bool grow_lf70( size_t buckets, size_t items ) -{ - return float(items)/float(buckets) >= 0.85f; -} - -#endif // various hash map implementations - -// ---------------------------------------------------------------------------- -// hashing and comparison functors -// ---------------------------------------------------------------------------- - -// NB: implementation detail: all of these classes must have dummy assignment -// operators to suppress warnings about "statement with no effect" from gcc -// in the hash table class assignment operator (where they're assigned) - -#ifndef wxNEEDS_WX_HASH_MAP - -// integer types -struct WXDLLIMPEXP_BASE wxIntegerHash -{ -private: - WX_HASH_MAP_NAMESPACE::hash longHash; - WX_HASH_MAP_NAMESPACE::hash ulongHash; - WX_HASH_MAP_NAMESPACE::hash intHash; - WX_HASH_MAP_NAMESPACE::hash uintHash; - WX_HASH_MAP_NAMESPACE::hash shortHash; - WX_HASH_MAP_NAMESPACE::hash ushortHash; - -#ifdef wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG - // hash ought to work but doesn't on some compilers - #if (!defined SIZEOF_LONG_LONG && SIZEOF_LONG == 4) \ - || (defined SIZEOF_LONG_LONG && SIZEOF_LONG_LONG == SIZEOF_LONG * 2) - size_t longlongHash( wxLongLong_t x ) const - { - return longHash( wx_truncate_cast(long, x) ) ^ - longHash( wx_truncate_cast(long, x >> (sizeof(long) * 8)) ); - } - #elif defined SIZEOF_LONG_LONG && SIZEOF_LONG_LONG == SIZEOF_LONG - WX_HASH_MAP_NAMESPACE::hash longlongHash; - #else - WX_HASH_MAP_NAMESPACE::hash longlongHash; - #endif -#endif // wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG - -public: - wxIntegerHash() { } - size_t operator()( long x ) const { return longHash( x ); } - size_t operator()( unsigned long x ) const { return ulongHash( x ); } - size_t operator()( int x ) const { return intHash( x ); } - size_t operator()( unsigned int x ) const { return uintHash( x ); } - size_t operator()( short x ) const { return shortHash( x ); } - size_t operator()( unsigned short x ) const { return ushortHash( x ); } -#ifdef wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG - size_t operator()( wxLongLong_t x ) const { return longlongHash(x); } - size_t operator()( wxULongLong_t x ) const { return longlongHash(x); } -#endif // wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG - - wxIntegerHash& operator=(const wxIntegerHash&) { return *this; } -}; - -#else // wxNEEDS_WX_HASH_MAP - -// integer types -struct WXDLLIMPEXP_BASE wxIntegerHash -{ - wxIntegerHash() { } - unsigned long operator()( long x ) const { return (unsigned long)x; } - unsigned long operator()( unsigned long x ) const { return x; } - unsigned long operator()( int x ) const { return (unsigned long)x; } - unsigned long operator()( unsigned int x ) const { return x; } - unsigned long operator()( short x ) const { return (unsigned long)x; } - unsigned long operator()( unsigned short x ) const { return x; } -#ifdef wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG - wxULongLong_t operator()( wxLongLong_t x ) const { return static_cast(x); } - wxULongLong_t operator()( wxULongLong_t x ) const { return x; } -#endif // wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG - - wxIntegerHash& operator=(const wxIntegerHash&) { return *this; } -}; - -#endif // !wxNEEDS_WX_HASH_MAP/wxNEEDS_WX_HASH_MAP - -struct WXDLLIMPEXP_BASE wxIntegerEqual -{ - wxIntegerEqual() { } - bool operator()( long a, long b ) const { return a == b; } - bool operator()( unsigned long a, unsigned long b ) const { return a == b; } - bool operator()( int a, int b ) const { return a == b; } - bool operator()( unsigned int a, unsigned int b ) const { return a == b; } - bool operator()( short a, short b ) const { return a == b; } - bool operator()( unsigned short a, unsigned short b ) const { return a == b; } -#ifdef wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG - bool operator()( wxLongLong_t a, wxLongLong_t b ) const { return a == b; } - bool operator()( wxULongLong_t a, wxULongLong_t b ) const { return a == b; } -#endif // wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG - - wxIntegerEqual& operator=(const wxIntegerEqual&) { return *this; } -}; - -// pointers -struct WXDLLIMPEXP_BASE wxPointerHash -{ - wxPointerHash() { } - -#ifdef wxNEEDS_WX_HASH_MAP - wxUIntPtr operator()( const void* k ) const { return wxPtrToUInt(k); } -#else - size_t operator()( const void* k ) const { return (size_t)k; } -#endif - - wxPointerHash& operator=(const wxPointerHash&) { return *this; } -}; - -struct WXDLLIMPEXP_BASE wxPointerEqual -{ - wxPointerEqual() { } - bool operator()( const void* a, const void* b ) const { return a == b; } - - wxPointerEqual& operator=(const wxPointerEqual&) { return *this; } -}; - -// wxString, char*, wchar_t* -struct WXDLLIMPEXP_BASE wxStringHash -{ - wxStringHash() {} - unsigned long operator()( const wxString& x ) const - { return stringHash( x.wx_str() ); } - unsigned long operator()( const wchar_t* x ) const - { return stringHash( x ); } - unsigned long operator()( const char* x ) const - { return stringHash( x ); } - -#if WXWIN_COMPATIBILITY_2_8 - static unsigned long wxCharStringHash( const wxChar* x ) - { return stringHash(x); } - #if wxUSE_UNICODE - static unsigned long charStringHash( const char* x ) - { return stringHash(x); } - #endif -#endif // WXWIN_COMPATIBILITY_2_8 - - static unsigned long stringHash( const wchar_t* ); - static unsigned long stringHash( const char* ); - - wxStringHash& operator=(const wxStringHash&) { return *this; } -}; - -struct WXDLLIMPEXP_BASE wxStringEqual -{ - wxStringEqual() {} - bool operator()( const wxString& a, const wxString& b ) const - { return a == b; } - bool operator()( const wxChar* a, const wxChar* b ) const - { return wxStrcmp( a, b ) == 0; } -#if wxUSE_UNICODE - bool operator()( const char* a, const char* b ) const - { return strcmp( a, b ) == 0; } -#endif // wxUSE_UNICODE - - wxStringEqual& operator=(const wxStringEqual&) { return *this; } -}; - -#ifdef wxNEEDS_WX_HASH_MAP - -#define wxPTROP_NORMAL(pointer) \ - pointer operator ->() const { return &(m_node->m_value); } -#define wxPTROP_NOP(pointer) - -#define _WX_DECLARE_HASH_MAP( KEY_T, VALUE_T, HASH_T, KEY_EQ_T, CLASSNAME, CLASSEXP ) \ -_WX_DECLARE_PAIR( KEY_T, VALUE_T, CLASSNAME##_wxImplementation_Pair, CLASSEXP ) \ -_WX_DECLARE_HASH_MAP_KEY_EX( KEY_T, CLASSNAME##_wxImplementation_Pair, CLASSNAME##_wxImplementation_KeyEx, CLASSEXP ) \ -_WX_DECLARE_HASHTABLE( CLASSNAME##_wxImplementation_Pair, KEY_T, HASH_T, \ - CLASSNAME##_wxImplementation_KeyEx, KEY_EQ_T, wxPTROP_NORMAL, \ - CLASSNAME##_wxImplementation_HashTable, CLASSEXP, grow_lf70, never_shrink ) \ -CLASSEXP CLASSNAME:public CLASSNAME##_wxImplementation_HashTable \ -{ \ -public: \ - typedef VALUE_T mapped_type; \ - _WX_DECLARE_PAIR( iterator, bool, Insert_Result, CLASSEXP ) \ - \ - wxEXPLICIT CLASSNAME( size_type hint = 100, hasher hf = hasher(), \ - key_equal eq = key_equal() ) \ - : CLASSNAME##_wxImplementation_HashTable( hint, hf, eq, \ - CLASSNAME##_wxImplementation_KeyEx() ) {} \ - \ - mapped_type& operator[]( const const_key_type& key ) \ - { \ - bool created; \ - return GetOrCreateNode( \ - CLASSNAME##_wxImplementation_Pair( key, mapped_type() ), \ - created)->m_value.second; \ - } \ - \ - const_iterator find( const const_key_type& key ) const \ - { \ - return const_iterator( GetNode( key ), this ); \ - } \ - \ - iterator find( const const_key_type& key ) \ - { \ - return iterator( GetNode( key ), this ); \ - } \ - \ - Insert_Result insert( const value_type& v ) \ - { \ - bool created; \ - Node *node = GetOrCreateNode( \ - CLASSNAME##_wxImplementation_Pair( v.first, v.second ), \ - created); \ - return Insert_Result(iterator(node, this), created); \ - } \ - \ - size_type erase( const key_type& k ) \ - { return CLASSNAME##_wxImplementation_HashTable::erase( k ); } \ - void erase( const iterator& it ) { erase( (*it).first ); } \ - \ - /* count() == 0 | 1 */ \ - size_type count( const const_key_type& key ) \ - { \ - return GetNode( key ) ? 1u : 0u; \ - } \ -} - -#endif // wxNEEDS_WX_HASH_MAP - -// these macros are to be used in the user code -#define WX_DECLARE_HASH_MAP( KEY_T, VALUE_T, HASH_T, KEY_EQ_T, CLASSNAME) \ - _WX_DECLARE_HASH_MAP( KEY_T, VALUE_T, HASH_T, KEY_EQ_T, CLASSNAME, class ) - -#define WX_DECLARE_STRING_HASH_MAP( VALUE_T, CLASSNAME ) \ - _WX_DECLARE_HASH_MAP( wxString, VALUE_T, wxStringHash, wxStringEqual, \ - CLASSNAME, class ) - -#define WX_DECLARE_VOIDPTR_HASH_MAP( VALUE_T, CLASSNAME ) \ - _WX_DECLARE_HASH_MAP( void*, VALUE_T, wxPointerHash, wxPointerEqual, \ - CLASSNAME, class ) - -// and these do exactly the same thing but should be used inside the -// library -#define WX_DECLARE_HASH_MAP_WITH_DECL( KEY_T, VALUE_T, HASH_T, KEY_EQ_T, CLASSNAME, DECL) \ - _WX_DECLARE_HASH_MAP( KEY_T, VALUE_T, HASH_T, KEY_EQ_T, CLASSNAME, DECL ) - -#define WX_DECLARE_EXPORTED_HASH_MAP( KEY_T, VALUE_T, HASH_T, KEY_EQ_T, CLASSNAME) \ - WX_DECLARE_HASH_MAP_WITH_DECL( KEY_T, VALUE_T, HASH_T, KEY_EQ_T, \ - CLASSNAME, class WXDLLIMPEXP_CORE ) - -#define WX_DECLARE_STRING_HASH_MAP_WITH_DECL( VALUE_T, CLASSNAME, DECL ) \ - _WX_DECLARE_HASH_MAP( wxString, VALUE_T, wxStringHash, wxStringEqual, \ - CLASSNAME, DECL ) - -#define WX_DECLARE_EXPORTED_STRING_HASH_MAP( VALUE_T, CLASSNAME ) \ - WX_DECLARE_STRING_HASH_MAP_WITH_DECL( VALUE_T, CLASSNAME, \ - class WXDLLIMPEXP_CORE ) - -#define WX_DECLARE_VOIDPTR_HASH_MAP_WITH_DECL( VALUE_T, CLASSNAME, DECL ) \ - _WX_DECLARE_HASH_MAP( void*, VALUE_T, wxPointerHash, wxPointerEqual, \ - CLASSNAME, DECL ) - -#define WX_DECLARE_EXPORTED_VOIDPTR_HASH_MAP( VALUE_T, CLASSNAME ) \ - WX_DECLARE_VOIDPTR_HASH_MAP_WITH_DECL( VALUE_T, CLASSNAME, \ - class WXDLLIMPEXP_CORE ) - -// delete all hash elements -// -// NB: the class declaration of the hash elements must be visible from the -// place where you use this macro, otherwise the proper destructor may not -// be called (a decent compiler should give a warning about it, but don't -// count on it)! -#define WX_CLEAR_HASH_MAP(type, hashmap) \ - { \ - type::iterator it, en; \ - for( it = (hashmap).begin(), en = (hashmap).end(); it != en; ++it ) \ - delete it->second; \ - (hashmap).clear(); \ - } - -//--------------------------------------------------------------------------- -// Declarations of common hashmap classes - -WX_DECLARE_HASH_MAP_WITH_DECL( long, long, wxIntegerHash, wxIntegerEqual, - wxLongToLongHashMap, class WXDLLIMPEXP_BASE ); - -WX_DECLARE_STRING_HASH_MAP_WITH_DECL( wxString, wxStringToStringHashMap, - class WXDLLIMPEXP_BASE ); - -WX_DECLARE_STRING_HASH_MAP_WITH_DECL( wxUIntPtr, wxStringToNumHashMap, - class WXDLLIMPEXP_BASE ); - - -#endif // _WX_HASHMAP_H_ diff --git a/Externals/wxWidgets3/include/wx/hashset.h b/Externals/wxWidgets3/include/wx/hashset.h deleted file mode 100644 index 8cd1becf9b..0000000000 --- a/Externals/wxWidgets3/include/wx/hashset.h +++ /dev/null @@ -1,198 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/hashset.h -// Purpose: wxHashSet class -// Author: Mattia Barbon -// Modified by: -// Created: 11/08/2003 -// Copyright: (c) Mattia Barbon -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_HASHSET_H_ -#define _WX_HASHSET_H_ - -#include "wx/hashmap.h" - -// see comment in wx/hashmap.h which also applies to different standard hash -// set classes - -#if wxUSE_STD_CONTAINERS && \ - (defined(HAVE_STD_UNORDERED_SET) || defined(HAVE_TR1_UNORDERED_SET)) - -#if defined(HAVE_STD_UNORDERED_SET) - #include - #define WX_HASH_SET_BASE_TEMPLATE std::unordered_set -#elif defined(HAVE_TR1_UNORDERED_SET) - #include - #define WX_HASH_SET_BASE_TEMPLATE std::tr1::unordered_set -#else - #error Update this code: unordered_set is available, but I do not know where. -#endif - -#elif wxUSE_STD_CONTAINERS && defined(HAVE_STL_HASH_MAP) - -#if defined(HAVE_EXT_HASH_MAP) - #include -#elif defined(HAVE_HASH_MAP) - #include -#endif - -#define WX_HASH_SET_BASE_TEMPLATE WX_HASH_MAP_NAMESPACE::hash_set - -#endif // different hash_set/unordered_set possibilities - -#ifdef WX_HASH_SET_BASE_TEMPLATE - -// we need to define the class declared by _WX_DECLARE_HASH_SET as a class and -// not a typedef to allow forward declaring it -#define _WX_DECLARE_HASH_SET_IMPL( KEY_T, HASH_T, KEY_EQ_T, PTROP, CLASSNAME, CLASSEXP ) \ -CLASSEXP CLASSNAME \ - : public WX_HASH_SET_BASE_TEMPLATE< KEY_T, HASH_T, KEY_EQ_T > \ -{ \ -public: \ - explicit CLASSNAME(size_type n = 3, \ - const hasher& h = hasher(), \ - const key_equal& ke = key_equal(), \ - const allocator_type& a = allocator_type()) \ - : WX_HASH_SET_BASE_TEMPLATE< KEY_T, HASH_T, KEY_EQ_T >(n, h, ke, a) \ - {} \ - template \ - CLASSNAME(InputIterator f, InputIterator l, \ - const hasher& h = hasher(), \ - const key_equal& ke = key_equal(), \ - const allocator_type& a = allocator_type()) \ - : WX_HASH_SET_BASE_TEMPLATE< KEY_T, HASH_T, KEY_EQ_T >(f, l, h, ke, a)\ - {} \ - CLASSNAME(const WX_HASH_SET_BASE_TEMPLATE< KEY_T, HASH_T, KEY_EQ_T >& s) \ - : WX_HASH_SET_BASE_TEMPLATE< KEY_T, HASH_T, KEY_EQ_T >(s) \ - {} \ -} - -// In some standard library implementations (in particular, the libstdc++ that -// ships with g++ 4.7), std::unordered_set inherits privately from its hasher -// and comparator template arguments for purposes of empty base optimization. -// As a result, in the declaration of a class deriving from std::unordered_set -// the names of the hasher and comparator classes are interpreted as naming -// the base class which is inaccessible. -// The workaround is to prefix the class names with 'struct'; however, don't -// do this on MSVC because it causes a warning there if the class was -// declared as a 'class' rather than a 'struct' (and MSVC's std::unordered_set -// implementation does not suffer from the access problem). -#ifdef _MSC_VER -#define WX_MAYBE_PREFIX_WITH_STRUCT(STRUCTNAME) STRUCTNAME -#else -#define WX_MAYBE_PREFIX_WITH_STRUCT(STRUCTNAME) struct STRUCTNAME -#endif - -#define _WX_DECLARE_HASH_SET( KEY_T, HASH_T, KEY_EQ_T, PTROP, CLASSNAME, CLASSEXP ) \ - _WX_DECLARE_HASH_SET_IMPL( \ - KEY_T, \ - WX_MAYBE_PREFIX_WITH_STRUCT(HASH_T), \ - WX_MAYBE_PREFIX_WITH_STRUCT(KEY_EQ_T), \ - PTROP, \ - CLASSNAME, \ - CLASSEXP) - -#else // no appropriate STL class, use our own implementation - -// this is a complex way of defining an easily inlineable identity function... -#define _WX_DECLARE_HASH_SET_KEY_EX( KEY_T, CLASSNAME, CLASSEXP ) \ -CLASSEXP CLASSNAME \ -{ \ - typedef KEY_T key_type; \ - typedef const key_type const_key_type; \ - typedef const_key_type& const_key_reference; \ -public: \ - CLASSNAME() { } \ - const_key_reference operator()( const_key_reference key ) const \ - { return key; } \ - \ - /* the dummy assignment operator is needed to suppress compiler */ \ - /* warnings from hash table class' operator=(): gcc complains about */ \ - /* "statement with no effect" without it */ \ - CLASSNAME& operator=(const CLASSNAME&) { return *this; } \ -}; - -#define _WX_DECLARE_HASH_SET( KEY_T, HASH_T, KEY_EQ_T, PTROP, CLASSNAME, CLASSEXP )\ -_WX_DECLARE_HASH_SET_KEY_EX( KEY_T, CLASSNAME##_wxImplementation_KeyEx, CLASSEXP ) \ -_WX_DECLARE_HASHTABLE( KEY_T, KEY_T, HASH_T, \ - CLASSNAME##_wxImplementation_KeyEx, KEY_EQ_T, PTROP, \ - CLASSNAME##_wxImplementation_HashTable, CLASSEXP, grow_lf70, never_shrink ) \ -CLASSEXP CLASSNAME:public CLASSNAME##_wxImplementation_HashTable \ -{ \ -public: \ - _WX_DECLARE_PAIR( iterator, bool, Insert_Result, CLASSEXP ) \ - \ - wxEXPLICIT CLASSNAME( size_type hint = 100, hasher hf = hasher(), \ - key_equal eq = key_equal() ) \ - : CLASSNAME##_wxImplementation_HashTable( hint, hf, eq, \ - CLASSNAME##_wxImplementation_KeyEx() ) {} \ - \ - Insert_Result insert( const key_type& key ) \ - { \ - bool created; \ - Node *node = GetOrCreateNode( key, created ); \ - return Insert_Result( iterator( node, this ), created ); \ - } \ - \ - const_iterator find( const const_key_type& key ) const \ - { \ - return const_iterator( GetNode( key ), this ); \ - } \ - \ - iterator find( const const_key_type& key ) \ - { \ - return iterator( GetNode( key ), this ); \ - } \ - \ - size_type erase( const key_type& k ) \ - { return CLASSNAME##_wxImplementation_HashTable::erase( k ); } \ - void erase( const iterator& it ) { erase( *it ); } \ - void erase( const const_iterator& it ) { erase( *it ); } \ - \ - /* count() == 0 | 1 */ \ - size_type count( const const_key_type& key ) const \ - { return GetNode( key ) ? 1 : 0; } \ -} - -#endif // STL/wx implementations - - -// these macros are to be used in the user code -#define WX_DECLARE_HASH_SET( KEY_T, HASH_T, KEY_EQ_T, CLASSNAME) \ - _WX_DECLARE_HASH_SET( KEY_T, HASH_T, KEY_EQ_T, wxPTROP_NORMAL, CLASSNAME, class ) - -// and these do exactly the same thing but should be used inside the -// library -#define WX_DECLARE_HASH_SET_WITH_DECL( KEY_T, HASH_T, KEY_EQ_T, CLASSNAME, DECL) \ - _WX_DECLARE_HASH_SET( KEY_T, HASH_T, KEY_EQ_T, wxPTROP_NORMAL, CLASSNAME, DECL ) - -#define WX_DECLARE_EXPORTED_HASH_SET( KEY_T, HASH_T, KEY_EQ_T, CLASSNAME) \ - WX_DECLARE_HASH_SET_WITH_DECL( KEY_T, HASH_T, KEY_EQ_T, \ - CLASSNAME, class WXDLLIMPEXP_CORE ) - -// Finally these versions allow to define hash sets of non-objects (including -// pointers, hence the confusing but wxArray-compatible name) without -// operator->() which can't be used for them. This is mostly used inside the -// library itself to avoid warnings when using such hash sets with some less -// common compilers (notably Sun CC). -#define WX_DECLARE_HASH_SET_PTR( KEY_T, HASH_T, KEY_EQ_T, CLASSNAME) \ - _WX_DECLARE_HASH_SET( KEY_T, HASH_T, KEY_EQ_T, wxPTROP_NOP, CLASSNAME, class ) -#define WX_DECLARE_HASH_SET_WITH_DECL_PTR( KEY_T, HASH_T, KEY_EQ_T, CLASSNAME, DECL) \ - _WX_DECLARE_HASH_SET( KEY_T, HASH_T, KEY_EQ_T, wxPTROP_NOP, CLASSNAME, DECL ) - -// delete all hash elements -// -// NB: the class declaration of the hash elements must be visible from the -// place where you use this macro, otherwise the proper destructor may not -// be called (a decent compiler should give a warning about it, but don't -// count on it)! -#define WX_CLEAR_HASH_SET(type, hashset) \ - { \ - type::iterator it, en; \ - for( it = (hashset).begin(), en = (hashset).end(); it != en; ++it ) \ - delete *it; \ - (hashset).clear(); \ - } - -#endif // _WX_HASHSET_H_ diff --git a/Externals/wxWidgets3/include/wx/headercol.h b/Externals/wxWidgets3/include/wx/headercol.h deleted file mode 100644 index 1b2fa3d401..0000000000 --- a/Externals/wxWidgets3/include/wx/headercol.h +++ /dev/null @@ -1,288 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/headercol.h -// Purpose: declaration of wxHeaderColumn class -// Author: Vadim Zeitlin -// Created: 2008-12-02 -// Copyright: (c) 2008 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_HEADERCOL_H_ -#define _WX_HEADERCOL_H_ - -#include "wx/bitmap.h" - -#if wxUSE_HEADERCTRL - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -enum -{ - // special value for column width meaning unspecified/default - wxCOL_WIDTH_DEFAULT = -1, - - // size the column automatically to fit all values - wxCOL_WIDTH_AUTOSIZE = -2 -}; - -// bit masks for the various column attributes -enum -{ - // column can be resized (included in default flags) - wxCOL_RESIZABLE = 1, - - // column can be clicked to toggle the sort order by its contents - wxCOL_SORTABLE = 2, - - // column can be dragged to change its order (included in default) - wxCOL_REORDERABLE = 4, - - // column is not shown at all - wxCOL_HIDDEN = 8, - - // default flags for wxHeaderColumn ctor - wxCOL_DEFAULT_FLAGS = wxCOL_RESIZABLE | wxCOL_REORDERABLE -}; - -// ---------------------------------------------------------------------------- -// wxHeaderColumn: interface for a column in a header of controls such as -// wxListCtrl, wxDataViewCtrl or wxGrid -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxHeaderColumn -{ -public: - // ctors and dtor - // -------------- - - /* - Derived classes must provide ctors with the following signatures - (notice that they shouldn't be explicit to allow passing strings/bitmaps - directly to methods such wxHeaderCtrl::AppendColumn()): - wxHeaderColumn(const wxString& title, - int width = wxCOL_WIDTH_DEFAULT, - wxAlignment align = wxALIGN_NOT, - int flags = wxCOL_DEFAULT_FLAGS); - wxHeaderColumn(const wxBitmap &bitmap, - int width = wxDVC_DEFAULT_WIDTH, - wxAlignment align = wxALIGN_CENTER, - int flags = wxCOL_DEFAULT_FLAGS); - */ - - // virtual dtor for the base class to avoid gcc warnings even though we - // don't normally delete the objects of this class via a pointer to - // wxHeaderColumn so it's not necessary, strictly speaking - virtual ~wxHeaderColumn() { } - - // getters for various attributes - // ------------------------------ - - // notice that wxHeaderColumn only provides getters as this is all the - // wxHeaderCtrl needs, various derived class must also provide some way to - // change these attributes but this can be done either at the column level - // (in which case they should inherit from wxSettableHeaderColumn) or via - // the methods of the main control in which case you don't need setters in - // the column class at all - - // title is the string shown for this column - virtual wxString GetTitle() const = 0; - - // bitmap shown (instead of text) in the column header - virtual wxBitmap GetBitmap() const = 0; \ - - // width of the column in pixels, can be set to wxCOL_WIDTH_DEFAULT meaning - // unspecified/default - virtual int GetWidth() const = 0; - - // minimal width can be set for resizable columns to forbid resizing them - // below the specified size (set to 0 to remove) - virtual int GetMinWidth() const = 0; - - // alignment of the text: wxALIGN_CENTRE, wxALIGN_LEFT or wxALIGN_RIGHT - virtual wxAlignment GetAlignment() const = 0; - - - // flags manipulations: - // -------------------- - - // notice that while we make GetFlags() pure virtual here and implement the - // individual flags access in terms of it, for some derived classes it is - // more natural to implement access to each flag individually, in which - // case they can use our GetFromIndividualFlags() helper below to implement - // GetFlags() - - // retrieve all column flags at once: combination of wxCOL_XXX values above - virtual int GetFlags() const = 0; - - bool HasFlag(int flag) const { return (GetFlags() & flag) != 0; } - - - // wxCOL_RESIZABLE - virtual bool IsResizeable() const - { return HasFlag(wxCOL_RESIZABLE); } - - // wxCOL_SORTABLE - virtual bool IsSortable() const - { return HasFlag(wxCOL_SORTABLE); } - - // wxCOL_REORDERABLE - virtual bool IsReorderable() const - { return HasFlag(wxCOL_REORDERABLE); } - - // wxCOL_HIDDEN - virtual bool IsHidden() const - { return HasFlag(wxCOL_HIDDEN); } - bool IsShown() const - { return !IsHidden(); } - - - // sorting - // ------- - - // return true if the column is the one currently used for sorting - virtual bool IsSortKey() const = 0; - - // for sortable columns indicate whether we should sort in ascending or - // descending order (this should only be taken into account if IsSortKey()) - virtual bool IsSortOrderAscending() const = 0; - -protected: - // helper for the class overriding IsXXX() - int GetFromIndividualFlags() const; -}; - -// ---------------------------------------------------------------------------- -// wxSettableHeaderColumn: column which allows to change its fields too -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxSettableHeaderColumn : public wxHeaderColumn -{ -public: - virtual void SetTitle(const wxString& title) = 0; - virtual void SetBitmap(const wxBitmap& bitmap) = 0; - virtual void SetWidth(int width) = 0; - virtual void SetMinWidth(int minWidth) = 0; - virtual void SetAlignment(wxAlignment align) = 0; - - // see comment for wxHeaderColumn::GetFlags() about the relationship - // between SetFlags() and Set{Sortable,Reorderable,...} - - // change, set, clear, toggle or test for any individual flag - virtual void SetFlags(int flags) = 0; - void ChangeFlag(int flag, bool set); - void SetFlag(int flag); - void ClearFlag(int flag); - void ToggleFlag(int flag); - - virtual void SetResizeable(bool resizable) - { ChangeFlag(wxCOL_RESIZABLE, resizable); } - virtual void SetSortable(bool sortable) - { ChangeFlag(wxCOL_SORTABLE, sortable); } - virtual void SetReorderable(bool reorderable) - { ChangeFlag(wxCOL_REORDERABLE, reorderable); } - virtual void SetHidden(bool hidden) - { ChangeFlag(wxCOL_HIDDEN, hidden); } - - // This function can be called to indicate that this column is not used for - // sorting any more. Under some platforms it's not necessary to do anything - // in this case as just setting another column as a sort key takes care of - // everything but under MSW we currently need to call this explicitly to - // reset the sort indicator displayed on the column. - virtual void UnsetAsSortKey() { } - - virtual void SetSortOrder(bool ascending) = 0; - void ToggleSortOrder() { SetSortOrder(!IsSortOrderAscending()); } - -protected: - // helper for the class overriding individual SetXXX() methods instead of - // overriding SetFlags() - void SetIndividualFlags(int flags); -}; - -// ---------------------------------------------------------------------------- -// wxHeaderColumnSimple: trivial generic implementation of wxHeaderColumn -// ---------------------------------------------------------------------------- - -class wxHeaderColumnSimple : public wxSettableHeaderColumn -{ -public: - // ctors and dtor - wxHeaderColumnSimple(const wxString& title, - int width = wxCOL_WIDTH_DEFAULT, - wxAlignment align = wxALIGN_NOT, - int flags = wxCOL_DEFAULT_FLAGS) - : m_title(title), - m_width(width), - m_align(align), - m_flags(flags) - { - Init(); - } - - wxHeaderColumnSimple(const wxBitmap& bitmap, - int width = wxCOL_WIDTH_DEFAULT, - wxAlignment align = wxALIGN_CENTER, - int flags = wxCOL_DEFAULT_FLAGS) - : m_bitmap(bitmap), - m_width(width), - m_align(align), - m_flags(flags) - { - Init(); - } - - // implement base class pure virtuals - virtual void SetTitle(const wxString& title) wxOVERRIDE { m_title = title; } - virtual wxString GetTitle() const wxOVERRIDE { return m_title; } - - virtual void SetBitmap(const wxBitmap& bitmap) wxOVERRIDE { m_bitmap = bitmap; } - wxBitmap GetBitmap() const wxOVERRIDE { return m_bitmap; } - - virtual void SetWidth(int width) wxOVERRIDE { m_width = width; } - virtual int GetWidth() const wxOVERRIDE { return m_width; } - - virtual void SetMinWidth(int minWidth) wxOVERRIDE { m_minWidth = minWidth; } - virtual int GetMinWidth() const wxOVERRIDE { return m_minWidth; } - - virtual void SetAlignment(wxAlignment align) wxOVERRIDE { m_align = align; } - virtual wxAlignment GetAlignment() const wxOVERRIDE { return m_align; } - - virtual void SetFlags(int flags) wxOVERRIDE { m_flags = flags; } - virtual int GetFlags() const wxOVERRIDE { return m_flags; } - - virtual bool IsSortKey() const wxOVERRIDE { return m_sort; } - virtual void UnsetAsSortKey() wxOVERRIDE { m_sort = false; } - - virtual void SetSortOrder(bool ascending) wxOVERRIDE - { - m_sort = true; - m_sortAscending = ascending; - } - - virtual bool IsSortOrderAscending() const wxOVERRIDE { return m_sortAscending; } - -private: - // common part of all ctors - void Init() - { - m_minWidth = 0; - m_sort = false; - m_sortAscending = true; - } - - wxString m_title; - wxBitmap m_bitmap; - int m_width, - m_minWidth; - wxAlignment m_align; - int m_flags; - bool m_sort, - m_sortAscending; -}; - -#endif // wxUSE_HEADERCTRL - -#endif // _WX_HEADERCOL_H_ - diff --git a/Externals/wxWidgets3/include/wx/headerctrl.h b/Externals/wxWidgets3/include/wx/headerctrl.h deleted file mode 100644 index 928ed7aa5e..0000000000 --- a/Externals/wxWidgets3/include/wx/headerctrl.h +++ /dev/null @@ -1,488 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/headerctrl.h -// Purpose: wxHeaderCtrlBase class: interface of wxHeaderCtrl -// Author: Vadim Zeitlin -// Created: 2008-12-01 -// Copyright: (c) 2008 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_HEADERCTRL_H_ -#define _WX_HEADERCTRL_H_ - -#include "wx/control.h" - -#if wxUSE_HEADERCTRL - -#include "wx/dynarray.h" -#include "wx/vector.h" - -#include "wx/headercol.h" - -// notice that the classes in this header are defined in the core library even -// although currently they're only used by wxGrid which is in wxAdv because we -// plan to use it in wxListCtrl which is in core too in the future -class WXDLLIMPEXP_FWD_CORE wxHeaderCtrlEvent; - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -enum -{ - // allow column drag and drop - wxHD_ALLOW_REORDER = 0x0001, - - // allow hiding (and showing back) the columns using the menu shown by - // right clicking the header - wxHD_ALLOW_HIDE = 0x0002, - - // style used by default when creating the control - wxHD_DEFAULT_STYLE = wxHD_ALLOW_REORDER -}; - -extern WXDLLIMPEXP_DATA_CORE(const char) wxHeaderCtrlNameStr[]; - -// ---------------------------------------------------------------------------- -// wxHeaderCtrlBase defines the interface of a header control -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxHeaderCtrlBase : public wxControl -{ -public: - /* - Derived classes must provide default ctor as well as a ctor and - Create() function with the following signatures: - - wxHeaderCtrl(wxWindow *parent, - wxWindowID winid = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxHD_DEFAULT_STYLE, - const wxString& name = wxHeaderCtrlNameStr); - - bool Create(wxWindow *parent, - wxWindowID winid = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxHD_DEFAULT_STYLE, - const wxString& name = wxHeaderCtrlNameStr); - */ - - // column-related methods - // ---------------------- - - // set the number of columns in the control - // - // this also calls UpdateColumn() for all columns - void SetColumnCount(unsigned int count); - - // return the number of columns in the control as set by SetColumnCount() - unsigned int GetColumnCount() const { return DoGetCount(); } - - // return whether the control has any columns - bool IsEmpty() const { return DoGetCount() == 0; } - - // update the column with the given index - void UpdateColumn(unsigned int idx) - { - wxCHECK_RET( idx < GetColumnCount(), "invalid column index" ); - - DoUpdate(idx); - } - - - // columns order - // ------------- - - // set the columns order: the array defines the column index which appears - // the given position, it must have GetColumnCount() elements and contain - // all indices exactly once - void SetColumnsOrder(const wxArrayInt& order); - wxArrayInt GetColumnsOrder() const; - - // get the index of the column at the given display position - unsigned int GetColumnAt(unsigned int pos) const; - - // get the position at which this column is currently displayed - unsigned int GetColumnPos(unsigned int idx) const; - - // reset the columns order to the natural one - void ResetColumnsOrder(); - - // helper function used by the generic version of this control and also - // wxGrid: reshuffles the array of column indices indexed by positions - // (i.e. using the same convention as for SetColumnsOrder()) so that the - // column with the given index is found at the specified position - static void MoveColumnInOrderArray(wxArrayInt& order, - unsigned int idx, - unsigned int pos); - - - // UI helpers - // ---------- - -#if wxUSE_MENUS - // show the popup menu containing all columns with check marks for the ones - // which are currently shown and return true if something was done using it - // (in this case UpdateColumnVisibility() will have been called) or false - // if the menu was cancelled - // - // this is called from the default right click handler for the controls - // with wxHD_ALLOW_HIDE style - bool ShowColumnsMenu(const wxPoint& pt, const wxString& title = wxString()); - - // append the entries for all our columns to the given menu, with the - // currently visible columns being checked - // - // this is used by ShowColumnsMenu() but can also be used if you use your - // own custom columns menu but nevertheless want to show all the columns in - // it - // - // the ids of the items corresponding to the columns are consecutive and - // start from idColumnsBase - void AddColumnsItems(wxMenu& menu, int idColumnsBase = 0); -#endif // wxUSE_MENUS - - // show the columns customization dialog and return true if something was - // changed using it (in which case UpdateColumnVisibility() and/or - // UpdateColumnsOrder() will have been called) - // - // this is called by the control itself from ShowColumnsMenu() (which in - // turn is only called by the control if wxHD_ALLOW_HIDE style was - // specified) and if the control has wxHD_ALLOW_REORDER style as well - bool ShowCustomizeDialog(); - - // compute column title width - int GetColumnTitleWidth(const wxHeaderColumn& col); - - // implementation only from now on - // ------------------------------- - - // the user doesn't need to TAB to this control - virtual bool AcceptsFocusFromKeyboard() const wxOVERRIDE { return false; } - - // this method is only overridden in order to synchronize the control with - // the main window when it is scrolled, the derived class must implement - // DoScrollHorz() - virtual void ScrollWindow(int dx, int dy, const wxRect *rect = NULL) wxOVERRIDE; - -protected: - // this method must be implemented by the derived classes to return the - // information for the given column - virtual const wxHeaderColumn& GetColumn(unsigned int idx) const = 0; - - // this method is called from the default EVT_HEADER_SEPARATOR_DCLICK - // handler to update the fitting column width of the given column, it - // should return true if the width was really updated - virtual bool UpdateColumnWidthToFit(unsigned int WXUNUSED(idx), - int WXUNUSED(widthTitle)) - { - return false; - } - - // this method is called from ShowColumnsMenu() and must be overridden to - // update the internal column visibility (there is no need to call - // UpdateColumn() from here, this will be done internally) - virtual void UpdateColumnVisibility(unsigned int WXUNUSED(idx), - bool WXUNUSED(show)) - { - wxFAIL_MSG( "must be overridden if called" ); - } - - // this method is called from ShowCustomizeDialog() to reorder all columns - // at once and should be implemented for controls using wxHD_ALLOW_REORDER - // style (there is no need to call SetColumnsOrder() from here, this is - // done by the control itself) - virtual void UpdateColumnsOrder(const wxArrayInt& WXUNUSED(order)) - { - wxFAIL_MSG( "must be overridden if called" ); - } - - // this method can be overridden in the derived classes to do something - // (e.g. update/resize some internal data structures) before the number of - // columns in the control changes - virtual void OnColumnCountChanging(unsigned int WXUNUSED(count)) { } - - - // helper function for the derived classes: update the array of column - // indices after the number of columns changed - void DoResizeColumnIndices(wxArrayInt& colIndices, unsigned int count); - -protected: - // this window doesn't look nice with the border so don't use it by default - virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } - -private: - // methods implementing our public API and defined in platform-specific - // implementations - virtual void DoSetCount(unsigned int count) = 0; - virtual unsigned int DoGetCount() const = 0; - virtual void DoUpdate(unsigned int idx) = 0; - - virtual void DoScrollHorz(int dx) = 0; - - virtual void DoSetColumnsOrder(const wxArrayInt& order) = 0; - virtual wxArrayInt DoGetColumnsOrder() const = 0; - - - // event handlers - void OnSeparatorDClick(wxHeaderCtrlEvent& event); -#if wxUSE_MENUS - void OnRClick(wxHeaderCtrlEvent& event); -#endif // wxUSE_MENUS - - wxDECLARE_EVENT_TABLE(); -}; - -// ---------------------------------------------------------------------------- -// wxHeaderCtrl: port-specific header control implementation, notice that this -// is still an ABC which is meant to be used as part of another -// control, see wxHeaderCtrlSimple for a standalone version -// ---------------------------------------------------------------------------- - -#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) - #include "wx/msw/headerctrl.h" -#else - #define wxHAS_GENERIC_HEADERCTRL - #include "wx/generic/headerctrlg.h" -#endif // platform - -// ---------------------------------------------------------------------------- -// wxHeaderCtrlSimple: concrete header control which can be used standalone -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxHeaderCtrlSimple : public wxHeaderCtrl -{ -public: - // control creation - // ---------------- - - wxHeaderCtrlSimple() { Init(); } - wxHeaderCtrlSimple(wxWindow *parent, - wxWindowID winid = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxHD_DEFAULT_STYLE, - const wxString& name = wxHeaderCtrlNameStr) - { - Init(); - - Create(parent, winid, pos, size, style, name); - } - - // managing the columns - // -------------------- - - // insert the column at the given position, using GetColumnCount() as - // position appends it at the end - void InsertColumn(const wxHeaderColumnSimple& col, unsigned int idx) - { - wxCHECK_RET( idx <= GetColumnCount(), "invalid column index" ); - - DoInsert(col, idx); - } - - // append the column to the end of the control - void AppendColumn(const wxHeaderColumnSimple& col) - { - DoInsert(col, GetColumnCount()); - } - - // delete the column at the given index - void DeleteColumn(unsigned int idx) - { - wxCHECK_RET( idx < GetColumnCount(), "invalid column index" ); - - DoDelete(idx); - } - - // delete all the existing columns - void DeleteAllColumns(); - - - // modifying columns - // ----------------- - - // show or hide the column, notice that even when a column is hidden we - // still account for it when using indices - void ShowColumn(unsigned int idx, bool show = true) - { - wxCHECK_RET( idx < GetColumnCount(), "invalid column index" ); - - DoShowColumn(idx, show); - } - - void HideColumn(unsigned int idx) - { - ShowColumn(idx, false); - } - - // indicate that the column is used for sorting - void ShowSortIndicator(unsigned int idx, bool ascending = true) - { - wxCHECK_RET( idx < GetColumnCount(), "invalid column index" ); - - DoShowSortIndicator(idx, ascending); - } - - // remove the sort indicator completely - void RemoveSortIndicator(); - -protected: - // implement/override base class methods - virtual const wxHeaderColumn& GetColumn(unsigned int idx) const wxOVERRIDE; - virtual bool UpdateColumnWidthToFit(unsigned int idx, int widthTitle) wxOVERRIDE; - - // and define another one to be overridden in the derived classes: it - // should return the best width for the given column contents or -1 if not - // implemented, we use it to implement UpdateColumnWidthToFit() - virtual int GetBestFittingWidth(unsigned int WXUNUSED(idx)) const - { - return -1; - } - -private: - // functions implementing our public API - void DoInsert(const wxHeaderColumnSimple& col, unsigned int idx); - void DoDelete(unsigned int idx); - void DoShowColumn(unsigned int idx, bool show); - void DoShowSortIndicator(unsigned int idx, bool ascending); - - // common part of all ctors - void Init(); - - // bring the column count in sync with the number of columns we store - void UpdateColumnCount() - { - SetColumnCount(static_cast(m_cols.size())); - } - - - // all our current columns - typedef wxVector Columns; - Columns m_cols; - - // the column currently used for sorting or -1 if none - unsigned int m_sortKey; - - - wxDECLARE_NO_COPY_CLASS(wxHeaderCtrlSimple); -}; - -// ---------------------------------------------------------------------------- -// wxHeaderCtrl events -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxHeaderCtrlEvent : public wxNotifyEvent -{ -public: - wxHeaderCtrlEvent(wxEventType commandType = wxEVT_NULL, int winid = 0) - : wxNotifyEvent(commandType, winid), - m_col(-1), - m_width(0), - m_order(static_cast(-1)) - { - } - - wxHeaderCtrlEvent(const wxHeaderCtrlEvent& event) - : wxNotifyEvent(event), - m_col(event.m_col), - m_width(event.m_width), - m_order(event.m_order) - { - } - - // the column which this event pertains to: valid for all header events - int GetColumn() const { return m_col; } - void SetColumn(int col) { m_col = col; } - - // the width of the column: valid for column resizing/dragging events only - int GetWidth() const { return m_width; } - void SetWidth(int width) { m_width = width; } - - // the new position of the column: for end reorder events only - unsigned int GetNewOrder() const { return m_order; } - void SetNewOrder(unsigned int order) { m_order = order; } - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxHeaderCtrlEvent(*this); } - -protected: - // the column affected by the event - int m_col; - - // the current width for the dragging events - int m_width; - - // the new column position for end reorder event - unsigned int m_order; - -private: - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxHeaderCtrlEvent); -}; - - -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_HEADER_CLICK, wxHeaderCtrlEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_HEADER_RIGHT_CLICK, wxHeaderCtrlEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_HEADER_MIDDLE_CLICK, wxHeaderCtrlEvent ); - -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_HEADER_DCLICK, wxHeaderCtrlEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_HEADER_RIGHT_DCLICK, wxHeaderCtrlEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_HEADER_MIDDLE_DCLICK, wxHeaderCtrlEvent ); - -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_HEADER_SEPARATOR_DCLICK, wxHeaderCtrlEvent ); - -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_HEADER_BEGIN_RESIZE, wxHeaderCtrlEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_HEADER_RESIZING, wxHeaderCtrlEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_HEADER_END_RESIZE, wxHeaderCtrlEvent ); - -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_HEADER_BEGIN_REORDER, wxHeaderCtrlEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_HEADER_END_REORDER, wxHeaderCtrlEvent ); - -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_HEADER_DRAGGING_CANCELLED, wxHeaderCtrlEvent ); - -typedef void (wxEvtHandler::*wxHeaderCtrlEventFunction)(wxHeaderCtrlEvent&); - -#define wxHeaderCtrlEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxHeaderCtrlEventFunction, func) - -#define wx__DECLARE_HEADER_EVT(evt, id, fn) \ - wx__DECLARE_EVT1(wxEVT_HEADER_ ## evt, id, wxHeaderCtrlEventHandler(fn)) - -#define EVT_HEADER_CLICK(id, fn) wx__DECLARE_HEADER_EVT(CLICK, id, fn) -#define EVT_HEADER_RIGHT_CLICK(id, fn) wx__DECLARE_HEADER_EVT(RIGHT_CLICK, id, fn) -#define EVT_HEADER_MIDDLE_CLICK(id, fn) wx__DECLARE_HEADER_EVT(MIDDLE_CLICK, id, fn) - -#define EVT_HEADER_DCLICK(id, fn) wx__DECLARE_HEADER_EVT(DCLICK, id, fn) -#define EVT_HEADER_RIGHT_DCLICK(id, fn) wx__DECLARE_HEADER_EVT(RIGHT_DCLICK, id, fn) -#define EVT_HEADER_MIDDLE_DCLICK(id, fn) wx__DECLARE_HEADER_EVT(MIDDLE_DCLICK, id, fn) - -#define EVT_HEADER_SEPARATOR_DCLICK(id, fn) wx__DECLARE_HEADER_EVT(SEPARATOR_DCLICK, id, fn) - -#define EVT_HEADER_BEGIN_RESIZE(id, fn) wx__DECLARE_HEADER_EVT(BEGIN_RESIZE, id, fn) -#define EVT_HEADER_RESIZING(id, fn) wx__DECLARE_HEADER_EVT(RESIZING, id, fn) -#define EVT_HEADER_END_RESIZE(id, fn) wx__DECLARE_HEADER_EVT(END_RESIZE, id, fn) - -#define EVT_HEADER_BEGIN_REORDER(id, fn) wx__DECLARE_HEADER_EVT(BEGIN_REORDER, id, fn) -#define EVT_HEADER_END_REORDER(id, fn) wx__DECLARE_HEADER_EVT(END_REORDER, id, fn) - -#define EVT_HEADER_DRAGGING_CANCELLED(id, fn) wx__DECLARE_HEADER_EVT(DRAGGING_CANCELLED, id, fn) - -// old wxEVT_COMMAND_* constants -#define wxEVT_COMMAND_HEADER_CLICK wxEVT_HEADER_CLICK -#define wxEVT_COMMAND_HEADER_RIGHT_CLICK wxEVT_HEADER_RIGHT_CLICK -#define wxEVT_COMMAND_HEADER_MIDDLE_CLICK wxEVT_HEADER_MIDDLE_CLICK -#define wxEVT_COMMAND_HEADER_DCLICK wxEVT_HEADER_DCLICK -#define wxEVT_COMMAND_HEADER_RIGHT_DCLICK wxEVT_HEADER_RIGHT_DCLICK -#define wxEVT_COMMAND_HEADER_MIDDLE_DCLICK wxEVT_HEADER_MIDDLE_DCLICK -#define wxEVT_COMMAND_HEADER_SEPARATOR_DCLICK wxEVT_HEADER_SEPARATOR_DCLICK -#define wxEVT_COMMAND_HEADER_BEGIN_RESIZE wxEVT_HEADER_BEGIN_RESIZE -#define wxEVT_COMMAND_HEADER_RESIZING wxEVT_HEADER_RESIZING -#define wxEVT_COMMAND_HEADER_END_RESIZE wxEVT_HEADER_END_RESIZE -#define wxEVT_COMMAND_HEADER_BEGIN_REORDER wxEVT_HEADER_BEGIN_REORDER -#define wxEVT_COMMAND_HEADER_END_REORDER wxEVT_HEADER_END_REORDER -#define wxEVT_COMMAND_HEADER_DRAGGING_CANCELLED wxEVT_HEADER_DRAGGING_CANCELLED - -#endif // wxUSE_HEADERCTRL - -#endif // _WX_HEADERCTRL_H_ diff --git a/Externals/wxWidgets3/include/wx/help.h b/Externals/wxWidgets3/include/wx/help.h deleted file mode 100644 index e38bc870f9..0000000000 --- a/Externals/wxWidgets3/include/wx/help.h +++ /dev/null @@ -1,39 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/help.h -// Purpose: wxHelpController base header -// Author: wxWidgets Team -// Modified by: -// Created: -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_HELP_H_BASE_ -#define _WX_HELP_H_BASE_ - -#include "wx/defs.h" - -#if wxUSE_HELP - -#include "wx/helpbase.h" - -#if defined(__WXMSW__) - #include "wx/msw/helpchm.h" - - #define wxHelpController wxCHMHelpController -#else // !MSW - -#if wxUSE_WXHTML_HELP - #include "wx/html/helpctrl.h" - #define wxHelpController wxHtmlHelpController -#else - #include "wx/generic/helpext.h" - #define wxHelpController wxExtHelpController -#endif - -#endif // MSW/!MSW - -#endif // wxUSE_HELP - -#endif - // _WX_HELP_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/helpbase.h b/Externals/wxWidgets3/include/wx/helpbase.h deleted file mode 100644 index f3cb199de4..0000000000 --- a/Externals/wxWidgets3/include/wx/helpbase.h +++ /dev/null @@ -1,105 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/helpbase.h -// Purpose: Help system base classes -// Author: Julian Smart -// Modified by: -// Created: 04/01/98 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_HELPBASEH__ -#define _WX_HELPBASEH__ - -#include "wx/defs.h" - -#if wxUSE_HELP - -#include "wx/object.h" -#include "wx/string.h" -#include "wx/gdicmn.h" -#include "wx/frame.h" - -// Flags for SetViewer -#define wxHELP_NETSCAPE 1 - -// Search modes: -enum wxHelpSearchMode -{ - wxHELP_SEARCH_INDEX, - wxHELP_SEARCH_ALL -}; - -// Defines the API for help controllers -class WXDLLIMPEXP_CORE wxHelpControllerBase: public wxObject -{ -public: - inline wxHelpControllerBase(wxWindow* parentWindow = NULL) { m_parentWindow = parentWindow; } - inline ~wxHelpControllerBase() {} - - // Must call this to set the filename and server name. - // server is only required when implementing TCP/IP-based - // help controllers. - virtual bool Initialize(const wxString& WXUNUSED(file), int WXUNUSED(server) ) { return false; } - virtual bool Initialize(const wxString& WXUNUSED(file)) { return false; } - - // Set viewer: only relevant to some kinds of controller - virtual void SetViewer(const wxString& WXUNUSED(viewer), long WXUNUSED(flags) = 0) {} - - // If file is "", reloads file given in Initialize - virtual bool LoadFile(const wxString& file = wxEmptyString) = 0; - - // Displays the contents - virtual bool DisplayContents(void) = 0; - - // Display the given section - virtual bool DisplaySection(int sectionNo) = 0; - - // Display the section using a context id - virtual bool DisplayContextPopup(int WXUNUSED(contextId)) { return false; } - - // Display the text in a popup, if possible - virtual bool DisplayTextPopup(const wxString& WXUNUSED(text), const wxPoint& WXUNUSED(pos)) { return false; } - - // By default, uses KeywordSection to display a topic. Implementations - // may override this for more specific behaviour. - virtual bool DisplaySection(const wxString& section) { return KeywordSearch(section); } - virtual bool DisplayBlock(long blockNo) = 0; - virtual bool KeywordSearch(const wxString& k, - wxHelpSearchMode mode = wxHELP_SEARCH_ALL) = 0; - /// Allows one to override the default settings for the help frame. - virtual void SetFrameParameters(const wxString& WXUNUSED(title), - const wxSize& WXUNUSED(size), - const wxPoint& WXUNUSED(pos) = wxDefaultPosition, - bool WXUNUSED(newFrameEachTime) = false) - { - // does nothing by default - } - /// Obtains the latest settings used by the help frame and the help - /// frame. - virtual wxFrame *GetFrameParameters(wxSize *WXUNUSED(size) = NULL, - wxPoint *WXUNUSED(pos) = NULL, - bool *WXUNUSED(newFrameEachTime) = NULL) - { - return NULL; // does nothing by default - } - - virtual bool Quit() = 0; - virtual void OnQuit() {} - - /// Set the window that can optionally be used for the help window's parent. - virtual void SetParentWindow(wxWindow* win) { m_parentWindow = win; } - - /// Get the window that can optionally be used for the help window's parent. - virtual wxWindow* GetParentWindow() const { return m_parentWindow; } - -protected: - wxWindow* m_parentWindow; -private: - wxDECLARE_CLASS(wxHelpControllerBase); -}; - -#endif // wxUSE_HELP - -#endif -// _WX_HELPBASEH__ diff --git a/Externals/wxWidgets3/include/wx/helphtml.h b/Externals/wxWidgets3/include/wx/helphtml.h deleted file mode 100644 index 87bc81dfbd..0000000000 --- a/Externals/wxWidgets3/include/wx/helphtml.h +++ /dev/null @@ -1,19 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/helphtml.h -// Purpose: Includes wx/html/helpctrl.h, for wxHtmlHelpController. -// Author: Julian Smart -// Modified by: -// Created: 2003-05-24 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_HELPHTML_H_ -#define __WX_HELPHTML_H_ - -#if wxUSE_WXHTML_HELP -#include "wx/html/helpctrl.h" -#endif - -#endif // __WX_HELPHTML_H_ - diff --git a/Externals/wxWidgets3/include/wx/helpwin.h b/Externals/wxWidgets3/include/wx/helpwin.h deleted file mode 100644 index 599d62a410..0000000000 --- a/Externals/wxWidgets3/include/wx/helpwin.h +++ /dev/null @@ -1,19 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/helpwin.h -// Purpose: Includes Windows or OS/2 help -// Author: Julian Smart -// Modified by: -// Created: -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_HELPWIN_H_BASE_ -#define _WX_HELPWIN_H_BASE_ - -#if defined(__WXMSW__) -#include "wx/msw/helpwin.h" -#endif - -#endif - // _WX_HELPWIN_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/htmllbox.h b/Externals/wxWidgets3/include/wx/htmllbox.h deleted file mode 100644 index e936699bbe..0000000000 --- a/Externals/wxWidgets3/include/wx/htmllbox.h +++ /dev/null @@ -1,324 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/htmllbox.h -// Purpose: wxHtmlListBox is a listbox whose items are wxHtmlCells -// Author: Vadim Zeitlin -// Modified by: -// Created: 31.05.03 -// Copyright: (c) 2003 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_HTMLLBOX_H_ -#define _WX_HTMLLBOX_H_ - -#include "wx/vlbox.h" // base class -#include "wx/html/htmlwin.h" -#include "wx/ctrlsub.h" - -#if wxUSE_FILESYSTEM - #include "wx/filesys.h" -#endif // wxUSE_FILESYSTEM - -class WXDLLIMPEXP_FWD_HTML wxHtmlCell; -class WXDLLIMPEXP_FWD_HTML wxHtmlWinParser; -class WXDLLIMPEXP_FWD_HTML wxHtmlListBoxCache; -class WXDLLIMPEXP_FWD_HTML wxHtmlListBoxStyle; - -extern WXDLLIMPEXP_DATA_HTML(const char) wxHtmlListBoxNameStr[]; -extern WXDLLIMPEXP_DATA_HTML(const char) wxSimpleHtmlListBoxNameStr[]; - -// ---------------------------------------------------------------------------- -// wxHtmlListBox -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_HTML wxHtmlListBox : public wxVListBox, - public wxHtmlWindowInterface, - public wxHtmlWindowMouseHelper -{ - wxDECLARE_ABSTRACT_CLASS(wxHtmlListBox); -public: - // constructors and such - // --------------------- - - // default constructor, you must call Create() later - wxHtmlListBox(); - - // normal constructor which calls Create() internally - wxHtmlListBox(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxHtmlListBoxNameStr); - - // really creates the control and sets the initial number of items in it - // (which may be changed later with SetItemCount()) - // - // the only special style which may be specified here is wxLB_MULTIPLE - // - // returns true on success or false if the control couldn't be created - bool Create(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxHtmlListBoxNameStr); - - // destructor cleans up whatever resources we use - virtual ~wxHtmlListBox(); - - // override some base class virtuals - virtual void RefreshRow(size_t line) wxOVERRIDE; - virtual void RefreshRows(size_t from, size_t to) wxOVERRIDE; - virtual void RefreshAll() wxOVERRIDE; - virtual void SetItemCount(size_t count) wxOVERRIDE; - -#if wxUSE_FILESYSTEM - // retrieve the file system used by the wxHtmlWinParser: if you use - // relative paths in your HTML, you should use its ChangePathTo() method - wxFileSystem& GetFileSystem() { return m_filesystem; } - const wxFileSystem& GetFileSystem() const { return m_filesystem; } -#endif // wxUSE_FILESYSTEM - - virtual void OnInternalIdle() wxOVERRIDE; - -protected: - // this method must be implemented in the derived class and should return - // the body (i.e. without ) of the HTML for the given item - virtual wxString OnGetItem(size_t n) const = 0; - - // this function may be overridden to decorate HTML returned by OnGetItem() - virtual wxString OnGetItemMarkup(size_t n) const; - - - // this method allows to customize the selection appearance: it may be used - // to specify the colour of the text which normally has the given colour - // colFg when it is inside the selection - // - // by default, the original colour is not used at all and all text has the - // same (default for this system) colour inside selection - virtual wxColour GetSelectedTextColour(const wxColour& colFg) const; - - // this is the same as GetSelectedTextColour() but allows to customize the - // background colour -- this is even more rarely used as you can change it - // globally using SetSelectionBackground() - virtual wxColour GetSelectedTextBgColour(const wxColour& colBg) const; - - - // we implement both of these functions in terms of OnGetItem(), they are - // not supposed to be overridden by our descendants - virtual void OnDrawItem(wxDC& dc, const wxRect& rect, size_t n) const wxOVERRIDE; - virtual wxCoord OnMeasureItem(size_t n) const wxOVERRIDE; - - // override this one to draw custom background for selected items correctly - virtual void OnDrawBackground(wxDC& dc, const wxRect& rect, size_t n) const wxOVERRIDE; - - // this method may be overridden to handle clicking on a link in the - // listbox (by default, clicks on links are simply ignored) - virtual void OnLinkClicked(size_t n, const wxHtmlLinkInfo& link); - - // event handlers - void OnSize(wxSizeEvent& event); - void OnMouseMove(wxMouseEvent& event); - void OnLeftDown(wxMouseEvent& event); - - - // common part of all ctors - void Init(); - - // ensure that the given item is cached - void CacheItem(size_t n) const; - -private: - // wxHtmlWindowInterface methods: - virtual void SetHTMLWindowTitle(const wxString& title) wxOVERRIDE; - virtual void OnHTMLLinkClicked(const wxHtmlLinkInfo& link) wxOVERRIDE; - virtual wxHtmlOpeningStatus OnHTMLOpeningURL(wxHtmlURLType type, - const wxString& url, - wxString *redirect) const wxOVERRIDE; - virtual wxPoint HTMLCoordsToWindow(wxHtmlCell *cell, - const wxPoint& pos) const wxOVERRIDE; - virtual wxWindow* GetHTMLWindow() wxOVERRIDE; - virtual wxColour GetHTMLBackgroundColour() const wxOVERRIDE; - virtual void SetHTMLBackgroundColour(const wxColour& clr) wxOVERRIDE; - virtual void SetHTMLBackgroundImage(const wxBitmap& bmpBg) wxOVERRIDE; - virtual void SetHTMLStatusText(const wxString& text) wxOVERRIDE; - virtual wxCursor GetHTMLCursor(HTMLCursor type) const wxOVERRIDE; - - // returns index of item that contains given HTML cell - size_t GetItemForCell(const wxHtmlCell *cell) const; - - // Create the cell for the given item, caller is responsible for freeing it. - wxHtmlCell* CreateCellForItem(size_t n) const; - - // return physical coordinates of root wxHtmlCell of n-th item - wxPoint GetRootCellCoords(size_t n) const; - - // Converts physical coordinates stored in @a pos into coordinates - // relative to the root cell of the item under mouse cursor, if any. If no - // cell is found under the cursor, returns false. Otherwise stores the new - // coordinates back into @a pos and pointer to the cell under cursor into - // @a cell and returns true. - bool PhysicalCoordsToCell(wxPoint& pos, wxHtmlCell*& cell) const; - - // The opposite of PhysicalCoordsToCell: converts coordinates relative to - // given cell to physical coordinates in the window - wxPoint CellCoordsToPhysical(const wxPoint& pos, wxHtmlCell *cell) const; - -private: - // this class caches the pre-parsed HTML to speed up display - wxHtmlListBoxCache *m_cache; - - // HTML parser we use - wxHtmlWinParser *m_htmlParser; - -#if wxUSE_FILESYSTEM - // file system used by m_htmlParser - wxFileSystem m_filesystem; -#endif // wxUSE_FILESYSTEM - - // rendering style for the parser which allows us to customize our colours - wxHtmlListBoxStyle *m_htmlRendStyle; - - - // it calls our GetSelectedTextColour() and GetSelectedTextBgColour() - friend class wxHtmlListBoxStyle; - friend class wxHtmlListBoxWinInterface; - - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_NO_COPY_CLASS(wxHtmlListBox); -}; - - -// ---------------------------------------------------------------------------- -// wxSimpleHtmlListBox -// ---------------------------------------------------------------------------- - -#define wxHLB_DEFAULT_STYLE wxBORDER_SUNKEN -#define wxHLB_MULTIPLE wxLB_MULTIPLE - -class WXDLLIMPEXP_HTML wxSimpleHtmlListBox : - public wxWindowWithItems -{ - wxDECLARE_ABSTRACT_CLASS(wxSimpleHtmlListBox); -public: - // wxListbox-compatible constructors - // --------------------------------- - - wxSimpleHtmlListBox() { } - - wxSimpleHtmlListBox(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = NULL, - long style = wxHLB_DEFAULT_STYLE, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxSimpleHtmlListBoxNameStr) - { - Create(parent, id, pos, size, n, choices, style, validator, name); - } - - wxSimpleHtmlListBox(wxWindow *parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style = wxHLB_DEFAULT_STYLE, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxSimpleHtmlListBoxNameStr) - { - Create(parent, id, pos, size, choices, style, validator, name); - } - - bool Create(wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = NULL, - long style = wxHLB_DEFAULT_STYLE, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxSimpleHtmlListBoxNameStr); - bool Create(wxWindow *parent, wxWindowID id, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style = wxHLB_DEFAULT_STYLE, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxSimpleHtmlListBoxNameStr); - - virtual ~wxSimpleHtmlListBox(); - - // these must be overloaded otherwise the compiler will complain - // about wxItemContainerImmutable::[G|S]etSelection being pure virtuals... - void SetSelection(int n) wxOVERRIDE - { wxVListBox::SetSelection(n); } - int GetSelection() const wxOVERRIDE - { return wxVListBox::GetSelection(); } - - - // accessing strings - // ----------------- - - virtual unsigned int GetCount() const wxOVERRIDE - { return m_items.GetCount(); } - - virtual wxString GetString(unsigned int n) const wxOVERRIDE; - - // override default unoptimized wxItemContainer::GetStrings() function - wxArrayString GetStrings() const - { return m_items; } - - virtual void SetString(unsigned int n, const wxString& s) wxOVERRIDE; - - // resolve ambiguity between wxItemContainer and wxVListBox versions - void Clear() wxOVERRIDE; - -protected: - virtual int DoInsertItems(const wxArrayStringsAdapter & items, - unsigned int pos, - void **clientData, wxClientDataType type) wxOVERRIDE; - - virtual void DoSetItemClientData(unsigned int n, void *clientData) wxOVERRIDE - { m_HTMLclientData[n] = clientData; } - - virtual void *DoGetItemClientData(unsigned int n) const wxOVERRIDE - { return m_HTMLclientData[n]; } - - // wxItemContainer methods - virtual void DoClear() wxOVERRIDE; - virtual void DoDeleteOneItem(unsigned int n) wxOVERRIDE; - - // calls wxHtmlListBox::SetItemCount() and RefreshAll() - void UpdateCount(); - - // override these functions just to change their visibility: users of - // wxSimpleHtmlListBox shouldn't be allowed to call them directly! - virtual void SetItemCount(size_t count) wxOVERRIDE - { wxHtmlListBox::SetItemCount(count); } - virtual void SetRowCount(size_t count) - { wxHtmlListBox::SetRowCount(count); } - - virtual wxString OnGetItem(size_t n) const wxOVERRIDE - { return m_items[n]; } - - virtual void InitEvent(wxCommandEvent& event, int n) wxOVERRIDE - { - // we're not a virtual control and we can include the string - // of the item which was clicked: - event.SetString(m_items[n]); - wxVListBox::InitEvent(event, n); - } - - wxArrayString m_items; - wxArrayPtrVoid m_HTMLclientData; - - // Note: For the benefit of old compilers (like gcc-2.8) this should - // not be named m_clientdata as that clashes with the name of an - // anonymous struct member in wxEvtHandler, which we derive from. - - wxDECLARE_NO_COPY_CLASS(wxSimpleHtmlListBox); -}; - -#endif // _WX_HTMLLBOX_H_ - diff --git a/Externals/wxWidgets3/include/wx/hyperlink.h b/Externals/wxWidgets3/include/wx/hyperlink.h deleted file mode 100644 index b74bcf140c..0000000000 --- a/Externals/wxWidgets3/include/wx/hyperlink.h +++ /dev/null @@ -1,173 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/hyperlink.h -// Purpose: Hyperlink control -// Author: David Norris , Otto Wyss -// Modified by: Ryan Norton, Francesco Montorsi -// Created: 04/02/2005 -// Copyright: (c) 2005 David Norris -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_HYPERLINK_H_ -#define _WX_HYPERLINK_H_ - -#include "wx/defs.h" - -#if wxUSE_HYPERLINKCTRL - -#include "wx/control.h" - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -#define wxHL_CONTEXTMENU 0x0001 -#define wxHL_ALIGN_LEFT 0x0002 -#define wxHL_ALIGN_RIGHT 0x0004 -#define wxHL_ALIGN_CENTRE 0x0008 -#define wxHL_DEFAULT_STYLE (wxHL_CONTEXTMENU|wxNO_BORDER|wxHL_ALIGN_CENTRE) - -extern WXDLLIMPEXP_DATA_ADV(const char) wxHyperlinkCtrlNameStr[]; - - -// ---------------------------------------------------------------------------- -// wxHyperlinkCtrl -// ---------------------------------------------------------------------------- - -// A static text control that emulates a hyperlink. The link is displayed -// in an appropriate text style, derived from the control's normal font. -// When the mouse rolls over the link, the cursor changes to a hand and the -// link's color changes to the active color. -// -// Clicking on the link does not launch a web browser; instead, a -// HyperlinkEvent is fired. The event propagates upward until it is caught, -// just like a wxCommandEvent. -// -// Use the EVT_HYPERLINK() to catch link events. -class WXDLLIMPEXP_ADV wxHyperlinkCtrlBase : public wxControl -{ -public: - - // get/set - virtual wxColour GetHoverColour() const = 0; - virtual void SetHoverColour(const wxColour &colour) = 0; - - virtual wxColour GetNormalColour() const = 0; - virtual void SetNormalColour(const wxColour &colour) = 0; - - virtual wxColour GetVisitedColour() const = 0; - virtual void SetVisitedColour(const wxColour &colour) = 0; - - virtual wxString GetURL() const = 0; - virtual void SetURL (const wxString &url) = 0; - - virtual void SetVisited(bool visited = true) = 0; - virtual bool GetVisited() const = 0; - - // NOTE: also wxWindow::Set/GetLabel, wxWindow::Set/GetBackgroundColour, - // wxWindow::Get/SetFont, wxWindow::Get/SetCursor are important ! - - virtual bool HasTransparentBackground() wxOVERRIDE { return true; } - -protected: - virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } - - // checks for validity some of the ctor/Create() function parameters - void CheckParams(const wxString& label, const wxString& url, long style); - -public: - // not part of the public API but needs to be public as used by - // GTK+ callbacks: - void SendEvent(); -}; - -// ---------------------------------------------------------------------------- -// wxHyperlinkEvent -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_ADV wxHyperlinkEvent; - -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_HYPERLINK, wxHyperlinkEvent ); - -// -// An event fired when the user clicks on the label in a hyperlink control. -// See HyperlinkControl for details. -// -class WXDLLIMPEXP_ADV wxHyperlinkEvent : public wxCommandEvent -{ -public: - wxHyperlinkEvent() {} - wxHyperlinkEvent(wxObject *generator, wxWindowID id, const wxString& url) - : wxCommandEvent(wxEVT_HYPERLINK, id), - m_url(url) - { - SetEventObject(generator); - } - - // Returns the URL associated with the hyperlink control - // that the user clicked on. - wxString GetURL() const { return m_url; } - void SetURL(const wxString &url) { m_url=url; } - - // default copy ctor, assignment operator and dtor are ok - virtual wxEvent *Clone() const wxOVERRIDE { return new wxHyperlinkEvent(*this); } - -private: - - // URL associated with the hyperlink control that the used clicked on. - wxString m_url; - - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxHyperlinkEvent); -}; - - -// ---------------------------------------------------------------------------- -// event types and macros -// ---------------------------------------------------------------------------- - -typedef void (wxEvtHandler::*wxHyperlinkEventFunction)(wxHyperlinkEvent&); - -#define wxHyperlinkEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxHyperlinkEventFunction, func) - -#define EVT_HYPERLINK(id, fn) \ - wx__DECLARE_EVT1(wxEVT_HYPERLINK, id, wxHyperlinkEventHandler(fn)) - - -#if defined(__WXGTK210__) && !defined(__WXUNIVERSAL__) - #include "wx/gtk/hyperlink.h" -// Note that the native control is only available in Unicode version under MSW. -#elif defined(__WXMSW__) && wxUSE_UNICODE && !defined(__WXUNIVERSAL__) - #include "wx/msw/hyperlink.h" -#else - #include "wx/generic/hyperlink.h" - - class WXDLLIMPEXP_ADV wxHyperlinkCtrl : public wxGenericHyperlinkCtrl - { - public: - wxHyperlinkCtrl() { } - - wxHyperlinkCtrl(wxWindow *parent, - wxWindowID id, - const wxString& label, - const wxString& url, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxHL_DEFAULT_STYLE, - const wxString& name = wxHyperlinkCtrlNameStr) - : wxGenericHyperlinkCtrl(parent, id, label, url, pos, size, - style, name) - { - } - - private: - wxDECLARE_DYNAMIC_CLASS_NO_COPY( wxHyperlinkCtrl ); - }; -#endif - -// old wxEVT_COMMAND_* constants -#define wxEVT_COMMAND_HYPERLINK wxEVT_HYPERLINK - -#endif // wxUSE_HYPERLINKCTRL - -#endif // _WX_HYPERLINK_H_ diff --git a/Externals/wxWidgets3/include/wx/icon.h b/Externals/wxWidgets3/include/wx/icon.h deleted file mode 100644 index 0f7c45e904..0000000000 --- a/Externals/wxWidgets3/include/wx/icon.h +++ /dev/null @@ -1,71 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/icon.h -// Purpose: wxIcon base header -// Author: Julian Smart -// Modified by: -// Created: -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_ICON_H_BASE_ -#define _WX_ICON_H_BASE_ - -#include "wx/iconloc.h" - - -// a more readable way to tell -#define wxICON_SCREEN_DEPTH (-1) - - -// the wxICON_DEFAULT_TYPE (the wxIcon equivalent of wxBITMAP_DEFAULT_TYPE) -// constant defines the default argument value for wxIcon ctor and wxIcon::LoadFile() -// functions. - -#if defined(__WXMSW__) - #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_ICO_RESOURCE - #include "wx/msw/icon.h" -#elif defined(__WXMOTIF__) - #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_XPM - #include "wx/motif/icon.h" -#elif defined(__WXGTK20__) - #ifdef __WINDOWS__ - #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_ICO_RESOURCE - #else - #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_XPM - #endif - #include "wx/generic/icon.h" -#elif defined(__WXGTK__) - #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_XPM - #include "wx/generic/icon.h" -#elif defined(__WXX11__) - #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_XPM - #include "wx/generic/icon.h" -#elif defined(__WXDFB__) - #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_XPM - #include "wx/generic/icon.h" -#elif defined(__WXMAC__) -#if wxOSX_USE_COCOA_OR_CARBON - #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_ICON_RESOURCE - #include "wx/osx/icon.h" -#else - #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_PNG_RESOURCE - #include "wx/generic/icon.h" -#endif -#elif defined(__WXQT__) - #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_XPM - #include "wx/generic/icon.h" -#endif - -//----------------------------------------------------------------------------- -// wxVariant support -//----------------------------------------------------------------------------- - -#if wxUSE_VARIANT -#include "wx/variant.h" -DECLARE_VARIANT_OBJECT_EXPORTED(wxIcon,WXDLLIMPEXP_CORE) -#endif - - -#endif - // _WX_ICON_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/iconbndl.h b/Externals/wxWidgets3/include/wx/iconbndl.h deleted file mode 100644 index 704c58f248..0000000000 --- a/Externals/wxWidgets3/include/wx/iconbndl.h +++ /dev/null @@ -1,132 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/iconbndl.h -// Purpose: wxIconBundle -// Author: Mattia barbon -// Modified by: -// Created: 23.03.02 -// Copyright: (c) Mattia Barbon -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_ICONBNDL_H_ -#define _WX_ICONBNDL_H_ - -#include "wx/gdiobj.h" -#include "wx/gdicmn.h" // for wxSize -#include "wx/icon.h" - -#include "wx/dynarray.h" - -class WXDLLIMPEXP_FWD_BASE wxInputStream; - -WX_DECLARE_EXPORTED_OBJARRAY(wxIcon, wxIconArray); - -// this class can't load bitmaps of type wxBITMAP_TYPE_ICO_RESOURCE, -// if you need them, you have to load them manually and call -// wxIconCollection::AddIcon -class WXDLLIMPEXP_CORE wxIconBundle : public wxGDIObject -{ -public: - // Flags that determine what happens if GetIcon() doesn't find the icon of - // exactly the requested size. - enum - { - // Return invalid icon if exact size is not found. - FALLBACK_NONE = 0, - - // Return the icon of the system icon size if exact size is not found. - // May be combined with other non-NONE enum elements to determine what - // happens if the system icon size is not found neither. - FALLBACK_SYSTEM = 1, - - // Return the icon of closest larger size or, if there is no icon of - // larger size in the bundle, the closest icon of smaller size. - FALLBACK_NEAREST_LARGER = 2 - }; - - // default constructor - wxIconBundle(); - - // initializes the bundle with the icon(s) found in the file -#if wxUSE_STREAMS && wxUSE_IMAGE -#if wxUSE_FFILE || wxUSE_FILE - wxIconBundle(const wxString& file, wxBitmapType type = wxBITMAP_TYPE_ANY); -#endif // wxUSE_FFILE || wxUSE_FILE - wxIconBundle(wxInputStream& stream, wxBitmapType type = wxBITMAP_TYPE_ANY); -#endif // wxUSE_STREAMS && wxUSE_IMAGE - - // initializes the bundle with a single icon - wxIconBundle(const wxIcon& icon); - - // default copy ctor and assignment operator are OK - - // adds all the icons contained in the file to the collection, - // if the collection already contains icons with the same - // width and height, they are replaced -#if wxUSE_STREAMS && wxUSE_IMAGE -#if wxUSE_FFILE || wxUSE_FILE - void AddIcon(const wxString& file, wxBitmapType type = wxBITMAP_TYPE_ANY); -#endif // wxUSE_FFILE || wxUSE_FILE - void AddIcon(wxInputStream& stream, wxBitmapType type = wxBITMAP_TYPE_ANY); -#endif // wxUSE_STREAMS && wxUSE_IMAGE - - // adds the icon to the collection, if the collection already - // contains an icon with the same width and height, it is - // replaced - void AddIcon(const wxIcon& icon); - - // returns the icon with the given size; if no such icon exists, - // behavior is specified by the flags. - wxIcon GetIcon(const wxSize& size, int flags = FALLBACK_SYSTEM) const; - - // equivalent to GetIcon(wxSize(size, size)) - wxIcon GetIcon(wxCoord size = wxDefaultCoord, - int flags = FALLBACK_SYSTEM) const - { return GetIcon(wxSize(size, size), flags); } - - // returns the icon exactly of the specified size or wxNullIcon if no icon - // of exactly given size are available - wxIcon GetIconOfExactSize(const wxSize& size) const; - wxIcon GetIconOfExactSize(wxCoord size) const - { return GetIconOfExactSize(wxSize(size, size)); } - - // enumerate all icons in the bundle: don't use these functions if ti can - // be avoided, using GetIcon() directly is better - - // return the number of available icons - size_t GetIconCount() const; - - // return the icon at index (must be < GetIconCount()) - wxIcon GetIconByIndex(size_t n) const; - - // check if we have any icons at all - bool IsEmpty() const { return GetIconCount() == 0; } - -#if WXWIN_COMPATIBILITY_2_8 -#if wxUSE_STREAMS && wxUSE_IMAGE && (wxUSE_FFILE || wxUSE_FILE) - wxDEPRECATED( void AddIcon(const wxString& file, long type) - { - AddIcon(file, (wxBitmapType)type); - } - ) - - wxDEPRECATED_CONSTRUCTOR( wxIconBundle (const wxString& file, long type) - { - AddIcon(file, (wxBitmapType)type); - } - ) -#endif // wxUSE_STREAMS && wxUSE_IMAGE && (wxUSE_FFILE || wxUSE_FILE) -#endif // WXWIN_COMPATIBILITY_2_8 - -protected: - virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE; - -private: - // delete all icons - void DeleteIcons(); - - wxDECLARE_DYNAMIC_CLASS(wxIconBundle); -}; - -#endif // _WX_ICONBNDL_H_ diff --git a/Externals/wxWidgets3/include/wx/iconloc.h b/Externals/wxWidgets3/include/wx/iconloc.h deleted file mode 100644 index 9baaaa5297..0000000000 --- a/Externals/wxWidgets3/include/wx/iconloc.h +++ /dev/null @@ -1,80 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/iconloc.h -// Purpose: declaration of wxIconLocation class -// Author: Vadim Zeitlin -// Modified by: -// Created: 21.06.2003 -// Copyright: (c) 2003 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_ICONLOC_H_ -#define _WX_ICONLOC_H_ - -#include "wx/string.h" - -// ---------------------------------------------------------------------------- -// wxIconLocation: describes the location of an icon -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxIconLocationBase -{ -public: - // ctor takes the name of the file where the icon is - wxEXPLICIT wxIconLocationBase(const wxString& filename = wxEmptyString) - : m_filename(filename) { } - - // default copy ctor, assignment operator and dtor are ok - - - // returns true if this object is valid/initialized - bool IsOk() const { return !m_filename.empty(); } - - // set/get the icon file name - void SetFileName(const wxString& filename) { m_filename = filename; } - const wxString& GetFileName() const { return m_filename; } - -private: - wxString m_filename; -}; - -// under Windows the same file may contain several icons so we also store the -// index of the icon -#if defined(__WINDOWS__) - -class WXDLLIMPEXP_BASE wxIconLocation : public wxIconLocationBase -{ -public: - // ctor takes the name of the file where the icon is and the icons index in - // the file - wxEXPLICIT wxIconLocation(const wxString& file = wxEmptyString, int num = 0); - - // set/get the icon index - void SetIndex(int num) { m_index = num; } - int GetIndex() const { return m_index; } - -private: - int m_index; -}; - -inline -wxIconLocation::wxIconLocation(const wxString& file, int num) - : wxIconLocationBase(file) -{ - SetIndex(num); -} - -#else // !__WINDOWS__ - -// must be a class because we forward declare it as class -class WXDLLIMPEXP_BASE wxIconLocation : public wxIconLocationBase -{ -public: - wxEXPLICIT wxIconLocation(const wxString& filename = wxEmptyString) - : wxIconLocationBase(filename) { } -}; - -#endif // platform - -#endif // _WX_ICONLOC_H_ - diff --git a/Externals/wxWidgets3/include/wx/imagbmp.h b/Externals/wxWidgets3/include/wx/imagbmp.h deleted file mode 100644 index a4a6527eed..0000000000 --- a/Externals/wxWidgets3/include/wx/imagbmp.h +++ /dev/null @@ -1,159 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/imagbmp.h -// Purpose: wxImage BMP, ICO, CUR and ANI handlers -// Author: Robert Roebling, Chris Elliott -// Copyright: (c) Robert Roebling, Chris Elliott -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_IMAGBMP_H_ -#define _WX_IMAGBMP_H_ - -#include "wx/image.h" - -// defines for saving the BMP file in different formats, Bits Per Pixel -// USE: wximage.SetOption( wxIMAGE_OPTION_BMP_FORMAT, wxBMP_xBPP ); -#define wxIMAGE_OPTION_BMP_FORMAT wxString(wxT("wxBMP_FORMAT")) - -// These two options are filled in upon reading CUR file and can (should) be -// specified when saving a CUR file - they define the hotspot of the cursor: -#define wxIMAGE_OPTION_CUR_HOTSPOT_X wxT("HotSpotX") -#define wxIMAGE_OPTION_CUR_HOTSPOT_Y wxT("HotSpotY") - - -enum -{ - wxBMP_24BPP = 24, // default, do not need to set - //wxBMP_16BPP = 16, // wxQuantize can only do 236 colors? - wxBMP_8BPP = 8, // 8bpp, quantized colors - wxBMP_8BPP_GREY = 9, // 8bpp, rgb averaged to greys - wxBMP_8BPP_GRAY = wxBMP_8BPP_GREY, - wxBMP_8BPP_RED = 10, // 8bpp, red used as greyscale - wxBMP_8BPP_PALETTE = 11, // 8bpp, use the wxImage's palette - wxBMP_4BPP = 4, // 4bpp, quantized colors - wxBMP_1BPP = 1, // 1bpp, quantized "colors" - wxBMP_1BPP_BW = 2 // 1bpp, black & white from red -}; - -// ---------------------------------------------------------------------------- -// wxBMPHandler -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxBMPHandler : public wxImageHandler -{ -public: - wxBMPHandler() - { - m_name = wxT("Windows bitmap file"); - m_extension = wxT("bmp"); - m_type = wxBITMAP_TYPE_BMP; - m_mime = wxT("image/x-bmp"); - } - -#if wxUSE_STREAMS - virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true ) wxOVERRIDE; - virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 ) wxOVERRIDE; - -protected: - virtual bool DoCanRead( wxInputStream& stream ) wxOVERRIDE; - bool SaveDib(wxImage *image, wxOutputStream& stream, bool verbose, - bool IsBmp, bool IsMask); - bool DoLoadDib(wxImage *image, int width, int height, int bpp, int ncolors, - int comp, wxFileOffset bmpOffset, wxInputStream& stream, - bool verbose, bool IsBmp, bool hasPalette, int colEntrySize = 4); - bool LoadDib(wxImage *image, wxInputStream& stream, bool verbose, bool IsBmp); -#endif // wxUSE_STREAMS - -private: - wxDECLARE_DYNAMIC_CLASS(wxBMPHandler); -}; - -#if wxUSE_ICO_CUR -// ---------------------------------------------------------------------------- -// wxICOHandler -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxICOHandler : public wxBMPHandler -{ -public: - wxICOHandler() - { - m_name = wxT("Windows icon file"); - m_extension = wxT("ico"); - m_type = wxBITMAP_TYPE_ICO; - m_mime = wxT("image/x-ico"); - } - -#if wxUSE_STREAMS - virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true ) wxOVERRIDE; - virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 ) wxOVERRIDE; - virtual bool DoLoadFile( wxImage *image, wxInputStream& stream, bool verbose, int index ); - -protected: - virtual int DoGetImageCount( wxInputStream& stream ) wxOVERRIDE; - virtual bool DoCanRead( wxInputStream& stream ) wxOVERRIDE; -#endif // wxUSE_STREAMS - -private: - wxDECLARE_DYNAMIC_CLASS(wxICOHandler); -}; - - -// ---------------------------------------------------------------------------- -// wxCURHandler -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxCURHandler : public wxICOHandler -{ -public: - wxCURHandler() - { - m_name = wxT("Windows cursor file"); - m_extension = wxT("cur"); - m_type = wxBITMAP_TYPE_CUR; - m_mime = wxT("image/x-cur"); - } - - // VS: This handler's meat is implemented inside wxICOHandler (the two - // formats are almost identical), but we hide this fact at - // the API level, since it is a mere implementation detail. - -protected: -#if wxUSE_STREAMS - virtual bool DoCanRead( wxInputStream& stream ) wxOVERRIDE; -#endif // wxUSE_STREAMS - -private: - wxDECLARE_DYNAMIC_CLASS(wxCURHandler); -}; -// ---------------------------------------------------------------------------- -// wxANIHandler -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxANIHandler : public wxCURHandler -{ -public: - wxANIHandler() - { - m_name = wxT("Windows animated cursor file"); - m_extension = wxT("ani"); - m_type = wxBITMAP_TYPE_ANI; - m_mime = wxT("image/x-ani"); - } - - -#if wxUSE_STREAMS - virtual bool SaveFile( wxImage *WXUNUSED(image), wxOutputStream& WXUNUSED(stream), bool WXUNUSED(verbose=true) ) wxOVERRIDE{return false ;} - virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 ) wxOVERRIDE; - -protected: - virtual int DoGetImageCount( wxInputStream& stream ) wxOVERRIDE; - virtual bool DoCanRead( wxInputStream& stream ) wxOVERRIDE; -#endif // wxUSE_STREAMS - -private: - wxDECLARE_DYNAMIC_CLASS(wxANIHandler); -}; - -#endif // wxUSE_ICO_CUR -#endif // _WX_IMAGBMP_H_ diff --git a/Externals/wxWidgets3/include/wx/image.h b/Externals/wxWidgets3/include/wx/image.h deleted file mode 100644 index c7e7a87e82..0000000000 --- a/Externals/wxWidgets3/include/wx/image.h +++ /dev/null @@ -1,667 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/image.h -// Purpose: wxImage class -// Author: Robert Roebling -// Copyright: (c) Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_IMAGE_H_ -#define _WX_IMAGE_H_ - -#include "wx/defs.h" - -#if wxUSE_IMAGE - -#include "wx/object.h" -#include "wx/string.h" -#include "wx/gdicmn.h" -#include "wx/hashmap.h" -#include "wx/arrstr.h" - -#if wxUSE_STREAMS -# include "wx/stream.h" -#endif - -// on some systems (Unixware 7.x) index is defined as a macro in the headers -// which breaks the compilation below -#undef index - -#define wxIMAGE_OPTION_QUALITY wxString(wxS("quality")) -#define wxIMAGE_OPTION_FILENAME wxString(wxS("FileName")) - -#define wxIMAGE_OPTION_RESOLUTION wxString(wxS("Resolution")) -#define wxIMAGE_OPTION_RESOLUTIONX wxString(wxS("ResolutionX")) -#define wxIMAGE_OPTION_RESOLUTIONY wxString(wxS("ResolutionY")) - -#define wxIMAGE_OPTION_RESOLUTIONUNIT wxString(wxS("ResolutionUnit")) - -#define wxIMAGE_OPTION_MAX_WIDTH wxString(wxS("MaxWidth")) -#define wxIMAGE_OPTION_MAX_HEIGHT wxString(wxS("MaxHeight")) - -#define wxIMAGE_OPTION_ORIGINAL_WIDTH wxString(wxS("OriginalWidth")) -#define wxIMAGE_OPTION_ORIGINAL_HEIGHT wxString(wxS("OriginalHeight")) - -// constants used with wxIMAGE_OPTION_RESOLUTIONUNIT -// -// NB: don't change these values, they correspond to libjpeg constants -enum wxImageResolution -{ - // Resolution not specified - wxIMAGE_RESOLUTION_NONE = 0, - - // Resolution specified in inches - wxIMAGE_RESOLUTION_INCHES = 1, - - // Resolution specified in centimeters - wxIMAGE_RESOLUTION_CM = 2 -}; - -// Constants for wxImage::Scale() for determining the level of quality -enum wxImageResizeQuality -{ - // different image resizing algorithms used by Scale() and Rescale() - wxIMAGE_QUALITY_NEAREST = 0, - wxIMAGE_QUALITY_BILINEAR = 1, - wxIMAGE_QUALITY_BICUBIC = 2, - wxIMAGE_QUALITY_BOX_AVERAGE = 3, - - // default quality is low (but fast) - wxIMAGE_QUALITY_NORMAL = wxIMAGE_QUALITY_NEAREST, - - // highest (but best) quality - wxIMAGE_QUALITY_HIGH = 4 -}; - -// alpha channel values: fully transparent, default threshold separating -// transparent pixels from opaque for a few functions dealing with alpha and -// fully opaque -const unsigned char wxIMAGE_ALPHA_TRANSPARENT = 0; -const unsigned char wxIMAGE_ALPHA_THRESHOLD = 0x80; -const unsigned char wxIMAGE_ALPHA_OPAQUE = 0xff; - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxImageHandler; -class WXDLLIMPEXP_FWD_CORE wxImage; -class WXDLLIMPEXP_FWD_CORE wxPalette; - -//----------------------------------------------------------------------------- -// wxVariant support -//----------------------------------------------------------------------------- - -#if wxUSE_VARIANT -#include "wx/variant.h" -DECLARE_VARIANT_OBJECT_EXPORTED(wxImage,WXDLLIMPEXP_CORE) -#endif - -//----------------------------------------------------------------------------- -// wxImageHandler -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxImageHandler: public wxObject -{ -public: - wxImageHandler() - : m_name(wxEmptyString), m_extension(wxEmptyString), m_mime(), m_type(wxBITMAP_TYPE_INVALID) - { } - -#if wxUSE_STREAMS - // NOTE: LoadFile and SaveFile are not pure virtuals to allow derived classes - // to implement only one of the two - virtual bool LoadFile( wxImage *WXUNUSED(image), wxInputStream& WXUNUSED(stream), - bool WXUNUSED(verbose)=true, int WXUNUSED(index)=-1 ) - { return false; } - virtual bool SaveFile( wxImage *WXUNUSED(image), wxOutputStream& WXUNUSED(stream), - bool WXUNUSED(verbose)=true ) - { return false; } - - int GetImageCount( wxInputStream& stream ); - // save the stream position, call DoGetImageCount() and restore the position - - bool CanRead( wxInputStream& stream ) { return CallDoCanRead(stream); } - bool CanRead( const wxString& name ); -#endif // wxUSE_STREAMS - - void SetName(const wxString& name) { m_name = name; } - void SetExtension(const wxString& ext) { m_extension = ext; } - void SetAltExtensions(const wxArrayString& exts) { m_altExtensions = exts; } - void SetType(wxBitmapType type) { m_type = type; } - void SetMimeType(const wxString& type) { m_mime = type; } - const wxString& GetName() const { return m_name; } - const wxString& GetExtension() const { return m_extension; } - const wxArrayString& GetAltExtensions() const { return m_altExtensions; } - wxBitmapType GetType() const { return m_type; } - const wxString& GetMimeType() const { return m_mime; } - -#if WXWIN_COMPATIBILITY_2_8 - wxDEPRECATED( - void SetType(long type) { SetType((wxBitmapType)type); } - ) -#endif // WXWIN_COMPATIBILITY_2_8 - -protected: -#if wxUSE_STREAMS - // NOTE: this function is allowed to change the current stream position - // since GetImageCount() will take care of restoring it later - virtual int DoGetImageCount( wxInputStream& WXUNUSED(stream) ) - { return 1; } // default return value is 1 image - - // NOTE: this function is allowed to change the current stream position - // since CallDoCanRead() will take care of restoring it later - virtual bool DoCanRead( wxInputStream& stream ) = 0; - - // save the stream position, call DoCanRead() and restore the position - bool CallDoCanRead(wxInputStream& stream); -#endif // wxUSE_STREAMS - - // helper for the derived classes SaveFile() implementations: returns the - // values of x- and y-resolution options specified as the image options if - // any - static wxImageResolution - GetResolutionFromOptions(const wxImage& image, int *x, int *y); - - - wxString m_name; - wxString m_extension; - wxArrayString m_altExtensions; - wxString m_mime; - wxBitmapType m_type; - -private: - wxDECLARE_CLASS(wxImageHandler); -}; - -//----------------------------------------------------------------------------- -// wxImageHistogram -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxImageHistogramEntry -{ -public: - wxImageHistogramEntry() { index = value = 0; } - unsigned long index; - unsigned long value; -}; - -WX_DECLARE_EXPORTED_HASH_MAP(unsigned long, wxImageHistogramEntry, - wxIntegerHash, wxIntegerEqual, - wxImageHistogramBase); - -class WXDLLIMPEXP_CORE wxImageHistogram : public wxImageHistogramBase -{ -public: - wxImageHistogram() : wxImageHistogramBase(256) { } - - // get the key in the histogram for the given RGB values - static unsigned long MakeKey(unsigned char r, - unsigned char g, - unsigned char b) - { - return (r << 16) | (g << 8) | b; - } - - // find first colour that is not used in the image and has higher - // RGB values than RGB(startR, startG, startB) - // - // returns true and puts this colour in r, g, b (each of which may be NULL) - // on success or returns false if there are no more free colours - bool FindFirstUnusedColour(unsigned char *r, - unsigned char *g, - unsigned char *b, - unsigned char startR = 1, - unsigned char startG = 0, - unsigned char startB = 0 ) const; -}; - -//----------------------------------------------------------------------------- -// wxImage -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxImage: public wxObject -{ -public: - // red, green and blue are 8 bit unsigned integers in the range of 0..255 - // We use the identifier RGBValue instead of RGB, since RGB is #defined - class RGBValue - { - public: - RGBValue(unsigned char r=0, unsigned char g=0, unsigned char b=0) - : red(r), green(g), blue(b) {} - unsigned char red; - unsigned char green; - unsigned char blue; - }; - - // hue, saturation and value are doubles in the range 0.0..1.0 - class HSVValue - { - public: - HSVValue(double h=0.0, double s=0.0, double v=0.0) - : hue(h), saturation(s), value(v) {} - double hue; - double saturation; - double value; - }; - - wxImage() {} - wxImage( int width, int height, bool clear = true ) - { Create( width, height, clear ); } - wxImage( int width, int height, unsigned char* data, bool static_data = false ) - { Create( width, height, data, static_data ); } - wxImage( int width, int height, unsigned char* data, unsigned char* alpha, bool static_data = false ) - { Create( width, height, data, alpha, static_data ); } - - // ctor variants using wxSize: - wxImage( const wxSize& sz, bool clear = true ) - { Create( sz, clear ); } - wxImage( const wxSize& sz, unsigned char* data, bool static_data = false ) - { Create( sz, data, static_data ); } - wxImage( const wxSize& sz, unsigned char* data, unsigned char* alpha, bool static_data = false ) - { Create( sz, data, alpha, static_data ); } - - wxImage( const wxString& name, wxBitmapType type = wxBITMAP_TYPE_ANY, int index = -1 ) - { LoadFile( name, type, index ); } - wxImage( const wxString& name, const wxString& mimetype, int index = -1 ) - { LoadFile( name, mimetype, index ); } - wxImage( const char* const* xpmData ) - { Create(xpmData); } - -#if wxUSE_STREAMS - wxImage( wxInputStream& stream, wxBitmapType type = wxBITMAP_TYPE_ANY, int index = -1 ) - { LoadFile( stream, type, index ); } - wxImage( wxInputStream& stream, const wxString& mimetype, int index = -1 ) - { LoadFile( stream, mimetype, index ); } -#endif // wxUSE_STREAMS - - bool Create( const char* const* xpmData ); -#ifdef __BORLANDC__ - // needed for Borland 5.5 - wxImage( char** xpmData ) { Create(const_cast(xpmData)); } - bool Create( char** xpmData ) { return Create(const_cast(xpmData)); } -#endif - - bool Create( int width, int height, bool clear = true ); - bool Create( int width, int height, unsigned char* data, bool static_data = false ); - bool Create( int width, int height, unsigned char* data, unsigned char* alpha, bool static_data = false ); - - // Create() variants using wxSize: - bool Create( const wxSize& sz, bool clear = true ) - { return Create(sz.GetWidth(), sz.GetHeight(), clear); } - bool Create( const wxSize& sz, unsigned char* data, bool static_data = false ) - { return Create(sz.GetWidth(), sz.GetHeight(), data, static_data); } - bool Create( const wxSize& sz, unsigned char* data, unsigned char* alpha, bool static_data = false ) - { return Create(sz.GetWidth(), sz.GetHeight(), data, alpha, static_data); } - - void Destroy(); - - // initialize the image data with zeroes - void Clear(unsigned char value = 0); - - // creates an identical copy of the image (the = operator - // just raises the ref count) - wxImage Copy() const; - - // return the new image with size width*height - wxImage GetSubImage( const wxRect& rect) const; - - // Paste the image or part of this image into an image of the given size at the pos - // any newly exposed areas will be filled with the rgb colour - // by default if r = g = b = -1 then fill with this image's mask colour or find and - // set a suitable mask colour - wxImage Size( const wxSize& size, const wxPoint& pos, - int r = -1, int g = -1, int b = -1 ) const; - - // pastes image into this instance and takes care of - // the mask colour and out of bounds problems - void Paste( const wxImage &image, int x, int y ); - - // return the new image with size width*height - wxImage Scale( int width, int height, - wxImageResizeQuality quality = wxIMAGE_QUALITY_NORMAL ) const; - - // box averager and bicubic filters for up/down sampling - wxImage ResampleNearest(int width, int height) const; - wxImage ResampleBox(int width, int height) const; - wxImage ResampleBilinear(int width, int height) const; - wxImage ResampleBicubic(int width, int height) const; - - // blur the image according to the specified pixel radius - wxImage Blur(int radius) const; - wxImage BlurHorizontal(int radius) const; - wxImage BlurVertical(int radius) const; - - wxImage ShrinkBy( int xFactor , int yFactor ) const ; - - // rescales the image in place - wxImage& Rescale( int width, int height, - wxImageResizeQuality quality = wxIMAGE_QUALITY_NORMAL ) - { return *this = Scale(width, height, quality); } - - // resizes the image in place - wxImage& Resize( const wxSize& size, const wxPoint& pos, - int r = -1, int g = -1, int b = -1 ) { return *this = Size(size, pos, r, g, b); } - - // Rotates the image about the given point, 'angle' radians. - // Returns the rotated image, leaving this image intact. - wxImage Rotate(double angle, const wxPoint & centre_of_rotation, - bool interpolating = true, wxPoint * offset_after_rotation = NULL) const; - - wxImage Rotate90( bool clockwise = true ) const; - wxImage Rotate180() const; - wxImage Mirror( bool horizontally = true ) const; - - // replace one colour with another - void Replace( unsigned char r1, unsigned char g1, unsigned char b1, - unsigned char r2, unsigned char g2, unsigned char b2 ); - - // Convert to greyscale image. Uses the luminance component (Y) of the image. - // The luma value (YUV) is calculated using (R * weight_r) + (G * weight_g) + (B * weight_b), defaults to ITU-T BT.601 - wxImage ConvertToGreyscale(double weight_r, double weight_g, double weight_b) const; - wxImage ConvertToGreyscale(void) const; - - // convert to monochrome image ( will be replaced by white, - // everything else by black) - wxImage ConvertToMono( unsigned char r, unsigned char g, unsigned char b ) const; - - // Convert to disabled (dimmed) image. - wxImage ConvertToDisabled(unsigned char brightness = 255) const; - - // these routines are slow but safe - void SetRGB( int x, int y, unsigned char r, unsigned char g, unsigned char b ); - void SetRGB( const wxRect& rect, unsigned char r, unsigned char g, unsigned char b ); - unsigned char GetRed( int x, int y ) const; - unsigned char GetGreen( int x, int y ) const; - unsigned char GetBlue( int x, int y ) const; - - void SetAlpha(int x, int y, unsigned char alpha); - unsigned char GetAlpha(int x, int y) const; - - // find first colour that is not used in the image and has higher - // RGB values than - bool FindFirstUnusedColour( unsigned char *r, unsigned char *g, unsigned char *b, - unsigned char startR = 1, unsigned char startG = 0, - unsigned char startB = 0 ) const; - // Set image's mask to the area of 'mask' that has colour - bool SetMaskFromImage(const wxImage & mask, - unsigned char mr, unsigned char mg, unsigned char mb); - - // converts image's alpha channel to mask (choosing mask colour - // automatically or using the specified colour for the mask), if it has - // any, does nothing otherwise: - bool ConvertAlphaToMask(unsigned char threshold = wxIMAGE_ALPHA_THRESHOLD); - bool ConvertAlphaToMask(unsigned char mr, unsigned char mg, unsigned char mb, - unsigned char threshold = wxIMAGE_ALPHA_THRESHOLD); - - - // This method converts an image where the original alpha - // information is only available as a shades of a colour - // (actually shades of grey) typically when you draw anti- - // aliased text into a bitmap. The DC drawinf routines - // draw grey values on the black background although they - // actually mean to draw white with differnt alpha values. - // This method reverses it, assuming a black (!) background - // and white text (actually only the red channel is read). - // The method will then fill up the whole image with the - // colour given. - bool ConvertColourToAlpha( unsigned char r, unsigned char g, unsigned char b ); - - // Methods for controlling LoadFile() behaviour. Currently they allow to - // specify whether the function should log warnings if there are any - // problems with the image file not completely preventing it from being - // loaded. By default the warnings are logged, but this can be disabled - // either globally or for a particular image object. - enum - { - Load_Verbose = 1 - }; - - static void SetDefaultLoadFlags(int flags); - static int GetDefaultLoadFlags(); - - void SetLoadFlags(int flags); - int GetLoadFlags() const; - - static bool CanRead( const wxString& name ); - static int GetImageCount( const wxString& name, wxBitmapType type = wxBITMAP_TYPE_ANY ); - virtual bool LoadFile( const wxString& name, wxBitmapType type = wxBITMAP_TYPE_ANY, int index = -1 ); - virtual bool LoadFile( const wxString& name, const wxString& mimetype, int index = -1 ); - -#if wxUSE_STREAMS - static bool CanRead( wxInputStream& stream ); - static int GetImageCount( wxInputStream& stream, wxBitmapType type = wxBITMAP_TYPE_ANY ); - virtual bool LoadFile( wxInputStream& stream, wxBitmapType type = wxBITMAP_TYPE_ANY, int index = -1 ); - virtual bool LoadFile( wxInputStream& stream, const wxString& mimetype, int index = -1 ); -#endif - - virtual bool SaveFile( const wxString& name ) const; - virtual bool SaveFile( const wxString& name, wxBitmapType type ) const; - virtual bool SaveFile( const wxString& name, const wxString& mimetype ) const; - -#if wxUSE_STREAMS - virtual bool SaveFile( wxOutputStream& stream, wxBitmapType type ) const; - virtual bool SaveFile( wxOutputStream& stream, const wxString& mimetype ) const; -#endif - - bool Ok() const { return IsOk(); } - bool IsOk() const; - int GetWidth() const; - int GetHeight() const; - - wxSize GetSize() const - { return wxSize(GetWidth(), GetHeight()); } - - // Gets the type of image found by LoadFile or specified with SaveFile - wxBitmapType GetType() const; - - // Set the image type, this is normally only called if the image is being - // created from data in the given format but not using LoadFile() (e.g. - // wxGIFDecoder uses this) - void SetType(wxBitmapType type); - - // these functions provide fastest access to wxImage data but should be - // used carefully as no checks are done - unsigned char *GetData() const; - void SetData( unsigned char *data, bool static_data=false ); - void SetData( unsigned char *data, int new_width, int new_height, bool static_data=false ); - - unsigned char *GetAlpha() const; // may return NULL! - bool HasAlpha() const { return GetAlpha() != NULL; } - void SetAlpha(unsigned char *alpha = NULL, bool static_data=false); - void InitAlpha(); - void ClearAlpha(); - - // return true if this pixel is masked or has alpha less than specified - // threshold - bool IsTransparent(int x, int y, - unsigned char threshold = wxIMAGE_ALPHA_THRESHOLD) const; - - // Mask functions - void SetMaskColour( unsigned char r, unsigned char g, unsigned char b ); - // Get the current mask colour or find a suitable colour - // returns true if using current mask colour - bool GetOrFindMaskColour( unsigned char *r, unsigned char *g, unsigned char *b ) const; - unsigned char GetMaskRed() const; - unsigned char GetMaskGreen() const; - unsigned char GetMaskBlue() const; - void SetMask( bool mask = true ); - bool HasMask() const; - -#if wxUSE_PALETTE - // Palette functions - bool HasPalette() const; - const wxPalette& GetPalette() const; - void SetPalette(const wxPalette& palette); -#endif // wxUSE_PALETTE - - // Option functions (arbitrary name/value mapping) - void SetOption(const wxString& name, const wxString& value); - void SetOption(const wxString& name, int value); - wxString GetOption(const wxString& name) const; - int GetOptionInt(const wxString& name) const; - bool HasOption(const wxString& name) const; - - unsigned long CountColours( unsigned long stopafter = (unsigned long) -1 ) const; - - // Computes the histogram of the image and fills a hash table, indexed - // with integer keys built as 0xRRGGBB, containing wxImageHistogramEntry - // objects. Each of them contains an 'index' (useful to build a palette - // with the image colours) and a 'value', which is the number of pixels - // in the image with that colour. - // Returned value: # of entries in the histogram - unsigned long ComputeHistogram( wxImageHistogram &h ) const; - - // Rotates the hue of each pixel of the image. angle is a double in the range - // -1.0..1.0 where -1.0 is -360 degrees and 1.0 is 360 degrees - void RotateHue(double angle); - - static wxList& GetHandlers() { return sm_handlers; } - static void AddHandler( wxImageHandler *handler ); - static void InsertHandler( wxImageHandler *handler ); - static bool RemoveHandler( const wxString& name ); - static wxImageHandler *FindHandler( const wxString& name ); - static wxImageHandler *FindHandler( const wxString& extension, wxBitmapType imageType ); - static wxImageHandler *FindHandler( wxBitmapType imageType ); - - static wxImageHandler *FindHandlerMime( const wxString& mimetype ); - - static wxString GetImageExtWildcard(); - - static void CleanUpHandlers(); - static void InitStandardHandlers(); - - static HSVValue RGBtoHSV(const RGBValue& rgb); - static RGBValue HSVtoRGB(const HSVValue& hsv); - -#if WXWIN_COMPATIBILITY_2_8 - wxDEPRECATED_CONSTRUCTOR( - wxImage(const wxString& name, long type, int index = -1) - { - LoadFile(name, (wxBitmapType)type, index); - } - ) - -#if wxUSE_STREAMS - wxDEPRECATED_CONSTRUCTOR( - wxImage(wxInputStream& stream, long type, int index = -1) - { - LoadFile(stream, (wxBitmapType)type, index); - } - ) - - wxDEPRECATED( - bool LoadFile(wxInputStream& stream, long type, int index = -1) - { - return LoadFile(stream, (wxBitmapType)type, index); - } - ) - - wxDEPRECATED( - bool SaveFile(wxOutputStream& stream, long type) const - { - return SaveFile(stream, (wxBitmapType)type); - } - ) -#endif // wxUSE_STREAMS - - wxDEPRECATED( - bool LoadFile(const wxString& name, long type, int index = -1) - { - return LoadFile(name, (wxBitmapType)type, index); - } - ) - - wxDEPRECATED( - bool SaveFile(const wxString& name, long type) const - { - return SaveFile(name, (wxBitmapType)type); - } - ) - - static wxDEPRECATED( - wxImageHandler *FindHandler(const wxString& ext, long type) - { - return FindHandler(ext, (wxBitmapType)type); - } - ) - - static wxDEPRECATED( - wxImageHandler *FindHandler(long imageType) - { - return FindHandler((wxBitmapType)imageType); - } - ) -#endif // WXWIN_COMPATIBILITY_2_8 - -protected: - static wxList sm_handlers; - - // return the index of the point with the given coordinates or -1 if the - // image is invalid of the coordinates are out of range - // - // note that index must be multiplied by 3 when using it with RGB array - long XYToIndex(int x, int y) const; - - virtual wxObjectRefData* CreateRefData() const wxOVERRIDE; - virtual wxObjectRefData* CloneRefData(const wxObjectRefData* data) const wxOVERRIDE; - -private: - friend class WXDLLIMPEXP_FWD_CORE wxImageHandler; - - // Possible values for MakeEmptyClone() flags. - enum - { - // Create an image with the same orientation as this one. This is the - // default and only exists for symmetry with SwapOrientation. - Clone_SameOrientation = 0, - - // Create an image with the same height as this image width and the - // same width as this image height. - Clone_SwapOrientation = 1 - }; - - // Returns a new blank image with the same dimensions (or with width and - // height swapped if Clone_SwapOrientation flag is given), alpha, and mask - // as this image itself. This is used by several functions creating - // modified versions of this image. - wxImage MakeEmptyClone(int flags = Clone_SameOrientation) const; - -#if wxUSE_STREAMS - // read the image from the specified stream updating image type if - // successful - bool DoLoad(wxImageHandler& handler, wxInputStream& stream, int index); - - // write the image to the specified stream and also update the image type - // if successful - bool DoSave(wxImageHandler& handler, wxOutputStream& stream) const; -#endif // wxUSE_STREAMS - - wxDECLARE_DYNAMIC_CLASS(wxImage); -}; - - -extern void WXDLLIMPEXP_CORE wxInitAllImageHandlers(); - -extern WXDLLIMPEXP_DATA_CORE(wxImage) wxNullImage; - -//----------------------------------------------------------------------------- -// wxImage handlers -//----------------------------------------------------------------------------- - -#include "wx/imagbmp.h" -#include "wx/imagpng.h" -#include "wx/imaggif.h" -#include "wx/imagpcx.h" -#include "wx/imagjpeg.h" -#include "wx/imagtga.h" -#include "wx/imagtiff.h" -#include "wx/imagpnm.h" -#include "wx/imagxpm.h" -#include "wx/imagiff.h" - -#endif // wxUSE_IMAGE - -#endif - // _WX_IMAGE_H_ diff --git a/Externals/wxWidgets3/include/wx/imaggif.h b/Externals/wxWidgets3/include/wx/imaggif.h deleted file mode 100644 index b59744c0cb..0000000000 --- a/Externals/wxWidgets3/include/wx/imaggif.h +++ /dev/null @@ -1,93 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/imaggif.h -// Purpose: wxImage GIF handler -// Author: Vaclav Slavik, Guillermo Rodriguez Garcia, Gershon Elber, Troels K -// Copyright: (c) 1999-2011 Vaclav Slavik, Guillermo Rodriguez Garcia, Gershon Elber, Troels K -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_IMAGGIF_H_ -#define _WX_IMAGGIF_H_ - -#include "wx/image.h" - - -//----------------------------------------------------------------------------- -// wxGIFHandler -//----------------------------------------------------------------------------- - -#if wxUSE_GIF - -#define wxIMAGE_OPTION_GIF_COMMENT wxT("GifComment") - -struct wxRGB; -struct GifHashTableType; -class WXDLLIMPEXP_FWD_CORE wxImageArray; // anidecod.h - -class WXDLLIMPEXP_CORE wxGIFHandler : public wxImageHandler -{ -public: - inline wxGIFHandler() - { - m_name = wxT("GIF file"); - m_extension = wxT("gif"); - m_type = wxBITMAP_TYPE_GIF; - m_mime = wxT("image/gif"); - m_hashTable = NULL; - } - -#if wxUSE_STREAMS - virtual bool LoadFile(wxImage *image, wxInputStream& stream, - bool verbose = true, int index = -1) wxOVERRIDE; - virtual bool SaveFile(wxImage *image, wxOutputStream& stream, - bool verbose=true) wxOVERRIDE; - - // Save animated gif - bool SaveAnimation(const wxImageArray& images, wxOutputStream *stream, - bool verbose = true, int delayMilliSecs = 1000); - -protected: - virtual int DoGetImageCount(wxInputStream& stream) wxOVERRIDE; - virtual bool DoCanRead(wxInputStream& stream) wxOVERRIDE; - - bool DoSaveFile(const wxImage&, wxOutputStream *, bool verbose, - bool first, int delayMilliSecs, bool loop, - const wxRGB *pal, int palCount, - int mask_index); -#endif // wxUSE_STREAMS -protected: - - // Declarations for saving - - unsigned long m_crntShiftDWord; /* For bytes decomposition into codes. */ - int m_pixelCount; - struct GifHashTableType *m_hashTable; - wxInt16 - m_EOFCode, /* The EOF LZ code. */ - m_clearCode, /* The CLEAR LZ code. */ - m_runningCode, /* The next code algorithm can generate. */ - m_runningBits, /* The number of bits required to represent RunningCode. */ - m_maxCode1, /* 1 bigger than max. possible code, in RunningBits bits. */ - m_crntCode, /* Current algorithm code. */ - m_crntShiftState; /* Number of bits in CrntShiftDWord. */ - wxUint8 m_LZBuf[256]; /* Compressed input is buffered here. */ - - bool InitHashTable(); - void ClearHashTable(); - void InsertHashTable(unsigned long key, int code); - int ExistsHashTable(unsigned long key); - -#if wxUSE_STREAMS - bool CompressOutput(wxOutputStream *, int code); - bool SetupCompress(wxOutputStream *, int bpp); - bool CompressLine(wxOutputStream *, const wxUint8 *line, int lineLen); -#endif - -private: - wxDECLARE_DYNAMIC_CLASS(wxGIFHandler); -}; - -#endif // wxUSE_GIF - -#endif // _WX_IMAGGIF_H_ - diff --git a/Externals/wxWidgets3/include/wx/imagiff.h b/Externals/wxWidgets3/include/wx/imagiff.h deleted file mode 100644 index 78c6561088..0000000000 --- a/Externals/wxWidgets3/include/wx/imagiff.h +++ /dev/null @@ -1,43 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/imagiff.h -// Purpose: wxImage handler for Amiga IFF images -// Author: Steffen Gutmann -// Copyright: (c) Steffen Gutmann, 2002 -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_IMAGE_IFF_H_ -#define _WX_IMAGE_IFF_H_ - -#include "wx/image.h" - -//----------------------------------------------------------------------------- -// wxIFFHandler -//----------------------------------------------------------------------------- - -#if wxUSE_IMAGE && wxUSE_IFF - -class WXDLLIMPEXP_CORE wxIFFHandler : public wxImageHandler -{ -public: - wxIFFHandler() - { - m_name = wxT("IFF file"); - m_extension = wxT("iff"); - m_type = wxBITMAP_TYPE_IFF; - m_mime = wxT("image/x-iff"); - } - -#if wxUSE_STREAMS - virtual bool LoadFile(wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1) wxOVERRIDE; - virtual bool SaveFile(wxImage *image, wxOutputStream& stream, bool verbose=true) wxOVERRIDE; -protected: - virtual bool DoCanRead(wxInputStream& stream) wxOVERRIDE; -#endif - - wxDECLARE_DYNAMIC_CLASS(wxIFFHandler); -}; - -#endif // wxUSE_IMAGE && wxUSE_IFF - -#endif // _WX_IMAGE_IFF_H_ diff --git a/Externals/wxWidgets3/include/wx/imagjpeg.h b/Externals/wxWidgets3/include/wx/imagjpeg.h deleted file mode 100644 index 342aa7e99c..0000000000 --- a/Externals/wxWidgets3/include/wx/imagjpeg.h +++ /dev/null @@ -1,52 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/imagjpeg.h -// Purpose: wxImage JPEG handler -// Author: Vaclav Slavik -// Copyright: (c) Vaclav Slavik -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_IMAGJPEG_H_ -#define _WX_IMAGJPEG_H_ - -#include "wx/defs.h" - -//----------------------------------------------------------------------------- -// wxJPEGHandler -//----------------------------------------------------------------------------- - -#if wxUSE_LIBJPEG - -#include "wx/image.h" -#include "wx/versioninfo.h" - -class WXDLLIMPEXP_CORE wxJPEGHandler: public wxImageHandler -{ -public: - inline wxJPEGHandler() - { - m_name = wxT("JPEG file"); - m_extension = wxT("jpg"); - m_altExtensions.Add(wxT("jpeg")); - m_altExtensions.Add(wxT("jpe")); - m_type = wxBITMAP_TYPE_JPEG; - m_mime = wxT("image/jpeg"); - } - - static wxVersionInfo GetLibraryVersionInfo(); - -#if wxUSE_STREAMS - virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 ) wxOVERRIDE; - virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true ) wxOVERRIDE; -protected: - virtual bool DoCanRead( wxInputStream& stream ) wxOVERRIDE; -#endif - -private: - wxDECLARE_DYNAMIC_CLASS(wxJPEGHandler); -}; - -#endif // wxUSE_LIBJPEG - -#endif // _WX_IMAGJPEG_H_ - diff --git a/Externals/wxWidgets3/include/wx/imaglist.h b/Externals/wxWidgets3/include/wx/imaglist.h deleted file mode 100644 index 72255ac710..0000000000 --- a/Externals/wxWidgets3/include/wx/imaglist.h +++ /dev/null @@ -1,56 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/imaglist.h -// Purpose: wxImageList base header -// Author: Julian Smart -// Modified by: -// Created: -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_IMAGLIST_H_BASE_ -#define _WX_IMAGLIST_H_BASE_ - -#include "wx/defs.h" - -/* - * wxImageList is used for wxListCtrl, wxTreeCtrl. These controls refer to - * images for their items by an index into an image list. - * A wxImageList is capable of creating images with optional masks from - * a variety of sources - a single bitmap plus a colour to indicate the mask, - * two bitmaps, or an icon. - * - * Image lists can also create and draw images used for drag and drop functionality. - * This is not yet implemented in wxImageList. We need to discuss a generic API - * for doing drag and drop and see whether it ties in with the Win95 view of it. - * See below for candidate functions and an explanation of how they might be - * used. - */ - -// Flag values for Set/GetImageList -enum -{ - wxIMAGE_LIST_NORMAL, // Normal icons - wxIMAGE_LIST_SMALL, // Small icons - wxIMAGE_LIST_STATE // State icons: unimplemented (see WIN32 documentation) -}; - -// Flags for Draw -#define wxIMAGELIST_DRAW_NORMAL 0x0001 -#define wxIMAGELIST_DRAW_TRANSPARENT 0x0002 -#define wxIMAGELIST_DRAW_SELECTED 0x0004 -#define wxIMAGELIST_DRAW_FOCUSED 0x0008 - -#if defined(__WXMSW__) || defined(__WXMAC__) - #define wxHAS_NATIVE_IMAGELIST -#endif - -#if !defined(wxHAS_NATIVE_IMAGELIST) - #include "wx/generic/imaglist.h" -#elif defined(__WXMSW__) - #include "wx/msw/imaglist.h" -#elif defined(__WXMAC__) - #include "wx/osx/imaglist.h" -#endif - -#endif // _WX_IMAGLIST_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/imagpcx.h b/Externals/wxWidgets3/include/wx/imagpcx.h deleted file mode 100644 index 210bbb3233..0000000000 --- a/Externals/wxWidgets3/include/wx/imagpcx.h +++ /dev/null @@ -1,46 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/imagpcx.h -// Purpose: wxImage PCX handler -// Author: Guillermo Rodriguez Garcia -// Copyright: (c) 1999 Guillermo Rodriguez Garcia -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_IMAGPCX_H_ -#define _WX_IMAGPCX_H_ - -#include "wx/image.h" - - -//----------------------------------------------------------------------------- -// wxPCXHandler -//----------------------------------------------------------------------------- - -#if wxUSE_PCX -class WXDLLIMPEXP_CORE wxPCXHandler : public wxImageHandler -{ -public: - inline wxPCXHandler() - { - m_name = wxT("PCX file"); - m_extension = wxT("pcx"); - m_type = wxBITMAP_TYPE_PCX; - m_mime = wxT("image/pcx"); - } - -#if wxUSE_STREAMS - virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 ) wxOVERRIDE; - virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true ) wxOVERRIDE; -protected: - virtual bool DoCanRead( wxInputStream& stream ) wxOVERRIDE; -#endif // wxUSE_STREAMS - -private: - wxDECLARE_DYNAMIC_CLASS(wxPCXHandler); -}; -#endif // wxUSE_PCX - - -#endif - // _WX_IMAGPCX_H_ - diff --git a/Externals/wxWidgets3/include/wx/imagpng.h b/Externals/wxWidgets3/include/wx/imagpng.h deleted file mode 100644 index e30cf73845..0000000000 --- a/Externals/wxWidgets3/include/wx/imagpng.h +++ /dev/null @@ -1,68 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/imagpng.h -// Purpose: wxImage PNG handler -// Author: Robert Roebling -// Copyright: (c) Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_IMAGPNG_H_ -#define _WX_IMAGPNG_H_ - -#include "wx/defs.h" - -//----------------------------------------------------------------------------- -// wxPNGHandler -//----------------------------------------------------------------------------- - -#if wxUSE_LIBPNG - -#include "wx/image.h" -#include "wx/versioninfo.h" - -#define wxIMAGE_OPTION_PNG_FORMAT wxT("PngFormat") -#define wxIMAGE_OPTION_PNG_BITDEPTH wxT("PngBitDepth") -#define wxIMAGE_OPTION_PNG_FILTER wxT("PngF") -#define wxIMAGE_OPTION_PNG_COMPRESSION_LEVEL wxT("PngZL") -#define wxIMAGE_OPTION_PNG_COMPRESSION_MEM_LEVEL wxT("PngZM") -#define wxIMAGE_OPTION_PNG_COMPRESSION_STRATEGY wxT("PngZS") -#define wxIMAGE_OPTION_PNG_COMPRESSION_BUFFER_SIZE wxT("PngZB") - -enum -{ - wxPNG_TYPE_COLOUR = 0, - wxPNG_TYPE_GREY = 2, - wxPNG_TYPE_GREY_RED = 3, - wxPNG_TYPE_PALETTE = 4 -}; - -class WXDLLIMPEXP_CORE wxPNGHandler: public wxImageHandler -{ -public: - inline wxPNGHandler() - { - m_name = wxT("PNG file"); - m_extension = wxT("png"); - m_type = wxBITMAP_TYPE_PNG; - m_mime = wxT("image/png"); - } - - static wxVersionInfo GetLibraryVersionInfo(); - -#if wxUSE_STREAMS - virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 ) wxOVERRIDE; - virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true ) wxOVERRIDE; -protected: - virtual bool DoCanRead( wxInputStream& stream ) wxOVERRIDE; -#endif - -private: - wxDECLARE_DYNAMIC_CLASS(wxPNGHandler); -}; - -#endif - // wxUSE_LIBPNG - -#endif - // _WX_IMAGPNG_H_ - diff --git a/Externals/wxWidgets3/include/wx/imagpnm.h b/Externals/wxWidgets3/include/wx/imagpnm.h deleted file mode 100644 index 0f3f460ad8..0000000000 --- a/Externals/wxWidgets3/include/wx/imagpnm.h +++ /dev/null @@ -1,48 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/imagpnm.h -// Purpose: wxImage PNM handler -// Author: Sylvain Bougnoux -// Copyright: (c) Sylvain Bougnoux -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_IMAGPNM_H_ -#define _WX_IMAGPNM_H_ - -#include "wx/image.h" - -//----------------------------------------------------------------------------- -// wxPNMHandler -//----------------------------------------------------------------------------- - -#if wxUSE_PNM -class WXDLLIMPEXP_CORE wxPNMHandler : public wxImageHandler -{ -public: - inline wxPNMHandler() - { - m_name = wxT("PNM file"); - m_extension = wxT("pnm"); - m_altExtensions.Add(wxT("ppm")); - m_altExtensions.Add(wxT("pgm")); - m_altExtensions.Add(wxT("pbm")); - m_type = wxBITMAP_TYPE_PNM; - m_mime = wxT("image/pnm"); - } - -#if wxUSE_STREAMS - virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 ) wxOVERRIDE; - virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true ) wxOVERRIDE; -protected: - virtual bool DoCanRead( wxInputStream& stream ) wxOVERRIDE; -#endif - -private: - wxDECLARE_DYNAMIC_CLASS(wxPNMHandler); -}; -#endif - - -#endif - // _WX_IMAGPNM_H_ - diff --git a/Externals/wxWidgets3/include/wx/imagtga.h b/Externals/wxWidgets3/include/wx/imagtga.h deleted file mode 100644 index 0c2c7d0a0d..0000000000 --- a/Externals/wxWidgets3/include/wx/imagtga.h +++ /dev/null @@ -1,46 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/imagtga.h -// Purpose: wxImage TGA handler -// Author: Seth Jackson -// Copyright: (c) 2005 Seth Jackson -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_IMAGTGA_H_ -#define _WX_IMAGTGA_H_ - -#include "wx/image.h" - -//----------------------------------------------------------------------------- -// wxTGAHandler -//----------------------------------------------------------------------------- - -#if wxUSE_TGA - -class WXDLLIMPEXP_CORE wxTGAHandler : public wxImageHandler -{ -public: - wxTGAHandler() - { - m_name = wxT("TGA file"); - m_extension = wxT("tga"); - m_altExtensions.Add(wxT("tpic")); - m_type = wxBITMAP_TYPE_TGA; - m_mime = wxT("image/tga"); - } - -#if wxUSE_STREAMS - virtual bool LoadFile(wxImage* image, wxInputStream& stream, - bool verbose = true, int index = -1) wxOVERRIDE; - virtual bool SaveFile(wxImage* image, wxOutputStream& stream, - bool verbose = true) wxOVERRIDE; -protected: - virtual bool DoCanRead(wxInputStream& stream) wxOVERRIDE; -#endif // wxUSE_STREAMS - - wxDECLARE_DYNAMIC_CLASS(wxTGAHandler); -}; - -#endif // wxUSE_TGA - -#endif // _WX_IMAGTGA_H_ diff --git a/Externals/wxWidgets3/include/wx/imagtiff.h b/Externals/wxWidgets3/include/wx/imagtiff.h deleted file mode 100644 index 0c7be8884a..0000000000 --- a/Externals/wxWidgets3/include/wx/imagtiff.h +++ /dev/null @@ -1,59 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/imagtiff.h -// Purpose: wxImage TIFF handler -// Author: Robert Roebling -// Copyright: (c) Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_IMAGTIFF_H_ -#define _WX_IMAGTIFF_H_ - -#include "wx/defs.h" - -//----------------------------------------------------------------------------- -// wxTIFFHandler -//----------------------------------------------------------------------------- - -#if wxUSE_LIBTIFF - -#include "wx/image.h" -#include "wx/versioninfo.h" - -// defines for wxImage::SetOption -#define wxIMAGE_OPTION_TIFF_BITSPERSAMPLE wxString(wxT("BitsPerSample")) -#define wxIMAGE_OPTION_TIFF_SAMPLESPERPIXEL wxString(wxT("SamplesPerPixel")) -#define wxIMAGE_OPTION_TIFF_COMPRESSION wxString(wxT("Compression")) -#define wxIMAGE_OPTION_TIFF_PHOTOMETRIC wxString(wxT("Photometric")) -#define wxIMAGE_OPTION_TIFF_IMAGEDESCRIPTOR wxString(wxT("ImageDescriptor")) - -// for backwards compatibility -#define wxIMAGE_OPTION_BITSPERSAMPLE wxIMAGE_OPTION_TIFF_BITSPERSAMPLE -#define wxIMAGE_OPTION_SAMPLESPERPIXEL wxIMAGE_OPTION_TIFF_SAMPLESPERPIXEL -#define wxIMAGE_OPTION_COMPRESSION wxIMAGE_OPTION_TIFF_COMPRESSION -#define wxIMAGE_OPTION_IMAGEDESCRIPTOR wxIMAGE_OPTION_TIFF_IMAGEDESCRIPTOR - -class WXDLLIMPEXP_CORE wxTIFFHandler: public wxImageHandler -{ -public: - wxTIFFHandler(); - - static wxVersionInfo GetLibraryVersionInfo(); - -#if wxUSE_STREAMS - virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 ) wxOVERRIDE; - virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true ) wxOVERRIDE; - -protected: - virtual int DoGetImageCount( wxInputStream& stream ) wxOVERRIDE; - virtual bool DoCanRead( wxInputStream& stream ) wxOVERRIDE; -#endif - -private: - wxDECLARE_DYNAMIC_CLASS(wxTIFFHandler); -}; - -#endif // wxUSE_LIBTIFF - -#endif // _WX_IMAGTIFF_H_ - diff --git a/Externals/wxWidgets3/include/wx/imagxpm.h b/Externals/wxWidgets3/include/wx/imagxpm.h deleted file mode 100644 index 1af34875e4..0000000000 --- a/Externals/wxWidgets3/include/wx/imagxpm.h +++ /dev/null @@ -1,44 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/imagxpm.h -// Purpose: wxImage XPM handler -// Author: Vaclav Slavik -// Copyright: (c) 2001 Vaclav Slavik -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_IMAGXPM_H_ -#define _WX_IMAGXPM_H_ - -#include "wx/image.h" - -#if wxUSE_XPM - -//----------------------------------------------------------------------------- -// wxXPMHandler -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxXPMHandler : public wxImageHandler -{ -public: - inline wxXPMHandler() - { - m_name = wxT("XPM file"); - m_extension = wxT("xpm"); - m_type = wxBITMAP_TYPE_XPM; - m_mime = wxT("image/xpm"); - } - -#if wxUSE_STREAMS - virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 ) wxOVERRIDE; - virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true ) wxOVERRIDE; -protected: - virtual bool DoCanRead( wxInputStream& stream ) wxOVERRIDE; -#endif - -private: - wxDECLARE_DYNAMIC_CLASS(wxXPMHandler); -}; - -#endif // wxUSE_XPM - -#endif // _WX_IMAGXPM_H_ diff --git a/Externals/wxWidgets3/include/wx/infobar.h b/Externals/wxWidgets3/include/wx/infobar.h deleted file mode 100644 index ebda4f695a..0000000000 --- a/Externals/wxWidgets3/include/wx/infobar.h +++ /dev/null @@ -1,72 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/infobar.h -// Purpose: declaration of wxInfoBarBase defining common API of wxInfoBar -// Author: Vadim Zeitlin -// Created: 2009-07-28 -// Copyright: (c) 2009 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_INFOBAR_H_ -#define _WX_INFOBAR_H_ - -#include "wx/defs.h" - -#if wxUSE_INFOBAR - -#include "wx/control.h" - -// ---------------------------------------------------------------------------- -// wxInfoBar shows non-critical but important information to the user -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxInfoBarBase : public wxControl -{ -public: - // real ctors are provided by the derived classes, just notice that unlike - // most of the other windows, info bar is created hidden and must be - // explicitly shown when it is needed (this is done because it is supposed - // to be shown only intermittently and hiding it after creating it from the - // user code would result in flicker) - wxInfoBarBase() { } - - - // show the info bar with the given message and optionally an icon - virtual void ShowMessage(const wxString& msg, - int flags = wxICON_INFORMATION) = 0; - - // hide the info bar - virtual void Dismiss() = 0; - - // add an extra button to the bar, near the message (replacing the default - // close button which is only shown if no extra buttons are used) - virtual void AddButton(wxWindowID btnid, - const wxString& label = wxString()) = 0; - - // remove a button previously added by AddButton() - virtual void RemoveButton(wxWindowID btnid) = 0; - - // get information about the currently shown buttons - virtual size_t GetButtonCount() const = 0; - virtual wxWindowID GetButtonId(size_t idx) const = 0; - virtual bool HasButtonId(wxWindowID btnid) const = 0; - -private: - wxDECLARE_NO_COPY_CLASS(wxInfoBarBase); -}; - -// currently only GTK+ has a native implementation -#if defined(__WXGTK218__) && !defined(__WXUNIVERSAL__) - #include "wx/gtk/infobar.h" - #define wxHAS_NATIVE_INFOBAR -#endif // wxGTK2 - -// if the generic version is the only one we have, use it -#ifndef wxHAS_NATIVE_INFOBAR - #include "wx/generic/infobar.h" - #define wxInfoBar wxInfoBarGeneric -#endif - -#endif // wxUSE_INFOBAR - -#endif // _WX_INFOBAR_H_ diff --git a/Externals/wxWidgets3/include/wx/init.h b/Externals/wxWidgets3/include/wx/init.h deleted file mode 100644 index 0810cceb49..0000000000 --- a/Externals/wxWidgets3/include/wx/init.h +++ /dev/null @@ -1,116 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/init.h -// Purpose: wxWidgets initialization and finalization functions -// Author: Vadim Zeitlin -// Modified by: -// Created: 29.06.2003 -// Copyright: (c) 2003 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_INIT_H_ -#define _WX_INIT_H_ - -#include "wx/defs.h" -#include "wx/chartype.h" - -// ---------------------------------------------------------------------------- -// wxEntry helper functions which allow to have more fine grained control -// ---------------------------------------------------------------------------- - -// do common initialization, return true if ok (in this case wxEntryCleanup -// must be called later), otherwise the program can't use wxWidgets at all -// -// this function also creates wxTheApp as a side effect, if wxIMPLEMENT_APP -// hadn't been used a dummy default application object is created -// -// note that the parameters may be modified, this is why we pass them by -// reference! -extern bool WXDLLIMPEXP_BASE wxEntryStart(int& argc, wxChar **argv); - -// free the resources allocated by the library in wxEntryStart() and shut it -// down (wxEntryStart() may be called again afterwards if necessary) -extern void WXDLLIMPEXP_BASE wxEntryCleanup(); - - -// ---------------------------------------------------------------------------- -// wxEntry: this function initializes the library, runs the main event loop -// and cleans it up -// ---------------------------------------------------------------------------- - -// note that other, platform-specific, overloads of wxEntry may exist as well -// but this one always exists under all platforms -// -// returns the program exit code -extern int WXDLLIMPEXP_BASE wxEntry(int& argc, wxChar **argv); - -// we overload wxEntry[Start]() to take "char **" pointers too -#if wxUSE_UNICODE - -extern bool WXDLLIMPEXP_BASE wxEntryStart(int& argc, char **argv); -extern int WXDLLIMPEXP_BASE wxEntry(int& argc, char **argv); - -#endif// wxUSE_UNICODE - -// Under Windows we define additional wxEntry() overloads with signature -// compatible with WinMain() and not the traditional main(). -#if wxUSE_GUI && defined(__WINDOWS__) - #include "wx/msw/init.h" -#endif - -// ---------------------------------------------------------------------------- -// Using the library without (explicit) application object: you may avoid using -// wxDECLARE_APP and wxIMPLEMENT_APP macros and call the functions below instead at -// the program startup and termination -// ---------------------------------------------------------------------------- - -// initialize the library (may be called as many times as needed, but each -// call to wxInitialize() must be matched by wxUninitialize()) -extern bool WXDLLIMPEXP_BASE wxInitialize(); -extern bool WXDLLIMPEXP_BASE wxInitialize(int& argc, wxChar **argv); -#if wxUSE_UNICODE -extern bool WXDLLIMPEXP_BASE wxInitialize(int& argc, char **argv); -#endif - -// clean up -- the library can't be used any more after the last call to -// wxUninitialize() -extern void WXDLLIMPEXP_BASE wxUninitialize(); - -// create an object of this class on stack to initialize/cleanup the library -// automatically -class WXDLLIMPEXP_BASE wxInitializer -{ -public: - // initialize the library - wxInitializer() - { - m_ok = wxInitialize(); - } - - wxInitializer(int& argc, wxChar **argv) - { - m_ok = wxInitialize(argc, argv); - } - -#if wxUSE_UNICODE - wxInitializer(int& argc, char **argv) - { - m_ok = wxInitialize(argc, argv); - } -#endif // wxUSE_UNICODE - - // has the initialization been successful? (explicit test) - bool IsOk() const { return m_ok; } - - // has the initialization been successful? (implicit test) - operator bool() const { return m_ok; } - - // dtor only does clean up if we initialized the library properly - ~wxInitializer() { if ( m_ok ) wxUninitialize(); } - -private: - bool m_ok; -}; - -#endif // _WX_INIT_H_ - diff --git a/Externals/wxWidgets3/include/wx/intl.h b/Externals/wxWidgets3/include/wx/intl.h deleted file mode 100644 index c2020ddbfc..0000000000 --- a/Externals/wxWidgets3/include/wx/intl.h +++ /dev/null @@ -1,371 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/intl.h -// Purpose: Internationalization and localisation for wxWidgets -// Author: Vadim Zeitlin -// Modified by: Michael N. Filippov -// (2003/09/30 - plural forms support) -// Created: 29/01/98 -// Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_INTL_H_ -#define _WX_INTL_H_ - -#include "wx/defs.h" -#include "wx/string.h" -#include "wx/translation.h" - -// Make wxLayoutDirection enum available without need for wxUSE_INTL so wxWindow, wxApp -// and other classes are not distrubed by wxUSE_INTL - -enum wxLayoutDirection -{ - wxLayout_Default, - wxLayout_LeftToRight, - wxLayout_RightToLeft -}; - -#if wxUSE_INTL - -#include "wx/fontenc.h" -#include "wx/language.h" - -// ============================================================================ -// global decls -// ============================================================================ - -// ---------------------------------------------------------------------------- -// macros -// ---------------------------------------------------------------------------- - -// ---------------------------------------------------------------------------- -// forward decls -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_BASE wxLocale; -class WXDLLIMPEXP_FWD_BASE wxLanguageInfoArray; - -// ============================================================================ -// locale support -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxLanguageInfo: encapsulates wxLanguage to OS native lang.desc. -// translation information -// ---------------------------------------------------------------------------- - -struct WXDLLIMPEXP_BASE wxLanguageInfo -{ - int Language; // wxLanguage id - wxString CanonicalName; // Canonical name, e.g. fr_FR -#ifdef __WINDOWS__ - wxUint32 WinLang, // Win32 language identifiers - WinSublang; -#endif // __WINDOWS__ - wxString Description; // human-readable name of the language - wxLayoutDirection LayoutDirection; - -#ifdef __WINDOWS__ - // return the LCID corresponding to this language - wxUint32 GetLCID() const; -#endif // __WINDOWS__ - - // return the locale name corresponding to this language usable with - // setlocale() on the current system - wxString GetLocaleName() const; -}; - -// for Unix systems GetLocaleName() is trivial so implement it inline here, for -// MSW it's implemented in intl.cpp -#ifndef __WINDOWS__ -inline wxString wxLanguageInfo::GetLocaleName() const { return CanonicalName; } -#endif // !__WINDOWS__ - - -// ---------------------------------------------------------------------------- -// wxLocaleCategory: the category of locale settings -// ---------------------------------------------------------------------------- - -enum wxLocaleCategory -{ - // (any) numbers - wxLOCALE_CAT_NUMBER, - - // date/time - wxLOCALE_CAT_DATE, - - // monetary value - wxLOCALE_CAT_MONEY, - - // default category for wxLocaleInfo values which only apply to a single - // category (e.g. wxLOCALE_SHORT_DATE_FMT) - wxLOCALE_CAT_DEFAULT, - - wxLOCALE_CAT_MAX -}; - -// ---------------------------------------------------------------------------- -// wxLocaleInfo: the items understood by wxLocale::GetInfo() -// ---------------------------------------------------------------------------- - -enum wxLocaleInfo -{ - // the thousands separator (for wxLOCALE_CAT_NUMBER or MONEY) - wxLOCALE_THOUSANDS_SEP, - - // the character used as decimal point (for wxLOCALE_CAT_NUMBER or MONEY) - wxLOCALE_DECIMAL_POINT, - - // the stftime()-formats used for short/long date and time representations - // (under some platforms short and long date formats are the same) - // - // NB: these elements should appear in this order, code in GetInfo() relies - // on it - wxLOCALE_SHORT_DATE_FMT, - wxLOCALE_LONG_DATE_FMT, - wxLOCALE_DATE_TIME_FMT, - wxLOCALE_TIME_FMT - -}; - -// ---------------------------------------------------------------------------- -// wxLocale: encapsulates all language dependent settings, including current -// message catalogs, date, time and currency formats (TODO) &c -// ---------------------------------------------------------------------------- - -enum wxLocaleInitFlags -{ - wxLOCALE_DONT_LOAD_DEFAULT = 0x0000, // don't load wxwin.mo - wxLOCALE_LOAD_DEFAULT = 0x0001 // load wxwin.mo? -#if WXWIN_COMPATIBILITY_2_8 - ,wxLOCALE_CONV_ENCODING = 0x0002 // no longer used, simply remove - // it from the existing code -#endif -}; - -class WXDLLIMPEXP_BASE wxLocale -{ -public: - // ctor & dtor - // ----------- - - // call Init() if you use this ctor - wxLocale() { DoCommonInit(); } - - // the ctor has a side effect of changing current locale - wxLocale(const wxString& name, // name (for messages) - const wxString& shortName = wxEmptyString, // dir prefix (for msg files) - const wxString& locale = wxEmptyString, // locale (for setlocale) - bool bLoadDefault = true // preload wxstd.mo? -#if WXWIN_COMPATIBILITY_2_8 - ,bool bConvertEncoding = true // convert Win<->Unix if necessary? -#endif - ) - { - DoCommonInit(); - -#if WXWIN_COMPATIBILITY_2_8 - Init(name, shortName, locale, bLoadDefault, bConvertEncoding); -#else - Init(name, shortName, locale, bLoadDefault); -#endif - } - - wxLocale(int language, // wxLanguage id or custom language - int flags = wxLOCALE_LOAD_DEFAULT) - { - DoCommonInit(); - - Init(language, flags); - } - - // the same as a function (returns true on success) - bool Init(const wxString& name, - const wxString& shortName = wxEmptyString, - const wxString& locale = wxEmptyString, - bool bLoadDefault = true -#if WXWIN_COMPATIBILITY_2_8 - ,bool bConvertEncoding = true -#endif - ); - - // same as second ctor (returns true on success) - bool Init(int language = wxLANGUAGE_DEFAULT, - int flags = wxLOCALE_LOAD_DEFAULT); - - // restores old locale - virtual ~wxLocale(); - - // Try to get user's (or OS's) preferred language setting. - // Return wxLANGUAGE_UNKNOWN if language-guessing algorithm failed - static int GetSystemLanguage(); - - // get the encoding used by default for text on this system, returns - // wxFONTENCODING_SYSTEM if it couldn't be determined - static wxFontEncoding GetSystemEncoding(); - - // get the string describing the system encoding, return empty string if - // couldn't be determined - static wxString GetSystemEncodingName(); - - // get the values of the given locale-dependent datum: the current locale - // is used, the US default value is returned if everything else fails - static wxString GetInfo(wxLocaleInfo index, - wxLocaleCategory cat = wxLOCALE_CAT_DEFAULT); - - // Same as GetInfo() but uses current locale at the OS level to retrieve - // the information. Normally it should be the same as the one used by - // GetInfo() but there are two exceptions: the most important one is that - // if no locale had been set, GetInfo() would fall back to "C" locale, - // while this one uses the default OS locale. Another, more rare, one is - // that some locales might not supported by the OS. - // - // Currently this is the same as GetInfo() under non-MSW platforms. - static wxString GetOSInfo(wxLocaleInfo index, - wxLocaleCategory cat = wxLOCALE_CAT_DEFAULT); - - // return true if the locale was set successfully - bool IsOk() const { return m_pszOldLocale != NULL; } - - // returns locale name - const wxString& GetLocale() const { return m_strLocale; } - - // return current locale wxLanguage value - int GetLanguage() const { return m_language; } - - // return locale name to be passed to setlocale() - wxString GetSysName() const; - - // return 'canonical' name, i.e. in the form of xx[_YY], where xx is - // language code according to ISO 639 and YY is country name - // as specified by ISO 3166. - wxString GetCanonicalName() const { return m_strShort; } - - // add a prefix to the catalog lookup path: the message catalog files will be - // looked up under prefix//LC_MESSAGES, prefix/LC_MESSAGES and prefix - // (in this order). - // - // This only applies to subsequent invocations of AddCatalog()! - static void AddCatalogLookupPathPrefix(const wxString& prefix) - { wxFileTranslationsLoader::AddCatalogLookupPathPrefix(prefix); } - - // add a catalog: it's searched for in standard places (current directory - // first, system one after), but the you may prepend additional directories to - // the search path with AddCatalogLookupPathPrefix(). - // - // The loaded catalog will be used for message lookup by GetString(). - // - // Returns 'true' if it was successfully loaded - bool AddCatalog(const wxString& domain); - bool AddCatalog(const wxString& domain, wxLanguage msgIdLanguage); - bool AddCatalog(const wxString& domain, - wxLanguage msgIdLanguage, const wxString& msgIdCharset); - - // check if the given locale is provided by OS and C run time - static bool IsAvailable(int lang); - - // check if the given catalog is loaded - bool IsLoaded(const wxString& domain) const; - - // Retrieve the language info struct for the given language - // - // Returns NULL if no info found, pointer must *not* be deleted by caller - static const wxLanguageInfo *GetLanguageInfo(int lang); - - // Returns language name in English or empty string if the language - // is not in database - static wxString GetLanguageName(int lang); - - // Returns ISO code ("canonical name") of language or empty string if the - // language is not in database - static wxString GetLanguageCanonicalName(int lang); - - // Find the language for the given locale string which may be either a - // canonical ISO 2 letter language code ("xx"), a language code followed by - // the country code ("xx_XX") or a Windows full language name ("Xxxxx...") - // - // Returns NULL if no info found, pointer must *not* be deleted by caller - static const wxLanguageInfo *FindLanguageInfo(const wxString& locale); - - // Add custom language to the list of known languages. - // Notes: 1) wxLanguageInfo contains platform-specific data - // 2) must be called before Init to have effect - static void AddLanguage(const wxLanguageInfo& info); - - // retrieve the translation for a string in all loaded domains unless - // the szDomain parameter is specified (and then only this domain is - // searched) - // n - additional parameter for PluralFormsParser - // - // return original string if translation is not available - // (in this case an error message is generated the first time - // a string is not found; use wxLogNull to suppress it) - // - // domains are searched in the last to first order, i.e. catalogs - // added later override those added before. - const wxString& GetString(const wxString& origString, - const wxString& domain = wxEmptyString) const - { - return wxGetTranslation(origString, domain); - } - // plural form version of the same: - const wxString& GetString(const wxString& origString, - const wxString& origString2, - unsigned n, - const wxString& domain = wxEmptyString) const - { - return wxGetTranslation(origString, origString2, n, domain); - } - - // Returns the current short name for the locale - const wxString& GetName() const { return m_strShort; } - - // return the contents of .po file header - wxString GetHeaderValue(const wxString& header, - const wxString& domain = wxEmptyString) const; - - // These two methods are for internal use only. First one creates - // ms_languagesDB if it doesn't already exist, second one destroys - // it. - static void CreateLanguagesDB(); - static void DestroyLanguagesDB(); - -private: - bool DoInit(const wxString& name, - const wxString& shortName, - const wxString& locale); - - // copy default table of languages from global static array to - // m_langugagesInfo, called by InitLanguagesDB - static void InitLanguagesDB(); - - // initialize the member fields to default values - void DoCommonInit(); - - wxString m_strLocale, // this locale name - m_strShort; // short name for the locale - int m_language; // this locale wxLanguage value - - const char *m_pszOldLocale; // previous locale from setlocale() - wxLocale *m_pOldLocale; // previous wxLocale - - bool m_initialized; - - wxTranslations m_translations; - - static wxLanguageInfoArray *ms_languagesDB; - - wxDECLARE_NO_COPY_CLASS(wxLocale); -}; - -// ---------------------------------------------------------------------------- -// global functions -// ---------------------------------------------------------------------------- - -// get the current locale object (note that it may be NULL!) -extern WXDLLIMPEXP_BASE wxLocale* wxGetLocale(); - -#endif // wxUSE_INTL - -#endif // _WX_INTL_H_ diff --git a/Externals/wxWidgets3/include/wx/iosfwrap.h b/Externals/wxWidgets3/include/wx/iosfwrap.h deleted file mode 100644 index 13fb1f7f89..0000000000 --- a/Externals/wxWidgets3/include/wx/iosfwrap.h +++ /dev/null @@ -1,25 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/iosfwrap.h -// Purpose: includes the correct stream-related forward declarations -// Author: Jan van Dijk -// Modified by: -// Created: 18.12.2002 -// Copyright: wxWidgets team -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#if wxUSE_STD_IOSTREAM - -#if wxUSE_IOSTREAMH - // There is no pre-ANSI iosfwd header so we include the full declarations. -# include -#else -# include -#endif - -#ifdef __WINDOWS__ -# include "wx/msw/winundef.h" -#endif - -#endif // wxUSE_STD_IOSTREAM - diff --git a/Externals/wxWidgets3/include/wx/ioswrap.h b/Externals/wxWidgets3/include/wx/ioswrap.h deleted file mode 100644 index 5805588ead..0000000000 --- a/Externals/wxWidgets3/include/wx/ioswrap.h +++ /dev/null @@ -1,29 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/ioswrap.h -// Purpose: includes the correct iostream headers for current compiler -// Author: Vadim Zeitlin -// Modified by: -// Created: 03.02.99 -// Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#if wxUSE_STD_IOSTREAM - -#include "wx/beforestd.h" - -#if wxUSE_IOSTREAMH -# include -#else -# include -#endif - -#include "wx/afterstd.h" - -#ifdef __WINDOWS__ -# include "wx/msw/winundef.h" -#endif - -#endif - // wxUSE_STD_IOSTREAM - diff --git a/Externals/wxWidgets3/include/wx/ipc.h b/Externals/wxWidgets3/include/wx/ipc.h deleted file mode 100644 index 36542e5f09..0000000000 --- a/Externals/wxWidgets3/include/wx/ipc.h +++ /dev/null @@ -1,44 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/ipc.h -// Purpose: wrapper around different wxIPC classes implementations -// Author: Vadim Zeitlin -// Modified by: -// Created: 15.04.02 -// Copyright: (c) 2002 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_IPC_H_ -#define _WX_IPC_H_ - -// Set wxUSE_DDE_FOR_IPC to 1 to use DDE for IPC under Windows. If it is set to -// 0, or if the platform is not Windows, use TCP/IP for IPC implementation - -#if !defined(wxUSE_DDE_FOR_IPC) - #ifdef __WINDOWS__ - #define wxUSE_DDE_FOR_IPC 1 - #else - #define wxUSE_DDE_FOR_IPC 0 - #endif -#endif // !defined(wxUSE_DDE_FOR_IPC) - -#if !defined(__WINDOWS__) - #undef wxUSE_DDE_FOR_IPC - #define wxUSE_DDE_FOR_IPC 0 -#endif - -#if wxUSE_DDE_FOR_IPC - #define wxConnection wxDDEConnection - #define wxServer wxDDEServer - #define wxClient wxDDEClient - - #include "wx/dde.h" -#else // !wxUSE_DDE_FOR_IPC - #define wxConnection wxTCPConnection - #define wxServer wxTCPServer - #define wxClient wxTCPClient - - #include "wx/sckipc.h" -#endif // wxUSE_DDE_FOR_IPC/!wxUSE_DDE_FOR_IPC - -#endif // _WX_IPC_H_ diff --git a/Externals/wxWidgets3/include/wx/ipcbase.h b/Externals/wxWidgets3/include/wx/ipcbase.h deleted file mode 100644 index 864a2ec3ea..0000000000 --- a/Externals/wxWidgets3/include/wx/ipcbase.h +++ /dev/null @@ -1,263 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/ipcbase.h -// Purpose: Base classes for IPC -// Author: Julian Smart -// Modified by: -// Created: 4/1/98 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_IPCBASEH__ -#define _WX_IPCBASEH__ - -#include "wx/defs.h" -#include "wx/object.h" -#include "wx/string.h" - -enum wxIPCFormat -{ - wxIPC_INVALID = 0, - wxIPC_TEXT = 1, /* CF_TEXT */ - wxIPC_BITMAP = 2, /* CF_BITMAP */ - wxIPC_METAFILE = 3, /* CF_METAFILEPICT */ - wxIPC_SYLK = 4, - wxIPC_DIF = 5, - wxIPC_TIFF = 6, - wxIPC_OEMTEXT = 7, /* CF_OEMTEXT */ - wxIPC_DIB = 8, /* CF_DIB */ - wxIPC_PALETTE = 9, - wxIPC_PENDATA = 10, - wxIPC_RIFF = 11, - wxIPC_WAVE = 12, - wxIPC_UTF16TEXT = 13, /* CF_UNICODE */ - wxIPC_ENHMETAFILE = 14, - wxIPC_FILENAME = 15, /* CF_HDROP */ - wxIPC_LOCALE = 16, - wxIPC_UTF8TEXT = 17, - wxIPC_UTF32TEXT = 18, -#if SIZEOF_WCHAR_T == 2 - wxIPC_UNICODETEXT = wxIPC_UTF16TEXT, -#elif SIZEOF_WCHAR_T == 4 - wxIPC_UNICODETEXT = wxIPC_UTF32TEXT, -#else -# error "Unknown wchar_t size" -#endif - wxIPC_PRIVATE = 20 -}; - -class WXDLLIMPEXP_FWD_BASE wxServerBase; -class WXDLLIMPEXP_FWD_BASE wxClientBase; - -class WXDLLIMPEXP_BASE wxConnectionBase: public wxObject -{ -public: - wxConnectionBase(void *buffer, size_t size); // use external buffer - wxConnectionBase(); // use internal, adaptive buffer - wxConnectionBase(const wxConnectionBase& copy); - virtual ~wxConnectionBase(); - - void SetConnected( bool c ) { m_connected = c; } - bool GetConnected() { return m_connected; } - - // Calls that CLIENT can make - bool Execute(const void *data, size_t size, wxIPCFormat fmt = wxIPC_PRIVATE) - { return DoExecute(data, size, fmt); } - bool Execute(const char *s, size_t size = wxNO_LEN) - { return DoExecute(s, size == wxNO_LEN ? strlen(s) + 1 - : size, wxIPC_TEXT); } - bool Execute(const wchar_t *ws, size_t size = wxNO_LEN) - { return DoExecute(ws, size == wxNO_LEN ? (wcslen(ws) + 1)*sizeof(wchar_t) - : size, wxIPC_UNICODETEXT); } - bool Execute(const wxString& s) - { - const wxScopedCharBuffer buf = s.utf8_str(); - return DoExecute(buf, strlen(buf) + 1, wxIPC_UTF8TEXT); - } - bool Execute(const wxCStrData& cs) - { return Execute(cs.AsString()); } - - virtual const void *Request(const wxString& item, - size_t *size = NULL, - wxIPCFormat format = wxIPC_TEXT) = 0; - - bool Poke(const wxString& item, const void *data, size_t size, - wxIPCFormat fmt = wxIPC_PRIVATE) - { return DoPoke(item, data, size, fmt); } - bool Poke(const wxString& item, const char *s, size_t size = wxNO_LEN) - { return DoPoke(item, s, size == wxNO_LEN ? strlen(s) + 1 - : size, wxIPC_TEXT); } - bool Poke(const wxString& item, const wchar_t *ws, size_t size = wxNO_LEN) - { return DoPoke(item, ws, - size == wxNO_LEN ? (wcslen(ws) + 1)*sizeof(wchar_t) - : size, wxIPC_UNICODETEXT); } - bool Poke(const wxString& item, const wxString& s) - { - const wxScopedCharBuffer buf = s.utf8_str(); - return DoPoke(item, buf, strlen(buf) + 1, wxIPC_UTF8TEXT); - } - bool Poke(const wxString& item, const wxCStrData& cs) - { return Poke(item, cs.AsString()); } - - virtual bool StartAdvise(const wxString& item) = 0; - virtual bool StopAdvise(const wxString& item) = 0; - - // Calls that SERVER can make - bool Advise(const wxString& item, const void *data, size_t size, - wxIPCFormat fmt = wxIPC_PRIVATE) - { return DoAdvise(item, data, size, fmt); } - bool Advise(const wxString& item, const char *s, size_t size = wxNO_LEN) - { return DoAdvise(item, s, size == wxNO_LEN ? strlen(s) + 1 - : size, wxIPC_TEXT); } - bool Advise(const wxString& item, const wchar_t *ws, size_t size = wxNO_LEN) - { return DoAdvise(item, ws, - size == wxNO_LEN ? (wcslen(ws) + 1)*sizeof(wchar_t) - : size, wxIPC_UNICODETEXT); } - bool Advise(const wxString& item, const wxString& s) - { - const wxScopedCharBuffer buf = s.utf8_str(); - return DoAdvise(item, buf, strlen(buf) + 1, wxIPC_UTF8TEXT); - } - bool Advise(const wxString& item, const wxCStrData& cs) - { return Advise(item, cs.AsString()); } - - // Calls that both can make - virtual bool Disconnect() = 0; - - - // Callbacks to SERVER - override at will - virtual bool OnExec(const wxString& WXUNUSED(topic), - const wxString& WXUNUSED(data)) - { - wxFAIL_MSG( "This method shouldn't be called, if it is, it probably " - "means that you didn't update your old code overriding " - "OnExecute() to use the new parameter types (\"const void *\" " - "instead of \"wxChar *\" and \"size_t\" instead of \"int\"), " - "you must do it or your code wouldn't be executed at all!" ); - return false; - } - - // deprecated function kept for backwards compatibility: usually you will - // want to override OnExec() above instead which receives its data in a more - // convenient format - virtual bool OnExecute(const wxString& topic, - const void *data, - size_t size, - wxIPCFormat format) - { return OnExec(topic, GetTextFromData(data, size, format)); } - - virtual const void *OnRequest(const wxString& WXUNUSED(topic), - const wxString& WXUNUSED(item), - size_t *size, - wxIPCFormat WXUNUSED(format)) - { *size = 0; return NULL; } - - virtual bool OnPoke(const wxString& WXUNUSED(topic), - const wxString& WXUNUSED(item), - const void *WXUNUSED(data), - size_t WXUNUSED(size), - wxIPCFormat WXUNUSED(format)) - { return false; } - - virtual bool OnStartAdvise(const wxString& WXUNUSED(topic), - const wxString& WXUNUSED(item)) - { return false; } - - virtual bool OnStopAdvise(const wxString& WXUNUSED(topic), - const wxString& WXUNUSED(item)) - { return false; } - - // Callbacks to CLIENT - override at will - virtual bool OnAdvise(const wxString& WXUNUSED(topic), - const wxString& WXUNUSED(item), - const void *WXUNUSED(data), - size_t WXUNUSED(size), - wxIPCFormat WXUNUSED(format)) - { return false; } - - // Callbacks to BOTH - virtual bool OnDisconnect() { delete this; return true; } - - - // return true if this is one of the formats used for textual data - // transmission - static bool IsTextFormat(wxIPCFormat format) - { - return format == wxIPC_TEXT || - format == wxIPC_UTF8TEXT || - format == wxIPC_UTF16TEXT || - format == wxIPC_UTF32TEXT; - } - - // converts from the data and format into a wxString automatically - // - // this function accepts data in all of wxIPC_TEXT, wxIPC_UNICODETEXT, and - // wxIPC_UTF8TEXT formats but asserts if the format is anything else (i.e. - // such that IsTextFormat(format) doesn't return true) - // - // notice that the size parameter here contains the total size of the data, - // including the terminating '\0' or L'\0' - static - wxString GetTextFromData(const void *data, size_t size, wxIPCFormat format); - - - // return a buffer at least this size, reallocating buffer if needed - // returns NULL if using an inadequate user buffer which can't be resized - void *GetBufferAtLeast(size_t bytes); - -protected: - virtual bool DoExecute(const void *data, size_t size, wxIPCFormat format) = 0; - virtual bool DoPoke(const wxString& item, const void *data, size_t size, - wxIPCFormat format) = 0; - virtual bool DoAdvise(const wxString& item, const void *data, size_t size, - wxIPCFormat format) = 0; - - -private: - char *m_buffer; - size_t m_buffersize; - bool m_deletebufferwhendone; - -protected: - bool m_connected; - - wxDECLARE_NO_ASSIGN_CLASS(wxConnectionBase); - wxDECLARE_CLASS(wxConnectionBase); -}; - - -class WXDLLIMPEXP_BASE wxServerBase : public wxObject -{ -public: - wxServerBase() { } - virtual ~wxServerBase() { } - - // Returns false on error (e.g. port number is already in use) - virtual bool Create(const wxString& serverName) = 0; - - // Callbacks to SERVER - override at will - virtual wxConnectionBase *OnAcceptConnection(const wxString& topic) = 0; - - wxDECLARE_CLASS(wxServerBase); -}; - -class WXDLLIMPEXP_BASE wxClientBase : public wxObject -{ -public: - wxClientBase() { } - virtual ~wxClientBase() { } - - virtual bool ValidHost(const wxString& host) = 0; - - // Call this to make a connection. Returns NULL if cannot. - virtual wxConnectionBase *MakeConnection(const wxString& host, - const wxString& server, - const wxString& topic) = 0; - - // Callbacks to CLIENT - override at will - virtual wxConnectionBase *OnMakeConnection() = 0; - - wxDECLARE_CLASS(wxClientBase); -}; - -#endif // _WX_IPCBASEH__ diff --git a/Externals/wxWidgets3/include/wx/itemid.h b/Externals/wxWidgets3/include/wx/itemid.h deleted file mode 100644 index 99897e9c17..0000000000 --- a/Externals/wxWidgets3/include/wx/itemid.h +++ /dev/null @@ -1,61 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/itemid.h -// Purpose: wxItemId class declaration. -// Author: Vadim Zeitlin -// Created: 2011-08-17 -// Copyright: (c) 2011 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_ITEMID_H_ -#define _WX_ITEMID_H_ - -// ---------------------------------------------------------------------------- -// wxItemId: an opaque item identifier used with wx{Tree,TreeList,DataView}Ctrl. -// ---------------------------------------------------------------------------- - -// The template argument T is typically a pointer to some opaque type. While -// wxTreeItemId and wxDataViewItem use a pointer to void, this is dangerous and -// not recommended for the new item id classes. -template -class wxItemId -{ -public: - typedef T Type; - - // This ctor is implicit which is fine for non-void* types, but if you use - // this class with void* you're strongly advised to make the derived class - // ctor explicit as implicitly converting from any pointer is simply too - // dangerous. - wxItemId(Type item = NULL) : m_pItem(item) { } - - // Default copy ctor, assignment operator and dtor are ok. - - bool IsOk() const { return m_pItem != NULL; } - Type GetID() const { return m_pItem; } - operator const Type() const { return m_pItem; } - - // This is used for implementation purposes only. - Type operator->() const { return m_pItem; } - - void Unset() { m_pItem = NULL; } - - // This field is public *only* for compatibility with the old wxTreeItemId - // implementation and must not be used in any new code. -//private: - Type m_pItem; -}; - -template -bool operator==(const wxItemId& left, const wxItemId& right) -{ - return left.GetID() == right.GetID(); -} - -template -bool operator!=(const wxItemId& left, const wxItemId& right) -{ - return !(left == right); -} - -#endif // _WX_ITEMID_H_ diff --git a/Externals/wxWidgets3/include/wx/joystick.h b/Externals/wxWidgets3/include/wx/joystick.h deleted file mode 100644 index 4a93a2518b..0000000000 --- a/Externals/wxWidgets3/include/wx/joystick.h +++ /dev/null @@ -1,37 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/joystick.h -// Purpose: wxJoystick base header -// Author: wxWidgets Team -// Modified by: -// Created: -// Copyright: (c) wxWidgets Team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_JOYSTICK_H_BASE_ -#define _WX_JOYSTICK_H_BASE_ - -#include "wx/defs.h" - -#if wxUSE_JOYSTICK - -#if defined(__WINDOWS__) -#include "wx/msw/joystick.h" -#elif defined(__WXMOTIF__) -#include "wx/unix/joystick.h" -#elif defined(__WXGTK__) -#include "wx/unix/joystick.h" -#elif defined(__WXX11__) -#include "wx/unix/joystick.h" -#elif defined(__DARWIN__) -#include "wx/osx/core/joystick.h" -#elif defined(__WXMAC__) -#include "wx/osx/joystick.h" -#elif defined(__WXQT__) -#include "wx/unix/joystick.h" -#endif - -#endif // wxUSE_JOYSTICK - -#endif - // _WX_JOYSTICK_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/kbdstate.h b/Externals/wxWidgets3/include/wx/kbdstate.h deleted file mode 100644 index ab0df32d1c..0000000000 --- a/Externals/wxWidgets3/include/wx/kbdstate.h +++ /dev/null @@ -1,121 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/kbdstate.h -// Purpose: Declaration of wxKeyboardState class -// Author: Vadim Zeitlin -// Created: 2008-09-19 -// Copyright: (c) 2008 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_KBDSTATE_H_ -#define _WX_KBDSTATE_H_ - -#include "wx/defs.h" - -// ---------------------------------------------------------------------------- -// wxKeyboardState stores the state of the keyboard modifier keys -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxKeyboardState -{ -public: - wxKeyboardState(bool controlDown = false, - bool shiftDown = false, - bool altDown = false, - bool metaDown = false) - : m_controlDown(controlDown), - m_shiftDown(shiftDown), - m_altDown(altDown), - m_metaDown(metaDown) -#ifdef __WXOSX__ - ,m_rawControlDown(false) -#endif - { - } - - // default copy ctor, assignment operator and dtor are ok - - - // accessors for the various modifier keys - // --------------------------------------- - - // should be used check if the key event has exactly the given modifiers: - // "GetModifiers() = wxMOD_CONTROL" is easier to write than "ControlDown() - // && !MetaDown() && !AltDown() && !ShiftDown()" - int GetModifiers() const - { - return (m_controlDown ? wxMOD_CONTROL : 0) | - (m_shiftDown ? wxMOD_SHIFT : 0) | - (m_metaDown ? wxMOD_META : 0) | -#ifdef __WXOSX__ - (m_rawControlDown ? wxMOD_RAW_CONTROL : 0) | -#endif - (m_altDown ? wxMOD_ALT : 0); - } - - // returns true if any modifiers at all are pressed - bool HasAnyModifiers() const { return GetModifiers() != wxMOD_NONE; } - - // returns true if any modifiers changing the usual key interpretation are - // pressed, notably excluding Shift - bool HasModifiers() const - { - return ControlDown() || RawControlDown() || AltDown(); - } - - // accessors for individual modifier keys - bool ControlDown() const { return m_controlDown; } - bool RawControlDown() const - { -#ifdef __WXOSX__ - return m_rawControlDown; -#else - return m_controlDown; -#endif - } - bool ShiftDown() const { return m_shiftDown; } - bool MetaDown() const { return m_metaDown; } - bool AltDown() const { return m_altDown; } - - // "Cmd" is a pseudo key which is Control for PC and Unix platforms but - // Apple ("Command") key under Macs: it makes often sense to use it instead - // of, say, ControlDown() because Cmd key is used for the same thing under - // Mac as Ctrl elsewhere (but Ctrl still exists, just not used for this - // purpose under Mac) - bool CmdDown() const - { - return ControlDown(); - } - - // these functions are mostly used by wxWidgets itself - // --------------------------------------------------- - - void SetControlDown(bool down) { m_controlDown = down; } - void SetRawControlDown(bool down) - { -#ifdef __WXOSX__ - m_rawControlDown = down; -#else - m_controlDown = down; -#endif - } - void SetShiftDown(bool down) { m_shiftDown = down; } - void SetAltDown(bool down) { m_altDown = down; } - void SetMetaDown(bool down) { m_metaDown = down; } - - - // for backwards compatibility with the existing code accessing these - // members of wxKeyEvent directly, these variables are public, however you - // should not use them in any new code, please use the accessors instead -public: - bool m_controlDown : 1; - bool m_shiftDown : 1; - bool m_altDown : 1; - bool m_metaDown : 1; -#ifdef __WXOSX__ - bool m_rawControlDown : 1; -#endif -}; - -#endif // _WX_KBDSTATE_H_ - diff --git a/Externals/wxWidgets3/include/wx/language.h b/Externals/wxWidgets3/include/wx/language.h deleted file mode 100644 index 5d788abcc2..0000000000 --- a/Externals/wxWidgets3/include/wx/language.h +++ /dev/null @@ -1,286 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/language.h -// Purpose: wxLanguage enum -// Author: Vadim Zeitlin -// Created: 2010-04-23 -// Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// WARNING: Parts of this file are generated. See misc/languages/README for -// details. - -#ifndef _WX_LANGUAGE_H_ -#define _WX_LANGUAGE_H_ - -#include "wx/defs.h" - -#if wxUSE_INTL - -// ---------------------------------------------------------------------------- -// wxLanguage: defines all supported languages -// ---------------------------------------------------------------------------- - -// --- --- --- generated code begins here --- --- --- - -/** - The languages supported by wxLocale. - - This enum is generated by misc/languages/genlang.py - When making changes, please put them into misc/languages/langtabl.txt -*/ -enum wxLanguage -{ - /// User's default/preferred language as got from OS. - wxLANGUAGE_DEFAULT, - - /// Unknown language, returned if wxLocale::GetSystemLanguage fails. - wxLANGUAGE_UNKNOWN, - - wxLANGUAGE_ABKHAZIAN, - wxLANGUAGE_AFAR, - wxLANGUAGE_AFRIKAANS, - wxLANGUAGE_ALBANIAN, - wxLANGUAGE_AMHARIC, - wxLANGUAGE_ARABIC, - wxLANGUAGE_ARABIC_ALGERIA, - wxLANGUAGE_ARABIC_BAHRAIN, - wxLANGUAGE_ARABIC_EGYPT, - wxLANGUAGE_ARABIC_IRAQ, - wxLANGUAGE_ARABIC_JORDAN, - wxLANGUAGE_ARABIC_KUWAIT, - wxLANGUAGE_ARABIC_LEBANON, - wxLANGUAGE_ARABIC_LIBYA, - wxLANGUAGE_ARABIC_MOROCCO, - wxLANGUAGE_ARABIC_OMAN, - wxLANGUAGE_ARABIC_QATAR, - wxLANGUAGE_ARABIC_SAUDI_ARABIA, - wxLANGUAGE_ARABIC_SUDAN, - wxLANGUAGE_ARABIC_SYRIA, - wxLANGUAGE_ARABIC_TUNISIA, - wxLANGUAGE_ARABIC_UAE, - wxLANGUAGE_ARABIC_YEMEN, - wxLANGUAGE_ARMENIAN, - wxLANGUAGE_ASSAMESE, - wxLANGUAGE_ASTURIAN, - wxLANGUAGE_AYMARA, - wxLANGUAGE_AZERI, - wxLANGUAGE_AZERI_CYRILLIC, - wxLANGUAGE_AZERI_LATIN, - wxLANGUAGE_BASHKIR, - wxLANGUAGE_BASQUE, - wxLANGUAGE_BELARUSIAN, - wxLANGUAGE_BENGALI, - wxLANGUAGE_BHUTANI, - wxLANGUAGE_BIHARI, - wxLANGUAGE_BISLAMA, - wxLANGUAGE_BOSNIAN, - wxLANGUAGE_BRETON, - wxLANGUAGE_BULGARIAN, - wxLANGUAGE_BURMESE, - wxLANGUAGE_CATALAN, - wxLANGUAGE_CHINESE, - wxLANGUAGE_CHINESE_SIMPLIFIED, - wxLANGUAGE_CHINESE_TRADITIONAL, - wxLANGUAGE_CHINESE_HONGKONG, - wxLANGUAGE_CHINESE_MACAU, - wxLANGUAGE_CHINESE_SINGAPORE, - wxLANGUAGE_CHINESE_TAIWAN, - wxLANGUAGE_CORSICAN, - wxLANGUAGE_CROATIAN, - wxLANGUAGE_CZECH, - wxLANGUAGE_DANISH, - wxLANGUAGE_DUTCH, - wxLANGUAGE_DUTCH_BELGIAN, - wxLANGUAGE_ENGLISH, - wxLANGUAGE_ENGLISH_UK, - wxLANGUAGE_ENGLISH_US, - wxLANGUAGE_ENGLISH_AUSTRALIA, - wxLANGUAGE_ENGLISH_BELIZE, - wxLANGUAGE_ENGLISH_BOTSWANA, - wxLANGUAGE_ENGLISH_CANADA, - wxLANGUAGE_ENGLISH_CARIBBEAN, - wxLANGUAGE_ENGLISH_DENMARK, - wxLANGUAGE_ENGLISH_EIRE, - wxLANGUAGE_ENGLISH_JAMAICA, - wxLANGUAGE_ENGLISH_NEW_ZEALAND, - wxLANGUAGE_ENGLISH_PHILIPPINES, - wxLANGUAGE_ENGLISH_SOUTH_AFRICA, - wxLANGUAGE_ENGLISH_TRINIDAD, - wxLANGUAGE_ENGLISH_ZIMBABWE, - wxLANGUAGE_ESPERANTO, - wxLANGUAGE_ESTONIAN, - wxLANGUAGE_FAEROESE, - wxLANGUAGE_FARSI, - wxLANGUAGE_FIJI, - wxLANGUAGE_FINNISH, - wxLANGUAGE_FRENCH, - wxLANGUAGE_FRENCH_BELGIAN, - wxLANGUAGE_FRENCH_CANADIAN, - wxLANGUAGE_FRENCH_LUXEMBOURG, - wxLANGUAGE_FRENCH_MONACO, - wxLANGUAGE_FRENCH_SWISS, - wxLANGUAGE_FRISIAN, - wxLANGUAGE_GALICIAN, - wxLANGUAGE_GEORGIAN, - wxLANGUAGE_GERMAN, - wxLANGUAGE_GERMAN_AUSTRIAN, - wxLANGUAGE_GERMAN_BELGIUM, - wxLANGUAGE_GERMAN_LIECHTENSTEIN, - wxLANGUAGE_GERMAN_LUXEMBOURG, - wxLANGUAGE_GERMAN_SWISS, - wxLANGUAGE_GREEK, - wxLANGUAGE_GREENLANDIC, - wxLANGUAGE_GUARANI, - wxLANGUAGE_GUJARATI, - wxLANGUAGE_HAUSA, - wxLANGUAGE_HEBREW, - wxLANGUAGE_HINDI, - wxLANGUAGE_HUNGARIAN, - wxLANGUAGE_ICELANDIC, - wxLANGUAGE_INDONESIAN, - wxLANGUAGE_INTERLINGUA, - wxLANGUAGE_INTERLINGUE, - wxLANGUAGE_INUKTITUT, - wxLANGUAGE_INUPIAK, - wxLANGUAGE_IRISH, - wxLANGUAGE_ITALIAN, - wxLANGUAGE_ITALIAN_SWISS, - wxLANGUAGE_JAPANESE, - wxLANGUAGE_JAVANESE, - wxLANGUAGE_KABYLE, - wxLANGUAGE_KANNADA, - wxLANGUAGE_KASHMIRI, - wxLANGUAGE_KASHMIRI_INDIA, - wxLANGUAGE_KAZAKH, - wxLANGUAGE_KERNEWEK, - wxLANGUAGE_KHMER, - wxLANGUAGE_KINYARWANDA, - wxLANGUAGE_KIRGHIZ, - wxLANGUAGE_KIRUNDI, - wxLANGUAGE_KONKANI, - wxLANGUAGE_KOREAN, - wxLANGUAGE_KURDISH, - wxLANGUAGE_LAOTHIAN, - wxLANGUAGE_LATIN, - wxLANGUAGE_LATVIAN, - wxLANGUAGE_LINGALA, - wxLANGUAGE_LITHUANIAN, - wxLANGUAGE_MACEDONIAN, - wxLANGUAGE_MALAGASY, - wxLANGUAGE_MALAY, - wxLANGUAGE_MALAYALAM, - wxLANGUAGE_MALAY_BRUNEI_DARUSSALAM, - wxLANGUAGE_MALAY_MALAYSIA, - wxLANGUAGE_MALTESE, - wxLANGUAGE_MANIPURI, - wxLANGUAGE_MAORI, - wxLANGUAGE_MARATHI, - wxLANGUAGE_MOLDAVIAN, - wxLANGUAGE_MONGOLIAN, - wxLANGUAGE_NAURU, - wxLANGUAGE_NEPALI, - wxLANGUAGE_NEPALI_INDIA, - wxLANGUAGE_NORWEGIAN_BOKMAL, - wxLANGUAGE_NORWEGIAN_NYNORSK, - wxLANGUAGE_OCCITAN, - wxLANGUAGE_ORIYA, - wxLANGUAGE_OROMO, - wxLANGUAGE_PASHTO, - wxLANGUAGE_POLISH, - wxLANGUAGE_PORTUGUESE, - wxLANGUAGE_PORTUGUESE_BRAZILIAN, - wxLANGUAGE_PUNJABI, - wxLANGUAGE_QUECHUA, - wxLANGUAGE_RHAETO_ROMANCE, - wxLANGUAGE_ROMANIAN, - wxLANGUAGE_RUSSIAN, - wxLANGUAGE_RUSSIAN_UKRAINE, - wxLANGUAGE_SAMI, - wxLANGUAGE_SAMOAN, - wxLANGUAGE_SANGHO, - wxLANGUAGE_SANSKRIT, - wxLANGUAGE_SCOTS_GAELIC, - wxLANGUAGE_SERBIAN, - wxLANGUAGE_SERBIAN_CYRILLIC, - wxLANGUAGE_SERBIAN_LATIN, - wxLANGUAGE_SERBO_CROATIAN, - wxLANGUAGE_SESOTHO, - wxLANGUAGE_SETSWANA, - wxLANGUAGE_SHONA, - wxLANGUAGE_SINDHI, - wxLANGUAGE_SINHALESE, - wxLANGUAGE_SISWATI, - wxLANGUAGE_SLOVAK, - wxLANGUAGE_SLOVENIAN, - wxLANGUAGE_SOMALI, - wxLANGUAGE_SPANISH, - wxLANGUAGE_SPANISH_ARGENTINA, - wxLANGUAGE_SPANISH_BOLIVIA, - wxLANGUAGE_SPANISH_CHILE, - wxLANGUAGE_SPANISH_COLOMBIA, - wxLANGUAGE_SPANISH_COSTA_RICA, - wxLANGUAGE_SPANISH_DOMINICAN_REPUBLIC, - wxLANGUAGE_SPANISH_ECUADOR, - wxLANGUAGE_SPANISH_EL_SALVADOR, - wxLANGUAGE_SPANISH_GUATEMALA, - wxLANGUAGE_SPANISH_HONDURAS, - wxLANGUAGE_SPANISH_MEXICAN, - wxLANGUAGE_SPANISH_MODERN, - wxLANGUAGE_SPANISH_NICARAGUA, - wxLANGUAGE_SPANISH_PANAMA, - wxLANGUAGE_SPANISH_PARAGUAY, - wxLANGUAGE_SPANISH_PERU, - wxLANGUAGE_SPANISH_PUERTO_RICO, - wxLANGUAGE_SPANISH_URUGUAY, - wxLANGUAGE_SPANISH_US, - wxLANGUAGE_SPANISH_VENEZUELA, - wxLANGUAGE_SUNDANESE, - wxLANGUAGE_SWAHILI, - wxLANGUAGE_SWEDISH, - wxLANGUAGE_SWEDISH_FINLAND, - wxLANGUAGE_TAGALOG, - wxLANGUAGE_TAJIK, - wxLANGUAGE_TAMIL, - wxLANGUAGE_TATAR, - wxLANGUAGE_TELUGU, - wxLANGUAGE_THAI, - wxLANGUAGE_TIBETAN, - wxLANGUAGE_TIGRINYA, - wxLANGUAGE_TONGA, - wxLANGUAGE_TSONGA, - wxLANGUAGE_TURKISH, - wxLANGUAGE_TURKMEN, - wxLANGUAGE_TWI, - wxLANGUAGE_UIGHUR, - wxLANGUAGE_UKRAINIAN, - wxLANGUAGE_URDU, - wxLANGUAGE_URDU_INDIA, - wxLANGUAGE_URDU_PAKISTAN, - wxLANGUAGE_UZBEK, - wxLANGUAGE_UZBEK_CYRILLIC, - wxLANGUAGE_UZBEK_LATIN, - wxLANGUAGE_VALENCIAN, - wxLANGUAGE_VIETNAMESE, - wxLANGUAGE_VOLAPUK, - wxLANGUAGE_WELSH, - wxLANGUAGE_WOLOF, - wxLANGUAGE_XHOSA, - wxLANGUAGE_YIDDISH, - wxLANGUAGE_YORUBA, - wxLANGUAGE_ZHUANG, - wxLANGUAGE_ZULU, - - /// For custom, user-defined languages. - wxLANGUAGE_USER_DEFINED, - - - /// Obsolete synonym. - wxLANGUAGE_CAMBODIAN = wxLANGUAGE_KHMER -}; - -// --- --- --- generated code ends here --- --- --- - -#endif // wxUSE_INTL - -#endif // _WX_LANGUAGE_H_ diff --git a/Externals/wxWidgets3/include/wx/layout.h b/Externals/wxWidgets3/include/wx/layout.h deleted file mode 100644 index 829fa9d8e2..0000000000 --- a/Externals/wxWidgets3/include/wx/layout.h +++ /dev/null @@ -1,190 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/layout.h -// Purpose: OBSOLETE layout constraint classes, use sizers instead -// Author: Julian Smart -// Modified by: -// Created: 29/01/98 -// Copyright: (c) 1998 Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_LAYOUT_H_ -#define _WX_LAYOUT_H_ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/object.h" - -// X stupidly defines these in X.h -#ifdef Above - #undef Above -#endif -#ifdef Below - #undef Below -#endif - -#if wxUSE_CONSTRAINTS - -// ---------------------------------------------------------------------------- -// forward declrations -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxWindowBase; -class WXDLLIMPEXP_FWD_CORE wxLayoutConstraints; - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -#define wxLAYOUT_DEFAULT_MARGIN 0 - -enum wxEdge -{ - wxLeft, wxTop, wxRight, wxBottom, wxWidth, wxHeight, - wxCentre, wxCenter = wxCentre, wxCentreX, wxCentreY -}; - -enum wxRelationship -{ - wxUnconstrained = 0, - wxAsIs, - wxPercentOf, - wxAbove, - wxBelow, - wxLeftOf, - wxRightOf, - wxSameAs, - wxAbsolute -}; - -// ---------------------------------------------------------------------------- -// wxIndividualLayoutConstraint: a constraint on window position -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxIndividualLayoutConstraint : public wxObject -{ -public: - wxIndividualLayoutConstraint(); - - // note that default copy ctor and assignment operators are ok - - virtual ~wxIndividualLayoutConstraint(){} - - void Set(wxRelationship rel, wxWindowBase *otherW, wxEdge otherE, int val = 0, int marg = wxLAYOUT_DEFAULT_MARGIN); - - // - // Sibling relationships - // - void LeftOf(wxWindowBase *sibling, int marg = wxLAYOUT_DEFAULT_MARGIN); - void RightOf(wxWindowBase *sibling, int marg = wxLAYOUT_DEFAULT_MARGIN); - void Above(wxWindowBase *sibling, int marg = wxLAYOUT_DEFAULT_MARGIN); - void Below(wxWindowBase *sibling, int marg = wxLAYOUT_DEFAULT_MARGIN); - - // - // 'Same edge' alignment - // - void SameAs(wxWindowBase *otherW, wxEdge edge, int marg = wxLAYOUT_DEFAULT_MARGIN); - - // The edge is a percentage of the other window's edge - void PercentOf(wxWindowBase *otherW, wxEdge wh, int per); - - // - // Edge has absolute value - // - void Absolute(int val); - - // - // Dimension is unconstrained - // - void Unconstrained() { relationship = wxUnconstrained; } - - // - // Dimension is 'as is' (use current size settings) - // - void AsIs() { relationship = wxAsIs; } - - // - // Accessors - // - wxWindowBase *GetOtherWindow() { return otherWin; } - wxEdge GetMyEdge() const { return myEdge; } - void SetEdge(wxEdge which) { myEdge = which; } - void SetValue(int v) { value = v; } - int GetMargin() { return margin; } - void SetMargin(int m) { margin = m; } - int GetValue() const { return value; } - int GetPercent() const { return percent; } - int GetOtherEdge() const { return otherEdge; } - bool GetDone() const { return done; } - void SetDone(bool d) { done = d; } - wxRelationship GetRelationship() { return relationship; } - void SetRelationship(wxRelationship r) { relationship = r; } - - // Reset constraint if it mentions otherWin - bool ResetIfWin(wxWindowBase *otherW); - - // Try to satisfy constraint - bool SatisfyConstraint(wxLayoutConstraints *constraints, wxWindowBase *win); - - // Get the value of this edge or dimension, or if this - // is not determinable, -1. - int GetEdge(wxEdge which, wxWindowBase *thisWin, wxWindowBase *other) const; - -protected: - // To be allowed to modify the internal variables - friend class wxIndividualLayoutConstraint_Serialize; - - // 'This' window is the parent or sibling of otherWin - wxWindowBase *otherWin; - - wxEdge myEdge; - wxRelationship relationship; - int margin; - int value; - int percent; - wxEdge otherEdge; - bool done; - - wxDECLARE_DYNAMIC_CLASS(wxIndividualLayoutConstraint); -}; - -// ---------------------------------------------------------------------------- -// wxLayoutConstraints: the complete set of constraints for a window -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxLayoutConstraints : public wxObject -{ -public: - // Edge constraints - wxIndividualLayoutConstraint left; - wxIndividualLayoutConstraint top; - wxIndividualLayoutConstraint right; - wxIndividualLayoutConstraint bottom; - // Size constraints - wxIndividualLayoutConstraint width; - wxIndividualLayoutConstraint height; - // Centre constraints - wxIndividualLayoutConstraint centreX; - wxIndividualLayoutConstraint centreY; - - wxLayoutConstraints(); - - // note that default copy ctor and assignment operators are ok - - virtual ~wxLayoutConstraints(){} - - bool SatisfyConstraints(wxWindowBase *win, int *noChanges); - bool AreSatisfied() const - { - return left.GetDone() && top.GetDone() && - width.GetDone() && height.GetDone(); - } - - wxDECLARE_DYNAMIC_CLASS(wxLayoutConstraints); -}; - -#endif // wxUSE_CONSTRAINTS - -#endif // _WX_LAYOUT_H_ diff --git a/Externals/wxWidgets3/include/wx/laywin.h b/Externals/wxWidgets3/include/wx/laywin.h deleted file mode 100644 index e3f6b6eeea..0000000000 --- a/Externals/wxWidgets3/include/wx/laywin.h +++ /dev/null @@ -1,17 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/laywin.h -// Purpose: wxSashLayoutWindow base header -// Author: Julian Smart -// Modified by: -// Created: -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_LAYWIN_H_BASE_ -#define _WX_LAYWIN_H_BASE_ - -#include "wx/generic/laywin.h" - -#endif - // _WX_LAYWIN_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/link.h b/Externals/wxWidgets3/include/wx/link.h deleted file mode 100644 index c422fc17af..0000000000 --- a/Externals/wxWidgets3/include/wx/link.h +++ /dev/null @@ -1,31 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/link.h -// Purpose: macros to force linking modules which might otherwise be -// discarded by the linker -// Author: Vaclav Slavik -// Copyright: (c) Vaclav Slavik -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_LINK_H_ -#define _WX_LINK_H_ - -// This must be part of the module you want to force: -#define wxFORCE_LINK_THIS_MODULE(module_name) \ - extern void _wx_link_dummy_func_##module_name (); \ - void _wx_link_dummy_func_##module_name () { } - - -// And this must be somewhere where it certainly will be linked: -#define wxFORCE_LINK_MODULE(module_name) \ - extern void _wx_link_dummy_func_##module_name (); \ - static struct wxForceLink##module_name \ - { \ - wxForceLink##module_name() \ - { \ - _wx_link_dummy_func_##module_name (); \ - } \ - } _wx_link_dummy_var_##module_name; - - -#endif // _WX_LINK_H_ diff --git a/Externals/wxWidgets3/include/wx/list.h b/Externals/wxWidgets3/include/wx/list.h deleted file mode 100644 index 9278a4f148..0000000000 --- a/Externals/wxWidgets3/include/wx/list.h +++ /dev/null @@ -1,1298 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/list.h -// Purpose: wxList, wxStringList classes -// Author: Julian Smart -// Modified by: VZ at 16/11/98: WX_DECLARE_LIST() and typesafe lists added -// Created: 29/01/98 -// Copyright: (c) 1998 Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -/* - All this is quite ugly but serves two purposes: - 1. Be almost 100% compatible with old, untyped, wxList class - 2. Ensure compile-time type checking for the linked lists - - The idea is to have one base class (wxListBase) working with "void *" data, - but to hide these untyped functions - i.e. make them protected, so they - can only be used from derived classes which have inline member functions - working with right types. This achieves the 2nd goal. As for the first one, - we provide a special derivation of wxListBase called wxList which looks just - like the old class. -*/ - -#ifndef _WX_LIST_H_ -#define _WX_LIST_H_ - -// ----------------------------------------------------------------------------- -// headers -// ----------------------------------------------------------------------------- - -#include "wx/defs.h" -#include "wx/object.h" -#include "wx/string.h" -#include "wx/vector.h" - -#if wxUSE_STD_CONTAINERS - #include "wx/beforestd.h" - #include - #include - #include - #include "wx/afterstd.h" -#endif - -// ---------------------------------------------------------------------------- -// types -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_BASE wxObjectListNode; -typedef wxObjectListNode wxNode; - -#if wxUSE_STD_CONTAINERS - -#define wxLIST_COMPATIBILITY - -#define WX_DECLARE_LIST_3(elT, dummy1, liT, dummy2, decl) \ - WX_DECLARE_LIST_WITH_DECL(elT, liT, decl) -#define WX_DECLARE_LIST_PTR_3(elT, dummy1, liT, dummy2, decl) \ - WX_DECLARE_LIST_3(elT, dummy1, liT, dummy2, decl) - -#define WX_DECLARE_LIST_2(elT, liT, dummy, decl) \ - WX_DECLARE_LIST_WITH_DECL(elT, liT, decl) -#define WX_DECLARE_LIST_PTR_2(elT, liT, dummy, decl) \ - WX_DECLARE_LIST_2(elT, liT, dummy, decl) \ - -#define WX_DECLARE_LIST_WITH_DECL(elT, liT, decl) \ - WX_DECLARE_LIST_XO(elT*, liT, decl) - -template -class wxList_SortFunction -{ -public: - wxList_SortFunction(wxSortCompareFunction f) : m_f(f) { } - bool operator()(const T& i1, const T& i2) - { return m_f((T*)&i1, (T*)&i2) < 0; } -private: - wxSortCompareFunction m_f; -}; - -/* - Note 1: the outer helper class _WX_LIST_HELPER_##liT below is a workaround - for mingw 3.2.3 compiler bug that prevents a static function of liT class - from being exported into dll. A minimal code snippet reproducing the bug: - - struct WXDLLIMPEXP_CORE Foo - { - static void Bar(); - struct SomeInnerClass - { - friend class Foo; // comment this out to make it link - }; - ~Foo() - { - Bar(); - } - }; - - The program does not link under mingw_gcc 3.2.3 producing undefined - reference to Foo::Bar() function - - - Note 2: the EmptyList is needed to allow having a NULL pointer-like - invalid iterator. We used to use just an uninitialized iterator object - instead but this fails with some debug/checked versions of STL, notably the - glibc version activated with _GLIBCXX_DEBUG, so we need to have a separate - invalid iterator. - */ - -// the real wxList-class declaration -#define WX_DECLARE_LIST_XO(elT, liT, decl) \ - decl _WX_LIST_HELPER_##liT \ - { \ - typedef elT _WX_LIST_ITEM_TYPE_##liT; \ - typedef std::list BaseListType; \ - public: \ - static BaseListType EmptyList; \ - static void DeleteFunction( _WX_LIST_ITEM_TYPE_##liT X ); \ - }; \ - \ - class liT : public std::list \ - { \ - private: \ - typedef std::list BaseListType; \ - \ - bool m_destroy; \ - \ - public: \ - class compatibility_iterator \ - { \ - private: \ - friend class liT; \ - \ - iterator m_iter; \ - liT * m_list; \ - \ - public: \ - compatibility_iterator() \ - : m_iter(_WX_LIST_HELPER_##liT::EmptyList.end()), m_list( NULL ) {} \ - compatibility_iterator( liT* li, iterator i ) \ - : m_iter( i ), m_list( li ) {} \ - compatibility_iterator( const liT* li, iterator i ) \ - : m_iter( i ), m_list( const_cast< liT* >( li ) ) {} \ - \ - compatibility_iterator* operator->() { return this; } \ - const compatibility_iterator* operator->() const { return this; } \ - \ - bool operator==(const compatibility_iterator& i) const \ - { \ - wxASSERT_MSG( m_list && i.m_list, \ - wxT("comparing invalid iterators is illegal") ); \ - return (m_list == i.m_list) && (m_iter == i.m_iter); \ - } \ - bool operator!=(const compatibility_iterator& i) const \ - { return !( operator==( i ) ); } \ - operator bool() const \ - { return m_list ? m_iter != m_list->end() : false; } \ - bool operator !() const \ - { return !( operator bool() ); } \ - \ - elT GetData() const \ - { return *m_iter; } \ - void SetData( elT e ) \ - { *m_iter = e; } \ - \ - compatibility_iterator GetNext() const \ - { \ - iterator i = m_iter; \ - return compatibility_iterator( m_list, ++i ); \ - } \ - compatibility_iterator GetPrevious() const \ - { \ - if ( m_iter == m_list->begin() ) \ - return compatibility_iterator(); \ - \ - iterator i = m_iter; \ - return compatibility_iterator( m_list, --i ); \ - } \ - int IndexOf() const \ - { \ - return *this ? (int)std::distance( m_list->begin(), m_iter ) \ - : wxNOT_FOUND; \ - } \ - }; \ - public: \ - liT() : m_destroy( false ) {} \ - \ - compatibility_iterator Find( const elT e ) const \ - { \ - liT* _this = const_cast< liT* >( this ); \ - return compatibility_iterator( _this, \ - std::find( _this->begin(), _this->end(), e ) ); \ - } \ - \ - bool IsEmpty() const \ - { return empty(); } \ - size_t GetCount() const \ - { return size(); } \ - int Number() const \ - { return static_cast< int >( GetCount() ); } \ - \ - compatibility_iterator Item( size_t idx ) const \ - { \ - iterator i = const_cast< liT* >(this)->begin(); \ - std::advance( i, idx ); \ - return compatibility_iterator( this, i ); \ - } \ - elT operator[](size_t idx) const \ - { \ - return Item(idx).GetData(); \ - } \ - \ - compatibility_iterator GetFirst() const \ - { \ - return compatibility_iterator( this, \ - const_cast< liT* >(this)->begin() ); \ - } \ - compatibility_iterator GetLast() const \ - { \ - iterator i = const_cast< liT* >(this)->end(); \ - return compatibility_iterator( this, !empty() ? --i : i ); \ - } \ - bool Member( elT e ) const \ - { return Find( e ); } \ - compatibility_iterator Nth( int n ) const \ - { return Item( n ); } \ - int IndexOf( elT e ) const \ - { return Find( e ).IndexOf(); } \ - \ - compatibility_iterator Append( elT e ) \ - { \ - push_back( e ); \ - return GetLast(); \ - } \ - compatibility_iterator Insert( elT e ) \ - { \ - push_front( e ); \ - return compatibility_iterator( this, begin() ); \ - } \ - compatibility_iterator Insert(const compatibility_iterator & i, elT e)\ - { \ - return compatibility_iterator( this, insert( i.m_iter, e ) ); \ - } \ - compatibility_iterator Insert( size_t idx, elT e ) \ - { \ - return compatibility_iterator( this, \ - insert( Item( idx ).m_iter, e ) ); \ - } \ - \ - void DeleteContents( bool destroy ) \ - { m_destroy = destroy; } \ - bool GetDeleteContents() const \ - { return m_destroy; } \ - void Erase( const compatibility_iterator& i ) \ - { \ - if ( m_destroy ) \ - _WX_LIST_HELPER_##liT::DeleteFunction( i->GetData() ); \ - erase( i.m_iter ); \ - } \ - bool DeleteNode( const compatibility_iterator& i ) \ - { \ - if( i ) \ - { \ - Erase( i ); \ - return true; \ - } \ - return false; \ - } \ - bool DeleteObject( elT e ) \ - { \ - return DeleteNode( Find( e ) ); \ - } \ - void Clear() \ - { \ - if ( m_destroy ) \ - std::for_each( begin(), end(), \ - _WX_LIST_HELPER_##liT::DeleteFunction ); \ - clear(); \ - } \ - /* Workaround for broken VC6 std::list::sort() see above */ \ - void Sort( wxSortCompareFunction compfunc ) \ - { sort( wxList_SortFunction(compfunc ) ); } \ - ~liT() { Clear(); } \ - \ - /* It needs access to our EmptyList */ \ - friend class compatibility_iterator; \ - } - -#define WX_DECLARE_LIST(elementtype, listname) \ - WX_DECLARE_LIST_WITH_DECL(elementtype, listname, class) -#define WX_DECLARE_LIST_PTR(elementtype, listname) \ - WX_DECLARE_LIST(elementtype, listname) - -#define WX_DECLARE_EXPORTED_LIST(elementtype, listname) \ - WX_DECLARE_LIST_WITH_DECL(elementtype, listname, class WXDLLIMPEXP_CORE) -#define WX_DECLARE_EXPORTED_LIST_PTR(elementtype, listname) \ - WX_DECLARE_EXPORTED_LIST(elementtype, listname) - -#define WX_DECLARE_USER_EXPORTED_LIST(elementtype, listname, usergoo) \ - WX_DECLARE_LIST_WITH_DECL(elementtype, listname, class usergoo) -#define WX_DECLARE_USER_EXPORTED_LIST_PTR(elementtype, listname, usergoo) \ - WX_DECLARE_USER_EXPORTED_LIST(elementtype, listname, usergoo) - -// this macro must be inserted in your program after -// #include "wx/listimpl.cpp" -#define WX_DEFINE_LIST(name) "don't forget to include listimpl.cpp!" - -#define WX_DEFINE_EXPORTED_LIST(name) WX_DEFINE_LIST(name) -#define WX_DEFINE_USER_EXPORTED_LIST(name) WX_DEFINE_LIST(name) - -#else // if !wxUSE_STD_CONTAINERS - - -// undef it to get rid of old, deprecated functions -#define wxLIST_COMPATIBILITY - -// ----------------------------------------------------------------------------- -// key stuff: a list may be optionally keyed on integer or string key -// ----------------------------------------------------------------------------- - -union wxListKeyValue -{ - long integer; - wxString *string; -}; - -// a struct which may contain both types of keys -// -// implementation note: on one hand, this class allows to have only one function -// for any keyed operation instead of 2 almost equivalent. OTOH, it's needed to -// resolve ambiguity which we would otherwise have with wxStringList::Find() and -// wxList::Find(const char *). -class WXDLLIMPEXP_BASE wxListKey -{ -public: - // implicit ctors - wxListKey() : m_keyType(wxKEY_NONE) - { } - wxListKey(long i) : m_keyType(wxKEY_INTEGER) - { m_key.integer = i; } - wxListKey(const wxString& s) : m_keyType(wxKEY_STRING) - { m_key.string = new wxString(s); } - wxListKey(const char *s) : m_keyType(wxKEY_STRING) - { m_key.string = new wxString(s); } - wxListKey(const wchar_t *s) : m_keyType(wxKEY_STRING) - { m_key.string = new wxString(s); } - - // accessors - wxKeyType GetKeyType() const { return m_keyType; } - const wxString GetString() const - { wxASSERT( m_keyType == wxKEY_STRING ); return *m_key.string; } - long GetNumber() const - { wxASSERT( m_keyType == wxKEY_INTEGER ); return m_key.integer; } - - // comparison - // Note: implementation moved to list.cpp to prevent BC++ inline - // expansion warning. - bool operator==(wxListKeyValue value) const ; - - // dtor - ~wxListKey() - { - if ( m_keyType == wxKEY_STRING ) - delete m_key.string; - } - -private: - wxKeyType m_keyType; - wxListKeyValue m_key; -}; - -// ----------------------------------------------------------------------------- -// wxNodeBase class is a (base for) node in a double linked list -// ----------------------------------------------------------------------------- - -extern WXDLLIMPEXP_DATA_BASE(wxListKey) wxDefaultListKey; - -class WXDLLIMPEXP_FWD_BASE wxListBase; - -class WXDLLIMPEXP_BASE wxNodeBase -{ -friend class wxListBase; -public: - // ctor - wxNodeBase(wxListBase *list = NULL, - wxNodeBase *previous = NULL, - wxNodeBase *next = NULL, - void *data = NULL, - const wxListKey& key = wxDefaultListKey); - - virtual ~wxNodeBase(); - - // FIXME no check is done that the list is really keyed on strings - wxString GetKeyString() const { return *m_key.string; } - long GetKeyInteger() const { return m_key.integer; } - - // Necessary for some existing code - void SetKeyString(const wxString& s) { m_key.string = new wxString(s); } - void SetKeyInteger(long i) { m_key.integer = i; } - -#ifdef wxLIST_COMPATIBILITY - // compatibility methods, use Get* instead. - wxDEPRECATED( wxNode *Next() const ); - wxDEPRECATED( wxNode *Previous() const ); - wxDEPRECATED( wxObject *Data() const ); -#endif // wxLIST_COMPATIBILITY - -protected: - // all these are going to be "overloaded" in the derived classes - wxNodeBase *GetNext() const { return m_next; } - wxNodeBase *GetPrevious() const { return m_previous; } - - void *GetData() const { return m_data; } - void SetData(void *data) { m_data = data; } - - // get 0-based index of this node within the list or wxNOT_FOUND - int IndexOf() const; - - virtual void DeleteData() { } -public: - // for wxList::iterator - void** GetDataPtr() const { return &(const_cast(this)->m_data); } -private: - // optional key stuff - wxListKeyValue m_key; - - void *m_data; // user data - wxNodeBase *m_next, // next and previous nodes in the list - *m_previous; - - wxListBase *m_list; // list we belong to - - wxDECLARE_NO_COPY_CLASS(wxNodeBase); -}; - -// ----------------------------------------------------------------------------- -// a double-linked list class -// ----------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_BASE wxList; - -class WXDLLIMPEXP_BASE wxListBase -{ -friend class wxNodeBase; // should be able to call DetachNode() -friend class wxHashTableBase; // should be able to call untyped Find() - -public: - // default ctor & dtor - wxListBase(wxKeyType keyType = wxKEY_NONE) - { Init(keyType); } - virtual ~wxListBase(); - - // accessors - // count of items in the list - size_t GetCount() const { return m_count; } - - // return true if this list is empty - bool IsEmpty() const { return m_count == 0; } - - // operations - - // delete all nodes - void Clear(); - - // instruct it to destroy user data when deleting nodes - void DeleteContents(bool destroy) { m_destroy = destroy; } - - // query if to delete - bool GetDeleteContents() const - { return m_destroy; } - - // get the keytype - wxKeyType GetKeyType() const - { return m_keyType; } - - // set the keytype (required by the serial code) - void SetKeyType(wxKeyType keyType) - { wxASSERT( m_count==0 ); m_keyType = keyType; } - -#ifdef wxLIST_COMPATIBILITY - // compatibility methods from old wxList - wxDEPRECATED( int Number() const ); // use GetCount instead. - wxDEPRECATED( wxNode *First() const ); // use GetFirst - wxDEPRECATED( wxNode *Last() const ); // use GetLast - wxDEPRECATED( wxNode *Nth(size_t n) const ); // use Item - - // kludge for typesafe list migration in core classes. - wxDEPRECATED( operator wxList&() const ); -#endif // wxLIST_COMPATIBILITY - -protected: - - // all methods here are "overloaded" in derived classes to provide compile - // time type checking - - // create a node for the list of this type - virtual wxNodeBase *CreateNode(wxNodeBase *prev, wxNodeBase *next, - void *data, - const wxListKey& key = wxDefaultListKey) = 0; - - - // ctors - // from an array - wxListBase(size_t count, void *elements[]); - // from a sequence of objects - wxListBase(void *object, ... /* terminate with NULL */); - -protected: - void Assign(const wxListBase& list) - { Clear(); DoCopy(list); } - - // get list head/tail - wxNodeBase *GetFirst() const { return m_nodeFirst; } - wxNodeBase *GetLast() const { return m_nodeLast; } - - // by (0-based) index - wxNodeBase *Item(size_t index) const; - - // get the list item's data - void *operator[](size_t n) const - { - wxNodeBase *node = Item(n); - - return node ? node->GetData() : NULL; - } - - // operations - // append to end of list - wxNodeBase *Prepend(void *object) - { return (wxNodeBase *)wxListBase::Insert(object); } - // append to beginning of list - wxNodeBase *Append(void *object); - // insert a new item at the beginning of the list - wxNodeBase *Insert(void *object) - { return Insert(static_cast(NULL), object); } - // insert a new item at the given position - wxNodeBase *Insert(size_t pos, void *object) - { return pos == GetCount() ? Append(object) - : Insert(Item(pos), object); } - // insert before given node or at front of list if prev == NULL - wxNodeBase *Insert(wxNodeBase *prev, void *object); - - // keyed append - wxNodeBase *Append(long key, void *object); - wxNodeBase *Append(const wxString& key, void *object); - - // removes node from the list but doesn't delete it (returns pointer - // to the node or NULL if it wasn't found in the list) - wxNodeBase *DetachNode(wxNodeBase *node); - // delete element from list, returns false if node not found - bool DeleteNode(wxNodeBase *node); - // finds object pointer and deletes node (and object if DeleteContents - // is on), returns false if object not found - bool DeleteObject(void *object); - - // search (all return NULL if item not found) - // by data - wxNodeBase *Find(const void *object) const; - - // by key - wxNodeBase *Find(const wxListKey& key) const; - - // get 0-based index of object or wxNOT_FOUND - int IndexOf( void *object ) const; - - // this function allows the sorting of arbitrary lists by giving - // a function to compare two list elements. The list is sorted in place. - void Sort(const wxSortCompareFunction compfunc); - - // functions for iterating over the list - void *FirstThat(wxListIterateFunction func); - void ForEach(wxListIterateFunction func); - void *LastThat(wxListIterateFunction func); - - // for STL interface, "last" points to one after the last node - // of the controlled sequence (NULL for the end of the list) - void Reverse(); - void DeleteNodes(wxNodeBase* first, wxNodeBase* last); -private: - - // common part of all ctors - void Init(wxKeyType keyType = wxKEY_NONE); - - // helpers - // common part of copy ctor and assignment operator - void DoCopy(const wxListBase& list); - // common part of all Append()s - wxNodeBase *AppendCommon(wxNodeBase *node); - // free node's data and node itself - void DoDeleteNode(wxNodeBase *node); - - size_t m_count; // number of elements in the list - bool m_destroy; // destroy user data when deleting list items? - wxNodeBase *m_nodeFirst, // pointers to the head and tail of the list - *m_nodeLast; - - wxKeyType m_keyType; // type of our keys (may be wxKEY_NONE) -}; - -// ----------------------------------------------------------------------------- -// macros for definition of "template" list type -// ----------------------------------------------------------------------------- - -// and now some heavy magic... - -// declare a list type named 'name' and containing elements of type 'T *' -// (as a by product of macro expansion you also get wx##name##Node -// wxNode-derived type) -// -// implementation details: -// 1. We define _WX_LIST_ITEM_TYPE_##name typedef to save in it the item type -// for the list of given type - this allows us to pass only the list name -// to WX_DEFINE_LIST() even if it needs both the name and the type -// -// 2. We redefine all non-type-safe wxList functions with type-safe versions -// which don't take any space (everything is inline), but bring compile -// time error checking. -// -// 3. The macro which is usually used (WX_DECLARE_LIST) is defined in terms of -// a more generic WX_DECLARE_LIST_2 macro which, in turn, uses the most -// generic WX_DECLARE_LIST_3 one. The last macro adds a sometimes -// interesting capability to store polymorphic objects in the list and is -// particularly useful with, for example, "wxWindow *" list where the -// wxWindowBase pointers are put into the list, but wxWindow pointers are -// retrieved from it. -// -// 4. final hack is that WX_DECLARE_LIST_3 is defined in terms of -// WX_DECLARE_LIST_4 to allow defining classes without operator->() as -// it results in compiler warnings when this operator doesn't make sense -// (i.e. stored elements are not pointers) - -// common part of WX_DECLARE_LIST_3 and WX_DECLARE_LIST_PTR_3 -#define WX_DECLARE_LIST_4(T, Tbase, name, nodetype, classexp, ptrop) \ - typedef int (*wxSortFuncFor_##name)(const T **, const T **); \ - \ - classexp nodetype : public wxNodeBase \ - { \ - public: \ - nodetype(wxListBase *list = NULL, \ - nodetype *previous = NULL, \ - nodetype *next = NULL, \ - T *data = NULL, \ - const wxListKey& key = wxDefaultListKey) \ - : wxNodeBase(list, previous, next, data, key) { } \ - \ - nodetype *GetNext() const \ - { return (nodetype *)wxNodeBase::GetNext(); } \ - nodetype *GetPrevious() const \ - { return (nodetype *)wxNodeBase::GetPrevious(); } \ - \ - T *GetData() const \ - { return (T *)wxNodeBase::GetData(); } \ - void SetData(T *data) \ - { wxNodeBase::SetData(data); } \ - \ - protected: \ - virtual void DeleteData(); \ - \ - wxDECLARE_NO_COPY_CLASS(nodetype); \ - }; \ - \ - classexp name : public wxListBase \ - { \ - public: \ - typedef nodetype Node; \ - classexp compatibility_iterator \ - { \ - public: \ - compatibility_iterator(Node *ptr = NULL) : m_ptr(ptr) { } \ - \ - Node *operator->() const { return m_ptr; } \ - operator Node *() const { return m_ptr; } \ - \ - private: \ - Node *m_ptr; \ - }; \ - \ - name(wxKeyType keyType = wxKEY_NONE) : wxListBase(keyType) \ - { } \ - name(const name& list) : wxListBase(list.GetKeyType()) \ - { Assign(list); } \ - name(size_t count, T *elements[]) \ - : wxListBase(count, (void **)elements) { } \ - \ - name& operator=(const name& list) \ - { if (&list != this) Assign(list); return *this; } \ - \ - nodetype *GetFirst() const \ - { return (nodetype *)wxListBase::GetFirst(); } \ - nodetype *GetLast() const \ - { return (nodetype *)wxListBase::GetLast(); } \ - \ - nodetype *Item(size_t index) const \ - { return (nodetype *)wxListBase::Item(index); } \ - \ - T *operator[](size_t index) const \ - { \ - nodetype *node = Item(index); \ - return node ? (T*)(node->GetData()) : NULL; \ - } \ - \ - nodetype *Append(Tbase *object) \ - { return (nodetype *)wxListBase::Append(object); } \ - nodetype *Insert(Tbase *object) \ - { return (nodetype *)Insert(static_cast(NULL), \ - object); } \ - nodetype *Insert(size_t pos, Tbase *object) \ - { return (nodetype *)wxListBase::Insert(pos, object); } \ - nodetype *Insert(nodetype *prev, Tbase *object) \ - { return (nodetype *)wxListBase::Insert(prev, object); } \ - \ - nodetype *Append(long key, void *object) \ - { return (nodetype *)wxListBase::Append(key, object); } \ - nodetype *Append(const wxChar *key, void *object) \ - { return (nodetype *)wxListBase::Append(key, object); } \ - \ - nodetype *DetachNode(nodetype *node) \ - { return (nodetype *)wxListBase::DetachNode(node); } \ - bool DeleteNode(nodetype *node) \ - { return wxListBase::DeleteNode(node); } \ - bool DeleteObject(Tbase *object) \ - { return wxListBase::DeleteObject(object); } \ - void Erase(nodetype *it) \ - { DeleteNode(it); } \ - \ - nodetype *Find(const Tbase *object) const \ - { return (nodetype *)wxListBase::Find(object); } \ - \ - virtual nodetype *Find(const wxListKey& key) const \ - { return (nodetype *)wxListBase::Find(key); } \ - \ - bool Member(const Tbase *object) const \ - { return Find(object) != NULL; } \ - \ - int IndexOf(Tbase *object) const \ - { return wxListBase::IndexOf(object); } \ - \ - void Sort(wxSortCompareFunction func) \ - { wxListBase::Sort(func); } \ - void Sort(wxSortFuncFor_##name func) \ - { Sort((wxSortCompareFunction)func); } \ - \ - protected: \ - virtual wxNodeBase *CreateNode(wxNodeBase *prev, wxNodeBase *next, \ - void *data, \ - const wxListKey& key = wxDefaultListKey) \ - { \ - return new nodetype(this, \ - (nodetype *)prev, (nodetype *)next, \ - (T *)data, key); \ - } \ - /* STL interface */ \ - public: \ - typedef size_t size_type; \ - typedef int difference_type; \ - typedef T* value_type; \ - typedef Tbase* base_value_type; \ - typedef value_type& reference; \ - typedef const value_type& const_reference; \ - typedef base_value_type& base_reference; \ - typedef const base_value_type& const_base_reference; \ - \ - classexp iterator \ - { \ - typedef name list; \ - public: \ - typedef nodetype Node; \ - typedef iterator itor; \ - typedef T* value_type; \ - typedef value_type* ptr_type; \ - typedef value_type& reference; \ - \ - Node* m_node; \ - Node* m_init; \ - public: \ - typedef reference reference_type; \ - typedef ptr_type pointer_type; \ - \ - iterator(Node* node, Node* init) : m_node(node), m_init(init) {}\ - iterator() : m_node(NULL), m_init(NULL) { } \ - reference_type operator*() const \ - { return *(pointer_type)m_node->GetDataPtr(); } \ - ptrop \ - itor& operator++() \ - { \ - wxASSERT_MSG( m_node, wxT("uninitialized iterator") ); \ - m_node = m_node->GetNext(); \ - return *this; \ - } \ - const itor operator++(int) \ - { \ - itor tmp = *this; \ - wxASSERT_MSG( m_node, wxT("uninitialized iterator") ); \ - m_node = m_node->GetNext(); \ - return tmp; \ - } \ - itor& operator--() \ - { \ - m_node = m_node ? m_node->GetPrevious() : m_init; \ - return *this; \ - } \ - const itor operator--(int) \ - { \ - itor tmp = *this; \ - m_node = m_node ? m_node->GetPrevious() : m_init; \ - return tmp; \ - } \ - bool operator!=(const itor& it) const \ - { return it.m_node != m_node; } \ - bool operator==(const itor& it) const \ - { return it.m_node == m_node; } \ - }; \ - classexp const_iterator \ - { \ - typedef name list; \ - public: \ - typedef nodetype Node; \ - typedef T* value_type; \ - typedef const value_type& const_reference; \ - typedef const_iterator itor; \ - typedef value_type* ptr_type; \ - \ - Node* m_node; \ - Node* m_init; \ - public: \ - typedef const_reference reference_type; \ - typedef const ptr_type pointer_type; \ - \ - const_iterator(Node* node, Node* init) \ - : m_node(node), m_init(init) { } \ - const_iterator() : m_node(NULL), m_init(NULL) { } \ - const_iterator(const iterator& it) \ - : m_node(it.m_node), m_init(it.m_init) { } \ - reference_type operator*() const \ - { return *(pointer_type)m_node->GetDataPtr(); } \ - ptrop \ - itor& operator++() \ - { \ - wxASSERT_MSG( m_node, wxT("uninitialized iterator") ); \ - m_node = m_node->GetNext(); \ - return *this; \ - } \ - const itor operator++(int) \ - { \ - itor tmp = *this; \ - wxASSERT_MSG( m_node, wxT("uninitialized iterator") ); \ - m_node = m_node->GetNext(); \ - return tmp; \ - } \ - itor& operator--() \ - { \ - m_node = m_node ? m_node->GetPrevious() : m_init; \ - return *this; \ - } \ - const itor operator--(int) \ - { \ - itor tmp = *this; \ - m_node = m_node ? m_node->GetPrevious() : m_init; \ - return tmp; \ - } \ - bool operator!=(const itor& it) const \ - { return it.m_node != m_node; } \ - bool operator==(const itor& it) const \ - { return it.m_node == m_node; } \ - }; \ - classexp reverse_iterator \ - { \ - typedef name list; \ - public: \ - typedef nodetype Node; \ - typedef T* value_type; \ - typedef reverse_iterator itor; \ - typedef value_type* ptr_type; \ - typedef value_type& reference; \ - \ - Node* m_node; \ - Node* m_init; \ - public: \ - typedef reference reference_type; \ - typedef ptr_type pointer_type; \ - \ - reverse_iterator(Node* node, Node* init) \ - : m_node(node), m_init(init) { } \ - reverse_iterator() : m_node(NULL), m_init(NULL) { } \ - reference_type operator*() const \ - { return *(pointer_type)m_node->GetDataPtr(); } \ - ptrop \ - itor& operator++() \ - { m_node = m_node->GetPrevious(); return *this; } \ - const itor operator++(int) \ - { itor tmp = *this; m_node = m_node->GetPrevious(); return tmp; }\ - itor& operator--() \ - { m_node = m_node ? m_node->GetNext() : m_init; return *this; } \ - const itor operator--(int) \ - { \ - itor tmp = *this; \ - m_node = m_node ? m_node->GetNext() : m_init; \ - return tmp; \ - } \ - bool operator!=(const itor& it) const \ - { return it.m_node != m_node; } \ - bool operator==(const itor& it) const \ - { return it.m_node == m_node; } \ - }; \ - classexp const_reverse_iterator \ - { \ - typedef name list; \ - public: \ - typedef nodetype Node; \ - typedef T* value_type; \ - typedef const_reverse_iterator itor; \ - typedef value_type* ptr_type; \ - typedef const value_type& const_reference; \ - \ - Node* m_node; \ - Node* m_init; \ - public: \ - typedef const_reference reference_type; \ - typedef const ptr_type pointer_type; \ - \ - const_reverse_iterator(Node* node, Node* init) \ - : m_node(node), m_init(init) { } \ - const_reverse_iterator() : m_node(NULL), m_init(NULL) { } \ - const_reverse_iterator(const reverse_iterator& it) \ - : m_node(it.m_node), m_init(it.m_init) { } \ - reference_type operator*() const \ - { return *(pointer_type)m_node->GetDataPtr(); } \ - ptrop \ - itor& operator++() \ - { m_node = m_node->GetPrevious(); return *this; } \ - const itor operator++(int) \ - { itor tmp = *this; m_node = m_node->GetPrevious(); return tmp; }\ - itor& operator--() \ - { m_node = m_node ? m_node->GetNext() : m_init; return *this;}\ - const itor operator--(int) \ - { \ - itor tmp = *this; \ - m_node = m_node ? m_node->GetNext() : m_init; \ - return tmp; \ - } \ - bool operator!=(const itor& it) const \ - { return it.m_node != m_node; } \ - bool operator==(const itor& it) const \ - { return it.m_node == m_node; } \ - }; \ - \ - wxEXPLICIT name(size_type n, const_reference v = value_type()) \ - { assign(n, v); } \ - name(const const_iterator& first, const const_iterator& last) \ - { assign(first, last); } \ - iterator begin() { return iterator(GetFirst(), GetLast()); } \ - const_iterator begin() const \ - { return const_iterator(GetFirst(), GetLast()); } \ - iterator end() { return iterator(NULL, GetLast()); } \ - const_iterator end() const { return const_iterator(NULL, GetLast()); }\ - reverse_iterator rbegin() \ - { return reverse_iterator(GetLast(), GetFirst()); } \ - const_reverse_iterator rbegin() const \ - { return const_reverse_iterator(GetLast(), GetFirst()); } \ - reverse_iterator rend() { return reverse_iterator(NULL, GetFirst()); }\ - const_reverse_iterator rend() const \ - { return const_reverse_iterator(NULL, GetFirst()); } \ - void resize(size_type n, value_type v = value_type()) \ - { \ - while (n < size()) \ - pop_back(); \ - while (n > size()) \ - push_back(v); \ - } \ - size_type size() const { return GetCount(); } \ - size_type max_size() const { return INT_MAX; } \ - bool empty() const { return IsEmpty(); } \ - reference front() { return *begin(); } \ - const_reference front() const { return *begin(); } \ - reference back() { iterator tmp = end(); return *--tmp; } \ - const_reference back() const { const_iterator tmp = end(); return *--tmp; }\ - void push_front(const_reference v = value_type()) \ - { Insert(GetFirst(), (const_base_reference)v); } \ - void pop_front() { DeleteNode(GetFirst()); } \ - void push_back(const_reference v = value_type()) \ - { Append((const_base_reference)v); } \ - void pop_back() { DeleteNode(GetLast()); } \ - void assign(const_iterator first, const const_iterator& last) \ - { \ - clear(); \ - for(; first != last; ++first) \ - Append((const_base_reference)*first); \ - } \ - void assign(size_type n, const_reference v = value_type()) \ - { \ - clear(); \ - for(size_type i = 0; i < n; ++i) \ - Append((const_base_reference)v); \ - } \ - iterator insert(const iterator& it, const_reference v) \ - { \ - if ( it == end() ) \ - { \ - Append((const_base_reference)v); \ - /* \ - note that this is the new end(), the old one was \ - invalidated by the Append() call, and this is why we \ - can't use the same code as in the normal case below \ - */ \ - iterator itins(end()); \ - return --itins; \ - } \ - else \ - { \ - Insert(it.m_node, (const_base_reference)v); \ - iterator itins(it); \ - return --itins; \ - } \ - } \ - void insert(const iterator& it, size_type n, const_reference v) \ - { \ - for(size_type i = 0; i < n; ++i) \ - insert(it, v); \ - } \ - void insert(const iterator& it, \ - const_iterator first, const const_iterator& last) \ - { \ - for(; first != last; ++first) \ - insert(it, *first); \ - } \ - iterator erase(const iterator& it) \ - { \ - iterator next = iterator(it.m_node->GetNext(), GetLast()); \ - DeleteNode(it.m_node); return next; \ - } \ - iterator erase(const iterator& first, const iterator& last) \ - { \ - iterator next = last; \ - if ( next != end() ) \ - ++next; \ - DeleteNodes(first.m_node, last.m_node); \ - return next; \ - } \ - void clear() { Clear(); } \ - void splice(const iterator& it, name& l, const iterator& first, const iterator& last)\ - { insert(it, first, last); l.erase(first, last); } \ - void splice(const iterator& it, name& l) \ - { splice(it, l, l.begin(), l.end() ); } \ - void splice(const iterator& it, name& l, const iterator& first) \ - { \ - if ( it != first ) \ - { \ - insert(it, *first); \ - l.erase(first); \ - } \ - } \ - void remove(const_reference v) \ - { DeleteObject((const_base_reference)v); } \ - void reverse() \ - { Reverse(); } \ - /* void swap(name& l) \ - { \ - { size_t t = m_count; m_count = l.m_count; l.m_count = t; } \ - { bool t = m_destroy; m_destroy = l.m_destroy; l.m_destroy = t; }\ - { wxNodeBase* t = m_nodeFirst; m_nodeFirst = l.m_nodeFirst; l.m_nodeFirst = t; }\ - { wxNodeBase* t = m_nodeLast; m_nodeLast = l.m_nodeLast; l.m_nodeLast = t; }\ - { wxKeyType t = m_keyType; m_keyType = l.m_keyType; l.m_keyType = t; }\ - } */ \ - } - -#define WX_LIST_PTROP \ - pointer_type operator->() const \ - { return (pointer_type)m_node->GetDataPtr(); } -#define WX_LIST_PTROP_NONE - -#define WX_DECLARE_LIST_3(T, Tbase, name, nodetype, classexp) \ - WX_DECLARE_LIST_4(T, Tbase, name, nodetype, classexp, WX_LIST_PTROP_NONE) -#define WX_DECLARE_LIST_PTR_3(T, Tbase, name, nodetype, classexp) \ - WX_DECLARE_LIST_4(T, Tbase, name, nodetype, classexp, WX_LIST_PTROP) - -#define WX_DECLARE_LIST_2(elementtype, listname, nodename, classexp) \ - WX_DECLARE_LIST_3(elementtype, elementtype, listname, nodename, classexp) -#define WX_DECLARE_LIST_PTR_2(elementtype, listname, nodename, classexp) \ - WX_DECLARE_LIST_PTR_3(elementtype, elementtype, listname, nodename, classexp) - -#define WX_DECLARE_LIST(elementtype, listname) \ - typedef elementtype _WX_LIST_ITEM_TYPE_##listname; \ - WX_DECLARE_LIST_2(elementtype, listname, wx##listname##Node, class) -#define WX_DECLARE_LIST_PTR(elementtype, listname) \ - typedef elementtype _WX_LIST_ITEM_TYPE_##listname; \ - WX_DECLARE_LIST_PTR_2(elementtype, listname, wx##listname##Node, class) - -#define WX_DECLARE_LIST_WITH_DECL(elementtype, listname, decl) \ - typedef elementtype _WX_LIST_ITEM_TYPE_##listname; \ - WX_DECLARE_LIST_2(elementtype, listname, wx##listname##Node, decl) - -#define WX_DECLARE_EXPORTED_LIST(elementtype, listname) \ - WX_DECLARE_LIST_WITH_DECL(elementtype, listname, class WXDLLIMPEXP_CORE) - -#define WX_DECLARE_EXPORTED_LIST_PTR(elementtype, listname) \ - typedef elementtype _WX_LIST_ITEM_TYPE_##listname; \ - WX_DECLARE_LIST_PTR_2(elementtype, listname, wx##listname##Node, class WXDLLIMPEXP_CORE) - -#define WX_DECLARE_USER_EXPORTED_LIST(elementtype, listname, usergoo) \ - typedef elementtype _WX_LIST_ITEM_TYPE_##listname; \ - WX_DECLARE_LIST_2(elementtype, listname, wx##listname##Node, class usergoo) -#define WX_DECLARE_USER_EXPORTED_LIST_PTR(elementtype, listname, usergoo) \ - typedef elementtype _WX_LIST_ITEM_TYPE_##listname; \ - WX_DECLARE_LIST_PTR_2(elementtype, listname, wx##listname##Node, class usergoo) - -// this macro must be inserted in your program after -// #include "wx/listimpl.cpp" -#define WX_DEFINE_LIST(name) "don't forget to include listimpl.cpp!" - -#define WX_DEFINE_EXPORTED_LIST(name) WX_DEFINE_LIST(name) -#define WX_DEFINE_USER_EXPORTED_LIST(name) WX_DEFINE_LIST(name) - -#endif // !wxUSE_STD_CONTAINERS - -// ============================================================================ -// now we can define classes 100% compatible with the old ones -// ============================================================================ - -// ---------------------------------------------------------------------------- -// commonly used list classes -// ---------------------------------------------------------------------------- - -#if defined(wxLIST_COMPATIBILITY) - -// inline compatibility functions - -#if !wxUSE_STD_CONTAINERS - -// ---------------------------------------------------------------------------- -// wxNodeBase deprecated methods -// ---------------------------------------------------------------------------- - -inline wxNode *wxNodeBase::Next() const { return (wxNode *)GetNext(); } -inline wxNode *wxNodeBase::Previous() const { return (wxNode *)GetPrevious(); } -inline wxObject *wxNodeBase::Data() const { return (wxObject *)GetData(); } - -// ---------------------------------------------------------------------------- -// wxListBase deprecated methods -// ---------------------------------------------------------------------------- - -inline int wxListBase::Number() const { return (int)GetCount(); } -inline wxNode *wxListBase::First() const { return (wxNode *)GetFirst(); } -inline wxNode *wxListBase::Last() const { return (wxNode *)GetLast(); } -inline wxNode *wxListBase::Nth(size_t n) const { return (wxNode *)Item(n); } -inline wxListBase::operator wxList&() const { return *(wxList*)this; } - -#endif - -// define this to make a lot of noise about use of the old wxList classes. -//#define wxWARN_COMPAT_LIST_USE - -// ---------------------------------------------------------------------------- -// wxList compatibility class: in fact, it's a list of wxObjects -// ---------------------------------------------------------------------------- - -WX_DECLARE_LIST_2(wxObject, wxObjectList, wxObjectListNode, - class WXDLLIMPEXP_BASE); - -class WXDLLIMPEXP_BASE wxList : public wxObjectList -{ -public: -#if defined(wxWARN_COMPAT_LIST_USE) && !wxUSE_STD_CONTAINERS - wxList() { } - wxDEPRECATED( wxList(int key_type) ); -#elif !wxUSE_STD_CONTAINERS - wxList(int key_type = wxKEY_NONE); -#endif - - // this destructor is required for Darwin - ~wxList() { } - -#if !wxUSE_STD_CONTAINERS - wxList& operator=(const wxList& list) - { if (&list != this) Assign(list); return *this; } - - // compatibility methods - void Sort(wxSortCompareFunction compfunc) { wxListBase::Sort(compfunc); } -#endif // !wxUSE_STD_CONTAINERS - - template - wxVector AsVector() const - { - wxVector vector(size()); - size_t i = 0; - - for ( const_iterator it = begin(); it != end(); ++it ) - { - vector[i++] = static_cast(*it); - } - - return vector; - } - -}; - -#if !wxUSE_STD_CONTAINERS - -// ----------------------------------------------------------------------------- -// wxStringList class for compatibility with the old code -// ----------------------------------------------------------------------------- -WX_DECLARE_LIST_2(wxChar, wxStringListBase, wxStringListNode, class WXDLLIMPEXP_BASE); - -class WXDLLIMPEXP_BASE wxStringList : public wxStringListBase -{ -public: - // ctors and such - // default -#ifdef wxWARN_COMPAT_LIST_USE - wxStringList(); - wxDEPRECATED( wxStringList(const wxChar *first ...) ); // FIXME-UTF8 -#else - wxStringList(); - wxStringList(const wxChar *first ...); // FIXME-UTF8 -#endif - - // copying the string list: the strings are copied, too (extremely - // inefficient!) - wxStringList(const wxStringList& other) : wxStringListBase() { DeleteContents(true); DoCopy(other); } - wxStringList& operator=(const wxStringList& other) - { - if (&other != this) - { - Clear(); - DoCopy(other); - } - return *this; - } - - // operations - // makes a copy of the string - wxNode *Add(const wxChar *s); - - // Append to beginning of list - wxNode *Prepend(const wxChar *s); - - bool Delete(const wxChar *s); - - wxChar **ListToArray(bool new_copies = false) const; - bool Member(const wxChar *s) const; - - // alphabetic sort - void Sort(); - -private: - void DoCopy(const wxStringList&); // common part of copy ctor and operator= -}; - -#else // if wxUSE_STD_CONTAINERS - -WX_DECLARE_LIST_XO(wxString, wxStringListBase, class WXDLLIMPEXP_BASE); - -class WXDLLIMPEXP_BASE wxStringList : public wxStringListBase -{ -public: - compatibility_iterator Append(wxChar* s) - { wxString tmp = s; delete[] s; return wxStringListBase::Append(tmp); } - compatibility_iterator Insert(wxChar* s) - { wxString tmp = s; delete[] s; return wxStringListBase::Insert(tmp); } - compatibility_iterator Insert(size_t pos, wxChar* s) - { - wxString tmp = s; - delete[] s; - return wxStringListBase::Insert(pos, tmp); - } - compatibility_iterator Add(const wxChar* s) - { push_back(s); return GetLast(); } - compatibility_iterator Prepend(const wxChar* s) - { push_front(s); return GetFirst(); } -}; - -#endif // wxUSE_STD_CONTAINERS - -#endif // wxLIST_COMPATIBILITY - -// delete all list elements -// -// NB: the class declaration of the list elements must be visible from the -// place where you use this macro, otherwise the proper destructor may not -// be called (a decent compiler should give a warning about it, but don't -// count on it)! -#define WX_CLEAR_LIST(type, list) \ - { \ - type::iterator it, en; \ - for( it = (list).begin(), en = (list).end(); it != en; ++it ) \ - delete *it; \ - (list).clear(); \ - } - -// append all element of one list to another one -#define WX_APPEND_LIST(list, other) \ - { \ - wxList::compatibility_iterator node = other->GetFirst(); \ - while ( node ) \ - { \ - (list)->push_back(node->GetData()); \ - node = node->GetNext(); \ - } \ - } - -#endif // _WX_LISTH__ diff --git a/Externals/wxWidgets3/include/wx/listbase.h b/Externals/wxWidgets3/include/wx/listbase.h deleted file mode 100644 index 1c79de0084..0000000000 --- a/Externals/wxWidgets3/include/wx/listbase.h +++ /dev/null @@ -1,633 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/listbase.h -// Purpose: wxListCtrl class -// Author: Vadim Zeitlin -// Modified by: -// Created: 04.12.99 -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_LISTBASE_H_BASE_ -#define _WX_LISTBASE_H_BASE_ - -#include "wx/colour.h" -#include "wx/font.h" -#include "wx/gdicmn.h" -#include "wx/event.h" -#include "wx/control.h" -#include "wx/systhemectrl.h" - -class WXDLLIMPEXP_FWD_CORE wxImageList; - -// ---------------------------------------------------------------------------- -// types -// ---------------------------------------------------------------------------- - -// type of compare function for wxListCtrl sort operation -typedef -int (wxCALLBACK *wxListCtrlCompare)(wxIntPtr item1, wxIntPtr item2, wxIntPtr sortData); - -// ---------------------------------------------------------------------------- -// wxListCtrl constants -// ---------------------------------------------------------------------------- - -// style flags -#define wxLC_VRULES 0x0001 -#define wxLC_HRULES 0x0002 - -#define wxLC_ICON 0x0004 -#define wxLC_SMALL_ICON 0x0008 -#define wxLC_LIST 0x0010 -#define wxLC_REPORT 0x0020 - -#define wxLC_ALIGN_TOP 0x0040 -#define wxLC_ALIGN_LEFT 0x0080 -#define wxLC_AUTOARRANGE 0x0100 -#define wxLC_VIRTUAL 0x0200 -#define wxLC_EDIT_LABELS 0x0400 -#define wxLC_NO_HEADER 0x0800 -#define wxLC_NO_SORT_HEADER 0x1000 -#define wxLC_SINGLE_SEL 0x2000 -#define wxLC_SORT_ASCENDING 0x4000 -#define wxLC_SORT_DESCENDING 0x8000 - -#define wxLC_MASK_TYPE (wxLC_ICON | wxLC_SMALL_ICON | wxLC_LIST | wxLC_REPORT) -#define wxLC_MASK_ALIGN (wxLC_ALIGN_TOP | wxLC_ALIGN_LEFT) -#define wxLC_MASK_SORT (wxLC_SORT_ASCENDING | wxLC_SORT_DESCENDING) - -// for compatibility only -#define wxLC_USER_TEXT wxLC_VIRTUAL - -// Omitted because -// (a) too much detail -// (b) not enough style flags -// (c) not implemented anyhow in the generic version -// -// #define wxLC_NO_SCROLL -// #define wxLC_NO_LABEL_WRAP -// #define wxLC_OWNERDRAW_FIXED -// #define wxLC_SHOW_SEL_ALWAYS - -// Mask flags to tell app/GUI what fields of wxListItem are valid -#define wxLIST_MASK_STATE 0x0001 -#define wxLIST_MASK_TEXT 0x0002 -#define wxLIST_MASK_IMAGE 0x0004 -#define wxLIST_MASK_DATA 0x0008 -#define wxLIST_SET_ITEM 0x0010 -#define wxLIST_MASK_WIDTH 0x0020 -#define wxLIST_MASK_FORMAT 0x0040 - -// State flags for indicating the state of an item -#define wxLIST_STATE_DONTCARE 0x0000 -#define wxLIST_STATE_DROPHILITED 0x0001 // MSW only -#define wxLIST_STATE_FOCUSED 0x0002 -#define wxLIST_STATE_SELECTED 0x0004 -#define wxLIST_STATE_CUT 0x0008 // MSW only -#define wxLIST_STATE_DISABLED 0x0010 // Not used -#define wxLIST_STATE_FILTERED 0x0020 // Not used -#define wxLIST_STATE_INUSE 0x0040 // Not used -#define wxLIST_STATE_PICKED 0x0080 // Not used -#define wxLIST_STATE_SOURCE 0x0100 // Not used - -// Hit test flags, used in HitTest -#define wxLIST_HITTEST_ABOVE 0x0001 // Above the client area. -#define wxLIST_HITTEST_BELOW 0x0002 // Below the client area. -#define wxLIST_HITTEST_NOWHERE 0x0004 // In the client area but below the last item. -#define wxLIST_HITTEST_ONITEMICON 0x0020 // On the bitmap associated with an item. -#define wxLIST_HITTEST_ONITEMLABEL 0x0080 // On the label (string) associated with an item. -#define wxLIST_HITTEST_ONITEMRIGHT 0x0100 // In the area to the right of an item. -#define wxLIST_HITTEST_ONITEMSTATEICON 0x0200 // On the state icon for a tree view item that is in a user-defined state. -#define wxLIST_HITTEST_TOLEFT 0x0400 // To the left of the client area. -#define wxLIST_HITTEST_TORIGHT 0x0800 // To the right of the client area. - -#define wxLIST_HITTEST_ONITEM (wxLIST_HITTEST_ONITEMICON | wxLIST_HITTEST_ONITEMLABEL | wxLIST_HITTEST_ONITEMSTATEICON) - -// GetSubItemRect constants -#define wxLIST_GETSUBITEMRECT_WHOLEITEM -1l - -// Flags for GetNextItem (MSW only except wxLIST_NEXT_ALL) -enum -{ - wxLIST_NEXT_ABOVE, // Searches for an item above the specified item - wxLIST_NEXT_ALL, // Searches for subsequent item by index - wxLIST_NEXT_BELOW, // Searches for an item below the specified item - wxLIST_NEXT_LEFT, // Searches for an item to the left of the specified item - wxLIST_NEXT_RIGHT // Searches for an item to the right of the specified item -}; - -// Alignment flags for Arrange (MSW only except wxLIST_ALIGN_LEFT) -enum -{ - wxLIST_ALIGN_DEFAULT, - wxLIST_ALIGN_LEFT, - wxLIST_ALIGN_TOP, - wxLIST_ALIGN_SNAP_TO_GRID -}; - -// Column format (MSW only except wxLIST_FORMAT_LEFT) -enum wxListColumnFormat -{ - wxLIST_FORMAT_LEFT, - wxLIST_FORMAT_RIGHT, - wxLIST_FORMAT_CENTRE, - wxLIST_FORMAT_CENTER = wxLIST_FORMAT_CENTRE -}; - -// Autosize values for SetColumnWidth -enum -{ - wxLIST_AUTOSIZE = -1, - wxLIST_AUTOSIZE_USEHEADER = -2 // partly supported by generic version -}; - -// Flag values for GetItemRect -enum -{ - wxLIST_RECT_BOUNDS, - wxLIST_RECT_ICON, - wxLIST_RECT_LABEL -}; - -// Flag values for FindItem (MSW only) -enum -{ - wxLIST_FIND_UP, - wxLIST_FIND_DOWN, - wxLIST_FIND_LEFT, - wxLIST_FIND_RIGHT -}; - -// ---------------------------------------------------------------------------- -// wxListItemAttr: a structure containing the visual attributes of an item -// ---------------------------------------------------------------------------- - -// TODO: this should be renamed to wxItemAttr or something general like this -// and used as base class for wxTextAttr which duplicates this class -// entirely currently -class WXDLLIMPEXP_CORE wxListItemAttr -{ -public: - // ctors - wxListItemAttr() { } - wxListItemAttr(const wxColour& colText, - const wxColour& colBack, - const wxFont& font) - : m_colText(colText), m_colBack(colBack), m_font(font) - { - } - - // default copy ctor, assignment operator and dtor are ok - - - // setters - void SetTextColour(const wxColour& colText) { m_colText = colText; } - void SetBackgroundColour(const wxColour& colBack) { m_colBack = colBack; } - void SetFont(const wxFont& font) { m_font = font; } - - // accessors - bool HasTextColour() const { return m_colText.IsOk(); } - bool HasBackgroundColour() const { return m_colBack.IsOk(); } - bool HasFont() const { return m_font.IsOk(); } - - const wxColour& GetTextColour() const { return m_colText; } - const wxColour& GetBackgroundColour() const { return m_colBack; } - const wxFont& GetFont() const { return m_font; } - - - // this is almost like assignment operator except it doesn't overwrite the - // fields unset in the source attribute - void AssignFrom(const wxListItemAttr& source) - { - if ( source.HasTextColour() ) - SetTextColour(source.GetTextColour()); - if ( source.HasBackgroundColour() ) - SetBackgroundColour(source.GetBackgroundColour()); - if ( source.HasFont() ) - SetFont(source.GetFont()); - } - -private: - wxColour m_colText, - m_colBack; - wxFont m_font; -}; - -// ---------------------------------------------------------------------------- -// wxListItem: the item or column info, used to exchange data with wxListCtrl -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxListItem : public wxObject -{ -public: - wxListItem() { Init(); m_attr = NULL; } - wxListItem(const wxListItem& item) - : wxObject(), - m_mask(item.m_mask), - m_itemId(item.m_itemId), - m_col(item.m_col), - m_state(item.m_state), - m_stateMask(item.m_stateMask), - m_text(item.m_text), - m_image(item.m_image), - m_data(item.m_data), - m_format(item.m_format), - m_width(item.m_width), - m_attr(NULL) - { - // copy list item attributes - if ( item.HasAttributes() ) - m_attr = new wxListItemAttr(*item.GetAttributes()); - } - - wxListItem& operator=(const wxListItem& item) - { - if ( &item != this ) - { - m_mask = item.m_mask; - m_itemId = item.m_itemId; - m_col = item.m_col; - m_state = item.m_state; - m_stateMask = item.m_stateMask; - m_text = item.m_text; - m_image = item.m_image; - m_data = item.m_data; - m_format = item.m_format; - m_width = item.m_width; - m_attr = item.m_attr ? new wxListItemAttr(*item.m_attr) : NULL; - } - - return *this; - } - - virtual ~wxListItem() { delete m_attr; } - - // resetting - void Clear() { Init(); m_text.clear(); ClearAttributes(); } - void ClearAttributes() { if ( m_attr ) { delete m_attr; m_attr = NULL; } } - - // setters - void SetMask(long mask) - { m_mask = mask; } - void SetId(long id) - { m_itemId = id; } - void SetColumn(int col) - { m_col = col; } - void SetState(long state) - { m_mask |= wxLIST_MASK_STATE; m_state = state; m_stateMask |= state; } - void SetStateMask(long stateMask) - { m_stateMask = stateMask; } - void SetText(const wxString& text) - { m_mask |= wxLIST_MASK_TEXT; m_text = text; } - void SetImage(int image) - { m_mask |= wxLIST_MASK_IMAGE; m_image = image; } - void SetData(long data) - { m_mask |= wxLIST_MASK_DATA; m_data = data; } - void SetData(void *data) - { m_mask |= wxLIST_MASK_DATA; m_data = wxPtrToUInt(data); } - - void SetWidth(int width) - { m_mask |= wxLIST_MASK_WIDTH; m_width = width; } - void SetAlign(wxListColumnFormat align) - { m_mask |= wxLIST_MASK_FORMAT; m_format = align; } - - void SetTextColour(const wxColour& colText) - { Attributes().SetTextColour(colText); } - void SetBackgroundColour(const wxColour& colBack) - { Attributes().SetBackgroundColour(colBack); } - void SetFont(const wxFont& font) - { Attributes().SetFont(font); } - - // accessors - long GetMask() const { return m_mask; } - long GetId() const { return m_itemId; } - int GetColumn() const { return m_col; } - long GetState() const { return m_state & m_stateMask; } - const wxString& GetText() const { return m_text; } - int GetImage() const { return m_image; } - wxUIntPtr GetData() const { return m_data; } - - int GetWidth() const { return m_width; } - wxListColumnFormat GetAlign() const { return (wxListColumnFormat)m_format; } - - wxListItemAttr *GetAttributes() const { return m_attr; } - bool HasAttributes() const { return m_attr != NULL; } - - wxColour GetTextColour() const - { return HasAttributes() ? m_attr->GetTextColour() : wxNullColour; } - wxColour GetBackgroundColour() const - { return HasAttributes() ? m_attr->GetBackgroundColour() - : wxNullColour; } - wxFont GetFont() const - { return HasAttributes() ? m_attr->GetFont() : wxNullFont; } - - // this conversion is necessary to make old code using GetItem() to - // compile - operator long() const { return m_itemId; } - - // these members are public for compatibility - - long m_mask; // Indicates what fields are valid - long m_itemId; // The zero-based item position - int m_col; // Zero-based column, if in report mode - long m_state; // The state of the item - long m_stateMask;// Which flags of m_state are valid (uses same flags) - wxString m_text; // The label/header text - int m_image; // The zero-based index into an image list - wxUIntPtr m_data; // App-defined data - - // For columns only - int m_format; // left, right, centre - int m_width; // width of column - -protected: - // creates m_attr if we don't have it yet - wxListItemAttr& Attributes() - { - if ( !m_attr ) - m_attr = new wxListItemAttr; - - return *m_attr; - } - - void Init() - { - m_mask = 0; - m_itemId = -1; - m_col = 0; - m_state = 0; - m_stateMask = 0; - m_image = -1; - m_data = 0; - - m_format = wxLIST_FORMAT_CENTRE; - m_width = 0; - } - - wxListItemAttr *m_attr; // optional pointer to the items style - -private: - wxDECLARE_DYNAMIC_CLASS(wxListItem); -}; - -// ---------------------------------------------------------------------------- -// wxListCtrlBase: the base class for the main control itself. -// ---------------------------------------------------------------------------- - -// Unlike other base classes, this class doesn't currently define the API of -// the real control class but is just used for implementation convenience. We -// should define the public class functions as pure virtual here in the future -// however. -class WXDLLIMPEXP_CORE wxListCtrlBase : public wxSystemThemedControl -{ -public: - wxListCtrlBase() { } - - // Image list methods. - // ------------------- - - // Associate the given (possibly NULL to indicate that no images will be - // used) image list with the control. The ownership of the image list - // passes to the control, i.e. it will be deleted when the control itself - // is destroyed. - // - // The value of "which" must be one of wxIMAGE_LIST_{NORMAL,SMALL,STATE}. - virtual void AssignImageList(wxImageList* imageList, int which) = 0; - - // Same as AssignImageList() but the control does not delete the image list - // so it can be shared among several controls. - virtual void SetImageList(wxImageList* imageList, int which) = 0; - - // Return the currently used image list, may be NULL. - virtual wxImageList* GetImageList(int which) const = 0; - - - // Column-related methods. - // ----------------------- - - // All these methods can only be used in report view mode. - - // Appends a new column. - // - // Returns the index of the newly inserted column or -1 on error. - long AppendColumn(const wxString& heading, - wxListColumnFormat format = wxLIST_FORMAT_LEFT, - int width = -1); - - // Add a new column to the control at the position "col". - // - // Returns the index of the newly inserted column or -1 on error. - long InsertColumn(long col, const wxListItem& info); - long InsertColumn(long col, - const wxString& heading, - int format = wxLIST_FORMAT_LEFT, - int width = wxLIST_AUTOSIZE); - - // Delete the given or all columns. - virtual bool DeleteColumn(int col) = 0; - virtual bool DeleteAllColumns() = 0; - - // Return the current number of columns. - virtual int GetColumnCount() const = 0; - - // Get or update information about the given column. Set item mask to - // indicate the fields to retrieve or change. - // - // Returns false on error, e.g. if the column index is invalid. - virtual bool GetColumn(int col, wxListItem& item) const = 0; - virtual bool SetColumn(int col, const wxListItem& item) = 0; - - // Convenient wrappers for the above methods which get or update just the - // column width. - virtual int GetColumnWidth(int col) const = 0; - virtual bool SetColumnWidth(int col, int width) = 0; - - // return the attribute for the item (may return NULL if none) - virtual wxListItemAttr *OnGetItemAttr(long item) const; - - // Other miscellaneous accessors. - // ------------------------------ - - // Convenient functions for testing the list control mode: - bool InReportView() const { return HasFlag(wxLC_REPORT); } - bool IsVirtual() const { return HasFlag(wxLC_VIRTUAL); } - - // Enable or disable beep when incremental match doesn't find any item. - // Only implemented in the generic version currently. - virtual void EnableBellOnNoMatch(bool WXUNUSED(on) = true) { } - - void EnableAlternateRowColours(bool enable = true); - void SetAlternateRowColour(const wxColour& colour); - wxColour GetAlternateRowColour() const { return m_alternateRowColour.GetBackgroundColour(); } - - // Checkboxes support: only implemented in wxMSW currently. - virtual bool HasCheckboxes() const { return false; } - virtual bool EnableCheckboxes(bool WXUNUSED(enable) = true) { return false; } - virtual bool IsItemChecked(long WXUNUSED(item)) const { return false; } - virtual void CheckItem(long WXUNUSED(item), bool WXUNUSED(check)) { } - -protected: - // Real implementations methods to which our public forwards. - virtual long DoInsertColumn(long col, const wxListItem& info) = 0; - - // Overridden methods of the base class. - virtual wxSize DoGetBestClientSize() const wxOVERRIDE; - -private: - // user defined color to draw row lines, may be invalid - wxListItemAttr m_alternateRowColour; -}; - -// ---------------------------------------------------------------------------- -// wxListEvent - the event class for the wxListCtrl notifications -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxListEvent : public wxNotifyEvent -{ -public: - wxListEvent(wxEventType commandType = wxEVT_NULL, int winid = 0) - : wxNotifyEvent(commandType, winid) - , m_code(-1) - , m_oldItemIndex(-1) - , m_itemIndex(-1) - , m_col(-1) - , m_pointDrag() - , m_item() - , m_editCancelled(false) - { } - - wxListEvent(const wxListEvent& event) - : wxNotifyEvent(event) - , m_code(event.m_code) - , m_oldItemIndex(event.m_oldItemIndex) - , m_itemIndex(event.m_itemIndex) - , m_col(event.m_col) - , m_pointDrag(event.m_pointDrag) - , m_item(event.m_item) - , m_editCancelled(event.m_editCancelled) - { } - - int GetKeyCode() const { return m_code; } - long GetIndex() const { return m_itemIndex; } - int GetColumn() const { return m_col; } - wxPoint GetPoint() const { return m_pointDrag; } - const wxString& GetLabel() const { return m_item.m_text; } - const wxString& GetText() const { return m_item.m_text; } - int GetImage() const { return m_item.m_image; } - wxUIntPtr GetData() const { return m_item.m_data; } - long GetMask() const { return m_item.m_mask; } - const wxListItem& GetItem() const { return m_item; } - - // for wxEVT_LIST_CACHE_HINT only - long GetCacheFrom() const { return m_oldItemIndex; } - long GetCacheTo() const { return m_itemIndex; } - - // was label editing canceled? (for wxEVT_LIST_END_LABEL_EDIT only) - bool IsEditCancelled() const { return m_editCancelled; } - void SetEditCanceled(bool editCancelled) { m_editCancelled = editCancelled; } - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxListEvent(*this); } - -//protected: -- not for backwards compatibility - int m_code; - long m_oldItemIndex; // only for wxEVT_LIST_CACHE_HINT - long m_itemIndex; - int m_col; - wxPoint m_pointDrag; - - wxListItem m_item; - -protected: - bool m_editCancelled; - -private: - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxListEvent); -}; - -// ---------------------------------------------------------------------------- -// wxListCtrl event macros -// ---------------------------------------------------------------------------- - -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_LIST_BEGIN_DRAG, wxListEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_LIST_BEGIN_RDRAG, wxListEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_LIST_BEGIN_LABEL_EDIT, wxListEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_LIST_END_LABEL_EDIT, wxListEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_LIST_DELETE_ITEM, wxListEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_LIST_DELETE_ALL_ITEMS, wxListEvent ); - -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_LIST_ITEM_SELECTED, wxListEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_LIST_ITEM_DESELECTED, wxListEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_LIST_KEY_DOWN, wxListEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_LIST_INSERT_ITEM, wxListEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_LIST_COL_CLICK, wxListEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_LIST_ITEM_RIGHT_CLICK, wxListEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_LIST_ITEM_MIDDLE_CLICK, wxListEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_LIST_ITEM_ACTIVATED, wxListEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_LIST_CACHE_HINT, wxListEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_LIST_COL_RIGHT_CLICK, wxListEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_LIST_COL_BEGIN_DRAG, wxListEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_LIST_COL_DRAGGING, wxListEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_LIST_COL_END_DRAG, wxListEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_LIST_ITEM_FOCUSED, wxListEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_LIST_ITEM_CHECKED, wxListEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_LIST_ITEM_UNCHECKED, wxListEvent ); - -typedef void (wxEvtHandler::*wxListEventFunction)(wxListEvent&); - -#define wxListEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxListEventFunction, func) - -#define wx__DECLARE_LISTEVT(evt, id, fn) \ - wx__DECLARE_EVT1(wxEVT_LIST_ ## evt, id, wxListEventHandler(fn)) - -#define EVT_LIST_BEGIN_DRAG(id, fn) wx__DECLARE_LISTEVT(BEGIN_DRAG, id, fn) -#define EVT_LIST_BEGIN_RDRAG(id, fn) wx__DECLARE_LISTEVT(BEGIN_RDRAG, id, fn) -#define EVT_LIST_BEGIN_LABEL_EDIT(id, fn) wx__DECLARE_LISTEVT(BEGIN_LABEL_EDIT, id, fn) -#define EVT_LIST_END_LABEL_EDIT(id, fn) wx__DECLARE_LISTEVT(END_LABEL_EDIT, id, fn) -#define EVT_LIST_DELETE_ITEM(id, fn) wx__DECLARE_LISTEVT(DELETE_ITEM, id, fn) -#define EVT_LIST_DELETE_ALL_ITEMS(id, fn) wx__DECLARE_LISTEVT(DELETE_ALL_ITEMS, id, fn) -#define EVT_LIST_KEY_DOWN(id, fn) wx__DECLARE_LISTEVT(KEY_DOWN, id, fn) -#define EVT_LIST_INSERT_ITEM(id, fn) wx__DECLARE_LISTEVT(INSERT_ITEM, id, fn) - -#define EVT_LIST_COL_CLICK(id, fn) wx__DECLARE_LISTEVT(COL_CLICK, id, fn) -#define EVT_LIST_COL_RIGHT_CLICK(id, fn) wx__DECLARE_LISTEVT(COL_RIGHT_CLICK, id, fn) -#define EVT_LIST_COL_BEGIN_DRAG(id, fn) wx__DECLARE_LISTEVT(COL_BEGIN_DRAG, id, fn) -#define EVT_LIST_COL_DRAGGING(id, fn) wx__DECLARE_LISTEVT(COL_DRAGGING, id, fn) -#define EVT_LIST_COL_END_DRAG(id, fn) wx__DECLARE_LISTEVT(COL_END_DRAG, id, fn) - -#define EVT_LIST_ITEM_SELECTED(id, fn) wx__DECLARE_LISTEVT(ITEM_SELECTED, id, fn) -#define EVT_LIST_ITEM_DESELECTED(id, fn) wx__DECLARE_LISTEVT(ITEM_DESELECTED, id, fn) -#define EVT_LIST_ITEM_RIGHT_CLICK(id, fn) wx__DECLARE_LISTEVT(ITEM_RIGHT_CLICK, id, fn) -#define EVT_LIST_ITEM_MIDDLE_CLICK(id, fn) wx__DECLARE_LISTEVT(ITEM_MIDDLE_CLICK, id, fn) -#define EVT_LIST_ITEM_ACTIVATED(id, fn) wx__DECLARE_LISTEVT(ITEM_ACTIVATED, id, fn) -#define EVT_LIST_ITEM_FOCUSED(id, fn) wx__DECLARE_LISTEVT(ITEM_FOCUSED, id, fn) -#define EVT_LIST_ITEM_CHECKED(id, fn) wx__DECLARE_LISTEVT(ITEM_CHECKED, id, fn) -#define EVT_LIST_ITEM_UNCHECKED(id, fn) wx__DECLARE_LISTEVT(ITEM_UNCHECKED, id, fn) - -#define EVT_LIST_CACHE_HINT(id, fn) wx__DECLARE_LISTEVT(CACHE_HINT, id, fn) - -// old wxEVT_COMMAND_* constants -#define wxEVT_COMMAND_LIST_BEGIN_DRAG wxEVT_LIST_BEGIN_DRAG -#define wxEVT_COMMAND_LIST_BEGIN_RDRAG wxEVT_LIST_BEGIN_RDRAG -#define wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT wxEVT_LIST_BEGIN_LABEL_EDIT -#define wxEVT_COMMAND_LIST_END_LABEL_EDIT wxEVT_LIST_END_LABEL_EDIT -#define wxEVT_COMMAND_LIST_DELETE_ITEM wxEVT_LIST_DELETE_ITEM -#define wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS wxEVT_LIST_DELETE_ALL_ITEMS -#define wxEVT_COMMAND_LIST_ITEM_SELECTED wxEVT_LIST_ITEM_SELECTED -#define wxEVT_COMMAND_LIST_ITEM_DESELECTED wxEVT_LIST_ITEM_DESELECTED -#define wxEVT_COMMAND_LIST_KEY_DOWN wxEVT_LIST_KEY_DOWN -#define wxEVT_COMMAND_LIST_INSERT_ITEM wxEVT_LIST_INSERT_ITEM -#define wxEVT_COMMAND_LIST_COL_CLICK wxEVT_LIST_COL_CLICK -#define wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK wxEVT_LIST_ITEM_RIGHT_CLICK -#define wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK wxEVT_LIST_ITEM_MIDDLE_CLICK -#define wxEVT_COMMAND_LIST_ITEM_ACTIVATED wxEVT_LIST_ITEM_ACTIVATED -#define wxEVT_COMMAND_LIST_CACHE_HINT wxEVT_LIST_CACHE_HINT -#define wxEVT_COMMAND_LIST_COL_RIGHT_CLICK wxEVT_LIST_COL_RIGHT_CLICK -#define wxEVT_COMMAND_LIST_COL_BEGIN_DRAG wxEVT_LIST_COL_BEGIN_DRAG -#define wxEVT_COMMAND_LIST_COL_DRAGGING wxEVT_LIST_COL_DRAGGING -#define wxEVT_COMMAND_LIST_COL_END_DRAG wxEVT_LIST_COL_END_DRAG -#define wxEVT_COMMAND_LIST_ITEM_FOCUSED wxEVT_LIST_ITEM_FOCUSED - - -#endif - // _WX_LISTCTRL_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/listbook.h b/Externals/wxWidgets3/include/wx/listbook.h deleted file mode 100644 index 5edfc0c6a8..0000000000 --- a/Externals/wxWidgets3/include/wx/listbook.h +++ /dev/null @@ -1,129 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/listbook.h -// Purpose: wxListbook: wxListCtrl and wxNotebook combination -// Author: Vadim Zeitlin -// Modified by: -// Created: 19.08.03 -// Copyright: (c) 2003 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_LISTBOOK_H_ -#define _WX_LISTBOOK_H_ - -#include "wx/defs.h" - -#if wxUSE_LISTBOOK - -#include "wx/bookctrl.h" -#include "wx/containr.h" - -class WXDLLIMPEXP_FWD_CORE wxListView; -class WXDLLIMPEXP_FWD_CORE wxListEvent; - -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_LISTBOOK_PAGE_CHANGED, wxBookCtrlEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_LISTBOOK_PAGE_CHANGING, wxBookCtrlEvent ); - -// wxListbook flags -#define wxLB_DEFAULT wxBK_DEFAULT -#define wxLB_TOP wxBK_TOP -#define wxLB_BOTTOM wxBK_BOTTOM -#define wxLB_LEFT wxBK_LEFT -#define wxLB_RIGHT wxBK_RIGHT -#define wxLB_ALIGN_MASK wxBK_ALIGN_MASK - -// ---------------------------------------------------------------------------- -// wxListbook -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxListbook : public wxNavigationEnabled -{ -public: - wxListbook() { } - - wxListbook(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxEmptyString) - { - (void)Create(parent, id, pos, size, style, name); - } - - // quasi ctor - bool Create(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxEmptyString); - - - // overridden base class methods - virtual bool SetPageText(size_t n, const wxString& strText) wxOVERRIDE; - virtual wxString GetPageText(size_t n) const wxOVERRIDE; - virtual int GetPageImage(size_t n) const wxOVERRIDE; - virtual bool SetPageImage(size_t n, int imageId) wxOVERRIDE; - virtual bool InsertPage(size_t n, - wxWindow *page, - const wxString& text, - bool bSelect = false, - int imageId = NO_IMAGE) wxOVERRIDE; - virtual int SetSelection(size_t n) wxOVERRIDE { return DoSetSelection(n, SetSelection_SendEvent); } - virtual int ChangeSelection(size_t n) wxOVERRIDE { return DoSetSelection(n); } - virtual int HitTest(const wxPoint& pt, long *flags = NULL) const wxOVERRIDE; - virtual void SetImageList(wxImageList *imageList) wxOVERRIDE; - - virtual bool DeleteAllPages() wxOVERRIDE; - - wxListView* GetListView() const { return (wxListView*)m_bookctrl; } - -protected: - virtual wxWindow *DoRemovePage(size_t page) wxOVERRIDE; - - void UpdateSelectedPage(size_t newsel) wxOVERRIDE; - - wxBookCtrlEvent* CreatePageChangingEvent() const wxOVERRIDE; - void MakeChangedEvent(wxBookCtrlEvent &event) wxOVERRIDE; - - // Get the correct wxListCtrl flags to use depending on our own flags. - long GetListCtrlFlags() const; - - // event handlers - void OnListSelected(wxListEvent& event); - void OnSize(wxSizeEvent& event); - -private: - // this should be called when we need to be relaid out - void UpdateSize(); - - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxListbook); -}; - -// ---------------------------------------------------------------------------- -// listbook event class and related stuff -// ---------------------------------------------------------------------------- - -// wxListbookEvent is obsolete and defined for compatibility only (notice that -// we use #define and not typedef to also keep compatibility with the existing -// code which forward declares it) -#define wxListbookEvent wxBookCtrlEvent -typedef wxBookCtrlEventFunction wxListbookEventFunction; -#define wxListbookEventHandler(func) wxBookCtrlEventHandler(func) - -#define EVT_LISTBOOK_PAGE_CHANGED(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_LISTBOOK_PAGE_CHANGED, winid, wxBookCtrlEventHandler(fn)) - -#define EVT_LISTBOOK_PAGE_CHANGING(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_LISTBOOK_PAGE_CHANGING, winid, wxBookCtrlEventHandler(fn)) - -// old wxEVT_COMMAND_* constants -#define wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED wxEVT_LISTBOOK_PAGE_CHANGED -#define wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING wxEVT_LISTBOOK_PAGE_CHANGING - -#endif // wxUSE_LISTBOOK - -#endif // _WX_LISTBOOK_H_ diff --git a/Externals/wxWidgets3/include/wx/listbox.h b/Externals/wxWidgets3/include/wx/listbox.h deleted file mode 100644 index 8f649e75a7..0000000000 --- a/Externals/wxWidgets3/include/wx/listbox.h +++ /dev/null @@ -1,168 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/listbox.h -// Purpose: wxListBox class interface -// Author: Vadim Zeitlin -// Modified by: -// Created: 22.10.99 -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_LISTBOX_H_BASE_ -#define _WX_LISTBOX_H_BASE_ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/defs.h" - -#if wxUSE_LISTBOX - -#include "wx/ctrlsub.h" // base class - -// forward declarations are enough here -class WXDLLIMPEXP_FWD_BASE wxArrayInt; -class WXDLLIMPEXP_FWD_BASE wxArrayString; - -// ---------------------------------------------------------------------------- -// global data -// ---------------------------------------------------------------------------- - -extern WXDLLIMPEXP_DATA_CORE(const char) wxListBoxNameStr[]; - -// ---------------------------------------------------------------------------- -// wxListBox interface is defined by the class wxListBoxBase -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxListBoxBase : public wxControlWithItems -{ -public: - wxListBoxBase() { } - virtual ~wxListBoxBase(); - - void InsertItems(unsigned int nItems, const wxString *items, unsigned int pos) - { Insert(nItems, items, pos); } - void InsertItems(const wxArrayString& items, unsigned int pos) - { Insert(items, pos); } - - // multiple selection logic - virtual bool IsSelected(int n) const = 0; - virtual void SetSelection(int n) wxOVERRIDE; - void SetSelection(int n, bool select) { DoSetSelection(n, select); } - void Deselect(int n) { DoSetSelection(n, false); } - void DeselectAll(int itemToLeaveSelected = -1); - - virtual bool SetStringSelection(const wxString& s, bool select); - virtual bool SetStringSelection(const wxString& s) - { - return SetStringSelection(s, true); - } - - // works for single as well as multiple selection listboxes (unlike - // GetSelection which only works for listboxes with single selection) - virtual int GetSelections(wxArrayInt& aSelections) const = 0; - - // set the specified item at the first visible item or scroll to max - // range. - void SetFirstItem(int n) { DoSetFirstItem(n); } - void SetFirstItem(const wxString& s); - - // ensures that the given item is visible scrolling the listbox if - // necessary - virtual void EnsureVisible(int n); - - virtual int GetTopItem() const { return wxNOT_FOUND; } - virtual int GetCountPerPage() const; - - // a combination of Append() and EnsureVisible(): appends the item to the - // listbox and ensures that it is visible i.e. not scrolled out of view - void AppendAndEnsureVisible(const wxString& s); - - // return true if the listbox allows multiple selection - bool HasMultipleSelection() const - { - return (m_windowStyle & wxLB_MULTIPLE) || - (m_windowStyle & wxLB_EXTENDED); - } - - // override wxItemContainer::IsSorted - virtual bool IsSorted() const wxOVERRIDE { return HasFlag( wxLB_SORT ); } - - // emulate selecting or deselecting the item event.GetInt() (depending on - // event.GetExtraLong()) - void Command(wxCommandEvent& event) wxOVERRIDE; - - // return the index of the item at this position or wxNOT_FOUND - int HitTest(const wxPoint& point) const { return DoListHitTest(point); } - int HitTest(int x, int y) const { return DoListHitTest(wxPoint(x, y)); } - - -protected: - virtual void DoSetFirstItem(int n) = 0; - - virtual void DoSetSelection(int n, bool select) = 0; - - // there is already wxWindow::DoHitTest() so call this one differently - virtual int DoListHitTest(const wxPoint& WXUNUSED(point)) const - { return wxNOT_FOUND; } - - // Helper for the code generating events in single selection mode: updates - // m_oldSelections and return true if the selection really changed. - // Otherwise just returns false. - bool DoChangeSingleSelection(int item); - - // Helper for generating events in multiple and extended mode: compare the - // current selections with the previously recorded ones (in - // m_oldSelections) and send the appropriate event if they differ, - // otherwise just return false. - bool CalcAndSendEvent(); - - // Send a listbox (de)selection or double click event. - // - // Returns true if the event was processed. - bool SendEvent(wxEventType evtType, int item, bool selected); - - // Array storing the indices of all selected items that we already notified - // the user code about for multi selection list boxes. - // - // For single selection list boxes, we reuse this array to store the single - // currently selected item, this is used by DoChangeSingleSelection(). - // - // TODO-OPT: wxSelectionStore would be more efficient for big list boxes. - wxArrayInt m_oldSelections; - - // Update m_oldSelections with currently selected items (does nothing in - // single selection mode on platforms other than MSW). - void UpdateOldSelections(); - - wxCoord GetLineHeight() const; - -private: - wxDECLARE_NO_COPY_CLASS(wxListBoxBase); -}; - -// ---------------------------------------------------------------------------- -// include the platform-specific class declaration -// ---------------------------------------------------------------------------- - -#if defined(__WXUNIVERSAL__) - #include "wx/univ/listbox.h" -#elif defined(__WXMSW__) - #include "wx/msw/listbox.h" -#elif defined(__WXMOTIF__) - #include "wx/motif/listbox.h" -#elif defined(__WXGTK20__) - #include "wx/gtk/listbox.h" -#elif defined(__WXGTK__) - #include "wx/gtk1/listbox.h" -#elif defined(__WXMAC__) - #include "wx/osx/listbox.h" -#elif defined(__WXQT__) - #include "wx/qt/listbox.h" -#endif - -#endif // wxUSE_LISTBOX - -#endif - // _WX_LISTBOX_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/listctrl.h b/Externals/wxWidgets3/include/wx/listctrl.h deleted file mode 100644 index dfb87816da..0000000000 --- a/Externals/wxWidgets3/include/wx/listctrl.h +++ /dev/null @@ -1,109 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/listctrl.h -// Purpose: wxListCtrl class -// Author: Vadim Zeitlin -// Modified by: -// Created: 04.12.99 -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_LISTCTRL_H_BASE_ -#define _WX_LISTCTRL_H_BASE_ - -#include "wx/defs.h" // headers should include this before first wxUSE_XXX check - -#if wxUSE_LISTCTRL - -#include "wx/listbase.h" - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -extern WXDLLIMPEXP_DATA_CORE(const char) wxListCtrlNameStr[]; - -// ---------------------------------------------------------------------------- -// include the wxListCtrl class declaration -// ---------------------------------------------------------------------------- - -#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) - #include "wx/msw/listctrl.h" -#elif defined(__WXQT__) && !defined(__WXUNIVERSAL__) - #include "wx/qt/listctrl.h" -#else - #include "wx/generic/listctrl.h" -#endif - -// ---------------------------------------------------------------------------- -// wxListView: a class which provides a better API for list control -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxListView : public wxListCtrl -{ -public: - wxListView() { } - wxListView( wxWindow *parent, - wxWindowID winid = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxLC_REPORT, - const wxValidator& validator = wxDefaultValidator, - const wxString &name = wxListCtrlNameStr) - { - Create(parent, winid, pos, size, style, validator, name); - } - - // focus/selection stuff - // --------------------- - - // [de]select an item - void Select(long n, bool on = true) - { - SetItemState(n, on ? wxLIST_STATE_SELECTED : 0, wxLIST_STATE_SELECTED); - } - - // focus and show the given item - void Focus(long index) - { - SetItemState(index, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED); - EnsureVisible(index); - } - - // get the currently focused item or -1 if none - long GetFocusedItem() const - { - return GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_FOCUSED); - } - - // get first and subsequent selected items, return -1 when no more - long GetNextSelected(long item) const - { return GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); } - long GetFirstSelected() const - { return GetNextSelected(-1); } - - // return true if the item is selected - bool IsSelected(long index) const - { return GetItemState(index, wxLIST_STATE_SELECTED) != 0; } - - // columns - // ------- - - void SetColumnImage(int col, int image) - { - wxListItem item; - item.SetMask(wxLIST_MASK_IMAGE); - item.SetImage(image); - SetColumn(col, item); - } - - void ClearColumnImage(int col) { SetColumnImage(col, -1); } - -private: - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxListView); -}; - -#endif // wxUSE_LISTCTRL - -#endif - // _WX_LISTCTRL_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/listimpl.cpp b/Externals/wxWidgets3/include/wx/listimpl.cpp deleted file mode 100644 index f3a4a1bdfe..0000000000 --- a/Externals/wxWidgets3/include/wx/listimpl.cpp +++ /dev/null @@ -1,35 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/listimpl.cpp -// Purpose: second-part of macro based implementation of template lists -// Author: Vadim Zeitlin -// Modified by: -// Created: 16/11/98 -// Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#if wxUSE_STD_CONTAINERS - -#undef WX_DEFINE_LIST -#define WX_DEFINE_LIST(name) \ - void _WX_LIST_HELPER_##name::DeleteFunction( _WX_LIST_ITEM_TYPE_##name X )\ - { \ - delete X; \ - } \ - _WX_LIST_HELPER_##name::BaseListType _WX_LIST_HELPER_##name::EmptyList; - -#else // !wxUSE_STD_CONTAINERS - #undef WX_DEFINE_LIST_2 - #define WX_DEFINE_LIST_2(T, name) \ - void wx##name##Node::DeleteData() \ - { \ - delete (T *)GetData(); \ - } - - // redefine the macro so that now it will generate the class implementation - // old value would provoke a compile-time error if this file is not included - #undef WX_DEFINE_LIST - #define WX_DEFINE_LIST(name) WX_DEFINE_LIST_2(_WX_LIST_ITEM_TYPE_##name, name) - -#endif // wxUSE_STD_CONTAINERS/!wxUSE_STD_CONTAINERS - diff --git a/Externals/wxWidgets3/include/wx/log.h b/Externals/wxWidgets3/include/wx/log.h deleted file mode 100644 index cbc15efde9..0000000000 --- a/Externals/wxWidgets3/include/wx/log.h +++ /dev/null @@ -1,1504 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/log.h -// Purpose: Assorted wxLogXXX functions, and wxLog (sink for logs) -// Author: Vadim Zeitlin -// Modified by: -// Created: 29/01/98 -// Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_LOG_H_ -#define _WX_LOG_H_ - -#include "wx/defs.h" -#include "wx/cpp.h" - -// ---------------------------------------------------------------------------- -// types -// ---------------------------------------------------------------------------- - -// NB: this is needed even if wxUSE_LOG == 0 -typedef unsigned long wxLogLevel; - -// the trace masks have been superseded by symbolic trace constants, they're -// for compatibility only and will be removed soon - do NOT use them -#if WXWIN_COMPATIBILITY_2_8 - #define wxTraceMemAlloc 0x0001 // trace memory allocation (new/delete) - #define wxTraceMessages 0x0002 // trace window messages/X callbacks - #define wxTraceResAlloc 0x0004 // trace GDI resource allocation - #define wxTraceRefCount 0x0008 // trace various ref counting operations - - #ifdef __WINDOWS__ - #define wxTraceOleCalls 0x0100 // OLE interface calls - #endif - - typedef unsigned long wxTraceMask; -#endif // WXWIN_COMPATIBILITY_2_8 - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/string.h" -#include "wx/strvararg.h" - -// ---------------------------------------------------------------------------- -// forward declarations -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_BASE wxObject; - -#if wxUSE_GUI - class WXDLLIMPEXP_FWD_CORE wxFrame; -#endif // wxUSE_GUI - -#if wxUSE_LOG - -#include "wx/arrstr.h" - -#include // for time_t - -#include "wx/dynarray.h" -#include "wx/hashmap.h" - -#if wxUSE_THREADS - #include "wx/thread.h" -#endif // wxUSE_THREADS - -// wxUSE_LOG_DEBUG enables the debug log messages -#ifndef wxUSE_LOG_DEBUG - #if wxDEBUG_LEVEL - #define wxUSE_LOG_DEBUG 1 - #else // !wxDEBUG_LEVEL - #define wxUSE_LOG_DEBUG 0 - #endif -#endif - -// wxUSE_LOG_TRACE enables the trace messages, they are disabled by default -#ifndef wxUSE_LOG_TRACE - #if wxDEBUG_LEVEL - #define wxUSE_LOG_TRACE 1 - #else // !wxDEBUG_LEVEL - #define wxUSE_LOG_TRACE 0 - #endif -#endif // wxUSE_LOG_TRACE - -// wxLOG_COMPONENT identifies the component which generated the log record and -// can be #define'd to a user-defined value when compiling the user code to use -// component-based filtering (see wxLog::SetComponentLevel()) -#ifndef wxLOG_COMPONENT - // this is a variable and not a macro in order to allow the user code to - // just #define wxLOG_COMPONENT without #undef'ining it first - extern WXDLLIMPEXP_DATA_BASE(const char *) wxLOG_COMPONENT; - - #ifdef WXBUILDING - #define wxLOG_COMPONENT "wx" - #endif -#endif - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -// different standard log levels (you may also define your own) -enum wxLogLevelValues -{ - wxLOG_FatalError, // program can't continue, abort immediately - wxLOG_Error, // a serious error, user must be informed about it - wxLOG_Warning, // user is normally informed about it but may be ignored - wxLOG_Message, // normal message (i.e. normal output of a non GUI app) - wxLOG_Status, // informational: might go to the status line of GUI app - wxLOG_Info, // informational message (a.k.a. 'Verbose') - wxLOG_Debug, // never shown to the user, disabled in release mode - wxLOG_Trace, // trace messages are also only enabled in debug mode - wxLOG_Progress, // used for progress indicator (not yet) - wxLOG_User = 100, // user defined levels start here - wxLOG_Max = 10000 -}; - -// symbolic trace masks - wxLogTrace("foo", "some trace message...") will be -// discarded unless the string "foo" has been added to the list of allowed -// ones with AddTraceMask() - -#define wxTRACE_MemAlloc wxT("memalloc") // trace memory allocation (new/delete) -#define wxTRACE_Messages wxT("messages") // trace window messages/X callbacks -#define wxTRACE_ResAlloc wxT("resalloc") // trace GDI resource allocation -#define wxTRACE_RefCount wxT("refcount") // trace various ref counting operations - -#ifdef __WINDOWS__ - #define wxTRACE_OleCalls wxT("ole") // OLE interface calls -#endif - -#include "wx/iosfwrap.h" - -// ---------------------------------------------------------------------------- -// information about a log record, i.e. unit of log output -// ---------------------------------------------------------------------------- - -class wxLogRecordInfo -{ -public: - // default ctor creates an uninitialized object - wxLogRecordInfo() - { - memset(this, 0, sizeof(*this)); - } - - // normal ctor, used by wxLogger specifies the location of the log - // statement; its time stamp and thread id are set up here - wxLogRecordInfo(const char *filename_, - int line_, - const char *func_, - const char *component_) - { - filename = filename_; - func = func_; - line = line_; - component = component_; - - timestamp = time(NULL); - -#if wxUSE_THREADS - threadId = wxThread::GetCurrentId(); -#endif // wxUSE_THREADS - - m_data = NULL; - } - - // we need to define copy ctor and assignment operator because of m_data - wxLogRecordInfo(const wxLogRecordInfo& other) - { - Copy(other); - } - - wxLogRecordInfo& operator=(const wxLogRecordInfo& other) - { - if ( &other != this ) - { - delete m_data; - Copy(other); - } - - return *this; - } - - // dtor is non-virtual, this class is not meant to be derived from - ~wxLogRecordInfo() - { - delete m_data; - } - - - // the file name and line number of the file where the log record was - // generated, if available or NULL and 0 otherwise - const char *filename; - int line; - - // the name of the function where the log record was generated (may be NULL - // if the compiler doesn't support __FUNCTION__) - const char *func; - - // the name of the component which generated this message, may be NULL if - // not set (i.e. wxLOG_COMPONENT not defined) - const char *component; - - // time of record generation - time_t timestamp; - -#if wxUSE_THREADS - // id of the thread which logged this record - wxThreadIdType threadId; -#endif // wxUSE_THREADS - - - // store an arbitrary value in this record context - // - // wxWidgets always uses keys starting with "wx.", e.g. "wx.sys_error" - void StoreValue(const wxString& key, wxUIntPtr val) - { - if ( !m_data ) - m_data = new ExtraData; - - m_data->numValues[key] = val; - } - - void StoreValue(const wxString& key, const wxString& val) - { - if ( !m_data ) - m_data = new ExtraData; - - m_data->strValues[key] = val; - } - - - // these functions retrieve the value of either numeric or string key, - // return false if not found - bool GetNumValue(const wxString& key, wxUIntPtr *val) const - { - if ( !m_data ) - return false; - - wxStringToNumHashMap::const_iterator it = m_data->numValues.find(key); - if ( it == m_data->numValues.end() ) - return false; - - *val = it->second; - - return true; - } - - bool GetStrValue(const wxString& key, wxString *val) const - { - if ( !m_data ) - return false; - - wxStringToStringHashMap::const_iterator it = m_data->strValues.find(key); - if ( it == m_data->strValues.end() ) - return false; - - *val = it->second; - - return true; - } - -private: - void Copy(const wxLogRecordInfo& other) - { - memcpy(this, &other, sizeof(*this)); - if ( other.m_data ) - m_data = new ExtraData(*other.m_data); - } - - // extra data associated with the log record: this is completely optional - // and can be used to pass information from the log function to the log - // sink (e.g. wxLogSysError() uses this to pass the error code) - struct ExtraData - { - wxStringToNumHashMap numValues; - wxStringToStringHashMap strValues; - }; - - // NULL if not used - ExtraData *m_data; -}; - -#define wxLOG_KEY_TRACE_MASK "wx.trace_mask" - -// ---------------------------------------------------------------------------- -// log record: a unit of log output -// ---------------------------------------------------------------------------- - -struct wxLogRecord -{ - wxLogRecord(wxLogLevel level_, - const wxString& msg_, - const wxLogRecordInfo& info_) - : level(level_), - msg(msg_), - info(info_) - { - } - - wxLogLevel level; - wxString msg; - wxLogRecordInfo info; -}; - -// ---------------------------------------------------------------------------- -// Derive from this class to customize format of log messages. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxLogFormatter -{ -public: - // Default constructor. - wxLogFormatter() { } - - // Trivial but virtual destructor for the base class. - virtual ~wxLogFormatter() { } - - - // Override this method to implement custom formatting of the given log - // record. The default implementation simply prepends a level-dependent - // prefix to the message and optionally adds a time stamp. - virtual wxString Format(wxLogLevel level, - const wxString& msg, - const wxLogRecordInfo& info) const; - -protected: - // Override this method to change just the time stamp formatting. It is - // called by default Format() implementation. - virtual wxString FormatTime(time_t t) const; -}; - - -// ---------------------------------------------------------------------------- -// derive from this class to redirect (or suppress, or ...) log messages -// normally, only a single instance of this class exists but it's not enforced -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxLog -{ -public: - // ctor - wxLog() : m_formatter(new wxLogFormatter) { } - - // make dtor virtual for all derived classes - virtual ~wxLog(); - - - // log messages selection - // ---------------------- - - // these functions allow to completely disable all log messages or disable - // log messages at level less important than specified for the current - // thread - - // is logging enabled at all now? - static bool IsEnabled() - { -#if wxUSE_THREADS - if ( !wxThread::IsMain() ) - return IsThreadLoggingEnabled(); -#endif // wxUSE_THREADS - - return ms_doLog; - } - - // change the flag state, return the previous one - static bool EnableLogging(bool enable = true) - { -#if wxUSE_THREADS - if ( !wxThread::IsMain() ) - return EnableThreadLogging(enable); -#endif // wxUSE_THREADS - - bool doLogOld = ms_doLog; - ms_doLog = enable; - return doLogOld; - } - - // return the current global log level - static wxLogLevel GetLogLevel() { return ms_logLevel; } - - // set global log level: messages with level > logLevel will not be logged - static void SetLogLevel(wxLogLevel logLevel) { ms_logLevel = logLevel; } - - // set the log level for the given component - static void SetComponentLevel(const wxString& component, wxLogLevel level); - - // return the effective log level for this component, falling back to - // parent component and to the default global log level if necessary - // - // NB: component argument is passed by value and not const reference in an - // attempt to encourage compiler to avoid an extra copy: as we modify - // the component internally, we'd create one anyhow and like this it - // can be avoided if the string is a temporary anyhow - static wxLogLevel GetComponentLevel(wxString component); - - - // is logging of messages from this component enabled at this level? - // - // usually always called with wxLOG_COMPONENT as second argument - static bool IsLevelEnabled(wxLogLevel level, wxString component) - { - return IsEnabled() && level <= GetComponentLevel(component); - } - - - // enable/disable messages at wxLOG_Verbose level (only relevant if the - // current log level is greater or equal to it) - // - // notice that verbose mode can be activated by the standard command-line - // '--verbose' option - static void SetVerbose(bool bVerbose = true) { ms_bVerbose = bVerbose; } - - // check if verbose messages are enabled - static bool GetVerbose() { return ms_bVerbose; } - - - // message buffering - // ----------------- - - // flush shows all messages if they're not logged immediately (FILE - // and iostream logs don't need it, but wxLogGui does to avoid showing - // 17 modal dialogs one after another) - virtual void Flush(); - - // flush the active target if any and also output any pending messages from - // background threads - static void FlushActive(); - - // only one sink is active at each moment get current log target, will call - // wxAppTraits::CreateLogTarget() to create one if none exists - static wxLog *GetActiveTarget(); - - // change log target, logger may be NULL - static wxLog *SetActiveTarget(wxLog *logger); - -#if wxUSE_THREADS - // change log target for the current thread only, shouldn't be called from - // the main thread as it doesn't use thread-specific log target - static wxLog *SetThreadActiveTarget(wxLog *logger); -#endif // wxUSE_THREADS - - // suspend the message flushing of the main target until the next call - // to Resume() - this is mainly for internal use (to prevent wxYield() - // from flashing the messages) - static void Suspend() { ms_suspendCount++; } - - // must be called for each Suspend()! - static void Resume() { ms_suspendCount--; } - - // should GetActiveTarget() try to create a new log object if the - // current is NULL? - static void DontCreateOnDemand(); - - // Make GetActiveTarget() create a new log object again. - static void DoCreateOnDemand(); - - // log the count of repeating messages instead of logging the messages - // multiple times - static void SetRepetitionCounting(bool bRepetCounting = true) - { ms_bRepetCounting = bRepetCounting; } - - // gets duplicate counting status - static bool GetRepetitionCounting() { return ms_bRepetCounting; } - - // add string trace mask - static void AddTraceMask(const wxString& str); - - // add string trace mask - static void RemoveTraceMask(const wxString& str); - - // remove all string trace masks - static void ClearTraceMasks(); - - // get string trace masks: note that this is MT-unsafe if other threads can - // call AddTraceMask() concurrently - static const wxArrayString& GetTraceMasks(); - - // is this trace mask in the list? - static bool IsAllowedTraceMask(const wxString& mask); - - - // log formatting - // ----------------- - - // Change wxLogFormatter object used by wxLog to format the log messages. - // - // wxLog takes ownership of the pointer passed in but the caller is - // responsible for deleting the returned pointer. - wxLogFormatter* SetFormatter(wxLogFormatter* formatter); - - - // All the time stamp related functions below only work when the default - // wxLogFormatter is being used. Defining a custom formatter overrides them - // as it could use its own time stamp format or format messages without - // using time stamp at all. - - - // sets the time stamp string format: this is used as strftime() format - // string for the log targets which add time stamps to the messages; set - // it to empty string to disable time stamping completely. - static void SetTimestamp(const wxString& ts) { ms_timestamp = ts; } - - // disable time stamping of log messages - static void DisableTimestamp() { SetTimestamp(wxEmptyString); } - - - // get the current timestamp format string (maybe empty) - static const wxString& GetTimestamp() { return ms_timestamp; } - - - - // helpers: all functions in this section are mostly for internal use only, - // don't call them from your code even if they are not formally deprecated - - // put the time stamp into the string if ms_timestamp is not empty (don't - // change it otherwise); the first overload uses the current time. - static void TimeStamp(wxString *str); - static void TimeStamp(wxString *str, time_t t); - - // these methods should only be called from derived classes DoLogRecord(), - // DoLogTextAtLevel() and DoLogText() implementations respectively and - // shouldn't be called directly, use logging functions instead - void LogRecord(wxLogLevel level, - const wxString& msg, - const wxLogRecordInfo& info) - { - DoLogRecord(level, msg, info); - } - - void LogTextAtLevel(wxLogLevel level, const wxString& msg) - { - DoLogTextAtLevel(level, msg); - } - - void LogText(const wxString& msg) - { - DoLogText(msg); - } - - // this is a helper used by wxLogXXX() functions, don't call it directly - // and see DoLog() for function to overload in the derived classes - static void OnLog(wxLogLevel level, - const wxString& msg, - const wxLogRecordInfo& info); - - // version called when no information about the location of the log record - // generation is available (but the time stamp is), it mainly exists for - // backwards compatibility, don't use it in new code - static void OnLog(wxLogLevel level, const wxString& msg, time_t t); - - // a helper calling the above overload with current time - static void OnLog(wxLogLevel level, const wxString& msg) - { - OnLog(level, msg, time(NULL)); - } - - - // this method exists for backwards compatibility only, don't use - bool HasPendingMessages() const { return true; } - - // don't use integer masks any more, use string trace masks instead -#if WXWIN_COMPATIBILITY_2_8 - static wxDEPRECATED_INLINE( void SetTraceMask(wxTraceMask ulMask), - ms_ulTraceMask = ulMask; ) - - // this one can't be marked deprecated as it's used in our own wxLogger - // below but it still is deprecated and shouldn't be used - static wxTraceMask GetTraceMask() { return ms_ulTraceMask; } -#endif // WXWIN_COMPATIBILITY_2_8 - -protected: - // the logging functions that can be overridden: DoLogRecord() is called - // for every "record", i.e. a unit of log output, to be logged and by - // default formats the message and passes it to DoLogTextAtLevel() which in - // turn passes it to DoLogText() by default - - // override this method if you want to change message formatting or do - // dynamic filtering - virtual void DoLogRecord(wxLogLevel level, - const wxString& msg, - const wxLogRecordInfo& info); - - // override this method to redirect output to different channels depending - // on its level only; if even the level doesn't matter, override - // DoLogText() instead - virtual void DoLogTextAtLevel(wxLogLevel level, const wxString& msg); - - // this function is not pure virtual as it might not be needed if you do - // the logging in overridden DoLogRecord() or DoLogTextAtLevel() directly - // but if you do not override them in your derived class you must override - // this one as the default implementation of it simply asserts - virtual void DoLogText(const wxString& msg); - - - // the rest of the functions are for backwards compatibility only, don't - // use them in new code; if you're updating your existing code you need to - // switch to overriding DoLogRecord/Text() above (although as long as these - // functions exist, log classes using them will continue to work) -#if WXWIN_COMPATIBILITY_2_8 - wxDEPRECATED_BUT_USED_INTERNALLY( - virtual void DoLog(wxLogLevel level, const char *szString, time_t t) - ); - - wxDEPRECATED_BUT_USED_INTERNALLY( - virtual void DoLog(wxLogLevel level, const wchar_t *wzString, time_t t) - ); - - // these shouldn't be used by new code - wxDEPRECATED_BUT_USED_INTERNALLY_INLINE( - virtual void DoLogString(const char *WXUNUSED(szString), - time_t WXUNUSED(t)), - wxEMPTY_PARAMETER_VALUE - ) - - wxDEPRECATED_BUT_USED_INTERNALLY_INLINE( - virtual void DoLogString(const wchar_t *WXUNUSED(wzString), - time_t WXUNUSED(t)), - wxEMPTY_PARAMETER_VALUE - ) -#endif // WXWIN_COMPATIBILITY_2_8 - - - // log a message indicating the number of times the previous message was - // repeated if previous repetition counter is strictly positive, does - // nothing otherwise; return the old value of repetition counter - unsigned LogLastRepeatIfNeeded(); - -private: -#if wxUSE_THREADS - // called from FlushActive() to really log any buffered messages logged - // from the other threads - void FlushThreadMessages(); - - // these functions are called for non-main thread only by IsEnabled() and - // EnableLogging() respectively - static bool IsThreadLoggingEnabled(); - static bool EnableThreadLogging(bool enable = true); -#endif // wxUSE_THREADS - - // get the active log target for the main thread, auto-creating it if - // necessary - // - // this is called from GetActiveTarget() and OnLog() when they're called - // from the main thread - static wxLog *GetMainThreadActiveTarget(); - - // called from OnLog() if it's called from the main thread or if we have a - // (presumably MT-safe) thread-specific logger and by FlushThreadMessages() - // when it plays back the buffered messages logged from the other threads - void CallDoLogNow(wxLogLevel level, - const wxString& msg, - const wxLogRecordInfo& info); - - - // variables - // ---------------- - - wxLogFormatter *m_formatter; // We own this pointer. - - - // static variables - // ---------------- - - // if true, don't log the same message multiple times, only log it once - // with the number of times it was repeated - static bool ms_bRepetCounting; - - static wxLog *ms_pLogger; // currently active log sink - static bool ms_doLog; // false => all logging disabled - static bool ms_bAutoCreate; // create new log targets on demand? - static bool ms_bVerbose; // false => ignore LogInfo messages - - static wxLogLevel ms_logLevel; // limit logging to levels <= ms_logLevel - - static size_t ms_suspendCount; // if positive, logs are not flushed - - // format string for strftime(), if empty, time stamping log messages is - // disabled - static wxString ms_timestamp; - -#if WXWIN_COMPATIBILITY_2_8 - static wxTraceMask ms_ulTraceMask; // controls wxLogTrace behaviour -#endif // WXWIN_COMPATIBILITY_2_8 -}; - -// ---------------------------------------------------------------------------- -// "trivial" derivations of wxLog -// ---------------------------------------------------------------------------- - -// log everything except for the debug/trace messages (which are passed to -// wxMessageOutputDebug) to a buffer -class WXDLLIMPEXP_BASE wxLogBuffer : public wxLog -{ -public: - wxLogBuffer() { } - - // get the string contents with all messages logged - const wxString& GetBuffer() const { return m_str; } - - // show the buffer contents to the user in the best possible way (this uses - // wxMessageOutputMessageBox) and clear it - virtual void Flush() wxOVERRIDE; - -protected: - virtual void DoLogTextAtLevel(wxLogLevel level, const wxString& msg) wxOVERRIDE; - -private: - wxString m_str; - - wxDECLARE_NO_COPY_CLASS(wxLogBuffer); -}; - - -// log everything to a "FILE *", stderr by default -class WXDLLIMPEXP_BASE wxLogStderr : public wxLog -{ -public: - // redirect log output to a FILE - wxLogStderr(FILE *fp = NULL); - -protected: - // implement sink function - virtual void DoLogText(const wxString& msg) wxOVERRIDE; - - FILE *m_fp; - - wxDECLARE_NO_COPY_CLASS(wxLogStderr); -}; - -#if wxUSE_STD_IOSTREAM - -// log everything to an "ostream", cerr by default -class WXDLLIMPEXP_BASE wxLogStream : public wxLog -{ -public: - // redirect log output to an ostream - wxLogStream(wxSTD ostream *ostr = (wxSTD ostream *) NULL); - -protected: - // implement sink function - virtual void DoLogText(const wxString& msg) wxOVERRIDE; - - // using ptr here to avoid including from this file - wxSTD ostream *m_ostr; -}; - -#endif // wxUSE_STD_IOSTREAM - -// ---------------------------------------------------------------------------- -// /dev/null log target: suppress logging until this object goes out of scope -// ---------------------------------------------------------------------------- - -// example of usage: -/* - void Foo() - { - wxFile file; - - // wxFile.Open() normally complains if file can't be opened, we don't - // want it - wxLogNull logNo; - - if ( !file.Open("bar") ) - ... process error ourselves ... - - // ~wxLogNull called, old log sink restored - } - */ -class WXDLLIMPEXP_BASE wxLogNull -{ -public: - wxLogNull() : m_flagOld(wxLog::EnableLogging(false)) { } - ~wxLogNull() { (void)wxLog::EnableLogging(m_flagOld); } - -private: - bool m_flagOld; // the previous value of the wxLog::ms_doLog -}; - -// ---------------------------------------------------------------------------- -// chaining log target: installs itself as a log target and passes all -// messages to the real log target given to it in the ctor but also forwards -// them to the previously active one -// -// note that you don't have to call SetActiveTarget() with this class, it -// does it itself in its ctor -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxLogChain : public wxLog -{ -public: - wxLogChain(wxLog *logger); - virtual ~wxLogChain(); - - // change the new log target - void SetLog(wxLog *logger); - - // this can be used to temporarily disable (and then reenable) passing - // messages to the old logger (by default we do pass them) - void PassMessages(bool bDoPass) { m_bPassMessages = bDoPass; } - - // are we passing the messages to the previous log target? - bool IsPassingMessages() const { return m_bPassMessages; } - - // return the previous log target (may be NULL) - wxLog *GetOldLog() const { return m_logOld; } - - // override base class version to flush the old logger as well - virtual void Flush() wxOVERRIDE; - - // call to avoid destroying the old log target - void DetachOldLog() { m_logOld = NULL; } - -protected: - // pass the record to the old logger if needed - virtual void DoLogRecord(wxLogLevel level, - const wxString& msg, - const wxLogRecordInfo& info) wxOVERRIDE; - -private: - // the current log target - wxLog *m_logNew; - - // the previous log target - wxLog *m_logOld; - - // do we pass the messages to the old logger? - bool m_bPassMessages; - - wxDECLARE_NO_COPY_CLASS(wxLogChain); -}; - -// a chain log target which uses itself as the new logger - -#define wxLogPassThrough wxLogInterposer - -class WXDLLIMPEXP_BASE wxLogInterposer : public wxLogChain -{ -public: - wxLogInterposer(); - -private: - wxDECLARE_NO_COPY_CLASS(wxLogInterposer); -}; - -// a temporary interposer which doesn't destroy the old log target -// (calls DetachOldLog) - -class WXDLLIMPEXP_BASE wxLogInterposerTemp : public wxLogChain -{ -public: - wxLogInterposerTemp(); - -private: - wxDECLARE_NO_COPY_CLASS(wxLogInterposerTemp); -}; - -#if wxUSE_GUI - // include GUI log targets: - #include "wx/generic/logg.h" -#endif // wxUSE_GUI - -// ---------------------------------------------------------------------------- -// wxLogger -// ---------------------------------------------------------------------------- - -// wxLogger is a helper class used by wxLogXXX() functions implementation, -// don't use it directly as it's experimental and subject to change (OTOH it -// might become public in the future if it's deemed to be useful enough) - -// contains information about the context from which a log message originates -// and provides Log() vararg method which forwards to wxLog::OnLog() and passes -// this context to it -class wxLogger -{ -public: - // ctor takes the basic information about the log record - wxLogger(wxLogLevel level, - const char *filename, - int line, - const char *func, - const char *component) - : m_level(level), - m_info(filename, line, func, component) - { - } - - // store extra data in our log record and return this object itself (so - // that further calls to its functions could be chained) - template - wxLogger& Store(const wxString& key, T val) - { - m_info.StoreValue(key, val); - return *this; - } - - // hack for "overloaded" wxLogXXX() functions: calling this method - // indicates that we may have an extra first argument preceding the format - // string and that if we do have it, we should store it in m_info using the - // given key (while by default 0 value will be used) - wxLogger& MaybeStore(const wxString& key, wxUIntPtr value = 0) - { - wxASSERT_MSG( m_optKey.empty(), "can only have one optional value" ); - m_optKey = key; - - m_info.StoreValue(key, value); - return *this; - } - - - // non-vararg function used by wxVLogXXX(): - - // log the message at the level specified in the ctor if this log message - // is enabled - void LogV(const wxString& format, va_list argptr) - { - // remember that fatal errors can't be disabled - if ( m_level == wxLOG_FatalError || - wxLog::IsLevelEnabled(m_level, m_info.component) ) - DoCallOnLog(format, argptr); - } - - // overloads used by functions with optional leading arguments (whose - // values are stored in the key passed to MaybeStore()) - void LogV(long num, const wxString& format, va_list argptr) - { - Store(m_optKey, num); - - LogV(format, argptr); - } - - void LogV(void *ptr, const wxString& format, va_list argptr) - { - Store(m_optKey, wxPtrToUInt(ptr)); - - LogV(format, argptr); - } - - void LogVTrace(const wxString& mask, const wxString& format, va_list argptr) - { - if ( !wxLog::IsAllowedTraceMask(mask) ) - return; - - Store(wxLOG_KEY_TRACE_MASK, mask); - - LogV(format, argptr); - } - - - // vararg functions used by wxLogXXX(): - - // will log the message at the level specified in the ctor - // - // notice that this function supposes that the caller already checked that - // the level was enabled and does no checks itself - WX_DEFINE_VARARG_FUNC_VOID - ( - Log, - 1, (const wxFormatString&), - DoLog, DoLogUtf8 - ) - - // same as Log() but with an extra numeric or pointer parameters: this is - // used to pass an optional value by storing it in m_info under the name - // passed to MaybeStore() and is required to support "overloaded" versions - // of wxLogStatus() and wxLogSysError() - WX_DEFINE_VARARG_FUNC_VOID - ( - Log, - 2, (long, const wxFormatString&), - DoLogWithNum, DoLogWithNumUtf8 - ) - - // unfortunately we can't use "void *" here as we get overload ambiguities - // with Log(wxFormatString, ...) when the first argument is a "char *" or - // "wchar_t *" then -- so we only allow passing wxObject here, which is - // ugly but fine in practice as this overload is only used by wxLogStatus() - // whose first argument is a wxFrame - WX_DEFINE_VARARG_FUNC_VOID - ( - Log, - 2, (wxObject *, const wxFormatString&), - DoLogWithPtr, DoLogWithPtrUtf8 - ) - - // log the message at the level specified as its first argument - // - // as the macros don't have access to the level argument in this case, this - // function does check that the level is enabled itself - WX_DEFINE_VARARG_FUNC_VOID - ( - LogAtLevel, - 2, (wxLogLevel, const wxFormatString&), - DoLogAtLevel, DoLogAtLevelUtf8 - ) - - // special versions for wxLogTrace() which is passed either string or - // integer mask as first argument determining whether the message should be - // logged or not - WX_DEFINE_VARARG_FUNC_VOID - ( - LogTrace, - 2, (const wxString&, const wxFormatString&), - DoLogTrace, DoLogTraceUtf8 - ) - -#if WXWIN_COMPATIBILITY_2_8 - WX_DEFINE_VARARG_FUNC_VOID - ( - LogTrace, - 2, (wxTraceMask, const wxFormatString&), - DoLogTraceMask, DoLogTraceMaskUtf8 - ) -#endif // WXWIN_COMPATIBILITY_2_8 - -private: -#if !wxUSE_UTF8_LOCALE_ONLY - void DoLog(const wxChar *format, ...) - { - va_list argptr; - va_start(argptr, format); - DoCallOnLog(format, argptr); - va_end(argptr); - } - - void DoLogWithNum(long num, const wxChar *format, ...) - { - Store(m_optKey, num); - - va_list argptr; - va_start(argptr, format); - DoCallOnLog(format, argptr); - va_end(argptr); - } - - void DoLogWithPtr(void *ptr, const wxChar *format, ...) - { - Store(m_optKey, wxPtrToUInt(ptr)); - - va_list argptr; - va_start(argptr, format); - DoCallOnLog(format, argptr); - va_end(argptr); - } - - void DoLogAtLevel(wxLogLevel level, const wxChar *format, ...) - { - if ( !wxLog::IsLevelEnabled(level, m_info.component) ) - return; - - va_list argptr; - va_start(argptr, format); - DoCallOnLog(level, format, argptr); - va_end(argptr); - } - - void DoLogTrace(const wxString& mask, const wxChar *format, ...) - { - if ( !wxLog::IsAllowedTraceMask(mask) ) - return; - - Store(wxLOG_KEY_TRACE_MASK, mask); - - va_list argptr; - va_start(argptr, format); - DoCallOnLog(format, argptr); - va_end(argptr); - } - -#if WXWIN_COMPATIBILITY_2_8 - void DoLogTraceMask(wxTraceMask mask, const wxChar *format, ...) - { - if ( (wxLog::GetTraceMask() & mask) != mask ) - return; - - Store(wxLOG_KEY_TRACE_MASK, mask); - - va_list argptr; - va_start(argptr, format); - DoCallOnLog(format, argptr); - va_end(argptr); - } -#endif // WXWIN_COMPATIBILITY_2_8 -#endif // !wxUSE_UTF8_LOCALE_ONLY - -#if wxUSE_UNICODE_UTF8 - void DoLogUtf8(const char *format, ...) - { - va_list argptr; - va_start(argptr, format); - DoCallOnLog(format, argptr); - va_end(argptr); - } - - void DoLogWithNumUtf8(long num, const char *format, ...) - { - Store(m_optKey, num); - - va_list argptr; - va_start(argptr, format); - DoCallOnLog(format, argptr); - va_end(argptr); - } - - void DoLogWithPtrUtf8(void *ptr, const char *format, ...) - { - Store(m_optKey, wxPtrToUInt(ptr)); - - va_list argptr; - va_start(argptr, format); - DoCallOnLog(format, argptr); - va_end(argptr); - } - - void DoLogAtLevelUtf8(wxLogLevel level, const char *format, ...) - { - if ( !wxLog::IsLevelEnabled(level, m_info.component) ) - return; - - va_list argptr; - va_start(argptr, format); - DoCallOnLog(level, format, argptr); - va_end(argptr); - } - - void DoLogTraceUtf8(const wxString& mask, const char *format, ...) - { - if ( !wxLog::IsAllowedTraceMask(mask) ) - return; - - Store(wxLOG_KEY_TRACE_MASK, mask); - - va_list argptr; - va_start(argptr, format); - DoCallOnLog(format, argptr); - va_end(argptr); - } - -#if WXWIN_COMPATIBILITY_2_8 - void DoLogTraceMaskUtf8(wxTraceMask mask, const char *format, ...) - { - if ( (wxLog::GetTraceMask() & mask) != mask ) - return; - - Store(wxLOG_KEY_TRACE_MASK, mask); - - va_list argptr; - va_start(argptr, format); - DoCallOnLog(format, argptr); - va_end(argptr); - } -#endif // WXWIN_COMPATIBILITY_2_8 -#endif // wxUSE_UNICODE_UTF8 - - void DoCallOnLog(wxLogLevel level, const wxString& format, va_list argptr) - { - wxLog::OnLog(level, wxString::FormatV(format, argptr), m_info); - } - - void DoCallOnLog(const wxString& format, va_list argptr) - { - DoCallOnLog(m_level, format, argptr); - } - - - const wxLogLevel m_level; - wxLogRecordInfo m_info; - - wxString m_optKey; - - wxDECLARE_NO_COPY_CLASS(wxLogger); -}; - -// ============================================================================ -// global functions -// ============================================================================ - -// ---------------------------------------------------------------------------- -// get error code/error message from system in a portable way -// ---------------------------------------------------------------------------- - -// return the last system error code -WXDLLIMPEXP_BASE unsigned long wxSysErrorCode(); - -// return the error message for given (or last if 0) error code -WXDLLIMPEXP_BASE const wxChar* wxSysErrorMsg(unsigned long nErrCode = 0); - -// ---------------------------------------------------------------------------- -// define wxLog() functions which can be used by application instead of -// stdio, iostream &c for log messages for easy redirection -// ---------------------------------------------------------------------------- - -/* - The code below is unreadable because it (unfortunately unavoidably) - contains a lot of macro magic but all it does is to define wxLogXXX() such - that you can call them as vararg functions to log a message at the - corresponding level. - - More precisely, it defines: - - - wxLog{FatalError,Error,Warning,Message,Verbose,Debug}() functions - taking the format string and additional vararg arguments if needed. - - wxLogGeneric(wxLogLevel level, const wxString& format, ...) which - takes the log level explicitly. - - wxLogSysError(const wxString& format, ...) and wxLogSysError(long - err, const wxString& format, ...) which log a wxLOG_Error severity - message with the error message corresponding to the system error code - err or the last error. - - wxLogStatus(const wxString& format, ...) which logs the message into - the status bar of the main application window and its overload - wxLogStatus(wxFrame *frame, const wxString& format, ...) which logs it - into the status bar of the specified frame. - - wxLogTrace(Mask mask, const wxString& format, ...) which only logs - the message is the specified mask is enabled. This comes in two kinds: - Mask can be a wxString or a long. Both are deprecated. - - In addition, wxVLogXXX() versions of all the functions above are also - defined. They take a va_list argument instead of "...". - */ - -// creates wxLogger object for the current location -#define wxMAKE_LOGGER(level) \ - wxLogger(wxLOG_##level, __FILE__, __LINE__, __WXFUNCTION__, wxLOG_COMPONENT) - -// this macro generates the expression which logs whatever follows it in -// parentheses at the level specified as argument -#define wxDO_LOG(level) wxMAKE_LOGGER(level).Log - -// this is the non-vararg equivalent -#define wxDO_LOGV(level, format, argptr) \ - wxMAKE_LOGGER(level).LogV(format, argptr) - -// this macro declares wxLog() macro which logs whatever follows it if -// logging at specified level is enabled (notice that if it is false, the -// following arguments are not even evaluated which is good as it avoids -// unnecessary overhead) -// -// Note: the strange (because executing at most once) for() loop because we -// must arrange for wxDO_LOG() to be at the end of the macro and using a -// more natural "if (IsLevelEnabled()) wxDO_LOG()" would result in wrong -// behaviour for the following code ("else" would bind to the wrong "if"): -// -// if ( cond ) -// wxLogError("!!!"); -// else -// ... -// -// See also #11829 for the problems with other simpler approaches, -// notably the need for two macros due to buggy __LINE__ in MSVC. -#define wxDO_LOG_IF_ENABLED_HELPER(level, loopvar) \ - for ( bool loopvar = false; \ - !loopvar && wxLog::IsLevelEnabled(wxLOG_##level, wxLOG_COMPONENT); \ - loopvar = true ) \ - wxDO_LOG(level) - -#define wxDO_LOG_IF_ENABLED(level) \ - wxDO_LOG_IF_ENABLED_HELPER(level, wxMAKE_UNIQUE_NAME(wxlogcheck)) - -// wxLogFatalError() is special as it can't be disabled -#define wxLogFatalError wxDO_LOG(FatalError) -#define wxVLogFatalError(format, argptr) wxDO_LOGV(FatalError, format, argptr) - -#define wxLogError wxDO_LOG_IF_ENABLED(Error) -#define wxVLogError(format, argptr) wxDO_LOGV(Error, format, argptr) - -#define wxLogWarning wxDO_LOG_IF_ENABLED(Warning) -#define wxVLogWarning(format, argptr) wxDO_LOGV(Warning, format, argptr) - -#define wxLogMessage wxDO_LOG_IF_ENABLED(Message) -#define wxVLogMessage(format, argptr) wxDO_LOGV(Message, format, argptr) - -#define wxLogInfo wxDO_LOG_IF_ENABLED(Info) -#define wxVLogInfo(format, argptr) wxDO_LOGV(Info, format, argptr) - - -// this one is special as it only logs if we're in verbose mode -#define wxLogVerbose \ - if ( !(wxLog::IsLevelEnabled(wxLOG_Info, wxLOG_COMPONENT) && \ - wxLog::GetVerbose()) ) \ - {} \ - else \ - wxDO_LOG(Info) -#define wxVLogVerbose(format, argptr) \ - if ( !(wxLog::IsLevelEnabled(wxLOG_Info, wxLOG_COMPONENT) && \ - wxLog::GetVerbose()) ) \ - {} \ - else \ - wxDO_LOGV(Info, format, argptr) - -// another special case: the level is passed as first argument of the function -// and so is not available to the macro -// -// notice that because of this, arguments of wxLogGeneric() are currently -// always evaluated, unlike for the other log functions -#define wxLogGeneric wxMAKE_LOGGER(Max).LogAtLevel -#define wxVLogGeneric(level, format, argptr) \ - if ( !wxLog::IsLevelEnabled(wxLOG_##level, wxLOG_COMPONENT) ) \ - {} \ - else \ - wxDO_LOGV(level, format, argptr) - - -// wxLogSysError() needs to stash the error code value in the log record info -// so it needs special handling too; additional complications arise because the -// error code may or not be present as the first argument -// -// notice that we unfortunately can't avoid the call to wxSysErrorCode() even -// though it may be unneeded if an explicit error code is passed to us because -// the message might not be logged immediately (e.g. it could be queued for -// logging from the main thread later) and so we can't to wait until it is -// logged to determine whether we have last error or not as it will be too late -// and it will have changed already by then (in fact it even changes when -// wxString::Format() is called because of vsnprintf() inside it so it can -// change even much sooner) -#define wxLOG_KEY_SYS_ERROR_CODE "wx.sys_error" - -#define wxLogSysError \ - if ( !wxLog::IsLevelEnabled(wxLOG_Error, wxLOG_COMPONENT) ) \ - {} \ - else \ - wxMAKE_LOGGER(Error).MaybeStore(wxLOG_KEY_SYS_ERROR_CODE, \ - wxSysErrorCode()).Log - -// unfortunately we can't have overloaded macros so we can't define versions -// both with and without error code argument and have to rely on LogV() -// overloads in wxLogger to select between them -#define wxVLogSysError \ - wxMAKE_LOGGER(Error).MaybeStore(wxLOG_KEY_SYS_ERROR_CODE, \ - wxSysErrorCode()).LogV - -#if wxUSE_GUI - // wxLogStatus() is similar to wxLogSysError() as it allows to optionally - // specify the frame to which the message should go - #define wxLOG_KEY_FRAME "wx.frame" - - #define wxLogStatus \ - if ( !wxLog::IsLevelEnabled(wxLOG_Status, wxLOG_COMPONENT) ) \ - {} \ - else \ - wxMAKE_LOGGER(Status).MaybeStore(wxLOG_KEY_FRAME).Log - - #define wxVLogStatus \ - wxMAKE_LOGGER(Status).MaybeStore(wxLOG_KEY_FRAME).LogV -#endif // wxUSE_GUI - - -#else // !wxUSE_LOG - -#undef wxUSE_LOG_DEBUG -#define wxUSE_LOG_DEBUG 0 - -#undef wxUSE_LOG_TRACE -#define wxUSE_LOG_TRACE 0 - -// define macros for defining log functions which do nothing at all -#define wxDEFINE_EMPTY_LOG_FUNCTION(level) \ - WX_DEFINE_VARARG_FUNC_NOP(wxLog##level, 1, (const wxFormatString&)) \ - inline void wxVLog##level(const wxFormatString& WXUNUSED(format), \ - va_list WXUNUSED(argptr)) { } \ - -#define wxDEFINE_EMPTY_LOG_FUNCTION2(level, argclass) \ - WX_DEFINE_VARARG_FUNC_NOP(wxLog##level, 2, (argclass, const wxFormatString&)) \ - inline void wxVLog##level(argclass WXUNUSED(arg), \ - const wxFormatString& WXUNUSED(format), \ - va_list WXUNUSED(argptr)) {} - -wxDEFINE_EMPTY_LOG_FUNCTION(FatalError); -wxDEFINE_EMPTY_LOG_FUNCTION(Error); -wxDEFINE_EMPTY_LOG_FUNCTION(SysError); -wxDEFINE_EMPTY_LOG_FUNCTION2(SysError, long); -wxDEFINE_EMPTY_LOG_FUNCTION(Warning); -wxDEFINE_EMPTY_LOG_FUNCTION(Message); -wxDEFINE_EMPTY_LOG_FUNCTION(Info); -wxDEFINE_EMPTY_LOG_FUNCTION(Verbose); - -wxDEFINE_EMPTY_LOG_FUNCTION2(Generic, wxLogLevel); - -#if wxUSE_GUI - wxDEFINE_EMPTY_LOG_FUNCTION(Status); - wxDEFINE_EMPTY_LOG_FUNCTION2(Status, wxFrame *); -#endif // wxUSE_GUI - -// Empty Class to fake wxLogNull -class WXDLLIMPEXP_BASE wxLogNull -{ -public: - wxLogNull() { } -}; - -// Dummy macros to replace some functions. -#define wxSysErrorCode() (unsigned long)0 -#define wxSysErrorMsg( X ) (const wxChar*)NULL - -// Fake symbolic trace masks... for those that are used frequently -#define wxTRACE_OleCalls wxEmptyString // OLE interface calls - -#endif // wxUSE_LOG/!wxUSE_LOG - - -// debug functions can be completely disabled in optimized builds - -// if these log functions are disabled, we prefer to define them as (empty) -// variadic macros as this completely removes them and their argument -// evaluation from the object code but if this is not supported by compiler we -// use empty inline functions instead (defining them as nothing would result in -// compiler warnings) -// -// note that making wxVLogDebug/Trace() themselves (empty inline) functions is -// a bad idea as some compilers are stupid enough to not inline even empty -// functions if their parameters are complicated enough, but by defining them -// as an empty inline function we ensure that even dumbest compilers optimise -// them away -#ifdef __BORLANDC__ - // but Borland gives "W8019: Code has no effect" for wxLogNop() so we need - // to define it differently for it to avoid these warnings (same problem as - // with wxUnusedVar()) - #define wxLogNop() { } -#else - inline void wxLogNop() { } -#endif - -#if wxUSE_LOG_DEBUG - #define wxLogDebug wxDO_LOG_IF_ENABLED(Debug) - #define wxVLogDebug(format, argptr) wxDO_LOGV(Debug, format, argptr) -#else // !wxUSE_LOG_DEBUG - #define wxVLogDebug(fmt, valist) wxLogNop() - - #ifdef HAVE_VARIADIC_MACROS - #define wxLogDebug(fmt, ...) wxLogNop() - #else // !HAVE_VARIADIC_MACROS - WX_DEFINE_VARARG_FUNC_NOP(wxLogDebug, 1, (const wxFormatString&)) - #endif -#endif // wxUSE_LOG_DEBUG/!wxUSE_LOG_DEBUG - -#if wxUSE_LOG_TRACE - #define wxLogTrace \ - if ( !wxLog::IsLevelEnabled(wxLOG_Trace, wxLOG_COMPONENT) ) \ - {} \ - else \ - wxMAKE_LOGGER(Trace).LogTrace - #define wxVLogTrace \ - if ( !wxLog::IsLevelEnabled(wxLOG_Trace, wxLOG_COMPONENT) ) \ - {} \ - else \ - wxMAKE_LOGGER(Trace).LogVTrace -#else // !wxUSE_LOG_TRACE - #define wxVLogTrace(mask, fmt, valist) wxLogNop() - - #ifdef HAVE_VARIADIC_MACROS - #define wxLogTrace(mask, fmt, ...) wxLogNop() - #else // !HAVE_VARIADIC_MACROS - #if WXWIN_COMPATIBILITY_2_8 - WX_DEFINE_VARARG_FUNC_NOP(wxLogTrace, 2, (wxTraceMask, const wxFormatString&)) - #endif - WX_DEFINE_VARARG_FUNC_NOP(wxLogTrace, 2, (const wxString&, const wxFormatString&)) - #endif // HAVE_VARIADIC_MACROS/!HAVE_VARIADIC_MACROS -#endif // wxUSE_LOG_TRACE/!wxUSE_LOG_TRACE - -// wxLogFatalError helper: show the (fatal) error to the user in a safe way, -// i.e. without using wxMessageBox() for example because it could crash -void WXDLLIMPEXP_BASE -wxSafeShowMessage(const wxString& title, const wxString& text); - -// ---------------------------------------------------------------------------- -// debug only logging functions: use them with API name and error code -// ---------------------------------------------------------------------------- - -#if wxUSE_LOG_DEBUG - // make life easier for people using VC++ IDE: clicking on the message - // will take us immediately to the place of the failed API -#ifdef __VISUALC__ - #define wxLogApiError(api, rc) \ - wxLogDebug(wxT("%s(%d): '%s' failed with error 0x%08lx (%s)."), \ - __FILE__, __LINE__, api, \ - (long)rc, wxSysErrorMsg(rc)) -#else // !VC++ - #define wxLogApiError(api, rc) \ - wxLogDebug(wxT("In file %s at line %d: '%s' failed with ") \ - wxT("error 0x%08lx (%s)."), \ - __FILE__, __LINE__, api, \ - (long)rc, wxSysErrorMsg(rc)) -#endif // VC++/!VC++ - - #define wxLogLastError(api) wxLogApiError(api, wxSysErrorCode()) - -#else // !wxUSE_LOG_DEBUG - #define wxLogApiError(api, err) wxLogNop() - #define wxLogLastError(api) wxLogNop() -#endif // wxUSE_LOG_DEBUG/!wxUSE_LOG_DEBUG - -// macro which disables debug logging in release builds: this is done by -// default by wxIMPLEMENT_APP() so usually it doesn't need to be used explicitly -#if defined(NDEBUG) && wxUSE_LOG_DEBUG - #define wxDISABLE_DEBUG_LOGGING_IN_RELEASE_BUILD() \ - wxLog::SetLogLevel(wxLOG_Info) -#else // !NDEBUG - #define wxDISABLE_DEBUG_LOGGING_IN_RELEASE_BUILD() -#endif // NDEBUG/!NDEBUG - -#endif // _WX_LOG_H_ - diff --git a/Externals/wxWidgets3/include/wx/longlong.h b/Externals/wxWidgets3/include/wx/longlong.h deleted file mode 100644 index f28a3635c8..0000000000 --- a/Externals/wxWidgets3/include/wx/longlong.h +++ /dev/null @@ -1,1131 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/longlong.h -// Purpose: declaration of wxLongLong class - best implementation of a 64 -// bit integer for the current platform. -// Author: Jeffrey C. Ollie , Vadim Zeitlin -// Modified by: -// Created: 10.02.99 -// Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_LONGLONG_H -#define _WX_LONGLONG_H - -#include "wx/defs.h" - -#if wxUSE_LONGLONG - -#include "wx/string.h" - -#include // for LONG_MAX - -// define this to compile wxLongLongWx in "test" mode: the results of all -// calculations will be compared with the real results taken from -// wxLongLongNative -- this is extremely useful to find the bugs in -// wxLongLongWx class! - -// #define wxLONGLONG_TEST_MODE - -#ifdef wxLONGLONG_TEST_MODE - #define wxUSE_LONGLONG_WX 1 - #define wxUSE_LONGLONG_NATIVE 1 -#endif // wxLONGLONG_TEST_MODE - -// ---------------------------------------------------------------------------- -// decide upon which class we will use -// ---------------------------------------------------------------------------- - -#ifndef wxLongLong_t - // both warning and pragma warning are not portable, but at least an - // unknown pragma should never be an error -- except that, actually, some - // broken compilers don't like it, so we have to disable it in this case - // - #ifdef __GNUC__ - #warning "Your compiler does not appear to support 64 bit "\ - "integers, using emulation class instead.\n" \ - "Please report your compiler version to " \ - "wx-dev@googlegroups.com!" - #else - #pragma warning "Your compiler does not appear to support 64 bit "\ - "integers, using emulation class instead.\n" \ - "Please report your compiler version to " \ - "wx-dev@googlegroups.com!" - #endif - - #define wxUSE_LONGLONG_WX 1 -#endif // compiler - -// the user may predefine wxUSE_LONGLONG_NATIVE and/or wxUSE_LONGLONG_NATIVE -// to disable automatic testing (useful for the test program which defines -// both classes) but by default we only use one class -#if (defined(wxUSE_LONGLONG_WX) && wxUSE_LONGLONG_WX) || !defined(wxLongLong_t) - // don't use both classes unless wxUSE_LONGLONG_NATIVE was explicitly set: - // this is useful in test programs and only there - #ifndef wxUSE_LONGLONG_NATIVE - #define wxUSE_LONGLONG_NATIVE 0 - #endif - - class WXDLLIMPEXP_FWD_BASE wxLongLongWx; - class WXDLLIMPEXP_FWD_BASE wxULongLongWx; -#if defined(__VISUALC__) && !defined(__WIN32__) - #define wxLongLong wxLongLongWx - #define wxULongLong wxULongLongWx -#else - typedef wxLongLongWx wxLongLong; - typedef wxULongLongWx wxULongLong; -#endif - -#else - // if nothing is defined, use native implementation by default, of course - #ifndef wxUSE_LONGLONG_NATIVE - #define wxUSE_LONGLONG_NATIVE 1 - #endif -#endif - -#ifndef wxUSE_LONGLONG_WX - #define wxUSE_LONGLONG_WX 0 - class WXDLLIMPEXP_FWD_BASE wxLongLongNative; - class WXDLLIMPEXP_FWD_BASE wxULongLongNative; - typedef wxLongLongNative wxLongLong; - typedef wxULongLongNative wxULongLong; -#endif - -// NB: if both wxUSE_LONGLONG_WX and NATIVE are defined, the user code should -// typedef wxLongLong as it wants, we don't do it - -// ---------------------------------------------------------------------------- -// choose the appropriate class -// ---------------------------------------------------------------------------- - -// we use iostream for wxLongLong output -#include "wx/iosfwrap.h" - -#if wxUSE_LONGLONG_NATIVE - -class WXDLLIMPEXP_BASE wxLongLongNative -{ -public: - // ctors - // default ctor initializes to 0 - wxLongLongNative() : m_ll(0) { } - // from long long - wxLongLongNative(wxLongLong_t ll) : m_ll(ll) { } - // from 2 longs - wxLongLongNative(wxInt32 hi, wxUint32 lo) - { - // cast to wxLongLong_t first to avoid precision loss! - m_ll = ((wxLongLong_t) hi) << 32; - m_ll |= (wxLongLong_t) lo; - } -#if wxUSE_LONGLONG_WX - wxLongLongNative(wxLongLongWx ll); -#endif - - // default copy ctor is ok - - // no dtor - - // assignment operators - // from native 64 bit integer -#ifndef wxLongLongIsLong - wxLongLongNative& operator=(wxLongLong_t ll) - { m_ll = ll; return *this; } - wxLongLongNative& operator=(wxULongLong_t ll) - { m_ll = ll; return *this; } -#endif // !wxLongLongNative - wxLongLongNative& operator=(const wxULongLongNative &ll); - wxLongLongNative& operator=(int l) - { m_ll = l; return *this; } - wxLongLongNative& operator=(long l) - { m_ll = l; return *this; } - wxLongLongNative& operator=(unsigned int l) - { m_ll = l; return *this; } - wxLongLongNative& operator=(unsigned long l) - { m_ll = l; return *this; } -#if wxUSE_LONGLONG_WX - wxLongLongNative& operator=(wxLongLongWx ll); - wxLongLongNative& operator=(const class wxULongLongWx &ll); -#endif - - - // from double: this one has an explicit name because otherwise we - // would have ambiguity with "ll = int" and also because we don't want - // to have implicit conversions between doubles and wxLongLongs - wxLongLongNative& Assign(double d) - { m_ll = (wxLongLong_t)d; return *this; } - - // assignment operators from wxLongLongNative is ok - - // accessors - // get high part - wxInt32 GetHi() const - { return wx_truncate_cast(wxInt32, m_ll >> 32); } - // get low part - wxUint32 GetLo() const - { return wx_truncate_cast(wxUint32, m_ll); } - - // get absolute value - wxLongLongNative Abs() const { return wxLongLongNative(*this).Abs(); } - wxLongLongNative& Abs() { if ( m_ll < 0 ) m_ll = -m_ll; return *this; } - - // convert to native long long - wxLongLong_t GetValue() const { return m_ll; } - - // convert to long with range checking in debug mode (only!) - long ToLong() const - { - // This assert is useless if long long is the same as long (which is - // the case under the standard Unix LP64 model). -#ifdef wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG - wxASSERT_MSG( (m_ll >= LONG_MIN) && (m_ll <= LONG_MAX), - wxT("wxLongLong to long conversion loss of precision") ); -#endif - - return wx_truncate_cast(long, m_ll); - } - - // convert to double - double ToDouble() const { return wx_truncate_cast(double, m_ll); } - - // don't provide implicit conversion to wxLongLong_t or we will have an - // ambiguity for all arithmetic operations - //operator wxLongLong_t() const { return m_ll; } - - // operations - // addition - wxLongLongNative operator+(const wxLongLongNative& ll) const - { return wxLongLongNative(m_ll + ll.m_ll); } - wxLongLongNative& operator+=(const wxLongLongNative& ll) - { m_ll += ll.m_ll; return *this; } - - wxLongLongNative operator+(const wxLongLong_t ll) const - { return wxLongLongNative(m_ll + ll); } - wxLongLongNative& operator+=(const wxLongLong_t ll) - { m_ll += ll; return *this; } - - // pre increment - wxLongLongNative& operator++() - { m_ll++; return *this; } - - // post increment - wxLongLongNative operator++(int) - { wxLongLongNative value(*this); m_ll++; return value; } - - // negation operator - wxLongLongNative operator-() const - { return wxLongLongNative(-m_ll); } - wxLongLongNative& Negate() { m_ll = -m_ll; return *this; } - - // subtraction - wxLongLongNative operator-(const wxLongLongNative& ll) const - { return wxLongLongNative(m_ll - ll.m_ll); } - wxLongLongNative& operator-=(const wxLongLongNative& ll) - { m_ll -= ll.m_ll; return *this; } - - wxLongLongNative operator-(const wxLongLong_t ll) const - { return wxLongLongNative(m_ll - ll); } - wxLongLongNative& operator-=(const wxLongLong_t ll) - { m_ll -= ll; return *this; } - - // pre decrement - wxLongLongNative& operator--() - { m_ll--; return *this; } - - // post decrement - wxLongLongNative operator--(int) - { wxLongLongNative value(*this); m_ll--; return value; } - - // shifts - // left shift - wxLongLongNative operator<<(int shift) const - { return wxLongLongNative(m_ll << shift); } - wxLongLongNative& operator<<=(int shift) - { m_ll <<= shift; return *this; } - - // right shift - wxLongLongNative operator>>(int shift) const - { return wxLongLongNative(m_ll >> shift); } - wxLongLongNative& operator>>=(int shift) - { m_ll >>= shift; return *this; } - - // bitwise operators - wxLongLongNative operator&(const wxLongLongNative& ll) const - { return wxLongLongNative(m_ll & ll.m_ll); } - wxLongLongNative& operator&=(const wxLongLongNative& ll) - { m_ll &= ll.m_ll; return *this; } - - wxLongLongNative operator|(const wxLongLongNative& ll) const - { return wxLongLongNative(m_ll | ll.m_ll); } - wxLongLongNative& operator|=(const wxLongLongNative& ll) - { m_ll |= ll.m_ll; return *this; } - - wxLongLongNative operator^(const wxLongLongNative& ll) const - { return wxLongLongNative(m_ll ^ ll.m_ll); } - wxLongLongNative& operator^=(const wxLongLongNative& ll) - { m_ll ^= ll.m_ll; return *this; } - - // multiplication/division - wxLongLongNative operator*(const wxLongLongNative& ll) const - { return wxLongLongNative(m_ll * ll.m_ll); } - wxLongLongNative operator*(long l) const - { return wxLongLongNative(m_ll * l); } - wxLongLongNative& operator*=(const wxLongLongNative& ll) - { m_ll *= ll.m_ll; return *this; } - wxLongLongNative& operator*=(long l) - { m_ll *= l; return *this; } - - wxLongLongNative operator/(const wxLongLongNative& ll) const - { return wxLongLongNative(m_ll / ll.m_ll); } - wxLongLongNative operator/(long l) const - { return wxLongLongNative(m_ll / l); } - wxLongLongNative& operator/=(const wxLongLongNative& ll) - { m_ll /= ll.m_ll; return *this; } - wxLongLongNative& operator/=(long l) - { m_ll /= l; return *this; } - - wxLongLongNative operator%(const wxLongLongNative& ll) const - { return wxLongLongNative(m_ll % ll.m_ll); } - wxLongLongNative operator%(long l) const - { return wxLongLongNative(m_ll % l); } - - // comparison - bool operator==(const wxLongLongNative& ll) const - { return m_ll == ll.m_ll; } - bool operator==(long l) const - { return m_ll == l; } - bool operator!=(const wxLongLongNative& ll) const - { return m_ll != ll.m_ll; } - bool operator!=(long l) const - { return m_ll != l; } - bool operator<(const wxLongLongNative& ll) const - { return m_ll < ll.m_ll; } - bool operator<(long l) const - { return m_ll < l; } - bool operator>(const wxLongLongNative& ll) const - { return m_ll > ll.m_ll; } - bool operator>(long l) const - { return m_ll > l; } - bool operator<=(const wxLongLongNative& ll) const - { return m_ll <= ll.m_ll; } - bool operator<=(long l) const - { return m_ll <= l; } - bool operator>=(const wxLongLongNative& ll) const - { return m_ll >= ll.m_ll; } - bool operator>=(long l) const - { return m_ll >= l; } - - // miscellaneous - - // return the string representation of this number - wxString ToString() const; - - // conversion to byte array: returns a pointer to static buffer! - void *asArray() const; - -#if wxUSE_STD_IOSTREAM - // input/output - friend WXDLLIMPEXP_BASE - wxSTD ostream& operator<<(wxSTD ostream&, const wxLongLongNative&); -#endif - - friend WXDLLIMPEXP_BASE - wxString& operator<<(wxString&, const wxLongLongNative&); - -#if wxUSE_STREAMS - friend WXDLLIMPEXP_BASE - class wxTextOutputStream& operator<<(class wxTextOutputStream&, const wxLongLongNative&); - friend WXDLLIMPEXP_BASE - class wxTextInputStream& operator>>(class wxTextInputStream&, wxLongLongNative&); -#endif - -private: - wxLongLong_t m_ll; -}; - - -class WXDLLIMPEXP_BASE wxULongLongNative -{ -public: - // ctors - // default ctor initializes to 0 - wxULongLongNative() : m_ll(0) { } - // from long long - wxULongLongNative(wxULongLong_t ll) : m_ll(ll) { } - // from 2 longs - wxULongLongNative(wxUint32 hi, wxUint32 lo) : m_ll(0) - { - // cast to wxLongLong_t first to avoid precision loss! - m_ll = ((wxULongLong_t) hi) << 32; - m_ll |= (wxULongLong_t) lo; - } - -#if wxUSE_LONGLONG_WX - wxULongLongNative(const class wxULongLongWx &ll); -#endif - - // default copy ctor is ok - - // no dtor - - // assignment operators - // from native 64 bit integer -#ifndef wxLongLongIsLong - wxULongLongNative& operator=(wxULongLong_t ll) - { m_ll = ll; return *this; } - wxULongLongNative& operator=(wxLongLong_t ll) - { m_ll = ll; return *this; } -#endif // !wxLongLongNative - wxULongLongNative& operator=(int l) - { m_ll = l; return *this; } - wxULongLongNative& operator=(long l) - { m_ll = l; return *this; } - wxULongLongNative& operator=(unsigned int l) - { m_ll = l; return *this; } - wxULongLongNative& operator=(unsigned long l) - { m_ll = l; return *this; } - wxULongLongNative& operator=(const wxLongLongNative &ll) - { m_ll = ll.GetValue(); return *this; } -#if wxUSE_LONGLONG_WX - wxULongLongNative& operator=(wxLongLongWx ll); - wxULongLongNative& operator=(const class wxULongLongWx &ll); -#endif - - // assignment operators from wxULongLongNative is ok - - // accessors - // get high part - wxUint32 GetHi() const - { return wx_truncate_cast(wxUint32, m_ll >> 32); } - // get low part - wxUint32 GetLo() const - { return wx_truncate_cast(wxUint32, m_ll); } - - // convert to native ulong long - wxULongLong_t GetValue() const { return m_ll; } - - // convert to ulong with range checking in debug mode (only!) - unsigned long ToULong() const - { - wxASSERT_MSG( m_ll <= ULONG_MAX, - wxT("wxULongLong to long conversion loss of precision") ); - - return wx_truncate_cast(unsigned long, m_ll); - } - - // convert to double - double ToDouble() const { return wx_truncate_cast(double, m_ll); } - - // operations - // addition - wxULongLongNative operator+(const wxULongLongNative& ll) const - { return wxULongLongNative(m_ll + ll.m_ll); } - wxULongLongNative& operator+=(const wxULongLongNative& ll) - { m_ll += ll.m_ll; return *this; } - - wxULongLongNative operator+(const wxULongLong_t ll) const - { return wxULongLongNative(m_ll + ll); } - wxULongLongNative& operator+=(const wxULongLong_t ll) - { m_ll += ll; return *this; } - - // pre increment - wxULongLongNative& operator++() - { m_ll++; return *this; } - - // post increment - wxULongLongNative operator++(int) - { wxULongLongNative value(*this); m_ll++; return value; } - - // subtraction - wxULongLongNative operator-(const wxULongLongNative& ll) const - { return wxULongLongNative(m_ll - ll.m_ll); } - wxULongLongNative& operator-=(const wxULongLongNative& ll) - { m_ll -= ll.m_ll; return *this; } - - wxULongLongNative operator-(const wxULongLong_t ll) const - { return wxULongLongNative(m_ll - ll); } - wxULongLongNative& operator-=(const wxULongLong_t ll) - { m_ll -= ll; return *this; } - - // pre decrement - wxULongLongNative& operator--() - { m_ll--; return *this; } - - // post decrement - wxULongLongNative operator--(int) - { wxULongLongNative value(*this); m_ll--; return value; } - - // shifts - // left shift - wxULongLongNative operator<<(int shift) const - { return wxULongLongNative(m_ll << shift); } - wxULongLongNative& operator<<=(int shift) - { m_ll <<= shift; return *this; } - - // right shift - wxULongLongNative operator>>(int shift) const - { return wxULongLongNative(m_ll >> shift); } - wxULongLongNative& operator>>=(int shift) - { m_ll >>= shift; return *this; } - - // bitwise operators - wxULongLongNative operator&(const wxULongLongNative& ll) const - { return wxULongLongNative(m_ll & ll.m_ll); } - wxULongLongNative& operator&=(const wxULongLongNative& ll) - { m_ll &= ll.m_ll; return *this; } - - wxULongLongNative operator|(const wxULongLongNative& ll) const - { return wxULongLongNative(m_ll | ll.m_ll); } - wxULongLongNative& operator|=(const wxULongLongNative& ll) - { m_ll |= ll.m_ll; return *this; } - - wxULongLongNative operator^(const wxULongLongNative& ll) const - { return wxULongLongNative(m_ll ^ ll.m_ll); } - wxULongLongNative& operator^=(const wxULongLongNative& ll) - { m_ll ^= ll.m_ll; return *this; } - - // multiplication/division - wxULongLongNative operator*(const wxULongLongNative& ll) const - { return wxULongLongNative(m_ll * ll.m_ll); } - wxULongLongNative operator*(unsigned long l) const - { return wxULongLongNative(m_ll * l); } - wxULongLongNative& operator*=(const wxULongLongNative& ll) - { m_ll *= ll.m_ll; return *this; } - wxULongLongNative& operator*=(unsigned long l) - { m_ll *= l; return *this; } - - wxULongLongNative operator/(const wxULongLongNative& ll) const - { return wxULongLongNative(m_ll / ll.m_ll); } - wxULongLongNative operator/(unsigned long l) const - { return wxULongLongNative(m_ll / l); } - wxULongLongNative& operator/=(const wxULongLongNative& ll) - { m_ll /= ll.m_ll; return *this; } - wxULongLongNative& operator/=(unsigned long l) - { m_ll /= l; return *this; } - - wxULongLongNative operator%(const wxULongLongNative& ll) const - { return wxULongLongNative(m_ll % ll.m_ll); } - wxULongLongNative operator%(unsigned long l) const - { return wxULongLongNative(m_ll % l); } - - // comparison - bool operator==(const wxULongLongNative& ll) const - { return m_ll == ll.m_ll; } - bool operator==(unsigned long l) const - { return m_ll == l; } - bool operator!=(const wxULongLongNative& ll) const - { return m_ll != ll.m_ll; } - bool operator!=(unsigned long l) const - { return m_ll != l; } - bool operator<(const wxULongLongNative& ll) const - { return m_ll < ll.m_ll; } - bool operator<(unsigned long l) const - { return m_ll < l; } - bool operator>(const wxULongLongNative& ll) const - { return m_ll > ll.m_ll; } - bool operator>(unsigned long l) const - { return m_ll > l; } - bool operator<=(const wxULongLongNative& ll) const - { return m_ll <= ll.m_ll; } - bool operator<=(unsigned long l) const - { return m_ll <= l; } - bool operator>=(const wxULongLongNative& ll) const - { return m_ll >= ll.m_ll; } - bool operator>=(unsigned long l) const - { return m_ll >= l; } - - // miscellaneous - - // return the string representation of this number - wxString ToString() const; - - // conversion to byte array: returns a pointer to static buffer! - void *asArray() const; - -#if wxUSE_STD_IOSTREAM - // input/output - friend WXDLLIMPEXP_BASE - wxSTD ostream& operator<<(wxSTD ostream&, const wxULongLongNative&); -#endif - - friend WXDLLIMPEXP_BASE - wxString& operator<<(wxString&, const wxULongLongNative&); - -#if wxUSE_STREAMS - friend WXDLLIMPEXP_BASE - class wxTextOutputStream& operator<<(class wxTextOutputStream&, const wxULongLongNative&); - friend WXDLLIMPEXP_BASE - class wxTextInputStream& operator>>(class wxTextInputStream&, wxULongLongNative&); -#endif - -private: - wxULongLong_t m_ll; -}; - -inline -wxLongLongNative& wxLongLongNative::operator=(const wxULongLongNative &ll) -{ - m_ll = ll.GetValue(); - return *this; -} - -#endif // wxUSE_LONGLONG_NATIVE - -#if wxUSE_LONGLONG_WX - -class WXDLLIMPEXP_BASE wxLongLongWx -{ -public: - // ctors - // default ctor initializes to 0 - wxLongLongWx() - { - m_lo = m_hi = 0; - -#ifdef wxLONGLONG_TEST_MODE - m_ll = 0; - - Check(); -#endif // wxLONGLONG_TEST_MODE - } - // from long - wxLongLongWx(long l) { *this = l; } - // from 2 longs - wxLongLongWx(long hi, unsigned long lo) - { - m_hi = hi; - m_lo = lo; - -#ifdef wxLONGLONG_TEST_MODE - m_ll = hi; - m_ll <<= 32; - m_ll |= lo; - - Check(); -#endif // wxLONGLONG_TEST_MODE - } - - // default copy ctor is ok in both cases - - // no dtor - - // assignment operators - // from long - wxLongLongWx& operator=(long l) - { - m_lo = l; - m_hi = (l < 0 ? -1l : 0l); - -#ifdef wxLONGLONG_TEST_MODE - m_ll = l; - - Check(); -#endif // wxLONGLONG_TEST_MODE - - return *this; - } - // from int - wxLongLongWx& operator=(int l) - { - return operator=((long)l); - } - - wxLongLongWx& operator=(unsigned long l) - { - m_lo = l; - m_hi = 0; - -#ifdef wxLONGLONG_TEST_MODE - m_ll = l; - - Check(); -#endif // wxLONGLONG_TEST_MODE - - return *this; - } - - wxLongLongWx& operator=(unsigned int l) - { - return operator=((unsigned long)l); - } - - wxLongLongWx& operator=(const class wxULongLongWx &ll); - - // from double - wxLongLongWx& Assign(double d); - // can't have assignment operator from 2 longs - - // accessors - // get high part - long GetHi() const { return m_hi; } - // get low part - unsigned long GetLo() const { return m_lo; } - - // get absolute value - wxLongLongWx Abs() const { return wxLongLongWx(*this).Abs(); } - wxLongLongWx& Abs() - { - if ( m_hi < 0 ) - m_hi = -m_hi; - -#ifdef wxLONGLONG_TEST_MODE - if ( m_ll < 0 ) - m_ll = -m_ll; - - Check(); -#endif // wxLONGLONG_TEST_MODE - - return *this; - } - - // convert to long with range checking in debug mode (only!) - long ToLong() const - { - wxASSERT_MSG( (m_hi == 0l) || (m_hi == -1l), - wxT("wxLongLong to long conversion loss of precision") ); - - return (long)m_lo; - } - - // convert to double - double ToDouble() const; - - // operations - // addition - wxLongLongWx operator+(const wxLongLongWx& ll) const; - wxLongLongWx& operator+=(const wxLongLongWx& ll); - wxLongLongWx operator+(long l) const; - wxLongLongWx& operator+=(long l); - - // pre increment operator - wxLongLongWx& operator++(); - - // post increment operator - wxLongLongWx& operator++(int) { return ++(*this); } - - // negation operator - wxLongLongWx operator-() const; - wxLongLongWx& Negate(); - - // subraction - wxLongLongWx operator-(const wxLongLongWx& ll) const; - wxLongLongWx& operator-=(const wxLongLongWx& ll); - - // pre decrement operator - wxLongLongWx& operator--(); - - // post decrement operator - wxLongLongWx& operator--(int) { return --(*this); } - - // shifts - // left shift - wxLongLongWx operator<<(int shift) const; - wxLongLongWx& operator<<=(int shift); - - // right shift - wxLongLongWx operator>>(int shift) const; - wxLongLongWx& operator>>=(int shift); - - // bitwise operators - wxLongLongWx operator&(const wxLongLongWx& ll) const; - wxLongLongWx& operator&=(const wxLongLongWx& ll); - wxLongLongWx operator|(const wxLongLongWx& ll) const; - wxLongLongWx& operator|=(const wxLongLongWx& ll); - wxLongLongWx operator^(const wxLongLongWx& ll) const; - wxLongLongWx& operator^=(const wxLongLongWx& ll); - wxLongLongWx operator~() const; - - // comparison - bool operator==(const wxLongLongWx& ll) const - { return m_lo == ll.m_lo && m_hi == ll.m_hi; } -#if wxUSE_LONGLONG_NATIVE - bool operator==(const wxLongLongNative& ll) const - { return m_lo == ll.GetLo() && m_hi == ll.GetHi(); } -#endif - bool operator!=(const wxLongLongWx& ll) const - { return !(*this == ll); } - bool operator<(const wxLongLongWx& ll) const; - bool operator>(const wxLongLongWx& ll) const; - bool operator<=(const wxLongLongWx& ll) const - { return *this < ll || *this == ll; } - bool operator>=(const wxLongLongWx& ll) const - { return *this > ll || *this == ll; } - - bool operator<(long l) const { return *this < wxLongLongWx(l); } - bool operator>(long l) const { return *this > wxLongLongWx(l); } - bool operator==(long l) const - { - return l >= 0 ? (m_hi == 0 && m_lo == (unsigned long)l) - : (m_hi == -1 && m_lo == (unsigned long)l); - } - - bool operator<=(long l) const { return *this < l || *this == l; } - bool operator>=(long l) const { return *this > l || *this == l; } - - // multiplication - wxLongLongWx operator*(const wxLongLongWx& ll) const; - wxLongLongWx& operator*=(const wxLongLongWx& ll); - - // division - wxLongLongWx operator/(const wxLongLongWx& ll) const; - wxLongLongWx& operator/=(const wxLongLongWx& ll); - - wxLongLongWx operator%(const wxLongLongWx& ll) const; - - void Divide(const wxLongLongWx& divisor, - wxLongLongWx& quotient, - wxLongLongWx& remainder) const; - - // input/output - - // return the string representation of this number - wxString ToString() const; - - void *asArray() const; - -#if wxUSE_STD_IOSTREAM - friend WXDLLIMPEXP_BASE - wxSTD ostream& operator<<(wxSTD ostream&, const wxLongLongWx&); -#endif // wxUSE_STD_IOSTREAM - - friend WXDLLIMPEXP_BASE - wxString& operator<<(wxString&, const wxLongLongWx&); - -#if wxUSE_STREAMS - friend WXDLLIMPEXP_BASE - class wxTextOutputStream& operator<<(class wxTextOutputStream&, const wxLongLongWx&); - friend WXDLLIMPEXP_BASE - class wxTextInputStream& operator>>(class wxTextInputStream&, wxLongLongWx&); -#endif - -private: - // long is at least 32 bits, so represent our 64bit number as 2 longs - - long m_hi; // signed bit is in the high part - unsigned long m_lo; - -#ifdef wxLONGLONG_TEST_MODE - void Check() - { - wxASSERT( (m_ll >> 32) == m_hi && (unsigned long)m_ll == m_lo ); - } - - wxLongLong_t m_ll; -#endif // wxLONGLONG_TEST_MODE -}; - - -class WXDLLIMPEXP_BASE wxULongLongWx -{ -public: - // ctors - // default ctor initializes to 0 - wxULongLongWx() - { - m_lo = m_hi = 0; - -#ifdef wxLONGLONG_TEST_MODE - m_ll = 0; - - Check(); -#endif // wxLONGLONG_TEST_MODE - } - // from ulong - wxULongLongWx(unsigned long l) { *this = l; } - // from 2 ulongs - wxULongLongWx(unsigned long hi, unsigned long lo) - { - m_hi = hi; - m_lo = lo; - -#ifdef wxLONGLONG_TEST_MODE - m_ll = hi; - m_ll <<= 32; - m_ll |= lo; - - Check(); -#endif // wxLONGLONG_TEST_MODE - } - - // from signed to unsigned - wxULongLongWx(wxLongLongWx ll) - { - wxASSERT(ll.GetHi() >= 0); - m_hi = (unsigned long)ll.GetHi(); - m_lo = ll.GetLo(); - } - - // default copy ctor is ok in both cases - - // no dtor - - // assignment operators - // from long - wxULongLongWx& operator=(unsigned long l) - { - m_lo = l; - m_hi = 0; - -#ifdef wxLONGLONG_TEST_MODE - m_ll = l; - - Check(); -#endif // wxLONGLONG_TEST_MODE - - return *this; - } - wxULongLongWx& operator=(long l) - { - m_lo = l; - m_hi = (unsigned long) ((l<0) ? -1l : 0); - -#ifdef wxLONGLONG_TEST_MODE - m_ll = (wxULongLong_t) (wxLongLong_t) l; - - Check(); -#endif // wxLONGLONG_TEST_MODE - - return *this; - } - wxULongLongWx& operator=(const class wxLongLongWx &ll) { - // Should we use an assert like it was before in the constructor? - // wxASSERT(ll.GetHi() >= 0); - m_hi = (unsigned long)ll.GetHi(); - m_lo = ll.GetLo(); - return *this; - } - - // can't have assignment operator from 2 longs - - // accessors - // get high part - unsigned long GetHi() const { return m_hi; } - // get low part - unsigned long GetLo() const { return m_lo; } - - // convert to long with range checking in debug mode (only!) - unsigned long ToULong() const - { - wxASSERT_MSG( m_hi == 0ul, - wxT("wxULongLong to long conversion loss of precision") ); - - return (unsigned long)m_lo; - } - - // convert to double - double ToDouble() const; - - // operations - // addition - wxULongLongWx operator+(const wxULongLongWx& ll) const; - wxULongLongWx& operator+=(const wxULongLongWx& ll); - wxULongLongWx operator+(unsigned long l) const; - wxULongLongWx& operator+=(unsigned long l); - - // pre increment operator - wxULongLongWx& operator++(); - - // post increment operator - wxULongLongWx& operator++(int) { return ++(*this); } - - // subtraction - wxLongLongWx operator-(const wxULongLongWx& ll) const; - wxULongLongWx& operator-=(const wxULongLongWx& ll); - - // pre decrement operator - wxULongLongWx& operator--(); - - // post decrement operator - wxULongLongWx& operator--(int) { return --(*this); } - - // shifts - // left shift - wxULongLongWx operator<<(int shift) const; - wxULongLongWx& operator<<=(int shift); - - // right shift - wxULongLongWx operator>>(int shift) const; - wxULongLongWx& operator>>=(int shift); - - // bitwise operators - wxULongLongWx operator&(const wxULongLongWx& ll) const; - wxULongLongWx& operator&=(const wxULongLongWx& ll); - wxULongLongWx operator|(const wxULongLongWx& ll) const; - wxULongLongWx& operator|=(const wxULongLongWx& ll); - wxULongLongWx operator^(const wxULongLongWx& ll) const; - wxULongLongWx& operator^=(const wxULongLongWx& ll); - wxULongLongWx operator~() const; - - // comparison - bool operator==(const wxULongLongWx& ll) const - { return m_lo == ll.m_lo && m_hi == ll.m_hi; } - bool operator!=(const wxULongLongWx& ll) const - { return !(*this == ll); } - bool operator<(const wxULongLongWx& ll) const; - bool operator>(const wxULongLongWx& ll) const; - bool operator<=(const wxULongLongWx& ll) const - { return *this < ll || *this == ll; } - bool operator>=(const wxULongLongWx& ll) const - { return *this > ll || *this == ll; } - - bool operator<(unsigned long l) const { return *this < wxULongLongWx(l); } - bool operator>(unsigned long l) const { return *this > wxULongLongWx(l); } - bool operator==(unsigned long l) const - { - return (m_hi == 0 && m_lo == (unsigned long)l); - } - - bool operator<=(unsigned long l) const { return *this < l || *this == l; } - bool operator>=(unsigned long l) const { return *this > l || *this == l; } - - // multiplication - wxULongLongWx operator*(const wxULongLongWx& ll) const; - wxULongLongWx& operator*=(const wxULongLongWx& ll); - - // division - wxULongLongWx operator/(const wxULongLongWx& ll) const; - wxULongLongWx& operator/=(const wxULongLongWx& ll); - - wxULongLongWx operator%(const wxULongLongWx& ll) const; - - void Divide(const wxULongLongWx& divisor, - wxULongLongWx& quotient, - wxULongLongWx& remainder) const; - - // input/output - - // return the string representation of this number - wxString ToString() const; - - void *asArray() const; - -#if wxUSE_STD_IOSTREAM - friend WXDLLIMPEXP_BASE - wxSTD ostream& operator<<(wxSTD ostream&, const wxULongLongWx&); -#endif // wxUSE_STD_IOSTREAM - - friend WXDLLIMPEXP_BASE - wxString& operator<<(wxString&, const wxULongLongWx&); - -#if wxUSE_STREAMS - friend WXDLLIMPEXP_BASE - class wxTextOutputStream& operator<<(class wxTextOutputStream&, const wxULongLongWx&); - friend WXDLLIMPEXP_BASE - class wxTextInputStream& operator>>(class wxTextInputStream&, wxULongLongWx&); -#endif - -private: - // long is at least 32 bits, so represent our 64bit number as 2 longs - - unsigned long m_hi; - unsigned long m_lo; - -#ifdef wxLONGLONG_TEST_MODE - void Check() - { - wxASSERT( (m_ll >> 32) == m_hi && (unsigned long)m_ll == m_lo ); - } - - wxULongLong_t m_ll; -#endif // wxLONGLONG_TEST_MODE -}; - -#endif // wxUSE_LONGLONG_WX - -// ---------------------------------------------------------------------------- -// binary operators -// ---------------------------------------------------------------------------- - -inline bool operator<(long l, const wxLongLong& ll) { return ll > l; } -inline bool operator>(long l, const wxLongLong& ll) { return ll < l; } -inline bool operator<=(long l, const wxLongLong& ll) { return ll >= l; } -inline bool operator>=(long l, const wxLongLong& ll) { return ll <= l; } -inline bool operator==(long l, const wxLongLong& ll) { return ll == l; } -inline bool operator!=(long l, const wxLongLong& ll) { return ll != l; } - -inline wxLongLong operator+(long l, const wxLongLong& ll) { return ll + l; } -inline wxLongLong operator-(long l, const wxLongLong& ll) -{ - return wxLongLong(l) - ll; -} - -inline bool operator<(unsigned long l, const wxULongLong& ull) { return ull > l; } -inline bool operator>(unsigned long l, const wxULongLong& ull) { return ull < l; } -inline bool operator<=(unsigned long l, const wxULongLong& ull) { return ull >= l; } -inline bool operator>=(unsigned long l, const wxULongLong& ull) { return ull <= l; } -inline bool operator==(unsigned long l, const wxULongLong& ull) { return ull == l; } -inline bool operator!=(unsigned long l, const wxULongLong& ull) { return ull != l; } - -inline wxULongLong operator+(unsigned long l, const wxULongLong& ull) { return ull + l; } - -inline wxLongLong operator-(unsigned long l, const wxULongLong& ull) -{ - wxULongLong ret = wxULongLong(l) - ull; - return wxLongLong((wxInt32)ret.GetHi(),ret.GetLo()); -} - -#if wxUSE_LONGLONG_NATIVE && wxUSE_STREAMS - -WXDLLIMPEXP_BASE class wxTextOutputStream &operator<<(class wxTextOutputStream &stream, wxULongLong_t value); -WXDLLIMPEXP_BASE class wxTextOutputStream &operator<<(class wxTextOutputStream &stream, wxLongLong_t value); - -WXDLLIMPEXP_BASE class wxTextInputStream &operator>>(class wxTextInputStream &stream, wxULongLong_t &value); -WXDLLIMPEXP_BASE class wxTextInputStream &operator>>(class wxTextInputStream &stream, wxLongLong_t &value); - -#endif - -// ---------------------------------------------------------------------------- -// Specialize numeric_limits<> for our long long wrapper classes. -// ---------------------------------------------------------------------------- - -#if wxUSE_LONGLONG_NATIVE - -#include - -namespace std -{ - -#ifdef __clang__ - // libstdc++ (used by Clang) uses struct for numeric_limits; unlike gcc, clang - // warns about this - template<> struct numeric_limits : public numeric_limits {}; - template<> struct numeric_limits : public numeric_limits {}; -#else - template<> class numeric_limits : public numeric_limits {}; - template<> class numeric_limits : public numeric_limits {}; -#endif - -} // namespace std - -#endif // wxUSE_LONGLONG_NATIVE - -// ---------------------------------------------------------------------------- -// Specialize wxArgNormalizer to allow using wxLongLong directly with wx pseudo -// vararg functions. -// ---------------------------------------------------------------------------- - -// Notice that this must be done here and not in wx/strvararg.h itself because -// we can't include wx/longlong.h from there as this header itself includes -// wx/string.h which includes wx/strvararg.h too, so to avoid the circular -// dependencies we can only do it here (or add another header just for this but -// it doesn't seem necessary). -#include "wx/strvararg.h" - -template<> -struct WXDLLIMPEXP_BASE wxArgNormalizer -{ - wxArgNormalizer(wxLongLong value, - const wxFormatString *fmt, unsigned index) - : m_value(value) - { - wxASSERT_ARG_TYPE( fmt, index, wxFormatString::Arg_LongLongInt ); - } - - wxLongLong_t get() const { return m_value.GetValue(); } - - wxLongLong m_value; -}; - -#endif // wxUSE_LONGLONG - -#endif // _WX_LONGLONG_H diff --git a/Externals/wxWidgets3/include/wx/math.h b/Externals/wxWidgets3/include/wx/math.h deleted file mode 100644 index 23ff2f031a..0000000000 --- a/Externals/wxWidgets3/include/wx/math.h +++ /dev/null @@ -1,175 +0,0 @@ -/** -* Name: wx/math.h -* Purpose: Declarations/definitions of common math functions -* Author: John Labenski and others -* Modified by: -* Created: 02/02/03 -* Copyright: (c) John Labenski -* Licence: wxWindows licence -*/ - -/* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */ - -#ifndef _WX_MATH_H_ -#define _WX_MATH_H_ - -#include "wx/defs.h" - -#include - -#ifndef M_PI - #define M_PI 3.1415926535897932384626433832795 -#endif - -/* Scaling factors for various unit conversions: 1 inch = 2.54 cm */ -#ifndef METRIC_CONVERSION_CONSTANT - #define METRIC_CONVERSION_CONSTANT (1/25.4) -#endif - -#ifndef mm2inches - #define mm2inches (METRIC_CONVERSION_CONSTANT) -#endif - -#ifndef inches2mm - #define inches2mm (1/(mm2inches)) -#endif - -#ifndef mm2twips - #define mm2twips (METRIC_CONVERSION_CONSTANT*1440) -#endif - -#ifndef twips2mm - #define twips2mm (1/(mm2twips)) -#endif - -#ifndef mm2pt - #define mm2pt (METRIC_CONVERSION_CONSTANT*72) -#endif - -#ifndef pt2mm - #define pt2mm (1/(mm2pt)) -#endif - - -#ifdef __cplusplus - -/* Any C++11 compiler should provide isfinite() */ -#if __cplusplus >= 201103 - #include - #define wxFinite(x) std::isfinite(x) -#elif defined(__VISUALC__) || defined(__BORLANDC__) - #include - #define wxFinite(x) _finite(x) -#elif defined(__MINGW64_TOOLCHAIN__) || defined(__clang__) - /* - add more compilers with C99 support here: using C99 isfinite() is - preferable to using BSD-ish finite() - */ - #if defined(_GLIBCXX_CMATH) || defined(_LIBCPP_CMATH) - // these headers #undef isfinite - #define wxFinite(x) std::isfinite(x) - #else - #define wxFinite(x) isfinite(x) - #endif -#elif defined(wxNEEDS_STRICT_ANSI_WORKAROUNDS) - wxDECL_FOR_STRICT_MINGW32(int, _finite, (double)) - - #define wxFinite(x) _finite(x) -#elif ( defined(__GNUG__)||defined(__GNUWIN32__)|| \ - defined(__SGI_CC__)||defined(__SUNCC__)||defined(__XLC__)|| \ - defined(__HPUX__) ) && ( !defined(wxOSX_USE_IPHONE) || wxOSX_USE_IPHONE == 0 ) -#ifdef __SOLARIS__ -#include -#endif - #define wxFinite(x) finite(x) -#else - #define wxFinite(x) ((x) == (x)) -#endif - - -#if defined(__VISUALC__)||defined(__BORLAND__) - #define wxIsNaN(x) _isnan(x) -#elif defined(__GNUG__)||defined(__GNUWIN32__)|| \ - defined(__SGI_CC__)||defined(__SUNCC__)||defined(__XLC__)|| \ - defined(__HPUX__) - #define wxIsNaN(x) isnan(x) -#else - #define wxIsNaN(x) ((x) != (x)) -#endif - -#ifdef __INTELC__ - - inline bool wxIsSameDouble(double x, double y) - { - // VZ: this warning, given for operators==() and !=() is not wrong, as == - // shouldn't be used with doubles, but we get too many of them and - // removing these operators is probably not a good idea - // - // Maybe we should always compare doubles up to some "epsilon" precision - #pragma warning(push) - - // floating-point equality and inequality comparisons are unreliable - #pragma warning(disable: 1572) - - return x == y; - - #pragma warning(pop) - } - -#else /* !__INTELC__ */ - wxGCC_WARNING_SUPPRESS(float-equal) - inline bool wxIsSameDouble(double x, double y) { return x == y; } - wxGCC_WARNING_RESTORE(float-equal) - -#endif /* __INTELC__/!__INTELC__ */ - -inline bool wxIsNullDouble(double x) { return wxIsSameDouble(x, 0.); } - -inline int wxRound(double x) -{ - wxASSERT_MSG( x > INT_MIN - 0.5 && x < INT_MAX + 0.5, - wxT("argument out of supported range") ); - - #if defined(HAVE_ROUND) - return int(round(x)); - #else - return (int)(x < 0 ? x - 0.5 : x + 0.5); - #endif -} - -// Convert between degrees and radians. -inline double wxDegToRad(double deg) { return (deg * M_PI) / 180.0; } -inline double wxRadToDeg(double rad) { return (rad * 180.0) / M_PI; } - -#endif /* __cplusplus */ - - -#if defined(__WINDOWS__) - #define wxMulDivInt32( a , b , c ) ::MulDiv( a , b , c ) -#else - #define wxMulDivInt32( a , b , c ) (wxRound((a)*(((wxDouble)b)/((wxDouble)c)))) -#endif - -#if wxUSE_APPLE_IEEE -#ifdef __cplusplus - extern "C" { -#endif - /* functions from common/extended.c */ - WXDLLIMPEXP_BASE wxFloat64 wxConvertFromIeeeExtended(const wxInt8 *bytes); - WXDLLIMPEXP_BASE void wxConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes); - - /* use wxConvertFromIeeeExtended() and wxConvertToIeeeExtended() instead */ -#if WXWIN_COMPATIBILITY_2_8 - wxDEPRECATED( WXDLLIMPEXP_BASE wxFloat64 ConvertFromIeeeExtended(const wxInt8 *bytes) ); - wxDEPRECATED( WXDLLIMPEXP_BASE void ConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes) ); -#endif - -#ifdef __cplusplus - } -#endif -#endif /* wxUSE_APPLE_IEEE */ - -/* Compute the greatest common divisor of two positive integers */ -WXDLLIMPEXP_BASE unsigned int wxGCD(unsigned int u, unsigned int v); - -#endif /* _WX_MATH_H_ */ diff --git a/Externals/wxWidgets3/include/wx/matrix.h b/Externals/wxWidgets3/include/wx/matrix.h deleted file mode 100644 index 859c2a28d1..0000000000 --- a/Externals/wxWidgets3/include/wx/matrix.h +++ /dev/null @@ -1,234 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/matrix.h -// Purpose: wxTransformMatrix class. NOT YET USED -// Author: Chris Breeze, Julian Smart -// Modified by: Klaas Holwerda -// Created: 01/02/97 -// Copyright: (c) Julian Smart, Chris Breeze -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MATRIXH__ -#define _WX_MATRIXH__ - -//! headerfiles="matrix.h wx/object.h" -#include "wx/object.h" -#include "wx/math.h" - -//! codefiles="matrix.cpp" - -// A simple 3x3 matrix. This may be replaced by a more general matrix -// class some day. -// -// Note: this is intended to be used in wxDC at some point to replace -// the current system of scaling/translation. It is not yet used. - -//:definition -// A 3x3 matrix to do 2D transformations. -// It can be used to map data to window coordinates, -// and also for manipulating your own data. -// For example drawing a picture (composed of several primitives) -// at a certain coordinate and angle within another parent picture. -// At all times m_isIdentity is set if the matrix itself is an Identity matrix. -// It is used where possible to optimize calculations. -class WXDLLIMPEXP_CORE wxTransformMatrix: public wxObject -{ -public: - wxTransformMatrix(void); - wxTransformMatrix(const wxTransformMatrix& mat); - - //get the value in the matrix at col,row - //rows are horizontal (second index of m_matrix member) - //columns are vertical (first index of m_matrix member) - double GetValue(int col, int row) const; - - //set the value in the matrix at col,row - //rows are horizontal (second index of m_matrix member) - //columns are vertical (first index of m_matrix member) - void SetValue(int col, int row, double value); - - void operator = (const wxTransformMatrix& mat); - bool operator == (const wxTransformMatrix& mat) const; - bool operator != (const wxTransformMatrix& mat) const; - - //multiply every element by t - wxTransformMatrix& operator*=(const double& t); - //divide every element by t - wxTransformMatrix& operator/=(const double& t); - //add matrix m to this t - wxTransformMatrix& operator+=(const wxTransformMatrix& m); - //subtract matrix m from this - wxTransformMatrix& operator-=(const wxTransformMatrix& m); - //multiply matrix m with this - wxTransformMatrix& operator*=(const wxTransformMatrix& m); - - // constant operators - - //multiply every element by t and return result - wxTransformMatrix operator*(const double& t) const; - //divide this matrix by t and return result - wxTransformMatrix operator/(const double& t) const; - //add matrix m to this and return result - wxTransformMatrix operator+(const wxTransformMatrix& m) const; - //subtract matrix m from this and return result - wxTransformMatrix operator-(const wxTransformMatrix& m) const; - //multiply this by matrix m and return result - wxTransformMatrix operator*(const wxTransformMatrix& m) const; - wxTransformMatrix operator-() const; - - //rows are horizontal (second index of m_matrix member) - //columns are vertical (first index of m_matrix member) - double& operator()(int col, int row); - - //rows are horizontal (second index of m_matrix member) - //columns are vertical (first index of m_matrix member) - double operator()(int col, int row) const; - - // Invert matrix - bool Invert(void); - - // Make into identity matrix - bool Identity(void); - - // Is the matrix the identity matrix? - // Only returns a flag, which is set whenever an operation - // is done. - inline bool IsIdentity(void) const { return m_isIdentity; } - - // This does an actual check. - inline bool IsIdentity1(void) const ; - - //Scale by scale (isotropic scaling i.e. the same in x and y): - //!ex: - //!code: | scale 0 0 | - //!code: matrix' = | 0 scale 0 | x matrix - //!code: | 0 0 scale | - bool Scale(double scale); - - //Scale with center point and x/y scale - // - //!ex: - //!code: | xs 0 xc(1-xs) | - //!code: matrix' = | 0 ys yc(1-ys) | x matrix - //!code: | 0 0 1 | - wxTransformMatrix& Scale(const double &xs, const double &ys,const double &xc, const double &yc); - - // mirror a matrix in x, y - //!ex: - //!code: | -1 0 0 | - //!code: matrix' = | 0 -1 0 | x matrix - //!code: | 0 0 1 | - wxTransformMatrix& Mirror(bool x=true, bool y=false); - // Translate by dx, dy: - //!ex: - //!code: | 1 0 dx | - //!code: matrix' = | 0 1 dy | x matrix - //!code: | 0 0 1 | - bool Translate(double x, double y); - - // Rotate clockwise by the given number of degrees: - //!ex: - //!code: | cos sin 0 | - //!code: matrix' = | -sin cos 0 | x matrix - //!code: | 0 0 1 | - bool Rotate(double angle); - - //Rotate counter clockwise with point of rotation - // - //!ex: - //!code: | cos(r) -sin(r) x(1-cos(r))+y(sin(r)| - //!code: matrix' = | sin(r) cos(r) y(1-cos(r))-x(sin(r)| x matrix - //!code: | 0 0 1 | - wxTransformMatrix& Rotate(const double &r, const double &x, const double &y); - - // Transform X value from logical to device - inline double TransformX(double x) const; - - // Transform Y value from logical to device - inline double TransformY(double y) const; - - // Transform a point from logical to device coordinates - bool TransformPoint(double x, double y, double& tx, double& ty) const; - - // Transform a point from device to logical coordinates. - // Example of use: - // wxTransformMatrix mat = dc.GetTransformation(); - // mat.Invert(); - // mat.InverseTransformPoint(x, y, x1, y1); - // OR (shorthand:) - // dc.LogicalToDevice(x, y, x1, y1); - // The latter is slightly less efficient if we're doing several - // conversions, since the matrix is inverted several times. - // N.B. 'this' matrix is the inverse at this point - bool InverseTransformPoint(double x, double y, double& tx, double& ty) const; - - double Get_scaleX(); - double Get_scaleY(); - double GetRotation(); - void SetRotation(double rotation); - - -public: - double m_matrix[3][3]; - bool m_isIdentity; -}; - - -/* -Chris Breeze reported, that -some functions of wxTransformMatrix cannot work because it is not -known if he matrix has been inverted. Be careful when using it. -*/ - -// Transform X value from logical to device -// warning: this function can only be used for this purpose -// because no rotation is involved when mapping logical to device coordinates -// mirror and scaling for x and y will be part of the matrix -// if you have a matrix that is rotated, eg a shape containing a matrix to place -// it in the logical coordinate system, use TransformPoint -inline double wxTransformMatrix::TransformX(double x) const -{ - //normally like this, but since no rotation is involved (only mirror and scale) - //we can do without Y -> m_matrix[1]{0] is -sin(rotation angle) and therefore zero - //(x * m_matrix[0][0] + y * m_matrix[1][0] + m_matrix[2][0])) - return (m_isIdentity ? x : (x * m_matrix[0][0] + m_matrix[2][0])); -} - -// Transform Y value from logical to device -// warning: this function can only be used for this purpose -// because no rotation is involved when mapping logical to device coordinates -// mirror and scaling for x and y will be part of the matrix -// if you have a matrix that is rotated, eg a shape containing a matrix to place -// it in the logical coordinate system, use TransformPoint -inline double wxTransformMatrix::TransformY(double y) const -{ - //normally like this, but since no rotation is involved (only mirror and scale) - //we can do without X -> m_matrix[0]{1] is sin(rotation angle) and therefore zero - //(x * m_matrix[0][1] + y * m_matrix[1][1] + m_matrix[2][1])) - return (m_isIdentity ? y : (y * m_matrix[1][1] + m_matrix[2][1])); -} - - -// Is the matrix the identity matrix? -// Each operation checks whether the result is still the identity matrix and sets a flag. -inline bool wxTransformMatrix::IsIdentity1(void) const -{ - return - ( wxIsSameDouble(m_matrix[0][0], 1.0) && - wxIsSameDouble(m_matrix[1][1], 1.0) && - wxIsSameDouble(m_matrix[2][2], 1.0) && - wxIsSameDouble(m_matrix[1][0], 0.0) && - wxIsSameDouble(m_matrix[2][0], 0.0) && - wxIsSameDouble(m_matrix[0][1], 0.0) && - wxIsSameDouble(m_matrix[2][1], 0.0) && - wxIsSameDouble(m_matrix[0][2], 0.0) && - wxIsSameDouble(m_matrix[1][2], 0.0) ); -} - -// Calculates the determinant of a 2 x 2 matrix -inline double wxCalculateDet(double a11, double a21, double a12, double a22) -{ - return a11 * a22 - a12 * a21; -} - -#endif // _WX_MATRIXH__ diff --git a/Externals/wxWidgets3/include/wx/mdi.h b/Externals/wxWidgets3/include/wx/mdi.h deleted file mode 100644 index 4be67abda9..0000000000 --- a/Externals/wxWidgets3/include/wx/mdi.h +++ /dev/null @@ -1,419 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/mdi.h -// Purpose: wxMDI base header -// Author: Julian Smart (original) -// Vadim Zeitlin (base MDI classes refactoring) -// Copyright: (c) 1998 Julian Smart -// (c) 2008 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MDI_H_BASE_ -#define _WX_MDI_H_BASE_ - -#include "wx/defs.h" - -#if wxUSE_MDI - -#include "wx/frame.h" -#include "wx/menu.h" - -// forward declarations -class WXDLLIMPEXP_FWD_CORE wxMDIParentFrame; -class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame; -class WXDLLIMPEXP_FWD_CORE wxMDIClientWindowBase; -class WXDLLIMPEXP_FWD_CORE wxMDIClientWindow; - -// ---------------------------------------------------------------------------- -// wxMDIParentFrameBase: base class for parent frame for MDI children -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxMDIParentFrameBase : public wxFrame -{ -public: - wxMDIParentFrameBase() - { - m_clientWindow = NULL; - m_currentChild = NULL; -#if wxUSE_MENUS - m_windowMenu = NULL; -#endif // wxUSE_MENUS - } - - /* - Derived classes should provide ctor and Create() with the following - declaration: - - bool Create(wxWindow *parent, - wxWindowID winid, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL, - const wxString& name = wxFrameNameStr); - */ - -#if wxUSE_MENUS - virtual ~wxMDIParentFrameBase() - { - delete m_windowMenu; - } -#endif // wxUSE_MENUS - - // accessors - // --------- - - // Get or change the active MDI child window - virtual wxMDIChildFrame *GetActiveChild() const - { return m_currentChild; } - virtual void SetActiveChild(wxMDIChildFrame *child) - { m_currentChild = child; } - - - // Get the client window - wxMDIClientWindowBase *GetClientWindow() const { return m_clientWindow; } - - - // MDI windows menu functions - // -------------------------- - -#if wxUSE_MENUS - // return the pointer to the current window menu or NULL if we don't have - // because of wxFRAME_NO_WINDOW_MENU style - wxMenu* GetWindowMenu() const { return m_windowMenu; } - - // use the given menu instead of the default window menu - // - // menu can be NULL to disable the window menu completely - virtual void SetWindowMenu(wxMenu *menu) - { - if ( menu != m_windowMenu ) - { - delete m_windowMenu; - m_windowMenu = menu; - } - } -#endif // wxUSE_MENUS - - - // standard MDI window management functions - // ---------------------------------------- - - virtual void Cascade() { } - virtual void Tile(wxOrientation WXUNUSED(orient) = wxHORIZONTAL) { } - virtual void ArrangeIcons() { } - virtual void ActivateNext() = 0; - virtual void ActivatePrevious() = 0; - - /* - Derived classes must provide the following function: - - static bool IsTDI(); - */ - - // Create the client window class (don't Create() the window here, just - // return a new object of a wxMDIClientWindow-derived class) - // - // Notice that if you override this method you should use the default - // constructor and Create() and not the constructor creating the window - // when creating the frame or your overridden version is not going to be - // called (as the call to a virtual function from ctor will be dispatched - // to this class version) - virtual wxMDIClientWindow *OnCreateClient(); - -protected: - // Override to pass menu/toolbar events to the active child first. - virtual bool TryBefore(wxEvent& event) wxOVERRIDE; - - - // This is wxMDIClientWindow for all the native implementations but not for - // the generic MDI version which has its own wxGenericMDIClientWindow and - // so we store it as just a base class pointer because we don't need its - // exact type anyhow - wxMDIClientWindowBase *m_clientWindow; - wxMDIChildFrame *m_currentChild; - -#if wxUSE_MENUS - // the current window menu or NULL if we are not using it - wxMenu *m_windowMenu; -#endif // wxUSE_MENUS -}; - -// ---------------------------------------------------------------------------- -// wxMDIChildFrameBase: child frame managed by wxMDIParentFrame -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxMDIChildFrameBase : public wxFrame -{ -public: - wxMDIChildFrameBase() { m_mdiParent = NULL; } - - /* - Derived classes should provide Create() with the following signature: - - bool Create(wxMDIParentFrame *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr); - - And setting m_mdiParent to parent parameter. - */ - - // MDI children specific methods - virtual void Activate() = 0; - - // Return the MDI parent frame: notice that it may not be the same as - // GetParent() (our parent may be the client window or even its subwindow - // in some implementations) - wxMDIParentFrame *GetMDIParent() const { return m_mdiParent; } - - // Synonym for GetMDIParent(), was used in some other ports - wxMDIParentFrame *GetMDIParentFrame() const { return GetMDIParent(); } - - - // in most ports MDI children frames are not really top-level, the only - // exception are the Mac ports in which MDI children are just normal top - // level windows too - virtual bool IsTopLevel() const wxOVERRIDE { return false; } - - // In all ports keyboard navigation must stop at MDI child frame level and - // can't cross its boundary. Indicate this by overriding this function to - // return true. - virtual bool IsTopNavigationDomain(NavigationKind kind) const wxOVERRIDE - { - switch ( kind ) - { - case Navigation_Tab: - return true; - - case Navigation_Accel: - // Parent frame accelerators should work inside MDI child, so - // don't block their processing by returning true for them. - break; - } - - return false; - } - - // Raising any frame is supposed to show it but wxFrame Raise() - // implementation doesn't work for MDI child frames in most forms so - // forward this to Activate() which serves the same purpose by default. - virtual void Raise() wxOVERRIDE { Activate(); } - -protected: - wxMDIParentFrame *m_mdiParent; -}; - -// ---------------------------------------------------------------------------- -// wxTDIChildFrame: child frame used by TDI implementations -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxTDIChildFrame : public wxMDIChildFrameBase -{ -public: - // override wxFrame methods for this non top-level window - -#if wxUSE_STATUSBAR - // no status bars - // - // TODO: MDI children should have their own status bars, why not? - virtual wxStatusBar* CreateStatusBar(int WXUNUSED(number) = 1, - long WXUNUSED(style) = 1, - wxWindowID WXUNUSED(id) = 1, - const wxString& WXUNUSED(name) - = wxEmptyString) wxOVERRIDE - { return NULL; } - - virtual wxStatusBar *GetStatusBar() const wxOVERRIDE - { return NULL; } - virtual void SetStatusText(const wxString &WXUNUSED(text), - int WXUNUSED(number)=0) wxOVERRIDE - { } - virtual void SetStatusWidths(int WXUNUSED(n), - const int WXUNUSED(widths)[]) wxOVERRIDE - { } -#endif // wxUSE_STATUSBAR - -#if wxUSE_TOOLBAR - // no toolbar - // - // TODO: again, it should be possible to have tool bars - virtual wxToolBar *CreateToolBar(long WXUNUSED(style), - wxWindowID WXUNUSED(id), - const wxString& WXUNUSED(name)) wxOVERRIDE - { return NULL; } - virtual wxToolBar *GetToolBar() const wxOVERRIDE { return NULL; } -#endif // wxUSE_TOOLBAR - - // no icon - virtual void SetIcons(const wxIconBundle& WXUNUSED(icons)) wxOVERRIDE { } - - // title is used as the tab label - virtual wxString GetTitle() const wxOVERRIDE { return m_title; } - virtual void SetTitle(const wxString& title) wxOVERRIDE = 0; - - // no maximize etc - virtual void Maximize(bool WXUNUSED(maximize) = true) wxOVERRIDE { } - virtual bool IsMaximized() const wxOVERRIDE { return true; } - virtual bool IsAlwaysMaximized() const wxOVERRIDE { return true; } - virtual void Iconize(bool WXUNUSED(iconize) = true) wxOVERRIDE { } - virtual bool IsIconized() const wxOVERRIDE { return false; } - virtual void Restore() wxOVERRIDE { } - - virtual bool ShowFullScreen(bool WXUNUSED(show), - long WXUNUSED(style)) wxOVERRIDE { return false; } - virtual bool IsFullScreen() const wxOVERRIDE { return false; } - - - // we need to override these functions to ensure that a child window is - // created even though we derive from wxFrame -- basically we make it - // behave as just a wxWindow by short-circuiting wxTLW changes to the base - // class behaviour - - virtual void AddChild(wxWindowBase *child) wxOVERRIDE { wxWindow::AddChild(child); } - - virtual bool Destroy() wxOVERRIDE { return wxWindow::Destroy(); } - - // extra platform-specific hacks -#ifdef __WXMSW__ - virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const - { - return wxWindow::MSWGetStyle(flags, exstyle); - } - - virtual WXHWND MSWGetParent() const - { - return wxWindow::MSWGetParent(); - } - - WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) - { - return wxWindow::MSWWindowProc(message, wParam, lParam); - } -#endif // __WXMSW__ - -protected: - virtual void DoGetSize(int *width, int *height) const wxOVERRIDE - { - wxWindow::DoGetSize(width, height); - } - - virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags) wxOVERRIDE - { - wxWindow::DoSetSize(x, y, width, height, sizeFlags); - } - - virtual void DoGetClientSize(int *width, int *height) const wxOVERRIDE - { - wxWindow::DoGetClientSize(width, height); - } - - virtual void DoSetClientSize(int width, int height) wxOVERRIDE - { - wxWindow::DoSetClientSize(width, height); - } - - virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE - { - wxWindow::DoMoveWindow(x, y, width, height); - } - - // no size hints - virtual void DoSetSizeHints(int WXUNUSED(minW), int WXUNUSED(minH), - int WXUNUSED(maxW), int WXUNUSED(maxH), - int WXUNUSED(incW), int WXUNUSED(incH)) wxOVERRIDE { } - - wxString m_title; -}; - -// ---------------------------------------------------------------------------- -// wxMDIClientWindowBase: child of parent frame, parent of children frames -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxMDIClientWindowBase : public wxWindow -{ -public: - /* - The derived class must provide the default ctor only (CreateClient() - will be called later). - */ - - // Can be overridden in the derived classes but the base class version must - // be usually called first to really create the client window. - virtual bool CreateClient(wxMDIParentFrame *parent, - long style = wxVSCROLL | wxHSCROLL) = 0; -}; - -// ---------------------------------------------------------------------------- -// Include the port-specific implementation of the base classes defined above -// ---------------------------------------------------------------------------- - -// wxUSE_GENERIC_MDI_AS_NATIVE may be predefined to force the generic MDI -// implementation use even on the platforms which usually don't use it -// -// notice that generic MDI can still be used without this, but you would need -// to explicitly use wxGenericMDIXXX classes in your code (and currently also -// add src/generic/mdig.cpp to your build as it's not compiled in if generic -// MDI is not used by default -- but this may change later...) -#ifndef wxUSE_GENERIC_MDI_AS_NATIVE - // wxUniv always uses the generic MDI implementation and so do the ports - // without native version (although wxCocoa seems to have one -- but it's - // probably not functional?) - #if defined(__WXMOTIF__) || \ - defined(__WXUNIVERSAL__) - #define wxUSE_GENERIC_MDI_AS_NATIVE 1 - #else - #define wxUSE_GENERIC_MDI_AS_NATIVE 0 - #endif -#endif // wxUSE_GENERIC_MDI_AS_NATIVE - -#if wxUSE_GENERIC_MDI_AS_NATIVE - #include "wx/generic/mdig.h" -#elif defined(__WXMSW__) - #include "wx/msw/mdi.h" -#elif defined(__WXGTK20__) - #include "wx/gtk/mdi.h" -#elif defined(__WXGTK__) - #include "wx/gtk1/mdi.h" -#elif defined(__WXMAC__) - #include "wx/osx/mdi.h" -#elif defined(__WXQT__) - #include "wx/qt/mdi.h" -#endif - -inline wxMDIClientWindow *wxMDIParentFrameBase::OnCreateClient() -{ - return new wxMDIClientWindow; -} - -inline bool wxMDIParentFrameBase::TryBefore(wxEvent& event) -{ - // Menu (and toolbar) events should be sent to the active child frame - // first, if any. - if ( event.GetEventType() == wxEVT_MENU || - event.GetEventType() == wxEVT_UPDATE_UI ) - { - wxMDIChildFrame * const child = GetActiveChild(); - if ( child ) - { - // However avoid sending the event back to the child if it's - // currently being propagated to us from it. - wxWindow* const - from = static_cast(event.GetPropagatedFrom()); - if ( !from || !from->IsDescendant(child) ) - { - if ( child->ProcessWindowEventLocally(event) ) - return true; - } - } - } - - return wxFrame::TryBefore(event); -} - -#endif // wxUSE_MDI - -#endif // _WX_MDI_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/mediactrl.h b/Externals/wxWidgets3/include/wx/mediactrl.h deleted file mode 100644 index 17b359dc15..0000000000 --- a/Externals/wxWidgets3/include/wx/mediactrl.h +++ /dev/null @@ -1,395 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/mediactrl.h -// Purpose: wxMediaCtrl class -// Author: Ryan Norton -// Modified by: -// Created: 11/07/04 -// Copyright: (c) Ryan Norton -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// Definitions -// ============================================================================ - -// ---------------------------------------------------------------------------- -// Header guard -// ---------------------------------------------------------------------------- -#ifndef _WX_MEDIACTRL_H_ -#define _WX_MEDIACTRL_H_ - -// ---------------------------------------------------------------------------- -// Pre-compiled header stuff -// ---------------------------------------------------------------------------- - -#include "wx/defs.h" - -// ---------------------------------------------------------------------------- -// Compilation guard -// ---------------------------------------------------------------------------- - -#if wxUSE_MEDIACTRL - -// ---------------------------------------------------------------------------- -// Includes -// ---------------------------------------------------------------------------- - -#include "wx/control.h" -#include "wx/uri.h" - -// ============================================================================ -// Declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// -// Enumerations -// -// ---------------------------------------------------------------------------- - -enum wxMediaState -{ - wxMEDIASTATE_STOPPED, - wxMEDIASTATE_PAUSED, - wxMEDIASTATE_PLAYING -}; - -enum wxMediaCtrlPlayerControls -{ - wxMEDIACTRLPLAYERCONTROLS_NONE = 0, - //Step controls like fastforward, step one frame etc. - wxMEDIACTRLPLAYERCONTROLS_STEP = 1 << 0, - //Volume controls like the speaker icon, volume slider, etc. - wxMEDIACTRLPLAYERCONTROLS_VOLUME = 1 << 1, - wxMEDIACTRLPLAYERCONTROLS_DEFAULT = - wxMEDIACTRLPLAYERCONTROLS_STEP | - wxMEDIACTRLPLAYERCONTROLS_VOLUME -}; - -#define wxMEDIABACKEND_DIRECTSHOW wxT("wxAMMediaBackend") -#define wxMEDIABACKEND_MCI wxT("wxMCIMediaBackend") -#define wxMEDIABACKEND_QUICKTIME wxT("wxQTMediaBackend") -#define wxMEDIABACKEND_GSTREAMER wxT("wxGStreamerMediaBackend") -#define wxMEDIABACKEND_REALPLAYER wxT("wxRealPlayerMediaBackend") -#define wxMEDIABACKEND_WMP10 wxT("wxWMP10MediaBackend") - -// ---------------------------------------------------------------------------- -// -// wxMediaEvent -// -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_MEDIA wxMediaEvent : public wxNotifyEvent -{ -public: - // ------------------------------------------------------------------------ - // wxMediaEvent Constructor - // - // Normal constructor, much the same as wxNotifyEvent - // ------------------------------------------------------------------------ - wxMediaEvent(wxEventType commandType = wxEVT_NULL, int winid = 0) - : wxNotifyEvent(commandType, winid) - { } - - // ------------------------------------------------------------------------ - // wxMediaEvent Copy Constructor - // - // Normal copy constructor, much the same as wxNotifyEvent - // ------------------------------------------------------------------------ - wxMediaEvent(const wxMediaEvent &clone) - : wxNotifyEvent(clone) - { } - - // ------------------------------------------------------------------------ - // wxMediaEvent::Clone - // - // Allocates a copy of this object. - // Required for wxEvtHandler::AddPendingEvent - // ------------------------------------------------------------------------ - virtual wxEvent *Clone() const wxOVERRIDE - { return new wxMediaEvent(*this); } - - - // Put this class on wxWidget's RTTI table - wxDECLARE_DYNAMIC_CLASS(wxMediaEvent); -}; - -// ---------------------------------------------------------------------------- -// -// wxMediaCtrl -// -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_MEDIA wxMediaCtrl : public wxControl -{ -public: - wxMediaCtrl() : m_imp(NULL), m_bLoaded(false) - { } - - wxMediaCtrl(wxWindow* parent, wxWindowID winid, - const wxString& fileName = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& szBackend = wxEmptyString, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxT("mediaCtrl")) - : m_imp(NULL), m_bLoaded(false) - { Create(parent, winid, fileName, pos, size, style, - szBackend, validator, name); } - - wxMediaCtrl(wxWindow* parent, wxWindowID winid, - const wxURI& location, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& szBackend = wxEmptyString, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxT("mediaCtrl")) - : m_imp(NULL), m_bLoaded(false) - { Create(parent, winid, location, pos, size, style, - szBackend, validator, name); } - - virtual ~wxMediaCtrl(); - - bool Create(wxWindow* parent, wxWindowID winid, - const wxString& fileName = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& szBackend = wxEmptyString, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxT("mediaCtrl")); - - bool Create(wxWindow* parent, wxWindowID winid, - const wxURI& location, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& szBackend = wxEmptyString, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxT("mediaCtrl")); - - bool DoCreate(const wxClassInfo* instance, - wxWindow* parent, wxWindowID winid, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxT("mediaCtrl")); - - bool Play(); - bool Pause(); - bool Stop(); - - bool Load(const wxString& fileName); - - wxMediaState GetState(); - - wxFileOffset Seek(wxFileOffset where, wxSeekMode mode = wxFromStart); - wxFileOffset Tell(); //FIXME: This should be const - wxFileOffset Length(); //FIXME: This should be const - - double GetPlaybackRate(); //All but MCI & GStreamer - bool SetPlaybackRate(double dRate); //All but MCI & GStreamer - - bool Load(const wxURI& location); - bool Load(const wxURI& location, const wxURI& proxy); - - wxFileOffset GetDownloadProgress(); // DirectShow only - wxFileOffset GetDownloadTotal(); // DirectShow only - - double GetVolume(); - bool SetVolume(double dVolume); - - bool ShowPlayerControls( - wxMediaCtrlPlayerControls flags = wxMEDIACTRLPLAYERCONTROLS_DEFAULT); - - //helpers for the wxPython people - bool LoadURI(const wxString& fileName) - { return Load(wxURI(fileName)); } - bool LoadURIWithProxy(const wxString& fileName, const wxString& proxy) - { return Load(wxURI(fileName), wxURI(proxy)); } - -protected: - static const wxClassInfo* NextBackend(wxClassInfo::const_iterator* it); - - void OnMediaFinished(wxMediaEvent& evt); - virtual void DoMoveWindow(int x, int y, int w, int h) wxOVERRIDE; - wxSize DoGetBestSize() const wxOVERRIDE; - - class wxMediaBackend* m_imp; - bool m_bLoaded; - - wxDECLARE_DYNAMIC_CLASS(wxMediaCtrl); -}; - -// ---------------------------------------------------------------------------- -// -// wxMediaBackend -// -// Derive from this and use standard wxWidgets RTTI -// (wxDECLARE_DYNAMIC_CLASS and wxIMPLEMENT_CLASS) to make a backend -// for wxMediaCtrl. Backends are searched alphabetically - -// the one with the earliest letter is tried first. -// -// Note that this is currently not API or ABI compatible - -// so statically link or make the client compile on-site. -// -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_MEDIA wxMediaBackend : public wxObject -{ -public: - wxMediaBackend() - { } - - virtual ~wxMediaBackend(); - - virtual bool CreateControl(wxControl* WXUNUSED(ctrl), - wxWindow* WXUNUSED(parent), - wxWindowID WXUNUSED(winid), - const wxPoint& WXUNUSED(pos), - const wxSize& WXUNUSED(size), - long WXUNUSED(style), - const wxValidator& WXUNUSED(validator), - const wxString& WXUNUSED(name)) - { return false; } - - virtual bool Play() - { return false; } - virtual bool Pause() - { return false; } - virtual bool Stop() - { return false; } - - virtual bool Load(const wxString& WXUNUSED(fileName)) - { return false; } - virtual bool Load(const wxURI& WXUNUSED(location)) - { return false; } - - virtual bool SetPosition(wxLongLong WXUNUSED(where)) - { return 0; } - virtual wxLongLong GetPosition() - { return 0; } - virtual wxLongLong GetDuration() - { return 0; } - - virtual void Move(int WXUNUSED(x), int WXUNUSED(y), - int WXUNUSED(w), int WXUNUSED(h)) - { } - virtual wxSize GetVideoSize() const - { return wxSize(0,0); } - - virtual double GetPlaybackRate() - { return 0.0; } - virtual bool SetPlaybackRate(double WXUNUSED(dRate)) - { return false; } - - virtual wxMediaState GetState() - { return wxMEDIASTATE_STOPPED; } - - virtual double GetVolume() - { return 0.0; } - virtual bool SetVolume(double WXUNUSED(dVolume)) - { return false; } - - virtual bool Load(const wxURI& WXUNUSED(location), - const wxURI& WXUNUSED(proxy)) - { return false; } - - virtual bool ShowPlayerControls( - wxMediaCtrlPlayerControls WXUNUSED(flags)) - { return false; } - virtual bool IsInterfaceShown() - { return false; } - - virtual wxLongLong GetDownloadProgress() - { return 0; } - virtual wxLongLong GetDownloadTotal() - { return 0; } - - virtual void MacVisibilityChanged() - { } - virtual void RESERVED9() {} - - wxDECLARE_DYNAMIC_CLASS(wxMediaBackend); -}; - - -//Our events -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_MEDIA, wxEVT_MEDIA_FINISHED, wxMediaEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_MEDIA, wxEVT_MEDIA_STOP, wxMediaEvent ); - -//Function type(s) our events need -typedef void (wxEvtHandler::*wxMediaEventFunction)(wxMediaEvent&); - -#define wxMediaEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxMediaEventFunction, func) - -//Macro for usage with message maps -#define EVT_MEDIA_FINISHED(winid, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_MEDIA_FINISHED, winid, wxID_ANY, wxMediaEventHandler(fn), NULL ), -#define EVT_MEDIA_STOP(winid, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_MEDIA_STOP, winid, wxID_ANY, wxMediaEventHandler(fn), NULL ), - -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_MEDIA, wxEVT_MEDIA_LOADED, wxMediaEvent ); -#define EVT_MEDIA_LOADED(winid, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_MEDIA_LOADED, winid, wxID_ANY, wxMediaEventHandler(fn), NULL ), - -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_MEDIA, wxEVT_MEDIA_STATECHANGED, wxMediaEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_MEDIA, wxEVT_MEDIA_PLAY, wxMediaEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_MEDIA, wxEVT_MEDIA_PAUSE, wxMediaEvent ); -#define EVT_MEDIA_STATECHANGED(winid, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_MEDIA_STATECHANGED, winid, wxID_ANY, wxMediaEventHandler(fn), NULL ), -#define EVT_MEDIA_PLAY(winid, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_MEDIA_PLAY, winid, wxID_ANY, wxMediaEventHandler(fn), NULL ), -#define EVT_MEDIA_PAUSE(winid, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_MEDIA_PAUSE, winid, wxID_ANY, wxMediaEventHandler(fn), NULL ), - -// ---------------------------------------------------------------------------- -// common backend base class used by many other backends -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_MEDIA wxMediaBackendCommonBase : public wxMediaBackend -{ -public: - // add a pending wxMediaEvent of the given type - void QueueEvent(wxEventType evtType); - - // notify that the movie playback is finished - void QueueFinishEvent() - { - QueueEvent(wxEVT_MEDIA_STATECHANGED); - QueueEvent(wxEVT_MEDIA_FINISHED); - } - - // send the stop event and return true if it hasn't been vetoed - bool SendStopEvent(); - - // Queue pause event - void QueuePlayEvent(); - - // Queue pause event - void QueuePauseEvent(); - - // Queue stop event (no veto) - void QueueStopEvent(); - -protected: - // call this when the movie size has changed but not because it has just - // been loaded (in this case, call NotifyMovieLoaded() below) - void NotifyMovieSizeChanged(); - - // call this when the movie is fully loaded - void NotifyMovieLoaded(); - - - wxMediaCtrl *m_ctrl; // parent control -}; - -// ---------------------------------------------------------------------------- -// End compilation guard -// ---------------------------------------------------------------------------- -#endif // wxUSE_MEDIACTRL - -// ---------------------------------------------------------------------------- -// End header guard and header itself -// ---------------------------------------------------------------------------- -#endif // _WX_MEDIACTRL_H_ - - diff --git a/Externals/wxWidgets3/include/wx/memconf.h b/Externals/wxWidgets3/include/wx/memconf.h deleted file mode 100644 index 3dbec634e1..0000000000 --- a/Externals/wxWidgets3/include/wx/memconf.h +++ /dev/null @@ -1,53 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/memconf.h -// Purpose: wxMemoryConfig class: a wxConfigBase implementation which only -// stores the settings in memory (thus they are lost when the -// program terminates) -// Author: Vadim Zeitlin -// Modified by: -// Created: 22.01.00 -// Copyright: (c) 2000 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -/* - * NB: I don't see how this class may possibly be useful to the application - * program (as the settings are lost on program termination), but it is - * handy to have it inside wxWidgets. So for now let's say that this class - * is private and should only be used by wxWidgets itself - this might - * change in the future. - */ - -#ifndef _WX_MEMCONF_H_ -#define _WX_MEMCONF_H_ - -#if wxUSE_CONFIG - -#include "wx/fileconf.h" // the base class - -// ---------------------------------------------------------------------------- -// wxMemoryConfig: a config class which stores settings in non-persistent way -// ---------------------------------------------------------------------------- - -// notice that we inherit from wxFileConfig which already stores its data in -// memory and just disable file reading/writing - this is probably not optimal -// and might be changed in future as well (this class will always deriev from -// wxConfigBase though) -class wxMemoryConfig : public wxFileConfig -{ -public: - // default (and only) ctor - wxMemoryConfig() : wxFileConfig(wxEmptyString, // default app name - wxEmptyString, // default vendor name - wxEmptyString, // no local config file - wxEmptyString, // no system config file - 0) // don't use any files - { - } - - wxDECLARE_NO_COPY_CLASS(wxMemoryConfig); -}; - -#endif // wxUSE_CONFIG - -#endif // _WX_MEMCONF_H_ diff --git a/Externals/wxWidgets3/include/wx/memory.h b/Externals/wxWidgets3/include/wx/memory.h deleted file mode 100644 index d6cc18301e..0000000000 --- a/Externals/wxWidgets3/include/wx/memory.h +++ /dev/null @@ -1,364 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/memory.h -// Purpose: Memory operations -// Author: Arthur Seaton, Julian Smart -// Modified by: -// Created: 29/01/98 -// Copyright: (c) 1998 Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MEMORY_H_ -#define _WX_MEMORY_H_ - -#include "wx/defs.h" -#include "wx/string.h" -#include "wx/msgout.h" - -#if wxUSE_MEMORY_TRACING || wxUSE_DEBUG_CONTEXT - -#include - -WXDLLIMPEXP_BASE void * wxDebugAlloc(size_t size, wxChar * fileName, int lineNum, bool isObject, bool isVect = false); -WXDLLIMPEXP_BASE void wxDebugFree(void * buf, bool isVect = false); - -//********************************************************************************** -/* - The global operator new used for everything apart from getting - dynamic storage within this function itself. -*/ - -// We'll only do malloc and free for the moment: leave the interesting -// stuff for the wxObject versions. - - -#if wxUSE_GLOBAL_MEMORY_OPERATORS - -// Undefine temporarily (new is #defined in object.h) because we want to -// declare some new operators. -#ifdef new - #undef new -#endif - -#if defined(__SUNCC__) - #define wxUSE_ARRAY_MEMORY_OPERATORS 0 -#elif defined (__SGI_CC_) - // only supported by -n32 compilers - #ifndef __EDG_ABI_COMPATIBILITY_VERSION - #define wxUSE_ARRAY_MEMORY_OPERATORS 0 - #endif -#else - #define wxUSE_ARRAY_MEMORY_OPERATORS 1 -#endif - -// devik 2000-8-29: All new/delete ops are now inline because they can't -// be marked as dllexport/dllimport. It then leads to weird bugs when -// used on MSW as DLL -#if defined(__WINDOWS__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE)) -inline void * operator new (size_t size, wxChar * fileName, int lineNum) -{ - return wxDebugAlloc(size, fileName, lineNum, false, false); -} - -inline void * operator new (size_t size) -{ - return wxDebugAlloc(size, NULL, 0, false); -} - -inline void operator delete (void * buf) -{ - wxDebugFree(buf, false); -} - -#if wxUSE_ARRAY_MEMORY_OPERATORS -inline void * operator new[] (size_t size) -{ - return wxDebugAlloc(size, NULL, 0, false, true); -} - -inline void * operator new[] (size_t size, wxChar * fileName, int lineNum) -{ - return wxDebugAlloc(size, fileName, lineNum, false, true); -} - -inline void operator delete[] (void * buf) -{ - wxDebugFree(buf, true); -} -#endif // wxUSE_ARRAY_MEMORY_OPERATORS - -#else - -void * operator new (size_t size, wxChar * fileName, int lineNum); - -void * operator new (size_t size); - -void operator delete (void * buf); - -#if wxUSE_ARRAY_MEMORY_OPERATORS -void * operator new[] (size_t size); - -void * operator new[] (size_t size, wxChar * fileName, int lineNum); - -void operator delete[] (void * buf); -#endif // wxUSE_ARRAY_MEMORY_OPERATORS -#endif // defined(__WINDOWS__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE)) - -#if defined(__VISUALC__) -inline void operator delete(void* pData, wxChar* /* fileName */, int /* lineNum */) -{ - wxDebugFree(pData, false); -} -inline void operator delete[](void* pData, wxChar* /* fileName */, int /* lineNum */) -{ - wxDebugFree(pData, true); -} -#endif // __VISUALC__ -#endif // wxUSE_GLOBAL_MEMORY_OPERATORS - -//********************************************************************************** - -typedef unsigned int wxMarkerType; - -/* - Define the struct which will be placed at the start of all dynamically - allocated memory. -*/ - -class WXDLLIMPEXP_BASE wxMemStruct { - -friend class WXDLLIMPEXP_FWD_BASE wxDebugContext; // access to the m_next pointer for list traversal. - -public: -public: - int AssertList (); - - size_t RequestSize () { return m_reqSize; } - wxMarkerType Marker () { return m_firstMarker; } - - // When an object is deleted we set the id slot to a specific value. - inline void SetDeleted (); - inline int IsDeleted (); - - int Append (); - int Unlink (); - - // Used to determine if the object is really a wxMemStruct. - // Not a foolproof test by any means, but better than none I hope! - int AssertIt (); - - // Do all validation on a node. - int ValidateNode (); - - // Check the integrity of a node and of the list, node by node. - int CheckBlock (); - int CheckAllPrevious (); - - // Print a single node. - void PrintNode (); - - // Called when the memory linking functions get an error. - void ErrorMsg (const char *); - void ErrorMsg (); - - inline void *GetActualData(void) const { return m_actualData; } - - void Dump(void); - -public: - // Check for underwriting. There are 2 of these checks. This one - // inside the struct and another right after the struct. - wxMarkerType m_firstMarker; - - // File name and line number are from cpp. - wxChar* m_fileName; - int m_lineNum; - - // The amount of memory requested by the caller. - size_t m_reqSize; - - // Used to try to verify that we really are dealing with an object - // of the required class. Can be 1 of 2 values these indicating a valid - // wxMemStruct object, or a deleted wxMemStruct object. - wxMarkerType m_id; - - wxMemStruct * m_prev; - wxMemStruct * m_next; - - void * m_actualData; - bool m_isObject; -}; - - -typedef void (wxMemStruct::*PmSFV) (); - -// Type of the app function that can be installed and called at wxWidgets shutdown -// (after all other registered files with global destructors have been closed down). -typedef void (*wxShutdownNotifyFunction)(); - -/* - Debugging class. This will only have a single instance, but it's - a reasonable way to keep everything together and to make this - available for change if needed by someone else. - A lot of this stuff would be better off within the wxMemStruct class, but - it's stuff which we need to access at times when there is no wxMemStruct - object so we use this class instead. Think of it as a collection of - globals which have to do with the wxMemStruct class. -*/ - -class WXDLLIMPEXP_BASE wxDebugContext { - -protected: - // Used to set alignment for markers. - static size_t CalcAlignment (); - - // Returns the amount of padding needed after something of the given - // size. This is so that when we cast pointers backwards and forwards - // the pointer value will be valid for a wxMarkerType. - static size_t GetPadding (size_t size) ; - - // Traverse the list. - static void TraverseList (PmSFV, wxMemStruct *from = NULL); - - static int debugLevel; - static bool debugOn; - - static int m_balign; // byte alignment - static int m_balignmask; // mask for performing byte alignment -public: - // Set a checkpoint to dump only the memory from - // a given point - static wxMemStruct *checkPoint; - - wxDebugContext(void); - ~wxDebugContext(void); - - static int GetLevel(void) { return debugLevel; } - static void SetLevel(int level) { debugLevel = level; } - - static bool GetDebugMode(void) { return debugOn; } - static void SetDebugMode(bool flag) { debugOn = flag; } - - static void SetCheckpoint(bool all = false); - static wxMemStruct *GetCheckpoint(void) { return checkPoint; } - - // Calculated from the request size and any padding needed - // before the final marker. - static size_t PaddedSize (size_t reqSize); - - // Calc the total amount of space we need from the system - // to satisfy a caller request. This includes all padding. - static size_t TotSize (size_t reqSize); - - // Return valid pointers to offsets within the allocated memory. - static char * StructPos (const char * buf); - static char * MidMarkerPos (const char * buf); - static char * CallerMemPos (const char * buf); - static char * EndMarkerPos (const char * buf, size_t size); - - // Given a pointer to the start of the caller requested area - // return a pointer to the start of the entire alloc\'d buffer. - static char * StartPos (const char * caller); - - // Access to the list. - static wxMemStruct * GetHead () { return m_head; } - static wxMemStruct * GetTail () { return m_tail; } - - // Set the list sentinals. - static wxMemStruct * SetHead (wxMemStruct * st) { return (m_head = st); } - static wxMemStruct * SetTail (wxMemStruct * st) { return (m_tail = st); } - - // If this is set then every new operation checks the validity - // of the all previous nodes in the list. - static bool GetCheckPrevious () { return m_checkPrevious; } - static void SetCheckPrevious (bool value) { m_checkPrevious = value; } - - // Checks all nodes, or all nodes if checkAll is true - static int Check(bool checkAll = false); - - // Print out the list of wxMemStruct nodes. - static bool PrintList(void); - - // Dump objects - static bool Dump(void); - - // Print statistics - static bool PrintStatistics(bool detailed = true); - - // Print out the classes in the application. - static bool PrintClasses(void); - - // Count the number of non-wxDebugContext-related objects - // that are outstanding - static int CountObjectsLeft(bool sinceCheckpoint = false); - - // This function is used to output the dump - static void OutputDumpLine(const wxChar *szFormat, ...); - - static void SetShutdownNotifyFunction(wxShutdownNotifyFunction shutdownFn); - -private: - // Store these here to allow access to the list without - // needing to have a wxMemStruct object. - static wxMemStruct* m_head; - static wxMemStruct* m_tail; - - // Set to false if we're not checking all previous nodes when - // we do a new. Set to true when we are. - static bool m_checkPrevious; - - // Holds a pointer to an optional application function to call at shutdown. - static wxShutdownNotifyFunction sm_shutdownFn; - - // Have to access our shutdown hook - friend class wxDebugContextDumpDelayCounter; -}; - -// Final cleanup (e.g. deleting the log object and doing memory leak checking) -// will be delayed until all wxDebugContextDumpDelayCounter objects have been -// destructed. Adding one wxDebugContextDumpDelayCounter per file will delay -// memory leak checking until after destructing all global objects. - -class WXDLLIMPEXP_BASE wxDebugContextDumpDelayCounter -{ -public: - wxDebugContextDumpDelayCounter(); - ~wxDebugContextDumpDelayCounter(); - -private: - void DoDump(); - static int sm_count; -}; - -// make leak dump after all globals have been destructed -static wxDebugContextDumpDelayCounter wxDebugContextDumpDelayCounter_File; -#define WXDEBUG_DUMPDELAYCOUNTER \ - static wxDebugContextDumpDelayCounter wxDebugContextDumpDelayCounter_Extra; - -// Output a debug message, in a system dependent fashion. -void WXDLLIMPEXP_BASE wxTrace(const wxChar *fmt ...) WX_ATTRIBUTE_PRINTF_1; -void WXDLLIMPEXP_BASE wxTraceLevel(int level, const wxChar *fmt ...) WX_ATTRIBUTE_PRINTF_2; - -#define WXTRACE wxTrace -#define WXTRACELEVEL wxTraceLevel - -#else // wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT - -#define WXDEBUG_DUMPDELAYCOUNTER - -// Borland C++ Builder 6 seems to have troubles with inline functions (see bug -// 819700) -#if 0 - inline void wxTrace(const wxChar *WXUNUSED(fmt)) {} - inline void wxTraceLevel(int WXUNUSED(level), const wxChar *WXUNUSED(fmt)) {} -#else - #define wxTrace(fmt) - #define wxTraceLevel(l, fmt) -#endif - -#define WXTRACE true ? (void)0 : wxTrace -#define WXTRACELEVEL true ? (void)0 : wxTraceLevel - -#endif // wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT - -#endif // _WX_MEMORY_H_ diff --git a/Externals/wxWidgets3/include/wx/memtext.h b/Externals/wxWidgets3/include/wx/memtext.h deleted file mode 100644 index 475e8fdc23..0000000000 --- a/Externals/wxWidgets3/include/wx/memtext.h +++ /dev/null @@ -1,54 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/memtext.h -// Purpose: wxMemoryText allows to use wxTextBuffer without a file -// Created: 14.11.01 -// Author: Morten Hanssen -// Copyright: (c) 2001 Morten Hanssen -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MEMTEXT_H -#define _WX_MEMTEXT_H - -#include "wx/defs.h" - -// there is no separate setting for wxMemoryText, it's smallish anyhow -#if wxUSE_TEXTBUFFER - -// ---------------------------------------------------------------------------- -// wxMemoryText -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxMemoryText : public wxTextBuffer -{ -public: - // Constructors. - wxMemoryText() { } - wxMemoryText(const wxString& name) : wxTextBuffer(name) { } - -protected: - virtual bool OnExists() const - { return false; } - - virtual bool OnOpen(const wxString & WXUNUSED(strBufferName), - wxTextBufferOpenMode WXUNUSED(OpenMode)) - { return true; } - - virtual bool OnClose() - { return true; } - - virtual bool OnRead(const wxMBConv& WXUNUSED(conv)) - { return true; } - - virtual bool OnWrite(wxTextFileType WXUNUSED(typeNew), - const wxMBConv& WXUNUSED(conv) = wxMBConvUTF8()) - { return true; } - -private: - wxDECLARE_NO_COPY_CLASS(wxMemoryText); -}; - -#endif // wxUSE_TEXTBUFFER - -#endif // _WX_MEMTEXT_H - diff --git a/Externals/wxWidgets3/include/wx/menu.h b/Externals/wxWidgets3/include/wx/menu.h deleted file mode 100644 index b733467604..0000000000 --- a/Externals/wxWidgets3/include/wx/menu.h +++ /dev/null @@ -1,643 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/menu.h -// Purpose: wxMenu and wxMenuBar classes -// Author: Vadim Zeitlin -// Modified by: -// Created: 26.10.99 -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MENU_H_BASE_ -#define _WX_MENU_H_BASE_ - -#include "wx/defs.h" - -#if wxUSE_MENUS - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/list.h" // for "template" list classes -#include "wx/window.h" // base class for wxMenuBar - -// also include this one to ensure compatibility with old code which only -// included wx/menu.h -#include "wx/menuitem.h" - -class WXDLLIMPEXP_FWD_CORE wxFrame; -class WXDLLIMPEXP_FWD_CORE wxMenu; -class WXDLLIMPEXP_FWD_CORE wxMenuBarBase; -class WXDLLIMPEXP_FWD_CORE wxMenuBar; -class WXDLLIMPEXP_FWD_CORE wxMenuItem; - -// pseudo template list classes -WX_DECLARE_EXPORTED_LIST(wxMenu, wxMenuList); -WX_DECLARE_EXPORTED_LIST(wxMenuItem, wxMenuItemList); - -// ---------------------------------------------------------------------------- -// wxMenu -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxMenuBase : public wxEvtHandler -{ -public: - // create a menu - static wxMenu *New(const wxString& title = wxEmptyString, long style = 0); - - // ctors - wxMenuBase(const wxString& title, long style = 0) : m_title(title) - { Init(style); } - wxMenuBase(long style = 0) - { Init(style); } - - // dtor deletes all the menu items we own - virtual ~wxMenuBase(); - - // menu construction - // ----------------- - - // append any kind of item (normal/check/radio/separator) - wxMenuItem* Append(int itemid, - const wxString& text = wxEmptyString, - const wxString& help = wxEmptyString, - wxItemKind kind = wxITEM_NORMAL) - { - return DoAppend(wxMenuItem::New((wxMenu *)this, itemid, text, help, kind)); - } - - // append a separator to the menu - wxMenuItem* AppendSeparator() { return Append(wxID_SEPARATOR); } - - // append a check item - wxMenuItem* AppendCheckItem(int itemid, - const wxString& text, - const wxString& help = wxEmptyString) - { - return Append(itemid, text, help, wxITEM_CHECK); - } - - // append a radio item - wxMenuItem* AppendRadioItem(int itemid, - const wxString& text, - const wxString& help = wxEmptyString) - { - return Append(itemid, text, help, wxITEM_RADIO); - } - - // append a submenu - wxMenuItem* AppendSubMenu(wxMenu *submenu, - const wxString& text, - const wxString& help = wxEmptyString) - { - return DoAppend(wxMenuItem::New((wxMenu *)this, wxID_ANY, text, help, - wxITEM_NORMAL, submenu)); - } - - // the most generic form of Append() - append anything - wxMenuItem* Append(wxMenuItem *item) { return DoAppend(item); } - - // insert a break in the menu (only works when appending the items, not - // inserting them) - virtual void Break() { } - - // insert an item before given position - wxMenuItem* Insert(size_t pos, wxMenuItem *item); - - // insert an item before given position - wxMenuItem* Insert(size_t pos, - int itemid, - const wxString& text = wxEmptyString, - const wxString& help = wxEmptyString, - wxItemKind kind = wxITEM_NORMAL) - { - return Insert(pos, wxMenuItem::New((wxMenu *)this, itemid, text, help, kind)); - } - - // insert a separator - wxMenuItem* InsertSeparator(size_t pos) - { - return Insert(pos, wxMenuItem::New((wxMenu *)this, wxID_SEPARATOR)); - } - - // insert a check item - wxMenuItem* InsertCheckItem(size_t pos, - int itemid, - const wxString& text, - const wxString& help = wxEmptyString) - { - return Insert(pos, itemid, text, help, wxITEM_CHECK); - } - - // insert a radio item - wxMenuItem* InsertRadioItem(size_t pos, - int itemid, - const wxString& text, - const wxString& help = wxEmptyString) - { - return Insert(pos, itemid, text, help, wxITEM_RADIO); - } - - // insert a submenu - wxMenuItem* Insert(size_t pos, - int itemid, - const wxString& text, - wxMenu *submenu, - const wxString& help = wxEmptyString) - { - return Insert(pos, wxMenuItem::New((wxMenu *)this, itemid, text, help, - wxITEM_NORMAL, submenu)); - } - - // prepend an item to the menu - wxMenuItem* Prepend(wxMenuItem *item) - { - return Insert(0u, item); - } - - // prepend any item to the menu - wxMenuItem* Prepend(int itemid, - const wxString& text = wxEmptyString, - const wxString& help = wxEmptyString, - wxItemKind kind = wxITEM_NORMAL) - { - return Insert(0u, itemid, text, help, kind); - } - - // prepend a separator - wxMenuItem* PrependSeparator() - { - return InsertSeparator(0u); - } - - // prepend a check item - wxMenuItem* PrependCheckItem(int itemid, - const wxString& text, - const wxString& help = wxEmptyString) - { - return InsertCheckItem(0u, itemid, text, help); - } - - // prepend a radio item - wxMenuItem* PrependRadioItem(int itemid, - const wxString& text, - const wxString& help = wxEmptyString) - { - return InsertRadioItem(0u, itemid, text, help); - } - - // prepend a submenu - wxMenuItem* Prepend(int itemid, - const wxString& text, - wxMenu *submenu, - const wxString& help = wxEmptyString) - { - return Insert(0u, itemid, text, submenu, help); - } - - // detach an item from the menu, but don't delete it so that it can be - // added back later (but if it's not, the caller is responsible for - // deleting it!) - wxMenuItem *Remove(int itemid) { return Remove(FindChildItem(itemid)); } - wxMenuItem *Remove(wxMenuItem *item); - - // delete an item from the menu (submenus are not destroyed by this - // function, see Destroy) - bool Delete(int itemid) { return Delete(FindChildItem(itemid)); } - bool Delete(wxMenuItem *item); - - // delete the item from menu and destroy it (if it's a submenu) - bool Destroy(int itemid) { return Destroy(FindChildItem(itemid)); } - bool Destroy(wxMenuItem *item); - - // menu items access - // ----------------- - - // get the items - size_t GetMenuItemCount() const { return m_items.GetCount(); } - - const wxMenuItemList& GetMenuItems() const { return m_items; } - wxMenuItemList& GetMenuItems() { return m_items; } - - // search - virtual int FindItem(const wxString& item) const; - wxMenuItem* FindItem(int itemid, wxMenu **menu = NULL) const; - - // find by position - wxMenuItem* FindItemByPosition(size_t position) const; - - // get/set items attributes - void Enable(int itemid, bool enable); - bool IsEnabled(int itemid) const; - - void Check(int itemid, bool check); - bool IsChecked(int itemid) const; - - void SetLabel(int itemid, const wxString& label); - wxString GetLabel(int itemid) const; - - // Returns the stripped label - wxString GetLabelText(int itemid) const { return wxMenuItem::GetLabelText(GetLabel(itemid)); } - - virtual void SetHelpString(int itemid, const wxString& helpString); - virtual wxString GetHelpString(int itemid) const; - - // misc accessors - // -------------- - - // the title - virtual void SetTitle(const wxString& title) { m_title = title; } - const wxString& GetTitle() const { return m_title; } - - // event handler - void SetEventHandler(wxEvtHandler *handler) { m_eventHandler = handler; } - wxEvtHandler *GetEventHandler() const { return m_eventHandler; } - - // Invoking window: this is set by wxWindow::PopupMenu() before showing a - // popup menu and reset after it's hidden. Notice that you probably want to - // use GetWindow() below instead of GetInvokingWindow() as the latter only - // returns non-NULL for the top level menus - // - // NB: avoid calling SetInvokingWindow() directly if possible, use - // wxMenuInvokingWindowSetter class below instead - void SetInvokingWindow(wxWindow *win); - wxWindow *GetInvokingWindow() const { return m_invokingWindow; } - - // the window associated with this menu: this is the invoking window for - // popup menus or the top level window to which the menu bar is attached - // for menus which are part of a menu bar - wxWindow *GetWindow() const; - - // style - long GetStyle() const { return m_style; } - - // implementation helpers - // ---------------------- - - // Updates the UI for a menu and all submenus recursively by generating - // wxEVT_UPDATE_UI for all the items. - // - // Do not use the "source" argument, it allows to override the event - // handler to use for these events, but this should never be needed. - void UpdateUI(wxEvtHandler* source = NULL); - - // get the menu bar this menu is attached to (may be NULL, always NULL for - // popup menus). Traverse up the menu hierarchy to find it. - wxMenuBar *GetMenuBar() const; - - // called when the menu is attached/detached to/from a menu bar - virtual void Attach(wxMenuBarBase *menubar); - virtual void Detach(); - - // is the menu attached to a menu bar (or is it a popup one)? - bool IsAttached() const { return GetMenuBar() != NULL; } - - // set/get the parent of this menu - void SetParent(wxMenu *parent) { m_menuParent = parent; } - wxMenu *GetParent() const { return m_menuParent; } - - // implementation only from now on - // ------------------------------- - - // unlike FindItem(), this function doesn't recurse but only looks through - // our direct children and also may return the index of the found child if - // pos != NULL - wxMenuItem *FindChildItem(int itemid, size_t *pos = NULL) const; - - // called to generate a wxCommandEvent, return true if it was processed, - // false otherwise - // - // the checked parameter may have boolean value or -1 for uncheckable items - bool SendEvent(int itemid, int checked = -1); - - // called to dispatch a wxMenuEvent to the right recipients, menu pointer - // can be NULL if we failed to find the associated menu (this happens at - // least in wxMSW for the events from the system menus) - static - bool ProcessMenuEvent(wxMenu* menu, wxMenuEvent& event, wxWindow* win); - - - // compatibility: these functions are deprecated, use the new ones instead - // ----------------------------------------------------------------------- - - // use the versions taking wxItem_XXX now instead, they're more readable - // and allow adding the radio items as well - void Append(int itemid, - const wxString& text, - const wxString& help, - bool isCheckable) - { - Append(itemid, text, help, isCheckable ? wxITEM_CHECK : wxITEM_NORMAL); - } - - // use more readable and not requiring unused itemid AppendSubMenu() instead - wxMenuItem* Append(int itemid, - const wxString& text, - wxMenu *submenu, - const wxString& help = wxEmptyString) - { - return DoAppend(wxMenuItem::New((wxMenu *)this, itemid, text, help, - wxITEM_NORMAL, submenu)); - } - - void Insert(size_t pos, - int itemid, - const wxString& text, - const wxString& help, - bool isCheckable) - { - Insert(pos, itemid, text, help, isCheckable ? wxITEM_CHECK : wxITEM_NORMAL); - } - - void Prepend(int itemid, - const wxString& text, - const wxString& help, - bool isCheckable) - { - Insert(0u, itemid, text, help, isCheckable); - } - - static void LockAccels(bool locked) - { - ms_locked = locked; - } - -protected: - // virtuals to override in derived classes - // --------------------------------------- - - virtual wxMenuItem* DoAppend(wxMenuItem *item); - virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item); - - virtual wxMenuItem *DoRemove(wxMenuItem *item); - virtual bool DoDelete(wxMenuItem *item); - virtual bool DoDestroy(wxMenuItem *item); - - // helpers - // ------- - - // common part of all ctors - void Init(long style); - - // associate the submenu with this menu - void AddSubMenu(wxMenu *submenu); - - wxMenuBar *m_menuBar; // menubar we belong to or NULL - wxMenu *m_menuParent; // parent menu or NULL - - wxString m_title; // the menu title or label - wxMenuItemList m_items; // the list of menu items - - wxWindow *m_invokingWindow; // for popup menus - - long m_style; // combination of wxMENU_XXX flags - - wxEvtHandler *m_eventHandler; // a pluggable in event handler - - static bool ms_locked; - - -private: - // Common part of SendEvent() and ProcessMenuEvent(): sends the event to - // its intended recipients, returns true if it was processed. - static bool DoProcessEvent(wxMenuBase* menu, wxEvent& event, wxWindow* win); - - wxDECLARE_NO_COPY_CLASS(wxMenuBase); -}; - -#if wxUSE_EXTENDED_RTTI - -// ---------------------------------------------------------------------------- -// XTI accessor -// ---------------------------------------------------------------------------- - -class WXDLLEXPORT wxMenuInfoHelper : public wxObject -{ -public: - wxMenuInfoHelper() { m_menu = NULL; } - virtual ~wxMenuInfoHelper() { } - - bool Create( wxMenu *menu, const wxString &title ) - { - m_menu = menu; - m_title = title; - return true; - } - - wxMenu* GetMenu() const { return m_menu; } - wxString GetTitle() const { return m_title; } - -private: - wxMenu *m_menu; - wxString m_title; - - wxDECLARE_DYNAMIC_CLASS(wxMenuInfoHelper); -}; - -WX_DECLARE_EXPORTED_LIST(wxMenuInfoHelper, wxMenuInfoHelperList ); - -#endif - -// ---------------------------------------------------------------------------- -// wxMenuBar -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxMenuBarBase : public wxWindow -{ -public: - // default ctor - wxMenuBarBase(); - - // dtor will delete all menus we own - virtual ~wxMenuBarBase(); - - // menu bar construction - // --------------------- - - // append a menu to the end of menubar, return true if ok - virtual bool Append(wxMenu *menu, const wxString& title); - - // insert a menu before the given position into the menubar, return true - // if inserted ok - virtual bool Insert(size_t pos, wxMenu *menu, const wxString& title); - - // menu bar items access - // --------------------- - - // get the number of menus in the menu bar - size_t GetMenuCount() const { return m_menus.GetCount(); } - - // get the menu at given position - wxMenu *GetMenu(size_t pos) const; - - // replace the menu at given position with another one, returns the - // previous menu (which should be deleted by the caller) - virtual wxMenu *Replace(size_t pos, wxMenu *menu, const wxString& title); - - // delete the menu at given position from the menu bar, return the pointer - // to the menu (which should be deleted by the caller) - virtual wxMenu *Remove(size_t pos); - - // enable or disable a submenu - virtual void EnableTop(size_t pos, bool enable) = 0; - - // is the menu enabled? - virtual bool IsEnabledTop(size_t WXUNUSED(pos)) const { return true; } - - // get or change the label of the menu at given position - virtual void SetMenuLabel(size_t pos, const wxString& label) = 0; - virtual wxString GetMenuLabel(size_t pos) const = 0; - - // get the stripped label of the menu at given position - virtual wxString GetMenuLabelText(size_t pos) const { return wxMenuItem::GetLabelText(GetMenuLabel(pos)); } - - // item search - // ----------- - - // by menu and item names, returns wxNOT_FOUND if not found or id of the - // found item - virtual int FindMenuItem(const wxString& menu, const wxString& item) const; - - // find item by id (in any menu), returns NULL if not found - // - // if menu is !NULL, it will be filled with wxMenu this item belongs to - virtual wxMenuItem* FindItem(int itemid, wxMenu **menu = NULL) const; - - // find menu by its caption, return wxNOT_FOUND on failure - int FindMenu(const wxString& title) const; - - // item access - // ----------- - - // all these functions just use FindItem() and then call an appropriate - // method on it - // - // NB: under MSW, these methods can only be used after the menubar had - // been attached to the frame - - void Enable(int itemid, bool enable); - void Check(int itemid, bool check); - bool IsChecked(int itemid) const; - bool IsEnabled(int itemid) const; - virtual bool IsEnabled() const { return wxWindow::IsEnabled(); } - - void SetLabel(int itemid, const wxString &label); - wxString GetLabel(int itemid) const; - - void SetHelpString(int itemid, const wxString& helpString); - wxString GetHelpString(int itemid) const; - - // implementation helpers - - // get the frame we are attached to (may return NULL) - wxFrame *GetFrame() const { return m_menuBarFrame; } - - // returns true if we're attached to a frame - bool IsAttached() const { return GetFrame() != NULL; } - - // associate the menubar with the frame - virtual void Attach(wxFrame *frame); - - // called before deleting the menubar normally - virtual void Detach(); - - // need to override these ones to avoid virtual function hiding - virtual bool Enable(bool enable = true) wxOVERRIDE { return wxWindow::Enable(enable); } - virtual void SetLabel(const wxString& s) wxOVERRIDE { wxWindow::SetLabel(s); } - virtual wxString GetLabel() const wxOVERRIDE { return wxWindow::GetLabel(); } - - // don't want menu bars to accept the focus by tabbing to them - virtual bool AcceptsFocusFromKeyboard() const wxOVERRIDE { return false; } - - // update all menu item states in all menus - virtual void UpdateMenus(); - - virtual bool CanBeOutsideClientArea() const wxOVERRIDE { return true; } - -#if wxUSE_EXTENDED_RTTI - // XTI helpers: - bool AppendMenuInfo( const wxMenuInfoHelper *info ) - { return Append( info->GetMenu(), info->GetTitle() ); } - const wxMenuInfoHelperList& GetMenuInfos() const; -#endif - -#if WXWIN_COMPATIBILITY_2_8 - // get or change the label of the menu at given position - // Deprecated in favour of SetMenuLabel - wxDEPRECATED( void SetLabelTop(size_t pos, const wxString& label) ); - // Deprecated in favour of GetMenuLabelText - wxDEPRECATED( wxString GetLabelTop(size_t pos) const ); -#endif - -protected: - // the list of all our menus - wxMenuList m_menus; - -#if wxUSE_EXTENDED_RTTI - // used by XTI - wxMenuInfoHelperList m_menuInfos; -#endif - - // the frame we are attached to (may be NULL) - wxFrame *m_menuBarFrame; - - wxDECLARE_NO_COPY_CLASS(wxMenuBarBase); -}; - -// ---------------------------------------------------------------------------- -// include the real class declaration -// ---------------------------------------------------------------------------- - -#ifdef wxUSE_BASE_CLASSES_ONLY - #define wxMenuItem wxMenuItemBase -#else // !wxUSE_BASE_CLASSES_ONLY -#if defined(__WXUNIVERSAL__) - #include "wx/univ/menu.h" -#elif defined(__WXMSW__) - #include "wx/msw/menu.h" -#elif defined(__WXMOTIF__) - #include "wx/motif/menu.h" -#elif defined(__WXGTK20__) - #include "wx/gtk/menu.h" -#elif defined(__WXGTK__) - #include "wx/gtk1/menu.h" -#elif defined(__WXMAC__) - #include "wx/osx/menu.h" -#elif defined(__WXQT__) - #include "wx/qt/menu.h" -#endif -#endif // wxUSE_BASE_CLASSES_ONLY/!wxUSE_BASE_CLASSES_ONLY - -// ---------------------------------------------------------------------------- -// Helper class used in the implementation only: sets the invoking window of -// the given menu in its ctor and resets it in dtor. -// ---------------------------------------------------------------------------- - -class wxMenuInvokingWindowSetter -{ -public: - // Ctor sets the invoking window for the given menu. - // - // The menu lifetime must be greater than that of this class. - wxMenuInvokingWindowSetter(wxMenu& menu, wxWindow *win) - : m_menu(menu) - { - menu.SetInvokingWindow(win); - } - - // Dtor resets the invoking window. - ~wxMenuInvokingWindowSetter() - { - m_menu.SetInvokingWindow(NULL); - } - -private: - wxMenu& m_menu; - - wxDECLARE_NO_COPY_CLASS(wxMenuInvokingWindowSetter); -}; - -#endif // wxUSE_MENUS - -#endif // _WX_MENU_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/menuitem.h b/Externals/wxWidgets3/include/wx/menuitem.h deleted file mode 100644 index 826086d118..0000000000 --- a/Externals/wxWidgets3/include/wx/menuitem.h +++ /dev/null @@ -1,215 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/menuitem.h -// Purpose: wxMenuItem class -// Author: Vadim Zeitlin -// Modified by: -// Created: 25.10.99 -// Copyright: (c) 1999 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MENUITEM_H_BASE_ -#define _WX_MENUITEM_H_BASE_ - -#include "wx/defs.h" - -#if wxUSE_MENUS - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/object.h" // base class - -// ---------------------------------------------------------------------------- -// forward declarations -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxAcceleratorEntry; -class WXDLLIMPEXP_FWD_CORE wxMenuItem; -class WXDLLIMPEXP_FWD_CORE wxMenu; - -// ---------------------------------------------------------------------------- -// wxMenuItem is an item in the menu which may be either a normal item, a sub -// menu or a separator -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxMenuItemBase : public wxObject -{ -public: - // creation - static wxMenuItem *New(wxMenu *parentMenu = NULL, - int itemid = wxID_SEPARATOR, - const wxString& text = wxEmptyString, - const wxString& help = wxEmptyString, - wxItemKind kind = wxITEM_NORMAL, - wxMenu *subMenu = NULL); - - // destruction: wxMenuItem will delete its submenu - virtual ~wxMenuItemBase(); - - // the menu we're in - wxMenu *GetMenu() const { return m_parentMenu; } - void SetMenu(wxMenu* menu) { m_parentMenu = menu; } - - // get/set id - void SetId(int itemid) { m_id = itemid; } - int GetId() const { return m_id; } - - // the item's text (or name) - // - // NB: the item's label includes the accelerators and mnemonics info (if - // any), i.e. it may contain '&' or '_' or "\t..." and thus is - // different from the item's text which only contains the text shown - // in the menu. This used to be called SetText. - virtual void SetItemLabel(const wxString& str); - - // return the item label including any mnemonics and accelerators. - // This used to be called GetText. - virtual wxString GetItemLabel() const { return m_text; } - - // return just the text of the item label, without any mnemonics - // This used to be called GetLabel. - virtual wxString GetItemLabelText() const { return GetLabelText(m_text); } - - // return just the text part of the given label (implemented in platform-specific code) - // This used to be called GetLabelFromText. - static wxString GetLabelText(const wxString& label); - - // what kind of menu item we are - wxItemKind GetKind() const { return m_kind; } - void SetKind(wxItemKind kind) { m_kind = kind; } - bool IsSeparator() const { return m_kind == wxITEM_SEPARATOR; } - - bool IsCheck() const { return m_kind == wxITEM_CHECK; } - bool IsRadio() const { return m_kind == wxITEM_RADIO; } - - virtual void SetCheckable(bool checkable) - { m_kind = checkable ? wxITEM_CHECK : wxITEM_NORMAL; } - - // Notice that this doesn't quite match SetCheckable(). - bool IsCheckable() const - { return m_kind == wxITEM_CHECK || m_kind == wxITEM_RADIO; } - - bool IsSubMenu() const { return m_subMenu != NULL; } - void SetSubMenu(wxMenu *menu) { m_subMenu = menu; } - wxMenu *GetSubMenu() const { return m_subMenu; } - - // state - virtual void Enable(bool enable = true) { m_isEnabled = enable; } - virtual bool IsEnabled() const { return m_isEnabled; } - - virtual void Check(bool check = true) { m_isChecked = check; } - virtual bool IsChecked() const { return m_isChecked; } - void Toggle() { Check(!m_isChecked); } - - // help string (displayed in the status bar by default) - void SetHelp(const wxString& str); - const wxString& GetHelp() const { return m_help; } - -#if wxUSE_ACCEL - // extract the accelerator from the given menu string, return NULL if none - // found - static wxAcceleratorEntry *GetAccelFromString(const wxString& label); - - // get our accelerator or NULL (caller must delete the pointer) - virtual wxAcceleratorEntry *GetAccel() const; - - // set the accel for this item - this may also be done indirectly with - // SetText() - virtual void SetAccel(wxAcceleratorEntry *accel); -#endif // wxUSE_ACCEL - -#if WXWIN_COMPATIBILITY_2_8 - // compatibility only, use new functions in the new code - wxDEPRECATED( void SetName(const wxString& str) ); - wxDEPRECATED( wxString GetName() const ); - - // Now use GetItemLabelText - wxDEPRECATED( wxString GetLabel() const ) ; - - // Now use GetItemLabel - wxDEPRECATED( const wxString& GetText() const ); - - // Now use GetLabelText to strip the accelerators - static wxDEPRECATED( wxString GetLabelFromText(const wxString& text) ); - - // Now use SetItemLabel - wxDEPRECATED( virtual void SetText(const wxString& str) ); -#endif // WXWIN_COMPATIBILITY_2_8 - - static wxMenuItem *New(wxMenu *parentMenu, - int itemid, - const wxString& text, - const wxString& help, - bool isCheckable, - wxMenu *subMenu = NULL) - { - return New(parentMenu, itemid, text, help, - isCheckable ? wxITEM_CHECK : wxITEM_NORMAL, subMenu); - } - -protected: - wxWindowIDRef m_id; // numeric id of the item >= 0 or wxID_ANY or wxID_SEPARATOR - wxMenu *m_parentMenu, // the menu we belong to - *m_subMenu; // our sub menu or NULL - wxString m_text, // label of the item - m_help; // the help string for the item - wxItemKind m_kind; // separator/normal/check/radio item? - bool m_isChecked; // is checked? - bool m_isEnabled; // is enabled? - - // this ctor is for the derived classes only, we're never created directly - wxMenuItemBase(wxMenu *parentMenu = NULL, - int itemid = wxID_SEPARATOR, - const wxString& text = wxEmptyString, - const wxString& help = wxEmptyString, - wxItemKind kind = wxITEM_NORMAL, - wxMenu *subMenu = NULL); - -private: - // and, if we have one ctor, compiler won't generate a default copy one, so - // declare them ourselves - but don't implement as they shouldn't be used - wxMenuItemBase(const wxMenuItemBase& item); - wxMenuItemBase& operator=(const wxMenuItemBase& item); -}; - -#if WXWIN_COMPATIBILITY_2_8 -inline void wxMenuItemBase::SetName(const wxString &str) - { SetItemLabel(str); } -inline wxString wxMenuItemBase::GetName() const - { return GetItemLabel(); } -inline wxString wxMenuItemBase::GetLabel() const - { return GetLabelText(m_text); } -inline const wxString& wxMenuItemBase::GetText() const { return m_text; } -inline void wxMenuItemBase::SetText(const wxString& text) { SetItemLabel(text); } -#endif // WXWIN_COMPATIBILITY_2_8 - -// ---------------------------------------------------------------------------- -// include the real class declaration -// ---------------------------------------------------------------------------- - -#ifdef wxUSE_BASE_CLASSES_ONLY - #define wxMenuItem wxMenuItemBase -#else // !wxUSE_BASE_CLASSES_ONLY -#if defined(__WXUNIVERSAL__) - #include "wx/univ/menuitem.h" -#elif defined(__WXMSW__) - #include "wx/msw/menuitem.h" -#elif defined(__WXMOTIF__) - #include "wx/motif/menuitem.h" -#elif defined(__WXGTK20__) - #include "wx/gtk/menuitem.h" -#elif defined(__WXGTK__) - #include "wx/gtk1/menuitem.h" -#elif defined(__WXMAC__) - #include "wx/osx/menuitem.h" -#elif defined(__WXQT__) - #include "wx/qt/menuitem.h" -#endif -#endif // wxUSE_BASE_CLASSES_ONLY/!wxUSE_BASE_CLASSES_ONLY - -#endif // wxUSE_MENUS - -#endif - // _WX_MENUITEM_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/meta/convertible.h b/Externals/wxWidgets3/include/wx/meta/convertible.h deleted file mode 100644 index 4599937821..0000000000 --- a/Externals/wxWidgets3/include/wx/meta/convertible.h +++ /dev/null @@ -1,38 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/meta/convertible.h -// Purpose: Test if types are convertible -// Author: Arne Steinarson -// Created: 2008-01-10 -// Copyright: (c) 2008 Arne Steinarson -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_META_CONVERTIBLE_H_ -#define _WX_META_CONVERTIBLE_H_ - -// -// Introduce an extra class to make this header compilable with g++3.2 -// -template -struct wxConvertibleTo_SizeHelper -{ - static char Match(B* pb); - static int Match(...); -}; - -// Helper to decide if an object of type D is convertible to type B (the test -// succeeds in particular when D derives from B) -template -struct wxConvertibleTo -{ - enum - { - value = - sizeof(wxConvertibleTo_SizeHelper::Match(static_cast(NULL))) - == - sizeof(char) - }; -}; - -#endif // _WX_META_CONVERTIBLE_H_ - diff --git a/Externals/wxWidgets3/include/wx/meta/if.h b/Externals/wxWidgets3/include/wx/meta/if.h deleted file mode 100644 index 0d93e8188b..0000000000 --- a/Externals/wxWidgets3/include/wx/meta/if.h +++ /dev/null @@ -1,56 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/meta/if.h -// Purpose: declares wxIf<> metaprogramming construct -// Author: Vaclav Slavik -// Created: 2008-01-22 -// Copyright: (c) 2008 Vaclav Slavik -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_META_IF_H_ -#define _WX_META_IF_H_ - -#include "wx/defs.h" - -namespace wxPrivate -{ - -template -struct wxIfImpl; - -// specialization for true: -template <> -struct wxIfImpl -{ - template struct Result - { - typedef TTrue value; - }; -}; - -// specialization for false: -template<> -struct wxIfImpl -{ - template struct Result - { - typedef TFalse value; - }; -}; - -} // namespace wxPrivate - -// wxIf<> template defines nested type "value" which is the same as -// TTrue if the condition Cond (boolean compile-time constant) was met and -// TFalse if it wasn't. -// -// See wxVector in vector.h for usage example -template -struct wxIf -{ - typedef typename wxPrivate::wxIfImpl - ::template Result::value - value; -}; - -#endif // _WX_META_IF_H_ diff --git a/Externals/wxWidgets3/include/wx/meta/implicitconversion.h b/Externals/wxWidgets3/include/wx/meta/implicitconversion.h deleted file mode 100644 index 2207cb193b..0000000000 --- a/Externals/wxWidgets3/include/wx/meta/implicitconversion.h +++ /dev/null @@ -1,102 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/meta/implicitconversion.h -// Purpose: Determine resulting type from implicit conversion -// Author: Vaclav Slavik -// Created: 2010-10-22 -// Copyright: (c) 2010 Vaclav Slavik -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_META_IMPLICITCONVERSION_H_ -#define _WX_META_IMPLICITCONVERSION_H_ - -#include "wx/defs.h" -#include "wx/meta/if.h" - -// C++ hierarchy of data types is: -// -// Long double (highest) -// Double -// Float -// Unsigned long int -// Long int -// Unsigned int -// Int (lowest) -// -// Types lower in the hierarchy are converted into ones higher up if both are -// involved e.g. in arithmetic expressions. - -namespace wxPrivate -{ - -template -struct TypeHierarchy -{ - // consider unknown types (e.g. objects, pointers) to be of highest - // level, always convert to them if they occur - static const int level = 9999; -}; - -#define WX_TYPE_HIERARCHY_LEVEL(level_num, type) \ - template<> struct TypeHierarchy \ - { \ - static const int level = level_num; \ - } - -WX_TYPE_HIERARCHY_LEVEL( 1, char); -WX_TYPE_HIERARCHY_LEVEL( 2, unsigned char); -WX_TYPE_HIERARCHY_LEVEL( 3, short); -WX_TYPE_HIERARCHY_LEVEL( 4, unsigned short); -WX_TYPE_HIERARCHY_LEVEL( 5, int); -WX_TYPE_HIERARCHY_LEVEL( 6, unsigned int); -WX_TYPE_HIERARCHY_LEVEL( 7, long); -WX_TYPE_HIERARCHY_LEVEL( 8, unsigned long); -#ifdef wxLongLong_t -WX_TYPE_HIERARCHY_LEVEL( 9, wxLongLong_t); -WX_TYPE_HIERARCHY_LEVEL(10, wxULongLong_t); -#endif -WX_TYPE_HIERARCHY_LEVEL(11, float); -WX_TYPE_HIERARCHY_LEVEL(12, double); -WX_TYPE_HIERARCHY_LEVEL(13, long double); - -#if wxWCHAR_T_IS_REAL_TYPE - #if SIZEOF_WCHAR_T == SIZEOF_SHORT - template<> struct TypeHierarchy : public TypeHierarchy {}; - #elif SIZEOF_WCHAR_T == SIZEOF_INT - template<> struct TypeHierarchy : public TypeHierarchy {}; - #elif SIZEOF_WCHAR_T == SIZEOF_LONG - template<> struct TypeHierarchy : public TypeHierarchy {}; - #else - #error "weird wchar_t size, please update this code" - #endif -#endif - -#undef WX_TYPE_HIERARCHY_LEVEL - -} // namespace wxPrivate - -// Helper to determine resulting type of implicit conversion in -// an expression with two arithmetic types. -template -struct wxImplicitConversionType -{ - typedef typename wxIf - < - // if T2 is "higher" type, convert to it - (int)(wxPrivate::TypeHierarchy::level) < (int)(wxPrivate::TypeHierarchy::level), - T2, - // otherwise use T1 - T1 - >::value - value; -}; - - -template -struct wxImplicitConversionType3 : public wxImplicitConversionType< - T1, - typename wxImplicitConversionType::value> -{ -}; - -#endif // _WX_META_IMPLICITCONVERSION_H_ diff --git a/Externals/wxWidgets3/include/wx/meta/int2type.h b/Externals/wxWidgets3/include/wx/meta/int2type.h deleted file mode 100644 index 7b8d5dc02c..0000000000 --- a/Externals/wxWidgets3/include/wx/meta/int2type.h +++ /dev/null @@ -1,16 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/meta/int2type.h -// Purpose: Generate a unique type from a constant integer -// Author: Arne Steinarson -// Created: 2008-01-10 -// Copyright: (c) 2008 Arne Steinarson -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_META_INT2TYPE_H_ -#define _WX_META_INT2TYPE_H_ - -template -struct wxInt2Type { enum { value=N }; }; - -#endif // _WX_META_INT2TYPE_H_ diff --git a/Externals/wxWidgets3/include/wx/meta/movable.h b/Externals/wxWidgets3/include/wx/meta/movable.h deleted file mode 100644 index 6e6aac9751..0000000000 --- a/Externals/wxWidgets3/include/wx/meta/movable.h +++ /dev/null @@ -1,44 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/meta/movable.h -// Purpose: Test if a type is movable using memmove() etc. -// Author: Vaclav Slavik -// Created: 2008-01-21 -// Copyright: (c) 2008 Vaclav Slavik -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_META_MOVABLE_H_ -#define _WX_META_MOVABLE_H_ - -#include "wx/meta/pod.h" -#include "wx/string.h" // for wxIsMovable specialization - -// Helper to decide if an object of type T is "movable", i.e. if it can be -// copied to another memory location using memmove() or realloc() C functions. -// C++ only gurantees that POD types (including primitive types) are -// movable. -template -struct wxIsMovable -{ - static const bool value = wxIsPod::value; -}; - -// Macro to add wxIsMovable specialization for given type that marks it -// as movable: -#define WX_DECLARE_TYPE_MOVABLE(type) \ - template<> struct wxIsMovable \ - { \ - static const bool value = true; \ - }; - -// Our implementation of wxString is written in such way that it's safe to move -// it around (unless position cache is used which unfortunately breaks this). -// OTOH, we don't know anything about std::string. -// (NB: we don't put this into string.h and choose to include wx/string.h from -// here instead so that rarely-used wxIsMovable code isn't included by -// everything) -#if !wxUSE_STD_STRING && !wxUSE_STRING_POS_CACHE -WX_DECLARE_TYPE_MOVABLE(wxString) -#endif - -#endif // _WX_META_MOVABLE_H_ diff --git a/Externals/wxWidgets3/include/wx/meta/pod.h b/Externals/wxWidgets3/include/wx/meta/pod.h deleted file mode 100644 index fa4395c62a..0000000000 --- a/Externals/wxWidgets3/include/wx/meta/pod.h +++ /dev/null @@ -1,69 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/meta/pod.h -// Purpose: Test if a type is POD -// Author: Vaclav Slavik, Jaakko Salli -// Created: 2010-06-14 -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_META_POD_H_ -#define _WX_META_POD_H_ - -#include "wx/defs.h" - -// -// TODO: Use TR1 is_pod<> implementation where available. VC9 SP1 has it -// in tr1 namespace, VC10 has it in std namespace. GCC 4.2 has it in -// , while GCC 4.3 and later have it in . -// - -// Helper to decide if an object of type T is POD (Plain Old Data) -template -struct wxIsPod -{ - static const bool value = false; -}; - -// Macro to add wxIsPod specialization for given type that marks it -// as Plain Old Data: -#define WX_DECLARE_TYPE_POD(type) \ - template<> struct wxIsPod \ - { \ - static const bool value = true; \ - }; - -WX_DECLARE_TYPE_POD(bool) -WX_DECLARE_TYPE_POD(unsigned char) -WX_DECLARE_TYPE_POD(signed char) -WX_DECLARE_TYPE_POD(unsigned int) -WX_DECLARE_TYPE_POD(signed int) -WX_DECLARE_TYPE_POD(unsigned short int) -WX_DECLARE_TYPE_POD(signed short int) -WX_DECLARE_TYPE_POD(signed long int) -WX_DECLARE_TYPE_POD(unsigned long int) -WX_DECLARE_TYPE_POD(float) -WX_DECLARE_TYPE_POD(double) -WX_DECLARE_TYPE_POD(long double) -#if wxWCHAR_T_IS_REAL_TYPE -WX_DECLARE_TYPE_POD(wchar_t) -#endif -#ifdef wxLongLong_t -WX_DECLARE_TYPE_POD(wxLongLong_t) -WX_DECLARE_TYPE_POD(wxULongLong_t) -#endif - -// pointers are Plain Old Data: -template -struct wxIsPod -{ - static const bool value = true; -}; - -template -struct wxIsPod -{ - static const bool value = true; -}; - -#endif // _WX_META_POD_H_ diff --git a/Externals/wxWidgets3/include/wx/meta/removeref.h b/Externals/wxWidgets3/include/wx/meta/removeref.h deleted file mode 100644 index efef170fb8..0000000000 --- a/Externals/wxWidgets3/include/wx/meta/removeref.h +++ /dev/null @@ -1,33 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/meta/removeref.h -// Purpose: Allows to remove a reference from a type. -// Author: Vadim Zeitlin -// Created: 2012-10-21 -// Copyright: (c) 2012 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_META_REMOVEREF_H_ -#define _WX_META_REMOVEREF_H_ - -// wxRemoveRef<> is similar to C++11 std::remove_reference<> but works with all -// compilers (but, to compensate for this, doesn't work with rvalue references). - -template -struct wxRemoveRef -{ - typedef T type; -}; - -template -struct wxRemoveRef -{ - typedef T type; -}; - -// Define this for compatibility with the previous versions in which -// wxRemoveRef() wasn't always defined as we supported MSVC6 for which it -// couldn't be implemented. -#define wxHAS_REMOVEREF - -#endif // _WX_META_REMOVEREF_H_ diff --git a/Externals/wxWidgets3/include/wx/metafile.h b/Externals/wxWidgets3/include/wx/metafile.h deleted file mode 100644 index e5e6dd03da..0000000000 --- a/Externals/wxWidgets3/include/wx/metafile.h +++ /dev/null @@ -1,51 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/metafile.h -// Purpose: wxMetaFile class declaration -// Author: wxWidgets team -// Modified by: -// Created: 13.01.00 -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_METAFILE_H_BASE_ -#define _WX_METAFILE_H_BASE_ - -#include "wx/defs.h" - -#if wxUSE_METAFILE - -// provide synonyms for all metafile classes -#define wxMetaFile wxMetafile -#define wxMetaFileDC wxMetafileDC -#define wxMetaFileDataObject wxMetafileDataObject - -#define wxMakeMetaFilePlaceable wxMakeMetafilePlaceable - -#if defined(__WXMSW__) - #if wxUSE_ENH_METAFILE - #include "wx/msw/enhmeta.h" - - #if wxUSE_WIN_METAFILES_ALWAYS - // use normal metafiles as well - #include "wx/msw/metafile.h" - #else // also map all metafile classes to enh metafile - typedef wxEnhMetaFile wxMetafile; - typedef wxEnhMetaFileDC wxMetafileDC; - #if wxUSE_DRAG_AND_DROP - typedef wxEnhMetaFileDataObject wxMetafileDataObject; - #endif - - // this flag will be set if wxMetafile class is wxEnhMetaFile - #define wxMETAFILE_IS_ENH - #endif // wxUSE_WIN_METAFILES_ALWAYS - #else // !wxUSE_ENH_METAFILE - #include "wx/msw/metafile.h" - #endif -#elif defined(__WXMAC__) - #include "wx/osx/metafile.h" -#endif - -#endif // wxUSE_METAFILE - -#endif // _WX_METAFILE_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/mimetype.h b/Externals/wxWidgets3/include/wx/mimetype.h deleted file mode 100644 index c95d7775f9..0000000000 --- a/Externals/wxWidgets3/include/wx/mimetype.h +++ /dev/null @@ -1,496 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/mimetype.h -// Purpose: classes and functions to manage MIME types -// Author: Vadim Zeitlin -// Modified by: -// Chris Elliott (biol75@york.ac.uk) 5 Dec 00: write support for Win32 -// Created: 23.09.98 -// Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows licence (part of wxExtra library) -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MIMETYPE_H_ -#define _WX_MIMETYPE_H_ - -// ---------------------------------------------------------------------------- -// headers and such -// ---------------------------------------------------------------------------- - -#include "wx/defs.h" - -#if wxUSE_MIMETYPE - -// the things we really need -#include "wx/string.h" -#include "wx/dynarray.h" -#include "wx/arrstr.h" - -#include - -// fwd decls -class WXDLLIMPEXP_FWD_BASE wxIconLocation; -class WXDLLIMPEXP_FWD_BASE wxFileTypeImpl; -class WXDLLIMPEXP_FWD_BASE wxMimeTypesManagerImpl; - -// these constants define the MIME informations source under UNIX and are used -// by wxMimeTypesManager::Initialize() -enum wxMailcapStyle -{ - wxMAILCAP_STANDARD = 1, - wxMAILCAP_NETSCAPE = 2, - wxMAILCAP_KDE = 4, - wxMAILCAP_GNOME = 8, - - wxMAILCAP_ALL = 15 -}; - -/* - TODO: would it be more convenient to have this class? - -class WXDLLIMPEXP_BASE wxMimeType : public wxString -{ -public: - // all string ctors here - - wxString GetType() const { return BeforeFirst(wxT('/')); } - wxString GetSubType() const { return AfterFirst(wxT('/')); } - - void SetSubType(const wxString& subtype) - { - *this = GetType() + wxT('/') + subtype; - } - - bool Matches(const wxMimeType& wildcard) - { - // implement using wxMimeTypesManager::IsOfType() - } -}; - -*/ - -// wxMimeTypeCommands stores the verbs defined for the given MIME type with -// their values -class WXDLLIMPEXP_BASE wxMimeTypeCommands -{ -public: - wxMimeTypeCommands() {} - - wxMimeTypeCommands(const wxArrayString& verbs, - const wxArrayString& commands) - : m_verbs(verbs), - m_commands(commands) - { - } - - // add a new verb with the command or replace the old value - void AddOrReplaceVerb(const wxString& verb, const wxString& cmd); - void Add(const wxString& s) - { - m_verbs.Add(s.BeforeFirst(wxT('='))); - m_commands.Add(s.AfterFirst(wxT('='))); - } - - // access the commands - size_t GetCount() const { return m_verbs.GetCount(); } - const wxString& GetVerb(size_t n) const { return m_verbs[n]; } - const wxString& GetCmd(size_t n) const { return m_commands[n]; } - - bool HasVerb(const wxString& verb) const - { return m_verbs.Index(verb) != wxNOT_FOUND; } - - // returns empty string and wxNOT_FOUND in idx if no such verb - wxString GetCommandForVerb(const wxString& verb, size_t *idx = NULL) const; - - // get a "verb=command" string - wxString GetVerbCmd(size_t n) const; - -private: - wxArrayString m_verbs; - wxArrayString m_commands; -}; - -// ---------------------------------------------------------------------------- -// wxFileTypeInfo: static container of information accessed via wxFileType. -// -// This class is used with wxMimeTypesManager::AddFallbacks() and Associate() -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxFileTypeInfo -{ -private: - void DoVarArgInit(const wxString& mimeType, - const wxString& openCmd, - const wxString& printCmd, - const wxString& desc, - va_list argptr); - - void VarArgInit(const wxString *mimeType, - const wxString *openCmd, - const wxString *printCmd, - const wxString *desc, - // the other parameters form a NULL terminated list of - // extensions - ...); - -public: - // NB: This is a helper to get implicit conversion of variadic ctor's - // fixed arguments into something that can be passed to VarArgInit(). - // Do not use, it's used by the ctor only. - struct CtorString - { - CtorString(const char *str) : m_str(str) {} - CtorString(const wchar_t *str) : m_str(str) {} - CtorString(const wxString& str) : m_str(str) {} - CtorString(const wxCStrData& str) : m_str(str) {} - CtorString(const wxScopedCharBuffer& str) : m_str(str) {} - CtorString(const wxScopedWCharBuffer& str) : m_str(str) {} - - operator const wxString*() const { return &m_str; } - - wxString m_str; - }; - - // ctors - - // Ctor specifying just the MIME type (which is mandatory), the other - // fields can be set later if needed. - wxFileTypeInfo(const wxString& mimeType) - : m_mimeType(mimeType) - { - } - - // Ctor allowing to specify the values of all fields at once: - // - // wxFileTypeInfo(const wxString& mimeType, - // const wxString& openCmd, - // const wxString& printCmd, - // const wxString& desc, - // // the other parameters form a list of extensions for this - // // file type and should be terminated with wxNullPtr (not - // // just NULL!) - // ...); - WX_DEFINE_VARARG_FUNC_CTOR(wxFileTypeInfo, - 4, (const CtorString&, - const CtorString&, - const CtorString&, - const CtorString&), - VarArgInit, VarArgInit) - - // the array elements correspond to the parameters of the ctor above in - // the same order - wxFileTypeInfo(const wxArrayString& sArray); - - // invalid item - use this to terminate the array passed to - // wxMimeTypesManager::AddFallbacks - wxFileTypeInfo() { } - - // test if this object can be used - bool IsValid() const { return !m_mimeType.empty(); } - - // setters - // set the open/print commands - void SetOpenCommand(const wxString& command) { m_openCmd = command; } - void SetPrintCommand(const wxString& command) { m_printCmd = command; } - - // set the description - void SetDescription(const wxString& desc) { m_desc = desc; } - - // add another extension corresponding to this file type - void AddExtension(const wxString& ext) { m_exts.push_back(ext); } - - // set the icon info - void SetIcon(const wxString& iconFile, int iconIndex = 0) - { - m_iconFile = iconFile; - m_iconIndex = iconIndex; - } - // set the short desc - void SetShortDesc(const wxString& shortDesc) { m_shortDesc = shortDesc; } - - // accessors - // get the MIME type - const wxString& GetMimeType() const { return m_mimeType; } - // get the open command - const wxString& GetOpenCommand() const { return m_openCmd; } - // get the print command - const wxString& GetPrintCommand() const { return m_printCmd; } - // get the short description (only used under Win32 so far) - const wxString& GetShortDesc() const { return m_shortDesc; } - // get the long, user visible description - const wxString& GetDescription() const { return m_desc; } - // get the array of all extensions - const wxArrayString& GetExtensions() const { return m_exts; } - size_t GetExtensionsCount() const {return m_exts.GetCount(); } - // get the icon info - const wxString& GetIconFile() const { return m_iconFile; } - int GetIconIndex() const { return m_iconIndex; } - -private: - wxString m_mimeType, // the MIME type in "type/subtype" form - m_openCmd, // command to use for opening the file (%s allowed) - m_printCmd, // command to use for printing the file (%s allowed) - m_shortDesc, // a short string used in the registry - m_desc; // a free form description of this file type - - // icon stuff - wxString m_iconFile; // the file containing the icon - int m_iconIndex; // icon index in this file - - wxArrayString m_exts; // the extensions which are mapped on this filetype - - -#if 0 // TODO - // the additional (except "open" and "print") command names and values - wxArrayString m_commandNames, - m_commandValues; -#endif // 0 -}; - -WX_DECLARE_USER_EXPORTED_OBJARRAY(wxFileTypeInfo, wxArrayFileTypeInfo, - WXDLLIMPEXP_BASE); - -// ---------------------------------------------------------------------------- -// wxFileType: gives access to all information about the files of given type. -// -// This class holds information about a given "file type". File type is the -// same as MIME type under Unix, but under Windows it corresponds more to an -// extension than to MIME type (in fact, several extensions may correspond to a -// file type). This object may be created in many different ways and depending -// on how it was created some fields may be unknown so the return value of all -// the accessors *must* be checked! -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxFileType -{ -friend class WXDLLIMPEXP_FWD_BASE wxMimeTypesManagerImpl; // it has access to m_impl - -public: - // An object of this class must be passed to Get{Open|Print}Command. The - // default implementation is trivial and doesn't know anything at all about - // parameters, only filename and MIME type are used (so it's probably ok for - // Windows where %{param} is not used anyhow) - class MessageParameters - { - public: - // ctors - MessageParameters() { } - MessageParameters(const wxString& filename, - const wxString& mimetype = wxEmptyString) - : m_filename(filename), m_mimetype(mimetype) { } - - // accessors (called by GetOpenCommand) - // filename - const wxString& GetFileName() const { return m_filename; } - // mime type - const wxString& GetMimeType() const { return m_mimetype; } - - // override this function in derived class - virtual wxString GetParamValue(const wxString& WXUNUSED(name)) const - { return wxEmptyString; } - - // virtual dtor as in any base class - virtual ~MessageParameters() { } - - protected: - wxString m_filename, m_mimetype; - }; - - // ctor from static data - wxFileType(const wxFileTypeInfo& ftInfo); - - // accessors: all of them return true if the corresponding information - // could be retrieved/found, false otherwise (and in this case all [out] - // parameters are unchanged) - // return the MIME type for this file type - bool GetMimeType(wxString *mimeType) const; - bool GetMimeTypes(wxArrayString& mimeTypes) const; - // fill passed in array with all extensions associated with this file - // type - bool GetExtensions(wxArrayString& extensions); - // get the icon corresponding to this file type and of the given size - bool GetIcon(wxIconLocation *iconloc) const; - bool GetIcon(wxIconLocation *iconloc, - const MessageParameters& params) const; - // get a brief file type description ("*.txt" => "text document") - bool GetDescription(wxString *desc) const; - - // get the command to be used to open/print the given file. - // get the command to execute the file of given type - bool GetOpenCommand(wxString *openCmd, - const MessageParameters& params) const; - // a simpler to use version of GetOpenCommand() -- it only takes the - // filename and returns an empty string on failure - wxString GetOpenCommand(const wxString& filename) const; - // get the command to print the file of given type - bool GetPrintCommand(wxString *printCmd, - const MessageParameters& params) const; - - - // return the number of commands defined for this file type, 0 if none - size_t GetAllCommands(wxArrayString *verbs, wxArrayString *commands, - const wxFileType::MessageParameters& params) const; - - // set an arbitrary command, ask confirmation if it already exists and - // overwriteprompt is true - bool SetCommand(const wxString& cmd, const wxString& verb, - bool overwriteprompt = true); - - bool SetDefaultIcon(const wxString& cmd = wxEmptyString, int index = 0); - - - // remove the association for this filetype from the system MIME database: - // notice that it will only work if the association is defined in the user - // file/registry part, we will never modify the system-wide settings - bool Unassociate(); - - // operations - // expand a string in the format of GetOpenCommand (which may contain - // '%s' and '%t' format specifiers for the file name and mime type - // and %{param} constructions). - static wxString ExpandCommand(const wxString& command, - const MessageParameters& params); - - // dtor (not virtual, shouldn't be derived from) - ~wxFileType(); - - wxString - GetExpandedCommand(const wxString& verb, - const wxFileType::MessageParameters& params) const; -private: - // default ctor is private because the user code never creates us - wxFileType(); - - // no copy ctor/assignment operator - wxFileType(const wxFileType&); - wxFileType& operator=(const wxFileType&); - - // the static container of wxFileType data: if it's not NULL, it means that - // this object is used as fallback only - const wxFileTypeInfo *m_info; - - // the object which implements the real stuff like reading and writing - // to/from system MIME database - wxFileTypeImpl *m_impl; -}; - -//---------------------------------------------------------------------------- -// wxMimeTypesManagerFactory -//---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxMimeTypesManagerFactory -{ -public: - wxMimeTypesManagerFactory() {} - virtual ~wxMimeTypesManagerFactory() {} - - virtual wxMimeTypesManagerImpl *CreateMimeTypesManagerImpl(); - - static void Set( wxMimeTypesManagerFactory *factory ); - static wxMimeTypesManagerFactory *Get(); - -private: - static wxMimeTypesManagerFactory *m_factory; -}; - -// ---------------------------------------------------------------------------- -// wxMimeTypesManager: interface to system MIME database. -// -// This class accesses the information about all known MIME types and allows -// the application to retrieve information (including how to handle data of -// given type) about them. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxMimeTypesManager -{ -public: - // static helper functions - // ----------------------- - - // check if the given MIME type is the same as the other one: the - // second argument may contain wildcards ('*'), but not the first. If - // the types are equal or if the mimeType matches wildcard the function - // returns true, otherwise it returns false - static bool IsOfType(const wxString& mimeType, const wxString& wildcard); - - // ctor - wxMimeTypesManager(); - - // NB: the following 2 functions are for Unix only and don't do anything - // elsewhere - - // loads data from standard files according to the mailcap styles - // specified: this is a bitwise OR of wxMailcapStyle values - // - // use the extraDir parameter if you want to look for files in another - // directory - void Initialize(int mailcapStyle = wxMAILCAP_ALL, - const wxString& extraDir = wxEmptyString); - - // and this function clears all the data from the manager - void ClearData(); - - // Database lookup: all functions return a pointer to wxFileType object - // whose methods may be used to query it for the information you're - // interested in. If the return value is !NULL, caller is responsible for - // deleting it. - // get file type from file extension - wxFileType *GetFileTypeFromExtension(const wxString& ext); - // get file type from MIME type (in format /) - wxFileType *GetFileTypeFromMimeType(const wxString& mimeType); - - // enumerate all known MIME types - // - // returns the number of retrieved file types - size_t EnumAllFileTypes(wxArrayString& mimetypes); - - // these functions can be used to provide default values for some of the - // MIME types inside the program itself - // - // The filetypes array should be terminated by either NULL entry or an - // invalid wxFileTypeInfo (i.e. the one created with default ctor) - void AddFallbacks(const wxFileTypeInfo *filetypes); - void AddFallback(const wxFileTypeInfo& ft) { m_fallbacks.Add(ft); } - - // create or remove associations - - // create a new association using the fields of wxFileTypeInfo (at least - // the MIME type and the extension should be set) - // if the other fields are empty, the existing values should be left alone - wxFileType *Associate(const wxFileTypeInfo& ftInfo); - - // undo Associate() - bool Unassociate(wxFileType *ft) ; - - // dtor (not virtual, shouldn't be derived from) - ~wxMimeTypesManager(); - -private: - // no copy ctor/assignment operator - wxMimeTypesManager(const wxMimeTypesManager&); - wxMimeTypesManager& operator=(const wxMimeTypesManager&); - - // the fallback info which is used if the information is not found in the - // real system database - wxArrayFileTypeInfo m_fallbacks; - - // the object working with the system MIME database - wxMimeTypesManagerImpl *m_impl; - - // if m_impl is NULL, create one - void EnsureImpl(); - - friend class wxMimeTypeCmnModule; -}; - - -// ---------------------------------------------------------------------------- -// global variables -// ---------------------------------------------------------------------------- - -// the default mime manager for wxWidgets programs -extern WXDLLIMPEXP_DATA_BASE(wxMimeTypesManager *) wxTheMimeTypesManager; - -#endif // wxUSE_MIMETYPE - -#endif - //_WX_MIMETYPE_H_ diff --git a/Externals/wxWidgets3/include/wx/minifram.h b/Externals/wxWidgets3/include/wx/minifram.h deleted file mode 100644 index bd03bbc939..0000000000 --- a/Externals/wxWidgets3/include/wx/minifram.h +++ /dev/null @@ -1,40 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/minifram.h -// Purpose: wxMiniFrame base header -// Author: Julian Smart -// Modified by: -// Created: -// Copyright: (c) Julian Smart -// Copyright: (c) 2014 wxWidgets dev team -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MINIFRAM_H_BASE_ -#define _WX_MINIFRAM_H_BASE_ - -#include "wx/defs.h" - -#if wxUSE_MINIFRAME - -#if defined(__WXMSW__) -#include "wx/msw/minifram.h" -#elif defined(__WXMOTIF__) -#include "wx/motif/minifram.h" -#elif defined(__WXGTK20__) -#include "wx/gtk/minifram.h" -#elif defined(__WXGTK__) -#include "wx/gtk1/minifram.h" -#elif defined(__WXX11__) -#include "wx/x11/minifram.h" -#elif defined(__WXMAC__) -#include "wx/osx/minifram.h" -#elif defined(__WXQT__) -#include "wx/qt/minifram.h" -#else -// TODO: it seems that wxMiniFrame could be just defined here generically -// instead of having all the above port-specific headers -#include "wx/frame.h" -typedef wxFrame wxMiniFrame; -#endif - -#endif // wxUSE_MINIFRAME -#endif // _WX_MINIFRAM_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/modalhook.h b/Externals/wxWidgets3/include/wx/modalhook.h deleted file mode 100644 index 55341f9bd9..0000000000 --- a/Externals/wxWidgets3/include/wx/modalhook.h +++ /dev/null @@ -1,104 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/modalhook.h -// Purpose: Allows to hook into showing modal dialogs. -// Author: Vadim Zeitlin -// Created: 2013-05-19 -// Copyright: (c) 2013 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MODALHOOK_H_ -#define _WX_MODALHOOK_H_ - -#include "wx/vector.h" - -class WXDLLIMPEXP_FWD_CORE wxDialog; - -// ---------------------------------------------------------------------------- -// Class allowing to be notified about any modal dialog calls. -// ---------------------------------------------------------------------------- - -// To be notified about entering and exiting modal dialogs and possibly to -// replace them with something else (e.g. just return a predefined value for -// testing), define an object of this class, override its Enter() and -// possibly Exit() methods and call Register() on it. -class WXDLLIMPEXP_CORE wxModalDialogHook -{ -public: - // Default ctor doesn't do anything, call Register() to activate the hook. - wxModalDialogHook() { } - - // Dtor unregisters the hook if it had been registered. - virtual ~wxModalDialogHook() { DoUnregister(); } - - // Register this hook as being active, i.e. its Enter() and Exit() methods - // will be called. - // - // Notice that the order of registration matters: the last hook registered - // is called first, and if its Enter() returns something != wxID_NONE, the - // subsequent hooks are skipped. - void Register(); - - // Unregister this hook. Notice that is done automatically from the dtor. - void Unregister(); - - // Called from wxWidgets code before showing any modal dialogs and calls - // Enter() for every registered hook. - static int CallEnter(wxDialog* dialog); - - // Called from wxWidgets code after dismissing the dialog and calls Exit() - // for every registered hook. - static void CallExit(wxDialog* dialog); - -protected: - // Called by wxWidgets before showing any modal dialogs, override this to - // be notified about this and return anything but wxID_NONE to skip showing - // the modal dialog entirely and just return the specified result. - virtual int Enter(wxDialog* dialog) = 0; - - // Called by wxWidgets after dismissing the modal dialog. Notice that it - // won't be called if Enter() hadn't been. - virtual void Exit(wxDialog* WXUNUSED(dialog)) { } - -private: - // Unregister the given hook, return true if it was done or false if the - // hook wasn't found. - bool DoUnregister(); - - // All the hooks in reverse registration order (i.e. in call order). - typedef wxVector Hooks; - static Hooks ms_hooks; - - wxDECLARE_NO_COPY_CLASS(wxModalDialogHook); -}; - -// Helper object used by WX_MODAL_DIALOG_HOOK below to ensure that CallExit() -// is called on scope exit. -class wxModalDialogHookExitGuard -{ -public: - wxEXPLICIT wxModalDialogHookExitGuard(wxDialog* dialog) - : m_dialog(dialog) - { - } - - ~wxModalDialogHookExitGuard() - { - wxModalDialogHook::CallExit(m_dialog); - } - -private: - wxDialog* const m_dialog; - - wxDECLARE_NO_COPY_CLASS(wxModalDialogHookExitGuard); -}; - -// This macro needs to be used at the top of every implementation of -// ShowModal() in order for wxModalDialogHook to work. -#define WX_HOOK_MODAL_DIALOG() \ - const int modalDialogHookRC = wxModalDialogHook::CallEnter(this); \ - if ( modalDialogHookRC != wxID_NONE ) \ - return modalDialogHookRC; \ - wxModalDialogHookExitGuard modalDialogHookExit(this) - -#endif // _WX_MODALHOOK_H_ diff --git a/Externals/wxWidgets3/include/wx/module.h b/Externals/wxWidgets3/include/wx/module.h deleted file mode 100644 index 2fc8559dd8..0000000000 --- a/Externals/wxWidgets3/include/wx/module.h +++ /dev/null @@ -1,119 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/module.h -// Purpose: Modules handling -// Author: Wolfram Gloger/adapted by Guilhem Lavaux -// Modified by: -// Created: 04/11/98 -// Copyright: (c) Wolfram Gloger and Guilhem Lavaux -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MODULE_H_ -#define _WX_MODULE_H_ - -#include "wx/object.h" -#include "wx/list.h" -#include "wx/arrstr.h" -#include "wx/dynarray.h" - -// declare a linked list of modules -class WXDLLIMPEXP_FWD_BASE wxModule; -WX_DECLARE_USER_EXPORTED_LIST(wxModule, wxModuleList, WXDLLIMPEXP_BASE); - -// and an array of class info objects -WX_DEFINE_USER_EXPORTED_ARRAY_PTR(wxClassInfo *, wxArrayClassInfo, - class WXDLLIMPEXP_BASE); - - -// declaring a class derived from wxModule will automatically create an -// instance of this class on program startup, call its OnInit() method and call -// OnExit() on program termination (but only if OnInit() succeeded) -class WXDLLIMPEXP_BASE wxModule : public wxObject -{ -public: - wxModule() {} - virtual ~wxModule() {} - - // if module init routine returns false the application - // will fail to startup - - bool Init() { return OnInit(); } - void Exit() { OnExit(); } - - // Override both of these - - // called on program startup - - virtual bool OnInit() = 0; - - // called just before program termination, but only if OnInit() - // succeeded - - virtual void OnExit() = 0; - - static void RegisterModule(wxModule *module); - static void RegisterModules(); - static bool InitializeModules(); - static void CleanUpModules() { DoCleanUpModules(m_modules); } - - // used by wxObjectLoader when unloading shared libs's - - static void UnregisterModule(wxModule *module); - -protected: - static wxModuleList m_modules; - - // the function to call from constructor of a deriving class add module - // dependency which will be initialized before the module and unloaded - // after that - void AddDependency(wxClassInfo *dep) - { - wxCHECK_RET( dep, wxT("NULL module dependency") ); - - m_dependencies.Add(dep); - } - - // same as the version above except it will look up wxClassInfo by name on - // its own - void AddDependency(const char *className) - { - m_namedDependencies.Add(className); - } - - -private: - // initialize module and Append it to initializedModules list recursively - // calling itself to satisfy module dependencies if needed - static bool - DoInitializeModule(wxModule *module, wxModuleList &initializedModules); - - // cleanup the modules in the specified list (which may not contain all - // modules if we're called during initialization because not all modules - // could be initialized) and also empty m_modules itself - static void DoCleanUpModules(const wxModuleList& modules); - - // resolve all named dependencies and add them to the normal m_dependencies - bool ResolveNamedDependencies(); - - - // module dependencies: contains wxClassInfo pointers for all modules which - // must be initialized before this one - wxArrayClassInfo m_dependencies; - - // and the named dependencies: those will be resolved during run-time and - // added to m_dependencies - wxArrayString m_namedDependencies; - - // used internally while initializing/cleaning up modules - enum - { - State_Registered, // module registered but not initialized yet - State_Initializing, // we're initializing this module but not done yet - State_Initialized // module initialized successfully - } m_state; - - - wxDECLARE_CLASS(wxModule); -}; - -#endif // _WX_MODULE_H_ diff --git a/Externals/wxWidgets3/include/wx/mousemanager.h b/Externals/wxWidgets3/include/wx/mousemanager.h deleted file mode 100644 index 997bee01ea..0000000000 --- a/Externals/wxWidgets3/include/wx/mousemanager.h +++ /dev/null @@ -1,153 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/mousemanager.h -// Purpose: wxMouseEventsManager class declaration -// Author: Vadim Zeitlin -// Created: 2009-04-20 -// Copyright: (c) 2009 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MOUSEMANAGER_H_ -#define _WX_MOUSEMANAGER_H_ - -#include "wx/event.h" - -// ---------------------------------------------------------------------------- -// wxMouseEventsManager -// ---------------------------------------------------------------------------- - -/* - This class handles mouse events and synthesizes high-level notifications - such as clicks and drag events from low level mouse button presses and - mouse movement events. It is useful because handling the mouse events is - less obvious than might seem at a first glance: for example, clicks on an - object should only be generated if the mouse was both pressed and released - over it and not just released (so it requires storing the previous state) - and dragging shouldn't start before the mouse moves away far enough. - - This class encapsulates all these dull details for controls containing - multiple items which can be identified by a positive integer index and you - just need to implement its pure virtual functions to use it. - */ -class WXDLLIMPEXP_CORE wxMouseEventsManager : public wxEvtHandler -{ -public: - // a mouse event manager is always associated with a window and must be - // deleted by the window when it is destroyed so if it is created using the - // default ctor Create() must be called later - wxMouseEventsManager() { Init(); } - wxMouseEventsManager(wxWindow *win) { Init(); Create(win); } - bool Create(wxWindow *win); - - virtual ~wxMouseEventsManager(); - -protected: - // called to find the item at the given position: return wxNOT_FOUND (-1) - // if there is no item here - virtual int MouseHitTest(const wxPoint& pos) = 0; - - // called when the user clicked (i.e. pressed and released mouse over the - // same item), should normally generate a notification about this click and - // return true if it was handled or false otherwise, determining whether - // the original mouse event is skipped or not - virtual bool MouseClicked(int item) = 0; - - // called to start dragging the given item, should generate the appropriate - // BEGIN_DRAG event and return false if dragging this item was forbidden - virtual bool MouseDragBegin(int item, const wxPoint& pos) = 0; - - // called while the item is being dragged, should normally update the - // feedback on screen (usually using wxOverlay) - virtual void MouseDragging(int item, const wxPoint& pos) = 0; - - // called when the mouse is released after dragging the item - virtual void MouseDragEnd(int item, const wxPoint& pos) = 0; - - // called when mouse capture is lost while dragging the item, should remove - // the visual feedback drawn by MouseDragging() - virtual void MouseDragCancelled(int item) = 0; - - - // you don't need to override those but you will want to do if it your - // control renders pressed items differently - - // called when the item is becomes pressed, can be used to change its - // appearance - virtual void MouseClickBegin(int WXUNUSED(item)) { } - - // called if the mouse capture was lost while the item was pressed, can be - // used to restore the default item appearance if it was changed in - // MouseClickBegin() - virtual void MouseClickCancelled(int WXUNUSED(item)) { } - -private: - /* - Here is a small diagram explaining the switches between different - states: - - - /---------->NORMAL<--------------- Drag end - / / / | event - / / | | ^ - / / | | | - Click / N | | mouse | mouse up - event / | | down | - | / | | DRAGGING - | / | | ^ - Y|/ N \ v |Y - +-------------+ +--------+ N +-----------+ - |On same item?| |On item?| -----------|Begin drag?| - +-------------+ +--------+ / +-----------+ - ^ | / ^ - | | / | - \ mouse | / mouse moved | - \ up v v far enough / - \--------PRESSED-------------------/ - - - There are also transitions from PRESSED and DRAGGING to NORMAL in case - the mouse capture is lost or Escape key is pressed which are not shown. - */ - enum State - { - State_Normal, // initial, default state - State_Pressed, // mouse was pressed over an item - State_Dragging // the item is being dragged - }; - - // common part of both ctors - void Init(); - - // various event handlers - void OnCaptureLost(wxMouseCaptureLostEvent& event); - void OnLeftDown(wxMouseEvent& event); - void OnLeftUp(wxMouseEvent& event); - void OnMove(wxMouseEvent& event); - - - // the associated window, never NULL except between the calls to the - // default ctor and Create() - wxWindow *m_win; - - // the current state - State m_state; - - // the details of the operation currently in progress, only valid if - // m_state is not normal - - // the item being pressed or dragged (always valid, i.e. != wxNOT_FOUND if - // m_state != State_Normal) - int m_item; - - // the position of the last mouse event of interest: either mouse press in - // State_Pressed or last movement event in State_Dragging - wxPoint m_posLast; - - - wxDECLARE_EVENT_TABLE(); - - wxDECLARE_NO_COPY_CLASS(wxMouseEventsManager); -}; - -#endif // _WX_MOUSEMANAGER_H_ - diff --git a/Externals/wxWidgets3/include/wx/mousestate.h b/Externals/wxWidgets3/include/wx/mousestate.h deleted file mode 100644 index 2ea1cc5bf1..0000000000 --- a/Externals/wxWidgets3/include/wx/mousestate.h +++ /dev/null @@ -1,149 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/mousestate.h -// Purpose: Declaration of wxMouseState class -// Author: Vadim Zeitlin -// Created: 2008-09-19 (extracted from wx/utils.h) -// Copyright: (c) 2008 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MOUSESTATE_H_ -#define _WX_MOUSESTATE_H_ - -#include "wx/gdicmn.h" // for wxPoint -#include "wx/kbdstate.h" - -// the symbolic names for the mouse buttons -enum wxMouseButton -{ - wxMOUSE_BTN_ANY = -1, - wxMOUSE_BTN_NONE = 0, - wxMOUSE_BTN_LEFT = 1, - wxMOUSE_BTN_MIDDLE = 2, - wxMOUSE_BTN_RIGHT = 3, - wxMOUSE_BTN_AUX1 = 4, - wxMOUSE_BTN_AUX2 = 5, - wxMOUSE_BTN_MAX -}; - -// ---------------------------------------------------------------------------- -// wxMouseState contains the information about mouse position, buttons and also -// key modifiers -// ---------------------------------------------------------------------------- - -// wxMouseState is used to hold information about button and modifier state -// and is what is returned from wxGetMouseState. -class WXDLLIMPEXP_CORE wxMouseState : public wxKeyboardState -{ -public: - wxMouseState() - : m_leftDown(false), m_middleDown(false), m_rightDown(false), - m_aux1Down(false), m_aux2Down(false), - m_x(0), m_y(0) - { - } - - // default copy ctor, assignment operator and dtor are ok - - - // accessors for the mouse position - wxCoord GetX() const { return m_x; } - wxCoord GetY() const { return m_y; } - wxPoint GetPosition() const { return wxPoint(m_x, m_y); } - void GetPosition(wxCoord *x, wxCoord *y) const - { - if ( x ) - *x = m_x; - if ( y ) - *y = m_y; - } - - // this overload is for compatibility only - void GetPosition(long *x, long *y) const - { - if ( x ) - *x = m_x; - if ( y ) - *y = m_y; - } - - // accessors for the pressed buttons - bool LeftIsDown() const { return m_leftDown; } - bool MiddleIsDown() const { return m_middleDown; } - bool RightIsDown() const { return m_rightDown; } - bool Aux1IsDown() const { return m_aux1Down; } - bool Aux2IsDown() const { return m_aux2Down; } - - bool ButtonIsDown(wxMouseButton but) const - { - switch ( but ) - { - case wxMOUSE_BTN_ANY: - return LeftIsDown() || MiddleIsDown() || RightIsDown() || - Aux1IsDown() || Aux2IsDown(); - - case wxMOUSE_BTN_LEFT: - return LeftIsDown(); - - case wxMOUSE_BTN_MIDDLE: - return MiddleIsDown(); - - case wxMOUSE_BTN_RIGHT: - return RightIsDown(); - - case wxMOUSE_BTN_AUX1: - return Aux1IsDown(); - - case wxMOUSE_BTN_AUX2: - return Aux2IsDown(); - - case wxMOUSE_BTN_NONE: - case wxMOUSE_BTN_MAX: - break; - } - - wxFAIL_MSG(wxS("invalid parameter")); - return false; - } - - - // these functions are mostly used by wxWidgets itself - void SetX(wxCoord x) { m_x = x; } - void SetY(wxCoord y) { m_y = y; } - void SetPosition(wxPoint pos) { m_x = pos.x, m_y = pos.y; } - - void SetLeftDown(bool down) { m_leftDown = down; } - void SetMiddleDown(bool down) { m_middleDown = down; } - void SetRightDown(bool down) { m_rightDown = down; } - void SetAux1Down(bool down) { m_aux1Down = down; } - void SetAux2Down(bool down) { m_aux2Down = down; } - - // this mostly makes sense in the derived classes such as wxMouseEvent - void SetState(const wxMouseState& state) { *this = state; } - - // these functions are for compatibility only, they were used in 2.8 - // version of wxMouseState but their names are confusing as wxMouseEvent - // has methods with the same names which do something quite different so - // don't use them any more -#if WXWIN_COMPATIBILITY_2_8 - wxDEPRECATED_INLINE(bool LeftDown() const, return LeftIsDown(); ) - wxDEPRECATED_INLINE(bool MiddleDown() const, return MiddleIsDown(); ) - wxDEPRECATED_INLINE(bool RightDown() const, return RightIsDown(); ) -#endif // WXWIN_COMPATIBILITY_2_8 - - // for compatibility reasons these variables are public as the code using - // wxMouseEvent often uses them directly -- however they should not be - // accessed directly in this class, use the accessors above instead -// private: - bool m_leftDown : 1; - bool m_middleDown : 1; - bool m_rightDown : 1; - bool m_aux1Down : 1; - bool m_aux2Down : 1; - - wxCoord m_x, - m_y; -}; - -#endif // _WX_MOUSESTATE_H_ - diff --git a/Externals/wxWidgets3/include/wx/msgdlg.h b/Externals/wxWidgets3/include/wx/msgdlg.h deleted file mode 100644 index 28e53d320b..0000000000 --- a/Externals/wxWidgets3/include/wx/msgdlg.h +++ /dev/null @@ -1,324 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msgdlg.h -// Purpose: common header and base class for wxMessageDialog -// Author: Julian Smart -// Modified by: -// Created: -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSGDLG_H_BASE_ -#define _WX_MSGDLG_H_BASE_ - -#include "wx/defs.h" - -#if wxUSE_MSGDLG - -#include "wx/dialog.h" -#include "wx/stockitem.h" - -extern WXDLLIMPEXP_DATA_CORE(const char) wxMessageBoxCaptionStr[]; - -// ---------------------------------------------------------------------------- -// wxMessageDialogBase: base class defining wxMessageDialog interface -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxMessageDialogBase : public wxDialog -{ -public: - // helper class for SetXXXLabels() methods: it makes it possible to pass - // either a stock id (wxID_CLOSE) or a string ("&Close") to them - class ButtonLabel - { - public: - // ctors are not explicit, objects of this class can be implicitly - // constructed from either stock ids or strings - ButtonLabel(int stockId) - : m_stockId(stockId) - { - wxASSERT_MSG( wxIsStockID(stockId), "invalid stock id" ); - } - - ButtonLabel(const wxString& label) - : m_label(label), m_stockId(wxID_NONE) - { - } - - ButtonLabel(const char *label) - : m_label(label), m_stockId(wxID_NONE) - { - } - - ButtonLabel(const wchar_t *label) - : m_label(label), m_stockId(wxID_NONE) - { - } - - ButtonLabel(const wxCStrData& label) - : m_label(label), m_stockId(wxID_NONE) - { - } - - // default copy ctor and dtor are ok - - // get the string label, whether it was originally specified directly - // or as a stock id -- this is only useful for platforms without native - // stock items id support - wxString GetAsString() const - { - return m_stockId == wxID_NONE - ? m_label - : wxGetStockLabel(m_stockId, wxSTOCK_FOR_BUTTON); - } - - // return the stock id or wxID_NONE if this is not a stock label - int GetStockId() const { return m_stockId; } - - private: - // the label if explicitly given or empty if this is a stock item - const wxString m_label; - - // the stock item id or wxID_NONE if m_label should be used - const int m_stockId; - }; - - // ctors - wxMessageDialogBase() { m_dialogStyle = 0; } - wxMessageDialogBase(wxWindow *parent, - const wxString& message, - const wxString& caption, - long style) - : m_message(message), - m_caption(caption) - { - m_parent = GetParentForModalDialog(parent, style); - SetMessageDialogStyle(style); - } - - // virtual dtor for the base class - virtual ~wxMessageDialogBase() { } - - wxString GetCaption() const { return m_caption; } - - // Title and caption are the same thing, GetCaption() mostly exists just - // for compatibility. - virtual void SetTitle(const wxString& title) wxOVERRIDE { m_caption = title; } - virtual wxString GetTitle() const wxOVERRIDE { return m_caption; } - - - virtual void SetMessage(const wxString& message) - { - m_message = message; - } - - wxString GetMessage() const { return m_message; } - - void SetExtendedMessage(const wxString& extendedMessage) - { - m_extendedMessage = extendedMessage; - } - - wxString GetExtendedMessage() const { return m_extendedMessage; } - - // change the dialog style flag - void SetMessageDialogStyle(long style) - { - wxASSERT_MSG( ((style & wxYES_NO) == wxYES_NO) || !(style & wxYES_NO), - "wxYES and wxNO may only be used together" ); - - wxASSERT_MSG( !(style & wxYES) || !(style & wxOK), - "wxOK and wxYES/wxNO can't be used together" ); - - // It is common to specify just the icon, without wxOK, in the existing - // code, especially one written by Windows programmers as MB_OK is 0 - // and so they're used to omitting wxOK. Don't complain about it but - // just add wxOK implicitly for compatibility. - if ( !(style & wxYES) && !(style & wxOK) ) - style |= wxOK; - - wxASSERT_MSG( (style & wxID_OK) != wxID_OK, - "wxMessageBox: Did you mean wxOK (and not wxID_OK)?" ); - - wxASSERT_MSG( !(style & wxNO_DEFAULT) || (style & wxNO), - "wxNO_DEFAULT is invalid without wxNO" ); - - wxASSERT_MSG( !(style & wxCANCEL_DEFAULT) || (style & wxCANCEL), - "wxCANCEL_DEFAULT is invalid without wxCANCEL" ); - - wxASSERT_MSG( !(style & wxCANCEL_DEFAULT) || !(style & wxNO_DEFAULT), - "only one default button can be specified" ); - - m_dialogStyle = style; - } - - long GetMessageDialogStyle() const { return m_dialogStyle; } - - // customization of the message box buttons - virtual bool SetYesNoLabels(const ButtonLabel& yes,const ButtonLabel& no) - { - DoSetCustomLabel(m_yes, yes); - DoSetCustomLabel(m_no, no); - return true; - } - - virtual bool SetYesNoCancelLabels(const ButtonLabel& yes, - const ButtonLabel& no, - const ButtonLabel& cancel) - { - DoSetCustomLabel(m_yes, yes); - DoSetCustomLabel(m_no, no); - DoSetCustomLabel(m_cancel, cancel); - return true; - } - - virtual bool SetOKLabel(const ButtonLabel& ok) - { - DoSetCustomLabel(m_ok, ok); - return true; - } - - virtual bool SetOKCancelLabels(const ButtonLabel& ok, - const ButtonLabel& cancel) - { - DoSetCustomLabel(m_ok, ok); - DoSetCustomLabel(m_cancel, cancel); - return true; - } - - virtual bool SetHelpLabel(const ButtonLabel& help) - { - DoSetCustomLabel(m_help, help); - return true; - } - // test if any custom labels were set - bool HasCustomLabels() const - { - return !(m_ok.empty() && m_cancel.empty() && m_help.empty() && - m_yes.empty() && m_no.empty()); - } - - // these functions return the label to be used for the button which is - // either a custom label explicitly set by the user or the default label, - // i.e. they always return a valid string - wxString GetYesLabel() const - { return m_yes.empty() ? GetDefaultYesLabel() : m_yes; } - wxString GetNoLabel() const - { return m_no.empty() ? GetDefaultNoLabel() : m_no; } - wxString GetOKLabel() const - { return m_ok.empty() ? GetDefaultOKLabel() : m_ok; } - wxString GetCancelLabel() const - { return m_cancel.empty() ? GetDefaultCancelLabel() : m_cancel; } - wxString GetHelpLabel() const - { return m_help.empty() ? GetDefaultHelpLabel() : m_help; } - - // based on message dialog style, returns exactly one of: wxICON_NONE, - // wxICON_ERROR, wxICON_WARNING, wxICON_QUESTION, wxICON_INFORMATION, - // wxICON_AUTH_NEEDED - virtual long GetEffectiveIcon() const - { - if ( m_dialogStyle & wxICON_NONE ) - return wxICON_NONE; - else if ( m_dialogStyle & wxICON_ERROR ) - return wxICON_ERROR; - else if ( m_dialogStyle & wxICON_WARNING ) - return wxICON_WARNING; - else if ( m_dialogStyle & wxICON_QUESTION ) - return wxICON_QUESTION; - else if ( m_dialogStyle & wxICON_INFORMATION ) - return wxICON_INFORMATION; - else if ( m_dialogStyle & wxYES ) - return wxICON_QUESTION; - else - return wxICON_INFORMATION; - } - -protected: - // for the platforms not supporting separate main and extended messages - // this function should be used to combine both of them in a single string - wxString GetFullMessage() const - { - wxString msg = m_message; - if ( !m_extendedMessage.empty() ) - msg << "\n\n" << m_extendedMessage; - - return msg; - } - - wxString m_message, - m_extendedMessage, - m_caption; - long m_dialogStyle; - - // this function is called by our public SetXXXLabels() and should assign - // the value to var with possibly some transformation (e.g. Cocoa version - // currently uses this to remove any accelerators from the button strings - // while GTK+ one handles stock items specifically here) - virtual void DoSetCustomLabel(wxString& var, const ButtonLabel& label) - { - var = label.GetAsString(); - } - - // these functions return the custom label or empty string and should be - // used only in specific circumstances such as creating the buttons with - // these labels (in which case it makes sense to only use a custom label if - // it was really given and fall back on stock label otherwise), use the - // Get{Yes,No,OK,Cancel}Label() methods above otherwise - const wxString& GetCustomYesLabel() const { return m_yes; } - const wxString& GetCustomNoLabel() const { return m_no; } - const wxString& GetCustomOKLabel() const { return m_ok; } - const wxString& GetCustomHelpLabel() const { return m_help; } - const wxString& GetCustomCancelLabel() const { return m_cancel; } - -private: - // these functions may be overridden to provide different defaults for the - // default button labels (this is used by wxGTK) - virtual wxString GetDefaultYesLabel() const { return wxGetTranslation("Yes"); } - virtual wxString GetDefaultNoLabel() const { return wxGetTranslation("No"); } - virtual wxString GetDefaultOKLabel() const { return wxGetTranslation("OK"); } - virtual wxString GetDefaultCancelLabel() const { return wxGetTranslation("Cancel"); } - virtual wxString GetDefaultHelpLabel() const { return wxGetTranslation("Help"); } - - // labels for the buttons, initially empty meaning that the defaults should - // be used, use GetYes/No/OK/CancelLabel() to access them - wxString m_yes, - m_no, - m_ok, - m_cancel, - m_help; - - wxDECLARE_NO_COPY_CLASS(wxMessageDialogBase); -}; - -#include "wx/generic/msgdlgg.h" - -#if defined(__WX_COMPILING_MSGDLGG_CPP__) || \ - defined(__WXUNIVERSAL__) || defined(__WXGPE__) || \ - (defined(__WXGTK__) && !defined(__WXGTK20__)) - - #define wxMessageDialog wxGenericMessageDialog -#elif defined(__WXMSW__) - #include "wx/msw/msgdlg.h" -#elif defined(__WXMOTIF__) - #include "wx/motif/msgdlg.h" -#elif defined(__WXGTK20__) - #include "wx/gtk/msgdlg.h" -#elif defined(__WXMAC__) - #include "wx/osx/msgdlg.h" -#elif defined(__WXQT__) - #include "wx/qt/msgdlg.h" -#endif - -// ---------------------------------------------------------------------------- -// wxMessageBox: the simplest way to use wxMessageDialog -// ---------------------------------------------------------------------------- - -int WXDLLIMPEXP_CORE wxMessageBox(const wxString& message, - const wxString& caption = wxMessageBoxCaptionStr, - long style = wxOK | wxCENTRE, - wxWindow *parent = NULL, - int x = wxDefaultCoord, int y = wxDefaultCoord); - -#endif // wxUSE_MSGDLG - -#endif // _WX_MSGDLG_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/msgout.h b/Externals/wxWidgets3/include/wx/msgout.h deleted file mode 100644 index 006e0651c3..0000000000 --- a/Externals/wxWidgets3/include/wx/msgout.h +++ /dev/null @@ -1,142 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msgout.h -// Purpose: wxMessageOutput class. Shows a message to the user -// Author: Mattia Barbon -// Modified by: -// Created: 17.07.02 -// Copyright: (c) Mattia Barbon -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSGOUT_H_ -#define _WX_MSGOUT_H_ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/defs.h" -#include "wx/chartype.h" -#include "wx/strvararg.h" - -// ---------------------------------------------------------------------------- -// wxMessageOutput is a class abstracting formatted output target, i.e. -// something you can printf() to -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxMessageOutput -{ -public: - virtual ~wxMessageOutput() { } - - // gets the current wxMessageOutput object (may be NULL during - // initialization or shutdown) - static wxMessageOutput* Get(); - - // sets the global wxMessageOutput instance; returns the previous one - static wxMessageOutput* Set(wxMessageOutput* msgout); - - // show a message to the user - // void Printf(const wxString& format, ...) = 0; - WX_DEFINE_VARARG_FUNC_VOID(Printf, 1, (const wxFormatString&), - DoPrintfWchar, DoPrintfUtf8) - - // called by DoPrintf() to output formatted string but can also be called - // directly if no formatting is needed - virtual void Output(const wxString& str) = 0; - -protected: -#if !wxUSE_UTF8_LOCALE_ONLY - void DoPrintfWchar(const wxChar *format, ...); -#endif -#if wxUSE_UNICODE_UTF8 - void DoPrintfUtf8(const char *format, ...); -#endif - -private: - static wxMessageOutput* ms_msgOut; -}; - -// ---------------------------------------------------------------------------- -// implementation which sends output to stderr or specified file -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxMessageOutputStderr : public wxMessageOutput -{ -public: - wxMessageOutputStderr(FILE *fp = stderr) : m_fp(fp) { } - - virtual void Output(const wxString& str) wxOVERRIDE; - -protected: - // return the string with "\n" appended if it doesn't already terminate - // with it (in which case it's returned unchanged) - wxString AppendLineFeedIfNeeded(const wxString& str); - - FILE *m_fp; -}; - -// ---------------------------------------------------------------------------- -// implementation showing the message to the user in "best" possible way: -// uses stderr or message box if available according to the flag given to ctor. -// ---------------------------------------------------------------------------- - -enum wxMessageOutputFlags -{ - wxMSGOUT_PREFER_STDERR = 0, // use stderr if available (this is the default) - wxMSGOUT_PREFER_MSGBOX = 1 // always use message box if available -}; - -class WXDLLIMPEXP_BASE wxMessageOutputBest : public wxMessageOutputStderr -{ -public: - wxMessageOutputBest(wxMessageOutputFlags flags = wxMSGOUT_PREFER_STDERR) - : m_flags(flags) { } - - virtual void Output(const wxString& str) wxOVERRIDE; - -private: - wxMessageOutputFlags m_flags; -}; - -// ---------------------------------------------------------------------------- -// implementation which shows output in a message box -// ---------------------------------------------------------------------------- - -#if wxUSE_GUI && wxUSE_MSGDLG - -class WXDLLIMPEXP_CORE wxMessageOutputMessageBox : public wxMessageOutput -{ -public: - wxMessageOutputMessageBox() { } - - virtual void Output(const wxString& str) wxOVERRIDE; -}; - -#endif // wxUSE_GUI && wxUSE_MSGDLG - -// ---------------------------------------------------------------------------- -// implementation using the native way of outputting debug messages -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxMessageOutputDebug : public wxMessageOutputStderr -{ -public: - wxMessageOutputDebug() { } - - virtual void Output(const wxString& str) wxOVERRIDE; -}; - -// ---------------------------------------------------------------------------- -// implementation using wxLog (mainly for backwards compatibility) -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxMessageOutputLog : public wxMessageOutput -{ -public: - wxMessageOutputLog() { } - - virtual void Output(const wxString& str) wxOVERRIDE; -}; - -#endif // _WX_MSGOUT_H_ diff --git a/Externals/wxWidgets3/include/wx/msgqueue.h b/Externals/wxWidgets3/include/wx/msgqueue.h deleted file mode 100644 index 8b8da87d18..0000000000 --- a/Externals/wxWidgets3/include/wx/msgqueue.h +++ /dev/null @@ -1,168 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msqqueue.h -// Purpose: Message queues for inter-thread communication -// Author: Evgeniy Tarassov -// Created: 2007-10-31 -// Copyright: (C) 2007 TT-Solutions SARL -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSGQUEUE_H_ -#define _WX_MSGQUEUE_H_ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/thread.h" - -#if wxUSE_THREADS - -#include "wx/stopwatch.h" - -#include "wx/beforestd.h" -#include -#include "wx/afterstd.h" - -enum wxMessageQueueError -{ - wxMSGQUEUE_NO_ERROR = 0, // operation completed successfully - wxMSGQUEUE_TIMEOUT, // no messages received before timeout expired - wxMSGQUEUE_MISC_ERROR // some unexpected (and fatal) error has occurred -}; - -// --------------------------------------------------------------------------- -// Message queue allows passing message between threads. -// -// This class is typically used for communicating between the main and worker -// threads. The main thread calls Post() and the worker thread calls Receive(). -// -// For this class a message is an object of arbitrary type T. Notice that -// typically there must be some special message indicating that the thread -// should terminate as there is no other way to gracefully shutdown a thread -// waiting on the message queue. -// --------------------------------------------------------------------------- -template -class wxMessageQueue -{ -public: - // The type of the messages transported by this queue - typedef T Message; - - // Default ctor creates an initially empty queue - wxMessageQueue() - : m_conditionNotEmpty(m_mutex) - { - } - - // Add a message to this queue and signal the threads waiting for messages. - // - // This method is safe to call from multiple threads in parallel. - wxMessageQueueError Post(const Message& msg) - { - wxMutexLocker locker(m_mutex); - - wxCHECK( locker.IsOk(), wxMSGQUEUE_MISC_ERROR ); - - m_messages.push(msg); - - m_conditionNotEmpty.Signal(); - - return wxMSGQUEUE_NO_ERROR; - } - - // Remove all messages from the queue. - // - // This method is meant to be called from the same thread(s) that call - // Post() to discard any still pending requests if they became unnecessary. - wxMessageQueueError Clear() - { - wxCHECK( IsOk(), wxMSGQUEUE_MISC_ERROR ); - - wxMutexLocker locker(m_mutex); - - std::queue empty; - std::swap(m_messages, empty); - - return wxMSGQUEUE_NO_ERROR; - } - - // Wait no more than timeout milliseconds until a message becomes available. - // - // Setting timeout to 0 is equivalent to an infinite timeout. See Receive(). - wxMessageQueueError ReceiveTimeout(long timeout, T& msg) - { - wxCHECK( IsOk(), wxMSGQUEUE_MISC_ERROR ); - - wxMutexLocker locker(m_mutex); - - wxCHECK( locker.IsOk(), wxMSGQUEUE_MISC_ERROR ); - - const wxMilliClock_t waitUntil = wxGetLocalTimeMillis() + timeout; - while ( m_messages.empty() ) - { - wxCondError result = m_conditionNotEmpty.WaitTimeout(timeout); - - if ( result == wxCOND_NO_ERROR ) - continue; - - wxCHECK( result == wxCOND_TIMEOUT, wxMSGQUEUE_MISC_ERROR ); - - const wxMilliClock_t now = wxGetLocalTimeMillis(); - - if ( now >= waitUntil ) - return wxMSGQUEUE_TIMEOUT; - - timeout = (waitUntil - now).ToLong(); - wxASSERT(timeout > 0); - } - - msg = m_messages.front(); - m_messages.pop(); - - return wxMSGQUEUE_NO_ERROR; - } - - // Same as ReceiveTimeout() but waits for as long as it takes for a message - // to become available (so it can't return wxMSGQUEUE_TIMEOUT) - wxMessageQueueError Receive(T& msg) - { - wxCHECK( IsOk(), wxMSGQUEUE_MISC_ERROR ); - - wxMutexLocker locker(m_mutex); - - wxCHECK( locker.IsOk(), wxMSGQUEUE_MISC_ERROR ); - - while ( m_messages.empty() ) - { - wxCondError result = m_conditionNotEmpty.Wait(); - - wxCHECK( result == wxCOND_NO_ERROR, wxMSGQUEUE_MISC_ERROR ); - } - - msg = m_messages.front(); - m_messages.pop(); - - return wxMSGQUEUE_NO_ERROR; - } - - // Return false only if there was a fatal error in ctor - bool IsOk() const - { - return m_conditionNotEmpty.IsOk(); - } - -private: - // Disable copy ctor and assignment operator - wxMessageQueue(const wxMessageQueue& rhs); - wxMessageQueue& operator=(const wxMessageQueue& rhs); - - mutable wxMutex m_mutex; - wxCondition m_conditionNotEmpty; - - std::queue m_messages; -}; - -#endif // wxUSE_THREADS - -#endif // _WX_MSGQUEUE_H_ diff --git a/Externals/wxWidgets3/include/wx/mstream.h b/Externals/wxWidgets3/include/wx/mstream.h deleted file mode 100644 index b4e7303eaa..0000000000 --- a/Externals/wxWidgets3/include/wx/mstream.h +++ /dev/null @@ -1,94 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/mstream.h -// Purpose: Memory stream classes -// Author: Guilhem Lavaux -// Modified by: -// Created: 11/07/98 -// Copyright: (c) Guilhem Lavaux -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_WXMMSTREAM_H__ -#define _WX_WXMMSTREAM_H__ - -#include "wx/defs.h" - -#if wxUSE_STREAMS - -#include "wx/stream.h" - -class WXDLLIMPEXP_FWD_BASE wxMemoryOutputStream; - -class WXDLLIMPEXP_BASE wxMemoryInputStream : public wxInputStream -{ -public: - wxMemoryInputStream(const void *data, size_t length); - wxMemoryInputStream(const wxMemoryOutputStream& stream); - wxMemoryInputStream(wxInputStream& stream, - wxFileOffset lenFile = wxInvalidOffset) - { - InitFromStream(stream, lenFile); - } - wxMemoryInputStream(wxMemoryInputStream& stream) - : wxInputStream() - { - InitFromStream(stream, wxInvalidOffset); - } - - virtual ~wxMemoryInputStream(); - virtual wxFileOffset GetLength() const wxOVERRIDE { return m_length; } - virtual bool IsSeekable() const wxOVERRIDE { return true; } - - virtual char Peek() wxOVERRIDE; - virtual bool CanRead() const wxOVERRIDE; - - wxStreamBuffer *GetInputStreamBuffer() const { return m_i_streambuf; } - -protected: - wxStreamBuffer *m_i_streambuf; - - size_t OnSysRead(void *buffer, size_t nbytes) wxOVERRIDE; - wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) wxOVERRIDE; - wxFileOffset OnSysTell() const wxOVERRIDE; - -private: - // common part of ctors taking wxInputStream - void InitFromStream(wxInputStream& stream, wxFileOffset lenFile); - - size_t m_length; - - // copy ctor is implemented above: it copies the other stream in this one - wxDECLARE_ABSTRACT_CLASS(wxMemoryInputStream); - wxDECLARE_NO_ASSIGN_CLASS(wxMemoryInputStream); -}; - -class WXDLLIMPEXP_BASE wxMemoryOutputStream : public wxOutputStream -{ -public: - // if data is !NULL it must be allocated with malloc() - wxMemoryOutputStream(void *data = NULL, size_t length = 0); - virtual ~wxMemoryOutputStream(); - virtual wxFileOffset GetLength() const wxOVERRIDE { return m_o_streambuf->GetLastAccess(); } - virtual bool IsSeekable() const wxOVERRIDE { return true; } - - size_t CopyTo(void *buffer, size_t len) const; - - wxStreamBuffer *GetOutputStreamBuffer() const { return m_o_streambuf; } - -protected: - wxStreamBuffer *m_o_streambuf; - -protected: - size_t OnSysWrite(const void *buffer, size_t nbytes) wxOVERRIDE; - wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) wxOVERRIDE; - wxFileOffset OnSysTell() const wxOVERRIDE; - - wxDECLARE_DYNAMIC_CLASS(wxMemoryOutputStream); - wxDECLARE_NO_COPY_CLASS(wxMemoryOutputStream); -}; - -#endif - // wxUSE_STREAMS - -#endif - // _WX_WXMMSTREAM_H__ diff --git a/Externals/wxWidgets3/include/wx/msw/accel.h b/Externals/wxWidgets3/include/wx/msw/accel.h deleted file mode 100644 index 325755784c..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/accel.h +++ /dev/null @@ -1,45 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/accel.h -// Purpose: wxAcceleratorTable class -// Author: Julian Smart -// Modified by: -// Created: 31/7/98 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_ACCEL_H_ -#define _WX_ACCEL_H_ - -class WXDLLIMPEXP_FWD_CORE wxWindow; - -// ---------------------------------------------------------------------------- -// the accel table has all accelerators for a given window or menu -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxAcceleratorTable : public wxObject -{ -public: - // default ctor - wxAcceleratorTable() { } - - // load from .rc resource (Windows specific) - wxAcceleratorTable(const wxString& resource); - - // initialize from array - wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]); - - bool Ok() const { return IsOk(); } - bool IsOk() const; - void SetHACCEL(WXHACCEL hAccel); - WXHACCEL GetHACCEL() const; - - // translate the accelerator, return true if done - bool Translate(wxWindow *window, WXMSG *msg) const; - -private: - wxDECLARE_DYNAMIC_CLASS(wxAcceleratorTable); -}; - -#endif - // _WX_ACCEL_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/amd64.manifest b/Externals/wxWidgets3/include/wx/msw/amd64.manifest deleted file mode 100644 index 60db9e3150..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/amd64.manifest +++ /dev/null @@ -1,22 +0,0 @@ - - - -wxWindows application - - - - - - diff --git a/Externals/wxWidgets3/include/wx/msw/anybutton.h b/Externals/wxWidgets3/include/wx/msw/anybutton.h deleted file mode 100644 index 3c876aeb2d..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/anybutton.h +++ /dev/null @@ -1,81 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/anybutton.h -// Purpose: wxAnyButton class -// Author: Julian Smart -// Created: 1997-02-01 (extracted from button.h) -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_ANYBUTTON_H_ -#define _WX_MSW_ANYBUTTON_H_ - -// ---------------------------------------------------------------------------- -// Common button functionality -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxAnyButton : public wxAnyButtonBase -{ -public: - wxAnyButton() - { - m_imageData = NULL; -#if wxUSE_MARKUP - m_markupText = NULL; -#endif // wxUSE_MARKUP - } - - virtual ~wxAnyButton(); - - // overridden base class methods - virtual void SetLabel(const wxString& label); - virtual bool SetBackgroundColour(const wxColour &colour); - virtual bool SetForegroundColour(const wxColour &colour); - - // implementation from now on - virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); - - virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item); - - // returns true if the platform should explicitly apply a theme border - virtual bool CanApplyThemeBorder() const { return false; } - -protected: - // usually overridden base class virtuals - virtual wxSize DoGetBestSize() const; - - virtual wxBitmap DoGetBitmap(State which) const; - virtual void DoSetBitmap(const wxBitmap& bitmap, State which); - virtual wxSize DoGetBitmapMargins() const; - virtual void DoSetBitmapMargins(wxCoord x, wxCoord y); - virtual void DoSetBitmapPosition(wxDirection dir); - -#if wxUSE_MARKUP - virtual bool DoSetLabelMarkup(const wxString& markup); -#endif // wxUSE_MARKUP - - // Increases the passed in size to account for the button image. - // - // Should only be called if we do have a button, i.e. if m_imageData is - // non-NULL. - void AdjustForBitmapSize(wxSize& size) const; - - class wxButtonImageData *m_imageData; - -#if wxUSE_MARKUP - class wxMarkupText *m_markupText; -#endif // wxUSE_MARKUP - - // Switches button into owner-drawn mode: this is used if we need to draw - // something not supported by the native control, such as using non default - // colours or a bitmap on pre-XP systems. - void MakeOwnerDrawn(); - bool IsOwnerDrawn() const; - - virtual bool MSWIsPushed() const; - -private: - wxDECLARE_NO_COPY_CLASS(wxAnyButton); -}; - -#endif // _WX_MSW_ANYBUTTON_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/app.h b/Externals/wxWidgets3/include/wx/msw/app.h deleted file mode 100644 index 29285adeab..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/app.h +++ /dev/null @@ -1,116 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/app.h -// Purpose: wxApp class -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_APP_H_ -#define _WX_APP_H_ - -#include "wx/event.h" -#include "wx/icon.h" - -class WXDLLIMPEXP_FWD_CORE wxFrame; -class WXDLLIMPEXP_FWD_CORE wxWindow; -class WXDLLIMPEXP_FWD_CORE wxApp; -class WXDLLIMPEXP_FWD_CORE wxKeyEvent; -class WXDLLIMPEXP_FWD_BASE wxLog; - -// Represents the application. Derive OnInit and declare -// a new App object to start application -class WXDLLIMPEXP_CORE wxApp : public wxAppBase -{ -public: - wxApp(); - virtual ~wxApp(); - - // override base class (pure) virtuals - virtual bool Initialize(int& argc, wxChar **argv); - virtual void CleanUp(); - - virtual void WakeUpIdle(); - - virtual void SetPrintMode(int mode) { m_printMode = mode; } - virtual int GetPrintMode() const { return m_printMode; } - - // implementation only - void OnIdle(wxIdleEvent& event); - void OnEndSession(wxCloseEvent& event); - void OnQueryEndSession(wxCloseEvent& event); - -#if wxUSE_EXCEPTIONS - virtual bool OnExceptionInMainLoop(); -#endif // wxUSE_EXCEPTIONS - - // MSW-specific from now on - // ------------------------ - - // this suffix should be appended to all our Win32 class names to obtain a - // variant registered without CS_[HV]REDRAW styles - static const wxChar *GetNoRedrawClassSuffix() { return wxT("NR"); } - - // get the name of the registered Win32 class with the given (unique) base - // name: this function constructs the unique class name using this name as - // prefix, checks if the class is already registered and registers it if it - // isn't and returns the name it was registered under (or NULL if it failed) - // - // the registered class will always have CS_[HV]REDRAW and CS_DBLCLKS - // styles as well as any additional styles specified as arguments here; and - // there will be also a companion registered class identical to this one - // but without CS_[HV]REDRAW whose name will be the same one but with - // GetNoRedrawClassSuffix() - // - // the background brush argument must be either a COLOR_XXX standard value - // or (default) -1 meaning that the class paints its background itself - static const wxChar *GetRegisteredClassName(const wxChar *name, - int bgBrushCol = -1, - int extraStyles = 0); - - // return true if this name corresponds to one of the classes we registered - // in the previous GetRegisteredClassName() calls - static bool IsRegisteredClassName(const wxString& name); - - // Return the layout direction to use for a window by default. - // - // If the parent is specified, use the same layout direction as it uses. - // Otherwise use the default global layout, either from wxTheApp, if it - // exists, or Windows itself. - // - // Notice that this normally should not be used for the child windows as - // they already inherit, just dialogs such as wxMessageDialog may want to - // use it. - static wxLayoutDirection MSWGetDefaultLayout(wxWindow* parent = NULL); - -protected: - int m_printMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT - -public: - // unregister any window classes registered by GetRegisteredClassName() - static void UnregisterWindowClasses(); - -#if wxUSE_RICHEDIT - // initialize the richedit DLL of (at least) given version, return true if - // ok (Win95 has version 1, Win98/NT4 has 1 and 2, W2K has 3) - static bool InitRichEdit(int version = 2); -#endif // wxUSE_RICHEDIT - - // returns 400, 470, 471 for comctl32.dll 4.00, 4.70, 4.71 or 0 if it - // wasn't found at all - static int GetComCtl32Version(); - - // the SW_XXX value to be used for the frames opened by the application - // (currently seems unused which is a bug -- TODO) - static int m_nCmdShow; - -protected: - wxDECLARE_EVENT_TABLE(); - wxDECLARE_NO_COPY_CLASS(wxApp); - wxDECLARE_DYNAMIC_CLASS(wxApp); -}; - -#endif // _WX_APP_H_ - diff --git a/Externals/wxWidgets3/include/wx/msw/appprogress.h b/Externals/wxWidgets3/include/wx/msw/appprogress.h deleted file mode 100644 index 0840c075d4..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/appprogress.h +++ /dev/null @@ -1,39 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/appprogress.h -// Purpose: wxAppProgressIndicator interface. -// Author: Chaobin Zhang -// Created: 2014-09-05 -// Copyright: (c) 2014 wxWidgets development team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_APPPROG_H_ -#define _WX_MSW_APPPROG_H_ - -#include "wx/vector.h" - -class WXDLLIMPEXP_FWD_CORE wxTaskBarButton; - -class WXDLLIMPEXP_CORE wxAppProgressIndicator - : public wxAppProgressIndicatorBase -{ -public: - wxAppProgressIndicator(wxWindow* parent = NULL, int maxValue = 100); - virtual ~wxAppProgressIndicator(); - - virtual bool IsAvailable() const wxOVERRIDE; - - virtual void SetValue(int value) wxOVERRIDE; - virtual void SetRange(int range) wxOVERRIDE; - virtual void Pulse() wxOVERRIDE; - virtual void Reset() wxOVERRIDE; - -private: - int m_maxValue; - - wxVector m_taskBarButtons; - - wxDECLARE_NO_COPY_CLASS(wxAppProgressIndicator); -}; - -#endif // _WX_MSW_APPPROG_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/apptbase.h b/Externals/wxWidgets3/include/wx/msw/apptbase.h deleted file mode 100644 index 2442bf3b61..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/apptbase.h +++ /dev/null @@ -1,70 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/apptbase.h -// Purpose: declaration of wxAppTraits for MSW -// Author: Vadim Zeitlin -// Modified by: -// Created: 22.06.2003 -// Copyright: (c) 2003 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_APPTBASE_H_ -#define _WX_MSW_APPTBASE_H_ - -// ---------------------------------------------------------------------------- -// wxAppTraits: the MSW version adds extra hooks needed by MSW-only code -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxAppTraits : public wxAppTraitsBase -{ -public: - // wxExecute() support methods - // --------------------------- - - // called before starting to wait for the child termination, may return - // some opaque data which will be passed later to AfterChildWaitLoop() - virtual void *BeforeChildWaitLoop() = 0; - - // called after starting to wait for the child termination, the parameter - // is the return value of BeforeChildWaitLoop() - virtual void AfterChildWaitLoop(void *data) = 0; - - -#if wxUSE_THREADS - // wxThread helpers - // ---------------- - - // process a message while waiting for a(nother) thread, should return - // false if and only if we have to exit the application - virtual bool DoMessageFromThreadWait() = 0; - - // wait for the handle to be signaled, return WAIT_OBJECT_0 if it is or, in - // the GUI code, WAIT_OBJECT_0 + 1 if a Windows message arrived - virtual WXDWORD WaitForThread(WXHANDLE hThread, int flags) = 0; -#endif // wxUSE_THREADS - - - // console helpers - // --------------- - - // this method can be overridden by a derived class to always return true - // or false to force [not] using the console for output to stderr - // - // by default console applications always return true from here while the - // GUI ones only return true if they're being run from console and there is - // no other activity happening in this console - virtual bool CanUseStderr() = 0; - - // write text to the console, return true if ok or false on error - virtual bool WriteToStderr(const wxString& text) = 0; - -protected: -#if wxUSE_THREADS - // implementation of WaitForThread() for the console applications which is - // also used by the GUI code if it doesn't [yet|already] dispatch events - WXDWORD DoSimpleWaitForThread(WXHANDLE hThread); -#endif // wxUSE_THREADS -}; - -#endif // _WX_MSW_APPTBASE_H_ - diff --git a/Externals/wxWidgets3/include/wx/msw/apptrait.h b/Externals/wxWidgets3/include/wx/msw/apptrait.h deleted file mode 100644 index d7466482a6..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/apptrait.h +++ /dev/null @@ -1,94 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/apptrait.h -// Purpose: class implementing wxAppTraits for MSW -// Author: Vadim Zeitlin -// Modified by: -// Created: 21.06.2003 -// Copyright: (c) 2003 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_APPTRAIT_H_ -#define _WX_MSW_APPTRAIT_H_ - -// ---------------------------------------------------------------------------- -// wxGUI/ConsoleAppTraits: must derive from wxAppTraits, not wxAppTraitsBase -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxConsoleAppTraits : public wxConsoleAppTraitsBase -{ -public: - virtual wxEventLoopBase *CreateEventLoop(); - virtual void *BeforeChildWaitLoop(); - virtual void AfterChildWaitLoop(void *data); -#if wxUSE_TIMER - virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer); -#endif // wxUSE_TIMER -#if wxUSE_THREADS - virtual bool DoMessageFromThreadWait(); - virtual WXDWORD WaitForThread(WXHANDLE hThread, int flags); -#endif // wxUSE_THREADS - virtual bool CanUseStderr() { return true; } - virtual bool WriteToStderr(const wxString& text); -}; - -#if wxUSE_GUI - -#if defined(__WXMSW__) - -class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase -{ -public: - virtual wxEventLoopBase *CreateEventLoop(); - virtual void *BeforeChildWaitLoop(); - virtual void AfterChildWaitLoop(void *data); -#if wxUSE_TIMER - virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer); -#endif // wxUSE_TIMER -#if wxUSE_THREADS - virtual bool DoMessageFromThreadWait(); - virtual WXDWORD WaitForThread(WXHANDLE hThread, int flags); -#endif // wxUSE_THREADS - wxPortId GetToolkitVersion(int *majVer = NULL, - int *minVer = NULL, - int *microVer = NULL) const wxOVERRIDE; - - virtual bool CanUseStderr(); - virtual bool WriteToStderr(const wxString& text); -}; - -#elif defined(__WXGTK__) - -class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase -{ -public: - virtual wxEventLoopBase *CreateEventLoop(); - virtual void *BeforeChildWaitLoop() { return NULL; } - virtual void AfterChildWaitLoop(void *WXUNUSED(data)) { } -#if wxUSE_TIMER - virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer); -#endif - -#if wxUSE_THREADS && defined(__WXGTK20__) - virtual void MutexGuiEnter(); - virtual void MutexGuiLeave(); -#endif - -#if wxUSE_THREADS - virtual bool DoMessageFromThreadWait() { return true; } - virtual WXDWORD WaitForThread(WXHANDLE hThread, int WXUNUSED(flags)) - { return DoSimpleWaitForThread(hThread); } -#endif // wxUSE_THREADS - virtual wxPortId GetToolkitVersion(int *majVer = NULL, - int *minVer = NULL, - int *microVer = NULL) const; - - virtual bool CanUseStderr() { return false; } - virtual bool WriteToStderr(const wxString& WXUNUSED(text)) { return false; } -}; - -#endif - -#endif // wxUSE_GUI - -#endif // _WX_MSW_APPTRAIT_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/bitmap.h b/Externals/wxWidgets3/include/wx/msw/bitmap.h deleted file mode 100644 index 4ebc108894..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/bitmap.h +++ /dev/null @@ -1,329 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/bitmap.h -// Purpose: wxBitmap class -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_BITMAP_H_ -#define _WX_BITMAP_H_ - -#include "wx/msw/gdiimage.h" -#include "wx/math.h" -#include "wx/palette.h" - -class WXDLLIMPEXP_FWD_CORE wxBitmap; -class WXDLLIMPEXP_FWD_CORE wxBitmapHandler; -class WXDLLIMPEXP_FWD_CORE wxBitmapRefData; -class WXDLLIMPEXP_FWD_CORE wxControl; -class WXDLLIMPEXP_FWD_CORE wxCursor; -class WXDLLIMPEXP_FWD_CORE wxDC; -#if wxUSE_WXDIB -class WXDLLIMPEXP_FWD_CORE wxDIB; -#endif -class WXDLLIMPEXP_FWD_CORE wxIcon; -class WXDLLIMPEXP_FWD_CORE wxMask; -class WXDLLIMPEXP_FWD_CORE wxPalette; -class WXDLLIMPEXP_FWD_CORE wxPixelDataBase; - -// What kind of transparency should a bitmap copied from an icon or cursor -// have? -enum wxBitmapTransparency -{ - wxBitmapTransparency_Auto, // default: copy alpha if the source has it - wxBitmapTransparency_None, // never create alpha - wxBitmapTransparency_Always // always use alpha -}; - -// ---------------------------------------------------------------------------- -// wxBitmap: a mono or colour bitmap -// NOTE: for wxMSW we don't use the wxBitmapBase base class declared in bitmap.h! -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxBitmap : public wxGDIImage, - public wxBitmapHelpers -{ -public: - // default ctor creates an invalid bitmap, you must Create() it later - wxBitmap() { } - - // Initialize with raw data - wxBitmap(const char bits[], int width, int height, int depth = 1); - - // Initialize with XPM data - wxBitmap(const char* const* data); -#ifdef wxNEEDS_CHARPP - wxBitmap(char** data) - { - *this = wxBitmap(const_cast(data)); - } -#endif - - // Load a file or resource - wxBitmap(const wxString& name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE); - - // New constructor for generalised creation from data - wxBitmap(const void* data, wxBitmapType type, int width, int height, int depth = 1); - - // Create a new, uninitialized bitmap of the given size and depth (if it - // is omitted, will create a bitmap compatible with the display) - // - // NB: this ctor will create a DIB for 24 and 32bpp bitmaps, use ctor - // taking a DC argument if you want to force using DDB in this case - wxBitmap(int width, int height, int depth = -1) { (void)Create(width, height, depth); } - wxBitmap(const wxSize& sz, int depth = -1) { (void)Create(sz, depth); } - - // Create a bitmap compatible with the given DC - wxBitmap(int width, int height, const wxDC& dc); - -#if wxUSE_IMAGE - // Convert from wxImage - wxBitmap(const wxImage& image, int depth = -1, double WXUNUSED(scale) = 1.0) - { (void)CreateFromImage(image, depth); } - - // Create a DDB compatible with the given DC from wxImage - wxBitmap(const wxImage& image, const wxDC& dc) - { (void)CreateFromImage(image, dc); } -#endif // wxUSE_IMAGE - - // we must have this, otherwise icons are silently copied into bitmaps using - // the copy ctor but the resulting bitmap is invalid! - wxBitmap(const wxIcon& icon, - wxBitmapTransparency transp = wxBitmapTransparency_Auto) - { - CopyFromIcon(icon, transp); - } - - // Convert from wxCursor - wxEXPLICIT wxBitmap(const wxCursor& cursor) - { - (void)CopyFromCursor(cursor, wxBitmapTransparency_Auto); - } - - wxBitmap& operator=(const wxIcon& icon) - { - (void)CopyFromIcon(icon); - - return *this; - } - -#if WXWIN_COMPATIBILITY_3_0 - // This assignment operator is not portable as it is not implemented in any - // other ports. - wxDEPRECATED_MSG("Don't assign wxCursor to an existing wxBitmap, create a new wxBitmap from wxCursor instead.") - wxBitmap& operator=(const wxCursor& cursor) - { - (void)CopyFromCursor(cursor); - - return *this; - } -#endif // WXWIN_COMPATIBILITY_3_0 - - virtual ~wxBitmap(); - -#if wxUSE_IMAGE - wxImage ConvertToImage() const; - wxBitmap ConvertToDisabled(unsigned char brightness = 255) const; -#endif // wxUSE_IMAGE - - // get the given part of bitmap - wxBitmap GetSubBitmap( const wxRect& rect ) const; - - // NB: This should not be called from user code. It is for wx internal - // use only. - wxBitmap GetSubBitmapOfHDC( const wxRect& rect, WXHDC hdc ) const; - - // copies the contents and mask of the given (colour) icon to the bitmap - bool CopyFromIcon(const wxIcon& icon, - wxBitmapTransparency transp = wxBitmapTransparency_Auto); - - // copies the contents and mask of the given cursor to the bitmap - bool CopyFromCursor(const wxCursor& cursor, - wxBitmapTransparency transp = wxBitmapTransparency_Auto); - -#if wxUSE_WXDIB - // copies from a device independent bitmap - bool CopyFromDIB(const wxDIB& dib); - bool IsDIB() const; - bool ConvertToDIB(); -#endif - - virtual bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH); - virtual bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH) - { return Create(sz.GetWidth(), sz.GetHeight(), depth); } - - virtual bool Create(int width, int height, const wxDC& dc); - virtual bool Create(const void* data, wxBitmapType type, int width, int height, int depth = 1); - virtual bool CreateScaled(int w, int h, int d, double logicalScale) - { return Create(wxRound(w*logicalScale), wxRound(h*logicalScale), d); } - - virtual bool LoadFile(const wxString& name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE); - virtual bool SaveFile(const wxString& name, wxBitmapType type, const wxPalette *cmap = NULL) const; - - wxBitmapRefData *GetBitmapData() const - { return (wxBitmapRefData *)m_refData; } - - // raw bitmap access support functions - void *GetRawData(wxPixelDataBase& data, int bpp); - void UngetRawData(wxPixelDataBase& data); - -#if wxUSE_PALETTE - wxPalette* GetPalette() const; - void SetPalette(const wxPalette& palette); -#endif // wxUSE_PALETTE - - wxMask *GetMask() const; - void SetMask(wxMask *mask); - - // these functions are internal and shouldn't be used, they risk to - // disappear in the future - bool HasAlpha() const; - void UseAlpha(bool use = true); - void ResetAlpha() { UseAlpha(false); } - - // support for scaled bitmaps - virtual double GetScaleFactor() const { return 1.0; } - virtual double GetScaledWidth() const { return GetWidth() / GetScaleFactor(); } - virtual double GetScaledHeight() const { return GetHeight() / GetScaleFactor(); } - virtual wxSize GetScaledSize() const - { return wxSize(wxRound(GetScaledWidth()), wxRound(GetScaledHeight())); } - - // implementation only from now on - // ------------------------------- - - // Set alpha flag to true if this is a 32bpp bitmap which has any non-0 - // values in its alpha channel. - void MSWUpdateAlpha(); - -public: - void SetHBITMAP(WXHBITMAP bmp) { SetHandle((WXHANDLE)bmp); } - WXHBITMAP GetHBITMAP() const { return (WXHBITMAP)GetHandle(); } - - void SetSelectedInto(wxDC *dc); - wxDC *GetSelectedInto() const; - -protected: - virtual wxGDIImageRefData *CreateData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; - - // creates an uninitialized bitmap, called from Create()s above - bool DoCreate(int w, int h, int depth, WXHDC hdc); - -#if wxUSE_IMAGE - // creates the bitmap from wxImage, supposed to be called from ctor - bool CreateFromImage(const wxImage& image, int depth); - - // creates a DDB from wxImage, supposed to be called from ctor - bool CreateFromImage(const wxImage& image, const wxDC& dc); - - // common part of the 2 methods above (hdc may be 0) - bool CreateFromImage(const wxImage& image, int depth, WXHDC hdc); -#endif // wxUSE_IMAGE - -private: - // common part of CopyFromIcon/CopyFromCursor for Win32 - bool - CopyFromIconOrCursor(const wxGDIImage& icon, - wxBitmapTransparency transp = wxBitmapTransparency_Auto); - - - wxDECLARE_DYNAMIC_CLASS(wxBitmap); -}; - -// ---------------------------------------------------------------------------- -// wxMask: a mono bitmap used for drawing bitmaps transparently. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxMask : public wxObject -{ -public: - wxMask(); - - // Copy constructor - wxMask(const wxMask &mask); - - // Construct a mask from a bitmap and a colour indicating the transparent - // area - wxMask(const wxBitmap& bitmap, const wxColour& colour); - - // Construct a mask from a bitmap and a palette index indicating the - // transparent area - wxMask(const wxBitmap& bitmap, int paletteIndex); - - // Construct a mask from a mono bitmap (copies the bitmap). - wxMask(const wxBitmap& bitmap); - - // construct a mask from the givne bitmap handle - wxMask(WXHBITMAP hbmp) { m_maskBitmap = hbmp; } - - virtual ~wxMask(); - - bool Create(const wxBitmap& bitmap, const wxColour& colour); - bool Create(const wxBitmap& bitmap, int paletteIndex); - bool Create(const wxBitmap& bitmap); - - wxBitmap GetBitmap() const; - - // Implementation - WXHBITMAP GetMaskBitmap() const { return m_maskBitmap; } - void SetMaskBitmap(WXHBITMAP bmp) { m_maskBitmap = bmp; } - -protected: - WXHBITMAP m_maskBitmap; - - wxDECLARE_DYNAMIC_CLASS(wxMask); -}; - - -// ---------------------------------------------------------------------------- -// wxBitmapHandler is a class which knows how to load/save bitmaps to/from file -// NOTE: for wxMSW we don't use the wxBitmapHandler class declared in bitmap.h! -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxBitmapHandler : public wxGDIImageHandler -{ -public: - wxBitmapHandler() { } - wxBitmapHandler(const wxString& name, const wxString& ext, wxBitmapType type) - : wxGDIImageHandler(name, ext, type) { } - - // implement wxGDIImageHandler's pure virtuals: - - virtual bool Create(wxGDIImage *image, - const void* data, - wxBitmapType type, - int width, int height, int depth = 1); - virtual bool Load(wxGDIImage *image, - const wxString& name, - wxBitmapType type, - int desiredWidth, int desiredHeight); - virtual bool Save(const wxGDIImage *image, - const wxString& name, - wxBitmapType type) const; - - - // make wxBitmapHandler compatible with the wxBitmapHandler interface - // declared in bitmap.h, even if it's derived from wxGDIImageHandler: - - virtual bool Create(wxBitmap *bitmap, - const void* data, - wxBitmapType type, - int width, int height, int depth = 1); - virtual bool LoadFile(wxBitmap *bitmap, - const wxString& name, - wxBitmapType type, - int desiredWidth, int desiredHeight); - virtual bool SaveFile(const wxBitmap *bitmap, - const wxString& name, - wxBitmapType type, - const wxPalette *palette = NULL) const; - -private: - wxDECLARE_DYNAMIC_CLASS(wxBitmapHandler); -}; - -#endif - // _WX_BITMAP_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/blank.cur b/Externals/wxWidgets3/include/wx/msw/blank.cur deleted file mode 100644 index 048f06b4ae..0000000000 Binary files a/Externals/wxWidgets3/include/wx/msw/blank.cur and /dev/null differ diff --git a/Externals/wxWidgets3/include/wx/msw/bmpbuttn.h b/Externals/wxWidgets3/include/wx/msw/bmpbuttn.h deleted file mode 100644 index 066c0f4f4f..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/bmpbuttn.h +++ /dev/null @@ -1,49 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/bmpbuttn.h -// Purpose: wxBitmapButton class -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_BMPBUTTN_H_ -#define _WX_BMPBUTTN_H_ - -#include "wx/button.h" -#include "wx/bitmap.h" -#include "wx/brush.h" - -class WXDLLIMPEXP_CORE wxBitmapButton : public wxBitmapButtonBase -{ -public: - wxBitmapButton() {} - - wxBitmapButton(wxWindow *parent, - wxWindowID id, - const wxBitmap& bitmap, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxBU_AUTODRAW, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr) - { - Create(parent, id, bitmap, pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxBitmap& bitmap, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxBU_AUTODRAW, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr); - -protected: - wxDECLARE_EVENT_TABLE(); - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxBitmapButton); -}; - -#endif // _WX_BMPBUTTN_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/bmpcbox.h b/Externals/wxWidgets3/include/wx/msw/bmpcbox.h deleted file mode 100644 index 3530c1b591..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/bmpcbox.h +++ /dev/null @@ -1,135 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/bmpcbox.h -// Purpose: wxBitmapComboBox -// Author: Jaakko Salli -// Created: 2008-04-06 -// Copyright: (c) 2008 Jaakko Salli -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_BMPCBOX_H_ -#define _WX_MSW_BMPCBOX_H_ - - -#include "wx/combobox.h" - - -// ---------------------------------------------------------------------------- -// wxBitmapComboBox: a wxComboBox that allows images to be shown -// in front of string items. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxBitmapComboBox : public wxComboBox, - public wxBitmapComboBoxBase -{ -public: - // ctors and such - wxBitmapComboBox() : wxComboBox(), wxBitmapComboBoxBase() - { - Init(); - } - - wxBitmapComboBox(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, - const wxString choices[] = NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxBitmapComboBoxNameStr) - : wxComboBox(), - wxBitmapComboBoxBase() - { - Init(); - - (void)Create(parent, id, value, pos, size, n, - choices, style, validator, name); - } - - wxBitmapComboBox(wxWindow *parent, - wxWindowID id, - const wxString& value, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxBitmapComboBoxNameStr); - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& value, - const wxPoint& pos, - const wxSize& size, - int n, - const wxString choices[], - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxBitmapComboBoxNameStr); - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& value, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxBitmapComboBoxNameStr); - - virtual ~wxBitmapComboBox(); - - // Sets the image for the given item. - virtual void SetItemBitmap(unsigned int n, const wxBitmap& bitmap); - - virtual bool SetFont(const wxFont& font); - - // Adds item with image to the end of the combo box. - int Append(const wxString& item, const wxBitmap& bitmap = wxNullBitmap); - int Append(const wxString& item, const wxBitmap& bitmap, void *clientData); - int Append(const wxString& item, const wxBitmap& bitmap, wxClientData *clientData); - - // Inserts item with image into the list before pos. Not valid for wxCB_SORT - // styles, use Append instead. - int Insert(const wxString& item, const wxBitmap& bitmap, unsigned int pos); - int Insert(const wxString& item, const wxBitmap& bitmap, - unsigned int pos, void *clientData); - int Insert(const wxString& item, const wxBitmap& bitmap, - unsigned int pos, wxClientData *clientData); - -protected: - - WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; - virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item); - virtual bool MSWOnMeasure(WXMEASUREITEMSTRUCT *item); - - // Event handlers - void OnSize(wxSizeEvent& event); - - virtual wxItemContainer* GetItemContainer() { return this; } - virtual wxWindow* GetControl() { return this; } - - // wxItemContainer implementation - virtual int DoInsertItems(const wxArrayStringsAdapter & items, - unsigned int pos, - void **clientData, wxClientDataType type); - virtual void DoClear(); - virtual void DoDeleteOneItem(unsigned int n); - - virtual bool OnAddBitmap(const wxBitmap& bitmap); - virtual wxSize DoGetBestSize() const; - void RecreateControl(); - -private: - void Init(); - - bool m_inResize; - - wxDECLARE_EVENT_TABLE(); - - wxDECLARE_DYNAMIC_CLASS(wxBitmapComboBox); -}; - -#endif // _WX_MSW_BMPCBOX_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/brush.h b/Externals/wxWidgets3/include/wx/msw/brush.h deleted file mode 100644 index 3de73c57e0..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/brush.h +++ /dev/null @@ -1,60 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/brush.h -// Purpose: wxBrush class -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_BRUSH_H_ -#define _WX_BRUSH_H_ - -class WXDLLIMPEXP_FWD_CORE wxBrush; -class WXDLLIMPEXP_FWD_CORE wxColour; -class WXDLLIMPEXP_FWD_CORE wxBitmap; - -// ---------------------------------------------------------------------------- -// wxBrush -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxBrush : public wxBrushBase -{ -public: - wxBrush(); - wxBrush(const wxColour& col, wxBrushStyle style = wxBRUSHSTYLE_SOLID); - wxBrush(const wxBitmap& stipple); - virtual ~wxBrush(); - - virtual void SetColour(const wxColour& col); - virtual void SetColour(unsigned char r, unsigned char g, unsigned char b); - virtual void SetStyle(wxBrushStyle style); - virtual void SetStipple(const wxBitmap& stipple); - - bool operator==(const wxBrush& brush) const; - bool operator!=(const wxBrush& brush) const { return !(*this == brush); } - - wxColour GetColour() const; - wxBrushStyle GetStyle() const; - wxBitmap *GetStipple() const; - - - wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants") - wxBrush(const wxColour& col, int style); - - wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants") - void SetStyle(int style) { SetStyle((wxBrushStyle)style); } - - // return the HBRUSH for this brush - virtual WXHANDLE GetResourceHandle() const; - -protected: - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; - -private: - wxDECLARE_DYNAMIC_CLASS(wxBrush); -}; - -#endif // _WX_BRUSH_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/bullseye.cur b/Externals/wxWidgets3/include/wx/msw/bullseye.cur deleted file mode 100644 index 359f6e09af..0000000000 Binary files a/Externals/wxWidgets3/include/wx/msw/bullseye.cur and /dev/null differ diff --git a/Externals/wxWidgets3/include/wx/msw/button.h b/Externals/wxWidgets3/include/wx/msw/button.h deleted file mode 100644 index 26979a8939..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/button.h +++ /dev/null @@ -1,85 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/button.h -// Purpose: wxButton class -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_BUTTON_H_ -#define _WX_MSW_BUTTON_H_ - -// ---------------------------------------------------------------------------- -// Pushbutton -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxButton : public wxButtonBase -{ -public: - wxButton() { Init(); } - wxButton(wxWindow *parent, - wxWindowID id, - const wxString& label = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr) - { - Init(); - - Create(parent, id, label, pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& label = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr); - - virtual ~wxButton(); - - virtual wxWindow *SetDefault(); - - // implementation from now on - virtual void Command(wxCommandEvent& event); - virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); - virtual bool MSWCommand(WXUINT param, WXWORD id); - - virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; - -protected: - // send a notification event, return true if processed - bool SendClickEvent(); - - // default button handling - void SetTmpDefault(); - void UnsetTmpDefault(); - - // set or unset BS_DEFPUSHBUTTON style - static void SetDefaultStyle(wxButton *btn, bool on); - - virtual bool DoGetAuthNeeded() const; - virtual void DoSetAuthNeeded(bool show); - - // true if the UAC symbol is shown - bool m_authNeeded; - -private: - void Init() - { - m_authNeeded = false; - } - - void OnCharHook(wxKeyEvent& event); - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxButton); -}; - -#endif // _WX_MSW_BUTTON_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/calctrl.h b/Externals/wxWidgets3/include/wx/msw/calctrl.h deleted file mode 100644 index 8fe57f7749..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/calctrl.h +++ /dev/null @@ -1,98 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/calctrl.h -// Purpose: wxCalendarCtrl control implementation for MSW -// Author: Vadim Zeitlin -// Copyright: (C) 2008 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_CALCTRL_H_ -#define _WX_MSW_CALCTRL_H_ - -class WXDLLIMPEXP_ADV wxCalendarCtrl : public wxCalendarCtrlBase -{ -public: - wxCalendarCtrl() { Init(); } - wxCalendarCtrl(wxWindow *parent, - wxWindowID id, - const wxDateTime& date = wxDefaultDateTime, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxCAL_SHOW_HOLIDAYS, - const wxString& name = wxCalendarNameStr) - { - Init(); - - Create(parent, id, date, pos, size, style, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxDateTime& date = wxDefaultDateTime, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxCAL_SHOW_HOLIDAYS, - const wxString& name = wxCalendarNameStr); - - virtual bool SetDate(const wxDateTime& date); - virtual wxDateTime GetDate() const; - - virtual bool SetDateRange(const wxDateTime& lowerdate = wxDefaultDateTime, - const wxDateTime& upperdate = wxDefaultDateTime); - virtual bool GetDateRange(wxDateTime *lowerdate, wxDateTime *upperdate) const; - - virtual bool EnableMonthChange(bool enable = true); - - virtual void Mark(size_t day, bool mark); - virtual void SetHoliday(size_t day); - - virtual wxCalendarHitTestResult HitTest(const wxPoint& pos, - wxDateTime *date = NULL, - wxDateTime::WeekDay *wd = NULL); - - virtual void SetWindowStyleFlag(long style); - -protected: - virtual wxSize DoGetBestSize() const; - - virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; - - virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); - - void MSWOnClick(wxMouseEvent& event); - void MSWOnDoubleClick(wxMouseEvent& event); - -private: - void Init(); - - // bring the control in sync with m_marks - void UpdateMarks(); - - // set first day of week in the control to correspond to our - // wxCAL_MONDAY_FIRST flag - void UpdateFirstDayOfWeek(); - - // reset holiday information - virtual void ResetHolidayAttrs() { m_holidays = 0; } - - // redisplay holidays - virtual void RefreshHolidays() { UpdateMarks(); } - - - // current date, we need to store it instead of simply retrieving it from - // the control as needed in order to be able to generate the correct events - // from MSWOnNotify() - wxDateTime m_date; - - // bit field containing the state (marked or not) of all days in the month - wxUint32 m_marks; - - // the same but indicating whether a day is a holiday or not - wxUint32 m_holidays; - - - wxDECLARE_DYNAMIC_CLASS(wxCalendarCtrl); - wxDECLARE_NO_COPY_CLASS(wxCalendarCtrl); -}; - -#endif // _WX_MSW_CALCTRL_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/caret.h b/Externals/wxWidgets3/include/wx/msw/caret.h deleted file mode 100644 index c179032d08..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/caret.h +++ /dev/null @@ -1,63 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/caret.h -// Purpose: wxCaret class - the MSW implementation of wxCaret -// Author: Vadim Zeitlin -// Modified by: -// Created: 23.05.99 -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_CARET_H_ -#define _WX_CARET_H_ - -class WXDLLIMPEXP_CORE wxCaret : public wxCaretBase -{ -public: - wxCaret() { Init(); } - // create the caret of given (in pixels) width and height and associate - // with the given window - wxCaret(wxWindow *window, int width, int height) - { - Init(); - - (void)Create(window, width, height); - } - // same as above - wxCaret(wxWindowBase *window, const wxSize& size) - { - Init(); - - (void)Create(window, size); - } - - // process wxWindow notifications - virtual void OnSetFocus(); - virtual void OnKillFocus(); - -protected: - void Init() - { - wxCaretBase::Init(); - - m_hasCaret = false; - } - - // override base class virtuals - virtual void DoMove(); - virtual void DoShow(); - virtual void DoHide(); - virtual void DoSize(); - - // helper function which creates the system caret - bool MSWCreateCaret(); - -private: - bool m_hasCaret; - - wxDECLARE_NO_COPY_CLASS(wxCaret); -}; - -#endif // _WX_CARET_H_ - - diff --git a/Externals/wxWidgets3/include/wx/msw/cdrom.ico b/Externals/wxWidgets3/include/wx/msw/cdrom.ico deleted file mode 100644 index f3fa3a9576..0000000000 Binary files a/Externals/wxWidgets3/include/wx/msw/cdrom.ico and /dev/null differ diff --git a/Externals/wxWidgets3/include/wx/msw/checkbox.h b/Externals/wxWidgets3/include/wx/msw/checkbox.h deleted file mode 100644 index a79a21da22..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/checkbox.h +++ /dev/null @@ -1,80 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/checkbox.h -// Purpose: wxCheckBox class -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_CHECKBOX_H_ -#define _WX_CHECKBOX_H_ - -#include "wx/msw/ownerdrawnbutton.h" - -// Checkbox item (single checkbox) -class WXDLLIMPEXP_CORE wxCheckBox : public wxMSWOwnerDrawnButton -{ -public: - wxCheckBox() { } - wxCheckBox(wxWindow *parent, - wxWindowID id, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxCheckBoxNameStr) - { - Create(parent, id, label, pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxCheckBoxNameStr); - - virtual void SetValue(bool value); - virtual bool GetValue() const; - - // override some base class virtuals - virtual void SetLabel(const wxString& label); - - virtual bool MSWCommand(WXUINT param, WXWORD id); - virtual void Command(wxCommandEvent& event); - - // returns true if the platform should explicitly apply a theme border - virtual bool CanApplyThemeBorder() const { return false; } - - // implementation only from now on - virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const; - -protected: - virtual wxSize DoGetBestClientSize() const; - - virtual void DoSet3StateValue(wxCheckBoxState value); - virtual wxCheckBoxState DoGet3StateValue() const; - - // Implement wxMSWOwnerDrawnButtonBase methods. - virtual int MSWGetButtonStyle() const wxOVERRIDE; - virtual void MSWOnButtonResetOwnerDrawn() wxOVERRIDE; - virtual int MSWGetButtonCheckedFlag() const wxOVERRIDE; - virtual void - MSWDrawButtonBitmap(wxDC& dc, const wxRect& rect, int flags) wxOVERRIDE; - -private: - // common part of all ctors - void Init(); - - // current state of the checkbox - wxCheckBoxState m_state; - - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxCheckBox); -}; - -#endif // _WX_CHECKBOX_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/checklst.h b/Externals/wxWidgets3/include/wx/msw/checklst.h deleted file mode 100644 index 9392f3e399..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/checklst.h +++ /dev/null @@ -1,88 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/checklst.h -// Purpose: wxCheckListBox class - a listbox with checkable items -// Author: Vadim Zeitlin -// Modified by: -// Created: 16.11.97 -// Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef __CHECKLST__H_ -#define __CHECKLST__H_ - -#if !wxUSE_OWNER_DRAWN - #error "wxCheckListBox class requires owner-drawn functionality." -#endif - -class WXDLLIMPEXP_FWD_CORE wxOwnerDrawn; -class WXDLLIMPEXP_FWD_CORE wxCheckListBoxItem; // fwd decl, defined in checklst.cpp - -class WXDLLIMPEXP_CORE wxCheckListBox : public wxCheckListBoxBase -{ -public: - // ctors - wxCheckListBox(); - wxCheckListBox(wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int nStrings = 0, - const wxString choices[] = NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxListBoxNameStr); - wxCheckListBox(wxWindow *parent, wxWindowID id, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxListBoxNameStr); - - bool Create(wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxListBoxNameStr); - bool Create(wxWindow *parent, wxWindowID id, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxListBoxNameStr); - - // items may be checked - virtual bool IsChecked(unsigned int uiIndex) const; - virtual void Check(unsigned int uiIndex, bool bCheck = true); - virtual void Toggle(unsigned int uiIndex); - - // we create our items ourselves and they have non-standard size, - // so we need to override these functions - virtual wxOwnerDrawn *CreateLboxItem(size_t n); - virtual bool MSWOnMeasure(WXMEASUREITEMSTRUCT *item); - -protected: - // pressing space or clicking the check box toggles the item - void OnKeyDown(wxKeyEvent& event); - void OnLeftClick(wxMouseEvent& event); - - // send an "item checked" event - void SendEvent(unsigned int uiIndex) - { - wxCommandEvent event(wxEVT_CHECKLISTBOX, GetId()); - event.SetInt(uiIndex); - event.SetEventObject(this); - event.SetString(GetString(uiIndex)); - ProcessCommand(event); - } - - wxSize DoGetBestClientSize() const; - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxCheckListBox); -}; - -#endif //_CHECKLST_H diff --git a/Externals/wxWidgets3/include/wx/msw/child.ico b/Externals/wxWidgets3/include/wx/msw/child.ico deleted file mode 100644 index 435cca2471..0000000000 Binary files a/Externals/wxWidgets3/include/wx/msw/child.ico and /dev/null differ diff --git a/Externals/wxWidgets3/include/wx/msw/chkconf.h b/Externals/wxWidgets3/include/wx/msw/chkconf.h deleted file mode 100644 index 656ef98017..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/chkconf.h +++ /dev/null @@ -1,414 +0,0 @@ -/* - * Name: wx/msw/chkconf.h - * Purpose: Compiler-specific configuration checking - * Author: Julian Smart - * Modified by: - * Created: 01/02/97 - * Copyright: (c) Julian Smart - * Licence: wxWindows licence - */ - -/* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */ - -#ifndef _WX_MSW_CHKCONF_H_ -#define _WX_MSW_CHKCONF_H_ - -/* ensure that MSW-specific settings are defined */ -#ifndef wxUSE_ACTIVEX -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_ACTIVEX must be defined." -# else -# define wxUSE_ACTIVEX 0 -# endif -#endif /* !defined(wxUSE_ACTIVEX) */ - -#ifndef wxUSE_WINRT -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_WINRT must be defined." -# else -# define wxUSE_WINRT 0 -# endif -#endif /* !defined(wxUSE_ACTIVEX) */ - -#ifndef wxUSE_CRASHREPORT -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_CRASHREPORT must be defined." -# else -# define wxUSE_CRASHREPORT 0 -# endif -#endif /* !defined(wxUSE_CRASHREPORT) */ - -#ifndef wxUSE_DC_CACHEING -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_DC_CACHEING must be defined" -# else -# define wxUSE_DC_CACHEING 1 -# endif -#endif /* wxUSE_DC_CACHEING */ - -#ifndef wxUSE_DIALUP_MANAGER -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_DIALUP_MANAGER must be defined." -# else -# define wxUSE_DIALUP_MANAGER 0 -# endif -#endif /* !defined(wxUSE_DIALUP_MANAGER) */ - -#ifndef wxUSE_MS_HTML_HELP -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_MS_HTML_HELP must be defined." -# else -# define wxUSE_MS_HTML_HELP 0 -# endif -#endif /* !defined(wxUSE_MS_HTML_HELP) */ - -#ifndef wxUSE_INICONF -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_INICONF must be defined." -# else -# define wxUSE_INICONF 0 -# endif -#endif /* !defined(wxUSE_INICONF) */ - -#ifndef wxUSE_OLE -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_OLE must be defined." -# else -# define wxUSE_OLE 0 -# endif -#endif /* !defined(wxUSE_OLE) */ - -#ifndef wxUSE_OLE_AUTOMATION -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_OLE_AUTOMATION must be defined." -# else -# define wxUSE_OLE_AUTOMATION 0 -# endif -#endif /* !defined(wxUSE_OLE_AUTOMATION) */ - -#ifndef wxUSE_TASKBARICON_BALLOONS -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_TASKBARICON_BALLOONS must be defined." -# else -# define wxUSE_TASKBARICON_BALLOONS 0 -# endif -#endif /* wxUSE_TASKBARICON_BALLOONS */ - -#ifndef wxUSE_TASKBARBUTTON -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_TASKBARBUTTON must be defined." -# else -# define wxUSE_TASKBARBUTTON 0 -# endif -#endif /* wxUSE_TASKBARBUTTON */ - -#ifndef wxUSE_UXTHEME -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_UXTHEME must be defined." -# else -# define wxUSE_UXTHEME 0 -# endif -#endif /* wxUSE_UXTHEME */ - -/* - * Unfortunately we can't use compiler TLS support if the library can be used - * inside a dynamically loaded DLL under Windows XP, as this can result in hard - * to diagnose crashes due to the bugs in Windows TLS support, see #13116. - * - * So we disable it unless we can be certain that the code will never run under - * XP, as is the case if we're using a compiler which doesn't support XP such - * as MSVC 11+, unless it's used with the special "_xp" toolset, in which case - * _USING_V110_SDK71_ is defined. - * - * However defining wxUSE_COMPILER_TLS as 2 overrides this safety check, see - * the comments in wx/setup.h. - */ -#if wxUSE_COMPILER_TLS == 1 - #if !wxCHECK_VISUALC_VERSION(11) || defined(_USING_V110_SDK71_) - #undef wxUSE_COMPILER_TLS - #define wxUSE_COMPILER_TLS 0 - #endif -#endif - - -/* - * disable the settings which don't work for some compilers - */ - -/* - * All of the settings below require SEH support (__try/__catch) and can't work - * without it. - */ -#if !defined(_MSC_VER) && \ - (!defined(__BORLANDC__) || __BORLANDC__ < 0x0550) -# undef wxUSE_ON_FATAL_EXCEPTION -# define wxUSE_ON_FATAL_EXCEPTION 0 - -# undef wxUSE_CRASHREPORT -# define wxUSE_CRASHREPORT 0 - -# undef wxUSE_STACKWALKER -# define wxUSE_STACKWALKER 0 -#endif /* compiler doesn't support SEH */ - -#if defined(__GNUWIN32__) - /* These don't work as expected for mingw32 and cygwin32 */ -# undef wxUSE_MEMORY_TRACING -# define wxUSE_MEMORY_TRACING 0 - -# undef wxUSE_GLOBAL_MEMORY_OPERATORS -# define wxUSE_GLOBAL_MEMORY_OPERATORS 0 - -# undef wxUSE_DEBUG_NEW_ALWAYS -# define wxUSE_DEBUG_NEW_ALWAYS 0 - -/* some Cygwin versions don't have wcslen */ -# if defined(__CYGWIN__) || defined(__CYGWIN32__) -# if ! ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95))) -# undef wxUSE_WCHAR_T -# define wxUSE_WCHAR_T 0 -# endif -#endif - -#endif /* __GNUWIN32__ */ - -#if !wxUSE_OWNER_DRAWN && !defined(__WXUNIVERSAL__) -# undef wxUSE_CHECKLISTBOX -# define wxUSE_CHECKLISTBOX 0 -#endif - -#if wxUSE_SPINCTRL -# if !wxUSE_SPINBTN -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxSpinCtrl requires wxSpinButton on MSW" -# else -# undef wxUSE_SPINBTN -# define wxUSE_SPINBTN 1 -# endif -# endif -#endif - -/* - Compiler-specific checks. - */ - -/* Borland */ -#ifdef __BORLANDC__ - -#if __BORLANDC__ < 0x500 - /* BC++ 4.0 can't compile JPEG library */ -# undef wxUSE_LIBJPEG -# define wxUSE_LIBJPEG 0 -#endif - -/* wxUSE_DEBUG_NEW_ALWAYS = 1 not compatible with BC++ in DLL mode */ -#if defined(WXMAKINGDLL) || defined(WXUSINGDLL) -# undef wxUSE_DEBUG_NEW_ALWAYS -# define wxUSE_DEBUG_NEW_ALWAYS 0 -#endif - -#endif /* __BORLANDC__ */ - -/* - un/redefine the options which we can't compile (after checking that they're - defined - */ -#ifdef __WINE__ -# if wxUSE_ACTIVEX -# undef wxUSE_ACTIVEX -# define wxUSE_ACTIVEX 0 -# endif /* wxUSE_ACTIVEX */ -#endif /* __WINE__ */ - -/* - Currently wxUSE_GRAPHICS_CONTEXT is only enabled with MSVC by default, so - only check for wxUSE_ACTIVITYINDICATOR dependency on it if it can be - enabled, otherwise turn the latter off to allow the library to compile. - */ -#if !wxUSE_GRAPHICS_CONTEXT && !defined(_MSC_VER) -# undef wxUSE_ACTIVITYINDICATOR -# define wxUSE_ACTIVITYINDICATOR 0 -#endif /* !wxUSE_ACTIVITYINDICATOR && !_MSC_VER */ - - -/* check settings consistency for MSW-specific ones */ -#if wxUSE_CRASHREPORT && !wxUSE_ON_FATAL_EXCEPTION -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_CRASHREPORT requires wxUSE_ON_FATAL_EXCEPTION" -# else -# undef wxUSE_CRASHREPORT -# define wxUSE_CRASHREPORT 0 -# endif -#endif /* wxUSE_CRASHREPORT */ - -#if !wxUSE_VARIANT -# if wxUSE_ACTIVEX -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxActiveXContainer requires wxVariant" -# else -# undef wxUSE_ACTIVEX -# define wxUSE_ACTIVEX 0 -# endif -# endif - -# if wxUSE_OLE_AUTOMATION -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxAutomationObject requires wxVariant" -# else -# undef wxUSE_OLE_AUTOMATION -# define wxUSE_OLE_AUTOMATION 0 -# endif -# endif -#endif /* !wxUSE_VARIANT */ - -#if !wxUSE_DATAOBJ -# if wxUSE_OLE -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_OLE requires wxDataObject" -# else -# undef wxUSE_OLE -# define wxUSE_OLE 0 -# endif -# endif -#endif /* !wxUSE_DATAOBJ */ - -#if !wxUSE_DYNAMIC_LOADER -# if wxUSE_MS_HTML_HELP -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_MS_HTML_HELP requires wxUSE_DYNAMIC_LOADER." -# else -# undef wxUSE_MS_HTML_HELP -# define wxUSE_MS_HTML_HELP 0 -# endif -# endif -# if wxUSE_DIALUP_MANAGER -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_DIALUP_MANAGER requires wxUSE_DYNAMIC_LOADER." -# else -# undef wxUSE_DIALUP_MANAGER -# define wxUSE_DIALUP_MANAGER 0 -# endif -# endif -#endif /* !wxUSE_DYNAMIC_LOADER */ - -#if !wxUSE_DYNLIB_CLASS -# if wxUSE_DC_TRANSFORM_MATRIX -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_DC_TRANSFORM_MATRIX requires wxUSE_DYNLIB_CLASS" -# else -# undef wxUSE_DC_TRANSFORM_MATRIX -# define wxUSE_DC_TRANSFORM_MATRIX 0 -# endif -# endif -# if wxUSE_UXTHEME -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_UXTHEME requires wxUSE_DYNLIB_CLASS" -# else -# undef wxUSE_UXTHEME -# define wxUSE_UXTHEME 0 -# endif -# endif -# if wxUSE_MEDIACTRL -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_MEDIACTRL requires wxUSE_DYNLIB_CLASS" -# else -# undef wxUSE_MEDIACTRL -# define wxUSE_MEDIACTRL 0 -# endif -# endif -# if wxUSE_INKEDIT -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_INKEDIT requires wxUSE_DYNLIB_CLASS" -# else -# undef wxUSE_INKEDIT -# define wxUSE_INKEDIT 0 -# endif -# endif -#endif /* !wxUSE_DYNLIB_CLASS */ - -#if !wxUSE_OLE -# if wxUSE_ACTIVEX -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxActiveXContainer requires wxUSE_OLE" -# else -# undef wxUSE_ACTIVEX -# define wxUSE_ACTIVEX 0 -# endif -# endif - -# if wxUSE_DATAOBJ -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_DATAOBJ requires wxUSE_OLE" -# else -# undef wxUSE_DATAOBJ -# define wxUSE_DATAOBJ 0 -# endif -# endif - -# if wxUSE_OLE_AUTOMATION -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxAutomationObject requires wxUSE_OLE" -# else -# undef wxUSE_OLE_AUTOMATION -# define wxUSE_OLE_AUTOMATION 0 -# endif -# endif -#endif /* !wxUSE_OLE */ - -#if !wxUSE_ACTIVEX -# if wxUSE_MEDIACTRL -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxMediaCtl requires wxActiveXContainer" -# else -# undef wxUSE_MEDIACTRL -# define wxUSE_MEDIACTRL 0 -# endif -# endif -# if wxUSE_WEB -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxWebView requires wxActiveXContainer under MSW" -# else -# undef wxUSE_WEB -# define wxUSE_WEB 0 -# endif -# endif -#endif /* !wxUSE_ACTIVEX */ - -#if wxUSE_ACTIVITYINDICATOR && !wxUSE_GRAPHICS_CONTEXT -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_ACTIVITYINDICATOR requires wxGraphicsContext" -# else -# undef wxUSE_ACTIVITYINDICATOR -# define wxUSE_ACTIVITYINDICATOR 0 -# endif -#endif /* wxUSE_ACTIVITYINDICATOR */ - -#if !wxUSE_THREADS -# if wxUSE_FSWATCHER -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxFileSystemWatcher requires wxThread under MSW" -# else -# undef wxUSE_FSWATCHER -# define wxUSE_FSWATCHER 0 -# endif -# endif -#endif /* !wxUSE_THREADS */ - - -#if !wxUSE_OLE_AUTOMATION -# if wxUSE_WEB -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxWebView requires wxUSE_OLE_AUTOMATION under MSW" -# else -# undef wxUSE_WEB -# define wxUSE_WEB 0 -# endif -# endif -#endif /* !wxUSE_OLE_AUTOMATION */ - -#if defined(__WXUNIVERSAL__) && wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW && !wxUSE_POSTSCRIPT -# undef wxUSE_POSTSCRIPT -# define wxUSE_POSTSCRIPT 1 -#endif - -#endif /* _WX_MSW_CHKCONF_H_ */ diff --git a/Externals/wxWidgets3/include/wx/msw/choice.h b/Externals/wxWidgets3/include/wx/msw/choice.h deleted file mode 100644 index 2758409c57..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/choice.h +++ /dev/null @@ -1,176 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/choice.h -// Purpose: wxChoice class -// Author: Julian Smart -// Modified by: Vadim Zeitlin to derive from wxChoiceBase -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_CHOICE_H_ -#define _WX_CHOICE_H_ - -struct tagCOMBOBOXINFO; - -// ---------------------------------------------------------------------------- -// Choice item -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxChoice : public wxChoiceBase -{ -public: - // ctors - wxChoice() { Init(); } - virtual ~wxChoice(); - - wxChoice(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxChoiceNameStr) - { - Init(); - Create(parent, id, pos, size, n, choices, style, validator, name); - } - - wxChoice(wxWindow *parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxChoiceNameStr) - { - Init(); - Create(parent, id, pos, size, choices, style, validator, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxChoiceNameStr); - bool Create(wxWindow *parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxChoiceNameStr); - - virtual bool Show(bool show = true); - - virtual void SetLabel(const wxString& label); - - virtual unsigned int GetCount() const; - virtual int GetSelection() const; - virtual int GetCurrentSelection() const; - virtual void SetSelection(int n); - - virtual int FindString(const wxString& s, bool bCase = false) const; - virtual wxString GetString(unsigned int n) const; - virtual void SetString(unsigned int n, const wxString& s); - - virtual wxVisualAttributes GetDefaultAttributes() const - { - return GetClassDefaultAttributes(GetWindowVariant()); - } - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - // MSW only - virtual bool MSWCommand(WXUINT param, WXWORD id); - WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); - virtual WXHBRUSH MSWControlColor(WXHDC hDC, WXHWND hWnd); - virtual bool MSWShouldPreProcessMessage(WXMSG *pMsg); - virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; - - // returns true if the platform should explicitly apply a theme border - virtual bool CanApplyThemeBorder() const { return false; } - -protected: - // choose the default border for this window - virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } - - // common part of all ctors - void Init() - { - m_lastAcceptedSelection = - m_pendingSelection = wxID_NONE; - m_heightOwn = wxDefaultCoord; - } - - virtual void DoDeleteOneItem(unsigned int n); - virtual void DoClear(); - - virtual int DoInsertItems(const wxArrayStringsAdapter& items, - unsigned int pos, - void **clientData, wxClientDataType type); - - virtual void DoMoveWindow(int x, int y, int width, int height); - virtual void DoSetItemClientData(unsigned int n, void* clientData); - virtual void* DoGetItemClientData(unsigned int n) const; - - // MSW implementation - virtual wxSize DoGetBestSize() const; - virtual void DoGetSize(int *w, int *h) const; - virtual void DoSetSize(int x, int y, - int width, int height, - int sizeFlags = wxSIZE_AUTO); - virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const; - - // Show or hide the popup part of the control. - void MSWDoPopupOrDismiss(bool show); - - // update the height of the drop down list to fit the number of items we - // have (without changing the visible height) - void MSWUpdateDropDownHeight(); - - // set the height of the visible part of the control to m_heightOwn - void MSWUpdateVisibleHeight(); - - // create and initialize the control - bool CreateAndInit(wxWindow *parent, wxWindowID id, - const wxPoint& pos, - const wxSize& size, - int n, const wxString choices[], - long style, - const wxValidator& validator, - const wxString& name); - - // free all memory we have (used by Clear() and dtor) - void Free(); - - // set the height for simple combo box - int SetHeightSimpleComboBox(int nItems) const; - -#if wxUSE_DEFERRED_SIZING - virtual void MSWEndDeferWindowPos(); -#endif // wxUSE_DEFERRED_SIZING - - // These variables are only used while the drop down is opened. - // - // The first one contains the item that had been originally selected before - // the drop down was opened and the second one the item we should select - // when the drop down is closed again. - int m_lastAcceptedSelection, - m_pendingSelection; - - // the height of the control itself if it was set explicitly or - // wxDefaultCoord if it hadn't - int m_heightOwn; - - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxChoice); -}; - -#endif // _WX_CHOICE_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/clipbrd.h b/Externals/wxWidgets3/include/wx/msw/clipbrd.h deleted file mode 100644 index 51c94afe04..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/clipbrd.h +++ /dev/null @@ -1,89 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/clipbrd.h -// Purpose: wxClipboad class and clipboard functions for MSW -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_CLIPBRD_H_ -#define _WX_CLIPBRD_H_ - -#if wxUSE_CLIPBOARD - -// These functions superceded by wxClipboard, but retained in order to -// implement wxClipboard, and for compatibility. - -// open/close the clipboard -WXDLLIMPEXP_CORE bool wxOpenClipboard(); -WXDLLIMPEXP_CORE bool wxIsClipboardOpened(); -#define wxClipboardOpen wxIsClipboardOpened -WXDLLIMPEXP_CORE bool wxCloseClipboard(); - -// get/set data -WXDLLIMPEXP_CORE bool wxEmptyClipboard(); -WXDLLIMPEXP_CORE bool wxSetClipboardData(wxDataFormat dataFormat, - const void *data, - int width = 0, int height = 0); -WXDLLIMPEXP_CORE void* wxGetClipboardData(wxDataFormat dataFormat, - long *len = NULL); - -// clipboard formats -WXDLLIMPEXP_CORE bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat); -WXDLLIMPEXP_CORE wxDataFormat wxEnumClipboardFormats(wxDataFormat dataFormat); -WXDLLIMPEXP_CORE int wxRegisterClipboardFormat(wxChar *formatName); -WXDLLIMPEXP_CORE bool wxGetClipboardFormatName(wxDataFormat dataFormat, - wxChar *formatName, - int maxCount); - -//----------------------------------------------------------------------------- -// wxClipboard -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxClipboard : public wxClipboardBase -{ -public: - wxClipboard(); - virtual ~wxClipboard(); - - // open the clipboard before SetData() and GetData() - virtual bool Open(); - - // close the clipboard after SetData() and GetData() - virtual void Close(); - - // query whether the clipboard is opened - virtual bool IsOpened() const; - - // set the clipboard data. all other formats will be deleted. - virtual bool SetData( wxDataObject *data ); - - // add to the clipboard data. - virtual bool AddData( wxDataObject *data ); - - // ask if data in correct format is available - virtual bool IsSupported( const wxDataFormat& format ); - - // fill data with data on the clipboard (if available) - virtual bool GetData( wxDataObject& data ); - - // clears wxTheClipboard and the system's clipboard if possible - virtual void Clear(); - - // flushes the clipboard: this means that the data which is currently on - // clipboard will stay available even after the application exits (possibly - // eating memory), otherwise the clipboard will be emptied on exit - virtual bool Flush(); - -private: - IDataObject *m_lastDataObject; - bool m_isOpened; - - wxDECLARE_DYNAMIC_CLASS(wxClipboard); -}; - -#endif // wxUSE_CLIPBOARD - -#endif // _WX_CLIPBRD_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/colordlg.h b/Externals/wxWidgets3/include/wx/msw/colordlg.h deleted file mode 100644 index c59bf4f468..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/colordlg.h +++ /dev/null @@ -1,71 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/colordlg.h -// Purpose: wxColourDialog class -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_COLORDLG_H_ -#define _WX_COLORDLG_H_ - -#include "wx/dialog.h" - -// ---------------------------------------------------------------------------- -// wxColourDialog: dialog for choosing a colours -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxColourDialog : public wxDialog -{ -public: - wxColourDialog() { Init(); } - wxColourDialog(wxWindow *parent, wxColourData *data = NULL) - { - Init(); - - Create(parent, data); - } - - bool Create(wxWindow *parent, wxColourData *data = NULL); - - wxColourData& GetColourData() { return m_colourData; } - - // override some base class virtuals - virtual void SetTitle(const wxString& title); - virtual wxString GetTitle() const; - - virtual int ShowModal(); - - // wxMSW-specific implementation from now on - // ----------------------------------------- - - // called from the hook procedure on WM_INITDIALOG reception - virtual void MSWOnInitDone(WXHWND hDlg); - -protected: - // common part of all ctors - void Init(); - - virtual void DoGetPosition( int *x, int *y ) const; - virtual void DoGetSize(int *width, int *height) const; - virtual void DoGetClientSize(int *width, int *height) const; - virtual void DoMoveWindow(int x, int y, int width, int height); - virtual void DoCentre(int dir); - - wxColourData m_colourData; - wxString m_title; - - // indicates that the dialog should be centered in this direction if non 0 - // (set by DoCentre(), used by MSWOnInitDone()) - int m_centreDir; - - // true if DoMoveWindow() had been called - bool m_movedWindow; - - - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxColourDialog); -}; - -#endif // _WX_COLORDLG_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/colour.h b/Externals/wxWidgets3/include/wx/msw/colour.h deleted file mode 100644 index 07d72dc682..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/colour.h +++ /dev/null @@ -1,72 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/colour.h -// Purpose: wxColour class -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_COLOUR_H_ -#define _WX_COLOUR_H_ - -#include "wx/object.h" - -// ---------------------------------------------------------------------------- -// Colour -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxColour : public wxColourBase -{ -public: - // constructors - // ------------ - DEFINE_STD_WXCOLOUR_CONSTRUCTORS - - // accessors - // --------- - - virtual bool IsOk() const { return m_isInit; } - - unsigned char Red() const { return m_red; } - unsigned char Green() const { return m_green; } - unsigned char Blue() const { return m_blue; } - unsigned char Alpha() const { return m_alpha ; } - - // comparison - bool operator==(const wxColour& colour) const - { - return m_isInit == colour.m_isInit - && m_red == colour.m_red - && m_green == colour.m_green - && m_blue == colour.m_blue - && m_alpha == colour.m_alpha; - } - - bool operator!=(const wxColour& colour) const { return !(*this == colour); } - - WXCOLORREF GetPixel() const { return m_pixel; } - -public: - WXCOLORREF m_pixel; - -protected: - // Helper function - void Init(); - - virtual void - InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a); - -private: - bool m_isInit; - unsigned char m_red; - unsigned char m_blue; - unsigned char m_green; - unsigned char m_alpha; - -private: - wxDECLARE_DYNAMIC_CLASS(wxColour); -}; - -#endif // _WX_COLOUR_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/colours.bmp b/Externals/wxWidgets3/include/wx/msw/colours.bmp deleted file mode 100644 index 7d391ad144..0000000000 Binary files a/Externals/wxWidgets3/include/wx/msw/colours.bmp and /dev/null differ diff --git a/Externals/wxWidgets3/include/wx/msw/combo.h b/Externals/wxWidgets3/include/wx/msw/combo.h deleted file mode 100644 index 17053c151c..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/combo.h +++ /dev/null @@ -1,115 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/combo.h -// Purpose: wxComboCtrl class -// Author: Jaakko Salli -// Modified by: -// Created: Apr-30-2006 -// Copyright: (c) Jaakko Salli -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_COMBOCONTROL_H_ -#define _WX_COMBOCONTROL_H_ - -// NB: Definition of _WX_COMBOCONTROL_H_ is used in wx/generic/combo.h to -// determine whether there is native wxComboCtrl, so make sure you -// use it in all native wxComboCtrls. - -#if wxUSE_COMBOCTRL - -#if wxUSE_TIMER - #include "wx/timer.h" - #define wxUSE_COMBOCTRL_POPUP_ANIMATION 1 -#endif - - -// ---------------------------------------------------------------------------- -// Native wxComboCtrl -// ---------------------------------------------------------------------------- - -// Define this only if native implementation includes all features -#define wxCOMBOCONTROL_FULLY_FEATURED - -extern WXDLLIMPEXP_DATA_CORE(const char) wxComboBoxNameStr[]; - -class WXDLLIMPEXP_CORE wxComboCtrl : public wxComboCtrlBase -{ -public: - // ctors and such - wxComboCtrl() : wxComboCtrlBase() { Init(); } - - wxComboCtrl(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxComboBoxNameStr) - : wxComboCtrlBase() - { - Init(); - - (void)Create(parent, id, value, pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxComboBoxNameStr); - - virtual ~wxComboCtrl(); - - virtual void PrepareBackground( wxDC& dc, const wxRect& rect, int flags ) const; - virtual bool IsKeyPopupToggle(const wxKeyEvent& event) const; - - static int GetFeatures() { return wxComboCtrlFeatures::All; } - -#if wxUSE_COMBOCTRL_POPUP_ANIMATION - void OnTimerEvent(wxTimerEvent& WXUNUSED(event)) { DoTimerEvent(); } - -protected: - void DoTimerEvent(); - - virtual bool AnimateShow( const wxRect& rect, int flags ); -#endif // wxUSE_COMBOCTRL_POPUP_ANIMATION - -protected: - - // Dummy method - we override all functions that call this - virtual WXHWND GetEditHWND() const { return NULL; } - - // customization - virtual void OnResize(); - virtual wxCoord GetNativeTextIndent() const; - - // event handlers - void OnPaintEvent( wxPaintEvent& event ); - void OnMouseEvent( wxMouseEvent& event ); - - virtual bool HasTransparentBackground() { return IsDoubleBuffered(); } - -private: - void Init(); - -#if wxUSE_COMBOCTRL_POPUP_ANIMATION - // Popup animation related - wxMilliClock_t m_animStart; - wxTimer m_animTimer; - wxRect m_animRect; - int m_animFlags; -#endif - - wxDECLARE_EVENT_TABLE(); - - wxDECLARE_DYNAMIC_CLASS(wxComboCtrl); -}; - - -#endif // wxUSE_COMBOCTRL -#endif - // _WX_COMBOCONTROL_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/combobox.h b/Externals/wxWidgets3/include/wx/msw/combobox.h deleted file mode 100644 index c016fd3e17..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/combobox.h +++ /dev/null @@ -1,176 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/combobox.h -// Purpose: wxComboBox class -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_COMBOBOX_H_ -#define _WX_COMBOBOX_H_ - -#include "wx/choice.h" -#include "wx/textentry.h" - -#if wxUSE_COMBOBOX - -// ---------------------------------------------------------------------------- -// Combobox control -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxComboBox : public wxChoice, - public wxTextEntry -{ -public: - wxComboBox() { Init(); } - - wxComboBox(wxWindow *parent, wxWindowID id, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxComboBoxNameStr) - { - Init(); - Create(parent, id, value, pos, size, n, choices, style, validator, name); - - } - - wxComboBox(wxWindow *parent, wxWindowID id, - const wxString& value, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxComboBoxNameStr) - { - Init(); - - Create(parent, id, value, pos, size, choices, style, validator, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, - const wxString choices[] = NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxComboBoxNameStr); - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& value, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxComboBoxNameStr); - - // See wxComboBoxBase discussion of IsEmpty(). - bool IsListEmpty() const { return wxItemContainer::IsEmpty(); } - bool IsTextEmpty() const { return wxTextEntry::IsEmpty(); } - - // resolve ambiguities among virtual functions inherited from both base - // classes - virtual void Clear(); - virtual wxString GetValue() const; - virtual void SetValue(const wxString& value); - virtual wxString GetStringSelection() const - { return wxChoice::GetStringSelection(); } - virtual void Popup() { MSWDoPopupOrDismiss(true); } - virtual void Dismiss() { MSWDoPopupOrDismiss(false); } - virtual void SetSelection(int n) { wxChoice::SetSelection(n); } - virtual void SetSelection(long from, long to) - { wxTextEntry::SetSelection(from, to); } - virtual int GetSelection() const { return wxChoice::GetSelection(); } - virtual bool ContainsHWND(WXHWND hWnd) const; - virtual void GetSelection(long *from, long *to) const; - - virtual bool IsEditable() const; - - // implementation only from now on - virtual bool MSWCommand(WXUINT param, WXWORD id); - bool MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam); - virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); - bool MSWShouldPreProcessMessage(WXMSG *pMsg); - - // Standard event handling - void OnCut(wxCommandEvent& event); - void OnCopy(wxCommandEvent& event); - void OnPaste(wxCommandEvent& event); - void OnUndo(wxCommandEvent& event); - void OnRedo(wxCommandEvent& event); - void OnDelete(wxCommandEvent& event); - void OnSelectAll(wxCommandEvent& event); - - void OnUpdateCut(wxUpdateUIEvent& event); - void OnUpdateCopy(wxUpdateUIEvent& event); - void OnUpdatePaste(wxUpdateUIEvent& event); - void OnUpdateUndo(wxUpdateUIEvent& event); - void OnUpdateRedo(wxUpdateUIEvent& event); - void OnUpdateDelete(wxUpdateUIEvent& event); - void OnUpdateSelectAll(wxUpdateUIEvent& event); - - virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; - -#if wxUSE_UXTHEME - // override wxTextEntry method to work around Windows bug - virtual bool SetHint(const wxString& hint); -#endif // wxUSE_UXTHEME - - virtual void SetLayoutDirection(wxLayoutDirection dir) wxOVERRIDE; - -protected: -#if wxUSE_TOOLTIPS - virtual void DoSetToolTip(wxToolTip *tip); -#endif - - virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const; - - // Override this one to avoid eating events from our popup listbox. - virtual wxWindow *MSWFindItem(long id, WXHWND hWnd) const; - - // this is the implementation of GetEditHWND() which can also be used when - // we don't have the edit control, it simply returns NULL then - // - // try not to use this function unless absolutely necessary (as in the - // message handling code where the edit control might not be created yet - // for the messages we receive during the control creation) as normally - // just testing for IsEditable() and using GetEditHWND() should be enough - WXHWND GetEditHWNDIfAvailable() const; - - virtual void EnableTextChangedEvents(bool enable) - { - m_allowTextEvents = enable; - } - -private: - // there are the overridden wxTextEntry methods which should only be called - // when we do have an edit control so they assert if this is not the case - virtual wxWindow *GetEditableWindow(); - virtual WXHWND GetEditHWND() const; - - // common part of all ctors - void Init() - { - m_allowTextEvents = true; - } - - // normally true, false if text events are currently disabled - bool m_allowTextEvents; - - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxComboBox); - wxDECLARE_EVENT_TABLE(); -}; - -#endif // wxUSE_COMBOBOX - -#endif // _WX_COMBOBOX_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/commandlinkbutton.h b/Externals/wxWidgets3/include/wx/msw/commandlinkbutton.h deleted file mode 100644 index bc4d4804d0..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/commandlinkbutton.h +++ /dev/null @@ -1,73 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/commandlinkbutton.h -// Purpose: wxCommandLinkButton class -// Author: Rickard Westerlund -// Created: 2010-06-11 -// Copyright: (c) 2010 wxWidgets team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_COMMANDLINKBUTTON_H_ -#define _WX_MSW_COMMANDLINKBUTTON_H_ - -// ---------------------------------------------------------------------------- -// Command link button for wxMSW -// ---------------------------------------------------------------------------- - -// Derive from the generic version to be able to fall back to it during -// run-time if the command link buttons are not supported by the system we're -// running under. - -class WXDLLIMPEXP_ADV wxCommandLinkButton : public wxGenericCommandLinkButton -{ -public: - wxCommandLinkButton () : wxGenericCommandLinkButton() { } - - wxCommandLinkButton(wxWindow *parent, - wxWindowID id, - const wxString& mainLabel = wxEmptyString, - const wxString& note = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr) - : wxGenericCommandLinkButton() - { - Create(parent, id, mainLabel, note, pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& mainLabel = wxEmptyString, - const wxString& note = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr); - - // overridden base class methods - // ----------------------------- - - // do the same thing as in the generic case here - virtual void SetLabel(const wxString& label) - { - SetMainLabelAndNote(label.BeforeFirst('\n'), label.AfterFirst('\n')); - } - - virtual void SetMainLabelAndNote(const wxString& mainLabel, - const wxString& note); - - virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; - -protected: - virtual wxSize DoGetBestSize() const; - - virtual bool HasNativeBitmap() const; - -private: - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxCommandLinkButton); -}; - -#endif // _WX_MSW_COMMANDLINKBUTTON_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/computer.ico b/Externals/wxWidgets3/include/wx/msw/computer.ico deleted file mode 100644 index f36237bdb9..0000000000 Binary files a/Externals/wxWidgets3/include/wx/msw/computer.ico and /dev/null differ diff --git a/Externals/wxWidgets3/include/wx/msw/control.h b/Externals/wxWidgets3/include/wx/msw/control.h deleted file mode 100644 index aeaccf982f..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/control.h +++ /dev/null @@ -1,130 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/control.h -// Purpose: wxControl class -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_CONTROL_H_ -#define _WX_CONTROL_H_ - -#include "wx/dynarray.h" - -// General item class -class WXDLLIMPEXP_CORE wxControl : public wxControlBase -{ -public: - wxControl() { } - - wxControl(wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxControlNameStr) - { - Create(parent, id, pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxControlNameStr); - - - // Simulates an event - virtual void Command(wxCommandEvent& event) { ProcessCommand(event); } - - - // implementation from now on - // -------------------------- - - virtual wxVisualAttributes GetDefaultAttributes() const - { - return GetClassDefaultAttributes(GetWindowVariant()); - } - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - // Calls the callback and appropriate event handlers - bool ProcessCommand(wxCommandEvent& event); - - // MSW-specific - virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); - - // For ownerdraw items - virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *WXUNUSED(item)) { return false; } - virtual bool MSWOnMeasure(WXMEASUREITEMSTRUCT *WXUNUSED(item)) { return false; } - - const wxArrayLong& GetSubcontrols() const { return m_subControls; } - - // default handling of WM_CTLCOLORxxx: this is public so that wxWindow - // could call it - virtual WXHBRUSH MSWControlColor(WXHDC pDC, WXHWND hWnd); - - // default style for the control include WS_TABSTOP if it AcceptsFocus() - virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; - -protected: - // choose the default border for this window - virtual wxBorder GetDefaultBorder() const; - - // return default best size (doesn't really make any sense, override this) - virtual wxSize DoGetBestSize() const; - - // create the control of the given Windows class: this is typically called - // from Create() method of the derived class passing its label, pos and - // size parameter (style parameter is not needed because m_windowStyle is - // supposed to had been already set and so is used instead when this - // function is called) - bool MSWCreateControl(const wxChar *classname, - const wxString& label, - const wxPoint& pos, - const wxSize& size); - - // NB: the method below is deprecated now, with MSWGetStyle() the method - // above should be used instead! Once all the controls are updated to - // implement MSWGetStyle() this version will disappear. - // - // create the control of the given class with the given style (combination - // of WS_XXX flags, i.e. Windows style, not wxWidgets one), returns - // false if creation failed - // - // All parameters except classname and style are optional, if the - // size/position are not given, they should be set later with SetSize() - // and, label (the title of the window), of course, is left empty. The - // extended style is determined from the style and the app 3D settings - // automatically if it's not specified explicitly. - bool MSWCreateControl(const wxChar *classname, - WXDWORD style, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - const wxString& label = wxEmptyString, - WXDWORD exstyle = (WXDWORD)-1); - - // call this from the derived class MSWControlColor() if you want to show - // the control greyed out (and opaque) - WXHBRUSH MSWControlColorDisabled(WXHDC pDC); - - // common part of the 3 functions above: pass wxNullColour to use the - // appropriate background colour (meaning ours or our parents) or a fixed - // one - virtual WXHBRUSH DoMSWControlColor(WXHDC pDC, wxColour colBg, WXHWND hWnd); - - // Look in our GetSubcontrols() for the windows with the given ID. - virtual wxWindow *MSWFindItem(long id, WXHWND hWnd) const; - - - // for controls like radiobuttons which are really composite this array - // holds the ids (not HWNDs!) of the sub controls - wxArrayLong m_subControls; - -private: - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxControl); -}; - -#endif // _WX_CONTROL_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/crashrpt.h b/Externals/wxWidgets3/include/wx/msw/crashrpt.h deleted file mode 100644 index f354b482c2..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/crashrpt.h +++ /dev/null @@ -1,119 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/crashrpt.h -// Purpose: helpers for the structured exception handling (SEH) under Win32 -// Author: Vadim Zeitlin -// Modified by: -// Created: 13.07.2003 -// Copyright: (c) 2003 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_CRASHRPT_H_ -#define _WX_MSW_CRASHRPT_H_ - -#include "wx/defs.h" - -#if wxUSE_CRASHREPORT - -struct _EXCEPTION_POINTERS; - -// ---------------------------------------------------------------------------- -// crash report generation flags -// ---------------------------------------------------------------------------- - -enum -{ - // we always report where the crash occurred - wxCRASH_REPORT_LOCATION = 0, - - // if this flag is given, the call stack is dumped - // - // this results in dump/crash report as small as possible, this is the - // default flag - wxCRASH_REPORT_STACK = 1, - - // if this flag is given, the values of the local variables are dumped - // - // note that with the current implementation it requires dumping the full - // process address space and so this will result in huge dump file and will - // take some time to generate - // - // it's probably not a good idea to use this by default, start with default - // mini dump and ask your users to set WX_CRASH_FLAGS environment variable - // to 2 or 4 if you need more information in the dump - wxCRASH_REPORT_LOCALS = 2, - - // if this flag is given, the values of all global variables are dumped - // - // this creates a much larger mini dump than just wxCRASH_REPORT_STACK but - // still much smaller than wxCRASH_REPORT_LOCALS one - wxCRASH_REPORT_GLOBALS = 4, - - // default is to create the smallest possible crash report - wxCRASH_REPORT_DEFAULT = wxCRASH_REPORT_LOCATION | wxCRASH_REPORT_STACK -}; - -// ---------------------------------------------------------------------------- -// wxCrashContext: information about the crash context -// ---------------------------------------------------------------------------- - -struct WXDLLIMPEXP_BASE wxCrashContext -{ - // initialize this object with the given information or from the current - // global exception info which is only valid inside wxApp::OnFatalException - wxCrashContext(_EXCEPTION_POINTERS *ep = NULL); - - // get the name for this exception code - wxString GetExceptionString() const; - - - // exception code - size_t code; - - // exception address - void *addr; - - // machine-specific registers vaues - struct - { -#ifdef __INTEL__ - wxInt32 eax, ebx, ecx, edx, esi, edi, - ebp, esp, eip, - cs, ds, es, fs, gs, ss, - flags; -#endif // __INTEL__ - } regs; -}; - -// ---------------------------------------------------------------------------- -// wxCrashReport: this class is used to create crash reports -// ---------------------------------------------------------------------------- - -struct WXDLLIMPEXP_BASE wxCrashReport -{ - // set the name of the file to which the report is written, it is - // constructed from the .exe name by default - static void SetFileName(const wxString& filename); - - // return the current file name - static wxString GetFileName(); - - // write the exception report to the file, return true if it could be done - // or false otherwise - // - // if ep pointer is NULL, the global exception info which is valid only - // inside wxApp::OnFatalException() is used - static bool Generate(int flags = wxCRASH_REPORT_DEFAULT, - _EXCEPTION_POINTERS *ep = NULL); - - - // generate a crash report from outside of wxApp::OnFatalException(), this - // can be used to take "snapshots" of the program in wxApp::OnAssert() for - // example - static bool GenerateNow(int flags = wxCRASH_REPORT_DEFAULT); -}; - -#endif // wxUSE_CRASHREPORT - -#endif // _WX_MSW_CRASHRPT_H_ - diff --git a/Externals/wxWidgets3/include/wx/msw/cross.cur b/Externals/wxWidgets3/include/wx/msw/cross.cur deleted file mode 100644 index 5b8f4632f9..0000000000 Binary files a/Externals/wxWidgets3/include/wx/msw/cross.cur and /dev/null differ diff --git a/Externals/wxWidgets3/include/wx/msw/csquery.bmp b/Externals/wxWidgets3/include/wx/msw/csquery.bmp deleted file mode 100644 index 4e7bcdc30b..0000000000 Binary files a/Externals/wxWidgets3/include/wx/msw/csquery.bmp and /dev/null differ diff --git a/Externals/wxWidgets3/include/wx/msw/ctrlsub.h b/Externals/wxWidgets3/include/wx/msw/ctrlsub.h deleted file mode 100644 index e3d9d6e63a..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/ctrlsub.h +++ /dev/null @@ -1,42 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/ctrlsub.h -// Purpose: common functionality of wxItemContainer-derived controls -// Author: Vadim Zeitlin -// Created: 2007-07-25 -// Copyright: (c) 2007 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_CTRLSUB_H_ -#define _WX_MSW_CTRLSUB_H_ - -// ---------------------------------------------------------------------------- -// wxControlWithItems -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxControlWithItems : public wxControlWithItemsBase -{ -public: - wxControlWithItems() { } - -protected: - // preallocate memory for inserting the given new items into the control - // using the wm message (normally either LB_INITSTORAGE or CB_INITSTORAGE) - void MSWAllocStorage(const wxArrayStringsAdapter& items, unsigned wm); - - // insert or append a string to the controls using the given message - // (one of {CB,LB}_{ADD,INSERT}STRING, pos must be 0 when appending) - int MSWInsertOrAppendItem(unsigned pos, const wxString& item, unsigned wm); - - // normally the control containing the items is this window itself but if - // the derived control is composed of several windows, this method can be - // overridden to return the real list/combobox control - virtual WXHWND MSWGetItemsHWND() const { return GetHWND(); } - -private: - wxDECLARE_ABSTRACT_CLASS(wxControlWithItems); - wxDECLARE_NO_COPY_CLASS(wxControlWithItems); -}; - -#endif // _WX_MSW_CTRLSUB_H_ - diff --git a/Externals/wxWidgets3/include/wx/msw/cursor.h b/Externals/wxWidgets3/include/wx/msw/cursor.h deleted file mode 100644 index 7ff2d45de2..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/cursor.h +++ /dev/null @@ -1,49 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/cursor.h -// Purpose: wxCursor class -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_CURSOR_H_ -#define _WX_CURSOR_H_ - -class WXDLLIMPEXP_FWD_CORE wxImage; - -// Cursor -class WXDLLIMPEXP_CORE wxCursor : public wxCursorBase -{ -public: - // constructors - wxCursor(); - wxCursor(const wxImage& image); - wxCursor(const wxString& name, - wxBitmapType type = wxCURSOR_DEFAULT_TYPE, - int hotSpotX = 0, int hotSpotY = 0); - wxCursor(wxStockCursor id) { InitFromStock(id); } -#if WXWIN_COMPATIBILITY_2_8 - wxCursor(int id) { InitFromStock((wxStockCursor)id); } -#endif - - virtual wxPoint GetHotSpot() const wxOVERRIDE; - - virtual ~wxCursor(); - - // implementation only - void SetHCURSOR(WXHCURSOR cursor) { SetHandle((WXHANDLE)cursor); } - WXHCURSOR GetHCURSOR() const { return (WXHCURSOR)GetHandle(); } - -protected: - void InitFromStock(wxStockCursor); - - virtual wxGDIImageRefData *CreateData() const; - -private: - wxDECLARE_DYNAMIC_CLASS(wxCursor); -}; - -#endif - // _WX_CURSOR_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/custombgwin.h b/Externals/wxWidgets3/include/wx/msw/custombgwin.h deleted file mode 100644 index ca8d8bfc42..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/custombgwin.h +++ /dev/null @@ -1,57 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/custombgwin.h -// Purpose: wxMSW implementation of wxCustomBackgroundWindow -// Author: Vadim Zeitlin -// Created: 2011-10-10 -// Copyright: (c) 2011 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_CUSTOMBGWIN_H_ -#define _WX_MSW_CUSTOMBGWIN_H_ - -#include "wx/bitmap.h" -#include "wx/brush.h" - -// ---------------------------------------------------------------------------- -// wxCustomBackgroundWindow -// ---------------------------------------------------------------------------- - -template -class wxCustomBackgroundWindow : public W, - public wxCustomBackgroundWindowBase -{ -public: - typedef W BaseWindowClass; - - wxCustomBackgroundWindow() { m_backgroundBrush = NULL; } - - virtual ~wxCustomBackgroundWindow() { delete m_backgroundBrush; } - -protected: - virtual void DoSetBackgroundBitmap(const wxBitmap& bmp) - { - delete m_backgroundBrush; - m_backgroundBrush = bmp.IsOk() ? new wxBrush(bmp) : NULL; - - // Our transparent children should use our background if we have it, - // otherwise try to restore m_inheritBgCol to some reasonable value: true - // if we also have non-default background colour or false otherwise. - BaseWindowClass::m_inheritBgCol = bmp.IsOk() - || BaseWindowClass::UseBgCol(); - } - - virtual WXHBRUSH MSWGetCustomBgBrush() - { - if ( m_backgroundBrush ) - return (WXHBRUSH)m_backgroundBrush->GetResourceHandle(); - - return BaseWindowClass::MSWGetCustomBgBrush(); - } - - wxBrush *m_backgroundBrush; - - wxDECLARE_NO_COPY_TEMPLATE_CLASS(wxCustomBackgroundWindow, W); -}; - -#endif // _WX_MSW_CUSTOMBGWIN_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/datectrl.h b/Externals/wxWidgets3/include/wx/msw/datectrl.h deleted file mode 100644 index aeb3d30830..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/datectrl.h +++ /dev/null @@ -1,69 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/datectrl.h -// Purpose: wxDatePickerCtrl for Windows -// Author: Vadim Zeitlin -// Modified by: -// Created: 2005-01-09 -// Copyright: (c) 2005 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_DATECTRL_H_ -#define _WX_MSW_DATECTRL_H_ - -// ---------------------------------------------------------------------------- -// wxDatePickerCtrl -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDatePickerCtrl : public wxDatePickerCtrlBase -{ -public: - // ctors - wxDatePickerCtrl() { } - - wxDatePickerCtrl(wxWindow *parent, - wxWindowID id, - const wxDateTime& dt = wxDefaultDateTime, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDP_DEFAULT | wxDP_SHOWCENTURY, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxDatePickerCtrlNameStr) - { - Create(parent, id, dt, pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxDateTime& dt = wxDefaultDateTime, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDP_DEFAULT | wxDP_SHOWCENTURY, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxDatePickerCtrlNameStr); - - // Override this one to add date-specific (and time-ignoring) checks. - virtual void SetValue(const wxDateTime& dt); - virtual wxDateTime GetValue() const; - - // Implement the base class pure virtuals. - virtual void SetRange(const wxDateTime& dt1, const wxDateTime& dt2); - virtual bool GetRange(wxDateTime *dt1, wxDateTime *dt2) const; - - // Override MSW-specific functions used during control creation. - virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; - -protected: -#if wxUSE_INTL - virtual wxLocaleInfo MSWGetFormat() const; -#endif // wxUSE_INTL - virtual bool MSWAllowsNone() const { return HasFlag(wxDP_ALLOWNONE); } - virtual bool MSWOnDateTimeChange(const tagNMDATETIMECHANGE& dtch); - -private: - wxDateTime MSWGetControlValue() const; - - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDatePickerCtrl); -}; - -#endif // _WX_MSW_DATECTRL_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/datetimectrl.h b/Externals/wxWidgets3/include/wx/msw/datetimectrl.h deleted file mode 100644 index dcb4d4ee19..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/datetimectrl.h +++ /dev/null @@ -1,88 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/datetimectrl.h -// Purpose: wxDateTimePickerCtrl for Windows. -// Author: Vadim Zeitlin -// Created: 2011-09-22 (extracted from wx/msw/datectrl.h). -// Copyright: (c) 2005-2011 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_DATETIMECTRL_H_ -#define _WX_MSW_DATETIMECTRL_H_ - -#include "wx/intl.h" - -// Forward declare a struct from Platform SDK. -struct tagNMDATETIMECHANGE; - -// ---------------------------------------------------------------------------- -// wxDateTimePickerCtrl -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDateTimePickerCtrl : public wxDateTimePickerCtrlBase -{ -public: - // set/get the date - virtual void SetValue(const wxDateTime& dt); - virtual wxDateTime GetValue() const; - - // returns true if the platform should explicitly apply a theme border - virtual bool CanApplyThemeBorder() const { return false; } - - virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); - -protected: - virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } - virtual wxSize DoGetBestSize() const; - - // Helper for the derived classes Create(): creates a native control with - // the specified attributes. - bool MSWCreateDateTimePicker(wxWindow *parent, - wxWindowID id, - const wxDateTime& dt, - const wxPoint& pos, - const wxSize& size, - long style, - const wxValidator& validator, - const wxString& name); - - // Notice that the methods below must be overridden in all native MSW - // classes inheriting from this one but they can't be pure virtual because - // the generic implementations, not needing nor able to implement them, is - // also derived from this class currently. The real problem is, of course, - // this wrong class structure because the generic classes also inherit the - // wrong implementations of Set/GetValue() and DoGetBestSize() but as they - // override these methods anyhow, it does work -- but is definitely ugly - // and need to be changed (but how?) in the future. - -#if wxUSE_INTL - // Override to return the date/time format used by this control. - virtual wxLocaleInfo MSWGetFormat() const /* = 0 */ - { - wxFAIL_MSG( "Unreachable" ); - return wxLOCALE_TIME_FMT; - } -#endif // wxUSE_INTL - - // Override to indicate whether we can have no date at all. - virtual bool MSWAllowsNone() const /* = 0 */ - { - wxFAIL_MSG( "Unreachable" ); - return false; - } - - // Override to update m_date and send the event when the control contents - // changes, return true if the event was handled. - virtual bool MSWOnDateTimeChange(const tagNMDATETIMECHANGE& dtch) /* = 0 */ - { - wxUnusedVar(dtch); - wxFAIL_MSG( "Unreachable" ); - return false; - } - - - // the date currently shown by the control, may be invalid - wxDateTime m_date; -}; - -#endif // _WX_MSW_DATETIMECTRL_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/dc.h b/Externals/wxWidgets3/include/wx/msw/dc.h deleted file mode 100644 index b4f603023c..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/dc.h +++ /dev/null @@ -1,381 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/dc.h -// Purpose: wxDC class -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_DC_H_ -#define _WX_MSW_DC_H_ - -#include "wx/defs.h" -#include "wx/dc.h" - -// --------------------------------------------------------------------------- -// macros -// --------------------------------------------------------------------------- - -#if wxUSE_DC_CACHEING -/* - * Cached blitting, maintaining a cache - * of bitmaps required for transparent blitting - * instead of constant creation/deletion - */ - -class wxDCCacheEntry: public wxObject -{ -public: - wxDCCacheEntry(WXHBITMAP hBitmap, int w, int h, int depth); - wxDCCacheEntry(WXHDC hDC, int depth); - virtual ~wxDCCacheEntry(); - - WXHBITMAP m_bitmap; - WXHDC m_dc; - int m_width; - int m_height; - int m_depth; -}; -#endif - -// this is an ABC: use one of the derived classes to create a DC associated -// with a window, screen, printer and so on -class WXDLLIMPEXP_CORE wxMSWDCImpl: public wxDCImpl -{ -public: - wxMSWDCImpl(wxDC *owner, WXHDC hDC); - virtual ~wxMSWDCImpl(); - - // implement base class pure virtuals - // ---------------------------------- - - virtual void Clear(); - - virtual bool StartDoc(const wxString& message); - virtual void EndDoc(); - - virtual void StartPage(); - virtual void EndPage(); - - virtual void SetFont(const wxFont& font); - virtual void SetPen(const wxPen& pen); - virtual void SetBrush(const wxBrush& brush); - virtual void SetBackground(const wxBrush& brush); - virtual void SetBackgroundMode(int mode); -#if wxUSE_PALETTE - virtual void SetPalette(const wxPalette& palette); -#endif // wxUSE_PALETTE - - virtual void DestroyClippingRegion(); - - virtual wxCoord GetCharHeight() const; - virtual wxCoord GetCharWidth() const; - - virtual bool CanDrawBitmap() const; - virtual bool CanGetTextExtent() const; - virtual int GetDepth() const; - virtual wxSize GetPPI() const; - - - virtual void SetMapMode(wxMappingMode mode); - virtual void SetUserScale(double x, double y); - virtual void SetLogicalScale(double x, double y); - virtual void SetLogicalOrigin(wxCoord x, wxCoord y); - virtual void SetDeviceOrigin(wxCoord x, wxCoord y); - virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp); - -#if wxUSE_DC_TRANSFORM_MATRIX - virtual bool CanUseTransformMatrix() const; - virtual bool SetTransformMatrix(const wxAffineMatrix2D& matrix); - virtual wxAffineMatrix2D GetTransformMatrix() const; - virtual void ResetTransformMatrix(); -#endif // wxUSE_DC_TRANSFORM_MATRIX - - virtual void SetLogicalFunction(wxRasterOperationMode function); - - // implementation from now on - // -------------------------- - - virtual void SetRop(WXHDC cdc); - virtual void SelectOldObjects(WXHDC dc); - - void SetWindow(wxWindow *win) - { - m_window = win; - -#if wxUSE_PALETTE - // if we have palettes use the correct one for this window - InitializePalette(); -#endif // wxUSE_PALETTE - } - - WXHDC GetHDC() const { return m_hDC; } - void SetHDC(WXHDC dc, bool bOwnsDC = false) - { - m_hDC = dc; - m_bOwnsDC = bOwnsDC; - - // we might have a pre existing clipping region, make sure that we - // return it if asked -- but avoid calling ::GetClipBox() right now as - // it could be unnecessary wasteful - m_clipping = true; - m_clipX1 = - m_clipX2 = 0; - } - - void* GetHandle() const { return (void*)GetHDC(); } - - const wxBitmap& GetSelectedBitmap() const { return m_selectedBitmap; } - wxBitmap& GetSelectedBitmap() { return m_selectedBitmap; } - - // update the internal clip box variables - void UpdateClipBox(); - -#if wxUSE_DC_CACHEING - static wxDCCacheEntry* FindBitmapInCache(WXHDC hDC, int w, int h); - static wxDCCacheEntry* FindDCInCache(wxDCCacheEntry* notThis, WXHDC hDC); - - static void AddToBitmapCache(wxDCCacheEntry* entry); - static void AddToDCCache(wxDCCacheEntry* entry); - static void ClearCache(); -#endif - - // RTL related functions - // --------------------- - - // get or change the layout direction (LTR or RTL) for this dc, - // wxLayout_Default is returned if layout direction is not supported - virtual wxLayoutDirection GetLayoutDirection() const; - virtual void SetLayoutDirection(wxLayoutDirection dir); - -protected: - void Init() - { - m_bOwnsDC = false; - m_hDC = NULL; - - m_oldBitmap = NULL; - m_oldPen = NULL; - m_oldBrush = NULL; - m_oldFont = NULL; - -#if wxUSE_PALETTE - m_oldPalette = NULL; -#endif // wxUSE_PALETTE - } - - // create an uninitialized DC: this should be only used by the derived - // classes - wxMSWDCImpl( wxDC *owner ) : wxDCImpl( owner ) { Init(); } - - void RealizeScaleAndOrigin(); - -public: - virtual void DoGetFontMetrics(int *height, - int *ascent, - int *descent, - int *internalLeading, - int *externalLeading, - int *averageWidth) const; - virtual void DoGetTextExtent(const wxString& string, - wxCoord *x, wxCoord *y, - wxCoord *descent = NULL, - wxCoord *externalLeading = NULL, - const wxFont *theFont = NULL) const; - virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const; - - virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, - wxFloodFillStyle style = wxFLOOD_SURFACE); - - virtual void DoGradientFillLinear(const wxRect& rect, - const wxColour& initialColour, - const wxColour& destColour, - wxDirection nDirection = wxEAST); - - virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const; - - virtual void DoDrawPoint(wxCoord x, wxCoord y); - virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2); - - virtual void DoDrawArc(wxCoord x1, wxCoord y1, - wxCoord x2, wxCoord y2, - wxCoord xc, wxCoord yc); - virtual void DoDrawCheckMark(wxCoord x, wxCoord y, - wxCoord width, wxCoord height); - virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h, - double sa, double ea); - - virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height); - virtual void DoDrawRoundedRectangle(wxCoord x, wxCoord y, - wxCoord width, wxCoord height, - double radius); - virtual void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height); - -#if wxUSE_SPLINES - virtual void DoDrawSpline(const wxPointList *points); -#endif - - virtual void DoCrossHair(wxCoord x, wxCoord y); - - virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y); - virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y, - bool useMask = false); - - virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y); - virtual void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, - double angle); - - virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, - wxDC *source, wxCoord xsrc, wxCoord ysrc, - wxRasterOperationMode rop = wxCOPY, bool useMask = false, - wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord); - - virtual bool DoStretchBlit(wxCoord xdest, wxCoord ydest, - wxCoord dstWidth, wxCoord dstHeight, - wxDC *source, - wxCoord xsrc, wxCoord ysrc, - wxCoord srcWidth, wxCoord srcHeight, - wxRasterOperationMode rop = wxCOPY, bool useMask = false, - wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord); - - virtual void DoSetClippingRegion(wxCoord x, wxCoord y, - wxCoord width, wxCoord height); - virtual void DoSetDeviceClippingRegion(const wxRegion& region); - virtual void DoGetClippingBox(wxCoord *x, wxCoord *y, - wxCoord *w, wxCoord *h) const; - - virtual void DoGetSizeMM(int* width, int* height) const; - - virtual void DoDrawLines(int n, const wxPoint points[], - wxCoord xoffset, wxCoord yoffset); - virtual void DoDrawPolygon(int n, const wxPoint points[], - wxCoord xoffset, wxCoord yoffset, - wxPolygonFillMode fillStyle = wxODDEVEN_RULE); - virtual void DoDrawPolyPolygon(int n, const int count[], const wxPoint points[], - wxCoord xoffset, wxCoord yoffset, - wxPolygonFillMode fillStyle = wxODDEVEN_RULE); - virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const - { - return subrect == NULL ? GetSelectedBitmap() - : GetSelectedBitmap().GetSubBitmap(*subrect); - } - - -#if wxUSE_PALETTE - // MSW specific, select a logical palette into the HDC - // (tell windows to translate pixel from other palettes to our custom one - // and vice versa) - // Realize tells it to also reset the system palette to this one. - void DoSelectPalette(bool realize = false); - - // Find out what palette our parent window has, then select it into the dc - void InitializePalette(); -#endif // wxUSE_PALETTE - -protected: - // common part of DoDrawText() and DoDrawRotatedText() - void DrawAnyText(const wxString& text, wxCoord x, wxCoord y); - - // common part of DoSetClippingRegion() and DoSetDeviceClippingRegion() - void SetClippingHrgn(WXHRGN hrgn); - - // implementation of DoGetSize() for wxScreen/PrinterDC: this simply - // returns the size of the entire device this DC is associated with - // - // notice that we intentionally put it in a separate function instead of - // DoGetSize() itself because we want it to remain pure virtual both - // because each derived class should take care to define it as needed (this - // implementation is not at all always appropriate) and because we want - // wxDC to be an ABC to prevent it from being created directly - void GetDeviceSize(int *width, int *height) const; - - - // MSW-specific member variables - // ----------------------------- - - // the window associated with this DC (may be NULL) - wxWindow *m_canvas; - - wxBitmap m_selectedBitmap; - - // TRUE => DeleteDC() in dtor, FALSE => only ReleaseDC() it - bool m_bOwnsDC:1; - - // our HDC - WXHDC m_hDC; - - // Store all old GDI objects when do a SelectObject, so we can select them - // back in (this unselecting user's objects) so we can safely delete the - // DC. - WXHBITMAP m_oldBitmap; - WXHPEN m_oldPen; - WXHBRUSH m_oldBrush; - WXHFONT m_oldFont; - -#if wxUSE_PALETTE - WXHPALETTE m_oldPalette; -#endif // wxUSE_PALETTE - -#if wxUSE_DC_CACHEING - static wxObjectList sm_bitmapCache; - static wxObjectList sm_dcCache; -#endif - - wxDECLARE_CLASS(wxMSWDCImpl); - wxDECLARE_NO_COPY_CLASS(wxMSWDCImpl); -}; - -// ---------------------------------------------------------------------------- -// wxDCTemp: a wxDC which doesn't free the given HDC (used by wxWidgets -// only/mainly) -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxDCTempImpl : public wxMSWDCImpl -{ -public: - // construct a temporary DC with the specified HDC and size (it should be - // specified whenever we know it for this HDC) - wxDCTempImpl(wxDC *owner, WXHDC hdc, const wxSize& size ) - : wxMSWDCImpl( owner, hdc ), - m_size(size) - { - } - - virtual ~wxDCTempImpl() - { - // prevent base class dtor from freeing it - SetHDC((WXHDC)NULL); - } - - virtual void DoGetSize(int *w, int *h) const - { - wxASSERT_MSG( m_size.IsFullySpecified(), - wxT("size of this DC hadn't been set and is unknown") ); - - if ( w ) - *w = m_size.x; - if ( h ) - *h = m_size.y; - } - -private: - // size of this DC must be explicitly set by SetSize() as we have no way to - // find it ourselves - const wxSize m_size; - - wxDECLARE_NO_COPY_CLASS(wxDCTempImpl); -}; - -class WXDLLIMPEXP_CORE wxDCTemp : public wxDC -{ -public: - wxDCTemp(WXHDC hdc, const wxSize& size = wxDefaultSize) - : wxDC(new wxDCTempImpl(this, hdc, size)) - { - } -}; - -#endif // _WX_MSW_DC_H_ - diff --git a/Externals/wxWidgets3/include/wx/msw/dcclient.h b/Externals/wxWidgets3/include/wx/msw/dcclient.h deleted file mode 100644 index 10ac3ab571..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/dcclient.h +++ /dev/null @@ -1,108 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/dcclient.h -// Purpose: wxClientDC class -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DCCLIENT_H_ -#define _WX_DCCLIENT_H_ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/dc.h" -#include "wx/msw/dc.h" -#include "wx/dcclient.h" - -class wxPaintDCInfo; - -// ---------------------------------------------------------------------------- -// DC classes -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxWindowDCImpl : public wxMSWDCImpl -{ -public: - // default ctor - wxWindowDCImpl( wxDC *owner ); - - // Create a DC corresponding to the whole window - wxWindowDCImpl( wxDC *owner, wxWindow *win ); - - virtual void DoGetSize(int *width, int *height) const; - -protected: - // initialize the newly created DC - void InitDC(); - - wxDECLARE_CLASS(wxWindowDCImpl); - wxDECLARE_NO_COPY_CLASS(wxWindowDCImpl); -}; - -class WXDLLIMPEXP_CORE wxClientDCImpl : public wxWindowDCImpl -{ -public: - // default ctor - wxClientDCImpl( wxDC *owner ); - - // Create a DC corresponding to the client area of the window - wxClientDCImpl( wxDC *owner, wxWindow *win ); - - virtual ~wxClientDCImpl(); - - virtual void DoGetSize(int *width, int *height) const; - -protected: - void InitDC(); - - wxDECLARE_CLASS(wxClientDCImpl); - wxDECLARE_NO_COPY_CLASS(wxClientDCImpl); -}; - -class WXDLLIMPEXP_CORE wxPaintDCImpl : public wxClientDCImpl -{ -public: - wxPaintDCImpl( wxDC *owner ); - - // Create a DC corresponding for painting the window in OnPaint() - wxPaintDCImpl( wxDC *owner, wxWindow *win ); - - virtual ~wxPaintDCImpl(); - - // find the entry for this DC in the cache (keyed by the window) - static WXHDC FindDCInCache(wxWindow* win); - - // This must be called by the code handling WM_PAINT to remove the DC - // cached for this window for the duration of this message processing. - static void EndPaint(wxWindow *win); - -protected: - // Find the DC for this window in the cache, return NULL if not found. - static wxPaintDCInfo *FindInCache(wxWindow* win); - - wxDECLARE_CLASS(wxPaintDCImpl); - wxDECLARE_NO_COPY_CLASS(wxPaintDCImpl); -}; - -/* - * wxPaintDCEx - * This class is used when an application sends an HDC with the WM_PAINT - * message. It is used in HandlePaint and need not be used by an application. - */ - -class WXDLLIMPEXP_CORE wxPaintDCEx : public wxPaintDC -{ -public: - wxPaintDCEx(wxWindow *canvas, WXHDC dc); - - wxDECLARE_CLASS(wxPaintDCEx); - wxDECLARE_NO_COPY_CLASS(wxPaintDCEx); -}; - -#endif - // _WX_DCCLIENT_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/dcmemory.h b/Externals/wxWidgets3/include/wx/msw/dcmemory.h deleted file mode 100644 index 8c57173974..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/dcmemory.h +++ /dev/null @@ -1,44 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/dcmemory.h -// Purpose: wxMemoryDC class -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DCMEMORY_H_ -#define _WX_DCMEMORY_H_ - -#include "wx/dcmemory.h" -#include "wx/msw/dc.h" - -class WXDLLIMPEXP_CORE wxMemoryDCImpl: public wxMSWDCImpl -{ -public: - wxMemoryDCImpl( wxMemoryDC *owner ); - wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap ); - wxMemoryDCImpl( wxMemoryDC *owner, wxDC *dc ); // Create compatible DC - - // override some base class virtuals - virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height); - virtual void DoGetSize(int* width, int* height) const; - virtual void DoSelect(const wxBitmap& bitmap); - - virtual wxBitmap DoGetAsBitmap(const wxRect* subrect) const - { return subrect == NULL ? GetSelectedBitmap() : GetSelectedBitmap().GetSubBitmapOfHDC(*subrect, GetHDC() );} - -protected: - // create DC compatible with the given one or screen if dc == NULL - bool CreateCompatible(wxDC *dc); - - // initialize the newly created DC - void Init(); - - wxDECLARE_CLASS(wxMemoryDCImpl); - wxDECLARE_NO_COPY_CLASS(wxMemoryDCImpl); -}; - -#endif - // _WX_DCMEMORY_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/dcprint.h b/Externals/wxWidgets3/include/wx/msw/dcprint.h deleted file mode 100644 index c3f223b512..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/dcprint.h +++ /dev/null @@ -1,82 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/dcprint.h -// Purpose: wxPrinterDC class -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_DCPRINT_H_ -#define _WX_MSW_DCPRINT_H_ - -#if wxUSE_PRINTING_ARCHITECTURE - -#include "wx/dcprint.h" -#include "wx/cmndata.h" -#include "wx/msw/dc.h" - -// ------------------------------------------------------------------------ -// wxPrinterDCImpl -// - -class WXDLLIMPEXP_CORE wxPrinterDCImpl : public wxMSWDCImpl -{ -public: - // Create from print data - wxPrinterDCImpl( wxPrinterDC *owner, const wxPrintData& data ); - wxPrinterDCImpl( wxPrinterDC *owner, WXHDC theDC ); - - // override some base class virtuals - virtual bool StartDoc(const wxString& message); - virtual void EndDoc(); - virtual void StartPage(); - virtual void EndPage(); - - virtual wxRect GetPaperRect() const; - -protected: - virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y, - bool useMask = false); - virtual bool DoBlit(wxCoord xdest, wxCoord ydest, - wxCoord width, wxCoord height, - wxDC *source, wxCoord xsrc, wxCoord ysrc, - wxRasterOperationMode rop = wxCOPY, bool useMask = false, - wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord); - virtual void DoGetSize(int *w, int *h) const - { - GetDeviceSize(w, h); - } - - - // init the dc - void Init(); - - wxPrintData m_printData; - -private: - wxDECLARE_CLASS(wxPrinterDCImpl); - wxDECLARE_NO_COPY_CLASS(wxPrinterDCImpl); -}; - -// Gets an HDC for the specified printer configuration -WXHDC WXDLLIMPEXP_CORE wxGetPrinterDC(const wxPrintData& data); - -// ------------------------------------------------------------------------ -// wxPrinterDCromHDC -// - -class WXDLLIMPEXP_CORE wxPrinterDCFromHDC: public wxPrinterDC -{ -public: - wxPrinterDCFromHDC( WXHDC theDC ) - : wxPrinterDC(new wxPrinterDCImpl(this, theDC)) - { - } -}; - -#endif // wxUSE_PRINTING_ARCHITECTURE - -#endif // _WX_MSW_DCPRINT_H_ - diff --git a/Externals/wxWidgets3/include/wx/msw/dcscreen.h b/Externals/wxWidgets3/include/wx/msw/dcscreen.h deleted file mode 100644 index 839b585ab1..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/dcscreen.h +++ /dev/null @@ -1,33 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/dcscreen.h -// Purpose: wxScreenDC class -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_DCSCREEN_H_ -#define _WX_MSW_DCSCREEN_H_ - -#include "wx/dcscreen.h" -#include "wx/msw/dc.h" - -class WXDLLIMPEXP_CORE wxScreenDCImpl : public wxMSWDCImpl -{ -public: - // Create a DC representing the whole screen - wxScreenDCImpl( wxScreenDC *owner ); - - virtual void DoGetSize(int *w, int *h) const - { - GetDeviceSize(w, h); - } - - wxDECLARE_CLASS(wxScreenDCImpl); - wxDECLARE_NO_COPY_CLASS(wxScreenDCImpl); -}; - -#endif // _WX_MSW_DCSCREEN_H_ - diff --git a/Externals/wxWidgets3/include/wx/msw/dde.h b/Externals/wxWidgets3/include/wx/msw/dde.h deleted file mode 100644 index cc3da0a1c3..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/dde.h +++ /dev/null @@ -1,137 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/dde.h -// Purpose: DDE class -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DDE_H_ -#define _WX_DDE_H_ - -#include "wx/ipcbase.h" - -/* - * Mini-DDE implementation - - Most transactions involve a topic name and an item name (choose these - as befits your application). - - A client can: - - - ask the server to execute commands (data) associated with a topic - - request data from server by topic and item - - poke data into the server - - ask the server to start an advice loop on topic/item - - ask the server to stop an advice loop - - A server can: - - - respond to execute, request, poke and advice start/stop - - send advise data to client - - Note that this limits the server in the ways it can send data to the - client, i.e. it can't send unsolicited information. - * - */ - -class WXDLLIMPEXP_FWD_BASE wxDDEServer; -class WXDLLIMPEXP_FWD_BASE wxDDEClient; - -class WXDLLIMPEXP_BASE wxDDEConnection : public wxConnectionBase -{ -public: - wxDDEConnection(void *buffer, size_t size); // use external buffer - wxDDEConnection(); // use internal buffer - virtual ~wxDDEConnection(); - - // implement base class pure virtual methods - virtual const void *Request(const wxString& item, - size_t *size = NULL, - wxIPCFormat format = wxIPC_TEXT); - virtual bool StartAdvise(const wxString& item); - virtual bool StopAdvise(const wxString& item); - virtual bool Disconnect(); - -protected: - virtual bool DoExecute(const void *data, size_t size, wxIPCFormat format); - virtual bool DoPoke(const wxString& item, const void *data, size_t size, - wxIPCFormat format); - virtual bool DoAdvise(const wxString& item, const void *data, size_t size, - wxIPCFormat format); - -public: - wxString m_topicName; - wxDDEServer* m_server; - wxDDEClient* m_client; - - WXHCONV m_hConv; - const void* m_sendingData; - int m_dataSize; - wxIPCFormat m_dataType; - - wxDECLARE_NO_COPY_CLASS(wxDDEConnection); - wxDECLARE_DYNAMIC_CLASS(wxDDEConnection); -}; - -class WXDLLIMPEXP_BASE wxDDEServer : public wxServerBase -{ -public: - wxDDEServer(); - bool Create(const wxString& server_name); - virtual ~wxDDEServer(); - - virtual wxConnectionBase *OnAcceptConnection(const wxString& topic); - - // Find/delete wxDDEConnection corresponding to the HCONV - wxDDEConnection *FindConnection(WXHCONV conv); - bool DeleteConnection(WXHCONV conv); - wxString& GetServiceName() const { return (wxString&) m_serviceName; } - - wxDDEConnectionList& GetConnections() const - { return (wxDDEConnectionList&) m_connections; } - -protected: - int m_lastError; - wxString m_serviceName; - wxDDEConnectionList m_connections; - - wxDECLARE_DYNAMIC_CLASS(wxDDEServer); -}; - -class WXDLLIMPEXP_BASE wxDDEClient: public wxClientBase -{ -public: - wxDDEClient(); - virtual ~wxDDEClient(); - - bool ValidHost(const wxString& host); - - // Call this to make a connection. Returns NULL if cannot. - virtual wxConnectionBase *MakeConnection(const wxString& host, - const wxString& server, - const wxString& topic); - - // Tailor this to return own connection. - virtual wxConnectionBase *OnMakeConnection(); - - // Find/delete wxDDEConnection corresponding to the HCONV - wxDDEConnection *FindConnection(WXHCONV conv); - bool DeleteConnection(WXHCONV conv); - - wxDDEConnectionList& GetConnections() const - { return (wxDDEConnectionList&) m_connections; } - -protected: - int m_lastError; - wxDDEConnectionList m_connections; - - wxDECLARE_DYNAMIC_CLASS(wxDDEClient); -}; - -void WXDLLIMPEXP_BASE wxDDEInitialize(); -void WXDLLIMPEXP_BASE wxDDECleanUp(); - -#endif // _WX_DDE_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/debughlp.h b/Externals/wxWidgets3/include/wx/msw/debughlp.h deleted file mode 100644 index b224c19a23..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/debughlp.h +++ /dev/null @@ -1,434 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/debughlp.h -// Purpose: wraps dbghelp.h standard file -// Author: Vadim Zeitlin, Suzumizaki-kimitaka -// Created: 2005-01-08 (extracted from msw/crashrpt.cpp) -// Copyright: (c) 2003-2005 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_DEBUGHLPH_H_ -#define _WX_MSW_DEBUGHLPH_H_ - -#include "wx/dynlib.h" - -#include "wx/msw/wrapwin.h" - -#ifdef __VISUALC__ - // Disable a warning that we can do nothing about: we get it at least for - // imagehlp.h from 8.1 Windows kit when using VC14. - #pragma warning(push) - - // 'typedef ': ignored on left of '' when no variable is declared - #pragma warning(disable:4091) -#endif - -#include - -#ifdef __VISUALC__ - #pragma warning(pop) -#endif - -#include "wx/msw/private.h" - -// wxUSE_DBGHELP can be predefined on the compiler command line to force using -// dbghelp.dll even if it's not detected or, on the contrary, avoid using even -// if it's available. -#ifndef wxUSE_DBGHELP - // The only compiler which is known to have the necessary headers is MSVC. - #ifdef __VISUALC__ - // MSVC7.1 shipped with API v9 and we don't support anything earlier - // anyhow. - #if API_VERSION_NUMBER >= 9 - #define wxUSE_DBGHELP 1 - #else - #define wxUSE_DBGHELP 0 - #endif - #else - #define wxUSE_DBGHELP 0 - #endif -#endif - -#if wxUSE_DBGHELP - -/* - -The table below shows which functions are exported by dbghelp.dll. - -On 64 bit Windows, there seems to be no difference between 32bit dll and 64bit -one. Vista-64 and Win8-64 look the same, but "Ex" and "ExW" versions exist only -in Windows 8. - -Note that SymGetLineFromAddrW and EnumerateLoadedModulesW DON'T exist at all. - -function | Windows | XP-32 Vista-64 Win8-64 -SymEnumSymbolsW n/a v v -SymFromAddrW n/a v v -SymInitializeW n/a v v - -SymEnumSymbols v v v -SymFromAddr v v v -SymInitialize v v v - -SymGetLineFromAddrW64 n/a v v -SymGetLineFromAddr64 v v v -SymGetLineFromAddrW n/a n/a n/a -SymGetLineFromAddr v v v - -EnumerateLoadedModulesW64 n/a v v -EnumerateLoadedModules64 v v v -EnumerateLoadedModulesW n/a n/a n/a -EnumerateLoadedModules v v v - -*/ - -// It's not really clear whether API v10 is used by anything as VC8 still used -// v9, just as MSVC7.1, while VC9 already used v11, but provide support for it -// just in case. -#if API_VERSION_NUMBER < 10/*{{{*/ - -typedef BOOL -(CALLBACK *PENUMLOADED_MODULES_CALLBACKW64)(PWSTR ModuleName, - DWORD64 ModuleBase, - ULONG ModuleSize, - PVOID UserContext); - -typedef struct _IMAGEHLP_LINEW64 -{ - DWORD SizeOfStruct; - PVOID Key; - DWORD LineNumber; - PWSTR FileName; - DWORD64 Address; -} IMAGEHLP_LINEW64, *PIMAGEHLP_LINEW64; - -typedef struct _SYMBOL_INFOW -{ - ULONG SizeOfStruct; - ULONG TypeIndex; - ULONG64 Reserved[2]; - ULONG Index; - ULONG Size; - ULONG64 ModBase; - ULONG Flags; - ULONG64 Value; - ULONG64 Address; - ULONG Register; - ULONG Scope; - ULONG Tag; - ULONG NameLen; - ULONG MaxNameLen; - WCHAR Name[1]; -} SYMBOL_INFOW, *PSYMBOL_INFOW; - -typedef BOOL -(CALLBACK *PSYM_ENUMERATESYMBOLS_CALLBACKW)(PSYMBOL_INFOW pSymInfo, - ULONG SymbolSize, - PVOID UserContext); - -typedef BOOL -(CALLBACK *PSYM_ENUMERATESYMBOLS_CALLBACK)(PSYMBOL_INFO pSymInfo, - ULONG SymbolSize, - PVOID UserContext); - -#endif // API_VERSION_NUMBER < 10/*}}}*/ - -// wx-prefixed types map to either the ANSI or Unicode ("W") version depending -// on the build of wx itself. -#ifdef UNICODE - #define wxPSYM_ENUMERATESYMBOLS_CALLBACK PSYM_ENUMERATESYMBOLS_CALLBACKW -#else // !UNICODE - #define wxPSYM_ENUMERATESYMBOLS_CALLBACK PSYM_ENUMERATESYMBOLS_CALLBACK -#endif // UNICODE/!UNICODE - -// This one could be already defined by wx/msw/stackwalk.h -#ifndef wxSYMBOL_INFO - #ifdef UNICODE - #define wxSYMBOL_INFO SYMBOL_INFOW - #else // !UNICODE - #define wxSYMBOL_INFO SYMBOL_INFO - #endif // UNICODE/!UNICODE -#endif // !defined(wxSYMBOL_INFO) - -typedef wxSYMBOL_INFO* wxPSYMBOL_INFO; - -// This differs from PENUMLOADED_MODULES_CALLBACK[W]64 in that it always uses -// "const" for its first argument when the SDK used to pass a non-const string -// here until API_VERSION_NUMBER==11, so we can't just define it as an existing -// typedef. -typedef BOOL -(CALLBACK *wxPENUMLOADED_MODULES_CALLBACK)(const wxChar* moduleName, - DWORD64 moduleBase, - ULONG moduleSize, - void *userContext); - -// ---------------------------------------------------------------------------- -// wxDbgHelpDLL: dynamically load dbghelp.dll functions -// ---------------------------------------------------------------------------- - -// wrapper for some functions from dbghelp.dll -// -// MT note: this class is not MT safe and should be only used from a single -// thread at a time (this is so because dbghelp.dll is not MT-safe -// itself anyhow) -class wxDbgHelpDLL -{ -public: - // some useful constants not present in debughlp.h (stolen from DIA SDK) - enum BasicType - { - BASICTYPE_NOTYPE = 0, - BASICTYPE_VOID = 1, - BASICTYPE_CHAR = 2, - BASICTYPE_WCHAR = 3, - BASICTYPE_INT = 6, - BASICTYPE_UINT = 7, - BASICTYPE_FLOAT = 8, - BASICTYPE_BCD = 9, - BASICTYPE_BOOL = 10, - BASICTYPE_LONG = 13, - BASICTYPE_ULONG = 14, - BASICTYPE_CURRENCY = 25, - BASICTYPE_DATE = 26, - BASICTYPE_VARIANT = 27, - BASICTYPE_COMPLEX = 28, - BASICTYPE_BIT = 29, - BASICTYPE_BSTR = 30, - BASICTYPE_HRESULT = 31, - BASICTYPE_MAX - }; - - enum SymbolTag - { - SYMBOL_TAG_NULL, - SYMBOL_TAG_EXE, - SYMBOL_TAG_COMPILAND, - SYMBOL_TAG_COMPILAND_DETAILS, - SYMBOL_TAG_COMPILAND_ENV, - SYMBOL_TAG_FUNCTION, - SYMBOL_TAG_BLOCK, - SYMBOL_TAG_DATA, - SYMBOL_TAG_ANNOTATION, - SYMBOL_TAG_LABEL, - SYMBOL_TAG_PUBLIC_SYMBOL, - SYMBOL_TAG_UDT, - SYMBOL_TAG_ENUM, - SYMBOL_TAG_FUNCTION_TYPE, - SYMBOL_TAG_POINTER_TYPE, - SYMBOL_TAG_ARRAY_TYPE, - SYMBOL_TAG_BASE_TYPE, - SYMBOL_TAG_TYPEDEF, - SYMBOL_TAG_BASE_CLASS, - SYMBOL_TAG_FRIEND, - SYMBOL_TAG_FUNCTION_ARG_TYPE, - SYMBOL_TAG_FUNC_DEBUG_START, - SYMBOL_TAG_FUNC_DEBUG_END, - SYMBOL_TAG_USING_NAMESPACE, - SYMBOL_TAG_VTABLE_SHAPE, - SYMBOL_TAG_VTABLE, - SYMBOL_TAG_CUSTOM, - SYMBOL_TAG_THUNK, - SYMBOL_TAG_CUSTOM_TYPE, - SYMBOL_TAG_MANAGED_TYPE, - SYMBOL_TAG_DIMENSION, - SYMBOL_TAG_MAX - }; - - enum DataKind - { - DATA_UNKNOWN, - DATA_LOCAL, - DATA_STATIC_LOCAL, - DATA_PARAM, - DATA_OBJECT_PTR, // "this" pointer - DATA_FILE_STATIC, - DATA_GLOBAL, - DATA_MEMBER, - DATA_STATIC_MEMBER, - DATA_CONSTANT, - DATA_MAX - }; - - enum UdtKind - { - UDT_STRUCT, - UDT_CLASS, - UDT_UNION, - UDT_MAX - }; - - - // function types - typedef DWORD (WINAPI *SymGetOptions_t)(); - typedef DWORD (WINAPI *SymSetOptions_t)(DWORD); - typedef BOOL (WINAPI *SymInitialize_t)(HANDLE, LPCSTR, BOOL); - typedef BOOL (WINAPI *SymInitializeW_t)(HANDLE, LPCWSTR, BOOL); - typedef BOOL (WINAPI *StackWalk_t)(DWORD, HANDLE, HANDLE, LPSTACKFRAME, - LPVOID, PREAD_PROCESS_MEMORY_ROUTINE, - PFUNCTION_TABLE_ACCESS_ROUTINE, - PGET_MODULE_BASE_ROUTINE, - PTRANSLATE_ADDRESS_ROUTINE); - typedef BOOL (WINAPI *SymFromAddr_t)(HANDLE, DWORD64, PDWORD64, PSYMBOL_INFO); - typedef BOOL (WINAPI *SymFromAddrW_t)(HANDLE, DWORD64, PDWORD64, PSYMBOL_INFOW); - typedef LPVOID (WINAPI *SymFunctionTableAccess_t)(HANDLE, DWORD_PTR); - typedef DWORD_PTR (WINAPI *SymGetModuleBase_t)(HANDLE, DWORD_PTR); - typedef BOOL (WINAPI *SymGetLineFromAddr_t)(HANDLE, DWORD, - PDWORD, PIMAGEHLP_LINE); - typedef BOOL (WINAPI *SymGetLineFromAddr64_t)(HANDLE, DWORD64, - PDWORD, PIMAGEHLP_LINE64); - typedef BOOL (WINAPI *SymGetLineFromAddrW64_t)(HANDLE, DWORD64, - PDWORD, PIMAGEHLP_LINEW64); - typedef BOOL (WINAPI *SymSetContext_t)(HANDLE, PIMAGEHLP_STACK_FRAME, - PIMAGEHLP_CONTEXT); - typedef BOOL (WINAPI *SymEnumSymbols_t)(HANDLE, ULONG64, PCSTR, - PSYM_ENUMERATESYMBOLS_CALLBACK, - const PVOID); - typedef BOOL (WINAPI *SymEnumSymbolsW_t)(HANDLE, ULONG64, PCWSTR, - PSYM_ENUMERATESYMBOLS_CALLBACKW, - const PVOID); - typedef BOOL (WINAPI *SymGetTypeInfo_t)(HANDLE, DWORD64, ULONG, - IMAGEHLP_SYMBOL_TYPE_INFO, PVOID); - typedef BOOL (WINAPI *SymCleanup_t)(HANDLE); - typedef BOOL (WINAPI *EnumerateLoadedModules_t)(HANDLE, PENUMLOADED_MODULES_CALLBACK, PVOID); - typedef BOOL (WINAPI *EnumerateLoadedModules64_t)(HANDLE, PENUMLOADED_MODULES_CALLBACK64, PVOID); - typedef BOOL (WINAPI *EnumerateLoadedModulesW64_t)(HANDLE, PENUMLOADED_MODULES_CALLBACKW64, PVOID); - typedef BOOL (WINAPI *MiniDumpWriteDump_t)(HANDLE, DWORD, HANDLE, - MINIDUMP_TYPE, - CONST PMINIDUMP_EXCEPTION_INFORMATION, - CONST PMINIDUMP_USER_STREAM_INFORMATION, - CONST PMINIDUMP_CALLBACK_INFORMATION); - - // Higher level functions selecting the right debug help library function - // to call: for CallFoo(), it can be Foo(), Foo64(), FooW() or FooW64() - // depending on the build options and function availability. - // - // They also provide more convenient to use wx-specific API, e.g. work with - // wxString instead of char/wchar_t pointers and omit the arguments we - // don't need. - static BOOL CallSymInitialize(HANDLE, BOOL); - static BOOL CallEnumerateLoadedModules(HANDLE, wxPENUMLOADED_MODULES_CALLBACK, PVOID); - static BOOL CallSymFromAddr(HANDLE, DWORD64, - size_t* offset, wxString* name); - static BOOL CallSymGetLineFromAddr(HANDLE, DWORD64, - wxString* fileName, size_t* line); - static BOOL CallSymEnumSymbols(HANDLE hProcess, - ULONG64 baseOfDll, - wxPSYM_ENUMERATESYMBOLS_CALLBACK callback, - const PVOID callbackParam); - - // The macro called by wxDO_FOR_ALL_SYM_FUNCS() below takes 2 arguments: - // the name of the function in the program code, which never has "64" - // suffix, and the name of the function in the DLL which can have "64" - // suffix in some cases. These 2 helper macros call the macro with the - // correct arguments in both cases. - #define wxSYM_CALL(what, name) what(name, name) -#if defined(_M_AMD64) - #define wxSYM_CALL_64(what, name) what(name, name ## 64) - - // Also undo all the "helpful" definitions done by imagehlp.h that map 32 - // bit functions to 64 bit ones, we don't need this as we do it ourselves. - #undef StackWalk - #undef SymFunctionTableAccess - #undef SymGetModuleBase - #undef SymGetLineFromAddr - #undef EnumerateLoadedModules -#else - #define wxSYM_CALL_64(what, name) what(name, name) -#endif - - #define wxSYM_CALL_ALWAYS_W(what, name) what(name ## W, name ## W) - - #define wxSYM_CALL_ALTERNATIVES(what, name) \ - what(name, name); \ - what(name ## 64, name ## 64); \ - what(name ## W64, name ## W64) - - #define wxDO_FOR_ALL_SYM_FUNCS_REQUIRED_PUBLIC(what) \ - wxSYM_CALL_64(what, StackWalk); \ - wxSYM_CALL_64(what, SymFunctionTableAccess); \ - wxSYM_CALL_64(what, SymGetModuleBase); \ - \ - wxSYM_CALL(what, SymGetOptions); \ - wxSYM_CALL(what, SymSetOptions); \ - wxSYM_CALL(what, SymSetContext); \ - wxSYM_CALL(what, SymGetTypeInfo); \ - wxSYM_CALL(what, SymCleanup); \ - wxSYM_CALL(what, MiniDumpWriteDump) - - #define wxDO_FOR_ALL_SYM_FUNCS_REQUIRED_PRIVATE(what) \ - wxSYM_CALL(what, SymInitialize); \ - wxSYM_CALL(what, SymFromAddr); \ - wxSYM_CALL(what, SymEnumSymbols) - - #define wxDO_FOR_ALL_SYM_FUNCS_REQUIRED(what) \ - wxDO_FOR_ALL_SYM_FUNCS_REQUIRED_PRIVATE(what); \ - wxDO_FOR_ALL_SYM_FUNCS_REQUIRED_PUBLIC(what) - - // Alternation will work when the following functions are not found, - // therefore they are not included in REQUIRED version. - #define wxDO_FOR_ALL_SYM_FUNCS_OPTIONAL(what) \ - wxSYM_CALL_ALTERNATIVES(what, SymGetLineFromAddr); \ - wxSYM_CALL_ALTERNATIVES(what, EnumerateLoadedModules); \ - wxSYM_CALL_ALWAYS_W(what, SymInitialize); \ - wxSYM_CALL_ALWAYS_W(what, SymFromAddr); \ - wxSYM_CALL_ALWAYS_W(what, SymEnumSymbols) - - #define wxDO_FOR_ALL_SYM_FUNCS(what) \ - wxDO_FOR_ALL_SYM_FUNCS_REQUIRED(what); \ - wxDO_FOR_ALL_SYM_FUNCS_OPTIONAL(what) - - #define wxDECLARE_SYM_FUNCTION(func, name) static func ## _t func - - wxDO_FOR_ALL_SYM_FUNCS_REQUIRED_PUBLIC(wxDECLARE_SYM_FUNCTION); - -private: - wxDO_FOR_ALL_SYM_FUNCS_REQUIRED_PRIVATE(wxDECLARE_SYM_FUNCTION); - wxDO_FOR_ALL_SYM_FUNCS_OPTIONAL(wxDECLARE_SYM_FUNCTION); - -public: - - #undef wxDECLARE_SYM_FUNCTION - - // load all functions from DLL, return true if ok - static bool Init(); - - // return the string with the error message explaining why Init() failed - static const wxString& GetErrorMessage(); - - // log error returned by the given function to debug output - static void LogError(const wxChar *func); - - // return textual representation of the value of given symbol - static wxString DumpSymbol(wxPSYMBOL_INFO pSymInfo, void *pVariable); - - // return the name of the symbol with given type index - static wxString GetSymbolName(wxPSYMBOL_INFO pSymInfo); - -private: - // dereference the given symbol, i.e. return symbol which is not a - // pointer/reference any more - // - // if ppData != NULL, dereference the pointer as many times as we - // dereferenced the symbol - // - // return the tag of the dereferenced symbol - static SymbolTag DereferenceSymbol(wxPSYMBOL_INFO pSymInfo, void **ppData); - - static wxString DumpField(wxPSYMBOL_INFO pSymInfo, - void *pVariable, - unsigned level); - - static wxString DumpBaseType(BasicType bt, DWORD64 length, void *pVariable); - - static wxString DumpUDT(wxPSYMBOL_INFO pSymInfo, - void *pVariable, - unsigned level = 0); - - static bool BindDbgHelpFunctions(const wxDynamicLibrary& dllDbgHelp); - static bool DoInit(); -}; - -#endif // wxUSE_DBGHELP - -#endif // _WX_MSW_DEBUGHLPH_H_ - diff --git a/Externals/wxWidgets3/include/wx/msw/dialog.h b/Externals/wxWidgets3/include/wx/msw/dialog.h deleted file mode 100644 index 03f2ebad33..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/dialog.h +++ /dev/null @@ -1,95 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/dialog.h -// Purpose: wxDialog class -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DIALOG_H_ -#define _WX_DIALOG_H_ - -#include "wx/panel.h" - -extern WXDLLIMPEXP_DATA_CORE(const char) wxDialogNameStr[]; - -class WXDLLIMPEXP_FWD_CORE wxDialogModalData; - -// Dialog boxes -class WXDLLIMPEXP_CORE wxDialog : public wxDialogBase -{ -public: - wxDialog() { Init(); } - - // full ctor - wxDialog(wxWindow *parent, wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_DIALOG_STYLE, - const wxString& name = wxDialogNameStr) - { - Init(); - - (void)Create(parent, id, title, pos, size, style, name); - } - - bool Create(wxWindow *parent, wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_DIALOG_STYLE, - const wxString& name = wxDialogNameStr); - - virtual ~wxDialog(); - - // return true if we're showing the dialog modally - virtual bool IsModal() const { return m_modalData != NULL; } - - // show the dialog modally and return the value passed to EndModal() - virtual int ShowModal(); - - // may be called to terminate the dialog with the given return code - virtual void EndModal(int retCode); - - - // implementation only from now on - // ------------------------------- - - // override some base class virtuals - virtual bool Show(bool show = true); - virtual void SetWindowStyleFlag(long style); - - // Windows callbacks - WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam); - -protected: - // common part of all ctors - void Init(); - -private: - // these functions deal with the gripper window shown in the corner of - // resizable dialogs - void CreateGripper(); - void DestroyGripper(); - void ShowGripper(bool show); - void ResizeGripper(); - - // this function is used to adjust Z-order of new children relative to the - // gripper if we have one - void OnWindowCreate(wxWindowCreateEvent& event); - - // gripper window for a resizable dialog, NULL if we're not resizable - WXHWND m_hGripper; - - // this pointer is non-NULL only while the modal event loop is running - wxDialogModalData *m_modalData; - - wxDECLARE_DYNAMIC_CLASS(wxDialog); - wxDECLARE_NO_COPY_CLASS(wxDialog); -}; - -#endif - // _WX_DIALOG_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/dib.h b/Externals/wxWidgets3/include/wx/msw/dib.h deleted file mode 100644 index 6fb4c3eca3..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/dib.h +++ /dev/null @@ -1,278 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/dib.h -// Purpose: wxDIB class representing Win32 device independent bitmaps -// Author: Vadim Zeitlin -// Modified by: -// Created: 03.03.03 (replaces the old file with the same name) -// Copyright: (c) 1997-2003 wxWidgets team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_DIB_H_ -#define _WX_MSW_DIB_H_ - -class WXDLLIMPEXP_FWD_CORE wxPalette; - -#include "wx/msw/private.h" - -#if wxUSE_WXDIB - -#ifdef __WXMSW__ - #include "wx/bitmap.h" -#endif // __WXMSW__ - -// ---------------------------------------------------------------------------- -// wxDIB: represents a DIB section -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxDIB -{ -public: - // ctors and such - // -------------- - - // create an uninitialized DIB with the given width, height and depth (only - // 24 and 32 bpp DIBs are currently supported) - // - // after using this ctor, GetData() and GetHandle() may be used if IsOk() - // returns true - wxDIB(int width, int height, int depth) - { Init(); (void)Create(width, height, depth); } - -#ifdef __WXMSW__ - // create a DIB from the DDB - wxDIB(const wxBitmap& bmp) - { Init(); (void)Create(bmp); } -#endif // __WXMSW__ - - // create a DIB from the Windows DDB - wxDIB(HBITMAP hbmp) - { Init(); (void)Create(hbmp); } - - // load a DIB from file (any depth is supoprted here unlike above) - // - // as above, use IsOk() to see if the bitmap was loaded successfully - wxDIB(const wxString& filename) - { Init(); (void)Load(filename); } - - // same as the corresponding ctors but with return value - bool Create(int width, int height, int depth); -#ifdef __WXMSW__ - bool Create(const wxBitmap& bmp) { return Create(GetHbitmapOf(bmp)); } -#endif - bool Create(HBITMAP hbmp); - bool Load(const wxString& filename); - - // dtor is not virtual, this class is not meant to be used polymorphically - ~wxDIB(); - - - // operations - // ---------- - - // create a bitmap compatible with the given HDC (or screen by default) and - // return its handle, the caller is responsible for freeing it (using - // DeleteObject()) - HBITMAP CreateDDB(HDC hdc = 0) const; - - // get the handle from the DIB and reset it, i.e. this object won't destroy - // the DIB after this (but the caller should do it) - HBITMAP Detach() { HBITMAP hbmp = m_handle; m_handle = 0; return hbmp; } - -#if defined(__WXMSW__) && wxUSE_PALETTE - // create a palette for this DIB (always a trivial/default one for 24bpp) - wxPalette *CreatePalette() const; -#endif // defined(__WXMSW__) && wxUSE_PALETTE - - // save the DIB as a .BMP file to the file with the given name - bool Save(const wxString& filename); - - - // accessors - // --------- - - // return true if DIB was successfully created, false otherwise - bool IsOk() const { return m_handle != 0; } - - // get the bitmap size - wxSize GetSize() const { DoGetObject(); return wxSize(m_width, m_height); } - int GetWidth() const { DoGetObject(); return m_width; } - int GetHeight() const { DoGetObject(); return m_height; } - - // get the number of bits per pixel, or depth - int GetDepth() const { DoGetObject(); return m_depth; } - - // get the DIB handle - HBITMAP GetHandle() const { return m_handle; } - - // get raw pointer to bitmap bits, you should know what you do if you - // decide to use it - unsigned char *GetData() const - { DoGetObject(); return (unsigned char *)m_data; } - - - // HBITMAP conversion - // ------------------ - - // these functions are only used by wxWidgets internally right now, please - // don't use them directly if possible as they're subject to change - - // creates a DDB compatible with the given (or screen) DC from either - // a plain DIB or a DIB section (in which case the last parameter must be - // non NULL) - static HBITMAP ConvertToBitmap(const BITMAPINFO *pbi, - HDC hdc = 0, - void *bits = NULL); - - // create a plain DIB (not a DIB section) from a DDB, the caller is - // responsable for freeing it using ::GlobalFree() - static HGLOBAL ConvertFromBitmap(HBITMAP hbmp); - - // creates a DIB from the given DDB or calculates the space needed by it: - // if pbi is NULL, only the space is calculated, otherwise pbi is supposed - // to point at BITMAPINFO of the correct size which is filled by this - // function (this overload is needed for wxBitmapDataObject code in - // src/msw/ole/dataobj.cpp) - static size_t ConvertFromBitmap(BITMAPINFO *pbi, HBITMAP hbmp); - - - // wxImage conversion - // ------------------ - -#if wxUSE_IMAGE - // Possible formats for DIBs created by the functions below. - enum PixelFormat - { - PixelFormat_PreMultiplied = 0, - PixelFormat_NotPreMultiplied = 1 - }; - - // Create a DIB from the given image, the DIB will be either 24 or 32 (if - // the image has alpha channel) bpp. - // - // By default the DIB stores pixel data in pre-multiplied format so that it - // can be used with ::AlphaBlend() but it is also possible to disable - // pre-multiplication for the DIB to be usable with ImageList_Draw() which - // does pre-multiplication internally. - wxDIB(const wxImage& image, PixelFormat pf = PixelFormat_PreMultiplied) - { - Init(); - (void)Create(image, pf); - } - - // same as the above ctor but with the return code - bool Create(const wxImage& image, PixelFormat pf = PixelFormat_PreMultiplied); - - // create wxImage having the same data as this DIB - - // Possible options of conversion to wxImage - enum ConversionFlags - { - // Determine whether 32bpp DIB contains real alpha channel - // and return wxImage with or without alpha channel values. - Convert_AlphaAuto, - // Assume that 32bpp DIB contains valid alpha channel and always - // return wxImage with alpha channel values in this case. - Convert_AlphaAlwaysIf32bpp - }; - wxImage ConvertToImage(ConversionFlags flags = Convert_AlphaAuto) const; -#endif // wxUSE_IMAGE - - - // helper functions - // ---------------- - - // return the size of one line in a DIB with given width and depth: the - // point here is that as the scan lines need to be DWORD aligned so we may - // need to add some padding - static unsigned long GetLineSize(int width, int depth) - { - return ((width*depth + 31) & ~31) >> 3; - } - -private: - // common part of all ctors - void Init(); - - // free resources - void Free(); - - // initialize the contents from the provided DDB (Create() must have been - // already called) - bool CopyFromDDB(HBITMAP hbmp); - - - // the DIB section handle, 0 if invalid - HBITMAP m_handle; - - // NB: we could store only m_handle and not any of the other fields as - // we may always retrieve them from it using ::GetObject(), but we - // decide to still store them for efficiency concerns -- however if we - // don't have them from the very beginning (e.g. DIB constructed from a - // bitmap), we only retrieve them when necessary and so these fields - // should *never* be accessed directly, even from inside wxDIB code - - // function which must be called before accessing any members and which - // gets their values from m_handle, if not done yet - void DoGetObject() const; - - // pointer to DIB bits, may be NULL - void *m_data; - - // size and depth of the image - int m_width, - m_height, - m_depth; - - // in some cases we could be using a handle which we didn't create and in - // this case we shouldn't free it neither -- this flag tell us if this is - // the case - bool m_ownsHandle; - - - // DIBs can't be copied - wxDIB(const wxDIB&); - wxDIB& operator=(const wxDIB&); -}; - -// ---------------------------------------------------------------------------- -// inline functions implementation -// ---------------------------------------------------------------------------- - -inline -void wxDIB::Init() -{ - m_handle = 0; - m_ownsHandle = true; - - m_data = NULL; - - m_width = - m_height = - m_depth = 0; -} - -inline -void wxDIB::Free() -{ - if ( m_handle && m_ownsHandle ) - { - if ( !::DeleteObject(m_handle) ) - { - wxLogLastError(wxT("DeleteObject(hDIB)")); - } - - Init(); - } -} - -inline wxDIB::~wxDIB() -{ - Free(); -} - -#endif - // wxUSE_WXDIB - -#endif // _WX_MSW_DIB_H_ - diff --git a/Externals/wxWidgets3/include/wx/msw/dirdlg.h b/Externals/wxWidgets3/include/wx/msw/dirdlg.h deleted file mode 100644 index 365d97fea5..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/dirdlg.h +++ /dev/null @@ -1,39 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/dirdlg.h -// Purpose: wxDirDialog class -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DIRDLG_H_ -#define _WX_DIRDLG_H_ - -class WXDLLIMPEXP_CORE wxDirDialog : public wxDirDialogBase -{ -public: - wxDirDialog(wxWindow *parent, - const wxString& message = wxDirSelectorPromptStr, - const wxString& defaultPath = wxEmptyString, - long style = wxDD_DEFAULT_STYLE, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - const wxString& name = wxDirDialogNameStr); - - void SetPath(const wxString& path); - - virtual int ShowModal(); - -private: - // The real implementations of ShowModal(), used for Windows versions - // before and since Vista. - int ShowSHBrowseForFolder(WXHWND owner); - int ShowIFileDialog(WXHWND owner); - - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDirDialog); -}; - -#endif - // _WX_DIRDLG_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/dragimag.h b/Externals/wxWidgets3/include/wx/msw/dragimag.h deleted file mode 100644 index 28671c070a..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/dragimag.h +++ /dev/null @@ -1,244 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/dragimag.h -// Purpose: wxDragImage class: a kind of a cursor, that can cope -// with more sophisticated images -// Author: Julian Smart -// Modified by: -// Created: 08/04/99 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DRAGIMAG_H_ -#define _WX_DRAGIMAG_H_ - -#if wxUSE_DRAGIMAGE - -#include "wx/bitmap.h" -#include "wx/icon.h" -#include "wx/cursor.h" -#include "wx/treectrl.h" -#include "wx/listctrl.h" - -// If 1, use a simple wxCursor instead of ImageList_SetDragCursorImage -#define wxUSE_SIMPLER_DRAGIMAGE 0 - -/* - To use this class, create a wxDragImage when you start dragging, for example: - - void MyTreeCtrl::OnBeginDrag(wxTreeEvent& event) - { -#ifdef __WXMSW__ - ::UpdateWindow((HWND) GetHWND()); // We need to implement this in wxWidgets -#endif - - CaptureMouse(); - - m_dragImage = new wxDragImage(* this, itemId); - m_dragImage->BeginDrag(wxPoint(0, 0), this); - m_dragImage->Move(pt, this); - m_dragImage->Show(this); - ... - } - - In your OnMouseMove function, hide the image, do any display updating required, - then move and show the image again: - - void MyTreeCtrl::OnMouseMove(wxMouseEvent& event) - { - if (m_dragMode == MY_TREE_DRAG_NONE) - { - event.Skip(); - return; - } - - // Prevent screen corruption by hiding the image - if (m_dragImage) - m_dragImage->Hide(this); - - // Do some updating of the window, such as highlighting the drop target - ... - -#ifdef __WXMSW__ - if (updateWindow) - ::UpdateWindow((HWND) GetHWND()); -#endif - - // Move and show the image again - m_dragImage->Move(event.GetPosition(), this); - m_dragImage->Show(this); - } - - Eventually we end the drag and delete the drag image. - - void MyTreeCtrl::OnLeftUp(wxMouseEvent& event) - { - ... - - // End the drag and delete the drag image - if (m_dragImage) - { - m_dragImage->EndDrag(this); - delete m_dragImage; - m_dragImage = NULL; - } - ReleaseMouse(); - } -*/ - -/* - Notes for Unix version: - Can we simply use cursors instead, creating a cursor dynamically, setting it into the window - in BeginDrag, and restoring the old cursor in EndDrag? - For a really bog-standard implementation, we could simply use a normal dragging cursor - and ignore the image. -*/ - -/* - * wxDragImage - */ - -class WXDLLIMPEXP_CORE wxDragImage: public wxObject -{ -public: - - // Ctors & dtor - //////////////////////////////////////////////////////////////////////////// - - wxDragImage(); - wxDragImage(const wxBitmap& image, const wxCursor& cursor = wxNullCursor) - { - Init(); - - Create(image, cursor); - } - - wxDragImage(const wxIcon& image, const wxCursor& cursor = wxNullCursor) - { - Init(); - - Create(image, cursor); - } - - wxDragImage(const wxString& str, const wxCursor& cursor = wxNullCursor) - { - Init(); - - Create(str, cursor); - } - -#if wxUSE_TREECTRL - wxDragImage(const wxTreeCtrl& treeCtrl, wxTreeItemId& id) - { - Init(); - - Create(treeCtrl, id); - } -#endif - -#if wxUSE_LISTCTRL - wxDragImage(const wxListCtrl& listCtrl, long id) - { - Init(); - - Create(listCtrl, id); - } -#endif - - virtual ~wxDragImage(); - - // Attributes - //////////////////////////////////////////////////////////////////////////// - - // Operations - //////////////////////////////////////////////////////////////////////////// - - // Create a drag image from a bitmap and optional cursor - bool Create(const wxBitmap& image, const wxCursor& cursor = wxNullCursor); - - // Create a drag image from an icon and optional cursor - bool Create(const wxIcon& image, const wxCursor& cursor = wxNullCursor); - - // Create a drag image from a string and optional cursor - bool Create(const wxString& str, const wxCursor& cursor = wxNullCursor); - -#if wxUSE_TREECTRL - // Create a drag image for the given tree control item - bool Create(const wxTreeCtrl& treeCtrl, wxTreeItemId& id); -#endif - -#if wxUSE_LISTCTRL - // Create a drag image for the given list control item - bool Create(const wxListCtrl& listCtrl, long id); -#endif - - // Begin drag. hotspot is the location of the drag position relative to the upper-left - // corner of the image. - bool BeginDrag(const wxPoint& hotspot, wxWindow* window, bool fullScreen = false, wxRect* rect = NULL); - - // Begin drag. hotspot is the location of the drag position relative to the upper-left - // corner of the image. This is full screen only. fullScreenRect gives the - // position of the window on the screen, to restrict the drag to. - bool BeginDrag(const wxPoint& hotspot, wxWindow* window, wxWindow* fullScreenRect); - - // End drag - bool EndDrag(); - - // Move the image: call from OnMouseMove. Pt is in window client coordinates if window - // is non-NULL, or in screen coordinates if NULL. - bool Move(const wxPoint& pt); - - // Show the image - bool Show(); - - // Hide the image - bool Hide(); - - // Implementation - //////////////////////////////////////////////////////////////////////////// - - // Initialize variables - void Init(); - - // Returns the native image list handle - WXHIMAGELIST GetHIMAGELIST() const { return m_hImageList; } - -#if !wxUSE_SIMPLER_DRAGIMAGE - // Returns the native image list handle for the cursor - WXHIMAGELIST GetCursorHIMAGELIST() const { return m_hCursorImageList; } -#endif - - // don't use in new code, use versions without hot spot parameter -#if WXWIN_COMPATIBILITY_2_8 - wxDEPRECATED_CONSTRUCTOR( wxDragImage(const wxBitmap& image, const wxCursor& cursor, const wxPoint& cursorHotspot) ); - wxDEPRECATED_CONSTRUCTOR( wxDragImage(const wxString& str, const wxCursor& cursor, const wxPoint& cursorHotspot) ); - wxDEPRECATED_CONSTRUCTOR( wxDragImage(const wxIcon& image, const wxCursor& cursor, const wxPoint& cursorHotspot) ); - wxDEPRECATED( bool Create(const wxBitmap& image, const wxCursor& cursor, const wxPoint& cursorHotspot) ); - wxDEPRECATED( bool Create(const wxIcon& image, const wxCursor& cursor, const wxPoint& cursorHotspot) ); - wxDEPRECATED( bool Create(const wxString& str, const wxCursor& cursor, const wxPoint& cursorHotspot) ); -#endif // WXWIN_COMPATIBILITY_2_8 - -protected: - WXHIMAGELIST m_hImageList; - -#if wxUSE_SIMPLER_DRAGIMAGE - wxCursor m_oldCursor; -#else - WXHIMAGELIST m_hCursorImageList; -#endif - - wxCursor m_cursor; -// wxPoint m_cursorHotspot; // Obsolete - wxPoint m_position; - wxWindow* m_window; - wxRect m_boundingRect; - bool m_fullScreen; - -private: - wxDECLARE_DYNAMIC_CLASS(wxDragImage); - wxDECLARE_NO_COPY_CLASS(wxDragImage); -}; - -#endif // wxUSE_DRAGIMAGE -#endif - // _WX_DRAGIMAG_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/drive.ico b/Externals/wxWidgets3/include/wx/msw/drive.ico deleted file mode 100644 index cac90115fe..0000000000 Binary files a/Externals/wxWidgets3/include/wx/msw/drive.ico and /dev/null differ diff --git a/Externals/wxWidgets3/include/wx/msw/enhmeta.h b/Externals/wxWidgets3/include/wx/msw/enhmeta.h deleted file mode 100644 index b3ae3bb4c6..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/enhmeta.h +++ /dev/null @@ -1,195 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/enhmeta.h -// Purpose: wxEnhMetaFile class for Win32 -// Author: Vadim Zeitlin -// Modified by: -// Created: 13.01.00 -// Copyright: (c) 2000 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_ENHMETA_H_ -#define _WX_MSW_ENHMETA_H_ - -#include "wx/dc.h" -#include "wx/gdiobj.h" - -#if wxUSE_DRAG_AND_DROP - #include "wx/dataobj.h" -#endif - -// ---------------------------------------------------------------------------- -// wxEnhMetaFile: encapsulation of Win32 HENHMETAFILE -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxEnhMetaFile : public wxGDIObject -{ -public: - wxEnhMetaFile(const wxString& file = wxEmptyString) : m_filename(file) - { Init(); } - wxEnhMetaFile(const wxEnhMetaFile& metafile) : wxGDIObject() - { Init(); Assign(metafile); } - wxEnhMetaFile& operator=(const wxEnhMetaFile& metafile) - { Free(); Assign(metafile); return *this; } - - virtual ~wxEnhMetaFile() - { Free(); } - - // display the picture stored in the metafile on the given DC - bool Play(wxDC *dc, wxRect *rectBound = NULL); - - // accessors - virtual bool IsOk() const { return m_hMF != 0; } - - wxSize GetSize() const; - int GetWidth() const { return GetSize().x; } - int GetHeight() const { return GetSize().y; } - - const wxString& GetFileName() const { return m_filename; } - - // copy the metafile to the clipboard: the width and height parameters are - // for backwards compatibility (with wxMetaFile) only, they are ignored by - // this method - bool SetClipboard(int width = 0, int height = 0); - - // Detach the HENHMETAFILE from this object, i.e. don't delete the handle - // in the dtor -- the caller is now responsible for doing this, e.g. using - // Free() method below. - WXHANDLE Detach() { WXHANDLE h = m_hMF; m_hMF = 0; return h; } - - // Destroy the given HENHMETAFILE object. - static void Free(WXHANDLE handle); - - // implementation - WXHANDLE GetHENHMETAFILE() const { return m_hMF; } - void SetHENHMETAFILE(WXHANDLE hMF) { Free(); m_hMF = hMF; } - -protected: - void Init(); - void Free() { Free(m_hMF); } - void Assign(const wxEnhMetaFile& mf); - - // we don't use these functions (but probably should) but have to implement - // them as they're pure virtual in the base class - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; - -private: - wxString m_filename; - WXHANDLE m_hMF; - - wxDECLARE_DYNAMIC_CLASS(wxEnhMetaFile); -}; - -// ---------------------------------------------------------------------------- -// wxEnhMetaFileDC: allows to create a wxEnhMetaFile -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxEnhMetaFileDC : public wxDC -{ -public: - // the ctor parameters specify the filename (empty for memory metafiles), - // the metafile picture size and the optional description/comment - wxEnhMetaFileDC(const wxString& filename = wxEmptyString, - int width = 0, int height = 0, - const wxString& description = wxEmptyString); - - // as above, but takes reference DC as first argument to take resolution, - // size, font metrics etc. from - wxEXPLICIT - wxEnhMetaFileDC(const wxDC& referenceDC, - const wxString& filename = wxEmptyString, - int width = 0, int height = 0, - const wxString& description = wxEmptyString); - - // obtain a pointer to the new metafile (caller should delete it) - wxEnhMetaFile *Close(); - -private: - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxEnhMetaFileDC); -}; - -#if wxUSE_DRAG_AND_DROP - -// ---------------------------------------------------------------------------- -// wxEnhMetaFileDataObject is a specialization of wxDataObject for enh metafile -// ---------------------------------------------------------------------------- - -// notice that we want to support both CF_METAFILEPICT and CF_ENHMETAFILE and -// so we derive from wxDataObject and not from wxDataObjectSimple -class WXDLLIMPEXP_CORE wxEnhMetaFileDataObject : public wxDataObject -{ -public: - // ctors - wxEnhMetaFileDataObject() { } - wxEnhMetaFileDataObject(const wxEnhMetaFile& metafile) - : m_metafile(metafile) { } - - // virtual functions which you may override if you want to provide data on - // demand only - otherwise, the trivial default versions will be used - virtual void SetMetafile(const wxEnhMetaFile& metafile) - { m_metafile = metafile; } - virtual wxEnhMetaFile GetMetafile() const - { return m_metafile; } - - // implement base class pure virtuals - virtual wxDataFormat GetPreferredFormat(Direction dir) const; - virtual size_t GetFormatCount(Direction dir) const; - virtual void GetAllFormats(wxDataFormat *formats, Direction dir) const; - virtual size_t GetDataSize(const wxDataFormat& format) const; - virtual bool GetDataHere(const wxDataFormat& format, void *buf) const; - virtual bool SetData(const wxDataFormat& format, size_t len, - const void *buf); - -protected: - wxEnhMetaFile m_metafile; - - wxDECLARE_NO_COPY_CLASS(wxEnhMetaFileDataObject); -}; - - -// ---------------------------------------------------------------------------- -// wxEnhMetaFileSimpleDataObject does derive from wxDataObjectSimple which -// makes it more convenient to use (it can be used with wxDataObjectComposite) -// at the price of not supoprting any more CF_METAFILEPICT but only -// CF_ENHMETAFILE -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxEnhMetaFileSimpleDataObject : public wxDataObjectSimple -{ -public: - // ctors - wxEnhMetaFileSimpleDataObject() : wxDataObjectSimple(wxDF_ENHMETAFILE) { } - wxEnhMetaFileSimpleDataObject(const wxEnhMetaFile& metafile) - : wxDataObjectSimple(wxDF_ENHMETAFILE), m_metafile(metafile) { } - - // virtual functions which you may override if you want to provide data on - // demand only - otherwise, the trivial default versions will be used - virtual void SetEnhMetafile(const wxEnhMetaFile& metafile) - { m_metafile = metafile; } - virtual wxEnhMetaFile GetEnhMetafile() const - { return m_metafile; } - - // implement base class pure virtuals - virtual size_t GetDataSize() const; - virtual bool GetDataHere(void *buf) const; - virtual bool SetData(size_t len, const void *buf); - - virtual size_t GetDataSize(const wxDataFormat& WXUNUSED(format)) const - { return GetDataSize(); } - virtual bool GetDataHere(const wxDataFormat& WXUNUSED(format), - void *buf) const - { return GetDataHere(buf); } - virtual bool SetData(const wxDataFormat& WXUNUSED(format), - size_t len, const void *buf) - { return SetData(len, buf); } - -protected: - wxEnhMetaFile m_metafile; - - wxDECLARE_NO_COPY_CLASS(wxEnhMetaFileSimpleDataObject); -}; - -#endif // wxUSE_DRAG_AND_DROP - -#endif // _WX_MSW_ENHMETA_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/evtloop.h b/Externals/wxWidgets3/include/wx/msw/evtloop.h deleted file mode 100644 index be8f597726..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/evtloop.h +++ /dev/null @@ -1,73 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/evtloop.h -// Purpose: wxEventLoop class for wxMSW port -// Author: Vadim Zeitlin -// Modified by: -// Created: 2004-07-31 -// Copyright: (c) 2003-2004 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_EVTLOOP_H_ -#define _WX_MSW_EVTLOOP_H_ - -#include "wx/dynarray.h" -#include "wx/msw/wrapwin.h" -#include "wx/window.h" -#include "wx/msw/evtloopconsole.h" // for wxMSWEventLoopBase - -// ---------------------------------------------------------------------------- -// wxEventLoop -// ---------------------------------------------------------------------------- - -WX_DECLARE_EXPORTED_OBJARRAY(MSG, wxMSGArray); - -class WXDLLIMPEXP_CORE wxGUIEventLoop : public wxMSWEventLoopBase -{ -public: - wxGUIEventLoop() { } - - // process a single message: calls PreProcessMessage() before dispatching - // it - virtual void ProcessMessage(WXMSG *msg); - - // preprocess a message, return true if processed (i.e. no further - // dispatching required) - virtual bool PreProcessMessage(WXMSG *msg); - - // set the critical window: this is the window such that all the events - // except those to this window (and its children) stop to be processed - // (typical examples: assert or crash report dialog) - // - // calling this function with NULL argument restores the normal event - // handling - static void SetCriticalWindow(wxWindowMSW *win) { ms_winCritical = win; } - - // return true if there is no critical window or if this window is [a child - // of] the critical one - static bool AllowProcessing(wxWindowMSW *win) - { - return !ms_winCritical || IsChildOfCriticalWindow(win); - } - - // override/implement base class virtuals - virtual bool Dispatch(); - virtual int DispatchTimeout(unsigned long timeout); - -protected: - virtual void OnNextIteration(); - virtual void DoYieldFor(long eventsToProcess); - -private: - // check if the given window is a child of ms_winCritical (which must be - // non NULL) - static bool IsChildOfCriticalWindow(wxWindowMSW *win); - - // array of messages used for temporary storage by YieldFor() - wxMSGArray m_arrMSG; - - // critical window or NULL - static wxWindowMSW *ms_winCritical; -}; - -#endif // _WX_MSW_EVTLOOP_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/evtloopconsole.h b/Externals/wxWidgets3/include/wx/msw/evtloopconsole.h deleted file mode 100644 index a4eb6d54ac..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/evtloopconsole.h +++ /dev/null @@ -1,68 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/evtloopconsole.h -// Purpose: wxConsoleEventLoop class for Windows -// Author: Vadim Zeitlin -// Modified by: -// Created: 2004-07-31 -// Copyright: (c) 2003-2004 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_EVTLOOPCONSOLE_H_ -#define _WX_MSW_EVTLOOPCONSOLE_H_ - -class WXDLLIMPEXP_BASE wxMSWEventLoopBase : public wxEventLoopManual -{ -public: - wxMSWEventLoopBase(); - virtual ~wxMSWEventLoopBase(); - - // implement base class pure virtuals - virtual bool Pending() const; - virtual void WakeUp(); - -#if wxUSE_THREADS - // MSW-specific method to wait for the termination of the specified (by its - // native handle) thread or any input message arriving (in GUI case). - // - // Return value is WAIT_OBJECT_0 if the thread terminated, WAIT_OBJECT_0+1 - // if a message arrived with anything else indicating an error. - WXDWORD MSWWaitForThread(WXHANDLE hThread); -#endif // wxUSE_THREADS - -protected: - // get the next message from queue and return true or return false if we - // got WM_QUIT or an error occurred - bool GetNextMessage(WXMSG *msg); - - // same as above but with a timeout and return value can be -1 meaning that - // time out expired in addition to true/false - int GetNextMessageTimeout(WXMSG *msg, unsigned long timeout); - -private: - // An auto-reset Win32 event which is signalled when we need to wake up the - // main thread waiting in GetNextMessage[Timeout](). - WXHANDLE m_heventWake; -}; - -#if wxUSE_CONSOLE_EVENTLOOP - -class WXDLLIMPEXP_BASE wxConsoleEventLoop : public wxMSWEventLoopBase -{ -public: - wxConsoleEventLoop() { } - - // override/implement base class virtuals - virtual bool Dispatch(); - virtual int DispatchTimeout(unsigned long timeout); - - // Windows-specific function to process a single message - virtual void ProcessMessage(WXMSG *msg); - -protected: - virtual void DoYieldFor(long eventsToProcess); -}; - -#endif // wxUSE_CONSOLE_EVENTLOOP - -#endif // _WX_MSW_EVTLOOPCONSOLE_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/fdrepdlg.h b/Externals/wxWidgets3/include/wx/msw/fdrepdlg.h deleted file mode 100644 index ac7ba48858..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/fdrepdlg.h +++ /dev/null @@ -1,61 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/fdrepdlg.h -// Purpose: wxFindReplaceDialog class -// Author: Markus Greither -// Modified by: 31.07.01: VZ: integrated into wxWidgets -// Created: 23/03/2001 -// Copyright: (c) Markus Greither -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_FDREPDLG_H_ -#define _WX_MSW_FDREPDLG_H_ - -// ---------------------------------------------------------------------------- -// wxFindReplaceDialog: dialog for searching / replacing text -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxFindReplaceDialog : public wxFindReplaceDialogBase -{ -public: - // ctors and such - wxFindReplaceDialog() { Init(); } - wxFindReplaceDialog(wxWindow *parent, - wxFindReplaceData *data, - const wxString &title, - int style = 0); - - bool Create(wxWindow *parent, - wxFindReplaceData *data, - const wxString &title, - int style = 0); - - virtual ~wxFindReplaceDialog(); - - // implementation only from now on - - wxFindReplaceDialogImpl *GetImpl() const { return m_impl; } - - // override some base class virtuals - virtual bool Show(bool show = true); - virtual void SetTitle( const wxString& title); - virtual wxString GetTitle() const; - -protected: - virtual void DoGetSize(int *width, int *height) const; - virtual void DoGetClientSize(int *width, int *height) const; - virtual void DoSetSize(int x, int y, - int width, int height, - int sizeFlags = wxSIZE_AUTO); - - void Init(); - - wxString m_title; - - wxFindReplaceDialogImpl *m_impl; - - wxDECLARE_DYNAMIC_CLASS(wxFindReplaceDialog); - wxDECLARE_NO_COPY_CLASS(wxFindReplaceDialog); -}; - -#endif // _WX_MSW_FDREPDLG_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/file1.ico b/Externals/wxWidgets3/include/wx/msw/file1.ico deleted file mode 100644 index f0a80d32b4..0000000000 Binary files a/Externals/wxWidgets3/include/wx/msw/file1.ico and /dev/null differ diff --git a/Externals/wxWidgets3/include/wx/msw/filedlg.h b/Externals/wxWidgets3/include/wx/msw/filedlg.h deleted file mode 100644 index c3259f7f75..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/filedlg.h +++ /dev/null @@ -1,67 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/filedlg.h -// Purpose: wxFileDialog class -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_FILEDLG_H_ -#define _WX_FILEDLG_H_ - -//------------------------------------------------------------------------- -// wxFileDialog -//------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxFileDialog: public wxFileDialogBase -{ -public: - wxFileDialog(wxWindow *parent, - const wxString& message = wxFileSelectorPromptStr, - const wxString& defaultDir = wxEmptyString, - const wxString& defaultFile = wxEmptyString, - const wxString& wildCard = wxFileSelectorDefaultWildcardStr, - long style = wxFD_DEFAULT_STYLE, - const wxPoint& pos = wxDefaultPosition, - const wxSize& sz = wxDefaultSize, - const wxString& name = wxFileDialogNameStr); - - virtual void GetPaths(wxArrayString& paths) const; - virtual void GetFilenames(wxArrayString& files) const; - virtual bool SupportsExtraControl() const { return true; } - void MSWOnInitDialogHook(WXHWND hwnd); - - virtual int ShowModal(); - - // wxMSW-specific implementation from now on - // ----------------------------------------- - - // called from the hook procedure on CDN_INITDONE reception - virtual void MSWOnInitDone(WXHWND hDlg); - - // called from the hook procedure on CDN_SELCHANGE. - void MSWOnSelChange(WXHWND hDlg); - -protected: - - virtual void DoMoveWindow(int x, int y, int width, int height); - virtual void DoCentre(int dir); - virtual void DoGetSize( int *width, int *height ) const; - virtual void DoGetPosition( int *x, int *y ) const; - -private: - wxArrayString m_fileNames; - - // remember if our SetPosition() or Centre() (which requires special - // treatment) was called - bool m_bMovedWindow; - int m_centreDir; // nothing to do if 0 - - wxDECLARE_DYNAMIC_CLASS(wxFileDialog); - wxDECLARE_NO_COPY_CLASS(wxFileDialog); -}; - -#endif // _WX_FILEDLG_H_ - diff --git a/Externals/wxWidgets3/include/wx/msw/floppy.ico b/Externals/wxWidgets3/include/wx/msw/floppy.ico deleted file mode 100644 index 4453a7512c..0000000000 Binary files a/Externals/wxWidgets3/include/wx/msw/floppy.ico and /dev/null differ diff --git a/Externals/wxWidgets3/include/wx/msw/folder1.ico b/Externals/wxWidgets3/include/wx/msw/folder1.ico deleted file mode 100644 index 2994019d4c..0000000000 Binary files a/Externals/wxWidgets3/include/wx/msw/folder1.ico and /dev/null differ diff --git a/Externals/wxWidgets3/include/wx/msw/folder2.ico b/Externals/wxWidgets3/include/wx/msw/folder2.ico deleted file mode 100644 index 9a595b9fea..0000000000 Binary files a/Externals/wxWidgets3/include/wx/msw/folder2.ico and /dev/null differ diff --git a/Externals/wxWidgets3/include/wx/msw/font.h b/Externals/wxWidgets3/include/wx/msw/font.h deleted file mode 100644 index e46a62ca6e..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/font.h +++ /dev/null @@ -1,172 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/font.h -// Purpose: wxFont class -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_FONT_H_ -#define _WX_FONT_H_ - -#include "wx/gdicmn.h" - -// ---------------------------------------------------------------------------- -// wxFont -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxFont : public wxFontBase -{ -public: - // ctors and such - wxFont() { } - - wxFont(const wxFontInfo& info); - - wxFont(int size, - wxFontFamily family, - wxFontStyle style, - wxFontWeight weight, - bool underlined = false, - const wxString& face = wxEmptyString, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT) - { - Create(size, family, style, weight, underlined, face, encoding); - } - - bool Create(int size, - wxFontFamily family, - wxFontStyle style, - wxFontWeight weight, - bool underlined = false, - const wxString& face = wxEmptyString, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT) - { - return DoCreate(size, wxDefaultSize, false, family, style, - weight, underlined, face, encoding); - } - - wxFont(const wxSize& pixelSize, - wxFontFamily family, - wxFontStyle style, - wxFontWeight weight, - bool underlined = false, - const wxString& face = wxEmptyString, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT) - { - (void)Create(pixelSize, family, style, weight, - underlined, face, encoding); - } - - wxFont(const wxNativeFontInfo& info, WXHFONT hFont = 0) - { - Create(info, hFont); - } - - wxFont(const wxString& fontDesc); - - - bool Create(const wxSize& pixelSize, - wxFontFamily family, - wxFontStyle style, - wxFontWeight weight, - bool underlined = false, - const wxString& face = wxEmptyString, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT) - { - return DoCreate(-1, pixelSize, true, family, style, - weight, underlined, face, encoding); - } - - bool Create(const wxNativeFontInfo& info, WXHFONT hFont = 0); - - virtual ~wxFont(); - - // implement base class pure virtuals - virtual int GetPointSize() const; - virtual wxSize GetPixelSize() const; - virtual bool IsUsingSizeInPixels() const; - virtual wxFontStyle GetStyle() const; - virtual wxFontWeight GetWeight() const; - virtual bool GetUnderlined() const; - virtual bool GetStrikethrough() const; - virtual wxString GetFaceName() const; - virtual wxFontEncoding GetEncoding() const; - virtual const wxNativeFontInfo *GetNativeFontInfo() const; - - virtual void SetPointSize(int pointSize); - virtual void SetPixelSize(const wxSize& pixelSize); - virtual void SetFamily(wxFontFamily family); - virtual void SetStyle(wxFontStyle style); - virtual void SetWeight(wxFontWeight weight); - virtual bool SetFaceName(const wxString& faceName); - virtual void SetUnderlined(bool underlined); - virtual void SetStrikethrough(bool strikethrough); - virtual void SetEncoding(wxFontEncoding encoding); - - wxDECLARE_COMMON_FONT_METHODS(); - - virtual bool IsFixedWidth() const; - - wxDEPRECATED_MSG("use wxFONT{FAMILY,STYLE,WEIGHT}_XXX constants ie: wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD") - wxFont(int size, - int family, - int style, - int weight, - bool underlined = false, - const wxString& face = wxEmptyString, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT) - { - (void)Create(size, (wxFontFamily)family, (wxFontStyle)style, (wxFontWeight)weight, underlined, face, encoding); - } - - wxDEPRECATED_MSG("use wxFONT{FAMILY,STYLE,WEIGHT}_XXX constants ie: wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD") - wxFont(const wxSize& pixelSize, - int family, - int style, - int weight, - bool underlined = false, - const wxString& face = wxEmptyString, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT) - { - (void)Create(pixelSize, (wxFontFamily)family, (wxFontStyle)style, (wxFontWeight)weight, - underlined, face, encoding); - } - - // implementation only from now on - // ------------------------------- - - virtual bool IsFree() const; - virtual bool RealizeResource(); - virtual WXHANDLE GetResourceHandle() const; - virtual bool FreeResource(bool force = false); - - // for consistency with other wxMSW classes - WXHFONT GetHFONT() const; - -protected: - // real font creation function, used in all cases - bool DoCreate(int size, - const wxSize& pixelSize, - bool sizeUsingPixels, - wxFontFamily family, - wxFontStyle style, - wxFontWeight weight, - bool underlined = false, - const wxString& face = wxEmptyString, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT); - - virtual void DoSetNativeFontInfo(const wxNativeFontInfo& info); - virtual wxFontFamily DoGetFamily() const; - - // implement wxObject virtuals which are used by AllocExclusive() - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; - -private: - wxDECLARE_DYNAMIC_CLASS(wxFont); -}; - -#endif // _WX_FONT_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/fontdlg.h b/Externals/wxWidgets3/include/wx/msw/fontdlg.h deleted file mode 100644 index 9e5d1f66c7..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/fontdlg.h +++ /dev/null @@ -1,34 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/fontdlg.h -// Purpose: wxFontDialog class -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_FONTDLG_H_ -#define _WX_MSW_FONTDLG_H_ - -// ---------------------------------------------------------------------------- -// wxFontDialog -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxFontDialog : public wxFontDialogBase -{ -public: - wxFontDialog() : wxFontDialogBase() { /* must be Create()d later */ } - wxFontDialog(wxWindow *parent) - : wxFontDialogBase(parent) { Create(parent); } - wxFontDialog(wxWindow *parent, const wxFontData& data) - : wxFontDialogBase(parent, data) { Create(parent, data); } - - virtual int ShowModal(); - -protected: - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxFontDialog); -}; - -#endif - // _WX_MSW_FONTDLG_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/frame.h b/Externals/wxWidgets3/include/wx/msw/frame.h deleted file mode 100644 index 6cc4ae1279..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/frame.h +++ /dev/null @@ -1,191 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/frame.h -// Purpose: wxFrame class -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_FRAME_H_ -#define _WX_FRAME_H_ - -#if wxUSE_TASKBARBUTTON -class WXDLLIMPEXP_FWD_CORE wxTaskBarButton; -#endif - -class WXDLLIMPEXP_CORE wxFrame : public wxFrameBase -{ -public: - // construction - wxFrame() { Init(); } - wxFrame(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr) - { - Init(); - - Create(parent, id, title, pos, size, style, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr); - virtual ~wxFrame(); - - // implement base class pure virtuals - virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL); - - // implementation only from now on - // ------------------------------- - - // event handlers - void OnSysColourChanged(wxSysColourChangedEvent& event); - - // Toolbar -#if wxUSE_TOOLBAR - virtual wxToolBar* CreateToolBar(long style = -1, - wxWindowID id = wxID_ANY, - const wxString& name = wxToolBarNameStr); -#endif // wxUSE_TOOLBAR - - // Status bar -#if wxUSE_STATUSBAR - virtual wxStatusBar* OnCreateStatusBar(int number = 1, - long style = wxSTB_DEFAULT_STYLE, - wxWindowID id = 0, - const wxString& name = wxStatusLineNameStr); - - // Hint to tell framework which status bar to use: the default is to use - // native one for the platforms which support it (Win32), the generic one - // otherwise - - // TODO: should this go into a wxFrameworkSettings class perhaps? - static void UseNativeStatusBar(bool useNative) - { m_useNativeStatusBar = useNative; } - static bool UsesNativeStatusBar() - { return m_useNativeStatusBar; } -#endif // wxUSE_STATUSBAR - - // event handlers - bool HandleSize(int x, int y, WXUINT flag); - bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control); - - // tooltip management -#if wxUSE_TOOLTIPS - WXHWND GetToolTipCtrl() const { return m_hwndToolTip; } - void SetToolTipCtrl(WXHWND hwndTT) { m_hwndToolTip = hwndTT; } -#endif // tooltips - - // override the base class function to handle iconized/maximized frames - virtual void SendSizeEvent(int flags = 0); - - virtual wxPoint GetClientAreaOrigin() const; - - // override base class version to add menu bar accel processing - virtual bool MSWTranslateMessage(WXMSG *msg) - { - return MSWDoTranslateMessage(this, msg); - } - - // window proc for the frames - virtual WXLRESULT MSWWindowProc(WXUINT message, - WXWPARAM wParam, - WXLPARAM lParam); - -#if wxUSE_MENUS - // get the currently active menu: this is the same as the frame menu for - // normal frames but is overridden by wxMDIParentFrame - virtual WXHMENU MSWGetActiveMenu() const { return m_hMenu; } - - virtual bool HandleMenuSelect(WXWORD nItem, WXWORD nFlags, WXHMENU hMenu); - virtual bool DoSendMenuOpenCloseEvent(wxEventType evtType, wxMenu* menu); - - // Look up the menu in the menu bar. - virtual wxMenu* MSWFindMenuFromHMENU(WXHMENU hMenu); -#endif // wxUSE_MENUS - -#if wxUSE_TASKBARBUTTON - // Return the taskbar button of the window. - // - // The pointer returned by this method belongs to the window and will be - // deleted when the window itself is, do not delete it yourself. May return - // NULL if the initialization of taskbar button failed. - wxTaskBarButton* MSWGetTaskBarButton(); -#endif // wxUSE_TASKBARBUTTON - -protected: - // common part of all ctors - void Init(); - - // override base class virtuals - virtual void DoGetClientSize(int *width, int *height) const; - virtual void DoSetClientSize(int width, int height); - -#if wxUSE_MENUS_NATIVE - // perform MSW-specific action when menubar is changed - virtual void AttachMenuBar(wxMenuBar *menubar); - - // a plug in for MDI frame classes which need to do something special when - // the menubar is set - virtual void InternalSetMenuBar(); -#endif // wxUSE_MENUS_NATIVE - - // propagate our state change to all child frames - void IconizeChildFrames(bool bIconize); - - // the real implementation of MSWTranslateMessage(), also used by - // wxMDIChildFrame - bool MSWDoTranslateMessage(wxFrame *frame, WXMSG *msg); - - virtual bool IsMDIChild() const { return false; } - - // get default (wxWidgets) icon for the frame - virtual WXHICON GetDefaultIcon() const; - -#if wxUSE_TOOLBAR - virtual void PositionToolBar(); -#endif // wxUSE_TOOLBAR - -#if wxUSE_STATUSBAR - virtual void PositionStatusBar(); - - static bool m_useNativeStatusBar; -#endif // wxUSE_STATUSBAR - -#if wxUSE_MENUS - // frame menu, NULL if none - WXHMENU m_hMenu; - - // The number of currently opened menus: 0 initially, 1 when a top level - // menu is opened, 2 when its submenu is opened and so on. - int m_menuDepth; -#endif // wxUSE_MENUS - -private: -#if wxUSE_TOOLTIPS - WXHWND m_hwndToolTip; -#endif // tooltips - - // used by IconizeChildFrames(), see comments there - bool m_wasMinimized; - -#if wxUSE_TASKBARBUTTON - wxTaskBarButton* m_taskBarButton; -#endif - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxFrame); -}; - -#endif - // _WX_FRAME_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/fswatcher.h b/Externals/wxWidgets3/include/wx/msw/fswatcher.h deleted file mode 100644 index b73ee66188..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/fswatcher.h +++ /dev/null @@ -1,37 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/fswatcher.h -// Purpose: wxMSWFileSystemWatcher -// Author: Bartosz Bekier -// Created: 2009-05-26 -// Copyright: (c) 2009 Bartosz Bekier -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_FSWATCHER_MSW_H_ -#define _WX_FSWATCHER_MSW_H_ - -#include "wx/defs.h" - -#if wxUSE_FSWATCHER - -class WXDLLIMPEXP_BASE wxMSWFileSystemWatcher : public wxFileSystemWatcherBase -{ -public: - wxMSWFileSystemWatcher(); - - wxMSWFileSystemWatcher(const wxFileName& path, - int events = wxFSW_EVENT_ALL); - - // Override the base class function to provide a much more efficient - // implementation for it using the platform native support for watching the - // entire directory trees. - virtual bool AddTree(const wxFileName& path, int events = wxFSW_EVENT_ALL, - const wxString& filter = wxEmptyString); - -protected: - bool Init(); -}; - -#endif // wxUSE_FSWATCHER - -#endif /* _WX_FSWATCHER_MSW_H_ */ diff --git a/Externals/wxWidgets3/include/wx/msw/gauge.h b/Externals/wxWidgets3/include/wx/msw/gauge.h deleted file mode 100644 index 4f54f34e08..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/gauge.h +++ /dev/null @@ -1,79 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/gauge.h -// Purpose: wxGauge implementation for MSW -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_GAUGE_H_ -#define _WX_MSW_GAUGE_H_ - -#if wxUSE_GAUGE - -extern WXDLLIMPEXP_DATA_CORE(const char) wxGaugeNameStr[]; - -// Group box -class WXDLLIMPEXP_CORE wxGauge : public wxGaugeBase -{ -public: - wxGauge() { } - - wxGauge(wxWindow *parent, - wxWindowID id, - int range, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxGA_HORIZONTAL, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxGaugeNameStr) - { - (void)Create(parent, id, range, pos, size, style, validator, name); - } - - virtual ~wxGauge(); - - bool Create(wxWindow *parent, - wxWindowID id, - int range, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxGA_HORIZONTAL, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxGaugeNameStr); - - // set gauge range/value - virtual void SetRange(int range); - virtual void SetValue(int pos); - - // overridden base class virtuals - virtual bool SetForegroundColour(const wxColour& col); - virtual bool SetBackgroundColour(const wxColour& col); - - virtual void Pulse(); - - WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; - - // returns true if the platform should explicitly apply a theme border - virtual bool CanApplyThemeBorder() const { return false; } - -protected: - virtual wxSize DoGetBestSize() const; - -private: - // returns true if the control is currently in indeterminate (a.k.a. - // "marquee") mode - bool IsInIndeterminateMode() const; - - // switch to/from indeterminate mode - void SetIndeterminateMode(); - void SetDeterminateMode(); - - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxGauge); -}; - -#endif // wxUSE_GAUGE - -#endif // _WX_MSW_GAUGE_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/gccpriv.h b/Externals/wxWidgets3/include/wx/msw/gccpriv.h deleted file mode 100644 index b12efa9b2c..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/gccpriv.h +++ /dev/null @@ -1,168 +0,0 @@ -/* - Name: wx/msw/gccpriv.h - Purpose: MinGW/Cygwin definitions - Author: Vadim Zeitlin - Modified by: - Created: - Copyright: (c) Vadim Zeitlin - Licence: wxWindows Licence -*/ - -/* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */ - -#ifndef _WX_MSW_GCCPRIV_H_ -#define _WX_MSW_GCCPRIV_H_ - -#if defined(__MINGW32__) && !defined(__GNUWIN32__) - #define __GNUWIN32__ -#endif - -#if defined(__MINGW32__) - /* - Include the header defining __MINGW32_{MAJ,MIN}OR_VERSION but check - that UNICODE or _UNICODE is already defined, as _mingw.h relies on them - being set and we'd get weird compilation errors later if it is included - without them being defined, better give a clearer error right now. - */ - #if !defined(UNICODE) - #ifndef wxUSE_UNICODE - #error "wxUSE_UNICODE must be defined before including this header." - #endif - #if wxUSE_UNICODE - #error "UNICODE must be defined before including this header." - #endif - #endif - - #include <_mingw.h> - - /* - MinGW-w64 project provides compilers for both Win32 and Win64 but only - defines the same __MINGW32__ symbol for the former as MinGW32 toolchain - which is quite different (notably doesn't provide many SDK headers that - MinGW-w64 does include). So we define a separate symbol which, unlike - the predefined __MINGW64__, can be used to detect this toolchain in - both 32 and 64 bit builds. - - And define __MINGW32_TOOLCHAIN__ for consistency and also because it's - convenient as we often want to have some workarounds only for the (old) - MinGW32 but not (newer) MinGW-w64, which still predefines __MINGW32__. - */ - #ifdef __MINGW64_VERSION_MAJOR - #ifndef __MINGW64_TOOLCHAIN__ - #define __MINGW64_TOOLCHAIN__ - #endif - #else - #ifndef __MINGW32_TOOLCHAIN__ - #define __MINGW32_TOOLCHAIN__ - #endif - #endif - - #define wxCHECK_MINGW32_VERSION( major, minor ) \ - ( ( ( __MINGW32_MAJOR_VERSION > (major) ) \ - || ( __MINGW32_MAJOR_VERSION == (major) && __MINGW32_MINOR_VERSION >= (minor) ) ) ) -#else - #define wxCHECK_MINGW32_VERSION( major, minor ) (0) -#endif - -#if defined( __MINGW32__ ) && !defined(__WINE__) && !defined( HAVE_W32API_H ) - #if __MINGW32_MAJOR_VERSION >= 1 - #define HAVE_W32API_H - #endif -#elif defined( __CYGWIN__ ) && !defined( HAVE_W32API_H ) - #if ( __GNUC__ > 2 ) - #define HAVE_W32API_H - #endif -#endif - -/* check for MinGW/Cygwin w32api version ( releases >= 0.5, only ) */ -#if defined( HAVE_W32API_H ) -#include -#endif - -#if defined(__W32API_MAJOR_VERSION) && defined(__W32API_MINOR_VERSION) - #define wxCHECK_W32API_VERSION( major, minor ) \ - ( ( ( __W32API_MAJOR_VERSION > (major) ) \ - || ( __W32API_MAJOR_VERSION == (major) && __W32API_MINOR_VERSION >= (minor) ) ) ) -#else - #define wxCHECK_W32API_VERSION( major, minor ) (0) -#endif - -/* Cygwin 1.0 */ -#if defined(__CYGWIN__) && ((__GNUC__==2) && (__GNUC_MINOR__==9)) - #define __CYGWIN10__ -#endif - -/* Mingw runtime 1.0-20010604 has some missing _tXXXX functions, - so let's define them ourselves: */ -#if defined(__GNUWIN32__) && wxCHECK_W32API_VERSION( 1, 0 ) \ - && !wxCHECK_W32API_VERSION( 1, 1 ) - #ifndef _tsetlocale - #if wxUSE_UNICODE - #define _tsetlocale _wsetlocale - #else - #define _tsetlocale setlocale - #endif - #endif - #ifndef _tgetenv - #if wxUSE_UNICODE - #define _tgetenv _wgetenv - #else - #define _tgetenv getenv - #endif - #endif - #ifndef _tfopen - #if wxUSE_UNICODE - #define _tfopen _wfopen - #else - #define _tfopen fopen - #endif - #endif -#endif - -/* current (= before mingw-runtime 3.3) mingw32 headers forget to - define _puttchar, this will probably be fixed in the next versions but - for now do it ourselves - */ -#if defined( __MINGW32__ ) && \ - !wxCHECK_MINGW32_VERSION(3,3) && !defined( _puttchar ) - #ifdef wxUSE_UNICODE - #define _puttchar putwchar - #else - #define _puttchar puttchar - #endif -#endif - -/* - Traditional MinGW (but not MinGW-w64 nor TDM-GCC) omits many POSIX - functions from their headers when compiled with __STRICT_ANSI__ defined. - Unfortunately this means that they are not available when using -std=c++98 - (not very common) or -std=c++11 (much more so), but we still need them even - in this case. As the intention behind using -std=c++11 is probably to get - the new C++11 features and not disable the use of POSIX functions, we just - manually declare the functions we need in this case if necessary. - */ -#if defined(__MINGW32_TOOLCHAIN__) && defined(__STRICT_ANSI__) - #define wxNEEDS_STRICT_ANSI_WORKAROUNDS - - /* - This macro is somewhat unusual as it takes the list of parameters - inside parentheses and includes semicolon inside it as putting the - semicolon outside wouldn't do the right thing when this macro is empty. - */ - #define wxDECL_FOR_STRICT_MINGW32(rettype, func, params) \ - extern "C" _CRTIMP rettype __cdecl __MINGW_NOTHROW func params ; - - /* - There is a bug resulting in a compilation error in MinGW standard - math.h header, see https://sourceforge.net/p/mingw/bugs/2250/, work - around it here because math.h is also included from several other - standard headers (e.g. ) and we don't want to duplicate this - hack everywhere this happens. - */ - wxDECL_FOR_STRICT_MINGW32(double, _hypot, (double, double)) -#else - #define wxDECL_FOR_STRICT_MINGW32(rettype, func, params) -#endif - -#endif - /* _WX_MSW_GCCPRIV_H_ */ diff --git a/Externals/wxWidgets3/include/wx/msw/gdiimage.h b/Externals/wxWidgets3/include/wx/msw/gdiimage.h deleted file mode 100644 index 18ebbb8f20..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/gdiimage.h +++ /dev/null @@ -1,197 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/gdiimage.h -// Purpose: wxGDIImage class: base class for wxBitmap, wxIcon, wxCursor -// under MSW -// Author: Vadim Zeitlin -// Modified by: -// Created: 20.11.99 -// Copyright: (c) 1999 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// NB: this is a private header, it is not intended to be directly included by -// user code (but may be included from other, public, wxWin headers - -#ifndef _WX_MSW_GDIIMAGE_H_ -#define _WX_MSW_GDIIMAGE_H_ - -#include "wx/gdiobj.h" // base class -#include "wx/gdicmn.h" // wxBITMAP_TYPE_INVALID -#include "wx/list.h" - -class WXDLLIMPEXP_FWD_CORE wxGDIImageRefData; -class WXDLLIMPEXP_FWD_CORE wxGDIImageHandler; -class WXDLLIMPEXP_FWD_CORE wxGDIImage; - -WX_DECLARE_EXPORTED_LIST(wxGDIImageHandler, wxGDIImageHandlerList); - -// ---------------------------------------------------------------------------- -// wxGDIImageRefData: common data fields for all derived classes -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxGDIImageRefData : public wxGDIRefData -{ -public: - wxGDIImageRefData() - { - m_width = m_height = m_depth = 0; - - m_handle = 0; - } - - wxGDIImageRefData(const wxGDIImageRefData& data) : wxGDIRefData() - { - m_width = data.m_width; - m_height = data.m_height; - m_depth = data.m_depth; - - // can't copy handles like this, derived class copy ctor must do it! - m_handle = NULL; - } - - // accessors - virtual bool IsOk() const { return m_handle != 0; } - - void SetSize(int w, int h) { m_width = w; m_height = h; } - - // free the resources we allocated - virtual void Free() = 0; - - // for compatibility, the member fields are public - - // the size of the image - int m_width, m_height; - - // the depth of the image - int m_depth; - - // the handle to it - union - { - WXHANDLE m_handle; // for untyped access - WXHBITMAP m_hBitmap; - WXHICON m_hIcon; - WXHCURSOR m_hCursor; - }; -}; - -// ---------------------------------------------------------------------------- -// wxGDIImage: this class supports GDI image handlers which may be registered -// dynamically and will be used for loading/saving the images in the specified -// format. It also falls back to wxImage if no appropriate image is found. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxGDIImage : public wxGDIObject -{ -public: - // handlers list interface - static wxGDIImageHandlerList& GetHandlers() { return ms_handlers; } - - static void AddHandler(wxGDIImageHandler *handler); - static void InsertHandler(wxGDIImageHandler *handler); - static bool RemoveHandler(const wxString& name); - - static wxGDIImageHandler *FindHandler(const wxString& name); - static wxGDIImageHandler *FindHandler(const wxString& extension, long type); - static wxGDIImageHandler *FindHandler(long type); - - static void InitStandardHandlers(); - static void CleanUpHandlers(); - - // access to the ref data casted to the right type - wxGDIImageRefData *GetGDIImageData() const - { return (wxGDIImageRefData *)m_refData; } - - // accessors - WXHANDLE GetHandle() const - { return IsNull() ? 0 : GetGDIImageData()->m_handle; } - void SetHandle(WXHANDLE handle) - { AllocExclusive(); GetGDIImageData()->m_handle = handle; } - - int GetWidth() const { return IsNull() ? 0 : GetGDIImageData()->m_width; } - int GetHeight() const { return IsNull() ? 0 : GetGDIImageData()->m_height; } - int GetDepth() const { return IsNull() ? 0 : GetGDIImageData()->m_depth; } - - wxSize GetSize() const - { - return IsNull() ? wxSize(0,0) : - wxSize(GetGDIImageData()->m_width, GetGDIImageData()->m_height); - } - - void SetWidth(int w) { AllocExclusive(); GetGDIImageData()->m_width = w; } - void SetHeight(int h) { AllocExclusive(); GetGDIImageData()->m_height = h; } - void SetDepth(int d) { AllocExclusive(); GetGDIImageData()->m_depth = d; } - - void SetSize(int w, int h) - { - AllocExclusive(); - GetGDIImageData()->SetSize(w, h); - } - void SetSize(const wxSize& size) { SetSize(size.x, size.y); } - - // forward some of base class virtuals to wxGDIImageRefData - bool FreeResource(bool force = false); - virtual WXHANDLE GetResourceHandle() const; - -protected: - // create the data for the derived class here - virtual wxGDIImageRefData *CreateData() const = 0; - - // implement the wxGDIObject method in terms of our, more specific, one - virtual wxGDIRefData *CreateGDIRefData() const { return CreateData(); } - - // we can't [efficiently] clone objects of this class - virtual wxGDIRefData * - CloneGDIRefData(const wxGDIRefData *WXUNUSED(data)) const - { - wxFAIL_MSG( wxT("must be implemented if used") ); - - return NULL; - } - - static wxGDIImageHandlerList ms_handlers; -}; - -// ---------------------------------------------------------------------------- -// wxGDIImageHandler: a class which knows how to load/save wxGDIImages. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxGDIImageHandler : public wxObject -{ -public: - // ctor - wxGDIImageHandler() { m_type = wxBITMAP_TYPE_INVALID; } - wxGDIImageHandler(const wxString& name, - const wxString& ext, - wxBitmapType type) - : m_name(name), m_extension(ext), m_type(type) { } - - // accessors - void SetName(const wxString& name) { m_name = name; } - void SetExtension(const wxString& ext) { m_extension = ext; } - void SetType(wxBitmapType type) { m_type = type; } - - const wxString& GetName() const { return m_name; } - const wxString& GetExtension() const { return m_extension; } - wxBitmapType GetType() const { return m_type; } - - // real handler operations: to implement in derived classes - virtual bool Create(wxGDIImage *image, - const void* data, - wxBitmapType flags, - int width, int height, int depth = 1) = 0; - virtual bool Load(wxGDIImage *image, - const wxString& name, - wxBitmapType flags, - int desiredWidth, int desiredHeight) = 0; - virtual bool Save(const wxGDIImage *image, - const wxString& name, - wxBitmapType type) const = 0; - -protected: - wxString m_name; - wxString m_extension; - wxBitmapType m_type; -}; - -#endif // _WX_MSW_GDIIMAGE_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/genrcdefs.h b/Externals/wxWidgets3/include/wx/msw/genrcdefs.h deleted file mode 100644 index 809419b3f9..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/genrcdefs.h +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Name: wx/msw/genrcdefs.h - * Purpose: Emit preprocessor symbols into rcdefs.h for resource compiler - * Author: Mike Wetherell - * Copyright: (c) 2005 Mike Wetherell - * Licence: wxWindows licence - */ - -#define EMIT(line) line - -EMIT(#ifndef _WX_RCDEFS_H) -EMIT(#define _WX_RCDEFS_H) - -#ifdef _MSC_FULL_VER -#if _MSC_FULL_VER < 140040130 -EMIT(#define wxUSE_RC_MANIFEST 1) -#endif -#else -EMIT(#define wxUSE_RC_MANIFEST 1) -#endif - -#if defined _M_AMD64 || defined __x86_64__ -EMIT(#define WX_CPU_AMD64) -#endif - -#ifdef _M_ARM -EMIT(#define WX_CPU_ARM) -#endif - -#if defined _M_IA64 || defined __ia64__ -EMIT(#define WX_CPU_IA64) -#endif - -#if defined _M_IX86 || defined _X86_ -EMIT(#define WX_CPU_X86) -#endif - -#ifdef _M_PPC -EMIT(#define WX_CPU_PPC) -#endif - -#ifdef _M_SH -EMIT(#define WX_CPU_SH) -#endif - -EMIT(#endif) diff --git a/Externals/wxWidgets3/include/wx/msw/glcanvas.h b/Externals/wxWidgets3/include/wx/msw/glcanvas.h deleted file mode 100644 index fdcdd1faa5..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/glcanvas.h +++ /dev/null @@ -1,182 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/glcanvas.h -// Purpose: wxGLCanvas, for using OpenGL with wxWidgets under Windows -// Author: Julian Smart -// Modified by: -// Created: 04/01/98 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GLCANVAS_H_ -#define _WX_GLCANVAS_H_ - -#include "wx/palette.h" - -#include "wx/msw/wrapwin.h" - -#include - -// ---------------------------------------------------------------------------- -// wxGLContext: OpenGL rendering context -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_GL wxGLContext : public wxGLContextBase -{ -public: - wxGLContext(wxGLCanvas *win, - const wxGLContext *other = NULL, - const wxGLContextAttrs *ctxAttrs = NULL); - virtual ~wxGLContext(); - - virtual bool SetCurrent(const wxGLCanvas& win) const; - - HGLRC GetGLRC() const { return m_glContext; } - -protected: - HGLRC m_glContext; - -private: - wxDECLARE_CLASS(wxGLContext); -}; - -// ---------------------------------------------------------------------------- -// wxGLCanvas: OpenGL output window -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_GL wxGLCanvas : public wxGLCanvasBase -{ -public: - wxEXPLICIT // avoid implicitly converting a wxWindow* to wxGLCanvas - wxGLCanvas(wxWindow *parent, - const wxGLAttributes& dispAttrs, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxGLCanvasName, - const wxPalette& palette = wxNullPalette); - - wxEXPLICIT - wxGLCanvas(wxWindow *parent, - wxWindowID id = wxID_ANY, - const int *attribList = NULL, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxGLCanvasName, - const wxPalette& palette = wxNullPalette); - - bool Create(wxWindow *parent, - const wxGLAttributes& dispAttrs, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxGLCanvasName, - const wxPalette& palette = wxNullPalette); - - bool Create(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxGLCanvasName, - const int *attribList = NULL, - const wxPalette& palette = wxNullPalette); - - virtual ~wxGLCanvas(); - - // implement wxGLCanvasBase methods - virtual bool SwapBuffers(); - - - // MSW-specific helpers - // -------------------- - - // get the HDC used for OpenGL rendering - HDC GetHDC() const { return m_hDC; } - - // Try to find pixel format matching the given attributes list for the - // specified HDC, return 0 on error, otherwise ppfd is filled in with the - // information from dispAttrs - static int FindMatchingPixelFormat(const wxGLAttributes& dispAttrs, - PIXELFORMATDESCRIPTOR* ppfd = NULL); - // Same as FindMatchingPixelFormat - static int ChooseMatchingPixelFormat(HDC hdc, const int *attribList, - PIXELFORMATDESCRIPTOR *pfd = NULL); - -#if wxUSE_PALETTE - // palette stuff - bool SetupPalette(const wxPalette& palette); - virtual wxPalette CreateDefaultPalette(); - void OnQueryNewPalette(wxQueryNewPaletteEvent& event); - void OnPaletteChanged(wxPaletteChangedEvent& event); -#endif // wxUSE_PALETTE - - // deprecated methods using the implicit wxGLContext, associate the context - // explicitly with the window instead -#if WXWIN_COMPATIBILITY_2_8 - wxDEPRECATED( - wxGLCanvas(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxGLCanvasName, - const int *attribList = NULL, - const wxPalette& palette = wxNullPalette) - ); - - wxDEPRECATED( - wxGLCanvas(wxWindow *parent, - const wxGLContext *shared, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxGLCanvasName, - const int *attribList = NULL, - const wxPalette& palette = wxNullPalette) - ); - - wxDEPRECATED( - wxGLCanvas(wxWindow *parent, - const wxGLCanvas *shared, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxGLCanvasName, - const int *attribList = NULL, - const wxPalette& palette = wxNullPalette) - ); -#endif // WXWIN_COMPATIBILITY_2_8 - -protected: - // common part of all ctors - void Init(); - - // the real window creation function, Create() may reuse it twice as we may - // need to create an OpenGL window to query the available extensions and - // then potentially delete and recreate it with another pixel format - bool CreateWindow(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxGLCanvasName); - - // set up the pixel format using the given attributes and palette - int DoSetup(PIXELFORMATDESCRIPTOR &pfd, const int *attribList); - - - // HDC for this window, we keep it all the time - HDC m_hDC; - -private: - wxDECLARE_EVENT_TABLE(); - wxDECLARE_CLASS(wxGLCanvas); -}; - -#endif // _WX_GLCANVAS_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/hand.cur b/Externals/wxWidgets3/include/wx/msw/hand.cur deleted file mode 100644 index e5a1fe7c2f..0000000000 Binary files a/Externals/wxWidgets3/include/wx/msw/hand.cur and /dev/null differ diff --git a/Externals/wxWidgets3/include/wx/msw/headerctrl.h b/Externals/wxWidgets3/include/wx/msw/headerctrl.h deleted file mode 100644 index db702c5a19..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/headerctrl.h +++ /dev/null @@ -1,136 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/headerctrl.h -// Purpose: wxMSW native wxHeaderCtrl -// Author: Vadim Zeitlin -// Created: 2008-12-01 -// Copyright: (c) 2008 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_HEADERCTRL_H_ -#define _WX_MSW_HEADERCTRL_H_ - -class WXDLLIMPEXP_FWD_CORE wxImageList; - -// ---------------------------------------------------------------------------- -// wxHeaderCtrl -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxHeaderCtrl : public wxHeaderCtrlBase -{ -public: - wxHeaderCtrl() - { - Init(); - } - - wxHeaderCtrl(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxHD_DEFAULT_STYLE, - const wxString& name = wxHeaderCtrlNameStr) - { - Init(); - - Create(parent, id, pos, size, style, name); - } - - bool Create(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxHD_DEFAULT_STYLE, - const wxString& name = wxHeaderCtrlNameStr); - - virtual ~wxHeaderCtrl(); - - -protected: - // override wxWindow methods which must be implemented by a new control - virtual wxSize DoGetBestSize() const; - virtual void DoSetSize(int x, int y, - int width, int height, - int sizeFlags = wxSIZE_AUTO); - -private: - // implement base class pure virtuals - virtual void DoSetCount(unsigned int count); - virtual unsigned int DoGetCount() const; - virtual void DoUpdate(unsigned int idx); - - virtual void DoScrollHorz(int dx); - - virtual void DoSetColumnsOrder(const wxArrayInt& order); - virtual wxArrayInt DoGetColumnsOrder() const; - - // override MSW-specific methods needed for new control - virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; - virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); - - // common part of all ctors - void Init(); - - // wrapper around Header_InsertItem(): insert the item using information - // from the given column at the given index - void DoInsertItem(const wxHeaderColumn& col, unsigned int idx); - - // get the number of currently visible items: this is also the total number - // of items contained in the native control - int GetShownColumnsCount() const; - - // due to the discrepancy for the hidden columns which we know about but - // the native control does not, there can be a difference between the - // column indices we use and the ones used by the native control; these - // functions translate between them - // - // notice that MSWToNativeIdx() shouldn't be called for hidden columns and - // MSWFromNativeIdx() always returns an index of a visible column - int MSWToNativeIdx(int idx); - int MSWFromNativeIdx(int item); - - // this is the same as above but for order, not index - int MSWToNativeOrder(int order); - int MSWFromNativeOrder(int order); - - // get the event type corresponding to a click or double click event - // (depending on dblclk value) with the specified (using MSW convention) - // mouse button - wxEventType GetClickEventType(bool dblclk, int button); - - - // the number of columns in the control, including the hidden ones (not - // taken into account by the native control, see comment in DoGetCount()) - unsigned int m_numColumns; - - // this is a lookup table allowing us to check whether the column with the - // given index is currently shown in the native control, in which case the - // value of this array element with this index is 0, or hidden - // - // notice that this may be different from GetColumn(idx).IsHidden() and in - // fact we need this array precisely because it will be different from it - // in DoUpdate() when the column hidden flag gets toggled and we need it to - // handle this transition correctly - wxArrayInt m_isHidden; - - // the order of our columns: this array contains the index of the column - // shown at the position n as the n-th element - // - // this is necessary only to handle the hidden columns: the native control - // doesn't know about them and so we can't use Header_GetOrderArray() - wxArrayInt m_colIndices; - - // the image list: initially NULL, created on demand - wxImageList *m_imageList; - - // the offset of the window used to emulate scrolling it - int m_scrollOffset; - - // actual column we are dragging or -1 if not dragging anything - int m_colBeingDragged; - - wxDECLARE_NO_COPY_CLASS(wxHeaderCtrl); -}; - -#endif // _WX_MSW_HEADERCTRL_H_ - diff --git a/Externals/wxWidgets3/include/wx/msw/helpbest.h b/Externals/wxWidgets3/include/wx/msw/helpbest.h deleted file mode 100644 index a6f1b2cb0e..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/helpbest.h +++ /dev/null @@ -1,128 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/helpbest.h -// Purpose: Tries to load MS HTML Help, falls back to wxHTML upon failure -// Author: Mattia Barbon -// Modified by: -// Created: 02/04/2001 -// Copyright: (c) Mattia Barbon -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_HELPBEST_H_ -#define _WX_HELPBEST_H_ - -#if wxUSE_HELP && wxUSE_MS_HTML_HELP \ - && wxUSE_WXHTML_HELP && !defined(__WXUNIVERSAL__) - -#include "wx/helpbase.h" -#include "wx/html/helpfrm.h" // for wxHF_DEFAULT_STYLE - -class WXDLLIMPEXP_HTML wxBestHelpController: public wxHelpControllerBase -{ -public: - wxBestHelpController(wxWindow* parentWindow = NULL, - int style = wxHF_DEFAULT_STYLE) - : wxHelpControllerBase(parentWindow), - m_helpControllerType(wxUseNone), - m_helpController(NULL), - m_style(style) - { - } - - virtual ~wxBestHelpController() { delete m_helpController; } - - // Must call this to set the filename - virtual bool Initialize(const wxString& file); - virtual bool Initialize(const wxString& file, int WXUNUSED(server) ) { return Initialize( file ); } - - // If file is "", reloads file given in Initialize - virtual bool LoadFile(const wxString& file = wxEmptyString) - { - return m_helpController->LoadFile( GetValidFilename( file ) ); - } - - virtual bool DisplayContents() - { - return m_helpController->DisplayContents(); - } - - virtual bool DisplaySection(int sectionNo) - { - return m_helpController->DisplaySection( sectionNo ); - } - - virtual bool DisplaySection(const wxString& section) - { - return m_helpController->DisplaySection( section ); - } - - virtual bool DisplayBlock(long blockNo) - { - return m_helpController->DisplayBlock( blockNo ); - } - - virtual bool DisplayContextPopup(int contextId) - { - return m_helpController->DisplayContextPopup( contextId ); - } - - virtual bool DisplayTextPopup(const wxString& text, const wxPoint& pos) - { - return m_helpController->DisplayTextPopup( text, pos ); - } - - virtual bool KeywordSearch(const wxString& k, - wxHelpSearchMode mode = wxHELP_SEARCH_ALL) - { - return m_helpController->KeywordSearch( k, mode ); - } - - virtual bool Quit() - { - return m_helpController->Quit(); - } - - // Allows one to override the default settings for the help frame. - virtual void SetFrameParameters(const wxString& title, - const wxSize& size, - const wxPoint& pos = wxDefaultPosition, - bool newFrameEachTime = false) - { - m_helpController->SetFrameParameters( title, size, pos, - newFrameEachTime ); - } - - // Obtains the latest settings used by the help frame and the help frame. - virtual wxFrame *GetFrameParameters(wxSize *size = NULL, - wxPoint *pos = NULL, - bool *newFrameEachTime = NULL) - { - return m_helpController->GetFrameParameters( size, pos, - newFrameEachTime ); - } - - /// Set the window that can optionally be used for the help window's parent. - virtual void SetParentWindow(wxWindow* win) { m_helpController->SetParentWindow(win); } - - /// Get the window that can optionally be used for the help window's parent. - virtual wxWindow* GetParentWindow() const { return m_helpController->GetParentWindow(); } - -protected: - // Append/change extension if necessary. - wxString GetValidFilename(const wxString& file) const; - -protected: - enum HelpControllerType { wxUseNone, wxUseHtmlHelp, wxUseChmHelp }; - - HelpControllerType m_helpControllerType; - wxHelpControllerBase* m_helpController; - int m_style; - - wxDECLARE_DYNAMIC_CLASS(wxBestHelpController); - wxDECLARE_NO_COPY_CLASS(wxBestHelpController); -}; - -#endif // wxUSE_HELP && wxUSE_MS_HTML_HELP && wxUSE_WXHTML_HELP - -#endif - // _WX_HELPBEST_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/helpchm.h b/Externals/wxWidgets3/include/wx/msw/helpchm.h deleted file mode 100644 index 1aadac3bda..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/helpchm.h +++ /dev/null @@ -1,89 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/helpchm.h -// Purpose: Help system: MS HTML Help implementation -// Author: Julian Smart -// Modified by: -// Created: 16/04/2000 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_HELPCHM_H_ -#define _WX_MSW_HELPCHM_H_ - -#if wxUSE_MS_HTML_HELP - -#include "wx/helpbase.h" - -class WXDLLIMPEXP_CORE wxCHMHelpController : public wxHelpControllerBase -{ -public: - wxCHMHelpController(wxWindow* parentWindow = NULL): wxHelpControllerBase(parentWindow) { } - - // Must call this to set the filename - virtual bool Initialize(const wxString& file); - virtual bool Initialize(const wxString& file, int WXUNUSED(server) ) { return Initialize( file ); } - - // If file is "", reloads file given in Initialize - virtual bool LoadFile(const wxString& file = wxEmptyString); - virtual bool DisplayContents(); - virtual bool DisplaySection(int sectionNo); - virtual bool DisplaySection(const wxString& section); - virtual bool DisplayBlock(long blockNo); - virtual bool DisplayContextPopup(int contextId); - virtual bool DisplayTextPopup(const wxString& text, const wxPoint& pos); - virtual bool KeywordSearch(const wxString& k, - wxHelpSearchMode mode = wxHELP_SEARCH_ALL); - virtual bool Quit(); - - wxString GetHelpFile() const { return m_helpFile; } - - // helper of DisplayTextPopup(), also used in wxSimpleHelpProvider::ShowHelp - static bool ShowContextHelpPopup(const wxString& text, - const wxPoint& pos, - wxWindow *window); - -protected: - // get the name of the CHM file we use from our m_helpFile - wxString GetValidFilename() const; - - // Call HtmlHelp() with the provided parameters (both overloads do the same - // thing but allow to avoid casts in the calling code) and return false - // (but don't crash) if HTML help is unavailable - static bool CallHtmlHelp(wxWindow *win, const wxChar *str, - unsigned cmd, WXWPARAM param); - static bool CallHtmlHelp(wxWindow *win, const wxChar *str, - unsigned cmd, const void *param = NULL) - { - return CallHtmlHelp(win, str, cmd, reinterpret_cast(param)); - } - - // even simpler wrappers using GetParentWindow() and GetValidFilename() as - // the first 2 HtmlHelp() parameters - bool CallHtmlHelp(unsigned cmd, WXWPARAM param) - { - return CallHtmlHelp(GetParentWindow(), GetValidFilename().t_str(), - cmd, param); - } - - bool CallHtmlHelp(unsigned cmd, const void *param = NULL) - { - return CallHtmlHelp(cmd, reinterpret_cast(param)); - } - - // wrapper around CallHtmlHelp(HH_DISPLAY_TEXT_POPUP): only one of text and - // contextId parameters can be non-NULL/non-zero - static bool DoDisplayTextPopup(const wxChar *text, - const wxPoint& pos, - int contextId, - wxWindow *window); - - - wxString m_helpFile; - - wxDECLARE_DYNAMIC_CLASS(wxCHMHelpController); -}; - -#endif // wxUSE_MS_HTML_HELP - -#endif // _WX_MSW_HELPCHM_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/helpwin.h b/Externals/wxWidgets3/include/wx/msw/helpwin.h deleted file mode 100644 index e0f797a6d4..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/helpwin.h +++ /dev/null @@ -1,55 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/helpwin.h -// Purpose: Help system: WinHelp implementation -// Author: Julian Smart -// Modified by: -// Created: 04/01/98 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_HELPWIN_H_ -#define _WX_HELPWIN_H_ - -#include "wx/wx.h" - -#if wxUSE_HELP - -#include "wx/helpbase.h" - -class WXDLLIMPEXP_CORE wxWinHelpController: public wxHelpControllerBase -{ - wxDECLARE_DYNAMIC_CLASS(wxWinHelpController); - -public: - wxWinHelpController(wxWindow* parentWindow = NULL): wxHelpControllerBase(parentWindow) {} - virtual ~wxWinHelpController() {} - - // Must call this to set the filename - virtual bool Initialize(const wxString& file); - virtual bool Initialize(const wxString& file, int WXUNUSED(server) ) { return Initialize( file ); } - - // If file is "", reloads file given in Initialize - virtual bool LoadFile(const wxString& file = wxEmptyString); - virtual bool DisplayContents(); - virtual bool DisplaySection(int sectionNo); - virtual bool DisplaySection(const wxString& section) { return KeywordSearch(section); } - virtual bool DisplayBlock(long blockNo); - virtual bool DisplayContextPopup(int contextId); - virtual bool KeywordSearch(const wxString& k, - wxHelpSearchMode mode = wxHELP_SEARCH_ALL); - virtual bool Quit(); - - inline wxString GetHelpFile() const { return m_helpFile; } - -protected: - // Append extension if necessary. - wxString GetValidFilename(const wxString& file) const; - -private: - wxString m_helpFile; -}; - -#endif // wxUSE_HELP -#endif -// _WX_HELPWIN_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/htmlhelp.h b/Externals/wxWidgets3/include/wx/msw/htmlhelp.h deleted file mode 100644 index 3e8a7caf92..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/htmlhelp.h +++ /dev/null @@ -1,465 +0,0 @@ -/* - * wx/msw/htmlhelp.h - * Copyright 2004 Jacek Caban - * - * Originally written for the Wine project, and issued under - * the wxWindows licence by kind permission of the author. - * - * Licence: wxWindows licence - */ - -#ifndef __HTMLHELP_H__ -#define __HTMLHELP_H__ - -#define HH_DISPLAY_TOPIC 0x00 -#define HH_HELP_FINDER 0x00 -#define HH_DISPLAY_TOC 0x01 -#define HH_DISPLAY_INDEX 0x02 -#define HH_DISPLAY_SEARCH 0x03 -#define HH_SET_WIN_TYPE 0x04 -#define HH_GET_WIN_TYPE 0x05 -#define HH_GET_WIN_HANDLE 0x06 -#define HH_ENUM_INFO_TYPE 0x07 -#define HH_SET_INFO_TYPE 0x08 -#define HH_SYNC 0x09 -#define HH_RESERVED1 0x0A -#define HH_RESERVED2 0x0B -#define HH_RESERVED3 0x0C -#define HH_KEYWORD_LOOKUP 0x0D -#define HH_DISPLAY_TEXT_POPUP 0x0E -#define HH_HELP_CONTEXT 0x0F -#define HH_TP_HELP_CONTEXTMENU 0x10 -#define HH_TP_HELP_WM_HELP 0x11 -#define HH_CLOSE_ALL 0x12 -#define HH_ALINK_LOOKUP 0x13 -#define HH_GET_LAST_ERROR 0x14 -#define HH_ENUM_CATEGORY 0x15 -#define HH_ENUM_CATEGORY_IT 0x16 -#define HH_RESET_IT_FILTER 0x17 -#define HH_SET_INCLUSIVE_FILTER 0x18 -#define HH_SET_EXCLUSIVE_FILTER 0x19 -#define HH_INITIALIZE 0x1C -#define HH_UNINITIALIZE 0x1D -#define HH_PRETRANSLATEMESSAGE 0xFD -#define HH_SET_GLOBAL_PROPERTY 0xFC - -#define HHWIN_PROP_TAB_AUTOHIDESHOW 0x00000001 -#define HHWIN_PROP_ONTOP 0x00000002 -#define HHWIN_PROP_NOTITLEBAR 0x00000004 -#define HHWIN_PROP_NODEF_STYLES 0x00000008 -#define HHWIN_PROP_NODEF_EXSTYLES 0x00000010 -#define HHWIN_PROP_TRI_PANE 0x00000020 -#define HHWIN_PROP_NOTB_TEXT 0x00000040 -#define HHWIN_PROP_POST_QUIT 0x00000080 -#define HHWIN_PROP_AUTO_SYNC 0x00000100 -#define HHWIN_PROP_TRACKING 0x00000200 -#define HHWIN_PROP_TAB_SEARCH 0x00000400 -#define HHWIN_PROP_TAB_HISTORY 0x00000800 -#define HHWIN_PROP_TAB_FAVORITES 0x00001000 -#define HHWIN_PROP_CHANGE_TITLE 0x00002000 -#define HHWIN_PROP_NAV_ONLY_WIN 0x00004000 -#define HHWIN_PROP_NO_TOOLBAR 0x00008000 -#define HHWIN_PROP_MENU 0x00010000 -#define HHWIN_PROP_TAB_ADVSEARCH 0x00020000 -#define HHWIN_PROP_USER_POS 0x00040000 -#define HHWIN_PROP_TAB_CUSTOM1 0x00080000 -#define HHWIN_PROP_TAB_CUSTOM2 0x00100000 -#define HHWIN_PROP_TAB_CUSTOM3 0x00200000 -#define HHWIN_PROP_TAB_CUSTOM4 0x00400000 -#define HHWIN_PROP_TAB_CUSTOM5 0x00800000 -#define HHWIN_PROP_TAB_CUSTOM6 0x01000000 -#define HHWIN_PROP_TAB_CUSTOM7 0x02000000 -#define HHWIN_PROP_TAB_CUSTOM8 0x04000000 -#define HHWIN_PROP_TAB_CUSTOM9 0x08000000 -#define HHWIN_TB_MARGIN 0x10000000 - -#define HHWIN_PARAM_PROPERTIES 0x00000002 -#define HHWIN_PARAM_STYLES 0x00000004 -#define HHWIN_PARAM_EXSTYLES 0x00000008 -#define HHWIN_PARAM_RECT 0x00000010 -#define HHWIN_PARAM_NAV_WIDTH 0x00000020 -#define HHWIN_PARAM_SHOWSTATE 0x00000040 -#define HHWIN_PARAM_INFOTYPES 0x00000080 -#define HHWIN_PARAM_TB_FLAGS 0x00000100 -#define HHWIN_PARAM_EXPANSION 0x00000200 -#define HHWIN_PARAM_TABPOS 0x00000400 -#define HHWIN_PARAM_TABORDER 0x00000800 -#define HHWIN_PARAM_HISTORY_COUNT 0x00001000 -#define HHWIN_PARAM_CUR_TAB 0x00002000 - -#define HHWIN_BUTTON_EXPAND 0x00000002 -#define HHWIN_BUTTON_BACK 0x00000004 -#define HHWIN_BUTTON_FORWARD 0x00000008 -#define HHWIN_BUTTON_STOP 0x00000010 -#define HHWIN_BUTTON_REFRESH 0x00000020 -#define HHWIN_BUTTON_HOME 0x00000040 -#define HHWIN_BUTTON_BROWSE_FWD 0x00000080 -#define HHWIN_BUTTON_BROWSE_BCK 0x00000100 -#define HHWIN_BUTTON_NOTES 0x00000200 -#define HHWIN_BUTTON_CONTENTS 0x00000400 -#define HHWIN_BUTTON_SYNC 0x00000800 -#define HHWIN_BUTTON_OPTIONS 0x00001000 -#define HHWIN_BUTTON_PRINT 0x00002000 -#define HHWIN_BUTTON_INDEX 0x00004000 -#define HHWIN_BUTTON_SEARCH 0x00008000 -#define HHWIN_BUTTON_HISTORY 0x00010000 -#define HHWIN_BUTTON_FAVORITES 0x00020000 -#define HHWIN_BUTTON_JUMP1 0x00040000 -#define HHWIN_BUTTON_JUMP2 0x00080000 -#define HHWIN_BUTTON_ZOOM 0x00100000 -#define HHWIN_BUTTON_TOC_NEXT 0x00200000 -#define HHWIN_BUTTON_TOC_PREV 0x00400000 - -#define HHWIN_DEF_BUTTONS \ - (HHWIN_BUTTON_EXPAND | HHWIN_BUTTON_BACK | HHWIN_BUTTON_OPTIONS | HHWIN_BUTTON_PRINT) - -#define IDTB_EXPAND 200 -#define IDTB_CONTRACT 201 -#define IDTB_STOP 202 -#define IDTB_REFRESH 203 -#define IDTB_BACK 204 -#define IDTB_HOME 205 -#define IDTB_SYNC 206 -#define IDTB_PRINT 207 -#define IDTB_OPTIONS 208 -#define IDTB_FORWARD 209 -#define IDTB_NOTES 210 -#define IDTB_BROWSE_FWD 211 -#define IDTB_BROWSE_BACK 212 -#define IDTB_CONTENTS 213 -#define IDTB_INDEX 214 -#define IDTB_SEARCH 215 -#define IDTB_HISTORY 216 -#define IDTB_FAVORITES 217 -#define IDTB_JUMP1 218 -#define IDTB_JUMP2 219 -#define IDTB_CUSTOMIZE 221 -#define IDTB_ZOOM 222 -#define IDTB_TOC_NEXT 223 -#define IDTB_TOC_PREV 224 - -#define HHN_FIRST (0U-860U) -#define HHN_LAST (0U-879U) -#define HHN_NAVCOMPLETE HHN_FIRST -#define HHN_TRACK (HHN_FIRST-1) -#define HHN_WINDOW_CREATE (HHN_FIRST-2) - - -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct tagHH_NOTIFY { - NMHDR hdr; - PCSTR pszurl; -} HH_NOTIFY; - -typedef struct tagHH_POPUPA { - int cbStruct; - HINSTANCE hinst; - UINT idString; - LPCSTR pszText; - POINT pt; - COLORREF clrForeground; - COLORREF clrBackground; - RECT rcMargins; - LPCSTR pszFont; -} HH_POPUPA; - -typedef struct tagHH_POPUPW { - int cbStruct; - HINSTANCE hinst; - UINT idString; - LPCWSTR pszText; - POINT pt; - COLORREF clrForeground; - COLORREF clrBackground; - RECT rcMargins; - LPCWSTR pszFont; -} HH_POPUPW; - -#ifdef _UNICODE -typedef HH_POPUPW HH_POPUP; -#else -typedef HH_POPUPA HH_POPUP; -#endif - -typedef struct tagHH_ALINKA { - int cbStruct; - BOOL fReserved; - LPCSTR pszKeywords; - LPCSTR pszUrl; - LPCSTR pszMsgText; - LPCSTR pszMsgTitle; - LPCSTR pszWindow; - BOOL fIndexOnFail; -} HH_ALINKA; - -typedef struct tagHH_ALINKW { - int cbStruct; - BOOL fReserved; - LPCWSTR pszKeywords; - LPCWSTR pszUrl; - LPCWSTR pszMsgText; - LPCWSTR pszMsgTitle; - LPCWSTR pszWindow; - BOOL fIndexOnFail; -} HH_ALINKW; - -#ifdef _UNICODE -typedef HH_ALINKW HH_ALINK; -typedef HH_ALINKW HH_AKLINK; -#else -typedef HH_ALINKA HH_ALINK; -typedef HH_ALINKA HH_AKLINK; -#endif - -enum { - HHWIN_NAVTYPE_TOC, - HHWIN_NAVTYPE_INDEX, - HHWIN_NAVTYPE_SEARCH, - HHWIN_NAVTYPE_FAVORITES, - HHWIN_NAVTYPE_HISTORY, - HHWIN_NAVTYPE_AUTHOR, - HHWIN_NAVTYPE_CUSTOM_FIRST = 11 -}; - -enum { - IT_INCLUSIVE, - IT_EXCLUSIVE, - IT_HIDDEN -}; - -typedef struct tagHH_ENUM_IT { - int cbStruct; - int iType; - LPCSTR pszCatName; - LPCSTR pszITName; - LPCSTR pszITDescription; -} HH_ENUM_IT, *PHH_ENUM_IT; - -typedef struct tagHH_ENUM_CAT { - int cbStruct; - LPCSTR pszCatName; - LPCSTR pszCatDescription; -} HH_ENUM_CAT, *PHH_ENUM_CAT; - -typedef struct tagHH_SET_INFOTYPE { - int cbStruct; - LPCSTR pszCatName; - LPCSTR pszInfoTypeName; -} HH_SET_INFOTYPE; - -typedef DWORD HH_INFOTYPE, *PHH_INFOTYPE; - -enum { - HHWIN_NAVTAB_TOP, - HHWIN_NAVTAB_LEFT, - HHWIN_NAVTAB_BOTTOM -}; - -#define HH_MAX_TABS 19 - -enum { - HH_TAB_CONTENTS, - HH_TAB_INDEX, - HH_TAB_SEARCH, - HH_TAB_FAVORITES, - HH_TAB_HISTORY, - HH_TAB_AUTHOR, - HH_TAB_CUSTOM_FIRST = 11, - HH_TAB_CUSTOM_LAST = HH_MAX_TABS -}; - -#define HH_MAX_TABS_CUSTOM (HH_TAB_CUSTOM_LAST-HH_TAB_CUSTOM_FIRST+1) -#define HH_FTS_DEFAULT_PROXIMITY -1 - -typedef struct tagHH_FTS_QUERYA { - int cbStruct; - BOOL fUniCodeStrings; - LPCSTR pszSearchQuery; - LONG iProximity; - BOOL fStemmedSearch; - BOOL fTitleOnly; - BOOL fExecute; - LPCSTR pszWindow; -} HH_FTS_QUERYA; - -typedef struct tagHH_FTS_QUERYW { - int cbStruct; - BOOL fUniCodeStrings; - LPCWSTR pszSearchQuery; - LONG iProximity; - BOOL fStemmedSearch; - BOOL fTitleOnly; - BOOL fExecute; - LPCWSTR pszWindow; -} HH_FTS_QUERYW; - -#ifdef _UNICODE -typedef HH_FTS_QUERYW HH_FTS_QUERY; -#else -typedef HH_FTS_QUERYA HH_FTS_QUERY; -#endif - -typedef struct tagHH_WINTYPEA { - int cbStruct; - BOOL fUniCodeStrings; - LPCSTR pszType; - DWORD fsValidMembers; - DWORD fsWinProperties; - LPCSTR pszCaption; - DWORD dwStyles; - DWORD dwExStyles; - RECT rcWindowPos; - int nShowState; - HWND hwndHelp; - HWND hwndCaller; - PHH_INFOTYPE paInfoTypes; - HWND hwndToolBar; - HWND hwndNavigation; - HWND hwndHTML; - int iNavWidth; - RECT rcHTML; - LPCSTR pszToc; - LPCSTR pszIndex; - LPCSTR pszFile; - LPCSTR pszHome; - DWORD fsToolBarFlags; - BOOL fNotExpanded; - int curNavType; - int tabpos; - int idNotify; - BYTE tabOrder[HH_MAX_TABS+1]; - int cHistory; - LPCSTR pszJump1; - LPCSTR pszJump2; - LPCSTR pszUrlJump1; - LPCSTR pszUrlJump2; - RECT rcMinSize; - int cbInfoTypes; - LPCSTR pszCustomTabs; -} HH_WINTYPEA, *PHH_WINTYPEA; - -typedef struct tagHH_WINTYPEW { - int cbStruct; - BOOL fUniCodeStrings; - LPCWSTR pszType; - DWORD fsValidMembers; - DWORD fsWinProperties; - LPCWSTR pszCaption; - DWORD dwStyles; - DWORD dwExStyles; - RECT rcWindowPos; - int nShowState; - HWND hwndHelp; - HWND hwndCaller; - PHH_INFOTYPE paInfoTypes; - HWND hwndToolBar; - HWND hwndNavigation; - HWND hwndHTML; - int iNavWidth; - RECT rcHTML; - LPCWSTR pszToc; - LPCWSTR pszIndex; - LPCWSTR pszFile; - LPCWSTR pszHome; - DWORD fsToolBarFlags; - BOOL fNotExpanded; - int curNavType; - int tabpos; - int idNotify; - BYTE tabOrder[HH_MAX_TABS+1]; - int cHistory; - LPCWSTR pszJump1; - LPCWSTR pszJump2; - LPCWSTR pszUrlJump1; - LPCWSTR pszUrlJump2; - RECT rcMinSize; - int cbInfoTypes; - LPCWSTR pszCustomTabs; -} HH_WINTYPEW, *PHH_WINTYPEW; - -#ifdef _UNICODE -typedef HH_WINTYPEW HH_WINTYPE; -#else -typedef HH_WINTYPEA HH_WINTYPE; -#endif - -enum { - HHACT_TAB_CONTENTS, - HHACT_TAB_INDEX, - HHACT_TAB_SEARCH, - HHACT_TAB_HISTORY, - HHACT_TAB_FAVORITES, - HHACT_EXPAND, - HHACT_CONTRACT, - HHACT_BACK, - HHACT_FORWARD, - HHACT_STOP, - HHACT_REFRESH, - HHACT_HOME, - HHACT_SYNC, - HHACT_OPTIONS, - HHACT_PRINT, - HHACT_HIGHLIGHT, - HHACT_CUSTOMIZE, - HHACT_JUMP1, - HHACT_JUMP2, - HHACT_ZOOM, - HHACT_TOC_NEXT, - HHACT_TOC_PREV, - HHACT_NOTES, - HHACT_LAST_ENUM -}; - -typedef struct tagHH_NTRACKA { - NMHDR hdr; - PCSTR pszCurUrl; - int idAction; - PHH_WINTYPEA phhWinType; -} HH_NTRACKA; - -typedef struct tagHH_NTRACKW { - NMHDR hdr; - PCSTR pszCurUrl; - int idAction; - PHH_WINTYPEW phhWinType; -} HH_NTRACKW; - -#ifdef _UNICODE -typedef HH_NTRACKW HH_NTRACK; -#else -typedef HH_NTRACKA HH_NTRACK; -#endif - -HWND WINAPI HtmlHelpA(HWND,LPCSTR,UINT,DWORD); -HWND WINAPI HtmlHelpA(HWND,LPCSTR,UINT,DWORD); -#define HtmlHelp WINELIB_NAME_AW(HtmlHelp) - -#define ATOM_HTMLHELP_API_ANSI (LPTSTR)14 -#define ATOM_HTMLHELP_API_UNICODE (LPTSTR)15 - -typedef enum tagHH_GPROPID { - HH_GPROPID_SINGLETHREAD = 1, - HH_GPROPID_TOOLBAR_MARGIN = 2, - HH_GPROPID_UI_LANGUAGE = 3, - HH_GPROPID_CURRENT_SUBSET = 4, - HH_GPROPID_CONTENT_LANGUAGE = 5 -} HH_GPROPID; - -#ifdef __WIDL_OAIDL_H - -typedef struct tagHH_GLOBAL_PROPERTY -{ - HH_GPROPID id; - VARIANT var; -} HH_GLOBAL_PROPERTY ; - -#endif /* __WIDL_OAIDL_H */ - -#ifdef __cplusplus -} -#endif - -#endif /* __HTMLHELP_H__ */ diff --git a/Externals/wxWidgets3/include/wx/msw/hyperlink.h b/Externals/wxWidgets3/include/wx/msw/hyperlink.h deleted file mode 100644 index 847695b273..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/hyperlink.h +++ /dev/null @@ -1,64 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/hyperlink.h -// Purpose: Hyperlink control -// Author: Rickard Westerlund -// Created: 2010-08-04 -// Copyright: (c) 2010 wxWidgets team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_HYPERLINK_H_ -#define _WX_MSW_HYPERLINK_H_ - -#include "wx/generic/hyperlink.h" - -// ---------------------------------------------------------------------------- -// wxHyperlinkCtrl -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxHyperlinkCtrl : public wxGenericHyperlinkCtrl -{ -public: - // Default constructor (for two-step construction). - wxHyperlinkCtrl() { } - - // Constructor. - wxHyperlinkCtrl(wxWindow *parent, - wxWindowID id, - const wxString& label, const wxString& url, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxHL_DEFAULT_STYLE, - const wxString& name = wxHyperlinkCtrlNameStr) - { - (void)Create(parent, id, label, url, pos, size, style, name); - } - - // Creation function (for two-step construction). - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& label, const wxString& url, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxHL_DEFAULT_STYLE, - const wxString& name = wxHyperlinkCtrlNameStr); - - - // overridden base class methods - // ----------------------------- - - virtual void SetURL(const wxString &url); - - virtual void SetLabel(const wxString &label); - -protected: - virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; - virtual wxSize DoGetBestClientSize() const; - -private: - virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); - - wxDECLARE_DYNAMIC_CLASS( wxHyperlinkCtrl ); -}; - -#endif // _WX_MSW_HYPERLINK_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/ia64.manifest b/Externals/wxWidgets3/include/wx/msw/ia64.manifest deleted file mode 100644 index 242ea4b624..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/ia64.manifest +++ /dev/null @@ -1,22 +0,0 @@ - - - -wxWindows application - - - - - - diff --git a/Externals/wxWidgets3/include/wx/msw/icon.h b/Externals/wxWidgets3/include/wx/msw/icon.h deleted file mode 100644 index 6bf5acb897..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/icon.h +++ /dev/null @@ -1,96 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/icon.h -// Purpose: wxIcon class -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_ICON_H_ -#define _WX_ICON_H_ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/msw/gdiimage.h" - -// --------------------------------------------------------------------------- -// icon data -// --------------------------------------------------------------------------- - -// notice that although wxIconRefData inherits from wxBitmapRefData, it is not -// a valid wxBitmapRefData -class WXDLLIMPEXP_CORE wxIconRefData : public wxGDIImageRefData -{ -public: - wxIconRefData() { } - virtual ~wxIconRefData() { Free(); } - - virtual void Free(); -}; - -// --------------------------------------------------------------------------- -// Icon -// --------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxIcon : public wxGDIImage -{ -public: - // ctors - // default - wxIcon() { } - - // from raw data - wxIcon(const char bits[], int width, int height); - - // from XPM data - wxIcon(const char* const* data) { CreateIconFromXpm(data); } -#ifdef wxNEEDS_CHARPP - wxIcon(char **data) { CreateIconFromXpm(const_cast(data)); } -#endif - // from resource/file - wxIcon(const wxString& name, - wxBitmapType type = wxICON_DEFAULT_TYPE, - int desiredWidth = -1, int desiredHeight = -1); - - wxIcon(const wxIconLocation& loc); - - virtual ~wxIcon(); - - virtual bool LoadFile(const wxString& name, - wxBitmapType type = wxICON_DEFAULT_TYPE, - int desiredWidth = -1, int desiredHeight = -1); - - bool CreateFromHICON(WXHICON icon); - - // implementation only from now on - wxIconRefData *GetIconData() const { return (wxIconRefData *)m_refData; } - - void SetHICON(WXHICON icon) { SetHandle((WXHANDLE)icon); } - WXHICON GetHICON() const { return (WXHICON)GetHandle(); } - - // create from bitmap (which should have a mask unless it's monochrome): - // there shouldn't be any implicit bitmap -> icon conversion (i.e. no - // ctors, assignment operators...), but it's ok to have such function - void CopyFromBitmap(const wxBitmap& bmp); - -protected: - virtual wxGDIImageRefData *CreateData() const - { - return new wxIconRefData; - } - - virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; - - // create from XPM data - void CreateIconFromXpm(const char* const* data); - -private: - wxDECLARE_DYNAMIC_CLASS(wxIcon); -}; - -#endif - // _WX_ICON_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/imaglist.h b/Externals/wxWidgets3/include/wx/msw/imaglist.h deleted file mode 100644 index daedc31878..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/imaglist.h +++ /dev/null @@ -1,209 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/imaglist.h -// Purpose: wxImageList class -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_IMAGLIST_H_ -#define _WX_IMAGLIST_H_ - -#include "wx/bitmap.h" - -// Eventually we'll make this a reference-counted wxGDIObject. For -// now, the app must take care of ownership issues. That is, the -// image lists must be explicitly deleted after the control(s) that uses them -// is (are) deleted, or when the app exits. -class WXDLLIMPEXP_CORE wxImageList : public wxObject -{ -public: - /* - * Public interface - */ - - wxImageList(); - - // Creates an image list. - // Specify the width and height of the images in the list, - // whether there are masks associated with them (e.g. if creating images - // from icons), and the initial size of the list. - wxImageList(int width, int height, bool mask = true, int initialCount = 1) - { - Create(width, height, mask, initialCount); - } - virtual ~wxImageList(); - - - // Attributes - //////////////////////////////////////////////////////////////////////////// - - // Returns the number of images in the image list. - int GetImageCount() const; - - // Returns the size (same for all images) of the images in the list - bool GetSize(int index, int &width, int &height) const; - - // Returns the overall size - wxSize GetSize() const { return m_size; } - - // Operations - //////////////////////////////////////////////////////////////////////////// - - // Creates an image list - // width, height specify the size of the images in the list (all the same). - // mask specifies whether the images have masks or not. - // initialNumber is the initial number of images to reserve. - bool Create(int width, int height, bool mask = true, int initialNumber = 1); - - // Adds a bitmap, and optionally a mask bitmap. - // Note that wxImageList creates *new* bitmaps, so you may delete - // 'bitmap' and 'mask' after calling Add. - int Add(const wxBitmap& bitmap, const wxBitmap& mask = wxNullBitmap); - - // Adds a bitmap, using the specified colour to create the mask bitmap - // Note that wxImageList creates *new* bitmaps, so you may delete - // 'bitmap' after calling Add. - int Add(const wxBitmap& bitmap, const wxColour& maskColour); - - // Adds a bitmap and mask from an icon. - int Add(const wxIcon& icon); - - // Replaces a bitmap, optionally passing a mask bitmap. - // Note that wxImageList creates new bitmaps, so you may delete - // 'bitmap' and 'mask' after calling Replace. - bool Replace(int index, const wxBitmap& bitmap, const wxBitmap& mask = wxNullBitmap); - -/* Not supported by Win95 - // Replacing a bitmap, using the specified colour to create the mask bitmap - // Note that wxImageList creates new bitmaps, so you may delete - // 'bitmap'. - bool Replace(int index, const wxBitmap& bitmap, const wxColour& maskColour); -*/ - - // Replaces a bitmap and mask from an icon. - // You can delete 'icon' after calling Replace. - bool Replace(int index, const wxIcon& icon); - - // Removes the image at the given index. - bool Remove(int index); - - // Remove all images - bool RemoveAll(); - - // Draws the given image on a dc at the specified position. - // If 'solidBackground' is true, Draw sets the image list background - // colour to the background colour of the wxDC, to speed up - // drawing by eliminating masked drawing where possible. - bool Draw(int index, wxDC& dc, int x, int y, - int flags = wxIMAGELIST_DRAW_NORMAL, - bool solidBackground = false); - - // Get a bitmap - wxBitmap GetBitmap(int index) const; - - // Get an icon - wxIcon GetIcon(int index) const; - - // TODO: miscellaneous functionality -/* - wxIcon *MakeIcon(int index); - bool SetOverlayImage(int index, int overlayMask); - -*/ - - // TODO: Drag-and-drop related functionality. - -#if 0 - // Creates a new drag image by combining the given image (typically a mouse cursor image) - // with the current drag image. - bool SetDragCursorImage(int index, const wxPoint& hotSpot); - - // If successful, returns a pointer to the temporary image list that is used for dragging; - // otherwise, NULL. - // dragPos: receives the current drag position. - // hotSpot: receives the offset of the drag image relative to the drag position. - static wxImageList *GetDragImageList(wxPoint& dragPos, wxPoint& hotSpot); - - // Call this function to begin dragging an image. This function creates a temporary image list - // that is used for dragging. The image combines the specified image and its mask with the - // current cursor. In response to subsequent mouse move messages, you can move the drag image - // by using the DragMove member function. To end the drag operation, you can use the EndDrag - // member function. - bool BeginDrag(int index, const wxPoint& hotSpot); - - // Ends a drag operation. - bool EndDrag(); - - // Call this function to move the image that is being dragged during a drag-and-drop operation. - // This function is typically called in response to a mouse move message. To begin a drag - // operation, use the BeginDrag member function. - static bool DragMove(const wxPoint& point); - - // During a drag operation, locks updates to the window specified by lockWindow and displays - // the drag image at the position specified by point. - // The coordinates are relative to the window's upper left corner, so you must compensate - // for the widths of window elements, such as the border, title bar, and menu bar, when - // specifying the coordinates. - // If lockWindow is NULL, this function draws the image in the display context associated - // with the desktop window, and coordinates are relative to the upper left corner of the screen. - // This function locks all other updates to the given window during the drag operation. - // If you need to do any drawing during a drag operation, such as highlighting the target - // of a drag-and-drop operation, you can temporarily hide the dragged image by using the - // wxImageList::DragLeave function. - - // lockWindow: pointer to the window that owns the drag image. - // point: position at which to display the drag image. Coordinates are relative to the - // upper left corner of the window (not the client area). - - static bool DragEnter( wxWindow *lockWindow, const wxPoint& point ); - - // Unlocks the window specified by pWndLock and hides the drag image, allowing the - // window to be updated. - static bool DragLeave( wxWindow *lockWindow ); - - /* Here's roughly how you'd use these functions if implemented in this Win95-like way: - - 1) Starting to drag: - - wxImageList *dragImageList = new wxImageList(16, 16, true); - dragImageList->Add(myDragImage); // Provide an image to combine with the current cursor - dragImageList->BeginDrag(0, wxPoint(0, 0)); - wxShowCursor(false); // wxShowCursor not yet implemented in wxWin - myWindow->CaptureMouse(); - - 2) Dragging: - - // Called within mouse move event. Could also use dragImageList instead of assuming - // these are static functions. - // These two functions could possibly be combined into one, since DragEnter is - // a bit obscure. - wxImageList::DragMove(wxPoint(x, y)); // x, y are current cursor position - wxImageList::DragEnter(NULL, wxPoint(x, y)); // NULL assumes dragging across whole screen - - 3) Finishing dragging: - - dragImageList->EndDrag(); - myWindow->ReleaseMouse(); - wxShowCursor(true); -*/ - -#endif - - // Implementation - //////////////////////////////////////////////////////////////////////////// - - // Returns the native image list handle - WXHIMAGELIST GetHIMAGELIST() const { return m_hImageList; } - -protected: - WXHIMAGELIST m_hImageList; - wxSize m_size; - - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxImageList); -}; - -#endif - // _WX_IMAGLIST_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/iniconf.h b/Externals/wxWidgets3/include/wx/msw/iniconf.h deleted file mode 100644 index b08c52c857..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/iniconf.h +++ /dev/null @@ -1,105 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/iniconf.h -// Purpose: INI-file based wxConfigBase implementation -// Author: Vadim Zeitlin -// Modified by: -// Created: 27.07.98 -// Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_INICONF_H_ -#define _WX_MSW_INICONF_H_ - -#include "wx/defs.h" - -#if wxUSE_CONFIG && wxUSE_INICONF - -// ---------------------------------------------------------------------------- -// wxIniConfig is a wxConfig implementation which uses MS Windows INI files to -// store the data. Because INI files don't really support arbitrary nesting of -// groups, we do the following: -// (1) in win.ini file we store all entries in the [vendor] section and -// the value group1/group2/key is mapped to the value group1_group2_key -// in this section, i.e. all path separators are replaced with underscore -// (2) in appname.ini file we map group1/group2/group3/key to the entry -// group2_group3_key in [group1] -// -// Of course, it might lead to indesirable results if '_' is also used in key -// names (i.e. group/key is the same as group_key) and also GetPath() result -// may be not what you would expect it to be. -// -// Another limitation: the keys and section names are never case-sensitive -// which might differ from wxFileConfig it it was compiled with -// wxCONFIG_CASE_SENSITIVE option. -// ---------------------------------------------------------------------------- - -// for this class, "local" file is the file appname.ini and the global file -// is the [vendor] subsection of win.ini (default for "vendor" is to be the -// same as appname). The file name (strAppName parameter) may, in fact, -// contain the full path to the file. If it doesn't, the file is searched for -// in the Windows directory. -class WXDLLIMPEXP_CORE wxIniConfig : public wxConfigBase -{ -public: - // ctor & dtor - // if strAppName doesn't contain the extension and is not an absolute path, - // ".ini" is appended to it. if strVendor is empty, it's taken to be the - // same as strAppName. - wxIniConfig(const wxString& strAppName = wxEmptyString, const wxString& strVendor = wxEmptyString, - const wxString& localFilename = wxEmptyString, const wxString& globalFilename = wxEmptyString, long style = wxCONFIG_USE_LOCAL_FILE); - virtual ~wxIniConfig(); - - // implement inherited pure virtual functions - virtual void SetPath(const wxString& strPath); - virtual const wxString& GetPath() const; - - virtual bool GetFirstGroup(wxString& str, long& lIndex) const; - virtual bool GetNextGroup (wxString& str, long& lIndex) const; - virtual bool GetFirstEntry(wxString& str, long& lIndex) const; - virtual bool GetNextEntry (wxString& str, long& lIndex) const; - - virtual size_t GetNumberOfEntries(bool bRecursive = false) const; - virtual size_t GetNumberOfGroups(bool bRecursive = false) const; - - virtual bool HasGroup(const wxString& strName) const; - virtual bool HasEntry(const wxString& strName) const; - - // return true if the current group is empty - bool IsEmpty() const; - - virtual bool Flush(bool bCurrentOnly = false); - - virtual bool RenameEntry(const wxString& oldName, const wxString& newName); - virtual bool RenameGroup(const wxString& oldName, const wxString& newName); - - virtual bool DeleteEntry(const wxString& Key, bool bGroupIfEmptyAlso = true); - virtual bool DeleteGroup(const wxString& szKey); - virtual bool DeleteAll(); - -protected: - // read/write - bool DoReadString(const wxString& key, wxString *pStr) const; - bool DoReadLong(const wxString& key, long *plResult) const; - bool DoReadBinary(const wxString& key, wxMemoryBuffer *buf) const; - - bool DoWriteString(const wxString& key, const wxString& szValue); - bool DoWriteLong(const wxString& key, long lValue); - bool DoWriteBinary(const wxString& key, const wxMemoryBuffer& buf); - -private: - // helpers - wxString GetPrivateKeyName(const wxString& szKey) const; - wxString GetKeyName(const wxString& szKey) const; - - wxString m_strLocalFilename; // name of the private INI file - wxString m_strGroup, // current group in appname.ini file - m_strPath; // the rest of the path (no trailing '_'!) - - wxDECLARE_NO_COPY_CLASS(wxIniConfig); - wxDECLARE_ABSTRACT_CLASS(wxIniConfig); -}; - -#endif // wxUSE_CONFIG && wxUSE_INICONF - -#endif // _WX_MSW_INICONF_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/init.h b/Externals/wxWidgets3/include/wx/msw/init.h deleted file mode 100644 index 847fb0888c..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/init.h +++ /dev/null @@ -1,85 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/init.h -// Purpose: Windows-specific wxEntry() overload -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_INIT_H_ -#define _WX_MSW_INIT_H_ - -// ---------------------------------------------------------------------------- -// Windows-specific wxEntry() overload and wxIMPLEMENT_WXWIN_MAIN definition -// ---------------------------------------------------------------------------- - -// we need HINSTANCE declaration to define WinMain() -#include "wx/msw/wrapwin.h" - -#ifndef SW_SHOWNORMAL - #define SW_SHOWNORMAL 1 -#endif - -// WinMain() is always ANSI, even in Unicode build. -typedef char *wxCmdLineArgType; - -// Windows-only overloads of wxEntry() and wxEntryStart() which take the -// parameters passed to WinMain() instead of those passed to main() -extern WXDLLIMPEXP_CORE bool - wxEntryStart(HINSTANCE hInstance, - HINSTANCE hPrevInstance = NULL, - wxCmdLineArgType pCmdLine = NULL, - int nCmdShow = SW_SHOWNORMAL); - -extern WXDLLIMPEXP_CORE int - wxEntry(HINSTANCE hInstance, - HINSTANCE hPrevInstance = NULL, - wxCmdLineArgType pCmdLine = NULL, - int nCmdShow = SW_SHOWNORMAL); - -#if defined(__BORLANDC__) && wxUSE_UNICODE - // Borland C++ has the following nonstandard behaviour: when the -WU - // command line flag is used, the linker expects to find wWinMain instead - // of WinMain. This flag causes the compiler to define _UNICODE and - // UNICODE symbols and there's no way to detect its use, so we have to - // define both WinMain and wWinMain so that wxIMPLEMENT_WXWIN_MAIN works - // for both code compiled with and without -WU. - // See http://sourceforge.net/tracker/?func=detail&atid=309863&aid=1935997&group_id=9863 - // for more details. - #define wxIMPLEMENT_WXWIN_MAIN_BORLAND_NONSTANDARD \ - extern "C" int WINAPI wWinMain(HINSTANCE hInstance, \ - HINSTANCE hPrevInstance, \ - wchar_t * WXUNUSED(lpCmdLine), \ - int nCmdShow) \ - { \ - wxDISABLE_DEBUG_SUPPORT(); \ - \ - /* NB: wxEntry expects lpCmdLine argument to be char*, not */ \ - /* wchar_t*, but fortunately it's not used anywhere */ \ - /* and we can simply pass NULL in: */ \ - return wxEntry(hInstance, hPrevInstance, NULL, nCmdShow); \ - } -#else - #define wxIMPLEMENT_WXWIN_MAIN_BORLAND_NONSTANDARD -#endif // defined(__BORLANDC__) && wxUSE_UNICODE - -#define wxIMPLEMENT_WXWIN_MAIN \ - extern "C" int WINAPI WinMain(HINSTANCE hInstance, \ - HINSTANCE hPrevInstance, \ - wxCmdLineArgType WXUNUSED(lpCmdLine), \ - int nCmdShow) \ - { \ - wxDISABLE_DEBUG_SUPPORT(); \ - \ - /* NB: We pass NULL in place of lpCmdLine to behave the same as */ \ - /* Borland-specific wWinMain() above. If it becomes needed */ \ - /* to pass lpCmdLine to wxEntry() here, you'll have to fix */ \ - /* wWinMain() above too. */ \ - return wxEntry(hInstance, hPrevInstance, NULL, nCmdShow); \ - } \ - wxIMPLEMENT_WXWIN_MAIN_BORLAND_NONSTANDARD - - -#endif // _WX_MSW_INIT_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/joystick.h b/Externals/wxWidgets3/include/wx/msw/joystick.h deleted file mode 100644 index 09c8bcb7c8..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/joystick.h +++ /dev/null @@ -1,91 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/joystick.h -// Purpose: wxJoystick class -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_JOYSTICK_H_ -#define _WX_JOYSTICK_H_ - -#include "wx/event.h" - -class WXDLLIMPEXP_ADV wxJoystick: public wxObject -{ - wxDECLARE_DYNAMIC_CLASS(wxJoystick); -public: - /* - * Public interface - */ - - wxJoystick(int joystick = wxJOYSTICK1); - - // Attributes - //////////////////////////////////////////////////////////////////////////// - - wxPoint GetPosition(void) const; - int GetPosition(unsigned axis) const; - bool GetButtonState(unsigned button) const; - int GetZPosition(void) const; - int GetButtonState(void) const; - int GetPOVPosition(void) const; - int GetPOVCTSPosition(void) const; - int GetRudderPosition(void) const; - int GetUPosition(void) const; - int GetVPosition(void) const; - int GetMovementThreshold(void) const; - void SetMovementThreshold(int threshold) ; - - // Capabilities - //////////////////////////////////////////////////////////////////////////// - - static int GetNumberJoysticks(void); - - bool IsOk(void) const; // Checks that the joystick is functioning - int GetManufacturerId(void) const ; - int GetProductId(void) const ; - wxString GetProductName(void) const ; - int GetXMin(void) const; - int GetYMin(void) const; - int GetZMin(void) const; - int GetXMax(void) const; - int GetYMax(void) const; - int GetZMax(void) const; - int GetNumberButtons(void) const; - int GetNumberAxes(void) const; - int GetMaxButtons(void) const; - int GetMaxAxes(void) const; - int GetPollingMin(void) const; - int GetPollingMax(void) const; - int GetRudderMin(void) const; - int GetRudderMax(void) const; - int GetUMin(void) const; - int GetUMax(void) const; - int GetVMin(void) const; - int GetVMax(void) const; - - bool HasRudder(void) const; - bool HasZ(void) const; - bool HasU(void) const; - bool HasV(void) const; - bool HasPOV(void) const; - bool HasPOV4Dir(void) const; - bool HasPOVCTS(void) const; - - // Operations - //////////////////////////////////////////////////////////////////////////// - - // pollingFreq = 0 means that movement events are sent when above the threshold. - // If pollingFreq > 0, events are received every this many milliseconds. - bool SetCapture(wxWindow* win, int pollingFreq = 0); - bool ReleaseCapture(void); - -protected: - int m_joystick; -}; - -#endif - // _WX_JOYSTICK_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/libraries.h b/Externals/wxWidgets3/include/wx/msw/libraries.h deleted file mode 100644 index abd0046a74..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/libraries.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Name: wx/msw/libraries.h - * Purpose: Pragmas for linking libs conditionally - * Author: Michael Wetherell - * Modified by: - * Copyright: (c) 2005 Michael Wetherell - * Licence: wxWindows licence - */ - -#ifndef _WX_MSW_LIBRARIES_H_ -#define _WX_MSW_LIBRARIES_H_ - -/* - * Notes: - * - * In general the preferred place to add libs is in the bakefiles. This file - * can be used where libs must be added conditionally, for those compilers that - * support a way to do that. - */ - -#if defined __VISUALC__ && wxUSE_ACCESSIBILITY -#pragma comment(lib, "oleacc") -#endif - -#endif /* _WX_MSW_LIBRARIES_H_ */ diff --git a/Externals/wxWidgets3/include/wx/msw/listbox.h b/Externals/wxWidgets3/include/wx/msw/listbox.h deleted file mode 100644 index ffd8b68752..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/listbox.h +++ /dev/null @@ -1,206 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/listbox.h -// Purpose: wxListBox class -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_LISTBOX_H_ -#define _WX_LISTBOX_H_ - -#if wxUSE_LISTBOX - -// ---------------------------------------------------------------------------- -// simple types -// ---------------------------------------------------------------------------- - -#if wxUSE_OWNER_DRAWN - class WXDLLIMPEXP_FWD_CORE wxOwnerDrawn; - - // define the array of list box items - #include "wx/dynarray.h" - - WX_DEFINE_EXPORTED_ARRAY_PTR(wxOwnerDrawn *, wxListBoxItemsArray); -#endif // wxUSE_OWNER_DRAWN - -// forward declaration for GetSelections() -class WXDLLIMPEXP_FWD_BASE wxArrayInt; - -// ---------------------------------------------------------------------------- -// List box control -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxListBox : public wxListBoxBase -{ -public: - // ctors and such - wxListBox() { Init(); } - wxListBox(wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxListBoxNameStr) - { - Init(); - - Create(parent, id, pos, size, n, choices, style, validator, name); - } - wxListBox(wxWindow *parent, wxWindowID id, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxListBoxNameStr) - { - Init(); - - Create(parent, id, pos, size, choices, style, validator, name); - } - - bool Create(wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxListBoxNameStr); - bool Create(wxWindow *parent, wxWindowID id, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxListBoxNameStr); - - virtual ~wxListBox(); - - virtual unsigned int GetCount() const; - virtual wxString GetString(unsigned int n) const; - virtual void SetString(unsigned int n, const wxString& s); - virtual int FindString(const wxString& s, bool bCase = false) const; - - virtual bool IsSelected(int n) const; - virtual int GetSelection() const; - virtual int GetSelections(wxArrayInt& aSelections) const; - - // return the index of the item at this position or wxNOT_FOUND - int HitTest(const wxPoint& pt) const { return DoHitTestList(pt); } - int HitTest(wxCoord x, wxCoord y) const { return DoHitTestList(wxPoint(x, y)); } - - virtual void EnsureVisible(int n); - - virtual int GetTopItem() const; - virtual int GetCountPerPage() const; - - // ownerdrawn wxListBox and wxCheckListBox support -#if wxUSE_OWNER_DRAWN - // override base class virtuals - virtual bool SetFont(const wxFont &font); - - bool MSWOnMeasure(WXMEASUREITEMSTRUCT *item); - bool MSWOnDraw(WXDRAWITEMSTRUCT *item); - - // plug-in for derived classes - virtual wxOwnerDrawn *CreateLboxItem(size_t n); - - // allows to get the item and use SetXXX functions to set it's appearance - wxOwnerDrawn *GetItem(size_t n) const { return m_aItems[n]; } - - // get the index of the given item - int GetItemIndex(wxOwnerDrawn *item) const { return m_aItems.Index(item); } - - // get rect of the given item index - bool GetItemRect(size_t n, wxRect& rect) const; - - // redraw the given item - bool RefreshItem(size_t n); -#endif // wxUSE_OWNER_DRAWN - - // Windows-specific code to update the horizontal extent of the listbox, if - // necessary. If s is non-empty, the horizontal extent is increased to the - // length of this string if it's currently too short, otherwise the maximum - // extent of all strings is used. In any case calls InvalidateBestSize() - virtual void SetHorizontalExtent(const wxString& s = wxEmptyString); - - // Windows callbacks - bool MSWCommand(WXUINT param, WXWORD id); - WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; - - // under XP when using "transition effect for menus and tooltips" if we - // return true for WM_PRINTCLIENT here then it causes noticeable slowdown - virtual bool MSWShouldPropagatePrintChild() - { - return false; - } - - virtual wxVisualAttributes GetDefaultAttributes() const - { - return GetClassDefaultAttributes(GetWindowVariant()); - } - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL) - { - return GetCompositeControlsDefaultAttributes(variant); - } - - // returns true if the platform should explicitly apply a theme border - virtual bool CanApplyThemeBorder() const { return false; } - - virtual void OnInternalIdle(); - -protected: - virtual wxSize DoGetBestClientSize() const; - - virtual void DoClear(); - virtual void DoDeleteOneItem(unsigned int n); - - virtual void DoSetSelection(int n, bool select); - - virtual int DoInsertItems(const wxArrayStringsAdapter& items, - unsigned int pos, - void **clientData, wxClientDataType type); - - virtual void DoSetFirstItem(int n); - virtual void DoSetItemClientData(unsigned int n, void* clientData); - virtual void* DoGetItemClientData(unsigned int n) const; - - // this can't be called DoHitTest() because wxWindow already has this method - virtual int DoHitTestList(const wxPoint& point) const; - - // free memory (common part of Clear() and dtor) - void Free(); - - unsigned int m_noItems; - -#if wxUSE_OWNER_DRAWN - // control items - wxListBoxItemsArray m_aItems; -#endif - -private: - // common part of all ctors - void Init(); - - // call this when items are added to or deleted from the listbox or an - // items text changes - void MSWOnItemsChanged(); - - // flag indicating whether the max horizontal extent should be updated, - // i.e. if we need to call SetHorizontalExtent() from OnInternalIdle() - bool m_updateHorizontalExtent; - - - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxListBox); -}; - -#endif // wxUSE_LISTBOX - -#endif - // _WX_LISTBOX_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/listctrl.h b/Externals/wxWidgets3/include/wx/msw/listctrl.h deleted file mode 100644 index 1b8beaed63..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/listctrl.h +++ /dev/null @@ -1,469 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/listctrl.h -// Purpose: wxListCtrl class -// Author: Julian Smart -// Modified by: Agron Selimaj -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_LISTCTRL_H_ -#define _WX_LISTCTRL_H_ - -#include "wx/textctrl.h" -#include "wx/dynarray.h" -#include "wx/vector.h" - -class wxMSWListItemData; - -// define this symbol to indicate the availability of SetColumnsOrder() and -// related functions -#define wxHAS_LISTCTRL_COLUMN_ORDER - -/* - The wxListCtrl can show lists of items in four different modes: - wxLC_LIST: multicolumn list view, with optional small icons (icons could be - optional for some platforms). Columns are computed automatically, - i.e. you don't set columns as in wxLC_REPORT. In other words, - the list wraps, unlike a wxListBox. - wxLC_REPORT: single or multicolumn report view (with optional header) - wxLC_ICON: large icon view, with optional labels - wxLC_SMALL_ICON: small icon view, with optional labels - - You can change the style dynamically, either with SetSingleStyle or - SetWindowStyleFlag. - - Further window styles: - - wxLC_ALIGN_TOP icons align to the top (default) - wxLC_ALIGN_LEFT icons align to the left - wxLC_AUTOARRANGE icons arrange themselves - wxLC_USER_TEXT the app provides label text on demand, except for column headers - wxLC_EDIT_LABELS labels are editable: app will be notified. - wxLC_NO_HEADER no header in report mode - wxLC_NO_SORT_HEADER can't click on header - wxLC_SINGLE_SEL single selection - wxLC_SORT_ASCENDING sort ascending (must still supply a comparison callback in SortItems) - wxLC_SORT_DESCENDING sort descending (ditto) - - Items are referred to by their index (position in the list starting from zero). - - Label text is supplied via insertion/setting functions and is stored by the - control, unless the wxLC_USER_TEXT style has been specified, in which case - the app will be notified when text is required (see sample). - - Images are dealt with by (optionally) associating 3 image lists with the control. - Zero-based indexes into these image lists indicate which image is to be used for - which item. Each image in an image list can contain a mask, and can be made out - of either a bitmap, two bitmaps or an icon. See ImagList.h for more details. - - Notifications are passed via the wxWidgets 2.0 event system, or using virtual - functions in wxWidgets 1.66. - - See the sample wxListCtrl app for API usage. - - TODO: - - addition of further convenience functions - to avoid use of wxListItem in some functions - - state/overlay images: probably not needed. - - in Win95, you can be called back to supply other information - besides text, such as state information. This saves no memory - and is probably superfluous to requirements. - - testing of whole API, extending current sample. - - - */ - -class WXDLLIMPEXP_CORE wxListCtrl: public wxListCtrlBase -{ -public: - /* - * Public interface - */ - - wxListCtrl() { Init(); } - - wxListCtrl(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxLC_ICON, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxListCtrlNameStr) - { - Init(); - - Create(parent, id, pos, size, style, validator, name); - } - - virtual ~wxListCtrl(); - - bool Create(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxLC_ICON, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxListCtrlNameStr); - - - // Attributes - //////////////////////////////////////////////////////////////////////////// - - // Set the control colours - bool SetForegroundColour(const wxColour& col); - bool SetBackgroundColour(const wxColour& col); - - // Gets information about this column - bool GetColumn(int col, wxListItem& item) const; - - // Sets information about this column - bool SetColumn(int col, const wxListItem& item); - - // Gets the column width - int GetColumnWidth(int col) const; - - // Sets the column width - bool SetColumnWidth(int col, int width); - - - // Gets the column order from its index or index from its order - int GetColumnOrder(int col) const; - int GetColumnIndexFromOrder(int order) const; - - // Gets the column order for all columns - wxArrayInt GetColumnsOrder() const; - - // Sets the column order for all columns - bool SetColumnsOrder(const wxArrayInt& orders); - - - // Gets the number of items that can fit vertically in the - // visible area of the list control (list or report view) - // or the total number of items in the list control (icon - // or small icon view) - int GetCountPerPage() const; - - // return the total area occupied by all the items (icon/small icon only) - wxRect GetViewRect() const; - - // Gets the edit control for editing labels. - wxTextCtrl* GetEditControl() const; - - // Gets information about the item - bool GetItem(wxListItem& info) const; - - // Sets information about the item - bool SetItem(wxListItem& info); - - // Sets a string field at a particular column - long SetItem(long index, int col, const wxString& label, int imageId = -1); - - // Gets the item state - int GetItemState(long item, long stateMask) const; - - // Sets the item state - bool SetItemState(long item, long state, long stateMask); - - // Sets the item image - bool SetItemImage(long item, int image, int selImage = -1); - bool SetItemColumnImage(long item, long column, int image); - - // Gets the item text - wxString GetItemText(long item, int col = 0) const; - - // Sets the item text - void SetItemText(long item, const wxString& str); - - // Gets the item data - wxUIntPtr GetItemData(long item) const; - - // Sets the item data - bool SetItemPtrData(long item, wxUIntPtr data); - bool SetItemData(long item, long data) { return SetItemPtrData(item, data); } - - // Gets the item rectangle - bool GetItemRect(long item, wxRect& rect, int code = wxLIST_RECT_BOUNDS) const; - - // Gets the subitem rectangle in report mode - bool GetSubItemRect(long item, long subItem, wxRect& rect, int code = wxLIST_RECT_BOUNDS) const; - - // Gets the item position - bool GetItemPosition(long item, wxPoint& pos) const; - - // Sets the item position - bool SetItemPosition(long item, const wxPoint& pos); - - // Gets the number of items in the list control - int GetItemCount() const; - - // Gets the number of columns in the list control - int GetColumnCount() const { return m_colCount; } - - // get the horizontal and vertical components of the item spacing - wxSize GetItemSpacing() const; - - // Foreground colour of an item. - void SetItemTextColour( long item, const wxColour& col); - wxColour GetItemTextColour( long item ) const; - - // Background colour of an item. - void SetItemBackgroundColour( long item, const wxColour &col); - wxColour GetItemBackgroundColour( long item ) const; - - // Font of an item. - void SetItemFont( long item, const wxFont &f); - wxFont GetItemFont( long item ) const; - - // Checkbox state of an item - virtual bool HasCheckboxes() const wxOVERRIDE; - virtual bool EnableCheckboxes(bool enable = true) wxOVERRIDE; - virtual bool IsItemChecked(long item) const wxOVERRIDE; - virtual void CheckItem(long item, bool check) wxOVERRIDE; - - // Gets the number of selected items in the list control - int GetSelectedItemCount() const; - - // Gets the text colour of the listview - wxColour GetTextColour() const; - - // Sets the text colour of the listview - void SetTextColour(const wxColour& col); - - // Gets the index of the topmost visible item when in - // list or report view - long GetTopItem() const; - - // Add or remove a single window style - void SetSingleStyle(long style, bool add = true); - - // Set the whole window style - void SetWindowStyleFlag(long style); - - // Searches for an item, starting from 'item'. - // item can be -1 to find the first item that matches the - // specified flags. - // Returns the item or -1 if unsuccessful. - long GetNextItem(long item, int geometry = wxLIST_NEXT_ALL, int state = wxLIST_STATE_DONTCARE) const; - - // Gets one of the three image lists - wxImageList *GetImageList(int which) const; - - // Sets the image list - // N.B. There's a quirk in the Win95 list view implementation. - // If in wxLC_LIST mode, it'll *still* display images by the labels if - // there's a small-icon image list set for the control - even though you - // haven't specified wxLIST_MASK_IMAGE when inserting. - // So you have to set a NULL small-icon image list to be sure that - // the wxLC_LIST mode works without icons. Of course, you may want icons... - void SetImageList(wxImageList *imageList, int which); - void AssignImageList(wxImageList *imageList, int which); - - // refresh items selectively (only useful for virtual list controls) - void RefreshItem(long item); - void RefreshItems(long itemFrom, long itemTo); - - // Operations - //////////////////////////////////////////////////////////////////////////// - - // Arranges the items - bool Arrange(int flag = wxLIST_ALIGN_DEFAULT); - - // Deletes an item - bool DeleteItem(long item); - - // Deletes all items - bool DeleteAllItems(); - - // Deletes a column - bool DeleteColumn(int col); - - // Deletes all columns - bool DeleteAllColumns(); - - // Clears items, and columns if there are any. - void ClearAll(); - - // Edit the label - wxTextCtrl* EditLabel(long item, wxClassInfo* textControlClass = wxCLASSINFO(wxTextCtrl)); - - // End label editing, optionally cancelling the edit - bool EndEditLabel(bool cancel); - - // Ensures this item is visible - bool EnsureVisible(long item); - - // Find an item whose label matches this string, starting from the item after 'start' - // or the beginning if 'start' is -1. - long FindItem(long start, const wxString& str, bool partial = false); - - // Find an item whose data matches this data, starting from the item after 'start' - // or the beginning if 'start' is -1. - long FindItem(long start, wxUIntPtr data); - - // Find an item nearest this position in the specified direction, starting from - // the item after 'start' or the beginning if 'start' is -1. - long FindItem(long start, const wxPoint& pt, int direction); - - // Determines which item (if any) is at the specified point, - // giving details in 'flags' (see wxLIST_HITTEST_... flags above) - // Request the subitem number as well at the given coordinate. - long HitTest(const wxPoint& point, int& flags, long* ptrSubItem = NULL) const; - - // Inserts an item, returning the index of the new item if successful, - // -1 otherwise. - long InsertItem(const wxListItem& info); - - // Insert a string item - long InsertItem(long index, const wxString& label); - - // Insert an image item - long InsertItem(long index, int imageIndex); - - // Insert an image/string item - long InsertItem(long index, const wxString& label, int imageIndex); - - // set the number of items in a virtual list control - void SetItemCount(long count); - - // Scrolls the list control. If in icon, small icon or report view mode, - // x specifies the number of pixels to scroll. If in list view mode, x - // specifies the number of columns to scroll. - // If in icon, small icon or list view mode, y specifies the number of pixels - // to scroll. If in report view mode, y specifies the number of lines to scroll. - bool ScrollList(int dx, int dy); - - // Sort items. - - // fn is a function which takes 3 long arguments: item1, item2, data. - // item1 is the long data associated with a first item (NOT the index). - // item2 is the long data associated with a second item (NOT the index). - // data is the same value as passed to SortItems. - // The return value is a negative number if the first item should precede the second - // item, a positive number of the second item should precede the first, - // or zero if the two items are equivalent. - - // data is arbitrary data to be passed to the sort function. - bool SortItems(wxListCtrlCompare fn, wxIntPtr data); - - // IMPLEMENTATION - virtual bool MSWCommand(WXUINT param, WXWORD id); - virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); - virtual bool MSWShouldPreProcessMessage(WXMSG* msg); - - // bring the control in sync with current m_windowStyle value - void UpdateStyle(); - - // Event handlers - //////////////////////////////////////////////////////////////////////////// - // Necessary for drawing hrules and vrules, if specified - void OnPaint(wxPaintEvent& event); - - - virtual bool ShouldInheritColours() const { return false; } - - virtual wxVisualAttributes GetDefaultAttributes() const - { - return GetClassDefaultAttributes(GetWindowVariant()); - } - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - // convert our styles to Windows - virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; - - // special Windows message handling - virtual WXLRESULT MSWWindowProc(WXUINT nMsg, - WXWPARAM wParam, - WXLPARAM lParam); - -protected: - // common part of all ctors - void Init(); - - // Implement constrained best size calculation. - virtual int DoGetBestClientHeight(int width) const - { return MSWGetBestViewRect(width, -1).y; } - virtual int DoGetBestClientWidth(int height) const - { return MSWGetBestViewRect(-1, height).x; } - - wxSize MSWGetBestViewRect(int x, int y) const; - - // Implement base class pure virtual methods. - long DoInsertColumn(long col, const wxListItem& info); - - // free memory taken by all internal data - void FreeAllInternalData(); - - // get the internal data object for this item (may return NULL) - wxMSWListItemData *MSWGetItemData(long item) const; - - // get the item attribute, either by quering it for virtual control, or by - // returning the one previously set using setter methods for a normal one - wxListItemAttr *DoGetItemColumnAttr(long item, long column) const; - - - wxTextCtrl* m_textCtrl; // The control used for editing a label - wxImageList * m_imageListNormal; // The image list for normal icons - wxImageList * m_imageListSmall; // The image list for small icons - wxImageList * m_imageListState; // The image list state icons (not implemented yet) - bool m_ownsImageListNormal, - m_ownsImageListSmall, - m_ownsImageListState; - - int m_colCount; // Windows doesn't have GetColumnCount so must - // keep track of inserted/deleted columns - - // all wxMSWListItemData objects we use - wxVector m_internalData; - - // true if we have any items with custom attributes - bool m_hasAnyAttr; - - // these functions are only used for virtual list view controls, i.e. the - // ones with wxLC_VIRTUAL style - - // return the text for the given column of the given item - virtual wxString OnGetItemText(long item, long column) const; - - // return the icon for the given item. In report view, OnGetItemImage will - // only be called for the first column. See OnGetItemColumnImage for - // details. - virtual int OnGetItemImage(long item) const; - - // return the icon for the given item and column. - virtual int OnGetItemColumnImage(long item, long column) const; - - // return the attribute for the given item and column (may return NULL if none) - virtual wxListItemAttr *OnGetItemColumnAttr(long item, long WXUNUSED(column)) const - { - return OnGetItemAttr(item); - } - -private: - // process NM_CUSTOMDRAW notification message - WXLPARAM OnCustomDraw(WXLPARAM lParam); - - // set the extended styles for the control (used by Create() and - // UpdateStyle()), only should be called if InReportView() - void MSWSetExListStyles(); - - // initialize the (already created) m_textCtrl with the associated HWND - void InitEditControl(WXHWND hWnd); - - // destroy m_textCtrl if it's currently valid and reset it to NULL - void DeleteEditControl(); - - // Intercept Escape and Enter keys to avoid them being stolen from our - // in-place editor control. - void OnCharHook(wxKeyEvent& event); - - - wxDECLARE_DYNAMIC_CLASS(wxListCtrl); - wxDECLARE_EVENT_TABLE(); - wxDECLARE_NO_COPY_CLASS(wxListCtrl); -}; - -#endif // _WX_LISTCTRL_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/magnif1.cur b/Externals/wxWidgets3/include/wx/msw/magnif1.cur deleted file mode 100644 index 15d1a77a49..0000000000 Binary files a/Externals/wxWidgets3/include/wx/msw/magnif1.cur and /dev/null differ diff --git a/Externals/wxWidgets3/include/wx/msw/mdi.h b/Externals/wxWidgets3/include/wx/msw/mdi.h deleted file mode 100644 index 125c5a6532..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/mdi.h +++ /dev/null @@ -1,270 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/mdi.h -// Purpose: MDI (Multiple Document Interface) classes -// Author: Julian Smart -// Modified by: 2008-10-31 Vadim Zeitlin: derive from the base classes -// Created: 01/02/97 -// Copyright: (c) 1997 Julian Smart -// (c) 2008 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_MDI_H_ -#define _WX_MSW_MDI_H_ - -#include "wx/frame.h" - -class WXDLLIMPEXP_FWD_CORE wxAcceleratorTable; - -// --------------------------------------------------------------------------- -// wxMDIParentFrame -// --------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxMDIParentFrame : public wxMDIParentFrameBase -{ -public: - wxMDIParentFrame() { Init(); } - wxMDIParentFrame(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL, - const wxString& name = wxFrameNameStr) - { - Init(); - - Create(parent, id, title, pos, size, style, name); - } - - virtual ~wxMDIParentFrame(); - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL, - const wxString& name = wxFrameNameStr); - - // override/implement base class [pure] virtual methods - // ---------------------------------------------------- - - static bool IsTDI() { return false; } - - // we don't store the active child in m_currentChild so override this - // function to find it dynamically - virtual wxMDIChildFrame *GetActiveChild() const; - - virtual void Cascade(); - virtual void Tile(wxOrientation orient = wxHORIZONTAL); - virtual void ArrangeIcons(); - virtual void ActivateNext(); - virtual void ActivatePrevious(); - -#if wxUSE_MENUS - virtual void SetWindowMenu(wxMenu* menu); - - virtual void DoMenuUpdates(wxMenu* menu = NULL); - - // return the active child menu, if any - virtual WXHMENU MSWGetActiveMenu() const; -#endif // wxUSE_MENUS - - - // implementation only from now on - - // MDI helpers - // ----------- - -#if wxUSE_MENUS - // called by wxMDIChildFrame after it was successfully created - virtual void AddMDIChild(wxMDIChildFrame *child); - - // called by wxMDIChildFrame just before it is destroyed - virtual void RemoveMDIChild(wxMDIChildFrame *child); -#endif // wxUSE_MENUS - - // handlers - // -------- - - // Responds to colour changes - void OnSysColourChanged(wxSysColourChangedEvent& event); - - void OnActivate(wxActivateEvent& event); - void OnSize(wxSizeEvent& event); - void OnIconized(wxIconizeEvent& event); - - bool HandleActivate(int state, bool minimized, WXHWND activate); - - // override window proc for MDI-specific message processing - virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); - - virtual WXLRESULT MSWDefWindowProc(WXUINT, WXWPARAM, WXLPARAM); - virtual bool MSWTranslateMessage(WXMSG* msg); - -#if wxUSE_MENUS - // override the menu-relayed methods to also look in the active child menu - // bar and the "Window" menu - virtual wxMenuItem *FindItemInMenuBar(int menuId) const; - virtual wxMenu* MSWFindMenuFromHMENU(WXHMENU hMenu); -#endif // wxUSE_MENUS - -protected: -#if wxUSE_MENUS_NATIVE - virtual void InternalSetMenuBar(); -#endif // wxUSE_MENUS_NATIVE - - virtual WXHICON GetDefaultIcon() const; - - // set the size of the MDI client window to match the frame size - void UpdateClientSize(); - -private: - // common part of all ctors - void Init(); - -#if wxUSE_MENUS - // "Window" menu commands event handlers - void OnMDICommand(wxCommandEvent& event); - void OnMDIChild(wxCommandEvent& event); - - - // add/remove window menu if we have it (i.e. m_windowMenu != NULL) - void AddWindowMenu(); - void RemoveWindowMenu(); - - // update the window menu (if we have it) to enable or disable the commands - // which only make sense when we have more than one child - void UpdateWindowMenu(bool enable); - -#if wxUSE_ACCEL - wxAcceleratorTable *m_accelWindowMenu; -#endif // wxUSE_ACCEL -#endif // wxUSE_MENUS - - // return the number of child frames we currently have (maybe 0) - int GetChildFramesCount() const; - - // if true, indicates whether the event wasn't really processed even though - // it was "handled", see OnActivate() and HandleActivate() - bool m_activationNotHandled; - - - friend class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame; - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_DYNAMIC_CLASS(wxMDIParentFrame); - wxDECLARE_NO_COPY_CLASS(wxMDIParentFrame); -}; - -// --------------------------------------------------------------------------- -// wxMDIChildFrame -// --------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxMDIChildFrame : public wxMDIChildFrameBase -{ -public: - wxMDIChildFrame() { Init(); } - wxMDIChildFrame(wxMDIParentFrame *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr) - { - Init(); - - Create(parent, id, title, pos, size, style, name); - } - - bool Create(wxMDIParentFrame *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr); - - virtual ~wxMDIChildFrame(); - - // implement MDI operations - virtual void Activate(); - - // Override some frame operations too - virtual void Maximize(bool maximize = true); - virtual void Restore(); - - virtual bool Show(bool show = true); - - // Implementation only from now on - // ------------------------------- - - // Handlers - bool HandleMDIActivate(long bActivate, WXHWND, WXHWND); - bool HandleWindowPosChanging(void *lpPos); - bool HandleGetMinMaxInfo(void *mmInfo); - - virtual WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam); - virtual WXLRESULT MSWDefWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam); - virtual bool MSWTranslateMessage(WXMSG *msg); - - virtual void MSWDestroyWindow(); - - bool ResetWindowStyle(void *vrect); - - void OnIdle(wxIdleEvent& event); - -protected: - virtual void DoGetScreenPosition(int *x, int *y) const; - virtual void DoGetPosition(int *x, int *y) const; - virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags); - virtual void DoSetClientSize(int width, int height); - virtual void InternalSetMenuBar(); - virtual bool IsMDIChild() const { return true; } - virtual void DetachMenuBar(); - - virtual WXHICON GetDefaultIcon() const; - - // common part of all ctors - void Init(); - -private: - bool m_needsResize; // flag which tells us to artificially resize the frame - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxMDIChildFrame); -}; - -// --------------------------------------------------------------------------- -// wxMDIClientWindow -// --------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxMDIClientWindow : public wxMDIClientWindowBase -{ -public: - wxMDIClientWindow() { Init(); } - - // Note: this is virtual, to allow overridden behaviour. - virtual bool CreateClient(wxMDIParentFrame *parent, - long style = wxVSCROLL | wxHSCROLL); - - // Explicitly call default scroll behaviour - void OnScroll(wxScrollEvent& event); - -protected: - virtual void DoSetSize(int x, int y, - int width, int height, - int sizeFlags = wxSIZE_AUTO); - - void Init() { m_scrollX = m_scrollY = 0; } - - int m_scrollX, m_scrollY; - -private: - wxDECLARE_EVENT_TABLE(); - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxMDIClientWindow); -}; - -#endif // _WX_MSW_MDI_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/mdi.ico b/Externals/wxWidgets3/include/wx/msw/mdi.ico deleted file mode 100644 index 435cca2471..0000000000 Binary files a/Externals/wxWidgets3/include/wx/msw/mdi.ico and /dev/null differ diff --git a/Externals/wxWidgets3/include/wx/msw/menu.h b/Externals/wxWidgets3/include/wx/msw/menu.h deleted file mode 100644 index 2260c6b4d1..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/menu.h +++ /dev/null @@ -1,231 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/menu.h -// Purpose: wxMenu, wxMenuBar classes -// Author: Julian Smart -// Modified by: Vadim Zeitlin (wxMenuItem is now in separate file) -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MENU_H_ -#define _WX_MENU_H_ - -#if wxUSE_ACCEL - #include "wx/accel.h" - #include "wx/dynarray.h" - - WX_DEFINE_EXPORTED_ARRAY_PTR(wxAcceleratorEntry *, wxAcceleratorArray); -#endif // wxUSE_ACCEL - -class WXDLLIMPEXP_FWD_CORE wxFrame; - -class wxMenuRadioItemsData; - - -#include "wx/arrstr.h" - -// ---------------------------------------------------------------------------- -// Menu -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxMenu : public wxMenuBase -{ -public: - // ctors & dtor - wxMenu(const wxString& title, long style = 0) - : wxMenuBase(title, style) { Init(); } - - wxMenu(long style = 0) : wxMenuBase(style) { Init(); } - - virtual ~wxMenu(); - - virtual void Break(); - - virtual void SetTitle(const wxString& title); - - // MSW-only methods - // ---------------- - - // Create a new menu from the given native HMENU. Takes ownership of the - // menu handle and will delete it when this object is destroyed. - static wxMenu *MSWNewFromHMENU(WXHMENU hMenu) { return new wxMenu(hMenu); } - - // Detaches HMENU so that it isn't deleted when this object is destroyed. - // Don't use this object after calling this method. - WXHMENU MSWDetachHMENU() { WXHMENU m = m_hMenu; m_hMenu = NULL; return m; } - - // implementation only from now on - // ------------------------------- - - bool MSWCommand(WXUINT param, WXWORD id); - - // get the native menu handle - WXHMENU GetHMenu() const { return m_hMenu; } - - // Return the start and end position of the radio group to which the item - // at the given position belongs. Returns false if there is no radio group - // containing this position. - bool MSWGetRadioGroupRange(int pos, int *start, int *end) const; - -#if wxUSE_ACCEL - // called by wxMenuBar to build its accel table from the accels of all menus - bool HasAccels() const { return !m_accels.empty(); } - size_t GetAccelCount() const { return m_accels.size(); } - size_t CopyAccels(wxAcceleratorEntry *accels) const; - - // called by wxMenuItem when its accels changes - void UpdateAccel(wxMenuItem *item); - - // helper used by wxMenu itself (returns the index in m_accels) - int FindAccel(int id) const; - - // used only by wxMDIParentFrame currently but could be useful elsewhere: - // returns a new accelerator table with accelerators for just this menu - // (shouldn't be called if we don't have any accelerators) - wxAcceleratorTable *CreateAccelTable() const; -#endif // wxUSE_ACCEL - - // get the menu with given handle (recursively) - wxMenu* MSWGetMenu(WXHMENU hMenu); - -#if wxUSE_OWNER_DRAWN - - int GetMaxAccelWidth() - { - if (m_maxAccelWidth == -1) - CalculateMaxAccelWidth(); - return m_maxAccelWidth; - } - - void ResetMaxAccelWidth() - { - m_maxAccelWidth = -1; - } - -private: - void CalculateMaxAccelWidth(); - -#endif // wxUSE_OWNER_DRAWN - -protected: - virtual wxMenuItem* DoAppend(wxMenuItem *item); - virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item); - virtual wxMenuItem* DoRemove(wxMenuItem *item); - -private: - // This constructor is private, use MSWNewFromHMENU() to use it. - wxMenu(WXHMENU hMenu); - - // Common part of all ctors, it doesn't create a new HMENU. - void InitNoCreate(); - - // Common part of all ctors except of the one above taking a native menu - // handler: calls InitNoCreate() and also creates a new menu. - void Init(); - - // common part of Append/Insert (behaves as Append is pos == (size_t)-1) - bool DoInsertOrAppend(wxMenuItem *item, size_t pos = (size_t)-1); - - - // This variable contains the description of the radio item groups and - // allows to find whether an item at the given position is part of the - // group and also where its group starts and ends. - // - // It is initially NULL and only allocated if we have any radio items. - wxMenuRadioItemsData *m_radioData; - - // if true, insert a breal before appending the next item - bool m_doBreak; - - // the menu handle of this menu - WXHMENU m_hMenu; - -#if wxUSE_ACCEL - // the accelerators for our menu items - wxAcceleratorArray m_accels; -#endif // wxUSE_ACCEL - -#if wxUSE_OWNER_DRAWN - // true if the menu has any ownerdrawn items - bool m_ownerDrawn; - - // the max width of menu items bitmaps - int m_maxBitmapWidth; - - // the max width of menu items accels - int m_maxAccelWidth; -#endif // wxUSE_OWNER_DRAWN - - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxMenu); -}; - -// ---------------------------------------------------------------------------- -// Menu Bar (a la Windows) -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxMenuBar : public wxMenuBarBase -{ -public: - // ctors & dtor - // default constructor - wxMenuBar(); - // unused under MSW - wxMenuBar(long style); - // menubar takes ownership of the menus arrays but copies the titles - wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style = 0); - virtual ~wxMenuBar(); - - // menubar construction - virtual bool Append( wxMenu *menu, const wxString &title ); - virtual bool Insert(size_t pos, wxMenu *menu, const wxString& title); - virtual wxMenu *Replace(size_t pos, wxMenu *menu, const wxString& title); - virtual wxMenu *Remove(size_t pos); - - virtual void EnableTop( size_t pos, bool flag ); - virtual bool IsEnabledTop(size_t pos) const; - virtual void SetMenuLabel( size_t pos, const wxString& label ); - virtual wxString GetMenuLabel( size_t pos ) const; - - // implementation from now on - WXHMENU Create(); - virtual void Detach(); - virtual void Attach(wxFrame *frame); - -#if wxUSE_ACCEL - // update the accel table (must be called after adding/deleting a menu) - void RebuildAccelTable(); -#endif // wxUSE_ACCEL - - // get the menu handle - WXHMENU GetHMenu() const { return m_hMenu; } - - // if the menubar is modified, the display is not updated automatically, - // call this function to update it (m_menuBarFrame should be !NULL) - void Refresh(); - - // To avoid compile warning - void Refresh( bool eraseBackground, - const wxRect *rect = (const wxRect *) NULL ) { wxWindow::Refresh(eraseBackground, rect); } - - // Get a top level menu position or wxNOT_FOUND from its handle. - int MSWGetTopMenuPos(WXHMENU hMenu) const; - - // Get a top level or sub menu with given handle (recursively). - wxMenu* MSWGetMenu(WXHMENU hMenu) const; - -protected: - // common part of all ctors - void Init(); - - WXHMENU m_hMenu; - - // Return the MSW position for a wxMenu which is sometimes different from - // the wxWidgets position. - int MSWPositionForWxMenu(wxMenu *menu, int wxpos); - -private: - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxMenuBar); -}; - -#endif // _WX_MENU_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/menuitem.h b/Externals/wxWidgets3/include/wx/msw/menuitem.h deleted file mode 100644 index 5847295f83..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/menuitem.h +++ /dev/null @@ -1,156 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/menuitem.h -// Purpose: wxMenuItem class -// Author: Vadim Zeitlin -// Modified by: -// Created: 11.11.97 -// Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _MENUITEM_H -#define _MENUITEM_H - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/bitmap.h" - -#if wxUSE_OWNER_DRAWN - #include "wx/ownerdrw.h" - - struct tagRECT; -#endif - -// ---------------------------------------------------------------------------- -// wxMenuItem: an item in the menu, optionally implements owner-drawn behaviour -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxMenuItem : public wxMenuItemBase -#if wxUSE_OWNER_DRAWN - , public wxOwnerDrawn -#endif -{ -public: - // ctor & dtor - wxMenuItem(wxMenu *parentMenu = NULL, - int id = wxID_SEPARATOR, - const wxString& name = wxEmptyString, - const wxString& help = wxEmptyString, - wxItemKind kind = wxITEM_NORMAL, - wxMenu *subMenu = NULL); - virtual ~wxMenuItem(); - - // override base class virtuals - virtual void SetItemLabel(const wxString& strName); - - virtual void Enable(bool bDoEnable = true); - virtual void Check(bool bDoCheck = true); - virtual bool IsChecked() const; - - // unfortunately needed to resolve ambiguity between - // wxMenuItemBase::IsCheckable() and wxOwnerDrawn::IsCheckable() - bool IsCheckable() const { return wxMenuItemBase::IsCheckable(); } - - // the id for a popup menu is really its menu handle (as required by - // ::AppendMenu() API), so this function will return either the id or the - // menu handle depending on what we are - // - // notice that it also returns the id as an unsigned int, as required by - // Win32 API - WXWPARAM GetMSWId() const; - -#if WXWIN_COMPATIBILITY_2_8 - // compatibility only, don't use in new code - wxDEPRECATED( - wxMenuItem(wxMenu *parentMenu, - int id, - const wxString& text, - const wxString& help, - bool isCheckable, - wxMenu *subMenu = NULL) - ); -#endif - - void SetBitmaps(const wxBitmap& bmpChecked, - const wxBitmap& bmpUnchecked = wxNullBitmap) - { - DoSetBitmap(bmpChecked, true); - DoSetBitmap(bmpUnchecked, false); - } - - void SetBitmap(const wxBitmap& bmp, bool bChecked = true) - { - DoSetBitmap(bmp, bChecked); - } - - const wxBitmap& GetBitmap(bool bChecked = true) const - { return (bChecked ? m_bmpChecked : m_bmpUnchecked); } - -#if wxUSE_OWNER_DRAWN - void SetDisabledBitmap(const wxBitmap& bmpDisabled) - { - m_bmpDisabled = bmpDisabled; - SetOwnerDrawn(true); - } - - const wxBitmap& GetDisabledBitmap() const - { return m_bmpDisabled; } - - int MeasureAccelWidth() const; - - // override wxOwnerDrawn base class virtuals - virtual wxString GetName() const; - virtual bool OnMeasureItem(size_t *pwidth, size_t *pheight); - virtual bool OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODStatus stat); - -protected: - virtual void GetFontToUse(wxFont& font) const; - virtual void GetColourToUse(wxODStatus stat, wxColour& colText, wxColour& colBack) const; - -private: - // helper function for draw std menu check mark - void DrawStdCheckMark(WXHDC hdc, const tagRECT* rc, wxODStatus stat); - - // helper function to determine if the item must be owner-drawn - bool MSWMustUseOwnerDrawn(); -#endif // wxUSE_OWNER_DRAWN - - enum BitmapKind - { - Normal, - Checked, - Unchecked - }; - - // helper function to get a handle for bitmap associated with item - WXHBITMAP GetHBitmapForMenu(BitmapKind kind) const; - - // helper function to set/change the bitmap - void DoSetBitmap(const wxBitmap& bmp, bool bChecked); - -private: - // common part of all ctors - void Init(); - - // Return the item position in the menu containing it. - // - // Returns -1 if the item is not attached to a menu or if we can't find its - // position (which is not really supposed to ever happen). - int MSGetMenuItemPos() const; - - // item bitmaps - wxBitmap m_bmpChecked, // bitmap to put near the item - m_bmpUnchecked; // (checked is used also for 'uncheckable' items) -#if wxUSE_OWNER_DRAWN - wxBitmap m_bmpDisabled; -#endif // wxUSE_OWNER_DRAWN - - // Give wxMenu access to our MSWMustUseOwnerDrawn() and GetHBitmapForMenu(). - friend class wxMenu; - - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxMenuItem); -}; - -#endif //_MENUITEM_H diff --git a/Externals/wxWidgets3/include/wx/msw/metafile.h b/Externals/wxWidgets3/include/wx/msw/metafile.h deleted file mode 100644 index 8a7c6ce68f..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/metafile.h +++ /dev/null @@ -1,189 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/metafile.h -// Purpose: wxMetaFile, wxMetaFileDC and wxMetaFileDataObject classes -// Author: Julian Smart -// Modified by: VZ 07.01.00: implemented wxMetaFileDataObject -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_METAFIILE_H_ -#define _WX_METAFIILE_H_ - -#include "wx/dc.h" -#include "wx/gdiobj.h" - -#if wxUSE_DRAG_AND_DROP - #include "wx/dataobj.h" -#endif - -// ---------------------------------------------------------------------------- -// Metafile and metafile device context classes -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxMetafile; - -class WXDLLIMPEXP_CORE wxMetafileRefData: public wxGDIRefData -{ -public: - wxMetafileRefData(); - virtual ~wxMetafileRefData(); - - virtual bool IsOk() const { return m_metafile != 0; } - -public: - WXHANDLE m_metafile; - int m_windowsMappingMode; - int m_width, m_height; - - friend class WXDLLIMPEXP_FWD_CORE wxMetafile; -}; - -#define M_METAFILEDATA ((wxMetafileRefData *)m_refData) - -class WXDLLIMPEXP_CORE wxMetafile: public wxGDIObject -{ -public: - wxMetafile(const wxString& file = wxEmptyString); - virtual ~wxMetafile(); - - // After this is called, the metafile cannot be used for anything - // since it is now owned by the clipboard. - virtual bool SetClipboard(int width = 0, int height = 0); - - virtual bool Play(wxDC *dc); - - // set/get the size of metafile for clipboard operations - wxSize GetSize() const { return wxSize(GetWidth(), GetHeight()); } - int GetWidth() const { return M_METAFILEDATA->m_width; } - int GetHeight() const { return M_METAFILEDATA->m_height; } - - void SetWidth(int width) { M_METAFILEDATA->m_width = width; } - void SetHeight(int height) { M_METAFILEDATA->m_height = height; } - - // Implementation - WXHANDLE GetHMETAFILE() const { return M_METAFILEDATA->m_metafile; } - void SetHMETAFILE(WXHANDLE mf) ; - int GetWindowsMappingMode() const { return M_METAFILEDATA->m_windowsMappingMode; } - void SetWindowsMappingMode(int mm); - -protected: - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; - -private: - wxDECLARE_DYNAMIC_CLASS(wxMetafile); -}; - -class WXDLLIMPEXP_CORE wxMetafileDCImpl: public wxMSWDCImpl -{ -public: - wxMetafileDCImpl(wxDC *owner, const wxString& file = wxEmptyString); - wxMetafileDCImpl(wxDC *owner, const wxString& file, - int xext, int yext, int xorg, int yorg); - virtual ~wxMetafileDCImpl(); - - virtual wxMetafile *Close(); - virtual void SetMapMode(wxMappingMode mode); - virtual void DoGetTextExtent(const wxString& string, - wxCoord *x, wxCoord *y, - wxCoord *descent = NULL, - wxCoord *externalLeading = NULL, - const wxFont *theFont = NULL) const; - - // Implementation - wxMetafile *GetMetaFile() const { return m_metaFile; } - void SetMetaFile(wxMetafile *mf) { m_metaFile = mf; } - int GetWindowsMappingMode() const { return m_windowsMappingMode; } - void SetWindowsMappingMode(int mm) { m_windowsMappingMode = mm; } - -protected: - virtual void DoGetSize(int *width, int *height) const; - - int m_windowsMappingMode; - wxMetafile* m_metaFile; - -private: - wxDECLARE_CLASS(wxMetafileDCImpl); - wxDECLARE_NO_COPY_CLASS(wxMetafileDCImpl); -}; - -class WXDLLIMPEXP_CORE wxMetafileDC: public wxDC -{ -public: - // Don't supply origin and extent - // Supply them to wxMakeMetaFilePlaceable instead. - wxMetafileDC(const wxString& file) - : wxDC(new wxMetafileDCImpl( this, file )) - { } - - // Supply origin and extent (recommended). - // Then don't need to supply them to wxMakeMetaFilePlaceable. - wxMetafileDC(const wxString& file, int xext, int yext, int xorg, int yorg) - : wxDC(new wxMetafileDCImpl( this, file, xext, yext, xorg, yorg )) - { } - - wxMetafile *GetMetafile() const - { return ((wxMetafileDCImpl*)m_pimpl)->GetMetaFile(); } - - wxMetafile *Close() - { return ((wxMetafileDCImpl*)m_pimpl)->Close(); } - -private: - wxDECLARE_CLASS(wxMetafileDC); - wxDECLARE_NO_COPY_CLASS(wxMetafileDC); -}; - - - - -/* - * Pass filename of existing non-placeable metafile, and bounding box. - * Adds a placeable metafile header, sets the mapping mode to anisotropic, - * and sets the window origin and extent to mimic the wxMM_TEXT mapping mode. - * - */ - -// No origin or extent -bool WXDLLIMPEXP_CORE wxMakeMetafilePlaceable(const wxString& filename, float scale = 1.0); - -// Optional origin and extent -bool WXDLLIMPEXP_CORE wxMakeMetaFilePlaceable(const wxString& filename, int x1, int y1, int x2, int y2, float scale = 1.0, bool useOriginAndExtent = true); - -// ---------------------------------------------------------------------------- -// wxMetafileDataObject is a specialization of wxDataObject for metafile data -// ---------------------------------------------------------------------------- - -#if wxUSE_DRAG_AND_DROP - -class WXDLLIMPEXP_CORE wxMetafileDataObject : public wxDataObjectSimple -{ -public: - // ctors - wxMetafileDataObject() : wxDataObjectSimple(wxDF_METAFILE) - { } - wxMetafileDataObject(const wxMetafile& metafile) - : wxDataObjectSimple(wxDF_METAFILE), m_metafile(metafile) { } - - // virtual functions which you may override if you want to provide data on - // demand only - otherwise, the trivial default versions will be used - virtual void SetMetafile(const wxMetafile& metafile) - { m_metafile = metafile; } - virtual wxMetafile GetMetafile() const - { return m_metafile; } - - // implement base class pure virtuals - virtual size_t GetDataSize() const; - virtual bool GetDataHere(void *buf) const; - virtual bool SetData(size_t len, const void *buf); - -protected: - wxMetafile m_metafile; -}; - -#endif // wxUSE_DRAG_AND_DROP - -#endif - // _WX_METAFIILE_H_ - diff --git a/Externals/wxWidgets3/include/wx/msw/mimetype.h b/Externals/wxWidgets3/include/wx/msw/mimetype.h deleted file mode 100644 index 77becd7b84..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/mimetype.h +++ /dev/null @@ -1,142 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/mimetype.h -// Purpose: classes and functions to manage MIME types -// Author: Vadim Zeitlin -// Modified by: -// Created: 23.09.98 -// Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWidgets licence (part of base library) -///////////////////////////////////////////////////////////////////////////// - -#ifndef _MIMETYPE_IMPL_H -#define _MIMETYPE_IMPL_H - -#include "wx/defs.h" - -#if wxUSE_MIMETYPE - -#include "wx/mimetype.h" - -// ---------------------------------------------------------------------------- -// wxFileTypeImpl is the MSW version of wxFileType, this is a private class -// and is never used directly by the application -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxFileTypeImpl -{ -public: - // ctor - wxFileTypeImpl() { } - - // one of these Init() function must be called (ctor can't take any - // arguments because it's common) - - // initialize us with our file type name and extension - in this case - // we will read all other data from the registry - void Init(const wxString& strFileType, const wxString& ext); - - // implement accessor functions - bool GetExtensions(wxArrayString& extensions); - bool GetMimeType(wxString *mimeType) const; - bool GetMimeTypes(wxArrayString& mimeTypes) const; - bool GetIcon(wxIconLocation *iconLoc) const; - bool GetDescription(wxString *desc) const; - bool GetOpenCommand(wxString *openCmd, - const wxFileType::MessageParameters& params) const - { - *openCmd = GetExpandedCommand(wxS("open"), params); - return !openCmd->empty(); - } - - bool GetPrintCommand(wxString *printCmd, - const wxFileType::MessageParameters& params) const - { - *printCmd = GetExpandedCommand(wxS("print"), params); - return !printCmd->empty(); - } - - size_t GetAllCommands(wxArrayString * verbs, wxArrayString * commands, - const wxFileType::MessageParameters& params) const; - - bool Unassociate(); - - // set an arbitrary command, ask confirmation if it already exists and - // overwriteprompt is true - bool SetCommand(const wxString& cmd, - const wxString& verb, - bool overwriteprompt = true); - - bool SetDefaultIcon(const wxString& cmd = wxEmptyString, int index = 0); - - // this is called by Associate - bool SetDescription (const wxString& desc); - - // This is called by all our own methods modifying the registry to let the - // Windows Shell know about the changes. - // - // It is also called from Associate() and Unassociate() which suppress the - // internally generated notifications using the method below, which is why - // it has to be public. - void MSWNotifyShell(); - - // Call before/after performing several registry changes in a row to - // temporarily suppress multiple notifications that would be generated for - // them and generate a single one at the end using MSWNotifyShell() - // explicitly. - void MSWSuppressNotifications(bool supress); - - wxString - GetExpandedCommand(const wxString& verb, - const wxFileType::MessageParameters& params) const; -private: - // helper function: reads the command corresponding to the specified verb - // from the registry (returns an empty string if not found) - wxString GetCommand(const wxString& verb) const; - - // get the registry path for the given verb - wxString GetVerbPath(const wxString& verb) const; - - // check that the registry key for our extension exists, create it if it - // doesn't, return false if this failed - bool EnsureExtKeyExists(); - - wxString m_strFileType, // may be empty - m_ext; - bool m_suppressNotify; - - // these methods are not publicly accessible (as wxMimeTypesManager - // doesn't know about them), and should only be called by Unassociate - - bool RemoveOpenCommand(); - bool RemoveCommand(const wxString& verb); - bool RemoveMimeType(); - bool RemoveDefaultIcon(); - bool RemoveDescription(); -}; - -class WXDLLIMPEXP_BASE wxMimeTypesManagerImpl -{ -public: - // nothing to do here, we don't load any data but just go and fetch it from - // the registry when asked for - wxMimeTypesManagerImpl() { } - - // implement containing class functions - wxFileType *GetFileTypeFromExtension(const wxString& ext); - wxFileType *GetOrAllocateFileTypeFromExtension(const wxString& ext); - wxFileType *GetFileTypeFromMimeType(const wxString& mimeType); - - size_t EnumAllFileTypes(wxArrayString& mimetypes); - - // create a new filetype association - wxFileType *Associate(const wxFileTypeInfo& ftInfo); - - // create a new filetype with the given name and extension - wxFileType *CreateFileType(const wxString& filetype, const wxString& ext); -}; - -#endif // wxUSE_MIMETYPE - -#endif - //_MIMETYPE_IMPL_H - diff --git a/Externals/wxWidgets3/include/wx/msw/minifram.h b/Externals/wxWidgets3/include/wx/msw/minifram.h deleted file mode 100644 index c6d86c99da..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/minifram.h +++ /dev/null @@ -1,51 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/minifram.h -// Purpose: wxMiniFrame class -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MINIFRAM_H_ -#define _WX_MINIFRAM_H_ - -#include "wx/frame.h" - -class WXDLLIMPEXP_CORE wxMiniFrame : public wxFrame -{ -public: - wxMiniFrame() { } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxCAPTION | wxCLIP_CHILDREN | wxRESIZE_BORDER, - const wxString& name = wxFrameNameStr) - { - return wxFrame::Create(parent, id, title, pos, size, - style | - wxFRAME_TOOL_WINDOW | - (parent ? wxFRAME_FLOAT_ON_PARENT : 0), name); - } - - wxMiniFrame(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxCAPTION | wxCLIP_CHILDREN | wxRESIZE_BORDER, - const wxString& name = wxFrameNameStr) - { - Create(parent, id, title, pos, size, style, name); - } - -protected: - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxMiniFrame); -}; - -#endif - // _WX_MINIFRAM_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/missing.h b/Externals/wxWidgets3/include/wx/msw/missing.h deleted file mode 100644 index 5a248282b8..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/missing.h +++ /dev/null @@ -1,425 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/missing.h -// Purpose: Declarations for parts of the Win32 SDK that are missing in -// the versions that come with some compilers -// Created: 2002/04/23 -// Copyright: (c) 2002 Mattia Barbon -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MISSING_H_ -#define _WX_MISSING_H_ - -#ifndef WM_CHANGEUISTATE - #define WM_CHANGEUISTATE 0x0127 -#endif - -#ifndef WM_UPDATEUISTATE - #define WM_UPDATEUISTATE 0x0128 -#endif - -#ifndef WM_QUERYUISTATE - #define WM_QUERYUISTATE 0x0129 -#endif - -#ifndef WM_PRINTCLIENT - #define WM_PRINTCLIENT 0x318 -#endif - -#ifndef DT_HIDEPREFIX - #define DT_HIDEPREFIX 0x00100000 -#endif - -#ifndef DSS_HIDEPREFIX - #define DSS_HIDEPREFIX 0x0200 -#endif - -// Needed by toplevel.cpp -#ifndef UIS_SET - #define UIS_SET 1 - #define UIS_CLEAR 2 - #define UIS_INITIALIZE 3 -#endif - -#ifndef UISF_HIDEFOCUS - #define UISF_HIDEFOCUS 1 -#endif - -#ifndef UISF_HIDEACCEL - #define UISF_HIDEACCEL 2 -#endif - -#ifndef OFN_EXPLORER - #define OFN_EXPLORER 0x00080000 -#endif - -#ifndef OFN_ENABLESIZING - #define OFN_ENABLESIZING 0x00800000 -#endif - -// Needed by window.cpp -#if wxUSE_MOUSEWHEEL - #ifndef WM_MOUSEWHEEL - #define WM_MOUSEWHEEL 0x020A - #endif - #ifndef WM_MOUSEHWHEEL - #define WM_MOUSEHWHEEL 0x020E - #endif - #ifndef WHEEL_DELTA - #define WHEEL_DELTA 120 - #endif - #ifndef SPI_GETWHEELSCROLLLINES - #define SPI_GETWHEELSCROLLLINES 104 - #endif - #ifndef SPI_GETWHEELSCROLLCHARS - #define SPI_GETWHEELSCROLLCHARS 108 - #endif -#endif // wxUSE_MOUSEWHEEL - -// Needed by window.cpp -#ifndef VK_OEM_1 - #define VK_OEM_1 0xBA - #define VK_OEM_2 0xBF - #define VK_OEM_3 0xC0 - #define VK_OEM_4 0xDB - #define VK_OEM_5 0xDC - #define VK_OEM_6 0xDD - #define VK_OEM_7 0xDE - #define VK_OEM_102 0xE2 -#endif - -#ifndef VK_OEM_COMMA - #define VK_OEM_PLUS 0xBB - #define VK_OEM_COMMA 0xBC - #define VK_OEM_MINUS 0xBD - #define VK_OEM_PERIOD 0xBE -#endif - -#ifndef SM_TABLETPC - #define SM_TABLETPC 86 -#endif - -#ifndef INKEDIT_CLASS -# define INKEDIT_CLASSW L"INKEDIT" -# ifdef UNICODE -# define INKEDIT_CLASS INKEDIT_CLASSW -# else -# define INKEDIT_CLASS "INKEDIT" -# endif -#endif - -#ifndef EM_SETINKINSERTMODE -# define EM_SETINKINSERTMODE (WM_USER + 0x0204) -#endif - -#ifndef EM_SETUSEMOUSEFORINPUT -#define EM_SETUSEMOUSEFORINPUT (WM_USER + 0x224) -#endif - -#ifndef TPM_RECURSE -#define TPM_RECURSE 1 -#endif - - -#ifndef WS_EX_LAYOUTRTL -#define WS_EX_LAYOUTRTL 0x00400000 -#endif - -#ifndef WS_EX_COMPOSITED -#define WS_EX_COMPOSITED 0x02000000L -#endif - -#ifndef WS_EX_LAYERED -#define WS_EX_LAYERED 0x00080000 -#endif - -#ifndef LWA_ALPHA -#define LWA_ALPHA 2 -#endif - -#ifndef QS_ALLPOSTMESSAGE -#define QS_ALLPOSTMESSAGE 0 -#endif - -// ---------------------------------------------------------------------------- -// menu stuff -// ---------------------------------------------------------------------------- - -#ifndef MIIM_BITMAP - #define MIIM_STRING 0x00000040 - #define MIIM_BITMAP 0x00000080 - #define MIIM_FTYPE 0x00000100 - #define HBMMENU_CALLBACK ((HBITMAP) -1) - - typedef struct tagMENUINFO - { - DWORD cbSize; - DWORD fMask; - DWORD dwStyle; - UINT cyMax; - HBRUSH hbrBack; - DWORD dwContextHelpID; - DWORD dwMenuData; - } MENUINFO, FAR *LPMENUINFO; -#endif // MIIM_BITMAP &c - -// ---------------------------------------------------------------------------- -// definitions related to ListView and Header common controls, needed by -// msw/listctrl.cpp and msw/headerctrl.cpp -// ---------------------------------------------------------------------------- - -#ifndef I_IMAGENONE - #define I_IMAGENONE (-2) -#endif - -#ifndef LVS_EX_FULLROWSELECT - #define LVS_EX_FULLROWSELECT 0x00000020 -#endif - -#if !defined(LVS_EX_LABELTIP) - #define LVS_EX_LABELTIP 0x00004000 -#endif - -#ifndef LVS_EX_SUBITEMIMAGES - #define LVS_EX_SUBITEMIMAGES 0x00000002 -#endif - -#ifndef LVS_EX_DOUBLEBUFFER - #define LVS_EX_DOUBLEBUFFER 0x00010000 -#endif - -#ifndef HDN_GETDISPINFOW - #define HDN_GETDISPINFOW (HDN_FIRST-29) -#endif - -#ifndef HDS_HOTTRACK - #define HDS_HOTTRACK 4 -#endif -#ifndef HDS_FLAT - #define HDS_FLAT 0x0200 -#endif - -#ifndef HDF_SORTUP - #define HDF_SORTUP 0x0400 - #define HDF_SORTDOWN 0x0200 -#endif - - /* - * In addition to the above, the following are required for several compilers. - */ - -#if !defined(CCS_VERT) -#define CCS_VERT 0x00000080L -#endif - -#if !defined(CCS_RIGHT) -#define CCS_RIGHT (CCS_VERT|CCS_BOTTOM) -#endif - -#if !defined(TB_SETDISABLEDIMAGELIST) - #define TB_SETDISABLEDIMAGELIST (WM_USER + 54) -#endif // !defined(TB_SETDISABLEDIMAGELIST) - -#ifndef CFM_BACKCOLOR - #define CFM_BACKCOLOR 0x04000000 -#endif - -#ifndef HANGUL_CHARSET - #define HANGUL_CHARSET 129 -#endif - -#ifndef CCM_SETUNICODEFORMAT - #define CCM_SETUNICODEFORMAT 8197 -#endif - -// ---------------------------------------------------------------------------- -// Tree control -// ---------------------------------------------------------------------------- - -#ifndef TV_FIRST - #define TV_FIRST 0x1100 -#endif - -#ifndef TVS_FULLROWSELECT - #define TVS_FULLROWSELECT 0x1000 -#endif - -#ifndef TVM_SETBKCOLOR - #define TVM_SETBKCOLOR (TV_FIRST + 29) - #define TVM_SETTEXTCOLOR (TV_FIRST + 30) -#endif - - /* - * The following are specifically required for MinGW. - */ - -#if defined (__MINGW32__) - -#if !wxCHECK_W32API_VERSION(3,1) - -#include -#include "wx/msw/winundef.h" - -typedef struct -{ - RECT rgrc[3]; - WINDOWPOS *lppos; -} NCCALCSIZE_PARAMS, *LPNCCALCSIZE_PARAMS; - -#endif - -#endif - -// Various defines used by the webview library that are needed by mingw - -#ifndef DISPID_COMMANDSTATECHANGE -#define DISPID_COMMANDSTATECHANGE 105 -#endif - -#ifndef DISPID_NAVIGATECOMPLETE2 -#define DISPID_NAVIGATECOMPLETE2 252 -#endif - -#ifndef DISPID_NAVIGATEERROR -#define DISPID_NAVIGATEERROR 271 -#endif - -#ifndef DISPID_NEWWINDOW3 -#define DISPID_NEWWINDOW3 273 -#endif - -#ifndef INET_E_ERROR_FIRST -#define INET_E_ERROR_FIRST 0x800C0002L -#endif - -#ifndef INET_E_INVALID_URL -#define INET_E_INVALID_URL 0x800C0002L -#endif - -#ifndef INET_E_NO_SESSION -#define INET_E_NO_SESSION 0x800C0003L -#endif - -#ifndef INET_E_CANNOT_CONNECT -#define INET_E_CANNOT_CONNECT 0x800C0004L -#endif - -#ifndef INET_E_RESOURCE_NOT_FOUND -#define INET_E_RESOURCE_NOT_FOUND 0x800C0005L -#endif - -#ifndef INET_E_OBJECT_NOT_FOUND -#define INET_E_OBJECT_NOT_FOUND 0x800C0006L -#endif - -#ifndef INET_E_DATA_NOT_AVAILABLE -#define INET_E_DATA_NOT_AVAILABLE 0x800C0007L -#endif - -#ifndef INET_E_DOWNLOAD_FAILURE -#define INET_E_DOWNLOAD_FAILURE 0x800C0008L -#endif - -#ifndef INET_E_AUTHENTICATION_REQUIRED -#define INET_E_AUTHENTICATION_REQUIRED 0x800C0009L -#endif - -#ifndef INET_E_NO_VALID_MEDIA -#define INET_E_NO_VALID_MEDIA 0x800C000AL -#endif - -#ifndef INET_E_CONNECTION_TIMEOUT -#define INET_E_CONNECTION_TIMEOUT 0x800C000BL -#endif - -#ifndef INET_E_INVALID_REQUEST -#define INET_E_INVALID_REQUEST 0x800C000CL -#endif - -#ifndef INET_E_UNKNOWN_PROTOCOL -#define INET_E_UNKNOWN_PROTOCOL 0x800C000DL -#endif - -#ifndef INET_E_SECURITY_PROBLEM -#define INET_E_SECURITY_PROBLEM 0x800C000EL -#endif - -#ifndef INET_E_CANNOT_LOAD_DATA -#define INET_E_CANNOT_LOAD_DATA 0x800C000FL -#endif - -#ifndef INET_E_CANNOT_INSTANTIATE_OBJECT -#define INET_E_CANNOT_INSTANTIATE_OBJECT 0x800C0010L -#endif - -#ifndef INET_E_QUERYOPTION_UNKNOWN -#define INET_E_QUERYOPTION_UNKNOWN 0x800C0013L -#endif - -#ifndef INET_E_REDIRECT_FAILED -#define INET_E_REDIRECT_FAILED 0x800C0014L -#endif - -#ifndef INET_E_REDIRECT_TO_DIR -#define INET_E_REDIRECT_TO_DIR 0x800C0015L -#endif - -#ifndef INET_E_CANNOT_LOCK_REQUEST -#define INET_E_CANNOT_LOCK_REQUEST 0x800C0016L -#endif - -#ifndef INET_E_USE_EXTEND_BINDING -#define INET_E_USE_EXTEND_BINDING 0x800C0017L -#endif - -#ifndef INET_E_TERMINATED_BIND -#define INET_E_TERMINATED_BIND 0x800C0018L -#endif - -#ifndef INET_E_INVALID_CERTIFICATE -#define INET_E_INVALID_CERTIFICATE 0x800C0019L -#endif - -#ifndef INET_E_CODE_DOWNLOAD_DECLINED -#define INET_E_CODE_DOWNLOAD_DECLINED 0x800C0100L -#endif - -#ifndef INET_E_RESULT_DISPATCHED -#define INET_E_RESULT_DISPATCHED 0x800C0200L -#endif - -#ifndef INET_E_CANNOT_REPLACE_SFP_FILE -#define INET_E_CANNOT_REPLACE_SFP_FILE 0x800C0300L -#endif - -#ifndef INET_E_CODE_INSTALL_BLOCKED_BY_HASH_POLICY -#define INET_E_CODE_INSTALL_BLOCKED_BY_HASH_POLICY 0x800C0500L -#endif - -#ifndef INET_E_CODE_INSTALL_SUPPRESSED -#define INET_E_CODE_INSTALL_SUPPRESSED 0x800C0400L -#endif - -#ifndef MUI_LANGUAGE_NAME -#define MUI_LANGUAGE_NAME 0x8 -#endif - - /* - * The following are specifically required for Wine - */ - -#ifdef __WINE__ - #ifndef ENUM_CURRENT_SETTINGS - #define ENUM_CURRENT_SETTINGS ((DWORD)-1) - #endif - #ifndef BROADCAST_QUERY_DENY - #define BROADCAST_QUERY_DENY 1112363332 - #endif -#endif // defined __WINE__ - -#ifndef INVALID_FILE_ATTRIBUTES - #define INVALID_FILE_ATTRIBUTES ((DWORD)-1) -#endif - -#endif - // _WX_MISSING_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/msgdlg.h b/Externals/wxWidgets3/include/wx/msw/msgdlg.h deleted file mode 100644 index 3562a362c3..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/msgdlg.h +++ /dev/null @@ -1,74 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/msgdlg.h -// Purpose: wxMessageDialog class -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSGBOXDLG_H_ -#define _WX_MSGBOXDLG_H_ - -class WXDLLIMPEXP_CORE wxMessageDialog : public wxMessageDialogBase -{ -public: - wxMessageDialog(wxWindow *parent, - const wxString& message, - const wxString& caption = wxMessageBoxCaptionStr, - long style = wxOK|wxCENTRE, - const wxPoint& WXUNUSED(pos) = wxDefaultPosition) - : wxMessageDialogBase(parent, message, caption, style) - { - m_hook = NULL; - } - - virtual int ShowModal(); - - virtual long GetEffectiveIcon() const; - - // implementation-specific - - // return the font used for the text in the message box - static wxFont GetMessageFont(); - -protected: - // Override this as task dialogs are always centered on parent. - virtual void DoCentre(int dir); - -private: - // hook procedure used to adjust the message box beyond what the standard - // MessageBox() function can do for us - static WXLRESULT wxCALLBACK HookFunction(int code, WXWPARAM, WXLPARAM); - - static const struct ButtonAccessors - { - int id; - wxString (wxMessageDialog::*getter)() const; - } ms_buttons[]; - - // replace the static text control with a text control in order to show - // scrollbar (and also, incidentally, allow text selection) - void ReplaceStaticWithEdit(); - - // adjust the button labels - // - // this is called from HookFunction() and our HWND is valid at this moment - void AdjustButtonLabels(); - - // offset all buttons starting from the first one given by dx to the right - void OffsetButtonsStartingFrom(int first, int dx); - - // used by ShowModal() to display a message box when task dialogs - // aren't available. - int ShowMessageBox(); - - - WXHANDLE m_hook; // HHOOK used to position the message box - - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxMessageDialog); -}; - - -#endif // _WX_MSGBOXDLG_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/msvcrt.h b/Externals/wxWidgets3/include/wx/msw/msvcrt.h deleted file mode 100644 index 38a4582e25..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/msvcrt.h +++ /dev/null @@ -1,69 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/msvcrt.h -// Purpose: macros to use some non-standard features of MS Visual C++ -// C run-time library -// Author: Vadim Zeitlin -// Modified by: -// Created: 31.01.1999 -// Copyright: (c) Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// the goal of this file is to define wxCrtSetDbgFlag() macro which may be -// used like this: -// wxCrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF); -// to turn on memory leak checks for programs compiled with Microsoft Visual -// C++ (5.0+). The macro will not be defined under other compilers or if it -// can't be used with MSVC for whatever reason. - -#ifndef _MSW_MSVCRT_H_ -#define _MSW_MSVCRT_H_ - -// use debug CRT functions for memory leak detections in VC++ 5.0+ in debug -// builds -#undef wxUSE_VC_CRTDBG -#if defined(_DEBUG) && defined(__VISUALC__) \ - && !defined(UNDER_CE) - // it doesn't combine well with wxWin own memory debugging methods - #if !wxUSE_GLOBAL_MEMORY_OPERATORS && !wxUSE_MEMORY_TRACING && !defined(__NO_VC_CRTDBG__) - #define wxUSE_VC_CRTDBG - #endif -#endif - -#ifdef wxUSE_VC_CRTDBG - // Need to undef new if including crtdbg.h which may redefine new itself - #ifdef new - #undef new - #endif - - #include - - // Defining _CRTBLD should never be necessary at all, but keep it for now - // as there is no time to retest all the compilers before 3.0 release. - // Definitely do not use it with MSVS 2013 as defining it results in errors - // if the standard is included afterwards. - #if !defined(_CRTBLD) && !wxCHECK_VISUALC_VERSION(12) - // Needed when building with pure MS SDK - #define _CRTBLD - #endif - - #include - - #undef WXDEBUG_NEW - #define WXDEBUG_NEW new(_NORMAL_BLOCK, __FILE__, __LINE__) - - // this define works around a bug with inline declarations of new, see - // - // http://support.microsoft.com/kb/q140858/ - // - // for the details - #define new WXDEBUG_NEW - - #define wxCrtSetDbgFlag(flag) \ - _CrtSetDbgFlag(_CrtSetDbgFlag(_CRTDBG_REPORT_FLAG) | (flag)) -#else // !using VC CRT - #define wxCrtSetDbgFlag(flag) -#endif // wxUSE_VC_CRTDBG - -#endif // _MSW_MSVCRT_H_ - diff --git a/Externals/wxWidgets3/include/wx/msw/nonownedwnd.h b/Externals/wxWidgets3/include/wx/msw/nonownedwnd.h deleted file mode 100644 index 72e3e6b072..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/nonownedwnd.h +++ /dev/null @@ -1,38 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/nonownedwnd.h -// Purpose: wxNonOwnedWindow declaration for wxMSW. -// Author: Vadim Zeitlin -// Created: 2011-10-09 -// Copyright: (c) 2011 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_NONOWNEDWND_H_ -#define _WX_MSW_NONOWNEDWND_H_ - -class wxNonOwnedWindowShapeImpl; - -// ---------------------------------------------------------------------------- -// wxNonOwnedWindow -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxNonOwnedWindow : public wxNonOwnedWindowBase -{ -public: - wxNonOwnedWindow(); - virtual ~wxNonOwnedWindow(); - -protected: - virtual bool DoClearShape(); - virtual bool DoSetRegionShape(const wxRegion& region); -#if wxUSE_GRAPHICS_CONTEXT - virtual bool DoSetPathShape(const wxGraphicsPath& path); - -private: - wxNonOwnedWindowShapeImpl* m_shapeImpl; -#endif // wxUSE_GRAPHICS_CONTEXT - - wxDECLARE_NO_COPY_CLASS(wxNonOwnedWindow); -}; - -#endif // _WX_MSW_NONOWNEDWND_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/notebook.h b/Externals/wxWidgets3/include/wx/msw/notebook.h deleted file mode 100644 index 64d6bfc5d4..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/notebook.h +++ /dev/null @@ -1,207 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/notebook.h -// Purpose: MSW/GTK compatible notebook (a.k.a. property sheet) -// Author: Robert Roebling -// Modified by: Vadim Zeitlin for Windows version -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _NOTEBOOK_H -#define _NOTEBOOK_H - -#if wxUSE_NOTEBOOK - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/control.h" - -// ---------------------------------------------------------------------------- -// wxNotebook -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxNotebook : public wxNotebookBase -{ -public: - // ctors - // ----- - // default for dynamic class - wxNotebook(); - // the same arguments as for wxControl (@@@ any special styles?) - wxNotebook(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxNotebookNameStr); - // Create() function - bool Create(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxNotebookNameStr); - virtual ~wxNotebook(); - - // accessors - // --------- - // get number of pages in the dialog - virtual size_t GetPageCount() const; - - // set the currently selected page, return the index of the previously - // selected one (or wxNOT_FOUND on error) - // NB: this function will _not_ generate wxEVT_NOTEBOOK_PAGE_xxx events - int SetSelection(size_t nPage); - - // changes selected page without sending events - int ChangeSelection(size_t nPage); - - // set/get the title of a page - bool SetPageText(size_t nPage, const wxString& strText); - wxString GetPageText(size_t nPage) const; - - // image list stuff: each page may have an image associated with it. All - // the images belong to an image list, so you have to - // 1) create an image list - // 2) associate it with the notebook - // 3) set for each page it's image - // associate image list with a control - void SetImageList(wxImageList* imageList); - - // sets/returns item's image index in the current image list - int GetPageImage(size_t nPage) const; - bool SetPageImage(size_t nPage, int nImage); - - // currently it's always 1 because wxGTK doesn't support multi-row - // tab controls - int GetRowCount() const; - - // control the appearance of the notebook pages - // set the size (the same for all pages) - void SetPageSize(const wxSize& size); - // set the padding between tabs (in pixels) - void SetPadding(const wxSize& padding); - - // operations - // ---------- - // remove all pages - bool DeleteAllPages(); - - // inserts a new page to the notebook (it will be deleted ny the notebook, - // don't delete it yourself). If bSelect, this page becomes active. - bool InsertPage(size_t nPage, - wxNotebookPage *pPage, - const wxString& strText, - bool bSelect = false, - int imageId = NO_IMAGE); - - // Windows-only at present. Also, you must use the wxNB_FIXEDWIDTH - // style. - void SetTabSize(const wxSize& sz); - - // hit test - virtual int HitTest(const wxPoint& pt, long *flags = NULL) const; - - // calculate the size of the notebook from the size of its page - virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const; - - // callbacks - // --------- - void OnSize(wxSizeEvent& event); - void OnNavigationKey(wxNavigationKeyEvent& event); - - // base class virtuals - // ------------------- - - virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); - virtual bool MSWOnScroll(int orientation, WXWORD nSBCode, - WXWORD pos, WXHWND control); - -#if wxUSE_CONSTRAINTS - virtual void SetConstraintSizes(bool recurse = true); - virtual bool DoPhase(int nPhase); -#endif // wxUSE_CONSTRAINTS - - // Attempts to get colour for UX theme page background - wxColour GetThemeBackgroundColour() const; - - // implementation only - // ------------------- - -#if wxUSE_UXTHEME - virtual bool SetBackgroundColour(const wxColour& colour) - { - if ( !wxNotebookBase::SetBackgroundColour(colour) ) - return false; - - UpdateBgBrush(); - - return true; - } - - // draw child background - virtual bool MSWPrintChild(WXHDC hDC, wxWindow *win); - - virtual bool MSWHasInheritableBackground() const { return true; } -#endif // wxUSE_UXTHEME - - // translate wxWin styles to the Windows ones - virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const; - -protected: - // common part of all ctors - void Init(); - - // hides the currently shown page and shows the given one (if not -1) and - // updates m_selection accordingly - void UpdateSelection(int selNew); - - // remove one page from the notebook, without deleting - virtual wxNotebookPage *DoRemovePage(size_t nPage); - - // get the page rectangle for the current notebook size - // - // returns empty rectangle if an error occurs, do test for it - wxRect GetPageSize() const; - - // set the size of the given page to fit in the notebook - void AdjustPageSize(wxNotebookPage *page); - -#if wxUSE_UXTHEME - // return the themed brush for painting our children - virtual WXHBRUSH MSWGetCustomBgBrush() { return m_hbrBackground; } - - // gets the bitmap of notebook background and returns a brush from it - WXHBRUSH QueryBgBitmap(); - - // creates the brush to be used for drawing the tab control background - void UpdateBgBrush(); - - // common part of QueryBgBitmap() and MSWPrintChild() - // - // if child == NULL, draw background for the entire notebook itself - bool DoDrawBackground(WXHDC hDC, wxWindow *child = NULL); -#endif // wxUSE_UXTHEME - - // these function are used for reducing flicker on notebook resize - void OnEraseBackground(wxEraseEvent& event); - void OnPaint(wxPaintEvent& event); - - // true if we have already subclassed our updown control - bool m_hasSubclassedUpdown; - -#if wxUSE_UXTHEME - // background brush used to paint the tab control - WXHBRUSH m_hbrBackground; -#endif // wxUSE_UXTHEME - - - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxNotebook); - wxDECLARE_EVENT_TABLE(); -}; - -#endif // wxUSE_NOTEBOOK - -#endif // _NOTEBOOK_H diff --git a/Externals/wxWidgets3/include/wx/msw/ole/access.h b/Externals/wxWidgets3/include/wx/msw/ole/access.h deleted file mode 100644 index 980943edb8..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/ole/access.h +++ /dev/null @@ -1,67 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/ole/access.h -// Purpose: declaration of the wxAccessible class -// Author: Julian Smart -// Modified by: -// Created: 2003-02-12 -// Copyright: (c) 2003 Julian Smart -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_ACCESS_H_ -#define _WX_ACCESS_H_ - -#if wxUSE_ACCESSIBILITY - -// ---------------------------------------------------------------------------- -// forward declarations -// ---------------------------------------------------------------------------- - -class wxIAccessible; -class WXDLLIMPEXP_FWD_CORE wxWindow; - -// ---------------------------------------------------------------------------- -// macros -// ---------------------------------------------------------------------------- - -// ---------------------------------------------------------------------------- -// wxAccessible implements accessibility behaviour. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxAccessible : public wxAccessibleBase -{ -public: - wxAccessible(wxWindow *win = NULL); - virtual ~wxAccessible(); - -// Overridables - -// Accessors - - // Returns the wxIAccessible pointer - wxIAccessible* GetIAccessible() { return m_pIAccessible; } - - // Returns the IAccessible standard interface pointer - void* GetIAccessibleStd() ; - -// Operations - - // Sends an event when something changes in an accessible object. - static void NotifyEvent(int eventType, wxWindow* window, wxAccObject objectType, - int objectId); - -protected: - void Init(); - -private: - wxIAccessible * m_pIAccessible; // the pointer to COM interface - void* m_pIAccessibleStd; // the pointer to the standard COM interface, - // for default processing - - wxDECLARE_NO_COPY_CLASS(wxAccessible); -}; - -#endif //wxUSE_ACCESSIBILITY - -#endif //_WX_ACCESS_H_ - diff --git a/Externals/wxWidgets3/include/wx/msw/ole/activex.h b/Externals/wxWidgets3/include/wx/msw/ole/activex.h deleted file mode 100644 index 1679d8dffd..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/ole/activex.h +++ /dev/null @@ -1,261 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/ole/activex.h -// Purpose: wxActiveXContainer class -// Author: Ryan Norton -// Modified by: -// Created: 8/18/05 -// Copyright: (c) Ryan Norton -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// Definitions -// ============================================================================ - -#ifndef _WX_MSW_OLE_ACTIVEXCONTAINER_H_ -#define _WX_MSW_OLE_ACTIVEXCONTAINER_H_ - -#if wxUSE_ACTIVEX - -//--------------------------------------------------------------------------- -// wx includes -//--------------------------------------------------------------------------- - -#include "wx/msw/ole/oleutils.h" // wxBasicString &c -#include "wx/msw/ole/uuid.h" -#include "wx/window.h" -#include "wx/variant.h" - -class FrameSite; - -//--------------------------------------------------------------------------- -// MSW COM includes -//--------------------------------------------------------------------------- -#include -#include - -#include - -#include - -#ifndef STDMETHOD - #define STDMETHOD(funcname) virtual HRESULT wxSTDCALL funcname -#endif - -// -// These defines are from another ole header - but its not in the -// latest sdk. Also the ifndef DISPID_READYSTATE is here because at -// least on my machine with the latest sdk olectl.h defines these 3 -// -#ifndef DISPID_READYSTATE - #define DISPID_READYSTATE (-525) - #define DISPID_READYSTATECHANGE (-609) - #define DISPID_AMBIENT_TRANSFERPRIORITY (-728) -#endif - -#define DISPID_AMBIENT_OFFLINEIFNOTCONNECTED (-5501) -#define DISPID_AMBIENT_SILENT (-5502) - -#ifndef DISPID_AMBIENT_CODEPAGE - #define DISPID_AMBIENT_CODEPAGE (-725) - #define DISPID_AMBIENT_CHARSET (-727) -#endif - - -//--------------------------------------------------------------------------- -// -// wxActiveXContainer -// -//--------------------------------------------------------------------------- - -template -class wxAutoOleInterface -{ -public: - typedef I Interface; - - explicit wxAutoOleInterface(I *pInterface = NULL) : m_interface(pInterface) - {} - wxAutoOleInterface(REFIID riid, IUnknown *pUnk) : m_interface(NULL) - { QueryInterface(riid, pUnk); } - wxAutoOleInterface(REFIID riid, IDispatch *pDispatch) : m_interface(NULL) - { QueryInterface(riid, pDispatch); } - wxAutoOleInterface(REFCLSID clsid, REFIID riid) : m_interface(NULL) - { CreateInstance(clsid, riid); } - wxAutoOleInterface(const wxAutoOleInterface& ti) : m_interface(NULL) - { operator=(ti); } - - wxAutoOleInterface& operator=(const wxAutoOleInterface& ti) - { - if ( ti.m_interface ) - ti.m_interface->AddRef(); - Free(); - m_interface = ti.m_interface; - return *this; - } - - wxAutoOleInterface& operator=(I*& ti) - { - Free(); - m_interface = ti; - return *this; - } - - ~wxAutoOleInterface() { Free(); } - - void Free() - { - if ( m_interface ) - m_interface->Release(); - m_interface = NULL; - } - - HRESULT QueryInterface(REFIID riid, IUnknown *pUnk) - { - Free(); - wxASSERT(pUnk != NULL); - return pUnk->QueryInterface(riid, (void **)&m_interface); - } - - HRESULT CreateInstance(REFCLSID clsid, REFIID riid) - { - Free(); - return CoCreateInstance - ( - clsid, - NULL, - CLSCTX_ALL, - riid, - (void **)&m_interface - ); - } - - operator I*() const {return m_interface; } - I* operator->() {return m_interface; } - I** GetRef() {return &m_interface; } - bool Ok() const { return IsOk(); } - bool IsOk() const { return m_interface != NULL; } - -protected: - I *m_interface; -}; - -#if WXWIN_COMPATIBILITY_2_8 -// this macro is kept for compatibility with older wx versions -#define WX_DECLARE_AUTOOLE(wxAutoOleInterfaceType, I) \ - typedef wxAutoOleInterface wxAutoOleInterfaceType; -#endif // WXWIN_COMPATIBILITY_2_8 - -typedef wxAutoOleInterface wxAutoIDispatch; -typedef wxAutoOleInterface wxAutoIOleClientSite; -typedef wxAutoOleInterface wxAutoIUnknown; -typedef wxAutoOleInterface wxAutoIOleObject; -typedef wxAutoOleInterface wxAutoIOleInPlaceObject; -typedef wxAutoOleInterface wxAutoIOleInPlaceActiveObject; -typedef wxAutoOleInterface wxAutoIOleDocumentView; -typedef wxAutoOleInterface wxAutoIViewObject; - -class WXDLLIMPEXP_CORE wxActiveXContainer : public wxWindow -{ -public: - wxActiveXContainer(wxWindow * parent, REFIID iid, IUnknown* pUnk); - virtual ~wxActiveXContainer(); - - void OnSize(wxSizeEvent&); - void OnPaint(wxPaintEvent&); - void OnSetFocus(wxFocusEvent&); - void OnKillFocus(wxFocusEvent&); - virtual bool MSWTranslateMessage(WXMSG* pMsg); - virtual bool QueryClientSiteInterface(REFIID iid, void **_interface, const char *&desc); - -protected: - friend class FrameSite; - friend class wxActiveXEvents; - - FrameSite *m_frameSite; - wxAutoIDispatch m_Dispatch; - wxAutoIOleClientSite m_clientSite; - wxAutoIUnknown m_ActiveX; - wxAutoIOleObject m_oleObject; - wxAutoIOleInPlaceObject m_oleInPlaceObject; - wxAutoIOleInPlaceActiveObject m_oleInPlaceActiveObject; - wxAutoIOleDocumentView m_docView; - wxAutoIViewObject m_viewObject; - HWND m_oleObjectHWND; - bool m_bAmbientUserMode; - DWORD m_docAdviseCookie; - wxWindow* m_realparent; - - void CreateActiveX(REFIID, IUnknown*); -}; - -///\brief Store native event parameters. -///\detail Store OLE 'Invoke' parameters for event handlers that need to access them. -/// These are the exact values for the event as they are passed to the wxActiveXContainer. -struct wxActiveXEventNativeMSW -{ - DISPID dispIdMember; - REFIID riid; - LCID lcid; - WORD wFlags; - DISPPARAMS *pDispParams; - VARIANT *pVarResult; - EXCEPINFO *pExcepInfo; - unsigned int *puArgErr; - - wxActiveXEventNativeMSW - (DISPID a_dispIdMember, REFIID a_riid, LCID a_lcid, WORD a_wFlags, DISPPARAMS *a_pDispParams, - VARIANT *a_pVarResult, EXCEPINFO *a_pExcepInfo, unsigned int *a_puArgErr) - :dispIdMember(a_dispIdMember), riid(a_riid), lcid(a_lcid), wFlags(a_wFlags), pDispParams(a_pDispParams), - pVarResult(a_pVarResult), pExcepInfo(a_pExcepInfo), puArgErr(a_puArgErr) - { } -}; - -// Events -class WXDLLIMPEXP_CORE wxActiveXEvent : public wxCommandEvent -{ -private: - friend class wxActiveXEvents; - wxVariant m_params; - DISPID m_dispid; - -public: - virtual wxEvent *Clone() const - { return new wxActiveXEvent(*this); } - - size_t ParamCount() const; - - wxString ParamType(size_t idx) const - { - wxASSERT(idx < ParamCount()); - return m_params[idx].GetType(); - } - - wxString ParamName(size_t idx) const - { - wxASSERT(idx < ParamCount()); - return m_params[idx].GetName(); - } - - wxVariant& operator[] (size_t idx); - - DISPID GetDispatchId() const - { return m_dispid; } - - wxActiveXEventNativeMSW *GetNativeParameters() const - { return (wxActiveXEventNativeMSW*)GetClientData(); } -}; - -// #define wxACTIVEX_ID 14001 -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_ACTIVEX, wxActiveXEvent ); - -typedef void (wxEvtHandler::*wxActiveXEventFunction)(wxActiveXEvent&); - -#define wxActiveXEventHandler(func) \ - wxEVENT_HANDLER_CAST( wxActiveXEventFunction, func ) - -#define EVT_ACTIVEX(id, fn) wxDECLARE_EVENT_TABLE_ENTRY(wxEVT_ACTIVEX, id, -1, wxActiveXEventHandler( fn ), NULL ), - -#endif // wxUSE_ACTIVEX - -#endif // _WX_MSW_OLE_ACTIVEXCONTAINER_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/ole/automtn.h b/Externals/wxWidgets3/include/wx/msw/ole/automtn.h deleted file mode 100644 index 1d1eb33af3..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/ole/automtn.h +++ /dev/null @@ -1,140 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/ole/automtn.h -// Purpose: OLE automation utilities -// Author: Julian Smart -// Modified by: -// Created: 11/6/98 -// Copyright: (c) 1998, Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_AUTOMTN_H_ -#define _WX_AUTOMTN_H_ - -#include "wx/defs.h" - -#if wxUSE_OLE_AUTOMATION - -#include "wx/object.h" -#include "wx/variant.h" - -typedef void WXIDISPATCH; -typedef unsigned short* WXBSTR; -typedef unsigned long WXLCID; - -#ifdef GetObject -#undef GetObject -#endif - -// Flags used with wxAutomationObject::GetInstance() -enum wxAutomationInstanceFlags -{ - // Only use the existing instance, never create a new one. - wxAutomationInstance_UseExistingOnly = 0, - - // Create a new instance if there are no existing ones. - wxAutomationInstance_CreateIfNeeded = 1, - - // Do not log errors if we failed to get the existing instance because none - // is available. - wxAutomationInstance_SilentIfNone = 2 -}; - -/* - * wxAutomationObject - * Wraps up an IDispatch pointer and invocation; does variant conversion. - */ - -class WXDLLIMPEXP_CORE wxAutomationObject: public wxObject -{ -public: - wxAutomationObject(WXIDISPATCH* dispatchPtr = NULL); - virtual ~wxAutomationObject(); - - // Set/get dispatch pointer - void SetDispatchPtr(WXIDISPATCH* dispatchPtr) { m_dispatchPtr = dispatchPtr; } - WXIDISPATCH* GetDispatchPtr() const { return m_dispatchPtr; } - bool IsOk() const { return m_dispatchPtr != NULL; } - - // Get a dispatch pointer from the current object associated - // with a ProgID, such as "Excel.Application" - bool GetInstance(const wxString& progId, - int flags = wxAutomationInstance_CreateIfNeeded) const; - - // Get a dispatch pointer from a new instance of the class - bool CreateInstance(const wxString& progId) const; - - // Low-level invocation function. Pass either an array of variants, - // or an array of pointers to variants. - bool Invoke(const wxString& member, int action, - wxVariant& retValue, int noArgs, wxVariant args[], const wxVariant* ptrArgs[] = 0) const; - - // Invoke a member function - wxVariant CallMethod(const wxString& method, int noArgs, wxVariant args[]); - wxVariant CallMethodArray(const wxString& method, int noArgs, const wxVariant **args); - - // Convenience function - wxVariant CallMethod(const wxString& method, - const wxVariant& arg1 = wxNullVariant, const wxVariant& arg2 = wxNullVariant, - const wxVariant& arg3 = wxNullVariant, const wxVariant& arg4 = wxNullVariant, - const wxVariant& arg5 = wxNullVariant, const wxVariant& arg6 = wxNullVariant); - - // Get/Put property - wxVariant GetProperty(const wxString& property, int noArgs = 0, wxVariant args[] = NULL) const; - wxVariant GetPropertyArray(const wxString& property, int noArgs, const wxVariant **args) const; - wxVariant GetProperty(const wxString& property, - const wxVariant& arg1, const wxVariant& arg2 = wxNullVariant, - const wxVariant& arg3 = wxNullVariant, const wxVariant& arg4 = wxNullVariant, - const wxVariant& arg5 = wxNullVariant, const wxVariant& arg6 = wxNullVariant); - - bool PutPropertyArray(const wxString& property, int noArgs, const wxVariant **args); - bool PutProperty(const wxString& property, int noArgs, wxVariant args[]) ; - bool PutProperty(const wxString& property, - const wxVariant& arg1, const wxVariant& arg2 = wxNullVariant, - const wxVariant& arg3 = wxNullVariant, const wxVariant& arg4 = wxNullVariant, - const wxVariant& arg5 = wxNullVariant, const wxVariant& arg6 = wxNullVariant); - - // Uses DISPATCH_PROPERTYGET - // and returns a dispatch pointer. The calling code should call Release - // on the pointer, though this could be implicit by constructing an wxAutomationObject - // with it and letting the destructor call Release. - WXIDISPATCH* GetDispatchProperty(const wxString& property, int noArgs, wxVariant args[]) const; - WXIDISPATCH* GetDispatchProperty(const wxString& property, int noArgs, const wxVariant **args) const; - - // A way of initialising another wxAutomationObject with a dispatch object, - // without having to deal with nasty IDispatch pointers. - bool GetObject(wxAutomationObject& obj, const wxString& property, int noArgs = 0, wxVariant args[] = NULL) const; - bool GetObject(wxAutomationObject& obj, const wxString& property, int noArgs, const wxVariant **args) const; - - // Returns the locale identifier used in automation calls. The default is - // LOCALE_SYSTEM_DEFAULT. Objects obtained by GetObject() inherit the - // locale identifier from the one that created them. - WXLCID GetLCID() const; - - // Sets the locale identifier to be used in automation calls performed by - // this object. The default is LOCALE_SYSTEM_DEFAULT. - void SetLCID(WXLCID lcid); - - // Returns the flags used for conversions between wxVariant and OLE - // VARIANT, see wxOleConvertVariantFlags. The default value is - // wxOleConvertVariant_Default but all the objects obtained by GetObject() - // inherit the flags from the one that created them. - long GetConvertVariantFlags() const; - - // Sets the flags used for conversions between wxVariant and OLE VARIANT, - // see wxOleConvertVariantFlags (default is wxOleConvertVariant_Default. - void SetConvertVariantFlags(long flags); - -public: // public for compatibility only, don't use m_dispatchPtr directly. - WXIDISPATCH* m_dispatchPtr; - -private: - WXLCID m_lcid; - long m_convertVariantFlags; - - wxDECLARE_NO_COPY_CLASS(wxAutomationObject); -}; - -#endif // wxUSE_OLE_AUTOMATION - -#endif // _WX_AUTOMTN_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/ole/dataform.h b/Externals/wxWidgets3/include/wx/msw/ole/dataform.h deleted file mode 100644 index 26959099f7..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/ole/dataform.h +++ /dev/null @@ -1,70 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/ole/dataform.h -// Purpose: declaration of the wxDataFormat class -// Author: Vadim Zeitlin -// Modified by: -// Created: 19.10.99 (extracted from msw/ole/dataobj.h) -// Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_OLE_DATAFORM_H -#define _WX_MSW_OLE_DATAFORM_H - -// ---------------------------------------------------------------------------- -// wxDataFormat identifies the single format of data -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxDataFormat -{ -public: - // the clipboard formats under Win32 are WORD's - typedef unsigned short NativeFormat; - - wxDataFormat(NativeFormat format = wxDF_INVALID) { m_format = format; } - - // we need constructors from all string types as implicit conversions to - // wxString don't apply when we already rely on implicit conversion of a, - // for example, "char *" string to wxDataFormat, and existing code does it - wxDataFormat(const wxString& format) { SetId(format); } - wxDataFormat(const char *format) { SetId(format); } - wxDataFormat(const wchar_t *format) { SetId(format); } - wxDataFormat(const wxCStrData& format) { SetId(format); } - - wxDataFormat& operator=(NativeFormat format) - { m_format = format; return *this; } - wxDataFormat& operator=(const wxDataFormat& format) - { m_format = format.m_format; return *this; } - - // default copy ctor/assignment operators ok - - // comparison (must have both versions) - bool operator==(wxDataFormatId format) const; - bool operator!=(wxDataFormatId format) const; - bool operator==(const wxDataFormat& format) const; - bool operator!=(const wxDataFormat& format) const; - - // explicit and implicit conversions to NativeFormat which is one of - // standard data types (implicit conversion is useful for preserving the - // compatibility with old code) - NativeFormat GetFormatId() const { return m_format; } - operator NativeFormat() const { return m_format; } - - // this works with standard as well as custom ids - void SetType(NativeFormat format) { m_format = format; } - NativeFormat GetType() const { return m_format; } - - // string ids are used for custom types - this SetId() must be used for - // application-specific formats - wxString GetId() const; - void SetId(const wxString& format); - - // returns true if the format is one of those defined in wxDataFormatId - bool IsStandard() const { return m_format > 0 && m_format < wxDF_PRIVATE; } - -private: - NativeFormat m_format; -}; - -#endif // _WX_MSW_OLE_DATAFORM_H - diff --git a/Externals/wxWidgets3/include/wx/msw/ole/dataobj.h b/Externals/wxWidgets3/include/wx/msw/ole/dataobj.h deleted file mode 100644 index cc1002766a..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/ole/dataobj.h +++ /dev/null @@ -1,78 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/ole/dataobj.h -// Purpose: declaration of the wxDataObject class -// Author: Vadim Zeitlin -// Modified by: -// Created: 10.05.98 -// Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_OLE_DATAOBJ_H -#define _WX_MSW_OLE_DATAOBJ_H - -// ---------------------------------------------------------------------------- -// forward declarations -// ---------------------------------------------------------------------------- - -struct IDataObject; - -// ---------------------------------------------------------------------------- -// wxDataObject is a "smart" and polymorphic piece of data. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxDataObject : public wxDataObjectBase -{ -public: - // ctor & dtor - wxDataObject(); - virtual ~wxDataObject(); - - // retrieve IDataObject interface (for other OLE related classes) - IDataObject *GetInterface() const { return m_pIDataObject; } - - // tell the object that it should be now owned by IDataObject - i.e. when - // it is deleted, it should delete us as well - void SetAutoDelete(); - - // return true if we support this format in "Get" direction - bool IsSupportedFormat(const wxDataFormat& format) const - { return wxDataObjectBase::IsSupported(format, Get); } - - // if this method returns false, this wxDataObject will be copied to - // the clipboard with its size prepended to it, which is compatible with - // older wx versions - // - // if returns true, then this wxDataObject will be copied to the clipboard - // without any additional information and ::HeapSize() function will be used - // to get the size of that data - virtual bool NeedsVerbatimData(const wxDataFormat& WXUNUSED(format)) const - { - // return false from here only for compatibility with earlier wx versions - return true; - } - - // function to return symbolic name of clipboard format (for debug messages) -#ifdef __WXDEBUG__ - static const wxChar *GetFormatName(wxDataFormat format); - - #define wxGetFormatName(format) wxDataObject::GetFormatName(format) -#else // !Debug - #define wxGetFormatName(format) wxT("") -#endif // Debug/!Debug - // they need to be accessed from wxIDataObject, so made them public, - // or wxIDataObject friend -public: - virtual const void* GetSizeFromBuffer( const void* buffer, size_t* size, - const wxDataFormat& format ); - virtual void* SetSizeInBuffer( void* buffer, size_t size, - const wxDataFormat& format ); - virtual size_t GetBufferOffset( const wxDataFormat& format ); - -private: - IDataObject *m_pIDataObject; // pointer to the COM interface - - wxDECLARE_NO_COPY_CLASS(wxDataObject); -}; - -#endif //_WX_MSW_OLE_DATAOBJ_H diff --git a/Externals/wxWidgets3/include/wx/msw/ole/dataobj2.h b/Externals/wxWidgets3/include/wx/msw/ole/dataobj2.h deleted file mode 100644 index 9b97e9fb0a..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/ole/dataobj2.h +++ /dev/null @@ -1,145 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/ole/dataobj2.h -// Purpose: second part of platform specific wxDataObject header - -// declarations of predefined wxDataObjectSimple-derived classes -// Author: Vadim Zeitlin -// Modified by: -// Created: 21.10.99 -// Copyright: (c) 1999 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_OLE_DATAOBJ2_H -#define _WX_MSW_OLE_DATAOBJ2_H - -// ---------------------------------------------------------------------------- -// wxBitmapDataObject is a specialization of wxDataObject for bitmap data -// -// NB: in fact, under MSW we support CF_DIB (and not CF_BITMAP) clipboard -// format and we also provide wxBitmapDataObject2 for CF_BITMAP (which is -// rarely used). This is ugly, but I haven't found a solution for it yet. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxBitmapDataObject : public wxBitmapDataObjectBase -{ -public: - // ctors - wxBitmapDataObject(const wxBitmap& bitmap = wxNullBitmap) - : wxBitmapDataObjectBase(bitmap) - { - SetFormat(wxDF_DIB); - - m_data = NULL; - } - - // implement base class pure virtuals - virtual size_t GetDataSize() const; - virtual bool GetDataHere(void *buf) const; - virtual bool SetData(size_t len, const void *buf); - - virtual size_t GetDataSize(const wxDataFormat& WXUNUSED(format)) const - { return GetDataSize(); } - virtual bool GetDataHere(const wxDataFormat& WXUNUSED(format), - void *buf) const - { return GetDataHere(buf); } - virtual bool SetData(const wxDataFormat& WXUNUSED(format), - size_t len, const void *buf) - { return SetData(len, buf); } - -private: - // the DIB data - void /* BITMAPINFO */ *m_data; - - wxDECLARE_NO_COPY_CLASS(wxBitmapDataObject); -}; - -// ---------------------------------------------------------------------------- -// wxBitmapDataObject2 - a data object for CF_BITMAP -// -// FIXME did I already mention it was ugly? -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxBitmapDataObject2 : public wxBitmapDataObjectBase -{ -public: - // ctors - wxBitmapDataObject2(const wxBitmap& bitmap = wxNullBitmap) - : wxBitmapDataObjectBase(bitmap) - { - } - - // implement base class pure virtuals - virtual size_t GetDataSize() const; - virtual bool GetDataHere(void *buf) const; - virtual bool SetData(size_t len, const void *buf); - - virtual size_t GetDataSize(const wxDataFormat& WXUNUSED(format)) const - { return GetDataSize(); } - virtual bool GetDataHere(const wxDataFormat& WXUNUSED(format), - void *buf) const - { return GetDataHere(buf); } - virtual bool SetData(const wxDataFormat& WXUNUSED(format), - size_t len, const void *buf) - { return SetData(len, buf); } - -private: - wxDECLARE_NO_COPY_CLASS(wxBitmapDataObject2); -}; - -// ---------------------------------------------------------------------------- -// wxFileDataObject - data object for CF_HDROP -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxFileDataObject : public wxFileDataObjectBase -{ -public: - wxFileDataObject() { } - - // implement base class pure virtuals - virtual bool SetData(size_t len, const void *buf); - virtual size_t GetDataSize() const; - virtual bool GetDataHere(void *pData) const; - virtual void AddFile(const wxString& file); - - virtual size_t GetDataSize(const wxDataFormat& WXUNUSED(format)) const - { return GetDataSize(); } - virtual bool GetDataHere(const wxDataFormat& WXUNUSED(format), - void *buf) const - { return GetDataHere(buf); } - virtual bool SetData(const wxDataFormat& WXUNUSED(format), - size_t len, const void *buf) - { return SetData(len, buf); } - -private: - wxDECLARE_NO_COPY_CLASS(wxFileDataObject); -}; - -// ---------------------------------------------------------------------------- -// wxURLDataObject: data object for URLs -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxURLDataObject : public wxDataObjectComposite -{ -public: - // initialize with URL in ctor or use SetURL later - wxURLDataObject(const wxString& url = wxEmptyString); - - // return the URL as string - wxString GetURL() const; - - // Set a string as the URL in the data object - void SetURL(const wxString& url); - - // override to set m_textFormat - virtual bool SetData(const wxDataFormat& format, - size_t len, - const void *buf); - -private: - // last data object we got data in - wxDataObjectSimple *m_dataObjectLast; - - wxDECLARE_NO_COPY_CLASS(wxURLDataObject); -}; - -#endif // _WX_MSW_OLE_DATAOBJ2_H diff --git a/Externals/wxWidgets3/include/wx/msw/ole/dropsrc.h b/Externals/wxWidgets3/include/wx/msw/ole/dropsrc.h deleted file mode 100644 index 1c5f692702..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/ole/dropsrc.h +++ /dev/null @@ -1,78 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/ole/dropsrc.h -// Purpose: declaration of the wxDropSource class -// Author: Vadim Zeitlin -// Modified by: -// Created: 06.03.98 -// Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_OLEDROPSRC_H -#define _WX_OLEDROPSRC_H - -#if wxUSE_DRAG_AND_DROP - -// ---------------------------------------------------------------------------- -// forward declarations -// ---------------------------------------------------------------------------- - -class wxIDropSource; -class WXDLLIMPEXP_FWD_CORE wxDataObject; -class WXDLLIMPEXP_FWD_CORE wxWindow; - -// ---------------------------------------------------------------------------- -// macros -// ---------------------------------------------------------------------------- - -// this macro may be used instead for wxDropSource ctor arguments: it will use -// the cursor 'name' from the resources under MSW, but will expand to -// something else under GTK. If you don't use it, you will have to use #ifdef -// in the application code. -#define wxDROP_ICON(name) wxCursor(wxT(#name)) - -// ---------------------------------------------------------------------------- -// wxDropSource is used to start the drag-&-drop operation on associated -// wxDataObject object. It's responsible for giving UI feedback while dragging. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxDropSource : public wxDropSourceBase -{ -public: - // ctors: if you use default ctor you must call SetData() later! - // - // NB: the "wxWindow *win" parameter is unused and is here only for wxGTK - // compatibility, as well as both icon parameters - wxDropSource(wxWindow *win = NULL, - const wxCursor &cursorCopy = wxNullCursor, - const wxCursor &cursorMove = wxNullCursor, - const wxCursor &cursorStop = wxNullCursor); - wxDropSource(wxDataObject& data, - wxWindow *win = NULL, - const wxCursor &cursorCopy = wxNullCursor, - const wxCursor &cursorMove = wxNullCursor, - const wxCursor &cursorStop = wxNullCursor); - - virtual ~wxDropSource(); - - // do it (call this in response to a mouse button press, for example) - // params: if bAllowMove is false, data can be only copied - virtual wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly); - - // overridable: you may give some custom UI feedback during d&d operation - // in this function (it's called on each mouse move, so it shouldn't be - // too slow). Just return false if you want default feedback. - virtual bool GiveFeedback(wxDragResult effect); - -protected: - void Init(); - -private: - wxIDropSource *m_pIDropSource; // the pointer to COM interface - - wxDECLARE_NO_COPY_CLASS(wxDropSource); -}; - -#endif //wxUSE_DRAG_AND_DROP - -#endif //_WX_OLEDROPSRC_H diff --git a/Externals/wxWidgets3/include/wx/msw/ole/droptgt.h b/Externals/wxWidgets3/include/wx/msw/ole/droptgt.h deleted file mode 100644 index 4cb9d3907d..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/ole/droptgt.h +++ /dev/null @@ -1,89 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/ole/droptgt.h -// Purpose: declaration of the wxDropTarget class -// Author: Vadim Zeitlin -// Modified by: -// Created: 06.03.98 -// Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_OLEDROPTGT_H -#define _WX_OLEDROPTGT_H - -#if wxUSE_DRAG_AND_DROP - -// ---------------------------------------------------------------------------- -// forward declarations -// ---------------------------------------------------------------------------- - -class wxIDropTarget; -struct wxIDropTargetHelper; -struct IDataObject; - -// ---------------------------------------------------------------------------- -// An instance of the class wxDropTarget may be associated with any wxWindow -// derived object via SetDropTarget() function. If this is done, the virtual -// methods of wxDropTarget are called when something is dropped on the window. -// -// Note that wxDropTarget is an abstract base class (ABC) and you should derive -// your own class from it implementing pure virtual function in order to use it -// (all of them, including protected ones which are called by the class itself) -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxDropTarget : public wxDropTargetBase -{ -public: - // ctor & dtor - wxDropTarget(wxDataObject *dataObject = NULL); - virtual ~wxDropTarget(); - - // normally called by wxWindow on window creation/destruction, but might be - // called `manually' as well. Register() returns true on success. - bool Register(WXHWND hwnd); - void Revoke(WXHWND hwnd); - - // provide default implementation for base class pure virtuals - virtual bool OnDrop(wxCoord x, wxCoord y); - virtual bool GetData(); - - // Can only be called during OnXXX methods. - wxDataFormat GetMatchingPair(); - - // implementation only from now on - // ------------------------------- - - // do we accept this kind of data? - bool MSWIsAcceptedData(IDataObject *pIDataSource) const; - - // give us the data source from IDropTarget::Drop() - this is later used by - // GetData() when it's called from inside OnData() - void MSWSetDataSource(IDataObject *pIDataSource); - - // These functions take care of all things necessary to support native drag - // images. - // - // {Init,End}DragImageSupport() are called during Register/Revoke, - // UpdateDragImageOnXXX() functions are called on the corresponding drop - // target events. - void MSWInitDragImageSupport(); - void MSWEndDragImageSupport(); - void MSWUpdateDragImageOnData(wxCoord x, wxCoord y, wxDragResult res); - void MSWUpdateDragImageOnDragOver(wxCoord x, wxCoord y, wxDragResult res); - void MSWUpdateDragImageOnEnter(wxCoord x, wxCoord y, wxDragResult res); - void MSWUpdateDragImageOnLeave(); - -private: - // helper used by IsAcceptedData() and GetData() - wxDataFormat MSWGetSupportedFormat(IDataObject *pIDataSource) const; - - wxIDropTarget *m_pIDropTarget; // the pointer to our COM interface - IDataObject *m_pIDataSource; // the pointer to the source data object - wxIDropTargetHelper *m_dropTargetHelper; // the drop target helper - - wxDECLARE_NO_COPY_CLASS(wxDropTarget); -}; - -#endif //wxUSE_DRAG_AND_DROP - -#endif //_WX_OLEDROPTGT_H diff --git a/Externals/wxWidgets3/include/wx/msw/ole/oleutils.h b/Externals/wxWidgets3/include/wx/msw/ole/oleutils.h deleted file mode 100644 index 57a99fb445..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/ole/oleutils.h +++ /dev/null @@ -1,376 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/ole/oleutils.h -// Purpose: OLE helper routines, OLE debugging support &c -// Author: Vadim Zeitlin -// Modified by: -// Created: 19.02.1998 -// Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_OLEUTILS_H -#define _WX_OLEUTILS_H - -#include "wx/defs.h" - -#if wxUSE_OLE - -// ole2.h includes windows.h, so include wrapwin.h first -#include "wx/msw/wrapwin.h" -// get IUnknown, REFIID &c -#include -#include "wx/intl.h" -#include "wx/log.h" -#include "wx/variant.h" - -// ============================================================================ -// General purpose functions and macros -// ============================================================================ - -// ---------------------------------------------------------------------------- -// initialize/cleanup OLE -// ---------------------------------------------------------------------------- - -// call OleInitialize() or CoInitialize[Ex]() depending on the platform -// -// return true if ok, false otherwise -inline bool wxOleInitialize() -{ - HRESULT - hr = ::OleInitialize(NULL); - - // RPC_E_CHANGED_MODE indicates that OLE had been already initialized - // before, albeit with different mode. Don't consider it to be an error as - // we don't actually care ourselves about the mode used so this allows the - // main application to call OleInitialize() on its own before we do if it - // needs non-default mode. - if ( hr != RPC_E_CHANGED_MODE && FAILED(hr) ) - { - wxLogError(wxGetTranslation("Cannot initialize OLE")); - - return false; - } - - return true; -} - -inline void wxOleUninitialize() -{ - ::OleUninitialize(); -} - -// ---------------------------------------------------------------------------- -// misc helper functions/macros -// ---------------------------------------------------------------------------- - -// release the interface pointer (if !NULL) -inline void ReleaseInterface(IUnknown *pIUnk) -{ - if ( pIUnk != NULL ) - pIUnk->Release(); -} - -// release the interface pointer (if !NULL) and make it NULL -#define RELEASE_AND_NULL(p) if ( (p) != NULL ) { p->Release(); p = NULL; }; - -// return true if the iid is in the array -extern WXDLLIMPEXP_CORE bool IsIidFromList(REFIID riid, const IID *aIids[], size_t nCount); - -// ============================================================================ -// IUnknown implementation helpers -// ============================================================================ - -/* - The most dumb implementation of IUnknown methods. We don't support - aggregation nor containment, but for 99% of cases this simple - implementation is quite enough. - - Usage is trivial: here is all you should have - 1) DECLARE_IUNKNOWN_METHODS in your (IUnknown derived!) class declaration - 2) BEGIN/END_IID_TABLE with ADD_IID in between for all interfaces you - support (at least all for which you intent to return 'this' from QI, - i.e. you should derive from IFoo if you have ADD_IID(Foo)) somewhere else - 3) IMPLEMENT_IUNKNOWN_METHODS somewhere also - - These macros are quite simple: AddRef and Release are trivial and QI does - lookup in a static member array of IIDs and returns 'this' if it founds - the requested interface in it or E_NOINTERFACE if not. - */ - -/* - wxAutoULong: this class is used for automatically initalising m_cRef to 0 -*/ -class wxAutoULong -{ -public: - wxAutoULong(ULONG value = 0) : m_Value(value) { } - - operator ULONG&() { return m_Value; } - ULONG& operator=(ULONG value) { m_Value = value; return m_Value; } - - wxAutoULong& operator++() { ++m_Value; return *this; } - const wxAutoULong operator++( int ) { wxAutoULong temp = *this; ++m_Value; return temp; } - - wxAutoULong& operator--() { --m_Value; return *this; } - const wxAutoULong operator--( int ) { wxAutoULong temp = *this; --m_Value; return temp; } - -private: - ULONG m_Value; -}; - -// declare the methods and the member variable containing reference count -// you must also define the ms_aIids array somewhere with BEGIN_IID_TABLE -// and friends (see below) - -#define DECLARE_IUNKNOWN_METHODS \ - public: \ - STDMETHODIMP QueryInterface(REFIID, void **); \ - STDMETHODIMP_(ULONG) AddRef(); \ - STDMETHODIMP_(ULONG) Release(); \ - private: \ - static const IID *ms_aIids[]; \ - wxAutoULong m_cRef - -// macros for declaring supported interfaces -// NB: ADD_IID prepends IID_I whereas ADD_RAW_IID does not -#define BEGIN_IID_TABLE(cname) const IID *cname::ms_aIids[] = { -#define ADD_IID(iid) &IID_I##iid, -#define ADD_RAW_IID(iid) &iid, -#define END_IID_TABLE } - -// implementation is as straightforward as possible -// Parameter: classname - the name of the class -#define IMPLEMENT_IUNKNOWN_METHODS(classname) \ - STDMETHODIMP classname::QueryInterface(REFIID riid, void **ppv) \ - { \ - wxLogQueryInterface(wxT(#classname), riid); \ - \ - if ( IsIidFromList(riid, ms_aIids, WXSIZEOF(ms_aIids)) ) { \ - *ppv = this; \ - AddRef(); \ - \ - return S_OK; \ - } \ - else { \ - *ppv = NULL; \ - \ - return (HRESULT) E_NOINTERFACE; \ - } \ - } \ - \ - STDMETHODIMP_(ULONG) classname::AddRef() \ - { \ - wxLogAddRef(wxT(#classname), m_cRef); \ - \ - return ++m_cRef; \ - } \ - \ - STDMETHODIMP_(ULONG) classname::Release() \ - { \ - wxLogRelease(wxT(#classname), m_cRef); \ - \ - if ( --m_cRef == wxAutoULong(0) ) { \ - delete this; \ - return 0; \ - } \ - else \ - return m_cRef; \ - } - -// ============================================================================ -// Debugging support -// ============================================================================ - -// VZ: I don't know it's not done for compilers other than VC++ but I leave it -// as is. Please note, though, that tracing OLE interface calls may be -// incredibly useful when debugging OLE programs. -#if defined(__WXDEBUG__) && defined(__VISUALC__) -// ---------------------------------------------------------------------------- -// All OLE specific log functions have DebugTrace level (as LogTrace) -// ---------------------------------------------------------------------------- - -// tries to translate riid into a symbolic name, if possible -WXDLLIMPEXP_CORE void wxLogQueryInterface(const wxChar *szInterface, REFIID riid); - -// these functions print out the new value of reference counter -WXDLLIMPEXP_CORE void wxLogAddRef (const wxChar *szInterface, ULONG cRef); -WXDLLIMPEXP_CORE void wxLogRelease(const wxChar *szInterface, ULONG cRef); - -#else //!__WXDEBUG__ - #define wxLogQueryInterface(szInterface, riid) - #define wxLogAddRef(szInterface, cRef) - #define wxLogRelease(szInterface, cRef) -#endif //__WXDEBUG__ - -// wrapper around BSTR type (by Vadim Zeitlin) - -class WXDLLIMPEXP_CORE wxBasicString -{ -public: - // ctors & dtor - wxBasicString(const wxString& str); - wxBasicString(const wxBasicString& bstr); - ~wxBasicString(); - - wxBasicString& operator=(const wxBasicString& bstr); - - // accessors - // just get the string - operator BSTR() const { return m_bstrBuf; } - // retrieve a copy of our string - caller must SysFreeString() it later! - BSTR Get() const { return SysAllocString(m_bstrBuf); } - -private: - // actual string - BSTR m_bstrBuf; -}; - -#if wxUSE_VARIANT -// Convert variants -class WXDLLIMPEXP_FWD_BASE wxVariant; - -// wrapper for CURRENCY type used in VARIANT (VARIANT.vt == VT_CY) -class WXDLLIMPEXP_CORE wxVariantDataCurrency : public wxVariantData -{ -public: - wxVariantDataCurrency() { VarCyFromR8(0.0, &m_value); } - wxVariantDataCurrency(CURRENCY value) { m_value = value; } - - CURRENCY GetValue() const { return m_value; } - void SetValue(CURRENCY value) { m_value = value; } - - virtual bool Eq(wxVariantData& data) const; - -#if wxUSE_STD_IOSTREAM - virtual bool Write(wxSTD ostream& str) const; -#endif - virtual bool Write(wxString& str) const; - - wxVariantData* Clone() const { return new wxVariantDataCurrency(m_value); } - virtual wxString GetType() const { return wxS("currency"); } - - DECLARE_WXANY_CONVERSION() - -private: - CURRENCY m_value; -}; - - -// wrapper for SCODE type used in VARIANT (VARIANT.vt == VT_ERROR) -class WXDLLIMPEXP_CORE wxVariantDataErrorCode : public wxVariantData -{ -public: - wxVariantDataErrorCode(SCODE value = S_OK) { m_value = value; } - - SCODE GetValue() const { return m_value; } - void SetValue(SCODE value) { m_value = value; } - - virtual bool Eq(wxVariantData& data) const; - -#if wxUSE_STD_IOSTREAM - virtual bool Write(wxSTD ostream& str) const; -#endif - virtual bool Write(wxString& str) const; - - wxVariantData* Clone() const { return new wxVariantDataErrorCode(m_value); } - virtual wxString GetType() const { return wxS("errorcode"); } - - DECLARE_WXANY_CONVERSION() - -private: - SCODE m_value; -}; - -// wrapper for SAFEARRAY, used for passing multidimensional arrays in wxVariant -class WXDLLIMPEXP_CORE wxVariantDataSafeArray : public wxVariantData -{ -public: - wxEXPLICIT wxVariantDataSafeArray(SAFEARRAY* value = NULL) - { - m_value = value; - } - - SAFEARRAY* GetValue() const { return m_value; } - void SetValue(SAFEARRAY* value) { m_value = value; } - - virtual bool Eq(wxVariantData& data) const; - -#if wxUSE_STD_IOSTREAM - virtual bool Write(wxSTD ostream& str) const; -#endif - virtual bool Write(wxString& str) const; - - wxVariantData* Clone() const { return new wxVariantDataSafeArray(m_value); } - virtual wxString GetType() const { return wxS("safearray"); } - - DECLARE_WXANY_CONVERSION() - -private: - SAFEARRAY* m_value; -}; - -// Used by wxAutomationObject for its wxConvertOleToVariant() calls. -enum wxOleConvertVariantFlags -{ - wxOleConvertVariant_Default = 0, - - // If wxOleConvertVariant_ReturnSafeArrays flag is set, SAFEARRAYs - // contained in OLE VARIANTs will be returned as wxVariants - // with wxVariantDataSafeArray type instead of wxVariants - // with the list type containing the (flattened) SAFEARRAY's elements. - wxOleConvertVariant_ReturnSafeArrays = 1 -}; - -WXDLLIMPEXP_CORE -bool wxConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant); - -WXDLLIMPEXP_CORE -bool wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant, - long flags = wxOleConvertVariant_Default); - -#endif // wxUSE_VARIANT - -// Convert string to Unicode -WXDLLIMPEXP_CORE BSTR wxConvertStringToOle(const wxString& str); - -// Convert string from BSTR to wxString -WXDLLIMPEXP_CORE wxString wxConvertStringFromOle(BSTR bStr); - -#else // !wxUSE_OLE - -// ---------------------------------------------------------------------------- -// stub functions to avoid #if wxUSE_OLE in the main code -// ---------------------------------------------------------------------------- - -inline bool wxOleInitialize() { return false; } -inline void wxOleUninitialize() { } - -#endif // wxUSE_OLE/!wxUSE_OLE - -// RAII class initializing OLE in its ctor and undoing it in its dtor. -class wxOleInitializer -{ -public: - wxOleInitializer() - : m_ok(wxOleInitialize()) - { - } - - bool IsOk() const - { - return m_ok; - } - - ~wxOleInitializer() - { - if ( m_ok ) - wxOleUninitialize(); - } - -private: - const bool m_ok; - - wxDECLARE_NO_COPY_CLASS(wxOleInitializer); -}; - -#endif //_WX_OLEUTILS_H diff --git a/Externals/wxWidgets3/include/wx/msw/ole/safearray.h b/Externals/wxWidgets3/include/wx/msw/ole/safearray.h deleted file mode 100644 index fb5c70a399..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/ole/safearray.h +++ /dev/null @@ -1,394 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: msw/ole/safearray.h -// Purpose: Helpers for working with OLE SAFEARRAYs. -// Author: PB -// Created: 2012-09-23 -// Copyright: (c) 2012 wxWidgets development team -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _MSW_OLE_SAFEARRAY_H_ -#define _MSW_OLE_SAFEARRAY_H_ - -#include "wx/msw/ole/oleutils.h" - -#if wxUSE_OLE && wxUSE_VARIANT - -/* - wxSafeArray is wxWidgets wrapper for working with MS Windows SAFEARRAYs. - It also has convenience functions for converting between SAFEARRAY - and wxVariant with list type or wxArrayString. -*/ - -// The base class with type-independent methods. It exists solely in order to -// reduce the template bloat. -class WXDLLIMPEXP_CORE wxSafeArrayBase -{ -public: - // If owns a SAFEARRAY, it's unlocked and destroyed. - virtual ~wxSafeArrayBase() { Destroy(); } - - // Unlocks and destroys the owned SAFEARRAY. - void Destroy(); - - // Unlocks the owned SAFEARRAY, returns it and gives up its ownership. - SAFEARRAY* Detach(); - - // Returns true if has a valid SAFEARRAY. - bool HasArray() const { return m_array != NULL; } - - // Returns the number of dimensions. - size_t GetDim() const; - - // Returns lower bound for dimension dim in bound. Dimensions start at 1. - bool GetLBound(size_t dim, long& bound) const; - - // Returns upper bound for dimension dim in bound. Dimensions start at 1. - bool GetUBound(size_t dim, long& bound) const; - - // Returns element count for dimension dim. Dimensions start at 1. - size_t GetCount(size_t dim) const; - -protected: - // Default constructor, protected so the class can't be used on its own, - // it's only used as a base class of wxSafeArray<>. - wxSafeArrayBase() - { - m_array = NULL; - } - - bool Lock(); - bool Unlock(); - - SAFEARRAY* m_array; -}; - -// wxSafeArrayConvertor<> must be specialized for the type in order to allow -// using it with wxSafeArray<>. -// -// We specialize it below for the standard types. -template -struct wxSafeArrayConvertor {}; - -/** - Macro for specializing wxSafeArrayConvertor for simple types. - - The template parameters are: - - externType: basic C data type, e.g. wxFloat64 or wxInt32 - - varType: corresponding VARIANT type constant, e.g. VT_R8 or VT_I4. -*/ -#define wxSPECIALIZE_WXSAFEARRAY_CONVERTOR_SIMPLE(externType, varType) \ -template <> \ -struct wxSafeArrayConvertor \ -{ \ - typedef externType externT; \ - typedef externT internT; \ - static bool ToArray(const externT& from, internT& to) \ - { \ - to = from; \ - return true; \ - } \ - static bool FromArray(const internT& from, externT& to) \ - { \ - to = from; \ - return true; \ - } \ -} - -wxSPECIALIZE_WXSAFEARRAY_CONVERTOR_SIMPLE(wxInt16, VT_I2); -wxSPECIALIZE_WXSAFEARRAY_CONVERTOR_SIMPLE(wxInt32, VT_I4); -wxSPECIALIZE_WXSAFEARRAY_CONVERTOR_SIMPLE(wxFloat32, VT_R4); -wxSPECIALIZE_WXSAFEARRAY_CONVERTOR_SIMPLE(wxFloat64, VT_R8); - -// Specialization for VT_BSTR using wxString. -template <> -struct wxSafeArrayConvertor -{ - typedef wxString externT; - typedef BSTR internT; - - static bool ToArray(const wxString& from, BSTR& to) - { - BSTR bstr = wxConvertStringToOle(from); - - if ( !bstr && !from.empty() ) - { - // BSTR can be NULL for empty strings but if the string was - // not empty, it means we failed to allocate memory for it. - return false; - } - to = bstr; - return true; - } - - static bool FromArray(const BSTR from, wxString& to) - { - to = wxConvertStringFromOle(from); - return true; - } -}; - -// Specialization for VT_VARIANT using wxVariant. -template <> -struct wxSafeArrayConvertor -{ - typedef wxVariant externT; - typedef VARIANT internT; - - static bool ToArray(const wxVariant& from, VARIANT& to) - { - return wxConvertVariantToOle(from, to); - } - - static bool FromArray(const VARIANT& from, wxVariant& to) - { - return wxConvertOleToVariant(from, to); - } -}; - - -template -class wxSafeArray : public wxSafeArrayBase -{ -public: - typedef wxSafeArrayConvertor Convertor; - typedef typename Convertor::internT internT; - typedef typename Convertor::externT externT; - - // Default constructor. - wxSafeArray() - { - m_array = NULL; - } - - // Creates and locks a zero-based one-dimensional SAFEARRAY with the given - // number of elements. - bool Create(size_t count) - { - SAFEARRAYBOUND bound; - - bound.lLbound = 0; - bound.cElements = count; - return Create(&bound, 1); - } - - // Creates and locks a SAFEARRAY. See SafeArrayCreate() in MSDN - // documentation for more information. - bool Create(SAFEARRAYBOUND* bound, size_t dimensions) - { - wxCHECK_MSG( !m_array, false, wxS("Can't be created twice") ); - - m_array = SafeArrayCreate(varType, dimensions, bound); - if ( !m_array ) - return false; - - return Lock(); - } - - /** - Creates a 0-based one-dimensional SAFEARRAY from wxVariant with the - list type. - - Can be called only for wxSafeArray. - */ - bool CreateFromListVariant(const wxVariant& variant) - { - wxCHECK(varType == VT_VARIANT, false); - wxCHECK(variant.GetType() == wxS("list"), false); - - if ( !Create(variant.GetCount()) ) - return false; - - VARIANT* data = static_cast(m_array->pvData); - - for ( size_t i = 0; i < variant.GetCount(); i++) - { - if ( !Convertor::ToArray(variant[i], data[i]) ) - return false; - } - return true; - } - - /** - Creates a 0-based one-dimensional SAFEARRAY from wxArrayString. - - Can be called only for wxSafeArray. - */ - bool CreateFromArrayString(const wxArrayString& strings) - { - wxCHECK(varType == VT_BSTR, false); - - if ( !Create(strings.size()) ) - return false; - - BSTR* data = static_cast(m_array->pvData); - - for ( size_t i = 0; i < strings.size(); i++ ) - { - if ( !Convertor::ToArray(strings[i], data[i]) ) - return false; - } - return true; - } - - /** - Attaches and locks an existing SAFEARRAY. - The array must have the same VARTYPE as this wxSafeArray was - instantiated with. - */ - bool Attach(SAFEARRAY* array) - { - wxCHECK_MSG(!m_array && array, false, - wxS("Can only attach a valid array to an uninitialized one") ); - - VARTYPE vt; - HRESULT hr = SafeArrayGetVartype(array, &vt); - if ( FAILED(hr) ) - { - wxLogApiError(wxS("SafeArrayGetVarType()"), hr); - return false; - } - - wxCHECK_MSG(vt == varType, false, - wxS("Attaching array of invalid type")); - - m_array = array; - return Lock(); - } - - /** - Indices have the same row-column order as rgIndices in - SafeArrayPutElement(), i.e. they follow BASIC rules, NOT C ones. - */ - bool SetElement(long* indices, const externT& element) - { - wxCHECK_MSG( m_array, false, wxS("Uninitialized array") ); - wxCHECK_MSG( indices, false, wxS("Invalid index") ); - - internT* data; - - if ( FAILED( SafeArrayPtrOfIndex(m_array, (LONG *)indices, (void**)&data) ) ) - return false; - - return Convertor::ToArray(element, *data); - } - - /** - Indices have the same row-column order as rgIndices in - SafeArrayPutElement(), i.e. they follow BASIC rules, NOT C ones. - */ - bool GetElement(long* indices, externT& element) const - { - wxCHECK_MSG( m_array, false, wxS("Uninitialized array") ); - wxCHECK_MSG( indices, false, wxS("Invalid index") ); - - internT* data; - - if ( FAILED( SafeArrayPtrOfIndex(m_array, (LONG *)indices, (void**)&data) ) ) - return false; - - return Convertor::FromArray(*data, element); - } - - /** - Converts the array to a wxVariant with the list type, regardless of the - underlying SAFEARRAY type. - - If the array is multidimensional, it is flattened using the alghoritm - originally employed in wxConvertOleToVariant(). - */ - bool ConvertToVariant(wxVariant& variant) const - { - wxCHECK_MSG( m_array, false, wxS("Uninitialized array") ); - - size_t dims = m_array->cDims; - size_t count = 1; - - for ( size_t i = 0; i < dims; i++ ) - count *= m_array->rgsabound[i].cElements; - - const internT* data = static_cast(m_array->pvData); - externT element; - - variant.ClearList(); - for ( size_t i1 = 0; i1 < count; i1++ ) - { - if ( !Convertor::FromArray(data[i1], element) ) - { - variant.ClearList(); - return false; - } - variant.Append(element); - } - return true; - } - - /** - Converts an array to an ArrayString. - - Can be called only for wxSafeArray. If the array is - multidimensional, it is flattened using the alghoritm originally - employed in wxConvertOleToVariant(). - */ - bool ConvertToArrayString(wxArrayString& strings) const - { - wxCHECK_MSG( m_array, false, wxS("Uninitialized array") ); - wxCHECK(varType == VT_BSTR, false); - - size_t dims = m_array->cDims; - size_t count = 1; - - for ( size_t i = 0; i < dims; i++ ) - count *= m_array->rgsabound[i].cElements; - - const BSTR* data = static_cast(m_array->pvData); - wxString element; - - strings.clear(); - strings.reserve(count); - for ( size_t i1 = 0; i1 < count; i1++ ) - { - if ( !Convertor::FromArray(data[i1], element) ) - { - strings.clear(); - return false; - } - strings.push_back(element); - } - return true; - } - - static bool ConvertToVariant(SAFEARRAY* psa, wxVariant& variant) - { - wxSafeArray sa; - bool result = false; - - if ( sa.Attach(psa) ) - result = sa.ConvertToVariant(variant); - - if ( sa.HasArray() ) - sa.Detach(); - - return result; - } - - static bool ConvertToArrayString(SAFEARRAY* psa, wxArrayString& strings) - { - wxSafeArray sa; - bool result = false; - - if ( sa.Attach(psa) ) - result = sa.ConvertToArrayString(strings); - - if ( sa.HasArray() ) - sa.Detach(); - - return result; - } - - wxDECLARE_NO_COPY_TEMPLATE_CLASS(wxSafeArray, varType); -}; - -#endif // wxUSE_OLE && wxUSE_VARIANT - -#endif // _MSW_OLE_SAFEARRAY_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/ole/uuid.h b/Externals/wxWidgets3/include/wx/msw/ole/uuid.h deleted file mode 100644 index c712b79dd2..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/ole/uuid.h +++ /dev/null @@ -1,87 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/ole/uuid.h -// Purpose: encapsulates an UUID with some added helper functions -// Author: Vadim Zeitlin -// Modified by: -// Created: 11.07.97 -// Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows licence -// -// Notes: you should link your project with RPCRT4.LIB! -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_OLEUUID_H -#define _WX_OLEUUID_H - -#include "wx/chartype.h" -// ------------------------------------------------------------------ -// UUID (Universally Unique IDentifier) definition -// ------------------------------------------------------------------ - -// ----- taken from RPC.H -#ifndef UUID_DEFINED // in some cases RPC.H will be already - typedef struct - { - unsigned long Data1; - unsigned short Data2; - unsigned short Data3; - unsigned char Data4[8]; - } UUID; // UUID = GUID = CLSID = LIBID = IID -#endif // UUID_DEFINED - -#ifndef GUID_DEFINED - typedef UUID GUID; - #define UUID_DEFINED // prevent redefinition -#endif // GUID_DEFINED - -typedef unsigned char uchar; - -// ------------------------------------------------------------------ -// a class to store UUID and it's string representation -// ------------------------------------------------------------------ - -// uses RPC functions to create/convert Universally Unique Identifiers -class WXDLLIMPEXP_CORE Uuid -{ -private: - UUID m_uuid; - wxUChar *m_pszUuid; // this string is alloc'd and freed by RPC - wxChar *m_pszCForm; // this string is allocated in Set/Create - - void UuidToCForm(); - - // function used to set initial state by all ctors - void Init() { m_pszUuid = NULL; m_pszCForm = NULL; } - -public: - // ctors & dtor - Uuid() { Init(); } - Uuid(const wxChar *pc) { Init(); Set(pc); } - Uuid(const UUID &uuid) { Init(); Set(uuid); } - ~Uuid(); - - // copy ctor and assignment operator needed for this class - Uuid(const Uuid& uuid); - Uuid& operator=(const Uuid& uuid); - - // create a brand new UUID - void Create(); - - // set value of UUID - bool Set(const wxChar *pc); // from a string, returns true if ok - void Set(const UUID& uuid); // from another UUID (never fails) - - // comparison operators - bool operator==(const Uuid& uuid) const; - bool operator!=(const Uuid& uuid) const { return !(*this == uuid); } - - // accessors - operator const UUID*() const { return &m_uuid; } - operator const wxChar*() const { return (wxChar *)(m_pszUuid); } - - // return string representation of the UUID in the C form - // (as in DEFINE_GUID macro) - const wxChar *CForm() const { return m_pszCForm; } -}; - -#endif //_WX_OLEUUID_H diff --git a/Externals/wxWidgets3/include/wx/msw/ownerdrawnbutton.h b/Externals/wxWidgets3/include/wx/msw/ownerdrawnbutton.h deleted file mode 100644 index 2cb6c785f9..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/ownerdrawnbutton.h +++ /dev/null @@ -1,139 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/ownerdrawnbutton.h -// Purpose: Common base class for wxCheckBox and wxRadioButton -// Author: Vadim Zeitlin -// Created: 2014-05-04 -// Copyright: (c) 2014 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_OWNERDRAWNBUTTON_H_ -#define _WX_MSW_OWNERDRAWNBUTTON_H_ - -// ---------------------------------------------------------------------------- -// wxMSWOwnerDrawnButton: base class for any kind of Windows buttons -// ---------------------------------------------------------------------------- - -// This class contains the type-independent part of wxMSWOwnerDrawnButton and -// is implemented in src/msw/control.cpp. -// -// Notice that this class is internal implementation detail only and is -// intentionally not documented. Ideally it wouldn't be even exported from the -// DLL but this somehow breaks building of applications using wxWidgets with -// Intel compiler using LTCG, so we do export it. -class WXDLLIMPEXP_CORE wxMSWOwnerDrawnButtonBase -{ -protected: - // Ctor takes the back pointer to the real window, must be non-NULL. - wxMSWOwnerDrawnButtonBase(wxWindow* win) : - m_win(win) - { - m_isPressed = - m_isHot = false; - } - - // Explicitly define the destructor even if it's trivial to make it - // protected. This avoids compiler warnings about the fact that this class - // has virtual functions, but no virtual destructor without making the dtor - // virtual which is not needed here as objects are never deleted via - // pointers to this class (and protected dtor enforces this). - // - // Unfortunately g++ 3.4.5 still complains about the dtor being non virtual - // even if it is protected, but actually does not give any warnings if the - // dtor is not defined at all, so work around this 3.4.5 bug inside our - // general g++ workaround. -#if wxCHECK_GCC_VERSION(4, 0) - ~wxMSWOwnerDrawnButtonBase() { } -#endif // g++ 4.0+ - - // Make the control owner drawn if necessary to implement support for the - // given foreground colour. - void MSWMakeOwnerDrawnIfNecessary(const wxColour& colFg); - - // Return true if the control is currently owner drawn. - bool MSWIsOwnerDrawn() const; - - // Draw the button if the message information about which is provided in - // the given DRAWITEMSTRUCT asks us to do it, otherwise just return false. - bool MSWDrawButton(WXDRAWITEMSTRUCT *item); - - - // Methods which must be overridden in the derived concrete class. - - // Return the style to use for the non-owner-drawn button. - virtual int MSWGetButtonStyle() const = 0; - - // Called after reverting button to non-owner drawn state, provides a hook - // for wxCheckBox-specific hack. - virtual void MSWOnButtonResetOwnerDrawn() { } - - // Return the flags (such as wxCONTROL_CHECKED) to use for the control when - // drawing it. Notice that this class already takes care of the common - // logic and sets the other wxCONTROL_XXX flags on its own, this method - // really only needs to return the flags depending on the checked state. - virtual int MSWGetButtonCheckedFlag() const = 0; - - // Actually draw the check or radio bitmap, typically just by using the - // appropriate wxRendererNative method. - virtual void - MSWDrawButtonBitmap(wxDC& dc, const wxRect& rect, int flags) = 0; - - -private: - // Make the control owner drawn or reset it to normal style. - void MSWMakeOwnerDrawn(bool ownerDrawn); - - // Event handlers used to update the appearance of owner drawn button. - void OnMouseEnterOrLeave(wxMouseEvent& event); - void OnMouseLeft(wxMouseEvent& event); - void OnFocus(wxFocusEvent& event); - - - // The real window. - wxWindow* const m_win; - - // true if the checkbox is currently pressed - bool m_isPressed; - - // true if mouse is currently over the control - bool m_isHot; - - - wxDECLARE_NO_COPY_CLASS(wxMSWOwnerDrawnButtonBase); -}; - -// This class uses a weak version of CRTP, i.e. it's a template class taking -// the base class that the class deriving from it would normally derive from. -template -class wxMSWOwnerDrawnButton - : public T, - private wxMSWOwnerDrawnButtonBase -{ -private: - typedef T Base; - -public: - wxMSWOwnerDrawnButton() : wxMSWOwnerDrawnButtonBase(this) - { - } - - virtual bool SetForegroundColour(const wxColour& colour) wxOVERRIDE - { - if ( !Base::SetForegroundColour(colour) ) - return false; - - MSWMakeOwnerDrawnIfNecessary(colour); - - return true; - } - - virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item) wxOVERRIDE - { - return MSWDrawButton(item) || Base::MSWOnDraw(item); - } - -protected: - bool IsOwnerDrawn() const { return MSWIsOwnerDrawn(); } -}; - -#endif // _WX_MSW_OWNERDRAWNBUTTON_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/ownerdrw.h b/Externals/wxWidgets3/include/wx/msw/ownerdrw.h deleted file mode 100644 index 789a7f2d77..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/ownerdrw.h +++ /dev/null @@ -1,28 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/ownerdrw.h -// Purpose: wxOwnerDrawn class -// Author: Marcin Malich -// Modified by: -// Created: 2009-09-22 -// Copyright: (c) 2009 Marcin Malich -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_OWNERDRW_H_ -#define _WX_OWNERDRW_H_ - -#if wxUSE_OWNER_DRAWN - -class WXDLLIMPEXP_CORE wxOwnerDrawn : public wxOwnerDrawnBase -{ -public: - wxOwnerDrawn() {} - virtual ~wxOwnerDrawn() {} - - virtual bool OnDrawItem(wxDC& dc, const wxRect& rc, - wxODAction act, wxODStatus stat); -}; - -#endif // wxUSE_OWNER_DRAWN - -#endif // _WX_OWNERDRW_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/palette.h b/Externals/wxWidgets3/include/wx/msw/palette.h deleted file mode 100644 index 1f1d15736f..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/palette.h +++ /dev/null @@ -1,50 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/palette.h -// Purpose: wxPalette class -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PALETTE_H_ -#define _WX_PALETTE_H_ - -#include "wx/gdiobj.h" - -class WXDLLIMPEXP_CORE wxPalette : public wxPaletteBase -{ -public: - wxPalette() { } - wxPalette(int n, - const unsigned char *red, const unsigned char *green, const unsigned char *blue) - { - Create(n, red, green, blue); - } - - bool Create(int n, - const unsigned char *red, const unsigned char *green, const unsigned char *blue); - - virtual int GetColoursCount() const; - - int - GetPixel(unsigned char red, unsigned char green, unsigned char blue) const; - - bool - GetRGB(int pixel, - unsigned char *red, unsigned char *green, unsigned char *blue) const; - - // implementation - WXHPALETTE GetHPALETTE() const; - void SetHPALETTE(WXHPALETTE pal); - -protected: - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; - -private: - wxDECLARE_DYNAMIC_CLASS(wxPalette); -}; - -#endif // _WX_PALETTE_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/panel.h b/Externals/wxWidgets3/include/wx/msw/panel.h deleted file mode 100644 index 4762bef191..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/panel.h +++ /dev/null @@ -1,56 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/panel.h -// Purpose: wxMSW-specific wxPanel class. -// Author: Vadim Zeitlin -// Created: 2011-03-18 -// Copyright: (c) 2011 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_PANEL_H_ -#define _WX_MSW_PANEL_H_ - -class WXDLLIMPEXP_FWD_CORE wxBrush; - -// ---------------------------------------------------------------------------- -// wxPanel -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxPanel : public wxPanelBase -{ -public: - wxPanel() { } - - wxPanel(wxWindow *parent, - wxWindowID winid = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxTAB_TRAVERSAL | wxNO_BORDER, - const wxString& name = wxPanelNameStr) - { - Create(parent, winid, pos, size, style, name); - } - - // This is overridden for MSW to return true for all panels that are child - // of a window with themed background (such as wxNotebook) which should - // show through the child panels. - virtual bool HasTransparentBackground(); - - -#if WXWIN_COMPATIBILITY_2_8 - wxDEPRECATED_CONSTRUCTOR( - wxPanel(wxWindow *parent, - int x, int y, int width, int height, - long style = wxTAB_TRAVERSAL | wxNO_BORDER, - const wxString& name = wxPanelNameStr) - { - Create(parent, wxID_ANY, wxPoint(x, y), wxSize(width, height), style, name); - } - ) -#endif // WXWIN_COMPATIBILITY_2_8 - -private: - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPanel); -}; - -#endif // _WX_MSW_PANEL_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/pbrush.cur b/Externals/wxWidgets3/include/wx/msw/pbrush.cur deleted file mode 100644 index 299016a315..0000000000 Binary files a/Externals/wxWidgets3/include/wx/msw/pbrush.cur and /dev/null differ diff --git a/Externals/wxWidgets3/include/wx/msw/pen.h b/Externals/wxWidgets3/include/wx/msw/pen.h deleted file mode 100644 index 7641cd4293..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/pen.h +++ /dev/null @@ -1,78 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/pen.h -// Purpose: wxPen class -// Author: Julian Smart -// Modified by: Vadim Zeitlin: fixed operator=(), ==(), !=() -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PEN_H_ -#define _WX_PEN_H_ - -#include "wx/gdiobj.h" -#include "wx/gdicmn.h" - -// ---------------------------------------------------------------------------- -// Pen -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxPen : public wxPenBase -{ -public: - wxPen() { } - wxPen(const wxColour& col, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID); - - wxPen(const wxBitmap& stipple, int width); - virtual ~wxPen() { } - - bool operator==(const wxPen& pen) const; - bool operator!=(const wxPen& pen) const { return !(*this == pen); } - - // Override in order to recreate the pen - void SetColour(const wxColour& col); - void SetColour(unsigned char r, unsigned char g, unsigned char b); - - void SetWidth(int width); - void SetStyle(wxPenStyle style); - void SetStipple(const wxBitmap& stipple); - void SetDashes(int nb_dashes, const wxDash *dash); - void SetJoin(wxPenJoin join); - void SetCap(wxPenCap cap); - - wxColour GetColour() const; - int GetWidth() const; - wxPenStyle GetStyle() const; - wxPenJoin GetJoin() const; - wxPenCap GetCap() const; - int GetDashes(wxDash** ptr) const; - wxDash* GetDash() const; - int GetDashCount() const; - wxBitmap* GetStipple() const; - - - wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants") - wxPen(const wxColour& col, int width, int style); - - wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants") - void SetStyle(int style) { SetStyle((wxPenStyle)style); } - - - // internal: wxGDIObject methods - virtual bool RealizeResource(); - virtual bool FreeResource(bool force = false); - virtual WXHANDLE GetResourceHandle() const; - virtual bool IsFree() const; - -protected: - virtual wxGDIRefData* CreateGDIRefData() const; - virtual wxGDIRefData* CloneGDIRefData(const wxGDIRefData* data) const; - - // same as FreeResource() + RealizeResource() - bool Recreate(); - - wxDECLARE_DYNAMIC_CLASS(wxPen); -}; - -#endif // _WX_PEN_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/pencil.cur b/Externals/wxWidgets3/include/wx/msw/pencil.cur deleted file mode 100644 index afa760257c..0000000000 Binary files a/Externals/wxWidgets3/include/wx/msw/pencil.cur and /dev/null differ diff --git a/Externals/wxWidgets3/include/wx/msw/pntleft.cur b/Externals/wxWidgets3/include/wx/msw/pntleft.cur deleted file mode 100644 index e7192aab6d..0000000000 Binary files a/Externals/wxWidgets3/include/wx/msw/pntleft.cur and /dev/null differ diff --git a/Externals/wxWidgets3/include/wx/msw/pntright.cur b/Externals/wxWidgets3/include/wx/msw/pntright.cur deleted file mode 100644 index 565447b03c..0000000000 Binary files a/Externals/wxWidgets3/include/wx/msw/pntright.cur and /dev/null differ diff --git a/Externals/wxWidgets3/include/wx/msw/popupwin.h b/Externals/wxWidgets3/include/wx/msw/popupwin.h deleted file mode 100644 index 3fbd2d4dcc..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/popupwin.h +++ /dev/null @@ -1,42 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/popupwin.h -// Purpose: wxPopupWindow class for wxMSW -// Author: Vadim Zeitlin -// Modified by: -// Created: 06.01.01 -// Copyright: (c) 2001 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_POPUPWIN_H_ -#define _WX_MSW_POPUPWIN_H_ - -// ---------------------------------------------------------------------------- -// wxPopupWindow -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxPopupWindow : public wxPopupWindowBase -{ -public: - wxPopupWindow() { } - - wxPopupWindow(wxWindow *parent, int flags = wxBORDER_NONE) - { (void)Create(parent, flags); } - - bool Create(wxWindow *parent, int flags = wxBORDER_NONE); - - virtual void SetFocus(); - virtual bool Show(bool show = true); - - // return the style to be used for the popup windows - virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle) const; - - // get the HWND to be used as parent of this window with CreateWindow() - virtual WXHWND MSWGetParent() const; - -protected: - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPopupWindow); -}; - -#endif // _WX_MSW_POPUPWIN_H_ - diff --git a/Externals/wxWidgets3/include/wx/msw/printdlg.h b/Externals/wxWidgets3/include/wx/msw/printdlg.h deleted file mode 100644 index b3419cbdbb..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/printdlg.h +++ /dev/null @@ -1,125 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/printdlg.h -// Purpose: wxPrintDialog, wxPageSetupDialog classes -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PRINTDLG_H_ -#define _WX_PRINTDLG_H_ - -#if wxUSE_PRINTING_ARCHITECTURE - -#include "wx/dialog.h" -#include "wx/cmndata.h" -#include "wx/prntbase.h" -#include "wx/printdlg.h" - -class WXDLLIMPEXP_FWD_CORE wxDC; -class WinPrinter; - -//---------------------------------------------------------------------------- -// wxWindowsPrintNativeData -//---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxWindowsPrintNativeData: public wxPrintNativeDataBase -{ -public: - wxWindowsPrintNativeData(); - virtual ~wxWindowsPrintNativeData(); - - virtual bool TransferTo( wxPrintData &data ); - virtual bool TransferFrom( const wxPrintData &data ); - - virtual bool Ok() const { return IsOk(); } - virtual bool IsOk() const; - - void InitializeDevMode(const wxString &printerName = wxEmptyString, WinPrinter* printer = NULL); - void* GetDevMode() const { return m_devMode; } - void SetDevMode(void* data) { m_devMode = data; } - void* GetDevNames() const { return m_devNames; } - void SetDevNames(void* data) { m_devNames = data; } - -private: - void* m_devMode; - void* m_devNames; - - short m_customWindowsPaperId; - -private: - wxDECLARE_DYNAMIC_CLASS(wxWindowsPrintNativeData); -}; - -// --------------------------------------------------------------------------- -// wxWindowsPrintDialog: the MSW dialog for printing -// --------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxWindowsPrintDialog : public wxPrintDialogBase -{ -public: - wxWindowsPrintDialog(wxWindow *parent, wxPrintDialogData* data = NULL); - wxWindowsPrintDialog(wxWindow *parent, wxPrintData* data); - virtual ~wxWindowsPrintDialog(); - - bool Create(wxWindow *parent, wxPrintDialogData* data = NULL); - virtual int ShowModal(); - - wxPrintDialogData& GetPrintDialogData() { return m_printDialogData; } - wxPrintData& GetPrintData() { return m_printDialogData.GetPrintData(); } - - virtual wxDC *GetPrintDC(); - -private: - wxPrintDialogData m_printDialogData; - wxPrinterDC* m_printerDC; - bool m_destroyDC; - wxWindow* m_dialogParent; - -private: - bool ConvertToNative( wxPrintDialogData &data ); - bool ConvertFromNative( wxPrintDialogData &data ); - - // holds MSW handle - void* m_printDlg; - -private: - wxDECLARE_CLASS(wxWindowsPrintDialog); - wxDECLARE_NO_COPY_CLASS(wxWindowsPrintDialog); -}; - -// --------------------------------------------------------------------------- -// wxWindowsPageSetupDialog: the MSW page setup dialog -// --------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxWindowsPageSetupDialog: public wxPageSetupDialogBase -{ -public: - wxWindowsPageSetupDialog(); - wxWindowsPageSetupDialog(wxWindow *parent, wxPageSetupDialogData *data = NULL); - virtual ~wxWindowsPageSetupDialog(); - - bool Create(wxWindow *parent, wxPageSetupDialogData *data = NULL); - virtual int ShowModal(); - bool ConvertToNative( wxPageSetupDialogData &data ); - bool ConvertFromNative( wxPageSetupDialogData &data ); - - virtual wxPageSetupDialogData& GetPageSetupDialogData() { return m_pageSetupData; } - -private: - wxPageSetupDialogData m_pageSetupData; - wxWindow* m_dialogParent; - - // holds MSW handle - void* m_pageDlg; - -private: - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxWindowsPageSetupDialog); -}; - -#endif // wxUSE_PRINTING_ARCHITECTURE - -#endif - // _WX_PRINTDLG_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/printwin.h b/Externals/wxWidgets3/include/wx/msw/printwin.h deleted file mode 100644 index b6fceef7c6..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/printwin.h +++ /dev/null @@ -1,66 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/printwin.h -// Purpose: wxWindowsPrinter, wxWindowsPrintPreview classes -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PRINTWIN_H_ -#define _WX_PRINTWIN_H_ - -#include "wx/prntbase.h" - -// --------------------------------------------------------------------------- -// Represents the printer: manages printing a wxPrintout object -// --------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxWindowsPrinter : public wxPrinterBase -{ - wxDECLARE_DYNAMIC_CLASS(wxWindowsPrinter); - -public: - wxWindowsPrinter(wxPrintDialogData *data = NULL); - - virtual bool Print(wxWindow *parent, - wxPrintout *printout, - bool prompt = true); - - virtual wxDC *PrintDialog(wxWindow *parent); - virtual bool Setup(wxWindow *parent); - -private: - wxDECLARE_NO_COPY_CLASS(wxWindowsPrinter); -}; - -// --------------------------------------------------------------------------- -// wxPrintPreview: programmer creates an object of this class to preview a -// wxPrintout. -// --------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxWindowsPrintPreview : public wxPrintPreviewBase -{ -public: - wxWindowsPrintPreview(wxPrintout *printout, - wxPrintout *printoutForPrinting = NULL, - wxPrintDialogData *data = NULL); - wxWindowsPrintPreview(wxPrintout *printout, - wxPrintout *printoutForPrinting, - wxPrintData *data); - virtual ~wxWindowsPrintPreview(); - - virtual bool Print(bool interactive); - virtual void DetermineScaling(); - -protected: -#if wxUSE_ENH_METAFILE - virtual bool RenderPageIntoBitmap(wxBitmap& bmp, int pageNum); -#endif - - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxWindowsPrintPreview); -}; - -#endif -// _WX_PRINTWIN_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/private.h b/Externals/wxWidgets3/include/wx/msw/private.h deleted file mode 100644 index 6af753ff27..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/private.h +++ /dev/null @@ -1,1163 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/private.h -// Purpose: Private declarations: as this header is only included by -// wxWidgets itself, it may contain identifiers which don't start -// with "wx". -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PRIVATE_H_ -#define _WX_PRIVATE_H_ - -#include "wx/msw/wrapwin.h" - -#include "wx/log.h" - -#if wxUSE_GUI - #include "wx/window.h" -#endif // wxUSE_GUI - -class WXDLLIMPEXP_FWD_CORE wxFont; -class WXDLLIMPEXP_FWD_CORE wxWindow; -class WXDLLIMPEXP_FWD_CORE wxWindowBase; - -// --------------------------------------------------------------------------- -// private constants -// --------------------------------------------------------------------------- - -// 260 was taken from windef.h -#ifndef MAX_PATH - #define MAX_PATH 260 -#endif - -// --------------------------------------------------------------------------- -// standard icons from the resources -// --------------------------------------------------------------------------- - -#if wxUSE_GUI - -extern WXDLLIMPEXP_DATA_CORE(HICON) wxSTD_FRAME_ICON; -extern WXDLLIMPEXP_DATA_CORE(HICON) wxSTD_MDIPARENTFRAME_ICON; -extern WXDLLIMPEXP_DATA_CORE(HICON) wxSTD_MDICHILDFRAME_ICON; -extern WXDLLIMPEXP_DATA_CORE(HICON) wxDEFAULT_FRAME_ICON; -extern WXDLLIMPEXP_DATA_CORE(HICON) wxDEFAULT_MDIPARENTFRAME_ICON; -extern WXDLLIMPEXP_DATA_CORE(HICON) wxDEFAULT_MDICHILDFRAME_ICON; -extern WXDLLIMPEXP_DATA_CORE(HFONT) wxSTATUS_LINE_FONT; - -#endif // wxUSE_GUI - -// --------------------------------------------------------------------------- -// global data -// --------------------------------------------------------------------------- - -extern WXDLLIMPEXP_DATA_BASE(HINSTANCE) wxhInstance; - -extern "C" -{ - WXDLLIMPEXP_BASE HINSTANCE wxGetInstance(); -} - -WXDLLIMPEXP_BASE void wxSetInstance(HINSTANCE hInst); - -// --------------------------------------------------------------------------- -// define things missing from some compilers' headers -// --------------------------------------------------------------------------- - -// this defines a CASTWNDPROC macro which casts a pointer to the type of a -// window proc -#if defined(STRICT) || defined(__GNUC__) - typedef WNDPROC WndProcCast; -#else - typedef FARPROC WndProcCast; -#endif - - -#define CASTWNDPROC (WndProcCast) - - - -// --------------------------------------------------------------------------- -// some stuff for old Windows versions (FIXME: what does it do here??) -// --------------------------------------------------------------------------- - -#if !defined(APIENTRY) // NT defines APIENTRY, 3.x not - #define APIENTRY FAR PASCAL -#endif - -/* - * Decide what window classes we're going to use - * for this combination of CTl3D/FAFA settings - */ - -#define STATIC_CLASS wxT("STATIC") -#define STATIC_FLAGS (SS_LEFT|WS_CHILD|WS_VISIBLE) -#define CHECK_CLASS wxT("BUTTON") -#define CHECK_FLAGS (BS_AUTOCHECKBOX|WS_TABSTOP|WS_CHILD) -#define CHECK_IS_FAFA FALSE -#define RADIO_CLASS wxT("BUTTON") -#define RADIO_FLAGS (BS_AUTORADIOBUTTON|WS_CHILD|WS_VISIBLE) -#define RADIO_SIZE 20 -#define RADIO_IS_FAFA FALSE -#define PURE_WINDOWS -#define GROUP_CLASS wxT("BUTTON") -#define GROUP_FLAGS (BS_GROUPBOX|WS_CHILD|WS_VISIBLE) - -/* -#define BITCHECK_FLAGS (FB_BITMAP|FC_BUTTONDRAW|FC_DEFAULT|WS_VISIBLE) -#define BITRADIO_FLAGS (FC_BUTTONDRAW|FB_BITMAP|FC_RADIO|WS_CHILD|WS_VISIBLE) -*/ - -// --------------------------------------------------------------------------- -// misc macros -// --------------------------------------------------------------------------- - -#define MEANING_CHARACTER '0' -#define DEFAULT_ITEM_WIDTH 100 -#define DEFAULT_ITEM_HEIGHT 80 - -// Scale font to get edit control height -//#define EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy) (3*(cy)/2) -#define EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy) (cy+8) - -// Generic subclass proc, for panel item moving/sizing and intercept -// EDIT control VK_RETURN messages -extern LONG APIENTRY - wxSubclassedGenericControlProc(WXHWND hWnd, WXUINT message, WXWPARAM wParam, WXLPARAM lParam); - -// --------------------------------------------------------------------------- -// useful macros and functions -// --------------------------------------------------------------------------- - -// a wrapper macro for ZeroMemory() -#define wxZeroMemory(obj) ::ZeroMemory(&obj, sizeof(obj)) - -// This one is a macro so that it can be tested with #ifdef, it will be -// undefined if it cannot be implemented for a given compiler. -// Vc++, bcc, dmc, ow, mingw akk have _get_osfhandle() and Cygwin has -// get_osfhandle. Others are currently unknown, e.g. Salford, Intel, Visual -// Age. -#if defined(__CYGWIN__) - #define wxGetOSFHandle(fd) ((HANDLE)get_osfhandle(fd)) -#elif defined(__VISUALC__) \ - || defined(__BORLANDC__) \ - || defined(__MINGW32__) - #define wxGetOSFHandle(fd) ((HANDLE)_get_osfhandle(fd)) - #define wxOpenOSFHandle(h, flags) (_open_osfhandle(wxPtrToUInt(h), flags)) - - wxDECL_FOR_STRICT_MINGW32(FILE*, _fdopen, (int, const char*)) - #define wx_fdopen _fdopen -#endif - -// close the handle in the class dtor -template -class AutoHANDLE -{ -public: - wxEXPLICIT AutoHANDLE(HANDLE handle = InvalidHandle()) : m_handle(handle) { } - - bool IsOk() const { return m_handle != InvalidHandle(); } - operator HANDLE() const { return m_handle; } - - ~AutoHANDLE() { if ( IsOk() ) DoClose(); } - - void Close() - { - wxCHECK_RET(IsOk(), wxT("Handle must be valid")); - - DoClose(); - - m_handle = InvalidHandle(); - } - -protected: - // We need this helper function because integer INVALID_VALUE is not - // implicitly convertible to HANDLE, which is a pointer. - static HANDLE InvalidHandle() - { - return static_cast(INVALID_VALUE); - } - - void DoClose() - { - if ( !::CloseHandle(m_handle) ) - wxLogLastError(wxT("CloseHandle")); - } - - WXHANDLE m_handle; -}; - -// a template to make initializing Windows structs less painful: it zeros all -// the struct fields and also sets cbSize member to the correct value (and so -// can be only used with structures which have this member...) -template -struct WinStruct : public T -{ - WinStruct() - { - ::ZeroMemory(this, sizeof(T)); - - // explicit qualification is required here for this to be valid C++ - this->cbSize = sizeof(T); - } -}; - - -// Macros for converting wxString to the type expected by API functions. -// -// Normally it is enough to just use wxString::t_str() which is implicitly -// convertible to LPCTSTR, but in some cases an explicit conversion is required. -// -// In such cases wxMSW_CONV_LPCTSTR() should be used. But if an API function -// takes a non-const pointer, wxMSW_CONV_LPTSTR() which casts away the -// constness (but doesn't make it possible to really modify the returned -// pointer, of course) should be used. And if a string is passed as LPARAM, use -// wxMSW_CONV_LPARAM() which does the required ugly reinterpret_cast<> too. -#define wxMSW_CONV_LPCTSTR(s) static_cast((s).t_str()) -#define wxMSW_CONV_LPTSTR(s) const_cast(wxMSW_CONV_LPCTSTR(s)) -#define wxMSW_CONV_LPARAM(s) reinterpret_cast(wxMSW_CONV_LPCTSTR(s)) - - -#if wxUSE_GUI - -#include "wx/gdicmn.h" -#include "wx/colour.h" - -// make conversion from wxColour and COLORREF a bit less painful -inline COLORREF wxColourToRGB(const wxColour& c) -{ - return RGB(c.Red(), c.Green(), c.Blue()); -} - -inline COLORREF wxColourToPalRGB(const wxColour& c) -{ - return PALETTERGB(c.Red(), c.Green(), c.Blue()); -} - -inline wxColour wxRGBToColour(COLORREF rgb) -{ - return wxColour(GetRValue(rgb), GetGValue(rgb), GetBValue(rgb)); -} - -inline void wxRGBToColour(wxColour& c, COLORREF rgb) -{ - c.Set(GetRValue(rgb), GetGValue(rgb), GetBValue(rgb)); -} - -// get the standard colour map for some standard colours - see comment in this -// function to understand why is it needed and when should it be used -// -// it returns a wxCOLORMAP (can't use COLORMAP itself here as comctl32.dll -// might be not included/available) array of size wxSTD_COLOUR_MAX -// -// NB: if you change these colours, update wxBITMAP_STD_COLOURS in the -// resources as well: it must have the same number of pixels! -enum wxSTD_COLOUR -{ - wxSTD_COL_BTNTEXT, - wxSTD_COL_BTNSHADOW, - wxSTD_COL_BTNFACE, - wxSTD_COL_BTNHIGHLIGHT, - wxSTD_COL_MAX -}; - -struct WXDLLIMPEXP_CORE wxCOLORMAP -{ - COLORREF from, to; -}; - -// this function is implemented in src/msw/window.cpp -extern wxCOLORMAP *wxGetStdColourMap(); - -// create a wxRect from Windows RECT -inline wxRect wxRectFromRECT(const RECT& rc) -{ - return wxRect(rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top); -} - -// copy Windows RECT to our wxRect -inline void wxCopyRECTToRect(const RECT& rc, wxRect& rect) -{ - rect = wxRectFromRECT(rc); -} - -// and vice versa -inline void wxCopyRectToRECT(const wxRect& rect, RECT& rc) -{ - // note that we don't use wxRect::GetRight() as it is one of compared to - // wxRectFromRECT() above - rc.top = rect.y; - rc.left = rect.x; - rc.right = rect.x + rect.width; - rc.bottom = rect.y + rect.height; -} - -// translations between HIMETRIC units (which OLE likes) and pixels (which are -// liked by all the others) - implemented in msw/utilsexc.cpp -extern void HIMETRICToPixel(LONG *x, LONG *y); -extern void HIMETRICToPixel(LONG *x, LONG *y, HDC hdcRef); -extern void PixelToHIMETRIC(LONG *x, LONG *y); -extern void PixelToHIMETRIC(LONG *x, LONG *y, HDC hdcRef); - -// Windows convention of the mask is opposed to the wxWidgets one, so we need -// to invert the mask each time we pass one/get one to/from Windows -extern HBITMAP wxInvertMask(HBITMAP hbmpMask, int w = 0, int h = 0); - -// Creates an icon or cursor depending from a bitmap -// -// The bitmap must be valid and it should have a mask. If it doesn't, a default -// mask is created using light grey as the transparent colour. -extern HICON wxBitmapToHICON(const wxBitmap& bmp); - -// Same requirements as above apply and the bitmap must also have the correct -// size. -extern -HCURSOR wxBitmapToHCURSOR(const wxBitmap& bmp, int hotSpotX, int hotSpotY); - - -#if wxUSE_OWNER_DRAWN - -// Draw the bitmap in specified state (this is used by owner drawn controls) -enum wxDSBStates -{ - wxDSB_NORMAL = 0, - wxDSB_SELECTED, - wxDSB_DISABLED -}; - -extern -BOOL wxDrawStateBitmap(HDC hDC, HBITMAP hBitmap, int x, int y, UINT uState); - -#endif // wxUSE_OWNER_DRAWN - -// get (x, y) from DWORD - notice that HI/LOWORD can *not* be used because they -// will fail on system with multiple monitors where the coords may be negative -// -// these macros are standard now (Win98) but some older headers don't have them -#ifndef GET_X_LPARAM - #define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp)) - #define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp)) -#endif // GET_X_LPARAM - -// get the current state of SHIFT/CTRL/ALT keys -inline bool wxIsModifierDown(int vk) -{ - // GetKeyState() returns different negative values on WinME and WinNT, - // so simply test for negative value. - return ::GetKeyState(vk) < 0; -} - -inline bool wxIsShiftDown() -{ - return wxIsModifierDown(VK_SHIFT); -} - -inline bool wxIsCtrlDown() -{ - return wxIsModifierDown(VK_CONTROL); -} - -inline bool wxIsAltDown() -{ - return wxIsModifierDown(VK_MENU); -} - -inline bool wxIsAnyModifierDown() -{ - return wxIsShiftDown() || wxIsCtrlDown() || wxIsAltDown(); -} - -// wrapper around GetWindowRect() and GetClientRect() APIs doing error checking -// for Win32 -inline RECT wxGetWindowRect(HWND hwnd) -{ - RECT rect; - - if ( !::GetWindowRect(hwnd, &rect) ) - { - wxLogLastError(wxT("GetWindowRect")); - } - - return rect; -} - -inline RECT wxGetClientRect(HWND hwnd) -{ - RECT rect; - - if ( !::GetClientRect(hwnd, &rect) ) - { - wxLogLastError(wxT("GetClientRect")); - } - - return rect; -} - -// --------------------------------------------------------------------------- -// small helper classes -// --------------------------------------------------------------------------- - -// create an instance of this class and use it as the HDC for screen, will -// automatically release the DC going out of scope -class ScreenHDC -{ -public: - ScreenHDC() { m_hdc = ::GetDC(NULL); } - ~ScreenHDC() { ::ReleaseDC(NULL, m_hdc); } - - operator HDC() const { return m_hdc; } - -private: - HDC m_hdc; - - wxDECLARE_NO_COPY_CLASS(ScreenHDC); -}; - -// the same as ScreenHDC but for window DCs -class WindowHDC -{ -public: - WindowHDC() : m_hwnd(NULL), m_hdc(NULL) { } - WindowHDC(HWND hwnd) { m_hdc = ::GetDC(m_hwnd = hwnd); } - ~WindowHDC() { if ( m_hwnd && m_hdc ) { ::ReleaseDC(m_hwnd, m_hdc); } } - - operator HDC() const { return m_hdc; } - -private: - HWND m_hwnd; - HDC m_hdc; - - wxDECLARE_NO_COPY_CLASS(WindowHDC); -}; - -// the same as ScreenHDC but for memory DCs: creates the HDC compatible with -// the given one (screen by default) in ctor and destroys it in dtor -class MemoryHDC -{ -public: - MemoryHDC(HDC hdc = 0) { m_hdc = ::CreateCompatibleDC(hdc); } - ~MemoryHDC() { ::DeleteDC(m_hdc); } - - operator HDC() const { return m_hdc; } - -private: - HDC m_hdc; - - wxDECLARE_NO_COPY_CLASS(MemoryHDC); -}; - -// a class which selects a GDI object into a DC in its ctor and deselects in -// dtor -class SelectInHDC -{ -private: - void DoInit(HGDIOBJ hgdiobj) { m_hgdiobj = ::SelectObject(m_hdc, hgdiobj); } - -public: - SelectInHDC() : m_hdc(NULL), m_hgdiobj(NULL) { } - SelectInHDC(HDC hdc, HGDIOBJ hgdiobj) : m_hdc(hdc) { DoInit(hgdiobj); } - - void Init(HDC hdc, HGDIOBJ hgdiobj) - { - wxASSERT_MSG( !m_hdc, wxT("initializing twice?") ); - - m_hdc = hdc; - - DoInit(hgdiobj); - } - - ~SelectInHDC() { if ( m_hdc ) ::SelectObject(m_hdc, m_hgdiobj); } - - // return true if the object was successfully selected - operator bool() const { return m_hgdiobj != 0; } - -private: - HDC m_hdc; - HGDIOBJ m_hgdiobj; - - wxDECLARE_NO_COPY_CLASS(SelectInHDC); -}; - -// a class which cleans up any GDI object -class AutoGDIObject -{ -protected: - AutoGDIObject() { m_gdiobj = NULL; } - AutoGDIObject(HGDIOBJ gdiobj) : m_gdiobj(gdiobj) { } - ~AutoGDIObject() { if ( m_gdiobj ) ::DeleteObject(m_gdiobj); } - - void InitGdiobj(HGDIOBJ gdiobj) - { - wxASSERT_MSG( !m_gdiobj, wxT("initializing twice?") ); - - m_gdiobj = gdiobj; - } - - HGDIOBJ GetObject() const { return m_gdiobj; } - -private: - HGDIOBJ m_gdiobj; -}; - -// TODO: all this asks for using a AutoHandler template... - -// a class for temporary brushes -class AutoHBRUSH : private AutoGDIObject -{ -public: - AutoHBRUSH(COLORREF col) - : AutoGDIObject(::CreateSolidBrush(col)) { } - - operator HBRUSH() const { return (HBRUSH)GetObject(); } -}; - -// a class for temporary fonts -class AutoHFONT : private AutoGDIObject -{ -private: -public: - AutoHFONT() - : AutoGDIObject() { } - - AutoHFONT(const LOGFONT& lf) - : AutoGDIObject(::CreateFontIndirect(&lf)) { } - - void Init(const LOGFONT& lf) { InitGdiobj(::CreateFontIndirect(&lf)); } - - operator HFONT() const { return (HFONT)GetObject(); } -}; - -// a class for temporary pens -class AutoHPEN : private AutoGDIObject -{ -public: - AutoHPEN(COLORREF col) - : AutoGDIObject(::CreatePen(PS_SOLID, 0, col)) { } - - operator HPEN() const { return (HPEN)GetObject(); } -}; - -// classes for temporary bitmaps -class AutoHBITMAP : private AutoGDIObject -{ -public: - AutoHBITMAP() - : AutoGDIObject() { } - - AutoHBITMAP(HBITMAP hbmp) : AutoGDIObject(hbmp) { } - - void Init(HBITMAP hbmp) { InitGdiobj(hbmp); } - - operator HBITMAP() const { return (HBITMAP)GetObject(); } -}; - -class CompatibleBitmap : public AutoHBITMAP -{ -public: - CompatibleBitmap(HDC hdc, int w, int h) - : AutoHBITMAP(::CreateCompatibleBitmap(hdc, w, h)) - { - } -}; - -class MonoBitmap : public AutoHBITMAP -{ -public: - MonoBitmap(int w, int h) - : AutoHBITMAP(::CreateBitmap(w, h, 1, 1, 0)) - { - } -}; - -// class automatically destroys the region object -class AutoHRGN : private AutoGDIObject -{ -public: - AutoHRGN(HRGN hrgn) : AutoGDIObject(hrgn) { } - - operator HRGN() const { return (HRGN)GetObject(); } -}; - -// Class automatically freeing ICONINFO struct fields after retrieving it using -// GetIconInfo(). -class AutoIconInfo : public ICONINFO -{ -public: - AutoIconInfo() { wxZeroMemory(*this); } - - bool GetFrom(HICON hIcon) - { - if ( !::GetIconInfo(hIcon, this) ) - { - wxLogLastError(wxT("GetIconInfo")); - return false; - } - - return true; - } - - ~AutoIconInfo() - { - if ( hbmColor ) - ::DeleteObject(hbmColor); - if ( hbmMask ) - ::DeleteObject(hbmMask); - } -}; - -// class sets the specified clipping region during its life time -class HDCClipper -{ -public: - HDCClipper(HDC hdc, HRGN hrgn) - : m_hdc(hdc) - { - if ( !::SelectClipRgn(hdc, hrgn) ) - { - wxLogLastError(wxT("SelectClipRgn")); - } - } - - ~HDCClipper() - { - ::SelectClipRgn(m_hdc, NULL); - } - -private: - HDC m_hdc; - - wxDECLARE_NO_COPY_CLASS(HDCClipper); -}; - -// set the given map mode for the life time of this object - class HDCMapModeChanger - { - public: - HDCMapModeChanger(HDC hdc, int mm) - : m_hdc(hdc) - { - m_modeOld = ::SetMapMode(hdc, mm); - if ( !m_modeOld ) - { - wxLogLastError(wxT("SelectClipRgn")); - } - } - - ~HDCMapModeChanger() - { - if ( m_modeOld ) - ::SetMapMode(m_hdc, m_modeOld); - } - - private: - HDC m_hdc; - int m_modeOld; - - wxDECLARE_NO_COPY_CLASS(HDCMapModeChanger); - }; - - #define wxCHANGE_HDC_MAP_MODE(hdc, mm) \ - HDCMapModeChanger wxMAKE_UNIQUE_NAME(wxHDCMapModeChanger)(hdc, mm) - -// smart pointer using GlobalAlloc/GlobalFree() -class GlobalPtr -{ -public: - // default ctor, call Init() later - GlobalPtr() - { - m_hGlobal = NULL; - } - - // allocates a block of given size - void Init(size_t size, unsigned flags = GMEM_MOVEABLE) - { - m_hGlobal = ::GlobalAlloc(flags, size); - if ( !m_hGlobal ) - { - wxLogLastError(wxT("GlobalAlloc")); - } - } - - GlobalPtr(size_t size, unsigned flags = GMEM_MOVEABLE) - { - Init(size, flags); - } - - ~GlobalPtr() - { - if ( m_hGlobal && ::GlobalFree(m_hGlobal) ) - { - wxLogLastError(wxT("GlobalFree")); - } - } - - // implicit conversion - operator HGLOBAL() const { return m_hGlobal; } - -private: - HGLOBAL m_hGlobal; - - wxDECLARE_NO_COPY_CLASS(GlobalPtr); -}; - -// when working with global pointers (which is unfortunately still necessary -// sometimes, e.g. for clipboard) it is important to unlock them exactly as -// many times as we lock them which just asks for using a "smart lock" class -class GlobalPtrLock -{ -public: - // default ctor, use Init() later -- should only be used if the HGLOBAL can - // be NULL (in which case Init() shouldn't be called) - GlobalPtrLock() - { - m_hGlobal = NULL; - m_ptr = NULL; - } - - // initialize the object, may be only called if we were created using the - // default ctor; HGLOBAL must not be NULL - void Init(HGLOBAL hGlobal) - { - m_hGlobal = hGlobal; - - // NB: GlobalLock() is a macro, not a function, hence don't use the - // global scope operator with it (and neither with GlobalUnlock()) - m_ptr = GlobalLock(hGlobal); - if ( !m_ptr ) - { - wxLogLastError(wxT("GlobalLock")); - } - } - - // initialize the object, HGLOBAL must not be NULL - GlobalPtrLock(HGLOBAL hGlobal) - { - Init(hGlobal); - } - - ~GlobalPtrLock() - { - if ( m_hGlobal && !GlobalUnlock(m_hGlobal) ) - { - // this might happen simply because the block became unlocked - DWORD dwLastError = ::GetLastError(); - if ( dwLastError != NO_ERROR ) - { - wxLogApiError(wxT("GlobalUnlock"), dwLastError); - } - } - } - - void *Get() const { return m_ptr; } - operator void *() const { return m_ptr; } - -private: - HGLOBAL m_hGlobal; - void *m_ptr; - - wxDECLARE_NO_COPY_CLASS(GlobalPtrLock); -}; - -// register the class when it is first needed and unregister it in dtor -class ClassRegistrar -{ -public: - // ctor doesn't register the class, call Initialize() for this - ClassRegistrar() { m_registered = -1; } - - // return true if the class is already registered - bool IsInitialized() const { return m_registered != -1; } - - // return true if the class had been already registered - bool IsRegistered() const { return m_registered == 1; } - - // try to register the class if not done yet, return true on success - bool Register(const WNDCLASS& wc) - { - // we should only be called if we hadn't been initialized yet - wxASSERT_MSG( m_registered == -1, - wxT("calling ClassRegistrar::Register() twice?") ); - - m_registered = ::RegisterClass(&wc) ? 1 : 0; - if ( !IsRegistered() ) - { - wxLogLastError(wxT("RegisterClassEx()")); - } - else - { - m_clsname = wc.lpszClassName; - } - - return m_registered == 1; - } - - // get the name of the registered class (returns empty string if not - // registered) - const wxString& GetName() const { return m_clsname; } - - // unregister the class if it had been registered - ~ClassRegistrar() - { - if ( IsRegistered() ) - { - if ( !::UnregisterClass(m_clsname.t_str(), wxGetInstance()) ) - { - wxLogLastError(wxT("UnregisterClass")); - } - } - } - -private: - // initial value is -1 which means that we hadn't tried registering the - // class yet, it becomes true or false (1 or 0) when Initialize() is called - int m_registered; - - // the name of the class, only non empty if it had been registered - wxString m_clsname; -}; - -// --------------------------------------------------------------------------- -// macros to make casting between WXFOO and FOO a bit easier: the GetFoo() -// returns Foo cast to the Windows type for ourselves, while GetFooOf() takes -// an argument which should be a pointer or reference to the object of the -// corresponding class (this depends on the macro) -// --------------------------------------------------------------------------- - -#define GetHwnd() ((HWND)GetHWND()) -#define GetHwndOf(win) ((HWND)((win)->GetHWND())) -// old name -#define GetWinHwnd GetHwndOf - -#define GetHdc() ((HDC)GetHDC()) -#define GetHdcOf(dc) ((HDC)(dc).GetHDC()) - -#define GetHbitmap() ((HBITMAP)GetHBITMAP()) -#define GetHbitmapOf(bmp) ((HBITMAP)(bmp).GetHBITMAP()) - -#define GetHicon() ((HICON)GetHICON()) -#define GetHiconOf(icon) ((HICON)(icon).GetHICON()) - -#define GetHaccel() ((HACCEL)GetHACCEL()) -#define GetHaccelOf(table) ((HACCEL)((table).GetHACCEL())) - -#define GetHbrush() ((HBRUSH)GetResourceHandle()) -#define GetHbrushOf(brush) ((HBRUSH)(brush).GetResourceHandle()) - -#define GetHmenu() ((HMENU)GetHMenu()) -#define GetHmenuOf(menu) ((HMENU)(menu)->GetHMenu()) - -#define GetHcursor() ((HCURSOR)GetHCURSOR()) -#define GetHcursorOf(cursor) ((HCURSOR)(cursor).GetHCURSOR()) - -#define GetHfont() ((HFONT)GetHFONT()) -#define GetHfontOf(font) ((HFONT)(font).GetHFONT()) - -#define GetHimagelist() ((HIMAGELIST)GetHIMAGELIST()) -#define GetHimagelistOf(imgl) ((HIMAGELIST)(imgl)->GetHIMAGELIST()) - -#define GetHpalette() ((HPALETTE)GetHPALETTE()) -#define GetHpaletteOf(pal) ((HPALETTE)(pal).GetHPALETTE()) - -#define GetHpen() ((HPEN)GetResourceHandle()) -#define GetHpenOf(pen) ((HPEN)(pen).GetResourceHandle()) - -#define GetHrgn() ((HRGN)GetHRGN()) -#define GetHrgnOf(rgn) ((HRGN)(rgn).GetHRGN()) - -#endif // wxUSE_GUI - -// --------------------------------------------------------------------------- -// global functions -// --------------------------------------------------------------------------- - -// return the full path of the given module -inline wxString wxGetFullModuleName(HMODULE hmod) -{ - wxString fullname; - if ( !::GetModuleFileName - ( - hmod, - wxStringBuffer(fullname, MAX_PATH), - MAX_PATH - ) ) - { - wxLogLastError(wxT("GetModuleFileName")); - } - - return fullname; -} - -// return the full path of the program file -inline wxString wxGetFullModuleName() -{ - return wxGetFullModuleName((HMODULE)wxGetInstance()); -} - -// return the run-time version of the OS in a format similar to -// WINVER/_WIN32_WINNT compile-time macros: -// -// 0x0300 Windows NT 3.51 -// 0x0400 Windows 95, NT4 -// 0x0410 Windows 98 -// 0x0500 Windows ME, 2000 -// 0x0501 Windows XP, 2003 -// 0x0502 Windows XP SP2, 2003 SP1 -// 0x0600 Windows Vista, 2008 -// 0x0601 Windows 7 -// 0x0602 Windows 8 (currently also returned for 8.1 if program does not have a manifest indicating 8.1 support) -// 0x0603 Windows 8.1 (currently only returned for 8.1 if program has a manifest indicating 8.1 support) -// 0x1000 Windows 10 (currently only returned for 10 if program has a manifest indicating 10 support) -// -// for the other Windows versions 0 is currently returned -enum wxWinVersion -{ - wxWinVersion_Unknown = 0, - - wxWinVersion_3 = 0x0300, - wxWinVersion_NT3 = wxWinVersion_3, - - wxWinVersion_4 = 0x0400, - wxWinVersion_95 = wxWinVersion_4, - wxWinVersion_NT4 = wxWinVersion_4, - wxWinVersion_98 = 0x0410, - - wxWinVersion_5 = 0x0500, - wxWinVersion_ME = wxWinVersion_5, - wxWinVersion_NT5 = wxWinVersion_5, - wxWinVersion_2000 = wxWinVersion_5, - wxWinVersion_XP = 0x0501, - wxWinVersion_2003 = 0x0501, - wxWinVersion_XP_SP2 = 0x0502, - wxWinVersion_2003_SP1 = 0x0502, - - wxWinVersion_6 = 0x0600, - wxWinVersion_Vista = wxWinVersion_6, - wxWinVersion_NT6 = wxWinVersion_6, - - wxWinVersion_7 = 0x601, - - wxWinVersion_8 = 0x602, - wxWinVersion_8_1 = 0x603, - - wxWinVersion_10 = 0x1000 -}; - -WXDLLIMPEXP_BASE wxWinVersion wxGetWinVersion(); - -#if wxUSE_GUI && defined(__WXMSW__) - -// cursor stuff -extern HCURSOR wxGetCurrentBusyCursor(); // from msw/utils.cpp -extern const wxCursor *wxGetGlobalCursor(); // from msw/cursor.cpp - -// GetCursorPos can fail without populating the POINT. This falls back to GetMessagePos. -WXDLLIMPEXP_CORE void wxGetCursorPosMSW(POINT* pt); - -WXDLLIMPEXP_CORE void wxGetCharSize(WXHWND wnd, int *x, int *y, const wxFont& the_font); -WXDLLIMPEXP_CORE void wxFillLogFont(LOGFONT *logFont, const wxFont *font); -WXDLLIMPEXP_CORE wxFont wxCreateFontFromLogFont(const LOGFONT *logFont); -WXDLLIMPEXP_CORE wxFontEncoding wxGetFontEncFromCharSet(int charset); - -WXDLLIMPEXP_CORE void wxSliderEvent(WXHWND control, WXWORD wParam, WXWORD pos); -WXDLLIMPEXP_CORE void wxScrollBarEvent(WXHWND hbar, WXWORD wParam, WXWORD pos); - -// Find maximum size of window/rectangle -extern WXDLLIMPEXP_CORE void wxFindMaxSize(WXHWND hwnd, RECT *rect); - -// Safely get the window text (i.e. without using fixed size buffer) -extern WXDLLIMPEXP_CORE wxString wxGetWindowText(WXHWND hWnd); - -// get the window class name -extern WXDLLIMPEXP_CORE wxString wxGetWindowClass(WXHWND hWnd); - -// get the window id (should be unsigned, hence this is not wxWindowID which -// is, for mainly historical reasons, signed) -extern WXDLLIMPEXP_CORE int wxGetWindowId(WXHWND hWnd); - -// check if hWnd's WNDPROC is wndProc. Return true if yes, false if they are -// different -extern WXDLLIMPEXP_CORE bool wxCheckWindowWndProc(WXHWND hWnd, WXFARPROC wndProc); - -// Does this window style specify any border? -inline bool wxStyleHasBorder(long style) -{ - return (style & (wxSIMPLE_BORDER | wxRAISED_BORDER | - wxSUNKEN_BORDER | wxDOUBLE_BORDER)) != 0; -} - -inline long wxGetWindowExStyle(const wxWindowMSW *win) -{ - return ::GetWindowLong(GetHwndOf(win), GWL_EXSTYLE); -} - -inline bool wxHasWindowExStyle(const wxWindowMSW *win, long style) -{ - return (wxGetWindowExStyle(win) & style) != 0; -} - -inline long wxSetWindowExStyle(const wxWindowMSW *win, long style) -{ - return ::SetWindowLong(GetHwndOf(win), GWL_EXSTYLE, style); -} - -// Common helper of wxUpdate{,Edit}LayoutDirection() below: sets or clears the -// given flag(s) depending on wxLayoutDirection and returns true if the flags -// really changed. -inline bool -wxUpdateExStyleForLayoutDirection(WXHWND hWnd, - wxLayoutDirection dir, - LONG_PTR flagsForRTL) -{ - wxCHECK_MSG( hWnd, false, - wxS("Can't set layout direction for invalid window") ); - - const LONG_PTR styleOld = ::GetWindowLongPtr(hWnd, GWL_EXSTYLE); - - LONG_PTR styleNew = styleOld; - switch ( dir ) - { - case wxLayout_LeftToRight: - styleNew &= ~flagsForRTL; - break; - - case wxLayout_RightToLeft: - styleNew |= flagsForRTL; - break; - - case wxLayout_Default: - wxFAIL_MSG(wxS("Invalid layout direction")); - } - - if ( styleNew == styleOld ) - return false; - - ::SetWindowLongPtr(hWnd, GWL_EXSTYLE, styleNew); - - return true; -} - -// Update layout direction flag for a generic window. -// -// See below for the special version that must be used with EDIT controls. -// -// Returns true if the layout direction did change. -inline bool wxUpdateLayoutDirection(WXHWND hWnd, wxLayoutDirection dir) -{ - return wxUpdateExStyleForLayoutDirection(hWnd, dir, WS_EX_LAYOUTRTL); -} - -// Update layout direction flag for an EDIT control. -// -// Returns true if anything changed or false if the direction flag was already -// set to the desired direction (which can't be wxLayout_Default). -inline bool wxUpdateEditLayoutDirection(WXHWND hWnd, wxLayoutDirection dir) -{ - return wxUpdateExStyleForLayoutDirection(hWnd, dir, - WS_EX_RIGHT | - WS_EX_RTLREADING | - WS_EX_LEFTSCROLLBAR); -} - -// Companion of the above function checking if an EDIT control uses RTL. -inline wxLayoutDirection wxGetEditLayoutDirection(WXHWND hWnd) -{ - wxCHECK_MSG( hWnd, wxLayout_Default, wxS("invalid window") ); - - // While we set 3 style bits above, we're only really interested in one of - // them here. In particularly, don't check for WS_EX_RIGHT as it can be set - // for a right-aligned control even if it doesn't use RTL. And while we - // could test WS_EX_LEFTSCROLLBAR, this doesn't really seem useful. - const LONG_PTR style = ::GetWindowLongPtr(hWnd, GWL_EXSTYLE); - - return style & WS_EX_RTLREADING ? wxLayout_RightToLeft - : wxLayout_LeftToRight; -} - -// ---------------------------------------------------------------------------- -// functions mapping HWND to wxWindow -// ---------------------------------------------------------------------------- - -// this function simply checks whether the given hwnd corresponds to a wxWindow -// and returns either that window if it does or NULL otherwise -extern WXDLLIMPEXP_CORE wxWindow* wxFindWinFromHandle(HWND hwnd); - -// find the window for HWND which is part of some wxWindow, i.e. unlike -// wxFindWinFromHandle() above it will also work for "sub controls" of a -// wxWindow. -// -// returns the wxWindow corresponding to the given HWND or NULL. -extern WXDLLIMPEXP_CORE wxWindow *wxGetWindowFromHWND(WXHWND hwnd); - -// Get the size of an icon -extern WXDLLIMPEXP_CORE wxSize wxGetHiconSize(HICON hicon); - -// Lines are drawn differently for WinCE and regular WIN32 -WXDLLIMPEXP_CORE void wxDrawLine(HDC hdc, int x1, int y1, int x2, int y2); - -// fill the client rect of the given window on the provided dc using this brush -inline void wxFillRect(HWND hwnd, HDC hdc, HBRUSH hbr) -{ - RECT rc; - ::GetClientRect(hwnd, &rc); - ::FillRect(hdc, &rc, hbr); -} - -// ---------------------------------------------------------------------------- -// 32/64 bit helpers -// ---------------------------------------------------------------------------- - -#ifdef __WIN64__ - -inline void *wxGetWindowProc(HWND hwnd) -{ - return (void *)::GetWindowLongPtr(hwnd, GWLP_WNDPROC); -} - -inline void *wxGetWindowUserData(HWND hwnd) -{ - return (void *)::GetWindowLongPtr(hwnd, GWLP_USERDATA); -} - -inline WNDPROC wxSetWindowProc(HWND hwnd, WNDPROC func) -{ - return (WNDPROC)::SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG_PTR)func); -} - -inline void *wxSetWindowUserData(HWND hwnd, void *data) -{ - return (void *)::SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)data); -} - -#else // __WIN32__ - -// note that the casts to LONG_PTR here are required even on 32-bit machines -// for the 64-bit warning mode of later versions of MSVC (C4311/4312) -inline WNDPROC wxGetWindowProc(HWND hwnd) -{ - return (WNDPROC)(LONG_PTR)::GetWindowLong(hwnd, GWL_WNDPROC); -} - -inline void *wxGetWindowUserData(HWND hwnd) -{ - return (void *)(LONG_PTR)::GetWindowLong(hwnd, GWL_USERDATA); -} - -inline WNDPROC wxSetWindowProc(HWND hwnd, WNDPROC func) -{ - return (WNDPROC)(LONG_PTR)::SetWindowLong(hwnd, GWL_WNDPROC, (LONG_PTR)func); -} - -inline void *wxSetWindowUserData(HWND hwnd, void *data) -{ - return (void *)(LONG_PTR)::SetWindowLong(hwnd, GWL_USERDATA, (LONG_PTR)data); -} - -#endif // __WIN64__/__WIN32__ - -#endif // wxUSE_GUI && __WXMSW__ - -#endif // _WX_PRIVATE_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/private/button.h b/Externals/wxWidgets3/include/wx/msw/private/button.h deleted file mode 100644 index 9f605c66a3..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/private/button.h +++ /dev/null @@ -1,76 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/private/button.h -// Purpose: helper functions used with native BUTTON control -// Author: Vadim Zeitlin -// Created: 2008-06-07 -// Copyright: (c) 2008 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_PRIVATE_BUTTON_H_ -#define _WX_MSW_PRIVATE_BUTTON_H_ - -// define some standard button constants which may be missing in the headers -#ifndef BS_PUSHLIKE - #define BS_PUSHLIKE 0x00001000L -#endif - -#ifndef BST_UNCHECKED - #define BST_UNCHECKED 0x0000 -#endif - -#ifndef BST_CHECKED - #define BST_CHECKED 0x0001 -#endif - -#ifndef BST_INDETERMINATE - #define BST_INDETERMINATE 0x0002 -#endif - -namespace wxMSWButton -{ - -// returns BS_MULTILINE if the label contains new lines or 0 otherwise -inline int GetMultilineStyle(const wxString& label) -{ - return label.find(wxT('\n')) == wxString::npos ? 0 : BS_MULTILINE; -} - -// update the style of the specified HWND to include or exclude BS_MULTILINE -// depending on whether the label contains the new lines -void UpdateMultilineStyle(HWND hwnd, const wxString& label); - -// flags for ComputeBestSize() and GetFittingSize() -enum -{ - Size_AuthNeeded = 1, - Size_ExactFit = 2 -}; - -// NB: All the functions below are implemented in src/msw/button.cpp - -// Compute the button size (as if wxBU_EXACTFIT were specified, i.e. without -// adjusting it to be of default size if it's smaller) for the given label size -WXDLLIMPEXP_CORE wxSize -GetFittingSize(wxWindow *win, const wxSize& sizeLabel, int flags = 0); - -// Compute the button size (as if wxBU_EXACTFIT were specified) by computing -// its label size and then calling GetFittingSize(). -wxSize ComputeBestFittingSize(wxControl *btn, int flags = 0); - -// Increase the size passed as parameter to be at least the standard button -// size if the control doesn't have wxBU_EXACTFIT style and also cache it as -// the best size and return its value -- this is used in DoGetBestSize() -// implementation. -wxSize IncreaseToStdSizeAndCache(wxControl *btn, const wxSize& size); - -// helper of wxToggleButton::DoGetBestSize() -inline wxSize ComputeBestSize(wxControl *btn, int flags = 0) -{ - return IncreaseToStdSizeAndCache(btn, ComputeBestFittingSize(btn, flags)); -} - -} // namespace wxMSWButton - -#endif // _WX_MSW_PRIVATE_BUTTON_H_ - diff --git a/Externals/wxWidgets3/include/wx/msw/private/comptr.h b/Externals/wxWidgets3/include/wx/msw/private/comptr.h deleted file mode 100644 index 194cf54f90..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/private/comptr.h +++ /dev/null @@ -1,129 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/private/comptr.h -// Purpose: Smart pointer for COM interfaces. -// Author: PB -// Created: 2012-04-16 -// Copyright: (c) 2012 wxWidgets team -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_PRIVATE_COMPTR_H_ -#define _WX_MSW_PRIVATE_COMPTR_H_ - -// ---------------------------------------------------------------------------- -// wxCOMPtr: A minimalistic smart pointer for use with COM interfaces. -// ---------------------------------------------------------------------------- - -template -class wxCOMPtr -{ -public: - typedef T element_type; - - wxCOMPtr() - : m_ptr(NULL) - { - } - - wxEXPLICIT wxCOMPtr(T* ptr) - : m_ptr(ptr) - { - if ( m_ptr ) - m_ptr->AddRef(); - } - - wxCOMPtr(const wxCOMPtr& ptr) - : m_ptr(ptr.get()) - { - if ( m_ptr ) - m_ptr->AddRef(); - } - - ~wxCOMPtr() - { - if ( m_ptr ) - m_ptr->Release(); - } - - void reset(T* ptr = NULL) - { - if ( m_ptr != ptr) - { - if ( ptr ) - ptr->AddRef(); - if ( m_ptr ) - m_ptr->Release(); - m_ptr = ptr; - } - } - - wxCOMPtr& operator=(const wxCOMPtr& ptr) - { - reset(ptr.get()); - return *this; - } - - wxCOMPtr& operator=(T* ptr) - { - reset(ptr); - return *this; - } - - operator T*() const - { - return m_ptr; - } - - T& operator*() const - { - return *m_ptr; - } - - T* operator->() const - { - return m_ptr; - } - - // It would be better to forbid direct access completely but we do need - // for QueryInterface() and similar functions, so provide it but it can - // only be used to initialize the pointer, not to modify an existing one. - T** operator&() - { - wxASSERT_MSG(!m_ptr, - wxS("Can't get direct access to initialized pointer")); - - return &m_ptr; - } - - T* get() const - { - return m_ptr; - } - - bool operator<(T* ptr) const - { - return get() < ptr; - } - -private: - T* m_ptr; -}; - -// Define a helper for the macro below: we just need a function taking a -// pointer and not returning anything to avoid warnings about unused return -// value of the cast in the macro itself. -namespace wxPrivate { inline void PPV_ARGS_CHECK(void*) { } } - -// Takes the interface name and a pointer to a pointer of the interface type -// and expands into the IID of this interface and the same pointer but after a -// type-safety check. -// -// This is similar to the standard IID_PPV_ARGS macro but takes the pointer -// type instead of relying on the non-standard Microsoft __uuidof(). -#define wxIID_PPV_ARGS(IType, pType) \ - IID_##IType, \ - (wxPrivate::PPV_ARGS_CHECK(static_cast(*pType)), \ - reinterpret_cast(pType)) - -#endif // _WX_MSW_PRIVATE_COMPTR_H_ - diff --git a/Externals/wxWidgets3/include/wx/msw/private/datecontrols.h b/Externals/wxWidgets3/include/wx/msw/private/datecontrols.h deleted file mode 100644 index 9794cfae89..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/private/datecontrols.h +++ /dev/null @@ -1,30 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/private/datecontrols.h -// Purpose: implementation helpers for wxDatePickerCtrl and wxCalendarCtrl -// Author: Vadim Zeitlin -// Created: 2008-04-04 -// Copyright: (c) 2008 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _MSW_PRIVATE_DATECONTROLS_H_ -#define _MSW_PRIVATE_DATECONTROLS_H_ - -#include "wx/datetime.h" - -#include "wx/msw/wrapwin.h" - -// namespace for the helper functions related to the date controls -namespace wxMSWDateControls -{ - -// do the one time only initialization of date classes of comctl32.dll, return -// true if ok or log an error and return false if we failed (this can only -// happen with a very old version of common controls DLL, i.e. before 4.70) -extern bool CheckInitialization(); - -} // namespace wxMSWDateControls - -#endif // _MSW_PRIVATE_DATECONTROLS_H_ - - diff --git a/Externals/wxWidgets3/include/wx/msw/private/dc.h b/Externals/wxWidgets3/include/wx/msw/private/dc.h deleted file mode 100644 index 303cd19df6..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/private/dc.h +++ /dev/null @@ -1,147 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/private/dc.h -// Purpose: private wxMSW helpers for working with HDCs -// Author: Vadim Zeitlin -// Created: 2009-06-16 (extracted from src/msw/dc.cpp) -// Copyright: (c) 2009 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _MSW_PRIVATE_DC_H_ -#define _MSW_PRIVATE_DC_H_ - -#include "wx/msw/dc.h" -#include "wx/msw/wrapwin.h" - -namespace wxMSWImpl -{ - -// various classes to change some DC property temporarily - -// text background and foreground colours -class wxTextColoursChanger -{ -public: - wxTextColoursChanger(HDC hdc, const wxMSWDCImpl& dc) - : m_hdc(hdc) - { - Change(dc.GetTextForeground(), dc.GetTextBackground()); - } - - wxTextColoursChanger(HDC hdc, const wxColour& colFg, const wxColour& colBg) - : m_hdc(hdc) - { - Change(colFg, colBg); - } - - wxTextColoursChanger(HDC hdc, COLORREF colFg, COLORREF colBg) - : m_hdc(hdc) - { - Change(colFg, colBg); - } - - ~wxTextColoursChanger() - { - if ( m_oldColFg != CLR_INVALID ) - ::SetTextColor(m_hdc, m_oldColFg); - if ( m_oldColBg != CLR_INVALID ) - ::SetBkColor(m_hdc, m_oldColBg); - } - -protected: - // this ctor doesn't change mode immediately, call Change() later to do it - // only if needed - wxTextColoursChanger(HDC hdc) - : m_hdc(hdc) - { - m_oldColFg = - m_oldColBg = CLR_INVALID; - } - - void Change(const wxColour& colFg, const wxColour& colBg) - { - Change(colFg.IsOk() ? colFg.GetPixel() : CLR_INVALID, - colBg.IsOk() ? colBg.GetPixel() : CLR_INVALID); - } - - void Change(COLORREF colFg, COLORREF colBg) - { - if ( colFg != CLR_INVALID ) - { - m_oldColFg = ::SetTextColor(m_hdc, colFg); - if ( m_oldColFg == CLR_INVALID ) - { - wxLogLastError(wxT("SetTextColor")); - } - } - else - { - m_oldColFg = CLR_INVALID; - } - - if ( colBg != CLR_INVALID ) - { - m_oldColBg = ::SetBkColor(m_hdc, colBg); - if ( m_oldColBg == CLR_INVALID ) - { - wxLogLastError(wxT("SetBkColor")); - } - } - else - { - m_oldColBg = CLR_INVALID; - } - } - -private: - const HDC m_hdc; - COLORREF m_oldColFg, - m_oldColBg; - - wxDECLARE_NO_COPY_CLASS(wxTextColoursChanger); -}; - -// background mode -class wxBkModeChanger -{ -public: - // set background mode to opaque if mode != wxBRUSHSTYLE_TRANSPARENT - wxBkModeChanger(HDC hdc, int mode) - : m_hdc(hdc) - { - Change(mode); - } - - ~wxBkModeChanger() - { - if ( m_oldMode ) - ::SetBkMode(m_hdc, m_oldMode); - } - -protected: - // this ctor doesn't change mode immediately, call Change() later to do it - // only if needed - wxBkModeChanger(HDC hdc) : m_hdc(hdc) { m_oldMode = 0; } - - void Change(int mode) - { - m_oldMode = ::SetBkMode(m_hdc, mode == wxBRUSHSTYLE_TRANSPARENT - ? TRANSPARENT - : OPAQUE); - if ( !m_oldMode ) - { - wxLogLastError(wxT("SetBkMode")); - } - } - -private: - const HDC m_hdc; - int m_oldMode; - - wxDECLARE_NO_COPY_CLASS(wxBkModeChanger); -}; - -} // namespace wxMSWImpl - -#endif // _MSW_PRIVATE_DC_H_ - diff --git a/Externals/wxWidgets3/include/wx/msw/private/event.h b/Externals/wxWidgets3/include/wx/msw/private/event.h deleted file mode 100644 index 27825e49a7..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/private/event.h +++ /dev/null @@ -1,104 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/private/event.h -// Purpose: Simple Windows 'event object' wrapper. -// Author: Troelsk, Vadim Zeitlin -// Created: 2014-05-07 -// Copyright: (c) 2014 wxWidgets team -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_PRIVATE_EVENT_H_ -#define _WX_MSW_PRIVATE_EVENT_H_ - -#include "wx/msw/private.h" - -namespace wxWinAPI -{ - -class Event : public AutoHANDLE<0> -{ -public: - enum Kind - { - ManualReset, - AutomaticReset - }; - - enum InitialState - { - Signaled, - Nonsignaled - }; - - Event() - { - } - - // Wrappers around {Create,Set,Reset}Event() Windows API functions, with - // the same semantics. - bool Create(Kind kind = AutomaticReset, - InitialState initialState = Nonsignaled, - const wxChar* name = NULL); - bool Set(); - bool Reset(); - -private: - wxDECLARE_NO_COPY_CLASS(Event); -}; - -} // namespace wxWinAPI - -// ---------------------------------------------------------------------------- -// Implementations requiring windows.h; these are to moved out-of-line if -// this class is moved to a public header, or if [parts of] msw/private.h is -// changed to not depend on windows.h being included. -// ---------------------------------------------------------------------------- - -inline bool -wxWinAPI::Event::Create(wxWinAPI::Event::Kind kind, - wxWinAPI::Event::InitialState initialState, - const wxChar* name) -{ - wxCHECK_MSG( !IsOk(), false, wxS("Event can't be created twice") ); - - WXHANDLE handle = ::CreateEvent(NULL, - kind == ManualReset, - initialState == Signaled, - name); - if ( !handle ) - { - wxLogLastError(wxS("CreateEvent")); - return false; - } - - m_handle = handle; - return true; -} - -inline bool wxWinAPI::Event::Set() -{ - wxCHECK_MSG( m_handle, false, wxS("Event must be valid") ); - - if ( !::SetEvent(m_handle) ) - { - wxLogLastError(wxS("SetEvent")); - return false; - } - - return true; -} - -inline bool wxWinAPI::Event::Reset() -{ - wxCHECK_MSG( m_handle, false, wxS("Event must be valid") ); - - if ( !::ResetEvent(m_handle) ) - { - wxLogLastError(wxS("ResetEvent")); - return false; - } - - return true; -} - -#endif // _WX_MSW_PRIVATE_EVENT_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/private/fswatcher.h b/Externals/wxWidgets3/include/wx/msw/private/fswatcher.h deleted file mode 100644 index 055617b77c..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/private/fswatcher.h +++ /dev/null @@ -1,335 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/private/fswatcher.h -// Purpose: File system watcher impl classes -// Author: Bartosz Bekier -// Created: 2009-05-26 -// Copyright: (c) 2009 Bartosz Bekier -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef WX_MSW_PRIVATE_FSWATCHER_H_ -#define WX_MSW_PRIVATE_FSWATCHER_H_ - -#include "wx/filename.h" -#include "wx/vector.h" -#include "wx/msw/private.h" - -// ============================================================================ -// wxFSWatcherEntry implementation & helper declarations -// ============================================================================ - -class wxFSWatcherImplMSW; - -class wxFSWatchEntryMSW : public wxFSWatchInfo -{ -public: - enum - { - BUFFER_SIZE = 4096 // TODO parametrize - }; - - wxFSWatchEntryMSW(const wxFSWatchInfo& winfo) : - wxFSWatchInfo(winfo) - { - // get handle for this path - m_handle = OpenDir(m_path); - m_overlapped = (OVERLAPPED*)calloc(1, sizeof(OVERLAPPED)); - wxZeroMemory(m_buffer); - } - - virtual ~wxFSWatchEntryMSW() - { - wxLogTrace(wxTRACE_FSWATCHER, "Deleting entry '%s'", m_path); - - if (m_handle != INVALID_HANDLE_VALUE) - { - if (!CloseHandle(m_handle)) - { - wxLogSysError(_("Unable to close the handle for '%s'"), - m_path); - } - } - free(m_overlapped); - } - - bool IsOk() const - { - return m_handle != INVALID_HANDLE_VALUE; - } - - HANDLE GetHandle() const - { - return m_handle; - } - - void* GetBuffer() - { - return m_buffer; - } - - OVERLAPPED* GetOverlapped() const - { - return m_overlapped; - } - -private: - // opens dir with all flags, attributes etc. necessary to be later - // asynchronous watched with ReadDirectoryChangesW - static HANDLE OpenDir(const wxString& path) - { - HANDLE handle = CreateFile(path.t_str(), - FILE_LIST_DIRECTORY, - FILE_SHARE_READ | - FILE_SHARE_WRITE | - FILE_SHARE_DELETE, - NULL, - OPEN_EXISTING, - FILE_FLAG_BACKUP_SEMANTICS | - FILE_FLAG_OVERLAPPED, - NULL); - if (handle == INVALID_HANDLE_VALUE) - { - wxLogSysError(_("Failed to open directory \"%s\" for monitoring."), - path); - } - - return handle; - } - - HANDLE m_handle; // handle to opened directory - char m_buffer[BUFFER_SIZE]; // buffer for fs events - OVERLAPPED* m_overlapped; - - wxDECLARE_NO_COPY_CLASS(wxFSWatchEntryMSW); -}; - -// ============================================================================ -// wxFSWatcherImplMSW helper classes implementations -// ============================================================================ - -class wxIOCPService -{ -public: - wxIOCPService() : - m_iocp(INVALID_HANDLE_VALUE) - { - Init(); - } - - ~wxIOCPService() - { - if (m_iocp != INVALID_HANDLE_VALUE) - { - if (!CloseHandle(m_iocp)) - { - wxLogSysError(_("Unable to close I/O completion port handle")); - } - } - m_watches.clear(); - } - - // associates a wxFSWatchEntryMSW with completion port - bool Add(wxSharedPtr watch) - { - wxCHECK_MSG( m_iocp != INVALID_HANDLE_VALUE, false, "IOCP not init" ); - wxCHECK_MSG( watch->IsOk(), false, "Invalid watch" ); - - // associate with IOCP - HANDLE ret = CreateIoCompletionPort(watch->GetHandle(), m_iocp, - (ULONG_PTR)watch.get(), 0); - if (ret == NULL) - { - wxLogSysError(_("Unable to associate handle with " - "I/O completion port")); - return false; - } - else if (ret != m_iocp) - { - wxFAIL_MSG(_("Unexpectedly new I/O completion port was created")); - return false; - } - - // add to watch map - wxFSWatchEntries::value_type val(watch->GetPath(), watch); - return m_watches.insert(val).second; - } - - // Removes a watch we're currently using. Notice that this doesn't happen - // immediately, CompleteRemoval() must be called later when it's really - // safe to delete the watch, i.e. after completion of the IO operation - // using it. - bool ScheduleForRemoval(const wxSharedPtr& watch) - { - wxCHECK_MSG( m_iocp != INVALID_HANDLE_VALUE, false, "IOCP not init" ); - wxCHECK_MSG( watch->IsOk(), false, "Invalid watch" ); - - const wxString path = watch->GetPath(); - wxFSWatchEntries::iterator it = m_watches.find(path); - wxCHECK_MSG( it != m_watches.end(), false, - "Can't remove a watch we don't use" ); - - // We can't just delete the watch here as we can have pending events - // for it and if we destroyed it now, we could get a dangling (or, - // worse, reused to point to another object) pointer in ReadEvents() so - // just remember that this one should be removed when CompleteRemoval() - // is called later. - m_removedWatches.push_back(watch); - m_watches.erase(it); - - return true; - } - - // Really remove the watch previously passed to ScheduleForRemoval(). - // - // It's ok to call this for a watch that hadn't been removed before, in - // this case we'll just return false and do nothing. - bool CompleteRemoval(wxFSWatchEntryMSW* watch) - { - for ( Watches::iterator it = m_removedWatches.begin(); - it != m_removedWatches.end(); - ++it ) - { - if ( (*it).get() == watch ) - { - // Removing the object from here will result in deleting the - // watch itself as it's not referenced from anywhere else now. - m_removedWatches.erase(it); - return true; - } - } - - return false; - } - - // post completion packet - bool PostEmptyStatus() - { - wxCHECK_MSG( m_iocp != INVALID_HANDLE_VALUE, false, "IOCP not init" ); - - // The special values of 0 will make GetStatus() return Status_Exit. - int ret = PostQueuedCompletionStatus(m_iocp, 0, 0, NULL); - if (!ret) - { - wxLogSysError(_("Unable to post completion status")); - } - - return ret != 0; - } - - // Possible return values of GetStatus() - enum Status - { - // Status successfully retrieved into the provided arguments. - Status_OK, - - // Special status indicating that we should exit retrieved. - Status_Exit, - - // An error occurred because the watched directory was deleted. - Status_Deleted, - - // Some other error occurred. - Status_Error - }; - - // Wait for completion status to arrive. - // This function can block forever in it's wait for completion status. - // Use PostEmptyStatus() to wake it up (and end the worker thread) - Status - GetStatus(DWORD* count, wxFSWatchEntryMSW** watch, - OVERLAPPED** overlapped) - { - wxCHECK_MSG( m_iocp != INVALID_HANDLE_VALUE, Status_Error, - "Invalid IOCP object" ); - wxCHECK_MSG( count && watch && overlapped, Status_Error, - "Output parameters can't be NULL" ); - - int ret = GetQueuedCompletionStatus(m_iocp, count, (ULONG_PTR *)watch, - overlapped, INFINITE); - if ( ret != 0 ) - { - return *count || *watch || *overlapped ? Status_OK : Status_Exit; - } - - // An error is returned if the underlying directory has been deleted, - // but this is not really an unexpected failure, so handle it - // specially. - if ( wxSysErrorCode() == ERROR_ACCESS_DENIED && - *watch && !wxFileName::DirExists((*watch)->GetPath()) ) - return Status_Deleted; - - // Some other error, at least log it. - wxLogSysError(_("Unable to dequeue completion packet")); - - return Status_Error; - } - -protected: - bool Init() - { - m_iocp = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 0); - if (m_iocp == NULL) - { - wxLogSysError(_("Unable to create I/O completion port")); - } - return m_iocp != NULL; - } - - HANDLE m_iocp; - - // The hash containing all the wxFSWatchEntryMSW objects currently being - // watched keyed by their paths. - wxFSWatchEntries m_watches; - - // Contains the watches which had been removed but are still pending. - typedef wxVector< wxSharedPtr > Watches; - Watches m_removedWatches; -}; - - -class wxIOCPThread : public wxThread -{ -public: - wxIOCPThread(wxFSWatcherImplMSW* service, wxIOCPService* iocp); - - // finishes this thread - bool Finish(); - -protected: - // structure to hold information needed to process one native event - // this is just a dummy holder, so it doesn't take ownership of it's data - struct wxEventProcessingData - { - wxEventProcessingData(const FILE_NOTIFY_INFORMATION* ne, - const wxFSWatchEntryMSW* watch_) : - nativeEvent(ne), watch(watch_) - {} - - const FILE_NOTIFY_INFORMATION* nativeEvent; - const wxFSWatchEntryMSW* watch; - }; - - virtual ExitCode Entry(); - - // wait for events to occur, read them and send to interested parties - // returns false it empty status was read, which means we would exit - // true otherwise - bool ReadEvents(); - - void ProcessNativeEvents(wxVector& events); - - void SendEvent(wxFileSystemWatcherEvent& evt); - - static int Native2WatcherFlags(int flags); - - static wxString FileNotifyInformationToString( - const FILE_NOTIFY_INFORMATION& e); - - static wxFileName GetEventPath(const wxFSWatchEntryMSW& watch, - const FILE_NOTIFY_INFORMATION& e); - - wxFSWatcherImplMSW* m_service; - wxIOCPService* m_iocp; -}; - -#endif /* WX_MSW_PRIVATE_FSWATCHER_H_ */ diff --git a/Externals/wxWidgets3/include/wx/msw/private/hiddenwin.h b/Externals/wxWidgets3/include/wx/msw/private/hiddenwin.h deleted file mode 100644 index 3b52b60983..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/private/hiddenwin.h +++ /dev/null @@ -1,30 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/private/hiddenwin.h -// Purpose: Helper for creating a hidden window used by wxMSW internally. -// Author: Vadim Zeitlin -// Created: 2011-09-16 -// Copyright: (c) 2011 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_PRIVATE_HIDDENWIN_H_ -#define _WX_MSW_PRIVATE_HIDDENWIN_H_ - -#include "wx/msw/private.h" - -/* - Creates a hidden window with supplied window proc registering the class for - it if necessary (i.e. the first time only). Caller is responsible for - destroying the window and unregistering the class (note that this must be - done because wxWidgets may be used as a DLL and so may be loaded/unloaded - multiple times into/from the same process so we can't rely on automatic - Windows class unregistration). - - pclassname is a pointer to a caller stored classname, which must initially be - NULL. classname is the desired wndclass classname. If function successfully - registers the class, pclassname will be set to classname. - */ -extern "C" WXDLLIMPEXP_BASE HWND -wxCreateHiddenWindow(LPCTSTR *pclassname, LPCTSTR classname, WNDPROC wndproc); - -#endif // _WX_MSW_PRIVATE_HIDDENWIN_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/private/keyboard.h b/Externals/wxWidgets3/include/wx/msw/private/keyboard.h deleted file mode 100644 index 002303e967..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/private/keyboard.h +++ /dev/null @@ -1,41 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/private/keyboard.h -// Purpose: Helper keyboard-related functions. -// Author: Vadim Zeitlin -// Created: 2010-09-09 -// Copyright: (c) 2010 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_PRIVATE_KEYBOARD_H_ -#define _WX_MSW_PRIVATE_KEYBOARD_H_ - -#include "wx/defs.h" - -namespace wxMSWKeyboard -{ - -// ---------------------------------------------------------------------------- -// Functions for translating between MSW virtual keys codes and wx key codes -// -// These functions are currently implemented in src/msw/window.cpp. -// ---------------------------------------------------------------------------- - -// Translate MSW virtual key code to wx key code. lParam is used to distinguish -// between numpad and extended version of the keys, extended is assumed by -// default if lParam == 0. -// -// Returns WXK_NONE if translation couldn't be done at all (this happens e.g. -// for dead keys and in this case uc will be WXK_NONE too) or if the key -// corresponds to a non-Latin-1 character in which case uc is filled with its -// Unicode value. -WXDLLIMPEXP_CORE int VKToWX(WXWORD vk, WXLPARAM lParam = 0, wchar_t *uc = NULL); - -// Translate wxKeyCode enum element (passed as int for compatibility reasons) -// to MSW virtual key code. isExtended is set to true if the key corresponds to -// a non-numpad version of a key that exists both on numpad and outside it. -WXDLLIMPEXP_CORE WXWORD WXToVK(int id, bool *isExtended = NULL); - -} // namespace wxMSWKeyboard - -#endif // _WX_MSW_PRIVATE_KEYBOARD_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/private/metrics.h b/Externals/wxWidgets3/include/wx/msw/private/metrics.h deleted file mode 100644 index 0e1b41deb5..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/private/metrics.h +++ /dev/null @@ -1,48 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/private/metrics.h -// Purpose: various helper functions to retrieve system metrics -// Author: Vadim Zeitlin -// Created: 2008-09-05 -// Copyright: (c) 2008 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_PRIVATE_METRICS_H_ -#define _WX_MSW_PRIVATE_METRICS_H_ - -namespace wxMSWImpl -{ - -// return NONCLIENTMETRICS as retrieved by SystemParametersInfo() -// -// currently this is not cached as the values may change when system settings -// do and we don't react to this to invalidate the cache but it could be done -// in the future -// -// MT-safety: this function is only meant to be called from the main thread -inline const NONCLIENTMETRICS& GetNonClientMetrics() -{ - static WinStruct nm; - if ( !::SystemParametersInfo(SPI_GETNONCLIENTMETRICS, 0, &nm, 0) ) - { -#if WINVER >= 0x0600 - // a new field has been added to NONCLIENTMETRICS under Vista, so - // the call to SystemParametersInfo() fails if we use the struct - // size incorporating this new value on an older system -- retry - // without it - nm.cbSize -= sizeof(int); - if ( !::SystemParametersInfo(SPI_GETNONCLIENTMETRICS, 0, &nm, 0) ) -#endif // WINVER >= 0x0600 - { - // maybe we should initialize the struct with some defaults? - wxLogLastError(wxT("SystemParametersInfo(SPI_GETNONCLIENTMETRICS)")); - } - } - - return nm; -} - -} // namespace wxMSWImpl - -#endif // _WX_MSW_PRIVATE_METRICS_H_ - diff --git a/Externals/wxWidgets3/include/wx/msw/private/msgdlg.h b/Externals/wxWidgets3/include/wx/msw/private/msgdlg.h deleted file mode 100644 index cb56df484b..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/private/msgdlg.h +++ /dev/null @@ -1,93 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/private/msgdlg.h -// Purpose: helper functions used with native message dialog -// Author: Rickard Westerlund -// Created: 2010-07-12 -// Copyright: (c) 2010 wxWidgets team -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_PRIVATE_MSGDLG_H_ -#define _WX_MSW_PRIVATE_MSGDLG_H_ - -#include "wx/msw/wrapcctl.h" -#include "wx/scopedarray.h" - -// Macro to help identify if task dialogs are available: we rely on -// TD_WARNING_ICON being defined in the headers for this as this symbol is used -// by the task dialogs only. Also notice that task dialogs are available for -// Unicode applications only. -#if defined(TD_WARNING_ICON) && wxUSE_UNICODE - #define wxHAS_MSW_TASKDIALOG -#endif - -// Provides methods for creating a task dialog. -namespace wxMSWMessageDialog -{ - -#ifdef wxHAS_MSW_TASKDIALOG - class wxMSWTaskDialogConfig - { - public: - enum { MAX_BUTTONS = 4 }; - - wxMSWTaskDialogConfig() - : buttons(new TASKDIALOG_BUTTON[MAX_BUTTONS]), - parent(NULL), - iconId(0), - style(0), - useCustomLabels(false) - { } - - // initializes the object from a message dialog. - wxMSWTaskDialogConfig(const wxMessageDialogBase& dlg); - - wxScopedArray buttons; - wxWindow *parent; - wxString caption; - wxString message; - wxString extendedMessage; - long iconId; - long style; - bool useCustomLabels; - wxString btnYesLabel; - wxString btnNoLabel; - wxString btnOKLabel; - wxString btnCancelLabel; - wxString btnHelpLabel; - - // Will create a task dialog with it's parameters for it's creation - // stored in the provided TASKDIALOGCONFIG parameter. - // NOTE: The wxMSWTaskDialogConfig object needs to remain accessible - // during the subsequent call to TaskDialogIndirect(). - void MSWCommonTaskDialogInit(TASKDIALOGCONFIG &tdc); - - // Used by MSWCommonTaskDialogInit() to add a regular button or a - // button with a custom label if used. - void AddTaskDialogButton(TASKDIALOGCONFIG &tdc, - int btnCustomId, - int btnCommonId, - const wxString& customLabel); - }; // class wxMSWTaskDialogConfig - - - typedef HRESULT (WINAPI *TaskDialogIndirect_t)(const TASKDIALOGCONFIG *, - int *, int *, BOOL *); - - // Return the pointer to TaskDialogIndirect(). This should only be called - // if HasNativeTaskDialog() returned true and is normally guaranteed to - // succeed in this case. - TaskDialogIndirect_t GetTaskDialogIndirectFunc(); -#endif // wxHAS_MSW_TASKDIALOG - - - // Check if the task dialog is available: this simply checks the OS version - // as we know that it's only present in Vista and later. - bool HasNativeTaskDialog(); - - // Translates standard MSW button IDs like IDCANCEL into an equivalent - // wx constant such as wxCANCEL. - int MSWTranslateReturnCode(int msAns); -}; // namespace wxMSWMessageDialog - -#endif // _WX_MSW_PRIVATE_MSGDLG_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/private/pipestream.h b/Externals/wxWidgets3/include/wx/msw/private/pipestream.h deleted file mode 100644 index ba6d032bea..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/private/pipestream.h +++ /dev/null @@ -1,50 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/private/pipestream.h -// Purpose: MSW wxPipeInputStream and wxPipeOutputStream declarations -// Author: Vadim Zeitlin -// Created: 2013-06-08 (extracted from src/msw/utilsexc.cpp) -// Copyright: (c) 2013 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_PRIVATE_PIPESTREAM_H_ -#define _WX_MSW_PRIVATE_PIPESTREAM_H_ - -class wxPipeInputStream : public wxInputStream -{ -public: - wxEXPLICIT wxPipeInputStream(HANDLE hInput); - virtual ~wxPipeInputStream(); - - // returns true if the pipe is still opened - bool IsOpened() const { return m_hInput != INVALID_HANDLE_VALUE; } - - // returns true if there is any data to be read from the pipe - virtual bool CanRead() const; - -protected: - virtual size_t OnSysRead(void *buffer, size_t len); - -protected: - HANDLE m_hInput; - - wxDECLARE_NO_COPY_CLASS(wxPipeInputStream); -}; - -class wxPipeOutputStream: public wxOutputStream -{ -public: - wxEXPLICIT wxPipeOutputStream(HANDLE hOutput); - virtual ~wxPipeOutputStream() { Close(); } - bool Close(); - -protected: - size_t OnSysWrite(const void *buffer, size_t len); - -protected: - HANDLE m_hOutput; - - wxDECLARE_NO_COPY_CLASS(wxPipeOutputStream); -}; - -#endif // _WX_MSW_PRIVATE_PIPESTREAM_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/private/sockmsw.h b/Externals/wxWidgets3/include/wx/msw/private/sockmsw.h deleted file mode 100644 index fdde2f7017..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/private/sockmsw.h +++ /dev/null @@ -1,66 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/private/gsockmsw.h -// Purpose: MSW-specific socket implementation -// Authors: Guilhem Lavaux, Guillermo Rodriguez Garcia, Vadim Zeitlin -// Created: April 1997 -// Copyright: (C) 1999-1997, Guilhem Lavaux -// (C) 1999-2000, Guillermo Rodriguez Garcia -// (C) 2008 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - - -#ifndef _WX_MSW_GSOCKMSW_H_ -#define _WX_MSW_GSOCKMSW_H_ - -#include "wx/msw/wrapwin.h" - -#if defined(__CYGWIN__) - //CYGWIN gives annoying warning about runtime stuff if we don't do this -# define USE_SYS_TYPES_FD_SET -# include -#endif - -#if defined(__CYGWIN__) - #include -#endif - -// ---------------------------------------------------------------------------- -// MSW-specific socket implementation -// ---------------------------------------------------------------------------- - -class wxSocketImplMSW : public wxSocketImpl -{ -public: - wxSocketImplMSW(wxSocketBase& wxsocket); - - virtual ~wxSocketImplMSW(); - - virtual wxSocketError GetLastError() const; - - virtual void ReenableEvents(wxSocketEventFlags WXUNUSED(flags)) - { - // notifications are never disabled in this implementation, there is no - // need for this as WSAAsyncSelect() only sends notification once when - // the new data becomes available anyhow, so there is no need to do - // anything here - } - -private: - virtual void DoClose(); - - virtual void UnblockAndRegisterWithEventLoop() - { - // no need to make the socket non-blocking, Install_Callback() will do - // it - wxSocketManager::Get()->Install_Callback(this); - } - - int m_msgnumber; - - friend class wxSocketMSWManager; - - wxDECLARE_NO_COPY_CLASS(wxSocketImplMSW); -}; - -#endif /* _WX_MSW_GSOCKMSW_H_ */ diff --git a/Externals/wxWidgets3/include/wx/msw/private/textmeasure.h b/Externals/wxWidgets3/include/wx/msw/private/textmeasure.h deleted file mode 100644 index ee14751a5b..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/private/textmeasure.h +++ /dev/null @@ -1,63 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/private/textmeasure.h -// Purpose: wxMSW-specific declaration of wxTextMeasure class -// Author: Manuel Martin -// Created: 2012-10-05 -// Copyright: (c) 1997-2012 wxWidgets team -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_PRIVATE_TEXTMEASURE_H_ -#define _WX_MSW_PRIVATE_TEXTMEASURE_H_ - -#include "wx/msw/wrapwin.h" - -// ---------------------------------------------------------------------------- -// wxTextMeasure for MSW. -// ---------------------------------------------------------------------------- - -class wxTextMeasure : public wxTextMeasureBase -{ -public: - wxEXPLICIT wxTextMeasure(const wxDC *dc, const wxFont *font = NULL) - : wxTextMeasureBase(dc, font) - { - Init(); - } - - wxEXPLICIT wxTextMeasure(const wxWindow *win, const wxFont *font = NULL) - : wxTextMeasureBase(win, font) - { - Init(); - } - -protected: - void Init(); - - virtual void BeginMeasuring(); - virtual void EndMeasuring(); - - virtual void DoGetTextExtent(const wxString& string, - wxCoord *width, - wxCoord *height, - wxCoord *descent = NULL, - wxCoord *externalLeading = NULL); - - virtual bool DoGetPartialTextExtents(const wxString& text, - wxArrayInt& widths, - double scaleX); - - - - // We use either the HDC of the provided wxDC or an HDC created for our - // window. - HDC m_hdc; - - // If we change the font in BeginMeasuring(), we restore it to the old one - // in EndMeasuring(). - HFONT m_hfontOld; - - wxDECLARE_NO_COPY_CLASS(wxTextMeasure); -}; - -#endif // _WX_MSW_PRIVATE_TEXTMEASURE_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/private/timer.h b/Externals/wxWidgets3/include/wx/msw/private/timer.h deleted file mode 100644 index 71ce2ceec7..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/private/timer.h +++ /dev/null @@ -1,36 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/private/timer.h -// Purpose: wxTimer class -// Author: Julian Smart -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_PRIVATE_TIMER_H_ -#define _WX_MSW_PRIVATE_TIMER_H_ - -#if wxUSE_TIMER - -#include "wx/private/timer.h" -#include "wx/msw/wrapwin.h" // for WPARAM - -class WXDLLIMPEXP_BASE wxMSWTimerImpl : public wxTimerImpl -{ -public: - wxMSWTimerImpl(wxTimer *timer) : wxTimerImpl(timer) { m_id = 0; } - - virtual bool Start(int milliseconds = -1, bool oneShot = false); - virtual void Stop(); - - virtual bool IsRunning() const { return m_id != 0; } - -protected: - // this must be 64 bit under Win64 as WPARAM (storing timer ids) is 64 bit - // there and so the ids may possibly not fit in 32 bits - WPARAM m_id; -}; - -#endif // wxUSE_TIMER - -#endif // _WX_TIMERH_ diff --git a/Externals/wxWidgets3/include/wx/msw/progdlg.h b/Externals/wxWidgets3/include/wx/msw/progdlg.h deleted file mode 100644 index c63a0b66f8..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/progdlg.h +++ /dev/null @@ -1,73 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/progdlg.h -// Purpose: wxProgressDialog -// Author: Rickard Westerlund -// Created: 2010-07-22 -// Copyright: (c) 2010 wxWidgets team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PROGDLG_H_ -#define _WX_PROGDLG_H_ - -class wxProgressDialogTaskRunner; -class wxProgressDialogSharedData; - -class WXDLLIMPEXP_CORE wxProgressDialog : public wxGenericProgressDialog -{ -public: - wxProgressDialog(const wxString& title, const wxString& message, - int maximum = 100, - wxWindow *parent = NULL, - int style = wxPD_APP_MODAL | wxPD_AUTO_HIDE); - - virtual ~wxProgressDialog(); - - virtual bool Update(int value, const wxString& newmsg = wxEmptyString, bool *skip = NULL); - virtual bool Pulse(const wxString& newmsg = wxEmptyString, bool *skip = NULL); - - void Resume(); - - int GetValue() const; - wxString GetMessage() const; - - void SetRange(int maximum); - - // Return whether "Cancel" or "Skip" button was pressed, always return - // false if the corresponding button is not shown. - bool WasSkipped() const; - bool WasCancelled() const; - - virtual void SetTitle(const wxString& title); - virtual wxString GetTitle() const; - - virtual bool Show( bool show = true ); - - // Must provide overload to avoid hiding it (and warnings about it) - virtual void Update() { wxGenericProgressDialog::Update(); } - - virtual WXWidget GetHandle() const; - -private: - // Performs common routines to Update() and Pulse(). Requires the - // shared object to have been entered. - bool DoNativeBeforeUpdate(bool *skip); - - // Updates the various timing informations for both determinate - // and indeterminate modes. Requires the shared object to have - // been entered. - void UpdateExpandedInformation(int value); - - wxProgressDialogTaskRunner *m_taskDialogRunner; - - wxProgressDialogSharedData *m_sharedData; - - // Store the message and title we currently use to be able to return it - // from Get{Message,Title}() - wxString m_message, - m_title; - - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxProgressDialog); -}; - -#endif // _WX_PROGDLG_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/question.ico b/Externals/wxWidgets3/include/wx/msw/question.ico deleted file mode 100644 index b34c3b81d1..0000000000 Binary files a/Externals/wxWidgets3/include/wx/msw/question.ico and /dev/null differ diff --git a/Externals/wxWidgets3/include/wx/msw/radiobox.h b/Externals/wxWidgets3/include/wx/msw/radiobox.h deleted file mode 100644 index 270337f3d5..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/radiobox.h +++ /dev/null @@ -1,189 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/radiobox.h -// Purpose: wxRadioBox class -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_RADIOBOX_H_ -#define _WX_RADIOBOX_H_ - -#include "wx/statbox.h" - -class WXDLLIMPEXP_FWD_CORE wxSubwindows; - -// ---------------------------------------------------------------------------- -// wxRadioBox -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxRadioBox : public wxStaticBox, public wxRadioBoxBase -{ -public: - wxRadioBox() { Init(); } - - wxRadioBox(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = NULL, - int majorDim = 0, - long style = wxRA_SPECIFY_COLS, - const wxValidator& val = wxDefaultValidator, - const wxString& name = wxRadioBoxNameStr) - { - Init(); - - (void)Create(parent, id, title, pos, size, n, choices, majorDim, - style, val, name); - } - - wxRadioBox(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - int majorDim = 0, - long style = wxRA_SPECIFY_COLS, - const wxValidator& val = wxDefaultValidator, - const wxString& name = wxRadioBoxNameStr) - { - Init(); - - (void)Create(parent, id, title, pos, size, choices, majorDim, - style, val, name); - } - - virtual ~wxRadioBox(); - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = NULL, - int majorDim = 0, - long style = wxRA_SPECIFY_COLS, - const wxValidator& val = wxDefaultValidator, - const wxString& name = wxRadioBoxNameStr); - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - int majorDim = 0, - long style = wxRA_SPECIFY_COLS, - const wxValidator& val = wxDefaultValidator, - const wxString& name = wxRadioBoxNameStr); - - // implement the radiobox interface - virtual void SetSelection(int n); - virtual int GetSelection() const { return m_selectedButton; } - virtual unsigned int GetCount() const; - virtual wxString GetString(unsigned int n) const; - virtual void SetString(unsigned int n, const wxString& label); - virtual bool Enable(unsigned int n, bool enable = true); - virtual bool Show(unsigned int n, bool show = true); - virtual bool IsItemEnabled(unsigned int n) const; - virtual bool IsItemShown(unsigned int n) const; - virtual int GetItemFromPoint(const wxPoint& pt) const; - - // override some base class methods - virtual bool Show(bool show = true); - virtual bool Enable(bool enable = true); - virtual bool CanBeFocused() const; - virtual void SetFocus(); - virtual bool SetFont(const wxFont& font); - virtual bool ContainsHWND(WXHWND hWnd) const; - virtual bool SetForegroundColour(const wxColour& colour); - virtual bool SetBackgroundColour(const wxColour& colour); -#if wxUSE_TOOLTIPS - virtual bool HasToolTips() const; -#endif // wxUSE_TOOLTIPS -#if wxUSE_HELP - // override virtual function with a platform-independent implementation - virtual wxString GetHelpTextAtPoint(const wxPoint & pt, wxHelpEvent::Origin origin) const - { - return wxRadioBoxBase::DoGetHelpTextAtPoint( this, pt, origin ); - } -#endif // wxUSE_HELP - - virtual bool Reparent(wxWindowBase *newParent); - - // returns true if the platform should explicitly apply a theme border - virtual bool CanApplyThemeBorder() const { return false; } - - void SetLabelFont(const wxFont& WXUNUSED(font)) {} - void SetButtonFont(const wxFont& font) { SetFont(font); } - - - // implementation only from now on - // ------------------------------- - - // This function can be used to check if the given radio button HWND - // belongs to one of our radio boxes. If it doesn't, NULL is returned. - static wxRadioBox *GetFromRadioButtonHWND(WXHWND hwnd); - - virtual bool MSWCommand(WXUINT param, WXWORD id); - void Command(wxCommandEvent& event); - - void SendNotificationEvent(); - -protected: - // common part of all ctors - void Init(); - - // subclass one radio button - void SubclassRadioButton(WXHWND hWndBtn); - - // get the max size of radio buttons - wxSize GetMaxButtonSize() const; - - // get the total size occupied by the radio box buttons - wxSize GetTotalButtonSize(const wxSize& sizeBtn) const; - - // Adjust all the buttons to the new window size. - void PositionAllButtons(int x, int y, int width, int height); - - virtual void DoSetSize(int x, int y, - int width, int height, - int sizeFlags = wxSIZE_AUTO); - virtual void DoMoveWindow(int x, int y, int width, int height); - virtual wxSize DoGetBestSize() const; - -#if wxUSE_TOOLTIPS - virtual void DoSetItemToolTip(unsigned int n, wxToolTip * tooltip); -#endif - - virtual WXHRGN MSWGetRegionWithoutChildren(); - - // resolve ambiguity in base classes - virtual wxBorder GetDefaultBorder() const { return wxRadioBoxBase::GetDefaultBorder(); } - - // the buttons we contain - wxSubwindows *m_radioButtons; - - // and the special dummy button used only as a tab group boundary - WXHWND m_dummyHwnd; - wxWindowIDRef m_dummyId; - - // array of widths and heights of the buttons, may be wxDefaultCoord if the - // corresponding quantity should be computed - int *m_radioWidth; - int *m_radioHeight; - - // currently selected button or wxNOT_FOUND if none - int m_selectedButton; - -private: - wxDECLARE_DYNAMIC_CLASS(wxRadioBox); - wxDECLARE_NO_COPY_CLASS(wxRadioBox); -}; - -#endif - // _WX_RADIOBOX_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/radiobut.h b/Externals/wxWidgets3/include/wx/msw/radiobut.h deleted file mode 100644 index f5708fb6ad..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/radiobut.h +++ /dev/null @@ -1,81 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/radiobut.h -// Purpose: wxRadioButton class -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_RADIOBUT_H_ -#define _WX_RADIOBUT_H_ - -#include "wx/msw/ownerdrawnbutton.h" - -class WXDLLIMPEXP_CORE wxRadioButton : public wxMSWOwnerDrawnButton -{ -public: - // ctors and creation functions - wxRadioButton() { Init(); } - - wxRadioButton(wxWindow *parent, - wxWindowID id, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxRadioButtonNameStr) - { - Init(); - - Create(parent, id, label, pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxRadioButtonNameStr); - - // implement the radio button interface - virtual void SetValue(bool value); - virtual bool GetValue() const; - - // implementation only from now on - virtual bool MSWCommand(WXUINT param, WXWORD id); - virtual void Command(wxCommandEvent& event); - - virtual bool HasTransparentBackground() { return true; } - - virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; - -protected: - virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } - virtual wxSize DoGetBestSize() const; - - // Implement wxMSWOwnerDrawnButtonBase methods. - virtual int MSWGetButtonStyle() const wxOVERRIDE; - virtual void MSWOnButtonResetOwnerDrawn() wxOVERRIDE; - virtual int MSWGetButtonCheckedFlag() const wxOVERRIDE; - virtual void - MSWDrawButtonBitmap(wxDC& dc, const wxRect& rect, int flags) wxOVERRIDE; - - -private: - // common part of all ctors - void Init(); - - - // we need to store the state internally as the result of GetValue() - // sometimes gets out of sync in WM_COMMAND handler - bool m_isChecked; - - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxRadioButton); -}; - -#endif // _WX_RADIOBUT_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/rcdefs.h b/Externals/wxWidgets3/include/wx/msw/rcdefs.h deleted file mode 100644 index 8b9ac716f9..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/rcdefs.h +++ /dev/null @@ -1,41 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/rcdefs.h -// Purpose: Fallback for the generated rcdefs.h under the lib directory -// Author: Mike Wetherell -// Copyright: (c) 2005 Mike Wetherell -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_RCDEFS_H -#define _WX_RCDEFS_H - -#ifdef __GNUC__ - // We must be using windres which uses gcc as its preprocessor. We do need - // to generate the manifest then as gcc doesn't do it automatically and we - // can define the architecture macro on our own as all the usual symbols - // are available (unlike with Microsoft RC.EXE which doesn't predefine - // anything useful at all). - #ifndef wxUSE_RC_MANIFEST - #define wxUSE_RC_MANIFEST 1 - #endif - - #if defined __i386__ - #ifndef WX_CPU_X86 - #define WX_CPU_X86 - #endif - #elif defined __x86_64__ - #ifndef WX_CPU_AMD64 - #define WX_CPU_AMD64 - #endif - #elif defined __ia64__ - #ifndef WX_CPU_IA64 - #define WX_CPU_IA64 - #endif - #endif -#endif - -// Don't do anything here for the other compilers, in particular don't define -// WX_CPU_X86 here as we used to do. If people define wxUSE_RC_MANIFEST, they -// must also define the architecture constant correctly. - -#endif diff --git a/Externals/wxWidgets3/include/wx/msw/regconf.h b/Externals/wxWidgets3/include/wx/msw/regconf.h deleted file mode 100644 index 312d1ba5f9..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/regconf.h +++ /dev/null @@ -1,114 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/regconf.h -// Purpose: Registry based implementation of wxConfigBase -// Author: Vadim Zeitlin -// Modified by: -// Created: 27.04.98 -// Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_REGCONF_H_ -#define _WX_MSW_REGCONF_H_ - -#include "wx/defs.h" - -#if wxUSE_CONFIG && wxUSE_REGKEY - -#include "wx/msw/registry.h" -#include "wx/object.h" -#include "wx/confbase.h" -#include "wx/buffer.h" - -// ---------------------------------------------------------------------------- -// wxRegConfig -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxRegConfig : public wxConfigBase -{ -public: - // ctor & dtor - // will store data in HKLM\appName and HKCU\appName - wxRegConfig(const wxString& appName = wxEmptyString, - const wxString& vendorName = wxEmptyString, - const wxString& localFilename = wxEmptyString, - const wxString& globalFilename = wxEmptyString, - long style = wxCONFIG_USE_GLOBAL_FILE); - - // dtor will save unsaved data - virtual ~wxRegConfig(){} - - // implement inherited pure virtual functions - // ------------------------------------------ - - // path management - virtual void SetPath(const wxString& strPath); - virtual const wxString& GetPath() const { return m_strPath; } - - // entry/subgroup info - // enumerate all of them - virtual bool GetFirstGroup(wxString& str, long& lIndex) const; - virtual bool GetNextGroup (wxString& str, long& lIndex) const; - virtual bool GetFirstEntry(wxString& str, long& lIndex) const; - virtual bool GetNextEntry (wxString& str, long& lIndex) const; - - // tests for existence - virtual bool HasGroup(const wxString& strName) const; - virtual bool HasEntry(const wxString& strName) const; - virtual EntryType GetEntryType(const wxString& name) const; - - // get number of entries/subgroups in the current group, with or without - // it's subgroups - virtual size_t GetNumberOfEntries(bool bRecursive = false) const; - virtual size_t GetNumberOfGroups(bool bRecursive = false) const; - - virtual bool Flush(bool WXUNUSED(bCurrentOnly) = false) { return true; } - - // rename - virtual bool RenameEntry(const wxString& oldName, const wxString& newName); - virtual bool RenameGroup(const wxString& oldName, const wxString& newName); - - // delete - virtual bool DeleteEntry(const wxString& key, bool bGroupIfEmptyAlso = true); - virtual bool DeleteGroup(const wxString& key); - virtual bool DeleteAll(); - -protected: - // opens the local key creating it if necessary and returns it - wxRegKey& LocalKey() const // must be const to be callable from const funcs - { - wxRegConfig* self = wxConstCast(this, wxRegConfig); - - if ( !m_keyLocal.IsOpened() ) - { - // create on demand - self->m_keyLocal.Create(); - } - - return self->m_keyLocal; - } - - // implement read/write methods - virtual bool DoReadString(const wxString& key, wxString *pStr) const; - virtual bool DoReadLong(const wxString& key, long *plResult) const; - virtual bool DoReadBinary(const wxString& key, wxMemoryBuffer* buf) const; - - virtual bool DoWriteString(const wxString& key, const wxString& szValue); - virtual bool DoWriteLong(const wxString& key, long lValue); - virtual bool DoWriteBinary(const wxString& key, const wxMemoryBuffer& buf); - -private: - // these keys are opened during all lifetime of wxRegConfig object - wxRegKey m_keyLocalRoot, m_keyLocal, - m_keyGlobalRoot, m_keyGlobal; - - // current path (not '/' terminated) - wxString m_strPath; - - wxDECLARE_NO_COPY_CLASS(wxRegConfig); - wxDECLARE_ABSTRACT_CLASS(wxRegConfig); -}; - -#endif // wxUSE_CONFIG && wxUSE_REGKEY - -#endif // _WX_MSW_REGCONF_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/region.h b/Externals/wxWidgets3/include/wx/msw/region.h deleted file mode 100644 index 54b4935b66..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/region.h +++ /dev/null @@ -1,103 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/region.h -// Purpose: wxRegion class -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) 1997-2002 wxWidgets team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_REGION_H_ -#define _WX_MSW_REGION_H_ - -class WXDLLIMPEXP_CORE wxRegion : public wxRegionWithCombine -{ -public: - wxRegion(); - wxRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h); - wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight); - wxRegion(const wxRect& rect); - wxRegion(WXHRGN hRegion); // Hangs on to this region - wxRegion(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle = wxODDEVEN_RULE ); -#if wxUSE_IMAGE - wxRegion( const wxBitmap& bmp) - { - Union(bmp); - } - wxRegion( const wxBitmap& bmp, - const wxColour& transColour, int tolerance = 0) - { - Union(bmp, transColour, tolerance); - } -#endif // wxUSE_IMAGE - - virtual ~wxRegion(); - - // wxRegionBase methods - virtual void Clear(); - virtual bool IsEmpty() const; - - // Get internal region handle - WXHRGN GetHRGN() const; - -protected: - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; - - virtual bool DoIsEqual(const wxRegion& region) const; - virtual bool DoGetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const; - virtual wxRegionContain DoContainsPoint(wxCoord x, wxCoord y) const; - virtual wxRegionContain DoContainsRect(const wxRect& rect) const; - - virtual bool DoOffset(wxCoord x, wxCoord y); - virtual bool DoCombine(const wxRegion& region, wxRegionOp op); - - friend class WXDLLIMPEXP_FWD_CORE wxRegionIterator; - - wxDECLARE_DYNAMIC_CLASS(wxRegion); -}; - -class WXDLLIMPEXP_CORE wxRegionIterator : public wxObject -{ -public: - wxRegionIterator() { Init(); } - wxRegionIterator(const wxRegion& region); - wxRegionIterator(const wxRegionIterator& ri) : wxObject(ri) { Init(); *this = ri; } - - wxRegionIterator& operator=(const wxRegionIterator& ri); - - virtual ~wxRegionIterator(); - - void Reset() { m_current = 0; } - void Reset(const wxRegion& region); - - bool HaveRects() const { return (m_current < m_numRects); } - - operator bool () const { return HaveRects(); } - - wxRegionIterator& operator++(); - wxRegionIterator operator++(int); - - wxCoord GetX() const; - wxCoord GetY() const; - wxCoord GetW() const; - wxCoord GetWidth() const { return GetW(); } - wxCoord GetH() const; - wxCoord GetHeight() const { return GetH(); } - - wxRect GetRect() const { return wxRect(GetX(), GetY(), GetW(), GetH()); } - -private: - // common part of all ctors - void Init(); - - long m_current; - long m_numRects; - wxRegion m_region; - wxRect* m_rects; - - wxDECLARE_DYNAMIC_CLASS(wxRegionIterator); -}; - -#endif // _WX_MSW_REGION_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/registry.h b/Externals/wxWidgets3/include/wx/msw/registry.h deleted file mode 100644 index 2c17d36145..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/registry.h +++ /dev/null @@ -1,275 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/registry.h -// Purpose: Registry classes and functions -// Author: Vadim Zeitlin -// Modified by: -// Created: 03.04.1998 -// Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_REGISTRY_H_ -#define _WX_MSW_REGISTRY_H_ - -#include "wx/defs.h" - -#if wxUSE_REGKEY - -class WXDLLIMPEXP_FWD_BASE wxOutputStream; - -// ---------------------------------------------------------------------------- -// class wxRegKey encapsulates window HKEY handle -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxRegKey -{ -public: - // NB: do _not_ change the values of elements in these enumerations! - - // registry value types (with comments from winnt.h) - enum ValueType - { - Type_None, // No value type - Type_String, // Unicode nul terminated string - Type_Expand_String, // Unicode nul terminated string - // (with environment variable references) - Type_Binary, // Free form binary - Type_Dword, // 32-bit number - Type_Dword_little_endian // 32-bit number - = Type_Dword, // (same as Type_DWORD) - Type_Dword_big_endian, // 32-bit number - Type_Link, // Symbolic Link (unicode) - Type_Multi_String, // Multiple Unicode strings - Type_Resource_list, // Resource list in the resource map - Type_Full_resource_descriptor, // Resource list in the hardware description - Type_Resource_requirements_list // ??? - }; - - // predefined registry keys - enum StdKey - { - HKCR, // classes root - HKCU, // current user - HKLM, // local machine - HKUSR, // users - HKPD, // performance data (WinNT/2K only) - HKCC, // current config - HKDD, // dynamic data (Win95/98 only) - HKMAX - }; - - // access mode for the key - enum AccessMode - { - Read, // read-only - Write // read and write - }; - - // Different registry views supported under WOW64. - enum WOW64ViewMode - { - // 32 bit registry for 32 bit applications, 64 bit registry - // for 64 bit ones. - WOW64ViewMode_Default, - - // Can be used in 64 bit apps to access 32 bit registry, - // has no effect (i.e. treated as default) in 32 bit apps. - WOW64ViewMode_32, - - // Can be used in 32 bit apps to access 64 bit registry, - // has no effect (i.e. treated as default) in 64 bit apps. - WOW64ViewMode_64 - }; - - // information about standard (predefined) registry keys - // number of standard keys - static const size_t nStdKeys; - // get the name of a standard key - static const wxChar *GetStdKeyName(size_t key); - // get the short name of a standard key - static const wxChar *GetStdKeyShortName(size_t key); - // get StdKey from root HKEY - static StdKey GetStdKeyFromHkey(WXHKEY hkey); - - // extracts the std key prefix from the string (return value) and - // leaves only the part after it (i.e. modifies the string passed!) - static StdKey ExtractKeyName(wxString& str); - - // ctors - // root key is set to HKCR (the only root key under Win16) - wxRegKey(WOW64ViewMode viewMode = WOW64ViewMode_Default); - - // strKey is the full name of the key (i.e. starting with HKEY_xxx...) - wxRegKey(const wxString& strKey, - WOW64ViewMode viewMode = WOW64ViewMode_Default); - - // strKey is the name of key under (standard key) keyParent - wxRegKey(StdKey keyParent, - const wxString& strKey, - WOW64ViewMode viewMode = WOW64ViewMode_Default); - - // strKey is the name of key under (previously created) keyParent - wxRegKey(const wxRegKey& keyParent, const wxString& strKey); - // dtor closes the key - ~wxRegKey(); - - // change key (closes the previously opened key if any) - // the name is absolute, i.e. should start with HKEY_xxx - void SetName(const wxString& strKey); - // the name is relative to the parent key - void SetName(StdKey keyParent, const wxString& strKey); - // the name is relative to the parent key - void SetName(const wxRegKey& keyParent, const wxString& strKey); - // hKey should be opened and will be closed in wxRegKey dtor - void SetHkey(WXHKEY hKey); - - // get information about the key - // get the (full) key name. Abbreviate std root keys if bShortPrefix. - wxString GetName(bool bShortPrefix = true) const; - // Retrieves the registry view used by this key. - WOW64ViewMode GetView() const { return m_viewMode; } - // return true if the key exists - bool Exists() const; - // get the info about key (any number of these pointers may be NULL) - bool GetKeyInfo(size_t *pnSubKeys, // number of subkeys - size_t *pnMaxKeyLen, // max length of subkey name - size_t *pnValues, // number of values - size_t *pnMaxValueLen) const; - // return true if the key is opened - bool IsOpened() const { return m_hKey != 0; } - // for "if ( !key ) wxLogError(...)" kind of expressions - operator bool() const { return m_dwLastError == 0; } - - // operations on the key itself - // explicitly open the key (will be automatically done by all functions - // which need the key to be opened if the key is not opened yet) - bool Open(AccessMode mode = Write); - // create the key: will fail if the key already exists and !bOkIfExists - bool Create(bool bOkIfExists = true); - // rename a value from old name to new one - bool RenameValue(const wxString& szValueOld, const wxString& szValueNew); - // rename the key - bool Rename(const wxString& szNewName); - // copy value to another key possibly changing its name (by default it will - // remain the same) - bool CopyValue(const wxString& szValue, wxRegKey& keyDst, - const wxString& szNewName = wxEmptyString); - - // copy the entire contents of the key recursively to another location - bool Copy(const wxString& szNewName); - // same as Copy() but using a key and not the name - bool Copy(wxRegKey& keyDst); - // close the key (will be automatically done in dtor) - bool Close(); - - // deleting keys/values - // deletes this key and all of it's subkeys/values - bool DeleteSelf(); - // deletes the subkey with all of it's subkeys/values recursively - bool DeleteKey(const wxString& szKey); - // deletes the named value (may be empty string to remove the default value) - bool DeleteValue(const wxString& szValue); - - // access to values and subkeys - // get value type - ValueType GetValueType(const wxString& szValue) const; - // returns true if the value contains a number (else it's some string) - bool IsNumericValue(const wxString& szValue) const; - - // assignment operators set the default value of the key - wxRegKey& operator=(const wxString& strValue) - { SetValue(wxEmptyString, strValue); return *this; } - - // query the default value of the key: implicitly or explicitly - wxString QueryDefaultValue() const; - operator wxString() const { return QueryDefaultValue(); } - - // named values - - // set the string value - bool SetValue(const wxString& szValue, const wxString& strValue); - // retrieve the string value - bool QueryValue(const wxString& szValue, wxString& strValue) const - { return QueryValue(szValue, strValue, false); } - // retrieve raw string value - bool QueryRawValue(const wxString& szValue, wxString& strValue) const - { return QueryValue(szValue, strValue, true); } - // retrieve either raw or expanded string value - bool QueryValue(const wxString& szValue, wxString& strValue, bool raw) const; - - // set the numeric value - bool SetValue(const wxString& szValue, long lValue); - // return the numeric value - bool QueryValue(const wxString& szValue, long *plValue) const; - // set the binary value - bool SetValue(const wxString& szValue, const wxMemoryBuffer& buf); - // return the binary value - bool QueryValue(const wxString& szValue, wxMemoryBuffer& buf) const; - - // query existence of a key/value - // return true if value exists - bool HasValue(const wxString& szKey) const; - // return true if given subkey exists - bool HasSubKey(const wxString& szKey) const; - // return true if any subkeys exist - bool HasSubkeys() const; - // return true if any values exist - bool HasValues() const; - // return true if the key is empty (nothing under this key) - bool IsEmpty() const { return !HasSubkeys() && !HasValues(); } - - // enumerate values and subkeys - bool GetFirstValue(wxString& strValueName, long& lIndex); - bool GetNextValue (wxString& strValueName, long& lIndex) const; - - bool GetFirstKey (wxString& strKeyName , long& lIndex); - bool GetNextKey (wxString& strKeyName , long& lIndex) const; - - // export the contents of this key and all its subkeys to the given file - // (which won't be overwritten, it's an error if it already exists) - // - // note that we export the key in REGEDIT4 format, not RegSaveKey() binary - // format nor newer REGEDIT5 one - bool Export(const wxString& filename) const; - - // same as above but write to the given (opened) stream - bool Export(wxOutputStream& ostr) const; - - - // for wxRegConfig usage only: preallocate some memory for the name - void ReserveMemoryForName(size_t bytes) { m_strKey.reserve(bytes); } - -private: - // common part of all ctors - void Init() - { - m_hKey = (WXHKEY) NULL; - m_dwLastError = 0; - } - - // recursive helper for Export() - bool DoExport(wxOutputStream& ostr) const; - - // export a single value - bool DoExportValue(wxOutputStream& ostr, const wxString& name) const; - - // return the text representation (in REGEDIT4 format) of the value with the - // given name - wxString FormatValue(const wxString& name) const; - - - WXHKEY m_hKey, // our handle - m_hRootKey; // handle of the top key (i.e. StdKey) - wxString m_strKey; // key name (relative to m_hRootKey) - WOW64ViewMode m_viewMode; // which view to select under WOW64 - AccessMode m_mode; // valid only if key is opened - long m_dwLastError; // last error (0 if none) - - - wxDECLARE_NO_COPY_CLASS(wxRegKey); -}; - -#endif // wxUSE_REGKEY - -#endif // _WX_MSW_REGISTRY_H_ - diff --git a/Externals/wxWidgets3/include/wx/msw/removble.ico b/Externals/wxWidgets3/include/wx/msw/removble.ico deleted file mode 100644 index f218a894c2..0000000000 Binary files a/Externals/wxWidgets3/include/wx/msw/removble.ico and /dev/null differ diff --git a/Externals/wxWidgets3/include/wx/msw/richmsgdlg.h b/Externals/wxWidgets3/include/wx/msw/richmsgdlg.h deleted file mode 100644 index 51cdc63222..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/richmsgdlg.h +++ /dev/null @@ -1,30 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/richmsgdlg.h -// Purpose: wxRichMessageDialog -// Author: Rickard Westerlund -// Created: 2010-07-04 -// Copyright: (c) 2010 wxWidgets team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_RICHMSGDLG_H_ -#define _WX_MSW_RICHMSGDLG_H_ - -class WXDLLIMPEXP_CORE wxRichMessageDialog : public wxGenericRichMessageDialog -{ -public: - wxRichMessageDialog(wxWindow *parent, - const wxString& message, - const wxString& caption = wxMessageBoxCaptionStr, - long style = wxOK | wxCENTRE) - : wxGenericRichMessageDialog(parent, message, caption, style) - { } - - // overridden base class method showing the native task dialog if possible - virtual int ShowModal(); - -private: - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxRichMessageDialog); -}; - -#endif // _WX_MSW_RICHMSGDLG_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/roller.cur b/Externals/wxWidgets3/include/wx/msw/roller.cur deleted file mode 100644 index 118c37fa43..0000000000 Binary files a/Externals/wxWidgets3/include/wx/msw/roller.cur and /dev/null differ diff --git a/Externals/wxWidgets3/include/wx/msw/rt/private/notifmsg.h b/Externals/wxWidgets3/include/wx/msw/rt/private/notifmsg.h deleted file mode 100644 index 018218e9bb..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/rt/private/notifmsg.h +++ /dev/null @@ -1,26 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/rt/private/notifmsg.h -// Purpose: WinRT implementation of wxNotificationMessageImpl -// Author: Tobias Taschner -// Created: 2015-09-13 -// Copyright: (c) 2015 wxWidgets development team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// -#ifndef _WX_MSW_RT_PRIVATE_NOTIFMSG_H_ -#define _WX_MSW_RT_PRIVATE_NOTIFMSG_H_ - -#include "wx/notifmsg.h" -#include "wx/private/notifmsg.h" - -class wxToastNotificationHelper -{ -public: - static bool UseToasts(const wxString& shortcutPath, - const wxString& appId); - - static bool IsEnabled(); - - static wxNotificationMessageImpl* CreateInstance(wxNotificationMessageBase* notification); -}; - -#endif // _WX_MSW_RT_PRIVATE_NOTIFMSG_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/rt/utils.h b/Externals/wxWidgets3/include/wx/msw/rt/utils.h deleted file mode 100644 index b315531090..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/rt/utils.h +++ /dev/null @@ -1,84 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/rt/utils.h -// Purpose: Windows Runtime Objects helper functions and objects -// Author: Tobias Taschner -// Created: 2015-09-05 -// Copyright: (c) 2015 wxWidgets development team -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_RTUTILS_H -#define _WX_MSW_RTUTILS_H - -#include "wx/defs.h" - -#if wxUSE_WINRT - -#include "wx/string.h" -#include "wx/msw/wrapwin.h" - -#include - -namespace wxWinRT -{ - -bool WXDLLIMPEXP_CORE IsAvailable(); - -bool WXDLLIMPEXP_CORE Initialize(); - -void WXDLLIMPEXP_CORE Uninitialize(); - -bool WXDLLIMPEXP_CORE GetActivationFactory(const wxString& activatableClassId, REFIID iid, void ** factory); - -// RAII class initializing WinRT in its ctor and undoing it in its dtor. -class WXDLLIMPEXP_CORE Initializer -{ -public: - Initializer() - : m_ok(Initialize()) - { - } - - bool IsOk() const - { - return m_ok; - } - - ~Initializer() - { - if (m_ok) - Uninitialize(); - } - -private: - const bool m_ok; - - wxDECLARE_NO_COPY_CLASS(Initializer); -}; - -// Simple class to convert wxString to HSTRING -// This just wraps a reference to the wxString object, -// which needs a life time greater than the TempStringRef object -class WXDLLIMPEXP_CORE TempStringRef -{ -public: - HSTRING Get() const { return m_hstring; } - - operator HSTRING() const { return m_hstring; }; - - static const TempStringRef Make(const wxString &str); - -private: - TempStringRef(const wxString &str); - - HSTRING m_hstring; - HSTRING_HEADER m_header; - - wxDECLARE_NO_COPY_CLASS(TempStringRef); -}; - -} // namespace wxWinRT - -#endif // wxUSE_WINRT - -#endif // _WX_MSW_RTUTILS_H diff --git a/Externals/wxWidgets3/include/wx/msw/scrolbar.h b/Externals/wxWidgets3/include/wx/msw/scrolbar.h deleted file mode 100644 index 1e3023203b..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/scrolbar.h +++ /dev/null @@ -1,74 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/scrolbar.h -// Purpose: wxScrollBar class -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_SCROLBAR_H_ -#define _WX_SCROLBAR_H_ - -// Scrollbar item -class WXDLLIMPEXP_CORE wxScrollBar: public wxScrollBarBase -{ -public: - wxScrollBar() { m_pageSize = 0; m_viewSize = 0; m_objectSize = 0; } - virtual ~wxScrollBar(); - - wxScrollBar(wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSB_HORIZONTAL, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxScrollBarNameStr) - { - Create(parent, id, pos, size, style, validator, name); - } - bool Create(wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSB_HORIZONTAL, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxScrollBarNameStr); - - int GetThumbPosition() const ; - int GetThumbSize() const { return m_pageSize; } - int GetPageSize() const { return m_viewSize; } - int GetRange() const { return m_objectSize; } - - virtual void SetThumbPosition(int viewStart); - virtual void SetScrollbar(int position, int thumbSize, int range, int pageSize, - bool refresh = true); - - // needed for RTTI - void SetThumbSize( int s ) { SetScrollbar( GetThumbPosition() , s , GetRange() , GetPageSize() , true ) ; } - void SetPageSize( int s ) { SetScrollbar( GetThumbPosition() , GetThumbSize() , GetRange() , s , true ) ; } - void SetRange( int s ) { SetScrollbar( GetThumbPosition() , GetThumbSize() , s , GetPageSize() , true ) ; } - - void Command(wxCommandEvent& event); - virtual bool MSWOnScroll(int orientation, WXWORD wParam, - WXWORD pos, WXHWND control); - - // override wxControl version to not use solid background here - virtual WXHBRUSH MSWControlColor(WXHDC pDC, WXHWND hWnd); - - virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; - - // returns true if the platform should explicitly apply a theme border - virtual bool CanApplyThemeBorder() const { return false; } - -protected: - virtual wxSize DoGetBestSize() const; - - int m_pageSize; - int m_viewSize; - int m_objectSize; - - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxScrollBar); -}; - -#endif - // _WX_SCROLBAR_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/seh.h b/Externals/wxWidgets3/include/wx/msw/seh.h deleted file mode 100644 index cf27714f38..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/seh.h +++ /dev/null @@ -1,72 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/seh.h -// Purpose: declarations for SEH (structured exceptions handling) support -// Author: Vadim Zeitlin -// Created: 2006-04-26 -// Copyright: (c) 2006 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_SEH_H_ -#define _WX_MSW_SEH_H_ - -#if wxUSE_ON_FATAL_EXCEPTION - - // the exception handler which should be called from the exception filter - // - // it calls wxApp::OnFatalException() if wxTheApp object exists - WXDLLIMPEXP_BASE unsigned long wxGlobalSEHandler(EXCEPTION_POINTERS *pExcPtrs); - - // helper macro for wxSEH_HANDLE -#if defined(__BORLANDC__) - // some compilers don't understand that this code is unreachable and warn - // about no value being returned from the function without it, so calm them - // down - #define wxSEH_DUMMY_RETURN(rc) return rc; -#else - #define wxSEH_DUMMY_RETURN(rc) -#endif - - // macros which allow to avoid many #if wxUSE_ON_FATAL_EXCEPTION in the code - // which uses them - #define wxSEH_TRY __try - #define wxSEH_IGNORE __except ( EXCEPTION_EXECUTE_HANDLER ) { } - #define wxSEH_HANDLE(rc) \ - __except ( wxGlobalSEHandler(GetExceptionInformation()) ) \ - { \ - /* use the same exit code as abort() */ \ - ::ExitProcess(3); \ - \ - wxSEH_DUMMY_RETURN(rc) \ - } - -#else // wxUSE_ON_FATAL_EXCEPTION - #define wxSEH_TRY - #define wxSEH_IGNORE - #define wxSEH_HANDLE(rc) -#endif // wxUSE_ON_FATAL_EXCEPTION - -#if wxUSE_ON_FATAL_EXCEPTION && defined(__VISUALC__) - #include - - // C++ exception to structured exceptions translator: we need it in order - // to prevent VC++ from "helpfully" translating structured exceptions (such - // as division by 0 or access violation) to C++ pseudo-exceptions - extern void wxSETranslator(unsigned int code, EXCEPTION_POINTERS *ep); - - // up to VC 12 this warning ("calling _set_se_translator() requires /EHa") - // is harmless and it's easier to suppress it than deal with it as make/ - // project file level as it seems to be harmless - #if __VISUALC__ < 1900 - #pragma warning(disable: 4535) - #endif - - // note that the SE translator must be called wxSETranslator! - #define DisableAutomaticSETranslator() _set_se_translator(wxSETranslator) -#else // !__VISUALC__ - // the other compilers do nothing as stupid by default so nothing to do for - // them - #define DisableAutomaticSETranslator() -#endif // __VISUALC__/!__VISUALC__ - -#endif // _WX_MSW_SEH_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/setup0.h b/Externals/wxWidgets3/include/wx/msw/setup0.h deleted file mode 100644 index 8ade54c2e9..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/setup0.h +++ /dev/null @@ -1,1681 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/setup.h -// Purpose: Configuration for the library -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_SETUP_H_ -#define _WX_SETUP_H_ - -/* --- start common options --- */ -// ---------------------------------------------------------------------------- -// global settings -// ---------------------------------------------------------------------------- - -// define this to 0 when building wxBase library - this can also be done from -// makefile/project file overriding the value here -#ifndef wxUSE_GUI - #define wxUSE_GUI 1 -#endif // wxUSE_GUI - -// ---------------------------------------------------------------------------- -// compatibility settings -// ---------------------------------------------------------------------------- - -// This setting determines the compatibility with 2.8 API: set it to 0 to -// flag all cases of using deprecated functions. -// -// Default is 1 but please try building your code with 0 as the default will -// change to 0 in the next version and the deprecated functions will disappear -// in the version after it completely. -// -// Recommended setting: 0 (please update your code) -#define WXWIN_COMPATIBILITY_2_8 0 - -// This setting determines the compatibility with 3.0 API: set it to 0 to -// flag all cases of using deprecated functions. -// -// Default is 1 but please try building your code with 0 as the default will -// change to 0 in the next version and the deprecated functions will disappear -// in the version after it completely. -// -// Recommended setting: 0 (please update your code) -#define WXWIN_COMPATIBILITY_3_0 1 - -// MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when -// default system font is used for wxWindow::GetCharWidth/Height() instead of -// the current font. -// -// Default is 0 -// -// Recommended setting: 0 -#define wxDIALOG_UNIT_COMPATIBILITY 0 - -// ---------------------------------------------------------------------------- -// debugging settings -// ---------------------------------------------------------------------------- - -// wxDEBUG_LEVEL will be defined as 1 in wx/debug.h so normally there is no -// need to define it here. You may do it for two reasons: either completely -// disable/compile out the asserts in release version (then do it inside #ifdef -// NDEBUG) or, on the contrary, enable more asserts, including the usually -// disabled ones, in the debug build (then do it inside #ifndef NDEBUG) -// -// #ifdef NDEBUG -// #define wxDEBUG_LEVEL 0 -// #else -// #define wxDEBUG_LEVEL 2 -// #endif - -// wxHandleFatalExceptions() may be used to catch the program faults at run -// time and, instead of terminating the program with a usual GPF message box, -// call the user-defined wxApp::OnFatalException() function. If you set -// wxUSE_ON_FATAL_EXCEPTION to 0, wxHandleFatalExceptions() will not work. -// -// This setting is for Win32 only and can only be enabled if your compiler -// supports Win32 structured exception handling (currently only VC++ does) -// -// Default is 1 -// -// Recommended setting: 1 if your compiler supports it. -#define wxUSE_ON_FATAL_EXCEPTION 1 - -// Set this to 1 to be able to generate a human-readable (unlike -// machine-readable minidump created by wxCrashReport::Generate()) stack back -// trace when your program crashes using wxStackWalker -// -// Default is 1 if supported by the compiler. -// -// Recommended setting: 1, set to 0 if your programs never crash -#define wxUSE_STACKWALKER 1 - -// Set this to 1 to compile in wxDebugReport class which allows you to create -// and optionally upload to your web site a debug report consisting of back -// trace of the crash (if wxUSE_STACKWALKER == 1) and other information. -// -// Default is 1 if supported by the compiler. -// -// Recommended setting: 1, it is compiled into a separate library so there -// is no overhead if you don't use it -#define wxUSE_DEBUGREPORT 1 - -// Generic comment about debugging settings: they are very useful if you don't -// use any other memory leak detection tools such as Purify/BoundsChecker, but -// are probably redundant otherwise. Also, Visual C++ CRT has the same features -// as wxWidgets memory debugging subsystem built in since version 5.0 and you -// may prefer to use it instead of built in memory debugging code because it is -// faster and more fool proof. -// -// Using VC++ CRT memory debugging is enabled by default in debug build (_DEBUG -// is defined) if wxUSE_GLOBAL_MEMORY_OPERATORS is *not* enabled (i.e. is 0) -// and if __NO_VC_CRTDBG__ is not defined. - -// The rest of the options in this section are obsolete and not supported, -// enable them at your own risk. - -// If 1, enables wxDebugContext, for writing error messages to file, etc. If -// __WXDEBUG__ is not defined, will still use the normal memory operators. -// -// Default is 0 -// -// Recommended setting: 0 -#define wxUSE_DEBUG_CONTEXT 0 - -// If 1, enables debugging versions of wxObject::new and wxObject::delete *IF* -// __WXDEBUG__ is also defined. -// -// WARNING: this code may not work with all architectures, especially if -// alignment is an issue. This switch is currently ignored for mingw / cygwin -// -// Default is 0 -// -// Recommended setting: 1 if you are not using a memory debugging tool, else 0 -#define wxUSE_MEMORY_TRACING 0 - -// In debug mode, cause new and delete to be redefined globally. -// If this causes problems (e.g. link errors which is a common problem -// especially if you use another library which also redefines the global new -// and delete), set this to 0. -// This switch is currently ignored for mingw / cygwin -// -// Default is 0 -// -// Recommended setting: 0 -#define wxUSE_GLOBAL_MEMORY_OPERATORS 0 - -// In debug mode, causes new to be defined to be WXDEBUG_NEW (see object.h). If -// this causes problems (e.g. link errors), set this to 0. You may need to set -// this to 0 if using templates (at least for VC++). This switch is currently -// ignored for MinGW/Cygwin. -// -// Default is 0 -// -// Recommended setting: 0 -#define wxUSE_DEBUG_NEW_ALWAYS 0 - - -// ---------------------------------------------------------------------------- -// Unicode support -// ---------------------------------------------------------------------------- - -// These settings are obsolete: the library is always built in Unicode mode -// now, only set wxUSE_UNICODE to 0 to compile legacy code in ANSI mode if -// absolutely necessary -- updating it is strongly recommended as the ANSI mode -// will disappear completely in future wxWidgets releases. -#ifndef wxUSE_UNICODE - #define wxUSE_UNICODE 1 -#endif - -// wxUSE_WCHAR_T is required by wxWidgets now, don't change. -#define wxUSE_WCHAR_T 1 - -// ---------------------------------------------------------------------------- -// global features -// ---------------------------------------------------------------------------- - -// Compile library in exception-safe mode? If set to 1, the library will try to -// behave correctly in presence of exceptions (even though it still will not -// use the exceptions itself) and notify the user code about any unhandled -// exceptions. If set to 0, propagation of the exceptions through the library -// code will lead to undefined behaviour -- but the code itself will be -// slightly smaller and faster. -// -// Note that like wxUSE_THREADS this option is automatically set to 0 if -// wxNO_EXCEPTIONS is defined. -// -// Default is 1 -// -// Recommended setting: depends on whether you intend to use C++ exceptions -// in your own code (1 if you do, 0 if you don't) -#define wxUSE_EXCEPTIONS 1 - -// Set wxUSE_EXTENDED_RTTI to 1 to use extended RTTI -// -// Default is 0 -// -// Recommended setting: 0 (this is still work in progress...) -#define wxUSE_EXTENDED_RTTI 0 - -// Support for message/error logging. This includes wxLogXXX() functions and -// wxLog and derived classes. Don't set this to 0 unless you really know what -// you are doing. -// -// Default is 1 -// -// Recommended setting: 1 (always) -#define wxUSE_LOG 1 - -// Recommended setting: 1 -#define wxUSE_LOGWINDOW 1 - -// Recommended setting: 1 -#define wxUSE_LOGGUI 1 - -// Recommended setting: 1 -#define wxUSE_LOG_DIALOG 1 - -// Support for command line parsing using wxCmdLineParser class. -// -// Default is 1 -// -// Recommended setting: 1 (can be set to 0 if you don't use the cmd line) -#define wxUSE_CMDLINE_PARSER 1 - -// Support for multithreaded applications: if 1, compile in thread classes -// (thread.h) and make the library a bit more thread safe. Although thread -// support is quite stable by now, you may still consider recompiling the -// library without it if you have no use for it - this will result in a -// somewhat smaller and faster operation. -// -// Notice that if wxNO_THREADS is defined, wxUSE_THREADS is automatically reset -// to 0 in wx/chkconf.h, so, for example, if you set USE_THREADS to 0 in -// build/msw/config.* file this value will have no effect. -// -// Default is 1 -// -// Recommended setting: 0 unless you do plan to develop MT applications -#define wxUSE_THREADS 1 - -// If enabled, compiles wxWidgets streams classes -// -// wx stream classes are used for image IO, process IO redirection, network -// protocols implementation and much more and so disabling this results in a -// lot of other functionality being lost. -// -// Default is 1 -// -// Recommended setting: 1 as setting it to 0 disables many other things -#define wxUSE_STREAMS 1 - -// Support for positional parameters (e.g. %1$d, %2$s ...) in wxVsnprintf. -// Note that if the system's implementation does not support positional -// parameters, setting this to 1 forces the use of the wxWidgets implementation -// of wxVsnprintf. The standard vsnprintf() supports positional parameters on -// many Unix systems but usually doesn't under Windows. -// -// Positional parameters are very useful when translating a program since using -// them in formatting strings allow translators to correctly reorder the -// translated sentences. -// -// Default is 1 -// -// Recommended setting: 1 if you want to support multiple languages -#define wxUSE_PRINTF_POS_PARAMS 1 - -// Enable the use of compiler-specific thread local storage keyword, if any. -// This is used for wxTLS_XXX() macros implementation and normally should use -// the compiler-provided support as it's simpler and more efficient, but is -// disabled under Windows in wx/msw/chkconf.h as it can't be used if wxWidgets -// is used in a dynamically loaded Win32 DLL (i.e. using LoadLibrary()) under -// XP as this triggers a bug in compiler TLS support that results in crashes -// when any TLS variables are used. -// -// If you're absolutely sure that your build of wxWidgets is never going to be -// used in such situation, either because it's not going to be linked from any -// kind of plugin or because you only target Vista or later systems, you can -// set this to 2 to force the use of compiler TLS even under MSW. -// -// Default is 1 meaning that compiler TLS is used only if it's 100% safe. -// -// Recommended setting: 2 if you want to have maximal performance and don't -// care about the scenario described above. -#define wxUSE_COMPILER_TLS 1 - -// ---------------------------------------------------------------------------- -// Interoperability with the standard library. -// ---------------------------------------------------------------------------- - -// Set wxUSE_STL to 1 to enable maximal interoperability with the standard -// library, even at the cost of backwards compatibility. -// -// Default is 0 -// -// Recommended setting: 0 as the options below already provide a relatively -// good level of interoperability and changing this option arguably isn't worth -// diverging from the official builds of the library. -#define wxUSE_STL 0 - -// This is not a real option but is used as the default value for -// wxUSE_STD_IOSTREAM, wxUSE_STD_STRING and wxUSE_STD_CONTAINERS_COMPATIBLY. -// -// Set it to 0 if you want to disable the use of all standard classes -// completely for some reason. -#define wxUSE_STD_DEFAULT 1 - -// Use standard C++ containers where it can be done without breaking backwards -// compatibility. -// -// This provides better interoperability with the standard library, e.g. with -// this option on it's possible to insert std::vector<> into many wxWidgets -// containers directly. -// -// Default is 1. -// -// Recommended setting is 1 unless you want to avoid all dependencies on the -// standard library. -#define wxUSE_STD_CONTAINERS_COMPATIBLY wxUSE_STD_DEFAULT - -// Use standard C++ containers to implement wxVector<>, wxStack<>, wxDList<> -// and wxHashXXX<> classes. If disabled, wxWidgets own (mostly compatible but -// usually more limited) implementations are used which allows to avoid the -// dependency on the C++ run-time library. -// -// Default is 0 for compatibility reasons. -// -// Recommended setting: 1 unless compatibility with the official wxWidgets -// build and/or the existing code is a concern. -#define wxUSE_STD_CONTAINERS 0 - -// Use standard C++ streams if 1 instead of wx streams in some places. If -// disabled, wx streams are used everywhere and wxWidgets doesn't depend on the -// standard streams library. -// -// Notice that enabling this does not replace wx streams with std streams -// everywhere, in a lot of places wx streams are used no matter what. -// -// Default is 1 if compiler supports it. -// -// Recommended setting: 1 if you use the standard streams anyhow and so -// dependency on the standard streams library is not a -// problem -#define wxUSE_STD_IOSTREAM wxUSE_STD_DEFAULT - -// Enable minimal interoperability with the standard C++ string class if 1. -// "Minimal" means that wxString can be constructed from std::string or -// std::wstring but can't be implicitly converted to them. You need to enable -// the option below for the latter. -// -// Default is 1 for most compilers. -// -// Recommended setting: 1 unless you want to ensure your program doesn't use -// the standard C++ library at all. -#define wxUSE_STD_STRING wxUSE_STD_DEFAULT - -// Make wxString as much interchangeable with std::[w]string as possible, in -// particular allow implicit conversion of wxString to either of these classes. -// This comes at a price (or a benefit, depending on your point of view) of not -// allowing implicit conversion to "const char *" and "const wchar_t *". -// -// Because a lot of existing code relies on these conversions, this option is -// disabled by default but can be enabled for your build if you don't care -// about compatibility. -// -// Default is 0 if wxUSE_STL has its default value or 1 if it is enabled. -// -// Recommended setting: 0 to remain compatible with the official builds of -// wxWidgets. -#define wxUSE_STD_STRING_CONV_IN_WXSTRING wxUSE_STL - -// VC++ 4.2 and above allows and but you can't mix -// them. Set this option to 1 to use , 0 to use . -// -// Note that newer compilers (including VC++ 7.1 and later) don't support -// wxUSE_IOSTREAMH == 1 and so will be used anyhow. -// -// Default is 0. -// -// Recommended setting: 0, only set to 1 if you use a really old compiler -#define wxUSE_IOSTREAMH 0 - - -// ---------------------------------------------------------------------------- -// non GUI features selection -// ---------------------------------------------------------------------------- - -// Set wxUSE_LONGLONG to 1 to compile the wxLongLong class. This is a 64 bit -// integer which is implemented in terms of native 64 bit integers if any or -// uses emulation otherwise. -// -// This class is required by wxDateTime and so you should enable it if you want -// to use wxDateTime. For most modern platforms, it will use the native 64 bit -// integers in which case (almost) all of its functions are inline and it -// almost does not take any space, so there should be no reason to switch it -// off. -// -// Recommended setting: 1 -#define wxUSE_LONGLONG 1 - -// Set wxUSE_BASE64 to 1, to compile in Base64 support. This is required for -// storing binary data in wxConfig on most platforms. -// -// Default is 1. -// -// Recommended setting: 1 (but can be safely disabled if you don't use it) -#define wxUSE_BASE64 1 - -// Set this to 1 to be able to use wxEventLoop even in console applications -// (i.e. using base library only, without GUI). This is mostly useful for -// processing socket events but is also necessary to use timers in console -// applications -// -// Default is 1. -// -// Recommended setting: 1 (but can be safely disabled if you don't use it) -#define wxUSE_CONSOLE_EVENTLOOP 1 - -// Set wxUSE_(F)FILE to 1 to compile wx(F)File classes. wxFile uses low level -// POSIX functions for file access, wxFFile uses ANSI C stdio.h functions. -// -// Default is 1 -// -// Recommended setting: 1 (wxFile is highly recommended as it is required by -// i18n code, wxFileConfig and others) -#define wxUSE_FILE 1 -#define wxUSE_FFILE 1 - -// Use wxFSVolume class providing access to the configured/active mount points -// -// Default is 1 -// -// Recommended setting: 1 (but may be safely disabled if you don't use it) -#define wxUSE_FSVOLUME 1 - -// Use wxStandardPaths class which allows to retrieve some standard locations -// in the file system -// -// Default is 1 -// -// Recommended setting: 1 (may be disabled to save space, but not much) -#define wxUSE_STDPATHS 1 - -// use wxTextBuffer class: required by wxTextFile -#define wxUSE_TEXTBUFFER 1 - -// use wxTextFile class: requires wxFile and wxTextBuffer, required by -// wxFileConfig -#define wxUSE_TEXTFILE 1 - -// i18n support: _() macro, wxLocale class. Requires wxTextFile. -#define wxUSE_INTL 1 - -// Provide wxFoo_l() functions similar to standard foo() functions but taking -// an extra locale parameter. -// -// Notice that this is fully implemented only for the systems providing POSIX -// xlocale support or Microsoft Visual C++ >= 8 (which provides proprietary -// almost-equivalent of xlocale functions), otherwise wxFoo_l() functions will -// only work for the current user locale and "C" locale. You can use -// wxHAS_XLOCALE_SUPPORT to test whether the full support is available. -// -// Default is 1 -// -// Recommended setting: 1 but may be disabled if you are writing programs -// running only in C locale anyhow -#define wxUSE_XLOCALE 1 - -// Set wxUSE_DATETIME to 1 to compile the wxDateTime and related classes which -// allow to manipulate dates, times and time intervals. -// -// Requires: wxUSE_LONGLONG -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_DATETIME 1 - -// Set wxUSE_TIMER to 1 to compile wxTimer class -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_TIMER 1 - -// Use wxStopWatch clas. -// -// Default is 1 -// -// Recommended setting: 1 (needed by wxSocket) -#define wxUSE_STOPWATCH 1 - -// Set wxUSE_FSWATCHER to 1 if you want to enable wxFileSystemWatcher -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_FSWATCHER 1 - -// Setting wxUSE_CONFIG to 1 enables the use of wxConfig and related classes -// which allow the application to store its settings in the persistent -// storage. Setting this to 1 will also enable on-demand creation of the -// global config object in wxApp. -// -// See also wxUSE_CONFIG_NATIVE below. -// -// Recommended setting: 1 -#define wxUSE_CONFIG 1 - -// If wxUSE_CONFIG is 1, you may choose to use either the native config -// classes under Windows (using .INI files under Win16 and the registry under -// Win32) or the portable text file format used by the config classes under -// Unix. -// -// Default is 1 to use native classes. Note that you may still use -// wxFileConfig even if you set this to 1 - just the config object created by -// default for the applications needs will be a wxRegConfig or wxIniConfig and -// not wxFileConfig. -// -// Recommended setting: 1 -#define wxUSE_CONFIG_NATIVE 1 - -// If wxUSE_DIALUP_MANAGER is 1, compile in wxDialUpManager class which allows -// to connect/disconnect from the network and be notified whenever the dial-up -// network connection is established/terminated. Requires wxUSE_DYNAMIC_LOADER. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_DIALUP_MANAGER 1 - -// Compile in classes for run-time DLL loading and function calling. -// Required by wxUSE_DIALUP_MANAGER. -// -// This setting is for Win32 only -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_DYNLIB_CLASS 1 - -// experimental, don't use for now -#define wxUSE_DYNAMIC_LOADER 1 - -// Set to 1 to use socket classes -#define wxUSE_SOCKETS 1 - -// Set to 1 to use ipv6 socket classes (requires wxUSE_SOCKETS) -// -// Notice that currently setting this option under Windows will result in -// programs which can only run on recent OS versions (with ws2_32.dll -// installed) which is why it is disabled by default. -// -// Default is 1. -// -// Recommended setting: 1 if you need IPv6 support -#define wxUSE_IPV6 0 - -// Set to 1 to enable virtual file systems (required by wxHTML) -#define wxUSE_FILESYSTEM 1 - -// Set to 1 to enable virtual ZIP filesystem (requires wxUSE_FILESYSTEM) -#define wxUSE_FS_ZIP 1 - -// Set to 1 to enable virtual archive filesystem (requires wxUSE_FILESYSTEM) -#define wxUSE_FS_ARCHIVE 1 - -// Set to 1 to enable virtual Internet filesystem (requires wxUSE_FILESYSTEM) -#define wxUSE_FS_INET 1 - -// wxArchive classes for accessing archives such as zip and tar -#define wxUSE_ARCHIVE_STREAMS 1 - -// Set to 1 to compile wxZipInput/OutputStream classes. -#define wxUSE_ZIPSTREAM 1 - -// Set to 1 to compile wxTarInput/OutputStream classes. -#define wxUSE_TARSTREAM 1 - -// Set to 1 to compile wxZlibInput/OutputStream classes. Also required by -// wxUSE_LIBPNG -#define wxUSE_ZLIB 1 - -// If enabled, the code written by Apple will be used to write, in a portable -// way, float on the disk. See extended.c for the license which is different -// from wxWidgets one. -// -// Default is 1. -// -// Recommended setting: 1 unless you don't like the license terms (unlikely) -#define wxUSE_APPLE_IEEE 1 - -// Joystick support class -#define wxUSE_JOYSTICK 1 - -// wxFontEnumerator class -#define wxUSE_FONTENUM 1 - -// wxFontMapper class -#define wxUSE_FONTMAP 1 - -// wxMimeTypesManager class -#define wxUSE_MIMETYPE 1 - -// wxProtocol and related classes: if you want to use either of wxFTP, wxHTTP -// or wxURL you need to set this to 1. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_PROTOCOL 1 - -// The settings for the individual URL schemes -#define wxUSE_PROTOCOL_FILE 1 -#define wxUSE_PROTOCOL_FTP 1 -#define wxUSE_PROTOCOL_HTTP 1 - -// Define this to use wxURL class. -#define wxUSE_URL 1 - -// Define this to use native platform url and protocol support. -// Currently valid only for MS-Windows. -// Note: if you set this to 1, you can open ftp/http/gopher sites -// and obtain a valid input stream for these sites -// even when you set wxUSE_PROTOCOL_FTP/HTTP to 0. -// Doing so reduces the code size. -// -// This code is experimental and subject to change. -#define wxUSE_URL_NATIVE 0 - -// Support for wxVariant class used in several places throughout the library, -// notably in wxDataViewCtrl API. -// -// Default is 1. -// -// Recommended setting: 1 unless you want to reduce the library size as much as -// possible in which case setting this to 0 can gain up to 100KB. -#define wxUSE_VARIANT 1 - -// Support for wxAny class, the successor for wxVariant. -// -// Default is 1. -// -// Recommended setting: 1 unless you want to reduce the library size by a small amount, -// or your compiler cannot for some reason cope with complexity of templates used. -#define wxUSE_ANY 1 - -// Support for regular expression matching via wxRegEx class: enable this to -// use POSIX regular expressions in your code. You need to compile regex -// library from src/regex to use it under Windows. -// -// Default is 0 -// -// Recommended setting: 1 if your compiler supports it, if it doesn't please -// contribute us a makefile for src/regex for it -#define wxUSE_REGEX 1 - -// wxSystemOptions class -#define wxUSE_SYSTEM_OPTIONS 1 - -// wxSound class -#define wxUSE_SOUND 1 - -// Use wxMediaCtrl -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_MEDIACTRL 1 - -// Use wxWidget's XRC XML-based resource system. Recommended. -// -// Default is 1 -// -// Recommended setting: 1 (requires wxUSE_XML) -#define wxUSE_XRC 1 - -// XML parsing classes. Note that their API will change in the future, so -// using wxXmlDocument and wxXmlNode in your app is not recommended. -// -// Default is the same as wxUSE_XRC, i.e. 1 by default. -// -// Recommended setting: 1 (required by XRC) -#define wxUSE_XML wxUSE_XRC - -// Use wxWidget's AUI docking system -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_AUI 1 - -// Use wxWidget's Ribbon classes for interfaces -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_RIBBON 1 - -// Use wxPropertyGrid. -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_PROPGRID 1 - -// Use wxStyledTextCtrl, a wxWidgets implementation of Scintilla. -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_STC 1 - -// Use wxWidget's web viewing classes -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_WEBVIEW 1 - -// Use the IE wxWebView backend -// -// Default is 1 on MSW -// -// Recommended setting: 1 -#ifdef __WXMSW__ -#define wxUSE_WEBVIEW_IE 1 -#else -#define wxUSE_WEBVIEW_IE 0 -#endif - -// Use the WebKit wxWebView backend -// -// Default is 1 on GTK and OSX -// -// Recommended setting: 1 -#if defined(__WXGTK__) || defined(__WXOSX__) -#define wxUSE_WEBVIEW_WEBKIT 1 -#else -#define wxUSE_WEBVIEW_WEBKIT 0 -#endif - -// Enable wxGraphicsContext and related classes for a modern 2D drawing API. -// -// Default is 1 except if you're using a non-Microsoft compiler under Windows -// as only MSVC is known to ship with at least gdiplus.h which is required to -// compile GDI+-based implementation of wxGraphicsContext (MSVC10 and later -// versions also include d2d1.h required for Direct2D-based implementation). -// For other compilers (e.g. mingw32) you may need to install the headers (and -// just the headers) yourself. If you do, change the setting below manually. -// -// Recommended setting: 1 if supported by the compilation environment - -// notice that we can't use wxCHECK_VISUALC_VERSION() here as this file is -// included from wx/platform.h before wxCHECK_VISUALC_VERSION() is defined -#ifdef _MSC_VER -# define wxUSE_GRAPHICS_CONTEXT 1 -#else - // Disable support for other Windows compilers, enable it if your compiler - // comes with new enough SDK or you installed the headers manually. - // - // Notice that this will be set by configure under non-Windows platforms - // anyhow so the value there is not important. -# define wxUSE_GRAPHICS_CONTEXT 0 -#endif - -// Enable wxGraphicsContext implementation using Cairo library. -// -// This is not needed under Windows and detected automatically by configure -// under other systems, however you may set this to 1 manually if you installed -// Cairo under Windows yourself and prefer to use it instead the native GDI+ -// implementation. -// -// Default is 0 -// -// Recommended setting: 0 -#define wxUSE_CAIRO 0 - - -// ---------------------------------------------------------------------------- -// Individual GUI controls -// ---------------------------------------------------------------------------- - -// You must set wxUSE_CONTROLS to 1 if you are using any controls at all -// (without it, wxControl class is not compiled) -// -// Default is 1 -// -// Recommended setting: 1 (don't change except for very special programs) -#define wxUSE_CONTROLS 1 - -// Support markup in control labels, i.e. provide wxControl::SetLabelMarkup(). -// Currently markup is supported only by a few controls and only some ports but -// their number will increase with time. -// -// Default is 1 -// -// Recommended setting: 1 (may be set to 0 if you want to save on code size) -#define wxUSE_MARKUP 1 - -// wxPopupWindow class is a top level transient window. It is currently used -// to implement wxTipWindow -// -// Default is 1 -// -// Recommended setting: 1 (may be set to 0 if you don't wxUSE_TIPWINDOW) -#define wxUSE_POPUPWIN 1 - -// wxTipWindow allows to implement the custom tooltips, it is used by the -// context help classes. Requires wxUSE_POPUPWIN. -// -// Default is 1 -// -// Recommended setting: 1 (may be set to 0) -#define wxUSE_TIPWINDOW 1 - -// Each of the settings below corresponds to one wxWidgets control. They are -// all switched on by default but may be disabled if you are sure that your -// program (including any standard dialogs it can show!) doesn't need them and -// if you desperately want to save some space. If you use any of these you must -// set wxUSE_CONTROLS as well. -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_ACTIVITYINDICATOR 1 // wxActivityIndicator -#define wxUSE_ANIMATIONCTRL 1 // wxAnimationCtrl -#define wxUSE_BANNERWINDOW 1 // wxBannerWindow -#define wxUSE_BUTTON 1 // wxButton -#define wxUSE_BMPBUTTON 1 // wxBitmapButton -#define wxUSE_CALENDARCTRL 1 // wxCalendarCtrl -#define wxUSE_CHECKBOX 1 // wxCheckBox -#define wxUSE_CHECKLISTBOX 1 // wxCheckListBox (requires wxUSE_OWNER_DRAWN) -#define wxUSE_CHOICE 1 // wxChoice -#define wxUSE_COLLPANE 1 // wxCollapsiblePane -#define wxUSE_COLOURPICKERCTRL 1 // wxColourPickerCtrl -#define wxUSE_COMBOBOX 1 // wxComboBox -#define wxUSE_COMMANDLINKBUTTON 1 // wxCommandLinkButton -#define wxUSE_DATAVIEWCTRL 1 // wxDataViewCtrl -#define wxUSE_DATEPICKCTRL 1 // wxDatePickerCtrl -#define wxUSE_DIRPICKERCTRL 1 // wxDirPickerCtrl -#define wxUSE_EDITABLELISTBOX 1 // wxEditableListBox -#define wxUSE_FILECTRL 1 // wxFileCtrl -#define wxUSE_FILEPICKERCTRL 1 // wxFilePickerCtrl -#define wxUSE_FONTPICKERCTRL 1 // wxFontPickerCtrl -#define wxUSE_GAUGE 1 // wxGauge -#define wxUSE_HEADERCTRL 1 // wxHeaderCtrl -#define wxUSE_HYPERLINKCTRL 1 // wxHyperlinkCtrl -#define wxUSE_LISTBOX 1 // wxListBox -#define wxUSE_LISTCTRL 1 // wxListCtrl -#define wxUSE_RADIOBOX 1 // wxRadioBox -#define wxUSE_RADIOBTN 1 // wxRadioButton -#define wxUSE_RICHMSGDLG 1 // wxRichMessageDialog -#define wxUSE_SCROLLBAR 1 // wxScrollBar -#define wxUSE_SEARCHCTRL 1 // wxSearchCtrl -#define wxUSE_SLIDER 1 // wxSlider -#define wxUSE_SPINBTN 1 // wxSpinButton -#define wxUSE_SPINCTRL 1 // wxSpinCtrl -#define wxUSE_STATBOX 1 // wxStaticBox -#define wxUSE_STATLINE 1 // wxStaticLine -#define wxUSE_STATTEXT 1 // wxStaticText -#define wxUSE_STATBMP 1 // wxStaticBitmap -#define wxUSE_TEXTCTRL 1 // wxTextCtrl -#define wxUSE_TIMEPICKCTRL 1 // wxTimePickerCtrl -#define wxUSE_TOGGLEBTN 1 // requires wxButton -#define wxUSE_TREECTRL 1 // wxTreeCtrl -#define wxUSE_TREELISTCTRL 1 // wxTreeListCtrl - -// Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR -// below either wxStatusBar95 or a generic wxStatusBar will be used. -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_STATUSBAR 1 - -// Two status bar implementations are available under Win32: the generic one -// or the wrapper around native control. For native look and feel the native -// version should be used. -// -// Default is 1 for the platforms where native status bar is supported. -// -// Recommended setting: 1 (there is no advantage in using the generic one) -#define wxUSE_NATIVE_STATUSBAR 1 - -// wxToolBar related settings: if wxUSE_TOOLBAR is 0, don't compile any toolbar -// classes at all. Otherwise, use the native toolbar class unless -// wxUSE_TOOLBAR_NATIVE is 0. -// -// Default is 1 for all settings. -// -// Recommended setting: 1 for wxUSE_TOOLBAR and wxUSE_TOOLBAR_NATIVE. -#define wxUSE_TOOLBAR 1 -#define wxUSE_TOOLBAR_NATIVE 1 - -// wxNotebook is a control with several "tabs" located on one of its sides. It -// may be used to logically organise the data presented to the user instead of -// putting everything in one huge dialog. It replaces wxTabControl and related -// classes of wxWin 1.6x. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_NOTEBOOK 1 - -// wxListbook control is similar to wxNotebook but uses wxListCtrl instead of -// the tabs -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_LISTBOOK 1 - -// wxChoicebook control is similar to wxNotebook but uses wxChoice instead of -// the tabs -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_CHOICEBOOK 1 - -// wxTreebook control is similar to wxNotebook but uses wxTreeCtrl instead of -// the tabs -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_TREEBOOK 1 - -// wxToolbook control is similar to wxNotebook but uses wxToolBar instead of -// tabs -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_TOOLBOOK 1 - -// wxTaskBarIcon is a small notification icon shown in the system toolbar or -// dock. -// -// Default is 1. -// -// Recommended setting: 1 (but can be set to 0 if you don't need it) -#define wxUSE_TASKBARICON 1 - -// wxGrid class -// -// Default is 1, set to 0 to cut down compilation time and binaries size if you -// don't use it. -// -// Recommended setting: 1 -// -#define wxUSE_GRID 1 - -// wxMiniFrame class: a frame with narrow title bar -// -// Default is 1. -// -// Recommended setting: 1 (it doesn't cost almost anything) -#define wxUSE_MINIFRAME 1 - -// wxComboCtrl and related classes: combobox with custom popup window and -// not necessarily a listbox. -// -// Default is 1. -// -// Recommended setting: 1 but can be safely set to 0 except for wxUniv where it -// it used by wxComboBox -#define wxUSE_COMBOCTRL 1 - -// wxOwnerDrawnComboBox is a custom combobox allowing to paint the combobox -// items. -// -// Default is 1. -// -// Recommended setting: 1 but can be safely set to 0, except where it is -// needed as a base class for generic wxBitmapComboBox. -#define wxUSE_ODCOMBOBOX 1 - -// wxBitmapComboBox is a combobox that can have images in front of text items. -// -// Default is 1. -// -// Recommended setting: 1 but can be safely set to 0 -#define wxUSE_BITMAPCOMBOBOX 1 - -// wxRearrangeCtrl is a wxCheckListBox with two buttons allowing to move items -// up and down in it. It is also used as part of wxRearrangeDialog. -// -// Default is 1. -// -// Recommended setting: 1 but can be safely set to 0 (currently used only by -// wxHeaderCtrl) -#define wxUSE_REARRANGECTRL 1 - -// wxAddRemoveCtrl is a composite control containing a control showing some -// items (e.g. wxListBox, wxListCtrl, wxTreeCtrl, wxDataViewCtrl, ...) and "+"/ -// "-" buttons allowing to add and remove items to/from the control. -// -// Default is 1. -// -// Recommended setting: 1 but can be safely set to 0 if you don't need it (not -// used by the library itself). -#define wxUSE_ADDREMOVECTRL 1 - -// ---------------------------------------------------------------------------- -// Miscellaneous GUI stuff -// ---------------------------------------------------------------------------- - -// wxAcceleratorTable/Entry classes and support for them in wxMenu(Bar) -#define wxUSE_ACCEL 1 - -// Use the standard art provider. The icons returned by this provider are -// embedded into the library as XPMs so disabling it reduces the library size -// somewhat but this should only be done if you use your own custom art -// provider returning the icons or never use any icons not provided by the -// native art provider (which might not be implemented at all for some -// platforms) or by the Tango icons provider (if it's not itself disabled -// below). -// -// Default is 1. -// -// Recommended setting: 1 unless you use your own custom art provider. -#define wxUSE_ARTPROVIDER_STD 1 - -// Use art provider providing Tango icons: this art provider has higher quality -// icons than the default ones using smaller size XPM icons without -// transparency but the embedded PNG icons add to the library size. -// -// Default is 1 under non-GTK ports. Under wxGTK the native art provider using -// the GTK+ stock icons replaces it so it is normally not necessary. -// -// Recommended setting: 1 but can be turned off to reduce the library size. -#define wxUSE_ARTPROVIDER_TANGO 1 - -// Hotkey support (currently Windows only) -#define wxUSE_HOTKEY 1 - -// Use wxCaret: a class implementing a "cursor" in a text control (called caret -// under Windows). -// -// Default is 1. -// -// Recommended setting: 1 (can be safely set to 0, not used by the library) -#define wxUSE_CARET 1 - -// Use wxDisplay class: it allows enumerating all displays on a system and -// their geometries as well as finding the display on which the given point or -// window lies. -// -// Default is 1. -// -// Recommended setting: 1 if you need it, can be safely set to 0 otherwise -#define wxUSE_DISPLAY 1 - -// Miscellaneous geometry code: needed for Canvas library -#define wxUSE_GEOMETRY 1 - -// Use wxImageList. This class is needed by wxNotebook, wxTreeCtrl and -// wxListCtrl. -// -// Default is 1. -// -// Recommended setting: 1 (set it to 0 if you don't use any of the controls -// enumerated above, then this class is mostly useless too) -#define wxUSE_IMAGLIST 1 - -// Use wxInfoBar class. -// -// Default is 1. -// -// Recommended setting: 1 (but can be disabled without problems as nothing -// depends on it) -#define wxUSE_INFOBAR 1 - -// Use wxMenu, wxMenuBar, wxMenuItem. -// -// Default is 1. -// -// Recommended setting: 1 (can't be disabled under MSW) -#define wxUSE_MENUS 1 - -// Use wxNotificationMessage. -// -// wxNotificationMessage allows to show non-intrusive messages to the user -// using balloons, banners, popups or whatever is the appropriate method for -// the current platform. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_NOTIFICATION_MESSAGE 1 - -// wxPreferencesEditor provides a common API for different ways of presenting -// the standard "Preferences" or "Properties" dialog under different platforms -// (e.g. some use modal dialogs, some use modeless ones; some apply the changes -// immediately while others require an explicit "Apply" button). -// -// Default is 1. -// -// Recommended setting: 1 (but can be safely disabled if you don't use it) -#define wxUSE_PREFERENCES_EDITOR 1 - -// wxRichToolTip is a customizable tooltip class which has more functionality -// than the stock (but native, unlike this class) wxToolTip. -// -// Default is 1. -// -// Recommended setting: 1 (but can be safely set to 0 if you don't need it) -#define wxUSE_RICHTOOLTIP 1 - -// Use wxSashWindow class. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_SASH 1 - -// Use wxSplitterWindow class. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_SPLITTER 1 - -// Use wxToolTip and wxWindow::Set/GetToolTip() methods. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_TOOLTIPS 1 - -// wxValidator class and related methods -#define wxUSE_VALIDATORS 1 - -// Use reference counted ID management: this means that wxWidgets will track -// the automatically allocated ids (those used when you use wxID_ANY when -// creating a window, menu or toolbar item &c) instead of just supposing that -// the program never runs out of them. This is mostly useful only under wxMSW -// where the total ids range is limited to SHRT_MIN..SHRT_MAX and where -// long-running programs can run into problems with ids reuse without this. On -// the other platforms, where the ids have the full int range, this shouldn't -// be necessary. -#ifdef __WXMSW__ -#define wxUSE_AUTOID_MANAGEMENT 1 -#else -#define wxUSE_AUTOID_MANAGEMENT 0 -#endif - -// ---------------------------------------------------------------------------- -// common dialogs -// ---------------------------------------------------------------------------- - -// On rare occasions (e.g. using DJGPP) may want to omit common dialogs (e.g. -// file selector, printer dialog). Switching this off also switches off the -// printing architecture and interactive wxPrinterDC. -// -// Default is 1 -// -// Recommended setting: 1 (unless it really doesn't work) -#define wxUSE_COMMON_DIALOGS 1 - -// wxBusyInfo displays window with message when app is busy. Works in same way -// as wxBusyCursor -#define wxUSE_BUSYINFO 1 - -// Use single/multiple choice dialogs. -// -// Default is 1 -// -// Recommended setting: 1 (used in the library itself) -#define wxUSE_CHOICEDLG 1 - -// Use colour picker dialog -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_COLOURDLG 1 - -// wxDirDlg class for getting a directory name from user -#define wxUSE_DIRDLG 1 - -// TODO: setting to choose the generic or native one - -// Use file open/save dialogs. -// -// Default is 1 -// -// Recommended setting: 1 (used in many places in the library itself) -#define wxUSE_FILEDLG 1 - -// Use find/replace dialogs. -// -// Default is 1 -// -// Recommended setting: 1 (but may be safely set to 0) -#define wxUSE_FINDREPLDLG 1 - -// Use font picker dialog -// -// Default is 1 -// -// Recommended setting: 1 (used in the library itself) -#define wxUSE_FONTDLG 1 - -// Use wxMessageDialog and wxMessageBox. -// -// Default is 1 -// -// Recommended setting: 1 (used in the library itself) -#define wxUSE_MSGDLG 1 - -// progress dialog class for lengthy operations -#define wxUSE_PROGRESSDLG 1 - -// Set to 0 to disable the use of the native progress dialog (currently only -// available under MSW and suffering from some bugs there, hence this option). -#define wxUSE_NATIVE_PROGRESSDLG 1 - -// support for startup tips (wxShowTip &c) -#define wxUSE_STARTUP_TIPS 1 - -// text entry dialog and wxGetTextFromUser function -#define wxUSE_TEXTDLG 1 - -// number entry dialog -#define wxUSE_NUMBERDLG 1 - -// splash screen class -#define wxUSE_SPLASH 1 - -// wizards -#define wxUSE_WIZARDDLG 1 - -// Compile in wxAboutBox() function showing the standard "About" dialog. -// -// Default is 1 -// -// Recommended setting: 1 but can be set to 0 to save some space if you don't -// use this function -#define wxUSE_ABOUTDLG 1 - -// wxFileHistory class -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_FILE_HISTORY 1 - -// ---------------------------------------------------------------------------- -// Metafiles support -// ---------------------------------------------------------------------------- - -// Windows supports the graphics format known as metafile which is, though not -// portable, is widely used under Windows and so is supported by wxWin (under -// Windows only, of course). Win16 (Win3.1) used the so-called "Window -// MetaFiles" or WMFs which were replaced with "Enhanced MetaFiles" or EMFs in -// Win32 (Win9x, NT, 2000). Both of these are supported in wxWin and, by -// default, WMFs will be used under Win16 and EMFs under Win32. This may be -// changed by setting wxUSE_WIN_METAFILES_ALWAYS to 1 and/or setting -// wxUSE_ENH_METAFILE to 0. You may also set wxUSE_METAFILE to 0 to not compile -// in any metafile related classes at all. -// -// Default is 1 for wxUSE_ENH_METAFILE and 0 for wxUSE_WIN_METAFILES_ALWAYS. -// -// Recommended setting: default or 0 for everything for portable programs. -#define wxUSE_METAFILE 1 -#define wxUSE_ENH_METAFILE 1 -#define wxUSE_WIN_METAFILES_ALWAYS 0 - -// ---------------------------------------------------------------------------- -// Big GUI components -// ---------------------------------------------------------------------------- - -// Set to 0 to disable MDI support. -// -// Requires wxUSE_NOTEBOOK under platforms other than MSW. -// -// Default is 1. -// -// Recommended setting: 1, can be safely set to 0. -#define wxUSE_MDI 1 - -// Set to 0 to disable document/view architecture -#define wxUSE_DOC_VIEW_ARCHITECTURE 1 - -// Set to 0 to disable MDI document/view architecture -// -// Requires wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE -#define wxUSE_MDI_ARCHITECTURE 1 - -// Set to 0 to disable print/preview architecture code -#define wxUSE_PRINTING_ARCHITECTURE 1 - -// wxHTML sublibrary allows to display HTML in wxWindow programs and much, -// much more. -// -// Default is 1. -// -// Recommended setting: 1 (wxHTML is great!), set to 0 if you want compile a -// smaller library. -#define wxUSE_HTML 1 - -// Setting wxUSE_GLCANVAS to 1 enables OpenGL support. You need to have OpenGL -// headers and libraries to be able to compile the library with wxUSE_GLCANVAS -// set to 1 and, under Windows, also to add opengl32.lib and glu32.lib to the -// list of libraries used to link your application (although this is done -// implicitly for Microsoft Visual C++ users). -// -// Default is 1. -// -// Recommended setting: 1 if you intend to use OpenGL, can be safely set to 0 -// otherwise. -#define wxUSE_GLCANVAS 1 - -// wxRichTextCtrl allows editing of styled text. -// -// Default is 1. -// -// Recommended setting: 1, set to 0 if you want compile a -// smaller library. -#define wxUSE_RICHTEXT 1 - -// ---------------------------------------------------------------------------- -// Data transfer -// ---------------------------------------------------------------------------- - -// Use wxClipboard class for clipboard copy/paste. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_CLIPBOARD 1 - -// Use wxDataObject and related classes. Needed for clipboard and OLE drag and -// drop -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_DATAOBJ 1 - -// Use wxDropTarget and wxDropSource classes for drag and drop (this is -// different from "built in" drag and drop in wxTreeCtrl which is always -// available). Requires wxUSE_DATAOBJ. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_DRAG_AND_DROP 1 - -// Use wxAccessible for enhanced and customisable accessibility. -// Depends on wxUSE_OLE. -// -// Default is 0. -// -// Recommended setting (at present): 0 -#define wxUSE_ACCESSIBILITY 0 - -// ---------------------------------------------------------------------------- -// miscellaneous settings -// ---------------------------------------------------------------------------- - -// wxSingleInstanceChecker class allows to verify at startup if another program -// instance is running. -// -// Default is 1 -// -// Recommended setting: 1 (the class is tiny, disabling it won't save much -// space) -#define wxUSE_SNGLINST_CHECKER 1 - -#define wxUSE_DRAGIMAGE 1 - -#define wxUSE_IPC 1 - // 0 for no interprocess comms -#define wxUSE_HELP 1 - // 0 for no help facility - -// Should we use MS HTML help for wxHelpController? If disabled, neither -// wxCHMHelpController nor wxBestHelpController are available. -// -// Default is 1 under MSW, 0 is always used for the other platforms. -// -// Recommended setting: 1, only set to 0 if you have trouble compiling -// wxCHMHelpController (could be a problem with really ancient compilers) -#define wxUSE_MS_HTML_HELP 1 - - -// Use wxHTML-based help controller? -#define wxUSE_WXHTML_HELP 1 - -#define wxUSE_CONSTRAINTS 1 - // 0 for no window layout constraint system - -#define wxUSE_SPLINES 1 - // 0 for no splines - -#define wxUSE_MOUSEWHEEL 1 - // Include mouse wheel support - -// Compile wxUIActionSimulator class? -#define wxUSE_UIACTIONSIMULATOR 1 - -// ---------------------------------------------------------------------------- -// wxDC classes for various output formats -// ---------------------------------------------------------------------------- - -// Set to 1 for PostScript device context. -#define wxUSE_POSTSCRIPT 0 - -// Set to 1 to use font metric files in GetTextExtent -#define wxUSE_AFM_FOR_POSTSCRIPT 1 - -// Set to 1 to compile in support for wxSVGFileDC, a wxDC subclass which allows -// to create files in SVG (Scalable Vector Graphics) format. -#define wxUSE_SVG 1 - -// Should wxDC provide SetTransformMatrix() and related methods? -// -// Default is 1 but can be set to 0 if this functionality is not used. Notice -// that currently only wxMSW supports this so setting this to 0 doesn't change -// much for non-MSW platforms (although it will still save a few bytes -// probably). -// -// Recommended setting: 1. -#define wxUSE_DC_TRANSFORM_MATRIX 1 - -// ---------------------------------------------------------------------------- -// image format support -// ---------------------------------------------------------------------------- - -// wxImage supports many different image formats which can be configured at -// compile-time. BMP is always supported, others are optional and can be safely -// disabled if you don't plan to use images in such format sometimes saving -// substantial amount of code in the final library. -// -// Some formats require an extra library which is included in wxWin sources -// which is mentioned if it is the case. - -// Set to 1 for wxImage support (recommended). -#define wxUSE_IMAGE 1 - -// Set to 1 for PNG format support (requires libpng). Also requires wxUSE_ZLIB. -#define wxUSE_LIBPNG 1 - -// Set to 1 for JPEG format support (requires libjpeg) -#define wxUSE_LIBJPEG 1 - -// Set to 1 for TIFF format support (requires libtiff) -#define wxUSE_LIBTIFF 1 - -// Set to 1 for TGA format support (loading only) -#define wxUSE_TGA 1 - -// Set to 1 for GIF format support -#define wxUSE_GIF 1 - -// Set to 1 for PNM format support -#define wxUSE_PNM 1 - -// Set to 1 for PCX format support -#define wxUSE_PCX 1 - -// Set to 1 for IFF format support (Amiga format) -#define wxUSE_IFF 0 - -// Set to 1 for XPM format support -#define wxUSE_XPM 1 - -// Set to 1 for MS Icons and Cursors format support -#define wxUSE_ICO_CUR 1 - -// Set to 1 to compile in wxPalette class -#define wxUSE_PALETTE 1 - -// ---------------------------------------------------------------------------- -// wxUniversal-only options -// ---------------------------------------------------------------------------- - -// Set to 1 to enable compilation of all themes, this is the default -#define wxUSE_ALL_THEMES 1 - -// Set to 1 to enable the compilation of individual theme if wxUSE_ALL_THEMES -// is unset, if it is set these options are not used; notice that metal theme -// uses Win32 one -#define wxUSE_THEME_GTK 0 -#define wxUSE_THEME_METAL 0 -#define wxUSE_THEME_MONO 0 -#define wxUSE_THEME_WIN32 0 - - -/* --- end common options --- */ - -/* --- start MSW options --- */ -// ---------------------------------------------------------------------------- -// Graphics backends choices for Windows -// ---------------------------------------------------------------------------- - -// The options here are only taken into account if wxUSE_GRAPHICS_CONTEXT is 1. - -// Enable support for GDI+-based implementation of wxGraphicsContext. -// -// Default is 1. -// -// Recommended setting: 1 if you need to support XP, as Direct2D is not -// available there. -#define wxUSE_GRAPHICS_GDIPLUS wxUSE_GRAPHICS_CONTEXT - -// Enable support for Direct2D-based implementation of wxGraphicsContext. -// -// Default is 1 for compilers which support it, i.e. VC10+ currently. If you -// use an earlier MSVC version or another compiler and installed the necessary -// SDK components manually, you need to change this setting. -// -// Recommended setting: 1 for faster and better quality graphics under Windows -// 7 and later systems (if wxUSE_GRAPHICS_GDIPLUS is also enabled, earlier -// systems will fall back on using GDI+). -#if defined(_MSC_VER) && _MSC_VER >= 1600 - #define wxUSE_GRAPHICS_DIRECT2D wxUSE_GRAPHICS_CONTEXT -#else - #define wxUSE_GRAPHICS_DIRECT2D 0 -#endif - -// ---------------------------------------------------------------------------- -// Windows-only settings -// ---------------------------------------------------------------------------- - -// Set this to 1 for generic OLE support: this is required for drag-and-drop, -// clipboard, OLE Automation. Only set it to 0 if your compiler is very old and -// can't compile/doesn't have the OLE headers. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_OLE 1 - -// Set this to 1 to enable wxAutomationObject class. -// -// Default is 1. -// -// Recommended setting: 1 if you need to control other applications via OLE -// Automation, can be safely set to 0 otherwise -#define wxUSE_OLE_AUTOMATION 1 - -// Set this to 1 to enable wxActiveXContainer class allowing to embed OLE -// controls in wx. -// -// Default is 1. -// -// Recommended setting: 1, required by wxMediaCtrl -#define wxUSE_ACTIVEX 1 - -// Enable WinRT support -// -// Default is 1 for compilers which support it, i.e. VS2012+ currently. If you -// use an earlier MSVC version or another compiler and installed the necessary -// SDK components manually, you need to change this setting. -// -// Recommended setting: 1 -#if defined(_MSC_VER) && _MSC_VER >= 1700 && !defined(_USING_V110_SDK71_) - #define wxUSE_WINRT 1 -#else - #define wxUSE_WINRT 0 -#endif - -// wxDC caching implementation -#define wxUSE_DC_CACHEING 1 - -// Set this to 1 to enable wxDIB class used internally for manipulating -// wxBitmap data. -// -// Default is 1, set it to 0 only if you don't use wxImage neither -// -// Recommended setting: 1 (without it conversion to/from wxImage won't work) -#define wxUSE_WXDIB 1 - -// Set to 0 to disable PostScript print/preview architecture code under Windows -// (just use Windows printing). -#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1 - -// Set this to 1 to compile in wxRegKey class. -// -// Default is 1 -// -// Recommended setting: 1, this is used internally by wx in a few places -#define wxUSE_REGKEY 1 - -// Set this to 1 to use RICHEDIT controls for wxTextCtrl with style wxTE_RICH -// which allows to put more than ~32Kb of text in it even under Win9x (NT -// doesn't have such limitation). -// -// Default is 1 for compilers which support it -// -// Recommended setting: 1, only set it to 0 if your compiler doesn't have -// or can't compile -#define wxUSE_RICHEDIT 1 - -// Set this to 1 to use extra features of richedit v2 and later controls -// -// Default is 1 for compilers which support it -// -// Recommended setting: 1 -#define wxUSE_RICHEDIT2 1 - -// Set this to 1 to enable support for the owner-drawn menu and listboxes. This -// is required by wxUSE_CHECKLISTBOX. -// -// Default is 1. -// -// Recommended setting: 1, set to 0 for a small library size reduction -#define wxUSE_OWNER_DRAWN 1 - -// Set this to 1 to enable MSW-specific wxTaskBarIcon::ShowBalloon() method. It -// is required by native wxNotificationMessage implementation. -// -// Default is 1 but disabled in wx/msw/chkconf.h if SDK is too old to contain -// the necessary declarations. -// -// Recommended setting: 1, set to 0 for a tiny library size reduction -#define wxUSE_TASKBARICON_BALLOONS 1 - -// Set this to 1 to enable following functionality added in Windows 7: thumbnail -// representations, thumbnail toolbars, notification and status overlays, -// progress indicators and jump lists. -// -// Default is 1. -// -// Recommended setting: 1, set to 0 for a tiny library size reduction -#define wxUSE_TASKBARBUTTON 1 - -// Set to 1 to compile MS Windows XP theme engine support -#define wxUSE_UXTHEME 1 - -// Set to 1 to use InkEdit control (Tablet PC), if available -#define wxUSE_INKEDIT 0 - -// Set to 1 to enable .INI files based wxConfig implementation (wxIniConfig) -// -// Default is 0. -// -// Recommended setting: 0, nobody uses .INI files any more -#define wxUSE_INICONF 0 - -// ---------------------------------------------------------------------------- -// Generic versions of native controls -// ---------------------------------------------------------------------------- - -// Set this to 1 to be able to use wxDatePickerCtrlGeneric in addition to the -// native wxDatePickerCtrl -// -// Default is 0. -// -// Recommended setting: 0, this is mainly used for testing -#define wxUSE_DATEPICKCTRL_GENERIC 0 - -// Set this to 1 to be able to use wxTimePickerCtrlGeneric in addition to the -// native wxTimePickerCtrl for the platforms that have the latter (MSW). -// -// Default is 0. -// -// Recommended setting: 0, this is mainly used for testing -#define wxUSE_TIMEPICKCTRL_GENERIC 0 - -// ---------------------------------------------------------------------------- -// Crash debugging helpers -// ---------------------------------------------------------------------------- - -// Set this to 1 to be able to use wxCrashReport::Generate() to create mini -// dumps of your program when it crashes (or at any other moment) -// -// Default is 1 if supported by the compiler (VC++ and recent BC++ only). -// -// Recommended setting: 1, set to 0 if your programs never crash -#define wxUSE_CRASHREPORT 1 -/* --- end MSW options --- */ - -#endif // _WX_SETUP_H_ - diff --git a/Externals/wxWidgets3/include/wx/msw/setup_inc.h b/Externals/wxWidgets3/include/wx/msw/setup_inc.h deleted file mode 100644 index eb01cbd540..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/setup_inc.h +++ /dev/null @@ -1,189 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/setup_inc.h -// Purpose: MSW-specific setup.h options -// Author: Vadim Zeitlin -// Created: 2007-07-21 (extracted from wx/msw/setup0.h) -// Copyright: (c) 2007 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ---------------------------------------------------------------------------- -// Graphics backends choices for Windows -// ---------------------------------------------------------------------------- - -// The options here are only taken into account if wxUSE_GRAPHICS_CONTEXT is 1. - -// Enable support for GDI+-based implementation of wxGraphicsContext. -// -// Default is 1. -// -// Recommended setting: 1 if you need to support XP, as Direct2D is not -// available there. -#define wxUSE_GRAPHICS_GDIPLUS wxUSE_GRAPHICS_CONTEXT - -// Enable support for Direct2D-based implementation of wxGraphicsContext. -// -// Default is 1 for compilers which support it, i.e. VC10+ currently. If you -// use an earlier MSVC version or another compiler and installed the necessary -// SDK components manually, you need to change this setting. -// -// Recommended setting: 1 for faster and better quality graphics under Windows -// 7 and later systems (if wxUSE_GRAPHICS_GDIPLUS is also enabled, earlier -// systems will fall back on using GDI+). -#if defined(_MSC_VER) && _MSC_VER >= 1600 - #define wxUSE_GRAPHICS_DIRECT2D wxUSE_GRAPHICS_CONTEXT -#else - #define wxUSE_GRAPHICS_DIRECT2D 0 -#endif - -// ---------------------------------------------------------------------------- -// Windows-only settings -// ---------------------------------------------------------------------------- - -// Set this to 1 for generic OLE support: this is required for drag-and-drop, -// clipboard, OLE Automation. Only set it to 0 if your compiler is very old and -// can't compile/doesn't have the OLE headers. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_OLE 1 - -// Set this to 1 to enable wxAutomationObject class. -// -// Default is 1. -// -// Recommended setting: 1 if you need to control other applications via OLE -// Automation, can be safely set to 0 otherwise -#define wxUSE_OLE_AUTOMATION 1 - -// Set this to 1 to enable wxActiveXContainer class allowing to embed OLE -// controls in wx. -// -// Default is 1. -// -// Recommended setting: 1, required by wxMediaCtrl -#define wxUSE_ACTIVEX 1 - -// Enable WinRT support -// -// Default is 1 for compilers which support it, i.e. VS2012+ currently. If you -// use an earlier MSVC version or another compiler and installed the necessary -// SDK components manually, you need to change this setting. -// -// Recommended setting: 1 -#if defined(_MSC_VER) && _MSC_VER >= 1700 - #define wxUSE_WINRT 1 -#else - #define wxUSE_WINRT 0 -#endif - -// wxDC caching implementation -#define wxUSE_DC_CACHEING 1 - -// Set this to 1 to enable wxDIB class used internally for manipulating -// wxBitmap data. -// -// Default is 1, set it to 0 only if you don't use wxImage neither -// -// Recommended setting: 1 (without it conversion to/from wxImage won't work) -#define wxUSE_WXDIB 1 - -// Set to 0 to disable PostScript print/preview architecture code under Windows -// (just use Windows printing). -#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1 - -// Set this to 1 to compile in wxRegKey class. -// -// Default is 1 -// -// Recommended setting: 1, this is used internally by wx in a few places -#define wxUSE_REGKEY 1 - -// Set this to 1 to use RICHEDIT controls for wxTextCtrl with style wxTE_RICH -// which allows to put more than ~32Kb of text in it even under Win9x (NT -// doesn't have such limitation). -// -// Default is 1 for compilers which support it -// -// Recommended setting: 1, only set it to 0 if your compiler doesn't have -// or can't compile -#define wxUSE_RICHEDIT 1 - -// Set this to 1 to use extra features of richedit v2 and later controls -// -// Default is 1 for compilers which support it -// -// Recommended setting: 1 -#define wxUSE_RICHEDIT2 1 - -// Set this to 1 to enable support for the owner-drawn menu and listboxes. This -// is required by wxUSE_CHECKLISTBOX. -// -// Default is 1. -// -// Recommended setting: 1, set to 0 for a small library size reduction -#define wxUSE_OWNER_DRAWN 1 - -// Set this to 1 to enable MSW-specific wxTaskBarIcon::ShowBalloon() method. It -// is required by native wxNotificationMessage implementation. -// -// Default is 1 but disabled in wx/msw/chkconf.h if SDK is too old to contain -// the necessary declarations. -// -// Recommended setting: 1, set to 0 for a tiny library size reduction -#define wxUSE_TASKBARICON_BALLOONS 1 - -// Set this to 1 to enable following functionality added in Windows 7: thumbnail -// representations, thumbnail toolbars, notification and status overlays, -// progress indicators and jump lists. -// -// Default is 1. -// -// Recommended setting: 1, set to 0 for a tiny library size reduction -#define wxUSE_TASKBARBUTTON 1 - -// Set to 1 to compile MS Windows XP theme engine support -#define wxUSE_UXTHEME 1 - -// Set to 1 to use InkEdit control (Tablet PC), if available -#define wxUSE_INKEDIT 0 - -// Set to 1 to enable .INI files based wxConfig implementation (wxIniConfig) -// -// Default is 0. -// -// Recommended setting: 0, nobody uses .INI files any more -#define wxUSE_INICONF 0 - -// ---------------------------------------------------------------------------- -// Generic versions of native controls -// ---------------------------------------------------------------------------- - -// Set this to 1 to be able to use wxDatePickerCtrlGeneric in addition to the -// native wxDatePickerCtrl -// -// Default is 0. -// -// Recommended setting: 0, this is mainly used for testing -#define wxUSE_DATEPICKCTRL_GENERIC 0 - -// Set this to 1 to be able to use wxTimePickerCtrlGeneric in addition to the -// native wxTimePickerCtrl for the platforms that have the latter (MSW). -// -// Default is 0. -// -// Recommended setting: 0, this is mainly used for testing -#define wxUSE_TIMEPICKCTRL_GENERIC 0 - -// ---------------------------------------------------------------------------- -// Crash debugging helpers -// ---------------------------------------------------------------------------- - -// Set this to 1 to be able to use wxCrashReport::Generate() to create mini -// dumps of your program when it crashes (or at any other moment) -// -// Default is 1 if supported by the compiler (VC++ and recent BC++ only). -// -// Recommended setting: 1, set to 0 if your programs never crash -#define wxUSE_CRASHREPORT 1 diff --git a/Externals/wxWidgets3/include/wx/msw/slider.h b/Externals/wxWidgets3/include/wx/msw/slider.h deleted file mode 100644 index 7579e834f1..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/slider.h +++ /dev/null @@ -1,149 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/slider.h -// Purpose: wxSlider class implementation using trackbar control -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_SLIDER_H_ -#define _WX_SLIDER_H_ - -class WXDLLIMPEXP_FWD_CORE wxSubwindows; - -// Slider -class WXDLLIMPEXP_CORE wxSlider : public wxSliderBase -{ -public: - wxSlider() { Init(); } - - wxSlider(wxWindow *parent, - wxWindowID id, - int value, - int minValue, - int maxValue, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSL_HORIZONTAL, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxSliderNameStr) - { - Init(); - - (void)Create(parent, id, value, minValue, maxValue, - pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - int value, - int minValue, int maxValue, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSL_HORIZONTAL, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxSliderNameStr); - - virtual ~wxSlider(); - - // slider methods - virtual int GetValue() const; - virtual void SetValue(int); - - void SetRange(int minValue, int maxValue); - - int GetMin() const { return m_rangeMin; } - int GetMax() const { return m_rangeMax; } - - // Win32-specific slider methods - int GetTickFreq() const { return m_tickFreq; } - void SetPageSize(int pageSize); - int GetPageSize() const; - void ClearSel(); - void ClearTicks(); - void SetLineSize(int lineSize); - int GetLineSize() const; - int GetSelEnd() const; - int GetSelStart() const; - void SetSelection(int minPos, int maxPos); - void SetThumbLength(int len); - int GetThumbLength() const; - void SetTick(int tickPos); - - // implementation only from now on - WXHWND GetStaticMin() const; - WXHWND GetStaticMax() const; - WXHWND GetEditValue() const; - virtual bool ContainsHWND(WXHWND hWnd) const; - - // we should let background show through the slider (and its labels) - virtual bool HasTransparentBackground() { return true; } - - // returns true if the platform should explicitly apply a theme border - virtual bool CanApplyThemeBorder() const { return false; } - - void Command(wxCommandEvent& event); - virtual bool MSWOnScroll(int orientation, WXWORD wParam, - WXWORD pos, WXHWND control); - - virtual bool Show(bool show = true); - virtual bool Enable(bool show = true); - virtual bool SetFont(const wxFont& font); - virtual bool SetForegroundColour(const wxColour& colour); - virtual bool SetBackgroundColour(const wxColour& colour); - - virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const; - -protected: - // common part of all ctors - void Init(); - - // format an integer value as string - static wxString Format(int n) { return wxString::Format(wxT("%d"), n); } - - // get the boundig box for the slider and possible labels - wxRect GetBoundingBox() const; - - // Get the height and, if the pointers are non NULL, widths of both labels. - // - // Notice that the return value will be 0 if we don't have wxSL_LABELS - // style but we do fill widthMin and widthMax even if we don't have - // wxSL_MIN_MAX_LABELS style set so the caller should account for it. - int GetLabelsSize(int *widthMin = NULL, int *widthMax = NULL) const; - - - // overridden base class virtuals - virtual void DoGetPosition(int *x, int *y) const; - virtual void DoGetSize(int *width, int *height) const; - virtual void DoMoveWindow(int x, int y, int width, int height); - virtual wxSize DoGetBestSize() const; - - WXHBRUSH DoMSWControlColor(WXHDC pDC, wxColour colBg, WXHWND hWnd) wxOVERRIDE; - - - // the labels windows, if any - wxSubwindows *m_labels; - - // Last background brush we returned from DoMSWControlColor(), see there. - WXHBRUSH m_hBrushBg; - - int m_rangeMin; - int m_rangeMax; - int m_pageSize; - int m_lineSize; - int m_tickFreq; - - // flag needed to detect whether we're getting THUMBRELEASE event because - // of dragging the thumb or scrolling the mouse wheel - bool m_isDragging; - - // Platform-specific implementation of SetTickFreq - virtual void DoSetTickFreq(int freq); - - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxSlider); -}; - -#endif // _WX_SLIDER_H_ - diff --git a/Externals/wxWidgets3/include/wx/msw/sound.h b/Externals/wxWidgets3/include/wx/msw/sound.h deleted file mode 100644 index 9e7cc49698..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/sound.h +++ /dev/null @@ -1,51 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/sound.h -// Purpose: wxSound class -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_SOUND_H_ -#define _WX_SOUND_H_ - -#if wxUSE_SOUND - -class WXDLLIMPEXP_ADV wxSound : public wxSoundBase -{ -public: - wxSound(); - wxSound(const wxString& fileName, bool isResource = false); - wxSound(size_t size, const void* data); - virtual ~wxSound(); - - // Create from resource or file - bool Create(const wxString& fileName, bool isResource = false); - - // Create from data - bool Create(size_t size, const void* data); - - bool IsOk() const { return m_data != NULL; } - - static void Stop(); - -protected: - void Init() { m_data = NULL; } - bool CheckCreatedOk(); - void Free(); - - virtual bool DoPlay(unsigned flags) const; - -private: - // data of this object - class wxSoundData *m_data; - - wxDECLARE_NO_COPY_CLASS(wxSound); -}; - -#endif // wxUSE_SOUND - -#endif // _WX_SOUND_H_ - diff --git a/Externals/wxWidgets3/include/wx/msw/spinbutt.h b/Externals/wxWidgets3/include/wx/msw/spinbutt.h deleted file mode 100644 index 051cadf428..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/spinbutt.h +++ /dev/null @@ -1,74 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/spinbutt.h -// Purpose: wxSpinButton class -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_SPINBUTT_H_ -#define _WX_SPINBUTT_H_ - -#include "wx/control.h" -#include "wx/event.h" - -#if wxUSE_SPINBTN - -class WXDLLIMPEXP_CORE wxSpinButton : public wxSpinButtonBase -{ -public: - // construction - wxSpinButton() { } - - wxSpinButton(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSP_VERTICAL | wxSP_ARROW_KEYS, - const wxString& name = wxSPIN_BUTTON_NAME) - { - Create(parent, id, pos, size, style, name); - } - - virtual ~wxSpinButton(); - - bool Create(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSP_VERTICAL | wxSP_ARROW_KEYS, - const wxString& name = wxSPIN_BUTTON_NAME); - - - // accessors - virtual int GetValue() const; - virtual void SetValue(int val); - virtual void SetRange(int minVal, int maxVal); - - // implementation - virtual bool MSWCommand(WXUINT param, WXWORD id); - virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); - virtual bool MSWOnScroll(int orientation, WXWORD wParam, - WXWORD pos, WXHWND control); - - // a wxSpinButton can't do anything useful with focus, only wxSpinCtrl can - virtual bool AcceptsFocus() const { return false; } - - // returns true if the platform should explicitly apply a theme border - virtual bool CanApplyThemeBorder() const { return false; } - -protected: - virtual wxSize DoGetBestSize() const; - - // ensure that the control displays a value in the current range - virtual void NormalizeValue(); - -private: - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxSpinButton); -}; - -#endif // wxUSE_SPINBTN - -#endif // _WX_SPINBUTT_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/spinctrl.h b/Externals/wxWidgets3/include/wx/msw/spinctrl.h deleted file mode 100644 index 28c16f5437..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/spinctrl.h +++ /dev/null @@ -1,172 +0,0 @@ -//////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/spinctrl.h -// Purpose: wxSpinCtrl class declaration for Win32 -// Author: Vadim Zeitlin -// Modified by: -// Created: 22.07.99 -// Copyright: (c) Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_SPINCTRL_H_ -#define _WX_MSW_SPINCTRL_H_ - -#include "wx/spinbutt.h" // the base class - -#if wxUSE_SPINCTRL - -#include "wx/dynarray.h" - -class WXDLLIMPEXP_FWD_CORE wxSpinCtrl; -WX_DEFINE_EXPORTED_ARRAY_PTR(wxSpinCtrl *, wxArraySpins); - -// ---------------------------------------------------------------------------- -// Under Win32, wxSpinCtrl is a wxSpinButton with a buddy (as MSDN docs call -// it) text window whose contents is automatically updated when the spin -// control is clicked. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxSpinCtrl : public wxSpinButton -{ -public: - wxSpinCtrl() { Init(); } - - wxSpinCtrl(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT, - int min = 0, int max = 100, int initial = 0, - const wxString& name = wxT("wxSpinCtrl")) - { - Init(); - - Create(parent, id, value, pos, size, style, min, max, initial, name); - } - - bool Create(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT, - int min = 0, int max = 100, int initial = 0, - const wxString& name = wxT("wxSpinCtrl")); - - // a wxTextCtrl-like method (but we can't have GetValue returning wxString - // because the base class already has one returning int!) - void SetValue(const wxString& text); - - // another wxTextCtrl-like method - void SetSelection(long from, long to); - - // wxSpinCtrlBase methods - virtual int GetBase() const; - virtual bool SetBase(int base); - - - // implementation only from now on - // ------------------------------- - - virtual ~wxSpinCtrl(); - - virtual void SetValue(int val); - virtual int GetValue() const; - virtual void SetRange(int minVal, int maxVal); - virtual bool SetFont(const wxFont &font); - virtual void SetFocus(); - - virtual bool Enable(bool enable = true); - virtual bool Show(bool show = true); - - virtual bool Reparent(wxWindowBase *newParent); - - // wxSpinButton doesn't accept focus, but we do - virtual bool AcceptsFocus() const { return wxWindow::AcceptsFocus(); } - - // we're like wxTextCtrl and not (default) wxButton - virtual wxVisualAttributes GetDefaultAttributes() const - { - return GetClassDefaultAttributes(GetWindowVariant()); - } - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL) - { - return GetCompositeControlsDefaultAttributes(variant); - } - - // for internal use only - - // get the subclassed window proc of the buddy text - WXFARPROC GetBuddyWndProc() const { return m_wndProcBuddy; } - - // return the spinctrl object whose buddy is the given window or NULL - static wxSpinCtrl *GetSpinForTextCtrl(WXHWND hwndBuddy); - - // process a WM_COMMAND generated by the buddy text control - bool ProcessTextCommand(WXWORD cmd, WXWORD id); - - // recognize buddy window as part of this control at wx level - virtual bool ContainsHWND(WXHWND hWnd) const { return hWnd == m_hwndBuddy; } - - virtual void SetLayoutDirection(wxLayoutDirection dir) wxOVERRIDE; - -protected: - virtual void DoGetPosition(int *x, int *y) const; - virtual void DoMoveWindow(int x, int y, int width, int height); - virtual wxSize DoGetBestSize() const; - virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const; - virtual void DoGetSize(int *width, int *height) const; - virtual void DoGetClientSize(int *x, int *y) const; -#if wxUSE_TOOLTIPS - virtual void DoSetToolTip( wxToolTip *tip ); -#endif // wxUSE_TOOLTIPS - - virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); - virtual bool MSWOnScroll(int orientation, WXWORD wParam, - WXWORD pos, WXHWND control); - - // handle processing of special keys - void OnChar(wxKeyEvent& event); - void OnSetFocus(wxFocusEvent& event); - void OnKillFocus(wxFocusEvent& event); - - // generate spin control update event with the given value - void SendSpinUpdate(int value); - - // called to ensure that the value is in the correct range - virtual void NormalizeValue(); - - // the value of the control before the latest change (which might not have - // changed anything in fact -- this is why we need this field) - int m_oldValue; - - // the data for the "buddy" text ctrl - WXHWND m_hwndBuddy; - WXFARPROC m_wndProcBuddy; - - // Block text update event after SetValue() - bool m_blockEvent; - -private: - // Common part of all ctors. - void Init(); - - // Adjust the text control style depending on whether we need to enter only - // digits or may need to enter something else (e.g. "-" sign, "x" - // hexadecimal prefix, ...) in it. - void UpdateBuddyStyle(); - - - wxDECLARE_DYNAMIC_CLASS(wxSpinCtrl); - wxDECLARE_EVENT_TABLE(); - wxDECLARE_NO_COPY_CLASS(wxSpinCtrl); -}; - -#endif // wxUSE_SPINCTRL - -#endif // _WX_MSW_SPINCTRL_H_ - - diff --git a/Externals/wxWidgets3/include/wx/msw/stackwalk.h b/Externals/wxWidgets3/include/wx/msw/stackwalk.h deleted file mode 100644 index e068ea2d95..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/stackwalk.h +++ /dev/null @@ -1,111 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/stackwalk.h -// Purpose: wxStackWalker for MSW -// Author: Vadim Zeitlin -// Modified by: -// Created: 2005-01-08 -// Copyright: (c) 2005 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_STACKWALK_H_ -#define _WX_MSW_STACKWALK_H_ - -#include "wx/arrstr.h" - -// these structs are declared in windows headers -struct _CONTEXT; -struct _EXCEPTION_POINTERS; - -// and these in dbghelp.h -struct _SYMBOL_INFO; -struct _SYMBOL_INFOW; - -#if wxUSE_UNICODE - #define wxSYMBOL_INFO _SYMBOL_INFOW -#else // !wxUSE_UNICODE - #define wxSYMBOL_INFO _SYMBOL_INFO -#endif // wxUSE_UNICODE/!wxUSE_UNICODE - -// ---------------------------------------------------------------------------- -// wxStackFrame -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxStackFrame : public wxStackFrameBase -{ -private: - wxStackFrame *ConstCast() const - { return const_cast(this); } - - size_t DoGetParamCount() const { return m_paramTypes.GetCount(); } - -public: - wxStackFrame(size_t level, void *address, size_t addrFrame) - : wxStackFrameBase(level, address) - { - m_hasName = - m_hasLocation = false; - - m_addrFrame = addrFrame; - } - - virtual size_t GetParamCount() const - { - ConstCast()->OnGetParam(); - return DoGetParamCount(); - } - - virtual bool - GetParam(size_t n, wxString *type, wxString *name, wxString *value) const; - - // callback used by OnGetParam(), don't call directly - void OnParam(wxSYMBOL_INFO *pSymInfo); - -protected: - virtual void OnGetName(); - virtual void OnGetLocation(); - - void OnGetParam(); - - - // helper for debug API: it wants to have addresses as DWORDs - size_t GetSymAddr() const - { - return reinterpret_cast(m_address); - } - -private: - bool m_hasName, - m_hasLocation; - - size_t m_addrFrame; - - wxArrayString m_paramTypes, - m_paramNames, - m_paramValues; -}; - -// ---------------------------------------------------------------------------- -// wxStackWalker -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxStackWalker : public wxStackWalkerBase -{ -public: - // we don't use ctor argument, it is for compatibility with Unix version - // only - wxStackWalker(const char * WXUNUSED(argv0) = NULL) { } - - virtual void Walk(size_t skip = 1, size_t maxDepth = wxSTACKWALKER_MAX_DEPTH); -#if wxUSE_ON_FATAL_EXCEPTION - virtual void WalkFromException(size_t maxDepth = wxSTACKWALKER_MAX_DEPTH); -#endif // wxUSE_ON_FATAL_EXCEPTION - - - // enumerate stack frames from the given context - void WalkFrom(const _CONTEXT *ctx, size_t skip = 1, size_t maxDepth = wxSTACKWALKER_MAX_DEPTH); - void WalkFrom(const _EXCEPTION_POINTERS *ep, size_t skip = 1, size_t maxDepth = wxSTACKWALKER_MAX_DEPTH); -}; - -#endif // _WX_MSW_STACKWALK_H_ - diff --git a/Externals/wxWidgets3/include/wx/msw/statbmp.h b/Externals/wxWidgets3/include/wx/msw/statbmp.h deleted file mode 100644 index 443440f130..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/statbmp.h +++ /dev/null @@ -1,103 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/statbmp.h -// Purpose: wxStaticBitmap class for wxMSW -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_STATBMP_H_ -#define _WX_STATBMP_H_ - -#include "wx/control.h" -#include "wx/icon.h" -#include "wx/bitmap.h" - -extern WXDLLIMPEXP_DATA_CORE(const char) wxStaticBitmapNameStr[]; - -// a control showing an icon or a bitmap -class WXDLLIMPEXP_CORE wxStaticBitmap : public wxStaticBitmapBase -{ -public: - wxStaticBitmap() { Init(); } - - wxStaticBitmap(wxWindow *parent, - wxWindowID id, - const wxGDIImage& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxStaticBitmapNameStr) - { - Init(); - - Create(parent, id, label, pos, size, style, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxGDIImage& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxStaticBitmapNameStr); - - virtual ~wxStaticBitmap() { Free(); } - - virtual void SetIcon(const wxIcon& icon) { SetImage(&icon); } - virtual void SetBitmap(const wxBitmap& bitmap) { SetImage(&bitmap); } - virtual wxBitmap GetBitmap() const; - virtual wxIcon GetIcon() const; - - virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; - - // returns true if the platform should explicitly apply a theme border - virtual bool CanApplyThemeBorder() const { return false; } - -protected: - virtual wxSize DoGetBestClientSize() const; - - // ctor/dtor helpers - void Init(); - void Free(); - - // true if icon/bitmap is valid - bool ImageIsOk() const; - - void SetImage(const wxGDIImage* image); - void SetImageNoCopy( wxGDIImage* image ); - - // draw the bitmap ourselves here if the OS can't do it correctly (if it - // can we leave it to it) - void DoPaintManually(wxPaintEvent& event); - - void WXHandleSize(wxSizeEvent& event); - - // we can have either an icon or a bitmap - bool m_isIcon; - wxGDIImage *m_image; - - // handle used in last call to STM_SETIMAGE - WXHANDLE m_currentHandle; - -private: - // Flag indicating whether we own m_currentHandle, i.e. should delete it. - bool m_ownsCurrentHandle; - - // Replace the image at the native control level with the given HBITMAP or - // HICON (which can be 0) and destroy the previous image if necessary. - void MSWReplaceImageHandle(WXLPARAM handle); - - // Delete the current handle only if we own it. - void DeleteCurrentHandleIfNeeded(); - - - wxDECLARE_DYNAMIC_CLASS(wxStaticBitmap); - wxDECLARE_EVENT_TABLE(); - wxDECLARE_NO_COPY_CLASS(wxStaticBitmap); -}; - -#endif - // _WX_STATBMP_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/statbox.h b/Externals/wxWidgets3/include/wx/msw/statbox.h deleted file mode 100644 index 6ce580861b..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/statbox.h +++ /dev/null @@ -1,70 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/statbox.h -// Purpose: wxStaticBox class -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_STATBOX_H_ -#define _WX_MSW_STATBOX_H_ - -// Group box -class WXDLLIMPEXP_CORE wxStaticBox : public wxStaticBoxBase -{ -public: - wxStaticBox() { } - - wxStaticBox(wxWindow *parent, wxWindowID id, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxStaticBoxNameStr) - { - Create(parent, id, label, pos, size, style, name); - } - - bool Create(wxWindow *parent, wxWindowID id, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxStaticBoxNameStr); - - /// Implementation only - virtual void GetBordersForSizer(int *borderTop, int *borderOther) const; - - virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; - - // returns true if the platform should explicitly apply a theme border - virtual bool CanApplyThemeBorder() const { return false; } - -protected: - virtual wxSize DoGetBestSize() const; - -public: - virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); - -protected: - // return the region with all the windows inside this static box excluded - virtual WXHRGN MSWGetRegionWithoutChildren(); - - // remove the parts which are painted by static box itself from the given - // region which is embedded in a rectangle (0, 0)-(w, h) - virtual void MSWGetRegionWithoutSelf(WXHRGN hrgn, int w, int h); - - // paint the given rectangle with our background brush/colour - virtual void PaintBackground(wxDC& dc, const struct tagRECT& rc); - // paint the foreground of the static box - virtual void PaintForeground(wxDC& dc, const struct tagRECT& rc); - - void OnPaint(wxPaintEvent& event); - - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticBox); -}; - -#endif // _WX_MSW_STATBOX_H_ - diff --git a/Externals/wxWidgets3/include/wx/msw/statline.h b/Externals/wxWidgets3/include/wx/msw/statline.h deleted file mode 100644 index ce4569448b..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/statline.h +++ /dev/null @@ -1,51 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/statline.h -// Purpose: MSW version of wxStaticLine class -// Author: Vadim Zeitlin -// Created: 28.06.99 -// Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_STATLINE_H_ -#define _WX_MSW_STATLINE_H_ - -// ---------------------------------------------------------------------------- -// wxStaticLine -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxStaticLine : public wxStaticLineBase -{ -public: - // constructors and pseudo-constructors - wxStaticLine() { } - - wxStaticLine( wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxLI_HORIZONTAL, - const wxString &name = wxStaticLineNameStr ) - { - Create(parent, id, pos, size, style, name); - } - - bool Create( wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxLI_HORIZONTAL, - const wxString &name = wxStaticLineNameStr ); - - // overridden base class virtuals - virtual bool AcceptsFocus() const { return false; } - - // usually overridden base class virtuals - virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; - - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticLine); -}; - -#endif // _WX_MSW_STATLINE_H_ - - diff --git a/Externals/wxWidgets3/include/wx/msw/stattext.h b/Externals/wxWidgets3/include/wx/msw/stattext.h deleted file mode 100644 index 5a478c3500..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/stattext.h +++ /dev/null @@ -1,57 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/stattext.h -// Purpose: wxStaticText class -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_STATTEXT_H_ -#define _WX_STATTEXT_H_ - -class WXDLLIMPEXP_CORE wxStaticText : public wxStaticTextBase -{ -public: - wxStaticText() { } - - wxStaticText(wxWindow *parent, - wxWindowID id, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxStaticTextNameStr) - { - Create(parent, id, label, pos, size, style, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxStaticTextNameStr); - - // override some methods to resize the window properly - virtual void SetLabel(const wxString& label); - virtual bool SetFont( const wxFont &font ); - - virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const; - -protected: - // implement/override some base class virtuals - virtual void DoSetSize(int x, int y, int w, int h, - int sizeFlags = wxSIZE_AUTO); - virtual wxSize DoGetBestClientSize() const; - - virtual wxString DoGetLabel() const; - virtual void DoSetLabel(const wxString& str); - - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticText); -}; - -#endif - // _WX_STATTEXT_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/statusbar.h b/Externals/wxWidgets3/include/wx/msw/statusbar.h deleted file mode 100644 index 4aa4349959..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/statusbar.h +++ /dev/null @@ -1,111 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/statusbar.h -// Purpose: native implementation of wxStatusBar -// Author: Vadim Zeitlin -// Modified by: -// Created: 04.04.98 -// Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_STATUSBAR_H_ -#define _WX_MSW_STATUSBAR_H_ - -#if wxUSE_NATIVE_STATUSBAR - -#include "wx/vector.h" -#include "wx/tooltip.h" - -class WXDLLIMPEXP_FWD_CORE wxClientDC; - -class WXDLLIMPEXP_CORE wxStatusBar : public wxStatusBarBase -{ -public: - // ctors and such - wxStatusBar(); - wxStatusBar(wxWindow *parent, - wxWindowID id = wxID_ANY, - long style = wxSTB_DEFAULT_STYLE, - const wxString& name = wxStatusBarNameStr) - { - m_pDC = NULL; - (void)Create(parent, id, style, name); - } - - bool Create(wxWindow *parent, - wxWindowID id = wxID_ANY, - long style = wxSTB_DEFAULT_STYLE, - const wxString& name = wxStatusBarNameStr); - - virtual ~wxStatusBar(); - - // implement base class methods - virtual void SetFieldsCount(int number = 1, const int *widths = NULL); - virtual void SetStatusWidths(int n, const int widths_field[]); - virtual void SetStatusStyles(int n, const int styles[]); - virtual void SetMinHeight(int height); - virtual bool GetFieldRect(int i, wxRect& rect) const; - - virtual int GetBorderX() const; - virtual int GetBorderY() const; - - // override some wxWindow virtual methods too - virtual bool SetFont(const wxFont& font); - - virtual WXLRESULT MSWWindowProc(WXUINT nMsg, - WXWPARAM wParam, - WXLPARAM lParam); - -protected: - // implement base class pure virtual method - virtual void DoUpdateStatusText(int number); - - // override some base class virtuals - virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const; - virtual wxSize DoGetBestSize() const; - virtual void DoMoveWindow(int x, int y, int width, int height); -#if wxUSE_TOOLTIPS - virtual bool MSWProcessMessage(WXMSG* pMsg); - virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM* result); -#endif - - // implementation of the public SetStatusWidths() - void MSWUpdateFieldsWidths(); - - // used by DoUpdateStatusText() - wxClientDC *m_pDC; - -#if wxUSE_TOOLTIPS - // the tooltips used when wxSTB_SHOW_TIPS is given - wxVector m_tooltips; -#endif - -private: - struct MSWBorders - { - int horz, - vert, - between; - }; - - // retrieve all status bar borders using SB_GETBORDERS - MSWBorders MSWGetBorders() const; - - // return the size of the border between the fields - int MSWGetBorderWidth() const; - - struct MSWMetrics - { - int gripWidth, - textMargin; - }; - - // return the various status bar metrics - static const MSWMetrics& MSWGetMetrics(); - - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxStatusBar); -}; - -#endif // wxUSE_NATIVE_STATUSBAR - -#endif // _WX_MSW_STATUSBAR_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/std.ico b/Externals/wxWidgets3/include/wx/msw/std.ico deleted file mode 100644 index 435cca2471..0000000000 Binary files a/Externals/wxWidgets3/include/wx/msw/std.ico and /dev/null differ diff --git a/Externals/wxWidgets3/include/wx/msw/stdpaths.h b/Externals/wxWidgets3/include/wx/msw/stdpaths.h deleted file mode 100644 index 965c079226..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/stdpaths.h +++ /dev/null @@ -1,99 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/stdpaths.h -// Purpose: wxStandardPaths for Win32 -// Author: Vadim Zeitlin -// Modified by: -// Created: 2004-10-19 -// Copyright: (c) 2004 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_STDPATHS_H_ -#define _WX_MSW_STDPATHS_H_ - -struct _GUID; - -// ---------------------------------------------------------------------------- -// wxStandardPaths -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxStandardPaths : public wxStandardPathsBase -{ -public: - // implement base class pure virtuals - virtual wxString GetExecutablePath() const; - virtual wxString GetConfigDir() const; - virtual wxString GetUserConfigDir() const; - virtual wxString GetDataDir() const; - virtual wxString GetUserDataDir() const; - virtual wxString GetUserLocalDataDir() const; - virtual wxString GetPluginsDir() const; - virtual wxString GetUserDir(Dir userDir) const wxOVERRIDE; - - - // MSW-specific methods - - // This class supposes that data, plugins &c files are located under the - // program directory which is the directory containing the application - // binary itself. But sometimes this binary may be in a subdirectory of the - // main program directory, e.g. this happens in at least the following - // common cases: - // 1. The program is in "bin" subdirectory of the installation directory. - // 2. The program is in "debug" subdirectory of the directory containing - // sources and data files during development - // - // By calling this function you instruct the class to remove the last - // component of the path if it matches its argument. Notice that it may be - // called more than once, e.g. you can call both IgnoreAppSubDir("bin") and - // IgnoreAppSubDir("debug") to take care of both production and development - // cases above but that each call will only remove the last path component. - // Finally note that the argument can contain wild cards so you can also - // call IgnoreAppSubDir("vc*msw*") to ignore all build directories at once - // when using wxWidgets-inspired output directories names. - void IgnoreAppSubDir(const wxString& subdirPattern); - - // This function is used to ignore all common build directories and is - // called from the ctor -- use DontIgnoreAppSubDir() to undo this. - void IgnoreAppBuildSubDirs(); - - // Undo the effects of all preceding IgnoreAppSubDir() calls. - void DontIgnoreAppSubDir(); - - - // Returns the directory corresponding to the specified Windows shell CSIDL - static wxString MSWGetShellDir(int csidl); - -protected: - // Ctor is protected, use wxStandardPaths::Get() instead of instantiating - // objects of this class directly. - // - // It calls IgnoreAppBuildSubDirs() and also sets up the object to use - // both vendor and application name by default. - wxStandardPaths(); - - // get the path corresponding to the given standard CSIDL_XXX constant - static wxString DoGetDirectory(int csidl); - - static wxString DoGetKnownFolder(const _GUID& rfid); - - // return the directory of the application itself - wxString GetAppDir() const; - - // directory returned by GetAppDir() - mutable wxString m_appDir; -}; - -// ---------------------------------------------------------------------------- -// wxStandardPathsWin16: this class is for internal use only -// ---------------------------------------------------------------------------- - -// override config file locations to be compatible with the values used by -// wxFileConfig (dating from Win16 days which explains the class name) -class WXDLLIMPEXP_BASE wxStandardPathsWin16 : public wxStandardPaths -{ -public: - virtual wxString GetConfigDir() const; - virtual wxString GetUserConfigDir() const; -}; - -#endif // _WX_MSW_STDPATHS_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/subwin.h b/Externals/wxWidgets3/include/wx/msw/subwin.h deleted file mode 100644 index b38d2037ad..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/subwin.h +++ /dev/null @@ -1,253 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/subwin.h -// Purpose: helper for implementing the controls with subwindows -// Author: Vadim Zeitlin -// Modified by: -// Created: 2004-12-11 -// Copyright: (c) 2004 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_SUBWIN_H_ -#define _WX_MSW_SUBWIN_H_ - -#include "wx/msw/private.h" - -// ---------------------------------------------------------------------------- -// wxSubwindows contains all HWNDs making part of a single wx control -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxSubwindows -{ -public: - // the number of subwindows can be specified either as parameter to ctor or - // later in Create() - wxSubwindows(size_t n = 0) { Init(); if ( n ) Create(n); } - - // allocate enough space for the given number of windows - void Create(size_t n) - { - wxASSERT_MSG( !m_hwnds, wxT("Create() called twice?") ); - - m_count = n; - m_hwnds = (HWND *)calloc(n, sizeof(HWND)); - m_ids = new wxWindowIDRef[n]; - } - - // non-virtual dtor, this class is not supposed to be used polymorphically - ~wxSubwindows() - { - for ( size_t n = 0; n < m_count; n++ ) - { - if ( m_hwnds[n] ) - ::DestroyWindow(m_hwnds[n]); - } - - free(m_hwnds); - delete [] m_ids; - } - - // get the number of subwindows - size_t GetCount() const { return m_count; } - - // access a given window - HWND& Get(size_t n) - { - wxASSERT_MSG( n < m_count, wxT("subwindow index out of range") ); - - return m_hwnds[n]; - } - - HWND operator[](size_t n) const - { - return const_cast(this)->Get(n); - } - - // initialize the given window: id will be stored in wxWindowIDRef ensuring - // that it is not reused while this object exists - void Set(size_t n, HWND hwnd, wxWindowID id) - { - wxASSERT_MSG( n < m_count, wxT("subwindow index out of range") ); - - m_hwnds[n] = hwnd; - m_ids[n] = id; - } - - // check if we have this window - bool HasWindow(HWND hwnd) - { - for ( size_t n = 0; n < m_count; n++ ) - { - if ( m_hwnds[n] == hwnd ) - return true; - } - - return false; - } - - - // methods which are forwarded to all subwindows - // --------------------------------------------- - - // show/hide everything - void Show(bool show) - { - int sw = show ? SW_SHOW : SW_HIDE; - for ( size_t n = 0; n < m_count; n++ ) - { - if ( m_hwnds[n] ) - ::ShowWindow(m_hwnds[n], sw); - } - } - - // enable/disable everything - void Enable(bool enable) - { - for ( size_t n = 0; n < m_count; n++ ) - { - if ( m_hwnds[n] ) - ::EnableWindow(m_hwnds[n], enable); - } - } - - // set font for all windows - void SetFont(const wxFont& font) - { - HFONT hfont = GetHfontOf(font); - wxCHECK_RET( hfont, wxT("invalid font") ); - - for ( size_t n = 0; n < m_count; n++ ) - { - if ( m_hwnds[n] ) - { - ::SendMessage(m_hwnds[n], WM_SETFONT, (WPARAM)hfont, 0); - - // otherwise the window might not be redrawn correctly - ::InvalidateRect(m_hwnds[n], NULL, FALSE /* don't erase bg */); - } - } - } - - // add all windows to update region to force redraw - void Refresh() - { - for ( size_t n = 0; n < m_count; n++ ) - { - if ( m_hwnds[n] ) - { - ::InvalidateRect(m_hwnds[n], NULL, FALSE /* don't erase bg */); - } - } - } - - // find the bounding box for all windows - wxRect GetBoundingBox() const - { - wxRect r; - for ( size_t n = 0; n < m_count; n++ ) - { - if ( m_hwnds[n] ) - { - RECT rc; - - ::GetWindowRect(m_hwnds[n], &rc); - - r.Union(wxRectFromRECT(rc)); - } - } - - return r; - } - -private: - void Init() - { - m_count = 0; - m_hwnds = NULL; - m_ids = NULL; - } - - // number of elements in m_hwnds array - size_t m_count; - - // the HWNDs we contain - HWND *m_hwnds; - - // the IDs of the windows - wxWindowIDRef *m_ids; - - - wxDECLARE_NO_COPY_CLASS(wxSubwindows); -}; - -// convenient macro to forward a few methods which are usually propagated to -// subwindows to a wxSubwindows object -// -// parameters should be: -// - cname the name of the class implementing these methods -// - base the name of its base class -// - subwins the name of the member variable of type wxSubwindows * -#define WX_FORWARD_STD_METHODS_TO_SUBWINDOWS(cname, base, subwins) \ - bool cname::ContainsHWND(WXHWND hWnd) const \ - { \ - return subwins && subwins->HasWindow((HWND)hWnd); \ - } \ - \ - bool cname::Show(bool show) \ - { \ - if ( !base::Show(show) ) \ - return false; \ - \ - if ( subwins ) \ - subwins->Show(show); \ - \ - return true; \ - } \ - \ - bool cname::Enable(bool enable) \ - { \ - if ( !base::Enable(enable) ) \ - return false; \ - \ - if ( subwins ) \ - subwins->Enable(enable); \ - \ - return true; \ - } \ - \ - bool cname::SetFont(const wxFont& font) \ - { \ - if ( !base::SetFont(font) ) \ - return false; \ - \ - if ( subwins ) \ - subwins->SetFont(font); \ - \ - return true; \ - } \ - \ - bool cname::SetForegroundColour(const wxColour& colour) \ - { \ - if ( !base::SetForegroundColour(colour) ) \ - return false; \ - \ - if ( subwins ) \ - subwins->Refresh(); \ - \ - return true; \ - } \ - \ - bool cname::SetBackgroundColour(const wxColour& colour) \ - { \ - if ( !base::SetBackgroundColour(colour) ) \ - return false; \ - \ - if ( subwins ) \ - subwins->Refresh(); \ - \ - return true; \ - } \ - - -#endif // _WX_MSW_SUBWIN_H_ - diff --git a/Externals/wxWidgets3/include/wx/msw/taskbar.h b/Externals/wxWidgets3/include/wx/msw/taskbar.h deleted file mode 100644 index 3fe5c9b61b..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/taskbar.h +++ /dev/null @@ -1,71 +0,0 @@ -///////////////////////////////////////////////////////////////////////// -// File: wx/msw/taskbar.h -// Purpose: Defines wxTaskBarIcon class for manipulating icons on the -// Windows task bar. -// Author: Julian Smart -// Modified by: Vaclav Slavik -// Created: 24/3/98 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////// - -#ifndef _WX_TASKBAR_H_ -#define _WX_TASKBAR_H_ - -#include "wx/icon.h" - -// private helper class: -class WXDLLIMPEXP_FWD_ADV wxTaskBarIconWindow; - -class WXDLLIMPEXP_ADV wxTaskBarIcon : public wxTaskBarIconBase -{ -public: - wxTaskBarIcon(wxTaskBarIconType iconType = wxTBI_DEFAULT_TYPE); - virtual ~wxTaskBarIcon(); - - // Accessors - bool IsOk() const { return true; } - bool IsIconInstalled() const { return m_iconAdded; } - - // Operations - bool SetIcon(const wxIcon& icon, const wxString& tooltip = wxEmptyString); - bool RemoveIcon(void); - bool PopupMenu(wxMenu *menu); - - // MSW-specific class methods - -#if wxUSE_TASKBARICON_BALLOONS - // show a balloon notification (the icon must have been already initialized - // using SetIcon) - // - // title and text are limited to 63 and 255 characters respectively, msec - // is the timeout, in milliseconds, before the balloon disappears (will be - // clamped down to the allowed 10-30s range by Windows if it's outside it) - // and flags can include wxICON_ERROR/INFO/WARNING to show a corresponding - // icon - // - // return true if balloon was shown, false on error (incorrect parameters - // or function unsupported by OS) - bool ShowBalloon(const wxString& title, - const wxString& text, - unsigned msec = 0, - int flags = 0, - const wxIcon& icon = wxNullIcon); -#endif // wxUSE_TASKBARICON_BALLOONS - -protected: - friend class wxTaskBarIconWindow; - - long WindowProc(unsigned int msg, unsigned int wParam, long lParam); - void RegisterWindowMessages(); - - - wxTaskBarIconWindow *m_win; - bool m_iconAdded; - wxIcon m_icon; - wxString m_strTooltip; - - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxTaskBarIcon); -}; - -#endif // _WX_TASKBAR_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/taskbarbutton.h b/Externals/wxWidgets3/include/wx/msw/taskbarbutton.h deleted file mode 100644 index ed24df01ed..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/taskbarbutton.h +++ /dev/null @@ -1,75 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: include/wx/msw/taskbarbutton.h -// Purpose: Defines wxTaskBarButtonImpl class. -// Author: Chaobin Zhang -// Created: 2014-06-01 -// Copyright: (c) 2014 wxWidgets development team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_TASKBARBUTTON_H_ -#define _WX_MSW_TASKBARBUTTON_H_ - -#include "wx/defs.h" - -#if wxUSE_TASKBARBUTTON - -#include "wx/vector.h" -#include "wx/taskbarbutton.h" - -class WXDLLIMPEXP_FWD_CORE wxITaskbarList3; - -class WXDLLIMPEXP_CORE wxTaskBarButtonImpl : public wxTaskBarButton -{ -public: - virtual ~wxTaskBarButtonImpl(); - - virtual void SetProgressRange(int range) wxOVERRIDE; - virtual void SetProgressValue(int value) wxOVERRIDE; - virtual void PulseProgress() wxOVERRIDE; - virtual void Show(bool show = true) wxOVERRIDE; - virtual void Hide() wxOVERRIDE; - virtual void SetThumbnailTooltip(const wxString& tooltip) wxOVERRIDE; - virtual void SetProgressState(wxTaskBarButtonState state) wxOVERRIDE; - virtual void SetOverlayIcon(const wxIcon& icon, - const wxString& description = wxString()) wxOVERRIDE; - virtual void SetThumbnailClip(const wxRect& rect) wxOVERRIDE; - virtual void SetThumbnailContents(const wxWindow *child) wxOVERRIDE; - virtual bool InsertThumbBarButton(size_t pos, - wxThumbBarButton *button) wxOVERRIDE; - virtual bool AppendThumbBarButton(wxThumbBarButton *button) wxOVERRIDE; - virtual bool AppendSeparatorInThumbBar() wxOVERRIDE; - virtual wxThumbBarButton* RemoveThumbBarButton( - wxThumbBarButton *button) wxOVERRIDE; - virtual wxThumbBarButton* RemoveThumbBarButton(int id) wxOVERRIDE; - wxThumbBarButton* GetThumbBarButtonByIndex(size_t index); - bool InitOrUpdateThumbBarButtons(); - virtual void Realize() wxOVERRIDE; - -private: - // This ctor is only used by wxTaskBarButton::New() - wxTaskBarButtonImpl(wxITaskbarList3* taskbarList, wxWindow* parent); - - wxWindow* m_parent; - wxITaskbarList3 *m_taskbarList; - - typedef wxVector wxThumbBarButtons; - wxThumbBarButtons m_thumbBarButtons; - - int m_progressRange; - int m_progressValue; - wxTaskBarButtonState m_progressState; - wxString m_thumbnailTooltip; - wxIcon m_overlayIcon; - wxString m_overlayIconDescription; - wxRect m_thumbnailClipRect; - bool m_hasInitThumbnailToolbar; - - friend wxTaskBarButton* wxTaskBarButton::New(wxWindow*); - - wxDECLARE_NO_COPY_CLASS(wxTaskBarButtonImpl); -}; - -#endif // wxUSE_TASKBARBUTTON - -#endif // _WX_MSW_TASKBARBUTTON_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/textctrl.h b/Externals/wxWidgets3/include/wx/msw/textctrl.h deleted file mode 100644 index a2027003f7..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/textctrl.h +++ /dev/null @@ -1,300 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/textctrl.h -// Purpose: wxTextCtrl class -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_TEXTCTRL_H_ -#define _WX_TEXTCTRL_H_ - -class WXDLLIMPEXP_CORE wxTextCtrl : public wxTextCtrlBase -{ -public: - // creation - // -------- - - wxTextCtrl() { Init(); } - wxTextCtrl(wxWindow *parent, wxWindowID id, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxTextCtrlNameStr) - { - Init(); - - Create(parent, id, value, pos, size, style, validator, name); - } - virtual ~wxTextCtrl(); - - bool Create(wxWindow *parent, wxWindowID id, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxTextCtrlNameStr); - - // overridden wxTextEntry methods - // ------------------------------ - - virtual wxString GetValue() const; - virtual wxString GetRange(long from, long to) const; - - virtual bool IsEmpty() const; - - virtual void WriteText(const wxString& text); - virtual void AppendText(const wxString& text); - virtual void Clear(); - - virtual int GetLineLength(long lineNo) const; - virtual wxString GetLineText(long lineNo) const; - virtual int GetNumberOfLines() const; - - virtual void SetMaxLength(unsigned long len); - - virtual void GetSelection(long *from, long *to) const; - - virtual void Redo(); - virtual bool CanRedo() const; - - virtual void SetInsertionPointEnd(); - virtual long GetInsertionPoint() const; - virtual wxTextPos GetLastPosition() const; - - // implement base class pure virtuals - // ---------------------------------- - - virtual bool IsModified() const; - virtual void MarkDirty(); - virtual void DiscardEdits(); - - virtual bool EmulateKeyPress(const wxKeyEvent& event); - -#if wxUSE_RICHEDIT - // apply text attribute to the range of text (only works with richedit - // controls) - virtual bool SetStyle(long start, long end, const wxTextAttr& style); - virtual bool SetDefaultStyle(const wxTextAttr& style); - virtual bool GetStyle(long position, wxTextAttr& style); -#endif // wxUSE_RICHEDIT - - // translate between the position (which is just an index in the text ctrl - // considering all its contents as a single strings) and (x, y) coordinates - // which represent column and line. - virtual long XYToPosition(long x, long y) const; - virtual bool PositionToXY(long pos, long *x, long *y) const; - - virtual void ShowPosition(long pos); - virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const; - virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, - wxTextCoord *col, - wxTextCoord *row) const - { - return wxTextCtrlBase::HitTest(pt, col, row); - } - - virtual void SetLayoutDirection(wxLayoutDirection dir) wxOVERRIDE; - virtual wxLayoutDirection GetLayoutDirection() const wxOVERRIDE; - - // Caret handling (Windows only) - bool ShowNativeCaret(bool show = true); - bool HideNativeCaret() { return ShowNativeCaret(false); } - - // Implementation from now on - // -------------------------- - -#if wxUSE_DRAG_AND_DROP && wxUSE_RICHEDIT - virtual void SetDropTarget(wxDropTarget *dropTarget); -#endif // wxUSE_DRAG_AND_DROP && wxUSE_RICHEDIT - - virtual void SetWindowStyleFlag(long style); - - virtual void Command(wxCommandEvent& event); - virtual bool MSWCommand(WXUINT param, WXWORD id); - virtual WXHBRUSH MSWControlColor(WXHDC hDC, WXHWND hWnd); - -#if wxUSE_RICHEDIT - virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); - - int GetRichVersion() const { return m_verRichEdit; } - bool IsRich() const { return m_verRichEdit != 0; } - - // rich edit controls are not compatible with normal ones and we must set - // the colours and font for them otherwise - virtual bool SetBackgroundColour(const wxColour& colour); - virtual bool SetForegroundColour(const wxColour& colour); - virtual bool SetFont(const wxFont& font); -#else - bool IsRich() const { return false; } -#endif // wxUSE_RICHEDIT - -#if wxUSE_INKEDIT && wxUSE_RICHEDIT - bool IsInkEdit() const { return m_isInkEdit != 0; } -#else - bool IsInkEdit() const { return false; } -#endif - - virtual void AdoptAttributesFromHWND(); - - virtual bool AcceptsFocusFromKeyboard() const; - - // returns true if the platform should explicitly apply a theme border - virtual bool CanApplyThemeBorder() const; - - // callbacks - void OnDropFiles(wxDropFilesEvent& event); - void OnChar(wxKeyEvent& event); // Process 'enter' if required - - void OnCut(wxCommandEvent& event); - void OnCopy(wxCommandEvent& event); - void OnPaste(wxCommandEvent& event); - void OnUndo(wxCommandEvent& event); - void OnRedo(wxCommandEvent& event); - void OnDelete(wxCommandEvent& event); - void OnSelectAll(wxCommandEvent& event); - - void OnUpdateCut(wxUpdateUIEvent& event); - void OnUpdateCopy(wxUpdateUIEvent& event); - void OnUpdatePaste(wxUpdateUIEvent& event); - void OnUpdateUndo(wxUpdateUIEvent& event); - void OnUpdateRedo(wxUpdateUIEvent& event); - void OnUpdateDelete(wxUpdateUIEvent& event); - void OnUpdateSelectAll(wxUpdateUIEvent& event); - - // Show a context menu for Rich Edit controls (the standard - // EDIT control has one already) - void OnContextMenu(wxContextMenuEvent& event); - - // Create context menu for RICHEDIT controls. This may be called once during - // the control's lifetime or every time the menu is shown, depending on - // implementation. - virtual wxMenu *MSWCreateContextMenu(); - - // be sure the caret remains invisible if the user - // called HideNativeCaret() before - void OnSetFocus(wxFocusEvent& event); - - // intercept WM_GETDLGCODE - virtual bool MSWHandleMessage(WXLRESULT *result, - WXUINT message, - WXWPARAM wParam, - WXLPARAM lParam); - - virtual bool MSWShouldPreProcessMessage(WXMSG* pMsg); - virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; - -protected: - // common part of all ctors - void Init(); - - // creates the control of appropriate class (plain or rich edit) with the - // styles corresponding to m_windowStyle - // - // this is used by ctor/Create() and when we need to recreate the control - // later - bool MSWCreateText(const wxString& value, - const wxPoint& pos, - const wxSize& size); - - virtual void DoSetValue(const wxString &value, int flags = 0); - - virtual wxPoint DoPositionToCoords(long pos) const; - - // return true if this control has a user-set limit on amount of text (i.e. - // the limit is due to a previous call to SetMaxLength() and not built in) - bool HasSpaceLimit(unsigned int *len) const; - -#if wxUSE_RICHEDIT && !wxUSE_UNICODE - // replace the selection or the entire control contents with the given text - // in the specified encoding - bool StreamIn(const wxString& value, wxFontEncoding encoding, bool selOnly); - - // get the contents of the control out as text in the given encoding - wxString StreamOut(wxFontEncoding encoding, bool selOnly = false) const; -#endif // wxUSE_RICHEDIT - - // replace the contents of the selection or of the entire control with the - // given text - void DoWriteText(const wxString& text, - int flags = SetValue_SendEvent | SetValue_SelectionOnly); - - // set the selection (possibly without scrolling the caret into view) - void DoSetSelection(long from, long to, int flags); - - // get the length of the line containing the character at the given - // position - long GetLengthOfLineContainingPos(long pos) const; - - // send TEXT_UPDATED event, return true if it was handled, false otherwise - bool SendUpdateEvent(); - - virtual wxSize DoGetBestSize() const; - virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const; - -#if wxUSE_RICHEDIT - // Apply the character-related parts of wxTextAttr to the given selection - // or the entire control if start == end == -1. - // - // This function is private and should only be called for rich edit - // controls and with (from, to) already in correct order, i.e. from <= to. - bool MSWSetCharFormat(const wxTextAttr& attr, long from = -1, long to = -1); - - // Same as above for paragraph-related parts of wxTextAttr. Note that this - // can only be applied to the selection as RichEdit doesn't support setting - // the paragraph styles globally. - bool MSWSetParaFormat(const wxTextAttr& attr, long from, long to); - - // Send wxEVT_CONTEXT_MENU event from here if the control doesn't do it on - // its own. - void OnRightUp(wxMouseEvent& event); - - // we're using RICHEDIT (and not simple EDIT) control if this field is not - // 0, it also gives the version of the RICHEDIT control being used - // (although not directly: 1 is for 1.0, 2 is for either 2.0 or 3.0 as we - // can't nor really need to distinguish between them and 4 is for 4.1) - int m_verRichEdit; -#endif // wxUSE_RICHEDIT - - // number of EN_UPDATE events sent by Windows when we change the controls - // text ourselves: we want this to be exactly 1 - int m_updatesCount; - -private: - virtual void EnableTextChangedEvents(bool enable) - { - m_updatesCount = enable ? -1 : -2; - } - - // implement wxTextEntry pure virtual: it implements all the operations for - // the simple EDIT controls - virtual WXHWND GetEditHWND() const { return m_hWnd; } - - void OnKeyDown(wxKeyEvent& event); - - // Used by EN_MAXTEXT handler to increase the size limit (will do nothing - // if the current limit is big enough). Should never be called directly. - // - // Returns true if we increased the limit to allow entering more text, - // false if we hit the limit set by SetMaxLength() and so didn't change it. - bool AdjustSpaceLimit(); - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxTextCtrl); - - wxMenu* m_privateContextMenu; - - bool m_isNativeCaretShown; - -#if wxUSE_INKEDIT && wxUSE_RICHEDIT - int m_isInkEdit; -#endif - -}; - -#endif // _WX_TEXTCTRL_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/textentry.h b/Externals/wxWidgets3/include/wx/msw/textentry.h deleted file mode 100644 index 2590b83191..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/textentry.h +++ /dev/null @@ -1,106 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/textentry.h -// Purpose: wxMSW-specific wxTextEntry implementation -// Author: Vadim Zeitlin -// Created: 2007-09-26 -// Copyright: (c) 2007 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_TEXTENTRY_H_ -#define _WX_MSW_TEXTENTRY_H_ - -class wxTextAutoCompleteData; // private class used only by wxTextEntry itself - -// ---------------------------------------------------------------------------- -// wxTextEntry: common part of wxComboBox and (single line) wxTextCtrl -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxTextEntry : public wxTextEntryBase -{ -public: - wxTextEntry(); - virtual ~wxTextEntry(); - - // implement wxTextEntryBase pure virtual methods - virtual void WriteText(const wxString& text); - virtual void Remove(long from, long to); - - virtual void Copy(); - virtual void Cut(); - virtual void Paste(); - - virtual void Undo(); - virtual void Redo(); - virtual bool CanUndo() const; - virtual bool CanRedo() const; - - virtual void SetInsertionPoint(long pos); - virtual long GetInsertionPoint() const; - virtual long GetLastPosition() const; - - virtual void SetSelection(long from, long to) - { DoSetSelection(from, to); } - virtual void GetSelection(long *from, long *to) const; - - virtual bool IsEditable() const; - virtual void SetEditable(bool editable); - - virtual void SetMaxLength(unsigned long len); - virtual void ForceUpper(); - -#if wxUSE_UXTHEME - virtual bool SetHint(const wxString& hint); - virtual wxString GetHint() const; -#endif // wxUSE_UXTHEME - -protected: - virtual wxString DoGetValue() const; - - // this is really a hook for multiline text controls as the single line - // ones don't need to ever scroll to show the selection but having it here - // allows us to put Remove() in the base class - enum - { - SetSel_NoScroll = 0, // don't do anything special - SetSel_Scroll = 1 // default: scroll to make the selection visible - }; - virtual void DoSetSelection(long from, long to, int flags = SetSel_Scroll); - - // margins functions - virtual bool DoSetMargins(const wxPoint& pt); - virtual wxPoint DoGetMargins() const; - - // auto-completion uses COM under Windows so they won't work without - // wxUSE_OLE as OleInitialize() is not called then -#if wxUSE_OLE - virtual bool DoAutoCompleteStrings(const wxArrayString& choices); -#if wxUSE_DYNLIB_CLASS - virtual bool DoAutoCompleteFileNames(int flags); -#endif // wxUSE_DYNLIB_CLASS - virtual bool DoAutoCompleteCustom(wxTextCompleter *completer); -#endif // wxUSE_OLE - -private: - // implement this to return the HWND of the EDIT control - virtual WXHWND GetEditHWND() const = 0; - -#if wxUSE_OLE - // Get the auto-complete object creating it if necessary. Returns NULL if - // creating it failed. - wxTextAutoCompleteData *GetOrCreateCompleter(); - - // Various auto-completion-related stuff, only used if any of AutoComplete() - // methods are called. Use the function above to access it. - wxTextAutoCompleteData *m_autoCompleteData; - - // It needs to call our GetEditableWindow() and GetEditHWND() methods. - friend class wxTextAutoCompleteData; -#endif // wxUSE_OLE -}; - -// We don't need the generic version. -#define wxHAS_NATIVE_TEXT_FORCEUPPER - -#endif // _WX_MSW_TEXTENTRY_H_ - diff --git a/Externals/wxWidgets3/include/wx/msw/tglbtn.h b/Externals/wxWidgets3/include/wx/msw/tglbtn.h deleted file mode 100644 index 0dec96fa11..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/tglbtn.h +++ /dev/null @@ -1,110 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/tglbtn.h -// Purpose: Declaration of the wxToggleButton class, which implements a -// toggle button under wxMSW. -// Author: John Norris, minor changes by Axel Schlueter -// Modified by: -// Created: 08.02.01 -// Copyright: (c) 2000 Johnny C. Norris II -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_TOGGLEBUTTON_H_ -#define _WX_TOGGLEBUTTON_H_ - -#include "wx/bitmap.h" - -// Checkbox item (single checkbox) -class WXDLLIMPEXP_CORE wxToggleButton : public wxToggleButtonBase -{ -public: - wxToggleButton() { Init(); } - wxToggleButton(wxWindow *parent, - wxWindowID id, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxCheckBoxNameStr) - { - Create(parent, id, label, pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxCheckBoxNameStr); - - virtual void SetValue(bool value); - virtual bool GetValue() const ; - - virtual bool MSWCommand(WXUINT param, WXWORD id); - virtual void Command(wxCommandEvent& event); - - // returns true if the platform should explicitly apply a theme border - virtual bool CanApplyThemeBorder() const { return false; } - -protected: - virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } - - virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const; - - virtual bool MSWIsPushed() const; - - void Init(); - - // current state of the button (when owner-drawn) - bool m_state; - -private: - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxToggleButton); -}; - -//----------------------------------------------------------------------------- -// wxBitmapToggleButton -//----------------------------------------------------------------------------- - - -class WXDLLIMPEXP_CORE wxBitmapToggleButton: public wxToggleButton -{ -public: - // construction/destruction - wxBitmapToggleButton() {} - wxBitmapToggleButton(wxWindow *parent, - wxWindowID id, - const wxBitmap& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxCheckBoxNameStr) - { - Create(parent, id, label, pos, size, style, validator, name); - } - - // Create the control - bool Create(wxWindow *parent, - wxWindowID id, - const wxBitmap& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxCheckBoxNameStr); - - // deprecated synonym for SetBitmapLabel() - wxDEPRECATED_INLINE( void SetLabel(const wxBitmap& bitmap), - SetBitmapLabel(bitmap); ) - // prevent virtual function hiding - virtual void SetLabel(const wxString& label) { wxToggleButton::SetLabel(label); } - -private: - wxDECLARE_DYNAMIC_CLASS(wxBitmapToggleButton); -}; - -#endif // _WX_TOGGLEBUTTON_H_ - diff --git a/Externals/wxWidgets3/include/wx/msw/timectrl.h b/Externals/wxWidgets3/include/wx/msw/timectrl.h deleted file mode 100644 index c5bc83aec6..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/timectrl.h +++ /dev/null @@ -1,62 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/timectrl.h -// Purpose: wxTimePickerCtrl for Windows. -// Author: Vadim Zeitlin -// Created: 2011-09-22 -// Copyright: (c) 2011 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_TIMECTRL_H_ -#define _WX_MSW_TIMECTRL_H_ - -// ---------------------------------------------------------------------------- -// wxTimePickerCtrl -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxTimePickerCtrl : public wxTimePickerCtrlBase -{ -public: - // ctors - wxTimePickerCtrl() { } - - wxTimePickerCtrl(wxWindow *parent, - wxWindowID id, - const wxDateTime& dt = wxDefaultDateTime, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxTP_DEFAULT, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxTimePickerCtrlNameStr) - { - Create(parent, id, dt, pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxDateTime& dt = wxDefaultDateTime, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxTP_DEFAULT, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxTimePickerCtrlNameStr) - { - return MSWCreateDateTimePicker(parent, id, dt, - pos, size, style, - validator, name); - } - - // Override MSW-specific functions used during control creation. - virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; - -protected: -#if wxUSE_INTL - virtual wxLocaleInfo MSWGetFormat() const; -#endif // wxUSE_INTL - virtual bool MSWAllowsNone() const { return false; } - virtual bool MSWOnDateTimeChange(const tagNMDATETIMECHANGE& dtch); - - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxTimePickerCtrl); -}; - -#endif // _WX_MSW_TIMECTRL_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/tls.h b/Externals/wxWidgets3/include/wx/msw/tls.h deleted file mode 100644 index e14fd541ca..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/tls.h +++ /dev/null @@ -1,123 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/tls.h -// Purpose: Win32 implementation of wxTlsValue<> -// Author: Vadim Zeitlin -// Created: 2008-08-08 -// Copyright: (c) 2008 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_TLS_H_ -#define _WX_MSW_TLS_H_ - -#include "wx/msw/wrapwin.h" -#include "wx/thread.h" -#include "wx/vector.h" - -// ---------------------------------------------------------------------------- -// wxTlsKey is a helper class encapsulating a TLS slot -// ---------------------------------------------------------------------------- - -class wxTlsKey -{ -public: - // ctor allocates a new key - wxTlsKey(wxTlsDestructorFunction destructor) - { - m_destructor = destructor; - m_slot = ::TlsAlloc(); - } - - // return true if the key was successfully allocated - bool IsOk() const { return m_slot != TLS_OUT_OF_INDEXES; } - - // get the key value, there is no error return - void *Get() const - { - // Exceptionally, TlsGetValue() calls SetLastError() even on success - // which means it overwrites the previous value. This is undesirable - // here, so explicitly preserve the last error here. - const DWORD dwLastError = ::GetLastError(); - void* const value = ::TlsGetValue(m_slot); - if ( dwLastError ) - ::SetLastError(dwLastError); - return value; - } - - // change the key value, return true if ok - bool Set(void *value) - { - void *old = Get(); - - if ( ::TlsSetValue(m_slot, value) == 0 ) - return false; - - if ( old ) - m_destructor(old); - - // update m_allValues list of all values - remove old, add new - wxCriticalSectionLocker lock(m_csAllValues); - if ( old ) - { - for ( wxVector::iterator i = m_allValues.begin(); - i != m_allValues.end(); - ++i ) - { - if ( *i == old ) - { - if ( value ) - *i = value; - else - m_allValues.erase(i); - return true; - } - } - wxFAIL_MSG( "previous wxTlsKey value not recorded in m_allValues" ); - } - - if ( value ) - m_allValues.push_back(value); - - return true; - } - - // free the key - ~wxTlsKey() - { - if ( !IsOk() ) - return; - - // Win32 API doesn't have the equivalent of pthread's destructor, so we - // have to keep track of all allocated values and destroy them manually; - // ideally we'd do that at thread exit time, but since we could only - // do that with wxThread and not otherwise created threads, we do it - // here. - // - // TODO: We should still call destructors for wxTlsKey used in the - // thread from wxThread's thread shutdown code, *in addition* - // to doing it in ~wxTlsKey. - // - // NB: No need to lock m_csAllValues, by the time this code is called, - // no other thread can be using this key. - for ( wxVector::iterator i = m_allValues.begin(); - i != m_allValues.end(); - ++i ) - { - m_destructor(*i); - } - - ::TlsFree(m_slot); - } - -private: - wxTlsDestructorFunction m_destructor; - DWORD m_slot; - - wxVector m_allValues; - wxCriticalSection m_csAllValues; - - wxDECLARE_NO_COPY_CLASS(wxTlsKey); -}; - -#endif // _WX_MSW_TLS_H_ - diff --git a/Externals/wxWidgets3/include/wx/msw/toolbar.h b/Externals/wxWidgets3/include/wx/msw/toolbar.h deleted file mode 100644 index 772e99aa12..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/toolbar.h +++ /dev/null @@ -1,185 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/toolbar.h -// Purpose: wxToolBar (Windows 95 toolbar) class -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_TBAR95_H_ -#define _WX_MSW_TBAR95_H_ - -#if wxUSE_TOOLBAR - -#include "wx/dynarray.h" -#include "wx/imaglist.h" - -class WXDLLIMPEXP_CORE wxToolBar : public wxToolBarBase -{ -public: - // ctors and dtor - wxToolBar() { Init(); } - - wxToolBar(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxTB_DEFAULT_STYLE, - const wxString& name = wxToolBarNameStr) - { - Init(); - - Create(parent, id, pos, size, style, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxTB_DEFAULT_STYLE, - const wxString& name = wxToolBarNameStr); - - virtual ~wxToolBar(); - - // override/implement base class virtuals - virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const; - - virtual bool Realize(); - - virtual void SetToolBitmapSize(const wxSize& size); - virtual wxSize GetToolSize() const; - - virtual void SetRows(int nRows); - - virtual void SetToolNormalBitmap(int id, const wxBitmap& bitmap); - virtual void SetToolDisabledBitmap(int id, const wxBitmap& bitmap); - - virtual void SetToolPacking(int packing); - - // implementation only from now on - // ------------------------------- - - virtual void SetWindowStyleFlag(long style); - - virtual bool MSWCommand(WXUINT param, WXWORD id); - virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); - - void OnMouseEvent(wxMouseEvent& event); - void OnSysColourChanged(wxSysColourChangedEvent& event); - void OnEraseBackground(wxEraseEvent& event); - - void SetFocus() {} - - static WXHBITMAP MapBitmap(WXHBITMAP bitmap, int width, int height); - - // override WndProc mainly to process WM_SIZE - virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); - - virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; - - // returns true if the platform should explicitly apply a theme border - virtual bool CanApplyThemeBorder() const { return false; } - -#ifdef wxHAS_MSW_BACKGROUND_ERASE_HOOK - virtual bool MSWEraseBgHook(WXHDC hDC); - virtual WXHBRUSH MSWGetBgBrushForChild(WXHDC hDC, wxWindowMSW *child); -#endif // wxHAS_MSW_BACKGROUND_ERASE_HOOK - - virtual wxToolBarToolBase *CreateTool(int id, - const wxString& label, - const wxBitmap& bmpNormal, - const wxBitmap& bmpDisabled = wxNullBitmap, - wxItemKind kind = wxITEM_NORMAL, - wxObject *clientData = NULL, - const wxString& shortHelp = wxEmptyString, - const wxString& longHelp = wxEmptyString); - - virtual wxToolBarToolBase *CreateTool(wxControl *control, - const wxString& label); -protected: - // common part of all ctors - void Init(); - - // create the native toolbar control - bool MSWCreateToolbar(const wxPoint& pos, const wxSize& size); - - // recreate the control completely - void Recreate(); - - // implement base class pure virtuals - virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool); - virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool); - - virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable); - virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle); - virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle); - - // return the appropriate size and flags for the toolbar control - virtual wxSize DoGetBestSize() const; - - // handlers for various events - bool HandleSize(WXWPARAM wParam, WXLPARAM lParam); -#ifdef wxHAS_MSW_BACKGROUND_ERASE_HOOK - bool HandlePaint(WXWPARAM wParam, WXLPARAM lParam); -#endif // wxHAS_MSW_BACKGROUND_ERASE_HOOK - void HandleMouseMove(WXWPARAM wParam, WXLPARAM lParam); - - // should be called whenever the toolbar size changes - void UpdateSize(); - - // create m_disabledImgList (but doesn't fill it), set it to NULL if it is - // unneeded - void CreateDisabledImageList(); - - // get the Windows toolbar style of this control - long GetMSWToolbarStyle() const; - - // set native toolbar padding - void MSWSetPadding(WXWORD padding); - - // the big bitmap containing all bitmaps of the toolbar buttons - WXHBITMAP m_hBitmap; - - // the image list with disabled images, may be NULL if we use - // system-provided versions of them - wxImageList *m_disabledImgList; - - // the total number of toolbar elements - size_t m_nButtons; - - // the sum of the sizes of the fixed items (i.e. excluding stretchable - // spaces) in the toolbar direction - int m_totalFixedSize; - - // the tool the cursor is in - wxToolBarToolBase *m_pInTool; - -private: - // makes sure tool bitmap size is sufficient for all tools - void AdjustToolBitmapSize(); - - // update the sizes of stretchable spacers to consume all extra space we - // have - void UpdateStretchableSpacersSize(); - -#ifdef wxHAS_MSW_BACKGROUND_ERASE_HOOK - // do erase the toolbar background, always do it for the entire control as - // the caller sets the clipping region correctly to exclude parts which - // should not be erased - void MSWDoEraseBackground(WXHDC hDC); - - // return the brush to use for erasing the toolbar background - WXHBRUSH MSWGetToolbarBgBrush(); -#endif // wxHAS_MSW_BACKGROUND_ERASE_HOOK - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_DYNAMIC_CLASS(wxToolBar); - wxDECLARE_NO_COPY_CLASS(wxToolBar); -}; - -#endif // wxUSE_TOOLBAR - -#endif // _WX_MSW_TBAR95_H_ - diff --git a/Externals/wxWidgets3/include/wx/msw/tooltip.h b/Externals/wxWidgets3/include/wx/msw/tooltip.h deleted file mode 100644 index 4c3be08cec..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/tooltip.h +++ /dev/null @@ -1,121 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/tooltip.h -// Purpose: wxToolTip class - tooltip control -// Author: Vadim Zeitlin -// Modified by: -// Created: 31.01.99 -// Copyright: (c) 1999 Robert Roebling, Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_TOOLTIP_H_ -#define _WX_MSW_TOOLTIP_H_ - -#include "wx/object.h" -#include "wx/gdicmn.h" - -class WXDLLIMPEXP_FWD_CORE wxWindow; -class wxToolTipOtherWindows; - -class WXDLLIMPEXP_CORE wxToolTip : public wxObject -{ -public: - // ctor & dtor - wxToolTip(const wxString &tip); - virtual ~wxToolTip(); - - // ctor used by wxStatusBar to associate a tooltip to a portion of - // the status bar window: - wxToolTip(wxWindow* win, unsigned int id, - const wxString &tip, const wxRect& rc); - - // accessors - // tip text - void SetTip(const wxString& tip); - const wxString& GetTip() const { return m_text; } - - // the window we're associated with - void SetWindow(wxWindow *win); - wxWindow *GetWindow() const { return m_window; } - - // controlling tooltip behaviour: globally change tooltip parameters - // enable or disable the tooltips globally - static void Enable(bool flag); - // set the delay after which the tooltip appears - static void SetDelay(long milliseconds); - // set the delay after which the tooltip disappears or how long the - // tooltip remains visible - static void SetAutoPop(long milliseconds); - // set the delay between subsequent tooltips to appear - static void SetReshow(long milliseconds); - // set maximum width for the new tooltips: -1 disables wrapping - // entirely, 0 restores the default behaviour - static void SetMaxWidth(int width); - - // implementation only from now on - // ------------------------------- - - // should be called in response to WM_MOUSEMOVE - static void RelayEvent(WXMSG *msg); - - // add a window to the tooltip control - void AddOtherWindow(WXHWND hwnd); - - // remove any tooltip from the window - static void Remove(WXHWND hwnd, unsigned int id, const wxRect& rc); - - // Set the rectangle we're associated with. This rectangle is only used for - // the main window, not any sub-windows added with Add() so in general it - // makes sense to use it for tooltips associated with a single window only. - void SetRect(const wxRect& rc); - - // Called when TLW shown state is changed and hides the tooltip itself if - // the window it's associated with is hidden. - static void UpdateVisibility(); - -private: - // This module calls our DeleteToolTipCtrl(). - friend class wxToolTipModule; - - // Adds a window other than our main m_window to this tooltip. - void DoAddHWND(WXHWND hWnd); - - // Perform the specified operation for the given window only. - void DoSetTip(WXHWND hWnd); - void DoRemove(WXHWND hWnd); - - // Call the given function for all windows we're associated with. - void DoForAllWindows(void (wxToolTip::*func)(WXHWND)); - - - // the one and only one tooltip control we use - never access it directly - // but use GetToolTipCtrl() which will create it when needed - static WXHWND ms_hwndTT; - - // create the tooltip ctrl if it doesn't exist yet and return its HWND - static WXHWND GetToolTipCtrl(); - - // to be used in wxModule for deleting tooltip ctrl window when exiting mainloop - static void DeleteToolTipCtrl(); - - // new tooltip maximum width, defaults to min(display width, 400) - static int ms_maxWidth; - - // remove this tooltip from the tooltip control - void Remove(); - - // adjust tooltip max width based on current tooltip text - bool AdjustMaxWidth(); - - wxString m_text; // tooltip text - wxWindow* m_window; // main window we're associated with - wxToolTipOtherWindows *m_others; // other windows associated with it or NULL - wxRect m_rect; // the rect of the window for which this tooltip is shown - // (or a rect with width/height == 0 to show it for the entire window) - unsigned int m_id; // the id of this tooltip (ignored when m_rect width/height is 0) - - wxDECLARE_ABSTRACT_CLASS(wxToolTip); - wxDECLARE_NO_COPY_CLASS(wxToolTip); -}; - -#endif // _WX_MSW_TOOLTIP_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/toplevel.h b/Externals/wxWidgets3/include/wx/msw/toplevel.h deleted file mode 100644 index 3a847e2f4d..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/toplevel.h +++ /dev/null @@ -1,191 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/toplevel.h -// Purpose: wxTopLevelWindowMSW is the MSW implementation of wxTLW -// Author: Vadim Zeitlin -// Modified by: -// Created: 20.09.01 -// Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com) -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_TOPLEVEL_H_ -#define _WX_MSW_TOPLEVEL_H_ - -// ---------------------------------------------------------------------------- -// wxTopLevelWindowMSW -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxTopLevelWindowMSW : public wxTopLevelWindowBase -{ -public: - // constructors and such - wxTopLevelWindowMSW() { Init(); } - - wxTopLevelWindowMSW(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr) - { - Init(); - - (void)Create(parent, id, title, pos, size, style, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr); - - virtual ~wxTopLevelWindowMSW(); - - // implement base class pure virtuals - virtual void SetTitle( const wxString& title); - virtual wxString GetTitle() const; - virtual void Maximize(bool maximize = true); - virtual bool IsMaximized() const; - virtual void Iconize(bool iconize = true); - virtual bool IsIconized() const; - virtual void SetIcons(const wxIconBundle& icons ); - virtual void Restore(); - - virtual void SetLayoutDirection(wxLayoutDirection dir); - - virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO); - - virtual bool Show(bool show = true); - virtual void Raise(); - - virtual void ShowWithoutActivating(); - virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL); - virtual bool IsFullScreen() const { return m_fsIsShowing; } - - // wxMSW only: EnableCloseButton(false) may be used to remove the "Close" - // button from the title bar - virtual bool EnableCloseButton(bool enable = true); - virtual bool EnableMaximizeButton(bool enable = true) wxOVERRIDE; - virtual bool EnableMinimizeButton(bool enable = true) wxOVERRIDE; - - // Set window transparency if the platform supports it - virtual bool SetTransparent(wxByte alpha); - virtual bool CanSetTransparent(); - - - // MSW-specific methods - // -------------------- - - // Return the menu representing the "system" menu of the window. You can - // call wxMenu::AppendWhatever() methods on it but removing items from it - // is in general not a good idea. - // - // The pointer returned by this method belongs to the window and will be - // deleted when the window itself is, do not delete it yourself. May return - // NULL if getting the system menu failed. - wxMenu *MSWGetSystemMenu() const; - - - // implementation from now on - // -------------------------- - - // event handlers - void OnActivate(wxActivateEvent& event); - - // called by wxWindow whenever it gets focus - void SetLastFocus(wxWindow *win) { m_winLastFocused = win; } - wxWindow *GetLastFocus() const { return m_winLastFocused; } - - // translate wxWidgets flags to Windows ones - virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle) const; - - // choose the right parent to use with CreateWindow() - virtual WXHWND MSWGetParent() const; - - // window proc for the frames - WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam); - - // returns true if the platform should explicitly apply a theme border - virtual bool CanApplyThemeBorder() const { return false; } - -protected: - // common part of all ctors - void Init(); - - // create a new frame, return false if it couldn't be created - bool CreateFrame(const wxString& title, - const wxPoint& pos, - const wxSize& size); - - // create a new dialog using the given dialog template from resources, - // return false if it couldn't be created - bool CreateDialog(const void *dlgTemplate, - const wxString& title, - const wxPoint& pos, - const wxSize& size); - - // common part of Iconize(), Maximize() and Restore() - void DoShowWindow(int nShowCmd); - - // override those to return the normal window coordinates even when the - // window is minimized - virtual void DoGetPosition(int *x, int *y) const; - virtual void DoGetSize(int *width, int *height) const; - - // Top level windows have different freeze semantics on Windows - virtual void DoFreeze(); - virtual void DoThaw(); - - // helper of SetIcons(): calls gets the icon with the size specified by the - // given system metrics (SM_C{X|Y}[SM]ICON) from the bundle and sets it - // using WM_SETICON with the specified wParam (ICOM_SMALL or ICON_BIG); - // returns true if the icon was set - bool DoSelectAndSetIcon(const wxIconBundle& icons, int smX, int smY, int i); - - // override wxWindow virtual method to use CW_USEDEFAULT if necessary - virtual void MSWGetCreateWindowCoords(const wxPoint& pos, - const wxSize& size, - int& x, int& y, - int& w, int& h) const; - - - // is the window currently iconized? - bool m_iconized; - - // should the frame be maximized when it will be shown? set by Maximize() - // when it is called while the frame is hidden - bool m_maximizeOnShow; - - // Data to save/restore when calling ShowFullScreen - long m_fsStyle; // Passed to ShowFullScreen - wxRect m_fsOldSize; - long m_fsOldWindowStyle; - bool m_fsIsMaximized; - bool m_fsIsShowing; - - // Save the current focus to m_winLastFocused if we're not iconized (the - // focus is always NULL when we're iconized). - void DoSaveLastFocus(); - - // Restore focus to m_winLastFocused if possible and needed. - void DoRestoreLastFocus(); - - // The last focused child: we remember it when we're deactivated and - // restore focus to it when we're activated (this is done here) or restored - // from iconic state (done by wxFrame). - wxWindow *m_winLastFocused; - -private: - - // The system menu: initially NULL but can be set (once) by - // MSWGetSystemMenu(). Owned by this window. - wxMenu *m_menuSystem; - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_NO_COPY_CLASS(wxTopLevelWindowMSW); -}; - -#endif // _WX_MSW_TOPLEVEL_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/treectrl.h b/Externals/wxWidgets3/include/wx/msw/treectrl.h deleted file mode 100644 index 914cddc395..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/treectrl.h +++ /dev/null @@ -1,348 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/treectrl.h -// Purpose: wxTreeCtrl class -// Author: Julian Smart -// Modified by: Vadim Zeitlin to be less MSW-specific on 10/10/98 -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_TREECTRL_H_ -#define _WX_MSW_TREECTRL_H_ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#if wxUSE_TREECTRL - -#include "wx/textctrl.h" -#include "wx/dynarray.h" -#include "wx/treebase.h" -#include "wx/hashmap.h" - -#ifdef __GNUWIN32__ - // Cygwin windows.h defines these identifiers - #undef GetFirstChild - #undef GetNextSibling -#endif // Cygwin - -// fwd decl -class WXDLLIMPEXP_FWD_CORE wxImageList; -class WXDLLIMPEXP_FWD_CORE wxDragImage; -struct WXDLLIMPEXP_FWD_CORE wxTreeViewItem; - -// hash storing attributes for our items -WX_DECLARE_EXPORTED_VOIDPTR_HASH_MAP(wxTreeItemAttr *, wxMapTreeAttr); - -// ---------------------------------------------------------------------------- -// wxTreeCtrl -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxTreeCtrl : public wxTreeCtrlBase -{ -public: - // creation - // -------- - wxTreeCtrl() { Init(); } - - wxTreeCtrl(wxWindow *parent, wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxTreeCtrlNameStr) - { - Create(parent, id, pos, size, style, validator, name); - } - - virtual ~wxTreeCtrl(); - - bool Create(wxWindow *parent, wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxTreeCtrlNameStr); - - // implement base class pure virtuals - // ---------------------------------- - - virtual unsigned int GetCount() const; - - virtual unsigned int GetIndent() const; - virtual void SetIndent(unsigned int indent); - - virtual void SetImageList(wxImageList *imageList); - virtual void SetStateImageList(wxImageList *imageList); - - virtual wxString GetItemText(const wxTreeItemId& item) const; - virtual int GetItemImage(const wxTreeItemId& item, - wxTreeItemIcon which = wxTreeItemIcon_Normal) const; - virtual wxTreeItemData *GetItemData(const wxTreeItemId& item) const; - virtual wxColour GetItemTextColour(const wxTreeItemId& item) const; - virtual wxColour GetItemBackgroundColour(const wxTreeItemId& item) const; - virtual wxFont GetItemFont(const wxTreeItemId& item) const; - - virtual void SetItemText(const wxTreeItemId& item, const wxString& text); - virtual void SetItemImage(const wxTreeItemId& item, int image, - wxTreeItemIcon which = wxTreeItemIcon_Normal); - virtual void SetItemData(const wxTreeItemId& item, wxTreeItemData *data); - virtual void SetItemHasChildren(const wxTreeItemId& item, bool has = true); - virtual void SetItemBold(const wxTreeItemId& item, bool bold = true); - virtual void SetItemDropHighlight(const wxTreeItemId& item, - bool highlight = true); - virtual void SetItemTextColour(const wxTreeItemId& item, - const wxColour& col); - virtual void SetItemBackgroundColour(const wxTreeItemId& item, - const wxColour& col); - virtual void SetItemFont(const wxTreeItemId& item, const wxFont& font); - - // item status inquiries - // --------------------- - - virtual bool IsVisible(const wxTreeItemId& item) const; - virtual bool ItemHasChildren(const wxTreeItemId& item) const; - virtual bool IsExpanded(const wxTreeItemId& item) const; - virtual bool IsSelected(const wxTreeItemId& item) const; - virtual bool IsBold(const wxTreeItemId& item) const; - - virtual size_t GetChildrenCount(const wxTreeItemId& item, - bool recursively = true) const; - - // navigation - // ---------- - - virtual wxTreeItemId GetRootItem() const; - virtual wxTreeItemId GetSelection() const; - virtual size_t GetSelections(wxArrayTreeItemIds& selections) const; - virtual wxTreeItemId GetFocusedItem() const; - - virtual void ClearFocusedItem(); - virtual void SetFocusedItem(const wxTreeItemId& item); - - - virtual wxTreeItemId GetItemParent(const wxTreeItemId& item) const; - virtual wxTreeItemId GetFirstChild(const wxTreeItemId& item, - wxTreeItemIdValue& cookie) const; - virtual wxTreeItemId GetNextChild(const wxTreeItemId& item, - wxTreeItemIdValue& cookie) const; - virtual wxTreeItemId GetLastChild(const wxTreeItemId& item) const; - - virtual wxTreeItemId GetNextSibling(const wxTreeItemId& item) const; - virtual wxTreeItemId GetPrevSibling(const wxTreeItemId& item) const; - - virtual wxTreeItemId GetFirstVisibleItem() const; - virtual wxTreeItemId GetNextVisible(const wxTreeItemId& item) const; - virtual wxTreeItemId GetPrevVisible(const wxTreeItemId& item) const; - - // operations - // ---------- - - virtual wxTreeItemId AddRoot(const wxString& text, - int image = -1, int selectedImage = -1, - wxTreeItemData *data = NULL); - - virtual void Delete(const wxTreeItemId& item); - virtual void DeleteChildren(const wxTreeItemId& item); - virtual void DeleteAllItems(); - - virtual void Expand(const wxTreeItemId& item); - virtual void Collapse(const wxTreeItemId& item); - virtual void CollapseAndReset(const wxTreeItemId& item); - virtual void Toggle(const wxTreeItemId& item); - - virtual void Unselect(); - virtual void UnselectAll(); - virtual void SelectItem(const wxTreeItemId& item, bool select = true); - virtual void SelectChildren(const wxTreeItemId& parent); - - virtual void EnsureVisible(const wxTreeItemId& item); - virtual void ScrollTo(const wxTreeItemId& item); - - virtual wxTextCtrl *EditLabel(const wxTreeItemId& item, - wxClassInfo* textCtrlClass = wxCLASSINFO(wxTextCtrl)); - virtual wxTextCtrl *GetEditControl() const; - virtual void EndEditLabel(const wxTreeItemId& WXUNUSED(item), - bool discardChanges = false) - { - DoEndEditLabel(discardChanges); - } - - virtual void SortChildren(const wxTreeItemId& item); - - virtual bool GetBoundingRect(const wxTreeItemId& item, - wxRect& rect, - bool textOnly = false) const; - - // implementation - // -------------- - - virtual wxVisualAttributes GetDefaultAttributes() const - { - return GetClassDefaultAttributes(GetWindowVariant()); - } - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - - virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); - virtual WXLRESULT MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); - virtual bool MSWCommand(WXUINT param, WXWORD id); - virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); - virtual bool MSWShouldPreProcessMessage(WXMSG* msg); - - // override some base class virtuals - virtual bool SetBackgroundColour(const wxColour &colour); - virtual bool SetForegroundColour(const wxColour &colour); - - // returns true if the platform should explicitly apply a theme border - virtual bool CanApplyThemeBorder() const { return false; } - -protected: - // Implement "update locking" in a custom way for this control. - virtual void DoFreeze(); - virtual void DoThaw(); - - virtual void DoSetSize(int x, int y, - int width, int height, - int sizeFlags = wxSIZE_AUTO); - - // SetImageList helper - void SetAnyImageList(wxImageList *imageList, int which); - - // refresh a single item - void RefreshItem(const wxTreeItemId& item); - - // end edit label - void DoEndEditLabel(bool discardChanges = false); - - virtual int DoGetItemState(const wxTreeItemId& item) const; - virtual void DoSetItemState(const wxTreeItemId& item, int state); - - virtual wxTreeItemId DoInsertItem(const wxTreeItemId& parent, - size_t pos, - const wxString& text, - int image, int selectedImage, - wxTreeItemData *data); - virtual wxTreeItemId DoInsertAfter(const wxTreeItemId& parent, - const wxTreeItemId& idPrevious, - const wxString& text, - int image = -1, int selImage = -1, - wxTreeItemData *data = NULL); - virtual wxTreeItemId DoTreeHitTest(const wxPoint& point, int& flags) const; - - // obtain the user data for the lParam member of TV_ITEM - class wxTreeItemParam *GetItemParam(const wxTreeItemId& item) const; - - // update the event to include the items client data and pass it to - // HandleWindowEvent(), return true if it processed it - bool HandleTreeEvent(wxTreeEvent& event) const; - - // pass the event to HandleTreeEvent() and return true if the event was - // either unprocessed or not vetoed - bool IsTreeEventAllowed(wxTreeEvent& event) const - { - return !HandleTreeEvent(event) || event.IsAllowed(); - } - - // generate a wxEVT_KEY_DOWN event from the specified WPARAM/LPARAM values - // having the same meaning as for WM_KEYDOWN, return true if it was - // processed - bool MSWHandleTreeKeyDownEvent(WXWPARAM wParam, WXLPARAM lParam); - - // handle a key event in a multi-selection control, should be only called - // for keys which can be used to change the selection - // - // return true if the key was processed, false otherwise - bool MSWHandleSelectionKey(unsigned vkey); - - - // data used only while editing the item label: - wxTextCtrl *m_textCtrl; // text control in which it is edited - wxTreeItemId m_idEdited; // the item being edited - -private: - // the common part of all ctors - void Init(); - - // helper functions - bool DoGetItem(wxTreeViewItem *tvItem) const; - void DoSetItem(wxTreeViewItem *tvItem); - - void DoExpand(const wxTreeItemId& item, int flag); - - void DoSelectItem(const wxTreeItemId& item, bool select = true); - void DoUnselectItem(const wxTreeItemId& item); - void DoToggleItemSelection(const wxTreeItemId& item); - - void DoUnselectAll(); - void DoSelectChildren(const wxTreeItemId& parent); - - void DeleteTextCtrl(); - - // return true if the item is the hidden root one (i.e. it's the root item - // and the tree has wxTR_HIDE_ROOT style) - bool IsHiddenRoot(const wxTreeItemId& item) const; - - - // check if the given flags (taken from TV_HITTESTINFO structure) - // indicate a position "on item": this is less trivial than just checking - // for TVHT_ONITEM because we consider that points to the left and right of - // item text are also "on item" when wxTR_FULL_ROW_HIGHLIGHT is used as the - // item visually spans the entire breadth of the window then - bool MSWIsOnItem(unsigned flags) const; - - // Delete the given item from the native control. - bool MSWDeleteItem(const wxTreeItemId& item); - - - // the hash storing the items attributes (indexed by item ids) - wxMapTreeAttr m_attrs; - - // true if the hash above is not empty - bool m_hasAnyAttr; - -#if wxUSE_DRAGIMAGE - // used for dragging - wxDragImage *m_dragImage; -#endif - - // Virtual root item, if wxTR_HIDE_ROOT is set. - void* m_pVirtualRoot; - - // the starting item for selection with Shift - wxTreeItemId m_htSelStart, m_htClickedItem; - wxPoint m_ptClick; - - // whether dragging has started - bool m_dragStarted; - - // whether focus was lost between subsequent clicks of a single item - bool m_focusLost; - - // set when we are changing selection ourselves (only used in multi - // selection mode) - bool m_changingSelection; - - // whether we need to trigger a state image click event - bool m_triggerStateImageClick; - - // whether we need to deselect other items on mouse up - bool m_mouseUpDeselect; - - // The size to restore the control to when it is thawed, see DoThaw(). - wxSize m_thawnSize; - - friend class wxTreeItemIndirectData; - friend class wxTreeSortHelper; - - wxDECLARE_DYNAMIC_CLASS(wxTreeCtrl); - wxDECLARE_NO_COPY_CLASS(wxTreeCtrl); -}; - -#endif // wxUSE_TREECTRL - -#endif // _WX_MSW_TREECTRL_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/uxtheme.h b/Externals/wxWidgets3/include/wx/msw/uxtheme.h deleted file mode 100644 index f15973e305..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/uxtheme.h +++ /dev/null @@ -1,320 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/uxtheme.h -// Purpose: wxUxThemeEngine class: support for XP themes -// Author: John Platts, Vadim Zeitlin -// Modified by: -// Created: 2003 -// Copyright: (c) 2003 John Platts, Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_UXTHEME_H_ -#define _WX_UXTHEME_H_ - -#include "wx/defs.h" - -#include "wx/msw/private.h" // we use GetHwndOf() -#include "wx/msw/uxthemep.h" - -// Amazingly, GetThemeFont() and GetThemeSysFont() functions use LOGFONTA under -// XP but LOGFONTW (even in non-Unicode build) under later versions of Windows. -// If we declare them as taking LOGFONT below, the code would be able to -// silently pass LOGFONTA to them in ANSI build and would crash at run-time -// under Windows Vista/7 because of a buffer overrun (LOGFONTA being smaller -// than LOGFONTW expected by these functions). If we we declare them as taking -// LOGFONTW, the code wouldn't work correctly under XP. So we use a special -// wxUxThemeFont class to encapsulate this and intentionally change the LOGFONT -// output parameters of the theme functions to take it instead. - -class wxUxThemeFont -{ -public: - // Trivial default ctor. - wxUxThemeFont() { } - - // Just some unique type. - struct Ptr { }; - -#if wxUSE_UNICODE - // In Unicode build we always use LOGFONT anyhow so this class is - // completely trivial. - Ptr *GetPtr() { return reinterpret_cast(&m_lfW); } - const LOGFONTW& GetLOGFONT() { return m_lfW; } -#else // !wxUSE_UNICODE - // Return either LOGFONTA or LOGFONTW pointer as required by the current - // Windows version. - Ptr *GetPtr() - { - return UseLOGFONTW() ? reinterpret_cast(&m_lfW) - : reinterpret_cast(&m_lfA); - } - - // This method returns LOGFONT (i.e. LOGFONTA in ANSI build and LOGFONTW in - // Unicode one) which can be used with other, normal, Windows or wx - // functions. Internally it may need to transform LOGFONTW to LOGFONTA. - const LOGFONTA& GetLOGFONT() - { - if ( UseLOGFONTW() ) - { - // Most of the fields are the same in LOGFONTA and LOGFONTW so just - // copy everything by default. - memcpy(&m_lfA, &m_lfW, sizeof(m_lfA)); - - // But the face name must be converted from Unicode. - WideCharToMultiByte(CP_ACP, 0, m_lfW.lfFaceName, -1, - m_lfA.lfFaceName, sizeof(m_lfA.lfFaceName), - NULL, NULL); - } - - return m_lfA; - } - -private: - static bool UseLOGFONTW() - { - return wxGetWinVersion() >= wxWinVersion_Vista; - } - - LOGFONTA m_lfA; -#endif // wxUSE_UNICODE/!wxUSE_UNICODE - -private: - LOGFONTW m_lfW; - - wxDECLARE_NO_COPY_CLASS(wxUxThemeFont); -}; - -typedef int(__stdcall *DTT_CALLBACK_PROC)(HDC hdc, const wchar_t * pszText, int cchText, RECT * prc, unsigned int dwFlags, WXLPARAM lParam); - -typedef struct _DTTOPTS -{ - DWORD dwSize; - DWORD dwFlags; - COLORREF crText; - COLORREF crBorder; - COLORREF crShadow; - int iTextShadowType; - POINT ptShadowOffset; - int iBorderSize; - int iFontPropId; - int iColorPropId; - int iStateId; - BOOL fApplyOverlay; - int iGlowSize; - DTT_CALLBACK_PROC pfnDrawTextCallback; - WXLPARAM lParam; -} DTTOPTS, *PDTTOPTS; - -typedef HTHEME (__stdcall *PFNWXUOPENTHEMEDATA)(HWND, const wchar_t *); -typedef HRESULT (__stdcall *PFNWXUCLOSETHEMEDATA)(HTHEME); -typedef HRESULT (__stdcall *PFNWXUDRAWTHEMEBACKGROUND)(HTHEME, HDC, int, int, const RECT *, const RECT *); -typedef HRESULT (__stdcall *PFNWXUDRAWTHEMETEXT)(HTHEME, HDC, int, int, const wchar_t *, int, DWORD, DWORD, const RECT *); -typedef HRESULT (__stdcall *PFNWXUDRAWTHEMETEXTEX)(HTHEME, HDC, int, int, const wchar_t *, int, DWORD, RECT *, const DTTOPTS *); -typedef HRESULT (__stdcall *PFNWXUGETTHEMEBACKGROUNDCONTENTRECT)(HTHEME, HDC, int, int, const RECT *, RECT *); -typedef HRESULT (__stdcall *PFNWXUGETTHEMEBACKGROUNDEXTENT)(HTHEME, HDC, int, int, const RECT *, RECT *); -typedef HRESULT (__stdcall *PFNWXUGETTHEMEPARTSIZE)(HTHEME, HDC, int, int, const RECT *, /* enum */ THEMESIZE, SIZE *); -typedef HRESULT (__stdcall *PFNWXUGETTHEMETEXTEXTENT)(HTHEME, HDC, int, int, const wchar_t *, int, DWORD, const RECT *, RECT *); -typedef HRESULT (__stdcall *PFNWXUGETTHEMETEXTMETRICS)(HTHEME, HDC, int, int, TEXTMETRIC*); -typedef HRESULT (__stdcall *PFNWXUGETTHEMEBACKGROUNDREGION)(HTHEME, HDC, int, int, const RECT *, HRGN *); -typedef HRESULT (__stdcall *PFNWXUHITTESTTHEMEBACKGROUND)(HTHEME, HDC, int, int, DWORD, const RECT *, HRGN, POINT, unsigned short *); -typedef HRESULT (__stdcall *PFNWXUDRAWTHEMEEDGE)(HTHEME, HDC, int, int, const RECT *, unsigned int, unsigned int, RECT *); -typedef HRESULT (__stdcall *PFNWXUDRAWTHEMEICON)(HTHEME, HDC, int, int, const RECT *, HIMAGELIST, int); -typedef BOOL (__stdcall *PFNWXUISTHEMEPARTDEFINED)(HTHEME, int, int); -typedef BOOL (__stdcall *PFNWXUISTHEMEBACKGROUNDPARTIALLYTRANSPARENT)(HTHEME, int, int); -typedef HRESULT (__stdcall *PFNWXUGETTHEMECOLOR)(HTHEME, int, int, int, COLORREF*); -typedef HRESULT (__stdcall *PFNWXUGETTHEMEMETRIC)(HTHEME, HDC, int, int, int, int *); -typedef HRESULT (__stdcall *PFNWXUGETTHEMESTRING)(HTHEME, int, int, int, wchar_t *, int); -typedef HRESULT (__stdcall *PFNWXUGETTHEMEBOOL)(HTHEME, int, int, int, BOOL *); -typedef HRESULT (__stdcall *PFNWXUGETTHEMEINT)(HTHEME, int, int, int, int *); -typedef HRESULT (__stdcall *PFNWXUGETTHEMEENUMVALUE)(HTHEME, int, int, int, int *); -typedef HRESULT (__stdcall *PFNWXUGETTHEMEPOSITION)(HTHEME, int, int, int, POINT *); -typedef HRESULT (__stdcall *PFNWXUGETTHEMEFONT)(HTHEME, HDC, int, int, int, wxUxThemeFont::Ptr *); -typedef HRESULT (__stdcall *PFNWXUGETTHEMERECT)(HTHEME, int, int, int, RECT *); -typedef HRESULT (__stdcall *PFNWXUGETTHEMEMARGINS)(HTHEME, HDC, int, int, int, RECT *, MARGINS *); -typedef HRESULT (__stdcall *PFNWXUGETTHEMEINTLIST)(HTHEME, int, int, int, INTLIST*); -typedef HRESULT (__stdcall *PFNWXUGETTHEMEPROPERTYORIGIN)(HTHEME, int, int, int, /* enum */ PROPERTYORIGIN *); -typedef HRESULT (__stdcall *PFNWXUSETWINDOWTHEME)(HWND, const wchar_t*, const wchar_t *); -typedef HRESULT (__stdcall *PFNWXUGETTHEMEFILENAME)(HTHEME, int, int, int, wchar_t *, int); -typedef COLORREF(__stdcall *PFNWXUGETTHEMESYSCOLOR)(HTHEME, int); -typedef HBRUSH (__stdcall *PFNWXUGETTHEMESYSCOLORBRUSH)(HTHEME, int); -typedef BOOL (__stdcall *PFNWXUGETTHEMESYSBOOL)(HTHEME, int); -typedef int (__stdcall *PFNWXUGETTHEMESYSSIZE)(HTHEME, int); -typedef HRESULT (__stdcall *PFNWXUGETTHEMESYSFONT)(HTHEME, int, wxUxThemeFont::Ptr *); -typedef HRESULT (__stdcall *PFNWXUGETTHEMESYSSTRING)(HTHEME, int, wchar_t *, int); -typedef HRESULT (__stdcall *PFNWXUGETTHEMESYSINT)(HTHEME, int, int *); -typedef BOOL (__stdcall *PFNWXUISTHEMEACTIVE)(); -typedef BOOL (__stdcall *PFNWXUISAPPTHEMED)(); -typedef HTHEME (__stdcall *PFNWXUGETWINDOWTHEME)(HWND); -typedef HRESULT (__stdcall *PFNWXUENABLETHEMEDIALOGTEXTURE)(HWND, DWORD); -typedef BOOL (__stdcall *PFNWXUISTHEMEDIALOGTEXTUREENABLED)(HWND); -typedef DWORD (__stdcall *PFNWXUGETTHEMEAPPPROPERTIES)(); -typedef void (__stdcall *PFNWXUSETTHEMEAPPPROPERTIES)(DWORD); -typedef HRESULT (__stdcall *PFNWXUGETCURRENTTHEMENAME)(wchar_t *, int, wchar_t *, int, wchar_t *, int); -typedef HRESULT (__stdcall *PFNWXUGETTHEMEDOCUMENTATIONPROPERTY)(const wchar_t *, const wchar_t *, wchar_t *, int); -typedef HRESULT (__stdcall *PFNWXUDRAWTHEMEPARENTBACKGROUND)(HWND, HDC, RECT *); -typedef HRESULT (__stdcall *PFNWXUENABLETHEMING)(BOOL); - -// ---------------------------------------------------------------------------- -// wxUxThemeEngine: provides all theme functions from uxtheme.dll -// ---------------------------------------------------------------------------- - -// we always define this class, even if wxUSE_UXTHEME == 0, but we just make it -// empty in this case -- this allows to use it elsewhere without any #ifdefs -#if wxUSE_UXTHEME - #include "wx/dynlib.h" - - #define wxUX_THEME_DECLARE(type, func) type func; -#else - #define wxUX_THEME_DECLARE(type, func) type func(...) { return 0; } -#endif - -class WXDLLIMPEXP_CORE wxUxThemeEngine -{ -public: - // get the theme engine or NULL if themes are not available - static wxUxThemeEngine *Get(); - - // get the theme enging or NULL if themes are not available or not used for - // this application - static wxUxThemeEngine *GetIfActive(); - - // all uxtheme.dll functions - wxUX_THEME_DECLARE(PFNWXUOPENTHEMEDATA, OpenThemeData) - wxUX_THEME_DECLARE(PFNWXUCLOSETHEMEDATA, CloseThemeData) - wxUX_THEME_DECLARE(PFNWXUDRAWTHEMEBACKGROUND, DrawThemeBackground) - wxUX_THEME_DECLARE(PFNWXUDRAWTHEMETEXT, DrawThemeText) - wxUX_THEME_DECLARE(PFNWXUDRAWTHEMETEXTEX, DrawThemeTextEx) - wxUX_THEME_DECLARE(PFNWXUGETTHEMEBACKGROUNDCONTENTRECT, GetThemeBackgroundContentRect) - wxUX_THEME_DECLARE(PFNWXUGETTHEMEBACKGROUNDEXTENT, GetThemeBackgroundExtent) - wxUX_THEME_DECLARE(PFNWXUGETTHEMEPARTSIZE, GetThemePartSize) - wxUX_THEME_DECLARE(PFNWXUGETTHEMETEXTEXTENT, GetThemeTextExtent) - wxUX_THEME_DECLARE(PFNWXUGETTHEMETEXTMETRICS, GetThemeTextMetrics) - wxUX_THEME_DECLARE(PFNWXUGETTHEMEBACKGROUNDREGION, GetThemeBackgroundRegion) - wxUX_THEME_DECLARE(PFNWXUHITTESTTHEMEBACKGROUND, HitTestThemeBackground) - wxUX_THEME_DECLARE(PFNWXUDRAWTHEMEEDGE, DrawThemeEdge) - wxUX_THEME_DECLARE(PFNWXUDRAWTHEMEICON, DrawThemeIcon) - wxUX_THEME_DECLARE(PFNWXUISTHEMEPARTDEFINED, IsThemePartDefined) - wxUX_THEME_DECLARE(PFNWXUISTHEMEBACKGROUNDPARTIALLYTRANSPARENT, IsThemeBackgroundPartiallyTransparent) - wxUX_THEME_DECLARE(PFNWXUGETTHEMECOLOR, GetThemeColor) - wxUX_THEME_DECLARE(PFNWXUGETTHEMEMETRIC, GetThemeMetric) - wxUX_THEME_DECLARE(PFNWXUGETTHEMESTRING, GetThemeString) - wxUX_THEME_DECLARE(PFNWXUGETTHEMEBOOL, GetThemeBool) - wxUX_THEME_DECLARE(PFNWXUGETTHEMEINT, GetThemeInt) - wxUX_THEME_DECLARE(PFNWXUGETTHEMEENUMVALUE, GetThemeEnumValue) - wxUX_THEME_DECLARE(PFNWXUGETTHEMEPOSITION, GetThemePosition) - wxUX_THEME_DECLARE(PFNWXUGETTHEMEFONT, GetThemeFont) - wxUX_THEME_DECLARE(PFNWXUGETTHEMERECT, GetThemeRect) - wxUX_THEME_DECLARE(PFNWXUGETTHEMEMARGINS, GetThemeMargins) - wxUX_THEME_DECLARE(PFNWXUGETTHEMEINTLIST, GetThemeIntList) - wxUX_THEME_DECLARE(PFNWXUGETTHEMEPROPERTYORIGIN, GetThemePropertyOrigin) - wxUX_THEME_DECLARE(PFNWXUSETWINDOWTHEME, SetWindowTheme) - wxUX_THEME_DECLARE(PFNWXUGETTHEMEFILENAME, GetThemeFilename) - wxUX_THEME_DECLARE(PFNWXUGETTHEMESYSCOLOR, GetThemeSysColor) - wxUX_THEME_DECLARE(PFNWXUGETTHEMESYSCOLORBRUSH, GetThemeSysColorBrush) - wxUX_THEME_DECLARE(PFNWXUGETTHEMESYSBOOL, GetThemeSysBool) - wxUX_THEME_DECLARE(PFNWXUGETTHEMESYSSIZE, GetThemeSysSize) - wxUX_THEME_DECLARE(PFNWXUGETTHEMESYSFONT, GetThemeSysFont) - wxUX_THEME_DECLARE(PFNWXUGETTHEMESYSSTRING, GetThemeSysString) - wxUX_THEME_DECLARE(PFNWXUGETTHEMESYSINT, GetThemeSysInt) - wxUX_THEME_DECLARE(PFNWXUISTHEMEACTIVE, IsThemeActive) - wxUX_THEME_DECLARE(PFNWXUISAPPTHEMED, IsAppThemed) - wxUX_THEME_DECLARE(PFNWXUGETWINDOWTHEME, GetWindowTheme) - wxUX_THEME_DECLARE(PFNWXUENABLETHEMEDIALOGTEXTURE, EnableThemeDialogTexture) - wxUX_THEME_DECLARE(PFNWXUISTHEMEDIALOGTEXTUREENABLED, IsThemeDialogTextureEnabled) - wxUX_THEME_DECLARE(PFNWXUGETTHEMEAPPPROPERTIES, GetThemeAppProperties) - wxUX_THEME_DECLARE(PFNWXUSETTHEMEAPPPROPERTIES, SetThemeAppProperties) - wxUX_THEME_DECLARE(PFNWXUGETCURRENTTHEMENAME, GetCurrentThemeName) - wxUX_THEME_DECLARE(PFNWXUGETTHEMEDOCUMENTATIONPROPERTY, GetThemeDocumentationProperty) - wxUX_THEME_DECLARE(PFNWXUDRAWTHEMEPARENTBACKGROUND, DrawThemeParentBackground) - wxUX_THEME_DECLARE(PFNWXUENABLETHEMING, EnableTheming) - -private: - // construcor is private as only Get() can create us and is also trivial as - // everything really happens in Initialize() - wxUxThemeEngine() { } - - // destructor is private as only Get() and wxUxThemeModule delete us, it is - // not virtual as we're not supposed to be derived from - ~wxUxThemeEngine() { } - -#if wxUSE_UXTHEME - // initialize the theme engine: load the DLL, resolve the functions - // - // return true if we can be used, false if themes are not available - bool Initialize(); - - - // uxtheme.dll - wxDynamicLibrary m_dllUxTheme; - - - // the one and only theme engine, initially NULL - static wxUxThemeEngine *ms_themeEngine; - - // this is a bool which initially has the value -1 meaning "unknown" - static int ms_isThemeEngineAvailable; - - // it must be able to delete us - friend class wxUxThemeModule; -#endif // wxUSE_UXTHEME - - wxDECLARE_NO_COPY_CLASS(wxUxThemeEngine); -}; - -#if wxUSE_UXTHEME - -/* static */ inline wxUxThemeEngine *wxUxThemeEngine::GetIfActive() -{ - wxUxThemeEngine *engine = Get(); - return engine && engine->IsAppThemed() && engine->IsThemeActive() - ? engine - : NULL; -} - -#else // !wxUSE_UXTHEME - -/* static */ inline wxUxThemeEngine *wxUxThemeEngine::Get() -{ - return NULL; -} - -/* static */ inline wxUxThemeEngine *wxUxThemeEngine::GetIfActive() -{ - return NULL; -} - -#endif // wxUSE_UXTHEME/!wxUSE_UXTHEME - -// ---------------------------------------------------------------------------- -// wxUxThemeHandle: encapsulates ::Open/CloseThemeData() -// ---------------------------------------------------------------------------- - -class wxUxThemeHandle -{ -public: - wxUxThemeHandle(const wxWindow *win, const wchar_t *classes) - { - wxUxThemeEngine *engine = wxUxThemeEngine::Get(); - - m_hTheme = engine ? (HTHEME)engine->OpenThemeData(GetHwndOf(win), classes) - : NULL; - } - - operator HTHEME() const { return m_hTheme; } - - ~wxUxThemeHandle() - { - if ( m_hTheme ) - { - wxUxThemeEngine::Get()->CloseThemeData(m_hTheme); - } - } - -private: - HTHEME m_hTheme; - - wxDECLARE_NO_COPY_CLASS(wxUxThemeHandle); -}; - -#endif // _WX_UXTHEME_H_ - diff --git a/Externals/wxWidgets3/include/wx/msw/uxthemep.h b/Externals/wxWidgets3/include/wx/msw/uxthemep.h deleted file mode 100644 index 3d5123b9cf..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/uxthemep.h +++ /dev/null @@ -1,169 +0,0 @@ -/* - * Win32 5.1 theme definitions - * - * Copyright (C) 2003 Kevin Koltzau - * - * Originally written for the Wine project, and issued under - * the wxWindows licence by kind permission of the author. - * - * Licence: wxWindows licence - */ - -#ifndef __WINE_UXTHEME_H -#define __WINE_UXTHEME_H - -#include "wx/msw/wrapcctl.h" - -typedef HANDLE HTHEME; - -HRESULT WINAPI CloseThemeData(HTHEME hTheme); -HRESULT WINAPI DrawThemeBackground(HTHEME,HDC,int,int,const RECT*,const RECT*); - -#define DTBG_CLIPRECT 0x00000001 -#define DTBG_DRAWSOLID 0x00000002 -#define DTBG_OMITBORDER 0x00000004 -#define DTBG_OMITCONTENT 0x00000008 -#define DTBG_COMPUTINGREGION 0x00000010 -#define DTBG_MIRRORDC 0x00000020 - -typedef struct _DTBGOPTS { - DWORD dwSize; - DWORD dwFlags; - RECT rcClip; -} DTBGOPTS, *PDTBGOPTS; - -HRESULT WINAPI DrawThemeBackgroundEx(HTHEME,HDC,int,int,const RECT*, - const DTBGOPTS*); -HRESULT WINAPI DrawThemeEdge(HTHEME,HDC,int,int,const RECT*,UINT,UINT, - RECT*); -HRESULT WINAPI DrawThemeIcon(HTHEME,HDC,int,int,const RECT*,HIMAGELIST,int); -HRESULT WINAPI DrawThemeParentBackground(HWND,HDC,RECT*); - -#define DTT_GRAYED 0x1 - -HRESULT WINAPI DrawThemeText(HTHEME,HDC,int,int,LPCWSTR,int,DWORD,DWORD, - const RECT*); - -#define ETDT_DISABLE 0x00000001 -#define ETDT_ENABLE 0x00000002 -#define ETDT_USETABTEXTURE 0x00000004 -#define ETDT_ENABLETAB (ETDT_ENABLE|ETDT_USETABTEXTURE) - -HRESULT WINAPI EnableThemeDialogTexture(HWND,DWORD); -HRESULT WINAPI EnableTheming(BOOL); -HRESULT WINAPI GetCurrentThemeName(LPWSTR,int,LPWSTR,int,LPWSTR,int); - -#define STAP_ALLOW_NONCLIENT (1<<0) -#define STAP_ALLOW_CONTROLS (1<<1) -#define STAP_ALLOW_WEBCONTENT (1<<2) - -DWORD WINAPI GetThemeAppProperties(void); -HRESULT WINAPI GetThemeBackgroundContentRect(HTHEME,HDC,int,int, - const RECT*,RECT*); -HRESULT WINAPI GetThemeBackgroundExtent(HTHEME,HDC,int,int,const RECT*,RECT*); -HRESULT WINAPI GetThemeBackgroundRegion(HTHEME,HDC,int,int,const RECT*,HRGN*); -HRESULT WINAPI GetThemeBool(HTHEME,int,int,int,BOOL*); -HRESULT WINAPI GetThemeColor(HTHEME,int,int,int,COLORREF*); - -#if defined(__GNUC__) -# define SZ_THDOCPROP_DISPLAYNAME (const WCHAR []){ 'D','i','s','p','l','a','y','N','a','m','e',0 } -# define SZ_THDOCPROP_CANONICALNAME (const WCHAR []){ 'T','h','e','m','e','N','a','m','e',0 } -# define SZ_THDOCPROP_TOOLTIP (const WCHAR []){ 'T','o','o','l','T','i','p',0 } -# define SZ_THDOCPROP_AUTHOR (const WCHAR []){ 'a','u','t','h','o','r',0 } -#else /* lif defined(_MSC_VER) */ -# define SZ_THDOCPROP_DISPLAYNAME L"DisplayName" -# define SZ_THDOCPROP_CANONICALNAME L"ThemeName" -# define SZ_THDOCPROP_TOOLTIP L"ToolTip" -# define SZ_THDOCPROP_AUTHOR L"author" -/* -#else -static const WCHAR SZ_THDOCPROP_DISPLAYNAME[] = { 'D','i','s','p','l','a','y','N','a','m','e',0 }; -static const WCHAR SZ_THDOCPROP_CANONICALNAME[] = { 'T','h','e','m','e','N','a','m','e',0 }; -static const WCHAR SZ_THDOCPROP_TOOLTIP[] = { 'T','o','o','l','T','i','p',0 }; -static const WCHAR SZ_THDOCPROP_AUTHOR[] = { 'a','u','t','h','o','r',0 }; -*/ -#endif - -HRESULT WINAPI GetThemeDocumentationProperty(LPCWSTR,LPCWSTR,LPWSTR,int); -HRESULT WINAPI GetThemeEnumValue(HTHEME,int,int,int,int*); -HRESULT WINAPI GetThemeFilename(HTHEME,int,int,int,LPWSTR,int); -HRESULT WINAPI GetThemeFont(HTHEME,HDC,int,int,int,LOGFONTW*); -HRESULT WINAPI GetThemeInt(HTHEME,int,int,int,int*); - -#define MAX_INTLIST_COUNT 10 -typedef struct _INTLIST { - int iValueCount; - int iValues[MAX_INTLIST_COUNT]; -} INTLIST, *PINTLIST; - -HRESULT WINAPI GetThemeIntList(HTHEME,int,int,int,INTLIST*); - -typedef struct _MARGINS { - int cxLeftWidth; - int cxRightWidth; - int cyTopHeight; - int cyBottomHeight; -} MARGINS, *PMARGINS; - -HRESULT WINAPI GetThemeMargins(HTHEME,HDC,int,int,int,RECT*,MARGINS*); -HRESULT WINAPI GetThemeMetric(HTHEME,HDC,int,int,int,int*); - -typedef enum { - TS_MIN, - TS_TRUE, - TS_DRAW -} THEMESIZE; - -HRESULT WINAPI GetThemePartSize(HTHEME,HDC,int,int,RECT*,THEMESIZE,SIZE*); -HRESULT WINAPI GetThemePosition(HTHEME,int,int,int,POINT*); - -typedef enum { - PO_STATE, - PO_PART, - PO_CLASS, - PO_GLOBAL, - PO_NOTFOUND -} PROPERTYORIGIN; - -HRESULT WINAPI GetThemePropertyOrigin(HTHEME,int,int,int,PROPERTYORIGIN*); -HRESULT WINAPI GetThemeRect(HTHEME,int,int,int,RECT*); -HRESULT WINAPI GetThemeString(HTHEME,int,int,int,LPWSTR,int); -BOOL WINAPI GetThemeSysBool(HTHEME,int); -COLORREF WINAPI GetThemeSysColor(HTHEME,int); -HBRUSH WINAPI GetThemeSysColorBrush(HTHEME,int); -HRESULT WINAPI GetThemeSysFont(HTHEME,int,LOGFONTW*); -HRESULT WINAPI GetThemeSysInt(HTHEME,int,int*); -int WINAPI GetThemeSysSize(HTHEME,int); -HRESULT WINAPI GetThemeSysString(HTHEME,int,LPWSTR,int); -HRESULT WINAPI GetThemeTextExtent(HTHEME,HDC,int,int,LPCWSTR,int,DWORD, - const RECT*,RECT*); -HRESULT WINAPI GetThemeTextMetrics(HTHEME,HDC,int,int,TEXTMETRICW*); -HTHEME WINAPI GetWindowTheme(HWND); - -#define HTTB_BACKGROUNDSEG 0x0000 -#define HTTB_FIXEDBORDER 0x0002 -#define HTTB_CAPTION 0x0004 -#define HTTB_RESIZINGBORDER_LEFT 0x0010 -#define HTTB_RESIZINGBORDER_TOP 0x0020 -#define HTTB_RESIZINGBORDER_RIGHT 0x0040 -#define HTTB_RESIZINGBORDER_BOTTOM 0x0080 -#define HTTB_RESIZINGBORDER \ - (HTTB_RESIZINGBORDER_LEFT|HTTB_RESIZINGBORDER_TOP|\ - HTTB_RESIZINGBORDER_RIGHT|HTTB_RESIZINGBORDER_BOTTOM) -#define HTTB_SIZINGTEMPLATE 0x0100 -#define HTTB_SYSTEMSIZINGMARGINS 0x0200 - -HRESULT WINAPI HitTestThemeBackground(HTHEME,HDC,int,int,DWORD,const RECT*, - HRGN,POINT,WORD*); -BOOL WINAPI IsAppThemed(void); -BOOL WINAPI IsThemeActive(void); -BOOL WINAPI IsThemeBackgroundPartiallyTransparent(HTHEME,int,int); -BOOL WINAPI IsThemeDialogTextureEnabled(void); -BOOL WINAPI IsThemePartDefined(HTHEME,int,int); -HTHEME WINAPI OpenThemeData(HWND,LPCWSTR); -void WINAPI SetThemeAppProperties(DWORD); -HRESULT WINAPI SetWindowTheme(HWND,LPCWSTR,LPCWSTR); - - -#endif - diff --git a/Externals/wxWidgets3/include/wx/msw/webview_ie.h b/Externals/wxWidgets3/include/wx/msw/webview_ie.h deleted file mode 100644 index 07f7cc6738..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/webview_ie.h +++ /dev/null @@ -1,356 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: include/wx/msw/webview_ie.h -// Purpose: wxMSW IE wxWebView backend -// Author: Marianne Gagnon -// Copyright: (c) 2010 Marianne Gagnon, 2011 Steven Lamerton -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef wxWebViewIE_H -#define wxWebViewIE_H - -#include "wx/setup.h" - -#if wxUSE_WEBVIEW && wxUSE_WEBVIEW_IE && defined(__WXMSW__) - -#include "wx/control.h" -#include "wx/webview.h" -#include "wx/msw/ole/automtn.h" -#include "wx/msw/ole/activex.h" -#include "wx/msw/ole/oleutils.h" -#include "wx/msw/private/comptr.h" -#include "wx/msw/wrapwin.h" -#include "wx/msw/missing.h" -#include "wx/msw/webview_missing.h" -#include "wx/sharedptr.h" -#include "wx/vector.h" - -struct IHTMLDocument2; -struct IHTMLElement; -struct IMarkupPointer; -class wxFSFile; -class ClassFactory; -class wxIEContainer; -class DocHostUIHandler; -class wxFindPointers; -class wxIInternetProtocol; - -class WXDLLIMPEXP_WEBVIEW wxWebViewIE : public wxWebView -{ -public: - - wxWebViewIE() {} - - wxWebViewIE(wxWindow* parent, - wxWindowID id, - const wxString& url = wxWebViewDefaultURLStr, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxWebViewNameStr) - { - Create(parent, id, url, pos, size, style, name); - } - - ~wxWebViewIE(); - - bool Create(wxWindow* parent, - wxWindowID id, - const wxString& url = wxWebViewDefaultURLStr, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxWebViewNameStr); - - virtual void LoadURL(const wxString& url); - virtual void LoadHistoryItem(wxSharedPtr item); - virtual wxVector > GetBackwardHistory(); - virtual wxVector > GetForwardHistory(); - - virtual bool CanGoForward() const; - virtual bool CanGoBack() const; - virtual void GoBack(); - virtual void GoForward(); - virtual void ClearHistory(); - virtual void EnableHistory(bool enable = true); - virtual void Stop(); - virtual void Reload(wxWebViewReloadFlags flags = wxWEBVIEW_RELOAD_DEFAULT); - - virtual wxString GetPageSource() const; - virtual wxString GetPageText() const; - - virtual bool IsBusy() const; - virtual wxString GetCurrentURL() const; - virtual wxString GetCurrentTitle() const; - - virtual void SetZoomType(wxWebViewZoomType); - virtual wxWebViewZoomType GetZoomType() const; - virtual bool CanSetZoomType(wxWebViewZoomType) const; - - virtual void Print(); - - virtual wxWebViewZoom GetZoom() const; - virtual void SetZoom(wxWebViewZoom zoom); - - //Clipboard functions - virtual bool CanCut() const; - virtual bool CanCopy() const; - virtual bool CanPaste() const; - virtual void Cut(); - virtual void Copy(); - virtual void Paste(); - - //Undo / redo functionality - virtual bool CanUndo() const; - virtual bool CanRedo() const; - virtual void Undo(); - virtual void Redo(); - - //Find function - virtual long Find(const wxString& text, int flags = wxWEBVIEW_FIND_DEFAULT); - - //Editing functions - virtual void SetEditable(bool enable = true); - virtual bool IsEditable() const; - - //Selection - virtual void SelectAll(); - virtual bool HasSelection() const; - virtual void DeleteSelection(); - virtual wxString GetSelectedText() const; - virtual wxString GetSelectedSource() const; - virtual void ClearSelection(); - - virtual void RunScript(const wxString& javascript); - - //Virtual Filesystem Support - virtual void RegisterHandler(wxSharedPtr handler); - - virtual void* GetNativeBackend() const { return m_webBrowser; } - - // ---- IE-specific methods - - // FIXME: I seem to be able to access remote webpages even in offline mode... - bool IsOfflineMode(); - void SetOfflineMode(bool offline); - - wxWebViewZoom GetIETextZoom() const; - void SetIETextZoom(wxWebViewZoom level); - - wxWebViewZoom GetIEOpticalZoom() const; - void SetIEOpticalZoom(wxWebViewZoom level); - - void onActiveXEvent(wxActiveXEvent& evt); - void onEraseBg(wxEraseEvent&) {} - - wxDECLARE_EVENT_TABLE(); - -protected: - virtual void DoSetPage(const wxString& html, const wxString& baseUrl); - -private: - wxIEContainer* m_container; - wxAutomationObject m_ie; - IWebBrowser2* m_webBrowser; - DWORD m_dwCookie; - wxCOMPtr m_uiHandler; - - //We store the current zoom type; - wxWebViewZoomType m_zoomType; - - /** The "Busy" property of IWebBrowser2 does not always return busy when - * we'd want it to; this variable may be set to true in cases where the - * Busy property is false but should be true. - */ - bool m_isBusy; - //We manage our own history, the history list contains the history items - //which are added as documentcomplete events arrive, unless we are loading - //an item from the history. The position is stored as an int, and reflects - //where we are in the history list. - wxVector > m_historyList; - wxVector m_factories; - int m_historyPosition; - bool m_historyLoadingFromList; - bool m_historyEnabled; - - //We store find flag, results and position. - wxVector m_findPointers; - int m_findFlags; - wxString m_findText; - int m_findPosition; - - //Generic helper functions - bool CanExecCommand(wxString command) const; - void ExecCommand(wxString command); - wxCOMPtr GetDocument() const; - bool IsElementVisible(wxCOMPtr elm); - //Find helper functions. - void FindInternal(const wxString& text, int flags, int internal_flag); - long FindNext(int direction = 1); - void FindClear(); - //Toggles control features see INTERNETFEATURELIST for values. - bool EnableControlFeature(long flag, bool enable = true); - - wxDECLARE_DYNAMIC_CLASS(wxWebViewIE); -}; - -class WXDLLIMPEXP_WEBVIEW wxWebViewFactoryIE : public wxWebViewFactory -{ -public: - virtual wxWebView* Create() { return new wxWebViewIE; } - virtual wxWebView* Create(wxWindow* parent, - wxWindowID id, - const wxString& url = wxWebViewDefaultURLStr, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxWebViewNameStr) - { return new wxWebViewIE(parent, id, url, pos, size, style, name); } -}; - -class VirtualProtocol : public wxIInternetProtocol -{ -protected: - wxIInternetProtocolSink* m_protocolSink; - wxString m_html; - VOID * fileP; - - wxFSFile* m_file; - wxSharedPtr m_handler; - -public: - VirtualProtocol(wxSharedPtr handler); - virtual ~VirtualProtocol() {} - - //IUnknown - DECLARE_IUNKNOWN_METHODS; - - //IInternetProtocolRoot - HRESULT STDMETHODCALLTYPE Abort(HRESULT WXUNUSED(hrReason), - DWORD WXUNUSED(dwOptions)) - { return E_NOTIMPL; } - HRESULT STDMETHODCALLTYPE Continue(wxPROTOCOLDATA *WXUNUSED(pProtocolData)) - { return S_OK; } - HRESULT STDMETHODCALLTYPE Resume() { return S_OK; } - HRESULT STDMETHODCALLTYPE Start(LPCWSTR szUrl, - wxIInternetProtocolSink *pOIProtSink, - wxIInternetBindInfo *pOIBindInfo, - DWORD grfPI, - HANDLE_PTR dwReserved); - HRESULT STDMETHODCALLTYPE Suspend() { return S_OK; } - HRESULT STDMETHODCALLTYPE Terminate(DWORD WXUNUSED(dwOptions)) { return S_OK; } - - //IInternetProtocol - HRESULT STDMETHODCALLTYPE LockRequest(DWORD WXUNUSED(dwOptions)) - { return S_OK; } - HRESULT STDMETHODCALLTYPE Read(void *pv, ULONG cb, ULONG *pcbRead); - HRESULT STDMETHODCALLTYPE Seek(LARGE_INTEGER WXUNUSED(dlibMove), - DWORD WXUNUSED(dwOrigin), - ULARGE_INTEGER* WXUNUSED(plibNewPosition)) - { return E_FAIL; } - HRESULT STDMETHODCALLTYPE UnlockRequest() { return S_OK; } -}; - -class ClassFactory : public IClassFactory -{ -public: - ClassFactory(wxSharedPtr handler) : m_handler(handler) - { AddRef(); } - virtual ~ClassFactory() {} - - wxString GetName() { return m_handler->GetName(); } - - //IClassFactory - HRESULT STDMETHODCALLTYPE CreateInstance(IUnknown* pUnkOuter, - REFIID riid, void** ppvObject); - HRESULT STDMETHODCALLTYPE LockServer(BOOL fLock); - - //IUnknown - DECLARE_IUNKNOWN_METHODS; - -private: - wxSharedPtr m_handler; -}; - -class wxIEContainer : public wxActiveXContainer -{ -public: - wxIEContainer(wxWindow *parent, REFIID iid, IUnknown *pUnk, DocHostUIHandler* uiHandler = NULL); - virtual ~wxIEContainer(); - virtual bool QueryClientSiteInterface(REFIID iid, void **_interface, const char *&desc); -private: - DocHostUIHandler* m_uiHandler; -}; - -class DocHostUIHandler : public wxIDocHostUIHandler -{ -public: - DocHostUIHandler(wxWebView* browser) { m_browser = browser; } - virtual ~DocHostUIHandler() {} - - virtual HRESULT wxSTDCALL ShowContextMenu(DWORD dwID, POINT *ppt, - IUnknown *pcmdtReserved, - IDispatch *pdispReserved); - - virtual HRESULT wxSTDCALL GetHostInfo(DOCHOSTUIINFO *pInfo); - - virtual HRESULT wxSTDCALL ShowUI(DWORD dwID, - IOleInPlaceActiveObject *pActiveObject, - IOleCommandTarget *pCommandTarget, - IOleInPlaceFrame *pFrame, - IOleInPlaceUIWindow *pDoc); - - virtual HRESULT wxSTDCALL HideUI(void); - - virtual HRESULT wxSTDCALL UpdateUI(void); - - virtual HRESULT wxSTDCALL EnableModeless(BOOL fEnable); - - virtual HRESULT wxSTDCALL OnDocWindowActivate(BOOL fActivate); - - virtual HRESULT wxSTDCALL OnFrameWindowActivate(BOOL fActivate); - - virtual HRESULT wxSTDCALL ResizeBorder(LPCRECT prcBorder, - IOleInPlaceUIWindow *pUIWindow, - BOOL fRameWindow); - - virtual HRESULT wxSTDCALL TranslateAccelerator(LPMSG lpMsg, - const GUID *pguidCmdGroup, - DWORD nCmdID); - - virtual HRESULT wxSTDCALL GetOptionKeyPath(LPOLESTR *pchKey, - DWORD dw); - - virtual HRESULT wxSTDCALL GetDropTarget(IDropTarget *pDropTarget, - IDropTarget **ppDropTarget); - - virtual HRESULT wxSTDCALL GetExternal(IDispatch **ppDispatch); - - virtual HRESULT wxSTDCALL TranslateUrl(DWORD dwTranslate, - OLECHAR *pchURLIn, - OLECHAR **ppchURLOut); - - virtual HRESULT wxSTDCALL FilterDataObject(IDataObject *pDO, - IDataObject **ppDORet); - //IUnknown - DECLARE_IUNKNOWN_METHODS; - -private: - wxWebView* m_browser; -}; - -class wxFindPointers -{ -public: - wxFindPointers(wxIMarkupPointer *ptrBegin, wxIMarkupPointer *ptrEnd) - { - begin = ptrBegin; - end = ptrEnd; - } - //The two markup pointers. - wxIMarkupPointer *begin, *end; -}; - -#endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_IE && defined(__WXMSW__) - -#endif // wxWebViewIE_H diff --git a/Externals/wxWidgets3/include/wx/msw/webview_missing.h b/Externals/wxWidgets3/include/wx/msw/webview_missing.h deleted file mode 100644 index 514ae1e56c..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/webview_missing.h +++ /dev/null @@ -1,947 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: include/wx/msw/webview_missing.h -// Purpose: Definitions / classes commonly missing used by wxWebViewIE -// Author: Steven Lamerton -// Copyright: (c) 2012 Steven Lamerton -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -/* - * Classes and definitions used by wxWebViewIE vary in their - * completeness between compilers and versions of compilers. - * We implement our own versions here which should work - * for all compilers. The definitions are taken from the - * mingw-w64 headers which are public domain. -*/ - -/* urlmon.h */ - -struct IHTMLElement; -struct IHTMLDocument2; - -#ifndef REFRESH_NORMAL -#define REFRESH_NORMAL 0 -#endif - -#ifndef REFRESH_COMPLETELY -#define REFRESH_COMPLETELY 3 -#endif - -typedef enum __wxMIDL_IBindStatusCallback_0006 -{ - wxBSCF_FIRSTDATANOTIFICATION = 0x1, - wxBSCF_INTERMEDIATEDATANOTIFICATION = 0x2, - wxBSCF_LASTDATANOTIFICATION = 0x4, - wxBSCF_DATAFULLYAVAILABLE = 0x8, - wxBSCF_AVAILABLEDATASIZEUNKNOWN = 0x10 -} wxBSCF; - -EXTERN_C const IID CLSID_FileProtocol; - -typedef struct _tagwxBINDINFO -{ - ULONG cbSize; - LPWSTR szExtraInfo; - STGMEDIUM stgmedData; - DWORD grfBindInfoF; - DWORD dwBindVerb; - LPWSTR szCustomVerb; - DWORD cbstgmedData; - DWORD dwOptions; - DWORD dwOptionsFlags; - DWORD dwCodePage; - SECURITY_ATTRIBUTES securityAttributes; - IID iid; - IUnknown *pUnk; - DWORD dwReserved; -} wxBINDINFO; - -typedef struct _tagwxPROTOCOLDATA -{ - DWORD grfFlags; - DWORD dwState; - LPVOID pData; - ULONG cbData; -} wxPROTOCOLDATA; - -class wxIInternetBindInfo : public IUnknown -{ -public: - virtual HRESULT wxSTDCALL GetBindInfo(DWORD *grfBINDF, wxBINDINFO *pbindinfo) = 0; - virtual HRESULT wxSTDCALL GetBindString(ULONG ulStringType, LPOLESTR *ppwzStr, - ULONG cEl, ULONG *pcElFetched) = 0; -}; - -class wxIInternetProtocolSink : public IUnknown -{ -public: - virtual HRESULT wxSTDCALL Switch(wxPROTOCOLDATA *pProtocolData) = 0; - virtual HRESULT wxSTDCALL ReportProgress(ULONG ulStatusCode, - LPCWSTR szStatusText) = 0; - virtual HRESULT wxSTDCALL ReportData(DWORD grfBSCF, ULONG ulProgress, - ULONG ulProgressMax) = 0; - virtual HRESULT wxSTDCALL ReportResult(HRESULT hrResult, DWORD dwError, - LPCWSTR szResult) = 0; -}; - -class wxIInternetProtocolRoot : public IUnknown -{ -public: - virtual HRESULT wxSTDCALL Start(LPCWSTR szUrl, wxIInternetProtocolSink *pOIProtSink, - wxIInternetBindInfo *pOIBindInfo, DWORD grfPI, - HANDLE_PTR dwReserved) = 0; - virtual HRESULT wxSTDCALL Continue(wxPROTOCOLDATA *pProtocolData) = 0; - virtual HRESULT wxSTDCALL Abort(HRESULT hrReason, DWORD dwOptions) = 0; - virtual HRESULT wxSTDCALL Terminate(DWORD dwOptions) = 0; - virtual HRESULT wxSTDCALL Suspend(void) = 0; - virtual HRESULT wxSTDCALL Resume(void) = 0; -}; - - -class wxIInternetProtocol : public wxIInternetProtocolRoot -{ -public: - virtual HRESULT wxSTDCALL Read(void *pv, ULONG cb, ULONG *pcbRead) = 0; - virtual HRESULT wxSTDCALL Seek(LARGE_INTEGER dlibMove, DWORD dwOrigin, - ULARGE_INTEGER *plibNewPosition) = 0; - virtual HRESULT wxSTDCALL LockRequest(DWORD dwOptions) = 0; - virtual HRESULT wxSTDCALL UnlockRequest(void) = 0; -}; - - -class wxIInternetSession : public IUnknown -{ -public: - virtual HRESULT wxSTDCALL RegisterNameSpace(IClassFactory *pCF, REFCLSID rclsid, - LPCWSTR pwzProtocol, - ULONG cPatterns, - const LPCWSTR *ppwzPatterns, - DWORD dwReserved) = 0; - virtual HRESULT wxSTDCALL UnregisterNameSpace(IClassFactory *pCF, - LPCWSTR pszProtocol) = 0; - virtual HRESULT wxSTDCALL RegisterMimeFilter(IClassFactory *pCF, - REFCLSID rclsid, - LPCWSTR pwzType) = 0; - virtual HRESULT wxSTDCALL UnregisterMimeFilter(IClassFactory *pCF, - LPCWSTR pwzType) = 0; - virtual HRESULT wxSTDCALL CreateBinding(LPBC pBC, LPCWSTR szUrl, - IUnknown *pUnkOuter, IUnknown **ppUnk, - wxIInternetProtocol **ppOInetProt, - DWORD dwOption) = 0; - virtual HRESULT wxSTDCALL SetSessionOption(DWORD dwOption, LPVOID pBuffer, - DWORD dwBufferLength, - DWORD dwReserved) = 0; - virtual HRESULT wxSTDCALL GetSessionOption(DWORD dwOption, LPVOID pBuffer, - DWORD *pdwBufferLength, - DWORD dwReserved) = 0; -}; - -/* end of urlmon.h */ - -/* mshtmhst.h */ - -typedef enum _tagwxDOCHOSTUIFLAG -{ - DOCHOSTUIFLAG_DIALOG = 0x1, - DOCHOSTUIFLAG_DISABLE_HELP_MENU = 0x2, - DOCHOSTUIFLAG_NO3DBORDER = 0x4, - DOCHOSTUIFLAG_SCROLL_NO = 0x8, - DOCHOSTUIFLAG_DISABLE_SCRIPT_INACTIVE = 0x10, - DOCHOSTUIFLAG_OPENNEWWIN = 0x20, - DOCHOSTUIFLAG_DISABLE_OFFSCREEN = 0x40, - DOCHOSTUIFLAG_FLAT_SCROLLBAR = 0x80, - DOCHOSTUIFLAG_DIV_BLOCKDEFAULT = 0x100, - DOCHOSTUIFLAG_ACTIVATE_CLIENTHIT_ONLY = 0x200, - DOCHOSTUIFLAG_OVERRIDEBEHAVIORFACTORY = 0x400, - DOCHOSTUIFLAG_CODEPAGELINKEDFONTS = 0x800, - DOCHOSTUIFLAG_URL_ENCODING_DISABLE_UTF8 = 0x1000, - DOCHOSTUIFLAG_URL_ENCODING_ENABLE_UTF8 = 0x2000, - DOCHOSTUIFLAG_ENABLE_FORMS_AUTOCOMPLETE = 0x4000, - DOCHOSTUIFLAG_ENABLE_INPLACE_NAVIGATION = 0x10000, - DOCHOSTUIFLAG_IME_ENABLE_RECONVERSION = 0x20000, - DOCHOSTUIFLAG_THEME = 0x40000, - DOCHOSTUIFLAG_NOTHEME = 0x80000, - DOCHOSTUIFLAG_NOPICS = 0x100000, - DOCHOSTUIFLAG_NO3DOUTERBORDER = 0x200000, - DOCHOSTUIFLAG_DISABLE_EDIT_NS_FIXUP = 0x400000, - DOCHOSTUIFLAG_LOCAL_MACHINE_ACCESS_CHECK = 0x800000, - DOCHOSTUIFLAG_DISABLE_UNTRUSTEDPROTOCOL = 0x1000000 -} DOCHOSTUIFLAG; - -typedef struct _tagwxDOCHOSTUIINFO -{ - ULONG cbSize; - DWORD dwFlags; - DWORD dwDoubleClick; - OLECHAR *pchHostCss; - OLECHAR *pchHostNS; -} DOCHOSTUIINFO; - -class wxIDocHostUIHandler : public IUnknown -{ -public: - virtual HRESULT wxSTDCALL ShowContextMenu(DWORD dwID, POINT *ppt, - IUnknown *pcmdtReserved, - IDispatch *pdispReserved) = 0; - - virtual HRESULT wxSTDCALL GetHostInfo(DOCHOSTUIINFO *pInfo) = 0; - - virtual HRESULT wxSTDCALL ShowUI(DWORD dwID, - IOleInPlaceActiveObject *pActiveObject, - IOleCommandTarget *pCommandTarget, - IOleInPlaceFrame *pFrame, - IOleInPlaceUIWindow *pDoc) = 0; - - virtual HRESULT wxSTDCALL HideUI(void) = 0; - - virtual HRESULT wxSTDCALL UpdateUI(void) = 0; - - virtual HRESULT wxSTDCALL EnableModeless(BOOL fEnable) = 0; - - virtual HRESULT wxSTDCALL OnDocWindowActivate(BOOL fActivate) = 0; - - virtual HRESULT wxSTDCALL OnFrameWindowActivate(BOOL fActivate) = 0; - - virtual HRESULT wxSTDCALL ResizeBorder(LPCRECT prcBorder, - IOleInPlaceUIWindow *pUIWindow, - BOOL fRameWindow) = 0; - - virtual HRESULT wxSTDCALL TranslateAccelerator(LPMSG lpMsg, - const GUID *pguidCmdGroup, - DWORD nCmdID) = 0; - - virtual HRESULT wxSTDCALL GetOptionKeyPath(LPOLESTR *pchKey, - DWORD dw) = 0; - - virtual HRESULT wxSTDCALL GetDropTarget(IDropTarget *pDropTarget, - IDropTarget **ppDropTarget) = 0; - - virtual HRESULT wxSTDCALL GetExternal(IDispatch **ppDispatch) = 0; - - virtual HRESULT wxSTDCALL TranslateUrl(DWORD dwTranslate, - OLECHAR *pchURLIn, - OLECHAR **ppchURLOut) = 0; - - virtual HRESULT wxSTDCALL FilterDataObject(IDataObject *pDO, - IDataObject **ppDORet) = 0; -}; - -/* end of mshtmhst.h */ - -/* mshtml.h */ - -typedef enum _tagwxPOINTER_GRAVITY -{ - wxPOINTER_GRAVITY_Left = 0, - wxPOINTER_GRAVITY_Right = 1, - wxPOINTER_GRAVITY_Max = 2147483647 -} wxPOINTER_GRAVITY; - -typedef enum _tagwxELEMENT_ADJACENCY -{ - wxELEM_ADJ_BeforeBegin = 0, - wxELEM_ADJ_AfterBegin = 1, - wxELEM_ADJ_BeforeEnd = 2, - wxELEM_ADJ_AfterEnd = 3, - wxELEMENT_ADJACENCY_Max = 2147483647 -} wxELEMENT_ADJACENCY; - -typedef enum _tagwxMARKUP_CONTEXT_TYPE -{ - wxCONTEXT_TYPE_None = 0, - wxCONTEXT_TYPE_Text = 1, - wxCONTEXT_TYPE_EnterScope = 2, - wxCONTEXT_TYPE_ExitScope = 3, - wxCONTEXT_TYPE_NoScope = 4, - wxMARKUP_CONTEXT_TYPE_Max = 2147483647 -} wxMARKUP_CONTEXT_TYPE; - -typedef enum _tagwxFINDTEXT_FLAGS -{ - wxFINDTEXT_BACKWARDS = 0x1, - wxFINDTEXT_WHOLEWORD = 0x2, - wxFINDTEXT_MATCHCASE = 0x4, - wxFINDTEXT_RAW = 0x20000, - wxFINDTEXT_MATCHDIAC = 0x20000000, - wxFINDTEXT_MATCHKASHIDA = 0x40000000, - wxFINDTEXT_MATCHALEFHAMZA = 0x80000000, - wxFINDTEXT_FLAGS_Max = 2147483647 -} wxFINDTEXT_FLAGS; - -typedef enum _tagwxMOVEUNIT_ACTION -{ - wxMOVEUNIT_PREVCHAR = 0, - wxMOVEUNIT_NEXTCHAR = 1, - wxMOVEUNIT_PREVCLUSTERBEGIN = 2, - wxMOVEUNIT_NEXTCLUSTERBEGIN = 3, - wxMOVEUNIT_PREVCLUSTEREND = 4, - wxMOVEUNIT_NEXTCLUSTEREND = 5, - wxMOVEUNIT_PREVWORDBEGIN = 6, - wxMOVEUNIT_NEXTWORDBEGIN = 7, - wxMOVEUNIT_PREVWORDEND = 8, - wxMOVEUNIT_NEXTWORDEND = 9, - wxMOVEUNIT_PREVPROOFWORD = 10, - wxMOVEUNIT_NEXTPROOFWORD = 11, - wxMOVEUNIT_NEXTURLBEGIN = 12, - wxMOVEUNIT_PREVURLBEGIN = 13, - wxMOVEUNIT_NEXTURLEND = 14, - wxMOVEUNIT_PREVURLEND = 15, - wxMOVEUNIT_PREVSENTENCE = 16, - wxMOVEUNIT_NEXTSENTENCE = 17, - wxMOVEUNIT_PREVBLOCK = 18, - wxMOVEUNIT_NEXTBLOCK = 19, - wxMOVEUNIT_ACTION_Max = 2147483647 -} wxMOVEUNIT_ACTION; - -typedef enum _tagwxELEMENT_TAG_ID -{ - wxTAGID_NULL = 0, wxTAGID_UNKNOWN = 1, wxTAGID_A = 2, wxTAGID_ACRONYM = 3, - wxTAGID_ADDRESS = 4, wxTAGID_APPLET = 5, wxTAGID_AREA = 6, wxTAGID_B = 7, - wxTAGID_BASE = 8, wxTAGID_BASEFONT = 9, wxTAGID_BDO = 10, - wxTAGID_BGSOUND = 11, wxTAGID_BIG = 12, wxTAGID_BLINK = 13, - wxTAGID_BLOCKQUOTE = 14, wxTAGID_BODY = 15, wxTAGID_BR = 16, - wxTAGID_BUTTON = 17, wxTAGID_CAPTION = 18, wxTAGID_CENTER = 19, - wxTAGID_CITE = 20, wxTAGID_CODE = 21, wxTAGID_COL = 22, - wxTAGID_COLGROUP = 23, wxTAGID_COMMENT = 24, wxTAGID_COMMENT_RAW = 25, - wxTAGID_DD = 26, wxTAGID_DEL = 27, wxTAGID_DFN = 28, wxTAGID_DIR = 29, - wxTAGID_DIV = 30, wxTAGID_DL = 31, wxTAGID_DT = 32, wxTAGID_EM = 33, - wxTAGID_EMBED = 34, wxTAGID_FIELDSET = 35, wxTAGID_FONT = 36, - wxTAGID_FORM = 37, wxTAGID_FRAME = 38, wxTAGID_FRAMESET = 39, - wxTAGID_GENERIC = 40, wxTAGID_H1 = 41, wxTAGID_H2 = 42, wxTAGID_H3 = 43, - wxTAGID_H4 = 44, wxTAGID_H5 = 45, wxTAGID_H6 = 46, wxTAGID_HEAD = 47, - wxTAGID_HR = 48, wxTAGID_HTML = 49, wxTAGID_I = 50, wxTAGID_IFRAME = 51, - wxTAGID_IMG = 52, wxTAGID_INPUT = 53, wxTAGID_INS = 54, wxTAGID_KBD = 55, - wxTAGID_LABEL = 56, wxTAGID_LEGEND = 57, wxTAGID_LI = 58, wxTAGID_LINK = 59, - wxTAGID_LISTING = 60, wxTAGID_MAP = 61, wxTAGID_MARQUEE = 62, - wxTAGID_MENU = 63, wxTAGID_META = 64, wxTAGID_NEXTID = 65, - wxTAGID_NOBR = 66, wxTAGID_NOEMBED = 67, wxTAGID_NOFRAMES = 68, - wxTAGID_NOSCRIPT = 69, wxTAGID_OBJECT = 70, wxTAGID_OL = 71, - wxTAGID_OPTION = 72, wxTAGID_P = 73, wxTAGID_PARAM = 74, - wxTAGID_PLAINTEXT = 75, wxTAGID_PRE = 76, wxTAGID_Q = 77, wxTAGID_RP = 78, - wxTAGID_RT = 79, wxTAGID_RUBY = 80, wxTAGID_S = 81, wxTAGID_SAMP = 82, - wxTAGID_SCRIPT = 83, wxTAGID_SELECT = 84, wxTAGID_SMALL = 85, - wxTAGID_SPAN = 86, wxTAGID_STRIKE = 87, wxTAGID_STRONG = 88, - wxTAGID_STYLE = 89, wxTAGID_SUB = 90, wxTAGID_SUP = 91, wxTAGID_TABLE = 92, - wxTAGID_TBODY = 93, wxTAGID_TC = 94, wxTAGID_TD = 95, wxTAGID_TEXTAREA = 96, - wxTAGID_TFOOT = 97, wxTAGID_TH = 98, wxTAGID_THEAD = 99, - wxTAGID_TITLE = 100, wxTAGID_TR = 101, wxTAGID_TT = 102, wxTAGID_U = 103, - wxTAGID_UL = 104, wxTAGID_VAR = 105, wxTAGID_WBR = 106, wxTAGID_XMP = 107, - wxTAGID_ROOT = 108, wxTAGID_OPTGROUP = 109, wxTAGID_COUNT = 110, - wxTAGID_LAST_PREDEFINED = 10000, wxELEMENT_TAG_ID_Max = 2147483647 -} wxELEMENT_TAG_ID; - -struct wxIHTMLStyle : public IDispatch -{ -public: - virtual HRESULT wxSTDCALL put_fontFamily(BSTR v) = 0; - virtual HRESULT wxSTDCALL get_fontFamily(BSTR *p) = 0; - virtual HRESULT wxSTDCALL put_fontStyle(BSTR v) = 0; - virtual HRESULT wxSTDCALL get_fontStyle(BSTR *p) = 0; - virtual HRESULT wxSTDCALL put_fontVariant(BSTR v) = 0; - virtual HRESULT wxSTDCALL get_fontVariant(BSTR *p) = 0; - virtual HRESULT wxSTDCALL put_fontWeight(BSTR v) = 0; - virtual HRESULT wxSTDCALL get_fontWeight(BSTR *p) = 0; - virtual HRESULT wxSTDCALL put_fontSize(VARIANT v) = 0; - virtual HRESULT wxSTDCALL get_fontSize(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL put_font(BSTR v) = 0; - virtual HRESULT wxSTDCALL get_font(BSTR *p) = 0; - virtual HRESULT wxSTDCALL put_color(VARIANT v) = 0; - virtual HRESULT wxSTDCALL get_color(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL put_background(BSTR v) = 0; - virtual HRESULT wxSTDCALL get_background(BSTR *p) = 0; - virtual HRESULT wxSTDCALL put_backgroundColor(VARIANT v) = 0; - virtual HRESULT wxSTDCALL get_backgroundColor(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL put_backgroundImage(BSTR v) = 0; - virtual HRESULT wxSTDCALL get_backgroundImage(BSTR *p) = 0; - virtual HRESULT wxSTDCALL put_backgroundRepeat(BSTR v) = 0; - virtual HRESULT wxSTDCALL get_backgroundRepeat(BSTR *p) = 0; - virtual HRESULT wxSTDCALL put_backgroundAttachment(BSTR v) = 0; - virtual HRESULT wxSTDCALL get_backgroundAttachment(BSTR *p) = 0; - virtual HRESULT wxSTDCALL put_backgroundPosition(BSTR v) = 0; - virtual HRESULT wxSTDCALL get_backgroundPosition(BSTR *p) = 0; - virtual HRESULT wxSTDCALL put_backgroundPositionX(VARIANT v) = 0; - virtual HRESULT wxSTDCALL get_backgroundPositionX(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL put_backgroundPositionY(VARIANT v) = 0; - virtual HRESULT wxSTDCALL get_backgroundPositionY(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL put_wordSpacing(VARIANT v) = 0; - virtual HRESULT wxSTDCALL get_wordSpacing(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL put_letterSpacing(VARIANT v) = 0; - virtual HRESULT wxSTDCALL get_letterSpacing(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL put_textDecoration(BSTR v) = 0; - virtual HRESULT wxSTDCALL get_textDecoration(BSTR *p) = 0; - virtual HRESULT wxSTDCALL put_textDecorationNone(VARIANT_BOOL v) = 0; - virtual HRESULT wxSTDCALL get_textDecorationNone(VARIANT_BOOL *p) = 0; - virtual HRESULT wxSTDCALL put_textDecorationUnderline(VARIANT_BOOL v) = 0; - virtual HRESULT wxSTDCALL get_textDecorationUnderline(VARIANT_BOOL *p) = 0; - virtual HRESULT wxSTDCALL put_textDecorationOverline(VARIANT_BOOL v) = 0; - virtual HRESULT wxSTDCALL get_textDecorationOverline(VARIANT_BOOL *p) = 0; - virtual HRESULT wxSTDCALL put_textDecorationLineThrough(VARIANT_BOOL v) = 0; - virtual HRESULT wxSTDCALL get_textDecorationLineThrough(VARIANT_BOOL *p) = 0; - virtual HRESULT wxSTDCALL put_textDecorationBlink(VARIANT_BOOL v) = 0; - virtual HRESULT wxSTDCALL get_textDecorationBlink(VARIANT_BOOL *p) = 0; - virtual HRESULT wxSTDCALL put_verticalAlign(VARIANT v) = 0; - virtual HRESULT wxSTDCALL get_verticalAlign(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL put_textTransform(BSTR v) = 0; - virtual HRESULT wxSTDCALL get_textTransform(BSTR *p) = 0; - virtual HRESULT wxSTDCALL put_textAlign(BSTR v) = 0; - virtual HRESULT wxSTDCALL get_textAlign(BSTR *p) = 0; - virtual HRESULT wxSTDCALL put_textIndent(VARIANT v) = 0; - virtual HRESULT wxSTDCALL get_textIndent(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL put_lineHeight(VARIANT v) = 0; - virtual HRESULT wxSTDCALL get_lineHeight(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL put_marginTop(VARIANT v) = 0; - virtual HRESULT wxSTDCALL get_marginTop(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL put_marginRight(VARIANT v) = 0; - virtual HRESULT wxSTDCALL get_marginRight(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL put_marginBottom(VARIANT v) = 0; - virtual HRESULT wxSTDCALL get_marginBottom(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL put_marginLeft(VARIANT v) = 0; - virtual HRESULT wxSTDCALL get_marginLeft(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL put_margin(BSTR v) = 0; - virtual HRESULT wxSTDCALL get_margin(BSTR *p) = 0; - virtual HRESULT wxSTDCALL put_paddingTop(VARIANT v) = 0; - virtual HRESULT wxSTDCALL get_paddingTop(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL put_paddingRight(VARIANT v) = 0; - virtual HRESULT wxSTDCALL get_paddingRight(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL put_paddingBottom(VARIANT v) = 0; - virtual HRESULT wxSTDCALL get_paddingBottom(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL put_paddingLeft(VARIANT v) = 0; - virtual HRESULT wxSTDCALL get_paddingLeft(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL put_padding(BSTR v) = 0; - virtual HRESULT wxSTDCALL get_padding(BSTR *p) = 0; - virtual HRESULT wxSTDCALL put_border(BSTR v) = 0; - virtual HRESULT wxSTDCALL get_border(BSTR *p) = 0; - virtual HRESULT wxSTDCALL put_borderTop(BSTR v) = 0; - virtual HRESULT wxSTDCALL get_borderTop(BSTR *p) = 0; - virtual HRESULT wxSTDCALL put_borderRight(BSTR v) = 0; - virtual HRESULT wxSTDCALL get_borderRight(BSTR *p) = 0; - virtual HRESULT wxSTDCALL put_borderBottom(BSTR v) = 0; - virtual HRESULT wxSTDCALL get_borderBottom(BSTR *p) = 0; - virtual HRESULT wxSTDCALL put_borderLeft(BSTR v) = 0; - virtual HRESULT wxSTDCALL get_borderLeft(BSTR *p) = 0; - virtual HRESULT wxSTDCALL put_borderColor(BSTR v) = 0; - virtual HRESULT wxSTDCALL get_borderColor(BSTR *p) = 0; - virtual HRESULT wxSTDCALL put_borderTopColor(VARIANT v) = 0; - virtual HRESULT wxSTDCALL get_borderTopColor(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL put_borderRightColor(VARIANT v) = 0; - virtual HRESULT wxSTDCALL get_borderRightColor(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL put_borderBottomColor(VARIANT v) = 0; - virtual HRESULT wxSTDCALL get_borderBottomColor(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL put_borderLeftColor(VARIANT v) = 0; - virtual HRESULT wxSTDCALL get_borderLeftColor(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL put_borderWidth(BSTR v) = 0; - virtual HRESULT wxSTDCALL get_borderWidth(BSTR *p) = 0; - virtual HRESULT wxSTDCALL put_borderTopWidth(VARIANT v) = 0; - virtual HRESULT wxSTDCALL get_borderTopWidth(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL put_borderRightWidth(VARIANT v) = 0; - virtual HRESULT wxSTDCALL get_borderRightWidth(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL put_borderBottomWidth(VARIANT v) = 0; - virtual HRESULT wxSTDCALL get_borderBottomWidth(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL put_borderLeftWidth(VARIANT v) = 0; - virtual HRESULT wxSTDCALL get_borderLeftWidth(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL put_borderStyle(BSTR v) = 0; - virtual HRESULT wxSTDCALL get_borderStyle(BSTR *p) = 0; - virtual HRESULT wxSTDCALL put_borderTopStyle(BSTR v) = 0; - virtual HRESULT wxSTDCALL get_borderTopStyle(BSTR *p) = 0; - virtual HRESULT wxSTDCALL put_borderRightStyle(BSTR v) = 0; - virtual HRESULT wxSTDCALL get_borderRightStyle(BSTR *p) = 0; - virtual HRESULT wxSTDCALL put_borderBottomStyle(BSTR v) = 0; - virtual HRESULT wxSTDCALL get_borderBottomStyle(BSTR *p) = 0; - virtual HRESULT wxSTDCALL put_borderLeftStyle(BSTR v) = 0; - virtual HRESULT wxSTDCALL get_borderLeftStyle(BSTR *p) = 0; - virtual HRESULT wxSTDCALL put_width(VARIANT v) = 0; - virtual HRESULT wxSTDCALL get_width(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL put_height(VARIANT v) = 0; - virtual HRESULT wxSTDCALL get_height(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL put_styleFloat(BSTR v) = 0; - virtual HRESULT wxSTDCALL get_styleFloat(BSTR *p) = 0; - virtual HRESULT wxSTDCALL put_clear(BSTR v) = 0; - virtual HRESULT wxSTDCALL get_clear(BSTR *p) = 0; - virtual HRESULT wxSTDCALL put_display(BSTR v) = 0; - virtual HRESULT wxSTDCALL get_display(BSTR *p) = 0; - virtual HRESULT wxSTDCALL put_visibility(BSTR v) = 0; - virtual HRESULT wxSTDCALL get_visibility(BSTR *p) = 0; - virtual HRESULT wxSTDCALL put_listStyleType(BSTR v) = 0; - virtual HRESULT wxSTDCALL get_listStyleType(BSTR *p) = 0; - virtual HRESULT wxSTDCALL put_listStylePosition(BSTR v) = 0; - virtual HRESULT wxSTDCALL get_listStylePosition(BSTR *p) = 0; - virtual HRESULT wxSTDCALL put_listStyleImage(BSTR v) = 0; - virtual HRESULT wxSTDCALL get_listStyleImage(BSTR *p) = 0; - virtual HRESULT wxSTDCALL put_listStyle(BSTR v) = 0; - virtual HRESULT wxSTDCALL get_listStyle(BSTR *p) = 0; - virtual HRESULT wxSTDCALL put_whiteSpace(BSTR v) = 0; - virtual HRESULT wxSTDCALL get_whiteSpace(BSTR *p) = 0; - virtual HRESULT wxSTDCALL put_top(VARIANT v) = 0; - virtual HRESULT wxSTDCALL get_top(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL put_left(VARIANT v) = 0; - virtual HRESULT wxSTDCALL get_left(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL get_position(BSTR *p) = 0; - virtual HRESULT wxSTDCALL put_zIndex(VARIANT v) = 0; - virtual HRESULT wxSTDCALL get_zIndex(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL put_overflow(BSTR v) = 0; - virtual HRESULT wxSTDCALL get_overflow(BSTR *p) = 0; - virtual HRESULT wxSTDCALL put_pageBreakBefore(BSTR v) = 0; - virtual HRESULT wxSTDCALL get_pageBreakBefore(BSTR *p) = 0; - virtual HRESULT wxSTDCALL put_pageBreakAfter(BSTR v) = 0; - virtual HRESULT wxSTDCALL get_pageBreakAfter(BSTR *p) = 0; - virtual HRESULT wxSTDCALL put_cssText(BSTR v) = 0; - virtual HRESULT wxSTDCALL get_cssText(BSTR *p) = 0; - virtual HRESULT wxSTDCALL put_pixelTop(long v) = 0; - virtual HRESULT wxSTDCALL get_pixelTop(long *p) = 0; - virtual HRESULT wxSTDCALL put_pixelLeft(long v) = 0; - virtual HRESULT wxSTDCALL get_pixelLeft(long *p) = 0; - virtual HRESULT wxSTDCALL put_pixelWidth(long v) = 0; - virtual HRESULT wxSTDCALL get_pixelWidth(long *p) = 0; - virtual HRESULT wxSTDCALL put_pixelHeight(long v) = 0; - virtual HRESULT wxSTDCALL get_pixelHeight(long *p) = 0; - virtual HRESULT wxSTDCALL put_posTop(float v) = 0; - virtual HRESULT wxSTDCALL get_posTop(float *p) = 0; - virtual HRESULT wxSTDCALL put_posLeft(float v) = 0; - virtual HRESULT wxSTDCALL get_posLeft(float *p) = 0; - virtual HRESULT wxSTDCALL put_posWidth(float v) = 0; - virtual HRESULT wxSTDCALL get_posWidth(float *p) = 0; - virtual HRESULT wxSTDCALL put_posHeight(float v) = 0; - virtual HRESULT wxSTDCALL get_posHeight(float *p) = 0; - virtual HRESULT wxSTDCALL put_cursor(BSTR v) = 0; - virtual HRESULT wxSTDCALL get_cursor(BSTR *p) = 0; - virtual HRESULT wxSTDCALL put_clip(BSTR v) = 0; - virtual HRESULT wxSTDCALL get_clip(BSTR *p) = 0; - virtual HRESULT wxSTDCALL put_filter(BSTR v) = 0; - virtual HRESULT wxSTDCALL get_filter(BSTR *p) = 0; - virtual HRESULT wxSTDCALL setAttribute(BSTR strAttributeName, VARIANT AttributeValue, LONG lFlags = 1) = 0; - virtual HRESULT wxSTDCALL getAttribute(BSTR strAttributeName, LONG lFlags, VARIANT *AttributeValue) = 0; - virtual HRESULT wxSTDCALL removeAttribute(BSTR strAttributeName, LONG lFlags, VARIANT_BOOL *pfSuccess) = 0; - virtual HRESULT wxSTDCALL toString(BSTR *String) = 0; -}; - -struct wxIHTMLCurrentStyle : public IDispatch -{ -public: - virtual HRESULT wxSTDCALL get_position(BSTR *p) = 0; - virtual HRESULT wxSTDCALL get_styleFloat(BSTR *p) = 0; - virtual HRESULT wxSTDCALL get_color(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL get_backgroundColor(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL get_fontFamily(BSTR *p) = 0; - virtual HRESULT wxSTDCALL get_fontStyle(BSTR *p) = 0; - virtual HRESULT wxSTDCALL get_fontVariant(BSTR *p) = 0; - virtual HRESULT wxSTDCALL get_fontWeight(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL get_fontSize(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL get_backgroundImage(BSTR *p) = 0; - virtual HRESULT wxSTDCALL get_backgroundPositionX(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL get_backgroundPositionY(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL get_backgroundRepeat(BSTR *p) = 0; - virtual HRESULT wxSTDCALL get_borderLeftColor(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL get_borderTopColor(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL get_borderRightColor(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL get_borderBottomColor(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL get_borderTopStyle(BSTR *p) = 0; - virtual HRESULT wxSTDCALL get_borderRightStyle(BSTR *p) = 0; - virtual HRESULT wxSTDCALL get_borderBottomStyle(BSTR *p) = 0; - virtual HRESULT wxSTDCALL get_borderLeftStyle(BSTR *p) = 0; - virtual HRESULT wxSTDCALL get_borderTopWidth(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL get_borderRightWidth(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL get_borderBottomWidth(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL get_borderLeftWidth(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL get_left(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL get_top(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL get_width(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL get_height(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL get_paddingLeft(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL get_paddingTop(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL get_paddingRight(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL get_paddingBottom(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL get_textAlign(BSTR *p) = 0; - virtual HRESULT wxSTDCALL get_textDecoration(BSTR *p) = 0; - virtual HRESULT wxSTDCALL get_display(BSTR *p) = 0; - virtual HRESULT wxSTDCALL get_visibility(BSTR *p) = 0; - virtual HRESULT wxSTDCALL get_zIndex(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL get_letterSpacing(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL get_lineHeight(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL get_textIndent(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL get_verticalAlign(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL get_backgroundAttachment(BSTR *p) = 0; - virtual HRESULT wxSTDCALL get_marginTop(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL get_marginRight(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL get_marginBottom(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL get_marginLeft(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL get_clear(BSTR *p) = 0; - virtual HRESULT wxSTDCALL get_listStyleType(BSTR *p) = 0; - virtual HRESULT wxSTDCALL get_listStylePosition(BSTR *p) = 0; - virtual HRESULT wxSTDCALL get_listStyleImage(BSTR *p) = 0; - virtual HRESULT wxSTDCALL get_clipTop(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL get_clipRight(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL get_clipBottom(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL get_clipLeft(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL get_overflow(BSTR *p) = 0; - virtual HRESULT wxSTDCALL get_pageBreakBefore(BSTR *p) = 0; - virtual HRESULT wxSTDCALL get_pageBreakAfter(BSTR *p) = 0; - virtual HRESULT wxSTDCALL get_cursor(BSTR *p) = 0; - virtual HRESULT wxSTDCALL get_tableLayout(BSTR *p) = 0; - virtual HRESULT wxSTDCALL get_borderCollapse(BSTR *p) = 0; - virtual HRESULT wxSTDCALL get_direction(BSTR *p) = 0; - virtual HRESULT wxSTDCALL get_behavior(BSTR *p) = 0; - virtual HRESULT wxSTDCALL getAttribute(BSTR strAttributeName, LONG lFlags, VARIANT *AttributeValue) = 0; - virtual HRESULT wxSTDCALL get_unicodeBidi(BSTR *p) = 0; - virtual HRESULT wxSTDCALL get_right(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL get_bottom(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL get_imeMode(BSTR *p) = 0; - virtual HRESULT wxSTDCALL get_rubyAlign(BSTR *p) = 0; - virtual HRESULT wxSTDCALL get_rubyPosition(BSTR *p) = 0; - virtual HRESULT wxSTDCALL get_rubyOverhang(BSTR *p) = 0; - virtual HRESULT wxSTDCALL get_textAutospace(BSTR *p) = 0; - virtual HRESULT wxSTDCALL get_lineBreak(BSTR *p) = 0; - virtual HRESULT wxSTDCALL get_wordBreak(BSTR *p) = 0; - virtual HRESULT wxSTDCALL get_textJustify(BSTR *p) = 0; - virtual HRESULT wxSTDCALL get_textJustifyTrim(BSTR *p) = 0; - virtual HRESULT wxSTDCALL get_textKashida(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL get_blockDirection(BSTR *p) = 0; - virtual HRESULT wxSTDCALL get_layoutGridChar(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL get_layoutGridLine(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL get_layoutGridMode(BSTR *p) = 0; - virtual HRESULT wxSTDCALL get_layoutGridType(BSTR *p) = 0; - virtual HRESULT wxSTDCALL get_borderStyle(BSTR *p) = 0; - virtual HRESULT wxSTDCALL get_borderColor(BSTR *p) = 0; - virtual HRESULT wxSTDCALL get_borderWidth(BSTR *p) = 0; - virtual HRESULT wxSTDCALL get_padding(BSTR *p) = 0; - virtual HRESULT wxSTDCALL get_margin(BSTR *p) = 0; - virtual HRESULT wxSTDCALL get_accelerator(BSTR *p) = 0; - virtual HRESULT wxSTDCALL get_overflowX(BSTR *p) = 0; - virtual HRESULT wxSTDCALL get_overflowY(BSTR *p) = 0; - virtual HRESULT wxSTDCALL get_textTransform(BSTR *p) = 0; -}; - - -struct wxIHTMLRect : public IDispatch -{ -public: - virtual HRESULT wxSTDCALL put_left(long v) = 0; - virtual HRESULT wxSTDCALL get_left(long *p) = 0; - virtual HRESULT wxSTDCALL put_top(long v) = 0; - virtual HRESULT wxSTDCALL get_top(long *p) = 0; - virtual HRESULT wxSTDCALL put_right(long v) = 0; - virtual HRESULT wxSTDCALL get_right(long *p) = 0; - virtual HRESULT wxSTDCALL put_bottom(long v) = 0; - virtual HRESULT wxSTDCALL get_bottom(long *p) = 0; -}; - -struct wxIHTMLRectCollection : public IDispatch -{ -public: - virtual HRESULT wxSTDCALL get_length(long *p) = 0; - virtual HRESULT wxSTDCALL get__newEnum(IUnknown **p) = 0; - virtual HRESULT wxSTDCALL item(VARIANT *pvarIndex, VARIANT *pvarResult) = 0; -}; - -struct wxIHTMLFiltersCollection : public IDispatch -{ -public: - virtual HRESULT wxSTDCALL get_length(long *p) = 0; - virtual HRESULT wxSTDCALL get__newEnum(IUnknown **p) = 0; - virtual HRESULT wxSTDCALL item(VARIANT *pvarIndex, VARIANT *pvarResult) = 0; -}; - -struct wxIHTMLElementCollection : public IDispatch -{ -public: - virtual HRESULT wxSTDCALL toString(BSTR *String) = 0; - virtual HRESULT wxSTDCALL put_length(long v) = 0; - virtual HRESULT wxSTDCALL get_length(long *p) = 0; - virtual HRESULT wxSTDCALL get__newEnum(IUnknown **p) = 0; - virtual HRESULT wxSTDCALL item(VARIANT name, VARIANT index, IDispatch **pdisp) = 0; - virtual HRESULT wxSTDCALL tags(VARIANT tagName, IDispatch **pdisp) = 0; -}; - -struct wxIHTMLElement2 : public IDispatch -{ -public: - virtual HRESULT wxSTDCALL get_scopeName(BSTR *p) = 0; - virtual HRESULT wxSTDCALL setCapture(VARIANT_BOOL containerCapture = -1) = 0; - virtual HRESULT wxSTDCALL releaseCapture(void) = 0; - virtual HRESULT wxSTDCALL put_onlosecapture(VARIANT v) = 0; - virtual HRESULT wxSTDCALL get_onlosecapture(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL componentFromPoint(long x, long y, BSTR *component) = 0; - virtual HRESULT wxSTDCALL doScroll(VARIANT component) = 0; - virtual HRESULT wxSTDCALL put_onscroll(VARIANT v) = 0; - virtual HRESULT wxSTDCALL get_onscroll(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL put_ondrag(VARIANT v) = 0; - virtual HRESULT wxSTDCALL get_ondrag(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL put_ondragend(VARIANT v) = 0; - virtual HRESULT wxSTDCALL get_ondragend(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL put_ondragenter(VARIANT v) = 0; - virtual HRESULT wxSTDCALL get_ondragenter(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL put_ondragover(VARIANT v) = 0; - virtual HRESULT wxSTDCALL get_ondragover(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL put_ondragleave(VARIANT v) = 0; - virtual HRESULT wxSTDCALL get_ondragleave(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL put_ondrop(VARIANT v) = 0; - virtual HRESULT wxSTDCALL get_ondrop(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL put_onbeforecut(VARIANT v) = 0; - virtual HRESULT wxSTDCALL get_onbeforecut(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL put_oncut(VARIANT v) = 0; - virtual HRESULT wxSTDCALL get_oncut(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL put_onbeforecopy(VARIANT v) = 0; - virtual HRESULT wxSTDCALL get_onbeforecopy(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL put_oncopy(VARIANT v) = 0; - virtual HRESULT wxSTDCALL get_oncopy(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL put_onbeforepaste(VARIANT v) = 0; - virtual HRESULT wxSTDCALL get_onbeforepaste(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL put_onpaste(VARIANT v) = 0; - virtual HRESULT wxSTDCALL get_onpaste(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL get_currentStyle(wxIHTMLCurrentStyle **p) = 0; - virtual HRESULT wxSTDCALL put_onpropertychange(VARIANT v) = 0; - virtual HRESULT wxSTDCALL get_onpropertychange(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL getClientRects(wxIHTMLRectCollection **pRectCol) = 0; - virtual HRESULT wxSTDCALL getBoundingClientRect(wxIHTMLRect **pRect) = 0; - virtual HRESULT wxSTDCALL setExpression(BSTR propname, BSTR expression, BSTR language) = 0; - virtual HRESULT wxSTDCALL getExpression(BSTR propname, VARIANT *expression) = 0; - virtual HRESULT wxSTDCALL removeExpression(BSTR propname, VARIANT_BOOL *pfSuccess) = 0; - virtual HRESULT wxSTDCALL put_tabIndex(short v) = 0; - virtual HRESULT wxSTDCALL get_tabIndex(short *p) = 0; - virtual HRESULT wxSTDCALL focus(void) = 0; - virtual HRESULT wxSTDCALL put_accessKey(BSTR v) = 0; - virtual HRESULT wxSTDCALL get_accessKey(BSTR *p) = 0; - virtual HRESULT wxSTDCALL put_onblur(VARIANT v) = 0; - virtual HRESULT wxSTDCALL get_onblur(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL put_onfocus(VARIANT v) = 0; - virtual HRESULT wxSTDCALL get_onfocus(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL put_onresize(VARIANT v) = 0; - virtual HRESULT wxSTDCALL get_onresize(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL blur(void) = 0; - virtual HRESULT wxSTDCALL addFilter(IUnknown *pUnk) = 0; - virtual HRESULT wxSTDCALL removeFilter(IUnknown *pUnk) = 0; - virtual HRESULT wxSTDCALL get_clientHeight(long *p) = 0; - virtual HRESULT wxSTDCALL get_clientWidth(long *p) = 0; - virtual HRESULT wxSTDCALL get_clientTop(long *p) = 0; - virtual HRESULT wxSTDCALL get_clientLeft(long *p) = 0; - virtual HRESULT wxSTDCALL attachEvent(BSTR event, IDispatch *pDisp, VARIANT_BOOL *pfResult) = 0; - virtual HRESULT wxSTDCALL detachEvent(BSTR event, IDispatch *pDisp) = 0; - virtual HRESULT wxSTDCALL get_readyState(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL put_onreadystatechange(VARIANT v) = 0; - virtual HRESULT wxSTDCALL get_onreadystatechange(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL put_onrowsdelete(VARIANT v) = 0; - virtual HRESULT wxSTDCALL get_onrowsdelete(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL put_onrowsinserted(VARIANT v) = 0; - virtual HRESULT wxSTDCALL get_onrowsinserted(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL put_oncellchange(VARIANT v) = 0; - virtual HRESULT wxSTDCALL get_oncellchange(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL put_dir(BSTR v) = 0; - virtual HRESULT wxSTDCALL get_dir(BSTR *p) = 0; - virtual HRESULT wxSTDCALL createControlRange(IDispatch **range) = 0; - virtual HRESULT wxSTDCALL get_scrollHeight(long *p) = 0; - virtual HRESULT wxSTDCALL get_scrollWidth(long *p) = 0; - virtual HRESULT wxSTDCALL put_scrollTop(long v) = 0; - virtual HRESULT wxSTDCALL get_scrollTop(long *p) = 0; - virtual HRESULT wxSTDCALL put_scrollLeft(long v) = 0; - virtual HRESULT wxSTDCALL get_scrollLeft(long *p) = 0; - virtual HRESULT wxSTDCALL clearAttributes(void) = 0; - virtual HRESULT wxSTDCALL mergeAttributes(IHTMLElement *mergeThis) = 0; - virtual HRESULT wxSTDCALL put_oncontextmenu(VARIANT v) = 0; - virtual HRESULT wxSTDCALL get_oncontextmenu(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL insertAdjacentElement(BSTR where, IHTMLElement *insertedElement, IHTMLElement **inserted) = 0; - virtual HRESULT wxSTDCALL applyElement(IHTMLElement *apply, BSTR where, IHTMLElement **applied) = 0; - virtual HRESULT wxSTDCALL getAdjacentText(BSTR where, BSTR *text) = 0; - virtual HRESULT wxSTDCALL replaceAdjacentText(BSTR where, BSTR newText, BSTR *oldText) = 0; - virtual HRESULT wxSTDCALL get_canHaveChildren(VARIANT_BOOL *p) = 0; - virtual HRESULT wxSTDCALL addBehavior(BSTR bstrUrl, VARIANT *pvarFactory, long *pCookie) = 0; - virtual HRESULT wxSTDCALL removeBehavior(long cookie, VARIANT_BOOL *pfResult) = 0; - virtual HRESULT wxSTDCALL get_runtimeStyle(wxIHTMLStyle **p) = 0; - virtual HRESULT wxSTDCALL get_behaviorUrns(IDispatch **p) = 0; - virtual HRESULT wxSTDCALL put_tagUrn(BSTR v) = 0; - virtual HRESULT wxSTDCALL get_tagUrn(BSTR *p) = 0; - virtual HRESULT wxSTDCALL put_onbeforeeditfocus(VARIANT v) = 0; - virtual HRESULT wxSTDCALL get_onbeforeeditfocus(VARIANT *p) = 0; - virtual HRESULT wxSTDCALL get_readyStateValue(long *p) = 0; - virtual HRESULT wxSTDCALL getElementsByTagName(BSTR v, - wxIHTMLElementCollection **pelColl) = 0; -}; - -struct wxIHTMLTxtRange : public IDispatch -{ -public: - virtual HRESULT wxSTDCALL get_htmlText(BSTR *p) = 0; - virtual HRESULT wxSTDCALL put_text(BSTR v) = 0; - virtual HRESULT wxSTDCALL get_text(BSTR *p) = 0; - virtual HRESULT wxSTDCALL parentElement(IHTMLElement **parent) = 0; - virtual HRESULT wxSTDCALL duplicate(wxIHTMLTxtRange **Duplicate) = 0; - virtual HRESULT wxSTDCALL inRange(wxIHTMLTxtRange *Range, VARIANT_BOOL *InRange) = 0; - virtual HRESULT wxSTDCALL isEqual(wxIHTMLTxtRange *Range, VARIANT_BOOL *IsEqual) = 0; - virtual HRESULT wxSTDCALL scrollIntoView(VARIANT_BOOL fStart = -1) = 0; - virtual HRESULT wxSTDCALL collapse(VARIANT_BOOL Start = -1) = 0; - virtual HRESULT wxSTDCALL expand(BSTR Unit, VARIANT_BOOL *Success) = 0; - virtual HRESULT wxSTDCALL move(BSTR Unit, long Count, long *ActualCount) = 0; - virtual HRESULT wxSTDCALL moveStart(BSTR Unit, long Count, long *ActualCount) = 0; - virtual HRESULT wxSTDCALL moveEnd(BSTR Unit, long Count, long *ActualCount) = 0; - virtual HRESULT wxSTDCALL select(void) = 0; - virtual HRESULT wxSTDCALL pasteHTML(BSTR html) = 0; - virtual HRESULT wxSTDCALL moveToElementText(IHTMLElement *element) = 0; - virtual HRESULT wxSTDCALL setEndPoint(BSTR how, wxIHTMLTxtRange *SourceRange) = 0; - virtual HRESULT wxSTDCALL compareEndPoints(BSTR how, wxIHTMLTxtRange *SourceRange, long *ret) = 0; - virtual HRESULT wxSTDCALL findText(BSTR String, long count, long Flags, VARIANT_BOOL *Success) = 0; - virtual HRESULT wxSTDCALL moveToPoint(long x, long y) = 0; - virtual HRESULT wxSTDCALL getBookmark(BSTR *Boolmark) = 0; - virtual HRESULT wxSTDCALL moveToBookmark(BSTR Bookmark, VARIANT_BOOL *Success) = 0; - virtual HRESULT wxSTDCALL queryCommandSupported(BSTR cmdID, VARIANT_BOOL *pfRet) = 0; - virtual HRESULT wxSTDCALL queryCommandEnabled(BSTR cmdID, VARIANT_BOOL *pfRet) = 0; - virtual HRESULT wxSTDCALL queryCommandState(BSTR cmdID, VARIANT_BOOL *pfRet) = 0; - virtual HRESULT wxSTDCALL queryCommandIndeterm(BSTR cmdID, VARIANT_BOOL *pfRet) = 0; - virtual HRESULT wxSTDCALL queryCommandText(BSTR cmdID, BSTR *pcmdText) = 0; - virtual HRESULT wxSTDCALL queryCommandValue(BSTR cmdID, VARIANT *pcmdValue) = 0; - virtual HRESULT wxSTDCALL execCommand(BSTR cmdID, VARIANT_BOOL showUI, VARIANT value, VARIANT_BOOL *pfRet) = 0; - virtual HRESULT wxSTDCALL execCommandShowHelp(BSTR cmdID, VARIANT_BOOL *pfRet) = 0; -}; - -struct wxIMarkupContainer : public IUnknown -{ -public: - virtual HRESULT wxSTDCALL OwningDoc(IHTMLDocument2 **ppDoc) = 0; -}; - -struct wxIMarkupPointer : public IUnknown -{ -public: - virtual HRESULT wxSTDCALL OwningDoc(IHTMLDocument2 **ppDoc) = 0; - virtual HRESULT wxSTDCALL Gravity(wxPOINTER_GRAVITY *pGravity) = 0; - virtual HRESULT wxSTDCALL SetGravity(wxPOINTER_GRAVITY Gravity) = 0; - virtual HRESULT wxSTDCALL Cling(BOOL *pfCling) = 0; - virtual HRESULT wxSTDCALL SetCling(BOOL fCLing) = 0; - virtual HRESULT wxSTDCALL Unposition(void) = 0; - virtual HRESULT wxSTDCALL IsPositioned(BOOL *pfPositioned) = 0; - virtual HRESULT wxSTDCALL GetContainer(wxIMarkupContainer **ppContainer) = 0; - virtual HRESULT wxSTDCALL MoveAdjacentToElement(IHTMLElement *pElement, wxELEMENT_ADJACENCY eAdj) = 0; - virtual HRESULT wxSTDCALL MoveToPointer(wxIMarkupPointer *pPointer) = 0; - virtual HRESULT wxSTDCALL MoveToContainer(wxIMarkupContainer *pContainer, BOOL fAtStart) = 0; - virtual HRESULT wxSTDCALL Left(BOOL fMove, wxMARKUP_CONTEXT_TYPE *pContext, IHTMLElement **ppElement, long *pcch, OLECHAR *pchText) = 0; - virtual HRESULT wxSTDCALL Right(BOOL fMove, wxMARKUP_CONTEXT_TYPE *pContext, IHTMLElement **ppElement, long *pcch, OLECHAR *pchText) = 0; - virtual HRESULT wxSTDCALL CurrentScope(IHTMLElement **ppElemCurrent) = 0; - virtual HRESULT wxSTDCALL IsLeftOf(wxIMarkupPointer *pPointerThat, BOOL *pfResult) = 0; - virtual HRESULT wxSTDCALL IsLeftOfOrEqualTo(wxIMarkupPointer *pPointerThat, BOOL *pfResult) = 0; - virtual HRESULT wxSTDCALL IsRightOf(wxIMarkupPointer *pPointerThat, BOOL *pfResult) = 0; - virtual HRESULT wxSTDCALL IsRightOfOrEqualTo(wxIMarkupPointer *pPointerThat, BOOL *pfResult) = 0; - virtual HRESULT wxSTDCALL IsEqualTo(wxIMarkupPointer *pPointerThat, BOOL *pfAreEqual) = 0; - virtual HRESULT wxSTDCALL MoveUnit(wxMOVEUNIT_ACTION muAction) = 0; - virtual HRESULT wxSTDCALL FindText(OLECHAR *pchFindText, DWORD dwFlags, wxIMarkupPointer *pIEndMatch, wxIMarkupPointer *pIEndSearch) = 0; -}; - -struct wxIMarkupServices : public IUnknown -{ -public: - virtual HRESULT wxSTDCALL CreateMarkupPointer(wxIMarkupPointer **ppPointer) = 0; - virtual HRESULT wxSTDCALL CreateMarkupContainer(wxIMarkupContainer **ppMarkupContainer) = 0; - virtual HRESULT wxSTDCALL CreateElement(wxELEMENT_TAG_ID tagID, OLECHAR *pchAttributes, IHTMLElement **ppElement) = 0; - virtual HRESULT wxSTDCALL CloneElement(IHTMLElement *pElemCloneThis, IHTMLElement **ppElementTheClone) = 0; - virtual HRESULT wxSTDCALL InsertElement(IHTMLElement *pElementInsert, wxIMarkupPointer *pPointerStart, wxIMarkupPointer *pPointerFinish) = 0; - virtual HRESULT wxSTDCALL RemoveElement(IHTMLElement *pElementRemove) = 0; - virtual HRESULT wxSTDCALL Remove(wxIMarkupPointer *pPointerStart, wxIMarkupPointer *pPointerFinish) = 0; - virtual HRESULT wxSTDCALL Copy(wxIMarkupPointer *pPointerSourceStart, wxIMarkupPointer *pPointerSourceFinish, wxIMarkupPointer *pPointerTarget) = 0; - virtual HRESULT wxSTDCALL Move(wxIMarkupPointer *pPointerSourceStart, wxIMarkupPointer *pPointerSourceFinish, wxIMarkupPointer *pPointerTarget) = 0; - virtual HRESULT wxSTDCALL InsertText(OLECHAR *pchText, long cch, wxIMarkupPointer *pPointerTarget) = 0; - virtual HRESULT wxSTDCALL ParseString(OLECHAR *pchHTML, DWORD dwFlags, wxIMarkupContainer **ppContainerResult, wxIMarkupPointer *ppPointerStart, wxIMarkupPointer *ppPointerFinish) = 0; - virtual HRESULT wxSTDCALL ParseGlobal(HGLOBAL hglobalHTML, DWORD dwFlags, wxIMarkupContainer **ppContainerResult, wxIMarkupPointer *pPointerStart, wxIMarkupPointer *pPointerFinish) = 0; - virtual HRESULT wxSTDCALL IsScopedElement(IHTMLElement *pElement, BOOL *pfScoped) = 0; - virtual HRESULT wxSTDCALL GetElementTagId(IHTMLElement *pElement, wxELEMENT_TAG_ID *ptagId) = 0; - virtual HRESULT wxSTDCALL GetTagIDForName(BSTR bstrName, wxELEMENT_TAG_ID *ptagId) = 0; - virtual HRESULT wxSTDCALL GetNameForTagID(wxELEMENT_TAG_ID tagId, BSTR *pbstrName) = 0; - virtual HRESULT wxSTDCALL MovePointersToRange(wxIHTMLTxtRange *pIRange, wxIMarkupPointer *pPointerStart, wxIMarkupPointer *pPointerFinish) = 0; - virtual HRESULT wxSTDCALL MoveRangeToPointers(wxIMarkupPointer *pPointerStart, wxIMarkupPointer *pPointerFinish, wxIHTMLTxtRange *pIRange) = 0; - virtual HRESULT wxSTDCALL BeginUndoUnit(OLECHAR *pchTitle) = 0; - virtual HRESULT wxSTDCALL EndUndoUnit(void) = 0; -}; - -/* end of mshtml.h */ - -/* WinInet.h */ - -#ifndef HTTP_STATUS_BAD_REQUEST -#define HTTP_STATUS_BAD_REQUEST 400 -#endif - -#ifndef HTTP_STATUS_DENIED -#define HTTP_STATUS_DENIED 401 -#endif - -#ifndef HTTP_STATUS_PAYMENT_REQ -#define HTTP_STATUS_PAYMENT_REQ 402 -#endif - -#ifndef HTTP_STATUS_FORBIDDEN -#define HTTP_STATUS_FORBIDDEN 403 -#endif - -#ifndef HTTP_STATUS_NOT_FOUND -#define HTTP_STATUS_NOT_FOUND 404 -#endif - -#ifndef HTTP_STATUS_BAD_METHOD -#define HTTP_STATUS_BAD_METHOD 405 -#endif - -#ifndef HTTP_STATUS_NONE_ACCEPTABLE -#define HTTP_STATUS_NONE_ACCEPTABLE 406 -#endif - -#ifndef HTTP_STATUS_PROXY_AUTH_REQ -#define HTTP_STATUS_PROXY_AUTH_REQ 407 -#endif - -#ifndef HTTP_STATUS_REQUEST_TIMEOUT -#define HTTP_STATUS_REQUEST_TIMEOUT 408 -#endif - -#ifndef HTTP_STATUS_CONFLICT -#define HTTP_STATUS_CONFLICT 409 -#endif - -#ifndef HTTP_STATUS_GONE -#define HTTP_STATUS_GONE 410 -#endif - -#ifndef HTTP_STATUS_LENGTH_REQUIRED -#define HTTP_STATUS_LENGTH_REQUIRED 411 -#endif - -#ifndef HTTP_STATUS_PRECOND_FAILED -#define HTTP_STATUS_PRECOND_FAILED 412 -#endif - -#ifndef HTTP_STATUS_REQUEST_TOO_LARGE -#define HTTP_STATUS_REQUEST_TOO_LARGE 413 -#endif - -#ifndef HTTP_STATUS_URI_TOO_LONG -#define HTTP_STATUS_URI_TOO_LONG 414 -#endif - -#ifndef HTTP_STATUS_UNSUPPORTED_MEDIA -#define HTTP_STATUS_UNSUPPORTED_MEDIA 415 -#endif - -#ifndef HTTP_STATUS_RETRY_WITH -#define HTTP_STATUS_RETRY_WITH 449 -#endif - -#ifndef HTTP_STATUS_SERVER_ERROR -#define HTTP_STATUS_SERVER_ERROR 500 -#endif - -#ifndef HTTP_STATUS_NOT_SUPPORTED -#define HTTP_STATUS_NOT_SUPPORTED 501 -#endif - -#ifndef HTTP_STATUS_BAD_GATEWAY -#define HTTP_STATUS_BAD_GATEWAY 502 -#endif - -#ifndef HTTP_STATUS_SERVICE_UNAVAIL -#define HTTP_STATUS_SERVICE_UNAVAIL 503 -#endif - -#ifndef HTTP_STATUS_GATEWAY_TIMEOUT -#define HTTP_STATUS_GATEWAY_TIMEOUT 504 -#endif - -#ifndef HTTP_STATUS_VERSION_NOT_SUP -#define HTTP_STATUS_VERSION_NOT_SUP 505 -#endif - -/* end of WinInet.h */ - diff --git a/Externals/wxWidgets3/include/wx/msw/webviewhistoryitem_ie.h b/Externals/wxWidgets3/include/wx/msw/webviewhistoryitem_ie.h deleted file mode 100644 index 6edfbb3932..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/webviewhistoryitem_ie.h +++ /dev/null @@ -1,30 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: include/wx/msw/webviewhistoryitem.h -// Purpose: wxWebViewHistoryItem header for MSW -// Author: Steven Lamerton -// Copyright: (c) 2011 Steven Lamerton -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_WEBVIEWHISTORYITEM_H_ -#define _WX_MSW_WEBVIEWHISTORYITEM_H_ - -#include "wx/setup.h" - -#if wxUSE_WEBVIEW && wxUSE_WEBVIEW_IE && defined(__WXMSW__) - -class WXDLLIMPEXP_WEBVIEW wxWebViewHistoryItem -{ -public: - wxWebViewHistoryItem(const wxString& url, const wxString& title) : - m_url(url), m_title(title) {} - wxString GetUrl() { return m_url; } - wxString GetTitle() { return m_title; } - -private: - wxString m_url, m_title; -}; - -#endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_IE && defined(__WXMSW__) - -#endif // _WX_MSW_WEBVIEWHISTORYITEM_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/window.h b/Externals/wxWidgets3/include/wx/msw/window.h deleted file mode 100644 index fff738f338..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/window.h +++ /dev/null @@ -1,740 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/window.h -// Purpose: wxWindowMSW class -// Author: Julian Smart -// Modified by: Vadim Zeitlin on 13.05.99: complete refont of message handling, -// elimination of Default(), ... -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_WINDOW_H_ -#define _WX_WINDOW_H_ - -#include "wx/settings.h" // solely for wxSystemColour - -class WXDLLIMPEXP_FWD_CORE wxButton; - -// if this is set to 1, we use deferred window sizing to reduce flicker when -// resizing complicated window hierarchies, but this can in theory result in -// different behaviour than the old code so we keep the possibility to use it -// by setting this to 0 (in the future this should be removed completely) -#define wxUSE_DEFERRED_SIZING 1 - -// --------------------------------------------------------------------------- -// wxWindow declaration for MSW -// --------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxWindowMSW : public wxWindowBase -{ - friend class wxSpinCtrl; - friend class wxSlider; - friend class wxRadioBox; -public: - wxWindowMSW() { Init(); } - - wxWindowMSW(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxPanelNameStr) - { - Init(); - Create(parent, id, pos, size, style, name); - } - - virtual ~wxWindowMSW(); - - bool Create(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxPanelNameStr); - - // implement base class pure virtuals - virtual void SetLabel(const wxString& label); - virtual wxString GetLabel() const; - - virtual void Raise(); - virtual void Lower(); - - // No scaling. Device pixels are exposed directly. - virtual double GetContentScaleFactor() const { return 1.0; } - - virtual bool BeginRepositioningChildren(); - virtual void EndRepositioningChildren(); - - virtual bool Show(bool show = true); - virtual bool ShowWithEffect(wxShowEffect effect, - unsigned timeout = 0) - { - return MSWShowWithEffect(true, effect, timeout); - } - virtual bool HideWithEffect(wxShowEffect effect, - unsigned timeout = 0) - { - return MSWShowWithEffect(false, effect, timeout); - } - - virtual void SetFocus(); - virtual void SetFocusFromKbd(); - - virtual bool Reparent(wxWindowBase *newParent); - - virtual void WarpPointer(int x, int y); - - virtual void Refresh( bool eraseBackground = true, - const wxRect *rect = (const wxRect *) NULL ); - virtual void Update(); - - virtual void SetWindowStyleFlag(long style); - virtual void SetExtraStyle(long exStyle); - virtual bool SetCursor( const wxCursor &cursor ); - virtual bool SetFont( const wxFont &font ); - - virtual int GetCharHeight() const; - virtual int GetCharWidth() const; - - virtual void SetScrollbar( int orient, int pos, int thumbVisible, - int range, bool refresh = true ); - virtual void SetScrollPos( int orient, int pos, bool refresh = true ); - virtual int GetScrollPos( int orient ) const; - virtual int GetScrollThumb( int orient ) const; - virtual int GetScrollRange( int orient ) const; - virtual void ScrollWindow( int dx, int dy, - const wxRect* rect = NULL ); - - virtual bool ScrollLines(int lines); - virtual bool ScrollPages(int pages); - - virtual void SetLayoutDirection(wxLayoutDirection dir); - virtual wxLayoutDirection GetLayoutDirection() const; - virtual wxCoord AdjustForLayoutDirection(wxCoord x, - wxCoord width, - wxCoord widthTotal) const; - - virtual void SetId(wxWindowID winid); - -#if wxUSE_DRAG_AND_DROP - virtual void SetDropTarget( wxDropTarget *dropTarget ); -#endif // wxUSE_DRAG_AND_DROP - - // Accept files for dragging - virtual void DragAcceptFiles(bool accept); - -#ifndef __WXUNIVERSAL__ - // Native resource loading (implemented in src/msw/nativdlg.cpp) - // FIXME: should they really be all virtual? - virtual bool LoadNativeDialog(wxWindow* parent, wxWindowID id); - virtual bool LoadNativeDialog(wxWindow* parent, const wxString& name); - wxWindow* GetWindowChild1(wxWindowID id); - wxWindow* GetWindowChild(wxWindowID id); -#endif // __WXUNIVERSAL__ - -#if wxUSE_HOTKEY - // install and deinstall a system wide hotkey - virtual bool RegisterHotKey(int hotkeyId, int modifiers, int keycode); - virtual bool UnregisterHotKey(int hotkeyId); -#endif // wxUSE_HOTKEY - - // window handle stuff - // ------------------- - - WXHWND GetHWND() const { return m_hWnd; } - void SetHWND(WXHWND hWnd) { m_hWnd = hWnd; } - virtual WXWidget GetHandle() const { return GetHWND(); } - - void AssociateHandle(WXWidget handle); - void DissociateHandle(); - - // does this window have deferred position and/or size? - bool IsSizeDeferred() const; - - // these functions allow to register a global handler for the given Windows - // message: it will be called from MSWWindowProc() of any window which gets - // this event if it's not processed before (i.e. unlike a hook procedure it - // does not override the normal processing) - // - // notice that if you want to process a message for a given window only you - // should override its MSWWindowProc() instead - - // type of the handler: it is called with the message parameters (except - // that the window object is passed instead of window handle) and should - // return true if it handled the message or false if it should be passed to - // DefWindowProc() - typedef bool (*MSWMessageHandler)(wxWindowMSW *win, - WXUINT nMsg, - WXWPARAM wParam, - WXLPARAM lParam); - - // install a handler, shouldn't be called more than one for the same message - static bool MSWRegisterMessageHandler(int msg, MSWMessageHandler handler); - - // unregister a previously registered handler - static void MSWUnregisterMessageHandler(int msg, MSWMessageHandler handler); - - - // implementation from now on - // ========================== - - // event handlers - // -------------- - - void OnPaint(wxPaintEvent& event); - -public: - // Windows subclassing - void SubclassWin(WXHWND hWnd); - void UnsubclassWin(); - - WXFARPROC MSWGetOldWndProc() const { return m_oldWndProc; } - void MSWSetOldWndProc(WXFARPROC proc) { m_oldWndProc = proc; } - - // return true if the window is of a standard (i.e. not wxWidgets') class - // - // to understand why does it work, look at SubclassWin() code and comments - bool IsOfStandardClass() const { return m_oldWndProc != NULL; } - - wxWindow *FindItem(long id, WXHWND hWnd = NULL) const; - wxWindow *FindItemByHWND(WXHWND hWnd, bool controlOnly = false) const; - - // MSW only: true if this control is part of the main control - virtual bool ContainsHWND(WXHWND WXUNUSED(hWnd)) const { return false; } - -#if wxUSE_TOOLTIPS - // MSW only: true if this window or any of its children have a tooltip - virtual bool HasToolTips() const { return GetToolTip() != NULL; } -#endif // wxUSE_TOOLTIPS - - // translate wxWidgets style flags for this control into the Windows style - // and optional extended style for the corresponding native control - // - // this is the function that should be overridden in the derived classes, - // but you will mostly use MSWGetCreateWindowFlags() below - virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const ; - - // get the MSW window flags corresponding to wxWidgets ones - // - // the functions returns the flags (WS_XXX) directly and puts the ext - // (WS_EX_XXX) flags into the provided pointer if not NULL - WXDWORD MSWGetCreateWindowFlags(WXDWORD *exflags = NULL) const - { return MSWGetStyle(GetWindowStyle(), exflags); } - - // update the real underlying window style flags to correspond to the - // current wxWindow object style (safe to call even if window isn't fully - // created yet) - void MSWUpdateStyle(long flagsOld, long exflagsOld); - - // get the HWND to be used as parent of this window with CreateWindow() - virtual WXHWND MSWGetParent() const; - - // get the Win32 window class name used by all wxWindow objects by default - static const wxChar *MSWGetRegisteredClassName(); - - // creates the window of specified Windows class with given style, extended - // style, title and geometry (default values - // - // returns true if the window has been created, false if creation failed - bool MSWCreate(const wxChar *wclass, - const wxChar *title = NULL, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - WXDWORD style = 0, - WXDWORD exendedStyle = 0); - - virtual bool MSWCommand(WXUINT param, WXWORD id); - -#ifndef __WXUNIVERSAL__ - // Create an appropriate wxWindow from a HWND - virtual wxWindow* CreateWindowFromHWND(wxWindow* parent, WXHWND hWnd); - - // Make sure the window style reflects the HWND style (roughly) - virtual void AdoptAttributesFromHWND(); -#endif // __WXUNIVERSAL__ - - // Setup background and foreground colours correctly - virtual void SetupColours(); - - // ------------------------------------------------------------------------ - // helpers for message handlers: these perform the same function as the - // message crackers from - they unpack WPARAM and LPARAM into - // the correct parameters - // ------------------------------------------------------------------------ - - void UnpackCommand(WXWPARAM wParam, WXLPARAM lParam, - WXWORD *id, WXHWND *hwnd, WXWORD *cmd); - void UnpackActivate(WXWPARAM wParam, WXLPARAM lParam, - WXWORD *state, WXWORD *minimized, WXHWND *hwnd); - void UnpackScroll(WXWPARAM wParam, WXLPARAM lParam, - WXWORD *code, WXWORD *pos, WXHWND *hwnd); - void UnpackCtlColor(WXWPARAM wParam, WXLPARAM lParam, - WXHDC *hdc, WXHWND *hwnd); - void UnpackMenuSelect(WXWPARAM wParam, WXLPARAM lParam, - WXWORD *item, WXWORD *flags, WXHMENU *hmenu); - - // ------------------------------------------------------------------------ - // internal handlers for MSW messages: all handlers return a boolean value: - // true means that the handler processed the event and false that it didn't - // ------------------------------------------------------------------------ - - // there are several cases where we have virtual functions for Windows - // message processing: this is because these messages often require to be - // processed in a different manner in the derived classes. For all other - // messages, however, we do *not* have corresponding MSWOnXXX() function - // and if the derived class wants to process them, it should override - // MSWWindowProc() directly. - - // scroll event (both horizontal and vertical) - virtual bool MSWOnScroll(int orientation, WXWORD nSBCode, - WXWORD pos, WXHWND control); - - // child control notifications - virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); - - // owner-drawn controls need to process these messages - virtual bool MSWOnDrawItem(int id, WXDRAWITEMSTRUCT *item); - virtual bool MSWOnMeasureItem(int id, WXMEASUREITEMSTRUCT *item); - - // the rest are not virtual - bool HandleCreate(WXLPCREATESTRUCT cs, bool *mayCreate); - bool HandleInitDialog(WXHWND hWndFocus); - bool HandleDestroy(); - - bool HandlePaint(); - bool HandlePrintClient(WXHDC hDC); - bool HandleEraseBkgnd(WXHDC hDC); - - bool HandleMinimize(); - bool HandleMaximize(); - bool HandleSize(int x, int y, WXUINT flag); - bool HandleSizing(wxRect& rect); - bool HandleGetMinMaxInfo(void *mmInfo); - bool HandleEnterSizeMove(); - bool HandleExitSizeMove(); - - bool HandleShow(bool show, int status); - bool HandleActivate(int flag, bool minimized, WXHWND activate); - - bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control); - - bool HandleCtlColor(WXHBRUSH *hBrush, WXHDC hdc, WXHWND hWnd); - - bool HandlePaletteChanged(WXHWND hWndPalChange); - bool HandleQueryNewPalette(); - bool HandleSysColorChange(); - bool HandleDisplayChange(); - bool HandleCaptureChanged(WXHWND gainedCapture); - virtual bool HandleSettingChange(WXWPARAM wParam, WXLPARAM lParam); - - bool HandleQueryEndSession(long logOff, bool *mayEnd); - bool HandleEndSession(bool endSession, long logOff); - - bool HandleSetFocus(WXHWND wnd); - bool HandleKillFocus(WXHWND wnd); - - bool HandleDropFiles(WXWPARAM wParam); - - bool HandleMouseEvent(WXUINT msg, int x, int y, WXUINT flags); - bool HandleMouseMove(int x, int y, WXUINT flags); - bool HandleMouseWheel(wxMouseWheelAxis axis, - WXWPARAM wParam, WXLPARAM lParam); - - bool HandleChar(WXWPARAM wParam, WXLPARAM lParam); - bool HandleKeyDown(WXWPARAM wParam, WXLPARAM lParam); - bool HandleKeyUp(WXWPARAM wParam, WXLPARAM lParam); -#if wxUSE_HOTKEY - bool HandleHotKey(WXWPARAM wParam, WXLPARAM lParam); -#endif - int HandleMenuChar(int chAccel, WXLPARAM lParam); - // Create and process a clipboard event specified by type. - bool HandleClipboardEvent( WXUINT nMsg ); - - bool HandleQueryDragIcon(WXHICON *hIcon); - - bool HandleSetCursor(WXHWND hWnd, short nHitTest, int mouseMsg); - - bool HandlePower(WXWPARAM wParam, WXLPARAM lParam, bool *vetoed); - - - // The main body of common window proc for all wxWindow objects. It tries - // to handle the given message and returns true if it was handled (the - // appropriate return value is then put in result, which must be non-NULL) - // or false if it wasn't. - // - // This function should be overridden in any new code instead of - // MSWWindowProc() even if currently most of the code overrides - // MSWWindowProc() as it had been written before this function was added. - virtual bool MSWHandleMessage(WXLRESULT *result, - WXUINT message, - WXWPARAM wParam, - WXLPARAM lParam); - - // Common Window procedure for all wxWindow objects: forwards to - // MSWHandleMessage() and MSWDefWindowProc() if the message wasn't handled. - virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); - - // Calls an appropriate default window procedure - virtual WXLRESULT MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); - - // message processing helpers - - // return false if the message shouldn't be translated/preprocessed but - // dispatched normally - virtual bool MSWShouldPreProcessMessage(WXMSG* pMsg); - - // return true if the message was preprocessed and shouldn't be dispatched - virtual bool MSWProcessMessage(WXMSG* pMsg); - - // return true if the message was translated and shouldn't be dispatched - virtual bool MSWTranslateMessage(WXMSG* pMsg); - - // called when the window is about to be destroyed - virtual void MSWDestroyWindow(); - - - // Functions dealing with painting the window background. The derived - // classes should normally only need to reimplement MSWGetBgBrush() if they - // need to use a non-solid brush for erasing their background. This - // function is called by MSWGetBgBrushForChild() which only exists for the - // weird wxToolBar case and MSWGetBgBrushForChild() itself is used by - // MSWGetBgBrush() to actually find the right brush to use. - - // Adjust the origin for the brush returned by MSWGetBgBrushForChild(). - // - // This needs to be overridden for scrolled windows to ensure that the - // scrolling of their associated DC is taken into account. - // - // Both parameters must be non-NULL. - virtual void MSWAdjustBrushOrg(int* WXUNUSED(xOrg), - int* WXUNUSED(yOrg)) const - { - } - - // The brush returned from here must remain valid at least until the next - // event loop iteration. Returning 0, as is done by default, indicates - // there is no custom background brush. - virtual WXHBRUSH MSWGetCustomBgBrush() { return 0; } - - // this function should return the brush to paint the children controls - // background or 0 if this window doesn't impose any particular background - // on its children - // - // the hDC parameter is the DC background will be drawn on, it can be used - // to call SetBrushOrgEx() on it if the returned brush is a bitmap one - // - // child parameter is never NULL, it can be this window itself or one of - // its (grand)children - // - // the base class version returns a solid brush if we have a non default - // background colour or 0 otherwise - virtual WXHBRUSH MSWGetBgBrushForChild(WXHDC hDC, wxWindowMSW *child); - - // return the background brush to use for painting the given window by - // querying the parent windows via MSWGetBgBrushForChild() recursively - WXHBRUSH MSWGetBgBrush(WXHDC hDC); - - enum MSWThemeColour - { - ThemeColourText = 0, - ThemeColourBackground, - ThemeColourBorder - }; - - // returns a specific theme colour, or if that is not possible then - // wxSystemSettings::GetColour(fallback) - wxColour MSWGetThemeColour(const wchar_t *themeName, - int themePart, - int themeState, - MSWThemeColour themeColour, - wxSystemColour fallback) const; - - // gives the parent the possibility to draw its children background, e.g. - // this is used by wxNotebook to do it using DrawThemeBackground() - // - // return true if background was drawn, false otherwise - virtual bool MSWPrintChild(WXHDC WXUNUSED(hDC), wxWindow * WXUNUSED(child)) - { - return false; - } - - // some controls (e.g. wxListBox) need to set the return value themselves - // - // return true to let parent handle it if we don't, false otherwise - virtual bool MSWShouldPropagatePrintChild() - { - return true; - } - - // This should be overridden to return true for the controls which have - // themed background that should through their children. Currently only - // wxNotebook uses this. - // - // The base class version already returns true if we have a solid - // background colour that should be propagated to our children. - virtual bool MSWHasInheritableBackground() const - { - return InheritsBackgroundColour(); - } - -#if !defined(__WXUNIVERSAL__) - #define wxHAS_MSW_BACKGROUND_ERASE_HOOK -#endif - -#ifdef wxHAS_MSW_BACKGROUND_ERASE_HOOK - // allows the child to hook into its parent WM_ERASEBKGND processing: call - // MSWSetEraseBgHook() with a non-NULL window to make parent call - // MSWEraseBgHook() on this window (don't forget to reset it to NULL - // afterwards) - // - // this hack is used by wxToolBar, see comments there - void MSWSetEraseBgHook(wxWindow *child); - - // return true if WM_ERASEBKGND is currently hooked - bool MSWHasEraseBgHook() const; - - // called when the window on which MSWSetEraseBgHook() had been called - // receives WM_ERASEBKGND - virtual bool MSWEraseBgHook(WXHDC WXUNUSED(hDC)) { return false; } -#endif // wxHAS_MSW_BACKGROUND_ERASE_HOOK - - // common part of Show/HideWithEffect() - bool MSWShowWithEffect(bool show, - wxShowEffect effect, - unsigned timeout); - - // Responds to colour changes: passes event on to children. - void OnSysColourChanged(wxSysColourChangedEvent& event); - - // initialize various fields of wxMouseEvent (common part of MSWOnMouseXXX) - void InitMouseEvent(wxMouseEvent& event, int x, int y, WXUINT flags); - - // check if mouse is in the window - bool IsMouseInWindow() const; - - // check if a native double-buffering applies for this window - virtual bool IsDoubleBuffered() const; - - void SetDoubleBuffered(bool on); - - // synthesize a wxEVT_LEAVE_WINDOW event and set m_mouseInWindow to false - void GenerateMouseLeave(); - - // virtual function for implementing internal idle - // behaviour - virtual void OnInternalIdle(); - -#if wxUSE_MENUS && !defined(__WXUNIVERSAL__) - virtual bool HandleMenuSelect(WXWORD nItem, WXWORD nFlags, WXHMENU hMenu); - - // handle WM_(UN)INITMENUPOPUP message to generate wxEVT_MENU_OPEN/CLOSE - bool HandleMenuPopup(wxEventType evtType, WXHMENU hMenu); - - // Command part of HandleMenuPopup() and HandleExitMenuLoop(). - virtual bool DoSendMenuOpenCloseEvent(wxEventType evtType, wxMenu* menu); - - // Find the menu corresponding to the given handle. - virtual wxMenu* MSWFindMenuFromHMENU(WXHMENU hMenu); -#endif // wxUSE_MENUS && !__WXUNIVERSAL__ - - // Return the default button for the TLW containing this window or NULL if - // none. - static wxButton* MSWGetDefaultButtonFor(wxWindow* win); - - // Simulate a click on the given button if it is non-null, enabled and - // shown. - // - // Return true if the button was clicked, false otherwise. - static bool MSWClickButtonIfPossible(wxButton* btn); - -protected: - // this allows you to implement standard control borders without - // repeating the code in different classes that are not derived from - // wxControl - virtual wxBorder GetDefaultBorderForControl() const; - - // choose the default border for this window - virtual wxBorder GetDefaultBorder() const; - - // Translate wxBORDER_THEME (and other border styles if necessary to the value - // that makes most sense for this Windows environment - virtual wxBorder TranslateBorder(wxBorder border) const; - -#if wxUSE_MENUS_NATIVE - virtual bool DoPopupMenu( wxMenu *menu, int x, int y ); -#endif // wxUSE_MENUS_NATIVE - - // the window handle - WXHWND m_hWnd; - - // the old window proc (we subclass all windows) - WXFARPROC m_oldWndProc; - - // additional (MSW specific) flags - bool m_mouseInWindow:1; - bool m_lastKeydownProcessed:1; - - // the size of one page for scrolling - int m_xThumbSize; - int m_yThumbSize; - - // implement the base class pure virtuals - virtual void DoGetTextExtent(const wxString& string, - int *x, int *y, - int *descent = NULL, - int *externalLeading = NULL, - const wxFont *font = NULL) const; - virtual void DoClientToScreen( int *x, int *y ) const; - virtual void DoScreenToClient( int *x, int *y ) const; - virtual void DoGetPosition( int *x, int *y ) const; - virtual void DoGetSize( int *width, int *height ) const; - virtual void DoGetClientSize( int *width, int *height ) const; - virtual void DoSetSize(int x, int y, - int width, int height, - int sizeFlags = wxSIZE_AUTO); - virtual void DoSetClientSize(int width, int height); - - virtual wxSize DoGetBorderSize() const; - - virtual void DoCaptureMouse(); - virtual void DoReleaseMouse(); - - virtual void DoEnable(bool enable); - - virtual void DoFreeze(); - virtual void DoThaw(); - - // this simply moves/resizes the given HWND which is supposed to be our - // sibling (this is useful for controls which are composite at MSW level - // and for which DoMoveWindow() is not enough) - // - // returns true if the window move was deferred, false if it was moved - // immediately (no error return) - bool DoMoveSibling(WXHWND hwnd, int x, int y, int width, int height); - - // move the window to the specified location and resize it: this is called - // from both DoSetSize() and DoSetClientSize() and would usually just call - // ::MoveWindow() except for composite controls which will want to arrange - // themselves inside the given rectangle - virtual void DoMoveWindow(int x, int y, int width, int height); - -#if wxUSE_TOOLTIPS - virtual void DoSetToolTip( wxToolTip *tip ); - - // process TTN_NEEDTEXT message properly (i.e. fixing the bugs in - // comctl32.dll in our code -- see the function body for more info) - bool HandleTooltipNotify(WXUINT code, - WXLPARAM lParam, - const wxString& ttip); -#endif // wxUSE_TOOLTIPS - - // This is used by CreateKeyEvent() and also for wxEVT_CHAR[_HOOK] event - // creation. Notice that this method doesn't initialize wxKeyEvent - // m_keyCode and m_uniChar fields. - void InitAnyKeyEvent(wxKeyEvent& event, - WXWPARAM wParam, - WXLPARAM lParam) const; - - // Helper functions used by HandleKeyXXX() methods and some derived - // classes, wParam and lParam have the same meaning as in WM_KEY{DOWN,UP}. - // - // NB: evType here must be wxEVT_KEY_{DOWN,UP} as wParam here contains the - // virtual key code, not character! - wxKeyEvent CreateKeyEvent(wxEventType evType, - WXWPARAM wParam, - WXLPARAM lParam = 0) const; - - // Another helper for creating wxKeyEvent for wxEVT_CHAR and related types. - // - // The wParam and lParam here must come from WM_CHAR event parameters, i.e. - // wParam must be a character and not a virtual code. - wxKeyEvent CreateCharEvent(wxEventType evType, - WXWPARAM wParam, - WXLPARAM lParam) const; - - - // default OnEraseBackground() implementation, return true if we did erase - // the background, false otherwise (i.e. the system should erase it) - bool DoEraseBackground(WXHDC hDC); - - // generate WM_CHANGEUISTATE if it's needed for the OS we're running under - // - // action should be one of the UIS_XXX constants - // state should be one or more of the UISF_XXX constants - // if action == UIS_INITIALIZE then it doesn't seem to matter what we use - // for state as the system will decide for us what needs to be set - void MSWUpdateUIState(int action, int state = 0); - - // translate wxWidgets coords into Windows ones suitable to be passed to - // ::CreateWindow(), called from MSWCreate() - virtual void MSWGetCreateWindowCoords(const wxPoint& pos, - const wxSize& size, - int& x, int& y, - int& w, int& h) const; - - bool MSWEnableHWND(WXHWND hWnd, bool enable); - - // Return the pointer to this window or one of its sub-controls if this ID - // and HWND combination belongs to one of them. - // - // This is used by FindItem() and is overridden in wxControl, see there. - virtual wxWindow* MSWFindItem(long WXUNUSED(id), WXHWND WXUNUSED(hWnd)) const - { - return NULL; - } - -private: - // common part of all ctors - void Init(); - - // the (non-virtual) handlers for the events - bool HandleMove(int x, int y); - bool HandleMoving(wxRect& rect); - bool HandleJoystickEvent(WXUINT msg, int x, int y, WXUINT flags); - bool HandleNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); - -#ifndef __WXUNIVERSAL__ - // Call ::IsDialogMessage() if it is safe to do it (i.e. if it's not going - // to hang or do something else stupid) with the given message, return true - // if the message was handled by it. - bool MSWSafeIsDialogMessage(WXMSG* msg); -#endif // __WXUNIVERSAL__ - -#if wxUSE_DEFERRED_SIZING -protected: - // this function is called after the window was resized to its new size - virtual void MSWEndDeferWindowPos() - { - m_pendingPosition = wxDefaultPosition; - m_pendingSize = wxDefaultSize; - } - - // current defer window position operation handle (may be NULL) - WXHANDLE m_hDWP; - - // When deferred positioning is done these hold the pending changes, and - // are used for the default values if another size/pos changes is done on - // this window before the group of deferred changes is completed. - wxPoint m_pendingPosition; - wxSize m_pendingSize; -#endif // wxUSE_DEFERRED_SIZING - -private: - wxDECLARE_DYNAMIC_CLASS(wxWindowMSW); - wxDECLARE_NO_COPY_CLASS(wxWindowMSW); - wxDECLARE_EVENT_TABLE(); -}; - -// window creation helper class: before creating a new HWND, instantiate an -// object of this class on stack - this allows to process the messages sent to -// the window even before CreateWindow() returns -class wxWindowCreationHook -{ -public: - wxWindowCreationHook(wxWindowMSW *winBeingCreated); - ~wxWindowCreationHook(); -}; - -#endif // _WX_WINDOW_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/winundef.h b/Externals/wxWidgets3/include/wx/msw/winundef.h deleted file mode 100644 index 8d86f0cc7a..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/winundef.h +++ /dev/null @@ -1,466 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: winundef.h -// Purpose: undefine the common symbols #define'd by -// Author: Vadim Zeitlin -// Modified by: -// Created: 16.05.99 -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -/* THIS SHOULD NOT BE USED since you might include it once e.g. in window.h, - * then again _AFTER_ you've included windows.h, in which case it won't work - * a 2nd time -- JACS -#ifndef _WX_WINUNDEF_H_ -#define _WX_WINUNDEF_H_ - */ - -// ---------------------------------------------------------------------------- -// windows.h #defines the following identifiers which are also used in wxWin so -// we replace these symbols with the corresponding inline functions and -// undefine the macro. -// -// This looks quite ugly here but allows us to write clear (and correct!) code -// elsewhere because the functions, unlike the macros, respect the scope. -// ---------------------------------------------------------------------------- - -// CreateDialog - -#if defined(CreateDialog) - #undef CreateDialog - - inline HWND CreateDialog(HINSTANCE hInstance, - LPCTSTR pTemplate, - HWND hwndParent, - DLGPROC pDlgProc) - { - #ifdef _UNICODE - return CreateDialogW(hInstance, pTemplate, hwndParent, pDlgProc); - #else - return CreateDialogA(hInstance, pTemplate, hwndParent, pDlgProc); - #endif - } -#endif - -// CreateFont - -#ifdef CreateFont - #undef CreateFont - - inline HFONT CreateFont(int height, - int width, - int escapement, - int orientation, - int weight, - DWORD italic, - DWORD underline, - DWORD strikeout, - DWORD charset, - DWORD outprecision, - DWORD clipprecision, - DWORD quality, - DWORD family, - LPCTSTR facename) - { - #ifdef _UNICODE - return CreateFontW(height, width, escapement, orientation, - weight, italic, underline, strikeout, charset, - outprecision, clipprecision, quality, - family, facename); - #else - return CreateFontA(height, width, escapement, orientation, - weight, italic, underline, strikeout, charset, - outprecision, clipprecision, quality, - family, facename); - #endif - } -#endif // CreateFont - -// CreateWindow - -#if defined(CreateWindow) - #undef CreateWindow - - inline HWND CreateWindow(LPCTSTR lpClassName, - LPCTSTR lpWndClass, - DWORD dwStyle, - int x, int y, int w, int h, - HWND hWndParent, - HMENU hMenu, - HINSTANCE hInstance, - LPVOID lpParam) - { - #ifdef _UNICODE - return CreateWindowW(lpClassName, lpWndClass, dwStyle, x, y, w, h, - hWndParent, hMenu, hInstance, lpParam); - #else - return CreateWindowA(lpClassName, lpWndClass, dwStyle, x, y, w, h, - hWndParent, hMenu, hInstance, lpParam); - #endif - } -#endif - -// LoadMenu - -#ifdef LoadMenu - #undef LoadMenu - - inline HMENU LoadMenu(HINSTANCE instance, LPCTSTR name) - { - #ifdef _UNICODE - return LoadMenuW(instance, name); - #else - return LoadMenuA(instance, name); - #endif - } -#endif - -// FindText - -#ifdef FindText - #undef FindText - - inline HWND APIENTRY FindText(LPFINDREPLACE lpfindreplace) - { - #ifdef _UNICODE - return FindTextW(lpfindreplace); - #else - return FindTextA(lpfindreplace); - #endif - } -#endif - -// GetCharWidth - -#ifdef GetCharWidth - #undef GetCharWidth - inline BOOL GetCharWidth(HDC dc, UINT first, UINT last, LPINT buffer) - { - #ifdef _UNICODE - return GetCharWidthW(dc, first, last, buffer); - #else - return GetCharWidthA(dc, first, last, buffer); - #endif - } -#endif - -// FindWindow - -#ifdef FindWindow - #undef FindWindow - #ifdef _UNICODE - inline HWND FindWindow(LPCWSTR classname, LPCWSTR windowname) - { - return FindWindowW(classname, windowname); - } - #else - inline HWND FindWindow(LPCSTR classname, LPCSTR windowname) - { - return FindWindowA(classname, windowname); - } - #endif -#endif - -// PlaySound - -#ifdef PlaySound - #undef PlaySound - #ifdef _UNICODE - inline BOOL PlaySound(LPCWSTR pszSound, HMODULE hMod, DWORD fdwSound) - { - return PlaySoundW(pszSound, hMod, fdwSound); - } - #else - inline BOOL PlaySound(LPCSTR pszSound, HMODULE hMod, DWORD fdwSound) - { - return PlaySoundA(pszSound, hMod, fdwSound); - } - #endif -#endif - -// GetClassName - -#ifdef GetClassName - #undef GetClassName - #ifdef _UNICODE - inline int GetClassName(HWND h, LPWSTR classname, int maxcount) - { - return GetClassNameW(h, classname, maxcount); - } - #else - inline int GetClassName(HWND h, LPSTR classname, int maxcount) - { - return GetClassNameA(h, classname, maxcount); - } - #endif -#endif - -// GetClassInfo - -#ifdef GetClassInfo - #undef GetClassInfo - #ifdef _UNICODE - inline BOOL GetClassInfo(HINSTANCE h, LPCWSTR name, LPWNDCLASSW winclass) - { - return GetClassInfoW(h, name, winclass); - } - #else - inline BOOL GetClassInfo(HINSTANCE h, LPCSTR name, LPWNDCLASSA winclass) - { - return GetClassInfoA(h, name, winclass); - } - #endif -#endif - -// LoadAccelerators - -#ifdef LoadAccelerators - #undef LoadAccelerators - #ifdef _UNICODE - inline HACCEL LoadAccelerators(HINSTANCE h, LPCWSTR name) - { - return LoadAcceleratorsW(h, name); - } - #else - inline HACCEL LoadAccelerators(HINSTANCE h, LPCSTR name) - { - return LoadAcceleratorsA(h, name); - } - #endif -#endif - -// DrawText - -#ifdef DrawText - #undef DrawText - #ifdef _UNICODE - inline int DrawText(HDC h, LPCWSTR str, int count, LPRECT rect, UINT format) - { - return DrawTextW(h, str, count, rect, format); - } - #else - inline int DrawText(HDC h, LPCSTR str, int count, LPRECT rect, UINT format) - { - return DrawTextA(h, str, count, rect, format); - } - #endif -#endif - - -// StartDoc - -#ifdef StartDoc - #undef StartDoc - - // Work around a bug in very old MinGW headers that didn't define DOCINFOW - // and DOCINFOA but only DOCINFO in both ANSI and Unicode. - #if defined( __GNUG__ ) - #if !wxCHECK_W32API_VERSION( 0, 5 ) - #define DOCINFOW DOCINFO - #define DOCINFOA DOCINFO - #endif - #endif - - #ifdef _UNICODE - inline int StartDoc(HDC h, CONST DOCINFOW* info) - { - return StartDocW(h, (DOCINFOW*) info); - } - #else - inline int StartDoc(HDC h, CONST DOCINFOA* info) - { - return StartDocA(h, (DOCINFOA*) info); - } - #endif -#endif - -// GetObject - -#ifdef GetObject - #undef GetObject - inline int GetObject(HGDIOBJ h, int i, LPVOID buffer) - { - #ifdef _UNICODE - return GetObjectW(h, i, buffer); - #else - return GetObjectA(h, i, buffer); - #endif - } -#endif - -// GetMessage - -#ifdef GetMessage - #undef GetMessage - inline int GetMessage(LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, UINT wMsgFilterMax) - { - #ifdef _UNICODE - return GetMessageW(lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax); - #else - return GetMessageA(lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax); - #endif - } -#endif - -// LoadIcon -#ifdef LoadIcon - #undef LoadIcon - inline HICON LoadIcon(HINSTANCE hInstance, LPCTSTR lpIconName) - { - #ifdef _UNICODE - return LoadIconW(hInstance, lpIconName); - #else // ANSI - return LoadIconA(hInstance, lpIconName); - #endif // Unicode/ANSI - } -#endif // LoadIcon - -// LoadBitmap -#ifdef LoadBitmap - #undef LoadBitmap - inline HBITMAP LoadBitmap(HINSTANCE hInstance, LPCTSTR lpBitmapName) - { - #ifdef _UNICODE - return LoadBitmapW(hInstance, lpBitmapName); - #else // ANSI - return LoadBitmapA(hInstance, lpBitmapName); - #endif // Unicode/ANSI - } -#endif // LoadBitmap - -// LoadLibrary - -#ifdef LoadLibrary - #undef LoadLibrary - #ifdef _UNICODE - inline HINSTANCE LoadLibrary(LPCWSTR lpLibFileName) - { - return LoadLibraryW(lpLibFileName); - } - #else - inline HINSTANCE LoadLibrary(LPCSTR lpLibFileName) - { - return LoadLibraryA(lpLibFileName); - } - #endif -#endif - -// FindResource -#ifdef FindResource - #undef FindResource - #ifdef _UNICODE - inline HRSRC FindResource(HMODULE hModule, LPCWSTR lpName, LPCWSTR lpType) - { - return FindResourceW(hModule, lpName, lpType); - } - #else - inline HRSRC FindResource(HMODULE hModule, LPCSTR lpName, LPCSTR lpType) - { - return FindResourceA(hModule, lpName, lpType); - } - #endif -#endif - -// IsMaximized - -#ifdef IsMaximized - #undef IsMaximized - inline BOOL IsMaximized(HWND hwnd) - { - return IsZoomed(hwnd); - } -#endif - -// GetFirstChild - -#ifdef GetFirstChild - #undef GetFirstChild - inline HWND GetFirstChild(HWND hwnd) - { - return GetTopWindow(hwnd); - } -#endif - -// GetFirstSibling - -#ifdef GetFirstSibling - #undef GetFirstSibling - inline HWND GetFirstSibling(HWND hwnd) - { - return GetWindow(hwnd,GW_HWNDFIRST); - } -#endif - -// GetLastSibling - -#ifdef GetLastSibling - #undef GetLastSibling - inline HWND GetLastSibling(HWND hwnd) - { - return GetWindow(hwnd,GW_HWNDLAST); - } -#endif - -// GetPrevSibling - -#ifdef GetPrevSibling - #undef GetPrevSibling - inline HWND GetPrevSibling(HWND hwnd) - { - return GetWindow(hwnd,GW_HWNDPREV); - } -#endif - -// GetNextSibling - -#ifdef GetNextSibling - #undef GetNextSibling - inline HWND GetNextSibling(HWND hwnd) - { - return GetWindow(hwnd,GW_HWNDNEXT); - } -#endif - -// For WINE - -#if defined(GetWindowStyle) - #undef GetWindowStyle -#endif - -// For ming and cygwin - -// GetFirstChild -#ifdef GetFirstChild - #undef GetFirstChild - inline HWND GetFirstChild(HWND h) - { - return GetTopWindow(h); - } -#endif - - -// GetNextSibling -#ifdef GetNextSibling - #undef GetNextSibling - inline HWND GetNextSibling(HWND h) - { - return GetWindow(h, GW_HWNDNEXT); - } -#endif - - -#ifdef Yield - #undef Yield -#endif - - -// GetWindowProc -//ifdef GetWindowProc -// #undef GetWindowProc -//endif -//ifdef GetNextChild -// #undef GetNextChild -//endif - -// #endif // _WX_WINUNDEF_H_ - diff --git a/Externals/wxWidgets3/include/wx/msw/wrapcctl.h b/Externals/wxWidgets3/include/wx/msw/wrapcctl.h deleted file mode 100644 index e19111ada5..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/wrapcctl.h +++ /dev/null @@ -1,46 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/wrapcctl.h -// Purpose: Wrapper for the standard header -// Author: Vadim Zeitlin -// Modified by: -// Created: 03.08.2003 -// Copyright: (c) 2003 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_WRAPCCTL_H_ -#define _WX_MSW_WRAPCCTL_H_ - -#include "wx/msw/wrapwin.h" - -#include - -// define things which might be missing from our commctrl.h -#include "wx/msw/missing.h" - -// Set Unicode format for a common control -inline void wxSetCCUnicodeFormat(HWND hwnd) -{ - ::SendMessage(hwnd, CCM_SETUNICODEFORMAT, wxUSE_UNICODE, 0); -} - -#if wxUSE_GUI -// Return the default font for the common controls -// -// this is implemented in msw/settings.cpp -class wxFont; -extern wxFont wxGetCCDefaultFont(); - -// this is just a wrapper for HDITEM which we can't use in the public header -// because we don't want to include commctrl.h (and hence windows.h) from there -struct wxHDITEM : public HDITEM -{ - wxHDITEM() - { - ::ZeroMemory(this, sizeof(*this)); - } -}; - -#endif // wxUSE_GUI - -#endif // _WX_MSW_WRAPCCTL_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/wrapcdlg.h b/Externals/wxWidgets3/include/wx/msw/wrapcdlg.h deleted file mode 100644 index 038a9bc6fc..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/wrapcdlg.h +++ /dev/null @@ -1,27 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/wrapcdlg.h -// Purpose: Wrapper for the standard header -// Author: Wlodzimierz ABX Skiba -// Modified by: -// Created: 22.03.2005 -// Copyright: (c) 2005 Wlodzimierz Skiba -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_WRAPCDLG_H_ -#define _WX_MSW_WRAPCDLG_H_ - -#include "wx/defs.h" - -#include "wx/msw/wrapwin.h" -#include "wx/msw/private.h" -#include "wx/msw/missing.h" - -#if wxUSE_COMMON_DIALOGS - #include -#endif - -#include "wx/msw/winundef.h" - -#endif // _WX_MSW_WRAPCDLG_H_ - diff --git a/Externals/wxWidgets3/include/wx/msw/wrapgdip.h b/Externals/wxWidgets3/include/wx/msw/wrapgdip.h deleted file mode 100644 index 7b12ea51f9..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/wrapgdip.h +++ /dev/null @@ -1,44 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/wrapgdip.h -// Purpose: wrapper around header -// Author: Vadim Zeitlin -// Created: 2007-03-15 -// Copyright: (c) 2007 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_WRAPGDIP_H_ -#define _WX_MSW_WRAPGDIP_H_ - -#include "wx/msw/wrapwin.h" - -// these macros must be defined before gdiplus.h is included but we explicitly -// prevent windows.h from defining them in wx/msw/wrapwin.h as they conflict -// with standard functions of the same name elsewhere, so we have to pay for it -// by manually redefining them ourselves here -#ifndef max - #define max(a,b) (((a) > (b)) ? (a) : (b)) -#endif - -#ifndef min - #define min(a,b) (((a) < (b)) ? (a) : (b)) -#endif - -// There are many clashes between the names of the member fields and parameters -// in the standard gdiplus.h header and each of them results in C4458 with -// VC14, so disable this warning for this file as there is no other way to -// avoid it. -#ifdef __VISUALC__ - #pragma warning(push) - #pragma warning(disable:4458) // declaration of 'xxx' hides class member -#endif - -#include -using namespace Gdiplus; - -#ifdef __VISUALC__ - #pragma warning(pop) -#endif - -#endif // _WX_MSW_WRAPGDIP_H_ - diff --git a/Externals/wxWidgets3/include/wx/msw/wrapshl.h b/Externals/wxWidgets3/include/wx/msw/wrapshl.h deleted file mode 100644 index aa32ca9964..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/wrapshl.h +++ /dev/null @@ -1,87 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/wrapshl.h -// Purpose: wrapper class for stuff from shell32.dll -// Author: Vadim Zeitlin -// Modified by: -// Created: 2004-10-19 -// Copyright: (c) 2004 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_WRAPSHL_H_ -#define _WX_MSW_WRAPSHL_H_ - -#include "wx/msw/wrapwin.h" - -#include - -#include "wx/msw/winundef.h" - -#include "wx/log.h" - -// ---------------------------------------------------------------------------- -// wxItemIdList implements RAII on top of ITEMIDLIST -// ---------------------------------------------------------------------------- - -class wxItemIdList -{ -public: - // ctor takes ownership of the item and will free it - wxItemIdList(LPITEMIDLIST pidl) - { - m_pidl = pidl; - } - - static void Free(LPITEMIDLIST pidl) - { - if ( pidl ) - { - LPMALLOC pMalloc; - SHGetMalloc(&pMalloc); - if ( pMalloc ) - { - pMalloc->Free(pidl); - pMalloc->Release(); - } - else - { - wxLogLastError(wxT("SHGetMalloc")); - } - } - } - - ~wxItemIdList() - { - Free(m_pidl); - } - - // implicit conversion to LPITEMIDLIST - operator LPITEMIDLIST() const { return m_pidl; } - - // get the corresponding path, returns empty string on error - wxString GetPath() const - { - wxString path; - if ( !SHGetPathFromIDList(m_pidl, wxStringBuffer(path, MAX_PATH)) ) - { - wxLogLastError(wxT("SHGetPathFromIDList")); - } - - return path; - } - -private: - LPITEMIDLIST m_pidl; - - wxDECLARE_NO_COPY_CLASS(wxItemIdList); -}; - -// enable autocompleting filenames in the text control with given HWND -// -// this only works on systems with shlwapi.dll 5.0 or later -// -// implemented in src/msw/utilsgui.cpp -extern bool wxEnableFileNameAutoComplete(HWND hwnd); - -#endif // _WX_MSW_WRAPSHL_H_ - diff --git a/Externals/wxWidgets3/include/wx/msw/wrapwin.h b/Externals/wxWidgets3/include/wx/msw/wrapwin.h deleted file mode 100644 index eb94226059..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/wrapwin.h +++ /dev/null @@ -1,57 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/wrapwin.h -// Purpose: Wrapper around , to be included instead of it -// Author: Vaclav Slavik -// Created: 2003/07/22 -// Copyright: (c) 2003 Vaclav Slavik -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_WRAPWIN_H_ -#define _WX_WRAPWIN_H_ - -#include "wx/platform.h" - -// strict type checking to detect conversion from HFOO to HBAR at compile-time -#ifndef STRICT - #define STRICT 1 -#endif - -// this macro tells windows.h to not define min() and max() as macros: we need -// this as otherwise they conflict with standard C++ functions -#ifndef NOMINMAX - #define NOMINMAX -#endif // NOMINMAX - - -// before including windows.h, define version macros at (currently) maximal -// values because we do all our checks at run-time anyhow -#ifndef WINVER - #define WINVER 0x0603 -#endif - -// define _WIN32_WINNT and _WIN32_IE to the highest possible values because we -// always check for the version of installed DLLs at runtime anyway (see -// wxGetWinVersion() and wxApp::GetComCtl32Version()) unless the user really -// doesn't want to use APIs only available on later OS versions and had defined -// them to (presumably lower) values -#ifndef _WIN32_WINNT - #define _WIN32_WINNT 0x0603 -#endif - -#ifndef _WIN32_IE - #define _WIN32_IE 0x0700 -#endif - -// For IPv6 support, we must include winsock2.h before winsock.h, and -// windows.h include winsock.h so do it before including it -#if wxUSE_IPV6 - #include -#endif - -#include - -// #undef the macros defined in winsows.h which conflict with code elsewhere -#include "wx/msw/winundef.h" - -#endif // _WX_WRAPWIN_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/wx.manifest b/Externals/wxWidgets3/include/wx/msw/wx.manifest deleted file mode 100644 index ecce6f5c3b..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/wx.manifest +++ /dev/null @@ -1,22 +0,0 @@ - - - -wxWindows application - - - - - - diff --git a/Externals/wxWidgets3/include/wx/msw/wx.rc b/Externals/wxWidgets3/include/wx/msw/wx.rc deleted file mode 100644 index f71bb61e0a..0000000000 --- a/Externals/wxWidgets3/include/wx/msw/wx.rc +++ /dev/null @@ -1,126 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// File: wx.rc -// Purpose: wxWindows resource definitions. ALWAYS include -// this in your application resource file. -// Author: Julian Smart -// Modified by: -// Created: -// Copyright: (c) Julian Smart -// Licence: wxWindows Licence -///////////////////////////////////////////////////////////////////////////// - -#include - -#include "wx/msw/rcdefs.h" - -////////////////////////////////////////////////////////////////////////////// -// -// This is the MDI Window menu -// - -wxWindowMenu MENU DISCARDABLE -BEGIN - POPUP "&Window" - BEGIN - MENUITEM "&Cascade", 4002 - MENUITEM "Tile &Horizontally", 4001 - MENUITEM "Tile &Vertically", 4005 - MENUITEM "", -1 - MENUITEM "&Arrange Icons", 4003 - MENUITEM "&Next", 4004 - END -END - -////////////////////////////////////////////////////////////////////////////// -// -// Standard wxWindows Cursors -// - -WXCURSOR_HAND CURSOR DISCARDABLE "wx/msw/hand.cur" -WXCURSOR_BULLSEYE CURSOR DISCARDABLE "wx/msw/bullseye.cur" -WXCURSOR_PENCIL CURSOR DISCARDABLE "wx/msw/pencil.cur" -WXCURSOR_MAGNIFIER CURSOR DISCARDABLE "wx/msw/magnif1.cur" -WXCURSOR_ROLLER CURSOR DISCARDABLE "wx/msw/roller.cur" -WXCURSOR_PBRUSH CURSOR DISCARDABLE "wx/msw/pbrush.cur" -WXCURSOR_PLEFT CURSOR DISCARDABLE "wx/msw/pntleft.cur" -WXCURSOR_PRIGHT CURSOR DISCARDABLE "wx/msw/pntright.cur" -WXCURSOR_BLANK CURSOR DISCARDABLE "wx/msw/blank.cur" -WXCURSOR_CROSS CURSOR DISCARDABLE "wx/msw/cross.cur" - - -////////////////////////////////////////////////////////////////////////////// -// -// Default Icons -// - -// First wx icon in alphabetical order. -// -// Notice that it also may be used by Explorer as the application icon if the -// main program doesn't define any icons preceding this one in alphabetical -// order (i.e. any icons defined by it start with "wy", "x", "y" or "z") in -// 16*16 or 32*32 sizes. -wxICON_AAA ICON "wx/msw/std.ico" - -//wxDEFAULT_FRAME ICON "wx/msw/std.ico" -//wxDEFAULT_MDIPARENTFRAME ICON "wx/msw/mdi.ico" -//wxDEFAULT_MDICHILDFRAME ICON "wx/msw/child.ico" - -// Standard small icons -wxICON_SMALL_CLOSED_FOLDER ICON "wx/msw/folder1.ico" -wxICON_SMALL_OPEN_FOLDER ICON "wx/msw/folder2.ico" -wxICON_SMALL_FILE ICON "wx/msw/file1.ico" -wxICON_SMALL_COMPUTER ICON "wx/msw/computer.ico" -wxICON_SMALL_DRIVE ICON "wx/msw/drive.ico" -wxICON_SMALL_CDROM ICON "wx/msw/cdrom.ico" -wxICON_SMALL_FLOPPY ICON "wx/msw/floppy.ico" -wxICON_SMALL_REMOVEABLE ICON "wx/msw/removble.ico" - -////////////////////////////////////////////////////////////////////////////// -// -// Bitmaps -// - -// For wxContextHelpButton -csquery BITMAP "wx/msw/csquery.bmp" - -// For obtaining the RGB values of standard colours -wxBITMAP_STD_COLOURS BITMAP "wx/msw/colours.bmp" - -////////////////////////////////////////////////////////////////////////////// -// -// Include manifest file for common controls library v6 required to use themes. -// -// Predefining wxUSE_NO_MANIFEST as 1 always disables the use of the manifest. -// Otherwise we include it only if wxUSE_RC_MANIFEST is defined as 1. -// - -#if !defined(wxUSE_NO_MANIFEST) || (wxUSE_NO_MANIFEST == 0) - -#if defined(wxUSE_RC_MANIFEST) && wxUSE_RC_MANIFEST - -// see "about isolated applications" topic in MSDN -#ifdef ISOLATION_AWARE_ENABLED -#define wxMANIFEST_ID 2 -#else -#define wxMANIFEST_ID 1 -#endif - -#if defined(WX_CPU_AMD64) -wxMANIFEST_ID 24 "wx/msw/amd64.manifest" -#elif defined(WX_CPU_IA64) -wxMANIFEST_ID 24 "wx/msw/ia64.manifest" -#elif defined(WX_CPU_X86) -wxMANIFEST_ID 24 "wx/msw/wx.manifest" -#else -// Notice that if the manifest is included, WX_CPU_XXX constant corresponding -// to the architecture we're compiling for must be defined. This can be done -// either manually in your make/project file or by configuring the resource -// compiler paths to search in $(WXWIN)/lib/$(COMPILER_PREFIX)_lib/mswu[d] -// directory for its include files, as wx/msw/rcdefs.h file in this directory -// is generated during wxWidgets build and contains the correct definition. -#error "One of WX_CPU_XXX constants must be defined. See comment above." -#endif - -#endif // wxUSE_RC_MANIFEST - -#endif // !defined(wxUSE_NO_MANIFEST) || (wxUSE_NO_MANIFEST == 0) diff --git a/Externals/wxWidgets3/include/wx/nativewin.h b/Externals/wxWidgets3/include/wx/nativewin.h deleted file mode 100644 index b2ebad0685..0000000000 --- a/Externals/wxWidgets3/include/wx/nativewin.h +++ /dev/null @@ -1,251 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/nativewin.h -// Purpose: classes allowing to wrap a native window handle -// Author: Vadim Zeitlin -// Created: 2008-03-05 -// Copyright: (c) 2008 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_NATIVEWIN_H_ -#define _WX_NATIVEWIN_H_ - -#include "wx/toplevel.h" - -// These symbols can be tested in the user code to see if the current wx port -// has support for creating wxNativeContainerWindow and wxNativeWindow from -// native windows. -// -// Be optimistic by default, we undefine them below if necessary. -#define wxHAS_NATIVE_CONTAINER_WINDOW -#define wxHAS_NATIVE_WINDOW - -// we define the following typedefs for each of the platform supporting native -// windows wrapping: -// -// - wxNativeContainerWindowHandle is the toolkit-level handle of the native -// window, i.e. HWND/GdkWindow*/NSWindow -// -// - wxNativeContainerWindowId is the lowest level identifier of the native -// window, i.e. HWND/GdkNativeWindow/NSWindow (so it's the same as above for -// all platforms except GTK where we also can work with Window/XID) -// -// - wxNativeWindowHandle for child windows, i.e. HWND/GtkWidget*/NSControl -#if defined(__WXMSW__) - #include "wx/msw/wrapwin.h" - - typedef HWND wxNativeContainerWindowId; - typedef HWND wxNativeContainerWindowHandle; - typedef HWND wxNativeWindowHandle; -#elif defined(__WXGTK__) - #include - - // GdkNativeWindow is guint32 under GDK/X11 and gpointer under GDK/WIN32 - #ifdef __UNIX__ - typedef unsigned long wxNativeContainerWindowId; - #else - typedef void *wxNativeContainerWindowId; - #endif - typedef GdkWindow *wxNativeContainerWindowHandle; - typedef GtkWidget *wxNativeWindowHandle; -#elif defined(__WXOSX_COCOA__) - typedef NSView *wxNativeWindowHandle; - - // no support for using native TLWs yet - #undef wxHAS_NATIVE_CONTAINER_WINDOW -#else - // no support for using native windows under this platform yet - #undef wxHAS_NATIVE_CONTAINER_WINDOW - #undef wxHAS_NATIVE_WINDOW -#endif - -#ifdef wxHAS_NATIVE_WINDOW - -// ---------------------------------------------------------------------------- -// wxNativeWindow: for using native windows inside wxWidgets windows -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxNativeWindow : public wxWindow -{ -public: - // Default ctor, Create() must be called later to really create the window. - wxNativeWindow() - { - Init(); - } - - // Create a window from an existing native window handle. - // - // Notice that this ctor doesn't take the usual pos and size parameters, - // they're taken from the window handle itself. - // - // Use GetHandle() to check if the creation was successful, it will return - // 0 if the handle was invalid. - wxNativeWindow(wxWindow* parent, wxWindowID winid, wxNativeWindowHandle handle) - { - Init(); - - Create(parent, winid, handle); - } - - // Same as non-default ctor, but with a return code. - bool Create(wxWindow* parent, wxWindowID winid, wxNativeWindowHandle handle); - - // By default the native window with which this wxWindow is associated is - // owned by the user code and needs to be destroyed by it in a platform - // specific way, however this function can be called to let wxNativeWindow - // dtor take care of destroying the native window instead of having to do - // it from the user code. - void Disown() - { - wxCHECK_RET( m_ownedByUser, wxS("Can't disown more than once") ); - - m_ownedByUser = false; - - DoDisown(); - } - -#ifdef __WXMSW__ - // Prevent the native window, not owned by us, from being destroyed by the - // base class dtor, unless Disown() had been called. - virtual ~wxNativeWindow(); -#endif // __WXMSW__ - -private: - void Init() - { - m_ownedByUser = true; - } - - // This is implemented in platform-specific code. - void DoDisown(); - - // If the native widget owned by the user code. - bool m_ownedByUser; - - wxDECLARE_NO_COPY_CLASS(wxNativeWindow); -}; - -#endif // wxHAS_NATIVE_WINDOW - -#ifdef wxHAS_NATIVE_CONTAINER_WINDOW - -// ---------------------------------------------------------------------------- -// wxNativeContainerWindow: can be used for creating other wxWindows inside it -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxNativeContainerWindow : public wxTopLevelWindow -{ -public: - // default ctor, call Create() later - wxNativeContainerWindow() { } - - // create a window from an existing native window handle - // - // use GetHandle() to check if the creation was successful, it will return - // 0 if the handle was invalid - wxNativeContainerWindow(wxNativeContainerWindowHandle handle) - { - Create(handle); - } - - // same as ctor above but with a return code - bool Create(wxNativeContainerWindowHandle handle); - -#if defined(__WXGTK__) - // this is a convenient ctor for wxGTK applications which can also create - // the objects of this class from the really native window handles and not - // only the GdkWindow objects - // - // wxNativeContainerWindowId is Window (i.e. an XID, i.e. an int) under X11 - // (when GDK_WINDOWING_X11 is defined) or HWND under Win32 - wxNativeContainerWindow(wxNativeContainerWindowId winid) { Create(winid); } - - bool Create(wxNativeContainerWindowId winid); -#endif // wxGTK - - // unlike for the normal windows, dtor will not destroy the native window - // as it normally doesn't belong to us - virtual ~wxNativeContainerWindow(); - - - // provide (trivial) implementation of the base class pure virtuals - virtual void SetTitle(const wxString& WXUNUSED(title)) wxOVERRIDE - { - wxFAIL_MSG( "not implemented for native windows" ); - } - - virtual wxString GetTitle() const wxOVERRIDE - { - wxFAIL_MSG( "not implemented for native windows" ); - - return wxString(); - } - - virtual void Maximize(bool WXUNUSED(maximize) = true) wxOVERRIDE - { - wxFAIL_MSG( "not implemented for native windows" ); - } - - virtual bool IsMaximized() const wxOVERRIDE - { - wxFAIL_MSG( "not implemented for native windows" ); - - return false; - } - - virtual void Iconize(bool WXUNUSED(iconize) = true) wxOVERRIDE - { - wxFAIL_MSG( "not implemented for native windows" ); - } - - virtual bool IsIconized() const wxOVERRIDE - { - // this is called by wxGTK implementation so don't assert - return false; - } - - virtual void Restore() wxOVERRIDE - { - wxFAIL_MSG( "not implemented for native windows" ); - } - - virtual bool ShowFullScreen(bool WXUNUSED(show), - long WXUNUSED(style) = wxFULLSCREEN_ALL) wxOVERRIDE - { - wxFAIL_MSG( "not implemented for native windows" ); - - return false; - } - - virtual bool IsFullScreen() const wxOVERRIDE - { - wxFAIL_MSG( "not implemented for native windows" ); - - return false; - } - -#ifdef __WXMSW__ - virtual bool IsShown() const wxOVERRIDE; -#endif // __WXMSW__ - - // this is an implementation detail: called when the native window is - // destroyed by an outside agency; deletes the C++ object too but can in - // principle be overridden to something else (knowing that the window - // handle of this object and all of its children is invalid any more) - virtual void OnNativeDestroyed(); - -protected: -#ifdef __WXMSW__ - virtual WXLRESULT - MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); -#endif // __WXMSW__ - -private: - wxDECLARE_NO_COPY_CLASS(wxNativeContainerWindow); -}; - -#endif // wxHAS_NATIVE_CONTAINER_WINDOW - -#endif // _WX_NATIVEWIN_H_ - diff --git a/Externals/wxWidgets3/include/wx/nonownedwnd.h b/Externals/wxWidgets3/include/wx/nonownedwnd.h deleted file mode 100644 index 9beb00da9b..0000000000 --- a/Externals/wxWidgets3/include/wx/nonownedwnd.h +++ /dev/null @@ -1,113 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/nonownedwnd.h -// Purpose: declares wxNonTopLevelWindow class -// Author: Vaclav Slavik -// Modified by: -// Created: 2006-12-24 -// Copyright: (c) 2006 TT-Solutions -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_NONOWNEDWND_H_ -#define _WX_NONOWNEDWND_H_ - -#include "wx/window.h" - -// Styles that can be used with any wxNonOwnedWindow: -#define wxFRAME_SHAPED 0x0010 // Create a window that is able to be shaped - -class WXDLLIMPEXP_FWD_CORE wxGraphicsPath; - -// ---------------------------------------------------------------------------- -// wxNonOwnedWindow: a window that is not a child window of another one. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxNonOwnedWindowBase : public wxWindow -{ -public: - // Set the shape of the window to the given region. - // Returns true if the platform supports this feature (and the - // operation is successful.) - bool SetShape(const wxRegion& region) - { - // This style is in fact only needed by wxOSX/Carbon so once we don't - // use this port any more, we could get rid of this requirement, but - // for now you must specify wxFRAME_SHAPED for SetShape() to work on - // all platforms. - wxCHECK_MSG - ( - HasFlag(wxFRAME_SHAPED), false, - wxS("Shaped windows must be created with the wxFRAME_SHAPED style.") - ); - - return region.IsEmpty() ? DoClearShape() : DoSetRegionShape(region); - } - -#if wxUSE_GRAPHICS_CONTEXT - // Set the shape using the specified path. - bool SetShape(const wxGraphicsPath& path) - { - wxCHECK_MSG - ( - HasFlag(wxFRAME_SHAPED), false, - wxS("Shaped windows must be created with the wxFRAME_SHAPED style.") - ); - - return DoSetPathShape(path); - } -#endif // wxUSE_GRAPHICS_CONTEXT - - - // Overridden base class methods. - // ------------------------------ - - virtual void AdjustForParentClientOrigin(int& WXUNUSED(x), int& WXUNUSED(y), - int WXUNUSED(sizeFlags) = 0) const wxOVERRIDE - { - // Non owned windows positions don't need to be adjusted for parent - // client area origin so simply do nothing here. - } - - virtual void InheritAttributes() wxOVERRIDE - { - // Non owned windows don't inherit attributes from their parent window - // (if the parent frame is red, it doesn't mean that all dialogs shown - // by it should be red as well), so don't do anything here neither. - } - -protected: - virtual bool DoClearShape() - { - return false; - } - - virtual bool DoSetRegionShape(const wxRegion& WXUNUSED(region)) - { - return false; - } - -#if wxUSE_GRAPHICS_CONTEXT - virtual bool DoSetPathShape(const wxGraphicsPath& WXUNUSED(path)) - { - return false; - } -#endif // wxUSE_GRAPHICS_CONTEXT -}; - -#if defined(__WXDFB__) - #include "wx/dfb/nonownedwnd.h" -#elif defined(__WXGTK20__) - #include "wx/gtk/nonownedwnd.h" -#elif defined(__WXMAC__) - #include "wx/osx/nonownedwnd.h" -#elif defined(__WXMSW__) - #include "wx/msw/nonownedwnd.h" -#else - // No special class needed in other ports, they can derive both wxTLW and - // wxPopupWindow directly from wxWindow and don't implement SetShape(). - class wxNonOwnedWindow : public wxNonOwnedWindowBase - { - }; -#endif - -#endif // _WX_NONOWNEDWND_H_ diff --git a/Externals/wxWidgets3/include/wx/notebook.h b/Externals/wxWidgets3/include/wx/notebook.h deleted file mode 100644 index 2d5de60566..0000000000 --- a/Externals/wxWidgets3/include/wx/notebook.h +++ /dev/null @@ -1,207 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/notebook.h -// Purpose: wxNotebook interface -// Author: Vadim Zeitlin -// Modified by: -// Created: 01.02.01 -// Copyright: (c) 1996-2000 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_NOTEBOOK_H_BASE_ -#define _WX_NOTEBOOK_H_BASE_ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/defs.h" - -#if wxUSE_NOTEBOOK - -#include "wx/bookctrl.h" - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -// wxNotebook hit results, use wxBK_HITTEST so other book controls can share them -// if wxUSE_NOTEBOOK is disabled -enum -{ - wxNB_HITTEST_NOWHERE = wxBK_HITTEST_NOWHERE, - wxNB_HITTEST_ONICON = wxBK_HITTEST_ONICON, - wxNB_HITTEST_ONLABEL = wxBK_HITTEST_ONLABEL, - wxNB_HITTEST_ONITEM = wxBK_HITTEST_ONITEM, - wxNB_HITTEST_ONPAGE = wxBK_HITTEST_ONPAGE -}; - -// wxNotebook flags - -// use common book wxBK_* flags for describing alignment -#define wxNB_DEFAULT wxBK_DEFAULT -#define wxNB_TOP wxBK_TOP -#define wxNB_BOTTOM wxBK_BOTTOM -#define wxNB_LEFT wxBK_LEFT -#define wxNB_RIGHT wxBK_RIGHT - -#define wxNB_FIXEDWIDTH 0x0100 -#define wxNB_MULTILINE 0x0200 -#define wxNB_NOPAGETHEME 0x0400 -#define wxNB_FLAT 0x0800 - - -typedef wxWindow wxNotebookPage; // so far, any window can be a page - -extern WXDLLIMPEXP_DATA_CORE(const char) wxNotebookNameStr[]; - -#if wxUSE_EXTENDED_RTTI - -// ---------------------------------------------------------------------------- -// XTI accessor -// ---------------------------------------------------------------------------- - -class WXDLLEXPORT wxNotebookPageInfo : public wxObject -{ -public: - wxNotebookPageInfo() { m_page = NULL; m_imageId = -1; m_selected = false; } - virtual ~wxNotebookPageInfo() { } - - bool Create(wxNotebookPage *page, - const wxString& text, - bool selected, - int imageId) - { - m_page = page; - m_text = text; - m_selected = selected; - m_imageId = imageId; - return true; - } - - wxNotebookPage* GetPage() const { return m_page; } - wxString GetText() const { return m_text; } - bool GetSelected() const { return m_selected; } - int GetImageId() const { return m_imageId; } - -private: - wxNotebookPage *m_page; - wxString m_text; - bool m_selected; - int m_imageId; - - wxDECLARE_DYNAMIC_CLASS(wxNotebookPageInfo); -}; - -WX_DECLARE_EXPORTED_LIST(wxNotebookPageInfo, wxNotebookPageInfoList ); - -#endif - -// ---------------------------------------------------------------------------- -// wxNotebookBase: define wxNotebook interface -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxNotebookBase : public wxBookCtrlBase -{ -public: - // ctors - // ----- - - wxNotebookBase() { } - - // wxNotebook-specific additions to wxBookCtrlBase interface - // --------------------------------------------------------- - - // get the number of rows for a control with wxNB_MULTILINE style (not all - // versions support it - they will always return 1 then) - virtual int GetRowCount() const { return 1; } - - // set the padding between tabs (in pixels) - virtual void SetPadding(const wxSize& padding) = 0; - - // set the size of the tabs for wxNB_FIXEDWIDTH controls - virtual void SetTabSize(const wxSize& sz) = 0; - - - - // implement some base class functions - virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const wxOVERRIDE; - - // On platforms that support it, get the theme page background colour, else invalid colour - virtual wxColour GetThemeBackgroundColour() const { return wxNullColour; } - - - // send wxEVT_NOTEBOOK_PAGE_CHANGING/ED events - - // returns false if the change to nPage is vetoed by the program - bool SendPageChangingEvent(int nPage); - - // sends the event about page change from old to new (or GetSelection() if - // new is wxNOT_FOUND) - void SendPageChangedEvent(int nPageOld, int nPageNew = wxNOT_FOUND); - - // wxBookCtrlBase overrides this method to return false but we do need - // focus because we have tabs - virtual bool AcceptsFocus() const wxOVERRIDE { return wxControl::AcceptsFocus(); } - -#if wxUSE_EXTENDED_RTTI - // XTI accessors - virtual void AddPageInfo( wxNotebookPageInfo* info ); - virtual const wxNotebookPageInfoList& GetPageInfos() const; -#endif - -protected: -#if wxUSE_EXTENDED_RTTI - wxNotebookPageInfoList m_pageInfos; -#endif - wxDECLARE_NO_COPY_CLASS(wxNotebookBase); -}; - -// ---------------------------------------------------------------------------- -// notebook event class and related stuff -// ---------------------------------------------------------------------------- - -// wxNotebookEvent is obsolete and defined for compatibility only (notice that -// we use #define and not typedef to also keep compatibility with the existing -// code which forward declares it) -#define wxNotebookEvent wxBookCtrlEvent -typedef wxBookCtrlEventFunction wxNotebookEventFunction; -#define wxNotebookEventHandler(func) wxBookCtrlEventHandler(func) - -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_NOTEBOOK_PAGE_CHANGED, wxBookCtrlEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_NOTEBOOK_PAGE_CHANGING, wxBookCtrlEvent ); - -#define EVT_NOTEBOOK_PAGE_CHANGED(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_NOTEBOOK_PAGE_CHANGED, winid, wxBookCtrlEventHandler(fn)) - -#define EVT_NOTEBOOK_PAGE_CHANGING(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_NOTEBOOK_PAGE_CHANGING, winid, wxBookCtrlEventHandler(fn)) - -// ---------------------------------------------------------------------------- -// wxNotebook class itself -// ---------------------------------------------------------------------------- - -#if defined(__WXUNIVERSAL__) - #include "wx/univ/notebook.h" -#elif defined(__WXMSW__) - #include "wx/msw/notebook.h" -#elif defined(__WXMOTIF__) - #include "wx/generic/notebook.h" -#elif defined(__WXGTK20__) - #include "wx/gtk/notebook.h" -#elif defined(__WXGTK__) - #include "wx/gtk1/notebook.h" -#elif defined(__WXMAC__) - #include "wx/osx/notebook.h" -#elif defined(__WXQT__) - #include "wx/qt/notebook.h" -#endif - -// old wxEVT_COMMAND_* constants -#define wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED wxEVT_NOTEBOOK_PAGE_CHANGED -#define wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING wxEVT_NOTEBOOK_PAGE_CHANGING - -#endif // wxUSE_NOTEBOOK - -#endif - // _WX_NOTEBOOK_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/notifmsg.h b/Externals/wxWidgets3/include/wx/notifmsg.h deleted file mode 100644 index eb41f85ad4..0000000000 --- a/Externals/wxWidgets3/include/wx/notifmsg.h +++ /dev/null @@ -1,182 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/notifmsg.h -// Purpose: class allowing to show notification messages to the user -// Author: Vadim Zeitlin -// Created: 2007-11-19 -// Copyright: (c) 2007 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_NOTIFMSG_H_ -#define _WX_NOTIFMSG_H_ - -#include "wx/event.h" - -#if wxUSE_NOTIFICATION_MESSAGE - -// ---------------------------------------------------------------------------- -// wxNotificationMessage: allows to show the user a message non intrusively -// ---------------------------------------------------------------------------- - -// notice that this class is not a window and so doesn't derive from wxWindow - -class WXDLLIMPEXP_ADV wxNotificationMessageBase : public wxEvtHandler -{ -public: - // ctors and initializers - // ---------------------- - - // default ctor, use setters below to initialize it later - wxNotificationMessageBase() - { - Init(); - } - - // create a notification object with the given title and message (the - // latter may be empty in which case only the title will be shown) - wxNotificationMessageBase(const wxString& title, - const wxString& message = wxEmptyString, - wxWindow *parent = NULL, - int flags = wxICON_INFORMATION) - { - Init(); - Create(title, message, parent, flags); - } - - virtual ~wxNotificationMessageBase(); - - // note that the setters must be called before Show() - - // set the title: short string, markup not allowed - void SetTitle(const wxString& title); - - // set the text of the message: this is a longer string than the title and - // some platforms allow simple HTML-like markup in it - void SetMessage(const wxString& message); - - // set the parent for this notification: we'll be associated with the top - // level parent of this window or, if this method is not called, with the - // main application window by default - void SetParent(wxWindow *parent); - - // this method can currently be used to choose a standard icon to use: the - // parameter may be one of wxICON_INFORMATION, wxICON_WARNING or - // wxICON_ERROR only (but not wxICON_QUESTION) - void SetFlags(int flags); - - // set a custom icon to use instead of the system provided specified via SetFlags - virtual void SetIcon(const wxIcon& icon); - - // Add a button to the notification, returns false if the platform does not support - // actions in notifications - virtual bool AddAction(wxWindowID actionid, const wxString &label = wxString()); - - // showing and hiding - // ------------------ - - // possible values for Show() timeout - enum - { - Timeout_Auto = -1, // notification will be hidden automatically - Timeout_Never = 0 // notification will never time out - }; - - // show the notification to the user and hides it after timeout seconds - // pass (special values Timeout_Auto and Timeout_Never can be used) - // - // returns false if an error occurred - bool Show(int timeout = Timeout_Auto); - - // hide the notification, returns true if it was hidden or false if it - // couldn't be done (e.g. on some systems automatically hidden - // notifications can't be hidden manually) - bool Close(); - -protected: - // Common part of all ctors. - void Create(const wxString& title = wxEmptyString, - const wxString& message = wxEmptyString, - wxWindow *parent = NULL, - int flags = wxICON_INFORMATION) - { - SetTitle(title); - SetMessage(message); - SetParent(parent); - SetFlags(flags); - } - - class wxNotificationMessageImpl* m_impl; - -private: - - void Init() - { - m_impl = NULL; - } - - wxDECLARE_NO_COPY_CLASS(wxNotificationMessageBase); -}; - -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_NOTIFICATION_MESSAGE_CLICK, wxCommandEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_NOTIFICATION_MESSAGE_DISMISSED, wxCommandEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_NOTIFICATION_MESSAGE_ACTION, wxCommandEvent ); - -#if (defined(__WXGTK__) && wxUSE_LIBNOTIFY) || \ - (defined(__WXMSW__) && wxUSE_TASKBARICON && wxUSE_TASKBARICON_BALLOONS) || \ - (defined(__WXOSX_COCOA__) && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8)) - #define wxHAS_NATIVE_NOTIFICATION_MESSAGE -#endif - -// ---------------------------------------------------------------------------- -// wxNotificationMessage -// ---------------------------------------------------------------------------- - -#ifdef wxHAS_NATIVE_NOTIFICATION_MESSAGE - -#if defined(__WXMSW__) -class WXDLLIMPEXP_FWD_ADV wxTaskBarIcon; -#endif // defined(__WXMSW__) - -#else -#include "wx/generic/notifmsg.h" -#endif // wxHAS_NATIVE_NOTIFICATION_MESSAGE - -class WXDLLIMPEXP_ADV wxNotificationMessage : public -#ifdef wxHAS_NATIVE_NOTIFICATION_MESSAGE - wxNotificationMessageBase -#else - wxGenericNotificationMessage -#endif -{ -public: - wxNotificationMessage() { Init(); } - wxNotificationMessage(const wxString& title, - const wxString& message = wxString(), - wxWindow *parent = NULL, - int flags = wxICON_INFORMATION) - { - Init(); - Create(title, message, parent, flags); - } - -#if defined(__WXMSW__) && defined(wxHAS_NATIVE_NOTIFICATION_MESSAGE) - static bool MSWUseToasts( - const wxString& shortcutPath = wxString(), - const wxString& appId = wxString()); - - // returns the task bar icon which was used previously (may be NULL) - static wxTaskBarIcon *UseTaskBarIcon(wxTaskBarIcon *icon); - -#endif // defined(__WXMSW__) && defined(wxHAS_NATIVE_NOTIFICATION_MESSAGE) - -private: - // common part of all ctors - void Init(); - - wxDECLARE_NO_COPY_CLASS(wxNotificationMessage); -}; - -#endif // wxUSE_NOTIFICATION_MESSAGE - -#endif // _WX_NOTIFMSG_H_ - diff --git a/Externals/wxWidgets3/include/wx/numdlg.h b/Externals/wxWidgets3/include/wx/numdlg.h deleted file mode 100644 index c1c39742ec..0000000000 --- a/Externals/wxWidgets3/include/wx/numdlg.h +++ /dev/null @@ -1,22 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/numdlg.h -// Purpose: wxNumberEntryDialog class -// Author: John Labenski -// Modified by: -// Created: 07.02.04 (extracted from wx/textdlg.h) -// Copyright: (c) John Labenski -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_NUMDLGDLG_H_BASE_ -#define _WX_NUMDLGDLG_H_BASE_ - -#include "wx/defs.h" - -#if wxUSE_NUMBERDLG - -#include "wx/generic/numdlgg.h" - -#endif // wxUSE_NUMBERDLG - -#endif // _WX_NUMDLGDLG_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/numformatter.h b/Externals/wxWidgets3/include/wx/numformatter.h deleted file mode 100644 index 13b47b210b..0000000000 --- a/Externals/wxWidgets3/include/wx/numformatter.h +++ /dev/null @@ -1,78 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/numformatter.h -// Purpose: wxNumberFormatter class -// Author: Fulvio Senore, Vadim Zeitlin -// Created: 2010-11-06 -// Copyright: (c) 2010 wxWidgets team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_NUMFORMATTER_H_ -#define _WX_NUMFORMATTER_H_ - -#include "wx/string.h" - -// Helper class for formatting numbers with thousands separators which also -// supports parsing the numbers formatted by it. -class WXDLLIMPEXP_BASE wxNumberFormatter -{ -public: - // Bit masks for ToString() - enum Style - { - Style_None = 0x00, - Style_WithThousandsSep = 0x01, - Style_NoTrailingZeroes = 0x02 // Only for floating point numbers - }; - - // Format a number as a string. By default, the thousands separator is - // used, specify Style_None to prevent this. For floating point numbers, - // precision can also be specified. - static wxString ToString(long val, - int style = Style_WithThousandsSep); -#ifdef wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG - static wxString ToString(wxLongLong_t val, - int style = Style_WithThousandsSep); -#endif // wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG - static wxString ToString(double val, - int precision, - int style = Style_WithThousandsSep); - - // Parse a string representing a number, possibly with thousands separator. - // - // Return true on success and stores the result in the provided location - // which must be a valid non-NULL pointer. - static bool FromString(wxString s, long *val); -#ifdef wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG - static bool FromString(wxString s, wxLongLong_t *val); -#endif // wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG - static bool FromString(wxString s, double *val); - - - // Get the decimal separator for the current locale. It is always defined - // and we fall back to returning '.' in case of an error. - static wxChar GetDecimalSeparator(); - - // Get the thousands separator if grouping of the digits is used by the - // current locale. The value returned in sep should be only used if the - // function returns true. - static bool GetThousandsSeparatorIfUsed(wxChar *sep); - -private: - // Post-process the string representing an integer. - static wxString PostProcessIntString(wxString s, int style); - - // Add the thousands separators to a string representing a number without - // the separators. This is used by ToString(Style_WithThousandsSep). - static void AddThousandsSeparators(wxString& s); - - // Remove trailing zeroes and, if there is nothing left after it, the - // decimal separator itself from a string representing a floating point - // number. Also used by ToString(). - static void RemoveTrailingZeroes(wxString& s); - - // Remove all thousands separators from a string representing a number. - static void RemoveThousandsSeparators(wxString& s); -}; - -#endif // _WX_NUMFORMATTER_H_ diff --git a/Externals/wxWidgets3/include/wx/object.h b/Externals/wxWidgets3/include/wx/object.h deleted file mode 100644 index 6a0140737b..0000000000 --- a/Externals/wxWidgets3/include/wx/object.h +++ /dev/null @@ -1,480 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/object.h -// Purpose: wxObject class, plus run-time type information macros -// Author: Julian Smart -// Modified by: Ron Lee -// Created: 01/02/97 -// Copyright: (c) 1997 Julian Smart -// (c) 2001 Ron Lee -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_OBJECTH__ -#define _WX_OBJECTH__ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/memory.h" - -#define wxDECLARE_CLASS_INFO_ITERATORS() \ -class WXDLLIMPEXP_BASE const_iterator \ - { \ - typedef wxHashTable_Node Node; \ - public: \ - typedef const wxClassInfo* value_type; \ - typedef const value_type& const_reference; \ - typedef const_iterator itor; \ - typedef value_type* ptr_type; \ - \ - Node* m_node; \ - wxHashTable* m_table; \ - public: \ - typedef const_reference reference_type; \ - typedef ptr_type pointer_type; \ - \ - const_iterator(Node* node, wxHashTable* table) \ - : m_node(node), m_table(table) { } \ - const_iterator() : m_node(NULL), m_table(NULL) { } \ - value_type operator*() const; \ - itor& operator++(); \ - const itor operator++(int); \ - bool operator!=(const itor& it) const \ - { return it.m_node != m_node; } \ - bool operator==(const itor& it) const \ - { return it.m_node == m_node; } \ - }; \ - \ - static const_iterator begin_classinfo(); \ - static const_iterator end_classinfo() - -// based on the value of wxUSE_EXTENDED_RTTI symbol, -// only one of the RTTI system will be compiled: -// - the "old" one (defined by rtti.h) or -// - the "new" one (defined by xti.h) -#include "wx/xti.h" -#include "wx/rtti.h" - -#define wxIMPLEMENT_CLASS(name, basename) \ - wxIMPLEMENT_ABSTRACT_CLASS(name, basename) - -#define wxIMPLEMENT_CLASS2(name, basename1, basename2) \ - wxIMPLEMENT_ABSTRACT_CLASS2(name, basename1, basename2) - -// ----------------------------------- -// for pluggable classes -// ----------------------------------- - - // NOTE: this should probably be the very first statement - // in the class declaration so wxPluginSentinel is - // the first member initialised and the last destroyed. - -// _DECLARE_DL_SENTINEL(name) wxPluginSentinel m_pluginsentinel; - -#if wxUSE_NESTED_CLASSES - -#define _DECLARE_DL_SENTINEL(name, exportdecl) \ -class exportdecl name##PluginSentinel { \ -private: \ - static const wxString sm_className; \ -public: \ - name##PluginSentinel(); \ - ~name##PluginSentinel(); \ -}; \ -name##PluginSentinel m_pluginsentinel - -#define _IMPLEMENT_DL_SENTINEL(name) \ - const wxString name::name##PluginSentinel::sm_className(#name); \ - name::name##PluginSentinel::name##PluginSentinel() { \ - wxPluginLibrary *e = (wxPluginLibrary*) wxPluginLibrary::ms_classes.Get(#name); \ - if( e != 0 ) { e->RefObj(); } \ - } \ - name::name##PluginSentinel::~name##PluginSentinel() { \ - wxPluginLibrary *e = (wxPluginLibrary*) wxPluginLibrary::ms_classes.Get(#name); \ - if( e != 0 ) { e->UnrefObj(); } \ - } -#else - -#define _DECLARE_DL_SENTINEL(name) -#define _IMPLEMENT_DL_SENTINEL(name) - -#endif // wxUSE_NESTED_CLASSES - -#define wxDECLARE_PLUGGABLE_CLASS(name) \ - wxDECLARE_DYNAMIC_CLASS(name); _DECLARE_DL_SENTINEL(name, WXDLLIMPEXP_CORE) -#define wxDECLARE_ABSTRACT_PLUGGABLE_CLASS(name) \ - wxDECLARE_ABSTRACT_CLASS(name); _DECLARE_DL_SENTINEL(name, WXDLLIMPEXP_CORE) - -#define wxDECLARE_USER_EXPORTED_PLUGGABLE_CLASS(name, usergoo) \ - wxDECLARE_DYNAMIC_CLASS(name); _DECLARE_DL_SENTINEL(name, usergoo) -#define wxDECLARE_USER_EXPORTED_ABSTRACT_PLUGGABLE_CLASS(name, usergoo) \ - wxDECLARE_ABSTRACT_CLASS(name); _DECLARE_DL_SENTINEL(name, usergoo) - -#define wxIMPLEMENT_PLUGGABLE_CLASS(name, basename) \ - wxIMPLEMENT_DYNAMIC_CLASS(name, basename) _IMPLEMENT_DL_SENTINEL(name) -#define wxIMPLEMENT_PLUGGABLE_CLASS2(name, basename1, basename2) \ - wxIMPLEMENT_DYNAMIC_CLASS2(name, basename1, basename2) _IMPLEMENT_DL_SENTINEL(name) -#define wxIMPLEMENT_ABSTRACT_PLUGGABLE_CLASS(name, basename) \ - wxIMPLEMENT_ABSTRACT_CLASS(name, basename) _IMPLEMENT_DL_SENTINEL(name) -#define wxIMPLEMENT_ABSTRACT_PLUGGABLE_CLASS2(name, basename1, basename2) \ - wxIMPLEMENT_ABSTRACT_CLASS2(name, basename1, basename2) _IMPLEMENT_DL_SENTINEL(name) - -#define wxIMPLEMENT_USER_EXPORTED_PLUGGABLE_CLASS(name, basename) \ - wxIMPLEMENT_PLUGGABLE_CLASS(name, basename) -#define wxIMPLEMENT_USER_EXPORTED_PLUGGABLE_CLASS2(name, basename1, basename2) \ - wxIMPLEMENT_PLUGGABLE_CLASS2(name, basename1, basename2) -#define wxIMPLEMENT_USER_EXPORTED_ABSTRACT_PLUGGABLE_CLASS(name, basename) \ - wxIMPLEMENT_ABSTRACT_PLUGGABLE_CLASS(name, basename) -#define wxIMPLEMENT_USER_EXPORTED_ABSTRACT_PLUGGABLE_CLASS2(name, basename1, basename2) \ - wxIMPLEMENT_ABSTRACT_PLUGGABLE_CLASS2(name, basename1, basename2) - -#define wxCLASSINFO(name) (&name::ms_classInfo) - -#define wxIS_KIND_OF(obj, className) obj->IsKindOf(&className::ms_classInfo) - -// Just seems a bit nicer-looking (pretend it's not a macro) -#define wxIsKindOf(obj, className) obj->IsKindOf(&className::ms_classInfo) - -// this cast does some more checks at compile time as it uses static_cast -// internally -// -// note that it still has different semantics from dynamic_cast<> and so can't -// be replaced by it as long as there are any compilers not supporting it -#define wxDynamicCast(obj, className) \ - ((className *) wxCheckDynamicCast( \ - const_cast(static_cast(\ - const_cast(static_cast(obj)))), \ - &className::ms_classInfo)) - -// The 'this' pointer is always true, so use this version -// to cast the this pointer and avoid compiler warnings. -#define wxDynamicCastThis(className) \ - (IsKindOf(&className::ms_classInfo) ? (className *)(this) : (className *)0) - -template -inline T *wxCheckCast(const void *ptr) -{ - wxASSERT_MSG( wxDynamicCast(ptr, T), "wxStaticCast() used incorrectly" ); - return const_cast(static_cast(ptr)); -} - -#define wxStaticCast(obj, className) wxCheckCast(obj) - -// ---------------------------------------------------------------------------- -// set up memory debugging macros -// ---------------------------------------------------------------------------- - -/* - Which new/delete operator variants do we want? - - _WX_WANT_NEW_SIZET_WXCHAR_INT = void *operator new (size_t size, wxChar *fileName = 0, int lineNum = 0) - _WX_WANT_DELETE_VOID = void operator delete (void * buf) - _WX_WANT_DELETE_VOID_WXCHAR_INT = void operator delete(void *buf, wxChar*, int) - _WX_WANT_ARRAY_NEW_SIZET_WXCHAR_INT = void *operator new[] (size_t size, wxChar *fileName , int lineNum = 0) - _WX_WANT_ARRAY_DELETE_VOID = void operator delete[] (void *buf) - _WX_WANT_ARRAY_DELETE_VOID_WXCHAR_INT = void operator delete[] (void* buf, wxChar*, int ) -*/ - -#if wxUSE_MEMORY_TRACING - -// All compilers get these ones -#define _WX_WANT_NEW_SIZET_WXCHAR_INT -#define _WX_WANT_DELETE_VOID - -#if defined(__VISUALC__) - #define _WX_WANT_DELETE_VOID_WXCHAR_INT -#endif - -// Now see who (if anyone) gets the array memory operators -#if wxUSE_ARRAY_MEMORY_OPERATORS - - // Everyone except Visual C++ (cause problems for VC++ - crashes) - #if !defined(__VISUALC__) - #define _WX_WANT_ARRAY_NEW_SIZET_WXCHAR_INT - #endif - - // Everyone except Visual C++ (cause problems for VC++ - crashes) - #if !defined(__VISUALC__) - #define _WX_WANT_ARRAY_DELETE_VOID - #endif -#endif // wxUSE_ARRAY_MEMORY_OPERATORS - -#endif // wxUSE_MEMORY_TRACING - -// ---------------------------------------------------------------------------- -// Compatibility macro aliases DECLARE group -// ---------------------------------------------------------------------------- -// deprecated variants _not_ requiring a semicolon after them and without wx prefix. -// (note that also some wx-prefixed macro do _not_ require a semicolon because -// it's not always possible to force the compiler to require it) - -#define DECLARE_CLASS_INFO_ITERATORS() wxDECLARE_CLASS_INFO_ITERATORS(); -#define DECLARE_ABSTRACT_CLASS(n) wxDECLARE_ABSTRACT_CLASS(n); -#define DECLARE_DYNAMIC_CLASS_NO_ASSIGN(n) wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(n); -#define DECLARE_DYNAMIC_CLASS_NO_COPY(n) wxDECLARE_DYNAMIC_CLASS_NO_COPY(n); -#define DECLARE_DYNAMIC_CLASS(n) wxDECLARE_DYNAMIC_CLASS(n); -#define DECLARE_CLASS(n) wxDECLARE_CLASS(n); - -#define DECLARE_PLUGGABLE_CLASS(n) wxDECLARE_PLUGGABLE_CLASS(n); -#define DECLARE_ABSTRACT_PLUGGABLE_CLASS(n) wxDECLARE_ABSTRACT_PLUGGABLE_CLASS(n); -#define DECLARE_USER_EXPORTED_PLUGGABLE_CLASS(n,u) wxDECLARE_USER_EXPORTED_PLUGGABLE_CLASS(n,u); -#define DECLARE_USER_EXPORTED_ABSTRACT_PLUGGABLE_CLASS(n,u) wxDECLARE_USER_EXPORTED_ABSTRACT_PLUGGABLE_CLASS(n,u); - -// ---------------------------------------------------------------------------- -// wxRefCounter: ref counted data "manager" -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxRefCounter -{ -public: - wxRefCounter() { m_count = 1; } - - int GetRefCount() const { return m_count; } - - void IncRef() { m_count++; } - void DecRef(); - -protected: - // this object should never be destroyed directly but only as a - // result of a DecRef() call: - virtual ~wxRefCounter() { } - -private: - // our refcount: - int m_count; - - // It doesn't make sense to copy the reference counted objects, a new ref - // counter should be created for a new object instead and compilation - // errors in the code using wxRefCounter due to the lack of copy ctor often - // indicate a problem, e.g. a forgotten copy ctor implementation somewhere. - wxDECLARE_NO_COPY_CLASS(wxRefCounter); -}; - -// ---------------------------------------------------------------------------- -// wxObjectRefData: ref counted data meant to be stored in wxObject -// ---------------------------------------------------------------------------- - -typedef wxRefCounter wxObjectRefData; - -// ---------------------------------------------------------------------------- -// wxObjectDataPtr: helper class to avoid memleaks because of missing calls -// to wxObjectRefData::DecRef -// ---------------------------------------------------------------------------- - -template -class wxObjectDataPtr -{ -public: - typedef T element_type; - - wxEXPLICIT wxObjectDataPtr(T *ptr = NULL) : m_ptr(ptr) {} - - // copy ctor - wxObjectDataPtr(const wxObjectDataPtr &tocopy) - : m_ptr(tocopy.m_ptr) - { - if (m_ptr) - m_ptr->IncRef(); - } - - ~wxObjectDataPtr() - { - if (m_ptr) - m_ptr->DecRef(); - } - - T *get() const { return m_ptr; } - - // test for pointer validity: defining conversion to unspecified_bool_type - // and not more obvious bool to avoid implicit conversions to integer types - typedef T *(wxObjectDataPtr::*unspecified_bool_type)() const; - operator unspecified_bool_type() const - { - return m_ptr ? &wxObjectDataPtr::get : NULL; - } - - T& operator*() const - { - wxASSERT(m_ptr != NULL); - return *(m_ptr); - } - - T *operator->() const - { - wxASSERT(m_ptr != NULL); - return get(); - } - - void reset(T *ptr) - { - if (m_ptr) - m_ptr->DecRef(); - m_ptr = ptr; - } - - wxObjectDataPtr& operator=(const wxObjectDataPtr &tocopy) - { - if (m_ptr) - m_ptr->DecRef(); - m_ptr = tocopy.m_ptr; - if (m_ptr) - m_ptr->IncRef(); - return *this; - } - - wxObjectDataPtr& operator=(T *ptr) - { - if (m_ptr) - m_ptr->DecRef(); - m_ptr = ptr; - return *this; - } - -private: - T *m_ptr; -}; - -// ---------------------------------------------------------------------------- -// wxObject: the root class of wxWidgets object hierarchy -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxObject -{ - wxDECLARE_ABSTRACT_CLASS(wxObject); - -public: - wxObject() { m_refData = NULL; } - virtual ~wxObject() { UnRef(); } - - wxObject(const wxObject& other) - { - m_refData = other.m_refData; - if (m_refData) - m_refData->IncRef(); - } - - wxObject& operator=(const wxObject& other) - { - if ( this != &other ) - { - Ref(other); - } - return *this; - } - - bool IsKindOf(const wxClassInfo *info) const; - - - // Turn on the correct set of new and delete operators - -#ifdef _WX_WANT_NEW_SIZET_WXCHAR_INT - void *operator new ( size_t size, const wxChar *fileName = NULL, int lineNum = 0 ); -#endif - -#ifdef _WX_WANT_DELETE_VOID - void operator delete ( void * buf ); -#endif - -#ifdef _WX_WANT_DELETE_VOID_WXCHAR_INT - void operator delete ( void *buf, const wxChar*, int ); -#endif - -#ifdef _WX_WANT_ARRAY_NEW_SIZET_WXCHAR_INT - void *operator new[] ( size_t size, const wxChar *fileName = NULL, int lineNum = 0 ); -#endif - -#ifdef _WX_WANT_ARRAY_DELETE_VOID - void operator delete[] ( void *buf ); -#endif - -#ifdef _WX_WANT_ARRAY_DELETE_VOID_WXCHAR_INT - void operator delete[] (void* buf, const wxChar*, int ); -#endif - - // ref counted data handling methods - - // get/set - wxObjectRefData *GetRefData() const { return m_refData; } - void SetRefData(wxObjectRefData *data) { m_refData = data; } - - // make a 'clone' of the object - void Ref(const wxObject& clone); - - // destroy a reference - void UnRef(); - - // Make sure this object has only one reference - void UnShare() { AllocExclusive(); } - - // check if this object references the same data as the other one - bool IsSameAs(const wxObject& o) const { return m_refData == o.m_refData; } - -protected: - // ensure that our data is not shared with anybody else: if we have no - // data, it is created using CreateRefData() below, if we have shared data - // it is copied using CloneRefData(), otherwise nothing is done - void AllocExclusive(); - - // both methods must be implemented if AllocExclusive() is used, not pure - // virtual only because of the backwards compatibility reasons - - // create a new m_refData - virtual wxObjectRefData *CreateRefData() const; - - // create a new m_refData initialized with the given one - virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; - - wxObjectRefData *m_refData; -}; - -inline wxObject *wxCheckDynamicCast(wxObject *obj, wxClassInfo *classInfo) -{ - return obj && obj->GetClassInfo()->IsKindOf(classInfo) ? obj : NULL; -} - -#include "wx/xti2.h" - -// ---------------------------------------------------------------------------- -// more debugging macros -// ---------------------------------------------------------------------------- - -#if wxUSE_DEBUG_NEW_ALWAYS - #define WXDEBUG_NEW new(__TFILE__,__LINE__) - - #if wxUSE_GLOBAL_MEMORY_OPERATORS - #define new WXDEBUG_NEW - #elif defined(__VISUALC__) - // Including this file redefines new and allows leak reports to - // contain line numbers - #include "wx/msw/msvcrt.h" - #endif -#endif // wxUSE_DEBUG_NEW_ALWAYS - -// ---------------------------------------------------------------------------- -// Compatibility macro aliases IMPLEMENT group -// ---------------------------------------------------------------------------- - -// deprecated variants _not_ requiring a semicolon after them and without wx prefix. -// (note that also some wx-prefixed macro do _not_ require a semicolon because -// it's not always possible to force the compiler to require it) - -#define IMPLEMENT_DYNAMIC_CLASS(n,b) wxIMPLEMENT_DYNAMIC_CLASS(n,b) -#define IMPLEMENT_DYNAMIC_CLASS2(n,b1,b2) wxIMPLEMENT_DYNAMIC_CLASS2(n,b1,b2) -#define IMPLEMENT_ABSTRACT_CLASS(n,b) wxIMPLEMENT_ABSTRACT_CLASS(n,b) -#define IMPLEMENT_ABSTRACT_CLASS2(n,b1,b2) wxIMPLEMENT_ABSTRACT_CLASS2(n,b1,b2) -#define IMPLEMENT_CLASS(n,b) wxIMPLEMENT_CLASS(n,b) -#define IMPLEMENT_CLASS2(n,b1,b2) wxIMPLEMENT_CLASS2(n,b1,b2) - -#define IMPLEMENT_PLUGGABLE_CLASS(n,b) wxIMPLEMENT_PLUGGABLE_CLASS(n,b) -#define IMPLEMENT_PLUGGABLE_CLASS2(n,b,b2) wxIMPLEMENT_PLUGGABLE_CLASS2(n,b,b2) -#define IMPLEMENT_ABSTRACT_PLUGGABLE_CLASS(n,b) wxIMPLEMENT_ABSTRACT_PLUGGABLE_CLASS(n,b) -#define IMPLEMENT_ABSTRACT_PLUGGABLE_CLASS2(n,b,b2) wxIMPLEMENT_ABSTRACT_PLUGGABLE_CLASS2(n,b,b2) -#define IMPLEMENT_USER_EXPORTED_PLUGGABLE_CLASS(n,b) wxIMPLEMENT_USER_EXPORTED_PLUGGABLE_CLASS(n,b) -#define IMPLEMENT_USER_EXPORTED_PLUGGABLE_CLASS2(n,b,b2) wxIMPLEMENT_USER_EXPORTED_PLUGGABLE_CLASS2(n,b,b2) -#define IMPLEMENT_USER_EXPORTED_ABSTRACT_PLUGGABLE_CLASS(n,b) wxIMPLEMENT_USER_EXPORTED_ABSTRACT_PLUGGABLE_CLASS(n,b) -#define IMPLEMENT_USER_EXPORTED_ABSTRACT_PLUGGABLE_CLASS2(n,b,b2) wxIMPLEMENT_USER_EXPORTED_ABSTRACT_PLUGGABLE_CLASS2(n,b,b2) - -#define CLASSINFO(n) wxCLASSINFO(n) - -#endif // _WX_OBJECTH__ diff --git a/Externals/wxWidgets3/include/wx/odcombo.h b/Externals/wxWidgets3/include/wx/odcombo.h deleted file mode 100644 index 64cfc64fcf..0000000000 --- a/Externals/wxWidgets3/include/wx/odcombo.h +++ /dev/null @@ -1,403 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/odcombo.h -// Purpose: wxOwnerDrawnComboBox and wxVListBoxPopup -// Author: Jaakko Salli -// Modified by: -// Created: Apr-30-2006 -// Copyright: (c) Jaakko Salli -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_ODCOMBO_H_ -#define _WX_ODCOMBO_H_ - -#include "wx/defs.h" - -#if wxUSE_ODCOMBOBOX - -#include "wx/combo.h" -#include "wx/ctrlsub.h" -#include "wx/vlbox.h" -#include "wx/timer.h" - - -// -// New window styles for wxOwnerDrawnComboBox -// -enum -{ - // Double-clicking cycles item if wxCB_READONLY is also used. - wxODCB_DCLICK_CYCLES = wxCC_SPECIAL_DCLICK, - - // If used, control itself is not custom paint using callback. - // Even if this is not used, writable combo is never custom paint - // until SetCustomPaintWidth is called - wxODCB_STD_CONTROL_PAINT = 0x1000 -}; - - -// -// Callback flags (see wxOwnerDrawnComboBox::OnDrawItem) -// -enum wxOwnerDrawnComboBoxPaintingFlags -{ - // when set, we are painting the selected item in control, - // not in the popup - wxODCB_PAINTING_CONTROL = 0x0001, - - - // when set, we are painting an item which should have - // focus rectangle painted in the background. Text colour - // and clipping region are then appropriately set in - // the default OnDrawBackground implementation. - wxODCB_PAINTING_SELECTED = 0x0002 -}; - - -// ---------------------------------------------------------------------------- -// wxVListBoxComboPopup is a wxVListBox customized to act as a popup control. -// -// Notes: -// wxOwnerDrawnComboBox uses this as its popup. However, it always derives -// from native wxComboCtrl. If you need to use this popup with -// wxGenericComboControl, then remember that vast majority of item manipulation -// functionality is implemented in the wxVListBoxComboPopup class itself. -// -// ---------------------------------------------------------------------------- - - -class WXDLLIMPEXP_ADV wxVListBoxComboPopup : public wxVListBox, - public wxComboPopup -{ - friend class wxOwnerDrawnComboBox; -public: - - // init and dtor - wxVListBoxComboPopup() : wxVListBox(), wxComboPopup() { } - virtual ~wxVListBoxComboPopup(); - - // required virtuals - virtual void Init() wxOVERRIDE; - virtual bool Create(wxWindow* parent) wxOVERRIDE; - virtual void SetFocus() wxOVERRIDE; - virtual wxWindow *GetControl() wxOVERRIDE { return this; } - virtual void SetStringValue( const wxString& value ) wxOVERRIDE; - virtual wxString GetStringValue() const wxOVERRIDE; - - // more customization - virtual void OnPopup() wxOVERRIDE; - virtual wxSize GetAdjustedSize( int minWidth, int prefHeight, int maxHeight ) wxOVERRIDE; - virtual void PaintComboControl( wxDC& dc, const wxRect& rect ) wxOVERRIDE; - virtual void OnComboKeyEvent( wxKeyEvent& event ) wxOVERRIDE; - virtual void OnComboCharEvent( wxKeyEvent& event ) wxOVERRIDE; - virtual void OnComboDoubleClick() wxOVERRIDE; - virtual bool LazyCreate() wxOVERRIDE; - virtual bool FindItem(const wxString& item, wxString* trueItem) wxOVERRIDE; - - // Item management - void SetSelection( int item ); - void Insert( const wxString& item, int pos ); - int Append(const wxString& item); - void Clear(); - void Delete( unsigned int item ); - void SetItemClientData(unsigned int n, void* clientData, wxClientDataType clientDataItemsType); - void *GetItemClientData(unsigned int n) const; - void SetString( int item, const wxString& str ); - wxString GetString( int item ) const; - unsigned int GetCount() const; - int FindString(const wxString& s, bool bCase = false) const; - int GetSelection() const; - - //void Populate( int n, const wxString choices[] ); - void Populate( const wxArrayString& choices ); - void ClearClientDatas(); - - // helpers - int GetItemAtPosition( const wxPoint& pos ) { return HitTest(pos); } - wxCoord GetTotalHeight() const { return EstimateTotalHeight(); } - wxCoord GetLineHeight(int line) const { return OnGetRowHeight(line); } - -protected: - - // Called by OnComboDoubleClick and OnCombo{Key,Char}Event - bool HandleKey( int keycode, bool saturate, wxChar keychar = 0 ); - - // sends combobox select event from the parent combo control - void SendComboBoxEvent( int selection ); - - // gets value, sends event and dismisses - void DismissWithEvent(); - - // OnMeasureItemWidth will be called on next GetAdjustedSize. - void ItemWidthChanged(unsigned int item) - { - m_widths[item] = -1; - m_widthsDirty = true; - } - - // Callbacks for drawing and measuring items. Override in a derived class for - // owner-drawnness. Font, background and text colour have been prepared according - // to selection, focus and such. - // - // item: item index to be drawn, may be wxNOT_FOUND when painting combo control itself - // and there is no valid selection - // flags: wxODCB_PAINTING_CONTROL is set if painting to combo control instead of list - // - // NOTE: If wxVListBoxComboPopup is used with a wxComboCtrl class not derived from - // wxOwnerDrawnComboBox, this method must be overridden. - virtual void OnDrawItem( wxDC& dc, const wxRect& rect, int item, int flags) const; - - // This is same as in wxVListBox - virtual wxCoord OnMeasureItem( size_t item ) const wxOVERRIDE; - - // Return item width, or -1 for calculating from text extent (default) - virtual wxCoord OnMeasureItemWidth( size_t item ) const; - - // Draw item and combo control background. Flags are same as with OnDrawItem. - // NB: Can't use name OnDrawBackground because of virtual function hiding warnings. - virtual void OnDrawBg(wxDC& dc, const wxRect& rect, int item, int flags) const; - - // Additional wxVListBox implementation (no need to override in derived classes) - virtual void OnDrawItem(wxDC& dc, const wxRect& rect, size_t n) const wxOVERRIDE; - void OnDrawBackground(wxDC& dc, const wxRect& rect, size_t n) const wxOVERRIDE; - - // filter mouse move events happening outside the list box - // move selection with cursor - void OnMouseMove(wxMouseEvent& event); - void OnKey(wxKeyEvent& event); - void OnChar(wxKeyEvent& event); - void OnLeftClick(wxMouseEvent& event); - - // Return the widest item width (recalculating it if necessary) - int GetWidestItemWidth() { CalcWidths(); return m_widestWidth; } - - // Return the index of the widest item (recalculating it if necessary) - int GetWidestItem() { CalcWidths(); return m_widestItem; } - - // Stop partial completion (when some other event occurs) - void StopPartialCompletion(); - - wxArrayString m_strings; - wxArrayPtrVoid m_clientDatas; - - wxFont m_useFont; - - //wxString m_stringValue; // displayed text (may be different than m_strings[m_value]) - int m_value; // selection - int m_itemHover; // on which item the cursor is - int m_itemHeight; // default item height (calculate from font size - // and used in the absence of callback) - wxClientDataType m_clientDataItemsType; - -private: - - // Cached item widths (in pixels). - wxArrayInt m_widths; - - // Width of currently widest item. - int m_widestWidth; - - // Index of currently widest item. - int m_widestItem; - - // Measure some items in next GetAdjustedSize? - bool m_widthsDirty; - - // Find widest item in next GetAdjustedSize? - bool m_findWidest; - - // has the mouse been released on this control? - bool m_clicked; - - // Recalculate widths if they are dirty - void CalcWidths(); - - // Partial completion string - wxString m_partialCompletionString; - - wxString m_stringValue; - -#if wxUSE_TIMER - // Partial completion timer - wxTimer m_partialCompletionTimer; -#endif // wxUSE_TIMER - - wxDECLARE_EVENT_TABLE(); -}; - - -// ---------------------------------------------------------------------------- -// wxOwnerDrawnComboBox: a generic wxComboBox that allows custom paint items -// in addition to many other types of customization already allowed by -// the wxComboCtrl. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxOwnerDrawnComboBox : - public wxWindowWithItems -{ - //friend class wxComboPopupWindow; - friend class wxVListBoxComboPopup; -public: - - // ctors and such - wxOwnerDrawnComboBox() { Init(); } - - wxOwnerDrawnComboBox(wxWindow *parent, - wxWindowID id, - const wxString& value, - const wxPoint& pos, - const wxSize& size, - int n, - const wxString choices[], - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxComboBoxNameStr) - { - Init(); - - (void)Create(parent, id, value, pos, size, n, - choices, style, validator, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxComboBoxNameStr); - - wxOwnerDrawnComboBox(wxWindow *parent, - wxWindowID id, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - const wxArrayString& choices = wxArrayString(), - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxComboBoxNameStr); - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& value, - const wxPoint& pos, - const wxSize& size, - int n, - const wxString choices[], - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxComboBoxNameStr); - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& value, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxComboBoxNameStr); - - virtual ~wxOwnerDrawnComboBox(); - - // Prevent app from using wxComboPopup - void SetPopupControl(wxVListBoxComboPopup* popup) - { - DoSetPopupControl(popup); - } - - // wxControlWithItems methods - virtual unsigned int GetCount() const wxOVERRIDE; - virtual wxString GetString(unsigned int n) const wxOVERRIDE; - virtual void SetString(unsigned int n, const wxString& s) wxOVERRIDE; - virtual int FindString(const wxString& s, bool bCase = false) const wxOVERRIDE; - virtual void Select(int n); - virtual int GetSelection() const wxOVERRIDE; - - // See wxComboBoxBase discussion of IsEmpty(). - bool IsListEmpty() const { return wxItemContainer::IsEmpty(); } - bool IsTextEmpty() const { return wxTextEntry::IsEmpty(); } - - // Override these just to maintain consistency with virtual methods - // between classes. - virtual void Clear() wxOVERRIDE; - virtual void GetSelection(long *from, long *to) const wxOVERRIDE; - - virtual void SetSelection(int n) wxOVERRIDE { Select(n); } - - - // Prevent a method from being hidden - virtual void SetSelection(long from, long to) wxOVERRIDE - { - wxComboCtrl::SetSelection(from,to); - } - - // Return the widest item width (recalculating it if necessary) - virtual int GetWidestItemWidth() { EnsurePopupControl(); return GetVListBoxComboPopup()->GetWidestItemWidth(); } - - // Return the index of the widest item (recalculating it if necessary) - virtual int GetWidestItem() { EnsurePopupControl(); return GetVListBoxComboPopup()->GetWidestItem(); } - - virtual bool IsSorted() const wxOVERRIDE { return HasFlag(wxCB_SORT); } - -protected: - virtual void DoClear() wxOVERRIDE; - virtual void DoDeleteOneItem(unsigned int n) wxOVERRIDE; - - // Callback for drawing. Font, background and text colour have been - // prepared according to selection, focus and such. - // item: item index to be drawn, may be wxNOT_FOUND when painting combo control itself - // and there is no valid selection - // flags: wxODCB_PAINTING_CONTROL is set if painting to combo control instead of list - virtual void OnDrawItem( wxDC& dc, const wxRect& rect, int item, int flags ) const; - - // Callback for item height, or -1 for default - virtual wxCoord OnMeasureItem( size_t item ) const; - - // Callback for item width, or -1 for default/undetermined - virtual wxCoord OnMeasureItemWidth( size_t item ) const; - - // override base implementation so we can return the size for the - // largest item - virtual wxSize DoGetBestSize() const wxOVERRIDE; - - // Callback for background drawing. Flags are same as with - // OnDrawItem. - virtual void OnDrawBackground( wxDC& dc, const wxRect& rect, int item, int flags ) const; - - // NULL popup can be used to indicate default interface - virtual void DoSetPopupControl(wxComboPopup* popup) wxOVERRIDE; - - // clears all allocated client datas - void ClearClientDatas(); - - wxVListBoxComboPopup* GetVListBoxComboPopup() const - { - return (wxVListBoxComboPopup*) m_popupInterface; - } - - virtual int DoInsertItems(const wxArrayStringsAdapter& items, - unsigned int pos, - void **clientData, wxClientDataType type) wxOVERRIDE; - virtual void DoSetItemClientData(unsigned int n, void* clientData) wxOVERRIDE; - virtual void* DoGetItemClientData(unsigned int n) const wxOVERRIDE; - - // temporary storage for the initial choices - //const wxString* m_baseChoices; - //int m_baseChoicesCount; - wxArrayString m_initChs; - -private: - void Init(); - - wxDECLARE_EVENT_TABLE(); - - wxDECLARE_DYNAMIC_CLASS(wxOwnerDrawnComboBox); -}; - - -#endif // wxUSE_ODCOMBOBOX - -#endif - // _WX_ODCOMBO_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/accel.h b/Externals/wxWidgets3/include/wx/osx/accel.h deleted file mode 100644 index 70ba837e3e..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/accel.h +++ /dev/null @@ -1,33 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/accel.h -// Purpose: wxAcceleratorTable class -// Author: Stefan Csomor -// Modified by: -// Created: 1998-01-01 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_ACCEL_H_ -#define _WX_ACCEL_H_ - -#include "wx/string.h" -#include "wx/event.h" - -class WXDLLIMPEXP_CORE wxAcceleratorTable: public wxObject -{ - wxDECLARE_DYNAMIC_CLASS(wxAcceleratorTable); -public: - wxAcceleratorTable(); - wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]); // Load from array - - virtual ~wxAcceleratorTable(); - - bool Ok() const { return IsOk(); } - bool IsOk() const; - - int GetCommand( wxKeyEvent &event ); -}; - -#endif - // _WX_ACCEL_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/activityindicator.h b/Externals/wxWidgets3/include/wx/osx/activityindicator.h deleted file mode 100644 index a6f78231a8..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/activityindicator.h +++ /dev/null @@ -1,59 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/activityindicator.h -// Purpose: Declaration of wxActivityIndicator for wxOSX (Cocoa only). -// Author: Vadim Zeitlin -// Created: 2015-03-08 -// Copyright: (c) 2015 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_OSX_ACTIVITYINDICATOR_H_ -#define _WX_OSX_ACTIVITYINDICATOR_H_ - -// ---------------------------------------------------------------------------- -// wxActivityIndicator: implementation using GtkSpinner. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxActivityIndicator : public wxActivityIndicatorBase -{ -public: - wxActivityIndicator() - { - Init(); - } - - explicit - wxActivityIndicator(wxWindow* parent, - wxWindowID winid = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxActivityIndicatorNameStr) - { - Init(); - - Create(parent, winid, pos, size, style, name); - } - - bool Create(wxWindow* parent, - wxWindowID winid = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxActivityIndicatorNameStr); - - virtual void Start() wxOVERRIDE; - virtual void Stop() wxOVERRIDE; - virtual bool IsRunning() const wxOVERRIDE; - -private: - // Common part of all ctors. - void Init() { m_isRunning = false; } - - bool m_isRunning; - - wxDECLARE_DYNAMIC_CLASS(wxActivityIndicator); - wxDECLARE_NO_COPY_CLASS(wxActivityIndicator); -}; - -#endif // _WX_OSX_ACTIVITYINDICATOR_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/anybutton.h b/Externals/wxWidgets3/include/wx/osx/anybutton.h deleted file mode 100644 index 31b579a440..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/anybutton.h +++ /dev/null @@ -1,58 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: anybutton.h -// Purpose: wxAnyButton class -// Author: Stefan Csomor -// Created: 1998-01-01 (extracted from button.h) -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_OSX_ANYBUTTON_H_ -#define _WX_OSX_ANYBUTTON_H_ - -// Any button -class WXDLLIMPEXP_CORE wxAnyButton : public wxAnyButtonBase -{ -public: - wxAnyButton() {} - - static wxSize GetDefaultSize(); - - virtual void SetLabel(const wxString& label) wxOVERRIDE; - -protected: - virtual wxSize DoGetBestSize() const wxOVERRIDE; - - void OnEnterWindow( wxMouseEvent& event); - void OnLeaveWindow( wxMouseEvent& event); - - virtual wxBitmap DoGetBitmap(State which) const wxOVERRIDE; - virtual void DoSetBitmap(const wxBitmap& bitmap, State which) wxOVERRIDE; - virtual void DoSetBitmapPosition(wxDirection dir) wxOVERRIDE; - - virtual void DoSetBitmapMargins(int x, int y) wxOVERRIDE - { - m_marginX = x; - m_marginY = y; - InvalidateBestSize(); - } - -#if wxUSE_MARKUP && wxOSX_USE_COCOA - virtual bool DoSetLabelMarkup(const wxString& markup) wxOVERRIDE; -#endif // wxUSE_MARKUP && wxOSX_USE_COCOA - - - // the margins around the bitmap - int m_marginX; - int m_marginY; - - // the bitmaps for the different state of the buttons, all of them may be - // invalid and the button only shows a bitmap at all if State_Normal bitmap - // is valid - wxBitmap m_bitmaps[State_Max]; - - wxDECLARE_NO_COPY_CLASS(wxAnyButton); - wxDECLARE_EVENT_TABLE(); -}; - -#endif // _WX_OSX_ANYBUTTON_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/app.h b/Externals/wxWidgets3/include/wx/osx/app.h deleted file mode 100644 index cbd13b41a6..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/app.h +++ /dev/null @@ -1,173 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/app.h -// Purpose: wxApp class -// Author: Stefan Csomor -// Modified by: -// Created: 1998-01-01 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_APP_H_ -#define _WX_APP_H_ - -#include "wx/defs.h" -#include "wx/object.h" -#include "wx/gdicmn.h" -#include "wx/event.h" - -class WXDLLIMPEXP_FWD_CORE wxFrame; -class WXDLLIMPEXP_FWD_CORE wxWindowMac; -class WXDLLIMPEXP_FWD_CORE wxApp ; -class WXDLLIMPEXP_FWD_CORE wxKeyEvent; -class WXDLLIMPEXP_FWD_BASE wxLog; -class WXDLLIMPEXP_FWD_CORE wxMacAutoreleasePool; - -// Force an exit from main loop -void WXDLLIMPEXP_CORE wxExit(); - -// Yield to other apps/messages -bool WXDLLIMPEXP_CORE wxYield(); - -// Represents the application. Derive OnInit and declare -// a new App object to start application -class WXDLLIMPEXP_CORE wxApp: public wxAppBase -{ - wxDECLARE_DYNAMIC_CLASS(wxApp); - - wxApp(); - virtual ~wxApp(); - - virtual void WakeUpIdle() wxOVERRIDE; - - virtual void SetPrintMode(int mode) wxOVERRIDE { m_printMode = mode; } - virtual int GetPrintMode() const { return m_printMode; } - - // calling OnInit with an auto-release pool ready ... - virtual bool CallOnInit() wxOVERRIDE; -#if wxUSE_GUI - // setting up all MacOS Specific Event-Handlers etc - virtual bool OnInitGui() wxOVERRIDE; -#endif // wxUSE_GUI - - virtual int OnRun() wxOVERRIDE; - - virtual bool ProcessIdle() wxOVERRIDE; - - // implementation only - void OnIdle(wxIdleEvent& event); - void OnEndSession(wxCloseEvent& event); - void OnQueryEndSession(wxCloseEvent& event); - -protected: - int m_printMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT - wxMacAutoreleasePool* m_macPool; - -public: - - static bool sm_isEmbedded; - // Implementation - virtual bool Initialize(int& argc, wxChar **argv) wxOVERRIDE; - virtual void CleanUp() wxOVERRIDE; - - // the installed application event handler - WXEVENTHANDLERREF MacGetEventHandler() { return m_macEventHandler ; } - WXEVENTHANDLERREF MacGetCurrentEventHandlerCallRef() { return m_macCurrentEventHandlerCallRef ; } - void MacSetCurrentEvent( WXEVENTREF event , WXEVENTHANDLERCALLREF handler ) - { m_macCurrentEvent = event ; m_macCurrentEventHandlerCallRef = handler ; } - - // adding a CFType object to be released only at the end of the current event cycle (increases the - // refcount of the object passed), needed in case we are in the middle of an event concering an object - // we want to delete and cannot do it immediately - // TODO change semantics to be in line with cocoa (make autrelease NOT increase the count) - void MacAddToAutorelease( void* cfrefobj ); - void MacReleaseAutoreleasePool(); - -public: - static wxWindow* s_captureWindow ; - static long s_lastModifiers ; - - int m_nCmdShow; - - // mac specifics -protected: -#if wxOSX_USE_COCOA - // override for support of custom app controllers - virtual WX_NSObject OSXCreateAppController(); -#endif - -private: - virtual bool DoInitGui(); - virtual void DoCleanUp(); - - WXEVENTHANDLERREF m_macEventHandler ; - WXEVENTHANDLERCALLREF m_macCurrentEventHandlerCallRef ; - WXEVENTREF m_macCurrentEvent ; - -public: - static long s_macAboutMenuItemId ; - static long s_macPreferencesMenuItemId ; - static long s_macExitMenuItemId ; - static wxString s_macHelpMenuTitleName ; - - WXEVENTREF MacGetCurrentEvent() { return m_macCurrentEvent ; } - - // For embedded use. By default does nothing. - virtual void MacHandleUnhandledEvent( WXEVENTREF ev ); - - bool MacSendKeyDownEvent( wxWindow* focus , long keyval , long modifiers , long when , wxChar uniChar ) ; - bool MacSendKeyUpEvent( wxWindow* focus , long keyval , long modifiers , long when , wxChar uniChar ) ; - bool MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers , long when , wxChar uniChar ) ; - void MacCreateKeyEvent( wxKeyEvent& event, wxWindow* focus , long keymessage , long modifiers , long when , wxChar uniChar ) ; - // in response of an openFiles message with Cocoa and an - // open-document apple event - virtual void MacOpenFiles(const wxArrayString &fileNames) ; - // called by MacOpenFiles for each file. - virtual void MacOpenFile(const wxString &fileName) ; - // in response of a get-url apple event - virtual void MacOpenURL(const wxString &url) ; - // in response of a print-document apple event - virtual void MacPrintFiles(const wxArrayString &fileNames) ; - // called by MacPrintFiles for each file - virtual void MacPrintFile(const wxString &fileName) ; - // in response of a open-application apple event - virtual void MacNewFile() ; - // in response of a reopen-application apple event - virtual void MacReopenApp() ; - - // override this to return false from a non-bundled console app in order to stay in background ... - virtual bool OSXIsGUIApplication() { return true; } - -#if wxOSX_USE_COCOA_OR_IPHONE - // immediately before the native event loop launches - virtual void OSXOnWillFinishLaunching(); - // immediately when the native event loop starts, no events have been served yet - virtual void OSXOnDidFinishLaunching(); - // OS asks to terminate app, return no to stay running - virtual bool OSXOnShouldTerminate(); - // before application terminates - virtual void OSXOnWillTerminate(); - -private: - bool m_onInitResult; - bool m_inited; - wxArrayString m_openFiles; - wxArrayString m_printFiles; - wxString m_getURL; - -public: - bool OSXInitWasCalled() { return m_inited; } - void OSXStoreOpenFiles(const wxArrayString &files ) { m_openFiles = files ; } - void OSXStorePrintFiles(const wxArrayString &files ) { m_printFiles = files ; } - void OSXStoreOpenURL(const wxString &url ) { m_getURL = url ; } -#endif - - // Hide the application windows the same as the system hide command would do it. - void MacHideApp(); - - wxDECLARE_EVENT_TABLE(); -}; - -#endif - // _WX_APP_H_ - diff --git a/Externals/wxWidgets3/include/wx/osx/appprogress.h b/Externals/wxWidgets3/include/wx/osx/appprogress.h deleted file mode 100644 index a64b2cc62f..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/appprogress.h +++ /dev/null @@ -1,36 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/appprogress.h -// Purpose: wxAppProgressIndicator OS X implementation -// Author: Tobias Taschner -// Created: 2014-10-22 -// Copyright: (c) 2014 wxWidgets development team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_OSX_APPPROG_H_ -#define _WX_OSX_APPPROG_H_ - -#include "wx/window.h" - -class WXDLLIMPEXP_CORE wxAppProgressIndicator - : public wxAppProgressIndicatorBase -{ -public: - wxAppProgressIndicator(wxWindow* parent = NULL, int maxValue = 100); - virtual ~wxAppProgressIndicator(); - - virtual bool IsAvailable() const wxOVERRIDE; - - virtual void SetValue(int value) wxOVERRIDE; - virtual void SetRange(int range) wxOVERRIDE; - virtual void Pulse() wxOVERRIDE; - virtual void Reset() wxOVERRIDE; - -private: - int m_maxValue; - void *m_dockIcon; - - wxDECLARE_NO_COPY_CLASS(wxAppProgressIndicator); -}; - -#endif // _WX_OSX_APPPROG_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/bitmap.h b/Externals/wxWidgets3/include/wx/osx/bitmap.h deleted file mode 100644 index 200d5a26fa..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/bitmap.h +++ /dev/null @@ -1,213 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/bitmap.h -// Purpose: wxBitmap class -// Author: Stefan Csomor -// Modified by: -// Created: 1998-01-01 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_BITMAP_H_ -#define _WX_BITMAP_H_ - -#include "wx/palette.h" - -// Bitmap -class WXDLLIMPEXP_FWD_CORE wxBitmap; -class wxBitmapRefData ; -class WXDLLIMPEXP_FWD_CORE wxBitmapHandler; -class WXDLLIMPEXP_FWD_CORE wxControl; -class WXDLLIMPEXP_FWD_CORE wxCursor; -class WXDLLIMPEXP_FWD_CORE wxDC; -class WXDLLIMPEXP_FWD_CORE wxIcon; -class WXDLLIMPEXP_FWD_CORE wxImage; -class WXDLLIMPEXP_FWD_CORE wxPixelDataBase; - -// A mask is a bitmap used for drawing bitmaps -// Internally it is stored as a 8 bit deep memory chunk, 0 = black means the source will be drawn -// 255 = white means the source will not be drawn, no other values will be present -// 8 bit is chosen only for performance reasons, note also that this is the inverse value range -// from alpha, where 0 = invisible , 255 = fully drawn - -class WXDLLIMPEXP_CORE wxMask: public wxObject -{ - wxDECLARE_DYNAMIC_CLASS(wxMask); - -public: - wxMask(); - - // Copy constructor - wxMask(const wxMask& mask); - - // Construct a mask from a bitmap and a colour indicating - // the transparent area - wxMask(const wxBitmap& bitmap, const wxColour& colour); - - // Construct a mask from a mono bitmap (black meaning show pixels, white meaning transparent) - wxMask(const wxBitmap& bitmap); - - // implementation helper only : construct a mask from a 32 bit memory buffer - wxMask(const wxMemoryBuffer& buf, int width , int height , int bytesPerRow ) ; - - virtual ~wxMask(); - - bool Create(const wxBitmap& bitmap, const wxColour& colour); - bool Create(const wxBitmap& bitmap); - bool Create(const wxMemoryBuffer& buf, int width , int height , int bytesPerRow ) ; - - wxBitmap GetBitmap() const; - - // Implementation below - - void Init() ; - - // a 8 bit depth mask - void* GetRawAccess() const; - int GetBytesPerRow() const { return m_bytesPerRow ; } - // renders/updates native representation when necessary - void RealizeNative() ; - - WXHBITMAP GetHBITMAP() const ; - - -private: - wxMemoryBuffer m_memBuf ; - int m_bytesPerRow ; - int m_width ; - int m_height ; - - WXHBITMAP m_maskBitmap ; - -}; - -class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase -{ - wxDECLARE_DYNAMIC_CLASS(wxBitmap); - - friend class WXDLLIMPEXP_FWD_CORE wxBitmapHandler; - -public: - wxBitmap() {} // Platform-specific - - // Initialize with raw data. - wxBitmap(const char bits[], int width, int height, int depth = 1); - - // Initialize with XPM data - wxBitmap(const char* const* bits); - - // Load a file or resource - wxBitmap(const wxString& name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE); - - // Constructor for generalised creation from data - wxBitmap(const void* data, wxBitmapType type, int width, int height, int depth = 1); - - // creates an bitmap from the native image format - wxBitmap(CGImageRef image, double scale = 1.0); - wxBitmap(WX_NSImage image); - wxBitmap(CGContextRef bitmapcontext); - - // Create a bitmap compatible with the given DC - wxBitmap(int width, int height, const wxDC& dc); - - // If depth is omitted, will create a bitmap compatible with the display - wxBitmap(int width, int height, int depth = -1) { (void)Create(width, height, depth); } - wxBitmap(const wxSize& sz, int depth = -1) { (void)Create(sz, depth); } - - // Convert from wxImage: - wxBitmap(const wxImage& image, int depth = -1, double scale = 1.0); - - // Convert from wxIcon - wxBitmap(const wxIcon& icon) { CopyFromIcon(icon); } - - virtual ~wxBitmap() {} - - wxImage ConvertToImage() const; - - // get the given part of bitmap - wxBitmap GetSubBitmap( const wxRect& rect ) const; - - virtual bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH); - virtual bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH) - { return Create(sz.GetWidth(), sz.GetHeight(), depth); } - - virtual bool Create(const void* data, wxBitmapType type, int width, int height, int depth = 1); - bool Create( CGImageRef image, double scale = 1.0 ); - bool Create( WX_NSImage image ); - bool Create( CGContextRef bitmapcontext); - - // Create a bitmap compatible with the given DC, inheriting its magnification factor - bool Create(int width, int height, const wxDC& dc); - - // Create a bitmap with a scale factor, width and height are multiplied with that factor - bool CreateScaled(int logwidth, int logheight, int depth, double logicalScale); - - // virtual bool Create( WXHICON icon) ; - virtual bool LoadFile(const wxString& name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE); - virtual bool SaveFile(const wxString& name, wxBitmapType type, const wxPalette *cmap = NULL) const; - - wxBitmapRefData *GetBitmapData() const - { return (wxBitmapRefData *)m_refData; } - - // copies the contents and mask of the given (colour) icon to the bitmap - virtual bool CopyFromIcon(const wxIcon& icon); - - int GetWidth() const; - int GetHeight() const; - int GetDepth() const; - void SetWidth(int w); - void SetHeight(int h); - void SetDepth(int d); - void SetOk(bool isOk); - -#if wxUSE_PALETTE - wxPalette* GetPalette() const; - void SetPalette(const wxPalette& palette); -#endif // wxUSE_PALETTE - - wxMask *GetMask() const; - void SetMask(wxMask *mask) ; - - static void InitStandardHandlers(); - - // raw bitmap access support functions, for internal use only - void *GetRawData(wxPixelDataBase& data, int bpp); - void UngetRawData(wxPixelDataBase& data); - - // these functions are internal and shouldn't be used, they risk to - // disappear in the future - bool HasAlpha() const; - void UseAlpha(); - - // returns the 'native' implementation, a GWorldPtr for the content and one for the mask - WXHBITMAP GetHBITMAP( WXHBITMAP * mask = NULL ) const; - - // returns a CGImageRef which must released after usage with CGImageRelease - CGImageRef CreateCGImage() const ; - -#if wxOSX_USE_COCOA - // returns an autoreleased version of the image - WX_NSImage GetNSImage() const; -#endif -#if wxOSX_USE_IPHONE - // returns an autoreleased version of the image - WX_UIImage GetUIImage() const; -#endif - // returns a IconRef which must be retained before and released after usage - IconRef GetIconRef() const; - // returns a IconRef which must be released after usage - IconRef CreateIconRef() const; - // get read only access to the underlying buffer - void *GetRawAccess() const ; - // brackets to the underlying OS structure for read/write access - // makes sure that no cached images will be constructed until terminated - void *BeginRawAccess() ; - void EndRawAccess() ; - - double GetScaleFactor() const; -protected: - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; -}; - -#endif // _WX_BITMAP_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/bmpbuttn.h b/Externals/wxWidgets3/include/wx/osx/bmpbuttn.h deleted file mode 100644 index 813a6dcb61..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/bmpbuttn.h +++ /dev/null @@ -1,48 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/bmpbuttn.h -// Purpose: wxBitmapButton class -// Author: Stefan Csomor -// Modified by: -// Created: 1998-01-01 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_OSX_BMPBUTTN_H_ -#define _WX_OSX_BMPBUTTN_H_ - -#include "wx/button.h" - -#define wxDEFAULT_BUTTON_MARGIN 4 - -class WXDLLIMPEXP_CORE wxBitmapButton : public wxBitmapButtonBase -{ -public: - wxBitmapButton() - { - SetMargins(wxDEFAULT_BUTTON_MARGIN, wxDEFAULT_BUTTON_MARGIN); - } - - wxBitmapButton(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr) - { - Create(parent, id, bitmap, pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr); - -protected: - - virtual wxSize DoGetBestSize() const; - - wxDECLARE_DYNAMIC_CLASS(wxBitmapButton); -}; - -#endif // _WX_OSX_BMPBUTTN_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/brush.h b/Externals/wxWidgets3/include/wx/osx/brush.h deleted file mode 100644 index 072cfa4d16..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/brush.h +++ /dev/null @@ -1,56 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/brush.h -// Purpose: wxBrush class -// Author: Stefan Csomor -// Modified by: -// Created: 1998-01-01 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_BRUSH_H_ -#define _WX_BRUSH_H_ - -#include "wx/gdicmn.h" -#include "wx/gdiobj.h" -#include "wx/bitmap.h" - -class WXDLLIMPEXP_FWD_CORE wxBrush; - -// Brush -class WXDLLIMPEXP_CORE wxBrush: public wxBrushBase -{ -public: - wxBrush(); - wxBrush(const wxColour& col, wxBrushStyle style = wxBRUSHSTYLE_SOLID); - wxBrush(const wxBitmap& stipple); - virtual ~wxBrush(); - - virtual void SetColour(const wxColour& col) ; - virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) ; - virtual void SetStyle(wxBrushStyle style) ; - virtual void SetStipple(const wxBitmap& stipple) ; - - bool operator==(const wxBrush& brush) const; - bool operator!=(const wxBrush& brush) const { return !(*this == brush); } - - wxColour GetColour() const; - wxBrushStyle GetStyle() const ; - wxBitmap *GetStipple() const ; - - - wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants") - wxBrush(const wxColour& col, int style); - - wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants") - void SetStyle(int style) { SetStyle((wxBrushStyle)style); } - -protected: - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; - -private: - wxDECLARE_DYNAMIC_CLASS(wxBrush); -}; - -#endif // _WX_BRUSH_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/button.h b/Externals/wxWidgets3/include/wx/osx/button.h deleted file mode 100644 index 5726b211b9..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/button.h +++ /dev/null @@ -1,59 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/button.h -// Purpose: wxButton class -// Author: Stefan Csomor -// Modified by: -// Created: 1998-01-01 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_OSX_BUTTON_H_ -#define _WX_OSX_BUTTON_H_ - -#include "wx/control.h" -#include "wx/gdicmn.h" - -// Pushbutton -class WXDLLIMPEXP_CORE wxButton : public wxButtonBase -{ -public: - wxButton() {} - wxButton(wxWindow *parent, - wxWindowID id, - const wxString& label = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr) - { - Create(parent, id, label, pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& label = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr); - - virtual void SetLabel(const wxString& label); - virtual wxWindow *SetDefault(); - virtual void Command(wxCommandEvent& event); - - // osx specific event handling common for all osx-ports - - virtual bool OSXHandleClicked( double timestampsec ); - -#if wxOSX_USE_COCOA - void OSXUpdateAfterLabelChange(const wxString& label); -#endif - -protected: - wxDECLARE_DYNAMIC_CLASS(wxButton); -}; - -#endif // _WX_OSX_BUTTON_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/carbon/private/overlay.h b/Externals/wxWidgets3/include/wx/osx/carbon/private/overlay.h deleted file mode 100644 index f5ebe1d83e..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/carbon/private/overlay.h +++ /dev/null @@ -1,57 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/carbon/private/overlay.h -// Purpose: wxOverlayImpl declaration -// Author: Stefan Csomor -// Modified by: -// Created: 2006-10-20 -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MAC_CARBON_PRIVATE_OVERLAY_H_ -#define _WX_MAC_CARBON_PRIVATE_OVERLAY_H_ - -#include "wx/osx/private.h" -#include "wx/toplevel.h" -#include "wx/graphics.h" - -class wxOverlayImpl -{ -public: - wxOverlayImpl() ; - ~wxOverlayImpl() ; - - - // clears the overlay without restoring the former state - // to be done eg when the window content has been changed and repainted - void Reset(); - - // returns true if it has been setup - bool IsOk(); - - void Init( wxDC* dc, int x , int y , int width , int height ); - - void BeginDrawing( wxDC* dc); - - void EndDrawing( wxDC* dc); - - void Clear( wxDC* dc); - -private: - OSStatus CreateOverlayWindow(); - - void MacGetBounds( Rect *bounds ); - - WindowRef m_overlayWindow; - WindowRef m_overlayParentWindow; - CGContextRef m_overlayContext ; - // we store the window in case we would have to issue a Refresh() - wxWindow* m_window ; - - int m_x ; - int m_y ; - int m_width ; - int m_height ; -} ; - -#endif // _WX_MAC_CARBON_PRIVATE_OVERLAY_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/carbon/private/print.h b/Externals/wxWidgets3/include/wx/osx/carbon/private/print.h deleted file mode 100644 index eeda2bef28..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/carbon/private/print.h +++ /dev/null @@ -1,81 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/carbon/private/print.h -// Purpose: private implementation for printing on OS X -// Author: Stefan Csomor -// Modified by: -// Created: 03/02/99 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MAC_PRIVATE_PRINT_H_ -#define _WX_MAC_PRIVATE_PRINT_H_ - -#include "wx/cmndata.h" -#include "wx/print.h" - -// for PrintingManager -#include "ApplicationServices/ApplicationServices.h" - -class WXDLLIMPEXP_CORE wxOSXPrintData : public wxPrintNativeDataBase -{ -public: - wxOSXPrintData(); - virtual ~wxOSXPrintData(); - - virtual bool TransferTo( wxPrintData &data ); - virtual bool TransferFrom( const wxPrintData &data ); - - virtual bool IsOk() const ; - - virtual void TransferFrom( const wxPageSetupDialogData * ); - virtual void TransferTo( wxPageSetupDialogData * ); - - virtual void TransferFrom( const wxPrintDialogData * ); - virtual void TransferTo( wxPrintDialogData * ); - - PMPrintSession GetPrintSession() { return m_macPrintSession; } - PMPageFormat GetPageFormat() { return m_macPageFormat; } - PMPrintSettings GetPrintSettings() { return m_macPrintSettings; } -protected : - virtual void TransferPrinterNameFrom( const wxPrintData &data ); - virtual void TransferPaperInfoFrom( const wxPrintData &data ); - virtual void TransferResolutionFrom( const wxPrintData &data ); - - virtual void TransferPrinterNameTo( wxPrintData &data ); - virtual void TransferPaperInfoTo( wxPrintData &data ); - virtual void TransferResolutionTo( wxPrintData &data ); - - - virtual void UpdateFromPMState(); - virtual void UpdateToPMState(); - - PMPrintSession m_macPrintSession ; - PMPageFormat m_macPageFormat ; - PMPrintSettings m_macPrintSettings ; - PMPaper m_macPaper; -private: - wxDECLARE_DYNAMIC_CLASS(wxOSXPrintData); -} ; - -WXDLLIMPEXP_CORE wxPrintNativeDataBase* wxOSXCreatePrintData(); - -#if wxOSX_USE_COCOA -class WXDLLIMPEXP_CORE wxOSXCocoaPrintData : public wxOSXPrintData -{ -public: - wxOSXCocoaPrintData(); - virtual ~wxOSXCocoaPrintData(); - - WX_NSPrintInfo GetNSPrintInfo() { return m_macPrintInfo; } -protected: - virtual void UpdateFromPMState(); - virtual void UpdateToPMState(); - - WX_NSPrintInfo m_macPrintInfo; -private: - wxDECLARE_DYNAMIC_CLASS(wxOSXCocoaPrintData); -} ; -#endif - -#endif // _WX_MAC_PRIVATE_PRINT_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/carbon/region.h b/Externals/wxWidgets3/include/wx/osx/carbon/region.h deleted file mode 100644 index 1aa40e46e2..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/carbon/region.h +++ /dev/null @@ -1,102 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/carbon/region.h -// Purpose: wxRegion class -// Author: Stefan Csomor -// Modified by: -// Created: 1998-01-01 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MAC_CARBON_REGION_H_ -#define _WX_MAC_CARBON_REGION_H_ - -#include "wx/list.h" - -class WXDLLIMPEXP_CORE wxRegion : public wxRegionWithCombine -{ -public: - wxRegion() { } - wxRegion(long x, long y, long w, long h); - wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight); - wxRegion(const wxRect& rect); - wxRegion( WXHRGN hRegion ); - wxRegion(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle = wxODDEVEN_RULE ); -#if wxUSE_IMAGE - wxRegion(const wxBitmap& bmp) - { - Union(bmp); - } - wxRegion(const wxBitmap& bmp, - const wxColour& transColour, int tolerance = 0) - { - Union(bmp, transColour, tolerance); - } -#endif - - virtual ~wxRegion(); - - // wxRegionBase methods - virtual void Clear(); - virtual bool IsEmpty() const; - - // Internal - WXHRGN GetWXHRGN() const ; - -protected: - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; - - virtual bool DoIsEqual(const wxRegion& region) const; - virtual bool DoGetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const; - virtual wxRegionContain DoContainsPoint(wxCoord x, wxCoord y) const; - virtual wxRegionContain DoContainsRect(const wxRect& rect) const; - - virtual bool DoOffset(wxCoord x, wxCoord y); - virtual bool DoCombine(const wxRegion& region, wxRegionOp op); - virtual bool DoUnionWithRect(const wxRect& rect); - -private: - wxDECLARE_DYNAMIC_CLASS(wxRegion); - friend class WXDLLIMPEXP_FWD_CORE wxRegionIterator; -}; - -class WXDLLIMPEXP_CORE wxRegionIterator : public wxObject -{ -public: - wxRegionIterator(); - wxRegionIterator(const wxRegion& region); - wxRegionIterator(const wxRegionIterator& iterator); - virtual ~wxRegionIterator(); - - wxRegionIterator& operator=(const wxRegionIterator& iterator); - - void Reset() { m_current = 0; } - void Reset(const wxRegion& region); - - operator bool () const { return m_current < m_numRects; } - bool HaveRects() const { return m_current < m_numRects; } - - wxRegionIterator& operator++(); - wxRegionIterator operator++(int); - - long GetX() const; - long GetY() const; - long GetW() const; - long GetWidth() const { return GetW(); } - long GetH() const; - long GetHeight() const { return GetH(); } - wxRect GetRect() const { return wxRect((int)GetX(), (int)GetY(), (int)GetWidth(), (int)GetHeight()); } - -private: - void SetRects(long numRects, wxRect *rects); - - long m_current; - long m_numRects; - wxRegion m_region; - wxRect* m_rects; - - wxDECLARE_DYNAMIC_CLASS(wxRegionIterator); -}; - -#endif // _WX_MAC_CARBON_REGION_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/checkbox.h b/Externals/wxWidgets3/include/wx/osx/checkbox.h deleted file mode 100644 index c81865fbce..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/checkbox.h +++ /dev/null @@ -1,82 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/checkbox.h -// Purpose: wxCheckBox class -// Author: Stefan Csomor -// Modified by: -// Created: 1998-01-01 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_CHECKBOX_H_ -#define _WX_CHECKBOX_H_ - -// Checkbox item (single checkbox) -class WXDLLIMPEXP_CORE wxCheckBox : public wxCheckBoxBase -{ -public: - wxCheckBox() { } - wxCheckBox(wxWindow *parent, wxWindowID id, const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxCheckBoxNameStr) - { - Create(parent, id, label, pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, wxWindowID id, const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxCheckBoxNameStr); - virtual void SetValue(bool); - virtual bool GetValue() const; - - virtual void Command(wxCommandEvent& event); - - // osx specific event handling common for all osx-ports - - virtual bool OSXHandleClicked( double timestampsec ); -protected: - void DoSet3StateValue(wxCheckBoxState val); - virtual wxCheckBoxState DoGet3StateValue() const; - - wxDECLARE_DYNAMIC_CLASS(wxCheckBox); -}; - -class WXDLLIMPEXP_FWD_CORE wxBitmap; -class WXDLLIMPEXP_CORE wxBitmapCheckBox: public wxCheckBox -{ -public: - int checkWidth; - int checkHeight; - - wxBitmapCheckBox() - : checkWidth(-1), checkHeight(-1) - { } - - wxBitmapCheckBox(wxWindow *parent, wxWindowID id, const wxBitmap *label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxCheckBoxNameStr) - { - Create(parent, id, label, pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, wxWindowID id, const wxBitmap *bitmap, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxCheckBoxNameStr); - virtual void SetValue(bool); - virtual bool GetValue() const; - virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO); - virtual void SetLabel(const wxBitmap *bitmap); - virtual void SetLabel( const wxString & WXUNUSED(name) ) {} - - wxDECLARE_DYNAMIC_CLASS(wxBitmapCheckBox); -}; -#endif - // _WX_CHECKBOX_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/checklst.h b/Externals/wxWidgets3/include/wx/osx/checklst.h deleted file mode 100644 index 3039639a54..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/checklst.h +++ /dev/null @@ -1,93 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/checklst.h -// Purpose: wxCheckListBox class - a listbox with checkable items -// Note: this is an optional class. -// Author: Stefan Csomor -// Modified by: -// Created: 1998-01-01 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MAC_CHECKLST_H_ -#define _WX_MAC_CHECKLST_H_ - -class WXDLLIMPEXP_CORE wxCheckListBox : public wxCheckListBoxBase -{ -public: - // ctors - wxCheckListBox() { Init(); } - wxCheckListBox(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int nStrings = 0, - const wxString *choices = NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxListBoxNameStr) - { - Init(); - - Create(parent, id, pos, size, nStrings, choices, style, validator, name); - } - wxCheckListBox(wxWindow *parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxListBoxNameStr) - { - Init(); - - Create(parent, id, pos, size, choices, style, validator, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int nStrings = 0, - const wxString *choices = NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxListBoxNameStr); - bool Create(wxWindow *parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxListBoxNameStr); - - // items may be checked - bool IsChecked(unsigned int uiIndex) const wxOVERRIDE; - void Check(unsigned int uiIndex, bool bCheck = true) wxOVERRIDE; - - // data callbacks - virtual void GetValueCallback( unsigned int n, wxListWidgetColumn* col , wxListWidgetCellValue& value ) wxOVERRIDE; - virtual void SetValueCallback( unsigned int n, wxListWidgetColumn* col , wxListWidgetCellValue& value ) wxOVERRIDE; - -protected: - // override all methods which add/delete items to update m_checks array as - // well - virtual void OnItemInserted(unsigned int pos) wxOVERRIDE; - virtual void DoDeleteOneItem(unsigned int n) wxOVERRIDE; - virtual void DoClear() wxOVERRIDE; - - // the array containing the checked status of the items - wxArrayInt m_checks; - - wxListWidgetColumn* m_checkColumn ; - - void Init(); - -private: - wxDECLARE_EVENT_TABLE(); - wxDECLARE_DYNAMIC_CLASS(wxCheckListBox); -}; - -#endif // _WX_MAC_CHECKLST_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/chkconf.h b/Externals/wxWidgets3/include/wx/osx/chkconf.h deleted file mode 100644 index 113f8052c2..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/chkconf.h +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Name: wx/osx/chkconf.h - * Purpose: Mac-specific config settings checks - * Author: Vadim Zeitlin - * Modified by: - * Created: 2005-04-05 (extracted from wx/chkconf.h) - * Copyright: (c) 2005 Vadim Zeitlin - * Licence: wxWindows licence - */ - -/* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */ - -#ifndef _WX_OSX_CHKCONF_H_ -#define _WX_OSX_CHKCONF_H_ - -/* - * check graphics context option, must be on for every os x platform - * we only use core graphics now on all builds, try to catch attempts - * to configure the build otherwise and give error messages - */ - -#if wxUSE_GUI && (!wxUSE_GRAPHICS_CONTEXT || \ - ( defined( wxMAC_USE_CORE_GRAPHICS ) && !wxMAC_USE_CORE_GRAPHICS )) -# error "OS X builds use CoreGraphics in this wx version, you cannot turn back to QuickDraw completely" -#endif - -/* - * using mixins of cocoa functionality - */ - -#ifdef __WXOSX_COCOA__ - #define wxOSX_USE_COCOA 1 -#else - #define wxOSX_USE_COCOA 0 -#endif - -#ifdef __WXOSX_CARBON__ - #define wxOSX_USE_CARBON 1 -#else - #define wxOSX_USE_CARBON 0 -#endif - -#ifdef __WXOSX_IPHONE__ - #define wxOSX_USE_IPHONE 1 -#else - #define wxOSX_USE_IPHONE 0 -#endif - -/* - * setting flags according to the platform - */ - -#ifdef __LP64__ - #if wxOSX_USE_CARBON - #error "Carbon does not support 64bit" - #endif -#endif - -/* - * combination flags - */ - -#if wxOSX_USE_COCOA || wxOSX_USE_CARBON - #define wxOSX_USE_COCOA_OR_CARBON 1 -#else - #define wxOSX_USE_COCOA_OR_CARBON 0 -#endif - -#if wxOSX_USE_COCOA || wxOSX_USE_IPHONE - #define wxOSX_USE_COCOA_OR_IPHONE 1 -#else - #define wxOSX_USE_COCOA_OR_IPHONE 0 -#endif - -#if wxOSX_USE_IPHONE - #include "wx/osx/iphone/chkconf.h" -#elif wxOSX_USE_COCOA - #include "wx/osx/cocoa/chkconf.h" -#endif - -#endif /* _WX_OSX_CHKCONF_H_ */ diff --git a/Externals/wxWidgets3/include/wx/osx/choice.h b/Externals/wxWidgets3/include/wx/osx/choice.h deleted file mode 100644 index e261782ef6..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/choice.h +++ /dev/null @@ -1,102 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/choice.h -// Purpose: wxChoice class -// Author: Stefan Csomor -// Modified by: -// Created: 1998-01-01 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_CHOICE_H_ -#define _WX_CHOICE_H_ - -#include "wx/control.h" - -#include "wx/dynarray.h" -#include "wx/arrstr.h" - -WX_DEFINE_ARRAY( char * , wxChoiceDataArray ) ; - -// Choice item -class WXDLLIMPEXP_CORE wxChoice: public wxChoiceBase -{ - wxDECLARE_DYNAMIC_CLASS(wxChoice); - -public: - wxChoice() - : m_strings(), m_datas() - {} - - virtual ~wxChoice() ; - - wxChoice(wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxChoiceNameStr) - { - Create(parent, id, pos, size, n, choices, style, validator, name); - } - wxChoice(wxWindow *parent, wxWindowID id, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxChoiceNameStr) - { - Create(parent, id, pos, size, choices, style, validator, name); - } - - bool Create(wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxChoiceNameStr); - bool Create(wxWindow *parent, wxWindowID id, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxChoiceNameStr); - - virtual unsigned int GetCount() const ; - virtual int GetSelection() const ; - virtual void SetSelection(int n); - - virtual int FindString(const wxString& s, bool bCase = false) const; - virtual wxString GetString(unsigned int n) const ; - virtual void SetString(unsigned int pos, const wxString& s); - // osx specific event handling common for all osx-ports - - virtual bool OSXHandleClicked( double timestampsec ); - -protected: - virtual void DoDeleteOneItem(unsigned int n); - virtual void DoClear(); - - virtual wxSize DoGetBestSize() const ; - virtual int DoInsertItems(const wxArrayStringsAdapter& items, - unsigned int pos, - void **clientData, wxClientDataType type); - - virtual void DoSetItemClientData(unsigned int n, void* clientData); - virtual void* DoGetItemClientData(unsigned int n) const; - - wxArrayString m_strings; - wxChoiceDataArray m_datas ; - wxMenu* m_popUpMenu ; - -private: - // This should be called when the number of items in the control changes. - void DoAfterItemCountChange(); -}; - -#endif - // _WX_CHOICE_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/clipbrd.h b/Externals/wxWidgets3/include/wx/osx/clipbrd.h deleted file mode 100644 index 2c45068e24..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/clipbrd.h +++ /dev/null @@ -1,67 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/clipbrd.h -// Purpose: Clipboard functionality. -// Author: Stefan Csomor -// Modified by: -// Created: 1998-01-01 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_CLIPBRD_H_ -#define _WX_CLIPBRD_H_ - -#if wxUSE_CLIPBOARD - -#include "wx/osx/core/cfref.h" - -//----------------------------------------------------------------------------- -// wxClipboard -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxClipboard : public wxClipboardBase -{ -public: - wxClipboard(); - virtual ~wxClipboard(); - - // open the clipboard before SetData() and GetData() - virtual bool Open(); - - // close the clipboard after SetData() and GetData() - virtual void Close(); - - // query whether the clipboard is opened - virtual bool IsOpened() const; - - // set the clipboard data. all other formats will be deleted. - virtual bool SetData( wxDataObject *data ); - - // add to the clipboard data. - virtual bool AddData( wxDataObject *data ); - - // ask if data in correct format is available - virtual bool IsSupported( const wxDataFormat& format ); - - // fill data with data on the clipboard (if available) - virtual bool GetData( wxDataObject& data ); - - // clears wxTheClipboard and the system's clipboard if possible - virtual void Clear(); - - // flushes the clipboard: this means that the data which is currently on - // clipboard will stay available even after the application exits (possibly - // eating memory), otherwise the clipboard will be emptied on exit - virtual bool Flush(); - -private: - wxDataObject *m_data; - bool m_open; - wxCFRef m_pasteboard; - - wxDECLARE_DYNAMIC_CLASS(wxClipboard); -}; - -#endif // wxUSE_CLIPBOARD - -#endif // _WX_CLIPBRD_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/cocoa/chkconf.h b/Externals/wxWidgets3/include/wx/osx/cocoa/chkconf.h deleted file mode 100644 index 8d8818e5d0..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/cocoa/chkconf.h +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Name: wx/osx/cocoa/chkconf.h - * Purpose: Compiler-specific configuration checking - * Author: Stefan Csomor - * Modified by: - * Created: 2008-07-30 - * Copyright: (c) Stefan Csomor - * Licence: wxWindows licence - */ - -#ifndef _WX_OSX_COCOA_CHKCONF_H_ -#define _WX_OSX_COCOA_CHKCONF_H_ - -/* Many wchar functions (and also strnlen(), for some reason) are only - available since 10.7 so don't use them if we want to build the applications - that would run under 10.6 and earlier. */ -#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_7 -#define HAVE_STRNLEN 1 -#define HAVE_WCSDUP 1 -#define HAVE_WCSNLEN 1 -#define HAVE_WCSCASECMP 1 -#define HAVE_WCSNCASECMP 1 -#endif - -/* - * native (1) or emulated (0) toolbar - */ - -#ifndef wxOSX_USE_NATIVE_TOOLBAR - #define wxOSX_USE_NATIVE_TOOLBAR 1 -#endif - -/* - * leave is isFlipped and don't override - */ -#ifndef wxOSX_USE_NATIVE_FLIPPED - #define wxOSX_USE_NATIVE_FLIPPED 1 -#endif - -/* - * text rendering system - */ - -#define wxOSX_USE_ATSU_TEXT 0 - -/* - * Audio System - */ - -#define wxOSX_USE_QUICKTIME 0 -#define wxOSX_USE_AUDIOTOOLBOX 0 - -/* - Use the more efficient FSEvents API instead of kqueue - events for file system watcher, but only on OS X >= 10.7 since - that version introduced a flag that allows watching files as - well as sub directories. - */ -#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_7 - #define wxHAVE_FSEVENTS_FILE_NOTIFICATIONS 1 -#endif - -/* - * turning off capabilities that don't work under cocoa yet - */ - -#endif - /* _WX_MAC_CHKCONF_H_ */ - diff --git a/Externals/wxWidgets3/include/wx/osx/cocoa/dataview.h b/Externals/wxWidgets3/include/wx/osx/cocoa/dataview.h deleted file mode 100644 index 65fc99c2b3..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/cocoa/dataview.h +++ /dev/null @@ -1,516 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/cocoa/dataview.h -// Purpose: wxDataViewCtrl native implementation header for carbon -// Author: -// Copyright: (c) 2009 -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DATAVIEWCTRL_COCOOA_H_ -#define _WX_DATAVIEWCTRL_COCOOA_H_ - -#include "wx/defs.h" - -#import - -#include "wx/osx/core/dataview.h" -#include "wx/osx/private.h" - -// Forward declaration -class wxCocoaDataViewControl; - -/* - Dramatis personae: - - [vertical arrows indicate inheritance, horizontal -- aggregation] - - - wxWindow ---> wxWidgetCocoaImpl wxDataViewWidgetImpl NSOutlineView - | \ / | - | \ / | - | \ / | - v \/ \/ v - wxDataViewCtrl -------> wxCocoaDataViewControl <-------> wxCocoaOutlineView - - - The right most classes are Objective-C only and can't be used from (pure) - C++ code. - */ - -// ============================================================================ -// wxPointerObject: simply stores a pointer, without taking its ownership -// ============================================================================ - -// Two pointer objects are equal if the containing pointers are equal. This -// means also that the hash value of a pointer object depends only on the -// stored pointer. - -@interface wxPointerObject : NSObject -{ - void* pointer; -} - - -(id) initWithPointer:(void*)initPointer; - - -(void*) pointer; - -(void) setPointer:(void*)newPointer; -@end - -// ============================================================================ -// wxSortDescriptorObject: helper class to use native sorting facilities -// ============================================================================ - -@interface wxSortDescriptorObject : NSSortDescriptor -{ - wxDataViewColumn* columnPtr; // pointer to the sorting column - - wxDataViewModel* modelPtr; // pointer to model -} - - -(id) - initWithModelPtr:(wxDataViewModel*)initModelPtr - sortingColumnPtr:(wxDataViewColumn*)initColumnPtr - ascending:(BOOL)sortAscending; - - -(wxDataViewColumn*) columnPtr; - -(wxDataViewModel*) modelPtr; - - -(void) setColumnPtr:(wxDataViewColumn*)newColumnPtr; - -(void) setModelPtr:(wxDataViewModel*)newModelPtr; -@end - -// ============================================================================ -// wxDataViewColumnNativeData: extra data for wxDataViewColumn -// ============================================================================ - -class wxDataViewColumnNativeData -{ -public: - wxDataViewColumnNativeData() : m_NativeColumnPtr(NULL) - { - } - - wxDataViewColumnNativeData(NSTableColumn* initNativeColumnPtr) - : m_NativeColumnPtr(initNativeColumnPtr) - { - } - - NSTableColumn* GetNativeColumnPtr() const - { - return m_NativeColumnPtr; - } - - void SetNativeColumnPtr(NSTableColumn* newNativeColumnPtr) - { - m_NativeColumnPtr = newNativeColumnPtr; - } - -private: - // not owned by us - NSTableColumn* m_NativeColumnPtr; -}; - -// ============================================================================ -// wxDataViewRendererNativeData: extra data for wxDataViewRenderer -// ============================================================================ - -class wxDataViewRendererNativeData -{ -public: - wxDataViewRendererNativeData() - : m_Object(NULL), m_ColumnCell(NULL) - { - Init(); - } - - wxDataViewRendererNativeData(NSCell* initColumnCell) - : m_Object(NULL), m_ColumnCell([initColumnCell retain]) - { - Init(); - } - - wxDataViewRendererNativeData(NSCell* initColumnCell, id initObject) - : m_Object([initObject retain]), m_ColumnCell([initColumnCell retain]) - { - Init(); - } - - ~wxDataViewRendererNativeData() - { - [m_ColumnCell release]; - [m_Object release]; - - [m_origFont release]; - [m_origTextColour release]; - } - - NSCell* GetColumnCell() const { return m_ColumnCell; } - NSTableColumn* GetColumnPtr() const { return m_TableColumnPtr; } - id GetItem() const { return m_Item; } - NSCell* GetItemCell() const { return m_ItemCell; } - id GetObject() const { return m_Object; } - - void SetColumnCell(NSCell* newCell) - { - [newCell retain]; - [m_ColumnCell release]; - m_ColumnCell = newCell; - } - void SetColumnPtr(NSTableColumn* newColumnPtr) - { - m_TableColumnPtr = newColumnPtr; - } - void SetItem(id newItem) - { - m_Item = newItem; - } - void SetItemCell(NSCell* newCell) - { - m_ItemCell = newCell; - } - void SetObject(id newObject) - { - [newObject retain]; - [m_Object release]; - m_Object = newObject; - } - - // The original cell font and text colour stored here are NULL by default - // and are only initialized to the values retrieved from the cell when we - // change them from wxCocoaOutlineView:willDisplayCell:forTableColumn:item: - // which calls our SaveOriginalXXX() methods before changing the cell - // attributes. - // - // This allows us to avoid doing anything for the columns without any - // attributes but still be able to restore the correct attributes for the - // ones that do. - NSFont *GetOriginalFont() const { return m_origFont; } - NSColor *GetOriginalTextColour() const { return m_origTextColour; } - - void SaveOriginalFont(NSFont *font) - { - m_origFont = [font retain]; - } - - void SaveOriginalTextColour(NSColor *textColour) - { - m_origTextColour = [textColour retain]; - } - - // The ellipsization mode which we need to set for each cell being rendered. - void SetEllipsizeMode(wxEllipsizeMode mode) { m_ellipsizeMode = mode; } - wxEllipsizeMode GetEllipsizeMode() const { return m_ellipsizeMode; } - - // Set the line break mode for the given cell using our m_ellipsizeMode - void ApplyLineBreakMode(NSCell *cell); - -private: - // common part of all ctors - void Init(); - - id m_Item; // item NOT owned by renderer - - // object that can be used by renderer for storing special data (owned by - // renderer) - id m_Object; - - NSCell* m_ColumnCell; // column's cell is owned by renderer - NSCell* m_ItemCell; // item's cell is NOT owned by renderer - - NSTableColumn* m_TableColumnPtr; // column NOT owned by renderer - - // we own those if they're non-NULL - NSFont *m_origFont; - NSColor *m_origTextColour; - - wxEllipsizeMode m_ellipsizeMode; -}; - -// ============================================================================ -// wxCocoaOutlineDataSource -// ============================================================================ - -// This class implements the data source delegate for the outline view. -// As only an informal protocol exists this class inherits from NSObject only. -// -// As mentioned in the documentation for NSOutlineView the native control does -// not own any data. Therefore, it has to be done by the data source. -// Unfortunately, wxWidget's data source is a C++ data source but -// NSOutlineDataSource requires objects as data. Therefore, the data (or better -// the native item objects) have to be stored additionally in the native data -// source. -// NSOutlineView requires quick access to the item objects and quick linear -// access to an item's children. This requires normally a hash type of storage -// for the item object itself and an array structure for each item's children. -// This means that basically two times the whole structure of wxWidget's model -// class has to be stored. -// This implementation is using a compromise: all items that are in use by the -// control are stored in a set (from there they can be easily retrieved) and -// owned by the set. Furthermore, children of the last parent are stored -// in a linear list. -// -@interface wxCocoaOutlineDataSource : NSObject -{ - // descriptors specifying the sorting (currently the array only holds one - // object only) - NSArray* sortDescriptors; - - NSMutableArray* children; // buffered children - - NSMutableSet* items; // stores all items that are in use by the control - - wxCocoaDataViewControl* implementation; - - wxDataViewModel* model; - - // parent of the buffered children; the object is owned - wxPointerObject* currentParentItem; -} - - // methods of informal protocol: - -(BOOL) - outlineView:(NSOutlineView*)outlineView - acceptDrop:(id)info - item:(id)item - childIndex:(NSInteger)index; - - -(id) - outlineView:(NSOutlineView*)outlineView - child:(NSInteger)index - ofItem:(id)item; - - -(id) - outlineView:(NSOutlineView*)outlineView - objectValueForTableColumn:(NSTableColumn*)tableColumn - byItem:(id)item; - - -(BOOL) - outlineView:(NSOutlineView*)outlineView - isItemExpandable:(id)item; - - -(NSInteger) - outlineView:(NSOutlineView*)outlineView - numberOfChildrenOfItem:(id)item; - - -(NSDragOperation) - outlineView:(NSOutlineView*)outlineView - validateDrop:(id)info - proposedItem:(id)item - proposedChildIndex:(NSInteger)index; - - -(BOOL) - outlineView:(NSOutlineView*)outlineView - writeItems:(NSArray*)items - toPasteboard:(NSPasteboard*)pasteboard; - - // buffer for items handling - -(void) addToBuffer:(wxPointerObject*)item; - -(void) clearBuffer; - // returns the item in the buffer that has got the same pointer as "item", - // if such an item does not exist nil is returned - -(wxPointerObject*) getDataViewItemFromBuffer:(const wxDataViewItem&)item; - -(wxPointerObject*) getItemFromBuffer:(wxPointerObject*)item; - -(BOOL) isInBuffer:(wxPointerObject*)item; - -(void) removeFromBuffer:(wxPointerObject*)item; - - // buffered children handling - -(void) clearChildren; - -(wxPointerObject*) getChild:(NSUInteger)index; - -(NSUInteger) getChildCount; - - // buffer handling - -(void) clearBuffers; - - // sorting - -(NSArray*) sortDescriptors; - -(void) setSortDescriptors:(NSArray*)newSortDescriptors; - - // access to wxWidgets variables - -(wxPointerObject*) currentParentItem; - -(wxCocoaDataViewControl*) implementation; - -(wxDataViewModel*) model; - -(void) setCurrentParentItem:(wxPointerObject*)newCurrentParentItem; - -(void) setImplementation:(wxCocoaDataViewControl*)newImplementation; - -(void) setModel:(wxDataViewModel*)newModel; - - // other methods - -(void) - bufferItem:(wxPointerObject*)parentItem - withChildren:(wxDataViewItemArray*)dataViewChildrenPtr; -@end - -// ============================================================================ -// wxCustomCell: used for custom renderers -// ============================================================================ - -@interface wxCustomCell : NSTextFieldCell -{ -} - - -(NSSize) cellSize; -@end - -// ============================================================================ -// wxImageTextCell -// ============================================================================ -// -// As the native cocoa environment does not have a cell displaying an icon/ -// image and text at the same time, it has to be implemented by the user. -// This implementation follows the implementation of Chuck Pisula in Apple's -// DragNDropOutline sample application. -// Although in wxDataViewCtrl icons are used on OSX icons do not exist for -// display. Therefore, the cell is also called wxImageTextCell. -// Instead of displaying images of any size (which is possible) this cell uses -// a fixed size for displaying the image. Larger images are scaled to fit -// into their reserved space. Smaller or not existing images use the fixed -// reserved size and are scaled if necessary. -// -@interface wxImageTextCell : NSTextFieldCell -{ -@private - CGFloat xImageShift; // shift for the image in x-direction from border - CGFloat spaceImageText; // space between image and text - - NSImage* image; // the image itself - - NSSize imageSize; // largest size of the image; default size is (16, 16) - - // the text alignment is used to align the whole cell (image and text) - NSTextAlignment cellAlignment; -} - - -(NSTextAlignment) alignment; - -(void) setAlignment:(NSTextAlignment)newAlignment; - - -(NSImage*) image; - -(void) setImage:(NSImage*)newImage; - - -(NSSize) imageSize; - -(void) setImageSize:(NSSize) newImageSize; - - -(NSSize) cellSize; -@end - -// ============================================================================ -// wxCocoaOutlineView -// ============================================================================ - -@interface wxCocoaOutlineView : NSOutlineView -{ -@private - // column and row of the cell being edited or -1 if none - int currentlyEditedColumn, - currentlyEditedRow; - - wxCocoaDataViewControl* implementation; -} - - -(wxCocoaDataViewControl*) implementation; - -(void) setImplementation:(wxCocoaDataViewControl*) newImplementation; -@end - -// ============================================================================ -// wxCocoaDataViewControl -// ============================================================================ - -// This is the internal interface class between wxDataViewCtrl (wxWidget) and -// the native source view (Mac OS X cocoa). -class wxCocoaDataViewControl : public wxWidgetCocoaImpl, - public wxDataViewWidgetImpl -{ -public: - // constructors / destructor - wxCocoaDataViewControl(wxWindow* peer, - const wxPoint& pos, - const wxSize& size, - long style); - virtual ~wxCocoaDataViewControl(); - - wxDataViewCtrl* GetDataViewCtrl() const - { - return static_cast(GetWXPeer()); - } - - // column related methods (inherited from wxDataViewWidgetImpl) - virtual bool ClearColumns(); - virtual bool DeleteColumn(wxDataViewColumn* columnPtr); - virtual void DoSetExpanderColumn(wxDataViewColumn const* columnPtr); - virtual wxDataViewColumn* GetColumn(unsigned int pos) const; - virtual int GetColumnPosition(wxDataViewColumn const* columnPtr) const; - virtual bool InsertColumn(unsigned int pos, wxDataViewColumn* columnPtr); - virtual void FitColumnWidthToContent(unsigned int pos); - - // item related methods (inherited from wxDataViewWidgetImpl) - virtual bool Add(const wxDataViewItem& parent, const wxDataViewItem& item); - virtual bool Add(const wxDataViewItem& parent, - const wxDataViewItemArray& items); - virtual void Collapse(const wxDataViewItem& item); - virtual void EnsureVisible(const wxDataViewItem& item, - wxDataViewColumn const* columnPtr); - virtual void Expand(const wxDataViewItem& item); - virtual unsigned int GetCount() const; - virtual wxRect GetRectangle(const wxDataViewItem& item, - wxDataViewColumn const* columnPtr); - virtual bool IsExpanded(const wxDataViewItem& item) const; - virtual bool Reload(); - virtual bool Remove(const wxDataViewItem& parent, - const wxDataViewItem& item); - virtual bool Remove(const wxDataViewItem& parent, - const wxDataViewItemArray& item); - virtual bool Update(const wxDataViewColumn* columnPtr); - virtual bool Update(const wxDataViewItem& parent, - const wxDataViewItem& item); - virtual bool Update(const wxDataViewItem& parent, - const wxDataViewItemArray& items); - - // model related methods - virtual bool AssociateModel(wxDataViewModel* model); - - // - // selection related methods (inherited from wxDataViewWidgetImpl) - // - virtual wxDataViewItem GetCurrentItem() const; - virtual void SetCurrentItem(const wxDataViewItem& item); - virtual wxDataViewColumn *GetCurrentColumn() const; - virtual int GetSelectedItemsCount() const; - virtual int GetSelections(wxDataViewItemArray& sel) const; - virtual bool IsSelected(const wxDataViewItem& item) const; - virtual void Select(const wxDataViewItem& item); - virtual void SelectAll(); - virtual void Unselect(const wxDataViewItem& item); - virtual void UnselectAll(); - - // - // sorting related methods - // - virtual wxDataViewColumn* GetSortingColumn () const; - virtual void Resort(); - - // - // other methods (inherited from wxDataViewWidgetImpl) - // - virtual void DoSetIndent(int indent); - virtual void HitTest(const wxPoint& point, - wxDataViewItem& item, - wxDataViewColumn*& columnPtr) const; - virtual void SetRowHeight(const wxDataViewItem& item, unsigned int height); - virtual void OnSize(); - - virtual void StartEditor( const wxDataViewItem & item, unsigned int column ); - - // drag & drop helper methods - wxDataFormat GetDnDDataFormat(wxDataObjectComposite* dataObjects); - wxDataObjectComposite* GetDnDDataObjects(NSData* dataObject) const; - - // Cocoa-specific helpers - id GetItemAtRow(int row) const; - -private: - void InitOutlineView(long style); - - wxCocoaOutlineDataSource* m_DataSource; - - wxCocoaOutlineView* m_OutlineView; -}; - -#endif // _WX_DATAVIEWCTRL_COCOOA_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/cocoa/evtloop.h b/Externals/wxWidgets3/include/wx/osx/cocoa/evtloop.h deleted file mode 100644 index ab15dd94af..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/cocoa/evtloop.h +++ /dev/null @@ -1,48 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/cocoa/evtloop.h -// Purpose: declaration of wxGUIEventLoop for wxOSX/Cocoa -// Author: Vadim Zeitlin -// Created: 2008-12-28 -// Copyright: (c) 2006 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_OSX_COCOA_EVTLOOP_H_ -#define _WX_OSX_COCOA_EVTLOOP_H_ - -class WXDLLIMPEXP_BASE wxGUIEventLoop : public wxCFEventLoop -{ -public: - wxGUIEventLoop(); - ~wxGUIEventLoop(); - - void BeginModalSession( wxWindow* modalWindow ); - - void EndModalSession(); - - virtual void WakeUp(); - - void OSXUseLowLevelWakeup(bool useIt) - { m_osxLowLevelWakeUp = useIt ; } - -protected: - virtual int DoDispatchTimeout(unsigned long timeout); - - virtual void OSXDoRun(); - virtual void OSXDoStop(); - - virtual CFRunLoopRef CFGetCurrentRunLoop() const; - - void* m_modalSession; - - wxWindow* m_modalWindow; - - WXWindow m_dummyWindow; - - int m_modalNestedLevel; - - bool m_osxLowLevelWakeUp; -}; - -#endif // _WX_OSX_COCOA_EVTLOOP_H_ - diff --git a/Externals/wxWidgets3/include/wx/osx/cocoa/private.h b/Externals/wxWidgets3/include/wx/osx/cocoa/private.h deleted file mode 100644 index 8c6553e5ac..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/cocoa/private.h +++ /dev/null @@ -1,490 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/cocoa/private.h -// Purpose: Private declarations: as this header is only included by -// wxWidgets itself, it may contain identifiers which don't start -// with "wx". -// Author: Stefan Csomor -// Modified by: -// Created: 1998-01-01 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PRIVATE_COCOA_H_ -#define _WX_PRIVATE_COCOA_H_ - -#include - -#ifdef __OBJC__ - #import -#endif - -// -// shared between Cocoa and Carbon -// - -// bring in theming types without pulling in the headers - -#if wxUSE_GUI -typedef SInt16 ThemeBrush; -CGColorRef WXDLLIMPEXP_CORE wxMacCreateCGColorFromHITheme( ThemeBrush brush ) ; -OSStatus WXDLLIMPEXP_CORE wxMacDrawCGImage( - CGContextRef inContext, - const CGRect * inBounds, - CGImageRef inImage) ; -WX_NSImage WXDLLIMPEXP_CORE wxOSXGetNSImageFromCGImage( CGImageRef image, double scale = 1.0, bool isTemplate = false); -WX_NSImage WXDLLIMPEXP_CORE wxOSXGetNSImageFromIconRef( WXHICON iconref ); -CGImageRef WXDLLIMPEXP_CORE wxOSXCreateCGImageFromNSImage( WX_NSImage nsimage, double *scale = NULL ); -CGImageRef WXDLLIMPEXP_CORE wxOSXGetCGImageFromNSImage( WX_NSImage nsimage, CGRect* r, CGContextRef cg); -CGContextRef WXDLLIMPEXP_CORE wxOSXCreateBitmapContextFromNSImage( WX_NSImage nsimage, bool *isTemplate = NULL); - -wxBitmap WXDLLIMPEXP_CORE wxOSXCreateSystemBitmap(const wxString& id, const wxString &client, const wxSize& size); -WXWindow WXDLLIMPEXP_CORE wxOSXGetMainWindow(); - -class WXDLLIMPEXP_FWD_CORE wxDialog; - -class WXDLLIMPEXP_CORE wxWidgetCocoaImpl : public wxWidgetImpl -{ -public : - wxWidgetCocoaImpl( wxWindowMac* peer , WXWidget w, bool isRootControl = false, bool isUserPane = false ) ; - wxWidgetCocoaImpl() ; - ~wxWidgetCocoaImpl(); - - void Init(); - - virtual bool IsVisible() const ; - virtual void SetVisibility(bool); - - // we provide a static function which can be reused from - // wxNonOwnedWindowCocoaImpl too - static bool ShowViewOrWindowWithEffect(wxWindow *win, - bool show, - wxShowEffect effect, - unsigned timeout); - - virtual bool ShowWithEffect(bool show, - wxShowEffect effect, - unsigned timeout); - - virtual void Raise(); - - virtual void Lower(); - - virtual void ScrollRect( const wxRect *rect, int dx, int dy ); - - virtual WXWidget GetWXWidget() const { return m_osxView; } - - virtual void SetBackgroundColour(const wxColour&); - virtual bool SetBackgroundStyle(wxBackgroundStyle style); - - virtual void GetContentArea( int &left , int &top , int &width , int &height ) const; - virtual void Move(int x, int y, int width, int height); - virtual void GetPosition( int &x, int &y ) const; - virtual void GetSize( int &width, int &height ) const; - virtual void SetControlSize( wxWindowVariant variant ); - - virtual void SetNeedsDisplay( const wxRect* where = NULL ); - virtual bool GetNeedsDisplay() const; - - virtual void SetDrawingEnabled(bool enabled); - - virtual bool CanFocus() const; - // return true if successful - virtual bool SetFocus(); - virtual bool HasFocus() const; - - void RemoveFromParent(); - void Embed( wxWidgetImpl *parent ); - - void SetDefaultButton( bool isDefault ); - void PerformClick(); - virtual void SetLabel(const wxString& title, wxFontEncoding encoding); - - void SetCursor( const wxCursor & cursor ); - void CaptureMouse(); - void ReleaseMouse(); -#if wxUSE_DRAG_AND_DROP - void SetDropTarget(wxDropTarget* target); -#endif - wxInt32 GetValue() const; - void SetValue( wxInt32 v ); - wxBitmap GetBitmap() const; - void SetBitmap( const wxBitmap& bitmap ); - void SetBitmapPosition( wxDirection dir ); - void SetupTabs( const wxNotebook ¬ebook ); - void GetBestRect( wxRect *r ) const; - bool IsEnabled() const; - void Enable( bool enable ); - bool ButtonClickDidStateChange() { return true ;} - void SetMinimum( wxInt32 v ); - void SetMaximum( wxInt32 v ); - wxInt32 GetMinimum() const; - wxInt32 GetMaximum() const; - void PulseGauge(); - void SetScrollThumb( wxInt32 value, wxInt32 thumbSize ); - - void SetFont( const wxFont & font , const wxColour& foreground , long windowStyle, bool ignoreBlack = true ); - void SetToolTip( wxToolTip* tooltip ); - - void InstallEventHandler( WXWidget control = NULL ); - - virtual bool DoHandleMouseEvent(NSEvent *event); - virtual bool DoHandleKeyEvent(NSEvent *event); - virtual bool DoHandleCharEvent(NSEvent *event, NSString *text); - virtual void DoNotifyFocusSet(); - virtual void DoNotifyFocusLost(); - virtual void DoNotifyFocusEvent(bool receivedFocus, wxWidgetImpl* otherWindow); - - virtual void SetupKeyEvent(wxKeyEvent &wxevent, NSEvent * nsEvent, NSString* charString = NULL); - virtual void SetupMouseEvent(wxMouseEvent &wxevent, NSEvent * nsEvent); - void SetupCoordinates(wxCoord &x, wxCoord &y, NSEvent *nsEvent); - virtual bool SetupCursor(NSEvent* event); - - -#if !wxOSX_USE_NATIVE_FLIPPED - void SetFlipped(bool flipped); - virtual bool IsFlipped() const { return m_isFlipped; } -#endif - - virtual double GetContentScaleFactor() const; - - // cocoa thunk connected calls - -#if wxUSE_DRAG_AND_DROP - virtual unsigned int draggingEntered(void* sender, WXWidget slf, void* _cmd); - virtual void draggingExited(void* sender, WXWidget slf, void* _cmd); - virtual unsigned int draggingUpdated(void* sender, WXWidget slf, void* _cmd); - virtual bool performDragOperation(void* sender, WXWidget slf, void* _cmd); -#endif - virtual void mouseEvent(WX_NSEvent event, WXWidget slf, void* _cmd); - virtual void cursorUpdate(WX_NSEvent event, WXWidget slf, void* _cmd); - virtual void keyEvent(WX_NSEvent event, WXWidget slf, void* _cmd); - virtual void insertText(NSString* text, WXWidget slf, void* _cmd); - virtual void doCommandBySelector(void* sel, WXWidget slf, void* _cmd); - virtual bool performKeyEquivalent(WX_NSEvent event, WXWidget slf, void* _cmd); - virtual bool acceptsFirstResponder(WXWidget slf, void* _cmd); - virtual bool becomeFirstResponder(WXWidget slf, void* _cmd); - virtual bool resignFirstResponder(WXWidget slf, void* _cmd); -#if !wxOSX_USE_NATIVE_FLIPPED - virtual bool isFlipped(WXWidget slf, void* _cmd); -#endif - virtual void drawRect(void* rect, WXWidget slf, void* _cmd); - - virtual void controlAction(WXWidget slf, void* _cmd, void* sender); - virtual void controlDoubleAction(WXWidget slf, void* _cmd, void *sender); - - // for wxTextCtrl-derived classes, put here since they don't all derive - // from the same pimpl class. - virtual void controlTextDidChange(); - -protected: - WXWidget m_osxView; - NSEvent* m_lastKeyDownEvent; -#if !wxOSX_USE_NATIVE_FLIPPED - bool m_isFlipped; -#endif - // if it the control has an editor, that editor will already send some - // events, don't resend them - bool m_hasEditor; - - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxWidgetCocoaImpl); -}; - -DECLARE_WXCOCOA_OBJC_CLASS( wxNSWindow ); - -class wxNonOwnedWindowCocoaImpl : public wxNonOwnedWindowImpl -{ -public : - wxNonOwnedWindowCocoaImpl( wxNonOwnedWindow* nonownedwnd) ; - wxNonOwnedWindowCocoaImpl(); - - virtual ~wxNonOwnedWindowCocoaImpl(); - - virtual void WillBeDestroyed() wxOVERRIDE; - void Create( wxWindow* parent, const wxPoint& pos, const wxSize& size, - long style, long extraStyle, const wxString& name ) wxOVERRIDE; - void Create( wxWindow* parent, WXWindow nativeWindow ); - - WXWindow GetWXWindow() const wxOVERRIDE; - void Raise() wxOVERRIDE; - void Lower() wxOVERRIDE; - bool Show(bool show) wxOVERRIDE; - - virtual bool ShowWithEffect(bool show, - wxShowEffect effect, - unsigned timeout) wxOVERRIDE; - - void Update() wxOVERRIDE; - bool SetTransparent(wxByte alpha) wxOVERRIDE; - bool SetBackgroundColour(const wxColour& col ) wxOVERRIDE; - void SetExtraStyle( long exStyle ) wxOVERRIDE; - void SetWindowStyleFlag( long style ) wxOVERRIDE; - bool SetBackgroundStyle(wxBackgroundStyle style) wxOVERRIDE; - bool CanSetTransparent() wxOVERRIDE; - - void MoveWindow(int x, int y, int width, int height) wxOVERRIDE; - void GetPosition( int &x, int &y ) const wxOVERRIDE; - void GetSize( int &width, int &height ) const wxOVERRIDE; - - void GetContentArea( int &left , int &top , int &width , int &height ) const wxOVERRIDE; - bool SetShape(const wxRegion& region) wxOVERRIDE; - - virtual void SetTitle( const wxString& title, wxFontEncoding encoding ) wxOVERRIDE; - - virtual bool EnableCloseButton(bool enable) wxOVERRIDE; - virtual bool EnableMaximizeButton(bool enable) wxOVERRIDE; - virtual bool EnableMinimizeButton(bool enable) wxOVERRIDE; - - virtual bool IsMaximized() const wxOVERRIDE; - - virtual bool IsIconized() const wxOVERRIDE; - - virtual void Iconize( bool iconize ) wxOVERRIDE; - - virtual void Maximize(bool maximize) wxOVERRIDE; - - virtual bool IsFullScreen() const wxOVERRIDE; - - bool EnableFullScreenView(bool enable) wxOVERRIDE; - - virtual bool ShowFullScreen(bool show, long style) wxOVERRIDE; - - virtual void ShowWithoutActivating() wxOVERRIDE; - - virtual void RequestUserAttention(int flags) wxOVERRIDE; - - virtual void ScreenToWindow( int *x, int *y ) wxOVERRIDE; - - virtual void WindowToScreen( int *x, int *y ) wxOVERRIDE; - - virtual bool IsActive() wxOVERRIDE; - - virtual void SetModified(bool modified) wxOVERRIDE; - virtual bool IsModified() const wxOVERRIDE; - - virtual void SetRepresentedFilename(const wxString& filename) wxOVERRIDE; - - wxNonOwnedWindow* GetWXPeer() { return m_wxPeer; } - - CGWindowLevel GetWindowLevel() const wxOVERRIDE { return m_macWindowLevel; } - void RestoreWindowLevel() wxOVERRIDE; - - static WX_NSResponder GetNextFirstResponder() ; - static WX_NSResponder GetFormerFirstResponder() ; -protected : - CGWindowLevel m_macWindowLevel; - WXWindow m_macWindow; - void * m_macFullScreenData ; - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxNonOwnedWindowCocoaImpl); -}; - -DECLARE_WXCOCOA_OBJC_CLASS( wxNSButton ); - -class wxButtonCocoaImpl : public wxWidgetCocoaImpl, public wxButtonImpl -{ -public: - wxButtonCocoaImpl(wxWindowMac *wxpeer, wxNSButton *v); - virtual void SetBitmap(const wxBitmap& bitmap); -#if wxUSE_MARKUP - virtual void SetLabelMarkup(const wxString& markup); -#endif // wxUSE_MARKUP - - void SetPressedBitmap( const wxBitmap& bitmap ); - void GetLayoutInset(int &left , int &top , int &right, int &bottom) const; - void SetAcceleratorFromLabel(const wxString& label); - - NSButton *GetNSButton() const; -}; - -#ifdef __OBJC__ - - typedef NSRect WXRect; - typedef void (*wxOSX_TextEventHandlerPtr)(NSView* self, SEL _cmd, NSString *event); - typedef void (*wxOSX_EventHandlerPtr)(NSView* self, SEL _cmd, NSEvent *event); - typedef BOOL (*wxOSX_PerformKeyEventHandlerPtr)(NSView* self, SEL _cmd, NSEvent *event); - typedef BOOL (*wxOSX_FocusHandlerPtr)(NSView* self, SEL _cmd); - - - WXDLLIMPEXP_CORE NSScreen* wxOSXGetMenuScreen(); - WXDLLIMPEXP_CORE NSRect wxToNSRect( NSView* parent, const wxRect& r ); - WXDLLIMPEXP_CORE wxRect wxFromNSRect( NSView* parent, const NSRect& rect ); - WXDLLIMPEXP_CORE NSPoint wxToNSPoint( NSView* parent, const wxPoint& p ); - WXDLLIMPEXP_CORE wxPoint wxFromNSPoint( NSView* parent, const NSPoint& p ); - - NSRect WXDLLIMPEXP_CORE wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const wxSize &size , - bool adjustForOrigin = true ); - - WXDLLIMPEXP_CORE NSView* wxOSXGetViewFromResponder( NSResponder* responder ); - - // used for many wxControls - - @interface wxNSButton : NSButton - { - NSTrackingRectTag rectTag; - } - - @end - - @interface wxNSBox : NSBox - { - } - - @end - - @interface wxNSTextFieldEditor : NSTextView - { - NSEvent* lastKeyDownEvent; - NSTextField* textField; - } - - - (void) setTextField:(NSTextField*) field; - @end - - @interface wxNSTextField : NSTextField - { - wxNSTextFieldEditor* fieldEditor; - } - - - (wxNSTextFieldEditor*) fieldEditor; - - (void) setFieldEditor:(wxNSTextFieldEditor*) fieldEditor; - - @end - - @interface wxNSSecureTextField : NSSecureTextField - { - } - - @end - - - @interface wxNSTextView : NSTextView - { - } - - - (void)textDidChange:(NSNotification *)aNotification; - - @end - - @interface wxNSComboBox : NSComboBox - { - wxNSTextFieldEditor* fieldEditor; - } - - - (wxNSTextFieldEditor*) fieldEditor; - - (void) setFieldEditor:(wxNSTextFieldEditor*) fieldEditor; - - @end - - - - @interface wxNSMenu : NSMenu - { - wxMenuImpl* impl; - } - - - (void) setImplementation:(wxMenuImpl*) item; - - (wxMenuImpl*) implementation; - - @end - - @interface wxNSMenuItem : NSMenuItem - { - wxMenuItemImpl* impl; - } - - - (void) setImplementation:(wxMenuItemImpl*) item; - - (wxMenuItemImpl*) implementation; - - - (void)clickedAction:(id)sender; - - (BOOL)validateMenuItem:(NSMenuItem *)menuItem; - - @end - - void WXDLLIMPEXP_CORE wxOSXCocoaClassAddWXMethods(Class c); - - /* - We need this for ShowModal, as the sheet just disables the parent window and - returns control to the app, whereas we don't want to return from ShowModal - until the sheet has been dismissed. - */ - @interface ModalDialogDelegate : NSObject - { - BOOL sheetFinished; - int resultCode; - wxDialog* impl; - } - - - (void)setImplementation: (wxDialog *)dialog; - - (BOOL)finished; - - (int)code; - - (void)waitForSheetToFinish; - - (void)sheetDidEnd:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo; - @end - - // This interface must be exported in shared 64 bit multilib build but - // using WXEXPORT with Objective C interfaces doesn't work with old (4.0.1) - // gcc when using 10.4 SDK. It does work with newer gcc even in 32 bit - // builds but seems to be unnecessary there so to avoid the expense of a - // configure check verifying if this does work or not with the current - // compiler we just only use it for 64 bit builds where this is always - // supported. - // - // NB: Currently this is the only place where we need to export an - // interface but if we need to do it elsewhere we should define a - // WXEXPORT_OBJC macro once and reuse it in all places it's needed - // instead of duplicating this preprocessor check. -#ifdef __LP64__ - WXEXPORT -#endif // 64 bit builds - @interface wxNSAppController : NSObject - { - } - - @end - -#endif // __OBJC__ - -// NSCursor - -WX_NSCursor wxMacCocoaCreateStockCursor( int cursor_type ); -WX_NSCursor wxMacCocoaCreateCursorFromCGImage( CGImageRef cgImageRef, float hotSpotX, float hotSpotY ); -void wxMacCocoaSetCursor( WX_NSCursor cursor ); -void wxMacCocoaHideCursor(); -void wxMacCocoaShowCursor(); - -typedef struct tagClassicCursor -{ - wxUint16 bits[16]; - wxUint16 mask[16]; - wxInt16 hotspot[2]; -}ClassicCursor; - -const short kwxCursorBullseye = 0; -const short kwxCursorBlank = 1; -const short kwxCursorPencil = 2; -const short kwxCursorMagnifier = 3; -const short kwxCursorNoEntry = 4; -const short kwxCursorPaintBrush = 5; -const short kwxCursorPointRight = 6; -const short kwxCursorPointLeft = 7; -const short kwxCursorQuestionArrow = 8; -const short kwxCursorRightArrow = 9; -const short kwxCursorSizeNS = 10; -const short kwxCursorSize = 11; -const short kwxCursorSizeNESW = 12; -const short kwxCursorSizeNWSE = 13; -const short kwxCursorRoller = 14; -const short kwxCursorWatch = 15; -const short kwxCursorLast = kwxCursorWatch; - -// exposing our fallback cursor map - -extern ClassicCursor gMacCursors[]; - -extern NSLayoutManager* gNSLayoutManager; - -#endif // wxUSE_GUI - -#endif - // _WX_PRIVATE_COCOA_H_ - diff --git a/Externals/wxWidgets3/include/wx/osx/cocoa/private/date.h b/Externals/wxWidgets3/include/wx/osx/cocoa/private/date.h deleted file mode 100644 index e7d9d40b6d..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/cocoa/private/date.h +++ /dev/null @@ -1,50 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/cocoa/private/date.h -// Purpose: NSDate-related helpers -// Author: Vadim Zeitlin -// Created: 2011-12-19 -// Copyright: (c) 2011 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_OSX_COCOA_PRIVATE_DATE_H_ -#define _WX_OSX_COCOA_PRIVATE_DATE_H_ - -#include "wx/datetime.h" - -namespace wxOSXImpl -{ - -// Functions to convert between NSDate and wxDateTime. - -// Returns an NSDate corresponding to the given wxDateTime which can be invalid -// (in which case nil is returned). -inline NSDate* NSDateFromWX(const wxDateTime& dt) -{ - if ( !dt.IsValid() ) - return nil; - - // Get the internal representation as a double used by NSDate. - double ticks = dt.GetValue().ToDouble(); - - // wxDateTime uses milliseconds while NSDate uses (fractional) seconds. - return [NSDate dateWithTimeIntervalSince1970:ticks/1000.]; -} - - -// Returns wxDateTime corresponding to the given NSDate (which may be nil). -inline wxDateTime NSDateToWX(const NSDate* d) -{ - if ( !d ) - return wxDefaultDateTime; - - // Reverse everything done above. - wxLongLong ll; - ll.Assign([d timeIntervalSince1970]*1000); - wxDateTime dt(ll); - return dt; -} - -} // namespace wxOSXImpl - -#endif // _WX_OSX_COCOA_PRIVATE_DATE_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/cocoa/private/markuptoattr.h b/Externals/wxWidgets3/include/wx/osx/cocoa/private/markuptoattr.h deleted file mode 100644 index 1d23d8e3b4..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/cocoa/private/markuptoattr.h +++ /dev/null @@ -1,119 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/cocoa/private/markuptoattr.h -// Purpose: Class to convert markup to Cocoa attributed strings. -// Author: Vadim Zeitlin -// Created: 2011-02-22 -// Copyright: (c) 2011 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_OSX_COCOA_PRIVATE_MARKUPTOATTR_H_ -#define _WX_OSX_COCOA_PRIVATE_MARKUPTOATTR_H_ - -#include "wx/private/markupparserattr.h" - -// ---------------------------------------------------------------------------- -// wxMarkupToAttrString: create NSAttributedString from markup. -// ---------------------------------------------------------------------------- - -class wxMarkupToAttrString : public wxMarkupParserAttrOutput -{ -public: - // We don't care about the original colours because we never use them but - // we do need the correct initial font as we apply modifiers (e.g. create a - // font larger than it) to it and so it must be valid. - wxMarkupToAttrString(wxWindow *win, const wxString& markup) - : wxMarkupParserAttrOutput(win->GetFont(), wxColour(), wxColour()) - { - const wxCFStringRef - label(wxControl::RemoveMnemonics(wxMarkupParser::Strip(markup))); - m_attrString = [[NSMutableAttributedString alloc] - initWithString: label.AsNSString()]; - - m_pos = 0; - - [m_attrString beginEditing]; - - // First thing we do is change the default string font: as mentioned in - // Apple documentation, attributed strings use "Helvetica 12" font by - // default which is different from the system "Lucida Grande" font. So - // we need to explicitly change the font for the entire string. - [m_attrString addAttribute:NSFontAttributeName - value:win->GetFont().OSXGetNSFont() - range:NSMakeRange(0, [m_attrString length])]; - - // Now translate the markup tags to corresponding attributes. - wxMarkupParser parser(*this); - parser.Parse(markup); - - [m_attrString endEditing]; - } - - ~wxMarkupToAttrString() - { - [m_attrString release]; - } - - // Accessor for the users of this class. - // - // We keep ownership of the returned string. - NSMutableAttributedString *GetNSAttributedString() const - { - return m_attrString; - } - - - // Implement base class pure virtual methods to process markup tags. - virtual void OnText(const wxString& text) - { - m_pos += wxControl::RemoveMnemonics(text).length(); - } - - virtual void OnAttrStart(const Attr& WXUNUSED(attr)) - { - // Just remember the starting position of the range, we can't really - // set the attribute until we find the end of it. - m_rangeStarts.push(m_pos); - } - - virtual void OnAttrEnd(const Attr& attr) - { - unsigned start = m_rangeStarts.top(); - m_rangeStarts.pop(); - - const NSRange range = NSMakeRange(start, m_pos - start); - - [m_attrString addAttribute:NSFontAttributeName - value:attr.font.OSXGetNSFont() - range:range]; - - if ( attr.foreground.IsOk() ) - { - [m_attrString addAttribute:NSForegroundColorAttributeName - value:attr.foreground.OSXGetNSColor() - range:range]; - } - - if ( attr.background.IsOk() ) - { - [m_attrString addAttribute:NSBackgroundColorAttributeName - value:attr.background.OSXGetNSColor() - range:range]; - } - } - -private: - // The attributed string we're building. - NSMutableAttributedString *m_attrString; - - // The current position in the output string. - unsigned m_pos; - - // The positions of starting ranges. - wxStack m_rangeStarts; - - - wxDECLARE_NO_COPY_CLASS(wxMarkupToAttrString); -}; - -#endif // _WX_OSX_COCOA_PRIVATE_MARKUPTOATTR_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/cocoa/private/overlay.h b/Externals/wxWidgets3/include/wx/osx/cocoa/private/overlay.h deleted file mode 100644 index 5a49e8104e..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/cocoa/private/overlay.h +++ /dev/null @@ -1,55 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/cocoa/private/overlay.h -// Purpose: wxOverlayImpl declaration -// Author: Stefan Csomor -// Modified by: -// Created: 2006-10-20 -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_OSX_COCOA_PRIVATE_OVERLAY_H_ -#define _WX_OSX_COCOA_PRIVATE_OVERLAY_H_ - -#include "wx/osx/private.h" -#include "wx/toplevel.h" -#include "wx/graphics.h" - -class wxOverlayImpl -{ -public: - wxOverlayImpl() ; - ~wxOverlayImpl() ; - - - // clears the overlay without restoring the former state - // to be done eg when the window content has been changed and repainted - void Reset(); - - // returns true if it has been setup - bool IsOk(); - - void Init( wxDC* dc, int x , int y , int width , int height ); - - void BeginDrawing( wxDC* dc); - - void EndDrawing( wxDC* dc); - - void Clear( wxDC* dc); - -private: - void CreateOverlayWindow(); - - WXWindow m_overlayWindow; - WXWindow m_overlayParentWindow; - CGContextRef m_overlayContext ; - // we store the window in case we would have to issue a Refresh() - wxWindow* m_window ; - - int m_x ; - int m_y ; - int m_width ; - int m_height ; -} ; - -#endif // _WX_MAC_CARBON_PRIVATE_OVERLAY_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/cocoa/private/textimpl.h b/Externals/wxWidgets3/include/wx/osx/cocoa/private/textimpl.h deleted file mode 100644 index 2091b38188..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/cocoa/private/textimpl.h +++ /dev/null @@ -1,135 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/cocoa/private/textimpl.h -// Purpose: textcontrol implementation classes that have to be exposed -// Author: Stefan Csomor -// Modified by: -// Created: 03/02/99 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_OSX_COCOA_PRIVATE_TEXTIMPL_H_ -#define _WX_OSX_COCOA_PRIVATE_TEXTIMPL_H_ - -#include "wx/combobox.h" -#include "wx/osx/private.h" - -@class wxTextEntryFormatter; - -// implementation exposed, so that search control can pull it - -class wxNSTextFieldControl : public wxWidgetCocoaImpl, public wxTextWidgetImpl -{ -public : - // wxNSTextFieldControl must always be associated with a wxTextEntry. If - // it's associated with a wxTextCtrl then we can get the associated entry - // from it but otherwise the second ctor should be used to explicitly pass - // us the entry. - wxNSTextFieldControl( wxTextCtrl *text, WXWidget w ); - wxNSTextFieldControl( wxWindow *wxPeer, wxTextEntry *entry, WXWidget w ); - virtual ~wxNSTextFieldControl(); - - virtual bool CanClipMaxLength() const { return true; } - virtual void SetMaxLength(unsigned long len); - - virtual bool CanForceUpper() { return true; } - virtual void ForceUpper(); - - virtual wxString GetStringValue() const ; - virtual void SetStringValue( const wxString &str) ; - virtual void Copy() ; - virtual void Cut() ; - virtual void Paste() ; - virtual bool CanPaste() const ; - virtual void SetEditable(bool editable) ; - virtual void GetSelection( long* from, long* to) const ; - virtual void SetSelection( long from , long to ); - virtual void WriteText(const wxString& str) ; - virtual bool HasOwnContextMenu() const { return true; } - virtual bool SetHint(const wxString& hint); - - virtual void controlAction(WXWidget slf, void* _cmd, void *sender); - virtual bool becomeFirstResponder(WXWidget slf, void *_cmd); - virtual bool resignFirstResponder(WXWidget slf, void *_cmd); - - virtual void SetInternalSelection( long from , long to ); - virtual void UpdateInternalSelectionFromEditor( wxNSTextFieldEditor* editor); -protected : - NSTextField* m_textField; - long m_selStart; - long m_selEnd; - -private: - // Common part of both ctors. - void Init(WXWidget w); - - // Get our formatter, creating it if necessary. - wxTextEntryFormatter* GetFormatter(); -}; - -class wxNSTextViewControl : public wxWidgetCocoaImpl, public wxTextWidgetImpl -{ -public: - wxNSTextViewControl( wxTextCtrl *wxPeer, WXWidget w, long style ); - virtual ~wxNSTextViewControl(); - - virtual void insertText(NSString* text, WXWidget slf, void *_cmd); - - virtual wxString GetStringValue() const ; - virtual void SetStringValue( const wxString &str) ; - virtual void Copy() ; - virtual void Cut() ; - virtual void Paste() ; - virtual bool CanPaste() const ; - virtual void SetEditable(bool editable) ; - virtual void GetSelection( long* from, long* to) const ; - virtual void SetSelection( long from , long to ); - virtual void WriteText(const wxString& str) ; - virtual void SetFont( const wxFont & font , const wxColour& foreground , long windowStyle, bool ignoreBlack = true ); - - virtual bool GetStyle(long position, wxTextAttr& style); - virtual void SetStyle(long start, long end, const wxTextAttr& style); - - virtual bool CanFocus() const; - - virtual bool HasOwnContextMenu() const { return true; } - - virtual void CheckSpelling(bool check); - virtual wxSize GetBestSize() const; - -protected: - NSScrollView* m_scrollView; - NSTextView* m_textView; -}; - -class wxNSComboBoxControl : public wxNSTextFieldControl, public wxComboWidgetImpl -{ -public : - wxNSComboBoxControl( wxComboBox *wxPeer, WXWidget w ); - virtual ~wxNSComboBoxControl(); - - virtual int GetSelectedItem() const; - virtual void SetSelectedItem(int item); - - virtual int GetNumberOfItems() const; - - virtual void InsertItem(int pos, const wxString& item); - virtual void RemoveItem(int pos); - - virtual void Clear(); - - virtual wxString GetStringAtIndex(int pos) const; - - virtual int FindString(const wxString& text) const; - virtual void Popup(); - virtual void Dismiss(); - - virtual void SetEditable(bool editable); - - virtual void mouseEvent(WX_NSEvent event, WXWidget slf, void *_cmd); - -private: - NSComboBox* m_comboBox; -}; - -#endif // _WX_OSX_COCOA_PRIVATE_TEXTIMPL_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/cocoa/stdpaths.h b/Externals/wxWidgets3/include/wx/osx/cocoa/stdpaths.h deleted file mode 100644 index 59c33f2019..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/cocoa/stdpaths.h +++ /dev/null @@ -1,43 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/cocoa/stdpaths.h -// Purpose: wxStandardPaths for Cocoa -// Author: Tobias Taschner -// Created: 2015-09-09 -// Copyright: (c) 2015 wxWidgets development team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_COCOA_STDPATHS_H_ -#define _WX_COCOA_STDPATHS_H_ - -// ---------------------------------------------------------------------------- -// wxStandardPaths -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxStandardPaths : public wxStandardPathsBase -{ -public: - virtual ~wxStandardPaths(); - - // implement base class pure virtuals - virtual wxString GetExecutablePath() const wxOVERRIDE; - virtual wxString GetConfigDir() const wxOVERRIDE; - virtual wxString GetUserConfigDir() const wxOVERRIDE; - virtual wxString GetDataDir() const wxOVERRIDE; - virtual wxString GetLocalDataDir() const wxOVERRIDE; - virtual wxString GetUserDataDir() const wxOVERRIDE; - virtual wxString GetPluginsDir() const wxOVERRIDE; - virtual wxString GetResourcesDir() const wxOVERRIDE; - virtual wxString - GetLocalizedResourcesDir(const wxString& lang, - ResourceCat category = ResourceCat_None) const wxOVERRIDE; - virtual wxString GetUserDir(Dir userDir) const wxOVERRIDE; - -protected: - // Ctor is protected, use wxStandardPaths::Get() instead of instantiating - // objects of this class directly. - wxStandardPaths(); -}; - - -#endif // _WX_COCOA_STDPATHS_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/colordlg.h b/Externals/wxWidgets3/include/wx/osx/colordlg.h deleted file mode 100644 index c46f2f5d0f..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/colordlg.h +++ /dev/null @@ -1,39 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/colordlg.h -// Purpose: wxColourDialog class. Use generic version if no -// platform-specific implementation. -// Author: Stefan Csomor -// Modified by: -// Created: 1998-01-01 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_COLORDLG_H_ -#define _WX_COLORDLG_H_ - -#include "wx/dialog.h" - -/* - * Platform-specific colour dialog implementation - */ - -class WXDLLIMPEXP_CORE wxColourDialog: public wxDialog -{ - wxDECLARE_DYNAMIC_CLASS(wxColourDialog); -public: - wxColourDialog(); - wxColourDialog(wxWindow *parent, wxColourData *data = NULL); - - bool Create(wxWindow *parent, wxColourData *data = NULL); - - int ShowModal(); - wxColourData& GetColourData() { return m_colourData; } - -protected: - wxColourData m_colourData; - wxWindow* m_dialogParent; -}; - -#endif - // _WX_COLORDLG_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/colour.h b/Externals/wxWidgets3/include/wx/osx/colour.h deleted file mode 100644 index 408625476d..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/colour.h +++ /dev/null @@ -1 +0,0 @@ -#include "wx/osx/core/colour.h" diff --git a/Externals/wxWidgets3/include/wx/osx/combobox.h b/Externals/wxWidgets3/include/wx/osx/combobox.h deleted file mode 100644 index 95de0449d4..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/combobox.h +++ /dev/null @@ -1,140 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/combobox.h -// Purpose: wxComboBox class -// Author: Stefan Csomor -// Modified by: -// Created: 1998-01-01 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_COMBOBOX_H_ -#define _WX_COMBOBOX_H_ - -#include "wx/containr.h" -#include "wx/choice.h" -#include "wx/textctrl.h" - -WX_DEFINE_ARRAY( char * , wxComboBoxDataArray ) ; - -// forward declaration of private implementation classes - -class wxComboBoxText; -class wxComboBoxChoice; -class wxComboWidgetImpl; - -// Combobox item -class WXDLLIMPEXP_CORE wxComboBox : - public wxWindowWithItems< - wxControl, - wxComboBoxBase> -{ - wxDECLARE_DYNAMIC_CLASS(wxComboBox); - - public: - virtual ~wxComboBox(); - - // callback functions - virtual void DelegateTextChanged( const wxString& value ); - virtual void DelegateChoice( const wxString& value ); - - wxComboBox() { } - - wxComboBox(wxWindow *parent, wxWindowID id, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxComboBoxNameStr) - { - Create(parent, id, value, pos, size, n, choices, style, validator, name); - } - - wxComboBox(wxWindow *parent, wxWindowID id, - const wxString& value, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxComboBoxNameStr) - { - Create(parent, id, value, pos, size, choices, style, validator, name); - } - - bool Create(wxWindow *parent, wxWindowID id, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxComboBoxNameStr); - - bool Create(wxWindow *parent, wxWindowID id, - const wxString& value, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxComboBoxNameStr); - - virtual int GetSelection() const; - virtual void GetSelection(long *from, long *to) const; - virtual void SetSelection(int n); - virtual void SetSelection(long from, long to); - virtual int FindString(const wxString& s, bool bCase = false) const; - virtual wxString GetString(unsigned int n) const; - virtual wxString GetStringSelection() const; - virtual void SetString(unsigned int n, const wxString& s); - - virtual unsigned int GetCount() const; - - virtual void SetValue(const wxString& value); -// these methods are provided by wxTextEntry for the native impl. - -#if wxOSX_USE_COCOA - virtual void Popup(); - virtual void Dismiss(); -#endif // wxOSX_USE_COCOA - - - // osx specific event handling common for all osx-ports - - virtual bool OSXHandleClicked( double timestampsec ); - -#if wxOSX_USE_COCOA - wxComboWidgetImpl* GetComboPeer() const; -#endif -protected: - // List functions - virtual void DoDeleteOneItem(unsigned int n); - virtual void DoClear(); - - // wxTextEntry functions - virtual wxWindow *GetEditableWindow() { return this; } - - // override the base class virtuals involved in geometry calculations - virtual wxSize DoGetBestSize() const; - - virtual int DoInsertItems(const wxArrayStringsAdapter& items, - unsigned int pos, - void **clientData, wxClientDataType type); - - virtual void DoSetItemClientData(unsigned int n, void* clientData); - virtual void * DoGetItemClientData(unsigned int n) const; - - - virtual void EnableTextChangedEvents(bool enable); - - // the subcontrols - wxComboBoxText* m_text; - wxComboBoxChoice* m_choice; - - wxComboBoxDataArray m_datas; -}; - -#endif // _WX_COMBOBOX_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/config_xcode.h b/Externals/wxWidgets3/include/wx/osx/config_xcode.h deleted file mode 100644 index ca0619bc78..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/config_xcode.h +++ /dev/null @@ -1,151 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/config_xcode.h -// Purpose: configurations for xcode builds -// Author: Stefan Csomor -// Modified by: -// Created: 29.04.04 -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// from config.log confdefs - -#define HAVE_SSIZE_T 1 -#define STDC_HEADERS 1 -#ifdef __BIG_ENDIAN__ -#define WORDS_BIGENDIAN 1 -#endif -#define wxUSE_UNIX 1 -#define __UNIX__ 1 -#define __BSD__ 1 -#define __DARWIN__ 1 -#define wx_USE_NANOX 0 - -#define HAVE_EXPLICIT 1 -#define HAVE_VA_COPY 1 -#define HAVE_VARIADIC_MACROS 1 -#define HAVE_STD_WSTRING 1 -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 -#if __GNUC__ > 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ >= 2 ) - #if !defined(__has_include) - #define HAVE_TR1_UNORDERED_MAP 1 - #define HAVE_TR1_UNORDERED_SET 1 - #define HAVE_TR1_TYPE_TRAITS 1 - #endif - #define HAVE_GCC_ATOMIC_BUILTINS 1 -#endif -#endif -#define HAVE_VISIBILITY 1 -#define wxHAVE_PTHREAD_CLEANUP 1 -#define CONST_COMPATIBILITY 0 -#define WX_TIMEZONE timezone -#define WX_SOCKLEN_T socklen_t -#define SOCKOPTLEN_T socklen_t -#define WX_STATFS_T struct statfs -#define wxTYPE_SA_HANDLER int -#define WX_GMTOFF_IN_TM 1 -#define HAVE_PW_GECOS 1 -#define HAVE_DLOPEN 1 -#define HAVE_CXA_DEMANGLE 1 -#define HAVE_GETTIMEOFDAY 1 -#define HAVE_FSYNC 1 -#define HAVE_ROUND 1 -#define HAVE_SCHED_YIELD 1 -#define HAVE_PTHREAD_MUTEXATTR_T 1 -#define HAVE_PTHREAD_MUTEXATTR_SETTYPE_DECL 1 -#define HAVE_PTHREAD_CANCEL 1 -#define HAVE_PTHREAD_ATTR_SETSTACKSIZE 1 -#define HAVE_SNPRINTF 1 -#define HAVE_SNPRINTF_DECL 1 -#define HAVE_UNIX98_PRINTF 1 -#define HAVE_STATFS 1 -#define HAVE_STATFS_DECL 1 -#define HAVE_STRPTIME 1 -#define HAVE_STRPTIME_DECL 1 -#define HAVE_STRTOULL 1 -#define HAVE_THREAD_PRIORITY_FUNCTIONS 1 -#define HAVE_VSNPRINTF 1 -#define HAVE_VSNPRINTF_DECL 1 -#define HAVE_VSSCANF 1 -#define HAVE_VSSCANF_DECL 1 -#define HAVE_USLEEP 1 -#define HAVE_WCSLEN 1 -#define SIZEOF_WCHAR_T 4 -#define SIZEOF_SHORT 2 -#define SIZEOF_INT 4 -#ifdef __LP64__ -#define SIZEOF_VOID_P 8 -#define SIZEOF_LONG 8 -#define SIZEOF_SIZE_T 8 -#else -#define SIZEOF_VOID_P 4 -#define SIZEOF_LONG 4 -#define SIZEOF_SIZE_T 4 -#endif -#define SIZEOF_LONG_LONG 8 -#define wxSIZE_T_IS_ULONG 1 -#define wxWCHAR_T_IS_REAL_TYPE 1 -#define HAVE_DLERROR 1 -#define HAVE_FCNTL 1 -#define HAVE_GETHOSTBYNAME 1 -#define HAVE_GETSERVBYNAME 1 -#define HAVE_GMTIME_R 1 -#define HAVE_INET_ADDR 1 -#define HAVE_INET_ATON 1 -#define HAVE_LOCALTIME_R 1 -#define HAVE_MKSTEMP 1 -#define HAVE_SETENV 1 -/* #define HAVE_PUTENV 1 */ -#define HAVE_STRTOK_R 1 -#define HAVE_UNAME 1 -#define HAVE_USLEEP 1 -#define HAVE_X11_XKBLIB_H 1 -#define HAVE_SCHED_H 1 -#define HAVE_UNISTD_H 1 -#define HAVE_WCHAR_H 1 -/* better to use the built-in CF conversions, also avoid iconv versioning problems */ -/* #undef HAVE_ICONV */ -#define ICONV_CONST -#define HAVE_LANGINFO_H 1 -#define HAVE_WCSRTOMBS 1 -#define HAVE_FPUTWS 1 -#define HAVE_WPRINTF 1 -#define HAVE_VSWPRINTF 1 -#define HAVE_VSWSCANF 1 -#define HAVE_FSEEKO 1 -#define HAVE_SYS_SELECT_H 1 -#define HAVE_FDOPEN 1 -#define HAVE_SYSCONF 1 -#define HAVE_GETPWUID_R 1 -#define HAVE_GETGRGID_R 1 -#define HAVE_LOCALE_T 1 -#define wxHAS_KQUEUE 1 - -#define PACKAGE_BUGREPORT "wx-dev@googlegroups.com" -#define PACKAGE_NAME "wxWidgets" -#define PACKAGE_STRING "wxWidgets 3.1.1" -#define PACKAGE_TARNAME "wxwidgets" -#define PACKAGE_VERSION "3.1.1" - -// for regex -#define WX_NO_REGEX_ADVANCED 1 - -// for jpeg - -#define HAVE_STDLIB_H 1 - -// OBSOLETE ? - -#define HAVE_COS 1 -#define HAVE_FLOOR 1 -#define HAVE_INTTYPES_H 1 -#define HAVE_MEMORY_H 1 - -#define HAVE_REGCOMP 1 -#define HAVE_STRINGS_H 1 -#define HAVE_STRING_H 1 -#define HAVE_SYS_STAT_H 1 -#define HAVE_SYS_TYPES_H 1 -#define HAVE_X11_XLIB_H 1 -#define SOCKLEN_T socklen_t -#define _FILE_OFFSET_BITS 64 diff --git a/Externals/wxWidgets3/include/wx/osx/control.h b/Externals/wxWidgets3/include/wx/osx/control.h deleted file mode 100644 index 6e667fdd24..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/control.h +++ /dev/null @@ -1,51 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/control.h -// Purpose: wxControl class -// Author: Stefan Csomor -// Modified by: -// Created: 1998-01-01 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_CONTROL_H_ -#define _WX_CONTROL_H_ - -WXDLLIMPEXP_DATA_CORE(extern const char) wxControlNameStr[]; - -// General item class -class WXDLLIMPEXP_CORE wxControl : public wxControlBase -{ - wxDECLARE_ABSTRACT_CLASS(wxControl); - -public: - wxControl(); - wxControl(wxWindow *parent, wxWindowID winid, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxControlNameStr) - { - Create(parent, winid, pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, wxWindowID winid, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxControlNameStr); - - // Simulates an event - virtual void Command(wxCommandEvent& event) { ProcessCommand(event); } - - // implementation from now on - // -------------------------- - - // Calls the callback and appropriate event handlers - bool ProcessCommand(wxCommandEvent& event); - - void OnKeyDown( wxKeyEvent &event ) ; -}; - -#endif - // _WX_CONTROL_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/core/cfdataref.h b/Externals/wxWidgets3/include/wx/osx/core/cfdataref.h deleted file mode 100644 index 6c604cd069..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/core/cfdataref.h +++ /dev/null @@ -1,96 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/core/cfdataref.h -// Purpose: wxCFDataRef class -// Author: Stefan Csomor -// Modified by: -// Created: 2007/05/10 -// Copyright: (c) 2007 Stefan Csomor -// Licence: wxWindows licence -// Notes: See http://developer.apple.com/documentation/CoreFoundation/Conceptual/CFBinaryData/index.html -///////////////////////////////////////////////////////////////////////////// -/*! @header wx/osx/core/cfdataref.h - @abstract wxCFDataRef template class -*/ - -#ifndef _WX_MAC_COREFOUNDATION_CFDATAREF_H__ -#define _WX_MAC_COREFOUNDATION_CFDATAREF_H__ - -#include "wx/osx/core/cfref.h" - -#include - -/*! @class wxCFDataRef - @discussion Properly retains/releases reference to CoreFoundation data objects -*/ -class wxCFDataRef : public wxCFRef< CFDataRef > -{ -public: - /*! @method wxCFDataRef - @abstract Creates a NULL data ref - */ - wxCFDataRef() - {} - - typedef wxCFRef super_type; - - /*! @method wxCFDataRef - @abstract Assumes ownership of p and creates a reference to it. - @templatefield otherType Any type. - @param p The raw pointer to assume ownership of. May be NULL. - @discussion Like shared_ptr, it is assumed that the caller has a strong reference to p and intends - to transfer ownership of that reference to this ref holder. If the object comes from - a Create or Copy method then this is the correct behaviour. If the object comes from - a Get method then you must CFRetain it yourself before passing it to this constructor. - A handy way to do this is to use the non-member wxCFRefFromGet factory funcion. - This method is templated and takes an otherType *p. This prevents implicit conversion - using an operator refType() in a different ref-holding class type. - */ - explicit wxCFDataRef(CFDataRef r) - : super_type(r) - {} - - /*! @method wxCFDataRef - @abstract Copies a ref holder of the same type - @param otherRef The other ref holder to copy. - @discussion Ownership will be shared by the original ref and the newly created ref. That is, - the object will be explicitly retained by this new ref. - */ - wxCFDataRef(const wxCFDataRef& otherRef) - : super_type( otherRef ) - {} - - /*! @method wxCFDataRef - @abstract Copies raw data into a data ref - @param data The raw data. - @param length The data length. - */ - wxCFDataRef(const UInt8* data, CFIndex length) - : super_type(CFDataCreate(kCFAllocatorDefault, data, length)) - { - } - - /*! @method GetLength - @abstract returns the length in bytes of the data stored - */ - CFIndex GetLength() const - { - if ( m_ptr ) - return CFDataGetLength( *this ); - else - return 0; - } - - /*! @method GetBytes - @abstract Copies the data into an external buffer - @param range The desired range. - @param buffer The target buffer. - */ - void GetBytes( CFRange range, UInt8 *buffer ) const - { - if ( m_ptr ) - CFDataGetBytes(m_ptr, range, buffer); - } -}; - -#endif //ifndef _WX_MAC_COREFOUNDATION_CFDATAREF_H__ - diff --git a/Externals/wxWidgets3/include/wx/osx/core/cfref.h b/Externals/wxWidgets3/include/wx/osx/core/cfref.h deleted file mode 100644 index c4a6b3c17a..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/core/cfref.h +++ /dev/null @@ -1,400 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/core/cfref.h -// Purpose: wxCFRef template class -// Author: David Elliott -// Modified by: Stefan Csomor -// Created: 2007/05/10 -// Copyright: (c) 2007 David Elliott , Stefan Csomor -// Licence: wxWindows licence -// Notes: See http://developer.apple.com/documentation/CoreFoundation/Conceptual/CFMemoryMgmt/index.html -///////////////////////////////////////////////////////////////////////////// -/*! @header wx/osx/core/cfref.h - @abstract wxCFRef template class - @discussion FIXME: Convert doc tags to something less buggy with C++ -*/ - -#ifndef _WX_MAC_COREFOUNDATION_CFREF_H__ -#define _WX_MAC_COREFOUNDATION_CFREF_H__ - -// Include unistd to ensure that NULL is defined -#include -// Include AvailabilityMacros for DEPRECATED_ATTRIBUTE -#include - -// #include -/* Don't include CFBase.h such that this header can be included from public - * headers with minimal namespace pollution. - * Note that Darwin CF uses extern for CF_EXPORT. If we need this on Win32 - * or non-Darwin Mac OS we'll need to define the appropriate __declspec. - */ -typedef const void *CFTypeRef; -extern "C" { -extern /* CF_EXPORT */ -CFTypeRef CFRetain(CFTypeRef cf); -extern /* CF_EXPORT */ -void CFRelease(CFTypeRef cf); -} // extern "C" - - -/*! @function wxCFRelease - @abstract A CFRelease variant that checks for NULL before releasing. - @discussion The parameter is template not for type safety but to ensure the argument - is a raw pointer and not a ref holder of any type. -*/ -template -inline void wxCFRelease(Type *r) -{ - if ( r != NULL ) - ::CFRelease((CFTypeRef)r); -} - -/*! @function wxCFRetain - @abstract A typesafe CFRetain variant that checks for NULL. -*/ -template -inline Type* wxCFRetain(Type *r) -{ - // NOTE(DE): Setting r to the result of CFRetain improves efficiency on both x86 and PPC - // Casting r to CFTypeRef ensures we are calling the real C version defined in CFBase.h - // and not any possibly templated/overloaded CFRetain. - if ( r != NULL ) - r = (Type*)::CFRetain((CFTypeRef)r); - return r; -} - -template -class wxCFRef; - -/*! @class wxCFWeakRef - @templatefield refType The CF reference type (e.g. CFStringRef, CFRunLoopRef, etc.) - It should already be a pointer. This is different from - shared_ptr where the template parameter is the pointee type. - @discussion Wraps a raw pointer without any retain or release. - Provides a way to get what amounts to a raw pointer from a wxCFRef without - using a raw pointer. Unlike a raw pointer, constructing a wxCFRef from this - class will cause it to be retained because it is assumed that a wxCFWeakRef - does not own its pointer. -*/ -template -class wxCFWeakRef -{ - template - friend wxCFWeakRef static_cfref_cast(const wxCFRef &otherRef); -public: - /*! @method wxCFWeakRef - @abstract Creates a NULL reference - */ - wxCFWeakRef() - : m_ptr(NULL) - {} - - // Default copy constructor is fine. - // Default destructor is fine but we'll set NULL to avoid bugs - ~wxCFWeakRef() - { m_ptr = NULL; } - - // Do not implement a raw-pointer constructor. - - /*! @method wxCFWeakRef - @abstract Copies another ref holder where its type can be converted to ours - @templatefield otherRefType Any type held by another wxCFWeakRef. - @param otherRef The other weak ref holder to copy. - @discussion This is merely a copy or implicit cast. - */ - template - wxCFWeakRef(const wxCFWeakRef& otherRef) - : m_ptr(otherRef.get()) // Implicit conversion from otherRefType to refType should occur - {} - - /*! @method wxCFWeakRef - @abstract Copies a strong ref holder where its type can be converted to ours - @templatefield otherRefType Any type held by a wxCFRef. - @param otherRef The strong ref holder to copy. - @discussion This ref is merely a pointer copy, the strong ref still holds the pointer. - */ - template - wxCFWeakRef(const wxCFRef& otherRef) - : m_ptr(otherRef.get()) // Implicit conversion from otherRefType to refType should occur - {} - - /*! @method get - @abstract Explicit conversion to the underlying pointer type - @discussion Allows the caller to explicitly get the underlying pointer. - */ - refType get() const - { return m_ptr; } - - /*! @method operator refType - @abstract Implicit conversion to the underlying pointer type - @discussion Allows the ref to be used in CF function calls. - */ - operator refType() const - { return m_ptr; } - -protected: - /*! @method wxCFWeakRef - @abstract Constructs a weak reference to the raw pointer - @templatefield otherType Any type. - @param p The raw pointer to assume ownership of. May be NULL. - @discussion This method is private so that the friend static_cfref_cast can use it - */ - template - explicit wxCFWeakRef(otherType *p) - : m_ptr(p) // Implicit conversion from otherType* to refType should occur. - {} - - /*! @var m_ptr The raw pointer. - */ - refType m_ptr; -}; - -/*! @class wxCFRef - @templatefield refType The CF reference type (e.g. CFStringRef, CFRunLoopRef, etc.) - It should already be a pointer. This is different from - shared_ptr where the template parameter is the pointee type. - @discussion Properly retains/releases reference to CoreFoundation objects -*/ -template -class wxCFRef -{ -public: - /*! @method wxCFRef - @abstract Creates a NULL reference - */ - wxCFRef() - : m_ptr(NULL) - {} - - /*! @method wxCFRef - @abstract Assumes ownership of p and creates a reference to it. - @templatefield otherType Any type. - @param p The raw pointer to assume ownership of. May be NULL. - @discussion Like shared_ptr, it is assumed that the caller has a strong reference to p and intends - to transfer ownership of that reference to this ref holder. If the object comes from - a Create or Copy method then this is the correct behaviour. If the object comes from - a Get method then you must CFRetain it yourself before passing it to this constructor. - A handy way to do this is to use the non-member wxCFRefFromGet factory funcion. - This method is templated and takes an otherType *p. This prevents implicit conversion - using an operator refType() in a different ref-holding class type. - */ - template - explicit wxCFRef(otherType *p) - : m_ptr(p) // Implicit conversion from otherType* to refType should occur. - {} - - /*! @method wxCFRef - @abstract Copies a ref holder of the same type - @param otherRef The other ref holder to copy. - @discussion Ownership will be shared by the original ref and the newly created ref. That is, - the object will be explicitly retained by this new ref. - */ - wxCFRef(const wxCFRef& otherRef) - : m_ptr(wxCFRetain(otherRef.m_ptr)) - {} - - /*! @method wxCFRef - @abstract Copies a ref holder where its type can be converted to ours - @templatefield otherRefType Any type held by another wxCFRef. - @param otherRef The other ref holder to copy. - @discussion Ownership will be shared by the original ref and the newly created ref. That is, - the object will be explicitly retained by this new ref. - */ - template - wxCFRef(const wxCFRef& otherRef) - : m_ptr(wxCFRetain(otherRef.get())) // Implicit conversion from otherRefType to refType should occur - {} - - /*! @method wxCFRef - @abstract Copies a weak ref holder where its type can be converted to ours - @templatefield otherRefType Any type held by a wxCFWeakRef. - @param otherRef The weak ref holder to copy. - @discussion Ownership will be taken by this newly created ref. That is, - the object will be explicitly retained by this new ref. - Ownership is most likely shared with some other ref as well. - */ - template - wxCFRef(const wxCFWeakRef& otherRef) - : m_ptr(wxCFRetain(otherRef.get())) // Implicit conversion from otherRefType to refType should occur - {} - - /*! @method ~wxCFRef - @abstract Releases (potentially shared) ownership of the ref. - @discussion A ref holder instance is always assumed to have ownership so ownership is always - released (CFRelease called) upon destruction. - */ - ~wxCFRef() - { reset(); } - - /*! @method operator= - @abstract Assigns the other ref's pointer to us when the otherRef is the same type. - @param otherRef The other ref holder to copy. - @discussion The incoming pointer is retained, the original pointer is released, and this object - is made to point to the new pointer. - */ - wxCFRef& operator=(const wxCFRef& otherRef) - { - if (this != &otherRef) - { - wxCFRetain(otherRef.m_ptr); - wxCFRelease(m_ptr); - m_ptr = otherRef.m_ptr; - } - return *this; - } - - /*! @method operator= - @abstract Assigns the other ref's pointer to us when the other ref can be converted to our type. - @templatefield otherRefType Any type held by another wxCFRef - @param otherRef The other ref holder to copy. - @discussion The incoming pointer is retained, the original pointer is released, and this object - is made to point to the new pointer. - */ - template - wxCFRef& operator=(const wxCFRef& otherRef) - { - wxCFRetain(otherRef.get()); - wxCFRelease(m_ptr); - m_ptr = otherRef.get(); // Implicit conversion from otherRefType to refType should occur - return *this; - } - - /*! @method get - @abstract Explicit conversion to the underlying pointer type - @discussion Allows the caller to explicitly get the underlying pointer. - */ - refType get() const - { return m_ptr; } - - /*! @method operator refType - @abstract Implicit conversion to the underlying pointer type - @discussion Allows the ref to be used in CF function calls. - */ - operator refType() const - { return m_ptr; } - -#if 0 - < // HeaderDoc is retarded and thinks the GT from operator-> is part of a template param. - // So give it that < outside of a comment to fake it out. (if 0 is not a comment to HeaderDoc) -#endif - - /*! @method operator-> - @abstract Implicit conversion to the underlying pointer type - @discussion This is nearly useless for CF types which are nearly always opaque - */ - refType operator-> () const - { return m_ptr; } - - /*! @method reset - @abstract Nullifies the reference - @discussion Releases ownership (calls CFRelease) before nullifying the pointer. - */ - void reset() - { - wxCFRelease(m_ptr); - m_ptr = NULL; - } - - /*! @method reset - @abstract Sets this to a new reference - @templatefield otherType Any type. - @param p The raw pointer to assume ownership of - @discussion The existing reference is released (like destruction). It is assumed that the caller - has a strong reference to the new p and intends to transfer ownership of that reference - to this ref holder. Take care to call CFRetain if you received the object from a Get method. - This method is templated and takes an otherType *p. This prevents implicit conversion - using an operator refType() in a different ref-holding class type. - */ - template - void reset(otherType* p) - { - wxCFRelease(m_ptr); - m_ptr = p; // Automatic conversion should occur - } - - // Release the pointer, i.e. give up its ownership. - refType release() - { - refType p = m_ptr; - m_ptr = NULL; - return p; - } - -protected: - /*! @var m_ptr The raw pointer. - */ - refType m_ptr; -}; - -/*! @function wxCFRefFromGet - @abstract Factory function to create wxCFRef from a raw pointer obtained from a Get-rule function - @param p The pointer to retain and create a wxCFRef from. May be NULL. - @discussion Unlike the wxCFRef raw pointer constructor, this function explicitly retains its - argument. This can be used for functions such as CFDictionaryGetValue() or - CFAttributedStringGetString() which return a temporary reference (Get-rule functions). - FIXME: Anybody got a better name? -*/ -template -inline wxCFRef wxCFRefFromGet(Type *p) -{ - return wxCFRef(wxCFRetain(p)); -} - -/*! @function static_cfref_cast - @abstract Works like static_cast but with a wxCFRef as the argument. - @param refType Template parameter. The destination raw pointer type - @param otherRef Normal parameter. The source wxCFRef<> object. - @discussion This is intended to be a clever way to make static_cast work while allowing - the return value to be converted to either a strong ref or a raw pointer - while ensuring that the retain count is updated appropriately. - - This is modeled after shared_ptr's static_pointer_cast. Just as wxCFRef is - parameterized on a pointer to an opaque type so is this class. Note that - this differs from shared_ptr which is parameterized on the pointee type. - - FIXME: Anybody got a better name? -*/ -template -inline wxCFWeakRef static_cfref_cast(const wxCFRef &otherRef); - -template -inline wxCFWeakRef static_cfref_cast(const wxCFRef &otherRef) -{ - return wxCFWeakRef(static_cast(otherRef.get())); -} - -/*! @function CFRelease - @abstract Overloads CFRelease so that the user is warned of bad behaviour. - @discussion It is rarely appropriate to retain or release a wxCFRef. If one absolutely - must do it he can explicitly get() the raw pointer - Normally, this function is unimplemented resulting in a linker error if used. -*/ -template -inline void CFRelease(const wxCFRef & cfref) DEPRECATED_ATTRIBUTE; - -/*! @function CFRetain - @abstract Overloads CFRetain so that the user is warned of bad behaviour. - @discussion It is rarely appropriate to retain or release a wxCFRef. If one absolutely - must do it he can explicitly get() the raw pointer - Normally, this function is unimplemented resulting in a linker error if used. -*/ -template -inline void CFRetain(const wxCFRef& cfref) DEPRECATED_ATTRIBUTE; - -// Change the 0 to a 1 if you want the functions to work (no link errors) -// Neither function will cause retain/release side-effects if implemented. -#if 0 -template -void CFRelease(const wxCFRef & cfref) -{ - CFRelease(cfref.get()); -} - -template -void CFRetain(const wxCFRef & cfref) -{ - CFRetain(cfref.get()); -} -#endif - -#endif //ndef _WX_MAC_COREFOUNDATION_CFREF_H__ - diff --git a/Externals/wxWidgets3/include/wx/osx/core/cfstring.h b/Externals/wxWidgets3/include/wx/osx/core/cfstring.h deleted file mode 100644 index 8b939a29a6..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/core/cfstring.h +++ /dev/null @@ -1,100 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/core/cfstring.h -// Purpose: wxCFStringRef and other string functions -// Author: Stefan Csomor -// Modified by: -// Created: 2004-10-29 (from code in wx/mac/carbon/private.h) -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -// Usage: Darwin (base library) -///////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_CFSTRINGHOLDER_H__ -#define __WX_CFSTRINGHOLDER_H__ - -#include - -#include "wx/dlimpexp.h" -#include "wx/fontenc.h" -#include "wx/osx/core/cfref.h" - -#ifdef WORDS_BIGENDIAN - #define kCFStringEncodingUTF32Native kCFStringEncodingUTF32BE -#else - #define kCFStringEncodingUTF32Native kCFStringEncodingUTF32LE -#endif - -class WXDLLIMPEXP_FWD_BASE wxString; - -WXDLLIMPEXP_BASE void wxMacConvertNewlines13To10( wxString *data ) ; -WXDLLIMPEXP_BASE void wxMacConvertNewlines10To13( wxString *data ) ; - -WXDLLIMPEXP_BASE void wxMacConvertNewlines13To10( char * data ) ; -WXDLLIMPEXP_BASE void wxMacConvertNewlines10To13( char * data ) ; - -WXDLLIMPEXP_BASE wxUint32 wxMacGetSystemEncFromFontEnc(wxFontEncoding encoding) ; -WXDLLIMPEXP_BASE wxFontEncoding wxMacGetFontEncFromSystemEnc(wxUint32 encoding) ; -WXDLLIMPEXP_BASE void wxMacWakeUp() ; - -class WXDLLIMPEXP_BASE wxCFStringRef : public wxCFRef< CFStringRef > -{ -public: - wxCFStringRef() - { - } - - wxCFStringRef(const wxString &str, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT) ; - -#ifdef __WXMAC__ - wxCFStringRef(NSString* ref) - : wxCFRef< CFStringRef >((CFStringRef) ref) - { - } -#endif - - wxCFStringRef(CFStringRef ref) - : wxCFRef< CFStringRef >(ref) - { - } - - wxCFStringRef(const wxCFStringRef& otherRef ) - : wxCFRef< CFStringRef >(otherRef) - { - } - - ~wxCFStringRef() - { - } - - wxString AsString( wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) const; - - static wxString AsString( CFStringRef ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ; - static wxString AsStringWithNormalizationFormC( CFStringRef ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ; -#ifdef __WXMAC__ - static wxString AsString( NSString* ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ; - static wxString AsStringWithNormalizationFormC( NSString* ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ; - - NSString* AsNSString() const { return (NSString*)(CFStringRef) *this; } -#endif -private: -} ; - -// corresponding class for holding UniChars (native unicode characters) - -class WXDLLIMPEXP_BASE wxMacUniCharBuffer -{ -public : - wxMacUniCharBuffer( const wxString &str ) ; - - ~wxMacUniCharBuffer() ; - - UniCharPtr GetBuffer() ; - - UniCharCount GetChars() ; - -private : - UniCharPtr m_ubuf ; - UniCharCount m_chars ; -}; -#endif //__WXCFSTRINGHOLDER_H__ diff --git a/Externals/wxWidgets3/include/wx/osx/core/colour.h b/Externals/wxWidgets3/include/wx/osx/core/colour.h deleted file mode 100644 index ff41bcb5dd..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/core/colour.h +++ /dev/null @@ -1,88 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/core/colour.h -// Purpose: wxColour class -// Author: Stefan Csomor -// Modified by: -// Created: 1998-01-01 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_COLOUR_H_ -#define _WX_COLOUR_H_ - -#include "wx/object.h" -#include "wx/string.h" - -#include "wx/osx/core/cfref.h" - -struct RGBColor; - -// Colour -class WXDLLIMPEXP_CORE wxColour: public wxColourBase -{ -public: - // constructors - // ------------ - DEFINE_STD_WXCOLOUR_CONSTRUCTORS - - // default copy ctor and dtor are ok - - // accessors - virtual bool IsOk() const { return m_cgColour != NULL; } - - virtual WXDLLIMPEXP_INLINE_CORE ChannelType Red() const { return m_red; } - virtual WXDLLIMPEXP_INLINE_CORE ChannelType Green() const { return m_green; } - virtual WXDLLIMPEXP_INLINE_CORE ChannelType Blue() const { return m_blue; } - virtual WXDLLIMPEXP_INLINE_CORE ChannelType Alpha() const { return m_alpha; } - - // comparison - bool operator == (const wxColour& colour) const; - - bool operator != (const wxColour& colour) const { return !(*this == colour); } - - CGColorRef GetPixel() const { return m_cgColour; } - - CGColorRef GetCGColor() const { return m_cgColour; } - CGColorRef CreateCGColor() const { return wxCFRetain( (CGColorRef)m_cgColour ); } - -#if wxOSX_USE_COCOA_OR_CARBON - void GetRGBColor( RGBColor *col ) const; -#endif - - // Mac-specific ctor and assignment operator from the native colour - // assumes ownership of CGColorRef - wxColour( CGColorRef col ); -#if wxOSX_USE_COCOA_OR_CARBON - wxColour(const RGBColor& col); - wxColour& operator=(const RGBColor& col); -#endif -#if wxOSX_USE_COCOA - // This ctor does not take ownership of the color. - explicit wxColour(WX_NSColor color); - WX_NSColor OSXGetNSColor() const; -#endif - wxColour& operator=(CGColorRef col); - wxColour& operator=(const wxColour& col); - -protected : - virtual void - InitRGBA(ChannelType r, ChannelType g, ChannelType b, ChannelType a); -#if wxOSX_USE_COCOA_OR_CARBON - void InitRGBColor( const RGBColor& col ); -#endif - void InitCGColorRef( CGColorRef col ); - -private: - wxCFRef m_cgColour; - - ChannelType m_red; - ChannelType m_blue; - ChannelType m_green; - ChannelType m_alpha; - - wxDECLARE_DYNAMIC_CLASS(wxColour); -}; - -#endif - // _WX_COLOUR_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/core/dataview.h b/Externals/wxWidgets3/include/wx/osx/core/dataview.h deleted file mode 100644 index 440be5e8e0..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/core/dataview.h +++ /dev/null @@ -1,113 +0,0 @@ - -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/core/dataview.h -// Purpose: wxDataViewCtrl native implementation header for OSX -// Author: -// Copyright: (c) 2009 -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DATAVIEWCTRL_CORE_H_ -#define _WX_DATAVIEWCTRL_CORE_H_ - -#include "wx/dataview.h" - -typedef wxWidgetImpl wxWidgetImplType; - -// --------------------------------------------------------- -// Helper functions for dataview implementation on OSX -// --------------------------------------------------------- -wxWidgetImplType* CreateDataView(wxWindowMac* wxpeer, wxWindowMac* parent, wxWindowID id, - wxPoint const& pos, wxSize const& size, - long style, long extraStyle); -wxString ConcatenateDataViewItemValues(wxDataViewCtrl const* dataViewCtrlPtr, wxDataViewItem const& dataViewItem); // concatenates all data of the visible columns of the passed control - // and item TAB separated into a string and returns it - -// --------------------------------------------------------- -// wxDataViewWidgetImpl -// Common interface of the native dataview implementation -// for the carbon and cocoa environment. -// ATTENTION -// All methods assume that the passed column pointers are -// valid (unless a NULL pointer is explicitly allowed -// to be passed)! -// ATTENTION -// --------------------------------------------------------- -class WXDLLIMPEXP_CORE wxDataViewWidgetImpl -{ -public: - // - // constructors / destructor - // - virtual ~wxDataViewWidgetImpl(void) - { - } - - // - // column related methods - // - virtual bool ClearColumns (void) = 0; // deletes all columns in the native control - virtual bool DeleteColumn (wxDataViewColumn* columnPtr) = 0; // deletes the column in the native control - virtual void DoSetExpanderColumn(wxDataViewColumn const* columnPtr) = 0; // sets the disclosure column in the native control - virtual wxDataViewColumn* GetColumn (unsigned int pos) const = 0; // returns the column belonging to 'pos' in the native control - virtual int GetColumnPosition (wxDataViewColumn const* columnPtr) const = 0; // returns the position of the passed column in the native control - virtual bool InsertColumn (unsigned int pos, wxDataViewColumn* columnPtr) = 0; // inserts a column at pos in the native control; - // the method can assume that the column's owner is already set - virtual void FitColumnWidthToContent(unsigned int pos) = 0; // resizes column to fit its content - - // - // item related methods - // - virtual bool Add (wxDataViewItem const& parent, wxDataViewItem const& item) = 0; // adds an item to the native control - virtual bool Add (wxDataViewItem const& parent, wxDataViewItemArray const& itesm) = 0; // adds a items to the native control - virtual void Collapse (wxDataViewItem const& item) = 0; // collapses the passed item in the native control - virtual void EnsureVisible(wxDataViewItem const& item, wxDataViewColumn const* columnPtr) = 0; // ensures that the passed item's value in the passed column is visible (column pointer can be NULL) - virtual void Expand (wxDataViewItem const& item) = 0; // expands the passed item in the native control - virtual unsigned int GetCount (void) const = 0; // returns the number of items in the native control - virtual wxRect GetRectangle (wxDataViewItem const& item, wxDataViewColumn const* columnPtr) = 0; // returns the rectangle that is used by the passed item and column in the native control - virtual bool IsExpanded (wxDataViewItem const& item) const = 0; // checks if the passed item is expanded in the native control - virtual bool Reload (void) = 0; // clears the native control and reloads all data - virtual bool Remove (wxDataViewItem const& parent, wxDataViewItem const& item) = 0; // removes an item from the native control - virtual bool Remove (wxDataViewItem const& parent, wxDataViewItemArray const& item) = 0; // removes items from the native control - virtual bool Update (wxDataViewColumn const* columnPtr) = 0; // updates the items in the passed column of the native control - virtual bool Update (wxDataViewItem const& parent, wxDataViewItem const& item) = 0; // updates the passed item in the native control - virtual bool Update (wxDataViewItem const& parent, wxDataViewItemArray const& items) = 0; // updates the passed items in the native control - - // - // model related methods - // - virtual bool AssociateModel(wxDataViewModel* model) = 0; // informs the native control that a model is present - - // - // selection related methods - // - virtual wxDataViewItem GetCurrentItem() const = 0; - virtual void SetCurrentItem(const wxDataViewItem& item) = 0; - - virtual wxDataViewColumn *GetCurrentColumn() const = 0; - - virtual int GetSelectedItemsCount() const = 0; - virtual int GetSelections(wxDataViewItemArray& sel) const = 0; // returns all selected items in the native control - virtual bool IsSelected (wxDataViewItem const& item) const = 0; // checks if the passed item is selected in the native control - virtual void Select (wxDataViewItem const& item) = 0; // selects the passed item in the native control - virtual void SelectAll (void) = 0; // selects all items in the native control - virtual void Unselect (wxDataViewItem const& item) = 0; // unselects the passed item in the native control - virtual void UnselectAll (void) = 0; // unselects all items in the native control - - // - // sorting related methods - // - virtual wxDataViewColumn* GetSortingColumn (void) const = 0; // returns the column that is primarily responsible for sorting in the native control - virtual void Resort (void) = 0; // asks the native control to start a resorting process - - // - // other methods - // - virtual void DoSetIndent (int indent) = 0; // sets the indention in the native control - virtual void HitTest (wxPoint const& point, wxDataViewItem& item, wxDataViewColumn*& columnPtr) const = 0; // return the item and column pointer that contains with the passed point - virtual void SetRowHeight(wxDataViewItem const& item, unsigned int height) = 0; // sets the height of the row containg the passed item in the native control - virtual void OnSize (void) = 0; // updates the layout of the native control after a size event - virtual void StartEditor( const wxDataViewItem & item, unsigned int column ) = 0; // starts editing the passed in item and column -}; - -#endif // _WX_DATAVIEWCTRL_CORE_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/core/evtloop.h b/Externals/wxWidgets3/include/wx/osx/core/evtloop.h deleted file mode 100644 index 7c4f189fdf..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/core/evtloop.h +++ /dev/null @@ -1,118 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/core/evtloop.h -// Purpose: CoreFoundation-based event loop -// Author: Vadim Zeitlin -// Modified by: -// Created: 2006-01-12 -// Copyright: (c) 2006 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_OSX_CORE_EVTLOOP_H_ -#define _WX_OSX_CORE_EVTLOOP_H_ - -DECLARE_WXOSX_OPAQUE_CFREF( CFRunLoop ) -DECLARE_WXOSX_OPAQUE_CFREF( CFRunLoopObserver ) - -class WXDLLIMPEXP_FWD_BASE wxCFEventLoopPauseIdleEvents; - -class WXDLLIMPEXP_BASE wxCFEventLoop : public wxEventLoopBase -{ - friend class wxCFEventLoopPauseIdleEvents; -public: - wxCFEventLoop(); - virtual ~wxCFEventLoop(); - - // sets the "should exit" flag and wakes up the loop so that it terminates - // soon - virtual void ScheduleExit(int rc = 0); - - // return true if any events are available - virtual bool Pending() const; - - // dispatch a single event, return false if we should exit from the loop - virtual bool Dispatch(); - - // same as Dispatch() but doesn't wait for longer than the specified (in - // ms) timeout, return true if an event was processed, false if we should - // exit the loop or -1 if timeout expired - virtual int DispatchTimeout(unsigned long timeout); - - // implement this to wake up the loop: usually done by posting a dummy event - // to it (can be called from non main thread) - virtual void WakeUp(); - - bool ShouldProcessIdleEvents() const { return m_processIdleEvents ; } - -#if wxUSE_UIACTIONSIMULATOR - // notifies Yield and Dispatch to wait for at least one event before - // returning, this is necessary, because the synthesized events need to be - // converted by the OS before being available on the native event queue - void SetShouldWaitForEvent(bool should) { m_shouldWaitForEvent = should; } -#endif -protected: - // enters a loop calling OnNextIteration(), Pending() and Dispatch() and - // terminating when Exit() is called - virtual int DoRun(); - - // may be overridden to perform some action at the start of each new event - // loop iteration - virtual void OnNextIteration() {} - - virtual void DoYieldFor(long eventsToProcess); - - void CommonModeObserverCallBack(CFRunLoopObserverRef observer, int activity); - void DefaultModeObserverCallBack(CFRunLoopObserverRef observer, int activity); - - // set to false to avoid idling at unexpected moments - eg when having native message boxes - void SetProcessIdleEvents(bool process) { m_processIdleEvents = process; } - - static void OSXCommonModeObserverCallBack(CFRunLoopObserverRef observer, int activity, void *info); - static void OSXDefaultModeObserverCallBack(CFRunLoopObserverRef observer, int activity, void *info); - - // get the currently executing CFRunLoop - virtual CFRunLoopRef CFGetCurrentRunLoop() const; - - virtual int DoDispatchTimeout(unsigned long timeout); - - virtual void OSXDoRun(); - virtual void OSXDoStop(); - - // the loop exit code - int m_exitcode; - - // cfrunloop - CFRunLoopRef m_runLoop; - - // common modes runloop observer - CFRunLoopObserverRef m_commonModeRunLoopObserver; - - // default mode runloop observer - CFRunLoopObserverRef m_defaultModeRunLoopObserver; - - // set to false to avoid idling at unexpected moments - eg when having native message boxes - bool m_processIdleEvents; - -#if wxUSE_UIACTIONSIMULATOR - bool m_shouldWaitForEvent; -#endif -private: - // process all already pending events and dispatch a new one (blocking - // until it appears in the event queue if necessary) - // - // returns the return value of DoDispatchTimeout() - int DoProcessEvents(); - - wxDECLARE_NO_COPY_CLASS(wxCFEventLoop); -}; - -class WXDLLIMPEXP_BASE wxCFEventLoopPauseIdleEvents : public wxObject -{ -public: - wxCFEventLoopPauseIdleEvents(); - virtual ~wxCFEventLoopPauseIdleEvents(); -private: - bool m_formerState; -}; - -#endif // _WX_OSX_EVTLOOP_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/core/hid.h b/Externals/wxWidgets3/include/wx/osx/core/hid.h deleted file mode 100644 index 20c1a7ba41..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/core/hid.h +++ /dev/null @@ -1,114 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/core/hid.h -// Purpose: DARWIN HID layer for WX -// Author: Ryan Norton -// Modified by: -// Created: 11/11/2003 -// Copyright: (c) Ryan Norton -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// =========================================================================== -// declarations -// =========================================================================== - -// --------------------------------------------------------------------------- -// headers -// --------------------------------------------------------------------------- - -#ifndef _WX_MACCARBONHID_H_ -#define _WX_MACCARBONHID_H_ - -#include "wx/defs.h" -#include "wx/string.h" - -//Mac OSX only -#ifdef __DARWIN__ - -#include -#include -#include -#include -#include - -//Darn apple - doesn't properly wrap their headers in extern "C"! -//http://www.macosx.com/forums/archive/index.php/t-68069.html -extern "C" { -#include -} - -#include //this actually includes mach_port.h (see above) - -// =========================================================================== -// definitions -// =========================================================================== - - -// --------------------------------------------------------------------------- -// wxHIDDevice -// -// A wrapper around OS X HID Manager procedures. -// The tutorial "Working With HID Class Device Interfaces" Is -// Quite good, as is the sample program associated with it -// (Depite the author's protests!). -// --------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxHIDDevice -{ -public: - wxHIDDevice() : m_ppDevice(NULL), m_ppQueue(NULL), m_pCookies(NULL) {} - - bool Create (int nClass = -1, int nType = -1, int nDev = 1); - - static size_t GetCount(int nClass = -1, int nType = -1); - - void AddCookie(CFTypeRef Data, int i); - void AddCookieInQueue(CFTypeRef Data, int i); - void InitCookies(size_t dwSize, bool bQueue = false); - - //Must be implemented by derived classes - //builds the cookie array - - //first call InitCookies to initialize the cookie - //array, then AddCookie to add a cookie at a certain point in an array - virtual void BuildCookies(CFArrayRef Array) = 0; - - //checks to see whether the cookie at nIndex is active (element value != 0) - bool IsActive(int nIndex); - - //checks to see whether an element in the internal cookie array - //exists - bool HasElement(int nIndex); - - //closes the device and cleans the queue and cookies - virtual ~wxHIDDevice(); - -protected: - IOHIDDeviceInterface** m_ppDevice; //this, essentially - IOHIDQueueInterface** m_ppQueue; //queue (if we want one) - IOHIDElementCookie* m_pCookies; //cookies - - wxString m_szProductName; //product name - int m_nProductId; //product id - int m_nManufacturerId; //manufacturer id - mach_port_t m_pPort; //mach port to use -}; - -// --------------------------------------------------------------------------- -// wxHIDKeyboard -// -// Semi-simple implementation that opens a connection to the first -// keyboard of the machine. Used in wxGetKeyState. -// --------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxHIDKeyboard : public wxHIDDevice -{ -public: - static int GetCount(); - bool Create(int nDev = 1); - void AddCookie(CFTypeRef Data, int i); - virtual void BuildCookies(CFArrayRef Array); - void DoBuildCookies(CFArrayRef Array); -}; - -#endif //__DARWIN__ - -#endif - // _WX_MACCARBONHID_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/core/joystick.h b/Externals/wxWidgets3/include/wx/osx/core/joystick.h deleted file mode 100644 index 51e373821a..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/core/joystick.h +++ /dev/null @@ -1,92 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/core/joystick.h -// Purpose: wxJoystick class -// Author: Ryan Norton -// Modified by: -// Created: 2/13/2005 -// Copyright: (c) Ryan Norton -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_JOYSTICK_H_ -#define _WX_JOYSTICK_H_ - -#include "wx/event.h" - -class WXDLLIMPEXP_FWD_CORE wxJoystickThread; - -class WXDLLIMPEXP_ADV wxJoystick: public wxObject -{ - wxDECLARE_DYNAMIC_CLASS(wxJoystick); - public: - - wxJoystick(int joystick = wxJOYSTICK1); - virtual ~wxJoystick(); - - // Attributes - //////////////////////////////////////////////////////////////////////////// - - wxPoint GetPosition() const; - int GetPosition(unsigned axis) const; - bool GetButtonState(unsigned button) const; - int GetZPosition() const; - int GetButtonState() const; - int GetPOVPosition() const; - int GetPOVCTSPosition() const; - int GetRudderPosition() const; - int GetUPosition() const; - int GetVPosition() const; - int GetMovementThreshold() const; - void SetMovementThreshold(int threshold) ; - - // Capabilities - //////////////////////////////////////////////////////////////////////////// - - bool IsOk() const; // Checks that the joystick is functioning - static int GetNumberJoysticks() ; - int GetManufacturerId() const ; - int GetProductId() const ; - wxString GetProductName() const ; - int GetXMin() const; - int GetYMin() const; - int GetZMin() const; - int GetXMax() const; - int GetYMax() const; - int GetZMax() const; - int GetNumberButtons() const; - int GetNumberAxes() const; - int GetMaxButtons() const; - int GetMaxAxes() const; - int GetPollingMin() const; - int GetPollingMax() const; - int GetRudderMin() const; - int GetRudderMax() const; - int GetUMin() const; - int GetUMax() const; - int GetVMin() const; - int GetVMax() const; - - bool HasRudder() const; - bool HasZ() const; - bool HasU() const; - bool HasV() const; - bool HasPOV() const; - bool HasPOV4Dir() const; - bool HasPOVCTS() const; - - // Operations - //////////////////////////////////////////////////////////////////////////// - - // pollingFreq = 0 means that movement events are sent when above the threshold. - // If pollingFreq > 0, events are received every this many milliseconds. - bool SetCapture(wxWindow* win, int pollingFreq = 0); - bool ReleaseCapture(); - -protected: - int m_joystick; - wxJoystickThread* m_thread; - class wxHIDJoystick* m_hid; -}; - -#endif - // _WX_JOYSTICK_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/core/mimetype.h b/Externals/wxWidgets3/include/wx/osx/core/mimetype.h deleted file mode 100644 index 2a97b3cda6..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/core/mimetype.h +++ /dev/null @@ -1,123 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/core/mimetype.h -// Purpose: Mac implementation for wx mime-related classes -// Author: Neil Perkins -// Modified by: -// Created: 2010-05-15 -// Copyright: (C) 2010 Neil Perkins -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _MIMETYPE_IMPL_H -#define _MIMETYPE_IMPL_H - -#include "wx/defs.h" - -#if wxUSE_MIMETYPE - -#include "wx/mimetype.h" -#include "wx/hashmap.h" -#include "wx/iconloc.h" - - -// This class implements mime type functionality for Mac OS X using UTIs and Launch Services -// Currently only the GetFileTypeFromXXXX public functions have been implemented -class WXDLLIMPEXP_BASE wxMimeTypesManagerImpl -{ -public: - - wxMimeTypesManagerImpl(); - virtual ~wxMimeTypesManagerImpl(); - - // These functions are not needed on Mac OS X and have no-op implementations - void Initialize(int mailcapStyles = wxMAILCAP_STANDARD, const wxString& extraDir = wxEmptyString); - void ClearData(); - - // Functions to look up types by ext, mime or UTI - wxFileType *GetFileTypeFromExtension(const wxString& ext); - wxFileType *GetFileTypeFromMimeType(const wxString& mimeType); - wxFileType *GetFileTypeFromUti(const wxString& uti); - - // These functions are only stubs on Mac OS X - size_t EnumAllFileTypes(wxArrayString& mimetypes); - wxFileType *Associate(const wxFileTypeInfo& ftInfo); - bool Unassociate(wxFileType *ft); - -private: - - // The work of querying the OS for type data is done in these two functions - void LoadTypeDataForUti(const wxString& uti); - void LoadDisplayDataForUti(const wxString& uti); - - // These functions are pass-throughs from wxFileTypeImpl - bool GetExtensions(const wxString& uti, wxArrayString& extensions); - bool GetMimeType(const wxString& uti, wxString *mimeType); - bool GetMimeTypes(const wxString& uti, wxArrayString& mimeTypes); - bool GetIcon(const wxString& uti, wxIconLocation *iconLoc); - bool GetDescription(const wxString& uti, wxString *desc); - bool GetApplication(const wxString& uti, wxString *command); - - // Structure to represent file types - typedef struct FileTypeData - { - wxArrayString extensions; - wxArrayString mimeTypes; - wxIconLocation iconLoc; - wxString application; - wxString description; - } - FileTypeInfo; - - // Map types - WX_DECLARE_STRING_HASH_MAP( wxString, TagMap ); - WX_DECLARE_STRING_HASH_MAP( FileTypeData, UtiMap ); - - // Data store - TagMap m_extMap; - TagMap m_mimeMap; - UtiMap m_utiMap; - - friend class wxFileTypeImpl; -}; - - -// This class provides the interface between wxFileType and wxMimeTypesManagerImple for Mac OS X -// Currently only extension, mimetype, description and icon information is available -// All other methods have no-op implementation -class WXDLLIMPEXP_BASE wxFileTypeImpl -{ -public: - - wxFileTypeImpl(); - virtual ~wxFileTypeImpl(); - - bool GetExtensions(wxArrayString& extensions) const ; - bool GetMimeType(wxString *mimeType) const ; - bool GetMimeTypes(wxArrayString& mimeTypes) const ; - bool GetIcon(wxIconLocation *iconLoc) const ; - bool GetDescription(wxString *desc) const ; - bool GetOpenCommand(wxString *openCmd, const wxFileType::MessageParameters& params) const; - - // These functions are only stubs on Mac OS X - bool GetPrintCommand(wxString *printCmd, const wxFileType::MessageParameters& params) const; - size_t GetAllCommands(wxArrayString *verbs, wxArrayString *commands, const wxFileType::MessageParameters& params) const; - bool SetCommand(const wxString& cmd, const wxString& verb, bool overwriteprompt = TRUE); - bool SetDefaultIcon(const wxString& strIcon = wxEmptyString, int index = 0); - bool Unassociate(wxFileType *ft); - - wxString - GetExpandedCommand(const wxString& verb, - const wxFileType::MessageParameters& params) const; -private: - - // All that is needed to query type info - UTI and pointer to the manager - wxString m_uti; - wxMimeTypesManagerImpl* m_manager; - - friend class wxMimeTypesManagerImpl; -}; - -#endif // wxUSE_MIMETYPE -#endif //_MIMETYPE_IMPL_H - - diff --git a/Externals/wxWidgets3/include/wx/osx/core/objcid.h b/Externals/wxWidgets3/include/wx/osx/core/objcid.h deleted file mode 100644 index 35238bb891..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/core/objcid.h +++ /dev/null @@ -1,23 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/core/objcid.h -// Purpose: Define wxObjCID working in both C++ and Objective-C. -// Author: Vadim Zeitlin -// Created: 2012-05-20 -// Copyright: (c) 2012 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_OSX_CORE_OBJCID_H_ -#define _WX_OSX_CORE_OBJCID_H_ - -// ---------------------------------------------------------------------------- -// wxObjCID: Equivalent of Objective-C "id" that works in C++ code. -// ---------------------------------------------------------------------------- - -#ifdef __OBJC__ - #define wxObjCID id -#else - typedef struct objc_object* wxObjCID; -#endif - -#endif // _WX_OSX_CORE_OBJCID_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/core/private.h b/Externals/wxWidgets3/include/wx/osx/core/private.h deleted file mode 100644 index 182e25dff4..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/core/private.h +++ /dev/null @@ -1,935 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/core/private.h -// Purpose: Private declarations: as this header is only included by -// wxWidgets itself, it may contain identifiers which don't start -// with "wx". -// Author: Stefan Csomor -// Modified by: -// Created: 1998-01-01 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PRIVATE_CORE_H_ -#define _WX_PRIVATE_CORE_H_ - -#include "wx/defs.h" - -#include - -#include "wx/osx/core/cfstring.h" -#include "wx/osx/core/cfdataref.h" - -// platform specific Clang analyzer support -#ifndef NS_RETURNS_RETAINED -# if WX_HAS_CLANG_FEATURE(attribute_ns_returns_retained) -# define NS_RETURNS_RETAINED __attribute__((ns_returns_retained)) -# else -# define NS_RETURNS_RETAINED -# endif -#endif - -#ifndef CF_RETURNS_RETAINED -# if WX_HAS_CLANG_FEATURE(attribute_cf_returns_retained) -# define CF_RETURNS_RETAINED __attribute__((cf_returns_retained)) -# else -# define CF_RETURNS_RETAINED -# endif -#endif - -#if ( !wxUSE_GUI && !wxOSX_USE_IPHONE ) || wxOSX_USE_COCOA_OR_CARBON - -// Carbon functions are currently still used in wxOSX/Cocoa too (including -// wxBase part of it). -#include - -void WXDLLIMPEXP_CORE wxMacStringToPascal( const wxString&from , unsigned char * to ); -wxString WXDLLIMPEXP_CORE wxMacMakeStringFromPascal( const unsigned char * from ); - -WXDLLIMPEXP_BASE wxString wxMacFSRefToPath( const FSRef *fsRef , CFStringRef additionalPathComponent = NULL ); -WXDLLIMPEXP_BASE OSStatus wxMacPathToFSRef( const wxString&path , FSRef *fsRef ); -WXDLLIMPEXP_BASE wxString wxMacHFSUniStrToString( ConstHFSUniStr255Param uniname ); - -// keycode utils from app.cpp - -WXDLLIMPEXP_BASE CGKeyCode wxCharCodeWXToOSX(wxKeyCode code); -WXDLLIMPEXP_BASE long wxMacTranslateKey(unsigned char key, unsigned char code); - -#endif - -#if wxUSE_GUI - -#if wxOSX_USE_IPHONE -#include -#else -#include -#endif - -#include "wx/bitmap.h" -#include "wx/window.h" - -class WXDLLIMPEXP_CORE wxMacCGContextStateSaver -{ - wxDECLARE_NO_COPY_CLASS(wxMacCGContextStateSaver); - -public: - wxMacCGContextStateSaver( CGContextRef cg ) - { - m_cg = cg; - CGContextSaveGState( cg ); - } - ~wxMacCGContextStateSaver() - { - CGContextRestoreGState( m_cg ); - } -private: - CGContextRef m_cg; -}; - -class WXDLLIMPEXP_CORE wxDeferredObjectDeleter : public wxObject -{ -public : - wxDeferredObjectDeleter( wxObject* obj ) : m_obj(obj) - { - } - virtual ~wxDeferredObjectDeleter() - { - delete m_obj; - } -protected : - wxObject* m_obj ; -} ; - -// Quartz - -WXDLLIMPEXP_CORE CGImageRef wxMacCreateCGImageFromBitmap( const wxBitmap& bitmap ); - -WXDLLIMPEXP_CORE CGDataProviderRef wxMacCGDataProviderCreateWithCFData( CFDataRef data ); -WXDLLIMPEXP_CORE CGDataConsumerRef wxMacCGDataConsumerCreateWithCFData( CFMutableDataRef data ); -WXDLLIMPEXP_CORE CGDataProviderRef wxMacCGDataProviderCreateWithMemoryBuffer( const wxMemoryBuffer& buf ); - -WXDLLIMPEXP_CORE CGColorSpaceRef wxMacGetGenericRGBColorSpace(void); - -WXDLLIMPEXP_CORE double wxOSXGetMainScreenContentScaleFactor(); - -class wxWindowMac; -// to -extern wxWindow* g_MacLastWindow; -class wxNonOwnedWindow; - -// temporary typedef so that no additional casts are necessary within carbon code at the moment - -class wxMacControl; -class wxWidgetImpl; -class wxComboBox; -class wxNotebook; -class wxTextCtrl; -class wxSearchCtrl; - -WXDLLIMPEXP_CORE wxWindowMac * wxFindWindowFromWXWidget(WXWidget inControl ); - -typedef wxWidgetImpl wxWidgetImplType; - -#if wxUSE_MENUS -class wxMenuItemImpl : public wxObject -{ -public : - wxMenuItemImpl( wxMenuItem* peer ) : m_peer(peer) - { - } - - virtual ~wxMenuItemImpl() ; - virtual void SetBitmap( const wxBitmap& bitmap ) = 0; - virtual void Enable( bool enable ) = 0; - virtual void Check( bool check ) = 0; - virtual void SetLabel( const wxString& text, wxAcceleratorEntry *entry ) = 0; - virtual void Hide( bool hide = true ) = 0; - - virtual void * GetHMenuItem() = 0; - - wxMenuItem* GetWXPeer() { return m_peer ; } - - static wxMenuItemImpl* Create( wxMenuItem* peer, wxMenu *pParentMenu, - int id, - const wxString& text, - wxAcceleratorEntry *entry, - const wxString& strHelp, - wxItemKind kind, - wxMenu *pSubMenu ); - - // handle OS specific menu items if they weren't handled during normal processing - virtual bool DoDefault() { return false; } -protected : - wxMenuItem* m_peer; - - wxDECLARE_ABSTRACT_CLASS(wxMenuItemImpl); -} ; - -class wxMenuImpl : public wxObject -{ -public : - wxMenuImpl( wxMenu* peer ) : m_peer(peer) - { - } - - virtual ~wxMenuImpl() ; - virtual void InsertOrAppend(wxMenuItem *pItem, size_t pos) = 0; - virtual void Remove( wxMenuItem *pItem ) = 0; - - virtual void MakeRoot() = 0; - - virtual void SetTitle( const wxString& text ) = 0; - - virtual WXHMENU GetHMenu() = 0; - - wxMenu* GetWXPeer() { return m_peer ; } - - virtual void PopUp( wxWindow *win, int x, int y ) = 0; - - virtual void GetMenuBarDimensions(int &x, int &y, int &width, int &height) const - { - x = y = width = height = -1; - } - - static wxMenuImpl* Create( wxMenu* peer, const wxString& title ); - static wxMenuImpl* CreateRootMenu( wxMenu* peer ); -protected : - wxMenu* m_peer; - - wxDECLARE_ABSTRACT_CLASS(wxMenuItemImpl); -} ; -#endif - - -class WXDLLIMPEXP_CORE wxWidgetImpl : public wxObject -{ -public : - wxWidgetImpl( wxWindowMac* peer , bool isRootControl = false, bool isUserPane = false ); - wxWidgetImpl(); - virtual ~wxWidgetImpl(); - - void Init(); - - bool IsRootControl() const { return m_isRootControl; } - - bool IsUserPane() const { return m_isUserPane; } - - wxWindowMac* GetWXPeer() const { return m_wxPeer; } - - bool IsOk() const { return GetWXWidget() != NULL; } - - // not only the control itself, but also all its parents must be visible - // in order for this function to return true - virtual bool IsVisible() const = 0; - // set the visibility of this widget (maybe latent) - virtual void SetVisibility( bool visible ) = 0; - - virtual bool ShowWithEffect(bool WXUNUSED(show), - wxShowEffect WXUNUSED(effect), - unsigned WXUNUSED(timeout)) - { - return false; - } - - virtual void Raise() = 0; - - virtual void Lower() = 0; - - virtual void ScrollRect( const wxRect *rect, int dx, int dy ) = 0; - - virtual WXWidget GetWXWidget() const = 0; - - virtual void SetBackgroundColour( const wxColour& col ) = 0; - virtual bool SetBackgroundStyle(wxBackgroundStyle style) = 0; - - // all coordinates in native parent widget relative coordinates - virtual void GetContentArea( int &left , int &top , int &width , int &height ) const = 0; - virtual void Move(int x, int y, int width, int height) = 0; - virtual void GetPosition( int &x, int &y ) const = 0; - virtual void GetSize( int &width, int &height ) const = 0; - virtual void SetControlSize( wxWindowVariant variant ) = 0; - virtual double GetContentScaleFactor() const - { - return 1.0; - } - - // the native coordinates may have an 'aura' for shadows etc, if this is the case the layout - // inset indicates on which insets the real control is drawn - virtual void GetLayoutInset(int &left , int &top , int &right, int &bottom) const - { - left = top = right = bottom = 0; - } - - // native view coordinates are topleft to bottom right (flipped regarding CoreGraphics origin) - virtual bool IsFlipped() const { return true; } - - virtual void SetNeedsDisplay( const wxRect* where = NULL ) = 0; - virtual bool GetNeedsDisplay() const = 0; - - virtual bool NeedsFocusRect() const; - virtual void SetNeedsFocusRect( bool needs ); - - virtual bool NeedsFrame() const; - virtual void SetNeedsFrame( bool needs ); - - virtual void SetDrawingEnabled(bool enabled); - - virtual bool CanFocus() const = 0; - // return true if successful - virtual bool SetFocus() = 0; - virtual bool HasFocus() const = 0; - - virtual void RemoveFromParent() = 0; - virtual void Embed( wxWidgetImpl *parent ) = 0; - - virtual void SetDefaultButton( bool isDefault ) = 0; - virtual void PerformClick() = 0; - virtual void SetLabel( const wxString& title, wxFontEncoding encoding ) = 0; -#if wxUSE_MARKUP && wxOSX_USE_COCOA - virtual void SetLabelMarkup( const wxString& WXUNUSED(markup) ) { } -#endif - - virtual void SetCursor( const wxCursor & cursor ) = 0; - virtual void CaptureMouse() = 0; - virtual void ReleaseMouse() = 0; - - virtual void SetDropTarget( wxDropTarget * WXUNUSED(dropTarget) ) {} - - virtual wxInt32 GetValue() const = 0; - virtual void SetValue( wxInt32 v ) = 0; - virtual wxBitmap GetBitmap() const = 0; - virtual void SetBitmap( const wxBitmap& bitmap ) = 0; - virtual void SetBitmapPosition( wxDirection dir ) = 0; - virtual void SetupTabs( const wxNotebook& WXUNUSED(notebook) ) {} - virtual int TabHitTest( const wxPoint & WXUNUSED(pt), long *flags ) {*flags=1; return -1;} - virtual void GetBestRect( wxRect *r ) const = 0; - virtual bool IsEnabled() const = 0; - virtual void Enable( bool enable ) = 0; - virtual void SetMinimum( wxInt32 v ) = 0; - virtual void SetMaximum( wxInt32 v ) = 0; - virtual wxInt32 GetMinimum() const = 0; - virtual wxInt32 GetMaximum() const = 0; - virtual void PulseGauge() = 0; - virtual void SetScrollThumb( wxInt32 value, wxInt32 thumbSize ) = 0; - - virtual void SetFont( const wxFont & font , const wxColour& foreground , long windowStyle, bool ignoreBlack = true ) = 0; - - virtual void SetToolTip(wxToolTip* WXUNUSED(tooltip)) { } - - // is the clicked event sent AFTER the state already changed, so no additional - // state changing logic is required from the outside - virtual bool ButtonClickDidStateChange() = 0; - - virtual void InstallEventHandler( WXWidget control = NULL ) = 0; - - // Mechanism used to keep track of whether a change should send an event - // Do SendEvents(false) when starting actions that would trigger programmatic events - // and SendEvents(true) at the end of the block. - virtual void SendEvents(bool shouldSendEvents) { m_shouldSendEvents = shouldSendEvents; } - virtual bool ShouldSendEvents() { return m_shouldSendEvents; } - - // static methods for associating native controls and their implementations - - // finds the impl associated with this native control - static wxWidgetImpl* - FindFromWXWidget(WXWidget control); - - // finds the impl associated with this native control, if the native control itself is not known - // also checks whether its parent is eg a registered scrollview, ie whether the control is a native subpart - // of a known control - static wxWidgetImpl* - FindBestFromWXWidget(WXWidget control); - - static void RemoveAssociations( wxWidgetImpl* impl); - - static void Associate( WXWidget control, wxWidgetImpl *impl ); - - static WXWidget FindFocus(); - - // static creation methods, must be implemented by all toolkits - - static wxWidgetImplType* CreateUserPane( wxWindowMac* wxpeer, - wxWindowMac* parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style, - long extraStyle) ; - static wxWidgetImplType* CreateContentView( wxNonOwnedWindow* now ) ; - - static wxWidgetImplType* CreateButton( wxWindowMac* wxpeer, - wxWindowMac* parent, - wxWindowID id, - const wxString& label, - const wxPoint& pos, - const wxSize& size, - long style, - long extraStyle) ; - - static wxWidgetImplType* CreateDisclosureTriangle( wxWindowMac* wxpeer, - wxWindowMac* parent, - wxWindowID id, - const wxString& label, - const wxPoint& pos, - const wxSize& size, - long style, - long extraStyle) ; - - static wxWidgetImplType* CreateStaticLine( wxWindowMac* wxpeer, - wxWindowMac* parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style, - long extraStyle) ; - - static wxWidgetImplType* CreateGroupBox( wxWindowMac* wxpeer, - wxWindowMac* parent, - wxWindowID id, - const wxString& label, - const wxPoint& pos, - const wxSize& size, - long style, - long extraStyle) ; - - static wxWidgetImplType* CreateStaticText( wxWindowMac* wxpeer, - wxWindowMac* parent, - wxWindowID id, - const wxString& label, - const wxPoint& pos, - const wxSize& size, - long style, - long extraStyle) ; - - static wxWidgetImplType* CreateTextControl( wxTextCtrl* wxpeer, - wxWindowMac* parent, - wxWindowID id, - const wxString& content, - const wxPoint& pos, - const wxSize& size, - long style, - long extraStyle) ; - - static wxWidgetImplType* CreateSearchControl( wxSearchCtrl* wxpeer, - wxWindowMac* parent, - wxWindowID id, - const wxString& content, - const wxPoint& pos, - const wxSize& size, - long style, - long extraStyle) ; - - static wxWidgetImplType* CreateCheckBox( wxWindowMac* wxpeer, - wxWindowMac* parent, - wxWindowID id, - const wxString& label, - const wxPoint& pos, - const wxSize& size, - long style, - long extraStyle); - - static wxWidgetImplType* CreateRadioButton( wxWindowMac* wxpeer, - wxWindowMac* parent, - wxWindowID id, - const wxString& label, - const wxPoint& pos, - const wxSize& size, - long style, - long extraStyle); - - static wxWidgetImplType* CreateToggleButton( wxWindowMac* wxpeer, - wxWindowMac* parent, - wxWindowID id, - const wxString& label, - const wxPoint& pos, - const wxSize& size, - long style, - long extraStyle); - - static wxWidgetImplType* CreateBitmapToggleButton( wxWindowMac* wxpeer, - wxWindowMac* parent, - wxWindowID id, - const wxBitmap& bitmap, - const wxPoint& pos, - const wxSize& size, - long style, - long extraStyle); - - static wxWidgetImplType* CreateBitmapButton( wxWindowMac* wxpeer, - wxWindowMac* parent, - wxWindowID id, - const wxBitmap& bitmap, - const wxPoint& pos, - const wxSize& size, - long style, - long extraStyle); - - static wxWidgetImplType* CreateTabView( wxWindowMac* wxpeer, - wxWindowMac* parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style, - long extraStyle); - - static wxWidgetImplType* CreateGauge( wxWindowMac* wxpeer, - wxWindowMac* parent, - wxWindowID id, - wxInt32 value, - wxInt32 minimum, - wxInt32 maximum, - const wxPoint& pos, - const wxSize& size, - long style, - long extraStyle); - - static wxWidgetImplType* CreateSlider( wxWindowMac* wxpeer, - wxWindowMac* parent, - wxWindowID id, - wxInt32 value, - wxInt32 minimum, - wxInt32 maximum, - const wxPoint& pos, - const wxSize& size, - long style, - long extraStyle); - - static wxWidgetImplType* CreateSpinButton( wxWindowMac* wxpeer, - wxWindowMac* parent, - wxWindowID id, - wxInt32 value, - wxInt32 minimum, - wxInt32 maximum, - const wxPoint& pos, - const wxSize& size, - long style, - long extraStyle); - - static wxWidgetImplType* CreateScrollBar( wxWindowMac* wxpeer, - wxWindowMac* parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style, - long extraStyle); - - static wxWidgetImplType* CreateChoice( wxWindowMac* wxpeer, - wxWindowMac* parent, - wxWindowID id, - wxMenu* menu, - const wxPoint& pos, - const wxSize& size, - long style, - long extraStyle); - - static wxWidgetImplType* CreateListBox( wxWindowMac* wxpeer, - wxWindowMac* parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style, - long extraStyle); - -#if wxOSX_USE_COCOA - static wxWidgetImplType* CreateComboBox( wxComboBox* wxpeer, - wxWindowMac* parent, - wxWindowID id, - wxMenu* menu, - const wxPoint& pos, - const wxSize& size, - long style, - long extraStyle); -#endif - - // converts from Toplevel-Content relative to local - static void Convert( wxPoint *pt , wxWidgetImpl *from , wxWidgetImpl *to ); -protected : - bool m_isRootControl; - bool m_isUserPane; - wxWindowMac* m_wxPeer; - bool m_needsFocusRect; - bool m_needsFrame; - bool m_shouldSendEvents; - - wxDECLARE_ABSTRACT_CLASS(wxWidgetImpl); -}; - -// -// the interface to be implemented eg by a listbox -// - -class WXDLLIMPEXP_CORE wxListWidgetColumn -{ -public : - virtual ~wxListWidgetColumn() {} -} ; - -class WXDLLIMPEXP_CORE wxListWidgetCellValue -{ -public : - wxListWidgetCellValue() {} - virtual ~wxListWidgetCellValue() {} - - virtual void Set( CFStringRef value ) = 0; - virtual void Set( const wxString& value ) = 0; - virtual void Set( int value ) = 0; - virtual void Check( bool check ); - - virtual bool IsChecked() const; - virtual int GetIntValue() const = 0; - virtual wxString GetStringValue() const = 0; -} ; - -class WXDLLIMPEXP_CORE wxListWidgetImpl -{ -public: - wxListWidgetImpl() {} - virtual ~wxListWidgetImpl() { } - - virtual wxListWidgetColumn* InsertTextColumn( unsigned pos, const wxString& title, bool editable = false, - wxAlignment just = wxALIGN_LEFT , int defaultWidth = -1) = 0 ; - virtual wxListWidgetColumn* InsertCheckColumn( unsigned pos , const wxString& title, bool editable = false, - wxAlignment just = wxALIGN_LEFT , int defaultWidth = -1) = 0 ; - - // add and remove - - // TODO will be replaced - virtual void ListDelete( unsigned int n ) = 0; - virtual void ListInsert( unsigned int n ) = 0; - virtual void ListClear() = 0; - - // selecting - - virtual void ListDeselectAll() = 0; - virtual void ListSetSelection( unsigned int n, bool select, bool multi ) = 0; - virtual int ListGetSelection() const = 0; - virtual int ListGetSelections( wxArrayInt& aSelections ) const = 0; - virtual bool ListIsSelected( unsigned int n ) const = 0; - - // display - - virtual void ListScrollTo( unsigned int n ) = 0; - virtual int ListGetTopItem() const = 0; - virtual void UpdateLine( unsigned int n, wxListWidgetColumn* col = NULL ) = 0; - virtual void UpdateLineToEnd( unsigned int n) = 0; - - // accessing content - - virtual unsigned int ListGetCount() const = 0; - - virtual int DoListHitTest( const wxPoint& inpoint ) const = 0; -}; - -// -// interface to be implemented by a textcontrol -// - -class WXDLLIMPEXP_FWD_CORE wxTextAttr; -class WXDLLIMPEXP_FWD_CORE wxTextEntry; - -// common interface for all implementations -class WXDLLIMPEXP_CORE wxTextWidgetImpl - -{ -public : - // Any widgets implementing this interface must be associated with a - // wxTextEntry so instead of requiring the derived classes to implement - // another (pure) virtual function, just take the pointer to this entry in - // our ctor and implement GetTextEntry() ourselves. - wxTextWidgetImpl(wxTextEntry *entry) : m_entry(entry) {} - - virtual ~wxTextWidgetImpl() {} - - wxTextEntry *GetTextEntry() const { return m_entry; } - - virtual bool CanFocus() const { return true; } - - virtual wxString GetStringValue() const = 0 ; - virtual void SetStringValue( const wxString &val ) = 0 ; - virtual void SetSelection( long from, long to ) = 0 ; - virtual void GetSelection( long* from, long* to ) const = 0 ; - virtual void WriteText( const wxString& str ) = 0 ; - - virtual bool CanClipMaxLength() const { return false; } - virtual void SetMaxLength(unsigned long WXUNUSED(len)) {} - - virtual bool CanForceUpper() { return false; } - virtual void ForceUpper() {} - - virtual bool GetStyle( long position, wxTextAttr& style); - virtual void SetStyle( long start, long end, const wxTextAttr& style ) ; - virtual void Copy() ; - virtual void Cut() ; - virtual void Paste() ; - virtual bool CanPaste() const ; - virtual void SetEditable( bool editable ) ; - virtual long GetLastPosition() const ; - virtual void Replace( long from, long to, const wxString &str ) ; - virtual void Remove( long from, long to ) ; - - - virtual bool HasOwnContextMenu() const - { return false ; } - - virtual bool SetupCursor( const wxPoint& WXUNUSED(pt) ) - { return false ; } - - virtual void Clear() ; - virtual bool CanUndo() const; - virtual void Undo() ; - virtual bool CanRedo() const; - virtual void Redo() ; - virtual int GetNumberOfLines() const ; - virtual long XYToPosition(long x, long y) const; - virtual bool PositionToXY(long pos, long *x, long *y) const ; - virtual void ShowPosition(long WXUNUSED(pos)) ; - virtual int GetLineLength(long lineNo) const ; - virtual wxString GetLineText(long lineNo) const ; - virtual void CheckSpelling(bool WXUNUSED(check)) { } - - virtual wxSize GetBestSize() const { return wxDefaultSize; } - - virtual bool SetHint(const wxString& WXUNUSED(hint)) { return false; } -private: - wxTextEntry * const m_entry; - - wxDECLARE_NO_COPY_CLASS(wxTextWidgetImpl); -}; - -// common interface for all implementations -class WXDLLIMPEXP_CORE wxComboWidgetImpl - -{ -public : - wxComboWidgetImpl() {} - - virtual ~wxComboWidgetImpl() {} - - virtual int GetSelectedItem() const { return -1; } - virtual void SetSelectedItem(int WXUNUSED(item)) {} - - virtual int GetNumberOfItems() const { return -1; } - - virtual void InsertItem(int WXUNUSED(pos), const wxString& WXUNUSED(item)) {} - - virtual void RemoveItem(int WXUNUSED(pos)) {} - - virtual void Clear() {} - virtual void Popup() {} - virtual void Dismiss() {} - - virtual wxString GetStringAtIndex(int WXUNUSED(pos)) const { return wxEmptyString; } - - virtual int FindString(const wxString& WXUNUSED(text)) const { return -1; } -}; - -// -// common interface for buttons -// - -class wxButtonImpl -{ - public : - wxButtonImpl(){} - virtual ~wxButtonImpl(){} - - virtual void SetPressedBitmap( const wxBitmap& bitmap ) = 0; -} ; - -// -// common interface for search controls -// - -class wxSearchWidgetImpl -{ -public : - wxSearchWidgetImpl(){} - virtual ~wxSearchWidgetImpl(){} - - // search field options - virtual void ShowSearchButton( bool show ) = 0; - virtual bool IsSearchButtonVisible() const = 0; - - virtual void ShowCancelButton( bool show ) = 0; - virtual bool IsCancelButtonVisible() const = 0; - - virtual void SetSearchMenu( wxMenu* menu ) = 0; - - virtual void SetDescriptiveText(const wxString& text) = 0; -} ; - -// -// toplevel window implementation class -// - -class wxNonOwnedWindowImpl : public wxObject -{ -public : - wxNonOwnedWindowImpl( wxNonOwnedWindow* nonownedwnd) : m_wxPeer(nonownedwnd) - { - } - wxNonOwnedWindowImpl() - { - } - virtual ~wxNonOwnedWindowImpl() - { - } - - virtual void WillBeDestroyed() - { - } - - virtual void Create( wxWindow* parent, const wxPoint& pos, const wxSize& size, - long style, long extraStyle, const wxString& name ) = 0; - - - virtual WXWindow GetWXWindow() const = 0; - - virtual void Raise() - { - } - - virtual void Lower() - { - } - - virtual bool Show(bool WXUNUSED(show)) - { - return false; - } - - virtual bool ShowWithEffect(bool show, wxShowEffect WXUNUSED(effect), unsigned WXUNUSED(timeout)) - { - return Show(show); - } - - virtual void Update() - { - } - - virtual bool SetTransparent(wxByte WXUNUSED(alpha)) - { - return false; - } - - virtual bool SetBackgroundColour(const wxColour& WXUNUSED(col) ) - { - return false; - } - - virtual void SetExtraStyle( long WXUNUSED(exStyle) ) - { - } - - virtual void SetWindowStyleFlag( long WXUNUSED(style) ) - { - } - - virtual bool SetBackgroundStyle(wxBackgroundStyle WXUNUSED(style)) - { - return false ; - } - - virtual bool CanSetTransparent() - { - return false; - } - - virtual void GetContentArea( int &left , int &top , int &width , int &height ) const = 0; - virtual void MoveWindow(int x, int y, int width, int height) = 0; - virtual void GetPosition( int &x, int &y ) const = 0; - virtual void GetSize( int &width, int &height ) const = 0; - - virtual bool SetShape(const wxRegion& WXUNUSED(region)) - { - return false; - } - - virtual void SetTitle( const wxString& title, wxFontEncoding encoding ) = 0; - - virtual bool EnableCloseButton(bool enable) = 0; - virtual bool EnableMaximizeButton(bool enable) = 0; - virtual bool EnableMinimizeButton(bool enable) = 0; - - virtual bool IsMaximized() const = 0; - - virtual bool IsIconized() const= 0; - - virtual void Iconize( bool iconize )= 0; - - virtual void Maximize(bool maximize) = 0; - - virtual bool IsFullScreen() const= 0; - - virtual void ShowWithoutActivating() { Show(true); } - - virtual bool EnableFullScreenView(bool enable) = 0; - - virtual bool ShowFullScreen(bool show, long style)= 0; - - virtual void RequestUserAttention(int flags) = 0; - - virtual void ScreenToWindow( int *x, int *y ) = 0; - - virtual void WindowToScreen( int *x, int *y ) = 0; - - virtual bool IsActive() = 0; - - wxNonOwnedWindow* GetWXPeer() { return m_wxPeer; } - - static wxNonOwnedWindowImpl* - FindFromWXWindow(WXWindow window); - - static void RemoveAssociations( wxNonOwnedWindowImpl* impl); - - static void Associate( WXWindow window, wxNonOwnedWindowImpl *impl ); - - // static creation methods, must be implemented by all toolkits - - static wxNonOwnedWindowImpl* CreateNonOwnedWindow( wxNonOwnedWindow* wxpeer, wxWindow* parent, WXWindow native) ; - - static wxNonOwnedWindowImpl* CreateNonOwnedWindow( wxNonOwnedWindow* wxpeer, wxWindow* parent, const wxPoint& pos, const wxSize& size, - long style, long extraStyle, const wxString& name ) ; - - virtual void SetModified(bool WXUNUSED(modified)) { } - virtual bool IsModified() const { return false; } - - virtual void SetRepresentedFilename(const wxString& WXUNUSED(filename)) { } - -#if wxOSX_USE_IPHONE - virtual CGFloat GetWindowLevel() const { return 0.0; } -#else - virtual CGWindowLevel GetWindowLevel() const { return kCGNormalWindowLevel; } -#endif - virtual void RestoreWindowLevel() {} -protected : - wxNonOwnedWindow* m_wxPeer; - wxDECLARE_ABSTRACT_CLASS(wxNonOwnedWindowImpl); -}; - -#endif // wxUSE_GUI - -//--------------------------------------------------------------------------- -// cocoa bridging utilities -//--------------------------------------------------------------------------- - -bool wxMacInitCocoa(); - -class WXDLLIMPEXP_CORE wxMacAutoreleasePool -{ -public : - wxMacAutoreleasePool(); - ~wxMacAutoreleasePool(); -private : - void* m_pool; -}; - -// NSObject - -void wxMacCocoaRelease( void* obj ); -void wxMacCocoaAutorelease( void* obj ); -void* wxMacCocoaRetain( void* obj ); - - -#endif - // _WX_PRIVATE_CORE_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/core/private/datetimectrl.h b/Externals/wxWidgets3/include/wx/osx/core/private/datetimectrl.h deleted file mode 100644 index 213e047c69..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/core/private/datetimectrl.h +++ /dev/null @@ -1,64 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/core/private/datetime.h -// Purpose: -// Author: Vadim Zeitlin -// Created: 2011-12-19 -// Copyright: (c) 2011 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_OSX_CORE_PRIVATE_DATETIMECTRL_H_ -#define _WX_OSX_CORE_PRIVATE_DATETIMECTRL_H_ - -#if wxUSE_DATEPICKCTRL - -#include "wx/osx/private.h" - -#include "wx/datetime.h" - -enum wxDateTimeWidgetKind -{ - wxDateTimeWidget_YearMonthDay, - wxDateTimeWidget_HourMinuteSecond -}; - -// ---------------------------------------------------------------------------- -// wxDateTimeWidgetImpl: peer class for wxDateTimePickerCtrl. -// ---------------------------------------------------------------------------- - -class wxDateTimeWidgetImpl -#if wxOSX_USE_COCOA - : public wxWidgetCocoaImpl -#else - #error "Unsupported platform" -#endif -{ -public: - static wxDateTimeWidgetImpl* - CreateDateTimePicker(wxDateTimePickerCtrl* wxpeer, - const wxDateTime& dt, - const wxPoint& pos, - const wxSize& size, - long style, - wxDateTimeWidgetKind kind); - - virtual void SetDateTime(const wxDateTime& dt) = 0; - virtual wxDateTime GetDateTime() const = 0; - - virtual void SetDateRange(const wxDateTime& dt1, const wxDateTime& dt2) = 0; - virtual bool GetDateRange(wxDateTime* dt1, wxDateTime* dt2) = 0; - - virtual ~wxDateTimeWidgetImpl() { } - -protected: -#if wxOSX_USE_COCOA - wxDateTimeWidgetImpl(wxDateTimePickerCtrl* wxpeer, WXWidget view) - : wxWidgetCocoaImpl(wxpeer, view) - { - } -#endif -}; - -#endif // wxUSE_DATEPICKCTRL - -#endif // _WX_OSX_CORE_PRIVATE_DATETIMECTRL_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/core/private/strconv_cf.h b/Externals/wxWidgets3/include/wx/osx/core/private/strconv_cf.h deleted file mode 100644 index d22c73f72f..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/core/private/strconv_cf.h +++ /dev/null @@ -1,337 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/core/private/strconv_cf.h -// Purpose: Unicode conversion classes -// Author: David Elliott, Ryan Norton -// Modified by: -// Created: 2007-07-06 -// Copyright: (c) 2004 Ryan Norton -// (c) 2007 David Elliott -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#include "wx/strconv.h" - -#include -#include - -// ============================================================================ -// CoreFoundation conversion classes -// ============================================================================ - -inline CFStringEncoding wxCFStringEncFromFontEnc(wxFontEncoding encoding) -{ - CFStringEncoding enc = kCFStringEncodingInvalidId ; - - switch (encoding) - { - case wxFONTENCODING_DEFAULT : - enc = CFStringGetSystemEncoding(); - break ; - - case wxFONTENCODING_ISO8859_1 : - enc = kCFStringEncodingISOLatin1 ; - break ; - case wxFONTENCODING_ISO8859_2 : - enc = kCFStringEncodingISOLatin2; - break ; - case wxFONTENCODING_ISO8859_3 : - enc = kCFStringEncodingISOLatin3 ; - break ; - case wxFONTENCODING_ISO8859_4 : - enc = kCFStringEncodingISOLatin4; - break ; - case wxFONTENCODING_ISO8859_5 : - enc = kCFStringEncodingISOLatinCyrillic; - break ; - case wxFONTENCODING_ISO8859_6 : - enc = kCFStringEncodingISOLatinArabic; - break ; - case wxFONTENCODING_ISO8859_7 : - enc = kCFStringEncodingISOLatinGreek; - break ; - case wxFONTENCODING_ISO8859_8 : - enc = kCFStringEncodingISOLatinHebrew; - break ; - case wxFONTENCODING_ISO8859_9 : - enc = kCFStringEncodingISOLatin5; - break ; - case wxFONTENCODING_ISO8859_10 : - enc = kCFStringEncodingISOLatin6; - break ; - case wxFONTENCODING_ISO8859_11 : - enc = kCFStringEncodingISOLatinThai; - break ; - case wxFONTENCODING_ISO8859_13 : - enc = kCFStringEncodingISOLatin7; - break ; - case wxFONTENCODING_ISO8859_14 : - enc = kCFStringEncodingISOLatin8; - break ; - case wxFONTENCODING_ISO8859_15 : - enc = kCFStringEncodingISOLatin9; - break ; - - case wxFONTENCODING_KOI8 : - enc = kCFStringEncodingKOI8_R; - break ; - case wxFONTENCODING_ALTERNATIVE : // MS-DOS CP866 - enc = kCFStringEncodingDOSRussian; - break ; - -// case wxFONTENCODING_BULGARIAN : -// enc = ; -// break ; - - case wxFONTENCODING_CP437 : - enc = kCFStringEncodingDOSLatinUS ; - break ; - case wxFONTENCODING_CP850 : - enc = kCFStringEncodingDOSLatin1; - break ; - case wxFONTENCODING_CP852 : - enc = kCFStringEncodingDOSLatin2; - break ; - case wxFONTENCODING_CP855 : - enc = kCFStringEncodingDOSCyrillic; - break ; - case wxFONTENCODING_CP866 : - enc = kCFStringEncodingDOSRussian ; - break ; - case wxFONTENCODING_CP874 : - enc = kCFStringEncodingDOSThai; - break ; - case wxFONTENCODING_CP932 : - enc = kCFStringEncodingDOSJapanese; - break ; - case wxFONTENCODING_CP936 : - enc = kCFStringEncodingDOSChineseSimplif ; - break ; - case wxFONTENCODING_CP949 : - enc = kCFStringEncodingDOSKorean; - break ; - case wxFONTENCODING_CP950 : - enc = kCFStringEncodingDOSChineseTrad; - break ; - case wxFONTENCODING_CP1250 : - enc = kCFStringEncodingWindowsLatin2; - break ; - case wxFONTENCODING_CP1251 : - enc = kCFStringEncodingWindowsCyrillic ; - break ; - case wxFONTENCODING_CP1252 : - enc = kCFStringEncodingWindowsLatin1 ; - break ; - case wxFONTENCODING_CP1253 : - enc = kCFStringEncodingWindowsGreek; - break ; - case wxFONTENCODING_CP1254 : - enc = kCFStringEncodingWindowsLatin5; - break ; - case wxFONTENCODING_CP1255 : - enc = kCFStringEncodingWindowsHebrew ; - break ; - case wxFONTENCODING_CP1256 : - enc = kCFStringEncodingWindowsArabic ; - break ; - case wxFONTENCODING_CP1257 : - enc = kCFStringEncodingWindowsBalticRim; - break ; -// This only really encodes to UTF7 (if that) evidently -// case wxFONTENCODING_UTF7 : -// enc = kCFStringEncodingNonLossyASCII ; -// break ; - case wxFONTENCODING_UTF8 : - enc = kCFStringEncodingUTF8 ; - break ; - case wxFONTENCODING_EUC_JP : - enc = kCFStringEncodingEUC_JP; - break ; -/* Don't support conversion to/from UTF16 as wxWidgets can do this better. - * In particular, ToWChar would fail miserably using strlen on an input UTF16. - case wxFONTENCODING_UTF16 : - enc = kCFStringEncodingUnicode ; - break ; -*/ - case wxFONTENCODING_MACROMAN : - enc = kCFStringEncodingMacRoman ; - break ; - case wxFONTENCODING_MACJAPANESE : - enc = kCFStringEncodingMacJapanese ; - break ; - case wxFONTENCODING_MACCHINESETRAD : - enc = kCFStringEncodingMacChineseTrad ; - break ; - case wxFONTENCODING_MACKOREAN : - enc = kCFStringEncodingMacKorean ; - break ; - case wxFONTENCODING_MACARABIC : - enc = kCFStringEncodingMacArabic ; - break ; - case wxFONTENCODING_MACHEBREW : - enc = kCFStringEncodingMacHebrew ; - break ; - case wxFONTENCODING_MACGREEK : - enc = kCFStringEncodingMacGreek ; - break ; - case wxFONTENCODING_MACCYRILLIC : - enc = kCFStringEncodingMacCyrillic ; - break ; - case wxFONTENCODING_MACDEVANAGARI : - enc = kCFStringEncodingMacDevanagari ; - break ; - case wxFONTENCODING_MACGURMUKHI : - enc = kCFStringEncodingMacGurmukhi ; - break ; - case wxFONTENCODING_MACGUJARATI : - enc = kCFStringEncodingMacGujarati ; - break ; - case wxFONTENCODING_MACORIYA : - enc = kCFStringEncodingMacOriya ; - break ; - case wxFONTENCODING_MACBENGALI : - enc = kCFStringEncodingMacBengali ; - break ; - case wxFONTENCODING_MACTAMIL : - enc = kCFStringEncodingMacTamil ; - break ; - case wxFONTENCODING_MACTELUGU : - enc = kCFStringEncodingMacTelugu ; - break ; - case wxFONTENCODING_MACKANNADA : - enc = kCFStringEncodingMacKannada ; - break ; - case wxFONTENCODING_MACMALAJALAM : - enc = kCFStringEncodingMacMalayalam ; - break ; - case wxFONTENCODING_MACSINHALESE : - enc = kCFStringEncodingMacSinhalese ; - break ; - case wxFONTENCODING_MACBURMESE : - enc = kCFStringEncodingMacBurmese ; - break ; - case wxFONTENCODING_MACKHMER : - enc = kCFStringEncodingMacKhmer ; - break ; - case wxFONTENCODING_MACTHAI : - enc = kCFStringEncodingMacThai ; - break ; - case wxFONTENCODING_MACLAOTIAN : - enc = kCFStringEncodingMacLaotian ; - break ; - case wxFONTENCODING_MACGEORGIAN : - enc = kCFStringEncodingMacGeorgian ; - break ; - case wxFONTENCODING_MACARMENIAN : - enc = kCFStringEncodingMacArmenian ; - break ; - case wxFONTENCODING_MACCHINESESIMP : - enc = kCFStringEncodingMacChineseSimp ; - break ; - case wxFONTENCODING_MACTIBETAN : - enc = kCFStringEncodingMacTibetan ; - break ; - case wxFONTENCODING_MACMONGOLIAN : - enc = kCFStringEncodingMacMongolian ; - break ; - case wxFONTENCODING_MACETHIOPIC : - enc = kCFStringEncodingMacEthiopic ; - break ; - case wxFONTENCODING_MACCENTRALEUR : - enc = kCFStringEncodingMacCentralEurRoman ; - break ; - case wxFONTENCODING_MACVIATNAMESE : - enc = kCFStringEncodingMacVietnamese ; - break ; - case wxFONTENCODING_MACARABICEXT : - enc = kCFStringEncodingMacExtArabic ; - break ; - case wxFONTENCODING_MACSYMBOL : - enc = kCFStringEncodingMacSymbol ; - break ; - case wxFONTENCODING_MACDINGBATS : - enc = kCFStringEncodingMacDingbats ; - break ; - case wxFONTENCODING_MACTURKISH : - enc = kCFStringEncodingMacTurkish ; - break ; - case wxFONTENCODING_MACCROATIAN : - enc = kCFStringEncodingMacCroatian ; - break ; - case wxFONTENCODING_MACICELANDIC : - enc = kCFStringEncodingMacIcelandic ; - break ; - case wxFONTENCODING_MACROMANIAN : - enc = kCFStringEncodingMacRomanian ; - break ; - case wxFONTENCODING_MACCELTIC : - enc = kCFStringEncodingMacCeltic ; - break ; - case wxFONTENCODING_MACGAELIC : - enc = kCFStringEncodingMacGaelic ; - break ; - /* CFString is known to support this back to the original CarbonLib */ - /* http://developer.apple.com/samplecode/CarbonMDEF/listing2.html */ - case wxFONTENCODING_MACKEYBOARD : - /* We don't wish to pollute the namespace too much, even though we're a private header. */ - /* The constant is well-defined as 41 and is not expected to change. */ - enc = 41 /*kTextEncodingMacKeyboardGlyphs*/ ; - break ; - - default : - // because gcc is picky - break ; - } - - return enc ; -} - - -class wxMBConv_cf : public wxMBConv -{ -public: - wxMBConv_cf() - { - Init(CFStringGetSystemEncoding()) ; - } - - wxMBConv_cf(const wxMBConv_cf& conv) : wxMBConv() - { - m_encoding = conv.m_encoding; - } - -#if wxUSE_FONTMAP - wxMBConv_cf(const char* name) - { - Init( wxCFStringEncFromFontEnc(wxFontMapperBase::Get()->CharsetToEncoding(name, false) ) ) ; - } -#endif - - wxMBConv_cf(wxFontEncoding encoding) - { - Init( wxCFStringEncFromFontEnc(encoding) ); - } - - virtual ~wxMBConv_cf() - { - } - - void Init( CFStringEncoding encoding) - { - m_encoding = encoding ; - } - - virtual size_t ToWChar(wchar_t * dst, size_t dstSize, const char * src, size_t srcSize = wxNO_LEN) const; - virtual size_t FromWChar(char *dst, size_t dstSize, const wchar_t *src, size_t srcSize = wxNO_LEN) const; - - virtual wxMBConv *Clone() const { return new wxMBConv_cf(*this); } - - bool IsOk() const - { - return m_encoding != kCFStringEncodingInvalidId && - CFStringIsEncodingAvailable(m_encoding); - } - -private: - CFStringEncoding m_encoding ; -}; - diff --git a/Externals/wxWidgets3/include/wx/osx/core/private/timer.h b/Externals/wxWidgets3/include/wx/osx/core/private/timer.h deleted file mode 100644 index 2f191797d9..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/core/private/timer.h +++ /dev/null @@ -1,32 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/core/private/timer.h -// Purpose: wxTimer class based on core foundation -// Author: Stefan Csomor -// Created: 2008-07-16 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_OSX_CORE_PRIVATE_TIMER_H_ -#define _WX_OSX_CORE_PRIVATE_TIMER_H_ - -#include "wx/private/timer.h" - -struct wxOSXTimerInfo; - -class WXDLLIMPEXP_CORE wxOSXTimerImpl : public wxTimerImpl -{ -public: - wxOSXTimerImpl(wxTimer *timer); - virtual ~wxOSXTimerImpl(); - - virtual bool Start(int milliseconds = -1, bool one_shot = false); - virtual void Stop(); - - virtual bool IsRunning() const; - -private: - wxOSXTimerInfo *m_info; -}; - -#endif // _WX_OSX_CORE_PRIVATE_TIMER_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/cursor.h b/Externals/wxWidgets3/include/wx/osx/cursor.h deleted file mode 100644 index 7af9a4176c..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/cursor.h +++ /dev/null @@ -1,52 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/cursor.h -// Purpose: wxCursor class -// Author: Stefan Csomor -// Modified by: -// Created: 1998-01-01 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_CURSOR_H_ -#define _WX_CURSOR_H_ - -#include "wx/bitmap.h" - -// Cursor -class WXDLLIMPEXP_CORE wxCursor : public wxCursorBase -{ -public: - wxCursor(); - - wxCursor(const wxImage & image) ; - wxCursor(const wxString& name, - wxBitmapType type = wxCURSOR_DEFAULT_TYPE, - int hotSpotX = 0, int hotSpotY = 0); - - wxCursor(wxStockCursor id) { InitFromStock(id); } -#if WXWIN_COMPATIBILITY_2_8 - wxCursor(int id) { InitFromStock((wxStockCursor)id); } -#endif - virtual ~wxCursor(); - - void MacInstall() const ; - - void SetHCURSOR(WXHCURSOR cursor); - WXHCURSOR GetHCURSOR() const; - -protected: - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; - -private: - void InitFromStock(wxStockCursor); - - void CreateFromImage(const wxImage & image) ; - - wxDECLARE_DYNAMIC_CLASS(wxCursor); -}; - -extern WXDLLIMPEXP_CORE void wxSetCursor(const wxCursor& cursor); - -#endif // _WX_CURSOR_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/dataform.h b/Externals/wxWidgets3/include/wx/osx/dataform.h deleted file mode 100644 index a9c7ba9e3c..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/dataform.h +++ /dev/null @@ -1,68 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/dataform.h -// Purpose: declaration of the wxDataFormat class -// Author: Stefan Csomor (lifted from dnd.h) -// Modified by: -// Created: 10/21/99 -// Copyright: (c) 1999 Stefan Csomor -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MAC_DATAFORM_H -#define _WX_MAC_DATAFORM_H - -class WXDLLIMPEXP_CORE wxDataFormat -{ -public: - typedef unsigned long NativeFormat; - - wxDataFormat(); - wxDataFormat(wxDataFormatId vType); - wxDataFormat(const wxDataFormat& rFormat); - wxDataFormat(const wxString& rId); - wxDataFormat(const wxChar* pId); - wxDataFormat(NativeFormat vFormat); - ~wxDataFormat(); - - wxDataFormat& operator=(NativeFormat vFormat) - { SetId(vFormat); return *this; } - - // comparison (must have both versions) - bool operator==(const wxDataFormat& format) const ; - bool operator!=(const wxDataFormat& format) const - { return ! ( *this == format ); } - bool operator==(wxDataFormatId format) const - { return m_type == (wxDataFormatId)format; } - bool operator!=(wxDataFormatId format) const - { return m_type != (wxDataFormatId)format; } - - wxDataFormat& operator=(const wxDataFormat& format); - - // explicit and implicit conversions to NativeFormat which is one of - // standard data types (implicit conversion is useful for preserving the - // compatibility with old code) - NativeFormat GetFormatId() const { return m_format; } - operator NativeFormat() const { return m_format; } - - void SetId(NativeFormat format); - - // string ids are used for custom types - this SetId() must be used for - // application-specific formats - wxString GetId() const; - void SetId(const wxString& pId); - - // implementation - wxDataFormatId GetType() const { return m_type; } - void SetType( wxDataFormatId type ); - - // returns true if the format is one of those defined in wxDataFormatId - bool IsStandard() const { return m_type > 0 && m_type < wxDF_PRIVATE; } - -private: - wxDataFormatId m_type; - NativeFormat m_format; - // indicates the type in case of wxDF_PRIVATE : - wxString m_id ; -}; - -#endif // _WX_MAC_DATAFORM_H diff --git a/Externals/wxWidgets3/include/wx/osx/dataobj.h b/Externals/wxWidgets3/include/wx/osx/dataobj.h deleted file mode 100644 index 45a73f289f..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/dataobj.h +++ /dev/null @@ -1,40 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/dataobj.h -// Purpose: declaration of the wxDataObject -// Author: Stefan Csomor (adapted from Robert Roebling's gtk port) -// Modified by: -// Created: 10/21/99 -// Copyright: (c) 1998, 1999 Vadim Zeitlin, Robert Roebling -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MAC_DATAOBJ_H_ -#define _WX_MAC_DATAOBJ_H_ - -// ---------------------------------------------------------------------------- -// wxDataObject is the same as wxDataObjectBase under wxGTK -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxDataObject : public wxDataObjectBase -{ -public: - wxDataObject(); -#ifdef __DARWIN__ - virtual ~wxDataObject() { } -#endif - - virtual bool IsSupportedFormat( const wxDataFormat& format, Direction dir = Get ) const; - void AddToPasteboard( void * pasteboardRef , wxIntPtr itemID ); - // returns true if the passed in format is present in the pasteboard - static bool IsFormatInPasteboard( void * pasteboardRef, const wxDataFormat &dataFormat ); - // returns true if any of the accepted formats of this dataobj is in the pasteboard - bool HasDataInPasteboard( void * pasteboardRef ); - bool GetFromPasteboard( void * pasteboardRef ); - -#if wxOSX_USE_COCOA - virtual void AddSupportedTypes( void* cfarray); -#endif -}; - -#endif // _WX_MAC_DATAOBJ_H_ - diff --git a/Externals/wxWidgets3/include/wx/osx/dataobj2.h b/Externals/wxWidgets3/include/wx/osx/dataobj2.h deleted file mode 100644 index dec7fe50bf..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/dataobj2.h +++ /dev/null @@ -1,93 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/dataobj2.h -// Purpose: declaration of standard wxDataObjectSimple-derived classes -// Author: David Webster (adapted from Robert Roebling's gtk port -// Modified by: -// Created: 10/21/99 -// Copyright: (c) 1998, 1999 Vadim Zeitlin, Robert Roebling -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MAC_DATAOBJ2_H_ -#define _WX_MAC_DATAOBJ2_H_ - -// ---------------------------------------------------------------------------- -// wxBitmapDataObject is a specialization of wxDataObject for bitmaps -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxBitmapDataObject : public wxBitmapDataObjectBase -{ -public: - // ctors - wxBitmapDataObject(); - wxBitmapDataObject(const wxBitmap& bitmap); - - // destr - virtual ~wxBitmapDataObject(); - - // override base class virtual to update PNG data too - virtual void SetBitmap(const wxBitmap& bitmap); - - // implement base class pure virtuals - // ---------------------------------- - - virtual size_t GetDataSize() const ; - virtual bool GetDataHere(void *buf) const ; - virtual bool SetData(size_t len, const void *buf); - // Must provide overloads to avoid hiding them (and warnings about it) - virtual size_t GetDataSize(const wxDataFormat&) const - { - return GetDataSize(); - } - virtual bool GetDataHere(const wxDataFormat&, void *buf) const - { - return GetDataHere(buf); - } - virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) - { - return SetData(len, buf); - } - -protected : - void Init() ; - void Clear() ; - - void* m_pictHandle ; - bool m_pictCreated ; -}; - -// ---------------------------------------------------------------------------- -// wxFileDataObject is a specialization of wxDataObject for file names -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxFileDataObject : public wxFileDataObjectBase -{ -public: - // implement base class pure virtuals - // ---------------------------------- - - void AddFile( const wxString &filename ); - - virtual size_t GetDataSize() const; - virtual bool GetDataHere(void *buf) const; - virtual bool SetData(size_t len, const void *buf); - // Must provide overloads to avoid hiding them (and warnings about it) - virtual size_t GetDataSize(const wxDataFormat&) const - { - return GetDataSize(); - } - virtual bool GetDataHere(const wxDataFormat&, void *buf) const - { - return GetDataHere(buf); - } - virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) - { - return SetData(len, buf); - } -protected: - // translates the filenames stored into a utf8 encoded char stream - void GetFileNames(wxCharBuffer &buf) const ; -}; - -#endif // _WX_MAC_DATAOBJ2_H_ - diff --git a/Externals/wxWidgets3/include/wx/osx/dataview.h b/Externals/wxWidgets3/include/wx/osx/dataview.h deleted file mode 100644 index 2f7261cc1f..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/dataview.h +++ /dev/null @@ -1,311 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/dataview.h -// Purpose: wxDataViewCtrl native implementation header for OSX -// Author: -// Copyright: (c) 2009 -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DATAVIEWCTRL_OSX_H_ -#define _WX_DATAVIEWCTRL_OSX_H_ - -#ifdef __WXMAC_CLASSIC__ -# error "Native wxDataViewCtrl for classic environment not defined. Please use generic control." -#endif - -// -------------------------------------------------------- -// Class declarations to mask native types -// -------------------------------------------------------- -class wxDataViewColumnNativeData; // class storing environment dependent data for the native implementation -class wxDataViewWidgetImpl; // class used as a common interface for carbon and cocoa implementation - -// --------------------------------------------------------- -// wxDataViewColumn -// --------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDataViewColumn: public wxDataViewColumnBase -{ -public: - // constructors / destructor - wxDataViewColumn(const wxString& title, - wxDataViewRenderer* renderer, - unsigned int model_column, - int width = wxDVC_DEFAULT_WIDTH, - wxAlignment align = wxALIGN_CENTER, - int flags = wxDATAVIEW_COL_RESIZABLE); - wxDataViewColumn(const wxBitmap& bitmap, - wxDataViewRenderer* renderer, - unsigned int model_column, - int width = wxDVC_DEFAULT_WIDTH, - wxAlignment align = wxALIGN_CENTER, - int flags = wxDATAVIEW_COL_RESIZABLE); - virtual ~wxDataViewColumn(); - - // implement wxHeaderColumnBase pure virtual methods - virtual wxAlignment GetAlignment() const { return m_alignment; } - virtual int GetFlags() const { return m_flags; } - virtual int GetMaxWidth() const { return m_maxWidth; } - virtual int GetMinWidth() const { return m_minWidth; } - virtual wxString GetTitle() const { return m_title; } - virtual int GetWidth() const; - virtual bool IsSortOrderAscending() const { return m_ascending; } - virtual bool IsSortKey() const; - virtual bool IsHidden() const; - - virtual void SetAlignment (wxAlignment align); - virtual void SetBitmap (wxBitmap const& bitmap); - virtual void SetFlags (int flags) { m_flags = flags; /*SetIndividualFlags(flags); */ } - virtual void SetHidden (bool hidden); - virtual void SetMaxWidth (int maxWidth); - virtual void SetMinWidth (int minWidth); - virtual void SetReorderable(bool reorderable); - virtual void SetResizeable (bool resizable); - virtual void SetSortable (bool sortable); - virtual void SetSortOrder (bool ascending); - virtual void SetTitle (wxString const& title); - virtual void SetWidth (int width); - - // implementation only - wxDataViewColumnNativeData* GetNativeData() const - { - return m_NativeDataPtr; - } - - void SetNativeData(wxDataViewColumnNativeData* newNativeDataPtr); // class takes ownership of pointer - int GetWidthVariable() const - { - return m_width; - } - void SetWidthVariable(int NewWidth) - { - m_width = NewWidth; - } - void SetSortOrderVariable(bool NewOrder) - { - m_ascending = NewOrder; - } - -private: - // common part of all ctors - void InitCommon(int width, wxAlignment align, int flags) - { - m_ascending = true; - m_flags = flags & ~wxDATAVIEW_COL_HIDDEN; // TODO - m_maxWidth = 30000; - m_minWidth = 0; - m_alignment = align; - SetWidth(width); - } - - bool m_ascending; // sorting order - - int m_flags; // flags for the column - int m_maxWidth; // maximum width for the column - int m_minWidth; // minimum width for the column - int m_width; // column width - - wxAlignment m_alignment; // column header alignment - - wxDataViewColumnNativeData* m_NativeDataPtr; // storing environment dependent data for the native implementation - - wxString m_title; // column title -}; - -// -// type definitions related to wxDataViewColumn -// -WX_DEFINE_ARRAY(wxDataViewColumn*,wxDataViewColumnPtrArrayType); - -// --------------------------------------------------------- -// wxDataViewCtrl -// --------------------------------------------------------- -class WXDLLIMPEXP_ADV wxDataViewCtrl: public wxDataViewCtrlBase -{ -public: - // Constructors / destructor: - wxDataViewCtrl() - { - Init(); - } - wxDataViewCtrl(wxWindow *parent, - wxWindowID winid, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxDataViewCtrlNameStr ) - { - Init(); - Create(parent, winid, pos, size, style, validator, name); - } - - ~wxDataViewCtrl(); - - bool Create(wxWindow *parent, - wxWindowID winid, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxDataViewCtrlNameStr); - - virtual wxWindow* GetMainWindow() // not used for the native implementation - { - return this; - } - - // inherited methods from wxDataViewCtrlBase: - virtual bool AssociateModel(wxDataViewModel* model) wxOVERRIDE; - - virtual bool AppendColumn (wxDataViewColumn* columnPtr) wxOVERRIDE; - virtual bool ClearColumns () wxOVERRIDE; - virtual bool DeleteColumn (wxDataViewColumn* columnPtr) wxOVERRIDE; - virtual wxDataViewColumn* GetColumn (unsigned int pos) const wxOVERRIDE; - virtual unsigned int GetColumnCount () const wxOVERRIDE; - virtual int GetColumnPosition(const wxDataViewColumn* columnPtr) const wxOVERRIDE; - virtual wxDataViewColumn* GetSortingColumn () const wxOVERRIDE; - virtual bool InsertColumn (unsigned int pos, wxDataViewColumn *col) wxOVERRIDE; - virtual bool PrependColumn (wxDataViewColumn* columnPtr) wxOVERRIDE; - - virtual void Collapse( const wxDataViewItem& item) wxOVERRIDE; - virtual void EnsureVisible(const wxDataViewItem& item, const wxDataViewColumn* columnPtr=NULL) wxOVERRIDE; - virtual void Expand(const wxDataViewItem& item) wxOVERRIDE; - virtual bool IsExpanded(const wxDataViewItem & item) const wxOVERRIDE; - - virtual unsigned int GetCount() const; - virtual wxRect GetItemRect(const wxDataViewItem& item, - const wxDataViewColumn* columnPtr = NULL) const wxOVERRIDE; - virtual int GetSelectedItemsCount() const wxOVERRIDE; - virtual int GetSelections(wxDataViewItemArray& sel) const wxOVERRIDE; - - virtual void HitTest(const wxPoint& point, wxDataViewItem& item, wxDataViewColumn*& columnPtr) const wxOVERRIDE; - - virtual bool IsSelected(const wxDataViewItem& item) const wxOVERRIDE; - - virtual void SelectAll() wxOVERRIDE; - virtual void Select(const wxDataViewItem& item) wxOVERRIDE; - virtual void SetSelections(const wxDataViewItemArray& sel) wxOVERRIDE; - - virtual void Unselect(const wxDataViewItem& item) wxOVERRIDE; - virtual void UnselectAll() wxOVERRIDE; - -// -// implementation -// - // returns a pointer to the native implementation - wxDataViewWidgetImpl* GetDataViewPeer() const; - - // adds all children of the passed parent to the control; if 'parentItem' is invalid the root(s) is/are added: - void AddChildren(wxDataViewItem const& parentItem); - - // finishes editing of custom items; if no custom item is currently edited the method does nothing - void FinishCustomItemEditing(); - - virtual void EditItem(const wxDataViewItem& item, const wxDataViewColumn *column) wxOVERRIDE; - - // returns the n-th pointer to a column; - // this method is different from GetColumn(unsigned int pos) because here 'n' is not a position in the control but the n-th - // position in the internal list/array of column pointers - wxDataViewColumn* GetColumnPtr(size_t n) const - { - return m_ColumnPtrs[n]; - } - // returns the current being rendered item of the customized renderer (this item is only valid during editing) - wxDataViewItem const& GetCustomRendererItem() const - { - return m_CustomRendererItem; - } - // returns a pointer to a customized renderer (this pointer is only valid during editing) - wxDataViewCustomRenderer* GetCustomRendererPtr() const - { - return m_CustomRendererPtr; - } - - // checks if currently a delete process is running - bool IsDeleting() const - { - return m_Deleting; - } - - // with CG, we need to get the context from an kEventControlDraw event - // unfortunately, the DataBrowser callbacks don't provide the context - // and we need it, so we need to set/remove it before and after draw - // events so we can access it in the callbacks. - void MacSetDrawingContext(void* context) - { - m_cgContext = context; - } - void* MacGetDrawingContext() const - { - return m_cgContext; - } - - // sets the currently being edited item of the custom renderer - void SetCustomRendererItem(wxDataViewItem const& NewItem) - { - m_CustomRendererItem = NewItem; - } - // sets the custom renderer - void SetCustomRendererPtr(wxDataViewCustomRenderer* NewCustomRendererPtr) - { - m_CustomRendererPtr = NewCustomRendererPtr; - } - // sets the flag indicating a deletion process: - void SetDeleting(bool deleting) - { - m_Deleting = deleting; - } - - virtual wxDataViewColumn *GetCurrentColumn() const wxOVERRIDE; - - virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE - { - return GetClassDefaultAttributes(GetWindowVariant()); - } - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - -protected: - // inherited methods from wxDataViewCtrlBase - virtual void DoSetExpanderColumn() wxOVERRIDE; - virtual void DoSetIndent() wxOVERRIDE; - - virtual wxSize DoGetBestSize() const wxOVERRIDE; - - // event handling - void OnSize(wxSizeEvent &event); - void OnMouse(wxMouseEvent &event); - -private: - // initializing of local variables: - void Init(); - - virtual wxDataViewItem DoGetCurrentItem() const wxOVERRIDE; - virtual void DoSetCurrentItem(const wxDataViewItem& item) wxOVERRIDE; - - // - // variables - // - bool m_Deleting; // flag indicating if a delete process is running; this flag is necessary because the notifier indicating an item deletion in the model may be called - // after the actual deletion of the item; then, native callback functions/delegates may try to update data of variables that are already deleted; - // if this flag is set all native variable update requests will be ignored - - void* m_cgContext; // pointer to core graphics context - - wxDataViewCustomRenderer* m_CustomRendererPtr; // pointer to a valid custom renderer while editing; this class does NOT own the pointer - - wxDataViewItem m_CustomRendererItem; // currently edited item by the customrenderer; it is invalid while not editing a custom item - - wxDataViewColumnPtrArrayType m_ColumnPtrs; // all column pointers are stored in an array - - wxDataViewModelNotifier* m_ModelNotifier; // stores the model notifier for the control (does not own the notifier) - - // wxWidget internal stuff: - wxDECLARE_DYNAMIC_CLASS(wxDataViewCtrl); - wxDECLARE_NO_COPY_CLASS(wxDataViewCtrl); - wxDECLARE_EVENT_TABLE(); -}; - -#endif // _WX_DATAVIEWCTRL_OSX_H_ - diff --git a/Externals/wxWidgets3/include/wx/osx/datectrl.h b/Externals/wxWidgets3/include/wx/osx/datectrl.h deleted file mode 100644 index 555ba68e99..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/datectrl.h +++ /dev/null @@ -1,54 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/datectrl.h -// Purpose: Declaration of wxOSX-specific wxDatePickerCtrl class. -// Author: Vadim Zeitlin -// Created: 2011-12-18 -// Copyright: (c) 2011 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_OSX_DATECTRL_H_ -#define _WX_OSX_DATECTRL_H_ - -// ---------------------------------------------------------------------------- -// wxDatePickerCtrl -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDatePickerCtrl : public wxDatePickerCtrlBase -{ -public: - // Constructors. - wxDatePickerCtrl() { } - - wxDatePickerCtrl(wxWindow *parent, - wxWindowID id, - const wxDateTime& dt = wxDefaultDateTime, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDP_DEFAULT | wxDP_SHOWCENTURY, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxDatePickerCtrlNameStr) - { - Create(parent, id, dt, pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxDateTime& dt = wxDefaultDateTime, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDP_DEFAULT | wxDP_SHOWCENTURY, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxDatePickerCtrlNameStr); - - // Implement the base class pure virtuals. - virtual void SetRange(const wxDateTime& dt1, const wxDateTime& dt2); - virtual bool GetRange(wxDateTime *dt1, wxDateTime *dt2) const; - - virtual void OSXGenerateEvent(const wxDateTime& dt); - -private: - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDatePickerCtrl); -}; - -#endif // _WX_OSX_DATECTRL_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/datetimectrl.h b/Externals/wxWidgets3/include/wx/osx/datetimectrl.h deleted file mode 100644 index 9993970125..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/datetimectrl.h +++ /dev/null @@ -1,33 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/datetimectrl.h -// Purpose: Declaration of wxOSX-specific wxDateTimePickerCtrl class. -// Author: Vadim Zeitlin -// Created: 2011-12-18 -// Copyright: (c) 2011 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_OSX_DATETIMECTRL_H_ -#define _WX_OSX_DATETIMECTRL_H_ - -class wxDateTimeWidgetImpl; - -// ---------------------------------------------------------------------------- -// wxDateTimePickerCtrl -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDateTimePickerCtrl : public wxDateTimePickerCtrlBase -{ -public: - // Implement the base class pure virtuals. - virtual void SetValue(const wxDateTime& dt); - virtual wxDateTime GetValue() const; - - // Implementation only. - virtual void OSXGenerateEvent(const wxDateTime& dt) = 0; - -protected: - wxDateTimeWidgetImpl* GetDateTimePeer() const; -}; - -#endif // _WX_OSX_DATETIMECTRL_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/dc.h b/Externals/wxWidgets3/include/wx/osx/dc.h deleted file mode 100644 index 84bb59c077..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/dc.h +++ /dev/null @@ -1,14 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/dc.h -// Purpose: wxDC class -// Author: Stefan Csomor -// Modified by: -// Created: 1998-01-01 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DC_H_ -#define _WX_DC_H_ - -#endif // _WX_DC_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/dcclient.h b/Externals/wxWidgets3/include/wx/osx/dcclient.h deleted file mode 100644 index 4c88220d9e..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/dcclient.h +++ /dev/null @@ -1,71 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/dcclient.h -// Purpose: wxClientDC, wxPaintDC and wxWindowDC classes -// Author: Stefan Csomor -// Modified by: -// Created: 1998-01-01 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DCCLIENT_H_ -#define _WX_DCCLIENT_H_ - -#include "wx/dc.h" -#include "wx/dcgraph.h" - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxPaintDC; -class WXDLLIMPEXP_FWD_CORE wxWindow; - -class WXDLLIMPEXP_CORE wxWindowDCImpl: public wxGCDCImpl -{ -public: - wxWindowDCImpl( wxDC *owner ); - wxWindowDCImpl( wxDC *owner, wxWindow *window ); - virtual ~wxWindowDCImpl(); - - virtual void DoGetSize( int *width, int *height ) const; - virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const; - -protected: - bool m_release; - int m_width; - int m_height; - - wxDECLARE_CLASS(wxWindowDCImpl); - wxDECLARE_NO_COPY_CLASS(wxWindowDCImpl); -}; - - -class WXDLLIMPEXP_CORE wxClientDCImpl: public wxWindowDCImpl -{ -public: - wxClientDCImpl( wxDC *owner ); - wxClientDCImpl( wxDC *owner, wxWindow *window ); - virtual ~wxClientDCImpl(); - -private: - wxDECLARE_CLASS(wxClientDCImpl); - wxDECLARE_NO_COPY_CLASS(wxClientDCImpl); -}; - - -class WXDLLIMPEXP_CORE wxPaintDCImpl: public wxWindowDCImpl -{ -public: - wxPaintDCImpl( wxDC *owner ); - wxPaintDCImpl( wxDC *owner, wxWindow *win ); - virtual ~wxPaintDCImpl(); - -protected: - wxDECLARE_CLASS(wxPaintDCImpl); - wxDECLARE_NO_COPY_CLASS(wxPaintDCImpl); -}; - - -#endif - // _WX_DCCLIENT_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/dcmemory.h b/Externals/wxWidgets3/include/wx/osx/dcmemory.h deleted file mode 100644 index 05fccf5075..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/dcmemory.h +++ /dev/null @@ -1,45 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/dcmemory.h -// Purpose: wxMemoryDC class -// Author: Stefan Csomor -// Modified by: -// Created: 1998-01-01 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DCMEMORY_H_ -#define _WX_DCMEMORY_H_ - -#include "wx/osx/dcclient.h" - -class WXDLLIMPEXP_CORE wxMemoryDCImpl: public wxPaintDCImpl -{ -public: - wxMemoryDCImpl( wxMemoryDC *owner ); - wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap ); - wxMemoryDCImpl( wxMemoryDC *owner, wxDC *dc ); - - virtual ~wxMemoryDCImpl(); - - virtual void DoGetSize( int *width, int *height ) const; - virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const - { return subrect == NULL ? GetSelectedBitmap() : GetSelectedBitmap().GetSubBitmap(*subrect); } - virtual void DoSelect(const wxBitmap& bitmap); - - virtual const wxBitmap& GetSelectedBitmap() const - { return m_selected; } - virtual wxBitmap& GetSelectedBitmap() - { return m_selected; } - -private: - void Init(); - - wxBitmap m_selected; - - wxDECLARE_CLASS(wxMemoryDCImpl); - wxDECLARE_NO_COPY_CLASS(wxMemoryDCImpl); -}; - -#endif - // _WX_DCMEMORY_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/dcprint.h b/Externals/wxWidgets3/include/wx/osx/dcprint.h deleted file mode 100644 index 7bebfbc37c..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/dcprint.h +++ /dev/null @@ -1,51 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/dcprint.h -// Purpose: wxPrinterDC class -// Author: Stefan Csomor -// Modified by: -// Created: 1998-01-01 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DCPRINT_H_ -#define _WX_DCPRINT_H_ - -#include "wx/dc.h" -#include "wx/dcgraph.h" -#include "wx/cmndata.h" - -class wxNativePrinterDC ; - -class WXDLLIMPEXP_CORE wxPrinterDCImpl: public wxGCDCImpl -{ -public: -#if wxUSE_PRINTING_ARCHITECTURE - - wxPrinterDCImpl( wxPrinterDC *owner, const wxPrintData& printdata ); - virtual ~wxPrinterDCImpl(); - - virtual bool StartDoc( const wxString& WXUNUSED(message) ) ; - virtual void EndDoc(void) ; - virtual void StartPage(void) ; - virtual void EndPage(void) ; - - wxRect GetPaperRect() const; - - wxPrintData& GetPrintData() { return m_printData; } - virtual wxSize GetPPI() const; - -protected: - virtual void DoGetSize( int *width, int *height ) const; - - wxPrintData m_printData ; - wxNativePrinterDC* m_nativePrinterDC ; - -private: - wxDECLARE_CLASS(wxPrinterDC); -#endif // wxUSE_PRINTING_ARCHITECTURE -}; - -#endif - // _WX_DCPRINT_H_ - diff --git a/Externals/wxWidgets3/include/wx/osx/dcscreen.h b/Externals/wxWidgets3/include/wx/osx/dcscreen.h deleted file mode 100644 index c6fdd335a2..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/dcscreen.h +++ /dev/null @@ -1,34 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/dcscreen.h -// Purpose: wxScreenDC class -// Author: Stefan Csomor -// Modified by: -// Created: 1998-01-01 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DCSCREEN_H_ -#define _WX_DCSCREEN_H_ - -#include "wx/dcclient.h" -#include "wx/osx/dcclient.h" - -class WXDLLIMPEXP_CORE wxScreenDCImpl: public wxWindowDCImpl -{ -public: - wxScreenDCImpl( wxDC *owner ); - virtual ~wxScreenDCImpl(); - - virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const; -private: - void* m_overlayWindow; - -private: - wxDECLARE_CLASS(wxScreenDCImpl); - wxDECLARE_NO_COPY_CLASS(wxScreenDCImpl); -}; - -#endif - // _WX_DCSCREEN_H_ - diff --git a/Externals/wxWidgets3/include/wx/osx/dialog.h b/Externals/wxWidgets3/include/wx/osx/dialog.h deleted file mode 100644 index 88d5462f15..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/dialog.h +++ /dev/null @@ -1,95 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/dialog.h -// Purpose: wxDialog class -// Author: Stefan Csomor -// Modified by: -// Created: 1998-01-01 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DIALOG_H_ -#define _WX_DIALOG_H_ - -#include "wx/panel.h" - -class WXDLLIMPEXP_FWD_CORE wxMacToolTip ; -class WXDLLIMPEXP_FWD_CORE wxModalEventLoop ; - -// Dialog boxes -class WXDLLIMPEXP_CORE wxDialog : public wxDialogBase -{ - wxDECLARE_DYNAMIC_CLASS(wxDialog); - -public: - wxDialog() { Init(); } - - // Constructor with no modal flag - the new convention. - wxDialog(wxWindow *parent, wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_DIALOG_STYLE, - const wxString& name = wxDialogNameStr) - { - Init(); - Create(parent, id, title, pos, size, style, name); - } - - bool Create(wxWindow *parent, wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_DIALOG_STYLE, - const wxString& name = wxDialogNameStr); - - virtual ~wxDialog(); - -// virtual bool Destroy(); - virtual bool Show(bool show = true); - - // return true if we're showing the dialog modally - virtual bool IsModal() const; - - // show the dialog modally and return the value passed to EndModal() - virtual int ShowModal(); - - virtual void ShowWindowModal(); - - // may be called to terminate the dialog with the given return code - virtual void EndModal(int retCode); - - static bool OSXHasModalDialogsOpen(); - static void OSXBeginModalDialog(); - static void OSXEndModalDialog(); - - // implementation - // -------------- - - wxDialogModality GetModality() const; - -#if wxOSX_USE_COCOA - virtual void ModalFinishedCallback(void* WXUNUSED(panel), int WXUNUSED(returnCode)) {} -#endif - -protected: - // show window modal dialog - void DoShowWindowModal(); - - // end window modal dialog. - void EndWindowModal(); - - // mac also takes command-period as cancel - virtual bool IsEscapeKey(const wxKeyEvent& event); - - - wxDialogModality m_modality; - - wxModalEventLoop* m_eventLoop; - -private: - void Init(); -}; - -#endif - // _WX_DIALOG_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/dirdlg.h b/Externals/wxWidgets3/include/wx/osx/dirdlg.h deleted file mode 100644 index c23cf71bf5..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/dirdlg.h +++ /dev/null @@ -1,70 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/dirdlg.h -// Purpose: wxDirDialog class -// Author: Stefan Csomor -// Modified by: -// Created: 1998-01-01 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DIRDLG_H_ -#define _WX_DIRDLG_H_ - -#if wxOSX_USE_COCOA - DECLARE_WXCOCOA_OBJC_CLASS(NSOpenPanel); -#endif - -class WXDLLIMPEXP_CORE wxDirDialog : public wxDirDialogBase -{ -public: - wxDirDialog() { Init(); } - - wxDirDialog(wxWindow *parent, - const wxString& message = wxDirSelectorPromptStr, - const wxString& defaultPath = wxT(""), - long style = wxDD_DEFAULT_STYLE, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - const wxString& name = wxDirDialogNameStr) - { - Init(); - - Create(parent,message,defaultPath,style,pos,size,name); - } - - void Create(wxWindow *parent, - const wxString& message = wxDirSelectorPromptStr, - const wxString& defaultPath = wxT(""), - long style = wxDD_DEFAULT_STYLE, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - const wxString& name = wxDirDialogNameStr); - -#if wxOSX_USE_COCOA - ~wxDirDialog(); -#endif - - virtual int ShowModal(); - -#if wxOSX_USE_COCOA - virtual void ShowWindowModal(); - virtual void ModalFinishedCallback(void* panel, int returnCode); -#endif - -private: -#if wxOSX_USE_COCOA - // Create and initialize NSOpenPanel that we use in both ShowModal() and - // ShowWindowModal(). - WX_NSOpenPanel OSXCreatePanel() const; - - WX_NSObject m_sheetDelegate; -#endif - - // Common part of all ctors. - void Init(); - - wxDECLARE_DYNAMIC_CLASS(wxDirDialog); -}; - -#endif // _WX_DIRDLG_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/dnd.h b/Externals/wxWidgets3/include/wx/osx/dnd.h deleted file mode 100644 index 7cd8ed2242..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/dnd.h +++ /dev/null @@ -1,108 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/dnd.h -// Purpose: Declaration of the wxDropTarget, wxDropSource class etc. -// Author: Stefan Csomor -// Copyright: (c) 1998 Stefan Csomor -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DND_H_ -#define _WX_DND_H_ - -#if wxUSE_DRAG_AND_DROP - -#include "wx/defs.h" -#include "wx/object.h" -#include "wx/string.h" -#include "wx/string.h" -#include "wx/dataobj.h" -#include "wx/cursor.h" - -//------------------------------------------------------------------------- -// classes -//------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxWindow; - -class WXDLLIMPEXP_FWD_CORE wxDropTarget; -class WXDLLIMPEXP_FWD_CORE wxTextDropTarget; -class WXDLLIMPEXP_FWD_CORE wxFileDropTarget; - -class WXDLLIMPEXP_FWD_CORE wxDropSource; - -// ---------------------------------------------------------------------------- -// macros -// ---------------------------------------------------------------------------- - -// this macro may be used instead for wxDropSource ctor arguments: it will use -// the icon 'name' from an XPM file under GTK, but will expand to something -// else under MSW. If you don't use it, you will have to use #ifdef in the -// application code. -#define wxDROP_ICON(X) wxCursor(X##_xpm) - -//------------------------------------------------------------------------- -// wxDropTarget -//------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxDropTarget: public wxDropTargetBase -{ - public: - - wxDropTarget(wxDataObject *dataObject = NULL ); - - virtual wxDragResult OnDragOver(wxCoord x, wxCoord y, wxDragResult def); - virtual bool OnDrop(wxCoord x, wxCoord y); - virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def); - virtual bool GetData(); - // NOTE: This is needed by the generic wxDataViewCtrl, not sure how to implement. - virtual wxDataFormat GetMatchingPair(); - - bool CurrentDragHasSupportedFormat() ; - void SetCurrentDragPasteboard( void* dragpasteboard ) { m_currentDragPasteboard = dragpasteboard ; } - protected : - void* m_currentDragPasteboard ; -}; - -//------------------------------------------------------------------------- -// wxDropSource -//------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxDropSource: public wxDropSourceBase -{ -public: - // ctors: if you use default ctor you must call SetData() later! - // - // NB: the "wxWindow *win" parameter is unused and is here only for wxGTK - // compatibility, as well as both icon parameters - wxDropSource( wxWindow *win = NULL, - const wxCursor &cursorCopy = wxNullCursor, - const wxCursor &cursorMove = wxNullCursor, - const wxCursor &cursorStop = wxNullCursor); - - /* constructor for setting one data object */ - wxDropSource( wxDataObject& data, - wxWindow *win, - const wxCursor &cursorCopy = wxNullCursor, - const wxCursor &cursorMove = wxNullCursor, - const wxCursor &cursorStop = wxNullCursor); - - virtual ~wxDropSource(); - - // do it (call this in response to a mouse button press, for example) - // params: if bAllowMove is false, data can be only copied - virtual wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly); - - wxWindow* GetWindow() { return m_window ; } - void SetCurrentDragPasteboard( void* dragpasteboard ) { m_currentDragPasteboard = dragpasteboard ; } - bool MacInstallDefaultCursor(wxDragResult effect) ; - static wxDropSource* GetCurrentDropSource(); - protected : - - wxWindow *m_window; - void* m_currentDragPasteboard ; -}; - -#endif // wxUSE_DRAG_AND_DROP - -#endif - //_WX_DND_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/dvrenderer.h b/Externals/wxWidgets3/include/wx/osx/dvrenderer.h deleted file mode 100644 index 6ef28ed39e..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/dvrenderer.h +++ /dev/null @@ -1,112 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/dvrenderer.h -// Purpose: wxDataViewRenderer for OS X wxDataViewCtrl implementations -// Author: Vadim Zeitlin -// Created: 2009-11-07 (extracted from wx/osx/dataview.h) -// Copyright: (c) 2009 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_OSX_DVRENDERER_H_ -#define _WX_OSX_DVRENDERER_H_ - -class wxDataViewRendererNativeData; - -// ---------------------------------------------------------------------------- -// wxDataViewRenderer -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDataViewRenderer : public wxDataViewRendererBase -{ -public: - // constructors / destructor - // ------------------------- - - wxDataViewRenderer(const wxString& varianttype, - wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, - int align = wxDVR_DEFAULT_ALIGNMENT); - - virtual ~wxDataViewRenderer(); - - // inherited methods from wxDataViewRendererBase - // --------------------------------------------- - - virtual int GetAlignment() const wxOVERRIDE - { - return m_alignment; - } - virtual wxDataViewCellMode GetMode() const wxOVERRIDE - { - return m_mode; - } - virtual bool GetValue(wxVariant& value) const wxOVERRIDE - { - value = m_value; - return true; - } - - // NB: in Carbon this is always identical to the header alignment - virtual void SetAlignment(int align) wxOVERRIDE; - virtual void SetMode(wxDataViewCellMode mode) wxOVERRIDE; - virtual bool SetValue(const wxVariant& newValue) wxOVERRIDE - { - m_value = newValue; - return true; - } - - virtual void EnableEllipsize(wxEllipsizeMode mode = wxELLIPSIZE_MIDDLE) wxOVERRIDE; - virtual wxEllipsizeMode GetEllipsizeMode() const wxOVERRIDE; - - // implementation - // -------------- - - const wxVariant& GetValue() const - { - return m_value; - } - - wxDataViewRendererNativeData* GetNativeData() const - { - return m_NativeDataPtr; - } - - // a call to the native data browser function to render the data; - // returns true if the data value could be rendered, false otherwise - virtual bool MacRender() = 0; - - void SetNativeData(wxDataViewRendererNativeData* newNativeDataPtr); - - -#if wxOSX_USE_COCOA - // called when a value was edited by user - virtual void OSXOnCellChanged(NSObject *value, - const wxDataViewItem& item, - unsigned col); - -protected: - virtual void SetAttr(const wxDataViewItemAttr& attr) wxOVERRIDE; - virtual void SetEnabled(bool enabled) wxOVERRIDE; -#else -protected: - void SetAttr(const wxDataViewItemAttr& WXUNUSED(attr)) wxOVERRIDE { }; - void SetEnabled(bool WXUNUSED(enabled)) wxOVERRIDE { }; -#endif - -private: - // contains the alignment flags - int m_alignment; - - // storing the mode that determines how the cell is going to be shown - wxDataViewCellMode m_mode; - - // data used by implementation of the native renderer - wxDataViewRendererNativeData* m_NativeDataPtr; - - // value that is going to be rendered - wxVariant m_value; - - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewRenderer); -}; - -#endif // _WX_OSX_DVRENDERER_H_ - diff --git a/Externals/wxWidgets3/include/wx/osx/dvrenderers.h b/Externals/wxWidgets3/include/wx/osx/dvrenderers.h deleted file mode 100644 index 2e43251261..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/dvrenderers.h +++ /dev/null @@ -1,222 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/dvrenderers.h -// Purpose: All OS X wxDataViewCtrl renderer classes -// Author: Vadim Zeitlin -// Created: 2009-11-07 (extracted from wx/osx/dataview.h) -// Copyright: (c) 2009 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_OSX_DVRENDERERS_H_ -#define _WX_OSX_DVRENDERERS_H_ - -// --------------------------------------------------------- -// wxDataViewCustomRenderer -// --------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDataViewCustomRenderer : public wxDataViewCustomRendererBase -{ -public: - static wxString GetDefaultType() { return wxS("string"); } - - wxDataViewCustomRenderer(const wxString& varianttype = GetDefaultType(), - wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, - int align = wxDVR_DEFAULT_ALIGNMENT); - - virtual ~wxDataViewCustomRenderer(); - - - // implementation only - // ------------------- - - virtual bool MacRender(); - - virtual wxDC* GetDC(); // creates a device context and keeps it - void SetDC(wxDC* newDCPtr); // this method takes ownership of the pointer - -private: - wxControl* m_editorCtrlPtr; // pointer to an in-place editor control - - wxDC* m_DCPtr; - - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCustomRenderer); -}; - -// --------------------------------------------------------- -// wxDataViewTextRenderer -// --------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDataViewTextRenderer: public wxDataViewRenderer -{ -public: - static wxString GetDefaultType() { return wxS("string"); } - - wxDataViewTextRenderer(const wxString& varianttype = GetDefaultType(), - wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, - int align = wxDVR_DEFAULT_ALIGNMENT); - - virtual bool MacRender(); - -#if wxOSX_USE_COCOA - virtual void OSXOnCellChanged(NSObject *value, - const wxDataViewItem& item, - unsigned col); -#endif // Cocoa - -private: - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewTextRenderer); -}; - -// --------------------------------------------------------- -// wxDataViewBitmapRenderer -// --------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDataViewBitmapRenderer: public wxDataViewRenderer -{ -public: - static wxString GetDefaultType() { return wxS("wxBitmap"); } - - wxDataViewBitmapRenderer(const wxString& varianttype = GetDefaultType(), - wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, - int align = wxDVR_DEFAULT_ALIGNMENT); - - virtual bool MacRender(); - -private: - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewBitmapRenderer); -}; - -#if wxOSX_USE_COCOA - -// ------------------------------------- -// wxDataViewChoiceRenderer -// ------------------------------------- - -class WXDLLIMPEXP_ADV wxDataViewChoiceRenderer: public wxDataViewRenderer -{ -public: - wxDataViewChoiceRenderer(const wxArrayString& choices, - wxDataViewCellMode mode = wxDATAVIEW_CELL_EDITABLE, - int alignment = wxDVR_DEFAULT_ALIGNMENT ); - - virtual bool MacRender(); - - wxString GetChoice(size_t index) const { return m_choices[index]; } - const wxArrayString& GetChoices() const { return m_choices; } - -#if wxOSX_USE_COCOA - virtual void OSXOnCellChanged(NSObject *value, - const wxDataViewItem& item, - unsigned col); -#endif // Cocoa - -private: - wxArrayString m_choices; - - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewChoiceRenderer); -}; - -#endif // wxOSX_USE_COCOA - -// --------------------------------------------------------- -// wxDataViewIconTextRenderer -// --------------------------------------------------------- -class WXDLLIMPEXP_ADV wxDataViewIconTextRenderer: public wxDataViewRenderer -{ -public: - static wxString GetDefaultType() { return wxS("wxDataViewIconText"); } - - wxDataViewIconTextRenderer(const wxString& varianttype = GetDefaultType(), - wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, - int align = wxDVR_DEFAULT_ALIGNMENT); - - virtual bool MacRender(); - -#if wxOSX_USE_COCOA - virtual void OSXOnCellChanged(NSObject *value, - const wxDataViewItem& item, - unsigned col); -#endif // Cocoa - -private: - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewIconTextRenderer); -}; - -// --------------------------------------------------------- -// wxDataViewToggleRenderer -// --------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDataViewToggleRenderer: public wxDataViewRenderer -{ -public: - static wxString GetDefaultType() { return wxS("bool"); } - - wxDataViewToggleRenderer(const wxString& varianttype = GetDefaultType(), - wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, - int align = wxDVR_DEFAULT_ALIGNMENT); - - virtual bool MacRender(); - -#if wxOSX_USE_COCOA - virtual void OSXOnCellChanged(NSObject *value, - const wxDataViewItem& item, - unsigned col); -#endif // Cocoa - -private: - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewToggleRenderer); -}; - -// --------------------------------------------------------- -// wxDataViewProgressRenderer -// --------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDataViewProgressRenderer: public wxDataViewRenderer -{ -public: - static wxString GetDefaultType() { return wxS("long"); } - - wxDataViewProgressRenderer(const wxString& label = wxEmptyString, - const wxString& varianttype = GetDefaultType(), - wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, - int align = wxDVR_DEFAULT_ALIGNMENT); - - virtual bool MacRender(); - -#if wxOSX_USE_COCOA - virtual void OSXOnCellChanged(NSObject *value, - const wxDataViewItem& item, - unsigned col); -#endif // Cocoa - -private: - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewProgressRenderer); -}; - -// --------------------------------------------------------- -// wxDataViewDateRenderer -// --------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDataViewDateRenderer: public wxDataViewRenderer -{ -public: - static wxString GetDefaultType() { return wxS("datetime"); } - - wxDataViewDateRenderer(const wxString& varianttype = GetDefaultType(), - wxDataViewCellMode mode = wxDATAVIEW_CELL_ACTIVATABLE, - int align = wxDVR_DEFAULT_ALIGNMENT); - - virtual bool MacRender(); - -#if wxOSX_USE_COCOA - virtual void OSXOnCellChanged(NSObject *value, - const wxDataViewItem& item, - unsigned col); -#endif // Cocoa - -private: - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewDateRenderer); -}; - -#endif // _WX_OSX_DVRENDERERS_H_ - diff --git a/Externals/wxWidgets3/include/wx/osx/evtloop.h b/Externals/wxWidgets3/include/wx/osx/evtloop.h deleted file mode 100644 index cbbab016d6..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/evtloop.h +++ /dev/null @@ -1,40 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/evtloop.h -// Purpose: simply forwards to wx/osx/carbon/evtloop.h or -// wx/osx/cocoa/evtloop.h for consistency with the other Mac -// headers -// Author: Vadim Zeitlin -// Modified by: -// Created: 2006-01-12 -// Copyright: (c) 2006 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_OSX_EVTLOOP_H_ -#define _WX_OSX_EVTLOOP_H_ - -#include "wx/osx/cocoa/evtloop.h" - -class WXDLLIMPEXP_FWD_CORE wxWindow; -class WXDLLIMPEXP_FWD_CORE wxNonOwnedWindow; - -class WXDLLIMPEXP_CORE wxModalEventLoop : public wxGUIEventLoop -{ -public: - wxModalEventLoop(wxWindow *modalWindow); - wxModalEventLoop(WXWindow modalNativeWindow); - -#ifdef __WXOSX_COCOA__ - // skip wxGUIEventLoop to avoid missing Enter/Exit notifications - virtual int Run() { return wxCFEventLoop::Run(); } -#endif -protected: - virtual void OSXDoRun(); - virtual void OSXDoStop(); - - // (in case) the modal window for this event loop - wxNonOwnedWindow* m_modalWindow; - WXWindow m_modalNativeWindow; -}; - -#endif // _WX_OSX_EVTLOOP_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/evtloopsrc.h b/Externals/wxWidgets3/include/wx/osx/evtloopsrc.h deleted file mode 100644 index 291ce0f1e4..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/evtloopsrc.h +++ /dev/null @@ -1,44 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/evtloopsrc.h -// Purpose: wxCFEventLoopSource class -// Author: Vadim Zeitlin -// Created: 2009-10-21 -// Copyright: (c) 2009 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_OSX_EVTLOOPSRC_H_ -#define _WX_OSX_EVTLOOPSRC_H_ - -typedef struct __CFSocket* CFSocketRef; - -// ---------------------------------------------------------------------------- -// wxCFEventLoopSource: CoreFoundation-based wxEventLoopSource for OS X -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxCFEventLoopSource : public wxEventLoopSource -{ -public: - // Create a new source in uninitialized state, call InitSocketRef() later - // to associate it with the socket it is going to use. - wxCFEventLoopSource(wxEventLoopSourceHandler *handler, int flags) - : wxEventLoopSource(handler, flags) - { - m_cfSocket = NULL; - } - - // Finish initialization of the event loop source by providing the - // associated socket. This object takes ownership of it and will release it. - void InitSourceSocket(CFSocketRef cfSocket); - - // Destructor deletes the associated socket. - virtual ~wxCFEventLoopSource(); - -private: - CFSocketRef m_cfSocket; - - wxDECLARE_NO_COPY_CLASS(wxCFEventLoopSource); -}; - -#endif // _WX_OSX_EVTLOOPSRC_H_ - diff --git a/Externals/wxWidgets3/include/wx/osx/filedlg.h b/Externals/wxWidgets3/include/wx/osx/filedlg.h deleted file mode 100644 index d8e8a862a6..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/filedlg.h +++ /dev/null @@ -1,111 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/filedlg.h -// Purpose: wxFileDialog class -// Author: Stefan Csomor -// Modified by: -// Created: 1998-01-01 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_FILEDLG_H_ -#define _WX_FILEDLG_H_ - -class WXDLLIMPEXP_FWD_CORE wxChoice; - -//------------------------------------------------------------------------- -// wxFileDialog -//------------------------------------------------------------------------- - -// set this system option to 1 in order to always show the filetypes popup in -// file open dialogs if possible - -#define wxOSX_FILEDIALOG_ALWAYS_SHOW_TYPES wxT("osx.openfiledialog.always-show-types") - -class WXDLLIMPEXP_CORE wxFileDialog: public wxFileDialogBase -{ - wxDECLARE_DYNAMIC_CLASS(wxFileDialog); -protected: - wxArrayString m_fileNames; - wxArrayString m_paths; - -public: - wxFileDialog() { Init(); } - wxFileDialog(wxWindow *parent, - const wxString& message = wxFileSelectorPromptStr, - const wxString& defaultDir = wxEmptyString, - const wxString& defaultFile = wxEmptyString, - const wxString& wildCard = wxFileSelectorDefaultWildcardStr, - long style = wxFD_DEFAULT_STYLE, - const wxPoint& pos = wxDefaultPosition, - const wxSize& sz = wxDefaultSize, - const wxString& name = wxFileDialogNameStr) - { - Init(); - - Create(parent,message,defaultDir,defaultFile,wildCard,style,pos,sz,name); - } - - void Create(wxWindow *parent, - const wxString& message = wxFileSelectorPromptStr, - const wxString& defaultDir = wxEmptyString, - const wxString& defaultFile = wxEmptyString, - const wxString& wildCard = wxFileSelectorDefaultWildcardStr, - long style = wxFD_DEFAULT_STYLE, - const wxPoint& pos = wxDefaultPosition, - const wxSize& sz = wxDefaultSize, - const wxString& name = wxFileDialogNameStr); - -#if wxOSX_USE_COCOA - ~wxFileDialog(); -#endif - - virtual void GetPaths(wxArrayString& paths) const { paths = m_paths; } - virtual void GetFilenames(wxArrayString& files) const { files = m_fileNames ; } - - virtual int ShowModal(); - -#if wxOSX_USE_COCOA - virtual void ShowWindowModal(); - virtual void ModalFinishedCallback(void* panel, int resultCode); -#endif - - virtual bool SupportsExtraControl() const; - - // implementation only - -#if wxOSX_USE_COCOA - // returns true if the file can be shown as active - bool CheckFile( const wxString& filename ); -#endif - -protected: - // not supported for file dialog, RR - virtual void DoSetSize(int WXUNUSED(x), int WXUNUSED(y), - int WXUNUSED(width), int WXUNUSED(height), - int WXUNUSED(sizeFlags) = wxSIZE_AUTO) {} - - void SetupExtraControls(WXWindow nativeWindow); - -#if wxOSX_USE_COCOA - virtual wxWindow* CreateFilterPanel(wxWindow *extracontrol); - void DoOnFilterSelected(int index); - virtual void OnFilterSelected(wxCommandEvent &event); - - wxArrayString m_filterExtensions; - wxArrayString m_filterNames; - wxChoice* m_filterChoice; - wxWindow* m_filterPanel; - bool m_useFileTypeFilter; - int m_firstFileTypeFilter; - wxArrayString m_currentExtensions; - WX_NSObject m_delegate; - WX_NSObject m_sheetDelegate; -#endif - -private: - // Common part of all ctors. - void Init(); -}; - -#endif // _WX_FILEDLG_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/font.h b/Externals/wxWidgets3/include/wx/osx/font.h deleted file mode 100644 index 93950f47a1..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/font.h +++ /dev/null @@ -1,182 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/font.h -// Purpose: wxFont class -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_FONT_H_ -#define _WX_FONT_H_ - -// ---------------------------------------------------------------------------- -// wxFont -// ---------------------------------------------------------------------------- - -// font styles -enum wxOSXSystemFont -{ - wxOSX_SYSTEM_FONT_NONE = 0, - wxOSX_SYSTEM_FONT_NORMAL, - wxOSX_SYSTEM_FONT_BOLD, - wxOSX_SYSTEM_FONT_SMALL, - wxOSX_SYSTEM_FONT_SMALL_BOLD, - wxOSX_SYSTEM_FONT_MINI, - wxOSX_SYSTEM_FONT_MINI_BOLD, - wxOSX_SYSTEM_FONT_LABELS, - wxOSX_SYSTEM_FONT_VIEWS -}; - - -class WXDLLIMPEXP_CORE wxFont : public wxFontBase -{ -public: - // ctors and such - wxFont() { } - - wxFont(const wxFontInfo& info) - { - Create(info.GetPointSize(), - info.GetFamily(), - info.GetStyle(), - info.GetWeight(), - info.IsUnderlined(), - info.GetFaceName(), - info.GetEncoding()); - - if ( info.IsUsingSizeInPixels() ) - SetPixelSize(info.GetPixelSize()); - } - - wxFont( wxOSXSystemFont systemFont ); - -#if wxOSX_USE_COCOA - wxFont(WX_NSFont nsfont); -#endif - - wxFont(int size, - wxFontFamily family, - wxFontStyle style, - wxFontWeight weight, - bool underlined = false, - const wxString& face = wxEmptyString, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT) - { - Create(size, family, style, weight, underlined, face, encoding); - } - - wxFont(const wxSize& pixelSize, - wxFontFamily family, - wxFontStyle style, - wxFontWeight weight, - bool underlined = false, - const wxString& face = wxEmptyString, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT) - { - Create(10, family, style, weight, underlined, face, encoding); - SetPixelSize(pixelSize); - } - - bool Create(int size, - wxFontFamily family, - wxFontStyle style, - wxFontWeight weight, - bool underlined = false, - const wxString& face = wxEmptyString, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT); - - wxFont(const wxNativeFontInfo& info) - { - (void)Create(info); - } - - wxFont(const wxString& fontDesc); - - bool Create(const wxNativeFontInfo& info); - - virtual ~wxFont(); - - // implement base class pure virtuals - virtual int GetPointSize() const; - virtual wxSize GetPixelSize() const; - virtual wxFontStyle GetStyle() const; - virtual wxFontWeight GetWeight() const; - virtual bool GetUnderlined() const; - virtual bool GetStrikethrough() const; - virtual wxString GetFaceName() const; - virtual wxFontEncoding GetEncoding() const; - virtual const wxNativeFontInfo *GetNativeFontInfo() const; - - virtual bool IsFixedWidth() const; - - virtual void SetPointSize(int pointSize); - virtual void SetFamily(wxFontFamily family); - virtual void SetStyle(wxFontStyle style); - virtual void SetWeight(wxFontWeight weight); - virtual bool SetFaceName(const wxString& faceName); - virtual void SetUnderlined(bool underlined); - virtual void SetStrikethrough(bool strikethrough); - virtual void SetEncoding(wxFontEncoding encoding); - - wxDECLARE_COMMON_FONT_METHODS(); - - wxDEPRECATED_MSG("use wxFONT{FAMILY,STYLE,WEIGHT}_XXX constants") - wxFont(int size, - int family, - int style, - int weight, - bool underlined = false, - const wxString& face = wxEmptyString, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT); - - - // implementation only from now on - // ------------------------------- - - virtual bool RealizeResource(); - - // Mac-specific, risks to change, don't use in portable code - -#if wxOSX_USE_COCOA_OR_CARBON - CGFontRef OSXGetCGFont() const; -#endif - - CTFontRef OSXGetCTFont() const; - -#if wxOSX_USE_ATSU_TEXT - // Returns an ATSUStyle not ATSUStyle* - void* MacGetATSUStyle() const ; - void* OSXGetATSUStyle() const { return MacGetATSUStyle() ; } - - wxDEPRECATED( wxUint32 MacGetATSUFontID() const ); - wxDEPRECATED( wxUint32 MacGetATSUAdditionalQDStyles() const ); -#endif - -#if wxOSX_USE_COCOA - WX_NSFont OSXGetNSFont() const; - static WX_NSFont OSXCreateNSFont(wxOSXSystemFont font, wxNativeFontInfo* info); - static WX_NSFont OSXCreateNSFont(const wxNativeFontInfo* info); - static void SetNativeInfoFromNSFont(WX_NSFont nsfont, wxNativeFontInfo* info); -#endif - -#if wxOSX_USE_IPHONE - WX_UIFont OSXGetUIFont() const; - static WX_UIFont OSXCreateUIFont(wxOSXSystemFont font, wxNativeFontInfo* info); - static WX_UIFont OSXCreateUIFont(const wxNativeFontInfo* info); -#endif - -protected: - virtual void DoSetNativeFontInfo(const wxNativeFontInfo& info); - virtual wxFontFamily DoGetFamily() const; - - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; - -private: - - wxDECLARE_DYNAMIC_CLASS(wxFont); -}; - -#endif // _WX_FONT_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/fontdlg.h b/Externals/wxWidgets3/include/wx/osx/fontdlg.h deleted file mode 100644 index 817501e39b..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/fontdlg.h +++ /dev/null @@ -1,173 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/fontdlg.h -// Purpose: wxFontDialog class using fonts window services (10.2+). -// Author: Ryan Norton -// Modified by: -// Created: 2004-09-25 -// Copyright: (c) Ryan Norton -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_FONTDLG_H_ -#define _WX_FONTDLG_H_ - -#include "wx/dialog.h" - -/* - * Font dialog - */ - -/* - * support old notation - */ -#ifdef wxMAC_USE_EXPERIMENTAL_FONTDIALOG -#define wxOSX_USE_EXPERIMENTAL_FONTDIALOG wxMAC_USE_EXPERIMENTAL_FONTDIALOG -#endif - -#ifndef wxOSX_USE_EXPERIMENTAL_FONTDIALOG -#define wxOSX_USE_EXPERIMENTAL_FONTDIALOG 1 -#endif - -#if wxOSX_USE_EXPERIMENTAL_FONTDIALOG - -class WXDLLIMPEXP_CORE wxFontDialog : public wxDialog -{ -public: - wxFontDialog(); - wxFontDialog(wxWindow *parent); - wxFontDialog(wxWindow *parent, const wxFontData& data); - virtual ~wxFontDialog(); - - bool Create(wxWindow *parent); - bool Create(wxWindow *parent, const wxFontData& data); - - int ShowModal(); - wxFontData& GetFontData() { return m_fontData; } - -protected: - wxFontData m_fontData; - - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxFontDialog); -}; - -extern "C" int RunMixedFontDialog(wxFontDialog* dialog) ; - -#else // wxOSX_USE_EXPERIMENTAL_FONTDIALOG - -#if !USE_NATIVE_FONT_DIALOG_FOR_MACOSX - -/*! - * Forward declarations - */ - -class wxFontColourSwatchCtrl; -class wxFontPreviewCtrl; -class WXDLLIMPEXP_FWD_CORE wxSpinCtrl; -class WXDLLIMPEXP_FWD_CORE wxSpinEvent; -class WXDLLIMPEXP_FWD_CORE wxListBox; -class WXDLLIMPEXP_FWD_CORE wxChoice; -class WXDLLIMPEXP_FWD_CORE wxButton; -class WXDLLIMPEXP_FWD_CORE wxStaticText; -class WXDLLIMPEXP_FWD_CORE wxCheckBox; - -/*! - * Control identifiers - */ - -#define wxID_FONTDIALOG_FACENAME 20001 -#define wxID_FONTDIALOG_FONTSIZE 20002 -#define wxID_FONTDIALOG_BOLD 20003 -#define wxID_FONTDIALOG_ITALIC 20004 -#define wxID_FONTDIALOG_UNDERLINED 20005 -#define wxID_FONTDIALOG_COLOUR 20006 -#define wxID_FONTDIALOG_PREVIEW 20007 - -#endif - // !USE_NATIVE_FONT_DIALOG_FOR_MACOSX - -class WXDLLIMPEXP_CORE wxFontDialog: public wxDialog -{ - wxDECLARE_DYNAMIC_CLASS(wxFontDialog); - -#if !USE_NATIVE_FONT_DIALOG_FOR_MACOSX - wxDECLARE_EVENT_TABLE(); -#endif - -public: - wxFontDialog(); - wxFontDialog(wxWindow *parent, const wxFontData& data); - virtual ~wxFontDialog(); - - bool Create(wxWindow *parent, const wxFontData& data); - - int ShowModal(); - wxFontData& GetFontData() { return m_fontData; } - bool IsShown() const; - void OnPanelClose(); - void SetData(const wxFontData& data); - -#if !USE_NATIVE_FONT_DIALOG_FOR_MACOSX - - /// Creates the controls and sizers - void CreateControls(); - - /// Initialize font - void InitializeFont(); - - /// Set controls according to current font - void InitializeControls(); - - /// Respond to font change - void ChangeFont(); - - /// Respond to colour change - void OnColourChanged(wxCommandEvent& event); - - /// wxEVT_LISTBOX event handler for wxID_FONTDIALOG_FACENAME - void OnFontdialogFacenameSelected( wxCommandEvent& event ); - - /// wxEVT_SPINCTRL event handler for wxID_FONTDIALOG_FONTSIZE - void OnFontdialogFontsizeUpdated( wxSpinEvent& event ); - - /// wxEVT_TEXT event handler for wxID_FONTDIALOG_FONTSIZE - void OnFontdialogFontsizeTextUpdated( wxCommandEvent& event ); - - /// wxEVT_CHECKBOX event handler for wxID_FONTDIALOG_BOLD - void OnFontdialogBoldClick( wxCommandEvent& event ); - - /// wxEVT_CHECKBOX event handler for wxID_FONTDIALOG_ITALIC - void OnFontdialogItalicClick( wxCommandEvent& event ); - - /// wxEVT_CHECKBOX event handler for wxID_FONTDIALOG_UNDERLINED - void OnFontdialogUnderlinedClick( wxCommandEvent& event ); - - /// wxEVT_BUTTON event handler for wxID_OK - void OnOkClick( wxCommandEvent& event ); - - /// Should we show tooltips? - static bool ShowToolTips(); - - wxListBox* m_facenameCtrl; - wxSpinCtrl* m_sizeCtrl; - wxCheckBox* m_boldCtrl; - wxCheckBox* m_italicCtrl; - wxCheckBox* m_underlinedCtrl; - wxFontColourSwatchCtrl* m_colourCtrl; - wxFontPreviewCtrl* m_previewCtrl; - - wxFont m_dialogFont; - bool m_suppressUpdates; - -#endif - // !USE_NATIVE_FONT_DIALOG_FOR_MACOSX - -protected: - wxWindow* m_dialogParent; - wxFontData m_fontData; - void* m_pEventHandlerRef; -}; - -#endif - -#endif - // _WX_FONTDLG_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/frame.h b/Externals/wxWidgets3/include/wx/osx/frame.h deleted file mode 100644 index 195145281f..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/frame.h +++ /dev/null @@ -1,117 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/frame.h -// Purpose: wxFrame class -// Author: Stefan Csomor -// Modified by: -// Created: 1998-01-01 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_FRAME_H_ -#define _WX_FRAME_H_ - -#include "wx/toolbar.h" -#include "wx/accel.h" -#include "wx/icon.h" - -class WXDLLIMPEXP_FWD_CORE wxMacToolTip ; - -class WXDLLIMPEXP_CORE wxFrame: public wxFrameBase -{ -public: - // construction - wxFrame() { Init(); } - wxFrame(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr) - { - Init(); - - Create(parent, id, title, pos, size, style, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr); - - // implementation only from now on - // ------------------------------- - - // get the origin of the client area (which may be different from (0, 0) - // if the frame has a toolbar) in client coordinates - virtual wxPoint GetClientAreaOrigin() const wxOVERRIDE; - - // override some more virtuals - virtual bool Show(bool show = true) wxOVERRIDE; - virtual bool Enable(bool enable = true) wxOVERRIDE; - - // event handlers - void OnActivate(wxActivateEvent& event); - void OnSysColourChanged(wxSysColourChangedEvent& event); - - // Toolbar -#if wxUSE_TOOLBAR - virtual wxToolBar* CreateToolBar(long style = -1, - wxWindowID id = -1, - const wxString& name = wxToolBarNameStr) wxOVERRIDE; - - virtual void SetToolBar(wxToolBar *toolbar) wxOVERRIDE; -#endif // wxUSE_TOOLBAR - - // Status bar -#if wxUSE_STATUSBAR - virtual wxStatusBar* OnCreateStatusBar(int number = 1, - long style = wxSTB_DEFAULT_STYLE, - wxWindowID id = 0, - const wxString& name = wxStatusLineNameStr) wxOVERRIDE; -#endif // wxUSE_STATUSBAR - - // called by wxWindow whenever it gets focus - void SetLastFocus(wxWindow *win) { m_winLastFocused = win; } - wxWindow *GetLastFocus() const { return m_winLastFocused; } - - void PositionBars(); - - // internal response to size events - virtual void MacOnInternalSize() wxOVERRIDE { PositionBars(); } - -protected: - // common part of all ctors - void Init(); - -#if wxUSE_TOOLBAR - virtual void PositionToolBar() wxOVERRIDE; -#endif -#if wxUSE_STATUSBAR - virtual void PositionStatusBar() wxOVERRIDE; -#endif - - // override base class virtuals - virtual void DoGetClientSize(int *width, int *height) const wxOVERRIDE; - virtual void DoSetClientSize(int width, int height) wxOVERRIDE; - -#if wxUSE_MENUS - virtual void DetachMenuBar() wxOVERRIDE; - virtual void AttachMenuBar(wxMenuBar *menubar) wxOVERRIDE; -#endif - - // the last focused child: we restore focus to it on activation - wxWindow *m_winLastFocused; - - virtual bool MacIsChildOfClientArea( const wxWindow* child ) const wxOVERRIDE; - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_DYNAMIC_CLASS(wxFrame); -}; - -#endif - // _WX_FRAME_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/fswatcher_fsevents.h b/Externals/wxWidgets3/include/wx/osx/fswatcher_fsevents.h deleted file mode 100644 index bbaa95d951..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/fswatcher_fsevents.h +++ /dev/null @@ -1,88 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/fswatcher_fsevents.h -// Purpose: File System watcher that uses the FSEvents API -// of OS X to efficiently watch trees -// Author: Roberto Perpuly -// Created: 2015-04-24 -// Copyright: (c) 2015 Roberto Perpuly -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_FSWATCHER_FSEVENTS_H_ -#define _WX_FSWATCHER_FSEVENTS_H_ - -#include "wx/defs.h" - -#if wxUSE_FSWATCHER - -#include -#include "wx/unix/fswatcher_kqueue.h" - -WX_DECLARE_STRING_HASH_MAP(FSEventStreamRef, FSEventStreamRefMap); - -/* - The FSEvents watcher uses the newer FSEvents service - that is available in OS X, the service allows for - efficient watching of entire directory hierarchies. - Note that adding a single file watch (or directory - watch) still use kqueue events. - - We take care to only use this on OS X >= 10.7, as that - version introduced the ability to get file-level notifications. - - See the following docs that outline the FSEvents API - - https://developer.apple.com/library/mac/documentation/Darwin/Conceptual/FSEvents_ProgGuide/UsingtheFSEventsFramework/UsingtheFSEventsFramework.html - - https://developer.apple.com/library/mac/documentation/Darwin/Reference/FSEvents_Ref/index.html -*/ -class WXDLLIMPEXP_BASE wxFsEventsFileSystemWatcher : - public wxKqueueFileSystemWatcher -{ -public: - wxFsEventsFileSystemWatcher(); - - wxFsEventsFileSystemWatcher(const wxFileName& path, - int events = wxFSW_EVENT_ALL); - - ~wxFsEventsFileSystemWatcher(); - - // reimplement adding a tree so that it does not use - // kqueue at all - bool AddTree(const wxFileName& path, int events = wxFSW_EVENT_ALL, - const wxString& filespec = wxEmptyString) wxOVERRIDE; - - // reimplement removing a tree so that we - // cleanup the opened fs streams - bool RemoveTree(const wxFileName& path) wxOVERRIDE; - - // reimplement remove all so that we cleanup - // watches from kqeueue and from FSEvents - bool RemoveAll() wxOVERRIDE; - - // post an file change event to the owner - void PostChange(const wxFileName& oldFileName, - const wxFileName& newFileName, int event); - - // post a warning event to the owner - void PostWarning(wxFSWWarningType warning, const wxString& msg); - - // post an error event to the owner - void PostError(const wxString& msg); - - // reimplement count to include the FS stream watches - int GetWatchedPathsCount() const; - - // reimplement to include paths from FS stream watches - int GetWatchedPaths(wxArrayString* paths) const; - -private: - - // map of path => FSEventStreamRef - FSEventStreamRefMap m_streams; - -}; - -#endif /* wxUSE_FSWATCHER */ - -#endif /* _WX_FSWATCHER_FSEVENTS_H_ */ diff --git a/Externals/wxWidgets3/include/wx/osx/gauge.h b/Externals/wxWidgets3/include/wx/osx/gauge.h deleted file mode 100644 index cfd9ff5ce4..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/gauge.h +++ /dev/null @@ -1,53 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/gauge.h -// Purpose: wxGauge class -// Author: Stefan Csomor -// Modified by: -// Created: 1998-01-01 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GAUGE_H_ -#define _WX_GAUGE_H_ - -#include "wx/control.h" - -// Group box -class WXDLLIMPEXP_CORE wxGauge: public wxGaugeBase -{ - public: - wxGauge() { } - - wxGauge(wxWindow *parent, wxWindowID id, - int range, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxGA_HORIZONTAL, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxGaugeNameStr) - { - Create(parent, id, range, pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, wxWindowID id, - int range, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxGA_HORIZONTAL, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxGaugeNameStr); - - // set gauge range/value - virtual void SetRange(int range); - virtual void SetValue(int pos); - virtual int GetValue() const ; - - void Pulse(); - - protected: - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxGauge); -}; - -#endif - // _WX_GAUGE_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/glcanvas.h b/Externals/wxWidgets3/include/wx/osx/glcanvas.h deleted file mode 100644 index 24cac5b5d2..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/glcanvas.h +++ /dev/null @@ -1,168 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/glcanvas.h -// Purpose: wxGLCanvas, for using OpenGL with wxWidgets under Macintosh -// Author: Stefan Csomor -// Modified by: -// Created: 1998-01-01 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GLCANVAS_H_ -#define _WX_GLCANVAS_H_ - -#ifdef __WXOSX_IPHONE__ -#import -#import -#define wxUSE_OPENGL_EMULATION 1 -#else -#include -#endif - -#include "wx/vector.h" - -// low level calls - -WXDLLIMPEXP_GL WXGLContext WXGLCreateContext( WXGLPixelFormat pixelFormat, WXGLContext shareContext ); -WXDLLIMPEXP_GL void WXGLDestroyContext( WXGLContext context ); - -WXDLLIMPEXP_GL WXGLContext WXGLGetCurrentContext(); -WXDLLIMPEXP_GL bool WXGLSetCurrentContext(WXGLContext context); - -WXDLLIMPEXP_GL WXGLPixelFormat WXGLChoosePixelFormat(const int *GLAttrs = NULL, - int n1 = 0, - const int *ctxAttrs = NULL, - int n2 = 0); -WXDLLIMPEXP_GL void WXGLDestroyPixelFormat( WXGLPixelFormat pixelFormat ); - -class WXDLLIMPEXP_GL wxGLContext : public wxGLContextBase -{ -public: - wxGLContext(wxGLCanvas *win, - const wxGLContext *other = NULL, - const wxGLContextAttrs *ctxAttrs = NULL); - virtual ~wxGLContext(); - - virtual bool SetCurrent(const wxGLCanvas& win) const; - - // Mac-specific - WXGLContext GetWXGLContext() const { return m_glContext; } - -private: - WXGLContext m_glContext; - - wxDECLARE_NO_COPY_CLASS(wxGLContext); -}; - -class WXDLLIMPEXP_GL wxGLCanvas : public wxGLCanvasBase -{ -public: - wxGLCanvas(wxWindow *parent, - const wxGLAttributes& dispAttrs, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxGLCanvasName, - const wxPalette& palette = wxNullPalette); - - wxGLCanvas(wxWindow *parent, - wxWindowID id = wxID_ANY, - const int *attribList = NULL, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxGLCanvasName, - const wxPalette& palette = wxNullPalette); - - bool Create(wxWindow *parent, - const wxGLAttributes& dispAttrs, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxGLCanvasName, - const wxPalette& palette = wxNullPalette); - - bool Create(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxGLCanvasName, - const int *attribList = NULL, - const wxPalette& palette = wxNullPalette); - - virtual ~wxGLCanvas(); - - // implement wxGLCanvasBase methods - virtual bool SwapBuffers() wxOVERRIDE; - - - // Mac-specific functions - // ---------------------- - - // return true if multisample extension is supported - static bool IsAGLMultiSampleAvailable(); - - // return the pixel format used by this window - WXGLPixelFormat GetWXGLPixelFormat() const { return m_glFormat; } - - // Return the copy of attributes passed at ctor - wxGLAttributes& GetGLDispAttrs() { return m_GLAttrs; } - - // update the view port of the current context to match this window - void SetViewport(); - - - // deprecated methods - // ------------------ - -#if WXWIN_COMPATIBILITY_2_8 - wxDEPRECATED( - wxGLCanvas(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxGLCanvasName, - const int *attribList = NULL, - const wxPalette& palette = wxNullPalette) - ); - - wxDEPRECATED( - wxGLCanvas(wxWindow *parent, - const wxGLContext *shared, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxGLCanvasName, - const int *attribList = NULL, - const wxPalette& palette = wxNullPalette) - ); - - wxDEPRECATED( - wxGLCanvas(wxWindow *parent, - const wxGLCanvas *shared, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxGLCanvasName, - const int *attribList = NULL, - const wxPalette& palette = wxNullPalette) - ); -#endif // WXWIN_COMPATIBILITY_2_8 - - // implementation-only from now on - -protected: - WXGLPixelFormat m_glFormat; - wxGLAttributes m_GLAttrs; - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_CLASS(wxGLCanvas); -}; - -#endif // _WX_GLCANVAS_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/icon.h b/Externals/wxWidgets3/include/wx/osx/icon.h deleted file mode 100644 index 1ac332a2a2..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/icon.h +++ /dev/null @@ -1,100 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/icon.h -// Purpose: wxIcon class -// Author: Stefan Csomor -// Modified by: -// Created: 1998-01-01 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_ICON_H_ -#define _WX_ICON_H_ - -#include "wx/bitmap.h" - -// Icon -class WXDLLIMPEXP_CORE wxIcon : public wxGDIObject -{ -public: - wxIcon(); - - wxIcon(const char* const* data); - wxIcon(const char bits[], int width , int height ); - wxIcon(const wxString& name, wxBitmapType flags = wxICON_DEFAULT_TYPE, - int desiredWidth = -1, int desiredHeight = -1); - wxIcon(const wxIconLocation& loc) - { - LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ICON); - } - - wxIcon(WXHICON icon, const wxSize& size); - - virtual ~wxIcon(); - - bool LoadFile(const wxString& name, wxBitmapType flags = wxICON_DEFAULT_TYPE, - int desiredWidth = -1, int desiredHeight = -1); - - - // create from bitmap (which should have a mask unless it's monochrome): - // there shouldn't be any implicit bitmap -> icon conversion (i.e. no - // ctors, assignment operators...), but it's ok to have such function - void CopyFromBitmap(const wxBitmap& bmp); - - int GetWidth() const; - int GetHeight() const; - int GetDepth() const; - void SetWidth(int w); - void SetHeight(int h); - void SetDepth(int d); - void SetOk(bool isOk); - - wxSize GetSize() const { return wxSize(GetWidth(), GetHeight()); } - - WXHICON GetHICON() const; - -#if wxOSX_USE_COCOA - WX_NSImage GetNSImage() const ; -#endif - -protected: - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; - -private: - wxDECLARE_DYNAMIC_CLASS(wxIcon); - - bool LoadIconFromSystemResource(const wxString& resourceName, int desiredWidth, int desiredHeight); - bool LoadIconFromBundleResource(const wxString& resourceName, int desiredWidth, int desiredHeight); - bool LoadIconFromFile(const wxString& filename, int desiredWidth, int desiredHeight); - bool LoadIconAsBitmap(const wxString& filename, wxBitmapType flags = wxICON_DEFAULT_TYPE, int desiredWidth = -1, int desiredHeight = -1); -}; - -class WXDLLIMPEXP_CORE wxICONResourceHandler: public wxBitmapHandler -{ -public: - wxICONResourceHandler() - { - SetName(wxT("ICON resource")); - SetExtension(wxEmptyString); - SetType(wxBITMAP_TYPE_ICON_RESOURCE); - } - - virtual bool LoadFile(wxBitmap *bitmap, - const wxString& name, - wxBitmapType flags, - int desiredWidth = -1, - int desiredHeight = -1); - - // unhide the base class virtual - virtual bool LoadFile(wxBitmap *bitmap, - const wxString& name, - wxBitmapType flags) - { return LoadFile(bitmap, name, flags, -1, -1); } - -private: - wxDECLARE_DYNAMIC_CLASS(wxICONResourceHandler); -}; - -#endif - // _WX_ICON_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/imaglist.h b/Externals/wxWidgets3/include/wx/osx/imaglist.h deleted file mode 100644 index 0173832e75..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/imaglist.h +++ /dev/null @@ -1,61 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/imaglist.h -// Purpose: -// Author: Robert Roebling, Stefan Csomor -// Created: 01/02/97 -// Id: -// Copyright: (c) 1998 Robert Roebling and Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_IMAGLIST_H_ -#define _WX_IMAGLIST_H_ - -#include "wx/defs.h" -#include "wx/list.h" -#include "wx/icon.h" - -class WXDLLIMPEXP_FWD_CORE wxDC; -class WXDLLIMPEXP_FWD_CORE wxBitmap; -class WXDLLIMPEXP_FWD_CORE wxColour; - -class WXDLLIMPEXP_CORE wxImageList: public wxObject -{ -public: - wxImageList() { m_width = m_height = 0; } - wxImageList( int width, int height, bool mask = true, int initialCount = 1 ); - virtual ~wxImageList(); - bool Create( int width, int height, bool mask = true, int initialCount = 1 ); - bool Create(); - - virtual int GetImageCount() const; - virtual bool GetSize( int index, int &width, int &height ) const; - virtual wxSize GetSize() const { return wxSize(m_width, m_height); } - - int Add( const wxIcon& bitmap ); - int Add( const wxBitmap& bitmap ); - int Add( const wxBitmap& bitmap, const wxBitmap& mask ); - int Add( const wxBitmap& bitmap, const wxColour& maskColour ); - wxBitmap GetBitmap(int index) const; - wxIcon GetIcon(int index) const; - bool Replace( int index, const wxIcon &bitmap ); - bool Replace( int index, const wxBitmap &bitmap ); - bool Replace( int index, const wxBitmap &bitmap, const wxBitmap &mask ); - bool Remove( int index ); - bool RemoveAll(); - - virtual bool Draw(int index, wxDC& dc, int x, int y, - int flags = wxIMAGELIST_DRAW_NORMAL, - bool solidBackground = false); - -private: - wxList m_images; - - int m_width; - int m_height; - - wxDECLARE_DYNAMIC_CLASS(wxImageList); -}; - -#endif // _WX_IMAGLIST_H_ - diff --git a/Externals/wxWidgets3/include/wx/osx/iphone/chkconf.h b/Externals/wxWidgets3/include/wx/osx/iphone/chkconf.h deleted file mode 100644 index 7b3dad1be2..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/iphone/chkconf.h +++ /dev/null @@ -1,378 +0,0 @@ -/* - * Name: wx/osx/iphone/chkconf.h - * Purpose: Compiler-specific configuration checking - * Author: Stefan Csomor - * Modified by: - * Created: 2008-07-30 - * Copyright: (c) Stefan Csomor - * Licence: wxWindows licence - */ - -#ifndef _WX_OSX_IPHONE_CHKCONF_H_ -#define _WX_OSX_IPHONE_CHKCONF_H_ - -/* - * text rendering system - */ - -/* we have different options and we turn on all that make sense - * under a certain platform - */ - -#define wxOSX_USE_ATSU_TEXT 0 -#define wxHAS_OPENGL_ES - -#define wxOSX_USE_QUICKTIME 0 -#define wxOSX_USE_AUDIOTOOLBOX 1 - -/* - * turning off capabilities that don't work under iphone yet - */ - -#if wxUSE_MIMETYPE -#undef wxUSE_MIMETYPE -#define wxUSE_MIMETYPE 0 -#endif - -#if wxUSE_MDI -#undef wxUSE_MDI -#define wxUSE_MDI 0 -#endif - -#if wxUSE_MDI_ARCHITECTURE -#undef wxUSE_MDI_ARCHITECTURE -#define wxUSE_MDI_ARCHITECTURE 0 -#endif - -#if wxUSE_DRAG_AND_DROP -#undef wxUSE_DRAG_AND_DROP -#define wxUSE_DRAG_AND_DROP 0 -#endif - -#if wxUSE_TASKBARICON -#undef wxUSE_TASKBARICON -#define wxUSE_TASKBARICON 0 -#endif - -#if wxUSE_TOOLTIPS -#undef wxUSE_TOOLTIPS -#define wxUSE_TOOLTIPS 0 -#endif - -#if wxUSE_DATAVIEWCTRL -#undef wxUSE_DATAVIEWCTRL -#define wxUSE_DATAVIEWCTRL 0 -#endif - -#if wxUSE_TREELISTCTRL -#undef wxUSE_TREELISTCTRL -#define wxUSE_TREELISTCTRL 0 -#endif - -#if wxUSE_DRAG_AND_DROP -#undef wxUSE_DRAG_AND_DROP -#define wxUSE_DRAG_AND_DROP 0 -#endif - -#if wxUSE_TASKBARICON -#undef wxUSE_TASKBARICON -#define wxUSE_TASKBARICON 0 -#endif - -#define wxUSE_BUTTON 1 - -#if wxUSE_CARET -#undef wxUSE_CARET -#define wxUSE_CARET 0 -#endif - -#if wxUSE_CHOICE -#undef wxUSE_CHOICE -#define wxUSE_CHOICE 0 -#endif - -#if wxUSE_COMBOBOX -#undef wxUSE_COMBOBOX -#define wxUSE_COMBOBOX 0 -#endif - -#ifndef __WXUNIVERSAL__ -#undef wxUSE_SCROLLBAR -#define wxUSE_SCROLLBAR 0 -#endif - -#undef wxUSE_STATUSBAR -#undef wxUSE_NATIVE_STATUSBAR -#undef wxUSE_ABOUTDLG -#undef wxUSE_STATLINE -#undef wxUSE_COLLPANE -#undef wxUSE_STATBMP -#undef wxUSE_STATBOX -#undef wxUSE_RADIOBTN -#undef wxUSE_RADIOBOX -#undef wxUSE_TOGGLEBTN - - -#define wxUSE_STATUSBAR 0 -#define wxUSE_NATIVE_STATUSBAR 0 -#define wxUSE_ABOUTDLG 0 -#define wxUSE_STATLINE 0 -#define wxUSE_COLLPANE 0 -#define wxUSE_STATBMP 0 -#define wxUSE_STATBOX 0 -#define wxUSE_RADIOBTN 0 -#define wxUSE_RADIOBOX 0 -#define wxUSE_TOGGLEBTN 0 - -#undef wxUSE_HTML - -#define wxUSE_HTML 0 - -#undef wxUSE_RICHTEXT -#define wxUSE_RICHTEXT 0 - -#undef wxUSE_ACTIVITYINDICATOR -#undef wxUSE_ADDREMOVECTRL -#undef wxUSE_ANIMATIONCTRL -#undef wxUSE_CALENDARCTRL -#undef wxUSE_COMBOCTRL -#undef wxUSE_ODCOMBOBOX -#undef wxUSE_BITMAPCOMBOBOX -#undef wxUSE_BMPBUTTON -#undef wxUSE_CHECKLISTBOX -#undef wxUSE_GRID -#undef wxUSE_LISTBOX -#undef wxUSE_LISTCTRL -#undef wxUSE_NOTEBOOK -#undef wxUSE_SPINBTN -#undef wxUSE_SPINCTRL -#undef wxUSE_TREECTRL -#undef wxUSE_DATEPICKCTRL -#undef wxUSE_DATAVIEWCTRL -#undef wxUSE_EDITABLELISTBOX -#undef wxUSE_FILEPICKERCTRL -#undef wxUSE_DIRPICKERCTRL -#undef wxUSE_FILECTRL -#undef wxUSE_COLOURPICKERCTRL -#undef wxUSE_FONTPICKERCTRL -#undef wxUSE_DEBUGREPORT -#undef wxUSE_HYPERLINKCTRL -#undef wxUSE_STC -#undef wxUSE_AUI -#undef wxUSE_BUSYINFO -#undef wxUSE_SEARCHCTRL - -#define wxUSE_ACTIVITYINDICATOR 0 -#define wxUSE_ADDREMOVECTRL 0 -#define wxUSE_ANIMATIONCTRL 0 -#define wxUSE_CALENDARCTRL 0 -#define wxUSE_COMBOCTRL 0 -#define wxUSE_ODCOMBOBOX 0 -#define wxUSE_BITMAPCOMBOBOX 0 -#define wxUSE_BMPBUTTON 0 -#define wxUSE_CHECKLISTBOX 0 -#define wxUSE_GRID 0 -#define wxUSE_LISTBOX 0 -#define wxUSE_LISTCTRL 0 -#define wxUSE_NOTEBOOK 0 -#define wxUSE_SPINBTN 0 -#define wxUSE_SPINCTRL 0 -#define wxUSE_TREECTRL 0 -#define wxUSE_DATEPICKCTRL 0 -#define wxUSE_DATAVIEWCTRL 0 -#define wxUSE_EDITABLELISTBOX 0 -#define wxUSE_FILEPICKERCTRL 0 -#define wxUSE_DIRPICKERCTRL 0 -#define wxUSE_FILECTRL 0 -#define wxUSE_COLOURPICKERCTRL 0 -#define wxUSE_FONTPICKERCTRL 0 -#define wxUSE_DEBUGREPORT 0 -#define wxUSE_HYPERLINKCTRL 0 -#define wxUSE_STC 0 -#define wxUSE_AUI 0 -#define wxUSE_BUSYINFO 0 -#define wxUSE_SEARCHCTRL 0 - -#undef wxUSE_LOGWINDOW -#undef wxUSE_LOG_DIALOG -#undef wxUSE_LISTBOOK -#undef wxUSE_CHOICEBOOK -#undef wxUSE_TREEBOOK -#undef wxUSE_TOOLBOOK -#undef wxUSE_CHOICEDLG -#undef wxUSE_HELP -#undef wxUSE_PROGRESSDLG -#undef wxUSE_FONTDLG -#undef wxUSE_FILEDLG -#undef wxUSE_CHOICEDLG -#undef wxUSE_NUMBERDLG -#undef wxUSE_TEXTDLG -#undef wxUSE_DIRDLG -#undef wxUSE_STARTUP_TIPS -#undef wxUSE_WIZARDDLG -#undef wxUSE_TOOLBAR_NATIVE -#undef wxUSE_FINDREPLDLG -#undef wxUSE_TASKBARICON -#undef wxUSE_REARRANGECTRL - -#define wxUSE_LOGWINDOW 0 -#define wxUSE_LOG_DIALOG 0 -#define wxUSE_LISTBOOK 0 -#define wxUSE_CHOICEBOOK 0 -#define wxUSE_TREEBOOK 0 -#define wxUSE_TOOLBOOK 0 -#define wxUSE_CHOICEDLG 0 -#define wxUSE_HELP 0 -#define wxUSE_PROGRESSDLG 0 -#define wxUSE_FONTDLG 0 -#define wxUSE_FILEDLG 0 -#define wxUSE_CHOICEDLG 0 -#define wxUSE_NUMBERDLG 0 -#define wxUSE_TEXTDLG 0 -#define wxUSE_DIRDLG 0 -#define wxUSE_STARTUP_TIPS 0 -#define wxUSE_WIZARDDLG 0 -#define wxUSE_TOOLBAR_NATIVE 0 -#define wxUSE_FINDREPLDLG 0 -#define wxUSE_TASKBARICON 0 -#define wxUSE_REARRANGECTRL 0 - -#if wxUSE_WXHTML_HELP -#undef wxUSE_WXHTML_HELP -#define wxUSE_WXHTML_HELP 0 -#endif - -#if wxUSE_DOC_VIEW_ARCHITECTURE -#undef wxUSE_DOC_VIEW_ARCHITECTURE -#define wxUSE_DOC_VIEW_ARCHITECTURE 0 -#endif - -#if wxUSE_PRINTING_ARCHITECTURE -#undef wxUSE_PRINTING_ARCHITECTURE -#define wxUSE_PRINTING_ARCHITECTURE 0 -#endif - -#if wxUSE_MENUS -#undef wxUSE_MENUS -#define wxUSE_MENUS 0 -#endif - -/* -#if wxUSE_POPUPWIN -#undef wxUSE_POPUPWIN -#define wxUSE_POPUPWIN 0 -#endif - -#if wxUSE_COMBOBOX -#undef wxUSE_COMBOBOX -#define wxUSE_COMBOBOX 0 -#endif - - - -#if wxUSE_CALENDARCTRL -#undef wxUSE_CALENDARCTRL -#define wxUSE_CALENDARCTRL 0 -#endif - -*/ - -#if wxUSE_CLIPBOARD -#undef wxUSE_CLIPBOARD -#define wxUSE_CLIPBOARD 0 -#endif // wxUSE_CLIPBOARD - -/* -#if wxUSE_GLCANVAS -#undef wxUSE_GLCANVAS -#define wxUSE_GLCANVAS 0 -#endif // wxUSE_GLCANVAS -*/ - -#if wxUSE_COLOURDLG -#undef wxUSE_COLOURDLG -#define wxUSE_COLOURDLG 0 -#endif // wxUSE_COLOURDLG - -// iphone has a toolbar that is a regular UIView - -#ifdef wxOSX_USE_NATIVE_TOOLBAR -#if wxOSX_USE_NATIVE_TOOLBAR -#undef wxOSX_USE_NATIVE_TOOLBAR -#define wxOSX_USE_NATIVE_TOOLBAR 0 -#endif -#else -#define wxOSX_USE_NATIVE_TOOLBAR 0 -#endif - -#if wxUSE_RIBBON -#undef wxUSE_RIBBON -#define wxUSE_RIBBON 0 -#endif - -#if wxUSE_INFOBAR -#undef wxUSE_INFOBAR -#define wxUSE_INFOBAR 0 -#endif - -#if wxUSE_FILE_HISTORY -#undef wxUSE_FILE_HISTORY -#define wxUSE_FILE_HISTORY 0 -#endif - -#if wxUSE_NOTIFICATION_MESSAGE -#undef wxUSE_NOTIFICATION_MESSAGE -#define wxUSE_NOTIFICATION_MESSAGE 0 -#endif - -#undef wxUSE_PREFERENCES_EDITOR -#define wxUSE_PREFERENCES_EDITOR 0 - -#if wxUSE_PROPGRID -#undef wxUSE_PROPGRID -#define wxUSE_PROPGRID 0 -#endif - -#if wxUSE_WEBKIT -#undef wxUSE_WEBKIT -#define wxUSE_WEBKIT 0 -#endif - -#if wxUSE_DATAOBJ -#undef wxUSE_DATAOBJ -#define wxUSE_DATAOBJ 0 -#endif - -#if wxUSE_UIACTIONSIMULATOR -#undef wxUSE_UIACTIONSIMULATOR -#define wxUSE_UIACTIONSIMULATOR 0 -#endif - -#if wxUSE_RICHMSGDLG -#undef wxUSE_RICHMSGDLG -#define wxUSE_RICHMSGDLG 0 -#endif - -#if wxUSE_RICHTEXT -#undef wxUSE_RICHTEXT -#define wxUSE_RICHTEXT 0 -#endif - -#if wxUSE_TIMEPICKCTRL -#undef wxUSE_TIMEPICKCTRL -#define wxUSE_TIMEPICKCTRL 0 -#endif - -#if wxUSE_RICHTOOLTIP -#undef wxUSE_RICHTOOLTIP -#define wxUSE_RICHTOOLTIP 0 -#endif - -#if wxUSE_WEBVIEW -#undef wxUSE_WEBVIEW -#define wxUSE_WEBVIEW 0 -#endif - -#endif - /* _WX_OSX_IPHONE_CHKCONF_H_ */ - diff --git a/Externals/wxWidgets3/include/wx/osx/iphone/private.h b/Externals/wxWidgets3/include/wx/osx/iphone/private.h deleted file mode 100644 index 5b27fe7959..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/iphone/private.h +++ /dev/null @@ -1,230 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/iphone/private.h -// Purpose: Private declarations: as this header is only included by -// wxWidgets itself, it may contain identifiers which don't start -// with "wx". -// Author: Stefan Csomor -// Modified by: -// Created: 1998-01-01 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PRIVATE_IPHONE_H_ -#define _WX_PRIVATE_IPHONE_H_ - -#ifdef __OBJC__ - #import -#endif - -#include -#include -#include - - -#if wxUSE_GUI - -typedef CGRect WXRect; - -OSStatus WXDLLIMPEXP_CORE wxMacDrawCGImage( - CGContextRef inContext, - const CGRect * inBounds, - CGImageRef inImage) ; - -WX_UIImage WXDLLIMPEXP_CORE wxOSXGetUIImageFromCGImage( CGImageRef image ); -wxBitmap WXDLLIMPEXP_CORE wxOSXCreateSystemBitmap(const wxString& id, const wxString &client, const wxSize& size); - -class WXDLLIMPEXP_CORE wxWidgetIPhoneImpl : public wxWidgetImpl -{ -public : - wxWidgetIPhoneImpl( wxWindowMac* peer , WXWidget w, bool isRootControl = false, bool isUserPane = false ) ; - wxWidgetIPhoneImpl() ; - ~wxWidgetIPhoneImpl(); - - void Init(); - - virtual bool IsVisible() const ; - virtual void SetVisibility( bool visible ); - - virtual void Raise(); - - virtual void Lower(); - - virtual void ScrollRect( const wxRect *rect, int dx, int dy ); - - virtual WXWidget GetWXWidget() const { return m_osxView; } - - virtual void SetBackgroundColour( const wxColour& col ) ; - virtual bool SetBackgroundStyle(wxBackgroundStyle style) ; - - virtual void GetContentArea( int &left , int &top , int &width , int &height ) const; - virtual void Move(int x, int y, int width, int height); - virtual void GetPosition( int &x, int &y ) const; - virtual void GetSize( int &width, int &height ) const; - virtual void SetControlSize( wxWindowVariant variant ); - virtual double GetContentScaleFactor() const ; - - virtual void SetNeedsDisplay( const wxRect* where = NULL ); - virtual bool GetNeedsDisplay() const; - - virtual bool CanFocus() const; - // return true if successful - virtual bool SetFocus(); - virtual bool HasFocus() const; - - void RemoveFromParent(); - void Embed( wxWidgetImpl *parent ); - - void SetDefaultButton( bool isDefault ); - void PerformClick(); - virtual void SetLabel(const wxString& title, wxFontEncoding encoding); - - void SetCursor( const wxCursor & cursor ); - void CaptureMouse(); - void ReleaseMouse(); - - wxInt32 GetValue() const; - void SetValue( wxInt32 v ); - - virtual wxBitmap GetBitmap() const; - virtual void SetBitmap( const wxBitmap& bitmap ); - virtual void SetBitmapPosition( wxDirection dir ); - - void SetupTabs( const wxNotebook ¬ebook ); - void GetBestRect( wxRect *r ) const; - bool IsEnabled() const; - void Enable( bool enable ); - bool ButtonClickDidStateChange() { return true ;} - void SetMinimum( wxInt32 v ); - void SetMaximum( wxInt32 v ); - wxInt32 GetMinimum() const; - wxInt32 GetMaximum() const; - void PulseGauge(); - void SetScrollThumb( wxInt32 value, wxInt32 thumbSize ); - - void SetFont( const wxFont & font , const wxColour& foreground , long windowStyle, bool ignoreBlack = true ); - - void InstallEventHandler( WXWidget control = NULL ); - - virtual void DoNotifyFocusEvent(bool receivedFocus, wxWidgetImpl* otherWindow); - - // thunk connected calls - - virtual void drawRect(CGRect* rect, WXWidget slf, void* _cmd); - virtual void touchEvent(WX_NSSet touches, WX_UIEvent event, WXWidget slf, void* _cmd); - virtual bool becomeFirstResponder(WXWidget slf, void* _cmd); - virtual bool resignFirstResponder(WXWidget slf, void* _cmd); - - // action - - virtual void controlAction(void* sender, wxUint32 controlEvent, WX_UIEvent rawEvent); - virtual void controlTextDidChange(); -protected: - WXWidget m_osxView; - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxWidgetIPhoneImpl); -}; - -class wxNonOwnedWindowIPhoneImpl : public wxNonOwnedWindowImpl -{ -public : - wxNonOwnedWindowIPhoneImpl( wxNonOwnedWindow* nonownedwnd) ; - wxNonOwnedWindowIPhoneImpl(); - - virtual ~wxNonOwnedWindowIPhoneImpl(); - - virtual void WillBeDestroyed() ; - void Create( wxWindow* parent, const wxPoint& pos, const wxSize& size, - long style, long extraStyle, const wxString& name ) ; - void Create( wxWindow* parent, WXWindow nativeWindow ); - - WXWindow GetWXWindow() const; - void Raise(); - void Lower(); - bool Show(bool show); - bool ShowWithEffect(bool show, wxShowEffect effect, unsigned timeout); - - void Update(); - bool SetTransparent(wxByte alpha); - bool SetBackgroundColour(const wxColour& col ); - void SetExtraStyle( long exStyle ); - bool SetBackgroundStyle(wxBackgroundStyle style); - bool CanSetTransparent(); - - void MoveWindow(int x, int y, int width, int height); - void GetPosition( int &x, int &y ) const; - void GetSize( int &width, int &height ) const; - - void GetContentArea( int &left , int &top , int &width , int &height ) const; - bool SetShape(const wxRegion& region); - - virtual void SetTitle( const wxString& title, wxFontEncoding encoding ) ; - - // Title bar buttons don't exist in iOS. - virtual bool EnableCloseButton(bool WXUNUSED(enable)) { return false; } - virtual bool EnableMaximizeButton(bool WXUNUSED(enable)) { return false; } - virtual bool EnableMinimizeButton(bool WXUNUSED(enable)) { return false; } - - virtual bool IsMaximized() const; - - virtual bool IsIconized() const; - - virtual void Iconize( bool iconize ); - - virtual void Maximize(bool maximize); - - virtual bool IsFullScreen() const; - - virtual bool EnableFullScreenView(bool enable); - - virtual bool ShowFullScreen(bool show, long style); - - virtual void RequestUserAttention(int flags); - - virtual void ScreenToWindow( int *x, int *y ); - - virtual void WindowToScreen( int *x, int *y ); - - // FIXME: Does iPhone have a concept of inactive windows? - virtual bool IsActive() { return true; } - - wxNonOwnedWindow* GetWXPeer() { return m_wxPeer; } - - virtual bool InitialShowEventSent() { return m_initialShowSent; } -protected : - WX_UIWindow m_macWindow; - void * m_macFullScreenData ; - bool m_initialShowSent; - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxNonOwnedWindowIPhoneImpl); -}; - -#ifdef __OBJC__ - - WXDLLIMPEXP_CORE CGRect wxToNSRect( UIView* parent, const wxRect& r ); - WXDLLIMPEXP_CORE wxRect wxFromNSRect( UIView* parent, const CGRect& rect ); - WXDLLIMPEXP_CORE CGPoint wxToNSPoint( UIView* parent, const wxPoint& p ); - WXDLLIMPEXP_CORE wxPoint wxFromNSPoint( UIView* parent, const CGPoint& p ); - - CGRect WXDLLIMPEXP_CORE wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const wxSize &size , - bool adjustForOrigin = true ); - - @interface wxUIButton : UIButton - { - } - - @end - - @interface wxUIView : UIView - { - } - - @end // wxUIView - - - void WXDLLIMPEXP_CORE wxOSXIPhoneClassAddWXMethods(Class c); - -#endif - -#endif // wxUSE_GUI - -#endif - // _WX_PRIVATE_IPHONE_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/iphone/private/textimpl.h b/Externals/wxWidgets3/include/wx/osx/iphone/private/textimpl.h deleted file mode 100644 index 7c9e5fd109..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/iphone/private/textimpl.h +++ /dev/null @@ -1,107 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/iphone/private/textimpl.h -// Purpose: textcontrol implementation classes that have to be exposed -// Author: Stefan Csomor -// Modified by: -// Created: 03/02/99 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_OSX_COCOA_PRIVATE_TEXTIMPL_H_ -#define _WX_OSX_COCOA_PRIVATE_TEXTIMPL_H_ - -#include "wx/combobox.h" -#include "wx/osx/private.h" - -// implementation exposed, so that search control can pull it - -class wxUITextFieldControl : public wxWidgetIPhoneImpl, public wxTextWidgetImpl -{ -public : - wxUITextFieldControl( wxTextCtrl *wxPeer, UITextField* w ); - virtual ~wxUITextFieldControl(); - - virtual wxString GetStringValue() const ; - virtual void SetStringValue( const wxString &str) ; - virtual void Copy() ; - virtual void Cut() ; - virtual void Paste() ; - virtual bool CanPaste() const ; - virtual void SetEditable(bool editable) ; - virtual void GetSelection( long* from, long* to) const ; - virtual void SetSelection( long from , long to ); - virtual void WriteText(const wxString& str) ; - virtual bool HasOwnContextMenu() const { return true; } - - virtual wxSize GetBestSize() const; - - virtual bool SetHint(const wxString& hint); - - virtual void controlAction(WXWidget slf, void* _cmd, void *sender); -protected : - UITextField* m_textField; - NSObject* m_delegate; - long m_selStart; - long m_selEnd; -}; - -class wxUITextViewControl : public wxWidgetIPhoneImpl, public wxTextWidgetImpl -{ -public: - wxUITextViewControl( wxTextCtrl *wxPeer, UITextView* w ); - virtual ~wxUITextViewControl(); - - virtual wxString GetStringValue() const ; - virtual void SetStringValue( const wxString &str) ; - virtual void Copy() ; - virtual void Cut() ; - virtual void Paste() ; - virtual bool CanPaste() const ; - virtual void SetEditable(bool editable) ; - virtual void GetSelection( long* from, long* to) const ; - virtual void SetSelection( long from , long to ); - virtual void WriteText(const wxString& str) ; - virtual void SetFont( const wxFont & font , const wxColour& foreground , long windowStyle, bool ignoreBlack = true ); - - virtual bool GetStyle(long position, wxTextAttr& style); - virtual void SetStyle(long start, long end, const wxTextAttr& style); - - virtual bool CanFocus() const; - - virtual bool HasOwnContextMenu() const { return true; } - - virtual void CheckSpelling(bool check); - virtual wxSize GetBestSize() const; - -protected: - NSObject* m_delegate; - UITextView* m_textView; -}; - -#if 0 -class wxNSComboBoxControl : public wxUITextFieldControl, public wxComboWidgetImpl -{ -public : - wxNSComboBoxControl( wxWindow *wxPeer, WXWidget w ); - virtual ~wxNSComboBoxControl(); - - virtual int GetSelectedItem() const; - virtual void SetSelectedItem(int item); - - virtual int GetNumberOfItems() const; - - virtual void InsertItem(int pos, const wxString& item); - virtual void RemoveItem(int pos); - - virtual void Clear(); - - virtual wxString GetStringAtIndex(int pos) const; - - virtual int FindString(const wxString& text) const; -private: - NSComboBox* m_comboBox; -}; -#endif - -#endif // _WX_OSX_COCOA_PRIVATE_TEXTIMPL_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/joystick.h b/Externals/wxWidgets3/include/wx/osx/joystick.h deleted file mode 100644 index 310cb6ddd0..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/joystick.h +++ /dev/null @@ -1,90 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/joystick.h -// Purpose: wxJoystick class -// Author: Stefan Csomor -// Modified by: -// Created: 1998-01-01 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_JOYSTICK_H_ -#define _WX_JOYSTICK_H_ - -#include "wx/event.h" - -class WXDLLIMPEXP_ADV wxJoystick: public wxObject -{ - wxDECLARE_DYNAMIC_CLASS(wxJoystick); -public: - /* - * Public interface - */ - - wxJoystick(int joystick = wxJOYSTICK1) { m_joystick = joystick; } - - // Attributes - //////////////////////////////////////////////////////////////////////////// - - wxPoint GetPosition() const; - int GetPosition(unsigned axis) const; - bool GetButtonState(unsigned button) const; - int GetZPosition() const; - int GetButtonState() const; - int GetPOVPosition() const; - int GetPOVCTSPosition() const; - int GetRudderPosition() const; - int GetUPosition() const; - int GetVPosition() const; - int GetMovementThreshold() const; - void SetMovementThreshold(int threshold) ; - - // Capabilities - //////////////////////////////////////////////////////////////////////////// - - bool IsOk() const; // Checks that the joystick is functioning - static int GetNumberJoysticks() ; - int GetManufacturerId() const ; - int GetProductId() const ; - wxString GetProductName() const ; - int GetXMin() const; - int GetYMin() const; - int GetZMin() const; - int GetXMax() const; - int GetYMax() const; - int GetZMax() const; - int GetNumberButtons() const; - int GetNumberAxes() const; - int GetMaxButtons() const; - int GetMaxAxes() const; - int GetPollingMin() const; - int GetPollingMax() const; - int GetRudderMin() const; - int GetRudderMax() const; - int GetUMin() const; - int GetUMax() const; - int GetVMin() const; - int GetVMax() const; - - bool HasRudder() const; - bool HasZ() const; - bool HasU() const; - bool HasV() const; - bool HasPOV() const; - bool HasPOV4Dir() const; - bool HasPOVCTS() const; - - // Operations - //////////////////////////////////////////////////////////////////////////// - - // pollingFreq = 0 means that movement events are sent when above the threshold. - // If pollingFreq > 0, events are received every this many milliseconds. - bool SetCapture(wxWindow* win, int pollingFreq = 0); - bool ReleaseCapture(); - -protected: - int m_joystick; -}; - -#endif - // _WX_JOYSTICK_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/listbox.h b/Externals/wxWidgets3/include/wx/osx/listbox.h deleted file mode 100644 index 53fd434d97..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/listbox.h +++ /dev/null @@ -1,177 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/listbox.h -// Purpose: wxListBox class -// Author: Stefan Csomor -// Modified by: -// Created: 1998-01-01 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_LISTBOX_H_ -#define _WX_LISTBOX_H_ - -// ---------------------------------------------------------------------------- -// simple types -// ---------------------------------------------------------------------------- -#include "wx/dynarray.h" -#include "wx/arrstr.h" - -// forward decl for GetSelections() -class wxArrayInt; - -// forward decl for wxListWidgetImpl implementation type. -class wxListWidgetImpl; - -// List box item - -WX_DEFINE_ARRAY( char* , wxListDataArray ); - -// ---------------------------------------------------------------------------- -// List box control -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxListWidgetColumn; - -class WXDLLIMPEXP_FWD_CORE wxListWidgetCellValue; - -class WXDLLIMPEXP_CORE wxListBox : public wxListBoxBase -{ -public: - // ctors and such - wxListBox(); - - wxListBox( - wxWindow *parent, - wxWindowID winid, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxListBoxNameStr) - { - Create(parent, winid, pos, size, n, choices, style, validator, name); - } - - wxListBox( - wxWindow *parent, - wxWindowID winid, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxListBoxNameStr) - { - Create(parent, winid, pos, size, choices, style, validator, name); - } - - bool Create( - wxWindow *parent, - wxWindowID winid, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, - const wxString choices[] = NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxListBoxNameStr); - - bool Create( - wxWindow *parent, - wxWindowID winid, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxListBoxNameStr); - - virtual ~wxListBox(); - - // implement base class pure virtuals - virtual void Refresh(bool eraseBack = true, const wxRect *rect = NULL) wxOVERRIDE; - - virtual unsigned int GetCount() const wxOVERRIDE; - virtual wxString GetString(unsigned int n) const wxOVERRIDE; - virtual void SetString(unsigned int n, const wxString& s) wxOVERRIDE; - virtual int FindString(const wxString& s, bool bCase = false) const wxOVERRIDE; - - // data callbacks - virtual void GetValueCallback( unsigned int n, wxListWidgetColumn* col , wxListWidgetCellValue& value ); - virtual void SetValueCallback( unsigned int n, wxListWidgetColumn* col , wxListWidgetCellValue& value ); - - virtual bool IsSelected(int n) const wxOVERRIDE; - virtual int GetSelection() const wxOVERRIDE; - virtual int GetSelections(wxArrayInt& aSelections) const wxOVERRIDE; - - virtual void EnsureVisible(int n) wxOVERRIDE; - - virtual int GetTopItem() const wxOVERRIDE; - - virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE - { - return GetClassDefaultAttributes(GetWindowVariant()); - } - - // wxCheckListBox support - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - wxListWidgetImpl* GetListPeer() const; - - bool MacGetBlockEvents() const { return m_blockEvents; } - - virtual void HandleLineEvent( unsigned int n, bool doubleClick ); -protected: - // callback for derived classes which may have to insert additional data - // at a certain line - which cannot be predetermined for sorted list data - virtual void OnItemInserted(unsigned int pos); - - virtual void DoClear() wxOVERRIDE; - virtual void DoDeleteOneItem(unsigned int n) wxOVERRIDE; - - // from wxItemContainer - virtual int DoInsertItems(const wxArrayStringsAdapter& items, - unsigned int pos, - void **clientData, wxClientDataType type) wxOVERRIDE; - - virtual void DoSetItemClientData(unsigned int n, void* clientData) wxOVERRIDE; - virtual void* DoGetItemClientData(unsigned int n) const wxOVERRIDE; - - // from wxListBoxBase - virtual void DoSetSelection(int n, bool select) wxOVERRIDE; - virtual void DoSetFirstItem(int n) wxOVERRIDE; - virtual int DoListHitTest(const wxPoint& point) const wxOVERRIDE; - - // free memory (common part of Clear() and dtor) - // prevent collision with some BSD definitions of macro Free() - void FreeData(); - - virtual wxSize DoGetBestSize() const wxOVERRIDE; - - bool m_blockEvents; - - wxListWidgetColumn* m_textColumn; - - // data storage (copied from univ) - - // the array containing all items (it is sorted if the listbox has - // wxLB_SORT style) - union - { - wxArrayString *unsorted; - wxSortedArrayString *sorted; - } m_strings; - - // and this one the client data (either void or wxClientData) - wxArrayPtrVoid m_itemsClientData; - -private: - - wxDECLARE_DYNAMIC_CLASS(wxListBox); - wxDECLARE_EVENT_TABLE(); -}; - -#endif // _WX_LISTBOX_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/listctrl.h b/Externals/wxWidgets3/include/wx/osx/listctrl.h deleted file mode 100644 index 652af605f0..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/listctrl.h +++ /dev/null @@ -1,398 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/listctrl.h -// Purpose: wxListCtrl class -// Author: Stefan Csomor -// Modified by: -// Created: 1998-01-01 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_LISTCTRL_H_ -#define _WX_LISTCTRL_H_ - -#include "wx/defs.h" -#include "wx/generic/listctrl.h" - -#define wxMAC_ALWAYS_USE_GENERIC_LISTCTRL wxT("mac.listctrl.always_use_generic") - -class wxMacDataBrowserListCtrlControl; -class wxListCtrlTextCtrlWrapper; -class wxListCtrlRenameTimer; - -WX_DECLARE_EXPORTED_LIST(wxListItem, wxColumnList); - -class WXDLLIMPEXP_CORE wxListCtrl: public wxListCtrlBase -{ - wxDECLARE_DYNAMIC_CLASS(wxListCtrl); -public: - /* - * Public interface - */ - - wxListCtrl() { Init(); } - - wxListCtrl(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxLC_ICON, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxListCtrlNameStr) - { - Init(); - - Create(parent, id, pos, size, style, validator, name); - } - - virtual ~wxListCtrl(); - - bool Create(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxLC_ICON, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxListCtrlNameStr); - - // Attributes - //////////////////////////////////////////////////////////////////////////// - - // Gets information about this column - bool GetColumn(int col, wxListItem& item) const; - - // Sets information about this column - bool SetColumn(int col, const wxListItem& item) ; - - // Gets the column width - int GetColumnWidth(int col) const; - - // Sets the column width - bool SetColumnWidth(int col, int width) ; - - // Gets the number of items that can fit vertically in the - // visible area of the list control (list or report view) - // or the total number of items in the list control (icon - // or small icon view) - int GetCountPerPage() const; - - // Gets the edit control for editing labels. - wxTextCtrl* GetEditControl() const; - - // Gets information about the item - bool GetItem(wxListItem& info) const ; - - // Sets information about the item - bool SetItem(wxListItem& info) ; - - // Sets a string field at a particular column - long SetItem(long index, int col, const wxString& label, int imageId = -1); - - // Gets the item state - int GetItemState(long item, long stateMask) const ; - - // Sets the item state - bool SetItemState(long item, long state, long stateMask) ; - - void AssignImageList(wxImageList *imageList, int which); - - // Sets the item image - bool SetItemImage(long item, int image, int selImage = -1) ; - bool SetItemColumnImage(long item, long column, int image); - - // Gets the item text - wxString GetItemText(long item, int col = 0) const ; - - // Sets the item text - void SetItemText(long item, const wxString& str) ; - - void SetItemTextColour(long item, const wxColour& colour) ; - wxColour GetItemTextColour(long item) const; - - void SetItemBackgroundColour(long item, const wxColour& colour) ; - wxColour GetItemBackgroundColour(long item) const; - - void SetItemFont( long item, const wxFont &f); - wxFont GetItemFont( long item ) const; - - // Gets the item data - long GetItemData(long item) const ; - - // Sets the item data - bool SetItemPtrData(long item, wxUIntPtr data); - bool SetItemData(long item, long data) { return SetItemPtrData(item, data); } - - // Gets the item rectangle - bool GetItemRect(long item, wxRect& rect, int code = wxLIST_RECT_BOUNDS) const ; - - // Gets the item rectangle of a subitem - bool GetSubItemRect( long item, long subItem, wxRect& rect, int code = wxLIST_RECT_BOUNDS ) const; - - // Gets the item position - bool GetItemPosition(long item, wxPoint& pos) const ; - - // Sets the item position - bool SetItemPosition(long item, const wxPoint& pos) ; - - // Gets the number of items in the list control - int GetItemCount() const; - - // Gets the number of columns in the list control - int GetColumnCount() const; - - void SetItemSpacing( int spacing, bool isSmall = false ); - wxSize GetItemSpacing() const; - - // Gets the number of selected items in the list control - int GetSelectedItemCount() const; - - wxRect GetViewRect() const; - - // Gets the text colour of the listview - wxColour GetTextColour() const; - - // Sets the text colour of the listview - void SetTextColour(const wxColour& col); - - // Gets the index of the topmost visible item when in - // list or report view - long GetTopItem() const ; - - // Add or remove a single window style - void SetSingleStyle(long style, bool add = true) ; - - // Set the whole window style - void SetWindowStyleFlag(long style) ; - - // Searches for an item, starting from 'item'. - // item can be -1 to find the first item that matches the - // specified flags. - // Returns the item or -1 if unsuccessful. - long GetNextItem(long item, int geometry = wxLIST_NEXT_ALL, int state = wxLIST_STATE_DONTCARE) const ; - - // Gets one of the three image lists - wxImageList *GetImageList(int which) const ; - - // Sets the image list - void SetImageList(wxImageList *imageList, int which) ; - - // Operations - //////////////////////////////////////////////////////////////////////////// - - // Arranges the items - bool Arrange(int flag = wxLIST_ALIGN_DEFAULT); - - // Deletes an item - bool DeleteItem(long item); - - // Deletes all items - bool DeleteAllItems() ; - - // Deletes a column - bool DeleteColumn(int col); - - // Deletes all columns - bool DeleteAllColumns(); - - // Clears items, and columns if there are any. - void ClearAll(); - - // Edit the label - wxTextCtrl* EditLabel(long item, wxClassInfo* textControlClass = wxCLASSINFO(wxTextCtrl)); - - // End label editing, optionally cancelling the edit - bool EndEditLabel(bool cancel); - - // Ensures this item is visible - bool EnsureVisible(long item) ; - - // Find an item whose label matches this string, starting from the item after 'start' - // or the beginning if 'start' is -1. - long FindItem(long start, const wxString& str, bool partial = false); - - // Find an item whose data matches this data, starting from the item after 'start' - // or the beginning if 'start' is -1. - long FindItem(long start, long data); - - // Find an item nearest this position in the specified direction, starting from - // the item after 'start' or the beginning if 'start' is -1. - long FindItem(long start, const wxPoint& pt, int direction); - - // Determines which item (if any) is at the specified point, - // giving details in 'flags' (see wxLIST_HITTEST_... flags above) - // Request the subitem number as well at the given coordinate. - long HitTest(const wxPoint& point, int& flags, long* ptrSubItem = NULL) const; - - // Inserts an item, returning the index of the new item if successful, - // -1 otherwise. - // TOD: Should also have some further convenience functions - // which don't require setting a wxListItem object - long InsertItem(wxListItem& info); - - // Insert a string item - long InsertItem(long index, const wxString& label); - - // Insert an image item - long InsertItem(long index, int imageIndex); - - // Insert an image/string item - long InsertItem(long index, const wxString& label, int imageIndex); - - // Scrolls the list control. If in icon, small icon or report view mode, - // x specifies the number of pixels to scroll. If in list view mode, x - // specifies the number of columns to scroll. - // If in icon, small icon or list view mode, y specifies the number of pixels - // to scroll. If in report view mode, y specifies the number of lines to scroll. - bool ScrollList(int dx, int dy); - - // Sort items. - - // fn is a function which takes 3 long arguments: item1, item2, data. - // item1 is the long data associated with a first item (NOT the index). - // item2 is the long data associated with a second item (NOT the index). - // data is the same value as passed to SortItems. - // The return value is a negative number if the first item should precede the second - // item, a positive number of the second item should precede the first, - // or zero if the two items are equivalent. - - // data is arbitrary data to be passed to the sort function. - bool SortItems(wxListCtrlCompare fn, wxIntPtr data); - - wxMacDataBrowserListCtrlControl* GetListPeer() const; - - // these functions are only used for virtual list view controls, i.e. the - // ones with wxLC_VIRTUAL style - - void SetItemCount(long count); - void RefreshItem(long item); - void RefreshItems(long itemFrom, long itemTo); - - // return the text for the given column of the given item - virtual wxString OnGetItemText(long item, long column) const; - - // return the icon for the given item. In report view, OnGetItemImage will - // only be called for the first column. See OnGetItemColumnImage for - // details. - virtual int OnGetItemImage(long item) const; - - // return the icon for the given item and column. - virtual int OnGetItemColumnImage(long item, long column) const; - -/* Why should we need this function? Leave for now. - * We might need it because item data may have changed, - * but the display needs refreshing (in string callback mode) - // Updates an item. If the list control has the wxLI_AUTO_ARRANGE style, - // the items will be rearranged. - bool Update(long item); -*/ - - void Command(wxCommandEvent& event) { ProcessCommand(event); } - - wxListCtrlCompare GetCompareFunc() { return m_compareFunc; } - wxIntPtr GetCompareFuncData() { return m_compareFuncData; } - - - // public overrides needed for pimpl approach - virtual bool SetFont(const wxFont& font); - virtual bool SetForegroundColour(const wxColour& colour); - virtual bool SetBackgroundColour(const wxColour& colour); - virtual wxColour GetBackgroundColour() const; - - virtual void Freeze (); - virtual void Thaw (); - virtual void Update (); - - // functions for editing/timer - void OnRenameTimer(); - bool OnRenameAccept(long itemEdit, const wxString& value); - void OnRenameCancelled(long itemEdit); - - void ChangeCurrent(long current); - void ResetCurrent() { ChangeCurrent((long)-1); } - bool HasCurrent() const { return m_current != (long)-1; } - - void OnLeftDown(wxMouseEvent& event); - void OnDblClick(wxMouseEvent& event); - - void FinishEditing(wxTextCtrl *text) - { - delete text; - m_textctrlWrapper = NULL; - SetFocus(); - } - - virtual int GetScrollPos(int orient) const; - - void OnRightDown(wxMouseEvent& event); - void OnMiddleDown(wxMouseEvent& event); - void OnChar(wxKeyEvent& event); - virtual void SetFocus(); - void FireMouseEvent(wxEventType eventType, wxPoint position); - - virtual void SetDropTarget( wxDropTarget *dropTarget ); - virtual wxDropTarget* GetDropTarget() const; - - // with CG, we need to get the context from an kEventControlDraw event - // unfortunately, the DataBrowser callbacks don't provide the context - // and we need it, so we need to set/remove it before and after draw - // events so we can access it in the callbacks. - void MacSetDrawingContext(void* context) { m_cgContext = context; } - void* MacGetDrawingContext() { return m_cgContext; } - - virtual wxVisualAttributes GetDefaultAttributes() const - { - return GetClassDefaultAttributes(GetWindowVariant()); - } - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - -protected: - // Implement base class pure virtual methods. - long DoInsertColumn(long col, const wxListItem& info); - - // protected overrides needed for pimpl approach - virtual void DoSetSize(int x, int y, - int width, int height, - int sizeFlags = wxSIZE_AUTO); - - long m_current; - wxListCtrlTextCtrlWrapper *m_textctrlWrapper; - wxListCtrlRenameTimer *m_renameTimer; - // common part of all ctors - void Init(); - - wxGenericListCtrl* m_genericImpl; // allow use of the generic impl. - wxMacDataBrowserListCtrlControl* m_dbImpl; - void* m_macListCtrlEventHandler; - void* m_cgContext; - wxListCtrlCompare m_compareFunc; - wxIntPtr m_compareFuncData; - - wxTextCtrl* m_textCtrl; // The control used for editing a label - wxImageList * m_imageListNormal; // The image list for normal icons - wxImageList * m_imageListSmall; // The image list for small icons - wxImageList * m_imageListState; // The image list state icons (not implemented yet) - - wxColumnList m_colsInfo; // for storing info about each column - wxColour m_textColor; - wxColour m_bgColor; - - // keep track of whether or not we should delete the image list ourselves. - bool m_ownsImageListNormal, - m_ownsImageListSmall, - m_ownsImageListState; - - long m_baseStyle; // Basic Windows style flags, for recreation purposes - int m_colCount; // Windows doesn't have GetColumnCount so must - // keep track of inserted/deleted columns - - int m_count; // for virtual lists, store item count - -private: - int CalcColumnAutoWidth(int col) const; - -}; - -#endif - // _WX_LISTCTRL_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/mdi.h b/Externals/wxWidgets3/include/wx/osx/mdi.h deleted file mode 100644 index 2bca063802..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/mdi.h +++ /dev/null @@ -1,153 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/mdi.h -// Purpose: MDI (Multiple Document Interface) classes. -// Author: Stefan Csomor -// Modified by: 2008-10-31 Vadim Zeitlin: derive from the base classes -// Created: 1998-01-01 -// Copyright: (c) Stefan Csomor -// (c) 2008 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_OSX_CARBON_MDI_H_ -#define _WX_OSX_CARBON_MDI_H_ - -class WXDLLIMPEXP_CORE wxMDIParentFrame : public wxMDIParentFrameBase -{ -public: - wxMDIParentFrame() { Init(); } - wxMDIParentFrame(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL, - const wxString& name = wxFrameNameStr) - { - Init(); - Create(parent, id, title, pos, size, style, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL, - const wxString& name = wxFrameNameStr); - - virtual ~wxMDIParentFrame(); - - // implement/override base class [pure] virtuals - // --------------------------------------------- - - static bool IsTDI() { return false; } - - virtual void AddChild(wxWindowBase *child) wxOVERRIDE; - virtual void RemoveChild(wxWindowBase *child) wxOVERRIDE; - - virtual void ActivateNext() wxOVERRIDE { /* TODO */ } - virtual void ActivatePrevious() wxOVERRIDE { /* TODO */ } - - virtual bool Show(bool show = true) wxOVERRIDE; - - - // Mac-specific implementation from now on - // --------------------------------------- - - // Mac OS activate event - virtual void MacActivate(long timestamp, bool activating) wxOVERRIDE; - - // wxWidgets activate event - void OnActivate(wxActivateEvent& event); - void OnSysColourChanged(wxSysColourChangedEvent& event); - - void SetMenuBar(wxMenuBar *menu_bar) wxOVERRIDE; - - // Get rect to be used to center top-level children - virtual void GetRectForTopLevelChildren(int *x, int *y, int *w, int *h) wxOVERRIDE; - -protected: - // common part of all ctors - void Init(); - - // returns true if this frame has some contents and so should be visible, - // false if it's used solely as container for its children - bool ShouldBeVisible() const; - - - wxMenu *m_windowMenu; - - // true if MDI Frame is intercepting commands, not child - bool m_parentFrameActive; - - // true if the frame should be shown but is not because it is empty and - // useless otherwise than a container for its children - bool m_shouldBeShown; - -private: - friend class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame; - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_DYNAMIC_CLASS(wxMDIParentFrame); -}; - -class WXDLLIMPEXP_CORE wxMDIChildFrame : public wxMDIChildFrameBase -{ -public: - wxMDIChildFrame() { Init(); } - wxMDIChildFrame(wxMDIParentFrame *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr) - { - Init() ; - Create(parent, id, title, pos, size, style, name); - } - - bool Create(wxMDIParentFrame *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr); - - virtual ~wxMDIChildFrame(); - - // un-override the base class override - virtual bool IsTopLevel() const { return true; } - - // implement MDI operations - virtual void Activate(); - - - // Mac OS activate event - virtual void MacActivate(long timestamp, bool activating); - -protected: - // common part of all ctors - void Init(); - - wxDECLARE_DYNAMIC_CLASS(wxMDIChildFrame); -}; - -class WXDLLIMPEXP_CORE wxMDIClientWindow : public wxMDIClientWindowBase -{ -public: - wxMDIClientWindow() { } - virtual ~wxMDIClientWindow(); - - virtual bool CreateClient(wxMDIParentFrame *parent, - long style = wxVSCROLL | wxHSCROLL); - -protected: - virtual void DoGetClientSize(int *width, int *height) const; - - wxDECLARE_DYNAMIC_CLASS(wxMDIClientWindow); -}; - -#endif // _WX_OSX_CARBON_MDI_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/menu.h b/Externals/wxWidgets3/include/wx/osx/menu.h deleted file mode 100644 index 1540b4055d..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/menu.h +++ /dev/null @@ -1,187 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/menu.h -// Purpose: wxMenu, wxMenuBar classes -// Author: Stefan Csomor -// Modified by: -// Created: 1998-01-01 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MENU_H_ -#define _WX_MENU_H_ - -class WXDLLIMPEXP_FWD_CORE wxFrame; - -#include "wx/arrstr.h" - -// ---------------------------------------------------------------------------- -// Menu -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxMenuImpl ; - -class WXDLLIMPEXP_CORE wxMenu : public wxMenuBase -{ -public: - // ctors & dtor - wxMenu(const wxString& title, long style = 0) - : wxMenuBase(title, style) { Init(); } - - wxMenu(long style = 0) : wxMenuBase(style) { Init(); } - - virtual ~wxMenu(); - - virtual void Break(); - - virtual void SetTitle(const wxString& title); - - bool ProcessCommand(wxCommandEvent& event); - - // get the menu handle - WXHMENU GetHMenu() const ; - - // implementation only from now on - // ------------------------------- - - bool HandleCommandUpdateStatus( wxMenuItem* menuItem, wxWindow* senderWindow = NULL); - bool HandleCommandProcess( wxMenuItem* menuItem, wxWindow* senderWindow = NULL); - void HandleMenuItemHighlighted( wxMenuItem* menuItem ); - void HandleMenuOpened(); - void HandleMenuClosed(); - - wxMenuImpl* GetPeer() { return m_peer; } - - // make sure we can veto - void SetAllowRearrange( bool allow ); - bool AllowRearrange() const { return m_allowRearrange; } - - // if a menu is used purely for internal implementation reasons (eg wxChoice) - // we don't want native menu events being triggered - void SetNoEventsMode( bool noEvents ); - bool GetNoEventsMode() const { return m_noEventsMode; } -protected: - // hide special menu items like exit, preferences etc - // that are expected in the app menu - void DoRearrange() ; - - virtual wxMenuItem* DoAppend(wxMenuItem *item); - virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item); - virtual wxMenuItem* DoRemove(wxMenuItem *item); - -private: - // common part of all ctors - void Init(); - - // common part of Do{Append,Insert}(): behaves as Append if pos == -1 - bool DoInsertOrAppend(wxMenuItem *item, size_t pos = (size_t)-1); - - // Common part of HandleMenu{Opened,Closed}(). - void DoHandleMenuOpenedOrClosed(wxEventType evtType); - - - // if TRUE, insert a break before appending the next item - bool m_doBreak; - - // in this menu rearranging of menu items (esp hiding) is allowed - bool m_allowRearrange; - - // don't trigger native events - bool m_noEventsMode; - - wxMenuImpl* m_peer; - - wxDECLARE_DYNAMIC_CLASS(wxMenu); -}; - -#if wxOSX_USE_COCOA_OR_CARBON - -// the iphone only has popup-menus - -// ---------------------------------------------------------------------------- -// Menu Bar (a la Windows) -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxMenuBar : public wxMenuBarBase -{ -public: - // ctors & dtor - // default constructor - wxMenuBar(); - // unused under MSW - wxMenuBar(long style); - // menubar takes ownership of the menus arrays but copies the titles - wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style = 0); - virtual ~wxMenuBar(); - - // menubar construction - virtual bool Append( wxMenu *menu, const wxString &title ); - virtual bool Insert(size_t pos, wxMenu *menu, const wxString& title); - virtual wxMenu *Replace(size_t pos, wxMenu *menu, const wxString& title); - virtual wxMenu *Remove(size_t pos); - - virtual void EnableTop( size_t pos, bool flag ); - virtual bool IsEnabledTop(size_t pos) const; - virtual void SetMenuLabel( size_t pos, const wxString& label ); - virtual wxString GetMenuLabel( size_t pos ) const; - virtual bool Enable( bool enable = true ); - // for virtual function hiding - virtual void Enable( int itemid, bool enable ) - { - wxMenuBarBase::Enable( itemid, enable ); - } - - // implementation from now on - void Detach(); - - // returns TRUE if we're attached to a frame - bool IsAttached() const { return m_menuBarFrame != NULL; } - // get the frame we live in - wxFrame *GetFrame() const { return m_menuBarFrame; } - // attach to a frame - void Attach(wxFrame *frame); - - // if the menubar is modified, the display is not updated automatically, - // call this function to update it (m_menuBarFrame should be !NULL) - void Refresh(bool eraseBackground = true, const wxRect *rect = NULL); - -#if wxABI_VERSION >= 30001 - wxMenu *OSXGetAppleMenu() const { return m_appleMenu; } -#endif - - static void SetAutoWindowMenu( bool enable ) { s_macAutoWindowMenu = enable ; } - static bool GetAutoWindowMenu() { return s_macAutoWindowMenu ; } - - void MacUninstallMenuBar() ; - void MacInstallMenuBar() ; - static wxMenuBar* MacGetInstalledMenuBar() { return s_macInstalledMenuBar ; } - static void MacSetCommonMenuBar(wxMenuBar* menubar) { s_macCommonMenuBar=menubar; } - static wxMenuBar* MacGetCommonMenuBar() { return s_macCommonMenuBar; } - - - static WXHMENU MacGetWindowMenuHMenu() { return s_macWindowMenuHandle ; } - - virtual void DoGetPosition(int *x, int *y) const; - virtual void DoGetSize(int *width, int *height) const; - virtual void DoGetClientSize(int *width, int *height) const; - -protected: - // common part of all ctors - void Init(); - - static bool s_macAutoWindowMenu ; - static WXHMENU s_macWindowMenuHandle ; - -private: - static wxMenuBar* s_macInstalledMenuBar ; - static wxMenuBar* s_macCommonMenuBar ; - - wxMenu* m_rootMenu; - wxMenu* m_appleMenu; - - wxDECLARE_DYNAMIC_CLASS(wxMenuBar); -}; - -#endif - -#endif // _WX_MENU_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/menuitem.h b/Externals/wxWidgets3/include/wx/osx/menuitem.h deleted file mode 100644 index b5e0000876..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/menuitem.h +++ /dev/null @@ -1,98 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/menuitem.h -// Purpose: wxMenuItem class -// Author: Vadim Zeitlin -// Modified by: -// Created: 11.11.97 -// Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _MENUITEM_H -#define _MENUITEM_H - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/defs.h" -#include "wx/bitmap.h" - -// ---------------------------------------------------------------------------- -// wxMenuItem: an item in the menu, optionally implements owner-drawn behaviour -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxMenuItemImpl ; - -class WXDLLIMPEXP_CORE wxMenuItem: public wxMenuItemBase -{ -public: - // ctor & dtor - wxMenuItem(wxMenu *parentMenu = NULL, - int id = wxID_SEPARATOR, - const wxString& name = wxEmptyString, - const wxString& help = wxEmptyString, - wxItemKind kind = wxITEM_NORMAL, - wxMenu *subMenu = NULL); - virtual ~wxMenuItem(); - - // override base class virtuals - virtual void SetItemLabel(const wxString& strName); - - virtual void Enable(bool bDoEnable = true); - virtual void Check(bool bDoCheck = true); - - virtual void SetBitmap(const wxBitmap& bitmap) ; - virtual const wxBitmap& GetBitmap() const { return m_bitmap; } - - - // Implementation only from now on. - - // update the os specific representation - void UpdateItemBitmap() ; - void UpdateItemText() ; - void UpdateItemStatus() ; - - // mark item as belonging to the given radio group - void SetAsRadioGroupStart(bool start = true); - void SetRadioGroupStart(int start); - void SetRadioGroupEnd(int end); - - // return true if this is the starting item of a radio group - bool IsRadioGroupStart() const; - - // get the start of the radio group this item belongs to: should not be - // called for the starting radio group item itself because it doesn't have - // this information - int GetRadioGroupStart() const; - - // get the end of the radio group this item belongs to: should be only - // called for the starting radio group item, i.e. if IsRadioGroupStart() is - // true - int GetRadioGroupEnd() const; - - wxMenuItemImpl* GetPeer() { return m_peer; } -private: - void UncheckRadio() ; - - // the positions of the first and last items of the radio group this item - // belongs to or -1: start is the radio group start and is valid for all - // but first radio group items (m_isRadioGroupStart == FALSE), end is valid - // only for the first one - union - { - int start; - int end; - } m_radioGroup; - - // does this item start a radio group? - bool m_isRadioGroupStart; - - wxBitmap m_bitmap; // Bitmap for menuitem, if any - - wxMenuItemImpl* m_peer; - - wxDECLARE_DYNAMIC_CLASS(wxMenuItem); -}; - -#endif //_MENUITEM_H diff --git a/Externals/wxWidgets3/include/wx/osx/metafile.h b/Externals/wxWidgets3/include/wx/osx/metafile.h deleted file mode 100644 index 1851a08cad..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/metafile.h +++ /dev/null @@ -1,170 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/metafile.h -// Purpose: wxMetaFile, wxMetaFileDC classes. -// This probably should be restricted to Windows platforms, -// but if there is an equivalent on your platform, great. -// Author: Stefan Csomor -// Modified by: -// Created: 1998-01-01 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - - -#ifndef _WX_METAFIILE_H_ -#define _WX_METAFIILE_H_ - -#include "wx/dc.h" -#include "wx/gdiobj.h" - -#if wxUSE_DATAOBJ -#include "wx/dataobj.h" -#endif - -#include "wx/osx/dcclient.h" - -/* - * Metafile and metafile device context classes - * - */ - -#define wxMetaFile wxMetafile -#define wxMetaFileDC wxMetafileDC - -class WXDLLIMPEXP_FWD_CORE wxMetafile; -class wxMetafileRefData ; - -#define M_METAFILEDATA ((wxMetafileRefData *)m_refData) - -class WXDLLIMPEXP_CORE wxMetafile : public wxGDIObject -{ -public: - wxMetafile(const wxString& file = wxEmptyString); - virtual ~wxMetafile(void); - - // After this is called, the metafile cannot be used for anything - // since it is now owned by the clipboard. - virtual bool SetClipboard(int width = 0, int height = 0); - - virtual bool Play(wxDC *dc); - - wxSize GetSize() const; - int GetWidth() const { return GetSize().x; } - int GetHeight() const { return GetSize().y; } - - // Implementation - WXHMETAFILE GetHMETAFILE() const ; - void SetHMETAFILE(WXHMETAFILE mf) ; -protected: - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; - - wxDECLARE_DYNAMIC_CLASS(wxMetafile); -}; - - -class WXDLLIMPEXP_CORE wxMetafileDCImpl: public wxGCDCImpl -{ -public: - wxMetafileDCImpl( wxDC *owner, - const wxString& filename, - int width, int height, - const wxString& description ); - - virtual ~wxMetafileDCImpl(); - - // Should be called at end of drawing - virtual wxMetafile *Close(); - - // Implementation - wxMetafile *GetMetaFile(void) const { return m_metaFile; } - void SetMetaFile(wxMetafile *mf) { m_metaFile = mf; } - -protected: - virtual void DoGetSize(int *width, int *height) const; - - wxMetafile* m_metaFile; - -private: - wxDECLARE_CLASS(wxMetafileDCImpl); - wxDECLARE_NO_COPY_CLASS(wxMetafileDCImpl); -}; - -class WXDLLIMPEXP_CORE wxMetafileDC: public wxDC -{ - public: - // the ctor parameters specify the filename (empty for memory metafiles), - // the metafile picture size and the optional description/comment - wxMetafileDC( const wxString& filename = wxEmptyString, - int width = 0, int height = 0, - const wxString& description = wxEmptyString ) : - wxDC( new wxMetafileDCImpl( this, filename, width, height, description) ) - { } - - wxMetafile *GetMetafile() const - { return ((wxMetafileDCImpl*)m_pimpl)->GetMetaFile(); } - - wxMetafile *Close() - { return ((wxMetafileDCImpl*)m_pimpl)->Close(); } - -private: - wxDECLARE_CLASS(wxMetafileDC); - wxDECLARE_NO_COPY_CLASS(wxMetafileDC); -}; - - -/* - * Pass filename of existing non-placeable metafile, and bounding box. - * Adds a placeable metafile header, sets the mapping mode to anisotropic, - * and sets the window origin and extent to mimic the wxMM_TEXT mapping mode. - * - */ - -// No origin or extent -#define wxMakeMetaFilePlaceable wxMakeMetafilePlaceable -bool WXDLLIMPEXP_CORE wxMakeMetafilePlaceable(const wxString& filename, float scale = 1.0); - -// Optional origin and extent -bool WXDLLIMPEXP_CORE wxMakeMetaFilePlaceable(const wxString& filename, int x1, int y1, int x2, int y2, float scale = 1.0, bool useOriginAndExtent = true); - -// ---------------------------------------------------------------------------- -// wxMetafileDataObject is a specialization of wxDataObject for metafile data -// ---------------------------------------------------------------------------- - -#if wxUSE_DATAOBJ -class WXDLLIMPEXP_CORE wxMetafileDataObject : public wxDataObjectSimple -{ -public: - // ctors - wxMetafileDataObject() - : wxDataObjectSimple(wxDF_METAFILE) { } - wxMetafileDataObject(const wxMetafile& metafile) - : wxDataObjectSimple(wxDF_METAFILE), m_metafile(metafile) { } - - // virtual functions which you may override if you want to provide data on - // demand only - otherwise, the trivial default versions will be used - virtual void SetMetafile(const wxMetafile& metafile) - { m_metafile = metafile; } - virtual wxMetafile GetMetafile() const - { return m_metafile; } - - // implement base class pure virtuals - virtual size_t GetDataSize() const; - virtual bool GetDataHere(void *buf) const; - virtual bool SetData(size_t len, const void *buf); - - virtual size_t GetDataSize(const wxDataFormat& WXUNUSED(format)) const - { return GetDataSize(); } - virtual bool GetDataHere(const wxDataFormat& WXUNUSED(format), - void *buf) const - { return GetDataHere(buf); } - virtual bool SetData(const wxDataFormat& WXUNUSED(format), - size_t len, const void *buf) - { return SetData(len, buf); } -protected: - wxMetafile m_metafile; -}; -#endif - -#endif - // _WX_METAFIILE_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/mimetype.h b/Externals/wxWidgets3/include/wx/osx/mimetype.h deleted file mode 100644 index e6e6eb0c81..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/mimetype.h +++ /dev/null @@ -1 +0,0 @@ -#include "wx/osx/core/mimetype.h" diff --git a/Externals/wxWidgets3/include/wx/osx/minifram.h b/Externals/wxWidgets3/include/wx/osx/minifram.h deleted file mode 100644 index a4180f975e..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/minifram.h +++ /dev/null @@ -1,41 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/minifram.h -// Purpose: wxMiniFrame class. A small frame for e.g. floating toolbars. -// If there is no equivalent on your platform, just make it a -// normal frame. -// Author: Stefan Csomor -// Modified by: -// Created: 1998-01-01 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MINIFRAM_H_ -#define _WX_MINIFRAM_H_ - -#include "wx/frame.h" - -class WXDLLIMPEXP_CORE wxMiniFrame: public wxFrame { - - wxDECLARE_DYNAMIC_CLASS(wxMiniFrame); - -public: - wxMiniFrame() {} - wxMiniFrame(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxCAPTION | wxRESIZE_BORDER | wxTINY_CAPTION, - const wxString& name = wxFrameNameStr) - { - // Use wxFrame constructor in absence of more specific code. - Create(parent, id, title, pos, size, style | wxFRAME_TOOL_WINDOW | wxFRAME_FLOAT_ON_PARENT , name); - } - - virtual ~wxMiniFrame() {} -protected: -}; - -#endif - // _WX_MINIFRAM_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/msgdlg.h b/Externals/wxWidgets3/include/wx/osx/msgdlg.h deleted file mode 100644 index c4257aff57..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/msgdlg.h +++ /dev/null @@ -1,54 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/msgdlg.h -// Purpose: wxMessageDialog class. Use generic version if no -// platform-specific implementation. -// Author: Stefan Csomor -// Modified by: -// Created: 1998-01-01 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSGBOXDLG_H_ -#define _WX_MSGBOXDLG_H_ - -class WXDLLIMPEXP_CORE wxMessageDialog : public wxMessageDialogBase -{ -public: - wxMessageDialog(wxWindow *parent, - const wxString& message, - const wxString& caption = wxMessageBoxCaptionStr, - long style = wxOK|wxCENTRE, - const wxPoint& pos = wxDefaultPosition); - -#if wxOSX_USE_COCOA - ~wxMessageDialog(); -#endif - - virtual int ShowModal(); - -#if wxOSX_USE_COCOA - virtual void ShowWindowModal(); - virtual void ModalFinishedCallback(void* panel, int resultCode); -#endif - -protected: - // not supported for message dialog - virtual void DoSetSize(int WXUNUSED(x), int WXUNUSED(y), - int WXUNUSED(width), int WXUNUSED(height), - int WXUNUSED(sizeFlags) = wxSIZE_AUTO) {} - -#if wxOSX_USE_COCOA - void* ConstructNSAlert(); -#endif - - int m_buttonId[4]; - int m_buttonCount; - -#if wxOSX_USE_COCOA - WX_NSObject m_sheetDelegate; -#endif - wxDECLARE_DYNAMIC_CLASS(wxMessageDialog); -}; - -#endif // _WX_MSGBOXDLG_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/nonownedwnd.h b/Externals/wxWidgets3/include/wx/osx/nonownedwnd.h deleted file mode 100644 index 9b0d3bea4e..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/nonownedwnd.h +++ /dev/null @@ -1,163 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/nonownedwnd.h -// Purpose: declares wxNonOwnedWindow class -// Author: Stefan Csomor -// Modified by: -// Created: 2008-03-24 -// Copyright: (c) 2008 Stefan Csomor -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MAC_NONOWNEDWND_H_ -#define _WX_MAC_NONOWNEDWND_H_ - -#include "wx/window.h" - -#include "wx/graphics.h" - -#if wxUSE_SYSTEM_OPTIONS - #define wxMAC_WINDOW_PLAIN_TRANSITION wxT("mac.window-plain-transition") -#endif - -//----------------------------------------------------------------------------- -// wxNonOwnedWindow -//----------------------------------------------------------------------------- - -// This class represents "non-owned" window. A window is owned by another -// window if it has a parent and is positioned within the parent. For example, -// wxFrame is non-owned, because even though it can have a parent, it's -// location is independent of it. This class is for internal use only, it's -// the base class for wxTopLevelWindow and wxPopupWindow. - -class wxNonOwnedWindowImpl; - -class WXDLLIMPEXP_CORE wxNonOwnedWindow : public wxNonOwnedWindowBase -{ -public: - // constructors and such - wxNonOwnedWindow() { Init(); } - - wxNonOwnedWindow(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxPanelNameStr) - { - Init(); - - (void)Create(parent, id, pos, size, style, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxPanelNameStr); - - bool Create(wxWindow *parent, WXWindow nativeWindow); - - virtual ~wxNonOwnedWindow(); - - virtual void SubclassWin(WXWindow nativeWindow); - virtual void UnsubclassWin(); - - virtual wxPoint GetClientAreaOrigin() const; - - // implement base class pure virtuals - - virtual bool SetTransparent(wxByte alpha); - virtual bool CanSetTransparent(); - - virtual bool SetBackgroundStyle(wxBackgroundStyle style); - - virtual void Update(); - - WXWindow GetWXWindow() const ; - static wxNonOwnedWindow* GetFromWXWindow( WXWindow win ); - - // implementation from now on - // -------------------------- - - // These accessors are Mac-specific and don't exist in other ports. - const wxRegion& GetShape() const { return m_shape; } -#if wxUSE_GRAPHICS_CONTEXT - const wxGraphicsPath& GetShapePath() { return m_shapePath; } -#endif // wxUSE_GRAPHICS_CONTEXT - - // activation hooks only necessary for MDI Implementation - static void MacDelayedDeactivation(long timestamp); - virtual void MacActivate( long timestamp , bool inIsActivating ) ; - - virtual void SetWindowStyleFlag(long flags); - - virtual void Raise(); - virtual void Lower(); - virtual bool Show( bool show = true ); - - virtual void SetExtraStyle(long exStyle) ; - - virtual bool SetBackgroundColour( const wxColour &colour ); - - wxNonOwnedWindowImpl* GetNonOwnedPeer() const { return m_nowpeer; } - -#if wxOSX_USE_COCOA_OR_IPHONE - // override the base class method to return an NSWindow instead of NSView - virtual void *OSXGetViewOrWindow() const; -#endif // Cocoa - - // osx specific event handling common for all osx-ports - - virtual void HandleActivated( double timestampsec, bool didActivate ); - virtual void HandleResized( double timestampsec ); - virtual void HandleMoved( double timestampsec ); - virtual void HandleResizing( double timestampsec, wxRect* rect ); - - void OSXHandleMiniaturize(double WXUNUSED(timestampsec), bool miniaturized); - - void WindowWasPainted(); - - virtual bool Destroy(); - -protected: - // common part of all ctors - void Init(); - - virtual void DoGetPosition( int *x, int *y ) const; - virtual void DoGetSize( int *width, int *height ) const; - virtual void DoMoveWindow(int x, int y, int width, int height); - virtual void DoGetClientSize(int *width, int *height) const; - - virtual bool OSXShowWithEffect(bool show, - wxShowEffect effect, - unsigned timeout); - - virtual bool DoClearShape(); - virtual bool DoSetRegionShape(const wxRegion& region); -#if wxUSE_GRAPHICS_CONTEXT - virtual bool DoSetPathShape(const wxGraphicsPath& path); -#endif // wxUSE_GRAPHICS_CONTEXT - - virtual void WillBeDestroyed(); - - wxNonOwnedWindowImpl* m_nowpeer ; - -// wxWindowMac* m_macFocus ; - - static wxNonOwnedWindow *s_macDeactivateWindow; - -private : - static clock_t s_lastFlush; - - wxRegion m_shape; -#if wxUSE_GRAPHICS_CONTEXT - wxGraphicsPath m_shapePath; -#endif // wxUSE_GRAPHICS_CONTEXT -}; - -// list of all frames and modeless dialogs -extern WXDLLIMPEXP_DATA_CORE(wxWindowList) wxModelessWindows; - - -#endif // _WX_MAC_NONOWNEDWND_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/notebook.h b/Externals/wxWidgets3/include/wx/osx/notebook.h deleted file mode 100644 index c8e706f080..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/notebook.h +++ /dev/null @@ -1,140 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/notebook.h -// Purpose: MSW/GTK compatible notebook (a.k.a. property sheet) -// Author: Stefan Csomor -// Modified by: -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_NOTEBOOK_H_ -#define _WX_NOTEBOOK_H_ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- -#include "wx/event.h" - -// ---------------------------------------------------------------------------- -// types -// ---------------------------------------------------------------------------- - -// fwd declarations -class WXDLLIMPEXP_FWD_CORE wxImageList; -class WXDLLIMPEXP_FWD_CORE wxWindow; - -// ---------------------------------------------------------------------------- -// wxNotebook -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxNotebook : public wxNotebookBase -{ -public: - // ctors - // ----- - // default for dynamic class - wxNotebook() { } - // the same arguments as for wxControl (@@@ any special styles?) - wxNotebook(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxNotebookNameStr) - { Create( parent, id, pos, size, style, name ); } - // Create() function - bool Create(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxNotebookNameStr); - // dtor - virtual ~wxNotebook(); - - // accessors - // --------- - // set the currently selected page, return the index of the previously - // selected one (or wxNOT_FOUND on error) - // NB: this function will _not_ generate wxEVT_NOTEBOOK_PAGE_xxx events - int SetSelection(size_t nPage) wxOVERRIDE { return DoSetSelection(nPage, SetSelection_SendEvent); } - - // changes selected page without sending events - int ChangeSelection(size_t nPage) wxOVERRIDE { return DoSetSelection(nPage); } - - // set/get the title of a page - bool SetPageText(size_t nPage, const wxString& strText) wxOVERRIDE; - wxString GetPageText(size_t nPage) const wxOVERRIDE; - - // sets/returns item's image index in the current image list - int GetPageImage(size_t nPage) const wxOVERRIDE; - bool SetPageImage(size_t nPage, int nImage) wxOVERRIDE; - - // control the appearance of the notebook pages - // set the size (the same for all pages) - virtual void SetPageSize(const wxSize& size) wxOVERRIDE; - // set the padding between tabs (in pixels) - virtual void SetPadding(const wxSize& padding) wxOVERRIDE; - // sets the size of the tabs (assumes all tabs are the same size) - virtual void SetTabSize(const wxSize& sz) wxOVERRIDE; - - // hit test - virtual int HitTest(const wxPoint& pt, long *flags = NULL) const wxOVERRIDE; - - // calculate size for wxNotebookSizer - wxSize CalcSizeFromPage(const wxSize& sizePage) const wxOVERRIDE; - wxRect GetPageRect() const wxOVERRIDE; - - // operations - // ---------- - // remove all pages - bool DeleteAllPages() wxOVERRIDE; - // the same as AddPage(), but adds it at the specified position - bool InsertPage(size_t nPage, - wxNotebookPage *pPage, - const wxString& strText, - bool bSelect = false, - int imageId = NO_IMAGE) wxOVERRIDE; - - // callbacks - // --------- - void OnSize(wxSizeEvent& event); - void OnSetFocus(wxFocusEvent& event); - void OnNavigationKey(wxNavigationKeyEvent& event); - - // implementation - // -------------- - -#if wxUSE_CONSTRAINTS - virtual void SetConstraintSizes(bool recurse = true) wxOVERRIDE; - virtual bool DoPhase(int nPhase) wxOVERRIDE; - -#endif - - // base class virtuals - // ------------------- - virtual void Command(wxCommandEvent& event) wxOVERRIDE; - // osx specific event handling common for all osx-ports - - virtual bool OSXHandleClicked( double timestampsec ) wxOVERRIDE; - -protected: - virtual wxNotebookPage *DoRemovePage(size_t page) wxOVERRIDE; - // common part of all ctors - void Init(); - - // helper functions - void ChangePage(int nOldSel, int nSel); // change pages - void MacSetupTabs(); - - int DoSetSelection(size_t nPage, int flags = 0) wxOVERRIDE; - - // the icon indices - wxArrayInt m_images; - - wxDECLARE_DYNAMIC_CLASS(wxNotebook); - wxDECLARE_EVENT_TABLE(); -}; - - -#endif // _WX_NOTEBOOK_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/palette.h b/Externals/wxWidgets3/include/wx/osx/palette.h deleted file mode 100644 index 7c695ec1c9..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/palette.h +++ /dev/null @@ -1,40 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/palette.h -// Purpose: wxPalette class -// Author: Stefan Csomor -// Modified by: -// Created: 1998-01-01 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PALETTE_H_ -#define _WX_PALETTE_H_ - -#include "wx/gdiobj.h" - -#define M_PALETTEDATA ((wxPaletteRefData *)m_refData) - -class WXDLLIMPEXP_CORE wxPalette : public wxPaletteBase -{ -public: - wxPalette(); - - wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue); - virtual ~wxPalette(); - bool Create(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue); - - int GetPixel(unsigned char red, unsigned char green, unsigned char blue) const; - bool GetRGB(int pixel, unsigned char *red, unsigned char *green, unsigned char *blue) const; - - virtual int GetColoursCount() const; - -protected: - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; - -private: - wxDECLARE_DYNAMIC_CLASS(wxPalette); -}; - -#endif // _WX_PALETTE_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/pen.h b/Externals/wxWidgets3/include/wx/osx/pen.h deleted file mode 100644 index c203e2faeb..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/pen.h +++ /dev/null @@ -1,75 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/pen.h -// Purpose: wxPen class -// Author: Stefan Csomor -// Modified by: -// Created: 1998-01-01 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PEN_H_ -#define _WX_PEN_H_ - -#include "wx/gdiobj.h" -#include "wx/colour.h" -#include "wx/bitmap.h" - -// Pen -class WXDLLIMPEXP_CORE wxPen : public wxPenBase -{ -public: - wxPen(); - wxPen(const wxColour& col, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID); - - wxPen(const wxBitmap& stipple, int width); - virtual ~wxPen(); - - bool operator==(const wxPen& pen) const; - bool operator!=(const wxPen& pen) const { return !(*this == pen); } - - // Override in order to recreate the pen - void SetColour(const wxColour& col) ; - void SetColour(unsigned char r, unsigned char g, unsigned char b) ; - - void SetWidth(int width) ; - void SetStyle(wxPenStyle style) ; - void SetStipple(const wxBitmap& stipple) ; - void SetDashes(int nb_dashes, const wxDash *dash) ; - void SetJoin(wxPenJoin join) ; - void SetCap(wxPenCap cap) ; - - wxColour GetColour() const ; - int GetWidth() const; - wxPenStyle GetStyle() const; - wxPenJoin GetJoin() const; - wxPenCap GetCap() const; - int GetDashes(wxDash **ptr) const; - int GetDashCount() const; - - wxBitmap *GetStipple() const ; - - - wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants") - wxPen(const wxColour& col, int width, int style); - - wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants") - void SetStyle(int style) { SetStyle((wxPenStyle)style); } - - // Implementation - - // Useful helper: create the brush resource - bool RealizeResource(); - -protected: - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; - -private: - void Unshare(); - - wxDECLARE_DYNAMIC_CLASS(wxPen); -}; - -#endif - // _WX_PEN_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/popupwin.h b/Externals/wxWidgets3/include/wx/osx/popupwin.h deleted file mode 100644 index 8d9be37dee..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/popupwin.h +++ /dev/null @@ -1,35 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/popupwin.h -// Purpose: wxPopupWindow class for wxMac -// Author: Stefan Csomor -// Modified by: -// Created: -// Copyright: (c) 2006 Stefan Csomor -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MAC_POPUPWIN_H_ -#define _WX_MAC_POPUPWIN_H_ - -// ---------------------------------------------------------------------------- -// wxPopupWindow -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxPopupWindow : public wxPopupWindowBase -{ -public: - wxPopupWindow() { } - ~wxPopupWindow(); - - wxPopupWindow(wxWindow *parent, int flags = wxBORDER_NONE) - { (void)Create(parent, flags); } - - bool Create(wxWindow *parent, int flags = wxBORDER_NONE); - - virtual bool Show(bool show = true); - - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPopupWindow); -}; - -#endif // _WX_MAC_POPUPWIN_H_ - diff --git a/Externals/wxWidgets3/include/wx/osx/printdlg.h b/Externals/wxWidgets3/include/wx/osx/printdlg.h deleted file mode 100644 index 83fbd58dde..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/printdlg.h +++ /dev/null @@ -1,111 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/printdlg.h -// Purpose: wxPrintDialog, wxPageSetupDialog classes. -// Use generic, PostScript version if no -// platform-specific implementation. -// Author: Stefan Csomor -// Modified by: -// Created: 1998-01-01 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PRINTDLG_H_ -#define _WX_PRINTDLG_H_ - -#include "wx/dialog.h" -#include "wx/cmndata.h" -#include "wx/printdlg.h" -#include "wx/prntbase.h" - -/* - * wxMacPrintDialog - * The Mac dialog for printing - */ - -class WXDLLIMPEXP_FWD_CORE wxDC; -class WXDLLIMPEXP_CORE wxMacPrintDialog: public wxPrintDialogBase -{ -public: - wxMacPrintDialog(); - wxMacPrintDialog(wxWindow *parent, wxPrintDialogData* data = NULL); - wxMacPrintDialog(wxWindow *parent, wxPrintData* data ); - virtual ~wxMacPrintDialog(); - - bool Create(wxWindow *parent, wxPrintDialogData* data = NULL); - virtual int ShowModal(); - - virtual wxPrintDialogData& GetPrintDialogData() { return m_printDialogData; } - virtual wxPrintData& GetPrintData() { return m_printDialogData.GetPrintData(); } - virtual wxDC *GetPrintDC(); - -private: - wxPrintDialogData m_printDialogData; - wxDC* m_printerDC; - bool m_destroyDC; - wxWindow* m_dialogParent; - -private: - wxDECLARE_DYNAMIC_CLASS(wxPrintDialog); -}; - -/* - * wxMacPageSetupDialog - * The Mac page setup dialog - */ - -class WXDLLIMPEXP_CORE wxMacPageSetupDialog: public wxPageSetupDialogBase -{ -public: - wxMacPageSetupDialog(wxWindow *parent, wxPageSetupDialogData *data = NULL); - virtual ~wxMacPageSetupDialog(); - - virtual wxPageSetupDialogData& GetPageSetupDialogData(); - - bool Create(wxWindow *parent, wxPageSetupDialogData *data = NULL); - virtual int ShowModal(); - -private: - wxPageSetupDialogData m_pageSetupData; - wxWindow* m_dialogParent; - -private: - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxMacPageSetupDialog); -}; - -class WXDLLIMPEXP_FWD_CORE wxTextCtrl; - -/* -* wxMacPageMarginsDialog -* A Mac dialog for setting the page margins separately from page setup since -* (native) wxMacPageSetupDialog doesn't let you set margins. -*/ - -class WXDLLIMPEXP_CORE wxMacPageMarginsDialog : public wxDialog -{ -public: - wxMacPageMarginsDialog(wxFrame* parent, wxPageSetupDialogData* data); - bool TransferToWindow(); - bool TransferDataFromWindow(); - - virtual wxPageSetupDialogData& GetPageSetupDialogData() { return *m_pageSetupDialogData; } - -private: - wxPageSetupDialogData* m_pageSetupDialogData; - - wxPoint m_MinMarginTopLeft; - wxPoint m_MinMarginBottomRight; - wxTextCtrl *m_LeftMargin; - wxTextCtrl *m_TopMargin; - wxTextCtrl *m_RightMargin; - wxTextCtrl *m_BottomMargin; - - void GetMinMargins(); - bool CheckValue(wxTextCtrl* textCtrl, int *value, int minValue, const wxString& name); - -private: - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxMacPageMarginsDialog); -}; - - -#endif // _WX_PRINTDLG_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/printmac.h b/Externals/wxWidgets3/include/wx/osx/printmac.h deleted file mode 100644 index caf4aca61b..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/printmac.h +++ /dev/null @@ -1,59 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/printmac.h -// Purpose: wxWindowsPrinter, wxWindowsPrintPreview classes -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PRINTWIN_H_ -#define _WX_PRINTWIN_H_ - -#include "wx/prntbase.h" - -/* - * Represents the printer: manages printing a wxPrintout object - */ - -class WXDLLIMPEXP_CORE wxMacPrinter: public wxPrinterBase -{ - wxDECLARE_DYNAMIC_CLASS(wxMacPrinter); - -public: - wxMacPrinter(wxPrintDialogData *data = NULL); - virtual ~wxMacPrinter(); - - virtual bool Print(wxWindow *parent, - wxPrintout *printout, - bool prompt = true); - virtual wxDC* PrintDialog(wxWindow *parent); - virtual bool Setup(wxWindow *parent); - -}; - -/* - * wxPrintPreview - * Programmer creates an object of this class to preview a wxPrintout. - */ - -class WXDLLIMPEXP_CORE wxMacPrintPreview: public wxPrintPreviewBase -{ - wxDECLARE_CLASS(wxMacPrintPreview); - -public: - wxMacPrintPreview(wxPrintout *printout, - wxPrintout *printoutForPrinting = NULL, - wxPrintDialogData *data = NULL); - wxMacPrintPreview(wxPrintout *printout, - wxPrintout *printoutForPrinting, - wxPrintData *data); - virtual ~wxMacPrintPreview(); - - virtual bool Print(bool interactive); - virtual void DetermineScaling(); -}; - -#endif - // _WX_PRINTWIN_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/private.h b/Externals/wxWidgets3/include/wx/osx/private.h deleted file mode 100644 index 23fd0025fb..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/private.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef _WX_PRIVATE_OSX_H_ -#define _WX_PRIVATE_OSX_H_ - -#include "wx/osx/core/private.h" - -#if wxOSX_USE_IPHONE - #include "wx/osx/iphone/private.h" -#elif wxOSX_USE_COCOA - #include "wx/osx/cocoa/private.h" -#elif wxUSE_GUI - #error "Must include wx/defs.h first" -#endif - -#endif diff --git a/Externals/wxWidgets3/include/wx/osx/private/addremovectrl.h b/Externals/wxWidgets3/include/wx/osx/private/addremovectrl.h deleted file mode 100644 index a5b342a8d2..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/private/addremovectrl.h +++ /dev/null @@ -1,117 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/private/addremovectrl.h -// Purpose: OS X specific wxAddRemoveImpl implementation -// Author: Vadim Zeitlin -// Created: 2015-02-05 -// Copyright: (c) 2015 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_OSX_PRIVATE_ADDREMOVECTRL_H_ -#define _WX_OSX_PRIVATE_ADDREMOVECTRL_H_ - -#include "wx/artprov.h" -#include "wx/bmpbuttn.h" -#include "wx/panel.h" - -#include "wx/osx/private.h" - -// ---------------------------------------------------------------------------- -// wxAddRemoveImpl itself -// ---------------------------------------------------------------------------- - -class wxAddRemoveImpl : public wxAddRemoveImplWithButtons -{ -public: - wxAddRemoveImpl(wxAddRemoveAdaptor* adaptor, - wxAddRemoveCtrl* parent, - wxWindow* ctrlItems) - : wxAddRemoveImplWithButtons(adaptor, parent, ctrlItems), - m_ctrlItems(ctrlItems) - { - // This size is hard coded for now as this is what the system dialogs - // themselves (e.g. the buttons under the lists in the "Users" or - // "Network" panes of the "System Preferences") use under OS X 10.8. - const wxSize sizeBtn(25, 23); - - m_btnAdd = new wxBitmapButton(parent, wxID_ADD, - wxArtProvider::GetBitmap("NSAddTemplate"), - wxDefaultPosition, - sizeBtn, - wxBORDER_SIMPLE); - - m_btnRemove = new wxBitmapButton(parent, wxID_REMOVE, - wxArtProvider::GetBitmap("NSRemoveTemplate"), - wxDefaultPosition, - sizeBtn, - wxBORDER_SIMPLE); - - // Under OS X the space to the right of the buttons is actually - // occupied by an inactive gradient button, so create one. - m_btnPlaceholder = new wxButton(parent, wxID_ANY, "", - wxDefaultPosition, - sizeBtn, - wxBORDER_SIMPLE); - m_btnPlaceholder->Disable(); - - - // We need to lay out our windows manually under OS X as it is the only - // way to achieve the required, for the correct look, overlap between - // their borders -- sizers would never allow this. - parent->Bind(wxEVT_SIZE, &wxAddRemoveImpl::OnSize, this); - - // We also have to ensure that the window with the items doesn't have - // any border as it wouldn't look correctly if it did. - long style = ctrlItems->GetWindowStyle(); - style &= ~wxBORDER_MASK; - style |= wxBORDER_SIMPLE; - ctrlItems->SetWindowStyle(style); - - - SetUpEvents(); - } - - // As we don't use sizers, we also need to compute our best size ourselves. - virtual wxSize GetBestClientSize() const wxOVERRIDE - { - wxSize size = m_ctrlItems->GetBestSize(); - - const wxSize sizeBtn = m_btnAdd->GetSize(); - - size.y += sizeBtn.y; - size.IncTo(wxSize(3*sizeBtn.x, -1)); - - return size; - } - -private: - void OnSize(wxSizeEvent& event) - { - const wxSize size = event.GetSize(); - - const wxSize sizeBtn = m_btnAdd->GetSize(); - - const int yBtn = size.y - sizeBtn.y; - - // There is a vertical overlap which hides the items control bottom - // border. - m_ctrlItems->SetSize(0, 0, size.x, yBtn + 2); - - // And there is also a horizontal 1px overlap between the buttons - // themselves, so subtract 1 from the next button position. - int x = 0; - m_btnAdd->Move(x, yBtn); - x += sizeBtn.x - 1; - - m_btnRemove->Move(x, yBtn); - x += sizeBtn.x - 1; - - // The last one needs to be resized to take up all the remaining space. - m_btnPlaceholder->SetSize(x, yBtn, size.x - x, sizeBtn.y); - } - - wxWindow* m_ctrlItems; - wxButton* /* const */ m_btnPlaceholder; -}; - -#endif // _WX_OSX_PRIVATE_ADDREMOVECTRL_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/private/print.h b/Externals/wxWidgets3/include/wx/osx/private/print.h deleted file mode 100644 index 13c3d5cda1..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/private/print.h +++ /dev/null @@ -1 +0,0 @@ -#include "wx/osx/carbon/private/print.h" diff --git a/Externals/wxWidgets3/include/wx/osx/private/timer.h b/Externals/wxWidgets3/include/wx/osx/private/timer.h deleted file mode 100644 index 1eb8dd80e9..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/private/timer.h +++ /dev/null @@ -1,3 +0,0 @@ -#if 1 // revert to wxOSX_USE_COCOA_OR_IPHONE in case of problems - #include "wx/osx/core/private/timer.h" -#endif diff --git a/Externals/wxWidgets3/include/wx/osx/radiobox.h b/Externals/wxWidgets3/include/wx/osx/radiobox.h deleted file mode 100644 index bbf61a7b37..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/radiobox.h +++ /dev/null @@ -1,109 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/radiobox.h -// Purpose: wxRadioBox class -// Author: Stefan Csomor -// Modified by: -// Created: 1998-01-01 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_RADIOBOX_H_ -#define _WX_RADIOBOX_H_ - -// List box item -class WXDLLIMPEXP_FWD_CORE wxBitmap ; - -class WXDLLIMPEXP_FWD_CORE wxRadioButton ; - -class WXDLLIMPEXP_CORE wxRadioBox: public wxControl, public wxRadioBoxBase -{ - wxDECLARE_DYNAMIC_CLASS(wxRadioBox); -public: -// Constructors & destructor - wxRadioBox(); - wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title, - const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = NULL, - int majorDim = 0, long style = wxRA_SPECIFY_COLS, - const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr) - { - Create(parent, id, title, pos, size, n, choices, majorDim, style, val, name); - } - wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title, - const wxPoint& pos, const wxSize& size, - const wxArrayString& choices, - int majorDim = 0, long style = wxRA_SPECIFY_COLS, - const wxValidator& val = wxDefaultValidator, - const wxString& name = wxRadioBoxNameStr) - { - Create(parent, id, title, pos, size, choices, - majorDim, style, val, name); - } - virtual ~wxRadioBox(); - bool Create(wxWindow *parent, wxWindowID id, const wxString& title, - const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = NULL, - int majorDim = 0, long style = wxRA_SPECIFY_COLS, - const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr); - bool Create(wxWindow *parent, wxWindowID id, const wxString& title, - const wxPoint& pos, const wxSize& size, - const wxArrayString& choices, - int majorDim = 0, long style = wxRA_SPECIFY_COLS, - const wxValidator& val = wxDefaultValidator, - const wxString& name = wxRadioBoxNameStr); - - // Enabling - virtual bool Enable(bool enable = true) wxOVERRIDE; - virtual bool Enable(unsigned int item, bool enable = true) wxOVERRIDE; - virtual bool IsItemEnabled(unsigned int item) const wxOVERRIDE; - - // Showing - virtual bool Show(bool show = true) wxOVERRIDE; - virtual bool Show(unsigned int item, bool show = true) wxOVERRIDE; - virtual bool IsItemShown(unsigned int item) const wxOVERRIDE; - - // Specific functions (in wxWidgets2 reference) - virtual void SetSelection(int item) wxOVERRIDE; - virtual int GetSelection() const wxOVERRIDE; - - virtual unsigned int GetCount() const wxOVERRIDE { return m_noItems; } - - virtual wxString GetString(unsigned int item) const wxOVERRIDE; - virtual void SetString(unsigned int item, const wxString& label) wxOVERRIDE; - - virtual wxString GetLabel() const wxOVERRIDE; - virtual void SetLabel(const wxString& label) wxOVERRIDE; - - // protect native font of box - virtual bool SetFont( const wxFont &font ) wxOVERRIDE; -// Other external functions - void Command(wxCommandEvent& event) wxOVERRIDE; - void SetFocus() wxOVERRIDE; - -// Other variable access functions - int GetNumberOfRowsOrCols() const { return m_noRowsOrCols; } - void SetNumberOfRowsOrCols(int n) { m_noRowsOrCols = n; } - - void OnRadioButton( wxCommandEvent& event ) ; - -protected: - // resolve ambiguity in base classes - virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxRadioBoxBase::GetDefaultBorder(); } - - wxRadioButton *m_radioButtonCycle; - - unsigned int m_noItems; - int m_noRowsOrCols; - -// Internal functions - virtual wxSize DoGetBestSize() const wxOVERRIDE; - virtual void DoSetSize(int x, int y, - int width, int height, - int sizeFlags = wxSIZE_AUTO) wxOVERRIDE; - - wxDECLARE_EVENT_TABLE(); -}; - -#endif - // _WX_RADIOBOX_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/radiobut.h b/Externals/wxWidgets3/include/wx/osx/radiobut.h deleted file mode 100644 index 714d1984e9..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/radiobut.h +++ /dev/null @@ -1,93 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/radiobut.h -// Purpose: wxRadioButton class -// Author: Stefan Csomor -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_RADIOBUT_H_ -#define _WX_RADIOBUT_H_ - -class WXDLLIMPEXP_CORE wxRadioButton: public wxControl -{ - wxDECLARE_DYNAMIC_CLASS(wxRadioButton); - -public: - wxRadioButton() {} - wxRadioButton(wxWindow *parent, wxWindowID id, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxRadioButtonNameStr) - { - Create(parent, id, label, pos, size, style, validator, name); - } - virtual ~wxRadioButton(); - - bool Create(wxWindow *parent, wxWindowID id, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxRadioButtonNameStr); - - virtual void SetValue(bool val); - virtual bool GetValue() const ; - - // implementation - - void Command(wxCommandEvent& event); - wxRadioButton *AddInCycle(wxRadioButton *cycle); - void RemoveFromCycle(); - wxRadioButton *NextInCycle() {return m_cycle;} - - // osx specific event handling common for all osx-ports - - virtual bool OSXHandleClicked( double timestampsec ); - protected: - - wxRadioButton *m_cycle; -}; - -// Not implemented -#if 0 -class WXDLLIMPEXP_FWD_CORE wxBitmap ; - -WXDLLIMPEXP_DATA_CORE(extern const wxChar) wxBitmapRadioButtonNameStr[]; - -class WXDLLIMPEXP_CORE wxBitmapRadioButton: public wxRadioButton -{ - wxDECLARE_DYNAMIC_CLASS(wxBitmapRadioButton); -protected: - wxBitmap *theButtonBitmap; -public: - wxBitmapRadioButton() { theButtonBitmap = NULL; } - wxBitmapRadioButton(wxWindow *parent, wxWindowID id, - const wxBitmap *label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxBitmapRadioButtonNameStr) - { - Create(parent, id, label, pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, wxWindowID id, - const wxBitmap *label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxBitmapRadioButtonNameStr); - - virtual void SetLabel(const wxBitmap *label); - virtual void SetValue(bool val) ; - virtual bool GetValue() const ; -}; -#endif - -#endif - // _WX_RADIOBUT_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/region.h b/Externals/wxWidgets3/include/wx/osx/region.h deleted file mode 100644 index e085282079..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/region.h +++ /dev/null @@ -1,8 +0,0 @@ -#if wxOSX_USE_COCOA_OR_CARBON -#include "wx/osx/carbon/region.h" -#else -#define wxRegionGeneric wxRegion -#define wxRegionIteratorGeneric wxRegionIterator - -#include "wx/generic/region.h" -#endif diff --git a/Externals/wxWidgets3/include/wx/osx/scrolbar.h b/Externals/wxWidgets3/include/wx/osx/scrolbar.h deleted file mode 100644 index fdfc105d97..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/scrolbar.h +++ /dev/null @@ -1,68 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/scrolbar.h -// Purpose: wxScrollBar class -// Author: Stefan Csomor -// Modified by: -// Created: 1998-01-01 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_SCROLBAR_H_ -#define _WX_SCROLBAR_H_ - -// Scrollbar item -class WXDLLIMPEXP_CORE wxScrollBar : public wxScrollBarBase -{ -public: - wxScrollBar() { m_pageSize = 0; m_viewSize = 0; m_objectSize = 0; } - virtual ~wxScrollBar(); - - wxScrollBar(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSB_HORIZONTAL, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxScrollBarNameStr) - { - Create(parent, id, pos, size, style, validator, name); - } - bool Create(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSB_HORIZONTAL, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxScrollBarNameStr); - - virtual int GetThumbPosition() const wxOVERRIDE; - virtual int GetThumbSize() const wxOVERRIDE { return m_viewSize; } - virtual int GetPageSize() const wxOVERRIDE { return m_pageSize; } - virtual int GetRange() const wxOVERRIDE { return m_objectSize; } - - virtual void SetThumbPosition(int viewStart) wxOVERRIDE; - virtual void SetScrollbar(int position, int thumbSize, int range, - int pageSize, bool refresh = true) wxOVERRIDE; - - // needed for RTTI - void SetThumbSize( int s ) { SetScrollbar( GetThumbPosition() , s , GetRange() , GetPageSize() , true ) ; } - void SetPageSize( int s ) { SetScrollbar( GetThumbPosition() , GetThumbSize() , GetRange() , s , true ) ; } - void SetRange( int s ) { SetScrollbar( GetThumbPosition() , GetThumbSize() , s , GetPageSize() , true ) ; } - - // implementation only from now on - void Command(wxCommandEvent& event) wxOVERRIDE; - virtual void TriggerScrollEvent( wxEventType scrollEvent ) wxOVERRIDE; - virtual bool OSXHandleClicked( double timestampsec ) wxOVERRIDE; -protected: - virtual wxSize DoGetBestSize() const wxOVERRIDE; - - int m_pageSize; - int m_viewSize; - int m_objectSize; - - wxDECLARE_DYNAMIC_CLASS(wxScrollBar); - wxDECLARE_EVENT_TABLE(); -}; - -#endif // _WX_SCROLBAR_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/setup0.h b/Externals/wxWidgets3/include/wx/osx/setup0.h deleted file mode 100644 index 47046eb9a9..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/setup0.h +++ /dev/null @@ -1,1549 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/setup.h -// Purpose: Configuration for the library -// Author: Stefan Csomor -// Modified by: Stefan Csomor -// Created: 1998-01-01 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_SETUP_H_ -#define _WX_SETUP_H_ - - -/* --- start common options --- */ -// ---------------------------------------------------------------------------- -// global settings -// ---------------------------------------------------------------------------- - -// define this to 0 when building wxBase library - this can also be done from -// makefile/project file overriding the value here -#ifndef wxUSE_GUI - #define wxUSE_GUI 1 -#endif // wxUSE_GUI - -// ---------------------------------------------------------------------------- -// compatibility settings -// ---------------------------------------------------------------------------- - -// This setting determines the compatibility with 2.8 API: set it to 0 to -// flag all cases of using deprecated functions. -// -// Default is 1 but please try building your code with 0 as the default will -// change to 0 in the next version and the deprecated functions will disappear -// in the version after it completely. -// -// Recommended setting: 0 (please update your code) -#define WXWIN_COMPATIBILITY_2_8 0 - -// This setting determines the compatibility with 3.0 API: set it to 0 to -// flag all cases of using deprecated functions. -// -// Default is 1 but please try building your code with 0 as the default will -// change to 0 in the next version and the deprecated functions will disappear -// in the version after it completely. -// -// Recommended setting: 0 (please update your code) -#define WXWIN_COMPATIBILITY_3_0 1 - -// MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when -// default system font is used for wxWindow::GetCharWidth/Height() instead of -// the current font. -// -// Default is 0 -// -// Recommended setting: 0 -#define wxDIALOG_UNIT_COMPATIBILITY 0 - -// ---------------------------------------------------------------------------- -// debugging settings -// ---------------------------------------------------------------------------- - -// wxDEBUG_LEVEL will be defined as 1 in wx/debug.h so normally there is no -// need to define it here. You may do it for two reasons: either completely -// disable/compile out the asserts in release version (then do it inside #ifdef -// NDEBUG) or, on the contrary, enable more asserts, including the usually -// disabled ones, in the debug build (then do it inside #ifndef NDEBUG) -// -// #ifdef NDEBUG -// #define wxDEBUG_LEVEL 0 -// #else -// #define wxDEBUG_LEVEL 2 -// #endif - -// wxHandleFatalExceptions() may be used to catch the program faults at run -// time and, instead of terminating the program with a usual GPF message box, -// call the user-defined wxApp::OnFatalException() function. If you set -// wxUSE_ON_FATAL_EXCEPTION to 0, wxHandleFatalExceptions() will not work. -// -// This setting is for Win32 only and can only be enabled if your compiler -// supports Win32 structured exception handling (currently only VC++ does) -// -// Default is 1 -// -// Recommended setting: 1 if your compiler supports it. -#define wxUSE_ON_FATAL_EXCEPTION 1 - -// Set this to 1 to be able to generate a human-readable (unlike -// machine-readable minidump created by wxCrashReport::Generate()) stack back -// trace when your program crashes using wxStackWalker -// -// Default is 1 if supported by the compiler. -// -// Recommended setting: 1, set to 0 if your programs never crash -#define wxUSE_STACKWALKER 1 - -// Set this to 1 to compile in wxDebugReport class which allows you to create -// and optionally upload to your web site a debug report consisting of back -// trace of the crash (if wxUSE_STACKWALKER == 1) and other information. -// -// Default is 1 if supported by the compiler. -// -// Recommended setting: 1, it is compiled into a separate library so there -// is no overhead if you don't use it -#define wxUSE_DEBUGREPORT 1 - -// Generic comment about debugging settings: they are very useful if you don't -// use any other memory leak detection tools such as Purify/BoundsChecker, but -// are probably redundant otherwise. Also, Visual C++ CRT has the same features -// as wxWidgets memory debugging subsystem built in since version 5.0 and you -// may prefer to use it instead of built in memory debugging code because it is -// faster and more fool proof. -// -// Using VC++ CRT memory debugging is enabled by default in debug build (_DEBUG -// is defined) if wxUSE_GLOBAL_MEMORY_OPERATORS is *not* enabled (i.e. is 0) -// and if __NO_VC_CRTDBG__ is not defined. - -// The rest of the options in this section are obsolete and not supported, -// enable them at your own risk. - -// If 1, enables wxDebugContext, for writing error messages to file, etc. If -// __WXDEBUG__ is not defined, will still use the normal memory operators. -// -// Default is 0 -// -// Recommended setting: 0 -#define wxUSE_DEBUG_CONTEXT 0 - -// If 1, enables debugging versions of wxObject::new and wxObject::delete *IF* -// __WXDEBUG__ is also defined. -// -// WARNING: this code may not work with all architectures, especially if -// alignment is an issue. This switch is currently ignored for mingw / cygwin -// -// Default is 0 -// -// Recommended setting: 1 if you are not using a memory debugging tool, else 0 -#define wxUSE_MEMORY_TRACING 0 - -// In debug mode, cause new and delete to be redefined globally. -// If this causes problems (e.g. link errors which is a common problem -// especially if you use another library which also redefines the global new -// and delete), set this to 0. -// This switch is currently ignored for mingw / cygwin -// -// Default is 0 -// -// Recommended setting: 0 -#define wxUSE_GLOBAL_MEMORY_OPERATORS 0 - -// In debug mode, causes new to be defined to be WXDEBUG_NEW (see object.h). If -// this causes problems (e.g. link errors), set this to 0. You may need to set -// this to 0 if using templates (at least for VC++). This switch is currently -// ignored for MinGW/Cygwin. -// -// Default is 0 -// -// Recommended setting: 0 -#define wxUSE_DEBUG_NEW_ALWAYS 0 - - -// ---------------------------------------------------------------------------- -// Unicode support -// ---------------------------------------------------------------------------- - -// These settings are obsolete: the library is always built in Unicode mode -// now, only set wxUSE_UNICODE to 0 to compile legacy code in ANSI mode if -// absolutely necessary -- updating it is strongly recommended as the ANSI mode -// will disappear completely in future wxWidgets releases. -#ifndef wxUSE_UNICODE - #define wxUSE_UNICODE 1 -#endif - -// wxUSE_WCHAR_T is required by wxWidgets now, don't change. -#define wxUSE_WCHAR_T 1 - -// ---------------------------------------------------------------------------- -// global features -// ---------------------------------------------------------------------------- - -// Compile library in exception-safe mode? If set to 1, the library will try to -// behave correctly in presence of exceptions (even though it still will not -// use the exceptions itself) and notify the user code about any unhandled -// exceptions. If set to 0, propagation of the exceptions through the library -// code will lead to undefined behaviour -- but the code itself will be -// slightly smaller and faster. -// -// Note that like wxUSE_THREADS this option is automatically set to 0 if -// wxNO_EXCEPTIONS is defined. -// -// Default is 1 -// -// Recommended setting: depends on whether you intend to use C++ exceptions -// in your own code (1 if you do, 0 if you don't) -#define wxUSE_EXCEPTIONS 1 - -// Set wxUSE_EXTENDED_RTTI to 1 to use extended RTTI -// -// Default is 0 -// -// Recommended setting: 0 (this is still work in progress...) -#define wxUSE_EXTENDED_RTTI 0 - -// Support for message/error logging. This includes wxLogXXX() functions and -// wxLog and derived classes. Don't set this to 0 unless you really know what -// you are doing. -// -// Default is 1 -// -// Recommended setting: 1 (always) -#define wxUSE_LOG 1 - -// Recommended setting: 1 -#define wxUSE_LOGWINDOW 1 - -// Recommended setting: 1 -#define wxUSE_LOGGUI 1 - -// Recommended setting: 1 -#define wxUSE_LOG_DIALOG 1 - -// Support for command line parsing using wxCmdLineParser class. -// -// Default is 1 -// -// Recommended setting: 1 (can be set to 0 if you don't use the cmd line) -#define wxUSE_CMDLINE_PARSER 1 - -// Support for multithreaded applications: if 1, compile in thread classes -// (thread.h) and make the library a bit more thread safe. Although thread -// support is quite stable by now, you may still consider recompiling the -// library without it if you have no use for it - this will result in a -// somewhat smaller and faster operation. -// -// Notice that if wxNO_THREADS is defined, wxUSE_THREADS is automatically reset -// to 0 in wx/chkconf.h, so, for example, if you set USE_THREADS to 0 in -// build/msw/config.* file this value will have no effect. -// -// Default is 1 -// -// Recommended setting: 0 unless you do plan to develop MT applications -#define wxUSE_THREADS 1 - -// If enabled, compiles wxWidgets streams classes -// -// wx stream classes are used for image IO, process IO redirection, network -// protocols implementation and much more and so disabling this results in a -// lot of other functionality being lost. -// -// Default is 1 -// -// Recommended setting: 1 as setting it to 0 disables many other things -#define wxUSE_STREAMS 1 - -// Support for positional parameters (e.g. %1$d, %2$s ...) in wxVsnprintf. -// Note that if the system's implementation does not support positional -// parameters, setting this to 1 forces the use of the wxWidgets implementation -// of wxVsnprintf. The standard vsnprintf() supports positional parameters on -// many Unix systems but usually doesn't under Windows. -// -// Positional parameters are very useful when translating a program since using -// them in formatting strings allow translators to correctly reorder the -// translated sentences. -// -// Default is 1 -// -// Recommended setting: 1 if you want to support multiple languages -#define wxUSE_PRINTF_POS_PARAMS 1 - -// Enable the use of compiler-specific thread local storage keyword, if any. -// This is used for wxTLS_XXX() macros implementation and normally should use -// the compiler-provided support as it's simpler and more efficient, but is -// disabled under Windows in wx/msw/chkconf.h as it can't be used if wxWidgets -// is used in a dynamically loaded Win32 DLL (i.e. using LoadLibrary()) under -// XP as this triggers a bug in compiler TLS support that results in crashes -// when any TLS variables are used. -// -// If you're absolutely sure that your build of wxWidgets is never going to be -// used in such situation, either because it's not going to be linked from any -// kind of plugin or because you only target Vista or later systems, you can -// set this to 2 to force the use of compiler TLS even under MSW. -// -// Default is 1 meaning that compiler TLS is used only if it's 100% safe. -// -// Recommended setting: 2 if you want to have maximal performance and don't -// care about the scenario described above. -#define wxUSE_COMPILER_TLS 1 - -// ---------------------------------------------------------------------------- -// Interoperability with the standard library. -// ---------------------------------------------------------------------------- - -// Set wxUSE_STL to 1 to enable maximal interoperability with the standard -// library, even at the cost of backwards compatibility. -// -// Default is 0 -// -// Recommended setting: 0 as the options below already provide a relatively -// good level of interoperability and changing this option arguably isn't worth -// diverging from the official builds of the library. -#define wxUSE_STL 0 - -// This is not a real option but is used as the default value for -// wxUSE_STD_IOSTREAM, wxUSE_STD_STRING and wxUSE_STD_CONTAINERS_COMPATIBLY. -// -// Set it to 0 if you want to disable the use of all standard classes -// completely for some reason. -#define wxUSE_STD_DEFAULT 1 - -// Use standard C++ containers where it can be done without breaking backwards -// compatibility. -// -// This provides better interoperability with the standard library, e.g. with -// this option on it's possible to insert std::vector<> into many wxWidgets -// containers directly. -// -// Default is 1. -// -// Recommended setting is 1 unless you want to avoid all dependencies on the -// standard library. -#define wxUSE_STD_CONTAINERS_COMPATIBLY wxUSE_STD_DEFAULT - -// Use standard C++ containers to implement wxVector<>, wxStack<>, wxDList<> -// and wxHashXXX<> classes. If disabled, wxWidgets own (mostly compatible but -// usually more limited) implementations are used which allows to avoid the -// dependency on the C++ run-time library. -// -// Default is 0 for compatibility reasons. -// -// Recommended setting: 1 unless compatibility with the official wxWidgets -// build and/or the existing code is a concern. -#define wxUSE_STD_CONTAINERS 0 - -// Use standard C++ streams if 1 instead of wx streams in some places. If -// disabled, wx streams are used everywhere and wxWidgets doesn't depend on the -// standard streams library. -// -// Notice that enabling this does not replace wx streams with std streams -// everywhere, in a lot of places wx streams are used no matter what. -// -// Default is 1 if compiler supports it. -// -// Recommended setting: 1 if you use the standard streams anyhow and so -// dependency on the standard streams library is not a -// problem -#define wxUSE_STD_IOSTREAM wxUSE_STD_DEFAULT - -// Enable minimal interoperability with the standard C++ string class if 1. -// "Minimal" means that wxString can be constructed from std::string or -// std::wstring but can't be implicitly converted to them. You need to enable -// the option below for the latter. -// -// Default is 1 for most compilers. -// -// Recommended setting: 1 unless you want to ensure your program doesn't use -// the standard C++ library at all. -#define wxUSE_STD_STRING wxUSE_STD_DEFAULT - -// Make wxString as much interchangeable with std::[w]string as possible, in -// particular allow implicit conversion of wxString to either of these classes. -// This comes at a price (or a benefit, depending on your point of view) of not -// allowing implicit conversion to "const char *" and "const wchar_t *". -// -// Because a lot of existing code relies on these conversions, this option is -// disabled by default but can be enabled for your build if you don't care -// about compatibility. -// -// Default is 0 if wxUSE_STL has its default value or 1 if it is enabled. -// -// Recommended setting: 0 to remain compatible with the official builds of -// wxWidgets. -#define wxUSE_STD_STRING_CONV_IN_WXSTRING wxUSE_STL - -// VC++ 4.2 and above allows and but you can't mix -// them. Set this option to 1 to use , 0 to use . -// -// Note that newer compilers (including VC++ 7.1 and later) don't support -// wxUSE_IOSTREAMH == 1 and so will be used anyhow. -// -// Default is 0. -// -// Recommended setting: 0, only set to 1 if you use a really old compiler -#define wxUSE_IOSTREAMH 0 - - -// ---------------------------------------------------------------------------- -// non GUI features selection -// ---------------------------------------------------------------------------- - -// Set wxUSE_LONGLONG to 1 to compile the wxLongLong class. This is a 64 bit -// integer which is implemented in terms of native 64 bit integers if any or -// uses emulation otherwise. -// -// This class is required by wxDateTime and so you should enable it if you want -// to use wxDateTime. For most modern platforms, it will use the native 64 bit -// integers in which case (almost) all of its functions are inline and it -// almost does not take any space, so there should be no reason to switch it -// off. -// -// Recommended setting: 1 -#define wxUSE_LONGLONG 1 - -// Set wxUSE_BASE64 to 1, to compile in Base64 support. This is required for -// storing binary data in wxConfig on most platforms. -// -// Default is 1. -// -// Recommended setting: 1 (but can be safely disabled if you don't use it) -#define wxUSE_BASE64 1 - -// Set this to 1 to be able to use wxEventLoop even in console applications -// (i.e. using base library only, without GUI). This is mostly useful for -// processing socket events but is also necessary to use timers in console -// applications -// -// Default is 1. -// -// Recommended setting: 1 (but can be safely disabled if you don't use it) -#define wxUSE_CONSOLE_EVENTLOOP 1 - -// Set wxUSE_(F)FILE to 1 to compile wx(F)File classes. wxFile uses low level -// POSIX functions for file access, wxFFile uses ANSI C stdio.h functions. -// -// Default is 1 -// -// Recommended setting: 1 (wxFile is highly recommended as it is required by -// i18n code, wxFileConfig and others) -#define wxUSE_FILE 1 -#define wxUSE_FFILE 1 - -// Use wxFSVolume class providing access to the configured/active mount points -// -// Default is 1 -// -// Recommended setting: 1 (but may be safely disabled if you don't use it) -#define wxUSE_FSVOLUME 1 - -// Use wxStandardPaths class which allows to retrieve some standard locations -// in the file system -// -// Default is 1 -// -// Recommended setting: 1 (may be disabled to save space, but not much) -#define wxUSE_STDPATHS 1 - -// use wxTextBuffer class: required by wxTextFile -#define wxUSE_TEXTBUFFER 1 - -// use wxTextFile class: requires wxFile and wxTextBuffer, required by -// wxFileConfig -#define wxUSE_TEXTFILE 1 - -// i18n support: _() macro, wxLocale class. Requires wxTextFile. -#define wxUSE_INTL 1 - -// Provide wxFoo_l() functions similar to standard foo() functions but taking -// an extra locale parameter. -// -// Notice that this is fully implemented only for the systems providing POSIX -// xlocale support or Microsoft Visual C++ >= 8 (which provides proprietary -// almost-equivalent of xlocale functions), otherwise wxFoo_l() functions will -// only work for the current user locale and "C" locale. You can use -// wxHAS_XLOCALE_SUPPORT to test whether the full support is available. -// -// Default is 1 -// -// Recommended setting: 1 but may be disabled if you are writing programs -// running only in C locale anyhow -#define wxUSE_XLOCALE 1 - -// Set wxUSE_DATETIME to 1 to compile the wxDateTime and related classes which -// allow to manipulate dates, times and time intervals. -// -// Requires: wxUSE_LONGLONG -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_DATETIME 1 - -// Set wxUSE_TIMER to 1 to compile wxTimer class -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_TIMER 1 - -// Use wxStopWatch clas. -// -// Default is 1 -// -// Recommended setting: 1 (needed by wxSocket) -#define wxUSE_STOPWATCH 1 - -// Set wxUSE_FSWATCHER to 1 if you want to enable wxFileSystemWatcher -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_FSWATCHER 1 - -// Setting wxUSE_CONFIG to 1 enables the use of wxConfig and related classes -// which allow the application to store its settings in the persistent -// storage. Setting this to 1 will also enable on-demand creation of the -// global config object in wxApp. -// -// See also wxUSE_CONFIG_NATIVE below. -// -// Recommended setting: 1 -#define wxUSE_CONFIG 1 - -// If wxUSE_CONFIG is 1, you may choose to use either the native config -// classes under Windows (using .INI files under Win16 and the registry under -// Win32) or the portable text file format used by the config classes under -// Unix. -// -// Default is 1 to use native classes. Note that you may still use -// wxFileConfig even if you set this to 1 - just the config object created by -// default for the applications needs will be a wxRegConfig or wxIniConfig and -// not wxFileConfig. -// -// Recommended setting: 1 -#define wxUSE_CONFIG_NATIVE 1 - -// If wxUSE_DIALUP_MANAGER is 1, compile in wxDialUpManager class which allows -// to connect/disconnect from the network and be notified whenever the dial-up -// network connection is established/terminated. Requires wxUSE_DYNAMIC_LOADER. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_DIALUP_MANAGER 1 - -// Compile in classes for run-time DLL loading and function calling. -// Required by wxUSE_DIALUP_MANAGER. -// -// This setting is for Win32 only -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_DYNLIB_CLASS 1 - -// experimental, don't use for now -#define wxUSE_DYNAMIC_LOADER 1 - -// Set to 1 to use socket classes -#define wxUSE_SOCKETS 1 - -// Set to 1 to use ipv6 socket classes (requires wxUSE_SOCKETS) -// -// Notice that currently setting this option under Windows will result in -// programs which can only run on recent OS versions (with ws2_32.dll -// installed) which is why it is disabled by default. -// -// Default is 1. -// -// Recommended setting: 1 if you need IPv6 support -#define wxUSE_IPV6 0 - -// Set to 1 to enable virtual file systems (required by wxHTML) -#define wxUSE_FILESYSTEM 1 - -// Set to 1 to enable virtual ZIP filesystem (requires wxUSE_FILESYSTEM) -#define wxUSE_FS_ZIP 1 - -// Set to 1 to enable virtual archive filesystem (requires wxUSE_FILESYSTEM) -#define wxUSE_FS_ARCHIVE 1 - -// Set to 1 to enable virtual Internet filesystem (requires wxUSE_FILESYSTEM) -#define wxUSE_FS_INET 1 - -// wxArchive classes for accessing archives such as zip and tar -#define wxUSE_ARCHIVE_STREAMS 1 - -// Set to 1 to compile wxZipInput/OutputStream classes. -#define wxUSE_ZIPSTREAM 1 - -// Set to 1 to compile wxTarInput/OutputStream classes. -#define wxUSE_TARSTREAM 1 - -// Set to 1 to compile wxZlibInput/OutputStream classes. Also required by -// wxUSE_LIBPNG -#define wxUSE_ZLIB 1 - -// If enabled, the code written by Apple will be used to write, in a portable -// way, float on the disk. See extended.c for the license which is different -// from wxWidgets one. -// -// Default is 1. -// -// Recommended setting: 1 unless you don't like the license terms (unlikely) -#define wxUSE_APPLE_IEEE 1 - -// Joystick support class -#define wxUSE_JOYSTICK 1 - -// wxFontEnumerator class -#define wxUSE_FONTENUM 1 - -// wxFontMapper class -#define wxUSE_FONTMAP 1 - -// wxMimeTypesManager class -#define wxUSE_MIMETYPE 1 - -// wxProtocol and related classes: if you want to use either of wxFTP, wxHTTP -// or wxURL you need to set this to 1. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_PROTOCOL 1 - -// The settings for the individual URL schemes -#define wxUSE_PROTOCOL_FILE 1 -#define wxUSE_PROTOCOL_FTP 1 -#define wxUSE_PROTOCOL_HTTP 1 - -// Define this to use wxURL class. -#define wxUSE_URL 1 - -// Define this to use native platform url and protocol support. -// Currently valid only for MS-Windows. -// Note: if you set this to 1, you can open ftp/http/gopher sites -// and obtain a valid input stream for these sites -// even when you set wxUSE_PROTOCOL_FTP/HTTP to 0. -// Doing so reduces the code size. -// -// This code is experimental and subject to change. -#define wxUSE_URL_NATIVE 0 - -// Support for wxVariant class used in several places throughout the library, -// notably in wxDataViewCtrl API. -// -// Default is 1. -// -// Recommended setting: 1 unless you want to reduce the library size as much as -// possible in which case setting this to 0 can gain up to 100KB. -#define wxUSE_VARIANT 1 - -// Support for wxAny class, the successor for wxVariant. -// -// Default is 1. -// -// Recommended setting: 1 unless you want to reduce the library size by a small amount, -// or your compiler cannot for some reason cope with complexity of templates used. -#define wxUSE_ANY 1 - -// Support for regular expression matching via wxRegEx class: enable this to -// use POSIX regular expressions in your code. You need to compile regex -// library from src/regex to use it under Windows. -// -// Default is 0 -// -// Recommended setting: 1 if your compiler supports it, if it doesn't please -// contribute us a makefile for src/regex for it -#define wxUSE_REGEX 1 - -// wxSystemOptions class -#define wxUSE_SYSTEM_OPTIONS 1 - -// wxSound class -#define wxUSE_SOUND 1 - -// Use wxMediaCtrl -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_MEDIACTRL 1 - -// Use wxWidget's XRC XML-based resource system. Recommended. -// -// Default is 1 -// -// Recommended setting: 1 (requires wxUSE_XML) -#define wxUSE_XRC 1 - -// XML parsing classes. Note that their API will change in the future, so -// using wxXmlDocument and wxXmlNode in your app is not recommended. -// -// Default is the same as wxUSE_XRC, i.e. 1 by default. -// -// Recommended setting: 1 (required by XRC) -#define wxUSE_XML wxUSE_XRC - -// Use wxWidget's AUI docking system -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_AUI 1 - -// Use wxWidget's Ribbon classes for interfaces -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_RIBBON 1 - -// Use wxPropertyGrid. -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_PROPGRID 1 - -// Use wxStyledTextCtrl, a wxWidgets implementation of Scintilla. -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_STC 1 - -// Use wxWidget's web viewing classes -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_WEBVIEW 1 - -// Use the IE wxWebView backend -// -// Default is 1 on MSW -// -// Recommended setting: 1 -#ifdef __WXMSW__ -#define wxUSE_WEBVIEW_IE 1 -#else -#define wxUSE_WEBVIEW_IE 0 -#endif - -// Use the WebKit wxWebView backend -// -// Default is 1 on GTK and OSX -// -// Recommended setting: 1 -#if defined(__WXGTK__) || defined(__WXOSX__) -#define wxUSE_WEBVIEW_WEBKIT 1 -#else -#define wxUSE_WEBVIEW_WEBKIT 0 -#endif - -// Enable wxGraphicsContext and related classes for a modern 2D drawing API. -// -// Default is 1 except if you're using a non-Microsoft compiler under Windows -// as only MSVC is known to ship with at least gdiplus.h which is required to -// compile GDI+-based implementation of wxGraphicsContext (MSVC10 and later -// versions also include d2d1.h required for Direct2D-based implementation). -// For other compilers (e.g. mingw32) you may need to install the headers (and -// just the headers) yourself. If you do, change the setting below manually. -// -// Recommended setting: 1 if supported by the compilation environment - -// notice that we can't use wxCHECK_VISUALC_VERSION() here as this file is -// included from wx/platform.h before wxCHECK_VISUALC_VERSION() is defined -#ifdef _MSC_VER -# define wxUSE_GRAPHICS_CONTEXT 1 -#else - // Disable support for other Windows compilers, enable it if your compiler - // comes with new enough SDK or you installed the headers manually. - // - // Notice that this will be set by configure under non-Windows platforms - // anyhow so the value there is not important. -# define wxUSE_GRAPHICS_CONTEXT 0 -#endif - -// Enable wxGraphicsContext implementation using Cairo library. -// -// This is not needed under Windows and detected automatically by configure -// under other systems, however you may set this to 1 manually if you installed -// Cairo under Windows yourself and prefer to use it instead the native GDI+ -// implementation. -// -// Default is 0 -// -// Recommended setting: 0 -#define wxUSE_CAIRO 0 - - -// ---------------------------------------------------------------------------- -// Individual GUI controls -// ---------------------------------------------------------------------------- - -// You must set wxUSE_CONTROLS to 1 if you are using any controls at all -// (without it, wxControl class is not compiled) -// -// Default is 1 -// -// Recommended setting: 1 (don't change except for very special programs) -#define wxUSE_CONTROLS 1 - -// Support markup in control labels, i.e. provide wxControl::SetLabelMarkup(). -// Currently markup is supported only by a few controls and only some ports but -// their number will increase with time. -// -// Default is 1 -// -// Recommended setting: 1 (may be set to 0 if you want to save on code size) -#define wxUSE_MARKUP 1 - -// wxPopupWindow class is a top level transient window. It is currently used -// to implement wxTipWindow -// -// Default is 1 -// -// Recommended setting: 1 (may be set to 0 if you don't wxUSE_TIPWINDOW) -#define wxUSE_POPUPWIN 1 - -// wxTipWindow allows to implement the custom tooltips, it is used by the -// context help classes. Requires wxUSE_POPUPWIN. -// -// Default is 1 -// -// Recommended setting: 1 (may be set to 0) -#define wxUSE_TIPWINDOW 1 - -// Each of the settings below corresponds to one wxWidgets control. They are -// all switched on by default but may be disabled if you are sure that your -// program (including any standard dialogs it can show!) doesn't need them and -// if you desperately want to save some space. If you use any of these you must -// set wxUSE_CONTROLS as well. -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_ACTIVITYINDICATOR 1 // wxActivityIndicator -#define wxUSE_ANIMATIONCTRL 1 // wxAnimationCtrl -#define wxUSE_BANNERWINDOW 1 // wxBannerWindow -#define wxUSE_BUTTON 1 // wxButton -#define wxUSE_BMPBUTTON 1 // wxBitmapButton -#define wxUSE_CALENDARCTRL 1 // wxCalendarCtrl -#define wxUSE_CHECKBOX 1 // wxCheckBox -#define wxUSE_CHECKLISTBOX 1 // wxCheckListBox (requires wxUSE_OWNER_DRAWN) -#define wxUSE_CHOICE 1 // wxChoice -#define wxUSE_COLLPANE 1 // wxCollapsiblePane -#define wxUSE_COLOURPICKERCTRL 1 // wxColourPickerCtrl -#define wxUSE_COMBOBOX 1 // wxComboBox -#define wxUSE_COMMANDLINKBUTTON 1 // wxCommandLinkButton -#define wxUSE_DATAVIEWCTRL 1 // wxDataViewCtrl -#define wxUSE_DATEPICKCTRL 1 // wxDatePickerCtrl -#define wxUSE_DIRPICKERCTRL 1 // wxDirPickerCtrl -#define wxUSE_EDITABLELISTBOX 1 // wxEditableListBox -#define wxUSE_FILECTRL 1 // wxFileCtrl -#define wxUSE_FILEPICKERCTRL 1 // wxFilePickerCtrl -#define wxUSE_FONTPICKERCTRL 1 // wxFontPickerCtrl -#define wxUSE_GAUGE 1 // wxGauge -#define wxUSE_HEADERCTRL 1 // wxHeaderCtrl -#define wxUSE_HYPERLINKCTRL 1 // wxHyperlinkCtrl -#define wxUSE_LISTBOX 1 // wxListBox -#define wxUSE_LISTCTRL 1 // wxListCtrl -#define wxUSE_RADIOBOX 1 // wxRadioBox -#define wxUSE_RADIOBTN 1 // wxRadioButton -#define wxUSE_RICHMSGDLG 1 // wxRichMessageDialog -#define wxUSE_SCROLLBAR 1 // wxScrollBar -#define wxUSE_SEARCHCTRL 1 // wxSearchCtrl -#define wxUSE_SLIDER 1 // wxSlider -#define wxUSE_SPINBTN 1 // wxSpinButton -#define wxUSE_SPINCTRL 1 // wxSpinCtrl -#define wxUSE_STATBOX 1 // wxStaticBox -#define wxUSE_STATLINE 1 // wxStaticLine -#define wxUSE_STATTEXT 1 // wxStaticText -#define wxUSE_STATBMP 1 // wxStaticBitmap -#define wxUSE_TEXTCTRL 1 // wxTextCtrl -#define wxUSE_TIMEPICKCTRL 1 // wxTimePickerCtrl -#define wxUSE_TOGGLEBTN 1 // requires wxButton -#define wxUSE_TREECTRL 1 // wxTreeCtrl -#define wxUSE_TREELISTCTRL 1 // wxTreeListCtrl - -// Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR -// below either wxStatusBar95 or a generic wxStatusBar will be used. -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_STATUSBAR 1 - -// Two status bar implementations are available under Win32: the generic one -// or the wrapper around native control. For native look and feel the native -// version should be used. -// -// Default is 1 for the platforms where native status bar is supported. -// -// Recommended setting: 1 (there is no advantage in using the generic one) -#define wxUSE_NATIVE_STATUSBAR 1 - -// wxToolBar related settings: if wxUSE_TOOLBAR is 0, don't compile any toolbar -// classes at all. Otherwise, use the native toolbar class unless -// wxUSE_TOOLBAR_NATIVE is 0. -// -// Default is 1 for all settings. -// -// Recommended setting: 1 for wxUSE_TOOLBAR and wxUSE_TOOLBAR_NATIVE. -#define wxUSE_TOOLBAR 1 -#define wxUSE_TOOLBAR_NATIVE 1 - -// wxNotebook is a control with several "tabs" located on one of its sides. It -// may be used to logically organise the data presented to the user instead of -// putting everything in one huge dialog. It replaces wxTabControl and related -// classes of wxWin 1.6x. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_NOTEBOOK 1 - -// wxListbook control is similar to wxNotebook but uses wxListCtrl instead of -// the tabs -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_LISTBOOK 1 - -// wxChoicebook control is similar to wxNotebook but uses wxChoice instead of -// the tabs -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_CHOICEBOOK 1 - -// wxTreebook control is similar to wxNotebook but uses wxTreeCtrl instead of -// the tabs -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_TREEBOOK 1 - -// wxToolbook control is similar to wxNotebook but uses wxToolBar instead of -// tabs -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_TOOLBOOK 1 - -// wxTaskBarIcon is a small notification icon shown in the system toolbar or -// dock. -// -// Default is 1. -// -// Recommended setting: 1 (but can be set to 0 if you don't need it) -#define wxUSE_TASKBARICON 1 - -// wxGrid class -// -// Default is 1, set to 0 to cut down compilation time and binaries size if you -// don't use it. -// -// Recommended setting: 1 -// -#define wxUSE_GRID 1 - -// wxMiniFrame class: a frame with narrow title bar -// -// Default is 1. -// -// Recommended setting: 1 (it doesn't cost almost anything) -#define wxUSE_MINIFRAME 1 - -// wxComboCtrl and related classes: combobox with custom popup window and -// not necessarily a listbox. -// -// Default is 1. -// -// Recommended setting: 1 but can be safely set to 0 except for wxUniv where it -// it used by wxComboBox -#define wxUSE_COMBOCTRL 1 - -// wxOwnerDrawnComboBox is a custom combobox allowing to paint the combobox -// items. -// -// Default is 1. -// -// Recommended setting: 1 but can be safely set to 0, except where it is -// needed as a base class for generic wxBitmapComboBox. -#define wxUSE_ODCOMBOBOX 1 - -// wxBitmapComboBox is a combobox that can have images in front of text items. -// -// Default is 1. -// -// Recommended setting: 1 but can be safely set to 0 -#define wxUSE_BITMAPCOMBOBOX 1 - -// wxRearrangeCtrl is a wxCheckListBox with two buttons allowing to move items -// up and down in it. It is also used as part of wxRearrangeDialog. -// -// Default is 1. -// -// Recommended setting: 1 but can be safely set to 0 (currently used only by -// wxHeaderCtrl) -#define wxUSE_REARRANGECTRL 1 - -// wxAddRemoveCtrl is a composite control containing a control showing some -// items (e.g. wxListBox, wxListCtrl, wxTreeCtrl, wxDataViewCtrl, ...) and "+"/ -// "-" buttons allowing to add and remove items to/from the control. -// -// Default is 1. -// -// Recommended setting: 1 but can be safely set to 0 if you don't need it (not -// used by the library itself). -#define wxUSE_ADDREMOVECTRL 1 - -// ---------------------------------------------------------------------------- -// Miscellaneous GUI stuff -// ---------------------------------------------------------------------------- - -// wxAcceleratorTable/Entry classes and support for them in wxMenu(Bar) -#define wxUSE_ACCEL 1 - -// Use the standard art provider. The icons returned by this provider are -// embedded into the library as XPMs so disabling it reduces the library size -// somewhat but this should only be done if you use your own custom art -// provider returning the icons or never use any icons not provided by the -// native art provider (which might not be implemented at all for some -// platforms) or by the Tango icons provider (if it's not itself disabled -// below). -// -// Default is 1. -// -// Recommended setting: 1 unless you use your own custom art provider. -#define wxUSE_ARTPROVIDER_STD 1 - -// Use art provider providing Tango icons: this art provider has higher quality -// icons than the default ones using smaller size XPM icons without -// transparency but the embedded PNG icons add to the library size. -// -// Default is 1 under non-GTK ports. Under wxGTK the native art provider using -// the GTK+ stock icons replaces it so it is normally not necessary. -// -// Recommended setting: 1 but can be turned off to reduce the library size. -#define wxUSE_ARTPROVIDER_TANGO 1 - -// Hotkey support (currently Windows only) -#define wxUSE_HOTKEY 1 - -// Use wxCaret: a class implementing a "cursor" in a text control (called caret -// under Windows). -// -// Default is 1. -// -// Recommended setting: 1 (can be safely set to 0, not used by the library) -#define wxUSE_CARET 1 - -// Use wxDisplay class: it allows enumerating all displays on a system and -// their geometries as well as finding the display on which the given point or -// window lies. -// -// Default is 1. -// -// Recommended setting: 1 if you need it, can be safely set to 0 otherwise -#define wxUSE_DISPLAY 1 - -// Miscellaneous geometry code: needed for Canvas library -#define wxUSE_GEOMETRY 1 - -// Use wxImageList. This class is needed by wxNotebook, wxTreeCtrl and -// wxListCtrl. -// -// Default is 1. -// -// Recommended setting: 1 (set it to 0 if you don't use any of the controls -// enumerated above, then this class is mostly useless too) -#define wxUSE_IMAGLIST 1 - -// Use wxInfoBar class. -// -// Default is 1. -// -// Recommended setting: 1 (but can be disabled without problems as nothing -// depends on it) -#define wxUSE_INFOBAR 1 - -// Use wxMenu, wxMenuBar, wxMenuItem. -// -// Default is 1. -// -// Recommended setting: 1 (can't be disabled under MSW) -#define wxUSE_MENUS 1 - -// Use wxNotificationMessage. -// -// wxNotificationMessage allows to show non-intrusive messages to the user -// using balloons, banners, popups or whatever is the appropriate method for -// the current platform. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_NOTIFICATION_MESSAGE 1 - -// wxPreferencesEditor provides a common API for different ways of presenting -// the standard "Preferences" or "Properties" dialog under different platforms -// (e.g. some use modal dialogs, some use modeless ones; some apply the changes -// immediately while others require an explicit "Apply" button). -// -// Default is 1. -// -// Recommended setting: 1 (but can be safely disabled if you don't use it) -#define wxUSE_PREFERENCES_EDITOR 1 - -// wxRichToolTip is a customizable tooltip class which has more functionality -// than the stock (but native, unlike this class) wxToolTip. -// -// Default is 1. -// -// Recommended setting: 1 (but can be safely set to 0 if you don't need it) -#define wxUSE_RICHTOOLTIP 1 - -// Use wxSashWindow class. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_SASH 1 - -// Use wxSplitterWindow class. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_SPLITTER 1 - -// Use wxToolTip and wxWindow::Set/GetToolTip() methods. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_TOOLTIPS 1 - -// wxValidator class and related methods -#define wxUSE_VALIDATORS 1 - -// Use reference counted ID management: this means that wxWidgets will track -// the automatically allocated ids (those used when you use wxID_ANY when -// creating a window, menu or toolbar item &c) instead of just supposing that -// the program never runs out of them. This is mostly useful only under wxMSW -// where the total ids range is limited to SHRT_MIN..SHRT_MAX and where -// long-running programs can run into problems with ids reuse without this. On -// the other platforms, where the ids have the full int range, this shouldn't -// be necessary. -#ifdef __WXMSW__ -#define wxUSE_AUTOID_MANAGEMENT 1 -#else -#define wxUSE_AUTOID_MANAGEMENT 0 -#endif - -// ---------------------------------------------------------------------------- -// common dialogs -// ---------------------------------------------------------------------------- - -// On rare occasions (e.g. using DJGPP) may want to omit common dialogs (e.g. -// file selector, printer dialog). Switching this off also switches off the -// printing architecture and interactive wxPrinterDC. -// -// Default is 1 -// -// Recommended setting: 1 (unless it really doesn't work) -#define wxUSE_COMMON_DIALOGS 1 - -// wxBusyInfo displays window with message when app is busy. Works in same way -// as wxBusyCursor -#define wxUSE_BUSYINFO 1 - -// Use single/multiple choice dialogs. -// -// Default is 1 -// -// Recommended setting: 1 (used in the library itself) -#define wxUSE_CHOICEDLG 1 - -// Use colour picker dialog -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_COLOURDLG 1 - -// wxDirDlg class for getting a directory name from user -#define wxUSE_DIRDLG 1 - -// TODO: setting to choose the generic or native one - -// Use file open/save dialogs. -// -// Default is 1 -// -// Recommended setting: 1 (used in many places in the library itself) -#define wxUSE_FILEDLG 1 - -// Use find/replace dialogs. -// -// Default is 1 -// -// Recommended setting: 1 (but may be safely set to 0) -#define wxUSE_FINDREPLDLG 1 - -// Use font picker dialog -// -// Default is 1 -// -// Recommended setting: 1 (used in the library itself) -#define wxUSE_FONTDLG 1 - -// Use wxMessageDialog and wxMessageBox. -// -// Default is 1 -// -// Recommended setting: 1 (used in the library itself) -#define wxUSE_MSGDLG 1 - -// progress dialog class for lengthy operations -#define wxUSE_PROGRESSDLG 1 - -// Set to 0 to disable the use of the native progress dialog (currently only -// available under MSW and suffering from some bugs there, hence this option). -#define wxUSE_NATIVE_PROGRESSDLG 1 - -// support for startup tips (wxShowTip &c) -#define wxUSE_STARTUP_TIPS 1 - -// text entry dialog and wxGetTextFromUser function -#define wxUSE_TEXTDLG 1 - -// number entry dialog -#define wxUSE_NUMBERDLG 1 - -// splash screen class -#define wxUSE_SPLASH 1 - -// wizards -#define wxUSE_WIZARDDLG 1 - -// Compile in wxAboutBox() function showing the standard "About" dialog. -// -// Default is 1 -// -// Recommended setting: 1 but can be set to 0 to save some space if you don't -// use this function -#define wxUSE_ABOUTDLG 1 - -// wxFileHistory class -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_FILE_HISTORY 1 - -// ---------------------------------------------------------------------------- -// Metafiles support -// ---------------------------------------------------------------------------- - -// Windows supports the graphics format known as metafile which is, though not -// portable, is widely used under Windows and so is supported by wxWin (under -// Windows only, of course). Win16 (Win3.1) used the so-called "Window -// MetaFiles" or WMFs which were replaced with "Enhanced MetaFiles" or EMFs in -// Win32 (Win9x, NT, 2000). Both of these are supported in wxWin and, by -// default, WMFs will be used under Win16 and EMFs under Win32. This may be -// changed by setting wxUSE_WIN_METAFILES_ALWAYS to 1 and/or setting -// wxUSE_ENH_METAFILE to 0. You may also set wxUSE_METAFILE to 0 to not compile -// in any metafile related classes at all. -// -// Default is 1 for wxUSE_ENH_METAFILE and 0 for wxUSE_WIN_METAFILES_ALWAYS. -// -// Recommended setting: default or 0 for everything for portable programs. -#define wxUSE_METAFILE 1 -#define wxUSE_ENH_METAFILE 1 -#define wxUSE_WIN_METAFILES_ALWAYS 0 - -// ---------------------------------------------------------------------------- -// Big GUI components -// ---------------------------------------------------------------------------- - -// Set to 0 to disable MDI support. -// -// Requires wxUSE_NOTEBOOK under platforms other than MSW. -// -// Default is 1. -// -// Recommended setting: 1, can be safely set to 0. -#define wxUSE_MDI 1 - -// Set to 0 to disable document/view architecture -#define wxUSE_DOC_VIEW_ARCHITECTURE 1 - -// Set to 0 to disable MDI document/view architecture -// -// Requires wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE -#define wxUSE_MDI_ARCHITECTURE 1 - -// Set to 0 to disable print/preview architecture code -#define wxUSE_PRINTING_ARCHITECTURE 1 - -// wxHTML sublibrary allows to display HTML in wxWindow programs and much, -// much more. -// -// Default is 1. -// -// Recommended setting: 1 (wxHTML is great!), set to 0 if you want compile a -// smaller library. -#define wxUSE_HTML 1 - -// Setting wxUSE_GLCANVAS to 1 enables OpenGL support. You need to have OpenGL -// headers and libraries to be able to compile the library with wxUSE_GLCANVAS -// set to 1 and, under Windows, also to add opengl32.lib and glu32.lib to the -// list of libraries used to link your application (although this is done -// implicitly for Microsoft Visual C++ users). -// -// Default is 1. -// -// Recommended setting: 1 if you intend to use OpenGL, can be safely set to 0 -// otherwise. -#define wxUSE_GLCANVAS 1 - -// wxRichTextCtrl allows editing of styled text. -// -// Default is 1. -// -// Recommended setting: 1, set to 0 if you want compile a -// smaller library. -#define wxUSE_RICHTEXT 1 - -// ---------------------------------------------------------------------------- -// Data transfer -// ---------------------------------------------------------------------------- - -// Use wxClipboard class for clipboard copy/paste. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_CLIPBOARD 1 - -// Use wxDataObject and related classes. Needed for clipboard and OLE drag and -// drop -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_DATAOBJ 1 - -// Use wxDropTarget and wxDropSource classes for drag and drop (this is -// different from "built in" drag and drop in wxTreeCtrl which is always -// available). Requires wxUSE_DATAOBJ. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_DRAG_AND_DROP 1 - -// Use wxAccessible for enhanced and customisable accessibility. -// Depends on wxUSE_OLE. -// -// Default is 0. -// -// Recommended setting (at present): 0 -#define wxUSE_ACCESSIBILITY 0 - -// ---------------------------------------------------------------------------- -// miscellaneous settings -// ---------------------------------------------------------------------------- - -// wxSingleInstanceChecker class allows to verify at startup if another program -// instance is running. -// -// Default is 1 -// -// Recommended setting: 1 (the class is tiny, disabling it won't save much -// space) -#define wxUSE_SNGLINST_CHECKER 1 - -#define wxUSE_DRAGIMAGE 1 - -#define wxUSE_IPC 1 - // 0 for no interprocess comms -#define wxUSE_HELP 1 - // 0 for no help facility - -// Should we use MS HTML help for wxHelpController? If disabled, neither -// wxCHMHelpController nor wxBestHelpController are available. -// -// Default is 1 under MSW, 0 is always used for the other platforms. -// -// Recommended setting: 1, only set to 0 if you have trouble compiling -// wxCHMHelpController (could be a problem with really ancient compilers) -#define wxUSE_MS_HTML_HELP 1 - - -// Use wxHTML-based help controller? -#define wxUSE_WXHTML_HELP 1 - -#define wxUSE_CONSTRAINTS 1 - // 0 for no window layout constraint system - -#define wxUSE_SPLINES 1 - // 0 for no splines - -#define wxUSE_MOUSEWHEEL 1 - // Include mouse wheel support - -// Compile wxUIActionSimulator class? -#define wxUSE_UIACTIONSIMULATOR 1 - -// ---------------------------------------------------------------------------- -// wxDC classes for various output formats -// ---------------------------------------------------------------------------- - -// Set to 1 for PostScript device context. -#define wxUSE_POSTSCRIPT 0 - -// Set to 1 to use font metric files in GetTextExtent -#define wxUSE_AFM_FOR_POSTSCRIPT 1 - -// Set to 1 to compile in support for wxSVGFileDC, a wxDC subclass which allows -// to create files in SVG (Scalable Vector Graphics) format. -#define wxUSE_SVG 1 - -// Should wxDC provide SetTransformMatrix() and related methods? -// -// Default is 1 but can be set to 0 if this functionality is not used. Notice -// that currently only wxMSW supports this so setting this to 0 doesn't change -// much for non-MSW platforms (although it will still save a few bytes -// probably). -// -// Recommended setting: 1. -#define wxUSE_DC_TRANSFORM_MATRIX 1 - -// ---------------------------------------------------------------------------- -// image format support -// ---------------------------------------------------------------------------- - -// wxImage supports many different image formats which can be configured at -// compile-time. BMP is always supported, others are optional and can be safely -// disabled if you don't plan to use images in such format sometimes saving -// substantial amount of code in the final library. -// -// Some formats require an extra library which is included in wxWin sources -// which is mentioned if it is the case. - -// Set to 1 for wxImage support (recommended). -#define wxUSE_IMAGE 1 - -// Set to 1 for PNG format support (requires libpng). Also requires wxUSE_ZLIB. -#define wxUSE_LIBPNG 1 - -// Set to 1 for JPEG format support (requires libjpeg) -#define wxUSE_LIBJPEG 1 - -// Set to 1 for TIFF format support (requires libtiff) -#define wxUSE_LIBTIFF 1 - -// Set to 1 for TGA format support (loading only) -#define wxUSE_TGA 1 - -// Set to 1 for GIF format support -#define wxUSE_GIF 1 - -// Set to 1 for PNM format support -#define wxUSE_PNM 1 - -// Set to 1 for PCX format support -#define wxUSE_PCX 1 - -// Set to 1 for IFF format support (Amiga format) -#define wxUSE_IFF 0 - -// Set to 1 for XPM format support -#define wxUSE_XPM 1 - -// Set to 1 for MS Icons and Cursors format support -#define wxUSE_ICO_CUR 1 - -// Set to 1 to compile in wxPalette class -#define wxUSE_PALETTE 1 - -// ---------------------------------------------------------------------------- -// wxUniversal-only options -// ---------------------------------------------------------------------------- - -// Set to 1 to enable compilation of all themes, this is the default -#define wxUSE_ALL_THEMES 1 - -// Set to 1 to enable the compilation of individual theme if wxUSE_ALL_THEMES -// is unset, if it is set these options are not used; notice that metal theme -// uses Win32 one -#define wxUSE_THEME_GTK 0 -#define wxUSE_THEME_METAL 0 -#define wxUSE_THEME_MONO 0 -#define wxUSE_THEME_WIN32 0 - - -/* --- end common options --- */ - -// ---------------------------------------------------------------------------- -// Unix-specific options settings -// ---------------------------------------------------------------------------- - -// use wxSelectDispatcher class -#define wxUSE_SELECT_DISPATCHER 1 - -// use wxEpollDispatcher class (Linux only) -#define wxUSE_EPOLL_DISPATCHER 0 - -/* - Use GStreamer for Unix. - - Default is 0 as this requires a lot of dependencies which might not be - available. - - Recommended setting: 1 (wxMediaCtrl won't work by default without it). - */ -#define wxUSE_GSTREAMER 0 - -// ---------------------------------------------------------------------------- -// Mac-specific settings -// ---------------------------------------------------------------------------- - -#undef wxUSE_GRAPHICS_CONTEXT -#define wxUSE_GRAPHICS_CONTEXT 1 - - -// things not implemented under Mac - -#undef wxUSE_STACKWALKER -#define wxUSE_STACKWALKER 0 - -// wxWebKit is a wrapper for Apple's WebKit framework, use it if you want to -// embed the Safari browser control -// 0 by default because of Jaguar compatibility problems -#define wxUSE_WEBKIT 1 - - -// Set to 0 for no libmspack -#define wxUSE_LIBMSPACK 0 - -// native toolbar does support embedding controls, but not complex panels, please test -#define wxOSX_USE_NATIVE_TOOLBAR 1 - -// make sure we have the proper dispatcher for the console event loop -#define wxUSE_SELECT_DISPATCHER 1 -#define wxUSE_EPOLL_DISPATCHER 0 - - -#endif - // _WX_SETUP_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/slider.h b/Externals/wxWidgets3/include/wx/osx/slider.h deleted file mode 100644 index fffde4d3ee..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/slider.h +++ /dev/null @@ -1,117 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/slider.h -// Purpose: wxSlider class -// Author: Stefan Csomor -// Modified by: -// Created: 1998-01-01 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_SLIDER_H_ -#define _WX_SLIDER_H_ - -#include "wx/compositewin.h" -#include "wx/stattext.h" - -// Slider -class WXDLLIMPEXP_CORE wxSlider: public wxCompositeWindow -{ - wxDECLARE_DYNAMIC_CLASS(wxSlider); - -public: - wxSlider(); - - wxSlider(wxWindow *parent, wxWindowID id, - int value, int minValue, int maxValue, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSL_HORIZONTAL, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxSliderNameStr) - { - Create(parent, id, value, minValue, maxValue, pos, size, style, validator, name); - } - - virtual ~wxSlider(); - - bool Create(wxWindow *parent, wxWindowID id, - int value, int minValue, int maxValue, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSL_HORIZONTAL, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxSliderNameStr); - - virtual int GetValue() const wxOVERRIDE; - virtual void SetValue(int) wxOVERRIDE; - - void SetRange(int minValue, int maxValue) wxOVERRIDE; - - int GetMin() const wxOVERRIDE { return m_rangeMin; } - int GetMax() const wxOVERRIDE { return m_rangeMax; } - - void SetMin(int minValue) { SetRange(minValue, m_rangeMax); } - void SetMax(int maxValue) { SetRange(m_rangeMin, maxValue); } - - // For trackbars only - int GetTickFreq() const wxOVERRIDE { return m_tickFreq; } - void SetPageSize(int pageSize) wxOVERRIDE; - int GetPageSize() const wxOVERRIDE; - void ClearSel() wxOVERRIDE; - void ClearTicks() wxOVERRIDE; - void SetLineSize(int lineSize) wxOVERRIDE; - int GetLineSize() const wxOVERRIDE; - int GetSelEnd() const wxOVERRIDE; - int GetSelStart() const wxOVERRIDE; - void SetSelection(int minPos, int maxPos) wxOVERRIDE; - void SetThumbLength(int len) wxOVERRIDE; - int GetThumbLength() const wxOVERRIDE; - void SetTick(int tickPos) wxOVERRIDE; - - void Command(wxCommandEvent& event) wxOVERRIDE; - // osx specific event handling common for all osx-ports - - virtual bool OSXHandleClicked( double timestampsec ) wxOVERRIDE; - virtual void TriggerScrollEvent( wxEventType scrollEvent ) wxOVERRIDE; - -protected: - // Platform-specific implementation of SetTickFreq - virtual void DoSetTickFreq(int freq) wxOVERRIDE; - - virtual wxSize DoGetBestSize() const wxOVERRIDE; - virtual void DoSetSize(int x, int y, int w, int h, int sizeFlags) wxOVERRIDE; - virtual void DoMoveWindow(int x, int y, int w, int h) wxOVERRIDE; - - // set min/max size of the slider - virtual void DoSetSizeHints( int minW, int minH, - int maxW, int maxH, - int incW, int incH) wxOVERRIDE; - - // Common processing to invert slider values based on wxSL_INVERSE - virtual int ValueInvertOrNot(int value) const wxOVERRIDE; - - wxStaticText* m_macMinimumStatic ; - wxStaticText* m_macMaximumStatic ; - wxStaticText* m_macValueStatic ; - - int m_rangeMin; - int m_rangeMax; - int m_pageSize; - int m_lineSize; - int m_tickFreq; -private : - virtual wxWindowList GetCompositeWindowParts() const wxOVERRIDE - { - wxWindowList parts; - parts.push_back(m_macMinimumStatic); - parts.push_back(m_macMaximumStatic); - parts.push_back(m_macValueStatic); - return parts; - } - - wxDECLARE_EVENT_TABLE(); -}; - -#endif - // _WX_SLIDER_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/sound.h b/Externals/wxWidgets3/include/wx/osx/sound.h deleted file mode 100644 index e35d090894..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/sound.h +++ /dev/null @@ -1,79 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/sound.h -// Purpose: wxSound class (loads and plays short Windows .wav files). -// Optional on non-Windows platforms. -// Author: Ryan Norton, Stefan Csomor -// Modified by: -// Created: 1998-01-01 -// Copyright: (c) Ryan Norton, Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_SOUND_H_ -#define _WX_SOUND_H_ - -#if wxUSE_SOUND - -#include "wx/object.h" - -class WXDLLIMPEXP_FWD_ADV wxSoundTimer; - -class WXDLLIMPEXP_ADV wxSoundData -{ -public : - wxSoundData(); - virtual ~wxSoundData(); - - virtual bool Play(unsigned int flags) = 0; - // stops the sound and deletes the optional timer - virtual void Stop(); - // mark this to be deleted - virtual void MarkForDeletion(); - virtual bool IsMarkedForDeletion() const { return m_markedForDeletion; } - - // does the true work of stopping and cleaning up - virtual void DoStop() = 0; - -protected: - unsigned int m_flags; - bool m_markedForDeletion; -} ; - -class WXDLLIMPEXP_ADV wxSound : public wxSoundBase -{ -public: - wxSound(); - wxSound(const wxString& fileName, bool isResource = false); - wxSound(size_t size, const void* data); - virtual ~wxSound(); - - // Create from resource or file - bool Create(const wxString& fileName, bool isResource = false); - // Create from data - bool Create(size_t size, const void* data); - - bool IsOk() const { return m_data != NULL; } - - // Stop playing any sound - static void Stop(); - - // Returns true if a sound is being played - static bool IsPlaying(); - - // Notification when a sound has stopped - static void SoundStopped(const wxSoundData* data); - -protected: - bool DoPlay(unsigned flags) const; - void Init(); - -private: - // data of this object - class wxSoundData *m_data; - - wxDECLARE_NO_COPY_CLASS(wxSound); -}; - -#endif -#endif - // _WX_SOUND_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/spinbutt.h b/Externals/wxWidgets3/include/wx/osx/spinbutt.h deleted file mode 100644 index e8b48f3f89..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/spinbutt.h +++ /dev/null @@ -1,76 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/spinbutt.h -// Purpose: wxSpinButton class -// Author: Stefan Csomor -// Modified by: -// Created: 1998-01-01 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_SPINBUTT_H_ -#define _WX_SPINBUTT_H_ - -#include "wx/control.h" -#include "wx/event.h" - -/* - The wxSpinButton is like a small scrollbar than is often placed next - to a text control. - - wxSP_HORIZONTAL: horizontal spin button - wxSP_VERTICAL: vertical spin button (the default) - wxSP_ARROW_KEYS: arrow keys increment/decrement value - wxSP_WRAP: value wraps at either end - */ - -class WXDLLIMPEXP_CORE wxSpinButton : public wxSpinButtonBase -{ -public: - // construction - wxSpinButton(); - - wxSpinButton(wxWindow *parent, - wxWindowID id = -1, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSP_VERTICAL | wxSP_ARROW_KEYS, - const wxString& name = wxT("wxSpinButton")) - { - Create(parent, id, pos, size, style, name); - } - - virtual ~wxSpinButton(); - - bool Create(wxWindow *parent, - wxWindowID id = -1, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSP_VERTICAL | wxSP_ARROW_KEYS, - const wxString& name = wxT("wxSpinButton")); - - - // accessors - virtual void SetRange(int minVal, int maxVal); - virtual int GetValue() const ; - virtual void SetValue(int val); - - // implementation - - virtual void TriggerScrollEvent( wxEventType scrollEvent ) ; - - // osx specific event handling common for all osx-ports - - virtual bool OSXHandleClicked( double timestampsec ); - -protected: - void SendThumbTrackEvent() ; - - virtual wxSize DoGetBestSize() const; - -private: - wxDECLARE_DYNAMIC_CLASS(wxSpinButton); -}; - -#endif - // _WX_SPINBUTT_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/srchctrl.h b/Externals/wxWidgets3/include/wx/osx/srchctrl.h deleted file mode 100644 index 4a4d88af47..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/srchctrl.h +++ /dev/null @@ -1,87 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/srchctrl.h -// Purpose: mac carbon wxSearchCtrl class -// Author: Vince Harron -// Created: 2006-02-19 -// Copyright: Vince Harron -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_SEARCHCTRL_H_ -#define _WX_SEARCHCTRL_H_ - -#if wxUSE_SEARCHCTRL - -class wxSearchWidgetImpl; - -class WXDLLIMPEXP_CORE wxSearchCtrl : public wxSearchCtrlBase -{ -public: - // creation - // -------- - - wxSearchCtrl(); - wxSearchCtrl(wxWindow *parent, wxWindowID id, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxSearchCtrlNameStr); - - virtual ~wxSearchCtrl(); - - bool Create(wxWindow *parent, wxWindowID id, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxSearchCtrlNameStr); - -#if wxUSE_MENUS - // get/set search button menu - // -------------------------- - virtual void SetMenu( wxMenu* menu ) wxOVERRIDE; - virtual wxMenu* GetMenu() wxOVERRIDE; -#endif // wxUSE_MENUS - - // get/set search options - // ---------------------- - virtual void ShowSearchButton( bool show ) wxOVERRIDE; - virtual bool IsSearchButtonVisible() const wxOVERRIDE; - - virtual void ShowCancelButton( bool show ) wxOVERRIDE; - virtual bool IsCancelButtonVisible() const wxOVERRIDE; - - // TODO: In 2.9 these should probably be virtual, and declared in the base class... - void SetDescriptiveText(const wxString& text); - wxString GetDescriptiveText() const; - - virtual bool HandleSearchFieldSearchHit() ; - virtual bool HandleSearchFieldCancelHit() ; - - wxSearchWidgetImpl * GetSearchPeer() const; - -protected: - - wxSize DoGetBestSize() const wxOVERRIDE; - - void Init(); - -#if wxUSE_MENUS - wxMenu *m_menu; -#endif // wxUSE_MENUS - - wxString m_descriptiveText; - -private: - wxDECLARE_DYNAMIC_CLASS(wxSearchCtrl); - - wxDECLARE_EVENT_TABLE(); -}; - -#endif // wxUSE_SEARCHCTRL - -#endif // _WX_SEARCHCTRL_H_ - diff --git a/Externals/wxWidgets3/include/wx/osx/statbmp.h b/Externals/wxWidgets3/include/wx/osx/statbmp.h deleted file mode 100644 index 45d1f3c9d5..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/statbmp.h +++ /dev/null @@ -1,2 +0,0 @@ -#define wxGenericStaticBitmap wxStaticBitmap -#include "wx/generic/statbmpg.h" diff --git a/Externals/wxWidgets3/include/wx/osx/statbox.h b/Externals/wxWidgets3/include/wx/osx/statbox.h deleted file mode 100644 index 981d2c3fdb..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/statbox.h +++ /dev/null @@ -1,49 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/statbox.h -// Purpose: wxStaticBox class -// Author: Stefan Csomor -// Modified by: -// Created: 1998-01-01 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_STATBOX_H_ -#define _WX_STATBOX_H_ - -class WXDLLIMPEXP_CORE wxStaticBox : public wxStaticBoxBase -{ - wxDECLARE_DYNAMIC_CLASS(wxStaticBox); - -public: - wxStaticBox() {} - wxStaticBox(wxWindow *parent, wxWindowID id, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxStaticBoxNameStr) - { - Create(parent, id, label, pos, size, style, name); - } - - bool Create(wxWindow *parent, wxWindowID id, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxStaticBoxNameStr); - - virtual void Command(wxCommandEvent& WXUNUSED(event)) {} - virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {} - - virtual void GetBordersForSizer(int *borderTop, int *borderOther) const; - - virtual bool AcceptsFocus() const { return false; } - - // protect native font of box - virtual bool SetFont( const wxFont &font ); -}; - -#endif - // _WX_STATBOX_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/statline.h b/Externals/wxWidgets3/include/wx/osx/statline.h deleted file mode 100644 index 204c8759bc..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/statline.h +++ /dev/null @@ -1,56 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/statline.h -// Purpose: a generic wxStaticLine class used for mac before adaptation -// Author: Vadim Zeitlin -// Created: 28.06.99 -// Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GENERIC_STATLINE_H_ -#define _WX_GENERIC_STATLINE_H_ - -class wxStaticBox; - -// ---------------------------------------------------------------------------- -// wxStaticLine -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxStaticLine : public wxStaticLineBase -{ -public: - // constructors and pseudo-constructors - wxStaticLine() : m_statbox(NULL) { } - - wxStaticLine( wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - long style = wxLI_HORIZONTAL, - const wxString &name = wxStaticLineNameStr ) - : m_statbox(NULL) - { - Create(parent, id, pos, size, style, name); - } - - bool Create( wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - long style = wxLI_HORIZONTAL, - const wxString &name = wxStaticLineNameStr ); - - // it's necessary to override this wxWindow function because we - // will want to return the main widget for m_statbox - // - WXWidget GetMainWidget() const; - -protected: - // we implement the static line using a static box - wxStaticBox *m_statbox; - - wxDECLARE_DYNAMIC_CLASS(wxStaticLine); -}; - -#endif // _WX_GENERIC_STATLINE_H_ - diff --git a/Externals/wxWidgets3/include/wx/osx/stattext.h b/Externals/wxWidgets3/include/wx/osx/stattext.h deleted file mode 100644 index 28c89a05d8..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/stattext.h +++ /dev/null @@ -1,57 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/stattext.h -// Purpose: wxStaticText class -// Author: Stefan Csomor -// Modified by: -// Created: 1998-01-01 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_STATTEXT_H_ -#define _WX_STATTEXT_H_ - -class WXDLLIMPEXP_CORE wxStaticText: public wxStaticTextBase -{ -public: - wxStaticText() { } - - wxStaticText(wxWindow *parent, wxWindowID id, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxStaticTextNameStr) - { - Create(parent, id, label, pos, size, style, name); - } - - bool Create(wxWindow *parent, wxWindowID id, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxStaticTextNameStr); - - // accessors - void SetLabel( const wxString &str ) ; - bool SetFont( const wxFont &font ); - - virtual bool AcceptsFocus() const { return false; } - -protected : - - virtual wxString DoGetLabel() const; - virtual void DoSetLabel(const wxString& str); - - virtual wxSize DoGetBestSize() const ; - -#if wxUSE_MARKUP && wxOSX_USE_COCOA - virtual bool DoSetLabelMarkup(const wxString& markup); -#endif // wxUSE_MARKUP && wxOSX_USE_COCOA - - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticText); -}; - -#endif - // _WX_STATTEXT_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/statusbr.h b/Externals/wxWidgets3/include/wx/osx/statusbr.h deleted file mode 100644 index 76d6bbaebd..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/statusbr.h +++ /dev/null @@ -1,42 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/statusbr.h -// Purpose: native implementation of wxStatusBar. -// Optional: can use generic version instead. -// Author: Stefan Csomor -// Modified by: -// Created: 1998-01-01 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_STATBAR_H_ -#define _WX_STATBAR_H_ - -class WXDLLIMPEXP_CORE wxStatusBarMac : public wxStatusBarGeneric -{ -public: - wxStatusBarMac(); - wxStatusBarMac(wxWindow *parent, wxWindowID id = wxID_ANY, - long style = wxSTB_DEFAULT_STYLE, - const wxString& name = wxStatusBarNameStr); - - virtual ~wxStatusBarMac(); - - bool Create(wxWindow *parent, wxWindowID id = wxID_ANY, - long style = wxSTB_DEFAULT_STYLE, - const wxString& name = wxStatusBarNameStr); - - // Implementation - virtual void MacHiliteChanged() wxOVERRIDE; - void OnPaint(wxPaintEvent& event); - -protected: - virtual void DrawFieldText(wxDC& dc, const wxRect& rc, int i, int textHeight) wxOVERRIDE; - virtual void DrawField(wxDC& dc, int i, int textHeight) wxOVERRIDE; - virtual void DoUpdateStatusText(int number = 0) wxOVERRIDE; - - wxDECLARE_DYNAMIC_CLASS(wxStatusBarMac); - wxDECLARE_EVENT_TABLE(); -}; - -#endif // _WX_STATBAR_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/taskbarosx.h b/Externals/wxWidgets3/include/wx/osx/taskbarosx.h deleted file mode 100644 index cf7056a2c0..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/taskbarosx.h +++ /dev/null @@ -1,43 +0,0 @@ -///////////////////////////////////////////////////////////////////////// -// File: wx/mac/taskbarosx.h -// Purpose: Defines wxTaskBarIcon class for OSX -// Author: Ryan Norton -// Modified by: -// Created: 04/04/2003 -// Copyright: (c) Ryan Norton, 2003 -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////// - -#ifndef _TASKBAR_H_ -#define _TASKBAR_H_ - -class WXDLLIMPEXP_FWD_CORE wxIcon; -class WXDLLIMPEXP_FWD_CORE wxMenu; - -class WXDLLIMPEXP_ADV wxTaskBarIcon : public wxTaskBarIconBase -{ - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxTaskBarIcon); -public: - wxTaskBarIcon(wxTaskBarIconType iconType = wxTBI_DEFAULT_TYPE); - virtual ~wxTaskBarIcon(); - - // returns true if the taskbaricon is in the global menubar -#if wxOSX_USE_COCOA - bool OSXIsStatusItem(); -#else - bool OSXIsStatusItem() { return false; } -#endif - bool IsOk() const { return true; } - - bool IsIconInstalled() const; - bool SetIcon(const wxIcon& icon, const wxString& tooltip = wxEmptyString); - bool RemoveIcon(); - bool PopupMenu(wxMenu *menu); - -protected: - wxTaskBarIconType m_type; - class wxTaskBarIconImpl* m_impl; - friend class wxTaskBarIconImpl; -}; -#endif - // _TASKBAR_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/textctrl.h b/Externals/wxWidgets3/include/wx/osx/textctrl.h deleted file mode 100644 index 31892a77c6..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/textctrl.h +++ /dev/null @@ -1,154 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/textctrl.h -// Purpose: wxTextCtrl class -// Author: Stefan Csomor -// Modified by: -// Created: 1998-01-01 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_TEXTCTRL_H_ -#define _WX_TEXTCTRL_H_ - -#if wxUSE_SYSTEM_OPTIONS - // set this to 'true' if you want to use the 'classic' MLTE-based implementation - // instead of the HIView-based implementation in 10.3 and upwards, the former - // has more features (backgrounds etc.), but may show redraw artefacts and other - // problems depending on your usage; hence, the default is 'false'. - #define wxMAC_TEXTCONTROL_USE_MLTE wxT("mac.textcontrol-use-mlte") - // set this to 'true' if you want editable text controls to have spell checking turned - // on by default, you can change this setting individually on a control using MacCheckSpelling - #define wxMAC_TEXTCONTROL_USE_SPELL_CHECKER wxT("mac.textcontrol-use-spell-checker") -#endif - -#include "wx/control.h" -#include "wx/textctrl.h" - -class WXDLLIMPEXP_CORE wxTextCtrl: public wxTextCtrlBase -{ - wxDECLARE_DYNAMIC_CLASS(wxTextCtrl); - -public: - wxTextCtrl() - { Init(); } - - wxTextCtrl(wxWindow *parent, - wxWindowID id, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxTextCtrlNameStr) - { - Init(); - Create(parent, id, value, pos, size, style, validator, name); - } - - virtual ~wxTextCtrl(); - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxTextCtrlNameStr); - - // accessors - // --------- - - virtual int GetLineLength(long lineNo) const wxOVERRIDE; - virtual wxString GetLineText(long lineNo) const wxOVERRIDE; - virtual int GetNumberOfLines() const wxOVERRIDE; - - virtual bool IsModified() const wxOVERRIDE; - - // operations - // ---------- - - - // sets/clears the dirty flag - virtual void MarkDirty() wxOVERRIDE; - virtual void DiscardEdits() wxOVERRIDE; - - // text control under some platforms supports the text styles: these - // methods apply the given text style to the given selection or to - // set/get the style which will be used for all appended text - virtual bool SetFont( const wxFont &font ) wxOVERRIDE; - virtual bool GetStyle(long position, wxTextAttr& style) wxOVERRIDE; - virtual bool SetStyle(long start, long end, const wxTextAttr& style) wxOVERRIDE; - virtual bool SetDefaultStyle(const wxTextAttr& style) wxOVERRIDE; - - // translate between the position (which is just an index into the textctrl - // considering all its contents as a single strings) and (x, y) coordinates - // which represent column and line. - virtual long XYToPosition(long x, long y) const wxOVERRIDE; - virtual bool PositionToXY(long pos, long *x, long *y) const wxOVERRIDE; - - virtual void ShowPosition(long pos) wxOVERRIDE; - - // overrides so that we can send text updated events - virtual void Copy() wxOVERRIDE; - virtual void Cut() wxOVERRIDE; - virtual void Paste() wxOVERRIDE; - - // Implementation - // -------------- - virtual void Command(wxCommandEvent& event) wxOVERRIDE; - - virtual bool AcceptsFocus() const wxOVERRIDE; - - // callbacks - void OnDropFiles(wxDropFilesEvent& event); - void OnChar(wxKeyEvent& event); // Process 'enter' if required - void OnKeyDown(wxKeyEvent& event); // Process clipboard shortcuts - - void OnCut(wxCommandEvent& event); - void OnCopy(wxCommandEvent& event); - void OnPaste(wxCommandEvent& event); - void OnUndo(wxCommandEvent& event); - void OnRedo(wxCommandEvent& event); - void OnDelete(wxCommandEvent& event); - void OnSelectAll(wxCommandEvent& event); - - void OnUpdateCut(wxUpdateUIEvent& event); - void OnUpdateCopy(wxUpdateUIEvent& event); - void OnUpdatePaste(wxUpdateUIEvent& event); - void OnUpdateUndo(wxUpdateUIEvent& event); - void OnUpdateRedo(wxUpdateUIEvent& event); - void OnUpdateDelete(wxUpdateUIEvent& event); - void OnUpdateSelectAll(wxUpdateUIEvent& event); - - void OnContextMenu(wxContextMenuEvent& event); - - virtual bool MacSetupCursor( const wxPoint& pt ) wxOVERRIDE; - - virtual void MacVisibilityChanged() wxOVERRIDE; - virtual void MacSuperChangedPosition() wxOVERRIDE; - virtual void MacCheckSpelling(bool check); - -protected: - // common part of all ctors - void Init(); - - virtual wxSize DoGetBestSize() const wxOVERRIDE; - - // flag is set to true when the user edits the controls contents - bool m_dirty; - - virtual void EnableTextChangedEvents(bool WXUNUSED(enable)) wxOVERRIDE - { - // nothing to do here as the events are never generated when we change - // the controls value programmatically anyhow - } - -private : - wxMenu *m_privateContextMenu; - - wxDECLARE_EVENT_TABLE(); -}; - -#endif // _WX_TEXTCTRL_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/textentry.h b/Externals/wxWidgets3/include/wx/osx/textentry.h deleted file mode 100644 index 29939d8383..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/textentry.h +++ /dev/null @@ -1,115 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/textentry.h -// Purpose: wxTextEntry class -// Author: Stefan Csomor -// Modified by: Kevin Ollivier -// Created: 1998-01-01 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_OSX_TEXTENTRY_H_ -#define _WX_OSX_TEXTENTRY_H_ - -#if wxUSE_SYSTEM_OPTIONS - // set this to 'true' if you want to use the 'classic' MLTE-based implementation - // instead of the HIView-based implementation in 10.3 and upwards, the former - // has more features (backgrounds etc.), but may show redraw artefacts and other - // problems depending on your usage; hence, the default is 'false'. - #define wxMAC_TEXTCONTROL_USE_MLTE wxT("mac.textcontrol-use-mlte") - // set this to 'true' if you want editable text controls to have spell checking turned - // on by default, you can change this setting individually on a control using MacCheckSpelling - #define wxMAC_TEXTCONTROL_USE_SPELL_CHECKER wxT("mac.textcontrol-use-spell-checker") -#endif - -#include "wx/control.h" - -// forward decl for wxListWidgetImpl implementation type. -class WXDLLIMPEXP_FWD_CORE wxTextWidgetImpl; - -class WXDLLIMPEXP_CORE wxTextEntry: public wxTextEntryBase -{ - -public: - wxTextEntry(); - virtual ~wxTextEntry(); - - virtual bool IsEditable() const; - - // If the return values from and to are the same, there is no selection. - virtual void GetSelection(long* from, long* to) const; - - // operations - // ---------- - - // editing - virtual void Clear(); - virtual void Remove(long from, long to); - - // set the max number of characters which may be entered - // in a single line text control - virtual void SetMaxLength(unsigned long len); - - virtual void ForceUpper(); - - // writing text inserts it at the current position; - // appending always inserts it at the end - virtual void WriteText(const wxString& text); - - // Clipboard operations - virtual void Copy(); - virtual void Cut(); - virtual void Paste(); - - virtual bool CanCopy() const; - virtual bool CanCut() const; - virtual bool CanPaste() const; - - // Undo/redo - virtual void Undo(); - virtual void Redo(); - - virtual bool CanUndo() const; - virtual bool CanRedo() const; - - // Insertion point - virtual void SetInsertionPoint(long pos); - virtual void SetInsertionPointEnd(); - virtual long GetInsertionPoint() const; - virtual wxTextPos GetLastPosition() const; - - virtual void SetSelection(long from, long to); - virtual void SetEditable(bool editable); - - virtual bool SendMaxLenEvent(); - - // set the grayed out hint text - virtual bool SetHint(const wxString& hint); - virtual wxString GetHint() const; - - // Implementation - // -------------- - - virtual wxTextWidgetImpl * GetTextPeer() const; - wxTextCompleter *OSXGetCompleter() const { return m_completer; } - -protected: - - virtual wxString DoGetValue() const; - - virtual bool DoAutoCompleteStrings(const wxArrayString& choices); - virtual bool DoAutoCompleteCustom(wxTextCompleter *completer); - - // The object providing auto-completions or NULL if none. - wxTextCompleter *m_completer; - - bool m_editable; - - // need to make this public because of the current implementation via callbacks - unsigned long m_maxLength; - -private: - wxString m_hintString; -}; - -#endif // _WX_OSX_TEXTENTRY_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/tglbtn.h b/Externals/wxWidgets3/include/wx/osx/tglbtn.h deleted file mode 100644 index 1283d33f6c..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/tglbtn.h +++ /dev/null @@ -1,85 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/tglbtn.h -// Purpose: Declaration of the wxToggleButton class, which implements a -// toggle button under wxMac. -// Author: Stefan Csomor -// Modified by: -// Created: 08.02.01 -// Copyright: (c) 2004 Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_TOGGLEBUTTON_H_ -#define _WX_TOGGLEBUTTON_H_ - -class WXDLLIMPEXP_CORE wxToggleButton : public wxToggleButtonBase -{ -public: - wxToggleButton() {} - wxToggleButton(wxWindow *parent, - wxWindowID id, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxCheckBoxNameStr) - { - Create(parent, id, label, pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxCheckBoxNameStr); - - virtual void SetValue(bool value); - virtual bool GetValue() const ; - - virtual bool OSXHandleClicked( double timestampsec ); - - virtual void Command(wxCommandEvent& event); - -protected: - virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } - -private: - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxToggleButton); -}; - - -class WXDLLIMPEXP_CORE wxBitmapToggleButton : public wxToggleButton -{ -public: - wxBitmapToggleButton() {} - wxBitmapToggleButton(wxWindow *parent, - wxWindowID id, - const wxBitmap& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxCheckBoxNameStr) - { - Create(parent, id, label, pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxBitmap& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxCheckBoxNameStr); - -private: - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxBitmapToggleButton); -}; - -#endif // _WX_TOGGLEBUTTON_H_ - diff --git a/Externals/wxWidgets3/include/wx/osx/timectrl.h b/Externals/wxWidgets3/include/wx/osx/timectrl.h deleted file mode 100644 index 6673fcce38..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/timectrl.h +++ /dev/null @@ -1,50 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/timectrl.h -// Purpose: Declaration of wxOSX-specific wxTimePickerCtrl class. -// Author: Vadim Zeitlin -// Created: 2011-12-18 -// Copyright: (c) 2011 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_OSX_TIMECTRL_H_ -#define _WX_OSX_TIMECTRL_H_ - -// ---------------------------------------------------------------------------- -// wxTimePickerCtrl -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxTimePickerCtrl : public wxTimePickerCtrlBase -{ -public: - // Constructors. - wxTimePickerCtrl() { } - - wxTimePickerCtrl(wxWindow *parent, - wxWindowID id, - const wxDateTime& dt = wxDefaultDateTime, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxTP_DEFAULT, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxTimePickerCtrlNameStr) - { - Create(parent, id, dt, pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxDateTime& dt = wxDefaultDateTime, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxTP_DEFAULT, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxTimePickerCtrlNameStr); - - virtual void OSXGenerateEvent(const wxDateTime& dt); - -private: - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxTimePickerCtrl); -}; - -#endif // _WX_OSX_TIMECTRL_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/toolbar.h b/Externals/wxWidgets3/include/wx/osx/toolbar.h deleted file mode 100644 index 70a33f77a7..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/toolbar.h +++ /dev/null @@ -1,130 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/toolbar.h -// Purpose: wxToolBar class -// Author: Stefan Csomor -// Modified by: -// Created: 1998-01-01 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_TOOLBAR_H_ -#define _WX_TOOLBAR_H_ - -#if wxUSE_TOOLBAR - -#include "wx/tbarbase.h" -#include "wx/dynarray.h" - -class WXDLLIMPEXP_CORE wxToolBar: public wxToolBarBase -{ - wxDECLARE_DYNAMIC_CLASS(wxToolBar); -public: - /* - * Public interface - */ - - wxToolBar() { Init(); } - - wxToolBar(wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - long style = wxTB_DEFAULT_STYLE, - const wxString& name = wxToolBarNameStr) - { - Init(); - Create(parent, id, pos, size, style, name); - } - virtual ~wxToolBar(); - - bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - long style = wxTB_DEFAULT_STYLE, - const wxString& name = wxToolBarNameStr); - - virtual void SetWindowStyleFlag(long style) wxOVERRIDE; - - virtual bool Destroy() wxOVERRIDE; - - // override/implement base class virtuals - virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const wxOVERRIDE; - -#ifndef __WXOSX_IPHONE__ - virtual bool Show(bool show = true) wxOVERRIDE; - virtual bool IsShown() const wxOVERRIDE; -#endif - virtual bool Realize() wxOVERRIDE; - - virtual void SetToolBitmapSize(const wxSize& size) wxOVERRIDE; - virtual wxSize GetToolSize() const wxOVERRIDE; - - virtual void SetRows(int nRows) wxOVERRIDE; - - virtual void SetToolNormalBitmap(int id, const wxBitmap& bitmap) wxOVERRIDE; - virtual void SetToolDisabledBitmap(int id, const wxBitmap& bitmap) wxOVERRIDE; - -#ifndef __WXOSX_IPHONE__ - // Add all the buttons - - virtual wxString MacGetToolTipString( wxPoint &where ) wxOVERRIDE; - void OnPaint(wxPaintEvent& event) ; - void OnMouse(wxMouseEvent& event) ; - virtual void MacSuperChangedPosition() wxOVERRIDE; -#endif - -#if wxOSX_USE_NATIVE_TOOLBAR - // make all tools selectable - void OSXSetSelectableTools(bool set); - void OSXSelectTool(int toolId); - - bool MacInstallNativeToolbar(bool usesNative); - void MacUninstallNativeToolbar(); - bool MacWantsNativeToolbar(); - bool MacTopLevelHasNativeToolbar(bool *ownToolbarInstalled) const; -#endif - - virtual wxToolBarToolBase *CreateTool(int id, - const wxString& label, - const wxBitmap& bmpNormal, - const wxBitmap& bmpDisabled = wxNullBitmap, - wxItemKind kind = wxITEM_NORMAL, - wxObject *clientData = NULL, - const wxString& shortHelp = wxEmptyString, - const wxString& longHelp = wxEmptyString) wxOVERRIDE; - virtual wxToolBarToolBase *CreateTool(wxControl *control, - const wxString& label) wxOVERRIDE; - -protected: - // common part of all ctors - void Init(); - - void DoLayout(); - - void DoSetSize(int x, int y, int width, int height, int sizeFlags) wxOVERRIDE; - -#ifndef __WXOSX_IPHONE__ - virtual void DoGetSize(int *width, int *height) const wxOVERRIDE; - virtual wxSize DoGetBestSize() const wxOVERRIDE; -#endif -#ifdef __WXOSX_COCOA__ - virtual void DoGetPosition(int*x, int *y) const wxOVERRIDE; -#endif - virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool) wxOVERRIDE; - virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool) wxOVERRIDE; - - virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable) wxOVERRIDE; - virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle) wxOVERRIDE; - virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle) wxOVERRIDE; - - wxDECLARE_EVENT_TABLE(); -#if wxOSX_USE_NATIVE_TOOLBAR - bool m_macUsesNativeToolbar ; - void* m_macToolbar ; -#endif -#ifdef __WXOSX_IPHONE__ - WX_UIView m_macToolbar; -#endif -}; - -#endif // wxUSE_TOOLBAR - -#endif - // _WX_TOOLBAR_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/tooltip.h b/Externals/wxWidgets3/include/wx/osx/tooltip.h deleted file mode 100644 index c229555071..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/tooltip.h +++ /dev/null @@ -1,57 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/tooltip.h -// Purpose: wxToolTip class - tooltip control -// Author: Stefan Csomor -// Modified by: -// Created: 31.01.99 -// Copyright: (c) 1999 Robert Roebling, Vadim Zeitlin, Stefan Csomor -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MAC_TOOLTIP_H_ -#define _WX_MAC_TOOLTIP_H_ - -#include "wx/string.h" -#include "wx/event.h" - -class WXDLLIMPEXP_CORE wxToolTip : public wxObject -{ -public: - // ctor & dtor - wxToolTip(const wxString &tip); - virtual ~wxToolTip(); - - // accessors - // tip text - void SetTip(const wxString& tip); - const wxString& GetTip() const { return m_text; } - - // the window we're associated with - void SetWindow(wxWindow *win); - wxWindow *GetWindow() const { return m_window; } - - // controlling tooltip behaviour: globally change tooltip parameters - // enable or disable the tooltips globally - static void Enable(bool flag); - // set the delay after which the tooltip appears - static void SetDelay(long milliseconds); - // set the delay after which the tooltip disappears or how long the tooltip remains visible - static void SetAutoPop(long milliseconds); - // set the delay between subsequent tooltips to appear - static void SetReshow(long milliseconds); - static void NotifyWindowDelete( WXHWND win ) ; - - // implementation only from now on - // ------------------------------- - - // should be called in response to mouse events - static void RelayEvent(wxWindow *win , wxMouseEvent &event); - static void RemoveToolTips(); - -private: - wxString m_text; // tooltip text - wxWindow *m_window; // window we're associated with - wxDECLARE_ABSTRACT_CLASS(wxToolTip); -}; - -#endif // _WX_MAC_TOOLTIP_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/toplevel.h b/Externals/wxWidgets3/include/wx/osx/toplevel.h deleted file mode 100644 index 72f58c98a6..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/toplevel.h +++ /dev/null @@ -1,109 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/toplevel.h -// Purpose: wxTopLevelWindowMac is the Mac implementation of wxTLW -// Author: Stefan Csomor -// Modified by: -// Created: 20.09.01 -// Copyright: (c) 2001 Stefan Csomor -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_TOPLEVEL_H_ -#define _WX_MSW_TOPLEVEL_H_ - -// ---------------------------------------------------------------------------- -// wxTopLevelWindowMac -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxTopLevelWindowMac : public wxTopLevelWindowBase -{ -public: - // constructors and such - wxTopLevelWindowMac() { Init(); } - - wxTopLevelWindowMac(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr) - { - Init(); - - (void)Create(parent, id, title, pos, size, style, name); - } - - virtual ~wxTopLevelWindowMac(); - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr); - - bool Create(wxWindow *parent, WXWindow nativeWindow); - - virtual bool Destroy() wxOVERRIDE; - - virtual wxPoint GetClientAreaOrigin() const wxOVERRIDE; - - // Attracts the users attention to this window if the application is - // inactive (should be called when a background event occurs) - virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO) wxOVERRIDE; - - // implement base class pure virtuals - virtual void Maximize(bool maximize = true) wxOVERRIDE; - virtual bool IsMaximized() const wxOVERRIDE; - virtual void Iconize(bool iconize = true) wxOVERRIDE; - virtual bool IsIconized() const wxOVERRIDE; - virtual void Restore() wxOVERRIDE; - - virtual bool IsActive() wxOVERRIDE; - - virtual void ShowWithoutActivating() wxOVERRIDE; - bool EnableFullScreenView(bool enable = true) wxOVERRIDE; - virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) wxOVERRIDE; - virtual bool IsFullScreen() const wxOVERRIDE; - - // implementation from now on - // -------------------------- - - virtual void SetTitle( const wxString& title) wxOVERRIDE; - virtual wxString GetTitle() const wxOVERRIDE; - - // EnableCloseButton(false) used to disable the "Close" - // button on the title bar - virtual bool EnableCloseButton(bool enable = true) wxOVERRIDE; - virtual bool EnableMaximizeButton(bool enable = true) wxOVERRIDE; - virtual bool EnableMinimizeButton(bool enable = true) wxOVERRIDE; - - virtual void SetLabel(const wxString& label) wxOVERRIDE { SetTitle( label ); } - virtual wxString GetLabel() const wxOVERRIDE { return GetTitle(); } - - virtual void OSXSetModified(bool modified) wxOVERRIDE; - virtual bool OSXIsModified() const wxOVERRIDE; - - virtual void SetRepresentedFilename(const wxString& filename) wxOVERRIDE; - - // do *not* call this to iconize the frame, this is a private function! - void OSXSetIconizeState(bool iconic); - -protected: - // common part of all ctors - void Init(); - - // is the frame currently iconized? - bool m_iconized; - - // should the frame be maximized when it will be shown? set by Maximize() - // when it is called while the frame is hidden - bool m_maximizeOnShow; - -private : - wxDECLARE_EVENT_TABLE(); -}; - -#endif // _WX_MSW_TOPLEVEL_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/uma.h b/Externals/wxWidgets3/include/wx/osx/uma.h deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/Externals/wxWidgets3/include/wx/osx/webview_webkit.h b/Externals/wxWidgets3/include/wx/osx/webview_webkit.h deleted file mode 100644 index b1982aeb89..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/webview_webkit.h +++ /dev/null @@ -1,186 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: include/wx/osx/webkit.h -// Purpose: wxWebViewWebKit - embeddable web kit control, -// OS X implementation of web view component -// Author: Jethro Grassie / Kevin Ollivier / Marianne Gagnon -// Modified by: -// Created: 2004-4-16 -// Copyright: (c) Jethro Grassie / Kevin Ollivier / Marianne Gagnon -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_WEBKIT_H -#define _WX_WEBKIT_H - -#include "wx/defs.h" - -#if wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT && defined(__WXOSX__) - -#include "wx/control.h" -#include "wx/webview.h" - -#include "wx/osx/core/objcid.h" - -// ---------------------------------------------------------------------------- -// Web Kit Control -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_WEBVIEW wxWebViewWebKit : public wxWebView -{ -public: - wxDECLARE_DYNAMIC_CLASS(wxWebViewWebKit); - - wxWebViewWebKit() {} - wxWebViewWebKit(wxWindow *parent, - wxWindowID winID = wxID_ANY, - const wxString& strURL = wxWebViewDefaultURLStr, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxString& name = wxWebViewNameStr) - { - Create(parent, winID, strURL, pos, size, style, name); - } - bool Create(wxWindow *parent, - wxWindowID winID = wxID_ANY, - const wxString& strURL = wxWebViewDefaultURLStr, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxString& name = wxWebViewNameStr) wxOVERRIDE; - virtual ~wxWebViewWebKit(); - - virtual bool CanGoBack() const wxOVERRIDE; - virtual bool CanGoForward() const wxOVERRIDE; - virtual void GoBack() wxOVERRIDE; - virtual void GoForward() wxOVERRIDE; - virtual void Reload(wxWebViewReloadFlags flags = wxWEBVIEW_RELOAD_DEFAULT) wxOVERRIDE; - virtual void Stop() wxOVERRIDE; - virtual wxString GetPageSource() const wxOVERRIDE; - virtual wxString GetPageText() const wxOVERRIDE; - - virtual void Print() wxOVERRIDE; - - virtual void LoadURL(const wxString& url) wxOVERRIDE; - virtual wxString GetCurrentURL() const wxOVERRIDE; - virtual wxString GetCurrentTitle() const wxOVERRIDE; - virtual wxWebViewZoom GetZoom() const wxOVERRIDE; - virtual void SetZoom(wxWebViewZoom zoom) wxOVERRIDE; - - virtual void SetZoomType(wxWebViewZoomType zoomType) wxOVERRIDE; - virtual wxWebViewZoomType GetZoomType() const wxOVERRIDE; - virtual bool CanSetZoomType(wxWebViewZoomType type) const wxOVERRIDE; - - virtual bool IsBusy() const wxOVERRIDE { return m_busy; } - - //History functions - virtual void ClearHistory() wxOVERRIDE; - virtual void EnableHistory(bool enable = true) wxOVERRIDE; - virtual wxVector > GetBackwardHistory() wxOVERRIDE; - virtual wxVector > GetForwardHistory() wxOVERRIDE; - virtual void LoadHistoryItem(wxSharedPtr item) wxOVERRIDE; - - //Undo / redo functionality - virtual bool CanUndo() const wxOVERRIDE; - virtual bool CanRedo() const wxOVERRIDE; - virtual void Undo() wxOVERRIDE; - virtual void Redo() wxOVERRIDE; - - //Find function - virtual long Find(const wxString& text, int flags = wxWEBVIEW_FIND_DEFAULT) wxOVERRIDE - { - wxUnusedVar(text); - wxUnusedVar(flags); - return wxNOT_FOUND; - } - - //Clipboard functions - virtual bool CanCut() const wxOVERRIDE { return true; } - virtual bool CanCopy() const wxOVERRIDE { return true; } - virtual bool CanPaste() const wxOVERRIDE { return true; } - virtual void Cut() wxOVERRIDE; - virtual void Copy() wxOVERRIDE; - virtual void Paste() wxOVERRIDE; - - //Editing functions - virtual void SetEditable(bool enable = true) wxOVERRIDE; - virtual bool IsEditable() const wxOVERRIDE; - - //Selection - virtual void DeleteSelection() wxOVERRIDE; - virtual bool HasSelection() const wxOVERRIDE; - virtual void SelectAll() wxOVERRIDE; - virtual wxString GetSelectedText() const wxOVERRIDE; - virtual wxString GetSelectedSource() const wxOVERRIDE; - virtual void ClearSelection() wxOVERRIDE; - - void RunScript(const wxString& javascript) wxOVERRIDE; - - //Virtual Filesystem Support - virtual void RegisterHandler(wxSharedPtr handler) wxOVERRIDE; - - virtual void* GetNativeBackend() const wxOVERRIDE { return m_webView; } - - // ---- methods not from the parent (common) interface - bool CanGetPageSource() const; - - void SetScrollPos(int pos); - int GetScrollPos(); - - bool CanIncreaseTextSize() const; - void IncreaseTextSize(); - bool CanDecreaseTextSize() const; - void DecreaseTextSize(); - - float GetWebkitZoom() const; - void SetWebkitZoom(float zoom); - - // don't hide base class virtuals - virtual void SetScrollPos( int orient, int pos, bool refresh = true ) wxOVERRIDE - { return wxControl::SetScrollPos(orient, pos, refresh); } - virtual int GetScrollPos( int orient ) const wxOVERRIDE - { return wxControl::GetScrollPos(orient); } - - //we need to resize the webview when the control size changes - void OnSize(wxSizeEvent &event); - void OnMove(wxMoveEvent &event); - void OnMouseEvents(wxMouseEvent &event); - - bool m_busy; - bool m_nextNavigationIsNewWindow; - -protected: - virtual void DoSetPage(const wxString& html, const wxString& baseUrl) wxOVERRIDE; - - wxDECLARE_EVENT_TABLE(); - void MacVisibilityChanged() wxOVERRIDE; - -private: - wxWindow *m_parent; - wxWindowID m_windowID; - wxString m_pageTitle; - - OSXWebViewPtr m_webView; - - // we may use this later to setup our own mouse events, - // so leave it in for now. - void* m_webKitCtrlEventHandler; - //It should be WebView*, but WebView is an Objective-C class - //TODO: look into using DECLARE_WXCOCOA_OBJC_CLASS rather than this. -}; - -class WXDLLIMPEXP_WEBVIEW wxWebViewFactoryWebKit : public wxWebViewFactory -{ -public: - virtual wxWebView* Create() { return new wxWebViewWebKit; } - virtual wxWebView* Create(wxWindow* parent, - wxWindowID id, - const wxString& url = wxWebViewDefaultURLStr, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxWebViewNameStr) - { return new wxWebViewWebKit(parent, id, url, pos, size, style, name); } -}; - -#endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT - -#endif // _WX_WEBKIT_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/webviewhistoryitem_webkit.h b/Externals/wxWidgets3/include/wx/osx/webviewhistoryitem_webkit.h deleted file mode 100644 index 6a15e46526..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/webviewhistoryitem_webkit.h +++ /dev/null @@ -1,35 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: include/wx/osx/webviewhistoryitem.h -// Purpose: wxWebViewHistoryItem header for OSX -// Author: Steven Lamerton -// Copyright: (c) 2011 Steven Lamerton -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_OSX_WEBVIEWHISTORYITEM_H_ -#define _WX_OSX_WEBVIEWHISTORYITEM_H_ - -#include "wx/defs.h" - -#if wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT && defined(__WXOSX__) - -#include "wx/osx/core/objcid.h" - -class WXDLLIMPEXP_WEBVIEW wxWebViewHistoryItem -{ -public: - wxWebViewHistoryItem(const wxString& url, const wxString& title) : - m_url(url), m_title(title) {} - wxString GetUrl() { return m_url; } - wxString GetTitle() { return m_title; } - - friend class wxWebViewWebKit; - -private: - wxString m_url, m_title; - wxObjCID m_histItem; -}; - -#endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT - -#endif // _WX_OSX_WEBVIEWHISTORYITEM_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/window.h b/Externals/wxWidgets3/include/wx/osx/window.h deleted file mode 100644 index 192c420eaf..0000000000 --- a/Externals/wxWidgets3/include/wx/osx/window.h +++ /dev/null @@ -1,400 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/window.h -// Purpose: wxWindowMac class -// Author: Stefan Csomor -// Modified by: -// Created: 1998-01-01 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_WINDOW_H_ -#define _WX_WINDOW_H_ - -#include "wx/brush.h" -#include "wx/dc.h" - -class WXDLLIMPEXP_FWD_CORE wxButton; -class WXDLLIMPEXP_FWD_CORE wxScrollBar; -class WXDLLIMPEXP_FWD_CORE wxPanel; -class WXDLLIMPEXP_FWD_CORE wxNonOwnedWindow; - -#if wxOSX_USE_COCOA_OR_IPHONE - class WXDLLIMPEXP_FWD_CORE wxWidgetImpl ; - typedef wxWidgetImpl wxOSXWidgetImpl; -#endif - - -class WXDLLIMPEXP_CORE wxWindowMac: public wxWindowBase -{ - wxDECLARE_DYNAMIC_CLASS(wxWindowMac); - - friend class wxDC; - friend class wxPaintDC; - -public: - wxWindowMac(); - - wxWindowMac( wxWindowMac *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxPanelNameStr ); - - virtual ~wxWindowMac(); - - bool Create( wxWindowMac *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxPanelNameStr ); - - virtual void SendSizeEvent(int flags = 0) wxOVERRIDE; - - // implement base class pure virtuals - virtual void SetLabel( const wxString& label ) wxOVERRIDE; - virtual wxString GetLabel() const wxOVERRIDE; - - virtual void Raise() wxOVERRIDE; - virtual void Lower() wxOVERRIDE; - - virtual bool Show( bool show = true ) wxOVERRIDE; - virtual bool ShowWithEffect(wxShowEffect effect, - unsigned timeout = 0) wxOVERRIDE - { - return OSXShowWithEffect(true, effect, timeout); - } - virtual bool HideWithEffect(wxShowEffect effect, - unsigned timeout = 0) wxOVERRIDE - { - return OSXShowWithEffect(false, effect, timeout); - } - - virtual bool IsShownOnScreen() const wxOVERRIDE; - - virtual void SetFocus() wxOVERRIDE; - - virtual void WarpPointer( int x, int y ) wxOVERRIDE; - - virtual void Refresh( bool eraseBackground = true, - const wxRect *rect = NULL ) wxOVERRIDE; - - virtual void Update() wxOVERRIDE; - virtual void ClearBackground() wxOVERRIDE; - - virtual bool SetCursor( const wxCursor &cursor ) wxOVERRIDE; - virtual bool SetFont( const wxFont &font ) wxOVERRIDE; - virtual bool SetBackgroundColour( const wxColour &colour ) wxOVERRIDE; - virtual bool SetForegroundColour( const wxColour &colour ) wxOVERRIDE; - - virtual bool SetBackgroundStyle(wxBackgroundStyle style) wxOVERRIDE; - - virtual int GetCharHeight() const wxOVERRIDE; - virtual int GetCharWidth() const wxOVERRIDE; - -public: - virtual void SetScrollbar( int orient, int pos, int thumbVisible, - int range, bool refresh = true ) wxOVERRIDE; - virtual void SetScrollPos( int orient, int pos, bool refresh = true ) wxOVERRIDE; - virtual int GetScrollPos( int orient ) const wxOVERRIDE; - virtual int GetScrollThumb( int orient ) const wxOVERRIDE; - virtual int GetScrollRange( int orient ) const wxOVERRIDE; - virtual void ScrollWindow( int dx, int dy, - const wxRect* rect = NULL ) wxOVERRIDE; - virtual void AlwaysShowScrollbars(bool horz = true, bool vert = true) wxOVERRIDE; - virtual bool IsScrollbarAlwaysShown(int orient) const wxOVERRIDE - { - return orient == wxHORIZONTAL ? m_hScrollBarAlwaysShown - : m_vScrollBarAlwaysShown; - } - - virtual bool Reparent( wxWindowBase *newParent ) wxOVERRIDE; - -#if wxUSE_HOTKEY && wxOSX_USE_COCOA_OR_CARBON - // hot keys (system wide accelerators) - // ----------------------------------- - - virtual bool RegisterHotKey(int hotkeyId, int modifiers, int keycode) wxOVERRIDE; - virtual bool UnregisterHotKey(int hotkeyId) wxOVERRIDE; -#endif // wxUSE_HOTKEY - -#if wxUSE_DRAG_AND_DROP - virtual void SetDropTarget( wxDropTarget *dropTarget ) wxOVERRIDE; -#endif - - // Accept files for dragging - virtual void DragAcceptFiles( bool accept ) wxOVERRIDE; - - // implementation from now on - // -------------------------- - - void MacClientToRootWindow( int *x , int *y ) const; - - void MacWindowToRootWindow( int *x , int *y ) const; - - void MacRootWindowToWindow( int *x , int *y ) const; - - virtual wxString MacGetToolTipString( wxPoint &where ); - - // simple accessors - // ---------------- - - virtual WXWidget GetHandle() const wxOVERRIDE; - - virtual bool SetTransparent(wxByte alpha) wxOVERRIDE; - virtual bool CanSetTransparent() wxOVERRIDE; - virtual wxByte GetTransparent() const; - - // event handlers - // -------------- - - void OnMouseEvent( wxMouseEvent &event ); - - void MacOnScroll( wxScrollEvent&event ); - - virtual bool AcceptsFocus() const wxOVERRIDE; - - virtual bool IsDoubleBuffered() const wxOVERRIDE { return true; } - -public: - static long MacRemoveBordersFromStyle( long style ); - -public: - // For implementation purposes: - // sometimes decorations make the client area smaller - virtual wxPoint GetClientAreaOrigin() const wxOVERRIDE; - - wxWindowMac *FindItem(long id) const; - wxWindowMac *FindItemByHWND(WXHWND hWnd, bool controlOnly = false) const; - - virtual void TriggerScrollEvent( wxEventType scrollEvent ) ; - // this should not be overridden in classes above wxWindowMac - // because it is called from its destructor via DeleteChildren - virtual void RemoveChild( wxWindowBase *child ) wxOVERRIDE; - - virtual bool MacDoRedraw( long time ) ; - virtual void MacPaintChildrenBorders(); - virtual void MacPaintBorders( int left , int top ) ; - void MacPaintGrowBox(); - - // invalidates the borders and focus area around the control; - // must not be virtual as it will be called during destruction - void MacInvalidateBorders() ; - - WXWindow MacGetTopLevelWindowRef() const ; - wxNonOwnedWindow* MacGetTopLevelWindow() const ; - - virtual long MacGetWXBorderSize() const; - virtual long MacGetLeftBorderSize() const ; - virtual long MacGetRightBorderSize() const ; - virtual long MacGetTopBorderSize() const ; - virtual long MacGetBottomBorderSize() const ; - - virtual void MacSuperChangedPosition() ; - - // absolute coordinates of this window's root have changed - virtual void MacTopLevelWindowChangedPosition() ; - - virtual void MacChildAdded() ; - virtual void MacVisibilityChanged() ; - virtual void MacEnabledStateChanged() ; - virtual void MacHiliteChanged() ; - virtual wxInt32 MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ; - - bool MacIsReallyEnabled() ; - bool MacIsReallyHilited() ; - -#if WXWIN_COMPATIBILITY_2_8 - bool MacIsUserPane(); -#endif - bool MacIsUserPane() const; - - virtual bool MacSetupCursor( const wxPoint& pt ) ; - - // return the rectangle that would be visible of this control, - // regardless whether controls are hidden - // only taking into account clipping by parent windows - const wxRect& MacGetClippedClientRect() const ; - const wxRect& MacGetClippedRect() const ; - const wxRect& MacGetClippedRectWithOuterStructure() const ; - - // returns the visible region of this control in window ie non-client coordinates - const wxRegion& MacGetVisibleRegion( bool includeOuterStructures = false ) ; - - // returns true if children have to clipped to the content area - // (e.g., scrolled windows) - bool MacClipChildren() const { return m_clipChildren ; } - void MacSetClipChildren( bool clip ) { m_clipChildren = clip ; } - - // returns true if the grandchildren need to be clipped to the children's content area - // (e.g., splitter windows) - virtual bool MacClipGrandChildren() const { return false ; } - bool MacIsWindowScrollbar( const wxWindow* sb ) const - { return ((wxWindow*)m_hScrollBar == sb || (wxWindow*)m_vScrollBar == sb) ; } - virtual bool IsClientAreaChild(const wxWindow *child) const wxOVERRIDE - { - return !MacIsWindowScrollbar(child) && !((wxWindow*)m_growBox==child) && - wxWindowBase::IsClientAreaChild(child); - } - - void MacPostControlCreate(const wxPoint& pos, const wxSize& size) ; - wxList& GetSubcontrols() { return m_subControls; } - - // translate wxWidgets coords into ones suitable - // to be passed to CreateControl calls - // - // returns true if non-default coords are returned, false otherwise - bool MacGetBoundsForControl(const wxPoint& pos, - const wxSize& size, - int& x, int& y, - int& w, int& h , bool adjustForOrigin ) const ; - - // the 'true' OS level control for this wxWindow - wxOSXWidgetImpl* GetPeer() const; - - // optimization to avoid creating a user pane in wxWindow::Create if we already know - // we will replace it with our own peer - void DontCreatePeer(); - - // return true unless DontCreatePeer() had been called - bool ShouldCreatePeer() const; - - // sets the native implementation wrapper, can replace an existing peer, use peer = NULL to - // release existing peer - void SetPeer(wxOSXWidgetImpl* peer); - - // wraps the already existing peer with the wrapper - void SetWrappingPeer(wxOSXWidgetImpl* wrapper); - -#if wxOSX_USE_COCOA_OR_IPHONE - // the NSView or NSWindow of this window: can be used for both child and - // non-owned windows - // - // this is useful for a few Cocoa function which can work with either views - // or windows indiscriminately, e.g. for setting NSViewAnimationTargetKey - virtual void *OSXGetViewOrWindow() const; -#endif // Cocoa - - void * MacGetCGContextRef() { return m_cgContextRef ; } - void MacSetCGContextRef(void * cg) { m_cgContextRef = cg ; } - - // osx specific event handling common for all osx-ports - - virtual bool OSXHandleClicked( double timestampsec ); - virtual bool OSXHandleKeyEvent( wxKeyEvent& event ); - virtual void OSXSimulateFocusEvents(); - - bool IsNativeWindowWrapper() const { return m_isNativeWindowWrapper; } - - double GetContentScaleFactor() const wxOVERRIDE; - - // internal response to size events - virtual void MacOnInternalSize() {} - -protected: - // For controls like radio buttons which are genuinely composite - wxList m_subControls; - - // the peer object, allowing for cleaner API support - - void * m_cgContextRef ; - - // cache the clipped rectangles within the window hierarchy - void MacUpdateClippedRects() const ; - - mutable bool m_cachedClippedRectValid ; - mutable wxRect m_cachedClippedRectWithOuterStructure ; - mutable wxRect m_cachedClippedRect ; - mutable wxRect m_cachedClippedClientRect ; - mutable wxRegion m_cachedClippedRegionWithOuterStructure ; - mutable wxRegion m_cachedClippedRegion ; - mutable wxRegion m_cachedClippedClientRegion ; - - // insets of the mac control from the wx top left corner - wxPoint m_macTopLeftInset ; - wxPoint m_macBottomRightInset ; - wxByte m_macAlpha ; - - wxScrollBar* m_hScrollBar ; - wxScrollBar* m_vScrollBar ; - bool m_hScrollBarAlwaysShown; - bool m_vScrollBarAlwaysShown; - wxWindow* m_growBox ; - wxString m_label ; - - bool m_isNativeWindowWrapper; - - // set to true if we do a sharp clip at the content area of this window - // must be dynamic as eg a panel normally is not clipping precisely, but if - // it becomes the target window of a scrolled window it has to... - bool m_clipChildren ; - - virtual bool MacIsChildOfClientArea( const wxWindow* child ) const ; - - bool MacHasScrollBarCorner() const; - void MacCreateScrollBars( long style ) ; - void MacRepositionScrollBars() ; - void MacUpdateControlFont() ; - - // implement the base class pure virtuals - virtual void DoGetTextExtent(const wxString& string, - int *x, int *y, - int *descent = NULL, - int *externalLeading = NULL, - const wxFont *theFont = NULL ) const wxOVERRIDE; - - virtual void DoEnable( bool enable ) wxOVERRIDE; -#if wxUSE_MENUS - virtual bool DoPopupMenu( wxMenu *menu, int x, int y ) wxOVERRIDE; -#endif - - virtual void DoFreeze() wxOVERRIDE; - virtual void DoThaw() wxOVERRIDE; - - virtual wxSize DoGetBestSize() const wxOVERRIDE; - virtual wxSize DoGetSizeFromClientSize( const wxSize & size ) const; - virtual void DoClientToScreen( int *x, int *y ) const wxOVERRIDE; - virtual void DoScreenToClient( int *x, int *y ) const wxOVERRIDE; - virtual void DoGetPosition( int *x, int *y ) const wxOVERRIDE; - virtual void DoGetSize( int *width, int *height ) const wxOVERRIDE; - virtual void DoGetClientSize( int *width, int *height ) const wxOVERRIDE; - virtual void DoSetSize(int x, int y, - int width, int height, - int sizeFlags = wxSIZE_AUTO) wxOVERRIDE; - virtual void DoSetClientSize(int width, int height) wxOVERRIDE; - - virtual void DoCaptureMouse() wxOVERRIDE; - virtual void DoReleaseMouse() wxOVERRIDE; - - // move the window to the specified location and resize it: this is called - // from both DoSetSize() and DoSetClientSize() and would usually just call - // ::MoveWindow() except for composite controls which will want to arrange - // themselves inside the given rectangle - virtual void DoMoveWindow( int x, int y, int width, int height ) wxOVERRIDE; - virtual void DoSetWindowVariant( wxWindowVariant variant ) wxOVERRIDE; - -#if wxUSE_TOOLTIPS - virtual void DoSetToolTip( wxToolTip *tip ) wxOVERRIDE; -#endif - - // common part of Show/HideWithEffect() - virtual bool OSXShowWithEffect(bool show, - wxShowEffect effect, - unsigned timeout); - -private: - wxOSXWidgetImpl * m_peer ; - // common part of all ctors - void Init(); - - // show/hide scrollbars as needed, common part of SetScrollbar() and - // AlwaysShowScrollbars() - void DoUpdateScrollbarVisibility(); - - wxDECLARE_NO_COPY_CLASS(wxWindowMac); - wxDECLARE_EVENT_TABLE(); -}; - -#endif // _WX_WINDOW_H_ diff --git a/Externals/wxWidgets3/include/wx/overlay.h b/Externals/wxWidgets3/include/wx/overlay.h deleted file mode 100644 index 57b87b48df..0000000000 --- a/Externals/wxWidgets3/include/wx/overlay.h +++ /dev/null @@ -1,94 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/overlay.h -// Purpose: wxOverlay class -// Author: Stefan Csomor -// Modified by: -// Created: 2006-10-20 -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_OVERLAY_H_ -#define _WX_OVERLAY_H_ - -#include "wx/defs.h" - -#if defined(__WXDFB__) - #define wxHAS_NATIVE_OVERLAY 1 -#else - // don't define wxHAS_NATIVE_OVERLAY -#endif - -// ---------------------------------------------------------------------------- -// creates an overlay over an existing window, allowing for manipulations like -// rubberbanding etc. This API is not stable yet, not to be used outside wx -// internal code -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxOverlayImpl; -class WXDLLIMPEXP_FWD_CORE wxDC; - -class WXDLLIMPEXP_CORE wxOverlay -{ -public: - wxOverlay(); - ~wxOverlay(); - - // clears the overlay without restoring the former state - // to be done eg when the window content has been changed and repainted - void Reset(); - - // returns (port-specific) implementation of the overlay - wxOverlayImpl *GetImpl() { return m_impl; } - -private: - friend class WXDLLIMPEXP_FWD_CORE wxDCOverlay; - - // returns true if it has been setup - bool IsOk(); - - void Init(wxDC* dc, int x , int y , int width , int height); - - void BeginDrawing(wxDC* dc); - - void EndDrawing(wxDC* dc); - - void Clear(wxDC* dc); - - wxOverlayImpl* m_impl; - - bool m_inDrawing; - - - wxDECLARE_NO_COPY_CLASS(wxOverlay); -}; - - -class WXDLLIMPEXP_CORE wxDCOverlay -{ -public: - // connects this overlay to the corresponding drawing dc, if the overlay is - // not initialized yet this call will do so - wxDCOverlay(wxOverlay &overlay, wxDC *dc, int x , int y , int width , int height); - - // convenience wrapper that behaves the same using the entire area of the dc - wxDCOverlay(wxOverlay &overlay, wxDC *dc); - - // removes the connection between the overlay and the dc - virtual ~wxDCOverlay(); - - // clears the layer, restoring the state at the last init - void Clear(); - -private: - void Init(wxDC *dc, int x , int y , int width , int height); - - wxOverlay& m_overlay; - - wxDC* m_dc; - - - wxDECLARE_NO_COPY_CLASS(wxDCOverlay); -}; - -#endif // _WX_OVERLAY_H_ diff --git a/Externals/wxWidgets3/include/wx/ownerdrw.h b/Externals/wxWidgets3/include/wx/ownerdrw.h deleted file mode 100644 index 7ae3b71cb4..0000000000 --- a/Externals/wxWidgets3/include/wx/ownerdrw.h +++ /dev/null @@ -1,142 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/ownerdrw.h -// Purpose: interface for owner-drawn GUI elements -// Author: Vadim Zeitlin -// Modified by: Marcin Malich -// Created: 11.11.97 -// Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_OWNERDRW_H_BASE -#define _WX_OWNERDRW_H_BASE - -#include "wx/defs.h" - -#if wxUSE_OWNER_DRAWN - -#include "wx/font.h" -#include "wx/colour.h" - -class WXDLLIMPEXP_FWD_CORE wxDC; - -// ---------------------------------------------------------------------------- -// wxOwnerDrawn - a mix-in base class, derive from it to implement owner-drawn -// behaviour -// -// wxOwnerDrawn supports drawing of an item with non standard font, color and -// also supports 3 bitmaps: either a checked/unchecked bitmap for a checkable -// element or one unchangeable bitmap otherwise. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxOwnerDrawnBase -{ -public: - wxOwnerDrawnBase() - { - m_ownerDrawn = false; - m_margin = ms_defaultMargin; - } - - virtual ~wxOwnerDrawnBase() {} - - void SetFont(const wxFont& font) - { m_font = font; m_ownerDrawn = true; } - - wxFont& GetFont() const - { return (wxFont&) m_font; } - - - void SetTextColour(const wxColour& colText) - { m_colText = colText; m_ownerDrawn = true; } - - wxColour& GetTextColour() const - { return (wxColour&) m_colText; } - - void SetBackgroundColour(const wxColour& colBack) - { m_colBack = colBack; m_ownerDrawn = true; } - - wxColour& GetBackgroundColour() const - { return (wxColour&) m_colBack ; } - - - void SetMarginWidth(int width) - { m_margin = width; } - - int GetMarginWidth() const - { return m_margin; } - - static int GetDefaultMarginWidth() - { return ms_defaultMargin; } - - - // get item name (with mnemonics if exist) - virtual wxString GetName() const = 0; - - - // this function might seem strange, but if it returns false it means that - // no non-standard attribute are set, so there is no need for this control - // to be owner-drawn. Moreover, you can force owner-drawn to false if you - // want to change, say, the color for the item but only if it is owner-drawn - // (see wxMenuItem::wxMenuItem for example) - bool IsOwnerDrawn() const - { return m_ownerDrawn; } - - // switch on/off owner-drawing the item - void SetOwnerDrawn(bool ownerDrawn = true) - { m_ownerDrawn = ownerDrawn; } - - - // constants used in OnDrawItem - // (they have the same values as corresponding Win32 constants) - enum wxODAction - { - wxODDrawAll = 0x0001, // redraw entire control - wxODSelectChanged = 0x0002, // selection changed (see Status.Select) - wxODFocusChanged = 0x0004 // keyboard focus changed (see Status.Focus) - }; - - enum wxODStatus - { - wxODSelected = 0x0001, // control is currently selected - wxODGrayed = 0x0002, // item is to be grayed - wxODDisabled = 0x0004, // item is to be drawn as disabled - wxODChecked = 0x0008, // item is to be checked - wxODHasFocus = 0x0010, // item has the keyboard focus - wxODDefault = 0x0020, // item is the default item - wxODHidePrefix= 0x0100 // hide keyboard cues (w2k and xp only) - }; - - // virtual functions to implement drawing (return true if processed) - virtual bool OnMeasureItem(size_t *width, size_t *height); - virtual bool OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODStatus stat) = 0; - -protected: - - // get the font and colour to use, whether it is set or not - virtual void GetFontToUse(wxFont& font) const; - virtual void GetColourToUse(wxODStatus stat, wxColour& colText, wxColour& colBack) const; - -private: - bool m_ownerDrawn; // true if something is non standard - - wxFont m_font; // font to use for drawing - wxColour m_colText, // color ----"---"---"---- - m_colBack; // background color - - int m_margin; // space occupied by bitmap to the left of the item - - static int ms_defaultMargin; -}; - -// ---------------------------------------------------------------------------- -// include the platform-specific class declaration -// ---------------------------------------------------------------------------- - -#if defined(__WXMSW__) - #include "wx/msw/ownerdrw.h" -#endif - -#endif // wxUSE_OWNER_DRAWN - -#endif // _WX_OWNERDRW_H_BASE diff --git a/Externals/wxWidgets3/include/wx/palette.h b/Externals/wxWidgets3/include/wx/palette.h deleted file mode 100644 index 00aa960159..0000000000 --- a/Externals/wxWidgets3/include/wx/palette.h +++ /dev/null @@ -1,44 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/palette.h -// Purpose: Common header and base class for wxPalette -// Author: Julian Smart -// Modified by: -// Created: -// Copyright: (c) Julian Smart -// Licence: wxWindows Licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PALETTE_H_BASE_ -#define _WX_PALETTE_H_BASE_ - -#include "wx/defs.h" - -#if wxUSE_PALETTE - -#include "wx/object.h" -#include "wx/gdiobj.h" - -// wxPaletteBase -class WXDLLIMPEXP_CORE wxPaletteBase: public wxGDIObject -{ -public: - virtual ~wxPaletteBase() { } - - virtual int GetColoursCount() const { wxFAIL_MSG( wxT("not implemented") ); return 0; } -}; - -#if defined(__WXMSW__) - #include "wx/msw/palette.h" -#elif defined(__WXX11__) || defined(__WXMOTIF__) - #include "wx/x11/palette.h" -#elif defined(__WXGTK__) - #include "wx/generic/paletteg.h" -#elif defined(__WXMAC__) - #include "wx/osx/palette.h" -#elif defined(__WXQT__) - #include "wx/qt/palette.h" -#endif - -#endif // wxUSE_PALETTE - -#endif // _WX_PALETTE_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/panel.h b/Externals/wxWidgets3/include/wx/panel.h deleted file mode 100644 index e11db6728b..0000000000 --- a/Externals/wxWidgets3/include/wx/panel.h +++ /dev/null @@ -1,72 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/panel.h -// Purpose: Base header for wxPanel -// Author: Julian Smart -// Modified by: -// Created: -// Copyright: (c) Julian Smart -// (c) 2011 Vadim Zeitlin -// Licence: wxWindows Licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PANEL_H_BASE_ -#define _WX_PANEL_H_BASE_ - -// ---------------------------------------------------------------------------- -// headers and forward declarations -// ---------------------------------------------------------------------------- - -#include "wx/window.h" -#include "wx/containr.h" - -class WXDLLIMPEXP_FWD_CORE wxControlContainer; - -extern WXDLLIMPEXP_DATA_CORE(const char) wxPanelNameStr[]; - -// ---------------------------------------------------------------------------- -// wxPanel contains other controls and implements TAB traversal between them -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxPanelBase : public wxNavigationEnabled -{ -public: - wxPanelBase() { } - - // Derived classes should also provide this constructor: - /* - wxPanelBase(wxWindow *parent, - wxWindowID winid = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxTAB_TRAVERSAL | wxNO_BORDER, - const wxString& name = wxPanelNameStr); - */ - - // Pseudo ctor - bool Create(wxWindow *parent, - wxWindowID winid = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxTAB_TRAVERSAL | wxNO_BORDER, - const wxString& name = wxPanelNameStr); - - - // implementation from now on - // -------------------------- - - virtual void InitDialog() wxOVERRIDE; - -private: - wxDECLARE_NO_COPY_CLASS(wxPanelBase); -}; - -#if defined(__WXUNIVERSAL__) - #include "wx/univ/panel.h" -#elif defined(__WXMSW__) - #include "wx/msw/panel.h" -#else - #define wxHAS_GENERIC_PANEL - #include "wx/generic/panelg.h" -#endif - -#endif // _WX_PANELH_BASE_ diff --git a/Externals/wxWidgets3/include/wx/paper.h b/Externals/wxWidgets3/include/wx/paper.h deleted file mode 100644 index 19e6d26a45..0000000000 --- a/Externals/wxWidgets3/include/wx/paper.h +++ /dev/null @@ -1,121 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/paper.h -// Purpose: Paper database types and classes -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PAPERH__ -#define _WX_PAPERH__ - -#include "wx/defs.h" -#include "wx/event.h" -#include "wx/cmndata.h" -#include "wx/intl.h" -#include "wx/hashmap.h" - -/* - * Paper type: see defs.h for wxPaperSize enum. - * A wxPrintPaperType can have an id and a name, or just a name and wxPAPER_NONE, - * so you can add further paper types without needing new ids. - */ - -#ifdef __WXMSW__ -#define WXADDPAPER(paperId, platformId, name, w, h) AddPaperType(paperId, platformId, name, w, h) -#else -#define WXADDPAPER(paperId, platformId, name, w, h) AddPaperType(paperId, 0, name, w, h) -#endif - -class WXDLLIMPEXP_CORE wxPrintPaperType: public wxObject -{ -public: - wxPrintPaperType(); - - // platformId is a platform-specific id, such as in Windows, DMPAPER_... - wxPrintPaperType(wxPaperSize paperId, int platformId, const wxString& name, int w, int h); - - inline wxString GetName() const { return wxGetTranslation(m_paperName); } - inline wxPaperSize GetId() const { return m_paperId; } - inline int GetPlatformId() const { return m_platformId; } - - // Get width and height in tenths of a millimetre - inline int GetWidth() const { return m_width; } - inline int GetHeight() const { return m_height; } - - // Get size in tenths of a millimetre - inline wxSize GetSize() const { return wxSize(m_width, m_height); } - - // Get size in a millimetres - inline wxSize GetSizeMM() const { return wxSize(m_width/10, m_height/10); } - - // Get width and height in device units (1/72th of an inch) - wxSize GetSizeDeviceUnits() const ; - -public: - wxPaperSize m_paperId; - int m_platformId; - int m_width; // In tenths of a millimetre - int m_height; // In tenths of a millimetre - wxString m_paperName; - -private: - wxDECLARE_DYNAMIC_CLASS(wxPrintPaperType); -}; - -WX_DECLARE_STRING_HASH_MAP(wxPrintPaperType*, wxStringToPrintPaperTypeHashMap); - -class WXDLLIMPEXP_FWD_CORE wxPrintPaperTypeList; - -class WXDLLIMPEXP_CORE wxPrintPaperDatabase -{ -public: - wxPrintPaperDatabase(); - ~wxPrintPaperDatabase(); - - void CreateDatabase(); - void ClearDatabase(); - - void AddPaperType(wxPaperSize paperId, const wxString& name, int w, int h); - void AddPaperType(wxPaperSize paperId, int platformId, const wxString& name, int w, int h); - - // Find by name - wxPrintPaperType *FindPaperType(const wxString& name); - - // Find by size id - wxPrintPaperType *FindPaperType(wxPaperSize id); - - // Find by platform id - wxPrintPaperType *FindPaperTypeByPlatformId(int id); - - // Find by size - wxPrintPaperType *FindPaperType(const wxSize& size); - - // Convert name to size id - wxPaperSize ConvertNameToId(const wxString& name); - - // Convert size id to name - wxString ConvertIdToName(wxPaperSize paperId); - - // Get the paper size - wxSize GetSize(wxPaperSize paperId); - - // Get the paper size - wxPaperSize GetSize(const wxSize& size); - - // - wxPrintPaperType* Item(size_t index) const; - size_t GetCount() const; -private: - wxStringToPrintPaperTypeHashMap* m_map; - wxPrintPaperTypeList* m_list; - //wxDECLARE_DYNAMIC_CLASS(wxPrintPaperDatabase); -}; - -extern WXDLLIMPEXP_DATA_CORE(wxPrintPaperDatabase*) wxThePrintPaperDatabase; - - -#endif - // _WX_PAPERH__ diff --git a/Externals/wxWidgets3/include/wx/pen.h b/Externals/wxWidgets3/include/wx/pen.h deleted file mode 100644 index e7eb2ff4a1..0000000000 --- a/Externals/wxWidgets3/include/wx/pen.h +++ /dev/null @@ -1,156 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/pen.h -// Purpose: Base header for wxPen -// Author: Julian Smart -// Modified by: -// Created: -// Copyright: (c) Julian Smart -// Licence: wxWindows Licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PEN_H_BASE_ -#define _WX_PEN_H_BASE_ - -#include "wx/gdiobj.h" -#include "wx/gdicmn.h" - -enum wxPenStyle -{ - wxPENSTYLE_INVALID = -1, - - wxPENSTYLE_SOLID = wxSOLID, - wxPENSTYLE_DOT = wxDOT, - wxPENSTYLE_LONG_DASH = wxLONG_DASH, - wxPENSTYLE_SHORT_DASH = wxSHORT_DASH, - wxPENSTYLE_DOT_DASH = wxDOT_DASH, - wxPENSTYLE_USER_DASH = wxUSER_DASH, - - wxPENSTYLE_TRANSPARENT = wxTRANSPARENT, - - wxPENSTYLE_STIPPLE_MASK_OPAQUE = wxSTIPPLE_MASK_OPAQUE, - wxPENSTYLE_STIPPLE_MASK = wxSTIPPLE_MASK, - wxPENSTYLE_STIPPLE = wxSTIPPLE, - - wxPENSTYLE_BDIAGONAL_HATCH = wxHATCHSTYLE_BDIAGONAL, - wxPENSTYLE_CROSSDIAG_HATCH = wxHATCHSTYLE_CROSSDIAG, - wxPENSTYLE_FDIAGONAL_HATCH = wxHATCHSTYLE_FDIAGONAL, - wxPENSTYLE_CROSS_HATCH = wxHATCHSTYLE_CROSS, - wxPENSTYLE_HORIZONTAL_HATCH = wxHATCHSTYLE_HORIZONTAL, - wxPENSTYLE_VERTICAL_HATCH = wxHATCHSTYLE_VERTICAL, - wxPENSTYLE_FIRST_HATCH = wxHATCHSTYLE_FIRST, - wxPENSTYLE_LAST_HATCH = wxHATCHSTYLE_LAST -}; - -enum wxPenJoin -{ - wxJOIN_INVALID = -1, - - wxJOIN_BEVEL = 120, - wxJOIN_MITER, - wxJOIN_ROUND -}; - -enum wxPenCap -{ - wxCAP_INVALID = -1, - - wxCAP_ROUND = 130, - wxCAP_PROJECTING, - wxCAP_BUTT -}; - - -class WXDLLIMPEXP_CORE wxPenBase : public wxGDIObject -{ -public: - virtual ~wxPenBase() { } - - virtual void SetColour(const wxColour& col) = 0; - virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) = 0; - - virtual void SetWidth(int width) = 0; - virtual void SetStyle(wxPenStyle style) = 0; - virtual void SetStipple(const wxBitmap& stipple) = 0; - virtual void SetDashes(int nb_dashes, const wxDash *dash) = 0; - virtual void SetJoin(wxPenJoin join) = 0; - virtual void SetCap(wxPenCap cap) = 0; - - virtual wxColour GetColour() const = 0; - virtual wxBitmap *GetStipple() const = 0; - virtual wxPenStyle GetStyle() const = 0; - virtual wxPenJoin GetJoin() const = 0; - virtual wxPenCap GetCap() const = 0; - virtual int GetWidth() const = 0; - virtual int GetDashes(wxDash **ptr) const = 0; - - // Convenient helpers for testing whether the pen is a transparent one: - // unlike GetStyle() == wxPENSTYLE_TRANSPARENT, they work correctly even if - // the pen is invalid (they both return false in this case). - bool IsTransparent() const - { - return IsOk() && GetStyle() == wxPENSTYLE_TRANSPARENT; - } - - bool IsNonTransparent() const - { - return IsOk() && GetStyle() != wxPENSTYLE_TRANSPARENT; - } -}; - -#if defined(__WXMSW__) - #include "wx/msw/pen.h" -#elif defined(__WXMOTIF__) || defined(__WXX11__) - #include "wx/x11/pen.h" -#elif defined(__WXGTK20__) - #include "wx/gtk/pen.h" -#elif defined(__WXGTK__) - #include "wx/gtk1/pen.h" -#elif defined(__WXDFB__) - #include "wx/dfb/pen.h" -#elif defined(__WXMAC__) - #include "wx/osx/pen.h" -#elif defined(__WXQT__) - #include "wx/qt/pen.h" -#endif - -class WXDLLIMPEXP_CORE wxPenList: public wxGDIObjListBase -{ -public: - wxPen *FindOrCreatePen(const wxColour& colour, - int width = 1, - wxPenStyle style = wxPENSTYLE_SOLID); - - wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants") - wxPen *FindOrCreatePen(const wxColour& colour, int width, int style) - { return FindOrCreatePen(colour, width, (wxPenStyle)style); } -}; - -extern WXDLLIMPEXP_DATA_CORE(wxPenList*) wxThePenList; - -// provide comparison operators to allow code such as -// -// if ( pen.GetStyle() == wxTRANSPARENT ) -// -// to compile without warnings which it would otherwise provoke from some -// compilers as it compares elements of different enums - -// Unfortunately some compilers have ambiguity issues when enum comparisons are -// overloaded so we have to disable the overloads in this case, see -// wxCOMPILER_NO_OVERLOAD_ON_ENUM definition in wx/platform.h for more details. -#ifndef wxCOMPILER_NO_OVERLOAD_ON_ENUM - -wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants") -inline bool operator==(wxPenStyle s, wxDeprecatedGUIConstants t) -{ - return static_cast(s) == static_cast(t); -} - -wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants") -inline bool operator!=(wxPenStyle s, wxDeprecatedGUIConstants t) -{ - return static_cast(s) != static_cast(t); -} - -#endif // wxCOMPILER_NO_OVERLOAD_ON_ENUM - -#endif // _WX_PEN_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/persist.h b/Externals/wxWidgets3/include/wx/persist.h deleted file mode 100644 index 757fad0355..0000000000 --- a/Externals/wxWidgets3/include/wx/persist.h +++ /dev/null @@ -1,254 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/persist.h -// Purpose: common classes for persistence support -// Author: Vadim Zeitlin -// Created: 2009-01-18 -// Copyright: (c) 2009 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PERSIST_H_ -#define _WX_PERSIST_H_ - -#include "wx/string.h" -#include "wx/hashmap.h" -#include "wx/confbase.h" - -class wxPersistentObject; - -WX_DECLARE_VOIDPTR_HASH_MAP(wxPersistentObject *, wxPersistentObjectsMap); - -// ---------------------------------------------------------------------------- -// global functions -// ---------------------------------------------------------------------------- - -/* - We do _not_ declare this function as doing this would force us to specialize - it for the user classes deriving from the standard persistent classes. - However we do define overloads of wxCreatePersistentObject() for all the wx - classes which means that template wxPersistentObject::Restore() picks up the - right overload to use provided that the header defining the correct overload - is included before calling it. And a compilation error happens if this is - not done. - -template -wxPersistentObject *wxCreatePersistentObject(T *obj); - - */ - -// ---------------------------------------------------------------------------- -// wxPersistenceManager: global aspects of persistent windows -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxPersistenceManager -{ -public: - // Call this method to specify a non-default persistence manager to use. - // This function should usually be called very early to affect creation of - // all persistent controls and the object passed to it must have a lifetime - // long enough to be still alive when the persistent controls are destroyed - // and need it to save their state so typically this would be a global or a - // wxApp member. - static void Set(wxPersistenceManager& manager); - - // accessor to the unique persistence manager object - static wxPersistenceManager& Get(); - - // trivial but virtual dtor - virtual ~wxPersistenceManager(); - - - // globally disable restoring or saving the persistent properties (both are - // enabled by default) - void DisableSaving() { m_doSave = false; } - void DisableRestoring() { m_doRestore = false; } - - - // register an object with the manager: when using the first overload, - // wxCreatePersistentObject() must be specialized for this object class; - // with the second one the persistent adapter is created by the caller - // - // the object shouldn't be already registered with us - template - wxPersistentObject *Register(T *obj) - { - return Register(obj, wxCreatePersistentObject(obj)); - } - - wxPersistentObject *Register(void *obj, wxPersistentObject *po); - - // check if the object is registered and return the associated - // wxPersistentObject if it is or NULL otherwise - wxPersistentObject *Find(void *obj) const; - - // unregister the object, this is called by wxPersistentObject itself so - // there is usually no need to do it explicitly - // - // deletes the associated wxPersistentObject - void Unregister(void *obj); - - - // save/restore the state of an object - // - // these methods do nothing if DisableSaving/Restoring() was called - // - // Restore() returns true if the object state was really restored - void Save(void *obj); - bool Restore(void *obj); - - // combines both Save() and Unregister() calls - void SaveAndUnregister(void *obj) - { - Save(obj); - Unregister(obj); - } - - // combines both Register() and Restore() calls - template - bool RegisterAndRestore(T *obj) - { - return Register(obj) && Restore(obj); - } - - bool RegisterAndRestore(void *obj, wxPersistentObject *po) - { - return Register(obj, po) && Restore(obj); - } - - - // methods used by the persistent objects to save and restore the data - // - // currently these methods simply use wxConfig::Get() but they may be - // overridden in the derived class (once we allow creating custom - // persistent managers) -#define wxPERSIST_DECLARE_SAVE_RESTORE_FOR(Type) \ - virtual bool SaveValue(const wxPersistentObject& who, \ - const wxString& name, \ - Type value); \ - \ - virtual bool \ - RestoreValue(const wxPersistentObject& who, \ - const wxString& name, \ - Type *value) - - wxPERSIST_DECLARE_SAVE_RESTORE_FOR(bool); - wxPERSIST_DECLARE_SAVE_RESTORE_FOR(int); - wxPERSIST_DECLARE_SAVE_RESTORE_FOR(long); - wxPERSIST_DECLARE_SAVE_RESTORE_FOR(wxString); - -#undef wxPERSIST_DECLARE_SAVE_RESTORE_FOR - -protected: - // ctor is private, use Get() - wxPersistenceManager() - { - m_doSave = - m_doRestore = true; - } - - - // Return the config object to use, by default just the global one but a - // different one could be used by the derived class if needed. - virtual wxConfigBase *GetConfig() const { return wxConfigBase::Get(); } - - // Return the path to use for saving the setting with the given name for - // the specified object (notice that the name is the name of the setting, - // not the name of the object itself which can be retrieved with GetName()). - virtual wxString GetKey(const wxPersistentObject& who, - const wxString& name) const; - - -private: - // map with the registered objects as keys and associated - // wxPersistentObjects as values - wxPersistentObjectsMap m_persistentObjects; - - // true if we should restore/save the settings (it doesn't make much sense - // to use this class when both of them are false but setting one of them to - // false may make sense in some situations) - bool m_doSave, - m_doRestore; - - wxDECLARE_NO_COPY_CLASS(wxPersistenceManager); -}; - -// ---------------------------------------------------------------------------- -// wxPersistentObject: ABC for anything persistent -// ---------------------------------------------------------------------------- - -class wxPersistentObject -{ -public: - // ctor associates us with the object whose options we save/restore - wxPersistentObject(void *obj) : m_obj(obj) { } - - // trivial but virtual dtor - virtual ~wxPersistentObject() { } - - - // methods used by wxPersistenceManager - // ------------------------------------ - - // save/restore the corresponding objects settings - // - // these methods shouldn't be used directly as they don't respect the - // global wxPersistenceManager::DisableSaving/Restoring() settings, use - // wxPersistenceManager methods with the same name instead - virtual void Save() const = 0; - virtual bool Restore() = 0; - - - // get the kind of the objects we correspond to, e.g. "Frame" - virtual wxString GetKind() const = 0; - - // get the name of the object we correspond to, e.g. "Main" - virtual wxString GetName() const = 0; - - - // return the associated object - void *GetObject() const { return m_obj; } - -protected: - // wrappers for wxPersistenceManager methods which don't require passing - // "this" as the first parameter all the time - template - bool SaveValue(const wxString& name, T value) const - { - return wxPersistenceManager::Get().SaveValue(*this, name, value); - } - - template - bool RestoreValue(const wxString& name, T *value) - { - return wxPersistenceManager::Get().RestoreValue(*this, name, value); - } - -private: - void * const m_obj; - - wxDECLARE_NO_COPY_CLASS(wxPersistentObject); -}; - -// Helper function calling RegisterAndRestore() on the global persistence -// manager object. -template -inline bool wxPersistentRegisterAndRestore(T *obj) -{ - wxPersistentObject * const pers = wxCreatePersistentObject(obj); - - return wxPersistenceManager::Get().RegisterAndRestore(obj, pers); - -} - -// A helper function which also sets the name for the (wxWindow-derived) object -// before registering and restoring it. -template -inline bool wxPersistentRegisterAndRestore(T *obj, const wxString& name) -{ - obj->SetName(name); - - return wxPersistentRegisterAndRestore(obj); -} - -#endif // _WX_PERSIST_H_ - diff --git a/Externals/wxWidgets3/include/wx/persist/bookctrl.h b/Externals/wxWidgets3/include/wx/persist/bookctrl.h deleted file mode 100644 index 6b48ebe0b4..0000000000 --- a/Externals/wxWidgets3/include/wx/persist/bookctrl.h +++ /dev/null @@ -1,66 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/persist/bookctrl.h -// Purpose: persistence support for wxBookCtrl -// Author: Vadim Zeitlin -// Created: 2009-01-19 -// Copyright: (c) 2009 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PERSIST_BOOKCTRL_H_ -#define _WX_PERSIST_BOOKCTRL_H_ - -#include "wx/persist/window.h" - -#include "wx/bookctrl.h" - -// ---------------------------------------------------------------------------- -// string constants used by wxPersistentBookCtrl -// ---------------------------------------------------------------------------- - -#define wxPERSIST_BOOK_KIND "Book" - -#define wxPERSIST_BOOK_SELECTION "Selection" - -// ---------------------------------------------------------------------------- -// wxPersistentBookCtrl: supports saving/restoring book control selection -// ---------------------------------------------------------------------------- - -class wxPersistentBookCtrl : public wxPersistentWindow -{ -public: - wxPersistentBookCtrl(wxBookCtrlBase *book) - : wxPersistentWindow(book) - { - } - - virtual void Save() const wxOVERRIDE - { - SaveValue(wxPERSIST_BOOK_SELECTION, Get()->GetSelection()); - } - - virtual bool Restore() wxOVERRIDE - { - long sel; - if ( RestoreValue(wxPERSIST_BOOK_SELECTION, &sel) ) - { - wxBookCtrlBase * const book = Get(); - if ( sel >= 0 && (unsigned)sel < book->GetPageCount() ) - { - book->SetSelection(sel); - return true; - } - } - - return false; - } - - virtual wxString GetKind() const wxOVERRIDE { return wxPERSIST_BOOK_KIND; } -}; - -inline wxPersistentObject *wxCreatePersistentObject(wxBookCtrlBase *book) -{ - return new wxPersistentBookCtrl(book); -} - -#endif // _WX_PERSIST_BOOKCTRL_H_ diff --git a/Externals/wxWidgets3/include/wx/persist/splitter.h b/Externals/wxWidgets3/include/wx/persist/splitter.h deleted file mode 100644 index 46979d673f..0000000000 --- a/Externals/wxWidgets3/include/wx/persist/splitter.h +++ /dev/null @@ -1,68 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/persist/splitter.h -// Purpose: Persistence support for wxSplitterWindow. -// Author: Vadim Zeitlin -// Created: 2011-08-31 -// Copyright: (c) 2011 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PERSIST_SPLITTER_H_ -#define _WX_PERSIST_SPLITTER_H_ - -#include "wx/persist/window.h" - -#include "wx/splitter.h" - -// ---------------------------------------------------------------------------- -// string constants used by wxPersistentSplitter -// ---------------------------------------------------------------------------- - -#define wxPERSIST_SPLITTER_KIND "Splitter" - -// Special position value of -1 means the splitter is not split at all. -#define wxPERSIST_SPLITTER_POSITION "Position" - -// ---------------------------------------------------------------------------- -// wxPersistentSplitter: supports saving/restoring splitter position -// ---------------------------------------------------------------------------- - -class wxPersistentSplitter : public wxPersistentWindow -{ -public: - wxPersistentSplitter(wxSplitterWindow* splitter) - : wxPersistentWindow(splitter) - { - } - - virtual void Save() const wxOVERRIDE - { - wxSplitterWindow* const splitter = Get(); - - int pos = splitter->IsSplit() ? splitter->GetSashPosition() : -1; - SaveValue(wxPERSIST_SPLITTER_POSITION, pos); - } - - virtual bool Restore() wxOVERRIDE - { - int pos; - if ( !RestoreValue(wxPERSIST_SPLITTER_POSITION, &pos) ) - return false; - - if ( pos == -1 ) - Get()->Unsplit(); - else - Get()->SetSashPosition(pos); - - return true; - } - - virtual wxString GetKind() const wxOVERRIDE { return wxPERSIST_SPLITTER_KIND; } -}; - -inline wxPersistentObject *wxCreatePersistentObject(wxSplitterWindow* splitter) -{ - return new wxPersistentSplitter(splitter); -} - -#endif // _WX_PERSIST_SPLITTER_H_ diff --git a/Externals/wxWidgets3/include/wx/persist/toplevel.h b/Externals/wxWidgets3/include/wx/persist/toplevel.h deleted file mode 100644 index 722a66af59..0000000000 --- a/Externals/wxWidgets3/include/wx/persist/toplevel.h +++ /dev/null @@ -1,145 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/persist/toplevel.h -// Purpose: persistence support for wxTLW -// Author: Vadim Zeitlin -// Created: 2009-01-19 -// Copyright: (c) 2009 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PERSIST_TOPLEVEL_H_ -#define _WX_PERSIST_TOPLEVEL_H_ - -#include "wx/persist/window.h" - -#include "wx/toplevel.h" -#include "wx/display.h" - -// ---------------------------------------------------------------------------- -// string constants used by wxPersistentTLW -// ---------------------------------------------------------------------------- - -// we use just "Window" to keep configuration files and such short, there -// should be no confusion with wxWindow itself as we don't have persistent -// windows, just persistent controls which have their own specific kind strings -#define wxPERSIST_TLW_KIND "Window" - -// names for various persistent options -#define wxPERSIST_TLW_X "x" -#define wxPERSIST_TLW_Y "y" -#define wxPERSIST_TLW_W "w" -#define wxPERSIST_TLW_H "h" - -#define wxPERSIST_TLW_MAXIMIZED "Maximized" -#define wxPERSIST_TLW_ICONIZED "Iconized" - -// ---------------------------------------------------------------------------- -// wxPersistentTLW: supports saving/restoring window position and size as well -// as maximized/iconized/restore state -// ---------------------------------------------------------------------------- - -class wxPersistentTLW : public wxPersistentWindow -{ -public: - wxPersistentTLW(wxTopLevelWindow *tlw) - : wxPersistentWindow(tlw) - { - } - - virtual void Save() const wxOVERRIDE - { - const wxTopLevelWindow * const tlw = Get(); - - const wxPoint pos = tlw->GetScreenPosition(); - SaveValue(wxPERSIST_TLW_X, pos.x); - SaveValue(wxPERSIST_TLW_Y, pos.y); - - // notice that we use GetSize() here and not GetClientSize() because - // the latter doesn't return correct results for the minimized windows - // (at least not under Windows) - // - // of course, it shouldn't matter anyhow usually, the client size - // should be preserved as well unless the size of the decorations - // changed between the runs - const wxSize size = tlw->GetSize(); - SaveValue(wxPERSIST_TLW_W, size.x); - SaveValue(wxPERSIST_TLW_H, size.y); - - SaveValue(wxPERSIST_TLW_MAXIMIZED, tlw->IsMaximized()); - SaveValue(wxPERSIST_TLW_ICONIZED, tlw->IsIconized()); -#ifdef __WXGTK20__ - SaveValue("decor_l", tlw->m_decorSize.left); - SaveValue("decor_r", tlw->m_decorSize.right); - SaveValue("decor_t", tlw->m_decorSize.top); - SaveValue("decor_b", tlw->m_decorSize.bottom); -#endif - } - - virtual bool Restore() wxOVERRIDE - { - wxTopLevelWindow * const tlw = Get(); - - long x wxDUMMY_INITIALIZE(-1), - y wxDUMMY_INITIALIZE(-1), - w wxDUMMY_INITIALIZE(-1), - h wxDUMMY_INITIALIZE(-1); - const bool hasPos = RestoreValue(wxPERSIST_TLW_X, &x) && - RestoreValue(wxPERSIST_TLW_Y, &y); - const bool hasSize = RestoreValue(wxPERSIST_TLW_W, &w) && - RestoreValue(wxPERSIST_TLW_H, &h); -#ifdef __WXGTK20__ - wxTopLevelWindowGTK::DecorSize decorSize; - if (tlw->m_decorSize.top == 0 && - RestoreValue("decor_l", &decorSize.left) && - RestoreValue("decor_r", &decorSize.right) && - RestoreValue("decor_t", &decorSize.top) && - RestoreValue("decor_b", &decorSize.bottom)) - { - tlw->m_decorSize = decorSize; - } -#endif - - if ( hasPos ) - { - // to avoid making the window completely invisible if it had been - // shown on a monitor which was disconnected since the last run - // (this is pretty common for notebook with external displays) - // - // NB: we should allow window position to be (slightly) off screen, - // it's not uncommon to position the window so that its upper - // left corner has slightly negative coordinate - if ( wxDisplay::GetFromPoint(wxPoint(x, y)) != wxNOT_FOUND || - (hasSize && wxDisplay::GetFromPoint( - wxPoint(x + w, y + h)) != wxNOT_FOUND) ) - { - tlw->Move(x, y, wxSIZE_ALLOW_MINUS_ONE); - } - //else: should we try to adjust position/size somehow? - } - - if ( hasSize ) - tlw->SetSize(w, h); - - // note that the window can be both maximized and iconized - bool maximized; - if ( RestoreValue(wxPERSIST_TLW_MAXIMIZED, &maximized) && maximized ) - tlw->Maximize(); - - bool iconized; - if ( RestoreValue(wxPERSIST_TLW_ICONIZED, &iconized) && iconized ) - tlw->Iconize(); - - // the most important property of the window that we restore is its - // size, so disregard the value of hasPos here - return hasSize; - } - - virtual wxString GetKind() const wxOVERRIDE { return wxPERSIST_TLW_KIND; } -}; - -inline wxPersistentObject *wxCreatePersistentObject(wxTopLevelWindow *tlw) -{ - return new wxPersistentTLW(tlw); -} - -#endif // _WX_PERSIST_TOPLEVEL_H_ diff --git a/Externals/wxWidgets3/include/wx/persist/treebook.h b/Externals/wxWidgets3/include/wx/persist/treebook.h deleted file mode 100644 index 9a38296879..0000000000 --- a/Externals/wxWidgets3/include/wx/persist/treebook.h +++ /dev/null @@ -1,96 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/persist/treebook.h -// Purpose: persistence support for wxBookCtrl -// Author: Vadim Zeitlin -// Created: 2009-01-19 -// Copyright: (c) 2009 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PERSIST_TREEBOOK_H_ -#define _WX_PERSIST_TREEBOOK_H_ - -#include "wx/persist/bookctrl.h" - -#include "wx/arrstr.h" -#include "wx/treebook.h" - -// ---------------------------------------------------------------------------- -// string constants used by wxPersistentTreeBookCtrl -// ---------------------------------------------------------------------------- - -#define wxPERSIST_TREEBOOK_KIND "TreeBook" - -// this key contains the indices of all expanded nodes in the tree book -// separated by wxPERSIST_TREEBOOK_EXPANDED_SEP -#define wxPERSIST_TREEBOOK_EXPANDED_BRANCHES "Expanded" -#define wxPERSIST_TREEBOOK_EXPANDED_SEP ',' - -// ---------------------------------------------------------------------------- -// wxPersistentTreeBookCtrl: supports saving/restoring open tree branches -// ---------------------------------------------------------------------------- - -class wxPersistentTreeBookCtrl : public wxPersistentBookCtrl -{ -public: - wxPersistentTreeBookCtrl(wxTreebook *book) - : wxPersistentBookCtrl(book) - { - } - - virtual void Save() const wxOVERRIDE - { - const wxTreebook * const book = GetTreeBook(); - - wxString expanded; - const size_t count = book->GetPageCount(); - for ( size_t n = 0; n < count; n++ ) - { - if ( book->IsNodeExpanded(n) ) - { - if ( !expanded.empty() ) - expanded += wxPERSIST_TREEBOOK_EXPANDED_SEP; - - expanded += wxString::Format("%u", static_cast(n)); - } - } - - SaveValue(wxPERSIST_TREEBOOK_EXPANDED_BRANCHES, expanded); - - wxPersistentBookCtrl::Save(); - } - - virtual bool Restore() wxOVERRIDE - { - wxTreebook * const book = GetTreeBook(); - - wxString expanded; - if ( RestoreValue(wxPERSIST_TREEBOOK_EXPANDED_BRANCHES, &expanded) ) - { - const wxArrayString - indices(wxSplit(expanded, wxPERSIST_TREEBOOK_EXPANDED_SEP)); - - const size_t pageCount = book->GetPageCount(); - const size_t count = indices.size(); - for ( size_t n = 0; n < count; n++ ) - { - unsigned long idx; - if ( indices[n].ToULong(&idx) && idx < pageCount ) - book->ExpandNode(idx); - } - } - - return wxPersistentBookCtrl::Restore(); - } - - virtual wxString GetKind() const wxOVERRIDE { return wxPERSIST_TREEBOOK_KIND; } - - wxTreebook *GetTreeBook() const { return static_cast(Get()); } -}; - -inline wxPersistentObject *wxCreatePersistentObject(wxTreebook *book) -{ - return new wxPersistentTreeBookCtrl(book); -} - -#endif // _WX_PERSIST_TREEBOOK_H_ diff --git a/Externals/wxWidgets3/include/wx/persist/window.h b/Externals/wxWidgets3/include/wx/persist/window.h deleted file mode 100644 index db163a2f1a..0000000000 --- a/Externals/wxWidgets3/include/wx/persist/window.h +++ /dev/null @@ -1,76 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/persist/window.h -// Purpose: wxPersistentWindow declaration -// Author: Vadim Zeitlin -// Created: 2009-01-23 -// Copyright: (c) 2009 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PERSIST_WINDOW_H_ -#define _WX_PERSIST_WINDOW_H_ - -#include "wx/persist.h" - -#include "wx/window.h" - -// ---------------------------------------------------------------------------- -// wxPersistentWindow: base class for persistent windows, uses the window name -// as persistent name by default and automatically reacts -// to the window destruction -// ---------------------------------------------------------------------------- - -// type-independent part of wxPersistentWindow -class wxPersistentWindowBase : public wxPersistentObject -{ -public: - wxPersistentWindowBase(wxWindow *win) - : wxPersistentObject(win) - { - win->Bind(wxEVT_DESTROY, &wxPersistentWindowBase::HandleDestroy, this); - } - - virtual wxString GetName() const wxOVERRIDE - { - const wxString name = GetWindow()->GetName(); - wxASSERT_MSG( !name.empty(), "persistent windows should be named!" ); - - return name; - } - -protected: - wxWindow *GetWindow() const { return static_cast(GetObject()); } - -private: - void HandleDestroy(wxWindowDestroyEvent& event) - { - event.Skip(); - - // only react to the destruction of this object itself, not of any of - // its children - if ( event.GetEventObject() == GetObject() ) - { - // this will delete this object itself - wxPersistenceManager::Get().SaveAndUnregister(GetWindow()); - } - } - - wxDECLARE_NO_COPY_CLASS(wxPersistentWindowBase); -}; - -template -class wxPersistentWindow : public wxPersistentWindowBase -{ -public: - typedef T WindowType; - - wxPersistentWindow(WindowType *win) - : wxPersistentWindowBase(win) - { - } - - WindowType *Get() const { return static_cast(GetWindow()); } -}; - -#endif // _WX_PERSIST_WINDOW_H_ - diff --git a/Externals/wxWidgets3/include/wx/pickerbase.h b/Externals/wxWidgets3/include/wx/pickerbase.h deleted file mode 100644 index f4ec165784..0000000000 --- a/Externals/wxWidgets3/include/wx/pickerbase.h +++ /dev/null @@ -1,176 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/pickerbase.h -// Purpose: wxPickerBase definition -// Author: Francesco Montorsi (based on Vadim Zeitlin's code) -// Modified by: -// Created: 14/4/2006 -// Copyright: (c) Vadim Zeitlin, Francesco Montorsi -// Licence: wxWindows Licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PICKERBASE_H_BASE_ -#define _WX_PICKERBASE_H_BASE_ - -#include "wx/control.h" -#include "wx/sizer.h" -#include "wx/containr.h" - -class WXDLLIMPEXP_FWD_CORE wxTextCtrl; -class WXDLLIMPEXP_FWD_CORE wxToolTip; - -extern WXDLLIMPEXP_DATA_CORE(const char) wxButtonNameStr[]; - -// ---------------------------------------------------------------------------- -// wxPickerBase is the base class for the picker controls which support -// a wxPB_USE_TEXTCTRL style; i.e. for those pickers which can use an auxiliary -// text control next to the 'real' picker. -// -// The wxTextPickerHelper class manages enabled/disabled state of the text control, -// its sizing and positioning. -// ---------------------------------------------------------------------------- - -#define wxPB_USE_TEXTCTRL 0x0002 -#define wxPB_SMALL 0x8000 - -class WXDLLIMPEXP_CORE wxPickerBase : public wxNavigationEnabled -{ -public: - // ctor: text is the associated text control - wxPickerBase() : m_text(NULL), m_picker(NULL), m_sizer(NULL) - { } - virtual ~wxPickerBase() {} - - - // if present, intercepts wxPB_USE_TEXTCTRL style and creates the text control - // The 3rd argument is the initial wxString to display in the text control - bool CreateBase(wxWindow *parent, - wxWindowID id, - const wxString& text = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr); - -public: // public API - - // margin between the text control and the picker - void SetInternalMargin(int newmargin) - { GetTextCtrlItem()->SetBorder(newmargin); m_sizer->Layout(); } - int GetInternalMargin() const - { return GetTextCtrlItem()->GetBorder(); } - - // proportion of the text control - void SetTextCtrlProportion(int prop) - { GetTextCtrlItem()->SetProportion(prop); m_sizer->Layout(); } - int GetTextCtrlProportion() const - { return GetTextCtrlItem()->GetProportion(); } - - // proportion of the picker control - void SetPickerCtrlProportion(int prop) - { GetPickerCtrlItem()->SetProportion(prop); m_sizer->Layout(); } - int GetPickerCtrlProportion() const - { return GetPickerCtrlItem()->GetProportion(); } - - bool IsTextCtrlGrowable() const - { return (GetTextCtrlItem()->GetFlag() & wxGROW) != 0; } - void SetTextCtrlGrowable(bool grow = true) - { - int f = GetDefaultTextCtrlFlag(); - if ( grow ) - f |= wxGROW; - else - f &= ~wxGROW; - - GetTextCtrlItem()->SetFlag(f); - } - - bool IsPickerCtrlGrowable() const - { return (GetPickerCtrlItem()->GetFlag() & wxGROW) != 0; } - void SetPickerCtrlGrowable(bool grow = true) - { - int f = GetDefaultPickerCtrlFlag(); - if ( grow ) - { - f &= ~wxALIGN_MASK; - f |= wxGROW; - } - - GetPickerCtrlItem()->SetFlag(f); - } - - bool HasTextCtrl() const - { return m_text != NULL; } - wxTextCtrl *GetTextCtrl() - { return m_text; } - wxControl *GetPickerCtrl() - { return m_picker; } - - void SetTextCtrl(wxTextCtrl* text) - { m_text = text; } - void SetPickerCtrl(wxControl* picker) - { m_picker = picker; } - - // methods that derived class must/may override - virtual void UpdatePickerFromTextCtrl() = 0; - virtual void UpdateTextCtrlFromPicker() = 0; - -protected: - // overridden base class methods -#if wxUSE_TOOLTIPS - virtual void DoSetToolTip(wxToolTip *tip) wxOVERRIDE; -#endif // wxUSE_TOOLTIPS - - - // event handlers - void OnTextCtrlDelete(wxWindowDestroyEvent &); - void OnTextCtrlUpdate(wxCommandEvent &); - void OnTextCtrlKillFocus(wxFocusEvent &); - - // returns the set of styles for the attached wxTextCtrl - // from given wxPickerBase's styles - virtual long GetTextCtrlStyle(long style) const - { return (style & wxWINDOW_STYLE_MASK); } - - // returns the set of styles for the m_picker - virtual long GetPickerStyle(long style) const - { return (style & wxWINDOW_STYLE_MASK); } - - - wxSizerItem *GetPickerCtrlItem() const - { - if (this->HasTextCtrl()) - return m_sizer->GetItem((size_t)1); - return m_sizer->GetItem((size_t)0); - } - - wxSizerItem *GetTextCtrlItem() const - { - wxASSERT(this->HasTextCtrl()); - return m_sizer->GetItem((size_t)0); - } - - int GetDefaultPickerCtrlFlag() const - { - return wxALIGN_CENTER_VERTICAL; - } - - int GetDefaultTextCtrlFlag() const - { - return wxALIGN_CENTER_VERTICAL | wxRIGHT; - } - - void PostCreation(); - -protected: - wxTextCtrl *m_text; // can be NULL - wxControl *m_picker; - wxBoxSizer *m_sizer; - -private: - wxDECLARE_ABSTRACT_CLASS(wxPickerBase); -}; - - -#endif - // _WX_PICKERBASE_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/platform.h b/Externals/wxWidgets3/include/wx/platform.h deleted file mode 100644 index b490d52a96..0000000000 --- a/Externals/wxWidgets3/include/wx/platform.h +++ /dev/null @@ -1,592 +0,0 @@ -/** -* Name: wx/platform.h -* Purpose: define the OS and compiler identification macros -* Author: Vadim Zeitlin -* Modified by: -* Created: 29.10.01 (extracted from wx/defs.h) -* Copyright: (c) 1997-2001 Vadim Zeitlin -* Licence: wxWindows licence -*/ - -/* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */ - -#ifndef _WX_PLATFORM_H_ -#define _WX_PLATFORM_H_ - -#ifdef __WXMAC_XCODE__ -# include -# include -# include -# ifndef MAC_OS_X_VERSION_10_4 -# define MAC_OS_X_VERSION_10_4 1040 -# endif -# ifndef MAC_OS_X_VERSION_10_5 -# define MAC_OS_X_VERSION_10_5 1050 -# endif -# ifndef MAC_OS_X_VERSION_10_6 -# define MAC_OS_X_VERSION_10_6 1060 -# endif -# ifndef MAC_OS_X_VERSION_10_7 -# define MAC_OS_X_VERSION_10_7 1070 -# endif -# ifndef MAC_OS_X_VERSION_10_8 -# define MAC_OS_X_VERSION_10_8 1080 -# endif -# ifndef MAC_OS_X_VERSION_10_9 -# define MAC_OS_X_VERSION_10_9 1090 -# endif -# ifndef MAC_OS_X_VERSION_10_10 -# define MAC_OS_X_VERSION_10_10 101000 -# endif -# include "wx/osx/config_xcode.h" -# ifndef __WXOSX__ -# define __WXOSX__ 1 -# endif -# ifndef __WXMAC__ -# define __WXMAC__ 1 -# endif -#endif - -/* - We use __WINDOWS__ as our main identification symbol for Microsoft Windows - but it's actually not predefined directly by any commonly used compilers - (only Watcom defines it itself and it's not supported any longer), so we - define it ourselves if any of the following macros is defined: - - - MSVC _WIN32 (notice that this is also defined under Win64) - - Borland __WIN32__ - - Our __WXMSW__ which selects Windows as platform automatically - */ -#if defined(_WIN32) || defined(__WIN32__) || defined(__WXMSW__) -# ifndef __WINDOWS__ -# define __WINDOWS__ -# endif /* !__WINDOWS__ */ -#endif /* Any standard symbol indicating Windows */ - -#if defined(__WINDOWS__) - /* Select wxMSW under Windows if no other port is specified. */ -# if !defined(__WXMSW__) && !defined(__WXMOTIF__) && !defined(__WXGTK__) && !defined(__WXX11__) -# define __WXMSW__ -# endif - -# if !defined(__WINDOWS__) -# define __WINDOWS__ -# endif - -# ifndef _WIN32 -# define _WIN32 -# endif - -# ifndef WIN32 -# define WIN32 -# endif - -# ifndef __WIN32__ -# define __WIN32__ -# endif - - /* MSVC predefines _WIN64 for 64 bit builds, for gcc we use generic - architecture definitions. */ -# if defined(_WIN64) || defined(__x86_64__) -# ifndef __WIN64__ -# define __WIN64__ -# endif /* !__WIN64__ */ -# endif /* _WIN64 */ - -#endif /* __WINDOWS__ */ - -/* - Don't use widget toolkit specific code in non-GUI code in the library - itself to ensure that the same base library is used for both MSW and GTK - ports. But keep __WXMSW__ defined for (console) applications using - wxWidgets for compatibility. - */ -#if defined(WXBUILDING) && defined(wxUSE_GUI) && !wxUSE_GUI -# ifdef __WXMSW__ -# undef __WXMSW__ -# endif -# ifdef __WXGTK__ -# undef __WXGTK__ -# endif -#endif - -#if defined(__WXGTK__) && defined(__WINDOWS__) - -# ifdef __WXMSW__ -# undef __WXMSW__ -# endif - -#endif /* __WXGTK__ && __WINDOWS__ */ - -#ifdef __ANDROID__ -# define __WXANDROID__ -# include "wx/android/config_android.h" -#endif - -#include "wx/compiler.h" - -/* - Include wx/setup.h for the Unix platform defines generated by configure and - the library compilation options - - Note that it must be included before defining hardware symbols below as they - could be already defined by configure but it must be included after defining - the compiler macros above as msvc/wx/setup.h relies on them under Windows. - */ -#include "wx/setup.h" - -/* - Convenience for any optional classes that use the wxAnyButton base class. - */ -#if wxUSE_TOGGLEBTN || wxUSE_BUTTON - #define wxHAS_ANY_BUTTON -#endif - - -/* - Hardware platform detection. - - VC++ defines _M_xxx symbols. - */ -#if defined(_M_IX86) || defined(i386) || defined(__i386) || defined(__i386__) - #ifndef __INTEL__ - #define __INTEL__ - #endif -#endif /* x86 */ - -#if defined(_M_IA64) - #ifndef __IA64__ - #define __IA64__ - #endif -#endif /* ia64 */ - -#if defined(_M_MPPC) || defined(__PPC__) || defined(__ppc__) - #ifndef __POWERPC__ - #define __POWERPC__ - #endif -#endif /* alpha */ - -#if defined(_M_ALPHA) || defined(__AXP__) - #ifndef __ALPHA__ - #define __ALPHA__ - #endif -#endif /* alpha */ - - -/* - adjust the Unicode setting: wxUSE_UNICODE should be defined as 0 or 1 - and is used by wxWidgets, _UNICODE and/or UNICODE may be defined or used by - the system headers so bring these settings in sync - */ - -/* set wxUSE_UNICODE to 1 if UNICODE or _UNICODE is defined */ -#if defined(_UNICODE) || defined(UNICODE) -# undef wxUSE_UNICODE -# define wxUSE_UNICODE 1 -#else /* !UNICODE */ -# ifndef wxUSE_UNICODE -# define wxUSE_UNICODE 0 -# endif -#endif /* UNICODE/!UNICODE */ - -/* and vice versa: define UNICODE and _UNICODE if wxUSE_UNICODE is 1 */ -#if wxUSE_UNICODE -# ifndef _UNICODE -# define _UNICODE -# endif -# ifndef UNICODE -# define UNICODE -# endif -#endif /* wxUSE_UNICODE */ - - -/* - test for old versions of Borland C, normally need at least 5.82, Turbo - explorer, available for free at http://www.turboexplorer.com/downloads -*/ - - -/* - Older versions of Borland C have some compiler bugs that need - workarounds. Mostly pertains to the free command line compiler 5.5.1. -*/ -#if defined(__BORLANDC__) && (__BORLANDC__ <= 0x551) - /* - The Borland free compiler is unable to handle overloaded enum - comparisons under certain conditions e.g. when any class has a - conversion ctor for an integral type and there's an overload to - compare between an integral type and that class type. - */ -# define wxCOMPILER_NO_OVERLOAD_ON_ENUM - - /* - This is needed to overcome bugs in 5.5.1 STL, linking errors will - result if it is not defined. - */ -# define _RWSTD_COMPILE_INSTANTIATE - - /* - Preprocessor in older Borland compilers have major problems - concatenating with ##. Specifically, if the string operands being - concatenated have special meaning (e.g. L"str", 123i64 etc) - then ## will not concatenate the operands correctly. - - As a workaround, define wxPREPEND* and wxAPPEND* without using - wxCONCAT_HELPER. - */ -# define wxCOMPILER_BROKEN_CONCAT_OPER -#endif /* __BORLANDC__ */ - -/* - OS: then test for generic Unix defines, then for particular flavours and - finally for Unix-like systems - Mac OS X matches this case (__MACH__), prior Mac OS do not. - */ -#if defined(__UNIX__) || defined(__unix) || defined(__unix__) || \ - defined(____SVR4____) || defined(__LINUX__) || defined(__sgi) || \ - defined(__hpux) || defined(__sun) || defined(__SUN__) || defined(_AIX) || \ - defined(__VMS) || defined(__BEOS__) || defined(__MACH__) - -# define __UNIX_LIKE__ - -# ifdef __SGI__ -# ifdef __GNUG__ -# else /* !gcc */ - /* - Note I use the term __SGI_CC__ for both cc and CC, its not a good - idea to mix gcc and cc/CC, the name mangling is different - */ -# define __SGI_CC__ -# endif /* gcc/!gcc */ - - /* system headers use this symbol and not __cplusplus in some places */ -# ifndef _LANGUAGE_C_PLUS_PLUS -# define _LANGUAGE_C_PLUS_PLUS -# endif -# endif /* SGI */ - -# if defined(__INNOTEK_LIBC__) - /* Ensure visibility of strnlen declaration */ -# define _GNU_SOURCE -# endif - - /* define __HPUX__ for HP-UX where standard macro is __hpux */ -# if defined(__hpux) && !defined(__HPUX__) -# define __HPUX__ -# endif /* HP-UX */ - - /* All of these should already be defined by including configure- - generated setup.h but we wish to support Xcode compilation without - requiring the user to define these himself. - */ -# if defined(__APPLE__) && defined(__MACH__) -# ifndef __UNIX__ -# define __UNIX__ 1 -# endif -# ifndef __BSD__ -# define __BSD__ 1 -# endif - /* __DARWIN__ is our own define to mean OS X or pure Darwin */ -# ifndef __DARWIN__ -# define __DARWIN__ 1 -# endif - /* OS X uses unsigned long size_t for both ILP32 and LP64 modes. */ -# if !defined(wxSIZE_T_IS_UINT) && !defined(wxSIZE_T_IS_ULONG) -# define wxSIZE_T_IS_ULONG -# endif -# endif - -/* - OS: Windows - */ -#elif defined(__WINDOWS__) - - /* to be changed for Win64! */ -# ifndef __WIN32__ -# error "__WIN32__ should be defined for Win32 and Win64, Win16 is not supported" -# endif - - /* size_t is the same as unsigned int for all Windows compilers we know, */ - /* so define it if it hadn't been done by configure yet */ -# if !defined(wxSIZE_T_IS_UINT) && !defined(wxSIZE_T_IS_ULONG) && !defined(__WIN64__) -# define wxSIZE_T_IS_UINT -# endif -#else -# error "Unknown platform." -#endif /* OS */ - -/* - if we're on a Unix system but didn't use configure (so that setup.h didn't - define __UNIX__), do define __UNIX__ now - */ -#if !defined(__UNIX__) && defined(__UNIX_LIKE__) -# define __UNIX__ -#endif /* Unix */ - -#if defined(__WXMOTIF__) || defined(__WXX11__) -# define __X__ -#endif - -/* - We get "Large Files (ILP32) not supported in strict ANSI mode." #error - from HP-UX standard headers when compiling with g++ without this: - */ -#if defined(__HPUX__) && !defined(__STDC_EXT__) -# define __STDC_EXT__ 1 -#endif - -/* Force linking against required libraries under Windows: */ -#if defined __WINDOWS__ -# include "wx/msw/libraries.h" -#endif - -#if defined(__BORLANDC__) || (defined(__GNUC__) && __GNUC__ < 3) -#define wxNEEDS_CHARPP -#endif - -/* - Note that wx/msw/gccpriv.h must be included after defining UNICODE and - _UNICODE macros as it includes _mingw.h which relies on them being set. - */ -#if ( defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || \ - ( defined( __CYGWIN__ ) && defined( __WINDOWS__ ) ) ) && \ - !defined(__WXMOTIF__) && \ - !defined(__WXX11__) -# include "wx/msw/gccpriv.h" -#else -# undef wxCHECK_W32API_VERSION -# define wxCHECK_W32API_VERSION(maj, min) (0) -# undef wxCHECK_MINGW32_VERSION -# define wxCHECK_MINGW32_VERSION( major, minor ) (0) -# define wxDECL_FOR_STRICT_MINGW32(rettype, func, params) -#endif - - -/* - Handle Darwin gcc universal compilation. Don't do this in an Apple- - specific case since no sane compiler should be defining either - __BIG_ENDIAN__ or __LITTLE_ENDIAN__ unless it really is generating - code that will be hosted on a machine with the appropriate endianness. - If a compiler defines neither, assume the user or configure set - WORDS_BIGENDIAN appropriately. - */ -#if defined(__BIG_ENDIAN__) -# undef WORDS_BIGENDIAN -# define WORDS_BIGENDIAN 1 -#elif defined(__LITTLE_ENDIAN__) -# undef WORDS_BIGENDIAN -#elif defined(__WXMAC__) && !defined(WORDS_BIGENDIAN) -/* According to Stefan even ancient Mac compilers defined __BIG_ENDIAN__ */ -# warning "Compiling wxMac with probably wrong endianness" -#endif -/* also the 32/64 bit universal builds must be handled accordingly */ -#ifdef __DARWIN__ -# ifdef __LP64__ -# undef SIZEOF_VOID_P -# undef SIZEOF_LONG -# undef SIZEOF_SIZE_T -# define SIZEOF_VOID_P 8 -# define SIZEOF_LONG 8 -# define SIZEOF_SIZE_T 8 -# else -# undef SIZEOF_VOID_P -# undef SIZEOF_LONG -# undef SIZEOF_SIZE_T -# define SIZEOF_VOID_P 4 -# define SIZEOF_LONG 4 -# define SIZEOF_SIZE_T 4 -# endif -#endif - -/* - Define various OS X symbols before including wx/chkconf.h which uses them. - - __WXOSX_MAC__ means Mac OS X, non embedded - __WXOSX_IPHONE__ means OS X iPhone - */ - -/* - Normally all of __WXOSX_XXX__, __WXOSX__ and __WXMAC__ are defined by - configure but ensure that we also define them if configure was not used for - whatever reason. - - The primary symbol remains __WXOSX_XXX__ one, __WXOSX__ exists to allow - checking for any OS X port (Cocoa) and __WXMAC__ is an old name - for it. - */ -#if defined(__WXOSX_COCOA__) || defined(__WXOSX_IPHONE__) -# ifndef __WXOSX__ -# define __WXOSX__ 1 -# endif -# ifndef __WXMAC__ -# define __WXMAC__ 1 -# endif -#endif - -#ifdef __WXOSX__ -/* setup precise defines according to sdk used */ -# include -# if defined(__WXOSX_IPHONE__) -# if !( defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE ) -# error "incorrect SDK for an iPhone build" -# endif -# else -# if wxUSE_GUI && !defined(__WXOSX_COCOA__) -# error "one of __WXOSX_IPHONE__ or __WXOSX_COCOA__ must be defined for the GUI build" -# endif -# if !( defined(TARGET_OS_MAC) && TARGET_OS_MAC ) -# error "incorrect SDK for a Mac OS X build" -# endif -# define __WXOSX_MAC__ 1 -# endif -#endif - -#ifdef __WXOSX_MAC__ -# if defined(__MACH__) -# include -# ifndef MAC_OS_X_VERSION_10_4 -# define MAC_OS_X_VERSION_10_4 1040 -# endif -# ifndef MAC_OS_X_VERSION_10_5 -# define MAC_OS_X_VERSION_10_5 1050 -# endif -# ifndef MAC_OS_X_VERSION_10_6 -# define MAC_OS_X_VERSION_10_6 1060 -# endif -# ifndef MAC_OS_X_VERSION_10_7 -# define MAC_OS_X_VERSION_10_7 1070 -# endif -# ifndef MAC_OS_X_VERSION_10_8 -# define MAC_OS_X_VERSION_10_8 1080 -# endif -# ifndef MAC_OS_X_VERSION_10_9 -# define MAC_OS_X_VERSION_10_9 1090 -# endif -# ifndef MAC_OS_X_VERSION_10_10 -# define MAC_OS_X_VERSION_10_10 101000 -# endif -# else -# error "only mach-o configurations are supported" -# endif -#endif - -/* - This is obsolete and kept for backwards compatibility only. - */ -#if defined(__WXOSX__) -# define __WXOSX_OR_COCOA__ 1 -#endif - -/* - check the consistency of the settings in setup.h: note that this must be - done after setting wxUSE_UNICODE correctly as it is used in wx/chkconf.h - and after defining the compiler macros which are used in it too - */ -#include "wx/chkconf.h" - - -/* - some compilers don't support iostream.h any longer, while some of theme - are not updated with yet, so override the users setting here - in such case. - */ -#if defined(_MSC_VER) && (_MSC_VER >= 1310) -# undef wxUSE_IOSTREAMH -# define wxUSE_IOSTREAMH 0 -#elif defined(__MINGW32__) -# undef wxUSE_IOSTREAMH -# define wxUSE_IOSTREAMH 0 -#endif /* compilers with/without iostream.h */ - -/* - old C++ headers (like ) declare classes in the global namespace - while the new, standard ones (like ) do it in std:: namespace, - unless it's an old gcc version. - - using this macro allows constuctions like "wxSTD iostream" to work in - either case - */ -#if !wxUSE_IOSTREAMH && (!defined(__GNUC__) || ( __GNUC__ > 2 ) || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)) -# define wxSTD std:: -#else -# define wxSTD -#endif - -/* On OpenVMS with the most recent HP C++ compiler some function (i.e. wscanf) - * are only available in the std-namespace. (BUG???) - */ -#if defined( __VMS ) && (__DECCXX_VER >= 70100000) && !defined(__STD_CFRONT) && !defined( __NONAMESPACE_STD ) -# define wxVMS_USE_STD std:: -#else -# define wxVMS_USE_STD -#endif - -#ifdef __VMS -#define XtDisplay XTDISPLAY -#ifdef __WXMOTIF__ -#define XtParent XTPARENT -#define XtScreen XTSCREEN -#define XtWindow XTWINDOW -#endif -#endif - -/* Choose which method we will use for updating menus - * - in OnIdle, or when we receive a wxEVT_MENU_OPEN event. - * Presently, only Windows, OS X and GTK+ support wxEVT_MENU_OPEN. - */ -#ifndef wxUSE_IDLEMENUUPDATES -# if (defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXOSX__)) && !defined(__WXUNIVERSAL__) -# define wxUSE_IDLEMENUUPDATES 0 -# else -# define wxUSE_IDLEMENUUPDATES 1 -# endif -#endif - -/* - * Define symbols that are not yet in - * configure or possibly some setup.h files. - * They will need to be added. - */ - -#ifndef wxUSE_FILECONFIG -# if wxUSE_CONFIG && wxUSE_TEXTFILE -# define wxUSE_FILECONFIG 1 -# else -# define wxUSE_FILECONFIG 0 -# endif -#endif - -#ifndef wxUSE_HOTKEY -# define wxUSE_HOTKEY 0 -#endif - -#if !defined(wxUSE_WXDIB) && defined(__WXMSW__) -# define wxUSE_WXDIB 1 -#endif - -/* - Optionally supported C++ features. - */ - -/* - RTTI: if it is disabled in build/msw/makefile.* then this symbol will - already be defined but it's also possible to do it from configure (with - g++) or by editing project files with MSVC so test for it here too. - */ -#ifndef wxNO_RTTI - /* - Only 4.3 defines __GXX_RTTI by default so its absence is not an - indication of disabled RTTI with the previous versions. - */ -# if wxCHECK_GCC_VERSION(4, 3) -# ifndef __GXX_RTTI -# define wxNO_RTTI -# endif -# elif defined(_MSC_VER) -# ifndef _CPPRTTI -# define wxNO_RTTI -# endif -# endif -#endif /* wxNO_RTTI */ - -#endif /* _WX_PLATFORM_H_ */ diff --git a/Externals/wxWidgets3/include/wx/platinfo.h b/Externals/wxWidgets3/include/wx/platinfo.h deleted file mode 100644 index cc13959567..0000000000 --- a/Externals/wxWidgets3/include/wx/platinfo.h +++ /dev/null @@ -1,371 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/platinfo.h -// Purpose: declaration of the wxPlatformInfo class -// Author: Francesco Montorsi -// Modified by: -// Created: 07.07.2006 (based on wxToolkitInfo) -// Copyright: (c) 2006 Francesco Montorsi -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PLATINFO_H_ -#define _WX_PLATINFO_H_ - -#include "wx/string.h" - -// ---------------------------------------------------------------------------- -// wxPlatformInfo enums & structs -// ---------------------------------------------------------------------------- - -// VERY IMPORTANT: when changing these enum values, also change the relative -// string tables in src/common/platinfo.cpp - - -// families & sub-families of operating systems -enum wxOperatingSystemId -{ - wxOS_UNKNOWN = 0, // returned on error - - wxOS_MAC_OS = 1 << 0, // Apple Mac OS 8/9/X with Mac paths - wxOS_MAC_OSX_DARWIN = 1 << 1, // Apple Mac OS X with Unix paths - wxOS_MAC = wxOS_MAC_OS|wxOS_MAC_OSX_DARWIN, - - wxOS_WINDOWS_9X = 1 << 2, // Windows 9x family (95/98/ME) - wxOS_WINDOWS_NT = 1 << 3, // Windows NT family (NT/2000/XP) - wxOS_WINDOWS_MICRO = 1 << 4, // MicroWindows - wxOS_WINDOWS_CE = 1 << 5, // Windows CE (Window Mobile) - wxOS_WINDOWS = wxOS_WINDOWS_9X | - wxOS_WINDOWS_NT | - wxOS_WINDOWS_MICRO | - wxOS_WINDOWS_CE, - - wxOS_UNIX_LINUX = 1 << 6, // Linux - wxOS_UNIX_FREEBSD = 1 << 7, // FreeBSD - wxOS_UNIX_OPENBSD = 1 << 8, // OpenBSD - wxOS_UNIX_NETBSD = 1 << 9, // NetBSD - wxOS_UNIX_SOLARIS = 1 << 10, // SunOS - wxOS_UNIX_AIX = 1 << 11, // AIX - wxOS_UNIX_HPUX = 1 << 12, // HP/UX - wxOS_UNIX = wxOS_UNIX_LINUX | - wxOS_UNIX_FREEBSD | - wxOS_UNIX_OPENBSD | - wxOS_UNIX_NETBSD | - wxOS_UNIX_SOLARIS | - wxOS_UNIX_AIX | - wxOS_UNIX_HPUX, - - // 1<<13 and 1<<14 available for other Unix flavours - - wxOS_DOS = 1 << 15, // Microsoft DOS - wxOS_OS2 = 1 << 16 // OS/2 -}; - -// list of wxWidgets ports - some of them can be used with more than -// a single toolkit. -enum wxPortId -{ - wxPORT_UNKNOWN = 0, // returned on error - - wxPORT_BASE = 1 << 0, // wxBase, no native toolkit used - - wxPORT_MSW = 1 << 1, // wxMSW, native toolkit is Windows API - wxPORT_MOTIF = 1 << 2, // wxMotif, using [Open]Motif or Lesstif - wxPORT_GTK = 1 << 3, // wxGTK, using GTK+ 1.x, 2.x, GPE or Maemo - wxPORT_DFB = 1 << 4, // wxDFB, using wxUniversal - wxPORT_X11 = 1 << 5, // wxX11, using wxUniversal - wxPORT_PM = 1 << 6, // wxOS2, using OS/2 Presentation Manager - wxPORT_OS2 = wxPORT_PM, // wxOS2, using OS/2 Presentation Manager - wxPORT_MAC = 1 << 7, // wxOSX (former wxMac), using Cocoa or iPhone API - wxPORT_OSX = wxPORT_MAC, // wxOSX, using Cocoa or iPhone API - wxPORT_COCOA = 1 << 8, // wxCocoa, using Cocoa NextStep/Mac API - wxPORT_WINCE = 1 << 9, // wxWinCE, toolkit is WinCE SDK API - wxPORT_QT = 1 << 10 // wxQT, using QT4 -}; - -// architecture of the operating system -// (regardless of the build environment of wxWidgets library - see -// wxIsPlatform64bit documentation for more info) -enum wxArchitecture -{ - wxARCH_INVALID = -1, // returned on error - - wxARCH_32, // 32 bit - wxARCH_64, - - wxARCH_MAX -}; - - -// endian-ness of the machine -enum wxEndianness -{ - wxENDIAN_INVALID = -1, // returned on error - - wxENDIAN_BIG, // 4321 - wxENDIAN_LITTLE, // 1234 - wxENDIAN_PDP, // 3412 - - wxENDIAN_MAX -}; - -// informations about a linux distro returned by the lsb_release utility -struct wxLinuxDistributionInfo -{ - wxString Id; - wxString Release; - wxString CodeName; - wxString Description; - - bool operator==(const wxLinuxDistributionInfo& ldi) const - { - return Id == ldi.Id && - Release == ldi.Release && - CodeName == ldi.CodeName && - Description == ldi.Description; - } - - bool operator!=(const wxLinuxDistributionInfo& ldi) const - { return !(*this == ldi); } -}; - - -// ---------------------------------------------------------------------------- -// wxPlatformInfo -// ---------------------------------------------------------------------------- - -// Information about the toolkit that the app is running under and some basic -// platform and architecture info -class WXDLLIMPEXP_BASE wxPlatformInfo -{ -public: - wxPlatformInfo(); - wxPlatformInfo(wxPortId pid, - int tkMajor = -1, int tkMinor = -1, - wxOperatingSystemId id = wxOS_UNKNOWN, - int osMajor = -1, int osMinor = -1, - wxArchitecture arch = wxARCH_INVALID, - wxEndianness endian = wxENDIAN_INVALID, - bool usingUniversal = false); - - // default copy ctor, assignment operator and dtor are ok - - bool operator==(const wxPlatformInfo &t) const; - - bool operator!=(const wxPlatformInfo &t) const - { return !(*this == t); } - - // Gets a wxPlatformInfo already initialized with the values for - // the currently running platform. - static const wxPlatformInfo& Get(); - - - - // string -> enum conversions - // --------------------------------- - - static wxOperatingSystemId GetOperatingSystemId(const wxString &name); - static wxPortId GetPortId(const wxString &portname); - - static wxArchitecture GetArch(const wxString &arch); - static wxEndianness GetEndianness(const wxString &end); - - // enum -> string conversions - // --------------------------------- - - static wxString GetOperatingSystemFamilyName(wxOperatingSystemId os); - static wxString GetOperatingSystemIdName(wxOperatingSystemId os); - static wxString GetPortIdName(wxPortId port, bool usingUniversal); - static wxString GetPortIdShortName(wxPortId port, bool usingUniversal); - - static wxString GetArchName(wxArchitecture arch); - static wxString GetEndiannessName(wxEndianness end); - - - // getters - // ----------------- - - int GetOSMajorVersion() const - { return m_osVersionMajor; } - int GetOSMinorVersion() const - { return m_osVersionMinor; } - int GetOSMicroVersion() const - { return m_osVersionMicro; } - - // return true if the OS version >= major.minor - bool CheckOSVersion(int major, int minor, int micro = 0) const; - - int GetToolkitMajorVersion() const - { return m_tkVersionMajor; } - int GetToolkitMinorVersion() const - { return m_tkVersionMinor; } - int GetToolkitMicroVersion() const - { return m_tkVersionMicro; } - - bool CheckToolkitVersion(int major, int minor, int micro = 0) const - { - return DoCheckVersion(GetToolkitMajorVersion(), - GetToolkitMinorVersion(), - GetToolkitMicroVersion(), - major, - minor, - micro); - } - - bool IsUsingUniversalWidgets() const - { return m_usingUniversal; } - - wxOperatingSystemId GetOperatingSystemId() const - { return m_os; } - wxLinuxDistributionInfo GetLinuxDistributionInfo() const - { return m_ldi; } - wxPortId GetPortId() const - { return m_port; } - wxArchitecture GetArchitecture() const - { return m_arch; } - wxEndianness GetEndianness() const - { return m_endian; } - - - // string getters - // ----------------- - - wxString GetOperatingSystemFamilyName() const - { return GetOperatingSystemFamilyName(m_os); } - wxString GetOperatingSystemIdName() const - { return GetOperatingSystemIdName(m_os); } - wxString GetPortIdName() const - { return GetPortIdName(m_port, m_usingUniversal); } - wxString GetPortIdShortName() const - { return GetPortIdShortName(m_port, m_usingUniversal); } - wxString GetArchName() const - { return GetArchName(m_arch); } - wxString GetEndiannessName() const - { return GetEndiannessName(m_endian); } - wxString GetOperatingSystemDescription() const - { return m_osDesc; } - wxString GetDesktopEnvironment() const - { return m_desktopEnv; } - - static wxString GetOperatingSystemDirectory(); - // doesn't make sense to store inside wxPlatformInfo the OS directory, - // thus this function is static; note that this function simply calls - // wxGetOSDirectory() and is here just to make it easier for the user to - // find it that feature (global functions can be difficult to find in the docs) - - // setters - // ----------------- - - void SetOSVersion(int major, int minor, int micro = 0) - { - m_osVersionMajor = major; - m_osVersionMinor = minor; - m_osVersionMicro = micro; - } - - void SetToolkitVersion(int major, int minor, int micro = 0) - { - m_tkVersionMajor = major; - m_tkVersionMinor = minor; - m_tkVersionMicro = micro; - } - - void SetOperatingSystemId(wxOperatingSystemId n) - { m_os = n; } - void SetOperatingSystemDescription(const wxString& desc) - { m_osDesc = desc; } - void SetPortId(wxPortId n) - { m_port = n; } - void SetArchitecture(wxArchitecture n) - { m_arch = n; } - void SetEndianness(wxEndianness n) - { m_endian = n; } - - void SetDesktopEnvironment(const wxString& de) - { m_desktopEnv = de; } - void SetLinuxDistributionInfo(const wxLinuxDistributionInfo& di) - { m_ldi = di; } - - - // miscellaneous - // ----------------- - - bool IsOk() const - { - return m_osVersionMajor != -1 && m_osVersionMinor != -1 && - m_osVersionMicro != -1 && - m_os != wxOS_UNKNOWN && - !m_osDesc.IsEmpty() && - m_tkVersionMajor != -1 && m_tkVersionMinor != -1 && - m_tkVersionMicro != -1 && - m_port != wxPORT_UNKNOWN && - m_arch != wxARCH_INVALID && - m_endian != wxENDIAN_INVALID; - - // do not check linux-specific info; it's ok to have them empty - } - - -protected: - static bool DoCheckVersion(int majorCur, int minorCur, int microCur, - int major, int minor, int micro) - { - return majorCur > major - || (majorCur == major && minorCur > minor) - || (majorCur == major && minorCur == minor && microCur >= micro); - } - - bool m_initializedForCurrentPlatform; - - void InitForCurrentPlatform(); - - - // OS stuff - // ----------------- - - // Version of the OS; valid if m_os != wxOS_UNKNOWN - // (-1 means not initialized yet). - int m_osVersionMajor, - m_osVersionMinor, - m_osVersionMicro; - - // Operating system ID. - wxOperatingSystemId m_os; - - // Operating system description. - wxString m_osDesc; - - - // linux-specific - // ----------------- - - wxString m_desktopEnv; - wxLinuxDistributionInfo m_ldi; - - - // toolkit - // ----------------- - - // Version of the underlying toolkit - // (-1 means not initialized yet; zero means no toolkit). - int m_tkVersionMajor, m_tkVersionMinor, m_tkVersionMicro; - - // name of the wxWidgets port - wxPortId m_port; - - // is using wxUniversal widgets? - bool m_usingUniversal; - - - // others - // ----------------- - - // architecture of the OS/machine - wxArchitecture m_arch; - - // endianness of the machine - wxEndianness m_endian; -}; - - - -#endif // _WX_PLATINFO_H_ diff --git a/Externals/wxWidgets3/include/wx/popupwin.h b/Externals/wxWidgets3/include/wx/popupwin.h deleted file mode 100644 index ea6a4427a4..0000000000 --- a/Externals/wxWidgets3/include/wx/popupwin.h +++ /dev/null @@ -1,195 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/popupwin.h -// Purpose: wxPopupWindow interface declaration -// Author: Vadim Zeitlin -// Modified by: -// Created: 06.01.01 -// Copyright: (c) 2001 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_POPUPWIN_H_BASE_ -#define _WX_POPUPWIN_H_BASE_ - -#include "wx/defs.h" - -#if wxUSE_POPUPWIN - -#include "wx/nonownedwnd.h" - -// ---------------------------------------------------------------------------- -// wxPopupWindow: a special kind of top level window used for popup menus, -// combobox popups and such. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxPopupWindowBase : public wxNonOwnedWindow -{ -public: - wxPopupWindowBase() { } - virtual ~wxPopupWindowBase(); - - // create the popup window - // - // style may only contain border flags - bool Create(wxWindow *parent, int style = wxBORDER_NONE); - - // move the popup window to the right position, i.e. such that it is - // entirely visible - // - // the popup is positioned at ptOrigin + size if it opens below and to the - // right (default), at ptOrigin - sizePopup if it opens above and to the - // left &c - // - // the point must be given in screen coordinates! - virtual void Position(const wxPoint& ptOrigin, - const wxSize& size); - - virtual bool IsTopLevel() const wxOVERRIDE { return true; } - - wxDECLARE_NO_COPY_CLASS(wxPopupWindowBase); -}; - - -// include the real class declaration -#if defined(__WXMSW__) - #include "wx/msw/popupwin.h" -#elif defined(__WXGTK20__) - #include "wx/gtk/popupwin.h" -#elif defined(__WXGTK__) - #include "wx/gtk1/popupwin.h" -#elif defined(__WXX11__) - #include "wx/x11/popupwin.h" -#elif defined(__WXMOTIF__) - #include "wx/motif/popupwin.h" -#elif defined(__WXDFB__) - #include "wx/dfb/popupwin.h" -#elif defined(__WXMAC__) - #include "wx/osx/popupwin.h" -#elif defined(__WXQT__) - #include "wx/qt/popupwin.h" -#else - #error "wxPopupWindow is not supported under this platform." -#endif - -// ---------------------------------------------------------------------------- -// wxPopupTransientWindow: a wxPopupWindow which disappears automatically -// when the user clicks mouse outside it or if it loses focus in any other way -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxPopupWindowHandler; -class WXDLLIMPEXP_FWD_CORE wxPopupFocusHandler; - -class WXDLLIMPEXP_CORE wxPopupTransientWindow : public wxPopupWindow -{ -public: - // ctors - wxPopupTransientWindow() { Init(); } - wxPopupTransientWindow(wxWindow *parent, int style = wxBORDER_NONE); - - virtual ~wxPopupTransientWindow(); - - // popup the window (this will show it too) and keep focus at winFocus - // (or itself if it's NULL), dismiss the popup if we lose focus - virtual void Popup(wxWindow *focus = NULL); - - // hide the window - virtual void Dismiss(); - - // can the window be dismissed now? - // - // VZ: where is this used?? - virtual bool CanDismiss() - { return true; } - - // called when a mouse is pressed while the popup is shown: return true - // from here to prevent its normal processing by the popup (which consists - // in dismissing it if the mouse is clicked outside it) - virtual bool ProcessLeftDown(wxMouseEvent& event); - - // Overridden to grab the input on some plaforms - virtual bool Show( bool show = true ) wxOVERRIDE; - - // Override to implement delayed destruction of this window. - virtual bool Destroy() wxOVERRIDE; - -protected: - // common part of all ctors - void Init(); - - // this is called when the popup is disappeared because of anything - // else but direct call to Dismiss() - virtual void OnDismiss(); - - // dismiss and notify the derived class - void DismissAndNotify(); - - // remove our event handlers - void PopHandlers(); - - // get alerted when child gets deleted from under us - void OnDestroy(wxWindowDestroyEvent& event); - -#if defined(__WXMSW__) ||(defined(__WXMAC__) && wxOSX_USE_COCOA_OR_CARBON) - // Check if the mouse needs to be captured or released: we must release - // when it's inside our window if we want the embedded controls to work. - void OnIdle(wxIdleEvent& event); -#endif - - // the child of this popup if any - wxWindow *m_child; - - // the window which has the focus while we're shown - wxWindow *m_focus; - - // these classes may call our DismissAndNotify() - friend class wxPopupWindowHandler; - friend class wxPopupFocusHandler; - - // the handlers we created, may be NULL (if not, must be deleted) - wxPopupWindowHandler *m_handlerPopup; - wxPopupFocusHandler *m_handlerFocus; - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_DYNAMIC_CLASS(wxPopupTransientWindow); - wxDECLARE_NO_COPY_CLASS(wxPopupTransientWindow); -}; - -#if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__) - -// ---------------------------------------------------------------------------- -// wxPopupComboWindow: wxPopupTransientWindow used by wxComboBox -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxComboBox; -class WXDLLIMPEXP_FWD_CORE wxComboCtrl; - -class WXDLLIMPEXP_CORE wxPopupComboWindow : public wxPopupTransientWindow -{ -public: - wxPopupComboWindow() { m_combo = NULL; } - wxPopupComboWindow(wxComboCtrl *parent); - - bool Create(wxComboCtrl *parent); - - // position the window correctly relatively to the combo - void PositionNearCombo(); - -protected: - // notify the combo here - virtual void OnDismiss(); - - // forward the key presses to the combobox - void OnKeyDown(wxKeyEvent& event); - - // the parent combobox - wxComboCtrl *m_combo; - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_DYNAMIC_CLASS(wxPopupComboWindow); -}; - -#endif // wxUSE_COMBOBOX && defined(__WXUNIVERSAL__) - -#endif // wxUSE_POPUPWIN - -#endif // _WX_POPUPWIN_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/position.h b/Externals/wxWidgets3/include/wx/position.h deleted file mode 100644 index bd324e2343..0000000000 --- a/Externals/wxWidgets3/include/wx/position.h +++ /dev/null @@ -1,59 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/position.h -// Purpose: Common structure and methods for positional information. -// Author: Vadim Zeitlin, Robin Dunn, Brad Anderson, Bryan Petty -// Created: 2007-03-13 -// Copyright: (c) 2007 The wxWidgets Team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_POSITION_H_ -#define _WX_POSITION_H_ - -#include "wx/gdicmn.h" - -class WXDLLIMPEXP_CORE wxPosition -{ -public: - wxPosition() : m_row(0), m_column(0) {} - wxPosition(int row, int col) : m_row(row), m_column(col) {} - - // default copy ctor and assignment operator are okay. - - int GetRow() const { return m_row; } - int GetColumn() const { return m_column; } - int GetCol() const { return GetColumn(); } - void SetRow(int row) { m_row = row; } - void SetColumn(int column) { m_column = column; } - void SetCol(int column) { SetColumn(column); } - - bool operator==(const wxPosition& p) const - { return m_row == p.m_row && m_column == p.m_column; } - bool operator!=(const wxPosition& p) const - { return !(*this == p); } - - wxPosition& operator+=(const wxPosition& p) - { m_row += p.m_row; m_column += p.m_column; return *this; } - wxPosition& operator-=(const wxPosition& p) - { m_row -= p.m_row; m_column -= p.m_column; return *this; } - wxPosition& operator+=(const wxSize& s) - { m_row += s.y; m_column += s.x; return *this; } - wxPosition& operator-=(const wxSize& s) - { m_row -= s.y; m_column -= s.x; return *this; } - - wxPosition operator+(const wxPosition& p) const - { return wxPosition(m_row + p.m_row, m_column + p.m_column); } - wxPosition operator-(const wxPosition& p) const - { return wxPosition(m_row - p.m_row, m_column - p.m_column); } - wxPosition operator+(const wxSize& s) const - { return wxPosition(m_row + s.y, m_column + s.x); } - wxPosition operator-(const wxSize& s) const - { return wxPosition(m_row - s.y, m_column - s.x); } - -private: - int m_row; - int m_column; -}; - -#endif // _WX_POSITION_H_ - diff --git a/Externals/wxWidgets3/include/wx/power.h b/Externals/wxWidgets3/include/wx/power.h deleted file mode 100644 index 7c45abafb6..0000000000 --- a/Externals/wxWidgets3/include/wx/power.h +++ /dev/null @@ -1,151 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/power.h -// Purpose: functions and classes for system power management -// Author: Vadim Zeitlin -// Modified by: -// Created: 2006-05-27 -// Copyright: (c) 2006 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_POWER_H_ -#define _WX_POWER_H_ - -#include "wx/event.h" - -// ---------------------------------------------------------------------------- -// power management constants -// ---------------------------------------------------------------------------- - -enum wxPowerType -{ - wxPOWER_SOCKET, - wxPOWER_BATTERY, - wxPOWER_UNKNOWN -}; - -enum wxBatteryState -{ - wxBATTERY_NORMAL_STATE, // system is fully usable - wxBATTERY_LOW_STATE, // start to worry - wxBATTERY_CRITICAL_STATE, // save quickly - wxBATTERY_SHUTDOWN_STATE, // too late - wxBATTERY_UNKNOWN_STATE -}; - -// ---------------------------------------------------------------------------- -// wxPowerEvent is generated when the system online status changes -// ---------------------------------------------------------------------------- - -// currently the power events are only available under Windows, to avoid -// compiling in the code for handling them which is never going to be invoked -// under the other platforms, we define wxHAS_POWER_EVENTS symbol if this event -// is available, it should be used to guard all code using wxPowerEvent -#ifdef __WINDOWS__ - -#define wxHAS_POWER_EVENTS - -class WXDLLIMPEXP_BASE wxPowerEvent : public wxEvent -{ -public: - wxPowerEvent() // just for use by wxRTTI - : m_veto(false) { } - - wxPowerEvent(wxEventType evtType) : wxEvent(wxID_NONE, evtType) - { - m_veto = false; - } - - // Veto the operation (only makes sense with EVT_POWER_SUSPENDING) - void Veto() { m_veto = true; } - - bool IsVetoed() const { return m_veto; } - - - // default copy ctor, assignment operator and dtor are ok - - virtual wxEvent *Clone() const { return new wxPowerEvent(*this); } - -private: - bool m_veto; - - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxPowerEvent); -}; - -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_BASE, wxEVT_POWER_SUSPENDING, wxPowerEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_BASE, wxEVT_POWER_SUSPENDED, wxPowerEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_BASE, wxEVT_POWER_SUSPEND_CANCEL, wxPowerEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_BASE, wxEVT_POWER_RESUME, wxPowerEvent ); - -typedef void (wxEvtHandler::*wxPowerEventFunction)(wxPowerEvent&); - -#define wxPowerEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxPowerEventFunction, func) - -#define EVT_POWER_SUSPENDING(func) \ - wx__DECLARE_EVT0(wxEVT_POWER_SUSPENDING, wxPowerEventHandler(func)) -#define EVT_POWER_SUSPENDED(func) \ - wx__DECLARE_EVT0(wxEVT_POWER_SUSPENDED, wxPowerEventHandler(func)) -#define EVT_POWER_SUSPEND_CANCEL(func) \ - wx__DECLARE_EVT0(wxEVT_POWER_SUSPEND_CANCEL, wxPowerEventHandler(func)) -#define EVT_POWER_RESUME(func) \ - wx__DECLARE_EVT0(wxEVT_POWER_RESUME, wxPowerEventHandler(func)) - -#else // no support for power events - #undef wxHAS_POWER_EVENTS -#endif // support for power events/no support - -// ---------------------------------------------------------------------------- -// wxPowerResourceBlocker -// ---------------------------------------------------------------------------- - -enum wxPowerResourceKind -{ - wxPOWER_RESOURCE_SCREEN, - wxPOWER_RESOURCE_SYSTEM -}; - -class WXDLLIMPEXP_BASE wxPowerResource -{ -public: - static bool Acquire(wxPowerResourceKind kind, - const wxString& reason = wxString()); - static void Release(wxPowerResourceKind kind); -}; - -class wxPowerResourceBlocker -{ -public: - explicit wxPowerResourceBlocker(wxPowerResourceKind kind, - const wxString& reason = wxString()) - : m_kind(kind), - m_acquired(wxPowerResource::Acquire(kind, reason)) - { - } - - bool IsInEffect() const { return m_acquired; } - - ~wxPowerResourceBlocker() - { - if ( m_acquired ) - wxPowerResource::Release(m_kind); - } - -private: - const wxPowerResourceKind m_kind; - const bool m_acquired; - - wxDECLARE_NO_COPY_CLASS(wxPowerResourceBlocker); -}; - -// ---------------------------------------------------------------------------- -// power management functions -// ---------------------------------------------------------------------------- - -// return the current system power state: online or offline -WXDLLIMPEXP_BASE wxPowerType wxGetPowerType(); - -// return approximate battery state -WXDLLIMPEXP_BASE wxBatteryState wxGetBatteryState(); - -#endif // _WX_POWER_H_ diff --git a/Externals/wxWidgets3/include/wx/preferences.h b/Externals/wxWidgets3/include/wx/preferences.h deleted file mode 100644 index 40dac7a0bd..0000000000 --- a/Externals/wxWidgets3/include/wx/preferences.h +++ /dev/null @@ -1,145 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/preferences.h -// Purpose: Declaration of wxPreferencesEditor class. -// Author: Vaclav Slavik -// Created: 2013-02-19 -// Copyright: (c) 2013 Vaclav Slavik -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PREFERENCES_H_ -#define _WX_PREFERENCES_H_ - -#include "wx/defs.h" - -#if wxUSE_PREFERENCES_EDITOR - -#include "wx/bitmap.h" -#include "wx/vector.h" - -class WXDLLIMPEXP_FWD_CORE wxWindow; - -class wxPreferencesEditorImpl; - -#if defined(__WXOSX_COCOA__) - // GetLargeIcon() is used - #define wxHAS_PREF_EDITOR_ICONS - // Changes should be applied immediately - #define wxHAS_PREF_EDITOR_APPLY_IMMEDIATELY - // The dialog is shown non-modally. - #define wxHAS_PREF_EDITOR_MODELESS -#elif defined(__WXGTK__) - // Changes should be applied immediately - #define wxHAS_PREF_EDITOR_APPLY_IMMEDIATELY - // The dialog is shown non-modally. - #define wxHAS_PREF_EDITOR_MODELESS -#endif - -// ---------------------------------------------------------------------------- -// wxPreferencesEditor: Native preferences editing -// ---------------------------------------------------------------------------- - -// One page of a preferences window -class WXDLLIMPEXP_CORE wxPreferencesPage -{ -public: - wxPreferencesPage() {} - virtual ~wxPreferencesPage() {} - - // Name of the page, used e.g. for tabs - virtual wxString GetName() const = 0; - - // Return 32x32 icon used for the page. Currently only used on OS X, where - // implementation is required; unused on other platforms. Because of this, - // the method is only pure virtual on platforms that use it. -#ifdef wxHAS_PREF_EDITOR_ICONS - virtual wxBitmap GetLargeIcon() const = 0; -#else - virtual wxBitmap GetLargeIcon() const { return wxBitmap(); } -#endif - - // Create a window (usually a wxPanel) for this page. The caller takes - // ownership of the returned window. - virtual wxWindow *CreateWindow(wxWindow *parent) = 0; - - wxDECLARE_NO_COPY_CLASS(wxPreferencesPage); -}; - - -// Helper for implementing some common pages (General, Advanced) -class WXDLLIMPEXP_CORE wxStockPreferencesPage : public wxPreferencesPage -{ -public: - enum Kind - { - Kind_General, - Kind_Advanced - }; - - wxStockPreferencesPage(Kind kind) : m_kind(kind) {} - Kind GetKind() const { return m_kind; } - - virtual wxString GetName() const wxOVERRIDE; -#ifdef __WXOSX_COCOA__ - virtual wxBitmap GetLargeIcon() const wxOVERRIDE; -#endif - -private: - Kind m_kind; -}; - - -// Notice that this class does not inherit from wxWindow. -class WXDLLIMPEXP_CORE wxPreferencesEditor -{ -public: - // Ctor creates an empty editor, use AddPage() to add controls to it. - wxPreferencesEditor(const wxString& title = wxString()); - - // Dtor destroys the dialog if still shown. - virtual ~wxPreferencesEditor(); - - // Add a new page to the editor. The editor takes ownership of the page - // and won't delete it until it is destroyed itself. - void AddPage(wxPreferencesPage *page); - - // Show the preferences dialog or bring it to the top if it's already - // shown. Notice that this method may or may not block depending on the - // platform, i.e. depending on whether the dialog is modal or not. - virtual void Show(wxWindow* parent); - - // Hide the currently shown dialog, if any. This is typically used to - // dismiss the dialog if the object whose preferences it is editing was - // closed. - void Dismiss(); - - // Whether changes to values in the pages should be applied immediately - // (OS X, GTK+) or only when the user clicks OK/Apply (Windows) - static bool ShouldApplyChangesImmediately() - { -#ifdef wxHAS_PREF_EDITOR_APPLY_IMMEDIATELY - return true; -#else - return false; -#endif - } - - // Whether the dialog is shown modally, i.e. Show() blocks, or not. - static bool ShownModally() - { -#ifdef wxHAS_PREF_EDITOR_MODELESS - return false; -#else - return true; -#endif - } - -private: - wxPreferencesEditorImpl* m_impl; - - wxDECLARE_NO_COPY_CLASS(wxPreferencesEditor); -}; - -#endif // wxUSE_PREFERENCES_EDITOR - -#endif // _WX_PREFERENCES_H_ diff --git a/Externals/wxWidgets3/include/wx/print.h b/Externals/wxWidgets3/include/wx/print.h deleted file mode 100644 index 269f55cba4..0000000000 --- a/Externals/wxWidgets3/include/wx/print.h +++ /dev/null @@ -1,38 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/print.h -// Purpose: Base header for printer classes -// Author: Julian Smart -// Modified by: -// Created: -// Copyright: (c) Julian Smart -// Licence: wxWindows Licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PRINT_H_BASE_ -#define _WX_PRINT_H_BASE_ - -#include "wx/defs.h" - -#if wxUSE_PRINTING_ARCHITECTURE - -#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) - -#include "wx/msw/printwin.h" - -#elif defined(__WXMAC__) - -#include "wx/osx/printmac.h" - - -#elif defined(__WXQT__) - -#include "wx/qt/printqt.h" -#else - -#include "wx/generic/printps.h" - -#endif - -#endif // wxUSE_PRINTING_ARCHITECTURE -#endif - // _WX_PRINT_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/printdlg.h b/Externals/wxWidgets3/include/wx/printdlg.h deleted file mode 100644 index ecb2ce8819..0000000000 --- a/Externals/wxWidgets3/include/wx/printdlg.h +++ /dev/null @@ -1,121 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/printdlg.h -// Purpose: Base header and class for print dialogs -// Author: Julian Smart -// Modified by: -// Created: -// Copyright: (c) Julian Smart -// Licence: wxWindows Licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PRINTDLG_H_BASE_ -#define _WX_PRINTDLG_H_BASE_ - -#include "wx/defs.h" - -#if wxUSE_PRINTING_ARCHITECTURE - -#include "wx/event.h" -#include "wx/dialog.h" -#include "wx/intl.h" -#include "wx/cmndata.h" - - -// --------------------------------------------------------------------------- -// wxPrintDialogBase: interface for the dialog for printing -// --------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxPrintDialogBase : public wxDialog -{ -public: - wxPrintDialogBase() { } - wxPrintDialogBase(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxString &title = wxEmptyString, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - long style = wxDEFAULT_DIALOG_STYLE); - - virtual wxPrintDialogData& GetPrintDialogData() = 0; - virtual wxPrintData& GetPrintData() = 0; - virtual wxDC *GetPrintDC() = 0; - -private: - wxDECLARE_ABSTRACT_CLASS(wxPrintDialogBase); - wxDECLARE_NO_COPY_CLASS(wxPrintDialogBase); -}; - -// --------------------------------------------------------------------------- -// wxPrintDialog: the dialog for printing. -// --------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxPrintDialog : public wxObject -{ -public: - wxPrintDialog(wxWindow *parent, wxPrintDialogData* data = NULL); - wxPrintDialog(wxWindow *parent, wxPrintData* data); - virtual ~wxPrintDialog(); - - virtual int ShowModal(); - - virtual wxPrintDialogData& GetPrintDialogData(); - virtual wxPrintData& GetPrintData(); - virtual wxDC *GetPrintDC(); - -private: - wxPrintDialogBase *m_pimpl; - -private: - wxDECLARE_DYNAMIC_CLASS(wxPrintDialog); - wxDECLARE_NO_COPY_CLASS(wxPrintDialog); -}; - -// --------------------------------------------------------------------------- -// wxPageSetupDialogBase: interface for the page setup dialog -// --------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxPageSetupDialogBase: public wxDialog -{ -public: - wxPageSetupDialogBase() { } - wxPageSetupDialogBase(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxString &title = wxEmptyString, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - long style = wxDEFAULT_DIALOG_STYLE); - - virtual wxPageSetupDialogData& GetPageSetupDialogData() = 0; - -private: - wxDECLARE_ABSTRACT_CLASS(wxPageSetupDialogBase); - wxDECLARE_NO_COPY_CLASS(wxPageSetupDialogBase); -}; - -// --------------------------------------------------------------------------- -// wxPageSetupDialog: the page setup dialog -// --------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxPageSetupDialog: public wxObject -{ -public: - wxPageSetupDialog(wxWindow *parent, wxPageSetupDialogData *data = NULL); - virtual ~wxPageSetupDialog(); - - int ShowModal(); - wxPageSetupDialogData& GetPageSetupDialogData(); - // old name - wxPageSetupDialogData& GetPageSetupData(); - -private: - wxPageSetupDialogBase *m_pimpl; - -private: - wxDECLARE_DYNAMIC_CLASS(wxPageSetupDialog); - wxDECLARE_NO_COPY_CLASS(wxPageSetupDialog); -}; - -#endif - -#endif - // _WX_PRINTDLG_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/private/addremovectrl.h b/Externals/wxWidgets3/include/wx/private/addremovectrl.h deleted file mode 100644 index adb349f646..0000000000 --- a/Externals/wxWidgets3/include/wx/private/addremovectrl.h +++ /dev/null @@ -1,154 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/private/addremovectrl.h -// Purpose: wxAddRemoveImpl helper class declaration -// Author: Vadim Zeitlin -// Created: 2015-02-04 -// Copyright: (c) 2015 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PRIVATE_ADDREMOVECTRL_H_ -#define _WX_PRIVATE_ADDREMOVECTRL_H_ - -#include "wx/button.h" -#include "wx/sizer.h" - -// ---------------------------------------------------------------------------- -// wxAddRemoveImplBase: implementation-only part of wxAddRemoveCtrl, base part -// ---------------------------------------------------------------------------- - -class wxAddRemoveImplBase -{ -public: - // Base class ctor just initializes the associated adaptor, the derived - // class is supposed to create the buttons and layout everything. - // - // Takes ownership of the adaptor pointer. - wxEXPLICIT wxAddRemoveImplBase(wxAddRemoveAdaptor* adaptor, - wxAddRemoveCtrl* WXUNUSED(parent), - wxWindow* ctrlItems) - : m_adaptor(adaptor) - { - ctrlItems->Bind(wxEVT_CHAR, &wxAddRemoveImplBase::OnChar, this); - } - - // wxOSX implementation needs to override this as it doesn't use sizers, - // for the others it is not necessary. - virtual wxSize GetBestClientSize() const { return wxDefaultSize; } - - virtual void SetButtonsToolTips(const wxString& addtip, - const wxString& removetip) = 0; - - virtual ~wxAddRemoveImplBase() - { - delete m_adaptor; - } - - // Event handlers which must be connected to the appropriate sources by the - // derived classes. - - void OnUpdateUIAdd(wxUpdateUIEvent& event) - { - event.Enable( m_adaptor->CanAdd() ); - } - - void OnUpdateUIRemove(wxUpdateUIEvent& event) - { - event.Enable( m_adaptor->CanRemove() ); - } - - void OnAdd(wxCommandEvent& WXUNUSED(event)) - { - m_adaptor->OnAdd(); - } - - void OnRemove(wxCommandEvent& WXUNUSED(event)) - { - m_adaptor->OnRemove(); - } - -private: - // This event handler is connected by this class itself and doesn't need to - // be accessible to the derived classes. - - void OnChar(wxKeyEvent& event) - { - switch ( event.GetKeyCode() ) - { - case '+': - case WXK_INSERT: - case WXK_NUMPAD_INSERT: - if ( m_adaptor->CanAdd() ) - m_adaptor->OnAdd(); - return; - - case '-': - case WXK_DELETE: - case WXK_NUMPAD_DELETE: - if ( m_adaptor->CanRemove() ) - m_adaptor->OnRemove(); - return; - } - - event.Skip(); - } - - wxAddRemoveAdaptor* const m_adaptor; - - wxDECLARE_NO_COPY_CLASS(wxAddRemoveImplBase); -}; - -// GTK+ uses a wxToolBar-based implementation and so doesn't need this class. -#ifndef __WXGTK__ - -// Base class for the ports using actual wxButtons for the "+"/"-" buttons. -class wxAddRemoveImplWithButtons : public wxAddRemoveImplBase -{ -public: - wxEXPLICIT wxAddRemoveImplWithButtons(wxAddRemoveAdaptor* adaptor, - wxAddRemoveCtrl* parent, - wxWindow* ctrlItems) - : wxAddRemoveImplBase(adaptor, parent, ctrlItems) - { - m_btnAdd = - m_btnRemove = NULL; - } - - virtual void SetButtonsToolTips(const wxString& addtip, - const wxString& removetip) wxOVERRIDE - { - m_btnAdd->SetToolTip(addtip); - m_btnRemove->SetToolTip(removetip); - } - -protected: - // Must be called by the derived class ctor after creating the buttons to - // set up the event handlers. - void SetUpEvents() - { - m_btnAdd->Bind(wxEVT_UPDATE_UI, - &wxAddRemoveImplBase::OnUpdateUIAdd, this); - m_btnRemove->Bind(wxEVT_UPDATE_UI, - &wxAddRemoveImplBase::OnUpdateUIRemove, this); - - m_btnAdd->Bind(wxEVT_BUTTON, &wxAddRemoveImplBase::OnAdd, this); - m_btnRemove->Bind(wxEVT_BUTTON, &wxAddRemoveImplBase::OnRemove, this); - } - - wxButton *m_btnAdd, - *m_btnRemove; - - wxDECLARE_NO_COPY_CLASS(wxAddRemoveImplWithButtons); -}; - -#endif // !wxGTK - -#ifdef __WXOSX__ - #include "wx/osx/private/addremovectrl.h" -#elif defined(__WXGTK__) - #include "wx/gtk/private/addremovectrl.h" -#else - #include "wx/generic/private/addremovectrl.h" -#endif - -#endif // _WX_PRIVATE_ADDREMOVECTRL_H_ diff --git a/Externals/wxWidgets3/include/wx/private/eventloopsourcesmanager.h b/Externals/wxWidgets3/include/wx/private/eventloopsourcesmanager.h deleted file mode 100644 index 430a2f7f20..0000000000 --- a/Externals/wxWidgets3/include/wx/private/eventloopsourcesmanager.h +++ /dev/null @@ -1,29 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/private/eventloopsourcesmanager.h -// Purpose: declares wxEventLoopSourcesManagerBase class -// Author: Rob Bresalier -// Created: 2013-06-19 -// Copyright: (c) 2013 Rob Bresalier -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PRIVATE_EVENTLOOPSOURCESMANAGER_H_ -#define _WX_PRIVATE_EVENTLOOPSOURCESMANAGER_H_ - -// For pulling in the value of wxUSE_EVENTLOOP_SOURCE -#include "wx/evtloop.h" - -#if wxUSE_EVENTLOOP_SOURCE - -class WXDLLIMPEXP_BASE wxEventLoopSourcesManagerBase -{ -public: - virtual wxEventLoopSource* - AddSourceForFD(int fd, wxEventLoopSourceHandler *handler, int flags) = 0; - - virtual ~wxEventLoopSourcesManagerBase() { } -}; - -#endif // wxUSE_EVENTLOOP_SOURCE - -#endif // _WX_PRIVATE_EVENTLOOPSOURCESMANAGER_H_ diff --git a/Externals/wxWidgets3/include/wx/private/fd.h b/Externals/wxWidgets3/include/wx/private/fd.h deleted file mode 100644 index 3f4a604c37..0000000000 --- a/Externals/wxWidgets3/include/wx/private/fd.h +++ /dev/null @@ -1,53 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/private/fd.h -// Purpose: private stuff for working with file descriptors -// Author: Vadim Zeitlin -// Created: 2008-11-23 (moved from wx/unix/private.h) -// Copyright: (c) 2008 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PRIVATE_FD_H_ -#define _WX_PRIVATE_FD_H_ - -// standard Linux headers produce many warnings when used with icc so define -// our own replacements for FD_XXX macros -#if defined(__INTELC__) && defined(__LINUX__) - inline void wxFD_ZERO(fd_set *fds) - { - #pragma warning(push) - #pragma warning(disable:593) - FD_ZERO(fds); - #pragma warning(pop) - } - - inline void wxFD_SET(int fd, fd_set *fds) - { - #pragma warning(push, 1) - #pragma warning(disable:1469) - FD_SET(fd, fds); - #pragma warning(pop) - } - - inline bool wxFD_ISSET(int fd, fd_set *fds) - { - #pragma warning(push, 1) - #pragma warning(disable:1469) - return FD_ISSET(fd, fds); - #pragma warning(pop) - } - inline void wxFD_CLR(int fd, fd_set *fds) - { - #pragma warning(push, 1) - #pragma warning(disable:1469) - FD_CLR(fd, fds); - #pragma warning(pop) - } -#else // !__INTELC__ - #define wxFD_ZERO(fds) FD_ZERO(fds) - #define wxFD_SET(fd, fds) FD_SET(fd, fds) - #define wxFD_ISSET(fd, fds) FD_ISSET(fd, fds) - #define wxFD_CLR(fd, fds) FD_CLR(fd, fds) -#endif // __INTELC__/!__INTELC__ - -#endif // _WX_PRIVATE_FD_H_ diff --git a/Externals/wxWidgets3/include/wx/private/fdiodispatcher.h b/Externals/wxWidgets3/include/wx/private/fdiodispatcher.h deleted file mode 100644 index 704bd46377..0000000000 --- a/Externals/wxWidgets3/include/wx/private/fdiodispatcher.h +++ /dev/null @@ -1,118 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/private/fdiodispatcher.h -// Purpose: classes for dispatching IO notifications for file descriptors -// Authors: Lukasz Michalski -// Created: December 2006 -// Copyright: (c) Lukasz Michalski -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PRIVATE_FDIODISPATCHER_H_ -#define _WX_PRIVATE_FDIODISPATCHER_H_ - -#include "wx/hashmap.h" -#include "wx/private/fdiohandler.h" - -// those flags describes sets where descriptor should be added -enum wxFDIODispatcherEntryFlags -{ - wxFDIO_INPUT = 1, - wxFDIO_OUTPUT = 2, - wxFDIO_EXCEPTION = 4, - wxFDIO_ALL = wxFDIO_INPUT | wxFDIO_OUTPUT | wxFDIO_EXCEPTION -}; - -// base class for wxSelectDispatcher and wxEpollDispatcher -class WXDLLIMPEXP_BASE wxFDIODispatcher -{ -public: - enum { TIMEOUT_INFINITE = -1 }; - - // return the global dispatcher to be used for IO events, can be NULL only - // if wxSelectDispatcher wasn't compiled into the library at all as - // creating it never fails - // - // don't delete the returned pointer - static wxFDIODispatcher *Get(); - - // if we have any registered handlers, check for any pending events to them - // and dispatch them -- this is used from wxX11 and wxDFB event loops - // implementation - static void DispatchPending(); - - // register handler for the given descriptor with the dispatcher, return - // true on success or false on error - virtual bool RegisterFD(int fd, wxFDIOHandler *handler, int flags) = 0; - - // modify descriptor flags or handler, return true on success - virtual bool ModifyFD(int fd, wxFDIOHandler *handler, int flags) = 0; - - // unregister descriptor previously registered with RegisterFD() - virtual bool UnregisterFD(int fd) = 0; - - // check if any events are currently available without dispatching them - virtual bool HasPending() const = 0; - - // wait for an event for at most timeout milliseconds and process it; - // return the number of events processed (possibly 0 if timeout expired) or - // -1 if an error occurred - virtual int Dispatch(int timeout = TIMEOUT_INFINITE) = 0; - - virtual ~wxFDIODispatcher() { } -}; - -//entry for wxFDIOHandlerMap -struct wxFDIOHandlerEntry -{ - wxFDIOHandlerEntry() - { - } - - wxFDIOHandlerEntry(wxFDIOHandler *handler_, int flags_) - : handler(handler_), - flags(flags_) - { - } - - wxFDIOHandler *handler; - int flags; -}; - -// this hash is used to map file descriptors to their handlers -WX_DECLARE_HASH_MAP( - int, - wxFDIOHandlerEntry, - wxIntegerHash, - wxIntegerEqual, - wxFDIOHandlerMap -); - -// FDIODispatcher that holds map fd <-> FDIOHandler, this should be used if -// this map isn't maintained elsewhere already as it is usually needed anyhow -// -// notice that all functions for FD management have implementation -// in the base class and should be called from the derived classes -class WXDLLIMPEXP_BASE wxMappedFDIODispatcher : public wxFDIODispatcher -{ -public: - // find the handler for the given fd, return NULL if none - wxFDIOHandler *FindHandler(int fd) const; - - // register handler for the given descriptor with the dispatcher, return - // true on success or false on error - virtual bool RegisterFD(int fd, wxFDIOHandler *handler, int flags) wxOVERRIDE; - - // modify descriptor flags or handler, return true on success - virtual bool ModifyFD(int fd, wxFDIOHandler *handler, int flags) wxOVERRIDE; - - // unregister descriptor previously registered with RegisterFD() - virtual bool UnregisterFD(int fd) wxOVERRIDE; - - virtual ~wxMappedFDIODispatcher() { } - -protected: - // the fd -> handler map containing all the registered handlers - wxFDIOHandlerMap m_handlers; -}; - -#endif // _WX_PRIVATE_FDIODISPATCHER_H_ diff --git a/Externals/wxWidgets3/include/wx/private/fdioeventloopsourcehandler.h b/Externals/wxWidgets3/include/wx/private/fdioeventloopsourcehandler.h deleted file mode 100644 index 5ac17de240..0000000000 --- a/Externals/wxWidgets3/include/wx/private/fdioeventloopsourcehandler.h +++ /dev/null @@ -1,38 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/private/fdioeventloopsourcehandler.h -// Purpose: declares wxFDIOEventLoopSourceHandler class -// Author: Rob Bresalier, Vadim Zeitlin -// Created: 2013-06-13 (extracted from src/unix/evtloopunix.cpp) -// Copyright: (c) 2009 Vadim Zeitlin -// (c) 2013 Rob Bresalier -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PRIVATE_FDIO_EVENT_LOOP_SOURCE_HANDLER_H -#define _WX_PRIVATE_FDIO_EVENT_LOOP_SOURCE_HANDLER_H - -#include "wx/evtloopsrc.h" - -// This class is a temporary bridge between event loop sources and -// FDIODispatcher. It is going to be removed soon, when all subject interfaces -// are modified -class wxFDIOEventLoopSourceHandler : public wxFDIOHandler -{ -public: - wxEXPLICIT wxFDIOEventLoopSourceHandler(wxEventLoopSourceHandler* handler) - : m_handler(handler) - { - } - - // Just forward to the real handler. - virtual void OnReadWaiting() wxOVERRIDE { m_handler->OnReadWaiting(); } - virtual void OnWriteWaiting() wxOVERRIDE { m_handler->OnWriteWaiting(); } - virtual void OnExceptionWaiting() wxOVERRIDE { m_handler->OnExceptionWaiting(); } - -protected: - wxEventLoopSourceHandler* const m_handler; - - wxDECLARE_NO_COPY_CLASS(wxFDIOEventLoopSourceHandler); -}; - -#endif // _WX_PRIVATE_FDIO_EVENT_LOOP_SOURCE_HANDLER_H diff --git a/Externals/wxWidgets3/include/wx/private/fdiohandler.h b/Externals/wxWidgets3/include/wx/private/fdiohandler.h deleted file mode 100644 index 94e36490cd..0000000000 --- a/Externals/wxWidgets3/include/wx/private/fdiohandler.h +++ /dev/null @@ -1,53 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/private/fdiohandler.h -// Purpose: declares wxFDIOHandler class -// Author: Vadim Zeitlin -// Created: 2009-08-17 -// Copyright: (c) 2009 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PRIVATE_FDIOHANDLER_H_ -#define _WX_PRIVATE_FDIOHANDLER_H_ - -// ---------------------------------------------------------------------------- -// wxFDIOHandler: interface used to process events on file descriptors -// ---------------------------------------------------------------------------- - -class wxFDIOHandler -{ -public: - wxFDIOHandler() { m_regmask = 0; } - - // called when descriptor is available for non-blocking read - virtual void OnReadWaiting() = 0; - - // called when descriptor is available for non-blocking write - virtual void OnWriteWaiting() = 0; - - // called when there is exception on descriptor - virtual void OnExceptionWaiting() = 0; - - // called to check if the handler is still valid, only used by - // wxSocketImplUnix currently - virtual bool IsOk() const { return true; } - - - // get/set the mask of events for which we're currently registered for: - // it's a combination of wxFDIO_{INPUT,OUTPUT,EXCEPTION} - int GetRegisteredEvents() const { return m_regmask; } - void SetRegisteredEvent(int flag) { m_regmask |= flag; } - void ClearRegisteredEvent(int flag) { m_regmask &= ~flag; } - - - // virtual dtor for the base class - virtual ~wxFDIOHandler() { } - -private: - int m_regmask; - - wxDECLARE_NO_COPY_CLASS(wxFDIOHandler); -}; - -#endif // _WX_PRIVATE_FDIOHANDLER_H_ - diff --git a/Externals/wxWidgets3/include/wx/private/fdiomanager.h b/Externals/wxWidgets3/include/wx/private/fdiomanager.h deleted file mode 100644 index 0721886f35..0000000000 --- a/Externals/wxWidgets3/include/wx/private/fdiomanager.h +++ /dev/null @@ -1,42 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/private/fdiomanager.h -// Purpose: declaration of wxFDIOManager -// Author: Vadim Zeitlin -// Created: 2009-08-17 -// Copyright: (c) 2009 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PRIVATE_FDIOMANAGER_H_ -#define _WX_PRIVATE_FDIOMANAGER_H_ - -#include "wx/private/fdiohandler.h" - -// ---------------------------------------------------------------------------- -// wxFDIOManager: register or unregister wxFDIOHandlers -// ---------------------------------------------------------------------------- - -// currently only used in wxGTK and wxMotif, see wx/unix/apptrait.h - -class wxFDIOManager -{ -public: - // identifies either input or output direction - // - // NB: the values of this enum shouldn't change - enum Direction - { - INPUT, - OUTPUT - }; - - // start or stop monitoring the events on the given file descriptor - virtual int AddInput(wxFDIOHandler *handler, int fd, Direction d) = 0; - virtual void RemoveInput(wxFDIOHandler *handler, int fd, Direction d) = 0; - - // empty but virtual dtor for the base class - virtual ~wxFDIOManager() { } -}; - -#endif // _WX_PRIVATE_FDIOMANAGER_H_ - diff --git a/Externals/wxWidgets3/include/wx/private/fileback.h b/Externals/wxWidgets3/include/wx/private/fileback.h deleted file mode 100644 index a4ca08aee7..0000000000 --- a/Externals/wxWidgets3/include/wx/private/fileback.h +++ /dev/null @@ -1,82 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/private/fileback.h -// Purpose: Back an input stream with memory or a file -// Author: Mike Wetherell -// Copyright: (c) 2006 Mike Wetherell -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_FILEBACK_H__ -#define _WX_FILEBACK_H__ - -#include "wx/defs.h" - -#if wxUSE_FILESYSTEM - -#include "wx/stream.h" - -// ---------------------------------------------------------------------------- -// Backs an input stream with memory or a file to make it seekable. -// -// One or more wxBackedInputStreams can be used to read it's data. The data is -// reference counted, so stays alive until the last wxBackingFile or -// wxBackedInputStream using it is destroyed. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxBackingFile -{ -public: - enum { DefaultBufSize = 16384 }; - - // Takes ownership of stream. If the stream is smaller than bufsize, the - // backing file is never created and the backing is done with memory. - wxBackingFile(wxInputStream *stream, - size_t bufsize = DefaultBufSize, - const wxString& prefix = wxT("wxbf")); - - wxBackingFile() : m_impl(NULL) { } - ~wxBackingFile(); - - wxBackingFile(const wxBackingFile& backer); - wxBackingFile& operator=(const wxBackingFile& backer); - - operator bool() const { return m_impl != NULL; } - -private: - class wxBackingFileImpl *m_impl; - friend class wxBackedInputStream; -}; - -// ---------------------------------------------------------------------------- -// An input stream to read from a wxBackingFile. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxBackedInputStream : public wxInputStream -{ -public: - wxBackedInputStream(const wxBackingFile& backer); - - // If the length of the backer's parent stream is unknown then GetLength() - // returns wxInvalidOffset until the parent has been read to the end. - wxFileOffset GetLength() const wxOVERRIDE; - - // Returns the length, reading the parent stream to the end if necessary. - wxFileOffset FindLength() const; - - bool IsSeekable() const wxOVERRIDE { return true; } - -protected: - size_t OnSysRead(void *buffer, size_t size) wxOVERRIDE; - wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) wxOVERRIDE; - wxFileOffset OnSysTell() const wxOVERRIDE; - -private: - wxBackingFile m_backer; - wxFileOffset m_pos; - - wxDECLARE_NO_COPY_CLASS(wxBackedInputStream); -}; - -#endif // wxUSE_FILESYSTEM - -#endif // _WX_FILEBACK_H__ diff --git a/Externals/wxWidgets3/include/wx/private/filename.h b/Externals/wxWidgets3/include/wx/private/filename.h deleted file mode 100644 index a4ed481020..0000000000 --- a/Externals/wxWidgets3/include/wx/private/filename.h +++ /dev/null @@ -1,55 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/private/filename.h -// Purpose: Internal declarations for src/common/filename.cpp -// Author: Mike Wetherell -// Modified by: -// Created: 2006-10-22 -// Copyright: (c) 2006 Mike Wetherell -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PRIVATE_FILENAME_H_ -#define _WX_PRIVATE_FILENAME_H_ - -#include "wx/file.h" -#include "wx/ffile.h" - -// Self deleting temp files aren't supported on all platforms. Therefore -// rather than let these be in the API, they can be used internally to -// implement classes (e.g. wxTempFileStream), that will do the clean up when -// the OS doesn't support it. - -// Same usage as wxFileName::CreateTempFileName() with the extra parameter -// deleteOnClose. *deleteOnClose true on entry requests a file created with a -// delete on close flag, on exit the value of *deleteOnClose indicates whether -// available. - -#if wxUSE_FILE -wxString wxCreateTempFileName(const wxString& prefix, - wxFile *fileTemp, - bool *deleteOnClose = NULL); -#endif - -#if wxUSE_FFILE -wxString wxCreateTempFileName(const wxString& prefix, - wxFFile *fileTemp, - bool *deleteOnClose = NULL); -#endif - -// Returns an open temp file, if possible either an unlinked open file or one -// that will delete on close. Only returns the filename if neither was -// possible, so that the caller can delete the file when done. - -#if wxUSE_FILE -bool wxCreateTempFile(const wxString& prefix, - wxFile *fileTemp, - wxString *name); -#endif - -#if wxUSE_FFILE -bool wxCreateTempFile(const wxString& prefix, - wxFFile *fileTemp, - wxString *name); -#endif - -#endif // _WX_PRIVATE_FILENAME_H_ diff --git a/Externals/wxWidgets3/include/wx/private/flagscheck.h b/Externals/wxWidgets3/include/wx/private/flagscheck.h deleted file mode 100644 index 3e3d9fbaae..0000000000 --- a/Externals/wxWidgets3/include/wx/private/flagscheck.h +++ /dev/null @@ -1,116 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/private/flagscheck.h -// Purpose: helpers for checking that (bit)flags don't overlap -// Author: Vaclav Slavik -// Created: 2008-02-21 -// Copyright: (c) 2008 Vaclav Slavik -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PRIVATE_FLAGSCHECK_H_ -#define _WX_PRIVATE_FLAGSCHECK_H_ - -#include "wx/debug.h" - -// IBM xlC 8 can't parse the template syntax -#if !defined(__IBMCPP__) - -#include "wx/meta/if.h" - -namespace wxPrivate -{ - -// These templates are used to implement wxADD_FLAG macro below. -// -// The idea is that we want to trigger *compilation* error if the flags -// overlap, not just runtime assert failure. We can't implement the check -// using just a simple logical operation, we need checks equivalent to this -// code: -// -// mask = wxFLAG_1; -// assert( (mask & wxFLAG_2) == 0 ); // no overlap -// mask |= wxFLAG_3; -// assert( (mask & wxFLAG_3) == 0 ); // no overlap -// mask |= wxFLAG_3; -// ... -// -// This can be done at compilation time by using templates metaprogramming -// technique that makes the compiler carry on the computation. -// -// NB: If any of this doesn't compile with your compiler and would be too -// hard to make work, it's probably best to disable this code and replace -// the macros below with empty stubs, this isn't anything critical. - -template struct FlagsHaveConflictingValues -{ - // no value here - triggers compilation error -}; - -template struct FlagValue -{ - enum { value = val }; -}; - -// This template adds its template parameter integer 'add' to another integer -// 'all' and produces their OR-combination (all | add). The result is "stored" -// as constant SafelyAddToMask<>::value. Combination of many flags is achieved -// by chaining parameter lists: the 'add' parameter is value member of -// another (different) SafelyAddToMask<> instantiation. -template struct SafelyAddToMask -{ - // This typedefs ensures that no flags in the list conflict. If there's - // any overlap between the already constructed part of the mask ('all') - // and the value being added to it ('add'), the test that is wxIf<>'s - // first parameter will be non-zero and so Added value will be - // FlagsHaveConflictingValues. The next statement will try to use - // AddedValue::value, but there's no such thing in - // FlagsHaveConflictingValues<> and so compilation will fail. - typedef typename wxIf<(all & add) == 0, - FlagValue, - FlagsHaveConflictingValues >::value - AddedValue; - - enum { value = all | AddedValue::value }; -}; - -} // wxPrivate namespace - - - -// This macro is used to ensure that no two flags that can be combined in -// the same integer value have overlapping bits. This is sometimes not entirely -// trivial to ensure, for example in wxWindow styles or flags for wxSizerItem -// that span several enums, some of them used for multiple purposes. -// -// By constructing allowed flags mask using wxADD_FLAG macro and then using -// this mask to check flags passed as arguments, you can ensure that -// -// a) if any of the allowed flags overlap, you will get compilation error -// b) if invalid flag is used, there will be an assert at runtime -// -// Example usage: -// -// static const int SIZER_FLAGS_MASK = -// wxADD_FLAG(wxCENTRE, -// wxADD_FLAG(wxHORIZONTAL, -// wxADD_FLAG(wxVERTICAL, -// ... -// 0))...); -// -// And wherever flags are used: -// -// wxASSERT_VALID_FLAG( m_flag, SIZER_FLAGS_MASK ); - -#define wxADD_FLAG(f, others) \ - ::wxPrivate::SafelyAddToMask::value - -#else - #define wxADD_FLAG(f, others) (f | others) -#endif - -// Checks if flags value 'f' is within the mask of allowed values -#define wxASSERT_VALID_FLAGS(f, mask) \ - wxASSERT_MSG( (f & mask) == f, \ - "invalid flag: not within " #mask ) - -#endif // _WX_PRIVATE_FLAGSCHECK_H_ diff --git a/Externals/wxWidgets3/include/wx/private/fontmgr.h b/Externals/wxWidgets3/include/wx/private/fontmgr.h deleted file mode 100644 index c00270a6b1..0000000000 --- a/Externals/wxWidgets3/include/wx/private/fontmgr.h +++ /dev/null @@ -1,247 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/private/fontmgr.h -// Purpose: font management for ports that don't have their own -// Author: Vaclav Slavik -// Created: 2006-11-18 -// Copyright: (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com) -// (c) 2006 REA Elektronik GmbH -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PRIVATE_FONTMGR_H_ -#define _WX_PRIVATE_FONTMGR_H_ - -#include "wx/list.h" -#include "wx/fontutil.h" - -class wxFontsManager; -class wxFontInstance; -class wxFontInstanceList; -class wxFontFace; -class wxFontBundle; -class wxFontBundleHash; -class wxFontMgrFontRefData; - -WX_DECLARE_LIST(wxFontBundle, wxFontBundleList); - -/** - This class represents single font face with set parameters (point size, - antialiasing). - */ -class wxFontInstanceBase -{ -protected: - wxFontInstanceBase(float ptSize, bool aa) : m_ptSize(ptSize), m_aa(aa) {} - virtual ~wxFontInstanceBase() {} - -public: - float GetPointSize() const { return m_ptSize; } - bool IsAntiAliased() const { return m_aa; } - -protected: - float m_ptSize; - bool m_aa; -}; - - -/// This class represents loaded font face (bundle+weight+italics). -class wxFontFaceBase -{ -protected: - /// Ctor. Creates object with reference count = 0, Acquire() must be - /// called after the object is created. - wxFontFaceBase(); - virtual ~wxFontFaceBase(); - -public: - /// Increases reference count of the face - virtual void Acquire(); - - /** - Decreases reference count of the face. Call this when you no longer - use the object returned by wxFontBundle. Note that this doesn't destroy - the object, but only optionally shuts it down, so it's possible to - call Acquire() and Release() more than once. - */ - virtual void Release(); - - /** - Returns instance of the font at given size. - - @param ptSize point size of the font to create; note that this is - a float and not integer, it should be wxFont's point - size multipled by wxDC's scale factor - @param aa should the font be antialiased? - */ - virtual wxFontInstance *GetFontInstance(float ptSize, bool aa); - -protected: - /// Called to create a new instance of the font by GetFontInstance() if - /// it wasn't found it cache. - virtual wxFontInstance *CreateFontInstance(float ptSize, bool aa) = 0; - -protected: - unsigned m_refCnt; - wxFontInstanceList *m_instances; -}; - -/** - This class represents font bundle. Font bundle is set of faces that have - the same name, but differ in weight and italics. - */ -class wxFontBundleBase -{ -public: - wxFontBundleBase(); - virtual ~wxFontBundleBase(); - - /// Returns name of the bundle - virtual wxString GetName() const = 0; - - /// Returns true if the font is fixe-width - virtual bool IsFixed() const = 0; - - /// Type of faces in the bundle - enum FaceType - { - // NB: values of these constants are set so that it's possible to - // make OR-combinations of them and still get valid enum element - FaceType_Regular = 0, - FaceType_Italic = 1, - FaceType_Bold = 2, - FaceType_BoldItalic = FaceType_Italic | FaceType_Bold, - - FaceType_Max - }; - - /// Returns true if the given face is available - bool HasFace(FaceType type) const { return m_faces[type] != NULL; } - - /** - Returns font face object that can be used to render font of given type. - - Note that this method can only be called if HasFace(type) returns true. - - Acquire() was called on the returned object, you must call Release() - when you stop using it. - */ - wxFontFace *GetFace(FaceType type) const; - - /** - Returns font face object that can be used to render given font. - - Acquire() was called on the returned object, you must call Release() - when you stop using it. - */ - wxFontFace *GetFaceForFont(const wxFontMgrFontRefData& font) const; - -protected: - wxFontFace *m_faces[FaceType_Max]; -}; - - -/** - Base class for wxFontsManager class, which manages the list of all - available fonts and their loaded instances. - */ -class wxFontsManagerBase -{ -protected: - wxFontsManagerBase(); - virtual ~wxFontsManagerBase(); - -public: - /// Returns the font manager singleton, creating it if it doesn't exist - static wxFontsManager *Get(); - - /// Called by wxApp to shut down the manager - static void CleanUp(); - - /// Returns list of all available font bundles - const wxFontBundleList& GetBundles() const { return *m_list; } - - /** - Returns object representing font bundle with the given name. - - The returned object is owned by wxFontsManager, you must not delete it. - */ - wxFontBundle *GetBundle(const wxString& name) const; - - /** - Returns object representing font bundle that can be used to render - given font. - - The returned object is owned by wxFontsManager, you must not delete it. - */ - wxFontBundle *GetBundleForFont(const wxFontMgrFontRefData& font) const; - - /// This method must be called by derived - void AddBundle(wxFontBundle *bundle); - - /// Returns default facename for given wxFont family - virtual wxString GetDefaultFacename(wxFontFamily family) const = 0; - -private: - wxFontBundleHash *m_hash; - wxFontBundleList *m_list; - -protected: - static wxFontsManager *ms_instance; -}; - - - -#if defined(__WXDFB__) - #include "wx/dfb/private/fontmgr.h" -#endif - - - -/// wxFontMgrFontRefData implementation using wxFontsManager classes -class wxFontMgrFontRefData : public wxGDIRefData -{ -public: - wxFontMgrFontRefData(int size = wxDEFAULT, - wxFontFamily family = wxFONTFAMILY_DEFAULT, - wxFontStyle style = wxFONTSTYLE_NORMAL, - wxFontWeight weight = wxFONTWEIGHT_NORMAL, - bool underlined = false, - const wxString& faceName = wxEmptyString, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT); - wxFontMgrFontRefData(const wxFontMgrFontRefData& data); - ~wxFontMgrFontRefData(); - - wxFontBundle *GetFontBundle() const; - wxFontInstance *GetFontInstance(float scale, bool antialiased) const; - - bool IsFixedWidth() const { return GetFontBundle()->IsFixed(); } - - const wxNativeFontInfo *GetNativeFontInfo() const { return &m_info; } - - int GetPointSize() const { return m_info.pointSize; } - wxString GetFaceName() const { return m_info.faceName; } - wxFontFamily GetFamily() const { return m_info.family; } - wxFontStyle GetStyle() const { return m_info.style; } - wxFontWeight GetWeight() const { return m_info.weight; } - bool GetUnderlined() const { return m_info.underlined; } - wxFontEncoding GetEncoding() const { return m_info.encoding; } - - void SetPointSize(int pointSize); - void SetFamily(wxFontFamily family); - void SetStyle(wxFontStyle style); - void SetWeight(wxFontWeight weight); - void SetFaceName(const wxString& faceName); - void SetUnderlined(bool underlined); - void SetEncoding(wxFontEncoding encoding); - -private: - void EnsureValidFont(); - - wxNativeFontInfo m_info; - - wxFontFace *m_fontFace; - wxFontBundle *m_fontBundle; - bool m_fontValid; -}; - -#endif // _WX_PRIVATE_FONTMGR_H_ diff --git a/Externals/wxWidgets3/include/wx/private/fswatcher.h b/Externals/wxWidgets3/include/wx/private/fswatcher.h deleted file mode 100644 index e2bf55a89d..0000000000 --- a/Externals/wxWidgets3/include/wx/private/fswatcher.h +++ /dev/null @@ -1,115 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/private/fswatcher.h -// Purpose: File system watcher impl classes -// Author: Bartosz Bekier -// Created: 2009-05-26 -// Copyright: (c) 2009 Bartosz Bekier -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef WX_PRIVATE_FSWATCHER_H_ -#define WX_PRIVATE_FSWATCHER_H_ - -#include "wx/sharedptr.h" - -#ifdef wxHAS_INOTIFY - class wxFSWatchEntryUnix; - #define wxFSWatchEntry wxFSWatchEntryUnix - WX_DECLARE_STRING_HASH_MAP(wxSharedPtr,wxFSWatchEntries); - #include "wx/unix/private/fswatcher_inotify.h" -#elif defined(wxHAS_KQUEUE) - class wxFSWatchEntryKq; - #define wxFSWatchEntry wxFSWatchEntryKq - WX_DECLARE_STRING_HASH_MAP(wxSharedPtr,wxFSWatchEntries); - #include "wx/unix/private/fswatcher_kqueue.h" -#elif defined(__WINDOWS__) - class wxFSWatchEntryMSW; - #define wxFSWatchEntry wxFSWatchEntryMSW - WX_DECLARE_STRING_HASH_MAP(wxSharedPtr,wxFSWatchEntries); - #include "wx/msw/private/fswatcher.h" -#else - #define wxFSWatchEntry wxFSWatchEntryPolling -#endif - -class wxFSWatcherImpl -{ -public: - wxFSWatcherImpl(wxFileSystemWatcherBase* watcher) : - m_watcher(watcher) - { - } - - virtual ~wxFSWatcherImpl() - { - (void) RemoveAll(); - } - - virtual bool Init() = 0; - - virtual bool Add(const wxFSWatchInfo& winfo) - { - if ( m_watches.find(winfo.GetPath()) != m_watches.end() ) - { - wxLogTrace(wxTRACE_FSWATCHER, - "Path '%s' is already watched", winfo.GetPath()); - // This can happen if a dir is watched, then a parent tree added - return true; - } - - // construct watch entry - wxSharedPtr watch(new wxFSWatchEntry(winfo)); - - if (!DoAdd(watch)) - return false; - - // add watch to our map (always succeedes, checked above) - wxFSWatchEntries::value_type val(watch->GetPath(), watch); - return m_watches.insert(val).second; - } - - virtual bool Remove(const wxFSWatchInfo& winfo) - { - wxFSWatchEntries::iterator it = m_watches.find(winfo.GetPath()); - if ( it == m_watches.end() ) - { - wxLogTrace(wxTRACE_FSWATCHER, - "Path '%s' is not watched", winfo.GetPath()); - // This can happen if a dir is watched, then a parent tree added - return true; - } - wxSharedPtr watch = it->second; - m_watches.erase(it); - return DoRemove(watch); - } - - virtual bool RemoveAll() - { - bool ret = true; - for ( wxFSWatchEntries::iterator it = m_watches.begin(); - it != m_watches.end(); - ++it ) - { - if ( !DoRemove(it->second) ) - ret = false; - } - m_watches.clear(); - return ret; - } - - // Check whether any filespec matches the file's ext (if present) - bool MatchesFilespec(const wxFileName& fn, const wxString& filespec) const - { - return filespec.empty() || wxMatchWild(filespec, fn.GetFullName()); - } - -protected: - virtual bool DoAdd(wxSharedPtr watch) = 0; - - virtual bool DoRemove(wxSharedPtr watch) = 0; - - wxFSWatchEntries m_watches; - wxFileSystemWatcherBase* m_watcher; -}; - - -#endif /* WX_PRIVATE_FSWATCHER_H_ */ diff --git a/Externals/wxWidgets3/include/wx/private/graphics.h b/Externals/wxWidgets3/include/wx/private/graphics.h deleted file mode 100644 index a5f303dd47..0000000000 --- a/Externals/wxWidgets3/include/wx/private/graphics.h +++ /dev/null @@ -1,168 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/private/graphics.h -// Purpose: private graphics context header -// Author: Stefan Csomor -// Modified by: -// Created: -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GRAPHICS_PRIVATE_H_ -#define _WX_GRAPHICS_PRIVATE_H_ - -#if wxUSE_GRAPHICS_CONTEXT - -#include "wx/graphics.h" - -class WXDLLIMPEXP_CORE wxGraphicsObjectRefData : public wxObjectRefData -{ - public : - wxGraphicsObjectRefData( wxGraphicsRenderer* renderer ); - wxGraphicsObjectRefData( const wxGraphicsObjectRefData* data ); - wxGraphicsRenderer* GetRenderer() const ; - virtual wxGraphicsObjectRefData* Clone() const ; - - protected : - wxGraphicsRenderer* m_renderer; -} ; - -class WXDLLIMPEXP_CORE wxGraphicsBitmapData : public wxGraphicsObjectRefData -{ -public : - wxGraphicsBitmapData( wxGraphicsRenderer* renderer) : - wxGraphicsObjectRefData(renderer) {} - - virtual ~wxGraphicsBitmapData() {} - - // returns the native representation - virtual void * GetNativeBitmap() const = 0; -} ; - -class WXDLLIMPEXP_CORE wxGraphicsMatrixData : public wxGraphicsObjectRefData -{ -public : - wxGraphicsMatrixData( wxGraphicsRenderer* renderer) : - wxGraphicsObjectRefData(renderer) {} - - virtual ~wxGraphicsMatrixData() {} - - // concatenates the matrix - virtual void Concat( const wxGraphicsMatrixData *t ) = 0; - - // sets the matrix to the respective values - virtual void Set(wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0, - wxDouble tx=0.0, wxDouble ty=0.0) = 0; - - // gets the component valuess of the matrix - virtual void Get(wxDouble* a=NULL, wxDouble* b=NULL, wxDouble* c=NULL, - wxDouble* d=NULL, wxDouble* tx=NULL, wxDouble* ty=NULL) const = 0; - - // makes this the inverse matrix - virtual void Invert() = 0; - - // returns true if the elements of the transformation matrix are equal ? - virtual bool IsEqual( const wxGraphicsMatrixData* t) const = 0; - - // return true if this is the identity matrix - virtual bool IsIdentity() const = 0; - - // - // transformation - // - - // add the translation to this matrix - virtual void Translate( wxDouble dx , wxDouble dy ) = 0; - - // add the scale to this matrix - virtual void Scale( wxDouble xScale , wxDouble yScale ) = 0; - - // add the rotation to this matrix (radians) - virtual void Rotate( wxDouble angle ) = 0; - - // - // apply the transforms - // - - // applies that matrix to the point - virtual void TransformPoint( wxDouble *x, wxDouble *y ) const = 0; - - // applies the matrix except for translations - virtual void TransformDistance( wxDouble *dx, wxDouble *dy ) const =0; - - // returns the native representation - virtual void * GetNativeMatrix() const = 0; -} ; - -class WXDLLIMPEXP_CORE wxGraphicsPathData : public wxGraphicsObjectRefData -{ -public : - wxGraphicsPathData(wxGraphicsRenderer* renderer) : wxGraphicsObjectRefData(renderer) {} - virtual ~wxGraphicsPathData() {} - - // - // These are the path primitives from which everything else can be constructed - // - - // begins a new subpath at (x,y) - virtual void MoveToPoint( wxDouble x, wxDouble y ) = 0; - - // adds a straight line from the current point to (x,y) - virtual void AddLineToPoint( wxDouble x, wxDouble y ) = 0; - - // adds a cubic Bezier curve from the current point, using two control points and an end point - virtual void AddCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble cx2, wxDouble cy2, wxDouble x, wxDouble y ) = 0; - - // adds another path - virtual void AddPath( const wxGraphicsPathData* path ) =0; - - // closes the current sub-path - virtual void CloseSubpath() = 0; - - // gets the last point of the current path, (0,0) if not yet set - virtual void GetCurrentPoint( wxDouble* x, wxDouble* y) const = 0; - - // adds an arc of a circle centering at (x,y) with radius (r) from startAngle to endAngle - virtual void AddArc( wxDouble x, wxDouble y, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise ) = 0; - - // - // These are convenience functions which - if not available natively will be assembled - // using the primitives from above - // - - // adds a quadratic Bezier curve from the current point, using a control point and an end point - virtual void AddQuadCurveToPoint( wxDouble cx, wxDouble cy, wxDouble x, wxDouble y ); - - // appends a rectangle as a new closed subpath - virtual void AddRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h ); - - // appends an ellipsis as a new closed subpath fitting the passed rectangle - virtual void AddCircle( wxDouble x, wxDouble y, wxDouble r ); - - // appends a an arc to two tangents connecting (current) to (x1,y1) and (x1,y1) to (x2,y2), also a straight line from (current) to (x1,y1) - virtual void AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r ) ; - - // appends an ellipse - virtual void AddEllipse( wxDouble x, wxDouble y, wxDouble w, wxDouble h); - - // appends a rounded rectangle - virtual void AddRoundedRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h, wxDouble radius); - - // returns the native path - virtual void * GetNativePath() const = 0; - - // give the native path returned by GetNativePath() back (there might be some deallocations necessary) - virtual void UnGetNativePath(void *p) const= 0; - - // transforms each point of this path by the matrix - virtual void Transform( const wxGraphicsMatrixData* matrix ) =0; - - // gets the bounding box enclosing all points (possibly including control points) - virtual void GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) const=0; - - virtual bool Contains( wxDouble x, wxDouble y, wxPolygonFillMode fillStyle = wxODDEVEN_RULE) const=0; -}; - -#endif - -#endif // _WX_GRAPHICS_PRIVATE_H_ diff --git a/Externals/wxWidgets3/include/wx/private/launchbrowser.h b/Externals/wxWidgets3/include/wx/private/launchbrowser.h deleted file mode 100644 index 984df897c9..0000000000 --- a/Externals/wxWidgets3/include/wx/private/launchbrowser.h +++ /dev/null @@ -1,43 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/private/launchbrowser.h -// Purpose: Helpers for wxLaunchDefaultBrowser() implementation. -// Author: Vadim Zeitlin -// Created: 2016-02-07 -// Copyright: (c) 2016 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PRIVATE_LAUNCHBROWSER_H_ -#define _WX_PRIVATE_LAUNCHBROWSER_H_ - -// ---------------------------------------------------------------------------- -// wxLaunchBrowserParams: passed to wxDoLaunchDefaultBrowser() -// ---------------------------------------------------------------------------- - -struct wxLaunchBrowserParams -{ - explicit wxLaunchBrowserParams(int f) : flags(f) { } - - // Return either the URL or the file depending on our scheme. - const wxString& GetPathOrURL() const - { - return scheme == wxS("file") ? path : url; - } - - - // The URL is always specified and is the real URL, always with the scheme - // part, which can be "file://". - wxString url; - - // The path is a local path which is only non-empty if the URL uses the - // "file://" scheme. - wxString path; - - // The scheme of the URL, e.g. "file" or "http". - wxString scheme; - - // The flags passed to wxLaunchDefaultBrowser(). - int flags; -}; - -#endif // _WX_PRIVATE_LAUNCHBROWSER_H_ diff --git a/Externals/wxWidgets3/include/wx/private/markupparser.h b/Externals/wxWidgets3/include/wx/private/markupparser.h deleted file mode 100644 index 855d92ad05..0000000000 --- a/Externals/wxWidgets3/include/wx/private/markupparser.h +++ /dev/null @@ -1,176 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/private/markupparser.h -// Purpose: Classes for parsing simple markup. -// Author: Vadim Zeitlin -// Created: 2011-02-16 -// Copyright: (c) 2011 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PRIVATE_MARKUPPARSER_H_ -#define _WX_PRIVATE_MARKUPPARSER_H_ - -#include "wx/string.h" - -// ---------------------------------------------------------------------------- -// wxMarkupSpanAttributes: information about attributes for a markup span. -// ---------------------------------------------------------------------------- - -struct wxMarkupSpanAttributes -{ - enum OptionalBool - { - Unspecified = -1, - No, - Yes - }; - - wxMarkupSpanAttributes() - { - m_sizeKind = Size_Unspecified; - - m_isBold = - m_isItalic = - m_isUnderlined = - m_isStrikethrough = Unspecified; - } - - // If a string is empty, it means that the corresponding attribute is not - // set. - wxString m_fgCol, - m_bgCol, - m_fontFace; - - // There are many ways of specifying the size. First of all, the size may - // be relative in which case m_fontSize is either -1 or +1 meaning that - // it's one step smaller or larger than the current font. Second, it may be - // absolute in which case m_fontSize contains either the size in 1024th of - // a point (Pango convention) or its values are in [-3, 3] interval and map - // to [xx-small, xx-large] CSS-like font size specification. And finally it - // may be not specified at all, of course, in which case the value of - // m_fontSize doesn't matter and it shouldn't be used. - enum - { - Size_Unspecified, - Size_Relative, - Size_Symbolic, - Size_PointParts - } m_sizeKind; - int m_fontSize; - - // If the value is Unspecified, the attribute wasn't given. - OptionalBool m_isBold, - m_isItalic, - m_isUnderlined, - m_isStrikethrough; -}; - -// ---------------------------------------------------------------------------- -// wxMarkupParserOutput: gathers the results of parsing markup. -// ---------------------------------------------------------------------------- - -// A class deriving directly from this one needs to implement all the pure -// virtual functions below but as the handling of all simple tags (bold, italic -// &c) is often very similar, it is usually more convenient to inherit from -// wxMarkupParserFontOutput defined in wx/private/markupparserfont.h instead. -class wxMarkupParserOutput -{ -public: - wxMarkupParserOutput() { } - virtual ~wxMarkupParserOutput() { } - - // Virtual functions called by wxMarkupParser while parsing the markup. - - // Called for a run of normal text. - virtual void OnText(const wxString& text) = 0; - - // These functions correspond to the simple tags without parameters. - virtual void OnBoldStart() = 0; - virtual void OnBoldEnd() = 0; - - virtual void OnItalicStart() = 0; - virtual void OnItalicEnd() = 0; - - virtual void OnUnderlinedStart() = 0; - virtual void OnUnderlinedEnd() = 0; - - virtual void OnStrikethroughStart() = 0; - virtual void OnStrikethroughEnd() = 0; - - virtual void OnBigStart() = 0; - virtual void OnBigEnd() = 0; - - virtual void OnSmallStart() = 0; - virtual void OnSmallEnd() = 0; - - virtual void OnTeletypeStart() = 0; - virtual void OnTeletypeEnd() = 0; - - // The generic span start and end functions. - virtual void OnSpanStart(const wxMarkupSpanAttributes& attrs) = 0; - virtual void OnSpanEnd(const wxMarkupSpanAttributes& attrs) = 0; - -private: - wxDECLARE_NO_COPY_CLASS(wxMarkupParserOutput); -}; - -// ---------------------------------------------------------------------------- -// wxMarkupParser: parses the given markup text into wxMarkupParserOutput. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxMarkupParser -{ -public: - // Initialize the parser with the object that will receive parsing results. - // This object lifetime must be greater than ours. - explicit wxMarkupParser(wxMarkupParserOutput& output) - : m_output(output) - { - } - - // Parse the entire string and call wxMarkupParserOutput methods. - // - // Return true if the string was successfully parsed or false if it failed - // (presumably because of syntax errors in the markup). - bool Parse(const wxString& text); - - // Quote a normal string, not meant to be interpreted as markup, so that it - // produces the same string when parsed as markup. This means, for example, - // replacing '<' in the input string with "<" to prevent them from being - // interpreted as tag opening characters. - static wxString Quote(const wxString& text); - - // Strip markup from a string, i.e. simply remove all tags and replace - // XML entities with their values (or with "&&" in case of "&" to - // prevent it from being interpreted as mnemonic marker). - static wxString Strip(const wxString& text); - -private: - // Simple struct combining the name of a tag and its attributes. - struct TagAndAttrs - { - TagAndAttrs(const wxString& name_) : name(name_) { } - - wxString name; - wxMarkupSpanAttributes attrs; - }; - - // Call the wxMarkupParserOutput method corresponding to the given tag. - // - // Return false if the tag doesn't match any of the known ones. - bool OutputTag(const TagAndAttrs& tagAndAttrs, bool start); - - // Parse the attributes and fill the provided TagAndAttrs object with the - // information about them. Does nothing if attrs string is empty. - // - // Returns empty string on success of a [fragment of an] error message if - // we failed to parse the attributes. - wxString ParseAttrs(wxString attrs, TagAndAttrs& tagAndAttrs); - - - wxMarkupParserOutput& m_output; - - wxDECLARE_NO_COPY_CLASS(wxMarkupParser); -}; - -#endif // _WX_PRIVATE_MARKUPPARSER_H_ diff --git a/Externals/wxWidgets3/include/wx/private/markupparserattr.h b/Externals/wxWidgets3/include/wx/private/markupparserattr.h deleted file mode 100644 index 998a0414a9..0000000000 --- a/Externals/wxWidgets3/include/wx/private/markupparserattr.h +++ /dev/null @@ -1,231 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/private/markupparserattr.h -// Purpose: Classes mapping markup attributes to wxFont/wxColour. -// Author: Vadim Zeitlin -// Created: 2011-02-18 -// Copyright: (c) 2011 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PRIVATE_MARKUPPARSERATTR_H_ -#define _WX_PRIVATE_MARKUPPARSERATTR_H_ - -#include "wx/private/markupparser.h" - -#include "wx/stack.h" - -#include "wx/colour.h" -#include "wx/font.h" - -// ---------------------------------------------------------------------------- -// wxMarkupParserAttrOutput: simplified wxFont-using version of the above. -// ---------------------------------------------------------------------------- - -// This class assumes that wxFont and wxColour are used to perform all the -// markup tags and implements the base class virtual functions in terms of -// OnAttr{Start,End}() only. -// -// Notice that you still must implement OnText() inherited from the base class -// when deriving from this one. -class wxMarkupParserAttrOutput : public wxMarkupParserOutput -{ -public: - // A simple container of font and colours. - struct Attr - { - Attr(const wxFont& font_, - const wxColour& foreground_ = wxColour(), - const wxColour& background_ = wxColour()) - : font(font_), foreground(foreground_), background(background_) - { - } - - wxFont font; - wxColour foreground, - background; - }; - - - // This object must be initialized with the font and colours to use - // initially, i.e. the ones used before any tags in the string. - wxMarkupParserAttrOutput(const wxFont& font, - const wxColour& foreground, - const wxColour& background) - { - m_attrs.push(Attr(font, foreground, background)); - } - - // Indicates the change of the font and/or colours used. Any of the - // fields of the argument may be invalid indicating that the corresponding - // attribute didn't actually change. - virtual void OnAttrStart(const Attr& attr) = 0; - - // Indicates the end of the region affected by the given attributes - // (the same ones that were passed to the matching OnAttrStart(), use - // GetAttr() to get the ones that will be used from now on). - virtual void OnAttrEnd(const Attr& attr) = 0; - - - // Implement all pure virtual methods inherited from the base class in - // terms of our own ones. - virtual void OnBoldStart() wxOVERRIDE { DoChangeFont(&wxFont::Bold); } - virtual void OnBoldEnd() wxOVERRIDE { DoEndAttr(); } - - virtual void OnItalicStart() wxOVERRIDE { DoChangeFont(&wxFont::Italic); } - virtual void OnItalicEnd() wxOVERRIDE { DoEndAttr(); } - - virtual void OnUnderlinedStart() wxOVERRIDE { DoChangeFont(&wxFont::Underlined); } - virtual void OnUnderlinedEnd() wxOVERRIDE { DoEndAttr(); } - - virtual void OnStrikethroughStart() wxOVERRIDE { DoChangeFont(&wxFont::Strikethrough); } - virtual void OnStrikethroughEnd() wxOVERRIDE { DoEndAttr(); } - - virtual void OnBigStart() wxOVERRIDE { DoChangeFont(&wxFont::Larger); } - virtual void OnBigEnd() wxOVERRIDE { DoEndAttr(); } - - virtual void OnSmallStart() wxOVERRIDE { DoChangeFont(&wxFont::Smaller); } - virtual void OnSmallEnd() wxOVERRIDE { DoEndAttr(); } - - virtual void OnTeletypeStart() wxOVERRIDE - { - wxFont font(GetFont()); - font.SetFamily(wxFONTFAMILY_TELETYPE); - DoSetFont(font); - } - virtual void OnTeletypeEnd() wxOVERRIDE { DoEndAttr(); } - - virtual void OnSpanStart(const wxMarkupSpanAttributes& spanAttr) wxOVERRIDE - { - wxFont font(GetFont()); - if ( !spanAttr.m_fontFace.empty() ) - font.SetFaceName(spanAttr.m_fontFace); - - FontModifier()(spanAttr.m_isBold, - font, &wxFont::SetWeight, - wxFONTWEIGHT_NORMAL, wxFONTWEIGHT_BOLD); - - FontModifier()(spanAttr.m_isItalic, - font, &wxFont::SetStyle, - wxFONTSTYLE_NORMAL, wxFONTSTYLE_ITALIC); - - FontModifier()(spanAttr.m_isUnderlined, - font, &wxFont::SetUnderlined, - false, true); - - // TODO: No support for strike-through yet. - - switch ( spanAttr.m_sizeKind ) - { - case wxMarkupSpanAttributes::Size_Unspecified: - break; - - case wxMarkupSpanAttributes::Size_Relative: - if ( spanAttr.m_fontSize > 0 ) - font.MakeLarger(); - else - font.MakeSmaller(); - break; - - case wxMarkupSpanAttributes::Size_Symbolic: - // The values of font size intentionally coincide with the - // values of wxFontSymbolicSize enum elements so simply cast - // one to the other. - font.SetSymbolicSize( - static_cast(spanAttr.m_fontSize) - ); - break; - - case wxMarkupSpanAttributes::Size_PointParts: - font.SetPointSize((spanAttr.m_fontSize + 1023)/1024); - break; - } - - - const Attr attr(font, spanAttr.m_fgCol, spanAttr.m_bgCol); - OnAttrStart(attr); - - m_attrs.push(attr); - } - - virtual void OnSpanEnd(const wxMarkupSpanAttributes& WXUNUSED(spanAttr)) wxOVERRIDE - { - DoEndAttr(); - } - -protected: - // Get the current attributes, i.e. the ones that should be used for - // rendering (or measuring or whatever) the text at the current position in - // the string. - // - // It may be called from OnAttrStart() to get the old attributes used - // before and from OnAttrEnd() to get the new attributes that will be used - // from now on but is mostly meant to be used from overridden OnText() - // implementations. - const Attr& GetAttr() const { return m_attrs.top(); } - - // A shortcut for accessing the font of the current attribute. - const wxFont& GetFont() const { return GetAttr().font; } - -private: - // Change only the font to the given one. Call OnAttrStart() to notify - // about the change and update the attributes stack. - void DoSetFont(const wxFont& font) - { - const Attr attr(font); - - OnAttrStart(attr); - - m_attrs.push(attr); - } - - // Apply the given function to the font currently on top of the font stack, - // push the new font on the stack and call OnAttrStart() with it. - void DoChangeFont(wxFont (wxFont::*func)() const) - { - DoSetFont((GetFont().*func)()); - } - - void DoEndAttr() - { - const Attr attr(m_attrs.top()); - m_attrs.pop(); - - OnAttrEnd(attr); - } - - // A helper class used to apply the given function to a wxFont object - // depending on the value of an OptionalBool. - template - struct FontModifier - { - FontModifier() { } - - void operator()(wxMarkupSpanAttributes::OptionalBool isIt, - wxFont& font, - void (wxFont::*func)(T), - T noValue, - T yesValue) - { - switch ( isIt ) - { - case wxMarkupSpanAttributes::Unspecified: - break; - - case wxMarkupSpanAttributes::No: - (font.*func)(noValue); - break; - - case wxMarkupSpanAttributes::Yes: - (font.*func)(yesValue); - break; - } - } - }; - - - wxStack m_attrs; - - wxDECLARE_NO_COPY_CLASS(wxMarkupParserAttrOutput); -}; - -#endif // _WX_PRIVATE_MARKUPPARSERATTR_H_ diff --git a/Externals/wxWidgets3/include/wx/private/notifmsg.h b/Externals/wxWidgets3/include/wx/private/notifmsg.h deleted file mode 100644 index 3f02a29e72..0000000000 --- a/Externals/wxWidgets3/include/wx/private/notifmsg.h +++ /dev/null @@ -1,76 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/private/notifmsg.h -// Purpose: wxNotificationMessage declarations -// Author: Tobias Taschner -// Created: 2015-08-04 -// Copyright: (c) 2015 wxWidgets development team -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PRIVATE_NOTIFMSG_H_ -#define _WX_PRIVATE_NOTIFMSG_H_ - -class wxNotificationMessageImpl -{ -public: - wxNotificationMessageImpl(wxNotificationMessageBase* notification): - m_notification(notification), - m_active(false) - { - - } - - virtual ~wxNotificationMessageImpl() { } - - virtual bool Show(int timeout) = 0; - - virtual bool Close() = 0; - - virtual void SetTitle(const wxString& title) = 0; - - virtual void SetMessage(const wxString& message) = 0; - - virtual void SetParent(wxWindow *parent) = 0; - - virtual void SetFlags(int flags) = 0; - - virtual void SetIcon(const wxIcon& icon) = 0; - - virtual bool AddAction(wxWindowID actionid, const wxString &label) = 0; - - virtual void Detach() - { - if (m_active) - m_notification = NULL; - else - delete this; - } - - bool ProcessNotificationEvent(wxEvent& event) - { - if (m_notification) - return m_notification->ProcessEvent(event); - else - return false; - } - - wxNotificationMessageBase* GetNotification() const - { - return m_notification; - } - -protected: - wxNotificationMessageBase* m_notification; - bool m_active; - - void SetActive(bool active) - { - m_active = active; - - // Delete the implementation if the notification is detached - if (!m_notification && !active) - delete this; - } -}; - -#endif // _WX_PRIVATE_NOTIFMSG_H_ diff --git a/Externals/wxWidgets3/include/wx/private/overlay.h b/Externals/wxWidgets3/include/wx/private/overlay.h deleted file mode 100644 index 1149701f7c..0000000000 --- a/Externals/wxWidgets3/include/wx/private/overlay.h +++ /dev/null @@ -1,66 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/private/overlay.h -// Purpose: wxOverlayImpl declaration -// Author: Stefan Csomor -// Modified by: -// Created: 2006-10-20 -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PRIVATE_OVERLAY_H_ -#define _WX_PRIVATE_OVERLAY_H_ - -#include "wx/overlay.h" - -#ifdef wxHAS_NATIVE_OVERLAY - -#if defined(__WXMAC__) - #include "wx/osx/carbon/private/overlay.h" -#elif defined(__WXDFB__) - #include "wx/dfb/private/overlay.h" -#else - #error "unknown native wxOverlay implementation" -#endif - -#else // !wxHAS_NATIVE_OVERLAY - -#include "wx/bitmap.h" - -class WXDLLIMPEXP_FWD_CORE wxWindow; - -// generic implementation of wxOverlay -class wxOverlayImpl -{ -public: - wxOverlayImpl(); - ~wxOverlayImpl(); - - - // clears the overlay without restoring the former state - // to be done eg when the window content has been changed and repainted - void Reset(); - - // returns true if it has been setup - bool IsOk(); - - void Init(wxDC* dc, int x , int y , int width , int height); - - void BeginDrawing(wxDC* dc); - - void EndDrawing(wxDC* dc); - - void Clear(wxDC* dc); - -private: - wxBitmap m_bmpSaved ; - int m_x ; - int m_y ; - int m_width ; - int m_height ; - wxWindow* m_window ; -}; - -#endif // wxHAS_NATIVE_OVERLAY/!wxHAS_NATIVE_OVERLAY - -#endif // _WX_PRIVATE_OVERLAY_H_ diff --git a/Externals/wxWidgets3/include/wx/private/pipestream.h b/Externals/wxWidgets3/include/wx/private/pipestream.h deleted file mode 100644 index d4020b3e6d..0000000000 --- a/Externals/wxWidgets3/include/wx/private/pipestream.h +++ /dev/null @@ -1,29 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/private/pipestream.h -// Purpose: Declares wxPipeInputStream and wxPipeOutputStream. -// Author: Vadim Zeitlin -// Modified by: Rob Bresalier -// Created: 2013-04-27 -// Copyright: (c) 2003 Vadim Zeitlin -// (c) 2013 Rob Bresalier -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PRIVATE_PIPESTREAM_H_ -#define _WX_PRIVATE_PIPESTREAM_H_ - -#include "wx/platform.h" - -// wxPipeInputStream is a platform-dependent input stream class (i.e. deriving, -// possible indirectly, from wxInputStream) for reading from a pipe, i.e. a -// pipe FD under Unix or a pipe HANDLE under MSW. It provides a single extra -// IsOpened() method. -// -// wxPipeOutputStream is similar but has no additional methods at all. -#if defined(__UNIX__) && !defined(__WINDOWS__) - #include "wx/unix/private/pipestream.h" -#elif defined(__WINDOWS__) - #include "wx/msw/private/pipestream.h" -#endif - -#endif // _WX_PRIVATE_PIPESTREAM_H_ diff --git a/Externals/wxWidgets3/include/wx/private/preferences.h b/Externals/wxWidgets3/include/wx/private/preferences.h deleted file mode 100644 index 8b926450b9..0000000000 --- a/Externals/wxWidgets3/include/wx/private/preferences.h +++ /dev/null @@ -1,40 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/private/preferences.h -// Purpose: wxPreferencesEditorImpl declaration. -// Author: Vaclav Slavik -// Created: 2013-02-19 -// Copyright: (c) 2013 Vaclav Slavik -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PRIVATE_PREFERENCES_H_ -#define _WX_PRIVATE_PREFERENCES_H_ - -#include "wx/preferences.h" - -#if wxUSE_TOOLBAR && defined(__WXOSX_COCOA__) && wxOSX_USE_NATIVE_TOOLBAR - #define wxHAS_PREF_EDITOR_NATIVE -#endif - -// ---------------------------------------------------------------------------- -// wxPreferencesEditorImpl: defines wxPreferencesEditor implementation. -// ---------------------------------------------------------------------------- - -class wxPreferencesEditorImpl -{ -public: - // This is implemented in a platform-specific way. - static wxPreferencesEditorImpl* Create(const wxString& title); - - // These methods simply mirror the public wxPreferencesEditor ones. - virtual void AddPage(wxPreferencesPage* page) = 0; - virtual void Show(wxWindow* parent) = 0; - virtual void Dismiss() = 0; - - virtual ~wxPreferencesEditorImpl() {} - -protected: - wxPreferencesEditorImpl() {} -}; - -#endif // _WX_PRIVATE_PREFERENCES_H_ diff --git a/Externals/wxWidgets3/include/wx/private/richtooltip.h b/Externals/wxWidgets3/include/wx/private/richtooltip.h deleted file mode 100644 index 89ce193fa4..0000000000 --- a/Externals/wxWidgets3/include/wx/private/richtooltip.h +++ /dev/null @@ -1,44 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/private/richtooltip.h -// Purpose: wxRichToolTipImpl declaration. -// Author: Vadim Zeitlin -// Created: 2011-10-18 -// Copyright: (c) 2011 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PRIVATE_RICHTOOLTIP_H_ -#define _WX_PRIVATE_RICHTOOLTIP_H_ - -#include "wx/richtooltip.h" - -// ---------------------------------------------------------------------------- -// wxRichToolTipImpl: defines wxRichToolTip implementation. -// ---------------------------------------------------------------------------- - -class wxRichToolTipImpl -{ -public: - // This is implemented in a platform-specific way. - static wxRichToolTipImpl* Create(const wxString& title, - const wxString& message); - - // These methods simply mirror the public wxRichToolTip ones. - virtual void SetBackgroundColour(const wxColour& col, - const wxColour& colEnd) = 0; - virtual void SetCustomIcon(const wxIcon& icon) = 0; - virtual void SetStandardIcon(int icon) = 0; - virtual void SetTimeout(unsigned milliseconds, - unsigned millisecondsShowdelay = 0) = 0; - virtual void SetTipKind(wxTipKind tipKind) = 0; - virtual void SetTitleFont(const wxFont& font) = 0; - - virtual void ShowFor(wxWindow* win, const wxRect* rect = NULL) = 0; - - virtual ~wxRichToolTipImpl() { } - -protected: - wxRichToolTipImpl() { } -}; - -#endif // _WX_PRIVATE_RICHTOOLTIP_H_ diff --git a/Externals/wxWidgets3/include/wx/private/sckaddr.h b/Externals/wxWidgets3/include/wx/private/sckaddr.h deleted file mode 100644 index 376812d6d7..0000000000 --- a/Externals/wxWidgets3/include/wx/private/sckaddr.h +++ /dev/null @@ -1,316 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/private/sckaddr.h -// Purpose: wxSockAddressImpl -// Author: Vadim Zeitlin -// Created: 2008-12-28 -// Copyright: (c) 2008 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PRIVATE_SOCKADDR_H_ -#define _WX_PRIVATE_SOCKADDR_H_ - -#ifdef __WINDOWS__ - #include "wx/msw/wrapwin.h" - - #if wxUSE_IPV6 - #include - #endif -#elif defined(__VMS__) - #include - - struct sockaddr_un - { - u_char sun_len; /* sockaddr len including null */ - u_char sun_family; /* AF_UNIX */ - char sun_path[108]; /* path name (gag) */ - }; - #include -#else // generic Unix - #include - #include - #include - #include -#endif // platform - -#include // for calloc() - -// this is a wrapper for sockaddr_storage if it's available or just sockaddr -// otherwise -union wxSockAddressStorage -{ -#if wxUSE_IPV6 - sockaddr_storage addr_storage; -#endif - sockaddr addr; -}; - -// ---------------------------------------------------------------------------- -// helpers for wxSockAddressImpl -// ---------------------------------------------------------------------------- - -// helper class mapping sockaddr_xxx types to corresponding AF_XXX values -template struct AddressFamily; - -template <> struct AddressFamily { enum { value = AF_INET }; }; - -#if wxUSE_IPV6 -template <> struct AddressFamily { enum { value = AF_INET6 }; }; -#endif // wxUSE_IPV6 - -#ifdef wxHAS_UNIX_DOMAIN_SOCKETS -template <> struct AddressFamily { enum { value = AF_UNIX }; }; -#endif // wxHAS_UNIX_DOMAIN_SOCKETS - -// ---------------------------------------------------------------------------- -// wxSockAddressImpl -// ---------------------------------------------------------------------------- - -// Represents a socket endpoint, e.g. an (address, port) pair for PF_INET -// sockets. It can be initialized from an existing sockaddr struct and also -// provides access to sockaddr stored internally so that it can be easily used -// with e.g. connect(2). -// -// This class also performs (synchronous, hence potentially long) name lookups -// if necessary, i.e. if the host name strings don't contain addresses in -// numerical form (quad dotted for IPv4 or standard hexadecimal for IPv6). -// Notice that internally the potentially Unicode host names are encoded as -// UTF-8 before being passed to the lookup function but the host names should -// really be ASCII anyhow. -class wxSockAddressImpl -{ -public: - // as this is passed to socket() it should be a PF_XXX and not AF_XXX (even - // though they're the same in practice) - enum Family - { - FAMILY_INET = PF_INET, -#if wxUSE_IPV6 - FAMILY_INET6 = PF_INET6, -#endif -#ifdef wxHAS_UNIX_DOMAIN_SOCKETS - FAMILY_UNIX = PF_UNIX, -#endif - FAMILY_UNSPEC = PF_UNSPEC - }; - - // default ctor creates uninitialized object, use one of CreateXXX() below - wxSockAddressImpl() - { - InitUnspec(); - } - - // ctor from an existing sockaddr - wxSockAddressImpl(const sockaddr& addr, int len) - { - switch ( addr.sa_family ) - { - case PF_INET: -#if wxUSE_IPV6 - case PF_INET6: -#endif -#ifdef wxHAS_UNIX_DOMAIN_SOCKETS - case PF_UNIX: -#endif - m_family = static_cast(addr.sa_family); - break; - - default: - wxFAIL_MSG( "unsupported socket address family" ); - InitUnspec(); - return; - } - - InitFromSockaddr(addr, len); - } - - // copy ctor and assignment operators - wxSockAddressImpl(const wxSockAddressImpl& other) - { - InitFromOther(other); - } - - wxSockAddressImpl& operator=(const wxSockAddressImpl& other) - { - if (this != &other) - { - free(m_addr); - InitFromOther(other); - } - return *this; - } - - // dtor frees the memory used by m_addr - ~wxSockAddressImpl() - { - free(m_addr); - } - - - // reset the address to the initial uninitialized state - void Clear() - { - free(m_addr); - - InitUnspec(); - } - - // initialize the address to be of specific address family, it must be - // currently uninitialized (you may call Clear() to achieve this) - void CreateINET(); - void CreateINET6(); -#ifdef wxHAS_UNIX_DOMAIN_SOCKETS - void CreateUnix(); -#endif // wxHAS_UNIX_DOMAIN_SOCKETS - void Create(Family family) - { - switch ( family ) - { - case FAMILY_INET: - CreateINET(); - break; - -#if wxUSE_IPV6 - case FAMILY_INET6: - CreateINET6(); - break; -#endif // wxUSE_IPV6 - -#ifdef wxHAS_UNIX_DOMAIN_SOCKETS - case FAMILY_UNIX: - CreateUnix(); - break; -#endif // wxHAS_UNIX_DOMAIN_SOCKETS - - default: - wxFAIL_MSG( "unsupported socket address family" ); - } - } - - // simple accessors - Family GetFamily() const { return m_family; } - bool Is(Family family) const { return m_family == family; } - bool IsOk() const { return m_family != FAMILY_UNSPEC; } - const sockaddr *GetAddr() const { return m_addr; } - sockaddr *GetWritableAddr() { return m_addr; } - int GetLen() const { return m_len; } - - // accessors for INET or INET6 address families -#if wxUSE_IPV6 - #define CALL_IPV4_OR_6(func, args) \ - Is(FAMILY_INET6) ? func##6(args) : func##4(args) - #define CALL_IPV4_OR_6_VOID(func) \ - Is(FAMILY_INET6) ? func##6() : func##4() -#else - #define CALL_IPV4_OR_6(func, args) func##4(args) - #define CALL_IPV4_OR_6_VOID(func) func##4() -#endif // IPv6 support on/off - - wxString GetHostName() const; - bool SetHostName(const wxString& name) - { - return CALL_IPV4_OR_6(SetHostName, (name)); - } - - wxUint16 GetPort() const { return CALL_IPV4_OR_6_VOID(GetPort); } - bool SetPort(wxUint16 port) { return CALL_IPV4_OR_6(SetPort, (port)); } - bool SetPortName(const wxString& name, const char *protocol); - - bool SetToAnyAddress() { return CALL_IPV4_OR_6_VOID(SetToAnyAddress); } - -#undef CALL_IPV4_OR_6 - - // accessors for INET addresses only - bool GetHostAddress(wxUint32 *address) const; - bool SetHostAddress(wxUint32 address); - - bool SetToBroadcastAddress() { return SetHostAddress(INADDR_BROADCAST); } - - // accessors for INET6 addresses only -#if wxUSE_IPV6 - bool GetHostAddress(in6_addr *address) const; - bool SetHostAddress(const in6_addr& address); -#endif // wxUSE_IPV6 - -#ifdef wxHAS_UNIX_DOMAIN_SOCKETS - // methods valid for Unix address family addresses only - bool SetPath(const wxString& path); - wxString GetPath() const; -#endif // wxHAS_UNIX_DOMAIN_SOCKETS - -private: - void DoAlloc(int len) - { - m_addr = static_cast(calloc(1, len)); - m_len = len; - } - - template - T *Alloc() - { - DoAlloc(sizeof(T)); - - return reinterpret_cast(m_addr); - } - - template - T *Get() const - { - wxCHECK_MSG( static_cast(m_family) == AddressFamily::value, - NULL, - "socket address family mismatch" ); - - return reinterpret_cast(m_addr); - } - - void InitUnspec() - { - m_family = FAMILY_UNSPEC; - m_addr = NULL; - m_len = 0; - } - - void InitFromSockaddr(const sockaddr& addr, int len) - { - DoAlloc(len); - memcpy(m_addr, &addr, len); - } - - void InitFromOther(const wxSockAddressImpl& other) - { - m_family = other.m_family; - - if ( other.m_addr ) - { - InitFromSockaddr(*other.m_addr, other.m_len); - } - else // no address to copy - { - m_addr = NULL; - m_len = 0; - } - } - - // IPv4/6 implementations of public functions - bool SetHostName4(const wxString& name); - - bool SetPort4(wxUint16 port); - wxUint16 GetPort4() const; - - bool SetToAnyAddress4() { return SetHostAddress(INADDR_ANY); } - -#if wxUSE_IPV6 - bool SetHostName6(const wxString& name); - - bool SetPort6(wxUint16 port); - wxUint16 GetPort6() const; - - bool SetToAnyAddress6(); -#endif // wxUSE_IPV6 - - Family m_family; - sockaddr *m_addr; - int m_len; -}; - -#endif // _WX_PRIVATE_SOCKADDR_H_ diff --git a/Externals/wxWidgets3/include/wx/private/selectdispatcher.h b/Externals/wxWidgets3/include/wx/private/selectdispatcher.h deleted file mode 100644 index ba7a59a53a..0000000000 --- a/Externals/wxWidgets3/include/wx/private/selectdispatcher.h +++ /dev/null @@ -1,125 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/private/selectdispatcher.h -// Purpose: wxSelectDispatcher class -// Authors: Lukasz Michalski and Vadim Zeitlin -// Created: December 2006 -// Copyright: (c) Lukasz Michalski -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PRIVATE_SELECTDISPATCHER_H_ -#define _WX_PRIVATE_SELECTDISPATCHER_H_ - -#include "wx/defs.h" - -#if wxUSE_SELECT_DISPATCHER - -#if defined(HAVE_SYS_SELECT_H) - #include - #include -#endif - -#include - -#include "wx/thread.h" -#include "wx/private/fdiodispatcher.h" - -// helper class storing all the select() fd sets -class WXDLLIMPEXP_BASE wxSelectSets -{ -public: - // ctor zeroes out all fd_sets - wxSelectSets(); - - // default copy ctor, assignment operator and dtor are ok - - - // return true if fd appears in any of the sets - bool HasFD(int fd) const; - - // add or remove FD to our sets depending on whether flags contains - // wxFDIO_INPUT/OUTPUT/EXCEPTION bits - bool SetFD(int fd, int flags); - - // same as SetFD() except it unsets the bits set in the flags for the given - // fd - bool ClearFD(int fd) - { - return SetFD(fd, 0); - } - - - // call select() with our sets: the other parameters are the same as for - // select() itself - int Select(int nfds, struct timeval *tv); - - // call the handler methods corresponding to the sets having this fd if it - // is present in any set and return true if it is - bool Handle(int fd, wxFDIOHandler& handler) const; - -private: - typedef void (wxFDIOHandler::*Callback)(); - - // the FD sets indices - enum - { - Read, - Write, - Except, - Max - }; - - // the sets used with select() - fd_set m_fds[Max]; - - // the wxFDIO_XXX flags, functions and names (used for debug messages only) - // corresponding to the FD sets above - static int ms_flags[Max]; - static const char *ms_names[Max]; - static Callback ms_handlers[Max]; -}; - -class WXDLLIMPEXP_BASE wxSelectDispatcher : public wxMappedFDIODispatcher -{ -public: - // default ctor - wxSelectDispatcher() { m_maxFD = -1; } - - // implement pure virtual methods of the base class - virtual bool RegisterFD(int fd, wxFDIOHandler *handler, int flags = wxFDIO_ALL) wxOVERRIDE; - virtual bool ModifyFD(int fd, wxFDIOHandler *handler, int flags = wxFDIO_ALL) wxOVERRIDE; - virtual bool UnregisterFD(int fd) wxOVERRIDE; - virtual bool HasPending() const wxOVERRIDE; - virtual int Dispatch(int timeout = TIMEOUT_INFINITE) wxOVERRIDE; - -private: - // common part of RegisterFD() and ModifyFD() - bool DoUpdateFDAndHandler(int fd, wxFDIOHandler *handler, int flags); - - // call the handlers for the fds present in the given sets, return the - // number of handlers we called - int ProcessSets(const wxSelectSets& sets); - - // helper of ProcessSets(): call the handler if its fd is in the set - void DoProcessFD(int fd, const fd_set& fds, wxFDIOHandler *handler, - const char *name); - - // common part of HasPending() and Dispatch(): calls select() with the - // specified timeout - int DoSelect(wxSelectSets& sets, int timeout) const; - - -#if wxUSE_THREADS - wxCriticalSection m_cs; -#endif // wxUSE_THREADS - - // the select sets containing all the registered fds - wxSelectSets m_sets; - - // the highest registered fd value or -1 if none - int m_maxFD; -}; - -#endif // wxUSE_SELECT_DISPATCHER - -#endif // _WX_PRIVATE_SOCKETEVTDISPATCH_H_ diff --git a/Externals/wxWidgets3/include/wx/private/socket.h b/Externals/wxWidgets3/include/wx/private/socket.h deleted file mode 100644 index 906c20c659..0000000000 --- a/Externals/wxWidgets3/include/wx/private/socket.h +++ /dev/null @@ -1,372 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/private/socket.h -// Purpose: wxSocketImpl and related declarations -// Authors: Guilhem Lavaux, Vadim Zeitlin -// Created: April 1997 -// Copyright: (c) 1997 Guilhem Lavaux -// (c) 2008 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -/* - Brief overview of different socket classes: - - - wxSocketBase is the public class representing a socket ("Base" here - refers to the fact that wxSocketClient and wxSocketServer are derived - from it and predates the convention of using "Base" for common base - classes for platform-specific classes in wxWidgets) with implementation - common to all platforms and forwarding methods whose implementation - differs between platforms to wxSocketImpl which it contains. - - - wxSocketImpl is actually just an abstract base class having only code - common to all platforms, the concrete implementation classes derive from - it and are created by wxSocketImpl::Create(). - - - Some socket operations have different implementations in console-mode and - GUI applications. wxSocketManager class exists to abstract this in such - way that console applications (using wxBase) don't depend on wxNet. An - object of this class is made available via wxApp and GUI applications set - up a different kind of global socket manager from console ones. - - TODO: it looks like wxSocketManager could be eliminated by providing - methods for registering/unregistering sockets directly in - wxEventLoop. - */ - -#ifndef _WX_PRIVATE_SOCKET_H_ -#define _WX_PRIVATE_SOCKET_H_ - -#include "wx/defs.h" - -#if wxUSE_SOCKETS - -#include "wx/socket.h" -#include "wx/private/sckaddr.h" - -#include - -/* - Including sys/types.h under Cygwin results in the warnings about "fd_set - having been defined in sys/types.h" when winsock.h is included later and - doesn't seem to be necessary anyhow. It's not needed under Mac neither. - */ -#if !defined(__WXMAC__) && !defined(__WXMSW__) -#include -#endif - -// include the header defining timeval: under Windows this struct is used only -// with sockets so we need to include winsock.h which we do via windows.h -#ifdef __WINDOWS__ - #include "wx/msw/wrapwin.h" -#else - #include // for timeval -#endif - -// these definitions are for MSW when we don't use configure, otherwise these -// symbols are defined by configure -#ifndef WX_SOCKLEN_T - #define WX_SOCKLEN_T int -#endif - -#ifndef SOCKOPTLEN_T - #define SOCKOPTLEN_T int -#endif - -// define some symbols which winsock.h defines but traditional BSD headers -// don't -#ifndef INVALID_SOCKET - #define INVALID_SOCKET (-1) -#endif - -#ifndef SOCKET_ERROR - #define SOCKET_ERROR (-1) -#endif - -typedef int wxSocketEventFlags; - -class wxSocketImpl; - -/* - Class providing hooks abstracting the differences between console and GUI - applications for socket code. - - We also have different implementations of this class for different platforms - allowing us to keep more things in the common code but the main reason for - its existence is that we want the same socket code work differently - depending on whether it's used from a console or a GUI program. This is - achieved by implementing the virtual methods of this class differently in - the objects returned by wxConsoleAppTraits::GetSocketManager() and the same - method in wxGUIAppTraits. - */ -class wxSocketManager -{ -public: - // set the manager to use, we don't take ownership of it - // - // this should be called before creating the first wxSocket object, - // otherwise the manager returned by wxAppTraits::GetSocketManager() will - // be used - static void Set(wxSocketManager *manager); - - // return the manager to use - // - // this initializes the manager at first use - static wxSocketManager *Get() - { - if ( !ms_manager ) - Init(); - - return ms_manager; - } - - // called before the first wxSocket is created and should do the - // initializations needed in order to use the network - // - // return true if initialized successfully; if this returns false sockets - // can't be used at all - virtual bool OnInit() = 0; - - // undo the initializations of OnInit() - virtual void OnExit() = 0; - - - // create the socket implementation object matching this manager - virtual wxSocketImpl *CreateSocket(wxSocketBase& wxsocket) = 0; - - // these functions enable or disable monitoring of the given socket for the - // specified events inside the currently running event loop (but notice - // that both BSD and Winsock implementations actually use socket->m_server - // value to determine what exactly should be monitored so it needs to be - // set before calling these functions) - // - // the default event value is used just for the convenience of wxMSW - // implementation which doesn't use this parameter anyhow, it doesn't make - // sense to pass wxSOCKET_LOST for the Unix implementation which does use - // this parameter - virtual void Install_Callback(wxSocketImpl *socket, - wxSocketNotify event = wxSOCKET_LOST) = 0; - virtual void Uninstall_Callback(wxSocketImpl *socket, - wxSocketNotify event = wxSOCKET_LOST) = 0; - - virtual ~wxSocketManager() { } - -private: - // get the manager to use if we don't have it yet - static void Init(); - - static wxSocketManager *ms_manager; -}; - -/* - Base class for all socket implementations providing functionality common to - BSD and Winsock sockets. - - Objects of this class are not created directly but only via the factory - function wxSocketManager::CreateSocket(). - */ -class wxSocketImpl -{ -public: - virtual ~wxSocketImpl(); - - // set various socket properties: all of those can only be called before - // creating the socket - void SetTimeout(unsigned long millisec); - void SetReusable() { m_reusable = true; } - void SetBroadcast() { m_broadcast = true; } - void DontDoBind() { m_dobind = false; } - void SetInitialSocketBuffers(int recv, int send) - { - m_initialRecvBufferSize = recv; - m_initialSendBufferSize = send; - } - - wxSocketError SetLocal(const wxSockAddressImpl& address); - wxSocketError SetPeer(const wxSockAddressImpl& address); - - // accessors - // --------- - - bool IsServer() const { return m_server; } - - const wxSockAddressImpl& GetLocal(); // non const as may update m_local - const wxSockAddressImpl& GetPeer() const { return m_peer; } - - wxSocketError GetError() const { return m_error; } - bool IsOk() const { return m_error == wxSOCKET_NOERROR; } - - // get the error code corresponding to the last operation - virtual wxSocketError GetLastError() const = 0; - - - // creating/closing the socket - // -------------------------- - - // notice that SetLocal() must be called before creating the socket using - // any of the functions below - // - // all of Create() functions return wxSOCKET_NOERROR if the operation - // completed successfully or one of: - // wxSOCKET_INVSOCK - the socket is in use. - // wxSOCKET_INVADDR - the local (server) or peer (client) address has not - // been set. - // wxSOCKET_IOERR - any other error. - - // create a socket listening on the local address specified by SetLocal() - // (notice that DontDoBind() is ignored by this function) - wxSocketError CreateServer(); - - // create a socket connected to the peer address specified by SetPeer() - // (notice that DontDoBind() is ignored by this function) - // - // this function may return wxSOCKET_WOULDBLOCK in addition to the return - // values listed above if wait is false - wxSocketError CreateClient(bool wait); - - // create (and bind unless DontDoBind() had been called) an UDP socket - // associated with the given local address - wxSocketError CreateUDP(); - - // may be called whether the socket was created or not, calls DoClose() if - // it was indeed created - void Close(); - - // shuts down the writing end of the socket and closes it, this is a more - // graceful way to close - // - // does nothing if the socket wasn't created - void Shutdown(); - - - // IO operations - // ------------- - - // basic IO, work for both TCP and UDP sockets - // - // return the number of bytes read/written (possibly 0) or -1 on error - int Read(void *buffer, int size); - int Write(const void *buffer, int size); - - // basically a wrapper for select(): returns the condition of the socket, - // blocking for not longer than timeout if it is specified (otherwise just - // poll without blocking at all) - // - // flags defines what kind of conditions we're interested in, the return - // value is composed of a (possibly empty) subset of the bits set in flags - wxSocketEventFlags Select(wxSocketEventFlags flags, - const timeval *timeout = NULL); - - // convenient wrapper calling Select() with our default timeout - wxSocketEventFlags SelectWithTimeout(wxSocketEventFlags flags) - { - return Select(flags, &m_timeout); - } - - // just a wrapper for accept(): it is called to create a new wxSocketImpl - // corresponding to a new server connection represented by the given - // wxSocketBase, returns NULL on error (including immediately if there are - // no pending connections as our sockets are non-blocking) - wxSocketImpl *Accept(wxSocketBase& wxsocket); - - - // notifications - // ------------- - - // notify m_wxsocket about the given socket event by calling its (inaptly - // named) OnRequest() method - void NotifyOnStateChange(wxSocketNotify event); - - // called after reading/writing the data from/to the socket and should - // enable back the wxSOCKET_INPUT/OUTPUT_FLAG notifications if they were - // turned off when this data was first detected - virtual void ReenableEvents(wxSocketEventFlags flags) = 0; - - // TODO: make these fields protected and provide accessors for those of - // them that wxSocketBase really needs -//protected: - wxSOCKET_T m_fd; - - int m_initialRecvBufferSize; - int m_initialSendBufferSize; - - wxSockAddressImpl m_local, - m_peer; - wxSocketError m_error; - - bool m_stream; - bool m_establishing; - bool m_reusable; - bool m_broadcast; - bool m_dobind; - - struct timeval m_timeout; - -protected: - wxSocketImpl(wxSocketBase& wxsocket); - - // get the associated socket flags - wxSocketFlags GetSocketFlags() const { return m_wxsocket->GetFlags(); } - - // true if we're a listening stream socket - bool m_server; - -private: - // called by Close() if we have a valid m_fd - virtual void DoClose() = 0; - - // put this socket into non-blocking mode and enable monitoring this socket - // as part of the event loop - virtual void UnblockAndRegisterWithEventLoop() = 0; - - // check that the socket wasn't created yet and that the given address - // (either m_local or m_peer depending on the socket kind) is valid and - // set m_error and return false if this is not the case - bool PreCreateCheck(const wxSockAddressImpl& addr); - - // set the given socket option: this just wraps setsockopt(SOL_SOCKET) - int SetSocketOption(int optname, int optval) - { - // although modern Unix systems use "const void *" for the 4th - // parameter here, old systems and Winsock still use "const char *" - return setsockopt(m_fd, SOL_SOCKET, optname, - reinterpret_cast(&optval), - sizeof(optval)); - } - - // set the given socket option to true value: this is an even simpler - // wrapper for setsockopt(SOL_SOCKET) for boolean options - int EnableSocketOption(int optname) - { - return SetSocketOption(optname, 1); - } - - // apply the options to the (just created) socket and register it with the - // event loop by calling UnblockAndRegisterWithEventLoop() - void PostCreation(); - - // update local address after binding/connecting - wxSocketError UpdateLocalAddress(); - - // functions used to implement Read/Write() - int RecvStream(void *buffer, int size); - int RecvDgram(void *buffer, int size); - int SendStream(const void *buffer, int size); - int SendDgram(const void *buffer, int size); - - - // set in ctor and never changed except that it's reset to NULL when the - // socket is shut down - wxSocketBase *m_wxsocket; - - wxDECLARE_NO_COPY_CLASS(wxSocketImpl); -}; - -#if defined(__WINDOWS__) - #include "wx/msw/private/sockmsw.h" -#else - #include "wx/unix/private/sockunix.h" -#endif - -#endif /* wxUSE_SOCKETS */ - -#endif /* _WX_PRIVATE_SOCKET_H_ */ diff --git a/Externals/wxWidgets3/include/wx/private/streamtempinput.h b/Externals/wxWidgets3/include/wx/private/streamtempinput.h deleted file mode 100644 index df937cf574..0000000000 --- a/Externals/wxWidgets3/include/wx/private/streamtempinput.h +++ /dev/null @@ -1,134 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/private/streamtempinput.h -// Purpose: defines wxStreamTempInputBuffer which is used by Unix and MSW -// implementations of wxExecute; this file is only used by the -// library and never by the user code -// Author: Vadim Zeitlin -// Modified by: Rob Bresalier -// Created: 2013-05-04 -// Copyright: (c) 2002 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PRIVATE_STREAMTEMPINPUT_H -#define _WX_PRIVATE_STREAMTEMPINPUT_H - -#include "wx/private/pipestream.h" - -// ---------------------------------------------------------------------------- -// wxStreamTempInputBuffer -// ---------------------------------------------------------------------------- - -/* - wxStreamTempInputBuffer is a hack which we need to solve the problem of - executing a child process synchronously with IO redirecting: when we do - this, the child writes to a pipe we open to it but when the pipe buffer - (which has finite capacity, e.g. commonly just 4Kb) becomes full we have to - read data from it because the child blocks in its write() until then and if - it blocks we are never going to return from wxExecute() so we dead lock. - - So here is the fix: we now read the output as soon as it appears into a temp - buffer (wxStreamTempInputBuffer object) and later just stuff it back into - the stream when the process terminates. See supporting code in wxExecute() - itself as well. - - Note that this is horribly inefficient for large amounts of output (count - the number of times we copy the data around) and so a better API is badly - needed! However it's not easy to devise a way to do this keeping backwards - compatibility with the existing wxExecute(wxEXEC_SYNC)... -*/ -class wxStreamTempInputBuffer -{ -public: - wxStreamTempInputBuffer() - { - m_stream = NULL; - m_buffer = NULL; - m_size = 0; - } - - // call to associate a stream with this buffer, otherwise nothing happens - // at all - void Init(wxPipeInputStream *stream) - { - wxASSERT_MSG( !m_stream, wxS("Can only initialize once") ); - - m_stream = stream; - } - - // check for input on our stream and cache it in our buffer if any - // - // return true if anything was done - bool Update() - { - if ( !m_stream || !m_stream->CanRead() ) - return false; - - // realloc in blocks of 4Kb: this is the default (and minimal) buffer - // size of the Unix pipes so it should be the optimal step - // - // NB: don't use "static int" in this inline function, some compilers - // (e.g. IBM xlC) don't like it - enum { incSize = 4096 }; - - void *buf = realloc(m_buffer, m_size + incSize); - if ( !buf ) - return false; - - m_buffer = buf; - m_stream->Read((char *)m_buffer + m_size, incSize); - m_size += m_stream->LastRead(); - - return true; - } - - // check if can continue reading from the stream, this is used to disable - // the callback once we can't read anything more - bool Eof() const - { - // If we have no stream, always return true as we can't read any more. - return !m_stream || m_stream->Eof(); - } - - // read everything remaining until the EOF, this should only be called once - // the child process terminates and we know that no more data is coming - bool ReadAll() - { - while ( !Eof() ) - { - if ( !Update() ) - return false; - } - - return true; - } - - // dtor puts the data buffered during this object lifetime into the - // associated stream - ~wxStreamTempInputBuffer() - { - if ( m_buffer ) - { - m_stream->Ungetch(m_buffer, m_size); - free(m_buffer); - } - } - - const void *GetBuffer() const { return m_buffer; } - - size_t GetSize() const { return m_size; } - -private: - // the stream we're buffering, if NULL we don't do anything at all - wxPipeInputStream *m_stream; - - // the buffer of size m_size (NULL if m_size == 0) - void *m_buffer; - - // the size of the buffer - size_t m_size; - - wxDECLARE_NO_COPY_CLASS(wxStreamTempInputBuffer); -}; - -#endif // _WX_PRIVATE_STREAMTEMPINPUT_H diff --git a/Externals/wxWidgets3/include/wx/private/textmeasure.h b/Externals/wxWidgets3/include/wx/private/textmeasure.h deleted file mode 100644 index db96dcd38f..0000000000 --- a/Externals/wxWidgets3/include/wx/private/textmeasure.h +++ /dev/null @@ -1,172 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/private/textmeasure.h -// Purpose: declaration of wxTextMeasure class -// Author: Manuel Martin -// Created: 2012-10-05 -// Copyright: (c) 1997-2012 wxWidgets team -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PRIVATE_TEXTMEASURE_H_ -#define _WX_PRIVATE_TEXTMEASURE_H_ - -class WXDLLIMPEXP_FWD_CORE wxDC; -class WXDLLIMPEXP_FWD_CORE wxFont; -class WXDLLIMPEXP_FWD_CORE wxWindow; - -// ---------------------------------------------------------------------------- -// wxTextMeasure: class used to measure text extent. -// ---------------------------------------------------------------------------- - -class wxTextMeasureBase -{ -public: - // The first ctor argument must be non-NULL, i.e. each object of this class - // is associated with either a valid wxDC or a valid wxWindow. The font can - // be NULL to use the current DC/window font or can be specified explicitly. - wxTextMeasureBase(const wxDC *dc, const wxFont *theFont); - wxTextMeasureBase(const wxWindow *win, const wxFont *theFont); - - // Even though this class is not supposed to be used polymorphically, give - // it a virtual dtor to avoid compiler warnings. - virtual ~wxTextMeasureBase() { } - - - // Return the extent of a single line string. - void GetTextExtent(const wxString& string, - wxCoord *width, - wxCoord *height, - wxCoord *descent = NULL, - wxCoord *externalLeading = NULL); - - // The same for a multiline (with '\n') string. - void GetMultiLineTextExtent(const wxString& text, - wxCoord *width, - wxCoord *height, - wxCoord *heightOneLine = NULL); - - // Find the dimensions of the largest string. - wxSize GetLargestStringExtent(size_t n, const wxString* strings); - wxSize GetLargestStringExtent(const wxArrayString& strings) - { - return GetLargestStringExtent(strings.size(), &strings[0]); - } - - // Fill the array with the widths for each "0..N" substrings for N from 1 - // to text.length(). - // - // The scaleX argument is the horizontal scale used by wxDC and is only - // used in the generic implementation. - bool GetPartialTextExtents(const wxString& text, - wxArrayInt& widths, - double scaleX); - - - // This is another method which is only used by MeasuringGuard. - bool IsUsingDCImpl() const { return m_useDCImpl; } - -protected: - // RAII wrapper for the two methods above. - class MeasuringGuard - { - public: - MeasuringGuard(wxTextMeasureBase& tm) : m_tm(tm) - { - // BeginMeasuring() should only be called if we have a native DC, - // so don't call it if we delegate to a DC of unknown type. - if ( !m_tm.IsUsingDCImpl() ) - m_tm.BeginMeasuring(); - } - - ~MeasuringGuard() - { - if ( !m_tm.IsUsingDCImpl() ) - m_tm.EndMeasuring(); - } - - private: - wxTextMeasureBase& m_tm; - }; - - - // These functions are called by our public methods before and after each - // call to DoGetTextExtent(). Derived classes may override them to prepare - // for -- possibly several -- subsequent calls to DoGetTextExtent(). - // - // As these calls must be always paired, they're never called directly but - // only by our friend MeasuringGuard class. - virtual void BeginMeasuring() { } - virtual void EndMeasuring() { } - - - // The main function of this class, to be implemented in platform-specific - // way used by all our public methods. - // - // The width and height pointers here are never NULL and the input string - // is not empty. - virtual void DoGetTextExtent(const wxString& string, - wxCoord *width, - wxCoord *height, - wxCoord *descent = NULL, - wxCoord *externalLeading = NULL) = 0; - - // The real implementation of GetPartialTextExtents(). - // - // On input, widths array contains text.length() zero elements and the text - // is guaranteed to be non-empty. - virtual bool DoGetPartialTextExtents(const wxString& text, - wxArrayInt& widths, - double scaleX) = 0; - - // Call either DoGetTextExtent() or wxDC::GetTextExtent() depending on the - // value of m_useDCImpl. - // - // This must be always used instead of calling DoGetTextExtent() directly! - void CallGetTextExtent(const wxString& string, - wxCoord *width, - wxCoord *height, - wxCoord *descent = NULL, - wxCoord *externalLeading = NULL); - - // Return a valid font: if one was given to us in the ctor, use this one, - // otherwise use the current font of the associated wxDC or wxWindow. - wxFont GetFont() const; - - - // Exactly one of m_dc and m_win is non-NULL for any given object of this - // class. - const wxDC* const m_dc; - const wxWindow* const m_win; - - // If this is true, simply forward to wxDC::GetTextExtent() from our - // CallGetTextExtent() instead of calling our own DoGetTextExtent(). - // - // We need this because our DoGetTextExtent() typically only works with - // native DCs, i.e. those having an HDC under Windows or using Pango under - // GTK+. However wxTextMeasure object can be constructed for any wxDC, not - // necessarily a native one and in this case we must call back into the DC - // implementation of text measuring itself. - bool m_useDCImpl; - - // This one can be NULL or not. - const wxFont* const m_font; - - wxDECLARE_NO_COPY_CLASS(wxTextMeasureBase); -}; - -// Include the platform dependent class declaration, if any. -#if defined(__WXGTK20__) - #include "wx/gtk/private/textmeasure.h" -#elif defined(__WXMSW__) - #include "wx/msw/private/textmeasure.h" -#else // no platform-specific implementation of wxTextMeasure yet - #include "wx/generic/private/textmeasure.h" - - #define wxUSE_GENERIC_TEXTMEASURE 1 -#endif - -#ifndef wxUSE_GENERIC_TEXTMEASURE - #define wxUSE_GENERIC_TEXTMEASURE 0 -#endif - -#endif // _WX_PRIVATE_TEXTMEASURE_H_ diff --git a/Externals/wxWidgets3/include/wx/private/threadinfo.h b/Externals/wxWidgets3/include/wx/private/threadinfo.h deleted file mode 100644 index 27a71674b0..0000000000 --- a/Externals/wxWidgets3/include/wx/private/threadinfo.h +++ /dev/null @@ -1,69 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/private/threadinfo.h -// Purpose: declaration of wxThreadSpecificInfo: thread-specific information -// Author: Vadim Zeitlin -// Created: 2009-07-13 -// Copyright: (c) 2009 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PRIVATE_THREADINFO_H_ -#define _WX_PRIVATE_THREADINFO_H_ - -#include "wx/defs.h" - -class WXDLLIMPEXP_FWD_BASE wxLog; - -#if wxUSE_INTL -#include "wx/hashset.h" -WX_DECLARE_HASH_SET(wxString, wxStringHash, wxStringEqual, - wxLocaleUntranslatedStrings); -#endif - - -// ---------------------------------------------------------------------------- -// wxThreadSpecificInfo: contains all thread-specific information used by wx -// ---------------------------------------------------------------------------- - -// Group all thread-specific information we use (e.g. the active wxLog target) -// a in this class to avoid consuming more TLS slots than necessary as there is -// only a limited number of them. -class wxThreadSpecificInfo -{ -public: - // Return this thread's instance. - static wxThreadSpecificInfo& Get(); - - // the thread-specific logger or NULL if the thread is using the global one - // (this is not used for the main thread which always uses the global - // logger) - wxLog *logger; - - // true if logging is currently disabled for this thread (this is also not - // used for the main thread which uses wxLog::ms_doLog) - // - // NB: we use a counter-intuitive "disabled" flag instead of "enabled" one - // because the default, for 0-initialized struct, should be to enable - // logging - bool loggingDisabled; - -#if wxUSE_INTL - // Storage for wxTranslations::GetUntranslatedString() - wxLocaleUntranslatedStrings untranslatedStrings; -#endif - -#if wxUSE_THREADS - // Cleans up storage for the current thread. Should be called when a thread - // is being destroyed. If it's not called, the only bad thing that happens - // is that the memory is deallocated later, on process termination. - static void ThreadCleanUp(); -#endif - -private: - wxThreadSpecificInfo() : logger(NULL), loggingDisabled(false) {} -}; - -#define wxThreadInfo wxThreadSpecificInfo::Get() - -#endif // _WX_PRIVATE_THREADINFO_H_ - diff --git a/Externals/wxWidgets3/include/wx/private/timer.h b/Externals/wxWidgets3/include/wx/private/timer.h deleted file mode 100644 index 5f4ce0d511..0000000000 --- a/Externals/wxWidgets3/include/wx/private/timer.h +++ /dev/null @@ -1,72 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/private/timer.h -// Purpose: Base class for wxTimer implementations -// Author: Lukasz Michalski -// Created: 31.10.2006 -// Copyright: (c) 2006-2007 wxWidgets dev team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_TIMERIMPL_H_BASE_ -#define _WX_TIMERIMPL_H_BASE_ - -#include "wx/defs.h" -#include "wx/event.h" -#include "wx/timer.h" - -// ---------------------------------------------------------------------------- -// wxTimerImpl: abstract base class for wxTimer implementations -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxTimerImpl -{ -public: - // default ctor, SetOwner() must be called after it (wxTimer does it) - wxTimerImpl(wxTimer *owner); - - // this must be called initially but may be also called later - void SetOwner(wxEvtHandler *owner, int timerid); - - // empty but virtual base class dtor, the caller is responsible for - // stopping the timer before it's destroyed (it can't be done from here as - // it's too late) - virtual ~wxTimerImpl() { } - - - // start the timer. When overriding call base version first. - virtual bool Start(int milliseconds = -1, bool oneShot = false); - - // stop the timer, only called if the timer is really running (unlike - // wxTimer::Stop()) - virtual void Stop() = 0; - - // return true if the timer is running - virtual bool IsRunning() const = 0; - - // this should be called by the port-specific code when the timer expires - virtual void Notify() { m_timer->Notify(); } - - // the default implementation of wxTimer::Notify(): generate a wxEVT_TIMER - void SendEvent(); - - - // accessors for wxTimer: - wxEvtHandler *GetOwner() const { return m_owner; } - int GetId() const { return m_idTimer; } - int GetInterval() const { return m_milli; } - bool IsOneShot() const { return m_oneShot; } - -protected: - wxTimer *m_timer; - - wxEvtHandler *m_owner; - - int m_idTimer; // id passed to wxTimerEvent - int m_milli; // the timer interval - bool m_oneShot; // true if one shot - - - wxDECLARE_NO_COPY_CLASS(wxTimerImpl); -}; - -#endif // _WX_TIMERIMPL_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/private/window.h b/Externals/wxWidgets3/include/wx/private/window.h deleted file mode 100644 index 1192fb97b2..0000000000 --- a/Externals/wxWidgets3/include/wx/private/window.h +++ /dev/null @@ -1,38 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/private/window.h -// Purpose: misc wxWindow helpers -// Author: Vaclav Slavik -// Created: 2010-01-21 -// Copyright: (c) 2010 Vaclav Slavik -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PRIVATE_WINDOW_H_ -#define _WX_PRIVATE_WINDOW_H_ - -#include "wx/gdicmn.h" - -namespace wxPrivate -{ - -// Windows' computes dialog units using average character width over upper- -// and lower-case ASCII alphabet and not using the average character width -// metadata stored in the font; see -// http://support.microsoft.com/default.aspx/kb/145994 for detailed discussion. -// -// This helper function computes font dimensions in the same way. It works with -// either wxDC or wxWindow argument. -template -inline wxSize GetAverageASCIILetterSize(const T& of_what) -{ - const wxStringCharType *TEXT_TO_MEASURE = - wxS("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"); - - wxSize s = of_what.GetTextExtent(TEXT_TO_MEASURE); - s.x = (s.x / 26 + 1) / 2; - return s; -} - -} // namespace wxPrivate - -#endif // _WX_PRIVATE_WINDOW_H_ diff --git a/Externals/wxWidgets3/include/wx/private/wxprintf.h b/Externals/wxWidgets3/include/wx/private/wxprintf.h deleted file mode 100644 index e16b9f4e40..0000000000 --- a/Externals/wxWidgets3/include/wx/private/wxprintf.h +++ /dev/null @@ -1,939 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/private/wxprintf.h -// Purpose: wxWidgets wxPrintf() implementation -// Author: Ove Kaven -// Modified by: Ron Lee, Francesco Montorsi -// Created: 09/04/99 -// Copyright: (c) wxWidgets copyright -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PRIVATE_WXPRINTF_H_ -#define _WX_PRIVATE_WXPRINTF_H_ - -// --------------------------------------------------------------------------- -// headers and macros -// --------------------------------------------------------------------------- - -#include "wx/crt.h" -#include "wx/log.h" -#include "wx/utils.h" - -#include - -// prefer snprintf over sprintf -#if defined(__VISUALC__) || \ - (defined(__BORLANDC__) && __BORLANDC__ >= 0x540) - #define system_sprintf(buff, max, flags, data) \ - ::_snprintf(buff, max, flags, data) -#elif defined(HAVE_SNPRINTF) - #define system_sprintf(buff, max, flags, data) \ - ::snprintf(buff, max, flags, data) -#else // NB: at least sprintf() should always be available - // since 'max' is not used in this case, wxVsnprintf() should always - // ensure that 'buff' is big enough for all common needs - // (see wxMAX_SVNPRINTF_FLAGBUFFER_LEN and wxMAX_SVNPRINTF_SCRATCHBUFFER_LEN) - #define system_sprintf(buff, max, flags, data) \ - ::sprintf(buff, flags, data) - - #define SYSTEM_SPRINTF_IS_UNSAFE -#endif - -// --------------------------------------------------------------------------- -// printf format string parsing -// --------------------------------------------------------------------------- - -// some limits of our implementation -#define wxMAX_SVNPRINTF_ARGUMENTS 64 -#define wxMAX_SVNPRINTF_FLAGBUFFER_LEN 32 -#define wxMAX_SVNPRINTF_SCRATCHBUFFER_LEN 512 - - -// the conversion specifiers accepted by wxCRT_VsnprintfW -enum wxPrintfArgType -{ - wxPAT_INVALID = -1, - - wxPAT_INT, // %d, %i, %o, %u, %x, %X - wxPAT_LONGINT, // %ld, etc -#ifdef wxLongLong_t - wxPAT_LONGLONGINT, // %Ld, etc -#endif - wxPAT_SIZET, // %zd, etc - - wxPAT_DOUBLE, // %e, %E, %f, %g, %G - wxPAT_LONGDOUBLE, // %le, etc - - wxPAT_POINTER, // %p - - wxPAT_CHAR, // %hc (in ANSI mode: %c, too) - wxPAT_WCHAR, // %lc (in Unicode mode: %c, too) - - wxPAT_PCHAR, // %s (related to a char *) - wxPAT_PWCHAR, // %s (related to a wchar_t *) - - wxPAT_NINT, // %n - wxPAT_NSHORTINT, // %hn - wxPAT_NLONGINT, // %ln - - wxPAT_STAR // '*' used for width or precision -}; - -// an argument passed to wxCRT_VsnprintfW -union wxPrintfArg -{ - int pad_int; // %d, %i, %o, %u, %x, %X - long int pad_longint; // %ld, etc -#ifdef wxLongLong_t - wxLongLong_t pad_longlongint; // %Ld, etc -#endif - size_t pad_sizet; // %zd, etc - - double pad_double; // %e, %E, %f, %g, %G - long double pad_longdouble; // %le, etc - - void *pad_pointer; // %p - - char pad_char; // %hc (in ANSI mode: %c, too) - wchar_t pad_wchar; // %lc (in Unicode mode: %c, too) - - void *pad_str; // %s - - int *pad_nint; // %n - short int *pad_nshortint; // %hn - long int *pad_nlongint; // %ln -}; - -// helper for converting string into either char* or wchar_t* depending -// on the type of wxPrintfConvSpec instantiation: -template struct wxPrintfStringHelper {}; - -template<> struct wxPrintfStringHelper -{ - typedef const wxWX2MBbuf ConvertedType; - static ConvertedType Convert(const wxString& s) { return s.mb_str(); } -}; - -template<> struct wxPrintfStringHelper -{ - typedef const wxWX2WCbuf ConvertedType; - static ConvertedType Convert(const wxString& s) { return s.wc_str(); } -}; - - -// Contains parsed data relative to a conversion specifier given to -// wxCRT_VsnprintfW and parsed from the format string -// NOTE: in C++ there is almost no difference between struct & classes thus -// there is no performance gain by using a struct here... -template -class wxPrintfConvSpec -{ -public: - - // the position of the argument relative to this conversion specifier - size_t m_pos; - - // the type of this conversion specifier - wxPrintfArgType m_type; - - // the minimum and maximum width - // when one of this var is set to -1 it means: use the following argument - // in the stack as minimum/maximum width for this conversion specifier - int m_nMinWidth, m_nMaxWidth; - - // does the argument need to the be aligned to left ? - bool m_bAlignLeft; - - // pointer to the '%' of this conversion specifier in the format string - // NOTE: this points somewhere in the string given to the Parse() function - - // it's task of the caller ensure that memory is still valid ! - const CharType *m_pArgPos; - - // pointer to the last character of this conversion specifier in the - // format string - // NOTE: this points somewhere in the string given to the Parse() function - - // it's task of the caller ensure that memory is still valid ! - const CharType *m_pArgEnd; - - // a little buffer where formatting flags like #+\.hlqLz are stored by Parse() - // for use in Process() - char m_szFlags[wxMAX_SVNPRINTF_FLAGBUFFER_LEN]; - - -public: - - // we don't declare this as a constructor otherwise it would be called - // automatically and we don't want this: to be optimized, wxCRT_VsnprintfW - // calls this function only on really-used instances of this class. - void Init(); - - // Parses the first conversion specifier in the given string, which must - // begin with a '%'. Returns false if the first '%' does not introduce a - // (valid) conversion specifier and thus should be ignored. - bool Parse(const CharType *format); - - // Process this conversion specifier and puts the result in the given - // buffer. Returns the number of characters written in 'buf' or -1 if - // there's not enough space. - int Process(CharType *buf, size_t lenMax, wxPrintfArg *p, size_t written); - - // Loads the argument of this conversion specifier from given va_list. - bool LoadArg(wxPrintfArg *p, va_list &argptr); - -private: - // An helper function of LoadArg() which is used to handle the '*' flag - void ReplaceAsteriskWith(int w); -}; - -template -void wxPrintfConvSpec::Init() -{ - m_nMinWidth = 0; - m_nMaxWidth = 0xFFFF; - m_pos = 0; - m_bAlignLeft = false; - m_pArgPos = m_pArgEnd = NULL; - m_type = wxPAT_INVALID; - - memset(m_szFlags, 0, sizeof(m_szFlags)); - // this character will never be removed from m_szFlags array and - // is important when calling sprintf() in wxPrintfConvSpec::Process() ! - m_szFlags[0] = '%'; -} - -template -bool wxPrintfConvSpec::Parse(const CharType *format) -{ - bool done = false; - - // temporary parse data - size_t flagofs = 1; - bool in_prec, // true if we found the dot in some previous iteration - prec_dot; // true if the dot has been already added to m_szFlags - int ilen = 0; - - m_bAlignLeft = in_prec = prec_dot = false; - m_pArgPos = m_pArgEnd = format; - do - { -#define CHECK_PREC \ - if (in_prec && !prec_dot) \ - { \ - m_szFlags[flagofs++] = '.'; \ - prec_dot = true; \ - } - - // what follows '%'? - const CharType ch = *(++m_pArgEnd); - switch ( ch ) - { - case wxT('\0'): - return false; // not really an argument - - case wxT('%'): - return false; // not really an argument - - case wxT('#'): - case wxT('0'): - case wxT(' '): - case wxT('+'): - case wxT('\''): - CHECK_PREC - m_szFlags[flagofs++] = char(ch); - break; - - case wxT('-'): - CHECK_PREC - m_bAlignLeft = true; - m_szFlags[flagofs++] = char(ch); - break; - - case wxT('.'): - // don't use CHECK_PREC here to avoid warning about the value - // assigned to prec_dot inside it being never used (because - // overwritten just below) from Borland in release build - if (in_prec && !prec_dot) - m_szFlags[flagofs++] = '.'; - in_prec = true; - prec_dot = false; - m_nMaxWidth = 0; - // dot will be auto-added to m_szFlags if non-negative - // number follows - break; - - case wxT('h'): - ilen = -1; - CHECK_PREC - m_szFlags[flagofs++] = char(ch); - break; - - case wxT('l'): - // NB: it's safe to use flagofs-1 as flagofs always start from 1 - if (m_szFlags[flagofs-1] == 'l') // 'll' modifier is the same as 'L' or 'q' - ilen = 2; - else - ilen = 1; - CHECK_PREC - m_szFlags[flagofs++] = char(ch); - break; - - case wxT('q'): - case wxT('L'): - ilen = 2; - CHECK_PREC - m_szFlags[flagofs++] = char(ch); - break; -#ifdef __WINDOWS__ - // under Windows we support the special '%I64' notation as longlong - // integer conversion specifier for MSVC compatibility - // (it behaves exactly as '%lli' or '%Li' or '%qi') - case wxT('I'): - if (*(m_pArgEnd+1) == wxT('6') && - *(m_pArgEnd+2) == wxT('4')) - { - m_pArgEnd++; - m_pArgEnd++; - - ilen = 2; - CHECK_PREC - m_szFlags[flagofs++] = char(ch); - m_szFlags[flagofs++] = '6'; - m_szFlags[flagofs++] = '4'; - break; - } - // else: fall-through, 'I' is MSVC equivalent of C99 'z' -#endif // __WINDOWS__ - - case wxT('z'): - case wxT('Z'): - // 'z' is C99 standard for size_t and ptrdiff_t, 'Z' was used - // for this purpose in libc5 and by wx <= 2.8 - ilen = 3; - CHECK_PREC - m_szFlags[flagofs++] = char(ch); - break; - - case wxT('*'): - if (in_prec) - { - CHECK_PREC - - // tell Process() to use the next argument - // in the stack as maxwidth... - m_nMaxWidth = -1; - } - else - { - // tell Process() to use the next argument - // in the stack as minwidth... - m_nMinWidth = -1; - } - - // save the * in our formatting buffer... - // will be replaced later by Process() - m_szFlags[flagofs++] = char(ch); - break; - - case wxT('1'): case wxT('2'): case wxT('3'): - case wxT('4'): case wxT('5'): case wxT('6'): - case wxT('7'): case wxT('8'): case wxT('9'): - { - int len = 0; - CHECK_PREC - while ( (*m_pArgEnd >= CharType('0')) && - (*m_pArgEnd <= CharType('9')) ) - { - m_szFlags[flagofs++] = char(*m_pArgEnd); - len = len*10 + (*m_pArgEnd - wxT('0')); - m_pArgEnd++; - } - - if (in_prec) - m_nMaxWidth = len; - else - m_nMinWidth = len; - - m_pArgEnd--; // the main loop pre-increments n again - } - break; - - case wxT('$'): // a positional parameter (e.g. %2$s) ? - { - if (m_nMinWidth <= 0) - break; // ignore this formatting flag as no - // numbers are preceding it - - // remove from m_szFlags all digits previously added - do { - flagofs--; - } while (m_szFlags[flagofs] >= '1' && - m_szFlags[flagofs] <= '9'); - - // re-adjust the offset making it point to the - // next free char of m_szFlags - flagofs++; - - m_pos = m_nMinWidth; - m_nMinWidth = 0; - } - break; - - case wxT('d'): - case wxT('i'): - case wxT('o'): - case wxT('u'): - case wxT('x'): - case wxT('X'): - CHECK_PREC - m_szFlags[flagofs++] = char(ch); - if (ilen == 0) - m_type = wxPAT_INT; - else if (ilen == -1) - // NB: 'short int' value passed through '...' - // is promoted to 'int', so we have to get - // an int from stack even if we need a short - m_type = wxPAT_INT; - else if (ilen == 1) - m_type = wxPAT_LONGINT; - else if (ilen == 2) -#ifdef wxLongLong_t - m_type = wxPAT_LONGLONGINT; -#else // !wxLongLong_t - m_type = wxPAT_LONGINT; -#endif // wxLongLong_t/!wxLongLong_t - else if (ilen == 3) - m_type = wxPAT_SIZET; - done = true; - break; - - case wxT('e'): - case wxT('E'): - case wxT('f'): - case wxT('g'): - case wxT('G'): - CHECK_PREC - m_szFlags[flagofs++] = char(ch); - if (ilen == 2) - m_type = wxPAT_LONGDOUBLE; - else - m_type = wxPAT_DOUBLE; - done = true; - break; - - case wxT('p'): - m_type = wxPAT_POINTER; - m_szFlags[flagofs++] = char(ch); - done = true; - break; - - case wxT('c'): - if (ilen == -1) - { - // in Unicode mode %hc == ANSI character - // and in ANSI mode, %hc == %c == ANSI... - m_type = wxPAT_CHAR; - } - else if (ilen == 1) - { - // in ANSI mode %lc == Unicode character - // and in Unicode mode, %lc == %c == Unicode... - m_type = wxPAT_WCHAR; - } - else - { -#if wxUSE_UNICODE - // in Unicode mode, %c == Unicode character - m_type = wxPAT_WCHAR; -#else - // in ANSI mode, %c == ANSI character - m_type = wxPAT_CHAR; -#endif - } - done = true; - break; - - case wxT('s'): - if (ilen == -1) - { - // Unicode mode wx extension: we'll let %hs mean non-Unicode - // strings (when in ANSI mode, %s == %hs == ANSI string) - m_type = wxPAT_PCHAR; - } - else if (ilen == 1) - { - // in Unicode mode, %ls == %s == Unicode string - // in ANSI mode, %ls == Unicode string - m_type = wxPAT_PWCHAR; - } - else - { -#if wxUSE_UNICODE - m_type = wxPAT_PWCHAR; -#else - m_type = wxPAT_PCHAR; -#endif - } - done = true; - break; - - case wxT('n'): - if (ilen == 0) - m_type = wxPAT_NINT; - else if (ilen == -1) - m_type = wxPAT_NSHORTINT; - else if (ilen >= 1) - m_type = wxPAT_NLONGINT; - done = true; - break; - - default: - // bad format, don't consider this an argument; - // leave it unchanged - return false; - } - - if (flagofs == wxMAX_SVNPRINTF_FLAGBUFFER_LEN) - { - wxLogDebug(wxT("Too many flags specified for a single conversion specifier!")); - return false; - } - } - while (!done); - - return true; // parsing was successful -} - -template -void wxPrintfConvSpec::ReplaceAsteriskWith(int width) -{ - char temp[wxMAX_SVNPRINTF_FLAGBUFFER_LEN]; - - // find the first * in our flag buffer - char *pwidth = strchr(m_szFlags, '*'); - wxCHECK_RET(pwidth, wxT("field width must be specified")); - - // save what follows the * (the +1 is to skip the asterisk itself!) - strcpy(temp, pwidth+1); - if (width < 0) - { - pwidth[0] = wxT('-'); - pwidth++; - } - - // replace * with the actual integer given as width -#ifndef SYSTEM_SPRINTF_IS_UNSAFE - int maxlen = (m_szFlags + wxMAX_SVNPRINTF_FLAGBUFFER_LEN - pwidth) / - sizeof(*m_szFlags); -#endif - int offset = system_sprintf(pwidth, maxlen, "%d", abs(width)); - - // restore after the expanded * what was following it - strcpy(pwidth+offset, temp); -} - -template -bool wxPrintfConvSpec::LoadArg(wxPrintfArg *p, va_list &argptr) -{ - // did the '*' width/precision specifier was used ? - if (m_nMaxWidth == -1) - { - // take the maxwidth specifier from the stack - m_nMaxWidth = va_arg(argptr, int); - if (m_nMaxWidth < 0) - m_nMaxWidth = 0; - else - ReplaceAsteriskWith(m_nMaxWidth); - } - - if (m_nMinWidth == -1) - { - // take the minwidth specifier from the stack - m_nMinWidth = va_arg(argptr, int); - - ReplaceAsteriskWith(m_nMinWidth); - if (m_nMinWidth < 0) - { - m_bAlignLeft = !m_bAlignLeft; - m_nMinWidth = -m_nMinWidth; - } - } - - switch (m_type) { - case wxPAT_INT: - p->pad_int = va_arg(argptr, int); - break; - case wxPAT_LONGINT: - p->pad_longint = va_arg(argptr, long int); - break; -#ifdef wxLongLong_t - case wxPAT_LONGLONGINT: - p->pad_longlongint = va_arg(argptr, wxLongLong_t); - break; -#endif // wxLongLong_t - case wxPAT_SIZET: - p->pad_sizet = va_arg(argptr, size_t); - break; - case wxPAT_DOUBLE: - p->pad_double = va_arg(argptr, double); - break; - case wxPAT_LONGDOUBLE: - p->pad_longdouble = va_arg(argptr, long double); - break; - case wxPAT_POINTER: - p->pad_pointer = va_arg(argptr, void *); - break; - - case wxPAT_CHAR: - p->pad_char = (char)va_arg(argptr, int); // char is promoted to int when passed through '...' - break; - case wxPAT_WCHAR: - p->pad_wchar = (wchar_t)va_arg(argptr, int); // char is promoted to int when passed through '...' - break; - - case wxPAT_PCHAR: - case wxPAT_PWCHAR: - p->pad_str = va_arg(argptr, void *); - break; - - case wxPAT_NINT: - p->pad_nint = va_arg(argptr, int *); - break; - case wxPAT_NSHORTINT: - p->pad_nshortint = va_arg(argptr, short int *); - break; - case wxPAT_NLONGINT: - p->pad_nlongint = va_arg(argptr, long int *); - break; - - case wxPAT_STAR: - // this will be handled as part of the next argument - return true; - - case wxPAT_INVALID: - default: - return false; - } - - return true; // loading was successful -} - -template -int wxPrintfConvSpec::Process(CharType *buf, size_t lenMax, wxPrintfArg *p, size_t written) -{ - // buffer to avoid dynamic memory allocation each time for small strings; - // note that this buffer is used only to hold results of number formatting, - // %s directly writes user's string in buf, without using szScratch - char szScratch[wxMAX_SVNPRINTF_SCRATCHBUFFER_LEN]; - size_t lenScratch = 0, lenCur = 0; - -#define APPEND_CH(ch) \ - { \ - if ( lenCur == lenMax ) \ - return -1; \ - \ - buf[lenCur++] = ch; \ - } - - switch ( m_type ) - { - case wxPAT_INT: - lenScratch = system_sprintf(szScratch, wxMAX_SVNPRINTF_SCRATCHBUFFER_LEN, m_szFlags, p->pad_int); - break; - - case wxPAT_LONGINT: - lenScratch = system_sprintf(szScratch, wxMAX_SVNPRINTF_SCRATCHBUFFER_LEN, m_szFlags, p->pad_longint); - break; - -#ifdef wxLongLong_t - case wxPAT_LONGLONGINT: - lenScratch = system_sprintf(szScratch, wxMAX_SVNPRINTF_SCRATCHBUFFER_LEN, m_szFlags, p->pad_longlongint); - break; -#endif // SIZEOF_LONG_LONG - - case wxPAT_SIZET: - lenScratch = system_sprintf(szScratch, wxMAX_SVNPRINTF_SCRATCHBUFFER_LEN, m_szFlags, p->pad_sizet); - break; - - case wxPAT_LONGDOUBLE: - lenScratch = system_sprintf(szScratch, wxMAX_SVNPRINTF_SCRATCHBUFFER_LEN, m_szFlags, p->pad_longdouble); - break; - - case wxPAT_DOUBLE: - lenScratch = system_sprintf(szScratch, wxMAX_SVNPRINTF_SCRATCHBUFFER_LEN, m_szFlags, p->pad_double); - break; - - case wxPAT_POINTER: - lenScratch = system_sprintf(szScratch, wxMAX_SVNPRINTF_SCRATCHBUFFER_LEN, m_szFlags, p->pad_pointer); - break; - - case wxPAT_CHAR: - case wxPAT_WCHAR: - { - wxUniChar ch; - if (m_type == wxPAT_CHAR) - ch = p->pad_char; - else // m_type == wxPAT_WCHAR - ch = p->pad_wchar; - - CharType val = ch; - - size_t i; - - if (!m_bAlignLeft) - for (i = 1; i < (size_t)m_nMinWidth; i++) - APPEND_CH(wxT(' ')); - - APPEND_CH(val); - - if (m_bAlignLeft) - for (i = 1; i < (size_t)m_nMinWidth; i++) - APPEND_CH(wxT(' ')); - } - break; - - case wxPAT_PCHAR: - case wxPAT_PWCHAR: - { - wxString s; - if ( !p->pad_str ) - { - if ( m_nMaxWidth >= 6 ) - s = wxT("(null)"); - } - else if (m_type == wxPAT_PCHAR) - s.assign(static_cast(p->pad_str)); - else // m_type == wxPAT_PWCHAR - s.assign(static_cast(p->pad_str)); - - typename wxPrintfStringHelper::ConvertedType strbuf( - wxPrintfStringHelper::Convert(s)); - - // at this point we are sure that m_nMaxWidth is positive or - // null (see top of wxPrintfConvSpec::LoadArg) - int len = wxMin((unsigned int)m_nMaxWidth, wxStrlen(strbuf)); - - int i; - - if (!m_bAlignLeft) - { - for (i = len; i < m_nMinWidth; i++) - APPEND_CH(wxT(' ')); - } - - len = wxMin((unsigned int)len, lenMax-lenCur); - wxStrncpy(buf+lenCur, strbuf, len); - lenCur += len; - - if (m_bAlignLeft) - { - for (i = len; i < m_nMinWidth; i++) - APPEND_CH(wxT(' ')); - } - } - break; - - case wxPAT_NINT: - *p->pad_nint = written; - break; - - case wxPAT_NSHORTINT: - *p->pad_nshortint = (short int)written; - break; - - case wxPAT_NLONGINT: - *p->pad_nlongint = written; - break; - - case wxPAT_INVALID: - default: - return -1; - } - - // if we used system's sprintf() then we now need to append the s_szScratch - // buffer to the given one... - switch (m_type) - { - case wxPAT_INT: - case wxPAT_LONGINT: -#ifdef wxLongLong_t - case wxPAT_LONGLONGINT: -#endif - case wxPAT_SIZET: - case wxPAT_LONGDOUBLE: - case wxPAT_DOUBLE: - case wxPAT_POINTER: - wxASSERT(lenScratch < wxMAX_SVNPRINTF_SCRATCHBUFFER_LEN); - // NB: 1) we can compare lenMax (for CharType*, i.e. possibly - // wchar_t*) with lenScratch (char*) because this code is - // formatting integers and that will have the same length - // even in UTF-8 (the only case when char* length may be - // more than wchar_t* length of the same string) - // 2) wxStrncpy converts the 2nd argument to 1st argument's - // type transparently if their types differ, so this code - // works for both instantiations - if (lenMax < lenScratch) - { - // fill output buffer and then return -1 - wxStrncpy(buf, szScratch, lenMax); - return -1; - } - wxStrncpy(buf, szScratch, lenScratch); - lenCur += lenScratch; - break; - - default: - break; // all other cases were completed previously - } - - return lenCur; -} - - -// helper that parses format string -template -struct wxPrintfConvSpecParser -{ - typedef wxPrintfConvSpec ConvSpec; - - wxPrintfConvSpecParser(const CharType *fmt) - { - nargs = 0; - posarg_present = - nonposarg_present = false; - - memset(pspec, 0, sizeof(pspec)); - - // parse the format string - for ( const CharType *toparse = fmt; *toparse != wxT('\0'); toparse++ ) - { - // skip everything except format specifications - if ( *toparse != '%' ) - continue; - - // also skip escaped percent signs - if ( toparse[1] == '%' ) - { - toparse++; - continue; - } - - ConvSpec *spec = &specs[nargs]; - spec->Init(); - - // attempt to parse this format specification - if ( !spec->Parse(toparse) ) - continue; - - // advance to the end of this specifier - toparse = spec->m_pArgEnd; - - // special handling for specifications including asterisks: we need - // to reserve an extra slot (or two if asterisks were used for both - // width and precision) in specs array in this case - if ( const char *f = strchr(spec->m_szFlags, '*') ) - { - unsigned numAsterisks = 1; - if ( strchr(++f, '*') ) - numAsterisks++; - - for ( unsigned n = 0; n < numAsterisks; n++ ) - { - if ( ++nargs == wxMAX_SVNPRINTF_ARGUMENTS ) - break; - - // TODO: we need to support specifiers of the form "%2$*1$s" - // (this is the same as "%*s") as if any positional arguments - // are used all asterisks must be positional as well but this - // requires a lot of changes in this code (basically we'd need - // to rewrite Parse() to return "*" and conversion itself as - // separate entries) - if ( posarg_present ) - { - wxFAIL_MSG - ( - wxString::Format - ( - "Format string \"%s\" uses both positional " - "parameters and '*' but this is not currently " - "supported by this implementation, sorry.", - fmt - ) - ); - } - - specs[nargs] = *spec; - - // make an entry for '*' and point to it from pspec - spec->Init(); - spec->m_type = wxPAT_STAR; - pspec[nargs - 1] = spec; - - spec = &specs[nargs]; - } - - // If we hit the maximal number of arguments inside the inner - // loop, break out of the outer one as well. - if ( nargs == wxMAX_SVNPRINTF_ARGUMENTS ) - break; - } - - - // check if this is a positional or normal argument - if ( spec->m_pos > 0 ) - { - // the positional arguments start from number 1 so we need - // to adjust the index - spec->m_pos--; - posarg_present = true; - } - else // not a positional argument... - { - spec->m_pos = nargs; - nonposarg_present = true; - } - - // this conversion specifier is tied to the pos-th argument... - pspec[spec->m_pos] = spec; - - if ( ++nargs == wxMAX_SVNPRINTF_ARGUMENTS ) - break; - } - - - // warn if we lost any arguments (the program probably will crash - // anyhow because of stack corruption...) - if ( nargs == wxMAX_SVNPRINTF_ARGUMENTS ) - { - wxFAIL_MSG - ( - wxString::Format - ( - "wxVsnprintf() currently supports only %d arguments, " - "but format string \"%s\" defines more of them.\n" - "You need to change wxMAX_SVNPRINTF_ARGUMENTS and " - "recompile if more are really needed.", - fmt, wxMAX_SVNPRINTF_ARGUMENTS - ) - ); - } - } - - // total number of valid elements in specs - unsigned nargs; - - // all format specifications in this format string in order of their - // appearance (which may be different from arguments order) - ConvSpec specs[wxMAX_SVNPRINTF_ARGUMENTS]; - - // pointer to specs array element for the N-th argument - ConvSpec *pspec[wxMAX_SVNPRINTF_ARGUMENTS]; - - // true if any positional/non-positional parameters are used - bool posarg_present, - nonposarg_present; -}; - -#undef APPEND_CH -#undef CHECK_PREC - -#endif // _WX_PRIVATE_WXPRINTF_H_ diff --git a/Externals/wxWidgets3/include/wx/prntbase.h b/Externals/wxWidgets3/include/wx/prntbase.h deleted file mode 100644 index 18987fffb3..0000000000 --- a/Externals/wxWidgets3/include/wx/prntbase.h +++ /dev/null @@ -1,762 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/prntbase.h -// Purpose: Base classes for printing framework -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PRNTBASEH__ -#define _WX_PRNTBASEH__ - -#include "wx/defs.h" - -#if wxUSE_PRINTING_ARCHITECTURE - -#include "wx/event.h" -#include "wx/cmndata.h" -#include "wx/panel.h" -#include "wx/scrolwin.h" -#include "wx/dialog.h" -#include "wx/frame.h" -#include "wx/dc.h" - -class WXDLLIMPEXP_FWD_CORE wxDC; -class WXDLLIMPEXP_FWD_CORE wxButton; -class WXDLLIMPEXP_FWD_CORE wxChoice; -class WXDLLIMPEXP_FWD_CORE wxPrintout; -class WXDLLIMPEXP_FWD_CORE wxPrinterBase; -class WXDLLIMPEXP_FWD_CORE wxPrintDialogBase; -class WXDLLIMPEXP_FWD_CORE wxPrintDialog; -class WXDLLIMPEXP_FWD_CORE wxPageSetupDialogBase; -class WXDLLIMPEXP_FWD_CORE wxPageSetupDialog; -class WXDLLIMPEXP_FWD_CORE wxPrintPreviewBase; -class WXDLLIMPEXP_FWD_CORE wxPreviewCanvas; -class WXDLLIMPEXP_FWD_CORE wxPreviewControlBar; -class WXDLLIMPEXP_FWD_CORE wxPreviewFrame; -class WXDLLIMPEXP_FWD_CORE wxPrintFactory; -class WXDLLIMPEXP_FWD_CORE wxPrintNativeDataBase; -class WXDLLIMPEXP_FWD_CORE wxPrintPreview; -class WXDLLIMPEXP_FWD_CORE wxPrintAbortDialog; -class WXDLLIMPEXP_FWD_CORE wxStaticText; -class wxPrintPageMaxCtrl; -class wxPrintPageTextCtrl; - -//---------------------------------------------------------------------------- -// error consts -//---------------------------------------------------------------------------- - -enum wxPrinterError -{ - wxPRINTER_NO_ERROR = 0, - wxPRINTER_CANCELLED, - wxPRINTER_ERROR -}; - -// Preview frame modality kind used with wxPreviewFrame::Initialize() -enum wxPreviewFrameModalityKind -{ - // Disable all the other top level windows while the preview is shown. - wxPreviewFrame_AppModal, - - // Disable only the parent window while the preview is shown. - wxPreviewFrame_WindowModal, - - // Don't disable any windows. - wxPreviewFrame_NonModal -}; - -//---------------------------------------------------------------------------- -// wxPrintFactory -//---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxPrintFactory -{ -public: - wxPrintFactory() {} - virtual ~wxPrintFactory() {} - - virtual wxPrinterBase *CreatePrinter( wxPrintDialogData* data ) = 0; - - virtual wxPrintPreviewBase *CreatePrintPreview( wxPrintout *preview, - wxPrintout *printout = NULL, - wxPrintDialogData *data = NULL ) = 0; - virtual wxPrintPreviewBase *CreatePrintPreview( wxPrintout *preview, - wxPrintout *printout, - wxPrintData *data ) = 0; - - virtual wxPrintDialogBase *CreatePrintDialog( wxWindow *parent, - wxPrintDialogData *data = NULL ) = 0; - virtual wxPrintDialogBase *CreatePrintDialog( wxWindow *parent, - wxPrintData *data ) = 0; - - virtual wxPageSetupDialogBase *CreatePageSetupDialog( wxWindow *parent, - wxPageSetupDialogData * data = NULL ) = 0; - - virtual wxDCImpl* CreatePrinterDCImpl( wxPrinterDC *owner, const wxPrintData& data ) = 0; - - // What to do and what to show in the wxPrintDialog - // a) Use the generic print setup dialog or a native one? - virtual bool HasPrintSetupDialog() = 0; - virtual wxDialog *CreatePrintSetupDialog( wxWindow *parent, wxPrintData *data ) = 0; - // b) Provide the "print to file" option ourselves or via print setup? - virtual bool HasOwnPrintToFile() = 0; - // c) Show current printer - virtual bool HasPrinterLine() = 0; - virtual wxString CreatePrinterLine() = 0; - // d) Show Status line for current printer? - virtual bool HasStatusLine() = 0; - virtual wxString CreateStatusLine() = 0; - - - virtual wxPrintNativeDataBase *CreatePrintNativeData() = 0; - - static void SetPrintFactory( wxPrintFactory *factory ); - static wxPrintFactory *GetFactory(); -private: - static wxPrintFactory *m_factory; -}; - -class WXDLLIMPEXP_CORE wxNativePrintFactory: public wxPrintFactory -{ -public: - virtual wxPrinterBase *CreatePrinter( wxPrintDialogData *data ) wxOVERRIDE; - - virtual wxPrintPreviewBase *CreatePrintPreview( wxPrintout *preview, - wxPrintout *printout = NULL, - wxPrintDialogData *data = NULL ) wxOVERRIDE; - virtual wxPrintPreviewBase *CreatePrintPreview( wxPrintout *preview, - wxPrintout *printout, - wxPrintData *data ) wxOVERRIDE; - - virtual wxPrintDialogBase *CreatePrintDialog( wxWindow *parent, - wxPrintDialogData *data = NULL ) wxOVERRIDE; - virtual wxPrintDialogBase *CreatePrintDialog( wxWindow *parent, - wxPrintData *data ) wxOVERRIDE; - - virtual wxPageSetupDialogBase *CreatePageSetupDialog( wxWindow *parent, - wxPageSetupDialogData * data = NULL ) wxOVERRIDE; - - virtual wxDCImpl* CreatePrinterDCImpl( wxPrinterDC *owner, const wxPrintData& data ) wxOVERRIDE; - - virtual bool HasPrintSetupDialog() wxOVERRIDE; - virtual wxDialog *CreatePrintSetupDialog( wxWindow *parent, wxPrintData *data ) wxOVERRIDE; - virtual bool HasOwnPrintToFile() wxOVERRIDE; - virtual bool HasPrinterLine() wxOVERRIDE; - virtual wxString CreatePrinterLine() wxOVERRIDE; - virtual bool HasStatusLine() wxOVERRIDE; - virtual wxString CreateStatusLine() wxOVERRIDE; - - virtual wxPrintNativeDataBase *CreatePrintNativeData() wxOVERRIDE; -}; - -//---------------------------------------------------------------------------- -// wxPrintNativeDataBase -//---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxPrintNativeDataBase: public wxObject -{ -public: - wxPrintNativeDataBase(); - virtual ~wxPrintNativeDataBase() {} - - virtual bool TransferTo( wxPrintData &data ) = 0; - virtual bool TransferFrom( const wxPrintData &data ) = 0; -#ifdef __WXOSX__ - // in order to expose functionality already to the result type of the ..PrintData->GetNativeData() - virtual void TransferFrom( const wxPageSetupDialogData * ) = 0; - virtual void TransferTo( wxPageSetupDialogData * ) = 0; -#endif - virtual bool Ok() const { return IsOk(); } - virtual bool IsOk() const = 0; - - int m_ref; - -private: - wxDECLARE_CLASS(wxPrintNativeDataBase); - wxDECLARE_NO_COPY_CLASS(wxPrintNativeDataBase); -}; - -//---------------------------------------------------------------------------- -// wxPrinterBase -//---------------------------------------------------------------------------- - -/* - * Represents the printer: manages printing a wxPrintout object - */ - -class WXDLLIMPEXP_CORE wxPrinterBase: public wxObject -{ -public: - wxPrinterBase(wxPrintDialogData *data = NULL); - virtual ~wxPrinterBase(); - - virtual wxPrintAbortDialog *CreateAbortWindow(wxWindow *parent, wxPrintout *printout); - virtual void ReportError(wxWindow *parent, wxPrintout *printout, const wxString& message); - - virtual wxPrintDialogData& GetPrintDialogData() const; - bool GetAbort() const { return sm_abortIt; } - - static wxPrinterError GetLastError() { return sm_lastError; } - - /////////////////////////////////////////////////////////////////////////// - // OVERRIDES - - virtual bool Setup(wxWindow *parent) = 0; - virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = true) = 0; - virtual wxDC* PrintDialog(wxWindow *parent) = 0; - -protected: - wxPrintDialogData m_printDialogData; - wxPrintout* m_currentPrintout; - - static wxPrinterError sm_lastError; - -public: - static wxWindow* sm_abortWindow; - static bool sm_abortIt; - -private: - wxDECLARE_CLASS(wxPrinterBase); - wxDECLARE_NO_COPY_CLASS(wxPrinterBase); -}; - -//---------------------------------------------------------------------------- -// wxPrinter -//---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxPrinter: public wxPrinterBase -{ -public: - wxPrinter(wxPrintDialogData *data = NULL); - virtual ~wxPrinter(); - - virtual wxPrintAbortDialog *CreateAbortWindow(wxWindow *parent, wxPrintout *printout) wxOVERRIDE; - virtual void ReportError(wxWindow *parent, wxPrintout *printout, const wxString& message) wxOVERRIDE; - - virtual bool Setup(wxWindow *parent) wxOVERRIDE; - virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = true) wxOVERRIDE; - virtual wxDC* PrintDialog(wxWindow *parent) wxOVERRIDE; - - virtual wxPrintDialogData& GetPrintDialogData() const wxOVERRIDE; - -protected: - wxPrinterBase *m_pimpl; - -private: - wxDECLARE_CLASS(wxPrinter); - wxDECLARE_NO_COPY_CLASS(wxPrinter); -}; - -//---------------------------------------------------------------------------- -// wxPrintout -//---------------------------------------------------------------------------- - -/* - * Represents an object via which a document may be printed. - * The programmer derives from this, overrides (at least) OnPrintPage, - * and passes it to a wxPrinter object for printing, or a wxPrintPreview - * object for previewing. - */ - -class WXDLLIMPEXP_CORE wxPrintout: public wxObject -{ -public: - wxPrintout(const wxString& title = wxGetTranslation("Printout")); - virtual ~wxPrintout(); - - virtual bool OnBeginDocument(int startPage, int endPage); - virtual void OnEndDocument(); - virtual void OnBeginPrinting(); - virtual void OnEndPrinting(); - - // Guaranteed to be before any other functions are called - virtual void OnPreparePrinting() { } - - virtual bool HasPage(int page); - virtual bool OnPrintPage(int page) = 0; - virtual void GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo); - - virtual wxString GetTitle() const { return m_printoutTitle; } - - wxDC *GetDC() const { return m_printoutDC; } - void SetDC(wxDC *dc) { m_printoutDC = dc; } - - void FitThisSizeToPaper(const wxSize& imageSize); - void FitThisSizeToPage(const wxSize& imageSize); - void FitThisSizeToPageMargins(const wxSize& imageSize, const wxPageSetupDialogData& pageSetupData); - void MapScreenSizeToPaper(); - void MapScreenSizeToPage(); - void MapScreenSizeToPageMargins(const wxPageSetupDialogData& pageSetupData); - void MapScreenSizeToDevice(); - - wxRect GetLogicalPaperRect() const; - wxRect GetLogicalPageRect() const; - wxRect GetLogicalPageMarginsRect(const wxPageSetupDialogData& pageSetupData) const; - - void SetLogicalOrigin(wxCoord x, wxCoord y); - void OffsetLogicalOrigin(wxCoord xoff, wxCoord yoff); - - void SetPageSizePixels(int w, int h) { m_pageWidthPixels = w; m_pageHeightPixels = h; } - void GetPageSizePixels(int *w, int *h) const { *w = m_pageWidthPixels; *h = m_pageHeightPixels; } - void SetPageSizeMM(int w, int h) { m_pageWidthMM = w; m_pageHeightMM = h; } - void GetPageSizeMM(int *w, int *h) const { *w = m_pageWidthMM; *h = m_pageHeightMM; } - - void SetPPIScreen(int x, int y) { m_PPIScreenX = x; m_PPIScreenY = y; } - void SetPPIScreen(const wxSize& ppi) { SetPPIScreen(ppi.x, ppi.y); } - void GetPPIScreen(int *x, int *y) const { *x = m_PPIScreenX; *y = m_PPIScreenY; } - void SetPPIPrinter(int x, int y) { m_PPIPrinterX = x; m_PPIPrinterY = y; } - void SetPPIPrinter(const wxSize& ppi) { SetPPIPrinter(ppi.x, ppi.y); } - void GetPPIPrinter(int *x, int *y) const { *x = m_PPIPrinterX; *y = m_PPIPrinterY; } - - void SetPaperRectPixels(const wxRect& paperRectPixels) { m_paperRectPixels = paperRectPixels; } - wxRect GetPaperRectPixels() const { return m_paperRectPixels; } - - // This must be called by wxPrintPreview to associate itself with the - // printout it uses. - virtual void SetPreview(wxPrintPreview *preview) { m_preview = preview; } - - wxPrintPreview *GetPreview() const { return m_preview; } - virtual bool IsPreview() const { return GetPreview() != NULL; } - -private: - wxString m_printoutTitle; - wxDC* m_printoutDC; - wxPrintPreview *m_preview; - - int m_pageWidthPixels; - int m_pageHeightPixels; - - int m_pageWidthMM; - int m_pageHeightMM; - - int m_PPIScreenX; - int m_PPIScreenY; - int m_PPIPrinterX; - int m_PPIPrinterY; - - wxRect m_paperRectPixels; - -private: - wxDECLARE_ABSTRACT_CLASS(wxPrintout); - wxDECLARE_NO_COPY_CLASS(wxPrintout); -}; - -//---------------------------------------------------------------------------- -// wxPreviewCanvas -//---------------------------------------------------------------------------- - -/* - * Canvas upon which a preview is drawn. - */ - -class WXDLLIMPEXP_CORE wxPreviewCanvas: public wxScrolledWindow -{ -public: - wxPreviewCanvas(wxPrintPreviewBase *preview, - wxWindow *parent, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxT("canvas")); - virtual ~wxPreviewCanvas(); - - void SetPreview(wxPrintPreviewBase *preview) { m_printPreview = preview; } - - void OnPaint(wxPaintEvent& event); - void OnChar(wxKeyEvent &event); - // Responds to colour changes - void OnSysColourChanged(wxSysColourChangedEvent& event); - -private: -#if wxUSE_MOUSEWHEEL - void OnMouseWheel(wxMouseEvent& event); -#endif // wxUSE_MOUSEWHEEL - void OnIdle(wxIdleEvent& event); - - wxPrintPreviewBase* m_printPreview; - - wxDECLARE_CLASS(wxPreviewCanvas); - wxDECLARE_EVENT_TABLE(); - wxDECLARE_NO_COPY_CLASS(wxPreviewCanvas); -}; - -//---------------------------------------------------------------------------- -// wxPreviewFrame -//---------------------------------------------------------------------------- - -/* - * Default frame for showing preview. - */ - -class WXDLLIMPEXP_CORE wxPreviewFrame: public wxFrame -{ -public: - wxPreviewFrame(wxPrintPreviewBase *preview, - wxWindow *parent, - const wxString& title = wxGetTranslation("Print Preview"), - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE | wxFRAME_FLOAT_ON_PARENT, - const wxString& name = wxFrameNameStr); - virtual ~wxPreviewFrame(); - - // Either Initialize() or InitializeWithModality() must be called before - // showing the preview frame, the former being just a particular case of - // the latter initializing the frame for being showing app-modally. - - // Notice that we must keep Initialize() with its existing signature to - // avoid breaking the old code that overrides it and we can't reuse the - // same name for the other functions to avoid virtual function hiding - // problem and the associated warnings given by some compilers (e.g. from - // g++ with -Woverloaded-virtual). - virtual void Initialize() - { - InitializeWithModality(wxPreviewFrame_AppModal); - } - - // Also note that this method is not virtual as it doesn't need to be - // overridden: it's never called by wxWidgets (of course, the same is true - // for Initialize() but, again, it must remain virtual for compatibility). - void InitializeWithModality(wxPreviewFrameModalityKind kind); - - void OnCloseWindow(wxCloseEvent& event); - virtual void CreateCanvas(); - virtual void CreateControlBar(); - - inline wxPreviewControlBar* GetControlBar() const { return m_controlBar; } - -protected: - wxPreviewCanvas* m_previewCanvas; - wxPreviewControlBar* m_controlBar; - wxPrintPreviewBase* m_printPreview; - wxWindowDisabler* m_windowDisabler; - - wxPreviewFrameModalityKind m_modalityKind; - - -private: - void OnChar(wxKeyEvent& event); - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_CLASS(wxPreviewFrame); - wxDECLARE_NO_COPY_CLASS(wxPreviewFrame); -}; - -//---------------------------------------------------------------------------- -// wxPreviewControlBar -//---------------------------------------------------------------------------- - -/* - * A panel with buttons for controlling a print preview. - * The programmer may wish to use other means for controlling - * the print preview. - */ - -#define wxPREVIEW_PRINT 1 -#define wxPREVIEW_PREVIOUS 2 -#define wxPREVIEW_NEXT 4 -#define wxPREVIEW_ZOOM 8 -#define wxPREVIEW_FIRST 16 -#define wxPREVIEW_LAST 32 -#define wxPREVIEW_GOTO 64 - -#define wxPREVIEW_DEFAULT (wxPREVIEW_PREVIOUS|wxPREVIEW_NEXT|wxPREVIEW_ZOOM\ - |wxPREVIEW_FIRST|wxPREVIEW_GOTO|wxPREVIEW_LAST) - -// Ids for controls -#define wxID_PREVIEW_CLOSE 1 -#define wxID_PREVIEW_NEXT 2 -#define wxID_PREVIEW_PREVIOUS 3 -#define wxID_PREVIEW_PRINT 4 -#define wxID_PREVIEW_ZOOM 5 -#define wxID_PREVIEW_FIRST 6 -#define wxID_PREVIEW_LAST 7 -#define wxID_PREVIEW_GOTO 8 -#define wxID_PREVIEW_ZOOM_IN 9 -#define wxID_PREVIEW_ZOOM_OUT 10 - -class WXDLLIMPEXP_CORE wxPreviewControlBar: public wxPanel -{ - wxDECLARE_CLASS(wxPreviewControlBar); - -public: - wxPreviewControlBar(wxPrintPreviewBase *preview, - long buttons, - wxWindow *parent, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxTAB_TRAVERSAL, - const wxString& name = wxT("panel")); - virtual ~wxPreviewControlBar(); - - virtual void CreateButtons(); - virtual void SetPageInfo(int minPage, int maxPage); - virtual void SetZoomControl(int zoom); - virtual int GetZoomControl(); - virtual wxPrintPreviewBase *GetPrintPreview() const - { return m_printPreview; } - - - // Implementation only from now on. - void OnWindowClose(wxCommandEvent& event); - void OnNext(); - void OnPrevious(); - void OnFirst(); - void OnLast(); - void OnGotoPage(); - void OnPrint(); - - void OnPrintButton(wxCommandEvent& WXUNUSED(event)) { OnPrint(); } - void OnNextButton(wxCommandEvent & WXUNUSED(event)) { OnNext(); } - void OnPreviousButton(wxCommandEvent & WXUNUSED(event)) { OnPrevious(); } - void OnFirstButton(wxCommandEvent & WXUNUSED(event)) { OnFirst(); } - void OnLastButton(wxCommandEvent & WXUNUSED(event)) { OnLast(); } - void OnPaint(wxPaintEvent& event); - - void OnUpdateNextButton(wxUpdateUIEvent& event) - { event.Enable(IsNextEnabled()); } - void OnUpdatePreviousButton(wxUpdateUIEvent& event) - { event.Enable(IsPreviousEnabled()); } - void OnUpdateFirstButton(wxUpdateUIEvent& event) - { event.Enable(IsFirstEnabled()); } - void OnUpdateLastButton(wxUpdateUIEvent& event) - { event.Enable(IsLastEnabled()); } - void OnUpdateZoomInButton(wxUpdateUIEvent& event) - { event.Enable(IsZoomInEnabled()); } - void OnUpdateZoomOutButton(wxUpdateUIEvent& event) - { event.Enable(IsZoomOutEnabled()); } - - // These methods are not private because they are called by wxPreviewCanvas. - void DoZoomIn(); - void DoZoomOut(); - -protected: - wxPrintPreviewBase* m_printPreview; - wxButton* m_closeButton; - wxChoice* m_zoomControl; - wxPrintPageTextCtrl* m_currentPageText; - wxPrintPageMaxCtrl* m_maxPageText; - - long m_buttonFlags; - -private: - void DoGotoPage(int page); - - void DoZoom(); - - bool IsNextEnabled() const; - bool IsPreviousEnabled() const; - bool IsFirstEnabled() const; - bool IsLastEnabled() const; - bool IsZoomInEnabled() const; - bool IsZoomOutEnabled() const; - - void OnZoomInButton(wxCommandEvent & WXUNUSED(event)) { DoZoomIn(); } - void OnZoomOutButton(wxCommandEvent & WXUNUSED(event)) { DoZoomOut(); } - void OnZoomChoice(wxCommandEvent& WXUNUSED(event)) { DoZoom(); } - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_NO_COPY_CLASS(wxPreviewControlBar); -}; - -//---------------------------------------------------------------------------- -// wxPrintPreviewBase -//---------------------------------------------------------------------------- - -/* - * Programmer creates an object of this class to preview a wxPrintout. - */ - -class WXDLLIMPEXP_CORE wxPrintPreviewBase: public wxObject -{ -public: - wxPrintPreviewBase(wxPrintout *printout, - wxPrintout *printoutForPrinting = NULL, - wxPrintDialogData *data = NULL); - wxPrintPreviewBase(wxPrintout *printout, - wxPrintout *printoutForPrinting, - wxPrintData *data); - virtual ~wxPrintPreviewBase(); - - virtual bool SetCurrentPage(int pageNum); - virtual int GetCurrentPage() const; - - virtual void SetPrintout(wxPrintout *printout); - virtual wxPrintout *GetPrintout() const; - virtual wxPrintout *GetPrintoutForPrinting() const; - - virtual void SetFrame(wxFrame *frame); - virtual void SetCanvas(wxPreviewCanvas *canvas); - - virtual wxFrame *GetFrame() const; - virtual wxPreviewCanvas *GetCanvas() const; - - // This is a helper routine, used by the next 4 routines. - - virtual void CalcRects(wxPreviewCanvas *canvas, wxRect& printableAreaRect, wxRect& paperRect); - - // The preview canvas should call this from OnPaint - virtual bool PaintPage(wxPreviewCanvas *canvas, wxDC& dc); - - // Updates rendered page by calling RenderPage() if needed, returns true - // if there was some change. Preview canvas should call it at idle time - virtual bool UpdatePageRendering(); - - // This draws a blank page onto the preview canvas - virtual bool DrawBlankPage(wxPreviewCanvas *canvas, wxDC& dc); - - // Adjusts the scrollbars for the current scale - virtual void AdjustScrollbars(wxPreviewCanvas *canvas); - - // This is called by wxPrintPreview to render a page into a wxMemoryDC. - virtual bool RenderPage(int pageNum); - - - virtual void SetZoom(int percent); - virtual int GetZoom() const; - - virtual wxPrintDialogData& GetPrintDialogData(); - - virtual int GetMaxPage() const; - virtual int GetMinPage() const; - - virtual bool Ok() const { return IsOk(); } - virtual bool IsOk() const; - virtual void SetOk(bool ok); - - /////////////////////////////////////////////////////////////////////////// - // OVERRIDES - - // If we own a wxPrintout that can be used for printing, this - // will invoke the actual printing procedure. Called - // by the wxPreviewControlBar. - virtual bool Print(bool interactive) = 0; - - // Calculate scaling that needs to be done to get roughly - // the right scaling for the screen pretending to be - // the currently selected printer. - virtual void DetermineScaling() = 0; - -protected: - // helpers for RenderPage(): - virtual bool RenderPageIntoDC(wxDC& dc, int pageNum); - // renders preview into m_previewBitmap - virtual bool RenderPageIntoBitmap(wxBitmap& bmp, int pageNum); - - void InvalidatePreviewBitmap(); - -protected: - wxPrintDialogData m_printDialogData; - wxPreviewCanvas* m_previewCanvas; - wxFrame* m_previewFrame; - wxBitmap* m_previewBitmap; - bool m_previewFailed; - wxPrintout* m_previewPrintout; - wxPrintout* m_printPrintout; - int m_currentPage; - int m_currentZoom; - float m_previewScaleX; - float m_previewScaleY; - int m_topMargin; - int m_leftMargin; - int m_pageWidth; - int m_pageHeight; - int m_minPage; - int m_maxPage; - - bool m_isOk; - bool m_printingPrepared; // Called OnPreparePrinting? - -private: - void Init(wxPrintout *printout, wxPrintout *printoutForPrinting); - - wxDECLARE_NO_COPY_CLASS(wxPrintPreviewBase); - wxDECLARE_CLASS(wxPrintPreviewBase); -}; - -//---------------------------------------------------------------------------- -// wxPrintPreview -//---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxPrintPreview: public wxPrintPreviewBase -{ -public: - wxPrintPreview(wxPrintout *printout, - wxPrintout *printoutForPrinting = NULL, - wxPrintDialogData *data = NULL); - wxPrintPreview(wxPrintout *printout, - wxPrintout *printoutForPrinting, - wxPrintData *data); - virtual ~wxPrintPreview(); - - virtual bool SetCurrentPage(int pageNum) wxOVERRIDE; - virtual int GetCurrentPage() const wxOVERRIDE; - virtual void SetPrintout(wxPrintout *printout) wxOVERRIDE; - virtual wxPrintout *GetPrintout() const wxOVERRIDE; - virtual wxPrintout *GetPrintoutForPrinting() const wxOVERRIDE; - virtual void SetFrame(wxFrame *frame) wxOVERRIDE; - virtual void SetCanvas(wxPreviewCanvas *canvas) wxOVERRIDE; - - virtual wxFrame *GetFrame() const wxOVERRIDE; - virtual wxPreviewCanvas *GetCanvas() const wxOVERRIDE; - virtual bool PaintPage(wxPreviewCanvas *canvas, wxDC& dc) wxOVERRIDE; - virtual bool UpdatePageRendering() wxOVERRIDE; - virtual bool DrawBlankPage(wxPreviewCanvas *canvas, wxDC& dc) wxOVERRIDE; - virtual void AdjustScrollbars(wxPreviewCanvas *canvas) wxOVERRIDE; - virtual bool RenderPage(int pageNum) wxOVERRIDE; - virtual void SetZoom(int percent) wxOVERRIDE; - virtual int GetZoom() const wxOVERRIDE; - - virtual bool Print(bool interactive) wxOVERRIDE; - virtual void DetermineScaling() wxOVERRIDE; - - virtual wxPrintDialogData& GetPrintDialogData() wxOVERRIDE; - - virtual int GetMaxPage() const wxOVERRIDE; - virtual int GetMinPage() const wxOVERRIDE; - - virtual bool Ok() const wxOVERRIDE { return IsOk(); } - virtual bool IsOk() const wxOVERRIDE; - virtual void SetOk(bool ok) wxOVERRIDE; - -private: - wxPrintPreviewBase *m_pimpl; - -private: - wxDECLARE_CLASS(wxPrintPreview); - wxDECLARE_NO_COPY_CLASS(wxPrintPreview); -}; - -//---------------------------------------------------------------------------- -// wxPrintAbortDialog -//---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxPrintAbortDialog: public wxDialog -{ -public: - wxPrintAbortDialog(wxWindow *parent, - const wxString& documentTitle, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_DIALOG_STYLE, - const wxString& name = wxT("dialog")); - - void SetProgress(int currentPage, int totalPages, - int currentCopy, int totalCopies); - - void OnCancel(wxCommandEvent& event); - -private: - wxStaticText *m_progress; - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_NO_COPY_CLASS(wxPrintAbortDialog); -}; - -#endif // wxUSE_PRINTING_ARCHITECTURE - -#endif - // _WX_PRNTBASEH__ diff --git a/Externals/wxWidgets3/include/wx/process.h b/Externals/wxWidgets3/include/wx/process.h deleted file mode 100644 index 733275d99a..0000000000 --- a/Externals/wxWidgets3/include/wx/process.h +++ /dev/null @@ -1,193 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/process.h -// Purpose: wxProcess class -// Author: Guilhem Lavaux -// Modified by: Vadim Zeitlin to check error codes, added Detach() method -// Created: 24/06/98 -// Copyright: (c) 1998 Guilhem Lavaux -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PROCESSH__ -#define _WX_PROCESSH__ - -#include "wx/event.h" - -#if wxUSE_STREAMS - #include "wx/stream.h" -#endif - -#include "wx/utils.h" // for wxSignal - -// the wxProcess creation flags -enum -{ - // no redirection - wxPROCESS_DEFAULT = 0, - - // redirect the IO of the child process - wxPROCESS_REDIRECT = 1 -}; - -// ---------------------------------------------------------------------------- -// A wxProcess object should be passed to wxExecute - than its OnTerminate() -// function will be called when the process terminates. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxProcess : public wxEvtHandler -{ -public: - // kill the process with the given PID - static wxKillError Kill(int pid, wxSignal sig = wxSIGTERM, int flags = wxKILL_NOCHILDREN); - - // test if the given process exists - static bool Exists(int pid); - - // this function replaces the standard popen() one: it launches a process - // asynchronously and allows the caller to get the streams connected to its - // std{in|out|err} - // - // on error NULL is returned, in any case the process object will be - // deleted automatically when the process terminates and should *not* be - // deleted by the caller - static wxProcess *Open(const wxString& cmd, int flags = wxEXEC_ASYNC); - - - // ctors - wxProcess(wxEvtHandler *parent = NULL, int nId = wxID_ANY) - { Init(parent, nId, wxPROCESS_DEFAULT); } - - wxProcess(int flags) { Init(NULL, wxID_ANY, flags); } - - virtual ~wxProcess(); - - // get the process ID of the process executed by Open() - long GetPid() const { return m_pid; } - - // may be overridden to be notified about process termination - virtual void OnTerminate(int pid, int status); - - // call this before passing the object to wxExecute() to redirect the - // launched process stdin/stdout, then use GetInputStream() and - // GetOutputStream() to get access to them - void Redirect() { m_redirect = true; } - bool IsRedirected() const { return m_redirect; } - - // detach from the parent - should be called by the parent if it's deleted - // before the process it started terminates - void Detach(); - - // Activates a GUI process by bringing its (main) window to the front. - // - // Currently only implemented in wxMSW, simply returns false under the - // other platforms. - bool Activate() const; - -#if wxUSE_STREAMS - // Pipe handling - wxInputStream *GetInputStream() const { return m_inputStream; } - wxInputStream *GetErrorStream() const { return m_errorStream; } - wxOutputStream *GetOutputStream() const { return m_outputStream; } - - // close the output stream indicating that nothing more will be written - void CloseOutput() { delete m_outputStream; m_outputStream = NULL; } - - // return true if the child process stdout is not closed - bool IsInputOpened() const; - - // return true if any input is available on the child process stdout/err - bool IsInputAvailable() const; - bool IsErrorAvailable() const; - - // implementation only (for wxExecute) - // - // NB: the streams passed here should correspond to the child process - // stdout, stdin and stderr and here the normal naming convention is - // used unlike elsewhere in this class - void SetPipeStreams(wxInputStream *outStream, - wxOutputStream *inStream, - wxInputStream *errStream); -#endif // wxUSE_STREAMS - - // priority - // Sets the priority to the given value: see wxPRIORITY_XXX constants. - // - // NB: the priority can only be set before the process is created - void SetPriority(unsigned priority); - - // Get the current priority. - unsigned GetPriority() const { return m_priority; } - - // implementation only - don't use! - // -------------------------------- - - // needs to be public since it needs to be used from wxExecute() global func - void SetPid(long pid) { m_pid = pid; } - -protected: - void Init(wxEvtHandler *parent, int id, int flags); - - int m_id; - long m_pid; - - unsigned m_priority; - -#if wxUSE_STREAMS - // these streams are connected to stdout, stderr and stdin of the child - // process respectively (yes, m_inputStream corresponds to stdout -- very - // confusing but too late to change now) - wxInputStream *m_inputStream, - *m_errorStream; - wxOutputStream *m_outputStream; -#endif // wxUSE_STREAMS - - bool m_redirect; - - wxDECLARE_DYNAMIC_CLASS(wxProcess); - wxDECLARE_NO_COPY_CLASS(wxProcess); -}; - -// ---------------------------------------------------------------------------- -// wxProcess events -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_BASE wxProcessEvent; - -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_BASE, wxEVT_END_PROCESS, wxProcessEvent ); - -class WXDLLIMPEXP_BASE wxProcessEvent : public wxEvent -{ -public: - wxProcessEvent(int nId = 0, int pid = 0, int exitcode = 0) : wxEvent(nId) - { - m_eventType = wxEVT_END_PROCESS; - m_pid = pid; - m_exitcode = exitcode; - } - - // accessors - // PID of process which terminated - int GetPid() { return m_pid; } - - // the exit code - int GetExitCode() { return m_exitcode; } - - // implement the base class pure virtual - virtual wxEvent *Clone() const wxOVERRIDE { return new wxProcessEvent(*this); } - -public: - int m_pid, - m_exitcode; - - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxProcessEvent); -}; - -typedef void (wxEvtHandler::*wxProcessEventFunction)(wxProcessEvent&); - -#define wxProcessEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxProcessEventFunction, func) - -#define EVT_END_PROCESS(id, func) \ - wx__DECLARE_EVT1(wxEVT_END_PROCESS, id, wxProcessEventHandler(func)) - -#endif // _WX_PROCESSH__ diff --git a/Externals/wxWidgets3/include/wx/progdlg.h b/Externals/wxWidgets3/include/wx/progdlg.h deleted file mode 100644 index 087c75a3d1..0000000000 --- a/Externals/wxWidgets3/include/wx/progdlg.h +++ /dev/null @@ -1,63 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/progdlg.h -// Purpose: Base header for wxProgressDialog -// Author: Julian Smart -// Modified by: -// Created: -// Copyright: (c) Julian Smart -// Licence: wxWindows Licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PROGDLG_H_BASE_ -#define _WX_PROGDLG_H_BASE_ - -#include "wx/defs.h" - -#if wxUSE_PROGRESSDLG - -/* - * wxProgressDialog flags - */ -#define wxPD_CAN_ABORT 0x0001 -#define wxPD_APP_MODAL 0x0002 -#define wxPD_AUTO_HIDE 0x0004 -#define wxPD_ELAPSED_TIME 0x0008 -#define wxPD_ESTIMATED_TIME 0x0010 -#define wxPD_SMOOTH 0x0020 -#define wxPD_REMAINING_TIME 0x0040 -#define wxPD_CAN_SKIP 0x0080 - - -#include "wx/generic/progdlgg.h" - -#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) - // The native implementation requires the use of threads and still has some - // problems, so it can be explicitly disabled. - #if wxUSE_THREADS && wxUSE_NATIVE_PROGRESSDLG - #define wxHAS_NATIVE_PROGRESSDIALOG - #include "wx/msw/progdlg.h" - #endif -#endif - -// If there is no native one, just use the generic version. -#ifndef wxHAS_NATIVE_PROGRESSDIALOG - class WXDLLIMPEXP_CORE wxProgressDialog - : public wxGenericProgressDialog - { - public: - wxProgressDialog( const wxString& title, const wxString& message, - int maximum = 100, - wxWindow *parent = NULL, - int style = wxPD_APP_MODAL | wxPD_AUTO_HIDE ) - : wxGenericProgressDialog( title, message, maximum, - parent, style ) - { } - - private: - wxDECLARE_DYNAMIC_CLASS_NO_COPY( wxProgressDialog ); - }; -#endif // !wxHAS_NATIVE_PROGRESSDIALOG - -#endif // wxUSE_PROGRESSDLG - -#endif // _WX_PROGDLG_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/propdlg.h b/Externals/wxWidgets3/include/wx/propdlg.h deleted file mode 100644 index 1f91c6fbc3..0000000000 --- a/Externals/wxWidgets3/include/wx/propdlg.h +++ /dev/null @@ -1,18 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/propdlg.h -// Purpose: wxPropertySheetDialog base header -// Author: Julian Smart -// Modified by: -// Created: -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PROPDLG_H_BASE_ -#define _WX_PROPDLG_H_BASE_ - -#include "wx/generic/propdlg.h" - -#endif - // _WX_PROPDLG_H_BASE_ - diff --git a/Externals/wxWidgets3/include/wx/protocol/file.h b/Externals/wxWidgets3/include/wx/protocol/file.h deleted file mode 100644 index 4654728403..0000000000 --- a/Externals/wxWidgets3/include/wx/protocol/file.h +++ /dev/null @@ -1,38 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/protocol/file.h -// Purpose: File protocol -// Author: Guilhem Lavaux -// Modified by: -// Created: 1997 -// Copyright: (c) 1997, 1998 Guilhem Lavaux -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_PROTO_FILE_H__ -#define __WX_PROTO_FILE_H__ - -#include "wx/defs.h" - -#if wxUSE_PROTOCOL_FILE - -#include "wx/protocol/protocol.h" - -class WXDLLIMPEXP_NET wxFileProto: public wxProtocol -{ -public: - wxFileProto(); - virtual ~wxFileProto(); - - bool Abort() wxOVERRIDE { return true; } - wxString GetContentType() const wxOVERRIDE { return wxEmptyString; } - - wxInputStream *GetInputStream(const wxString& path) wxOVERRIDE; - -protected: - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxFileProto); - DECLARE_PROTOCOL(wxFileProto) -}; - -#endif // wxUSE_PROTOCOL_FILE - -#endif // __WX_PROTO_FILE_H__ diff --git a/Externals/wxWidgets3/include/wx/protocol/ftp.h b/Externals/wxWidgets3/include/wx/protocol/ftp.h deleted file mode 100644 index 426b6c9914..0000000000 --- a/Externals/wxWidgets3/include/wx/protocol/ftp.h +++ /dev/null @@ -1,176 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/protocol/ftp.h -// Purpose: FTP protocol -// Author: Vadim Zeitlin -// Modified by: Mark Johnson, wxWindows@mj10777.de -// 20000917 : RmDir, GetLastResult, GetList -// Created: 07/07/1997 -// Copyright: (c) 1997, 1998 Guilhem Lavaux -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_FTP_H__ -#define __WX_FTP_H__ - -#include "wx/defs.h" - -#if wxUSE_PROTOCOL_FTP - -#include "wx/sckaddr.h" -#include "wx/protocol/protocol.h" -#include "wx/url.h" - -class WXDLLIMPEXP_NET wxFTP : public wxProtocol -{ -public: - enum TransferMode - { - NONE, // not set by user explicitly - ASCII, - BINARY - }; - - wxFTP(); - virtual ~wxFTP(); - - // Connecting and disconnecting - virtual bool Connect(const wxSockAddress& addr, bool wait = true) wxOVERRIDE; - virtual bool Connect(const wxString& host) wxOVERRIDE { return Connect(host, 0); } - virtual bool Connect(const wxString& host, unsigned short port); - - // disconnect - virtual bool Close() wxOVERRIDE; - - // Parameters set up - - // set transfer mode now - void SetPassive(bool pasv) { m_bPassive = pasv; } - bool SetBinary() { return SetTransferMode(BINARY); } - bool SetAscii() { return SetTransferMode(ASCII); } - bool SetTransferMode(TransferMode mode); - - // Generic FTP interface - - // FTP doesn't know the MIME type of the last downloaded/uploaded file - virtual wxString GetContentType() const wxOVERRIDE { return wxEmptyString; } - - // the last FTP server reply - const wxString& GetLastResult() const { return m_lastResult; } - - // send any FTP command (should be full FTP command line but without - // trailing "\r\n") and return its return code - char SendCommand(const wxString& command); - - // check that the command returned the given code - bool CheckCommand(const wxString& command, char expectedReturn) - { - // SendCommand() does updates m_lastError - return SendCommand(command) == expectedReturn; - } - - // Filesystem commands - bool ChDir(const wxString& dir); - bool MkDir(const wxString& dir); - bool RmDir(const wxString& dir); - wxString Pwd(); - bool Rename(const wxString& src, const wxString& dst); - bool RmFile(const wxString& path); - - // Get the size of a file in the current dir. - // this function tries its best to deliver the size in bytes using BINARY - // (the SIZE command reports different sizes depending on whether - // type is set to ASCII or BINARY) - // returns -1 if file is non-existent or size could not be found - int GetFileSize(const wxString& fileName); - - // Check to see if a file exists in the current dir - bool FileExists(const wxString& fileName); - - // Download methods - bool Abort() wxOVERRIDE; - - virtual wxInputStream *GetInputStream(const wxString& path) wxOVERRIDE; - virtual wxOutputStream *GetOutputStream(const wxString& path); - - // Directory listing - - // get the list of full filenames, the format is fixed: one file name per - // line - bool GetFilesList(wxArrayString& files, - const wxString& wildcard = wxEmptyString) - { - return GetList(files, wildcard, false); - } - - // get a directory list in server dependent format - this can be shown - // directly to the user - bool GetDirList(wxArrayString& files, - const wxString& wildcard = wxEmptyString) - { - return GetList(files, wildcard, true); - } - - // equivalent to either GetFilesList() (default) or GetDirList() - bool GetList(wxArrayString& files, - const wxString& wildcard = wxEmptyString, - bool details = false); - -protected: - // this executes a simple ftp command with the given argument and returns - // true if it its return code starts with '2' - bool DoSimpleCommand(const wxChar *command, - const wxString& arg = wxEmptyString); - - // get the server reply, return the first character of the reply code, - // '1'..'5' for normal FTP replies, 0 (*not* '0') if an error occurred - char GetResult(); - - // check that the result is equal to expected value - bool CheckResult(char ch) { return GetResult() == ch; } - - // return the socket to be used, Passive/Active versions are used only by - // GetPort() - wxSocketBase *GetPort(); - wxSocketBase *GetPassivePort(); - wxSocketBase *GetActivePort(); - - // helper for GetPort() - wxString GetPortCmdArgument(const wxIPV4address& Local, const wxIPV4address& New); - - // accept connection from server in active mode, returns the same socket as - // passed in passive mode - wxSocketBase *AcceptIfActive(wxSocketBase *sock); - - - // internal variables: - - wxString m_lastResult; - - // true if there is an FTP transfer going on - bool m_streaming; - - // although this should be set to ASCII by default according to STD9, - // we will use BINARY transfer mode by default for backwards compatibility - TransferMode m_currentTransfermode; - - bool m_bPassive; - - // following is true when a read or write times out, we then assume - // the connection is dead and abort. we avoid additional delays this way - bool m_bEncounteredError; - - - friend class wxInputFTPStream; - friend class wxOutputFTPStream; - - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxFTP); - DECLARE_PROTOCOL(wxFTP) -}; - -// the trace mask used by assorted wxLogTrace() in ftp code, do -// wxLog::AddTraceMask(FTP_TRACE_MASK) to see them in output -#define FTP_TRACE_MASK wxT("ftp") - -#endif // wxUSE_PROTOCOL_FTP - -#endif // __WX_FTP_H__ diff --git a/Externals/wxWidgets3/include/wx/protocol/http.h b/Externals/wxWidgets3/include/wx/protocol/http.h deleted file mode 100644 index 90e044862a..0000000000 --- a/Externals/wxWidgets3/include/wx/protocol/http.h +++ /dev/null @@ -1,96 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/protocol/http.h -// Purpose: HTTP protocol -// Author: Guilhem Lavaux -// Modified by: Simo Virokannas (authentication, Dec 2005) -// Created: August 1997 -// Copyright: (c) 1997, 1998 Guilhem Lavaux -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// -#ifndef _WX_HTTP_H -#define _WX_HTTP_H - -#include "wx/defs.h" - -#if wxUSE_PROTOCOL_HTTP - -#include "wx/hashmap.h" -#include "wx/protocol/protocol.h" -#include "wx/buffer.h" - -class WXDLLIMPEXP_NET wxHTTP : public wxProtocol -{ -public: - wxHTTP(); - virtual ~wxHTTP(); - - virtual bool Connect(const wxString& host, unsigned short port); - virtual bool Connect(const wxString& host) wxOVERRIDE { return Connect(host, 0); } - virtual bool Connect(const wxSockAddress& addr, bool wait = true) wxOVERRIDE; - bool Abort() wxOVERRIDE; - - wxInputStream *GetInputStream(const wxString& path) wxOVERRIDE; - - wxString GetContentType() const wxOVERRIDE; - wxString GetHeader(const wxString& header) const; - int GetResponse() const { return m_http_response; } - - void SetMethod(const wxString& method) { m_method = method; } - void SetHeader(const wxString& header, const wxString& h_data); - bool SetPostText(const wxString& contentType, - const wxString& data, - const wxMBConv& conv = wxConvUTF8); - bool SetPostBuffer(const wxString& contentType, const wxMemoryBuffer& data); - void SetProxyMode(bool on); - - /* Cookies */ - wxString GetCookie(const wxString& cookie) const; - bool HasCookies() const { return m_cookies.size() > 0; } - - // Use the other SetPostBuffer() overload or SetPostText() instead. - wxDEPRECATED(void SetPostBuffer(const wxString& post_buf)); - -protected: - typedef wxStringToStringHashMap::iterator wxHeaderIterator; - typedef wxStringToStringHashMap::const_iterator wxHeaderConstIterator; - typedef wxStringToStringHashMap::iterator wxCookieIterator; - typedef wxStringToStringHashMap::const_iterator wxCookieConstIterator; - - bool BuildRequest(const wxString& path, const wxString& method); - void SendHeaders(); - bool ParseHeaders(); - - wxString GenerateAuthString(const wxString& user, const wxString& pass) const; - - // find the header in m_headers - wxHeaderIterator FindHeader(const wxString& header); - wxHeaderConstIterator FindHeader(const wxString& header) const; - wxCookieIterator FindCookie(const wxString& cookie); - wxCookieConstIterator FindCookie(const wxString& cookie) const; - - // deletes the header value strings - void ClearHeaders(); - void ClearCookies(); - - // internal variables: - - wxString m_method; - wxStringToStringHashMap m_cookies; - - wxStringToStringHashMap m_headers; - bool m_read, - m_proxy_mode; - wxSockAddress *m_addr; - wxMemoryBuffer m_postBuffer; - wxString m_contentType; - int m_http_response; - - wxDECLARE_DYNAMIC_CLASS(wxHTTP); - DECLARE_PROTOCOL(wxHTTP) - wxDECLARE_NO_COPY_CLASS(wxHTTP); -}; - -#endif // wxUSE_PROTOCOL_HTTP - -#endif // _WX_HTTP_H - diff --git a/Externals/wxWidgets3/include/wx/protocol/log.h b/Externals/wxWidgets3/include/wx/protocol/log.h deleted file mode 100644 index df373b928f..0000000000 --- a/Externals/wxWidgets3/include/wx/protocol/log.h +++ /dev/null @@ -1,54 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/protocol/log.h -// Purpose: wxProtocolLog class for logging network exchanges -// Author: Troelsk, Vadim Zeitlin -// Created: 2009-03-06 -// Copyright: (c) 2009 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PROTOCOL_LOG_H_ -#define _WX_PROTOCOL_LOG_H_ - -#include "wx/string.h" - -// ---------------------------------------------------------------------------- -// wxProtocolLog: simple class for logging network requests and responses -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_NET wxProtocolLog -{ -public: - // Create object doing the logging using wxLogTrace() with the specified - // trace mask. - wxProtocolLog(const wxString& traceMask) - : m_traceMask(traceMask) - { - } - - // Virtual dtor for the base class - virtual ~wxProtocolLog() { } - - // Called by wxProtocol-derived classes to actually log something - virtual void LogRequest(const wxString& str) - { - DoLogString("==> " + str); - } - - virtual void LogResponse(const wxString& str) - { - DoLogString("<== " + str); - } - -protected: - // Can be overridden by the derived classes. - virtual void DoLogString(const wxString& str); - -private: - const wxString m_traceMask; - - wxDECLARE_NO_COPY_CLASS(wxProtocolLog); -}; - -#endif // _WX_PROTOCOL_LOG_H_ - diff --git a/Externals/wxWidgets3/include/wx/protocol/protocol.h b/Externals/wxWidgets3/include/wx/protocol/protocol.h deleted file mode 100644 index 24f3dd7798..0000000000 --- a/Externals/wxWidgets3/include/wx/protocol/protocol.h +++ /dev/null @@ -1,177 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/protocol/protocol.h -// Purpose: Protocol base class -// Author: Guilhem Lavaux -// Modified by: -// Created: 10/07/1997 -// Copyright: (c) 1997, 1998 Guilhem Lavaux -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PROTOCOL_PROTOCOL_H -#define _WX_PROTOCOL_PROTOCOL_H - -#include "wx/defs.h" - -#if wxUSE_PROTOCOL - -#include "wx/object.h" -#include "wx/string.h" -#include "wx/stream.h" - -#if wxUSE_SOCKETS - #include "wx/socket.h" -#endif - -class WXDLLIMPEXP_FWD_NET wxProtocolLog; - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -enum wxProtocolError -{ - wxPROTO_NOERR = 0, - wxPROTO_NETERR, - wxPROTO_PROTERR, - wxPROTO_CONNERR, - wxPROTO_INVVAL, - wxPROTO_NOHNDLR, - wxPROTO_NOFILE, - wxPROTO_ABRT, - wxPROTO_RCNCT, - wxPROTO_STREAMING -}; - -// ---------------------------------------------------------------------------- -// wxProtocol: abstract base class for all protocols -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_NET wxProtocol -#if wxUSE_SOCKETS - : public wxSocketClient -#else - : public wxObject -#endif -{ -public: - wxProtocol(); - virtual ~wxProtocol(); - -#if wxUSE_SOCKETS - bool Reconnect(); - virtual bool Connect( const wxString& WXUNUSED(host) ) { return false; } - virtual bool Connect( const wxSockAddress& addr, bool WXUNUSED(wait) = true) wxOVERRIDE - { return wxSocketClient::Connect(addr); } - - // read a '\r\n' terminated line from the given socket and put it in - // result (without the terminators) - static wxProtocolError ReadLine(wxSocketBase *socket, wxString& result); - - // read a line from this socket - this one can be overridden in the - // derived classes if different line termination convention is to be used - virtual wxProtocolError ReadLine(wxString& result); -#endif // wxUSE_SOCKETS - - virtual bool Abort() = 0; - virtual wxInputStream *GetInputStream(const wxString& path) = 0; - virtual wxString GetContentType() const = 0; - - // the error code - virtual wxProtocolError GetError() const { return m_lastError; } - - void SetUser(const wxString& user) { m_username = user; } - void SetPassword(const wxString& passwd) { m_password = passwd; } - - virtual void SetDefaultTimeout(wxUint32 Value); - - // override wxSocketBase::SetTimeout function to avoid that the internal - // m_uiDefaultTimeout goes out-of-sync: - virtual void SetTimeout(long seconds) wxOVERRIDE - { SetDefaultTimeout(seconds); } - - - // logging support: each wxProtocol object may have the associated logger - // (by default there is none) which is used to log network requests and - // responses - - // set the logger, deleting the old one and taking ownership of this one - void SetLog(wxProtocolLog *log); - - // return the current logger, may be NULL - wxProtocolLog *GetLog() const { return m_log; } - - // detach the existing logger without deleting it, the caller is - // responsible for deleting the returned pointer if it's non-NULL - wxProtocolLog *DetachLog() - { - wxProtocolLog * const log = m_log; - m_log = NULL; - return log; - } - - // these functions forward to the same functions with the same names in - // wxProtocolLog if we have a valid logger and do nothing otherwise - void LogRequest(const wxString& str); - void LogResponse(const wxString& str); - -protected: - // the timeout associated with the protocol: - wxUint32 m_uiDefaultTimeout; - - wxString m_username; - wxString m_password; - - // this must be always updated by the derived classes! - wxProtocolError m_lastError; - -private: - wxProtocolLog *m_log; - - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxProtocol); -}; - -// ---------------------------------------------------------------------------- -// macros for protocol classes -// ---------------------------------------------------------------------------- - -#define DECLARE_PROTOCOL(class) \ -public: \ - static wxProtoInfo g_proto_##class; - -#define IMPLEMENT_PROTOCOL(class, name, serv, host) \ -wxProtoInfo class::g_proto_##class(name, serv, host, wxCLASSINFO(class)); \ -bool wxProtocolUse##class = true; - -#define USE_PROTOCOL(class) \ - extern bool wxProtocolUse##class ; \ - static struct wxProtocolUserFor##class \ - { \ - wxProtocolUserFor##class() { wxProtocolUse##class = true; } \ - } wxProtocolDoUse##class; - -class WXDLLIMPEXP_NET wxProtoInfo : public wxObject -{ -public: - wxProtoInfo(const wxChar *name, - const wxChar *serv_name, - const bool need_host1, - wxClassInfo *info); - -protected: - wxProtoInfo *next; - wxString m_protoname; - wxString prefix; - wxString m_servname; - wxClassInfo *m_cinfo; - bool m_needhost; - - friend class wxURL; - - wxDECLARE_DYNAMIC_CLASS(wxProtoInfo); - wxDECLARE_NO_COPY_CLASS(wxProtoInfo); -}; - -#endif // wxUSE_PROTOCOL - -#endif // _WX_PROTOCOL_PROTOCOL_H diff --git a/Externals/wxWidgets3/include/wx/ptr_scpd.h b/Externals/wxWidgets3/include/wx/ptr_scpd.h deleted file mode 100644 index 76d8e42146..0000000000 --- a/Externals/wxWidgets3/include/wx/ptr_scpd.h +++ /dev/null @@ -1,13 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/ptr_scpd.h -// Purpose: compatibility wrapper for wxScoped{Ptr,Array} -// Author: Vadim Zeitlin -// Created: 2009-02-03 -// Copyright: (c) 2009 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// do not include this file in any new code, include either wx/scopedptr.h or -// wx/scopedarray.h (or both) instead -#include "wx/scopedarray.h" -#include "wx/scopedptr.h" diff --git a/Externals/wxWidgets3/include/wx/ptr_shrd.h b/Externals/wxWidgets3/include/wx/ptr_shrd.h deleted file mode 100644 index 635cfe36e0..0000000000 --- a/Externals/wxWidgets3/include/wx/ptr_shrd.h +++ /dev/null @@ -1,11 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/ptr_shrd.h -// Purpose: compatibility wrapper for wx/sharedptr.h -// Author: Vadim Zeitlin -// Created: 2009-02-03 -// Copyright: (c) 2009 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// do not include this file in any new code, include wx/sharedptr.h instead -#include "wx/sharedptr.h" diff --git a/Externals/wxWidgets3/include/wx/quantize.h b/Externals/wxWidgets3/include/wx/quantize.h deleted file mode 100644 index 366194f1f3..0000000000 --- a/Externals/wxWidgets3/include/wx/quantize.h +++ /dev/null @@ -1,75 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/quantize.h -// Purpose: wxQuantizer class -// Author: Julian Smart -// Modified by: -// Created: 22/6/2000 -// Copyright: (c) Julian Smart -// Licence: -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_QUANTIZE_H_ -#define _WX_QUANTIZE_H_ - -#include "wx/object.h" - -/* - * From jquant2.c - * - * Copyright (C) 1991-1996, Thomas G. Lane. - * This file is part of the Independent JPEG Group's software. - * For conditions of distribution and use, see the accompanying README file. - */ - -class WXDLLIMPEXP_FWD_CORE wxImage; -class WXDLLIMPEXP_FWD_CORE wxPalette; - -/* - * wxQuantize - * Based on the JPEG quantization code. Reduces the number of colours in a wxImage. - */ - -#define wxQUANTIZE_INCLUDE_WINDOWS_COLOURS 0x01 -#define wxQUANTIZE_RETURN_8BIT_DATA 0x02 -#define wxQUANTIZE_FILL_DESTINATION_IMAGE 0x04 - -class WXDLLIMPEXP_CORE wxQuantize: public wxObject -{ -public: - wxDECLARE_DYNAMIC_CLASS(wxQuantize); - -//// Constructor - - wxQuantize() {} - virtual ~wxQuantize() {} - -//// Operations - - // Reduce the colours in the source image and put the result into the - // destination image. Both images may be the same, to overwrite the source image. - // Specify an optional palette pointer to receive the resulting palette. - // This palette may be passed to ConvertImageToBitmap, for example. - // If you pass a palette pointer, you must free the palette yourself. - - static bool Quantize(const wxImage& src, wxImage& dest, wxPalette** pPalette, int desiredNoColours = 236, - unsigned char** eightBitData = 0, int flags = wxQUANTIZE_INCLUDE_WINDOWS_COLOURS|wxQUANTIZE_FILL_DESTINATION_IMAGE|wxQUANTIZE_RETURN_8BIT_DATA); - - // This version sets a palette in the destination image so you don't - // have to manage it yourself. - - static bool Quantize(const wxImage& src, wxImage& dest, int desiredNoColours = 236, - unsigned char** eightBitData = 0, int flags = wxQUANTIZE_INCLUDE_WINDOWS_COLOURS|wxQUANTIZE_FILL_DESTINATION_IMAGE|wxQUANTIZE_RETURN_8BIT_DATA); - -//// Helpers - - // Converts input bitmap(s) into 8bit representation with custom palette - - // in_rows and out_rows are arrays [0..h-1] of pointer to rows - // (in_rows contains w * 3 bytes per row, out_rows w bytes per row) - // fills out_rows with indexes into palette (which is also stored into palette variable) - static void DoQuantize(unsigned w, unsigned h, unsigned char **in_rows, unsigned char **out_rows, unsigned char *palette, int desiredNoColours); - -}; - -#endif - // _WX_QUANTIZE_H_ diff --git a/Externals/wxWidgets3/include/wx/radiobox.h b/Externals/wxWidgets3/include/wx/radiobox.h deleted file mode 100644 index ab9c22a681..0000000000 --- a/Externals/wxWidgets3/include/wx/radiobox.h +++ /dev/null @@ -1,172 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/radiobox.h -// Purpose: wxRadioBox declaration -// Author: Vadim Zeitlin -// Modified by: -// Created: 10.09.00 -// Copyright: (c) Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_RADIOBOX_H_BASE_ -#define _WX_RADIOBOX_H_BASE_ - -#include "wx/defs.h" - -#if wxUSE_RADIOBOX - -#include "wx/ctrlsub.h" - -#if wxUSE_TOOLTIPS - -#include "wx/dynarray.h" - -class WXDLLIMPEXP_FWD_CORE wxToolTip; - -WX_DEFINE_EXPORTED_ARRAY_PTR(wxToolTip *, wxToolTipArray); - -#endif // wxUSE_TOOLTIPS - -extern WXDLLIMPEXP_DATA_CORE(const char) wxRadioBoxNameStr[]; - -// ---------------------------------------------------------------------------- -// wxRadioBoxBase is not a normal base class, but rather a mix-in because the -// real wxRadioBox derives from different classes on different platforms: for -// example, it is a wxStaticBox in wxUniv and wxMSW but not in other ports -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxRadioBoxBase : public wxItemContainerImmutable -{ -public: - virtual ~wxRadioBoxBase(); - - // change/query the individual radio button state - virtual bool Enable(unsigned int n, bool enable = true) = 0; - virtual bool Show(unsigned int n, bool show = true) = 0; - virtual bool IsItemEnabled(unsigned int n) const = 0; - virtual bool IsItemShown(unsigned int n) const = 0; - - // return number of columns/rows in this radiobox - unsigned int GetColumnCount() const { return m_numCols; } - unsigned int GetRowCount() const { return m_numRows; } - - // return the next active (i.e. shown and not disabled) item above/below/to - // the left/right of the given one - int GetNextItem(int item, wxDirection dir, long style) const; - -#if wxUSE_TOOLTIPS - // set the tooltip text for a radio item, empty string unsets any tooltip - void SetItemToolTip(unsigned int item, const wxString& text); - - // get the individual items tooltip; returns NULL if none - wxToolTip *GetItemToolTip(unsigned int item) const - { return m_itemsTooltips ? (*m_itemsTooltips)[item] : NULL; } -#endif // wxUSE_TOOLTIPS - -#if wxUSE_HELP - // set helptext for a particular item, pass an empty string to erase it - void SetItemHelpText(unsigned int n, const wxString& helpText); - - // retrieve helptext for a particular item, empty string means no help text - wxString GetItemHelpText(unsigned int n) const; -#else // wxUSE_HELP - // just silently ignore the help text, it's better than requiring using - // conditional compilation in all code using this function - void SetItemHelpText(unsigned int WXUNUSED(n), - const wxString& WXUNUSED(helpText)) - { - } -#endif // wxUSE_HELP - - // returns the radio item at the given position or wxNOT_FOUND if none - // (currently implemented only under MSW and GTK) - virtual int GetItemFromPoint(const wxPoint& WXUNUSED(pt)) const - { - return wxNOT_FOUND; - } - - -protected: - wxRadioBoxBase() - { - m_numCols = - m_numRows = - m_majorDim = 0; - -#if wxUSE_TOOLTIPS - m_itemsTooltips = NULL; -#endif // wxUSE_TOOLTIPS - } - - virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } - - // return the number of items in major direction (which depends on whether - // we have wxRA_SPECIFY_COLS or wxRA_SPECIFY_ROWS style) - unsigned int GetMajorDim() const { return m_majorDim; } - - // sets m_majorDim and also updates m_numCols/Rows - // - // the style parameter should be the style of the radiobox itself - void SetMajorDim(unsigned int majorDim, long style); - -#if wxUSE_TOOLTIPS - // called from SetItemToolTip() to really set the tooltip for the specified - // item in the box (or, if tooltip is NULL, to remove any existing one). - // - // NB: this function should really be pure virtual but to avoid breaking - // the build of the ports for which it's not implemented yet we provide - // an empty stub in the base class for now - virtual void DoSetItemToolTip(unsigned int item, wxToolTip *tooltip); - - // returns true if we have any item tooltips - bool HasItemToolTips() const { return m_itemsTooltips != NULL; } -#endif // wxUSE_TOOLTIPS - -#if wxUSE_HELP - // Retrieve help text for an item: this is a helper for the implementation - // of wxWindow::GetHelpTextAtPoint() in the real radiobox class - wxString DoGetHelpTextAtPoint(const wxWindow *derived, - const wxPoint& pt, - wxHelpEvent::Origin origin) const; -#endif // wxUSE_HELP - -private: - // the number of elements in major dimension (i.e. number of columns if - // wxRA_SPECIFY_COLS or the number of rows if wxRA_SPECIFY_ROWS) and also - // the number of rows/columns calculated from it - unsigned int m_majorDim, - m_numCols, - m_numRows; - -#if wxUSE_TOOLTIPS - // array of tooltips for the individual items - // - // this array is initially NULL and initialized on first use - wxToolTipArray *m_itemsTooltips; -#endif - -#if wxUSE_HELP - // help text associated with a particular item or empty string if none - wxArrayString m_itemsHelpTexts; -#endif // wxUSE_HELP -}; - -#if defined(__WXUNIVERSAL__) - #include "wx/univ/radiobox.h" -#elif defined(__WXMSW__) - #include "wx/msw/radiobox.h" -#elif defined(__WXMOTIF__) - #include "wx/motif/radiobox.h" -#elif defined(__WXGTK20__) - #include "wx/gtk/radiobox.h" -#elif defined(__WXGTK__) - #include "wx/gtk1/radiobox.h" -#elif defined(__WXMAC__) - #include "wx/osx/radiobox.h" -#elif defined(__WXQT__) - #include "wx/qt/radiobox.h" -#endif - -#endif // wxUSE_RADIOBOX - -#endif // _WX_RADIOBOX_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/radiobut.h b/Externals/wxWidgets3/include/wx/radiobut.h deleted file mode 100644 index 11f466cdbe..0000000000 --- a/Externals/wxWidgets3/include/wx/radiobut.h +++ /dev/null @@ -1,56 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/radiobut.h -// Purpose: wxRadioButton declaration -// Author: Vadim Zeitlin -// Modified by: -// Created: 07.09.00 -// Copyright: (c) Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_RADIOBUT_H_BASE_ -#define _WX_RADIOBUT_H_BASE_ - -#include "wx/defs.h" - -#if wxUSE_RADIOBTN - -/* - There is no wxRadioButtonBase class as wxRadioButton interface is the same - as wxCheckBox(Base), but under some platforms wxRadioButton really - derives from wxCheckBox and on the others it doesn't. - - The pseudo-declaration of wxRadioButtonBase would look like this: - - class wxRadioButtonBase : public ... - { - public: - virtual void SetValue(bool value); - virtual bool GetValue() const; - }; - */ - -#include "wx/control.h" - -extern WXDLLIMPEXP_DATA_CORE(const char) wxRadioButtonNameStr[]; - -#if defined(__WXUNIVERSAL__) - #include "wx/univ/radiobut.h" -#elif defined(__WXMSW__) - #include "wx/msw/radiobut.h" -#elif defined(__WXMOTIF__) - #include "wx/motif/radiobut.h" -#elif defined(__WXGTK20__) - #include "wx/gtk/radiobut.h" -#elif defined(__WXGTK__) - #include "wx/gtk1/radiobut.h" -#elif defined(__WXMAC__) - #include "wx/osx/radiobut.h" -#elif defined(__WXQT__) - #include "wx/qt/radiobut.h" -#endif - -#endif // wxUSE_RADIOBTN - -#endif - // _WX_RADIOBUT_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/range.h b/Externals/wxWidgets3/include/wx/range.h deleted file mode 100644 index d59646e12a..0000000000 --- a/Externals/wxWidgets3/include/wx/range.h +++ /dev/null @@ -1,28 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/range.h -// Purpose: Range Value Class -// Author: Stefan Csomor -// Modified by: -// Created: 2011-01-07 -// Copyright: (c) 2011 Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_RANGE_H_ -#define _WX_RANGE_H_ - -#include "wx/defs.h" - -class wxRange -{ -public : - wxRange(): m_minVal(0), m_maxVal(0) {} - wxRange( int minVal, int maxVal) : m_minVal(minVal), m_maxVal(maxVal) {} - int GetMin() const { return m_minVal; } - int GetMax() const { return m_maxVal; } -private : - int m_minVal; - int m_maxVal; -}; - -#endif // _WX_RANGE_H_ diff --git a/Externals/wxWidgets3/include/wx/rawbmp.h b/Externals/wxWidgets3/include/wx/rawbmp.h deleted file mode 100644 index 12eb283723..0000000000 --- a/Externals/wxWidgets3/include/wx/rawbmp.h +++ /dev/null @@ -1,739 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/rawbmp.h -// Purpose: macros for fast, raw bitmap data access -// Author: Eric Kidd, Vadim Zeitlin -// Modified by: -// Created: 10.03.03 -// Copyright: (c) 2002 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_RAWBMP_H_ -#define _WX_RAWBMP_H_ - -#include "wx/defs.h" - -#ifdef wxHAS_RAW_BITMAP - -#include "wx/image.h" -#include "wx/bitmap.h" - -// ---------------------------------------------------------------------------- -// Abstract Pixel API -// -// We need to access our raw bitmap data (1) portably and (2) efficiently. -// We do this using a two-dimensional "iteration" interface. Performance -// is extremely important here: these functions will be called hundreds -// of thousands of times in a row, and even small inefficiencies will -// make applications seem slow. -// -// We can't always rely on inline functions, because not all compilers actually -// bother to inline them unless we crank the optimization levels way up. -// Therefore, we also provide macros to wring maximum speed out of compiler -// unconditionally (e.g. even in debug builds). Of course, if the performance -// isn't absolutely crucial for you you shouldn't be using them but the inline -// functions instead. -// ---------------------------------------------------------------------------- - -/* - Usage example: - - typedef wxPixelData PixelData; - - wxBitmap bmp; - PixelData data(bmp); - if ( !data ) - { - ... raw access to bitmap data unavailable, do something else ... - return; - } - - if ( data.GetWidth() < 20 || data.GetHeight() < 20 ) - { - ... complain: the bitmap it too small ... - return; - } - - PixelData::Iterator p(data); - - // we draw a (10, 10)-(20, 20) rect manually using the given r, g, b - p.Offset(data, 10, 10); - - for ( int y = 0; y < 10; ++y ) - { - PixelData::Iterator rowStart = p; - - for ( int x = 0; x < 10; ++x, ++p ) - { - p.Red() = r; - p.Green() = g; - p.Blue() = b; - } - - p = rowStart; - p.OffsetY(data, 1); - } - */ - -/* - Note: we do not use WXDLLIMPEXP_CORE with classes in this file because VC++ has - problems with exporting inner class defined inside a specialization of a - template class from a DLL. Besides, as all the methods are inline it's not - really necessary to put them in DLL at all. - */ - -// ---------------------------------------------------------------------------- -// wxPixelFormat -// ---------------------------------------------------------------------------- - -/* - wxPixelFormat is a template class describing the bitmap data format. It - contains the constants describing the format of pixel data, but does not - describe how the entire bitmap is stored (i.e. top-to-bottom, - bottom-to-top, ...). It is also a "traits"-like class, i.e. it only - contains some constants and maybe static methods but nothing more, so it - can be safely used without incurring any overhead as all accesses to it are - done at compile-time. - - Current limitations: we don't support RAGABA and ARAGAB formats supported - by Mac OS X. If there is sufficient interest, these classes could be - extended to deal with them. Neither do we support alpha channel having - different representation from the RGB ones (happens under QNX/Photon I - think), but again this could be achieved with some small extra effort. - - Template parameters are: - - type of a single pixel component - - size of the single pixel in bits - - indices of red, green and blue pixel components inside the pixel - - index of the alpha component or -1 if none - - type which can contain the full pixel value (all channels) - */ - -template - -struct wxPixelFormat -{ - // iterator over pixels is usually of type "ChannelType *" - typedef Channel ChannelType; - - // the type which may hold the entire pixel value - typedef Pixel PixelType; - - // size of one pixel in bits - static const int BitsPerPixel = Bpp; - - // size of one pixel in ChannelType units (usually bytes) - static const int SizePixel = Bpp / (8 * sizeof(Channel)); - - // the channels indices inside the pixel - enum - { - RED = R, - GREEN = G, - BLUE = B, - ALPHA = A - }; - - // true if we have an alpha channel (together with the other channels, this - // doesn't cover the case of wxImage which stores alpha separately) - enum { HasAlpha = A != -1 }; -}; - -// some "predefined" pixel formats -// ------------------------------- - -// wxImage format is common to all platforms -typedef wxPixelFormat wxImagePixelFormat; - -// the (most common) native bitmap format without alpha support -#if defined(__WXMSW__) - // under MSW the RGB components are reversed, they're in BGR order - typedef wxPixelFormat wxNativePixelFormat; - - #define wxPIXEL_FORMAT_ALPHA 3 -#elif defined(__WXMAC__) - // under Mac, first component is unused but still present, hence we use - // 32bpp, not 24 - typedef wxPixelFormat wxNativePixelFormat; - - #define wxPIXEL_FORMAT_ALPHA 0 -#elif defined(__WXGTK__) - // Under GTK+ 2.X we use GdkPixbuf, which is standard RGB or RGBA - typedef wxPixelFormat wxNativePixelFormat; - - #define wxPIXEL_FORMAT_ALPHA 3 -#elif defined(__WXDFB__) - // Under DirectFB, RGB components are reversed, they're in BGR order - typedef wxPixelFormat wxNativePixelFormat; - - #define wxPIXEL_FORMAT_ALPHA 3 -#elif defined(__WXQT__) - typedef wxPixelFormat wxNativePixelFormat; - - #define wxPIXEL_FORMAT_ALPHA 3 -#endif - -// the (most common) native format for bitmaps with alpha channel -#ifdef wxPIXEL_FORMAT_ALPHA - typedef wxPixelFormat wxAlphaPixelFormat; -#endif // wxPIXEL_FORMAT_ALPHA - -// we also define the (default/best) pixel format for the given class: this is -// used as default value for the pixel format in wxPixelIterator template -template struct wxPixelFormatFor; - -#if wxUSE_IMAGE -// wxPixelFormatFor is only defined for wxImage, attempt to use it with other -// classes (wxBitmap...) will result in compile errors which is exactly what we -// want -template <> -struct wxPixelFormatFor -{ - typedef wxImagePixelFormat Format; -}; -#endif //wxUSE_IMAGE - -// ---------------------------------------------------------------------------- -// wxPixelData -// ---------------------------------------------------------------------------- - -/* - wxPixelDataBase is just a helper for wxPixelData: it contains things common - to both wxImage and wxBitmap specializations. - */ -class wxPixelDataBase -{ -public: - // origin of the rectangular region we represent - wxPoint GetOrigin() const { return m_ptOrigin; } - - // width and height of the region we represent - int GetWidth() const { return m_width; } - int GetHeight() const { return m_height; } - - wxSize GetSize() const { return wxSize(m_width, m_height); } - - // the distance between two rows - int GetRowStride() const { return m_stride; } - -// private: -- see comment in the beginning of the file - - // the origin of this image inside the bigger bitmap (usually (0, 0)) - wxPoint m_ptOrigin; - - // the size of the image we address, in pixels - int m_width, - m_height; - - // this parameter is the offset of the start of the (N+1)st row from the - // Nth one and can be different from m_bypp*width in some cases: - // a) the most usual one is to force 32/64 bit alignment of rows - // b) another one is for bottom-to-top images where it's negative - // c) finally, it could conceivably be 0 for the images with all - // lines being identical - int m_stride; - -protected: - // ctor is protected because this class is only meant to be used as the - // base class by wxPixelData - wxPixelDataBase() - { - m_width = - m_height = - m_stride = 0; - } -}; - -/* - wxPixelData represents the entire bitmap data, i.e. unlike - wxPixelFormat (which it uses) it also stores the global bitmap - characteristics such as its size, inter-row separation and so on. - - Because of this it can be used to move the pixel iterators (which don't - have enough information about the bitmap themselves). This may seem a bit - unnatural but must be done in this way to keep the iterator objects as - small as possible for maximum efficiency as otherwise they wouldn't be put - into the CPU registers by the compiler any more. - - Implementation note: we use the standard workaround for lack of partial - template specialization support in VC7: instead of partly specializing the - class Foo for some T we introduce FooOut and FooIn nested in - it, make Foo equivalent to FooOut::FooIn and fully specialize - FooOut (FIXME-VC7). - - Also note that this class doesn't have any default definition because we - can't really do anything without knowing the exact image class. We do - provide wxPixelDataBase to make it simpler to write new wxPixelData - specializations. - */ - -// we need to define this skeleton template to mollify VC++ -template -struct wxPixelDataOut -{ - template - class wxPixelDataIn - { - public: - class Iterator { }; - }; -}; - -#if wxUSE_IMAGE -// wxPixelData specialization for wxImage: this is the simplest case as we -// don't have to care about different pixel formats here -template <> -struct wxPixelDataOut -{ - // NB: this is a template class even though it doesn't use its template - // parameter because otherwise wxPixelData couldn't compile - template - class wxPixelDataIn : public wxPixelDataBase - { - public: - // the type of the class we're working with - typedef wxImage ImageType; - - // the iterator which should be used for working with data in this - // format - class Iterator - { - public: - // the pixel format we use - typedef wxImagePixelFormat PixelFormat; - - // the pixel data we're working with - typedef - wxPixelDataOut::wxPixelDataIn PixelData; - - // go back to (0, 0) - void Reset(const PixelData& data) - { - *this = data.GetPixels(); - } - - // creates the iterator pointing to the beginning of data - Iterator(PixelData& data) - { - Reset(data); - } - - // creates the iterator initially pointing to the image origin - Iterator(const wxImage& image) - { - m_pRGB = image.GetData(); - - if ( image.HasAlpha() ) - { - m_pAlpha = image.GetAlpha(); - } - else // alpha is not used at all - { - m_pAlpha = NULL; - } - } - - // true if the iterator is valid - bool IsOk() const { return m_pRGB != NULL; } - - - // navigation - // ---------- - - // advance the iterator to the next pixel, prefix version - Iterator& operator++() - { - m_pRGB += PixelFormat::SizePixel; - if ( m_pAlpha ) - ++m_pAlpha; - - return *this; - } - - // postfix (hence less efficient -- don't use it unless you - // absolutely must) version - Iterator operator++(int) - { - Iterator p(*this); - ++*this; - return p; - } - - // move x pixels to the right and y down - // - // note that the rows don't wrap! - void Offset(const PixelData& data, int x, int y) - { - m_pRGB += data.GetRowStride()*y + PixelFormat::SizePixel*x; - if ( m_pAlpha ) - m_pAlpha += data.GetWidth()*y + x; - } - - // move x pixels to the right (again, no row wrapping) - void OffsetX(const PixelData& WXUNUSED(data), int x) - { - m_pRGB += PixelFormat::SizePixel*x; - if ( m_pAlpha ) - m_pAlpha += x; - } - - // move y rows to the bottom - void OffsetY(const PixelData& data, int y) - { - m_pRGB += data.GetRowStride()*y; - if ( m_pAlpha ) - m_pAlpha += data.GetWidth()*y; - } - - // go to the given position - void MoveTo(const PixelData& data, int x, int y) - { - Reset(data); - Offset(data, x, y); - } - - - // data access - // ----------- - - // access to individual colour components - PixelFormat::ChannelType& Red() { return m_pRGB[PixelFormat::RED]; } - PixelFormat::ChannelType& Green() { return m_pRGB[PixelFormat::GREEN]; } - PixelFormat::ChannelType& Blue() { return m_pRGB[PixelFormat::BLUE]; } - PixelFormat::ChannelType& Alpha() { return *m_pAlpha; } - - // address the pixel contents directly (always RGB, without alpha) - // - // this can't be used to modify the image as assigning a 32bpp - // value to 24bpp pixel would overwrite an extra byte in the next - // pixel or beyond the end of image - const typename PixelFormat::PixelType& Data() - { return *(typename PixelFormat::PixelType *)m_pRGB; } - - // private: -- see comment in the beginning of the file - - // pointer into RGB buffer - unsigned char *m_pRGB; - - // pointer into alpha buffer or NULL if alpha isn't used - unsigned char *m_pAlpha; - }; - - // initializes us with the data of the given image - wxPixelDataIn(ImageType& image) : m_image(image), m_pixels(image) - { - m_width = image.GetWidth(); - m_height = image.GetHeight(); - m_stride = Iterator::PixelFormat::SizePixel * m_width; - } - - // initializes us with the given region of the specified image - wxPixelDataIn(ImageType& image, - const wxPoint& pt, - const wxSize& sz) : m_image(image), m_pixels(image) - { - m_stride = Iterator::PixelFormat::SizePixel * m_width; - - InitRect(pt, sz); - } - - // initializes us with the given region of the specified image - wxPixelDataIn(ImageType& image, - const wxRect& rect) : m_image(image), m_pixels(image) - { - m_stride = Iterator::PixelFormat::SizePixel * m_width; - - InitRect(rect.GetPosition(), rect.GetSize()); - } - - // we evaluate to true only if we could get access to bitmap data - // successfully - operator bool() const { return m_pixels.IsOk(); } - - // get the iterator pointing to the origin - Iterator GetPixels() const { return m_pixels; } - - private: - void InitRect(const wxPoint& pt, const wxSize& sz) - { - m_width = sz.x; - m_height = sz.y; - - m_ptOrigin = pt; - m_pixels.Offset(*this, pt.x, pt.y); - } - - // the image we're working with - ImageType& m_image; - - // the iterator pointing to the image origin - Iterator m_pixels; - }; -}; -#endif //wxUSE_IMAGE - -#if wxUSE_GUI -// wxPixelData specialization for wxBitmap: here things are more interesting as -// we also have to support different pixel formats -template <> -struct wxPixelDataOut -{ - template - class wxPixelDataIn : public wxPixelDataBase - { - public: - // the type of the class we're working with - typedef wxBitmap ImageType; - - class Iterator - { - public: - // the pixel format we use - typedef Format PixelFormat; - - // the type of the pixel components - typedef typename PixelFormat::ChannelType ChannelType; - - // the pixel data we're working with - typedef wxPixelDataOut::wxPixelDataIn PixelData; - - - // go back to (0, 0) - void Reset(const PixelData& data) - { - *this = data.GetPixels(); - } - - // initializes the iterator to point to the origin of the given - // pixel data - Iterator(PixelData& data) - { - Reset(data); - } - - // initializes the iterator to point to the origin of the given - // bitmap - Iterator(wxBitmap& bmp, PixelData& data) - { - // using cast here is ugly but it should be safe as - // GetRawData() real return type should be consistent with - // BitsPerPixel (which is in turn defined by ChannelType) and - // this is the only thing we can do without making GetRawData() - // a template function which is undesirable - m_ptr = (ChannelType *) - bmp.GetRawData(data, PixelFormat::BitsPerPixel); - } - - // default constructor - Iterator() - { - m_ptr = NULL; - } - - // return true if this iterator is valid - bool IsOk() const { return m_ptr != NULL; } - - - // navigation - // ---------- - - // advance the iterator to the next pixel, prefix version - Iterator& operator++() - { - m_ptr += PixelFormat::SizePixel; - - return *this; - } - - // postfix (hence less efficient -- don't use it unless you - // absolutely must) version - Iterator operator++(int) - { - Iterator p(*this); - ++*this; - return p; - } - - // move x pixels to the right and y down - // - // note that the rows don't wrap! - void Offset(const PixelData& data, int x, int y) - { - m_ptr += data.GetRowStride()*y + PixelFormat::SizePixel*x; - } - - // move x pixels to the right (again, no row wrapping) - void OffsetX(const PixelData& WXUNUSED(data), int x) - { - m_ptr += PixelFormat::SizePixel*x; - } - - // move y rows to the bottom - void OffsetY(const PixelData& data, int y) - { - m_ptr += data.GetRowStride()*y; - } - - // go to the given position - void MoveTo(const PixelData& data, int x, int y) - { - Reset(data); - Offset(data, x, y); - } - - - // data access - // ----------- - - // access to individual colour components - ChannelType& Red() { return m_ptr[PixelFormat::RED]; } - ChannelType& Green() { return m_ptr[PixelFormat::GREEN]; } - ChannelType& Blue() { return m_ptr[PixelFormat::BLUE]; } - ChannelType& Alpha() { return m_ptr[PixelFormat::ALPHA]; } - - // address the pixel contents directly - // - // warning: the format is platform dependent - // - // warning 2: assigning to Data() only works correctly for 16bpp or - // 32bpp formats but using it for 24bpp ones overwrites - // one extra byte and so can't be done - typename PixelFormat::PixelType& Data() - { return *(typename PixelFormat::PixelType *)m_ptr; } - - // private: -- see comment in the beginning of the file - - // for efficiency reasons this class should not have any other - // fields, otherwise it won't be put into a CPU register (as it - // should inside the inner loops) by some compilers, notably gcc - ChannelType *m_ptr; - }; - - // ctor associates this pointer with a bitmap and locks the bitmap for - // raw access, it will be unlocked only by our dtor and so these - // objects should normally be only created on the stack, i.e. have - // limited life-time - wxPixelDataIn(wxBitmap& bmp) : m_bmp(bmp), m_pixels(bmp, *this) - { - } - - wxPixelDataIn(wxBitmap& bmp, const wxRect& rect) - : m_bmp(bmp), m_pixels(bmp, *this) - { - InitRect(rect.GetPosition(), rect.GetSize()); - } - - wxPixelDataIn(wxBitmap& bmp, const wxPoint& pt, const wxSize& sz) - : m_bmp(bmp), m_pixels(bmp, *this) - { - InitRect(pt, sz); - } - - // we evaluate to true only if we could get access to bitmap data - // successfully - operator bool() const { return m_pixels.IsOk(); } - - // get the iterator pointing to the origin - Iterator GetPixels() const { return m_pixels; } - - // dtor unlocks the bitmap - ~wxPixelDataIn() - { - if ( m_pixels.IsOk() ) - { -#if defined(__WXMSW__) || defined(__WXMAC__) - // this is a hack to mark wxBitmap as using alpha channel - if ( Format::HasAlpha ) - m_bmp.UseAlpha(); -#endif - m_bmp.UngetRawData(*this); - } - // else: don't call UngetRawData() if GetRawData() failed - } - -#if WXWIN_COMPATIBILITY_2_8 - // not needed anymore, calls to it should be simply removed - wxDEPRECATED_INLINE( void UseAlpha(), wxEMPTY_PARAMETER_VALUE ) -#endif - - // private: -- see comment in the beginning of the file - - // the bitmap we're associated with - wxBitmap m_bmp; - - // the iterator pointing to the image origin - Iterator m_pixels; - - private: - void InitRect(const wxPoint& pt, const wxSize& sz) - { - m_pixels.Offset(*this, pt.x, pt.y); - - m_ptOrigin = pt; - m_width = sz.x; - m_height = sz.y; - } - }; -}; - -#endif //wxUSE_GUI - -template ::Format > -class wxPixelData : - public wxPixelDataOut::template wxPixelDataIn -{ -public: - typedef - typename wxPixelDataOut::template wxPixelDataIn - Base; - - wxPixelData(Image& image) : Base(image) { } - - wxPixelData(Image& i, const wxRect& rect) : Base(i, rect) { } - - wxPixelData(Image& i, const wxPoint& pt, const wxSize& sz) - : Base(i, pt, sz) - { - } -}; - -// some "predefined" pixel data classes -#if wxUSE_IMAGE -typedef wxPixelData wxImagePixelData; -#endif //wxUSE_IMAGE -#if wxUSE_GUI -typedef wxPixelData wxNativePixelData; -typedef wxPixelData wxAlphaPixelData; - -#endif //wxUSE_GUI - -// ---------------------------------------------------------------------------- -// wxPixelIterator -// ---------------------------------------------------------------------------- - -/* - wxPixel::Iterator represents something which points to the pixel data and - allows us to iterate over it. In the simplest case of wxBitmap it is, - indeed, just a pointer, but it can be something more complicated and, - moreover, you are free to specialize it for other image classes and bitmap - formats. - - Note that although it would have been much more intuitive to have a real - class here instead of what we have now, this class would need two template - parameters, and this can't be done because we'd need compiler support for - partial template specialization then and VC7 doesn't provide it. - */ -template < class Image, class PixelFormat = wxPixelFormatFor > -struct wxPixelIterator : public wxPixelData::Iterator -{ -}; - -#endif // wxHAS_RAW_BITMAP -#endif // _WX_RAWBMP_H_ diff --git a/Externals/wxWidgets3/include/wx/rearrangectrl.h b/Externals/wxWidgets3/include/wx/rearrangectrl.h deleted file mode 100644 index f9d7c324fe..0000000000 --- a/Externals/wxWidgets3/include/wx/rearrangectrl.h +++ /dev/null @@ -1,236 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/rearrangectrl.h -// Purpose: various controls for rearranging the items interactively -// Author: Vadim Zeitlin -// Created: 2008-12-15 -// Copyright: (c) 2008 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_REARRANGECTRL_H_ -#define _WX_REARRANGECTRL_H_ - -#include "wx/checklst.h" - -#if wxUSE_REARRANGECTRL - -#include "wx/panel.h" -#include "wx/dialog.h" - -#include "wx/arrstr.h" - -extern WXDLLIMPEXP_DATA_CORE(const char) wxRearrangeListNameStr[]; -extern WXDLLIMPEXP_DATA_CORE(const char) wxRearrangeDialogNameStr[]; - -// ---------------------------------------------------------------------------- -// wxRearrangeList: a (check) list box allowing to move items around -// ---------------------------------------------------------------------------- - -// This class works allows to change the order of the items shown in it as well -// as to check or uncheck them individually. The data structure used to allow -// this is the order array which contains the items indices indexed by their -// position with an added twist that the unchecked items are represented by the -// bitwise complement of the corresponding index (for any architecture using -// two's complement for negative numbers representation (i.e. just about any at -// all) this means that a checked item N is represented by -N-1 in unchecked -// state). -// -// So, for example, the array order [1 -3 0] used in conjunction with the items -// array ["first", "second", "third"] means that the items are displayed in the -// order "second", "third", "first" and the "third" item is unchecked while the -// other two are checked. -class WXDLLIMPEXP_CORE wxRearrangeList : public wxCheckListBox -{ -public: - // ctors and such - // -------------- - - // default ctor, call Create() later - wxRearrangeList() { } - - // ctor creating the control, the arguments are the same as for - // wxCheckListBox except for the extra order array which defines the - // (initial) display order of the items as well as their statuses, see the - // description above - wxRearrangeList(wxWindow *parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - const wxArrayInt& order, - const wxArrayString& items, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxRearrangeListNameStr) - { - Create(parent, id, pos, size, order, items, style, validator, name); - } - - // Create() function takes the same parameters as the base class one and - // the order array determining the initial display order - bool Create(wxWindow *parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - const wxArrayInt& order, - const wxArrayString& items, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxRearrangeListNameStr); - - - // items order - // ----------- - - // get the current items order; the returned array uses the same convention - // as the one passed to the ctor - const wxArrayInt& GetCurrentOrder() const { return m_order; } - - // return true if the current item can be moved up or down (i.e. just that - // it's not the first or the last one) - bool CanMoveCurrentUp() const; - bool CanMoveCurrentDown() const; - - // move the current item one position up or down, return true if it was moved - // or false if the current item was the first/last one and so nothing was done - bool MoveCurrentUp(); - bool MoveCurrentDown(); - - - // Override this to keep our m_order array in sync with the real item state. - virtual void Check(unsigned int item, bool check = true) wxOVERRIDE; - -private: - // swap two items at the given positions in the listbox - void Swap(int pos1, int pos2); - - // event handler for item checking/unchecking - void OnCheck(wxCommandEvent& event); - - - // the current order array - wxArrayInt m_order; - - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_NO_COPY_CLASS(wxRearrangeList); -}; - -// ---------------------------------------------------------------------------- -// wxRearrangeCtrl: composite control containing a wxRearrangeList and buttons -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxRearrangeCtrl : public wxPanel -{ -public: - // ctors/Create function are the same as for wxRearrangeList - wxRearrangeCtrl() - { - Init(); - } - - wxRearrangeCtrl(wxWindow *parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - const wxArrayInt& order, - const wxArrayString& items, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxRearrangeListNameStr) - { - Init(); - - Create(parent, id, pos, size, order, items, style, validator, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - const wxArrayInt& order, - const wxArrayString& items, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxRearrangeListNameStr); - - // get the underlying listbox - wxRearrangeList *GetList() const { return m_list; } - -private: - // common part of all ctors - void Init(); - - // event handlers for the buttons - void OnUpdateButtonUI(wxUpdateUIEvent& event); - void OnButton(wxCommandEvent& event); - - - wxRearrangeList *m_list; - - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_NO_COPY_CLASS(wxRearrangeCtrl); -}; - -// ---------------------------------------------------------------------------- -// wxRearrangeDialog: dialog containing a wxRearrangeCtrl -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxRearrangeDialog : public wxDialog -{ -public: - // default ctor, use Create() later - wxRearrangeDialog() { Init(); } - - // ctor for the dialog: message is shown inside the dialog itself, order - // and items are passed to wxRearrangeList used internally - wxRearrangeDialog(wxWindow *parent, - const wxString& message, - const wxString& title, - const wxArrayInt& order, - const wxArrayString& items, - const wxPoint& pos = wxDefaultPosition, - const wxString& name = wxRearrangeDialogNameStr) - { - Init(); - - Create(parent, message, title, order, items, pos, name); - } - - bool Create(wxWindow *parent, - const wxString& message, - const wxString& title, - const wxArrayInt& order, - const wxArrayString& items, - const wxPoint& pos = wxDefaultPosition, - const wxString& name = wxRearrangeDialogNameStr); - - - // methods for the dialog customization - - // add extra contents to the dialog below the wxRearrangeCtrl part: the - // given window (usually a wxPanel containing more control inside it) must - // have the dialog as its parent and will be inserted into it at the right - // place by this method - void AddExtraControls(wxWindow *win); - - // return the wxRearrangeList control used by the dialog - wxRearrangeList *GetList() const; - - - // get the order of items after it was modified by the user - wxArrayInt GetOrder() const; - -private: - // common part of all ctors - void Init() { m_ctrl = NULL; } - - wxRearrangeCtrl *m_ctrl; - - wxDECLARE_NO_COPY_CLASS(wxRearrangeDialog); -}; - -#endif // wxUSE_REARRANGECTRL - -#endif // _WX_REARRANGECTRL_H_ - diff --git a/Externals/wxWidgets3/include/wx/recguard.h b/Externals/wxWidgets3/include/wx/recguard.h deleted file mode 100644 index d7775b995b..0000000000 --- a/Externals/wxWidgets3/include/wx/recguard.h +++ /dev/null @@ -1,52 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/recguard.h -// Purpose: declaration and implementation of wxRecursionGuard class -// Author: Vadim Zeitlin -// Modified by: -// Created: 14.08.2003 -// Copyright: (c) 2003 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_RECGUARD_H_ -#define _WX_RECGUARD_H_ - -#include "wx/defs.h" - -// ---------------------------------------------------------------------------- -// wxRecursionGuardFlag is used with wxRecursionGuard -// ---------------------------------------------------------------------------- - -typedef int wxRecursionGuardFlag; - -// ---------------------------------------------------------------------------- -// wxRecursionGuard is the simplest way to protect a function from reentrancy -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxRecursionGuard -{ -public: - wxRecursionGuard(wxRecursionGuardFlag& flag) - : m_flag(flag) - { - m_isInside = flag++ != 0; - } - - ~wxRecursionGuard() - { - wxASSERT_MSG( m_flag > 0, wxT("unbalanced wxRecursionGuards!?") ); - - m_flag--; - } - - bool IsInside() const { return m_isInside; } - -private: - wxRecursionGuardFlag& m_flag; - - // true if the flag had been already set when we were created - bool m_isInside; -}; - -#endif // _WX_RECGUARD_H_ - diff --git a/Externals/wxWidgets3/include/wx/regex.h b/Externals/wxWidgets3/include/wx/regex.h deleted file mode 100644 index 0b1836e344..0000000000 --- a/Externals/wxWidgets3/include/wx/regex.h +++ /dev/null @@ -1,164 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/regex.h -// Purpose: regular expression matching -// Author: Karsten Ballueder -// Modified by: VZ at 13.07.01 (integrated to wxWin) -// Created: 05.02.2000 -// Copyright: (c) 2000 Karsten Ballueder -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_REGEX_H_ -#define _WX_REGEX_H_ - -#include "wx/defs.h" - -#if wxUSE_REGEX - -#include "wx/string.h" - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -// flags for regex compilation: these can be used with Compile() -enum -{ - // use extended regex syntax - wxRE_EXTENDED = 0, - - // use advanced RE syntax (built-in regex only) -#ifdef wxHAS_REGEX_ADVANCED - wxRE_ADVANCED = 1, -#endif - - // use basic RE syntax - wxRE_BASIC = 2, - - // ignore case in match - wxRE_ICASE = 4, - - // only check match, don't set back references - wxRE_NOSUB = 8, - - // if not set, treat '\n' as an ordinary character, otherwise it is - // special: it is not matched by '.' and '^' and '$' always match - // after/before it regardless of the setting of wxRE_NOT[BE]OL - wxRE_NEWLINE = 16, - - // default flags - wxRE_DEFAULT = wxRE_EXTENDED -}; - -// flags for regex matching: these can be used with Matches() -// -// these flags are mainly useful when doing several matches in a long string, -// they can be used to prevent erroneous matches for '^' and '$' -enum -{ - // '^' doesn't match at the start of line - wxRE_NOTBOL = 32, - - // '$' doesn't match at the end of line - wxRE_NOTEOL = 64 -}; - -// ---------------------------------------------------------------------------- -// wxRegEx: a regular expression -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_BASE wxRegExImpl; - -class WXDLLIMPEXP_BASE wxRegEx -{ -public: - // default ctor: use Compile() later - wxRegEx() { Init(); } - - // create and compile - wxRegEx(const wxString& expr, int flags = wxRE_DEFAULT) - { - Init(); - (void)Compile(expr, flags); - } - - // return true if this is a valid compiled regular expression - bool IsValid() const { return m_impl != NULL; } - - // compile the string into regular expression, return true if ok or false - // if string has a syntax error - bool Compile(const wxString& pattern, int flags = wxRE_DEFAULT); - - // matches the precompiled regular expression against a string, return - // true if matches and false otherwise - // - // flags may be combination of wxRE_NOTBOL and wxRE_NOTEOL - // len may be the length of text (ignored by most system regex libs) - // - // may only be called after successful call to Compile() - bool Matches(const wxString& text, int flags = 0) const; - bool Matches(const wxChar *text, int flags, size_t len) const - { return Matches(wxString(text, len), flags); } - - // get the start index and the length of the match of the expression - // (index 0) or a bracketed subexpression (index != 0) - // - // may only be called after successful call to Matches() - // - // return false if no match or on error - bool GetMatch(size_t *start, size_t *len, size_t index = 0) const; - - // return the part of string corresponding to the match, empty string is - // returned if match failed - // - // may only be called after successful call to Matches() - wxString GetMatch(const wxString& text, size_t index = 0) const; - - // return the size of the array of matches, i.e. the number of bracketed - // subexpressions plus one for the expression itself, or 0 on error. - // - // may only be called after successful call to Compile() - size_t GetMatchCount() const; - - // replaces the current regular expression in the string pointed to by - // pattern, with the text in replacement and return number of matches - // replaced (maybe 0 if none found) or -1 on error - // - // the replacement text may contain backreferences (\number) which will be - // replaced with the value of the corresponding subexpression in the - // pattern match - // - // maxMatches may be used to limit the number of replacements made, setting - // it to 1, for example, will only replace first occurrence (if any) of the - // pattern in the text while default value of 0 means replace all - int Replace(wxString *text, const wxString& replacement, - size_t maxMatches = 0) const; - - // replace the first occurrence - int ReplaceFirst(wxString *text, const wxString& replacement) const - { return Replace(text, replacement, 1); } - - // replace all occurrences: this is actually a synonym for Replace() - int ReplaceAll(wxString *text, const wxString& replacement) const - { return Replace(text, replacement, 0); } - - // dtor not virtual, don't derive from this class - ~wxRegEx(); - -private: - // common part of all ctors - void Init(); - - // the real guts of this class - wxRegExImpl *m_impl; - - // as long as the class wxRegExImpl is not ref-counted, - // instances of the handle wxRegEx must not be copied. - wxRegEx(const wxRegEx&); - wxRegEx &operator=(const wxRegEx&); -}; - -#endif // wxUSE_REGEX - -#endif // _WX_REGEX_H_ - diff --git a/Externals/wxWidgets3/include/wx/region.h b/Externals/wxWidgets3/include/wx/region.h deleted file mode 100644 index 1ee8fcb1f4..0000000000 --- a/Externals/wxWidgets3/include/wx/region.h +++ /dev/null @@ -1,288 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/region.h -// Purpose: Base header for wxRegion -// Author: Julian Smart -// Modified by: -// Created: -// Copyright: (c) Julian Smart -// Licence: wxWindows Licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_REGION_H_BASE_ -#define _WX_REGION_H_BASE_ - -#include "wx/gdiobj.h" -#include "wx/gdicmn.h" - -class WXDLLIMPEXP_FWD_CORE wxBitmap; -class WXDLLIMPEXP_FWD_CORE wxColour; -class WXDLLIMPEXP_FWD_CORE wxRegion; - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -// result of wxRegion::Contains() call -enum wxRegionContain -{ - wxOutRegion = 0, - wxPartRegion = 1, - wxInRegion = 2 -}; - -// these constants are used with wxRegion::Combine() in the ports which have -// this method -enum wxRegionOp -{ - // Creates the intersection of the two combined regions. - wxRGN_AND, - - // Creates a copy of the region - wxRGN_COPY, - - // Combines the parts of first region that are not in the second one - wxRGN_DIFF, - - // Creates the union of two combined regions. - wxRGN_OR, - - // Creates the union of two regions except for any overlapping areas. - wxRGN_XOR -}; - -// ---------------------------------------------------------------------------- -// wxRegionBase defines wxRegion API -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxRegionBase : public wxGDIObject -{ -public: - // ctors - // ----- - - // none are defined here but the following should be available: -#if 0 - wxRegion(); - wxRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h); - wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight); - wxRegion(const wxRect& rect); - wxRegion(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle = wxODDEVEN_RULE); - wxRegion(const wxBitmap& bmp); - wxRegion(const wxBitmap& bmp, const wxColour& transp, int tolerance = 0); -#endif // 0 - - // operators - // --------- - - bool operator==(const wxRegion& region) const { return IsEqual(region); } - bool operator!=(const wxRegion& region) const { return !(*this == region); } - - - // accessors - // --------- - - // Is region empty? - virtual bool IsEmpty() const = 0; - bool Empty() const { return IsEmpty(); } - - // Is region equal (i.e. covers the same area as another one)? - bool IsEqual(const wxRegion& region) const; - - // Get the bounding box - bool GetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const - { return DoGetBox(x, y, w, h); } - wxRect GetBox() const - { - wxCoord x, y, w, h; - return DoGetBox(x, y, w, h) ? wxRect(x, y, w, h) : wxRect(); - } - - // Test if the given point or rectangle is inside this region - wxRegionContain Contains(wxCoord x, wxCoord y) const - { return DoContainsPoint(x, y); } - wxRegionContain Contains(const wxPoint& pt) const - { return DoContainsPoint(pt.x, pt.y); } - wxRegionContain Contains(wxCoord x, wxCoord y, wxCoord w, wxCoord h) const - { return DoContainsRect(wxRect(x, y, w, h)); } - wxRegionContain Contains(const wxRect& rect) const - { return DoContainsRect(rect); } - - - // operations - // ---------- - - virtual void Clear() = 0; - - // Move the region - bool Offset(wxCoord x, wxCoord y) - { return DoOffset(x, y); } - bool Offset(const wxPoint& pt) - { return DoOffset(pt.x, pt.y); } - - // Union rectangle or region with this region. - bool Union(wxCoord x, wxCoord y, wxCoord w, wxCoord h) - { return DoUnionWithRect(wxRect(x, y, w, h)); } - bool Union(const wxRect& rect) - { return DoUnionWithRect(rect); } - bool Union(const wxRegion& region) - { return DoUnionWithRegion(region); } - -#if wxUSE_IMAGE - // Use the non-transparent pixels of a wxBitmap for the region to combine - // with this region. First version takes transparency from bitmap's mask, - // second lets the user specify the colour to be treated as transparent - // along with an optional tolerance value. - // NOTE: implemented in common/rgncmn.cpp - bool Union(const wxBitmap& bmp); - bool Union(const wxBitmap& bmp, const wxColour& transp, int tolerance = 0); -#endif // wxUSE_IMAGE - - // Intersect rectangle or region with this one. - bool Intersect(wxCoord x, wxCoord y, wxCoord w, wxCoord h); - bool Intersect(const wxRect& rect); - bool Intersect(const wxRegion& region) - { return DoIntersect(region); } - - // Subtract rectangle or region from this: - // Combines the parts of 'this' that are not part of the second region. - bool Subtract(wxCoord x, wxCoord y, wxCoord w, wxCoord h); - bool Subtract(const wxRect& rect); - bool Subtract(const wxRegion& region) - { return DoSubtract(region); } - - // XOR: the union of two combined regions except for any overlapping areas. - bool Xor(wxCoord x, wxCoord y, wxCoord w, wxCoord h); - bool Xor(const wxRect& rect); - bool Xor(const wxRegion& region) - { return DoXor(region); } - - - // Convert the region to a B&W bitmap with the white pixels being inside - // the region. - wxBitmap ConvertToBitmap() const; - -protected: - virtual bool DoIsEqual(const wxRegion& region) const = 0; - virtual bool DoGetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const = 0; - virtual wxRegionContain DoContainsPoint(wxCoord x, wxCoord y) const = 0; - virtual wxRegionContain DoContainsRect(const wxRect& rect) const = 0; - - virtual bool DoOffset(wxCoord x, wxCoord y) = 0; - - virtual bool DoUnionWithRect(const wxRect& rect) = 0; - virtual bool DoUnionWithRegion(const wxRegion& region) = 0; - - virtual bool DoIntersect(const wxRegion& region) = 0; - virtual bool DoSubtract(const wxRegion& region) = 0; - virtual bool DoXor(const wxRegion& region) = 0; -}; - -// some ports implement a generic Combine() function while others only -// implement individual wxRegion operations, factor out the common code for the -// ports with Combine() in this class -#if defined(__WXMSW__) || \ - ( defined(__WXMAC__) && wxOSX_USE_COCOA_OR_CARBON ) - -#define wxHAS_REGION_COMBINE - -class WXDLLIMPEXP_CORE wxRegionWithCombine : public wxRegionBase -{ -public: - // these methods are not part of public API as they're not implemented on - // all ports - bool Combine(wxCoord x, wxCoord y, wxCoord w, wxCoord h, wxRegionOp op); - bool Combine(const wxRect& rect, wxRegionOp op); - bool Combine(const wxRegion& region, wxRegionOp op) - { return DoCombine(region, op); } - - -protected: - // the real Combine() method, to be defined in the derived class - virtual bool DoCombine(const wxRegion& region, wxRegionOp op) = 0; - - // implement some wxRegionBase pure virtuals in terms of Combine() - virtual bool DoUnionWithRect(const wxRect& rect); - virtual bool DoUnionWithRegion(const wxRegion& region); - virtual bool DoIntersect(const wxRegion& region); - virtual bool DoSubtract(const wxRegion& region); - virtual bool DoXor(const wxRegion& region); -}; - -#endif // ports with wxRegion::Combine() - -#if defined(__WXMSW__) - #include "wx/msw/region.h" -#elif defined(__WXGTK20__) - #include "wx/gtk/region.h" -#elif defined(__WXGTK__) - #include "wx/gtk1/region.h" -#elif defined(__WXMOTIF__) || defined(__WXX11__) - #include "wx/x11/region.h" -#elif defined(__WXDFB__) - #include "wx/dfb/region.h" -#elif defined(__WXMAC__) - #include "wx/osx/region.h" -#elif defined(__WXQT__) - #include "wx/qt/region.h" -#endif - -// ---------------------------------------------------------------------------- -// inline functions implementation -// ---------------------------------------------------------------------------- - -// NB: these functions couldn't be defined in the class declaration as they use -// wxRegion and so can be only defined after including the header declaring -// the real class - -inline bool wxRegionBase::Intersect(const wxRect& rect) -{ - return DoIntersect(wxRegion(rect)); -} - -inline bool wxRegionBase::Subtract(const wxRect& rect) -{ - return DoSubtract(wxRegion(rect)); -} - -inline bool wxRegionBase::Xor(const wxRect& rect) -{ - return DoXor(wxRegion(rect)); -} - -// ...and these functions are here because they call the ones above, and its -// not really proper to call an inline function before its defined inline. - -inline bool wxRegionBase::Intersect(wxCoord x, wxCoord y, wxCoord w, wxCoord h) -{ - return Intersect(wxRect(x, y, w, h)); -} - -inline bool wxRegionBase::Subtract(wxCoord x, wxCoord y, wxCoord w, wxCoord h) -{ - return Subtract(wxRect(x, y, w, h)); -} - -inline bool wxRegionBase::Xor(wxCoord x, wxCoord y, wxCoord w, wxCoord h) -{ - return Xor(wxRect(x, y, w, h)); -} - -#ifdef wxHAS_REGION_COMBINE - -inline bool wxRegionWithCombine::Combine(wxCoord x, - wxCoord y, - wxCoord w, - wxCoord h, - wxRegionOp op) -{ - return DoCombine(wxRegion(x, y, w, h), op); -} - -inline bool wxRegionWithCombine::Combine(const wxRect& rect, wxRegionOp op) -{ - return DoCombine(wxRegion(rect), op); -} - -#endif // wxHAS_REGION_COMBINE - -#endif // _WX_REGION_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/renderer.h b/Externals/wxWidgets3/include/wx/renderer.h deleted file mode 100644 index 627c142e12..0000000000 --- a/Externals/wxWidgets3/include/wx/renderer.h +++ /dev/null @@ -1,584 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/renderer.h -// Purpose: wxRendererNative class declaration -// Author: Vadim Zeitlin -// Modified by: -// Created: 20.07.2003 -// Copyright: (c) 2003 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -/* - Renderers are used in wxWidgets for two similar but different things: - (a) wxUniversal uses them to draw everything, i.e. all the control - (b) all the native ports use them to draw generic controls only - - wxUniversal needs more functionality than what is included in the base class - as it needs to draw stuff like scrollbars which are never going to be - generic. So we put the bare minimum needed by the native ports here and the - full wxRenderer class is declared in wx/univ/renderer.h and is only used by - wxUniveral (although note that native ports can load wxRenderer objects from - theme DLLs and use them as wxRendererNative ones, of course). - */ - -#ifndef _WX_RENDERER_H_ -#define _WX_RENDERER_H_ - -class WXDLLIMPEXP_FWD_CORE wxDC; -class WXDLLIMPEXP_FWD_CORE wxWindow; - -#include "wx/gdicmn.h" // for wxPoint, wxSize -#include "wx/colour.h" -#include "wx/font.h" -#include "wx/bitmap.h" -#include "wx/string.h" - -// some platforms have their own renderers, others use the generic one -#if defined(__WXMSW__) || ( defined(__WXMAC__) && wxOSX_USE_COCOA_OR_CARBON ) || defined(__WXGTK__) - #define wxHAS_NATIVE_RENDERER -#else - #undef wxHAS_NATIVE_RENDERER -#endif - -// only MSW and OS X currently provides DrawTitleBarBitmap() method -#if defined(__WXMSW__) || (defined(__WXMAC__) && wxUSE_LIBPNG && wxUSE_IMAGE) - #define wxHAS_DRAW_TITLE_BAR_BITMAP -#endif - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -// control state flags used in wxRenderer and wxColourScheme -enum -{ - wxCONTROL_NONE = 0x00000000, // absence of any other flags - wxCONTROL_DISABLED = 0x00000001, // control is disabled - wxCONTROL_FOCUSED = 0x00000002, // currently has keyboard focus - wxCONTROL_PRESSED = 0x00000004, // (button) is pressed - wxCONTROL_SPECIAL = 0x00000008, // control-specific bit: - wxCONTROL_ISDEFAULT = wxCONTROL_SPECIAL, // only for the buttons - wxCONTROL_ISSUBMENU = wxCONTROL_SPECIAL, // only for the menu items - wxCONTROL_EXPANDED = wxCONTROL_SPECIAL, // only for the tree items - wxCONTROL_SIZEGRIP = wxCONTROL_SPECIAL, // only for the status bar panes - wxCONTROL_FLAT = wxCONTROL_SPECIAL, // checkboxes only: flat border - wxCONTROL_CELL = wxCONTROL_SPECIAL, // only for item selection rect - wxCONTROL_CURRENT = 0x00000010, // mouse is currently over the control - wxCONTROL_SELECTED = 0x00000020, // selected item in e.g. listbox - wxCONTROL_CHECKED = 0x00000040, // (check/radio button) is checked - wxCONTROL_CHECKABLE = 0x00000080, // (menu) item can be checked - wxCONTROL_UNDETERMINED = wxCONTROL_CHECKABLE, // (check) undetermined state - - wxCONTROL_FLAGS_MASK = 0x000000ff, - - // this is a pseudo flag not used directly by wxRenderer but rather by some - // controls internally - wxCONTROL_DIRTY = 0x80000000 -}; - -// title bar buttons supported by DrawTitleBarBitmap() -// -// NB: they have the same values as wxTOPLEVEL_BUTTON_XXX constants in -// wx/univ/toplevel.h as they really represent the same things -enum wxTitleBarButton -{ - wxTITLEBAR_BUTTON_CLOSE = 0x01000000, - wxTITLEBAR_BUTTON_MAXIMIZE = 0x02000000, - wxTITLEBAR_BUTTON_ICONIZE = 0x04000000, - wxTITLEBAR_BUTTON_RESTORE = 0x08000000, - wxTITLEBAR_BUTTON_HELP = 0x10000000 -}; - -// ---------------------------------------------------------------------------- -// helper structs -// ---------------------------------------------------------------------------- - -// wxSplitterWindow parameters -struct WXDLLIMPEXP_CORE wxSplitterRenderParams -{ - // the only way to initialize this struct is by using this ctor - wxSplitterRenderParams(wxCoord widthSash_, wxCoord border_, bool isSens_) - : widthSash(widthSash_), border(border_), isHotSensitive(isSens_) - { - } - - // the width of the splitter sash - const wxCoord widthSash; - - // the width of the border of the splitter window - const wxCoord border; - - // true if the splitter changes its appearance when the mouse is over it - const bool isHotSensitive; -}; - - -// extra optional parameters for DrawHeaderButton -struct WXDLLIMPEXP_CORE wxHeaderButtonParams -{ - wxHeaderButtonParams() - : m_labelAlignment(wxALIGN_LEFT) - { } - - wxColour m_arrowColour; - wxColour m_selectionColour; - wxString m_labelText; - wxFont m_labelFont; - wxColour m_labelColour; - wxBitmap m_labelBitmap; - int m_labelAlignment; -}; - -enum wxHeaderSortIconType -{ - wxHDR_SORT_ICON_NONE, // Header button has no sort arrow - wxHDR_SORT_ICON_UP, // Header button an up sort arrow icon - wxHDR_SORT_ICON_DOWN // Header button a down sort arrow icon -}; - - -// wxRendererNative interface version -struct WXDLLIMPEXP_CORE wxRendererVersion -{ - wxRendererVersion(int version_, int age_) : version(version_), age(age_) { } - - // default copy ctor, assignment operator and dtor are ok - - // the current version and age of wxRendererNative interface: different - // versions are incompatible (in both ways) while the ages inside the same - // version are upwards compatible, i.e. the version of the renderer must - // match the version of the main program exactly while the age may be - // highergreater or equal to it - // - // NB: don't forget to increment age after adding any new virtual function! - enum - { - Current_Version = 1, - Current_Age = 5 - }; - - - // check if the given version is compatible with the current one - static bool IsCompatible(const wxRendererVersion& ver) - { - return ver.version == Current_Version && ver.age >= Current_Age; - } - - const int version; - const int age; -}; - -// ---------------------------------------------------------------------------- -// wxRendererNative: abstracts drawing methods needed by the native controls -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxRendererNative -{ -public: - // drawing functions - // ----------------- - - // draw the header control button (used by wxListCtrl) Returns optimal - // width for the label contents. - virtual int DrawHeaderButton(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags = 0, - wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE, - wxHeaderButtonParams* params=NULL) = 0; - - - // Draw the contents of a header control button (label, sort arrows, etc.) - // Normally only called by DrawHeaderButton. - virtual int DrawHeaderButtonContents(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags = 0, - wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE, - wxHeaderButtonParams* params=NULL) = 0; - - // Returns the default height of a header button, either a fixed platform - // height if available, or a generic height based on the window's font. - virtual int GetHeaderButtonHeight(wxWindow *win) = 0; - - // Returns the margin on left and right sides of header button's label - virtual int GetHeaderButtonMargin(wxWindow *win) = 0; - - - // draw the expanded/collapsed icon for a tree control item - virtual void DrawTreeItemButton(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags = 0) = 0; - - // draw the border for sash window: this border must be such that the sash - // drawn by DrawSash() blends into it well - virtual void DrawSplitterBorder(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags = 0) = 0; - - // draw a (vertical) sash - virtual void DrawSplitterSash(wxWindow *win, - wxDC& dc, - const wxSize& size, - wxCoord position, - wxOrientation orient, - int flags = 0) = 0; - - // draw a combobox dropdown button - // - // flags may use wxCONTROL_PRESSED and wxCONTROL_CURRENT - virtual void DrawComboBoxDropButton(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags = 0) = 0; - - // draw a dropdown arrow - // - // flags may use wxCONTROL_PRESSED and wxCONTROL_CURRENT - virtual void DrawDropArrow(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags = 0) = 0; - - // draw check button - // - // flags may use wxCONTROL_CHECKED, wxCONTROL_UNDETERMINED and wxCONTROL_CURRENT - virtual void DrawCheckBox(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags = 0) = 0; - - // Returns the default size of a check box. - virtual wxSize GetCheckBoxSize(wxWindow *win) = 0; - - // draw blank button - // - // flags may use wxCONTROL_PRESSED, wxCONTROL_CURRENT and wxCONTROL_ISDEFAULT - virtual void DrawPushButton(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags = 0) = 0; - - // draw collapse button - // - // flags may use wxCONTROL_CHECKED, wxCONTROL_UNDETERMINED and wxCONTROL_CURRENT - virtual void DrawCollapseButton(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags = 0) = 0; - - // Returns the default size of a collapse button - virtual wxSize GetCollapseButtonSize(wxWindow *win, wxDC& dc) = 0; - - // draw rectangle indicating that an item in e.g. a list control - // has been selected or focused - // - // flags may use - // wxCONTROL_SELECTED (item is selected, e.g. draw background) - // wxCONTROL_CURRENT (item is the current item, e.g. dotted border) - // wxCONTROL_FOCUSED (the whole control has focus, e.g. blue background vs. grey otherwise) - virtual void DrawItemSelectionRect(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags = 0) = 0; - - // draw the focus rectangle around the label contained in the given rect - // - // only wxCONTROL_SELECTED makes sense in flags here - virtual void DrawFocusRect(wxWindow* win, - wxDC& dc, - const wxRect& rect, - int flags = 0) = 0; - - // Draw a native wxChoice - virtual void DrawChoice(wxWindow* win, - wxDC& dc, - const wxRect& rect, - int flags = 0) = 0; - - // Draw a native wxComboBox - virtual void DrawComboBox(wxWindow* win, - wxDC& dc, - const wxRect& rect, - int flags = 0) = 0; - - // Draw a native wxTextCtrl frame - virtual void DrawTextCtrl(wxWindow* win, - wxDC& dc, - const wxRect& rect, - int flags = 0) = 0; - - // Draw a native wxRadioButton bitmap - virtual void DrawRadioBitmap(wxWindow* win, - wxDC& dc, - const wxRect& rect, - int flags = 0) = 0; - -#ifdef wxHAS_DRAW_TITLE_BAR_BITMAP - // Draw one of the standard title bar buttons - // - // This is currently implemented only for MSW and OS X (for the close - // button only) because there is no way to render standard title bar - // buttons under the other platforms, the best can be done is to use normal - // (only) images which wxArtProvider provides for wxART_HELP and - // wxART_CLOSE (but not any other title bar buttons) - // - // NB: make sure PNG handler is enabled if using this function under OS X - virtual void DrawTitleBarBitmap(wxWindow *win, - wxDC& dc, - const wxRect& rect, - wxTitleBarButton button, - int flags = 0) = 0; -#endif // wxHAS_DRAW_TITLE_BAR_BITMAP - - // Draw a gauge with native style like a wxGauge would display - virtual void DrawGauge(wxWindow* win, - wxDC& dc, - const wxRect& rect, - int value, - int max, - int flags = 0) = 0; - - // Draw text using the appropriate color for normal and selected states. - virtual void DrawItemText(wxWindow* win, - wxDC& dc, - const wxString& text, - const wxRect& rect, - int align = wxALIGN_LEFT | wxALIGN_TOP, - int flags = 0, - wxEllipsizeMode ellipsizeMode = wxELLIPSIZE_END) = 0; - - // geometry functions - // ------------------ - - // get the splitter parameters: the x field of the returned point is the - // sash width and the y field is the border width - virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win) = 0; - - - // pseudo constructors - // ------------------- - - // return the currently used renderer - static wxRendererNative& Get(); - - // return the generic implementation of the renderer - static wxRendererNative& GetGeneric(); - - // return the default (native) implementation for this platform - static wxRendererNative& GetDefault(); - - - // changing the global renderer - // ---------------------------- - -#if wxUSE_DYNLIB_CLASS - // load the renderer from the specified DLL, the returned pointer must be - // deleted by caller if not NULL when it is not used any more - static wxRendererNative *Load(const wxString& name); -#endif // wxUSE_DYNLIB_CLASS - - // set the renderer to use, passing NULL reverts to using the default - // renderer - // - // return the previous renderer used with Set() or NULL if none - static wxRendererNative *Set(wxRendererNative *renderer); - - - // miscellaneous stuff - // ------------------- - - // this function is used for version checking: Load() refuses to load any - // DLLs implementing an older or incompatible version; it should be - // implemented simply by returning wxRendererVersion::Current_XXX values - virtual wxRendererVersion GetVersion() const = 0; - - // virtual dtor for any base class - virtual ~wxRendererNative(); -}; - -// ---------------------------------------------------------------------------- -// wxDelegateRendererNative: allows reuse of renderers code -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxDelegateRendererNative : public wxRendererNative -{ -public: - wxDelegateRendererNative() - : m_rendererNative(GetGeneric()) { } - - wxDelegateRendererNative(wxRendererNative& rendererNative) - : m_rendererNative(rendererNative) { } - - - virtual int DrawHeaderButton(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags = 0, - wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE, - wxHeaderButtonParams* params = NULL) - { return m_rendererNative.DrawHeaderButton(win, dc, rect, flags, sortArrow, params); } - - virtual int DrawHeaderButtonContents(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags = 0, - wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE, - wxHeaderButtonParams* params = NULL) - { return m_rendererNative.DrawHeaderButtonContents(win, dc, rect, flags, sortArrow, params); } - - virtual int GetHeaderButtonHeight(wxWindow *win) - { return m_rendererNative.GetHeaderButtonHeight(win); } - - virtual int GetHeaderButtonMargin(wxWindow *win) - { return m_rendererNative.GetHeaderButtonMargin(win); } - - virtual void DrawTreeItemButton(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags = 0) - { m_rendererNative.DrawTreeItemButton(win, dc, rect, flags); } - - virtual void DrawSplitterBorder(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags = 0) - { m_rendererNative.DrawSplitterBorder(win, dc, rect, flags); } - - virtual void DrawSplitterSash(wxWindow *win, - wxDC& dc, - const wxSize& size, - wxCoord position, - wxOrientation orient, - int flags = 0) - { m_rendererNative.DrawSplitterSash(win, dc, size, - position, orient, flags); } - - virtual void DrawComboBoxDropButton(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags = 0) - { m_rendererNative.DrawComboBoxDropButton(win, dc, rect, flags); } - - virtual void DrawDropArrow(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags = 0) - { m_rendererNative.DrawDropArrow(win, dc, rect, flags); } - - virtual void DrawCheckBox(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags = 0) - { m_rendererNative.DrawCheckBox( win, dc, rect, flags ); } - - virtual wxSize GetCheckBoxSize(wxWindow *win) - { return m_rendererNative.GetCheckBoxSize(win); } - - virtual void DrawPushButton(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags = 0) - { m_rendererNative.DrawPushButton( win, dc, rect, flags ); } - - virtual void DrawCollapseButton(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags = 0) - { m_rendererNative.DrawCollapseButton(win, dc, rect, flags); } - - virtual wxSize GetCollapseButtonSize(wxWindow *win, wxDC& dc) - { return m_rendererNative.GetCollapseButtonSize(win, dc); } - - virtual void DrawItemSelectionRect(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags = 0) - { m_rendererNative.DrawItemSelectionRect( win, dc, rect, flags ); } - - virtual void DrawFocusRect(wxWindow* win, - wxDC& dc, - const wxRect& rect, - int flags = 0) - { m_rendererNative.DrawFocusRect( win, dc, rect, flags ); } - - virtual void DrawChoice(wxWindow* win, - wxDC& dc, - const wxRect& rect, - int flags = 0) - { m_rendererNative.DrawChoice( win, dc, rect, flags); } - - virtual void DrawComboBox(wxWindow* win, - wxDC& dc, - const wxRect& rect, - int flags = 0) - { m_rendererNative.DrawComboBox( win, dc, rect, flags); } - - virtual void DrawTextCtrl(wxWindow* win, - wxDC& dc, - const wxRect& rect, - int flags = 0) - { m_rendererNative.DrawTextCtrl( win, dc, rect, flags); } - - virtual void DrawRadioBitmap(wxWindow* win, - wxDC& dc, - const wxRect& rect, - int flags = 0) - { m_rendererNative.DrawRadioBitmap(win, dc, rect, flags); } - -#ifdef wxHAS_DRAW_TITLE_BAR_BITMAP - virtual void DrawTitleBarBitmap(wxWindow *win, - wxDC& dc, - const wxRect& rect, - wxTitleBarButton button, - int flags = 0) - { m_rendererNative.DrawTitleBarBitmap(win, dc, rect, button, flags); } -#endif // wxHAS_DRAW_TITLE_BAR_BITMAP - - virtual void DrawGauge(wxWindow* win, - wxDC& dc, - const wxRect& rect, - int value, - int max, - int flags = 0) - { m_rendererNative.DrawGauge(win, dc, rect, value, max, flags); } - - virtual void DrawItemText(wxWindow* win, - wxDC& dc, - const wxString& text, - const wxRect& rect, - int align = wxALIGN_LEFT | wxALIGN_TOP, - int flags = 0, - wxEllipsizeMode ellipsizeMode = wxELLIPSIZE_END) - { m_rendererNative.DrawItemText(win, dc, text, rect, align, flags, ellipsizeMode); } - - virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win) - { return m_rendererNative.GetSplitterParams(win); } - - virtual wxRendererVersion GetVersion() const - { return m_rendererNative.GetVersion(); } - -protected: - wxRendererNative& m_rendererNative; - - wxDECLARE_NO_COPY_CLASS(wxDelegateRendererNative); -}; - -// ---------------------------------------------------------------------------- -// inline functions implementation -// ---------------------------------------------------------------------------- - -#ifndef wxHAS_NATIVE_RENDERER - -// default native renderer is the generic one then -/* static */ inline -wxRendererNative& wxRendererNative::GetDefault() -{ - return GetGeneric(); -} - -#endif // !wxHAS_NATIVE_RENDERER - -#endif // _WX_RENDERER_H_ diff --git a/Externals/wxWidgets3/include/wx/richmsgdlg.h b/Externals/wxWidgets3/include/wx/richmsgdlg.h deleted file mode 100644 index ab49af7d00..0000000000 --- a/Externals/wxWidgets3/include/wx/richmsgdlg.h +++ /dev/null @@ -1,88 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/richmsgdlg.h -// Purpose: wxRichMessageDialogBase -// Author: Rickard Westerlund -// Created: 2010-07-03 -// Copyright: (c) 2010 wxWidgets team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_RICHMSGDLG_H_BASE_ -#define _WX_RICHMSGDLG_H_BASE_ - -#include "wx/defs.h" - -#if wxUSE_RICHMSGDLG - -#include "wx/msgdlg.h" - -// Extends a message dialog with an optional checkbox and user-expandable -// detailed text. -class WXDLLIMPEXP_CORE wxRichMessageDialogBase : public wxGenericMessageDialog -{ -public: - wxRichMessageDialogBase( wxWindow *parent, - const wxString& message, - const wxString& caption, - long style ) - : wxGenericMessageDialog( parent, message, caption, style ), - m_detailsExpanderCollapsedLabel( wxGetTranslation("&See details") ), - m_detailsExpanderExpandedLabel( wxGetTranslation("&Hide details") ), - m_checkBoxValue( false ) - { } - - void ShowCheckBox(const wxString& checkBoxText, bool checked = false) - { - m_checkBoxText = checkBoxText; - m_checkBoxValue = checked; - } - - wxString GetCheckBoxText() const { return m_checkBoxText; } - - void ShowDetailedText(const wxString& detailedText) - { m_detailedText = detailedText; } - - wxString GetDetailedText() const { return m_detailedText; } - - virtual bool IsCheckBoxChecked() const { return m_checkBoxValue; } - -protected: - const wxString m_detailsExpanderCollapsedLabel; - const wxString m_detailsExpanderExpandedLabel; - - wxString m_checkBoxText; - bool m_checkBoxValue; - wxString m_detailedText; - -private: - void ShowDetails(bool shown); - - wxDECLARE_NO_COPY_CLASS(wxRichMessageDialogBase); -}; - -// Always include the generic version as it's currently used as the base class -// by the MSW native implementation too. -#include "wx/generic/richmsgdlgg.h" - -#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) - #include "wx/msw/richmsgdlg.h" -#else - class WXDLLIMPEXP_CORE wxRichMessageDialog - : public wxGenericRichMessageDialog - { - public: - wxRichMessageDialog( wxWindow *parent, - const wxString& message, - const wxString& caption = wxMessageBoxCaptionStr, - long style = wxOK | wxCENTRE ) - : wxGenericRichMessageDialog( parent, message, caption, style ) - { } - - private: - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxRichMessageDialog); - }; -#endif - -#endif // wxUSE_RICHMSGDLG - -#endif // _WX_RICHMSGDLG_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/richtooltip.h b/Externals/wxWidgets3/include/wx/richtooltip.h deleted file mode 100644 index 1187e67ed1..0000000000 --- a/Externals/wxWidgets3/include/wx/richtooltip.h +++ /dev/null @@ -1,103 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/richtooltip.h -// Purpose: Declaration of wxRichToolTip class. -// Author: Vadim Zeitlin -// Created: 2011-10-07 -// Copyright: (c) 2011 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_RICHTOOLTIP_H_ -#define _WX_RICHTOOLTIP_H_ - -#include "wx/defs.h" - -#if wxUSE_RICHTOOLTIP - -#include "wx/colour.h" - -class WXDLLIMPEXP_FWD_CORE wxFont; -class WXDLLIMPEXP_FWD_CORE wxIcon; -class WXDLLIMPEXP_FWD_CORE wxWindow; - -class wxRichToolTipImpl; - -// This enum describes the kind of the tip shown which combines both the tip -// position and appearance because the two are related (when the tip is -// positioned asymmetrically, a right handed triangle is used but an -// equilateral one when it's in the middle of a side). -// -// Automatic selects the tip appearance best suited for the current platform -// and the position best suited for the window the tooltip is shown for, i.e. -// chosen in such a way that the tooltip is always fully on screen. -// -// Other values describe the position of the tooltip itself, not the window it -// relates to. E.g. wxTipKind_Top places the tip on the top of the tooltip and -// so the tooltip itself is located beneath its associated window. -enum wxTipKind -{ - wxTipKind_None, - wxTipKind_TopLeft, - wxTipKind_Top, - wxTipKind_TopRight, - wxTipKind_BottomLeft, - wxTipKind_Bottom, - wxTipKind_BottomRight, - wxTipKind_Auto -}; - -// ---------------------------------------------------------------------------- -// wxRichToolTip: a customizable but not necessarily native tooltip. -// ---------------------------------------------------------------------------- - -// Notice that this class does not inherit from wxWindow. -class WXDLLIMPEXP_ADV wxRichToolTip -{ -public: - // Ctor must specify the tooltip title and main message, additional - // attributes can be set later. - wxRichToolTip(const wxString& title, const wxString& message); - - // Set the background colour: if two colours are specified, the background - // is drawn using a gradient from top to bottom, otherwise a single solid - // colour is used. - void SetBackgroundColour(const wxColour& col, - const wxColour& colEnd = wxColour()); - - // Set the small icon to show: either one of the standard information/ - // warning/error ones (the question icon doesn't make sense for a tooltip) - // or a custom icon. - void SetIcon(int icon = wxICON_INFORMATION); - void SetIcon(const wxIcon& icon); - - // Set timeout after which the tooltip should disappear, in milliseconds. - // By default the tooltip is hidden after system-dependent interval of time - // elapses but this method can be used to change this or also disable - // hiding the tooltip automatically entirely by passing 0 in this parameter - // (but doing this can result in native version not being used). - // Optionally specify a show delay. - void SetTimeout(unsigned milliseconds, unsigned millisecondsShowdelay = 0); - - // Choose the tip kind, possibly none. By default the tip is positioned - // automatically, as if wxTipKind_Auto was used. - void SetTipKind(wxTipKind tipKind); - - // Set the title text font. By default it's emphasized using the font style - // or colour appropriate for the current platform. - void SetTitleFont(const wxFont& font); - - // Show the tooltip for the given window and optionally a specified area. - void ShowFor(wxWindow* win, const wxRect* rect = NULL); - - // Non-virtual dtor as this class is not supposed to be derived from. - ~wxRichToolTip(); - -private: - wxRichToolTipImpl* const m_impl; - - wxDECLARE_NO_COPY_CLASS(wxRichToolTip); -}; - -#endif // wxUSE_RICHTOOLTIP - -#endif // _WX_RICHTOOLTIP_H_ diff --git a/Externals/wxWidgets3/include/wx/rtti.h b/Externals/wxWidgets3/include/wx/rtti.h deleted file mode 100644 index 308b65767b..0000000000 --- a/Externals/wxWidgets3/include/wx/rtti.h +++ /dev/null @@ -1,321 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/rtti.h -// Purpose: old RTTI macros (use XTI when possible instead) -// Author: Julian Smart -// Modified by: Ron Lee -// Created: 01/02/97 -// Copyright: (c) 1997 Julian Smart -// (c) 2001 Ron Lee -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_RTTIH__ -#define _WX_RTTIH__ - -#if !wxUSE_EXTENDED_RTTI // XTI system is meant to replace these macros - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/memory.h" - -// ---------------------------------------------------------------------------- -// forward declarations -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_BASE wxObject; -class WXDLLIMPEXP_FWD_BASE wxString; -class WXDLLIMPEXP_FWD_BASE wxClassInfo; -class WXDLLIMPEXP_FWD_BASE wxHashTable; -class WXDLLIMPEXP_FWD_BASE wxObject; -class WXDLLIMPEXP_FWD_BASE wxPluginLibrary; -class WXDLLIMPEXP_FWD_BASE wxHashTable_Node; - -// ---------------------------------------------------------------------------- -// wxClassInfo -// ---------------------------------------------------------------------------- - -typedef wxObject *(*wxObjectConstructorFn)(void); - -class WXDLLIMPEXP_BASE wxClassInfo -{ - friend class WXDLLIMPEXP_FWD_BASE wxObject; - friend WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxString& name); -public: - wxClassInfo( const wxChar *className, - const wxClassInfo *baseInfo1, - const wxClassInfo *baseInfo2, - int size, - wxObjectConstructorFn ctor ) - : m_className(className) - , m_objectSize(size) - , m_objectConstructor(ctor) - , m_baseInfo1(baseInfo1) - , m_baseInfo2(baseInfo2) - , m_next(sm_first) - { - sm_first = this; - Register(); - } - - ~wxClassInfo(); - - wxObject *CreateObject() const - { return m_objectConstructor ? (*m_objectConstructor)() : 0; } - bool IsDynamic() const { return (NULL != m_objectConstructor); } - - const wxChar *GetClassName() const { return m_className; } - const wxChar *GetBaseClassName1() const - { return m_baseInfo1 ? m_baseInfo1->GetClassName() : NULL; } - const wxChar *GetBaseClassName2() const - { return m_baseInfo2 ? m_baseInfo2->GetClassName() : NULL; } - const wxClassInfo *GetBaseClass1() const { return m_baseInfo1; } - const wxClassInfo *GetBaseClass2() const { return m_baseInfo2; } - int GetSize() const { return m_objectSize; } - - wxObjectConstructorFn GetConstructor() const - { return m_objectConstructor; } - static const wxClassInfo *GetFirst() { return sm_first; } - const wxClassInfo *GetNext() const { return m_next; } - static wxClassInfo *FindClass(const wxString& className); - - // Climb upwards through inheritance hierarchy. - // Dual inheritance is catered for. - - bool IsKindOf(const wxClassInfo *info) const - { - return info != 0 && - ( info == this || - ( m_baseInfo1 && m_baseInfo1->IsKindOf(info) ) || - ( m_baseInfo2 && m_baseInfo2->IsKindOf(info) ) ); - } - - wxDECLARE_CLASS_INFO_ITERATORS(); - -private: - const wxChar *m_className; - int m_objectSize; - wxObjectConstructorFn m_objectConstructor; - - // Pointers to base wxClassInfos - - const wxClassInfo *m_baseInfo1; - const wxClassInfo *m_baseInfo2; - - // class info object live in a linked list: - // pointers to its head and the next element in it - - static wxClassInfo *sm_first; - wxClassInfo *m_next; - - static wxHashTable *sm_classTable; - -protected: - // registers the class - void Register(); - void Unregister(); - - wxDECLARE_NO_COPY_CLASS(wxClassInfo); -}; - -WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxString& name); - -// ---------------------------------------------------------------------------- -// Dynamic class macros -// ---------------------------------------------------------------------------- - -#define wxDECLARE_ABSTRACT_CLASS(name) \ - public: \ - static wxClassInfo ms_classInfo; \ - wxCLANG_WARNING_SUPPRESS(inconsistent-missing-override) \ - virtual wxClassInfo *GetClassInfo() const \ - wxCLANG_WARNING_RESTORE(inconsistent-missing-override) - -#define wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(name) \ - wxDECLARE_NO_ASSIGN_CLASS(name); \ - wxDECLARE_DYNAMIC_CLASS(name) - -#define wxDECLARE_DYNAMIC_CLASS_NO_COPY(name) \ - wxDECLARE_NO_COPY_CLASS(name); \ - wxDECLARE_DYNAMIC_CLASS(name) - -#define wxDECLARE_DYNAMIC_CLASS(name) \ - wxDECLARE_ABSTRACT_CLASS(name); \ - static wxObject* wxCreateObject() - -#define wxDECLARE_CLASS(name) \ - wxDECLARE_ABSTRACT_CLASS(name) - - -// common part of the macros below -#define wxIMPLEMENT_CLASS_COMMON(name, basename, baseclsinfo2, func) \ - wxClassInfo name::ms_classInfo(wxT(#name), \ - &basename::ms_classInfo, \ - baseclsinfo2, \ - (int) sizeof(name), \ - func); \ - \ - wxClassInfo *name::GetClassInfo() const \ - { return &name::ms_classInfo; } - -#define wxIMPLEMENT_CLASS_COMMON1(name, basename, func) \ - wxIMPLEMENT_CLASS_COMMON(name, basename, NULL, func) - -#define wxIMPLEMENT_CLASS_COMMON2(name, basename1, basename2, func) \ - wxIMPLEMENT_CLASS_COMMON(name, basename1, &basename2::ms_classInfo, func) - -// ----------------------------------- -// for concrete classes -// ----------------------------------- - - // Single inheritance with one base class -#define wxIMPLEMENT_DYNAMIC_CLASS(name, basename) \ - wxIMPLEMENT_CLASS_COMMON1(name, basename, name::wxCreateObject) \ - wxObject* name::wxCreateObject() \ - { return new name; } - - // Multiple inheritance with two base classes -#define wxIMPLEMENT_DYNAMIC_CLASS2(name, basename1, basename2) \ - wxIMPLEMENT_CLASS_COMMON2(name, basename1, basename2, \ - name::wxCreateObject) \ - wxObject* name::wxCreateObject() \ - { return new name; } - -// ----------------------------------- -// for abstract classes -// ----------------------------------- - - // Single inheritance with one base class -#define wxIMPLEMENT_ABSTRACT_CLASS(name, basename) \ - wxIMPLEMENT_CLASS_COMMON1(name, basename, NULL) - - // Multiple inheritance with two base classes -#define wxIMPLEMENT_ABSTRACT_CLASS2(name, basename1, basename2) \ - wxIMPLEMENT_CLASS_COMMON2(name, basename1, basename2, NULL) - -// ----------------------------------- -// XTI-compatible macros -// ----------------------------------- - -#include "wx/flags.h" - -// these macros only do something when wxUSE_EXTENDED_RTTI=1 -// (and in that case they are defined by xti.h); however to avoid -// to be forced to wrap these macros (in user's source files) with -// -// #if wxUSE_EXTENDED_RTTI -// ... -// #endif -// -// blocks, we define them here as empty. - -#define wxEMPTY_PARAMETER_VALUE /**/ - -#define wxBEGIN_ENUM( e ) wxEMPTY_PARAMETER_VALUE -#define wxENUM_MEMBER( v ) wxEMPTY_PARAMETER_VALUE -#define wxEND_ENUM( e ) wxEMPTY_PARAMETER_VALUE - -#define wxIMPLEMENT_SET_STREAMING(SetName,e) wxEMPTY_PARAMETER_VALUE - -#define wxBEGIN_FLAGS( e ) wxEMPTY_PARAMETER_VALUE -#define wxFLAGS_MEMBER( v ) wxEMPTY_PARAMETER_VALUE -#define wxEND_FLAGS( e ) wxEMPTY_PARAMETER_VALUE - -#define wxCOLLECTION_TYPE_INFO( element, collection ) wxEMPTY_PARAMETER_VALUE - -#define wxHANDLER(name,eventClassType) wxEMPTY_PARAMETER_VALUE -#define wxBEGIN_HANDLERS_TABLE(theClass) wxEMPTY_PARAMETER_VALUE -#define wxEND_HANDLERS_TABLE() wxEMPTY_PARAMETER_VALUE - -#define wxIMPLEMENT_DYNAMIC_CLASS_XTI( name, basename, unit ) \ - wxIMPLEMENT_DYNAMIC_CLASS( name, basename ) -#define wxIMPLEMENT_DYNAMIC_CLASS_XTI_CALLBACK( name, basename, unit, callback ) \ - wxIMPLEMENT_DYNAMIC_CLASS( name, basename ) - -#define wxIMPLEMENT_DYNAMIC_CLASS_WITH_COPY_XTI( name, basename, unit ) \ - wxIMPLEMENT_DYNAMIC_CLASS( name, basename) - -#define wxIMPLEMENT_DYNAMIC_CLASS_WITH_COPY_AND_STREAMERS_XTI( name, basename, \ - unit, toString, \ - fromString ) wxEMPTY_PARAMETER_VALUE -#define wxIMPLEMENT_DYNAMIC_CLASS_NO_WXOBJECT_NO_BASE_XTI( name, unit ) wxEMPTY_PARAMETER_VALUE -#define wxIMPLEMENT_DYNAMIC_CLASS_NO_WXOBJECT_XTI( name, basename, unit ) wxEMPTY_PARAMETER_VALUE - -#define wxIMPLEMENT_DYNAMIC_CLASS2_XTI( name, basename, basename2, unit) wxIMPLEMENT_DYNAMIC_CLASS2( name, basename, basename2 ) - -#define wxCONSTRUCTOR_0(klass) \ - wxEMPTY_PARAMETER_VALUE -#define wxCONSTRUCTOR_DUMMY(klass) \ - wxEMPTY_PARAMETER_VALUE -#define wxDIRECT_CONSTRUCTOR_0(klass) \ - wxEMPTY_PARAMETER_VALUE -#define wxCONSTRUCTOR_1(klass,t0,v0) \ - wxEMPTY_PARAMETER_VALUE -#define wxDIRECT_CONSTRUCTOR_1(klass,t0,v0) \ - wxEMPTY_PARAMETER_VALUE -#define wxCONSTRUCTOR_2(klass,t0,v0,t1,v1) \ - wxEMPTY_PARAMETER_VALUE -#define wxDIRECT_CONSTRUCTOR_2(klass,t0,v0,t1,v1) \ - wxEMPTY_PARAMETER_VALUE -#define wxCONSTRUCTOR_3(klass,t0,v0,t1,v1,t2,v2) \ - wxEMPTY_PARAMETER_VALUE -#define wxDIRECT_CONSTRUCTOR_3(klass,t0,v0,t1,v1,t2,v2) \ - wxEMPTY_PARAMETER_VALUE -#define wxCONSTRUCTOR_4(klass,t0,v0,t1,v1,t2,v2,t3,v3) \ - wxEMPTY_PARAMETER_VALUE -#define wxDIRECT_CONSTRUCTOR_4(klass,t0,v0,t1,v1,t2,v2,t3,v3) \ - wxEMPTY_PARAMETER_VALUE -#define wxCONSTRUCTOR_5(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4) \ - wxEMPTY_PARAMETER_VALUE -#define wxDIRECT_CONSTRUCTOR_5(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4) \ - wxEMPTY_PARAMETER_VALUE -#define wxCONSTRUCTOR_6(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4,t5,v5) \ - wxEMPTY_PARAMETER_VALUE -#define wxDIRECT_CONSTRUCTOR_6(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4,t5,v5) \ - wxEMPTY_PARAMETER_VALUE -#define wxCONSTRUCTOR_7(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4,t5,v5,t6,v6) \ - wxEMPTY_PARAMETER_VALUE -#define wxDIRECT_CONSTRUCTOR_7(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4,t5,v5,t6,v6) \ - wxEMPTY_PARAMETER_VALUE -#define wxCONSTRUCTOR_8(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4,t5,v5,t6,v6,t7,v7) \ - wxEMPTY_PARAMETER_VALUE -#define wxDIRECT_CONSTRUCTOR_8(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4,t5,v5,t6,v6,t7,v7) \ - wxEMPTY_PARAMETER_VALUE - -#define wxSETTER( property, Klass, valueType, setterMethod ) wxEMPTY_PARAMETER_VALUE -#define wxGETTER( property, Klass, valueType, gettermethod ) wxEMPTY_PARAMETER_VALUE -#define wxADDER( property, Klass, valueType, addermethod ) wxEMPTY_PARAMETER_VALUE -#define wxCOLLECTION_GETTER( property, Klass, valueType, gettermethod ) wxEMPTY_PARAMETER_VALUE - -#define wxBEGIN_PROPERTIES_TABLE(theClass) wxEMPTY_PARAMETER_VALUE -#define wxEND_PROPERTIES_TABLE() wxEMPTY_PARAMETER_VALUE -#define wxHIDE_PROPERTY( pname ) wxEMPTY_PARAMETER_VALUE - -#define wxPROPERTY( pname, type, setter, getter, defaultValue, flags, help, group) \ - wxEMPTY_PARAMETER_VALUE - -#define wxPROPERTY_FLAGS( pname, flags, type, setter, getter,defaultValue, \ - pflags, help, group) wxEMPTY_PARAMETER_VALUE - -#define wxREADONLY_PROPERTY( pname, type, getter,defaultValue, flags, help, group) \ - wxGETTER( pname, class_t, type, getter ) wxEMPTY_PARAMETER_VALUE - -#define wxREADONLY_PROPERTY_FLAGS( pname, flags, type, getter,defaultValue, \ - pflags, help, group) wxEMPTY_PARAMETER_VALUE - -#define wxPROPERTY_COLLECTION( pname, colltype, addelemtype, adder, getter, \ - flags, help, group ) wxEMPTY_PARAMETER_VALUE - -#define wxREADONLY_PROPERTY_COLLECTION( pname, colltype, addelemtype, getter, \ - flags, help, group) wxEMPTY_PARAMETER_VALUE -#define wxEVENT_PROPERTY( name, eventType, eventClass ) wxEMPTY_PARAMETER_VALUE - -#define wxEVENT_RANGE_PROPERTY( name, eventType, lastEventType, eventClass ) wxEMPTY_PARAMETER_VALUE - -#define wxIMPLEMENT_PROPERTY(name, type) wxEMPTY_PARAMETER_VALUE - -#define wxEMPTY_HANDLERS_TABLE(name) wxEMPTY_PARAMETER_VALUE - -#endif // !wxUSE_EXTENDED_RTTI -#endif // _WX_RTTIH__ diff --git a/Externals/wxWidgets3/include/wx/sashwin.h b/Externals/wxWidgets3/include/wx/sashwin.h deleted file mode 100644 index 21967a5c7e..0000000000 --- a/Externals/wxWidgets3/include/wx/sashwin.h +++ /dev/null @@ -1,17 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/sashwin.h -// Purpose: Base header for wxSashWindow -// Author: Julian Smart -// Modified by: -// Created: -// Copyright: (c) Julian Smart -// Licence: wxWindows Licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_SASHWIN_H_BASE_ -#define _WX_SASHWIN_H_BASE_ - -#include "wx/generic/sashwin.h" - -#endif - // _WX_SASHWIN_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/sckaddr.h b/Externals/wxWidgets3/include/wx/sckaddr.h deleted file mode 100644 index 5a568c3adc..0000000000 --- a/Externals/wxWidgets3/include/wx/sckaddr.h +++ /dev/null @@ -1,218 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/sckaddr.h -// Purpose: Network address classes -// Author: Guilhem Lavaux -// Modified by: Vadim Zeitlin to switch to wxSockAddressImpl implementation -// Created: 26/04/1997 -// Copyright: (c) 1997, 1998 Guilhem Lavaux -// (c) 2008, 2009 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_SCKADDR_H_ -#define _WX_SCKADDR_H_ - -#include "wx/defs.h" - -#if wxUSE_SOCKETS - -#include "wx/string.h" - -class wxSockAddressImpl; - -// forward declare it instead of including the system headers defining it which -// can bring in under Windows which we don't want to include from -// public wx headers -struct sockaddr; - -// Any socket address kind -class WXDLLIMPEXP_NET wxSockAddress : public wxObject -{ -public: - enum Family - { - NONE, - IPV4, - IPV6, - UNIX - }; - - wxSockAddress(); - wxSockAddress(const wxSockAddress& other); - virtual ~wxSockAddress(); - - wxSockAddress& operator=(const wxSockAddress& other); - - virtual void Clear(); - virtual Family Type() = 0; - - // accessors for the low level address represented by this object - const sockaddr *GetAddressData() const; - int GetAddressDataLen() const; - - // we need to be able to create copies of the addresses polymorphically - // (i.e. without knowing the exact address class) - virtual wxSockAddress *Clone() const = 0; - - - // implementation only, don't use - const wxSockAddressImpl& GetAddress() const { return *m_impl; } - void SetAddress(const wxSockAddressImpl& address); - -protected: - wxSockAddressImpl *m_impl; - -private: - void Init(); - wxDECLARE_ABSTRACT_CLASS(wxSockAddress); -}; - -// An IP address (either IPv4 or IPv6) -class WXDLLIMPEXP_NET wxIPaddress : public wxSockAddress -{ -public: - wxIPaddress() : wxSockAddress() { } - wxIPaddress(const wxIPaddress& other) - : wxSockAddress(other), - m_origHostname(other.m_origHostname) - { - } - - bool operator==(const wxIPaddress& addr) const; - - bool Hostname(const wxString& name); - bool Service(const wxString& name); - bool Service(unsigned short port); - - bool LocalHost(); - virtual bool IsLocalHost() const = 0; - - bool AnyAddress(); - - virtual wxString IPAddress() const = 0; - - wxString Hostname() const; - unsigned short Service() const; - - wxString OrigHostname() const { return m_origHostname; } - -protected: - // get m_impl initialized to the right family if it hadn't been done yet - wxSockAddressImpl& GetImpl(); - const wxSockAddressImpl& GetImpl() const - { - return const_cast(this)->GetImpl(); - } - - // host name originally passed to Hostname() - wxString m_origHostname; - -private: - // create the wxSockAddressImpl object of the correct family if it's - // currently uninitialized - virtual void DoInitImpl() = 0; - - - wxDECLARE_ABSTRACT_CLASS(wxIPaddress); -}; - -// An IPv4 address -class WXDLLIMPEXP_NET wxIPV4address : public wxIPaddress -{ -public: - wxIPV4address() : wxIPaddress() { } - wxIPV4address(const wxIPV4address& other) : wxIPaddress(other) { } - - // implement wxSockAddress pure virtuals: - virtual Family Type() wxOVERRIDE { return IPV4; } - virtual wxSockAddress *Clone() const wxOVERRIDE { return new wxIPV4address(*this); } - - - // implement wxIPaddress pure virtuals: - virtual bool IsLocalHost() const wxOVERRIDE; - - virtual wxString IPAddress() const wxOVERRIDE; - - - // IPv4-specific methods: - bool Hostname(unsigned long addr); - - // make base class methods hidden by our overload visible - using wxIPaddress::Hostname; - - bool BroadcastAddress(); - -private: - virtual void DoInitImpl() wxOVERRIDE; - - wxDECLARE_DYNAMIC_CLASS(wxIPV4address); -}; - - -#if wxUSE_IPV6 - -// An IPv6 address -class WXDLLIMPEXP_NET wxIPV6address : public wxIPaddress -{ -public: - wxIPV6address() : wxIPaddress() { } - wxIPV6address(const wxIPV6address& other) : wxIPaddress(other) { } - - // implement wxSockAddress pure virtuals: - virtual Family Type() { return IPV6; } - virtual wxSockAddress *Clone() const { return new wxIPV6address(*this); } - - - // implement wxIPaddress pure virtuals: - virtual bool IsLocalHost() const; - - virtual wxString IPAddress() const; - - // IPv6-specific methods: - bool Hostname(unsigned char addr[16]); - - using wxIPaddress::Hostname; - -private: - virtual void DoInitImpl(); - - wxDECLARE_DYNAMIC_CLASS(wxIPV6address); -}; - -#endif // wxUSE_IPV6 - -// Unix domain sockets are only available under, well, Unix -#if defined(__UNIX__) && !defined(__WINDOWS__) && !defined(__WINE__) - #define wxHAS_UNIX_DOMAIN_SOCKETS -#endif - -#ifdef wxHAS_UNIX_DOMAIN_SOCKETS - -// A Unix domain socket address -class WXDLLIMPEXP_NET wxUNIXaddress : public wxSockAddress -{ -public: - wxUNIXaddress() : wxSockAddress() { } - wxUNIXaddress(const wxUNIXaddress& other) : wxSockAddress(other) { } - - void Filename(const wxString& name); - wxString Filename() const; - - virtual Family Type() wxOVERRIDE { return UNIX; } - virtual wxSockAddress *Clone() const wxOVERRIDE { return new wxUNIXaddress(*this); } - -private: - wxSockAddressImpl& GetUNIX(); - const wxSockAddressImpl& GetUNIX() const - { - return const_cast(this)->GetUNIX(); - } - - wxDECLARE_DYNAMIC_CLASS(wxUNIXaddress); -}; - -#endif // wxHAS_UNIX_DOMAIN_SOCKETS - -#endif // wxUSE_SOCKETS - -#endif // _WX_SCKADDR_H_ diff --git a/Externals/wxWidgets3/include/wx/sckipc.h b/Externals/wxWidgets3/include/wx/sckipc.h deleted file mode 100644 index 7d1e2c32d0..0000000000 --- a/Externals/wxWidgets3/include/wx/sckipc.h +++ /dev/null @@ -1,159 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/sckipc.h -// Purpose: Interprocess communication implementation (wxSocket version) -// Author: Julian Smart -// Modified by: Guilhem Lavaux (big rewrite) May 1997, 1998 -// Guillermo Rodriguez (updated for wxSocket v2) Jan 2000 -// (callbacks deprecated) Mar 2000 -// Created: 1993 -// Copyright: (c) Julian Smart 1993 -// (c) Guilhem Lavaux 1997, 1998 -// (c) 2000 Guillermo Rodriguez -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_SCKIPC_H -#define _WX_SCKIPC_H - -#include "wx/defs.h" - -#if wxUSE_SOCKETS && wxUSE_IPC - -#include "wx/ipcbase.h" -#include "wx/socket.h" -#include "wx/sckstrm.h" -#include "wx/datstrm.h" - -/* - * Mini-DDE implementation - - Most transactions involve a topic name and an item name (choose these - as befits your application). - - A client can: - - - ask the server to execute commands (data) associated with a topic - - request data from server by topic and item - - poke data into the server - - ask the server to start an advice loop on topic/item - - ask the server to stop an advice loop - - A server can: - - - respond to execute, request, poke and advice start/stop - - send advise data to client - - Note that this limits the server in the ways it can send data to the - client, i.e. it can't send unsolicited information. - * - */ - -class WXDLLIMPEXP_FWD_NET wxTCPServer; -class WXDLLIMPEXP_FWD_NET wxTCPClient; - -class wxIPCSocketStreams; - -class WXDLLIMPEXP_NET wxTCPConnection : public wxConnectionBase -{ -public: - wxTCPConnection() { Init(); } - wxTCPConnection(void *buffer, size_t size) - : wxConnectionBase(buffer, size) - { - Init(); - } - - virtual ~wxTCPConnection(); - - // implement base class pure virtual methods - virtual const void *Request(const wxString& item, - size_t *size = NULL, - wxIPCFormat format = wxIPC_TEXT) wxOVERRIDE; - virtual bool StartAdvise(const wxString& item) wxOVERRIDE; - virtual bool StopAdvise(const wxString& item) wxOVERRIDE; - virtual bool Disconnect(void) wxOVERRIDE; - - // Will be used in the future to enable the compression but does nothing - // for now. - void Compress(bool on); - - -protected: - virtual bool DoExecute(const void *data, size_t size, wxIPCFormat format) wxOVERRIDE; - virtual bool DoPoke(const wxString& item, const void *data, size_t size, - wxIPCFormat format) wxOVERRIDE; - virtual bool DoAdvise(const wxString& item, const void *data, size_t size, - wxIPCFormat format) wxOVERRIDE; - - - // notice that all the members below are only initialized once the - // connection is made, i.e. in MakeConnection() for the client objects and - // after OnAcceptConnection() in the server ones - - // the underlying socket (wxSocketClient for IPC client and wxSocketServer - // for IPC server) - wxSocketBase *m_sock; - - // various streams that we use - wxIPCSocketStreams *m_streams; - - // the topic of this connection - wxString m_topic; - -private: - // common part of both ctors - void Init(); - - friend class wxTCPServer; - friend class wxTCPClient; - friend class wxTCPEventHandler; - - wxDECLARE_NO_COPY_CLASS(wxTCPConnection); - wxDECLARE_DYNAMIC_CLASS(wxTCPConnection); -}; - -class WXDLLIMPEXP_NET wxTCPServer : public wxServerBase -{ -public: - wxTCPServer(); - virtual ~wxTCPServer(); - - // Returns false on error (e.g. port number is already in use) - virtual bool Create(const wxString& serverName) wxOVERRIDE; - - virtual wxConnectionBase *OnAcceptConnection(const wxString& topic) wxOVERRIDE; - -protected: - wxSocketServer *m_server; - -#ifdef __UNIX_LIKE__ - // the name of the file associated to the Unix domain socket, may be empty - wxString m_filename; -#endif // __UNIX_LIKE__ - - wxDECLARE_NO_COPY_CLASS(wxTCPServer); - wxDECLARE_DYNAMIC_CLASS(wxTCPServer); -}; - -class WXDLLIMPEXP_NET wxTCPClient : public wxClientBase -{ -public: - wxTCPClient(); - - virtual bool ValidHost(const wxString& host) wxOVERRIDE; - - // Call this to make a connection. Returns NULL if cannot. - virtual wxConnectionBase *MakeConnection(const wxString& host, - const wxString& server, - const wxString& topic) wxOVERRIDE; - - // Callbacks to CLIENT - override at will - virtual wxConnectionBase *OnMakeConnection() wxOVERRIDE; - -private: - wxDECLARE_DYNAMIC_CLASS(wxTCPClient); -}; - -#endif // wxUSE_SOCKETS && wxUSE_IPC - -#endif // _WX_SCKIPC_H diff --git a/Externals/wxWidgets3/include/wx/sckstrm.h b/Externals/wxWidgets3/include/wx/sckstrm.h deleted file mode 100644 index f90a2feeec..0000000000 --- a/Externals/wxWidgets3/include/wx/sckstrm.h +++ /dev/null @@ -1,74 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/sckstrm.h -// Purpose: wxSocket*Stream -// Author: Guilhem Lavaux -// Modified by: -// Created: 17/07/97 -// Copyright: (c) -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// -#ifndef __SCK_STREAM_H__ -#define __SCK_STREAM_H__ - -#include "wx/stream.h" - -#if wxUSE_SOCKETS && wxUSE_STREAMS - -#include "wx/socket.h" - -class WXDLLIMPEXP_NET wxSocketOutputStream : public wxOutputStream -{ -public: - wxSocketOutputStream(wxSocketBase& s); - virtual ~wxSocketOutputStream(); - -protected: - wxSocketBase *m_o_socket; - - size_t OnSysWrite(const void *buffer, size_t bufsize) wxOVERRIDE; - - // socket streams are both un-seekable and size-less streams: - wxFileOffset OnSysTell() const wxOVERRIDE - { return wxInvalidOffset; } - wxFileOffset OnSysSeek(wxFileOffset WXUNUSED(pos), wxSeekMode WXUNUSED(mode)) wxOVERRIDE - { return wxInvalidOffset; } - - wxDECLARE_NO_COPY_CLASS(wxSocketOutputStream); -}; - -class WXDLLIMPEXP_NET wxSocketInputStream : public wxInputStream -{ -public: - wxSocketInputStream(wxSocketBase& s); - virtual ~wxSocketInputStream(); - -protected: - wxSocketBase *m_i_socket; - - size_t OnSysRead(void *buffer, size_t bufsize) wxOVERRIDE; - - // socket streams are both un-seekable and size-less streams: - - wxFileOffset OnSysTell() const wxOVERRIDE - { return wxInvalidOffset; } - wxFileOffset OnSysSeek(wxFileOffset WXUNUSED(pos), wxSeekMode WXUNUSED(mode)) wxOVERRIDE - { return wxInvalidOffset; } - - wxDECLARE_NO_COPY_CLASS(wxSocketInputStream); -}; - -class WXDLLIMPEXP_NET wxSocketStream : public wxSocketInputStream, - public wxSocketOutputStream -{ -public: - wxSocketStream(wxSocketBase& s); - virtual ~wxSocketStream(); - - wxDECLARE_NO_COPY_CLASS(wxSocketStream); -}; - -#endif - // wxUSE_SOCKETS && wxUSE_STREAMS - -#endif - // __SCK_STREAM_H__ diff --git a/Externals/wxWidgets3/include/wx/scopedarray.h b/Externals/wxWidgets3/include/wx/scopedarray.h deleted file mode 100644 index 2f80911fa2..0000000000 --- a/Externals/wxWidgets3/include/wx/scopedarray.h +++ /dev/null @@ -1,120 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/scopedarray.h -// Purpose: scoped smart pointer class -// Author: Vadim Zeitlin -// Created: 2009-02-03 -// Copyright: (c) Jesse Lovelace and original Boost authors (see below) -// (c) 2009 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_SCOPED_ARRAY_H_ -#define _WX_SCOPED_ARRAY_H_ - -#include "wx/defs.h" -#include "wx/checkeddelete.h" - -// ---------------------------------------------------------------------------- -// wxScopedArray: A scoped array -// ---------------------------------------------------------------------------- - -template -class wxScopedArray -{ -public: - typedef T element_type; - - wxEXPLICIT wxScopedArray(T * array = NULL) : m_array(array) { } - wxEXPLICIT wxScopedArray(size_t count) : m_array(new T[count]) { } - - ~wxScopedArray() { delete [] m_array; } - - // test for pointer validity: defining conversion to unspecified_bool_type - // and not more obvious bool to avoid implicit conversions to integer types - typedef T *(wxScopedArray::*unspecified_bool_type)() const; - operator unspecified_bool_type() const - { - return m_array ? &wxScopedArray::get : NULL; - } - - void reset(T *array = NULL) - { - if ( array != m_array ) - { - delete [] m_array; - m_array = array; - } - } - - T& operator[](size_t n) const { return m_array[n]; } - - T *get() const { return m_array; } - - void swap(wxScopedArray &other) - { - T * const tmp = other.m_array; - other.m_array = m_array; - m_array = tmp; - } - -private: - T *m_array; - - wxDECLARE_NO_COPY_TEMPLATE_CLASS(wxScopedArray, T); -}; - -// ---------------------------------------------------------------------------- -// old macro based implementation -// ---------------------------------------------------------------------------- - -// the same but for arrays instead of simple pointers -#define wxDECLARE_SCOPED_ARRAY(T, name)\ -class name \ -{ \ -private: \ - T * m_ptr; \ - name(name const &); \ - name & operator=(name const &); \ - \ -public: \ - wxEXPLICIT name(T * p = NULL) : m_ptr(p) \ - {} \ - \ - ~name(); \ - void reset(T * p = NULL); \ - \ - T & operator[](long int i) const\ - { \ - wxASSERT(m_ptr != NULL); \ - wxASSERT(i >= 0); \ - return m_ptr[i]; \ - } \ - \ - T * get() const \ - { \ - return m_ptr; \ - } \ - \ - void swap(name & ot) \ - { \ - T * tmp = ot.m_ptr; \ - ot.m_ptr = m_ptr; \ - m_ptr = tmp; \ - } \ -}; - -#define wxDEFINE_SCOPED_ARRAY(T, name) \ -name::~name() \ -{ \ - wxCHECKED_DELETE_ARRAY(m_ptr); \ -} \ -void name::reset(T * p){ \ - if (m_ptr != p) \ - { \ - wxCHECKED_DELETE_ARRAY(m_ptr); \ - m_ptr = p; \ - } \ -} - -#endif // _WX_SCOPED_ARRAY_H_ - diff --git a/Externals/wxWidgets3/include/wx/scopedptr.h b/Externals/wxWidgets3/include/wx/scopedptr.h deleted file mode 100644 index 9cc8f3968e..0000000000 --- a/Externals/wxWidgets3/include/wx/scopedptr.h +++ /dev/null @@ -1,214 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/scopedptr.h -// Purpose: scoped smart pointer class -// Author: Jesse Lovelace -// Created: 06/01/02 -// Copyright: (c) Jesse Lovelace and original Boost authors (see below) -// (c) 2009 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// This class closely follows the implementation of the boost -// library scoped_ptr and is an adaption for c++ macro's in -// the wxWidgets project. The original authors of the boost -// scoped_ptr are given below with their respective copyrights. - -// (C) Copyright Greg Colvin and Beman Dawes 1998, 1999. -// Copyright (c) 2001, 2002 Peter Dimov -// -// Permission to copy, use, modify, sell and distribute this software -// is granted provided this copyright notice appears in all copies. -// This software is provided "as is" without express or implied -// warranty, and with no claim as to its suitability for any purpose. -// -// See http://www.boost.org/libs/smart_ptr/scoped_ptr.htm for documentation. -// - -#ifndef _WX_SCOPED_PTR_H_ -#define _WX_SCOPED_PTR_H_ - -#include "wx/defs.h" -#include "wx/checkeddelete.h" - -// ---------------------------------------------------------------------------- -// wxScopedPtr: A scoped pointer -// ---------------------------------------------------------------------------- - -template -class wxScopedPtr -{ -public: - typedef T element_type; - - wxEXPLICIT wxScopedPtr(T * ptr = NULL) : m_ptr(ptr) { } - - ~wxScopedPtr() { wxCHECKED_DELETE(m_ptr); } - - // test for pointer validity: defining conversion to unspecified_bool_type - // and not more obvious bool to avoid implicit conversions to integer types -#ifdef __BORLANDC__ - // this compiler is too dumb to use unspecified_bool_type operator in tests - // of the form "if ( !ptr )" - typedef bool unspecified_bool_type; -#else - typedef T *(wxScopedPtr::*unspecified_bool_type)() const; -#endif // __BORLANDC__ - operator unspecified_bool_type() const - { - return m_ptr ? &wxScopedPtr::get : NULL; - } - - void reset(T * ptr = NULL) - { - if ( ptr != m_ptr ) - { - wxCHECKED_DELETE(m_ptr); - m_ptr = ptr; - } - } - - T *release() - { - T *ptr = m_ptr; - m_ptr = NULL; - return ptr; - } - - T & operator*() const - { - wxASSERT(m_ptr != NULL); - return *m_ptr; - } - - T * operator->() const - { - wxASSERT(m_ptr != NULL); - return m_ptr; - } - - T * get() const - { - return m_ptr; - } - - void swap(wxScopedPtr& other) - { - T * const tmp = other.m_ptr; - other.m_ptr = m_ptr; - m_ptr = tmp; - } - -private: - T * m_ptr; - - wxDECLARE_NO_COPY_TEMPLATE_CLASS(wxScopedPtr, T); -}; - -// ---------------------------------------------------------------------------- -// old macro based implementation -// ---------------------------------------------------------------------------- - -/* The type being used *must* be complete at the time - that wxDEFINE_SCOPED_* is called or a compiler error will result. - This is because the class checks for the completeness of the type - being used. */ - -#define wxDECLARE_SCOPED_PTR(T, name) \ -class name \ -{ \ -private: \ - T * m_ptr; \ - \ - name(name const &); \ - name & operator=(name const &); \ - \ -public: \ - wxEXPLICIT name(T * ptr = NULL) \ - : m_ptr(ptr) { } \ - \ - ~name(); \ - \ - void reset(T * ptr = NULL); \ - \ - T *release() \ - { \ - T *ptr = m_ptr; \ - m_ptr = NULL; \ - return ptr; \ - } \ - \ - T & operator*() const \ - { \ - wxASSERT(m_ptr != NULL); \ - return *m_ptr; \ - } \ - \ - T * operator->() const \ - { \ - wxASSERT(m_ptr != NULL); \ - return m_ptr; \ - } \ - \ - T * get() const \ - { \ - return m_ptr; \ - } \ - \ - void swap(name & ot) \ - { \ - T * tmp = ot.m_ptr; \ - ot.m_ptr = m_ptr; \ - m_ptr = tmp; \ - } \ -}; - -#define wxDEFINE_SCOPED_PTR(T, name)\ -void name::reset(T * ptr) \ -{ \ - if (m_ptr != ptr) \ - { \ - wxCHECKED_DELETE(m_ptr); \ - m_ptr = ptr; \ - } \ -} \ -name::~name() \ -{ \ - wxCHECKED_DELETE(m_ptr); \ -} - -// this macro can be used for the most common case when you want to declare and -// define the scoped pointer at the same time and want to use the standard -// naming convention: auto pointer to Foo is called FooPtr -#define wxDEFINE_SCOPED_PTR_TYPE(T) \ - wxDECLARE_SCOPED_PTR(T, T ## Ptr) \ - wxDEFINE_SCOPED_PTR(T, T ## Ptr) - -// ---------------------------------------------------------------------------- -// "Tied" scoped pointer: same as normal one but also sets the value of -// some other variable to the pointer value -// ---------------------------------------------------------------------------- - -#define wxDEFINE_TIED_SCOPED_PTR_TYPE(T) \ - wxDEFINE_SCOPED_PTR_TYPE(T) \ - class T ## TiedPtr : public T ## Ptr \ - { \ - public: \ - T ## TiedPtr(T **pp, T *p) \ - : T ## Ptr(p), m_pp(pp) \ - { \ - m_pOld = *pp; \ - *pp = p; \ - } \ - \ - ~ T ## TiedPtr() \ - { \ - *m_pp = m_pOld; \ - } \ - \ - private: \ - T **m_pp; \ - T *m_pOld; \ - }; - -#endif // _WX_SCOPED_PTR_H_ - diff --git a/Externals/wxWidgets3/include/wx/scopeguard.h b/Externals/wxWidgets3/include/wx/scopeguard.h deleted file mode 100644 index 6f6607dc26..0000000000 --- a/Externals/wxWidgets3/include/wx/scopeguard.h +++ /dev/null @@ -1,524 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/scopeguard.h -// Purpose: declares wxwxScopeGuard and related macros -// Author: Vadim Zeitlin -// Modified by: -// Created: 03.07.2003 -// Copyright: (c) 2003 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -/* - Acknowledgements: this header is heavily based on (well, almost the exact - copy of) ScopeGuard.h by Andrei Alexandrescu and Petru Marginean published - in December 2000 issue of C/C++ Users Journal. - http://www.cuj.com/documents/cujcexp1812alexandr/ - */ - -#ifndef _WX_SCOPEGUARD_H_ -#define _WX_SCOPEGUARD_H_ - -#include "wx/defs.h" - -#include "wx/except.h" - -// ---------------------------------------------------------------------------- -// helpers -// ---------------------------------------------------------------------------- - -namespace wxPrivate -{ - // in the original implementation this was a member template function of - // ScopeGuardImplBase but gcc 2.8 which is still used for OS/2 doesn't - // support member templates and so we must make it global - template - void OnScopeExit(ScopeGuardImpl& guard) - { - if ( !guard.WasDismissed() ) - { - // we're called from ScopeGuardImpl dtor and so we must not throw - wxTRY - { - guard.Execute(); - } - wxCATCH_ALL(;) // do nothing, just eat the exception - } - } - - // just to avoid the warning about unused variables - template - void Use(const T& WXUNUSED(t)) - { - } -} // namespace wxPrivate - -#define wxPrivateOnScopeExit(n) wxPrivate::OnScopeExit(n) -#define wxPrivateUse(n) wxPrivate::Use(n) - -// ============================================================================ -// wxScopeGuard for functions and functors -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxScopeGuardImplBase: used by wxScopeGuardImpl[0..N] below -// ---------------------------------------------------------------------------- - -class wxScopeGuardImplBase -{ -public: - wxScopeGuardImplBase() : m_wasDismissed(false) { } - - wxScopeGuardImplBase(const wxScopeGuardImplBase& other) - : m_wasDismissed(other.m_wasDismissed) - { - other.Dismiss(); - } - - void Dismiss() const { m_wasDismissed = true; } - - // for OnScopeExit() only (we can't make it friend, unfortunately)! - bool WasDismissed() const { return m_wasDismissed; } - -protected: - ~wxScopeGuardImplBase() { } - - // must be mutable for copy ctor to work - mutable bool m_wasDismissed; - -private: - wxScopeGuardImplBase& operator=(const wxScopeGuardImplBase&); -}; - -// wxScopeGuard is just a reference, see the explanation in CUJ article -typedef const wxScopeGuardImplBase& wxScopeGuard; - -// ---------------------------------------------------------------------------- -// wxScopeGuardImpl0: scope guard for actions without parameters -// ---------------------------------------------------------------------------- - -template -class wxScopeGuardImpl0 : public wxScopeGuardImplBase -{ -public: - static wxScopeGuardImpl0 MakeGuard(F fun) - { - return wxScopeGuardImpl0(fun); - } - - ~wxScopeGuardImpl0() { wxPrivateOnScopeExit(*this); } - - void Execute() { m_fun(); } - -protected: - wxScopeGuardImpl0(F fun) : m_fun(fun) { } - - F m_fun; - - wxScopeGuardImpl0& operator=(const wxScopeGuardImpl0&); -}; - -template -inline wxScopeGuardImpl0 wxMakeGuard(F fun) -{ - return wxScopeGuardImpl0::MakeGuard(fun); -} - -// ---------------------------------------------------------------------------- -// wxScopeGuardImpl1: scope guard for actions with 1 parameter -// ---------------------------------------------------------------------------- - -template -class wxScopeGuardImpl1 : public wxScopeGuardImplBase -{ -public: - static wxScopeGuardImpl1 MakeGuard(F fun, P1 p1) - { - return wxScopeGuardImpl1(fun, p1); - } - - ~wxScopeGuardImpl1() { wxPrivateOnScopeExit(* this); } - - void Execute() { m_fun(m_p1); } - -protected: - wxScopeGuardImpl1(F fun, P1 p1) : m_fun(fun), m_p1(p1) { } - - F m_fun; - const P1 m_p1; - - wxScopeGuardImpl1& operator=(const wxScopeGuardImpl1&); -}; - -template -inline wxScopeGuardImpl1 wxMakeGuard(F fun, P1 p1) -{ - return wxScopeGuardImpl1::MakeGuard(fun, p1); -} - -// ---------------------------------------------------------------------------- -// wxScopeGuardImpl2: scope guard for actions with 2 parameters -// ---------------------------------------------------------------------------- - -template -class wxScopeGuardImpl2 : public wxScopeGuardImplBase -{ -public: - static wxScopeGuardImpl2 MakeGuard(F fun, P1 p1, P2 p2) - { - return wxScopeGuardImpl2(fun, p1, p2); - } - - ~wxScopeGuardImpl2() { wxPrivateOnScopeExit(*this); } - - void Execute() { m_fun(m_p1, m_p2); } - -protected: - wxScopeGuardImpl2(F fun, P1 p1, P2 p2) : m_fun(fun), m_p1(p1), m_p2(p2) { } - - F m_fun; - const P1 m_p1; - const P2 m_p2; - - wxScopeGuardImpl2& operator=(const wxScopeGuardImpl2&); -}; - -template -inline wxScopeGuardImpl2 wxMakeGuard(F fun, P1 p1, P2 p2) -{ - return wxScopeGuardImpl2::MakeGuard(fun, p1, p2); -} - -// ---------------------------------------------------------------------------- -// wxScopeGuardImpl3: scope guard for actions with 3 parameters -// ---------------------------------------------------------------------------- - -template -class wxScopeGuardImpl3 : public wxScopeGuardImplBase -{ -public: - static wxScopeGuardImpl3 MakeGuard(F fun, P1 p1, P2 p2, P3 p3) - { - return wxScopeGuardImpl3(fun, p1, p2, p3); - } - - ~wxScopeGuardImpl3() { wxPrivateOnScopeExit(*this); } - - void Execute() { m_fun(m_p1, m_p2, m_p3); } - -protected: - wxScopeGuardImpl3(F fun, P1 p1, P2 p2, P3 p3) - : m_fun(fun), m_p1(p1), m_p2(p2), m_p3(p3) { } - - F m_fun; - const P1 m_p1; - const P2 m_p2; - const P3 m_p3; - - wxScopeGuardImpl3& operator=(const wxScopeGuardImpl3&); -}; - -template -inline wxScopeGuardImpl3 wxMakeGuard(F fun, P1 p1, P2 p2, P3 p3) -{ - return wxScopeGuardImpl3::MakeGuard(fun, p1, p2, p3); -} - -// ============================================================================ -// wxScopeGuards for object methods -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxObjScopeGuardImpl0 -// ---------------------------------------------------------------------------- - -template -class wxObjScopeGuardImpl0 : public wxScopeGuardImplBase -{ -public: - static wxObjScopeGuardImpl0 - MakeObjGuard(Obj& obj, MemFun memFun) - { - return wxObjScopeGuardImpl0(obj, memFun); - } - - ~wxObjScopeGuardImpl0() { wxPrivateOnScopeExit(*this); } - - void Execute() { (m_obj.*m_memfun)(); } - -protected: - wxObjScopeGuardImpl0(Obj& obj, MemFun memFun) - : m_obj(obj), m_memfun(memFun) { } - - Obj& m_obj; - MemFun m_memfun; -}; - -template -inline wxObjScopeGuardImpl0 wxMakeObjGuard(Obj& obj, MemFun memFun) -{ - return wxObjScopeGuardImpl0::MakeObjGuard(obj, memFun); -} - -template -class wxObjScopeGuardImpl1 : public wxScopeGuardImplBase -{ -public: - static wxObjScopeGuardImpl1 - MakeObjGuard(Obj& obj, MemFun memFun, P1 p1) - { - return wxObjScopeGuardImpl1(obj, memFun, p1); - } - - ~wxObjScopeGuardImpl1() { wxPrivateOnScopeExit(*this); } - - void Execute() { (m_obj.*m_memfun)(m_p1); } - -protected: - wxObjScopeGuardImpl1(Obj& obj, MemFun memFun, P1 p1) - : m_obj(obj), m_memfun(memFun), m_p1(p1) { } - - Obj& m_obj; - MemFun m_memfun; - const P1 m_p1; -}; - -template -inline wxObjScopeGuardImpl1 -wxMakeObjGuard(Obj& obj, MemFun memFun, P1 p1) -{ - return wxObjScopeGuardImpl1::MakeObjGuard(obj, memFun, p1); -} - -template -class wxObjScopeGuardImpl2 : public wxScopeGuardImplBase -{ -public: - static wxObjScopeGuardImpl2 - MakeObjGuard(Obj& obj, MemFun memFun, P1 p1, P2 p2) - { - return wxObjScopeGuardImpl2(obj, memFun, p1, p2); - } - - ~wxObjScopeGuardImpl2() { wxPrivateOnScopeExit(*this); } - - void Execute() { (m_obj.*m_memfun)(m_p1, m_p2); } - -protected: - wxObjScopeGuardImpl2(Obj& obj, MemFun memFun, P1 p1, P2 p2) - : m_obj(obj), m_memfun(memFun), m_p1(p1), m_p2(p2) { } - - Obj& m_obj; - MemFun m_memfun; - const P1 m_p1; - const P2 m_p2; -}; - -template -inline wxObjScopeGuardImpl2 -wxMakeObjGuard(Obj& obj, MemFun memFun, P1 p1, P2 p2) -{ - return wxObjScopeGuardImpl2:: - MakeObjGuard(obj, memFun, p1, p2); -} - -template -class wxObjScopeGuardImpl3 : public wxScopeGuardImplBase -{ -public: - static wxObjScopeGuardImpl3 - MakeObjGuard(Obj& obj, MemFun memFun, P1 p1, P2 p2, P3 p3) - { - return wxObjScopeGuardImpl3(obj, memFun, p1, p2, p3); - } - - ~wxObjScopeGuardImpl3() { wxPrivateOnScopeExit(*this); } - - void Execute() { (m_obj.*m_memfun)(m_p1, m_p2, m_p3); } - -protected: - wxObjScopeGuardImpl3(Obj& obj, MemFun memFun, P1 p1, P2 p2, P3 p3) - : m_obj(obj), m_memfun(memFun), m_p1(p1), m_p2(p2), m_p3(p3) { } - - Obj& m_obj; - MemFun m_memfun; - const P1 m_p1; - const P2 m_p2; - const P3 m_p3; -}; - -template -inline wxObjScopeGuardImpl3 -wxMakeObjGuard(Obj& obj, MemFun memFun, P1 p1, P2 p2, P3 p3) -{ - return wxObjScopeGuardImpl3:: - MakeObjGuard(obj, memFun, p1, p2, p3); -} - -// ---------------------------------------------------------------------------- -// wxVariableSetter: use the same technique as for wxScopeGuard to allow -// setting a variable to some value on block exit -// ---------------------------------------------------------------------------- - -namespace wxPrivate -{ - -// empty class just to be able to define a reference to it -class VariableSetterBase : public wxScopeGuardImplBase { }; - -typedef const VariableSetterBase& VariableSetter; - -template -class VariableSetterImpl : public VariableSetterBase -{ -public: - VariableSetterImpl(T& var, U value) - : m_var(var), - m_value(value) - { - } - - ~VariableSetterImpl() { wxPrivateOnScopeExit(*this); } - - void Execute() { m_var = m_value; } - -private: - T& m_var; - const U m_value; - - // suppress the warning about assignment operator not being generated - VariableSetterImpl& operator=(const VariableSetterImpl&); -}; - -template -class VariableNullerImpl : public VariableSetterBase -{ -public: - VariableNullerImpl(T& var) - : m_var(var) - { - } - - ~VariableNullerImpl() { wxPrivateOnScopeExit(*this); } - - void Execute() { m_var = NULL; } - -private: - T& m_var; - - VariableNullerImpl& operator=(const VariableNullerImpl&); -}; - -} // namespace wxPrivate - -template -inline -wxPrivate::VariableSetterImpl wxMakeVarSetter(T& var, U value) -{ - return wxPrivate::VariableSetterImpl(var, value); -} - -// calling wxMakeVarSetter(ptr, NULL) doesn't work because U is deduced to be -// "int" and subsequent assignment of "U" to "T *" fails, so provide a special -// function for this special case -template -inline -wxPrivate::VariableNullerImpl wxMakeVarNuller(T& var) -{ - return wxPrivate::VariableNullerImpl(var); -} - -// ============================================================================ -// macros for declaring unnamed scoped guards (which can't be dismissed) -// ============================================================================ - -// NB: the original code has a single (and much nicer) ON_BLOCK_EXIT macro -// but this results in compiler warnings about unused variables and I -// didn't find a way to work around this other than by having different -// macros with different names or using a less natural syntax for passing -// the arguments (e.g. as Boost preprocessor sequences, which would mean -// having to write wxON_BLOCK_EXIT(fwrite, (buf)(size)(n)(fp)) instead of -// wxON_BLOCK_EXIT4(fwrite, buf, size, n, fp)). - -#define wxGuardName wxMAKE_UNIQUE_NAME(wxScopeGuard) - -#define wxON_BLOCK_EXIT0_IMPL(n, f) \ - wxScopeGuard n = wxMakeGuard(f); \ - wxPrivateUse(n) -#define wxON_BLOCK_EXIT0(f) \ - wxON_BLOCK_EXIT0_IMPL(wxGuardName, f) - -#define wxON_BLOCK_EXIT_OBJ0_IMPL(n, o, m) \ - wxScopeGuard n = wxMakeObjGuard(o, m); \ - wxPrivateUse(n) -#define wxON_BLOCK_EXIT_OBJ0(o, m) \ - wxON_BLOCK_EXIT_OBJ0_IMPL(wxGuardName, o, &m) - -#define wxON_BLOCK_EXIT_THIS0(m) \ - wxON_BLOCK_EXIT_OBJ0(*this, m) - - -#define wxON_BLOCK_EXIT1_IMPL(n, f, p1) \ - wxScopeGuard n = wxMakeGuard(f, p1); \ - wxPrivateUse(n) -#define wxON_BLOCK_EXIT1(f, p1) \ - wxON_BLOCK_EXIT1_IMPL(wxGuardName, f, p1) - -#define wxON_BLOCK_EXIT_OBJ1_IMPL(n, o, m, p1) \ - wxScopeGuard n = wxMakeObjGuard(o, m, p1); \ - wxPrivateUse(n) -#define wxON_BLOCK_EXIT_OBJ1(o, m, p1) \ - wxON_BLOCK_EXIT_OBJ1_IMPL(wxGuardName, o, &m, p1) - -#define wxON_BLOCK_EXIT_THIS1(m, p1) \ - wxON_BLOCK_EXIT_OBJ1(*this, m, p1) - - -#define wxON_BLOCK_EXIT2_IMPL(n, f, p1, p2) \ - wxScopeGuard n = wxMakeGuard(f, p1, p2); \ - wxPrivateUse(n) -#define wxON_BLOCK_EXIT2(f, p1, p2) \ - wxON_BLOCK_EXIT2_IMPL(wxGuardName, f, p1, p2) - -#define wxON_BLOCK_EXIT_OBJ2_IMPL(n, o, m, p1, p2) \ - wxScopeGuard n = wxMakeObjGuard(o, m, p1, p2); \ - wxPrivateUse(n) -#define wxON_BLOCK_EXIT_OBJ2(o, m, p1, p2) \ - wxON_BLOCK_EXIT_OBJ2_IMPL(wxGuardName, o, &m, p1, p2) - -#define wxON_BLOCK_EXIT_THIS2(m, p1, p2) \ - wxON_BLOCK_EXIT_OBJ2(*this, m, p1, p2) - - -#define wxON_BLOCK_EXIT3_IMPL(n, f, p1, p2, p3) \ - wxScopeGuard n = wxMakeGuard(f, p1, p2, p3); \ - wxPrivateUse(n) -#define wxON_BLOCK_EXIT3(f, p1, p2, p3) \ - wxON_BLOCK_EXIT3_IMPL(wxGuardName, f, p1, p2, p3) - -#define wxON_BLOCK_EXIT_OBJ3_IMPL(n, o, m, p1, p2, p3) \ - wxScopeGuard n = wxMakeObjGuard(o, m, p1, p2, p3); \ - wxPrivateUse(n) -#define wxON_BLOCK_EXIT_OBJ3(o, m, p1, p2, p3) \ - wxON_BLOCK_EXIT_OBJ3_IMPL(wxGuardName, o, &m, p1, p2, p3) - -#define wxON_BLOCK_EXIT_THIS3(m, p1, p2, p3) \ - wxON_BLOCK_EXIT_OBJ3(*this, m, p1, p2, p3) - - -#define wxSetterName wxMAKE_UNIQUE_NAME(wxVarSetter) - -#define wxON_BLOCK_EXIT_SET_IMPL(n, var, value) \ - wxPrivate::VariableSetter n = wxMakeVarSetter(var, value); \ - wxPrivateUse(n) - -#define wxON_BLOCK_EXIT_SET(var, value) \ - wxON_BLOCK_EXIT_SET_IMPL(wxSetterName, var, value) - -#define wxON_BLOCK_EXIT_NULL_IMPL(n, var) \ - wxPrivate::VariableSetter n = wxMakeVarNuller(var); \ - wxPrivateUse(n) - -#define wxON_BLOCK_EXIT_NULL(ptr) \ - wxON_BLOCK_EXIT_NULL_IMPL(wxSetterName, ptr) - -#endif // _WX_SCOPEGUARD_H_ diff --git a/Externals/wxWidgets3/include/wx/scrolbar.h b/Externals/wxWidgets3/include/wx/scrolbar.h deleted file mode 100644 index 1352ae6c61..0000000000 --- a/Externals/wxWidgets3/include/wx/scrolbar.h +++ /dev/null @@ -1,84 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/scrolbar.h -// Purpose: wxScrollBar base header -// Author: Julian Smart -// Modified by: -// Created: -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_SCROLBAR_H_BASE_ -#define _WX_SCROLBAR_H_BASE_ - -#include "wx/defs.h" - -#if wxUSE_SCROLLBAR - -#include "wx/control.h" - -extern WXDLLIMPEXP_DATA_CORE(const char) wxScrollBarNameStr[]; - -// ---------------------------------------------------------------------------- -// wxScrollBar: a scroll bar control -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxScrollBarBase : public wxControl -{ -public: - wxScrollBarBase() { } - - /* - Derived classes should provide the following method and ctor with the - same parameters: - - bool Create(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSB_HORIZONTAL, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxScrollBarNameStr); - */ - - // accessors - virtual int GetThumbPosition() const = 0; - virtual int GetThumbSize() const = 0; - virtual int GetPageSize() const = 0; - virtual int GetRange() const = 0; - - bool IsVertical() const { return (m_windowStyle & wxVERTICAL) != 0; } - - // operations - virtual void SetThumbPosition(int viewStart) = 0; - virtual void SetScrollbar(int position, int thumbSize, - int range, int pageSize, - bool refresh = true) = 0; - - // implementation-only - bool IsNeeded() const { return GetRange() > GetThumbSize(); } - -private: - wxDECLARE_NO_COPY_CLASS(wxScrollBarBase); -}; - -#if defined(__WXUNIVERSAL__) - #include "wx/univ/scrolbar.h" -#elif defined(__WXMSW__) - #include "wx/msw/scrolbar.h" -#elif defined(__WXMOTIF__) - #include "wx/motif/scrolbar.h" -#elif defined(__WXGTK20__) - #include "wx/gtk/scrolbar.h" -#elif defined(__WXGTK__) - #include "wx/gtk1/scrolbar.h" -#elif defined(__WXMAC__) - #include "wx/osx/scrolbar.h" -#elif defined(__WXQT__) - #include "wx/qt/scrolbar.h" -#endif - -#endif // wxUSE_SCROLLBAR - -#endif - // _WX_SCROLBAR_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/scrolwin.h b/Externals/wxWidgets3/include/wx/scrolwin.h deleted file mode 100644 index e8f4ac8386..0000000000 --- a/Externals/wxWidgets3/include/wx/scrolwin.h +++ /dev/null @@ -1,479 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/scrolwin.h -// Purpose: wxScrolledWindow, wxScrolledControl and wxScrollHelper -// Author: Vadim Zeitlin -// Modified by: -// Created: 30.08.00 -// Copyright: (c) 2000 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_SCROLWIN_H_BASE_ -#define _WX_SCROLWIN_H_BASE_ - -#include "wx/panel.h" - -class WXDLLIMPEXP_FWD_CORE wxScrollHelperEvtHandler; -class WXDLLIMPEXP_FWD_BASE wxTimer; - -// default scrolled window style: scroll in both directions -#define wxScrolledWindowStyle (wxHSCROLL | wxVSCROLL) - -// values for the second argument of wxScrollHelper::ShowScrollbars() -enum wxScrollbarVisibility -{ - wxSHOW_SB_NEVER = -1, // never show the scrollbar at all - wxSHOW_SB_DEFAULT, // show scrollbar only if it is needed - wxSHOW_SB_ALWAYS // always show scrollbar, even if not needed -}; - -// ---------------------------------------------------------------------------- -// The hierarchy of scrolling classes is a bit complicated because we want to -// put as much functionality as possible in a mix-in class not deriving from -// wxWindow so that other classes could derive from the same base class on all -// platforms irrespectively of whether they are native controls (and hence -// don't use our scrolling) or not. -// -// So we have -// -// wxAnyScrollHelperBase -// | -// | -// \|/ -// wxScrollHelperBase -// | -// | -// \|/ -// wxWindow wxScrollHelper -// | \ / / -// | \ / / -// | _| |_ / -// | wxScrolledWindow / -// | / -// \|/ / -// wxControl / -// \ / -// \ / -// _| |_ -// wxScrolledControl -// -// ---------------------------------------------------------------------------- - -// This class allows reusing some of wxScrollHelperBase functionality in -// wxVarScrollHelperBase in wx/vscroll.h without duplicating its code. -class WXDLLIMPEXP_CORE wxAnyScrollHelperBase -{ -public: - wxEXPLICIT wxAnyScrollHelperBase(wxWindow* win); - virtual ~wxAnyScrollHelperBase() {} - - // Disable use of keyboard keys for scrolling. By default cursor movement - // keys (including Home, End, Page Up and Down) are used to scroll the - // window appropriately. If the derived class uses these keys for something - // else, e.g. changing the currently selected item, this function can be - // used to disable this behaviour as it's not only not necessary then but - // can actually be actively harmful if another object forwards a keyboard - // event corresponding to one of the above keys to us using - // ProcessWindowEvent() because the event will always be processed which - // can be undesirable. - void DisableKeyboardScrolling() { m_kbdScrollingEnabled = false; } - - // Override this function to draw the graphic (or just process EVT_PAINT) - virtual void OnDraw(wxDC& WXUNUSED(dc)) { } - - // change the DC origin according to the scroll position. - virtual void DoPrepareDC(wxDC& dc) = 0; - - // Simple accessor for the window that is really being scrolled. - wxWindow *GetTargetWindow() const { return m_targetWindow; } - - - // The methods called from the window event handlers. - void HandleOnChar(wxKeyEvent& event); - void HandleOnPaint(wxPaintEvent& event); - -protected: - // the window that receives the scroll events and the window to actually - // scroll, respectively - wxWindow *m_win, - *m_targetWindow; - - // whether cursor keys should scroll the window - bool m_kbdScrollingEnabled; -}; - -// This is the class containing the guts of (uniform) scrolling logic. -class WXDLLIMPEXP_CORE wxScrollHelperBase : public wxAnyScrollHelperBase -{ -public: - // ctor must be given the associated window - wxScrollHelperBase(wxWindow *winToScroll); - virtual ~wxScrollHelperBase(); - - // configure the scrolling - virtual void SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY, - int noUnitsX, int noUnitsY, - int xPos = 0, int yPos = 0, - bool noRefresh = false ); - - // scroll to the given (in logical coords) position - // - // notice that for backwards compatibility reasons Scroll() is virtual as - // the existing code could override it but new code should override - // DoScroll() instead - virtual void Scroll(int x, int y) { DoScroll(x, y); } - virtual void Scroll(const wxPoint& pt) { DoScroll(pt.x, pt.y); } - - // get/set the page size for this orientation (wxVERTICAL/wxHORIZONTAL) - int GetScrollPageSize(int orient) const; - void SetScrollPageSize(int orient, int pageSize); - - // get the number of lines the window can scroll, - // returns 0 if no scrollbars are there. - int GetScrollLines( int orient ) const; - - // Set the x, y scrolling increments. - void SetScrollRate( int xstep, int ystep ); - - // get the size of one logical unit in physical ones - void GetScrollPixelsPerUnit(int *pixelsPerUnitX, int *pixelsPerUnitY) const; - - // Set scrollbar visibility: it is possible to show scrollbar only if it is - // needed (i.e. if our virtual size is greater than the current size of the - // associated window), always (as wxALWAYS_SHOW_SB style does) or never (in - // which case you should provide some other way to scroll the window as the - // user wouldn't be able to do it at all) - void ShowScrollbars(wxScrollbarVisibility horz, wxScrollbarVisibility vert) - { - DoShowScrollbars(horz, vert); - } - - // Test whether the specified scrollbar is shown. - virtual bool IsScrollbarShown(int orient) const = 0; - - // Enable/disable Windows scrolling in either direction. If true, wxWidgets - // scrolls the canvas and only a bit of the canvas is invalidated; no - // Clear() is necessary. If false, the whole canvas is invalidated and a - // Clear() is necessary. Disable for when the scroll increment is used to - // actually scroll a non-constant distance - // - // Notice that calling this method with a false argument doesn't disable - // scrolling the window in this direction, it just changes the mechanism by - // which it is implemented to not use wxWindow::ScrollWindow(). - virtual void EnableScrolling(bool x_scrolling, bool y_scrolling); - - // Get the view start - void GetViewStart(int *x, int *y) const { DoGetViewStart(x, y); } - - wxPoint GetViewStart() const - { - wxPoint pt; - DoGetViewStart(&pt.x, &pt.y); - return pt; - } - - // Set the scale factor, used in PrepareDC - void SetScale(double xs, double ys) { m_scaleX = xs; m_scaleY = ys; } - double GetScaleX() const { return m_scaleX; } - double GetScaleY() const { return m_scaleY; } - - // translate between scrolled and unscrolled coordinates - void CalcScrolledPosition(int x, int y, int *xx, int *yy) const - { DoCalcScrolledPosition(x, y, xx, yy); } - wxPoint CalcScrolledPosition(const wxPoint& pt) const - { - wxPoint p2; - DoCalcScrolledPosition(pt.x, pt.y, &p2.x, &p2.y); - return p2; - } - - void CalcUnscrolledPosition(int x, int y, int *xx, int *yy) const - { DoCalcUnscrolledPosition(x, y, xx, yy); } - wxPoint CalcUnscrolledPosition(const wxPoint& pt) const - { - wxPoint p2; - DoCalcUnscrolledPosition(pt.x, pt.y, &p2.x, &p2.y); - return p2; - } - - void DoCalcScrolledPosition(int x, int y, int *xx, int *yy) const; - void DoCalcUnscrolledPosition(int x, int y, int *xx, int *yy) const; - - // Adjust the scrollbars - virtual void AdjustScrollbars() = 0; - - // Calculate scroll increment - int CalcScrollInc(wxScrollWinEvent& event); - - // Normally the wxScrolledWindow will scroll itself, but in some rare - // occasions you might want it to scroll [part of] another window (e.g. a - // child of it in order to scroll only a portion the area between the - // scrollbars (spreadsheet: only cell area will move). - void SetTargetWindow(wxWindow *target); - - void SetTargetRect(const wxRect& rect) { m_rectToScroll = rect; } - wxRect GetTargetRect() const { return m_rectToScroll; } - - virtual void DoPrepareDC(wxDC& dc) wxOVERRIDE; - - // are we generating the autoscroll events? - bool IsAutoScrolling() const { return m_timerAutoScroll != NULL; } - - // stop generating the scroll events when mouse is held outside the window - void StopAutoScrolling(); - - // this method can be overridden in a derived class to forbid sending the - // auto scroll events - note that unlike StopAutoScrolling() it doesn't - // stop the timer, so it will be called repeatedly and will typically - // return different values depending on the current mouse position - // - // the base class version just returns true - virtual bool SendAutoScrollEvents(wxScrollWinEvent& event) const; - - // the methods to be called from the window event handlers - void HandleOnScroll(wxScrollWinEvent& event); - void HandleOnSize(wxSizeEvent& event); - void HandleOnMouseEnter(wxMouseEvent& event); - void HandleOnMouseLeave(wxMouseEvent& event); -#if wxUSE_MOUSEWHEEL - void HandleOnMouseWheel(wxMouseEvent& event); -#endif // wxUSE_MOUSEWHEEL - void HandleOnChildFocus(wxChildFocusEvent& event); - -#if WXWIN_COMPATIBILITY_2_8 - wxDEPRECATED( - void OnScroll(wxScrollWinEvent& event) { HandleOnScroll(event); } - ) -#endif // WXWIN_COMPATIBILITY_2_8 - -protected: - // get pointer to our scroll rect if we use it or NULL - const wxRect *GetScrollRect() const - { - return m_rectToScroll.width != 0 ? &m_rectToScroll : NULL; - } - - // get the size of the target window - wxSize GetTargetSize() const - { - return m_rectToScroll.width != 0 ? m_rectToScroll.GetSize() - : m_targetWindow->GetClientSize(); - } - - void GetTargetSize(int *w, int *h) const - { - wxSize size = GetTargetSize(); - if ( w ) - *w = size.x; - if ( h ) - *h = size.y; - } - - // implementation of public methods with the same name - virtual void DoGetViewStart(int *x, int *y) const; - virtual void DoScroll(int x, int y) = 0; - virtual void DoShowScrollbars(wxScrollbarVisibility horz, - wxScrollbarVisibility vert) = 0; - - // implementations of various wxWindow virtual methods which should be - // forwarded to us (this can be done by WX_FORWARD_TO_SCROLL_HELPER()) - bool ScrollLayout(); - void ScrollDoSetVirtualSize(int x, int y); - wxSize ScrollGetBestVirtualSize() const; - - // change just the target window (unlike SetWindow which changes m_win as - // well) - void DoSetTargetWindow(wxWindow *target); - - // delete the event handler we installed - void DeleteEvtHandler(); - - // this function should be overridden to return the size available for - // m_targetWindow inside m_win of the given size - // - // the default implementation is only good for m_targetWindow == m_win - // case, if we're scrolling a subwindow you must override this method - virtual wxSize GetSizeAvailableForScrollTarget(const wxSize& size) - { - // returning just size from here is wrong but it was decided that it is - // not wrong enough to break the existing code (which doesn't override - // this recently added function at all) by adding this assert - // - // wxASSERT_MSG( m_targetWindow == m_win, "must be overridden" ); - - return size; - } - - - double m_scaleX; - double m_scaleY; - - wxRect m_rectToScroll; - - wxTimer *m_timerAutoScroll; - - // The number of pixels to scroll in horizontal and vertical directions - // respectively. - // - // If 0, means that the scrolling in the given direction is disabled. - int m_xScrollPixelsPerLine; - int m_yScrollPixelsPerLine; - int m_xScrollPosition; - int m_yScrollPosition; - int m_xScrollLines; - int m_yScrollLines; - int m_xScrollLinesPerPage; - int m_yScrollLinesPerPage; - - bool m_xScrollingEnabled; - bool m_yScrollingEnabled; - -#if wxUSE_MOUSEWHEEL - int m_wheelRotation; -#endif // wxUSE_MOUSEWHEEL - - wxScrollHelperEvtHandler *m_handler; - - wxDECLARE_NO_COPY_CLASS(wxScrollHelperBase); -}; - -// this macro can be used in a wxScrollHelper-derived class to forward wxWindow -// methods to corresponding wxScrollHelper methods -#define WX_FORWARD_TO_SCROLL_HELPER() \ -public: \ - virtual void PrepareDC(wxDC& dc) wxOVERRIDE { DoPrepareDC(dc); } \ - virtual bool Layout() wxOVERRIDE { return ScrollLayout(); } \ - virtual bool CanScroll(int orient) const wxOVERRIDE \ - { return IsScrollbarShown(orient); } \ - virtual void DoSetVirtualSize(int x, int y) wxOVERRIDE \ - { ScrollDoSetVirtualSize(x, y); } \ - virtual wxSize GetBestVirtualSize() const wxOVERRIDE \ - { return ScrollGetBestVirtualSize(); } - -// include the declaration of the real wxScrollHelper -#if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__) - #include "wx/gtk/scrolwin.h" -#elif defined(__WXGTK__) && !defined(__WXUNIVERSAL__) - #include "wx/gtk1/scrolwin.h" -#else - #define wxHAS_GENERIC_SCROLLWIN - #include "wx/generic/scrolwin.h" -#endif - -// ---------------------------------------------------------------------------- -// wxScrolled: a wxWindow which knows how to scroll -// ---------------------------------------------------------------------------- - -// helper class for wxScrolled below -struct WXDLLIMPEXP_CORE wxScrolledT_Helper -{ - static wxSize FilterBestSize(const wxWindow *win, - const wxScrollHelper *helper, - const wxSize& origBest); -#ifdef __WXMSW__ - static WXLRESULT FilterMSWWindowProc(WXUINT nMsg, WXLRESULT origResult); -#endif -}; - -// Scrollable window base on window type T. This used to be wxScrolledWindow, -// but wxScrolledWindow includes wxControlContainer functionality and that's -// not always desirable. -template -class wxScrolled : public T, - public wxScrollHelper, - private wxScrolledT_Helper -{ -public: - wxScrolled() : wxScrollHelper(this) { } - wxScrolled(wxWindow *parent, - wxWindowID winid = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxScrolledWindowStyle, - const wxString& name = wxPanelNameStr) - : wxScrollHelper(this) - { - Create(parent, winid, pos, size, style, name); - } - - bool Create(wxWindow *parent, - wxWindowID winid, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxScrolledWindowStyle, - const wxString& name = wxPanelNameStr) - { - m_targetWindow = this; - -#ifdef __WXMAC__ - this->MacSetClipChildren(true); -#endif - - // by default, we're scrollable in both directions (but if one of the - // styles is specified explicitly, we shouldn't add the other one - // automatically) - if ( !(style & (wxHSCROLL | wxVSCROLL)) ) - style |= wxHSCROLL | wxVSCROLL; - -#ifdef __WXOSX__ - bool retval = T::Create(parent, winid, pos, size, style, name); - if ( retval && (style & wxALWAYS_SHOW_SB) ) - ShowScrollbars(wxSHOW_SB_ALWAYS, wxSHOW_SB_ALWAYS); - return retval; -#else - if ( style & wxALWAYS_SHOW_SB ) - ShowScrollbars(wxSHOW_SB_ALWAYS, wxSHOW_SB_ALWAYS); - - return T::Create(parent, winid, pos, size, style, name); -#endif - } - -#ifdef __WXMSW__ - // we need to return a special WM_GETDLGCODE value to process just the - // arrows but let the other navigation characters through - virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) - { - return FilterMSWWindowProc(nMsg, T::MSWWindowProc(nMsg, wParam, lParam)); - } - - // Take into account the scroll origin. - virtual void MSWAdjustBrushOrg(int* xOrg, int* yOrg) const - { - CalcUnscrolledPosition(*xOrg, *yOrg, xOrg, yOrg); - } -#endif // __WXMSW__ - - WX_FORWARD_TO_SCROLL_HELPER() - -protected: - virtual wxSize DoGetBestSize() const wxOVERRIDE - { - return FilterBestSize(this, this, T::DoGetBestSize()); - } - -private: - wxDECLARE_NO_COPY_CLASS(wxScrolled); -}; - -// for compatibility with existing code, we provide wxScrolledWindow -// "typedef" for wxScrolled. It's not a real typedef because we -// want wxScrolledWindow to show in wxRTTI information (the class is widely -// used and likelihood of its wxRTTI information being used too is high): -class WXDLLIMPEXP_CORE wxScrolledWindow : public wxScrolled -{ -public: - wxScrolledWindow() : wxScrolled() {} - wxScrolledWindow(wxWindow *parent, - wxWindowID winid = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxScrolledWindowStyle, - const wxString& name = wxPanelNameStr) - : wxScrolled(parent, winid, pos, size, style, name) {} - - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxScrolledWindow); -}; - -typedef wxScrolled wxScrolledCanvas; - -#endif // _WX_SCROLWIN_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/selstore.h b/Externals/wxWidgets3/include/wx/selstore.h deleted file mode 100644 index 2cf420dc63..0000000000 --- a/Externals/wxWidgets3/include/wx/selstore.h +++ /dev/null @@ -1,124 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/selstore.h -// Purpose: wxSelectionStore stores selected items in a control -// Author: Vadim Zeitlin -// Modified by: -// Created: 08.06.03 (extracted from src/generic/listctrl.cpp) -// Copyright: (c) 2000-2003 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_SELSTORE_H_ -#define _WX_SELSTORE_H_ - -#include "wx/dynarray.h" - -// ---------------------------------------------------------------------------- -// wxSelectedIndices is just a sorted array of indices -// ---------------------------------------------------------------------------- - -inline int CMPFUNC_CONV wxUIntCmp(unsigned n1, unsigned n2) -{ - return (int)(n1 - n2); -} - -WX_DEFINE_SORTED_EXPORTED_ARRAY_CMP_INT(unsigned, wxUIntCmp, wxSelectedIndices); - -// ---------------------------------------------------------------------------- -// wxSelectionStore is used to store the selected items in the virtual -// controls, i.e. it is well suited for storing even when the control contains -// a huge (practically infinite) number of items. -// -// Of course, internally it still has to store the selected items somehow (as -// an array currently) but the advantage is that it can handle the selection -// of all items (common operation) efficiently and that it could be made even -// smarter in the future (e.g. store the selections as an array of ranges + -// individual items) without changing its API. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxSelectionStore -{ -public: - wxSelectionStore() : m_itemsSel(wxUIntCmp) { Init(); } - - // set the total number of items we handle - void SetItemCount(unsigned count); - - // special case of SetItemCount(0) - void Clear() { m_itemsSel.Clear(); m_count = 0; m_defaultState = false; } - - // must be called when new items are inserted/added - void OnItemsInserted(unsigned item, unsigned numItems); - - // must be called when an items is deleted - void OnItemDelete(unsigned item); - - // more efficient version for notifying the selection about deleting - // several items at once, return true if any of them were selected - bool OnItemsDeleted(unsigned item, unsigned numItems); - - // select one item, use SelectRange() insted if possible! - // - // returns true if the items selection really changed - bool SelectItem(unsigned item, bool select = true); - - // select the range of items (inclusive) - // - // return true and fill the itemsChanged array with the indices of items - // which have changed state if "few" of them did, otherwise return false - // (meaning that too many items changed state to bother counting them - // individually) - bool SelectRange(unsigned itemFrom, unsigned itemTo, - bool select = true, - wxArrayInt *itemsChanged = NULL); - - // return true if the given item is selected - bool IsSelected(unsigned item) const; - - // return true if no items are currently selected - bool IsEmpty() const - { - return m_defaultState ? m_itemsSel.size() == m_count - : m_itemsSel.empty(); - } - - // return the total number of selected items - unsigned GetSelectedCount() const - { - return m_defaultState ? m_count - m_itemsSel.GetCount() - : m_itemsSel.GetCount(); - } - - // type of a "cookie" used to preserve the iteration state, this is an - // opaque type, don't rely on its current representation - typedef size_t IterationState; - - // constant representing absence of selection and hence end of iteration - static const unsigned NO_SELECTION; - - // get the first selected item in index order, return NO_SELECTION if none - unsigned GetFirstSelectedItem(IterationState& cookie) const; - - // get the next selected item, return NO_SELECTION if no more - unsigned GetNextSelectedItem(IterationState& cookie) const; - -private: - // (re)init - void Init() { m_count = 0; m_defaultState = false; } - - // the total number of items we handle - unsigned m_count; - - // the default state: normally, false (i.e. off) but maybe set to true if - // there are more selected items than non selected ones - this allows to - // handle selection of all items efficiently - bool m_defaultState; - - // the array of items whose selection state is different from default - wxSelectedIndices m_itemsSel; - - wxDECLARE_NO_COPY_CLASS(wxSelectionStore); -}; - -#endif // _WX_SELSTORE_H_ - diff --git a/Externals/wxWidgets3/include/wx/settings.h b/Externals/wxWidgets3/include/wx/settings.h deleted file mode 100644 index f90ae071ba..0000000000 --- a/Externals/wxWidgets3/include/wx/settings.h +++ /dev/null @@ -1,221 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/settings.h -// Purpose: wxSystemSettings class -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_SETTINGS_H_BASE_ -#define _WX_SETTINGS_H_BASE_ - -#include "wx/colour.h" -#include "wx/font.h" - -class WXDLLIMPEXP_FWD_CORE wxWindow; - -// possible values for wxSystemSettings::GetFont() parameter -// -// NB: wxMSW assumes that they have the same values as the parameters of -// Windows GetStockObject() API, don't change the values! -enum wxSystemFont -{ - wxSYS_OEM_FIXED_FONT = 10, - wxSYS_ANSI_FIXED_FONT, - wxSYS_ANSI_VAR_FONT, - wxSYS_SYSTEM_FONT, - wxSYS_DEVICE_DEFAULT_FONT, - - // don't use: this is here just to make the values of enum elements - // coincide with the corresponding MSW constants - wxSYS_DEFAULT_PALETTE, - - // don't use: MSDN says that this is a stock object provided only - // for compatibility with 16-bit Windows versions earlier than 3.0! - wxSYS_SYSTEM_FIXED_FONT, - - wxSYS_DEFAULT_GUI_FONT, - - // this was just a temporary aberration, do not use it any more - wxSYS_ICONTITLE_FONT = wxSYS_DEFAULT_GUI_FONT -}; - -// possible values for wxSystemSettings::GetColour() parameter -// -// NB: wxMSW assumes that they have the same values as the parameters of -// Windows GetSysColor() API, don't change the values! -enum wxSystemColour -{ - wxSYS_COLOUR_SCROLLBAR, - wxSYS_COLOUR_DESKTOP, - wxSYS_COLOUR_ACTIVECAPTION, - wxSYS_COLOUR_INACTIVECAPTION, - wxSYS_COLOUR_MENU, - wxSYS_COLOUR_WINDOW, - wxSYS_COLOUR_WINDOWFRAME, - wxSYS_COLOUR_MENUTEXT, - wxSYS_COLOUR_WINDOWTEXT, - wxSYS_COLOUR_CAPTIONTEXT, - wxSYS_COLOUR_ACTIVEBORDER, - wxSYS_COLOUR_INACTIVEBORDER, - wxSYS_COLOUR_APPWORKSPACE, - wxSYS_COLOUR_HIGHLIGHT, - wxSYS_COLOUR_HIGHLIGHTTEXT, - wxSYS_COLOUR_BTNFACE, - wxSYS_COLOUR_BTNSHADOW, - wxSYS_COLOUR_GRAYTEXT, - wxSYS_COLOUR_BTNTEXT, - wxSYS_COLOUR_INACTIVECAPTIONTEXT, - wxSYS_COLOUR_BTNHIGHLIGHT, - wxSYS_COLOUR_3DDKSHADOW, - wxSYS_COLOUR_3DLIGHT, - wxSYS_COLOUR_INFOTEXT, - wxSYS_COLOUR_INFOBK, - wxSYS_COLOUR_LISTBOX, - wxSYS_COLOUR_HOTLIGHT, - wxSYS_COLOUR_GRADIENTACTIVECAPTION, - wxSYS_COLOUR_GRADIENTINACTIVECAPTION, - wxSYS_COLOUR_MENUHILIGHT, - wxSYS_COLOUR_MENUBAR, - wxSYS_COLOUR_LISTBOXTEXT, - wxSYS_COLOUR_LISTBOXHIGHLIGHTTEXT, - - wxSYS_COLOUR_MAX, - - // synonyms - wxSYS_COLOUR_BACKGROUND = wxSYS_COLOUR_DESKTOP, - wxSYS_COLOUR_3DFACE = wxSYS_COLOUR_BTNFACE, - wxSYS_COLOUR_3DSHADOW = wxSYS_COLOUR_BTNSHADOW, - wxSYS_COLOUR_BTNHILIGHT = wxSYS_COLOUR_BTNHIGHLIGHT, - wxSYS_COLOUR_3DHIGHLIGHT = wxSYS_COLOUR_BTNHIGHLIGHT, - wxSYS_COLOUR_3DHILIGHT = wxSYS_COLOUR_BTNHIGHLIGHT, - wxSYS_COLOUR_FRAMEBK = wxSYS_COLOUR_BTNFACE -}; - -// possible values for wxSystemSettings::GetMetric() index parameter -// -// NB: update the conversion table in msw/settings.cpp if you change the values -// of the elements of this enum -enum wxSystemMetric -{ - wxSYS_MOUSE_BUTTONS = 1, - wxSYS_BORDER_X, - wxSYS_BORDER_Y, - wxSYS_CURSOR_X, - wxSYS_CURSOR_Y, - wxSYS_DCLICK_X, - wxSYS_DCLICK_Y, - wxSYS_DRAG_X, - wxSYS_DRAG_Y, - wxSYS_EDGE_X, - wxSYS_EDGE_Y, - wxSYS_HSCROLL_ARROW_X, - wxSYS_HSCROLL_ARROW_Y, - wxSYS_HTHUMB_X, - wxSYS_ICON_X, - wxSYS_ICON_Y, - wxSYS_ICONSPACING_X, - wxSYS_ICONSPACING_Y, - wxSYS_WINDOWMIN_X, - wxSYS_WINDOWMIN_Y, - wxSYS_SCREEN_X, - wxSYS_SCREEN_Y, - wxSYS_FRAMESIZE_X, - wxSYS_FRAMESIZE_Y, - wxSYS_SMALLICON_X, - wxSYS_SMALLICON_Y, - wxSYS_HSCROLL_Y, - wxSYS_VSCROLL_X, - wxSYS_VSCROLL_ARROW_X, - wxSYS_VSCROLL_ARROW_Y, - wxSYS_VTHUMB_Y, - wxSYS_CAPTION_Y, - wxSYS_MENU_Y, - wxSYS_NETWORK_PRESENT, - wxSYS_PENWINDOWS_PRESENT, - wxSYS_SHOW_SOUNDS, - wxSYS_SWAP_BUTTONS, - wxSYS_DCLICK_MSEC -}; - -// possible values for wxSystemSettings::HasFeature() parameter -enum wxSystemFeature -{ - wxSYS_CAN_DRAW_FRAME_DECORATIONS = 1, - wxSYS_CAN_ICONIZE_FRAME, - wxSYS_TABLET_PRESENT -}; - -// values for different screen designs -enum wxSystemScreenType -{ - wxSYS_SCREEN_NONE = 0, // not yet defined - - wxSYS_SCREEN_TINY, // < - wxSYS_SCREEN_PDA, // >= 320x240 - wxSYS_SCREEN_SMALL, // >= 640x480 - wxSYS_SCREEN_DESKTOP // >= 800x600 -}; - -// ---------------------------------------------------------------------------- -// wxSystemSettingsNative: defines the API for wxSystemSettings class -// ---------------------------------------------------------------------------- - -// this is a namespace rather than a class: it has only non virtual static -// functions -// -// also note that the methods are implemented in the platform-specific source -// files (i.e. this is not a real base class as we can't override its virtual -// functions because it doesn't have any) - -class WXDLLIMPEXP_CORE wxSystemSettingsNative -{ -public: - // get a standard system colour - static wxColour GetColour(wxSystemColour index); - - // get a standard system font - static wxFont GetFont(wxSystemFont index); - - // get a system-dependent metric - static int GetMetric(wxSystemMetric index, wxWindow * win = NULL); - - // return true if the port has certain feature - static bool HasFeature(wxSystemFeature index); -}; - -// ---------------------------------------------------------------------------- -// include the declaration of the real platform-dependent class -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxSystemSettings : public wxSystemSettingsNative -{ -public: -#ifdef __WXUNIVERSAL__ - // in wxUniversal we want to use the theme standard colours instead of the - // system ones, otherwise wxSystemSettings is just the same as - // wxSystemSettingsNative - static wxColour GetColour(wxSystemColour index); - - // some metrics are toolkit-dependent and provided by wxUniv, some are - // lowlevel - static int GetMetric(wxSystemMetric index, wxWindow *win = NULL); -#endif // __WXUNIVERSAL__ - - // Get system screen design (desktop, pda, ..) used for - // laying out various dialogs. - static wxSystemScreenType GetScreenType(); - - // Override default. - static void SetScreenType( wxSystemScreenType screen ); - - // Value - static wxSystemScreenType ms_screen; - -}; - -#endif - // _WX_SETTINGS_H_BASE_ - diff --git a/Externals/wxWidgets3/include/wx/setup_inc.h b/Externals/wxWidgets3/include/wx/setup_inc.h deleted file mode 100644 index 4b404fbed1..0000000000 --- a/Externals/wxWidgets3/include/wx/setup_inc.h +++ /dev/null @@ -1,1490 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/setup_inc.h -// Purpose: setup.h settings -// Author: Vadim Zeitlin -// Modified by: -// Created: -// Copyright: (c) Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ---------------------------------------------------------------------------- -// global settings -// ---------------------------------------------------------------------------- - -// define this to 0 when building wxBase library - this can also be done from -// makefile/project file overriding the value here -#ifndef wxUSE_GUI - #define wxUSE_GUI 1 -#endif // wxUSE_GUI - -// ---------------------------------------------------------------------------- -// compatibility settings -// ---------------------------------------------------------------------------- - -// This setting determines the compatibility with 2.8 API: set it to 0 to -// flag all cases of using deprecated functions. -// -// Default is 1 but please try building your code with 0 as the default will -// change to 0 in the next version and the deprecated functions will disappear -// in the version after it completely. -// -// Recommended setting: 0 (please update your code) -#define WXWIN_COMPATIBILITY_2_8 0 - -// This setting determines the compatibility with 3.0 API: set it to 0 to -// flag all cases of using deprecated functions. -// -// Default is 1 but please try building your code with 0 as the default will -// change to 0 in the next version and the deprecated functions will disappear -// in the version after it completely. -// -// Recommended setting: 0 (please update your code) -#define WXWIN_COMPATIBILITY_3_0 1 - -// MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when -// default system font is used for wxWindow::GetCharWidth/Height() instead of -// the current font. -// -// Default is 0 -// -// Recommended setting: 0 -#define wxDIALOG_UNIT_COMPATIBILITY 0 - -// ---------------------------------------------------------------------------- -// debugging settings -// ---------------------------------------------------------------------------- - -// wxDEBUG_LEVEL will be defined as 1 in wx/debug.h so normally there is no -// need to define it here. You may do it for two reasons: either completely -// disable/compile out the asserts in release version (then do it inside #ifdef -// NDEBUG) or, on the contrary, enable more asserts, including the usually -// disabled ones, in the debug build (then do it inside #ifndef NDEBUG) -// -// #ifdef NDEBUG -// #define wxDEBUG_LEVEL 0 -// #else -// #define wxDEBUG_LEVEL 2 -// #endif - -// wxHandleFatalExceptions() may be used to catch the program faults at run -// time and, instead of terminating the program with a usual GPF message box, -// call the user-defined wxApp::OnFatalException() function. If you set -// wxUSE_ON_FATAL_EXCEPTION to 0, wxHandleFatalExceptions() will not work. -// -// This setting is for Win32 only and can only be enabled if your compiler -// supports Win32 structured exception handling (currently only VC++ does) -// -// Default is 1 -// -// Recommended setting: 1 if your compiler supports it. -#define wxUSE_ON_FATAL_EXCEPTION 1 - -// Set this to 1 to be able to generate a human-readable (unlike -// machine-readable minidump created by wxCrashReport::Generate()) stack back -// trace when your program crashes using wxStackWalker -// -// Default is 1 if supported by the compiler. -// -// Recommended setting: 1, set to 0 if your programs never crash -#define wxUSE_STACKWALKER 1 - -// Set this to 1 to compile in wxDebugReport class which allows you to create -// and optionally upload to your web site a debug report consisting of back -// trace of the crash (if wxUSE_STACKWALKER == 1) and other information. -// -// Default is 1 if supported by the compiler. -// -// Recommended setting: 1, it is compiled into a separate library so there -// is no overhead if you don't use it -#define wxUSE_DEBUGREPORT 1 - -// Generic comment about debugging settings: they are very useful if you don't -// use any other memory leak detection tools such as Purify/BoundsChecker, but -// are probably redundant otherwise. Also, Visual C++ CRT has the same features -// as wxWidgets memory debugging subsystem built in since version 5.0 and you -// may prefer to use it instead of built in memory debugging code because it is -// faster and more fool proof. -// -// Using VC++ CRT memory debugging is enabled by default in debug build (_DEBUG -// is defined) if wxUSE_GLOBAL_MEMORY_OPERATORS is *not* enabled (i.e. is 0) -// and if __NO_VC_CRTDBG__ is not defined. - -// The rest of the options in this section are obsolete and not supported, -// enable them at your own risk. - -// If 1, enables wxDebugContext, for writing error messages to file, etc. If -// __WXDEBUG__ is not defined, will still use the normal memory operators. -// -// Default is 0 -// -// Recommended setting: 0 -#define wxUSE_DEBUG_CONTEXT 0 - -// If 1, enables debugging versions of wxObject::new and wxObject::delete *IF* -// __WXDEBUG__ is also defined. -// -// WARNING: this code may not work with all architectures, especially if -// alignment is an issue. This switch is currently ignored for mingw / cygwin -// -// Default is 0 -// -// Recommended setting: 1 if you are not using a memory debugging tool, else 0 -#define wxUSE_MEMORY_TRACING 0 - -// In debug mode, cause new and delete to be redefined globally. -// If this causes problems (e.g. link errors which is a common problem -// especially if you use another library which also redefines the global new -// and delete), set this to 0. -// This switch is currently ignored for mingw / cygwin -// -// Default is 0 -// -// Recommended setting: 0 -#define wxUSE_GLOBAL_MEMORY_OPERATORS 0 - -// In debug mode, causes new to be defined to be WXDEBUG_NEW (see object.h). If -// this causes problems (e.g. link errors), set this to 0. You may need to set -// this to 0 if using templates (at least for VC++). This switch is currently -// ignored for MinGW/Cygwin. -// -// Default is 0 -// -// Recommended setting: 0 -#define wxUSE_DEBUG_NEW_ALWAYS 0 - - -// ---------------------------------------------------------------------------- -// Unicode support -// ---------------------------------------------------------------------------- - -// These settings are obsolete: the library is always built in Unicode mode -// now, only set wxUSE_UNICODE to 0 to compile legacy code in ANSI mode if -// absolutely necessary -- updating it is strongly recommended as the ANSI mode -// will disappear completely in future wxWidgets releases. -#ifndef wxUSE_UNICODE - #define wxUSE_UNICODE 1 -#endif - -// wxUSE_WCHAR_T is required by wxWidgets now, don't change. -#define wxUSE_WCHAR_T 1 - -// ---------------------------------------------------------------------------- -// global features -// ---------------------------------------------------------------------------- - -// Compile library in exception-safe mode? If set to 1, the library will try to -// behave correctly in presence of exceptions (even though it still will not -// use the exceptions itself) and notify the user code about any unhandled -// exceptions. If set to 0, propagation of the exceptions through the library -// code will lead to undefined behaviour -- but the code itself will be -// slightly smaller and faster. -// -// Note that like wxUSE_THREADS this option is automatically set to 0 if -// wxNO_EXCEPTIONS is defined. -// -// Default is 1 -// -// Recommended setting: depends on whether you intend to use C++ exceptions -// in your own code (1 if you do, 0 if you don't) -#define wxUSE_EXCEPTIONS 1 - -// Set wxUSE_EXTENDED_RTTI to 1 to use extended RTTI -// -// Default is 0 -// -// Recommended setting: 0 (this is still work in progress...) -#define wxUSE_EXTENDED_RTTI 0 - -// Support for message/error logging. This includes wxLogXXX() functions and -// wxLog and derived classes. Don't set this to 0 unless you really know what -// you are doing. -// -// Default is 1 -// -// Recommended setting: 1 (always) -#define wxUSE_LOG 1 - -// Recommended setting: 1 -#define wxUSE_LOGWINDOW 1 - -// Recommended setting: 1 -#define wxUSE_LOGGUI 1 - -// Recommended setting: 1 -#define wxUSE_LOG_DIALOG 1 - -// Support for command line parsing using wxCmdLineParser class. -// -// Default is 1 -// -// Recommended setting: 1 (can be set to 0 if you don't use the cmd line) -#define wxUSE_CMDLINE_PARSER 1 - -// Support for multithreaded applications: if 1, compile in thread classes -// (thread.h) and make the library a bit more thread safe. Although thread -// support is quite stable by now, you may still consider recompiling the -// library without it if you have no use for it - this will result in a -// somewhat smaller and faster operation. -// -// Notice that if wxNO_THREADS is defined, wxUSE_THREADS is automatically reset -// to 0 in wx/chkconf.h, so, for example, if you set USE_THREADS to 0 in -// build/msw/config.* file this value will have no effect. -// -// Default is 1 -// -// Recommended setting: 0 unless you do plan to develop MT applications -#define wxUSE_THREADS 1 - -// If enabled, compiles wxWidgets streams classes -// -// wx stream classes are used for image IO, process IO redirection, network -// protocols implementation and much more and so disabling this results in a -// lot of other functionality being lost. -// -// Default is 1 -// -// Recommended setting: 1 as setting it to 0 disables many other things -#define wxUSE_STREAMS 1 - -// Support for positional parameters (e.g. %1$d, %2$s ...) in wxVsnprintf. -// Note that if the system's implementation does not support positional -// parameters, setting this to 1 forces the use of the wxWidgets implementation -// of wxVsnprintf. The standard vsnprintf() supports positional parameters on -// many Unix systems but usually doesn't under Windows. -// -// Positional parameters are very useful when translating a program since using -// them in formatting strings allow translators to correctly reorder the -// translated sentences. -// -// Default is 1 -// -// Recommended setting: 1 if you want to support multiple languages -#define wxUSE_PRINTF_POS_PARAMS 1 - -// Enable the use of compiler-specific thread local storage keyword, if any. -// This is used for wxTLS_XXX() macros implementation and normally should use -// the compiler-provided support as it's simpler and more efficient, but is -// disabled under Windows in wx/msw/chkconf.h as it can't be used if wxWidgets -// is used in a dynamically loaded Win32 DLL (i.e. using LoadLibrary()) under -// XP as this triggers a bug in compiler TLS support that results in crashes -// when any TLS variables are used. -// -// If you're absolutely sure that your build of wxWidgets is never going to be -// used in such situation, either because it's not going to be linked from any -// kind of plugin or because you only target Vista or later systems, you can -// set this to 2 to force the use of compiler TLS even under MSW. -// -// Default is 1 meaning that compiler TLS is used only if it's 100% safe. -// -// Recommended setting: 2 if you want to have maximal performance and don't -// care about the scenario described above. -#define wxUSE_COMPILER_TLS 1 - -// ---------------------------------------------------------------------------- -// Interoperability with the standard library. -// ---------------------------------------------------------------------------- - -// Set wxUSE_STL to 1 to enable maximal interoperability with the standard -// library, even at the cost of backwards compatibility. -// -// Default is 0 -// -// Recommended setting: 0 as the options below already provide a relatively -// good level of interoperability and changing this option arguably isn't worth -// diverging from the official builds of the library. -#define wxUSE_STL 0 - -// This is not a real option but is used as the default value for -// wxUSE_STD_IOSTREAM, wxUSE_STD_STRING and wxUSE_STD_CONTAINERS_COMPATIBLY. -// -// Set it to 0 if you want to disable the use of all standard classes -// completely for some reason. -#define wxUSE_STD_DEFAULT 1 - -// Use standard C++ containers where it can be done without breaking backwards -// compatibility. -// -// This provides better interoperability with the standard library, e.g. with -// this option on it's possible to insert std::vector<> into many wxWidgets -// containers directly. -// -// Default is 1. -// -// Recommended setting is 1 unless you want to avoid all dependencies on the -// standard library. -#define wxUSE_STD_CONTAINERS_COMPATIBLY wxUSE_STD_DEFAULT - -// Use standard C++ containers to implement wxVector<>, wxStack<>, wxDList<> -// and wxHashXXX<> classes. If disabled, wxWidgets own (mostly compatible but -// usually more limited) implementations are used which allows to avoid the -// dependency on the C++ run-time library. -// -// Default is 0 for compatibility reasons. -// -// Recommended setting: 1 unless compatibility with the official wxWidgets -// build and/or the existing code is a concern. -#define wxUSE_STD_CONTAINERS 0 - -// Use standard C++ streams if 1 instead of wx streams in some places. If -// disabled, wx streams are used everywhere and wxWidgets doesn't depend on the -// standard streams library. -// -// Notice that enabling this does not replace wx streams with std streams -// everywhere, in a lot of places wx streams are used no matter what. -// -// Default is 1 if compiler supports it. -// -// Recommended setting: 1 if you use the standard streams anyhow and so -// dependency on the standard streams library is not a -// problem -#define wxUSE_STD_IOSTREAM wxUSE_STD_DEFAULT - -// Enable minimal interoperability with the standard C++ string class if 1. -// "Minimal" means that wxString can be constructed from std::string or -// std::wstring but can't be implicitly converted to them. You need to enable -// the option below for the latter. -// -// Default is 1 for most compilers. -// -// Recommended setting: 1 unless you want to ensure your program doesn't use -// the standard C++ library at all. -#define wxUSE_STD_STRING wxUSE_STD_DEFAULT - -// Make wxString as much interchangeable with std::[w]string as possible, in -// particular allow implicit conversion of wxString to either of these classes. -// This comes at a price (or a benefit, depending on your point of view) of not -// allowing implicit conversion to "const char *" and "const wchar_t *". -// -// Because a lot of existing code relies on these conversions, this option is -// disabled by default but can be enabled for your build if you don't care -// about compatibility. -// -// Default is 0 if wxUSE_STL has its default value or 1 if it is enabled. -// -// Recommended setting: 0 to remain compatible with the official builds of -// wxWidgets. -#define wxUSE_STD_STRING_CONV_IN_WXSTRING wxUSE_STL - -// VC++ 4.2 and above allows and but you can't mix -// them. Set this option to 1 to use , 0 to use . -// -// Note that newer compilers (including VC++ 7.1 and later) don't support -// wxUSE_IOSTREAMH == 1 and so will be used anyhow. -// -// Default is 0. -// -// Recommended setting: 0, only set to 1 if you use a really old compiler -#define wxUSE_IOSTREAMH 0 - - -// ---------------------------------------------------------------------------- -// non GUI features selection -// ---------------------------------------------------------------------------- - -// Set wxUSE_LONGLONG to 1 to compile the wxLongLong class. This is a 64 bit -// integer which is implemented in terms of native 64 bit integers if any or -// uses emulation otherwise. -// -// This class is required by wxDateTime and so you should enable it if you want -// to use wxDateTime. For most modern platforms, it will use the native 64 bit -// integers in which case (almost) all of its functions are inline and it -// almost does not take any space, so there should be no reason to switch it -// off. -// -// Recommended setting: 1 -#define wxUSE_LONGLONG 1 - -// Set wxUSE_BASE64 to 1, to compile in Base64 support. This is required for -// storing binary data in wxConfig on most platforms. -// -// Default is 1. -// -// Recommended setting: 1 (but can be safely disabled if you don't use it) -#define wxUSE_BASE64 1 - -// Set this to 1 to be able to use wxEventLoop even in console applications -// (i.e. using base library only, without GUI). This is mostly useful for -// processing socket events but is also necessary to use timers in console -// applications -// -// Default is 1. -// -// Recommended setting: 1 (but can be safely disabled if you don't use it) -#define wxUSE_CONSOLE_EVENTLOOP 1 - -// Set wxUSE_(F)FILE to 1 to compile wx(F)File classes. wxFile uses low level -// POSIX functions for file access, wxFFile uses ANSI C stdio.h functions. -// -// Default is 1 -// -// Recommended setting: 1 (wxFile is highly recommended as it is required by -// i18n code, wxFileConfig and others) -#define wxUSE_FILE 1 -#define wxUSE_FFILE 1 - -// Use wxFSVolume class providing access to the configured/active mount points -// -// Default is 1 -// -// Recommended setting: 1 (but may be safely disabled if you don't use it) -#define wxUSE_FSVOLUME 1 - -// Use wxStandardPaths class which allows to retrieve some standard locations -// in the file system -// -// Default is 1 -// -// Recommended setting: 1 (may be disabled to save space, but not much) -#define wxUSE_STDPATHS 1 - -// use wxTextBuffer class: required by wxTextFile -#define wxUSE_TEXTBUFFER 1 - -// use wxTextFile class: requires wxFile and wxTextBuffer, required by -// wxFileConfig -#define wxUSE_TEXTFILE 1 - -// i18n support: _() macro, wxLocale class. Requires wxTextFile. -#define wxUSE_INTL 1 - -// Provide wxFoo_l() functions similar to standard foo() functions but taking -// an extra locale parameter. -// -// Notice that this is fully implemented only for the systems providing POSIX -// xlocale support or Microsoft Visual C++ >= 8 (which provides proprietary -// almost-equivalent of xlocale functions), otherwise wxFoo_l() functions will -// only work for the current user locale and "C" locale. You can use -// wxHAS_XLOCALE_SUPPORT to test whether the full support is available. -// -// Default is 1 -// -// Recommended setting: 1 but may be disabled if you are writing programs -// running only in C locale anyhow -#define wxUSE_XLOCALE 1 - -// Set wxUSE_DATETIME to 1 to compile the wxDateTime and related classes which -// allow to manipulate dates, times and time intervals. -// -// Requires: wxUSE_LONGLONG -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_DATETIME 1 - -// Set wxUSE_TIMER to 1 to compile wxTimer class -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_TIMER 1 - -// Use wxStopWatch clas. -// -// Default is 1 -// -// Recommended setting: 1 (needed by wxSocket) -#define wxUSE_STOPWATCH 1 - -// Set wxUSE_FSWATCHER to 1 if you want to enable wxFileSystemWatcher -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_FSWATCHER 1 - -// Setting wxUSE_CONFIG to 1 enables the use of wxConfig and related classes -// which allow the application to store its settings in the persistent -// storage. Setting this to 1 will also enable on-demand creation of the -// global config object in wxApp. -// -// See also wxUSE_CONFIG_NATIVE below. -// -// Recommended setting: 1 -#define wxUSE_CONFIG 1 - -// If wxUSE_CONFIG is 1, you may choose to use either the native config -// classes under Windows (using .INI files under Win16 and the registry under -// Win32) or the portable text file format used by the config classes under -// Unix. -// -// Default is 1 to use native classes. Note that you may still use -// wxFileConfig even if you set this to 1 - just the config object created by -// default for the applications needs will be a wxRegConfig or wxIniConfig and -// not wxFileConfig. -// -// Recommended setting: 1 -#define wxUSE_CONFIG_NATIVE 1 - -// If wxUSE_DIALUP_MANAGER is 1, compile in wxDialUpManager class which allows -// to connect/disconnect from the network and be notified whenever the dial-up -// network connection is established/terminated. Requires wxUSE_DYNAMIC_LOADER. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_DIALUP_MANAGER 1 - -// Compile in classes for run-time DLL loading and function calling. -// Required by wxUSE_DIALUP_MANAGER. -// -// This setting is for Win32 only -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_DYNLIB_CLASS 1 - -// experimental, don't use for now -#define wxUSE_DYNAMIC_LOADER 1 - -// Set to 1 to use socket classes -#define wxUSE_SOCKETS 1 - -// Set to 1 to use ipv6 socket classes (requires wxUSE_SOCKETS) -// -// Notice that currently setting this option under Windows will result in -// programs which can only run on recent OS versions (with ws2_32.dll -// installed) which is why it is disabled by default. -// -// Default is 1. -// -// Recommended setting: 1 if you need IPv6 support -#define wxUSE_IPV6 0 - -// Set to 1 to enable virtual file systems (required by wxHTML) -#define wxUSE_FILESYSTEM 1 - -// Set to 1 to enable virtual ZIP filesystem (requires wxUSE_FILESYSTEM) -#define wxUSE_FS_ZIP 1 - -// Set to 1 to enable virtual archive filesystem (requires wxUSE_FILESYSTEM) -#define wxUSE_FS_ARCHIVE 1 - -// Set to 1 to enable virtual Internet filesystem (requires wxUSE_FILESYSTEM) -#define wxUSE_FS_INET 1 - -// wxArchive classes for accessing archives such as zip and tar -#define wxUSE_ARCHIVE_STREAMS 1 - -// Set to 1 to compile wxZipInput/OutputStream classes. -#define wxUSE_ZIPSTREAM 1 - -// Set to 1 to compile wxTarInput/OutputStream classes. -#define wxUSE_TARSTREAM 1 - -// Set to 1 to compile wxZlibInput/OutputStream classes. Also required by -// wxUSE_LIBPNG -#define wxUSE_ZLIB 1 - -// If enabled, the code written by Apple will be used to write, in a portable -// way, float on the disk. See extended.c for the license which is different -// from wxWidgets one. -// -// Default is 1. -// -// Recommended setting: 1 unless you don't like the license terms (unlikely) -#define wxUSE_APPLE_IEEE 1 - -// Joystick support class -#define wxUSE_JOYSTICK 1 - -// wxFontEnumerator class -#define wxUSE_FONTENUM 1 - -// wxFontMapper class -#define wxUSE_FONTMAP 1 - -// wxMimeTypesManager class -#define wxUSE_MIMETYPE 1 - -// wxProtocol and related classes: if you want to use either of wxFTP, wxHTTP -// or wxURL you need to set this to 1. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_PROTOCOL 1 - -// The settings for the individual URL schemes -#define wxUSE_PROTOCOL_FILE 1 -#define wxUSE_PROTOCOL_FTP 1 -#define wxUSE_PROTOCOL_HTTP 1 - -// Define this to use wxURL class. -#define wxUSE_URL 1 - -// Define this to use native platform url and protocol support. -// Currently valid only for MS-Windows. -// Note: if you set this to 1, you can open ftp/http/gopher sites -// and obtain a valid input stream for these sites -// even when you set wxUSE_PROTOCOL_FTP/HTTP to 0. -// Doing so reduces the code size. -// -// This code is experimental and subject to change. -#define wxUSE_URL_NATIVE 0 - -// Support for wxVariant class used in several places throughout the library, -// notably in wxDataViewCtrl API. -// -// Default is 1. -// -// Recommended setting: 1 unless you want to reduce the library size as much as -// possible in which case setting this to 0 can gain up to 100KB. -#define wxUSE_VARIANT 1 - -// Support for wxAny class, the successor for wxVariant. -// -// Default is 1. -// -// Recommended setting: 1 unless you want to reduce the library size by a small amount, -// or your compiler cannot for some reason cope with complexity of templates used. -#define wxUSE_ANY 1 - -// Support for regular expression matching via wxRegEx class: enable this to -// use POSIX regular expressions in your code. You need to compile regex -// library from src/regex to use it under Windows. -// -// Default is 0 -// -// Recommended setting: 1 if your compiler supports it, if it doesn't please -// contribute us a makefile for src/regex for it -#define wxUSE_REGEX 1 - -// wxSystemOptions class -#define wxUSE_SYSTEM_OPTIONS 1 - -// wxSound class -#define wxUSE_SOUND 1 - -// Use wxMediaCtrl -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_MEDIACTRL 1 - -// Use wxWidget's XRC XML-based resource system. Recommended. -// -// Default is 1 -// -// Recommended setting: 1 (requires wxUSE_XML) -#define wxUSE_XRC 1 - -// XML parsing classes. Note that their API will change in the future, so -// using wxXmlDocument and wxXmlNode in your app is not recommended. -// -// Default is the same as wxUSE_XRC, i.e. 1 by default. -// -// Recommended setting: 1 (required by XRC) -#define wxUSE_XML wxUSE_XRC - -// Use wxWidget's AUI docking system -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_AUI 1 - -// Use wxWidget's Ribbon classes for interfaces -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_RIBBON 1 - -// Use wxPropertyGrid. -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_PROPGRID 1 - -// Use wxStyledTextCtrl, a wxWidgets implementation of Scintilla. -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_STC 1 - -// Use wxWidget's web viewing classes -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_WEBVIEW 1 - -// Use the IE wxWebView backend -// -// Default is 1 on MSW -// -// Recommended setting: 1 -#ifdef __WXMSW__ -#define wxUSE_WEBVIEW_IE 1 -#else -#define wxUSE_WEBVIEW_IE 0 -#endif - -// Use the WebKit wxWebView backend -// -// Default is 1 on GTK and OSX -// -// Recommended setting: 1 -#if defined(__WXGTK__) || defined(__WXOSX__) -#define wxUSE_WEBVIEW_WEBKIT 1 -#else -#define wxUSE_WEBVIEW_WEBKIT 0 -#endif - -// Enable wxGraphicsContext and related classes for a modern 2D drawing API. -// -// Default is 1 except if you're using a non-Microsoft compiler under Windows -// as only MSVC is known to ship with at least gdiplus.h which is required to -// compile GDI+-based implementation of wxGraphicsContext (MSVC10 and later -// versions also include d2d1.h required for Direct2D-based implementation). -// For other compilers (e.g. mingw32) you may need to install the headers (and -// just the headers) yourself. If you do, change the setting below manually. -// -// Recommended setting: 1 if supported by the compilation environment - -// notice that we can't use wxCHECK_VISUALC_VERSION() here as this file is -// included from wx/platform.h before wxCHECK_VISUALC_VERSION() is defined -#ifdef _MSC_VER -# define wxUSE_GRAPHICS_CONTEXT 1 -#else - // Disable support for other Windows compilers, enable it if your compiler - // comes with new enough SDK or you installed the headers manually. - // - // Notice that this will be set by configure under non-Windows platforms - // anyhow so the value there is not important. -# define wxUSE_GRAPHICS_CONTEXT 0 -#endif - -// Enable wxGraphicsContext implementation using Cairo library. -// -// This is not needed under Windows and detected automatically by configure -// under other systems, however you may set this to 1 manually if you installed -// Cairo under Windows yourself and prefer to use it instead the native GDI+ -// implementation. -// -// Default is 0 -// -// Recommended setting: 0 -#define wxUSE_CAIRO 0 - - -// ---------------------------------------------------------------------------- -// Individual GUI controls -// ---------------------------------------------------------------------------- - -// You must set wxUSE_CONTROLS to 1 if you are using any controls at all -// (without it, wxControl class is not compiled) -// -// Default is 1 -// -// Recommended setting: 1 (don't change except for very special programs) -#define wxUSE_CONTROLS 1 - -// Support markup in control labels, i.e. provide wxControl::SetLabelMarkup(). -// Currently markup is supported only by a few controls and only some ports but -// their number will increase with time. -// -// Default is 1 -// -// Recommended setting: 1 (may be set to 0 if you want to save on code size) -#define wxUSE_MARKUP 1 - -// wxPopupWindow class is a top level transient window. It is currently used -// to implement wxTipWindow -// -// Default is 1 -// -// Recommended setting: 1 (may be set to 0 if you don't wxUSE_TIPWINDOW) -#define wxUSE_POPUPWIN 1 - -// wxTipWindow allows to implement the custom tooltips, it is used by the -// context help classes. Requires wxUSE_POPUPWIN. -// -// Default is 1 -// -// Recommended setting: 1 (may be set to 0) -#define wxUSE_TIPWINDOW 1 - -// Each of the settings below corresponds to one wxWidgets control. They are -// all switched on by default but may be disabled if you are sure that your -// program (including any standard dialogs it can show!) doesn't need them and -// if you desperately want to save some space. If you use any of these you must -// set wxUSE_CONTROLS as well. -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_ACTIVITYINDICATOR 1 // wxActivityIndicator -#define wxUSE_ANIMATIONCTRL 1 // wxAnimationCtrl -#define wxUSE_BANNERWINDOW 1 // wxBannerWindow -#define wxUSE_BUTTON 1 // wxButton -#define wxUSE_BMPBUTTON 1 // wxBitmapButton -#define wxUSE_CALENDARCTRL 1 // wxCalendarCtrl -#define wxUSE_CHECKBOX 1 // wxCheckBox -#define wxUSE_CHECKLISTBOX 1 // wxCheckListBox (requires wxUSE_OWNER_DRAWN) -#define wxUSE_CHOICE 1 // wxChoice -#define wxUSE_COLLPANE 1 // wxCollapsiblePane -#define wxUSE_COLOURPICKERCTRL 1 // wxColourPickerCtrl -#define wxUSE_COMBOBOX 1 // wxComboBox -#define wxUSE_COMMANDLINKBUTTON 1 // wxCommandLinkButton -#define wxUSE_DATAVIEWCTRL 1 // wxDataViewCtrl -#define wxUSE_DATEPICKCTRL 1 // wxDatePickerCtrl -#define wxUSE_DIRPICKERCTRL 1 // wxDirPickerCtrl -#define wxUSE_EDITABLELISTBOX 1 // wxEditableListBox -#define wxUSE_FILECTRL 1 // wxFileCtrl -#define wxUSE_FILEPICKERCTRL 1 // wxFilePickerCtrl -#define wxUSE_FONTPICKERCTRL 1 // wxFontPickerCtrl -#define wxUSE_GAUGE 1 // wxGauge -#define wxUSE_HEADERCTRL 1 // wxHeaderCtrl -#define wxUSE_HYPERLINKCTRL 1 // wxHyperlinkCtrl -#define wxUSE_LISTBOX 1 // wxListBox -#define wxUSE_LISTCTRL 1 // wxListCtrl -#define wxUSE_RADIOBOX 1 // wxRadioBox -#define wxUSE_RADIOBTN 1 // wxRadioButton -#define wxUSE_RICHMSGDLG 1 // wxRichMessageDialog -#define wxUSE_SCROLLBAR 1 // wxScrollBar -#define wxUSE_SEARCHCTRL 1 // wxSearchCtrl -#define wxUSE_SLIDER 1 // wxSlider -#define wxUSE_SPINBTN 1 // wxSpinButton -#define wxUSE_SPINCTRL 1 // wxSpinCtrl -#define wxUSE_STATBOX 1 // wxStaticBox -#define wxUSE_STATLINE 1 // wxStaticLine -#define wxUSE_STATTEXT 1 // wxStaticText -#define wxUSE_STATBMP 1 // wxStaticBitmap -#define wxUSE_TEXTCTRL 1 // wxTextCtrl -#define wxUSE_TIMEPICKCTRL 1 // wxTimePickerCtrl -#define wxUSE_TOGGLEBTN 1 // requires wxButton -#define wxUSE_TREECTRL 1 // wxTreeCtrl -#define wxUSE_TREELISTCTRL 1 // wxTreeListCtrl - -// Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR -// below either wxStatusBar95 or a generic wxStatusBar will be used. -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_STATUSBAR 1 - -// Two status bar implementations are available under Win32: the generic one -// or the wrapper around native control. For native look and feel the native -// version should be used. -// -// Default is 1 for the platforms where native status bar is supported. -// -// Recommended setting: 1 (there is no advantage in using the generic one) -#define wxUSE_NATIVE_STATUSBAR 1 - -// wxToolBar related settings: if wxUSE_TOOLBAR is 0, don't compile any toolbar -// classes at all. Otherwise, use the native toolbar class unless -// wxUSE_TOOLBAR_NATIVE is 0. -// -// Default is 1 for all settings. -// -// Recommended setting: 1 for wxUSE_TOOLBAR and wxUSE_TOOLBAR_NATIVE. -#define wxUSE_TOOLBAR 1 -#define wxUSE_TOOLBAR_NATIVE 1 - -// wxNotebook is a control with several "tabs" located on one of its sides. It -// may be used to logically organise the data presented to the user instead of -// putting everything in one huge dialog. It replaces wxTabControl and related -// classes of wxWin 1.6x. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_NOTEBOOK 1 - -// wxListbook control is similar to wxNotebook but uses wxListCtrl instead of -// the tabs -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_LISTBOOK 1 - -// wxChoicebook control is similar to wxNotebook but uses wxChoice instead of -// the tabs -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_CHOICEBOOK 1 - -// wxTreebook control is similar to wxNotebook but uses wxTreeCtrl instead of -// the tabs -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_TREEBOOK 1 - -// wxToolbook control is similar to wxNotebook but uses wxToolBar instead of -// tabs -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_TOOLBOOK 1 - -// wxTaskBarIcon is a small notification icon shown in the system toolbar or -// dock. -// -// Default is 1. -// -// Recommended setting: 1 (but can be set to 0 if you don't need it) -#define wxUSE_TASKBARICON 1 - -// wxGrid class -// -// Default is 1, set to 0 to cut down compilation time and binaries size if you -// don't use it. -// -// Recommended setting: 1 -// -#define wxUSE_GRID 1 - -// wxMiniFrame class: a frame with narrow title bar -// -// Default is 1. -// -// Recommended setting: 1 (it doesn't cost almost anything) -#define wxUSE_MINIFRAME 1 - -// wxComboCtrl and related classes: combobox with custom popup window and -// not necessarily a listbox. -// -// Default is 1. -// -// Recommended setting: 1 but can be safely set to 0 except for wxUniv where it -// it used by wxComboBox -#define wxUSE_COMBOCTRL 1 - -// wxOwnerDrawnComboBox is a custom combobox allowing to paint the combobox -// items. -// -// Default is 1. -// -// Recommended setting: 1 but can be safely set to 0, except where it is -// needed as a base class for generic wxBitmapComboBox. -#define wxUSE_ODCOMBOBOX 1 - -// wxBitmapComboBox is a combobox that can have images in front of text items. -// -// Default is 1. -// -// Recommended setting: 1 but can be safely set to 0 -#define wxUSE_BITMAPCOMBOBOX 1 - -// wxRearrangeCtrl is a wxCheckListBox with two buttons allowing to move items -// up and down in it. It is also used as part of wxRearrangeDialog. -// -// Default is 1. -// -// Recommended setting: 1 but can be safely set to 0 (currently used only by -// wxHeaderCtrl) -#define wxUSE_REARRANGECTRL 1 - -// wxAddRemoveCtrl is a composite control containing a control showing some -// items (e.g. wxListBox, wxListCtrl, wxTreeCtrl, wxDataViewCtrl, ...) and "+"/ -// "-" buttons allowing to add and remove items to/from the control. -// -// Default is 1. -// -// Recommended setting: 1 but can be safely set to 0 if you don't need it (not -// used by the library itself). -#define wxUSE_ADDREMOVECTRL 1 - -// ---------------------------------------------------------------------------- -// Miscellaneous GUI stuff -// ---------------------------------------------------------------------------- - -// wxAcceleratorTable/Entry classes and support for them in wxMenu(Bar) -#define wxUSE_ACCEL 1 - -// Use the standard art provider. The icons returned by this provider are -// embedded into the library as XPMs so disabling it reduces the library size -// somewhat but this should only be done if you use your own custom art -// provider returning the icons or never use any icons not provided by the -// native art provider (which might not be implemented at all for some -// platforms) or by the Tango icons provider (if it's not itself disabled -// below). -// -// Default is 1. -// -// Recommended setting: 1 unless you use your own custom art provider. -#define wxUSE_ARTPROVIDER_STD 1 - -// Use art provider providing Tango icons: this art provider has higher quality -// icons than the default ones using smaller size XPM icons without -// transparency but the embedded PNG icons add to the library size. -// -// Default is 1 under non-GTK ports. Under wxGTK the native art provider using -// the GTK+ stock icons replaces it so it is normally not necessary. -// -// Recommended setting: 1 but can be turned off to reduce the library size. -#define wxUSE_ARTPROVIDER_TANGO 1 - -// Hotkey support (currently Windows only) -#define wxUSE_HOTKEY 1 - -// Use wxCaret: a class implementing a "cursor" in a text control (called caret -// under Windows). -// -// Default is 1. -// -// Recommended setting: 1 (can be safely set to 0, not used by the library) -#define wxUSE_CARET 1 - -// Use wxDisplay class: it allows enumerating all displays on a system and -// their geometries as well as finding the display on which the given point or -// window lies. -// -// Default is 1. -// -// Recommended setting: 1 if you need it, can be safely set to 0 otherwise -#define wxUSE_DISPLAY 1 - -// Miscellaneous geometry code: needed for Canvas library -#define wxUSE_GEOMETRY 1 - -// Use wxImageList. This class is needed by wxNotebook, wxTreeCtrl and -// wxListCtrl. -// -// Default is 1. -// -// Recommended setting: 1 (set it to 0 if you don't use any of the controls -// enumerated above, then this class is mostly useless too) -#define wxUSE_IMAGLIST 1 - -// Use wxInfoBar class. -// -// Default is 1. -// -// Recommended setting: 1 (but can be disabled without problems as nothing -// depends on it) -#define wxUSE_INFOBAR 1 - -// Use wxMenu, wxMenuBar, wxMenuItem. -// -// Default is 1. -// -// Recommended setting: 1 (can't be disabled under MSW) -#define wxUSE_MENUS 1 - -// Use wxNotificationMessage. -// -// wxNotificationMessage allows to show non-intrusive messages to the user -// using balloons, banners, popups or whatever is the appropriate method for -// the current platform. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_NOTIFICATION_MESSAGE 1 - -// wxPreferencesEditor provides a common API for different ways of presenting -// the standard "Preferences" or "Properties" dialog under different platforms -// (e.g. some use modal dialogs, some use modeless ones; some apply the changes -// immediately while others require an explicit "Apply" button). -// -// Default is 1. -// -// Recommended setting: 1 (but can be safely disabled if you don't use it) -#define wxUSE_PREFERENCES_EDITOR 1 - -// wxRichToolTip is a customizable tooltip class which has more functionality -// than the stock (but native, unlike this class) wxToolTip. -// -// Default is 1. -// -// Recommended setting: 1 (but can be safely set to 0 if you don't need it) -#define wxUSE_RICHTOOLTIP 1 - -// Use wxSashWindow class. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_SASH 1 - -// Use wxSplitterWindow class. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_SPLITTER 1 - -// Use wxToolTip and wxWindow::Set/GetToolTip() methods. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_TOOLTIPS 1 - -// wxValidator class and related methods -#define wxUSE_VALIDATORS 1 - -// Use reference counted ID management: this means that wxWidgets will track -// the automatically allocated ids (those used when you use wxID_ANY when -// creating a window, menu or toolbar item &c) instead of just supposing that -// the program never runs out of them. This is mostly useful only under wxMSW -// where the total ids range is limited to SHRT_MIN..SHRT_MAX and where -// long-running programs can run into problems with ids reuse without this. On -// the other platforms, where the ids have the full int range, this shouldn't -// be necessary. -#ifdef __WXMSW__ -#define wxUSE_AUTOID_MANAGEMENT 1 -#else -#define wxUSE_AUTOID_MANAGEMENT 0 -#endif - -// ---------------------------------------------------------------------------- -// common dialogs -// ---------------------------------------------------------------------------- - -// On rare occasions (e.g. using DJGPP) may want to omit common dialogs (e.g. -// file selector, printer dialog). Switching this off also switches off the -// printing architecture and interactive wxPrinterDC. -// -// Default is 1 -// -// Recommended setting: 1 (unless it really doesn't work) -#define wxUSE_COMMON_DIALOGS 1 - -// wxBusyInfo displays window with message when app is busy. Works in same way -// as wxBusyCursor -#define wxUSE_BUSYINFO 1 - -// Use single/multiple choice dialogs. -// -// Default is 1 -// -// Recommended setting: 1 (used in the library itself) -#define wxUSE_CHOICEDLG 1 - -// Use colour picker dialog -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_COLOURDLG 1 - -// wxDirDlg class for getting a directory name from user -#define wxUSE_DIRDLG 1 - -// TODO: setting to choose the generic or native one - -// Use file open/save dialogs. -// -// Default is 1 -// -// Recommended setting: 1 (used in many places in the library itself) -#define wxUSE_FILEDLG 1 - -// Use find/replace dialogs. -// -// Default is 1 -// -// Recommended setting: 1 (but may be safely set to 0) -#define wxUSE_FINDREPLDLG 1 - -// Use font picker dialog -// -// Default is 1 -// -// Recommended setting: 1 (used in the library itself) -#define wxUSE_FONTDLG 1 - -// Use wxMessageDialog and wxMessageBox. -// -// Default is 1 -// -// Recommended setting: 1 (used in the library itself) -#define wxUSE_MSGDLG 1 - -// progress dialog class for lengthy operations -#define wxUSE_PROGRESSDLG 1 - -// Set to 0 to disable the use of the native progress dialog (currently only -// available under MSW and suffering from some bugs there, hence this option). -#define wxUSE_NATIVE_PROGRESSDLG 1 - -// support for startup tips (wxShowTip &c) -#define wxUSE_STARTUP_TIPS 1 - -// text entry dialog and wxGetTextFromUser function -#define wxUSE_TEXTDLG 1 - -// number entry dialog -#define wxUSE_NUMBERDLG 1 - -// splash screen class -#define wxUSE_SPLASH 1 - -// wizards -#define wxUSE_WIZARDDLG 1 - -// Compile in wxAboutBox() function showing the standard "About" dialog. -// -// Default is 1 -// -// Recommended setting: 1 but can be set to 0 to save some space if you don't -// use this function -#define wxUSE_ABOUTDLG 1 - -// wxFileHistory class -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_FILE_HISTORY 1 - -// ---------------------------------------------------------------------------- -// Metafiles support -// ---------------------------------------------------------------------------- - -// Windows supports the graphics format known as metafile which is, though not -// portable, is widely used under Windows and so is supported by wxWin (under -// Windows only, of course). Win16 (Win3.1) used the so-called "Window -// MetaFiles" or WMFs which were replaced with "Enhanced MetaFiles" or EMFs in -// Win32 (Win9x, NT, 2000). Both of these are supported in wxWin and, by -// default, WMFs will be used under Win16 and EMFs under Win32. This may be -// changed by setting wxUSE_WIN_METAFILES_ALWAYS to 1 and/or setting -// wxUSE_ENH_METAFILE to 0. You may also set wxUSE_METAFILE to 0 to not compile -// in any metafile related classes at all. -// -// Default is 1 for wxUSE_ENH_METAFILE and 0 for wxUSE_WIN_METAFILES_ALWAYS. -// -// Recommended setting: default or 0 for everything for portable programs. -#define wxUSE_METAFILE 1 -#define wxUSE_ENH_METAFILE 1 -#define wxUSE_WIN_METAFILES_ALWAYS 0 - -// ---------------------------------------------------------------------------- -// Big GUI components -// ---------------------------------------------------------------------------- - -// Set to 0 to disable MDI support. -// -// Requires wxUSE_NOTEBOOK under platforms other than MSW. -// -// Default is 1. -// -// Recommended setting: 1, can be safely set to 0. -#define wxUSE_MDI 1 - -// Set to 0 to disable document/view architecture -#define wxUSE_DOC_VIEW_ARCHITECTURE 1 - -// Set to 0 to disable MDI document/view architecture -// -// Requires wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE -#define wxUSE_MDI_ARCHITECTURE 1 - -// Set to 0 to disable print/preview architecture code -#define wxUSE_PRINTING_ARCHITECTURE 1 - -// wxHTML sublibrary allows to display HTML in wxWindow programs and much, -// much more. -// -// Default is 1. -// -// Recommended setting: 1 (wxHTML is great!), set to 0 if you want compile a -// smaller library. -#define wxUSE_HTML 1 - -// Setting wxUSE_GLCANVAS to 1 enables OpenGL support. You need to have OpenGL -// headers and libraries to be able to compile the library with wxUSE_GLCANVAS -// set to 1 and, under Windows, also to add opengl32.lib and glu32.lib to the -// list of libraries used to link your application (although this is done -// implicitly for Microsoft Visual C++ users). -// -// Default is 1. -// -// Recommended setting: 1 if you intend to use OpenGL, can be safely set to 0 -// otherwise. -#define wxUSE_GLCANVAS 1 - -// wxRichTextCtrl allows editing of styled text. -// -// Default is 1. -// -// Recommended setting: 1, set to 0 if you want compile a -// smaller library. -#define wxUSE_RICHTEXT 1 - -// ---------------------------------------------------------------------------- -// Data transfer -// ---------------------------------------------------------------------------- - -// Use wxClipboard class for clipboard copy/paste. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_CLIPBOARD 1 - -// Use wxDataObject and related classes. Needed for clipboard and OLE drag and -// drop -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_DATAOBJ 1 - -// Use wxDropTarget and wxDropSource classes for drag and drop (this is -// different from "built in" drag and drop in wxTreeCtrl which is always -// available). Requires wxUSE_DATAOBJ. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_DRAG_AND_DROP 1 - -// Use wxAccessible for enhanced and customisable accessibility. -// Depends on wxUSE_OLE. -// -// Default is 0. -// -// Recommended setting (at present): 0 -#define wxUSE_ACCESSIBILITY 0 - -// ---------------------------------------------------------------------------- -// miscellaneous settings -// ---------------------------------------------------------------------------- - -// wxSingleInstanceChecker class allows to verify at startup if another program -// instance is running. -// -// Default is 1 -// -// Recommended setting: 1 (the class is tiny, disabling it won't save much -// space) -#define wxUSE_SNGLINST_CHECKER 1 - -#define wxUSE_DRAGIMAGE 1 - -#define wxUSE_IPC 1 - // 0 for no interprocess comms -#define wxUSE_HELP 1 - // 0 for no help facility - -// Should we use MS HTML help for wxHelpController? If disabled, neither -// wxCHMHelpController nor wxBestHelpController are available. -// -// Default is 1 under MSW, 0 is always used for the other platforms. -// -// Recommended setting: 1, only set to 0 if you have trouble compiling -// wxCHMHelpController (could be a problem with really ancient compilers) -#define wxUSE_MS_HTML_HELP 1 - - -// Use wxHTML-based help controller? -#define wxUSE_WXHTML_HELP 1 - -#define wxUSE_CONSTRAINTS 1 - // 0 for no window layout constraint system - -#define wxUSE_SPLINES 1 - // 0 for no splines - -#define wxUSE_MOUSEWHEEL 1 - // Include mouse wheel support - -// Compile wxUIActionSimulator class? -#define wxUSE_UIACTIONSIMULATOR 1 - -// ---------------------------------------------------------------------------- -// wxDC classes for various output formats -// ---------------------------------------------------------------------------- - -// Set to 1 for PostScript device context. -#define wxUSE_POSTSCRIPT 0 - -// Set to 1 to use font metric files in GetTextExtent -#define wxUSE_AFM_FOR_POSTSCRIPT 1 - -// Set to 1 to compile in support for wxSVGFileDC, a wxDC subclass which allows -// to create files in SVG (Scalable Vector Graphics) format. -#define wxUSE_SVG 1 - -// Should wxDC provide SetTransformMatrix() and related methods? -// -// Default is 1 but can be set to 0 if this functionality is not used. Notice -// that currently only wxMSW supports this so setting this to 0 doesn't change -// much for non-MSW platforms (although it will still save a few bytes -// probably). -// -// Recommended setting: 1. -#define wxUSE_DC_TRANSFORM_MATRIX 1 - -// ---------------------------------------------------------------------------- -// image format support -// ---------------------------------------------------------------------------- - -// wxImage supports many different image formats which can be configured at -// compile-time. BMP is always supported, others are optional and can be safely -// disabled if you don't plan to use images in such format sometimes saving -// substantial amount of code in the final library. -// -// Some formats require an extra library which is included in wxWin sources -// which is mentioned if it is the case. - -// Set to 1 for wxImage support (recommended). -#define wxUSE_IMAGE 1 - -// Set to 1 for PNG format support (requires libpng). Also requires wxUSE_ZLIB. -#define wxUSE_LIBPNG 1 - -// Set to 1 for JPEG format support (requires libjpeg) -#define wxUSE_LIBJPEG 1 - -// Set to 1 for TIFF format support (requires libtiff) -#define wxUSE_LIBTIFF 1 - -// Set to 1 for TGA format support (loading only) -#define wxUSE_TGA 1 - -// Set to 1 for GIF format support -#define wxUSE_GIF 1 - -// Set to 1 for PNM format support -#define wxUSE_PNM 1 - -// Set to 1 for PCX format support -#define wxUSE_PCX 1 - -// Set to 1 for IFF format support (Amiga format) -#define wxUSE_IFF 0 - -// Set to 1 for XPM format support -#define wxUSE_XPM 1 - -// Set to 1 for MS Icons and Cursors format support -#define wxUSE_ICO_CUR 1 - -// Set to 1 to compile in wxPalette class -#define wxUSE_PALETTE 1 - -// ---------------------------------------------------------------------------- -// wxUniversal-only options -// ---------------------------------------------------------------------------- - -// Set to 1 to enable compilation of all themes, this is the default -#define wxUSE_ALL_THEMES 1 - -// Set to 1 to enable the compilation of individual theme if wxUSE_ALL_THEMES -// is unset, if it is set these options are not used; notice that metal theme -// uses Win32 one -#define wxUSE_THEME_GTK 0 -#define wxUSE_THEME_METAL 0 -#define wxUSE_THEME_MONO 0 -#define wxUSE_THEME_WIN32 0 - - diff --git a/Externals/wxWidgets3/include/wx/setup_redirect.h b/Externals/wxWidgets3/include/wx/setup_redirect.h deleted file mode 100644 index 7648c198ba..0000000000 --- a/Externals/wxWidgets3/include/wx/setup_redirect.h +++ /dev/null @@ -1,17 +0,0 @@ -/* - * wx/setup.h - * - * This file should not normally be used, except where makefiles - * have not yet been adjusted to take into account of the new scheme - * whereby a setup.h is created under the lib directory. - * - * Copyright: (c) Vadim Zeitlin - * Licence: wxWindows Licence - */ - -#ifdef __WXMSW__ -#include "wx/msw/setup.h" -#else -#error Please adjust your include path to pick up the wx/setup.h file under lib first. -#endif - diff --git a/Externals/wxWidgets3/include/wx/sharedptr.h b/Externals/wxWidgets3/include/wx/sharedptr.h deleted file mode 100644 index a9b6442c09..0000000000 --- a/Externals/wxWidgets3/include/wx/sharedptr.h +++ /dev/null @@ -1,169 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/sharedptr.h -// Purpose: Shared pointer based on the counted_ptr<> template, which -// is in the public domain -// Author: Robert Roebling, Yonat Sharon -// Copyright: Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_SHAREDPTR_H_ -#define _WX_SHAREDPTR_H_ - -#include "wx/defs.h" -#include "wx/atomic.h" - -// ---------------------------------------------------------------------------- -// wxSharedPtr: A smart pointer with non-intrusive reference counting. -// ---------------------------------------------------------------------------- - -template -class wxSharedPtr -{ -public: - typedef T element_type; - - wxEXPLICIT wxSharedPtr( T* ptr = NULL ) - : m_ref(NULL) - { - if (ptr) - m_ref = new reftype(ptr); - } - - template - wxEXPLICIT wxSharedPtr(T* ptr, Deleter d) - : m_ref(NULL) - { - if (ptr) - m_ref = new reftype_with_deleter(ptr, d); - } - - ~wxSharedPtr() { Release(); } - wxSharedPtr(const wxSharedPtr& tocopy) { Acquire(tocopy.m_ref); } - - wxSharedPtr& operator=( const wxSharedPtr& tocopy ) - { - if (this != &tocopy) - { - Release(); - Acquire(tocopy.m_ref); - } - return *this; - } - - wxSharedPtr& operator=( T* ptr ) - { - if (get() != ptr) - { - Release(); - if (ptr) - m_ref = new reftype(ptr); - } - return *this; - } - - // test for pointer validity: defining conversion to unspecified_bool_type - // and not more obvious bool to avoid implicit conversions to integer types - typedef T *(wxSharedPtr::*unspecified_bool_type)() const; - operator unspecified_bool_type() const - { - if (m_ref && m_ref->m_ptr) - return &wxSharedPtr::get; - else - return NULL; - } - - T& operator*() const - { - wxASSERT(m_ref != NULL); - wxASSERT(m_ref->m_ptr != NULL); - return *(m_ref->m_ptr); - } - - T* operator->() const - { - wxASSERT(m_ref != NULL); - wxASSERT(m_ref->m_ptr != NULL); - return m_ref->m_ptr; - } - - T* get() const - { - return m_ref ? m_ref->m_ptr : NULL; - } - - void reset( T* ptr = NULL ) - { - Release(); - if (ptr) - m_ref = new reftype(ptr); - } - - template - void reset(T* ptr, Deleter d) - { - Release(); - if (ptr) - m_ref = new reftype_with_deleter(ptr, d); - } - - bool unique() const { return (m_ref ? m_ref->m_count == 1 : true); } - long use_count() const { return (m_ref ? (long)m_ref->m_count : 0); } - -private: - - struct reftype - { - reftype(T* ptr) : m_ptr(ptr), m_count(1) {} - virtual ~reftype() {} - virtual void delete_ptr() { delete m_ptr; } - - T* m_ptr; - wxAtomicInt m_count; - }; - - template - struct reftype_with_deleter : public reftype - { - reftype_with_deleter(T* ptr, Deleter d) : reftype(ptr), m_deleter(d) {} - virtual void delete_ptr() { m_deleter(this->m_ptr); } - - Deleter m_deleter; - }; - - reftype* m_ref; - - void Acquire(reftype* ref) - { - m_ref = ref; - if (ref) - wxAtomicInc( ref->m_count ); - } - - void Release() - { - if (m_ref) - { - if (!wxAtomicDec( m_ref->m_count )) - { - m_ref->delete_ptr(); - delete m_ref; - } - m_ref = NULL; - } - } -}; - -template -bool operator == (wxSharedPtr const &a, wxSharedPtr const &b ) -{ - return a.get() == b.get(); -} - -template -bool operator != (wxSharedPtr const &a, wxSharedPtr const &b ) -{ - return a.get() != b.get(); -} - -#endif // _WX_SHAREDPTR_H_ diff --git a/Externals/wxWidgets3/include/wx/simplebook.h b/Externals/wxWidgets3/include/wx/simplebook.h deleted file mode 100644 index 4d604bac8e..0000000000 --- a/Externals/wxWidgets3/include/wx/simplebook.h +++ /dev/null @@ -1,222 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/simplebook.h -// Purpose: wxBookCtrlBase-derived class without any controller. -// Author: Vadim Zeitlin -// Created: 2012-08-21 -// Copyright: (c) 2012 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_SIMPLEBOOK_H_ -#define _WX_SIMPLEBOOK_H_ - -#include "wx/bookctrl.h" - -#if wxUSE_BOOKCTRL - -#include "wx/vector.h" - -// ---------------------------------------------------------------------------- -// wxSimplebook: a book control without any user-actionable controller. -// ---------------------------------------------------------------------------- - -// NB: This class doesn't use DLL export declaration as it's fully inline. - -class wxSimplebook : public wxBookCtrlBase -{ -public: - wxSimplebook() - { - Init(); - } - - wxSimplebook(wxWindow *parent, - wxWindowID winid = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxEmptyString) - : wxBookCtrlBase(parent, winid, pos, size, style | wxBK_TOP, name) - { - Init(); - } - - bool Create(wxWindow *parent, - wxWindowID winid = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxEmptyString) - { - return wxBookCtrlBase::Create(parent, winid, pos, size, style | wxBK_TOP, name); - } - - - // Methods specific to this class. - - // A method allowing to add a new page without any label (which is unused - // by this control) and show it immediately. - bool ShowNewPage(wxWindow* page) - { - return AddPage(page, wxString(), true /* select it */); - } - - - // Set effect to use for showing/hiding pages. - void SetEffects(wxShowEffect showEffect, wxShowEffect hideEffect) - { - m_showEffect = showEffect; - m_hideEffect = hideEffect; - } - - // Or the same effect for both of them. - void SetEffect(wxShowEffect effect) - { - SetEffects(effect, effect); - } - - // And the same for time outs. - void SetEffectsTimeouts(unsigned showTimeout, unsigned hideTimeout) - { - m_showTimeout = showTimeout; - m_hideTimeout = hideTimeout; - } - - void SetEffectTimeout(unsigned timeout) - { - SetEffectsTimeouts(timeout, timeout); - } - - - // Implement base class pure virtual methods. - - // Page management - virtual bool InsertPage(size_t n, - wxWindow *page, - const wxString& text, - bool bSelect = false, - int imageId = NO_IMAGE) wxOVERRIDE - { - if ( !wxBookCtrlBase::InsertPage(n, page, text, bSelect, imageId) ) - return false; - - m_pageTexts.insert(m_pageTexts.begin() + n, text); - - if ( !DoSetSelectionAfterInsertion(n, bSelect) ) - page->Hide(); - - return true; - } - - virtual int SetSelection(size_t n) wxOVERRIDE - { - return DoSetSelection(n, SetSelection_SendEvent); - } - - virtual int ChangeSelection(size_t n) wxOVERRIDE - { - return DoSetSelection(n); - } - - // Neither labels nor images are supported but we still store the labels - // just in case the user code attaches some importance to them. - virtual bool SetPageText(size_t n, const wxString& strText) wxOVERRIDE - { - wxCHECK_MSG( n < GetPageCount(), false, wxS("Invalid page") ); - - m_pageTexts[n] = strText; - - return true; - } - - virtual wxString GetPageText(size_t n) const wxOVERRIDE - { - wxCHECK_MSG( n < GetPageCount(), wxString(), wxS("Invalid page") ); - - return m_pageTexts[n]; - } - - virtual bool SetPageImage(size_t WXUNUSED(n), int WXUNUSED(imageId)) wxOVERRIDE - { - return false; - } - - virtual int GetPageImage(size_t WXUNUSED(n)) const wxOVERRIDE - { - return NO_IMAGE; - } - -protected: - virtual void UpdateSelectedPage(size_t newsel) wxOVERRIDE - { - m_selection = (int)newsel; - } - - virtual wxBookCtrlEvent* CreatePageChangingEvent() const wxOVERRIDE - { - return new wxBookCtrlEvent(wxEVT_BOOKCTRL_PAGE_CHANGING, - GetId()); - } - - virtual void MakeChangedEvent(wxBookCtrlEvent& event) wxOVERRIDE - { - event.SetEventType(wxEVT_BOOKCTRL_PAGE_CHANGED); - } - - virtual wxWindow *DoRemovePage(size_t page) wxOVERRIDE - { - wxWindow* const win = wxBookCtrlBase::DoRemovePage(page); - if ( win ) - { - m_pageTexts.erase(m_pageTexts.begin() + page); - - DoSetSelectionAfterRemoval(page); - } - - return win; - } - - virtual void DoSize() wxOVERRIDE - { - wxWindow* const page = GetCurrentPage(); - if ( page ) - page->SetSize(GetPageRect()); - } - - virtual void DoShowPage(wxWindow* page, bool show) wxOVERRIDE - { - if ( show ) - page->ShowWithEffect(m_showEffect, m_showTimeout); - else - page->HideWithEffect(m_hideEffect, m_hideTimeout); - } - -private: - void Init() - { - // We don't need any border as we don't have anything to separate the - // page contents from. - SetInternalBorder(0); - - // No effects by default. - m_showEffect = - m_hideEffect = wxSHOW_EFFECT_NONE; - - m_showTimeout = - m_hideTimeout = 0; - } - - wxVector m_pageTexts; - - wxShowEffect m_showEffect, - m_hideEffect; - - unsigned m_showTimeout, - m_hideTimeout; - - wxDECLARE_NO_COPY_CLASS(wxSimplebook); -}; - -#endif // wxUSE_BOOKCTRL - -#endif // _WX_SIMPLEBOOK_H_ diff --git a/Externals/wxWidgets3/include/wx/sizer.h b/Externals/wxWidgets3/include/wx/sizer.h deleted file mode 100644 index 14b446a71a..0000000000 --- a/Externals/wxWidgets3/include/wx/sizer.h +++ /dev/null @@ -1,1324 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/sizer.h -// Purpose: provide wxSizer class for layout -// Author: Robert Roebling and Robin Dunn -// Modified by: Ron Lee, Vadim Zeitlin (wxSizerFlags) -// Created: -// Copyright: (c) Robin Dunn, Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __WXSIZER_H__ -#define __WXSIZER_H__ - -#include "wx/defs.h" - -#include "wx/window.h" - -//--------------------------------------------------------------------------- -// classes -//--------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxButton; -class WXDLLIMPEXP_FWD_CORE wxBoxSizer; -class WXDLLIMPEXP_FWD_CORE wxSizerItem; -class WXDLLIMPEXP_FWD_CORE wxSizer; - -#ifndef wxUSE_BORDER_BY_DEFAULT - #define wxUSE_BORDER_BY_DEFAULT 1 -#endif - -// ---------------------------------------------------------------------------- -// wxSizerFlags: flags used for an item in the sizer -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxSizerFlags -{ -public: - // construct the flags object initialized with the given proportion (0 by - // default) - wxSizerFlags(int proportion = 0) : m_proportion(proportion) - { - m_flags = 0; - m_borderInPixels = 0; - } - - // setters for all sizer flags, they all return the object itself so that - // calls to them can be chained - - wxSizerFlags& Proportion(int proportion) - { - m_proportion = proportion; - return *this; - } - - wxSizerFlags& Expand() - { - m_flags |= wxEXPAND; - return *this; - } - - // notice that Align() replaces the current alignment flags, use specific - // methods below such as Top(), Left() &c if you want to set just the - // vertical or horizontal alignment - wxSizerFlags& Align(int alignment) // combination of wxAlignment values - { - m_flags &= ~wxALIGN_MASK; - m_flags |= alignment; - - return *this; - } - - // some shortcuts for Align() - wxSizerFlags& Centre() { return Align(wxALIGN_CENTRE); } - wxSizerFlags& Center() { return Centre(); } - - wxSizerFlags& CentreVertical() { return Align(wxALIGN_CENTRE_VERTICAL); } - wxSizerFlags& CenterVertical() { return CentreVertical(); } - - wxSizerFlags& CentreHorizontal() { return Align(wxALIGN_CENTRE_HORIZONTAL); } - wxSizerFlags& CenterHorizontal() { return CentreHorizontal(); } - - wxSizerFlags& Top() - { - m_flags &= ~(wxALIGN_BOTTOM | wxALIGN_CENTRE_VERTICAL); - return *this; - } - - wxSizerFlags& Left() - { - m_flags &= ~(wxALIGN_RIGHT | wxALIGN_CENTRE_HORIZONTAL); - return *this; - } - - wxSizerFlags& Right() - { - m_flags = (m_flags & ~wxALIGN_CENTRE_HORIZONTAL) | wxALIGN_RIGHT; - return *this; - } - - wxSizerFlags& Bottom() - { - m_flags = (m_flags & ~wxALIGN_CENTRE_VERTICAL) | wxALIGN_BOTTOM; - return *this; - } - - - // default border size used by Border() below - static int GetDefaultBorder() - { -#if wxUSE_BORDER_BY_DEFAULT - #ifdef __WXGTK20__ - // GNOME HIG says to use 6px as the base unit: - // http://library.gnome.org/devel/hig-book/stable/design-window.html.en - return 6; - #elif defined(__WXMAC__) - // Not sure if this is really the correct size for the border. - return 5; - #else - // For the other platforms, we need to scale raw pixel values using the - // current DPI, do it once (and cache the result) in another function. - #define wxNEEDS_BORDER_IN_PX - - // We don't react to dynamic DPI changes, so we can cache the values of - // the border in on-screen pixels after computing it once. This - // could/should change in the future. - if ( !ms_defaultBorderInPx ) - ms_defaultBorderInPx = DoGetDefaultBorderInPx(); - - return ms_defaultBorderInPx; - #endif -#else - return 0; -#endif - } - - - wxSizerFlags& Border(int direction, int borderInPixels) - { - wxCHECK_MSG( !(direction & ~wxALL), *this, - wxS("direction must be a combination of wxDirection ") - wxS("enum values.") ); - - m_flags &= ~wxALL; - m_flags |= direction; - - m_borderInPixels = borderInPixels; - - return *this; - } - - wxSizerFlags& Border(int direction = wxALL) - { -#if wxUSE_BORDER_BY_DEFAULT - return Border(direction, GetDefaultBorder()); -#else - // no borders by default on limited size screen - wxUnusedVar(direction); - - return *this; -#endif - } - - wxSizerFlags& DoubleBorder(int direction = wxALL) - { -#if wxUSE_BORDER_BY_DEFAULT - return Border(direction, 2*GetDefaultBorder()); -#else - wxUnusedVar(direction); - - return *this; -#endif - } - - wxSizerFlags& TripleBorder(int direction = wxALL) - { -#if wxUSE_BORDER_BY_DEFAULT - return Border(direction, 3*GetDefaultBorder()); -#else - wxUnusedVar(direction); - - return *this; -#endif - } - - wxSizerFlags& HorzBorder() - { -#if wxUSE_BORDER_BY_DEFAULT - return Border(wxLEFT | wxRIGHT, GetDefaultBorder()); -#else - return *this; -#endif - } - - wxSizerFlags& DoubleHorzBorder() - { -#if wxUSE_BORDER_BY_DEFAULT - return Border(wxLEFT | wxRIGHT, 2*GetDefaultBorder()); -#else - return *this; -#endif - } - - // setters for the others flags - wxSizerFlags& Shaped() - { - m_flags |= wxSHAPED; - - return *this; - } - - wxSizerFlags& FixedMinSize() - { - m_flags |= wxFIXED_MINSIZE; - - return *this; - } - - // makes the item ignore window's visibility status - wxSizerFlags& ReserveSpaceEvenIfHidden() - { - m_flags |= wxRESERVE_SPACE_EVEN_IF_HIDDEN; - return *this; - } - - // accessors for wxSizer only - int GetProportion() const { return m_proportion; } - int GetFlags() const { return m_flags; } - int GetBorderInPixels() const { return m_borderInPixels; } - -private: -#ifdef wxNEEDS_BORDER_IN_PX - static int DoGetDefaultBorderInPx(); - - static int ms_defaultBorderInPx; -#endif // wxNEEDS_BORDER_IN_PX - - int m_proportion; - int m_flags; - int m_borderInPixels; -}; - - -// ---------------------------------------------------------------------------- -// wxSizerSpacer: used by wxSizerItem to represent a spacer -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxSizerSpacer -{ -public: - wxSizerSpacer(const wxSize& size) : m_size(size), m_isShown(true) { } - - void SetSize(const wxSize& size) { m_size = size; } - const wxSize& GetSize() const { return m_size; } - - void Show(bool show) { m_isShown = show; } - bool IsShown() const { return m_isShown; } - -private: - // the size, in pixel - wxSize m_size; - - // is the spacer currently shown? - bool m_isShown; -}; - -// ---------------------------------------------------------------------------- -// wxSizerItem -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxSizerItem : public wxObject -{ -public: - // window - wxSizerItem( wxWindow *window, - int proportion=0, - int flag=0, - int border=0, - wxObject* userData=NULL ); - - // window with flags - wxSizerItem(wxWindow *window, const wxSizerFlags& flags) - { - Init(flags); - - DoSetWindow(window); - } - - // subsizer - wxSizerItem( wxSizer *sizer, - int proportion=0, - int flag=0, - int border=0, - wxObject* userData=NULL ); - - // sizer with flags - wxSizerItem(wxSizer *sizer, const wxSizerFlags& flags) - { - Init(flags); - - DoSetSizer(sizer); - } - - // spacer - wxSizerItem( int width, - int height, - int proportion=0, - int flag=0, - int border=0, - wxObject* userData=NULL); - - // spacer with flags - wxSizerItem(int width, int height, const wxSizerFlags& flags) - { - Init(flags); - - DoSetSpacer(wxSize(width, height)); - } - - wxSizerItem(); - virtual ~wxSizerItem(); - - virtual void DeleteWindows(); - - // Enable deleting the SizerItem without destroying the contained sizer. - void DetachSizer() { m_sizer = NULL; } - - virtual wxSize GetSize() const; - virtual wxSize CalcMin(); - virtual void SetDimension( const wxPoint& pos, const wxSize& size ); - - wxSize GetMinSize() const - { return m_minSize; } - wxSize GetMinSizeWithBorder() const; - - wxSize GetMaxSize() const - { return IsWindow() ? m_window->GetMaxSize() : wxDefaultSize; } - wxSize GetMaxSizeWithBorder() const; - - void SetMinSize(const wxSize& size) - { - if ( IsWindow() ) - m_window->SetMinSize(size); - m_minSize = size; - } - void SetMinSize( int x, int y ) - { SetMinSize(wxSize(x, y)); } - void SetInitSize( int x, int y ) - { SetMinSize(wxSize(x, y)); } - - // if either of dimensions is zero, ratio is assumed to be 1 - // to avoid "divide by zero" errors - void SetRatio(int width, int height) - { m_ratio = (width && height) ? ((float) width / (float) height) : 1; } - void SetRatio(const wxSize& size) - { SetRatio(size.x, size.y); } - void SetRatio(float ratio) - { m_ratio = ratio; } - float GetRatio() const - { return m_ratio; } - - virtual wxRect GetRect() { return m_rect; } - - // set a sizer item id (different from a window id, all sizer items, - // including spacers, can have an associated id) - void SetId(int id) { m_id = id; } - int GetId() const { return m_id; } - - bool IsWindow() const { return m_kind == Item_Window; } - bool IsSizer() const { return m_kind == Item_Sizer; } - bool IsSpacer() const { return m_kind == Item_Spacer; } - - void SetProportion( int proportion ) - { m_proportion = proportion; } - int GetProportion() const - { return m_proportion; } - void SetFlag( int flag ) - { m_flag = flag; } - int GetFlag() const - { return m_flag; } - void SetBorder( int border ) - { m_border = border; } - int GetBorder() const - { return m_border; } - - wxWindow *GetWindow() const - { return m_kind == Item_Window ? m_window : NULL; } - wxSizer *GetSizer() const - { return m_kind == Item_Sizer ? m_sizer : NULL; } - wxSize GetSpacer() const; - - // This function behaves obviously for the windows and spacers but for the - // sizers it returns true if any sizer element is shown and only returns - // false if all of them are hidden. Also, it always returns true if - // wxRESERVE_SPACE_EVEN_IF_HIDDEN flag was used. - bool IsShown() const; - - void Show(bool show); - - void SetUserData(wxObject* userData) - { delete m_userData; m_userData = userData; } - wxObject* GetUserData() const - { return m_userData; } - wxPoint GetPosition() const - { return m_pos; } - - // Called once the first component of an item has been decided. This is - // used in algorithms that depend on knowing the size in one direction - // before the min size in the other direction can be known. - // Returns true if it made use of the information (and min size was changed). - bool InformFirstDirection( int direction, int size, int availableOtherDir=-1 ); - - // these functions delete the current contents of the item if it's a sizer - // or a spacer but not if it is a window - void AssignWindow(wxWindow *window) - { - Free(); - DoSetWindow(window); - } - - void AssignSizer(wxSizer *sizer) - { - Free(); - DoSetSizer(sizer); - } - - void AssignSpacer(const wxSize& size) - { - Free(); - DoSetSpacer(size); - } - - void AssignSpacer(int w, int h) { AssignSpacer(wxSize(w, h)); } - -#if WXWIN_COMPATIBILITY_2_8 - // these functions do not free the old sizer/spacer and so can easily - // provoke the memory leaks and so shouldn't be used, use Assign() instead - wxDEPRECATED( void SetWindow(wxWindow *window) ); - wxDEPRECATED( void SetSizer(wxSizer *sizer) ); - wxDEPRECATED( void SetSpacer(const wxSize& size) ); - wxDEPRECATED( void SetSpacer(int width, int height) ); -#endif // WXWIN_COMPATIBILITY_2_8 - -protected: - // common part of several ctors - void Init() { m_userData = NULL; m_kind = Item_None; } - - // common part of ctors taking wxSizerFlags - void Init(const wxSizerFlags& flags); - - // free current contents - void Free(); - - // common parts of Set/AssignXXX() - void DoSetWindow(wxWindow *window); - void DoSetSizer(wxSizer *sizer); - void DoSetSpacer(const wxSize& size); - - // Add the border specified for this item to the given size - // if it's != wxDefaultSize, just return wxDefaultSize otherwise. - wxSize AddBorderToSize(const wxSize& size) const; - - // discriminated union: depending on m_kind one of the fields is valid - enum - { - Item_None, - Item_Window, - Item_Sizer, - Item_Spacer, - Item_Max - } m_kind; - union - { - wxWindow *m_window; - wxSizer *m_sizer; - wxSizerSpacer *m_spacer; - }; - - wxPoint m_pos; - wxSize m_minSize; - int m_proportion; - int m_border; - int m_flag; - int m_id; - - // on screen rectangle of this item (not including borders) - wxRect m_rect; - - // Aspect ratio can always be calculated from m_size, - // but this would cause precision loss when the window - // is shrunk. It is safer to preserve the initial value. - float m_ratio; - - wxObject *m_userData; - -private: - wxDECLARE_CLASS(wxSizerItem); - wxDECLARE_NO_COPY_CLASS(wxSizerItem); -}; - -WX_DECLARE_EXPORTED_LIST( wxSizerItem, wxSizerItemList ); - - -//--------------------------------------------------------------------------- -// wxSizer -//--------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxSizer: public wxObject, public wxClientDataContainer -{ -public: - wxSizer() { m_containingWindow = NULL; } - virtual ~wxSizer(); - - // methods for adding elements to the sizer: there are Add/Insert/Prepend - // overloads for each of window/sizer/spacer/wxSizerItem - wxSizerItem* Add(wxWindow *window, - int proportion = 0, - int flag = 0, - int border = 0, - wxObject* userData = NULL); - wxSizerItem* Add(wxSizer *sizer, - int proportion = 0, - int flag = 0, - int border = 0, - wxObject* userData = NULL); - wxSizerItem* Add(int width, - int height, - int proportion = 0, - int flag = 0, - int border = 0, - wxObject* userData = NULL); - wxSizerItem* Add( wxWindow *window, const wxSizerFlags& flags); - wxSizerItem* Add( wxSizer *sizer, const wxSizerFlags& flags); - wxSizerItem* Add( int width, int height, const wxSizerFlags& flags); - wxSizerItem* Add( wxSizerItem *item); - - virtual wxSizerItem *AddSpacer(int size); - wxSizerItem* AddStretchSpacer(int prop = 1); - - wxSizerItem* Insert(size_t index, - wxWindow *window, - int proportion = 0, - int flag = 0, - int border = 0, - wxObject* userData = NULL); - wxSizerItem* Insert(size_t index, - wxSizer *sizer, - int proportion = 0, - int flag = 0, - int border = 0, - wxObject* userData = NULL); - wxSizerItem* Insert(size_t index, - int width, - int height, - int proportion = 0, - int flag = 0, - int border = 0, - wxObject* userData = NULL); - wxSizerItem* Insert(size_t index, - wxWindow *window, - const wxSizerFlags& flags); - wxSizerItem* Insert(size_t index, - wxSizer *sizer, - const wxSizerFlags& flags); - wxSizerItem* Insert(size_t index, - int width, - int height, - const wxSizerFlags& flags); - - // NB: do _not_ override this function in the derived classes, this one is - // virtual for compatibility reasons only to allow old code overriding - // it to continue to work, override DoInsert() instead in the new code - virtual wxSizerItem* Insert(size_t index, wxSizerItem *item); - - wxSizerItem* InsertSpacer(size_t index, int size); - wxSizerItem* InsertStretchSpacer(size_t index, int prop = 1); - - wxSizerItem* Prepend(wxWindow *window, - int proportion = 0, - int flag = 0, - int border = 0, - wxObject* userData = NULL); - wxSizerItem* Prepend(wxSizer *sizer, - int proportion = 0, - int flag = 0, - int border = 0, - wxObject* userData = NULL); - wxSizerItem* Prepend(int width, - int height, - int proportion = 0, - int flag = 0, - int border = 0, - wxObject* userData = NULL); - wxSizerItem* Prepend(wxWindow *window, const wxSizerFlags& flags); - wxSizerItem* Prepend(wxSizer *sizer, const wxSizerFlags& flags); - wxSizerItem* Prepend(int width, int height, const wxSizerFlags& flags); - wxSizerItem* Prepend(wxSizerItem *item); - - wxSizerItem* PrependSpacer(int size); - wxSizerItem* PrependStretchSpacer(int prop = 1); - - // set (or possibly unset if window is NULL) or get the window this sizer - // is used in - void SetContainingWindow(wxWindow *window); - wxWindow *GetContainingWindow() const { return m_containingWindow; } - - virtual bool Remove( wxSizer *sizer ); - virtual bool Remove( int index ); - - virtual bool Detach( wxWindow *window ); - virtual bool Detach( wxSizer *sizer ); - virtual bool Detach( int index ); - - virtual bool Replace( wxWindow *oldwin, wxWindow *newwin, bool recursive = false ); - virtual bool Replace( wxSizer *oldsz, wxSizer *newsz, bool recursive = false ); - virtual bool Replace( size_t index, wxSizerItem *newitem ); - - virtual void Clear( bool delete_windows = false ); - virtual void DeleteWindows(); - - // Inform sizer about the first direction that has been decided (by parent item) - // Returns true if it made use of the information (and recalculated min size) - virtual bool InformFirstDirection( int WXUNUSED(direction), int WXUNUSED(size), int WXUNUSED(availableOtherDir) ) - { return false; } - - void SetMinSize( int width, int height ) - { DoSetMinSize( width, height ); } - void SetMinSize( const wxSize& size ) - { DoSetMinSize( size.x, size.y ); } - - // Searches recursively - bool SetItemMinSize( wxWindow *window, int width, int height ) - { return DoSetItemMinSize( window, width, height ); } - bool SetItemMinSize( wxWindow *window, const wxSize& size ) - { return DoSetItemMinSize( window, size.x, size.y ); } - - // Searches recursively - bool SetItemMinSize( wxSizer *sizer, int width, int height ) - { return DoSetItemMinSize( sizer, width, height ); } - bool SetItemMinSize( wxSizer *sizer, const wxSize& size ) - { return DoSetItemMinSize( sizer, size.x, size.y ); } - - bool SetItemMinSize( size_t index, int width, int height ) - { return DoSetItemMinSize( index, width, height ); } - bool SetItemMinSize( size_t index, const wxSize& size ) - { return DoSetItemMinSize( index, size.x, size.y ); } - - wxSize GetSize() const - { return m_size; } - wxPoint GetPosition() const - { return m_position; } - - // Calculate the minimal size or return m_minSize if bigger. - wxSize GetMinSize(); - - // These virtual functions are used by the layout algorithm: first - // CalcMin() is called to calculate the minimal size of the sizer and - // prepare for laying it out and then RecalcSizes() is called to really - // update all the sizer items - virtual wxSize CalcMin() = 0; - virtual void RecalcSizes() = 0; - - virtual void Layout(); - - wxSize ComputeFittingClientSize(wxWindow *window); - wxSize ComputeFittingWindowSize(wxWindow *window); - - wxSize Fit( wxWindow *window ); - void FitInside( wxWindow *window ); - void SetSizeHints( wxWindow *window ); -#if WXWIN_COMPATIBILITY_2_8 - // This only calls FitInside() since 2.9 - wxDEPRECATED( void SetVirtualSizeHints( wxWindow *window ) ); -#endif - - wxSizerItemList& GetChildren() - { return m_children; } - const wxSizerItemList& GetChildren() const - { return m_children; } - - void SetDimension(const wxPoint& pos, const wxSize& size) - { - m_position = pos; - m_size = size; - Layout(); - - // This call is required for wxWrapSizer to be able to calculate its - // minimal size correctly. - InformFirstDirection(wxHORIZONTAL, size.x, size.y); - } - void SetDimension(int x, int y, int width, int height) - { SetDimension(wxPoint(x, y), wxSize(width, height)); } - - size_t GetItemCount() const { return m_children.GetCount(); } - bool IsEmpty() const { return m_children.IsEmpty(); } - - wxSizerItem* GetItem( wxWindow *window, bool recursive = false ); - wxSizerItem* GetItem( wxSizer *sizer, bool recursive = false ); - wxSizerItem* GetItem( size_t index ); - wxSizerItem* GetItemById( int id, bool recursive = false ); - - // Manage whether individual scene items are considered - // in the layout calculations or not. - bool Show( wxWindow *window, bool show = true, bool recursive = false ); - bool Show( wxSizer *sizer, bool show = true, bool recursive = false ); - bool Show( size_t index, bool show = true ); - - bool Hide( wxSizer *sizer, bool recursive = false ) - { return Show( sizer, false, recursive ); } - bool Hide( wxWindow *window, bool recursive = false ) - { return Show( window, false, recursive ); } - bool Hide( size_t index ) - { return Show( index, false ); } - - bool IsShown( wxWindow *window ) const; - bool IsShown( wxSizer *sizer ) const; - bool IsShown( size_t index ) const; - - // Recursively call wxWindow::Show () on all sizer items. - virtual void ShowItems (bool show); - - void Show(bool show) { ShowItems(show); } - - // This is the ShowItems() counterpart and returns true if any of the sizer - // items are shown. - virtual bool AreAnyItemsShown() const; - -protected: - wxSize m_size; - wxSize m_minSize; - wxPoint m_position; - wxSizerItemList m_children; - - // the window this sizer is used in, can be NULL - wxWindow *m_containingWindow; - - wxSize GetMaxClientSize( wxWindow *window ) const; - wxSize GetMinClientSize( wxWindow *window ); - wxSize VirtualFitSize( wxWindow *window ); - - virtual void DoSetMinSize( int width, int height ); - virtual bool DoSetItemMinSize( wxWindow *window, int width, int height ); - virtual bool DoSetItemMinSize( wxSizer *sizer, int width, int height ); - virtual bool DoSetItemMinSize( size_t index, int width, int height ); - - // insert a new item into m_children at given index and return the item - // itself - virtual wxSizerItem* DoInsert(size_t index, wxSizerItem *item); - -private: - wxDECLARE_CLASS(wxSizer); -}; - -//--------------------------------------------------------------------------- -// wxGridSizer -//--------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxGridSizer: public wxSizer -{ -public: - // ctors specifying the number of columns only: number of rows will be - // deduced automatically depending on the number of sizer elements - wxGridSizer( int cols, int vgap, int hgap ); - wxGridSizer( int cols, const wxSize& gap = wxSize(0, 0) ); - - // ctors specifying the number of rows and columns - wxGridSizer( int rows, int cols, int vgap, int hgap ); - wxGridSizer( int rows, int cols, const wxSize& gap ); - - virtual void RecalcSizes() wxOVERRIDE; - virtual wxSize CalcMin() wxOVERRIDE; - - void SetCols( int cols ) - { - wxASSERT_MSG( cols >= 0, "Number of columns must be non-negative"); - m_cols = cols; - } - - void SetRows( int rows ) - { - wxASSERT_MSG( rows >= 0, "Number of rows must be non-negative"); - m_rows = rows; - } - - void SetVGap( int gap ) { m_vgap = gap; } - void SetHGap( int gap ) { m_hgap = gap; } - int GetCols() const { return m_cols; } - int GetRows() const { return m_rows; } - int GetVGap() const { return m_vgap; } - int GetHGap() const { return m_hgap; } - - int GetEffectiveColsCount() const { return m_cols ? m_cols : CalcCols(); } - int GetEffectiveRowsCount() const { return m_rows ? m_rows : CalcRows(); } - - // return the number of total items and the number of columns and rows - // (for internal use only) - int CalcRowsCols(int& rows, int& cols) const; - -protected: - // the number of rows/columns in the sizer, if 0 then it is determined - // dynamically depending on the total number of items - int m_rows; - int m_cols; - - // gaps between rows and columns - int m_vgap; - int m_hgap; - - virtual wxSizerItem *DoInsert(size_t index, wxSizerItem *item) wxOVERRIDE; - - void SetItemBounds( wxSizerItem *item, int x, int y, int w, int h ); - - // returns the number of columns/rows needed for the current total number - // of children (and the fixed number of rows/columns) - int CalcCols() const - { - wxCHECK_MSG - ( - m_rows, 0, - "Can't calculate number of cols if number of rows is not specified" - ); - - return int(m_children.GetCount() + m_rows - 1) / m_rows; - } - - int CalcRows() const - { - wxCHECK_MSG - ( - m_cols, 0, - "Can't calculate number of cols if number of rows is not specified" - ); - - return int(m_children.GetCount() + m_cols - 1) / m_cols; - } - -private: - wxDECLARE_CLASS(wxGridSizer); -}; - -//--------------------------------------------------------------------------- -// wxFlexGridSizer -//--------------------------------------------------------------------------- - -// values which define the behaviour for resizing wxFlexGridSizer cells in the -// "non-flexible" direction -enum wxFlexSizerGrowMode -{ - // don't resize the cells in non-flexible direction at all - wxFLEX_GROWMODE_NONE, - - // uniformly resize only the specified ones (default) - wxFLEX_GROWMODE_SPECIFIED, - - // uniformly resize all cells - wxFLEX_GROWMODE_ALL -}; - -class WXDLLIMPEXP_CORE wxFlexGridSizer: public wxGridSizer -{ -public: - // ctors specifying the number of columns only: number of rows will be - // deduced automatically depending on the number of sizer elements - wxFlexGridSizer( int cols, int vgap, int hgap ); - wxFlexGridSizer( int cols, const wxSize& gap = wxSize(0, 0) ); - - // ctors specifying the number of rows and columns - wxFlexGridSizer( int rows, int cols, int vgap, int hgap ); - wxFlexGridSizer( int rows, int cols, const wxSize& gap ); - - // dtor - virtual ~wxFlexGridSizer(); - - // set the rows/columns which will grow (the others will remain of the - // constant initial size) - void AddGrowableRow( size_t idx, int proportion = 0 ); - void RemoveGrowableRow( size_t idx ); - void AddGrowableCol( size_t idx, int proportion = 0 ); - void RemoveGrowableCol( size_t idx ); - - bool IsRowGrowable( size_t idx ); - bool IsColGrowable( size_t idx ); - - // the sizer cells may grow in both directions, not grow at all or only - // grow in one direction but not the other - - // the direction may be wxVERTICAL, wxHORIZONTAL or wxBOTH (default) - void SetFlexibleDirection(int direction) { m_flexDirection = direction; } - int GetFlexibleDirection() const { return m_flexDirection; } - - // note that the grow mode only applies to the direction which is not - // flexible - void SetNonFlexibleGrowMode(wxFlexSizerGrowMode mode) { m_growMode = mode; } - wxFlexSizerGrowMode GetNonFlexibleGrowMode() const { return m_growMode; } - - // Read-only access to the row heights and col widths arrays - const wxArrayInt& GetRowHeights() const { return m_rowHeights; } - const wxArrayInt& GetColWidths() const { return m_colWidths; } - - // implementation - virtual void RecalcSizes() wxOVERRIDE; - virtual wxSize CalcMin() wxOVERRIDE; - -protected: - void AdjustForFlexDirection(); - void AdjustForGrowables(const wxSize& sz); - void FindWidthsAndHeights(int nrows, int ncols); - - // the heights/widths of all rows/columns - wxArrayInt m_rowHeights, - m_colWidths; - - // indices of the growable columns and rows - wxArrayInt m_growableRows, - m_growableCols; - - // proportion values of the corresponding growable rows and columns - wxArrayInt m_growableRowsProportions, - m_growableColsProportions; - - // parameters describing whether the growable cells should be resized in - // both directions or only one - int m_flexDirection; - wxFlexSizerGrowMode m_growMode; - - // saves CalcMin result to optimize RecalcSizes - wxSize m_calculatedMinSize; - -private: - wxDECLARE_CLASS(wxFlexGridSizer); - wxDECLARE_NO_COPY_CLASS(wxFlexGridSizer); -}; - -//--------------------------------------------------------------------------- -// wxBoxSizer -//--------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxBoxSizer: public wxSizer -{ -public: - wxBoxSizer(int orient) - { - m_orient = orient; - m_totalProportion = 0; - - wxASSERT_MSG( m_orient == wxHORIZONTAL || m_orient == wxVERTICAL, - wxT("invalid value for wxBoxSizer orientation") ); - } - - virtual wxSizerItem *AddSpacer(int size) wxOVERRIDE; - - int GetOrientation() const { return m_orient; } - - bool IsVertical() const { return m_orient == wxVERTICAL; } - - void SetOrientation(int orient) { m_orient = orient; } - - // implementation of our resizing logic - virtual wxSize CalcMin() wxOVERRIDE; - virtual void RecalcSizes() wxOVERRIDE; - -protected: - // Only overridden to perform extra debugging checks. - virtual wxSizerItem *DoInsert(size_t index, wxSizerItem *item) wxOVERRIDE; - - // helpers for our code: this returns the component of the given wxSize in - // the direction of the sizer and in the other direction, respectively - int GetSizeInMajorDir(const wxSize& sz) const - { - return m_orient == wxHORIZONTAL ? sz.x : sz.y; - } - - int& SizeInMajorDir(wxSize& sz) - { - return m_orient == wxHORIZONTAL ? sz.x : sz.y; - } - - int& PosInMajorDir(wxPoint& pt) - { - return m_orient == wxHORIZONTAL ? pt.x : pt.y; - } - - int GetSizeInMinorDir(const wxSize& sz) const - { - return m_orient == wxHORIZONTAL ? sz.y : sz.x; - } - - int& SizeInMinorDir(wxSize& sz) - { - return m_orient == wxHORIZONTAL ? sz.y : sz.x; - } - - int& PosInMinorDir(wxPoint& pt) - { - return m_orient == wxHORIZONTAL ? pt.y : pt.x; - } - - // another helper: creates wxSize from major and minor components - wxSize SizeFromMajorMinor(int major, int minor) const - { - if ( m_orient == wxHORIZONTAL ) - { - return wxSize(major, minor); - } - else // wxVERTICAL - { - return wxSize(minor, major); - } - } - - - // either wxHORIZONTAL or wxVERTICAL - int m_orient; - - // the sum of proportion of all of our elements - int m_totalProportion; - - // the minimal size needed for this sizer as calculated by the last call to - // our CalcMin() - wxSize m_calculatedMinSize; - -private: - wxDECLARE_CLASS(wxBoxSizer); -}; - -//--------------------------------------------------------------------------- -// wxStaticBoxSizer -//--------------------------------------------------------------------------- - -#if wxUSE_STATBOX - -class WXDLLIMPEXP_FWD_CORE wxStaticBox; - -class WXDLLIMPEXP_CORE wxStaticBoxSizer: public wxBoxSizer -{ -public: - wxStaticBoxSizer(wxStaticBox *box, int orient); - wxStaticBoxSizer(int orient, wxWindow *win, const wxString& label = wxEmptyString); - virtual ~wxStaticBoxSizer(); - - void RecalcSizes() wxOVERRIDE; - wxSize CalcMin() wxOVERRIDE; - - wxStaticBox *GetStaticBox() const - { return m_staticBox; } - - // override to hide/show the static box as well - virtual void ShowItems (bool show) wxOVERRIDE; - virtual bool AreAnyItemsShown() const wxOVERRIDE; - - virtual bool Detach( wxWindow *window ) wxOVERRIDE; - virtual bool Detach( wxSizer *sizer ) wxOVERRIDE { return wxBoxSizer::Detach(sizer); } - virtual bool Detach( int index ) wxOVERRIDE { return wxBoxSizer::Detach(index); } - -protected: - wxStaticBox *m_staticBox; - -private: - wxDECLARE_CLASS(wxStaticBoxSizer); - wxDECLARE_NO_COPY_CLASS(wxStaticBoxSizer); -}; - -#endif // wxUSE_STATBOX - -//--------------------------------------------------------------------------- -// wxStdDialogButtonSizer -//--------------------------------------------------------------------------- - -#if wxUSE_BUTTON - -class WXDLLIMPEXP_CORE wxStdDialogButtonSizer: public wxBoxSizer -{ -public: - // Constructor just creates a new wxBoxSizer, not much else. - // Box sizer orientation is automatically determined here: - // vertical for PDAs, horizontal for everything else? - wxStdDialogButtonSizer(); - - // Checks button ID against system IDs and sets one of the pointers below - // to this button. Does not do any sizer-related things here. - void AddButton(wxButton *button); - - // Use these if no standard ID can/should be used - void SetAffirmativeButton( wxButton *button ); - void SetNegativeButton( wxButton *button ); - void SetCancelButton( wxButton *button ); - - // All platform-specific code here, checks which buttons exist and add - // them to the sizer accordingly. - // Note - one potential hack on Mac we could use here, - // if m_buttonAffirmative is wxID_SAVE then ensure wxID_SAVE - // is set to _("Save") and m_buttonNegative is set to _("Don't Save") - // I wouldn't add any other hacks like that into here, - // but this one I can see being useful. - void Realize(); - - wxButton *GetAffirmativeButton() const { return m_buttonAffirmative; } - wxButton *GetApplyButton() const { return m_buttonApply; } - wxButton *GetNegativeButton() const { return m_buttonNegative; } - wxButton *GetCancelButton() const { return m_buttonCancel; } - wxButton *GetHelpButton() const { return m_buttonHelp; } - -protected: - wxButton *m_buttonAffirmative; // wxID_OK, wxID_YES, wxID_SAVE go here - wxButton *m_buttonApply; // wxID_APPLY - wxButton *m_buttonNegative; // wxID_NO - wxButton *m_buttonCancel; // wxID_CANCEL, wxID_CLOSE - wxButton *m_buttonHelp; // wxID_HELP, wxID_CONTEXT_HELP - -private: - wxDECLARE_CLASS(wxStdDialogButtonSizer); - wxDECLARE_NO_COPY_CLASS(wxStdDialogButtonSizer); -}; - -#endif // wxUSE_BUTTON - - -// ---------------------------------------------------------------------------- -// inline functions implementation -// ---------------------------------------------------------------------------- - -#if WXWIN_COMPATIBILITY_2_8 - -inline void wxSizerItem::SetWindow(wxWindow *window) -{ - DoSetWindow(window); -} - -inline void wxSizerItem::SetSizer(wxSizer *sizer) -{ - DoSetSizer(sizer); -} - -inline void wxSizerItem::SetSpacer(const wxSize& size) -{ - DoSetSpacer(size); -} - -inline void wxSizerItem::SetSpacer(int width, int height) -{ - DoSetSpacer(wxSize(width, height)); -} - -#endif // WXWIN_COMPATIBILITY_2_8 - -inline wxSizerItem* -wxSizer::Insert(size_t index, wxSizerItem *item) -{ - return DoInsert(index, item); -} - - -inline wxSizerItem* -wxSizer::Add( wxSizerItem *item ) -{ - return Insert( m_children.GetCount(), item ); -} - -inline wxSizerItem* -wxSizer::Add( wxWindow *window, int proportion, int flag, int border, wxObject* userData ) -{ - return Add( new wxSizerItem( window, proportion, flag, border, userData ) ); -} - -inline wxSizerItem* -wxSizer::Add( wxSizer *sizer, int proportion, int flag, int border, wxObject* userData ) -{ - return Add( new wxSizerItem( sizer, proportion, flag, border, userData ) ); -} - -inline wxSizerItem* -wxSizer::Add( int width, int height, int proportion, int flag, int border, wxObject* userData ) -{ - return Add( new wxSizerItem( width, height, proportion, flag, border, userData ) ); -} - -inline wxSizerItem* -wxSizer::Add( wxWindow *window, const wxSizerFlags& flags ) -{ - return Add( new wxSizerItem(window, flags) ); -} - -inline wxSizerItem* -wxSizer::Add( wxSizer *sizer, const wxSizerFlags& flags ) -{ - return Add( new wxSizerItem(sizer, flags) ); -} - -inline wxSizerItem* -wxSizer::Add( int width, int height, const wxSizerFlags& flags ) -{ - return Add( new wxSizerItem(width, height, flags) ); -} - -inline wxSizerItem* -wxSizer::AddSpacer(int size) -{ - return Add(size, size); -} - -inline wxSizerItem* -wxSizer::AddStretchSpacer(int prop) -{ - return Add(0, 0, prop); -} - -inline wxSizerItem* -wxSizer::Prepend( wxSizerItem *item ) -{ - return Insert( 0, item ); -} - -inline wxSizerItem* -wxSizer::Prepend( wxWindow *window, int proportion, int flag, int border, wxObject* userData ) -{ - return Prepend( new wxSizerItem( window, proportion, flag, border, userData ) ); -} - -inline wxSizerItem* -wxSizer::Prepend( wxSizer *sizer, int proportion, int flag, int border, wxObject* userData ) -{ - return Prepend( new wxSizerItem( sizer, proportion, flag, border, userData ) ); -} - -inline wxSizerItem* -wxSizer::Prepend( int width, int height, int proportion, int flag, int border, wxObject* userData ) -{ - return Prepend( new wxSizerItem( width, height, proportion, flag, border, userData ) ); -} - -inline wxSizerItem* -wxSizer::PrependSpacer(int size) -{ - return Prepend(size, size); -} - -inline wxSizerItem* -wxSizer::PrependStretchSpacer(int prop) -{ - return Prepend(0, 0, prop); -} - -inline wxSizerItem* -wxSizer::Prepend( wxWindow *window, const wxSizerFlags& flags ) -{ - return Prepend( new wxSizerItem(window, flags) ); -} - -inline wxSizerItem* -wxSizer::Prepend( wxSizer *sizer, const wxSizerFlags& flags ) -{ - return Prepend( new wxSizerItem(sizer, flags) ); -} - -inline wxSizerItem* -wxSizer::Prepend( int width, int height, const wxSizerFlags& flags ) -{ - return Prepend( new wxSizerItem(width, height, flags) ); -} - -inline wxSizerItem* -wxSizer::Insert( size_t index, - wxWindow *window, - int proportion, - int flag, - int border, - wxObject* userData ) -{ - return Insert( index, new wxSizerItem( window, proportion, flag, border, userData ) ); -} - -inline wxSizerItem* -wxSizer::Insert( size_t index, - wxSizer *sizer, - int proportion, - int flag, - int border, - wxObject* userData ) -{ - return Insert( index, new wxSizerItem( sizer, proportion, flag, border, userData ) ); -} - -inline wxSizerItem* -wxSizer::Insert( size_t index, - int width, - int height, - int proportion, - int flag, - int border, - wxObject* userData ) -{ - return Insert( index, new wxSizerItem( width, height, proportion, flag, border, userData ) ); -} - -inline wxSizerItem* -wxSizer::Insert( size_t index, wxWindow *window, const wxSizerFlags& flags ) -{ - return Insert( index, new wxSizerItem(window, flags) ); -} - -inline wxSizerItem* -wxSizer::Insert( size_t index, wxSizer *sizer, const wxSizerFlags& flags ) -{ - return Insert( index, new wxSizerItem(sizer, flags) ); -} - -inline wxSizerItem* -wxSizer::Insert( size_t index, int width, int height, const wxSizerFlags& flags ) -{ - return Insert( index, new wxSizerItem(width, height, flags) ); -} - -inline wxSizerItem* -wxSizer::InsertSpacer(size_t index, int size) -{ - return Insert(index, size, size); -} - -inline wxSizerItem* -wxSizer::InsertStretchSpacer(size_t index, int prop) -{ - return Insert(index, 0, 0, prop); -} - -#endif // __WXSIZER_H__ diff --git a/Externals/wxWidgets3/include/wx/slider.h b/Externals/wxWidgets3/include/wx/slider.h deleted file mode 100644 index 7d615ca65f..0000000000 --- a/Externals/wxWidgets3/include/wx/slider.h +++ /dev/null @@ -1,149 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/slider.h -// Purpose: wxSlider interface -// Author: Vadim Zeitlin -// Modified by: -// Created: 09.02.01 -// Copyright: (c) 1996-2001 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_SLIDER_H_BASE_ -#define _WX_SLIDER_H_BASE_ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/defs.h" - -#if wxUSE_SLIDER - -#include "wx/control.h" - -// ---------------------------------------------------------------------------- -// wxSlider flags -// ---------------------------------------------------------------------------- - -#define wxSL_HORIZONTAL wxHORIZONTAL /* 0x0004 */ -#define wxSL_VERTICAL wxVERTICAL /* 0x0008 */ - -#define wxSL_TICKS 0x0010 -#define wxSL_AUTOTICKS wxSL_TICKS // we don't support manual ticks -#define wxSL_LEFT 0x0040 -#define wxSL_TOP 0x0080 -#define wxSL_RIGHT 0x0100 -#define wxSL_BOTTOM 0x0200 -#define wxSL_BOTH 0x0400 -#define wxSL_SELRANGE 0x0800 -#define wxSL_INVERSE 0x1000 -#define wxSL_MIN_MAX_LABELS 0x2000 -#define wxSL_VALUE_LABEL 0x4000 -#define wxSL_LABELS (wxSL_MIN_MAX_LABELS|wxSL_VALUE_LABEL) - -extern WXDLLIMPEXP_DATA_CORE(const char) wxSliderNameStr[]; - -// ---------------------------------------------------------------------------- -// wxSliderBase: define wxSlider interface -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxSliderBase : public wxControl -{ -public: - /* the ctor of the derived class should have the following form: - - wxSlider(wxWindow *parent, - wxWindowID id, - int value, int minValue, int maxValue, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSL_HORIZONTAL, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxSliderNameStr); - */ - wxSliderBase() { } - - // get/set the current slider value (should be in range) - virtual int GetValue() const = 0; - virtual void SetValue(int value) = 0; - - // retrieve/change the range - virtual void SetRange(int minValue, int maxValue) = 0; - virtual int GetMin() const = 0; - virtual int GetMax() const = 0; - void SetMin( int minValue ) { SetRange( minValue , GetMax() ) ; } - void SetMax( int maxValue ) { SetRange( GetMin() , maxValue ) ; } - - // the line/page size is the increment by which the slider moves when - // cursor arrow key/page up or down are pressed (clicking the mouse is like - // pressing PageUp/Down) and are by default set to 1 and 1/10 of the range - virtual void SetLineSize(int lineSize) = 0; - virtual void SetPageSize(int pageSize) = 0; - virtual int GetLineSize() const = 0; - virtual int GetPageSize() const = 0; - - // these methods get/set the length of the slider pointer in pixels - virtual void SetThumbLength(int lenPixels) = 0; - virtual int GetThumbLength() const = 0; - - // warning: most of subsequent methods are currently only implemented in - // wxMSW under Win95 and are silently ignored on other platforms - - void SetTickFreq(int freq) { DoSetTickFreq(freq); } - virtual int GetTickFreq() const { return 0; } - virtual void ClearTicks() { } - virtual void SetTick(int WXUNUSED(tickPos)) { } - - virtual void ClearSel() { } - virtual int GetSelEnd() const { return GetMin(); } - virtual int GetSelStart() const { return GetMax(); } - virtual void SetSelection(int WXUNUSED(min), int WXUNUSED(max)) { } - -#if WXWIN_COMPATIBILITY_2_8 - wxDEPRECATED_INLINE( void SetTickFreq(int freq, int), DoSetTickFreq(freq); ) -#endif - -protected: - // Platform-specific implementation of SetTickFreq - virtual void DoSetTickFreq(int WXUNUSED(freq)) { /* unsupported by default */ } - - // choose the default border for this window - virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } - - // adjust value according to wxSL_INVERSE style - virtual int ValueInvertOrNot(int value) const - { - if (HasFlag(wxSL_INVERSE)) - return (GetMax() + GetMin()) - value; - else - return value; - } - -private: - wxDECLARE_NO_COPY_CLASS(wxSliderBase); -}; - -// ---------------------------------------------------------------------------- -// include the real class declaration -// ---------------------------------------------------------------------------- - -#if defined(__WXUNIVERSAL__) - #include "wx/univ/slider.h" -#elif defined(__WXMSW__) - #include "wx/msw/slider.h" -#elif defined(__WXMOTIF__) - #include "wx/motif/slider.h" -#elif defined(__WXGTK20__) - #include "wx/gtk/slider.h" -#elif defined(__WXGTK__) - #include "wx/gtk1/slider.h" -#elif defined(__WXMAC__) - #include "wx/osx/slider.h" -#elif defined(__WXQT__) - #include "wx/qt/slider.h" -#endif - -#endif // wxUSE_SLIDER - -#endif - // _WX_SLIDER_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/snglinst.h b/Externals/wxWidgets3/include/wx/snglinst.h deleted file mode 100644 index 61213a86cf..0000000000 --- a/Externals/wxWidgets3/include/wx/snglinst.h +++ /dev/null @@ -1,96 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/snglinst.h -// Purpose: wxSingleInstanceChecker can be used to restrict the number of -// simultaneously running copies of a program to one -// Author: Vadim Zeitlin -// Modified by: -// Created: 08.06.01 -// Copyright: (c) 2001 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_SNGLINST_H_ -#define _WX_SNGLINST_H_ - -#if wxUSE_SNGLINST_CHECKER - -#include "wx/app.h" -#include "wx/utils.h" - -// ---------------------------------------------------------------------------- -// wxSingleInstanceChecker -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxSingleInstanceChecker -{ -public: - // default ctor, use Create() after it - wxSingleInstanceChecker() { Init(); } - - // like Create() but no error checking (dangerous!) - wxSingleInstanceChecker(const wxString& name, - const wxString& path = wxEmptyString) - { - Init(); - Create(name, path); - } - - // notice that calling Create() is optional now, if you don't do it before - // calling IsAnotherRunning(), CreateDefault() is used automatically - // - // name it is used as the mutex name under Win32 and the lock file name - // under Unix so it should be as unique as possible and must be non-empty - // - // path is optional and is ignored under Win32 and used as the directory to - // create the lock file in under Unix (default is wxGetHomeDir()) - // - // returns false if initialization failed, it doesn't mean that another - // instance is running - use IsAnotherRunning() to check it - bool Create(const wxString& name, const wxString& path = wxEmptyString); - - // use the default name, which is a combination of wxTheApp->GetAppName() - // and wxGetUserId() for mutex/lock file - // - // this is called implicitly by IsAnotherRunning() if the checker hadn't - // been created until then - bool CreateDefault() - { - wxCHECK_MSG( wxTheApp, false, "must have application instance" ); - return Create(wxTheApp->GetAppName() + '-' + wxGetUserId()); - } - - // is another copy of this program already running? - bool IsAnotherRunning() const - { - if ( !m_impl ) - { - if ( !const_cast(this)->CreateDefault() ) - { - // if creation failed, return false as it's better to not - // prevent this instance from starting up if there is an error - return false; - } - } - - return DoIsAnotherRunning(); - } - - // dtor is not virtual, this class is not meant to be used polymorphically - ~wxSingleInstanceChecker(); - -private: - // common part of all ctors - void Init() { m_impl = NULL; } - - // do check if another instance is running, called only if m_impl != NULL - bool DoIsAnotherRunning() const; - - // the implementation details (platform specific) - class WXDLLIMPEXP_FWD_BASE wxSingleInstanceCheckerImpl *m_impl; - - wxDECLARE_NO_COPY_CLASS(wxSingleInstanceChecker); -}; - -#endif // wxUSE_SNGLINST_CHECKER - -#endif // _WX_SNGLINST_H_ diff --git a/Externals/wxWidgets3/include/wx/socket.h b/Externals/wxWidgets3/include/wx/socket.h deleted file mode 100644 index daded4bf05..0000000000 --- a/Externals/wxWidgets3/include/wx/socket.h +++ /dev/null @@ -1,435 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/socket.h -// Purpose: Socket handling classes -// Authors: Guilhem Lavaux, Guillermo Rodriguez Garcia -// Modified by: -// Created: April 1997 -// Copyright: (c) Guilhem Lavaux -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_SOCKET_H_ -#define _WX_SOCKET_H_ - -#include "wx/defs.h" - -#if wxUSE_SOCKETS - -// --------------------------------------------------------------------------- -// wxSocket headers -// --------------------------------------------------------------------------- - -#include "wx/event.h" -#include "wx/sckaddr.h" -#include "wx/list.h" - -class wxSocketImpl; - -// ------------------------------------------------------------------------ -// Types and constants -// ------------------------------------------------------------------------ - -// Define the type of native sockets. -#if defined(__WINDOWS__) - // Although socket descriptors are still 32 bit values, even under Win64, - // the socket type is 64 bit there. - typedef wxUIntPtr wxSOCKET_T; -#else - typedef int wxSOCKET_T; -#endif - - -// Types of different socket notifications or events. -// -// NB: the values here should be consecutive and start with 0 as they are -// used to construct the wxSOCKET_XXX_FLAG bit mask values below -enum wxSocketNotify -{ - wxSOCKET_INPUT, - wxSOCKET_OUTPUT, - wxSOCKET_CONNECTION, - wxSOCKET_LOST -}; - -enum -{ - wxSOCKET_INPUT_FLAG = 1 << wxSOCKET_INPUT, - wxSOCKET_OUTPUT_FLAG = 1 << wxSOCKET_OUTPUT, - wxSOCKET_CONNECTION_FLAG = 1 << wxSOCKET_CONNECTION, - wxSOCKET_LOST_FLAG = 1 << wxSOCKET_LOST -}; - -// this is a combination of the bit masks defined above -typedef int wxSocketEventFlags; - -enum wxSocketError -{ - wxSOCKET_NOERROR = 0, - wxSOCKET_INVOP, - wxSOCKET_IOERR, - wxSOCKET_INVADDR, - wxSOCKET_INVSOCK, - wxSOCKET_NOHOST, - wxSOCKET_INVPORT, - wxSOCKET_WOULDBLOCK, - wxSOCKET_TIMEDOUT, - wxSOCKET_MEMERR, - wxSOCKET_OPTERR -}; - -// socket options/flags bit masks -enum -{ - wxSOCKET_NONE = 0x0000, - wxSOCKET_NOWAIT_READ = 0x0001, - wxSOCKET_NOWAIT_WRITE = 0x0002, - wxSOCKET_NOWAIT = wxSOCKET_NOWAIT_READ | wxSOCKET_NOWAIT_WRITE, - wxSOCKET_WAITALL_READ = 0x0004, - wxSOCKET_WAITALL_WRITE = 0x0008, - wxSOCKET_WAITALL = wxSOCKET_WAITALL_READ | wxSOCKET_WAITALL_WRITE, - wxSOCKET_BLOCK = 0x0010, - wxSOCKET_REUSEADDR = 0x0020, - wxSOCKET_BROADCAST = 0x0040, - wxSOCKET_NOBIND = 0x0080 -}; - -typedef int wxSocketFlags; - -// socket kind values (badly defined, don't use) -enum wxSocketType -{ - wxSOCKET_UNINIT, - wxSOCKET_CLIENT, - wxSOCKET_SERVER, - wxSOCKET_BASE, - wxSOCKET_DATAGRAM -}; - - -// event -class WXDLLIMPEXP_FWD_NET wxSocketEvent; -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_NET, wxEVT_SOCKET, wxSocketEvent); - -// -------------------------------------------------------------------------- -// wxSocketBase -// -------------------------------------------------------------------------- - -class WXDLLIMPEXP_NET wxSocketBase : public wxObject -{ -public: - // Public interface - // ---------------- - - // ctors and dtors - wxSocketBase(); - wxSocketBase(wxSocketFlags flags, wxSocketType type); - virtual ~wxSocketBase(); - void Init(); - bool Destroy(); - - // state - bool Ok() const { return IsOk(); } - bool IsOk() const { return m_impl != NULL; } - bool Error() const { return LastError() != wxSOCKET_NOERROR; } - bool IsClosed() const { return m_closed; } - bool IsConnected() const { return m_connected; } - bool IsData() { return WaitForRead(0, 0); } - bool IsDisconnected() const { return !IsConnected(); } - wxUint32 LastCount() const { return m_lcount; } - wxUint32 LastReadCount() const { return m_lcount_read; } - wxUint32 LastWriteCount() const { return m_lcount_write; } - wxSocketError LastError() const; - void SaveState(); - void RestoreState(); - - // addresses - virtual bool GetLocal(wxSockAddress& addr_man) const; - virtual bool GetPeer(wxSockAddress& addr_man) const; - virtual bool SetLocal(const wxIPV4address& local); - - // base IO - virtual bool Close(); - void ShutdownOutput(); - wxSocketBase& Discard(); - wxSocketBase& Peek(void* buffer, wxUint32 nbytes); - wxSocketBase& Read(void* buffer, wxUint32 nbytes); - wxSocketBase& ReadMsg(void *buffer, wxUint32 nbytes); - wxSocketBase& Unread(const void *buffer, wxUint32 nbytes); - wxSocketBase& Write(const void *buffer, wxUint32 nbytes); - wxSocketBase& WriteMsg(const void *buffer, wxUint32 nbytes); - - // all Wait() functions wait until their condition is satisfied or the - // timeout expires; if seconds == -1 (default) then m_timeout value is used - // - // it is also possible to call InterruptWait() to cancel any current Wait() - - // wait for anything at all to happen with this socket - bool Wait(long seconds = -1, long milliseconds = 0); - - // wait until we can read from or write to the socket without blocking - // (notice that this does not mean that the operation will succeed but only - // that it will return immediately) - bool WaitForRead(long seconds = -1, long milliseconds = 0); - bool WaitForWrite(long seconds = -1, long milliseconds = 0); - - // wait until the connection is terminated - bool WaitForLost(long seconds = -1, long milliseconds = 0); - - void InterruptWait() { m_interrupt = true; } - - - wxSocketFlags GetFlags() const { return m_flags; } - void SetFlags(wxSocketFlags flags); - virtual void SetTimeout(long seconds); - long GetTimeout() const { return m_timeout; } - - bool GetOption(int level, int optname, void *optval, int *optlen); - bool SetOption(int level, int optname, const void *optval, int optlen); - wxUint32 GetLastIOSize() const { return m_lcount; } - wxUint32 GetLastIOReadSize() const { return m_lcount_read; } - wxUint32 GetLastIOWriteSize() const { return m_lcount_write; } - - // event handling - void *GetClientData() const { return m_clientData; } - void SetClientData(void *data) { m_clientData = data; } - void SetEventHandler(wxEvtHandler& handler, int id = wxID_ANY); - void SetNotify(wxSocketEventFlags flags); - void Notify(bool notify); - - // Get the underlying socket descriptor. - wxSOCKET_T GetSocket() const; - - // initialize/shutdown the sockets (done automatically so there is no need - // to call these functions usually) - // - // should always be called from the main thread only so one of the cases - // where they should indeed be called explicitly is when the first wxSocket - // object in the application is created in a different thread - static bool Initialize(); - static void Shutdown(); - - // check if wxSocket had been already initialized - // - // notice that this function should be only called from the main thread as - // otherwise it is inherently unsafe because Initialize/Shutdown() may be - // called concurrently with it in the main thread - static bool IsInitialized(); - - // Implementation from now on - // -------------------------- - - // do not use, should be private (called from wxSocketImpl only) - void OnRequest(wxSocketNotify notify); - - // do not use, not documented nor supported - bool IsNoWait() const { return ((m_flags & wxSOCKET_NOWAIT) != 0); } - wxSocketType GetType() const { return m_type; } - -private: - friend class wxSocketClient; - friend class wxSocketServer; - friend class wxDatagramSocket; - - // low level IO - wxUint32 DoRead(void* buffer, wxUint32 nbytes); - wxUint32 DoWrite(const void *buffer, wxUint32 nbytes); - - // wait until the given flags are set for this socket or the given timeout - // (or m_timeout) expires - // - // notice that wxSOCKET_LOST_FLAG is always taken into account and the - // function returns -1 if the connection was lost; otherwise it returns - // true if any of the events specified by flags argument happened or false - // if the timeout expired - int DoWait(long timeout, wxSocketEventFlags flags); - - // a helper calling DoWait() using the same convention as the public - // WaitForXXX() functions use, i.e. use our timeout if seconds == -1 or the - // specified timeout otherwise - int DoWait(long seconds, long milliseconds, wxSocketEventFlags flags); - - // another helper calling DoWait() using our m_timeout - int DoWaitWithTimeout(wxSocketEventFlags flags) - { - return DoWait(m_timeout*1000, flags); - } - - // pushback buffer - void Pushback(const void *buffer, wxUint32 size); - wxUint32 GetPushback(void *buffer, wxUint32 size, bool peek); - - // store the given error as the LastError() - void SetError(wxSocketError error); - -private: - // socket - wxSocketImpl *m_impl; // port-specific implementation - wxSocketType m_type; // wxSocket type - - // state - wxSocketFlags m_flags; // wxSocket flags - bool m_connected; // connected? - bool m_establishing; // establishing connection? - bool m_reading; // busy reading? - bool m_writing; // busy writing? - bool m_closed; // was the other end closed? - wxUint32 m_lcount; // last IO transaction size - wxUint32 m_lcount_read; // last IO transaction size of Read() direction. - wxUint32 m_lcount_write; // last IO transaction size of Write() direction. - unsigned long m_timeout; // IO timeout value in seconds - // (TODO: remove, wxSocketImpl has it too) - wxList m_states; // stack of states (TODO: remove!) - bool m_interrupt; // interrupt ongoing wait operations? - bool m_beingDeleted; // marked for delayed deletion? - wxIPV4address m_localAddress; // bind to local address? - - // pushback buffer - void *m_unread; // pushback buffer - wxUint32 m_unrd_size; // pushback buffer size - wxUint32 m_unrd_cur; // pushback pointer (index into buffer) - - // events - int m_id; // socket id - wxEvtHandler *m_handler; // event handler - void *m_clientData; // client data for events - bool m_notify; // notify events to users? - wxSocketEventFlags m_eventmask; // which events to notify? - wxSocketEventFlags m_eventsgot; // collects events received in OnRequest() - - - friend class wxSocketReadGuard; - friend class wxSocketWriteGuard; - - wxDECLARE_CLASS(wxSocketBase); - wxDECLARE_NO_COPY_CLASS(wxSocketBase); -}; - - -// -------------------------------------------------------------------------- -// wxSocketServer -// -------------------------------------------------------------------------- - -class WXDLLIMPEXP_NET wxSocketServer : public wxSocketBase -{ -public: - wxSocketServer(const wxSockAddress& addr, - wxSocketFlags flags = wxSOCKET_NONE); - - wxSocketBase* Accept(bool wait = true); - bool AcceptWith(wxSocketBase& socket, bool wait = true); - - bool WaitForAccept(long seconds = -1, long milliseconds = 0); - - wxDECLARE_CLASS(wxSocketServer); - wxDECLARE_NO_COPY_CLASS(wxSocketServer); -}; - - -// -------------------------------------------------------------------------- -// wxSocketClient -// -------------------------------------------------------------------------- - -class WXDLLIMPEXP_NET wxSocketClient : public wxSocketBase -{ -public: - wxSocketClient(wxSocketFlags flags = wxSOCKET_NONE); - - virtual bool Connect(const wxSockAddress& addr, bool wait = true); - bool Connect(const wxSockAddress& addr, - const wxSockAddress& local, - bool wait = true); - - bool WaitOnConnect(long seconds = -1, long milliseconds = 0); - - // Sets initial socket buffer sizes using the SO_SNDBUF and SO_RCVBUF - // options before calling connect (either one can be -1 to leave it - // unchanged) - void SetInitialSocketBuffers(int recv, int send) - { - m_initialRecvBufferSize = recv; - m_initialSendBufferSize = send; - } - -private: - virtual bool DoConnect(const wxSockAddress& addr, - const wxSockAddress* local, - bool wait = true); - - // buffer sizes, -1 if unset and defaults should be used - int m_initialRecvBufferSize; - int m_initialSendBufferSize; - - wxDECLARE_CLASS(wxSocketClient); - wxDECLARE_NO_COPY_CLASS(wxSocketClient); -}; - - -// -------------------------------------------------------------------------- -// wxDatagramSocket -// -------------------------------------------------------------------------- - -// WARNING: still in alpha stage - -class WXDLLIMPEXP_NET wxDatagramSocket : public wxSocketBase -{ -public: - wxDatagramSocket(const wxSockAddress& addr, - wxSocketFlags flags = wxSOCKET_NONE); - - wxDatagramSocket& RecvFrom(wxSockAddress& addr, - void *buf, - wxUint32 nBytes); - wxDatagramSocket& SendTo(const wxSockAddress& addr, - const void* buf, - wxUint32 nBytes); - - /* TODO: - bool Connect(wxSockAddress& addr); - */ - -private: - wxDECLARE_CLASS(wxDatagramSocket); - wxDECLARE_NO_COPY_CLASS(wxDatagramSocket); -}; - - -// -------------------------------------------------------------------------- -// wxSocketEvent -// -------------------------------------------------------------------------- - -class WXDLLIMPEXP_NET wxSocketEvent : public wxEvent -{ -public: - wxSocketEvent(int id = 0) - : wxEvent(id, wxEVT_SOCKET) - { - } - - wxSocketNotify GetSocketEvent() const { return m_event; } - wxSocketBase *GetSocket() const - { return (wxSocketBase *) GetEventObject(); } - void *GetClientData() const { return m_clientData; } - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxSocketEvent(*this); } - virtual wxEventCategory GetEventCategory() const wxOVERRIDE { return wxEVT_CATEGORY_SOCKET; } - -public: - wxSocketNotify m_event; - void *m_clientData; - - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxSocketEvent); -}; - - -typedef void (wxEvtHandler::*wxSocketEventFunction)(wxSocketEvent&); - -#define wxSocketEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxSocketEventFunction, func) - -#define EVT_SOCKET(id, func) \ - wx__DECLARE_EVT1(wxEVT_SOCKET, id, wxSocketEventHandler(func)) - -#endif // wxUSE_SOCKETS - -#endif // _WX_SOCKET_H_ - diff --git a/Externals/wxWidgets3/include/wx/sound.h b/Externals/wxWidgets3/include/wx/sound.h deleted file mode 100644 index 003a4b7ae2..0000000000 --- a/Externals/wxWidgets3/include/wx/sound.h +++ /dev/null @@ -1,77 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/sound.h -// Purpose: wxSoundBase class -// Author: Vaclav Slavik -// Modified by: -// Created: 2004/02/01 -// Copyright: (c) 2004, Vaclav Slavik -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_SOUND_H_BASE_ -#define _WX_SOUND_H_BASE_ - -#include "wx/defs.h" - -#if wxUSE_SOUND - -#include "wx/object.h" - -// ---------------------------------------------------------------------------- -// wxSoundBase: common wxSound code and interface -// ---------------------------------------------------------------------------- - -// Flags for wxSound::Play - -// NB: We can't use enum with some compilers, because they keep reporting -// nonexistent ambiguities between Play(unsigned) and static Play(const -// wxString&, unsigned). -#define wxSOUND_SYNC ((unsigned)0) -#define wxSOUND_ASYNC ((unsigned)1) -#define wxSOUND_LOOP ((unsigned)2) - -// Base class for wxSound implementations -class WXDLLIMPEXP_ADV wxSoundBase : public wxObject -{ -public: - // Play the sound: - bool Play(unsigned flags = wxSOUND_ASYNC) const - { - wxASSERT_MSG( (flags & wxSOUND_LOOP) == 0 || - (flags & wxSOUND_ASYNC) != 0, - wxT("sound can only be looped asynchronously") ); - return DoPlay(flags); - } - - // Plays sound from filename: - static bool Play(const wxString& filename, unsigned flags = wxSOUND_ASYNC); - -protected: - virtual bool DoPlay(unsigned flags) const = 0; -}; - -// ---------------------------------------------------------------------------- -// wxSound class implementation -// ---------------------------------------------------------------------------- - -#if defined(__WINDOWS__) - #include "wx/msw/sound.h" -#elif defined(__WXMAC__) - #include "wx/osx/sound.h" -#elif defined(__UNIX__) - #include "wx/unix/sound.h" -#endif - -// ---------------------------------------------------------------------------- -// wxSoundBase methods -// ---------------------------------------------------------------------------- - -inline bool wxSoundBase::Play(const wxString& filename, unsigned flags) -{ - wxSound snd(filename); - return snd.IsOk() ? snd.Play(flags) : false; -} - -#endif // wxUSE_SOUND - -#endif // _WX_SOUND_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/spinbutt.h b/Externals/wxWidgets3/include/wx/spinbutt.h deleted file mode 100644 index 7370ebf600..0000000000 --- a/Externals/wxWidgets3/include/wx/spinbutt.h +++ /dev/null @@ -1,140 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/spinbutt.h -// Purpose: wxSpinButtonBase class -// Author: Julian Smart, Vadim Zeitlin -// Modified by: -// Created: 23.07.99 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_SPINBUTT_H_BASE_ -#define _WX_SPINBUTT_H_BASE_ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/defs.h" - -#if wxUSE_SPINBTN - -#include "wx/control.h" -#include "wx/event.h" -#include "wx/range.h" - -#define wxSPIN_BUTTON_NAME wxT("wxSpinButton") - -// ---------------------------------------------------------------------------- -// The wxSpinButton is like a small scrollbar than is often placed next -// to a text control. -// -// Styles: -// wxSP_HORIZONTAL: horizontal spin button -// wxSP_VERTICAL: vertical spin button (the default) -// wxSP_ARROW_KEYS: arrow keys increment/decrement value -// wxSP_WRAP: value wraps at either end -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxSpinButtonBase : public wxControl -{ -public: - // ctor initializes the range with the default (0..100) values - wxSpinButtonBase() { m_min = 0; m_max = 100; } - - // accessors - virtual int GetValue() const = 0; - virtual int GetMin() const { return m_min; } - virtual int GetMax() const { return m_max; } - wxRange GetRange() const { return wxRange( GetMin(), GetMax() );} - - // operations - virtual void SetValue(int val) = 0; - virtual void SetMin(int minVal) { SetRange ( minVal , m_max ) ; } - virtual void SetMax(int maxVal) { SetRange ( m_min , maxVal ) ; } - virtual void SetRange(int minVal, int maxVal) - { - m_min = minVal; - m_max = maxVal; - } - void SetRange( const wxRange& range) { SetRange( range.GetMin(), range.GetMax()); } - - // is this spin button vertically oriented? - bool IsVertical() const { return (m_windowStyle & wxSP_VERTICAL) != 0; } - -protected: - // the range value - int m_min; - int m_max; - - wxDECLARE_NO_COPY_CLASS(wxSpinButtonBase); -}; - -// ---------------------------------------------------------------------------- -// include the declaration of the real class -// ---------------------------------------------------------------------------- - -#if defined(__WXUNIVERSAL__) - #include "wx/univ/spinbutt.h" -#elif defined(__WXMSW__) - #include "wx/msw/spinbutt.h" -#elif defined(__WXMOTIF__) - #include "wx/motif/spinbutt.h" -#elif defined(__WXGTK20__) - #include "wx/gtk/spinbutt.h" -#elif defined(__WXGTK__) - #include "wx/gtk1/spinbutt.h" -#elif defined(__WXMAC__) - #include "wx/osx/spinbutt.h" -#elif defined(__WXQT__) - #include "wx/qt/spinbutt.h" -#endif - -// ---------------------------------------------------------------------------- -// the wxSpinButton event -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxSpinEvent : public wxNotifyEvent -{ -public: - wxSpinEvent(wxEventType commandType = wxEVT_NULL, int winid = 0) - : wxNotifyEvent(commandType, winid) - { - } - - wxSpinEvent(const wxSpinEvent& event) : wxNotifyEvent(event) {} - - // get the current value of the control - int GetValue() const { return m_commandInt; } - void SetValue(int value) { m_commandInt = value; } - - int GetPosition() const { return m_commandInt; } - void SetPosition(int pos) { m_commandInt = pos; } - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxSpinEvent(*this); } - -private: - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxSpinEvent); -}; - -typedef void (wxEvtHandler::*wxSpinEventFunction)(wxSpinEvent&); - -#define wxSpinEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxSpinEventFunction, func) - -// macros for handling spin events: notice that we must use the real values of -// the event type constants and not their references (wxEVT_SPIN[_UP/DOWN]) -// here as otherwise the event tables could end up with non-initialized -// (because of undefined initialization order of the globals defined in -// different translation units) references in them -#define EVT_SPIN_UP(winid, func) \ - wx__DECLARE_EVT1(wxEVT_SPIN_UP, winid, wxSpinEventHandler(func)) -#define EVT_SPIN_DOWN(winid, func) \ - wx__DECLARE_EVT1(wxEVT_SPIN_DOWN, winid, wxSpinEventHandler(func)) -#define EVT_SPIN(winid, func) \ - wx__DECLARE_EVT1(wxEVT_SPIN, winid, wxSpinEventHandler(func)) - -#endif // wxUSE_SPINBTN - -#endif - // _WX_SPINBUTT_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/spinctrl.h b/Externals/wxWidgets3/include/wx/spinctrl.h deleted file mode 100644 index 4df89ff178..0000000000 --- a/Externals/wxWidgets3/include/wx/spinctrl.h +++ /dev/null @@ -1,154 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/spinctrl.h -// Purpose: wxSpinCtrlBase class -// Author: Vadim Zeitlin -// Modified by: -// Created: 22.07.99 -// Copyright: (c) Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_SPINCTRL_H_ -#define _WX_SPINCTRL_H_ - -#include "wx/defs.h" - -#if wxUSE_SPINCTRL - -#include "wx/spinbutt.h" // should make wxSpinEvent visible to the app - -// Events -class WXDLLIMPEXP_FWD_CORE wxSpinDoubleEvent; - -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SPINCTRL, wxSpinEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SPINCTRLDOUBLE, wxSpinDoubleEvent); - -// ---------------------------------------------------------------------------- -// A spin ctrl is a text control with a spin button which is usually used to -// prompt the user for a numeric input. -// There are two kinds for number types T=integer or T=double. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxSpinCtrlBase : public wxControl -{ -public: - wxSpinCtrlBase() {} - - // accessor functions that derived classes are expected to have - // T GetValue() const - // T GetMin() const - // T GetMax() const - // T GetIncrement() const - virtual bool GetSnapToTicks() const = 0; - // unsigned GetDigits() const - wxSpinCtrlDouble only - - // operation functions that derived classes are expected to have - virtual void SetValue(const wxString& value) = 0; - // void SetValue(T val) - // void SetRange(T minVal, T maxVal) - // void SetIncrement(T inc) - virtual void SetSnapToTicks(bool snap_to_ticks) = 0; - // void SetDigits(unsigned digits) - wxSpinCtrlDouble only - - // The base for numbers display, e.g. 10 or 16. - virtual int GetBase() const = 0; - virtual bool SetBase(int base) = 0; - // Select text in the textctrl - virtual void SetSelection(long from, long to) = 0; - -private: - wxDECLARE_NO_COPY_CLASS(wxSpinCtrlBase); -}; - -// ---------------------------------------------------------------------------- -// wxSpinDoubleEvent - a wxSpinEvent for double valued controls -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxSpinDoubleEvent : public wxNotifyEvent -{ -public: - wxSpinDoubleEvent(wxEventType commandType = wxEVT_NULL, int winid = 0, - double value = 0) - : wxNotifyEvent(commandType, winid), m_value(value) - { - } - - wxSpinDoubleEvent(const wxSpinDoubleEvent& event) - : wxNotifyEvent(event), m_value(event.GetValue()) - { - } - - double GetValue() const { return m_value; } - void SetValue(double value) { m_value = value; } - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxSpinDoubleEvent(*this); } - -protected: - double m_value; - -private: - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxSpinDoubleEvent); -}; - -// ---------------------------------------------------------------------------- -// wxSpinDoubleEvent event type, see also wxSpinEvent in wx/spinbutt.h -// ---------------------------------------------------------------------------- - -typedef void (wxEvtHandler::*wxSpinDoubleEventFunction)(wxSpinDoubleEvent&); - -#define wxSpinDoubleEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxSpinDoubleEventFunction, func) - -// macros for handling spinctrl events - -#define EVT_SPINCTRL(id, fn) \ - wx__DECLARE_EVT1(wxEVT_SPINCTRL, id, wxSpinEventHandler(fn)) - -#define EVT_SPINCTRLDOUBLE(id, fn) \ - wx__DECLARE_EVT1(wxEVT_SPINCTRLDOUBLE, id, wxSpinDoubleEventHandler(fn)) - -// ---------------------------------------------------------------------------- -// include the platform-dependent class implementation -// ---------------------------------------------------------------------------- - -// we may have a native wxSpinCtrl implementation, native wxSpinCtrl and -// wxSpinCtrlDouble implementations or neither, define the appropriate symbols -// and include the generic version if necessary to provide the missing class(es) - -#if defined(__WXUNIVERSAL__) - // nothing, use generic controls -#elif defined(__WXMSW__) - #define wxHAS_NATIVE_SPINCTRL - #include "wx/msw/spinctrl.h" -#elif defined(__WXGTK20__) - #define wxHAS_NATIVE_SPINCTRL - #define wxHAS_NATIVE_SPINCTRLDOUBLE - #include "wx/gtk/spinctrl.h" -#elif defined(__WXGTK__) - #define wxHAS_NATIVE_SPINCTRL - #include "wx/gtk1/spinctrl.h" -#elif defined(__WXQT__) - #define wxHAS_NATIVE_SPINCTRL - #define wxHAS_NATIVE_SPINCTRLDOUBLE - #include "wx/qt/spinctrl.h" -#endif // platform - -#if !defined(wxHAS_NATIVE_SPINCTRL) || !defined(wxHAS_NATIVE_SPINCTRLDOUBLE) - #include "wx/generic/spinctlg.h" -#endif -namespace wxPrivate -{ - -// This is an internal helper function currently used by all ports: return the -// string containing hexadecimal representation of the given number. -extern wxString wxSpinCtrlFormatAsHex(long val, long maxVal); - -} // namespace wxPrivate - -// old wxEVT_COMMAND_* constants -#define wxEVT_COMMAND_SPINCTRL_UPDATED wxEVT_SPINCTRL -#define wxEVT_COMMAND_SPINCTRLDOUBLE_UPDATED wxEVT_SPINCTRLDOUBLE - -#endif // wxUSE_SPINCTRL - -#endif // _WX_SPINCTRL_H_ diff --git a/Externals/wxWidgets3/include/wx/splash.h b/Externals/wxWidgets3/include/wx/splash.h deleted file mode 100644 index e4fb0c21ee..0000000000 --- a/Externals/wxWidgets3/include/wx/splash.h +++ /dev/null @@ -1,17 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/splash.h -// Purpose: Base header for wxSplashScreen -// Author: Julian Smart -// Modified by: -// Created: -// Copyright: (c) Julian Smart -// Licence: wxWindows Licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_SPLASH_H_BASE_ -#define _WX_SPLASH_H_BASE_ - -#include "wx/generic/splash.h" - -#endif - // _WX_SPLASH_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/splitter.h b/Externals/wxWidgets3/include/wx/splitter.h deleted file mode 100644 index e1f953e9ea..0000000000 --- a/Externals/wxWidgets3/include/wx/splitter.h +++ /dev/null @@ -1,40 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/splitter.h -// Purpose: Base header for wxSplitterWindow -// Author: Julian Smart -// Modified by: -// Created: -// Copyright: (c) Julian Smart -// Licence: wxWindows Licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_SPLITTER_H_BASE_ -#define _WX_SPLITTER_H_BASE_ - -#include "wx/event.h" - -// ---------------------------------------------------------------------------- -// wxSplitterWindow flags -// ---------------------------------------------------------------------------- - -#define wxSP_NOBORDER 0x0000 -#define wxSP_THIN_SASH 0x0000 // NB: the default is 3D sash -#define wxSP_NOSASH 0x0010 -#define wxSP_PERMIT_UNSPLIT 0x0040 -#define wxSP_LIVE_UPDATE 0x0080 -#define wxSP_3DSASH 0x0100 -#define wxSP_3DBORDER 0x0200 -#define wxSP_NO_XP_THEME 0x0400 -#define wxSP_BORDER wxSP_3DBORDER -#define wxSP_3D (wxSP_3DBORDER | wxSP_3DSASH) - -class WXDLLIMPEXP_FWD_CORE wxSplitterEvent; - -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_SPLITTER_SASH_POS_CHANGED, wxSplitterEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_SPLITTER_SASH_POS_CHANGING, wxSplitterEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_SPLITTER_DOUBLECLICKED, wxSplitterEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_SPLITTER_UNSPLIT, wxSplitterEvent ); - -#include "wx/generic/splitter.h" - -#endif // _WX_SPLITTER_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/srchctrl.h b/Externals/wxWidgets3/include/wx/srchctrl.h deleted file mode 100644 index b28d3912d1..0000000000 --- a/Externals/wxWidgets3/include/wx/srchctrl.h +++ /dev/null @@ -1,102 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/srchctrl.h -// Purpose: wxSearchCtrlBase class -// Author: Vince Harron -// Created: 2006-02-18 -// Copyright: (c) Vince Harron -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_SEARCHCTRL_H_BASE_ -#define _WX_SEARCHCTRL_H_BASE_ - -#include "wx/defs.h" - -#if wxUSE_SEARCHCTRL - -#include "wx/textctrl.h" - -#if !defined(__WXUNIVERSAL__) && defined(__WXMAC__) - // search control was introduced in Mac OS X 10.3 Panther - #define wxUSE_NATIVE_SEARCH_CONTROL 1 - - #define wxSearchCtrlBaseBaseClass wxTextCtrl -#else - // no native version, use the generic one - #define wxUSE_NATIVE_SEARCH_CONTROL 0 - - #include "wx/compositewin.h" - #include "wx/containr.h" - - class WXDLLIMPEXP_CORE wxSearchCtrlBaseBaseClass - : public wxCompositeWindow< wxNavigationEnabled >, - public wxTextCtrlIface - { - }; -#endif - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -extern WXDLLIMPEXP_DATA_CORE(const char) wxSearchCtrlNameStr[]; - -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SEARCHCTRL_CANCEL_BTN, wxCommandEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SEARCHCTRL_SEARCH_BTN, wxCommandEvent); - -// ---------------------------------------------------------------------------- -// a search ctrl is a text control with a search button and a cancel button -// it is based on the MacOSX 10.3 control HISearchFieldCreate -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxSearchCtrlBase : public wxSearchCtrlBaseBaseClass -{ -public: - wxSearchCtrlBase() { } - virtual ~wxSearchCtrlBase() { } - - // search control -#if wxUSE_MENUS - virtual void SetMenu(wxMenu *menu) = 0; - virtual wxMenu *GetMenu() = 0; -#endif // wxUSE_MENUS - - // get/set options - virtual void ShowSearchButton( bool show ) = 0; - virtual bool IsSearchButtonVisible() const = 0; - - virtual void ShowCancelButton( bool show ) = 0; - virtual bool IsCancelButtonVisible() const = 0; - -private: - // implement wxTextEntry pure virtual method - virtual wxWindow *GetEditableWindow() wxOVERRIDE { return this; } -}; - - -// include the platform-dependent class implementation -#if wxUSE_NATIVE_SEARCH_CONTROL - #if defined(__WXMAC__) - #include "wx/osx/srchctrl.h" - #endif -#else - #include "wx/generic/srchctlg.h" -#endif - -// ---------------------------------------------------------------------------- -// macros for handling search events -// ---------------------------------------------------------------------------- - -#define EVT_SEARCHCTRL_CANCEL_BTN(id, fn) \ - wx__DECLARE_EVT1(wxEVT_SEARCHCTRL_CANCEL_BTN, id, wxCommandEventHandler(fn)) - -#define EVT_SEARCHCTRL_SEARCH_BTN(id, fn) \ - wx__DECLARE_EVT1(wxEVT_SEARCHCTRL_SEARCH_BTN, id, wxCommandEventHandler(fn)) - -// old wxEVT_COMMAND_* constants -#define wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN wxEVT_SEARCHCTRL_CANCEL_BTN -#define wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN wxEVT_SEARCHCTRL_SEARCH_BTN - -#endif // wxUSE_SEARCHCTRL - -#endif // _WX_SEARCHCTRL_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/sstream.h b/Externals/wxWidgets3/include/wx/sstream.h deleted file mode 100644 index 19f37c58d3..0000000000 --- a/Externals/wxWidgets3/include/wx/sstream.h +++ /dev/null @@ -1,111 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/sstream.h -// Purpose: string-based streams -// Author: Vadim Zeitlin -// Modified by: -// Created: 2004-09-19 -// Copyright: (c) 2004 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_SSTREAM_H_ -#define _WX_SSTREAM_H_ - -#include "wx/stream.h" - -#if wxUSE_STREAMS - -// ---------------------------------------------------------------------------- -// wxStringInputStream is a stream reading from the given (fixed size) string -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxStringInputStream : public wxInputStream -{ -public: - // ctor associates the stream with the given string which makes a copy of - // it - wxStringInputStream(const wxString& s); - - virtual wxFileOffset GetLength() const wxOVERRIDE; - virtual bool IsSeekable() const wxOVERRIDE { return true; } - -protected: - virtual wxFileOffset OnSysSeek(wxFileOffset ofs, wxSeekMode mode) wxOVERRIDE; - virtual wxFileOffset OnSysTell() const wxOVERRIDE; - virtual size_t OnSysRead(void *buffer, size_t size) wxOVERRIDE; - -private: - // the string that was passed in the ctor - wxString m_str; - - // the buffer we're reading from - wxCharBuffer m_buf; - - // length of the buffer we're reading from - size_t m_len; - - // position in the stream in bytes, *not* in chars - size_t m_pos; - - wxDECLARE_NO_COPY_CLASS(wxStringInputStream); -}; - -// ---------------------------------------------------------------------------- -// wxStringOutputStream writes data to the given string, expanding it as needed -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxStringOutputStream : public wxOutputStream -{ -public: - // The stream will write data either to the provided string or to an - // internal string which can be retrieved using GetString() - // - // Note that the conversion object should have the life time greater than - // this stream. - wxStringOutputStream(wxString *pString = NULL, - wxMBConv& conv = wxConvUTF8) - : m_conv(conv) -#if wxUSE_UNICODE - , m_unconv(0) -#endif // wxUSE_UNICODE - { - m_str = pString ? pString : &m_strInternal; - m_pos = m_str->length() / sizeof(wxChar); - } - - // get the string containing current output - const wxString& GetString() const { return *m_str; } - - virtual bool IsSeekable() const wxOVERRIDE { return true; } - -protected: - virtual wxFileOffset OnSysTell() const wxOVERRIDE; - virtual size_t OnSysWrite(const void *buffer, size_t size) wxOVERRIDE; - -private: - // internal string, not used if caller provided his own string - wxString m_strInternal; - - // pointer given by the caller or just pointer to m_strInternal - wxString *m_str; - - // position in the stream in bytes, *not* in chars - size_t m_pos; - - // converter to use: notice that with the default UTF-8 one the input - // stream must contain valid UTF-8 data, use wxConvISO8859_1 to work with - // arbitrary 8 bit data - wxMBConv& m_conv; - -#if wxUSE_UNICODE - // unconverted data from the last call to OnSysWrite() - wxMemoryBuffer m_unconv; -#endif // wxUSE_UNICODE - - wxDECLARE_NO_COPY_CLASS(wxStringOutputStream); -}; - -#endif // wxUSE_STREAMS - -#endif // _WX_SSTREAM_H_ - diff --git a/Externals/wxWidgets3/include/wx/stack.h b/Externals/wxWidgets3/include/wx/stack.h deleted file mode 100644 index b4e8ed2f8a..0000000000 --- a/Externals/wxWidgets3/include/wx/stack.h +++ /dev/null @@ -1,85 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/stack.h -// Purpose: STL stack clone -// Author: Lindsay Mathieson, Vadim Zeitlin -// Created: 30.07.2001 -// Copyright: (c) 2001 Lindsay Mathieson (WX_DECLARE_STACK) -// 2011 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_STACK_H_ -#define _WX_STACK_H_ - -#include "wx/vector.h" - -#if wxUSE_STD_CONTAINERS - -#include -#define wxStack std::stack - -#else // !wxUSE_STD_CONTAINERS - -// Notice that unlike std::stack, wxStack currently always uses wxVector and -// can't be used with any other underlying container type. -// -// Another difference is that comparison operators between stacks are not -// implemented (but they should be, see 23.2.3.3 of ISO/IEC 14882:1998). - -template -class wxStack -{ -public: - typedef wxVector container_type; - typedef typename container_type::size_type size_type; - typedef typename container_type::value_type value_type; - - wxStack() { } - explicit wxStack(const container_type& cont) : m_cont(cont) { } - - // Default copy ctor, assignment operator and dtor are ok. - - - bool empty() const { return m_cont.empty(); } - size_type size() const { return m_cont.size(); } - - value_type& top() { return m_cont.back(); } - const value_type& top() const { return m_cont.back(); } - - void push(const value_type& val) { m_cont.push_back(val); } - void pop() { m_cont.pop_back(); } - -private: - container_type m_cont; -}; - -#endif // wxUSE_STD_CONTAINERS/!wxUSE_STD_CONTAINERS - - -// Deprecated macro-based class for compatibility only, don't use any more. -#define WX_DECLARE_STACK(obj, cls) \ -class cls : public wxVector \ -{\ -public:\ - void push(const obj& o)\ - {\ - push_back(o); \ - };\ -\ - void pop()\ - {\ - pop_back(); \ - };\ -\ - obj& top()\ - {\ - return at(size() - 1);\ - };\ - const obj& top() const\ - {\ - return at(size() - 1); \ - };\ -} - -#endif // _WX_STACK_H_ - diff --git a/Externals/wxWidgets3/include/wx/stackwalk.h b/Externals/wxWidgets3/include/wx/stackwalk.h deleted file mode 100644 index 1133d6ef7c..0000000000 --- a/Externals/wxWidgets3/include/wx/stackwalk.h +++ /dev/null @@ -1,159 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/stackwalk.h -// Purpose: wxStackWalker and related classes, common part -// Author: Vadim Zeitlin -// Modified by: -// Created: 2005-01-07 -// Copyright: (c) 2004 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_STACKWALK_H_ -#define _WX_STACKWALK_H_ - -#include "wx/defs.h" - -#if wxUSE_STACKWALKER - -class WXDLLIMPEXP_FWD_BASE wxStackFrame; - -#define wxSTACKWALKER_MAX_DEPTH (200) - -// ---------------------------------------------------------------------------- -// wxStackFrame: a single stack level -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxStackFrameBase -{ -private: - // put this inline function here so that it is defined before use - wxStackFrameBase *ConstCast() const - { return const_cast(this); } - -public: - wxStackFrameBase(size_t level, void *address = NULL) - { - m_level = level; - - m_line = - m_offset = 0; - - m_address = address; - } - - // get the level of this frame (deepest/innermost one is 0) - size_t GetLevel() const { return m_level; } - - // return the address of this frame - void *GetAddress() const { return m_address; } - - - // return the unmangled (if possible) name of the function containing this - // frame - wxString GetName() const { ConstCast()->OnGetName(); return m_name; } - - // return the instruction pointer offset from the start of the function - size_t GetOffset() const { ConstCast()->OnGetName(); return m_offset; } - - // get the module this function belongs to (not always available) - wxString GetModule() const { ConstCast()->OnGetName(); return m_module; } - - - // return true if we have the filename and line number for this frame - bool HasSourceLocation() const { return !GetFileName().empty(); } - - // return the name of the file containing this frame, empty if - // unavailable (typically because debug info is missing) - wxString GetFileName() const - { ConstCast()->OnGetLocation(); return m_filename; } - - // return the line number of this frame, 0 if unavailable - size_t GetLine() const { ConstCast()->OnGetLocation(); return m_line; } - - - // return the number of parameters of this function (may return 0 if we - // can't retrieve the parameters info even although the function does have - // parameters) - virtual size_t GetParamCount() const { return 0; } - - // get the name, type and value (in text form) of the given parameter - // - // any pointer may be NULL - // - // return true if at least some values could be retrieved - virtual bool GetParam(size_t WXUNUSED(n), - wxString * WXUNUSED(type), - wxString * WXUNUSED(name), - wxString * WXUNUSED(value)) const - { - return false; - } - - - // although this class is not supposed to be used polymorphically, give it - // a virtual dtor to silence compiler warnings - virtual ~wxStackFrameBase() { } - -protected: - // hooks for derived classes to initialize some fields on demand - virtual void OnGetName() { } - virtual void OnGetLocation() { } - - - // fields are protected, not private, so that OnGetXXX() could modify them - // directly - size_t m_level; - - wxString m_name, - m_module, - m_filename; - - size_t m_line; - - void *m_address; - size_t m_offset; -}; - -// ---------------------------------------------------------------------------- -// wxStackWalker: class for enumerating stack frames -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxStackWalkerBase -{ -public: - // ctor does nothing, use Walk() to walk the stack - wxStackWalkerBase() { } - - // dtor does nothing neither but should be virtual - virtual ~wxStackWalkerBase() { } - - // enumerate stack frames from the current location, skipping the initial - // number of them (this can be useful when Walk() is called from some known - // location and you don't want to see the first few frames anyhow; also - // notice that Walk() frame itself is not included if skip >= 1) - virtual void Walk(size_t skip = 1, size_t maxDepth = wxSTACKWALKER_MAX_DEPTH) = 0; - -#if wxUSE_ON_FATAL_EXCEPTION - // enumerate stack frames from the location of uncaught exception - // - // this version can only be called from wxApp::OnFatalException() - virtual void WalkFromException(size_t maxDepth = wxSTACKWALKER_MAX_DEPTH) = 0; -#endif // wxUSE_ON_FATAL_EXCEPTION - -protected: - // this function must be overrided to process the given frame - virtual void OnStackFrame(const wxStackFrame& frame) = 0; -}; - -#ifdef __WINDOWS__ - #include "wx/msw/stackwalk.h" -#elif defined(__UNIX__) - #include "wx/unix/stackwalk.h" -#else - #error "wxStackWalker is not supported, set wxUSE_STACKWALKER to 0" -#endif - -#endif // wxUSE_STACKWALKER - -#endif // _WX_STACKWALK_H_ - diff --git a/Externals/wxWidgets3/include/wx/statbmp.h b/Externals/wxWidgets3/include/wx/statbmp.h deleted file mode 100644 index ea888cd501..0000000000 --- a/Externals/wxWidgets3/include/wx/statbmp.h +++ /dev/null @@ -1,84 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/statbmp.h -// Purpose: wxStaticBitmap class interface -// Author: Vadim Zeitlin -// Modified by: -// Created: 25.08.00 -// Copyright: (c) 2000 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_STATBMP_H_BASE_ -#define _WX_STATBMP_H_BASE_ - -#include "wx/defs.h" - -#if wxUSE_STATBMP - -#include "wx/control.h" -#include "wx/bitmap.h" -#include "wx/icon.h" - -extern WXDLLIMPEXP_DATA_CORE(const char) wxStaticBitmapNameStr[]; - -// a control showing an icon or a bitmap -class WXDLLIMPEXP_CORE wxStaticBitmapBase : public wxControl -{ -public: - enum ScaleMode - { - Scale_None, - Scale_Fill, - Scale_AspectFit, - Scale_AspectFill - }; - - wxStaticBitmapBase() { } - virtual ~wxStaticBitmapBase(); - - // our interface - virtual void SetIcon(const wxIcon& icon) = 0; - virtual void SetBitmap(const wxBitmap& bitmap) = 0; - virtual wxBitmap GetBitmap() const = 0; - virtual wxIcon GetIcon() const /* = 0 -- should be pure virtual */ - { - // stub it out here for now as not all ports implement it (but they - // should) - return wxIcon(); - } - virtual void SetScaleMode(ScaleMode WXUNUSED(scaleMode)) { } - virtual ScaleMode GetScaleMode() const { return Scale_None; } - - // overridden base class virtuals - virtual bool AcceptsFocus() const wxOVERRIDE { return false; } - virtual bool HasTransparentBackground() wxOVERRIDE { return true; } - -protected: - // choose the default border for this window - virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } - - virtual wxSize DoGetBestSize() const wxOVERRIDE; - - wxDECLARE_NO_COPY_CLASS(wxStaticBitmapBase); -}; - -#if defined(__WXUNIVERSAL__) - #include "wx/univ/statbmp.h" -#elif defined(__WXMSW__) - #include "wx/msw/statbmp.h" -#elif defined(__WXMOTIF__) - #include "wx/motif/statbmp.h" -#elif defined(__WXGTK20__) - #include "wx/gtk/statbmp.h" -#elif defined(__WXGTK__) - #include "wx/gtk1/statbmp.h" -#elif defined(__WXMAC__) - #include "wx/osx/statbmp.h" -#elif defined(__WXQT__) - #include "wx/qt/statbmp.h" -#endif - -#endif // wxUSE_STATBMP - -#endif - // _WX_STATBMP_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/statbox.h b/Externals/wxWidgets3/include/wx/statbox.h deleted file mode 100644 index 968903b009..0000000000 --- a/Externals/wxWidgets3/include/wx/statbox.h +++ /dev/null @@ -1,74 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/statbox.h -// Purpose: wxStaticBox base header -// Author: Julian Smart -// Modified by: -// Created: -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_STATBOX_H_BASE_ -#define _WX_STATBOX_H_BASE_ - -#include "wx/defs.h" - -#if wxUSE_STATBOX - -#include "wx/control.h" -#include "wx/containr.h" - -extern WXDLLIMPEXP_DATA_CORE(const char) wxStaticBoxNameStr[]; - -// ---------------------------------------------------------------------------- -// wxStaticBox: a grouping box with a label -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxStaticBoxBase : public wxNavigationEnabled -{ -public: - wxStaticBoxBase(); - - // overridden base class virtuals - virtual bool HasTransparentBackground() wxOVERRIDE { return true; } - - // implementation only: this is used by wxStaticBoxSizer to account for the - // need for extra space taken by the static box - // - // the top border is the margin at the top (where the title is), - // borderOther is the margin on all other sides - virtual void GetBordersForSizer(int *borderTop, int *borderOther) const - { - const int BORDER = FromDIP(5); // FIXME: hardcoded value - - *borderTop = GetLabel().empty() ? BORDER : GetCharHeight(); - *borderOther = BORDER; - } - -protected: - // choose the default border for this window - virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } - - wxDECLARE_NO_COPY_CLASS(wxStaticBoxBase); -}; - -#if defined(__WXUNIVERSAL__) - #include "wx/univ/statbox.h" -#elif defined(__WXMSW__) - #include "wx/msw/statbox.h" -#elif defined(__WXMOTIF__) - #include "wx/motif/statbox.h" -#elif defined(__WXGTK20__) - #include "wx/gtk/statbox.h" -#elif defined(__WXGTK__) - #include "wx/gtk1/statbox.h" -#elif defined(__WXMAC__) - #include "wx/osx/statbox.h" -#elif defined(__WXQT__) - #include "wx/qt/statbox.h" -#endif - -#endif // wxUSE_STATBOX - -#endif - // _WX_STATBOX_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/statline.h b/Externals/wxWidgets3/include/wx/statline.h deleted file mode 100644 index 49023d58ba..0000000000 --- a/Externals/wxWidgets3/include/wx/statline.h +++ /dev/null @@ -1,103 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/statline.h -// Purpose: wxStaticLine class interface -// Author: Vadim Zeitlin -// Created: 28.06.99 -// Copyright: (c) 1999 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_STATLINE_H_BASE_ -#define _WX_STATLINE_H_BASE_ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// this defines wxUSE_STATLINE -#include "wx/defs.h" - -#if wxUSE_STATLINE - -// the base class declaration -#include "wx/control.h" - -// ---------------------------------------------------------------------------- -// global variables -// ---------------------------------------------------------------------------- - -// the default name for objects of class wxStaticLine -extern WXDLLIMPEXP_DATA_CORE(const char) wxStaticLineNameStr[]; - -// ---------------------------------------------------------------------------- -// wxStaticLine - a line in a dialog -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxStaticLineBase : public wxControl -{ -public: - // constructor - wxStaticLineBase() { } - - // is the line vertical? - bool IsVertical() const { return (GetWindowStyle() & wxLI_VERTICAL) != 0; } - - // get the default size for the "lesser" dimension of the static line - static int GetDefaultSize() { return 2; } - - // overridden base class virtuals - virtual bool AcceptsFocus() const wxOVERRIDE { return false; } - -protected: - // choose the default border for this window - virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } - - // set the right size for the right dimension - wxSize AdjustSize(const wxSize& size) const - { - wxSize sizeReal(size); - if ( IsVertical() ) - { - if ( size.x == wxDefaultCoord ) - sizeReal.x = GetDefaultSize(); - } - else - { - if ( size.y == wxDefaultCoord ) - sizeReal.y = GetDefaultSize(); - } - - return sizeReal; - } - - virtual wxSize DoGetBestSize() const wxOVERRIDE - { - return AdjustSize(wxDefaultSize); - } - - wxDECLARE_NO_COPY_CLASS(wxStaticLineBase); -}; - -// ---------------------------------------------------------------------------- -// now include the actual class declaration -// ---------------------------------------------------------------------------- - -#if defined(__WXUNIVERSAL__) - #include "wx/univ/statline.h" -#elif defined(__WXMSW__) - #include "wx/msw/statline.h" -#elif defined(__WXGTK20__) - #include "wx/gtk/statline.h" -#elif defined(__WXGTK__) - #include "wx/gtk1/statline.h" -#elif defined(__WXMAC__) - #include "wx/osx/statline.h" -#elif defined(__WXQT__) - #include "wx/qt/statline.h" -#else // use generic implementation for all other platforms - #include "wx/generic/statline.h" -#endif - -#endif // wxUSE_STATLINE - -#endif // _WX_STATLINE_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/stattext.h b/Externals/wxWidgets3/include/wx/stattext.h deleted file mode 100644 index 237f93620e..0000000000 --- a/Externals/wxWidgets3/include/wx/stattext.h +++ /dev/null @@ -1,113 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/stattext.h -// Purpose: wxStaticText base header -// Author: Julian Smart -// Modified by: -// Created: -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_STATTEXT_H_BASE_ -#define _WX_STATTEXT_H_BASE_ - -#include "wx/defs.h" - -#if wxUSE_STATTEXT - -#include "wx/control.h" - -/* - * wxStaticText flags - */ -#define wxST_NO_AUTORESIZE 0x0001 -// free 0x0002 bit -#define wxST_ELLIPSIZE_START 0x0004 -#define wxST_ELLIPSIZE_MIDDLE 0x0008 -#define wxST_ELLIPSIZE_END 0x0010 - -#define wxST_ELLIPSIZE_MASK \ - (wxST_ELLIPSIZE_START | wxST_ELLIPSIZE_MIDDLE | wxST_ELLIPSIZE_END) - -extern WXDLLIMPEXP_DATA_CORE(const char) wxStaticTextNameStr[]; - -class WXDLLIMPEXP_CORE wxStaticTextBase : public wxControl -{ -public: - wxStaticTextBase() { } - - // wrap the text of the control so that no line is longer than the given - // width (if possible: this function won't break words) - // This function will modify the value returned by GetLabel()! - void Wrap(int width); - - // overridden base virtuals - virtual bool AcceptsFocus() const wxOVERRIDE { return false; } - virtual bool HasTransparentBackground() wxOVERRIDE { return true; } - - bool IsEllipsized() const - { - return (GetWindowStyle() & wxST_ELLIPSIZE_MASK) != 0; - } - -protected: // functions required for wxST_ELLIPSIZE_* support - - // choose the default border for this window - virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } - - // Calls Ellipsize() on the real label if necessary. Unlike GetLabelText(), - // keeps the mnemonics instead of removing them. - virtual wxString GetEllipsizedLabel() const; - - // Replaces parts of the string with ellipsis according to the ellipsize - // style. Shouldn't be called if we don't have any. - wxString Ellipsize(const wxString& label) const; - - // to be called when updating the size of the static text: - // updates the label redoing ellipsization calculations - void UpdateLabel(); - - // These functions are platform-specific and must be overridden in ports - // which do not natively support ellipsization and they must be implemented - // in a way so that the m_labelOrig member of wxControl is not touched: - - // returns the real label currently displayed inside the control. - virtual wxString DoGetLabel() const { return wxEmptyString; } - - // sets the real label currently displayed inside the control, - // _without_ invalidating the size. The text passed is always markup-free - // but may contain the mnemonic characters. - virtual void DoSetLabel(const wxString& WXUNUSED(str)) { } - - // Update the current size to match the best size unless wxST_NO_AUTORESIZE - // style is explicitly used. - void AutoResizeIfNecessary(); - -private: - wxDECLARE_NO_COPY_CLASS(wxStaticTextBase); -}; - -// see wx/generic/stattextg.h for the explanation -#ifndef wxNO_PORT_STATTEXT_INCLUDE - -#if defined(__WXUNIVERSAL__) - #include "wx/univ/stattext.h" -#elif defined(__WXMSW__) - #include "wx/msw/stattext.h" -#elif defined(__WXMOTIF__) - #include "wx/motif/stattext.h" -#elif defined(__WXGTK20__) - #include "wx/gtk/stattext.h" -#elif defined(__WXGTK__) - #include "wx/gtk1/stattext.h" -#elif defined(__WXMAC__) - #include "wx/osx/stattext.h" -#elif defined(__WXQT__) - #include "wx/qt/stattext.h" -#endif - -#endif // !wxNO_PORT_STATTEXT_INCLUDE - -#endif // wxUSE_STATTEXT - -#endif // _WX_STATTEXT_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/statusbr.h b/Externals/wxWidgets3/include/wx/statusbr.h deleted file mode 100644 index 375ee8dfc0..0000000000 --- a/Externals/wxWidgets3/include/wx/statusbr.h +++ /dev/null @@ -1,250 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/statusbr.h -// Purpose: wxStatusBar class interface -// Author: Vadim Zeitlin -// Modified by: -// Created: 05.02.00 -// Copyright: (c) Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_STATUSBR_H_BASE_ -#define _WX_STATUSBR_H_BASE_ - -#include "wx/defs.h" - -#if wxUSE_STATUSBAR - -#include "wx/control.h" -#include "wx/list.h" -#include "wx/dynarray.h" - -extern WXDLLIMPEXP_DATA_CORE(const char) wxStatusBarNameStr[]; - -// ---------------------------------------------------------------------------- -// wxStatusBar constants -// ---------------------------------------------------------------------------- - -// wxStatusBar styles -#define wxSTB_SIZEGRIP 0x0010 -#define wxSTB_SHOW_TIPS 0x0020 - -#define wxSTB_ELLIPSIZE_START 0x0040 -#define wxSTB_ELLIPSIZE_MIDDLE 0x0080 -#define wxSTB_ELLIPSIZE_END 0x0100 - -#define wxSTB_DEFAULT_STYLE (wxSTB_SIZEGRIP|wxSTB_ELLIPSIZE_END|wxSTB_SHOW_TIPS|wxFULL_REPAINT_ON_RESIZE) - - -// old compat style name: -#define wxST_SIZEGRIP wxSTB_SIZEGRIP - - -// style flags for wxStatusBar fields -#define wxSB_NORMAL 0x0000 -#define wxSB_FLAT 0x0001 -#define wxSB_RAISED 0x0002 -#define wxSB_SUNKEN 0x0003 - -// ---------------------------------------------------------------------------- -// wxStatusBarPane: an helper for wxStatusBar -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxStatusBarPane -{ -public: - wxStatusBarPane(int style = wxSB_NORMAL, int width = 0) - : m_nStyle(style), m_nWidth(width) - { m_bEllipsized = false; } - - int GetWidth() const { return m_nWidth; } - int GetStyle() const { return m_nStyle; } - wxString GetText() const { return m_text; } - - - // implementation-only from now on - // ------------------------------- - - bool IsEllipsized() const - { return m_bEllipsized; } - void SetIsEllipsized(bool isEllipsized) { m_bEllipsized = isEllipsized; } - - void SetWidth(int width) { m_nWidth = width; } - void SetStyle(int style) { m_nStyle = style; } - - // set text, return true if it changed or false if it was already set to - // this value - bool SetText(const wxString& text); - - // save the existing text on top of our stack and make the new text - // current; return true if the text really changed - bool PushText(const wxString& text); - - // restore the message saved by the last call to Push() (unless it was - // changed by an intervening call to SetText()) and return true if we - // really restored anything - bool PopText(); - -private: - int m_nStyle; - int m_nWidth; // may be negative, indicating a variable-width field - wxString m_text; - - // the array used to keep the previous values of this pane after a - // PushStatusText() call, its top element is the value to restore after the - // next PopStatusText() call while the currently shown value is always in - // m_text - wxArrayString m_arrStack; - - // is the currently shown value shown with ellipsis in the status bar? - bool m_bEllipsized; -}; - -WX_DECLARE_EXPORTED_OBJARRAY(wxStatusBarPane, wxStatusBarPaneArray); - -// ---------------------------------------------------------------------------- -// wxStatusBar: a window near the bottom of the frame used for status info -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxStatusBarBase : public wxControl -{ -public: - wxStatusBarBase(); - - virtual ~wxStatusBarBase(); - - // field count - // ----------- - - // set the number of fields and call SetStatusWidths(widths) if widths are - // given - virtual void SetFieldsCount(int number = 1, const int *widths = NULL); - int GetFieldsCount() const { return (int)m_panes.GetCount(); } - - // field text - // ---------- - - // just change or get the currently shown text - void SetStatusText(const wxString& text, int number = 0); - wxString GetStatusText(int number = 0) const; - - // change the currently shown text to the new one and save the current - // value to be restored by the next call to PopStatusText() - void PushStatusText(const wxString& text, int number = 0); - void PopStatusText(int number = 0); - - // fields widths - // ------------- - - // set status field widths as absolute numbers: positive widths mean that - // the field has the specified absolute width, negative widths are - // interpreted as the sizer options, i.e. the extra space (total space - // minus the sum of fixed width fields) is divided between the fields with - // negative width according to the abs value of the width (field with width - // -2 grows twice as much as one with width -1 &c) - virtual void SetStatusWidths(int n, const int widths[]); - - int GetStatusWidth(int n) const - { return m_panes[n].GetWidth(); } - - // field styles - // ------------ - - // Set the field border style to one of wxSB_XXX values. - virtual void SetStatusStyles(int n, const int styles[]); - - int GetStatusStyle(int n) const - { return m_panes[n].GetStyle(); } - - // geometry - // -------- - - // Get the position and size of the field's internal bounding rectangle - virtual bool GetFieldRect(int i, wxRect& rect) const = 0; - - // sets the minimal vertical size of the status bar - virtual void SetMinHeight(int height) = 0; - - // get the dimensions of the horizontal and vertical borders - virtual int GetBorderX() const = 0; - virtual int GetBorderY() const = 0; - - wxSize GetBorders() const - { return wxSize(GetBorderX(), GetBorderY()); } - - // miscellaneous - // ------------- - - const wxStatusBarPane& GetField(int n) const - { return m_panes[n]; } - - // wxWindow overrides: - - // don't want status bars to accept the focus at all - virtual bool AcceptsFocus() const wxOVERRIDE { return false; } - - // the client size of a toplevel window doesn't include the status bar - virtual bool CanBeOutsideClientArea() const wxOVERRIDE { return true; } - -protected: - // called after the status bar pane text changed and should update its - // display - virtual void DoUpdateStatusText(int number) = 0; - - - // wxWindow overrides: - -#if wxUSE_TOOLTIPS - virtual void DoSetToolTip( wxToolTip *tip ) wxOVERRIDE - { - wxASSERT_MSG(!HasFlag(wxSTB_SHOW_TIPS), - "Do not set tooltip(s) manually when using wxSTB_SHOW_TIPS!"); - wxWindow::DoSetToolTip(tip); - } -#endif // wxUSE_TOOLTIPS - virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } - - - // internal helpers & data: - - // calculate the real field widths for the given total available size - wxArrayInt CalculateAbsWidths(wxCoord widthTotal) const; - - // should be called to remember if the pane text is currently being show - // ellipsized or not - void SetEllipsizedFlag(int n, bool isEllipsized); - - - // the array with the pane infos: - wxStatusBarPaneArray m_panes; - - // if true overrides the width info of the wxStatusBarPanes - bool m_bSameWidthForAllPanes; - - wxDECLARE_NO_COPY_CLASS(wxStatusBarBase); -}; - -// ---------------------------------------------------------------------------- -// include the actual wxStatusBar class declaration -// ---------------------------------------------------------------------------- - -#if defined(__WXUNIVERSAL__) - #define wxStatusBarUniv wxStatusBar - #include "wx/univ/statusbr.h" -#elif defined(__WXMSW__) && wxUSE_NATIVE_STATUSBAR - #include "wx/msw/statusbar.h" -#elif defined(__WXMAC__) - #define wxStatusBarMac wxStatusBar - #include "wx/generic/statusbr.h" - #include "wx/osx/statusbr.h" -#elif defined(__WXQT__) - #include "wx/qt/statusbar.h" -#else - #define wxStatusBarGeneric wxStatusBar - #include "wx/generic/statusbr.h" -#endif - -#endif // wxUSE_STATUSBAR - -#endif - // _WX_STATUSBR_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/stdpaths.h b/Externals/wxWidgets3/include/wx/stdpaths.h deleted file mode 100644 index 5528626e81..0000000000 --- a/Externals/wxWidgets3/include/wx/stdpaths.h +++ /dev/null @@ -1,234 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/stdpaths.h -// Purpose: declaration of wxStandardPaths class -// Author: Vadim Zeitlin -// Modified by: -// Created: 2004-10-17 -// Copyright: (c) 2004 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_STDPATHS_H_ -#define _WX_STDPATHS_H_ - -#include "wx/defs.h" - -#include "wx/string.h" -#include "wx/filefn.h" - -class WXDLLIMPEXP_FWD_BASE wxStandardPaths; - -// ---------------------------------------------------------------------------- -// wxStandardPaths returns the standard locations in the file system -// ---------------------------------------------------------------------------- - -// NB: This is always compiled in, wxUSE_STDPATHS=0 only disables native -// wxStandardPaths class, but a minimal version is always available -class WXDLLIMPEXP_BASE wxStandardPathsBase -{ -public: - // possible resources categories - enum ResourceCat - { - // no special category - ResourceCat_None, - - // message catalog resources - ResourceCat_Messages, - - // end of enum marker - ResourceCat_Max - }; - - // what should we use to construct paths unique to this application: - // (AppInfo_AppName and AppInfo_VendorName can be combined together) - enum - { - AppInfo_None = 0, // nothing - AppInfo_AppName = 1, // the application name - AppInfo_VendorName = 2 // the vendor name - }; - - enum Dir - { - Dir_Documents, - Dir_Desktop, - Dir_Downloads, - Dir_Music, - Dir_Pictures, - Dir_Videos - }; - - // return the global standard paths object - static wxStandardPaths& Get(); - - // return the path (directory+filename) of the running executable or - // wxEmptyString if it couldn't be determined. - // The path is returned as an absolute path whenever possible. - // Default implementation only try to use wxApp->argv[0]. - virtual wxString GetExecutablePath() const; - - // return the directory with system config files: - // /etc under Unix, c:\Documents and Settings\All Users\Application Data - // under Windows, /Library/Preferences for Mac - virtual wxString GetConfigDir() const = 0; - - // return the directory for the user config files: - // $HOME under Unix, c:\Documents and Settings\username under Windows, - // ~/Library/Preferences under Mac - // - // only use this if you have a single file to put there, otherwise - // GetUserDataDir() is more appropriate - virtual wxString GetUserConfigDir() const = 0; - - // return the location of the applications global, i.e. not user-specific, - // data files - // - // prefix/share/appname under Unix, c:\Program Files\appname under Windows, - // appname.app/Contents/SharedSupport app bundle directory under Mac - virtual wxString GetDataDir() const = 0; - - // return the location for application data files which are host-specific - // - // same as GetDataDir() except under Unix where it is /etc/appname - virtual wxString GetLocalDataDir() const; - - // return the directory for the user-dependent application data files - // - // $HOME/.appname under Unix, - // c:\Documents and Settings\username\Application Data\appname under Windows - // and ~/Library/Application Support/appname under Mac - virtual wxString GetUserDataDir() const = 0; - - // return the directory for user data files which shouldn't be shared with - // the other machines - // - // same as GetUserDataDir() for all platforms except Windows where it is - // the "Local Settings\Application Data\appname" directory - virtual wxString GetUserLocalDataDir() const; - - // return the directory where the loadable modules (plugins) live - // - // prefix/lib/appname under Unix, program directory under Windows and - // Contents/Plugins app bundle subdirectory under Mac - virtual wxString GetPluginsDir() const = 0; - - // get resources directory: resources are auxiliary files used by the - // application and include things like image and sound files - // - // same as GetDataDir() for all platforms except Mac where it returns - // Contents/Resources subdirectory of the app bundle - virtual wxString GetResourcesDir() const { return GetDataDir(); } - - // get localized resources directory containing the resource files of the - // specified category for the given language - // - // in general this is just GetResourcesDir()/lang under Windows and Unix - // and GetResourcesDir()/lang.lproj under Mac but is something quite - // different under Unix for message catalog category (namely the standard - // prefix/share/locale/lang/LC_MESSAGES) - virtual wxString - GetLocalizedResourcesDir(const wxString& lang, - ResourceCat WXUNUSED(category) - = ResourceCat_None) const - { - return GetResourcesDir() + wxFILE_SEP_PATH + lang; - } - - // return the "Documents" directory for the current user - // - // C:\Documents and Settings\username\My Documents under Windows, - // $HOME under Unix and ~/Documents under Mac - virtual wxString GetDocumentsDir() const - { - return GetUserDir(Dir_Documents); - } - - // return the directory for the documents files used by this application: - // it's a subdirectory of GetDocumentsDir() constructed using the - // application name/vendor if it exists or just GetDocumentsDir() otherwise - virtual wxString GetAppDocumentsDir() const; - - // return the temporary directory for the current user - virtual wxString GetTempDir() const; - - virtual wxString GetUserDir(Dir userDir) const; - - // virtual dtor for the base class - virtual ~wxStandardPathsBase(); - - // Information used by AppendAppInfo - void UseAppInfo(int info) - { - m_usedAppInfo = info; - } - - bool UsesAppInfo(int info) const { return (m_usedAppInfo & info) != 0; } - - -protected: - // Ctor is protected as this is a base class which should never be created - // directly. - wxStandardPathsBase(); - - // append the path component, with a leading path separator if a - // path separator or dot (.) is not already at the end of dir - static wxString AppendPathComponent(const wxString& dir, const wxString& component); - - // append application information determined by m_usedAppInfo to dir - wxString AppendAppInfo(const wxString& dir) const; - - - // combination of AppInfo_XXX flags used by AppendAppInfo() - int m_usedAppInfo; -}; - -#if wxUSE_STDPATHS - #if defined(__WINDOWS__) - #include "wx/msw/stdpaths.h" - #define wxHAS_NATIVE_STDPATHS - #elif defined(__WXOSX_COCOA__) || defined(__WXOSX_IPHONE__) || defined(__DARWIN__) - #include "wx/osx/cocoa/stdpaths.h" - #define wxHAS_NATIVE_STDPATHS - #elif defined(__UNIX__) - #include "wx/unix/stdpaths.h" - #define wxHAS_NATIVE_STDPATHS - #endif -#endif - -// ---------------------------------------------------------------------------- -// Minimal generic implementation -// ---------------------------------------------------------------------------- - -// NB: Note that this minimal implementation is compiled in even if -// wxUSE_STDPATHS=0, so that our code can still use wxStandardPaths. - -#ifndef wxHAS_NATIVE_STDPATHS -class WXDLLIMPEXP_BASE wxStandardPaths : public wxStandardPathsBase -{ -public: - void SetInstallPrefix(const wxString& prefix) { m_prefix = prefix; } - wxString GetInstallPrefix() const { return m_prefix; } - - virtual wxString GetExecutablePath() const { return m_prefix; } - virtual wxString GetConfigDir() const { return m_prefix; } - virtual wxString GetUserConfigDir() const { return m_prefix; } - virtual wxString GetDataDir() const { return m_prefix; } - virtual wxString GetLocalDataDir() const { return m_prefix; } - virtual wxString GetUserDataDir() const { return m_prefix; } - virtual wxString GetPluginsDir() const { return m_prefix; } - virtual wxString GetUserDir(Dir WXUNUSED(userDir)) const { return m_prefix; } - -protected: - // Ctor is protected because wxStandardPaths::Get() should always be used - // to access the global wxStandardPaths object of the correct type instead - // of creating one of a possibly wrong type yourself. - wxStandardPaths() { } - -private: - wxString m_prefix; -}; -#endif // !wxHAS_NATIVE_STDPATHS - -#endif // _WX_STDPATHS_H_ - diff --git a/Externals/wxWidgets3/include/wx/stdstream.h b/Externals/wxWidgets3/include/wx/stdstream.h deleted file mode 100644 index 3cf565b624..0000000000 --- a/Externals/wxWidgets3/include/wx/stdstream.h +++ /dev/null @@ -1,122 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/stdstream.h -// Purpose: Header of std::istream and std::ostream derived wrappers for -// wxInputStream and wxOutputStream -// Author: Jonathan Liu -// Created: 2009-05-02 -// Copyright: (c) 2009 Jonathan Liu -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_STDSTREAM_H_ -#define _WX_STDSTREAM_H_ - -#include "wx/defs.h" // wxUSE_STD_IOSTREAM - -#if wxUSE_STREAMS && wxUSE_STD_IOSTREAM - -#include "wx/defs.h" -#include "wx/stream.h" -#include "wx/ioswrap.h" - -// ========================================================================== -// wxStdInputStreamBuffer -// ========================================================================== - -class WXDLLIMPEXP_BASE wxStdInputStreamBuffer : public std::streambuf -{ -public: - wxStdInputStreamBuffer(wxInputStream& stream); - virtual ~wxStdInputStreamBuffer() { } - -protected: - virtual std::streambuf *setbuf(char *s, std::streamsize n) wxOVERRIDE; - virtual std::streampos seekoff(std::streamoff off, - std::ios_base::seekdir way, - std::ios_base::openmode which = - std::ios_base::in | - std::ios_base::out) wxOVERRIDE; - virtual std::streampos seekpos(std::streampos sp, - std::ios_base::openmode which = - std::ios_base::in | - std::ios_base::out) wxOVERRIDE; - virtual std::streamsize showmanyc() wxOVERRIDE; - virtual std::streamsize xsgetn(char *s, std::streamsize n) wxOVERRIDE; - virtual int underflow() wxOVERRIDE; - virtual int uflow() wxOVERRIDE; - virtual int pbackfail(int c = EOF) wxOVERRIDE; - - // Special work around for VC8/9 (this bug was fixed in VC10 and later): - // these versions have non-standard _Xsgetn_s() that it being called from - // the stream code instead of xsgetn() and so our overridden implementation - // never actually gets used. To work around this, forward to it explicitly. -#if defined(__VISUALC8__) || defined(__VISUALC9__) - virtual std::streamsize - _Xsgetn_s(char *s, size_t WXUNUSED(size), std::streamsize n) - { - return xsgetn(s, n); - } -#endif // VC8 or VC9 - - wxInputStream& m_stream; - int m_lastChar; -}; - -// ========================================================================== -// wxStdInputStream -// ========================================================================== - -class WXDLLIMPEXP_BASE wxStdInputStream : public std::istream -{ -public: - wxStdInputStream(wxInputStream& stream); - virtual ~wxStdInputStream() { } - -protected: - wxStdInputStreamBuffer m_streamBuffer; -}; - -// ========================================================================== -// wxStdOutputStreamBuffer -// ========================================================================== - -class WXDLLIMPEXP_BASE wxStdOutputStreamBuffer : public std::streambuf -{ -public: - wxStdOutputStreamBuffer(wxOutputStream& stream); - virtual ~wxStdOutputStreamBuffer() { } - -protected: - virtual std::streambuf *setbuf(char *s, std::streamsize n) wxOVERRIDE; - virtual std::streampos seekoff(std::streamoff off, - std::ios_base::seekdir way, - std::ios_base::openmode which = - std::ios_base::in | - std::ios_base::out) wxOVERRIDE; - virtual std::streampos seekpos(std::streampos sp, - std::ios_base::openmode which = - std::ios_base::in | - std::ios_base::out) wxOVERRIDE; - virtual std::streamsize xsputn(const char *s, std::streamsize n) wxOVERRIDE; - virtual int overflow(int c) wxOVERRIDE; - - wxOutputStream& m_stream; -}; - -// ========================================================================== -// wxStdOutputStream -// ========================================================================== - -class WXDLLIMPEXP_BASE wxStdOutputStream : public std::ostream -{ -public: - wxStdOutputStream(wxOutputStream& stream); - virtual ~wxStdOutputStream() { } - -protected: - wxStdOutputStreamBuffer m_streamBuffer; -}; - -#endif // wxUSE_STREAMS && wxUSE_STD_IOSTREAM - -#endif // _WX_STDSTREAM_H_ diff --git a/Externals/wxWidgets3/include/wx/stockitem.h b/Externals/wxWidgets3/include/wx/stockitem.h deleted file mode 100644 index 72d3e714d8..0000000000 --- a/Externals/wxWidgets3/include/wx/stockitem.h +++ /dev/null @@ -1,80 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/stockitem.h -// Purpose: stock items helpers (privateh header) -// Author: Vaclav Slavik -// Modified by: -// Created: 2004-08-15 -// Copyright: (c) Vaclav Slavik, 2004 -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_STOCKITEM_H_ -#define _WX_STOCKITEM_H_ - -#include "wx/defs.h" -#include "wx/chartype.h" -#include "wx/string.h" -#include "wx/accel.h" - -// ---------------------------------------------------------------------------- -// Helper functions for stock items handling: -// ---------------------------------------------------------------------------- - -// Returns true if the ID is in the list of recognized stock actions -WXDLLIMPEXP_CORE bool wxIsStockID(wxWindowID id); - -// Returns true of the label is empty or label of a stock button with -// given ID -WXDLLIMPEXP_CORE bool wxIsStockLabel(wxWindowID id, const wxString& label); - -enum wxStockLabelQueryFlag -{ - wxSTOCK_NOFLAGS = 0, - - wxSTOCK_WITH_MNEMONIC = 1, - wxSTOCK_WITH_ACCELERATOR = 2, - - // by default, stock items text is returned with ellipsis, if appropriate, - // this flag allows to avoid having it - wxSTOCK_WITHOUT_ELLIPSIS = 4, - - // return label for button, not menu item: buttons should always use - // mnemonics and never use ellipsis - wxSTOCK_FOR_BUTTON = wxSTOCK_WITHOUT_ELLIPSIS | wxSTOCK_WITH_MNEMONIC -}; - -// Returns label that should be used for given stock UI element (e.g. "&OK" -// for wxSTOCK_OK); if wxSTOCK_WITH_MNEMONIC is given, the & character -// is included; if wxSTOCK_WITH_ACCELERATOR is given, the stock accelerator -// for given ID is concatenated to the label using \t as separator -WXDLLIMPEXP_CORE wxString wxGetStockLabel(wxWindowID id, - long flags = wxSTOCK_WITH_MNEMONIC); - -#if wxUSE_ACCEL - - // Returns the accelerator that should be used for given stock UI element - // (e.g. "Ctrl+x" for wxSTOCK_EXIT) - WXDLLIMPEXP_CORE wxAcceleratorEntry wxGetStockAccelerator(wxWindowID id); - -#endif - -// wxStockHelpStringClient conceptually works like wxArtClient: it gives a hint to -// wxGetStockHelpString() about the context where the help string is to be used -enum wxStockHelpStringClient -{ - wxSTOCK_MENU // help string to use for menu items -}; - -// Returns an help string for the given stock UI element and for the given "context". -WXDLLIMPEXP_CORE wxString wxGetStockHelpString(wxWindowID id, - wxStockHelpStringClient client = wxSTOCK_MENU); - - -#ifdef __WXGTK20__ - -// Translates stock ID to GTK+'s stock item string identifier: -WXDLLIMPEXP_CORE const char *wxGetStockGtkID(wxWindowID id); - -#endif - -#endif // _WX_STOCKITEM_H_ diff --git a/Externals/wxWidgets3/include/wx/stopwatch.h b/Externals/wxWidgets3/include/wx/stopwatch.h deleted file mode 100644 index ef39f39169..0000000000 --- a/Externals/wxWidgets3/include/wx/stopwatch.h +++ /dev/null @@ -1,92 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/stopwatch.h -// Purpose: wxStopWatch and global time-related functions -// Author: Julian Smart (wxTimer), Sylvain Bougnoux (wxStopWatch), -// Vadim Zeitlin (time functions, current wxStopWatch) -// Created: 26.06.03 (extracted from wx/timer.h) -// Copyright: (c) 1998-2003 Julian Smart, Sylvain Bougnoux -// (c) 2011 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_STOPWATCH_H_ -#define _WX_STOPWATCH_H_ - -#include "wx/defs.h" -#include "wx/longlong.h" - -// Time-related functions are also available via this header for compatibility -// but you should include wx/time.h directly if you need only them and not -// wxStopWatch itself. -#include "wx/time.h" - -// ---------------------------------------------------------------------------- -// wxStopWatch: measure time intervals with up to 1ms resolution -// ---------------------------------------------------------------------------- - -#if wxUSE_STOPWATCH - -class WXDLLIMPEXP_BASE wxStopWatch -{ -public: - // ctor starts the stop watch - wxStopWatch() { m_pauseCount = 0; Start(); } - - // Start the stop watch at the moment t0 expressed in milliseconds (i.e. - // calling Time() immediately afterwards returns t0). This can be used to - // restart an existing stopwatch. - void Start(long t0 = 0); - - // pause the stop watch - void Pause() - { - if ( m_pauseCount++ == 0 ) - m_elapsedBeforePause = GetCurrentClockValue() - m_t0; - } - - // resume it - void Resume() - { - wxASSERT_MSG( m_pauseCount > 0, - wxT("Resuming stop watch which is not paused") ); - - if ( --m_pauseCount == 0 ) - { - DoStart(); - m_t0 -= m_elapsedBeforePause; - } - } - - // Get elapsed time since the last Start() in microseconds. - wxLongLong TimeInMicro() const; - - // get elapsed time since the last Start() in milliseconds - long Time() const { return (TimeInMicro()/1000).ToLong(); } - -private: - // Really starts the stop watch. The initial time is set to current clock - // value. - void DoStart(); - - // Returns the current clock value in its native units. - wxLongLong GetCurrentClockValue() const; - - // Return the frequency of the clock used in its ticks per second. - wxLongLong GetClockFreq() const; - - - // The clock value when the stop watch was last started. Its units vary - // depending on the platform. - wxLongLong m_t0; - - // The elapsed time as of last Pause() call (only valid if m_pauseCount > - // 0) in the same units as m_t0. - wxLongLong m_elapsedBeforePause; - - // if > 0, the stop watch is paused, otherwise it is running - int m_pauseCount; -}; - -#endif // wxUSE_STOPWATCH - -#endif // _WX_STOPWATCH_H_ diff --git a/Externals/wxWidgets3/include/wx/strconv.h b/Externals/wxWidgets3/include/wx/strconv.h deleted file mode 100644 index 470632ca4a..0000000000 --- a/Externals/wxWidgets3/include/wx/strconv.h +++ /dev/null @@ -1,708 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/strconv.h -// Purpose: conversion routines for char sets any Unicode -// Author: Ove Kaaven, Robert Roebling, Vadim Zeitlin -// Modified by: -// Created: 29/01/98 -// Copyright: (c) 1998 Ove Kaaven, Robert Roebling -// (c) 1998-2006 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_STRCONV_H_ -#define _WX_STRCONV_H_ - -#include "wx/defs.h" -#include "wx/chartype.h" -#include "wx/buffer.h" - -#include - -class WXDLLIMPEXP_FWD_BASE wxString; - -// the error value returned by wxMBConv methods -#define wxCONV_FAILED ((size_t)-1) - -// ---------------------------------------------------------------------------- -// wxMBConv (abstract base class for conversions) -// ---------------------------------------------------------------------------- - -// When deriving a new class from wxMBConv you must reimplement ToWChar() and -// FromWChar() methods which are not pure virtual only for historical reasons, -// don't let the fact that the existing classes implement MB2WC/WC2MB() instead -// confuse you. -// -// You also have to implement Clone() to allow copying the conversions -// polymorphically. -// -// And you might need to override GetMBNulLen() as well. -class WXDLLIMPEXP_BASE wxMBConv -{ -public: - // The functions doing actual conversion from/to narrow to/from wide - // character strings. - // - // On success, the return value is the length (i.e. the number of - // characters, not bytes) of the converted string including any trailing - // L'\0' or (possibly multiple) '\0'(s). If the conversion fails or if - // there is not enough space for everything, including the trailing NUL - // character(s), in the output buffer, wxCONV_FAILED is returned. - // - // In the special case when dst is NULL (the value of dstLen is ignored - // then) the return value is the length of the needed buffer but nothing - // happens otherwise. If srcLen is wxNO_LEN, the entire string, up to and - // including the trailing NUL(s), is converted, otherwise exactly srcLen - // bytes are. - // - // Typical usage: - // - // size_t dstLen = conv.ToWChar(NULL, 0, src); - // if ( dstLen == wxCONV_FAILED ) - // ... handle error ... - // wchar_t *wbuf = new wchar_t[dstLen]; - // conv.ToWChar(wbuf, dstLen, src); - // ... work with wbuf ... - // delete [] wbuf; - // - virtual size_t ToWChar(wchar_t *dst, size_t dstLen, - const char *src, size_t srcLen = wxNO_LEN) const; - - virtual size_t FromWChar(char *dst, size_t dstLen, - const wchar_t *src, size_t srcLen = wxNO_LEN) const; - - - // Convenience functions for translating NUL-terminated strings: returns - // the buffer containing the converted string or NULL pointer if the - // conversion failed. - const wxWCharBuffer cMB2WC(const char *in) const; - const wxCharBuffer cWC2MB(const wchar_t *in) const; - - // Convenience functions for converting strings which may contain embedded - // NULs and don't have to be NUL-terminated. - // - // inLen is the length of the buffer including trailing NUL if any or - // wxNO_LEN if the input is NUL-terminated. - // - // outLen receives, if not NULL, the length of the converted string or 0 if - // the conversion failed (returning 0 and not -1 in this case makes it - // difficult to distinguish between failed conversion and empty input but - // this is done for backwards compatibility). Notice that the rules for - // whether outLen accounts or not for the last NUL are the same as for - // To/FromWChar() above: if inLen is specified, outLen is exactly the - // number of characters converted, whether the last one of them was NUL or - // not. But if inLen == wxNO_LEN then outLen doesn't account for the last - // NUL even though it is present. - const wxWCharBuffer - cMB2WC(const char *in, size_t inLen, size_t *outLen) const; - const wxCharBuffer - cWC2MB(const wchar_t *in, size_t inLen, size_t *outLen) const; - - // And yet more convenience functions for converting the entire buffers: - // these are the simplest and least error-prone as you never need to bother - // with lengths/sizes directly. - const wxWCharBuffer cMB2WC(const wxScopedCharBuffer& in) const; - const wxCharBuffer cWC2MB(const wxScopedWCharBuffer& in) const; - - // convenience functions for converting MB or WC to/from wxWin default -#if wxUSE_UNICODE - const wxWCharBuffer cMB2WX(const char *psz) const { return cMB2WC(psz); } - const wxCharBuffer cWX2MB(const wchar_t *psz) const { return cWC2MB(psz); } - const wchar_t* cWC2WX(const wchar_t *psz) const { return psz; } - const wchar_t* cWX2WC(const wchar_t *psz) const { return psz; } -#else // ANSI - const char* cMB2WX(const char *psz) const { return psz; } - const char* cWX2MB(const char *psz) const { return psz; } - const wxCharBuffer cWC2WX(const wchar_t *psz) const { return cWC2MB(psz); } - const wxWCharBuffer cWX2WC(const char *psz) const { return cMB2WC(psz); } -#endif // Unicode/ANSI - - // this function is used in the implementation of cMB2WC() to distinguish - // between the following cases: - // - // a) var width encoding with strings terminated by a single NUL - // (usual multibyte encodings): return 1 in this case - // b) fixed width encoding with 2 bytes/char and so terminated by - // 2 NULs (UTF-16/UCS-2 and variants): return 2 in this case - // c) fixed width encoding with 4 bytes/char and so terminated by - // 4 NULs (UTF-32/UCS-4 and variants): return 4 in this case - // - // anything else is not supported currently and -1 should be returned - virtual size_t GetMBNulLen() const { return 1; } - - // return the maximal value currently returned by GetMBNulLen() for any - // encoding - static size_t GetMaxMBNulLen() { return 4 /* for UTF-32 */; } - -#if wxUSE_UNICODE_UTF8 - // return true if the converter's charset is UTF-8, i.e. char* strings - // decoded using this object can be directly copied to wxString's internal - // storage without converting to WC and than back to UTF-8 MB string - virtual bool IsUTF8() const { return false; } -#endif - - // The old conversion functions. The existing classes currently mostly - // implement these ones but we're in transition to using To/FromWChar() - // instead and any new classes should implement just the new functions. - // For now, however, we provide default implementation of To/FromWChar() in - // this base class in terms of MB2WC/WC2MB() to avoid having to rewrite all - // the conversions at once. - // - // On success, the return value is the length (i.e. the number of - // characters, not bytes) not counting the trailing NUL(s) of the converted - // string. On failure, (size_t)-1 is returned. In the special case when - // outputBuf is NULL the return value is the same one but nothing is - // written to the buffer. - // - // Note that outLen is the length of the output buffer, not the length of - // the input (which is always supposed to be terminated by one or more - // NULs, as appropriate for the encoding)! - virtual size_t MB2WC(wchar_t *out, const char *in, size_t outLen) const; - virtual size_t WC2MB(char *out, const wchar_t *in, size_t outLen) const; - - - // make a heap-allocated copy of this object - virtual wxMBConv *Clone() const = 0; - - // virtual dtor for any base class - virtual ~wxMBConv(); -}; - -// ---------------------------------------------------------------------------- -// wxMBConvLibc uses standard mbstowcs() and wcstombs() functions for -// conversion (hence it depends on the current locale) -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxMBConvLibc : public wxMBConv -{ -public: - virtual size_t MB2WC(wchar_t *outputBuf, const char *psz, size_t outputSize) const wxOVERRIDE; - virtual size_t WC2MB(char *outputBuf, const wchar_t *psz, size_t outputSize) const wxOVERRIDE; - - virtual wxMBConv *Clone() const wxOVERRIDE { return new wxMBConvLibc; } - -#if wxUSE_UNICODE_UTF8 - virtual bool IsUTF8() const wxOVERRIDE { return wxLocaleIsUtf8; } -#endif -}; - -#ifdef __UNIX__ - -// ---------------------------------------------------------------------------- -// wxConvBrokenFileNames is made for Unix in Unicode mode when -// files are accidentally written in an encoding which is not -// the system encoding. Typically, the system encoding will be -// UTF8 but there might be files stored in ISO8859-1 on disk. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxConvBrokenFileNames : public wxMBConv -{ -public: - wxConvBrokenFileNames(const wxString& charset); - wxConvBrokenFileNames(const wxConvBrokenFileNames& conv) - : wxMBConv(), - m_conv(conv.m_conv ? conv.m_conv->Clone() : NULL) - { - } - virtual ~wxConvBrokenFileNames() { delete m_conv; } - - virtual size_t MB2WC(wchar_t *out, const char *in, size_t outLen) const wxOVERRIDE - { - return m_conv->MB2WC(out, in, outLen); - } - - virtual size_t WC2MB(char *out, const wchar_t *in, size_t outLen) const wxOVERRIDE - { - return m_conv->WC2MB(out, in, outLen); - } - - virtual size_t GetMBNulLen() const wxOVERRIDE - { - // cast needed to call a private function - return m_conv->GetMBNulLen(); - } - -#if wxUSE_UNICODE_UTF8 - virtual bool IsUTF8() const wxOVERRIDE { return m_conv->IsUTF8(); } -#endif - - virtual wxMBConv *Clone() const wxOVERRIDE { return new wxConvBrokenFileNames(*this); } - -private: - // the conversion object we forward to - wxMBConv *m_conv; - - wxDECLARE_NO_ASSIGN_CLASS(wxConvBrokenFileNames); -}; - -#endif // __UNIX__ - -// ---------------------------------------------------------------------------- -// wxMBConvUTF7 (for conversion using UTF7 encoding) -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxMBConvUTF7 : public wxMBConv -{ -public: - wxMBConvUTF7() { } - - // compiler-generated copy ctor, assignment operator and dtor are ok - // (assuming it's ok to copy the shift state -- not really sure about it) - - virtual size_t ToWChar(wchar_t *dst, size_t dstLen, - const char *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE; - virtual size_t FromWChar(char *dst, size_t dstLen, - const wchar_t *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE; - - virtual wxMBConv *Clone() const wxOVERRIDE { return new wxMBConvUTF7; } - -private: - // UTF-7 decoder/encoder may be in direct mode or in shifted mode after a - // '+' (and until the '-' or any other non-base64 character) - struct StateMode - { - enum Mode - { - Direct, // pass through state - Shifted // after a '+' (and before '-') - }; - }; - - // the current decoder state: this is only used by ToWChar() if srcLen - // parameter is not wxNO_LEN, when working on the entire NUL-terminated - // strings we neither update nor use the state - class DecoderState : private StateMode - { - private: - // current state: this one is private as we want to enforce the use of - // ToDirect/ToShifted() methods below - Mode mode; - - public: - // the initial state is direct - DecoderState() { mode = Direct; } - - // switch to/from shifted mode - void ToDirect() { mode = Direct; } - void ToShifted() { mode = Shifted; accum = bit = 0; isLSB = false; } - - bool IsDirect() const { return mode == Direct; } - bool IsShifted() const { return mode == Shifted; } - - - // these variables are only used in shifted mode - - unsigned int accum; // accumulator of the bit we've already got - unsigned int bit; // the number of bits consumed mod 8 - unsigned char msb; // the high byte of UTF-16 word - bool isLSB; // whether we're decoding LSB or MSB of UTF-16 word - }; - - DecoderState m_stateDecoder; - - - // encoder state is simpler as we always receive entire Unicode characters - // on input - class EncoderState : private StateMode - { - private: - Mode mode; - - public: - EncoderState() { mode = Direct; } - - void ToDirect() { mode = Direct; } - void ToShifted() { mode = Shifted; accum = bit = 0; } - - bool IsDirect() const { return mode == Direct; } - bool IsShifted() const { return mode == Shifted; } - - unsigned int accum; - unsigned int bit; - }; - - EncoderState m_stateEncoder; -}; - -// ---------------------------------------------------------------------------- -// wxMBConvUTF8 (for conversion using UTF8 encoding) -// ---------------------------------------------------------------------------- - -// this is the real UTF-8 conversion class, it has to be called "strict UTF-8" -// for compatibility reasons: the wxMBConvUTF8 class below also supports lossy -// conversions if it is created with non default options -class WXDLLIMPEXP_BASE wxMBConvStrictUTF8 : public wxMBConv -{ -public: - // compiler-generated default ctor and other methods are ok - - virtual size_t ToWChar(wchar_t *dst, size_t dstLen, - const char *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE; - virtual size_t FromWChar(char *dst, size_t dstLen, - const wchar_t *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE; - - virtual wxMBConv *Clone() const wxOVERRIDE { return new wxMBConvStrictUTF8(); } - -#if wxUSE_UNICODE_UTF8 - // NB: other mapping modes are not, strictly speaking, UTF-8, so we can't - // take the shortcut in that case - virtual bool IsUTF8() const wxOVERRIDE { return true; } -#endif -}; - -class WXDLLIMPEXP_BASE wxMBConvUTF8 : public wxMBConvStrictUTF8 -{ -public: - enum - { - MAP_INVALID_UTF8_NOT = 0, - MAP_INVALID_UTF8_TO_PUA = 1, - MAP_INVALID_UTF8_TO_OCTAL = 2 - }; - - wxMBConvUTF8(int options = MAP_INVALID_UTF8_NOT) : m_options(options) { } - - virtual size_t ToWChar(wchar_t *dst, size_t dstLen, - const char *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE; - virtual size_t FromWChar(char *dst, size_t dstLen, - const wchar_t *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE; - - virtual wxMBConv *Clone() const wxOVERRIDE { return new wxMBConvUTF8(m_options); } - -#if wxUSE_UNICODE_UTF8 - // NB: other mapping modes are not, strictly speaking, UTF-8, so we can't - // take the shortcut in that case - virtual bool IsUTF8() const wxOVERRIDE { return m_options == MAP_INVALID_UTF8_NOT; } -#endif - -private: - int m_options; -}; - -// ---------------------------------------------------------------------------- -// wxMBConvUTF16Base: for both LE and BE variants -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxMBConvUTF16Base : public wxMBConv -{ -public: - enum { BYTES_PER_CHAR = 2 }; - - virtual size_t GetMBNulLen() const wxOVERRIDE { return BYTES_PER_CHAR; } - -protected: - // return the length of the buffer using srcLen if it's not wxNO_LEN and - // computing the length ourselves if it is; also checks that the length is - // even if specified as we need an entire number of UTF-16 characters and - // returns wxNO_LEN which indicates error if it is odd - static size_t GetLength(const char *src, size_t srcLen); -}; - -// ---------------------------------------------------------------------------- -// wxMBConvUTF16LE (for conversion using UTF16 Little Endian encoding) -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxMBConvUTF16LE : public wxMBConvUTF16Base -{ -public: - virtual size_t ToWChar(wchar_t *dst, size_t dstLen, - const char *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE; - virtual size_t FromWChar(char *dst, size_t dstLen, - const wchar_t *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE; - virtual wxMBConv *Clone() const wxOVERRIDE { return new wxMBConvUTF16LE; } -}; - -// ---------------------------------------------------------------------------- -// wxMBConvUTF16BE (for conversion using UTF16 Big Endian encoding) -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxMBConvUTF16BE : public wxMBConvUTF16Base -{ -public: - virtual size_t ToWChar(wchar_t *dst, size_t dstLen, - const char *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE; - virtual size_t FromWChar(char *dst, size_t dstLen, - const wchar_t *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE; - virtual wxMBConv *Clone() const wxOVERRIDE { return new wxMBConvUTF16BE; } -}; - -// ---------------------------------------------------------------------------- -// wxMBConvUTF32Base: base class for both LE and BE variants -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxMBConvUTF32Base : public wxMBConv -{ -public: - enum { BYTES_PER_CHAR = 4 }; - - virtual size_t GetMBNulLen() const wxOVERRIDE { return BYTES_PER_CHAR; } - -protected: - // this is similar to wxMBConvUTF16Base method with the same name except - // that, of course, it verifies that length is divisible by 4 if given and - // not by 2 - static size_t GetLength(const char *src, size_t srcLen); -}; - -// ---------------------------------------------------------------------------- -// wxMBConvUTF32LE (for conversion using UTF32 Little Endian encoding) -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxMBConvUTF32LE : public wxMBConvUTF32Base -{ -public: - virtual size_t ToWChar(wchar_t *dst, size_t dstLen, - const char *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE; - virtual size_t FromWChar(char *dst, size_t dstLen, - const wchar_t *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE; - virtual wxMBConv *Clone() const wxOVERRIDE { return new wxMBConvUTF32LE; } -}; - -// ---------------------------------------------------------------------------- -// wxMBConvUTF32BE (for conversion using UTF32 Big Endian encoding) -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxMBConvUTF32BE : public wxMBConvUTF32Base -{ -public: - virtual size_t ToWChar(wchar_t *dst, size_t dstLen, - const char *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE; - virtual size_t FromWChar(char *dst, size_t dstLen, - const wchar_t *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE; - virtual wxMBConv *Clone() const wxOVERRIDE { return new wxMBConvUTF32BE; } -}; - -// ---------------------------------------------------------------------------- -// wxCSConv (for conversion based on loadable char sets) -// ---------------------------------------------------------------------------- - -#include "wx/fontenc.h" - -class WXDLLIMPEXP_BASE wxCSConv : public wxMBConv -{ -public: - // we can be created either from charset name or from an encoding constant - // but we can't have both at once - wxCSConv(const wxString& charset); - wxCSConv(wxFontEncoding encoding); - - wxCSConv(const wxCSConv& conv); - virtual ~wxCSConv(); - - wxCSConv& operator=(const wxCSConv& conv); - - virtual size_t ToWChar(wchar_t *dst, size_t dstLen, - const char *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE; - virtual size_t FromWChar(char *dst, size_t dstLen, - const wchar_t *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE; - virtual size_t GetMBNulLen() const wxOVERRIDE; - -#if wxUSE_UNICODE_UTF8 - virtual bool IsUTF8() const wxOVERRIDE; -#endif - - virtual wxMBConv *Clone() const wxOVERRIDE { return new wxCSConv(*this); } - - void Clear(); - - // return true if the conversion could be initialized successfully - bool IsOk() const; - -private: - // common part of all ctors - void Init(); - - // Creates the conversion to use, called from all ctors to initialize - // m_convReal. - wxMBConv *DoCreate() const; - - // Set the name (may be only called when m_name == NULL), makes copy of - // the charset string. - void SetName(const char *charset); - - // Set m_encoding field respecting the rules below, i.e. making sure it has - // a valid value if m_name == NULL (thus this should be always called after - // SetName()). - // - // Input encoding may be valid or not. - void SetEncoding(wxFontEncoding encoding); - - - // The encoding we use is specified by the two fields below: - // - // 1. If m_name != NULL, m_encoding corresponds to it if it's one of - // encodings we know about (i.e. member of wxFontEncoding) or is - // wxFONTENCODING_SYSTEM otherwise. - // - // 2. If m_name == NULL, m_encoding is always valid, i.e. not one of - // wxFONTENCODING_{SYSTEM,DEFAULT,MAX}. - char *m_name; - wxFontEncoding m_encoding; - - // The conversion object for our encoding or NULL if we failed to create it - // in which case we fall back to hard-coded ISO8859-1 conversion. - wxMBConv *m_convReal; -}; - -// ---------------------------------------------------------------------------- -// wxWhateverWorksConv: use whatever encoding works for the input -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxWhateverWorksConv : public wxMBConv -{ -public: - wxWhateverWorksConv() - { - } - - // Try to interpret the string as UTF-8, if it fails fall back to the - // current locale encoding (wxConvLibc) and if this fails as well, - // interpret it as wxConvISO8859_1 (which is used because it never fails - // and this conversion is used when we really, really must produce - // something on output). - virtual size_t - ToWChar(wchar_t *dst, size_t dstLen, - const char *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE; - - // Try to encode the string using the current locale encoding (wxConvLibc) - // and fall back to UTF-8 (which never fails) if it doesn't work. Note that - // we never use wxConvISO8859_1 here as we prefer to fall back on UTF-8 - // even for the strings containing only code points representable in 8869-1. - virtual size_t - FromWChar(char *dst, size_t dstLen, - const wchar_t *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE; - - virtual wxMBConv *Clone() const wxOVERRIDE - { - return new wxWhateverWorksConv(); - } -}; - -// ---------------------------------------------------------------------------- -// declare predefined conversion objects -// ---------------------------------------------------------------------------- - -// Note: this macro is an implementation detail (see the comment in -// strconv.cpp). The wxGet_XXX() and wxGet_XXXPtr() functions shouldn't be -// used by user code and neither should XXXPtr, use the wxConvXXX macro -// instead. -#define WX_DECLARE_GLOBAL_CONV(klass, name) \ - extern WXDLLIMPEXP_DATA_BASE(klass*) name##Ptr; \ - extern WXDLLIMPEXP_BASE klass* wxGet_##name##Ptr(); \ - inline klass& wxGet_##name() \ - { \ - if ( !name##Ptr ) \ - name##Ptr = wxGet_##name##Ptr(); \ - return *name##Ptr; \ - } - - -// conversion to be used with all standard functions affected by locale, e.g. -// strtol(), strftime(), ... -WX_DECLARE_GLOBAL_CONV(wxMBConv, wxConvLibc) -#define wxConvLibc wxGet_wxConvLibc() - -// conversion ISO-8859-1/UTF-7/UTF-8 <-> wchar_t -WX_DECLARE_GLOBAL_CONV(wxCSConv, wxConvISO8859_1) -#define wxConvISO8859_1 wxGet_wxConvISO8859_1() - -WX_DECLARE_GLOBAL_CONV(wxMBConvStrictUTF8, wxConvUTF8) -#define wxConvUTF8 wxGet_wxConvUTF8() - -WX_DECLARE_GLOBAL_CONV(wxMBConvUTF7, wxConvUTF7) -#define wxConvUTF7 wxGet_wxConvUTF7() - -// conversion used when we may not afford to lose data when outputting Unicode -// strings (should be avoid in the other direction as it can misinterpret the -// input encoding) -WX_DECLARE_GLOBAL_CONV(wxWhateverWorksConv, wxConvWhateverWorks) -#define wxConvWhateverWorks wxGet_wxConvWhateverWorks() - -// conversion used for the file names on the systems where they're not Unicode -// (basically anything except Windows) -// -// this is used by all file functions, can be changed by the application -// -// by default UTF-8 under Mac OS X and wxConvLibc elsewhere (but it's not used -// under Windows normally) -extern WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvFileName; - -// backwards compatible define -#define wxConvFile (*wxConvFileName) - -// the current conversion object, may be set to any conversion, is used by -// default in a couple of places inside wx (initially same as wxConvLibc) -extern WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvCurrent; - -// the conversion corresponding to the current locale -WX_DECLARE_GLOBAL_CONV(wxCSConv, wxConvLocal) -#define wxConvLocal wxGet_wxConvLocal() - -// the conversion corresponding to the encoding of the standard UI elements -// -// by default this is the same as wxConvLocal but may be changed if the program -// needs to use a fixed encoding -extern WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvUI; - -#undef WX_DECLARE_GLOBAL_CONV - -// ---------------------------------------------------------------------------- -// endianness-dependent conversions -// ---------------------------------------------------------------------------- - -#ifdef WORDS_BIGENDIAN - typedef wxMBConvUTF16BE wxMBConvUTF16; - typedef wxMBConvUTF32BE wxMBConvUTF32; -#else - typedef wxMBConvUTF16LE wxMBConvUTF16; - typedef wxMBConvUTF32LE wxMBConvUTF32; -#endif - -// ---------------------------------------------------------------------------- -// filename conversion macros -// ---------------------------------------------------------------------------- - -// filenames are multibyte on Unix and widechar on Windows -#if wxMBFILES && wxUSE_UNICODE - #define wxFNCONV(name) wxConvFileName->cWX2MB(name) - #define wxFNSTRINGCAST wxMBSTRINGCAST -#else -#if defined(__WXOSX__) && wxMBFILES - #define wxFNCONV(name) wxConvFileName->cWC2MB( wxConvLocal.cWX2WC(name) ) -#else - #define wxFNCONV(name) name -#endif - #define wxFNSTRINGCAST WXSTRINGCAST -#endif - -// ---------------------------------------------------------------------------- -// macros for the most common conversions -// ---------------------------------------------------------------------------- - -#if wxUSE_UNICODE - #define wxConvertWX2MB(s) wxConvCurrent->cWX2MB(s) - #define wxConvertMB2WX(s) wxConvCurrent->cMB2WX(s) - - // these functions should be used when the conversions really, really have - // to succeed (usually because we pass their results to a standard C - // function which would crash if we passed NULL to it), so these functions - // always return a valid pointer if their argument is non-NULL - - inline wxWCharBuffer wxSafeConvertMB2WX(const char *s) - { - return wxConvWhateverWorks.cMB2WC(s); - } - - inline wxCharBuffer wxSafeConvertWX2MB(const wchar_t *ws) - { - return wxConvWhateverWorks.cWC2MB(ws); - } -#else // ANSI - // no conversions to do - #define wxConvertWX2MB(s) (s) - #define wxConvertMB2WX(s) (s) - #define wxSafeConvertMB2WX(s) (s) - #define wxSafeConvertWX2MB(s) (s) -#endif // Unicode/ANSI - -#endif // _WX_STRCONV_H_ - diff --git a/Externals/wxWidgets3/include/wx/stream.h b/Externals/wxWidgets3/include/wx/stream.h deleted file mode 100644 index 52217f6fd3..0000000000 --- a/Externals/wxWidgets3/include/wx/stream.h +++ /dev/null @@ -1,683 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/stream.h -// Purpose: stream classes -// Author: Guilhem Lavaux, Guillermo Rodriguez Garcia, Vadim Zeitlin -// Modified by: -// Created: 11/07/98 -// Copyright: (c) Guilhem Lavaux -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_WXSTREAM_H__ -#define _WX_WXSTREAM_H__ - -#include "wx/defs.h" - -#if wxUSE_STREAMS - -#include -#include "wx/object.h" -#include "wx/string.h" -#include "wx/filefn.h" // for wxFileOffset, wxInvalidOffset and wxSeekMode - -class WXDLLIMPEXP_FWD_BASE wxStreamBase; -class WXDLLIMPEXP_FWD_BASE wxInputStream; -class WXDLLIMPEXP_FWD_BASE wxOutputStream; - -typedef wxInputStream& (*__wxInputManip)(wxInputStream&); -typedef wxOutputStream& (*__wxOutputManip)(wxOutputStream&); - -WXDLLIMPEXP_BASE wxOutputStream& wxEndL(wxOutputStream& o_stream); - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -enum wxStreamError -{ - wxSTREAM_NO_ERROR = 0, // stream is in good state - wxSTREAM_EOF, // EOF reached in Read() or similar - wxSTREAM_WRITE_ERROR, // generic write error - wxSTREAM_READ_ERROR // generic read error -}; - -const int wxEOF = -1; - -// ============================================================================ -// base stream classes: wxInputStream and wxOutputStream -// ============================================================================ - -// --------------------------------------------------------------------------- -// wxStreamBase: common (but non virtual!) base for all stream classes -// --------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxStreamBase : public wxObject -{ -public: - wxStreamBase(); - virtual ~wxStreamBase(); - - // error testing - wxStreamError GetLastError() const { return m_lasterror; } - virtual bool IsOk() const { return GetLastError() == wxSTREAM_NO_ERROR; } - bool operator!() const { return !IsOk(); } - - // reset the stream state - void Reset(wxStreamError error = wxSTREAM_NO_ERROR) { m_lasterror = error; } - - // this doesn't make sense for all streams, always test its return value - virtual size_t GetSize() const; - virtual wxFileOffset GetLength() const { return wxInvalidOffset; } - - // returns true if the streams supports seeking to arbitrary offsets - virtual bool IsSeekable() const { return false; } - -protected: - virtual wxFileOffset OnSysSeek(wxFileOffset seek, wxSeekMode mode); - virtual wxFileOffset OnSysTell() const; - - size_t m_lastcount; - wxStreamError m_lasterror; - - friend class wxStreamBuffer; - - wxDECLARE_ABSTRACT_CLASS(wxStreamBase); - wxDECLARE_NO_COPY_CLASS(wxStreamBase); -}; - -// ---------------------------------------------------------------------------- -// wxInputStream: base class for the input streams -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxInputStream : public wxStreamBase -{ -public: - // ctor and dtor, nothing exciting - wxInputStream(); - virtual ~wxInputStream(); - - - // IO functions - // ------------ - - // return a character from the stream without removing it, i.e. it will - // still be returned by the next call to GetC() - // - // blocks until something appears in the stream if necessary, if nothing - // ever does (i.e. EOF) LastRead() will return 0 (and the return value is - // undefined), otherwise 1 - virtual char Peek(); - - // return one byte from the stream, blocking until it appears if - // necessary - // - // on success returns a value between 0 - 255, or wxEOF on EOF or error. - int GetC(); - - // read at most the given number of bytes from the stream - // - // there are 2 possible situations here: either there is nothing at all in - // the stream right now in which case Read() blocks until something appears - // (use CanRead() to avoid this) or there is already some data available in - // the stream and then Read() doesn't block but returns just the data it - // can read without waiting for more - // - // in any case, if there are not enough bytes in the stream right now, - // LastRead() value will be less than size but greater than 0. If it is 0, - // it means that EOF has been reached. - virtual wxInputStream& Read(void *buffer, size_t size); - - // Read exactly the given number of bytes, unlike Read(), which may read - // less than the requested amount of data without returning an error, this - // method either reads all the data or returns false. - bool ReadAll(void *buffer, size_t size); - - // copy the entire contents of this stream into streamOut, stopping only - // when EOF is reached or an error occurs - wxInputStream& Read(wxOutputStream& streamOut); - - - // status functions - // ---------------- - - // returns the number of bytes read by the last call to Read(), GetC() or - // Peek() - // - // this should be used to discover whether that call succeeded in reading - // all the requested data or not - virtual size_t LastRead() const { return wxStreamBase::m_lastcount; } - - // returns true if some data is available in the stream right now, so that - // calling Read() wouldn't block - virtual bool CanRead() const; - - // is the stream at EOF? - // - // note that this cannot be really implemented for all streams and - // CanRead() is more reliable than Eof() - virtual bool Eof() const; - - - // write back buffer - // ----------------- - - // put back the specified number of bytes into the stream, they will be - // fetched by the next call to the read functions - // - // returns the number of bytes really stuffed back - size_t Ungetch(const void *buffer, size_t size); - - // put back the specified character in the stream - // - // returns true if ok, false on error - bool Ungetch(char c); - - - // position functions - // ------------------ - - // move the stream pointer to the given position (if the stream supports - // it) - // - // returns wxInvalidOffset on error - virtual wxFileOffset SeekI(wxFileOffset pos, wxSeekMode mode = wxFromStart); - - // return the current position of the stream pointer or wxInvalidOffset - virtual wxFileOffset TellI() const; - - - // stream-like operators - // --------------------- - - wxInputStream& operator>>(wxOutputStream& out) { return Read(out); } - wxInputStream& operator>>(__wxInputManip func) { return func(*this); } - -protected: - // do read up to size bytes of data into the provided buffer - // - // this method should return 0 if EOF has been reached or an error occurred - // (m_lasterror should be set accordingly as well) or the number of bytes - // read - virtual size_t OnSysRead(void *buffer, size_t size) = 0; - - // write-back buffer support - // ------------------------- - - // return the pointer to a buffer big enough to hold sizeNeeded bytes - char *AllocSpaceWBack(size_t sizeNeeded); - - // read up to size data from the write back buffer, return the number of - // bytes read - size_t GetWBack(void *buf, size_t size); - - // write back buffer or NULL if none - char *m_wback; - - // the size of the buffer - size_t m_wbacksize; - - // the current position in the buffer - size_t m_wbackcur; - - friend class wxStreamBuffer; - - wxDECLARE_ABSTRACT_CLASS(wxInputStream); - wxDECLARE_NO_COPY_CLASS(wxInputStream); -}; - -// ---------------------------------------------------------------------------- -// wxOutputStream: base for the output streams -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxOutputStream : public wxStreamBase -{ -public: - wxOutputStream(); - virtual ~wxOutputStream(); - - void PutC(char c); - virtual wxOutputStream& Write(const void *buffer, size_t size); - - // This is ReadAll() equivalent for Write(): it either writes exactly the - // given number of bytes or returns false, unlike Write() which can write - // less data than requested but still return without error. - bool WriteAll(const void *buffer, size_t size); - - wxOutputStream& Write(wxInputStream& stream_in); - - virtual wxFileOffset SeekO(wxFileOffset pos, wxSeekMode mode = wxFromStart); - virtual wxFileOffset TellO() const; - - virtual size_t LastWrite() const { return wxStreamBase::m_lastcount; } - - virtual void Sync(); - virtual bool Close() { return true; } - - wxOutputStream& operator<<(wxInputStream& out) { return Write(out); } - wxOutputStream& operator<<( __wxOutputManip func) { return func(*this); } - -protected: - // to be implemented in the derived classes (it should have been pure - // virtual) - virtual size_t OnSysWrite(const void *buffer, size_t bufsize); - - friend class wxStreamBuffer; - - wxDECLARE_ABSTRACT_CLASS(wxOutputStream); - wxDECLARE_NO_COPY_CLASS(wxOutputStream); -}; - -// ============================================================================ -// helper stream classes -// ============================================================================ - -// --------------------------------------------------------------------------- -// A stream for measuring streamed output -// --------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxCountingOutputStream : public wxOutputStream -{ -public: - wxCountingOutputStream(); - - virtual wxFileOffset GetLength() const wxOVERRIDE; - bool Ok() const { return IsOk(); } - virtual bool IsOk() const wxOVERRIDE { return true; } - -protected: - virtual size_t OnSysWrite(const void *buffer, size_t size) wxOVERRIDE; - virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) wxOVERRIDE; - virtual wxFileOffset OnSysTell() const wxOVERRIDE; - - size_t m_currentPos, - m_lastPos; - - wxDECLARE_DYNAMIC_CLASS(wxCountingOutputStream); - wxDECLARE_NO_COPY_CLASS(wxCountingOutputStream); -}; - -// --------------------------------------------------------------------------- -// "Filter" streams -// --------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxFilterInputStream : public wxInputStream -{ -public: - wxFilterInputStream(); - wxFilterInputStream(wxInputStream& stream); - wxFilterInputStream(wxInputStream *stream); - virtual ~wxFilterInputStream(); - - virtual char Peek() wxOVERRIDE { return m_parent_i_stream->Peek(); } - - virtual wxFileOffset GetLength() const wxOVERRIDE { return m_parent_i_stream->GetLength(); } - - wxInputStream *GetFilterInputStream() const { return m_parent_i_stream; } - -protected: - wxInputStream *m_parent_i_stream; - bool m_owns; - - wxDECLARE_ABSTRACT_CLASS(wxFilterInputStream); - wxDECLARE_NO_COPY_CLASS(wxFilterInputStream); -}; - -class WXDLLIMPEXP_BASE wxFilterOutputStream : public wxOutputStream -{ -public: - wxFilterOutputStream(); - wxFilterOutputStream(wxOutputStream& stream); - wxFilterOutputStream(wxOutputStream *stream); - virtual ~wxFilterOutputStream(); - - virtual wxFileOffset GetLength() const wxOVERRIDE { return m_parent_o_stream->GetLength(); } - - wxOutputStream *GetFilterOutputStream() const { return m_parent_o_stream; } - - bool Close() wxOVERRIDE; - -protected: - wxOutputStream *m_parent_o_stream; - bool m_owns; - - wxDECLARE_ABSTRACT_CLASS(wxFilterOutputStream); - wxDECLARE_NO_COPY_CLASS(wxFilterOutputStream); -}; - -enum wxStreamProtocolType -{ - wxSTREAM_PROTOCOL, // wxFileSystem protocol (should be only one) - wxSTREAM_MIMETYPE, // MIME types the stream handles - wxSTREAM_ENCODING, // The HTTP Content-Encodings the stream handles - wxSTREAM_FILEEXT // File extensions the stream handles -}; - -void WXDLLIMPEXP_BASE wxUseFilterClasses(); - -class WXDLLIMPEXP_BASE wxFilterClassFactoryBase : public wxObject -{ -public: - virtual ~wxFilterClassFactoryBase() { } - - wxString GetProtocol() const { return wxString(*GetProtocols()); } - wxString PopExtension(const wxString& location) const; - - virtual const wxChar * const *GetProtocols(wxStreamProtocolType type - = wxSTREAM_PROTOCOL) const = 0; - - bool CanHandle(const wxString& protocol, - wxStreamProtocolType type - = wxSTREAM_PROTOCOL) const; - -protected: - wxString::size_type FindExtension(const wxString& location) const; - - wxDECLARE_ABSTRACT_CLASS(wxFilterClassFactoryBase); -}; - -class WXDLLIMPEXP_BASE wxFilterClassFactory : public wxFilterClassFactoryBase -{ -public: - virtual ~wxFilterClassFactory() { } - - virtual wxFilterInputStream *NewStream(wxInputStream& stream) const = 0; - virtual wxFilterOutputStream *NewStream(wxOutputStream& stream) const = 0; - virtual wxFilterInputStream *NewStream(wxInputStream *stream) const = 0; - virtual wxFilterOutputStream *NewStream(wxOutputStream *stream) const = 0; - - static const wxFilterClassFactory *Find(const wxString& protocol, - wxStreamProtocolType type - = wxSTREAM_PROTOCOL); - - static const wxFilterClassFactory *GetFirst(); - const wxFilterClassFactory *GetNext() const { return m_next; } - - void PushFront() { Remove(); m_next = sm_first; sm_first = this; } - void Remove(); - -protected: - wxFilterClassFactory() : m_next(this) { } - - wxFilterClassFactory& operator=(const wxFilterClassFactory&) - { return *this; } - -private: - static wxFilterClassFactory *sm_first; - wxFilterClassFactory *m_next; - - wxDECLARE_ABSTRACT_CLASS(wxFilterClassFactory); -}; - -// ============================================================================ -// buffered streams -// ============================================================================ - -// --------------------------------------------------------------------------- -// Stream buffer: this class can be derived from and passed to -// wxBufferedStreams to implement custom buffering -// --------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxStreamBuffer -{ -public: - enum BufMode - { - read, - write, - read_write - }; - - wxStreamBuffer(wxStreamBase& stream, BufMode mode) - { - InitWithStream(stream, mode); - } - - wxStreamBuffer(size_t bufsize, wxInputStream& stream) - { - InitWithStream(stream, read); - SetBufferIO(bufsize); - } - - wxStreamBuffer(size_t bufsize, wxOutputStream& stream) - { - InitWithStream(stream, write); - SetBufferIO(bufsize); - } - - wxStreamBuffer(const wxStreamBuffer& buf); - virtual ~wxStreamBuffer(); - - // Filtered IO - virtual size_t Read(void *buffer, size_t size); - size_t Read(wxStreamBuffer *buf); - virtual size_t Write(const void *buffer, size_t size); - size_t Write(wxStreamBuffer *buf); - - virtual char Peek(); - virtual char GetChar(); - virtual void PutChar(char c); - virtual wxFileOffset Tell() const; - virtual wxFileOffset Seek(wxFileOffset pos, wxSeekMode mode); - - // Buffer control - void ResetBuffer(); - void Truncate(); - - // NB: the buffer must always be allocated with malloc() if takeOwn is - // true as it will be deallocated by free() - void SetBufferIO(void *start, void *end, bool takeOwnership = false); - void SetBufferIO(void *start, size_t len, bool takeOwnership = false); - void SetBufferIO(size_t bufsize); - void *GetBufferStart() const { return m_buffer_start; } - void *GetBufferEnd() const { return m_buffer_end; } - void *GetBufferPos() const { return m_buffer_pos; } - size_t GetBufferSize() const { return m_buffer_end - m_buffer_start; } - size_t GetIntPosition() const { return m_buffer_pos - m_buffer_start; } - void SetIntPosition(size_t pos) { m_buffer_pos = m_buffer_start + pos; } - size_t GetLastAccess() const { return m_buffer_end - m_buffer_start; } - size_t GetBytesLeft() const { return m_buffer_end - m_buffer_pos; } - - void Fixed(bool fixed) { m_fixed = fixed; } - void Flushable(bool f) { m_flushable = f; } - - bool FlushBuffer(); - bool FillBuffer(); - size_t GetDataLeft(); - - // misc accessors - wxStreamBase *GetStream() const { return m_stream; } - bool HasBuffer() const { return m_buffer_start != m_buffer_end; } - - bool IsFixed() const { return m_fixed; } - bool IsFlushable() const { return m_flushable; } - - // only for input/output buffers respectively, returns NULL otherwise - wxInputStream *GetInputStream() const; - wxOutputStream *GetOutputStream() const; - - // this constructs a dummy wxStreamBuffer, used by (and exists for) - // wxMemoryStreams only, don't use! - wxStreamBuffer(BufMode mode); - -protected: - void GetFromBuffer(void *buffer, size_t size); - void PutToBuffer(const void *buffer, size_t size); - - // set the last error to the specified value if we didn't have it before - void SetError(wxStreamError err); - - // common part of several ctors - void Init(); - - // common part of ctors taking wxStreamBase parameter - void InitWithStream(wxStreamBase& stream, BufMode mode); - - // init buffer variables to be empty - void InitBuffer(); - - // free the buffer (always safe to call) - void FreeBuffer(); - - // the buffer itself: the pointers to its start and end and the current - // position in the buffer - char *m_buffer_start, - *m_buffer_end, - *m_buffer_pos; - - // the stream we're associated with - wxStreamBase *m_stream; - - // its mode - BufMode m_mode; - - // flags - bool m_destroybuf, // deallocate buffer? - m_fixed, - m_flushable; - - - wxDECLARE_NO_ASSIGN_CLASS(wxStreamBuffer); -}; - -// --------------------------------------------------------------------------- -// wxBufferedInputStream -// --------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxBufferedInputStream : public wxFilterInputStream -{ -public: - // create a buffered stream on top of the specified low-level stream - // - // if a non NULL buffer is given to the stream, it will be deleted by it, - // otherwise a default 1KB buffer will be used - wxBufferedInputStream(wxInputStream& stream, - wxStreamBuffer *buffer = NULL); - - // ctor allowing to specify the buffer size, it's just a more convenient - // alternative to creating wxStreamBuffer, calling its SetBufferIO(bufsize) - // and using the ctor above - wxBufferedInputStream(wxInputStream& stream, size_t bufsize); - - - virtual ~wxBufferedInputStream(); - - virtual char Peek() wxOVERRIDE; - virtual wxInputStream& Read(void *buffer, size_t size) wxOVERRIDE; - - // Position functions - virtual wxFileOffset SeekI(wxFileOffset pos, wxSeekMode mode = wxFromStart) wxOVERRIDE; - virtual wxFileOffset TellI() const wxOVERRIDE; - virtual bool IsSeekable() const wxOVERRIDE { return m_parent_i_stream->IsSeekable(); } - - // the buffer given to the stream will be deleted by it - void SetInputStreamBuffer(wxStreamBuffer *buffer); - wxStreamBuffer *GetInputStreamBuffer() const { return m_i_streambuf; } - -protected: - virtual size_t OnSysRead(void *buffer, size_t bufsize) wxOVERRIDE; - virtual wxFileOffset OnSysSeek(wxFileOffset seek, wxSeekMode mode) wxOVERRIDE; - virtual wxFileOffset OnSysTell() const wxOVERRIDE; - - wxStreamBuffer *m_i_streambuf; - - wxDECLARE_NO_COPY_CLASS(wxBufferedInputStream); -}; - -// ---------------------------------------------------------------------------- -// wxBufferedOutputStream -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxBufferedOutputStream : public wxFilterOutputStream -{ -public: - // create a buffered stream on top of the specified low-level stream - // - // if a non NULL buffer is given to the stream, it will be deleted by it, - // otherwise a default 1KB buffer will be used - wxBufferedOutputStream(wxOutputStream& stream, - wxStreamBuffer *buffer = NULL); - - // ctor allowing to specify the buffer size, it's just a more convenient - // alternative to creating wxStreamBuffer, calling its SetBufferIO(bufsize) - // and using the ctor above - wxBufferedOutputStream(wxOutputStream& stream, size_t bufsize); - - virtual ~wxBufferedOutputStream(); - - virtual wxOutputStream& Write(const void *buffer, size_t size) wxOVERRIDE; - - // Position functions - virtual wxFileOffset SeekO(wxFileOffset pos, wxSeekMode mode = wxFromStart) wxOVERRIDE; - virtual wxFileOffset TellO() const wxOVERRIDE; - virtual bool IsSeekable() const wxOVERRIDE { return m_parent_o_stream->IsSeekable(); } - - void Sync() wxOVERRIDE; - bool Close() wxOVERRIDE; - - virtual wxFileOffset GetLength() const wxOVERRIDE; - - // the buffer given to the stream will be deleted by it - void SetOutputStreamBuffer(wxStreamBuffer *buffer); - wxStreamBuffer *GetOutputStreamBuffer() const { return m_o_streambuf; } - -protected: - virtual size_t OnSysWrite(const void *buffer, size_t bufsize) wxOVERRIDE; - virtual wxFileOffset OnSysSeek(wxFileOffset seek, wxSeekMode mode) wxOVERRIDE; - virtual wxFileOffset OnSysTell() const wxOVERRIDE; - - wxStreamBuffer *m_o_streambuf; - - wxDECLARE_NO_COPY_CLASS(wxBufferedOutputStream); -}; - -// --------------------------------------------------------------------------- -// wxWrapperInputStream: forwards all IO to another stream. -// --------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxWrapperInputStream : public wxFilterInputStream -{ -public: - // Constructor fully initializing the stream. The overload taking pointer - // takes ownership of the parent stream, the one taking reference does not. - // - // Notice that this class also has a default ctor but it's protected as the - // derived class is supposed to take care of calling InitParentStream() if - // it's used. - wxWrapperInputStream(wxInputStream& stream); - wxWrapperInputStream(wxInputStream* stream); - - // Override the base class methods to forward to the wrapped stream. - virtual wxFileOffset GetLength() const wxOVERRIDE; - virtual bool IsSeekable() const wxOVERRIDE; - -protected: - virtual size_t OnSysRead(void *buffer, size_t size) wxOVERRIDE; - virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) wxOVERRIDE; - virtual wxFileOffset OnSysTell() const wxOVERRIDE; - - // Ensure that our own last error is the same as that of the real stream. - // - // This method is const because the error must be updated even from const - // methods (in other words, it really should have been mutable in the first - // place). - void SynchronizeLastError() const - { - const_cast(this)-> - Reset(m_parent_i_stream->GetLastError()); - } - - // Default constructor, use InitParentStream() later. - wxWrapperInputStream(); - - // Set up the wrapped stream for an object initialized using the default - // constructor. The ownership logic is the same as above. - void InitParentStream(wxInputStream& stream); - void InitParentStream(wxInputStream* stream); - - wxDECLARE_NO_COPY_CLASS(wxWrapperInputStream); -}; - - -#endif // wxUSE_STREAMS - -#endif // _WX_WXSTREAM_H__ diff --git a/Externals/wxWidgets3/include/wx/string.h b/Externals/wxWidgets3/include/wx/string.h deleted file mode 100644 index c23586e314..0000000000 --- a/Externals/wxWidgets3/include/wx/string.h +++ /dev/null @@ -1,4176 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/string.h -// Purpose: wxString class -// Author: Vadim Zeitlin -// Modified by: -// Created: 29/01/98 -// Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -/* - Efficient string class [more or less] compatible with MFC CString, - wxWidgets version 1 wxString and std::string and some handy functions - missing from string.h. -*/ - -#ifndef _WX_WXSTRING_H__ -#define _WX_WXSTRING_H__ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/defs.h" // everybody should include this - -#if defined(__WXMAC__) - #include -#endif - -#include -#include -#include -#include -#include - -#include "wx/wxcrtbase.h" // for wxChar, wxStrlen() etc. -#include "wx/strvararg.h" -#include "wx/buffer.h" // for wxCharBuffer -#include "wx/strconv.h" // for wxConvertXXX() macros and wxMBConv classes -#include "wx/stringimpl.h" -#include "wx/stringops.h" -#include "wx/unichar.h" - -// by default we cache the mapping of the positions in UTF-8 string to the byte -// offset as this results in noticeable performance improvements for loops over -// strings using indices; comment out this line to disable this -// -// notice that this optimization is well worth using even in debug builds as it -// changes asymptotic complexity of algorithms using indices to iterate over -// wxString back to expected linear from quadratic -// -// also notice that wxTLS_TYPE() (__declspec(thread) in this case) is unsafe to -// use in DLL build under pre-Vista Windows so we disable this code for now, if -// anybody really needs to use UTF-8 build under Windows with this optimization -// it would have to be re-tested and probably corrected -// CS: under OSX release builds the string destructor/cache cleanup sometimes -// crashes, disable until we find the true reason or a better workaround -#if wxUSE_UNICODE_UTF8 && !defined(__WINDOWS__) && !defined(__WXOSX__) - #define wxUSE_STRING_POS_CACHE 1 -#else - #define wxUSE_STRING_POS_CACHE 0 -#endif - -#if wxUSE_STRING_POS_CACHE - #include "wx/tls.h" - - // change this 0 to 1 to enable additional (very expensive) asserts - // verifying that string caching logic works as expected - #if 0 - #define wxSTRING_CACHE_ASSERT(cond) wxASSERT(cond) - #else - #define wxSTRING_CACHE_ASSERT(cond) - #endif -#endif // wxUSE_STRING_POS_CACHE - -class WXDLLIMPEXP_FWD_BASE wxString; - -// unless this symbol is predefined to disable the compatibility functions, do -// use them -#ifndef WXWIN_COMPATIBILITY_STRING_PTR_AS_ITER - #define WXWIN_COMPATIBILITY_STRING_PTR_AS_ITER 1 -#endif - -namespace wxPrivate -{ - template struct wxStringAsBufHelper; -} - -// --------------------------------------------------------------------------- -// macros -// --------------------------------------------------------------------------- - -// casts [unfortunately!] needed to call some broken functions which require -// "char *" instead of "const char *" -#define WXSTRINGCAST (wxChar *)(const wxChar *) -#define wxCSTRINGCAST (wxChar *)(const wxChar *) -#define wxMBSTRINGCAST (char *)(const char *) -#define wxWCSTRINGCAST (wchar_t *)(const wchar_t *) - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -// --------------------------------------------------------------------------- -// global functions complementing standard C string library replacements for -// strlen() and portable strcasecmp() -//--------------------------------------------------------------------------- - -#if WXWIN_COMPATIBILITY_2_8 -// Use wxXXX() functions from wxcrt.h instead! These functions are for -// backwards compatibility only. - -// checks whether the passed in pointer is NULL and if the string is empty -wxDEPRECATED_MSG("use wxIsEmpty() instead") -inline bool IsEmpty(const char *p) { return (!p || !*p); } - -// safe version of strlen() (returns 0 if passed NULL pointer) -wxDEPRECATED_MSG("use wxStrlen() instead") -inline size_t Strlen(const char *psz) - { return psz ? strlen(psz) : 0; } - -// portable strcasecmp/_stricmp -wxDEPRECATED_MSG("use wxStricmp() instead") -inline int Stricmp(const char *psz1, const char *psz2) - { return wxCRT_StricmpA(psz1, psz2); } - -#endif // WXWIN_COMPATIBILITY_2_8 - -// ---------------------------------------------------------------------------- -// wxCStrData -// ---------------------------------------------------------------------------- - -// Lightweight object returned by wxString::c_str() and implicitly convertible -// to either const char* or const wchar_t*. -class wxCStrData -{ -private: - // Ctors; for internal use by wxString and wxCStrData only - wxCStrData(const wxString *str, size_t offset = 0, bool owned = false) - : m_str(str), m_offset(offset), m_owned(owned) {} - -public: - // Ctor constructs the object from char literal; they are needed to make - // operator?: compile and they intentionally take char*, not const char* - inline wxCStrData(char *buf); - inline wxCStrData(wchar_t *buf); - inline wxCStrData(const wxCStrData& data); - - inline ~wxCStrData(); - - // AsWChar() and AsChar() can't be defined here as they use wxString and so - // must come after it and because of this won't be inlined when called from - // wxString methods (without a lot of work to extract these wxString methods - // from inside the class itself). But we still define them being inline - // below to let compiler inline them from elsewhere. And because of this we - // must declare them as inline here because otherwise some compilers give - // warnings about them, e.g. mingw32 3.4.5 warns about " defined - // locally after being referenced with dllimport linkage" while IRIX - // mipsPro 7.4 warns about "function declared inline after being called". - inline const wchar_t* AsWChar() const; - operator const wchar_t*() const { return AsWChar(); } - - inline const char* AsChar() const; - const unsigned char* AsUnsignedChar() const - { return (const unsigned char *) AsChar(); } - operator const char*() const { return AsChar(); } - operator const unsigned char*() const { return AsUnsignedChar(); } - - operator const void*() const { return AsChar(); } - - // returns buffers that are valid as long as the associated wxString exists - const wxScopedCharBuffer AsCharBuf() const - { - return wxScopedCharBuffer::CreateNonOwned(AsChar()); - } - - const wxScopedWCharBuffer AsWCharBuf() const - { - return wxScopedWCharBuffer::CreateNonOwned(AsWChar()); - } - - inline wxString AsString() const; - - // returns the value as C string in internal representation (equivalent - // to AsString().wx_str(), but more efficient) - const wxStringCharType *AsInternal() const; - - // allow expressions like "c_str()[0]": - inline wxUniChar operator[](size_t n) const; - wxUniChar operator[](int n) const { return operator[](size_t(n)); } - wxUniChar operator[](long n) const { return operator[](size_t(n)); } -#ifndef wxSIZE_T_IS_UINT - wxUniChar operator[](unsigned int n) const { return operator[](size_t(n)); } -#endif // size_t != unsigned int - - // These operators are needed to emulate the pointer semantics of c_str(): - // expressions like "wxChar *p = str.c_str() + 1;" should continue to work - // (we need both versions to resolve ambiguities). Note that this means - // the 'n' value is interpreted as addition to char*/wchar_t* pointer, it - // is *not* number of Unicode characters in wxString. - wxCStrData operator+(int n) const - { return wxCStrData(m_str, m_offset + n, m_owned); } - wxCStrData operator+(long n) const - { return wxCStrData(m_str, m_offset + n, m_owned); } - wxCStrData operator+(size_t n) const - { return wxCStrData(m_str, m_offset + n, m_owned); } - - // and these for "str.c_str() + (p2 - p1)" (it also works for any integer - // expression but it must be ptrdiff_t and not e.g. int to work in this - // example): - wxCStrData operator-(ptrdiff_t n) const - { - wxASSERT_MSG( n <= (ptrdiff_t)m_offset, - wxT("attempt to construct address before the beginning of the string") ); - return wxCStrData(m_str, m_offset - n, m_owned); - } - - // this operator is needed to make expressions like "*c_str()" or - // "*(c_str() + 2)" work - inline wxUniChar operator*() const; - -private: - // the wxString this object was returned for - const wxString *m_str; - // Offset into c_str() return value. Note that this is *not* offset in - // m_str in Unicode characters. Instead, it is index into the - // char*/wchar_t* buffer returned by c_str(). It's interpretation depends - // on how is the wxCStrData instance used: if it is eventually cast to - // const char*, m_offset will be in bytes form string's start; if it is - // cast to const wchar_t*, it will be in wchar_t values. - size_t m_offset; - // should m_str be deleted, i.e. is it owned by us? - bool m_owned; - - friend class WXDLLIMPEXP_FWD_BASE wxString; -}; - -// ---------------------------------------------------------------------------- -// wxString: string class trying to be compatible with std::string, MFC -// CString and wxWindows 1.x wxString all at once -// --------------------------------------------------------------------------- - -#if wxUSE_UNICODE_UTF8 -// see the comment near wxString::iterator for why we need this -class WXDLLIMPEXP_BASE wxStringIteratorNode -{ -public: - wxStringIteratorNode() - : m_str(NULL), m_citer(NULL), m_iter(NULL), m_prev(NULL), m_next(NULL) {} - wxStringIteratorNode(const wxString *str, - wxStringImpl::const_iterator *citer) - { DoSet(str, citer, NULL); } - wxStringIteratorNode(const wxString *str, wxStringImpl::iterator *iter) - { DoSet(str, NULL, iter); } - ~wxStringIteratorNode() - { clear(); } - - inline void set(const wxString *str, wxStringImpl::const_iterator *citer) - { clear(); DoSet(str, citer, NULL); } - inline void set(const wxString *str, wxStringImpl::iterator *iter) - { clear(); DoSet(str, NULL, iter); } - - const wxString *m_str; - wxStringImpl::const_iterator *m_citer; - wxStringImpl::iterator *m_iter; - wxStringIteratorNode *m_prev, *m_next; - -private: - inline void clear(); - inline void DoSet(const wxString *str, - wxStringImpl::const_iterator *citer, - wxStringImpl::iterator *iter); - - // the node belongs to a particular iterator instance, it's not copied - // when a copy of the iterator is made - wxDECLARE_NO_COPY_CLASS(wxStringIteratorNode); -}; -#endif // wxUSE_UNICODE_UTF8 - -class WXDLLIMPEXP_BASE wxString -{ - // NB: special care was taken in arranging the member functions in such order - // that all inline functions can be effectively inlined, verify that all - // performance critical functions are still inlined if you change order! -public: - // an 'invalid' value for string index, moved to this place due to a CW bug - static const size_t npos; - -private: - // if we hadn't made these operators private, it would be possible to - // compile "wxString s; s = 17;" without any warnings as 17 is implicitly - // converted to char in C and we do have operator=(char) - // - // NB: we don't need other versions (short/long and unsigned) as attempt - // to assign another numeric type to wxString will now result in - // ambiguity between operator=(char) and operator=(int) - wxString& operator=(int); - - // these methods are not implemented - there is _no_ conversion from int to - // string, you're doing something wrong if the compiler wants to call it! - // - // try `s << i' or `s.Printf("%d", i)' instead - wxString(int); - - - // buffer for holding temporary substring when using any of the methods - // that take (char*,size_t) or (wchar_t*,size_t) arguments: - template - struct SubstrBufFromType - { - T data; - size_t len; - - SubstrBufFromType(const T& data_, size_t len_) - : data(data_), len(len_) - { - wxASSERT_MSG( len != npos, "must have real length" ); - } - }; - -#if wxUSE_UNICODE_UTF8 - // even char* -> char* needs conversion, from locale charset to UTF-8 - typedef SubstrBufFromType SubstrBufFromWC; - typedef SubstrBufFromType SubstrBufFromMB; -#elif wxUSE_UNICODE_WCHAR - typedef SubstrBufFromType SubstrBufFromWC; - typedef SubstrBufFromType SubstrBufFromMB; -#else - typedef SubstrBufFromType SubstrBufFromMB; - typedef SubstrBufFromType SubstrBufFromWC; -#endif - - - // Functions implementing primitive operations on string data; wxString - // methods and iterators are implemented in terms of it. The differences - // between UTF-8 and wchar_t* representations of the string are mostly - // contained here. - -#if wxUSE_UNICODE_UTF8 - static SubstrBufFromMB ConvertStr(const char *psz, size_t nLength, - const wxMBConv& conv); - static SubstrBufFromWC ConvertStr(const wchar_t *pwz, size_t nLength, - const wxMBConv& conv); -#elif wxUSE_UNICODE_WCHAR - static SubstrBufFromMB ConvertStr(const char *psz, size_t nLength, - const wxMBConv& conv); -#else - static SubstrBufFromWC ConvertStr(const wchar_t *pwz, size_t nLength, - const wxMBConv& conv); -#endif - -#if !wxUSE_UNICODE_UTF8 // wxUSE_UNICODE_WCHAR or !wxUSE_UNICODE - // returns C string encoded as the implementation expects: - #if wxUSE_UNICODE - static const wchar_t* ImplStr(const wchar_t* str) - { return str ? str : wxT(""); } - static const SubstrBufFromWC ImplStr(const wchar_t* str, size_t n) - { return SubstrBufFromWC(str, (str && n == npos) ? wxWcslen(str) : n); } - static wxScopedWCharBuffer ImplStr(const char* str, - const wxMBConv& conv = wxConvLibc) - { return ConvertStr(str, npos, conv).data; } - static SubstrBufFromMB ImplStr(const char* str, size_t n, - const wxMBConv& conv = wxConvLibc) - { return ConvertStr(str, n, conv); } - #else - static const char* ImplStr(const char* str, - const wxMBConv& WXUNUSED(conv) = wxConvLibc) - { return str ? str : ""; } - static const SubstrBufFromMB ImplStr(const char* str, size_t n, - const wxMBConv& WXUNUSED(conv) = wxConvLibc) - { return SubstrBufFromMB(str, (str && n == npos) ? wxStrlen(str) : n); } - static wxScopedCharBuffer ImplStr(const wchar_t* str) - { return ConvertStr(str, npos, wxConvLibc).data; } - static SubstrBufFromWC ImplStr(const wchar_t* str, size_t n) - { return ConvertStr(str, n, wxConvLibc); } - #endif - - // translates position index in wxString to/from index in underlying - // wxStringImpl: - static size_t PosToImpl(size_t pos) { return pos; } - static void PosLenToImpl(size_t pos, size_t len, - size_t *implPos, size_t *implLen) - { *implPos = pos; *implLen = len; } - static size_t LenToImpl(size_t len) { return len; } - static size_t PosFromImpl(size_t pos) { return pos; } - - // we don't want to define these as empty inline functions as it could - // result in noticeable (and quite unnecessary in non-UTF-8 build) slowdown - // in debug build where the inline functions are not effectively inlined - #define wxSTRING_INVALIDATE_CACHE() - #define wxSTRING_INVALIDATE_CACHED_LENGTH() - #define wxSTRING_UPDATE_CACHED_LENGTH(n) - #define wxSTRING_SET_CACHED_LENGTH(n) - -#else // wxUSE_UNICODE_UTF8 - - static wxScopedCharBuffer ImplStr(const char* str, - const wxMBConv& conv = wxConvLibc) - { return ConvertStr(str, npos, conv).data; } - static SubstrBufFromMB ImplStr(const char* str, size_t n, - const wxMBConv& conv = wxConvLibc) - { return ConvertStr(str, n, conv); } - - static wxScopedCharBuffer ImplStr(const wchar_t* str) - { return ConvertStr(str, npos, wxMBConvUTF8()).data; } - static SubstrBufFromWC ImplStr(const wchar_t* str, size_t n) - { return ConvertStr(str, n, wxMBConvUTF8()); } - -#if wxUSE_STRING_POS_CACHE - // this is an extremely simple cache used by PosToImpl(): each cache element - // contains the string it applies to and the index corresponding to the last - // used position in this wxString in its m_impl string - // - // NB: notice that this struct (and nested Element one) must be a POD or we - // wouldn't be able to use a thread-local variable of this type, in - // particular it should have no ctor -- we rely on statics being - // initialized to 0 instead - struct Cache - { - enum { SIZE = 8 }; - - struct Element - { - const wxString *str; // the string to which this element applies - size_t pos, // the cached index in this string - impl, // the corresponding position in its m_impl - len; // cached length or npos if unknown - - // reset cached index to 0 - void ResetPos() { pos = impl = 0; } - - // reset position and length - void Reset() { ResetPos(); len = npos; } - }; - - // cache the indices mapping for the last few string used - Element cached[SIZE]; - - // the last used index - unsigned lastUsed; - }; - -#ifndef wxHAS_COMPILER_TLS - // we must use an accessor function and not a static variable when the TLS - // variables support is implemented in the library (and not by the compiler) - // because the global s_cache variable could be not yet initialized when a - // ctor of another global object is executed and if that ctor uses any - // wxString methods, bad things happen - // - // however notice that this approach does not work when compiler TLS is used, - // at least not with g++ 4.1.2 under amd64 as it apparently compiles code - // using this accessor incorrectly when optimizations are enabled (-O2 is - // enough) -- luckily we don't need it then neither as static __thread - // variables are initialized by 0 anyhow then and so we can use the variable - // directly - WXEXPORT static Cache& GetCache() - { - static wxTLS_TYPE(Cache) s_cache; - - return wxTLS_VALUE(s_cache); - } - - // this helper struct is used to ensure that GetCache() is called during - // static initialization time, i.e. before any threads creation, as otherwise - // the static s_cache construction inside GetCache() wouldn't be MT-safe - friend struct wxStrCacheInitializer; -#else // wxHAS_COMPILER_TLS - static wxTLS_TYPE(Cache) ms_cache; - static Cache& GetCache() { return wxTLS_VALUE(ms_cache); } -#endif // !wxHAS_COMPILER_TLS/wxHAS_COMPILER_TLS - - static Cache::Element *GetCacheBegin() { return GetCache().cached; } - static Cache::Element *GetCacheEnd() { return GetCacheBegin() + Cache::SIZE; } - static unsigned& LastUsedCacheElement() { return GetCache().lastUsed; } - - // this is used in debug builds only to provide a convenient function, - // callable from a debugger, to show the cache contents - friend struct wxStrCacheDumper; - - // uncomment this to have access to some profiling statistics on program - // termination - //#define wxPROFILE_STRING_CACHE - -#ifdef wxPROFILE_STRING_CACHE - static struct PosToImplCacheStats - { - unsigned postot, // total non-trivial calls to PosToImpl - poshits, // cache hits from PosToImpl() - mishits, // cached position beyond the needed one - sumpos, // sum of all positions, used to compute the - // average position after dividing by postot - sumofs, // sum of all offsets after using the cache, used to - // compute the average after dividing by hits - lentot, // number of total calls to length() - lenhits; // number of cache hits in length() - } ms_cacheStats; - - friend struct wxStrCacheStatsDumper; - - #define wxCACHE_PROFILE_FIELD_INC(field) ms_cacheStats.field++ - #define wxCACHE_PROFILE_FIELD_ADD(field, val) ms_cacheStats.field += (val) -#else // !wxPROFILE_STRING_CACHE - #define wxCACHE_PROFILE_FIELD_INC(field) - #define wxCACHE_PROFILE_FIELD_ADD(field, val) -#endif // wxPROFILE_STRING_CACHE/!wxPROFILE_STRING_CACHE - - // note: it could seem that the functions below shouldn't be inline because - // they are big, contain loops and so the compiler shouldn't be able to - // inline them anyhow, however moving them into string.cpp does decrease the - // code performance by ~5%, at least when using g++ 4.1 so do keep them here - // unless tests show that it's not advantageous any more - - // return the pointer to the cache element for this string or NULL if not - // cached - Cache::Element *FindCacheElement() const - { - // profiling seems to show a small but consistent gain if we use this - // simple loop instead of starting from the last used element (there are - // a lot of misses in this function...) - Cache::Element * const cacheBegin = GetCacheBegin(); -#ifndef wxHAS_COMPILER_TLS - // during destruction tls calls may return NULL, in this case return NULL - // immediately without accessing anything else - if ( cacheBegin == NULL ) - return NULL; -#endif - Cache::Element * const cacheEnd = GetCacheEnd(); - for ( Cache::Element *c = cacheBegin; c != cacheEnd; c++ ) - { - if ( c->str == this ) - return c; - } - - return NULL; - } - - // unlike FindCacheElement(), this one always returns a valid pointer to the - // cache element for this string, it may have valid last cached position and - // its corresponding index in the byte string or not - Cache::Element *GetCacheElement() const - { - Cache::Element * const cacheBegin = GetCacheBegin(); - Cache::Element * const cacheEnd = GetCacheEnd(); - Cache::Element * const cacheStart = cacheBegin + LastUsedCacheElement(); - - // check the last used first, this does no (measurable) harm for a miss - // but does help for simple loops addressing the same string all the time - if ( cacheStart->str == this ) - return cacheStart; - - // notice that we're going to check cacheStart again inside this call but - // profiling shows that it's still faster to use a simple loop like - // inside FindCacheElement() than manually looping with wrapping starting - // from the cache entry after the start one - Cache::Element *c = FindCacheElement(); - if ( !c ) - { - // claim the next cache entry for this string - c = cacheStart; - if ( ++c == cacheEnd ) - c = cacheBegin; - - c->str = this; - c->Reset(); - - // and remember the last used element - LastUsedCacheElement() = c - cacheBegin; - } - - return c; - } - - size_t DoPosToImpl(size_t pos) const - { - wxCACHE_PROFILE_FIELD_INC(postot); - - // NB: although the case of pos == 1 (and offset from cached position - // equal to 1) are common, nothing is gained by writing special code - // for handling them, the compiler (at least g++ 4.1 used) seems to - // optimize the code well enough on its own - - wxCACHE_PROFILE_FIELD_ADD(sumpos, pos); - - Cache::Element * const cache = GetCacheElement(); - - // cached position can't be 0 so if it is, it means that this entry was - // used for length caching only so far, i.e. it doesn't count as a hit - // from our point of view - if ( cache->pos ) - { - wxCACHE_PROFILE_FIELD_INC(poshits); - } - - if ( pos == cache->pos ) - return cache->impl; - - // this seems to happen only rarely so just reset the cache in this case - // instead of complicating code even further by seeking backwards in this - // case - if ( cache->pos > pos ) - { - wxCACHE_PROFILE_FIELD_INC(mishits); - - cache->ResetPos(); - } - - wxCACHE_PROFILE_FIELD_ADD(sumofs, pos - cache->pos); - - - wxStringImpl::const_iterator i(m_impl.begin() + cache->impl); - for ( size_t n = cache->pos; n < pos; n++ ) - wxStringOperations::IncIter(i); - - cache->pos = pos; - cache->impl = i - m_impl.begin(); - - wxSTRING_CACHE_ASSERT( - (int)cache->impl == (begin() + pos).impl() - m_impl.begin() ); - - return cache->impl; - } - - void InvalidateCache() - { - Cache::Element * const cache = FindCacheElement(); - if ( cache ) - cache->Reset(); - } - - void InvalidateCachedLength() - { - Cache::Element * const cache = FindCacheElement(); - if ( cache ) - cache->len = npos; - } - - void SetCachedLength(size_t len) - { - // we optimistically cache the length here even if the string wasn't - // present in the cache before, this seems to do no harm and the - // potential for avoiding length recomputation for long strings looks - // interesting - GetCacheElement()->len = len; - } - - void UpdateCachedLength(ptrdiff_t delta) - { - Cache::Element * const cache = FindCacheElement(); - if ( cache && cache->len != npos ) - { - wxSTRING_CACHE_ASSERT( (ptrdiff_t)cache->len + delta >= 0 ); - - cache->len += delta; - } - } - - #define wxSTRING_INVALIDATE_CACHE() InvalidateCache() - #define wxSTRING_INVALIDATE_CACHED_LENGTH() InvalidateCachedLength() - #define wxSTRING_UPDATE_CACHED_LENGTH(n) UpdateCachedLength(n) - #define wxSTRING_SET_CACHED_LENGTH(n) SetCachedLength(n) -#else // !wxUSE_STRING_POS_CACHE - size_t DoPosToImpl(size_t pos) const - { - return (begin() + pos).impl() - m_impl.begin(); - } - - #define wxSTRING_INVALIDATE_CACHE() - #define wxSTRING_INVALIDATE_CACHED_LENGTH() - #define wxSTRING_UPDATE_CACHED_LENGTH(n) - #define wxSTRING_SET_CACHED_LENGTH(n) -#endif // wxUSE_STRING_POS_CACHE/!wxUSE_STRING_POS_CACHE - - size_t PosToImpl(size_t pos) const - { - return pos == 0 || pos == npos ? pos : DoPosToImpl(pos); - } - - void PosLenToImpl(size_t pos, size_t len, size_t *implPos, size_t *implLen) const; - - size_t LenToImpl(size_t len) const - { - size_t pos, len2; - PosLenToImpl(0, len, &pos, &len2); - return len2; - } - - size_t PosFromImpl(size_t pos) const - { - if ( pos == 0 || pos == npos ) - return pos; - else - return const_iterator(this, m_impl.begin() + pos) - begin(); - } -#endif // !wxUSE_UNICODE_UTF8/wxUSE_UNICODE_UTF8 - -public: - // standard types - typedef wxUniChar value_type; - typedef wxUniChar char_type; - typedef wxUniCharRef reference; - typedef wxChar* pointer; - typedef const wxChar* const_pointer; - - typedef size_t size_type; - typedef wxUniChar const_reference; - -#if wxUSE_STD_STRING - #if wxUSE_UNICODE_UTF8 - // random access is not O(1), as required by Random Access Iterator - #define WX_STR_ITERATOR_TAG std::bidirectional_iterator_tag - #else - #define WX_STR_ITERATOR_TAG std::random_access_iterator_tag - #endif - #define WX_DEFINE_ITERATOR_CATEGORY(cat) typedef cat iterator_category; -#else - // not defining iterator_category at all in this case is better than defining - // it as some dummy type -- at least it results in more intelligible error - // messages - #define WX_DEFINE_ITERATOR_CATEGORY(cat) -#endif - - #define WX_STR_ITERATOR_IMPL(iterator_name, pointer_type, reference_type) \ - private: \ - typedef wxStringImpl::iterator_name underlying_iterator; \ - public: \ - WX_DEFINE_ITERATOR_CATEGORY(WX_STR_ITERATOR_TAG) \ - typedef wxUniChar value_type; \ - typedef ptrdiff_t difference_type; \ - typedef reference_type reference; \ - typedef pointer_type pointer; \ - \ - reference operator[](size_t n) const { return *(*this + n); } \ - \ - iterator_name& operator++() \ - { wxStringOperations::IncIter(m_cur); return *this; } \ - iterator_name& operator--() \ - { wxStringOperations::DecIter(m_cur); return *this; } \ - iterator_name operator++(int) \ - { \ - iterator_name tmp = *this; \ - wxStringOperations::IncIter(m_cur); \ - return tmp; \ - } \ - iterator_name operator--(int) \ - { \ - iterator_name tmp = *this; \ - wxStringOperations::DecIter(m_cur); \ - return tmp; \ - } \ - \ - iterator_name& operator+=(ptrdiff_t n) \ - { \ - m_cur = wxStringOperations::AddToIter(m_cur, n); \ - return *this; \ - } \ - iterator_name& operator-=(ptrdiff_t n) \ - { \ - m_cur = wxStringOperations::AddToIter(m_cur, -n); \ - return *this; \ - } \ - \ - difference_type operator-(const iterator_name& i) const \ - { return wxStringOperations::DiffIters(m_cur, i.m_cur); } \ - \ - bool operator==(const iterator_name& i) const \ - { return m_cur == i.m_cur; } \ - bool operator!=(const iterator_name& i) const \ - { return m_cur != i.m_cur; } \ - \ - bool operator<(const iterator_name& i) const \ - { return m_cur < i.m_cur; } \ - bool operator>(const iterator_name& i) const \ - { return m_cur > i.m_cur; } \ - bool operator<=(const iterator_name& i) const \ - { return m_cur <= i.m_cur; } \ - bool operator>=(const iterator_name& i) const \ - { return m_cur >= i.m_cur; } \ - \ - private: \ - /* for internal wxString use only: */ \ - underlying_iterator impl() const { return m_cur; } \ - \ - friend class wxString; \ - friend class wxCStrData; \ - \ - private: \ - underlying_iterator m_cur - - class WXDLLIMPEXP_FWD_BASE const_iterator; - -#if wxUSE_UNICODE_UTF8 - // NB: In UTF-8 build, (non-const) iterator needs to keep reference - // to the underlying wxStringImpl, because UTF-8 is variable-length - // encoding and changing the value pointer to by an iterator (using - // its operator*) requires calling wxStringImpl::replace() if the old - // and new values differ in their encoding's length. - // - // Furthermore, the replace() call may invalid all iterators for the - // string, so we have to keep track of outstanding iterators and update - // them if replace() happens. - // - // This is implemented by maintaining linked list of iterators for every - // string and traversing it in wxUniCharRef::operator=(). Head of the - // list is stored in wxString. (FIXME-UTF8) - - class WXDLLIMPEXP_BASE iterator - { - WX_STR_ITERATOR_IMPL(iterator, wxChar*, wxUniCharRef); - - public: - iterator() {} - iterator(const iterator& i) - : m_cur(i.m_cur), m_node(i.str(), &m_cur) {} - iterator& operator=(const iterator& i) - { - if (&i != this) - { - m_cur = i.m_cur; - m_node.set(i.str(), &m_cur); - } - return *this; - } - - reference operator*() - { return wxUniCharRef::CreateForString(*str(), m_cur); } - - iterator operator+(ptrdiff_t n) const - { return iterator(str(), wxStringOperations::AddToIter(m_cur, n)); } - iterator operator-(ptrdiff_t n) const - { return iterator(str(), wxStringOperations::AddToIter(m_cur, -n)); } - - // Normal iterators need to be comparable with the const_iterators so - // declare the comparison operators and implement them below after the - // full const_iterator declaration. - bool operator==(const const_iterator& i) const; - bool operator!=(const const_iterator& i) const; - bool operator<(const const_iterator& i) const; - bool operator>(const const_iterator& i) const; - bool operator<=(const const_iterator& i) const; - bool operator>=(const const_iterator& i) const; - - private: - iterator(wxString *wxstr, underlying_iterator ptr) - : m_cur(ptr), m_node(wxstr, &m_cur) {} - - wxString* str() const { return const_cast(m_node.m_str); } - - wxStringIteratorNode m_node; - - friend class const_iterator; - }; - - class WXDLLIMPEXP_BASE const_iterator - { - // NB: reference_type is intentionally value, not reference, the character - // may be encoded differently in wxString data: - WX_STR_ITERATOR_IMPL(const_iterator, const wxChar*, wxUniChar); - - public: - const_iterator() {} - const_iterator(const const_iterator& i) - : m_cur(i.m_cur), m_node(i.str(), &m_cur) {} - const_iterator(const iterator& i) - : m_cur(i.m_cur), m_node(i.str(), &m_cur) {} - - const_iterator& operator=(const const_iterator& i) - { - if (&i != this) - { - m_cur = i.m_cur; - m_node.set(i.str(), &m_cur); - } - return *this; - } - const_iterator& operator=(const iterator& i) - { m_cur = i.m_cur; m_node.set(i.str(), &m_cur); return *this; } - - reference operator*() const - { return wxStringOperations::DecodeChar(m_cur); } - - const_iterator operator+(ptrdiff_t n) const - { return const_iterator(str(), wxStringOperations::AddToIter(m_cur, n)); } - const_iterator operator-(ptrdiff_t n) const - { return const_iterator(str(), wxStringOperations::AddToIter(m_cur, -n)); } - - // Notice that comparison operators taking non-const iterator are not - // needed here because of the implicit conversion from non-const iterator - // to const ones ensure that the versions for const_iterator declared - // inside WX_STR_ITERATOR_IMPL can be used. - - private: - // for internal wxString use only: - const_iterator(const wxString *wxstr, underlying_iterator ptr) - : m_cur(ptr), m_node(wxstr, &m_cur) {} - - const wxString* str() const { return m_node.m_str; } - - wxStringIteratorNode m_node; - }; - - size_t IterToImplPos(wxString::iterator i) const - { return wxStringImpl::const_iterator(i.impl()) - m_impl.begin(); } - - iterator GetIterForNthChar(size_t n) - { return iterator(this, m_impl.begin() + PosToImpl(n)); } - const_iterator GetIterForNthChar(size_t n) const - { return const_iterator(this, m_impl.begin() + PosToImpl(n)); } -#else // !wxUSE_UNICODE_UTF8 - - class WXDLLIMPEXP_BASE iterator - { - WX_STR_ITERATOR_IMPL(iterator, wxChar*, wxUniCharRef); - - public: - iterator() {} - iterator(const iterator& i) : m_cur(i.m_cur) {} - - reference operator*() - { return wxUniCharRef::CreateForString(m_cur); } - - iterator operator+(ptrdiff_t n) const - { return iterator(wxStringOperations::AddToIter(m_cur, n)); } - iterator operator-(ptrdiff_t n) const - { return iterator(wxStringOperations::AddToIter(m_cur, -n)); } - - // As in UTF-8 case above, define comparison operators taking - // const_iterator too. - bool operator==(const const_iterator& i) const; - bool operator!=(const const_iterator& i) const; - bool operator<(const const_iterator& i) const; - bool operator>(const const_iterator& i) const; - bool operator<=(const const_iterator& i) const; - bool operator>=(const const_iterator& i) const; - - private: - // for internal wxString use only: - iterator(underlying_iterator ptr) : m_cur(ptr) {} - iterator(wxString *WXUNUSED(str), underlying_iterator ptr) : m_cur(ptr) {} - - friend class const_iterator; - }; - - class WXDLLIMPEXP_BASE const_iterator - { - // NB: reference_type is intentionally value, not reference, the character - // may be encoded differently in wxString data: - WX_STR_ITERATOR_IMPL(const_iterator, const wxChar*, wxUniChar); - - public: - const_iterator() {} - const_iterator(const const_iterator& i) : m_cur(i.m_cur) {} - const_iterator(const iterator& i) : m_cur(i.m_cur) {} - - reference operator*() const - { return wxStringOperations::DecodeChar(m_cur); } - - const_iterator operator+(ptrdiff_t n) const - { return const_iterator(wxStringOperations::AddToIter(m_cur, n)); } - const_iterator operator-(ptrdiff_t n) const - { return const_iterator(wxStringOperations::AddToIter(m_cur, -n)); } - - // As in UTF-8 case above, we don't need comparison operators taking - // iterator because we have an implicit conversion from iterator to - // const_iterator so the operators declared by WX_STR_ITERATOR_IMPL will - // be used. - - private: - // for internal wxString use only: - const_iterator(underlying_iterator ptr) : m_cur(ptr) {} - const_iterator(const wxString *WXUNUSED(str), underlying_iterator ptr) - : m_cur(ptr) {} - }; - - iterator GetIterForNthChar(size_t n) { return begin() + n; } - const_iterator GetIterForNthChar(size_t n) const { return begin() + n; } -#endif // wxUSE_UNICODE_UTF8/!wxUSE_UNICODE_UTF8 - - #undef WX_STR_ITERATOR_TAG - #undef WX_STR_ITERATOR_IMPL - - // This method is mostly used by wxWidgets itself and return the offset of - // the given iterator in bytes relative to the start of the buffer - // representing the current string contents in the current locale encoding. - // - // It is inefficient as it involves converting part of the string to this - // encoding (and also unsafe as it simply returns 0 if the conversion fails) - // and so should be avoided if possible, wx itself only uses it to implement - // backwards-compatible API. - ptrdiff_t IterOffsetInMBStr(const const_iterator& i) const - { - const wxString str(begin(), i); - - // This is logically equivalent to strlen(str.mb_str()) but avoids - // actually converting the string to multibyte and just computes the - // length that it would have after conversion. - size_t ofs = wxConvLibc.FromWChar(NULL, 0, str.wc_str(), str.length()); - return ofs == wxCONV_FAILED ? 0 : static_cast(ofs); - } - - friend class iterator; - friend class const_iterator; - - template - class reverse_iterator_impl - { - public: - typedef T iterator_type; - - WX_DEFINE_ITERATOR_CATEGORY(typename T::iterator_category) - typedef typename T::value_type value_type; - typedef typename T::difference_type difference_type; - typedef typename T::reference reference; - typedef typename T::pointer *pointer; - - reverse_iterator_impl() {} - reverse_iterator_impl(iterator_type i) : m_cur(i) {} - reverse_iterator_impl(const reverse_iterator_impl& ri) - : m_cur(ri.m_cur) {} - - iterator_type base() const { return m_cur; } - - reference operator*() const { return *(m_cur-1); } - reference operator[](size_t n) const { return *(*this + n); } - - reverse_iterator_impl& operator++() - { --m_cur; return *this; } - reverse_iterator_impl operator++(int) - { reverse_iterator_impl tmp = *this; --m_cur; return tmp; } - reverse_iterator_impl& operator--() - { ++m_cur; return *this; } - reverse_iterator_impl operator--(int) - { reverse_iterator_impl tmp = *this; ++m_cur; return tmp; } - - // NB: explicit in the functions below is to keep BCC 5.5 happy - reverse_iterator_impl operator+(ptrdiff_t n) const - { return reverse_iterator_impl(m_cur - n); } - reverse_iterator_impl operator-(ptrdiff_t n) const - { return reverse_iterator_impl(m_cur + n); } - reverse_iterator_impl operator+=(ptrdiff_t n) - { m_cur -= n; return *this; } - reverse_iterator_impl operator-=(ptrdiff_t n) - { m_cur += n; return *this; } - - difference_type operator-(const reverse_iterator_impl& i) const - { return i.m_cur - m_cur; } - - bool operator==(const reverse_iterator_impl& ri) const - { return m_cur == ri.m_cur; } - bool operator!=(const reverse_iterator_impl& ri) const - { return !(*this == ri); } - - bool operator<(const reverse_iterator_impl& i) const - { return m_cur > i.m_cur; } - bool operator>(const reverse_iterator_impl& i) const - { return m_cur < i.m_cur; } - bool operator<=(const reverse_iterator_impl& i) const - { return m_cur >= i.m_cur; } - bool operator>=(const reverse_iterator_impl& i) const - { return m_cur <= i.m_cur; } - - private: - iterator_type m_cur; - }; - - typedef reverse_iterator_impl reverse_iterator; - typedef reverse_iterator_impl const_reverse_iterator; - -private: - // used to transform an expression built using c_str() (and hence of type - // wxCStrData) to an iterator into the string - static const_iterator CreateConstIterator(const wxCStrData& data) - { - return const_iterator(data.m_str, - (data.m_str->begin() + data.m_offset).impl()); - } - - // in UTF-8 STL build, creation from std::string requires conversion under - // non-UTF8 locales, so we can't have and use wxString(wxStringImpl) ctor; - // instead we define dummy type that lets us have wxString ctor for creation - // from wxStringImpl that couldn't be used by user code (in all other builds, - // "standard" ctors can be used): -#if wxUSE_UNICODE_UTF8 && wxUSE_STL_BASED_WXSTRING - struct CtorFromStringImplTag {}; - - wxString(CtorFromStringImplTag* WXUNUSED(dummy), const wxStringImpl& src) - : m_impl(src) {} - - static wxString FromImpl(const wxStringImpl& src) - { return wxString((CtorFromStringImplTag*)NULL, src); } -#else - #if !wxUSE_STL_BASED_WXSTRING - wxString(const wxStringImpl& src) : m_impl(src) { } - // else: already defined as wxString(wxStdString) below - #endif - static wxString FromImpl(const wxStringImpl& src) { return wxString(src); } -#endif - -public: - // constructors and destructor - // ctor for an empty string - wxString() {} - - // copy ctor - wxString(const wxString& stringSrc) : m_impl(stringSrc.m_impl) { } - - // string containing nRepeat copies of ch - wxString(wxUniChar ch, size_t nRepeat = 1 ) - { assign(nRepeat, ch); } - wxString(size_t nRepeat, wxUniChar ch) - { assign(nRepeat, ch); } - wxString(wxUniCharRef ch, size_t nRepeat = 1) - { assign(nRepeat, ch); } - wxString(size_t nRepeat, wxUniCharRef ch) - { assign(nRepeat, ch); } - wxString(char ch, size_t nRepeat = 1) - { assign(nRepeat, ch); } - wxString(size_t nRepeat, char ch) - { assign(nRepeat, ch); } - wxString(wchar_t ch, size_t nRepeat = 1) - { assign(nRepeat, ch); } - wxString(size_t nRepeat, wchar_t ch) - { assign(nRepeat, ch); } - - // ctors from char* strings: - wxString(const char *psz) - : m_impl(ImplStr(psz)) {} - wxString(const char *psz, const wxMBConv& conv) - : m_impl(ImplStr(psz, conv)) {} - wxString(const char *psz, size_t nLength) - { assign(psz, nLength); } - wxString(const char *psz, const wxMBConv& conv, size_t nLength) - { - SubstrBufFromMB str(ImplStr(psz, nLength, conv)); - m_impl.assign(str.data, str.len); - } - - // and unsigned char*: - wxString(const unsigned char *psz) - : m_impl(ImplStr((const char*)psz)) {} - wxString(const unsigned char *psz, const wxMBConv& conv) - : m_impl(ImplStr((const char*)psz, conv)) {} - wxString(const unsigned char *psz, size_t nLength) - { assign((const char*)psz, nLength); } - wxString(const unsigned char *psz, const wxMBConv& conv, size_t nLength) - { - SubstrBufFromMB str(ImplStr((const char*)psz, nLength, conv)); - m_impl.assign(str.data, str.len); - } - - // ctors from wchar_t* strings: - wxString(const wchar_t *pwz) - : m_impl(ImplStr(pwz)) {} - wxString(const wchar_t *pwz, const wxMBConv& WXUNUSED(conv)) - : m_impl(ImplStr(pwz)) {} - wxString(const wchar_t *pwz, size_t nLength) - { assign(pwz, nLength); } - wxString(const wchar_t *pwz, const wxMBConv& WXUNUSED(conv), size_t nLength) - { assign(pwz, nLength); } - - wxString(const wxScopedCharBuffer& buf) - { assign(buf.data(), buf.length()); } - wxString(const wxScopedWCharBuffer& buf) - { assign(buf.data(), buf.length()); } - - // NB: this version uses m_impl.c_str() to force making a copy of the - // string, so that "wxString(str.c_str())" idiom for passing strings - // between threads works - wxString(const wxCStrData& cstr) - : m_impl(cstr.AsString().m_impl.c_str()) { } - - // as we provide both ctors with this signature for both char and unsigned - // char string, we need to provide one for wxCStrData to resolve ambiguity - wxString(const wxCStrData& cstr, size_t nLength) - : m_impl(cstr.AsString().Mid(0, nLength).m_impl) {} - - // and because wxString is convertible to wxCStrData and const wxChar * - // we also need to provide this one - wxString(const wxString& str, size_t nLength) - { assign(str, nLength); } - - -#if wxUSE_STRING_POS_CACHE - ~wxString() - { - // we need to invalidate our cache entry as another string could be - // recreated at the same address (unlikely, but still possible, with the - // heap-allocated strings but perfectly common with stack-allocated ones) - InvalidateCache(); - } -#endif // wxUSE_STRING_POS_CACHE - - // even if we're not built with wxUSE_STD_STRING_CONV_IN_WXSTRING == 1 it is - // very convenient to allow implicit conversions from std::string to wxString - // and vice verse as this allows to use the same strings in non-GUI and GUI - // code, however we don't want to unconditionally add this ctor as it would - // make wx lib dependent on libstdc++ on some Linux versions which is bad, so - // instead we ask the client code to define this wxUSE_STD_STRING symbol if - // they need it -#if wxUSE_STD_STRING - #if wxUSE_UNICODE_WCHAR - wxString(const wxStdWideString& str) : m_impl(str) {} - #else // UTF-8 or ANSI - wxString(const wxStdWideString& str) - { assign(str.c_str(), str.length()); } - #endif - - #if !wxUSE_UNICODE // ANSI build - // FIXME-UTF8: do this in UTF8 build #if wxUSE_UTF8_LOCALE_ONLY, too - wxString(const std::string& str) : m_impl(str) {} - #else // Unicode - wxString(const std::string& str) - { assign(str.c_str(), str.length()); } - #endif -#endif // wxUSE_STD_STRING - - // Also always provide explicit conversions to std::[w]string in any case, - // see below for the implicit ones. -#if wxUSE_STD_STRING - // We can avoid a copy if we already use this string type internally, - // otherwise we create a copy on the fly: - #if wxUSE_UNICODE_WCHAR && wxUSE_STL_BASED_WXSTRING - #define wxStringToStdWstringRetType const wxStdWideString& - const wxStdWideString& ToStdWstring() const { return m_impl; } - #else - // wxStringImpl is either not std::string or needs conversion - #define wxStringToStdWstringRetType wxStdWideString - wxStdWideString ToStdWstring() const - { -#if wxUSE_UNICODE_WCHAR - wxScopedWCharBuffer buf = - wxScopedWCharBuffer::CreateNonOwned(m_impl.c_str(), m_impl.length()); -#else // !wxUSE_UNICODE_WCHAR - wxScopedWCharBuffer buf(wc_str()); -#endif - - return wxStdWideString(buf.data(), buf.length()); - } - #endif - - #if (!wxUSE_UNICODE || wxUSE_UTF8_LOCALE_ONLY) && wxUSE_STL_BASED_WXSTRING - // wxStringImpl is std::string in the encoding we want - #define wxStringToStdStringRetType const std::string& - const std::string& ToStdString() const { return m_impl; } - #else - // wxStringImpl is either not std::string or needs conversion - #define wxStringToStdStringRetType std::string - std::string ToStdString() const - { - wxScopedCharBuffer buf(mb_str()); - return std::string(buf.data(), buf.length()); - } - #endif - -#if wxUSE_STD_STRING_CONV_IN_WXSTRING - // Implicit conversions to std::[w]string are not provided by default as - // they conflict with the implicit conversions to "const char/wchar_t *" - // which we use for backwards compatibility but do provide them if - // explicitly requested. - operator wxStringToStdStringRetType() const { return ToStdString(); } - operator wxStringToStdWstringRetType() const { return ToStdWstring(); } -#endif // wxUSE_STD_STRING_CONV_IN_WXSTRING - -#undef wxStringToStdStringRetType -#undef wxStringToStdWstringRetType - -#endif // wxUSE_STD_STRING - - wxString Clone() const - { - // make a deep copy of the string, i.e. the returned string will have - // ref count = 1 with refcounted implementation - return wxString::FromImpl(wxStringImpl(m_impl.c_str(), m_impl.length())); - } - - // first valid index position - const_iterator begin() const { return const_iterator(this, m_impl.begin()); } - iterator begin() { return iterator(this, m_impl.begin()); } - // position one after the last valid one - const_iterator end() const { return const_iterator(this, m_impl.end()); } - iterator end() { return iterator(this, m_impl.end()); } - - // first element of the reversed string - const_reverse_iterator rbegin() const - { return const_reverse_iterator(end()); } - reverse_iterator rbegin() - { return reverse_iterator(end()); } - // one beyond the end of the reversed string - const_reverse_iterator rend() const - { return const_reverse_iterator(begin()); } - reverse_iterator rend() - { return reverse_iterator(begin()); } - - // std::string methods: -#if wxUSE_UNICODE_UTF8 - size_t length() const - { -#if wxUSE_STRING_POS_CACHE - wxCACHE_PROFILE_FIELD_INC(lentot); - - Cache::Element * const cache = GetCacheElement(); - - if ( cache->len == npos ) - { - // it's probably not worth trying to be clever and using cache->pos - // here as it's probably 0 anyhow -- you usually call length() before - // starting to index the string - cache->len = end() - begin(); - } - else - { - wxCACHE_PROFILE_FIELD_INC(lenhits); - - wxSTRING_CACHE_ASSERT( (int)cache->len == end() - begin() ); - } - - return cache->len; -#else // !wxUSE_STRING_POS_CACHE - return end() - begin(); -#endif // wxUSE_STRING_POS_CACHE/!wxUSE_STRING_POS_CACHE - } -#else - size_t length() const { return m_impl.length(); } -#endif - - size_type size() const { return length(); } - size_type max_size() const { return npos; } - - bool empty() const { return m_impl.empty(); } - - // NB: these methods don't have a well-defined meaning in UTF-8 case - size_type capacity() const { return m_impl.capacity(); } - void reserve(size_t sz) { m_impl.reserve(sz); } - - void resize(size_t nSize, wxUniChar ch = wxT('\0')) - { - const size_t len = length(); - if ( nSize == len) - return; - -#if wxUSE_UNICODE_UTF8 - if ( nSize < len ) - { - wxSTRING_INVALIDATE_CACHE(); - - // we can't use wxStringImpl::resize() for truncating the string as it - // counts in bytes, not characters - erase(nSize); - return; - } - - // we also can't use (presumably more efficient) resize() if we have to - // append characters taking more than one byte - if ( !ch.IsAscii() ) - { - append(nSize - len, ch); - } - else // can use (presumably faster) resize() version -#endif // wxUSE_UNICODE_UTF8 - { - wxSTRING_INVALIDATE_CACHED_LENGTH(); - - m_impl.resize(nSize, (wxStringCharType)ch); - } - } - - wxString substr(size_t nStart = 0, size_t nLen = npos) const - { - size_t pos, len; - PosLenToImpl(nStart, nLen, &pos, &len); - return FromImpl(m_impl.substr(pos, len)); - } - - // generic attributes & operations - // as standard strlen() - size_t Len() const { return length(); } - // string contains any characters? - bool IsEmpty() const { return empty(); } - // empty string is "false", so !str will return true - bool operator!() const { return empty(); } - // truncate the string to given length - wxString& Truncate(size_t uiLen); - // empty string contents - void Empty() { clear(); } - // empty the string and free memory - void Clear() { clear(); } - - // contents test - // Is an ascii value - bool IsAscii() const; - // Is a number - bool IsNumber() const; - // Is a word - bool IsWord() const; - - // data access (all indexes are 0 based) - // read access - wxUniChar at(size_t n) const - { return wxStringOperations::DecodeChar(m_impl.begin() + PosToImpl(n)); } - wxUniChar GetChar(size_t n) const - { return at(n); } - // read/write access - wxUniCharRef at(size_t n) - { return *GetIterForNthChar(n); } - wxUniCharRef GetWritableChar(size_t n) - { return at(n); } - // write access - void SetChar(size_t n, wxUniChar ch) - { at(n) = ch; } - - // get last character - wxUniChar Last() const - { - wxASSERT_MSG( !empty(), wxT("wxString: index out of bounds") ); - return *rbegin(); - } - - // get writable last character - wxUniCharRef Last() - { - wxASSERT_MSG( !empty(), wxT("wxString: index out of bounds") ); - return *rbegin(); - } - - /* - Note that we we must define all of the overloads below to avoid - ambiguity when using str[0]. - */ - wxUniChar operator[](int n) const - { return at(n); } - wxUniChar operator[](long n) const - { return at(n); } - wxUniChar operator[](size_t n) const - { return at(n); } -#ifndef wxSIZE_T_IS_UINT - wxUniChar operator[](unsigned int n) const - { return at(n); } -#endif // size_t != unsigned int - - // operator versions of GetWriteableChar() - wxUniCharRef operator[](int n) - { return at(n); } - wxUniCharRef operator[](long n) - { return at(n); } - wxUniCharRef operator[](size_t n) - { return at(n); } -#ifndef wxSIZE_T_IS_UINT - wxUniCharRef operator[](unsigned int n) - { return at(n); } -#endif // size_t != unsigned int - - - /* - Overview of wxString conversions, implicit and explicit: - - - wxString has a std::[w]string-like c_str() method, however it does - not return a C-style string directly but instead returns wxCStrData - helper object which is convertible to either "char *" narrow string - or "wchar_t *" wide string. Usually the correct conversion will be - applied by the compiler automatically but if this doesn't happen you - need to explicitly choose one using wxCStrData::AsChar() or AsWChar() - methods or another wxString conversion function. - - - One of the places where the conversion does *NOT* happen correctly is - when c_str() is passed to a vararg function such as printf() so you - must *NOT* use c_str() with them. Either use wxPrintf() (all wx - functions do handle c_str() correctly, even if they appear to be - vararg (but they're not, really)) or add an explicit AsChar() or, if - compatibility with previous wxWidgets versions is important, add a - cast to "const char *". - - - In non-STL mode only, wxString is also implicitly convertible to - wxCStrData. The same warning as above applies. - - - c_str() is polymorphic as it can be converted to either narrow or - wide string. If you explicitly need one or the other, choose to use - mb_str() (for narrow) or wc_str() (for wide) instead. Notice that - these functions can return either the pointer to string directly (if - this is what the string uses internally) or a temporary buffer - containing the string and convertible to it. Again, conversion will - usually be done automatically by the compiler but beware of the - vararg functions: you need an explicit cast when using them. - - - There are also non-const versions of mb_str() and wc_str() called - char_str() and wchar_str(). They are only meant to be used with - non-const-correct functions and they always return buffers. - - - Finally wx_str() returns whatever string representation is used by - wxString internally. It may be either a narrow or wide string - depending on wxWidgets build mode but it will always be a raw pointer - (and not a buffer). - */ - - // explicit conversion to wxCStrData - wxCStrData c_str() const { return wxCStrData(this); } - wxCStrData data() const { return c_str(); } - - // implicit conversion to wxCStrData - operator wxCStrData() const { return c_str(); } - - // the first two operators conflict with operators for conversion to - // std::string and they must be disabled if those conversions are enabled; - // the next one only makes sense if conversions to char* are also defined - // and not defining it in STL build also helps us to get more clear error - // messages for the code which relies on implicit conversion to char* in - // STL build -#if !wxUSE_STD_STRING_CONV_IN_WXSTRING - operator const char*() const { return c_str(); } - operator const wchar_t*() const { return c_str(); } - - // implicit conversion to untyped pointer for compatibility with previous - // wxWidgets versions: this is the same as conversion to const char * so it - // may fail! - operator const void*() const { return c_str(); } -#endif // !wxUSE_STD_STRING_CONV_IN_WXSTRING - - // identical to c_str(), for MFC compatibility - const wxCStrData GetData() const { return c_str(); } - - // explicit conversion to C string in internal representation (char*, - // wchar_t*, UTF-8-encoded char*, depending on the build): - const wxStringCharType *wx_str() const { return m_impl.c_str(); } - - // conversion to *non-const* multibyte or widestring buffer; modifying - // returned buffer won't affect the string, these methods are only useful - // for passing values to const-incorrect functions - wxWritableCharBuffer char_str(const wxMBConv& conv = wxConvLibc) const - { return mb_str(conv); } - wxWritableWCharBuffer wchar_str() const { return wc_str(); } - - // conversion to the buffer of the given type T (= char or wchar_t) and - // also optionally return the buffer length - // - // this is mostly/only useful for the template functions - template - wxCharTypeBuffer tchar_str(size_t *len = NULL) const - { -#if wxUSE_UNICODE - // we need a helper dispatcher depending on type - return wxPrivate::wxStringAsBufHelper::Get(*this, len); -#else // ANSI - // T can only be char in ANSI build - if ( len ) - *len = length(); - - return wxCharTypeBuffer::CreateNonOwned(wx_str(), length()); -#endif // Unicode build kind - } - - // conversion to/from plain (i.e. 7 bit) ASCII: this is useful for - // converting numbers or strings which are certain not to contain special - // chars (typically system functions, X atoms, environment variables etc.) - // - // the behaviour of these functions with the strings containing anything - // else than 7 bit ASCII characters is undefined, use at your own risk. -#if wxUSE_UNICODE - static wxString FromAscii(const char *ascii, size_t len); - static wxString FromAscii(const char *ascii); - static wxString FromAscii(char ascii); - const wxScopedCharBuffer ToAscii(char replaceWith = '_') const; -#else // ANSI - static wxString FromAscii(const char *ascii) { return wxString( ascii ); } - static wxString FromAscii(const char *ascii, size_t len) - { return wxString( ascii, len ); } - static wxString FromAscii(char ascii) { return wxString( ascii ); } - const char *ToAscii(char WXUNUSED(replaceWith) = '_') const { return c_str(); } -#endif // Unicode/!Unicode - - // also provide unsigned char overloads as signed/unsigned doesn't matter - // for 7 bit ASCII characters - static wxString FromAscii(const unsigned char *ascii) - { return FromAscii((const char *)ascii); } - static wxString FromAscii(const unsigned char *ascii, size_t len) - { return FromAscii((const char *)ascii, len); } - - // conversion to/from UTF-8: -#if wxUSE_UNICODE_UTF8 - static wxString FromUTF8Unchecked(const char *utf8) - { - if ( !utf8 ) - return wxEmptyString; - - wxASSERT( wxStringOperations::IsValidUtf8String(utf8) ); - return FromImpl(wxStringImpl(utf8)); - } - static wxString FromUTF8Unchecked(const char *utf8, size_t len) - { - if ( !utf8 ) - return wxEmptyString; - if ( len == npos ) - return FromUTF8Unchecked(utf8); - - wxASSERT( wxStringOperations::IsValidUtf8String(utf8, len) ); - return FromImpl(wxStringImpl(utf8, len)); - } - - static wxString FromUTF8(const char *utf8) - { - if ( !utf8 || !wxStringOperations::IsValidUtf8String(utf8) ) - return ""; - - return FromImpl(wxStringImpl(utf8)); - } - static wxString FromUTF8(const char *utf8, size_t len) - { - if ( len == npos ) - return FromUTF8(utf8); - - if ( !utf8 || !wxStringOperations::IsValidUtf8String(utf8, len) ) - return ""; - - return FromImpl(wxStringImpl(utf8, len)); - } - - const wxScopedCharBuffer utf8_str() const - { return wxCharBuffer::CreateNonOwned(m_impl.c_str(), m_impl.length()); } - - // this function exists in UTF-8 build only and returns the length of the - // internal UTF-8 representation - size_t utf8_length() const { return m_impl.length(); } -#elif wxUSE_UNICODE_WCHAR - static wxString FromUTF8(const char *utf8, size_t len = npos) - { return wxString(utf8, wxMBConvUTF8(), len); } - static wxString FromUTF8Unchecked(const char *utf8, size_t len = npos) - { - const wxString s(utf8, wxMBConvUTF8(), len); - wxASSERT_MSG( !utf8 || !*utf8 || !s.empty(), - "string must be valid UTF-8" ); - return s; - } - const wxScopedCharBuffer utf8_str() const { return mb_str(wxMBConvUTF8()); } -#else // ANSI - static wxString FromUTF8(const char *utf8) - { return wxString(wxMBConvUTF8().cMB2WC(utf8)); } - static wxString FromUTF8(const char *utf8, size_t len) - { - size_t wlen; - wxScopedWCharBuffer buf(wxMBConvUTF8().cMB2WC(utf8, len == npos ? wxNO_LEN : len, &wlen)); - return wxString(buf.data(), wlen); - } - static wxString FromUTF8Unchecked(const char *utf8, size_t len = npos) - { - size_t wlen; - wxScopedWCharBuffer buf - ( - wxMBConvUTF8().cMB2WC - ( - utf8, - len == npos ? wxNO_LEN : len, - &wlen - ) - ); - wxASSERT_MSG( !utf8 || !*utf8 || wlen, - "string must be valid UTF-8" ); - - return wxString(buf.data(), wlen); - } - const wxScopedCharBuffer utf8_str() const - { return wxMBConvUTF8().cWC2MB(wc_str()); } -#endif - - const wxScopedCharBuffer ToUTF8() const { return utf8_str(); } - - // functions for storing binary data in wxString: -#if wxUSE_UNICODE - static wxString From8BitData(const char *data, size_t len) - { return wxString(data, wxConvISO8859_1, len); } - // version for NUL-terminated data: - static wxString From8BitData(const char *data) - { return wxString(data, wxConvISO8859_1); } - const wxScopedCharBuffer To8BitData() const - { return mb_str(wxConvISO8859_1); } -#else // ANSI - static wxString From8BitData(const char *data, size_t len) - { return wxString(data, len); } - // version for NUL-terminated data: - static wxString From8BitData(const char *data) - { return wxString(data); } - const wxScopedCharBuffer To8BitData() const - { return wxScopedCharBuffer::CreateNonOwned(wx_str(), length()); } -#endif // Unicode/ANSI - - // conversions with (possible) format conversions: have to return a - // buffer with temporary data - // - // the functions defined (in either Unicode or ANSI) mode are mb_str() to - // return an ANSI (multibyte) string, wc_str() to return a wide string and - // fn_str() to return a string which should be used with the OS APIs - // accepting the file names. The return value is always the same, but the - // type differs because a function may either return pointer to the buffer - // directly or have to use intermediate buffer for translation. - -#if wxUSE_UNICODE - - // this is an optimization: even though using mb_str(wxConvLibc) does the - // same thing (i.e. returns pointer to internal representation as locale is - // always an UTF-8 one) in wxUSE_UTF8_LOCALE_ONLY case, we can avoid the - // extra checks and the temporary buffer construction by providing a - // separate mb_str() overload -#if wxUSE_UTF8_LOCALE_ONLY - const char* mb_str() const { return wx_str(); } - const wxScopedCharBuffer mb_str(const wxMBConv& conv) const - { - return AsCharBuf(conv); - } -#else // !wxUSE_UTF8_LOCALE_ONLY - const wxScopedCharBuffer mb_str(const wxMBConv& conv = wxConvLibc) const - { - return AsCharBuf(conv); - } -#endif // wxUSE_UTF8_LOCALE_ONLY/!wxUSE_UTF8_LOCALE_ONLY - - const wxWX2MBbuf mbc_str() const { return mb_str(*wxConvCurrent); } - -#if wxUSE_UNICODE_WCHAR - const wchar_t* wc_str() const { return wx_str(); } -#elif wxUSE_UNICODE_UTF8 - const wxScopedWCharBuffer wc_str() const - { return AsWCharBuf(wxMBConvStrictUTF8()); } -#endif - // for compatibility with !wxUSE_UNICODE version - const wxWX2WCbuf wc_str(const wxMBConv& WXUNUSED(conv)) const - { return wc_str(); } - -#if wxMBFILES - const wxScopedCharBuffer fn_str() const { return mb_str(wxConvFile); } -#else // !wxMBFILES - const wxWX2WCbuf fn_str() const { return wc_str(); } -#endif // wxMBFILES/!wxMBFILES - -#else // ANSI - const char* mb_str() const { return wx_str(); } - - // for compatibility with wxUSE_UNICODE version - const char* mb_str(const wxMBConv& WXUNUSED(conv)) const { return wx_str(); } - - const wxWX2MBbuf mbc_str() const { return mb_str(); } - - const wxScopedWCharBuffer wc_str(const wxMBConv& conv = wxConvLibc) const - { return AsWCharBuf(conv); } - - const wxScopedCharBuffer fn_str() const - { return wxConvFile.cWC2WX( wc_str( wxConvLibc ) ); } -#endif // Unicode/ANSI - -#if wxUSE_UNICODE_UTF8 - const wxScopedWCharBuffer t_str() const { return wc_str(); } -#elif wxUSE_UNICODE_WCHAR - const wchar_t* t_str() const { return wx_str(); } -#else - const char* t_str() const { return wx_str(); } -#endif - - - // overloaded assignment - // from another wxString - wxString& operator=(const wxString& stringSrc) - { - if ( this != &stringSrc ) - { - wxSTRING_INVALIDATE_CACHE(); - - m_impl = stringSrc.m_impl; - } - - return *this; - } - - wxString& operator=(const wxCStrData& cstr) - { return *this = cstr.AsString(); } - // from a character - wxString& operator=(wxUniChar ch) - { - wxSTRING_INVALIDATE_CACHE(); - -#if wxUSE_UNICODE_UTF8 - if ( !ch.IsAscii() ) - m_impl = wxStringOperations::EncodeChar(ch); - else -#endif // wxUSE_UNICODE_UTF8 - m_impl = (wxStringCharType)ch; - return *this; - } - - wxString& operator=(wxUniCharRef ch) - { return operator=((wxUniChar)ch); } - wxString& operator=(char ch) - { return operator=(wxUniChar(ch)); } - wxString& operator=(unsigned char ch) - { return operator=(wxUniChar(ch)); } - wxString& operator=(wchar_t ch) - { return operator=(wxUniChar(ch)); } - // from a C string - STL probably will crash on NULL, - // so we need to compensate in that case -#if wxUSE_STL_BASED_WXSTRING - wxString& operator=(const char *psz) - { - wxSTRING_INVALIDATE_CACHE(); - - if ( psz ) - m_impl = ImplStr(psz); - else - clear(); - - return *this; - } - - wxString& operator=(const wchar_t *pwz) - { - wxSTRING_INVALIDATE_CACHE(); - - if ( pwz ) - m_impl = ImplStr(pwz); - else - clear(); - - return *this; - } -#else // !wxUSE_STL_BASED_WXSTRING - wxString& operator=(const char *psz) - { - wxSTRING_INVALIDATE_CACHE(); - - m_impl = ImplStr(psz); - - return *this; - } - - wxString& operator=(const wchar_t *pwz) - { - wxSTRING_INVALIDATE_CACHE(); - - m_impl = ImplStr(pwz); - - return *this; - } -#endif // wxUSE_STL_BASED_WXSTRING/!wxUSE_STL_BASED_WXSTRING - - wxString& operator=(const unsigned char *psz) - { return operator=((const char*)psz); } - - // from wxScopedWCharBuffer - wxString& operator=(const wxScopedWCharBuffer& s) - { return assign(s); } - // from wxScopedCharBuffer - wxString& operator=(const wxScopedCharBuffer& s) - { return assign(s); } - - // string concatenation - // in place concatenation - /* - Concatenate and return the result. Note that the left to right - associativity of << allows to write things like "str << str1 << str2 - << ..." (unlike with +=) - */ - // string += string - wxString& operator<<(const wxString& s) - { -#if WXWIN_COMPATIBILITY_2_8 && !wxUSE_STL_BASED_WXSTRING && !wxUSE_UNICODE_UTF8 - wxASSERT_MSG( s.IsValid(), - wxT("did you forget to call UngetWriteBuf()?") ); -#endif - - append(s); - return *this; - } - // string += C string - wxString& operator<<(const char *psz) - { append(psz); return *this; } - wxString& operator<<(const wchar_t *pwz) - { append(pwz); return *this; } - wxString& operator<<(const wxCStrData& psz) - { append(psz.AsString()); return *this; } - // string += char - wxString& operator<<(wxUniChar ch) { append(1, ch); return *this; } - wxString& operator<<(wxUniCharRef ch) { append(1, ch); return *this; } - wxString& operator<<(char ch) { append(1, ch); return *this; } - wxString& operator<<(unsigned char ch) { append(1, ch); return *this; } - wxString& operator<<(wchar_t ch) { append(1, ch); return *this; } - - // string += buffer (i.e. from wxGetString) - wxString& operator<<(const wxScopedWCharBuffer& s) - { return append(s); } - wxString& operator<<(const wxScopedCharBuffer& s) - { return append(s); } - - // string += C string - wxString& Append(const wxString& s) - { - // test for empty() to share the string if possible - if ( empty() ) - *this = s; - else - append(s); - return *this; - } - wxString& Append(const char* psz) - { append(psz); return *this; } - wxString& Append(const wchar_t* pwz) - { append(pwz); return *this; } - wxString& Append(const wxCStrData& psz) - { append(psz); return *this; } - wxString& Append(const wxScopedCharBuffer& psz) - { append(psz); return *this; } - wxString& Append(const wxScopedWCharBuffer& psz) - { append(psz); return *this; } - wxString& Append(const char* psz, size_t nLen) - { append(psz, nLen); return *this; } - wxString& Append(const wchar_t* pwz, size_t nLen) - { append(pwz, nLen); return *this; } - wxString& Append(const wxCStrData& psz, size_t nLen) - { append(psz, nLen); return *this; } - wxString& Append(const wxScopedCharBuffer& psz, size_t nLen) - { append(psz, nLen); return *this; } - wxString& Append(const wxScopedWCharBuffer& psz, size_t nLen) - { append(psz, nLen); return *this; } - // append count copies of given character - wxString& Append(wxUniChar ch, size_t count = 1u) - { append(count, ch); return *this; } - wxString& Append(wxUniCharRef ch, size_t count = 1u) - { append(count, ch); return *this; } - wxString& Append(char ch, size_t count = 1u) - { append(count, ch); return *this; } - wxString& Append(unsigned char ch, size_t count = 1u) - { append(count, ch); return *this; } - wxString& Append(wchar_t ch, size_t count = 1u) - { append(count, ch); return *this; } - - // prepend a string, return the string itself - wxString& Prepend(const wxString& str) - { *this = str + *this; return *this; } - - // non-destructive concatenation - // two strings - friend wxString WXDLLIMPEXP_BASE operator+(const wxString& string1, - const wxString& string2); - // string with a single char - friend wxString WXDLLIMPEXP_BASE operator+(const wxString& string, wxUniChar ch); - // char with a string - friend wxString WXDLLIMPEXP_BASE operator+(wxUniChar ch, const wxString& string); - // string with C string - friend wxString WXDLLIMPEXP_BASE operator+(const wxString& string, - const char *psz); - friend wxString WXDLLIMPEXP_BASE operator+(const wxString& string, - const wchar_t *pwz); - // C string with string - friend wxString WXDLLIMPEXP_BASE operator+(const char *psz, - const wxString& string); - friend wxString WXDLLIMPEXP_BASE operator+(const wchar_t *pwz, - const wxString& string); - - // stream-like functions - // insert an int into string - wxString& operator<<(int i) - { return (*this) << Format(wxT("%d"), i); } - // insert an unsigned int into string - wxString& operator<<(unsigned int ui) - { return (*this) << Format(wxT("%u"), ui); } - // insert a long into string - wxString& operator<<(long l) - { return (*this) << Format(wxT("%ld"), l); } - // insert an unsigned long into string - wxString& operator<<(unsigned long ul) - { return (*this) << Format(wxT("%lu"), ul); } -#ifdef wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG - // insert a long long if they exist and aren't longs - wxString& operator<<(wxLongLong_t ll) - { - return (*this) << Format("%" wxLongLongFmtSpec "d", ll); - } - // insert an unsigned long long - wxString& operator<<(wxULongLong_t ull) - { - return (*this) << Format("%" wxLongLongFmtSpec "u" , ull); - } -#endif // wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG - // insert a float into string - wxString& operator<<(float f) - { return (*this) << Format(wxT("%f"), f); } - // insert a double into string - wxString& operator<<(double d) - { return (*this) << Format(wxT("%g"), d); } - - // string comparison - // case-sensitive comparison (returns a value < 0, = 0 or > 0) - int Cmp(const char *psz) const - { return compare(psz); } - int Cmp(const wchar_t *pwz) const - { return compare(pwz); } - int Cmp(const wxString& s) const - { return compare(s); } - int Cmp(const wxCStrData& s) const - { return compare(s); } - int Cmp(const wxScopedCharBuffer& s) const - { return compare(s); } - int Cmp(const wxScopedWCharBuffer& s) const - { return compare(s); } - // same as Cmp() but not case-sensitive - int CmpNoCase(const wxString& s) const; - - // test for the string equality, either considering case or not - // (if compareWithCase then the case matters) - bool IsSameAs(const wxString& str, bool compareWithCase = true) const - { -#if !wxUSE_UNICODE_UTF8 - // in UTF-8 build, length() is O(n) and doing this would be _slower_ - if ( length() != str.length() ) - return false; -#endif - return (compareWithCase ? Cmp(str) : CmpNoCase(str)) == 0; - } - bool IsSameAs(const char *str, bool compareWithCase = true) const - { return (compareWithCase ? Cmp(str) : CmpNoCase(str)) == 0; } - bool IsSameAs(const wchar_t *str, bool compareWithCase = true) const - { return (compareWithCase ? Cmp(str) : CmpNoCase(str)) == 0; } - - bool IsSameAs(const wxCStrData& str, bool compareWithCase = true) const - { return IsSameAs(str.AsString(), compareWithCase); } - bool IsSameAs(const wxScopedCharBuffer& str, bool compareWithCase = true) const - { return IsSameAs(str.data(), compareWithCase); } - bool IsSameAs(const wxScopedWCharBuffer& str, bool compareWithCase = true) const - { return IsSameAs(str.data(), compareWithCase); } - // comparison with a single character: returns true if equal - bool IsSameAs(wxUniChar c, bool compareWithCase = true) const; - // FIXME-UTF8: remove these overloads - bool IsSameAs(wxUniCharRef c, bool compareWithCase = true) const - { return IsSameAs(wxUniChar(c), compareWithCase); } - bool IsSameAs(char c, bool compareWithCase = true) const - { return IsSameAs(wxUniChar(c), compareWithCase); } - bool IsSameAs(unsigned char c, bool compareWithCase = true) const - { return IsSameAs(wxUniChar(c), compareWithCase); } - bool IsSameAs(wchar_t c, bool compareWithCase = true) const - { return IsSameAs(wxUniChar(c), compareWithCase); } - bool IsSameAs(int c, bool compareWithCase = true) const - { return IsSameAs(wxUniChar(c), compareWithCase); } - - // simple sub-string extraction - // return substring starting at nFirst of length nCount (or till the end - // if nCount = default value) - wxString Mid(size_t nFirst, size_t nCount = npos) const; - - // operator version of Mid() - wxString operator()(size_t start, size_t len) const - { return Mid(start, len); } - - // check if the string starts with the given prefix and return the rest - // of the string in the provided pointer if it is not NULL; otherwise - // return false - bool StartsWith(const wxString& prefix, wxString *rest = NULL) const; - // check if the string ends with the given suffix and return the - // beginning of the string before the suffix in the provided pointer if - // it is not NULL; otherwise return false - bool EndsWith(const wxString& suffix, wxString *rest = NULL) const; - - // get first nCount characters - wxString Left(size_t nCount) const; - // get last nCount characters - wxString Right(size_t nCount) const; - // get all characters before the first occurrence of ch - // (returns the whole string if ch not found) and also put everything - // following the first occurrence of ch into rest if it's non-NULL - wxString BeforeFirst(wxUniChar ch, wxString *rest = NULL) const; - // get all characters before the last occurrence of ch - // (returns empty string if ch not found) and also put everything - // following the last occurrence of ch into rest if it's non-NULL - wxString BeforeLast(wxUniChar ch, wxString *rest = NULL) const; - // get all characters after the first occurrence of ch - // (returns empty string if ch not found) - wxString AfterFirst(wxUniChar ch) const; - // get all characters after the last occurrence of ch - // (returns the whole string if ch not found) - wxString AfterLast(wxUniChar ch) const; - - // for compatibility only, use more explicitly named functions above - wxString Before(wxUniChar ch) const { return BeforeLast(ch); } - wxString After(wxUniChar ch) const { return AfterFirst(ch); } - - // case conversion - // convert to upper case in place, return the string itself - wxString& MakeUpper(); - // convert to upper case, return the copy of the string - wxString Upper() const { return wxString(*this).MakeUpper(); } - // convert to lower case in place, return the string itself - wxString& MakeLower(); - // convert to lower case, return the copy of the string - wxString Lower() const { return wxString(*this).MakeLower(); } - // convert the first character to the upper case and the rest to the - // lower one, return the modified string itself - wxString& MakeCapitalized(); - // convert the first character to the upper case and the rest to the - // lower one, return the copy of the string - wxString Capitalize() const { return wxString(*this).MakeCapitalized(); } - - // trimming/padding whitespace (either side) and truncating - // remove spaces from left or from right (default) side - wxString& Trim(bool bFromRight = true); - // add nCount copies chPad in the beginning or at the end (default) - wxString& Pad(size_t nCount, wxUniChar chPad = wxT(' '), bool bFromRight = true); - - // searching and replacing - // searching (return starting index, or -1 if not found) - int Find(wxUniChar ch, bool bFromEnd = false) const; // like strchr/strrchr - int Find(wxUniCharRef ch, bool bFromEnd = false) const - { return Find(wxUniChar(ch), bFromEnd); } - int Find(char ch, bool bFromEnd = false) const - { return Find(wxUniChar(ch), bFromEnd); } - int Find(unsigned char ch, bool bFromEnd = false) const - { return Find(wxUniChar(ch), bFromEnd); } - int Find(wchar_t ch, bool bFromEnd = false) const - { return Find(wxUniChar(ch), bFromEnd); } - // searching (return starting index, or -1 if not found) - int Find(const wxString& sub) const // like strstr - { - size_type idx = find(sub); - return (idx == npos) ? wxNOT_FOUND : (int)idx; - } - int Find(const char *sub) const // like strstr - { - size_type idx = find(sub); - return (idx == npos) ? wxNOT_FOUND : (int)idx; - } - int Find(const wchar_t *sub) const // like strstr - { - size_type idx = find(sub); - return (idx == npos) ? wxNOT_FOUND : (int)idx; - } - - int Find(const wxCStrData& sub) const - { return Find(sub.AsString()); } - int Find(const wxScopedCharBuffer& sub) const - { return Find(sub.data()); } - int Find(const wxScopedWCharBuffer& sub) const - { return Find(sub.data()); } - - // replace first (or all of bReplaceAll) occurrences of substring with - // another string, returns the number of replacements made - size_t Replace(const wxString& strOld, - const wxString& strNew, - bool bReplaceAll = true); - - // check if the string contents matches a mask containing '*' and '?' - bool Matches(const wxString& mask) const; - - // conversion to numbers: all functions return true only if the whole - // string is a number and put the value of this number into the pointer - // provided, the base is the numeric base in which the conversion should be - // done and must be comprised between 2 and 36 or be 0 in which case the - // standard C rules apply (leading '0' => octal, "0x" => hex) - // convert to a signed integer - bool ToLong(long *val, int base = 10) const; - // convert to an unsigned integer - bool ToULong(unsigned long *val, int base = 10) const; - // convert to wxLongLong -#if defined(wxLongLong_t) - bool ToLongLong(wxLongLong_t *val, int base = 10) const; - // convert to wxULongLong - bool ToULongLong(wxULongLong_t *val, int base = 10) const; -#endif // wxLongLong_t - // convert to a double - bool ToDouble(double *val) const; - - // conversions to numbers using C locale - // convert to a signed integer - bool ToCLong(long *val, int base = 10) const; - // convert to an unsigned integer - bool ToCULong(unsigned long *val, int base = 10) const; - // convert to a double - bool ToCDouble(double *val) const; - - // create a string representing the given floating point number with the - // default (like %g) or fixed (if precision >=0) precision - // in the current locale - static wxString FromDouble(double val, int precision = -1); - // in C locale - static wxString FromCDouble(double val, int precision = -1); - - // formatted input/output - // as sprintf(), returns the number of characters written or < 0 on error - // (take 'this' into account in attribute parameter count) - // int Printf(const wxString& format, ...); - WX_DEFINE_VARARG_FUNC(int, Printf, 1, (const wxFormatString&), - DoPrintfWchar, DoPrintfUtf8) - // as vprintf(), returns the number of characters written or < 0 on error - int PrintfV(const wxString& format, va_list argptr); - - // returns the string containing the result of Printf() to it - // static wxString Format(const wxString& format, ...) WX_ATTRIBUTE_PRINTF_1; - WX_DEFINE_VARARG_FUNC(static wxString, Format, 1, (const wxFormatString&), - DoFormatWchar, DoFormatUtf8) - // the same as above, but takes a va_list - static wxString FormatV(const wxString& format, va_list argptr); - - // raw access to string memory - // ensure that string has space for at least nLen characters - // only works if the data of this string is not shared - bool Alloc(size_t nLen) { reserve(nLen); return capacity() >= nLen; } - // minimize the string's memory - // only works if the data of this string is not shared - bool Shrink(); -#if WXWIN_COMPATIBILITY_2_8 && !wxUSE_STL_BASED_WXSTRING && !wxUSE_UNICODE_UTF8 - // These are deprecated, use wxStringBuffer or wxStringBufferLength instead - // - // get writable buffer of at least nLen bytes. Unget() *must* be called - // a.s.a.p. to put string back in a reasonable state! - wxDEPRECATED( wxStringCharType *GetWriteBuf(size_t nLen) ); - // call this immediately after GetWriteBuf() has been used - wxDEPRECATED( void UngetWriteBuf() ); - wxDEPRECATED( void UngetWriteBuf(size_t nLen) ); -#endif // WXWIN_COMPATIBILITY_2_8 && !wxUSE_STL_BASED_WXSTRING && wxUSE_UNICODE_UTF8 - - // wxWidgets version 1 compatibility functions - - // use Mid() - wxString SubString(size_t from, size_t to) const - { return Mid(from, (to - from + 1)); } - // values for second parameter of CompareTo function - enum caseCompare {exact, ignoreCase}; - // values for first parameter of Strip function - enum stripType {leading = 0x1, trailing = 0x2, both = 0x3}; - - // use Printf() - // (take 'this' into account in attribute parameter count) - // int sprintf(const wxString& format, ...) WX_ATTRIBUTE_PRINTF_2; - WX_DEFINE_VARARG_FUNC(int, sprintf, 1, (const wxFormatString&), - DoPrintfWchar, DoPrintfUtf8) - - // use Cmp() - int CompareTo(const wxChar* psz, caseCompare cmp = exact) const - { return cmp == exact ? Cmp(psz) : CmpNoCase(psz); } - - // use length() - size_t Length() const { return length(); } - // Count the number of characters - int Freq(wxUniChar ch) const; - // use MakeLower - void LowerCase() { MakeLower(); } - // use MakeUpper - void UpperCase() { MakeUpper(); } - // use Trim except that it doesn't change this string - wxString Strip(stripType w = trailing) const; - - // use Find (more general variants not yet supported) - size_t Index(const wxChar* psz) const { return Find(psz); } - size_t Index(wxUniChar ch) const { return Find(ch); } - // use Truncate - wxString& Remove(size_t pos) { return Truncate(pos); } - wxString& RemoveLast(size_t n = 1) { return Truncate(length() - n); } - - wxString& Remove(size_t nStart, size_t nLen) - { return (wxString&)erase( nStart, nLen ); } - - // use Find() - int First( wxUniChar ch ) const { return Find(ch); } - int First( wxUniCharRef ch ) const { return Find(ch); } - int First( char ch ) const { return Find(ch); } - int First( unsigned char ch ) const { return Find(ch); } - int First( wchar_t ch ) const { return Find(ch); } - int First( const wxString& str ) const { return Find(str); } - int Last( wxUniChar ch ) const { return Find(ch, true); } - bool Contains(const wxString& str) const { return Find(str) != wxNOT_FOUND; } - - // use empty() - bool IsNull() const { return empty(); } - - // std::string compatibility functions - - // take nLen chars starting at nPos - wxString(const wxString& str, size_t nPos, size_t nLen) - { assign(str, nPos, nLen); } - // take all characters from first to last - wxString(const_iterator first, const_iterator last) - : m_impl(first.impl(), last.impl()) { } -#if WXWIN_COMPATIBILITY_STRING_PTR_AS_ITER - // the 2 overloads below are for compatibility with the existing code using - // pointers instead of iterators - wxString(const char *first, const char *last) - { - SubstrBufFromMB str(ImplStr(first, last - first)); - m_impl.assign(str.data, str.len); - } - wxString(const wchar_t *first, const wchar_t *last) - { - SubstrBufFromWC str(ImplStr(first, last - first)); - m_impl.assign(str.data, str.len); - } - // and this one is needed to compile code adding offsets to c_str() result - wxString(const wxCStrData& first, const wxCStrData& last) - : m_impl(CreateConstIterator(first).impl(), - CreateConstIterator(last).impl()) - { - wxASSERT_MSG( first.m_str == last.m_str, - wxT("pointers must be into the same string") ); - } -#endif // WXWIN_COMPATIBILITY_STRING_PTR_AS_ITER - - // lib.string.modifiers - // append elements str[pos], ..., str[pos+n] - wxString& append(const wxString& str, size_t pos, size_t n) - { - wxSTRING_UPDATE_CACHED_LENGTH(n); - - size_t from, len; - str.PosLenToImpl(pos, n, &from, &len); - m_impl.append(str.m_impl, from, len); - return *this; - } - // append a string - wxString& append(const wxString& str) - { - wxSTRING_UPDATE_CACHED_LENGTH(str.length()); - - m_impl.append(str.m_impl); - return *this; - } - - // append first n (or all if n == npos) characters of sz - wxString& append(const char *sz) - { - wxSTRING_INVALIDATE_CACHED_LENGTH(); - - m_impl.append(ImplStr(sz)); - return *this; - } - - wxString& append(const wchar_t *sz) - { - wxSTRING_INVALIDATE_CACHED_LENGTH(); - - m_impl.append(ImplStr(sz)); - return *this; - } - - wxString& append(const char *sz, size_t n) - { - wxSTRING_INVALIDATE_CACHED_LENGTH(); - - SubstrBufFromMB str(ImplStr(sz, n)); - m_impl.append(str.data, str.len); - return *this; - } - wxString& append(const wchar_t *sz, size_t n) - { - wxSTRING_UPDATE_CACHED_LENGTH(n); - - SubstrBufFromWC str(ImplStr(sz, n)); - m_impl.append(str.data, str.len); - return *this; - } - - wxString& append(const wxCStrData& str) - { return append(str.AsString()); } - wxString& append(const wxScopedCharBuffer& str) - { return append(str.data(), str.length()); } - wxString& append(const wxScopedWCharBuffer& str) - { return append(str.data(), str.length()); } - wxString& append(const wxCStrData& str, size_t n) - { return append(str.AsString(), 0, n); } - wxString& append(const wxScopedCharBuffer& str, size_t n) - { return append(str.data(), n); } - wxString& append(const wxScopedWCharBuffer& str, size_t n) - { return append(str.data(), n); } - - // append n copies of ch - wxString& append(size_t n, wxUniChar ch) - { -#if wxUSE_UNICODE_UTF8 - if ( !ch.IsAscii() ) - { - wxSTRING_INVALIDATE_CACHED_LENGTH(); - - m_impl.append(wxStringOperations::EncodeNChars(n, ch)); - } - else // ASCII -#endif - { - wxSTRING_UPDATE_CACHED_LENGTH(n); - - m_impl.append(n, (wxStringCharType)ch); - } - - return *this; - } - - wxString& append(size_t n, wxUniCharRef ch) - { return append(n, wxUniChar(ch)); } - wxString& append(size_t n, char ch) - { return append(n, wxUniChar(ch)); } - wxString& append(size_t n, unsigned char ch) - { return append(n, wxUniChar(ch)); } - wxString& append(size_t n, wchar_t ch) - { return append(n, wxUniChar(ch)); } - - // append from first to last - wxString& append(const_iterator first, const_iterator last) - { - wxSTRING_INVALIDATE_CACHED_LENGTH(); - - m_impl.append(first.impl(), last.impl()); - return *this; - } -#if WXWIN_COMPATIBILITY_STRING_PTR_AS_ITER - wxString& append(const char *first, const char *last) - { return append(first, last - first); } - wxString& append(const wchar_t *first, const wchar_t *last) - { return append(first, last - first); } - wxString& append(const wxCStrData& first, const wxCStrData& last) - { return append(CreateConstIterator(first), CreateConstIterator(last)); } -#endif // WXWIN_COMPATIBILITY_STRING_PTR_AS_ITER - - // same as `this_string = str' - wxString& assign(const wxString& str) - { - wxSTRING_SET_CACHED_LENGTH(str.length()); - - m_impl = str.m_impl; - - return *this; - } - - // This is a non-standard-compliant overload taking the first "len" - // characters of the source string. - wxString& assign(const wxString& str, size_t len) - { -#if wxUSE_STRING_POS_CACHE - // It is legal to pass len > str.length() to wxStringImpl::assign() but - // by restricting it here we save some work for that function so it's not - // really less efficient and, at the same time, ensure that we don't - // cache invalid length. - const size_t lenSrc = str.length(); - if ( len > lenSrc ) - len = lenSrc; - - wxSTRING_SET_CACHED_LENGTH(len); -#endif // wxUSE_STRING_POS_CACHE - - m_impl.assign(str.m_impl, 0, str.LenToImpl(len)); - - return *this; - } - - // same as ` = str[pos..pos + n] - wxString& assign(const wxString& str, size_t pos, size_t n) - { - size_t from, len; - str.PosLenToImpl(pos, n, &from, &len); - m_impl.assign(str.m_impl, from, len); - - // it's important to call this after PosLenToImpl() above in case str is - // the same string as this one - wxSTRING_SET_CACHED_LENGTH(n); - - return *this; - } - - // same as `= first n (or all if n == npos) characters of sz' - wxString& assign(const char *sz) - { - wxSTRING_INVALIDATE_CACHE(); - - m_impl.assign(ImplStr(sz)); - - return *this; - } - - wxString& assign(const wchar_t *sz) - { - wxSTRING_INVALIDATE_CACHE(); - - m_impl.assign(ImplStr(sz)); - - return *this; - } - - wxString& assign(const char *sz, size_t n) - { - wxSTRING_INVALIDATE_CACHE(); - - SubstrBufFromMB str(ImplStr(sz, n)); - m_impl.assign(str.data, str.len); - - return *this; - } - - wxString& assign(const wchar_t *sz, size_t n) - { - wxSTRING_SET_CACHED_LENGTH(n); - - SubstrBufFromWC str(ImplStr(sz, n)); - m_impl.assign(str.data, str.len); - - return *this; - } - - wxString& assign(const wxCStrData& str) - { return assign(str.AsString()); } - wxString& assign(const wxScopedCharBuffer& str) - { return assign(str.data(), str.length()); } - wxString& assign(const wxScopedWCharBuffer& str) - { return assign(str.data(), str.length()); } - wxString& assign(const wxCStrData& str, size_t len) - { return assign(str.AsString(), len); } - wxString& assign(const wxScopedCharBuffer& str, size_t len) - { return assign(str.data(), len); } - wxString& assign(const wxScopedWCharBuffer& str, size_t len) - { return assign(str.data(), len); } - - // same as `= n copies of ch' - wxString& assign(size_t n, wxUniChar ch) - { - wxSTRING_SET_CACHED_LENGTH(n); - -#if wxUSE_UNICODE_UTF8 - if ( !ch.IsAscii() ) - m_impl.assign(wxStringOperations::EncodeNChars(n, ch)); - else -#endif - m_impl.assign(n, (wxStringCharType)ch); - - return *this; - } - - wxString& assign(size_t n, wxUniCharRef ch) - { return assign(n, wxUniChar(ch)); } - wxString& assign(size_t n, char ch) - { return assign(n, wxUniChar(ch)); } - wxString& assign(size_t n, unsigned char ch) - { return assign(n, wxUniChar(ch)); } - wxString& assign(size_t n, wchar_t ch) - { return assign(n, wxUniChar(ch)); } - - // assign from first to last - wxString& assign(const_iterator first, const_iterator last) - { - wxSTRING_INVALIDATE_CACHE(); - - m_impl.assign(first.impl(), last.impl()); - - return *this; - } -#if WXWIN_COMPATIBILITY_STRING_PTR_AS_ITER - wxString& assign(const char *first, const char *last) - { return assign(first, last - first); } - wxString& assign(const wchar_t *first, const wchar_t *last) - { return assign(first, last - first); } - wxString& assign(const wxCStrData& first, const wxCStrData& last) - { return assign(CreateConstIterator(first), CreateConstIterator(last)); } -#endif // WXWIN_COMPATIBILITY_STRING_PTR_AS_ITER - - // string comparison - int compare(const wxString& str) const; - int compare(const char* sz) const; - int compare(const wchar_t* sz) const; - int compare(const wxCStrData& str) const - { return compare(str.AsString()); } - int compare(const wxScopedCharBuffer& str) const - { return compare(str.data()); } - int compare(const wxScopedWCharBuffer& str) const - { return compare(str.data()); } - // comparison with a substring - int compare(size_t nStart, size_t nLen, const wxString& str) const; - // comparison of 2 substrings - int compare(size_t nStart, size_t nLen, - const wxString& str, size_t nStart2, size_t nLen2) const; - // substring comparison with first nCount characters of sz - int compare(size_t nStart, size_t nLen, - const char* sz, size_t nCount = npos) const; - int compare(size_t nStart, size_t nLen, - const wchar_t* sz, size_t nCount = npos) const; - - // insert another string - wxString& insert(size_t nPos, const wxString& str) - { insert(GetIterForNthChar(nPos), str.begin(), str.end()); return *this; } - // insert n chars of str starting at nStart (in str) - wxString& insert(size_t nPos, const wxString& str, size_t nStart, size_t n) - { - wxSTRING_UPDATE_CACHED_LENGTH(n); - - size_t from, len; - str.PosLenToImpl(nStart, n, &from, &len); - m_impl.insert(PosToImpl(nPos), str.m_impl, from, len); - - return *this; - } - - // insert first n (or all if n == npos) characters of sz - wxString& insert(size_t nPos, const char *sz) - { - wxSTRING_INVALIDATE_CACHE(); - - m_impl.insert(PosToImpl(nPos), ImplStr(sz)); - - return *this; - } - - wxString& insert(size_t nPos, const wchar_t *sz) - { - wxSTRING_INVALIDATE_CACHE(); - - m_impl.insert(PosToImpl(nPos), ImplStr(sz)); return *this; - } - - wxString& insert(size_t nPos, const char *sz, size_t n) - { - wxSTRING_UPDATE_CACHED_LENGTH(n); - - SubstrBufFromMB str(ImplStr(sz, n)); - m_impl.insert(PosToImpl(nPos), str.data, str.len); - - return *this; - } - - wxString& insert(size_t nPos, const wchar_t *sz, size_t n) - { - wxSTRING_UPDATE_CACHED_LENGTH(n); - - SubstrBufFromWC str(ImplStr(sz, n)); - m_impl.insert(PosToImpl(nPos), str.data, str.len); - - return *this; - } - - // insert n copies of ch - wxString& insert(size_t nPos, size_t n, wxUniChar ch) - { - wxSTRING_UPDATE_CACHED_LENGTH(n); - -#if wxUSE_UNICODE_UTF8 - if ( !ch.IsAscii() ) - m_impl.insert(PosToImpl(nPos), wxStringOperations::EncodeNChars(n, ch)); - else -#endif - m_impl.insert(PosToImpl(nPos), n, (wxStringCharType)ch); - return *this; - } - - iterator insert(iterator it, wxUniChar ch) - { - wxSTRING_UPDATE_CACHED_LENGTH(1); - -#if wxUSE_UNICODE_UTF8 - if ( !ch.IsAscii() ) - { - size_t pos = IterToImplPos(it); - m_impl.insert(pos, wxStringOperations::EncodeChar(ch)); - return iterator(this, m_impl.begin() + pos); - } - else -#endif - return iterator(this, m_impl.insert(it.impl(), (wxStringCharType)ch)); - } - - void insert(iterator it, const_iterator first, const_iterator last) - { - wxSTRING_INVALIDATE_CACHE(); - - m_impl.insert(it.impl(), first.impl(), last.impl()); - } - -#if WXWIN_COMPATIBILITY_STRING_PTR_AS_ITER - void insert(iterator it, const char *first, const char *last) - { insert(it - begin(), first, last - first); } - void insert(iterator it, const wchar_t *first, const wchar_t *last) - { insert(it - begin(), first, last - first); } - void insert(iterator it, const wxCStrData& first, const wxCStrData& last) - { insert(it, CreateConstIterator(first), CreateConstIterator(last)); } -#endif // WXWIN_COMPATIBILITY_STRING_PTR_AS_ITER - - void insert(iterator it, size_type n, wxUniChar ch) - { - wxSTRING_UPDATE_CACHED_LENGTH(n); - -#if wxUSE_UNICODE_UTF8 - if ( !ch.IsAscii() ) - m_impl.insert(IterToImplPos(it), wxStringOperations::EncodeNChars(n, ch)); - else -#endif - m_impl.insert(it.impl(), n, (wxStringCharType)ch); - } - - // delete characters from nStart to nStart + nLen - wxString& erase(size_type pos = 0, size_type n = npos) - { - wxSTRING_INVALIDATE_CACHE(); - - size_t from, len; - PosLenToImpl(pos, n, &from, &len); - m_impl.erase(from, len); - - return *this; - } - - // delete characters from first up to last - iterator erase(iterator first, iterator last) - { - wxSTRING_INVALIDATE_CACHE(); - - return iterator(this, m_impl.erase(first.impl(), last.impl())); - } - - iterator erase(iterator first) - { - wxSTRING_UPDATE_CACHED_LENGTH(-1); - - return iterator(this, m_impl.erase(first.impl())); - } - - void clear() - { - wxSTRING_SET_CACHED_LENGTH(0); - - m_impl.clear(); - } - - // replaces the substring of length nLen starting at nStart - wxString& replace(size_t nStart, size_t nLen, const char* sz) - { - wxSTRING_INVALIDATE_CACHE(); - - size_t from, len; - PosLenToImpl(nStart, nLen, &from, &len); - m_impl.replace(from, len, ImplStr(sz)); - - return *this; - } - - wxString& replace(size_t nStart, size_t nLen, const wchar_t* sz) - { - wxSTRING_INVALIDATE_CACHE(); - - size_t from, len; - PosLenToImpl(nStart, nLen, &from, &len); - m_impl.replace(from, len, ImplStr(sz)); - - return *this; - } - - // replaces the substring of length nLen starting at nStart - wxString& replace(size_t nStart, size_t nLen, const wxString& str) - { - wxSTRING_INVALIDATE_CACHE(); - - size_t from, len; - PosLenToImpl(nStart, nLen, &from, &len); - m_impl.replace(from, len, str.m_impl); - - return *this; - } - - // replaces the substring with nCount copies of ch - wxString& replace(size_t nStart, size_t nLen, size_t nCount, wxUniChar ch) - { - wxSTRING_INVALIDATE_CACHE(); - - size_t from, len; - PosLenToImpl(nStart, nLen, &from, &len); -#if wxUSE_UNICODE_UTF8 - if ( !ch.IsAscii() ) - m_impl.replace(from, len, wxStringOperations::EncodeNChars(nCount, ch)); - else -#endif - m_impl.replace(from, len, nCount, (wxStringCharType)ch); - - return *this; - } - - // replaces a substring with another substring - wxString& replace(size_t nStart, size_t nLen, - const wxString& str, size_t nStart2, size_t nLen2) - { - wxSTRING_INVALIDATE_CACHE(); - - size_t from, len; - PosLenToImpl(nStart, nLen, &from, &len); - - size_t from2, len2; - str.PosLenToImpl(nStart2, nLen2, &from2, &len2); - - m_impl.replace(from, len, str.m_impl, from2, len2); - - return *this; - } - - // replaces the substring with first nCount chars of sz - wxString& replace(size_t nStart, size_t nLen, - const char* sz, size_t nCount) - { - wxSTRING_INVALIDATE_CACHE(); - - size_t from, len; - PosLenToImpl(nStart, nLen, &from, &len); - - SubstrBufFromMB str(ImplStr(sz, nCount)); - - m_impl.replace(from, len, str.data, str.len); - - return *this; - } - - wxString& replace(size_t nStart, size_t nLen, - const wchar_t* sz, size_t nCount) - { - wxSTRING_INVALIDATE_CACHE(); - - size_t from, len; - PosLenToImpl(nStart, nLen, &from, &len); - - SubstrBufFromWC str(ImplStr(sz, nCount)); - - m_impl.replace(from, len, str.data, str.len); - - return *this; - } - - wxString& replace(size_t nStart, size_t nLen, - const wxString& s, size_t nCount) - { - wxSTRING_INVALIDATE_CACHE(); - - size_t from, len; - PosLenToImpl(nStart, nLen, &from, &len); - m_impl.replace(from, len, s.m_impl.c_str(), s.LenToImpl(nCount)); - - return *this; - } - - wxString& replace(iterator first, iterator last, const char* s) - { - wxSTRING_INVALIDATE_CACHE(); - - m_impl.replace(first.impl(), last.impl(), ImplStr(s)); - - return *this; - } - - wxString& replace(iterator first, iterator last, const wchar_t* s) - { - wxSTRING_INVALIDATE_CACHE(); - - m_impl.replace(first.impl(), last.impl(), ImplStr(s)); - - return *this; - } - - wxString& replace(iterator first, iterator last, const char* s, size_type n) - { - wxSTRING_INVALIDATE_CACHE(); - - SubstrBufFromMB str(ImplStr(s, n)); - m_impl.replace(first.impl(), last.impl(), str.data, str.len); - - return *this; - } - - wxString& replace(iterator first, iterator last, const wchar_t* s, size_type n) - { - wxSTRING_INVALIDATE_CACHE(); - - SubstrBufFromWC str(ImplStr(s, n)); - m_impl.replace(first.impl(), last.impl(), str.data, str.len); - - return *this; - } - - wxString& replace(iterator first, iterator last, const wxString& s) - { - wxSTRING_INVALIDATE_CACHE(); - - m_impl.replace(first.impl(), last.impl(), s.m_impl); - - return *this; - } - - wxString& replace(iterator first, iterator last, size_type n, wxUniChar ch) - { - wxSTRING_INVALIDATE_CACHE(); - -#if wxUSE_UNICODE_UTF8 - if ( !ch.IsAscii() ) - m_impl.replace(first.impl(), last.impl(), - wxStringOperations::EncodeNChars(n, ch)); - else -#endif - m_impl.replace(first.impl(), last.impl(), n, (wxStringCharType)ch); - - return *this; - } - - wxString& replace(iterator first, iterator last, - const_iterator first1, const_iterator last1) - { - wxSTRING_INVALIDATE_CACHE(); - - m_impl.replace(first.impl(), last.impl(), first1.impl(), last1.impl()); - - return *this; - } - - wxString& replace(iterator first, iterator last, - const char *first1, const char *last1) - { replace(first, last, first1, last1 - first1); return *this; } - wxString& replace(iterator first, iterator last, - const wchar_t *first1, const wchar_t *last1) - { replace(first, last, first1, last1 - first1); return *this; } - - // swap two strings - void swap(wxString& str) - { -#if wxUSE_STRING_POS_CACHE - // we modify not only this string but also the other one directly so we - // need to invalidate cache for both of them (we could also try to - // exchange their cache entries but it seems unlikely to be worth it) - InvalidateCache(); - str.InvalidateCache(); -#endif // wxUSE_STRING_POS_CACHE - - m_impl.swap(str.m_impl); - } - - // find a substring - size_t find(const wxString& str, size_t nStart = 0) const - { return PosFromImpl(m_impl.find(str.m_impl, PosToImpl(nStart))); } - - // find first n characters of sz - size_t find(const char* sz, size_t nStart = 0, size_t n = npos) const - { - SubstrBufFromMB str(ImplStr(sz, n)); - return PosFromImpl(m_impl.find(str.data, PosToImpl(nStart), str.len)); - } - size_t find(const wchar_t* sz, size_t nStart = 0, size_t n = npos) const - { - SubstrBufFromWC str(ImplStr(sz, n)); - return PosFromImpl(m_impl.find(str.data, PosToImpl(nStart), str.len)); - } - size_t find(const wxScopedCharBuffer& s, size_t nStart = 0, size_t n = npos) const - { return find(s.data(), nStart, n); } - size_t find(const wxScopedWCharBuffer& s, size_t nStart = 0, size_t n = npos) const - { return find(s.data(), nStart, n); } - size_t find(const wxCStrData& s, size_t nStart = 0, size_t n = npos) const - { return find(s.AsWChar(), nStart, n); } - - // find the first occurrence of character ch after nStart - size_t find(wxUniChar ch, size_t nStart = 0) const - { -#if wxUSE_UNICODE_UTF8 - if ( !ch.IsAscii() ) - return PosFromImpl(m_impl.find(wxStringOperations::EncodeChar(ch), - PosToImpl(nStart))); - else -#endif - return PosFromImpl(m_impl.find((wxStringCharType)ch, - PosToImpl(nStart))); - - } - size_t find(wxUniCharRef ch, size_t nStart = 0) const - { return find(wxUniChar(ch), nStart); } - size_t find(char ch, size_t nStart = 0) const - { return find(wxUniChar(ch), nStart); } - size_t find(unsigned char ch, size_t nStart = 0) const - { return find(wxUniChar(ch), nStart); } - size_t find(wchar_t ch, size_t nStart = 0) const - { return find(wxUniChar(ch), nStart); } - - // rfind() family is exactly like find() but works right to left - - // as find, but from the end - size_t rfind(const wxString& str, size_t nStart = npos) const - { return PosFromImpl(m_impl.rfind(str.m_impl, PosToImpl(nStart))); } - - // as find, but from the end - size_t rfind(const char* sz, size_t nStart = npos, size_t n = npos) const - { - SubstrBufFromMB str(ImplStr(sz, n)); - return PosFromImpl(m_impl.rfind(str.data, PosToImpl(nStart), str.len)); - } - size_t rfind(const wchar_t* sz, size_t nStart = npos, size_t n = npos) const - { - SubstrBufFromWC str(ImplStr(sz, n)); - return PosFromImpl(m_impl.rfind(str.data, PosToImpl(nStart), str.len)); - } - size_t rfind(const wxScopedCharBuffer& s, size_t nStart = npos, size_t n = npos) const - { return rfind(s.data(), nStart, n); } - size_t rfind(const wxScopedWCharBuffer& s, size_t nStart = npos, size_t n = npos) const - { return rfind(s.data(), nStart, n); } - size_t rfind(const wxCStrData& s, size_t nStart = npos, size_t n = npos) const - { return rfind(s.AsWChar(), nStart, n); } - // as find, but from the end - size_t rfind(wxUniChar ch, size_t nStart = npos) const - { -#if wxUSE_UNICODE_UTF8 - if ( !ch.IsAscii() ) - return PosFromImpl(m_impl.rfind(wxStringOperations::EncodeChar(ch), - PosToImpl(nStart))); - else -#endif - return PosFromImpl(m_impl.rfind((wxStringCharType)ch, - PosToImpl(nStart))); - } - size_t rfind(wxUniCharRef ch, size_t nStart = npos) const - { return rfind(wxUniChar(ch), nStart); } - size_t rfind(char ch, size_t nStart = npos) const - { return rfind(wxUniChar(ch), nStart); } - size_t rfind(unsigned char ch, size_t nStart = npos) const - { return rfind(wxUniChar(ch), nStart); } - size_t rfind(wchar_t ch, size_t nStart = npos) const - { return rfind(wxUniChar(ch), nStart); } - - // find first/last occurrence of any character (not) in the set: -#if wxUSE_STL_BASED_WXSTRING && !wxUSE_UNICODE_UTF8 - // FIXME-UTF8: this is not entirely correct, because it doesn't work if - // sizeof(wchar_t)==2 and surrogates are present in the string; - // should we care? Probably not. - size_t find_first_of(const wxString& str, size_t nStart = 0) const - { return m_impl.find_first_of(str.m_impl, nStart); } - size_t find_first_of(const char* sz, size_t nStart = 0) const - { return m_impl.find_first_of(ImplStr(sz), nStart); } - size_t find_first_of(const wchar_t* sz, size_t nStart = 0) const - { return m_impl.find_first_of(ImplStr(sz), nStart); } - size_t find_first_of(const char* sz, size_t nStart, size_t n) const - { return m_impl.find_first_of(ImplStr(sz), nStart, n); } - size_t find_first_of(const wchar_t* sz, size_t nStart, size_t n) const - { return m_impl.find_first_of(ImplStr(sz), nStart, n); } - size_t find_first_of(wxUniChar c, size_t nStart = 0) const - { return m_impl.find_first_of((wxChar)c, nStart); } - - size_t find_last_of(const wxString& str, size_t nStart = npos) const - { return m_impl.find_last_of(str.m_impl, nStart); } - size_t find_last_of(const char* sz, size_t nStart = npos) const - { return m_impl.find_last_of(ImplStr(sz), nStart); } - size_t find_last_of(const wchar_t* sz, size_t nStart = npos) const - { return m_impl.find_last_of(ImplStr(sz), nStart); } - size_t find_last_of(const char* sz, size_t nStart, size_t n) const - { return m_impl.find_last_of(ImplStr(sz), nStart, n); } - size_t find_last_of(const wchar_t* sz, size_t nStart, size_t n) const - { return m_impl.find_last_of(ImplStr(sz), nStart, n); } - size_t find_last_of(wxUniChar c, size_t nStart = npos) const - { return m_impl.find_last_of((wxChar)c, nStart); } - - size_t find_first_not_of(const wxString& str, size_t nStart = 0) const - { return m_impl.find_first_not_of(str.m_impl, nStart); } - size_t find_first_not_of(const char* sz, size_t nStart = 0) const - { return m_impl.find_first_not_of(ImplStr(sz), nStart); } - size_t find_first_not_of(const wchar_t* sz, size_t nStart = 0) const - { return m_impl.find_first_not_of(ImplStr(sz), nStart); } - size_t find_first_not_of(const char* sz, size_t nStart, size_t n) const - { return m_impl.find_first_not_of(ImplStr(sz), nStart, n); } - size_t find_first_not_of(const wchar_t* sz, size_t nStart, size_t n) const - { return m_impl.find_first_not_of(ImplStr(sz), nStart, n); } - size_t find_first_not_of(wxUniChar c, size_t nStart = 0) const - { return m_impl.find_first_not_of((wxChar)c, nStart); } - - size_t find_last_not_of(const wxString& str, size_t nStart = npos) const - { return m_impl.find_last_not_of(str.m_impl, nStart); } - size_t find_last_not_of(const char* sz, size_t nStart = npos) const - { return m_impl.find_last_not_of(ImplStr(sz), nStart); } - size_t find_last_not_of(const wchar_t* sz, size_t nStart = npos) const - { return m_impl.find_last_not_of(ImplStr(sz), nStart); } - size_t find_last_not_of(const char* sz, size_t nStart, size_t n) const - { return m_impl.find_last_not_of(ImplStr(sz), nStart, n); } - size_t find_last_not_of(const wchar_t* sz, size_t nStart, size_t n) const - { return m_impl.find_last_not_of(ImplStr(sz), nStart, n); } - size_t find_last_not_of(wxUniChar c, size_t nStart = npos) const - { return m_impl.find_last_not_of((wxChar)c, nStart); } -#else - // we can't use std::string implementation in UTF-8 build, because the - // character sets would be interpreted wrongly: - - // as strpbrk() but starts at nStart, returns npos if not found - size_t find_first_of(const wxString& str, size_t nStart = 0) const -#if wxUSE_UNICODE // FIXME-UTF8: temporary - { return find_first_of(str.wc_str(), nStart); } -#else - { return find_first_of(str.mb_str(), nStart); } -#endif - // same as above - size_t find_first_of(const char* sz, size_t nStart = 0) const; - size_t find_first_of(const wchar_t* sz, size_t nStart = 0) const; - size_t find_first_of(const char* sz, size_t nStart, size_t n) const; - size_t find_first_of(const wchar_t* sz, size_t nStart, size_t n) const; - // same as find(char, size_t) - size_t find_first_of(wxUniChar c, size_t nStart = 0) const - { return find(c, nStart); } - // find the last (starting from nStart) char from str in this string - size_t find_last_of (const wxString& str, size_t nStart = npos) const -#if wxUSE_UNICODE // FIXME-UTF8: temporary - { return find_last_of(str.wc_str(), nStart); } -#else - { return find_last_of(str.mb_str(), nStart); } -#endif - // same as above - size_t find_last_of (const char* sz, size_t nStart = npos) const; - size_t find_last_of (const wchar_t* sz, size_t nStart = npos) const; - size_t find_last_of(const char* sz, size_t nStart, size_t n) const; - size_t find_last_of(const wchar_t* sz, size_t nStart, size_t n) const; - // same as above - size_t find_last_of(wxUniChar c, size_t nStart = npos) const - { return rfind(c, nStart); } - - // find first/last occurrence of any character not in the set - - // as strspn() (starting from nStart), returns npos on failure - size_t find_first_not_of(const wxString& str, size_t nStart = 0) const -#if wxUSE_UNICODE // FIXME-UTF8: temporary - { return find_first_not_of(str.wc_str(), nStart); } -#else - { return find_first_not_of(str.mb_str(), nStart); } -#endif - // same as above - size_t find_first_not_of(const char* sz, size_t nStart = 0) const; - size_t find_first_not_of(const wchar_t* sz, size_t nStart = 0) const; - size_t find_first_not_of(const char* sz, size_t nStart, size_t n) const; - size_t find_first_not_of(const wchar_t* sz, size_t nStart, size_t n) const; - // same as above - size_t find_first_not_of(wxUniChar ch, size_t nStart = 0) const; - // as strcspn() - size_t find_last_not_of(const wxString& str, size_t nStart = npos) const -#if wxUSE_UNICODE // FIXME-UTF8: temporary - { return find_last_not_of(str.wc_str(), nStart); } -#else - { return find_last_not_of(str.mb_str(), nStart); } -#endif - // same as above - size_t find_last_not_of(const char* sz, size_t nStart = npos) const; - size_t find_last_not_of(const wchar_t* sz, size_t nStart = npos) const; - size_t find_last_not_of(const char* sz, size_t nStart, size_t n) const; - size_t find_last_not_of(const wchar_t* sz, size_t nStart, size_t n) const; - // same as above - size_t find_last_not_of(wxUniChar ch, size_t nStart = npos) const; -#endif // wxUSE_STL_BASED_WXSTRING && !wxUSE_UNICODE_UTF8 or not - - // provide char/wchar_t/wxUniCharRef overloads for char-finding functions - // above to resolve ambiguities: - size_t find_first_of(wxUniCharRef ch, size_t nStart = 0) const - { return find_first_of(wxUniChar(ch), nStart); } - size_t find_first_of(char ch, size_t nStart = 0) const - { return find_first_of(wxUniChar(ch), nStart); } - size_t find_first_of(unsigned char ch, size_t nStart = 0) const - { return find_first_of(wxUniChar(ch), nStart); } - size_t find_first_of(wchar_t ch, size_t nStart = 0) const - { return find_first_of(wxUniChar(ch), nStart); } - size_t find_last_of(wxUniCharRef ch, size_t nStart = npos) const - { return find_last_of(wxUniChar(ch), nStart); } - size_t find_last_of(char ch, size_t nStart = npos) const - { return find_last_of(wxUniChar(ch), nStart); } - size_t find_last_of(unsigned char ch, size_t nStart = npos) const - { return find_last_of(wxUniChar(ch), nStart); } - size_t find_last_of(wchar_t ch, size_t nStart = npos) const - { return find_last_of(wxUniChar(ch), nStart); } - size_t find_first_not_of(wxUniCharRef ch, size_t nStart = 0) const - { return find_first_not_of(wxUniChar(ch), nStart); } - size_t find_first_not_of(char ch, size_t nStart = 0) const - { return find_first_not_of(wxUniChar(ch), nStart); } - size_t find_first_not_of(unsigned char ch, size_t nStart = 0) const - { return find_first_not_of(wxUniChar(ch), nStart); } - size_t find_first_not_of(wchar_t ch, size_t nStart = 0) const - { return find_first_not_of(wxUniChar(ch), nStart); } - size_t find_last_not_of(wxUniCharRef ch, size_t nStart = npos) const - { return find_last_not_of(wxUniChar(ch), nStart); } - size_t find_last_not_of(char ch, size_t nStart = npos) const - { return find_last_not_of(wxUniChar(ch), nStart); } - size_t find_last_not_of(unsigned char ch, size_t nStart = npos) const - { return find_last_not_of(wxUniChar(ch), nStart); } - size_t find_last_not_of(wchar_t ch, size_t nStart = npos) const - { return find_last_not_of(wxUniChar(ch), nStart); } - - // and additional overloads for the versions taking strings: - size_t find_first_of(const wxCStrData& sz, size_t nStart = 0) const - { return find_first_of(sz.AsString(), nStart); } - size_t find_first_of(const wxScopedCharBuffer& sz, size_t nStart = 0) const - { return find_first_of(sz.data(), nStart); } - size_t find_first_of(const wxScopedWCharBuffer& sz, size_t nStart = 0) const - { return find_first_of(sz.data(), nStart); } - size_t find_first_of(const wxCStrData& sz, size_t nStart, size_t n) const - { return find_first_of(sz.AsWChar(), nStart, n); } - size_t find_first_of(const wxScopedCharBuffer& sz, size_t nStart, size_t n) const - { return find_first_of(sz.data(), nStart, n); } - size_t find_first_of(const wxScopedWCharBuffer& sz, size_t nStart, size_t n) const - { return find_first_of(sz.data(), nStart, n); } - - size_t find_last_of(const wxCStrData& sz, size_t nStart = 0) const - { return find_last_of(sz.AsString(), nStart); } - size_t find_last_of(const wxScopedCharBuffer& sz, size_t nStart = 0) const - { return find_last_of(sz.data(), nStart); } - size_t find_last_of(const wxScopedWCharBuffer& sz, size_t nStart = 0) const - { return find_last_of(sz.data(), nStart); } - size_t find_last_of(const wxCStrData& sz, size_t nStart, size_t n) const - { return find_last_of(sz.AsWChar(), nStart, n); } - size_t find_last_of(const wxScopedCharBuffer& sz, size_t nStart, size_t n) const - { return find_last_of(sz.data(), nStart, n); } - size_t find_last_of(const wxScopedWCharBuffer& sz, size_t nStart, size_t n) const - { return find_last_of(sz.data(), nStart, n); } - - size_t find_first_not_of(const wxCStrData& sz, size_t nStart = 0) const - { return find_first_not_of(sz.AsString(), nStart); } - size_t find_first_not_of(const wxScopedCharBuffer& sz, size_t nStart = 0) const - { return find_first_not_of(sz.data(), nStart); } - size_t find_first_not_of(const wxScopedWCharBuffer& sz, size_t nStart = 0) const - { return find_first_not_of(sz.data(), nStart); } - size_t find_first_not_of(const wxCStrData& sz, size_t nStart, size_t n) const - { return find_first_not_of(sz.AsWChar(), nStart, n); } - size_t find_first_not_of(const wxScopedCharBuffer& sz, size_t nStart, size_t n) const - { return find_first_not_of(sz.data(), nStart, n); } - size_t find_first_not_of(const wxScopedWCharBuffer& sz, size_t nStart, size_t n) const - { return find_first_not_of(sz.data(), nStart, n); } - - size_t find_last_not_of(const wxCStrData& sz, size_t nStart = 0) const - { return find_last_not_of(sz.AsString(), nStart); } - size_t find_last_not_of(const wxScopedCharBuffer& sz, size_t nStart = 0) const - { return find_last_not_of(sz.data(), nStart); } - size_t find_last_not_of(const wxScopedWCharBuffer& sz, size_t nStart = 0) const - { return find_last_not_of(sz.data(), nStart); } - size_t find_last_not_of(const wxCStrData& sz, size_t nStart, size_t n) const - { return find_last_not_of(sz.AsWChar(), nStart, n); } - size_t find_last_not_of(const wxScopedCharBuffer& sz, size_t nStart, size_t n) const - { return find_last_not_of(sz.data(), nStart, n); } - size_t find_last_not_of(const wxScopedWCharBuffer& sz, size_t nStart, size_t n) const - { return find_last_not_of(sz.data(), nStart, n); } - - // string += string - wxString& operator+=(const wxString& s) - { - wxSTRING_INVALIDATE_CACHED_LENGTH(); - - m_impl += s.m_impl; - return *this; - } - // string += C string - wxString& operator+=(const char *psz) - { - wxSTRING_INVALIDATE_CACHED_LENGTH(); - - m_impl += ImplStr(psz); - return *this; - } - wxString& operator+=(const wchar_t *pwz) - { - wxSTRING_INVALIDATE_CACHED_LENGTH(); - - m_impl += ImplStr(pwz); - return *this; - } - wxString& operator+=(const wxCStrData& s) - { - wxSTRING_INVALIDATE_CACHED_LENGTH(); - - m_impl += s.AsString().m_impl; - return *this; - } - wxString& operator+=(const wxScopedCharBuffer& s) - { return append(s); } - wxString& operator+=(const wxScopedWCharBuffer& s) - { return append(s); } - // string += char - wxString& operator+=(wxUniChar ch) - { - wxSTRING_UPDATE_CACHED_LENGTH(1); - -#if wxUSE_UNICODE_UTF8 - if ( !ch.IsAscii() ) - m_impl += wxStringOperations::EncodeChar(ch); - else -#endif - m_impl += (wxStringCharType)ch; - return *this; - } - wxString& operator+=(wxUniCharRef ch) { return *this += wxUniChar(ch); } - wxString& operator+=(int ch) { return *this += wxUniChar(ch); } - wxString& operator+=(char ch) { return *this += wxUniChar(ch); } - wxString& operator+=(unsigned char ch) { return *this += wxUniChar(ch); } - wxString& operator+=(wchar_t ch) { return *this += wxUniChar(ch); } - -private: -#if !wxUSE_STL_BASED_WXSTRING - // helpers for wxStringBuffer and wxStringBufferLength - wxStringCharType *DoGetWriteBuf(size_t nLen) - { - return m_impl.DoGetWriteBuf(nLen); - } - - void DoUngetWriteBuf() - { - wxSTRING_INVALIDATE_CACHE(); - - m_impl.DoUngetWriteBuf(); - } - - void DoUngetWriteBuf(size_t nLen) - { - wxSTRING_INVALIDATE_CACHE(); - - m_impl.DoUngetWriteBuf(nLen); - } -#endif // !wxUSE_STL_BASED_WXSTRING - - #if !wxUSE_UTF8_LOCALE_ONLY - int DoPrintfWchar(const wxChar *format, ...); - static wxString DoFormatWchar(const wxChar *format, ...); - #endif - #if wxUSE_UNICODE_UTF8 - int DoPrintfUtf8(const char *format, ...); - static wxString DoFormatUtf8(const char *format, ...); - #endif - -#if !wxUSE_STL_BASED_WXSTRING - // check string's data validity - bool IsValid() const { return m_impl.GetStringData()->IsValid(); } -#endif - -private: - wxStringImpl m_impl; - - // buffers for compatibility conversion from (char*)c_str() and - // (wchar_t*)c_str(): the pointers returned by these functions should remain - // valid until the string itself is modified for compatibility with the - // existing code and consistency with std::string::c_str() so returning a - // temporary buffer won't do and we need to cache the conversion results - - // TODO-UTF8: benchmark various approaches to keeping compatibility buffers - template - struct ConvertedBuffer - { - // notice that there is no need to initialize m_len here as it's unused - // as long as m_str is NULL - ConvertedBuffer() : m_str(NULL) {} - ~ConvertedBuffer() - { free(m_str); } - - bool Extend(size_t len) - { - // add extra 1 for the trailing NUL - void * const str = realloc(m_str, sizeof(T)*(len + 1)); - if ( !str ) - return false; - - m_str = static_cast(str); - m_len = len; - - return true; - } - - const wxScopedCharTypeBuffer AsScopedBuffer() const - { - return wxScopedCharTypeBuffer::CreateNonOwned(m_str, m_len); - } - - T *m_str; // pointer to the string data - size_t m_len; // length, not size, i.e. in chars and without last NUL - }; - - -#if wxUSE_UNICODE - // common mb_str() and wxCStrData::AsChar() helper: performs the conversion - // and returns either m_convertedToChar.m_str (in which case its m_len is - // also updated) or NULL if it failed - // - // there is an important exception: in wxUSE_UNICODE_UTF8 build if conv is a - // UTF-8 one, we return m_impl.c_str() directly, without doing any conversion - // as optimization and so the caller needs to check for this before using - // m_convertedToChar - // - // NB: AsChar() returns char* in any build, unlike mb_str() - const char *AsChar(const wxMBConv& conv) const; - - // mb_str() implementation helper - wxScopedCharBuffer AsCharBuf(const wxMBConv& conv) const - { -#if wxUSE_UNICODE_UTF8 - // avoid conversion if we can - if ( conv.IsUTF8() ) - { - return wxScopedCharBuffer::CreateNonOwned(m_impl.c_str(), - m_impl.length()); - } -#endif // wxUSE_UNICODE_UTF8 - - // call this solely in order to fill in m_convertedToChar as AsChar() - // updates it as a side effect: this is a bit ugly but it's a completely - // internal function so the users of this class shouldn't care or know - // about it and doing it like this, i.e. having a separate AsChar(), - // allows us to avoid the creation and destruction of a temporary buffer - // when using wxCStrData without duplicating any code - if ( !AsChar(conv) ) - { - // although it would be probably more correct to return NULL buffer - // from here if the conversion fails, a lot of existing code doesn't - // expect mb_str() (or wc_str()) to ever return NULL so return an - // empty string otherwise to avoid crashes in it - // - // also, some existing code does check for the conversion success and - // so asserting here would be bad too -- even if it does mean that - // silently losing data is possible for badly written code - return wxScopedCharBuffer::CreateNonOwned("", 0); - } - - return m_convertedToChar.AsScopedBuffer(); - } - - ConvertedBuffer m_convertedToChar; -#endif // !wxUSE_UNICODE - -#if !wxUSE_UNICODE_WCHAR - // common wc_str() and wxCStrData::AsWChar() helper for both UTF-8 and ANSI - // builds: converts the string contents into m_convertedToWChar and returns - // NULL if the conversion failed (this can only happen in ANSI build) - // - // NB: AsWChar() returns wchar_t* in any build, unlike wc_str() - const wchar_t *AsWChar(const wxMBConv& conv) const; - - // wc_str() implementation helper - wxScopedWCharBuffer AsWCharBuf(const wxMBConv& conv) const - { - if ( !AsWChar(conv) ) - return wxScopedWCharBuffer::CreateNonOwned(L"", 0); - - return m_convertedToWChar.AsScopedBuffer(); - } - - ConvertedBuffer m_convertedToWChar; -#endif // !wxUSE_UNICODE_WCHAR - -#if wxUSE_UNICODE_UTF8 - // FIXME-UTF8: (try to) move this elsewhere (TLS) or solve differently - // assigning to character pointer to by wxString::iterator may - // change the underlying wxStringImpl iterator, so we have to - // keep track of all iterators and update them as necessary: - struct wxStringIteratorNodeHead - { - wxStringIteratorNodeHead() : ptr(NULL) {} - wxStringIteratorNode *ptr; - - // copying is disallowed as it would result in more than one pointer into - // the same linked list - wxDECLARE_NO_COPY_CLASS(wxStringIteratorNodeHead); - }; - - wxStringIteratorNodeHead m_iterators; - - friend class WXDLLIMPEXP_FWD_BASE wxStringIteratorNode; - friend class WXDLLIMPEXP_FWD_BASE wxUniCharRef; -#endif // wxUSE_UNICODE_UTF8 - - friend class WXDLLIMPEXP_FWD_BASE wxCStrData; - friend class wxStringInternalBuffer; - friend class wxStringInternalBufferLength; -}; - -// string iterator operators that satisfy STL Random Access Iterator -// requirements: -inline wxString::iterator operator+(ptrdiff_t n, wxString::iterator i) - { return i + n; } -inline wxString::const_iterator operator+(ptrdiff_t n, wxString::const_iterator i) - { return i + n; } -inline wxString::reverse_iterator operator+(ptrdiff_t n, wxString::reverse_iterator i) - { return i + n; } -inline wxString::const_reverse_iterator operator+(ptrdiff_t n, wxString::const_reverse_iterator i) - { return i + n; } - -// notice that even though for many compilers the friend declarations above are -// enough, from the point of view of C++ standard we must have the declarations -// here as friend ones are not injected in the enclosing namespace and without -// them the code fails to compile with conforming compilers such as xlC or g++4 -wxString WXDLLIMPEXP_BASE operator+(const wxString& string1, const wxString& string2); -wxString WXDLLIMPEXP_BASE operator+(const wxString& string, const char *psz); -wxString WXDLLIMPEXP_BASE operator+(const wxString& string, const wchar_t *pwz); -wxString WXDLLIMPEXP_BASE operator+(const char *psz, const wxString& string); -wxString WXDLLIMPEXP_BASE operator+(const wchar_t *pwz, const wxString& string); - -wxString WXDLLIMPEXP_BASE operator+(const wxString& string, wxUniChar ch); -wxString WXDLLIMPEXP_BASE operator+(wxUniChar ch, const wxString& string); - -inline wxString operator+(const wxString& string, wxUniCharRef ch) - { return string + (wxUniChar)ch; } -inline wxString operator+(const wxString& string, char ch) - { return string + wxUniChar(ch); } -inline wxString operator+(const wxString& string, wchar_t ch) - { return string + wxUniChar(ch); } -inline wxString operator+(wxUniCharRef ch, const wxString& string) - { return (wxUniChar)ch + string; } -inline wxString operator+(char ch, const wxString& string) - { return wxUniChar(ch) + string; } -inline wxString operator+(wchar_t ch, const wxString& string) - { return wxUniChar(ch) + string; } - - -#define wxGetEmptyString() wxString() - -// ---------------------------------------------------------------------------- -// helper functions which couldn't be defined inline -// ---------------------------------------------------------------------------- - -namespace wxPrivate -{ - -#if wxUSE_UNICODE_WCHAR - -template <> -struct wxStringAsBufHelper -{ - static wxScopedCharBuffer Get(const wxString& s, size_t *len) - { - wxScopedCharBuffer buf(s.mb_str()); - if ( len ) - *len = buf ? strlen(buf) : 0; - return buf; - } -}; - -template <> -struct wxStringAsBufHelper -{ - static wxScopedWCharBuffer Get(const wxString& s, size_t *len) - { - const size_t length = s.length(); - if ( len ) - *len = length; - return wxScopedWCharBuffer::CreateNonOwned(s.wx_str(), length); - } -}; - -#elif wxUSE_UNICODE_UTF8 - -template <> -struct wxStringAsBufHelper -{ - static wxScopedCharBuffer Get(const wxString& s, size_t *len) - { - const size_t length = s.utf8_length(); - if ( len ) - *len = length; - return wxScopedCharBuffer::CreateNonOwned(s.wx_str(), length); - } -}; - -template <> -struct wxStringAsBufHelper -{ - static wxScopedWCharBuffer Get(const wxString& s, size_t *len) - { - wxScopedWCharBuffer wbuf(s.wc_str()); - if ( len ) - *len = wxWcslen(wbuf); - return wbuf; - } -}; - -#endif // Unicode build kind - -} // namespace wxPrivate - -// ---------------------------------------------------------------------------- -// wxStringBuffer: a tiny class allowing to get a writable pointer into string -// ---------------------------------------------------------------------------- - -#if !wxUSE_STL_BASED_WXSTRING -// string buffer for direct access to string data in their native -// representation: -class wxStringInternalBuffer -{ -public: - typedef wxStringCharType CharType; - - wxStringInternalBuffer(wxString& str, size_t lenWanted = 1024) - : m_str(str), m_buf(NULL) - { m_buf = m_str.DoGetWriteBuf(lenWanted); } - - ~wxStringInternalBuffer() { m_str.DoUngetWriteBuf(); } - - operator wxStringCharType*() const { return m_buf; } - -private: - wxString& m_str; - wxStringCharType *m_buf; - - wxDECLARE_NO_COPY_CLASS(wxStringInternalBuffer); -}; - -class wxStringInternalBufferLength -{ -public: - typedef wxStringCharType CharType; - - wxStringInternalBufferLength(wxString& str, size_t lenWanted = 1024) - : m_str(str), m_buf(NULL), m_len(0), m_lenSet(false) - { - m_buf = m_str.DoGetWriteBuf(lenWanted); - wxASSERT(m_buf != NULL); - } - - ~wxStringInternalBufferLength() - { - wxASSERT(m_lenSet); - m_str.DoUngetWriteBuf(m_len); - } - - operator wxStringCharType*() const { return m_buf; } - void SetLength(size_t length) { m_len = length; m_lenSet = true; } - -private: - wxString& m_str; - wxStringCharType *m_buf; - size_t m_len; - bool m_lenSet; - - wxDECLARE_NO_COPY_CLASS(wxStringInternalBufferLength); -}; - -#endif // !wxUSE_STL_BASED_WXSTRING - -template -class wxStringTypeBufferBase -{ -public: - typedef T CharType; - - wxStringTypeBufferBase(wxString& str, size_t lenWanted = 1024) - : m_str(str), m_buf(lenWanted) - { - // for compatibility with old wxStringBuffer which provided direct - // access to wxString internal buffer, initialize ourselves with the - // string initial contents - - size_t len; - const wxCharTypeBuffer buf(str.tchar_str(&len)); - if ( buf ) - { - if ( len > lenWanted ) - { - // in this case there is not enough space for terminating NUL, - // ensure that we still put it there - m_buf.data()[lenWanted] = 0; - len = lenWanted - 1; - } - - memcpy(m_buf.data(), buf, (len + 1)*sizeof(CharType)); - } - //else: conversion failed, this can happen when trying to get Unicode - // string contents into a char string - } - - operator CharType*() { return m_buf.data(); } - -protected: - wxString& m_str; - wxCharTypeBuffer m_buf; -}; - -template -class wxStringTypeBufferLengthBase : public wxStringTypeBufferBase -{ -public: - wxStringTypeBufferLengthBase(wxString& str, size_t lenWanted = 1024) - : wxStringTypeBufferBase(str, lenWanted), - m_len(0), - m_lenSet(false) - { } - - ~wxStringTypeBufferLengthBase() - { - wxASSERT_MSG( this->m_lenSet, "forgot to call SetLength()" ); - } - - void SetLength(size_t length) { m_len = length; m_lenSet = true; } - -protected: - size_t m_len; - bool m_lenSet; -}; - -template -class wxStringTypeBuffer : public wxStringTypeBufferBase -{ -public: - wxStringTypeBuffer(wxString& str, size_t lenWanted = 1024) - : wxStringTypeBufferBase(str, lenWanted) - { } - - ~wxStringTypeBuffer() - { - this->m_str.assign(this->m_buf.data()); - } - - wxDECLARE_NO_COPY_CLASS(wxStringTypeBuffer); -}; - -template -class wxStringTypeBufferLength : public wxStringTypeBufferLengthBase -{ -public: - wxStringTypeBufferLength(wxString& str, size_t lenWanted = 1024) - : wxStringTypeBufferLengthBase(str, lenWanted) - { } - - ~wxStringTypeBufferLength() - { - this->m_str.assign(this->m_buf.data(), this->m_len); - } - - wxDECLARE_NO_COPY_CLASS(wxStringTypeBufferLength); -}; - -#if wxUSE_STL_BASED_WXSTRING - -class wxStringInternalBuffer : public wxStringTypeBufferBase -{ -public: - wxStringInternalBuffer(wxString& str, size_t lenWanted = 1024) - : wxStringTypeBufferBase(str, lenWanted) {} - ~wxStringInternalBuffer() - { m_str.m_impl.assign(m_buf.data()); } - - wxDECLARE_NO_COPY_CLASS(wxStringInternalBuffer); -}; - -class wxStringInternalBufferLength - : public wxStringTypeBufferLengthBase -{ -public: - wxStringInternalBufferLength(wxString& str, size_t lenWanted = 1024) - : wxStringTypeBufferLengthBase(str, lenWanted) {} - - ~wxStringInternalBufferLength() - { - m_str.m_impl.assign(m_buf.data(), m_len); - } - - wxDECLARE_NO_COPY_CLASS(wxStringInternalBufferLength); -}; - -#endif // wxUSE_STL_BASED_WXSTRING - - -#if wxUSE_STL_BASED_WXSTRING || wxUSE_UNICODE_UTF8 -typedef wxStringTypeBuffer wxStringBuffer; -typedef wxStringTypeBufferLength wxStringBufferLength; -#else // if !wxUSE_STL_BASED_WXSTRING && !wxUSE_UNICODE_UTF8 -typedef wxStringInternalBuffer wxStringBuffer; -typedef wxStringInternalBufferLength wxStringBufferLength; -#endif // !wxUSE_STL_BASED_WXSTRING && !wxUSE_UNICODE_UTF8 - -#if wxUSE_UNICODE_UTF8 -typedef wxStringInternalBuffer wxUTF8StringBuffer; -typedef wxStringInternalBufferLength wxUTF8StringBufferLength; -#elif wxUSE_UNICODE_WCHAR - -// Note about inlined dtors in the classes below: this is done not for -// performance reasons but just to avoid linking errors in the MSVC DLL build -// under Windows: if a class has non-inline methods it must be declared as -// being DLL-exported but, due to an extremely interesting feature of MSVC 7 -// and later, any template class which is used as a base of a DLL-exported -// class is implicitly made DLL-exported too, as explained at the bottom of -// http://msdn.microsoft.com/en-us/library/twa2aw10.aspx (just to confirm: yes, -// _inheriting_ from a class can change whether it is being exported from DLL) -// -// But this results in link errors because the base template class is not DLL- -// exported, whether it is declared with WXDLLIMPEXP_BASE or not, because it -// does have only inline functions. So the simplest fix is to just make all the -// functions of these classes inline too. - -class wxUTF8StringBuffer : public wxStringTypeBufferBase -{ -public: - wxUTF8StringBuffer(wxString& str, size_t lenWanted = 1024) - : wxStringTypeBufferBase(str, lenWanted) {} - ~wxUTF8StringBuffer() - { - wxMBConvStrictUTF8 conv; - size_t wlen = conv.ToWChar(NULL, 0, m_buf); - wxCHECK_RET( wlen != wxCONV_FAILED, "invalid UTF-8 data in string buffer?" ); - - wxStringInternalBuffer wbuf(m_str, wlen); - conv.ToWChar(wbuf, wlen, m_buf); - } - - wxDECLARE_NO_COPY_CLASS(wxUTF8StringBuffer); -}; - -class wxUTF8StringBufferLength : public wxStringTypeBufferLengthBase -{ -public: - wxUTF8StringBufferLength(wxString& str, size_t lenWanted = 1024) - : wxStringTypeBufferLengthBase(str, lenWanted) {} - ~wxUTF8StringBufferLength() - { - wxCHECK_RET(m_lenSet, "length not set"); - - wxMBConvStrictUTF8 conv; - size_t wlen = conv.ToWChar(NULL, 0, m_buf, m_len); - wxCHECK_RET( wlen != wxCONV_FAILED, "invalid UTF-8 data in string buffer?" ); - - wxStringInternalBufferLength wbuf(m_str, wlen); - conv.ToWChar(wbuf, wlen, m_buf, m_len); - wbuf.SetLength(wlen); - } - - wxDECLARE_NO_COPY_CLASS(wxUTF8StringBufferLength); -}; -#endif // wxUSE_UNICODE_UTF8/wxUSE_UNICODE_WCHAR - - -// --------------------------------------------------------------------------- -// wxString comparison functions: operator versions are always case sensitive -// --------------------------------------------------------------------------- - -#define wxCMP_WXCHAR_STRING(p, s, op) 0 op s.Cmp(p) - -wxDEFINE_ALL_COMPARISONS(const wxChar *, const wxString&, wxCMP_WXCHAR_STRING) - -#undef wxCMP_WXCHAR_STRING - -inline bool operator==(const wxString& s1, const wxString& s2) - { return s1.IsSameAs(s2); } -inline bool operator!=(const wxString& s1, const wxString& s2) - { return !s1.IsSameAs(s2); } -inline bool operator< (const wxString& s1, const wxString& s2) - { return s1.Cmp(s2) < 0; } -inline bool operator> (const wxString& s1, const wxString& s2) - { return s1.Cmp(s2) > 0; } -inline bool operator<=(const wxString& s1, const wxString& s2) - { return s1.Cmp(s2) <= 0; } -inline bool operator>=(const wxString& s1, const wxString& s2) - { return s1.Cmp(s2) >= 0; } - -inline bool operator==(const wxString& s1, const wxCStrData& s2) - { return s1 == s2.AsString(); } -inline bool operator==(const wxCStrData& s1, const wxString& s2) - { return s1.AsString() == s2; } -inline bool operator!=(const wxString& s1, const wxCStrData& s2) - { return s1 != s2.AsString(); } -inline bool operator!=(const wxCStrData& s1, const wxString& s2) - { return s1.AsString() != s2; } - -inline bool operator==(const wxString& s1, const wxScopedWCharBuffer& s2) - { return (s1.Cmp((const wchar_t *)s2) == 0); } -inline bool operator==(const wxScopedWCharBuffer& s1, const wxString& s2) - { return (s2.Cmp((const wchar_t *)s1) == 0); } -inline bool operator!=(const wxString& s1, const wxScopedWCharBuffer& s2) - { return (s1.Cmp((const wchar_t *)s2) != 0); } -inline bool operator!=(const wxScopedWCharBuffer& s1, const wxString& s2) - { return (s2.Cmp((const wchar_t *)s1) != 0); } - -inline bool operator==(const wxString& s1, const wxScopedCharBuffer& s2) - { return (s1.Cmp((const char *)s2) == 0); } -inline bool operator==(const wxScopedCharBuffer& s1, const wxString& s2) - { return (s2.Cmp((const char *)s1) == 0); } -inline bool operator!=(const wxString& s1, const wxScopedCharBuffer& s2) - { return (s1.Cmp((const char *)s2) != 0); } -inline bool operator!=(const wxScopedCharBuffer& s1, const wxString& s2) - { return (s2.Cmp((const char *)s1) != 0); } - -inline wxString operator+(const wxString& string, const wxScopedWCharBuffer& buf) - { return string + (const wchar_t *)buf; } -inline wxString operator+(const wxScopedWCharBuffer& buf, const wxString& string) - { return (const wchar_t *)buf + string; } - -inline wxString operator+(const wxString& string, const wxScopedCharBuffer& buf) - { return string + (const char *)buf; } -inline wxString operator+(const wxScopedCharBuffer& buf, const wxString& string) - { return (const char *)buf + string; } - -// comparison with char -inline bool operator==(const wxUniChar& c, const wxString& s) { return s.IsSameAs(c); } -inline bool operator==(const wxUniCharRef& c, const wxString& s) { return s.IsSameAs(c); } -inline bool operator==(char c, const wxString& s) { return s.IsSameAs(c); } -inline bool operator==(wchar_t c, const wxString& s) { return s.IsSameAs(c); } -inline bool operator==(int c, const wxString& s) { return s.IsSameAs(c); } -inline bool operator==(const wxString& s, const wxUniChar& c) { return s.IsSameAs(c); } -inline bool operator==(const wxString& s, const wxUniCharRef& c) { return s.IsSameAs(c); } -inline bool operator==(const wxString& s, char c) { return s.IsSameAs(c); } -inline bool operator==(const wxString& s, wchar_t c) { return s.IsSameAs(c); } -inline bool operator!=(const wxUniChar& c, const wxString& s) { return !s.IsSameAs(c); } -inline bool operator!=(const wxUniCharRef& c, const wxString& s) { return !s.IsSameAs(c); } -inline bool operator!=(char c, const wxString& s) { return !s.IsSameAs(c); } -inline bool operator!=(wchar_t c, const wxString& s) { return !s.IsSameAs(c); } -inline bool operator!=(int c, const wxString& s) { return !s.IsSameAs(c); } -inline bool operator!=(const wxString& s, const wxUniChar& c) { return !s.IsSameAs(c); } -inline bool operator!=(const wxString& s, const wxUniCharRef& c) { return !s.IsSameAs(c); } -inline bool operator!=(const wxString& s, char c) { return !s.IsSameAs(c); } -inline bool operator!=(const wxString& s, wchar_t c) { return !s.IsSameAs(c); } - - -// wxString iterators comparisons -inline bool wxString::iterator::operator==(const const_iterator& i) const - { return i == *this; } -inline bool wxString::iterator::operator!=(const const_iterator& i) const - { return i != *this; } -inline bool wxString::iterator::operator<(const const_iterator& i) const - { return i > *this; } -inline bool wxString::iterator::operator>(const const_iterator& i) const - { return i < *this; } -inline bool wxString::iterator::operator<=(const const_iterator& i) const - { return i >= *this; } -inline bool wxString::iterator::operator>=(const const_iterator& i) const - { return i <= *this; } - -// comparison with C string in Unicode build -#if wxUSE_UNICODE - -#define wxCMP_CHAR_STRING(p, s, op) wxString(p) op s - -wxDEFINE_ALL_COMPARISONS(const char *, const wxString&, wxCMP_CHAR_STRING) - -#undef wxCMP_CHAR_STRING - -#endif // wxUSE_UNICODE - -// we also need to provide the operators for comparison with wxCStrData to -// resolve ambiguity between operator(const wxChar *,const wxString &) and -// operator(const wxChar *, const wxChar *) for "p == s.c_str()" -// -// notice that these are (shallow) pointer comparisons, not (deep) string ones -#define wxCMP_CHAR_CSTRDATA(p, s, op) p op s.AsChar() -#define wxCMP_WCHAR_CSTRDATA(p, s, op) p op s.AsWChar() - -wxDEFINE_ALL_COMPARISONS(const wchar_t *, const wxCStrData&, wxCMP_WCHAR_CSTRDATA) -wxDEFINE_ALL_COMPARISONS(const char *, const wxCStrData&, wxCMP_CHAR_CSTRDATA) - -#undef wxCMP_CHAR_CSTRDATA -#undef wxCMP_WCHAR_CSTRDATA - -// ---------------------------------------------------------------------------- -// Implement hashing using C++11 std::hash<>. -// ---------------------------------------------------------------------------- - -// Check for both compiler and standard library support for C++11: normally the -// former implies the latter but under Mac OS X < 10.7 C++11 compiler can (and -// even has to be) used with non-C++11 standard library, so explicitly exclude -// this case. -#if (__cplusplus >= 201103L || wxCHECK_VISUALC_VERSION(10)) \ - && ( (!defined __GLIBCXX__) || (__GLIBCXX__ > 20070719) ) - -// Don't do this if ToStdWstring() is not available. We could work around it -// but, presumably, if using std::wstring is undesirable, then so is using -// std::hash<> anyhow. -#if wxUSE_STD_STRING - -#include - -namespace std -{ - template<> - struct hash - { - size_t operator()(const wxString& s) const - { - return std::hash()(s.ToStdWstring()); - } - }; -} // namespace std - -#endif // wxUSE_STD_STRING - -#endif // C++11 - -// --------------------------------------------------------------------------- -// Implementation only from here until the end of file -// --------------------------------------------------------------------------- - -#if wxUSE_STD_IOSTREAM - -#include "wx/iosfwrap.h" - -WXDLLIMPEXP_BASE wxSTD ostream& operator<<(wxSTD ostream&, const wxString&); -WXDLLIMPEXP_BASE wxSTD ostream& operator<<(wxSTD ostream&, const wxCStrData&); -WXDLLIMPEXP_BASE wxSTD ostream& operator<<(wxSTD ostream&, const wxScopedCharBuffer&); -#ifndef __BORLANDC__ -WXDLLIMPEXP_BASE wxSTD ostream& operator<<(wxSTD ostream&, const wxScopedWCharBuffer&); -#endif - -#if wxUSE_UNICODE && defined(HAVE_WOSTREAM) - -WXDLLIMPEXP_BASE wxSTD wostream& operator<<(wxSTD wostream&, const wxString&); -WXDLLIMPEXP_BASE wxSTD wostream& operator<<(wxSTD wostream&, const wxCStrData&); -WXDLLIMPEXP_BASE wxSTD wostream& operator<<(wxSTD wostream&, const wxScopedWCharBuffer&); - -#endif // wxUSE_UNICODE && defined(HAVE_WOSTREAM) - -#endif // wxUSE_STD_IOSTREAM - -// --------------------------------------------------------------------------- -// wxCStrData implementation -// --------------------------------------------------------------------------- - -inline wxCStrData::wxCStrData(char *buf) - : m_str(new wxString(buf)), m_offset(0), m_owned(true) {} -inline wxCStrData::wxCStrData(wchar_t *buf) - : m_str(new wxString(buf)), m_offset(0), m_owned(true) {} - -inline wxCStrData::wxCStrData(const wxCStrData& data) - : m_str(data.m_owned ? new wxString(*data.m_str) : data.m_str), - m_offset(data.m_offset), - m_owned(data.m_owned) -{ -} - -inline wxCStrData::~wxCStrData() -{ - if ( m_owned ) - delete const_cast(m_str); // cast to silence warnings -} - -// AsChar() and AsWChar() implementations simply forward to wxString methods - -inline const wchar_t* wxCStrData::AsWChar() const -{ - const wchar_t * const p = -#if wxUSE_UNICODE_WCHAR - m_str->wc_str(); -#elif wxUSE_UNICODE_UTF8 - m_str->AsWChar(wxMBConvStrictUTF8()); -#else - m_str->AsWChar(wxConvLibc); -#endif - - // in Unicode build the string always has a valid Unicode representation - // and even if a conversion is needed (as in UTF8 case) it can't fail - // - // but in ANSI build the string contents might be not convertible to - // Unicode using the current locale encoding so we do need to check for - // errors -#if !wxUSE_UNICODE - if ( !p ) - { - // if conversion fails, return empty string and not NULL to avoid - // crashes in code written with either wxWidgets 2 wxString or - // std::string behaviour in mind: neither of them ever returns NULL - // from its c_str() and so we shouldn't neither - // - // notice that the same is done in AsChar() below and - // wxString::wc_str() and mb_str() for the same reasons - return L""; - } -#endif // !wxUSE_UNICODE - - return p + m_offset; -} - -inline const char* wxCStrData::AsChar() const -{ -#if wxUSE_UNICODE && !wxUSE_UTF8_LOCALE_ONLY - const char * const p = m_str->AsChar(wxConvLibc); - if ( !p ) - return ""; -#else // !wxUSE_UNICODE || wxUSE_UTF8_LOCALE_ONLY - const char * const p = m_str->mb_str(); -#endif // wxUSE_UNICODE && !wxUSE_UTF8_LOCALE_ONLY - - return p + m_offset; -} - -inline wxString wxCStrData::AsString() const -{ - if ( m_offset == 0 ) - return *m_str; - else - return m_str->Mid(m_offset); -} - -inline const wxStringCharType *wxCStrData::AsInternal() const -{ -#if wxUSE_UNICODE_UTF8 - return wxStringOperations::AddToIter(m_str->wx_str(), m_offset); -#else - return m_str->wx_str() + m_offset; -#endif -} - -inline wxUniChar wxCStrData::operator*() const -{ - if ( m_str->empty() ) - return wxUniChar(wxT('\0')); - else - return (*m_str)[m_offset]; -} - -inline wxUniChar wxCStrData::operator[](size_t n) const -{ - // NB: we intentionally use operator[] and not at() here because the former - // works for the terminating NUL while the latter does not - return (*m_str)[m_offset + n]; -} - -// ---------------------------------------------------------------------------- -// more wxCStrData operators -// ---------------------------------------------------------------------------- - -// we need to define those to allow "size_t pos = p - s.c_str()" where p is -// some pointer into the string -inline size_t operator-(const char *p, const wxCStrData& cs) -{ - return p - cs.AsChar(); -} - -inline size_t operator-(const wchar_t *p, const wxCStrData& cs) -{ - return p - cs.AsWChar(); -} - -// ---------------------------------------------------------------------------- -// implementation of wx[W]CharBuffer inline methods using wxCStrData -// ---------------------------------------------------------------------------- - -// FIXME-UTF8: move this to buffer.h -inline wxCharBuffer::wxCharBuffer(const wxCStrData& cstr) - : wxCharTypeBufferBase(cstr.AsCharBuf()) -{ -} - -inline wxWCharBuffer::wxWCharBuffer(const wxCStrData& cstr) - : wxCharTypeBufferBase(cstr.AsWCharBuf()) -{ -} - -#if wxUSE_UNICODE_UTF8 -// ---------------------------------------------------------------------------- -// implementation of wxStringIteratorNode inline methods -// ---------------------------------------------------------------------------- - -void wxStringIteratorNode::DoSet(const wxString *str, - wxStringImpl::const_iterator *citer, - wxStringImpl::iterator *iter) -{ - m_prev = NULL; - m_iter = iter; - m_citer = citer; - m_str = str; - if ( str ) - { - m_next = str->m_iterators.ptr; - const_cast(m_str)->m_iterators.ptr = this; - if ( m_next ) - m_next->m_prev = this; - } - else - { - m_next = NULL; - } -} - -void wxStringIteratorNode::clear() -{ - if ( m_next ) - m_next->m_prev = m_prev; - if ( m_prev ) - m_prev->m_next = m_next; - else if ( m_str ) // first in the list - const_cast(m_str)->m_iterators.ptr = m_next; - - m_next = m_prev = NULL; - m_citer = NULL; - m_iter = NULL; - m_str = NULL; -} -#endif // wxUSE_UNICODE_UTF8 - -#if WXWIN_COMPATIBILITY_2_8 - // lot of code out there doesn't explicitly include wx/crt.h, but uses - // CRT wrappers that are now declared in wx/wxcrt.h and wx/wxcrtvararg.h, - // so let's include this header now that wxString is defined and it's safe - // to do it: - #include "wx/crt.h" -#endif - -// ---------------------------------------------------------------------------- -// Checks on wxString characters -// ---------------------------------------------------------------------------- - -template - inline bool wxStringCheck(const wxString& val) - { - for ( wxString::const_iterator i = val.begin(); - i != val.end(); - ++i ) - if (T(*i) == 0) - return false; - return true; - } - -#endif // _WX_WXSTRING_H_ diff --git a/Externals/wxWidgets3/include/wx/stringimpl.h b/Externals/wxWidgets3/include/wx/stringimpl.h deleted file mode 100644 index e46bb800de..0000000000 --- a/Externals/wxWidgets3/include/wx/stringimpl.h +++ /dev/null @@ -1,557 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/stringimpl.h -// Purpose: wxStringImpl class, implementation of wxString -// Author: Vadim Zeitlin -// Modified by: -// Created: 29/01/98 -// Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -/* - This header implements std::string-like string class, wxStringImpl, that is - used by wxString to store the data. Alternatively, if wxUSE_STD_STRING=1, - wxStringImpl is just a typedef to std:: string class. -*/ - -#ifndef _WX_WXSTRINGIMPL_H__ -#define _WX_WXSTRINGIMPL_H__ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/defs.h" // everybody should include this -#include "wx/chartype.h" // for wxChar -#include "wx/wxcrtbase.h" // for wxStrlen() etc. - -#include - -// --------------------------------------------------------------------------- -// macros -// --------------------------------------------------------------------------- - -// implementation only -#define wxASSERT_VALID_INDEX(i) \ - wxASSERT_MSG( (size_t)(i) <= length(), wxT("invalid index in wxString") ) - - -// ---------------------------------------------------------------------------- -// global data -// ---------------------------------------------------------------------------- - -// global pointer to empty string -extern WXDLLIMPEXP_DATA_BASE(const wxChar*) wxEmptyString; -#if wxUSE_UNICODE_UTF8 -// FIXME-UTF8: we should have only one wxEmptyString -extern WXDLLIMPEXP_DATA_BASE(const wxStringCharType*) wxEmptyStringImpl; -#endif - - -// ---------------------------------------------------------------------------- -// deal with various build options -// ---------------------------------------------------------------------------- - -// we use STL-based string internally if we use std::string at all now, there -// should be no reason to prefer our internal implement but if you really need -// it you can predefine wxUSE_STL_BASED_WXSTRING as 0 when building the library -#ifndef wxUSE_STL_BASED_WXSTRING - #define wxUSE_STL_BASED_WXSTRING wxUSE_STD_STRING -#endif - -// in both cases we need to define wxStdString -#if wxUSE_STL_BASED_WXSTRING || wxUSE_STD_STRING - -#include "wx/beforestd.h" -#include -#include "wx/afterstd.h" - -#ifdef HAVE_STD_WSTRING - typedef std::wstring wxStdWideString; -#else - typedef std::basic_string wxStdWideString; -#endif - -#if wxUSE_UNICODE_WCHAR - typedef wxStdWideString wxStdString; -#else - typedef std::string wxStdString; -#endif - -#endif // wxUSE_STL_BASED_WXSTRING || wxUSE_STD_STRING - - -#if wxUSE_STL_BASED_WXSTRING - - // we always want ctor from std::string when using std::string internally - #undef wxUSE_STD_STRING - #define wxUSE_STD_STRING 1 - - typedef wxStdString wxStringImpl; -#else // if !wxUSE_STL_BASED_WXSTRING - -// in non-STL mode, compare() is implemented in wxString and not wxStringImpl -#undef HAVE_STD_STRING_COMPARE - -// --------------------------------------------------------------------------- -// string data prepended with some housekeeping info (used by wxString class), -// is never used directly (but had to be put here to allow inlining) -// --------------------------------------------------------------------------- - -struct WXDLLIMPEXP_BASE wxStringData -{ - int nRefs; // reference count - size_t nDataLength, // actual string length - nAllocLength; // allocated memory size - - // mimics declaration 'wxStringCharType data[nAllocLength]' - wxStringCharType* data() const { return (wxStringCharType*)(this + 1); } - - // empty string has a special ref count so it's never deleted - bool IsEmpty() const { return (nRefs == -1); } - bool IsShared() const { return (nRefs > 1); } - - // lock/unlock - void Lock() { if ( !IsEmpty() ) nRefs++; } - - // VC++ will refuse to inline Unlock but profiling shows that it is wrong -#if defined(__VISUALC__) - __forceinline -#endif - // VC++ free must take place in same DLL as allocation when using non dll - // run-time library (e.g. Multithreaded instead of Multithreaded DLL) -#if defined(__VISUALC__) && defined(_MT) && !defined(_DLL) - void Unlock() { if ( !IsEmpty() && --nRefs == 0) Free(); } - // we must not inline deallocation since allocation is not inlined - void Free(); -#else - void Unlock() { if ( !IsEmpty() && --nRefs == 0) free(this); } -#endif - - // if we had taken control over string memory (GetWriteBuf), it's - // intentionally put in invalid state - void Validate(bool b) { nRefs = (b ? 1 : 0); } - bool IsValid() const { return (nRefs != 0); } -}; - -class WXDLLIMPEXP_BASE wxStringImpl -{ -public: - // an 'invalid' value for string index, moved to this place due to a CW bug - static const size_t npos; - -protected: - // points to data preceded by wxStringData structure with ref count info - wxStringCharType *m_pchData; - - // accessor to string data - wxStringData* GetStringData() const { return (wxStringData*)m_pchData - 1; } - - // string (re)initialization functions - // initializes the string to the empty value (must be called only from - // ctors, use Reinit() otherwise) -#if wxUSE_UNICODE_UTF8 - void Init() { m_pchData = (wxStringCharType *)wxEmptyStringImpl; } // FIXME-UTF8 -#else - void Init() { m_pchData = (wxStringCharType *)wxEmptyString; } -#endif - // initializes the string with (a part of) C-string - void InitWith(const wxStringCharType *psz, size_t nPos = 0, size_t nLen = npos); - // as Init, but also frees old data - void Reinit() { GetStringData()->Unlock(); Init(); } - - // memory allocation - // allocates memory for string of length nLen - bool AllocBuffer(size_t nLen); - // effectively copies data to string - bool AssignCopy(size_t, const wxStringCharType *); - - // append a (sub)string - bool ConcatSelf(size_t nLen, const wxStringCharType *src, size_t nMaxLen); - bool ConcatSelf(size_t nLen, const wxStringCharType *src) - { return ConcatSelf(nLen, src, nLen); } - - // functions called before writing to the string: they copy it if there - // are other references to our data (should be the only owner when writing) - bool CopyBeforeWrite(); - bool AllocBeforeWrite(size_t); - - // compatibility with wxString - bool Alloc(size_t nLen); - -public: - // standard types - typedef wxStringCharType value_type; - typedef wxStringCharType char_type; - typedef size_t size_type; - typedef value_type& reference; - typedef const value_type& const_reference; - typedef value_type* pointer; - typedef const value_type* const_pointer; - - // macro to define the bulk of iterator and const_iterator classes - #define WX_DEFINE_STRINGIMPL_ITERATOR(iterator_name, ref_type, ptr_type) \ - public: \ - typedef wxStringCharType value_type; \ - typedef ref_type reference; \ - typedef ptr_type pointer; \ - typedef int difference_type; \ - \ - iterator_name() : m_ptr(NULL) { } \ - iterator_name(pointer ptr) : m_ptr(ptr) { } \ - \ - reference operator*() const { return *m_ptr; } \ - \ - iterator_name& operator++() { m_ptr++; return *this; } \ - iterator_name operator++(int) \ - { \ - const iterator_name tmp(*this); \ - m_ptr++; \ - return tmp; \ - } \ - \ - iterator_name& operator--() { m_ptr--; return *this; } \ - iterator_name operator--(int) \ - { \ - const iterator_name tmp(*this); \ - m_ptr--; \ - return tmp; \ - } \ - \ - iterator_name operator+(ptrdiff_t n) const \ - { return iterator_name(m_ptr + n); } \ - iterator_name operator-(ptrdiff_t n) const \ - { return iterator_name(m_ptr - n); } \ - iterator_name& operator+=(ptrdiff_t n) \ - { m_ptr += n; return *this; } \ - iterator_name& operator-=(ptrdiff_t n) \ - { m_ptr -= n; return *this; } \ - \ - difference_type operator-(const iterator_name& i) const \ - { return m_ptr - i.m_ptr; } \ - \ - bool operator==(const iterator_name& i) const \ - { return m_ptr == i.m_ptr; } \ - bool operator!=(const iterator_name& i) const \ - { return m_ptr != i.m_ptr; } \ - \ - bool operator<(const iterator_name& i) const \ - { return m_ptr < i.m_ptr; } \ - bool operator>(const iterator_name& i) const \ - { return m_ptr > i.m_ptr; } \ - bool operator<=(const iterator_name& i) const \ - { return m_ptr <= i.m_ptr; } \ - bool operator>=(const iterator_name& i) const \ - { return m_ptr >= i.m_ptr; } \ - \ - private: \ - /* for wxStringImpl use only */ \ - pointer GetPtr() const { return m_ptr; } \ - \ - friend class wxStringImpl; \ - \ - pointer m_ptr - - // we need to declare const_iterator in wxStringImpl scope, the friend - // declaration inside iterator class itself is not enough, or at least not - // for g++ 3.4 (g++ 4 is ok) - class WXDLLIMPEXP_FWD_BASE const_iterator; - - class WXDLLIMPEXP_BASE iterator - { - WX_DEFINE_STRINGIMPL_ITERATOR(iterator, - wxStringCharType&, - wxStringCharType*); - - friend class const_iterator; - }; - - class WXDLLIMPEXP_BASE const_iterator - { - public: - const_iterator(iterator i) : m_ptr(i.m_ptr) { } - - WX_DEFINE_STRINGIMPL_ITERATOR(const_iterator, - const wxStringCharType&, - const wxStringCharType*); - }; - - #undef WX_DEFINE_STRINGIMPL_ITERATOR - - - // constructors and destructor - // ctor for an empty string - wxStringImpl() { Init(); } - // copy ctor - wxStringImpl(const wxStringImpl& stringSrc) - { - wxASSERT_MSG( stringSrc.GetStringData()->IsValid(), - wxT("did you forget to call UngetWriteBuf()?") ); - - if ( stringSrc.empty() ) { - // nothing to do for an empty string - Init(); - } - else { - m_pchData = stringSrc.m_pchData; // share same data - GetStringData()->Lock(); // => one more copy - } - } - // string containing nRepeat copies of ch - wxStringImpl(size_type nRepeat, wxStringCharType ch); - // ctor takes first nLength characters from C string - // (default value of npos means take all the string) - wxStringImpl(const wxStringCharType *psz) - { InitWith(psz, 0, npos); } - wxStringImpl(const wxStringCharType *psz, size_t nLength) - { InitWith(psz, 0, nLength); } - // take nLen chars starting at nPos - wxStringImpl(const wxStringImpl& str, size_t nPos, size_t nLen) - { - wxASSERT_MSG( str.GetStringData()->IsValid(), - wxT("did you forget to call UngetWriteBuf()?") ); - Init(); - size_t strLen = str.length() - nPos; nLen = strLen < nLen ? strLen : nLen; - InitWith(str.c_str(), nPos, nLen); - } - // take everything between start and end - wxStringImpl(const_iterator start, const_iterator end); - - - // ctor from and conversion to std::string -#if wxUSE_STD_STRING - wxStringImpl(const wxStdString& impl) - { InitWith(impl.c_str(), 0, impl.length()); } - - operator wxStdString() const - { return wxStdString(c_str(), length()); } -#endif - -#if defined(__VISUALC__) - // disable warning about Unlock() below not being inlined (first, it - // seems to be inlined nevertheless and second, even if it isn't, there - // is nothing we can do about this - #pragma warning(push) - #pragma warning (disable:4714) -#endif - - // dtor is not virtual, this class must not be inherited from! - ~wxStringImpl() - { - GetStringData()->Unlock(); - } - -#if defined(__VISUALC__) - #pragma warning(pop) -#endif - - // overloaded assignment - // from another wxString - wxStringImpl& operator=(const wxStringImpl& stringSrc); - // from a character - wxStringImpl& operator=(wxStringCharType ch); - // from a C string - wxStringImpl& operator=(const wxStringCharType *psz); - - // return the length of the string - size_type length() const { return GetStringData()->nDataLength; } - // return the length of the string - size_type size() const { return length(); } - // return the maximum size of the string - size_type max_size() const { return npos; } - // resize the string, filling the space with c if c != 0 - void resize(size_t nSize, wxStringCharType ch = '\0'); - // delete the contents of the string - void clear() { erase(0, npos); } - // returns true if the string is empty - bool empty() const { return length() == 0; } - // inform string about planned change in size - void reserve(size_t sz) { Alloc(sz); } - size_type capacity() const { return GetStringData()->nAllocLength; } - - // lib.string.access - // return the character at position n - value_type operator[](size_type n) const { return m_pchData[n]; } - value_type at(size_type n) const - { wxASSERT_VALID_INDEX( n ); return m_pchData[n]; } - // returns the writable character at position n - reference operator[](size_type n) { CopyBeforeWrite(); return m_pchData[n]; } - reference at(size_type n) - { - wxASSERT_VALID_INDEX( n ); - CopyBeforeWrite(); - return m_pchData[n]; - } // FIXME-UTF8: not useful for us...? - - // lib.string.modifiers - // append elements str[pos], ..., str[pos+n] - wxStringImpl& append(const wxStringImpl& str, size_t pos, size_t n) - { - wxASSERT(pos <= str.length()); - ConcatSelf(n, str.c_str() + pos, str.length() - pos); - return *this; - } - // append a string - wxStringImpl& append(const wxStringImpl& str) - { ConcatSelf(str.length(), str.c_str()); return *this; } - // append first n (or all if n == npos) characters of sz - wxStringImpl& append(const wxStringCharType *sz) - { ConcatSelf(wxStrlen(sz), sz); return *this; } - wxStringImpl& append(const wxStringCharType *sz, size_t n) - { ConcatSelf(n, sz); return *this; } - // append n copies of ch - wxStringImpl& append(size_t n, wxStringCharType ch); - // append from first to last - wxStringImpl& append(const_iterator first, const_iterator last) - { ConcatSelf(last - first, first.GetPtr()); return *this; } - - // same as `this_string = str' - wxStringImpl& assign(const wxStringImpl& str) - { return *this = str; } - // same as ` = str[pos..pos + n] - wxStringImpl& assign(const wxStringImpl& str, size_t pos, size_t n) - { return replace(0, npos, str, pos, n); } - // same as `= first n (or all if n == npos) characters of sz' - wxStringImpl& assign(const wxStringCharType *sz) - { return replace(0, npos, sz, wxStrlen(sz)); } - wxStringImpl& assign(const wxStringCharType *sz, size_t n) - { return replace(0, npos, sz, n); } - // same as `= n copies of ch' - wxStringImpl& assign(size_t n, wxStringCharType ch) - { return replace(0, npos, n, ch); } - // assign from first to last - wxStringImpl& assign(const_iterator first, const_iterator last) - { return replace(begin(), end(), first, last); } - - // first valid index position - const_iterator begin() const { return m_pchData; } - iterator begin(); - // position one after the last valid one - const_iterator end() const { return m_pchData + length(); } - iterator end(); - - // insert another string - wxStringImpl& insert(size_t nPos, const wxStringImpl& str) - { - wxASSERT( str.GetStringData()->IsValid() ); - return insert(nPos, str.c_str(), str.length()); - } - // insert n chars of str starting at nStart (in str) - wxStringImpl& insert(size_t nPos, const wxStringImpl& str, size_t nStart, size_t n) - { - wxASSERT( str.GetStringData()->IsValid() ); - wxASSERT( nStart < str.length() ); - size_t strLen = str.length() - nStart; - n = strLen < n ? strLen : n; - return insert(nPos, str.c_str() + nStart, n); - } - // insert first n (or all if n == npos) characters of sz - wxStringImpl& insert(size_t nPos, const wxStringCharType *sz, size_t n = npos); - // insert n copies of ch - wxStringImpl& insert(size_t nPos, size_t n, wxStringCharType ch) - { return insert(nPos, wxStringImpl(n, ch)); } - iterator insert(iterator it, wxStringCharType ch) - { size_t idx = it - begin(); insert(idx, 1, ch); return begin() + idx; } - void insert(iterator it, const_iterator first, const_iterator last) - { insert(it - begin(), first.GetPtr(), last - first); } - void insert(iterator it, size_type n, wxStringCharType ch) - { insert(it - begin(), n, ch); } - - // delete characters from nStart to nStart + nLen - wxStringImpl& erase(size_type pos = 0, size_type n = npos); - iterator erase(iterator first, iterator last) - { - size_t idx = first - begin(); - erase(idx, last - first); - return begin() + idx; - } - iterator erase(iterator first); - - // explicit conversion to C string (use this with printf()!) - const wxStringCharType* c_str() const { return m_pchData; } - const wxStringCharType* data() const { return m_pchData; } - - // replaces the substring of length nLen starting at nStart - wxStringImpl& replace(size_t nStart, size_t nLen, const wxStringCharType* sz) - { return replace(nStart, nLen, sz, npos); } - // replaces the substring of length nLen starting at nStart - wxStringImpl& replace(size_t nStart, size_t nLen, const wxStringImpl& str) - { return replace(nStart, nLen, str.c_str(), str.length()); } - // replaces the substring with nCount copies of ch - wxStringImpl& replace(size_t nStart, size_t nLen, - size_t nCount, wxStringCharType ch) - { return replace(nStart, nLen, wxStringImpl(nCount, ch)); } - // replaces a substring with another substring - wxStringImpl& replace(size_t nStart, size_t nLen, - const wxStringImpl& str, size_t nStart2, size_t nLen2) - { return replace(nStart, nLen, str.substr(nStart2, nLen2)); } - // replaces the substring with first nCount chars of sz - wxStringImpl& replace(size_t nStart, size_t nLen, - const wxStringCharType* sz, size_t nCount); - - wxStringImpl& replace(iterator first, iterator last, const_pointer s) - { return replace(first - begin(), last - first, s); } - wxStringImpl& replace(iterator first, iterator last, const_pointer s, - size_type n) - { return replace(first - begin(), last - first, s, n); } - wxStringImpl& replace(iterator first, iterator last, const wxStringImpl& s) - { return replace(first - begin(), last - first, s); } - wxStringImpl& replace(iterator first, iterator last, size_type n, wxStringCharType c) - { return replace(first - begin(), last - first, n, c); } - wxStringImpl& replace(iterator first, iterator last, - const_iterator first1, const_iterator last1) - { return replace(first - begin(), last - first, first1.GetPtr(), last1 - first1); } - - // swap two strings - void swap(wxStringImpl& str); - - // All find() functions take the nStart argument which specifies the - // position to start the search on, the default value is 0. All functions - // return npos if there were no match. - - // find a substring - size_t find(const wxStringImpl& str, size_t nStart = 0) const; - - // find first n characters of sz - size_t find(const wxStringCharType* sz, size_t nStart = 0, size_t n = npos) const; - - // find the first occurrence of character ch after nStart - size_t find(wxStringCharType ch, size_t nStart = 0) const; - - // rfind() family is exactly like find() but works right to left - - // as find, but from the end - size_t rfind(const wxStringImpl& str, size_t nStart = npos) const; - - // as find, but from the end - size_t rfind(const wxStringCharType* sz, size_t nStart = npos, - size_t n = npos) const; - // as find, but from the end - size_t rfind(wxStringCharType ch, size_t nStart = npos) const; - - size_type copy(wxStringCharType* s, size_type n, size_type pos = 0); - - // substring extraction - wxStringImpl substr(size_t nStart = 0, size_t nLen = npos) const; - - // string += string - wxStringImpl& operator+=(const wxStringImpl& s) { return append(s); } - // string += C string - wxStringImpl& operator+=(const wxStringCharType *psz) { return append(psz); } - // string += char - wxStringImpl& operator+=(wxStringCharType ch) { return append(1, ch); } - - // helpers for wxStringBuffer and wxStringBufferLength - wxStringCharType *DoGetWriteBuf(size_t nLen); - void DoUngetWriteBuf(); - void DoUngetWriteBuf(size_t nLen); - - friend class WXDLLIMPEXP_FWD_BASE wxString; -}; - -#endif // !wxUSE_STL_BASED_WXSTRING - -// don't pollute the library user's name space -#undef wxASSERT_VALID_INDEX - -#endif // _WX_WXSTRINGIMPL_H__ diff --git a/Externals/wxWidgets3/include/wx/stringops.h b/Externals/wxWidgets3/include/wx/stringops.h deleted file mode 100644 index 21c6121787..0000000000 --- a/Externals/wxWidgets3/include/wx/stringops.h +++ /dev/null @@ -1,172 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/stringops.h -// Purpose: implementation of wxString primitive operations -// Author: Vaclav Slavik -// Modified by: -// Created: 2007-04-16 -// Copyright: (c) 2007 REA Elektronik GmbH -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_WXSTRINGOPS_H__ -#define _WX_WXSTRINGOPS_H__ - -#include "wx/chartype.h" -#include "wx/stringimpl.h" -#include "wx/unichar.h" -#include "wx/buffer.h" - -// This header contains wxStringOperations "namespace" class that implements -// elementary operations on string data as static methods; wxString methods and -// iterators are implemented in terms of it. Two implementations are available, -// one for UTF-8 encoded char* string and one for "raw" wchar_t* strings (or -// char* in ANSI build). - -// FIXME-UTF8: only wchar after we remove ANSI build -#if wxUSE_UNICODE_WCHAR || !wxUSE_UNICODE -struct WXDLLIMPEXP_BASE wxStringOperationsWchar -{ - // moves the iterator to the next Unicode character - template - static void IncIter(Iterator& i) { ++i; } - - // moves the iterator to the previous Unicode character - template - static void DecIter(Iterator& i) { --i; } - - // moves the iterator by n Unicode characters - template - static Iterator AddToIter(const Iterator& i, ptrdiff_t n) - { return i + n; } - - // returns distance of the two iterators in Unicode characters - template - static ptrdiff_t DiffIters(const Iterator& i1, const Iterator& i2) - { return i1 - i2; } - - // encodes the character to a form used to represent it in internal - // representation (returns a string in UTF8 version) - static wxChar EncodeChar(const wxUniChar& ch) { return (wxChar)ch; } - - static wxUniChar DecodeChar(const wxStringImpl::const_iterator& i) - { return *i; } -}; -#endif // wxUSE_UNICODE_WCHAR || !wxUSE_UNICODE - - -#if wxUSE_UNICODE_UTF8 -struct WXDLLIMPEXP_BASE wxStringOperationsUtf8 -{ - // checks correctness of UTF-8 sequence - static bool IsValidUtf8String(const char *c, - size_t len = wxStringImpl::npos); - static bool IsValidUtf8LeadByte(unsigned char c) - { - return (c <= 0x7F) || (c >= 0xC2 && c <= 0xF4); - } - - // table of offsets to skip forward when iterating over UTF-8 sequence - static const unsigned char ms_utf8IterTable[256]; - - - template - static void IncIter(Iterator& i) - { - wxASSERT( IsValidUtf8LeadByte(*i) ); - i += ms_utf8IterTable[(unsigned char)*i]; - } - - template - static void DecIter(Iterator& i) - { - // Non-lead bytes are all in the 0x80..0xBF range (i.e. 10xxxxxx in - // binary), so we just have to go back until we hit a byte that is - // either < 0x80 (i.e. 0xxxxxxx in binary) or 0xC0..0xFF (11xxxxxx in - // binary; this includes some invalid values, but we can ignore it - // here, because we assume valid UTF-8 input for the purpose of - // efficient implementation). - --i; - while ( ((*i) & 0xC0) == 0x80 /* 2 highest bits are '10' */ ) - --i; - } - - template - static Iterator AddToIter(const Iterator& i, ptrdiff_t n) - { - Iterator out(i); - - if ( n > 0 ) - { - for ( ptrdiff_t j = 0; j < n; ++j ) - IncIter(out); - } - else if ( n < 0 ) - { - for ( ptrdiff_t j = 0; j > n; --j ) - DecIter(out); - } - - return out; - } - - template - static ptrdiff_t DiffIters(Iterator i1, Iterator i2) - { - ptrdiff_t dist = 0; - - if ( i1 < i2 ) - { - while ( i1 != i2 ) - { - IncIter(i1); - dist--; - } - } - else if ( i2 < i1 ) - { - while ( i2 != i1 ) - { - IncIter(i2); - dist++; - } - } - - return dist; - } - - // encodes the character as UTF-8: - typedef wxUniChar::Utf8CharBuffer Utf8CharBuffer; - static Utf8CharBuffer EncodeChar(const wxUniChar& ch) - { return ch.AsUTF8(); } - - // returns n copies of ch encoded in UTF-8 string - static wxCharBuffer EncodeNChars(size_t n, const wxUniChar& ch); - - // returns the length of UTF-8 encoding of the character with lead byte 'c' - static size_t GetUtf8CharLength(char c) - { - wxASSERT( IsValidUtf8LeadByte(c) ); - return ms_utf8IterTable[(unsigned char)c]; - } - - // decodes single UTF-8 character from UTF-8 string - static wxUniChar DecodeChar(wxStringImpl::const_iterator i) - { - if ( (unsigned char)*i < 0x80 ) - return (int)*i; - return DecodeNonAsciiChar(i); - } - -private: - static wxUniChar DecodeNonAsciiChar(wxStringImpl::const_iterator i); -}; -#endif // wxUSE_UNICODE_UTF8 - - -#if wxUSE_UNICODE_UTF8 -typedef wxStringOperationsUtf8 wxStringOperations; -#else -typedef wxStringOperationsWchar wxStringOperations; -#endif - -#endif // _WX_WXSTRINGOPS_H_ diff --git a/Externals/wxWidgets3/include/wx/strvararg.h b/Externals/wxWidgets3/include/wx/strvararg.h deleted file mode 100644 index 468cbf8bbb..0000000000 --- a/Externals/wxWidgets3/include/wx/strvararg.h +++ /dev/null @@ -1,1159 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/strvararg.h -// Purpose: macros for implementing type-safe vararg passing of strings -// Author: Vaclav Slavik -// Created: 2007-02-19 -// Copyright: (c) 2007 REA Elektronik GmbH -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_STRVARARG_H_ -#define _WX_STRVARARG_H_ - -#include "wx/platform.h" - -#include "wx/cpp.h" -#include "wx/chartype.h" -#include "wx/strconv.h" -#include "wx/buffer.h" -#include "wx/unichar.h" - -#if defined(HAVE_TYPE_TRAITS) - #include -#elif defined(HAVE_TR1_TYPE_TRAITS) - #ifdef __VISUALC__ - #include - #else - #include - #endif -#endif - -class WXDLLIMPEXP_FWD_BASE wxCStrData; -class WXDLLIMPEXP_FWD_BASE wxString; - -// ---------------------------------------------------------------------------- -// WX_DEFINE_VARARG_FUNC* macros -// ---------------------------------------------------------------------------- - -// This macro is used to implement type-safe wrappers for variadic functions -// that accept strings as arguments. This makes it possible to pass char*, -// wchar_t* or even wxString (as opposed to having to use wxString::c_str()) -// to e.g. wxPrintf(). -// -// This is done by defining a set of N template function taking 1..N arguments -// (currently, N is set to 30 in this header). These functions are just thin -// wrappers around another variadic function ('impl' or 'implUtf8' arguments, -// see below) and the only thing the wrapper does is that it normalizes the -// arguments passed in so that they are of the type expected by variadic -// functions taking string arguments, i.e., char* or wchar_t*, depending on the -// build: -// * char* in the current locale's charset in ANSI build -// * char* with UTF-8 encoding if wxUSE_UNICODE_UTF8 and the app is running -// under an UTF-8 locale -// * wchar_t* if wxUSE_UNICODE_WCHAR or if wxUSE_UNICODE_UTF8 and the current -// locale is not UTF-8 -// -// Note that wxFormatString *must* be used for the format parameter of these -// functions, otherwise the implementation won't work correctly. Furthermore, -// it must be passed by value, not reference, because it's modified by the -// vararg templates internally. -// -// Parameters: -// [ there are examples in square brackets showing values of the parameters -// for the wxFprintf() wrapper for fprintf() function with the following -// prototype: -// int wxFprintf(FILE *stream, const wxString& format, ...); ] -// -// rettype Functions' return type [int] -// name Name of the function [fprintf] -// numfixed The number of leading "fixed" (i.e., not variadic) -// arguments of the function (e.g. "stream" and "format" -// arguments of fprintf()); their type is _not_ converted -// using wxArgNormalizer, unlike the rest of -// the function's arguments [2] -// fixed List of types of the leading "fixed" arguments, in -// parenthesis [(FILE*,const wxString&)] -// impl Name of the variadic function that implements 'name' for -// the native strings representation (wchar_t* if -// wxUSE_UNICODE_WCHAR or wxUSE_UNICODE_UTF8 when running under -// non-UTF8 locale, char* in ANSI build) [wxCrt_Fprintf] -// implUtf8 Like 'impl', but for the UTF-8 char* version to be used -// if wxUSE_UNICODE_UTF8 and running under UTF-8 locale -// (ignored otherwise) [fprintf] -// -#define WX_DEFINE_VARARG_FUNC(rettype, name, numfixed, fixed, impl, implUtf8) \ - _WX_VARARG_DEFINE_FUNC_N0(rettype, name, impl, implUtf8, numfixed, fixed) \ - WX_DEFINE_VARARG_FUNC_SANS_N0(rettype, name, numfixed, fixed, impl, implUtf8) - -// ditto, but without the version with 0 template/vararg arguments -#define WX_DEFINE_VARARG_FUNC_SANS_N0(rettype, name, \ - numfixed, fixed, impl, implUtf8) \ - _WX_VARARG_ITER(_WX_VARARG_MAX_ARGS, \ - _WX_VARARG_DEFINE_FUNC, \ - rettype, name, impl, implUtf8, numfixed, fixed) - -// Like WX_DEFINE_VARARG_FUNC, but for variadic functions that don't return -// a value. -#define WX_DEFINE_VARARG_FUNC_VOID(name, numfixed, fixed, impl, implUtf8) \ - _WX_VARARG_DEFINE_FUNC_VOID_N0(name, impl, implUtf8, numfixed, fixed) \ - _WX_VARARG_ITER(_WX_VARARG_MAX_ARGS, \ - _WX_VARARG_DEFINE_FUNC_VOID, \ - void, name, impl, implUtf8, numfixed, fixed) - -// Like WX_DEFINE_VARARG_FUNC_VOID, but instead of wrapping an implementation -// function, does nothing in defined functions' bodies. -// -// Used to implement wxLogXXX functions if wxUSE_LOG=0. -#define WX_DEFINE_VARARG_FUNC_NOP(name, numfixed, fixed) \ - _WX_VARARG_DEFINE_FUNC_NOP_N0(name, numfixed, fixed) \ - _WX_VARARG_ITER(_WX_VARARG_MAX_ARGS, \ - _WX_VARARG_DEFINE_FUNC_NOP, \ - void, name, dummy, dummy, numfixed, fixed) - -// Like WX_DEFINE_VARARG_FUNC_CTOR, but for defining template constructors -#define WX_DEFINE_VARARG_FUNC_CTOR(name, numfixed, fixed, impl, implUtf8) \ - _WX_VARARG_DEFINE_FUNC_CTOR_N0(name, impl, implUtf8, numfixed, fixed) \ - _WX_VARARG_ITER(_WX_VARARG_MAX_ARGS, \ - _WX_VARARG_DEFINE_FUNC_CTOR, \ - void, name, impl, implUtf8, numfixed, fixed) - - -// ---------------------------------------------------------------------------- -// wxFormatString -// ---------------------------------------------------------------------------- - -// This class must be used for format string argument of the functions -// defined using WX_DEFINE_VARARG_FUNC_* macros. It converts the string to -// char* or wchar_t* for passing to implementation function efficiently (i.e. -// without keeping the converted string in memory for longer than necessary, -// like c_str()). It also converts format string to the correct form that -// accounts for string changes done by wxArgNormalizer<> -// -// Note that this class can _only_ be used for function arguments! -class WXDLLIMPEXP_BASE wxFormatString -{ -public: - wxFormatString(const char *str) - : m_char(wxScopedCharBuffer::CreateNonOwned(str)), m_str(NULL), m_cstr(NULL) {} - wxFormatString(const wchar_t *str) - : m_wchar(wxScopedWCharBuffer::CreateNonOwned(str)), m_str(NULL), m_cstr(NULL) {} - wxFormatString(const wxString& str) - : m_str(&str), m_cstr(NULL) {} - wxFormatString(const wxCStrData& str) - : m_str(NULL), m_cstr(&str) {} - wxFormatString(const wxScopedCharBuffer& str) - : m_char(str), m_str(NULL), m_cstr(NULL) {} - wxFormatString(const wxScopedWCharBuffer& str) - : m_wchar(str), m_str(NULL), m_cstr(NULL) {} - - // Possible argument types. These are or-combinable for wxASSERT_ARG_TYPE - // convenience. Some of the values are or-combined with another value, this - // expresses "supertypes" for use with wxASSERT_ARG_TYPE masks. For example, - // a char* string is also a pointer and an integer is also a char. - enum ArgumentType - { - Arg_Unused = 0, // not used at all; the value of 0 is chosen to - // conveniently pass wxASSERT_ARG_TYPE's check - - Arg_Char = 0x0001, // character as char %c - Arg_Pointer = 0x0002, // %p - Arg_String = 0x0004 | Arg_Pointer, // any form of string (%s and %p too) - - Arg_Int = 0x0008 | Arg_Char, // (ints can be used with %c) -#if SIZEOF_INT == SIZEOF_LONG - Arg_LongInt = Arg_Int, -#else - Arg_LongInt = 0x0010, -#endif -#if defined(SIZEOF_LONG_LONG) && SIZEOF_LONG_LONG == SIZEOF_LONG - Arg_LongLongInt = Arg_LongInt, -#elif defined(wxLongLong_t) - Arg_LongLongInt = 0x0020, -#endif - - Arg_Double = 0x0040, - Arg_LongDouble = 0x0080, - -#if defined(wxSIZE_T_IS_UINT) - Arg_Size_t = Arg_Int, -#elif defined(wxSIZE_T_IS_ULONG) - Arg_Size_t = Arg_LongInt, -#elif defined(SIZEOF_LONG_LONG) && SIZEOF_SIZE_T == SIZEOF_LONG_LONG - Arg_Size_t = Arg_LongLongInt, -#else - Arg_Size_t = 0x0100, -#endif - - Arg_IntPtr = 0x0200, // %n -- store # of chars written - Arg_ShortIntPtr = 0x0400, - Arg_LongIntPtr = 0x0800, - - Arg_Unknown = 0x8000 // unrecognized specifier (likely error) - }; - - // returns the type of format specifier for n-th variadic argument (this is - // not necessarily n-th format specifier if positional specifiers are used); - // called by wxArgNormalizer<> specializations to get information about - // n-th variadic argument desired representation - ArgumentType GetArgumentType(unsigned n) const; - - // returns the value passed to ctor, only converted to wxString, similarly - // to other InputAsXXX() methods - wxString InputAsString() const; - -#if !wxUSE_UNICODE_WCHAR - operator const char*() const - { return const_cast(this)->AsChar(); } -private: - // InputAsChar() returns the value passed to ctor, only converted - // to char, while AsChar() takes the string returned by InputAsChar() - // and does format string conversion on it as well (and similarly for - // ..AsWChar() below) - const char* InputAsChar(); - const char* AsChar(); - wxScopedCharBuffer m_convertedChar; -#endif // !wxUSE_UNICODE_WCHAR - -#if wxUSE_UNICODE && !wxUSE_UTF8_LOCALE_ONLY -public: - operator const wchar_t*() const - { return const_cast(this)->AsWChar(); } -private: - const wchar_t* InputAsWChar(); - const wchar_t* AsWChar(); - wxScopedWCharBuffer m_convertedWChar; -#endif // wxUSE_UNICODE && !wxUSE_UTF8_LOCALE_ONLY - -private: - wxScopedCharBuffer m_char; - wxScopedWCharBuffer m_wchar; - - // NB: we can use a pointer here, because wxFormatString is only used - // as function argument, so it has shorter life than the string - // passed to the ctor - const wxString * const m_str; - const wxCStrData * const m_cstr; - - wxDECLARE_NO_ASSIGN_CLASS(wxFormatString); -}; - -// these two helper classes are used to find wxFormatString argument among fixed -// arguments passed to a vararg template -struct wxFormatStringArgument -{ - wxFormatStringArgument(const wxFormatString *s = NULL) : m_str(s) {} - const wxFormatString *m_str; - - // overriding this operator allows us to reuse _WX_VARARG_JOIN macro - wxFormatStringArgument operator,(const wxFormatStringArgument& a) const - { - wxASSERT_MSG( m_str == NULL || a.m_str == NULL, - "can't have two format strings in vararg function" ); - return wxFormatStringArgument(m_str ? m_str : a.m_str); - } - - operator const wxFormatString*() const { return m_str; } -}; - -template -struct wxFormatStringArgumentFinder -{ - static wxFormatStringArgument find(T) - { - // by default, arguments are not format strings, so return "not found" - return wxFormatStringArgument(); - } -}; - -template<> -struct wxFormatStringArgumentFinder -{ - static wxFormatStringArgument find(const wxFormatString& arg) - { return wxFormatStringArgument(&arg); } -}; - -template<> -struct wxFormatStringArgumentFinder - : public wxFormatStringArgumentFinder {}; - -// avoid passing big objects by value to wxFormatStringArgumentFinder::find() -// (and especially wx[W]CharBuffer with its auto_ptr<> style semantics!): -template<> -struct wxFormatStringArgumentFinder - : public wxFormatStringArgumentFinder {}; - -template<> -struct wxFormatStringArgumentFinder - : public wxFormatStringArgumentFinder {}; - -template<> -struct wxFormatStringArgumentFinder - : public wxFormatStringArgumentFinder {}; - -template<> -struct wxFormatStringArgumentFinder - : public wxFormatStringArgumentFinder {}; - -template<> -struct wxFormatStringArgumentFinder - : public wxFormatStringArgumentFinder {}; - - -// ---------------------------------------------------------------------------- -// wxArgNormalizer* converters -// ---------------------------------------------------------------------------- - -#if wxDEBUG_LEVEL - // Check that the format specifier for index-th argument in 'fmt' has - // the correct type (one of wxFormatString::Arg_XXX or-combination in - // 'expected_mask'). - #define wxASSERT_ARG_TYPE(fmt, index, expected_mask) \ - wxSTATEMENT_MACRO_BEGIN \ - if ( !fmt ) \ - break; \ - const int argtype = fmt->GetArgumentType(index); \ - wxASSERT_MSG( (argtype & (expected_mask)) == argtype, \ - "format specifier doesn't match argument type" ); \ - wxSTATEMENT_MACRO_END -#else - // Just define it to suppress "unused parameter" warnings for the - // parameters which we don't use otherwise - #define wxASSERT_ARG_TYPE(fmt, index, expected_mask) \ - wxUnusedVar(fmt); \ - wxUnusedVar(index) -#endif // wxDEBUG_LEVEL/!wxDEBUG_LEVEL - - -#if defined(HAVE_TYPE_TRAITS) || defined(HAVE_TR1_TYPE_TRAITS) - -// Note: this type is misnamed, so that the error message is easier to -// understand (no error happens for enums, because the IsEnum=true case is -// specialized). -template -struct wxFormatStringSpecifierNonPodType {}; - -template<> -struct wxFormatStringSpecifierNonPodType -{ - enum { value = wxFormatString::Arg_Int }; -}; - -template -struct wxFormatStringSpecifier -{ -#ifdef HAVE_TYPE_TRAITS - typedef std::is_enum is_enum; -#elif defined HAVE_TR1_TYPE_TRAITS - typedef std::tr1::is_enum is_enum; -#endif - enum { value = wxFormatStringSpecifierNonPodType::value }; -}; - -#else // !HAVE_(TR1_)TYPE_TRAITS - -template -struct wxFormatStringSpecifier -{ - // We can't detect enums without is_enum, so the only thing we can - // do is to accept unknown types. However, the only acceptable unknown - // types still are enums, which are promoted to ints, so return Arg_Int - // here. This will at least catch passing of non-POD types through ... at - // runtime. - // - // Furthermore, if the compiler doesn't have partial template - // specialization, we didn't cover pointers either. -#ifdef HAVE_PARTIAL_SPECIALIZATION - enum { value = wxFormatString::Arg_Int }; -#else - enum { value = wxFormatString::Arg_Int | wxFormatString::Arg_Pointer }; -#endif -}; - -#endif // HAVE_TR1_TYPE_TRAITS/!HAVE_TR1_TYPE_TRAITS - - -#ifdef HAVE_PARTIAL_SPECIALIZATION -template -struct wxFormatStringSpecifier -{ - enum { value = wxFormatString::Arg_Pointer }; -}; - -template -struct wxFormatStringSpecifier -{ - enum { value = wxFormatString::Arg_Pointer }; -}; -#endif // !HAVE_PARTIAL_SPECIALIZATION - - -#define wxFORMAT_STRING_SPECIFIER(T, arg) \ - template<> struct wxFormatStringSpecifier \ - { \ - enum { value = arg }; \ - }; - -wxFORMAT_STRING_SPECIFIER(bool, wxFormatString::Arg_Int) -wxFORMAT_STRING_SPECIFIER(int, wxFormatString::Arg_Int) -wxFORMAT_STRING_SPECIFIER(unsigned int, wxFormatString::Arg_Int) -wxFORMAT_STRING_SPECIFIER(short int, wxFormatString::Arg_Int) -wxFORMAT_STRING_SPECIFIER(short unsigned int, wxFormatString::Arg_Int) -wxFORMAT_STRING_SPECIFIER(long int, wxFormatString::Arg_LongInt) -wxFORMAT_STRING_SPECIFIER(long unsigned int, wxFormatString::Arg_LongInt) -#ifdef wxLongLong_t -wxFORMAT_STRING_SPECIFIER(wxLongLong_t, wxFormatString::Arg_LongLongInt) -wxFORMAT_STRING_SPECIFIER(wxULongLong_t, wxFormatString::Arg_LongLongInt) -#endif -wxFORMAT_STRING_SPECIFIER(float, wxFormatString::Arg_Double) -wxFORMAT_STRING_SPECIFIER(double, wxFormatString::Arg_Double) -wxFORMAT_STRING_SPECIFIER(long double, wxFormatString::Arg_LongDouble) - -#if wxWCHAR_T_IS_REAL_TYPE -wxFORMAT_STRING_SPECIFIER(wchar_t, wxFormatString::Arg_Char | wxFormatString::Arg_Int) -#endif - -#if !wxUSE_UNICODE -wxFORMAT_STRING_SPECIFIER(char, wxFormatString::Arg_Char | wxFormatString::Arg_Int) -wxFORMAT_STRING_SPECIFIER(signed char, wxFormatString::Arg_Char | wxFormatString::Arg_Int) -wxFORMAT_STRING_SPECIFIER(unsigned char, wxFormatString::Arg_Char | wxFormatString::Arg_Int) -#endif - -wxFORMAT_STRING_SPECIFIER(char*, wxFormatString::Arg_String) -wxFORMAT_STRING_SPECIFIER(unsigned char*, wxFormatString::Arg_String) -wxFORMAT_STRING_SPECIFIER(signed char*, wxFormatString::Arg_String) -wxFORMAT_STRING_SPECIFIER(const char*, wxFormatString::Arg_String) -wxFORMAT_STRING_SPECIFIER(const unsigned char*, wxFormatString::Arg_String) -wxFORMAT_STRING_SPECIFIER(const signed char*, wxFormatString::Arg_String) -wxFORMAT_STRING_SPECIFIER(wchar_t*, wxFormatString::Arg_String) -wxFORMAT_STRING_SPECIFIER(const wchar_t*, wxFormatString::Arg_String) - -wxFORMAT_STRING_SPECIFIER(int*, wxFormatString::Arg_IntPtr | wxFormatString::Arg_Pointer) -wxFORMAT_STRING_SPECIFIER(short int*, wxFormatString::Arg_ShortIntPtr | wxFormatString::Arg_Pointer) -wxFORMAT_STRING_SPECIFIER(long int*, wxFormatString::Arg_LongIntPtr | wxFormatString::Arg_Pointer) - -#undef wxFORMAT_STRING_SPECIFIER - - -// Converts an argument passed to wxPrint etc. into standard form expected, -// by wxXXX functions, e.g. all strings (wxString, char*, wchar_t*) are -// converted into wchar_t* or char* depending on the build. -template -struct wxArgNormalizer -{ - // Ctor. 'value' is the value passed as variadic argument, 'fmt' is pointer - // to printf-like format string or NULL if the variadic function doesn't - // use format string and 'index' is index of 'value' in variadic arguments - // list (starting at 1) - wxArgNormalizer(T value, - const wxFormatString *fmt, unsigned index) - : m_value(value) - { - wxASSERT_ARG_TYPE( fmt, index, wxFormatStringSpecifier::value ); - } - - // Returns the value in a form that can be safely passed to real vararg - // functions. In case of strings, this is char* in ANSI build and wchar_t* - // in Unicode build. - T get() const { return m_value; } - - T m_value; -}; - -// normalizer for passing arguments to functions working with wchar_t* (and -// until ANSI build is removed, char* in ANSI build as well - FIXME-UTF8) -// string representation -#if !wxUSE_UTF8_LOCALE_ONLY -template -struct wxArgNormalizerWchar : public wxArgNormalizer -{ - wxArgNormalizerWchar(T value, - const wxFormatString *fmt, unsigned index) - : wxArgNormalizer(value, fmt, index) {} -}; -#endif // !wxUSE_UTF8_LOCALE_ONLY - -// normalizer for passing arguments to functions working with UTF-8 encoded -// char* strings -#if wxUSE_UNICODE_UTF8 - template - struct wxArgNormalizerUtf8 : public wxArgNormalizer - { - wxArgNormalizerUtf8(T value, - const wxFormatString *fmt, unsigned index) - : wxArgNormalizer(value, fmt, index) {} - }; - - #define wxArgNormalizerNative wxArgNormalizerUtf8 -#else // wxUSE_UNICODE_WCHAR - #define wxArgNormalizerNative wxArgNormalizerWchar -#endif // wxUSE_UNICODE_UTF8 // wxUSE_UNICODE_UTF8 - - - -// special cases for converting strings: - - -// base class for wxArgNormalizer specializations that need to do conversion; -// CharType is either wxStringCharType or wchar_t in UTF-8 build when wrapping -// widechar CRT function -template -struct wxArgNormalizerWithBuffer -{ - typedef wxScopedCharTypeBuffer CharBuffer; - - wxArgNormalizerWithBuffer() {} - wxArgNormalizerWithBuffer(const CharBuffer& buf, - const wxFormatString *fmt, - unsigned index) - : m_value(buf) - { - wxASSERT_ARG_TYPE( fmt, index, wxFormatString::Arg_String ); - } - - const CharType *get() const { return m_value; } - - CharBuffer m_value; -}; - -// string objects: -template<> -struct WXDLLIMPEXP_BASE wxArgNormalizerNative -{ - wxArgNormalizerNative(const wxString& s, - const wxFormatString *fmt, - unsigned index) - : m_value(s) - { - wxASSERT_ARG_TYPE( fmt, index, wxFormatString::Arg_String ); - } - - const wxStringCharType *get() const; - - const wxString& m_value; -}; - -// c_str() values: -template<> -struct WXDLLIMPEXP_BASE wxArgNormalizerNative -{ - wxArgNormalizerNative(const wxCStrData& value, - const wxFormatString *fmt, - unsigned index) - : m_value(value) - { - wxASSERT_ARG_TYPE( fmt, index, wxFormatString::Arg_String ); - } - - const wxStringCharType *get() const; - - const wxCStrData& m_value; -}; - -// wxString/wxCStrData conversion to wchar_t* value -#if wxUSE_UNICODE_UTF8 && !wxUSE_UTF8_LOCALE_ONLY -template<> -struct WXDLLIMPEXP_BASE wxArgNormalizerWchar - : public wxArgNormalizerWithBuffer -{ - wxArgNormalizerWchar(const wxString& s, - const wxFormatString *fmt, unsigned index); -}; - -template<> -struct WXDLLIMPEXP_BASE wxArgNormalizerWchar - : public wxArgNormalizerWithBuffer -{ - wxArgNormalizerWchar(const wxCStrData& s, - const wxFormatString *fmt, unsigned index); -}; -#endif // wxUSE_UNICODE_UTF8 && !wxUSE_UTF8_LOCALE_ONLY - - -// C string pointers of the wrong type (wchar_t* for ANSI or UTF8 build, -// char* for wchar_t Unicode build or UTF8): -#if wxUSE_UNICODE_WCHAR - -template<> -struct wxArgNormalizerWchar - : public wxArgNormalizerWithBuffer -{ - wxArgNormalizerWchar(const char* s, - const wxFormatString *fmt, unsigned index) - : wxArgNormalizerWithBuffer(wxConvLibc.cMB2WC(s), fmt, index) {} -}; - -#elif wxUSE_UNICODE_UTF8 - -template<> -struct wxArgNormalizerUtf8 - : public wxArgNormalizerWithBuffer -{ - wxArgNormalizerUtf8(const wchar_t* s, - const wxFormatString *fmt, unsigned index) - : wxArgNormalizerWithBuffer(wxConvUTF8.cWC2MB(s), fmt, index) {} -}; - -template<> -struct wxArgNormalizerUtf8 - : public wxArgNormalizerWithBuffer -{ - wxArgNormalizerUtf8(const char* s, - const wxFormatString *fmt, - unsigned index) - { - wxASSERT_ARG_TYPE( fmt, index, wxFormatString::Arg_String ); - - if ( wxLocaleIsUtf8 ) - { - m_value = wxScopedCharBuffer::CreateNonOwned(s); - } - else - { - // convert to widechar string first: - wxScopedWCharBuffer buf(wxConvLibc.cMB2WC(s)); - - // then to UTF-8: - if ( buf ) - m_value = wxConvUTF8.cWC2MB(buf); - } - } -}; - -// UTF-8 build needs conversion to wchar_t* too: -#if !wxUSE_UTF8_LOCALE_ONLY -template<> -struct wxArgNormalizerWchar - : public wxArgNormalizerWithBuffer -{ - wxArgNormalizerWchar(const char* s, - const wxFormatString *fmt, unsigned index) - : wxArgNormalizerWithBuffer(wxConvLibc.cMB2WC(s), fmt, index) {} -}; -#endif // !wxUSE_UTF8_LOCALE_ONLY - -#else // ANSI - FIXME-UTF8 - -template<> -struct wxArgNormalizerWchar - : public wxArgNormalizerWithBuffer -{ - wxArgNormalizerWchar(const wchar_t* s, - const wxFormatString *fmt, unsigned index) - : wxArgNormalizerWithBuffer(wxConvLibc.cWC2MB(s), fmt, index) {} -}; - -#endif // wxUSE_UNICODE_WCHAR/wxUSE_UNICODE_UTF8/ANSI - - -// this macro is used to implement specialization that are exactly same as -// some other specialization, i.e. to "forward" the implementation (e.g. for -// T=wxString and T=const wxString&). Note that the ctor takes BaseT argument, -// not T! -#if wxUSE_UNICODE_UTF8 - #if wxUSE_UTF8_LOCALE_ONLY - #define WX_ARG_NORMALIZER_FORWARD(T, BaseT) \ - _WX_ARG_NORMALIZER_FORWARD_IMPL(wxArgNormalizerUtf8, T, BaseT) - #else // possibly non-UTF8 locales - #define WX_ARG_NORMALIZER_FORWARD(T, BaseT) \ - _WX_ARG_NORMALIZER_FORWARD_IMPL(wxArgNormalizerWchar, T, BaseT); \ - _WX_ARG_NORMALIZER_FORWARD_IMPL(wxArgNormalizerUtf8, T, BaseT) - #endif -#else // wxUSE_UNICODE_WCHAR - #define WX_ARG_NORMALIZER_FORWARD(T, BaseT) \ - _WX_ARG_NORMALIZER_FORWARD_IMPL(wxArgNormalizerWchar, T, BaseT) -#endif // wxUSE_UNICODE_UTF8/wxUSE_UNICODE_WCHAR - -#define _WX_ARG_NORMALIZER_FORWARD_IMPL(Normalizer, T, BaseT) \ - template<> \ - struct Normalizer : public Normalizer \ - { \ - Normalizer(BaseT value, \ - const wxFormatString *fmt, unsigned index) \ - : Normalizer(value, fmt, index) {} \ - } - -// non-reference versions of specializations for string objects -WX_ARG_NORMALIZER_FORWARD(wxString, const wxString&); -WX_ARG_NORMALIZER_FORWARD(wxCStrData, const wxCStrData&); - -// versions for passing non-const pointers: -WX_ARG_NORMALIZER_FORWARD(char*, const char*); -WX_ARG_NORMALIZER_FORWARD(wchar_t*, const wchar_t*); - -// versions for passing wx[W]CharBuffer: -WX_ARG_NORMALIZER_FORWARD(wxScopedCharBuffer, const char*); -WX_ARG_NORMALIZER_FORWARD(const wxScopedCharBuffer&, const char*); -WX_ARG_NORMALIZER_FORWARD(wxScopedWCharBuffer, const wchar_t*); -WX_ARG_NORMALIZER_FORWARD(const wxScopedWCharBuffer&, const wchar_t*); -WX_ARG_NORMALIZER_FORWARD(wxCharBuffer, const char*); -WX_ARG_NORMALIZER_FORWARD(const wxCharBuffer&, const char*); -WX_ARG_NORMALIZER_FORWARD(wxWCharBuffer, const wchar_t*); -WX_ARG_NORMALIZER_FORWARD(const wxWCharBuffer&, const wchar_t*); - -// versions for std::[w]string: -#if wxUSE_STD_STRING - -#include "wx/stringimpl.h" - -#if !wxUSE_UTF8_LOCALE_ONLY -template<> -struct wxArgNormalizerWchar - : public wxArgNormalizerWchar -{ - wxArgNormalizerWchar(const std::string& s, - const wxFormatString *fmt, unsigned index) - : wxArgNormalizerWchar(s.c_str(), fmt, index) {} -}; - -template<> -struct wxArgNormalizerWchar - : public wxArgNormalizerWchar -{ - wxArgNormalizerWchar(const wxStdWideString& s, - const wxFormatString *fmt, unsigned index) - : wxArgNormalizerWchar(s.c_str(), fmt, index) {} -}; -#endif // !wxUSE_UTF8_LOCALE_ONLY - -#if wxUSE_UNICODE_UTF8 -template<> -struct wxArgNormalizerUtf8 - : public wxArgNormalizerUtf8 -{ - wxArgNormalizerUtf8(const std::string& s, - const wxFormatString *fmt, unsigned index) - : wxArgNormalizerUtf8(s.c_str(), fmt, index) {} -}; - -template<> -struct wxArgNormalizerUtf8 - : public wxArgNormalizerUtf8 -{ - wxArgNormalizerUtf8(const wxStdWideString& s, - const wxFormatString *fmt, unsigned index) - : wxArgNormalizerUtf8(s.c_str(), fmt, index) {} -}; -#endif // wxUSE_UNICODE_UTF8 - -WX_ARG_NORMALIZER_FORWARD(std::string, const std::string&); -WX_ARG_NORMALIZER_FORWARD(wxStdWideString, const wxStdWideString&); - -#endif // wxUSE_STD_STRING - - -// versions for wxUniChar, wxUniCharRef: -// (this is same for UTF-8 and Wchar builds, we just convert to wchar_t) -template<> -struct wxArgNormalizer : public wxArgNormalizer -{ - wxArgNormalizer(const wxUniChar& s, - const wxFormatString *fmt, unsigned index) - : wxArgNormalizer(wx_truncate_cast(wchar_t, s.GetValue()), fmt, index) {} -}; - -// for wchar_t, default handler does the right thing - -// char has to be treated differently in Unicode builds: a char argument may -// be used either for a character value (which should be converted into -// wxUniChar) or as an integer value (which should be left as-is). We take -// advantage of the fact that both char and wchar_t are converted into int -// in variadic arguments here. -#if wxUSE_UNICODE -template -struct wxArgNormalizerNarrowChar -{ - wxArgNormalizerNarrowChar(T value, - const wxFormatString *fmt, unsigned index) - { - wxASSERT_ARG_TYPE( fmt, index, - wxFormatString::Arg_Char | wxFormatString::Arg_Int ); - - // FIXME-UTF8: which one is better default in absence of fmt string - // (i.e. when used like e.g. Foo("foo", "bar", 'c', NULL)? - if ( !fmt || fmt->GetArgumentType(index) == wxFormatString::Arg_Char ) - m_value = wx_truncate_cast(T, wxUniChar(value).GetValue()); - else - m_value = value; - } - - int get() const { return m_value; } - - T m_value; -}; - -template<> -struct wxArgNormalizer : public wxArgNormalizerNarrowChar -{ - wxArgNormalizer(char value, - const wxFormatString *fmt, unsigned index) - : wxArgNormalizerNarrowChar(value, fmt, index) {} -}; - -template<> -struct wxArgNormalizer - : public wxArgNormalizerNarrowChar -{ - wxArgNormalizer(unsigned char value, - const wxFormatString *fmt, unsigned index) - : wxArgNormalizerNarrowChar(value, fmt, index) {} -}; - -template<> -struct wxArgNormalizer - : public wxArgNormalizerNarrowChar -{ - wxArgNormalizer(signed char value, - const wxFormatString *fmt, unsigned index) - : wxArgNormalizerNarrowChar(value, fmt, index) {} -}; - -#endif // wxUSE_UNICODE - -// convert references: -WX_ARG_NORMALIZER_FORWARD(wxUniChar, const wxUniChar&); -WX_ARG_NORMALIZER_FORWARD(const wxUniCharRef&, const wxUniChar&); -WX_ARG_NORMALIZER_FORWARD(wxUniCharRef, const wxUniChar&); -WX_ARG_NORMALIZER_FORWARD(const wchar_t&, wchar_t); - -WX_ARG_NORMALIZER_FORWARD(const char&, char); -WX_ARG_NORMALIZER_FORWARD(const unsigned char&, unsigned char); -WX_ARG_NORMALIZER_FORWARD(const signed char&, signed char); - - -#undef WX_ARG_NORMALIZER_FORWARD -#undef _WX_ARG_NORMALIZER_FORWARD_IMPL - -// NB: Don't #undef wxASSERT_ARG_TYPE here as it's also used in wx/longlong.h. - -// ---------------------------------------------------------------------------- -// WX_VA_ARG_STRING -// ---------------------------------------------------------------------------- - -// Replacement for va_arg() for use with strings in functions that accept -// strings normalized by wxArgNormalizer: - -struct WXDLLIMPEXP_BASE wxArgNormalizedString -{ - wxArgNormalizedString(const void* ptr) : m_ptr(ptr) {} - - // returns true if non-NULL string was passed in - bool IsValid() const { return m_ptr != NULL; } - operator bool() const { return IsValid(); } - - // extracts the string, returns empty string if NULL was passed in - wxString GetString() const; - operator wxString() const; - -private: - const void *m_ptr; -}; - -#define WX_VA_ARG_STRING(ap) wxArgNormalizedString(va_arg(ap, const void*)) - -// ---------------------------------------------------------------------------- -// implementation of the WX_DEFINE_VARARG_* macros -// ---------------------------------------------------------------------------- - -// NB: The vararg emulation code is limited to 30 variadic and 4 fixed -// arguments at the moment. -// If you need more variadic arguments, you need to -// 1) increase the value of _WX_VARARG_MAX_ARGS -// 2) add _WX_VARARG_JOIN_* and _WX_VARARG_ITER_* up to the new -// _WX_VARARG_MAX_ARGS value to the lists below -// If you need more fixed arguments, you need to -// 1) increase the value of _WX_VARARG_MAX_FIXED_ARGS -// 2) add _WX_VARARG_FIXED_EXPAND_* and _WX_VARARG_FIXED_UNUSED_EXPAND_* -// macros below -#define _WX_VARARG_MAX_ARGS 30 -#define _WX_VARARG_MAX_FIXED_ARGS 4 - -#define _WX_VARARG_JOIN_1(m) m(1) -#define _WX_VARARG_JOIN_2(m) _WX_VARARG_JOIN_1(m), m(2) -#define _WX_VARARG_JOIN_3(m) _WX_VARARG_JOIN_2(m), m(3) -#define _WX_VARARG_JOIN_4(m) _WX_VARARG_JOIN_3(m), m(4) -#define _WX_VARARG_JOIN_5(m) _WX_VARARG_JOIN_4(m), m(5) -#define _WX_VARARG_JOIN_6(m) _WX_VARARG_JOIN_5(m), m(6) -#define _WX_VARARG_JOIN_7(m) _WX_VARARG_JOIN_6(m), m(7) -#define _WX_VARARG_JOIN_8(m) _WX_VARARG_JOIN_7(m), m(8) -#define _WX_VARARG_JOIN_9(m) _WX_VARARG_JOIN_8(m), m(9) -#define _WX_VARARG_JOIN_10(m) _WX_VARARG_JOIN_9(m), m(10) -#define _WX_VARARG_JOIN_11(m) _WX_VARARG_JOIN_10(m), m(11) -#define _WX_VARARG_JOIN_12(m) _WX_VARARG_JOIN_11(m), m(12) -#define _WX_VARARG_JOIN_13(m) _WX_VARARG_JOIN_12(m), m(13) -#define _WX_VARARG_JOIN_14(m) _WX_VARARG_JOIN_13(m), m(14) -#define _WX_VARARG_JOIN_15(m) _WX_VARARG_JOIN_14(m), m(15) -#define _WX_VARARG_JOIN_16(m) _WX_VARARG_JOIN_15(m), m(16) -#define _WX_VARARG_JOIN_17(m) _WX_VARARG_JOIN_16(m), m(17) -#define _WX_VARARG_JOIN_18(m) _WX_VARARG_JOIN_17(m), m(18) -#define _WX_VARARG_JOIN_19(m) _WX_VARARG_JOIN_18(m), m(19) -#define _WX_VARARG_JOIN_20(m) _WX_VARARG_JOIN_19(m), m(20) -#define _WX_VARARG_JOIN_21(m) _WX_VARARG_JOIN_20(m), m(21) -#define _WX_VARARG_JOIN_22(m) _WX_VARARG_JOIN_21(m), m(22) -#define _WX_VARARG_JOIN_23(m) _WX_VARARG_JOIN_22(m), m(23) -#define _WX_VARARG_JOIN_24(m) _WX_VARARG_JOIN_23(m), m(24) -#define _WX_VARARG_JOIN_25(m) _WX_VARARG_JOIN_24(m), m(25) -#define _WX_VARARG_JOIN_26(m) _WX_VARARG_JOIN_25(m), m(26) -#define _WX_VARARG_JOIN_27(m) _WX_VARARG_JOIN_26(m), m(27) -#define _WX_VARARG_JOIN_28(m) _WX_VARARG_JOIN_27(m), m(28) -#define _WX_VARARG_JOIN_29(m) _WX_VARARG_JOIN_28(m), m(29) -#define _WX_VARARG_JOIN_30(m) _WX_VARARG_JOIN_29(m), m(30) - -#define _WX_VARARG_ITER_1(m,a,b,c,d,e,f) m(1,a,b,c,d,e,f) -#define _WX_VARARG_ITER_2(m,a,b,c,d,e,f) _WX_VARARG_ITER_1(m,a,b,c,d,e,f) m(2,a,b,c,d,e,f) -#define _WX_VARARG_ITER_3(m,a,b,c,d,e,f) _WX_VARARG_ITER_2(m,a,b,c,d,e,f) m(3,a,b,c,d,e,f) -#define _WX_VARARG_ITER_4(m,a,b,c,d,e,f) _WX_VARARG_ITER_3(m,a,b,c,d,e,f) m(4,a,b,c,d,e,f) -#define _WX_VARARG_ITER_5(m,a,b,c,d,e,f) _WX_VARARG_ITER_4(m,a,b,c,d,e,f) m(5,a,b,c,d,e,f) -#define _WX_VARARG_ITER_6(m,a,b,c,d,e,f) _WX_VARARG_ITER_5(m,a,b,c,d,e,f) m(6,a,b,c,d,e,f) -#define _WX_VARARG_ITER_7(m,a,b,c,d,e,f) _WX_VARARG_ITER_6(m,a,b,c,d,e,f) m(7,a,b,c,d,e,f) -#define _WX_VARARG_ITER_8(m,a,b,c,d,e,f) _WX_VARARG_ITER_7(m,a,b,c,d,e,f) m(8,a,b,c,d,e,f) -#define _WX_VARARG_ITER_9(m,a,b,c,d,e,f) _WX_VARARG_ITER_8(m,a,b,c,d,e,f) m(9,a,b,c,d,e,f) -#define _WX_VARARG_ITER_10(m,a,b,c,d,e,f) _WX_VARARG_ITER_9(m,a,b,c,d,e,f) m(10,a,b,c,d,e,f) -#define _WX_VARARG_ITER_11(m,a,b,c,d,e,f) _WX_VARARG_ITER_10(m,a,b,c,d,e,f) m(11,a,b,c,d,e,f) -#define _WX_VARARG_ITER_12(m,a,b,c,d,e,f) _WX_VARARG_ITER_11(m,a,b,c,d,e,f) m(12,a,b,c,d,e,f) -#define _WX_VARARG_ITER_13(m,a,b,c,d,e,f) _WX_VARARG_ITER_12(m,a,b,c,d,e,f) m(13,a,b,c,d,e,f) -#define _WX_VARARG_ITER_14(m,a,b,c,d,e,f) _WX_VARARG_ITER_13(m,a,b,c,d,e,f) m(14,a,b,c,d,e,f) -#define _WX_VARARG_ITER_15(m,a,b,c,d,e,f) _WX_VARARG_ITER_14(m,a,b,c,d,e,f) m(15,a,b,c,d,e,f) -#define _WX_VARARG_ITER_16(m,a,b,c,d,e,f) _WX_VARARG_ITER_15(m,a,b,c,d,e,f) m(16,a,b,c,d,e,f) -#define _WX_VARARG_ITER_17(m,a,b,c,d,e,f) _WX_VARARG_ITER_16(m,a,b,c,d,e,f) m(17,a,b,c,d,e,f) -#define _WX_VARARG_ITER_18(m,a,b,c,d,e,f) _WX_VARARG_ITER_17(m,a,b,c,d,e,f) m(18,a,b,c,d,e,f) -#define _WX_VARARG_ITER_19(m,a,b,c,d,e,f) _WX_VARARG_ITER_18(m,a,b,c,d,e,f) m(19,a,b,c,d,e,f) -#define _WX_VARARG_ITER_20(m,a,b,c,d,e,f) _WX_VARARG_ITER_19(m,a,b,c,d,e,f) m(20,a,b,c,d,e,f) -#define _WX_VARARG_ITER_21(m,a,b,c,d,e,f) _WX_VARARG_ITER_20(m,a,b,c,d,e,f) m(21,a,b,c,d,e,f) -#define _WX_VARARG_ITER_22(m,a,b,c,d,e,f) _WX_VARARG_ITER_21(m,a,b,c,d,e,f) m(22,a,b,c,d,e,f) -#define _WX_VARARG_ITER_23(m,a,b,c,d,e,f) _WX_VARARG_ITER_22(m,a,b,c,d,e,f) m(23,a,b,c,d,e,f) -#define _WX_VARARG_ITER_24(m,a,b,c,d,e,f) _WX_VARARG_ITER_23(m,a,b,c,d,e,f) m(24,a,b,c,d,e,f) -#define _WX_VARARG_ITER_25(m,a,b,c,d,e,f) _WX_VARARG_ITER_24(m,a,b,c,d,e,f) m(25,a,b,c,d,e,f) -#define _WX_VARARG_ITER_26(m,a,b,c,d,e,f) _WX_VARARG_ITER_25(m,a,b,c,d,e,f) m(26,a,b,c,d,e,f) -#define _WX_VARARG_ITER_27(m,a,b,c,d,e,f) _WX_VARARG_ITER_26(m,a,b,c,d,e,f) m(27,a,b,c,d,e,f) -#define _WX_VARARG_ITER_28(m,a,b,c,d,e,f) _WX_VARARG_ITER_27(m,a,b,c,d,e,f) m(28,a,b,c,d,e,f) -#define _WX_VARARG_ITER_29(m,a,b,c,d,e,f) _WX_VARARG_ITER_28(m,a,b,c,d,e,f) m(29,a,b,c,d,e,f) -#define _WX_VARARG_ITER_30(m,a,b,c,d,e,f) _WX_VARARG_ITER_29(m,a,b,c,d,e,f) m(30,a,b,c,d,e,f) - - -#define _WX_VARARG_FIXED_EXPAND_1(t1) \ - t1 f1 -#define _WX_VARARG_FIXED_EXPAND_2(t1,t2) \ - t1 f1, t2 f2 -#define _WX_VARARG_FIXED_EXPAND_3(t1,t2,t3) \ - t1 f1, t2 f2, t3 f3 -#define _WX_VARARG_FIXED_EXPAND_4(t1,t2,t3,t4) \ - t1 f1, t2 f2, t3 f3, t4 f4 - -#define _WX_VARARG_FIXED_UNUSED_EXPAND_1(t1) \ - t1 WXUNUSED(f1) -#define _WX_VARARG_FIXED_UNUSED_EXPAND_2(t1,t2) \ - t1 WXUNUSED(f1), t2 WXUNUSED(f2) -#define _WX_VARARG_FIXED_UNUSED_EXPAND_3(t1,t2,t3) \ - t1 WXUNUSED(f1), t2 WXUNUSED(f2), t3 WXUNUSED(f3) -#define _WX_VARARG_FIXED_UNUSED_EXPAND_4(t1,t2,t3,t4) \ - t1 WXUNUSED(f1), t2 WXUNUSED(f2), t3 WXUNUSED(f3), t4 WXUNUSED(f4) - -#define _WX_VARARG_FIXED_TYPEDEFS_1(t1) \ - typedef t1 TF1 -#define _WX_VARARG_FIXED_TYPEDEFS_2(t1,t2) \ - _WX_VARARG_FIXED_TYPEDEFS_1(t1); typedef t2 TF2 -#define _WX_VARARG_FIXED_TYPEDEFS_3(t1,t2,t3) \ - _WX_VARARG_FIXED_TYPEDEFS_2(t1,t2); typedef t3 TF3 -#define _WX_VARARG_FIXED_TYPEDEFS_4(t1,t2,t3,t4) \ - _WX_VARARG_FIXED_TYPEDEFS_3(t1,t2,t3); typedef t4 TF4 - -// This macro expands N-items tuple of fixed arguments types into part of -// function's declaration. For example, -// "_WX_VARARG_FIXED_EXPAND(3, (int, char*, int))" expands into -// "int f1, char* f2, int f3". -#define _WX_VARARG_FIXED_EXPAND(N, args) \ - _WX_VARARG_FIXED_EXPAND_IMPL(N, args) -#define _WX_VARARG_FIXED_EXPAND_IMPL(N, args) \ - _WX_VARARG_FIXED_EXPAND_##N args - -// Ditto for unused arguments -#define _WX_VARARG_FIXED_UNUSED_EXPAND(N, args) \ - _WX_VARARG_FIXED_UNUSED_EXPAND_IMPL(N, args) -#define _WX_VARARG_FIXED_UNUSED_EXPAND_IMPL(N, args) \ - _WX_VARARG_FIXED_UNUSED_EXPAND_##N args - -// Declarates typedefs for fixed arguments types; i-th fixed argument types -// will have TFi typedef. -#define _WX_VARARG_FIXED_TYPEDEFS(N, args) \ - _WX_VARARG_FIXED_TYPEDEFS_IMPL(N, args) -#define _WX_VARARG_FIXED_TYPEDEFS_IMPL(N, args) \ - _WX_VARARG_FIXED_TYPEDEFS_##N args - - -// This macro calls another macro 'm' passed as second argument 'N' times, -// with its only argument set to 1..N, and concatenates the results using -// comma as separator. -// -// An example: -// #define foo(i) x##i -// // this expands to "x1,x2,x3,x4" -// _WX_VARARG_JOIN(4, foo) -// -// -// N must not be greater than _WX_VARARG_MAX_ARGS (=30). -#define _WX_VARARG_JOIN(N, m) _WX_VARARG_JOIN_IMPL(N, m) -#define _WX_VARARG_JOIN_IMPL(N, m) _WX_VARARG_JOIN_##N(m) - - -// This macro calls another macro 'm' passed as second argument 'N' times, with -// its first argument set to 1..N and the remaining arguments set to 'a', 'b', -// 'c', 'd', 'e' and 'f'. The results are separated with whitespace in the -// expansion. -// -// An example: -// // this macro expands to: -// // foo(1,a,b,c,d,e,f) -// // foo(2,a,b,c,d,e,f) -// // foo(3,a,b,c,d,e,f) -// _WX_VARARG_ITER(3, foo, a, b, c, d, e, f) -// -// N must not be greater than _WX_VARARG_MAX_ARGS (=30). -#define _WX_VARARG_ITER(N,m,a,b,c,d,e,f) \ - _WX_VARARG_ITER_IMPL(N,m,a,b,c,d,e,f) -#define _WX_VARARG_ITER_IMPL(N,m,a,b,c,d,e,f) \ - _WX_VARARG_ITER_##N(m,a,b,c,d,e,f) - -// Generates code snippet for i-th "variadic" argument in vararg function's -// prototype: -#define _WX_VARARG_ARG(i) T##i a##i - -// Like _WX_VARARG_ARG_UNUSED, but outputs argument's type with WXUNUSED: -#define _WX_VARARG_ARG_UNUSED(i) T##i WXUNUSED(a##i) - -// Generates code snippet for i-th type in vararg function's template<...>: -#define _WX_VARARG_TEMPL(i) typename T##i - -// Generates code snippet for passing i-th argument of vararg function -// wrapper to its implementation, normalizing it in the process: -#define _WX_VARARG_PASS_WCHAR(i) \ - wxArgNormalizerWchar(a##i, fmt, i).get() -#define _WX_VARARG_PASS_UTF8(i) \ - wxArgNormalizerUtf8(a##i, fmt, i).get() - - -// And the same for fixed arguments, _not_ normalizing it: -#define _WX_VARARG_PASS_FIXED(i) f##i - -#define _WX_VARARG_FIND_FMT(i) \ - (wxFormatStringArgumentFinder::find(f##i)) - -#define _WX_VARARG_FORMAT_STRING(numfixed, fixed) \ - _WX_VARARG_FIXED_TYPEDEFS(numfixed, fixed); \ - const wxFormatString *fmt = \ - (_WX_VARARG_JOIN(numfixed, _WX_VARARG_FIND_FMT)) - -#if wxUSE_UNICODE_UTF8 - #define _WX_VARARG_DO_CALL_UTF8(return_kw, impl, implUtf8, N, numfixed) \ - return_kw implUtf8(_WX_VARARG_JOIN(numfixed, _WX_VARARG_PASS_FIXED), \ - _WX_VARARG_JOIN(N, _WX_VARARG_PASS_UTF8)) - #define _WX_VARARG_DO_CALL0_UTF8(return_kw, impl, implUtf8, numfixed) \ - return_kw implUtf8(_WX_VARARG_JOIN(numfixed, _WX_VARARG_PASS_FIXED)) -#endif // wxUSE_UNICODE_UTF8 - -#define _WX_VARARG_DO_CALL_WCHAR(return_kw, impl, implUtf8, N, numfixed) \ - return_kw impl(_WX_VARARG_JOIN(numfixed, _WX_VARARG_PASS_FIXED), \ - _WX_VARARG_JOIN(N, _WX_VARARG_PASS_WCHAR)) -#define _WX_VARARG_DO_CALL0_WCHAR(return_kw, impl, implUtf8, numfixed) \ - return_kw impl(_WX_VARARG_JOIN(numfixed, _WX_VARARG_PASS_FIXED)) - -#if wxUSE_UNICODE_UTF8 - #if wxUSE_UTF8_LOCALE_ONLY - #define _WX_VARARG_DO_CALL _WX_VARARG_DO_CALL_UTF8 - #define _WX_VARARG_DO_CALL0 _WX_VARARG_DO_CALL0_UTF8 - #else // possibly non-UTF8 locales - #define _WX_VARARG_DO_CALL(return_kw, impl, implUtf8, N, numfixed) \ - if ( wxLocaleIsUtf8 ) \ - _WX_VARARG_DO_CALL_UTF8(return_kw, impl, implUtf8, N, numfixed);\ - else \ - _WX_VARARG_DO_CALL_WCHAR(return_kw, impl, implUtf8, N, numfixed) - - #define _WX_VARARG_DO_CALL0(return_kw, impl, implUtf8, numfixed) \ - if ( wxLocaleIsUtf8 ) \ - _WX_VARARG_DO_CALL0_UTF8(return_kw, impl, implUtf8, numfixed); \ - else \ - _WX_VARARG_DO_CALL0_WCHAR(return_kw, impl, implUtf8, numfixed) - #endif // wxUSE_UTF8_LOCALE_ONLY or not -#else // wxUSE_UNICODE_WCHAR or ANSI - #define _WX_VARARG_DO_CALL _WX_VARARG_DO_CALL_WCHAR - #define _WX_VARARG_DO_CALL0 _WX_VARARG_DO_CALL0_WCHAR -#endif // wxUSE_UNICODE_UTF8 / wxUSE_UNICODE_WCHAR - - -// Macro to be used with _WX_VARARG_ITER in the implementation of -// WX_DEFINE_VARARG_FUNC (see its documentation for the meaning of arguments) -#define _WX_VARARG_DEFINE_FUNC(N, rettype, name, \ - impl, implUtf8, numfixed, fixed) \ - template<_WX_VARARG_JOIN(N, _WX_VARARG_TEMPL)> \ - rettype name(_WX_VARARG_FIXED_EXPAND(numfixed, fixed), \ - _WX_VARARG_JOIN(N, _WX_VARARG_ARG)) \ - { \ - _WX_VARARG_FORMAT_STRING(numfixed, fixed); \ - _WX_VARARG_DO_CALL(return, impl, implUtf8, N, numfixed); \ - } - -#define _WX_VARARG_DEFINE_FUNC_N0(rettype, name, \ - impl, implUtf8, numfixed, fixed) \ - inline rettype name(_WX_VARARG_FIXED_EXPAND(numfixed, fixed)) \ - { \ - _WX_VARARG_DO_CALL0(return, impl, implUtf8, numfixed); \ - } - -// Macro to be used with _WX_VARARG_ITER in the implementation of -// WX_DEFINE_VARARG_FUNC_VOID (see its documentation for the meaning of -// arguments; rettype is ignored and is used only to satisfy _WX_VARARG_ITER's -// requirements). -#define _WX_VARARG_DEFINE_FUNC_VOID(N, rettype, name, \ - impl, implUtf8, numfixed, fixed) \ - template<_WX_VARARG_JOIN(N, _WX_VARARG_TEMPL)> \ - void name(_WX_VARARG_FIXED_EXPAND(numfixed, fixed), \ - _WX_VARARG_JOIN(N, _WX_VARARG_ARG)) \ - { \ - _WX_VARARG_FORMAT_STRING(numfixed, fixed); \ - _WX_VARARG_DO_CALL(wxEMPTY_PARAMETER_VALUE, \ - impl, implUtf8, N, numfixed); \ - } - -#define _WX_VARARG_DEFINE_FUNC_VOID_N0(name, impl, implUtf8, numfixed, fixed) \ - inline void name(_WX_VARARG_FIXED_EXPAND(numfixed, fixed)) \ - { \ - _WX_VARARG_DO_CALL0(wxEMPTY_PARAMETER_VALUE, \ - impl, implUtf8, numfixed); \ - } - -// Macro to be used with _WX_VARARG_ITER in the implementation of -// WX_DEFINE_VARARG_FUNC_CTOR (see its documentation for the meaning of -// arguments; rettype is ignored and is used only to satisfy _WX_VARARG_ITER's -// requirements). -#define _WX_VARARG_DEFINE_FUNC_CTOR(N, rettype, name, \ - impl, implUtf8, numfixed, fixed) \ - template<_WX_VARARG_JOIN(N, _WX_VARARG_TEMPL)> \ - name(_WX_VARARG_FIXED_EXPAND(numfixed, fixed), \ - _WX_VARARG_JOIN(N, _WX_VARARG_ARG)) \ - { \ - _WX_VARARG_FORMAT_STRING(numfixed, fixed); \ - _WX_VARARG_DO_CALL(wxEMPTY_PARAMETER_VALUE, \ - impl, implUtf8, N, numfixed); \ - } - -#define _WX_VARARG_DEFINE_FUNC_CTOR_N0(name, impl, implUtf8, numfixed, fixed) \ - inline name(_WX_VARARG_FIXED_EXPAND(numfixed, fixed)) \ - { \ - _WX_VARARG_DO_CALL0(wxEMPTY_PARAMETER_VALUE, \ - impl, implUtf8, numfixed); \ - } - -// Macro to be used with _WX_VARARG_ITER in the implementation of -// WX_DEFINE_VARARG_FUNC_NOP, i.e. empty stub for a disabled vararg function. -// The rettype and impl arguments are ignored. -#define _WX_VARARG_DEFINE_FUNC_NOP(N, rettype, name, \ - impl, implUtf8, numfixed, fixed) \ - template<_WX_VARARG_JOIN(N, _WX_VARARG_TEMPL)> \ - void name(_WX_VARARG_FIXED_UNUSED_EXPAND(numfixed, fixed), \ - _WX_VARARG_JOIN(N, _WX_VARARG_ARG_UNUSED)) \ - {} - -#define _WX_VARARG_DEFINE_FUNC_NOP_N0(name, numfixed, fixed) \ - inline void name(_WX_VARARG_FIXED_UNUSED_EXPAND(numfixed, fixed)) \ - {} - -#endif // _WX_STRVARARG_H_ diff --git a/Externals/wxWidgets3/include/wx/sysopt.h b/Externals/wxWidgets3/include/wx/sysopt.h deleted file mode 100644 index 63474c0660..0000000000 --- a/Externals/wxWidgets3/include/wx/sysopt.h +++ /dev/null @@ -1,74 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/sysopt.h -// Purpose: wxSystemOptions -// Author: Julian Smart -// Modified by: -// Created: 2001-07-10 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_SYSOPT_H_ -#define _WX_SYSOPT_H_ - -#include "wx/object.h" - -// ---------------------------------------------------------------------------- -// Enables an application to influence the wxWidgets implementation -// ---------------------------------------------------------------------------- - -class -#if wxUSE_SYSTEM_OPTIONS -WXDLLIMPEXP_BASE -#endif -wxSystemOptions : public wxObject -{ -public: - wxSystemOptions() { } - - // User-customizable hints to wxWidgets or associated libraries - // These could also be used to influence GetSystem... calls, indeed - // to implement SetSystemColour/Font/Metric - -#if wxUSE_SYSTEM_OPTIONS - static void SetOption(const wxString& name, const wxString& value); - static void SetOption(const wxString& name, int value); -#endif // wxUSE_SYSTEM_OPTIONS - static wxString GetOption(const wxString& name); - static int GetOptionInt(const wxString& name); - static bool HasOption(const wxString& name); - - static bool IsFalse(const wxString& name) - { - return HasOption(name) && GetOptionInt(name) == 0; - } -}; - -#if !wxUSE_SYSTEM_OPTIONS - -// define inline stubs for accessors to make it possible to use wxSystemOptions -// in the library itself without checking for wxUSE_SYSTEM_OPTIONS all the time - -/* static */ inline -wxString wxSystemOptions::GetOption(const wxString& WXUNUSED(name)) -{ - return wxEmptyString; -} - -/* static */ inline -int wxSystemOptions::GetOptionInt(const wxString& WXUNUSED(name)) -{ - return 0; -} - -/* static */ inline -bool wxSystemOptions::HasOption(const wxString& WXUNUSED(name)) -{ - return false; -} - -#endif // !wxUSE_SYSTEM_OPTIONS - -#endif - // _WX_SYSOPT_H_ - diff --git a/Externals/wxWidgets3/include/wx/systhemectrl.h b/Externals/wxWidgets3/include/wx/systhemectrl.h deleted file mode 100644 index 0b9a9ab6ba..0000000000 --- a/Externals/wxWidgets3/include/wx/systhemectrl.h +++ /dev/null @@ -1,66 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/systhemectrl.h -// Purpose: Class to make controls appear in the systems theme -// Author: Tobias Taschner -// Created: 2014-08-14 -// Copyright: (c) 2014 wxWidgets development team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_SYSTHEMECTRL_H -#define _WX_SYSTHEMECTRL_H - -#include "wx/defs.h" - -class WXDLLIMPEXP_FWD_CORE wxWindow; - -class WXDLLIMPEXP_CORE wxSystemThemedControlBase -{ -public: - wxSystemThemedControlBase() { } - - virtual ~wxSystemThemedControlBase() { } - -protected: - // This method is virtual and can be overridden, e.g. composite controls do - // it to enable the system theme for all of their parts. - virtual void DoEnableSystemTheme(bool enable, wxWindow* window); - - wxDECLARE_NO_COPY_CLASS(wxSystemThemedControlBase); -}; - -// This class used CRTP, i.e. it should be instantiated for the real base class -// and inherited from. -template -class wxSystemThemedControl : public C, - public wxSystemThemedControlBase -{ -public: - wxSystemThemedControl() { } - - void EnableSystemTheme(bool enable = true) - { - DoEnableSystemTheme(enable, this); - } - -protected: - wxDECLARE_NO_COPY_TEMPLATE_CLASS(wxSystemThemedControl, C); -}; - -// Only __WXMSW__ has a non-trivial implementation currently. -#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) - #define wxHAS_SYSTEM_THEMED_CONTROL -#endif - -#ifndef wxHAS_SYSTEM_THEMED_CONTROL - -inline void -wxSystemThemedControlBase::DoEnableSystemTheme(bool WXUNUSED(enable), - wxWindow* WXUNUSED(window)) -{ - // Nothing to do. -} - -#endif // !wxHAS_SYSTEM_THEMED_CONTROL - -#endif // _WX_SYSTHEMECTRL_H diff --git a/Externals/wxWidgets3/include/wx/tarstrm.h b/Externals/wxWidgets3/include/wx/tarstrm.h deleted file mode 100644 index 37a1ab3a99..0000000000 --- a/Externals/wxWidgets3/include/wx/tarstrm.h +++ /dev/null @@ -1,353 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/tarstrm.h -// Purpose: Streams for Tar files -// Author: Mike Wetherell -// Copyright: (c) 2004 Mike Wetherell -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_WXTARSTREAM_H__ -#define _WX_WXTARSTREAM_H__ - -#include "wx/defs.h" - -#if wxUSE_TARSTREAM - -#include "wx/archive.h" -#include "wx/hashmap.h" - - -///////////////////////////////////////////////////////////////////////////// -// Constants - -// TypeFlag values -enum wxTarType -{ - wxTAR_REGTYPE = '0', // regular file - wxTAR_LNKTYPE = '1', // hard link - wxTAR_SYMTYPE = '2', // symbolic link - wxTAR_CHRTYPE = '3', // character special - wxTAR_BLKTYPE = '4', // block special - wxTAR_DIRTYPE = '5', // directory - wxTAR_FIFOTYPE = '6', // named pipe - wxTAR_CONTTYPE = '7' // contiguous file -}; - -// Archive Formats (use wxTAR_PAX, it's backward compatible) -enum wxTarFormat -{ - wxTAR_USTAR, // POSIX.1-1990 tar format - wxTAR_PAX // POSIX.1-2001 tar format -}; - - -///////////////////////////////////////////////////////////////////////////// -// wxTarNotifier - -class WXDLLIMPEXP_BASE wxTarNotifier -{ -public: - virtual ~wxTarNotifier() { } - - virtual void OnEntryUpdated(class wxTarEntry& entry) = 0; -}; - - -///////////////////////////////////////////////////////////////////////////// -// Tar Entry - hold the meta data for a file in the tar - -class WXDLLIMPEXP_BASE wxTarEntry : public wxArchiveEntry -{ -public: - wxTarEntry(const wxString& name = wxEmptyString, - const wxDateTime& dt = wxDateTime::Now(), - wxFileOffset size = wxInvalidOffset); - virtual ~wxTarEntry(); - - wxTarEntry(const wxTarEntry& entry); - wxTarEntry& operator=(const wxTarEntry& entry); - - // Get accessors - wxString GetName(wxPathFormat format = wxPATH_NATIVE) const wxOVERRIDE; - wxString GetInternalName() const wxOVERRIDE { return m_Name; } - wxPathFormat GetInternalFormat() const wxOVERRIDE { return wxPATH_UNIX; } - int GetMode() const; - int GetUserId() const { return m_UserId; } - int GetGroupId() const { return m_GroupId; } - wxFileOffset GetSize() const wxOVERRIDE { return m_Size; } - wxFileOffset GetOffset() const wxOVERRIDE { return m_Offset; } - wxDateTime GetDateTime() const wxOVERRIDE { return m_ModifyTime; } - wxDateTime GetAccessTime() const { return m_AccessTime; } - wxDateTime GetCreateTime() const { return m_CreateTime; } - int GetTypeFlag() const { return m_TypeFlag; } - wxString GetLinkName() const { return m_LinkName; } - wxString GetUserName() const { return m_UserName; } - wxString GetGroupName() const { return m_GroupName; } - int GetDevMajor() const { return m_DevMajor; } - int GetDevMinor() const { return m_DevMinor; } - - // is accessors - bool IsDir() const wxOVERRIDE; - bool IsReadOnly() const wxOVERRIDE { return !(m_Mode & 0222); } - - // set accessors - void SetName(const wxString& name, wxPathFormat format = wxPATH_NATIVE) wxOVERRIDE; - void SetUserId(int id) { m_UserId = id; } - void SetGroupId(int id) { m_GroupId = id; } - void SetMode(int mode); - void SetSize(wxFileOffset size) wxOVERRIDE { m_Size = size; } - void SetDateTime(const wxDateTime& dt) wxOVERRIDE { m_ModifyTime = dt; } - void SetAccessTime(const wxDateTime& dt) { m_AccessTime = dt; } - void SetCreateTime(const wxDateTime& dt) { m_CreateTime = dt; } - void SetTypeFlag(int type) { m_TypeFlag = type; } - void SetLinkName(const wxString& link) { m_LinkName = link; } - void SetUserName(const wxString& user) { m_UserName = user; } - void SetGroupName(const wxString& group) { m_GroupName = group; } - void SetDevMajor(int dev) { m_DevMajor = dev; } - void SetDevMinor(int dev) { m_DevMinor = dev; } - - // set is accessors - void SetIsDir(bool isDir = true) wxOVERRIDE; - void SetIsReadOnly(bool isReadOnly = true) wxOVERRIDE; - - static wxString GetInternalName(const wxString& name, - wxPathFormat format = wxPATH_NATIVE, - bool *pIsDir = NULL); - - wxTarEntry *Clone() const { return new wxTarEntry(*this); } - - void SetNotifier(wxTarNotifier& WXUNUSED(notifier)) { } - -private: - void SetOffset(wxFileOffset offset) wxOVERRIDE { m_Offset = offset; } - - virtual wxArchiveEntry* DoClone() const wxOVERRIDE { return Clone(); } - - wxString m_Name; - int m_Mode; - bool m_IsModeSet; - int m_UserId; - int m_GroupId; - wxFileOffset m_Size; - wxFileOffset m_Offset; - wxDateTime m_ModifyTime; - wxDateTime m_AccessTime; - wxDateTime m_CreateTime; - int m_TypeFlag; - wxString m_LinkName; - wxString m_UserName; - wxString m_GroupName; - int m_DevMajor; - int m_DevMinor; - - friend class wxTarInputStream; - - wxDECLARE_DYNAMIC_CLASS(wxTarEntry); -}; - - -///////////////////////////////////////////////////////////////////////////// -// wxTarInputStream - -WX_DECLARE_STRING_HASH_MAP(wxString, wxTarHeaderRecords); - -class WXDLLIMPEXP_BASE wxTarInputStream : public wxArchiveInputStream -{ -public: - typedef wxTarEntry entry_type; - - wxTarInputStream(wxInputStream& stream, wxMBConv& conv = wxConvLocal); - wxTarInputStream(wxInputStream *stream, wxMBConv& conv = wxConvLocal); - virtual ~wxTarInputStream(); - - bool OpenEntry(wxTarEntry& entry); - bool CloseEntry() wxOVERRIDE; - - wxTarEntry *GetNextEntry(); - - wxFileOffset GetLength() const wxOVERRIDE { return m_size; } - bool IsSeekable() const wxOVERRIDE { return m_parent_i_stream->IsSeekable(); } - -protected: - size_t OnSysRead(void *buffer, size_t size) wxOVERRIDE; - wxFileOffset OnSysTell() const wxOVERRIDE { return m_pos; } - wxFileOffset OnSysSeek(wxFileOffset seek, wxSeekMode mode) wxOVERRIDE; - -private: - void Init(); - - wxArchiveEntry *DoGetNextEntry() wxOVERRIDE { return GetNextEntry(); } - bool OpenEntry(wxArchiveEntry& entry) wxOVERRIDE; - bool IsOpened() const { return m_pos != wxInvalidOffset; } - - wxStreamError ReadHeaders(); - bool ReadExtendedHeader(wxTarHeaderRecords*& recs); - - wxString GetExtendedHeader(const wxString& key) const; - wxString GetHeaderPath() const; - wxFileOffset GetHeaderNumber(int id) const; - wxString GetHeaderString(int id) const; - wxDateTime GetHeaderDate(const wxString& key) const; - - wxFileOffset m_pos; // position within the current entry - wxFileOffset m_offset; // offset to the start of the entry's data - wxFileOffset m_size; // size of the current entry's data - - int m_sumType; - int m_tarType; - class wxTarHeaderBlock *m_hdr; - wxTarHeaderRecords *m_HeaderRecs; - wxTarHeaderRecords *m_GlobalHeaderRecs; - - wxDECLARE_NO_COPY_CLASS(wxTarInputStream); -}; - - -///////////////////////////////////////////////////////////////////////////// -// wxTarOutputStream - -class WXDLLIMPEXP_BASE wxTarOutputStream : public wxArchiveOutputStream -{ -public: - wxTarOutputStream(wxOutputStream& stream, - wxTarFormat format = wxTAR_PAX, - wxMBConv& conv = wxConvLocal); - wxTarOutputStream(wxOutputStream *stream, - wxTarFormat format = wxTAR_PAX, - wxMBConv& conv = wxConvLocal); - virtual ~wxTarOutputStream(); - - bool PutNextEntry(wxTarEntry *entry); - - bool PutNextEntry(const wxString& name, - const wxDateTime& dt = wxDateTime::Now(), - wxFileOffset size = wxInvalidOffset) wxOVERRIDE; - - bool PutNextDirEntry(const wxString& name, - const wxDateTime& dt = wxDateTime::Now()) wxOVERRIDE; - - bool CopyEntry(wxTarEntry *entry, wxTarInputStream& inputStream); - bool CopyArchiveMetaData(wxTarInputStream& WXUNUSED(s)) { return true; } - - void Sync() wxOVERRIDE; - bool CloseEntry() wxOVERRIDE; - bool Close() wxOVERRIDE; - - bool IsSeekable() const wxOVERRIDE { return m_parent_o_stream->IsSeekable(); } - - void SetBlockingFactor(int factor) { m_BlockingFactor = factor; } - int GetBlockingFactor() const { return m_BlockingFactor; } - -protected: - size_t OnSysWrite(const void *buffer, size_t size) wxOVERRIDE; - wxFileOffset OnSysTell() const wxOVERRIDE { return m_pos; } - wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) wxOVERRIDE; - -private: - void Init(wxTarFormat format); - - bool PutNextEntry(wxArchiveEntry *entry) wxOVERRIDE; - bool CopyEntry(wxArchiveEntry *entry, wxArchiveInputStream& stream) wxOVERRIDE; - bool CopyArchiveMetaData(wxArchiveInputStream& WXUNUSED(s)) wxOVERRIDE { return true; } - bool IsOpened() const { return m_pos != wxInvalidOffset; } - - bool WriteHeaders(wxTarEntry& entry); - bool ModifyHeader(); - wxString PaxHeaderPath(const wxString& format, const wxString& path); - - void SetExtendedHeader(const wxString& key, const wxString& value); - void SetHeaderPath(const wxString& name); - bool SetHeaderNumber(int id, wxFileOffset n); - void SetHeaderString(int id, const wxString& str); - void SetHeaderDate(const wxString& key, const wxDateTime& datetime); - - wxFileOffset m_pos; // position within the current entry - wxFileOffset m_maxpos; // max pos written - wxFileOffset m_size; // expected entry size - - wxFileOffset m_headpos; // offset within the file to the entry's header - wxFileOffset m_datapos; // offset within the file to the entry's data - - wxFileOffset m_tarstart;// offset within the file to the tar - wxFileOffset m_tarsize; // size of tar so far - - bool m_pax; - int m_BlockingFactor; - wxUint32 m_chksum; - bool m_large; - class wxTarHeaderBlock *m_hdr; - class wxTarHeaderBlock *m_hdr2; - char *m_extendedHdr; - size_t m_extendedSize; - wxString m_badfit; - bool m_endrecWritten; - - wxDECLARE_NO_COPY_CLASS(wxTarOutputStream); -}; - - -///////////////////////////////////////////////////////////////////////////// -// Iterators - -#if wxUSE_STL || defined WX_TEST_ARCHIVE_ITERATOR -typedef wxArchiveIterator wxTarIter; -typedef wxArchiveIterator > wxTarPairIter; -#endif - - -///////////////////////////////////////////////////////////////////////////// -// wxTarClassFactory - -class WXDLLIMPEXP_BASE wxTarClassFactory : public wxArchiveClassFactory -{ -public: - typedef wxTarEntry entry_type; - typedef wxTarInputStream instream_type; - typedef wxTarOutputStream outstream_type; - typedef wxTarNotifier notifier_type; -#if wxUSE_STL || defined WX_TEST_ARCHIVE_ITERATOR - typedef wxTarIter iter_type; - typedef wxTarPairIter pairiter_type; -#endif - - wxTarClassFactory(); - - wxTarEntry *NewEntry() const - { return new wxTarEntry; } - wxTarInputStream *NewStream(wxInputStream& stream) const - { return new wxTarInputStream(stream, GetConv()); } - wxTarOutputStream *NewStream(wxOutputStream& stream) const - { return new wxTarOutputStream(stream, wxTAR_PAX, GetConv()); } - wxTarInputStream *NewStream(wxInputStream *stream) const - { return new wxTarInputStream(stream, GetConv()); } - wxTarOutputStream *NewStream(wxOutputStream *stream) const - { return new wxTarOutputStream(stream, wxTAR_PAX, GetConv()); } - - wxString GetInternalName(const wxString& name, - wxPathFormat format = wxPATH_NATIVE) const wxOVERRIDE - { return wxTarEntry::GetInternalName(name, format); } - - const wxChar * const *GetProtocols(wxStreamProtocolType type - = wxSTREAM_PROTOCOL) const wxOVERRIDE; - -protected: - wxArchiveEntry *DoNewEntry() const wxOVERRIDE - { return NewEntry(); } - wxArchiveInputStream *DoNewStream(wxInputStream& stream) const wxOVERRIDE - { return NewStream(stream); } - wxArchiveOutputStream *DoNewStream(wxOutputStream& stream) const wxOVERRIDE - { return NewStream(stream); } - wxArchiveInputStream *DoNewStream(wxInputStream *stream) const wxOVERRIDE - { return NewStream(stream); } - wxArchiveOutputStream *DoNewStream(wxOutputStream *stream) const wxOVERRIDE - { return NewStream(stream); } - -private: - wxDECLARE_DYNAMIC_CLASS(wxTarClassFactory); -}; - - -#endif // wxUSE_TARSTREAM - -#endif // _WX_WXTARSTREAM_H__ diff --git a/Externals/wxWidgets3/include/wx/taskbar.h b/Externals/wxWidgets3/include/wx/taskbar.h deleted file mode 100644 index 84b1c1dec6..0000000000 --- a/Externals/wxWidgets3/include/wx/taskbar.h +++ /dev/null @@ -1,154 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/taskbar.h -// Purpose: wxTaskBarIcon base header and class -// Author: Julian Smart -// Modified by: -// Created: -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_TASKBAR_H_BASE_ -#define _WX_TASKBAR_H_BASE_ - -#include "wx/defs.h" - -#if wxUSE_TASKBARICON - -#include "wx/event.h" - -class WXDLLIMPEXP_FWD_ADV wxTaskBarIconEvent; - -// ---------------------------------------------------------------------------- - -// type of taskbar item to create. Only applicable in wxOSX_COCOA -enum wxTaskBarIconType -{ - wxTBI_DOCK, - wxTBI_CUSTOM_STATUSITEM, -#if defined(wxOSX_USE_COCOA) && wxOSX_USE_COCOA - wxTBI_DEFAULT_TYPE = wxTBI_CUSTOM_STATUSITEM -#else - wxTBI_DEFAULT_TYPE = wxTBI_DOCK -#endif -}; - - -// ---------------------------------------------------------------------------- -// wxTaskBarIconBase: define wxTaskBarIcon interface -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxTaskBarIconBase : public wxEvtHandler -{ -public: - wxTaskBarIconBase() { } - -#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXQT__) - static bool IsAvailable(); -#else - static bool IsAvailable() { return true; } -#endif - - // Operations: - virtual bool SetIcon(const wxIcon& icon, - const wxString& tooltip = wxEmptyString) = 0; - virtual bool RemoveIcon() = 0; - virtual bool PopupMenu(wxMenu *menu) = 0; - - // delayed destruction (similarly to wxWindow::Destroy()) - void Destroy(); - -protected: - // creates menu to be displayed when user clicks on the icon - virtual wxMenu *CreatePopupMenu() { return NULL; } - -private: - // default events handling, calls CreatePopupMenu: - void OnRightButtonDown(wxTaskBarIconEvent& event); - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_NO_COPY_CLASS(wxTaskBarIconBase); -}; - - -// ---------------------------------------------------------------------------- -// now include the actual class declaration -// ---------------------------------------------------------------------------- - -#if defined(__WXMSW__) - #include "wx/msw/taskbar.h" -#elif defined(__WXGTK20__) - #include "wx/gtk/taskbar.h" -#elif defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) - #include "wx/unix/taskbarx11.h" -#elif defined (__WXMAC__) - #include "wx/osx/taskbarosx.h" -#elif defined (__WXQT__) - #include "wx/qt/taskbar.h" -#endif - -// ---------------------------------------------------------------------------- -// wxTaskBarIcon events -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxTaskBarIconEvent : public wxEvent -{ -public: - wxTaskBarIconEvent(wxEventType evtType, wxTaskBarIcon *tbIcon) - : wxEvent(wxID_ANY, evtType) - { - SetEventObject(tbIcon); - } - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxTaskBarIconEvent(*this); } - -private: - wxDECLARE_NO_ASSIGN_CLASS(wxTaskBarIconEvent); -}; - -typedef void (wxEvtHandler::*wxTaskBarIconEventFunction)(wxTaskBarIconEvent&); - -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_TASKBAR_MOVE, wxTaskBarIconEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_TASKBAR_LEFT_DOWN, wxTaskBarIconEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_TASKBAR_LEFT_UP, wxTaskBarIconEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_TASKBAR_RIGHT_DOWN, wxTaskBarIconEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_TASKBAR_RIGHT_UP, wxTaskBarIconEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_TASKBAR_LEFT_DCLICK, wxTaskBarIconEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_TASKBAR_RIGHT_DCLICK, wxTaskBarIconEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_TASKBAR_BALLOON_TIMEOUT, wxTaskBarIconEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_TASKBAR_BALLOON_CLICK, wxTaskBarIconEvent ); - -#define wxTaskBarIconEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxTaskBarIconEventFunction, func) - -#define wx__DECLARE_TASKBAREVT(evt, fn) \ - wx__DECLARE_EVT0(wxEVT_TASKBAR_ ## evt, wxTaskBarIconEventHandler(fn)) - -#define EVT_TASKBAR_MOVE(fn) wx__DECLARE_TASKBAREVT(MOVE, fn) -#define EVT_TASKBAR_LEFT_DOWN(fn) wx__DECLARE_TASKBAREVT(LEFT_DOWN, fn) -#define EVT_TASKBAR_LEFT_UP(fn) wx__DECLARE_TASKBAREVT(LEFT_UP, fn) -#define EVT_TASKBAR_RIGHT_DOWN(fn) wx__DECLARE_TASKBAREVT(RIGHT_DOWN, fn) -#define EVT_TASKBAR_RIGHT_UP(fn) wx__DECLARE_TASKBAREVT(RIGHT_UP, fn) -#define EVT_TASKBAR_LEFT_DCLICK(fn) wx__DECLARE_TASKBAREVT(LEFT_DCLICK, fn) -#define EVT_TASKBAR_RIGHT_DCLICK(fn) wx__DECLARE_TASKBAREVT(RIGHT_DCLICK, fn) - -// taskbar menu is shown on right button press under all platforms except MSW -// where it's shown on right button release, using this event type and macro -// allows to write code which works correctly on all platforms -#ifdef __WXMSW__ - #define wxEVT_TASKBAR_CLICK wxEVT_TASKBAR_RIGHT_UP -#else - #define wxEVT_TASKBAR_CLICK wxEVT_TASKBAR_RIGHT_DOWN -#endif -#define EVT_TASKBAR_CLICK(fn) wx__DECLARE_TASKBAREVT(CLICK, fn) - -// these events are currently generated only under wxMSW and only after (MSW- -// specific) ShowBalloon() had been called, don't use them in portable code -#define EVT_TASKBAR_BALLOON_TIMEOUT(fn) \ - wx__DECLARE_TASKBAREVT(BALLOON_TIMEOUT, fn) -#define EVT_TASKBAR_BALLOON_CLICK(fn) \ - wx__DECLARE_TASKBAREVT(BALLOON_CLICK, fn) - -#endif // wxUSE_TASKBARICON - -#endif // _WX_TASKBAR_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/taskbarbutton.h b/Externals/wxWidgets3/include/wx/taskbarbutton.h deleted file mode 100644 index 68759d21f3..0000000000 --- a/Externals/wxWidgets3/include/wx/taskbarbutton.h +++ /dev/null @@ -1,253 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: include/taskbarbutton.h -// Purpose: Defines wxTaskBarButton class for manipulating buttons on the -// windows taskbar. -// Author: Chaobin Zhang -// Created: 2014-04-30 -// Copyright: (c) 2014 wxWidgets development team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_TASKBARBUTTON_H_ -#define _WX_TASKBARBUTTON_H_ - -#include "wx/defs.h" - -#if wxUSE_TASKBARBUTTON - -#include "wx/icon.h" -#include "wx/string.h" - -class WXDLLIMPEXP_FWD_CORE wxTaskBarButton; -class WXDLLIMPEXP_FWD_CORE wxTaskBarJumpListCategory; -class WXDLLIMPEXP_FWD_CORE wxTaskBarJumpList; -class WXDLLIMPEXP_FWD_CORE wxTaskBarJumpListImpl; - -// ---------------------------------------------------------------------------- -// wxTaskBarButton: define wxTaskBarButton interface. -// ---------------------------------------------------------------------------- - -/** - State of the task bar button. -*/ -enum wxTaskBarButtonState -{ - wxTASKBAR_BUTTON_NO_PROGRESS = 0, - wxTASKBAR_BUTTON_INDETERMINATE = 1, - wxTASKBAR_BUTTON_NORMAL = 2, - wxTASKBAR_BUTTON_ERROR = 4, - wxTASKBAR_BUTTON_PAUSED = 8 -}; - -class WXDLLIMPEXP_CORE wxThumbBarButton : public wxObject -{ -public: - wxThumbBarButton() : m_taskBarButtonParent(NULL) - { } - - wxThumbBarButton(int id, - const wxIcon& icon, - const wxString& tooltip = wxString(), - bool enable = true, - bool dismissOnClick = false, - bool hasBackground = true, - bool shown = true, - bool interactive = true); - - bool Create(int id, - const wxIcon& icon, - const wxString& tooltip = wxString(), - bool enable = true, - bool dismissOnClick = false, - bool hasBackground = true, - bool shown = true, - bool interactive = true); - int GetID() const { return m_id; } - const wxIcon& GetIcon() const { return m_icon; } - const wxString& GetTooltip() const { return m_tooltip; } - - bool IsEnable() const { return m_enable; } - void Enable(bool enable = true); - void Disable() { Enable(false); } - - bool IsDismissOnClick() const { return m_dismissOnClick; } - void EnableDismissOnClick(bool enable = true); - void DisableDimissOnClick() { EnableDismissOnClick(false); } - - bool HasBackground() const { return m_hasBackground; } - void SetHasBackground(bool has = true); - - bool IsShown() const { return m_shown; } - void Show(bool shown = true); - void Hide() { Show(false); } - - bool IsInteractive() const { return m_interactive; } - void SetInteractive(bool interactive = true); - - void SetParent(wxTaskBarButton *parent) { m_taskBarButtonParent = parent; } - wxTaskBarButton* GetParent() const { return m_taskBarButtonParent; } - -private: - bool UpdateParentTaskBarButton(); - - int m_id; - wxIcon m_icon; - wxString m_tooltip; - bool m_enable; - bool m_dismissOnClick; - bool m_hasBackground; - bool m_shown; - bool m_interactive; - wxTaskBarButton *m_taskBarButtonParent; - - wxDECLARE_DYNAMIC_CLASS(wxThumbBarButton); -}; - -class WXDLLIMPEXP_CORE wxTaskBarButton -{ -public: - // Factory function, may return NULL if task bar buttons are not supported - // by the current system. - static wxTaskBarButton* New(wxWindow* parent); - - virtual ~wxTaskBarButton() { } - - // Operations: - virtual void SetProgressRange(int range) = 0; - virtual void SetProgressValue(int value) = 0; - virtual void PulseProgress() = 0; - virtual void Show(bool show = true) = 0; - virtual void Hide() = 0; - virtual void SetThumbnailTooltip(const wxString& tooltip) = 0; - virtual void SetProgressState(wxTaskBarButtonState state) = 0; - virtual void SetOverlayIcon(const wxIcon& icon, - const wxString& description = wxString()) = 0; - virtual void SetThumbnailClip(const wxRect& rect) = 0; - virtual void SetThumbnailContents(const wxWindow *child) = 0; - virtual bool InsertThumbBarButton(size_t pos, wxThumbBarButton *button) = 0; - virtual bool AppendThumbBarButton(wxThumbBarButton *button) = 0; - virtual bool AppendSeparatorInThumbBar() = 0; - virtual wxThumbBarButton* RemoveThumbBarButton(wxThumbBarButton *button) = 0; - virtual wxThumbBarButton* RemoveThumbBarButton(int id) = 0; - virtual void Realize() = 0; - -protected: - wxTaskBarButton() { } - -private: - wxDECLARE_NO_COPY_CLASS(wxTaskBarButton); -}; - -enum wxTaskBarJumpListItemType -{ - wxTASKBAR_JUMP_LIST_SEPARATOR, - wxTASKBAR_JUMP_LIST_TASK, - wxTASKBAR_JUMP_LIST_DESTIONATION -}; - -class WXDLLIMPEXP_CORE wxTaskBarJumpListItem -{ -public: - wxTaskBarJumpListItem(wxTaskBarJumpListCategory *parentCategory = NULL, - wxTaskBarJumpListItemType type = wxTASKBAR_JUMP_LIST_SEPARATOR, - const wxString& title = wxEmptyString, - const wxString& filePath = wxEmptyString, - const wxString& arguments = wxEmptyString, - const wxString& tooltip = wxEmptyString, - const wxString& iconPath = wxEmptyString, - int iconIndex = 0); - - wxTaskBarJumpListItemType GetType() const; - void SetType(wxTaskBarJumpListItemType type); - const wxString& GetTitle() const; - void SetTitle(const wxString& title); - const wxString& GetFilePath() const; - void SetFilePath(const wxString& filePath); - const wxString& GetArguments() const; - void SetArguments(const wxString& arguments); - const wxString& GetTooltip() const; - void SetTooltip(const wxString& tooltip); - const wxString& GetIconPath() const; - void SetIconPath(const wxString& iconPath); - int GetIconIndex() const; - void SetIconIndex(int iconIndex); - wxTaskBarJumpListCategory* GetCategory() const; - void SetCategory(wxTaskBarJumpListCategory *category); - -private: - wxTaskBarJumpListCategory *m_parentCategory; - wxTaskBarJumpListItemType m_type; - wxString m_title; - wxString m_filePath; - wxString m_arguments; - wxString m_tooltip; - wxString m_iconPath; - int m_iconIndex; - - wxDECLARE_NO_COPY_CLASS(wxTaskBarJumpListItem); -}; - -typedef wxVector wxTaskBarJumpListItems; - -class WXDLLIMPEXP_CORE wxTaskBarJumpListCategory -{ -public: - wxTaskBarJumpListCategory(wxTaskBarJumpList *parent = NULL, - const wxString& title = wxEmptyString); - virtual ~wxTaskBarJumpListCategory(); - - wxTaskBarJumpListItem* Append(wxTaskBarJumpListItem *item); - void Delete(wxTaskBarJumpListItem *item); - wxTaskBarJumpListItem* Remove(wxTaskBarJumpListItem *item); - wxTaskBarJumpListItem* FindItemByPosition(size_t pos) const; - wxTaskBarJumpListItem* Insert(size_t pos, wxTaskBarJumpListItem *item); - wxTaskBarJumpListItem* Prepend(wxTaskBarJumpListItem *item); - void SetTitle(const wxString& title); - const wxString& GetTitle() const; - const wxTaskBarJumpListItems& GetItems() const; - -private: - friend class wxTaskBarJumpListItem; - - void Update(); - - wxTaskBarJumpList *m_parent; - wxTaskBarJumpListItems m_items; - wxString m_title; - - wxDECLARE_NO_COPY_CLASS(wxTaskBarJumpListCategory); -}; - -typedef wxVector wxTaskBarJumpListCategories; - -class WXDLLIMPEXP_CORE wxTaskBarJumpList -{ -public: - wxTaskBarJumpList(const wxString& appID = wxEmptyString); - virtual ~wxTaskBarJumpList(); - void ShowRecentCategory(bool shown = true); - void HideRecentCategory(); - void ShowFrequentCategory(bool shown = true); - void HideFrequentCategory(); - - wxTaskBarJumpListCategory& GetTasks() const; - const wxTaskBarJumpListCategory& GetFrequentCategory() const; - const wxTaskBarJumpListCategory& GetRecentCategory() const; - const wxTaskBarJumpListCategories& GetCustomCategories() const; - - void AddCustomCategory(wxTaskBarJumpListCategory* category); - wxTaskBarJumpListCategory* RemoveCustomCategory(const wxString& title); - void DeleteCustomCategory(const wxString& title); - -private: - friend class wxTaskBarJumpListCategory; - - void Update(); - wxTaskBarJumpListImpl *m_jumpListImpl; - - wxDECLARE_NO_COPY_CLASS(wxTaskBarJumpList); -}; - -#endif // wxUSE_TASKBARBUTTON - -#endif // _WX_TASKBARBUTTON_H_ diff --git a/Externals/wxWidgets3/include/wx/tbarbase.h b/Externals/wxWidgets3/include/wx/tbarbase.h deleted file mode 100644 index 145803ec4b..0000000000 --- a/Externals/wxWidgets3/include/wx/tbarbase.h +++ /dev/null @@ -1,715 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/tbarbase.h -// Purpose: Base class for toolbar classes -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_TBARBASE_H_ -#define _WX_TBARBASE_H_ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/defs.h" - -#if wxUSE_TOOLBAR - -#include "wx/bitmap.h" -#include "wx/list.h" -#include "wx/control.h" - -class WXDLLIMPEXP_FWD_CORE wxToolBarBase; -class WXDLLIMPEXP_FWD_CORE wxToolBarToolBase; -class WXDLLIMPEXP_FWD_CORE wxImage; - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -extern WXDLLIMPEXP_DATA_CORE(const char) wxToolBarNameStr[]; -extern WXDLLIMPEXP_DATA_CORE(const wxSize) wxDefaultSize; -extern WXDLLIMPEXP_DATA_CORE(const wxPoint) wxDefaultPosition; - -enum wxToolBarToolStyle -{ - wxTOOL_STYLE_BUTTON = 1, - wxTOOL_STYLE_SEPARATOR = 2, - wxTOOL_STYLE_CONTROL -}; - -// ---------------------------------------------------------------------------- -// wxToolBarTool is a toolbar element. -// -// It has a unique id (except for the separators which always have id wxID_ANY), the -// style (telling whether it is a normal button, separator or a control), the -// state (toggled or not, enabled or not) and short and long help strings. The -// default implementations use the short help string for the tooltip text which -// is popped up when the mouse pointer enters the tool and the long help string -// for the applications status bar. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxToolBarToolBase : public wxObject -{ -public: - // ctors & dtor - // ------------ - - // generic ctor for any kind of tool - wxToolBarToolBase(wxToolBarBase *tbar = NULL, - int toolid = wxID_SEPARATOR, - const wxString& label = wxEmptyString, - const wxBitmap& bmpNormal = wxNullBitmap, - const wxBitmap& bmpDisabled = wxNullBitmap, - wxItemKind kind = wxITEM_NORMAL, - wxObject *clientData = NULL, - const wxString& shortHelpString = wxEmptyString, - const wxString& longHelpString = wxEmptyString) - : m_label(label), - m_shortHelpString(shortHelpString), - m_longHelpString(longHelpString) - { - Init - ( - tbar, - toolid == wxID_SEPARATOR ? wxTOOL_STYLE_SEPARATOR - : wxTOOL_STYLE_BUTTON, - toolid == wxID_ANY ? wxWindow::NewControlId() - : toolid, - kind - ); - - m_clientData = clientData; - - m_bmpNormal = bmpNormal; - m_bmpDisabled = bmpDisabled; - } - - // ctor for controls only - wxToolBarToolBase(wxToolBarBase *tbar, - wxControl *control, - const wxString& label) - : m_label(label) - { - Init(tbar, wxTOOL_STYLE_CONTROL, control->GetId(), wxITEM_MAX); - - m_control = control; - } - - virtual ~wxToolBarToolBase(); - - // accessors - // --------- - - // general - int GetId() const { return m_id; } - - wxControl *GetControl() const - { - wxASSERT_MSG( IsControl(), wxT("this toolbar tool is not a control") ); - - return m_control; - } - - wxToolBarBase *GetToolBar() const { return m_tbar; } - - // style/kind - bool IsStretchable() const { return m_stretchable; } - bool IsButton() const { return m_toolStyle == wxTOOL_STYLE_BUTTON; } - bool IsControl() const { return m_toolStyle == wxTOOL_STYLE_CONTROL; } - bool IsSeparator() const { return m_toolStyle == wxTOOL_STYLE_SEPARATOR; } - bool IsStretchableSpace() const { return IsSeparator() && IsStretchable(); } - int GetStyle() const { return m_toolStyle; } - wxItemKind GetKind() const - { - wxASSERT_MSG( IsButton(), wxT("only makes sense for buttons") ); - - return m_kind; - } - - void MakeStretchable() - { - wxASSERT_MSG( IsSeparator(), "only separators can be stretchable" ); - - m_stretchable = true; - } - - // state - bool IsEnabled() const { return m_enabled; } - bool IsToggled() const { return m_toggled; } - bool CanBeToggled() const - { return m_kind == wxITEM_CHECK || m_kind == wxITEM_RADIO; } - - // attributes - const wxBitmap& GetNormalBitmap() const { return m_bmpNormal; } - const wxBitmap& GetDisabledBitmap() const { return m_bmpDisabled; } - - const wxBitmap& GetBitmap() const - { return IsEnabled() ? GetNormalBitmap() : GetDisabledBitmap(); } - - const wxString& GetLabel() const { return m_label; } - - const wxString& GetShortHelp() const { return m_shortHelpString; } - const wxString& GetLongHelp() const { return m_longHelpString; } - - wxObject *GetClientData() const - { - if ( m_toolStyle == wxTOOL_STYLE_CONTROL ) - { - return (wxObject*)m_control->GetClientData(); - } - else - { - return m_clientData; - } - } - - // modifiers: return true if the state really changed - virtual bool Enable(bool enable); - virtual bool Toggle(bool toggle); - virtual bool SetToggle(bool toggle); - virtual bool SetShortHelp(const wxString& help); - virtual bool SetLongHelp(const wxString& help); - - void Toggle() { Toggle(!IsToggled()); } - - void SetNormalBitmap(const wxBitmap& bmp) { m_bmpNormal = bmp; } - void SetDisabledBitmap(const wxBitmap& bmp) { m_bmpDisabled = bmp; } - - virtual void SetLabel(const wxString& label) { m_label = label; } - - void SetClientData(wxObject *clientData) - { - if ( m_toolStyle == wxTOOL_STYLE_CONTROL ) - { - m_control->SetClientData(clientData); - } - else - { - m_clientData = clientData; - } - } - - // add tool to/remove it from a toolbar - virtual void Detach() { m_tbar = NULL; } - virtual void Attach(wxToolBarBase *tbar) { m_tbar = tbar; } - -#if wxUSE_MENUS - // these methods are only for tools of wxITEM_DROPDOWN kind (but even such - // tools can have a NULL associated menu) - virtual void SetDropdownMenu(wxMenu *menu); - wxMenu *GetDropdownMenu() const { return m_dropdownMenu; } -#endif - -protected: - // common part of all ctors - void Init(wxToolBarBase *tbar, - wxToolBarToolStyle style, - int toolid, - wxItemKind kind) - { - m_tbar = tbar; - m_toolStyle = style; - m_id = toolid; - m_kind = kind; - - m_clientData = NULL; - - m_stretchable = false; - m_toggled = false; - m_enabled = true; - -#if wxUSE_MENUS - m_dropdownMenu = NULL; -#endif - - } - - wxToolBarBase *m_tbar; // the toolbar to which we belong (may be NULL) - - // tool parameters - wxToolBarToolStyle m_toolStyle; - wxWindowIDRef m_id; // the tool id, wxID_SEPARATOR for separator - wxItemKind m_kind; // for normal buttons may be wxITEM_NORMAL/CHECK/RADIO - - // as controls have their own client data, no need to waste memory - union - { - wxObject *m_clientData; - wxControl *m_control; - }; - - // true if this tool is stretchable: currently is only value for separators - bool m_stretchable; - - // tool state - bool m_toggled; - bool m_enabled; - - // normal and disabled bitmaps for the tool, both can be invalid - wxBitmap m_bmpNormal; - wxBitmap m_bmpDisabled; - - // the button label - wxString m_label; - - // short and long help strings - wxString m_shortHelpString; - wxString m_longHelpString; - -#if wxUSE_MENUS - wxMenu *m_dropdownMenu; -#endif - - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxToolBarToolBase); -}; - -// a list of toolbar tools -WX_DECLARE_EXPORTED_LIST(wxToolBarToolBase, wxToolBarToolsList); - -// ---------------------------------------------------------------------------- -// the base class for all toolbars -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxToolBarBase : public wxControl -{ -public: - wxToolBarBase(); - virtual ~wxToolBarBase(); - - // toolbar construction - // -------------------- - - // the full AddTool() function - // - // If bmpDisabled is wxNullBitmap, a shadowed version of the normal bitmap - // is created and used as the disabled image. - wxToolBarToolBase *AddTool(int toolid, - const wxString& label, - const wxBitmap& bitmap, - const wxBitmap& bmpDisabled, - wxItemKind kind = wxITEM_NORMAL, - const wxString& shortHelp = wxEmptyString, - const wxString& longHelp = wxEmptyString, - wxObject *data = NULL) - { - return DoAddTool(toolid, label, bitmap, bmpDisabled, kind, - shortHelp, longHelp, data); - } - - // the most common AddTool() version - wxToolBarToolBase *AddTool(int toolid, - const wxString& label, - const wxBitmap& bitmap, - const wxString& shortHelp = wxEmptyString, - wxItemKind kind = wxITEM_NORMAL) - { - return AddTool(toolid, label, bitmap, wxNullBitmap, kind, shortHelp); - } - - // add a check tool, i.e. a tool which can be toggled - wxToolBarToolBase *AddCheckTool(int toolid, - const wxString& label, - const wxBitmap& bitmap, - const wxBitmap& bmpDisabled = wxNullBitmap, - const wxString& shortHelp = wxEmptyString, - const wxString& longHelp = wxEmptyString, - wxObject *data = NULL) - { - return AddTool(toolid, label, bitmap, bmpDisabled, wxITEM_CHECK, - shortHelp, longHelp, data); - } - - // add a radio tool, i.e. a tool which can be toggled and releases any - // other toggled radio tools in the same group when it happens - wxToolBarToolBase *AddRadioTool(int toolid, - const wxString& label, - const wxBitmap& bitmap, - const wxBitmap& bmpDisabled = wxNullBitmap, - const wxString& shortHelp = wxEmptyString, - const wxString& longHelp = wxEmptyString, - wxObject *data = NULL) - { - return AddTool(toolid, label, bitmap, bmpDisabled, wxITEM_RADIO, - shortHelp, longHelp, data); - } - - - // insert the new tool at the given position, if pos == GetToolsCount(), it - // is equivalent to AddTool() - virtual wxToolBarToolBase *InsertTool - ( - size_t pos, - int toolid, - const wxString& label, - const wxBitmap& bitmap, - const wxBitmap& bmpDisabled = wxNullBitmap, - wxItemKind kind = wxITEM_NORMAL, - const wxString& shortHelp = wxEmptyString, - const wxString& longHelp = wxEmptyString, - wxObject *clientData = NULL - ); - - virtual wxToolBarToolBase *AddTool (wxToolBarToolBase *tool); - virtual wxToolBarToolBase *InsertTool (size_t pos, wxToolBarToolBase *tool); - - // add an arbitrary control to the toolbar (notice that the control will be - // deleted by the toolbar and that it will also adjust its position/size) - // - // the label is optional and, if specified, will be shown near the control - // NB: the control should have toolbar as its parent - virtual wxToolBarToolBase * - AddControl(wxControl *control, const wxString& label = wxEmptyString); - - virtual wxToolBarToolBase * - InsertControl(size_t pos, wxControl *control, - const wxString& label = wxEmptyString); - - // get the control with the given id or return NULL - virtual wxControl *FindControl( int toolid ); - - // add a separator to the toolbar - virtual wxToolBarToolBase *AddSeparator(); - virtual wxToolBarToolBase *InsertSeparator(size_t pos); - - // add a stretchable space to the toolbar: this is similar to a separator - // except that it's always blank and that all the extra space the toolbar - // has is [equally] distributed among the stretchable spaces in it - virtual wxToolBarToolBase *AddStretchableSpace(); - virtual wxToolBarToolBase *InsertStretchableSpace(size_t pos); - - // remove the tool from the toolbar: the caller is responsible for actually - // deleting the pointer - virtual wxToolBarToolBase *RemoveTool(int toolid); - - // delete tool either by index or by position - virtual bool DeleteToolByPos(size_t pos); - virtual bool DeleteTool(int toolid); - - // delete all tools - virtual void ClearTools(); - - // must be called after all buttons have been created to finish toolbar - // initialisation - // - // derived class versions should call the base one first, before doing - // platform-specific stuff - virtual bool Realize(); - - // tools state - // ----------- - - virtual void EnableTool(int toolid, bool enable); - virtual void ToggleTool(int toolid, bool toggle); - - // Set this to be togglable (or not) - virtual void SetToggle(int toolid, bool toggle); - - // set/get tools client data (not for controls) - virtual wxObject *GetToolClientData(int toolid) const; - virtual void SetToolClientData(int toolid, wxObject *clientData); - - // returns tool pos, or wxNOT_FOUND if tool isn't found - virtual int GetToolPos(int id) const; - - // return true if the tool is toggled - virtual bool GetToolState(int toolid) const; - - virtual bool GetToolEnabled(int toolid) const; - - virtual void SetToolShortHelp(int toolid, const wxString& helpString); - virtual wxString GetToolShortHelp(int toolid) const; - virtual void SetToolLongHelp(int toolid, const wxString& helpString); - virtual wxString GetToolLongHelp(int toolid) const; - - virtual void SetToolNormalBitmap(int WXUNUSED(id), - const wxBitmap& WXUNUSED(bitmap)) {} - virtual void SetToolDisabledBitmap(int WXUNUSED(id), - const wxBitmap& WXUNUSED(bitmap)) {} - - - // margins/packing/separation - // -------------------------- - - virtual void SetMargins(int x, int y); - void SetMargins(const wxSize& size) - { SetMargins((int) size.x, (int) size.y); } - virtual void SetToolPacking(int packing) - { m_toolPacking = packing; } - virtual void SetToolSeparation(int separation) - { m_toolSeparation = separation; } - - virtual wxSize GetToolMargins() const { return wxSize(m_xMargin, m_yMargin); } - virtual int GetToolPacking() const { return m_toolPacking; } - virtual int GetToolSeparation() const { return m_toolSeparation; } - - // toolbar geometry - // ---------------- - - // set the number of toolbar rows - virtual void SetRows(int nRows); - - // the toolbar can wrap - limit the number of columns or rows it may take - void SetMaxRowsCols(int rows, int cols) - { m_maxRows = rows; m_maxCols = cols; } - int GetMaxRows() const { return m_maxRows; } - int GetMaxCols() const { return m_maxCols; } - - // get/set the size of the bitmaps used by the toolbar: should be called - // before adding any tools to the toolbar - virtual void SetToolBitmapSize(const wxSize& size) - { m_defaultWidth = size.x; m_defaultHeight = size.y; } - virtual wxSize GetToolBitmapSize() const - { return wxSize(m_defaultWidth, m_defaultHeight); } - - // the button size in some implementations is bigger than the bitmap size: - // get the total button size (by default the same as bitmap size) - virtual wxSize GetToolSize() const - { return GetToolBitmapSize(); } - - // returns a (non separator) tool containing the point (x, y) or NULL if - // there is no tool at this point (coordinates are client) - virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, - wxCoord y) const = 0; - - // find the tool by id - wxToolBarToolBase *FindById(int toolid) const; - - // return true if this is a vertical toolbar, otherwise false - bool IsVertical() const; - - // these methods allow to access tools by their index in the toolbar - size_t GetToolsCount() const { return m_tools.GetCount(); } - const wxToolBarToolBase *GetToolByPos(int pos) const { return m_tools[pos]; } - -#if WXWIN_COMPATIBILITY_2_8 - // the old versions of the various methods kept for compatibility - // don't use in the new code! - // -------------------------------------------------------------- - wxDEPRECATED_INLINE( - wxToolBarToolBase *AddTool(int toolid, - const wxBitmap& bitmap, - const wxBitmap& bmpDisabled, - bool toggle = false, - wxObject *clientData = NULL, - const wxString& shortHelpString = wxEmptyString, - const wxString& longHelpString = wxEmptyString) - , - return AddTool(toolid, wxEmptyString, - bitmap, bmpDisabled, - toggle ? wxITEM_CHECK : wxITEM_NORMAL, - shortHelpString, longHelpString, clientData); - ) - wxDEPRECATED_INLINE( - wxToolBarToolBase *AddTool(int toolid, - const wxBitmap& bitmap, - const wxString& shortHelpString = wxEmptyString, - const wxString& longHelpString = wxEmptyString) - , - return AddTool(toolid, wxEmptyString, - bitmap, wxNullBitmap, wxITEM_NORMAL, - shortHelpString, longHelpString, NULL); - ) - wxDEPRECATED_INLINE( - wxToolBarToolBase *AddTool(int toolid, - const wxBitmap& bitmap, - const wxBitmap& bmpDisabled, - bool toggle, - wxCoord xPos, - wxCoord yPos = wxDefaultCoord, - wxObject *clientData = NULL, - const wxString& shortHelp = wxEmptyString, - const wxString& longHelp = wxEmptyString) - , - return DoAddTool(toolid, wxEmptyString, bitmap, bmpDisabled, - toggle ? wxITEM_CHECK : wxITEM_NORMAL, - shortHelp, longHelp, clientData, xPos, yPos); - ) - wxDEPRECATED_INLINE( - wxToolBarToolBase *InsertTool(size_t pos, - int toolid, - const wxBitmap& bitmap, - const wxBitmap& bmpDisabled = wxNullBitmap, - bool toggle = false, - wxObject *clientData = NULL, - const wxString& shortHelp = wxEmptyString, - const wxString& longHelp = wxEmptyString) - , - return InsertTool(pos, toolid, wxEmptyString, bitmap, bmpDisabled, - toggle ? wxITEM_CHECK : wxITEM_NORMAL, - shortHelp, longHelp, clientData); - ) -#endif // WXWIN_COMPATIBILITY_2_8 - - // event handlers - // -------------- - - // NB: these functions are deprecated, use EVT_TOOL_XXX() instead! - - // Only allow toggle if returns true. Call when left button up. - virtual bool OnLeftClick(int toolid, bool toggleDown); - - // Call when right button down. - virtual void OnRightClick(int toolid, long x, long y); - - // Called when the mouse cursor enters a tool bitmap. - // Argument is wxID_ANY if mouse is exiting the toolbar. - virtual void OnMouseEnter(int toolid); - - // more deprecated functions - // ------------------------- - - // use GetToolMargins() instead - wxSize GetMargins() const { return GetToolMargins(); } - - // Tool factories, - // helper functions to create toolbar tools - // ------------------------- - virtual wxToolBarToolBase *CreateTool(int toolid, - const wxString& label, - const wxBitmap& bmpNormal, - const wxBitmap& bmpDisabled = wxNullBitmap, - wxItemKind kind = wxITEM_NORMAL, - wxObject *clientData = NULL, - const wxString& shortHelp = wxEmptyString, - const wxString& longHelp = wxEmptyString) = 0; - - virtual wxToolBarToolBase *CreateTool(wxControl *control, - const wxString& label) = 0; - - // this one is not virtual but just a simple helper/wrapper around - // CreateTool() for separators - wxToolBarToolBase *CreateSeparator() - { - return CreateTool(wxID_SEPARATOR, - wxEmptyString, - wxNullBitmap, wxNullBitmap, - wxITEM_SEPARATOR, NULL, - wxEmptyString, wxEmptyString); - } - - - // implementation only from now on - // ------------------------------- - - // Do the toolbar button updates (check for EVT_UPDATE_UI handlers) - virtual void UpdateWindowUI(long flags = wxUPDATE_UI_NONE) wxOVERRIDE ; - - // don't want toolbars to accept the focus - virtual bool AcceptsFocus() const wxOVERRIDE { return false; } - -#if wxUSE_MENUS - // Set dropdown menu - bool SetDropdownMenu(int toolid, wxMenu *menu); -#endif - -protected: - // choose the default border for this window - virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } - - // to implement in derived classes - // ------------------------------- - - // create a new toolbar tool and add it to the toolbar, this is typically - // implemented by just calling InsertTool() - virtual wxToolBarToolBase *DoAddTool - ( - int toolid, - const wxString& label, - const wxBitmap& bitmap, - const wxBitmap& bmpDisabled, - wxItemKind kind, - const wxString& shortHelp = wxEmptyString, - const wxString& longHelp = wxEmptyString, - wxObject *clientData = NULL, - wxCoord xPos = wxDefaultCoord, - wxCoord yPos = wxDefaultCoord - ); - - // the tool is not yet inserted into m_tools list when this function is - // called and will only be added to it if this function succeeds - virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool) = 0; - - // the tool is still in m_tools list when this function is called, it will - // only be deleted from it if it succeeds - virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool) = 0; - - // called when the tools enabled flag changes - virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable) = 0; - - // called when the tool is toggled - virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle) = 0; - - // called when the tools "can be toggled" flag changes - virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle) = 0; - - - // helper functions - // ---------------- - - // call this from derived class ctor/Create() to ensure that we have either - // wxTB_HORIZONTAL or wxTB_VERTICAL style, there is a lot of existing code - // which randomly checks either one or the other of them and gets confused - // if neither is set (and making one of them 0 is not an option neither as - // then the existing tests would break down) - void FixupStyle(); - - // un-toggle all buttons in the same radio group - void UnToggleRadioGroup(wxToolBarToolBase *tool); - - // make the size of the buttons big enough to fit the largest bitmap size - void AdjustToolBitmapSize(); - - // calls InsertTool() and deletes the tool if inserting it failed - wxToolBarToolBase *DoInsertNewTool(size_t pos, wxToolBarToolBase *tool) - { - if ( !InsertTool(pos, tool) ) - { - delete tool; - return NULL; - } - - return tool; - } - - // the list of all our tools - wxToolBarToolsList m_tools; - - // the offset of the first tool - int m_xMargin; - int m_yMargin; - - // the maximum number of toolbar rows/columns - int m_maxRows; - int m_maxCols; - - // the tool packing and separation - int m_toolPacking, - m_toolSeparation; - - // the size of the toolbar bitmaps - wxCoord m_defaultWidth, m_defaultHeight; - -private: - wxDECLARE_EVENT_TABLE(); - wxDECLARE_NO_COPY_CLASS(wxToolBarBase); -}; - -// deprecated function for creating the image for disabled buttons, use -// wxImage::ConvertToGreyscale() instead -#if WXWIN_COMPATIBILITY_2_8 - -wxDEPRECATED( bool wxCreateGreyedImage(const wxImage& in, wxImage& out) ); - -#endif // WXWIN_COMPATIBILITY_2_8 - - -#endif // wxUSE_TOOLBAR - -#endif - // _WX_TBARBASE_H_ - diff --git a/Externals/wxWidgets3/include/wx/testing.h b/Externals/wxWidgets3/include/wx/testing.h deleted file mode 100644 index bc8e603394..0000000000 --- a/Externals/wxWidgets3/include/wx/testing.h +++ /dev/null @@ -1,522 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/testing.h -// Purpose: helpers for GUI testing -// Author: Vaclav Slavik -// Created: 2012-08-28 -// Copyright: (c) 2012 Vaclav Slavik -// Licence: wxWindows Licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_TESTING_H_ -#define _WX_TESTING_H_ - -#include "wx/debug.h" -#include "wx/string.h" -#include "wx/modalhook.h" - -class WXDLLIMPEXP_FWD_CORE wxMessageDialogBase; -class WXDLLIMPEXP_FWD_CORE wxFileDialogBase; - -// ---------------------------------------------------------------------------- -// testing API -// ---------------------------------------------------------------------------- - -// Don't include this code when building the library itself -#ifndef WXBUILDING - -#include "wx/beforestd.h" -#include -#include -#include -#include "wx/afterstd.h" -#include "wx/cpp.h" -#include "wx/dialog.h" -#include "wx/msgdlg.h" -#include "wx/filedlg.h" - -#include - -class wxTestingModalHook; - -// This helper is used to construct the best possible name for the dialog of -// the given type using wxRTTI for this type, if any, and the C++ RTTI for -// either the type T statically or the dynamic type of "dlg" if it's non-null. -template -wxString wxGetDialogClassDescription(const wxClassInfo *ci, T* dlg = NULL) -{ - // We prefer to use the name from wxRTTI as it's guaranteed to be readable, - // unlike the name returned by type_info::name() which may need to be - // demangled, but if wxRTTI macros were not used for this object, it's - // better to return a not-very-readable-but-informative mangled name rather - // than a readable but useless "wxDialog". - if ( ci == wxCLASSINFO(wxDialog) ) - { - return wxString::Format("dialog of type \"%s\"", - (dlg ? typeid(*dlg) : typeid(T)).name()); - } - - // We consider that an unmangled name is clear enough to be used on its own. - return ci->GetClassName(); -} - -// Non-template base class for wxExpectModal (via wxExpectModalBase). -// Only used internally. -class wxModalExpectation -{ -public: - wxModalExpectation() : m_isOptional(false) {} - virtual ~wxModalExpectation() {} - - wxString GetDescription() const - { - return m_description.empty() ? GetDefaultDescription() : m_description; - } - - bool IsOptional() const { return m_isOptional; } - - virtual int Invoke(wxDialog *dlg) const = 0; - -protected: - // Override to return the default description of the expected dialog used - // if no specific description for this particular expectation is given. - virtual wxString GetDefaultDescription() const = 0; - - // User-provided description of the dialog, may be empty. - wxString m_description; - - // Is this dialog optional, i.e. not required to be shown? - bool m_isOptional; -}; - - -// This template is specialized for some of the standard dialog classes and can -// also be specialized outside of the library for the custom dialogs. -// -// All specializations must derive from wxExpectModalBase. -template class wxExpectModal; - - -/** - Base class for the expectation of a dialog of the given type T. - - Test code can derive ad hoc classes from this class directly and implement - its OnInvoked() to perform the necessary actions or derive wxExpectModal - and implement it once if the implementation of OnInvoked() is always the - same, i.e. depends just on the type T. - - T must be a class derived from wxDialog and E is the derived class type, - i.e. this is an example of using CRTP. The default value of E is fine in - case you're using this class as a base for your wxExpectModal<> - specialization anyhow but also if you don't use neither Optional() nor - Describe() methods, as the derived class type is only needed for them. - */ -template > -class wxExpectModalBase : public wxModalExpectation -{ -public: - typedef T DialogType; - typedef E ExpectationType; - - - // A note about these "modifier" methods: they return copies of this object - // and not a reference to the object itself (after modifying it) because - // this object is likely to be temporary and will be destroyed soon, while - // the new temporary created by these objects is bound to a const reference - // inside WX_TEST_IMPL_ADD_EXPECTATION() macro ensuring that its lifetime - // is prolonged until we can check if the expectations were met. - // - // This is also the reason these methods must be in this class and use - // CRTP: a copy of this object can't be created in the base class, which is - // abstract, and the copy must have the same type as the derived object to - // avoid slicing. - // - // Make sure you understand this comment in its entirety before considering - // modifying this code. - - - /** - Returns a copy of the expectation where the expected dialog is marked - as optional. - - Optional dialogs aren't required to appear, it's not an error if they - don't. - */ - ExpectationType Optional() const - { - ExpectationType e(*static_cast(this)); - e.m_isOptional = true; - return e; - } - - /** - Sets a description shown in the error message if the expectation fails. - - Using this method with unique descriptions for the different dialogs is - recommended to make it easier to find out which one of the expected - dialogs exactly was not shown. - */ - ExpectationType Describe(const wxString& description) const - { - ExpectationType e(*static_cast(this)); - e.m_description = description; - return e; - } - -protected: - virtual int Invoke(wxDialog *dlg) const - { - DialogType *t = dynamic_cast(dlg); - if ( t ) - return OnInvoked(t); - else - return wxID_NONE; // not handled - } - - /// Returns description of the expected dialog (by default, its class). - virtual wxString GetDefaultDescription() const - { - return wxGetDialogClassDescription(wxCLASSINFO(T)); - } - - /** - This method is called when ShowModal() was invoked on a dialog of type T. - - @return Return value is used as ShowModal()'s return value. - */ - virtual int OnInvoked(DialogType *dlg) const = 0; -}; - - -// wxExpectModal specializations for common dialogs: - -template -class wxExpectDismissableModal - : public wxExpectModalBase > -{ -public: - explicit wxExpectDismissableModal(int id) - { - switch ( id ) - { - case wxYES: - m_id = wxID_YES; - break; - case wxNO: - m_id = wxID_NO; - break; - case wxCANCEL: - m_id = wxID_CANCEL; - break; - case wxOK: - m_id = wxID_OK; - break; - case wxHELP: - m_id = wxID_HELP; - break; - default: - m_id = id; - break; - } - } - -protected: - virtual int OnInvoked(T *WXUNUSED(dlg)) const - { - return m_id; - } - - int m_id; -}; - -template<> -class wxExpectModal - : public wxExpectDismissableModal -{ -public: - explicit wxExpectModal(int id) - : wxExpectDismissableModal(id) - { - } - -protected: - virtual wxString GetDefaultDescription() const - { - // It can be useful to show which buttons the expected message box was - // supposed to have, in case there could have been several of them. - wxString details; - switch ( m_id ) - { - case wxID_YES: - case wxID_NO: - details = "wxYES_NO style"; - break; - - case wxID_CANCEL: - details = "wxCANCEL style"; - break; - - case wxID_OK: - details = "wxOK style"; - break; - - default: - details.Printf("a button with ID=%d", m_id); - break; - } - - return "wxMessageDialog with " + details; - } -}; - -class wxExpectAny : public wxExpectDismissableModal -{ -public: - explicit wxExpectAny(int id) - : wxExpectDismissableModal(id) - { - } -}; - -#if wxUSE_FILEDLG - -template<> -class wxExpectModal : public wxExpectModalBase -{ -public: - wxExpectModal(const wxString& path, int id = wxID_OK) - : m_path(path), m_id(id) - { - } - -protected: - virtual int OnInvoked(wxFileDialog *dlg) const - { - dlg->SetPath(m_path); - return m_id; - } - - wxString m_path; - int m_id; -}; - -#endif - -// Implementation of wxModalDialogHook for use in testing, with -// wxExpectModal and the wxTEST_DIALOG() macro. It is not intended for -// direct use, use the macro instead. -class wxTestingModalHook : public wxModalDialogHook -{ -public: - // This object is created with the location of the macro containing it by - // wxTEST_DIALOG macro, otherwise it falls back to the location of this - // line itself, which is not very useful, so normally you should provide - // your own values. - wxTestingModalHook(const char* file = NULL, - int line = 0, - const char* func = NULL) - : m_file(file), m_line(line), m_func(func) - { - Register(); - } - - // Called to verify that all expectations were met. This cannot be done in - // the destructor, because ReportFailure() may throw (either because it's - // overriden or because wx's assertions handling is, globally). And - // throwing from the destructor would introduce all sort of problems, - // including messing up the order of errors in some cases. - void CheckUnmetExpectations() - { - while ( !m_expectations.empty() ) - { - const wxModalExpectation *expect = m_expectations.front(); - m_expectations.pop(); - if ( expect->IsOptional() ) - continue; - - ReportFailure - ( - wxString::Format - ( - "Expected %s was not shown.", - expect->GetDescription() - ) - ); - break; - } - } - - void AddExpectation(const wxModalExpectation& e) - { - m_expectations.push(&e); - } - -protected: - virtual int Enter(wxDialog *dlg) - { - while ( !m_expectations.empty() ) - { - const wxModalExpectation *expect = m_expectations.front(); - m_expectations.pop(); - - int ret = expect->Invoke(dlg); - if ( ret != wxID_NONE ) - return ret; // dialog shown as expected - - // not showing an optional dialog is OK, but showing an unexpected - // one definitely isn't: - if ( !expect->IsOptional() ) - { - ReportFailure - ( - wxString::Format - ( - "%s was shown unexpectedly, expected %s.", - DescribeUnexpectedDialog(dlg), - expect->GetDescription() - ) - ); - return wxID_NONE; - } - // else: try the next expectation in the chain - } - - ReportFailure - ( - wxString::Format - ( - "%s was shown unexpectedly.", - DescribeUnexpectedDialog(dlg) - ) - ); - return wxID_NONE; - } - -protected: - // This method may be overridden to provide a better description of - // (unexpected) dialogs, e.g. add knowledge of custom dialogs used by the - // program here. - virtual wxString DescribeUnexpectedDialog(wxDialog* dlg) const - { - // Message boxes are handled specially here just because they are so - // ubiquitous. - if ( wxMessageDialog *msgdlg = dynamic_cast(dlg) ) - { - return wxString::Format - ( - "A message box \"%s\"", - msgdlg->GetMessage() - ); - } - - return wxString::Format - ( - "A %s with title \"%s\"", - wxGetDialogClassDescription(dlg->GetClassInfo(), dlg), - dlg->GetTitle() - ); - } - - // This method may be overridden to change the way test failures are - // handled. By default they result in an assertion failure which, of - // course, can itself be customized. - virtual void ReportFailure(const wxString& msg) - { - wxFAIL_MSG_AT( msg, - m_file ? m_file : __FILE__, - m_line ? m_line : __LINE__, - m_func ? m_func : __WXFUNCTION__ ); - } - -private: - const char* const m_file; - const int m_line; - const char* const m_func; - - std::queue m_expectations; - - wxDECLARE_NO_COPY_CLASS(wxTestingModalHook); -}; - - -// Redefining this value makes it possible to customize the hook class, -// including e.g. its error reporting. -#ifndef wxTEST_DIALOG_HOOK_CLASS - #define wxTEST_DIALOG_HOOK_CLASS wxTestingModalHook -#endif - -#define WX_TEST_IMPL_ADD_EXPECTATION(pos, expect) \ - const wxModalExpectation& wx_exp##pos = expect; \ - wx_hook.AddExpectation(wx_exp##pos); - -/** - Runs given code with all modal dialogs redirected to wxExpectModal - hooks, instead of being shown to the user. - - The first argument is any valid expression, typically a function call. The - remaining arguments are wxExpectModal instances defining the dialogs - that are expected to be shown, in order of appearance. - - Some typical examples: - - @code - wxTEST_DIALOG - ( - rc = dlg.ShowModal(), - wxExpectModal(wxGetCwd() + "/test.txt") - ); - @endcode - - Sometimes, the code may show more than one dialog: - - @code - wxTEST_DIALOG - ( - RunSomeFunction(), - wxExpectModal(wxNO), - wxExpectModal(wxYES), - wxExpectModal(wxGetCwd() + "/test.txt") - ); - @endcode - - Notice that wxExpectModal has some convenience methods for further - tweaking the expectations. For example, it's possible to mark an expected - dialog as @em optional for situations when a dialog may be shown, but isn't - required to, by calling the Optional() method: - - @code - wxTEST_DIALOG - ( - RunSomeFunction(), - wxExpectModal(wxNO), - wxExpectModal(wxGetCwd() + "/test.txt").Optional() - ); - @endcode - - @note By default, errors are reported with wxFAIL_MSG(). You may customize this by - implementing a class derived from wxTestingModalHook, overriding its - ReportFailure() method and redefining the wxTEST_DIALOG_HOOK_CLASS - macro to be the name of this class. - - @note Custom dialogs are supported too. All you have to do is to specialize - wxExpectModal<> for your dialog type and implement its OnInvoked() - method. - */ -#ifdef HAVE_VARIADIC_MACROS - -// See wx/cpp.h for the explanations of this hack. -#if defined(__GNUC__) && __GNUC__ == 3 - #pragma GCC system_header -#endif /* gcc-3.x */ - -#define wxTEST_DIALOG(codeToRun, ...) \ - { \ - wxTEST_DIALOG_HOOK_CLASS wx_hook(__FILE__, __LINE__, __WXFUNCTION__); \ - wxCALL_FOR_EACH(WX_TEST_IMPL_ADD_EXPECTATION, __VA_ARGS__) \ - codeToRun; \ - wx_hook.CheckUnmetExpectations(); \ - } -#endif /* HAVE_VARIADIC_MACROS */ - -#endif // !WXBUILDING - -#endif // _WX_TESTING_H_ diff --git a/Externals/wxWidgets3/include/wx/textbuf.h b/Externals/wxWidgets3/include/wx/textbuf.h deleted file mode 100644 index a2511b427d..0000000000 --- a/Externals/wxWidgets3/include/wx/textbuf.h +++ /dev/null @@ -1,210 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/textbuf.h -// Purpose: class wxTextBuffer to work with text buffers of _small_ size -// (buffer is fully loaded in memory) and which understands CR/LF -// differences between platforms. -// Created: 14.11.01 -// Author: Morten Hanssen, Vadim Zeitlin -// Copyright: (c) 1998-2001 Morten Hanssen, Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_TEXTBUFFER_H -#define _WX_TEXTBUFFER_H - -#include "wx/defs.h" -#include "wx/arrstr.h" -#include "wx/convauto.h" - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -// the line termination type (kept wxTextFileType name for compatibility) -enum wxTextFileType -{ - wxTextFileType_None, // incomplete (the last line of the file only) - wxTextFileType_Unix, // line is terminated with 'LF' = 0xA = 10 = '\n' - wxTextFileType_Dos, // 'CR' 'LF' - wxTextFileType_Mac, // 'CR' = 0xD = 13 = '\r' - wxTextFileType_Os2 // 'CR' 'LF' -}; - -#include "wx/string.h" - -#if wxUSE_TEXTBUFFER - -#include "wx/dynarray.h" - -// ---------------------------------------------------------------------------- -// wxTextBuffer -// ---------------------------------------------------------------------------- - -WX_DEFINE_USER_EXPORTED_ARRAY_INT(wxTextFileType, - wxArrayLinesType, - class WXDLLIMPEXP_BASE); - -#endif // wxUSE_TEXTBUFFER - -class WXDLLIMPEXP_BASE wxTextBuffer -{ -public: - // constants and static functions - // default type for current platform (determined at compile time) - static const wxTextFileType typeDefault; - - // this function returns a string which is identical to "text" passed in - // except that the line terminator characters are changed to correspond the - // given type. Called with the default argument, the function translates - // the string to the native format (Unix for Unix, DOS for Windows, ...). - static wxString Translate(const wxString& text, - wxTextFileType type = typeDefault); - - // get the buffer termination string - static const wxChar *GetEOL(wxTextFileType type = typeDefault); - - // the static methods of this class are compiled in even when - // !wxUSE_TEXTBUFFER because they are used by the library itself, but the - // rest can be left out -#if wxUSE_TEXTBUFFER - - // buffer operations - // ----------------- - - // buffer exists? - bool Exists() const; - - // create the buffer if it doesn't already exist - bool Create(); - - // same as Create() but with (another) buffer name - bool Create(const wxString& strBufferName); - - // Open() also loads buffer in memory on success - bool Open(const wxMBConv& conv = wxConvAuto()); - - // same as Open() but with (another) buffer name - bool Open(const wxString& strBufferName, const wxMBConv& conv = wxConvAuto()); - - // closes the buffer and frees memory, losing all changes - bool Close(); - - // is buffer currently opened? - bool IsOpened() const { return m_isOpened; } - - // accessors - // --------- - - // get the number of lines in the buffer - size_t GetLineCount() const { return m_aLines.size(); } - - // the returned line may be modified (but don't add CR/LF at the end!) - wxString& GetLine(size_t n) { return m_aLines[n]; } - const wxString& GetLine(size_t n) const { return m_aLines[n]; } - wxString& operator[](size_t n) { return m_aLines[n]; } - const wxString& operator[](size_t n) const { return m_aLines[n]; } - - // the current line has meaning only when you're using - // GetFirstLine()/GetNextLine() functions, it doesn't get updated when - // you're using "direct access" i.e. GetLine() - size_t GetCurrentLine() const { return m_nCurLine; } - void GoToLine(size_t n) { m_nCurLine = n; } - bool Eof() const { return m_nCurLine == m_aLines.size(); } - - // these methods allow more "iterator-like" traversal of the list of - // lines, i.e. you may write something like: - // for ( str = GetFirstLine(); !Eof(); str = GetNextLine() ) { ... } - - // NB: const is commented out because not all compilers understand - // 'mutable' keyword yet (m_nCurLine should be mutable) - wxString& GetFirstLine() /* const */ - { return m_aLines.empty() ? ms_eof : m_aLines[m_nCurLine = 0]; } - wxString& GetNextLine() /* const */ - { return ++m_nCurLine == m_aLines.size() ? ms_eof - : m_aLines[m_nCurLine]; } - wxString& GetPrevLine() /* const */ - { wxASSERT(m_nCurLine > 0); return m_aLines[--m_nCurLine]; } - wxString& GetLastLine() /* const */ - { m_nCurLine = m_aLines.size() - 1; return m_aLines.Last(); } - - // get the type of the line (see also GetEOL) - wxTextFileType GetLineType(size_t n) const { return m_aTypes[n]; } - - // guess the type of buffer - wxTextFileType GuessType() const; - - // get the name of the buffer - const wxString& GetName() const { return m_strBufferName; } - - // add/remove lines - // ---------------- - - // add a line to the end - void AddLine(const wxString& str, wxTextFileType type = typeDefault) - { m_aLines.push_back(str); m_aTypes.push_back(type); } - // insert a line before the line number n - void InsertLine(const wxString& str, - size_t n, - wxTextFileType type = typeDefault) - { - m_aLines.insert(m_aLines.begin() + n, str); - m_aTypes.insert(m_aTypes.begin()+n, type); - } - - // delete one line - void RemoveLine(size_t n) - { - m_aLines.erase(m_aLines.begin() + n); - m_aTypes.erase(m_aTypes.begin() + n); - } - - // remove all lines - void Clear() { m_aLines.clear(); m_aTypes.clear(); m_nCurLine = 0; } - - // change the buffer (default argument means "don't change type") - // possibly in another format - bool Write(wxTextFileType typeNew = wxTextFileType_None, - const wxMBConv& conv = wxConvAuto()); - - // dtor - virtual ~wxTextBuffer(); - -protected: - // ctors - // ----- - - // default ctor, use Open(string) - wxTextBuffer() { m_nCurLine = 0; m_isOpened = false; } - - // ctor from filename - wxTextBuffer(const wxString& strBufferName); - - enum wxTextBufferOpenMode { ReadAccess, WriteAccess }; - - // Must implement these in derived classes. - virtual bool OnExists() const = 0; - virtual bool OnOpen(const wxString &strBufferName, - wxTextBufferOpenMode openmode) = 0; - virtual bool OnClose() = 0; - virtual bool OnRead(const wxMBConv& conv) = 0; - virtual bool OnWrite(wxTextFileType typeNew, const wxMBConv& conv) = 0; - - static wxString ms_eof; // dummy string returned at EOF - wxString m_strBufferName; // name of the buffer - -private: - wxArrayLinesType m_aTypes; // type of each line - wxArrayString m_aLines; // lines of file - - size_t m_nCurLine; // number of current line in the buffer - - bool m_isOpened; // was the buffer successfully opened the last time? -#endif // wxUSE_TEXTBUFFER - - // copy ctor/assignment operator not implemented - wxTextBuffer(const wxTextBuffer&); - wxTextBuffer& operator=(const wxTextBuffer&); -}; - -#endif // _WX_TEXTBUFFER_H - diff --git a/Externals/wxWidgets3/include/wx/textcompleter.h b/Externals/wxWidgets3/include/wx/textcompleter.h deleted file mode 100644 index bc4135f8bf..0000000000 --- a/Externals/wxWidgets3/include/wx/textcompleter.h +++ /dev/null @@ -1,86 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/textcompleter.h -// Purpose: Declaration of wxTextCompleter class. -// Author: Vadim Zeitlin -// Created: 2011-04-13 -// Copyright: (c) 2011 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_TEXTCOMPLETER_H_ -#define _WX_TEXTCOMPLETER_H_ - -// ---------------------------------------------------------------------------- -// wxTextCompleter: used by wxTextEnter::AutoComplete() -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxTextCompleter -{ -public: - wxTextCompleter() { } - - // The virtual functions to be implemented by the derived classes: the - // first one is called to start preparing for completions for the given - // prefix and, if it returns true, GetNext() is called until it returns an - // empty string indicating that there are no more completions. - virtual bool Start(const wxString& prefix) = 0; - virtual wxString GetNext() = 0; - - virtual ~wxTextCompleter(); - -private: - wxDECLARE_NO_COPY_CLASS(wxTextCompleter); -}; - -// ---------------------------------------------------------------------------- -// wxTextCompleterSimple: returns the entire set of completions at once -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxTextCompleterSimple : public wxTextCompleter -{ -public: - wxTextCompleterSimple() { } - - // Must be implemented to return all the completions for the given prefix. - virtual void GetCompletions(const wxString& prefix, wxArrayString& res) = 0; - - virtual bool Start(const wxString& prefix); - virtual wxString GetNext(); - -private: - wxArrayString m_completions; - unsigned m_index; - - wxDECLARE_NO_COPY_CLASS(wxTextCompleterSimple); -}; - -// ---------------------------------------------------------------------------- -// wxTextCompleterFixed: Trivial wxTextCompleter implementation which always -// returns the same fixed array of completions. -// ---------------------------------------------------------------------------- - -// NB: This class is private and intentionally not documented as it is -// currently used only for implementation of completion with the fixed list -// of strings only by wxWidgets itself, do not use it outside of wxWidgets. - -class wxTextCompleterFixed : public wxTextCompleterSimple -{ -public: - void SetCompletions(const wxArrayString& strings) - { - m_strings = strings; - } - - virtual void GetCompletions(const wxString& WXUNUSED(prefix), - wxArrayString& res) - { - res = m_strings; - } - -private: - wxArrayString m_strings; -}; - - -#endif // _WX_TEXTCOMPLETER_H_ - diff --git a/Externals/wxWidgets3/include/wx/textctrl.h b/Externals/wxWidgets3/include/wx/textctrl.h deleted file mode 100644 index 341409530e..0000000000 --- a/Externals/wxWidgets3/include/wx/textctrl.h +++ /dev/null @@ -1,913 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/textctrl.h -// Purpose: wxTextAttr and wxTextCtrlBase class - the interface of wxTextCtrl -// Author: Vadim Zeitlin -// Modified by: -// Created: 13.07.99 -// Copyright: (c) Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_TEXTCTRL_H_BASE_ -#define _WX_TEXTCTRL_H_BASE_ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/defs.h" - -#if wxUSE_TEXTCTRL - -#include "wx/control.h" // the base class -#include "wx/textentry.h" // single-line text entry interface -#include "wx/dynarray.h" // wxArrayInt -#include "wx/gdicmn.h" // wxPoint - -#if wxUSE_STD_IOSTREAM - #include "wx/ioswrap.h" - #define wxHAS_TEXT_WINDOW_STREAM 1 -#else - #define wxHAS_TEXT_WINDOW_STREAM 0 -#endif - -class WXDLLIMPEXP_FWD_CORE wxTextCtrl; -class WXDLLIMPEXP_FWD_CORE wxTextCtrlBase; - -// ---------------------------------------------------------------------------- -// wxTextCtrl types -// ---------------------------------------------------------------------------- - -// wxTextCoord is the line or row number (which should have been unsigned but -// is long for backwards compatibility) -typedef long wxTextCoord; - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -extern WXDLLIMPEXP_DATA_CORE(const char) wxTextCtrlNameStr[]; - -// this is intentionally not enum to avoid warning fixes with -// typecasting from enum type to wxTextCoord -const wxTextCoord wxOutOfRangeTextCoord = -1; -const wxTextCoord wxInvalidTextCoord = -2; - -// ---------------------------------------------------------------------------- -// wxTextCtrl style flags -// ---------------------------------------------------------------------------- - -#define wxTE_NO_VSCROLL 0x0002 - -#define wxTE_READONLY 0x0010 -#define wxTE_MULTILINE 0x0020 -#define wxTE_PROCESS_TAB 0x0040 - -// alignment flags -#define wxTE_LEFT 0x0000 // 0x0000 -#define wxTE_CENTER wxALIGN_CENTER_HORIZONTAL // 0x0100 -#define wxTE_RIGHT wxALIGN_RIGHT // 0x0200 -#define wxTE_CENTRE wxTE_CENTER - -// this style means to use RICHEDIT control and does something only under wxMSW -// and Win32 and is silently ignored under all other platforms -#define wxTE_RICH 0x0080 - -#define wxTE_PROCESS_ENTER 0x0400 -#define wxTE_PASSWORD 0x0800 - -// automatically detect the URLs and generate the events when mouse is -// moved/clicked over an URL -// -// this is for Win32 richedit and wxGTK2 multiline controls only so far -#define wxTE_AUTO_URL 0x1000 - -// by default, the Windows text control doesn't show the selection when it -// doesn't have focus - use this style to force it to always show it -#define wxTE_NOHIDESEL 0x2000 - -// use wxHSCROLL to not wrap text at all, wxTE_CHARWRAP to wrap it at any -// position and wxTE_WORDWRAP to wrap at words boundary -// -// if no wrapping style is given at all, the control wraps at word boundary -#define wxTE_DONTWRAP wxHSCROLL -#define wxTE_CHARWRAP 0x4000 // wrap at any position -#define wxTE_WORDWRAP 0x0001 // wrap only at words boundaries -#define wxTE_BESTWRAP 0x0000 // this is the default - -#if WXWIN_COMPATIBILITY_2_8 - // this style is (or at least should be) on by default now, don't use it - #define wxTE_AUTO_SCROLL 0 -#endif // WXWIN_COMPATIBILITY_2_8 - -// force using RichEdit version 2.0 or 3.0 instead of 1.0 (default) for -// wxTE_RICH controls - can be used together with or instead of wxTE_RICH -#define wxTE_RICH2 0x8000 - -#if defined(__WXOSX_IPHONE__) -#define wxTE_CAPITALIZE wxTE_RICH2 -#else -#define wxTE_CAPITALIZE 0 -#endif - -// ---------------------------------------------------------------------------- -// wxTextCtrl file types -// ---------------------------------------------------------------------------- - -#define wxTEXT_TYPE_ANY 0 - -// ---------------------------------------------------------------------------- -// wxTextCtrl::HitTest return values -// ---------------------------------------------------------------------------- - -// the point asked is ... -enum wxTextCtrlHitTestResult -{ - wxTE_HT_UNKNOWN = -2, // this means HitTest() is simply not implemented - wxTE_HT_BEFORE, // either to the left or upper - wxTE_HT_ON_TEXT, // directly on - wxTE_HT_BELOW, // below [the last line] - wxTE_HT_BEYOND // after [the end of line] -}; -// ... the character returned - -// ---------------------------------------------------------------------------- -// Types for wxTextAttr -// ---------------------------------------------------------------------------- - -// Alignment - -enum wxTextAttrAlignment -{ - wxTEXT_ALIGNMENT_DEFAULT, - wxTEXT_ALIGNMENT_LEFT, - wxTEXT_ALIGNMENT_CENTRE, - wxTEXT_ALIGNMENT_CENTER = wxTEXT_ALIGNMENT_CENTRE, - wxTEXT_ALIGNMENT_RIGHT, - wxTEXT_ALIGNMENT_JUSTIFIED -}; - -// Flags to indicate which attributes are being applied -enum wxTextAttrFlags -{ - wxTEXT_ATTR_TEXT_COLOUR = 0x00000001, - wxTEXT_ATTR_BACKGROUND_COLOUR = 0x00000002, - - wxTEXT_ATTR_FONT_FACE = 0x00000004, - wxTEXT_ATTR_FONT_POINT_SIZE = 0x00000008, - wxTEXT_ATTR_FONT_PIXEL_SIZE = 0x10000000, - wxTEXT_ATTR_FONT_WEIGHT = 0x00000010, - wxTEXT_ATTR_FONT_ITALIC = 0x00000020, - wxTEXT_ATTR_FONT_UNDERLINE = 0x00000040, - wxTEXT_ATTR_FONT_STRIKETHROUGH = 0x08000000, - wxTEXT_ATTR_FONT_ENCODING = 0x02000000, - wxTEXT_ATTR_FONT_FAMILY = 0x04000000, - wxTEXT_ATTR_FONT_SIZE = \ - ( wxTEXT_ATTR_FONT_POINT_SIZE | wxTEXT_ATTR_FONT_PIXEL_SIZE ), - wxTEXT_ATTR_FONT = \ - ( wxTEXT_ATTR_FONT_FACE | wxTEXT_ATTR_FONT_SIZE | wxTEXT_ATTR_FONT_WEIGHT | \ - wxTEXT_ATTR_FONT_ITALIC | wxTEXT_ATTR_FONT_UNDERLINE | wxTEXT_ATTR_FONT_STRIKETHROUGH | wxTEXT_ATTR_FONT_ENCODING | wxTEXT_ATTR_FONT_FAMILY ), - - wxTEXT_ATTR_ALIGNMENT = 0x00000080, - wxTEXT_ATTR_LEFT_INDENT = 0x00000100, - wxTEXT_ATTR_RIGHT_INDENT = 0x00000200, - wxTEXT_ATTR_TABS = 0x00000400, - wxTEXT_ATTR_PARA_SPACING_AFTER = 0x00000800, - wxTEXT_ATTR_PARA_SPACING_BEFORE = 0x00001000, - wxTEXT_ATTR_LINE_SPACING = 0x00002000, - wxTEXT_ATTR_CHARACTER_STYLE_NAME = 0x00004000, - wxTEXT_ATTR_PARAGRAPH_STYLE_NAME = 0x00008000, - wxTEXT_ATTR_LIST_STYLE_NAME = 0x00010000, - - wxTEXT_ATTR_BULLET_STYLE = 0x00020000, - wxTEXT_ATTR_BULLET_NUMBER = 0x00040000, - wxTEXT_ATTR_BULLET_TEXT = 0x00080000, - wxTEXT_ATTR_BULLET_NAME = 0x00100000, - - wxTEXT_ATTR_BULLET = \ - ( wxTEXT_ATTR_BULLET_STYLE | wxTEXT_ATTR_BULLET_NUMBER | wxTEXT_ATTR_BULLET_TEXT | \ - wxTEXT_ATTR_BULLET_NAME ), - - - wxTEXT_ATTR_URL = 0x00200000, - wxTEXT_ATTR_PAGE_BREAK = 0x00400000, - wxTEXT_ATTR_EFFECTS = 0x00800000, - wxTEXT_ATTR_OUTLINE_LEVEL = 0x01000000, - - wxTEXT_ATTR_AVOID_PAGE_BREAK_BEFORE = 0x20000000, - wxTEXT_ATTR_AVOID_PAGE_BREAK_AFTER = 0x40000000, - - /*! - * Character and paragraph combined styles - */ - - wxTEXT_ATTR_CHARACTER = \ - (wxTEXT_ATTR_FONT|wxTEXT_ATTR_EFFECTS| \ - wxTEXT_ATTR_BACKGROUND_COLOUR|wxTEXT_ATTR_TEXT_COLOUR|wxTEXT_ATTR_CHARACTER_STYLE_NAME|wxTEXT_ATTR_URL), - - wxTEXT_ATTR_PARAGRAPH = \ - (wxTEXT_ATTR_ALIGNMENT|wxTEXT_ATTR_LEFT_INDENT|wxTEXT_ATTR_RIGHT_INDENT|wxTEXT_ATTR_TABS|\ - wxTEXT_ATTR_PARA_SPACING_BEFORE|wxTEXT_ATTR_PARA_SPACING_AFTER|wxTEXT_ATTR_LINE_SPACING|\ - wxTEXT_ATTR_BULLET|wxTEXT_ATTR_PARAGRAPH_STYLE_NAME|wxTEXT_ATTR_LIST_STYLE_NAME|wxTEXT_ATTR_OUTLINE_LEVEL|\ - wxTEXT_ATTR_PAGE_BREAK|wxTEXT_ATTR_AVOID_PAGE_BREAK_BEFORE|wxTEXT_ATTR_AVOID_PAGE_BREAK_AFTER), - - wxTEXT_ATTR_ALL = (wxTEXT_ATTR_CHARACTER|wxTEXT_ATTR_PARAGRAPH) -}; - -/*! - * Styles for wxTextAttr::SetBulletStyle - */ -enum wxTextAttrBulletStyle -{ - wxTEXT_ATTR_BULLET_STYLE_NONE = 0x00000000, - wxTEXT_ATTR_BULLET_STYLE_ARABIC = 0x00000001, - wxTEXT_ATTR_BULLET_STYLE_LETTERS_UPPER = 0x00000002, - wxTEXT_ATTR_BULLET_STYLE_LETTERS_LOWER = 0x00000004, - wxTEXT_ATTR_BULLET_STYLE_ROMAN_UPPER = 0x00000008, - wxTEXT_ATTR_BULLET_STYLE_ROMAN_LOWER = 0x00000010, - wxTEXT_ATTR_BULLET_STYLE_SYMBOL = 0x00000020, - wxTEXT_ATTR_BULLET_STYLE_BITMAP = 0x00000040, - wxTEXT_ATTR_BULLET_STYLE_PARENTHESES = 0x00000080, - wxTEXT_ATTR_BULLET_STYLE_PERIOD = 0x00000100, - wxTEXT_ATTR_BULLET_STYLE_STANDARD = 0x00000200, - wxTEXT_ATTR_BULLET_STYLE_RIGHT_PARENTHESIS = 0x00000400, - wxTEXT_ATTR_BULLET_STYLE_OUTLINE = 0x00000800, - - wxTEXT_ATTR_BULLET_STYLE_ALIGN_LEFT = 0x00000000, - wxTEXT_ATTR_BULLET_STYLE_ALIGN_RIGHT = 0x00001000, - wxTEXT_ATTR_BULLET_STYLE_ALIGN_CENTRE = 0x00002000, - - wxTEXT_ATTR_BULLET_STYLE_CONTINUATION = 0x00004000 -}; - -/*! - * Styles for wxTextAttr::SetTextEffects - */ -enum wxTextAttrEffects -{ - wxTEXT_ATTR_EFFECT_NONE = 0x00000000, - wxTEXT_ATTR_EFFECT_CAPITALS = 0x00000001, - wxTEXT_ATTR_EFFECT_SMALL_CAPITALS = 0x00000002, - wxTEXT_ATTR_EFFECT_STRIKETHROUGH = 0x00000004, - wxTEXT_ATTR_EFFECT_DOUBLE_STRIKETHROUGH = 0x00000008, - wxTEXT_ATTR_EFFECT_SHADOW = 0x00000010, - wxTEXT_ATTR_EFFECT_EMBOSS = 0x00000020, - wxTEXT_ATTR_EFFECT_OUTLINE = 0x00000040, - wxTEXT_ATTR_EFFECT_ENGRAVE = 0x00000080, - wxTEXT_ATTR_EFFECT_SUPERSCRIPT = 0x00000100, - wxTEXT_ATTR_EFFECT_SUBSCRIPT = 0x00000200, - wxTEXT_ATTR_EFFECT_RTL = 0x00000400, - wxTEXT_ATTR_EFFECT_SUPPRESS_HYPHENATION = 0x00001000 -}; - -/*! - * Line spacing values - */ -enum wxTextAttrLineSpacing -{ - wxTEXT_ATTR_LINE_SPACING_NORMAL = 10, - wxTEXT_ATTR_LINE_SPACING_HALF = 15, - wxTEXT_ATTR_LINE_SPACING_TWICE = 20 -}; - -// ---------------------------------------------------------------------------- -// wxTextAttr: a structure containing the visual attributes of a text -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxTextAttr -{ -public: - // ctors - wxTextAttr() { Init(); } - wxTextAttr(const wxTextAttr& attr) { Init(); Copy(attr); } - wxTextAttr(const wxColour& colText, - const wxColour& colBack = wxNullColour, - const wxFont& font = wxNullFont, - wxTextAttrAlignment alignment = wxTEXT_ALIGNMENT_DEFAULT); - - // Initialise this object. - void Init(); - - // Copy - void Copy(const wxTextAttr& attr); - - // Assignment - void operator= (const wxTextAttr& attr); - - // Equality test - bool operator== (const wxTextAttr& attr) const; - - // Partial equality test. If @a weakTest is @true, attributes of this object do not - // have to be present if those attributes of @a attr are present. If @a weakTest is - // @false, the function will fail if an attribute is present in @a attr but not - // in this object. - bool EqPartial(const wxTextAttr& attr, bool weakTest = true) const; - - // Get attributes from font. - bool GetFontAttributes(const wxFont& font, int flags = wxTEXT_ATTR_FONT); - - // setters - void SetTextColour(const wxColour& colText) { m_colText = colText; m_flags |= wxTEXT_ATTR_TEXT_COLOUR; } - void SetBackgroundColour(const wxColour& colBack) { m_colBack = colBack; m_flags |= wxTEXT_ATTR_BACKGROUND_COLOUR; } - void SetAlignment(wxTextAttrAlignment alignment) { m_textAlignment = alignment; m_flags |= wxTEXT_ATTR_ALIGNMENT; } - void SetTabs(const wxArrayInt& tabs) { m_tabs = tabs; m_flags |= wxTEXT_ATTR_TABS; } - void SetLeftIndent(int indent, int subIndent = 0) { m_leftIndent = indent; m_leftSubIndent = subIndent; m_flags |= wxTEXT_ATTR_LEFT_INDENT; } - void SetRightIndent(int indent) { m_rightIndent = indent; m_flags |= wxTEXT_ATTR_RIGHT_INDENT; } - - void SetFontSize(int pointSize) { m_fontSize = pointSize; m_flags &= ~wxTEXT_ATTR_FONT_SIZE; m_flags |= wxTEXT_ATTR_FONT_POINT_SIZE; } - void SetFontPointSize(int pointSize) { m_fontSize = pointSize; m_flags &= ~wxTEXT_ATTR_FONT_SIZE; m_flags |= wxTEXT_ATTR_FONT_POINT_SIZE; } - void SetFontPixelSize(int pixelSize) { m_fontSize = pixelSize; m_flags &= ~wxTEXT_ATTR_FONT_SIZE; m_flags |= wxTEXT_ATTR_FONT_PIXEL_SIZE; } - void SetFontStyle(wxFontStyle fontStyle) { m_fontStyle = fontStyle; m_flags |= wxTEXT_ATTR_FONT_ITALIC; } - void SetFontWeight(wxFontWeight fontWeight) { m_fontWeight = fontWeight; m_flags |= wxTEXT_ATTR_FONT_WEIGHT; } - void SetFontFaceName(const wxString& faceName) { m_fontFaceName = faceName; m_flags |= wxTEXT_ATTR_FONT_FACE; } - void SetFontUnderlined(bool underlined) { m_fontUnderlined = underlined; m_flags |= wxTEXT_ATTR_FONT_UNDERLINE; } - void SetFontStrikethrough(bool strikethrough) { m_fontStrikethrough = strikethrough; m_flags |= wxTEXT_ATTR_FONT_STRIKETHROUGH; } - void SetFontEncoding(wxFontEncoding encoding) { m_fontEncoding = encoding; m_flags |= wxTEXT_ATTR_FONT_ENCODING; } - void SetFontFamily(wxFontFamily family) { m_fontFamily = family; m_flags |= wxTEXT_ATTR_FONT_FAMILY; } - - // Set font - void SetFont(const wxFont& font, int flags = (wxTEXT_ATTR_FONT & ~wxTEXT_ATTR_FONT_PIXEL_SIZE)) { GetFontAttributes(font, flags); } - - void SetFlags(long flags) { m_flags = flags; } - - void SetCharacterStyleName(const wxString& name) { m_characterStyleName = name; m_flags |= wxTEXT_ATTR_CHARACTER_STYLE_NAME; } - void SetParagraphStyleName(const wxString& name) { m_paragraphStyleName = name; m_flags |= wxTEXT_ATTR_PARAGRAPH_STYLE_NAME; } - void SetListStyleName(const wxString& name) { m_listStyleName = name; SetFlags(GetFlags() | wxTEXT_ATTR_LIST_STYLE_NAME); } - void SetParagraphSpacingAfter(int spacing) { m_paragraphSpacingAfter = spacing; m_flags |= wxTEXT_ATTR_PARA_SPACING_AFTER; } - void SetParagraphSpacingBefore(int spacing) { m_paragraphSpacingBefore = spacing; m_flags |= wxTEXT_ATTR_PARA_SPACING_BEFORE; } - void SetLineSpacing(int spacing) { m_lineSpacing = spacing; m_flags |= wxTEXT_ATTR_LINE_SPACING; } - void SetBulletStyle(int style) { m_bulletStyle = style; m_flags |= wxTEXT_ATTR_BULLET_STYLE; } - void SetBulletNumber(int n) { m_bulletNumber = n; m_flags |= wxTEXT_ATTR_BULLET_NUMBER; } - void SetBulletText(const wxString& text) { m_bulletText = text; m_flags |= wxTEXT_ATTR_BULLET_TEXT; } - void SetBulletFont(const wxString& bulletFont) { m_bulletFont = bulletFont; } - void SetBulletName(const wxString& name) { m_bulletName = name; m_flags |= wxTEXT_ATTR_BULLET_NAME; } - void SetURL(const wxString& url) { m_urlTarget = url; m_flags |= wxTEXT_ATTR_URL; } - void SetPageBreak(bool pageBreak = true) { SetFlags(pageBreak ? (GetFlags() | wxTEXT_ATTR_PAGE_BREAK) : (GetFlags() & ~wxTEXT_ATTR_PAGE_BREAK)); } - void SetTextEffects(int effects) { m_textEffects = effects; SetFlags(GetFlags() | wxTEXT_ATTR_EFFECTS); } - void SetTextEffectFlags(int effects) { m_textEffectFlags = effects; } - void SetOutlineLevel(int level) { m_outlineLevel = level; SetFlags(GetFlags() | wxTEXT_ATTR_OUTLINE_LEVEL); } - - const wxColour& GetTextColour() const { return m_colText; } - const wxColour& GetBackgroundColour() const { return m_colBack; } - wxTextAttrAlignment GetAlignment() const { return m_textAlignment; } - const wxArrayInt& GetTabs() const { return m_tabs; } - long GetLeftIndent() const { return m_leftIndent; } - long GetLeftSubIndent() const { return m_leftSubIndent; } - long GetRightIndent() const { return m_rightIndent; } - long GetFlags() const { return m_flags; } - - int GetFontSize() const { return m_fontSize; } - wxFontStyle GetFontStyle() const { return m_fontStyle; } - wxFontWeight GetFontWeight() const { return m_fontWeight; } - bool GetFontUnderlined() const { return m_fontUnderlined; } - bool GetFontStrikethrough() const { return m_fontStrikethrough; } - const wxString& GetFontFaceName() const { return m_fontFaceName; } - wxFontEncoding GetFontEncoding() const { return m_fontEncoding; } - wxFontFamily GetFontFamily() const { return m_fontFamily; } - - wxFont GetFont() const; - - const wxString& GetCharacterStyleName() const { return m_characterStyleName; } - const wxString& GetParagraphStyleName() const { return m_paragraphStyleName; } - const wxString& GetListStyleName() const { return m_listStyleName; } - int GetParagraphSpacingAfter() const { return m_paragraphSpacingAfter; } - int GetParagraphSpacingBefore() const { return m_paragraphSpacingBefore; } - - int GetLineSpacing() const { return m_lineSpacing; } - int GetBulletStyle() const { return m_bulletStyle; } - int GetBulletNumber() const { return m_bulletNumber; } - const wxString& GetBulletText() const { return m_bulletText; } - const wxString& GetBulletFont() const { return m_bulletFont; } - const wxString& GetBulletName() const { return m_bulletName; } - const wxString& GetURL() const { return m_urlTarget; } - int GetTextEffects() const { return m_textEffects; } - int GetTextEffectFlags() const { return m_textEffectFlags; } - int GetOutlineLevel() const { return m_outlineLevel; } - - // accessors - bool HasTextColour() const { return m_colText.IsOk() && HasFlag(wxTEXT_ATTR_TEXT_COLOUR) ; } - bool HasBackgroundColour() const { return m_colBack.IsOk() && HasFlag(wxTEXT_ATTR_BACKGROUND_COLOUR) ; } - bool HasAlignment() const { return (m_textAlignment != wxTEXT_ALIGNMENT_DEFAULT) && HasFlag(wxTEXT_ATTR_ALIGNMENT) ; } - bool HasTabs() const { return HasFlag(wxTEXT_ATTR_TABS) ; } - bool HasLeftIndent() const { return HasFlag(wxTEXT_ATTR_LEFT_INDENT); } - bool HasRightIndent() const { return HasFlag(wxTEXT_ATTR_RIGHT_INDENT); } - bool HasFontWeight() const { return HasFlag(wxTEXT_ATTR_FONT_WEIGHT); } - bool HasFontSize() const { return HasFlag(wxTEXT_ATTR_FONT_SIZE); } - bool HasFontPointSize() const { return HasFlag(wxTEXT_ATTR_FONT_POINT_SIZE); } - bool HasFontPixelSize() const { return HasFlag(wxTEXT_ATTR_FONT_PIXEL_SIZE); } - bool HasFontItalic() const { return HasFlag(wxTEXT_ATTR_FONT_ITALIC); } - bool HasFontUnderlined() const { return HasFlag(wxTEXT_ATTR_FONT_UNDERLINE); } - bool HasFontStrikethrough() const { return HasFlag(wxTEXT_ATTR_FONT_STRIKETHROUGH); } - bool HasFontFaceName() const { return HasFlag(wxTEXT_ATTR_FONT_FACE); } - bool HasFontEncoding() const { return HasFlag(wxTEXT_ATTR_FONT_ENCODING); } - bool HasFontFamily() const { return HasFlag(wxTEXT_ATTR_FONT_FAMILY); } - bool HasFont() const { return HasFlag(wxTEXT_ATTR_FONT); } - - bool HasParagraphSpacingAfter() const { return HasFlag(wxTEXT_ATTR_PARA_SPACING_AFTER); } - bool HasParagraphSpacingBefore() const { return HasFlag(wxTEXT_ATTR_PARA_SPACING_BEFORE); } - bool HasLineSpacing() const { return HasFlag(wxTEXT_ATTR_LINE_SPACING); } - bool HasCharacterStyleName() const { return HasFlag(wxTEXT_ATTR_CHARACTER_STYLE_NAME) && !m_characterStyleName.IsEmpty(); } - bool HasParagraphStyleName() const { return HasFlag(wxTEXT_ATTR_PARAGRAPH_STYLE_NAME) && !m_paragraphStyleName.IsEmpty(); } - bool HasListStyleName() const { return HasFlag(wxTEXT_ATTR_LIST_STYLE_NAME) || !m_listStyleName.IsEmpty(); } - bool HasBulletStyle() const { return HasFlag(wxTEXT_ATTR_BULLET_STYLE); } - bool HasBulletNumber() const { return HasFlag(wxTEXT_ATTR_BULLET_NUMBER); } - bool HasBulletText() const { return HasFlag(wxTEXT_ATTR_BULLET_TEXT); } - bool HasBulletName() const { return HasFlag(wxTEXT_ATTR_BULLET_NAME); } - bool HasURL() const { return HasFlag(wxTEXT_ATTR_URL); } - bool HasPageBreak() const { return HasFlag(wxTEXT_ATTR_PAGE_BREAK); } - bool HasTextEffects() const { return HasFlag(wxTEXT_ATTR_EFFECTS); } - bool HasTextEffect(int effect) const { return HasFlag(wxTEXT_ATTR_EFFECTS) && ((GetTextEffectFlags() & effect) != 0); } - bool HasOutlineLevel() const { return HasFlag(wxTEXT_ATTR_OUTLINE_LEVEL); } - - bool HasFlag(long flag) const { return (m_flags & flag) != 0; } - void RemoveFlag(long flag) { m_flags &= ~flag; } - void AddFlag(long flag) { m_flags |= flag; } - - // Is this a character style? - bool IsCharacterStyle() const { return HasFlag(wxTEXT_ATTR_CHARACTER); } - bool IsParagraphStyle() const { return HasFlag(wxTEXT_ATTR_PARAGRAPH); } - - // returns false if we have any attributes set, true otherwise - bool IsDefault() const - { - return GetFlags() == 0; - } - - // Merges the given attributes. If compareWith - // is non-NULL, then it will be used to mask out those attributes that are the same in style - // and compareWith, for situations where we don't want to explicitly set inherited attributes. - bool Apply(const wxTextAttr& style, const wxTextAttr* compareWith = NULL); - - // merges the attributes of the base and the overlay objects and returns - // the result; the parameter attributes take precedence - // - // WARNING: the order of arguments is the opposite of Combine() - static wxTextAttr Merge(const wxTextAttr& base, const wxTextAttr& overlay) - { - return Combine(overlay, base, NULL); - } - - // merges the attributes of this object and overlay - void Merge(const wxTextAttr& overlay) - { - *this = Merge(*this, overlay); - } - - // return the attribute having the valid font and colours: it uses the - // attributes set in attr and falls back first to attrDefault and then to - // the text control font/colours for those attributes which are not set - static wxTextAttr Combine(const wxTextAttr& attr, - const wxTextAttr& attrDef, - const wxTextCtrlBase *text); - - // Compare tabs - static bool TabsEq(const wxArrayInt& tabs1, const wxArrayInt& tabs2); - - // Remove attributes - static bool RemoveStyle(wxTextAttr& destStyle, const wxTextAttr& style); - - // Combine two bitlists, specifying the bits of interest with separate flags. - static bool CombineBitlists(int& valueA, int valueB, int& flagsA, int flagsB); - - // Compare two bitlists - static bool BitlistsEqPartial(int valueA, int valueB, int flags); - - // Split into paragraph and character styles - static bool SplitParaCharStyles(const wxTextAttr& style, wxTextAttr& parStyle, wxTextAttr& charStyle); - -private: - long m_flags; - - // Paragraph styles - wxArrayInt m_tabs; // array of int: tab stops in 1/10 mm - int m_leftIndent; // left indent in 1/10 mm - int m_leftSubIndent; // left indent for all but the first - // line in a paragraph relative to the - // first line, in 1/10 mm - int m_rightIndent; // right indent in 1/10 mm - wxTextAttrAlignment m_textAlignment; - - int m_paragraphSpacingAfter; - int m_paragraphSpacingBefore; - int m_lineSpacing; - int m_bulletStyle; - int m_bulletNumber; - int m_textEffects; - int m_textEffectFlags; - int m_outlineLevel; - wxString m_bulletText; - wxString m_bulletFont; - wxString m_bulletName; - wxString m_urlTarget; - wxFontEncoding m_fontEncoding; - - // Character styles - wxColour m_colText, - m_colBack; - int m_fontSize; - wxFontStyle m_fontStyle; - wxFontWeight m_fontWeight; - wxFontFamily m_fontFamily; - bool m_fontUnderlined; - bool m_fontStrikethrough; - wxString m_fontFaceName; - - // Character style - wxString m_characterStyleName; - - // Paragraph style - wxString m_paragraphStyleName; - - // List style - wxString m_listStyleName; -}; - -// ---------------------------------------------------------------------------- -// wxTextAreaBase: multiline text control specific methods -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxTextAreaBase -{ -public: - wxTextAreaBase() { } - virtual ~wxTextAreaBase() { } - - // lines access - // ------------ - - virtual int GetLineLength(long lineNo) const = 0; - virtual wxString GetLineText(long lineNo) const = 0; - virtual int GetNumberOfLines() const = 0; - - - // file IO - // ------- - - bool LoadFile(const wxString& file, int fileType = wxTEXT_TYPE_ANY) - { return DoLoadFile(file, fileType); } - bool SaveFile(const wxString& file = wxEmptyString, - int fileType = wxTEXT_TYPE_ANY); - - // dirty flag handling - // ------------------- - - virtual bool IsModified() const = 0; - virtual void MarkDirty() = 0; - virtual void DiscardEdits() = 0; - void SetModified(bool modified) - { - if ( modified ) - MarkDirty(); - else - DiscardEdits(); - } - - - // styles handling - // --------------- - - // text control under some platforms supports the text styles: these - // methods allow to apply the given text style to the given selection or to - // set/get the style which will be used for all appended text - virtual bool SetStyle(long start, long end, const wxTextAttr& style) = 0; - virtual bool GetStyle(long position, wxTextAttr& style) = 0; - virtual bool SetDefaultStyle(const wxTextAttr& style) = 0; - virtual const wxTextAttr& GetDefaultStyle() const { return m_defaultStyle; } - - - // coordinates translation - // ----------------------- - - // translate between the position (which is just an index in the text ctrl - // considering all its contents as a single strings) and (x, y) coordinates - // which represent column and line. - virtual long XYToPosition(long x, long y) const = 0; - virtual bool PositionToXY(long pos, long *x, long *y) const = 0; - - // translate the given position (which is just an index in the text control) - // to client coordinates - wxPoint PositionToCoords(long pos) const; - - - virtual void ShowPosition(long pos) = 0; - - // find the character at position given in pixels - // - // NB: pt is in device coords (not adjusted for the client area origin nor - // scrolling) - virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const; - virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, - wxTextCoord *col, - wxTextCoord *row) const; - virtual wxString GetValue() const = 0; - virtual void SetValue(const wxString& value) = 0; - -protected: - // implementation of loading/saving - virtual bool DoLoadFile(const wxString& file, int fileType); - virtual bool DoSaveFile(const wxString& file, int fileType); - - // Return true if the given position is valid, i.e. positive and less than - // the last position. - virtual bool IsValidPosition(long pos) const = 0; - - // Default stub implementation of PositionToCoords() always returns - // wxDefaultPosition. - virtual wxPoint DoPositionToCoords(long pos) const; - - // the name of the last file loaded with LoadFile() which will be used by - // SaveFile() by default - wxString m_filename; - - // the text style which will be used for any new text added to the control - wxTextAttr m_defaultStyle; - - - wxDECLARE_NO_COPY_CLASS(wxTextAreaBase); -}; - -// this class defines wxTextCtrl interface, wxTextCtrlBase actually implements -// too much things because it derives from wxTextEntry and not wxTextEntryBase -// and so any classes which "look like" wxTextCtrl (such as wxRichTextCtrl) -// but don't need the (native) implementation bits from wxTextEntry should -// actually derive from this one and not wxTextCtrlBase -class WXDLLIMPEXP_CORE wxTextCtrlIface : public wxTextAreaBase, - public wxTextEntryBase -{ -public: - wxTextCtrlIface() { } - - // wxTextAreaBase overrides - virtual wxString GetValue() const wxOVERRIDE - { - return wxTextEntryBase::GetValue(); - } - virtual void SetValue(const wxString& value) wxOVERRIDE - { - wxTextEntryBase::SetValue(value); - } - -protected: - virtual bool IsValidPosition(long pos) const wxOVERRIDE - { - return pos >= 0 && pos <= GetLastPosition(); - } - -private: - wxDECLARE_NO_COPY_CLASS(wxTextCtrlIface); -}; - -// ---------------------------------------------------------------------------- -// wxTextCtrl: a single or multiple line text zone where user can edit text -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxTextCtrlBase : public wxControl, -#if wxHAS_TEXT_WINDOW_STREAM - public wxSTD streambuf, -#endif - public wxTextAreaBase, - public wxTextEntry -{ -public: - // creation - // -------- - - wxTextCtrlBase() { } - virtual ~wxTextCtrlBase() { } - - - // more readable flag testing methods - bool IsSingleLine() const { return !HasFlag(wxTE_MULTILINE); } - bool IsMultiLine() const { return !IsSingleLine(); } - - // stream-like insertion operators: these are always available, whether we - // were, or not, compiled with streambuf support - wxTextCtrl& operator<<(const wxString& s); - wxTextCtrl& operator<<(int i); - wxTextCtrl& operator<<(long i); - wxTextCtrl& operator<<(float f) { return *this << double(f); } - wxTextCtrl& operator<<(double d); - wxTextCtrl& operator<<(char c) { return *this << wxString(c); } - wxTextCtrl& operator<<(wchar_t c) { return *this << wxString(c); } - - // insert the character which would have resulted from this key event, - // return true if anything has been inserted - virtual bool EmulateKeyPress(const wxKeyEvent& event); - - - // do the window-specific processing after processing the update event - virtual void DoUpdateWindowUI(wxUpdateUIEvent& event) wxOVERRIDE; - - virtual bool ShouldInheritColours() const wxOVERRIDE { return false; } - - // work around the problem with having HitTest() both in wxControl and - // wxTextAreaBase base classes - virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const wxOVERRIDE - { - return wxTextAreaBase::HitTest(pt, pos); - } - - virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, - wxTextCoord *col, - wxTextCoord *row) const wxOVERRIDE - { - return wxTextAreaBase::HitTest(pt, col, row); - } - - // we provide stubs for these functions as not all platforms have styles - // support, but we really should leave them pure virtual here - virtual bool SetStyle(long start, long end, const wxTextAttr& style) wxOVERRIDE; - virtual bool GetStyle(long position, wxTextAttr& style) wxOVERRIDE; - virtual bool SetDefaultStyle(const wxTextAttr& style) wxOVERRIDE; - - // wxTextAreaBase overrides - virtual wxString GetValue() const wxOVERRIDE - { - return wxTextEntry::GetValue(); - } - virtual void SetValue(const wxString& value) wxOVERRIDE - { - wxTextEntry::SetValue(value); - } - - // wxWindow overrides - virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE - { - return GetClassDefaultAttributes(GetWindowVariant()); - } - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL) - { - return GetCompositeControlsDefaultAttributes(variant); - } - -protected: - // Override wxEvtHandler method to check for a common problem of binding - // wxEVT_TEXT_ENTER to a control without wxTE_PROCESS_ENTER style, which is - // never going to work. - virtual bool OnDynamicBind(wxDynamicEventTableEntry& entry) wxOVERRIDE; - - // override streambuf method -#if wxHAS_TEXT_WINDOW_STREAM - int overflow(int i) wxOVERRIDE; -#endif // wxHAS_TEXT_WINDOW_STREAM - - // Another wxTextAreaBase override. - virtual bool IsValidPosition(long pos) const wxOVERRIDE - { - return pos >= 0 && pos <= GetLastPosition(); - } - - // implement the wxTextEntry pure virtual method - virtual wxWindow *GetEditableWindow() wxOVERRIDE { return this; } - - wxDECLARE_NO_COPY_CLASS(wxTextCtrlBase); - wxDECLARE_ABSTRACT_CLASS(wxTextCtrlBase); -}; - -// ---------------------------------------------------------------------------- -// include the platform-dependent class definition -// ---------------------------------------------------------------------------- - -#if defined(__WXX11__) - #include "wx/x11/textctrl.h" -#elif defined(__WXUNIVERSAL__) - #include "wx/univ/textctrl.h" -#elif defined(__WXMSW__) - #include "wx/msw/textctrl.h" -#elif defined(__WXMOTIF__) - #include "wx/motif/textctrl.h" -#elif defined(__WXGTK20__) - #include "wx/gtk/textctrl.h" -#elif defined(__WXGTK__) - #include "wx/gtk1/textctrl.h" -#elif defined(__WXMAC__) - #include "wx/osx/textctrl.h" -#elif defined(__WXQT__) - #include "wx/qt/textctrl.h" -#endif - -// ---------------------------------------------------------------------------- -// wxTextCtrl events -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxTextUrlEvent; - -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_TEXT, wxCommandEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_TEXT_ENTER, wxCommandEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_TEXT_URL, wxTextUrlEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_TEXT_MAXLEN, wxCommandEvent); - -class WXDLLIMPEXP_CORE wxTextUrlEvent : public wxCommandEvent -{ -public: - wxTextUrlEvent(int winid, const wxMouseEvent& evtMouse, - long start, long end) - : wxCommandEvent(wxEVT_TEXT_URL, winid), - m_evtMouse(evtMouse), m_start(start), m_end(end) - { } - wxTextUrlEvent(const wxTextUrlEvent& event) - : wxCommandEvent(event), - m_evtMouse(event.m_evtMouse), - m_start(event.m_start), - m_end(event.m_end) { } - - // get the mouse event which happened over the URL - const wxMouseEvent& GetMouseEvent() const { return m_evtMouse; } - - // get the start of the URL - long GetURLStart() const { return m_start; } - - // get the end of the URL - long GetURLEnd() const { return m_end; } - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxTextUrlEvent(*this); } - -protected: - // the corresponding mouse event - wxMouseEvent m_evtMouse; - - // the start and end indices of the URL in the text control - long m_start, - m_end; - -private: - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxTextUrlEvent); - -public: - // for wxWin RTTI only, don't use - wxTextUrlEvent() : m_evtMouse(), m_start(0), m_end(0) { } -}; - -typedef void (wxEvtHandler::*wxTextUrlEventFunction)(wxTextUrlEvent&); - -#define wxTextEventHandler(func) wxCommandEventHandler(func) -#define wxTextUrlEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxTextUrlEventFunction, func) - -#define wx__DECLARE_TEXTEVT(evt, id, fn) \ - wx__DECLARE_EVT1(wxEVT_TEXT_ ## evt, id, wxTextEventHandler(fn)) - -#define wx__DECLARE_TEXTURLEVT(evt, id, fn) \ - wx__DECLARE_EVT1(wxEVT_TEXT_ ## evt, id, wxTextUrlEventHandler(fn)) - -#define EVT_TEXT(id, fn) wx__DECLARE_EVT1(wxEVT_TEXT, id, wxTextEventHandler(fn)) -#define EVT_TEXT_ENTER(id, fn) wx__DECLARE_TEXTEVT(ENTER, id, fn) -#define EVT_TEXT_URL(id, fn) wx__DECLARE_TEXTURLEVT(URL, id, fn) -#define EVT_TEXT_MAXLEN(id, fn) wx__DECLARE_TEXTEVT(MAXLEN, id, fn) - -#if wxHAS_TEXT_WINDOW_STREAM - -// ---------------------------------------------------------------------------- -// wxStreamToTextRedirector: this class redirects all data sent to the given -// C++ stream to the wxTextCtrl given to its ctor during its lifetime. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxStreamToTextRedirector -{ -private: - void Init(wxTextCtrl *text) - { - m_sbufOld = m_ostr.rdbuf(); - m_ostr.rdbuf(text); - } - -public: - wxStreamToTextRedirector(wxTextCtrl *text) - : m_ostr(wxSTD cout) - { - Init(text); - } - - wxStreamToTextRedirector(wxTextCtrl *text, wxSTD ostream *ostr) - : m_ostr(*ostr) - { - Init(text); - } - - ~wxStreamToTextRedirector() - { - m_ostr.rdbuf(m_sbufOld); - } - -private: - // the stream we're redirecting - wxSTD ostream& m_ostr; - - // the old streambuf (before we changed it) - wxSTD streambuf *m_sbufOld; -}; - -#endif // wxHAS_TEXT_WINDOW_STREAM - -// old wxEVT_COMMAND_* constants -#define wxEVT_COMMAND_TEXT_UPDATED wxEVT_TEXT -#define wxEVT_COMMAND_TEXT_ENTER wxEVT_TEXT_ENTER -#define wxEVT_COMMAND_TEXT_URL wxEVT_TEXT_URL -#define wxEVT_COMMAND_TEXT_MAXLEN wxEVT_TEXT_MAXLEN - -#endif // wxUSE_TEXTCTRL - -#endif - // _WX_TEXTCTRL_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/textdlg.h b/Externals/wxWidgets3/include/wx/textdlg.h deleted file mode 100644 index 509b700ba6..0000000000 --- a/Externals/wxWidgets3/include/wx/textdlg.h +++ /dev/null @@ -1,17 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/textdlg.h -// Purpose: wxTextEntryDialog class -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_TEXTDLG_H_BASE_ -#define _WX_TEXTDLG_H_BASE_ - -#include "wx/generic/textdlgg.h" - -#endif // _WX_TEXTDLG_H_BASE_ - diff --git a/Externals/wxWidgets3/include/wx/textentry.h b/Externals/wxWidgets3/include/wx/textentry.h deleted file mode 100644 index e44f3f0124..0000000000 --- a/Externals/wxWidgets3/include/wx/textentry.h +++ /dev/null @@ -1,342 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/textentry.h -// Purpose: declares wxTextEntry interface defining a simple text entry -// Author: Vadim Zeitlin -// Created: 2007-09-24 -// Copyright: (c) 2007 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_TEXTENTRY_H_ -#define _WX_TEXTENTRY_H_ - -// wxTextPos is the position in the text (currently it's hardly used anywhere -// and should probably be replaced with int anyhow) -typedef long wxTextPos; - -class WXDLLIMPEXP_FWD_BASE wxArrayString; -class WXDLLIMPEXP_FWD_CORE wxTextCompleter; -class WXDLLIMPEXP_FWD_CORE wxTextEntryHintData; -class WXDLLIMPEXP_FWD_CORE wxWindow; - -#include "wx/filefn.h" // for wxFILE and wxDIR only -#include "wx/gdicmn.h" // for wxPoint - -// ---------------------------------------------------------------------------- -// wxTextEntryBase -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxTextEntryBase -{ -public: - wxTextEntryBase() { m_eventsBlock = 0; m_hintData = NULL; } - virtual ~wxTextEntryBase(); - - - // accessing the value - // ------------------- - - // SetValue() generates a text change event, ChangeValue() doesn't - virtual void SetValue(const wxString& value) - { DoSetValue(value, SetValue_SendEvent); } - virtual void ChangeValue(const wxString& value); - - // writing text inserts it at the current position replacing any current - // selection, appending always inserts it at the end and doesn't remove any - // existing text (but it will reset the selection if there is any) - virtual void WriteText(const wxString& text) = 0; - virtual void AppendText(const wxString& text); - - virtual wxString GetValue() const; - virtual wxString GetRange(long from, long to) const; - bool IsEmpty() const { return GetLastPosition() <= 0; } - - - // editing operations - // ------------------ - - virtual void Replace(long from, long to, const wxString& value); - virtual void Remove(long from, long to) = 0; - virtual void Clear() { Remove(0, -1); } - void RemoveSelection(); - - - // clipboard operations - // -------------------- - - virtual void Copy() = 0; - virtual void Cut() = 0; - virtual void Paste() = 0; - - virtual bool CanCopy() const; - virtual bool CanCut() const; - virtual bool CanPaste() const; - - // undo/redo - // --------- - - virtual void Undo() = 0; - virtual void Redo() = 0; - - virtual bool CanUndo() const = 0; - virtual bool CanRedo() const = 0; - - - // insertion point - // --------------- - - // note that moving insertion point removes any current selection - virtual void SetInsertionPoint(long pos) = 0; - virtual void SetInsertionPointEnd() { SetInsertionPoint(-1); } - virtual long GetInsertionPoint() const = 0; - virtual long GetLastPosition() const = 0; - - - // selection - // --------- - - virtual void SetSelection(long from, long to) = 0; - virtual void SelectAll() { SetSelection(-1, -1); } - virtual void SelectNone() - { const long pos = GetInsertionPoint(); SetSelection(pos, pos); } - virtual void GetSelection(long *from, long *to) const = 0; - bool HasSelection() const; - virtual wxString GetStringSelection() const; - - - // auto-completion - // --------------- - - // these functions allow to auto-complete the text already entered into the - // control using either the given fixed list of strings, the paths from the - // file system or an arbitrary user-defined completer - // - // they all return true if completion was enabled or false on error (most - // commonly meaning that this functionality is not available under the - // current platform) - - bool AutoComplete(const wxArrayString& choices) - { return DoAutoCompleteStrings(choices); } - - bool AutoCompleteFileNames() - { return DoAutoCompleteFileNames(wxFILE); } - - bool AutoCompleteDirectories() - { return DoAutoCompleteFileNames(wxDIR); } - - // notice that we take ownership of the pointer and will delete it - // - // if the pointer is NULL auto-completion is disabled - bool AutoComplete(wxTextCompleter *completer) - { return DoAutoCompleteCustom(completer); } - - - // status - // ------ - - virtual bool IsEditable() const = 0; - virtual void SetEditable(bool editable) = 0; - - - // input restrictions - // ------------------ - - // set the max number of characters which may be entered in a single line - // text control - virtual void SetMaxLength(unsigned long WXUNUSED(len)) { } - - // convert any lower-case characters to upper-case on the fly in this entry - virtual void ForceUpper(); - - - // hints - // ----- - - // hint is the (usually greyed out) text shown in the control as long as - // it's empty and doesn't have focus, it is typically used in controls used - // for searching to let the user know what is supposed to be entered there - - virtual bool SetHint(const wxString& hint); - virtual wxString GetHint() const; - - - // margins - // ------- - - // margins are the empty space between borders of control and the text - // itself. When setting margin, use value -1 to indicate that specific - // margin should not be changed. - - bool SetMargins(const wxPoint& pt) - { return DoSetMargins(pt); } - bool SetMargins(wxCoord left, wxCoord top = -1) - { return DoSetMargins(wxPoint(left, top)); } - wxPoint GetMargins() const - { return DoGetMargins(); } - - - // implementation only - // ------------------- - - // generate the wxEVT_TEXT event for GetEditableWindow(), - // like SetValue() does and return true if the event was processed - // - // NB: this is public for wxRichTextCtrl use only right now, do not call it - static bool SendTextUpdatedEvent(wxWindow *win); - - // generate the wxEVT_TEXT event for this window - bool SendTextUpdatedEvent() - { - return SendTextUpdatedEvent(GetEditableWindow()); - } - - - // generate the wxEVT_TEXT event for this window if the - // events are not currently disabled - void SendTextUpdatedEventIfAllowed() - { - if ( EventsAllowed() ) - SendTextUpdatedEvent(); - } - - // this function is provided solely for the purpose of forwarding text - // change notifications state from one control to another, e.g. it can be - // used by a wxComboBox which derives from wxTextEntry if it delegates all - // of its methods to another wxTextCtrl - void ForwardEnableTextChangedEvents(bool enable) - { - // it's important to call the functions which update m_eventsBlock here - // and not just our own EnableTextChangedEvents() because our state - // (i.e. the result of EventsAllowed()) must change as well - if ( enable ) - ResumeTextChangedEvents(); - else - SuppressTextChangedEvents(); - } - - // change the entry value to be in upper case only, if needed (i.e. if it's - // not already the case) - void ConvertToUpperCase(); - -protected: - // flags for DoSetValue(): common part of SetValue() and ChangeValue() and - // also used to implement WriteText() in wxMSW - enum - { - SetValue_NoEvent = 0, - SetValue_SendEvent = 1, - SetValue_SelectionOnly = 2 - }; - - virtual void DoSetValue(const wxString& value, int flags); - virtual wxString DoGetValue() const = 0; - - // override this to return the associated window, it will be used for event - // generation and also by generic hints implementation - virtual wxWindow *GetEditableWindow() = 0; - - // margins functions - virtual bool DoSetMargins(const wxPoint& pt); - virtual wxPoint DoGetMargins() const; - - // the derived classes should override these virtual methods to implement - // auto-completion, they do the same thing as their public counterparts but - // have different names to allow overriding just one of them without hiding - // the other one(s) - virtual bool DoAutoCompleteStrings(const wxArrayString& WXUNUSED(choices)) - { return false; } - virtual bool DoAutoCompleteFileNames(int WXUNUSED(flags)) // wxFILE | wxDIR - { return false; } - virtual bool DoAutoCompleteCustom(wxTextCompleter *completer); - - - // class which should be used to temporarily disable text change events - // - // if suppress argument in ctor is false, nothing is done - class EventsSuppressor - { - public: - EventsSuppressor(wxTextEntryBase *text, bool suppress = true) - : m_text(text), - m_suppress(suppress) - { - if ( m_suppress ) - m_text->SuppressTextChangedEvents(); - } - - ~EventsSuppressor() - { - if ( m_suppress ) - m_text->ResumeTextChangedEvents(); - } - - private: - wxTextEntryBase *m_text; - bool m_suppress; - }; - - friend class EventsSuppressor; - -private: - // suppress or resume the text changed events generation: don't use these - // functions directly, use EventsSuppressor class above instead - void SuppressTextChangedEvents() - { - if ( !m_eventsBlock++ ) - EnableTextChangedEvents(false); - } - - void ResumeTextChangedEvents() - { - if ( !--m_eventsBlock ) - EnableTextChangedEvents(true); - } - - - // this must be overridden in the derived classes if our implementation of - // SetValue() or Replace() is used to disable (and enable back) generation - // of the text changed events - // - // initially the generation of the events is enabled - virtual void EnableTextChangedEvents(bool WXUNUSED(enable)) { } - - // return true if the events are currently not suppressed - bool EventsAllowed() const { return m_eventsBlock == 0; } - - - // if this counter is non-null, events are blocked - unsigned m_eventsBlock; - - // hint-related stuff, only allocated if/when SetHint() is used - wxTextEntryHintData *m_hintData; - - // It needs to call our Do{Get,Set}Value() to work with the real control - // contents. - friend class wxTextEntryHintData; -}; - -#ifdef __WXUNIVERSAL__ - // TODO: we need to use wxTextEntryDelegate here, but for now just prevent - // the GTK/MSW classes from being used in wxUniv build - class WXDLLIMPEXP_CORE wxTextEntry : public wxTextEntryBase - { - }; -#elif defined(__WXGTK20__) - #include "wx/gtk/textentry.h" -#elif defined(__WXMAC__) - #include "wx/osx/textentry.h" -#elif defined(__WXMSW__) - #include "wx/msw/textentry.h" -#elif defined(__WXMOTIF__) - #include "wx/motif/textentry.h" -#elif defined(__WXQT__) - #include "wx/qt/textentry.h" -#else - // no platform-specific implementation of wxTextEntry yet - class WXDLLIMPEXP_CORE wxTextEntry : public wxTextEntryBase - { - }; -#endif - -#endif // _WX_TEXTENTRY_H_ - diff --git a/Externals/wxWidgets3/include/wx/textfile.h b/Externals/wxWidgets3/include/wx/textfile.h deleted file mode 100644 index 64fefebc96..0000000000 --- a/Externals/wxWidgets3/include/wx/textfile.h +++ /dev/null @@ -1,61 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/textfile.h -// Purpose: class wxTextFile to work with text files of _small_ size -// (file is fully loaded in memory) and which understands CR/LF -// differences between platforms. -// Author: Vadim Zeitlin -// Modified by: -// Created: 03.04.98 -// Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_TEXTFILE_H -#define _WX_TEXTFILE_H - -#include "wx/defs.h" - -#include "wx/textbuf.h" - -#if wxUSE_TEXTFILE - -#include "wx/file.h" - -// ---------------------------------------------------------------------------- -// wxTextFile -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxTextFile : public wxTextBuffer -{ -public: - // constructors - wxTextFile() { } - wxTextFile(const wxString& strFileName); - -protected: - // implement the base class pure virtuals - virtual bool OnExists() const wxOVERRIDE; - virtual bool OnOpen(const wxString &strBufferName, - wxTextBufferOpenMode openMode) wxOVERRIDE; - virtual bool OnClose() wxOVERRIDE; - virtual bool OnRead(const wxMBConv& conv) wxOVERRIDE; - virtual bool OnWrite(wxTextFileType typeNew, const wxMBConv& conv) wxOVERRIDE; - -private: - - wxFile m_file; - - wxDECLARE_NO_COPY_CLASS(wxTextFile); -}; - -#else // !wxUSE_TEXTFILE - -// old code relies on the static methods of wxTextFile being always available -// and they still are available in wxTextBuffer (even if !wxUSE_TEXTBUFFER), so -// make it possible to use them in a backwards compatible way -typedef wxTextBuffer wxTextFile; - -#endif // wxUSE_TEXTFILE/!wxUSE_TEXTFILE - -#endif // _WX_TEXTFILE_H - diff --git a/Externals/wxWidgets3/include/wx/textwrapper.h b/Externals/wxWidgets3/include/wx/textwrapper.h deleted file mode 100644 index 02e37bd23e..0000000000 --- a/Externals/wxWidgets3/include/wx/textwrapper.h +++ /dev/null @@ -1,128 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/textwrapper.h -// Purpose: declaration of wxTextWrapper class -// Author: Vadim Zeitlin -// Created: 2009-05-31 (extracted from dlgcmn.cpp via wx/private/stattext.h) -// Copyright: (c) 1999, 2009 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_TEXTWRAPPER_H_ -#define _WX_TEXTWRAPPER_H_ - -#include "wx/window.h" - -// ---------------------------------------------------------------------------- -// wxTextWrapper -// ---------------------------------------------------------------------------- - -// this class is used to wrap the text on word boundary: wrapping is done by -// calling OnStartLine() and OnOutputLine() functions -class WXDLLIMPEXP_CORE wxTextWrapper -{ -public: - wxTextWrapper() { m_eol = false; } - - // win is used for getting the font, text is the text to wrap, width is the - // max line width or -1 to disable wrapping - void Wrap(wxWindow *win, const wxString& text, int widthMax); - - // we don't need it, but just to avoid compiler warnings - virtual ~wxTextWrapper() { } - -protected: - // line may be empty - virtual void OnOutputLine(const wxString& line) = 0; - - // called at the start of every new line (except the very first one) - virtual void OnNewLine() { } - -private: - // call OnOutputLine() and set m_eol to true - void DoOutputLine(const wxString& line) - { - OnOutputLine(line); - - m_eol = true; - } - - // this function is a destructive inspector: when it returns true it also - // resets the flag to false so calling it again wouldn't return true any - // more - bool IsStartOfNewLine() - { - if ( !m_eol ) - return false; - - m_eol = false; - - return true; - } - - - bool m_eol; - - wxDECLARE_NO_COPY_CLASS(wxTextWrapper); -}; - -#if wxUSE_STATTEXT - -#include "wx/sizer.h" -#include "wx/stattext.h" - -// A class creating a sizer with one static text per line of text. Creation of -// the controls used for each line can be customized by overriding -// OnCreateLine() function. -// -// This class is currently private to wxWidgets and used only by wxDialog -// itself. We may make it public later if there is sufficient interest. -class wxTextSizerWrapper : public wxTextWrapper -{ -public: - wxTextSizerWrapper(wxWindow *win) - { - m_win = win; - m_hLine = 0; - } - - wxSizer *CreateSizer(const wxString& text, int widthMax) - { - m_sizer = new wxBoxSizer(wxVERTICAL); - Wrap(m_win, text, widthMax); - return m_sizer; - } - - wxWindow *GetParent() const { return m_win; } - -protected: - virtual wxWindow *OnCreateLine(const wxString& line) - { - return new wxStaticText(m_win, wxID_ANY, - wxControl::EscapeMnemonics(line)); - } - - virtual void OnOutputLine(const wxString& line) wxOVERRIDE - { - if ( !line.empty() ) - { - m_sizer->Add(OnCreateLine(line)); - } - else // empty line, no need to create a control for it - { - if ( !m_hLine ) - m_hLine = m_win->GetCharHeight(); - - m_sizer->Add(5, m_hLine); - } - } - -private: - wxWindow *m_win; - wxSizer *m_sizer; - int m_hLine; -}; - -#endif // wxUSE_STATTEXT - -#endif // _WX_TEXTWRAPPER_H_ - diff --git a/Externals/wxWidgets3/include/wx/tglbtn.h b/Externals/wxWidgets3/include/wx/tglbtn.h deleted file mode 100644 index bb11446696..0000000000 --- a/Externals/wxWidgets3/include/wx/tglbtn.h +++ /dev/null @@ -1,99 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/tglbtn.h -// Purpose: This dummy header includes the proper header file for the -// system we're compiling under. -// Author: John Norris, minor changes by Axel Schlueter -// Modified by: -// Created: 08.02.01 -// Copyright: (c) 2000 Johnny C. Norris II -// Licence: wxWindows Licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_TOGGLEBUTTON_H_BASE_ -#define _WX_TOGGLEBUTTON_H_BASE_ - -#include "wx/defs.h" - -#if wxUSE_TOGGLEBTN - -#include "wx/event.h" -#include "wx/anybutton.h" // base class - -extern WXDLLIMPEXP_DATA_CORE(const char) wxCheckBoxNameStr[]; - -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TOGGLEBUTTON, wxCommandEvent ); - -// ---------------------------------------------------------------------------- -// wxToggleButtonBase -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxToggleButtonBase : public wxAnyButton -{ -public: - wxToggleButtonBase() { } - - // Get/set the value - virtual void SetValue(bool state) = 0; - virtual bool GetValue() const = 0; - - // The current "normal" state for the toggle button depends upon its value. - virtual State GetNormalState() const wxOVERRIDE - { - return GetValue() ? State_Pressed : State_Normal; - } - - void UpdateWindowUI(long flags) wxOVERRIDE - { - wxControl::UpdateWindowUI(flags); - - if ( !IsShown() ) - return; - - wxWindow *tlw = wxGetTopLevelParent( this ); - if (tlw && wxPendingDelete.Member( tlw )) - return; - - wxUpdateUIEvent event( GetId() ); - event.SetEventObject(this); - - if (GetEventHandler()->ProcessEvent(event) ) - { - if ( event.GetSetChecked() ) - SetValue( event.GetChecked() ); - } - } - -protected: - wxDECLARE_NO_COPY_CLASS(wxToggleButtonBase); -}; - - -#define EVT_TOGGLEBUTTON(id, fn) \ - wx__DECLARE_EVT1(wxEVT_TOGGLEBUTTON, id, wxCommandEventHandler(fn)) - -#if defined(__WXUNIVERSAL__) - #include "wx/univ/tglbtn.h" -#elif defined(__WXMSW__) - #include "wx/msw/tglbtn.h" - #define wxHAS_BITMAPTOGGLEBUTTON -#elif defined(__WXGTK20__) - #include "wx/gtk/tglbtn.h" - #define wxHAS_BITMAPTOGGLEBUTTON -#elif defined(__WXGTK__) - #include "wx/gtk1/tglbtn.h" -# elif defined(__WXMOTIF__) - #include "wx/motif/tglbtn.h" -#elif defined(__WXMAC__) - #include "wx/osx/tglbtn.h" - #define wxHAS_BITMAPTOGGLEBUTTON -#elif defined(__WXQT__) - #include "wx/qt/tglbtn.h" -#endif - -// old wxEVT_COMMAND_* constants -#define wxEVT_COMMAND_TOGGLEBUTTON_CLICKED wxEVT_TOGGLEBUTTON - -#endif // wxUSE_TOGGLEBTN - -#endif // _WX_TOGGLEBUTTON_H_BASE_ - diff --git a/Externals/wxWidgets3/include/wx/thread.h b/Externals/wxWidgets3/include/wx/thread.h deleted file mode 100644 index 5ff109c970..0000000000 --- a/Externals/wxWidgets3/include/wx/thread.h +++ /dev/null @@ -1,870 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/thread.h -// Purpose: Thread API -// Author: Guilhem Lavaux -// Modified by: Vadim Zeitlin (modifications partly inspired by omnithreads -// package from Olivetti & Oracle Research Laboratory) -// Created: 04/13/98 -// Copyright: (c) Guilhem Lavaux -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_THREAD_H_ -#define _WX_THREAD_H_ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// get the value of wxUSE_THREADS configuration flag -#include "wx/defs.h" - -#if wxUSE_THREADS - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -enum wxMutexError -{ - wxMUTEX_NO_ERROR = 0, // operation completed successfully - wxMUTEX_INVALID, // mutex hasn't been initialized - wxMUTEX_DEAD_LOCK, // mutex is already locked by the calling thread - wxMUTEX_BUSY, // mutex is already locked by another thread - wxMUTEX_UNLOCKED, // attempt to unlock a mutex which is not locked - wxMUTEX_TIMEOUT, // LockTimeout() has timed out - wxMUTEX_MISC_ERROR // any other error -}; - -enum wxCondError -{ - wxCOND_NO_ERROR = 0, - wxCOND_INVALID, - wxCOND_TIMEOUT, // WaitTimeout() has timed out - wxCOND_MISC_ERROR -}; - -enum wxSemaError -{ - wxSEMA_NO_ERROR = 0, - wxSEMA_INVALID, // semaphore hasn't been initialized successfully - wxSEMA_BUSY, // returned by TryWait() if Wait() would block - wxSEMA_TIMEOUT, // returned by WaitTimeout() - wxSEMA_OVERFLOW, // Post() would increase counter past the max - wxSEMA_MISC_ERROR -}; - -enum wxThreadError -{ - wxTHREAD_NO_ERROR = 0, // No error - wxTHREAD_NO_RESOURCE, // No resource left to create a new thread - wxTHREAD_RUNNING, // The thread is already running - wxTHREAD_NOT_RUNNING, // The thread isn't running - wxTHREAD_KILLED, // Thread we waited for had to be killed - wxTHREAD_MISC_ERROR // Some other error -}; - -enum wxThreadKind -{ - wxTHREAD_DETACHED, - wxTHREAD_JOINABLE -}; - -enum wxThreadWait -{ - wxTHREAD_WAIT_BLOCK, - wxTHREAD_WAIT_YIELD, // process events while waiting; MSW only - - // For compatibility reasons we use wxTHREAD_WAIT_YIELD by default as this - // was the default behaviour of wxMSW 2.8 but it should be avoided as it's - // dangerous and not portable. -#if WXWIN_COMPATIBILITY_2_8 - wxTHREAD_WAIT_DEFAULT = wxTHREAD_WAIT_YIELD -#else - wxTHREAD_WAIT_DEFAULT = wxTHREAD_WAIT_BLOCK -#endif -}; - -// Obsolete synonyms for wxPRIORITY_XXX for backwards compatibility-only -enum -{ - WXTHREAD_MIN_PRIORITY = wxPRIORITY_MIN, - WXTHREAD_DEFAULT_PRIORITY = wxPRIORITY_DEFAULT, - WXTHREAD_MAX_PRIORITY = wxPRIORITY_MAX -}; - -// There are 2 types of mutexes: normal mutexes and recursive ones. The attempt -// to lock a normal mutex by a thread which already owns it results in -// undefined behaviour (it always works under Windows, it will almost always -// result in a deadlock under Unix). Locking a recursive mutex in such -// situation always succeeds and it must be unlocked as many times as it has -// been locked. -// -// However recursive mutexes have several important drawbacks: first, in the -// POSIX implementation, they're less efficient. Second, and more importantly, -// they CAN NOT BE USED WITH CONDITION VARIABLES under Unix! Using them with -// wxCondition will work under Windows and some Unices (notably Linux) but will -// deadlock under other Unix versions (e.g. Solaris). As it might be difficult -// to ensure that a recursive mutex is not used with wxCondition, it is a good -// idea to avoid using recursive mutexes at all. Also, the last problem with -// them is that some (older) Unix versions don't support this at all -- which -// results in a configure warning when building and a deadlock when using them. -enum wxMutexType -{ - // normal mutex: try to always use this one - wxMUTEX_DEFAULT, - - // recursive mutex: don't use these ones with wxCondition - wxMUTEX_RECURSIVE -}; - -// forward declarations -class WXDLLIMPEXP_FWD_BASE wxThreadHelper; -class WXDLLIMPEXP_FWD_BASE wxConditionInternal; -class WXDLLIMPEXP_FWD_BASE wxMutexInternal; -class WXDLLIMPEXP_FWD_BASE wxSemaphoreInternal; -class WXDLLIMPEXP_FWD_BASE wxThreadInternal; - -// ---------------------------------------------------------------------------- -// A mutex object is a synchronization object whose state is set to signaled -// when it is not owned by any thread, and nonsignaled when it is owned. Its -// name comes from its usefulness in coordinating mutually-exclusive access to -// a shared resource. Only one thread at a time can own a mutex object. -// ---------------------------------------------------------------------------- - -// you should consider wxMutexLocker whenever possible instead of directly -// working with wxMutex class - it is safer -class WXDLLIMPEXP_BASE wxMutex -{ -public: - // constructor & destructor - // ------------------------ - - // create either default (always safe) or recursive mutex - wxMutex(wxMutexType mutexType = wxMUTEX_DEFAULT); - - // destroys the mutex kernel object - ~wxMutex(); - - // test if the mutex has been created successfully - bool IsOk() const; - - // mutex operations - // ---------------- - - // Lock the mutex, blocking on it until it is unlocked by the other thread. - // The result of locking a mutex already locked by the current thread - // depend on the mutex type. - // - // The caller must call Unlock() later if Lock() returned wxMUTEX_NO_ERROR. - wxMutexError Lock(); - - // Same as Lock() but return wxMUTEX_TIMEOUT if the mutex can't be locked - // during the given number of milliseconds - wxMutexError LockTimeout(unsigned long ms); - - // Try to lock the mutex: if it is currently locked, return immediately - // with an error. Otherwise the caller must call Unlock(). - wxMutexError TryLock(); - - // Unlock the mutex. It is an error to unlock an already unlocked mutex - wxMutexError Unlock(); - -protected: - wxMutexInternal *m_internal; - - friend class wxConditionInternal; - - wxDECLARE_NO_COPY_CLASS(wxMutex); -}; - -// a helper class which locks the mutex in the ctor and unlocks it in the dtor: -// this ensures that mutex is always unlocked, even if the function returns or -// throws an exception before it reaches the end -class WXDLLIMPEXP_BASE wxMutexLocker -{ -public: - // lock the mutex in the ctor - wxMutexLocker(wxMutex& mutex) - : m_isOk(false), m_mutex(mutex) - { m_isOk = ( m_mutex.Lock() == wxMUTEX_NO_ERROR ); } - - // returns true if mutex was successfully locked in ctor - bool IsOk() const - { return m_isOk; } - - // unlock the mutex in dtor - ~wxMutexLocker() - { if ( IsOk() ) m_mutex.Unlock(); } - -private: - // no assignment operator nor copy ctor - wxMutexLocker(const wxMutexLocker&); - wxMutexLocker& operator=(const wxMutexLocker&); - - bool m_isOk; - wxMutex& m_mutex; -}; - -// ---------------------------------------------------------------------------- -// Critical section: this is the same as mutex but is only visible to the -// threads of the same process. For the platforms which don't have native -// support for critical sections, they're implemented entirely in terms of -// mutexes. -// -// NB: wxCriticalSection object does not allocate any memory in its ctor -// which makes it possible to have static globals of this class -// ---------------------------------------------------------------------------- - -// in order to avoid any overhead under platforms where critical sections are -// just mutexes make all wxCriticalSection class functions inline -#if !defined(__WINDOWS__) - #define wxCRITSECT_IS_MUTEX 1 - - #define wxCRITSECT_INLINE WXEXPORT inline -#else // MSW - #define wxCRITSECT_IS_MUTEX 0 - - #define wxCRITSECT_INLINE -#endif // MSW/!MSW - -enum wxCriticalSectionType -{ - // recursive critical section - wxCRITSEC_DEFAULT, - - // non-recursive critical section - wxCRITSEC_NON_RECURSIVE -}; - -// you should consider wxCriticalSectionLocker whenever possible instead of -// directly working with wxCriticalSection class - it is safer -class WXDLLIMPEXP_BASE wxCriticalSection -{ -public: - // ctor & dtor - wxCRITSECT_INLINE wxCriticalSection( wxCriticalSectionType critSecType = wxCRITSEC_DEFAULT ); - wxCRITSECT_INLINE ~wxCriticalSection(); - // enter the section (the same as locking a mutex) - wxCRITSECT_INLINE void Enter(); - - // try to enter the section (the same as trying to lock a mutex) - wxCRITSECT_INLINE bool TryEnter(); - - // leave the critical section (same as unlocking a mutex) - wxCRITSECT_INLINE void Leave(); - -private: -#if wxCRITSECT_IS_MUTEX - wxMutex m_mutex; -#elif defined(__WINDOWS__) - // we can't allocate any memory in the ctor, so use placement new - - // unfortunately, we have to hardcode the sizeof() here because we can't - // include windows.h from this public header and we also have to use the - // union to force the correct (i.e. maximal) alignment - // - // if CRITICAL_SECTION size changes in Windows, you'll get an assert from - // thread.cpp and will need to increase the buffer size -#ifdef __WIN64__ - typedef char wxCritSectBuffer[40]; -#else // __WIN32__ - typedef char wxCritSectBuffer[24]; -#endif - union - { - unsigned long m_dummy1; - void *m_dummy2; - - wxCritSectBuffer m_buffer; - }; -#endif // Unix/Win32 - - wxDECLARE_NO_COPY_CLASS(wxCriticalSection); -}; - -#if wxCRITSECT_IS_MUTEX - // implement wxCriticalSection using mutexes - inline wxCriticalSection::wxCriticalSection( wxCriticalSectionType critSecType ) - : m_mutex( critSecType == wxCRITSEC_DEFAULT ? wxMUTEX_RECURSIVE : wxMUTEX_DEFAULT ) { } - inline wxCriticalSection::~wxCriticalSection() { } - - inline void wxCriticalSection::Enter() { (void)m_mutex.Lock(); } - inline bool wxCriticalSection::TryEnter() { return m_mutex.TryLock() == wxMUTEX_NO_ERROR; } - inline void wxCriticalSection::Leave() { (void)m_mutex.Unlock(); } -#endif // wxCRITSECT_IS_MUTEX - -#undef wxCRITSECT_INLINE -#undef wxCRITSECT_IS_MUTEX - -// wxCriticalSectionLocker is the same to critical sections as wxMutexLocker is -// to mutexes -class WXDLLIMPEXP_BASE wxCriticalSectionLocker -{ -public: - wxCriticalSectionLocker(wxCriticalSection& cs) - : m_critsect(cs) - { - m_critsect.Enter(); - } - - ~wxCriticalSectionLocker() - { - m_critsect.Leave(); - } - -private: - wxCriticalSection& m_critsect; - - wxDECLARE_NO_COPY_CLASS(wxCriticalSectionLocker); -}; - -// ---------------------------------------------------------------------------- -// wxCondition models a POSIX condition variable which allows one (or more) -// thread(s) to wait until some condition is fulfilled -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxCondition -{ -public: - // Each wxCondition object is associated with a (single) wxMutex object. - // The mutex object MUST be locked before calling Wait() - wxCondition(wxMutex& mutex); - - // dtor is not virtual, don't use this class polymorphically - ~wxCondition(); - - // return true if the condition has been created successfully - bool IsOk() const; - - // NB: the associated mutex MUST be locked beforehand by the calling thread - // - // it atomically releases the lock on the associated mutex - // and starts waiting to be woken up by a Signal()/Broadcast() - // once its signaled, then it will wait until it can reacquire - // the lock on the associated mutex object, before returning. - wxCondError Wait(); - - // std::condition_variable-like variant that evaluates the associated condition - template - wxCondError Wait(const Functor& predicate) - { - while ( !predicate() ) - { - wxCondError e = Wait(); - if ( e != wxCOND_NO_ERROR ) - return e; - } - return wxCOND_NO_ERROR; - } - - // exactly as Wait() except that it may also return if the specified - // timeout elapses even if the condition hasn't been signalled: in this - // case, the return value is wxCOND_TIMEOUT, otherwise (i.e. in case of a - // normal return) it is wxCOND_NO_ERROR. - // - // the timeout parameter specifies an interval that needs to be waited for - // in milliseconds - wxCondError WaitTimeout(unsigned long milliseconds); - - // NB: the associated mutex may or may not be locked by the calling thread - // - // this method unblocks one thread if any are blocking on the condition. - // if no thread is blocking in Wait(), then the signal is NOT remembered - // The thread which was blocking on Wait() will then reacquire the lock - // on the associated mutex object before returning - wxCondError Signal(); - - // NB: the associated mutex may or may not be locked by the calling thread - // - // this method unblocks all threads if any are blocking on the condition. - // if no thread is blocking in Wait(), then the signal is NOT remembered - // The threads which were blocking on Wait() will then reacquire the lock - // on the associated mutex object before returning. - wxCondError Broadcast(); - -private: - wxConditionInternal *m_internal; - - wxDECLARE_NO_COPY_CLASS(wxCondition); -}; - -// ---------------------------------------------------------------------------- -// wxSemaphore: a counter limiting the number of threads concurrently accessing -// a shared resource -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxSemaphore -{ -public: - // specifying a maxcount of 0 actually makes wxSemaphore behave as if there - // is no upper limit, if maxcount is 1 the semaphore behaves as a mutex - wxSemaphore( int initialcount = 0, int maxcount = 0 ); - - // dtor is not virtual, don't use this class polymorphically - ~wxSemaphore(); - - // return true if the semaphore has been created successfully - bool IsOk() const; - - // wait indefinitely, until the semaphore count goes beyond 0 - // and then decrement it and return (this method might have been called - // Acquire()) - wxSemaError Wait(); - - // same as Wait(), but does not block, returns wxSEMA_NO_ERROR if - // successful and wxSEMA_BUSY if the count is currently zero - wxSemaError TryWait(); - - // same as Wait(), but as a timeout limit, returns wxSEMA_NO_ERROR if the - // semaphore was acquired and wxSEMA_TIMEOUT if the timeout has elapsed - wxSemaError WaitTimeout(unsigned long milliseconds); - - // increments the semaphore count and signals one of the waiting threads - wxSemaError Post(); - -private: - wxSemaphoreInternal *m_internal; - - wxDECLARE_NO_COPY_CLASS(wxSemaphore); -}; - -// ---------------------------------------------------------------------------- -// wxThread: class encapsulating a thread of execution -// ---------------------------------------------------------------------------- - -// there are two different kinds of threads: joinable and detached (default) -// ones. Only joinable threads can return a return code and only detached -// threads auto-delete themselves - the user should delete the joinable -// threads manually. - -// NB: in the function descriptions the words "this thread" mean the thread -// created by the wxThread object while "main thread" is the thread created -// during the process initialization (a.k.a. the GUI thread) - -// On VMS thread pointers are 64 bits (also needed for other systems??? -#ifdef __VMS - typedef unsigned long long wxThreadIdType; -#else - typedef unsigned long wxThreadIdType; -#endif - -class WXDLLIMPEXP_BASE wxThread -{ -public: - // the return type for the thread function - typedef void *ExitCode; - - // static functions - // Returns the wxThread object for the calling thread. NULL is returned - // if the caller is the main thread (but it's recommended to use - // IsMain() and only call This() for threads other than the main one - // because NULL is also returned on error). If the thread wasn't - // created with wxThread class, the returned value is undefined. - static wxThread *This(); - - // Returns true if current thread is the main thread. - // - // Notice that it also returns true if main thread id hadn't been - // initialized yet on the assumption that it's too early in wx startup - // process for any other threads to have been created in this case. - static bool IsMain() - { - return !ms_idMainThread || GetCurrentId() == ms_idMainThread; - } - - // Return the main thread id - static wxThreadIdType GetMainId() { return ms_idMainThread; } - - // Release the rest of our time slice letting the other threads run - static void Yield(); - - // Sleep during the specified period of time in milliseconds - // - // This is the same as wxMilliSleep(). - static void Sleep(unsigned long milliseconds); - - // get the number of system CPUs - useful with SetConcurrency() - // (the "best" value for it is usually number of CPUs + 1) - // - // Returns -1 if unknown, number of CPUs otherwise - static int GetCPUCount(); - - // Get the platform specific thread ID and return as a long. This - // can be used to uniquely identify threads, even if they are not - // wxThreads. This is used by wxPython. - static wxThreadIdType GetCurrentId(); - - // sets the concurrency level: this is, roughly, the number of threads - // the system tries to schedule to run in parallel. 0 means the - // default value (usually acceptable, but may not yield the best - // performance for this process) - // - // Returns true on success, false otherwise (if not implemented, for - // example) - static bool SetConcurrency(size_t level); - - // constructor only creates the C++ thread object and doesn't create (or - // start) the real thread - wxThread(wxThreadKind kind = wxTHREAD_DETACHED); - - // functions that change the thread state: all these can only be called - // from _another_ thread (typically the thread that created this one, e.g. - // the main thread), not from the thread itself - - // create a new thread and optionally set the stack size on - // platforms that support that - call Run() to start it - wxThreadError Create(unsigned int stackSize = 0); - - // starts execution of the thread - from the moment Run() is called - // the execution of wxThread::Entry() may start at any moment, caller - // shouldn't suppose that it starts after (or before) Run() returns. - wxThreadError Run(); - - // stops the thread if it's running and deletes the wxThread object if - // this is a detached thread freeing its memory - otherwise (for - // joinable threads) you still need to delete wxThread object - // yourself. - // - // this function only works if the thread calls TestDestroy() - // periodically - the thread will only be deleted the next time it - // does it! - // - // will fill the rc pointer with the thread exit code if it's !NULL - wxThreadError Delete(ExitCode *rc = NULL, - wxThreadWait waitMode = wxTHREAD_WAIT_DEFAULT); - - // waits for a joinable thread to finish and returns its exit code - // - // Returns (ExitCode)-1 on error (for example, if the thread is not - // joinable) - ExitCode Wait(wxThreadWait waitMode = wxTHREAD_WAIT_DEFAULT); - - // kills the thread without giving it any chance to clean up - should - // not be used under normal circumstances, use Delete() instead. - // It is a dangerous function that should only be used in the most - // extreme cases! - // - // The wxThread object is deleted by Kill() if the thread is - // detachable, but you still have to delete it manually for joinable - // threads. - wxThreadError Kill(); - - // pause a running thread: as Delete(), this only works if the thread - // calls TestDestroy() regularly - wxThreadError Pause(); - - // resume a paused thread - wxThreadError Resume(); - - // priority - // Sets the priority to "prio" which must be in 0..100 range (see - // also wxPRIORITY_XXX constants). - // - // NB: under MSW the priority can only be set after the thread is - // created (but possibly before it is launched) - void SetPriority(unsigned int prio); - - // Get the current priority. - unsigned int GetPriority() const; - - // thread status inquiries - // Returns true if the thread is alive: i.e. running or suspended - bool IsAlive() const; - // Returns true if the thread is running (not paused, not killed). - bool IsRunning() const; - // Returns true if the thread is suspended - bool IsPaused() const; - - // is the thread of detached kind? - bool IsDetached() const { return m_isDetached; } - - // Get the thread ID - a platform dependent number which uniquely - // identifies a thread inside a process - wxThreadIdType GetId() const; - -#ifdef __WINDOWS__ - // Get the internal OS handle - WXHANDLE MSWGetHandle() const; -#endif // __WINDOWS__ - - wxThreadKind GetKind() const - { return m_isDetached ? wxTHREAD_DETACHED : wxTHREAD_JOINABLE; } - - // Returns true if the thread was asked to terminate: this function should - // be called by the thread from time to time, otherwise the main thread - // will be left forever in Delete()! - virtual bool TestDestroy(); - - // dtor is public, but the detached threads should never be deleted - use - // Delete() instead (or leave the thread terminate by itself) - virtual ~wxThread(); - -protected: - // exits from the current thread - can be called only from this thread - void Exit(ExitCode exitcode = 0); - - // entry point for the thread - called by Run() and executes in the context - // of this thread. - virtual void *Entry() = 0; - - // use this to call the Entry() virtual method - void *CallEntry(); - - // Callbacks which may be overridden by the derived class to perform some - // specific actions when the thread is deleted or killed. By default they - // do nothing. - - // This one is called by Delete() before actually deleting the thread and - // is executed in the context of the thread that called Delete(). - virtual void OnDelete() {} - - // This one is called by Kill() before killing the thread and is executed - // in the context of the thread that called Kill(). - virtual void OnKill() {} - -private: - // no copy ctor/assignment operator - wxThread(const wxThread&); - wxThread& operator=(const wxThread&); - - // called when the thread exits - in the context of this thread - // - // NB: this function will not be called if the thread is Kill()ed - virtual void OnExit() { } - - friend class wxThreadInternal; - friend class wxThreadModule; - - - // the main thread identifier, should be set on startup - static wxThreadIdType ms_idMainThread; - - // the (platform-dependent) thread class implementation - wxThreadInternal *m_internal; - - // protects access to any methods of wxThreadInternal object - wxCriticalSection m_critsect; - - // true if the thread is detached, false if it is joinable - bool m_isDetached; -}; - -// wxThreadHelperThread class -// -------------------------- - -class WXDLLIMPEXP_BASE wxThreadHelperThread : public wxThread -{ -public: - // constructor only creates the C++ thread object and doesn't create (or - // start) the real thread - wxThreadHelperThread(wxThreadHelper& owner, wxThreadKind kind) - : wxThread(kind), m_owner(owner) - { } - -protected: - // entry point for the thread -- calls Entry() in owner. - virtual void *Entry() wxOVERRIDE; - -private: - // the owner of the thread - wxThreadHelper& m_owner; - - // no copy ctor/assignment operator - wxThreadHelperThread(const wxThreadHelperThread&); - wxThreadHelperThread& operator=(const wxThreadHelperThread&); -}; - -// ---------------------------------------------------------------------------- -// wxThreadHelper: this class implements the threading logic to run a -// background task in another object (such as a window). It is a mix-in: just -// derive from it to implement a threading background task in your class. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxThreadHelper -{ -private: - void KillThread() - { - // If wxThreadHelperThread is detached and is about to finish, it will - // set m_thread to NULL so don't delete it then. - // But if KillThread is called before wxThreadHelperThread (in detached mode) - // sets it to NULL, then the thread object still exists and can be killed - wxCriticalSectionLocker locker(m_critSection); - - if ( m_thread ) - { - m_thread->Kill(); - - if ( m_kind == wxTHREAD_JOINABLE ) - delete m_thread; - - m_thread = NULL; - } - } - -public: - // constructor only initializes m_thread to NULL - wxThreadHelper(wxThreadKind kind = wxTHREAD_JOINABLE) - : m_thread(NULL), m_kind(kind) { } - - // destructor deletes m_thread - virtual ~wxThreadHelper() { KillThread(); } - -#if WXWIN_COMPATIBILITY_2_8 - wxDEPRECATED( wxThreadError Create(unsigned int stackSize = 0) ); -#endif - - // create a new thread (and optionally set the stack size on platforms that - // support/need that), call Run() to start it - wxThreadError CreateThread(wxThreadKind kind = wxTHREAD_JOINABLE, - unsigned int stackSize = 0) - { - KillThread(); - - m_kind = kind; - m_thread = new wxThreadHelperThread(*this, m_kind); - - return m_thread->Create(stackSize); - } - - // entry point for the thread - called by Run() and executes in the context - // of this thread. - virtual void *Entry() = 0; - - // returns a pointer to the thread which can be used to call Run() - wxThread *GetThread() const - { - wxCriticalSectionLocker locker((wxCriticalSection&)m_critSection); - - wxThread* thread = m_thread; - - return thread; - } - -protected: - wxThread *m_thread; - wxThreadKind m_kind; - wxCriticalSection m_critSection; // To guard the m_thread variable - - friend class wxThreadHelperThread; -}; - -#if WXWIN_COMPATIBILITY_2_8 -inline wxThreadError wxThreadHelper::Create(unsigned int stackSize) -{ return CreateThread(m_kind, stackSize); } -#endif - -// call Entry() in owner, put it down here to avoid circular declarations -inline void *wxThreadHelperThread::Entry() -{ - void * const result = m_owner.Entry(); - - wxCriticalSectionLocker locker(m_owner.m_critSection); - - // Detached thread will be deleted after returning, so make sure - // wxThreadHelper::GetThread will not return an invalid pointer. - // And that wxThreadHelper::KillThread will not try to kill - // an already deleted thread - if ( m_owner.m_kind == wxTHREAD_DETACHED ) - m_owner.m_thread = NULL; - - return result; -} - -// ---------------------------------------------------------------------------- -// Automatic initialization -// ---------------------------------------------------------------------------- - -// GUI mutex handling. -void WXDLLIMPEXP_BASE wxMutexGuiEnter(); -void WXDLLIMPEXP_BASE wxMutexGuiLeave(); - -// macros for entering/leaving critical sections which may be used without -// having to take them inside "#if wxUSE_THREADS" -#define wxENTER_CRIT_SECT(cs) (cs).Enter() -#define wxLEAVE_CRIT_SECT(cs) (cs).Leave() -#define wxCRIT_SECT_DECLARE(cs) static wxCriticalSection cs -#define wxCRIT_SECT_DECLARE_MEMBER(cs) wxCriticalSection cs -#define wxCRIT_SECT_LOCKER(name, cs) wxCriticalSectionLocker name(cs) - -// function for checking if we're in the main thread which may be used whether -// wxUSE_THREADS is 0 or 1 -inline bool wxIsMainThread() { return wxThread::IsMain(); } - -#else // !wxUSE_THREADS - -// no thread support -inline void wxMutexGuiEnter() { } -inline void wxMutexGuiLeave() { } - -// macros for entering/leaving critical sections which may be used without -// having to take them inside "#if wxUSE_THREADS" -// (the implementation uses dummy structs to force semicolon after the macro) -#define wxENTER_CRIT_SECT(cs) do {} while (0) -#define wxLEAVE_CRIT_SECT(cs) do {} while (0) -#define wxCRIT_SECT_DECLARE(cs) struct wxDummyCS##cs -#define wxCRIT_SECT_DECLARE_MEMBER(cs) struct wxDummyCSMember##cs { } -#define wxCRIT_SECT_LOCKER(name, cs) struct wxDummyCSLocker##name - -// if there is only one thread, it is always the main one -inline bool wxIsMainThread() { return true; } - -#endif // wxUSE_THREADS/!wxUSE_THREADS - -// mark part of code as being a critical section: this macro declares a -// critical section with the given name and enters it immediately and leaves -// it at the end of the current scope -// -// example: -// -// int Count() -// { -// static int s_counter = 0; -// -// wxCRITICAL_SECTION(counter); -// -// return ++s_counter; -// } -// -// this function is MT-safe in presence of the threads but there is no -// overhead when the library is compiled without threads -#define wxCRITICAL_SECTION(name) \ - wxCRIT_SECT_DECLARE(s_cs##name); \ - wxCRIT_SECT_LOCKER(cs##name##Locker, s_cs##name) - -// automatically lock GUI mutex in ctor and unlock it in dtor -class WXDLLIMPEXP_BASE wxMutexGuiLocker -{ -public: - wxMutexGuiLocker() { wxMutexGuiEnter(); } - ~wxMutexGuiLocker() { wxMutexGuiLeave(); } -}; - -// ----------------------------------------------------------------------------- -// implementation only until the end of file -// ----------------------------------------------------------------------------- - -#if wxUSE_THREADS - -#if defined(__WINDOWS__) || defined(__DARWIN__) - // unlock GUI if there are threads waiting for and lock it back when - // there are no more of them - should be called periodically by the main - // thread - extern void WXDLLIMPEXP_BASE wxMutexGuiLeaveOrEnter(); - - // returns true if the main thread has GUI lock - extern bool WXDLLIMPEXP_BASE wxGuiOwnedByMainThread(); - - // wakes up the main thread if it's sleeping inside ::GetMessage() - extern void WXDLLIMPEXP_BASE wxWakeUpMainThread(); - -#ifndef __DARWIN__ - // return true if the main thread is waiting for some other to terminate: - // wxApp then should block all "dangerous" messages - extern bool WXDLLIMPEXP_BASE wxIsWaitingForThread(); -#endif -#endif // MSW, OS/2 - -#endif // wxUSE_THREADS - -#endif // _WX_THREAD_H_ diff --git a/Externals/wxWidgets3/include/wx/thrimpl.cpp b/Externals/wxWidgets3/include/wx/thrimpl.cpp deleted file mode 100644 index b8d2eae7d9..0000000000 --- a/Externals/wxWidgets3/include/wx/thrimpl.cpp +++ /dev/null @@ -1,357 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/thrimpl.cpp -// Purpose: common part of wxThread Implementations -// Author: Vadim Zeitlin -// Modified by: -// Created: 04.06.02 (extracted from src/*/thread.cpp files) -// Copyright: (c) Vadim Zeitlin (2002) -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// this file is supposed to be included only by the various thread.cpp - -// ---------------------------------------------------------------------------- -// wxMutex -// ---------------------------------------------------------------------------- - -wxMutex::wxMutex(wxMutexType mutexType) -{ - m_internal = new wxMutexInternal(mutexType); - - if ( !m_internal->IsOk() ) - { - delete m_internal; - m_internal = NULL; - } -} - -wxMutex::~wxMutex() -{ - delete m_internal; -} - -bool wxMutex::IsOk() const -{ - return m_internal != NULL; -} - -wxMutexError wxMutex::Lock() -{ - wxCHECK_MSG( m_internal, wxMUTEX_INVALID, - wxT("wxMutex::Lock(): not initialized") ); - - return m_internal->Lock(); -} - -wxMutexError wxMutex::LockTimeout(unsigned long ms) -{ - wxCHECK_MSG( m_internal, wxMUTEX_INVALID, - wxT("wxMutex::Lock(): not initialized") ); - - return m_internal->Lock(ms); -} - -wxMutexError wxMutex::TryLock() -{ - wxCHECK_MSG( m_internal, wxMUTEX_INVALID, - wxT("wxMutex::TryLock(): not initialized") ); - - return m_internal->TryLock(); -} - -wxMutexError wxMutex::Unlock() -{ - wxCHECK_MSG( m_internal, wxMUTEX_INVALID, - wxT("wxMutex::Unlock(): not initialized") ); - - return m_internal->Unlock(); -} - -// -------------------------------------------------------------------------- -// wxConditionInternal -// -------------------------------------------------------------------------- - -// Win32 and OS/2 don't have explicit support for the POSIX condition -// variables and their events/event semaphores have quite different semantics, -// so we reimplement the conditions from scratch using the mutexes and -// semaphores -#if defined(__WINDOWS__) - -class wxConditionInternal -{ -public: - wxConditionInternal(wxMutex& mutex); - - bool IsOk() const { return m_mutex.IsOk() && m_semaphore.IsOk(); } - - wxCondError Wait(); - wxCondError WaitTimeout(unsigned long milliseconds); - - wxCondError Signal(); - wxCondError Broadcast(); - -private: - // the number of threads currently waiting for this condition - LONG m_numWaiters; - - // the critical section protecting m_numWaiters - wxCriticalSection m_csWaiters; - - wxMutex& m_mutex; - wxSemaphore m_semaphore; - - wxDECLARE_NO_COPY_CLASS(wxConditionInternal); -}; - -wxConditionInternal::wxConditionInternal(wxMutex& mutex) - : m_mutex(mutex) -{ - // another thread can't access it until we return from ctor, so no need to - // protect access to m_numWaiters here - m_numWaiters = 0; -} - -wxCondError wxConditionInternal::Wait() -{ - // increment the number of waiters - { - wxCriticalSectionLocker lock(m_csWaiters); - m_numWaiters++; - } - - m_mutex.Unlock(); - - // after unlocking the mutex other threads may Signal() us, but it is ok - // now as we had already incremented m_numWaiters so Signal() will post the - // semaphore and decrement m_numWaiters back even if it is called before we - // start to Wait() - const wxSemaError err = m_semaphore.Wait(); - - m_mutex.Lock(); - - if ( err == wxSEMA_NO_ERROR ) - { - // m_numWaiters was decremented by Signal() - return wxCOND_NO_ERROR; - } - - // but in case of an error we need to do it manually - { - wxCriticalSectionLocker lock(m_csWaiters); - m_numWaiters--; - } - - return err == wxSEMA_TIMEOUT ? wxCOND_TIMEOUT : wxCOND_MISC_ERROR; -} - -wxCondError wxConditionInternal::WaitTimeout(unsigned long milliseconds) -{ - { - wxCriticalSectionLocker lock(m_csWaiters); - m_numWaiters++; - } - - m_mutex.Unlock(); - - wxSemaError err = m_semaphore.WaitTimeout(milliseconds); - - m_mutex.Lock(); - - if ( err == wxSEMA_NO_ERROR ) - return wxCOND_NO_ERROR; - - if ( err == wxSEMA_TIMEOUT ) - { - // a potential race condition exists here: it happens when a waiting - // thread times out but doesn't have time to decrement m_numWaiters yet - // before Signal() is called in another thread - // - // to handle this particular case, check the semaphore again after - // acquiring m_csWaiters lock -- this will catch the signals missed - // during this window - wxCriticalSectionLocker lock(m_csWaiters); - - err = m_semaphore.WaitTimeout(0); - if ( err == wxSEMA_NO_ERROR ) - return wxCOND_NO_ERROR; - - // we need to decrement m_numWaiters ourselves as it wasn't done by - // Signal() - m_numWaiters--; - - return err == wxSEMA_TIMEOUT ? wxCOND_TIMEOUT : wxCOND_MISC_ERROR; - } - - // undo m_numWaiters++ above in case of an error - { - wxCriticalSectionLocker lock(m_csWaiters); - m_numWaiters--; - } - - return wxCOND_MISC_ERROR; -} - -wxCondError wxConditionInternal::Signal() -{ - wxCriticalSectionLocker lock(m_csWaiters); - - if ( m_numWaiters > 0 ) - { - // increment the semaphore by 1 - if ( m_semaphore.Post() != wxSEMA_NO_ERROR ) - return wxCOND_MISC_ERROR; - - m_numWaiters--; - } - - return wxCOND_NO_ERROR; -} - -wxCondError wxConditionInternal::Broadcast() -{ - wxCriticalSectionLocker lock(m_csWaiters); - - while ( m_numWaiters > 0 ) - { - if ( m_semaphore.Post() != wxSEMA_NO_ERROR ) - return wxCOND_MISC_ERROR; - - m_numWaiters--; - } - - return wxCOND_NO_ERROR; -} - -#endif // __WINDOWS__ - -// ---------------------------------------------------------------------------- -// wxCondition -// ---------------------------------------------------------------------------- - -wxCondition::wxCondition(wxMutex& mutex) -{ - m_internal = new wxConditionInternal(mutex); - - if ( !m_internal->IsOk() ) - { - delete m_internal; - m_internal = NULL; - } -} - -wxCondition::~wxCondition() -{ - delete m_internal; -} - -bool wxCondition::IsOk() const -{ - return m_internal != NULL; -} - -wxCondError wxCondition::Wait() -{ - wxCHECK_MSG( m_internal, wxCOND_INVALID, - wxT("wxCondition::Wait(): not initialized") ); - - return m_internal->Wait(); -} - -wxCondError wxCondition::WaitTimeout(unsigned long milliseconds) -{ - wxCHECK_MSG( m_internal, wxCOND_INVALID, - wxT("wxCondition::Wait(): not initialized") ); - - return m_internal->WaitTimeout(milliseconds); -} - -wxCondError wxCondition::Signal() -{ - wxCHECK_MSG( m_internal, wxCOND_INVALID, - wxT("wxCondition::Signal(): not initialized") ); - - return m_internal->Signal(); -} - -wxCondError wxCondition::Broadcast() -{ - wxCHECK_MSG( m_internal, wxCOND_INVALID, - wxT("wxCondition::Broadcast(): not initialized") ); - - return m_internal->Broadcast(); -} - -// -------------------------------------------------------------------------- -// wxSemaphore -// -------------------------------------------------------------------------- - -wxSemaphore::wxSemaphore(int initialcount, int maxcount) -{ - m_internal = new wxSemaphoreInternal( initialcount, maxcount ); - if ( !m_internal->IsOk() ) - { - delete m_internal; - m_internal = NULL; - } -} - -wxSemaphore::~wxSemaphore() -{ - delete m_internal; -} - -bool wxSemaphore::IsOk() const -{ - return m_internal != NULL; -} - -wxSemaError wxSemaphore::Wait() -{ - wxCHECK_MSG( m_internal, wxSEMA_INVALID, - wxT("wxSemaphore::Wait(): not initialized") ); - - return m_internal->Wait(); -} - -wxSemaError wxSemaphore::TryWait() -{ - wxCHECK_MSG( m_internal, wxSEMA_INVALID, - wxT("wxSemaphore::TryWait(): not initialized") ); - - return m_internal->TryWait(); -} - -wxSemaError wxSemaphore::WaitTimeout(unsigned long milliseconds) -{ - wxCHECK_MSG( m_internal, wxSEMA_INVALID, - wxT("wxSemaphore::WaitTimeout(): not initialized") ); - - return m_internal->WaitTimeout(milliseconds); -} - -wxSemaError wxSemaphore::Post() -{ - wxCHECK_MSG( m_internal, wxSEMA_INVALID, - wxT("wxSemaphore::Post(): not initialized") ); - - return m_internal->Post(); -} - -// ---------------------------------------------------------------------------- -// wxThread -// ---------------------------------------------------------------------------- - -#include "wx/utils.h" -#include "wx/private/threadinfo.h" -#include "wx/scopeguard.h" - -void wxThread::Sleep(unsigned long milliseconds) -{ - wxMilliSleep(milliseconds); -} - -void *wxThread::CallEntry() -{ - wxON_BLOCK_EXIT0(wxThreadSpecificInfo::ThreadCleanUp); - return Entry(); -} diff --git a/Externals/wxWidgets3/include/wx/time.h b/Externals/wxWidgets3/include/wx/time.h deleted file mode 100644 index 918da125b8..0000000000 --- a/Externals/wxWidgets3/include/wx/time.h +++ /dev/null @@ -1,76 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/time.h -// Purpose: Miscellaneous time-related functions. -// Author: Vadim Zeitlin -// Created: 2011-11-26 -// Copyright: (c) 2011 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_TIME_H_ -#define _WX_TIME_H_ - -#include "wx/longlong.h" - -// Returns the difference between UTC and local time in seconds. -WXDLLIMPEXP_BASE int wxGetTimeZone(); - -// Get number of seconds since local time 00:00:00 Jan 1st 1970. -extern long WXDLLIMPEXP_BASE wxGetLocalTime(); - -// Get number of seconds since GMT 00:00:00, Jan 1st 1970. -extern long WXDLLIMPEXP_BASE wxGetUTCTime(); - -#if wxUSE_LONGLONG - typedef wxLongLong wxMilliClock_t; - inline long wxMilliClockToLong(wxLongLong ll) { return ll.ToLong(); } -#else - typedef double wxMilliClock_t; - inline long wxMilliClockToLong(double d) { return wx_truncate_cast(long, d); } -#endif // wxUSE_LONGLONG - -// Get number of milliseconds since local time 00:00:00 Jan 1st 1970 -extern wxMilliClock_t WXDLLIMPEXP_BASE wxGetLocalTimeMillis(); - -#if wxUSE_LONGLONG - -// Get the number of milliseconds or microseconds since the Epoch. -wxLongLong WXDLLIMPEXP_BASE wxGetUTCTimeMillis(); -wxLongLong WXDLLIMPEXP_BASE wxGetUTCTimeUSec(); - -#endif // wxUSE_LONGLONG - -#define wxGetCurrentTime() wxGetLocalTime() - -// on some really old systems gettimeofday() doesn't have the second argument, -// define wxGetTimeOfDay() to hide this difference -#ifdef HAVE_GETTIMEOFDAY - #ifdef WX_GETTIMEOFDAY_NO_TZ - #define wxGetTimeOfDay(tv) gettimeofday(tv) - #else - #define wxGetTimeOfDay(tv) gettimeofday((tv), NULL) - #endif -#endif // HAVE_GETTIMEOFDAY - -/* Two wrapper functions for thread safety */ -#ifdef HAVE_LOCALTIME_R -#define wxLocaltime_r localtime_r -#else -WXDLLIMPEXP_BASE struct tm *wxLocaltime_r(const time_t*, struct tm*); -#if wxUSE_THREADS && !defined(__WINDOWS__) - // On Windows, localtime _is_ threadsafe! -#warning using pseudo thread-safe wrapper for localtime to emulate localtime_r -#endif -#endif - -#ifdef HAVE_GMTIME_R -#define wxGmtime_r gmtime_r -#else -WXDLLIMPEXP_BASE struct tm *wxGmtime_r(const time_t*, struct tm*); -#if wxUSE_THREADS && !defined(__WINDOWS__) - // On Windows, gmtime _is_ threadsafe! -#warning using pseudo thread-safe wrapper for gmtime to emulate gmtime_r -#endif -#endif - -#endif // _WX_TIME_H_ diff --git a/Externals/wxWidgets3/include/wx/timectrl.h b/Externals/wxWidgets3/include/wx/timectrl.h deleted file mode 100644 index 928d9aedf3..0000000000 --- a/Externals/wxWidgets3/include/wx/timectrl.h +++ /dev/null @@ -1,124 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/timectrl.h -// Purpose: Declaration of wxTimePickerCtrl class. -// Author: Vadim Zeitlin -// Created: 2011-09-22 -// Copyright: (c) 2011 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_TIMECTRL_H_ -#define _WX_TIMECTRL_H_ - -#include "wx/defs.h" - -#if wxUSE_TIMEPICKCTRL - -#include "wx/datetimectrl.h" - -#define wxTimePickerCtrlNameStr wxS("timectrl") - -// No special styles are currently defined for this control but still define a -// symbolic constant for the default style for consistency. -enum -{ - wxTP_DEFAULT = 0 -}; - -// ---------------------------------------------------------------------------- -// wxTimePickerCtrl: Allow the user to enter the time. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxTimePickerCtrlBase : public wxDateTimePickerCtrl -{ -public: - /* - The derived classes should implement ctor and Create() method with the - following signature: - - bool Create(wxWindow *parent, - wxWindowID id, - const wxDateTime& dt = wxDefaultDateTime, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxTP_DEFAULT, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxTimePickerCtrlNameStr); - */ - - /* - We also inherit Set/GetValue() methods from the base class which define - our public API. Notice that the date portion of the date passed as - input or received as output is or should be ignored, only the time part - of wxDateTime objects is really significant here. Use Set/GetTime() - below for possibly simpler interface. - */ - - // Set the given time. - bool SetTime(int hour, int min, int sec) - { - // Notice that we should use a date on which DST doesn't change to - // avoid any problems with time discontinuity so use a fixed date (on - // which nobody changes DST) instead of e.g. today. - wxDateTime dt(1, wxDateTime::Jan, 2012, hour, min, sec); - if ( !dt.IsValid() ) - { - // No need to assert here, wxDateTime already does it for us. - return false; - } - - SetValue(dt); - - return true; - } - - // Get the current time components. All pointers must be non-NULL. - bool GetTime(int* hour, int* min, int* sec) const - { - wxCHECK_MSG( hour && min && sec, false, - wxS("Time component pointers must be non-NULL") ); - - const wxDateTime::Tm tm = GetValue().GetTm(); - *hour = tm.hour; - *min = tm.min; - *sec = tm.sec; - - return true; - } -}; - -#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) - #include "wx/msw/timectrl.h" - - #define wxHAS_NATIVE_TIMEPICKERCTRL -#elif defined(__WXOSX_COCOA__) && !defined(__WXUNIVERSAL__) - #include "wx/osx/timectrl.h" - - #define wxHAS_NATIVE_TIMEPICKERCTRL -#else - #include "wx/generic/timectrl.h" - - class WXDLLIMPEXP_ADV wxTimePickerCtrl : public wxTimePickerCtrlGeneric - { - public: - wxTimePickerCtrl() { } - wxTimePickerCtrl(wxWindow *parent, - wxWindowID id, - const wxDateTime& date = wxDefaultDateTime, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxTP_DEFAULT, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxTimePickerCtrlNameStr) - : wxTimePickerCtrlGeneric(parent, id, date, pos, size, style, validator, name) - { - } - - private: - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxTimePickerCtrl); - }; -#endif - -#endif // wxUSE_TIMEPICKCTRL - -#endif // _WX_TIMECTRL_H_ diff --git a/Externals/wxWidgets3/include/wx/timer.h b/Externals/wxWidgets3/include/wx/timer.h deleted file mode 100644 index 956cc2a87e..0000000000 --- a/Externals/wxWidgets3/include/wx/timer.h +++ /dev/null @@ -1,196 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/timer.h -// Purpose: wxTimer, wxStopWatch and global time-related functions -// Author: Julian Smart -// Modified by: Vadim Zeitlin (wxTimerBase) -// Guillermo Rodriguez (global clean up) -// Created: 04/01/98 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_TIMER_H_BASE_ -#define _WX_TIMER_H_BASE_ - -#include "wx/defs.h" - -#if wxUSE_TIMER - -#include "wx/object.h" -#include "wx/longlong.h" -#include "wx/event.h" -#include "wx/stopwatch.h" // for backwards compatibility -#include "wx/utils.h" - - -// more readable flags for Start(): - -// generate notifications periodically until the timer is stopped (default) -#define wxTIMER_CONTINUOUS false - -// only send the notification once and then stop the timer -#define wxTIMER_ONE_SHOT true - -class WXDLLIMPEXP_FWD_BASE wxTimerImpl; -class WXDLLIMPEXP_FWD_BASE wxTimerEvent; - -// timer event type -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_BASE, wxEVT_TIMER, wxTimerEvent); - -// the interface of wxTimer class -class WXDLLIMPEXP_BASE wxTimer : public wxEvtHandler -{ -public: - // ctors and initializers - // ---------------------- - - // default: if you don't call SetOwner(), your only chance to get timer - // notifications is to override Notify() in the derived class - wxTimer() - { - Init(); - SetOwner(this); - } - - // ctor which allows to avoid having to override Notify() in the derived - // class: the owner will get timer notifications which can be handled with - // EVT_TIMER - wxTimer(wxEvtHandler *owner, int timerid = wxID_ANY) - { - Init(); - SetOwner(owner, timerid); - } - - // same as ctor above - void SetOwner(wxEvtHandler *owner, int timerid = wxID_ANY); - - virtual ~wxTimer(); - - - // working with the timer - // ---------------------- - - // NB: Start() and Stop() are not supposed to be overridden, they are only - // virtual for historical reasons, only Notify() can be overridden - - // start the timer: if milliseconds == -1, use the same value as for the - // last Start() - // - // it is now valid to call Start() multiple times: this just restarts the - // timer if it is already running - virtual bool Start(int milliseconds = -1, bool oneShot = false); - - // start the timer for one iteration only, this is just a simple wrapper - // for Start() - bool StartOnce(int milliseconds = -1) { return Start(milliseconds, true); } - - // stop the timer, does nothing if the timer is not running - virtual void Stop(); - - // override this in your wxTimer-derived class if you want to process timer - // messages in it, use non default ctor or SetOwner() otherwise - virtual void Notify(); - - - // accessors - // --------- - - // get the object notified about the timer events - wxEvtHandler *GetOwner() const; - - // return true if the timer is running - bool IsRunning() const; - - // return the timer ID - int GetId() const; - - // get the (last) timer interval in milliseconds - int GetInterval() const; - - // return true if the timer is one shot - bool IsOneShot() const; - -protected: - // common part of all ctors - void Init(); - - wxTimerImpl *m_impl; - - wxDECLARE_NO_COPY_CLASS(wxTimer); -}; - -// ---------------------------------------------------------------------------- -// wxTimerRunner: starts the timer in its ctor, stops in the dtor -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxTimerRunner -{ -public: - wxTimerRunner(wxTimer& timer) : m_timer(timer) { } - wxTimerRunner(wxTimer& timer, int milli, bool oneShot = false) - : m_timer(timer) - { - m_timer.Start(milli, oneShot); - } - - void Start(int milli, bool oneShot = false) - { - m_timer.Start(milli, oneShot); - } - - ~wxTimerRunner() - { - if ( m_timer.IsRunning() ) - { - m_timer.Stop(); - } - } - -private: - wxTimer& m_timer; - - wxDECLARE_NO_COPY_CLASS(wxTimerRunner); -}; - -// ---------------------------------------------------------------------------- -// wxTimerEvent -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxTimerEvent : public wxEvent -{ -public: - wxTimerEvent() - : wxEvent(wxID_ANY, wxEVT_TIMER) { m_timer=NULL; } - - wxTimerEvent(wxTimer& timer) - : wxEvent(timer.GetId(), wxEVT_TIMER), - m_timer(&timer) - { - SetEventObject(timer.GetOwner()); - } - - // accessors - int GetInterval() const { return m_timer->GetInterval(); } - wxTimer& GetTimer() const { return *m_timer; } - - // implement the base class pure virtual - virtual wxEvent *Clone() const wxOVERRIDE { return new wxTimerEvent(*this); } - virtual wxEventCategory GetEventCategory() const wxOVERRIDE { return wxEVT_CATEGORY_TIMER; } - -private: - wxTimer* m_timer; - - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxTimerEvent); -}; - -typedef void (wxEvtHandler::*wxTimerEventFunction)(wxTimerEvent&); - -#define wxTimerEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxTimerEventFunction, func) - -#define EVT_TIMER(timerid, func) \ - wx__DECLARE_EVT1(wxEVT_TIMER, timerid, wxTimerEventHandler(func)) - -#endif // wxUSE_TIMER - -#endif // _WX_TIMER_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/tipdlg.h b/Externals/wxWidgets3/include/wx/tipdlg.h deleted file mode 100644 index 173bbf41cd..0000000000 --- a/Externals/wxWidgets3/include/wx/tipdlg.h +++ /dev/null @@ -1,86 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/tipdlg.h -// Purpose: declaration of wxTipDialog -// Author: Vadim Zeitlin -// Modified by: -// Created: 28.06.99 -// Copyright: (c) Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_TIPDLG_H_ -#define _WX_TIPDLG_H_ - -// ---------------------------------------------------------------------------- -// headers which we must include here -// ---------------------------------------------------------------------------- - -#include "wx/defs.h" - -#if wxUSE_STARTUP_TIPS - -#include "wx/textfile.h" - -// ---------------------------------------------------------------------------- -// wxTipProvider - a class which is used by wxTipDialog to get the text of the -// tips -// ---------------------------------------------------------------------------- - -// the abstract base class: it provides the tips, i.e. implements the GetTip() -// function which returns the new tip each time it's called. To support this, -// wxTipProvider evidently needs some internal state which is the tip "index" -// and which should be saved/restored by the program to not always show one and -// the same tip (of course, you may use random starting position as well...) -class WXDLLIMPEXP_ADV wxTipProvider -{ -public: - wxTipProvider(size_t currentTip) { m_currentTip = currentTip; } - - // get the current tip and update the internal state to return the next tip - // when called for the next time - virtual wxString GetTip() = 0; - - // get the current tip "index" (or whatever allows the tip provider to know - // from where to start the next time) - size_t GetCurrentTip() const { return m_currentTip; } - - // virtual dtor for the base class - virtual ~wxTipProvider() { } - - -#if WXWIN_COMPATIBILITY_3_0 - wxDEPRECATED_MSG("this method does nothing, simply don't call it") - wxString PreprocessTip(const wxString& tip) { return tip; } -#endif - -protected: - size_t m_currentTip; -}; - -// a function which returns an implementation of wxTipProvider using the -// specified text file as the source of tips (each line is a tip). -// -// NB: the caller is responsible for deleting the pointer! -#if wxUSE_TEXTFILE -WXDLLIMPEXP_ADV wxTipProvider *wxCreateFileTipProvider(const wxString& filename, - size_t currentTip); -#endif // wxUSE_TEXTFILE - -// ---------------------------------------------------------------------------- -// wxTipDialog -// ---------------------------------------------------------------------------- - -// A dialog which shows a "tip" - a short and helpful messages describing to -// the user some program characteristic. Many programs show the tips at -// startup, so the dialog has "Show tips on startup" checkbox which allows to -// the user to disable this (however, it's the program which should show, or -// not, the dialog on startup depending on its value, not this class). -// -// The function returns true if this checkbox is checked, false otherwise. -WXDLLIMPEXP_ADV bool wxShowTip(wxWindow *parent, - wxTipProvider *tipProvider, - bool showAtStartup = true); - -#endif // wxUSE_STARTUP_TIPS - -#endif // _WX_TIPDLG_H_ diff --git a/Externals/wxWidgets3/include/wx/tipwin.h b/Externals/wxWidgets3/include/wx/tipwin.h deleted file mode 100644 index 08c0957e5b..0000000000 --- a/Externals/wxWidgets3/include/wx/tipwin.h +++ /dev/null @@ -1,97 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/tipwin.h -// Purpose: wxTipWindow is a window like the one typically used for -// showing the tooltips -// Author: Vadim Zeitlin -// Modified by: -// Created: 10.09.00 -// Copyright: (c) 2000 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_TIPWIN_H_ -#define _WX_TIPWIN_H_ - -#if wxUSE_TIPWINDOW - -#if wxUSE_POPUPWIN - #include "wx/popupwin.h" - - #define wxTipWindowBase wxPopupTransientWindow -#else - #include "wx/frame.h" - - #define wxTipWindowBase wxFrame -#endif -#include "wx/arrstr.h" - -class WXDLLIMPEXP_FWD_CORE wxTipWindowView; - -// ---------------------------------------------------------------------------- -// wxTipWindow -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxTipWindow : public wxTipWindowBase -{ -public: - // the mandatory ctor parameters are: the parent window and the text to - // show - // - // optionally you may also specify the length at which the lines are going - // to be broken in rows (100 pixels by default) - // - // windowPtr and rectBound are just passed to SetTipWindowPtr() and - // SetBoundingRect() - see below - wxTipWindow(wxWindow *parent, - const wxString& text, - wxCoord maxLength = 100, - wxTipWindow** windowPtr = NULL, - wxRect *rectBound = NULL); - - virtual ~wxTipWindow(); - - // If windowPtr is not NULL the given address will be NULLed when the - // window has closed - void SetTipWindowPtr(wxTipWindow** windowPtr) { m_windowPtr = windowPtr; } - - // If rectBound is not NULL, the window will disappear automatically when - // the mouse leave the specified rect: note that rectBound should be in the - // screen coordinates! - void SetBoundingRect(const wxRect& rectBound); - - // Hide and destroy the window - void Close(); - -protected: - // called by wxTipWindowView only - bool CheckMouseInBounds(const wxPoint& pos); - - // event handlers - void OnMouseClick(wxMouseEvent& event); - -#if !wxUSE_POPUPWIN - void OnActivate(wxActivateEvent& event); - void OnKillFocus(wxFocusEvent& event); -#else // wxUSE_POPUPWIN - virtual void OnDismiss() wxOVERRIDE; -#endif // wxUSE_POPUPWIN/!wxUSE_POPUPWIN - -private: - wxArrayString m_textLines; - wxCoord m_heightLine; - - wxTipWindowView *m_view; - - wxTipWindow** m_windowPtr; - wxRect m_rectBound; - - wxDECLARE_EVENT_TABLE(); - - friend class wxTipWindowView; - - wxDECLARE_NO_COPY_CLASS(wxTipWindow); -}; - -#endif // wxUSE_TIPWINDOW - -#endif // _WX_TIPWIN_H_ diff --git a/Externals/wxWidgets3/include/wx/tls.h b/Externals/wxWidgets3/include/wx/tls.h deleted file mode 100644 index 7e7592286b..0000000000 --- a/Externals/wxWidgets3/include/wx/tls.h +++ /dev/null @@ -1,143 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/tls.h -// Purpose: Implementation of thread local storage -// Author: Vadim Zeitlin -// Created: 2008-08-08 -// Copyright: (c) 2008 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_TLS_H_ -#define _WX_TLS_H_ - -#include "wx/defs.h" - -// ---------------------------------------------------------------------------- -// check for compiler support of thread-specific variables -// ---------------------------------------------------------------------------- - -// when not using threads at all, there is no need for thread-specific -// values to be really thread-specific -#if !wxUSE_THREADS - #define wxHAS_COMPILER_TLS - #define wxTHREAD_SPECIFIC_DECL -// otherwise try to find the compiler-specific way to handle TLS unless -// explicitly disabled by setting wxUSE_COMPILER_TLS to 0 (it is 1 by default). -#elif wxUSE_COMPILER_TLS -// __thread keyword is not supported correctly by MinGW, at least in some -// configurations, see http://sourceforge.net/support/tracker.php?aid=2837047 -// and when in doubt we prefer to not use it at all. -#if defined(HAVE___THREAD_KEYWORD) && !defined(__MINGW32__) - #define wxHAS_COMPILER_TLS - #define wxTHREAD_SPECIFIC_DECL __thread -// MSVC has its own version which might be supported by some other Windows -// compilers, to be tested -#elif defined(__VISUALC__) - #define wxHAS_COMPILER_TLS - #define wxTHREAD_SPECIFIC_DECL __declspec(thread) -#endif // compilers -#endif // wxUSE_COMPILER_TLS - -// ---------------------------------------------------------------------------- -// define wxTLS_TYPE() -// ---------------------------------------------------------------------------- - -#ifdef wxHAS_COMPILER_TLS - #define wxTLS_TYPE(T) wxTHREAD_SPECIFIC_DECL T - #define wxTLS_TYPE_REF(T) T& - #define wxTLS_PTR(var) (&(var)) - #define wxTLS_VALUE(var) (var) -#else // !wxHAS_COMPILER_TLS - - extern "C" - { - typedef void (*wxTlsDestructorFunction)(void*); - } - - #if defined(__WINDOWS__) - #include "wx/msw/tls.h" - #elif defined(__UNIX__) - #include "wx/unix/tls.h" - #else - // TODO: we could emulate TLS for such platforms... - #error Neither compiler nor OS support thread-specific variables. - #endif - - #include // for calloc() - - // wxTlsValue represents a thread-specific value of type T but, unlike - // with native compiler thread-specific variables, it behaves like a - // (never NULL) pointer to T and so needs to be dereferenced before use - // - // Note: T must be a POD! - // - // Note: On Unix, thread-specific T value is freed when the thread exits. - // On Windows, thread-specific values are freed later, when given - // wxTlsValue is destroyed. The only exception to this is the - // value for the main thread, which is always freed when - // wxTlsValue is destroyed. - template - class wxTlsValue - { - public: - typedef T ValueType; - - // ctor doesn't do anything, the object is created on first access - wxTlsValue() : m_key(free) {} - - // dtor is only called in the main thread context and so is not enough - // to free memory allocated by us for the other threads, we use - // destructor function when using Pthreads for this (which is not - // called for the main thread as it doesn't call pthread_exit() but - // just to be safe we also reset the key anyhow) - ~wxTlsValue() - { - if ( m_key.Get() ) - m_key.Set(NULL); // this deletes the value - } - - // access the object creating it on demand - ValueType *Get() - { - void *value = m_key.Get(); - if ( !value ) - { - // ValueType must be POD to be used in wxHAS_COMPILER_TLS case - // anyhow (at least gcc doesn't accept non-POD values being - // declared with __thread) so initialize it as a POD too - value = calloc(1, sizeof(ValueType)); - - if ( !m_key.Set(value) ) - { - free(value); - - // this will probably result in a crash in the caller but - // it's arguably better to crash immediately instead of - // slowly dying from out-of-memory errors which would - // happen as the next access to this object would allocate - // another ValueType instance and so on forever - value = NULL; - } - } - - return static_cast(value); - } - - // pointer-like accessors - ValueType *operator->() { return Get(); } - ValueType& operator*() { return *Get(); } - - private: - wxTlsKey m_key; - - wxDECLARE_NO_COPY_TEMPLATE_CLASS(wxTlsValue, T); - }; - - #define wxTLS_TYPE(T) wxTlsValue - #define wxTLS_TYPE_REF(T) wxTLS_TYPE(T)& - #define wxTLS_PTR(var) ((var).Get()) - #define wxTLS_VALUE(var) (*(var)) -#endif // wxHAS_COMPILER_TLS/!wxHAS_COMPILER_TLS - -#endif // _WX_TLS_H_ - diff --git a/Externals/wxWidgets3/include/wx/tokenzr.h b/Externals/wxWidgets3/include/wx/tokenzr.h deleted file mode 100644 index 45f91a0aef..0000000000 --- a/Externals/wxWidgets3/include/wx/tokenzr.h +++ /dev/null @@ -1,153 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/tokenzr.h -// Purpose: String tokenizer - a C++ replacement for strtok(3) -// Author: Guilhem Lavaux -// Modified by: (or rather rewritten by) Vadim Zeitlin -// Created: 04/22/98 -// Copyright: (c) Guilhem Lavaux -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_TOKENZRH -#define _WX_TOKENZRH - -#include "wx/object.h" -#include "wx/string.h" -#include "wx/arrstr.h" - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -// default: delimiters are usual white space characters -#define wxDEFAULT_DELIMITERS (wxT(" \t\r\n")) - -// wxStringTokenizer mode flags which determine its behaviour -enum wxStringTokenizerMode -{ - wxTOKEN_INVALID = -1, // set by def ctor until SetString() is called - wxTOKEN_DEFAULT, // strtok() for whitespace delims, RET_EMPTY else - wxTOKEN_RET_EMPTY, // return empty token in the middle of the string - wxTOKEN_RET_EMPTY_ALL, // return trailing empty tokens too - wxTOKEN_RET_DELIMS, // return the delim with token (implies RET_EMPTY) - wxTOKEN_STRTOK // behave exactly like strtok(3) -}; - -// ---------------------------------------------------------------------------- -// wxStringTokenizer: replaces infamous strtok() and has some other features -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxStringTokenizer : public wxObject -{ -public: - // ctors and initializers - // default ctor, call SetString() later - wxStringTokenizer() { m_mode = wxTOKEN_INVALID; } - // ctor which gives us the string - wxStringTokenizer(const wxString& str, - const wxString& delims = wxDEFAULT_DELIMITERS, - wxStringTokenizerMode mode = wxTOKEN_DEFAULT); - // copy ctor and assignment operator - wxStringTokenizer(const wxStringTokenizer& src); - wxStringTokenizer& operator=(const wxStringTokenizer& src); - - // args are same as for the non default ctor above - void SetString(const wxString& str, - const wxString& delims = wxDEFAULT_DELIMITERS, - wxStringTokenizerMode mode = wxTOKEN_DEFAULT); - - // reinitialize the tokenizer with the same delimiters/mode - void Reinit(const wxString& str); - - // tokens access - // return the number of remaining tokens - size_t CountTokens() const; - // did we reach the end of the string? - bool HasMoreTokens() const; - // get the next token, will return empty string if !HasMoreTokens() - wxString GetNextToken(); - // get the delimiter which terminated the token last retrieved by - // GetNextToken() or NUL if there had been no tokens yet or the last - // one wasn't terminated (but ran to the end of the string) - wxChar GetLastDelimiter() const { return m_lastDelim; } - - // get current tokenizer state - // returns the part of the string which remains to tokenize (*not* the - // initial string) - wxString GetString() const { return wxString(m_pos, m_string.end()); } - - // returns the current position (i.e. one index after the last - // returned token or 0 if GetNextToken() has never been called) in the - // original string - size_t GetPosition() const { return m_pos - m_string.begin(); } - - // misc - // get the current mode - can be different from the one passed to the - // ctor if it was wxTOKEN_DEFAULT - wxStringTokenizerMode GetMode() const { return m_mode; } - // do we return empty tokens? - bool AllowEmpty() const { return m_mode != wxTOKEN_STRTOK; } - - - // backwards compatibility section from now on - // ------------------------------------------- - - // for compatibility only, use GetNextToken() instead - wxString NextToken() { return GetNextToken(); } - - // compatibility only, don't use - void SetString(const wxString& to_tokenize, - const wxString& delims, - bool WXUNUSED(ret_delim)) - { - SetString(to_tokenize, delims, wxTOKEN_RET_DELIMS); - } - - wxStringTokenizer(const wxString& to_tokenize, - const wxString& delims, - bool ret_delim) - { - SetString(to_tokenize, delims, ret_delim); - } - -protected: - bool IsOk() const { return m_mode != wxTOKEN_INVALID; } - - bool DoHasMoreTokens() const; - - void DoCopyFrom(const wxStringTokenizer& src); - - enum MoreTokensState - { - MoreTokens_Unknown, - MoreTokens_Yes, - MoreTokens_No - }; - - MoreTokensState m_hasMoreTokens; - - wxString m_string; // the string we tokenize - wxString::const_iterator m_stringEnd; - // FIXME-UTF8: use wxWcharBuffer - wxWxCharBuffer m_delims; // all possible delimiters - size_t m_delimsLen; - - wxString::const_iterator m_pos; // the current position in m_string - - wxStringTokenizerMode m_mode; // see wxTOKEN_XXX values - - wxChar m_lastDelim; // delimiter after last token or '\0' -}; - -// ---------------------------------------------------------------------------- -// convenience function which returns all tokens at once -// ---------------------------------------------------------------------------- - -// the function takes the same parameters as wxStringTokenizer ctor and returns -// the array containing all tokens -wxArrayString WXDLLIMPEXP_BASE -wxStringTokenize(const wxString& str, - const wxString& delims = wxDEFAULT_DELIMITERS, - wxStringTokenizerMode mode = wxTOKEN_DEFAULT); - -#endif // _WX_TOKENZRH diff --git a/Externals/wxWidgets3/include/wx/toolbar.h b/Externals/wxWidgets3/include/wx/toolbar.h deleted file mode 100644 index f4f6afe1b5..0000000000 --- a/Externals/wxWidgets3/include/wx/toolbar.h +++ /dev/null @@ -1,88 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/toolbar.h -// Purpose: wxToolBar interface declaration -// Author: Vadim Zeitlin -// Modified by: -// Created: 20.11.99 -// Copyright: (c) Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_TOOLBAR_H_BASE_ -#define _WX_TOOLBAR_H_BASE_ - -#include "wx/defs.h" - -// ---------------------------------------------------------------------------- -// wxToolBar style flags -// ---------------------------------------------------------------------------- - -enum -{ - // lay out the toolbar horizontally - wxTB_HORIZONTAL = wxHORIZONTAL, // == 0x0004 - wxTB_TOP = wxTB_HORIZONTAL, - - // lay out the toolbar vertically - wxTB_VERTICAL = wxVERTICAL, // == 0x0008 - wxTB_LEFT = wxTB_VERTICAL, - - // show 3D buttons (wxToolBarSimple only) - wxTB_3DBUTTONS = 0x0010, - - // "flat" buttons (Win32/GTK only) - wxTB_FLAT = 0x0020, - - // dockable toolbar (GTK only) - wxTB_DOCKABLE = 0x0040, - - // don't show the icons (they're shown by default) - wxTB_NOICONS = 0x0080, - - // show the text (not shown by default) - wxTB_TEXT = 0x0100, - - // don't show the divider between toolbar and the window (Win32 only) - wxTB_NODIVIDER = 0x0200, - - // no automatic alignment (Win32 only, useless) - wxTB_NOALIGN = 0x0400, - - // show the text and the icons alongside, not vertically stacked (Win32/GTK) - wxTB_HORZ_LAYOUT = 0x0800, - wxTB_HORZ_TEXT = wxTB_HORZ_LAYOUT | wxTB_TEXT, - - // don't show the toolbar short help tooltips - wxTB_NO_TOOLTIPS = 0x1000, - - // lay out toolbar at the bottom of the window - wxTB_BOTTOM = 0x2000, - - // lay out toolbar at the right edge of the window - wxTB_RIGHT = 0x4000, - - wxTB_DEFAULT_STYLE = wxTB_HORIZONTAL -}; - -#if wxUSE_TOOLBAR - #include "wx/tbarbase.h" // the base class for all toolbars - - #if defined(__WXUNIVERSAL__) - #include "wx/univ/toolbar.h" - #elif defined(__WXMSW__) - #include "wx/msw/toolbar.h" - #elif defined(__WXMOTIF__) - #include "wx/motif/toolbar.h" - #elif defined(__WXGTK20__) - #include "wx/gtk/toolbar.h" - #elif defined(__WXGTK__) - #include "wx/gtk1/toolbar.h" - #elif defined(__WXMAC__) - #include "wx/osx/toolbar.h" - #elif defined(__WXQT__) - #include "wx/qt/toolbar.h" - #endif -#endif // wxUSE_TOOLBAR - -#endif - // _WX_TOOLBAR_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/toolbook.h b/Externals/wxWidgets3/include/wx/toolbook.h deleted file mode 100644 index ecd703cfc2..0000000000 --- a/Externals/wxWidgets3/include/wx/toolbook.h +++ /dev/null @@ -1,148 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/toolbook.h -// Purpose: wxToolbook: wxToolBar and wxNotebook combination -// Author: Julian Smart -// Modified by: -// Created: 2006-01-29 -// Copyright: (c) 2006 Julian Smart -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_TOOLBOOK_H_ -#define _WX_TOOLBOOK_H_ - -#include "wx/defs.h" - -#if wxUSE_TOOLBOOK - -#include "wx/bookctrl.h" -#include "wx/containr.h" - -class WXDLLIMPEXP_FWD_CORE wxToolBarBase; -class WXDLLIMPEXP_FWD_CORE wxCommandEvent; - -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TOOLBOOK_PAGE_CHANGED, wxBookCtrlEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TOOLBOOK_PAGE_CHANGING, wxBookCtrlEvent ); - - -// Use wxButtonToolBar -#define wxTBK_BUTTONBAR 0x0100 - -// Use wxTB_HORZ_LAYOUT style for the controlling toolbar -#define wxTBK_HORZ_LAYOUT 0x8000 - -// deprecated synonym, don't use -#if WXWIN_COMPATIBILITY_2_8 - #define wxBK_BUTTONBAR wxTBK_BUTTONBAR -#endif - -// ---------------------------------------------------------------------------- -// wxToolbook -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxToolbook : public wxNavigationEnabled -{ -public: - wxToolbook() - { - Init(); - } - - wxToolbook(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxEmptyString) - { - Init(); - - (void)Create(parent, id, pos, size, style, name); - } - - // quasi ctor - bool Create(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxEmptyString); - - - // implement base class virtuals - virtual bool SetPageText(size_t n, const wxString& strText) wxOVERRIDE; - virtual wxString GetPageText(size_t n) const wxOVERRIDE; - virtual int GetPageImage(size_t n) const wxOVERRIDE; - virtual bool SetPageImage(size_t n, int imageId) wxOVERRIDE; - virtual bool InsertPage(size_t n, - wxWindow *page, - const wxString& text, - bool bSelect = false, - int imageId = NO_IMAGE) wxOVERRIDE; - virtual int SetSelection(size_t n) wxOVERRIDE { return DoSetSelection(n, SetSelection_SendEvent); } - virtual int ChangeSelection(size_t n) wxOVERRIDE { return DoSetSelection(n); } - virtual void SetImageList(wxImageList *imageList) wxOVERRIDE; - - virtual bool DeleteAllPages() wxOVERRIDE; - virtual int HitTest(const wxPoint& pt, long *flags = NULL) const wxOVERRIDE; - - - // methods which are not part of base wxBookctrl API - - // get the underlying toolbar - wxToolBarBase* GetToolBar() const { return (wxToolBarBase*)m_bookctrl; } - - // must be called in OnIdle or by application to realize the toolbar and - // select the initial page. - void Realize(); - -protected: - virtual wxWindow *DoRemovePage(size_t page) wxOVERRIDE; - - // event handlers - void OnToolSelected(wxCommandEvent& event); - void OnSize(wxSizeEvent& event); - void OnIdle(wxIdleEvent& event); - - void UpdateSelectedPage(size_t newsel) wxOVERRIDE; - - wxBookCtrlEvent* CreatePageChangingEvent() const wxOVERRIDE; - void MakeChangedEvent(wxBookCtrlEvent &event) wxOVERRIDE; - - // whether the toolbar needs to be realized - bool m_needsRealizing; - - // maximum bitmap size - wxSize m_maxBitmapSize; - -private: - // common part of all constructors - void Init(); - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxToolbook); -}; - -// ---------------------------------------------------------------------------- -// listbook event class and related stuff -// ---------------------------------------------------------------------------- - -// wxToolbookEvent is obsolete and defined for compatibility only -#define wxToolbookEvent wxBookCtrlEvent -typedef wxBookCtrlEventFunction wxToolbookEventFunction; -#define wxToolbookEventHandler(func) wxBookCtrlEventHandler(func) - - -#define EVT_TOOLBOOK_PAGE_CHANGED(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_TOOLBOOK_PAGE_CHANGED, winid, wxBookCtrlEventHandler(fn)) - -#define EVT_TOOLBOOK_PAGE_CHANGING(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_TOOLBOOK_PAGE_CHANGING, winid, wxBookCtrlEventHandler(fn)) - -// old wxEVT_COMMAND_* constants -#define wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED wxEVT_TOOLBOOK_PAGE_CHANGED -#define wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING wxEVT_TOOLBOOK_PAGE_CHANGING - -#endif // wxUSE_TOOLBOOK - -#endif // _WX_TOOLBOOK_H_ diff --git a/Externals/wxWidgets3/include/wx/tooltip.h b/Externals/wxWidgets3/include/wx/tooltip.h deleted file mode 100644 index d65fef0b82..0000000000 --- a/Externals/wxWidgets3/include/wx/tooltip.h +++ /dev/null @@ -1,36 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/tooltip.h -// Purpose: wxToolTip base header -// Author: Robert Roebling -// Modified by: -// Created: -// Copyright: (c) Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_TOOLTIP_H_BASE_ -#define _WX_TOOLTIP_H_BASE_ - -#include "wx/defs.h" - -#if wxUSE_TOOLTIPS - -#if defined(__WXMSW__) -#include "wx/msw/tooltip.h" -#elif defined(__WXMOTIF__) -// #include "wx/motif/tooltip.h" -#elif defined(__WXGTK20__) -#include "wx/gtk/tooltip.h" -#elif defined(__WXGTK__) -#include "wx/gtk1/tooltip.h" -#elif defined(__WXMAC__) -#include "wx/osx/tooltip.h" -#elif defined(__WXQT__) -#include "wx/qt/tooltip.h" -#endif - -#endif - // wxUSE_TOOLTIPS - -#endif - // _WX_TOOLTIP_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/toplevel.h b/Externals/wxWidgets3/include/wx/toplevel.h deleted file mode 100644 index 47c5798ebc..0000000000 --- a/Externals/wxWidgets3/include/wx/toplevel.h +++ /dev/null @@ -1,377 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/toplevel.h -// Purpose: declares wxTopLevelWindow class, the base class for all -// top level windows (such as frames and dialogs) -// Author: Vadim Zeitlin, Vaclav Slavik -// Modified by: -// Created: 06.08.01 -// Copyright: (c) 2001 Vadim Zeitlin -// Vaclav Slavik -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_TOPLEVEL_BASE_H_ -#define _WX_TOPLEVEL_BASE_H_ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/nonownedwnd.h" -#include "wx/iconbndl.h" -#include "wx/weakref.h" - -// the default names for various classes -extern WXDLLIMPEXP_DATA_CORE(const char) wxFrameNameStr[]; - -class WXDLLIMPEXP_FWD_CORE wxTopLevelWindowBase; - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -/* - Summary of the bits used (some of them are defined in wx/frame.h and - wx/dialog.h and not here): - - +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ - |15|14|13|12|11|10| 9| 8| 7| 6| 5| 4| 3| 2| 1| 0| - +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ - | | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | \_ wxCENTRE - | | | | | | | | | | | | | | \____ wxFRAME_NO_TASKBAR - | | | | | | | | | | | | | \_______ wxFRAME_TOOL_WINDOW - | | | | | | | | | | | | \__________ wxFRAME_FLOAT_ON_PARENT - | | | | | | | | | | | \_____________ wxFRAME_SHAPED - | | | | | | | | | | \________________ wxDIALOG_NO_PARENT - | | | | | | | | | \___________________ wxRESIZE_BORDER - | | | | | | | | \______________________ wxTINY_CAPTION_VERT - | | | | | | | \_________________________ - | | | | | | \____________________________ wxMAXIMIZE_BOX - | | | | | \_______________________________ wxMINIMIZE_BOX - | | | | \__________________________________ wxSYSTEM_MENU - | | | \_____________________________________ wxCLOSE_BOX - | | \________________________________________ wxMAXIMIZE - | \___________________________________________ wxMINIMIZE - \______________________________________________ wxSTAY_ON_TOP - - - Notice that the 8 lower bits overlap with wxCENTRE and the button selection - bits (wxYES, wxOK wxNO, wxCANCEL, wxAPPLY, wxCLOSE and wxNO_DEFAULT) which - can be combined with the dialog style for several standard dialogs and - hence shouldn't overlap with any styles which can be used for the dialogs. - Additionally, wxCENTRE can be used with frames also. - */ - -// style common to both wxFrame and wxDialog -#define wxSTAY_ON_TOP 0x8000 -#define wxICONIZE 0x4000 -#define wxMINIMIZE wxICONIZE -#define wxMAXIMIZE 0x2000 -#define wxCLOSE_BOX 0x1000 // == wxHELP so can't be used with it - -#define wxSYSTEM_MENU 0x0800 -#define wxMINIMIZE_BOX 0x0400 -#define wxMAXIMIZE_BOX 0x0200 - -#define wxTINY_CAPTION 0x0080 // clashes with wxNO_DEFAULT -#define wxRESIZE_BORDER 0x0040 // == wxCLOSE - -#if WXWIN_COMPATIBILITY_2_8 - // HORIZ and VERT styles are equivalent anyhow so don't use different names - // for them - #define wxTINY_CAPTION_HORIZ wxTINY_CAPTION - #define wxTINY_CAPTION_VERT wxTINY_CAPTION -#endif - -// default style -#define wxDEFAULT_FRAME_STYLE \ - (wxSYSTEM_MENU | \ - wxRESIZE_BORDER | \ - wxMINIMIZE_BOX | \ - wxMAXIMIZE_BOX | \ - wxCLOSE_BOX | \ - wxCAPTION | \ - wxCLIP_CHILDREN) - - -// Dialogs are created in a special way -#define wxTOPLEVEL_EX_DIALOG 0x00000008 - -// Styles for ShowFullScreen -// (note that wxTopLevelWindow only handles wxFULLSCREEN_NOBORDER and -// wxFULLSCREEN_NOCAPTION; the rest is handled by wxTopLevelWindow) -enum -{ - wxFULLSCREEN_NOMENUBAR = 0x0001, - wxFULLSCREEN_NOTOOLBAR = 0x0002, - wxFULLSCREEN_NOSTATUSBAR = 0x0004, - wxFULLSCREEN_NOBORDER = 0x0008, - wxFULLSCREEN_NOCAPTION = 0x0010, - - wxFULLSCREEN_ALL = wxFULLSCREEN_NOMENUBAR | wxFULLSCREEN_NOTOOLBAR | - wxFULLSCREEN_NOSTATUSBAR | wxFULLSCREEN_NOBORDER | - wxFULLSCREEN_NOCAPTION -}; - -// Styles for RequestUserAttention -enum -{ - wxUSER_ATTENTION_INFO = 1, - wxUSER_ATTENTION_ERROR = 2 -}; - -// ---------------------------------------------------------------------------- -// wxTopLevelWindow: a top level (as opposed to child) window -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxTopLevelWindowBase : public wxNonOwnedWindow -{ -public: - // construction - wxTopLevelWindowBase(); - virtual ~wxTopLevelWindowBase(); - - // top level wnd state - // -------------------- - - // maximize = true => maximize, otherwise - restore - virtual void Maximize(bool maximize = true) = 0; - - // undo Maximize() or Iconize() - virtual void Restore() = 0; - - // iconize = true => iconize, otherwise - restore - virtual void Iconize(bool iconize = true) = 0; - - // return true if the frame is maximized - virtual bool IsMaximized() const = 0; - - // return true if the frame is always maximized - // due to native guidelines or current policy - virtual bool IsAlwaysMaximized() const; - - // return true if the frame is iconized - virtual bool IsIconized() const = 0; - - // get the frame icon - wxIcon GetIcon() const; - - // get the frame icons - const wxIconBundle& GetIcons() const { return m_icons; } - - // set the frame icon: implemented in terms of SetIcons() - void SetIcon(const wxIcon& icon); - - // set the frame icons - virtual void SetIcons(const wxIconBundle& icons) { m_icons = icons; } - - virtual bool EnableFullScreenView(bool WXUNUSED(enable) = true) - { - return false; - } - - // maximize the window to cover entire screen - virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) = 0; - - // shows the window, but doesn't activate it. If the base code is being run, - // it means the port doesn't implement this method yet and so alert the user. - virtual void ShowWithoutActivating() { - wxFAIL_MSG("ShowWithoutActivating not implemented on this platform."); - } - - // return true if the frame is in fullscreen mode - virtual bool IsFullScreen() const = 0; - - // the title of the top level window: the text which the - // window shows usually at the top of the frame/dialog in dedicated bar - virtual void SetTitle(const wxString& title) = 0; - virtual wxString GetTitle() const = 0; - - // enable/disable close button [x] - virtual bool EnableCloseButton(bool WXUNUSED(enable) = true) { return false; } - virtual bool EnableMaximizeButton(bool WXUNUSED(enable) = true) { return false; } - virtual bool EnableMinimizeButton(bool WXUNUSED(enable) = true) { return false; } - - // Attracts the users attention to this window if the application is - // inactive (should be called when a background event occurs) - virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO); - - // Is this the active frame (highlighted in the taskbar)? - // - // A TLW is active only if it contains the currently focused window. - virtual bool IsActive() { return IsDescendant(FindFocus()); } - - // this function may be overridden to return false to allow closing the - // application even when this top level window is still open - // - // notice that the window is still closed prior to the application exit and - // so it can still veto it even if it returns false from here - virtual bool ShouldPreventAppExit() const { return true; } - - // centre the window on screen: this is just a shortcut - void CentreOnScreen(int dir = wxBOTH) { DoCentre(dir | wxCENTRE_ON_SCREEN); } - void CenterOnScreen(int dir = wxBOTH) { CentreOnScreen(dir); } - - // Get the default size for a new top level window. This is used when - // creating a wxTLW under some platforms if no explicit size given. - static wxSize GetDefaultSize(); - - - // default item access: we have a permanent default item which is the one - // set by the user code but we may also have a temporary default item which - // would be chosen if the user pressed "Enter" now but the default action - // reverts to the "permanent" default as soon as this temporary default - // item loses focus - - // get the default item, temporary or permanent - wxWindow *GetDefaultItem() const - { return m_winTmpDefault ? m_winTmpDefault : m_winDefault; } - - // set the permanent default item, return the old default - wxWindow *SetDefaultItem(wxWindow *win) - { wxWindow *old = GetDefaultItem(); m_winDefault = win; return old; } - - // return the temporary default item, can be NULL - wxWindow *GetTmpDefaultItem() const { return m_winTmpDefault; } - - // set a temporary default item, SetTmpDefaultItem(NULL) should be called - // soon after a call to SetTmpDefaultItem(window), return the old default - wxWindow *SetTmpDefaultItem(wxWindow *win) - { wxWindow *old = GetDefaultItem(); m_winTmpDefault = win; return old; } - - // implementation only from now on - // ------------------------------- - - // override some base class virtuals - virtual bool Destroy() wxOVERRIDE; - virtual bool IsTopLevel() const wxOVERRIDE { return true; } - virtual bool IsTopNavigationDomain(NavigationKind kind) const wxOVERRIDE; - virtual bool IsVisible() const { return IsShown(); } - - // event handlers - void OnCloseWindow(wxCloseEvent& event); - void OnSize(wxSizeEvent& WXUNUSED(event)) { DoLayout(); } - - // Get rect to be used to center top-level children - virtual void GetRectForTopLevelChildren(int *x, int *y, int *w, int *h); - - // this should go away, but for now it's called from docview.cpp, - // so should be there for all platforms - void OnActivate(wxActivateEvent &WXUNUSED(event)) { } - - // do the window-specific processing after processing the update event - virtual void DoUpdateWindowUI(wxUpdateUIEvent& event) wxOVERRIDE ; - - // a different API for SetSizeHints - virtual void SetMinSize(const wxSize& minSize) wxOVERRIDE; - virtual void SetMaxSize(const wxSize& maxSize) wxOVERRIDE; - - virtual void OSXSetModified(bool modified) { m_modified = modified; } - virtual bool OSXIsModified() const { return m_modified; } - - virtual void SetRepresentedFilename(const wxString& WXUNUSED(filename)) { } - -protected: - // the frame client to screen translation should take account of the - // toolbar which may shift the origin of the client area - virtual void DoClientToScreen(int *x, int *y) const wxOVERRIDE; - virtual void DoScreenToClient(int *x, int *y) const wxOVERRIDE; - - // add support for wxCENTRE_ON_SCREEN - virtual void DoCentre(int dir) wxOVERRIDE; - - // no need to do client to screen translation to get our position in screen - // coordinates: this is already the case - virtual void DoGetScreenPosition(int *x, int *y) const wxOVERRIDE - { - DoGetPosition(x, y); - } - - // test whether this window makes part of the frame - // (menubar, toolbar and statusbar are excluded from automatic layout) - virtual bool IsOneOfBars(const wxWindow *WXUNUSED(win)) const - { return false; } - - // check if we should exit the program after deleting this window - bool IsLastBeforeExit() const; - - // send the iconize event, return true if processed - bool SendIconizeEvent(bool iconized = true); - - // do TLW-specific layout: we resize our unique child to fill the entire - // client area - void DoLayout(); - - static int WidthDefault(int w) { return w == wxDefaultCoord ? GetDefaultSize().x : w; } - static int HeightDefault(int h) { return h == wxDefaultCoord ? GetDefaultSize().y : h; } - - - // the frame icon - wxIconBundle m_icons; - - // a default window (usually a button) or NULL - wxWindowRef m_winDefault; - - // a temporary override of m_winDefault, use the latter if NULL - wxWindowRef m_winTmpDefault; - - bool m_modified; - - wxDECLARE_NO_COPY_CLASS(wxTopLevelWindowBase); - wxDECLARE_EVENT_TABLE(); -}; - - -// include the real class declaration -#if defined(__WXMSW__) - #include "wx/msw/toplevel.h" - #define wxTopLevelWindowNative wxTopLevelWindowMSW -#elif defined(__WXGTK20__) - #include "wx/gtk/toplevel.h" - #define wxTopLevelWindowNative wxTopLevelWindowGTK -#elif defined(__WXGTK__) - #include "wx/gtk1/toplevel.h" - #define wxTopLevelWindowNative wxTopLevelWindowGTK -#elif defined(__WXX11__) - #include "wx/x11/toplevel.h" - #define wxTopLevelWindowNative wxTopLevelWindowX11 -#elif defined(__WXDFB__) - #include "wx/dfb/toplevel.h" - #define wxTopLevelWindowNative wxTopLevelWindowDFB -#elif defined(__WXMAC__) - #include "wx/osx/toplevel.h" - #define wxTopLevelWindowNative wxTopLevelWindowMac -#elif defined(__WXMOTIF__) - #include "wx/motif/toplevel.h" - #define wxTopLevelWindowNative wxTopLevelWindowMotif -#elif defined(__WXQT__) - #include "wx/qt/toplevel.h" -#define wxTopLevelWindowNative wxTopLevelWindowQt -#endif - -#ifdef __WXUNIVERSAL__ - #include "wx/univ/toplevel.h" -#else // !__WXUNIVERSAL__ - class WXDLLIMPEXP_CORE wxTopLevelWindow : public wxTopLevelWindowNative - { - public: - // construction - wxTopLevelWindow() { } - wxTopLevelWindow(wxWindow *parent, - wxWindowID winid, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr) - : wxTopLevelWindowNative(parent, winid, title, - pos, size, style, name) - { - } - - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxTopLevelWindow); - }; -#endif // __WXUNIVERSAL__/!__WXUNIVERSAL__ - -#endif // _WX_TOPLEVEL_BASE_H_ diff --git a/Externals/wxWidgets3/include/wx/tracker.h b/Externals/wxWidgets3/include/wx/tracker.h deleted file mode 100644 index d8f272822c..0000000000 --- a/Externals/wxWidgets3/include/wx/tracker.h +++ /dev/null @@ -1,91 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/tracker.h -// Purpose: Support class for object lifetime tracking (wxWeakRef) -// Author: Arne Steinarson -// Created: 28 Dec 07 -// Copyright: (c) 2007 Arne Steinarson -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_TRACKER_H_ -#define _WX_TRACKER_H_ - -#include "wx/defs.h" - -class wxEventConnectionRef; - -// This class represents an object tracker and is stored in a linked list -// in the tracked object. It is only used in one of its derived forms. -class WXDLLIMPEXP_BASE wxTrackerNode -{ -public: - wxTrackerNode() : m_nxt(NULL) { } - virtual ~wxTrackerNode() { } - - virtual void OnObjectDestroy() = 0; - - virtual wxEventConnectionRef *ToEventConnection() { return NULL; } - -private: - wxTrackerNode *m_nxt; - - friend class wxTrackable; // For list access - friend class wxEvtHandler; // For list access -}; - -// Add-on base class for a trackable object. -class WXDLLIMPEXP_BASE wxTrackable -{ -public: - void AddNode(wxTrackerNode *prn) - { - prn->m_nxt = m_first; - m_first = prn; - } - - void RemoveNode(wxTrackerNode *prn) - { - for ( wxTrackerNode **pprn = &m_first; *pprn; pprn = &(*pprn)->m_nxt ) - { - if ( *pprn == prn ) - { - *pprn = prn->m_nxt; - return; - } - } - - wxFAIL_MSG( "removing invalid tracker node" ); - } - - wxTrackerNode *GetFirst() const { return m_first; } - -protected: - // this class is only supposed to be used as a base class but never be - // created nor destroyed directly so all ctors and dtor are protected - - wxTrackable() : m_first(NULL) { } - - // copy ctor and assignment operator intentionally do not copy m_first: the - // objects which track the original trackable shouldn't track the new copy - wxTrackable(const wxTrackable& WXUNUSED(other)) : m_first(NULL) { } - wxTrackable& operator=(const wxTrackable& WXUNUSED(other)) { return *this; } - - // dtor is not virtual: this class is not supposed to be used - // polymorphically and adding a virtual table to it would add unwanted - // overhead - ~wxTrackable() - { - // Notify all registered refs - while ( m_first ) - { - wxTrackerNode * const first = m_first; - m_first = first->m_nxt; - first->OnObjectDestroy(); - } - } - - wxTrackerNode *m_first; -}; - -#endif // _WX_TRACKER_H_ - diff --git a/Externals/wxWidgets3/include/wx/translation.h b/Externals/wxWidgets3/include/wx/translation.h deleted file mode 100644 index 2ca62cf4cc..0000000000 --- a/Externals/wxWidgets3/include/wx/translation.h +++ /dev/null @@ -1,329 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/translation.h -// Purpose: Internationalization and localisation for wxWidgets -// Author: Vadim Zeitlin, Vaclav Slavik, -// Michael N. Filippov -// Created: 2010-04-23 -// Copyright: (c) 1998 Vadim Zeitlin -// (c) 2010 Vaclav Slavik -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_TRANSLATION_H_ -#define _WX_TRANSLATION_H_ - -#include "wx/defs.h" -#include "wx/string.h" - -#if wxUSE_INTL - -#include "wx/buffer.h" -#include "wx/language.h" -#include "wx/hashmap.h" -#include "wx/strconv.h" -#include "wx/scopedptr.h" - -// ============================================================================ -// global decls -// ============================================================================ - -// ---------------------------------------------------------------------------- -// macros -// ---------------------------------------------------------------------------- - -// gettext() style macros (notice that xgettext should be invoked with -// --keyword="_" --keyword="wxPLURAL:1,2" options -// to extract the strings from the sources) -#ifndef WXINTL_NO_GETTEXT_MACRO - #define _(s) wxGetTranslation((s)) - #define wxPLURAL(sing, plur, n) wxGetTranslation((sing), (plur), n) -#endif - -// another one which just marks the strings for extraction, but doesn't -// perform the translation (use -kwxTRANSLATE with xgettext!) -#define wxTRANSLATE(str) str - -// ---------------------------------------------------------------------------- -// forward decls -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_BASE wxArrayString; -class WXDLLIMPEXP_FWD_BASE wxTranslationsLoader; -class WXDLLIMPEXP_FWD_BASE wxLocale; - -class wxPluralFormsCalculator; -wxDECLARE_SCOPED_PTR(wxPluralFormsCalculator, wxPluralFormsCalculatorPtr) - -// ---------------------------------------------------------------------------- -// wxMsgCatalog corresponds to one loaded message catalog. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxMsgCatalog -{ -public: - // Ctor is protected, because CreateFromXXX functions must be used, - // but destruction should be unrestricted -#if !wxUSE_UNICODE - ~wxMsgCatalog(); -#endif - - // load the catalog from disk or from data; caller is responsible for - // deleting them if not NULL - static wxMsgCatalog *CreateFromFile(const wxString& filename, - const wxString& domain); - - static wxMsgCatalog *CreateFromData(const wxScopedCharBuffer& data, - const wxString& domain); - - // get name of the catalog - wxString GetDomain() const { return m_domain; } - - // get the translated string: returns NULL if not found - const wxString *GetString(const wxString& sz, unsigned n = UINT_MAX) const; - -protected: - wxMsgCatalog(const wxString& domain) - : m_pNext(NULL), m_domain(domain) -#if !wxUSE_UNICODE - , m_conv(NULL) -#endif - {} - -private: - // variable pointing to the next element in a linked list (or NULL) - wxMsgCatalog *m_pNext; - friend class wxTranslations; - - wxStringToStringHashMap m_messages; // all messages in the catalog - wxString m_domain; // name of the domain - -#if !wxUSE_UNICODE - // the conversion corresponding to this catalog charset if we installed it - // as the global one - wxCSConv *m_conv; -#endif - - wxPluralFormsCalculatorPtr m_pluralFormsCalculator; -}; - -// ---------------------------------------------------------------------------- -// wxTranslations: message catalogs -// ---------------------------------------------------------------------------- - -// this class allows to get translations for strings -class WXDLLIMPEXP_BASE wxTranslations -{ -public: - wxTranslations(); - ~wxTranslations(); - - // returns current translations object, may return NULL - static wxTranslations *Get(); - // sets current translations object (takes ownership; may be NULL) - static void Set(wxTranslations *t); - - // changes loader to non-default one; takes ownership of 'loader' - void SetLoader(wxTranslationsLoader *loader); - - void SetLanguage(wxLanguage lang); - void SetLanguage(const wxString& lang); - - // get languages available for this app - wxArrayString GetAvailableTranslations(const wxString& domain) const; - - // find best translation language for given domain - wxString GetBestTranslation(const wxString& domain, wxLanguage msgIdLanguage); - wxString GetBestTranslation(const wxString& domain, - const wxString& msgIdLanguage = "en"); - - // add standard wxWidgets catalog ("wxstd") - bool AddStdCatalog(); - - // add catalog with given domain name and language, looking it up via - // wxTranslationsLoader - bool AddCatalog(const wxString& domain); - bool AddCatalog(const wxString& domain, wxLanguage msgIdLanguage); -#if !wxUSE_UNICODE - bool AddCatalog(const wxString& domain, - wxLanguage msgIdLanguage, - const wxString& msgIdCharset); -#endif - - // check if the given catalog is loaded - bool IsLoaded(const wxString& domain) const; - - // access to translations - const wxString *GetTranslatedString(const wxString& origString, - const wxString& domain = wxEmptyString) const; - const wxString *GetTranslatedString(const wxString& origString, - unsigned n, - const wxString& domain = wxEmptyString) const; - - wxString GetHeaderValue(const wxString& header, - const wxString& domain = wxEmptyString) const; - - // this is hack to work around a problem with wxGetTranslation() which - // returns const wxString& and not wxString, so when it returns untranslated - // string, it needs to have a copy of it somewhere - static const wxString& GetUntranslatedString(const wxString& str); - -private: - // perform loading of the catalog via m_loader - bool LoadCatalog(const wxString& domain, const wxString& lang, const wxString& msgIdLang); - - // find catalog by name in a linked list, return NULL if !found - wxMsgCatalog *FindCatalog(const wxString& domain) const; - - // same as Set(), without taking ownership; only for wxLocale - static void SetNonOwned(wxTranslations *t); - friend class wxLocale; - -private: - wxString m_lang; - wxTranslationsLoader *m_loader; - - wxMsgCatalog *m_pMsgCat; // pointer to linked list of catalogs - - // In addition to keeping all the catalogs in the linked list, we also - // store them in a hash map indexed by the domain name to allow finding - // them by name efficiently. - WX_DECLARE_HASH_MAP(wxString, wxMsgCatalog *, wxStringHash, wxStringEqual, wxMsgCatalogMap); - wxMsgCatalogMap m_catalogMap; -}; - - -// abstraction of translations discovery and loading -class WXDLLIMPEXP_BASE wxTranslationsLoader -{ -public: - wxTranslationsLoader() {} - virtual ~wxTranslationsLoader() {} - - virtual wxMsgCatalog *LoadCatalog(const wxString& domain, - const wxString& lang) = 0; - - virtual wxArrayString GetAvailableTranslations(const wxString& domain) const = 0; -}; - - -// standard wxTranslationsLoader implementation, using filesystem -class WXDLLIMPEXP_BASE wxFileTranslationsLoader - : public wxTranslationsLoader -{ -public: - static void AddCatalogLookupPathPrefix(const wxString& prefix); - - virtual wxMsgCatalog *LoadCatalog(const wxString& domain, - const wxString& lang) wxOVERRIDE; - - virtual wxArrayString GetAvailableTranslations(const wxString& domain) const wxOVERRIDE; -}; - - -#ifdef __WINDOWS__ -// loads translations from win32 resources -class WXDLLIMPEXP_BASE wxResourceTranslationsLoader - : public wxTranslationsLoader -{ -public: - virtual wxMsgCatalog *LoadCatalog(const wxString& domain, - const wxString& lang); - - virtual wxArrayString GetAvailableTranslations(const wxString& domain) const; - -protected: - // returns resource type to use for translations - virtual wxString GetResourceType() const { return "MOFILE"; } - - // returns module to load resources from - virtual WXHINSTANCE GetModule() const { return 0; } -}; -#endif // __WINDOWS__ - - -// ---------------------------------------------------------------------------- -// global functions -// ---------------------------------------------------------------------------- - -// get the translation of the string in the current locale -inline const wxString& wxGetTranslation(const wxString& str, - const wxString& domain = wxString()) -{ - wxTranslations *trans = wxTranslations::Get(); - const wxString *transStr = trans ? trans->GetTranslatedString(str, domain) - : NULL; - if ( transStr ) - return *transStr; - else - // NB: this function returns reference to a string, so we have to keep - // a copy of it somewhere - return wxTranslations::GetUntranslatedString(str); -} - -inline const wxString& wxGetTranslation(const wxString& str1, - const wxString& str2, - unsigned n, - const wxString& domain = wxString()) -{ - wxTranslations *trans = wxTranslations::Get(); - const wxString *transStr = trans ? trans->GetTranslatedString(str1, n, domain) - : NULL; - if ( transStr ) - return *transStr; - else - // NB: this function returns reference to a string, so we have to keep - // a copy of it somewhere - return n == 1 - ? wxTranslations::GetUntranslatedString(str1) - : wxTranslations::GetUntranslatedString(str2); -} - -#else // !wxUSE_INTL - -// the macros should still be defined - otherwise compilation would fail - -#if !defined(WXINTL_NO_GETTEXT_MACRO) - #if !defined(_) - #define _(s) (s) - #endif - #define wxPLURAL(sing, plur, n) ((n) == 1 ? (sing) : (plur)) -#endif - -#define wxTRANSLATE(str) str - -// NB: we use a template here in order to avoid using -// wxLocale::GetUntranslatedString() above, which would be required if -// we returned const wxString&; this way, the compiler should be able to -// optimize wxGetTranslation() away - -template -inline TString wxGetTranslation(TString str) - { return str; } - -template -inline TString wxGetTranslation(TString str, TDomain WXUNUSED(domain)) - { return str; } - -template -inline TString wxGetTranslation(TString str1, TString str2, size_t n) - { return n == 1 ? str1 : str2; } - -template -inline TString wxGetTranslation(TString str1, TString str2, size_t n, - TDomain WXUNUSED(domain)) - { return n == 1 ? str1 : str2; } - -#endif // wxUSE_INTL/!wxUSE_INTL - -// define this one just in case it occurs somewhere (instead of preferred -// wxTRANSLATE) too -#if !defined(WXINTL_NO_GETTEXT_MACRO) - #if !defined(gettext_noop) - #define gettext_noop(str) (str) - #endif - #if !defined(N_) - #define N_(s) (s) - #endif -#endif - -#endif // _WX_TRANSLATION_H_ diff --git a/Externals/wxWidgets3/include/wx/treebase.h b/Externals/wxWidgets3/include/wx/treebase.h deleted file mode 100644 index 6ce145f603..0000000000 --- a/Externals/wxWidgets3/include/wx/treebase.h +++ /dev/null @@ -1,403 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/treebase.h -// Purpose: wxTreeCtrl base classes and types -// Author: Julian Smart et al -// Modified by: -// Created: 01/02/97 -// Copyright: (c) 1997,1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_TREEBASE_H_ -#define _WX_TREEBASE_H_ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/defs.h" - -#if wxUSE_TREECTRL - -#include "wx/window.h" // for wxClientData -#include "wx/event.h" -#include "wx/dynarray.h" -#include "wx/itemid.h" - -// ---------------------------------------------------------------------------- -// wxTreeItemId identifies an element of the tree. It's opaque for the -// application and the only method which can be used by user code is IsOk(). -// ---------------------------------------------------------------------------- - -// This is a class and not a typedef because existing code may forward declare -// wxTreeItemId as a class and we don't want to break it without good reason. -class wxTreeItemId : public wxItemId -{ -public: - wxTreeItemId() : wxItemId() { } - wxTreeItemId(void* pItem) : wxItemId(pItem) { } -}; - -// ---------------------------------------------------------------------------- -// wxTreeItemData is some (arbitrary) user class associated with some item. The -// main advantage of having this class (compared to old untyped interface) is -// that wxTreeItemData's are destroyed automatically by the tree and, as this -// class has virtual dtor, it means that the memory will be automatically -// freed. OTOH, we don't just use wxObject instead of wxTreeItemData because -// the size of this class is critical: in any real application, each tree leaf -// will have wxTreeItemData associated with it and number of leaves may be -// quite big. -// -// Because the objects of this class are deleted by the tree, they should -// always be allocated on the heap! -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxTreeItemData: public wxClientData -{ -friend class WXDLLIMPEXP_FWD_CORE wxTreeCtrl; -friend class WXDLLIMPEXP_FWD_CORE wxGenericTreeCtrl; -public: - // creation/destruction - // -------------------- - // default ctor - wxTreeItemData() { } - - // default copy ctor/assignment operator are ok - - // accessor: get the item associated with us - const wxTreeItemId& GetId() const { return m_pItem; } - void SetId(const wxTreeItemId& id) { m_pItem = id; } - -protected: - wxTreeItemId m_pItem; -}; - -typedef void *wxTreeItemIdValue; - -WX_DEFINE_EXPORTED_ARRAY_PTR(wxTreeItemIdValue, wxArrayTreeItemIdsBase); - -// this is a wrapper around the array class defined above which allow to wok -// with values of natural wxTreeItemId type instead of using wxTreeItemIdValue -// and does it without any loss of efficiency -class WXDLLIMPEXP_CORE wxArrayTreeItemIds : public wxArrayTreeItemIdsBase -{ -public: - void Add(const wxTreeItemId& id) - { wxArrayTreeItemIdsBase::Add(id.m_pItem); } - void Insert(const wxTreeItemId& id, size_t pos) - { wxArrayTreeItemIdsBase::Insert(id.m_pItem, pos); } - wxTreeItemId Item(size_t i) const - { return wxTreeItemId(wxArrayTreeItemIdsBase::Item(i)); } - wxTreeItemId operator[](size_t i) const { return Item(i); } -}; - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -// enum for different images associated with a treectrl item -enum wxTreeItemIcon -{ - wxTreeItemIcon_Normal, // not selected, not expanded - wxTreeItemIcon_Selected, // selected, not expanded - wxTreeItemIcon_Expanded, // not selected, expanded - wxTreeItemIcon_SelectedExpanded, // selected, expanded - wxTreeItemIcon_Max -}; - -// special values for the 'state' parameter of wxTreeCtrl::SetItemState() -static const int wxTREE_ITEMSTATE_NONE = -1; // not state (no display state image) -static const int wxTREE_ITEMSTATE_NEXT = -2; // cycle to the next state -static const int wxTREE_ITEMSTATE_PREV = -3; // cycle to the previous state - -// ---------------------------------------------------------------------------- -// wxTreeCtrl flags -// ---------------------------------------------------------------------------- - -#define wxTR_NO_BUTTONS 0x0000 // for convenience -#define wxTR_HAS_BUTTONS 0x0001 // draw collapsed/expanded btns -#define wxTR_NO_LINES 0x0004 // don't draw lines at all -#define wxTR_LINES_AT_ROOT 0x0008 // connect top-level nodes -#define wxTR_TWIST_BUTTONS 0x0010 // still used by wxTreeListCtrl - -#define wxTR_SINGLE 0x0000 // for convenience -#define wxTR_MULTIPLE 0x0020 // can select multiple items - -#if WXWIN_COMPATIBILITY_2_8 - #define wxTR_EXTENDED 0x0040 // deprecated, don't use -#endif // WXWIN_COMPATIBILITY_2_8 - -#define wxTR_HAS_VARIABLE_ROW_HEIGHT 0x0080 // what it says - -#define wxTR_EDIT_LABELS 0x0200 // can edit item labels -#define wxTR_ROW_LINES 0x0400 // put border around items -#define wxTR_HIDE_ROOT 0x0800 // don't display root node - -#define wxTR_FULL_ROW_HIGHLIGHT 0x2000 // highlight full horz space - -// make the default control appearance look more native-like depending on the -// platform -#if defined(__WXGTK20__) - #define wxTR_DEFAULT_STYLE (wxTR_HAS_BUTTONS | wxTR_NO_LINES) -#elif defined(__WXMAC__) - #define wxTR_DEFAULT_STYLE \ - (wxTR_HAS_BUTTONS | wxTR_NO_LINES | wxTR_FULL_ROW_HIGHLIGHT) -#else - #define wxTR_DEFAULT_STYLE (wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT) -#endif - -// values for the `flags' parameter of wxTreeCtrl::HitTest() which determine -// where exactly the specified point is situated: - -static const int wxTREE_HITTEST_ABOVE = 0x0001; -static const int wxTREE_HITTEST_BELOW = 0x0002; -static const int wxTREE_HITTEST_NOWHERE = 0x0004; - // on the button associated with an item. -static const int wxTREE_HITTEST_ONITEMBUTTON = 0x0008; - // on the bitmap associated with an item. -static const int wxTREE_HITTEST_ONITEMICON = 0x0010; - // on the indent associated with an item. -static const int wxTREE_HITTEST_ONITEMINDENT = 0x0020; - // on the label (string) associated with an item. -static const int wxTREE_HITTEST_ONITEMLABEL = 0x0040; - // on the right of the label associated with an item. -static const int wxTREE_HITTEST_ONITEMRIGHT = 0x0080; - // on the label (string) associated with an item. -static const int wxTREE_HITTEST_ONITEMSTATEICON = 0x0100; - // on the left of the wxTreeCtrl. -static const int wxTREE_HITTEST_TOLEFT = 0x0200; - // on the right of the wxTreeCtrl. -static const int wxTREE_HITTEST_TORIGHT = 0x0400; - // on the upper part (first half) of the item. -static const int wxTREE_HITTEST_ONITEMUPPERPART = 0x0800; - // on the lower part (second half) of the item. -static const int wxTREE_HITTEST_ONITEMLOWERPART = 0x1000; - - // anywhere on the item -static const int wxTREE_HITTEST_ONITEM = wxTREE_HITTEST_ONITEMICON | - wxTREE_HITTEST_ONITEMLABEL; - -// tree ctrl default name -extern WXDLLIMPEXP_DATA_CORE(const char) wxTreeCtrlNameStr[]; - -// ---------------------------------------------------------------------------- -// wxTreeItemAttr: a structure containing the visual attributes of an item -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxTreeItemAttr -{ -public: - // ctors - wxTreeItemAttr() { } - wxTreeItemAttr(const wxColour& colText, - const wxColour& colBack, - const wxFont& font) - : m_colText(colText), m_colBack(colBack), m_font(font) { } - - // setters - void SetTextColour(const wxColour& colText) { m_colText = colText; } - void SetBackgroundColour(const wxColour& colBack) { m_colBack = colBack; } - void SetFont(const wxFont& font) { m_font = font; } - - // accessors - bool HasTextColour() const { return m_colText.IsOk(); } - bool HasBackgroundColour() const { return m_colBack.IsOk(); } - bool HasFont() const { return m_font.IsOk(); } - - const wxColour& GetTextColour() const { return m_colText; } - const wxColour& GetBackgroundColour() const { return m_colBack; } - const wxFont& GetFont() const { return m_font; } - -private: - wxColour m_colText, - m_colBack; - wxFont m_font; -}; - -// ---------------------------------------------------------------------------- -// wxTreeEvent is a special class for all events associated with tree controls -// -// NB: note that not all accessors make sense for all events, see the event -// descriptions below -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxTreeCtrlBase; - -class WXDLLIMPEXP_CORE wxTreeEvent : public wxNotifyEvent -{ -public: - wxTreeEvent(wxEventType commandType = wxEVT_NULL, int id = 0); - wxTreeEvent(wxEventType commandType, - wxTreeCtrlBase *tree, - const wxTreeItemId &item = wxTreeItemId()); - wxTreeEvent(const wxTreeEvent& event); - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxTreeEvent(*this); } - - // accessors - // get the item on which the operation was performed or the newly - // selected item for wxEVT_TREE_SEL_CHANGED/ING events - wxTreeItemId GetItem() const { return m_item; } - void SetItem(const wxTreeItemId& item) { m_item = item; } - - // for wxEVT_TREE_SEL_CHANGED/ING events, get the previously - // selected item - wxTreeItemId GetOldItem() const { return m_itemOld; } - void SetOldItem(const wxTreeItemId& item) { m_itemOld = item; } - - // the point where the mouse was when the drag operation started (for - // wxEVT_TREE_BEGIN_(R)DRAG events only) or click position - wxPoint GetPoint() const { return m_pointDrag; } - void SetPoint(const wxPoint& pt) { m_pointDrag = pt; } - - // keyboard data (for wxEVT_TREE_KEY_DOWN only) - const wxKeyEvent& GetKeyEvent() const { return m_evtKey; } - int GetKeyCode() const { return m_evtKey.GetKeyCode(); } - void SetKeyEvent(const wxKeyEvent& evt) { m_evtKey = evt; } - - // label (for EVT_TREE_{BEGIN|END}_LABEL_EDIT only) - const wxString& GetLabel() const { return m_label; } - void SetLabel(const wxString& label) { m_label = label; } - - // edit cancel flag (for EVT_TREE_{BEGIN|END}_LABEL_EDIT only) - bool IsEditCancelled() const { return m_editCancelled; } - void SetEditCanceled(bool editCancelled) { m_editCancelled = editCancelled; } - - // Set the tooltip for the item (for EVT\_TREE\_ITEM\_GETTOOLTIP events) - void SetToolTip(const wxString& toolTip) { m_label = toolTip; } - wxString GetToolTip() { return m_label; } - -private: - // not all of the members are used (or initialized) for all events - wxKeyEvent m_evtKey; - wxTreeItemId m_item, - m_itemOld; - wxPoint m_pointDrag; - wxString m_label; - bool m_editCancelled; - - friend class WXDLLIMPEXP_FWD_CORE wxTreeCtrl; - friend class WXDLLIMPEXP_FWD_CORE wxGenericTreeCtrl; - - wxDECLARE_DYNAMIC_CLASS(wxTreeEvent); -}; - -typedef void (wxEvtHandler::*wxTreeEventFunction)(wxTreeEvent&); - -// ---------------------------------------------------------------------------- -// tree control events and macros for handling them -// ---------------------------------------------------------------------------- - -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TREE_BEGIN_DRAG, wxTreeEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TREE_BEGIN_RDRAG, wxTreeEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TREE_BEGIN_LABEL_EDIT, wxTreeEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TREE_END_LABEL_EDIT, wxTreeEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TREE_DELETE_ITEM, wxTreeEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TREE_GET_INFO, wxTreeEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TREE_SET_INFO, wxTreeEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TREE_ITEM_EXPANDED, wxTreeEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TREE_ITEM_EXPANDING, wxTreeEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TREE_ITEM_COLLAPSED, wxTreeEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TREE_ITEM_COLLAPSING, wxTreeEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TREE_SEL_CHANGED, wxTreeEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TREE_SEL_CHANGING, wxTreeEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TREE_KEY_DOWN, wxTreeEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TREE_ITEM_ACTIVATED, wxTreeEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TREE_ITEM_RIGHT_CLICK, wxTreeEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TREE_ITEM_MIDDLE_CLICK, wxTreeEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TREE_END_DRAG, wxTreeEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TREE_STATE_IMAGE_CLICK, wxTreeEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TREE_ITEM_GETTOOLTIP, wxTreeEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TREE_ITEM_MENU, wxTreeEvent ); - -#define wxTreeEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxTreeEventFunction, func) - -#define wx__DECLARE_TREEEVT(evt, id, fn) \ - wx__DECLARE_EVT1(wxEVT_TREE_ ## evt, id, wxTreeEventHandler(fn)) - -// GetItem() returns the item being dragged, GetPoint() the mouse coords -// -// if you call event.Allow(), the drag operation will start and a -// EVT_TREE_END_DRAG event will be sent when the drag is over. -#define EVT_TREE_BEGIN_DRAG(id, fn) wx__DECLARE_TREEEVT(BEGIN_DRAG, id, fn) -#define EVT_TREE_BEGIN_RDRAG(id, fn) wx__DECLARE_TREEEVT(BEGIN_RDRAG, id, fn) - -// GetItem() is the item on which the drop occurred (if any) and GetPoint() the -// current mouse coords -#define EVT_TREE_END_DRAG(id, fn) wx__DECLARE_TREEEVT(END_DRAG, id, fn) - -// GetItem() returns the itme whose label is being edited, GetLabel() returns -// the current item label for BEGIN and the would be new one for END. -// -// Vetoing BEGIN event means that label editing won't happen at all, -// vetoing END means that the new value is discarded and the old one kept -#define EVT_TREE_BEGIN_LABEL_EDIT(id, fn) wx__DECLARE_TREEEVT(BEGIN_LABEL_EDIT, id, fn) -#define EVT_TREE_END_LABEL_EDIT(id, fn) wx__DECLARE_TREEEVT(END_LABEL_EDIT, id, fn) - -// provide/update information about GetItem() item -#define EVT_TREE_GET_INFO(id, fn) wx__DECLARE_TREEEVT(GET_INFO, id, fn) -#define EVT_TREE_SET_INFO(id, fn) wx__DECLARE_TREEEVT(SET_INFO, id, fn) - -// GetItem() is the item being expanded/collapsed, the "ING" versions can use -#define EVT_TREE_ITEM_EXPANDED(id, fn) wx__DECLARE_TREEEVT(ITEM_EXPANDED, id, fn) -#define EVT_TREE_ITEM_EXPANDING(id, fn) wx__DECLARE_TREEEVT(ITEM_EXPANDING, id, fn) -#define EVT_TREE_ITEM_COLLAPSED(id, fn) wx__DECLARE_TREEEVT(ITEM_COLLAPSED, id, fn) -#define EVT_TREE_ITEM_COLLAPSING(id, fn) wx__DECLARE_TREEEVT(ITEM_COLLAPSING, id, fn) - -// GetOldItem() is the item which had the selection previously, GetItem() is -// the item which acquires selection -#define EVT_TREE_SEL_CHANGED(id, fn) wx__DECLARE_TREEEVT(SEL_CHANGED, id, fn) -#define EVT_TREE_SEL_CHANGING(id, fn) wx__DECLARE_TREEEVT(SEL_CHANGING, id, fn) - -// GetKeyCode() returns the key code -// NB: this is the only message for which GetItem() is invalid (you may get the -// item from GetSelection()) -#define EVT_TREE_KEY_DOWN(id, fn) wx__DECLARE_TREEEVT(KEY_DOWN, id, fn) - -// GetItem() returns the item being deleted, the associated data (if any) will -// be deleted just after the return of this event handler (if any) -#define EVT_TREE_DELETE_ITEM(id, fn) wx__DECLARE_TREEEVT(DELETE_ITEM, id, fn) - -// GetItem() returns the item that was activated (double click, enter, space) -#define EVT_TREE_ITEM_ACTIVATED(id, fn) wx__DECLARE_TREEEVT(ITEM_ACTIVATED, id, fn) - -// GetItem() returns the item for which the context menu shall be shown -#define EVT_TREE_ITEM_MENU(id, fn) wx__DECLARE_TREEEVT(ITEM_MENU, id, fn) - -// GetItem() returns the item that was clicked on -#define EVT_TREE_ITEM_RIGHT_CLICK(id, fn) wx__DECLARE_TREEEVT(ITEM_RIGHT_CLICK, id, fn) -#define EVT_TREE_ITEM_MIDDLE_CLICK(id, fn) wx__DECLARE_TREEEVT(ITEM_MIDDLE_CLICK, id, fn) - -// GetItem() returns the item whose state image was clicked on -#define EVT_TREE_STATE_IMAGE_CLICK(id, fn) wx__DECLARE_TREEEVT(STATE_IMAGE_CLICK, id, fn) - -// GetItem() is the item for which the tooltip is being requested -#define EVT_TREE_ITEM_GETTOOLTIP(id, fn) wx__DECLARE_TREEEVT(ITEM_GETTOOLTIP, id, fn) - -// old wxEVT_COMMAND_* constants -#define wxEVT_COMMAND_TREE_BEGIN_DRAG wxEVT_TREE_BEGIN_DRAG -#define wxEVT_COMMAND_TREE_BEGIN_RDRAG wxEVT_TREE_BEGIN_RDRAG -#define wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT wxEVT_TREE_BEGIN_LABEL_EDIT -#define wxEVT_COMMAND_TREE_END_LABEL_EDIT wxEVT_TREE_END_LABEL_EDIT -#define wxEVT_COMMAND_TREE_DELETE_ITEM wxEVT_TREE_DELETE_ITEM -#define wxEVT_COMMAND_TREE_GET_INFO wxEVT_TREE_GET_INFO -#define wxEVT_COMMAND_TREE_SET_INFO wxEVT_TREE_SET_INFO -#define wxEVT_COMMAND_TREE_ITEM_EXPANDED wxEVT_TREE_ITEM_EXPANDED -#define wxEVT_COMMAND_TREE_ITEM_EXPANDING wxEVT_TREE_ITEM_EXPANDING -#define wxEVT_COMMAND_TREE_ITEM_COLLAPSED wxEVT_TREE_ITEM_COLLAPSED -#define wxEVT_COMMAND_TREE_ITEM_COLLAPSING wxEVT_TREE_ITEM_COLLAPSING -#define wxEVT_COMMAND_TREE_SEL_CHANGED wxEVT_TREE_SEL_CHANGED -#define wxEVT_COMMAND_TREE_SEL_CHANGING wxEVT_TREE_SEL_CHANGING -#define wxEVT_COMMAND_TREE_KEY_DOWN wxEVT_TREE_KEY_DOWN -#define wxEVT_COMMAND_TREE_ITEM_ACTIVATED wxEVT_TREE_ITEM_ACTIVATED -#define wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK wxEVT_TREE_ITEM_RIGHT_CLICK -#define wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK wxEVT_TREE_ITEM_MIDDLE_CLICK -#define wxEVT_COMMAND_TREE_END_DRAG wxEVT_TREE_END_DRAG -#define wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK wxEVT_TREE_STATE_IMAGE_CLICK -#define wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP wxEVT_TREE_ITEM_GETTOOLTIP -#define wxEVT_COMMAND_TREE_ITEM_MENU wxEVT_TREE_ITEM_MENU - -#endif // wxUSE_TREECTRL - -#endif // _WX_TREEBASE_H_ diff --git a/Externals/wxWidgets3/include/wx/treebook.h b/Externals/wxWidgets3/include/wx/treebook.h deleted file mode 100644 index 8661349c78..0000000000 --- a/Externals/wxWidgets3/include/wx/treebook.h +++ /dev/null @@ -1,263 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/treebook.h -// Purpose: wxTreebook: wxNotebook-like control presenting pages in a tree -// Author: Evgeniy Tarassov, Vadim Zeitlin -// Modified by: -// Created: 2005-09-15 -// Copyright: (c) 2005 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_TREEBOOK_H_ -#define _WX_TREEBOOK_H_ - -#include "wx/defs.h" - -#if wxUSE_TREEBOOK - -#include "wx/bookctrl.h" -#include "wx/containr.h" -#include "wx/treectrl.h" // for wxArrayTreeItemIds - -typedef wxWindow wxTreebookPage; - -class WXDLLIMPEXP_FWD_CORE wxTreeEvent; - -// ---------------------------------------------------------------------------- -// wxTreebook -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxTreebook : public wxNavigationEnabled -{ -public: - // Constructors and such - // --------------------- - - // Default ctor doesn't create the control, use Create() afterwards - wxTreebook() - { - Init(); - } - - // This ctor creates the tree book control - wxTreebook(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxBK_DEFAULT, - const wxString& name = wxEmptyString) - { - Init(); - - (void)Create(parent, id, pos, size, style, name); - } - - // Really creates the control - bool Create(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxBK_DEFAULT, - const wxString& name = wxEmptyString); - - - // Page insertion operations - // ------------------------- - - // Notice that page pointer may be NULL in which case the next non NULL - // page (usually the first child page of a node) is shown when this page is - // selected - - // Inserts a new page just before the page indicated by page. - // The new page is placed on the same level as page. - virtual bool InsertPage(size_t pos, - wxWindow *page, - const wxString& text, - bool bSelect = false, - int imageId = NO_IMAGE) wxOVERRIDE; - - // Inserts a new sub-page to the end of children of the page at given pos. - virtual bool InsertSubPage(size_t pos, - wxWindow *page, - const wxString& text, - bool bSelect = false, - int imageId = NO_IMAGE); - - // Adds a new page at top level after all other pages. - virtual bool AddPage(wxWindow *page, - const wxString& text, - bool bSelect = false, - int imageId = NO_IMAGE) wxOVERRIDE; - - // Adds a new child-page to the last top-level page inserted. - // Useful when constructing 1 level tree structure. - virtual bool AddSubPage(wxWindow *page, - const wxString& text, - bool bSelect = false, - int imageId = NO_IMAGE); - - // Deletes the page and ALL its children. Could trigger page selection - // change in a case when selected page is removed. In that case its parent - // is selected (or the next page if no parent). - virtual bool DeletePage(size_t pos) wxOVERRIDE; - - - // Tree operations - // --------------- - - // Gets the page node state -- node is expanded or collapsed - virtual bool IsNodeExpanded(size_t pos) const; - - // Expands or collapses the page node. Returns the previous state. - // May generate page changing events (if selected page - // is under the collapsed branch, then parent is autoselected). - virtual bool ExpandNode(size_t pos, bool expand = true); - - // shortcut for ExpandNode(pos, false) - bool CollapseNode(size_t pos) { return ExpandNode(pos, false); } - - // get the parent page or wxNOT_FOUND if this is a top level page - int GetPageParent(size_t pos) const; - - // the tree control we use for showing the pages index tree - wxTreeCtrl* GetTreeCtrl() const { return (wxTreeCtrl*)m_bookctrl; } - - - // Standard operations inherited from wxBookCtrlBase - // ------------------------------------------------- - - virtual bool SetPageText(size_t n, const wxString& strText) wxOVERRIDE; - virtual wxString GetPageText(size_t n) const wxOVERRIDE; - virtual int GetPageImage(size_t n) const wxOVERRIDE; - virtual bool SetPageImage(size_t n, int imageId) wxOVERRIDE; - virtual int SetSelection(size_t n) wxOVERRIDE { return DoSetSelection(n, SetSelection_SendEvent); } - virtual int ChangeSelection(size_t n) wxOVERRIDE { return DoSetSelection(n); } - virtual int HitTest(const wxPoint& pt, long *flags = NULL) const wxOVERRIDE; - virtual void SetImageList(wxImageList *imageList) wxOVERRIDE; - virtual void AssignImageList(wxImageList *imageList); - virtual bool DeleteAllPages() wxOVERRIDE; - -protected: - // Implementation of a page removal. See DeletPage for comments. - wxTreebookPage *DoRemovePage(size_t pos) wxOVERRIDE; - - // This subclass of wxBookCtrlBase accepts NULL page pointers (empty pages) - virtual bool AllowNullPage() const wxOVERRIDE { return true; } - - // event handlers - void OnTreeSelectionChange(wxTreeEvent& event); - void OnTreeNodeExpandedCollapsed(wxTreeEvent& event); - - // array of page ids and page windows - wxArrayTreeItemIds m_treeIds; - - // in the situation when m_selection page is not wxNOT_FOUND but page is - // NULL this is the first (sub)child that has a non-NULL page - int m_actualSelection; - -private: - // common part of all constructors - void Init(); - - // The real implementations of page insertion functions - // ------------------------------------------------------ - // All DoInsert/Add(Sub)Page functions add the page into : - // - the base class - // - the tree control - // - update the index/TreeItemId corespondance array - bool DoInsertPage(size_t pos, - wxWindow *page, - const wxString& text, - bool bSelect = false, - int imageId = NO_IMAGE); - bool DoInsertSubPage(size_t pos, - wxWindow *page, - const wxString& text, - bool bSelect = false, - int imageId = NO_IMAGE); - bool DoAddSubPage(wxWindow *page, - const wxString& text, - bool bSelect = false, - int imageId = NO_IMAGE); - - // Sets selection in the tree control and updates the page being shown. - int DoSetSelection(size_t pos, int flags = 0) wxOVERRIDE; - - // Returns currently shown page. In a case when selected the node - // has empty (NULL) page finds first (sub)child with not-empty page. - wxTreebookPage *DoGetCurrentPage() const; - - // Does the selection update. Called from page insertion functions - // to update selection if the selected page was pushed by the newly inserted - void DoUpdateSelection(bool bSelect, int page); - - - // Operations on the internal private members of the class - // ------------------------------------------------------- - // Returns the page TreeItemId for the page. - // Or, if the page index is incorrect, a fake one (fakePage.IsOk() == false) - wxTreeItemId DoInternalGetPage(size_t pos) const; - - // Linear search for a page with the id specified. If no page - // found wxNOT_FOUND is returned. The function is used when we catch an event - // from m_tree (wxTreeCtrl) component. - int DoInternalFindPageById(wxTreeItemId page) const; - - // Updates page and wxTreeItemId correspondance. - void DoInternalAddPage(size_t newPos, wxWindow *page, wxTreeItemId pageId); - - // Removes the page from internal structure. - void DoInternalRemovePage(size_t pos) - { DoInternalRemovePageRange(pos, 0); } - - // Removes the page and all its children designated by subCount - // from internal structures of the control. - void DoInternalRemovePageRange(size_t pos, size_t subCount); - - // Returns internal number of pages which can be different from - // GetPageCount() while performing a page insertion or removal. - size_t DoInternalGetPageCount() const { return m_treeIds.GetCount(); } - - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxTreebook); -}; - - -// ---------------------------------------------------------------------------- -// treebook event class and related stuff -// ---------------------------------------------------------------------------- - -// wxTreebookEvent is obsolete and defined for compatibility only -#define wxTreebookEvent wxBookCtrlEvent -typedef wxBookCtrlEventFunction wxTreebookEventFunction; -#define wxTreebookEventHandler(func) wxBookCtrlEventHandler(func) - - -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TREEBOOK_PAGE_CHANGED, wxBookCtrlEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TREEBOOK_PAGE_CHANGING, wxBookCtrlEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TREEBOOK_NODE_COLLAPSED, wxBookCtrlEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TREEBOOK_NODE_EXPANDED, wxBookCtrlEvent ); - -#define EVT_TREEBOOK_PAGE_CHANGED(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_TREEBOOK_PAGE_CHANGED, winid, wxBookCtrlEventHandler(fn)) - -#define EVT_TREEBOOK_PAGE_CHANGING(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_TREEBOOK_PAGE_CHANGING, winid, wxBookCtrlEventHandler(fn)) - -#define EVT_TREEBOOK_NODE_COLLAPSED(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_TREEBOOK_NODE_COLLAPSED, winid, wxBookCtrlEventHandler(fn)) - -#define EVT_TREEBOOK_NODE_EXPANDED(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_TREEBOOK_NODE_EXPANDED, winid, wxBookCtrlEventHandler(fn)) - -// old wxEVT_COMMAND_* constants -#define wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED wxEVT_TREEBOOK_PAGE_CHANGED -#define wxEVT_COMMAND_TREEBOOK_PAGE_CHANGING wxEVT_TREEBOOK_PAGE_CHANGING -#define wxEVT_COMMAND_TREEBOOK_NODE_COLLAPSED wxEVT_TREEBOOK_NODE_COLLAPSED -#define wxEVT_COMMAND_TREEBOOK_NODE_EXPANDED wxEVT_TREEBOOK_NODE_EXPANDED - - -#endif // wxUSE_TREEBOOK - -#endif // _WX_TREEBOOK_H_ diff --git a/Externals/wxWidgets3/include/wx/treectrl.h b/Externals/wxWidgets3/include/wx/treectrl.h deleted file mode 100644 index 9dfc85fb85..0000000000 --- a/Externals/wxWidgets3/include/wx/treectrl.h +++ /dev/null @@ -1,474 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/treectrl.h -// Purpose: wxTreeCtrl base header -// Author: Karsten Ballueder -// Modified by: -// Created: -// Copyright: (c) Karsten Ballueder -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_TREECTRL_H_BASE_ -#define _WX_TREECTRL_H_BASE_ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/defs.h" - -#if wxUSE_TREECTRL - -#include "wx/control.h" -#include "wx/treebase.h" -#include "wx/textctrl.h" // wxTextCtrl::ms_classinfo used through wxCLASSINFO macro -#include "wx/systhemectrl.h" - -class WXDLLIMPEXP_FWD_CORE wxImageList; - -#if !defined(__WXMSW__) || defined(__WXUNIVERSAL__) - #define wxHAS_GENERIC_TREECTRL -#endif - -// ---------------------------------------------------------------------------- -// wxTreeCtrlBase -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxTreeCtrlBase : public wxSystemThemedControl -{ -public: - wxTreeCtrlBase(); - virtual ~wxTreeCtrlBase(); - - // accessors - // --------- - - // get the total number of items in the control - virtual unsigned int GetCount() const = 0; - - // indent is the number of pixels the children are indented relative to - // the parents position. SetIndent() also redraws the control - // immediately. - virtual unsigned int GetIndent() const = 0; - virtual void SetIndent(unsigned int indent) = 0; - - // spacing is the number of pixels between the start and the Text - // (has no effect under wxMSW) - unsigned int GetSpacing() const { return m_spacing; } - void SetSpacing(unsigned int spacing) { m_spacing = spacing; } - - // image list: these functions allow to associate an image list with - // the control and retrieve it. Note that the control does _not_ delete - // the associated image list when it's deleted in order to allow image - // lists to be shared between different controls. - // - // The normal image list is for the icons which correspond to the - // normal tree item state (whether it is selected or not). - // Additionally, the application might choose to show a state icon - // which corresponds to an app-defined item state (for example, - // checked/unchecked) which are taken from the state image list. - wxImageList *GetImageList() const { return m_imageListNormal; } - wxImageList *GetStateImageList() const { return m_imageListState; } - - virtual void SetImageList(wxImageList *imageList) = 0; - virtual void SetStateImageList(wxImageList *imageList) = 0; - void AssignImageList(wxImageList *imageList) - { - SetImageList(imageList); - m_ownsImageListNormal = true; - } - void AssignStateImageList(wxImageList *imageList) - { - SetStateImageList(imageList); - m_ownsImageListState = true; - } - - - // Functions to work with tree ctrl items. Unfortunately, they can _not_ be - // member functions of wxTreeItem because they must know the tree the item - // belongs to for Windows implementation and storing the pointer to - // wxTreeCtrl in each wxTreeItem is just too much waste. - - // accessors - // --------- - - // retrieve items label - virtual wxString GetItemText(const wxTreeItemId& item) const = 0; - // get one of the images associated with the item (normal by default) - virtual int GetItemImage(const wxTreeItemId& item, - wxTreeItemIcon which = wxTreeItemIcon_Normal) const = 0; - // get the data associated with the item - virtual wxTreeItemData *GetItemData(const wxTreeItemId& item) const = 0; - - // get the item's text colour - virtual wxColour GetItemTextColour(const wxTreeItemId& item) const = 0; - - // get the item's background colour - virtual wxColour GetItemBackgroundColour(const wxTreeItemId& item) const = 0; - - // get the item's font - virtual wxFont GetItemFont(const wxTreeItemId& item) const = 0; - - // get the items state - int GetItemState(const wxTreeItemId& item) const - { - return DoGetItemState(item); - } - - // modifiers - // --------- - - // set items label - virtual void SetItemText(const wxTreeItemId& item, const wxString& text) = 0; - // set one of the images associated with the item (normal by default) - virtual void SetItemImage(const wxTreeItemId& item, - int image, - wxTreeItemIcon which = wxTreeItemIcon_Normal) = 0; - // associate some data with the item - virtual void SetItemData(const wxTreeItemId& item, wxTreeItemData *data) = 0; - - // force appearance of [+] button near the item. This is useful to - // allow the user to expand the items which don't have any children now - // - but instead add them only when needed, thus minimizing memory - // usage and loading time. - virtual void SetItemHasChildren(const wxTreeItemId& item, - bool has = true) = 0; - - // the item will be shown in bold - virtual void SetItemBold(const wxTreeItemId& item, bool bold = true) = 0; - - // the item will be shown with a drop highlight - virtual void SetItemDropHighlight(const wxTreeItemId& item, - bool highlight = true) = 0; - - // set the items text colour - virtual void SetItemTextColour(const wxTreeItemId& item, - const wxColour& col) = 0; - - // set the items background colour - virtual void SetItemBackgroundColour(const wxTreeItemId& item, - const wxColour& col) = 0; - - // set the items font (should be of the same height for all items) - virtual void SetItemFont(const wxTreeItemId& item, - const wxFont& font) = 0; - - // set the items state (special state values: wxTREE_ITEMSTATE_NONE/NEXT/PREV) - void SetItemState(const wxTreeItemId& item, int state); - - // item status inquiries - // --------------------- - - // is the item visible (it might be outside the view or not expanded)? - virtual bool IsVisible(const wxTreeItemId& item) const = 0; - // does the item has any children? - virtual bool ItemHasChildren(const wxTreeItemId& item) const = 0; - // same as above - bool HasChildren(const wxTreeItemId& item) const - { return ItemHasChildren(item); } - // is the item expanded (only makes sense if HasChildren())? - virtual bool IsExpanded(const wxTreeItemId& item) const = 0; - // is this item currently selected (the same as has focus)? - virtual bool IsSelected(const wxTreeItemId& item) const = 0; - // is item text in bold font? - virtual bool IsBold(const wxTreeItemId& item) const = 0; - // is the control empty? - bool IsEmpty() const; - - - // number of children - // ------------------ - - // if 'recursively' is false, only immediate children count, otherwise - // the returned number is the number of all items in this branch - virtual size_t GetChildrenCount(const wxTreeItemId& item, - bool recursively = true) const = 0; - - // navigation - // ---------- - - // wxTreeItemId.IsOk() will return false if there is no such item - - // get the root tree item - virtual wxTreeItemId GetRootItem() const = 0; - - // get the item currently selected (may return NULL if no selection) - virtual wxTreeItemId GetSelection() const = 0; - - // get the items currently selected, return the number of such item - // - // NB: this operation is expensive and can take a long time for a - // control with a lot of items (~ O(number of items)). - virtual size_t GetSelections(wxArrayTreeItemIds& selections) const = 0; - - // get the last item to be clicked when the control has wxTR_MULTIPLE - // equivalent to GetSelection() if not wxTR_MULTIPLE - virtual wxTreeItemId GetFocusedItem() const = 0; - - - // Clears the currently focused item - virtual void ClearFocusedItem() = 0; - // Sets the currently focused item. Item should be valid - virtual void SetFocusedItem(const wxTreeItemId& item) = 0; - - - // get the parent of this item (may return NULL if root) - virtual wxTreeItemId GetItemParent(const wxTreeItemId& item) const = 0; - - // for this enumeration function you must pass in a "cookie" parameter - // which is opaque for the application but is necessary for the library - // to make these functions reentrant (i.e. allow more than one - // enumeration on one and the same object simultaneously). Of course, - // the "cookie" passed to GetFirstChild() and GetNextChild() should be - // the same! - - // get the first child of this item - virtual wxTreeItemId GetFirstChild(const wxTreeItemId& item, - wxTreeItemIdValue& cookie) const = 0; - // get the next child - virtual wxTreeItemId GetNextChild(const wxTreeItemId& item, - wxTreeItemIdValue& cookie) const = 0; - // get the last child of this item - this method doesn't use cookies - virtual wxTreeItemId GetLastChild(const wxTreeItemId& item) const = 0; - - // get the next sibling of this item - virtual wxTreeItemId GetNextSibling(const wxTreeItemId& item) const = 0; - // get the previous sibling - virtual wxTreeItemId GetPrevSibling(const wxTreeItemId& item) const = 0; - - // get first visible item - virtual wxTreeItemId GetFirstVisibleItem() const = 0; - // get the next visible item: item must be visible itself! - // see IsVisible() and wxTreeCtrl::GetFirstVisibleItem() - virtual wxTreeItemId GetNextVisible(const wxTreeItemId& item) const = 0; - // get the previous visible item: item must be visible itself! - virtual wxTreeItemId GetPrevVisible(const wxTreeItemId& item) const = 0; - - // operations - // ---------- - - // add the root node to the tree - virtual wxTreeItemId AddRoot(const wxString& text, - int image = -1, int selImage = -1, - wxTreeItemData *data = NULL) = 0; - - // insert a new item in as the first child of the parent - wxTreeItemId PrependItem(const wxTreeItemId& parent, - const wxString& text, - int image = -1, int selImage = -1, - wxTreeItemData *data = NULL) - { - return DoInsertItem(parent, 0u, text, image, selImage, data); - } - - // insert a new item after a given one - wxTreeItemId InsertItem(const wxTreeItemId& parent, - const wxTreeItemId& idPrevious, - const wxString& text, - int image = -1, int selImage = -1, - wxTreeItemData *data = NULL) - { - return DoInsertAfter(parent, idPrevious, text, image, selImage, data); - } - - // insert a new item before the one with the given index - wxTreeItemId InsertItem(const wxTreeItemId& parent, - size_t pos, - const wxString& text, - int image = -1, int selImage = -1, - wxTreeItemData *data = NULL) - { - return DoInsertItem(parent, pos, text, image, selImage, data); - } - - // insert a new item in as the last child of the parent - wxTreeItemId AppendItem(const wxTreeItemId& parent, - const wxString& text, - int image = -1, int selImage = -1, - wxTreeItemData *data = NULL) - { - return DoInsertItem(parent, (size_t)-1, text, image, selImage, data); - } - - // delete this item and associated data if any - virtual void Delete(const wxTreeItemId& item) = 0; - // delete all children (but don't delete the item itself) - // NB: this won't send wxEVT_TREE_ITEM_DELETED events - virtual void DeleteChildren(const wxTreeItemId& item) = 0; - // delete all items from the tree - // NB: this won't send wxEVT_TREE_ITEM_DELETED events - virtual void DeleteAllItems() = 0; - - // expand this item - virtual void Expand(const wxTreeItemId& item) = 0; - // expand the item and all its children recursively - void ExpandAllChildren(const wxTreeItemId& item); - // expand all items - void ExpandAll(); - // collapse the item without removing its children - virtual void Collapse(const wxTreeItemId& item) = 0; - // collapse the item and all its children - void CollapseAllChildren(const wxTreeItemId& item); - // collapse all items - void CollapseAll(); - // collapse the item and remove all children - virtual void CollapseAndReset(const wxTreeItemId& item) = 0; - // toggles the current state - virtual void Toggle(const wxTreeItemId& item) = 0; - - // remove the selection from currently selected item (if any) - virtual void Unselect() = 0; - // unselect all items (only makes sense for multiple selection control) - virtual void UnselectAll() = 0; - // select this item - virtual void SelectItem(const wxTreeItemId& item, bool select = true) = 0; - // selects all (direct) children for given parent (only for - // multiselection controls) - virtual void SelectChildren(const wxTreeItemId& parent) = 0; - // unselect this item - void UnselectItem(const wxTreeItemId& item) { SelectItem(item, false); } - // toggle item selection - void ToggleItemSelection(const wxTreeItemId& item) - { - SelectItem(item, !IsSelected(item)); - } - - // make sure this item is visible (expanding the parent item and/or - // scrolling to this item if necessary) - virtual void EnsureVisible(const wxTreeItemId& item) = 0; - // scroll to this item (but don't expand its parent) - virtual void ScrollTo(const wxTreeItemId& item) = 0; - - // start editing the item label: this (temporarily) replaces the item - // with a one line edit control. The item will be selected if it hadn't - // been before. textCtrlClass parameter allows you to create an edit - // control of arbitrary user-defined class deriving from wxTextCtrl. - virtual wxTextCtrl *EditLabel(const wxTreeItemId& item, - wxClassInfo* textCtrlClass = wxCLASSINFO(wxTextCtrl)) = 0; - // returns the same pointer as StartEdit() if the item is being edited, - // NULL otherwise (it's assumed that no more than one item may be - // edited simultaneously) - virtual wxTextCtrl *GetEditControl() const = 0; - // end editing and accept or discard the changes to item label - virtual void EndEditLabel(const wxTreeItemId& item, - bool discardChanges = false) = 0; - - // Enable or disable beep when incremental match doesn't find any item. - // Only implemented in the generic version currently. - virtual void EnableBellOnNoMatch(bool WXUNUSED(on) = true) { } - - // sorting - // ------- - - // this function is called to compare 2 items and should return -1, 0 - // or +1 if the first item is less than, equal to or greater than the - // second one. The base class version performs alphabetic comparaison - // of item labels (GetText) - virtual int OnCompareItems(const wxTreeItemId& item1, - const wxTreeItemId& item2) - { - return wxStrcmp(GetItemText(item1), GetItemText(item2)); - } - - // sort the children of this item using OnCompareItems - // - // NB: this function is not reentrant and not MT-safe (FIXME)! - virtual void SortChildren(const wxTreeItemId& item) = 0; - - // items geometry - // -------------- - - // determine to which item (if any) belongs the given point (the - // coordinates specified are relative to the client area of tree ctrl) - // and, in the second variant, fill the flags parameter with a bitmask - // of wxTREE_HITTEST_xxx constants. - wxTreeItemId HitTest(const wxPoint& point) const - { int dummy; return DoTreeHitTest(point, dummy); } - wxTreeItemId HitTest(const wxPoint& point, int& flags) const - { return DoTreeHitTest(point, flags); } - - // get the bounding rectangle of the item (or of its label only) - virtual bool GetBoundingRect(const wxTreeItemId& item, - wxRect& rect, - bool textOnly = false) const = 0; - - - // implementation - // -------------- - - virtual bool ShouldInheritColours() const wxOVERRIDE { return false; } - - // hint whether to calculate best size quickly or accurately - void SetQuickBestSize(bool q) { m_quickBestSize = q; } - bool GetQuickBestSize() const { return m_quickBestSize; } - -protected: - virtual wxSize DoGetBestSize() const wxOVERRIDE; - - // common part of Get/SetItemState() - virtual int DoGetItemState(const wxTreeItemId& item) const = 0; - virtual void DoSetItemState(const wxTreeItemId& item, int state) = 0; - - // common part of Append/Prepend/InsertItem() - // - // pos is the position at which to insert the item or (size_t)-1 to append - // it to the end - virtual wxTreeItemId DoInsertItem(const wxTreeItemId& parent, - size_t pos, - const wxString& text, - int image, int selImage, - wxTreeItemData *data) = 0; - - // and this function implements overloaded InsertItem() taking wxTreeItemId - // (it can't be called InsertItem() as we'd have virtual function hiding - // problem in derived classes then) - virtual wxTreeItemId DoInsertAfter(const wxTreeItemId& parent, - const wxTreeItemId& idPrevious, - const wxString& text, - int image = -1, int selImage = -1, - wxTreeItemData *data = NULL) = 0; - - // real HitTest() implementation: again, can't be called just HitTest() - // because it's overloaded and so the non-virtual overload would be hidden - // (and can't be called DoHitTest() because this is already in wxWindow) - virtual wxTreeItemId DoTreeHitTest(const wxPoint& point, - int& flags) const = 0; - - - wxImageList *m_imageListNormal, // images for tree elements - *m_imageListState; // special images for app defined states - bool m_ownsImageListNormal, - m_ownsImageListState; - - // spacing between left border and the text - unsigned int m_spacing; - - // whether full or quick calculation is done in DoGetBestSize - bool m_quickBestSize; - - -private: - // Intercept Escape and Return keys to ensure that our in-place edit - // control always gets them before they're used for dialog navigation or - // anything else. - void OnCharHook(wxKeyEvent& event); - - - wxDECLARE_NO_COPY_CLASS(wxTreeCtrlBase); -}; - -// ---------------------------------------------------------------------------- -// include the platform-dependent wxTreeCtrl class -// ---------------------------------------------------------------------------- - -#ifdef wxHAS_GENERIC_TREECTRL - #include "wx/generic/treectlg.h" -#elif defined(__WXMSW__) - #include "wx/msw/treectrl.h" -#else - #error "unknown native wxTreeCtrl implementation" -#endif - -#endif // wxUSE_TREECTRL - -#endif // _WX_TREECTRL_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/treelist.h b/Externals/wxWidgets3/include/wx/treelist.h deleted file mode 100644 index 9782903ef4..0000000000 --- a/Externals/wxWidgets3/include/wx/treelist.h +++ /dev/null @@ -1,577 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/treelist.h -// Purpose: wxTreeListCtrl class declaration. -// Author: Vadim Zeitlin -// Created: 2011-08-17 -// Copyright: (c) 2011 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_TREELIST_H_ -#define _WX_TREELIST_H_ - -#include "wx/defs.h" - -#if wxUSE_TREELISTCTRL - -#include "wx/compositewin.h" -#include "wx/containr.h" -#include "wx/headercol.h" -#include "wx/itemid.h" -#include "wx/vector.h" -#include "wx/window.h" -#include "wx/withimages.h" - -class WXDLLIMPEXP_FWD_ADV wxDataViewCtrl; -class WXDLLIMPEXP_FWD_ADV wxDataViewEvent; - -extern WXDLLIMPEXP_DATA_ADV(const char) wxTreeListCtrlNameStr[]; - -class wxTreeListCtrl; -class wxTreeListModel; -class wxTreeListModelNode; - -// ---------------------------------------------------------------------------- -// Constants. -// ---------------------------------------------------------------------------- - -// wxTreeListCtrl styles. -// -// Notice that using wxTL_USER_3STATE implies wxTL_3STATE and wxTL_3STATE in -// turn implies wxTL_CHECKBOX. -enum -{ - wxTL_SINGLE = 0x0000, // This is the default anyhow. - wxTL_MULTIPLE = 0x0001, // Allow multiple selection. - wxTL_CHECKBOX = 0x0002, // Show checkboxes in the first column. - wxTL_3STATE = 0x0004, // Allow 3rd state in checkboxes. - wxTL_USER_3STATE = 0x0008, // Allow user to set 3rd state. - wxTL_NO_HEADER = 0x0010, // Column titles not visible. - - wxTL_DEFAULT_STYLE = wxTL_SINGLE, - wxTL_STYLE_MASK = wxTL_SINGLE | - wxTL_MULTIPLE | - wxTL_CHECKBOX | - wxTL_3STATE | - wxTL_USER_3STATE -}; - -// ---------------------------------------------------------------------------- -// wxTreeListItem: unique identifier of an item in wxTreeListCtrl. -// ---------------------------------------------------------------------------- - -// Make wxTreeListItem a forward-declarable class even though it's simple -// enough to possibly be declared as a simple typedef. -class wxTreeListItem : public wxItemId -{ -public: - wxTreeListItem(wxTreeListModelNode* item = NULL) - : wxItemId(item) - { - } -}; - -// Container of multiple items. -typedef wxVector wxTreeListItems; - -// Some special "items" that can be used with InsertItem(): -extern WXDLLIMPEXP_DATA_ADV(const wxTreeListItem) wxTLI_FIRST; -extern WXDLLIMPEXP_DATA_ADV(const wxTreeListItem) wxTLI_LAST; - -// ---------------------------------------------------------------------------- -// wxTreeListItemComparator: defines order of wxTreeListCtrl items. -// ---------------------------------------------------------------------------- - -class wxTreeListItemComparator -{ -public: - wxTreeListItemComparator() { } - - // The comparison function should return negative, null or positive value - // depending on whether the first item is less than, equal to or greater - // than the second one. The items should be compared using their values for - // the given column. - virtual int - Compare(wxTreeListCtrl* treelist, - unsigned column, - wxTreeListItem first, - wxTreeListItem second) = 0; - - // Although this class is not used polymorphically by wxWidgets itself, - // provide virtual dtor in case it's used like this in the user code. - virtual ~wxTreeListItemComparator() { } - -private: - wxDECLARE_NO_COPY_CLASS(wxTreeListItemComparator); -}; - -// ---------------------------------------------------------------------------- -// wxTreeListCtrl: a control combining wxTree- and wxListCtrl features. -// ---------------------------------------------------------------------------- - -// This control also provides easy to use high level interface. Although the -// implementation uses wxDataViewCtrl internally, this class is intentionally -// simpler than wxDataViewCtrl and doesn't provide all of its functionality. -// -// If you need extra features you can always use GetDataView() accessor to work -// with wxDataViewCtrl directly but doing this makes your unportable to possible -// future non-wxDataViewCtrl-based implementations of this class. - -class WXDLLIMPEXP_ADV wxTreeListCtrl - : public wxCompositeWindow< wxNavigationEnabled >, - public wxWithImages -{ -public: - // Constructors and such - // --------------------- - - wxTreeListCtrl() { Init(); } - wxTreeListCtrl(wxWindow* parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxTL_DEFAULT_STYLE, - const wxString& name = wxTreeListCtrlNameStr) - { - Init(); - - Create(parent, id, pos, size, style, name); - } - - bool Create(wxWindow* parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxTL_DEFAULT_STYLE, - const wxString& name = wxTreeListCtrlNameStr); - - - virtual ~wxTreeListCtrl(); - - // Columns methods - // --------------- - - // Add a column with the given title and attributes, returns the index of - // the new column or -1 on failure. - int AppendColumn(const wxString& title, - int width = wxCOL_WIDTH_AUTOSIZE, - wxAlignment align = wxALIGN_LEFT, - int flags = wxCOL_RESIZABLE) - { - return DoInsertColumn(title, -1, width, align, flags); - } - - // Return the total number of columns. - unsigned GetColumnCount() const; - - // Delete the column with the given index, returns false if index is - // invalid or deleting the column failed for some other reason. - bool DeleteColumn(unsigned col); - - // Delete all columns. - void ClearColumns(); - - // Set column width to either the given value in pixels or to the value - // large enough to fit all of the items if width == wxCOL_WIDTH_AUTOSIZE. - void SetColumnWidth(unsigned col, int width); - - // Get the current width of the given column in pixels. - int GetColumnWidth(unsigned col) const; - - // Get the width appropriate for showing the given text. This is typically - // used as second argument for AppendColumn() or with SetColumnWidth(). - int WidthFor(const wxString& text) const; - - - // Item methods - // ------------ - - // Adding items. The parent and text of the first column of the new item - // must always be specified, the rest is optional. - // - // Each item can have two images: one used for closed state and another for - // opened one. Only the first one is ever used for the items that don't - // have children. And both are not set by default. - // - // It is also possible to associate arbitrary client data pointer with the - // new item. It will be deleted by the control when the item is deleted - // (either by an explicit DeleteItem() call or because the entire control - // is destroyed). - - wxTreeListItem AppendItem(wxTreeListItem parent, - const wxString& text, - int imageClosed = NO_IMAGE, - int imageOpened = NO_IMAGE, - wxClientData* data = NULL) - { - return DoInsertItem(parent, wxTLI_LAST, text, - imageClosed, imageOpened, data); - } - - wxTreeListItem InsertItem(wxTreeListItem parent, - wxTreeListItem previous, - const wxString& text, - int imageClosed = NO_IMAGE, - int imageOpened = NO_IMAGE, - wxClientData* data = NULL) - { - return DoInsertItem(parent, previous, text, - imageClosed, imageOpened, data); - } - - wxTreeListItem PrependItem(wxTreeListItem parent, - const wxString& text, - int imageClosed = NO_IMAGE, - int imageOpened = NO_IMAGE, - wxClientData* data = NULL) - { - return DoInsertItem(parent, wxTLI_FIRST, text, - imageClosed, imageOpened, data); - } - - // Deleting items. - void DeleteItem(wxTreeListItem item); - void DeleteAllItems(); - - - // Tree navigation - // --------------- - - // Return the (never shown) root item. - wxTreeListItem GetRootItem() const; - - // The parent item may be invalid for the root-level items. - wxTreeListItem GetItemParent(wxTreeListItem item) const; - - // Iterate over the given item children: start by calling GetFirstChild() - // and then call GetNextSibling() for as long as it returns valid item. - wxTreeListItem GetFirstChild(wxTreeListItem item) const; - wxTreeListItem GetNextSibling(wxTreeListItem item) const; - - // Return the first child of the root item, which is also the first item of - // the tree in depth-first traversal order. - wxTreeListItem GetFirstItem() const { return GetFirstChild(GetRootItem()); } - - // Get item after the given one in the depth-first tree-traversal order. - // Calling this function starting with the result of GetFirstItem() allows - // iterating over all items in the tree. - wxTreeListItem GetNextItem(wxTreeListItem item) const; - - - // Items attributes - // ---------------- - - const wxString& GetItemText(wxTreeListItem item, unsigned col = 0) const; - - // The convenience overload below sets the text for the first column. - void SetItemText(wxTreeListItem item, unsigned col, const wxString& text); - void SetItemText(wxTreeListItem item, const wxString& text) - { - SetItemText(item, 0, text); - } - - // By default the opened image is the same as the normal, closed one (if - // it's used at all). - void SetItemImage(wxTreeListItem item, int closed, int opened = NO_IMAGE); - - // Retrieve or set the data associated with the item. - wxClientData* GetItemData(wxTreeListItem item) const; - void SetItemData(wxTreeListItem item, wxClientData* data); - - - // Expanding and collapsing - // ------------------------ - - void Expand(wxTreeListItem item); - void Collapse(wxTreeListItem item); - bool IsExpanded(wxTreeListItem item) const; - - - // Selection handling - // ------------------ - - // This function can be used with single selection controls, use - // GetSelections() with the multi-selection ones. - wxTreeListItem GetSelection() const; - - // This one can be used with either single or multi-selection controls. - unsigned GetSelections(wxTreeListItems& selections) const; - - // In single selection mode Select() deselects any other selected items, in - // multi-selection case it adds to the selection. - void Select(wxTreeListItem item); - - // Can be used in multiple selection mode only, single selected item in the - // single selection mode can't be unselected. - void Unselect(wxTreeListItem item); - - // Return true if the item is selected, can be used in both single and - // multiple selection modes. - bool IsSelected(wxTreeListItem item) const; - - // Select or unselect all items, only valid in multiple selection mode. - void SelectAll(); - void UnselectAll(); - - void EnsureVisible(wxTreeListItem item); - - // Checkbox handling - // ----------------- - - // Methods in this section can only be used with the controls created with - // wxTL_CHECKBOX style. - - // Simple set, unset or query the checked state. - void CheckItem(wxTreeListItem item, wxCheckBoxState state = wxCHK_CHECKED); - void UncheckItem(wxTreeListItem item) { CheckItem(item, wxCHK_UNCHECKED); } - - // The same but do it recursively for this item itself and its children. - void CheckItemRecursively(wxTreeListItem item, - wxCheckBoxState state = wxCHK_CHECKED); - - // Update the parent of this item recursively: if this item and all its - // siblings are checked, the parent will become checked as well. If this - // item and all its siblings are unchecked, the parent will be unchecked. - // And if the siblings of this item are not all in the same state, the - // parent will be switched to indeterminate state. And then the same logic - // will be applied to the parents parent and so on recursively. - // - // This is typically called when the state of the given item has changed - // from EVT_TREELIST_ITEM_CHECKED() handler in the controls which have - // wxTL_3STATE flag. Notice that without this flag this function can't work - // as it would be unable to set the state of a parent with both checked and - // unchecked items so it's only allowed to call it when this flag is set. - void UpdateItemParentStateRecursively(wxTreeListItem item); - - // Return the current state. - wxCheckBoxState GetCheckedState(wxTreeListItem item) const; - - // Return true if all item children (if any) are in the given state. - bool AreAllChildrenInState(wxTreeListItem item, - wxCheckBoxState state) const; - - - - // Sorting. - // -------- - - // Sort by the given column, either in ascending (default) or descending - // sort order. - // - // By default, simple alphabetical sorting is done by this column contents - // but SetItemComparator() may be called to perform comparison in some - // other way. - void SetSortColumn(unsigned col, bool ascendingOrder = true); - - // If the control contents is sorted, return true and fill the output - // parameters with the column which is currently used for sorting and - // whether we sort using ascending or descending order. Otherwise, i.e. if - // the control contents is unsorted, simply return false. - bool GetSortColumn(unsigned* col, bool* ascendingOrder = NULL); - - // Set the object to use for comparing the items. It will be called when - // the control is being sorted because the user clicked on a sortable - // column. - // - // The provided pointer is stored by the control so the object it points to - // must have a life-time equal or greater to that of the control itself. In - // addition, the pointer can be NULL to stop using custom comparator and - // revert to the default alphabetical comparison. - void SetItemComparator(wxTreeListItemComparator* comparator); - - - // View window functions. - // ---------------------- - - // This control itself is entirely covered by the "view window" which is - // currently a wxDataViewCtrl but if you want to avoid relying on this to - // allow your code to work with later versions which might not be - // wxDataViewCtrl-based, use the first function only and only use the - // second one if you really need to call wxDataViewCtrl methods on it. - wxWindow* GetView() const; - wxDataViewCtrl* GetDataView() const { return m_view; } - -private: - // Common part of all ctors. - void Init(); - - // Pure virtual method inherited from wxCompositeWindow. - virtual wxWindowList GetCompositeWindowParts() const wxOVERRIDE; - - // Implementation of AppendColumn(). - int DoInsertColumn(const wxString& title, - int pos, // May be -1 meaning "append". - int width, - wxAlignment align, - int flags); - - // Common part of {Append,Insert,Prepend}Item(). - wxTreeListItem DoInsertItem(wxTreeListItem parent, - wxTreeListItem previous, - const wxString& text, - int imageClosed, - int imageOpened, - wxClientData* data); - - // Send wxTreeListEvent corresponding to the given wxDataViewEvent for an - // item (as opposed for column-oriented events). - // - // Also updates the original event "skipped" and "vetoed" flags. - void SendItemEvent(wxEventType evt, wxDataViewEvent& event); - - // Send wxTreeListEvent corresponding to the given column wxDataViewEvent. - void SendColumnEvent(wxEventType evt, wxDataViewEvent& event); - - - // Called by wxTreeListModel when an item is toggled by the user. - void OnItemToggled(wxTreeListItem item, wxCheckBoxState stateOld); - - // Event handlers. - void OnSelectionChanged(wxDataViewEvent& event); - void OnItemExpanding(wxDataViewEvent& event); - void OnItemExpanded(wxDataViewEvent& event); - void OnItemActivated(wxDataViewEvent& event); - void OnItemContextMenu(wxDataViewEvent& event); - void OnColumnSorted(wxDataViewEvent& event); - void OnSize(wxSizeEvent& event); - - wxDECLARE_EVENT_TABLE(); - - - wxDataViewCtrl* m_view; - wxTreeListModel* m_model; - - wxTreeListItemComparator* m_comparator; - - - // It calls our inherited protected wxWithImages::GetImage() method. - friend class wxTreeListModel; - - wxDECLARE_NO_COPY_CLASS(wxTreeListCtrl); -}; - -// ---------------------------------------------------------------------------- -// wxTreeListEvent: event generated by wxTreeListCtrl. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxTreeListEvent : public wxNotifyEvent -{ -public: - // Default ctor is provided for wxRTTI needs only but should never be used. - wxTreeListEvent() { Init(); } - - // The item affected by the event. Valid for all events except - // column-specific ones such as COLUMN_SORTED. - wxTreeListItem GetItem() const { return m_item; } - - // The previous state of the item checkbox for ITEM_CHECKED events only. - wxCheckBoxState GetOldCheckedState() const { return m_oldCheckedState; } - - // The index of the column affected by the event. Currently only used by - // COLUMN_SORTED event. - unsigned GetColumn() const { return m_column; } - - virtual wxEvent* Clone() const wxOVERRIDE { return new wxTreeListEvent(*this); } - -private: - // Common part of all ctors. - void Init() - { - m_column = static_cast(-1); - - m_oldCheckedState = wxCHK_UNDETERMINED; - } - - // Ctor is private, only wxTreeListCtrl can create events of this type. - wxTreeListEvent(wxEventType evtType, - wxTreeListCtrl* treelist, - wxTreeListItem item) - : wxNotifyEvent(evtType, treelist->GetId()), - m_item(item) - { - SetEventObject(treelist); - - Init(); - } - - // Set the checkbox state before this event for ITEM_CHECKED events. - void SetOldCheckedState(wxCheckBoxState state) - { - m_oldCheckedState = state; - } - - // Set the column affected by this event for COLUMN_SORTED events. - void SetColumn(unsigned column) - { - m_column = column; - } - - - const wxTreeListItem m_item; - - wxCheckBoxState m_oldCheckedState; - - unsigned m_column; - - friend class wxTreeListCtrl; - - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxTreeListEvent); -}; - -// Event types and event table macros. - -typedef void (wxEvtHandler::*wxTreeListEventFunction)(wxTreeListEvent&); - -#define wxTreeListEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxTreeListEventFunction, func) - -#define wxEVT_TREELIST_GENERIC(name, id, fn) \ - wx__DECLARE_EVT1(wxEVT_TREELIST_##name, id, wxTreeListEventHandler(fn)) - -#define wxDECLARE_TREELIST_EVENT(name) \ - wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, \ - wxEVT_TREELIST_##name, \ - wxTreeListEvent) - -wxDECLARE_TREELIST_EVENT(SELECTION_CHANGED); -#define EVT_TREELIST_SELECTION_CHANGED(id, fn) \ - wxEVT_TREELIST_GENERIC(SELECTION_CHANGED, id, fn) - -wxDECLARE_TREELIST_EVENT(ITEM_EXPANDING); -#define EVT_TREELIST_ITEM_EXPANDING(id, fn) \ - wxEVT_TREELIST_GENERIC(ITEM_EXPANDING, id, fn) - -wxDECLARE_TREELIST_EVENT(ITEM_EXPANDED); -#define EVT_TREELIST_ITEM_EXPANDED(id, fn) \ - wxEVT_TREELIST_GENERIC(ITEM_EXPANDED, id, fn) - -wxDECLARE_TREELIST_EVENT(ITEM_CHECKED); -#define EVT_TREELIST_ITEM_CHECKED(id, fn) \ - wxEVT_TREELIST_GENERIC(ITEM_CHECKED, id, fn) - -wxDECLARE_TREELIST_EVENT(ITEM_ACTIVATED); -#define EVT_TREELIST_ITEM_ACTIVATED(id, fn) \ - wxEVT_TREELIST_GENERIC(ITEM_ACTIVATED, id, fn) - -wxDECLARE_TREELIST_EVENT(ITEM_CONTEXT_MENU); -#define EVT_TREELIST_ITEM_CONTEXT_MENU(id, fn) \ - wxEVT_TREELIST_GENERIC(ITEM_CONTEXT_MENU, id, fn) - -wxDECLARE_TREELIST_EVENT(COLUMN_SORTED); -#define EVT_TREELIST_COLUMN_SORTED(id, fn) \ - wxEVT_TREELIST_GENERIC(COLUMN_SORTED, id, fn) - -#undef wxDECLARE_TREELIST_EVENT - -// old wxEVT_COMMAND_* constants -#define wxEVT_COMMAND_TREELIST_SELECTION_CHANGED wxEVT_TREELIST_SELECTION_CHANGED -#define wxEVT_COMMAND_TREELIST_ITEM_EXPANDING wxEVT_TREELIST_ITEM_EXPANDING -#define wxEVT_COMMAND_TREELIST_ITEM_EXPANDED wxEVT_TREELIST_ITEM_EXPANDED -#define wxEVT_COMMAND_TREELIST_ITEM_CHECKED wxEVT_TREELIST_ITEM_CHECKED -#define wxEVT_COMMAND_TREELIST_ITEM_ACTIVATED wxEVT_TREELIST_ITEM_ACTIVATED -#define wxEVT_COMMAND_TREELIST_ITEM_CONTEXT_MENU wxEVT_TREELIST_ITEM_CONTEXT_MENU -#define wxEVT_COMMAND_TREELIST_COLUMN_SORTED wxEVT_TREELIST_COLUMN_SORTED - -#endif // wxUSE_TREELISTCTRL - -#endif // _WX_TREELIST_H_ diff --git a/Externals/wxWidgets3/include/wx/txtstrm.h b/Externals/wxWidgets3/include/wx/txtstrm.h deleted file mode 100644 index 8fc43a176f..0000000000 --- a/Externals/wxWidgets3/include/wx/txtstrm.h +++ /dev/null @@ -1,192 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/txtstrm.h -// Purpose: Text stream classes -// Author: Guilhem Lavaux -// Modified by: -// Created: 28/06/1998 -// Copyright: (c) Guilhem Lavaux -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_TXTSTREAM_H_ -#define _WX_TXTSTREAM_H_ - -#include "wx/stream.h" -#include "wx/convauto.h" - -#if wxUSE_STREAMS - -class WXDLLIMPEXP_FWD_BASE wxTextInputStream; -class WXDLLIMPEXP_FWD_BASE wxTextOutputStream; - -typedef wxTextInputStream& (*__wxTextInputManip)(wxTextInputStream&); -typedef wxTextOutputStream& (*__wxTextOutputManip)(wxTextOutputStream&); - -WXDLLIMPEXP_BASE wxTextOutputStream &endl( wxTextOutputStream &stream ); - - -#define wxEOT wxT('\4') // the End-Of-Text control code (used only inside wxTextInputStream) - -// If you're scanning through a file using wxTextInputStream, you should check for EOF _before_ -// reading the next item (word / number), because otherwise the last item may get lost. -// You should however be prepared to receive an empty item (empty string / zero number) at the -// end of file, especially on Windows systems. This is unavoidable because most (but not all) files end -// with whitespace (i.e. usually a newline). -class WXDLLIMPEXP_BASE wxTextInputStream -{ -public: -#if wxUSE_UNICODE - wxTextInputStream(wxInputStream& s, - const wxString &sep=wxT(" \t"), - const wxMBConv& conv = wxConvAuto()); -#else - wxTextInputStream(wxInputStream& s, const wxString &sep=wxT(" \t")); -#endif - ~wxTextInputStream(); - - const wxInputStream& GetInputStream() const { return m_input; } - - // base may be between 2 and 36, inclusive, or the special 0 (= C format) - wxUint64 Read64(int base = 10); - wxUint32 Read32(int base = 10); - wxUint16 Read16(int base = 10); - wxUint8 Read8(int base = 10); - wxInt64 Read64S(int base = 10); - wxInt32 Read32S(int base = 10); - wxInt16 Read16S(int base = 10); - wxInt8 Read8S(int base = 10); - double ReadDouble(); - wxString ReadLine(); - wxString ReadWord(); - wxChar GetChar() { wxChar c = NextChar(); return (wxChar)(c != wxEOT ? c : 0); } - - wxString GetStringSeparators() const { return m_separators; } - void SetStringSeparators(const wxString &c) { m_separators = c; } - - // Operators - wxTextInputStream& operator>>(wxString& word); - wxTextInputStream& operator>>(char& c); -#if wxUSE_UNICODE && wxWCHAR_T_IS_REAL_TYPE - wxTextInputStream& operator>>(wchar_t& wc); -#endif // wxUSE_UNICODE - wxTextInputStream& operator>>(wxInt16& i); - wxTextInputStream& operator>>(wxInt32& i); - wxTextInputStream& operator>>(wxInt64& i); - wxTextInputStream& operator>>(wxUint16& i); - wxTextInputStream& operator>>(wxUint32& i); - wxTextInputStream& operator>>(wxUint64& i); - wxTextInputStream& operator>>(double& i); - wxTextInputStream& operator>>(float& f); - - wxTextInputStream& operator>>( __wxTextInputManip func) { return func(*this); } - -protected: - wxInputStream &m_input; - wxString m_separators; - char m_lastBytes[10]; // stores the bytes that were read for the last character - -#if wxUSE_UNICODE - wxMBConv *m_conv; - - // The second half of a surrogate character when using UTF-16 for wchar_t: - // we can't return it immediately from GetChar() when we read a Unicode - // code point outside of the BMP, but we can't keep it in m_lastBytes - // neither because it can't separately decoded, so we have a separate 1 - // wchar_t buffer just for this case. -#if SIZEOF_WCHAR_T == 2 - wchar_t m_lastWChar; -#endif // SIZEOF_WCHAR_T == 2 -#endif // wxUSE_UNICODE - - bool EatEOL(const wxChar &c); - void UngetLast(); // should be used instead of wxInputStream::Ungetch() because of Unicode issues - // returns EOT (\4) if there is a stream error, or end of file - wxChar NextChar(); // this should be used instead of GetC() because of Unicode issues - wxChar NextNonSeparators(); - - wxDECLARE_NO_COPY_CLASS(wxTextInputStream); -}; - -enum wxEOL -{ - wxEOL_NATIVE, - wxEOL_UNIX, - wxEOL_MAC, - wxEOL_DOS -}; - -class WXDLLIMPEXP_BASE wxTextOutputStream -{ -public: -#if wxUSE_UNICODE - wxTextOutputStream(wxOutputStream& s, - wxEOL mode = wxEOL_NATIVE, - const wxMBConv& conv = wxConvAuto()); -#else - wxTextOutputStream(wxOutputStream& s, wxEOL mode = wxEOL_NATIVE); -#endif - virtual ~wxTextOutputStream(); - - const wxOutputStream& GetOutputStream() const { return m_output; } - - void SetMode( wxEOL mode = wxEOL_NATIVE ); - wxEOL GetMode() { return m_mode; } - - template - void Write(const T& i) - { - wxString str; - str << i; - - WriteString(str); - } - - void Write64(wxUint64 i); - void Write32(wxUint32 i); - void Write16(wxUint16 i); - void Write8(wxUint8 i); - virtual void WriteDouble(double d); - virtual void WriteString(const wxString& string); - - wxTextOutputStream& PutChar(wxChar c); - - void Flush(); - - wxTextOutputStream& operator<<(const wxString& string); - wxTextOutputStream& operator<<(char c); -#if wxUSE_UNICODE && wxWCHAR_T_IS_REAL_TYPE - wxTextOutputStream& operator<<(wchar_t wc); -#endif // wxUSE_UNICODE - wxTextOutputStream& operator<<(wxInt16 c); - wxTextOutputStream& operator<<(wxInt32 c); - wxTextOutputStream& operator<<(wxInt64 c); - wxTextOutputStream& operator<<(wxUint16 c); - wxTextOutputStream& operator<<(wxUint32 c); - wxTextOutputStream& operator<<(wxUint64 c); - wxTextOutputStream& operator<<(double f); - wxTextOutputStream& operator<<(float f); - - wxTextOutputStream& operator<<( __wxTextOutputManip func) { return func(*this); } - -protected: - wxOutputStream &m_output; - wxEOL m_mode; - -#if wxUSE_UNICODE - wxMBConv *m_conv; - -#if SIZEOF_WCHAR_T == 2 - // The first half of a surrogate character if one was passed to PutChar() - // and couldn't be output when it was called the last time. - wchar_t m_lastWChar; -#endif // SIZEOF_WCHAR_T == 2 -#endif // wxUSE_UNICODE - - wxDECLARE_NO_COPY_CLASS(wxTextOutputStream); -}; - -#endif - // wxUSE_STREAMS - -#endif - // _WX_DATSTREAM_H_ diff --git a/Externals/wxWidgets3/include/wx/typeinfo.h b/Externals/wxWidgets3/include/wx/typeinfo.h deleted file mode 100644 index a783af5d56..0000000000 --- a/Externals/wxWidgets3/include/wx/typeinfo.h +++ /dev/null @@ -1,147 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/typeinfo.h -// Purpose: wxTypeId implementation -// Author: Jaakko Salli -// Created: 2009-11-19 -// Copyright: (c) wxWidgets Team -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_TYPEINFO_H_ -#define _WX_TYPEINFO_H_ - -// -// This file defines wxTypeId macro that should be used internally in -// wxWidgets instead of typeid(), for compatibility with builds that do -// not implement C++ RTTI. Also, type defining macros in this file are -// intended for internal use only at this time and may change in future -// versions. -// -// The reason why we need this simple RTTI system in addition to the older -// wxObject-based one is that the latter does not work in template -// classes. -// - -#include "wx/defs.h" - -#ifndef wxNO_RTTI - -// -// Let's trust that Visual C++ versions 9.0 and later implement C++ -// RTTI well enough, so we can use it and work around harmless memory -// leaks reported by the static run-time libraries. -// -#if wxCHECK_VISUALC_VERSION(9) - #define wxTRUST_CPP_RTTI 1 -#else - #define wxTRUST_CPP_RTTI 0 -#endif - -#include -#include - -#define _WX_DECLARE_TYPEINFO_CUSTOM(CLS, IDENTFUNC) -#define WX_DECLARE_TYPEINFO_INLINE(CLS) -#define WX_DECLARE_TYPEINFO(CLS) -#define WX_DEFINE_TYPEINFO(CLS) -#define WX_DECLARE_ABSTRACT_TYPEINFO(CLS) - -#if wxTRUST_CPP_RTTI - -#define wxTypeId typeid - -#else /* !wxTRUST_CPP_RTTI */ - -// -// For improved type-safety, let's make the check using class name -// comparison. Most modern compilers already do this, but we cannot -// rely on all supported compilers to work this well. However, in -// cases where we'd know that typeid() would be flawless (as such), -// wxTypeId could of course simply be defined as typeid. -// - -class wxTypeIdentifier -{ -public: - wxTypeIdentifier(const char* className) - { - m_className = className; - } - - bool operator==(const wxTypeIdentifier& other) - { - return strcmp(m_className, other.m_className) == 0; - } - - bool operator!=(const wxTypeIdentifier& other) - { - return strcmp(m_className, other.m_className) != 0; - } -private: - const char* m_className; -}; - -#define wxTypeId(OBJ) wxTypeIdentifier(typeid(OBJ).name()) - -#endif /* wxTRUST_CPP_RTTI/!wxTRUST_CPP_RTTI */ - -#else // if !wxNO_RTTI - -#define wxTRUST_CPP_RTTI 0 - -// -// When C++ RTTI is not available, we will have to make the type comparison -// using pointer to a dummy static member function. This will fail if -// declared type is used across DLL boundaries, although using -// WX_DECLARE_TYPEINFO() and WX_DEFINE_TYPEINFO() pair instead of -// WX_DECLARE_TYPEINFO_INLINE() should fix this. However, that approach is -// usually not possible when type info needs to be declared for a template -// class. -// - -typedef void (*wxTypeIdentifier)(); - -// Use this macro to declare type info with specified static function -// IDENTFUNC used as type identifier. Usually you should only use -// WX_DECLARE_TYPEINFO() or WX_DECLARE_TYPEINFO_INLINE() however. -#define _WX_DECLARE_TYPEINFO_CUSTOM(CLS, IDENTFUNC) \ -public: \ - virtual wxTypeIdentifier GetWxTypeId() const \ - { \ - return reinterpret_cast \ - (&IDENTFUNC); \ - } - -// Use this macro to declare type info with externally specified -// type identifier, defined with WX_DEFINE_TYPEINFO(). -#define WX_DECLARE_TYPEINFO(CLS) \ -private: \ - static CLS sm_wxClassInfo(); \ -_WX_DECLARE_TYPEINFO_CUSTOM(CLS, sm_wxClassInfo) - -// Use this macro to implement type identifier function required by -// WX_DECLARE_TYPEINFO(). -// NOTE: CLS is required to have default ctor. If it doesn't -// already, you should provide a private dummy one. -#define WX_DEFINE_TYPEINFO(CLS) \ -CLS CLS::sm_wxClassInfo() { return CLS(); } - -// Use this macro to declare type info fully inline in class. -// NOTE: CLS is required to have default ctor. If it doesn't -// already, you should provide a private dummy one. -#define WX_DECLARE_TYPEINFO_INLINE(CLS) \ -private: \ - static CLS sm_wxClassInfo() { return CLS(); } \ -_WX_DECLARE_TYPEINFO_CUSTOM(CLS, sm_wxClassInfo) - -#define wxTypeId(OBJ) (OBJ).GetWxTypeId() - -// Because abstract classes cannot be instantiated, we use -// this macro to define pure virtual type interface for them. -#define WX_DECLARE_ABSTRACT_TYPEINFO(CLS) \ -public: \ - virtual wxTypeIdentifier GetWxTypeId() const = 0; - -#endif // wxNO_RTTI/!wxNO_RTTI - -#endif // _WX_TYPEINFO_H_ diff --git a/Externals/wxWidgets3/include/wx/types.h b/Externals/wxWidgets3/include/wx/types.h deleted file mode 100644 index 2e58582168..0000000000 --- a/Externals/wxWidgets3/include/wx/types.h +++ /dev/null @@ -1,92 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/types.h -// Purpose: Type identifiers, used by resource system -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_TYPESH__ -#define _WX_TYPESH__ - -// Types of objects -#define wxTYPE_ANY 0 -#define wxTYPE_OBJECT wxTYPE_ANY -#define wxTYPE_WINDOW 1 -#define wxTYPE_DIALOG_BOX 2 -#define wxTYPE_ITEM 3 -#define wxTYPE_PANEL 4 -#define wxTYPE_CANVAS 5 -#define wxTYPE_TEXT_WINDOW 6 -#define wxTYPE_FRAME 7 - -#define wxTYPE_BUTTON 8 -#define wxTYPE_TEXT 9 -#define wxTYPE_MESSAGE 10 -#define wxTYPE_CHOICE 11 -#define wxTYPE_LIST_BOX 12 -#define wxTYPE_SLIDER 13 -#define wxTYPE_CHECK_BOX 14 -#define wxTYPE_MENU 15 -#define wxTYPE_MENU_BAR 16 -#define wxTYPE_MULTI_TEXT 17 -#define wxTYPE_RADIO_BOX 18 -#define wxTYPE_GROUP_BOX 19 -#define wxTYPE_GAUGE 20 -#define wxTYPE_SCROLL_BAR 21 -#define wxTYPE_VIRT_LIST_BOX 22 -#define wxTYPE_COMBO_BOX 23 -#define wxTYPE_RADIO_BUTTON 24 - -#define wxTYPE_EVENT 25 -#define wxTYPE_DC 26 -#define wxTYPE_DC_CANVAS 27 -#define wxTYPE_DC_POSTSCRIPT 28 -#define wxTYPE_DC_PRINTER 29 -#define wxTYPE_DC_METAFILE 30 -#define wxTYPE_DC_MEMORY 31 -#define wxTYPE_MOUSE_EVENT 32 -#define wxTYPE_KEY_EVENT 33 -#define wxTYPE_COMMAND_EVENT 34 -#define wxTYPE_DC_PANEL 35 - -#define wxTYPE_PEN 40 -#define wxTYPE_BRUSH 41 -#define wxTYPE_FONT 42 -#define wxTYPE_ICON 42 -#define wxTYPE_BITMAP 43 -#define wxTYPE_METAFILE 44 -#define wxTYPE_TIMER 45 -#define wxTYPE_COLOUR 46 -#define wxTYPE_COLOURMAP 47 -#define wxTYPE_CURSOR 48 - -#define wxTYPE_DDE_CLIENT 60 -#define wxTYPE_DDE_SERVER 61 -#define wxTYPE_DDE_CONNECTION 62 - -#define wxTYPE_HELP_INSTANCE 63 - -#define wxTYPE_LIST 70 -#define wxTYPE_STRING_LIST 71 -#define wxTYPE_HASH_TABLE 72 -#define wxTYPE_NODE 73 -#define wxTYPE_APP 74 -#define wxTYPE_DATE 75 - -#define wxTYPE_ENHANCED_DIALOG 80 -#define wxTYPE_TOOLBAR 81 -#define wxTYPE_BUTTONBAR 82 - -#define wxTYPE_DATABASE 90 -#define wxTYPE_QUERY_FIELD 91 -#define wxTYPE_QUERY_COL 92 -#define wxTYPE_RECORDSET 93 - -#define wxTYPE_USER 500 - -#endif - // _WX_TYPESH__ - diff --git a/Externals/wxWidgets3/include/wx/uiaction.h b/Externals/wxWidgets3/include/wx/uiaction.h deleted file mode 100644 index 498da69821..0000000000 --- a/Externals/wxWidgets3/include/wx/uiaction.h +++ /dev/null @@ -1,93 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/uiaction.h -// Purpose: wxUIActionSimulator interface -// Author: Kevin Ollivier, Steven Lamerton, Vadim Zeitlin -// Modified by: -// Created: 2010-03-06 -// Copyright: (c) Kevin Ollivier -// (c) 2010 Steven Lamerton -// (c) 2010 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_UIACTIONSIMULATOR_H_ -#define _WX_UIACTIONSIMULATOR_H_ - -#include "wx/defs.h" - -#if wxUSE_UIACTIONSIMULATOR - -#include "wx/mousestate.h" // for wxMOUSE_BTN_XXX constants - -class WXDLLIMPEXP_CORE wxUIActionSimulator -{ -public: - wxUIActionSimulator() { } - - - // Default dtor, copy ctor and assignment operator are ok (even though the - // last two don't make much sense for this class). - - - // Mouse simulation - // ---------------- - - // Low level methods - bool MouseMove(long x, long y); - bool MouseMove(const wxPoint& point) { return MouseMove(point.x, point.y); } - - bool MouseDown(int button = wxMOUSE_BTN_LEFT); - bool MouseUp(int button = wxMOUSE_BTN_LEFT); - - // Higher level interface, use it if possible instead - bool MouseClick(int button = wxMOUSE_BTN_LEFT); - bool MouseDblClick(int button = wxMOUSE_BTN_LEFT); - bool MouseDragDrop(long x1, long y1, long x2, long y2, - int button = wxMOUSE_BTN_LEFT); - bool MouseDragDrop(const wxPoint& p1, const wxPoint& p2, - int button = wxMOUSE_BTN_LEFT) - { return MouseDragDrop(p1.x, p1.y, p2.x, p2.y, button); } - - // Keyboard simulation - // ------------------- - - // Low level methods for generating key presses and releases - bool KeyDown(int keycode, int modifiers = wxMOD_NONE) - { return Key(keycode, modifiers, true); } - - bool KeyUp(int keycode, int modifiers = wxMOD_NONE) - { return Key(keycode, modifiers, false); } - - // Higher level methods for generating both the key press and release for a - // single key or for all characters in the ASCII string "text" which can currently - // contain letters, digits and characters for the definition of numbers [+-., ]. - bool Char(int keycode, int modifiers = wxMOD_NONE); - - bool Text(const char *text); - - // Select the item with the given text in the currently focused control. - bool Select(const wxString& text); - -private: - // This is the common part of Key{Down,Up}() methods: while we keep them - // separate at public API level for consistency with Mouse{Down,Up}(), at - // implementation level it makes more sense to have them in a single - // function. - // - // It calls DoModifiers() to simulate pressing the modifier keys if - // necessary and then DoKey() for the key itself. - bool Key(int keycode, int modifiers, bool isDown); - - // Call DoKey() for all modifier keys whose bits are set in the parameter. - void SimulateModifiers(int modifier, bool isDown); - - - // The low-level port-specific function which really generates the key - // presses. It should generate exactly one key event with the given - // parameters. - bool DoKey(int keycode, int modifiers, bool isDown); -}; - -#endif // wxUSE_UIACTIONSIMULATOR - -#endif // _WX_UIACTIONSIMULATOR_H_ diff --git a/Externals/wxWidgets3/include/wx/unichar.h b/Externals/wxWidgets3/include/wx/unichar.h deleted file mode 100644 index a966d5909e..0000000000 --- a/Externals/wxWidgets3/include/wx/unichar.h +++ /dev/null @@ -1,338 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/unichar.h -// Purpose: wxUniChar and wxUniCharRef classes -// Author: Vaclav Slavik -// Created: 2007-03-19 -// Copyright: (c) 2007 REA Elektronik GmbH -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_UNICHAR_H_ -#define _WX_UNICHAR_H_ - -#include "wx/defs.h" -#include "wx/chartype.h" -#include "wx/stringimpl.h" - -#include // only for std::swap specialization below - -class WXDLLIMPEXP_FWD_BASE wxUniCharRef; -class WXDLLIMPEXP_FWD_BASE wxString; - -// This class represents single Unicode character. It can be converted to -// and from char or wchar_t and implements commonly used character operations. -class WXDLLIMPEXP_BASE wxUniChar -{ -public: - // NB: this is not wchar_t on purpose, it needs to represent the entire - // Unicode code points range and wchar_t may be too small for that - // (e.g. on Win32 where wchar_t* is encoded in UTF-16) - typedef wxUint32 value_type; - - wxUniChar() : m_value(0) {} - - // Create the character from 8bit character value encoded in the current - // locale's charset. - wxUniChar(char c) { m_value = From8bit(c); } - wxUniChar(unsigned char c) { m_value = From8bit((char)c); } - -#define wxUNICHAR_DEFINE_CTOR(type) \ - wxUniChar(type c) { m_value = (value_type)c; } - wxDO_FOR_INT_TYPES(wxUNICHAR_DEFINE_CTOR) -#undef wxUNICHAR_DEFINE_CTOR - - wxUniChar(const wxUniCharRef& c); - - // Returns Unicode code point value of the character - value_type GetValue() const { return m_value; } - -#if wxUSE_UNICODE_UTF8 - // buffer for single UTF-8 character - struct Utf8CharBuffer - { - char data[5]; - operator const char*() const { return data; } - }; - - // returns the character encoded as UTF-8 - // (NB: implemented in stringops.cpp) - Utf8CharBuffer AsUTF8() const; -#endif // wxUSE_UNICODE_UTF8 - - // Returns true if the character is an ASCII character: - bool IsAscii() const { return m_value < 0x80; } - - // Returns true if the character is representable as a single byte in the - // current locale encoding and return this byte in output argument c (which - // must be non-NULL) - bool GetAsChar(char *c) const - { -#if wxUSE_UNICODE - if ( !IsAscii() ) - { -#if !wxUSE_UTF8_LOCALE_ONLY - if ( GetAsHi8bit(m_value, c) ) - return true; -#endif // !wxUSE_UTF8_LOCALE_ONLY - - return false; - } -#endif // wxUSE_UNICODE - - *c = wx_truncate_cast(char, m_value); - return true; - } - - // Conversions to char and wchar_t types: all of those are needed to be - // able to pass wxUniChars to verious standard narrow and wide character - // functions - operator char() const { return To8bit(m_value); } - operator unsigned char() const { return (unsigned char)To8bit(m_value); } - -#define wxUNICHAR_DEFINE_OPERATOR_PAREN(type) \ - operator type() const { return (type)m_value; } - wxDO_FOR_INT_TYPES(wxUNICHAR_DEFINE_OPERATOR_PAREN) -#undef wxUNICHAR_DEFINE_OPERATOR_PAREN - - // We need this operator for the "*p" part of expressions like "for ( - // const_iterator p = begin() + nStart; *p; ++p )". In this case, - // compilation would fail without it because the conversion to bool would - // be ambiguous (there are all these int types conversions...). (And adding - // operator unspecified_bool_type() would only makes the ambiguity worse.) - operator bool() const { return m_value != 0; } - bool operator!() const { return !((bool)*this); } - - // And this one is needed by some (not all, but not using ifdefs makes the - // code easier) compilers to parse "str[0] && *p" successfully - bool operator&&(bool v) const { return (bool)*this && v; } - - // Assignment operators: - wxUniChar& operator=(const wxUniChar& c) { if (&c != this) m_value = c.m_value; return *this; } - wxUniChar& operator=(const wxUniCharRef& c); - wxUniChar& operator=(char c) { m_value = From8bit(c); return *this; } - wxUniChar& operator=(unsigned char c) { m_value = From8bit((char)c); return *this; } - -#define wxUNICHAR_DEFINE_OPERATOR_EQUAL(type) \ - wxUniChar& operator=(type c) { m_value = (value_type)c; return *this; } - wxDO_FOR_INT_TYPES(wxUNICHAR_DEFINE_OPERATOR_EQUAL) -#undef wxUNICHAR_DEFINE_OPERATOR_EQUAL - - // Comparison operators: -#define wxDEFINE_UNICHAR_CMP_WITH_INT(T, op) \ - bool operator op(T c) const { return m_value op (value_type)c; } - - // define the given comparison operator for all the types -#define wxDEFINE_UNICHAR_OPERATOR(op) \ - bool operator op(const wxUniChar& c) const { return m_value op c.m_value; }\ - bool operator op(char c) const { return m_value op From8bit(c); } \ - bool operator op(unsigned char c) const { return m_value op From8bit((char)c); } \ - wxDO_FOR_INT_TYPES_1(wxDEFINE_UNICHAR_CMP_WITH_INT, op) - - wxFOR_ALL_COMPARISONS(wxDEFINE_UNICHAR_OPERATOR) - -#undef wxDEFINE_UNICHAR_OPERATOR -#undef wxDEFINE_UNCHAR_CMP_WITH_INT - - // this is needed for expressions like 'Z'-c - int operator-(const wxUniChar& c) const { return m_value - c.m_value; } - int operator-(char c) const { return m_value - From8bit(c); } - int operator-(unsigned char c) const { return m_value - From8bit((char)c); } - int operator-(wchar_t c) const { return m_value - (value_type)c; } - - -private: - // notice that we implement these functions inline for 7-bit ASCII - // characters purely for performance reasons - static value_type From8bit(char c) - { -#if wxUSE_UNICODE - if ( (unsigned char)c < 0x80 ) - return c; - - return FromHi8bit(c); -#else - return c; -#endif - } - - static char To8bit(value_type c) - { -#if wxUSE_UNICODE - if ( c < 0x80 ) - return wx_truncate_cast(char, c); - - return ToHi8bit(c); -#else - return wx_truncate_cast(char, c); -#endif - } - - // helpers of the functions above called to deal with non-ASCII chars - static value_type FromHi8bit(char c); - static char ToHi8bit(value_type v); - static bool GetAsHi8bit(value_type v, char *c); - -private: - value_type m_value; -}; - - -// Writeable reference to a character in wxString. -// -// This class can be used in the same way wxChar is used, except that changing -// its value updates the underlying string object. -class WXDLLIMPEXP_BASE wxUniCharRef -{ -private: - typedef wxStringImpl::iterator iterator; - - // create the reference -#if wxUSE_UNICODE_UTF8 - wxUniCharRef(wxString& str, iterator pos) : m_str(str), m_pos(pos) {} -#else - wxUniCharRef(iterator pos) : m_pos(pos) {} -#endif - -public: - // NB: we have to make this public, because we don't have wxString - // declaration available here and so can't declare wxString::iterator - // as friend; so at least don't use a ctor but a static function - // that must be used explicitly (this is more than using 'explicit' - // keyword on ctor!): -#if wxUSE_UNICODE_UTF8 - static wxUniCharRef CreateForString(wxString& str, iterator pos) - { return wxUniCharRef(str, pos); } -#else - static wxUniCharRef CreateForString(iterator pos) - { return wxUniCharRef(pos); } -#endif - - wxUniChar::value_type GetValue() const { return UniChar().GetValue(); } - -#if wxUSE_UNICODE_UTF8 - wxUniChar::Utf8CharBuffer AsUTF8() const { return UniChar().AsUTF8(); } -#endif // wxUSE_UNICODE_UTF8 - - bool IsAscii() const { return UniChar().IsAscii(); } - bool GetAsChar(char *c) const { return UniChar().GetAsChar(c); } - - // Assignment operators: -#if wxUSE_UNICODE_UTF8 - wxUniCharRef& operator=(const wxUniChar& c); -#else - wxUniCharRef& operator=(const wxUniChar& c) { *m_pos = c; return *this; } -#endif - - wxUniCharRef& operator=(const wxUniCharRef& c) - { if (&c != this) *this = c.UniChar(); return *this; } - -#define wxUNICHAR_REF_DEFINE_OPERATOR_EQUAL(type) \ - wxUniCharRef& operator=(type c) { return *this = wxUniChar(c); } - wxDO_FOR_CHAR_INT_TYPES(wxUNICHAR_REF_DEFINE_OPERATOR_EQUAL) -#undef wxUNICHAR_REF_DEFINE_OPERATOR_EQUAL - - // Conversions to the same types as wxUniChar is convertible too: -#define wxUNICHAR_REF_DEFINE_OPERATOR_PAREN(type) \ - operator type() const { return UniChar(); } - wxDO_FOR_CHAR_INT_TYPES(wxUNICHAR_REF_DEFINE_OPERATOR_PAREN) -#undef wxUNICHAR_REF_DEFINE_OPERATOR_PAREN - - // see wxUniChar::operator bool etc. for explanation - operator bool() const { return (bool)UniChar(); } - bool operator!() const { return !UniChar(); } - bool operator&&(bool v) const { return UniChar() && v; } - -#define wxDEFINE_UNICHARREF_CMP_WITH_INT(T, op) \ - bool operator op(T c) const { return UniChar() op c; } - - // Comparison operators: -#define wxDEFINE_UNICHARREF_OPERATOR(op) \ - bool operator op(const wxUniCharRef& c) const { return UniChar() op c.UniChar(); }\ - bool operator op(const wxUniChar& c) const { return UniChar() op c; } \ - wxDO_FOR_CHAR_INT_TYPES_1(wxDEFINE_UNICHARREF_CMP_WITH_INT, op) - - wxFOR_ALL_COMPARISONS(wxDEFINE_UNICHARREF_OPERATOR) - -#undef wxDEFINE_UNICHARREF_OPERATOR -#undef wxDEFINE_UNICHARREF_CMP_WITH_INT - - // for expressions like c-'A': - int operator-(const wxUniCharRef& c) const { return UniChar() - c.UniChar(); } - int operator-(const wxUniChar& c) const { return UniChar() - c; } - int operator-(char c) const { return UniChar() - c; } - int operator-(unsigned char c) const { return UniChar() - c; } - int operator-(wchar_t c) const { return UniChar() - c; } - -private: -#if wxUSE_UNICODE_UTF8 - wxUniChar UniChar() const; -#else - wxUniChar UniChar() const { return *m_pos; } -#endif - - friend class WXDLLIMPEXP_FWD_BASE wxUniChar; - -private: - // reference to the string and pointer to the character in string -#if wxUSE_UNICODE_UTF8 - wxString& m_str; -#endif - iterator m_pos; -}; - -inline wxUniChar::wxUniChar(const wxUniCharRef& c) -{ - m_value = c.UniChar().m_value; -} - -inline wxUniChar& wxUniChar::operator=(const wxUniCharRef& c) -{ - m_value = c.UniChar().m_value; - return *this; -} - -// wxUniCharRef doesn't behave quite like a reference, notably because template -// deduction from wxUniCharRef doesn't yield wxUniChar as would have been the -// case if it were a real reference. This results in a number of problems and -// we can't fix all of them but we can at least provide a working swap() for -// it, instead of the default version which doesn't work because a "wrong" type -// is deduced. -namespace std -{ - -template <> -inline -void swap(wxUniCharRef& lhs, wxUniCharRef& rhs) -{ - if ( &lhs != &rhs ) - { - // The use of wxUniChar here is the crucial difference: in the default - // implementation, tmp would be wxUniCharRef and so assigning to lhs - // would modify it too. Here we make a real copy, not affected by - // changing lhs, instead. - wxUniChar tmp = lhs; - lhs = rhs; - rhs = tmp; - } -} - -} // namespace std - - -// Comparison operators for the case when wxUniChar(Ref) is the second operand -// implemented in terms of member comparison functions - -wxDEFINE_COMPARISONS_BY_REV(char, const wxUniChar&) -wxDEFINE_COMPARISONS_BY_REV(char, const wxUniCharRef&) - -wxDEFINE_COMPARISONS_BY_REV(wchar_t, const wxUniChar&) -wxDEFINE_COMPARISONS_BY_REV(wchar_t, const wxUniCharRef&) - -wxDEFINE_COMPARISONS_BY_REV(const wxUniChar&, const wxUniCharRef&) - -// for expressions like c-'A': -inline int operator-(char c1, const wxUniCharRef& c2) { return -(c2 - c1); } -inline int operator-(const wxUniChar& c1, const wxUniCharRef& c2) { return -(c2 - c1); } -inline int operator-(wchar_t c1, const wxUniCharRef& c2) { return -(c2 - c1); } - -#endif /* _WX_UNICHAR_H_ */ diff --git a/Externals/wxWidgets3/include/wx/unix/app.h b/Externals/wxWidgets3/include/wx/unix/app.h deleted file mode 100644 index 8b173548a8..0000000000 --- a/Externals/wxWidgets3/include/wx/unix/app.h +++ /dev/null @@ -1,73 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/unix/app.h -// Purpose: wxAppConsole implementation for Unix -// Author: Lukasz Michalski -// Created: 28/01/2005 -// Copyright: (c) Lukasz Michalski -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -//Ensure that sigset_t is being defined -#include - -class wxFDIODispatcher; -class wxFDIOHandler; -class wxWakeUpPipe; - -// wxApp subclass implementing event processing for console applications -class WXDLLIMPEXP_BASE wxAppConsole : public wxAppConsoleBase -{ -public: - wxAppConsole(); - virtual ~wxAppConsole(); - - // override base class initialization - virtual bool Initialize(int& argc, wxChar** argv) wxOVERRIDE; - - - // Unix-specific: Unix signal handling - // ----------------------------------- - - // type of the function which can be registered as signal handler: notice - // that it isn't really a signal handler, i.e. it's not subject to the - // usual signal handlers constraints, because it is called later from - // CheckSignal() and not when the signal really occurs - typedef void (*SignalHandler)(int); - - // Set signal handler for the given signal, SIG_DFL or SIG_IGN can be used - // instead of a function pointer - // - // Return true if handler was installed, false on error - bool SetSignalHandler(int signal, SignalHandler handler); - - // Check if any Unix signals arrived since the last call and execute - // handlers for them - void CheckSignal(); - - // Register the signal wake up pipe with the given dispatcher. - // - // This is used by wxExecute(wxEXEC_NOEVENTS) implementation only. - // - // The pointer to the handler used for processing events on this descriptor - // is returned so that it can be deleted when we no longer needed it. - wxFDIOHandler* RegisterSignalWakeUpPipe(wxFDIODispatcher& dispatcher); - -private: - // signal handler set up by SetSignalHandler() for all signals we handle, - // it just adds the signal to m_signalsCaught -- the real processing is - // done later, when CheckSignal() is called - static void HandleSignal(int signal); - - - // signals for which HandleSignal() had been called (reset from - // CheckSignal()) - sigset_t m_signalsCaught; - - // the signal handlers - WX_DECLARE_HASH_MAP(int, SignalHandler, wxIntegerHash, wxIntegerEqual, SignalHandlerHash); - SignalHandlerHash m_signalHandlerHash; - - // pipe used for wake up signal handling: if a signal arrives while we're - // blocking for input, writing to this pipe triggers a call to our CheckSignal() - wxWakeUpPipe *m_signalWakeUpPipe; -}; diff --git a/Externals/wxWidgets3/include/wx/unix/apptbase.h b/Externals/wxWidgets3/include/wx/unix/apptbase.h deleted file mode 100644 index ff41981407..0000000000 --- a/Externals/wxWidgets3/include/wx/unix/apptbase.h +++ /dev/null @@ -1,67 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/unix/apptbase.h -// Purpose: declaration of wxAppTraits for Unix systems -// Author: Vadim Zeitlin -// Modified by: -// Created: 23.06.2003 -// Copyright: (c) 2003 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_UNIX_APPTBASE_H_ -#define _WX_UNIX_APPTBASE_H_ - -#include "wx/evtloop.h" -#include "wx/evtloopsrc.h" - -class wxExecuteData; -class wxFDIOManager; -class wxEventLoopSourcesManagerBase; - -// ---------------------------------------------------------------------------- -// wxAppTraits: the Unix version adds extra hooks needed by Unix code -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxAppTraits : public wxAppTraitsBase -{ -public: - // wxExecute() support methods - // --------------------------- - - // Wait for the process termination and return its exit code or -1 on error. - // - // Notice that this is only used when execData.flags contains wxEXEC_SYNC - // and does not contain wxEXEC_NOEVENTS, i.e. when we need to really wait - // until the child process exit and dispatch the events while doing it. - virtual int WaitForChild(wxExecuteData& execData); - -#if wxUSE_SOCKETS - // return a pointer to the object which should be used to integrate - // monitoring of the file descriptors to the event loop (currently this is - // used for the sockets only but should be used for arbitrary event loop - // sources in the future) - // - // this object may be different for the console and GUI applications - // - // the pointer is not deleted by the caller as normally it points to a - // static variable - virtual wxFDIOManager *GetFDIOManager(); -#endif // wxUSE_SOCKETS - -#if wxUSE_EVENTLOOP_SOURCE - // Return a non-NULL pointer to the object responsible for managing the - // event loop sources in this kind of application. - virtual wxEventLoopSourcesManagerBase* GetEventLoopSourcesManager(); -#endif // wxUSE_CONSOLE_EVENTLOOP - -protected: - // Wait for the process termination by running the given event loop until - // this happens. - // - // This is used by the public WaitForChild() after creating the event loop - // of the appropriate kind. - int RunLoopUntilChildExit(wxExecuteData& execData, wxEventLoopBase& loop); -}; - -#endif // _WX_UNIX_APPTBASE_H_ - diff --git a/Externals/wxWidgets3/include/wx/unix/apptrait.h b/Externals/wxWidgets3/include/wx/unix/apptrait.h deleted file mode 100644 index 1095a3c37b..0000000000 --- a/Externals/wxWidgets3/include/wx/unix/apptrait.h +++ /dev/null @@ -1,95 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/unix/apptrait.h -// Purpose: standard implementations of wxAppTraits for Unix -// Author: Vadim Zeitlin -// Modified by: -// Created: 23.06.2003 -// Copyright: (c) 2003 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_UNIX_APPTRAIT_H_ -#define _WX_UNIX_APPTRAIT_H_ - -// ---------------------------------------------------------------------------- -// wxGUI/ConsoleAppTraits: must derive from wxAppTraits, not wxAppTraitsBase -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxConsoleAppTraits : public wxConsoleAppTraitsBase -{ -public: -#if wxUSE_CONSOLE_EVENTLOOP - virtual wxEventLoopBase *CreateEventLoop() wxOVERRIDE; -#endif // wxUSE_CONSOLE_EVENTLOOP -#if wxUSE_TIMER - virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer) wxOVERRIDE; -#endif -}; - -#if wxUSE_GUI - -// GTK+ and Motif integrate sockets and child processes monitoring directly in -// their main loop, the other Unix ports do it at wxEventLoop level and so use -// the non-GUI traits and don't need anything here -// -// TODO: Should we use XtAddInput() for wxX11 too? Or, vice versa, if there is -// no advantage in doing this compared to the generic way currently used -// by wxX11, should we continue to use GTK/Motif-specific stuff? -#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXQT__) - #define wxHAS_GUI_FDIOMANAGER - #define wxHAS_GUI_PROCESS_CALLBACKS -#endif // ports using wxFDIOManager - -#if defined(__WXMAC__) - #define wxHAS_GUI_PROCESS_CALLBACKS - #define wxHAS_GUI_SOCKET_MANAGER -#endif - -class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase -{ -public: - virtual wxEventLoopBase *CreateEventLoop() wxOVERRIDE; - virtual int WaitForChild(wxExecuteData& execData) wxOVERRIDE; -#if wxUSE_TIMER - virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer) wxOVERRIDE; -#endif -#if wxUSE_THREADS && defined(__WXGTK20__) - virtual void MutexGuiEnter() wxOVERRIDE; - virtual void MutexGuiLeave() wxOVERRIDE; -#endif - - wxPortId GetToolkitVersion(int *majVer = NULL, - int *minVer = NULL, - int *microVer = NULL) const wxOVERRIDE; - -#ifdef __WXGTK20__ - virtual wxString GetDesktopEnvironment() const wxOVERRIDE; - virtual wxString GetStandardCmdLineOptions(wxArrayString& names, - wxArrayString& desc) const wxOVERRIDE; -#endif // __WXGTK20____ - -#if defined(__WXGTK20__) - virtual bool ShowAssertDialog(const wxString& msg) wxOVERRIDE; -#endif - -#if wxUSE_SOCKETS - -#ifdef wxHAS_GUI_SOCKET_MANAGER - virtual wxSocketManager *GetSocketManager() wxOVERRIDE; -#endif - -#ifdef wxHAS_GUI_FDIOMANAGER - virtual wxFDIOManager *GetFDIOManager() wxOVERRIDE; -#endif - -#endif // wxUSE_SOCKETS - -#if wxUSE_EVENTLOOP_SOURCE - virtual wxEventLoopSourcesManagerBase* GetEventLoopSourcesManager() wxOVERRIDE; -#endif -}; - -#endif // wxUSE_GUI - -#endif // _WX_UNIX_APPTRAIT_H_ - diff --git a/Externals/wxWidgets3/include/wx/unix/chkconf.h b/Externals/wxWidgets3/include/wx/unix/chkconf.h deleted file mode 100644 index b8a1904133..0000000000 --- a/Externals/wxWidgets3/include/wx/unix/chkconf.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Name: wx/unix/chkconf.h - * Purpose: Unix-specific config settings consistency checks - * Author: Vadim Zeitlin - * Created: 2007-07-14 - * Copyright: (c) 2007 Vadim Zeitlin - * Licence: wxWindows licence - */ - -/* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */ - -#if wxUSE_CONSOLE_EVENTLOOP -# if !wxUSE_SELECT_DISPATCHER && !wxUSE_EPOLL_DISPATCHER -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxSelect/EpollDispatcher needed for console event loop" -# else -# undef wxUSE_SELECT_DISPATCHER -# define wxUSE_SELECT_DISPATCHER 1 -# endif -# endif -#endif /* wxUSE_CONSOLE_EVENTLOOP */ - -#if wxUSE_FSWATCHER -# if !defined(wxHAS_INOTIFY) && !defined(wxHAS_KQUEUE) -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxFileSystemWatcher requires either inotify() or kqueue()" -# else -# undef wxUSE_FSWATCHER -# define wxUSE_FSWATCHER 0 -# endif -# endif -#endif /* wxUSE_FSWATCHER */ - -#if wxUSE_GSTREAMER -# if !wxUSE_THREADS -# ifdef wxABORT_ON_CONFIG_ERROR -# error "GStreamer requires threads" -# else -# undef wxUSE_GSTREAMER -# define wxUSE_GSTREAMER 0 -# endif -# endif -#endif /* wxUSE_GSTREAMER */ diff --git a/Externals/wxWidgets3/include/wx/unix/evtloop.h b/Externals/wxWidgets3/include/wx/unix/evtloop.h deleted file mode 100644 index 5c2d074620..0000000000 --- a/Externals/wxWidgets3/include/wx/unix/evtloop.h +++ /dev/null @@ -1,62 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/unix/evtloop.h -// Purpose: declares wxEventLoop class -// Author: Lukasz Michalski (lm@zork.pl) -// Created: 2007-05-07 -// Copyright: (c) 2007 Lukasz Michalski -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_UNIX_EVTLOOP_H_ -#define _WX_UNIX_EVTLOOP_H_ - -#if wxUSE_CONSOLE_EVENTLOOP - -// ---------------------------------------------------------------------------- -// wxConsoleEventLoop -// ---------------------------------------------------------------------------- - -class wxEventLoopSource; -class wxFDIODispatcher; -class wxWakeUpPipeMT; - -class WXDLLIMPEXP_BASE wxConsoleEventLoop -#ifdef __WXOSX__ -: public wxCFEventLoop -#else -: public wxEventLoopManual -#endif -{ -public: - // initialize the event loop, use IsOk() to check if we were successful - wxConsoleEventLoop(); - virtual ~wxConsoleEventLoop(); - - // implement base class pure virtuals - virtual bool Pending() const wxOVERRIDE; - virtual bool Dispatch() wxOVERRIDE; - virtual int DispatchTimeout(unsigned long timeout) wxOVERRIDE; - virtual void WakeUp() wxOVERRIDE; - virtual bool IsOk() const wxOVERRIDE { return m_dispatcher != NULL; } - -protected: - virtual void OnNextIteration() wxOVERRIDE; - virtual void DoYieldFor(long eventsToProcess) wxOVERRIDE; - -private: - // pipe used for wake up messages: when a child thread wants to wake up - // the event loop in the main thread it writes to this pipe - wxWakeUpPipeMT *m_wakeupPipe; - - // the event loop source used to monitor this pipe - wxEventLoopSource* m_wakeupSource; - - // either wxSelectDispatcher or wxEpollDispatcher - wxFDIODispatcher *m_dispatcher; - - wxDECLARE_NO_COPY_CLASS(wxConsoleEventLoop); -}; - -#endif // wxUSE_CONSOLE_EVENTLOOP - -#endif // _WX_UNIX_EVTLOOP_H_ diff --git a/Externals/wxWidgets3/include/wx/unix/evtloopsrc.h b/Externals/wxWidgets3/include/wx/unix/evtloopsrc.h deleted file mode 100644 index 4c2cfec167..0000000000 --- a/Externals/wxWidgets3/include/wx/unix/evtloopsrc.h +++ /dev/null @@ -1,48 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/unix/evtloopsrc.h -// Purpose: wxUnixEventLoopSource class -// Author: Vadim Zeitlin -// Created: 2009-10-21 -// Copyright: (c) 2009 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_UNIX_EVTLOOPSRC_H_ -#define _WX_UNIX_EVTLOOPSRC_H_ - -class wxFDIODispatcher; -class wxFDIOHandler; - -// ---------------------------------------------------------------------------- -// wxUnixEventLoopSource: wxEventLoopSource for Unix-like toolkits using fds -// ---------------------------------------------------------------------------- - -class wxUnixEventLoopSource : public wxEventLoopSource -{ -public: - // dispatcher and fdioHandler are only used here to allow us to unregister - // from the event loop when we're destroyed - wxUnixEventLoopSource(wxFDIODispatcher *dispatcher, - wxFDIOHandler *fdioHandler, - int fd, - wxEventLoopSourceHandler *handler, - int flags) - : wxEventLoopSource(handler, flags), - m_dispatcher(dispatcher), - m_fdioHandler(fdioHandler), - m_fd(fd) - { - } - - virtual ~wxUnixEventLoopSource(); - -private: - wxFDIODispatcher * const m_dispatcher; - wxFDIOHandler * const m_fdioHandler; - const int m_fd; - - wxDECLARE_NO_COPY_CLASS(wxUnixEventLoopSource); -}; - -#endif // _WX_UNIX_EVTLOOPSRC_H_ - diff --git a/Externals/wxWidgets3/include/wx/unix/fontutil.h b/Externals/wxWidgets3/include/wx/unix/fontutil.h deleted file mode 100644 index 1c189379b6..0000000000 --- a/Externals/wxWidgets3/include/wx/unix/fontutil.h +++ /dev/null @@ -1,36 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/unix/fontutil.h -// Purpose: font-related helper functions for Unix/X11 -// Author: Vadim Zeitlin -// Modified by: -// Created: 05.11.99 -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_UNIX_FONTUTIL_H_ -#define _WX_UNIX_FONTUTIL_H_ - -#ifdef __X__ - typedef WXFontStructPtr wxNativeFont; -#elif defined(__WXGTK__) - typedef GdkFont *wxNativeFont; -#else - #error "Unsupported toolkit" -#endif - -// returns the handle of the nearest available font or 0 -extern wxNativeFont -wxLoadQueryNearestFont(int pointSize, - wxFontFamily family, - wxFontStyle style, - wxFontWeight weight, - bool underlined, - const wxString &facename, - wxFontEncoding encoding, - wxString* xFontName = NULL); - -// returns the font specified by the given XLFD -extern wxNativeFont wxLoadFont(const wxString& fontSpec); - -#endif // _WX_UNIX_FONTUTIL_H_ diff --git a/Externals/wxWidgets3/include/wx/unix/fswatcher_inotify.h b/Externals/wxWidgets3/include/wx/unix/fswatcher_inotify.h deleted file mode 100644 index 1881966053..0000000000 --- a/Externals/wxWidgets3/include/wx/unix/fswatcher_inotify.h +++ /dev/null @@ -1,36 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/unix/fswatcher_inotify.h -// Purpose: wxInotifyFileSystemWatcher -// Author: Bartosz Bekier -// Created: 2009-05-26 -// Copyright: (c) 2009 Bartosz Bekier -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_FSWATCHER_UNIX_H_ -#define _WX_FSWATCHER_UNIX_H_ - -#include "wx/defs.h" - -#if wxUSE_FSWATCHER - -class WXDLLIMPEXP_BASE wxInotifyFileSystemWatcher : - public wxFileSystemWatcherBase -{ -public: - wxInotifyFileSystemWatcher(); - - wxInotifyFileSystemWatcher(const wxFileName& path, - int events = wxFSW_EVENT_ALL); - - virtual ~wxInotifyFileSystemWatcher(); - - void OnDirDeleted(const wxString& path); - -protected: - bool Init(); -}; - -#endif - -#endif /* _WX_FSWATCHER_UNIX_H_ */ diff --git a/Externals/wxWidgets3/include/wx/unix/fswatcher_kqueue.h b/Externals/wxWidgets3/include/wx/unix/fswatcher_kqueue.h deleted file mode 100644 index a324eb7efd..0000000000 --- a/Externals/wxWidgets3/include/wx/unix/fswatcher_kqueue.h +++ /dev/null @@ -1,34 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/unix/fswatcher_kqueue.h -// Purpose: wxKqueueFileSystemWatcher -// Author: Bartosz Bekier -// Created: 2009-05-26 -// Copyright: (c) 2009 Bartosz Bekier -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_FSWATCHER_KQUEUE_H_ -#define _WX_FSWATCHER_KQUEUE_H_ - -#include "wx/defs.h" - -#if wxUSE_FSWATCHER - -class WXDLLIMPEXP_BASE wxKqueueFileSystemWatcher : - public wxFileSystemWatcherBase -{ -public: - wxKqueueFileSystemWatcher(); - - wxKqueueFileSystemWatcher(const wxFileName& path, - int events = wxFSW_EVENT_ALL); - - virtual ~wxKqueueFileSystemWatcher(); - -protected: - bool Init(); -}; - -#endif - -#endif /* _WX_FSWATCHER_OSX_H_ */ diff --git a/Externals/wxWidgets3/include/wx/unix/glx11.h b/Externals/wxWidgets3/include/wx/unix/glx11.h deleted file mode 100644 index 9295687a4b..0000000000 --- a/Externals/wxWidgets3/include/wx/unix/glx11.h +++ /dev/null @@ -1,165 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/unix/glx11.h -// Purpose: class common for all X11-based wxGLCanvas implementations -// Author: Vadim Zeitlin -// Created: 2007-04-15 -// Copyright: (c) 2007 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_UNIX_GLX11_H_ -#define _WX_UNIX_GLX11_H_ - -#include - -class wxGLContextAttrs; -class wxGLAttributes; - -// ---------------------------------------------------------------------------- -// wxGLContext -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_GL wxGLContext : public wxGLContextBase -{ -public: - wxGLContext(wxGLCanvas *win, - const wxGLContext *other = NULL, - const wxGLContextAttrs *ctxAttrs = NULL); - virtual ~wxGLContext(); - - virtual bool SetCurrent(const wxGLCanvas& win) const wxOVERRIDE; - -private: - // attach context to the drawable or unset it (if NULL) - static bool MakeCurrent(GLXDrawable drawable, GLXContext context); - - GLXContext m_glContext; - - wxDECLARE_CLASS(wxGLContext); -}; - -// ---------------------------------------------------------------------------- -// wxGLCanvasX11 -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_GL wxGLCanvasX11 : public wxGLCanvasBase -{ -public: - // initialization and dtor - // ----------------------- - - // default ctor doesn't do anything, InitVisual() must be called - wxGLCanvasX11(); - - // initializes GLXFBConfig and XVisualInfo corresponding to the given attributes - bool InitVisual(const wxGLAttributes& dispAttrs); - - // frees XVisualInfo info - virtual ~wxGLCanvasX11(); - - - // implement wxGLCanvasBase methods - // -------------------------------- - - virtual bool SwapBuffers() wxOVERRIDE; - - - // X11-specific methods - // -------------------- - - // return GLX version: 13 means 1.3 &c - static int GetGLXVersion(); - - // return true if multisample extension is available - static bool IsGLXMultiSampleAvailable(); - - // get the X11 handle of this window - virtual Window GetXWindow() const = 0; - - - // GLX-specific methods - // -------------------- - - // override some wxWindow methods - // ------------------------------ - - // return true only if the window is realized: OpenGL context can't be - // created until we are - virtual bool IsShownOnScreen() const wxOVERRIDE; - - - // implementation only from now on - // ------------------------------- - - // get the GLXFBConfig/XVisualInfo we use - GLXFBConfig *GetGLXFBConfig() const { return m_fbc; } - XVisualInfo *GetXVisualInfo() const { return m_vi; } - - // initialize the global default GL visual, return false if matching visual - // not found - static bool InitDefaultVisualInfo(const int *attribList); - - // get the default GL X11 visual (may be NULL, shouldn't be freed by caller) - static XVisualInfo *GetDefaultXVisualInfo() { return ms_glVisualInfo; } - - // free the global GL visual, called by wxGLApp - static void FreeDefaultVisualInfo(); - - // initializes XVisualInfo (in any case) and, if supported, GLXFBConfig - // - // returns false if XVisualInfo couldn't be initialized, otherwise caller - // is responsible for freeing the pointers - static bool InitXVisualInfo(const wxGLAttributes& dispAttrs, - GLXFBConfig **pFBC, XVisualInfo **pXVisual); - -private: - - // this is only used if it's supported i.e. if GL >= 1.3 - GLXFBConfig *m_fbc; - - // used for all GL versions, obtained from GLXFBConfig for GL >= 1.3 - XVisualInfo *m_vi; - - // the global/default versions of the above - static GLXFBConfig *ms_glFBCInfo; - static XVisualInfo *ms_glVisualInfo; -}; - -// ---------------------------------------------------------------------------- -// wxGLApp -// ---------------------------------------------------------------------------- - -// this is used in wx/glcanvas.h, prevent it from defining a generic wxGLApp -#define wxGL_APP_DEFINED - -class WXDLLIMPEXP_GL wxGLApp : public wxGLAppBase -{ -public: - wxGLApp() : wxGLAppBase() { } - - // implement wxGLAppBase method - virtual bool InitGLVisual(const int *attribList) wxOVERRIDE - { - return wxGLCanvasX11::InitDefaultVisualInfo(attribList); - } - - // and implement this wxGTK::wxApp method too - virtual void *GetXVisualInfo() wxOVERRIDE - { - return wxGLCanvasX11::GetDefaultXVisualInfo(); - } - - // and override this wxApp method to clean up - virtual int OnExit() wxOVERRIDE - { - wxGLCanvasX11::FreeDefaultVisualInfo(); - - return wxGLAppBase::OnExit(); - } - -private: - wxDECLARE_DYNAMIC_CLASS(wxGLApp); -}; - -#endif // _WX_UNIX_GLX11_H_ - diff --git a/Externals/wxWidgets3/include/wx/unix/joystick.h b/Externals/wxWidgets3/include/wx/unix/joystick.h deleted file mode 100644 index a20c936d29..0000000000 --- a/Externals/wxWidgets3/include/wx/unix/joystick.h +++ /dev/null @@ -1,94 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/unix/joystick.h -// Purpose: wxJoystick class -// Author: Guilhem Lavaux -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Guilhem Lavaux -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_UNIX_JOYSTICK_H_ -#define _WX_UNIX_JOYSTICK_H_ - -#include "wx/event.h" - -class WXDLLIMPEXP_FWD_CORE wxJoystickThread; - -class WXDLLIMPEXP_ADV wxJoystick: public wxObject -{ - wxDECLARE_DYNAMIC_CLASS(wxJoystick); -public: - /* - * Public interface - */ - - wxJoystick(int joystick = wxJOYSTICK1); - virtual ~wxJoystick(); - - // Attributes - //////////////////////////////////////////////////////////////////////////// - - wxPoint GetPosition() const; - int GetPosition(unsigned axis) const; - bool GetButtonState(unsigned button) const; - int GetZPosition() const; - int GetButtonState() const; - int GetPOVPosition() const; - int GetPOVCTSPosition() const; - int GetRudderPosition() const; - int GetUPosition() const; - int GetVPosition() const; - int GetMovementThreshold() const; - void SetMovementThreshold(int threshold) ; - - // Capabilities - //////////////////////////////////////////////////////////////////////////// - - bool IsOk() const; // Checks that the joystick is functioning - static int GetNumberJoysticks() ; - int GetManufacturerId() const ; - int GetProductId() const ; - wxString GetProductName() const ; - int GetXMin() const; - int GetYMin() const; - int GetZMin() const; - int GetXMax() const; - int GetYMax() const; - int GetZMax() const; - int GetNumberButtons() const; - int GetNumberAxes() const; - int GetMaxButtons() const; - int GetMaxAxes() const; - int GetPollingMin() const; - int GetPollingMax() const; - int GetRudderMin() const; - int GetRudderMax() const; - int GetUMin() const; - int GetUMax() const; - int GetVMin() const; - int GetVMax() const; - - bool HasRudder() const; - bool HasZ() const; - bool HasU() const; - bool HasV() const; - bool HasPOV() const; - bool HasPOV4Dir() const; - bool HasPOVCTS() const; - - // Operations - //////////////////////////////////////////////////////////////////////////// - - // pollingFreq = 0 means that movement events are sent when above the threshold. - // If pollingFreq > 0, events are received every this many milliseconds. - bool SetCapture(wxWindow* win, int pollingFreq = 0); - bool ReleaseCapture(); - -protected: - int m_device; - int m_joystick; - wxJoystickThread* m_thread; -}; - -#endif // _WX_UNIX_JOYSTICK_H_ diff --git a/Externals/wxWidgets3/include/wx/unix/mimetype.h b/Externals/wxWidgets3/include/wx/unix/mimetype.h deleted file mode 100644 index 27b303bbe7..0000000000 --- a/Externals/wxWidgets3/include/wx/unix/mimetype.h +++ /dev/null @@ -1,172 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/unix/mimetype.h -// Purpose: classes and functions to manage MIME types -// Author: Vadim Zeitlin -// Modified by: -// Created: 23.09.98 -// Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows licence (part of wxExtra library) -///////////////////////////////////////////////////////////////////////////// - -#ifndef _MIMETYPE_IMPL_H -#define _MIMETYPE_IMPL_H - -#include "wx/mimetype.h" - -#if wxUSE_MIMETYPE - -class wxMimeTypeCommands; - -WX_DEFINE_ARRAY_PTR(wxMimeTypeCommands *, wxMimeCommandsArray); - -// this is the real wxMimeTypesManager for Unix -class WXDLLIMPEXP_BASE wxMimeTypesManagerImpl -{ -public: - // ctor and dtor - wxMimeTypesManagerImpl(); - virtual ~wxMimeTypesManagerImpl(); - - // load all data into memory - done when it is needed for the first time - void Initialize(int mailcapStyles = wxMAILCAP_ALL, - const wxString& extraDir = wxEmptyString); - - // and delete the data here - void ClearData(); - - // implement containing class functions - wxFileType *GetFileTypeFromExtension(const wxString& ext); - wxFileType *GetFileTypeFromMimeType(const wxString& mimeType); - - size_t EnumAllFileTypes(wxArrayString& mimetypes); - - void AddFallback(const wxFileTypeInfo& filetype); - - // add information about the given mimetype - void AddMimeTypeInfo(const wxString& mimetype, - const wxString& extensions, - const wxString& description); - void AddMailcapInfo(const wxString& strType, - const wxString& strOpenCmd, - const wxString& strPrintCmd, - const wxString& strTest, - const wxString& strDesc); - - // add a new record to the user .mailcap/.mime.types files - wxFileType *Associate(const wxFileTypeInfo& ftInfo); - // remove association - bool Unassociate(wxFileType *ft); - - // accessors - // get the string containing space separated extensions for the given - // file type - wxString GetExtension(size_t index) { return m_aExtensions[index]; } - -protected: - void InitIfNeeded(); - - wxArrayString m_aTypes, // MIME types - m_aDescriptions, // descriptions (just some text) - m_aExtensions, // space separated list of extensions - m_aIcons; // Icon filenames - - // verb=command pairs for this file type - wxMimeCommandsArray m_aEntries; - - // are we initialized? - bool m_initialized; - - wxString GetCommand(const wxString &verb, size_t nIndex) const; - - // Read XDG *.desktop file - void LoadXDGApp(const wxString& filename); - // Scan XDG directory - void LoadXDGAppsFilesFromDir(const wxString& dirname); - - // Load XDG globs files - void LoadXDGGlobs(const wxString& filename); - - // functions used to do associations - virtual int AddToMimeData(const wxString& strType, - const wxString& strIcon, - wxMimeTypeCommands *entry, - const wxArrayString& strExtensions, - const wxString& strDesc, - bool replaceExisting = true); - virtual bool DoAssociation(const wxString& strType, - const wxString& strIcon, - wxMimeTypeCommands *entry, - const wxArrayString& strExtensions, - const wxString& strDesc); - - // give it access to m_aXXX variables - friend class WXDLLIMPEXP_FWD_BASE wxFileTypeImpl; -}; - -class WXDLLIMPEXP_BASE wxFileTypeImpl -{ -public: - // initialization functions - // this is used to construct a list of mimetypes which match; - // if built with GetFileTypeFromMimetype index 0 has the exact match and - // index 1 the type / * match - // if built with GetFileTypeFromExtension, index 0 has the mimetype for - // the first extension found, index 1 for the second and so on - - void Init(wxMimeTypesManagerImpl *manager, size_t index) - { m_manager = manager; m_index.Add(index); } - - // accessors - bool GetExtensions(wxArrayString& extensions); - bool GetMimeType(wxString *mimeType) const - { *mimeType = m_manager->m_aTypes[m_index[0]]; return true; } - bool GetMimeTypes(wxArrayString& mimeTypes) const; - bool GetIcon(wxIconLocation *iconLoc) const; - - bool GetDescription(wxString *desc) const - { *desc = m_manager->m_aDescriptions[m_index[0]]; return true; } - - bool GetOpenCommand(wxString *openCmd, - const wxFileType::MessageParameters& params) const - { - *openCmd = GetExpandedCommand(wxT("open"), params); - return (! openCmd -> IsEmpty() ); - } - - bool GetPrintCommand(wxString *printCmd, - const wxFileType::MessageParameters& params) const - { - *printCmd = GetExpandedCommand(wxT("print"), params); - return (! printCmd -> IsEmpty() ); - } - - // return the number of commands defined for this file type, 0 if none - size_t GetAllCommands(wxArrayString *verbs, wxArrayString *commands, - const wxFileType::MessageParameters& params) const; - - - // remove the record for this file type - // probably a mistake to come here, use wxMimeTypesManager.Unassociate (ft) instead - bool Unassociate(wxFileType *ft) - { - return m_manager->Unassociate(ft); - } - - // set an arbitrary command, ask confirmation if it already exists and - // overwriteprompt is TRUE - bool SetCommand(const wxString& cmd, const wxString& verb, bool overwriteprompt = true); - bool SetDefaultIcon(const wxString& strIcon = wxEmptyString, int index = 0); - - wxString - GetExpandedCommand(const wxString & verb, - const wxFileType::MessageParameters& params) const; -private: - wxMimeTypesManagerImpl *m_manager; - wxArrayInt m_index; // in the wxMimeTypesManagerImpl arrays -}; - -#endif // wxUSE_MIMETYPE - -#endif // _MIMETYPE_IMPL_H - - diff --git a/Externals/wxWidgets3/include/wx/unix/pipe.h b/Externals/wxWidgets3/include/wx/unix/pipe.h deleted file mode 100644 index 1bde4228a7..0000000000 --- a/Externals/wxWidgets3/include/wx/unix/pipe.h +++ /dev/null @@ -1,102 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/unix/pipe.h -// Purpose: wxPipe class -// Author: Vadim Zeitlin -// Modified by: -// Created: 24.06.2003 (extracted from src/unix/utilsunx.cpp) -// Copyright: (c) 2003 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_UNIX_PIPE_H_ -#define _WX_UNIX_PIPE_H_ - -#include -#include - -#include "wx/log.h" -#include "wx/intl.h" - -// ---------------------------------------------------------------------------- -// wxPipe: this class encapsulates pipe() system call -// ---------------------------------------------------------------------------- - -class wxPipe -{ -public: - // the symbolic names for the pipe ends - enum Direction - { - Read, - Write - }; - - enum - { - INVALID_FD = -1 - }; - - // default ctor doesn't do anything - wxPipe() { m_fds[Read] = m_fds[Write] = INVALID_FD; } - - // create the pipe, return TRUE if ok, FALSE on error - bool Create() - { - if ( pipe(m_fds) == -1 ) - { - wxLogSysError(wxGetTranslation("Pipe creation failed")); - - return false; - } - - return true; - } - - // switch the given end of the pipe to non-blocking IO - bool MakeNonBlocking(Direction which) - { - const int flags = fcntl(m_fds[which], F_GETFL, 0); - if ( flags == -1 ) - return false; - - return fcntl(m_fds[which], F_SETFL, flags | O_NONBLOCK) == 0; - } - - // return TRUE if we were created successfully - bool IsOk() const { return m_fds[Read] != INVALID_FD; } - - // return the descriptor for one of the pipe ends - int operator[](Direction which) const { return m_fds[which]; } - - // detach a descriptor, meaning that the pipe dtor won't close it, and - // return it - int Detach(Direction which) - { - int fd = m_fds[which]; - m_fds[which] = INVALID_FD; - - return fd; - } - - // close the pipe descriptors - void Close() - { - for ( size_t n = 0; n < WXSIZEOF(m_fds); n++ ) - { - if ( m_fds[n] != INVALID_FD ) - { - close(m_fds[n]); - m_fds[n] = INVALID_FD; - } - } - } - - // dtor closes the pipe descriptors - ~wxPipe() { Close(); } - -private: - int m_fds[2]; -}; - -#endif // _WX_UNIX_PIPE_H_ - diff --git a/Externals/wxWidgets3/include/wx/unix/private.h b/Externals/wxWidgets3/include/wx/unix/private.h deleted file mode 100644 index fafc5435db..0000000000 --- a/Externals/wxWidgets3/include/wx/unix/private.h +++ /dev/null @@ -1,19 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/unix/private.h -// Purpose: miscellaneous private things for Unix wx ports -// Author: Vadim Zeitlin -// Created: 2005-09-25 -// Copyright: (c) 2005 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_UNIX_PRIVATE_H_ -#define _WX_UNIX_PRIVATE_H_ - -// this file is currently empty as its original contents was moved to -// include/wx/private/fd.h but let's keep it for now in case we need it for -// something again in the future -#include "wx/private/fd.h" - -#endif // _WX_UNIX_PRIVATE_H_ - diff --git a/Externals/wxWidgets3/include/wx/unix/private/epolldispatcher.h b/Externals/wxWidgets3/include/wx/unix/private/epolldispatcher.h deleted file mode 100644 index c73411f221..0000000000 --- a/Externals/wxWidgets3/include/wx/unix/private/epolldispatcher.h +++ /dev/null @@ -1,53 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/unix/private/epolldispatcher.h -// Purpose: wxEpollDispatcher class -// Authors: Lukasz Michalski -// Created: April 2007 -// Copyright: (c) Lukasz Michalski -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PRIVATE_EPOLLDISPATCHER_H_ -#define _WX_PRIVATE_EPOLLDISPATCHER_H_ - -#include "wx/defs.h" - -#ifdef wxUSE_EPOLL_DISPATCHER - -#include "wx/private/fdiodispatcher.h" - -struct epoll_event; - -class WXDLLIMPEXP_BASE wxEpollDispatcher : public wxFDIODispatcher -{ -public: - // create a new instance of this class, can return NULL if - // epoll() is not supported on this system - // - // the caller should delete the returned pointer - static wxEpollDispatcher *Create(); - - virtual ~wxEpollDispatcher(); - - // implement base class pure virtual methods - virtual bool RegisterFD(int fd, wxFDIOHandler* handler, int flags = wxFDIO_ALL); - virtual bool ModifyFD(int fd, wxFDIOHandler* handler, int flags = wxFDIO_ALL); - virtual bool UnregisterFD(int fd); - virtual bool HasPending() const; - virtual int Dispatch(int timeout = TIMEOUT_INFINITE); - -private: - // ctor is private, use Create() - wxEpollDispatcher(int epollDescriptor); - - // common part of HasPending() and Dispatch(): calls epoll_wait() with the - // given timeout - int DoPoll(epoll_event *events, int numEvents, int timeout) const; - - - int m_epollDescriptor; -}; - -#endif // wxUSE_EPOLL_DISPATCHER - -#endif // _WX_PRIVATE_SOCKETEVTDISPATCH_H_ diff --git a/Externals/wxWidgets3/include/wx/unix/private/execute.h b/Externals/wxWidgets3/include/wx/unix/private/execute.h deleted file mode 100644 index e976d154c7..0000000000 --- a/Externals/wxWidgets3/include/wx/unix/private/execute.h +++ /dev/null @@ -1,102 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/unix/private/execute.h -// Purpose: private details of wxExecute() implementation -// Author: Vadim Zeitlin -// Copyright: (c) 1998 Robert Roebling, Julian Smart, Vadim Zeitlin -// (c) 2013 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_UNIX_EXECUTE_H -#define _WX_UNIX_EXECUTE_H - -#include "wx/app.h" -#include "wx/hashmap.h" -#include "wx/process.h" - -#if wxUSE_STREAMS - #include "wx/unix/pipe.h" - #include "wx/private/streamtempinput.h" -#endif - -class wxEventLoopBase; - -// Information associated with a running child process. -class wxExecuteData -{ -public: - wxExecuteData() - { - flags = - pid = 0; - exitcode = -1; - - process = NULL; - - syncEventLoop = NULL; - -#if wxUSE_STREAMS - fdOut = - fdErr = wxPipe::INVALID_FD; -#endif // wxUSE_STREAMS - } - - // This must be called in the parent process as soon as fork() returns to - // update us with the effective child PID. It also ensures that we handle - // SIGCHLD to be able to detect when this PID exits, so wxTheApp must be - // available. - void OnStart(int pid); - - // Called when the child process exits. - void OnExit(int exitcode); - - // Return true if we should (or already did) redirect the child IO. - bool IsRedirected() const { return process && process->IsRedirected(); } - - - // wxExecute() flags - int flags; - - // the pid of the child process - int pid; - - // The exit code of the process, set once the child terminates. - int exitcode; - - // the associated process object or NULL - wxProcess *process; - - // Local event loop used to wait for the child process termination in - // synchronous execution case. We can't create it ourselves as its exact - // type depends on the application kind (console/GUI), so we rely on - // wxAppTraits setting up this pointer to point to the appropriate object. - wxEventLoopBase *syncEventLoop; - -#if wxUSE_STREAMS - // the input buffer bufOut is connected to stdout, this is why it is - // called bufOut and not bufIn - wxStreamTempInputBuffer bufOut, - bufErr; - - // the corresponding FDs, -1 if not redirected - int fdOut, - fdErr; -#endif // wxUSE_STREAMS - - -private: - // SIGCHLD signal handler that checks whether any of the currently running - // children have exited. - static void OnSomeChildExited(int sig); - - // All currently running child processes indexed by their PID. - // - // Notice that the container doesn't own its elements. - WX_DECLARE_HASH_MAP(int, wxExecuteData*, wxIntegerHash, wxIntegerEqual, - ChildProcessesData); - static ChildProcessesData ms_childProcesses; - - wxDECLARE_NO_COPY_CLASS(wxExecuteData); -}; - -#endif // _WX_UNIX_EXECUTE_H diff --git a/Externals/wxWidgets3/include/wx/unix/private/executeiohandler.h b/Externals/wxWidgets3/include/wx/unix/private/executeiohandler.h deleted file mode 100644 index 2a7c2d7aa3..0000000000 --- a/Externals/wxWidgets3/include/wx/unix/private/executeiohandler.h +++ /dev/null @@ -1,136 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/unix/private/executeiohandler.h -// Purpose: IO handler class for the FD used by wxExecute() under Unix -// Author: Rob Bresalier, Vadim Zeitlin -// Created: 2013-01-06 -// Copyright: (c) 2013 Rob Bresalier, Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_UNIX_PRIVATE_EXECUTEIOHANDLER_H_ -#define _WX_UNIX_PRIVATE_EXECUTEIOHANDLER_H_ - -#include "wx/private/streamtempinput.h" - -// This class handles IO events on the pipe FD connected to the child process -// stdout/stderr and is used by wxExecute(). -// -// Currently it can derive from either wxEventLoopSourceHandler or -// wxFDIOHandler depending on the kind of dispatcher/event loop it is used -// with. In the future, when we get rid of wxFDIOHandler entirely, it will -// derive from wxEventLoopSourceHandler only. -template -class wxExecuteIOHandlerBase : public T -{ -public: - wxExecuteIOHandlerBase(int fd, wxStreamTempInputBuffer& buf) - : m_fd(fd), - m_buf(buf) - { - m_callbackDisabled = false; - } - - // Called when the associated descriptor is available for reading. - virtual void OnReadWaiting() - { - // Sync process, process all data coming at us from the pipe so that - // the pipe does not get full and cause a deadlock situation. - m_buf.Update(); - - if ( m_buf.Eof() ) - DisableCallback(); - } - - // These methods are never called as we only monitor the associated FD for - // reading, but we still must implement them as they're pure virtual in the - // base class. - virtual void OnWriteWaiting() { } - virtual void OnExceptionWaiting() { } - - // Disable any future calls to our OnReadWaiting(), can be called when - // we're sure that no more input is forthcoming. - void DisableCallback() - { - if ( !m_callbackDisabled ) - { - m_callbackDisabled = true; - - DoDisable(); - } - } - -protected: - const int m_fd; - -private: - virtual void DoDisable() = 0; - - wxStreamTempInputBuffer& m_buf; - - // If true, DisableCallback() had been already called. - bool m_callbackDisabled; - - wxDECLARE_NO_COPY_CLASS(wxExecuteIOHandlerBase); -}; - -// This is the version used with wxFDIODispatcher, which must be passed to the -// ctor in order to register this handler with it. -class wxExecuteFDIOHandler : public wxExecuteIOHandlerBase -{ -public: - wxExecuteFDIOHandler(wxFDIODispatcher& dispatcher, - int fd, - wxStreamTempInputBuffer& buf) - : wxExecuteIOHandlerBase(fd, buf), - m_dispatcher(dispatcher) - { - dispatcher.RegisterFD(fd, this, wxFDIO_INPUT); - } - - virtual ~wxExecuteFDIOHandler() - { - DisableCallback(); - } - -private: - virtual void DoDisable() - { - m_dispatcher.UnregisterFD(m_fd); - } - - wxFDIODispatcher& m_dispatcher; - - wxDECLARE_NO_COPY_CLASS(wxExecuteFDIOHandler); -}; - -// And this is the version used with an event loop. As AddSourceForFD() is -// static, we don't require passing the event loop to the ctor but an event -// loop must be running to handle our events. -class wxExecuteEventLoopSourceHandler - : public wxExecuteIOHandlerBase -{ -public: - wxExecuteEventLoopSourceHandler(int fd, wxStreamTempInputBuffer& buf) - : wxExecuteIOHandlerBase(fd, buf) - { - m_source = wxEventLoop::AddSourceForFD(fd, this, wxEVENT_SOURCE_INPUT); - } - - virtual ~wxExecuteEventLoopSourceHandler() - { - DisableCallback(); - } - -private: - virtual void DoDisable() - { - delete m_source; - m_source = NULL; - } - - wxEventLoopSource* m_source; - - wxDECLARE_NO_COPY_CLASS(wxExecuteEventLoopSourceHandler); -}; - -#endif // _WX_UNIX_PRIVATE_EXECUTEIOHANDLER_H_ diff --git a/Externals/wxWidgets3/include/wx/unix/private/fdiounix.h b/Externals/wxWidgets3/include/wx/unix/private/fdiounix.h deleted file mode 100644 index 2807821e19..0000000000 --- a/Externals/wxWidgets3/include/wx/unix/private/fdiounix.h +++ /dev/null @@ -1,27 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/unix/private/fdiounix.h -// Purpose: wxFDIOManagerUnix class used by console Unix applications -// Author: Vadim Zeitlin -// Created: 2009-08-17 -// Copyright: (c) 2009 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _UNIX_PRIVATE_FDIOUNIX_H_ -#define _UNIX_PRIVATE_FDIOUNIX_H_ - -#include "wx/private/fdiomanager.h" - -// ---------------------------------------------------------------------------- -// wxFDIOManagerUnix: implement wxFDIOManager interface using wxFDIODispatcher -// ---------------------------------------------------------------------------- - -class wxFDIOManagerUnix : public wxFDIOManager -{ -public: - virtual int AddInput(wxFDIOHandler *handler, int fd, Direction d); - virtual void RemoveInput(wxFDIOHandler *handler, int fd, Direction d); -}; - -#endif // _UNIX_PRIVATE_FDIOUNIX_H_ - diff --git a/Externals/wxWidgets3/include/wx/unix/private/fswatcher_inotify.h b/Externals/wxWidgets3/include/wx/unix/private/fswatcher_inotify.h deleted file mode 100644 index 249450eb50..0000000000 --- a/Externals/wxWidgets3/include/wx/unix/private/fswatcher_inotify.h +++ /dev/null @@ -1,71 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/unix/private/fswatcher_inotify.h -// Purpose: File system watcher impl classes -// Author: Bartosz Bekier -// Created: 2009-05-26 -// Copyright: (c) 2009 Bartosz Bekier -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef WX_UNIX_PRIVATE_FSWATCHER_INOTIFY_H_ -#define WX_UNIX_PRIVATE_FSWATCHER_INOTIFY_H_ - -#include "wx/filename.h" -#include "wx/evtloopsrc.h" - -// ============================================================================ -// wxFSWatcherEntry implementation & helper declarations -// ============================================================================ - -class wxFSWatcherImplUNIX; - -class wxFSWatchEntry : public wxFSWatchInfo -{ -public: - wxFSWatchEntry(const wxFSWatchInfo& winfo) : - wxFSWatchInfo(winfo) - { - } - - int GetWatchDescriptor() const - { - return m_wd; - } - - void SetWatchDescriptor(int wd) - { - m_wd = wd; - } - -private: - int m_wd; - - wxDECLARE_NO_COPY_CLASS(wxFSWatchEntry); -}; - - -// ============================================================================ -// wxFSWSourceHandler helper class -// ============================================================================ - -class wxFSWatcherImplUnix; - -/** - * Handler for handling i/o from inotify descriptor - */ -class wxFSWSourceHandler : public wxEventLoopSourceHandler -{ -public: - wxFSWSourceHandler(wxFSWatcherImplUnix* service) : - m_service(service) - { } - - virtual void OnReadWaiting(); - virtual void OnWriteWaiting(); - virtual void OnExceptionWaiting(); - -protected: - wxFSWatcherImplUnix* m_service; -}; - -#endif /* WX_UNIX_PRIVATE_FSWATCHER_INOTIFY_H_ */ diff --git a/Externals/wxWidgets3/include/wx/unix/private/fswatcher_kqueue.h b/Externals/wxWidgets3/include/wx/unix/private/fswatcher_kqueue.h deleted file mode 100644 index de3d489a38..0000000000 --- a/Externals/wxWidgets3/include/wx/unix/private/fswatcher_kqueue.h +++ /dev/null @@ -1,108 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/unix/private/fswatcher_kqueue.h -// Purpose: File system watcher impl classes -// Author: Bartosz Bekier -// Created: 2009-05-26 -// Copyright: (c) 2009 Bartosz Bekier -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef WX_UNIX_PRIVATE_FSWATCHER_KQUEUE_H_ -#define WX_UNIX_PRIVATE_FSWATCHER_KQUEUE_H_ - -#include -#include -#include "wx/dir.h" -#include "wx/debug.h" -#include "wx/arrstr.h" - -// ============================================================================ -// wxFSWatcherEntry implementation & helper declarations -// ============================================================================ - -class wxFSWatcherImplKqueue; - -class wxFSWatchEntryKq : public wxFSWatchInfo -{ -public: - struct wxDirState - { - wxDirState(const wxFSWatchInfo& winfo) - { - if (!wxDir::Exists(winfo.GetPath())) - return; - - wxDir dir(winfo.GetPath()); - wxCHECK_RET( dir.IsOpened(), - wxString::Format("Unable to open dir '%s'", winfo.GetPath())); - - wxString filename; - bool ret = dir.GetFirst(&filename); - while (ret) - { - files.push_back(filename); - ret = dir.GetNext(&filename); - } - } - - wxSortedArrayString files; - }; - - wxFSWatchEntryKq(const wxFSWatchInfo& winfo) : - wxFSWatchInfo(winfo), m_lastState(winfo) - { - m_fd = wxOpen(m_path, O_RDONLY, 0); - if (m_fd == -1) - { - wxLogSysError(_("Unable to open path '%s'"), m_path); - } - } - - virtual ~wxFSWatchEntryKq() - { - (void) Close(); - } - - bool Close() - { - if (!IsOk()) - return false; - - int ret = close(m_fd); - if (ret == -1) - { - wxLogSysError(_("Unable to close path '%s'"), m_path); - } - m_fd = -1; - - return ret != -1; - } - - bool IsOk() const - { - return m_fd != -1; - } - - int GetFileDescriptor() const - { - return m_fd; - } - - void RefreshState() - { - m_lastState = wxDirState(*this); - } - - const wxDirState& GetLastState() const - { - return m_lastState; - } - -private: - int m_fd; - wxDirState m_lastState; - - wxDECLARE_NO_COPY_CLASS(wxFSWatchEntryKq); -}; - -#endif /* WX_UNIX_PRIVATE_FSWATCHER_KQUEUE_H_ */ diff --git a/Externals/wxWidgets3/include/wx/unix/private/pipestream.h b/Externals/wxWidgets3/include/wx/unix/private/pipestream.h deleted file mode 100644 index 313a271741..0000000000 --- a/Externals/wxWidgets3/include/wx/unix/private/pipestream.h +++ /dev/null @@ -1,37 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/unix/private/pipestream.h -// Purpose: Unix wxPipeInputStream and wxPipeOutputStream declarations -// Author: Vadim Zeitlin -// Created: 2013-06-08 (extracted from wx/unix/pipe.h) -// Copyright: (c) 2013 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_UNIX_PRIVATE_PIPESTREAM_H_ -#define _WX_UNIX_PRIVATE_PIPESTREAM_H_ - -#include "wx/wfstream.h" - -class wxPipeInputStream : public wxFileInputStream -{ -public: - wxEXPLICIT wxPipeInputStream(int fd) : wxFileInputStream(fd) { } - - // return true if the pipe is still opened - bool IsOpened() const { return !Eof(); } - - // return true if we have anything to read, don't block - virtual bool CanRead() const; -}; - -class wxPipeOutputStream : public wxFileOutputStream -{ -public: - wxPipeOutputStream(int fd) : wxFileOutputStream(fd) { } - - // Override the base class version to ignore "pipe full" errors: this is - // not an error for this class. - size_t OnSysWrite(const void *buffer, size_t size); -}; - -#endif // _WX_UNIX_PRIVATE_PIPESTREAM_H_ diff --git a/Externals/wxWidgets3/include/wx/unix/private/sockunix.h b/Externals/wxWidgets3/include/wx/unix/private/sockunix.h deleted file mode 100644 index 642ef43bfa..0000000000 --- a/Externals/wxWidgets3/include/wx/unix/private/sockunix.h +++ /dev/null @@ -1,144 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/unix/private/sockunix.h -// Purpose: wxSocketImpl implementation for Unix systems -// Authors: Guilhem Lavaux, Vadim Zeitlin -// Created: April 1997 -// Copyright: (c) 1997 Guilhem Lavaux -// (c) 2008 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_UNIX_GSOCKUNX_H_ -#define _WX_UNIX_GSOCKUNX_H_ - -#include -#include - -// Under older (Open)Solaris versions FIONBIO is declared in this header only. -// In the newer versions it's included by sys/ioctl.h but it's simpler to just -// include it always instead of testing for whether it is or not. -#ifdef __SOLARIS__ - #include -#endif - -#include "wx/private/fdiomanager.h" - -class wxSocketImplUnix : public wxSocketImpl, - public wxFDIOHandler -{ -public: - wxSocketImplUnix(wxSocketBase& wxsocket) - : wxSocketImpl(wxsocket) - { - m_fds[0] = - m_fds[1] = -1; - } - - virtual wxSocketError GetLastError() const; - - virtual void ReenableEvents(wxSocketEventFlags flags) - { - // enable the notifications about input/output being available again in - // case they were disabled by OnRead/WriteWaiting() - // - // notice that we'd like to enable the events here only if there is - // nothing more left on the socket right now as otherwise we're going - // to get a "ready for whatever" notification immediately (well, during - // the next event loop iteration) and disable the event back again - // which is rather inefficient but unfortunately doing it like this - // doesn't work because the existing code (e.g. src/common/sckipc.cpp) - // expects to keep getting notifications about the data available from - // the socket even if it didn't read all the data the last time, so we - // absolutely have to continue generating them - EnableEvents(flags); - } - - // wxFDIOHandler methods - virtual void OnReadWaiting(); - virtual void OnWriteWaiting(); - virtual void OnExceptionWaiting(); - virtual bool IsOk() const { return m_fd != INVALID_SOCKET; } - -private: - virtual void DoClose() - { - DisableEvents(); - - close(m_fd); - } - - virtual void UnblockAndRegisterWithEventLoop() - { - int trueArg = 1; - ioctl(m_fd, FIONBIO, &trueArg); - - EnableEvents(); - } - - // enable or disable notifications for socket input/output events - void EnableEvents(int flags = wxSOCKET_INPUT_FLAG | wxSOCKET_OUTPUT_FLAG) - { DoEnableEvents(flags, true); } - void DisableEvents(int flags = wxSOCKET_INPUT_FLAG | wxSOCKET_OUTPUT_FLAG) - { DoEnableEvents(flags, false); } - - // really enable or disable socket input/output events - void DoEnableEvents(int flags, bool enable); - -protected: - // descriptors for input and output event notification channels associated - // with the socket - int m_fds[2]; - -private: - // notify the associated wxSocket about a change in socket state and shut - // down the socket if the event is wxSOCKET_LOST - void OnStateChange(wxSocketNotify event); - - // check if there is any input available, return 1 if yes, 0 if no or -1 on - // error - int CheckForInput(); - - - // give it access to our m_fds - friend class wxSocketFDBasedManager; -}; - -// A version of wxSocketManager which uses FDs for socket IO: it is used by -// Unix console applications and some X11-like ports (wxGTK and wxMotif but not -// wxX11 currently) which implement their own port-specific wxFDIOManagers -class wxSocketFDBasedManager : public wxSocketManager -{ -public: - wxSocketFDBasedManager() - { - m_fdioManager = NULL; - } - - virtual bool OnInit(); - virtual void OnExit() { } - - virtual wxSocketImpl *CreateSocket(wxSocketBase& wxsocket) - { - return new wxSocketImplUnix(wxsocket); - } - - virtual void Install_Callback(wxSocketImpl *socket_, wxSocketNotify event); - virtual void Uninstall_Callback(wxSocketImpl *socket_, wxSocketNotify event); - -protected: - // get the FD index corresponding to the given wxSocketNotify - wxFDIOManager::Direction - GetDirForEvent(wxSocketImpl *socket, wxSocketNotify event); - - // access the FDs we store - int& FD(wxSocketImplUnix *socket, wxFDIOManager::Direction d) - { - return socket->m_fds[d]; - } - - wxFDIOManager *m_fdioManager; - - wxDECLARE_NO_COPY_CLASS(wxSocketFDBasedManager); -}; - -#endif /* _WX_UNIX_GSOCKUNX_H_ */ diff --git a/Externals/wxWidgets3/include/wx/unix/private/timer.h b/Externals/wxWidgets3/include/wx/unix/private/timer.h deleted file mode 100644 index 6275b53d91..0000000000 --- a/Externals/wxWidgets3/include/wx/unix/private/timer.h +++ /dev/null @@ -1,138 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/unix/private/timer.h -// Purpose: wxTimer for wxBase (unix) -// Author: Lukasz Michalski -// Created: 15/01/2005 -// Copyright: (c) Lukasz Michalski -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_UNIX_PRIVATE_TIMER_H_ -#define _WX_UNIX_PRIVATE_TIMER_H_ - -#if wxUSE_TIMER - -#include "wx/private/timer.h" - -// the type used for milliseconds is large enough for microseconds too but -// introduce a synonym for it to avoid confusion -typedef wxMilliClock_t wxUsecClock_t; - -// ---------------------------------------------------------------------------- -// wxTimer implementation class for Unix platforms -// ---------------------------------------------------------------------------- - -// NB: we have to export at least this symbol from the shared library, because -// it's used by wxDFB's wxCore -class WXDLLIMPEXP_BASE wxUnixTimerImpl : public wxTimerImpl -{ -public: - wxUnixTimerImpl(wxTimer *timer); - virtual ~wxUnixTimerImpl(); - - virtual bool IsRunning() const; - virtual bool Start(int milliseconds = -1, bool oneShot = false); - virtual void Stop(); - - // for wxTimerScheduler only: resets the internal flag indicating that the - // timer is running - void MarkStopped() - { - wxASSERT_MSG( m_isRunning, wxT("stopping non-running timer?") ); - - m_isRunning = false; - } - -private: - bool m_isRunning; -}; - -// ---------------------------------------------------------------------------- -// wxTimerSchedule: information about a single timer, used by wxTimerScheduler -// ---------------------------------------------------------------------------- - -struct wxTimerSchedule -{ - wxTimerSchedule(wxUnixTimerImpl *timer, wxUsecClock_t expiration) - : m_timer(timer), - m_expiration(expiration) - { - } - - // the timer itself (we don't own this pointer) - wxUnixTimerImpl *m_timer; - - // the time of its next expiration, in usec - wxUsecClock_t m_expiration; -}; - -// the linked list of all active timers, we keep it sorted by expiration time -WX_DECLARE_LIST(wxTimerSchedule, wxTimerList); - -// ---------------------------------------------------------------------------- -// wxTimerScheduler: class responsible for updating all timers -// ---------------------------------------------------------------------------- - -class wxTimerScheduler -{ -public: - // get the unique timer scheduler instance - static wxTimerScheduler& Get() - { - if ( !ms_instance ) - ms_instance = new wxTimerScheduler; - - return *ms_instance; - } - - // must be called on shutdown to delete the global timer scheduler - static void Shutdown() - { - if ( ms_instance ) - { - delete ms_instance; - ms_instance = NULL; - } - } - - // adds timer which should expire at the given absolute time to the list - void AddTimer(wxUnixTimerImpl *timer, wxUsecClock_t expiration); - - // remove timer from the list, called automatically from timer dtor - void RemoveTimer(wxUnixTimerImpl *timer); - - - // the functions below are used by the event loop implementation to monitor - // and notify timers: - - // if this function returns true, the time remaining until the next time - // expiration is returned in the provided parameter (always positive or 0) - // - // it returns false if there are no timers - bool GetNext(wxUsecClock_t *remaining) const; - - // trigger the timer event for all timers which have expired, return true - // if any did - bool NotifyExpired(); - -private: - // ctor and dtor are private, this is a singleton class only created by - // Get() and destroyed by Shutdown() - wxTimerScheduler() { } - ~wxTimerScheduler(); - - // add the given timer schedule to the list in the right place - // - // we take ownership of the pointer "s" which must be heap-allocated - void DoAddTimer(wxTimerSchedule *s); - - - // the list of all currently active timers sorted by expiration - wxTimerList m_timers; - - static wxTimerScheduler *ms_instance; -}; - -#endif // wxUSE_TIMER - -#endif // _WX_UNIX_PRIVATE_TIMER_H_ diff --git a/Externals/wxWidgets3/include/wx/unix/private/wakeuppipe.h b/Externals/wxWidgets3/include/wx/unix/private/wakeuppipe.h deleted file mode 100644 index 5bd6db870a..0000000000 --- a/Externals/wxWidgets3/include/wx/unix/private/wakeuppipe.h +++ /dev/null @@ -1,97 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/unix/private/wakeuppipe.h -// Purpose: Helper class allowing to wake up the main thread. -// Author: Vadim Zeitlin -// Created: 2013-06-09 (extracted from src/unix/evtloopunix.cpp) -// Copyright: (c) 2013 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_UNIX_PRIVATE_WAKEUPPIPE_H_ -#define _WX_UNIX_PRIVATE_WAKEUPPIPE_H_ - -#include "wx/unix/pipe.h" -#include "wx/evtloopsrc.h" - -// ---------------------------------------------------------------------------- -// wxWakeUpPipe: allows to wake up the event loop by writing to it -// ---------------------------------------------------------------------------- - -// This class is not MT-safe, see wxWakeUpPipeMT below for a wake up pipe -// usable from other threads. - -class wxWakeUpPipe : public wxEventLoopSourceHandler -{ -public: - // Create and initialize the pipe. - // - // It's the callers responsibility to add the read end of this pipe, - // returned by GetReadFd(), to the code blocking on input. - wxWakeUpPipe(); - - // Wake up the blocking operation involving this pipe. - // - // It simply writes to the write end of the pipe. - // - // As indicated by its name, this method does no locking and so can be - // called only from the main thread. - void WakeUpNoLock(); - - // Same as WakeUp() but without locking. - - // Return the read end of the pipe. - int GetReadFd() { return m_pipe[wxPipe::Read]; } - - - // Implement wxEventLoopSourceHandler pure virtual methods - virtual void OnReadWaiting(); - virtual void OnWriteWaiting() { } - virtual void OnExceptionWaiting() { } - -private: - wxPipe m_pipe; - - // This flag is set to true after writing to the pipe and reset to false - // after reading from it in the main thread. Having it allows us to avoid - // overflowing the pipe with too many writes if the main thread can't keep - // up with reading from it. - bool m_pipeIsEmpty; -}; - -// ---------------------------------------------------------------------------- -// wxWakeUpPipeMT: thread-safe version of wxWakeUpPipe -// ---------------------------------------------------------------------------- - -// This class can be used from multiple threads, i.e. its WakeUp() can be -// called concurrently. - -class wxWakeUpPipeMT : public wxWakeUpPipe -{ -#if wxUSE_THREADS -public: - wxWakeUpPipeMT() { } - - // Thread-safe wrapper around WakeUpNoLock(): can be called from another - // thread to wake up the main one. - void WakeUp() - { - wxCriticalSectionLocker lock(m_pipeLock); - - WakeUpNoLock(); - } - - virtual void OnReadWaiting() - { - wxCriticalSectionLocker lock(m_pipeLock); - - wxWakeUpPipe::OnReadWaiting(); - } - -private: - // Protects access to m_pipeIsEmpty. - wxCriticalSection m_pipeLock; - -#endif // wxUSE_THREADS -}; - -#endif // _WX_UNIX_PRIVATE_WAKEUPPIPE_H_ diff --git a/Externals/wxWidgets3/include/wx/unix/sound.h b/Externals/wxWidgets3/include/wx/unix/sound.h deleted file mode 100644 index b5aa3ca6a5..0000000000 --- a/Externals/wxWidgets3/include/wx/unix/sound.h +++ /dev/null @@ -1,160 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/unix/sound.h -// Purpose: wxSound class -// Author: Julian Smart, Vaclav Slavik -// Modified by: -// Created: 25/10/98 -// Copyright: (c) Julian Smart, Vaclav Slavik -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_SOUND_H_ -#define _WX_SOUND_H_ - -#include "wx/defs.h" - -#if wxUSE_SOUND - -#include "wx/object.h" - -// ---------------------------------------------------------------------------- -// wxSound: simple audio playback class -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_ADV wxSoundBackend; -class WXDLLIMPEXP_FWD_ADV wxSound; -class WXDLLIMPEXP_FWD_BASE wxDynamicLibrary; - -/// Sound data, as loaded from .wav file: -class WXDLLIMPEXP_ADV wxSoundData -{ -public: - wxSoundData() : m_refCnt(1) {} - void IncRef(); - void DecRef(); - - // .wav header information: - unsigned m_channels; // num of channels (mono:1, stereo:2) - unsigned m_samplingRate; - unsigned m_bitsPerSample; // if 8, then m_data contains unsigned 8bit - // samples (wxUint8), if 16 then signed 16bit - // (wxInt16) - unsigned m_samples; // length in samples: - - // wave data: - size_t m_dataBytes; - wxUint8 *m_data; // m_dataBytes bytes of data - -private: - ~wxSoundData(); - unsigned m_refCnt; - wxUint8 *m_dataWithHeader; // ditto, but prefixed with .wav header - friend class wxSound; -}; - - -/// Simple sound class: -class WXDLLIMPEXP_ADV wxSound : public wxSoundBase -{ -public: - wxSound(); - wxSound(const wxString& fileName, bool isResource = false); - wxSound(size_t size, const void* data); - virtual ~wxSound(); - - // Create from resource or file - bool Create(const wxString& fileName, bool isResource = false); - // Create from data - bool Create(size_t size, const void* data); - - bool IsOk() const { return m_data != NULL; } - - // Stop playing any sound - static void Stop(); - - // Returns true if a sound is being played - static bool IsPlaying(); - - // for internal use - static void UnloadBackend(); - -protected: - bool DoPlay(unsigned flags) const wxOVERRIDE; - - static void EnsureBackend(); - void Free(); - bool LoadWAV(const void* data, size_t length, bool copyData); - - static wxSoundBackend *ms_backend; -#if wxUSE_LIBSDL && wxUSE_PLUGINS - // FIXME - temporary, until we have plugins architecture - static wxDynamicLibrary *ms_backendSDL; -#endif - -private: - wxSoundData *m_data; -}; - - -// ---------------------------------------------------------------------------- -// wxSoundBackend: -// ---------------------------------------------------------------------------- - -// This is interface to sound playing implementation. There are multiple -// sound architectures in use on Unix platforms and wxWidgets can use several -// of them for playback, depending on their availability at runtime; hence -// the need for backends. This class is for use by wxWidgets and people writing -// additional backends only, it is _not_ for use by applications! - -// Structure that holds playback status information -struct wxSoundPlaybackStatus -{ - // playback is in progress - bool m_playing; - // main thread called wxSound::Stop() - bool m_stopRequested; -}; - -// Audio backend interface -class WXDLLIMPEXP_ADV wxSoundBackend -{ -public: - virtual ~wxSoundBackend() {} - - // Returns the name of the backend (e.g. "Open Sound System") - virtual wxString GetName() const = 0; - - // Returns priority (higher priority backends are tried first) - virtual int GetPriority() const = 0; - - // Checks if the backend's audio system is available and the backend can - // be used for playback - virtual bool IsAvailable() const = 0; - - // Returns true if the backend is capable of playing sound asynchronously. - // If false, then wxWidgets creates a playback thread and handles async - // playback, otherwise it is left up to the backend (will usually be more - // effective). - virtual bool HasNativeAsyncPlayback() const = 0; - - // Plays the sound. flags are same flags as those passed to wxSound::Play. - // The function should periodically check the value of - // status->m_stopRequested and terminate if it is set to true (it may - // be modified by another thread) - virtual bool Play(wxSoundData *data, unsigned flags, - volatile wxSoundPlaybackStatus *status) = 0; - - // Stops playback (if something is played). - virtual void Stop() = 0; - - // Returns true if the backend is playing anything at the moment. - // (This method is never called for backends that don't support async - // playback.) - virtual bool IsPlaying() const = 0; -}; - - -#endif // wxUSE_SOUND - -#endif // _WX_SOUND_H_ - diff --git a/Externals/wxWidgets3/include/wx/unix/stackwalk.h b/Externals/wxWidgets3/include/wx/unix/stackwalk.h deleted file mode 100644 index f7e3a7de41..0000000000 --- a/Externals/wxWidgets3/include/wx/unix/stackwalk.h +++ /dev/null @@ -1,98 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/unix/stackwalk.h -// Purpose: declaration of wxStackWalker for Unix -// Author: Vadim Zeitlin -// Modified by: -// Created: 2005-01-19 -// Copyright: (c) 2005 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_UNIX_STACKWALK_H_ -#define _WX_UNIX_STACKWALK_H_ - -// ---------------------------------------------------------------------------- -// wxStackFrame -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxStackFrame : public wxStackFrameBase -{ - friend class wxStackWalker; - -public: - // arguments are the stack depth of this frame, its address and the return - // value of backtrace_symbols() for it - // - // NB: we don't copy syminfo pointer so it should have lifetime at least as - // long as ours - wxStackFrame(size_t level = 0, void *address = NULL, const char *syminfo = NULL) - : wxStackFrameBase(level, address) - { - m_syminfo = syminfo; - } - -protected: - virtual void OnGetName() wxOVERRIDE; - - // optimized for the 2 step initialization done by wxStackWalker - void Set(const wxString &name, const wxString &filename, const char* syminfo, - size_t level, size_t numLine, void *address) - { - m_level = level; - m_name = name; - m_filename = filename; - m_syminfo = syminfo; - - m_line = numLine; - m_address = address; - } - -private: - const char *m_syminfo; -}; - -// ---------------------------------------------------------------------------- -// wxStackWalker -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxStackWalker : public wxStackWalkerBase -{ -public: - // we need the full path to the program executable to be able to use - // addr2line, normally we can retrieve it from wxTheApp but if wxTheApp - // doesn't exist or doesn't have the correct value, the path may be given - // explicitly - wxStackWalker(const char *argv0 = NULL) - { - ms_exepath = wxString::FromAscii(argv0); - } - - ~wxStackWalker() - { - FreeStack(); - } - - virtual void Walk(size_t skip = 1, size_t maxDepth = wxSTACKWALKER_MAX_DEPTH) wxOVERRIDE; -#if wxUSE_ON_FATAL_EXCEPTION - virtual void WalkFromException(size_t maxDepth = wxSTACKWALKER_MAX_DEPTH) wxOVERRIDE { Walk(2, maxDepth); } -#endif // wxUSE_ON_FATAL_EXCEPTION - - static const wxString& GetExePath() { return ms_exepath; } - - - // these two may be used to save the stack at some point (fast operation) - // and then process it later (slow operation) - void SaveStack(size_t maxDepth); - void ProcessFrames(size_t skip); - void FreeStack(); - -private: - int InitFrames(wxStackFrame *arr, size_t n, void **addresses, char **syminfo); - - static wxString ms_exepath; - static void *ms_addresses[]; - static char **ms_symbols; - static int m_depth; -}; - -#endif // _WX_UNIX_STACKWALK_H_ diff --git a/Externals/wxWidgets3/include/wx/unix/stdpaths.h b/Externals/wxWidgets3/include/wx/unix/stdpaths.h deleted file mode 100644 index 74f915398c..0000000000 --- a/Externals/wxWidgets3/include/wx/unix/stdpaths.h +++ /dev/null @@ -1,63 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/unix/stdpaths.h -// Purpose: wxStandardPaths for Unix systems -// Author: Vadim Zeitlin -// Modified by: -// Created: 2004-10-19 -// Copyright: (c) 2004 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_UNIX_STDPATHS_H_ -#define _WX_UNIX_STDPATHS_H_ - -// ---------------------------------------------------------------------------- -// wxStandardPaths -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxStandardPaths : public wxStandardPathsBase -{ -public: - // tries to determine the installation prefix automatically (Linux only right - // now) and returns /usr/local if it failed - void DetectPrefix(); - - // set the program installation directory which is /usr/local by default - // - // under some systems (currently only Linux) the program directory can be - // determined automatically but for portable programs you should always set - // it explicitly - void SetInstallPrefix(const wxString& prefix); - - // get the program installation prefix - // - // if the prefix had been previously by SetInstallPrefix, returns that - // value, otherwise calls DetectPrefix() - wxString GetInstallPrefix() const; - - - // implement base class pure virtuals - virtual wxString GetExecutablePath() const wxOVERRIDE; - virtual wxString GetConfigDir() const wxOVERRIDE; - virtual wxString GetUserConfigDir() const wxOVERRIDE; - virtual wxString GetDataDir() const wxOVERRIDE; - virtual wxString GetLocalDataDir() const wxOVERRIDE; - virtual wxString GetUserDataDir() const wxOVERRIDE; - virtual wxString GetPluginsDir() const wxOVERRIDE; - virtual wxString GetLocalizedResourcesDir(const wxString& lang, - ResourceCat category) const wxOVERRIDE; -#ifndef __VMS - virtual wxString GetUserDir(Dir userDir) const wxOVERRIDE; -#endif - -protected: - // Ctor is protected, use wxStandardPaths::Get() instead of instantiating - // objects of this class directly. - wxStandardPaths() { } - -private: - wxString m_prefix; -}; - -#endif // _WX_UNIX_STDPATHS_H_ - diff --git a/Externals/wxWidgets3/include/wx/unix/taskbarx11.h b/Externals/wxWidgets3/include/wx/unix/taskbarx11.h deleted file mode 100644 index ffd3e0435b..0000000000 --- a/Externals/wxWidgets3/include/wx/unix/taskbarx11.h +++ /dev/null @@ -1,40 +0,0 @@ -///////////////////////////////////////////////////////////////////////// -// File: wx/unix/taskbarx11.h -// Purpose: Defines wxTaskBarIcon class for most common X11 desktops -// Author: Vaclav Slavik -// Modified by: -// Created: 04/04/2003 -// Copyright: (c) Vaclav Slavik, 2003 -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////// - -#ifndef _WX_UNIX_TASKBAR_H_ -#define _WX_UNIX_TASKBAR_H_ - -class WXDLLIMPEXP_FWD_ADV wxTaskBarIconArea; - -class WXDLLIMPEXP_ADV wxTaskBarIcon: public wxTaskBarIconBase -{ -public: - wxTaskBarIcon(); - virtual ~wxTaskBarIcon(); - - // Accessors: - bool IsOk() const; - bool IsIconInstalled() const; - - // Operations: - bool SetIcon(const wxIcon& icon, const wxString& tooltip = wxEmptyString) wxOVERRIDE; - bool RemoveIcon() wxOVERRIDE; - bool PopupMenu(wxMenu *menu) wxOVERRIDE; - -protected: - wxTaskBarIconArea *m_iconWnd; - -private: - void OnDestroy(wxWindowDestroyEvent&); - - wxDECLARE_DYNAMIC_CLASS(wxTaskBarIcon); -}; - -#endif // _WX_UNIX_TASKBAR_H_ diff --git a/Externals/wxWidgets3/include/wx/unix/tls.h b/Externals/wxWidgets3/include/wx/unix/tls.h deleted file mode 100644 index ce61e6fff7..0000000000 --- a/Externals/wxWidgets3/include/wx/unix/tls.h +++ /dev/null @@ -1,65 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/unix/tls.h -// Purpose: Pthreads implementation of wxTlsValue<> -// Author: Vadim Zeitlin -// Created: 2008-08-08 -// Copyright: (c) 2008 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_UNIX_TLS_H_ -#define _WX_UNIX_TLS_H_ - -#include - -// ---------------------------------------------------------------------------- -// wxTlsKey is a helper class encapsulating the TLS value index -// ---------------------------------------------------------------------------- - -class wxTlsKey -{ -public: - // ctor allocates a new key and possibly registering a destructor function - // for it - wxTlsKey(wxTlsDestructorFunction destructor) - { - m_destructor = destructor; - if ( pthread_key_create(&m_key, destructor) != 0 ) - m_key = 0; - } - - // return true if the key was successfully allocated - bool IsOk() const { return m_key != 0; } - - // get the key value, there is no error return - void *Get() const - { - return pthread_getspecific(m_key); - } - - // change the key value, return true if ok - bool Set(void *value) - { - void *old = Get(); - if ( old ) - m_destructor(old); - - return pthread_setspecific(m_key, value) == 0; - } - - // free the key - ~wxTlsKey() - { - if ( IsOk() ) - pthread_key_delete(m_key); - } - -private: - wxTlsDestructorFunction m_destructor; - pthread_key_t m_key; - - wxDECLARE_NO_COPY_CLASS(wxTlsKey); -}; - -#endif // _WX_UNIX_TLS_H_ - diff --git a/Externals/wxWidgets3/include/wx/unix/utilsx11.h b/Externals/wxWidgets3/include/wx/unix/utilsx11.h deleted file mode 100644 index e3019acc67..0000000000 --- a/Externals/wxWidgets3/include/wx/unix/utilsx11.h +++ /dev/null @@ -1,85 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/unix/utilsx11.h -// Purpose: Miscellaneous X11 functions -// Author: Mattia Barbon, Vaclav Slavik, Vadim Zeitlin -// Modified by: -// Created: 25.03.02 -// Copyright: (c) wxWidgets team -// (c) 2010 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_UNIX_UTILSX11_H_ -#define _WX_UNIX_UTILSX11_H_ - -#include "wx/defs.h" -#include "wx/gdicmn.h" - -#include - -// NB: Content of this header is for wxWidgets' private use! It is not -// part of public API and may be modified or even disappear in the future! - -#if defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXX11__) - -#if defined(__WXGTK__) -typedef void WXDisplay; -typedef void* WXWindow; -#endif -typedef unsigned long WXKeySym; - -int wxCharCodeXToWX(WXKeySym keySym); -WXKeySym wxCharCodeWXToX(int id); -int wxUnicodeCharXToWX(WXKeySym keySym); - -// Xlib keysym-unicode charactor pair -struct CodePair { - unsigned int keySym; - int uniChar; -}; - -class wxIconBundle; - -void wxSetIconsX11( WXDisplay* display, WXWindow window, - const wxIconBundle& ib ); - - -enum wxX11FullScreenMethod -{ - wxX11_FS_AUTODETECT = 0, - wxX11_FS_WMSPEC, - wxX11_FS_KDE, - wxX11_FS_GENERIC -}; - -wxX11FullScreenMethod wxGetFullScreenMethodX11(WXDisplay* display, - WXWindow rootWindow); - -void wxSetFullScreenStateX11(WXDisplay* display, WXWindow rootWindow, - WXWindow window, bool show, wxRect *origSize, - wxX11FullScreenMethod method); - - -// Class wrapping X11 Display: it opens it in ctor and closes it in dtor. -class wxX11Display -{ -public: - wxX11Display() { m_dpy = XOpenDisplay(NULL); } - ~wxX11Display() { if ( m_dpy ) XCloseDisplay(m_dpy); } - - operator Display *() const { return m_dpy; } - - // Using DefaultRootWindow() with an object of wxX11Display class doesn't - // compile because it is a macro which tries to cast wxX11Display so - // provide a convenient helper. - Window DefaultRoot() const { return DefaultRootWindow(m_dpy); } - -private: - Display *m_dpy; - - wxDECLARE_NO_COPY_CLASS(wxX11Display); -}; - -#endif // __WXMOTIF__, __WXGTK__, __WXX11__ - -#endif // _WX_UNIX_UTILSX11_H_ diff --git a/Externals/wxWidgets3/include/wx/uri.h b/Externals/wxWidgets3/include/wx/uri.h deleted file mode 100644 index 828428e954..0000000000 --- a/Externals/wxWidgets3/include/wx/uri.h +++ /dev/null @@ -1,183 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/uri.h -// Purpose: wxURI - Class for parsing URIs -// Author: Ryan Norton -// Vadim Zeitlin (UTF-8 URI support, many other changes) -// Created: 07/01/2004 -// Copyright: (c) 2004 Ryan Norton -// 2008 Vadim Zeitlin -// Licence: wxWindows Licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_URI_H_ -#define _WX_URI_H_ - -#include "wx/defs.h" -#include "wx/object.h" -#include "wx/string.h" -#include "wx/arrstr.h" - -// Host Type that the server component can be -enum wxURIHostType -{ - wxURI_REGNAME, // Host is a normal register name (www.mysite.com etc.) - wxURI_IPV4ADDRESS, // Host is a version 4 ip address (192.168.1.100) - wxURI_IPV6ADDRESS, // Host is a version 6 ip address [aa:aa:aa:aa::aa:aa]:5050 - wxURI_IPVFUTURE // Host is a future ip address (wxURI is unsure what kind) -}; - -// Component Flags -enum wxURIFieldType -{ - wxURI_SCHEME = 1, - wxURI_USERINFO = 2, - wxURI_SERVER = 4, - wxURI_PORT = 8, - wxURI_PATH = 16, - wxURI_QUERY = 32, - wxURI_FRAGMENT = 64 -}; - -// Miscellaneous other flags -enum wxURIFlags -{ - wxURI_STRICT = 1 -}; - - -// Generic class for parsing URIs. -// -// See RFC 3986 -class WXDLLIMPEXP_BASE wxURI : public wxObject -{ -public: - wxURI(); - wxURI(const wxString& uri); - - // default copy ctor, assignment operator and dtor are ok - - bool Create(const wxString& uri); - - wxURI& operator=(const wxString& string) - { - Create(string); - return *this; - } - - bool operator==(const wxURI& uri) const; - - // various accessors - - bool HasScheme() const { return (m_fields & wxURI_SCHEME) != 0; } - bool HasUserInfo() const { return (m_fields & wxURI_USERINFO) != 0; } - bool HasServer() const { return (m_fields & wxURI_SERVER) != 0; } - bool HasPort() const { return (m_fields & wxURI_PORT) != 0; } - bool HasPath() const { return (m_fields & wxURI_PATH) != 0; } - bool HasQuery() const { return (m_fields & wxURI_QUERY) != 0; } - bool HasFragment() const { return (m_fields & wxURI_FRAGMENT) != 0; } - - const wxString& GetScheme() const { return m_scheme; } - const wxString& GetPath() const { return m_path; } - const wxString& GetQuery() const { return m_query; } - const wxString& GetFragment() const { return m_fragment; } - const wxString& GetPort() const { return m_port; } - const wxString& GetUserInfo() const { return m_userinfo; } - const wxString& GetServer() const { return m_server; } - wxURIHostType GetHostType() const { return m_hostType; } - - // these functions only work if the user information part of the URI is in - // the usual (but insecure and hence explicitly recommended against by the - // RFC) "user:password" form - wxString GetUser() const; - wxString GetPassword() const; - - - // combine all URI components into a single string - // - // BuildURI() returns the real URI suitable for use with network libraries, - // for example, while BuildUnescapedURI() returns a string suitable to be - // shown to the user. - wxString BuildURI() const { return DoBuildURI(&wxURI::Nothing); } - wxString BuildUnescapedURI() const { return DoBuildURI(&wxURI::Unescape); } - - // the escaped URI should contain only ASCII characters, including possible - // escape sequences - static wxString Unescape(const wxString& escapedURI); - - - void Resolve(const wxURI& base, int flags = wxURI_STRICT); - bool IsReference() const; - bool IsRelative() const; - -protected: - void Clear(); - - // common part of BuildURI() and BuildUnescapedURI() - wxString DoBuildURI(wxString (*funcDecode)(const wxString&)) const; - - // function which returns its argument unmodified, this is used by - // BuildURI() to tell DoBuildURI() that nothing needs to be done with the - // URI components - static wxString Nothing(const wxString& value) { return value; } - - bool Parse(const char* uri); - - const char* ParseAuthority (const char* uri); - const char* ParseScheme (const char* uri); - const char* ParseUserInfo (const char* uri); - const char* ParseServer (const char* uri); - const char* ParsePort (const char* uri); - const char* ParsePath (const char* uri); - const char* ParseQuery (const char* uri); - const char* ParseFragment (const char* uri); - - - static bool ParseH16(const char*& uri); - static bool ParseIPv4address(const char*& uri); - static bool ParseIPv6address(const char*& uri); - static bool ParseIPvFuture(const char*& uri); - - // append next character pointer to by p to the string in an escaped form - // and advance p past it - // - // if the next character is '%' and it's followed by 2 hex digits, they are - // not escaped (again) by this function, this allows to keep (backwards- - // compatible) ambiguity about the input format to wxURI::Create(): it can - // be either already escaped or not - void AppendNextEscaped(wxString& s, const char *& p); - - // convert hexadecimal digit to its value; return -1 if c isn't valid - static int CharToHex(char c); - - // split an URI path string in its component segments (including empty and - // "." ones, no post-processing is done) - static wxArrayString SplitInSegments(const wxString& path); - - // various URI grammar helpers - static bool IsUnreserved(char c); - static bool IsReserved(char c); - static bool IsGenDelim(char c); - static bool IsSubDelim(char c); - static bool IsHex(char c); - static bool IsAlpha(char c); - static bool IsDigit(char c); - static bool IsEndPath(char c); - - wxString m_scheme; - wxString m_path; - wxString m_query; - wxString m_fragment; - - wxString m_userinfo; - wxString m_server; - wxString m_port; - - wxURIHostType m_hostType; - - size_t m_fields; - - wxDECLARE_DYNAMIC_CLASS(wxURI); -}; - -#endif // _WX_URI_H_ - diff --git a/Externals/wxWidgets3/include/wx/url.h b/Externals/wxWidgets3/include/wx/url.h deleted file mode 100644 index 457b043b9f..0000000000 --- a/Externals/wxWidgets3/include/wx/url.h +++ /dev/null @@ -1,116 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/url.h -// Purpose: URL parser -// Author: Guilhem Lavaux -// Modified by: Ryan Norton -// Created: 20/07/1997 -// Copyright: (c) 1997, 1998 Guilhem Lavaux -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_URL_H -#define _WX_URL_H - -#include "wx/defs.h" - -#if wxUSE_URL - -#include "wx/uri.h" -#include "wx/protocol/protocol.h" - -#if wxUSE_PROTOCOL_HTTP - #include "wx/protocol/http.h" -#endif - -enum wxURLError { - wxURL_NOERR = 0, - wxURL_SNTXERR, - wxURL_NOPROTO, - wxURL_NOHOST, - wxURL_NOPATH, - wxURL_CONNERR, - wxURL_PROTOERR -}; - -#if wxUSE_URL_NATIVE -class WXDLLIMPEXP_FWD_NET wxURL; - -class WXDLLIMPEXP_NET wxURLNativeImp : public wxObject -{ -public: - virtual ~wxURLNativeImp() { } - virtual wxInputStream *GetInputStream(wxURL *owner) = 0; -}; -#endif // wxUSE_URL_NATIVE - -class WXDLLIMPEXP_NET wxURL : public wxURI -{ -public: - wxURL(const wxString& sUrl = wxEmptyString); - wxURL(const wxURI& uri); - wxURL(const wxURL& url); - virtual ~wxURL(); - - wxURL& operator = (const wxString& url); - wxURL& operator = (const wxURI& uri); - wxURL& operator = (const wxURL& url); - - wxProtocol& GetProtocol() { return *m_protocol; } - wxURLError GetError() const { return m_error; } - wxString GetURL() const { return m_url; } - - wxURLError SetURL(const wxString &url) - { *this = url; return m_error; } - - bool IsOk() const - { return m_error == wxURL_NOERR; } - - wxInputStream *GetInputStream(); - -#if wxUSE_PROTOCOL_HTTP - static void SetDefaultProxy(const wxString& url_proxy); - void SetProxy(const wxString& url_proxy); -#endif // wxUSE_PROTOCOL_HTTP - -protected: - static wxProtoInfo *ms_protocols; - -#if wxUSE_PROTOCOL_HTTP - static wxHTTP *ms_proxyDefault; - static bool ms_useDefaultProxy; - wxHTTP *m_proxy; - bool m_useProxy; -#endif // wxUSE_PROTOCOL_HTTP - -#if wxUSE_URL_NATIVE - friend class wxURLNativeImp; - // pointer to a native URL implementation object - wxURLNativeImp *m_nativeImp; - // Creates on the heap and returns a native - // implementation object for the current platform. - static wxURLNativeImp *CreateNativeImpObject(); -#endif // wxUSE_URL_NATIVE - - wxProtoInfo *m_protoinfo; - wxProtocol *m_protocol; - - wxURLError m_error; - wxString m_url; - - void Init(const wxString&); - bool ParseURL(); - void CleanData(); - void Free(); - bool FetchProtocol(); - - friend class wxProtoInfo; - friend class wxURLModule; - -private: - wxDECLARE_DYNAMIC_CLASS(wxURL); -}; - -#endif // wxUSE_URL - -#endif // _WX_URL_H - diff --git a/Externals/wxWidgets3/include/wx/ustring.h b/Externals/wxWidgets3/include/wx/ustring.h deleted file mode 100644 index 7790ac1656..0000000000 --- a/Externals/wxWidgets3/include/wx/ustring.h +++ /dev/null @@ -1,705 +0,0 @@ - -// Name: wx/ustring.h -// Purpose: 32-bit string (UCS-4) -// Author: Robert Roebling -// Copyright: (c) Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_USTRING_H_ -#define _WX_USTRING_H_ - -#include "wx/defs.h" -#include "wx/string.h" - -#include - -#if SIZEOF_WCHAR_T == 2 -typedef wxWCharBuffer wxU16CharBuffer; -typedef wxScopedWCharBuffer wxScopedU16CharBuffer; -#else -typedef wxCharTypeBuffer wxU16CharBuffer; -typedef wxScopedCharTypeBuffer wxScopedU16CharBuffer; -#endif - -#if SIZEOF_WCHAR_T == 4 -typedef wxWCharBuffer wxU32CharBuffer; -typedef wxScopedWCharBuffer wxScopedU32CharBuffer; -#else -typedef wxCharTypeBuffer wxU32CharBuffer; -typedef wxScopedCharTypeBuffer wxScopedU32CharBuffer; -#endif - -#ifdef __VISUALC__ - // "non dll-interface class 'std::basic_string' used as base - // interface for dll-interface class 'wxString'" -- this is OK in our case - // (and warning is unavoidable anyhow) - #pragma warning(push) - #pragma warning(disable:4275) -#endif - -class WXDLLIMPEXP_BASE wxUString: public std::basic_string -{ -public: - wxUString() { } - - wxUString( const wxChar32 *str ) { assign(str); } - wxUString( const wxScopedU32CharBuffer &buf ) { assign(buf); } - - wxUString( const char *str ) { assign(str); } - wxUString( const wxScopedCharBuffer &buf ) { assign(buf); } - wxUString( const char *str, const wxMBConv &conv ) { assign(str,conv); } - wxUString( const wxScopedCharBuffer &buf, const wxMBConv &conv ) { assign(buf,conv); } - - wxUString( const wxChar16 *str ) { assign(str); } - wxUString( const wxScopedU16CharBuffer &buf ) { assign(buf); } - - wxUString( const wxCStrData *cstr ) { assign(cstr); } - wxUString( const wxString &str ) { assign(str); } - - wxUString( char ch ) { assign(ch); } - wxUString( wxChar16 ch ) { assign(ch); } - wxUString( wxChar32 ch ) { assign(ch); } - wxUString( wxUniChar ch ) { assign(ch); } - wxUString( wxUniCharRef ch ) { assign(ch); } - wxUString( size_type n, char ch ) { assign(n,ch); } - wxUString( size_type n, wxChar16 ch ) { assign(n,ch); } - wxUString( size_type n, wxChar32 ch ) { assign(n,ch); } - wxUString( size_type n, wxUniChar ch ) { assign(n,ch); } - wxUString( size_type n, wxUniCharRef ch ) { assign(n,ch); } - - // static construction - - static wxUString FromAscii( const char *str, size_type n ) - { - wxUString ret; - ret.assignFromAscii( str, n ); - return ret; - } - - static wxUString FromAscii( const char *str ) - { - wxUString ret; - ret.assignFromAscii( str ); - return ret; - } - - static wxUString FromUTF8( const char *str, size_type n ) - { - wxUString ret; - ret.assignFromUTF8( str, n ); - return ret; - } - - static wxUString FromUTF8( const char *str ) - { - wxUString ret; - ret.assignFromUTF8( str ); - return ret; - } - - static wxUString FromUTF16( const wxChar16 *str, size_type n ) - { - wxUString ret; - ret.assignFromUTF16( str, n ); - return ret; - } - - static wxUString FromUTF16( const wxChar16 *str ) - { - wxUString ret; - ret.assignFromUTF16( str ); - return ret; - } - - // assign from encoding - - wxUString &assignFromAscii( const char *str ); - wxUString &assignFromAscii( const char *str, size_type n ); - wxUString &assignFromUTF8( const char *str ); - wxUString &assignFromUTF8( const char *str, size_type n ); - wxUString &assignFromUTF16( const wxChar16* str ); - wxUString &assignFromUTF16( const wxChar16* str, size_type n ); - wxUString &assignFromCString( const char* str ); - wxUString &assignFromCString( const char* str, const wxMBConv &conv ); - - // conversions - - wxScopedCharBuffer utf8_str() const; - wxScopedU16CharBuffer utf16_str() const; - -#if SIZEOF_WCHAR_T == 2 - wxScopedWCharBuffer wc_str() const - { - return utf16_str(); - } -#else - const wchar_t *wc_str() const - { - return c_str(); - } -#endif - - operator wxString() const - { -#if wxUSE_UNICODE_UTF8 - return wxString::FromUTF8( utf8_str() ); -#else -#if SIZEOF_WCHAR_T == 2 - return wxString( utf16_str() ); -#else - return wxString( c_str() ); -#endif -#endif - } - -#if wxUSE_UNICODE_UTF8 - wxScopedCharBuffer wx_str() const - { - return utf8_str(); - } -#else -#if SIZEOF_WCHAR_T == 2 - wxScopedWCharBuffer wx_str() const - { - return utf16_str(); - } -#else - const wchar_t* wx_str() const - { - return c_str(); - } -#endif -#endif - - // assign - - wxUString &assign( const wxChar32* str ) - { - std::basic_string *base = this; - return (wxUString &) base->assign( str ); - } - - wxUString &assign( const wxChar32* str, size_type n ) - { - std::basic_string *base = this; - return (wxUString &) base->assign( str, n ); - } - - wxUString &assign( const wxUString &str ) - { - std::basic_string *base = this; - return (wxUString &) base->assign( str ); - } - - wxUString &assign( const wxUString &str, size_type pos, size_type n ) - { - std::basic_string *base = this; - return (wxUString &) base->assign( str, pos, n ); - } - - wxUString &assign( wxChar32 ch ) - { - std::basic_string *base = this; - return (wxUString &) base->assign( (size_type) 1, ch ); - } - - wxUString &assign( size_type n, wxChar32 ch ) - { - std::basic_string *base = this; - return (wxUString &) base->assign( n, ch ); - } - - wxUString &assign( const wxScopedU32CharBuffer &buf ) - { - return assign( buf.data() ); - } - - wxUString &assign( const char *str ) - { - return assignFromCString( str ); - } - - wxUString &assign( const wxScopedCharBuffer &buf ) - { - return assignFromCString( buf.data() ); - } - - wxUString &assign( const char *str, const wxMBConv &conv ) - { - return assignFromCString( str, conv ); - } - - wxUString &assign( const wxScopedCharBuffer &buf, const wxMBConv &conv ) - { - return assignFromCString( buf.data(), conv ); - } - - wxUString &assign( const wxChar16 *str ) - { - return assignFromUTF16( str ); - } - - wxUString &assign( const wxScopedU16CharBuffer &buf ) - { - return assignFromUTF16( buf.data() ); - } - - wxUString &assign( const wxCStrData *cstr ) - { -#if SIZEOF_WCHAR_T == 2 - return assignFromUTF16( cstr->AsWChar() ); -#else - return assign( cstr->AsWChar() ); -#endif - } - - wxUString &assign( const wxString &str ) - { -#if wxUSE_UNICODE_UTF8 - return assignFromUTF8( str.wx_str() ); -#else - #if SIZEOF_WCHAR_T == 2 - return assignFromUTF16( str.wc_str() ); - #else - return assign( str.wc_str() ); - #endif -#endif - } - - wxUString &assign( char ch ) - { - char buf[2]; - buf[0] = ch; - buf[1] = 0; - return assignFromCString( buf ); - } - - wxUString &assign( size_type n, char ch ) - { - wxCharBuffer buffer(n); - char *p = buffer.data(); - size_type i; - for (i = 0; i < n; i++) - { - *p = ch; - p++; - } - return assignFromCString( buffer.data() ); - } - - wxUString &assign( wxChar16 ch ) - { - wxChar16 buf[2]; - buf[0] = ch; - buf[1] = 0; - return assignFromUTF16( buf ); - } - - wxUString &assign( size_type n, wxChar16 ch ) - { - wxU16CharBuffer buffer(n); - wxChar16 *p = buffer.data(); - size_type i; - for (i = 0; i < n; i++) - { - *p = ch; - p++; - } - return assignFromUTF16( buffer.data() ); - } - - wxUString &assign( wxUniChar ch ) - { - return assign( (wxChar32) ch.GetValue() ); - } - - wxUString &assign( size_type n, wxUniChar ch ) - { - return assign( n, (wxChar32) ch.GetValue() ); - } - - wxUString &assign( wxUniCharRef ch ) - { - return assign( (wxChar32) ch.GetValue() ); - } - - wxUString &assign( size_type n, wxUniCharRef ch ) - { - return assign( n, (wxChar32) ch.GetValue() ); - } - - // append [STL overload] - - wxUString &append( const wxUString &s ) - { - std::basic_string *base = this; - return (wxUString &) base->append( s ); - } - - wxUString &append( const wxUString &s, size_type pos, size_type n ) - { - std::basic_string *base = this; - return (wxUString &) base->append( s, pos, n ); - } - - wxUString &append( const wxChar32* s ) - { - std::basic_string *base = this; - return (wxUString &) base->append( s ); - } - - wxUString &append( const wxChar32* s, size_type n ) - { - std::basic_string *base = this; - return (wxUString &) base->append( s, n ); - } - - wxUString &append( size_type n, wxChar32 c ) - { - std::basic_string *base = this; - return (wxUString &) base->append( n, c ); - } - - wxUString &append( wxChar32 c ) - { - std::basic_string *base = this; - return (wxUString &) base->append( 1, c ); - } - - // append [wx overload] - - wxUString &append( const wxScopedU16CharBuffer &buf ) - { - return append( buf.data() ); - } - - wxUString &append( const wxScopedU32CharBuffer &buf ) - { - return append( buf.data() ); - } - - wxUString &append( const char *str ) - { - return append( wxUString( str ) ); - } - - wxUString &append( const wxScopedCharBuffer &buf ) - { - return append( wxUString( buf ) ); - } - - wxUString &append( const wxChar16 *str ) - { - return append( wxUString( str ) ); - } - - wxUString &append( const wxString &str ) - { - return append( wxUString( str ) ); - } - - wxUString &append( const wxCStrData *cstr ) - { - return append( wxUString( cstr ) ); - } - - wxUString &append( char ch ) - { - char buf[2]; - buf[0] = ch; - buf[1] = 0; - return append( buf ); - } - - wxUString &append( wxChar16 ch ) - { - wxChar16 buf[2]; - buf[0] = ch; - buf[1] = 0; - return append( buf ); - } - - wxUString &append( wxUniChar ch ) - { - return append( (size_type) 1, (wxChar32) ch.GetValue() ); - } - - wxUString &append( wxUniCharRef ch ) - { - return append( (size_type) 1, (wxChar32) ch.GetValue() ); - } - - - // insert [STL overloads] - - wxUString &insert( size_type pos, const wxUString &s ) - { - std::basic_string *base = this; - return (wxUString &) base->insert( pos, s ); - } - - wxUString &insert( size_type pos, const wxUString &s, size_type pos1, size_type n ) - { - std::basic_string *base = this; - return (wxUString &) base->insert( pos, s, pos1, n ); - } - - wxUString &insert( size_type pos, const wxChar32 *s ) - { - std::basic_string *base = this; - return (wxUString &) base->insert( pos, s ); - } - - wxUString &insert( size_type pos, const wxChar32 *s, size_type n ) - { - std::basic_string *base = this; - return (wxUString &) base->insert( pos, s, n ); - } - - wxUString &insert( size_type pos, size_type n, wxChar32 c ) - { - std::basic_string *base = this; - return (wxUString &) base->insert( pos, n, c ); - } - - - // insert [STL overloads] - - wxUString &insert( size_type n, const char *s ) - { - return insert( n, wxUString( s ) ); - } - - wxUString &insert( size_type n, const wxChar16 *s ) - { - return insert( n, wxUString( s ) ); - } - - wxUString &insert( size_type n, const wxScopedCharBuffer &buf ) - { - return insert( n, wxUString( buf ) ); - } - - wxUString &insert( size_type n, const wxScopedU16CharBuffer &buf ) - { - return insert( n, wxUString( buf ) ); - } - - wxUString &insert( size_type n, const wxScopedU32CharBuffer &buf ) - { - return insert( n, buf.data() ); - } - - wxUString &insert( size_type n, const wxString &s ) - { - return insert( n, wxUString( s ) ); - } - - wxUString &insert( size_type n, const wxCStrData *cstr ) - { - return insert( n, wxUString( cstr ) ); - } - - wxUString &insert( size_type n, char ch ) - { - char buf[2]; - buf[0] = ch; - buf[1] = 0; - return insert( n, buf ); - } - - wxUString &insert( size_type n, wchar_t ch ) - { - wchar_t buf[2]; - buf[0] = ch; - buf[1] = 0; - return insert( n, buf ); - } - - // insert iterator - - iterator insert( iterator it, wxChar32 ch ) - { - std::basic_string *base = this; - return base->insert( it, ch ); - } - - void insert(iterator it, const_iterator first, const_iterator last) - { - std::basic_string *base = this; - base->insert( it, first, last ); - } - - - // operator = - wxUString& operator=(const wxString& s) - { return assign( s ); } - wxUString& operator=(const wxCStrData* s) - { return assign( s ); } - wxUString& operator=(const char *s) - { return assign( s ); } - wxUString& operator=(const wxChar16 *s) - { return assign( s ); } - wxUString& operator=(const wxChar32 *s) - { return assign( s ); } - wxUString& operator=(const wxScopedCharBuffer &s) - { return assign( s ); } - wxUString& operator=(const wxScopedU16CharBuffer &s) - { return assign( s ); } - wxUString& operator=(const wxScopedU32CharBuffer &s) - { return assign( s ); } - wxUString& operator=(char ch) - { return assign( ch ); } - wxUString& operator=(wxChar16 ch) - { return assign( ch ); } - wxUString& operator=(wxChar32 ch) - { return assign( ch ); } - wxUString& operator=(wxUniChar ch) - { return assign( ch ); } - wxUString& operator=(const wxUniCharRef ch) - { return assign( ch ); } - - // operator += - wxUString& operator+=(const wxUString& s) - { return append( s ); } - wxUString& operator+=(const wxString& s) - { return append( s ); } - wxUString& operator+=(const wxCStrData* s) - { return append( s ); } - wxUString& operator+=(const char *s) - { return append( s ); } - wxUString& operator+=(const wxChar16 *s) - { return append( s ); } - wxUString& operator+=(const wxChar32 *s) - { return append( s ); } - wxUString& operator+=(const wxScopedCharBuffer &s) - { return append( s ); } - wxUString& operator+=(const wxScopedU16CharBuffer &s) - { return append( s ); } - wxUString& operator+=(const wxScopedU32CharBuffer &s) - { return append( s ); } - wxUString& operator+=(char ch) - { return append( ch ); } - wxUString& operator+=(wxChar16 ch) - { return append( ch ); } - wxUString& operator+=(wxChar32 ch) - { return append( ch ); } - wxUString& operator+=(wxUniChar ch) - { return append( ch ); } - wxUString& operator+=(const wxUniCharRef ch) - { return append( ch ); } - -}; - -#ifdef __VISUALC__ - #pragma warning(pop) -#endif - -inline wxUString operator+(const wxUString &s1, const wxUString &s2) - { wxUString ret( s1 ); ret.append( s2 ); return ret; } -inline wxUString operator+(const wxUString &s1, const char *s2) - { return s1 + wxUString(s2); } -inline wxUString operator+(const wxUString &s1, const wxString &s2) - { return s1 + wxUString(s2); } -inline wxUString operator+(const wxUString &s1, const wxCStrData *s2) - { return s1 + wxUString(s2); } -inline wxUString operator+(const wxUString &s1, const wxChar16* s2) - { return s1 + wxUString(s2); } -inline wxUString operator+(const wxUString &s1, const wxChar32 *s2) - { return s1 + wxUString(s2); } -inline wxUString operator+(const wxUString &s1, const wxScopedCharBuffer &s2) - { return s1 + wxUString(s2); } -inline wxUString operator+(const wxUString &s1, const wxScopedU16CharBuffer &s2) - { return s1 + wxUString(s2); } -inline wxUString operator+(const wxUString &s1, const wxScopedU32CharBuffer &s2) - { return s1 + wxUString(s2); } -inline wxUString operator+(const wxUString &s1, char s2) - { return s1 + wxUString(s2); } -inline wxUString operator+(const wxUString &s1, wxChar32 s2) - { wxUString ret( s1 ); ret.append( s2 ); return ret; } -inline wxUString operator+(const wxUString &s1, wxChar16 s2) - { wxUString ret( s1 ); ret.append( (wxChar32) s2 ); return ret; } -inline wxUString operator+(const wxUString &s1, wxUniChar s2) - { wxUString ret( s1 ); ret.append( (wxChar32) s2.GetValue() ); return ret; } -inline wxUString operator+(const wxUString &s1, wxUniCharRef s2) - { wxUString ret( s1 ); ret.append( (wxChar32) s2.GetValue() ); return ret; } - -inline wxUString operator+(const char *s1, const wxUString &s2) - { return wxUString(s1) + s2; } -inline wxUString operator+(const wxString &s1, const wxUString &s2) - { return wxUString(s1) + s2; } -inline wxUString operator+(const wxCStrData *s1, const wxUString &s2) - { return wxUString(s1) + s2; } -inline wxUString operator+(const wxChar16* s1, const wxUString &s2) - { return wxUString(s1) + s2; } -inline wxUString operator+(const wxChar32 *s1, const wxUString &s2) - { return wxUString(s1) + s2; } -inline wxUString operator+(const wxScopedCharBuffer &s1, const wxUString &s2) - { return wxUString(s1) + s2; } -inline wxUString operator+(const wxScopedU16CharBuffer &s1, const wxUString &s2) - { return wxUString(s1) + s2; } -inline wxUString operator+(const wxScopedU32CharBuffer &s1, const wxUString &s2) - { return wxUString(s1) + s2; } -inline wxUString operator+(char s1, const wxUString &s2) - { return wxUString(s1) + s2; } -inline wxUString operator+(wxChar32 s1, const wxUString &s2 ) - { return wxUString(s1) + s2; } -inline wxUString operator+(wxChar16 s1, const wxUString &s2) - { return wxUString(s1) + s2; } -inline wxUString operator+(wxUniChar s1, const wxUString &s2) - { return wxUString(s1) + s2; } -inline wxUString operator+(wxUniCharRef s1, const wxUString &s2) - { return wxUString(s1) + s2; } - - -inline bool operator==(const wxUString& s1, const wxUString& s2) - { return s1.compare( s2 ) == 0; } -inline bool operator!=(const wxUString& s1, const wxUString& s2) - { return s1.compare( s2 ) != 0; } -inline bool operator< (const wxUString& s1, const wxUString& s2) - { return s1.compare( s2 ) < 0; } -inline bool operator> (const wxUString& s1, const wxUString& s2) - { return s1.compare( s2 ) > 0; } -inline bool operator<=(const wxUString& s1, const wxUString& s2) - { return s1.compare( s2 ) <= 0; } -inline bool operator>=(const wxUString& s1, const wxUString& s2) - { return s1.compare( s2 ) >= 0; } - -#define wxUSTRING_COMP_OPERATORS( T ) \ -inline bool operator==(const wxUString& s1, T s2) \ - { return s1.compare( wxUString(s2) ) == 0; } \ -inline bool operator!=(const wxUString& s1, T s2) \ - { return s1.compare( wxUString(s2) ) != 0; } \ -inline bool operator< (const wxUString& s1, T s2) \ - { return s1.compare( wxUString(s2) ) < 0; } \ -inline bool operator> (const wxUString& s1, T s2) \ - { return s1.compare( wxUString(s2) ) > 0; } \ -inline bool operator<=(const wxUString& s1, T s2) \ - { return s1.compare( wxUString(s2) ) <= 0; } \ -inline bool operator>=(const wxUString& s1, T s2) \ - { return s1.compare( wxUString(s2) ) >= 0; } \ -\ -inline bool operator==(T s2, const wxUString& s1) \ - { return s1.compare( wxUString(s2) ) == 0; } \ -inline bool operator!=(T s2, const wxUString& s1) \ - { return s1.compare( wxUString(s2) ) != 0; } \ -inline bool operator< (T s2, const wxUString& s1) \ - { return s1.compare( wxUString(s2) ) > 0; } \ -inline bool operator> (T s2, const wxUString& s1) \ - { return s1.compare( wxUString(s2) ) < 0; } \ -inline bool operator<=(T s2, const wxUString& s1) \ - { return s1.compare( wxUString(s2) ) >= 0; } \ -inline bool operator>=(T s2, const wxUString& s1) \ - { return s1.compare( wxUString(s2) ) <= 0; } - -wxUSTRING_COMP_OPERATORS( const wxString & ) -wxUSTRING_COMP_OPERATORS( const char * ) -wxUSTRING_COMP_OPERATORS( const wxChar16 * ) -wxUSTRING_COMP_OPERATORS( const wxChar32 * ) -wxUSTRING_COMP_OPERATORS( const wxScopedCharBuffer & ) -wxUSTRING_COMP_OPERATORS( const wxScopedU16CharBuffer & ) -wxUSTRING_COMP_OPERATORS( const wxScopedU32CharBuffer & ) -wxUSTRING_COMP_OPERATORS( const wxCStrData * ) - -#endif // _WX_USTRING_H_ diff --git a/Externals/wxWidgets3/include/wx/utils.h b/Externals/wxWidgets3/include/wx/utils.h deleted file mode 100644 index eda281cb8d..0000000000 --- a/Externals/wxWidgets3/include/wx/utils.h +++ /dev/null @@ -1,832 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/utils.h -// Purpose: Miscellaneous utilities -// Author: Julian Smart -// Modified by: -// Created: 29/01/98 -// Copyright: (c) 1998 Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_UTILS_H_ -#define _WX_UTILS_H_ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/object.h" -#include "wx/list.h" -#include "wx/filefn.h" -#include "wx/hashmap.h" -#include "wx/versioninfo.h" -#include "wx/meta/implicitconversion.h" - -#if wxUSE_GUI - #include "wx/gdicmn.h" - #include "wx/mousestate.h" -#endif - -class WXDLLIMPEXP_FWD_BASE wxArrayString; -class WXDLLIMPEXP_FWD_BASE wxArrayInt; - -// need this for wxGetDiskSpace() as we can't, unfortunately, forward declare -// wxLongLong -#include "wx/longlong.h" - -// needed for wxOperatingSystemId, wxLinuxDistributionInfo -#include "wx/platinfo.h" - -#if defined(__X__) - #include - #include -#endif - -#include - -// ---------------------------------------------------------------------------- -// Forward declaration -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_BASE wxProcess; -class WXDLLIMPEXP_FWD_CORE wxFrame; -class WXDLLIMPEXP_FWD_CORE wxWindow; -class wxWindowList; -class WXDLLIMPEXP_FWD_CORE wxEventLoop; - -// ---------------------------------------------------------------------------- -// Arithmetic functions -// ---------------------------------------------------------------------------- - -template -inline typename wxImplicitConversionType::value -wxMax(T1 a, T2 b) -{ - typedef typename wxImplicitConversionType::value ResultType; - - // Cast both operands to the same type before comparing them to avoid - // warnings about signed/unsigned comparisons from some compilers: - return static_cast(a) > static_cast(b) ? a : b; -} - -template -inline typename wxImplicitConversionType::value -wxMin(T1 a, T2 b) -{ - typedef typename wxImplicitConversionType::value ResultType; - - return static_cast(a) < static_cast(b) ? a : b; -} - -template -inline typename wxImplicitConversionType3::value -wxClip(T1 a, T2 b, T3 c) -{ - typedef typename wxImplicitConversionType3::value ResultType; - - if ( static_cast(a) < static_cast(b) ) - return b; - - if ( static_cast(a) > static_cast(c) ) - return c; - - return a; -} - -// ---------------------------------------------------------------------------- -// wxMemorySize -// ---------------------------------------------------------------------------- - -// wxGetFreeMemory can return huge amount of memory on 32-bit platforms as well -// so to always use long long for its result type on all platforms which -// support it -#if wxUSE_LONGLONG - typedef wxLongLong wxMemorySize; -#else - typedef long wxMemorySize; -#endif - -// ---------------------------------------------------------------------------- -// String functions (deprecated, use wxString) -// ---------------------------------------------------------------------------- - -#if WXWIN_COMPATIBILITY_2_8 -// A shorter way of using strcmp -wxDEPRECATED_INLINE(inline bool wxStringEq(const char *s1, const char *s2), - return wxCRT_StrcmpA(s1, s2) == 0; ) - -#if wxUSE_UNICODE -wxDEPRECATED_INLINE(inline bool wxStringEq(const wchar_t *s1, const wchar_t *s2), - return wxCRT_StrcmpW(s1, s2) == 0; ) -#endif // wxUSE_UNICODE - -#endif // WXWIN_COMPATIBILITY_2_8 - -// ---------------------------------------------------------------------------- -// Miscellaneous functions -// ---------------------------------------------------------------------------- - -// Sound the bell -WXDLLIMPEXP_CORE void wxBell(); - -#if wxUSE_MSGDLG -// Show wxWidgets information -WXDLLIMPEXP_CORE void wxInfoMessageBox(wxWindow* parent); -#endif // wxUSE_MSGDLG - -WXDLLIMPEXP_CORE wxVersionInfo wxGetLibraryVersionInfo(); - -// Get OS description as a user-readable string -WXDLLIMPEXP_BASE wxString wxGetOsDescription(); - -// Get OS version -WXDLLIMPEXP_BASE wxOperatingSystemId wxGetOsVersion(int *verMaj = NULL, - int *verMin = NULL, - int *verMicro = NULL); - -// Check is OS version is at least the specified major and minor version -WXDLLIMPEXP_BASE bool wxCheckOsVersion(int majorVsn, int minorVsn = 0, int microVsn = 0); - -// Get platform endianness -WXDLLIMPEXP_BASE bool wxIsPlatformLittleEndian(); - -// Get platform architecture -WXDLLIMPEXP_BASE bool wxIsPlatform64Bit(); - -#ifdef __LINUX__ -// Get linux-distro informations -WXDLLIMPEXP_BASE wxLinuxDistributionInfo wxGetLinuxDistributionInfo(); -#endif - -// Return a string with the current date/time -WXDLLIMPEXP_BASE wxString wxNow(); - -// Return path where wxWidgets is installed (mostly useful in Unices) -WXDLLIMPEXP_BASE const wxChar *wxGetInstallPrefix(); -// Return path to wxWin data (/usr/share/wx/%{version}) (Unices) -WXDLLIMPEXP_BASE wxString wxGetDataDir(); - -#if wxUSE_GUI - -// Get the state of a key (true if pressed, false if not) -// This is generally most useful getting the state of -// the modifier or toggle keys. -WXDLLIMPEXP_CORE bool wxGetKeyState(wxKeyCode key); - -// Don't synthesize KeyUp events holding down a key and producing -// KeyDown events with autorepeat. On by default and always on -// in wxMSW. -WXDLLIMPEXP_CORE bool wxSetDetectableAutoRepeat( bool flag ); - -// Returns the current state of the mouse position, buttons and modifers -WXDLLIMPEXP_CORE wxMouseState wxGetMouseState(); - -#endif // wxUSE_GUI - -// ---------------------------------------------------------------------------- -// wxPlatform -// ---------------------------------------------------------------------------- - -/* - * Class to make it easier to specify platform-dependent values - * - * Examples: - * long val = wxPlatform::If(wxMac, 1).ElseIf(wxGTK, 2).ElseIf(stPDA, 5).Else(3); - * wxString strVal = wxPlatform::If(wxMac, wxT("Mac")).ElseIf(wxMSW, wxT("MSW")).Else(wxT("Other")); - * - * A custom platform symbol: - * - * #define stPDA 100 - * #ifdef __WXWINCE__ - * wxPlatform::AddPlatform(stPDA); - * #endif - * - * long windowStyle = wxCAPTION | (long) wxPlatform::IfNot(stPDA, wxRESIZE_BORDER); - * - */ - -class WXDLLIMPEXP_BASE wxPlatform -{ -public: - wxPlatform() { Init(); } - wxPlatform(const wxPlatform& platform) { Copy(platform); } - void operator = (const wxPlatform& platform) { if (&platform != this) Copy(platform); } - void Copy(const wxPlatform& platform); - - // Specify an optional default value - wxPlatform(int defValue) { Init(); m_longValue = (long)defValue; } - wxPlatform(long defValue) { Init(); m_longValue = defValue; } - wxPlatform(const wxString& defValue) { Init(); m_stringValue = defValue; } - wxPlatform(double defValue) { Init(); m_doubleValue = defValue; } - - static wxPlatform If(int platform, long value); - static wxPlatform IfNot(int platform, long value); - wxPlatform& ElseIf(int platform, long value); - wxPlatform& ElseIfNot(int platform, long value); - wxPlatform& Else(long value); - - static wxPlatform If(int platform, int value) { return If(platform, (long)value); } - static wxPlatform IfNot(int platform, int value) { return IfNot(platform, (long)value); } - wxPlatform& ElseIf(int platform, int value) { return ElseIf(platform, (long) value); } - wxPlatform& ElseIfNot(int platform, int value) { return ElseIfNot(platform, (long) value); } - wxPlatform& Else(int value) { return Else((long) value); } - - static wxPlatform If(int platform, double value); - static wxPlatform IfNot(int platform, double value); - wxPlatform& ElseIf(int platform, double value); - wxPlatform& ElseIfNot(int platform, double value); - wxPlatform& Else(double value); - - static wxPlatform If(int platform, const wxString& value); - static wxPlatform IfNot(int platform, const wxString& value); - wxPlatform& ElseIf(int platform, const wxString& value); - wxPlatform& ElseIfNot(int platform, const wxString& value); - wxPlatform& Else(const wxString& value); - - long GetInteger() const { return m_longValue; } - const wxString& GetString() const { return m_stringValue; } - double GetDouble() const { return m_doubleValue; } - - operator int() const { return (int) GetInteger(); } - operator long() const { return GetInteger(); } - operator double() const { return GetDouble(); } - operator const wxString&() const { return GetString(); } - - static void AddPlatform(int platform); - static bool Is(int platform); - static void ClearPlatforms(); - -private: - - void Init() { m_longValue = 0; m_doubleValue = 0.0; } - - long m_longValue; - double m_doubleValue; - wxString m_stringValue; - static wxArrayInt* sm_customPlatforms; -}; - -/// Function for testing current platform -inline bool wxPlatformIs(int platform) { return wxPlatform::Is(platform); } - -// ---------------------------------------------------------------------------- -// Window ID management -// ---------------------------------------------------------------------------- - -// Ensure subsequent IDs don't clash with this one -WXDLLIMPEXP_BASE void wxRegisterId(int id); - -// Return the current ID -WXDLLIMPEXP_BASE int wxGetCurrentId(); - -// Generate a unique ID -WXDLLIMPEXP_BASE int wxNewId(); - -// ---------------------------------------------------------------------------- -// Various conversions -// ---------------------------------------------------------------------------- - -// Convert 2-digit hex number to decimal -WXDLLIMPEXP_BASE int wxHexToDec(const wxString& buf); - -// Convert 2-digit hex number to decimal -inline int wxHexToDec(const char* buf) -{ - int firstDigit, secondDigit; - - if (buf[0] >= 'A') - firstDigit = buf[0] - 'A' + 10; - else - firstDigit = buf[0] - '0'; - - if (buf[1] >= 'A') - secondDigit = buf[1] - 'A' + 10; - else - secondDigit = buf[1] - '0'; - - return (firstDigit & 0xF) * 16 + (secondDigit & 0xF ); -} - - -// Convert decimal integer to 2-character hex string -WXDLLIMPEXP_BASE void wxDecToHex(int dec, wxChar *buf); -WXDLLIMPEXP_BASE void wxDecToHex(int dec, char* ch1, char* ch2); -WXDLLIMPEXP_BASE wxString wxDecToHex(int dec); - -// ---------------------------------------------------------------------------- -// Process management -// ---------------------------------------------------------------------------- - -// NB: for backwards compatibility reasons the values of wxEXEC_[A]SYNC *must* -// be 0 and 1, don't change! - -enum -{ - // execute the process asynchronously - wxEXEC_ASYNC = 0, - - // execute it synchronously, i.e. wait until it finishes - wxEXEC_SYNC = 1, - - // under Windows, don't hide the child even if it's IO is redirected (this - // is done by default) - wxEXEC_SHOW_CONSOLE = 2, - - // deprecated synonym for wxEXEC_SHOW_CONSOLE, use the new name as it's - // more clear - wxEXEC_NOHIDE = wxEXEC_SHOW_CONSOLE, - - // under Unix, if the process is the group leader then passing wxKILL_CHILDREN to wxKill - // kills all children as well as pid - // under Windows (NT family only), sets the CREATE_NEW_PROCESS_GROUP flag, - // which allows to target Ctrl-Break signal to the spawned process. - // applies to console processes only. - wxEXEC_MAKE_GROUP_LEADER = 4, - - // by default synchronous execution disables all program windows to avoid - // that the user interacts with the program while the child process is - // running, you can use this flag to prevent this from happening - wxEXEC_NODISABLE = 8, - - // by default, the event loop is run while waiting for synchronous execution - // to complete and this flag can be used to simply block the main process - // until the child process finishes - wxEXEC_NOEVENTS = 16, - - // under Windows, hide the console of the child process if it has one, even - // if its IO is not redirected - wxEXEC_HIDE_CONSOLE = 32, - - // convenient synonym for flags given system()-like behaviour - wxEXEC_BLOCK = wxEXEC_SYNC | wxEXEC_NOEVENTS -}; - -// Map storing environment variables. -typedef wxStringToStringHashMap wxEnvVariableHashMap; - -// Used to pass additional parameters for child process to wxExecute(). Could -// be extended with other fields later. -struct wxExecuteEnv -{ - wxString cwd; // If empty, CWD is not changed. - wxEnvVariableHashMap env; // If empty, environment is unchanged. -}; - -// Execute another program. -// -// If flags contain wxEXEC_SYNC, return -1 on failure and the exit code of the -// process if everything was ok. Otherwise (i.e. if wxEXEC_ASYNC), return 0 on -// failure and the PID of the launched process if ok. -WXDLLIMPEXP_BASE long wxExecute(const wxString& command, - int flags = wxEXEC_ASYNC, - wxProcess *process = NULL, - const wxExecuteEnv *env = NULL); -WXDLLIMPEXP_BASE long wxExecute(char **argv, - int flags = wxEXEC_ASYNC, - wxProcess *process = NULL, - const wxExecuteEnv *env = NULL); -#if wxUSE_UNICODE -WXDLLIMPEXP_BASE long wxExecute(wchar_t **argv, - int flags = wxEXEC_ASYNC, - wxProcess *process = NULL, - const wxExecuteEnv *env = NULL); -#endif // wxUSE_UNICODE - -// execute the command capturing its output into an array line by line, this is -// always synchronous -WXDLLIMPEXP_BASE long wxExecute(const wxString& command, - wxArrayString& output, - int flags = 0, - const wxExecuteEnv *env = NULL); - -// also capture stderr (also synchronous) -WXDLLIMPEXP_BASE long wxExecute(const wxString& command, - wxArrayString& output, - wxArrayString& error, - int flags = 0, - const wxExecuteEnv *env = NULL); - -#if defined(__WINDOWS__) && wxUSE_IPC -// ask a DDE server to execute the DDE request with given parameters -WXDLLIMPEXP_BASE bool wxExecuteDDE(const wxString& ddeServer, - const wxString& ddeTopic, - const wxString& ddeCommand); -#endif // __WINDOWS__ && wxUSE_IPC - -enum wxSignal -{ - wxSIGNONE = 0, // verify if the process exists under Unix - wxSIGHUP, - wxSIGINT, - wxSIGQUIT, - wxSIGILL, - wxSIGTRAP, - wxSIGABRT, - wxSIGIOT = wxSIGABRT, // another name - wxSIGEMT, - wxSIGFPE, - wxSIGKILL, - wxSIGBUS, - wxSIGSEGV, - wxSIGSYS, - wxSIGPIPE, - wxSIGALRM, - wxSIGTERM - - // further signals are different in meaning between different Unix systems -}; - -enum wxKillError -{ - wxKILL_OK, // no error - wxKILL_BAD_SIGNAL, // no such signal - wxKILL_ACCESS_DENIED, // permission denied - wxKILL_NO_PROCESS, // no such process - wxKILL_ERROR // another, unspecified error -}; - -enum wxKillFlags -{ - wxKILL_NOCHILDREN = 0, // don't kill children - wxKILL_CHILDREN = 1 // kill children -}; - -enum wxShutdownFlags -{ - wxSHUTDOWN_FORCE = 1,// can be combined with other flags (MSW-only) - wxSHUTDOWN_POWEROFF = 2,// power off the computer - wxSHUTDOWN_REBOOT = 4,// shutdown and reboot - wxSHUTDOWN_LOGOFF = 8 // close session (currently MSW-only) -}; - -// Shutdown or reboot the PC -WXDLLIMPEXP_BASE bool wxShutdown(int flags = wxSHUTDOWN_POWEROFF); - -// send the given signal to the process (only NONE and KILL are supported under -// Windows, all others mean TERM), return 0 if ok and -1 on error -// -// return detailed error in rc if not NULL -WXDLLIMPEXP_BASE int wxKill(long pid, - wxSignal sig = wxSIGTERM, - wxKillError *rc = NULL, - int flags = wxKILL_NOCHILDREN); - -// Execute a command in an interactive shell window (always synchronously) -// If no command then just the shell -WXDLLIMPEXP_BASE bool wxShell(const wxString& command = wxEmptyString); - -// As wxShell(), but must give a (non interactive) command and its output will -// be returned in output array -WXDLLIMPEXP_BASE bool wxShell(const wxString& command, wxArrayString& output); - -// Sleep for nSecs seconds -WXDLLIMPEXP_BASE void wxSleep(int nSecs); - -// Sleep for a given amount of milliseconds -WXDLLIMPEXP_BASE void wxMilliSleep(unsigned long milliseconds); - -// Sleep for a given amount of microseconds -WXDLLIMPEXP_BASE void wxMicroSleep(unsigned long microseconds); - -#if WXWIN_COMPATIBILITY_2_8 -// Sleep for a given amount of milliseconds (old, bad name), use wxMilliSleep -wxDEPRECATED( WXDLLIMPEXP_BASE void wxUsleep(unsigned long milliseconds) ); -#endif - -// Get the process id of the current process -WXDLLIMPEXP_BASE unsigned long wxGetProcessId(); - -// Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX) -WXDLLIMPEXP_BASE wxMemorySize wxGetFreeMemory(); - -#if wxUSE_ON_FATAL_EXCEPTION - -// should wxApp::OnFatalException() be called? -WXDLLIMPEXP_BASE bool wxHandleFatalExceptions(bool doit = true); - -#endif // wxUSE_ON_FATAL_EXCEPTION - -// ---------------------------------------------------------------------------- -// Environment variables -// ---------------------------------------------------------------------------- - -// returns true if variable exists (value may be NULL if you just want to check -// for this) -WXDLLIMPEXP_BASE bool wxGetEnv(const wxString& var, wxString *value); - -// set the env var name to the given value, return true on success -WXDLLIMPEXP_BASE bool wxSetEnv(const wxString& var, const wxString& value); - -// remove the env var from environment -WXDLLIMPEXP_BASE bool wxUnsetEnv(const wxString& var); - -#if WXWIN_COMPATIBILITY_2_8 -inline bool wxSetEnv(const wxString& var, const char *value) - { return wxSetEnv(var, wxString(value)); } -inline bool wxSetEnv(const wxString& var, const wchar_t *value) - { return wxSetEnv(var, wxString(value)); } -template -inline bool wxSetEnv(const wxString& var, const wxScopedCharTypeBuffer& value) - { return wxSetEnv(var, wxString(value)); } -inline bool wxSetEnv(const wxString& var, const wxCStrData& value) - { return wxSetEnv(var, wxString(value)); } - -// this one is for passing NULL directly - don't use it, use wxUnsetEnv instead -wxDEPRECATED( inline bool wxSetEnv(const wxString& var, int value) ); -inline bool wxSetEnv(const wxString& var, int value) -{ - wxASSERT_MSG( value == 0, "using non-NULL integer as string?" ); - - wxUnusedVar(value); // fix unused parameter warning in release build - - return wxUnsetEnv(var); -} -#endif // WXWIN_COMPATIBILITY_2_8 - -// Retrieve the complete environment by filling specified map. -// Returns true on success or false if an error occurred. -WXDLLIMPEXP_BASE bool wxGetEnvMap(wxEnvVariableHashMap *map); - -// ---------------------------------------------------------------------------- -// Network and username functions. -// ---------------------------------------------------------------------------- - -// NB: "char *" functions are deprecated, use wxString ones! - -// Get eMail address -WXDLLIMPEXP_BASE bool wxGetEmailAddress(wxChar *buf, int maxSize); -WXDLLIMPEXP_BASE wxString wxGetEmailAddress(); - -// Get hostname. -WXDLLIMPEXP_BASE bool wxGetHostName(wxChar *buf, int maxSize); -WXDLLIMPEXP_BASE wxString wxGetHostName(); - -// Get FQDN -WXDLLIMPEXP_BASE wxString wxGetFullHostName(); -WXDLLIMPEXP_BASE bool wxGetFullHostName(wxChar *buf, int maxSize); - -// Get user ID e.g. jacs (this is known as login name under Unix) -WXDLLIMPEXP_BASE bool wxGetUserId(wxChar *buf, int maxSize); -WXDLLIMPEXP_BASE wxString wxGetUserId(); - -// Get user name e.g. Julian Smart -WXDLLIMPEXP_BASE bool wxGetUserName(wxChar *buf, int maxSize); -WXDLLIMPEXP_BASE wxString wxGetUserName(); - -// Get current Home dir and copy to dest (returns pstr->c_str()) -WXDLLIMPEXP_BASE wxString wxGetHomeDir(); -WXDLLIMPEXP_BASE const wxChar* wxGetHomeDir(wxString *pstr); - -// Get the user's (by default use the current user name) home dir, -// return empty string on error -WXDLLIMPEXP_BASE wxString wxGetUserHome(const wxString& user = wxEmptyString); - - -#if wxUSE_LONGLONG - typedef wxLongLong wxDiskspaceSize_t; -#else - typedef long wxDiskspaceSize_t; -#endif - -// get number of total/free bytes on the disk where path belongs -WXDLLIMPEXP_BASE bool wxGetDiskSpace(const wxString& path, - wxDiskspaceSize_t *pTotal = NULL, - wxDiskspaceSize_t *pFree = NULL); - - - -typedef int (*wxSortCallback)(const void* pItem1, - const void* pItem2, - const void* user_data); - - -WXDLLIMPEXP_BASE void wxQsort(void* pbase, size_t total_elems, - size_t size, wxSortCallback cmp, - const void* user_data); - - -#if wxUSE_GUI // GUI only things from now on - -// ---------------------------------------------------------------------------- -// Launch default browser -// ---------------------------------------------------------------------------- - -// flags for wxLaunchDefaultBrowser -enum -{ - wxBROWSER_NEW_WINDOW = 0x01, - wxBROWSER_NOBUSYCURSOR = 0x02 -}; - -// Launch url in the user's default internet browser -WXDLLIMPEXP_CORE bool wxLaunchDefaultBrowser(const wxString& url, int flags = 0); - -// Launch document in the user's default application -WXDLLIMPEXP_CORE bool wxLaunchDefaultApplication(const wxString& path, int flags = 0); - -// ---------------------------------------------------------------------------- -// Menu accelerators related things -// ---------------------------------------------------------------------------- - -// flags for wxStripMenuCodes -enum -{ - // strip '&' characters - wxStrip_Mnemonics = 1, - - // strip everything after '\t' - wxStrip_Accel = 2, - - // strip everything (this is the default) - wxStrip_All = wxStrip_Mnemonics | wxStrip_Accel -}; - -// strip mnemonics and/or accelerators from the label -WXDLLIMPEXP_CORE wxString -wxStripMenuCodes(const wxString& str, int flags = wxStrip_All); - -// ---------------------------------------------------------------------------- -// Window search -// ---------------------------------------------------------------------------- - -// Returns menu item id or wxNOT_FOUND if none. -WXDLLIMPEXP_CORE int wxFindMenuItemId(wxFrame *frame, const wxString& menuString, const wxString& itemString); - -// Find the wxWindow at the given point. wxGenericFindWindowAtPoint -// is always present but may be less reliable than a native version. -WXDLLIMPEXP_CORE wxWindow* wxGenericFindWindowAtPoint(const wxPoint& pt); -WXDLLIMPEXP_CORE wxWindow* wxFindWindowAtPoint(const wxPoint& pt); - -// NB: this function is obsolete, use wxWindow::FindWindowByLabel() instead -// -// Find the window/widget with the given title or label. -// Pass a parent to begin the search from, or NULL to look through -// all windows. -WXDLLIMPEXP_CORE wxWindow* wxFindWindowByLabel(const wxString& title, wxWindow *parent = NULL); - -// NB: this function is obsolete, use wxWindow::FindWindowByName() instead -// -// Find window by name, and if that fails, by label. -WXDLLIMPEXP_CORE wxWindow* wxFindWindowByName(const wxString& name, wxWindow *parent = NULL); - -// ---------------------------------------------------------------------------- -// Message/event queue helpers -// ---------------------------------------------------------------------------- - -// Yield to other apps/messages and disable user input -WXDLLIMPEXP_CORE bool wxSafeYield(wxWindow *win = NULL, bool onlyIfNeeded = false); - -// Enable or disable input to all top level windows -WXDLLIMPEXP_CORE void wxEnableTopLevelWindows(bool enable = true); - -// Check whether this window wants to process messages, e.g. Stop button -// in long calculations. -WXDLLIMPEXP_CORE bool wxCheckForInterrupt(wxWindow *wnd); - -// Consume all events until no more left -WXDLLIMPEXP_CORE void wxFlushEvents(); - -// a class which disables all windows (except, may be, the given one) in its -// ctor and enables them back in its dtor -class WXDLLIMPEXP_CORE wxWindowDisabler -{ -public: - // this ctor conditionally disables all windows: if the argument is false, - // it doesn't do anything - wxWindowDisabler(bool disable = true); - - // ctor disables all windows except winToSkip - wxWindowDisabler(wxWindow *winToSkip); - - // dtor enables back all windows disabled by the ctor - ~wxWindowDisabler(); - -private: - // disable all windows except the given one (used by both ctors) - void DoDisable(wxWindow *winToSkip = NULL); - -#if defined(__WXOSX__) && wxOSX_USE_COCOA - wxEventLoop* m_modalEventLoop; -#endif - wxWindowList *m_winDisabled; - bool m_disabled; - - wxDECLARE_NO_COPY_CLASS(wxWindowDisabler); -}; - -// ---------------------------------------------------------------------------- -// Cursors -// ---------------------------------------------------------------------------- - -// Set the cursor to the busy cursor for all windows -WXDLLIMPEXP_CORE void wxBeginBusyCursor(const wxCursor *cursor = wxHOURGLASS_CURSOR); - -// Restore cursor to normal -WXDLLIMPEXP_CORE void wxEndBusyCursor(); - -// true if we're between the above two calls -WXDLLIMPEXP_CORE bool wxIsBusy(); - -// Convenience class so we can just create a wxBusyCursor object on the stack -class WXDLLIMPEXP_CORE wxBusyCursor -{ -public: - wxBusyCursor(const wxCursor* cursor = wxHOURGLASS_CURSOR) - { wxBeginBusyCursor(cursor); } - ~wxBusyCursor() - { wxEndBusyCursor(); } - - // FIXME: These two methods are currently only implemented (and needed?) - // in wxGTK. BusyCursor handling should probably be moved to - // common code since the wxGTK and wxMSW implementations are very - // similar except for wxMSW using HCURSOR directly instead of - // wxCursor.. -- RL. - static const wxCursor &GetStoredCursor(); - static const wxCursor GetBusyCursor(); -}; - -void WXDLLIMPEXP_CORE wxGetMousePosition( int* x, int* y ); - -// ---------------------------------------------------------------------------- -// X11 Display access -// ---------------------------------------------------------------------------- - -#if defined(__X__) || defined(__WXGTK__) - -#ifdef __WXGTK__ - WXDLLIMPEXP_CORE void *wxGetDisplay(); -#endif - -#ifdef __X__ - WXDLLIMPEXP_CORE WXDisplay *wxGetDisplay(); - WXDLLIMPEXP_CORE bool wxSetDisplay(const wxString& display_name); - WXDLLIMPEXP_CORE wxString wxGetDisplayName(); -#endif // X or GTK+ - -// use this function instead of the functions above in implementation code -inline struct _XDisplay *wxGetX11Display() -{ - return (_XDisplay *)wxGetDisplay(); -} - -#endif // X11 || wxGTK - -#endif // wxUSE_GUI - -// ---------------------------------------------------------------------------- -// wxYield(): these functions are obsolete, please use wxApp methods instead! -// ---------------------------------------------------------------------------- - -// avoid redeclaring this function here if it had been already declated by -// wx/app.h, this results in warnings from g++ with -Wredundant-decls -#ifndef wx_YIELD_DECLARED -#define wx_YIELD_DECLARED - -// Yield to other apps/messages -WXDLLIMPEXP_CORE bool wxYield(); - -#endif // wx_YIELD_DECLARED - -// Like wxYield, but fails silently if the yield is recursive. -WXDLLIMPEXP_CORE bool wxYieldIfNeeded(); - -// ---------------------------------------------------------------------------- -// Windows resources access -// ---------------------------------------------------------------------------- - -// Windows only: get user-defined resource from the .res file. -#ifdef __WINDOWS__ - // default resource type for wxLoadUserResource() - extern WXDLLIMPEXP_DATA_BASE(const wxChar*) wxUserResourceStr; - - // Return the pointer to the resource data. This pointer is read-only, use - // the overload below if you need to modify the data. - // - // Notice that the resource type can be either a real string or an integer - // produced by MAKEINTRESOURCE(). In particular, any standard resource type, - // i.e any RT_XXX constant, could be passed here. - // - // Returns true on success, false on failure. Doesn't log an error message - // if the resource is not found (because this could be expected) but does - // log one if any other error occurs. - WXDLLIMPEXP_BASE bool - wxLoadUserResource(const void **outData, - size_t *outLen, - const wxString& resourceName, - const wxChar* resourceType = wxUserResourceStr, - WXHINSTANCE module = 0); - - // This function allocates a new buffer and makes a copy of the resource - // data, remember to delete[] the buffer. And avoid using it entirely if - // the overload above can be used. - // - // Returns NULL on failure. - WXDLLIMPEXP_BASE char* - wxLoadUserResource(const wxString& resourceName, - const wxChar* resourceType = wxUserResourceStr, - int* pLen = NULL, - WXHINSTANCE module = 0); -#endif // __WINDOWS__ - -#endif - // _WX_UTILSH__ diff --git a/Externals/wxWidgets3/include/wx/valgen.h b/Externals/wxWidgets3/include/wx/valgen.h deleted file mode 100644 index 995db4f86a..0000000000 --- a/Externals/wxWidgets3/include/wx/valgen.h +++ /dev/null @@ -1,94 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/valgen.h -// Purpose: wxGenericValidator class -// Author: Kevin Smith -// Created: Jan 22 1999 -// Copyright: (c) 1999 Julian Smart (assigned from Kevin) -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_VALGENH__ -#define _WX_VALGENH__ - -#include "wx/validate.h" - -#if wxUSE_VALIDATORS - -class WXDLLIMPEXP_FWD_BASE wxDateTime; -class WXDLLIMPEXP_FWD_BASE wxFileName; - -// ---------------------------------------------------------------------------- -// wxGenericValidator performs data transfer between many standard controls and -// variables of the type corresponding to their values. -// -// It doesn't do any validation so its name is a slight misnomer. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxGenericValidator: public wxValidator -{ -public: - // Different constructors: each of them creates a validator which can only - // be used with some controls, the comments before each constructor - // indicate which ones: - // wxCheckBox, wxRadioButton, wx(Bitmap)ToggleButton - wxGenericValidator(bool* val); - // wxChoice, wxGauge, wxRadioBox, wxScrollBar, wxSlider, wxSpinButton - wxGenericValidator(int* val); - // wxComboBox, wxTextCtrl, wxButton, wxStaticText (read-only) - wxGenericValidator(wxString* val); - // wxListBox, wxCheckListBox - wxGenericValidator(wxArrayInt* val); -#if wxUSE_DATETIME - // wxDatePickerCtrl - wxGenericValidator(wxDateTime* val); -#endif // wxUSE_DATETIME - // wxTextCtrl - wxGenericValidator(wxFileName* val); - // wxTextCtrl - wxGenericValidator(float* val); - // wxTextCtrl - wxGenericValidator(double* val); - - wxGenericValidator(const wxGenericValidator& copyFrom); - - virtual ~wxGenericValidator(){} - - // Make a clone of this validator (or return NULL) - currently necessary - // if you're passing a reference to a validator. - // Another possibility is to always pass a pointer to a new validator - // (so the calling code can use a copy constructor of the relevant class). - virtual wxObject *Clone() const wxOVERRIDE { return new wxGenericValidator(*this); } - bool Copy(const wxGenericValidator& val); - - // Called when the value in the window must be validated: this is not used - // by this class - virtual bool Validate(wxWindow * WXUNUSED(parent)) wxOVERRIDE { return true; } - - // Called to transfer data to the window - virtual bool TransferToWindow() wxOVERRIDE; - - // Called to transfer data to the window - virtual bool TransferFromWindow() wxOVERRIDE; - -protected: - void Initialize(); - - bool* m_pBool; - int* m_pInt; - wxString* m_pString; - wxArrayInt* m_pArrayInt; -#if wxUSE_DATETIME - wxDateTime* m_pDateTime; -#endif // wxUSE_DATETIME - wxFileName* m_pFileName; - float* m_pFloat; - double* m_pDouble; - -private: - wxDECLARE_CLASS(wxGenericValidator); - wxDECLARE_NO_ASSIGN_CLASS(wxGenericValidator); -}; - -#endif // wxUSE_VALIDATORS - -#endif // _WX_VALGENH__ diff --git a/Externals/wxWidgets3/include/wx/validate.h b/Externals/wxWidgets3/include/wx/validate.h deleted file mode 100644 index 477af1019a..0000000000 --- a/Externals/wxWidgets3/include/wx/validate.h +++ /dev/null @@ -1,116 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/validate.h -// Purpose: wxValidator class -// Author: Julian Smart -// Modified by: -// Created: 29/01/98 -// Copyright: (c) 1998 Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_VALIDATE_H_ -#define _WX_VALIDATE_H_ - -#include "wx/defs.h" - -#if wxUSE_VALIDATORS - -#include "wx/event.h" - -class WXDLLIMPEXP_FWD_CORE wxWindow; -class WXDLLIMPEXP_FWD_CORE wxWindowBase; - -/* - A validator has up to three purposes: - - 1) To validate the data in the window that's associated - with the validator. - 2) To transfer data to and from the window. - 3) To filter input, using its role as a wxEvtHandler - to intercept e.g. OnChar. - - Note that wxValidator and derived classes use reference counting. -*/ - -class WXDLLIMPEXP_CORE wxValidator : public wxEvtHandler -{ -public: - wxValidator(); - wxValidator(const wxValidator& other) - : wxEvtHandler() - , m_validatorWindow(other.m_validatorWindow) - { - } - virtual ~wxValidator(); - - // Make a clone of this validator (or return NULL) - currently necessary - // if you're passing a reference to a validator. - // Another possibility is to always pass a pointer to a new validator - // (so the calling code can use a copy constructor of the relevant class). - virtual wxObject *Clone() const - { return NULL; } - bool Copy(const wxValidator& val) - { m_validatorWindow = val.m_validatorWindow; return true; } - - // Called when the value in the window must be validated. - // This function can pop up an error message. - virtual bool Validate(wxWindow *WXUNUSED(parent)) { return false; } - - // Called to transfer data to the window - virtual bool TransferToWindow() { return false; } - - // Called to transfer data from the window - virtual bool TransferFromWindow() { return false; } - - // accessors - wxWindow *GetWindow() const { return (wxWindow *)m_validatorWindow; } - void SetWindow(wxWindowBase *win) { m_validatorWindow = win; } - - // validators beep by default if invalid key is pressed, this function - // allows to change this - static void SuppressBellOnError(bool suppress = true) - { ms_isSilent = suppress; } - - // test if beep is currently disabled - static bool IsSilent() { return ms_isSilent; } - - // this function is deprecated because it handled its parameter - // unnaturally: it disabled the bell when it was true, not false as could - // be expected; use SuppressBellOnError() instead -#if WXWIN_COMPATIBILITY_2_8 - static wxDEPRECATED_INLINE( - void SetBellOnError(bool doIt = true), - ms_isSilent = doIt; - ) -#endif - -protected: - wxWindowBase *m_validatorWindow; - -private: - static bool ms_isSilent; - - wxDECLARE_DYNAMIC_CLASS(wxValidator); - wxDECLARE_NO_ASSIGN_CLASS(wxValidator); -}; - -extern WXDLLIMPEXP_DATA_CORE(const wxValidator) wxDefaultValidator; - -#define wxVALIDATOR_PARAM(val) val - -#else // !wxUSE_VALIDATORS - // wxWidgets is compiled without support for wxValidator, but we still - // want to be able to pass wxDefaultValidator to the functions which take - // a wxValidator parameter to avoid using "#if wxUSE_VALIDATORS" - // everywhere - class WXDLLIMPEXP_FWD_CORE wxValidator; - static const wxValidator* const wxDefaultValidatorPtr = NULL; - #define wxDefaultValidator (*wxDefaultValidatorPtr) - - // this macro allows to avoid warnings about unused parameters when - // wxUSE_VALIDATORS == 0 - #define wxVALIDATOR_PARAM(val) -#endif // wxUSE_VALIDATORS/!wxUSE_VALIDATORS - -#endif // _WX_VALIDATE_H_ - diff --git a/Externals/wxWidgets3/include/wx/valnum.h b/Externals/wxWidgets3/include/wx/valnum.h deleted file mode 100644 index 3e73a730f2..0000000000 --- a/Externals/wxWidgets3/include/wx/valnum.h +++ /dev/null @@ -1,457 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/valnum.h -// Purpose: Numeric validator classes. -// Author: Vadim Zeitlin based on the submission of Fulvio Senore -// Created: 2010-11-06 -// Copyright: (c) 2010 wxWidgets team -// (c) 2011 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_VALNUM_H_ -#define _WX_VALNUM_H_ - -#include "wx/defs.h" - -#if wxUSE_VALIDATORS - -#include "wx/validate.h" - -#include - -// Bit masks used for numeric validator styles. -enum wxNumValidatorStyle -{ - wxNUM_VAL_DEFAULT = 0x0, - wxNUM_VAL_THOUSANDS_SEPARATOR = 0x1, - wxNUM_VAL_ZERO_AS_BLANK = 0x2, - wxNUM_VAL_NO_TRAILING_ZEROES = 0x4 -}; - -// ---------------------------------------------------------------------------- -// Base class for all numeric validators. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxNumValidatorBase : public wxValidator -{ -public: - // Change the validator style. Usually it's specified during construction. - void SetStyle(int style) { m_style = style; } - - - // Override base class method to not do anything but always return success: - // we don't need this as we do our validation on the fly here. - virtual bool Validate(wxWindow * WXUNUSED(parent)) wxOVERRIDE { return true; } - -protected: - wxNumValidatorBase(int style) - { - m_style = style; - } - - wxNumValidatorBase(const wxNumValidatorBase& other) : wxValidator() - { - m_style = other.m_style; - } - - bool HasFlag(wxNumValidatorStyle style) const - { - return (m_style & style) != 0; - } - - // Get the text entry of the associated control. Normally shouldn't ever - // return NULL (and will assert if it does return it) but the caller should - // still test the return value for safety. - wxTextEntry *GetTextEntry() const; - - // Convert wxNUM_VAL_THOUSANDS_SEPARATOR and wxNUM_VAL_NO_TRAILING_ZEROES - // bits of our style to the corresponding wxNumberFormatter::Style values. - int GetFormatFlags() const; - - // Return true if pressing a '-' key is acceptable for the current control - // contents and insertion point. This is meant to be called from the - // derived class IsCharOk() implementation. - bool IsMinusOk(const wxString& val, int pos) const; - - // Return the string which would result from inserting the given character - // at the specified position. - wxString GetValueAfterInsertingChar(wxString val, int pos, wxChar ch) const - { - val.insert(pos, ch); - return val; - } - -private: - // Check whether the specified character can be inserted in the control at - // the given position in the string representing the current controls - // contents. - // - // Notice that the base class checks for '-' itself so it's never passed to - // this function. - virtual bool IsCharOk(const wxString& val, int pos, wxChar ch) const = 0; - - // NormalizeString the contents of the string if it's a valid number, return - // empty string otherwise. - virtual wxString NormalizeString(const wxString& s) const = 0; - - - // Event handlers. - void OnChar(wxKeyEvent& event); - void OnKillFocus(wxFocusEvent& event); - - - // Determine the current insertion point and text in the associated control. - void GetCurrentValueAndInsertionPoint(wxString& val, int& pos) const; - - - // Combination of wxVAL_NUM_XXX values. - int m_style; - - - wxDECLARE_EVENT_TABLE(); - - wxDECLARE_NO_ASSIGN_CLASS(wxNumValidatorBase); -}; - -namespace wxPrivate -{ - -// This is a helper class used by wxIntegerValidator and wxFloatingPointValidator -// below that implements Transfer{To,From}Window() adapted to the type of the -// variable. -// -// The template argument B is the name of the base class which must derive from -// wxNumValidatorBase and define LongestValueType type and {To,As}String() -// methods i.e. basically be one of wx{Integer,Number}ValidatorBase classes. -// -// The template argument T is just the type handled by the validator that will -// inherit from this one. -template -class wxNumValidator : public B -{ -public: - typedef B BaseValidator; - typedef T ValueType; - - typedef typename BaseValidator::LongestValueType LongestValueType; - - wxCOMPILE_TIME_ASSERT - ( - sizeof(ValueType) <= sizeof(LongestValueType), - UnsupportedType - ); - - void SetMin(ValueType min) - { - this->DoSetMin(min); - } - - void SetMax(ValueType max) - { - this->DoSetMax(max); - } - - void SetRange(ValueType min, ValueType max) - { - SetMin(min); - SetMax(max); - } - - virtual bool TransferToWindow() - { - if ( m_value ) - { - wxTextEntry * const control = BaseValidator::GetTextEntry(); - if ( !control ) - return false; - - control->SetValue(NormalizeValue(*m_value)); - } - - return true; - } - - virtual bool TransferFromWindow() - { - if ( m_value ) - { - wxTextEntry * const control = BaseValidator::GetTextEntry(); - if ( !control ) - return false; - - const wxString s(control->GetValue()); - LongestValueType value; - if ( s.empty() && BaseValidator::HasFlag(wxNUM_VAL_ZERO_AS_BLANK) ) - value = 0; - else if ( !BaseValidator::FromString(s, &value) ) - return false; - - if ( !this->IsInRange(value) ) - return false; - - *m_value = static_cast(value); - } - - return true; - } - -protected: - wxNumValidator(ValueType *value, int style) - : BaseValidator(style), - m_value(value) - { - } - - // Implement wxNumValidatorBase virtual method which is the same for - // both integer and floating point numbers. - virtual wxString NormalizeString(const wxString& s) const - { - LongestValueType value; - return BaseValidator::FromString(s, &value) ? NormalizeValue(value) - : wxString(); - } - -private: - // Just a helper which is a common part of TransferToWindow() and - // NormalizeString(): returns string representation of a number honouring - // wxNUM_VAL_ZERO_AS_BLANK flag. - wxString NormalizeValue(LongestValueType value) const - { - wxString s; - if ( value != 0 || !BaseValidator::HasFlag(wxNUM_VAL_ZERO_AS_BLANK) ) - s = this->ToString(value); - - return s; - } - - - ValueType * const m_value; - - wxDECLARE_NO_ASSIGN_CLASS(wxNumValidator); -}; - -} // namespace wxPrivate - -// ---------------------------------------------------------------------------- -// Validators for integer numbers. -// ---------------------------------------------------------------------------- - -// Base class for integer numbers validator. This class contains all non -// type-dependent code of wxIntegerValidator<> and always works with values of -// type LongestValueType. It is not meant to be used directly, please use -// wxIntegerValidator<> only instead. -class WXDLLIMPEXP_CORE wxIntegerValidatorBase : public wxNumValidatorBase -{ -protected: - // Define the type we use here, it should be the maximal-sized integer type - // we support to make it possible to base wxIntegerValidator<> for any type - // on it. -#ifdef wxLongLong_t - typedef wxLongLong_t LongestValueType; -#else - typedef long LongestValueType; -#endif - - wxIntegerValidatorBase(int style) - : wxNumValidatorBase(style) - { - wxASSERT_MSG( !(style & wxNUM_VAL_NO_TRAILING_ZEROES), - "This style doesn't make sense for integers." ); - } - - wxIntegerValidatorBase(const wxIntegerValidatorBase& other) - : wxNumValidatorBase(other) - { - m_min = other.m_min; - m_max = other.m_max; - } - - // Provide methods for wxNumValidator use. - wxString ToString(LongestValueType value) const; - static bool FromString(const wxString& s, LongestValueType *value); - - void DoSetMin(LongestValueType min) { m_min = min; } - void DoSetMax(LongestValueType max) { m_max = max; } - - bool IsInRange(LongestValueType value) const - { - return m_min <= value && value <= m_max; - } - - // Implement wxNumValidatorBase pure virtual method. - virtual bool IsCharOk(const wxString& val, int pos, wxChar ch) const wxOVERRIDE; - -private: - // Minimal and maximal values accepted (inclusive). - LongestValueType m_min, m_max; - - wxDECLARE_NO_ASSIGN_CLASS(wxIntegerValidatorBase); -}; - -// Validator for integer numbers. It can actually work with any integer type -// (short, int or long and long long if supported) and their unsigned versions -// as well. -template -class wxIntegerValidator - : public wxPrivate::wxNumValidator -{ -public: - typedef T ValueType; - - typedef - wxPrivate::wxNumValidator Base; - - // Ctor for an integer validator. - // - // Sets the range appropriately for the type, including setting 0 as the - // minimal value for the unsigned types. - wxIntegerValidator(ValueType *value = NULL, int style = wxNUM_VAL_DEFAULT) - : Base(value, style) - { - this->DoSetMin(std::numeric_limits::min()); - this->DoSetMax(std::numeric_limits::max()); - } - - virtual wxObject *Clone() const { return new wxIntegerValidator(*this); } - -private: - wxDECLARE_NO_ASSIGN_CLASS(wxIntegerValidator); -}; - -// Helper function for creating integer validators which allows to avoid -// explicitly specifying the type as it deduces it from its parameter. -template -inline wxIntegerValidator -wxMakeIntegerValidator(T *value, int style = wxNUM_VAL_DEFAULT) -{ - return wxIntegerValidator(value, style); -} - -// ---------------------------------------------------------------------------- -// Validators for floating point numbers. -// ---------------------------------------------------------------------------- - -// Similar to wxIntegerValidatorBase, this class is not meant to be used -// directly, only wxFloatingPointValidator<> should be used in the user code. -class WXDLLIMPEXP_CORE wxFloatingPointValidatorBase : public wxNumValidatorBase -{ -public: - // Set precision i.e. the number of digits shown (and accepted on input) - // after the decimal point. By default this is set to the maximal precision - // supported by the type handled by the validator. - void SetPrecision(unsigned precision) { m_precision = precision; } - -protected: - // Notice that we can't use "long double" here because it's not supported - // by wxNumberFormatter yet, so restrict ourselves to just double (and - // float). - typedef double LongestValueType; - - wxFloatingPointValidatorBase(int style) - : wxNumValidatorBase(style) - { - } - - wxFloatingPointValidatorBase(const wxFloatingPointValidatorBase& other) - : wxNumValidatorBase(other) - { - m_precision = other.m_precision; - - m_min = other.m_min; - m_max = other.m_max; - } - - // Provide methods for wxNumValidator use. - wxString ToString(LongestValueType value) const; - static bool FromString(const wxString& s, LongestValueType *value); - - void DoSetMin(LongestValueType min) { m_min = min; } - void DoSetMax(LongestValueType max) { m_max = max; } - - bool IsInRange(LongestValueType value) const - { - return m_min <= value && value <= m_max; - } - - // Implement wxNumValidatorBase pure virtual method. - virtual bool IsCharOk(const wxString& val, int pos, wxChar ch) const wxOVERRIDE; - -private: - // Maximum number of decimals digits after the decimal separator. - unsigned m_precision; - - // Minimal and maximal values accepted (inclusive). - LongestValueType m_min, m_max; - - wxDECLARE_NO_ASSIGN_CLASS(wxFloatingPointValidatorBase); -}; - -// Validator for floating point numbers. It can be used with float, double or -// long double values. -template -class wxFloatingPointValidator - : public wxPrivate::wxNumValidator -{ -public: - typedef T ValueType; - typedef wxPrivate::wxNumValidator Base; - - // Ctor using implicit (maximal) precision for this type. - wxFloatingPointValidator(ValueType *value = NULL, - int style = wxNUM_VAL_DEFAULT) - : Base(value, style) - { - DoSetMinMax(); - - this->SetPrecision(std::numeric_limits::digits10); - } - - // Ctor specifying an explicit precision. - wxFloatingPointValidator(int precision, - ValueType *value = NULL, - int style = wxNUM_VAL_DEFAULT) - : Base(value, style) - { - DoSetMinMax(); - - this->SetPrecision(precision); - } - - virtual wxObject *Clone() const - { - return new wxFloatingPointValidator(*this); - } - -private: - void DoSetMinMax() - { - // NB: Do not use min(), it's not the smallest representable value for - // the floating point types but rather the smallest representable - // positive value. - this->DoSetMin(-std::numeric_limits::max()); - this->DoSetMax( std::numeric_limits::max()); - } -}; - -// Helper similar to wxMakeIntValidator(). -// -// NB: Unfortunately we can't just have a wxMakeNumericValidator() which would -// return either wxIntegerValidator<> or wxFloatingPointValidator<> so we -// do need two different functions. -template -inline wxFloatingPointValidator -wxMakeFloatingPointValidator(T *value, int style = wxNUM_VAL_DEFAULT) -{ - return wxFloatingPointValidator(value, style); -} - -template -inline wxFloatingPointValidator -wxMakeFloatingPointValidator(int precision, T *value, int style = wxNUM_VAL_DEFAULT) -{ - return wxFloatingPointValidator(precision, value, style); -} - -#endif // wxUSE_VALIDATORS - -#endif // _WX_VALNUM_H_ diff --git a/Externals/wxWidgets3/include/wx/valtext.h b/Externals/wxWidgets3/include/wx/valtext.h deleted file mode 100644 index 7dbdec176f..0000000000 --- a/Externals/wxWidgets3/include/wx/valtext.h +++ /dev/null @@ -1,108 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/valtext.h -// Purpose: wxTextValidator class -// Author: Julian Smart -// Modified by: Francesco Montorsi -// Created: 29/01/98 -// Copyright: (c) 1998 Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_VALTEXT_H_ -#define _WX_VALTEXT_H_ - -#include "wx/defs.h" - -#if wxUSE_VALIDATORS && (wxUSE_TEXTCTRL || wxUSE_COMBOBOX) - -class WXDLLIMPEXP_FWD_CORE wxTextEntry; - -#include "wx/validate.h" - -enum wxTextValidatorStyle -{ - wxFILTER_NONE = 0x0, - wxFILTER_EMPTY = 0x1, - wxFILTER_ASCII = 0x2, - wxFILTER_ALPHA = 0x4, - wxFILTER_ALPHANUMERIC = 0x8, - wxFILTER_DIGITS = 0x10, - wxFILTER_NUMERIC = 0x20, - wxFILTER_INCLUDE_LIST = 0x40, - wxFILTER_INCLUDE_CHAR_LIST = 0x80, - wxFILTER_EXCLUDE_LIST = 0x100, - wxFILTER_EXCLUDE_CHAR_LIST = 0x200 -}; - -class WXDLLIMPEXP_CORE wxTextValidator: public wxValidator -{ -public: - wxTextValidator(long style = wxFILTER_NONE, wxString *val = NULL); - wxTextValidator(const wxTextValidator& val); - - virtual ~wxTextValidator(){} - - // Make a clone of this validator (or return NULL) - currently necessary - // if you're passing a reference to a validator. - // Another possibility is to always pass a pointer to a new validator - // (so the calling code can use a copy constructor of the relevant class). - virtual wxObject *Clone() const wxOVERRIDE { return new wxTextValidator(*this); } - bool Copy(const wxTextValidator& val); - - // Called when the value in the window must be validated. - // This function can pop up an error message. - virtual bool Validate(wxWindow *parent) wxOVERRIDE; - - // Called to transfer data to the window - virtual bool TransferToWindow() wxOVERRIDE; - - // Called to transfer data from the window - virtual bool TransferFromWindow() wxOVERRIDE; - - // Filter keystrokes - void OnChar(wxKeyEvent& event); - - // ACCESSORS - inline long GetStyle() const { return m_validatorStyle; } - void SetStyle(long style); - - wxTextEntry *GetTextEntry(); - - void SetCharIncludes(const wxString& chars); - void SetIncludes(const wxArrayString& includes) { m_includes = includes; } - inline wxArrayString& GetIncludes() { return m_includes; } - - void SetCharExcludes(const wxString& chars); - void SetExcludes(const wxArrayString& excludes) { m_excludes = excludes; } - inline wxArrayString& GetExcludes() { return m_excludes; } - - bool HasFlag(wxTextValidatorStyle style) const - { return (m_validatorStyle & style) != 0; } - -protected: - - // returns true if all characters of the given string are present in m_includes - bool ContainsOnlyIncludedCharacters(const wxString& val) const; - - // returns true if at least one character of the given string is present in m_excludes - bool ContainsExcludedCharacters(const wxString& val) const; - - // returns the error message if the contents of 'val' are invalid - virtual wxString IsValid(const wxString& val) const; - -protected: - long m_validatorStyle; - wxString* m_stringValue; - wxArrayString m_includes; - wxArrayString m_excludes; - -private: - wxDECLARE_NO_ASSIGN_CLASS(wxTextValidator); - wxDECLARE_DYNAMIC_CLASS(wxTextValidator); - wxDECLARE_EVENT_TABLE(); -}; - -#endif - // wxUSE_VALIDATORS && (wxUSE_TEXTCTRL || wxUSE_COMBOBOX) - -#endif // _WX_VALTEXT_H_ diff --git a/Externals/wxWidgets3/include/wx/variant.h b/Externals/wxWidgets3/include/wx/variant.h deleted file mode 100644 index efb1b5b111..0000000000 --- a/Externals/wxWidgets3/include/wx/variant.h +++ /dev/null @@ -1,582 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/variant.h -// Purpose: wxVariant class, container for any type -// Author: Julian Smart -// Modified by: -// Created: 10/09/98 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_VARIANT_H_ -#define _WX_VARIANT_H_ - -#include "wx/defs.h" - -#if wxUSE_VARIANT - -#include "wx/object.h" -#include "wx/string.h" -#include "wx/arrstr.h" -#include "wx/list.h" -#include "wx/cpp.h" -#include "wx/longlong.h" - -#if wxUSE_DATETIME - #include "wx/datetime.h" -#endif // wxUSE_DATETIME - -#include "wx/iosfwrap.h" - -class wxAny; - -/* - * wxVariantData stores the actual data in a wxVariant object, - * to allow it to store any type of data. - * Derive from this to provide custom data handling. - * - * NB: When you construct a wxVariantData, it will have refcount - * of one. Refcount will not be further increased when - * it is passed to wxVariant. This simulates old common - * scenario where wxVariant took ownership of wxVariantData - * passed to it. - * If you create wxVariantData for other reasons than passing - * it to wxVariant, technically you are not required to call - * DecRef() before deleting it. - * - * TODO: in order to replace wxPropertyValue, we would need - * to consider adding constructors that take pointers to C++ variables, - * or removing that functionality from the wxProperty library. - * Essentially wxPropertyValue takes on some of the wxValidator functionality - * by storing pointers and not just actual values, allowing update of C++ data - * to be handled automatically. Perhaps there's another way of doing this without - * overloading wxVariant with unnecessary functionality. - */ - -class WXDLLIMPEXP_BASE wxVariantData : public wxObjectRefData -{ - friend class wxVariant; -public: - wxVariantData() { } - - // Override these to provide common functionality - virtual bool Eq(wxVariantData& data) const = 0; - -#if wxUSE_STD_IOSTREAM - virtual bool Write(wxSTD ostream& WXUNUSED(str)) const { return false; } -#endif - virtual bool Write(wxString& WXUNUSED(str)) const { return false; } -#if wxUSE_STD_IOSTREAM - virtual bool Read(wxSTD istream& WXUNUSED(str)) { return false; } -#endif - virtual bool Read(wxString& WXUNUSED(str)) { return false; } - // What type is it? Return a string name. - virtual wxString GetType() const = 0; - // If it based on wxObject return the ClassInfo. - virtual wxClassInfo* GetValueClassInfo() { return NULL; } - - // Implement this to make wxVariant::UnShare work. Returns - // a copy of the data. - virtual wxVariantData* Clone() const { return NULL; } - -#if wxUSE_ANY - // Converts value to wxAny, if possible. Return true if successful. - virtual bool GetAsAny(wxAny* WXUNUSED(any)) const { return false; } -#endif - -protected: - // Protected dtor should make some incompatible code - // break more louder. That is, they should do data->DecRef() - // instead of delete data. - virtual ~wxVariantData() { } -}; - -/* - * wxVariant can store any kind of data, but has some basic types - * built in. - */ - -class WXDLLIMPEXP_FWD_BASE wxVariant; - -WX_DECLARE_LIST_WITH_DECL(wxVariant, wxVariantList, class WXDLLIMPEXP_BASE); - -class WXDLLIMPEXP_BASE wxVariant: public wxObject -{ -public: - wxVariant(); - - wxVariant(const wxVariant& variant); - wxVariant(wxVariantData* data, const wxString& name = wxEmptyString); -#if wxUSE_ANY - wxVariant(const wxAny& any); -#endif - virtual ~wxVariant(); - - // generic assignment - void operator= (const wxVariant& variant); - - // Assignment using data, e.g. - // myVariant = new wxStringVariantData("hello"); - void operator= (wxVariantData* variantData); - - bool operator== (const wxVariant& variant) const; - bool operator!= (const wxVariant& variant) const; - - // Sets/gets name - inline void SetName(const wxString& name) { m_name = name; } - inline const wxString& GetName() const { return m_name; } - - // Tests whether there is data - bool IsNull() const; - - // For compatibility with wxWidgets <= 2.6, this doesn't increase - // reference count. - wxVariantData* GetData() const - { - return (wxVariantData*) m_refData; - } - void SetData(wxVariantData* data) ; - - // make a 'clone' of the object - void Ref(const wxVariant& clone) { wxObject::Ref(clone); } - - // ensure that the data is exclusive to this variant, and not shared - bool Unshare(); - - // Make NULL (i.e. delete the data) - void MakeNull(); - - // Delete data and name - void Clear(); - - // Returns a string representing the type of the variant, - // e.g. "string", "bool", "stringlist", "list", "double", "long" - wxString GetType() const; - - bool IsType(const wxString& type) const; - bool IsValueKindOf(const wxClassInfo* type) const; - - // write contents to a string (e.g. for debugging) - wxString MakeString() const; - -#if wxUSE_ANY - wxAny GetAny() const; -#endif - - // double - wxVariant(double val, const wxString& name = wxEmptyString); - bool operator== (double value) const; - bool operator!= (double value) const; - void operator= (double value) ; - inline operator double () const { return GetDouble(); } - inline double GetReal() const { return GetDouble(); } - double GetDouble() const; - - // long - wxVariant(long val, const wxString& name = wxEmptyString); - wxVariant(int val, const wxString& name = wxEmptyString); - wxVariant(short val, const wxString& name = wxEmptyString); - bool operator== (long value) const; - bool operator!= (long value) const; - void operator= (long value) ; - inline operator long () const { return GetLong(); } - inline long GetInteger() const { return GetLong(); } - long GetLong() const; - - // bool - wxVariant(bool val, const wxString& name = wxEmptyString); - bool operator== (bool value) const; - bool operator!= (bool value) const; - void operator= (bool value) ; - inline operator bool () const { return GetBool(); } - bool GetBool() const ; - - // wxDateTime -#if wxUSE_DATETIME - wxVariant(const wxDateTime& val, const wxString& name = wxEmptyString); - bool operator== (const wxDateTime& value) const; - bool operator!= (const wxDateTime& value) const; - void operator= (const wxDateTime& value) ; - inline operator wxDateTime () const { return GetDateTime(); } - wxDateTime GetDateTime() const; -#endif - - // wxString - wxVariant(const wxString& val, const wxString& name = wxEmptyString); - // these overloads are necessary to prevent the compiler from using bool - // version instead of wxString one: - wxVariant(const char* val, const wxString& name = wxEmptyString); - wxVariant(const wchar_t* val, const wxString& name = wxEmptyString); - wxVariant(const wxCStrData& val, const wxString& name = wxEmptyString); - wxVariant(const wxScopedCharBuffer& val, const wxString& name = wxEmptyString); - wxVariant(const wxScopedWCharBuffer& val, const wxString& name = wxEmptyString); - - bool operator== (const wxString& value) const; - bool operator!= (const wxString& value) const; - wxVariant& operator=(const wxString& value); - // these overloads are necessary to prevent the compiler from using bool - // version instead of wxString one: - wxVariant& operator=(const char* value) - { return *this = wxString(value); } - wxVariant& operator=(const wchar_t* value) - { return *this = wxString(value); } - wxVariant& operator=(const wxCStrData& value) - { return *this = value.AsString(); } - template - wxVariant& operator=(const wxScopedCharTypeBuffer& value) - { return *this = value.data(); } - - inline operator wxString () const { return MakeString(); } - wxString GetString() const; - -#if wxUSE_STD_STRING - wxVariant(const std::string& val, const wxString& name = wxEmptyString); - bool operator==(const std::string& value) const - { return operator==(wxString(value)); } - bool operator!=(const std::string& value) const - { return operator!=(wxString(value)); } - wxVariant& operator=(const std::string& value) - { return operator=(wxString(value)); } - operator std::string() const { return (operator wxString()).ToStdString(); } - - wxVariant(const wxStdWideString& val, const wxString& name = wxEmptyString); - bool operator==(const wxStdWideString& value) const - { return operator==(wxString(value)); } - bool operator!=(const wxStdWideString& value) const - { return operator!=(wxString(value)); } - wxVariant& operator=(const wxStdWideString& value) - { return operator=(wxString(value)); } - operator wxStdWideString() const { return (operator wxString()).ToStdWstring(); } -#endif // wxUSE_STD_STRING - - // wxUniChar - wxVariant(const wxUniChar& val, const wxString& name = wxEmptyString); - wxVariant(const wxUniCharRef& val, const wxString& name = wxEmptyString); - wxVariant(char val, const wxString& name = wxEmptyString); - wxVariant(wchar_t val, const wxString& name = wxEmptyString); - bool operator==(const wxUniChar& value) const; - bool operator==(const wxUniCharRef& value) const { return *this == wxUniChar(value); } - bool operator==(char value) const { return *this == wxUniChar(value); } - bool operator==(wchar_t value) const { return *this == wxUniChar(value); } - bool operator!=(const wxUniChar& value) const { return !(*this == value); } - bool operator!=(const wxUniCharRef& value) const { return !(*this == value); } - bool operator!=(char value) const { return !(*this == value); } - bool operator!=(wchar_t value) const { return !(*this == value); } - wxVariant& operator=(const wxUniChar& value); - wxVariant& operator=(const wxUniCharRef& value) { return *this = wxUniChar(value); } - wxVariant& operator=(char value) { return *this = wxUniChar(value); } - wxVariant& operator=(wchar_t value) { return *this = wxUniChar(value); } - operator wxUniChar() const { return GetChar(); } - operator char() const { return GetChar(); } - operator wchar_t() const { return GetChar(); } - wxUniChar GetChar() const; - - // wxArrayString - wxVariant(const wxArrayString& val, const wxString& name = wxEmptyString); - bool operator== (const wxArrayString& value) const; - bool operator!= (const wxArrayString& value) const; - void operator= (const wxArrayString& value); - operator wxArrayString () const { return GetArrayString(); } - wxArrayString GetArrayString() const; - - // void* - wxVariant(void* ptr, const wxString& name = wxEmptyString); - bool operator== (void* value) const; - bool operator!= (void* value) const; - void operator= (void* value); - operator void* () const { return GetVoidPtr(); } - void* GetVoidPtr() const; - - // wxObject* - wxVariant(wxObject* ptr, const wxString& name = wxEmptyString); - bool operator== (wxObject* value) const; - bool operator!= (wxObject* value) const; - void operator= (wxObject* value); - wxObject* GetWxObjectPtr() const; - -#if wxUSE_LONGLONG - // wxLongLong - wxVariant(wxLongLong, const wxString& name = wxEmptyString); - bool operator==(wxLongLong value) const; - bool operator!=(wxLongLong value) const; - void operator=(wxLongLong value); - operator wxLongLong() const { return GetLongLong(); } - wxLongLong GetLongLong() const; - - // wxULongLong - wxVariant(wxULongLong, const wxString& name = wxEmptyString); - bool operator==(wxULongLong value) const; - bool operator!=(wxULongLong value) const; - void operator=(wxULongLong value); - operator wxULongLong() const { return GetULongLong(); } - wxULongLong GetULongLong() const; -#endif - - // ------------------------------ - // list operations - // ------------------------------ - - wxVariant(const wxVariantList& val, const wxString& name = wxEmptyString); // List of variants - bool operator== (const wxVariantList& value) const; - bool operator!= (const wxVariantList& value) const; - void operator= (const wxVariantList& value) ; - // Treat a list variant as an array - wxVariant operator[] (size_t idx) const; - wxVariant& operator[] (size_t idx) ; - wxVariantList& GetList() const ; - - // Return the number of elements in a list - size_t GetCount() const; - - // Make empty list - void NullList(); - - // Append to list - void Append(const wxVariant& value); - - // Insert at front of list - void Insert(const wxVariant& value); - - // Returns true if the variant is a member of the list - bool Member(const wxVariant& value) const; - - // Deletes the nth element of the list - bool Delete(size_t item); - - // Clear list - void ClearList(); - -public: - // Type conversion - bool Convert(long* value) const; - bool Convert(bool* value) const; - bool Convert(double* value) const; - bool Convert(wxString* value) const; - bool Convert(wxUniChar* value) const; - bool Convert(char* value) const; - bool Convert(wchar_t* value) const; -#if wxUSE_DATETIME - bool Convert(wxDateTime* value) const; -#endif // wxUSE_DATETIME -#if wxUSE_LONGLONG - bool Convert(wxLongLong* value) const; - bool Convert(wxULongLong* value) const; - #ifdef wxLongLong_t - bool Convert(wxLongLong_t* value) const - { - wxLongLong temp; - if ( !Convert(&temp) ) - return false; - *value = temp.GetValue(); - return true; - } - bool Convert(wxULongLong_t* value) const - { - wxULongLong temp; - if ( !Convert(&temp) ) - return false; - *value = temp.GetValue(); - return true; - } - #endif // wxLongLong_t -#endif // wxUSE_LONGLONG - -// Attributes -protected: - virtual wxObjectRefData *CreateRefData() const wxOVERRIDE; - virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const wxOVERRIDE; - - wxString m_name; - -private: - wxDECLARE_DYNAMIC_CLASS(wxVariant); -}; - - -// -// wxVariant <-> wxAny conversion code -// -#if wxUSE_ANY - -#include "wx/any.h" - -// In order to convert wxAny to wxVariant, we need to be able to associate -// wxAnyValueType with a wxVariantData factory function. -typedef wxVariantData* (*wxVariantDataFactory)(const wxAny& any); - -// Actual Any-to-Variant registration must be postponed to a time when all -// global variables have been initialized. Hence this arrangement. -// wxAnyToVariantRegistration instances are kept in global scope and -// wxAnyValueTypeGlobals in any.cpp will use their data when the time is -// right. -class WXDLLIMPEXP_BASE wxAnyToVariantRegistration -{ -public: - wxAnyToVariantRegistration(wxVariantDataFactory factory); - virtual ~wxAnyToVariantRegistration(); - - virtual wxAnyValueType* GetAssociatedType() = 0; - wxVariantDataFactory GetFactory() const { return m_factory; } -private: - wxVariantDataFactory m_factory; -}; - -template -class wxAnyToVariantRegistrationImpl : public wxAnyToVariantRegistration -{ -public: - wxAnyToVariantRegistrationImpl(wxVariantDataFactory factory) - : wxAnyToVariantRegistration(factory) - { - } - - virtual wxAnyValueType* GetAssociatedType() wxOVERRIDE - { - return wxAnyValueTypeImpl::GetInstance(); - } -private: -}; - -#define DECLARE_WXANY_CONVERSION() \ -virtual bool GetAsAny(wxAny* any) const wxOVERRIDE; \ -static wxVariantData* VariantDataFactory(const wxAny& any); - -#define _REGISTER_WXANY_CONVERSION(T, CLASSNAME, FUNC) \ -static wxAnyToVariantRegistrationImpl \ - gs_##CLASSNAME##AnyToVariantRegistration = \ - wxAnyToVariantRegistrationImpl(&FUNC); - -#define REGISTER_WXANY_CONVERSION(T, CLASSNAME) \ -_REGISTER_WXANY_CONVERSION(T, CLASSNAME, CLASSNAME::VariantDataFactory) - -#define IMPLEMENT_TRIVIAL_WXANY_CONVERSION(T, CLASSNAME) \ -bool CLASSNAME::GetAsAny(wxAny* any) const \ -{ \ - *any = m_value; \ - return true; \ -} \ -wxVariantData* CLASSNAME::VariantDataFactory(const wxAny& any) \ -{ \ - return new CLASSNAME(any.As()); \ -} \ -REGISTER_WXANY_CONVERSION(T, CLASSNAME) - -#else // if !wxUSE_ANY - -#define DECLARE_WXANY_CONVERSION() -#define REGISTER_WXANY_CONVERSION(T, CLASSNAME) -#define IMPLEMENT_TRIVIAL_WXANY_CONVERSION(T, CLASSNAME) - -#endif // wxUSE_ANY/!wxUSE_ANY - - -#define DECLARE_VARIANT_OBJECT(classname) \ - DECLARE_VARIANT_OBJECT_EXPORTED(classname, wxEMPTY_PARAMETER_VALUE) - -#define DECLARE_VARIANT_OBJECT_EXPORTED(classname,expdecl) \ -expdecl classname& operator << ( classname &object, const wxVariant &variant ); \ -expdecl wxVariant& operator << ( wxVariant &variant, const classname &object ); - -#define IMPLEMENT_VARIANT_OBJECT(classname) \ - IMPLEMENT_VARIANT_OBJECT_EXPORTED(classname, wxEMPTY_PARAMETER_VALUE) - -#define IMPLEMENT_VARIANT_OBJECT_EXPORTED_NO_EQ(classname,expdecl) \ -class classname##VariantData: public wxVariantData \ -{ \ -public:\ - classname##VariantData() {} \ - classname##VariantData( const classname &value ) { m_value = value; } \ -\ - classname &GetValue() { return m_value; } \ -\ - virtual bool Eq(wxVariantData& data) const wxOVERRIDE; \ -\ - virtual wxString GetType() const wxOVERRIDE; \ - virtual wxClassInfo* GetValueClassInfo() wxOVERRIDE; \ -\ - virtual wxVariantData* Clone() const wxOVERRIDE { return new classname##VariantData(m_value); } \ -\ - DECLARE_WXANY_CONVERSION() \ -protected:\ - classname m_value; \ -};\ -\ -wxString classname##VariantData::GetType() const\ -{\ - return m_value.GetClassInfo()->GetClassName();\ -}\ -\ -wxClassInfo* classname##VariantData::GetValueClassInfo()\ -{\ - return m_value.GetClassInfo();\ -}\ -\ -expdecl classname& operator << ( classname &value, const wxVariant &variant )\ -{\ - wxASSERT( variant.GetType() == #classname );\ - \ - classname##VariantData *data = (classname##VariantData*) variant.GetData();\ - value = data->GetValue();\ - return value;\ -}\ -\ -expdecl wxVariant& operator << ( wxVariant &variant, const classname &value )\ -{\ - classname##VariantData *data = new classname##VariantData( value );\ - variant.SetData( data );\ - return variant;\ -} \ -IMPLEMENT_TRIVIAL_WXANY_CONVERSION(classname, classname##VariantData) - -// implements a wxVariantData-derived class using for the Eq() method the -// operator== which must have been provided by "classname" -#define IMPLEMENT_VARIANT_OBJECT_EXPORTED(classname,expdecl) \ -IMPLEMENT_VARIANT_OBJECT_EXPORTED_NO_EQ(classname,wxEMPTY_PARAMETER_VALUE expdecl) \ -\ -bool classname##VariantData::Eq(wxVariantData& data) const \ -{\ - wxASSERT( GetType() == data.GetType() );\ -\ - classname##VariantData & otherData = (classname##VariantData &) data;\ -\ - return otherData.m_value == m_value;\ -}\ - - -// implements a wxVariantData-derived class using for the Eq() method a shallow -// comparison (through wxObject::IsSameAs function) -#define IMPLEMENT_VARIANT_OBJECT_SHALLOWCMP(classname) \ - IMPLEMENT_VARIANT_OBJECT_EXPORTED_SHALLOWCMP(classname, wxEMPTY_PARAMETER_VALUE) -#define IMPLEMENT_VARIANT_OBJECT_EXPORTED_SHALLOWCMP(classname,expdecl) \ -IMPLEMENT_VARIANT_OBJECT_EXPORTED_NO_EQ(classname,wxEMPTY_PARAMETER_VALUE expdecl) \ -\ -bool classname##VariantData::Eq(wxVariantData& data) const \ -{\ - wxASSERT( GetType() == data.GetType() );\ -\ - classname##VariantData & otherData = (classname##VariantData &) data;\ -\ - return (otherData.m_value.IsSameAs(m_value));\ -}\ - - -// Since we want type safety wxVariant we need to fetch and dynamic_cast -// in a seemingly safe way so the compiler can check, so we define -// a dynamic_cast /wxDynamicCast analogue. - -#define wxGetVariantCast(var,classname) \ - ((classname*)(var.IsValueKindOf(&classname::ms_classInfo) ?\ - var.GetWxObjectPtr() : NULL)); - -// Replacement for using wxDynamicCast on a wxVariantData object -#ifndef wxNO_RTTI - #define wxDynamicCastVariantData(data, classname) dynamic_cast(data) -#endif - -#define wxStaticCastVariantData(data, classname) static_cast(data) - -extern wxVariant WXDLLIMPEXP_BASE wxNullVariant; - -#endif // wxUSE_VARIANT - -#endif // _WX_VARIANT_H_ diff --git a/Externals/wxWidgets3/include/wx/variantbase.h b/Externals/wxWidgets3/include/wx/variantbase.h deleted file mode 100644 index 22f4c32788..0000000000 --- a/Externals/wxWidgets3/include/wx/variantbase.h +++ /dev/null @@ -1,278 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/variantbase.h -// Purpose: wxVariantBase class, a minimal version of wxVariant used by XTI -// Author: Julian Smart -// Modified by: Francesco Montorsi -// Created: 10/09/98 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_VARIANTBASE_H_ -#define _WX_VARIANTBASE_H_ - -#include "wx/defs.h" - -#if wxUSE_VARIANT - -#include "wx/string.h" -#include "wx/arrstr.h" -#include "wx/cpp.h" -#include - -#if wxUSE_DATETIME - #include "wx/datetime.h" -#endif // wxUSE_DATETIME - -#include "wx/iosfwrap.h" - -class wxTypeInfo; -class wxObject; -class wxClassInfo; - -/* - * wxVariantData stores the actual data in a wxVariant object, - * to allow it to store any type of data. - * Derive from this to provide custom data handling. - * - * NB: To prevent addition of extra vtbl pointer to wxVariantData, - * we don't multiple-inherit from wxObjectRefData. Instead, - * we simply replicate the wxObject ref-counting scheme. - * - * NB: When you construct a wxVariantData, it will have refcount - * of one. Refcount will not be further increased when - * it is passed to wxVariant. This simulates old common - * scenario where wxVariant took ownership of wxVariantData - * passed to it. - * If you create wxVariantData for other reasons than passing - * it to wxVariant, technically you are not required to call - * DecRef() before deleting it. - * - * TODO: in order to replace wxPropertyValue, we would need - * to consider adding constructors that take pointers to C++ variables, - * or removing that functionality from the wxProperty library. - * Essentially wxPropertyValue takes on some of the wxValidator functionality - * by storing pointers and not just actual values, allowing update of C++ data - * to be handled automatically. Perhaps there's another way of doing this without - * overloading wxVariant with unnecessary functionality. - */ - -class WXDLLIMPEXP_BASE wxVariantData -{ - friend class wxVariantBase; - -public: - wxVariantData() - : m_count(1) - { } - -#if wxUSE_STD_IOSTREAM - virtual bool Write(wxSTD ostream& WXUNUSED(str)) const { return false; } - virtual bool Read(wxSTD istream& WXUNUSED(str)) { return false; } -#endif - virtual bool Write(wxString& WXUNUSED(str)) const { return false; } - virtual bool Read(wxString& WXUNUSED(str)) { return false; } - - // Override these to provide common functionality - virtual bool Eq(wxVariantData& data) const = 0; - - // What type is it? Return a string name. - virtual wxString GetType() const = 0; - - // returns the type info of the content - virtual const wxTypeInfo* GetTypeInfo() const = 0; - - // If it based on wxObject return the ClassInfo. - virtual wxClassInfo* GetValueClassInfo() { return NULL; } - - int GetRefCount() const - { return m_count; } - void IncRef() - { m_count++; } - void DecRef() - { - if ( --m_count == 0 ) - delete this; - } - -protected: - // Protected dtor should make some incompatible code - // break more louder. That is, they should do data->DecRef() - // instead of delete data. - virtual ~wxVariantData() {} - -private: - int m_count; -}; - -template class wxVariantDataT : public wxVariantData -{ -public: - wxVariantDataT(const T& d) : m_data(d) {} - virtual ~wxVariantDataT() {} - - // get a ref to the stored data - T & Get() { return m_data; } - - // get a const ref to the stored data - const T & Get() const { return m_data; } - - // set the data - void Set(const T& d) { m_data = d; } - - // Override these to provide common functionality - virtual bool Eq(wxVariantData& WXUNUSED(data)) const - { return false; /* FIXME!! */ } - - // What type is it? Return a string name. - virtual wxString GetType() const - { return GetTypeInfo()->GetTypeName(); } - - // return a heap allocated duplicate - //virtual wxVariantData* Clone() const { return new wxVariantDataT( Get() ); } - - // returns the type info of the contentc - virtual const wxTypeInfo* GetTypeInfo() const { return wxGetTypeInfo( (T*) NULL ); } - -private: - T m_data; -}; - - -/* - * wxVariantBase can store any kind of data, but has some basic types - * built in. - */ - -class WXDLLIMPEXP_BASE wxVariantBase -{ -public: - wxVariantBase(); - wxVariantBase(const wxVariantBase& variant); - wxVariantBase(wxVariantData* data, const wxString& name = wxEmptyString); - - template - wxVariantBase(const T& data, const wxString& name = wxEmptyString) : - m_data(new wxVariantDataT(data)), m_name(name) {} - - virtual ~wxVariantBase(); - - // generic assignment - void operator= (const wxVariantBase& variant); - - // Assignment using data, e.g. - // myVariant = new wxStringVariantData("hello"); - void operator= (wxVariantData* variantData); - - bool operator== (const wxVariantBase& variant) const; - bool operator!= (const wxVariantBase& variant) const; - - // Sets/gets name - inline void SetName(const wxString& name) { m_name = name; } - inline const wxString& GetName() const { return m_name; } - - // Tests whether there is data - bool IsNull() const; - - // FIXME: used by wxVariantBase code but is nice wording... - bool IsEmpty() const { return IsNull(); } - - // For compatibility with wxWidgets <= 2.6, this doesn't increase - // reference count. - wxVariantData* GetData() const { return m_data; } - void SetData(wxVariantData* data) ; - - // make a 'clone' of the object - void Ref(const wxVariantBase& clone); - - // destroy a reference - void UnRef(); - - // Make NULL (i.e. delete the data) - void MakeNull(); - - // write contents to a string (e.g. for debugging) - wxString MakeString() const; - - // Delete data and name - void Clear(); - - // Returns a string representing the type of the variant, - // e.g. "string", "bool", "stringlist", "list", "double", "long" - wxString GetType() const; - - bool IsType(const wxString& type) const; - bool IsValueKindOf(const wxClassInfo* type) const; - - // FIXME wxXTI methods: - - // get the typeinfo of the stored object - const wxTypeInfo* GetTypeInfo() const - { - if (!m_data) - return NULL; - return m_data->GetTypeInfo(); - } - - // get a ref to the stored data - template T& Get() - { - wxVariantDataT *dataptr = - wx_dynamic_cast(wxVariantDataT*, m_data); - wxASSERT_MSG( dataptr, - wxString::Format(wxT("Cast to %s not possible"), typeid(T).name()) ); - return dataptr->Get(); - } - - // get a const ref to the stored data - template const T& Get() const - { - const wxVariantDataT *dataptr = - wx_dynamic_cast(const wxVariantDataT*, m_data); - wxASSERT_MSG( dataptr, - wxString::Format(wxT("Cast to %s not possible"), typeid(T).name()) ); - return dataptr->Get(); - } - - template bool HasData() const - { - const wxVariantDataT *dataptr = - wx_dynamic_cast(const wxVariantDataT*, m_data); - return dataptr != NULL; - } - - // returns this value as string - wxString GetAsString() const; - - // gets the stored data casted to a wxObject*, - // returning NULL if cast is not possible - wxObject* GetAsObject(); - -protected: - wxVariantData* m_data; - wxString m_name; -}; - -#include "wx/dynarray.h" -WX_DECLARE_OBJARRAY_WITH_DECL(wxVariantBase, wxVariantBaseArray, class WXDLLIMPEXP_BASE); - - -// templated streaming, every type must have their specialization for these methods - -template -void wxStringReadValue( const wxString &s, T &data ); - -template -void wxStringWriteValue( wxString &s, const T &data); - -template -void wxToStringConverter( const wxVariantBase &v, wxString &s ) \ - { wxStringWriteValue( s, v.Get() ); } - -template -void wxFromStringConverter( const wxString &s, wxVariantBase &v ) \ - { T d; wxStringReadValue( s, d ); v = wxVariantBase(d); } - - -#endif // wxUSE_VARIANT -#endif // _WX_VARIANTBASE_H_ diff --git a/Externals/wxWidgets3/include/wx/vector.h b/Externals/wxWidgets3/include/wx/vector.h deleted file mode 100644 index 4eb0f856f4..0000000000 --- a/Externals/wxWidgets3/include/wx/vector.h +++ /dev/null @@ -1,579 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/vector.h -// Purpose: STL vector clone -// Author: Lindsay Mathieson -// Modified by: Vaclav Slavik - make it a template -// Created: 30.07.2001 -// Copyright: (c) 2001 Lindsay Mathieson , -// 2007 Vaclav Slavik -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_VECTOR_H_ -#define _WX_VECTOR_H_ - -#include "wx/defs.h" - -#if wxUSE_STD_CONTAINERS - -#include -#include - -#define wxVector std::vector -template -inline void wxVectorSort(wxVector& v) -{ - std::sort(v.begin(), v.end()); -} - -#else // !wxUSE_STD_CONTAINERS - -#include "wx/scopeguard.h" -#include "wx/meta/movable.h" -#include "wx/meta/if.h" - -#include "wx/beforestd.h" -#include // for placement new -#include "wx/afterstd.h" - -// wxQsort is declared in wx/utils.h, but can't include that file here, -// it indirectly includes this file. Just lovely... -typedef int (*wxSortCallback)(const void* pItem1, - const void* pItem2, - const void* user_data); -WXDLLIMPEXP_BASE void wxQsort(void* pbase, size_t total_elems, - size_t size, wxSortCallback cmp, - const void* user_data); - -namespace wxPrivate -{ - -// These templates encapsulate memory operations for use by wxVector; there are -// two implementations, both in generic way for any C++ types and as an -// optimized version for "movable" types that uses realloc() and memmove(). - -// version for movable types: -template -struct wxVectorMemOpsMovable -{ - static void Free(T* array) - { free(array); } - - static T* Realloc(T* old, size_t newCapacity, size_t WXUNUSED(occupiedSize)) - { return (T*)realloc(old, newCapacity * sizeof(T)); } - - static void MemmoveBackward(T* dest, T* source, size_t count) - { memmove(dest, source, count * sizeof(T)); } - - static void MemmoveForward(T* dest, T* source, size_t count) - { memmove(dest, source, count * sizeof(T)); } -}; - -// generic version for non-movable types: -template -struct wxVectorMemOpsGeneric -{ - static void Free(T* array) - { ::operator delete(array); } - - static T* Realloc(T* old, size_t newCapacity, size_t occupiedSize) - { - T *mem = (T*)::operator new(newCapacity * sizeof(T)); - for ( size_t i = 0; i < occupiedSize; i++ ) - { - ::new(mem + i) T(old[i]); - old[i].~T(); - } - ::operator delete(old); - return mem; - } - - static void MemmoveBackward(T* dest, T* source, size_t count) - { - wxASSERT( dest < source ); - T* destptr = dest; - T* sourceptr = source; - for ( size_t i = count; i > 0; --i, ++destptr, ++sourceptr ) - { - ::new(destptr) T(*sourceptr); - sourceptr->~T(); - } - } - - static void MemmoveForward(T* dest, T* source, size_t count) - { - wxASSERT( dest > source ); - T* destptr = dest + count - 1; - T* sourceptr = source + count - 1; - for ( size_t i = count; i > 0; --i, --destptr, --sourceptr ) - { - ::new(destptr) T(*sourceptr); - sourceptr->~T(); - } - } -}; - - -} // namespace wxPrivate - -template -class wxVector -{ -private: - // This cryptic expression means "typedef Ops to wxVectorMemOpsMovable if - // type T is movable type, otherwise to wxVectorMemOpsGeneric". - // - // Note that bcc needs the extra parentheses for non-type template - // arguments to compile this expression. - typedef typename wxIf< (wxIsMovable::value), - wxPrivate::wxVectorMemOpsMovable, - wxPrivate::wxVectorMemOpsGeneric >::value - Ops; - -public: - typedef size_t size_type; - typedef size_t difference_type; - typedef T value_type; - typedef value_type* pointer; - typedef const value_type* const_pointer; - typedef value_type* iterator; - typedef const value_type* const_iterator; - typedef value_type& reference; - typedef const value_type& const_reference; - - class reverse_iterator - { - public: - reverse_iterator() : m_ptr(NULL) { } - wxEXPLICIT reverse_iterator(iterator it) : m_ptr(it) { } - reverse_iterator(const reverse_iterator& it) : m_ptr(it.m_ptr) { } - - reference operator*() const { return *m_ptr; } - pointer operator->() const { return m_ptr; } - - iterator base() const { return m_ptr; } - - reverse_iterator& operator++() - { --m_ptr; return *this; } - reverse_iterator operator++(int) - { reverse_iterator tmp = *this; --m_ptr; return tmp; } - reverse_iterator& operator--() - { ++m_ptr; return *this; } - reverse_iterator operator--(int) - { reverse_iterator tmp = *this; ++m_ptr; return tmp; } - - reverse_iterator operator+(difference_type n) const - { return reverse_iterator(m_ptr - n); } - reverse_iterator& operator+=(difference_type n) - { m_ptr -= n; return *this; } - reverse_iterator operator-(difference_type n) const - { return reverse_iterator(m_ptr + n); } - reverse_iterator& operator-=(difference_type n) - { m_ptr += n; return *this; } - - reference operator[](difference_type n) const - { return *(*this + n); } - - bool operator ==(const reverse_iterator& it) const - { return m_ptr == it.m_ptr; } - bool operator !=(const reverse_iterator& it) const - { return m_ptr != it.m_ptr; } - - private: - value_type *m_ptr; - - friend class const_reverse_iterator; - }; - - class const_reverse_iterator - { - public: - const_reverse_iterator() : m_ptr(NULL) { } - wxEXPLICIT const_reverse_iterator(const_iterator it) : m_ptr(it) { } - const_reverse_iterator(const reverse_iterator& it) : m_ptr(it.m_ptr) { } - const_reverse_iterator(const const_reverse_iterator& it) : m_ptr(it.m_ptr) { } - - const_reference operator*() const { return *m_ptr; } - const_pointer operator->() const { return m_ptr; } - - const_iterator base() const { return m_ptr; } - - const_reverse_iterator& operator++() - { --m_ptr; return *this; } - const_reverse_iterator operator++(int) - { const_reverse_iterator tmp = *this; --m_ptr; return tmp; } - const_reverse_iterator& operator--() - { ++m_ptr; return *this; } - const_reverse_iterator operator--(int) - { const_reverse_iterator tmp = *this; ++m_ptr; return tmp; } - - const_reverse_iterator operator+(difference_type n) const - { return const_reverse_iterator(m_ptr - n); } - const_reverse_iterator& operator+=(difference_type n) - { m_ptr -= n; return *this; } - const_reverse_iterator operator-(difference_type n) const - { return const_reverse_iterator(m_ptr + n); } - const_reverse_iterator& operator-=(difference_type n) - { m_ptr += n; return *this; } - - const_reference operator[](difference_type n) const - { return *(*this + n); } - - bool operator ==(const const_reverse_iterator& it) const - { return m_ptr == it.m_ptr; } - bool operator !=(const const_reverse_iterator& it) const - { return m_ptr != it.m_ptr; } - - protected: - const value_type *m_ptr; - }; - - wxVector() : m_size(0), m_capacity(0), m_values(NULL) {} - - wxVector(size_type p_size) - : m_size(0), m_capacity(0), m_values(NULL) - { - reserve(p_size); - for ( size_t n = 0; n < p_size; n++ ) - push_back(value_type()); - } - - wxVector(size_type p_size, const value_type& v) - : m_size(0), m_capacity(0), m_values(NULL) - { - reserve(p_size); - for ( size_t n = 0; n < p_size; n++ ) - push_back(v); - } - - wxVector(const wxVector& c) : m_size(0), m_capacity(0), m_values(NULL) - { - Copy(c); - } - - template - wxVector(InputIterator first, InputIterator last) - : m_size(0), m_capacity(0), m_values(NULL) - { - assign(first, last); - } - - ~wxVector() - { - clear(); - } - - void assign(size_type p_size, const value_type& v) - { - clear(); - reserve(p_size); - for ( size_t n = 0; n < p_size; n++ ) - push_back(v); - } - - template - void assign(InputIterator first, InputIterator last) - { - clear(); - - // Notice that it would be nice to call reserve() here but we can't do - // it for arbitrary input iterators, we should have a dispatch on - // iterator type and call it if possible. - - for ( InputIterator it = first; it != last; ++it ) - push_back(*it); - } - - void swap(wxVector& v) - { - wxSwap(m_size, v.m_size); - wxSwap(m_capacity, v.m_capacity); - wxSwap(m_values, v.m_values); - } - - void clear() - { - // call destructors of stored objects: - for ( size_type i = 0; i < m_size; i++ ) - { - m_values[i].~T(); - } - - Ops::Free(m_values); - m_values = NULL; - m_size = - m_capacity = 0; - } - - void reserve(size_type n) - { - if ( n <= m_capacity ) - return; - - // increase the size twice, unless we're already too big or unless - // more is requested - // - // NB: casts to size_type are needed to suppress warnings about - // mixing enumeral and non-enumeral type in conditional expression - const size_type increment = m_size > 0 - ? m_size < ALLOC_MAX_SIZE - ? m_size - : (size_type)ALLOC_MAX_SIZE - : (size_type)ALLOC_INITIAL_SIZE; - if ( m_capacity + increment > n ) - n = m_capacity + increment; - - m_values = Ops::Realloc(m_values, n, m_size); - m_capacity = n; - } - - void resize(size_type n) - { - if ( n < m_size ) - Shrink(n); - else if ( n > m_size ) - Extend(n, value_type()); - } - - void resize(size_type n, const value_type& v) - { - if ( n < m_size ) - Shrink(n); - else if ( n > m_size ) - Extend(n, v); - } - - size_type size() const - { - return m_size; - } - - size_type capacity() const - { - return m_capacity; - } - - bool empty() const - { - return size() == 0; - } - - wxVector& operator=(const wxVector& vb) - { - if (this != &vb) - { - clear(); - Copy(vb); - } - return *this; - } - - void push_back(const value_type& v) - { - reserve(size() + 1); - - // use placement new to initialize new object in preallocated place in - // m_values and store 'v' in it: - void* const place = m_values + m_size; - ::new(place) value_type(v); - - // only increase m_size if the ctor didn't throw an exception; notice - // that if it _did_ throw, everything is OK, because we only increased - // vector's capacity so far and possibly written some data to - // uninitialized memory at the end of m_values - m_size++; - } - - void pop_back() - { - erase(end() - 1); - } - - const value_type& at(size_type idx) const - { - wxASSERT(idx < m_size); - return m_values[idx]; - } - - value_type& at(size_type idx) - { - wxASSERT(idx < m_size); - return m_values[idx]; - } - - const value_type& operator[](size_type idx) const { return at(idx); } - value_type& operator[](size_type idx) { return at(idx); } - const value_type& front() const { return at(0); } - value_type& front() { return at(0); } - const value_type& back() const { return at(size() - 1); } - value_type& back() { return at(size() - 1); } - - const_iterator begin() const { return m_values; } - iterator begin() { return m_values; } - const_iterator end() const { return m_values + size(); } - iterator end() { return m_values + size(); } - - reverse_iterator rbegin() { return reverse_iterator(end() - 1); } - reverse_iterator rend() { return reverse_iterator(begin() - 1); } - - const_reverse_iterator rbegin() const { return const_reverse_iterator(end() - 1); } - const_reverse_iterator rend() const { return const_reverse_iterator(begin() - 1); } - - iterator insert(iterator it, const value_type& v = value_type()) - { - // NB: this must be done before reserve(), because reserve() - // invalidates iterators! - const size_t idx = it - begin(); - const size_t after = end() - it; - - reserve(size() + 1); - - // the place where the new element is going to be inserted - value_type * const place = m_values + idx; - - // unless we're inserting at the end, move following elements out of - // the way: - if ( after > 0 ) - Ops::MemmoveForward(place + 1, place, after); - - // if the ctor called below throws an exception, we need to move all - // the elements back to their original positions in m_values - wxScopeGuard moveBack = wxMakeGuard( - Ops::MemmoveBackward, place, place + 1, after); - if ( !after ) - moveBack.Dismiss(); - - // use placement new to initialize new object in preallocated place in - // m_values and store 'v' in it: - ::new(place) value_type(v); - - // now that we did successfully add the new element, increment the size - // and disable moving the items back - moveBack.Dismiss(); - m_size++; - - return begin() + idx; - } - - iterator erase(iterator it) - { - return erase(it, it + 1); - } - - iterator erase(iterator first, iterator last) - { - if ( first == last ) - return first; - wxASSERT( first < end() && last <= end() ); - - const size_type idx = first - begin(); - const size_type count = last - first; - const size_type after = end() - last; - - // erase elements by calling their destructors: - for ( iterator i = first; i < last; ++i ) - i->~T(); - - // once that's done, move following elements over to the freed space: - if ( after > 0 ) - { - Ops::MemmoveBackward(m_values + idx, m_values + idx + count, after); - } - - m_size -= count; - - return begin() + idx; - } - -#if WXWIN_COMPATIBILITY_2_8 - wxDEPRECATED( size_type erase(size_type n) ); -#endif // WXWIN_COMPATIBILITY_2_8 - -private: - static const size_type ALLOC_INITIAL_SIZE = 16; - static const size_type ALLOC_MAX_SIZE = 4096; - - void Copy(const wxVector& vb) - { - reserve(vb.size()); - - for ( const_iterator i = vb.begin(); i != vb.end(); ++i ) - push_back(*i); - } - -private: - void Shrink(size_type n) - { - for ( size_type i = n; i < m_size; i++ ) - m_values[i].~T(); - m_size = n; - } - - void Extend(size_type n, const value_type& v) - { - reserve(n); - for ( size_type i = m_size; i < n; i++ ) - push_back(v); - } - - size_type m_size, - m_capacity; - value_type *m_values; -}; - -#if WXWIN_COMPATIBILITY_2_8 -template -inline typename wxVector::size_type wxVector::erase(size_type n) -{ - erase(begin() + n); - return n; -} -#endif // WXWIN_COMPATIBILITY_2_8 - - - -namespace wxPrivate -{ - -// This is a helper for the wxVectorSort function, and should not be used -// directly in user's code. -template -struct wxVectorComparator -{ - static int - Compare(const void* pitem1, const void* pitem2, const void* ) - { - const T& item1 = *reinterpret_cast(pitem1); - const T& item2 = *reinterpret_cast(pitem2); - - if (item1 < item2) - return -1; - else if (item2 < item1) - return 1; - else - return 0; - } -}; - -} // namespace wxPrivate - - - -template -void wxVectorSort(wxVector& v) -{ - wxQsort(v.begin(), v.size(), sizeof(T), - wxPrivate::wxVectorComparator::Compare, NULL); -} - - - -#endif // wxUSE_STD_CONTAINERS/!wxUSE_STD_CONTAINERS - -#if WXWIN_COMPATIBILITY_2_8 - #define WX_DECLARE_VECTORBASE(obj, cls) typedef wxVector cls - #define _WX_DECLARE_VECTOR(obj, cls, exp) WX_DECLARE_VECTORBASE(obj, cls) - #define WX_DECLARE_VECTOR(obj, cls) WX_DECLARE_VECTORBASE(obj, cls) -#endif // WXWIN_COMPATIBILITY_2_8 - -#endif // _WX_VECTOR_H_ diff --git a/Externals/wxWidgets3/include/wx/version.h b/Externals/wxWidgets3/include/wx/version.h deleted file mode 100644 index 57ec66fa40..0000000000 --- a/Externals/wxWidgets3/include/wx/version.h +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Name: wx/version.h - * Purpose: wxWidgets version numbers - * Author: Julian Smart - * Modified by: Ryan Norton (Converted to C) - * Created: 29/01/98 - * Copyright: (c) 1998 Julian Smart - * Licence: wxWindows licence - */ - -/* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */ - -#ifndef _WX_VERSION_H_ -#define _WX_VERSION_H_ - -#include "wx/cpp.h" /* for wxSTRINGIZE */ - -/* the constants below must be changed with each new version */ -/* ---------------------------------------------------------------------------- */ - -/* - Don't forget to update WX_CURRENT, WX_REVISION and WX_AGE in - build/bakefiles/version.bkl and regenerate the makefiles when you change - this! - */ - -/* NB: this file is parsed by automatic tools so don't change its format! */ -#define wxMAJOR_VERSION 3 -#define wxMINOR_VERSION 1 -#define wxRELEASE_NUMBER 1 -#define wxSUBRELEASE_NUMBER 0 -#define wxVERSION_STRING wxT("wxWidgets 3.1.1") - -/* nothing to update below this line when updating the version */ -/* ---------------------------------------------------------------------------- */ - -/* Users can pre-define wxABI_VERSION to a lower value in their - * makefile/project settings to compile code that will be binary compatible - * with earlier versions of the ABI within the same minor version (between - * minor versions binary compatibility breaks anyway). The default is the - * version of wxWidgets being used. A single number with two decimal digits - * for each component, e.g. 20601 for 2.6.1 */ -#ifndef wxABI_VERSION -#define wxABI_VERSION ( wxMAJOR_VERSION * 10000 + wxMINOR_VERSION * 100 + 99 ) -#endif - -/* helpers for wxVERSION_NUM_XXX */ -#define wxMAKE_VERSION_STRING(x, y, z) \ - wxSTRINGIZE(x) wxSTRINGIZE(y) wxSTRINGIZE(z) -#define wxMAKE_VERSION_DOT_STRING(x, y, z) \ - wxSTRINGIZE(x) "." wxSTRINGIZE(y) "." wxSTRINGIZE(z) - -#define wxMAKE_VERSION_STRING_T(x, y, z) \ - wxSTRINGIZE_T(x) wxSTRINGIZE_T(y) wxSTRINGIZE_T(z) -#define wxMAKE_VERSION_DOT_STRING_T(x, y, z) \ - wxSTRINGIZE_T(x) wxT(".") wxSTRINGIZE_T(y) wxT(".") wxSTRINGIZE_T(z) - -/* these are used by src/msw/version.rc and should always be ASCII, not Unicode */ -#define wxVERSION_NUM_STRING \ - wxMAKE_VERSION_STRING(wxMAJOR_VERSION, wxMINOR_VERSION, wxRELEASE_NUMBER) -#define wxVERSION_NUM_DOT_STRING \ - wxMAKE_VERSION_DOT_STRING(wxMAJOR_VERSION, wxMINOR_VERSION, wxRELEASE_NUMBER) - -/* those are Unicode-friendly */ -#define wxVERSION_NUM_STRING_T \ - wxMAKE_VERSION_STRING_T(wxMAJOR_VERSION, wxMINOR_VERSION, wxRELEASE_NUMBER) -#define wxVERSION_NUM_DOT_STRING_T \ - wxMAKE_VERSION_DOT_STRING_T(wxMAJOR_VERSION, wxMINOR_VERSION, wxRELEASE_NUMBER) - -/* some more defines, not really sure if they're [still] useful */ -#define wxVERSION_NUMBER ( (wxMAJOR_VERSION * 1000) + (wxMINOR_VERSION * 100) + wxRELEASE_NUMBER ) -#define wxBETA_NUMBER 0 -#define wxVERSION_FLOAT ( wxMAJOR_VERSION + (wxMINOR_VERSION/10.0) + (wxRELEASE_NUMBER/100.0) + (wxBETA_NUMBER/10000.0) ) - -/* check if the current version is at least major.minor.release */ -#define wxCHECK_VERSION(major,minor,release) \ - (wxMAJOR_VERSION > (major) || \ - (wxMAJOR_VERSION == (major) && wxMINOR_VERSION > (minor)) || \ - (wxMAJOR_VERSION == (major) && wxMINOR_VERSION == (minor) && wxRELEASE_NUMBER >= (release))) - -/* the same but check the subrelease also */ -#define wxCHECK_VERSION_FULL(major,minor,release,subrel) \ - (wxCHECK_VERSION(major, minor, release) && \ - ((major) != wxMAJOR_VERSION || \ - (minor) != wxMINOR_VERSION || \ - (release) != wxRELEASE_NUMBER || \ - (subrel) <= wxSUBRELEASE_NUMBER)) - -#endif /* _WX_VERSION_H_ */ - diff --git a/Externals/wxWidgets3/include/wx/versioninfo.h b/Externals/wxWidgets3/include/wx/versioninfo.h deleted file mode 100644 index 79469111a6..0000000000 --- a/Externals/wxWidgets3/include/wx/versioninfo.h +++ /dev/null @@ -1,77 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/versioninfo.h -// Purpose: declaration of wxVersionInfo class -// Author: Troels K -// Created: 2010-11-22 -// Copyright: (c) 2010 wxWidgets team -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_VERSIONINFO_H_ -#define _WX_VERSIONINFO_H_ - -#include "wx/string.h" - -// ---------------------------------------------------------------------------- -// wxVersionInfo: represents version information -// ---------------------------------------------------------------------------- - -class wxVersionInfo -{ -public: - wxVersionInfo(const wxString& name = wxString(), - int major = 0, - int minor = 0, - int micro = 0, - const wxString& description = wxString(), - const wxString& copyright = wxString()) - { - m_name = name; - m_major = major; - m_minor = minor; - m_micro = micro; - m_description = description; - m_copyright = copyright; - } - - // Default copy ctor, assignment operator and dtor are ok. - - - const wxString& GetName() const { return m_name; } - - int GetMajor() const { return m_major; } - int GetMinor() const { return m_minor; } - int GetMicro() const { return m_micro; } - - wxString ToString() const - { - return HasDescription() ? GetDescription() : GetVersionString(); - } - - wxString GetVersionString() const - { - wxString str; - str << m_name << ' ' << GetMajor() << '.' << GetMinor(); - if ( GetMicro() ) - str << '.' << GetMicro(); - - return str; - } - - bool HasDescription() const { return !m_description.empty(); } - const wxString& GetDescription() const { return m_description; } - - bool HasCopyright() const { return !m_copyright.empty(); } - const wxString& GetCopyright() const { return m_copyright; } - -private: - wxString m_name, - m_description, - m_copyright; - - int m_major, - m_minor, - m_micro; -}; - -#endif // _WX_VERSIONINFO_H_ diff --git a/Externals/wxWidgets3/include/wx/vidmode.h b/Externals/wxWidgets3/include/wx/vidmode.h deleted file mode 100644 index 550bb3b4bc..0000000000 --- a/Externals/wxWidgets3/include/wx/vidmode.h +++ /dev/null @@ -1,73 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/vidmode.h -// Purpose: declares wxVideoMode class used by both wxDisplay and wxApp -// Author: Vadim Zeitlin -// Modified by: -// Created: 27.09.2003 (extracted from wx/display.h) -// Copyright: (c) 2003 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_VMODE_H_ -#define _WX_VMODE_H_ - -// ---------------------------------------------------------------------------- -// wxVideoMode: a simple struct containing video mode parameters for a display -// ---------------------------------------------------------------------------- - -struct WXDLLIMPEXP_CORE wxVideoMode -{ - wxVideoMode(int width = 0, int height = 0, int depth = 0, int freq = 0) - { - w = width; - h = height; - - bpp = depth; - - refresh = freq; - } - - // default copy ctor and assignment operator are ok - - bool operator==(const wxVideoMode& m) const - { - return w == m.w && h == m.h && bpp == m.bpp && refresh == m.refresh; - } - bool operator!=(const wxVideoMode& mode) const - { - return !operator==(mode); - } - - // returns true if this mode matches the other one in the sense that all - // non zero fields of the other mode have the same value in this one - // (except for refresh which is allowed to have a greater value) - bool Matches(const wxVideoMode& other) const - { - return (!other.w || w == other.w) && - (!other.h || h == other.h) && - (!other.bpp || bpp == other.bpp) && - (!other.refresh || refresh >= other.refresh); - } - - // trivial accessors - int GetWidth() const { return w; } - int GetHeight() const { return h; } - int GetDepth() const { return bpp; } - int GetRefresh() const { return refresh; } - - // returns true if the object has been initialized - bool IsOk() const { return w && h; } - - - // the screen size in pixels (e.g. 640*480), 0 means unspecified - int w, h; - - // bits per pixel (e.g. 32), 1 is monochrome and 0 means unspecified/known - int bpp; - - // refresh frequency in Hz, 0 means unspecified/unknown - int refresh; -}; - -#endif // _WX_VMODE_H_ - diff --git a/Externals/wxWidgets3/include/wx/vlbox.h b/Externals/wxWidgets3/include/wx/vlbox.h deleted file mode 100644 index 2bee9267a1..0000000000 --- a/Externals/wxWidgets3/include/wx/vlbox.h +++ /dev/null @@ -1,311 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/vlbox.h -// Purpose: wxVListBox is a virtual listbox with lines of variable height -// Author: Vadim Zeitlin -// Modified by: -// Created: 31.05.03 -// Copyright: (c) 2003 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_VLBOX_H_ -#define _WX_VLBOX_H_ - -#include "wx/vscroll.h" // base class -#include "wx/bitmap.h" - -class WXDLLIMPEXP_FWD_CORE wxSelectionStore; -extern WXDLLIMPEXP_DATA_CORE(const char) wxVListBoxNameStr[]; - -// ---------------------------------------------------------------------------- -// wxVListBox -// ---------------------------------------------------------------------------- - -/* - This class has two main differences from a regular listbox: it can have an - arbitrarily huge number of items because it doesn't store them itself but - uses OnDrawItem() callback to draw them and its items can have variable - height as determined by OnMeasureItem(). - - It emits the same events as wxListBox and the same event macros may be used - with it. - */ -class WXDLLIMPEXP_CORE wxVListBox : public wxVScrolledWindow -{ -public: - // constructors and such - // --------------------- - - // default constructor, you must call Create() later - wxVListBox() { Init(); } - - // normal constructor which calls Create() internally - wxVListBox(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxVListBoxNameStr) - { - Init(); - - (void)Create(parent, id, pos, size, style, name); - } - - // really creates the control and sets the initial number of items in it - // (which may be changed later with SetItemCount()) - // - // the only special style which may be specified here is wxLB_MULTIPLE - // - // returns true on success or false if the control couldn't be created - bool Create(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxVListBoxNameStr); - - // dtor does some internal cleanup (deletes m_selStore if any) - virtual ~wxVListBox(); - - - // accessors - // --------- - - // get the number of items in the control - size_t GetItemCount() const { return GetRowCount(); } - - // does this control use multiple selection? - bool HasMultipleSelection() const { return m_selStore != NULL; } - - // get the currently selected item or wxNOT_FOUND if there is no selection - // - // this method is only valid for the single selection listboxes - int GetSelection() const - { - wxASSERT_MSG( !HasMultipleSelection(), - wxT("GetSelection() can't be used with wxLB_MULTIPLE") ); - - return m_current; - } - - // is this item the current one? - bool IsCurrent(size_t item) const { return item == (size_t)m_current; } - #ifdef __WXUNIVERSAL__ - bool IsCurrent() const { return wxVScrolledWindow::IsCurrent(); } - #endif - - // is this item selected? - bool IsSelected(size_t item) const; - - // get the number of the selected items (maybe 0) - // - // this method is valid for both single and multi selection listboxes - size_t GetSelectedCount() const; - - // get the first selected item, returns wxNOT_FOUND if none - // - // cookie is an opaque parameter which should be passed to - // GetNextSelected() later - // - // this method is only valid for the multi selection listboxes - int GetFirstSelected(unsigned long& cookie) const; - - // get next selection item, return wxNOT_FOUND if no more - // - // cookie must be the same parameter that was passed to GetFirstSelected() - // before - // - // this method is only valid for the multi selection listboxes - int GetNextSelected(unsigned long& cookie) const; - - // get the margins around each item - wxPoint GetMargins() const { return m_ptMargins; } - - // get the background colour of selected cells - const wxColour& GetSelectionBackground() const { return m_colBgSel; } - - // get the item rect, returns empty rect if the item is not visible - wxRect GetItemRect(size_t n) const; - - // operations - // ---------- - - // set the number of items to be shown in the control - // - // this is just a synonym for wxVScrolledWindow::SetRowCount() - virtual void SetItemCount(size_t count); - - // delete all items from the control - void Clear() { SetItemCount(0); } - - // set the selection to the specified item, if it is wxNOT_FOUND the - // selection is unset - // - // this function is only valid for the single selection listboxes - void SetSelection(int selection); - - // selects or deselects the specified item which must be valid (i.e. not - // equal to wxNOT_FOUND) - // - // return true if the items selection status has changed or false - // otherwise - // - // this function is only valid for the multiple selection listboxes - bool Select(size_t item, bool select = true); - - // selects the items in the specified range whose end points may be given - // in any order - // - // return true if any items selection status has changed, false otherwise - // - // this function is only valid for the single selection listboxes - bool SelectRange(size_t from, size_t to); - - // toggle the selection of the specified item (must be valid) - // - // this function is only valid for the multiple selection listboxes - void Toggle(size_t item) { Select(item, !IsSelected(item)); } - - // select all items in the listbox - // - // the return code indicates if any items were affected by this operation - // (true) or if nothing has changed (false) - bool SelectAll() { return DoSelectAll(true); } - - // unselect all items in the listbox - // - // the return code has the same meaning as for SelectAll() - bool DeselectAll() { return DoSelectAll(false); } - - // set the margins: horizontal margin is the distance between the window - // border and the item contents while vertical margin is half of the - // distance between items - // - // by default both margins are 0 - void SetMargins(const wxPoint& pt); - void SetMargins(wxCoord x, wxCoord y) { SetMargins(wxPoint(x, y)); } - - // change the background colour of the selected cells - void SetSelectionBackground(const wxColour& col); - - // refreshes only the selected items - void RefreshSelected(); - - - virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE - { - return GetClassDefaultAttributes(GetWindowVariant()); - } - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - -protected: - virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_THEME; } - - // the derived class must implement this function to actually draw the item - // with the given index on the provided DC - virtual void OnDrawItem(wxDC& dc, const wxRect& rect, size_t n) const = 0; - - // the derived class must implement this method to return the height of the - // specified item - virtual wxCoord OnMeasureItem(size_t n) const = 0; - - // this method may be used to draw separators between the lines; note that - // the rectangle may be modified, typically to deflate it a bit before - // passing to OnDrawItem() - // - // the base class version doesn't do anything - virtual void OnDrawSeparator(wxDC& dc, wxRect& rect, size_t n) const; - - // this method is used to draw the items background and, maybe, a border - // around it - // - // the base class version implements a reasonable default behaviour which - // consists in drawing the selected item with the standard background - // colour and drawing a border around the item if it is either selected or - // current - virtual void OnDrawBackground(wxDC& dc, const wxRect& rect, size_t n) const; - - // we implement OnGetRowHeight() in terms of OnMeasureItem() because this - // allows us to add borders to the items easily - // - // this function is not supposed to be overridden by the derived classes - virtual wxCoord OnGetRowHeight(size_t line) const wxOVERRIDE; - - - // event handlers - void OnPaint(wxPaintEvent& event); - void OnKeyDown(wxKeyEvent& event); - void OnLeftDown(wxMouseEvent& event); - void OnLeftDClick(wxMouseEvent& event); - void OnSetOrKillFocus(wxFocusEvent& event); - void OnSize(wxSizeEvent& event); - - // common part of all ctors - void Init(); - - // send the wxEVT_LISTBOX event - void SendSelectedEvent(); - virtual void InitEvent(wxCommandEvent& event, int n); - - // common implementation of SelectAll() and DeselectAll() - bool DoSelectAll(bool select); - - // change the current item (in single selection listbox it also implicitly - // changes the selection); current may be wxNOT_FOUND in which case there - // will be no current item any more - // - // return true if the current item changed, false otherwise - bool DoSetCurrent(int current); - - // flags for DoHandleItemClick - enum - { - ItemClick_Shift = 1, // item shift-clicked - ItemClick_Ctrl = 2, // ctrl - ItemClick_Kbd = 4 // item selected from keyboard - }; - - // common part of keyboard and mouse handling processing code - void DoHandleItemClick(int item, int flags); - - // paint the background of the given item using the provided colour if it's - // valid, otherwise just return false and do nothing (this is used by - // OnDrawBackground()) - bool DoDrawSolidBackground(const wxColour& col, - wxDC& dc, - const wxRect& rect, - size_t n) const; - -private: - // the current item or wxNOT_FOUND - // - // if m_selStore == NULL this is also the selected item, otherwise the - // selections are managed by m_selStore - int m_current; - - // the anchor of the selection for the multiselection listboxes: - // shift-clicking an item extends the selection from m_anchor to the item - // clicked, for example - // - // always wxNOT_FOUND for single selection listboxes - int m_anchor; - - // the object managing our selected items if not NULL - wxSelectionStore *m_selStore; - - // margins - wxPoint m_ptMargins; - - // the selection bg colour - wxColour m_colBgSel; - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_NO_COPY_CLASS(wxVListBox); - wxDECLARE_ABSTRACT_CLASS(wxVListBox); -}; - -#endif // _WX_VLBOX_H_ - diff --git a/Externals/wxWidgets3/include/wx/vms_x_fix.h b/Externals/wxWidgets3/include/wx/vms_x_fix.h deleted file mode 100644 index 8d34abd7e6..0000000000 --- a/Externals/wxWidgets3/include/wx/vms_x_fix.h +++ /dev/null @@ -1,1213 +0,0 @@ -/*************************************************************************** - * * - * Author : Jouk Jansen (joukj@hrem.stm.tudelft.nl) * - * * - * Last revision : 7 October 2005 * - * * - * Repair definitions of Runtime library functions when compiling with * - * /name=(as_is) on OpenVMS * - * * - ***************************************************************************/ - -#ifndef VMS_X_FIX -#define VMS_X_FIX - -#define decw$_select DECW$_SELECT -#define DtSaverGetWindows DTSAVERGETWINDOWS -#define MrmFetchWidget MRMFETCHWIDGET -#define MrmInitialize MRMINITIALIZE -#define MrmOpenHierarchy MRMOPENHIERARCHY -#define MrmRegisterNames MRMREGISTERNAMES -#define XAddExtension XADDEXTENSION -#define XAddHosts XADDHOSTS -#define XAllocClassHint XALLOCCLASSHINT -#define XAllocColor XALLOCCOLOR -#define XAllocColorCells XALLOCCOLORCELLS -#define XAllocIconSize XALLOCICONSIZE -#define XAllocNamedColor XALLOCNAMEDCOLOR -#define XAllocSizeHints XALLOCSIZEHINTS -#define XAllocStandardColormap XALLOCSTANDARDCOLORMAP -#define XAllocWMHints XALLOCWMHINTS -#define XAllowEvents XALLOWEVENTS -#define XAutoRepeatOff XAUTOREPEATOFF -#define XAutoRepeatOn XAUTOREPEATON -#define XBaseFontNameListOfFontSet XBASEFONTNAMELISTOFFONTSET -#define XBell XBELL -#define XBitmapPad XBITMAPPAD -#define XBlackPixel XBLACKPIXEL -#define XBlackPixelOfScreen XBLACKPIXELOFSCREEN -#define XCellsOfScreen XCELLSOFSCREEN -#define XChangeActivePointerGrab XCHANGEACTIVEPOINTERGRAB -#define XChangeGC XCHANGEGC -#define XChangeKeyboardControl XCHANGEKEYBOARDCONTROL -#define XChangePointerControl XCHANGEPOINTERCONTROL -#define XChangeProperty XCHANGEPROPERTY -#define XChangeWindowAttributes XCHANGEWINDOWATTRIBUTES -#define XCheckIfEvent XCHECKIFEVENT -#define XCheckMaskEvent XCHECKMASKEVENT -#define XCheckTypedEvent XCHECKTYPEDEVENT -#define XCheckTypedWindowEvent XCHECKTYPEDWINDOWEVENT -#define XCheckWindowEvent XCHECKWINDOWEVENT -#define XClearArea XCLEARAREA -#define XClearWindow XCLEARWINDOW -#define XClipBox XCLIPBOX -#define XCloseDisplay XCLOSEDISPLAY -#define XCloseIM XCLOSEIM -#define XConfigureWindow XCONFIGUREWINDOW -#define XConvertSelection XCONVERTSELECTION -#define XCopyArea XCOPYAREA -#define XCopyColormapAndFree XCOPYCOLORMAPANDFREE -#define XCopyGC XCOPYGC -#define XCopyPlane XCOPYPLANE -#define XCreateBitmapFromData XCREATEBITMAPFROMDATA -#define XCreateColormap XCREATECOLORMAP -#define XCreateFontCursor XCREATEFONTCURSOR -#define XCreateFontSet XCREATEFONTSET -#define XCreateGC XCREATEGC -#define XCreateGlyphCursor XCREATEGLYPHCURSOR -#define XCreateIC XCREATEIC -#define XCreateImage XCREATEIMAGE -#define XCreatePixmap XCREATEPIXMAP -#define XCreatePixmapCursor XCREATEPIXMAPCURSOR -#define XCreatePixmapFromBitmapData XCREATEPIXMAPFROMBITMAPDATA -#define XCreateRegion XCREATEREGION -#define XCreateSimpleWindow XCREATESIMPLEWINDOW -#define XCreateWindow XCREATEWINDOW -#define XDefaultColormap XDEFAULTCOLORMAP -#define XDefaultColormapOfScreen XDEFAULTCOLORMAPOFSCREEN -#define XDefaultDepth XDEFAULTDEPTH -#define XDefaultDepthOfScreen XDEFAULTDEPTHOFSCREEN -#define XDefaultGC XDEFAULTGC -#define XDefaultRootWindow XDEFAULTROOTWINDOW -#define XDefaultScreen XDEFAULTSCREEN -#define XDefaultScreenOfDisplay XDEFAULTSCREENOFDISPLAY -#define XDefaultVisual XDEFAULTVISUAL -#define XDefaultVisualOfScreen XDEFAULTVISUALOFSCREEN -#define XDefineCursor XDEFINECURSOR -#define XDeleteContext XDELETECONTEXT -#define XDeleteProperty XDELETEPROPERTY -#define XDestroyIC XDESTROYIC -#define XDestroyRegion XDESTROYREGION -#define XDestroySubwindows XDESTROYSUBWINDOWS -#define XDestroyWindow XDESTROYWINDOW -#define XDisableAccessControl XDISABLEACCESSCONTROL -#define XDisplayCells XDISPLAYCELLS -#define XDisplayHeight XDISPLAYHEIGHT -#define XDisplayKeycodes XDISPLAYKEYCODES -#define XDisplayName XDISPLAYNAME -#define XDisplayOfIM XDISPLAYOFIM -#define XDisplayOfScreen XDISPLAYOFSCREEN -#define XDisplayString XDISPLAYSTRING -#define XDisplayWidth XDISPLAYWIDTH -#define XDoesBackingStore XDOESBACKINGSTORE -#define XDrawArc XDRAWARC -#define XDrawArcs XDRAWARCS -#define XDrawImageString XDRAWIMAGESTRING -#define XDrawImageString16 XDRAWIMAGESTRING16 -#define XDrawLine XDRAWLINE -#define XDrawLines XDRAWLINES -#define XDrawPoint XDRAWPOINT -#define XDrawPoints XDRAWPOINTS -#define XDrawRectangle XDRAWRECTANGLE -#define XDrawRectangles XDRAWRECTANGLES -#define XDrawSegments XDRAWSEGMENTS -#define XDrawString XDRAWSTRING -#define XDrawString16 XDRAWSTRING16 -#define XDrawText XDRAWTEXT -#define XDrawText16 XDRAWTEXT16 -#define XESetCloseDisplay XESETCLOSEDISPLAY -#define XEmptyRegion XEMPTYREGION -#define XEnableAccessControl XENABLEACCESSCONTROL -#define XEqualRegion XEQUALREGION -#define XEventsQueued XEVENTSQUEUED -#define XExtendedMaxRequestSize XEXTENDEDMAXREQUESTSIZE -#define XExtentsOfFontSet XEXTENTSOFFONTSET -#define XFetchBuffer XFETCHBUFFER -#define XFetchBytes XFETCHBYTES -#define XFetchName XFETCHNAME -#define XFillArc XFILLARC -#define XFillArcs XFILLARCS -#define XFillPolygon XFILLPOLYGON -#define XFillRectangle XFILLRECTANGLE -#define XFillRectangles XFILLRECTANGLES -#define XFilterEvent XFILTEREVENT -#define XFindContext XFINDCONTEXT -#define XFlush XFLUSH -#define XFontsOfFontSet XFONTSOFFONTSET -#define XForceScreenSaver XFORCESCREENSAVER -#define XFree XFREE -#define XFreeColormap XFREECOLORMAP -#define XFreeColors XFREECOLORS -#define XFreeCursor XFREECURSOR -#define XFreeDeviceList XFREEDEVICELIST -#define XFreeDeviceState XFREEDEVICESTATE -#define XFreeFont XFREEFONT -#define XFreeFontInfo XFREEFONTINFO -#define XFreeFontNames XFREEFONTNAMES -#define XFreeFontSet XFREEFONTSET -#define XFreeGC XFREEGC -#define XFreeModifiermap XFREEMODIFIERMAP -#define XFreePixmap XFREEPIXMAP -#define XFreeStringList XFREESTRINGLIST -#define XGContextFromGC XGCONTEXTFROMGC -#define XGeometry XGEOMETRY -#define XGetAtomName XGETATOMNAME -#define XGetCommand XGETCOMMAND -#define XGetDefault XGETDEFAULT -#define XGetErrorDatabaseText XGETERRORDATABASETEXT -#define XGetErrorText XGETERRORTEXT -#define XGetExtensionVersion XGETEXTENSIONVERSION -#define XGetFontProperty XGETFONTPROPERTY -#define XGetGCValues XGETGCVALUES -#define XGetGeometry XGETGEOMETRY -#define XGetICValues XGETICVALUES -#define XGetIMValues XGETIMVALUES -#define XGetIconName XGETICONNAME -#define XGetIconSizes XGETICONSIZES -#define XGetImage XGETIMAGE -#define XGetInputFocus XGETINPUTFOCUS -#define XGetKeyboardControl XGETKEYBOARDCONTROL -#define XGetKeyboardMapping XGETKEYBOARDMAPPING -#define XGetModifierMapping XGETMODIFIERMAPPING -#define XGetMotionEvents XGETMOTIONEVENTS -#define XGetNormalHints XGETNORMALHINTS -#define XGetPointerMapping XGETPOINTERMAPPING -#define XGetRGBColormaps XGETRGBCOLORMAPS -#define XGetScreenSaver XGETSCREENSAVER -#define XGetSelectionOwner XGETSELECTIONOWNER -#define XGetStandardColormap XGETSTANDARDCOLORMAP -#define XGetSubImage XGETSUBIMAGE -#define XGetTextProperty XGETTEXTPROPERTY -#define XGetVisualInfo XGETVISUALINFO -#define XGetWMColormapWindows XGETWMCOLORMAPWINDOWS -#define XGetWMHints XGETWMHINTS -#define XGetWMIconName XGETWMICONNAME -#define XGetWMName XGETWMNAME -#define XGetWMNormalHints XGETWMNORMALHINTS -#define XGetWindowAttributes XGETWINDOWATTRIBUTES -#define XGetWindowProperty XGETWINDOWPROPERTY -#define XGrabButton XGRABBUTTON -#define XGrabKeyboard XGRABKEYBOARD -#define XGrabPointer XGRABPOINTER -#define XGrabServer XGRABSERVER -#define XHeightMMOfScreen XHEIGHTMMOFSCREEN -#define XHeightOfScreen XHEIGHTOFSCREEN -#define XIconifyWindow XICONIFYWINDOW -#define XIfEvent XIFEVENT -#define XInitExtension XINITEXTENSION -#define XInitImage XINITIMAGE -#define XInstallColormap XINSTALLCOLORMAP -#define XInternAtom XINTERNATOM -#define XInternAtoms XINTERNATOMS -#define XIntersectRegion XINTERSECTREGION -#define XKeycodeToKeysym XKEYCODETOKEYSYM -#define XKeysymToKeycode XKEYSYMTOKEYCODE -#define XKeysymToString XKEYSYMTOSTRING -#define XKillClient XKILLCLIENT -#define XListDepths XLISTDEPTHS -#define XListFonts XLISTFONTS -#define XListFontsWithInfo XLISTFONTSWITHINFO -#define XListHosts XLISTHOSTS -#define XListInputDevices XLISTINPUTDEVICES -#define XListInstalledColormaps XLISTINSTALLEDCOLORMAPS -#define XListPixmapFormats XLISTPIXMAPFORMATS -#define XListProperties XLISTPROPERTIES -#define XLoadFont XLOADFONT -#define XLoadQueryFont XLOADQUERYFONT -#define XLookupColor XLOOKUPCOLOR -#define XLookupKeysym XLOOKUPKEYSYM -#define XLookupString XLOOKUPSTRING -#define XLowerWindow XLOWERWINDOW -#define XMapRaised XMAPRAISED -#define XMapSubwindows XMAPSUBWINDOWS -#define XMapWindow XMAPWINDOW -#define XMatchVisualInfo XMATCHVISUALINFO -#define XMaxRequestSize XMAXREQUESTSIZE -#define XMissingExtension XMISSINGEXTENSION -#define XMoveResizeWindow XMOVERESIZEWINDOW -#define XMoveWindow XMOVEWINDOW -#define XNextEvent XNEXTEVENT -#define XNextRequest XNEXTREQUEST -#define XNoOp XNOOP -#define XOffsetRegion XOFFSETREGION -#define XOpenDevice XOPENDEVICE -#define XOpenDisplay XOPENDISPLAY -#define XOpenIM XOPENIM -#define XParseColor XPARSECOLOR -#define XParseGeometry XPARSEGEOMETRY -#define XPeekEvent XPEEKEVENT -#define XPeekIfEvent XPEEKIFEVENT -#define XPending XPENDING -#define XPointInRegion XPOINTINREGION -#define XPolygonRegion XPOLYGONREGION -#define XPutBackEvent XPUTBACKEVENT -#define XPutImage XPUTIMAGE -#define XQLength XQLENGTH -#define XQueryBestCursor XQUERYBESTCURSOR -#define XQueryBestStipple XQUERYBESTSTIPPLE -#define XQueryColor XQUERYCOLOR -#define XQueryColors XQUERYCOLORS -#define XQueryDeviceState XQUERYDEVICESTATE -#define XQueryExtension XQUERYEXTENSION -#define XQueryFont XQUERYFONT -#define XQueryKeymap XQUERYKEYMAP -#define XQueryPointer XQUERYPOINTER -#define XQueryTree XQUERYTREE -#define XRaiseWindow XRAISEWINDOW -#define XReadBitmapFile XREADBITMAPFILE -#define XRecolorCursor XRECOLORCURSOR -#define XReconfigureWMWindow XRECONFIGUREWMWINDOW -#define XRectInRegion XRECTINREGION -#define XRefreshKeyboardMapping XREFRESHKEYBOARDMAPPING -#define XRemoveHosts XREMOVEHOSTS -#define XReparentWindow XREPARENTWINDOW -#define XResetScreenSaver XRESETSCREENSAVER -#define XResizeWindow XRESIZEWINDOW -#define XResourceManagerString XRESOURCEMANAGERSTRING -#define XRestackWindows XRESTACKWINDOWS -#define XRotateBuffers XROTATEBUFFERS -#define XRootWindow XROOTWINDOW -#define XRootWindowOfScreen XROOTWINDOWOFSCREEN -#define XSaveContext XSAVECONTEXT -#define XScreenNumberOfScreen XSCREENNUMBEROFSCREEN -#define XScreenOfDisplay XSCREENOFDISPLAY -#define XSelectAsyncEvent XSELECTASYNCEVENT -#define XSelectAsyncInput XSELECTASYNCINPUT -#define XSelectExtensionEvent XSELECTEXTENSIONEVENT -#define XSelectInput XSELECTINPUT -#define XSendEvent XSENDEVENT -#define XServerVendor XSERVERVENDOR -#define XSetArcMode XSETARCMODE -#define XSetBackground XSETBACKGROUND -#define XSetClassHint XSETCLASSHINT -#define XSetClipMask XSETCLIPMASK -#define XSetClipOrigin XSETCLIPORIGIN -#define XSetClipRectangles XSETCLIPRECTANGLES -#define XSetCloseDownMode XSETCLOSEDOWNMODE -#define XSetCommand XSETCOMMAND -#define XSetDashes XSETDASHES -#define XSetErrorHandler XSETERRORHANDLER -#define XSetFillRule XSETFILLRULE -#define XSetFillStyle XSETFILLSTYLE -#define XSetFont XSETFONT -#define XSetForeground XSETFOREGROUND -#define XSetFunction XSETFUNCTION -#define XSetGraphicsExposures XSETGRAPHICSEXPOSURES -#define XSetICFocus XSETICFOCUS -#define XSetICValues XSETICVALUES -#define XSetIOErrorHandler XSETIOERRORHANDLER -#define XSetIconName XSETICONNAME -#define XSetInputFocus XSETINPUTFOCUS -#define XSetLineAttributes XSETLINEATTRIBUTES -#define XSetLocaleModifiers XSETLOCALEMODIFIERS -#define XSetNormalHints XSETNORMALHINTS -#define XSetPlaneMask XSETPLANEMASK -#define XSetRegion XSETREGION -#define XSetRGBColormaps XSETRGBCOLORMAPS -#define XSetScreenSaver XSETSCREENSAVER -#define XSetSelectionOwner XSETSELECTIONOWNER -#define XSetStandardProperties XSETSTANDARDPROPERTIES -#define XSetState XSETSTATE -#define XSetStipple XSETSTIPPLE -#define XSetSubwindowMode XSETSUBWINDOWMODE -#define XSetTSOrigin XSETTSORIGIN -#define XSetTextProperty XSETTEXTPROPERTY -#define XSetTile XSETTILE -#define XSetTransientForHint XSETTRANSIENTFORHINT -#define XSetWMClientMachine XSETWMCLIENTMACHINE -#define XSetWMColormapWindows XSETWMCOLORMAPWINDOWS -#define XSetWMHints XSETWMHINTS -#define XSetWMIconName XSETWMICONNAME -#define XSetWMName XSETWMNAME -#define XSetWMNormalHints XSETWMNORMALHINTS -#define XSetWMProperties XSETWMPROPERTIES -#define XSetWMProtocols XSETWMPROTOCOLS -#define XSetWMSizeHints XSETWMSIZEHINTS -#define XSetWindowBackground XSETWINDOWBACKGROUND -#define XSetWindowBackgroundPixmap XSETWINDOWBACKGROUNDPIXMAP -#define XSetWindowBorder XSETWINDOWBORDER -#define XSetWindowBorderPixmap XSETWINDOWBORDERPIXMAP -#define XSetWindowBorderWidth XSETWINDOWBORDERWIDTH -#define XSetWindowColormap XSETWINDOWCOLORMAP -#define XShapeCombineMask XSHAPECOMBINEMASK -#define XShapeCombineRectangles XSHAPECOMBINERECTANGLES -#define XShapeGetRectangles XSHAPEGETRECTANGLES -#define XShapeQueryExtension XSHAPEQUERYEXTENSION -#define XShmAttach XSHMATTACH -#define XShmCreateImage XSHMCREATEIMAGE -#define XShmCreatePixmap XSHMCREATEPIXMAP -#define XShmDetach XSHMDETACH -#define XShmGetEventBase XSHMGETEVENTBASE -#define XShmPutImage XSHMPUTIMAGE -#define XShmQueryExtension XSHMQUERYEXTENSION -#define XShmQueryVersion XSHMQUERYVERSION -#define XShrinkRegion XSHRINKREGION -#define XStoreBuffer XSTOREBUFFER -#define XStoreBytes XSTOREBYTES -#define XStoreColor XSTORECOLOR -#define XStoreColors XSTORECOLORS -#define XStoreName XSTORENAME -#define XStringListToTextProperty XSTRINGLISTTOTEXTPROPERTY -#define XStringToKeysym XSTRINGTOKEYSYM -#define XSubtractRegion XSUBTRACTREGION -#define XSupportsLocale XSUPPORTSLOCALE -#define XSync XSYNC -#define XSynchronize XSYNCHRONIZE -#define XTextExtents XTEXTEXTENTS -#define XTextExtents16 XTEXTEXTENTS16 -#define XTextPropertyToStringList XTEXTPROPERTYTOSTRINGLIST -#define XTextWidth XTEXTWIDTH -#define XTextWidth16 XTEXTWIDTH16 -#define XTranslateCoordinates XTRANSLATECOORDINATES -#define XUndefineCursor XUNDEFINECURSOR -#define XUngrabButton XUNGRABBUTTON -#define XUngrabKeyboard XUNGRABKEYBOARD -#define XUngrabPointer XUNGRABPOINTER -#define XUngrabServer XUNGRABSERVER -#define XUninstallColormap XUNINSTALLCOLORMAP -#define XUnionRectWithRegion XUNIONRECTWITHREGION -#define XUnionRegion XUNIONREGION -#define XUniqueContext XUNIQUECONTEXT -#define XUnmapWindow XUNMAPWINDOW -#define XUnsetICFocus XUNSETICFOCUS -#define XVaCreateNestedList XVACREATENESTEDLIST -#define XVisualIDFromVisual XVISUALIDFROMVISUAL -#define XWMGeometry XWMGEOMETRY -#define XWarpPointer XWARPPOINTER -#define XWhitePixel XWHITEPIXEL -#define XWhitePixelOfScreen XWHITEPIXELOFSCREEN -#define XWidthMMOfScreen XWIDTHMMOFSCREEN -#define XWidthOfScreen XWIDTHOFSCREEN -#define XWindowEvent XWINDOWEVENT -#define XWithdrawWindow XWITHDRAWWINDOW -#define XXorRegion XXORREGION -#define XcmsQueryColor XCMSQUERYCOLOR -#define XdbeAllocateBackBufferName XDBEALLOCATEBACKBUFFERNAME -#define XdbeFreeVisualInfo XDBEFREEVISUALINFO -#define XdbeGetVisualInfo XDBEGETVISUALINFO -#define XdbeQueryExtension XDBEQUERYEXTENSION -#define XdbeSwapBuffers XDBESWAPBUFFERS -#define XextAddDisplay XEXTADDDISPLAY -#define XextFindDisplay XEXTFINDDISPLAY -#define XextRemoveDisplay XEXTREMOVEDISPLAY -#define XkbSetDetectableAutoRepeat XKBSETDETECTABLEAUTOREPEAT -#define XmActivateProtocol XMACTIVATEPROTOCOL -#define XmAddProtocolCallback XMADDPROTOCOLCALLBACK -#define XmAddProtocols XMADDPROTOCOLS -#define XmChangeColor XMCHANGECOLOR -#define XmClipboardCopy XMCLIPBOARDCOPY -#define XmClipboardCopyByName XMCLIPBOARDCOPYBYNAME -#define XmClipboardEndCopy XMCLIPBOARDENDCOPY -#define XmClipboardEndRetrieve XMCLIPBOARDENDRETRIEVE -#define XmClipboardInquireCount XMCLIPBOARDINQUIRECOUNT -#define XmClipboardInquireFormat XMCLIPBOARDINQUIREFORMAT -#define XmClipboardInquireLength XMCLIPBOARDINQUIRELENGTH -#define XmClipboardLock XMCLIPBOARDLOCK -#define XmClipboardRetrieve XMCLIPBOARDRETRIEVE -#define XmClipboardStartCopy XMCLIPBOARDSTARTCOPY -#define XmClipboardStartRetrieve XMCLIPBOARDSTARTRETRIEVE -#define XmClipboardUnlock XMCLIPBOARDUNLOCK -#define XmCommandError XMCOMMANDERROR -#define XmCommandGetChild XMCOMMANDGETCHILD -#define XmCommandSetValue XMCOMMANDSETVALUE -#define XmCreateArrowButton XMCREATEARROWBUTTON -#define XmCreateArrowButtonGadget XMCREATEARROWBUTTONGADGET -#define XmCreateBulletinBoardDialog XMCREATEBULLETINBOARDDIALOG -#define XmCreateCascadeButton XMCREATECASCADEBUTTON -#define XmCreateCascadeButtonGadget XMCREATECASCADEBUTTONGADGET -#define XmCreateDialogShell XMCREATEDIALOGSHELL -#define XmCreateDragIcon XMCREATEDRAGICON -#define XmCreateDrawingArea XMCREATEDRAWINGAREA -#define XmCreateDrawnButton XMCREATEDRAWNBUTTON -#define XmCreateErrorDialog XMCREATEERRORDIALOG -#define XmCreateFileSelectionBox XMCREATEFILESELECTIONBOX -#define XmCreateFileSelectionDialog XMCREATEFILESELECTIONDIALOG -#define XmCreateForm XMCREATEFORM -#define XmCreateFormDialog XMCREATEFORMDIALOG -#define XmCreateFrame XMCREATEFRAME -#define XmCreateInformationDialog XMCREATEINFORMATIONDIALOG -#define XmCreateLabel XMCREATELABEL -#define XmCreateLabelGadget XMCREATELABELGADGET -#define XmCreateList XMCREATELIST -#define XmCreateMainWindow XMCREATEMAINWINDOW -#define XmCreateMenuBar XMCREATEMENUBAR -#define XmCreateMessageBox XMCREATEMESSAGEBOX -#define XmCreateMessageDialog XMCREATEMESSAGEDIALOG -#define XmCreateOptionMenu XMCREATEOPTIONMENU -#define XmCreatePanedWindow XMCREATEPANEDWINDOW -#define XmCreatePopupMenu XMCREATEPOPUPMENU -#define XmCreatePromptDialog XMCREATEPROMPTDIALOG -#define XmCreatePulldownMenu XMCREATEPULLDOWNMENU -#define XmCreatePushButton XMCREATEPUSHBUTTON -#define XmCreatePushButtonGadget XMCREATEPUSHBUTTONGADGET -#define XmCreateQuestionDialog XMCREATEQUESTIONDIALOG -#define XmCreateRadioBox XMCREATERADIOBOX -#define XmCreateRowColumn XMCREATEROWCOLUMN -#define XmCreateScale XMCREATESCALE -#define XmCreateScrollBar XMCREATESCROLLBAR -#define XmCreateScrolledList XMCREATESCROLLEDLIST -#define XmCreateScrolledText XMCREATESCROLLEDTEXT -#define XmCreateScrolledWindow XMCREATESCROLLEDWINDOW -#define XmCreateSelectionDialog XMCREATESELECTIONDIALOG -#define XmCreateSeparator XMCREATESEPARATOR -#define XmCreateSeparatorGadget XMCREATESEPARATORGADGET -#define XmCreateTemplateDialog XMCREATETEMPLATEDIALOG -#define XmCreateText XMCREATETEXT -#define XmCreateTextField XMCREATETEXTFIELD -#define XmCreateToggleButton XMCREATETOGGLEBUTTON -#define XmCreateToggleButtonGadget XMCREATETOGGLEBUTTONGADGET -#define XmCreateWarningDialog XMCREATEWARNINGDIALOG -#define XmCvtCTToXmString XMCVTCTTOXMSTRING -#define XmDestroyPixmap XMDESTROYPIXMAP -#define XmDragStart XMDRAGSTART -#define XmDropSiteRegister XMDROPSITEREGISTER -#define XmDropSiteUnregister XMDROPSITEUNREGISTER -#define XmDropSiteUpdate XMDROPSITEUPDATE -#define XmDropTransferStart XMDROPTRANSFERSTART -#define XmFileSelectionBoxGetChild XMFILESELECTIONBOXGETCHILD -#define XmFileSelectionDoSearch XMFILESELECTIONDOSEARCH -#define XmFontListAppendEntry XMFONTLISTAPPENDENTRY -#define XmFontListCopy XMFONTLISTCOPY -#define XmFontListCreate XMFONTLISTCREATE -#define XmFontListEntryCreate XMFONTLISTENTRYCREATE -#define XmFontListEntryFree XMFONTLISTENTRYFREE -#define XmFontListEntryGetFont XMFONTLISTENTRYGETFONT -#define XmFontListEntryGetTag XMFONTLISTENTRYGETTAG -#define XmFontListEntryLoad XMFONTLISTENTRYLOAD -#define XmFontListFree XMFONTLISTFREE -#define XmFontListFreeFontContext XMFONTLISTFREEFONTCONTEXT -#define XmFontListGetNextFont XMFONTLISTGETNEXTFONT -#define XmFontListInitFontContext XMFONTLISTINITFONTCONTEXT -#define XmFontListNextEntry XMFONTLISTNEXTENTRY -#define XmGetColors XMGETCOLORS -#define XmGetColorCalculation XMGETCOLORCALCULATION -#define XmGetFocusWidget XMGETFOCUSWIDGET -#define XmGetMenuCursor XMGETMENUCURSOR -#define XmGetPixmap XMGETPIXMAP -#define XmGetPixmapByDepth XMGETPIXMAPBYDEPTH -#define XmGetTearOffControl XMGETTEAROFFCONTROL -#define XmGetXmDisplay XMGETXMDISPLAY -#define XmImMbLookupString XMIMMBLOOKUPSTRING -#define XmImRegister XMIMREGISTER -#define XmImSetFocusValues XMIMSETFOCUSVALUES -#define XmImSetValues XMIMSETVALUES -#define XmImUnregister XMIMUNREGISTER -#define XmImUnsetFocus XMIMUNSETFOCUS -#define XmInstallImage XMINSTALLIMAGE -#define XmInternAtom XMINTERNATOM -#define XmIsMotifWMRunning XMISMOTIFWMRUNNING -#define XmListAddItem XMLISTADDITEM -#define XmListAddItemUnselected XMLISTADDITEMUNSELECTED -#define XmListAddItems XMLISTADDITEMS -#define XmListAddItemsUnselected XMLISTADDITEMSUNSELECTED -#define XmListDeleteAllItems XMLISTDELETEALLITEMS -#define XmListDeleteItem XMLISTDELETEITEM -#define XmListDeleteItemsPos XMLISTDELETEITEMSPOS -#define XmListDeletePos XMLISTDELETEPOS -#define XmListDeselectAllItems XMLISTDESELECTALLITEMS -#define XmListDeselectPos XMLISTDESELECTPOS -#define XmListGetKbdItemPos XMLISTGETKBDITEMPOS -#define XmListGetMatchPos XMLISTGETMATCHPOS -#define XmListGetSelectedPos XMLISTGETSELECTEDPOS -#define XmListItemExists XMLISTITEMEXISTS -#define XmListItemPos XMLISTITEMPOS -#define XmListPosSelected XMLISTPOSSELECTED -#define XmListReplaceItems XMLISTREPLACEITEMS -#define XmListReplaceItemsPos XMLISTREPLACEITEMSPOS -#define XmListSelectItem XMLISTSELECTITEM -#define XmListSelectPos XMLISTSELECTPOS -#define XmListSetBottomPos XMLISTSETBOTTOMPOS -#define XmListSetItem XMLISTSETITEM -#define XmListSetKbdItemPos XMLISTSETKBDITEMPOS -#define XmListSetPos XMLISTSETPOS -#define XmMainWindowSetAreas XMMAINWINDOWSETAREAS -#define XmMenuPosition XMMENUPOSITION -#define XmMessageBoxGetChild XMMESSAGEBOXGETCHILD -#define XmOptionButtonGadget XMOPTIONBUTTONGADGET -#define XmOptionLabelGadget XMOPTIONLABELGADGET -#define XmProcessTraversal XMPROCESSTRAVERSAL -#define XmQmotif XMQMOTIF -#define XmRemoveProtocolCallback XMREMOVEPROTOCOLCALLBACK -#define XmRemoveProtocols XMREMOVEPROTOCOLS -#define XmRemoveTabGroup XMREMOVETABGROUP -#define XmRepTypeGetId XMREPTYPEGETID -#define XmRepTypeGetRecord XMREPTYPEGETRECORD -#define XmRepTypeInstallTearOffModelCon XMREPTYPEINSTALLTEAROFFMODELCON -#define XmRepTypeRegister XMREPTYPEREGISTER -#define XmRepTypeValidValue XMREPTYPEVALIDVALUE -#define XmScrollBarGetValues XMSCROLLBARGETVALUES -#define XmScrollBarSetValues XMSCROLLBARSETVALUES -#define XmScrolledWindowSetAreas XMSCROLLEDWINDOWSETAREAS -#define XmSelectionBoxGetChild XMSELECTIONBOXGETCHILD -#define XmSetColorCalculation XMSETCOLORCALCULATION -#define XmStringByteCompare XMSTRINGBYTECOMPARE -#define XmStringCompare XMSTRINGCOMPARE -#define XmStringConcat XMSTRINGCONCAT -#define XmStringCopy XMSTRINGCOPY -#define XmStringCreate XMSTRINGCREATE -#define XmStringCreateLocalized XMSTRINGCREATELOCALIZED -#define XmStringCreateLtoR XMSTRINGCREATELTOR -#define XmStringCreateSimple XMSTRINGCREATESIMPLE -#define XmStringDraw XMSTRINGDRAW -#define XmStringDrawUnderline XMSTRINGDRAWUNDERLINE -#define XmStringExtent XMSTRINGEXTENT -#define XmStringFree XMSTRINGFREE -#define XmStringFreeContext XMSTRINGFREECONTEXT -#define XmStringGetLtoR XMSTRINGGETLTOR -#define XmStringGetNextComponent XMSTRINGGETNEXTCOMPONENT -#define XmStringGetNextSegment XMSTRINGGETNEXTSEGMENT -#define XmStringInitContext XMSTRINGINITCONTEXT -#define XmStringLength XMSTRINGLENGTH -#define XmStringLtoRCreate XMSTRINGLTORCREATE -#define XmStringNConcat XMSTRINGNCONCAT -#define XmStringSegmentCreate XMSTRINGSEGMENTCREATE -#define XmStringSeparatorCreate XMSTRINGSEPARATORCREATE -#define XmStringWidth XMSTRINGWIDTH -#define XmTextClearSelection XMTEXTCLEARSELECTION -#define XmTextCopy XMTEXTCOPY -#define XmTextCut XMTEXTCUT -#define XmTextFieldClearSelection XMTEXTFIELDCLEARSELECTION -#define XmTextFieldCopy XMTEXTFIELDCOPY -#define XmTextFieldCut XMTEXTFIELDCUT -#define XmTextFieldGetEditable XMTEXTFIELDGETEDITABLE -#define XmTextFieldGetInsertionPosition XMTEXTFIELDGETINSERTIONPOSITION -#define XmTextFieldGetLastPosition XMTEXTFIELDGETLASTPOSITION -#define XmTextFieldGetMaxLength XMTEXTFIELDGETMAXLENGTH -#define XmTextFieldGetSelection XMTEXTFIELDGETSELECTION -#define XmTextFieldGetSelectionPosition XMTEXTFIELDGETSELECTIONPOSITION -#define XmTextFieldGetString XMTEXTFIELDGETSTRING -#define XmTextFieldInsert XMTEXTFIELDINSERT -#define XmTextFieldPaste XMTEXTFIELDPASTE -#define XmTextFieldRemove XMTEXTFIELDREMOVE -#define XmTextFieldReplace XMTEXTFIELDREPLACE -#define XmTextFieldSetAddMode XMTEXTFIELDSETADDMODE -#define XmTextFieldSetHighlight XMTEXTFIELDSETHIGHLIGHT -#define XmTextFieldSetInsertionPosition XMTEXTFIELDSETINSERTIONPOSITION -#define XmTextFieldSetMaxLength XMTEXTFIELDSETMAXLENGTH -#define XmTextFieldSetSelection XMTEXTFIELDSETSELECTION -#define XmTextFieldSetString XMTEXTFIELDSETSTRING -#define XmTextFieldShowPosition XMTEXTFIELDSHOWPOSITION -#define XmTextGetCursorPosition XMTEXTGETCURSORPOSITION -#define XmTextGetEditable XMTEXTGETEDITABLE -#define XmTextGetInsertionPosition XMTEXTGETINSERTIONPOSITION -#define XmTextGetLastPosition XMTEXTGETLASTPOSITION -#define XmTextGetMaxLength XMTEXTGETMAXLENGTH -#define XmTextGetSelection XMTEXTGETSELECTION -#define XmTextGetSelectionPosition XMTEXTGETSELECTIONPOSITION -#define XmTextGetString XMTEXTGETSTRING -#define XmTextInsert XMTEXTINSERT -#define XmTextPaste XMTEXTPASTE -#define XmTextPosToXY XMTEXTPOSTOXY -#define XmTextRemove XMTEXTREMOVE -#define XmTextReplace XMTEXTREPLACE -#define XmTextSetCursorPosition XMTEXTSETCURSORPOSITION -#define XmTextSetEditable XMTEXTSETEDITABLE -#define XmTextSetHighlight XMTEXTSETHIGHLIGHT -#define XmTextSetInsertionPosition XMTEXTSETINSERTIONPOSITION -#define XmTextSetSelection XMTEXTSETSELECTION -#define XmTextSetString XMTEXTSETSTRING -#define XmTextSetTopCharacter XMTEXTSETTOPCHARACTER -#define XmTextShowPosition XMTEXTSHOWPOSITION -#define XmToggleButtonGadgetGetState XMTOGGLEBUTTONGADGETGETSTATE -#define XmToggleButtonGadgetSetState XMTOGGLEBUTTONGADGETSETSTATE -#define XmToggleButtonGetState XMTOGGLEBUTTONGETSTATE -#define XmToggleButtonSetState XMTOGGLEBUTTONSETSTATE -#define XmUninstallImage XMUNINSTALLIMAGE -#define XmUpdateDisplay XMUPDATEDISPLAY -#define XmVaCreateSimpleRadioBox XMVACREATESIMPLERADIOBOX -#define XmbDrawString XMBDRAWSTRING -#define XmbLookupString XMBLOOKUPSTRING -#define XmbResetIC XMBRESETIC -#define XmbSetWMProperties XMBSETWMPROPERTIES -#define XmbTextEscapement XMBTEXTESCAPEMENT -#define XmbTextExtents XMBTEXTEXTENTS -#define XmbTextListToTextProperty XMBTEXTLISTTOTEXTPROPERTY -#define XmbTextPropertyToTextList XMBTEXTPROPERTYTOTEXTLIST -#define XmbufCreateBuffers XMBUFCREATEBUFFERS -#define XmbufDestroyBuffers XMBUFDESTROYBUFFERS -#define XmbufDisplayBuffers XMBUFDISPLAYBUFFERS -#define XmbufQueryExtension XMBUFQUERYEXTENSION -#define Xmemory_free XMEMORY_FREE -#define Xmemory_malloc XMEMORY_MALLOC -#define XmuClientWindow XMUCLIENTWINDOW -#define XmuConvertStandardSelection XMUCONVERTSTANDARDSELECTION -#define XmuCvtStringToBitmap XMUCVTSTRINGTOBITMAP -#define XmuInternAtom XMUINTERNATOM -#define XmuInternStrings XMUINTERNSTRINGS -#define XmuLookupStandardColormap XMULOOKUPSTANDARDCOLORMAP -#define XmuPrintDefaultErrorMessage XMUPRINTDEFAULTERRORMESSAGE -#define XrmCombineDatabase XRMCOMBINEDATABASE -#define XrmCombineFileDatabase XRMCOMBINEFILEDATABASE -#define XrmDestroyDatabase XRMDESTROYDATABASE -#define XrmGetDatabase XRMGETDATABASE -#define XrmGetFileDatabase XRMGETFILEDATABASE -#define XrmGetResource XRMGETRESOURCE -#define XrmGetStringDatabase XRMGETSTRINGDATABASE -#define XrmInitialize XRMINITIALIZE -#define XrmMergeDatabases XRMMERGEDATABASES -#define XrmParseCommand XRMPARSECOMMAND -#define XrmPermStringToQuark XRMPERMSTRINGTOQUARK -#define XrmPutFileDatabase XRMPUTFILEDATABASE -#define XrmPutLineResource XRMPUTLINERESOURCE -#define XrmPutStringResource XRMPUTSTRINGRESOURCE -#define XrmQGetResource XRMQGETRESOURCE -#define XrmQPutStringResource XRMQPUTSTRINGRESOURCE -#define XrmQuarkToString XRMQUARKTOSTRING -#define XrmSetDatabase XRMSETDATABASE -#define XrmStringToBindingQuarkList XRMSTRINGTOBINDINGQUARKLIST -#define XrmStringToQuark XRMSTRINGTOQUARK -#define XtAddCallback XTADDCALLBACK -#define XtAddCallbacks XTADDCALLBACKS -#define XtAddConverter XTADDCONVERTER -#define XtAddEventHandler XTADDEVENTHANDLER -#define XtAddExposureToRegion XTADDEXPOSURETOREGION -#define XtAddGrab XTADDGRAB -#define XtAddRawEventHandler XTADDRAWEVENTHANDLER -#define XtAllocateGC XTALLOCATEGC -#define XtAppAddActions XTAPPADDACTIONS -#define XtAppAddInput XTAPPADDINPUT -#define XtAppAddTimeOut XTAPPADDTIMEOUT -#define XtAppAddWorkProc XTAPPADDWORKPROC -#define XtAppCreateShell XTAPPCREATESHELL -#define XtAppError XTAPPERROR -#define XtAppErrorMsg XTAPPERRORMSG -#define XtAppInitialize XTAPPINITIALIZE -#define XtAppMainLoop XTAPPMAINLOOP -#define XtAppNextEvent XTAPPNEXTEVENT -#define XtAppPeekEvent XTAPPPEEKEVENT -#define XtAppPending XTAPPPENDING -#define XtAppProcessEvent XTAPPPROCESSEVENT -#define XtAppSetErrorHandler XTAPPSETERRORHANDLER -#define XtAppSetFallbackResources XTAPPSETFALLBACKRESOURCES -#define XtAppSetTypeConverter XTAPPSETTYPECONVERTER -#define XtAppSetWarningHandler XTAPPSETWARNINGHANDLER -#define XtAppWarningMsg XTAPPWARNINGMSG -#define XtAppSetWarningMsgHandler XTAPPSETWARNINGMSGHANDLER -#define XtAppWarning XTAPPWARNING -#define XtAugmentTranslations XTAUGMENTTRANSLATIONS -#define XtCallActionProc XTCALLACTIONPROC -#define XtCallCallbackList XTCALLCALLBACKLIST -#define XtCallCallbacks XTCALLCALLBACKS -#define XtCallConverter XTCALLCONVERTER -#define XtCalloc XTCALLOC -#ifndef NOXTDISPLAY -#define XtClass XTCLASS -#endif -#define XtCloseDisplay XTCLOSEDISPLAY -#define XtConfigureWidget XTCONFIGUREWIDGET -#define XtConvert XTCONVERT -#define XtConvertAndStore XTCONVERTANDSTORE -#define XtCreateApplicationContext XTCREATEAPPLICATIONCONTEXT -#define XtCreateManagedWidget XTCREATEMANAGEDWIDGET -#define XtCreatePopupShell XTCREATEPOPUPSHELL -#define XtCreateWidget XTCREATEWIDGET -#define XtCreateWindow XTCREATEWINDOW -#define XtCvtStringToFont XTCVTSTRINGTOFONT -#define XtDatabase XTDATABASE -#define XtDestroyApplicationContext XTDESTROYAPPLICATIONCONTEXT -#define XtDestroyWidget XTDESTROYWIDGET -#define XtDisownSelection XTDISOWNSELECTION -#define XtDispatchEvent XTDISPATCHEVENT -#ifndef NOXTDISPLAY -#define XtDisplay XTDISPLAY -#endif -#define XtDisplayOfObject XTDISPLAYOFOBJECT -#define XtDisplayStringConvWarning XTDISPLAYSTRINGCONVWARNING -#define XtDisplayToApplicationContext XTDISPLAYTOAPPLICATIONCONTEXT -#define XtError XTERROR -#define XtErrorMsg XTERRORMSG -#define XtFree XTFREE -#define XtGetActionKeysym XTGETACTIONKEYSYM -#define XtGetActionList XTGETACTIONLIST -#define XtGetApplicationNameAndClass XTGETAPPLICATIONNAMEANDCLASS -#define XtGetApplicationResources XTGETAPPLICATIONRESOURCES -#define XtGetClassExtension XTGETCLASSEXTENSION -#define XtGetConstraintResourceList XTGETCONSTRAINTRESOURCELIST -#define XtGetGC XTGETGC -#define XtGetMultiClickTime XTGETMULTICLICKTIME -#define XtGetResourceList XTGETRESOURCELIST -#define XtGetSelectionValue XTGETSELECTIONVALUE -#define XtGetSelectionValues XTGETSELECTIONVALUES -#define XtGetSubresources XTGETSUBRESOURCES -#define XtGetValues XTGETVALUES -#define XtGrabButton XTGRABBUTTON -#define XtGrabKeyboard XTGRABKEYBOARD -#define XtGrabPointer XTGRABPOINTER -#define XtHasCallbacks XTHASCALLBACKS -#define XtInitialize XTINITIALIZE -#define XtInitializeWidgetClass XTINITIALIZEWIDGETCLASS -#define XtInsertEventHandler XTINSERTEVENTHANDLER -#define XtInsertRawEventHandler XTINSERTRAWEVENTHANDLER -#define XtInstallAccelerators XTINSTALLACCELERATORS -#define XtIsManaged XTISMANAGED -#define XtIsObject XTISOBJECT -#ifndef NOXTDISPLAY -#define XtIsRealized XTISREALIZED -#endif -#define XtIsSensitive XTISSENSITIVE -#define XtIsSubclass XTISSUBCLASS -#define XtLastTimestampProcessed XTLASTTIMESTAMPPROCESSED -#define XtMainLoop XTMAINLOOP -#define XtMakeGeometryRequest XTMAKEGEOMETRYREQUEST -#define XtMakeResizeRequest XTMAKERESIZEREQUEST -#define XtMalloc XTMALLOC -#define XtManageChild XTMANAGECHILD -#define XtManageChildren XTMANAGECHILDREN -#define XtMergeArgLists XTMERGEARGLISTS -#define XtMoveWidget XTMOVEWIDGET -#define XtName XTNAME -#define XtNameToWidget XTNAMETOWIDGET -#define XtOpenApplication XTOPENAPPLICATION -#define XtOpenDisplay XTOPENDISPLAY -#define XtOverrideTranslations XTOVERRIDETRANSLATIONS -#define XtOwnSelection XTOWNSELECTION -#ifndef NOXTDISPLAY -#define XtParent XTPARENT -#endif -#define XtParseAcceleratorTable XTPARSEACCELERATORTABLE -#define XtParseTranslationTable XTPARSETRANSLATIONTABLE -#define XtPopdown XTPOPDOWN -#define XtPopup XTPOPUP -#define XtPopupSpringLoaded XTPOPUPSPRINGLOADED -#define XtQueryGeometry XTQUERYGEOMETRY -#define XtRealizeWidget XTREALIZEWIDGET -#define XtRealloc XTREALLOC -#define XtRegisterDrawable _XTREGISTERWINDOW -#define XtRegisterGrabAction XTREGISTERGRABACTION -#define XtReleaseGC XTRELEASEGC -#define XtRemoveAllCallbacks XTREMOVEALLCALLBACKS -#define XtRemoveCallback XTREMOVECALLBACK -#define XtRemoveEventHandler XTREMOVEEVENTHANDLER -#define XtRemoveGrab XTREMOVEGRAB -#define XtRemoveInput XTREMOVEINPUT -#define XtRemoveTimeOut XTREMOVETIMEOUT -#define XtRemoveWorkProc XTREMOVEWORKPROC -#define XtResizeWidget XTRESIZEWIDGET -#define XtResolvePathname XTRESOLVEPATHNAME -#ifndef NOXTDISPLAY -#define XtScreen XTSCREEN -#endif -#define XtScreenDatabase XTSCREENDATABASE -#define XtScreenOfObject XTSCREENOFOBJECT -#define XtSessionReturnToken XTSESSIONRETURNTOKEN -#define XtSetErrorHandler XTSETERRORHANDLER -#define XtSetKeyboardFocus XTSETKEYBOARDFOCUS -#define XtSetLanguageProc XTSETLANGUAGEPROC -#define XtSetMappedWhenManaged XTSETMAPPEDWHENMANAGED -#define XtSetSensitive XTSETSENSITIVE -#define XtSetTypeConverter XTSETTYPECONVERTER -#define XtSetValues XTSETVALUES -#define XtShellStrings XTSHELLSTRINGS -#define XtStringConversionWarning XTSTRINGCONVERSIONWARNING -#define XtStrings XTSTRINGS -#define XtToolkitInitialize XTTOOLKITINITIALIZE -#define XtTranslateCoords XTTRANSLATECOORDS -#define XtTranslateKeycode XTTRANSLATEKEYCODE -#define XtUngrabButton XTUNGRABBUTTON -#define XtUngrabKeyboard XTUNGRABKEYBOARD -#define XtUngrabPointer XTUNGRABPOINTER -#define XtUnmanageChild XTUNMANAGECHILD -#define XtUnmanageChildren XTUNMANAGECHILDREN -#define XtUnrealizeWidget XTUNREALIZEWIDGET -#define XtUnregisterDrawable _XTUNREGISTERWINDOW -#define XtVaCreateManagedWidget XTVACREATEMANAGEDWIDGET -#define XtVaCreatePopupShell XTVACREATEPOPUPSHELL -#define XtVaCreateWidget XTVACREATEWIDGET -#define XtVaGetApplicationResources XTVAGETAPPLICATIONRESOURCES -#define XtVaGetValues XTVAGETVALUES -#define XtVaSetValues XTVASETVALUES -#define XtWarning XTWARNING -#define XtWarningMsg XTWARNINGMSG -#define XtWidgetToApplicationContext XTWIDGETTOAPPLICATIONCONTEXT -#ifndef NOXTDISPLAY -#define XtWindow XTWINDOW -#endif -#define XtWindowOfObject XTWINDOWOFOBJECT -#define XtWindowToWidget XTWINDOWTOWIDGET -#define XwcDrawImageString XWCDRAWIMAGESTRING -#define XwcDrawString XWCDRAWSTRING -#define XwcFreeStringList XWCFREESTRINGLIST -#define XwcTextEscapement XWCTEXTESCAPEMENT -#define XwcTextExtents XWCTEXTEXTENTS -#define XwcTextListToTextProperty XWCTEXTLISTTOTEXTPROPERTY -#define XwcLookupString XWCLOOKUPSTRING -#define XwcTextPropertyToTextList XWCTEXTPROPERTYTOTEXTLIST -#define _XAllocTemp _XALLOCTEMP -#define _XDeqAsyncHandler _XDEQASYNCHANDLER -#define _XEatData _XEATDATA -#define _XFlush _XFLUSH -#define _XFreeTemp _XFREETEMP -#define _XGetAsyncReply _XGETASYNCREPLY -#define _XInitImageFuncPtrs _XINITIMAGEFUNCPTRS -#define _XRead _XREAD -#define _XReadPad _XREADPAD -#define _XRegisterFilterByType _XREGISTERFILTERBYTYPE -#define _XReply _XREPLY -#define _XSend _XSEND -#define _XUnregisterFilter _XUNREGISTERFILTER -#define _XVIDtoVisual _XVIDTOVISUAL -#define _XmBottomShadowColorDefault _XMBOTTOMSHADOWCOLORDEFAULT -#define _XmClearBorder _XMCLEARBORDER -#define _XmConfigureObject _XMCONFIGUREOBJECT -#define _XmDestroyParentCallback _XMDESTROYPARENTCALLBACK -#define _XmDrawArrow _XMDRAWARROW -#define _XmDrawShadows _XMDRAWSHADOWS -#define _XmFontListGetDefaultFont _XMFONTLISTGETDEFAULTFONT -#define _XmFromHorizontalPixels _XMFROMHORIZONTALPIXELS -#define _XmFromVerticalPixels _XMFROMVERTICALPIXELS -#define _XmGetClassExtensionPtr _XMGETCLASSEXTENSIONPTR -#define _XmGetDefaultFontList _XMGETDEFAULTFONTLIST -#define _XmGetTextualDragIcon _XMGETTEXTUALDRAGICON -#define _XmGetWidgetExtData _XMGETWIDGETEXTDATA -#define _XmGrabKeyboard _XMGRABKEYBOARD -#define _XmGrabPointer _XMGRABPOINTER -#define _XmInheritClass _XMINHERITCLASS -#define _XmInputForGadget _XMINPUTFORGADGET -#define _XmInputInGadget _XMINPUTINGADGET -#define _XmMakeGeometryRequest _XMMAKEGEOMETRYREQUEST -#define _XmMenuPopDown _XMMENUPOPDOWN -#define _XmMoveObject _XMMOVEOBJECT -#define _XmNavigChangeManaged _XMNAVIGCHANGEMANAGED -#define _XmOSBuildFileList _XMOSBUILDFILELIST -#define _XmOSFileCompare _XMOSFILECOMPARE -#define _XmOSFindPatternPart _XMOSFINDPATTERNPART -#define _XmOSQualifyFileSpec _XMOSQUALIFYFILESPEC -#define _XmPostPopupMenu _XMPOSTPOPUPMENU -#define _XmPrimitiveEnter _XMPRIMITIVEENTER -#define _XmPrimitiveLeave _XMPRIMITIVELEAVE -#define _XmRedisplayGadgets _XMREDISPLAYGADGETS -#define _XmShellIsExclusive _XMSHELLISEXCLUSIVE -#define _XmStringDraw _XMSTRINGDRAW -#define _XmStringGetTextConcat _XMSTRINGGETTEXTCONCAT -#define _XmStrings _XMSTRINGS -#define _XmToHorizontalPixels _XMTOHORIZONTALPIXELS -#define _XmToVerticalPixels _XMTOVERTICALPIXELS -#define _XmTopShadowColorDefault _XMTOPSHADOWCOLORDEFAULT -#define _Xm_fastPtr _XM_FASTPTR -#define _XtCheckSubclassFlag _XTCHECKSUBCLASSFLAG -#define _XtCopyFromArg _XTCOPYFROMARG -#define _XtCountVaList _XTCOUNTVALIST -#define _XtInherit _XTINHERIT -#define _XtInheritTranslations _XTINHERITTRANSLATIONS -#define _XtIsSubclassOf _XTISSUBCLASSOF -#define _XtVaToArgList _XTVATOARGLIST -#define applicationShellWidgetClass APPLICATIONSHELLWIDGETCLASS -#define cli$dcl_parse CLI$DCL_PARSE -#define cli$get_value CLI$GET_VALUE -#define cli$present CLI$PRESENT -#define compositeClassRec COMPOSITECLASSREC -#define compositeWidgetClass COMPOSITEWIDGETCLASS -#define constraintClassRec CONSTRAINTCLASSREC -#define constraintWidgetClass CONSTRAINTWIDGETCLASS -#define coreWidgetClass COREWIDGETCLASS -#define exe$getspi EXE$GETSPI -#define lbr$close LBR$CLOSE -#define lbr$get_header LBR$GET_HEADER -#define lbr$get_index LBR$GET_INDEX -#define lbr$get_record LBR$GET_RECORD -#define lbr$ini_control LBR$INI_CONTROL -#define lbr$lookup_key LBR$LOOKUP_KEY -#define lbr$open LBR$OPEN -#define lbr$output_help LBR$OUTPUT_HELP -#define lib$add_times LIB$ADD_TIMES -#define lib$addx LIB$ADDX -#define lib$create_dir LIB$CREATE_DIR -#define lib$create_vm_zone LIB$CREATE_VM_ZONE -#define lib$cvt_from_internal_time LIB$CVT_FROM_INTERNAL_TIME -#define lib$cvt_htb LIB$CVT_HTB -#define lib$cvt_vectim LIB$CVT_VECTIM -#define lib$day LIB$DAY -#define lib$day_of_week LIB$DAY_OF_WEEK -#define lib$delete_symbol LIB$DELETE_SYMBOL -#define lib$delete_vm_zone LIB$DELETE_VM_ZONE -#define lib$disable_ctrl LIB$DISABLE_CTRL -#define lib$ediv LIB$EDIV -#define lib$emul LIB$EMUL -#define lib$enable_ctrl LIB$ENABLE_CTRL -#define lib$find_vm_zone LIB$FIND_VM_ZONE -#define lib$format_date_time LIB$FORMAT_DATE_TIME -#define lib$free_timer LIB$FREE_TIMER -#define lib$free_vm LIB$FREE_VM -#define lib$get_ef LIB$GET_EF -#define lib$get_foreign LIB$GET_FOREIGN -#define lib$get_input LIB$GET_INPUT -#define lib$get_users_language LIB$GET_USERS_LANGUAGE -#define lib$get_vm LIB$GET_VM -#define lib$get_symbol LIB$GET_SYMBOL -#define lib$getdvi LIB$GETDVI -#define lib$init_date_time_context LIB$INIT_DATE_TIME_CONTEXT -#define lib$init_timer LIB$INIT_TIMER -#define lib$find_file LIB$FIND_FILE -#define lib$find_file_end LIB$FIND_FILE_END -#define lib$find_image_symbol LIB$FIND_IMAGE_SYMBOL -#define lib$mult_delta_time LIB$MULT_DELTA_TIME -#define lib$put_output LIB$PUT_OUTPUT -#define lib$rename_file LIB$RENAME_FILE -#define lib$reset_vm_zone LIB$RESET_VM_ZONE -#define lib$set_symbol LIB$SET_SYMBOL -#define lib$sfree1_dd LIB$SFREE1_DD -#define lib$show_vm LIB$SHOW_VM -#define lib$show_vm_zone LIB$SHOW_VM_ZONE -#define lib$spawn LIB$SPAWN -#define lib$stat_timer LIB$STAT_TIMER -#define lib$subx LIB$SUBX -#define lib$sub_times LIB$SUB_TIMES -#define lib$wait LIB$WAIT -#define mail$send_add_address MAIL$SEND_ADD_ADDRESS -#define mail$send_add_attribute MAIL$SEND_ADD_ATTRIBUTE -#define mail$send_add_bodypart MAIL$SEND_ADD_BODYPART -#define mail$send_begin MAIL$SEND_BEGIN -#define mail$send_end MAIL$SEND_END -#define mail$send_message MAIL$SEND_MESSAGE -#define ncs$convert NCS$CONVERT -#define ncs$get_cf NCS$GET_CF -#define objectClass OBJECTCLASS -#define objectClassRec OBJECTCLASSREC -#define overrideShellClassRec OVERRIDESHELLCLASSREC -#define overrideShellWidgetClass OVERRIDESHELLWIDGETCLASS -#define pthread_attr_create PTHREAD_ATTR_CREATE -#define pthread_attr_delete PTHREAD_ATTR_DELETE -#define pthread_attr_destroy PTHREAD_ATTR_DESTROY -#define pthread_attr_getdetach_np PTHREAD_ATTR_GETDETACH_NP -#define pthread_attr_getguardsize_np PTHREAD_ATTR_GETGUARDSIZE_NP -#define pthread_attr_getinheritsched PTHREAD_ATTR_GETINHERITSCHED -#define pthread_attr_getprio PTHREAD_ATTR_GETPRIO -#define pthread_attr_getsched PTHREAD_ATTR_GETSCHED -#define pthread_attr_getschedparam PTHREAD_ATTR_GETSCHEDPARAM -#define pthread_attr_getschedpolicy PTHREAD_ATTR_GETSCHEDPOLICY -#define pthread_attr_getstacksize PTHREAD_ATTR_GETSTACKSIZE -#define pthread_attr_init PTHREAD_ATTR_INIT -#define pthread_attr_setdetach_np PTHREAD_ATTR_SETDETACH_NP -#define pthread_attr_setdetachstate PTHREAD_ATTR_SETDETACHSTATE -#define pthread_attr_setguardsize_np PTHREAD_ATTR_SETGUARDSIZE_NP -#define pthread_attr_setinheritsched PTHREAD_ATTR_SETINHERITSCHED -#define pthread_attr_setprio PTHREAD_ATTR_SETPRIO -#define pthread_attr_setsched PTHREAD_ATTR_SETSCHED -#define pthread_attr_setschedparam PTHREAD_ATTR_SETSCHEDPARAM -#define pthread_attr_setschedpolicy PTHREAD_ATTR_SETSCHEDPOLICY -#ifndef pthread_attr_setscope -# define pthread_attr_setscope PTHREAD_ATTR_SETSCOPE -#endif -#define pthread_attr_setstacksize PTHREAD_ATTR_SETSTACKSIZE -#define pthread_cancel PTHREAD_CANCEL -#define pthread_cancel_e PTHREAD_CANCEL_E -#define pthread_cond_broadcast PTHREAD_COND_BROADCAST -#define pthread_cond_destroy PTHREAD_COND_DESTROY -#define pthread_cond_init PTHREAD_COND_INIT -#define pthread_cond_sig_preempt_int_np PTHREAD_COND_SIG_PREEMPT_INT_NP -#define pthread_cond_signal PTHREAD_COND_SIGNAL -#define pthread_cond_signal_int_np PTHREAD_COND_SIGNAL_INT_NP -#define pthread_cond_timedwait PTHREAD_COND_TIMEDWAIT -#define pthread_cond_wait PTHREAD_COND_WAIT -#define pthread_condattr_create PTHREAD_CONDATTR_CREATE -#define pthread_condattr_delete PTHREAD_CONDATTR_DELETE -#define pthread_condattr_init PTHREAD_CONDATTR_INIT -#define pthread_create PTHREAD_CREATE -#define pthread_delay_np PTHREAD_DELAY_NP -#define pthread_detach PTHREAD_DETACH -#define pthread_equal PTHREAD_EQUAL -#define pthread_exc_fetch_fp_np PTHREAD_EXC_FETCH_FP_NP -#define pthread_exc_handler_np PTHREAD_EXC_HANDLER_NP -#define pthread_exc_matches_np PTHREAD_EXC_MATCHES_NP -#define pthread_exc_pop_ctx_np PTHREAD_EXC_POP_CTX_NP -#define pthread_exc_push_ctx_np PTHREAD_EXC_PUSH_CTX_NP -#define pthread_exc_raise_np PTHREAD_EXC_RAISE_NP -#define pthread_exc_savecontext_np PTHREAD_EXC_SAVECONTEXT_NP -#define pthread_exit PTHREAD_EXIT -#define pthread_get_expiration_np PTHREAD_GET_EXPIRATION_NP -#define pthread_getprio PTHREAD_GETPRIO -#define pthread_getschedparam PTHREAD_GETSCHEDPARAM -#define pthread_getscheduler PTHREAD_GETSCHEDULER -#define pthread_getspecific PTHREAD_GETSPECIFIC -#define pthread_getunique_np PTHREAD_GETUNIQUE_NP -#define pthread_join PTHREAD_JOIN -#define pthread_join32 PTHREAD_JOIN32 -#define pthread_key_create PTHREAD_KEY_CREATE -#define pthread_key_delete PTHREAD_KEY_DELETE -#define pthread_keycreate PTHREAD_KEYCREATE -#define pthread_kill PTHREAD_KILL -#define pthread_lock_global_np PTHREAD_LOCK_GLOBAL_NP -#define pthread_mutex_destroy PTHREAD_MUTEX_DESTROY -#define pthread_mutex_init PTHREAD_MUTEX_INIT -#define pthread_mutex_lock PTHREAD_MUTEX_LOCK -#define pthread_mutex_trylock PTHREAD_MUTEX_TRYLOCK -#define pthread_mutex_unlock PTHREAD_MUTEX_UNLOCK -#define pthread_mutexattr_create PTHREAD_MUTEXATTR_CREATE -#define pthread_mutexattr_delete PTHREAD_MUTEXATTR_DELETE -#define pthread_mutexattr_destroy PTHREAD_MUTEXATTR_DESTROY -#define pthread_mutexattr_getkind_np PTHREAD_MUTEXATTR_GETKIND_NP -#define pthread_mutexattr_init PTHREAD_MUTEXATTR_INIT -#define pthread_mutexattr_setkind_np PTHREAD_MUTEXATTR_SETKIND_NP -#define pthread_mutexattr_settype_np PTHREAD_MUTEXATTR_SETTYPE_NP -#define pthread_once PTHREAD_ONCE -#define pthread_resume_np PTHREAD_RESUME_NP -#define pthread_self PTHREAD_SELF -#define pthread_setasynccancel PTHREAD_SETASYNCCANCEL -#define pthread_setcancel PTHREAD_SETCANCEL -#define pthread_setcancelstate PTHREAD_SETCANCELSTATE -#define pthread_setcanceltype PTHREAD_SETCANCELTYPE -#define pthread_setprio PTHREAD_SETPRIO -#define pthread_setschedparam PTHREAD_SETSCHEDPARAM -#define pthread_setscheduler PTHREAD_SETSCHEDULER -#define pthread_setspecific PTHREAD_SETSPECIFIC -#define pthread_suspend_np PTHREAD_SUSPEND_NP -#define pthread_testcancel PTHREAD_TESTCANCEL -#define pthread_unlock_global_np PTHREAD_UNLOCK_GLOBAL_NP -#define pthread_yield PTHREAD_YIELD -#define pthread_yield_np PTHREAD_YIELD_NP -#define rectObjClass RECTOBJCLASS -#define rectObjClassRec RECTOBJCLASSREC -#define sessionShellWidgetClass SESSIONSHELLWIDGETCLASS -#define shellWidgetClass SHELLWIDGETCLASS -#define shmat SHMAT -#define shmctl SHMCTL -#define shmdt SHMDT -#define shmget SHMGET -#define smg$create_key_table SMG$CREATE_KEY_TABLE -#define smg$create_virtual_keyboard SMG$CREATE_VIRTUAL_KEYBOARD -#define smg$read_composed_line SMG$READ_COMPOSED_LINE -#define sys$add_ident SYS$ADD_IDENT -#define sys$asctoid SYS$ASCTOID -#define sys$assign SYS$ASSIGN -#define sys$bintim SYS$BINTIM -#define sys$cancel SYS$CANCEL -#define sys$cantim SYS$CANTIM -#define sys$check_access SYS$CHECK_ACCESS -#define sys$close SYS$CLOSE -#define sys$connect SYS$CONNECT -#define sys$create SYS$CREATE -#define sys$create_user_profile SYS$CREATE_USER_PROFILE -#define sys$crembx SYS$CREMBX -#define sys$creprc SYS$CREPRC -#define sys$crmpsc SYS$CRMPSC -#define sys$dassgn SYS$DASSGN -#define sys$dclast SYS$DCLAST -#define sys$dclexh SYS$DCLEXH -#define sys$delprc SYS$DELPRC -#define sys$deq SYS$DEQ -#define sys$dgblsc SYS$DGBLSC -#define sys$display SYS$DISPLAY -#define sys$enq SYS$ENQ -#define sys$enqw SYS$ENQW -#define sys$erase SYS$ERASE -#define sys$fao SYS$FAO -#define sys$faol SYS$FAOL -#define sys$find_held SYS$FIND_HELD -#define sys$finish_rdb SYS$FINISH_RDB -#define sys$flush SYS$FLUSH -#define sys$forcex SYS$FORCEX -#define sys$get SYS$GET -#define sys$get_security SYS$GET_SECURITY -#define sys$getdviw SYS$GETDVIW -#define sys$getjpi SYS$GETJPI -#define sys$getjpiw SYS$GETJPIW -#define sys$getlkiw SYS$GETLKIW -#define sys$getmsg SYS$GETMSG -#define sys$getsyi SYS$GETSYI -#define sys$getsyiw SYS$GETSYIW -#define sys$gettim SYS$GETTIM -#define sys$getuai SYS$GETUAI -#define sys$grantid SYS$GRANTID -#define sys$hash_password SYS$HASH_PASSWORD -#define sys$hiber SYS$HIBER -#define sys$mgblsc SYS$MGBLSC -#define sys$numtim SYS$NUMTIM -#define sys$open SYS$OPEN -#define sys$parse SYS$PARSE -#define sys$parse_acl SYS$PARSE_ACL -#define sys$parse_acl SYS$PARSE_ACL -#define sys$persona_assume SYS$PERSONA_ASSUME -#define sys$persona_create SYS$PERSONA_CREATE -#define sys$persona_delete SYS$PERSONA_DELETE -#define sys$process_scan SYS$PROCESS_SCAN -#define sys$put SYS$PUT -#define sys$qio SYS$QIO -#define sys$qiow SYS$QIOW -#define sys$read SYS$READ -#define sys$resched SYS$RESCHED -#define sys$rewind SYS$REWIND -#define sys$search SYS$SEARCH -#define sys$set_security SYS$SET_SECURITY -#define sys$setast SYS$SETAST -#define sys$setef SYS$SETEF -#define sys$setimr SYS$SETIMR -#define sys$setpri SYS$SETPRI -#define sys$setprn SYS$SETPRN -#define sys$setprv SYS$SETPRV -#define sys$setswm SYS$SETSWM -#define sys$setuai SYS$SETUAI -#define sys$sndopr SYS$SNDOPR -#define sys$synch SYS$SYNCH -#define sys$trnlnm SYS$TRNLNM -#define sys$update SYS$UPDATE -#define sys$wake SYS$WAKE -#define sys$write SYS$WRITE -#define topLevelShellClassRec TOPLEVELSHELLCLASSREC -#define topLevelShellWidgetClass TOPLEVELSHELLWIDGETCLASS -#define transientShellWidgetClass TRANSIENTSHELLWIDGETCLASS -#define vendorShellClassRec VENDORSHELLCLASSREC -#define vendorShellWidgetClass VENDORSHELLWIDGETCLASS -#define widgetClass WIDGETCLASS -#define widgetClassRec WIDGETCLASSREC -#define wmShellClassRec WMSHELLCLASSREC -#define wmShellWidgetClass WMSHELLWIDGETCLASS -#define x$soft_ast_lib_lock X$SOFT_AST_LIB_LOCK -#define x$soft_ast_lock_depth X$SOFT_AST_LOCK_DEPTH -#define x$soft_reenable_asts X$SOFT_REENABLE_ASTS -#define xmArrowButtonWidgetClass XMARROWBUTTONWIDGETCLASS -#define xmBulletinBoardWidgetClass XMBULLETINBOARDWIDGETCLASS -#define xmCascadeButtonClassRec XMCASCADEBUTTONCLASSREC -#define xmCascadeButtonGadgetClass XMCASCADEBUTTONGADGETCLASS -#define xmCascadeButtonWidgetClass XMCASCADEBUTTONWIDGETCLASS -#define xmCommandWidgetClass XMCOMMANDWIDGETCLASS -#define xmDialogShellWidgetClass XMDIALOGSHELLWIDGETCLASS -#define xmDrawingAreaWidgetClass XMDRAWINGAREAWIDGETCLASS -#define xmDrawnButtonWidgetClass XMDRAWNBUTTONWIDGETCLASS -#define xmFileSelectionBoxWidgetClass XMFILESELECTIONBOXWIDGETCLASS -#define xmFormWidgetClass XMFORMWIDGETCLASS -#define xmFrameWidgetClass XMFRAMEWIDGETCLASS -#define xmGadgetClass XMGADGETCLASS -#define xmLabelGadgetClass XMLABELGADGETCLASS -#define xmLabelWidgetClass XMLABELWIDGETCLASS -#define xmListWidgetClass XMLISTWIDGETCLASS -#define xmMainWindowWidgetClass XMMAINWINDOWWIDGETCLASS -#define xmManagerClassRec XMMANAGERCLASSREC -#define xmManagerWidgetClass XMMANAGERWIDGETCLASS -#define xmMenuShellWidgetClass XMMENUSHELLWIDGETCLASS -#define xmMessageBoxWidgetClass XMMESSAGEBOXWIDGETCLASS -#define xmPrimitiveClassRec XMPRIMITIVECLASSREC -#define xmPrimitiveWidgetClass XMPRIMITIVEWIDGETCLASS -#define xmPushButtonClassRec XMPUSHBUTTONCLASSREC -#define xmPushButtonGadgetClass XMPUSHBUTTONGADGETCLASS -#define xmPushButtonWidgetClass XMPUSHBUTTONWIDGETCLASS -#define xmRowColumnWidgetClass XMROWCOLUMNWIDGETCLASS -#define xmSashWidgetClass XMSASHWIDGETCLASS -#define xmScaleWidgetClass XMSCALEWIDGETCLASS -#define xmScrollBarWidgetClass XMSCROLLBARWIDGETCLASS -#define xmScrolledWindowClassRec XMSCROLLEDWINDOWCLASSREC -#define xmScrolledWindowWidgetClass XMSCROLLEDWINDOWWIDGETCLASS -#define xmSeparatorGadgetClass XMSEPARATORGADGETCLASS -#define xmSeparatorWidgetClass XMSEPARATORWIDGETCLASS -#define xmTextFieldWidgetClass XMTEXTFIELDWIDGETCLASS -#define xmTextWidgetClass XMTEXTWIDGETCLASS -#define xmToggleButtonGadgetClass XMTOGGLEBUTTONGADGETCLASS -#define xmToggleButtonWidgetClass XMTOGGLEBUTTONWIDGETCLASS - -#if (__VMS_VER < 80200000) -# define SetReqLen(req,n,badlen) \ - if ((req->length + n) > (unsigned)65535) { \ - n = badlen; \ - req->length += n; \ - } else \ - req->length += n -#endif - -#ifdef __cplusplus -extern "C" { -#endif -extern void XtFree(char*); -#ifdef __cplusplus -} -#endif - -#endif diff --git a/Externals/wxWidgets3/include/wx/volume.h b/Externals/wxWidgets3/include/wx/volume.h deleted file mode 100644 index fd6a8370e0..0000000000 --- a/Externals/wxWidgets3/include/wx/volume.h +++ /dev/null @@ -1,145 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/volume.h -// Purpose: wxFSVolume - encapsulates system volume information -// Author: George Policello -// Modified by: -// Created: 28 Jan 02 -// Copyright: (c) 2002 George Policello -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ---------------------------------------------------------------------------- -// wxFSVolume represents a volume/drive in a file system -// ---------------------------------------------------------------------------- - -#ifndef _WX_FSVOLUME_H_ -#define _WX_FSVOLUME_H_ - -#include "wx/defs.h" - -#if wxUSE_FSVOLUME - -#include "wx/arrstr.h" - -// the volume flags -enum wxFSVolumeFlags -{ - // is the volume mounted? - wxFS_VOL_MOUNTED = 0x0001, - - // is the volume removable (floppy, CD, ...)? - wxFS_VOL_REMOVABLE = 0x0002, - - // read only? (otherwise read write) - wxFS_VOL_READONLY = 0x0004, - - // network resources - wxFS_VOL_REMOTE = 0x0008 -}; - -// the volume types -enum wxFSVolumeKind -{ - wxFS_VOL_FLOPPY, - wxFS_VOL_DISK, - wxFS_VOL_CDROM, - wxFS_VOL_DVDROM, - wxFS_VOL_NETWORK, - wxFS_VOL_OTHER, - wxFS_VOL_MAX -}; - -class WXDLLIMPEXP_BASE wxFSVolumeBase -{ -public: - // return the array containing the names of the volumes - // - // only the volumes with the flags such that - // (flags & flagsSet) == flagsSet && !(flags & flagsUnset) - // are returned (by default, all mounted ones) - static wxArrayString GetVolumes(int flagsSet = wxFS_VOL_MOUNTED, - int flagsUnset = 0); - - // stop execution of GetVolumes() called previously (should be called from - // another thread, of course) - static void CancelSearch(); - - // create the volume object with this name (should be one of those returned - // by GetVolumes()). - wxFSVolumeBase(); - wxFSVolumeBase(const wxString& name); - bool Create(const wxString& name); - - // accessors - // --------- - - // is this a valid volume? - bool IsOk() const; - - // kind of this volume? - wxFSVolumeKind GetKind() const; - - // flags of this volume? - int GetFlags() const; - - // can we write to this volume? - bool IsWritable() const { return !(GetFlags() & wxFS_VOL_READONLY); } - - // get the name of the volume and the name which should be displayed to the - // user - wxString GetName() const { return m_volName; } - wxString GetDisplayName() const { return m_dispName; } - - // TODO: operatios (Mount(), Unmount(), Eject(), ...)? - -protected: - // the internal volume name - wxString m_volName; - - // the volume name as it is displayed to the user - wxString m_dispName; - - // have we been initialized correctly? - bool m_isOk; -}; - -#if wxUSE_GUI - -#include "wx/icon.h" -#include "wx/iconbndl.h" // only for wxIconArray - -enum wxFSIconType -{ - wxFS_VOL_ICO_SMALL = 0, - wxFS_VOL_ICO_LARGE, - wxFS_VOL_ICO_SEL_SMALL, - wxFS_VOL_ICO_SEL_LARGE, - wxFS_VOL_ICO_MAX -}; - -// wxFSVolume adds GetIcon() to wxFSVolumeBase -class WXDLLIMPEXP_CORE wxFSVolume : public wxFSVolumeBase -{ -public: - wxFSVolume() : wxFSVolumeBase() { InitIcons(); } - wxFSVolume(const wxString& name) : wxFSVolumeBase(name) { InitIcons(); } - - wxIcon GetIcon(wxFSIconType type) const; - -private: - void InitIcons(); - - // the different icons for this volume (created on demand) - wxIconArray m_icons; -}; - -#else // !wxUSE_GUI - -// wxFSVolume is the same thing as wxFSVolume in wxBase -typedef wxFSVolumeBase wxFSVolume; - -#endif // wxUSE_GUI/!wxUSE_GUI - -#endif // wxUSE_FSVOLUME - -#endif // _WX_FSVOLUME_H_ diff --git a/Externals/wxWidgets3/include/wx/vscroll.h b/Externals/wxWidgets3/include/wx/vscroll.h deleted file mode 100644 index 550d2cd471..0000000000 --- a/Externals/wxWidgets3/include/wx/vscroll.h +++ /dev/null @@ -1,871 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/vscroll.h -// Purpose: Variable scrolled windows (wx[V/H/HV]ScrolledWindow) -// Author: Vadim Zeitlin -// Modified by: Brad Anderson, Bryan Petty -// Created: 30.05.03 -// Copyright: (c) 2003 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_VSCROLL_H_ -#define _WX_VSCROLL_H_ - -#include "wx/panel.h" -#include "wx/position.h" -#include "wx/scrolwin.h" - -class WXDLLIMPEXP_FWD_CORE wxVarScrollHelperEvtHandler; - - -// Using the same techniques as the wxScrolledWindow class | -// hierarchy, the wx[V/H/HV]ScrolledWindow classes are slightly | -// more complex (compare with the diagram outlined in | -// scrolwin.h) for the purpose of reducing code duplication | -// through the use of mix-in classes. | -// | -// wxAnyScrollHelperBase | -// | | -// | | -// | | -// V | -// wxVarScrollHelperBase | -// / \ | -// / \ | -// V V | -// wxVarHScrollHelper wxVarVScrollHelper | -// | \ / | | -// | \ / | | -// | V V | | -// | wxVarHVScrollHelper | | -// | | | | -// | | V | -// | wxPanel | wxVarVScrollLegacyAdaptor | -// | / \ \ | | | -// | / \ `-----|----------. | | -// | / \ | \ | | -// | / \ | \ | | -// V V \ | V V | -// wxHScrolledWindow \ | wxVScrolledWindow | -// V V | -// wxHVScrolledWindow | -// | -// | -// Border added to suppress GCC multi-line comment warnings ->| - - -// =========================================================================== -// wxVarScrollHelperBase -// =========================================================================== - -// Provides all base common scroll calculations needed for either orientation, -// automatic scrollbar functionality, saved scroll positions, functionality -// for changing the target window to be scrolled, as well as defining all -// required virtual functions that need to be implemented for any orientation -// specific work. - -class WXDLLIMPEXP_CORE wxVarScrollHelperBase : public wxAnyScrollHelperBase -{ -public: - // constructors and such - // --------------------- - - wxVarScrollHelperBase(wxWindow *winToScroll); - virtual ~wxVarScrollHelperBase(); - - // operations - // ---------- - - // with physical scrolling on, the device origin is changed properly when - // a wxPaintDC is prepared, children are actually moved and laid out - // properly, and the contents of the window (pixels) are actually moved - void EnablePhysicalScrolling(bool scrolling = true) - { m_physicalScrolling = scrolling; } - - // wxNOT_FOUND if none, i.e. if it is below the last item - int VirtualHitTest(wxCoord coord) const; - - // recalculate all our parameters and redisplay all units - virtual void RefreshAll(); - - // accessors - // --------- - - // get the first currently visible unit - size_t GetVisibleBegin() const { return m_unitFirst; } - - // get the last currently visible unit - size_t GetVisibleEnd() const - { return m_unitFirst + m_nUnitsVisible; } - - // is this unit currently visible? - bool IsVisible(size_t unit) const - { return unit >= m_unitFirst && unit < GetVisibleEnd(); } - - // translate between scrolled and unscrolled coordinates - int CalcScrolledPosition(int coord) const - { return DoCalcScrolledPosition(coord); } - int CalcUnscrolledPosition(int coord) const - { return DoCalcUnscrolledPosition(coord); } - - virtual int DoCalcScrolledPosition(int coord) const; - virtual int DoCalcUnscrolledPosition(int coord) const; - - // update the thumb size shown by the scrollbar - virtual void UpdateScrollbar(); - void RemoveScrollbar(); - - // Normally the wxScrolledWindow will scroll itself, but in some rare - // occasions you might want it to scroll [part of] another window (e.g. a - // child of it in order to scroll only a portion the area between the - // scrollbars (spreadsheet: only cell area will move). - virtual void SetTargetWindow(wxWindow *target); - - // change the DC origin according to the scroll position. To properly - // forward calls to wxWindow::Layout use WX_FORWARD_TO_SCROLL_HELPER() - // derived class - virtual void DoPrepareDC(wxDC& dc) wxOVERRIDE; - - // the methods to be called from the window event handlers - void HandleOnScroll(wxScrollWinEvent& event); - void HandleOnSize(wxSizeEvent& event); -#if wxUSE_MOUSEWHEEL - void HandleOnMouseWheel(wxMouseEvent& event); -#endif // wxUSE_MOUSEWHEEL - - // these functions must be overidden in the derived class to return - // orientation specific data (e.g. the width for vertically scrolling - // derivatives in the case of GetOrientationTargetSize()) - virtual int GetOrientationTargetSize() const = 0; - virtual int GetNonOrientationTargetSize() const = 0; - virtual wxOrientation GetOrientation() const = 0; - -protected: - // all *Unit* functions are protected to be exposed by - // wxVarScrollHelperBase implementations (with appropriate names) - - // get the number of units this window contains (previously set by - // SetUnitCount()) - size_t GetUnitCount() const { return m_unitMax; } - - // set the number of units the helper contains: the derived class must - // provide the sizes for all units with indices up to the one given here - // in its OnGetUnitSize() - void SetUnitCount(size_t count); - - // redraw the specified unit - virtual void RefreshUnit(size_t unit); - - // redraw all units in the specified range (inclusive) - virtual void RefreshUnits(size_t from, size_t to); - - // scroll to the specified unit: it will become the first visible unit in - // the window - // - // return true if we scrolled the window, false if nothing was done - bool DoScrollToUnit(size_t unit); - - // scroll by the specified number of units/pages - virtual bool DoScrollUnits(int units); - virtual bool DoScrollPages(int pages); - - // this function must be overridden in the derived class and it should - // return the size of the given unit in pixels - virtual wxCoord OnGetUnitSize(size_t n) const = 0; - - // this function doesn't have to be overridden but it may be useful to do - // it if calculating the units' sizes is a relatively expensive operation - // as it gives the user code a possibility to calculate several of them at - // once - // - // OnGetUnitsSizeHint() is normally called just before OnGetUnitSize() but - // you shouldn't rely on the latter being called for all units in the - // interval specified here. It is also possible that OnGetUnitHeight() will - // be called for the units outside of this interval, so this is really just - // a hint, not a promise. - // - // finally note that unitMin is inclusive, while unitMax is exclusive, as - // usual - virtual void OnGetUnitsSizeHint(size_t WXUNUSED(unitMin), - size_t WXUNUSED(unitMax)) const - { } - - // when the number of units changes, we try to estimate the total size - // of all units which is a rather expensive operation in terms of unit - // access, so if the user code may estimate the average size - // better/faster than we do, it should override this function to implement - // its own logic - // - // this function should return the best guess for the total size it may - // make - virtual wxCoord EstimateTotalSize() const { return DoEstimateTotalSize(); } - - wxCoord DoEstimateTotalSize() const; - - // find the index of the unit we need to show to fit the specified unit on - // the opposite side either fully or partially (depending on fullyVisible) - size_t FindFirstVisibleFromLast(size_t last, - bool fullyVisible = false) const; - - // get the total size of the units between unitMin (inclusive) and - // unitMax (exclusive) - wxCoord GetUnitsSize(size_t unitMin, size_t unitMax) const; - - // get the offset of the first visible unit - wxCoord GetScrollOffset() const - { return GetUnitsSize(0, GetVisibleBegin()); } - - // get the size of the target window - wxSize GetTargetSize() const { return m_targetWindow->GetClientSize(); } - - void GetTargetSize(int *w, int *h) - { - wxSize size = GetTargetSize(); - if ( w ) - *w = size.x; - if ( h ) - *h = size.y; - } - - // calculate the new scroll position based on scroll event type - size_t GetNewScrollPosition(wxScrollWinEvent& event) const; - - // replacement implementation of wxWindow::Layout virtual method. To - // properly forward calls to wxWindow::Layout use - // WX_FORWARD_TO_SCROLL_HELPER() derived class - bool ScrollLayout(); - -#ifdef __WXMAC__ - // queue mac window update after handling scroll event - virtual void UpdateMacScrollWindow() { } -#endif // __WXMAC__ - - // change the target window - void DoSetTargetWindow(wxWindow *target); - - // delete the event handler we installed - void DeleteEvtHandler(); - - // helper function abstracting the orientation test: with vertical - // orientation, it assigns the first value to x and the second one to y, - // with horizontal orientation it reverses them, i.e. the first value is - // assigned to y and the second one to x - void AssignOrient(wxCoord& x, wxCoord& y, wxCoord first, wxCoord second); - - // similar to "oriented assignment" above but does "oriented increment": - // for vertical orientation, y is incremented by the given value and x if - // left unchanged, for horizontal orientation x is incremented - void IncOrient(wxCoord& x, wxCoord& y, wxCoord inc); - -private: - // the total number of (logical) units - size_t m_unitMax; - - // the total (estimated) size - wxCoord m_sizeTotal; - - // the first currently visible unit - size_t m_unitFirst; - - // the number of currently visible units (including the last, possibly only - // partly, visible one) - size_t m_nUnitsVisible; - - // accumulated mouse wheel rotation -#if wxUSE_MOUSEWHEEL - int m_sumWheelRotation; -#endif - - // do child scrolling (used in DoPrepareDC()) - bool m_physicalScrolling; - - // handler injected into target window to forward some useful events to us - wxVarScrollHelperEvtHandler *m_handler; -}; - - - -// =========================================================================== -// wxVarVScrollHelper -// =========================================================================== - -// Provides public API functions targeted for vertical-specific scrolling, -// wrapping the functionality of wxVarScrollHelperBase. - -class WXDLLIMPEXP_CORE wxVarVScrollHelper : public wxVarScrollHelperBase -{ -public: - // constructors and such - // --------------------- - - // ctor must be given the associated window - wxVarVScrollHelper(wxWindow *winToScroll) - : wxVarScrollHelperBase(winToScroll) - { - } - - // operators - - void SetRowCount(size_t rowCount) { SetUnitCount(rowCount); } - bool ScrollToRow(size_t row) { return DoScrollToUnit(row); } - - virtual bool ScrollRows(int rows) - { return DoScrollUnits(rows); } - virtual bool ScrollRowPages(int pages) - { return DoScrollPages(pages); } - - virtual void RefreshRow(size_t row) - { RefreshUnit(row); } - virtual void RefreshRows(size_t from, size_t to) - { RefreshUnits(from, to); } - - // accessors - - size_t GetRowCount() const { return GetUnitCount(); } - size_t GetVisibleRowsBegin() const { return GetVisibleBegin(); } - size_t GetVisibleRowsEnd() const { return GetVisibleEnd(); } - bool IsRowVisible(size_t row) const { return IsVisible(row); } - - virtual int GetOrientationTargetSize() const wxOVERRIDE - { return GetTargetWindow()->GetClientSize().y; } - virtual int GetNonOrientationTargetSize() const wxOVERRIDE - { return GetTargetWindow()->GetClientSize().x; } - virtual wxOrientation GetOrientation() const wxOVERRIDE { return wxVERTICAL; } - -protected: - // this function must be overridden in the derived class and it should - // return the size of the given row in pixels - virtual wxCoord OnGetRowHeight(size_t n) const = 0; - wxCoord OnGetUnitSize(size_t n) const wxOVERRIDE { return OnGetRowHeight(n); } - - virtual void OnGetRowsHeightHint(size_t WXUNUSED(rowMin), - size_t WXUNUSED(rowMax)) const { } - - // forward calls to OnGetRowsHeightHint() - virtual void OnGetUnitsSizeHint(size_t unitMin, size_t unitMax) const wxOVERRIDE - { OnGetRowsHeightHint(unitMin, unitMax); } - - // again, if not overridden, it will fall back on default method - virtual wxCoord EstimateTotalHeight() const - { return DoEstimateTotalSize(); } - - // forward calls to EstimateTotalHeight() - virtual wxCoord EstimateTotalSize() const wxOVERRIDE { return EstimateTotalHeight(); } - - wxCoord GetRowsHeight(size_t rowMin, size_t rowMax) const - { return GetUnitsSize(rowMin, rowMax); } -}; - - - -// =========================================================================== -// wxVarHScrollHelper -// =========================================================================== - -// Provides public API functions targeted for horizontal-specific scrolling, -// wrapping the functionality of wxVarScrollHelperBase. - -class WXDLLIMPEXP_CORE wxVarHScrollHelper : public wxVarScrollHelperBase -{ -public: - // constructors and such - // --------------------- - - // ctor must be given the associated window - wxVarHScrollHelper(wxWindow *winToScroll) - : wxVarScrollHelperBase(winToScroll) - { - } - - // operators - - void SetColumnCount(size_t columnCount) - { SetUnitCount(columnCount); } - - bool ScrollToColumn(size_t column) - { return DoScrollToUnit(column); } - virtual bool ScrollColumns(int columns) - { return DoScrollUnits(columns); } - virtual bool ScrollColumnPages(int pages) - { return DoScrollPages(pages); } - - virtual void RefreshColumn(size_t column) - { RefreshUnit(column); } - virtual void RefreshColumns(size_t from, size_t to) - { RefreshUnits(from, to); } - - // accessors - - size_t GetColumnCount() const - { return GetUnitCount(); } - size_t GetVisibleColumnsBegin() const - { return GetVisibleBegin(); } - size_t GetVisibleColumnsEnd() const - { return GetVisibleEnd(); } - bool IsColumnVisible(size_t column) const - { return IsVisible(column); } - - - virtual int GetOrientationTargetSize() const wxOVERRIDE - { return GetTargetWindow()->GetClientSize().x; } - virtual int GetNonOrientationTargetSize() const wxOVERRIDE - { return GetTargetWindow()->GetClientSize().y; } - virtual wxOrientation GetOrientation() const wxOVERRIDE { return wxHORIZONTAL; } - -protected: - // this function must be overridden in the derived class and it should - // return the size of the given column in pixels - virtual wxCoord OnGetColumnWidth(size_t n) const = 0; - wxCoord OnGetUnitSize(size_t n) const wxOVERRIDE { return OnGetColumnWidth(n); } - - virtual void OnGetColumnsWidthHint(size_t WXUNUSED(columnMin), - size_t WXUNUSED(columnMax)) const - { } - - // forward calls to OnGetColumnsWidthHint() - virtual void OnGetUnitsSizeHint(size_t unitMin, size_t unitMax) const wxOVERRIDE - { OnGetColumnsWidthHint(unitMin, unitMax); } - - // again, if not overridden, it will fall back on default method - virtual wxCoord EstimateTotalWidth() const { return DoEstimateTotalSize(); } - - // forward calls to EstimateTotalWidth() - virtual wxCoord EstimateTotalSize() const wxOVERRIDE { return EstimateTotalWidth(); } - - wxCoord GetColumnsWidth(size_t columnMin, size_t columnMax) const - { return GetUnitsSize(columnMin, columnMax); } -}; - - - -// =========================================================================== -// wxVarHVScrollHelper -// =========================================================================== - -// Provides public API functions targeted at functions with similar names in -// both wxVScrollHelper and wxHScrollHelper so class scope doesn't need to be -// specified (since we are using multiple inheritance). It also provides -// functions to make changing values for both orientations at the same time -// easier. - -class WXDLLIMPEXP_CORE wxVarHVScrollHelper : public wxVarVScrollHelper, - public wxVarHScrollHelper -{ -public: - // constructors and such - // --------------------- - - // ctor must be given the associated window - wxVarHVScrollHelper(wxWindow *winToScroll) - : wxVarVScrollHelper(winToScroll), wxVarHScrollHelper(winToScroll) { } - - // operators - // --------- - - // set the number of units the window contains for each axis: the derived - // class must provide the widths and heights for all units with indices up - // to each of the one given here in its OnGetColumnWidth() and - // OnGetRowHeight() - void SetRowColumnCount(size_t rowCount, size_t columnCount); - - - // with physical scrolling on, the device origin is changed properly when - // a wxPaintDC is prepared, children are actually moved and laid out - // properly, and the contents of the window (pixels) are actually moved - void EnablePhysicalScrolling(bool vscrolling = true, bool hscrolling = true) - { - wxVarVScrollHelper::EnablePhysicalScrolling(vscrolling); - wxVarHScrollHelper::EnablePhysicalScrolling(hscrolling); - } - - // scroll to the specified row/column: it will become the first visible - // cell in the window - // - // return true if we scrolled the window, false if nothing was done - bool ScrollToRowColumn(size_t row, size_t column); - bool ScrollToRowColumn(const wxPosition &pos) - { return ScrollToRowColumn(pos.GetRow(), pos.GetColumn()); } - - // redraw the specified cell - virtual void RefreshRowColumn(size_t row, size_t column); - virtual void RefreshRowColumn(const wxPosition &pos) - { RefreshRowColumn(pos.GetRow(), pos.GetColumn()); } - - // redraw the specified regions (inclusive). If the target window for - // both orientations is the same the rectangle of cells is refreshed; if - // the target windows differ the entire client size opposite the - // orientation direction is refreshed between the specified limits - virtual void RefreshRowsColumns(size_t fromRow, size_t toRow, - size_t fromColumn, size_t toColumn); - virtual void RefreshRowsColumns(const wxPosition& from, - const wxPosition& to) - { - RefreshRowsColumns(from.GetRow(), to.GetRow(), - from.GetColumn(), to.GetColumn()); - } - - // locate the virtual position from the given device coordinates - wxPosition VirtualHitTest(wxCoord x, wxCoord y) const; - wxPosition VirtualHitTest(const wxPoint &pos) const - { return VirtualHitTest(pos.x, pos.y); } - - // change the DC origin according to the scroll position. To properly - // forward calls to wxWindow::Layout use WX_FORWARD_TO_SCROLL_HELPER() - // derived class. We use this version to call both base classes' - // DoPrepareDC() - virtual void DoPrepareDC(wxDC& dc) wxOVERRIDE; - - // replacement implementation of wxWindow::Layout virtual method. To - // properly forward calls to wxWindow::Layout use - // WX_FORWARD_TO_SCROLL_HELPER() derived class. We use this version to - // call both base classes' ScrollLayout() - bool ScrollLayout(); - - // accessors - // --------- - - // get the number of units this window contains (previously set by - // Set[Column/Row/RowColumn/Unit]Count()) - wxSize GetRowColumnCount() const; - - // get the first currently visible units - wxPosition GetVisibleBegin() const; - wxPosition GetVisibleEnd() const; - - // is this cell currently visible? - bool IsVisible(size_t row, size_t column) const; - bool IsVisible(const wxPosition &pos) const - { return IsVisible(pos.GetRow(), pos.GetColumn()); } -}; - - - -#if WXWIN_COMPATIBILITY_2_8 - -// =========================================================================== -// wxVarVScrollLegacyAdaptor -// =========================================================================== - -// Provides backwards compatible API for applications originally built using -// wxVScrolledWindow in 2.6 or 2.8. Originally, wxVScrolledWindow referred -// to scrolling "lines". We use "units" in wxVarScrollHelperBase to avoid -// implying any orientation (since the functions are used for both horizontal -// and vertical scrolling in derived classes). And in the new -// wxVScrolledWindow and wxHScrolledWindow classes, we refer to them as -// "rows" and "columns", respectively. This is to help clear some confusion -// in not only those classes, but also in wxHVScrolledWindow where functions -// are inherited from both. - -class WXDLLIMPEXP_CORE wxVarVScrollLegacyAdaptor : public wxVarVScrollHelper -{ -public: - // constructors and such - // --------------------- - wxVarVScrollLegacyAdaptor(wxWindow *winToScroll) - : wxVarVScrollHelper(winToScroll) - { - } - - // accessors - // --------- - - // this is the same as GetVisibleRowsBegin(), exists to match - // GetLastVisibleLine() and for backwards compatibility only - wxDEPRECATED( size_t GetFirstVisibleLine() const ); - - // get the last currently visible line - // - // this function is unsafe as it returns (size_t)-1 (i.e. a huge positive - // number) if the control is empty, use GetVisibleRowsEnd() instead, this - // one is kept for backwards compatibility - wxDEPRECATED( size_t GetLastVisibleLine() const ); - - // "line" to "unit" compatibility functions - // ---------------------------------------- - - // get the number of lines this window contains (set by SetLineCount()) - wxDEPRECATED( size_t GetLineCount() const ); - - // set the number of lines the helper contains: the derived class must - // provide the sizes for all lines with indices up to the one given here - // in its OnGetLineHeight() - wxDEPRECATED( void SetLineCount(size_t count) ); - - // redraw the specified line - wxDEPRECATED( virtual void RefreshLine(size_t line) ); - - // redraw all lines in the specified range (inclusive) - wxDEPRECATED( virtual void RefreshLines(size_t from, size_t to) ); - - // scroll to the specified line: it will become the first visible line in - // the window - // - // return true if we scrolled the window, false if nothing was done - wxDEPRECATED( bool ScrollToLine(size_t line) ); - - // scroll by the specified number of lines/pages - wxDEPRECATED( virtual bool ScrollLines(int lines) ); - wxDEPRECATED( virtual bool ScrollPages(int pages) ); - -protected: - // unless the code has been updated to override OnGetRowHeight() instead, - // this function must be overridden in the derived class and it should - // return the height of the given row in pixels - wxDEPRECATED_BUT_USED_INTERNALLY( - virtual wxCoord OnGetLineHeight(size_t n) const ); - - // forwards the calls from base class pure virtual function to pure virtual - // OnGetLineHeight instead (backwards compatible name) - // note that we don't need to forward OnGetUnitSize() as it is already - // forwarded to OnGetRowHeight() in wxVarVScrollHelper - virtual wxCoord OnGetRowHeight(size_t n) const; - - // this function doesn't have to be overridden but it may be useful to do - // it if calculating the lines heights is a relatively expensive operation - // as it gives the user code a possibility to calculate several of them at - // once - // - // OnGetLinesHint() is normally called just before OnGetLineHeight() but you - // shouldn't rely on the latter being called for all lines in the interval - // specified here. It is also possible that OnGetLineHeight() will be - // called for the lines outside of this interval, so this is really just a - // hint, not a promise. - // - // finally note that lineMin is inclusive, while lineMax is exclusive, as - // usual - wxDEPRECATED_BUT_USED_INTERNALLY( virtual void OnGetLinesHint( - size_t lineMin, size_t lineMax) const ); - - // forwards the calls from base class pure virtual function to pure virtual - // OnGetLinesHint instead (backwards compatible name) - void OnGetRowsHeightHint(size_t rowMin, size_t rowMax) const; -}; - -#else // !WXWIN_COMPATIBILITY_2_8 - -// shortcut to avoid checking compatibility modes later -// remove this and all references to wxVarVScrollLegacyAdaptor once -// wxWidgets 2.6 and 2.8 compatibility is removed -typedef wxVarVScrollHelper wxVarVScrollLegacyAdaptor; - -#endif // WXWIN_COMPATIBILITY_2_8/!WXWIN_COMPATIBILITY_2_8 - - -// this macro must be used in declaration of wxVarScrollHelperBase-derived -// classes -#define WX_FORWARD_TO_VAR_SCROLL_HELPER() \ -public: \ - virtual void PrepareDC(wxDC& dc) wxOVERRIDE { DoPrepareDC(dc); } \ - virtual bool Layout() wxOVERRIDE { return ScrollLayout(); } - - - -// =========================================================================== -// wxVScrolledWindow -// =========================================================================== - -// In the name of this class, "V" may stand for "variable" because it can be -// used for scrolling rows of variable heights; "virtual", because it is not -// necessary to know the heights of all rows in advance -- only those which -// are shown on the screen need to be measured; or even "vertical", because -// this class only supports scrolling vertically. - -// In any case, this is a generalization of the wxScrolledWindow class which -// can be only used when all rows have the same heights. It lacks some other -// wxScrolledWindow features however, notably it can't scroll only a rectangle -// of the window and not its entire client area. - -class WXDLLIMPEXP_CORE wxVScrolledWindow : public wxPanel, - public wxVarVScrollLegacyAdaptor -{ -public: - // constructors and such - // --------------------- - - // default ctor, you must call Create() later - wxVScrolledWindow() : wxVarVScrollLegacyAdaptor(this) { } - - // normal ctor, no need to call Create() after this one - // - // note that wxVSCROLL is always automatically added to our style, there is - // no need to specify it explicitly - wxVScrolledWindow(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxPanelNameStr) - : wxVarVScrollLegacyAdaptor(this) - { - (void)Create(parent, id, pos, size, style, name); - } - - // same as the previous ctor but returns status code: true if ok - // - // just as with the ctor above, wxVSCROLL style is always used, there is no - // need to specify it - bool Create(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxPanelNameStr) - { - return wxPanel::Create(parent, id, pos, size, style | wxVSCROLL, name); - } - -#if WXWIN_COMPATIBILITY_2_8 - // Make sure we prefer our version of HitTest rather than wxWindow's - // These functions should no longer be masked in favor of VirtualHitTest() - int HitTest(wxCoord WXUNUSED(x), wxCoord y) const - { return wxVarVScrollHelper::VirtualHitTest(y); } - int HitTest(const wxPoint& pt) const - { return HitTest(pt.x, pt.y); } -#endif // WXWIN_COMPATIBILITY_2_8 - - WX_FORWARD_TO_VAR_SCROLL_HELPER() - -#ifdef __WXMAC__ -protected: - virtual void UpdateMacScrollWindow() wxOVERRIDE { Update(); } -#endif // __WXMAC__ - -private: - wxDECLARE_NO_COPY_CLASS(wxVScrolledWindow); - wxDECLARE_ABSTRACT_CLASS(wxVScrolledWindow); -}; - - - -// =========================================================================== -// wxHScrolledWindow -// =========================================================================== - -// In the name of this class, "H" stands for "horizontal" because it can be -// used for scrolling columns of variable widths. It is not necessary to know -// the widths of all columns in advance -- only those which are shown on the -// screen need to be measured. - -// This is a generalization of the wxScrolledWindow class which can be only -// used when all columns have the same width. It lacks some other -// wxScrolledWindow features however, notably it can't scroll only a rectangle -// of the window and not its entire client area. - -class WXDLLIMPEXP_CORE wxHScrolledWindow : public wxPanel, - public wxVarHScrollHelper -{ -public: - // constructors and such - // --------------------- - - // default ctor, you must call Create() later - wxHScrolledWindow() : wxVarHScrollHelper(this) { } - - // normal ctor, no need to call Create() after this one - // - // note that wxHSCROLL is always automatically added to our style, there is - // no need to specify it explicitly - wxHScrolledWindow(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxPanelNameStr) - : wxVarHScrollHelper(this) - { - (void)Create(parent, id, pos, size, style, name); - } - - // same as the previous ctor but returns status code: true if ok - // - // just as with the ctor above, wxHSCROLL style is always used, there is no - // need to specify it - bool Create(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxPanelNameStr) - { - return wxPanel::Create(parent, id, pos, size, style | wxHSCROLL, name); - } - - WX_FORWARD_TO_VAR_SCROLL_HELPER() - -#ifdef __WXMAC__ -protected: - virtual void UpdateMacScrollWindow() wxOVERRIDE { Update(); } -#endif // __WXMAC__ - -private: - wxDECLARE_NO_COPY_CLASS(wxHScrolledWindow); - wxDECLARE_ABSTRACT_CLASS(wxHScrolledWindow); -}; - - - -// =========================================================================== -// wxHVScrolledWindow -// =========================================================================== - -// This window inherits all functionality of both vertical and horizontal -// scrolled windows automatically handling everything needed to scroll both -// axis simultaneously. - -class WXDLLIMPEXP_CORE wxHVScrolledWindow : public wxPanel, - public wxVarHVScrollHelper -{ -public: - // constructors and such - // --------------------- - - // default ctor, you must call Create() later - wxHVScrolledWindow() - : wxPanel(), - wxVarHVScrollHelper(this) { } - - // normal ctor, no need to call Create() after this one - // - // note that wxVSCROLL and wxHSCROLL are always automatically added to our - // style, there is no need to specify them explicitly - wxHVScrolledWindow(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxPanelNameStr) - : wxPanel(), - wxVarHVScrollHelper(this) - { - (void)Create(parent, id, pos, size, style, name); - } - - // same as the previous ctor but returns status code: true if ok - // - // just as with the ctor above, wxVSCROLL and wxHSCROLL styles are always - // used, there is no need to specify them - bool Create(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxPanelNameStr) - { - return wxPanel::Create(parent, id, pos, size, - style | wxVSCROLL | wxHSCROLL, name); - } - - WX_FORWARD_TO_VAR_SCROLL_HELPER() - -#ifdef __WXMAC__ -protected: - virtual void UpdateMacScrollWindow() wxOVERRIDE { Update(); } -#endif // __WXMAC__ - -private: - wxDECLARE_NO_COPY_CLASS(wxHVScrolledWindow); - wxDECLARE_ABSTRACT_CLASS(wxHVScrolledWindow); -}; - -#endif // _WX_VSCROLL_H_ - diff --git a/Externals/wxWidgets3/include/wx/weakref.h b/Externals/wxWidgets3/include/wx/weakref.h deleted file mode 100644 index 4794c85ef0..0000000000 --- a/Externals/wxWidgets3/include/wx/weakref.h +++ /dev/null @@ -1,229 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/weakref.h -// Purpose: wxWeakRef - Generic weak references for wxWidgets -// Author: Arne Steinarson -// Created: 27 Dec 07 -// Copyright: (c) 2007 Arne Steinarson -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_WEAKREF_H_ -#define _WX_WEAKREF_H_ - -#include "wx/tracker.h" - - -#include "wx/meta/convertible.h" -#include "wx/meta/int2type.h" - -template -struct wxIsStaticTrackable -{ - enum { value = wxConvertibleTo::value }; -}; - - -// A weak reference to an object of type T (which must inherit from wxTrackable) -template -class wxWeakRef : public wxTrackerNode -{ -public: - typedef T element_type; - - // Default ctor - wxWeakRef() : m_pobj(NULL), m_ptbase(NULL) { } - - // Ctor from the object of this type: this is needed as the template ctor - // below is not used by at least g++4 when a literal NULL is used - wxWeakRef(T *pobj) : m_pobj(NULL), m_ptbase(NULL) - { - this->Assign(pobj); - } - - // When we have the full type here, static_cast<> will always work - // (or give a straight compiler error). - template - wxWeakRef(TDerived* pobj) : m_pobj(NULL), m_ptbase(NULL) - { - this->Assign(pobj); - } - - // We need this copy ctor, since otherwise a default compiler (binary) copy - // happens (if embedded as an object member). - wxWeakRef(const wxWeakRef& wr) : m_pobj(NULL), m_ptbase(NULL) - { - this->Assign(wr.get()); - } - - wxWeakRef& operator=(const wxWeakRef& wr) - { - this->AssignCopy(wr); - return *this; - } - - virtual ~wxWeakRef() { this->Release(); } - - // Smart pointer functions - T& operator*() const { return *this->m_pobj; } - T* operator->() const { return this->m_pobj; } - - T* get() const { return this->m_pobj; } - operator T*() const { return this->m_pobj; } - -public: - void Release() - { - // Release old object if any - if ( m_pobj ) - { - // Remove ourselves from object tracker list - m_ptbase->RemoveNode(this); - m_pobj = NULL; - m_ptbase = NULL; - } - } - - virtual void OnObjectDestroy() wxOVERRIDE - { - // Tracked object itself removes us from list of trackers - wxASSERT(m_pobj != NULL); - m_pobj = NULL; - m_ptbase = NULL; - } - -protected: - // Assign receives most derived class here and can use that - template - void Assign( TDerived* pobj ) - { - wxCOMPILE_TIME_ASSERT( wxIsStaticTrackable::value, - Tracked_class_should_inherit_from_wxTrackable ); - wxTrackable *ptbase = static_cast(pobj); - DoAssign(pobj, ptbase); - } - - void AssignCopy(const wxWeakRef& wr) - { - DoAssign(wr.m_pobj, wr.m_ptbase); - } - - void DoAssign(T* pobj, wxTrackable *ptbase) - { - if ( m_pobj == pobj ) - return; - - Release(); - - // Now set new trackable object - if ( pobj ) - { - // Add ourselves to object tracker list - wxASSERT( ptbase ); - ptbase->AddNode( this ); - m_pobj = pobj; - m_ptbase = ptbase; - } - } - - T *m_pobj; - wxTrackable *m_ptbase; -}; - - -#ifndef wxNO_RTTI - -// Weak ref implementation assign objects are queried for wxTrackable -// using dynamic_cast<> -template -class wxWeakRefDynamic : public wxTrackerNode -{ -public: - wxWeakRefDynamic() : m_pobj(NULL) { } - - wxWeakRefDynamic(T* pobj) : m_pobj(pobj) - { - Assign(pobj); - } - - wxWeakRefDynamic(const wxWeakRef& wr) - { - Assign(wr.get()); - } - - virtual ~wxWeakRefDynamic() { Release(); } - - // Smart pointer functions - T& operator*() const { wxASSERT(m_pobj); return *m_pobj; } - T* operator->() const { wxASSERT(m_pobj); return m_pobj; } - - T* get() const { return m_pobj; } - operator T* () const { return m_pobj; } - - T* operator = (T* pobj) { Assign(pobj); return m_pobj; } - - // Assign from another weak ref, point to same object - T* operator = (const wxWeakRef &wr) { Assign( wr.get() ); return m_pobj; } - - void Release() - { - // Release old object if any - if( m_pobj ) - { - // Remove ourselves from object tracker list - wxTrackable *pt = dynamic_cast(m_pobj); - wxASSERT(pt); - pt->RemoveNode(this); - m_pobj = NULL; - } - } - - virtual void OnObjectDestroy() wxOVERRIDE - { - wxASSERT_MSG(m_pobj, "tracked object should have removed us itself"); - - m_pobj = NULL; - } - -protected: - void Assign(T *pobj) - { - if ( m_pobj == pobj ) - return; - - Release(); - - // Now set new trackable object - if ( pobj ) - { - // Add ourselves to object tracker list - wxTrackable *pt = dynamic_cast(pobj); - if ( pt ) - { - pt->AddNode(this); - m_pobj = pobj; - } - else - { - // If the object we want to track does not support wxTackable, then - // log a message and keep the NULL object pointer. - wxFAIL_MSG( "Tracked class should inherit from wxTrackable" ); - } - } - } - - T *m_pobj; -}; - -#endif // RTTI enabled - - -// Provide some basic types of weak references -class WXDLLIMPEXP_FWD_BASE wxEvtHandler; -class WXDLLIMPEXP_FWD_CORE wxWindow; - - -typedef wxWeakRef wxEvtHandlerRef; -typedef wxWeakRef wxWindowRef; - -#endif // _WX_WEAKREF_H_ - diff --git a/Externals/wxWidgets3/include/wx/webview.h b/Externals/wxWidgets3/include/wx/webview.h deleted file mode 100644 index 4f18bada70..0000000000 --- a/Externals/wxWidgets3/include/wx/webview.h +++ /dev/null @@ -1,304 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: webview.h -// Purpose: Common interface and events for web view component -// Author: Marianne Gagnon -// Copyright: (c) 2010 Marianne Gagnon, 2011 Steven Lamerton -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_WEBVIEW_H_ -#define _WX_WEBVIEW_H_ - -#include "wx/defs.h" - -#if wxUSE_WEBVIEW - -#include "wx/control.h" -#include "wx/event.h" -#include "wx/sstream.h" -#include "wx/sharedptr.h" -#include "wx/vector.h" - -#if defined(__WXOSX__) - #include "wx/osx/webviewhistoryitem_webkit.h" -#elif defined(__WXGTK__) - #include "wx/gtk/webviewhistoryitem_webkit.h" -#elif defined(__WXMSW__) - #include "wx/msw/webviewhistoryitem_ie.h" -#else - #error "wxWebView not implemented on this platform." -#endif - -class wxFSFile; -class wxFileSystem; -class wxWebView; - -enum wxWebViewZoom -{ - wxWEBVIEW_ZOOM_TINY, - wxWEBVIEW_ZOOM_SMALL, - wxWEBVIEW_ZOOM_MEDIUM, - wxWEBVIEW_ZOOM_LARGE, - wxWEBVIEW_ZOOM_LARGEST -}; - -enum wxWebViewZoomType -{ - //Scales entire page, including images - wxWEBVIEW_ZOOM_TYPE_LAYOUT, - wxWEBVIEW_ZOOM_TYPE_TEXT -}; - -enum wxWebViewNavigationError -{ - wxWEBVIEW_NAV_ERR_CONNECTION, - wxWEBVIEW_NAV_ERR_CERTIFICATE, - wxWEBVIEW_NAV_ERR_AUTH, - wxWEBVIEW_NAV_ERR_SECURITY, - wxWEBVIEW_NAV_ERR_NOT_FOUND, - wxWEBVIEW_NAV_ERR_REQUEST, - wxWEBVIEW_NAV_ERR_USER_CANCELLED, - wxWEBVIEW_NAV_ERR_OTHER -}; - -enum wxWebViewReloadFlags -{ - //Default, may access cache - wxWEBVIEW_RELOAD_DEFAULT, - wxWEBVIEW_RELOAD_NO_CACHE -}; - -enum wxWebViewFindFlags -{ - wxWEBVIEW_FIND_WRAP = 0x0001, - wxWEBVIEW_FIND_ENTIRE_WORD = 0x0002, - wxWEBVIEW_FIND_MATCH_CASE = 0x0004, - wxWEBVIEW_FIND_HIGHLIGHT_RESULT = 0x0008, - wxWEBVIEW_FIND_BACKWARDS = 0x0010, - wxWEBVIEW_FIND_DEFAULT = 0 -}; - -//Base class for custom scheme handlers -class WXDLLIMPEXP_WEBVIEW wxWebViewHandler -{ -public: - wxWebViewHandler(const wxString& scheme) : m_scheme(scheme) {} - virtual ~wxWebViewHandler() {} - virtual wxString GetName() const { return m_scheme; } - virtual wxFSFile* GetFile(const wxString &uri) = 0; -private: - wxString m_scheme; -}; - -extern WXDLLIMPEXP_DATA_WEBVIEW(const char) wxWebViewNameStr[]; -extern WXDLLIMPEXP_DATA_WEBVIEW(const char) wxWebViewDefaultURLStr[]; -extern WXDLLIMPEXP_DATA_WEBVIEW(const char) wxWebViewBackendDefault[]; -extern WXDLLIMPEXP_DATA_WEBVIEW(const char) wxWebViewBackendIE[]; -extern WXDLLIMPEXP_DATA_WEBVIEW(const char) wxWebViewBackendWebKit[]; - -class WXDLLIMPEXP_WEBVIEW wxWebViewFactory : public wxObject -{ -public: - virtual wxWebView* Create() = 0; - virtual wxWebView* Create(wxWindow* parent, - wxWindowID id, - const wxString& url = wxWebViewDefaultURLStr, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxWebViewNameStr) = 0; -}; - -WX_DECLARE_STRING_HASH_MAP(wxSharedPtr, wxStringWebViewFactoryMap); - -class WXDLLIMPEXP_WEBVIEW wxWebView : public wxControl -{ -public: - wxWebView() - { - m_showMenu = true; - } - - virtual ~wxWebView() {} - - virtual bool Create(wxWindow* parent, - wxWindowID id, - const wxString& url = wxWebViewDefaultURLStr, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxWebViewNameStr) = 0; - - // Factory methods allowing the use of custom factories registered with - // RegisterFactory - static wxWebView* New(const wxString& backend = wxWebViewBackendDefault); - static wxWebView* New(wxWindow* parent, - wxWindowID id, - const wxString& url = wxWebViewDefaultURLStr, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - const wxString& backend = wxWebViewBackendDefault, - long style = 0, - const wxString& name = wxWebViewNameStr); - - static void RegisterFactory(const wxString& backend, - wxSharedPtr factory); - - // General methods - virtual void EnableContextMenu(bool enable = true) - { - m_showMenu = enable; - } - virtual wxString GetCurrentTitle() const = 0; - virtual wxString GetCurrentURL() const = 0; - // TODO: handle choosing a frame when calling GetPageSource()? - virtual wxString GetPageSource() const = 0; - virtual wxString GetPageText() const = 0; - virtual bool IsBusy() const = 0; - virtual bool IsContextMenuEnabled() const { return m_showMenu; } - virtual bool IsEditable() const = 0; - virtual void LoadURL(const wxString& url) = 0; - virtual void Print() = 0; - virtual void RegisterHandler(wxSharedPtr handler) = 0; - virtual void Reload(wxWebViewReloadFlags flags = wxWEBVIEW_RELOAD_DEFAULT) = 0; - virtual void RunScript(const wxString& javascript) = 0; - virtual void SetEditable(bool enable = true) = 0; - void SetPage(const wxString& html, const wxString& baseUrl) - { - DoSetPage(html, baseUrl); - } - void SetPage(wxInputStream& html, wxString baseUrl) - { - wxStringOutputStream stream; - stream.Write(html); - DoSetPage(stream.GetString(), baseUrl); - } - virtual void Stop() = 0; - - //History - virtual bool CanGoBack() const = 0; - virtual bool CanGoForward() const = 0; - virtual void GoBack() = 0; - virtual void GoForward() = 0; - virtual void ClearHistory() = 0; - virtual void EnableHistory(bool enable = true) = 0; - virtual wxVector > GetBackwardHistory() = 0; - virtual wxVector > GetForwardHistory() = 0; - virtual void LoadHistoryItem(wxSharedPtr item) = 0; - - //Zoom - virtual bool CanSetZoomType(wxWebViewZoomType type) const = 0; - virtual wxWebViewZoom GetZoom() const = 0; - virtual wxWebViewZoomType GetZoomType() const = 0; - virtual void SetZoom(wxWebViewZoom zoom) = 0; - virtual void SetZoomType(wxWebViewZoomType zoomType) = 0; - - //Selection - virtual void SelectAll() = 0; - virtual bool HasSelection() const = 0; - virtual void DeleteSelection() = 0; - virtual wxString GetSelectedText() const = 0; - virtual wxString GetSelectedSource() const = 0; - virtual void ClearSelection() = 0; - - //Clipboard functions - virtual bool CanCut() const = 0; - virtual bool CanCopy() const = 0; - virtual bool CanPaste() const = 0; - virtual void Cut() = 0; - virtual void Copy() = 0; - virtual void Paste() = 0; - - //Undo / redo functionality - virtual bool CanUndo() const = 0; - virtual bool CanRedo() const = 0; - virtual void Undo() = 0; - virtual void Redo() = 0; - - //Get the pointer to the underlying native engine. - virtual void* GetNativeBackend() const = 0; - //Find function - virtual long Find(const wxString& text, int flags = wxWEBVIEW_FIND_DEFAULT) = 0; - -protected: - virtual void DoSetPage(const wxString& html, const wxString& baseUrl) = 0; - -private: - static void InitFactoryMap(); - static wxStringWebViewFactoryMap::iterator FindFactory(const wxString &backend); - - bool m_showMenu; - static wxStringWebViewFactoryMap m_factoryMap; - - wxDECLARE_ABSTRACT_CLASS(wxWebView); -}; - -class WXDLLIMPEXP_WEBVIEW wxWebViewEvent : public wxNotifyEvent -{ -public: - wxWebViewEvent() {} - wxWebViewEvent(wxEventType type, int id, const wxString& url, - const wxString& target) - : wxNotifyEvent(type, id), m_url(url), m_target(target) - {} - - - const wxString& GetURL() const { return m_url; } - const wxString& GetTarget() const { return m_target; } - - virtual wxEvent* Clone() const wxOVERRIDE { return new wxWebViewEvent(*this); } -private: - wxString m_url; - wxString m_target; - - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxWebViewEvent); -}; - -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_WEBVIEW, wxEVT_WEBVIEW_NAVIGATING, wxWebViewEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_WEBVIEW, wxEVT_WEBVIEW_NAVIGATED, wxWebViewEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_WEBVIEW, wxEVT_WEBVIEW_LOADED, wxWebViewEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_WEBVIEW, wxEVT_WEBVIEW_ERROR, wxWebViewEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_WEBVIEW, wxEVT_WEBVIEW_NEWWINDOW, wxWebViewEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_WEBVIEW, wxEVT_WEBVIEW_TITLE_CHANGED, wxWebViewEvent ); - -typedef void (wxEvtHandler::*wxWebViewEventFunction) - (wxWebViewEvent&); - -#define wxWebViewEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxWebViewEventFunction, func) - -#define EVT_WEBVIEW_NAVIGATING(id, fn) \ - wx__DECLARE_EVT1(wxEVT_WEBVIEW_NAVIGATING, id, \ - wxWebViewEventHandler(fn)) - -#define EVT_WEBVIEW_NAVIGATED(id, fn) \ - wx__DECLARE_EVT1(wxEVT_WEBVIEW_NAVIGATED, id, \ - wxWebViewEventHandler(fn)) - -#define EVT_WEBVIEW_LOADED(id, fn) \ - wx__DECLARE_EVT1(wxEVT_WEBVIEW_LOADED, id, \ - wxWebViewEventHandler(fn)) - -#define EVT_WEBVIEW_ERROR(id, fn) \ - wx__DECLARE_EVT1(wxEVT_WEBVIEW_ERROR, id, \ - wxWebViewEventHandler(fn)) - -#define EVT_WEBVIEW_NEWWINDOW(id, fn) \ - wx__DECLARE_EVT1(wxEVT_WEBVIEW_NEWWINDOW, id, \ - wxWebViewEventHandler(fn)) - -#define EVT_WEBVIEW_TITLE_CHANGED(id, fn) \ - wx__DECLARE_EVT1(wxEVT_WEBVIEW_TITLE_CHANGED, id, \ - wxWebViewEventHandler(fn)) - -// old wxEVT_COMMAND_* constants -#define wxEVT_COMMAND_WEBVIEW_NAVIGATING wxEVT_WEBVIEW_NAVIGATING -#define wxEVT_COMMAND_WEBVIEW_NAVIGATED wxEVT_WEBVIEW_NAVIGATED -#define wxEVT_COMMAND_WEBVIEW_LOADED wxEVT_WEBVIEW_LOADED -#define wxEVT_COMMAND_WEBVIEW_ERROR wxEVT_WEBVIEW_ERROR -#define wxEVT_COMMAND_WEBVIEW_NEWWINDOW wxEVT_WEBVIEW_NEWWINDOW -#define wxEVT_COMMAND_WEBVIEW_TITLE_CHANGED wxEVT_WEBVIEW_TITLE_CHANGED - -#endif // wxUSE_WEBVIEW - -#endif // _WX_WEBVIEW_H_ diff --git a/Externals/wxWidgets3/include/wx/webviewarchivehandler.h b/Externals/wxWidgets3/include/wx/webviewarchivehandler.h deleted file mode 100644 index 6157b6b107..0000000000 --- a/Externals/wxWidgets3/include/wx/webviewarchivehandler.h +++ /dev/null @@ -1,36 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: webviewarchivehandler.h -// Purpose: Custom webview handler to allow archive browsing -// Author: Steven Lamerton -// Copyright: (c) 2011 Steven Lamerton -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_WEBVIEW_FILE_HANDLER_H_ -#define _WX_WEBVIEW_FILE_HANDLER_H_ - -#include "wx/setup.h" - -#if wxUSE_WEBVIEW - -class wxFSFile; -class wxFileSystem; - -#include "wx/webview.h" - -//Loads from uris such as scheme:///C:/example/example.html or archives such as -//scheme:///C:/example/example.zip;protocol=zip/example.html - -class WXDLLIMPEXP_WEBVIEW wxWebViewArchiveHandler : public wxWebViewHandler -{ -public: - wxWebViewArchiveHandler(const wxString& scheme); - virtual ~wxWebViewArchiveHandler(); - virtual wxFSFile* GetFile(const wxString &uri) wxOVERRIDE; -private: - wxFileSystem* m_fileSystem; -}; - -#endif // wxUSE_WEBVIEW - -#endif // _WX_WEBVIEW_FILE_HANDLER_H_ diff --git a/Externals/wxWidgets3/include/wx/webviewfshandler.h b/Externals/wxWidgets3/include/wx/webviewfshandler.h deleted file mode 100644 index 275410ab3f..0000000000 --- a/Externals/wxWidgets3/include/wx/webviewfshandler.h +++ /dev/null @@ -1,37 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: webviewfshandler.h -// Purpose: Custom webview handler for virtual file system -// Author: Nick Matthews -// Copyright: (c) 2012 Steven Lamerton -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// Based on webviewarchivehandler.h file by Steven Lamerton - -#ifndef _WX_WEBVIEW_FS_HANDLER_H_ -#define _WX_WEBVIEW_FS_HANDLER_H_ - -#include "wx/setup.h" - -#if wxUSE_WEBVIEW - -class wxFSFile; -class wxFileSystem; - -#include "wx/webview.h" - -//Loads from uris such as scheme:example.html - -class WXDLLIMPEXP_WEBVIEW wxWebViewFSHandler : public wxWebViewHandler -{ -public: - wxWebViewFSHandler(const wxString& scheme); - virtual ~wxWebViewFSHandler(); - virtual wxFSFile* GetFile(const wxString &uri) wxOVERRIDE; -private: - wxFileSystem* m_fileSystem; -}; - -#endif // wxUSE_WEBVIEW - -#endif // _WX_WEBVIEW_FS_HANDLER_H_ diff --git a/Externals/wxWidgets3/include/wx/wfstream.h b/Externals/wxWidgets3/include/wx/wfstream.h deleted file mode 100644 index 990e4ab114..0000000000 --- a/Externals/wxWidgets3/include/wx/wfstream.h +++ /dev/null @@ -1,263 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/wfstream.h -// Purpose: File stream classes -// Author: Guilhem Lavaux -// Modified by: -// Created: 11/07/98 -// Copyright: (c) Guilhem Lavaux -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_WXFSTREAM_H__ -#define _WX_WXFSTREAM_H__ - -#include "wx/defs.h" - -#if wxUSE_STREAMS - -#include "wx/object.h" -#include "wx/string.h" -#include "wx/stream.h" -#include "wx/file.h" -#include "wx/ffile.h" - -#if wxUSE_FILE - -// ---------------------------------------------------------------------------- -// wxFileStream using wxFile -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxFileInputStream : public wxInputStream -{ -public: - wxFileInputStream(const wxString& ifileName); - wxFileInputStream(wxFile& file); - wxFileInputStream(int fd); - virtual ~wxFileInputStream(); - - virtual wxFileOffset GetLength() const wxOVERRIDE; - - bool Ok() const { return IsOk(); } - virtual bool IsOk() const wxOVERRIDE; - virtual bool IsSeekable() const wxOVERRIDE { return m_file->GetKind() == wxFILE_KIND_DISK; } - - wxFile* GetFile() const { return m_file; } - -protected: - wxFileInputStream(); - - virtual size_t OnSysRead(void *buffer, size_t size) wxOVERRIDE; - virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) wxOVERRIDE; - virtual wxFileOffset OnSysTell() const wxOVERRIDE; - -protected: - wxFile *m_file; - bool m_file_destroy; - - wxDECLARE_NO_COPY_CLASS(wxFileInputStream); -}; - -class WXDLLIMPEXP_BASE wxFileOutputStream : public wxOutputStream -{ -public: - wxFileOutputStream(const wxString& fileName); - wxFileOutputStream(wxFile& file); - wxFileOutputStream(int fd); - virtual ~wxFileOutputStream(); - - void Sync() wxOVERRIDE; - bool Close() wxOVERRIDE { return m_file_destroy ? m_file->Close() : true; } - virtual wxFileOffset GetLength() const wxOVERRIDE; - - bool Ok() const { return IsOk(); } - virtual bool IsOk() const wxOVERRIDE; - virtual bool IsSeekable() const wxOVERRIDE { return m_file->GetKind() == wxFILE_KIND_DISK; } - - wxFile* GetFile() const { return m_file; } - -protected: - wxFileOutputStream(); - - virtual size_t OnSysWrite(const void *buffer, size_t size) wxOVERRIDE; - virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) wxOVERRIDE; - virtual wxFileOffset OnSysTell() const wxOVERRIDE; - -protected: - wxFile *m_file; - bool m_file_destroy; - - wxDECLARE_NO_COPY_CLASS(wxFileOutputStream); -}; - -class WXDLLIMPEXP_BASE wxTempFileOutputStream : public wxOutputStream -{ -public: - wxTempFileOutputStream(const wxString& fileName); - virtual ~wxTempFileOutputStream(); - - bool Close() wxOVERRIDE { return Commit(); } - WXDLLIMPEXP_INLINE_BASE virtual bool Commit() { return m_file->Commit(); } - WXDLLIMPEXP_INLINE_BASE virtual void Discard() { m_file->Discard(); } - - virtual wxFileOffset GetLength() const wxOVERRIDE { return m_file->Length(); } - virtual bool IsSeekable() const wxOVERRIDE { return true; } - -protected: - virtual size_t OnSysWrite(const void *buffer, size_t size) wxOVERRIDE; - virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) wxOVERRIDE - { return m_file->Seek(pos, mode); } - virtual wxFileOffset OnSysTell() const wxOVERRIDE { return m_file->Tell(); } - -private: - wxTempFile *m_file; - - wxDECLARE_NO_COPY_CLASS(wxTempFileOutputStream); -}; - -class WXDLLIMPEXP_BASE wxFileStream : public wxFileInputStream, - public wxFileOutputStream -{ -public: - wxFileStream(const wxString& fileName); - virtual bool IsOk() const wxOVERRIDE; - - // override (some) virtual functions inherited from both classes to resolve - // ambiguities (this wouldn't be necessary if wxStreamBase were a virtual - // base class but it isn't) - - virtual bool IsSeekable() const wxOVERRIDE - { - return wxFileInputStream::IsSeekable(); - } - - virtual wxFileOffset GetLength() const wxOVERRIDE - { - return wxFileInputStream::GetLength(); - } - -protected: - virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) wxOVERRIDE - { - return wxFileInputStream::OnSysSeek(pos, mode); - } - - virtual wxFileOffset OnSysTell() const wxOVERRIDE - { - return wxFileInputStream::OnSysTell(); - } - -private: - wxDECLARE_NO_COPY_CLASS(wxFileStream); -}; - -#endif //wxUSE_FILE - -#if wxUSE_FFILE - -// ---------------------------------------------------------------------------- -// wxFFileStream using wxFFile -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxFFileInputStream : public wxInputStream -{ -public: - wxFFileInputStream(const wxString& fileName, const wxString& mode = "rb"); - wxFFileInputStream(wxFFile& file); - wxFFileInputStream(FILE *file); - virtual ~wxFFileInputStream(); - - virtual wxFileOffset GetLength() const wxOVERRIDE; - - bool Ok() const { return IsOk(); } - virtual bool IsOk() const wxOVERRIDE; - virtual bool IsSeekable() const wxOVERRIDE { return m_file->GetKind() == wxFILE_KIND_DISK; } - - wxFFile* GetFile() const { return m_file; } - -protected: - wxFFileInputStream(); - - virtual size_t OnSysRead(void *buffer, size_t size) wxOVERRIDE; - virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) wxOVERRIDE; - virtual wxFileOffset OnSysTell() const wxOVERRIDE; - -protected: - wxFFile *m_file; - bool m_file_destroy; - - wxDECLARE_NO_COPY_CLASS(wxFFileInputStream); -}; - -class WXDLLIMPEXP_BASE wxFFileOutputStream : public wxOutputStream -{ -public: - wxFFileOutputStream(const wxString& fileName, const wxString& mode = "wb"); - wxFFileOutputStream(wxFFile& file); - wxFFileOutputStream(FILE *file); - virtual ~wxFFileOutputStream(); - - void Sync() wxOVERRIDE; - bool Close() wxOVERRIDE { return m_file_destroy ? m_file->Close() : true; } - virtual wxFileOffset GetLength() const wxOVERRIDE; - - bool Ok() const { return IsOk(); } - virtual bool IsOk() const wxOVERRIDE; - virtual bool IsSeekable() const wxOVERRIDE { return m_file->GetKind() == wxFILE_KIND_DISK; } - - wxFFile* GetFile() const { return m_file; } - -protected: - wxFFileOutputStream(); - - virtual size_t OnSysWrite(const void *buffer, size_t size) wxOVERRIDE; - virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) wxOVERRIDE; - virtual wxFileOffset OnSysTell() const wxOVERRIDE; - -protected: - wxFFile *m_file; - bool m_file_destroy; - - wxDECLARE_NO_COPY_CLASS(wxFFileOutputStream); -}; - -class WXDLLIMPEXP_BASE wxFFileStream : public wxFFileInputStream, - public wxFFileOutputStream -{ -public: - wxFFileStream(const wxString& fileName, const wxString& mode = "w+b"); - - // override some virtual functions to resolve ambiguities, just as in - // wxFileStream - - virtual bool IsOk() const wxOVERRIDE; - - virtual bool IsSeekable() const wxOVERRIDE - { - return wxFFileInputStream::IsSeekable(); - } - - virtual wxFileOffset GetLength() const wxOVERRIDE - { - return wxFFileInputStream::GetLength(); - } - -protected: - virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) wxOVERRIDE - { - return wxFFileInputStream::OnSysSeek(pos, mode); - } - - virtual wxFileOffset OnSysTell() const wxOVERRIDE - { - return wxFFileInputStream::OnSysTell(); - } - -private: - wxDECLARE_NO_COPY_CLASS(wxFFileStream); -}; - -#endif //wxUSE_FFILE - -#endif // wxUSE_STREAMS - -#endif // _WX_WXFSTREAM_H__ diff --git a/Externals/wxWidgets3/include/wx/window.h b/Externals/wxWidgets3/include/wx/window.h deleted file mode 100644 index 80938e9fb1..0000000000 --- a/Externals/wxWidgets3/include/wx/window.h +++ /dev/null @@ -1,2137 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/window.h -// Purpose: wxWindowBase class - the interface of wxWindow -// Author: Vadim Zeitlin -// Modified by: Ron Lee -// Created: 01/02/97 -// Copyright: (c) Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_WINDOW_H_BASE_ -#define _WX_WINDOW_H_BASE_ - -// ---------------------------------------------------------------------------- -// headers which we must include here -// ---------------------------------------------------------------------------- - -#include "wx/event.h" // the base class - -#include "wx/list.h" // defines wxWindowList - -#include "wx/cursor.h" // we have member variables of these classes -#include "wx/font.h" // so we can't do without them -#include "wx/colour.h" -#include "wx/region.h" -#include "wx/utils.h" -#include "wx/intl.h" - -#include "wx/validate.h" // for wxDefaultValidator (always include it) - -#if wxUSE_PALETTE - #include "wx/palette.h" -#endif // wxUSE_PALETTE - -#if wxUSE_ACCEL - #include "wx/accel.h" -#endif // wxUSE_ACCEL - -#if wxUSE_ACCESSIBILITY -#include "wx/access.h" -#endif - -// when building wxUniv/Foo we don't want the code for native menu use to be -// compiled in - it should only be used when building real wxFoo -#ifdef __WXUNIVERSAL__ - #define wxUSE_MENUS_NATIVE 0 -#else // !__WXUNIVERSAL__ - #define wxUSE_MENUS_NATIVE wxUSE_MENUS -#endif // __WXUNIVERSAL__/!__WXUNIVERSAL__ - - -// Define this macro if the corresponding operating system handles the state -// of children windows automatically when the parent is enabled/disabled. -// Otherwise wx itself must ensure that when the parent is disabled its -// children are disabled too, and their initial state is restored when the -// parent is enabled back. -#if defined(__WXMSW__) - // must do everything ourselves - #undef wxHAS_NATIVE_ENABLED_MANAGEMENT -#elif defined(__WXOSX__) - // must do everything ourselves - #undef wxHAS_NATIVE_ENABLED_MANAGEMENT -#else - #define wxHAS_NATIVE_ENABLED_MANAGEMENT -#endif - -// ---------------------------------------------------------------------------- -// forward declarations -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxCaret; -class WXDLLIMPEXP_FWD_CORE wxControl; -class WXDLLIMPEXP_FWD_CORE wxDC; -class WXDLLIMPEXP_FWD_CORE wxDropTarget; -class WXDLLIMPEXP_FWD_CORE wxLayoutConstraints; -class WXDLLIMPEXP_FWD_CORE wxSizer; -class WXDLLIMPEXP_FWD_CORE wxToolTip; -class WXDLLIMPEXP_FWD_CORE wxWindowBase; -class WXDLLIMPEXP_FWD_CORE wxWindow; -class WXDLLIMPEXP_FWD_CORE wxScrollHelper; - -#if wxUSE_ACCESSIBILITY -class WXDLLIMPEXP_FWD_CORE wxAccessible; -#endif - -// ---------------------------------------------------------------------------- -// helper stuff used by wxWindow -// ---------------------------------------------------------------------------- - -// struct containing all the visual attributes of a control -struct WXDLLIMPEXP_CORE wxVisualAttributes -{ - // the font used for control label/text inside it - wxFont font; - - // the foreground colour - wxColour colFg; - - // the background colour, may be wxNullColour if the controls background - // colour is not solid - wxColour colBg; -}; - -// different window variants, on platforms like eg mac uses different -// rendering sizes -enum wxWindowVariant -{ - wxWINDOW_VARIANT_NORMAL, // Normal size - wxWINDOW_VARIANT_SMALL, // Smaller size (about 25 % smaller than normal) - wxWINDOW_VARIANT_MINI, // Mini size (about 33 % smaller than normal) - wxWINDOW_VARIANT_LARGE, // Large size (about 25 % larger than normal) - wxWINDOW_VARIANT_MAX -}; - -#if wxUSE_SYSTEM_OPTIONS - #define wxWINDOW_DEFAULT_VARIANT wxT("window-default-variant") -#endif - -// valid values for Show/HideWithEffect() -enum wxShowEffect -{ - wxSHOW_EFFECT_NONE, - wxSHOW_EFFECT_ROLL_TO_LEFT, - wxSHOW_EFFECT_ROLL_TO_RIGHT, - wxSHOW_EFFECT_ROLL_TO_TOP, - wxSHOW_EFFECT_ROLL_TO_BOTTOM, - wxSHOW_EFFECT_SLIDE_TO_LEFT, - wxSHOW_EFFECT_SLIDE_TO_RIGHT, - wxSHOW_EFFECT_SLIDE_TO_TOP, - wxSHOW_EFFECT_SLIDE_TO_BOTTOM, - wxSHOW_EFFECT_BLEND, - wxSHOW_EFFECT_EXPAND, - wxSHOW_EFFECT_MAX -}; - -// flags for SendSizeEvent() -enum -{ - wxSEND_EVENT_POST = 1 -}; - -// ---------------------------------------------------------------------------- -// (pseudo)template list classes -// ---------------------------------------------------------------------------- - -WX_DECLARE_LIST_3(wxWindow, wxWindowBase, wxWindowList, wxWindowListNode, class WXDLLIMPEXP_CORE); - -// ---------------------------------------------------------------------------- -// global variables -// ---------------------------------------------------------------------------- - -extern WXDLLIMPEXP_DATA_CORE(wxWindowList) wxTopLevelWindows; - -// declared here for compatibility only, main declaration is in wx/app.h -extern WXDLLIMPEXP_DATA_BASE(wxList) wxPendingDelete; - -// ---------------------------------------------------------------------------- -// wxWindowBase is the base class for all GUI controls/widgets, this is the public -// interface of this class. -// -// Event handler: windows have themselves as their event handlers by default, -// but their event handlers could be set to another object entirely. This -// separation can reduce the amount of derivation required, and allow -// alteration of a window's functionality (e.g. by a resource editor that -// temporarily switches event handlers). -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxWindowBase : public wxEvtHandler -{ -public: - // creating the window - // ------------------- - - // default ctor, initializes everything which can be initialized before - // Create() - wxWindowBase() ; - - virtual ~wxWindowBase(); - - // deleting the window - // ------------------- - - // ask the window to close itself, return true if the event handler - // honoured our request - bool Close( bool force = false ); - - // the following functions delete the C++ objects (the window itself - // or its children) as well as the GUI windows and normally should - // never be used directly - - // delete window unconditionally (dangerous!), returns true if ok - virtual bool Destroy(); - // delete all children of this window, returns true if ok - bool DestroyChildren(); - - // is the window being deleted? - bool IsBeingDeleted() const; - - // window attributes - // ----------------- - - // label is just the same as the title (but for, e.g., buttons it - // makes more sense to speak about labels), title access - // is available from wxTLW classes only (frames, dialogs) - virtual void SetLabel(const wxString& label) = 0; - virtual wxString GetLabel() const = 0; - - // the window name is used for ressource setting in X, it is not the - // same as the window title/label - virtual void SetName( const wxString &name ) { m_windowName = name; } - virtual wxString GetName() const { return m_windowName; } - - // sets the window variant, calls internally DoSetVariant if variant - // has changed - void SetWindowVariant(wxWindowVariant variant); - wxWindowVariant GetWindowVariant() const { return m_windowVariant; } - - - // get or change the layout direction (LTR or RTL) for this window, - // wxLayout_Default is returned if layout direction is not supported - virtual wxLayoutDirection GetLayoutDirection() const - { return wxLayout_Default; } - virtual void SetLayoutDirection(wxLayoutDirection WXUNUSED(dir)) - { } - - // mirror coordinates for RTL layout if this window uses it and if the - // mirroring is not done automatically like Win32 - virtual wxCoord AdjustForLayoutDirection(wxCoord x, - wxCoord width, - wxCoord widthTotal) const; - - - // window id uniquely identifies the window among its siblings unless - // it is wxID_ANY which means "don't care" - virtual void SetId( wxWindowID winid ) { m_windowId = winid; } - wxWindowID GetId() const { return m_windowId; } - - // generate a unique id (or count of them consecutively), returns a - // valid id in the auto-id range or wxID_NONE if failed. If using - // autoid management, it will mark the id as reserved until it is - // used (by assigning it to a wxWindowIDRef) or unreserved. - static wxWindowID NewControlId(int count = 1) - { - return wxIdManager::ReserveId(count); - } - - // If an ID generated from NewControlId is not assigned to a wxWindowIDRef, - // it must be unreserved - static void UnreserveControlId(wxWindowID id, int count = 1) - { - wxIdManager::UnreserveId(id, count); - } - - - // moving/resizing - // --------------- - - // set the window size and/or position - void SetSize( int x, int y, int width, int height, - int sizeFlags = wxSIZE_AUTO ) - { DoSetSize(x, y, width, height, sizeFlags); } - - void SetSize( int width, int height ) - { DoSetSize( wxDefaultCoord, wxDefaultCoord, width, height, wxSIZE_USE_EXISTING ); } - - void SetSize( const wxSize& size ) - { SetSize( size.x, size.y); } - - void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO) - { DoSetSize(rect.x, rect.y, rect.width, rect.height, sizeFlags); } - - void Move(int x, int y, int flags = wxSIZE_USE_EXISTING) - { DoSetSize(x, y, wxDefaultCoord, wxDefaultCoord, flags); } - - void Move(const wxPoint& pt, int flags = wxSIZE_USE_EXISTING) - { Move(pt.x, pt.y, flags); } - - void SetPosition(const wxPoint& pt) { Move(pt); } - - // Z-order - virtual void Raise() = 0; - virtual void Lower() = 0; - - // client size is the size of area available for subwindows - void SetClientSize( int width, int height ) - { DoSetClientSize(width, height); } - - void SetClientSize( const wxSize& size ) - { DoSetClientSize(size.x, size.y); } - - void SetClientSize(const wxRect& rect) - { SetClientSize( rect.width, rect.height ); } - - // get the window position (pointers may be NULL): notice that it is in - // client coordinates for child windows and screen coordinates for the - // top level ones, use GetScreenPosition() if you need screen - // coordinates for all kinds of windows - void GetPosition( int *x, int *y ) const { DoGetPosition(x, y); } - wxPoint GetPosition() const - { - int x, y; - DoGetPosition(&x, &y); - - return wxPoint(x, y); - } - - // get the window position in screen coordinates - void GetScreenPosition(int *x, int *y) const { DoGetScreenPosition(x, y); } - wxPoint GetScreenPosition() const - { - int x, y; - DoGetScreenPosition(&x, &y); - - return wxPoint(x, y); - } - - // get the window size (pointers may be NULL) - void GetSize( int *w, int *h ) const { DoGetSize(w, h); } - wxSize GetSize() const - { - int w, h; - DoGetSize(& w, & h); - return wxSize(w, h); - } - - void GetClientSize( int *w, int *h ) const { DoGetClientSize(w, h); } - wxSize GetClientSize() const - { - int w, h; - DoGetClientSize(&w, &h); - - return wxSize(w, h); - } - - // get the position and size at once - wxRect GetRect() const - { - int x, y, w, h; - GetPosition(&x, &y); - GetSize(&w, &h); - - return wxRect(x, y, w, h); - } - - wxRect GetScreenRect() const - { - int x, y, w, h; - GetScreenPosition(&x, &y); - GetSize(&w, &h); - - return wxRect(x, y, w, h); - } - - // get the origin of the client area of the window relative to the - // window top left corner (the client area may be shifted because of - // the borders, scrollbars, other decorations...) - virtual wxPoint GetClientAreaOrigin() const; - - // get the client rectangle in window (i.e. client) coordinates - wxRect GetClientRect() const - { - return wxRect(GetClientAreaOrigin(), GetClientSize()); - } - - // client<->window size conversion - virtual wxSize ClientToWindowSize(const wxSize& size) const; - virtual wxSize WindowToClientSize(const wxSize& size) const; - - // get the size best suited for the window (in fact, minimal - // acceptable size using which it will still look "nice" in - // most situations) - wxSize GetBestSize() const; - - void GetBestSize(int *w, int *h) const - { - wxSize s = GetBestSize(); - if ( w ) - *w = s.x; - if ( h ) - *h = s.y; - } - - // Determine the best size in the other direction if one of them is - // fixed. This is used with windows that can wrap their contents and - // returns input-independent best size for the others. - int GetBestHeight(int width) const; - int GetBestWidth(int height) const; - - - void SetScrollHelper( wxScrollHelper *sh ) { m_scrollHelper = sh; } - wxScrollHelper *GetScrollHelper() { return m_scrollHelper; } - - // reset the cached best size value so it will be recalculated the - // next time it is needed. - void InvalidateBestSize(); - void CacheBestSize(const wxSize& size) const - { wxConstCast(this, wxWindowBase)->m_bestSizeCache = size; } - - - // This function will merge the window's best size into the window's - // minimum size, giving priority to the min size components, and - // returns the results. - virtual wxSize GetEffectiveMinSize() const; - - wxDEPRECATED_MSG("use GetEffectiveMinSize() instead") - wxSize GetBestFittingSize() const; - - // A 'Smart' SetSize that will fill in default size values with 'best' - // size. Sets the minsize to what was passed in. - void SetInitialSize(const wxSize& size=wxDefaultSize); - - wxDEPRECATED_MSG("use SetInitialSize() instead") - void SetBestFittingSize(const wxSize& size=wxDefaultSize); - - - // the generic centre function - centers the window on parent by` - // default or on screen if it doesn't have parent or - // wxCENTER_ON_SCREEN flag is given - void Centre(int dir = wxBOTH) { DoCentre(dir); } - void Center(int dir = wxBOTH) { DoCentre(dir); } - - // centre with respect to the parent window - void CentreOnParent(int dir = wxBOTH) { DoCentre(dir); } - void CenterOnParent(int dir = wxBOTH) { CentreOnParent(dir); } - - // set window size to wrap around its children - virtual void Fit(); - - // set virtual size to satisfy children - virtual void FitInside(); - - - // SetSizeHints is actually for setting the size hints - // for the wxTLW for a Window Manager - hence the name - - // and it is therefore overridden in wxTLW to do that. - // In wxWindow(Base), it has (unfortunately) been abused - // to mean the same as SetMinSize() and SetMaxSize(). - - virtual void SetSizeHints( int minW, int minH, - int maxW = wxDefaultCoord, int maxH = wxDefaultCoord, - int incW = wxDefaultCoord, int incH = wxDefaultCoord ) - { DoSetSizeHints(minW, minH, maxW, maxH, incW, incH); } - - void SetSizeHints( const wxSize& minSize, - const wxSize& maxSize=wxDefaultSize, - const wxSize& incSize=wxDefaultSize) - { DoSetSizeHints(minSize.x, minSize.y, maxSize.x, maxSize.y, incSize.x, incSize.y); } - - -#if WXWIN_COMPATIBILITY_2_8 - // these are useless and do nothing since wxWidgets 2.9 - wxDEPRECATED( virtual void SetVirtualSizeHints( int minW, int minH, - int maxW = wxDefaultCoord, int maxH = wxDefaultCoord ) ); - wxDEPRECATED( void SetVirtualSizeHints( const wxSize& minSize, - const wxSize& maxSize=wxDefaultSize) ); -#endif // WXWIN_COMPATIBILITY_2_8 - - - // Call these to override what GetBestSize() returns. This - // method is only virtual because it is overridden in wxTLW - // as a different API for SetSizeHints(). - virtual void SetMinSize(const wxSize& minSize); - virtual void SetMaxSize(const wxSize& maxSize); - - // Like Set*Size, but for client, not window, size - virtual void SetMinClientSize(const wxSize& size) - { SetMinSize(ClientToWindowSize(size)); } - virtual void SetMaxClientSize(const wxSize& size) - { SetMaxSize(ClientToWindowSize(size)); } - - // Override these methods to impose restrictions on min/max size. - // The easier way is to call SetMinSize() and SetMaxSize() which - // will have the same effect. Doing both is non-sense. - virtual wxSize GetMinSize() const { return wxSize(m_minWidth, m_minHeight); } - virtual wxSize GetMaxSize() const { return wxSize(m_maxWidth, m_maxHeight); } - - // Like Get*Size, but for client, not window, size - virtual wxSize GetMinClientSize() const - { return WindowToClientSize(GetMinSize()); } - virtual wxSize GetMaxClientSize() const - { return WindowToClientSize(GetMaxSize()); } - - // Get the min and max values one by one - int GetMinWidth() const { return GetMinSize().x; } - int GetMinHeight() const { return GetMinSize().y; } - int GetMaxWidth() const { return GetMaxSize().x; } - int GetMaxHeight() const { return GetMaxSize().y; } - - - // Methods for accessing the virtual size of a window. For most - // windows this is just the client area of the window, but for - // some like scrolled windows it is more or less independent of - // the screen window size. You may override the DoXXXVirtual - // methods below for classes where that is the case. - - void SetVirtualSize( const wxSize &size ) { DoSetVirtualSize( size.x, size.y ); } - void SetVirtualSize( int x, int y ) { DoSetVirtualSize( x, y ); } - - wxSize GetVirtualSize() const { return DoGetVirtualSize(); } - void GetVirtualSize( int *x, int *y ) const - { - wxSize s( DoGetVirtualSize() ); - - if( x ) - *x = s.GetWidth(); - if( y ) - *y = s.GetHeight(); - } - - // Override these methods for windows that have a virtual size - // independent of their client size. eg. the virtual area of a - // wxScrolledWindow. - - virtual void DoSetVirtualSize( int x, int y ); - virtual wxSize DoGetVirtualSize() const; - - // Return the largest of ClientSize and BestSize (as determined - // by a sizer, interior children, or other means) - - virtual wxSize GetBestVirtualSize() const - { - wxSize client( GetClientSize() ); - wxSize best( GetBestSize() ); - - return wxSize( wxMax( client.x, best.x ), wxMax( client.y, best.y ) ); - } - - // returns the magnification of the content of this window - // eg 2.0 for a window on a retina screen - virtual double GetContentScaleFactor() const; - - // return the size of the left/right and top/bottom borders in x and y - // components of the result respectively - virtual wxSize GetWindowBorderSize() const; - - // wxSizer and friends use this to give a chance to a component to recalc - // its min size once one of the final size components is known. Override - // this function when that is useful (such as for wxStaticText which can - // stretch over several lines). Parameter availableOtherDir - // tells the item how much more space there is available in the opposite - // direction (-1 if unknown). - virtual bool - InformFirstDirection(int direction, int size, int availableOtherDir); - - // sends a size event to the window using its current size -- this has an - // effect of refreshing the window layout - // - // by default the event is sent, i.e. processed immediately, but if flags - // value includes wxSEND_EVENT_POST then it's posted, i.e. only schedule - // for later processing - virtual void SendSizeEvent(int flags = 0); - - // this is a safe wrapper for GetParent()->SendSizeEvent(): it checks that - // we have a parent window and it's not in process of being deleted - // - // this is used by controls such as tool/status bars changes to which must - // also result in parent re-layout - void SendSizeEventToParent(int flags = 0); - - // this is a more readable synonym for SendSizeEvent(wxSEND_EVENT_POST) - void PostSizeEvent() { SendSizeEvent(wxSEND_EVENT_POST); } - - // this is the same as SendSizeEventToParent() but using PostSizeEvent() - void PostSizeEventToParent() { SendSizeEventToParent(wxSEND_EVENT_POST); } - - // These functions should be used before repositioning the children of - // this window to reduce flicker or, in MSW case, even avoid display - // corruption in some situations (so they're more than just optimization). - // - // EndRepositioningChildren() should be called if and only if - // BeginRepositioningChildren() returns true. To ensure that this is always - // done automatically, use ChildrenRepositioningGuard class below. - virtual bool BeginRepositioningChildren() { return false; } - virtual void EndRepositioningChildren() { } - - // A simple helper which ensures that EndRepositioningChildren() is called - // from its dtor if and only if calling BeginRepositioningChildren() from - // the ctor returned true. - class ChildrenRepositioningGuard - { - public: - // Notice that window can be NULL here, for convenience. In this case - // this class simply doesn't do anything. - wxEXPLICIT ChildrenRepositioningGuard(wxWindowBase* win) - : m_win(win), - m_callEnd(win && win->BeginRepositioningChildren()) - { - } - - ~ChildrenRepositioningGuard() - { - if ( m_callEnd ) - m_win->EndRepositioningChildren(); - } - - private: - wxWindowBase* const m_win; - const bool m_callEnd; - - wxDECLARE_NO_COPY_CLASS(ChildrenRepositioningGuard); - }; - - - // window state - // ------------ - - // returns true if window was shown/hidden, false if the nothing was - // done (window was already shown/hidden) - virtual bool Show( bool show = true ); - bool Hide() { return Show(false); } - - // show or hide the window with a special effect, not implemented on - // most platforms (where it is the same as Show()/Hide() respectively) - // - // timeout specifies how long the animation should take, in ms, the - // default value of 0 means to use the default (system-dependent) value - virtual bool ShowWithEffect(wxShowEffect WXUNUSED(effect), - unsigned WXUNUSED(timeout) = 0) - { - return Show(); - } - - virtual bool HideWithEffect(wxShowEffect WXUNUSED(effect), - unsigned WXUNUSED(timeout) = 0) - { - return Hide(); - } - - // returns true if window was enabled/disabled, false if nothing done - virtual bool Enable( bool enable = true ); - bool Disable() { return Enable(false); } - - virtual bool IsShown() const { return m_isShown; } - // returns true if the window is really enabled and false otherwise, - // whether because it had been explicitly disabled itself or because - // its parent is currently disabled -- then this method returns false - // whatever is the intrinsic state of this window, use IsThisEnabled(0 - // to retrieve it. In other words, this relation always holds: - // - // IsEnabled() == IsThisEnabled() && parent.IsEnabled() - // - bool IsEnabled() const; - - // returns the internal window state independently of the parent(s) - // state, i.e. the state in which the window would be if all its - // parents were enabled (use IsEnabled() above to get the effective - // window state) - bool IsThisEnabled() const { return m_isEnabled; } - - // returns true if the window is visible, i.e. IsShown() returns true - // if called on it and all its parents up to the first TLW - virtual bool IsShownOnScreen() const; - - // get/set window style (setting style won't update the window and so - // is only useful for internal usage) - virtual void SetWindowStyleFlag( long style ) { m_windowStyle = style; } - virtual long GetWindowStyleFlag() const { return m_windowStyle; } - - // just some (somewhat shorter) synonyms - void SetWindowStyle( long style ) { SetWindowStyleFlag(style); } - long GetWindowStyle() const { return GetWindowStyleFlag(); } - - // check if the flag is set - bool HasFlag(int flag) const { return (m_windowStyle & flag) != 0; } - virtual bool IsRetained() const { return HasFlag(wxRETAINED); } - - // turn the flag on if it had been turned off before and vice versa, - // return true if the flag is currently turned on - bool ToggleWindowStyle(int flag); - - // extra style: the less often used style bits which can't be set with - // SetWindowStyleFlag() - virtual void SetExtraStyle(long exStyle) { m_exStyle = exStyle; } - long GetExtraStyle() const { return m_exStyle; } - - bool HasExtraStyle(int exFlag) const { return (m_exStyle & exFlag) != 0; } - -#if WXWIN_COMPATIBILITY_2_8 - // make the window modal (all other windows unresponsive) - wxDEPRECATED( virtual void MakeModal(bool modal = true) ); -#endif - - // (primitive) theming support - // --------------------------- - - virtual void SetThemeEnabled(bool enableTheme) { m_themeEnabled = enableTheme; } - virtual bool GetThemeEnabled() const { return m_themeEnabled; } - - - // focus and keyboard handling - // --------------------------- - - // set focus to this window - virtual void SetFocus() = 0; - - // set focus to this window as the result of a keyboard action - virtual void SetFocusFromKbd() { SetFocus(); } - - // return the window which currently has the focus or NULL - static wxWindow *FindFocus(); - - static wxWindow *DoFindFocus() /* = 0: implement in derived classes */; - - // return true if the window has focus (handles composite windows - // correctly - returns true if GetMainWindowOfCompositeControl() - // has focus) - virtual bool HasFocus() const; - - // can this window have focus in principle? - // - // the difference between AcceptsFocus[FromKeyboard]() and CanAcceptFocus - // [FromKeyboard]() is that the former functions are meant to be - // overridden in the derived classes to simply return false if the - // control can't have focus, while the latter are meant to be used by - // this class clients and take into account the current window state - virtual bool AcceptsFocus() const { return true; } - - // can this window or one of its children accept focus? - // - // usually it's the same as AcceptsFocus() but is overridden for - // container windows - virtual bool AcceptsFocusRecursively() const { return AcceptsFocus(); } - - // can this window be given focus by keyboard navigation? if not, the - // only way to give it focus (provided it accepts it at all) is to - // click it - virtual bool AcceptsFocusFromKeyboard() const { return AcceptsFocus(); } - - - // Can this window be focused right now, in its current state? This - // shouldn't be called at all if AcceptsFocus() returns false. - // - // It is a convenient helper for the various functions using it below - // but also a hook allowing to override the default logic for some rare - // cases (currently just wxRadioBox in wxMSW) when it's inappropriate. - virtual bool CanBeFocused() const { return IsShown() && IsEnabled(); } - - // can this window itself have focus? - bool IsFocusable() const { return AcceptsFocus() && CanBeFocused(); } - - // can this window have focus right now? - // - // if this method returns true, it means that calling SetFocus() will - // put focus either to this window or one of its children, if you need - // to know whether this window accepts focus itself, use IsFocusable() - bool CanAcceptFocus() const - { return AcceptsFocusRecursively() && CanBeFocused(); } - - // can this window be assigned focus from keyboard right now? - bool CanAcceptFocusFromKeyboard() const - { return AcceptsFocusFromKeyboard() && CanBeFocused(); } - - // call this when the return value of AcceptsFocus() changes - virtual void SetCanFocus(bool WXUNUSED(canFocus)) { } - - // navigates inside this window - bool NavigateIn(int flags = wxNavigationKeyEvent::IsForward) - { return DoNavigateIn(flags); } - - // navigates in the specified direction from this window, this is - // equivalent to GetParent()->NavigateIn() - bool Navigate(int flags = wxNavigationKeyEvent::IsForward) - { return m_parent && ((wxWindowBase *)m_parent)->DoNavigateIn(flags); } - - // this function will generate the appropriate call to Navigate() if the - // key event is one normally used for keyboard navigation and return true - // in this case - bool HandleAsNavigationKey(const wxKeyEvent& event); - - // move this window just before/after the specified one in tab order - // (the other window must be our sibling!) - void MoveBeforeInTabOrder(wxWindow *win) - { DoMoveInTabOrder(win, OrderBefore); } - void MoveAfterInTabOrder(wxWindow *win) - { DoMoveInTabOrder(win, OrderAfter); } - - - // parent/children relations - // ------------------------- - - // get the list of children - const wxWindowList& GetChildren() const { return m_children; } - wxWindowList& GetChildren() { return m_children; } - - // needed just for extended runtime - const wxWindowList& GetWindowChildren() const { return GetChildren() ; } - - // get the window before/after this one in the parents children list, - // returns NULL if this is the first/last window - wxWindow *GetPrevSibling() const { return DoGetSibling(OrderBefore); } - wxWindow *GetNextSibling() const { return DoGetSibling(OrderAfter); } - - // get the parent or the parent of the parent - wxWindow *GetParent() const { return m_parent; } - inline wxWindow *GetGrandParent() const; - - // is this window a top level one? - virtual bool IsTopLevel() const; - - // is this window a child or grand child of this one (inside the same - // TLW)? - bool IsDescendant(wxWindowBase* win) const; - - // it doesn't really change parent, use Reparent() instead - void SetParent( wxWindowBase *parent ); - // change the real parent of this window, return true if the parent - // was changed, false otherwise (error or newParent == oldParent) - virtual bool Reparent( wxWindowBase *newParent ); - - // implementation mostly - virtual void AddChild( wxWindowBase *child ); - virtual void RemoveChild( wxWindowBase *child ); - - // returns true if the child is in the client area of the window, i.e. is - // not scrollbar, toolbar etc. - virtual bool IsClientAreaChild(const wxWindow *WXUNUSED(child)) const - { return true; } - - // looking for windows - // ------------------- - - // find window among the descendants of this one either by id or by - // name (return NULL if not found) - wxWindow *FindWindow(long winid) const; - wxWindow *FindWindow(const wxString& name) const; - - // Find a window among any window (all return NULL if not found) - static wxWindow *FindWindowById( long winid, const wxWindow *parent = NULL ); - static wxWindow *FindWindowByName( const wxString& name, - const wxWindow *parent = NULL ); - static wxWindow *FindWindowByLabel( const wxString& label, - const wxWindow *parent = NULL ); - - // event handler stuff - // ------------------- - - // get the current event handler - wxEvtHandler *GetEventHandler() const { return m_eventHandler; } - - // replace the event handler (allows to completely subclass the - // window) - void SetEventHandler( wxEvtHandler *handler ); - - // push/pop event handler: allows to chain a custom event handler to - // alreasy existing ones - void PushEventHandler( wxEvtHandler *handler ); - wxEvtHandler *PopEventHandler( bool deleteHandler = false ); - - // find the given handler in the event handler chain and remove (but - // not delete) it from the event handler chain, return true if it was - // found and false otherwise (this also results in an assert failure so - // this function should only be called when the handler is supposed to - // be there) - bool RemoveEventHandler(wxEvtHandler *handler); - - // Process an event by calling GetEventHandler()->ProcessEvent(): this - // is a straightforward replacement for ProcessEvent() itself which - // shouldn't be used directly with windows as it doesn't take into - // account any event handlers associated with the window - bool ProcessWindowEvent(wxEvent& event) - { return GetEventHandler()->ProcessEvent(event); } - - // Call GetEventHandler()->ProcessEventLocally(): this should be used - // instead of calling ProcessEventLocally() directly on the window - // itself as this wouldn't take any pushed event handlers into account - // correctly - bool ProcessWindowEventLocally(wxEvent& event) - { return GetEventHandler()->ProcessEventLocally(event); } - - // Process an event by calling GetEventHandler()->ProcessEvent() and - // handling any exceptions thrown by event handlers. It's mostly useful - // when processing wx events when called from C code (e.g. in GTK+ - // callback) when the exception wouldn't correctly propagate to - // wxEventLoop. - bool HandleWindowEvent(wxEvent& event) const; - - // disable wxEvtHandler double-linked list mechanism: - virtual void SetNextHandler(wxEvtHandler *handler) wxOVERRIDE; - virtual void SetPreviousHandler(wxEvtHandler *handler) wxOVERRIDE; - - -protected: - - // NOTE: we change the access specifier of the following wxEvtHandler functions - // so that the user won't be able to call them directly. - // Calling wxWindow::ProcessEvent in fact only works when there are NO - // event handlers pushed on the window. - // To ensure correct operation, instead of wxWindow::ProcessEvent - // you must always call wxWindow::GetEventHandler()->ProcessEvent() - // or HandleWindowEvent(). - // The same holds for all other wxEvtHandler functions. - - using wxEvtHandler::ProcessEvent; - using wxEvtHandler::ProcessEventLocally; -#if wxUSE_THREADS - using wxEvtHandler::ProcessThreadEvent; -#endif - using wxEvtHandler::SafelyProcessEvent; - using wxEvtHandler::ProcessPendingEvents; - using wxEvtHandler::AddPendingEvent; - using wxEvtHandler::QueueEvent; - -public: - - // validators - // ---------- - -#if wxUSE_VALIDATORS - // a window may have an associated validator which is used to control - // user input - virtual void SetValidator( const wxValidator &validator ); - virtual wxValidator *GetValidator() { return m_windowValidator; } -#endif // wxUSE_VALIDATORS - - - // dialog oriented functions - // ------------------------- - - // validate the correctness of input, return true if ok - virtual bool Validate(); - - // transfer data between internal and GUI representations - virtual bool TransferDataToWindow(); - virtual bool TransferDataFromWindow(); - - virtual void InitDialog(); - -#if wxUSE_ACCEL - // accelerators - // ------------ - virtual void SetAcceleratorTable( const wxAcceleratorTable& accel ) - { m_acceleratorTable = accel; } - wxAcceleratorTable *GetAcceleratorTable() - { return &m_acceleratorTable; } - -#endif // wxUSE_ACCEL - -#if wxUSE_HOTKEY - // hot keys (system wide accelerators) - // ----------------------------------- - - virtual bool RegisterHotKey(int hotkeyId, int modifiers, int keycode); - virtual bool UnregisterHotKey(int hotkeyId); -#endif // wxUSE_HOTKEY - - - // translation between different units - // ----------------------------------- - - // DPI-independent pixels, or DIPs, are pixel values for the standard - // 96 DPI display, they are scaled to take the current resolution into - // account (i.e. multiplied by the same factor as returned by - // GetContentScaleFactor()) if necessary for the current platform. - // - // Currently the conversion factor is the same for all windows but this - // will change with the monitor-specific resolution support in the - // future, so prefer using the non-static member functions. - // - // Similarly, currently in practice the factor is the same in both - // horizontal and vertical directions, but this could, in principle, - // change too, so prefer using the overloads taking wxPoint or wxSize. - - static wxSize FromDIP(const wxSize& sz, const wxWindowBase* w); - static wxPoint FromDIP(const wxPoint& pt, const wxWindowBase* w) - { - const wxSize sz = FromDIP(wxSize(pt.x, pt.y), w); - return wxPoint(sz.x, sz.y); - } - static int FromDIP(int d, const wxWindowBase* w) - { - return FromDIP(wxSize(d, 0), w).x; - } - - wxSize FromDIP(const wxSize& sz) const { return FromDIP(sz, this); } - wxPoint FromDIP(const wxPoint& pt) const { return FromDIP(pt, this); } - int FromDIP(int d) const { return FromDIP(d, this); } - - static wxSize ToDIP(const wxSize& sz, const wxWindowBase* w); - static wxPoint ToDIP(const wxPoint& pt, const wxWindowBase* w) - { - const wxSize sz = ToDIP(wxSize(pt.x, pt.y), w); - return wxPoint(sz.x, sz.y); - } - static int ToDIP(int d, const wxWindowBase* w) - { - return ToDIP(wxSize(d, 0), w).x; - } - - wxSize ToDIP(const wxSize& sz) const { return ToDIP(sz, this); } - wxPoint ToDIP(const wxPoint& pt) const { return ToDIP(pt, this); } - int ToDIP(int d) const { return ToDIP(d, this); } - - - // Dialog units are based on the size of the current font. - - wxPoint ConvertPixelsToDialog( const wxPoint& pt ) const; - wxPoint ConvertDialogToPixels( const wxPoint& pt ) const; - wxSize ConvertPixelsToDialog( const wxSize& sz ) const - { - wxPoint pt(ConvertPixelsToDialog(wxPoint(sz.x, sz.y))); - - return wxSize(pt.x, pt.y); - } - - wxSize ConvertDialogToPixels( const wxSize& sz ) const - { - wxPoint pt(ConvertDialogToPixels(wxPoint(sz.x, sz.y))); - - return wxSize(pt.x, pt.y); - } - - // mouse functions - // --------------- - - // move the mouse to the specified position - virtual void WarpPointer(int x, int y) = 0; - - // start or end mouse capture, these functions maintain the stack of - // windows having captured the mouse and after calling ReleaseMouse() - // the mouse is not released but returns to the window which had had - // captured it previously (if any) - void CaptureMouse(); - void ReleaseMouse(); - - // get the window which currently captures the mouse or NULL - static wxWindow *GetCapture(); - - // does this window have the capture? - virtual bool HasCapture() const - { return (wxWindow *)this == GetCapture(); } - - // painting the window - // ------------------- - - // mark the specified rectangle (or the whole window) as "dirty" so it - // will be repainted - virtual void Refresh( bool eraseBackground = true, - const wxRect *rect = (const wxRect *) NULL ) = 0; - - // a less awkward wrapper for Refresh - void RefreshRect(const wxRect& rect, bool eraseBackground = true) - { - Refresh(eraseBackground, &rect); - } - - // repaint all invalid areas of the window immediately - virtual void Update() { } - - // clear the window background - virtual void ClearBackground(); - - // freeze the window: don't redraw it until it is thawed - void Freeze(); - - // thaw the window: redraw it after it had been frozen - void Thaw(); - - // return true if window had been frozen and not unthawed yet - bool IsFrozen() const { return m_freezeCount != 0; } - - // adjust DC for drawing on this window - virtual void PrepareDC( wxDC & WXUNUSED(dc) ) { } - - // return true if the window contents is double buffered by the system - virtual bool IsDoubleBuffered() const { return false; } - - // the update region of the window contains the areas which must be - // repainted by the program - const wxRegion& GetUpdateRegion() const { return m_updateRegion; } - wxRegion& GetUpdateRegion() { return m_updateRegion; } - - // get the update rectangleregion bounding box in client coords - wxRect GetUpdateClientRect() const; - - // these functions verify whether the given point/rectangle belongs to - // (or at least intersects with) the update region - virtual bool DoIsExposed( int x, int y ) const; - virtual bool DoIsExposed( int x, int y, int w, int h ) const; - - bool IsExposed( int x, int y ) const - { return DoIsExposed(x, y); } - bool IsExposed( int x, int y, int w, int h ) const - { return DoIsExposed(x, y, w, h); } - bool IsExposed( const wxPoint& pt ) const - { return DoIsExposed(pt.x, pt.y); } - bool IsExposed( const wxRect& rect ) const - { return DoIsExposed(rect.x, rect.y, rect.width, rect.height); } - - // colours, fonts and cursors - // -------------------------- - - // get the default attributes for the controls of this class: we - // provide a virtual function which can be used to query the default - // attributes of an existing control and a static function which can - // be used even when no existing object of the given class is - // available, but which won't return any styles specific to this - // particular control, of course (e.g. "Ok" button might have - // different -- bold for example -- font) - virtual wxVisualAttributes GetDefaultAttributes() const - { - return GetClassDefaultAttributes(GetWindowVariant()); - } - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - // set/retrieve the window colours (system defaults are used by - // default): SetXXX() functions return true if colour was changed, - // SetDefaultXXX() reset the "m_inheritXXX" flag after setting the - // value to prevent it from being inherited by our children - virtual bool SetBackgroundColour(const wxColour& colour); - void SetOwnBackgroundColour(const wxColour& colour) - { - if ( SetBackgroundColour(colour) ) - m_inheritBgCol = false; - } - wxColour GetBackgroundColour() const; - bool InheritsBackgroundColour() const - { - return m_inheritBgCol; - } - bool UseBgCol() const - { - return m_hasBgCol; - } - - virtual bool SetForegroundColour(const wxColour& colour); - void SetOwnForegroundColour(const wxColour& colour) - { - if ( SetForegroundColour(colour) ) - m_inheritFgCol = false; - } - wxColour GetForegroundColour() const; - - // Set/get the background style. - virtual bool SetBackgroundStyle(wxBackgroundStyle style); - wxBackgroundStyle GetBackgroundStyle() const - { return m_backgroundStyle; } - - // returns true if the control has "transparent" areas such as a - // wxStaticText and wxCheckBox and the background should be adapted - // from a parent window - virtual bool HasTransparentBackground() { return false; } - - // Returns true if background transparency is supported for this - // window, i.e. if calling SetBackgroundStyle(wxBG_STYLE_TRANSPARENT) - // has a chance of succeeding. If reason argument is non-NULL, returns a - // user-readable explanation of why it isn't supported if the return - // value is false. - virtual bool IsTransparentBackgroundSupported(wxString* reason = NULL) const; - - // set/retrieve the font for the window (SetFont() returns true if the - // font really changed) - virtual bool SetFont(const wxFont& font) = 0; - void SetOwnFont(const wxFont& font) - { - if ( SetFont(font) ) - m_inheritFont = false; - } - wxFont GetFont() const; - - // set/retrieve the cursor for this window (SetCursor() returns true - // if the cursor was really changed) - virtual bool SetCursor( const wxCursor &cursor ); - const wxCursor& GetCursor() const { return m_cursor; } - -#if wxUSE_CARET - // associate a caret with the window - void SetCaret(wxCaret *caret); - // get the current caret (may be NULL) - wxCaret *GetCaret() const { return m_caret; } -#endif // wxUSE_CARET - - // get the (average) character size for the current font - virtual int GetCharHeight() const = 0; - virtual int GetCharWidth() const = 0; - - // get the width/height/... of the text using current or specified - // font - void GetTextExtent(const wxString& string, - int *x, int *y, - int *descent = NULL, - int *externalLeading = NULL, - const wxFont *font = NULL) const - { - DoGetTextExtent(string, x, y, descent, externalLeading, font); - } - - wxSize GetTextExtent(const wxString& string) const - { - wxCoord w, h; - GetTextExtent(string, &w, &h); - return wxSize(w, h); - } - - // client <-> screen coords - // ------------------------ - - // translate to/from screen/client coordinates (pointers may be NULL) - void ClientToScreen( int *x, int *y ) const - { DoClientToScreen(x, y); } - void ScreenToClient( int *x, int *y ) const - { DoScreenToClient(x, y); } - - // wxPoint interface to do the same thing - wxPoint ClientToScreen(const wxPoint& pt) const - { - int x = pt.x, y = pt.y; - DoClientToScreen(&x, &y); - - return wxPoint(x, y); - } - - wxPoint ScreenToClient(const wxPoint& pt) const - { - int x = pt.x, y = pt.y; - DoScreenToClient(&x, &y); - - return wxPoint(x, y); - } - - // test where the given (in client coords) point lies - wxHitTest HitTest(wxCoord x, wxCoord y) const - { return DoHitTest(x, y); } - - wxHitTest HitTest(const wxPoint& pt) const - { return DoHitTest(pt.x, pt.y); } - - // misc - // ---- - - // get the window border style from the given flags: this is different from - // simply doing flags & wxBORDER_MASK because it uses GetDefaultBorder() to - // translate wxBORDER_DEFAULT to something reasonable - wxBorder GetBorder(long flags) const; - - // get border for the flags of this window - wxBorder GetBorder() const { return GetBorder(GetWindowStyleFlag()); } - - // send wxUpdateUIEvents to this window, and children if recurse is true - virtual void UpdateWindowUI(long flags = wxUPDATE_UI_NONE); - - // do the window-specific processing after processing the update event - virtual void DoUpdateWindowUI(wxUpdateUIEvent& event) ; - -#if wxUSE_MENUS - // show popup menu at the given position, generate events for the items - // selected in it - bool PopupMenu(wxMenu *menu, const wxPoint& pos = wxDefaultPosition) - { return PopupMenu(menu, pos.x, pos.y); } - bool PopupMenu(wxMenu *menu, int x, int y); - - // simply return the id of the selected item or wxID_NONE without - // generating any events - int GetPopupMenuSelectionFromUser(wxMenu& menu, - const wxPoint& pos = wxDefaultPosition) - { return DoGetPopupMenuSelectionFromUser(menu, pos.x, pos.y); } - int GetPopupMenuSelectionFromUser(wxMenu& menu, int x, int y) - { return DoGetPopupMenuSelectionFromUser(menu, x, y); } -#endif // wxUSE_MENUS - - // override this method to return true for controls having multiple pages - virtual bool HasMultiplePages() const { return false; } - - - // scrollbars - // ---------- - - // can the window have the scrollbar in this orientation? - virtual bool CanScroll(int orient) const; - - // does the window have the scrollbar in this orientation? - bool HasScrollbar(int orient) const; - - // configure the window scrollbars - virtual void SetScrollbar( int orient, - int pos, - int thumbvisible, - int range, - bool refresh = true ) = 0; - virtual void SetScrollPos( int orient, int pos, bool refresh = true ) = 0; - virtual int GetScrollPos( int orient ) const = 0; - virtual int GetScrollThumb( int orient ) const = 0; - virtual int GetScrollRange( int orient ) const = 0; - - // scroll window to the specified position - virtual void ScrollWindow( int dx, int dy, - const wxRect* rect = NULL ) = 0; - - // scrolls window by line/page: note that not all controls support this - // - // return true if the position changed, false otherwise - virtual bool ScrollLines(int WXUNUSED(lines)) { return false; } - virtual bool ScrollPages(int WXUNUSED(pages)) { return false; } - - // convenient wrappers for ScrollLines/Pages - bool LineUp() { return ScrollLines(-1); } - bool LineDown() { return ScrollLines(1); } - bool PageUp() { return ScrollPages(-1); } - bool PageDown() { return ScrollPages(1); } - - // call this to always show one or both scrollbars, even if the window - // is big enough to not require them - virtual void AlwaysShowScrollbars(bool WXUNUSED(horz) = true, - bool WXUNUSED(vert) = true) - { - } - - // return true if AlwaysShowScrollbars() had been called before for the - // corresponding orientation - virtual bool IsScrollbarAlwaysShown(int WXUNUSED(orient)) const - { - return false; - } - - // context-sensitive help - // ---------------------- - - // these are the convenience functions wrapping wxHelpProvider methods - -#if wxUSE_HELP - // associate this help text with this window - void SetHelpText(const wxString& text); - -#if WXWIN_COMPATIBILITY_2_8 - // Associate this help text with all windows with the same id as this one. - // Don't use this, do wxHelpProvider::Get()->AddHelp(id, text); - wxDEPRECATED( void SetHelpTextForId(const wxString& text) ); -#endif // WXWIN_COMPATIBILITY_2_8 - - // get the help string associated with the given position in this window - // - // notice that pt may be invalid if event origin is keyboard or unknown - // and this method should return the global window help text then - virtual wxString GetHelpTextAtPoint(const wxPoint& pt, - wxHelpEvent::Origin origin) const; - // returns the position-independent help text - wxString GetHelpText() const - { - return GetHelpTextAtPoint(wxDefaultPosition, wxHelpEvent::Origin_Unknown); - } - -#else // !wxUSE_HELP - // silently ignore SetHelpText() calls - void SetHelpText(const wxString& WXUNUSED(text)) { } - void SetHelpTextForId(const wxString& WXUNUSED(text)) { } -#endif // wxUSE_HELP - - // tooltips - // -------- - -#if wxUSE_TOOLTIPS - // the easiest way to set a tooltip for a window is to use this method - void SetToolTip( const wxString &tip ) { DoSetToolTipText(tip); } - // attach a tooltip to the window, pointer can be NULL to remove - // existing tooltip - void SetToolTip( wxToolTip *tip ) { DoSetToolTip(tip); } - // more readable synonym for SetToolTip(NULL) - void UnsetToolTip() { SetToolTip(NULL); } - // get the associated tooltip or NULL if none - wxToolTip* GetToolTip() const { return m_tooltip; } - wxString GetToolTipText() const; - - // Use the same tool tip as the given one (which can be NULL to indicate - // that no tooltip should be used) for this window. This is currently only - // used by wxCompositeWindow::DoSetToolTip() implementation and is not part - // of the public wx API. - // - // Returns true if tip was valid and we copied it or false if it was NULL - // and we reset our own tooltip too. - bool CopyToolTip(wxToolTip *tip); -#else // !wxUSE_TOOLTIPS - // make it much easier to compile apps in an environment - // that doesn't support tooltips - void SetToolTip(const wxString & WXUNUSED(tip)) { } - void UnsetToolTip() { } -#endif // wxUSE_TOOLTIPS/!wxUSE_TOOLTIPS - - // drag and drop - // ------------- -#if wxUSE_DRAG_AND_DROP - // set/retrieve the drop target associated with this window (may be - // NULL; it's owned by the window and will be deleted by it) - virtual void SetDropTarget( wxDropTarget *dropTarget ) = 0; - virtual wxDropTarget *GetDropTarget() const { return m_dropTarget; } - - // Accept files for dragging - virtual void DragAcceptFiles(bool accept) -#ifdef __WXMSW__ - // it does have common implementation but not for MSW which has its own - // native version of it - = 0 -#endif // __WXMSW__ - ; - -#endif // wxUSE_DRAG_AND_DROP - - // constraints and sizers - // ---------------------- -#if wxUSE_CONSTRAINTS - // set the constraints for this window or retrieve them (may be NULL) - void SetConstraints( wxLayoutConstraints *constraints ); - wxLayoutConstraints *GetConstraints() const { return m_constraints; } - - // implementation only - void UnsetConstraints(wxLayoutConstraints *c); - wxWindowList *GetConstraintsInvolvedIn() const - { return m_constraintsInvolvedIn; } - void AddConstraintReference(wxWindowBase *otherWin); - void RemoveConstraintReference(wxWindowBase *otherWin); - void DeleteRelatedConstraints(); - void ResetConstraints(); - - // these methods may be overridden for special layout algorithms - virtual void SetConstraintSizes(bool recurse = true); - virtual bool LayoutPhase1(int *noChanges); - virtual bool LayoutPhase2(int *noChanges); - virtual bool DoPhase(int phase); - - // these methods are virtual but normally won't be overridden - virtual void SetSizeConstraint(int x, int y, int w, int h); - virtual void MoveConstraint(int x, int y); - virtual void GetSizeConstraint(int *w, int *h) const ; - virtual void GetClientSizeConstraint(int *w, int *h) const ; - virtual void GetPositionConstraint(int *x, int *y) const ; - -#endif // wxUSE_CONSTRAINTS - - // when using constraints or sizers, it makes sense to update - // children positions automatically whenever the window is resized - // - this is done if autoLayout is on - void SetAutoLayout( bool autoLayout ) { m_autoLayout = autoLayout; } - bool GetAutoLayout() const { return m_autoLayout; } - - // lay out the window and its children - virtual bool Layout(); - - // sizers - void SetSizer(wxSizer *sizer, bool deleteOld = true ); - void SetSizerAndFit( wxSizer *sizer, bool deleteOld = true ); - - wxSizer *GetSizer() const { return m_windowSizer; } - - // Track if this window is a member of a sizer - void SetContainingSizer(wxSizer* sizer); - wxSizer *GetContainingSizer() const { return m_containingSizer; } - - // accessibility - // ---------------------- -#if wxUSE_ACCESSIBILITY - // Override to create a specific accessible object. - virtual wxAccessible* CreateAccessible(); - - // Sets the accessible object. - void SetAccessible(wxAccessible* accessible) ; - - // Returns the accessible object. - wxAccessible* GetAccessible() { return m_accessible; } - - // Returns the accessible object, creating if necessary. - wxAccessible* GetOrCreateAccessible() ; -#endif - - - // Set window transparency if the platform supports it - virtual bool SetTransparent(wxByte WXUNUSED(alpha)) { return false; } - virtual bool CanSetTransparent() { return false; } - - - // implementation - // -------------- - - // event handlers - void OnSysColourChanged( wxSysColourChangedEvent& event ); - void OnInitDialog( wxInitDialogEvent &event ); - void OnMiddleClick( wxMouseEvent& event ); -#if wxUSE_HELP - void OnHelp(wxHelpEvent& event); -#endif // wxUSE_HELP - - // virtual function for implementing internal idle - // behaviour - virtual void OnInternalIdle(); - - // Send idle event to window and all subwindows - // Returns true if more idle time is requested. - virtual bool SendIdleEvents(wxIdleEvent& event); - - // get the handle of the window for the underlying window system: this - // is only used for wxWin itself or for user code which wants to call - // platform-specific APIs - virtual WXWidget GetHandle() const = 0; - // associate the window with a new native handle - virtual void AssociateHandle(WXWidget WXUNUSED(handle)) { } - // dissociate the current native handle from the window - virtual void DissociateHandle() { } - -#if wxUSE_PALETTE - // Store the palette used by DCs in wxWindow so that the dcs can share - // a palette. And we can respond to palette messages. - wxPalette GetPalette() const { return m_palette; } - - // When palette is changed tell the DC to set the system palette to the - // new one. - void SetPalette(const wxPalette& pal); - - // return true if we have a specific palette - bool HasCustomPalette() const { return m_hasCustomPalette; } - - // return the first parent window with a custom palette or NULL - wxWindow *GetAncestorWithCustomPalette() const; -#endif // wxUSE_PALETTE - - // inherit the parents visual attributes if they had been explicitly set - // by the user (i.e. we don't inherit default attributes) and if we don't - // have our own explicitly set - virtual void InheritAttributes(); - - // returns false from here if this window doesn't want to inherit the - // parents colours even if InheritAttributes() would normally do it - // - // this just provides a simple way to customize InheritAttributes() - // behaviour in the most common case - virtual bool ShouldInheritColours() const { return false; } - - // returns true if the window can be positioned outside of parent's client - // area (normal windows can't, but e.g. menubar or statusbar can): - virtual bool CanBeOutsideClientArea() const { return false; } - - // returns true if the platform should explicitly apply a theme border. Currently - // used only by Windows - virtual bool CanApplyThemeBorder() const { return true; } - - // returns the main window of composite control; this is the window - // that FindFocus returns if the focus is in one of composite control's - // windows - virtual wxWindow *GetMainWindowOfCompositeControl() - { return (wxWindow*)this; } - - enum NavigationKind - { - Navigation_Tab, - Navigation_Accel - }; - - // If this function returns true, keyboard events of the given kind can't - // escape from it. A typical example of such "navigation domain" is a top - // level window because pressing TAB in one of them must not transfer focus - // to a different top level window. But it's not limited to them, e.g. MDI - // children frames are not top level windows (and their IsTopLevel() - // returns false) but still are self-contained navigation domains for the - // purposes of TAB navigation -- but not for the accelerators. - virtual bool IsTopNavigationDomain(NavigationKind WXUNUSED(kind)) const - { - return false; - } - - -protected: - // helper for the derived class Create() methods: the first overload, with - // validator parameter, should be used for child windows while the second - // one is used for top level ones - bool CreateBase(wxWindowBase *parent, - wxWindowID winid, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxPanelNameStr); - - bool CreateBase(wxWindowBase *parent, - wxWindowID winid, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name); - - // event handling specific to wxWindow - virtual bool TryBefore(wxEvent& event) wxOVERRIDE; - virtual bool TryAfter(wxEvent& event) wxOVERRIDE; - - enum WindowOrder - { - OrderBefore, // insert before the given window - OrderAfter // insert after the given window - }; - - // common part of GetPrev/NextSibling() - wxWindow *DoGetSibling(WindowOrder order) const; - - // common part of MoveBefore/AfterInTabOrder() - virtual void DoMoveInTabOrder(wxWindow *win, WindowOrder move); - - // implementation of Navigate() and NavigateIn() - virtual bool DoNavigateIn(int flags); - -#if wxUSE_CONSTRAINTS - // satisfy the constraints for the windows but don't set the window sizes - void SatisfyConstraints(); -#endif // wxUSE_CONSTRAINTS - - // Send the wxWindowDestroyEvent if not done yet and sets m_isBeingDeleted - // to true - void SendDestroyEvent(); - - // this method should be implemented to use operating system specific code - // to really enable/disable the widget, it will only be called when we - // really need to enable/disable window and so no additional checks on the - // widgets state are necessary - virtual void DoEnable(bool WXUNUSED(enable)) { } - - - // the window id - a number which uniquely identifies a window among - // its siblings unless it is wxID_ANY - wxWindowIDRef m_windowId; - - // the parent window of this window (or NULL) and the list of the children - // of this window - wxWindow *m_parent; - wxWindowList m_children; - - // the minimal allowed size for the window (no minimal size if variable(s) - // contain(s) wxDefaultCoord) - int m_minWidth, - m_minHeight, - m_maxWidth, - m_maxHeight; - - // event handler for this window: usually is just 'this' but may be - // changed with SetEventHandler() - wxEvtHandler *m_eventHandler; - -#if wxUSE_VALIDATORS - // associated validator or NULL if none - wxValidator *m_windowValidator; -#endif // wxUSE_VALIDATORS - -#if wxUSE_DRAG_AND_DROP - wxDropTarget *m_dropTarget; -#endif // wxUSE_DRAG_AND_DROP - - // visual window attributes - wxCursor m_cursor; - wxFont m_font; // see m_hasFont - wxColour m_backgroundColour, // m_hasBgCol - m_foregroundColour; // m_hasFgCol - -#if wxUSE_CARET - wxCaret *m_caret; -#endif // wxUSE_CARET - - // the region which should be repainted in response to paint event - wxRegion m_updateRegion; - -#if wxUSE_ACCEL - // the accelerator table for the window which translates key strokes into - // command events - wxAcceleratorTable m_acceleratorTable; -#endif // wxUSE_ACCEL - - // the tooltip for this window (may be NULL) -#if wxUSE_TOOLTIPS - wxToolTip *m_tooltip; -#endif // wxUSE_TOOLTIPS - - // constraints and sizers -#if wxUSE_CONSTRAINTS - // the constraints for this window or NULL - wxLayoutConstraints *m_constraints; - - // constraints this window is involved in - wxWindowList *m_constraintsInvolvedIn; -#endif // wxUSE_CONSTRAINTS - - // this window's sizer - wxSizer *m_windowSizer; - - // The sizer this window is a member of, if any - wxSizer *m_containingSizer; - - // Layout() window automatically when its size changes? - bool m_autoLayout:1; - - // window state - bool m_isShown:1; - bool m_isEnabled:1; - bool m_isBeingDeleted:1; - - // was the window colours/font explicitly changed by user? - bool m_hasBgCol:1; - bool m_hasFgCol:1; - bool m_hasFont:1; - - // and should it be inherited by children? - bool m_inheritBgCol:1; - bool m_inheritFgCol:1; - bool m_inheritFont:1; - - // window attributes - long m_windowStyle, - m_exStyle; - wxString m_windowName; - bool m_themeEnabled; - wxBackgroundStyle m_backgroundStyle; -#if wxUSE_PALETTE - wxPalette m_palette; - bool m_hasCustomPalette; -#endif // wxUSE_PALETTE - -#if wxUSE_ACCESSIBILITY - wxAccessible* m_accessible; -#endif - - // Virtual size (scrolling) - wxSize m_virtualSize; - - wxScrollHelper *m_scrollHelper; - - wxWindowVariant m_windowVariant ; - - // override this to change the default (i.e. used when no style is - // specified) border for the window class - virtual wxBorder GetDefaultBorder() const; - - // this allows you to implement standard control borders without - // repeating the code in different classes that are not derived from - // wxControl - virtual wxBorder GetDefaultBorderForControl() const { return wxBORDER_THEME; } - - // Get the default size for the new window if no explicit size given. TLWs - // have their own default size so this is just for non top-level windows. - static int WidthDefault(int w) { return w == wxDefaultCoord ? 20 : w; } - static int HeightDefault(int h) { return h == wxDefaultCoord ? 20 : h; } - - - // Used to save the results of DoGetBestSize so it doesn't need to be - // recalculated each time the value is needed. - wxSize m_bestSizeCache; - - wxDEPRECATED_MSG("use SetInitialSize() instead.") - void SetBestSize(const wxSize& size); - wxDEPRECATED_MSG("use SetInitialSize() instead.") - virtual void SetInitialBestSize(const wxSize& size); - - - - // more pure virtual functions - // --------------------------- - - // NB: we must have DoSomething() function when Something() is an overloaded - // method: indeed, we can't just have "virtual Something()" in case when - // the function is overloaded because then we'd have to make virtual all - // the variants (otherwise only the virtual function may be called on a - // pointer to derived class according to C++ rules) which is, in - // general, absolutely not needed. So instead we implement all - // overloaded Something()s in terms of DoSomething() which will be the - // only one to be virtual. - - // text extent - virtual void DoGetTextExtent(const wxString& string, - int *x, int *y, - int *descent = NULL, - int *externalLeading = NULL, - const wxFont *font = NULL) const = 0; - - // coordinates translation - virtual void DoClientToScreen( int *x, int *y ) const = 0; - virtual void DoScreenToClient( int *x, int *y ) const = 0; - - virtual wxHitTest DoHitTest(wxCoord x, wxCoord y) const; - - // capture/release the mouse, used by Capture/ReleaseMouse() - virtual void DoCaptureMouse() = 0; - virtual void DoReleaseMouse() = 0; - - // retrieve the position/size of the window - virtual void DoGetPosition(int *x, int *y) const = 0; - virtual void DoGetScreenPosition(int *x, int *y) const; - virtual void DoGetSize(int *width, int *height) const = 0; - virtual void DoGetClientSize(int *width, int *height) const = 0; - - // get the size which best suits the window: for a control, it would be - // the minimal size which doesn't truncate the control, for a panel - the - // same size as it would have after a call to Fit() - virtual wxSize DoGetBestSize() const; - - // this method can be overridden instead of DoGetBestSize() if it computes - // the best size of the client area of the window only, excluding borders - // (GetBorderSize() will be used to add them) - virtual wxSize DoGetBestClientSize() const { return wxDefaultSize; } - - // These two methods can be overridden to implement intelligent - // width-for-height and/or height-for-width best size determination for the - // window. By default the fixed best size is used. - virtual int DoGetBestClientHeight(int WXUNUSED(width)) const - { return wxDefaultCoord; } - virtual int DoGetBestClientWidth(int WXUNUSED(height)) const - { return wxDefaultCoord; } - - // this is the virtual function to be overridden in any derived class which - // wants to change how SetSize() or Move() works - it is called by all - // versions of these functions in the base class - virtual void DoSetSize(int x, int y, - int width, int height, - int sizeFlags = wxSIZE_AUTO) = 0; - - // same as DoSetSize() for the client size - virtual void DoSetClientSize(int width, int height) = 0; - - virtual void DoSetSizeHints( int minW, int minH, - int maxW, int maxH, - int incW, int incH ); - - // return the total size of the window borders, i.e. the sum of the widths - // of the left and the right border in the x component of the returned size - // and the sum of the heights of the top and bottom borders in the y one - // - // NB: this is currently only implemented properly for wxMSW, wxGTK and - // wxUniv and doesn't behave correctly in the presence of scrollbars in - // the other ports - virtual wxSize DoGetBorderSize() const; - - // move the window to the specified location and resize it: this is called - // from both DoSetSize() and DoSetClientSize() and would usually just - // reposition this window except for composite controls which will want to - // arrange themselves inside the given rectangle - // - // Important note: the coordinates passed to this method are in parent's - // *window* coordinates and not parent's client coordinates (as the values - // passed to DoSetSize and returned by DoGetPosition are)! - virtual void DoMoveWindow(int x, int y, int width, int height) = 0; - - // centre the window in the specified direction on parent, note that - // wxCENTRE_ON_SCREEN shouldn't be specified here, it only makes sense for - // TLWs - virtual void DoCentre(int dir); - -#if wxUSE_TOOLTIPS - virtual void DoSetToolTipText( const wxString &tip ); - virtual void DoSetToolTip( wxToolTip *tip ); -#endif // wxUSE_TOOLTIPS - -#if wxUSE_MENUS - virtual bool DoPopupMenu(wxMenu *menu, int x, int y) = 0; -#endif // wxUSE_MENUS - - // Makes an adjustment to the window position to make it relative to the - // parents client area, e.g. if the parent is a frame with a toolbar, its - // (0, 0) is just below the toolbar - virtual void AdjustForParentClientOrigin(int& x, int& y, - int sizeFlags = 0) const; - - // implements the window variants - virtual void DoSetWindowVariant( wxWindowVariant variant ) ; - - - // really freeze/thaw the window (should have port-specific implementation) - virtual void DoFreeze() { } - virtual void DoThaw() { } - - - // Must be called when mouse capture is lost to send - // wxMouseCaptureLostEvent to windows on capture stack. - static void NotifyCaptureLost(); - -private: - // recursively call our own and our children DoEnable() when the - // enabled/disabled status changed because a parent window had been - // enabled/disabled - void NotifyWindowOnEnableChange(bool enabled); - -#if wxUSE_MENUS - // temporary event handlers used by GetPopupMenuSelectionFromUser() - void InternalOnPopupMenu(wxCommandEvent& event); - void InternalOnPopupMenuUpdate(wxUpdateUIEvent& event); - - // implementation of the public GetPopupMenuSelectionFromUser() method - int DoGetPopupMenuSelectionFromUser(wxMenu& menu, int x, int y); -#endif // wxUSE_MENUS - - // layout the window children when its size changes unless this was - // explicitly disabled with SetAutoLayout(false) - void InternalOnSize(wxSizeEvent& event); - - // base for dialog unit conversion, i.e. average character size - wxSize GetDlgUnitBase() const; - - - // number of Freeze() calls minus the number of Thaw() calls: we're frozen - // (i.e. not being updated) if it is positive - unsigned int m_freezeCount; - - - wxDECLARE_ABSTRACT_CLASS(wxWindowBase); - wxDECLARE_NO_COPY_CLASS(wxWindowBase); - wxDECLARE_EVENT_TABLE(); -}; - - - -// Inlines for some deprecated methods -inline wxSize wxWindowBase::GetBestFittingSize() const -{ - return GetEffectiveMinSize(); -} - -inline void wxWindowBase::SetBestFittingSize(const wxSize& size) -{ - SetInitialSize(size); -} - -inline void wxWindowBase::SetBestSize(const wxSize& size) -{ - SetInitialSize(size); -} - -inline void wxWindowBase::SetInitialBestSize(const wxSize& size) -{ - SetInitialSize(size); -} - - -// ---------------------------------------------------------------------------- -// now include the declaration of wxWindow class -// ---------------------------------------------------------------------------- - -// include the declaration of the platform-specific class -#if defined(__WXMSW__) - #ifdef __WXUNIVERSAL__ - #define wxWindowNative wxWindowMSW - #else // !wxUniv - #define wxWindowMSW wxWindow - #endif // wxUniv/!wxUniv - #include "wx/msw/window.h" -#elif defined(__WXMOTIF__) - #include "wx/motif/window.h" -#elif defined(__WXGTK20__) - #ifdef __WXUNIVERSAL__ - #define wxWindowNative wxWindowGTK - #else // !wxUniv - #define wxWindowGTK wxWindow - #endif // wxUniv - #include "wx/gtk/window.h" - #ifdef __WXGTK3__ - #define wxHAVE_DPI_INDEPENDENT_PIXELS - #endif -#elif defined(__WXGTK__) - #ifdef __WXUNIVERSAL__ - #define wxWindowNative wxWindowGTK - #else // !wxUniv - #define wxWindowGTK wxWindow - #endif // wxUniv - #include "wx/gtk1/window.h" -#elif defined(__WXX11__) - #ifdef __WXUNIVERSAL__ - #define wxWindowNative wxWindowX11 - #else // !wxUniv - #define wxWindowX11 wxWindow - #endif // wxUniv - #include "wx/x11/window.h" -#elif defined(__WXDFB__) - #define wxWindowNative wxWindowDFB - #include "wx/dfb/window.h" -#elif defined(__WXMAC__) - #ifdef __WXUNIVERSAL__ - #define wxWindowNative wxWindowMac - #else // !wxUniv - #define wxWindowMac wxWindow - #endif // wxUniv - #include "wx/osx/window.h" - #define wxHAVE_DPI_INDEPENDENT_PIXELS -#elif defined(__WXQT__) - #ifdef __WXUNIVERSAL__ - #define wxWindowNative wxWindowQt - #else // !wxUniv - #define wxWindowQt wxWindow - #endif // wxUniv - #include "wx/qt/window.h" -#endif - -// for wxUniversal, we now derive the real wxWindow from wxWindow, -// for the native ports we already have defined it above -#if defined(__WXUNIVERSAL__) - #ifndef wxWindowNative - #error "wxWindowNative must be defined above!" - #endif - - #include "wx/univ/window.h" -#endif // wxUniv - -// ---------------------------------------------------------------------------- -// inline functions which couldn't be declared in the class body because of -// forward dependencies -// ---------------------------------------------------------------------------- - -inline wxWindow *wxWindowBase::GetGrandParent() const -{ - return m_parent ? m_parent->GetParent() : NULL; -} - -#ifdef wxHAVE_DPI_INDEPENDENT_PIXELS - -// FromDIP() and ToDIP() become trivial in this case, so make them inline to -// avoid any overhead. - -/* static */ -inline wxSize -wxWindowBase::FromDIP(const wxSize& sz, const wxWindowBase* WXUNUSED(w)) -{ - return sz; -} - -/* static */ -inline wxSize -wxWindowBase::ToDIP(const wxSize& sz, const wxWindowBase* WXUNUSED(w)) -{ - return sz; -} - -#endif // wxHAVE_DPI_INDEPENDENT_PIXELS - -// ---------------------------------------------------------------------------- -// global functions -// ---------------------------------------------------------------------------- - -// Find the wxWindow at the current mouse position, also returning the mouse -// position. -extern WXDLLIMPEXP_CORE wxWindow* wxFindWindowAtPointer(wxPoint& pt); - -// Get the current mouse position. -extern WXDLLIMPEXP_CORE wxPoint wxGetMousePosition(); - -// get the currently active window of this application or NULL -extern WXDLLIMPEXP_CORE wxWindow *wxGetActiveWindow(); - -// get the (first) top level parent window -WXDLLIMPEXP_CORE wxWindow* wxGetTopLevelParent(wxWindow *win); - -#if wxUSE_ACCESSIBILITY -// ---------------------------------------------------------------------------- -// accessible object for windows -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxWindowAccessible: public wxAccessible -{ -public: - wxWindowAccessible(wxWindow* win): wxAccessible(win) { if (win) win->SetAccessible(this); } - virtual ~wxWindowAccessible() {} - -// Overridables - - // Can return either a child object, or an integer - // representing the child element, starting from 1. - virtual wxAccStatus HitTest(const wxPoint& pt, int* childId, wxAccessible** childObject); - - // Returns the rectangle for this object (id = 0) or a child element (id > 0). - virtual wxAccStatus GetLocation(wxRect& rect, int elementId); - - // Navigates from fromId to toId/toObject. - virtual wxAccStatus Navigate(wxNavDir navDir, int fromId, - int* toId, wxAccessible** toObject); - - // Gets the name of the specified object. - virtual wxAccStatus GetName(int childId, wxString* name); - - // Gets the number of children. - virtual wxAccStatus GetChildCount(int* childCount); - - // Gets the specified child (starting from 1). - // If *child is NULL and return value is wxACC_OK, - // this means that the child is a simple element and - // not an accessible object. - virtual wxAccStatus GetChild(int childId, wxAccessible** child); - - // Gets the parent, or NULL. - virtual wxAccStatus GetParent(wxAccessible** parent); - - // Performs the default action. childId is 0 (the action for this object) - // or > 0 (the action for a child). - // Return wxACC_NOT_SUPPORTED if there is no default action for this - // window (e.g. an edit control). - virtual wxAccStatus DoDefaultAction(int childId); - - // Gets the default action for this object (0) or > 0 (the action for a child). - // Return wxACC_OK even if there is no action. actionName is the action, or the empty - // string if there is no action. - // The retrieved string describes the action that is performed on an object, - // not what the object does as a result. For example, a toolbar button that prints - // a document has a default action of "Press" rather than "Prints the current document." - virtual wxAccStatus GetDefaultAction(int childId, wxString* actionName); - - // Returns the description for this object or a child. - virtual wxAccStatus GetDescription(int childId, wxString* description); - - // Returns help text for this object or a child, similar to tooltip text. - virtual wxAccStatus GetHelpText(int childId, wxString* helpText); - - // Returns the keyboard shortcut for this object or child. - // Return e.g. ALT+K - virtual wxAccStatus GetKeyboardShortcut(int childId, wxString* shortcut); - - // Returns a role constant. - virtual wxAccStatus GetRole(int childId, wxAccRole* role); - - // Returns a state constant. - virtual wxAccStatus GetState(int childId, long* state); - - // Returns a localized string representing the value for the object - // or child. - virtual wxAccStatus GetValue(int childId, wxString* strValue); - - // Selects the object or child. - virtual wxAccStatus Select(int childId, wxAccSelectionFlags selectFlags); - - // Gets the window with the keyboard focus. - // If childId is 0 and child is NULL, no object in - // this subhierarchy has the focus. - // If this object has the focus, child should be 'this'. - virtual wxAccStatus GetFocus(int* childId, wxAccessible** child); - -#if wxUSE_VARIANT - // Gets a variant representing the selected children - // of this object. - // Acceptable values: - // - a null variant (IsNull() returns true) - // - a list variant (GetType() == wxT("list") - // - an integer representing the selected child element, - // or 0 if this object is selected (GetType() == wxT("long") - // - a "void*" pointer to a wxAccessible child object - virtual wxAccStatus GetSelections(wxVariant* selections); -#endif // wxUSE_VARIANT -}; - -#endif // wxUSE_ACCESSIBILITY - - -#endif // _WX_WINDOW_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/windowid.h b/Externals/wxWidgets3/include/wx/windowid.h deleted file mode 100644 index 0c174b5f0c..0000000000 --- a/Externals/wxWidgets3/include/wx/windowid.h +++ /dev/null @@ -1,189 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/windowid.h -// Purpose: wxWindowID class - a class for managing window ids -// Author: Brian Vanderburg II -// Created: 2007-09-21 -// Copyright: (c) 2007 Brian Vanderburg II -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_WINDOWID_H_ -#define _WX_WINDOWID_H_ - -// NB: do not include defs.h as we are included from it - -typedef int wxWindowID; - -// ---------------------------------------------------------------------------- -// wxWindowIDRef: reference counted id value -// ---------------------------------------------------------------------------- - -// A wxWindowIDRef object wraps an id value and marks it as (un)used as -// necessary. All ids returned from wxWindow::NewControlId() should be assigned -// to an instance of this class to ensure that the id is marked as being in -// use. -// -// This class is always defined but it is trivial if wxUSE_AUTOID_MANAGEMENT is -// off. -class WXDLLIMPEXP_CORE wxWindowIDRef -{ -public: - // default ctor - wxWindowIDRef() - { - m_id = wxID_NONE; - } - - // ctor taking id values - wxWindowIDRef(int id) - { - Init(id); - } - - wxWindowIDRef(long id) - { - Init(wxWindowID(id)); - } - - wxWindowIDRef(const wxWindowIDRef& id) - { - Init(id.m_id); - } - - // dtor - ~wxWindowIDRef() - { - Assign(wxID_NONE); - } - - // assignment - wxWindowIDRef& operator=(int id) - { - Assign(id); - return *this; - } - - wxWindowIDRef& operator=(long id) - { - Assign(wxWindowID(id)); - return *this; - } - - wxWindowIDRef& operator=(const wxWindowIDRef& id) - { - if (&id != this) - Assign(id.m_id); - return *this; - } - - // access to the stored id value - wxWindowID GetValue() const - { - return m_id; - } - - operator wxWindowID() const - { - return m_id; - } - -private: -#if wxUSE_AUTOID_MANAGEMENT - // common part of all ctors: call Assign() for our new id - void Init(wxWindowID id) - { - // m_id must be initialized before calling Assign() - m_id = wxID_NONE; - Assign(id); - } - - // increase reference count of id, decrease the one of m_id - void Assign(wxWindowID id); -#else // !wxUSE_AUTOID_MANAGEMENT - // trivial stubs for the functions above - void Init(wxWindowID id) - { - m_id = id; - } - - void Assign(wxWindowID id) - { - m_id = id; - } -#endif // wxUSE_AUTOID_MANAGEMENT/!wxUSE_AUTOID_MANAGEMENT - - - wxWindowID m_id; -}; - -// comparison operators -inline bool operator==(const wxWindowIDRef& lhs, const wxWindowIDRef& rhs) -{ - return lhs.GetValue() == rhs.GetValue(); -} - -inline bool operator==(const wxWindowIDRef& lhs, int rhs) -{ - return lhs.GetValue() == rhs; -} - -inline bool operator==(const wxWindowIDRef& lhs, long rhs) -{ - return lhs.GetValue() == rhs; -} - -inline bool operator==(int lhs, const wxWindowIDRef& rhs) -{ - return rhs == lhs; -} - -inline bool operator==(long lhs, const wxWindowIDRef& rhs) -{ - return rhs == lhs; -} - -inline bool operator!=(const wxWindowIDRef& lhs, const wxWindowIDRef& rhs) -{ - return !(lhs == rhs); -} - -inline bool operator!=(const wxWindowIDRef& lhs, int rhs) -{ - return !(lhs == rhs); -} - -inline bool operator!=(const wxWindowIDRef& lhs, long rhs) -{ - return !(lhs == rhs); -} - -inline bool operator!=(int lhs, const wxWindowIDRef& rhs) -{ - return !(lhs == rhs); -} - -inline bool operator!=(long lhs, const wxWindowIDRef& rhs) -{ - return !(lhs == rhs); -} - -// ---------------------------------------------------------------------------- -// wxIdManager -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxIdManager -{ -public: - // This returns an id value and not an wxWindowIDRef. The returned value - // should be assigned a.s.a.p to a wxWindowIDRef. The IDs are marked as - // reserved so that another call to ReserveId before assigning the id to a - // wxWindowIDRef will not use the same ID - static wxWindowID ReserveId(int count = 1); - - // This will release an unused reserved ID. This should only be called - // if the ID returned by ReserveId was NOT assigned to a wxWindowIDRef - // for some purpose, maybe an early return from a function - static void UnreserveId(wxWindowID id, int count = 1); -}; - -#endif // _WX_WINDOWID_H_ diff --git a/Externals/wxWidgets3/include/wx/windowptr.h b/Externals/wxWidgets3/include/wx/windowptr.h deleted file mode 100644 index bebcf6ad8f..0000000000 --- a/Externals/wxWidgets3/include/wx/windowptr.h +++ /dev/null @@ -1,63 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/windowptr.h -// Purpose: smart pointer for holding wxWindow instances -// Author: Vaclav Slavik -// Created: 2013-09-01 -// Copyright: (c) 2013 Vaclav Slavik -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_WINDOWPTR_H_ -#define _WX_WINDOWPTR_H_ - -#include "wx/sharedptr.h" - -// ---------------------------------------------------------------------------- -// wxWindowPtr: A smart pointer with correct wxWindow destruction. -// ---------------------------------------------------------------------------- - -namespace wxPrivate -{ - -struct wxWindowDeleter -{ - void operator()(wxWindow *win) - { - win->Destroy(); - } -}; - -} // namespace wxPrivate - -template -class wxWindowPtr : public wxSharedPtr -{ -public: - typedef T element_type; - - wxEXPLICIT wxWindowPtr(element_type* win) - : wxSharedPtr(win, wxPrivate::wxWindowDeleter()) - { - } - - wxWindowPtr() {} - wxWindowPtr(const wxWindowPtr& tocopy) : wxSharedPtr(tocopy) {} - - wxWindowPtr& operator=(const wxWindowPtr& tocopy) - { - wxSharedPtr::operator=(tocopy); - return *this; - } - - wxWindowPtr& operator=(element_type* win) - { - return operator=(wxWindowPtr(win)); - } - - void reset(T* ptr = NULL) - { - wxSharedPtr::reset(ptr, wxPrivate::wxWindowDeleter()); - } -}; - -#endif // _WX_WINDOWPTR_H_ diff --git a/Externals/wxWidgets3/include/wx/withimages.h b/Externals/wxWidgets3/include/wx/withimages.h deleted file mode 100644 index 89120d3eb7..0000000000 --- a/Externals/wxWidgets3/include/wx/withimages.h +++ /dev/null @@ -1,96 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/withimages.h -// Purpose: Declaration of a simple wxWithImages class. -// Author: Vadim Zeitlin -// Created: 2011-08-17 -// Copyright: (c) 2011 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_WITHIMAGES_H_ -#define _WX_WITHIMAGES_H_ - -#include "wx/defs.h" -#include "wx/icon.h" -#include "wx/imaglist.h" - -// ---------------------------------------------------------------------------- -// wxWithImages: mix-in class providing access to wxImageList. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxWithImages -{ -public: - enum - { - NO_IMAGE = -1 - }; - - wxWithImages() - { - m_imageList = NULL; - m_ownsImageList = false; - } - - virtual ~wxWithImages() - { - FreeIfNeeded(); - } - - // Sets the image list to use, it is *not* deleted by the control. - virtual void SetImageList(wxImageList* imageList) - { - FreeIfNeeded(); - m_imageList = imageList; - } - - // As SetImageList() but we will delete the image list ourselves. - void AssignImageList(wxImageList* imageList) - { - SetImageList(imageList); - m_ownsImageList = true; - } - - // Get pointer (may be NULL) to the associated image list. - wxImageList* GetImageList() const { return m_imageList; } - -protected: - // Return true if we have a valid image list. - bool HasImageList() const { return m_imageList != NULL; } - - // Return the image with the given index from the image list. - // - // If there is no image list or if index == NO_IMAGE, silently returns - // wxNullIcon. - wxIcon GetImage(int iconIndex) const - { - return m_imageList && iconIndex != NO_IMAGE - ? m_imageList->GetIcon(iconIndex) - : wxNullIcon; - } - -private: - // Free the image list if necessary, i.e. if we own it. - void FreeIfNeeded() - { - if ( m_ownsImageList ) - { - delete m_imageList; - m_imageList = NULL; - - // We don't own it any more. - m_ownsImageList = false; - } - } - - - // The associated image list or NULL. - wxImageList* m_imageList; - - // False by default, if true then we delete m_imageList. - bool m_ownsImageList; - - wxDECLARE_NO_COPY_CLASS(wxWithImages); -}; - -#endif // _WX_WITHIMAGES_H_ diff --git a/Externals/wxWidgets3/include/wx/wizard.h b/Externals/wxWidgets3/include/wx/wizard.h deleted file mode 100644 index 0adffd253e..0000000000 --- a/Externals/wxWidgets3/include/wx/wizard.h +++ /dev/null @@ -1,337 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/wizard.h -// Purpose: wxWizard class: a GUI control presenting the user with a -// sequence of dialogs which allows to simply perform some task -// Author: Vadim Zeitlin (partly based on work by Ron Kuris and Kevin B. -// Smith) -// Modified by: Robert Cavanaugh -// Added capability to use .WXR resource files in Wizard pages -// Added wxWIZARD_HELP event -// Robert Vazan (sizers) -// Created: 15.08.99 -// Copyright: (c) 1999 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_WIZARD_H_ -#define _WX_WIZARD_H_ - -#include "wx/defs.h" - -#if wxUSE_WIZARDDLG - -// ---------------------------------------------------------------------------- -// headers and other simple declarations -// ---------------------------------------------------------------------------- - -#include "wx/dialog.h" // the base class -#include "wx/panel.h" // ditto -#include "wx/event.h" // wxEVT_XXX constants -#include "wx/bitmap.h" - -// Extended style to specify a help button -#define wxWIZARD_EX_HELPBUTTON 0x00000010 - -// Placement flags -#define wxWIZARD_VALIGN_TOP 0x01 -#define wxWIZARD_VALIGN_CENTRE 0x02 -#define wxWIZARD_VALIGN_BOTTOM 0x04 -#define wxWIZARD_HALIGN_LEFT 0x08 -#define wxWIZARD_HALIGN_CENTRE 0x10 -#define wxWIZARD_HALIGN_RIGHT 0x20 -#define wxWIZARD_TILE 0x40 - -// forward declarations -class WXDLLIMPEXP_FWD_ADV wxWizard; - -// ---------------------------------------------------------------------------- -// wxWizardPage is one of the wizards screen: it must know what are the -// following and preceding pages (which may be NULL for the first/last page). -// -// Other than GetNext/Prev() functions, wxWizardPage is just a panel and may be -// used as such (i.e. controls may be placed directly on it &c). -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxWizardPage : public wxPanel -{ -public: - wxWizardPage() { Init(); } - - // ctor accepts an optional bitmap which will be used for this page instead - // of the default one for this wizard (should be of the same size). Notice - // that no other parameters are needed because the wizard will resize and - // reposition the page anyhow - wxWizardPage(wxWizard *parent, - const wxBitmap& bitmap = wxNullBitmap); - - bool Create(wxWizard *parent, - const wxBitmap& bitmap = wxNullBitmap); - - // these functions are used by the wizard to show another page when the - // user chooses "Back" or "Next" button - virtual wxWizardPage *GetPrev() const = 0; - virtual wxWizardPage *GetNext() const = 0; - - // default GetBitmap() will just return m_bitmap which is ok in 99% of - // cases - override this method if you want to create the bitmap to be used - // dynamically or to do something even more fancy. It's ok to return - // wxNullBitmap from here - the default one will be used then. - virtual wxBitmap GetBitmap() const { return m_bitmap; } - -#if wxUSE_VALIDATORS - // Override the base functions to allow a validator to be assigned to this page. - virtual bool TransferDataToWindow() wxOVERRIDE - { - return GetValidator() ? GetValidator()->TransferToWindow() - : wxPanel::TransferDataToWindow(); - } - - virtual bool TransferDataFromWindow() wxOVERRIDE - { - return GetValidator() ? GetValidator()->TransferFromWindow() - : wxPanel::TransferDataFromWindow(); - } - - virtual bool Validate() wxOVERRIDE - { - return GetValidator() ? GetValidator()->Validate(this) - : wxPanel::Validate(); - } -#endif // wxUSE_VALIDATORS - -protected: - // common part of ctors: - void Init(); - - wxBitmap m_bitmap; - -private: - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxWizardPage); -}; - -// ---------------------------------------------------------------------------- -// wxWizardPageSimple just returns the pointers given to the ctor and is useful -// to create a simple wizard where the order of pages never changes. -// -// OTOH, it is also possible to dynamically decide which page to return (i.e. -// depending on the user's choices) as the wizard sample shows - in order to do -// this, you must derive from wxWizardPage directly. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxWizardPageSimple : public wxWizardPage -{ -public: - wxWizardPageSimple() { Init(); } - - // ctor takes the previous and next pages - wxWizardPageSimple(wxWizard *parent, - wxWizardPage *prev = NULL, - wxWizardPage *next = NULL, - const wxBitmap& bitmap = wxNullBitmap) - { - Create(parent, prev, next, bitmap); - } - - bool Create(wxWizard *parent = NULL, // let it be default ctor too - wxWizardPage *prev = NULL, - wxWizardPage *next = NULL, - const wxBitmap& bitmap = wxNullBitmap) - { - m_prev = prev; - m_next = next; - return wxWizardPage::Create(parent, bitmap); - } - - // the pointers may be also set later - but before starting the wizard - void SetPrev(wxWizardPage *prev) { m_prev = prev; } - void SetNext(wxWizardPage *next) { m_next = next; } - - // Convenience functions to make the pages follow each other without having - // to call their SetPrev() or SetNext() explicitly. - wxWizardPageSimple& Chain(wxWizardPageSimple* next) - { - SetNext(next); - next->SetPrev(this); - return *next; - } - - static void Chain(wxWizardPageSimple *first, wxWizardPageSimple *second) - { - wxCHECK_RET( first && second, - wxT("NULL passed to wxWizardPageSimple::Chain") ); - - first->SetNext(second); - second->SetPrev(first); - } - - // base class pure virtuals - virtual wxWizardPage *GetPrev() const wxOVERRIDE; - virtual wxWizardPage *GetNext() const wxOVERRIDE; - -private: - // common part of ctors: - void Init() - { - m_prev = m_next = NULL; - } - - // pointers are private, the derived classes shouldn't mess with them - - // just derive from wxWizardPage directly to implement different behaviour - wxWizardPage *m_prev, - *m_next; - - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxWizardPageSimple); -}; - -// ---------------------------------------------------------------------------- -// wxWizard -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxWizardBase : public wxDialog -{ -public: - /* - The derived class (i.e. the real wxWizard) has a ctor and Create() - function taking the following arguments: - - wxWizard(wxWindow *parent, - int id = wxID_ANY, - const wxString& title = wxEmptyString, - const wxBitmap& bitmap = wxNullBitmap, - const wxPoint& pos = wxDefaultPosition, - long style = wxDEFAULT_DIALOG_STYLE); - */ - wxWizardBase() { } - - // executes the wizard starting from the given page, returns true if it was - // successfully finished, false if user cancelled it - virtual bool RunWizard(wxWizardPage *firstPage) = 0; - - // get the current page (NULL if RunWizard() isn't running) - virtual wxWizardPage *GetCurrentPage() const = 0; - - // set the min size which should be available for the pages: a - // wizard will take into account the size of the bitmap (if any) - // itself and will never be less than some predefined fixed size - virtual void SetPageSize(const wxSize& size) = 0; - - // get the size available for the page - virtual wxSize GetPageSize() const = 0; - - // set the best size for the wizard, i.e. make it big enough to contain all - // of the pages starting from the given one - // - // this function may be called several times and possible with different - // pages in which case it will only increase the page size if needed (this - // may be useful if not all pages are accessible from the first one by - // default) - virtual void FitToPage(const wxWizardPage *firstPage) = 0; - - // Adding pages to page area sizer enlarges wizard - virtual wxSizer *GetPageAreaSizer() const = 0; - - // Set border around page area. Default is 0 if you add at least one - // page to GetPageAreaSizer and 5 if you don't. - virtual void SetBorder(int border) = 0; - - // the methods below may be overridden by the derived classes to provide - // custom logic for determining the pages order - - virtual bool HasNextPage(wxWizardPage *page) - { return page->GetNext() != NULL; } - - virtual bool HasPrevPage(wxWizardPage *page) - { return page->GetPrev() != NULL; } - - /// Override these functions to stop InitDialog from calling TransferDataToWindow - /// for _all_ pages when the wizard starts. Instead 'ShowPage' will call - /// TransferDataToWindow for the first page only. - bool TransferDataToWindow() wxOVERRIDE { return true; } - bool TransferDataFromWindow() wxOVERRIDE { return true; } - bool Validate() wxOVERRIDE { return true; } - -private: - wxDECLARE_NO_COPY_CLASS(wxWizardBase); -}; - -// include the real class declaration -#include "wx/generic/wizard.h" - -// ---------------------------------------------------------------------------- -// wxWizardEvent class represents an event generated by the wizard: this event -// is first sent to the page itself and, if not processed there, goes up the -// window hierarchy as usual -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxWizardEvent : public wxNotifyEvent -{ -public: - wxWizardEvent(wxEventType type = wxEVT_NULL, - int id = wxID_ANY, - bool direction = true, - wxWizardPage* page = NULL); - - // for EVT_WIZARD_PAGE_CHANGING, return true if we're going forward or - // false otherwise and for EVT_WIZARD_PAGE_CHANGED return true if we came - // from the previous page and false if we returned from the next one - // (this function doesn't make sense for CANCEL events) - bool GetDirection() const { return m_direction; } - - wxWizardPage* GetPage() const { return m_page; } - - virtual wxEvent *Clone() const wxOVERRIDE { return new wxWizardEvent(*this); } - -private: - bool m_direction; - wxWizardPage* m_page; - - wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxWizardEvent); -}; - -// ---------------------------------------------------------------------------- -// macros for handling wxWizardEvents -// ---------------------------------------------------------------------------- - -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_WIZARD_PAGE_CHANGED, wxWizardEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_WIZARD_PAGE_CHANGING, wxWizardEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_WIZARD_CANCEL, wxWizardEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_WIZARD_HELP, wxWizardEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_WIZARD_FINISHED, wxWizardEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_WIZARD_PAGE_SHOWN, wxWizardEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_WIZARD_BEFORE_PAGE_CHANGED, wxWizardEvent ); - -typedef void (wxEvtHandler::*wxWizardEventFunction)(wxWizardEvent&); - -#define wxWizardEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxWizardEventFunction, func) - -#define wx__DECLARE_WIZARDEVT(evt, id, fn) \ - wx__DECLARE_EVT1(wxEVT_WIZARD_ ## evt, id, wxWizardEventHandler(fn)) - -// notifies that the page has just been changed (can't be vetoed) -#define EVT_WIZARD_PAGE_CHANGED(id, fn) wx__DECLARE_WIZARDEVT(PAGE_CHANGED, id, fn) - -// the user pressed "" button and the page is going to be -// changed - unless the event handler vetoes the event -#define EVT_WIZARD_PAGE_CHANGING(id, fn) wx__DECLARE_WIZARDEVT(PAGE_CHANGING, id, fn) - -// Called before GetNext/GetPrev is called, so that the handler can change state that will be -// used when GetNext/GetPrev is called. PAGE_CHANGING is called too late to influence GetNext/GetPrev. -#define EVT_WIZARD_BEFORE_PAGE_CHANGED(id, fn) wx__DECLARE_WIZARDEVT(BEFORE_PAGE_CHANGED, id, fn) - -// the user pressed "Cancel" button and the wizard is going to be dismissed - -// unless the event handler vetoes the event -#define EVT_WIZARD_CANCEL(id, fn) wx__DECLARE_WIZARDEVT(CANCEL, id, fn) - -// the user pressed "Finish" button and the wizard is going to be dismissed - -#define EVT_WIZARD_FINISHED(id, fn) wx__DECLARE_WIZARDEVT(FINISHED, id, fn) - -// the user pressed "Help" button -#define EVT_WIZARD_HELP(id, fn) wx__DECLARE_WIZARDEVT(HELP, id, fn) - -// the page was just shown and laid out -#define EVT_WIZARD_PAGE_SHOWN(id, fn) wx__DECLARE_WIZARDEVT(PAGE_SHOWN, id, fn) - -#endif // wxUSE_WIZARDDLG - -#endif // _WX_WIZARD_H_ diff --git a/Externals/wxWidgets3/include/wx/wrapsizer.h b/Externals/wxWidgets3/include/wx/wrapsizer.h deleted file mode 100644 index f401c260df..0000000000 --- a/Externals/wxWidgets3/include/wx/wrapsizer.h +++ /dev/null @@ -1,99 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/wrapsizer.h -// Purpose: provide wrapping sizer for layout (wxWrapSizer) -// Author: Arne Steinarson -// Created: 2008-05-08 -// Copyright: (c) Arne Steinarson -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_WRAPSIZER_H_ -#define _WX_WRAPSIZER_H_ - -#include "wx/sizer.h" - -// flags for wxWrapSizer -enum -{ - wxEXTEND_LAST_ON_EACH_LINE = 1, - // don't leave spacers in the beginning of a new row - wxREMOVE_LEADING_SPACES = 2, - - wxWRAPSIZER_DEFAULT_FLAGS = wxEXTEND_LAST_ON_EACH_LINE | - wxREMOVE_LEADING_SPACES -}; - -// ---------------------------------------------------------------------------- -// A box sizer that can wrap items on several lines when sum of widths exceed -// available line width. -// ---------------------------------------------------------------------------- - -class WXDLLEXPORT wxWrapSizer : public wxBoxSizer -{ -public: - wxWrapSizer(int orient = wxHORIZONTAL, int flags = wxWRAPSIZER_DEFAULT_FLAGS); - virtual ~wxWrapSizer(); - - // override base class virtual methods - virtual wxSize CalcMin() wxOVERRIDE; - virtual void RecalcSizes() wxOVERRIDE; - - virtual bool InformFirstDirection(int direction, - int size, - int availableOtherDir) wxOVERRIDE; - -protected: - // This method is called to decide if an item represents empty space or - // not. We do this to avoid having space-only items first or last on a - // wrapped line (left alignment). - // - // By default only spacers are considered to be empty items but a derived - // class may override this item if some other kind of sizer elements should - // be also considered empty for some reason. - virtual bool IsSpaceItem(wxSizerItem *item) const - { - return item->IsSpacer(); - } - - // helpers of CalcMin() - void CalcMinFromMinor(int totMinor); - void CalcMinFromMajor(int totMajor); - void CalcMinUsingCurrentLayout(); - void CalcMinFittingSize(const wxSize& szBoundary); - void CalcMaxSingleItemSize(); - - // temporarily change the proportion of the last item of the N-th row to - // extend to the end of line if the appropriate flag is set - void AdjustLastRowItemProp(size_t n, wxSizerItem *itemLast); - - // remove all the items from m_rows - void ClearRows(); - - // return the N-th row sizer from m_rows creating it if necessary - wxSizer *GetRowSizer(size_t n); - - // should be called after completion of each row - void FinishRow(size_t n, int rowMajor, int rowMinor, wxSizerItem *itemLast); - - - const int m_flags; // Flags specified in the ctor - - int m_dirInform; // Direction for size information - int m_availSize; // Size available in m_dirInform direction - int m_availableOtherDir; // Size available in the other direction - bool m_lastUsed; // Indicates whether value from InformFirst... has - // been used yet - - // The sizes below are computed by RecalcSizes(), i.e. they don't have - // valid values during the initial call to CalcMin() and they are only - // valid for the current layout (i.e. the current number of rows) - int m_minSizeMinor; // Min size in minor direction - int m_maxSizeMajor; // Size of longest row - int m_minItemMajor; // Size of smallest item in major direction - - wxBoxSizer m_rows; // Sizer containing multiple rows of our items - - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxWrapSizer); -}; - -#endif // _WX_WRAPSIZER_H_ diff --git a/Externals/wxWidgets3/include/wx/wupdlock.h b/Externals/wxWidgets3/include/wx/wupdlock.h deleted file mode 100644 index eb799a82e9..0000000000 --- a/Externals/wxWidgets3/include/wx/wupdlock.h +++ /dev/null @@ -1,36 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/wupdlock.h -// Purpose: wxWindowUpdateLocker prevents window redrawing -// Author: Vadim Zeitlin -// Created: 2006-03-06 -// Copyright: (c) 2006 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_WUPDLOCK_H_ -#define _WX_WUPDLOCK_H_ - -#include "wx/window.h" - -// ---------------------------------------------------------------------------- -// wxWindowUpdateLocker prevents updates to the window during its lifetime -// ---------------------------------------------------------------------------- - -class wxWindowUpdateLocker -{ -public: - // create an object preventing updates of the given window (which must have - // a lifetime at least as great as ours) - wxWindowUpdateLocker(wxWindow *win) : m_win(win) { win->Freeze(); } - - // dtor thaws the window to permit updates again - ~wxWindowUpdateLocker() { m_win->Thaw(); } - -private: - wxWindow *m_win; - - wxDECLARE_NO_COPY_CLASS(wxWindowUpdateLocker); -}; - -#endif // _WX_WUPDLOCK_H_ - diff --git a/Externals/wxWidgets3/include/wx/wx.h b/Externals/wxWidgets3/include/wx/wx.h deleted file mode 100644 index 9f6a42cb13..0000000000 --- a/Externals/wxWidgets3/include/wx/wx.h +++ /dev/null @@ -1,112 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/wx.h -// Purpose: wxWidgets central header including the most often used ones -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_WX_H_ -#define _WX_WX_H_ - -#include "wx/defs.h" -#include "wx/object.h" -#include "wx/dynarray.h" -#include "wx/list.h" -#include "wx/hash.h" -#include "wx/string.h" -#include "wx/hashmap.h" -#include "wx/arrstr.h" -#include "wx/intl.h" -#include "wx/log.h" -#include "wx/event.h" -#include "wx/app.h" -#include "wx/utils.h" -#include "wx/stream.h" -#include "wx/memory.h" -#include "wx/math.h" -#include "wx/stopwatch.h" -#include "wx/timer.h" -#include "wx/module.h" -#include "wx/wxcrt.h" -#include "wx/wxcrtvararg.h" - -#if wxUSE_GUI - -#include "wx/window.h" -#include "wx/containr.h" -#include "wx/panel.h" -#include "wx/toplevel.h" -#include "wx/frame.h" -#include "wx/gdicmn.h" -#include "wx/gdiobj.h" -#include "wx/region.h" -#include "wx/bitmap.h" -#include "wx/image.h" -#include "wx/colour.h" -#include "wx/font.h" -#include "wx/dc.h" -#include "wx/dcclient.h" -#include "wx/dcmemory.h" -#include "wx/dcprint.h" -#include "wx/dcscreen.h" -#include "wx/button.h" -#include "wx/menuitem.h" -#include "wx/menu.h" -#include "wx/pen.h" -#include "wx/brush.h" -#include "wx/palette.h" -#include "wx/icon.h" -#include "wx/cursor.h" -#include "wx/dialog.h" -#include "wx/settings.h" -#include "wx/msgdlg.h" -#include "wx/dataobj.h" - -#include "wx/control.h" -#include "wx/ctrlsub.h" -#include "wx/bmpbuttn.h" -#include "wx/checkbox.h" -#include "wx/checklst.h" -#include "wx/choice.h" -#include "wx/scrolbar.h" -#include "wx/stattext.h" -#include "wx/statbmp.h" -#include "wx/statbox.h" -#include "wx/listbox.h" -#include "wx/radiobox.h" -#include "wx/radiobut.h" -#include "wx/textctrl.h" -#include "wx/slider.h" -#include "wx/gauge.h" -#include "wx/scrolwin.h" -#include "wx/dirdlg.h" -#include "wx/toolbar.h" -#include "wx/combobox.h" -#include "wx/layout.h" -#include "wx/sizer.h" -#include "wx/statusbr.h" -#include "wx/choicdlg.h" -#include "wx/textdlg.h" -#include "wx/filedlg.h" - -// this one is included by exactly one file (mdi.cpp) during wx build so even -// although we keep it here for the library users, don't include it to avoid -// bloating the PCH and (worse) rebuilding the entire library when it changes -// when building the library itself -#ifndef WXBUILDING - #include "wx/mdi.h" -#endif - -// always include, even if !wxUSE_VALIDATORS because we need wxDefaultValidator -#include "wx/validate.h" - -#if wxUSE_VALIDATORS - #include "wx/valtext.h" -#endif // wxUSE_VALIDATORS - -#endif // wxUSE_GUI - -#endif // _WX_WX_H_ diff --git a/Externals/wxWidgets3/include/wx/wxchar.h b/Externals/wxWidgets3/include/wx/wxchar.h deleted file mode 100644 index 597bbe1599..0000000000 --- a/Externals/wxWidgets3/include/wx/wxchar.h +++ /dev/null @@ -1,18 +0,0 @@ -////////////////////////////////////////////////////////////////////////////// -// Name: wx/wxchar.h -// Purpose: Declarations common to wx char/wchar_t usage (wide chars) -// Author: Joel Farley, Ove KÃ¥ven -// Modified by: Vadim Zeitlin, Robert Roebling, Ron Lee -// Created: 1998/06/12 -// Copyright: (c) 1998-2006 wxWidgets dev team -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_WXCHAR_H_ -#define _WX_WXCHAR_H_ - -// This header used to define CRT functions wrappers in wxWidgets 2.8. This is -// now done in (headers included by) wx/crt.h, so include it for compatibility: -#include "wx/crt.h" - -#endif /* _WX_WXCHAR_H_ */ diff --git a/Externals/wxWidgets3/include/wx/wxcrt.h b/Externals/wxWidgets3/include/wx/wxcrt.h deleted file mode 100644 index dbf556310c..0000000000 --- a/Externals/wxWidgets3/include/wx/wxcrt.h +++ /dev/null @@ -1,980 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/wxcrt.h -// Purpose: Type-safe ANSI and Unicode builds compatible wrappers for -// CRT functions -// Author: Joel Farley, Ove Kaaven -// Modified by: Vadim Zeitlin, Robert Roebling, Ron Lee, Vaclav Slavik -// Created: 1998/06/12 -// Copyright: (c) 1998-2006 wxWidgets dev team -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_WXCRT_H_ -#define _WX_WXCRT_H_ - -#include "wx/wxcrtbase.h" -#include "wx/string.h" - -#ifndef __WX_SETUP_H__ -// For non-configure builds assume vsscanf is available, if not Visual C -#if !defined (__VISUALC__) - #define HAVE_VSSCANF 1 -#endif -#endif - -// ============================================================================ -// misc functions -// ============================================================================ - -/* checks whether the passed in pointer is NULL and if the string is empty */ -inline bool wxIsEmpty(const char *s) { return !s || !*s; } -inline bool wxIsEmpty(const wchar_t *s) { return !s || !*s; } -inline bool wxIsEmpty(const wxScopedCharBuffer& s) { return wxIsEmpty(s.data()); } -inline bool wxIsEmpty(const wxScopedWCharBuffer& s) { return wxIsEmpty(s.data()); } -inline bool wxIsEmpty(const wxString& s) { return s.empty(); } -inline bool wxIsEmpty(const wxCStrData& s) { return s.AsString().empty(); } - - - -/* multibyte to wide char conversion functions and macros */ - -/* multibyte<->widechar conversion */ -WXDLLIMPEXP_BASE size_t wxMB2WC(wchar_t *buf, const char *psz, size_t n); -WXDLLIMPEXP_BASE size_t wxWC2MB(char *buf, const wchar_t *psz, size_t n); - -#if wxUSE_UNICODE - #define wxMB2WX wxMB2WC - #define wxWX2MB wxWC2MB - #define wxWC2WX wxStrncpy - #define wxWX2WC wxStrncpy -#else - #define wxMB2WX wxStrncpy - #define wxWX2MB wxStrncpy - #define wxWC2WX wxWC2MB - #define wxWX2WC wxMB2WC -#endif - - -// RN: We could do the usual tricky compiler detection here, -// and use their variant (such as wmemchr, etc.). The problem -// is that these functions are quite rare, even though they are -// part of the current POSIX standard. In addition, most compilers -// (including even MSC) inline them just like we do right in their -// headers. -// -#include - -#if wxUSE_UNICODE - //implement our own wmem variants - inline wxChar* wxTmemchr(const wxChar* s, wxChar c, size_t l) - { - for(;l && *s != c;--l, ++s) {} - - if(l) - return const_cast(s); - return NULL; - } - - inline int wxTmemcmp(const wxChar* sz1, const wxChar* sz2, size_t len) - { - for(; *sz1 == *sz2 && len; --len, ++sz1, ++sz2) {} - - if(len) - return *sz1 < *sz2 ? -1 : *sz1 > *sz2; - else - return 0; - } - - inline wxChar* wxTmemcpy(wxChar* szOut, const wxChar* szIn, size_t len) - { - return (wxChar*) memcpy(szOut, szIn, len * sizeof(wxChar)); - } - - inline wxChar* wxTmemmove(wxChar* szOut, const wxChar* szIn, size_t len) - { - return (wxChar*) memmove(szOut, szIn, len * sizeof(wxChar)); - } - - inline wxChar* wxTmemset(wxChar* szOut, wxChar cIn, size_t len) - { - wxChar* szRet = szOut; - - while (len--) - *szOut++ = cIn; - - return szRet; - } -#endif /* wxUSE_UNICODE */ - -// provide trivial wrappers for char* versions for both ANSI and Unicode builds -// (notice that these intentionally return "char *" and not "void *" unlike the -// standard memxxx() for symmetry with the wide char versions): -inline char* wxTmemchr(const char* s, char c, size_t len) - { return (char*)memchr(s, c, len); } -inline int wxTmemcmp(const char* sz1, const char* sz2, size_t len) - { return memcmp(sz1, sz2, len); } -inline char* wxTmemcpy(char* szOut, const char* szIn, size_t len) - { return (char*)memcpy(szOut, szIn, len); } -inline char* wxTmemmove(char* szOut, const char* szIn, size_t len) - { return (char*)memmove(szOut, szIn, len); } -inline char* wxTmemset(char* szOut, char cIn, size_t len) - { return (char*)memset(szOut, cIn, len); } - - -// ============================================================================ -// wx wrappers for CRT functions in both char* and wchar_t* versions -// ============================================================================ - -// A few notes on implementation of these wrappers: -// -// We need both char* and wchar_t* versions of functions like wxStrlen() for -// compatibility with both ANSI and Unicode builds. -// -// This makes passing wxString or c_str()/mb_str()/wc_str() result to them -// ambiguous, so we need to provide overrides for that as well (in cases where -// it makes sense). -// -// We can do this without problems for some functions (wxStrlen()), but in some -// cases, we can't stay compatible with both ANSI and Unicode builds, e.g. for -// wxStrcpy(const wxString&), which can only return either char* or wchar_t*. -// In these cases, we preserve ANSI build compatibility by returning char*. - -// ---------------------------------------------------------------------------- -// locale functions -// ---------------------------------------------------------------------------- - -// NB: we can't provide const wchar_t* (= wxChar*) overload, because calling -// wxSetlocale(category, NULL) -- which is a common thing to do -- would be -// ambiguous -WXDLLIMPEXP_BASE char* wxSetlocale(int category, const char *locale); -inline char* wxSetlocale(int category, const wxScopedCharBuffer& locale) - { return wxSetlocale(category, locale.data()); } -inline char* wxSetlocale(int category, const wxString& locale) - { return wxSetlocale(category, locale.mb_str()); } -inline char* wxSetlocale(int category, const wxCStrData& locale) - { return wxSetlocale(category, locale.AsCharBuf()); } - -// ---------------------------------------------------------------------------- -// string functions -// ---------------------------------------------------------------------------- - -/* safe version of strlen() (returns 0 if passed NULL pointer) */ -// NB: these are defined in wxcrtbase.h, see the comment there -// inline size_t wxStrlen(const char *s) { return s ? strlen(s) : 0; } -// inline size_t wxStrlen(const wchar_t *s) { return s ? wxCRT_Strlen_(s) : 0; } -inline size_t wxStrlen(const wxScopedCharBuffer& s) { return wxStrlen(s.data()); } -inline size_t wxStrlen(const wxScopedWCharBuffer& s) { return wxStrlen(s.data()); } -inline size_t wxStrlen(const wxString& s) { return s.length(); } -inline size_t wxStrlen(const wxCStrData& s) { return s.AsString().length(); } - -// this is a function new in 2.9 so we don't care about backwards compatibility and -// so don't need to support wxScopedCharBuffer/wxScopedWCharBuffer overloads -#if defined(wxCRT_StrnlenA) -inline size_t wxStrnlen(const char *str, size_t maxlen) { return wxCRT_StrnlenA(str, maxlen); } -#else -inline size_t wxStrnlen(const char *str, size_t maxlen) -{ - size_t n; - for ( n = 0; n < maxlen; n++ ) - if ( !str[n] ) - break; - - return n; -} -#endif - -#if defined(wxCRT_StrnlenW) -inline size_t wxStrnlen(const wchar_t *str, size_t maxlen) { return wxCRT_StrnlenW(str, maxlen); } -#else -inline size_t wxStrnlen(const wchar_t *str, size_t maxlen) -{ - size_t n; - for ( n = 0; n < maxlen; n++ ) - if ( !str[n] ) - break; - - return n; -} -#endif - -// NB: these are defined in wxcrtbase.h, see the comment there -// inline char* wxStrdup(const char *s) { return wxStrdupA(s); } -// inline wchar_t* wxStrdup(const wchar_t *s) { return wxStrdupW(s); } -inline char* wxStrdup(const wxScopedCharBuffer& s) { return wxStrdup(s.data()); } -inline wchar_t* wxStrdup(const wxScopedWCharBuffer& s) { return wxStrdup(s.data()); } -inline char* wxStrdup(const wxString& s) { return wxStrdup(s.mb_str()); } -inline char* wxStrdup(const wxCStrData& s) { return wxStrdup(s.AsCharBuf()); } - -inline char *wxStrcpy(char *dest, const char *src) - { return wxCRT_StrcpyA(dest, src); } -inline wchar_t *wxStrcpy(wchar_t *dest, const wchar_t *src) - { return wxCRT_StrcpyW(dest, src); } -inline char *wxStrcpy(char *dest, const wxString& src) - { return wxCRT_StrcpyA(dest, src.mb_str()); } -inline char *wxStrcpy(char *dest, const wxCStrData& src) - { return wxCRT_StrcpyA(dest, src.AsCharBuf()); } -inline char *wxStrcpy(char *dest, const wxScopedCharBuffer& src) - { return wxCRT_StrcpyA(dest, src.data()); } -inline wchar_t *wxStrcpy(wchar_t *dest, const wxString& src) - { return wxCRT_StrcpyW(dest, src.wc_str()); } -inline wchar_t *wxStrcpy(wchar_t *dest, const wxCStrData& src) - { return wxCRT_StrcpyW(dest, src.AsWCharBuf()); } -inline wchar_t *wxStrcpy(wchar_t *dest, const wxScopedWCharBuffer& src) - { return wxCRT_StrcpyW(dest, src.data()); } -inline char *wxStrcpy(char *dest, const wchar_t *src) - { return wxCRT_StrcpyA(dest, wxConvLibc.cWC2MB(src)); } -inline wchar_t *wxStrcpy(wchar_t *dest, const char *src) - { return wxCRT_StrcpyW(dest, wxConvLibc.cMB2WC(src)); } - -inline char *wxStrncpy(char *dest, const char *src, size_t n) - { return wxCRT_StrncpyA(dest, src, n); } -inline wchar_t *wxStrncpy(wchar_t *dest, const wchar_t *src, size_t n) - { return wxCRT_StrncpyW(dest, src, n); } -inline char *wxStrncpy(char *dest, const wxString& src, size_t n) - { return wxCRT_StrncpyA(dest, src.mb_str(), n); } -inline char *wxStrncpy(char *dest, const wxCStrData& src, size_t n) - { return wxCRT_StrncpyA(dest, src.AsCharBuf(), n); } -inline char *wxStrncpy(char *dest, const wxScopedCharBuffer& src, size_t n) - { return wxCRT_StrncpyA(dest, src.data(), n); } -inline wchar_t *wxStrncpy(wchar_t *dest, const wxString& src, size_t n) - { return wxCRT_StrncpyW(dest, src.wc_str(), n); } -inline wchar_t *wxStrncpy(wchar_t *dest, const wxCStrData& src, size_t n) - { return wxCRT_StrncpyW(dest, src.AsWCharBuf(), n); } -inline wchar_t *wxStrncpy(wchar_t *dest, const wxScopedWCharBuffer& src, size_t n) - { return wxCRT_StrncpyW(dest, src.data(), n); } -inline char *wxStrncpy(char *dest, const wchar_t *src, size_t n) - { return wxCRT_StrncpyA(dest, wxConvLibc.cWC2MB(src), n); } -inline wchar_t *wxStrncpy(wchar_t *dest, const char *src, size_t n) - { return wxCRT_StrncpyW(dest, wxConvLibc.cMB2WC(src), n); } - -// this is a function new in 2.9 so we don't care about backwards compatibility and -// so don't need to support wchar_t/char overloads -inline size_t wxStrlcpy(char *dest, const char *src, size_t n) -{ - const size_t len = wxCRT_StrlenA(src); - - if ( n ) - { - if ( n-- > len ) - n = len; - wxCRT_StrncpyA(dest, src, n); - dest[n] = '\0'; - } - - return len; -} -inline size_t wxStrlcpy(wchar_t *dest, const wchar_t *src, size_t n) -{ - const size_t len = wxCRT_StrlenW(src); - if ( n ) - { - if ( n-- > len ) - n = len; - wxCRT_StrncpyW(dest, src, n); - dest[n] = L'\0'; - } - - return len; -} - -inline char *wxStrcat(char *dest, const char *src) - { return wxCRT_StrcatA(dest, src); } -inline wchar_t *wxStrcat(wchar_t *dest, const wchar_t *src) - { return wxCRT_StrcatW(dest, src); } -inline char *wxStrcat(char *dest, const wxString& src) - { return wxCRT_StrcatA(dest, src.mb_str()); } -inline char *wxStrcat(char *dest, const wxCStrData& src) - { return wxCRT_StrcatA(dest, src.AsCharBuf()); } -inline char *wxStrcat(char *dest, const wxScopedCharBuffer& src) - { return wxCRT_StrcatA(dest, src.data()); } -inline wchar_t *wxStrcat(wchar_t *dest, const wxString& src) - { return wxCRT_StrcatW(dest, src.wc_str()); } -inline wchar_t *wxStrcat(wchar_t *dest, const wxCStrData& src) - { return wxCRT_StrcatW(dest, src.AsWCharBuf()); } -inline wchar_t *wxStrcat(wchar_t *dest, const wxScopedWCharBuffer& src) - { return wxCRT_StrcatW(dest, src.data()); } -inline char *wxStrcat(char *dest, const wchar_t *src) - { return wxCRT_StrcatA(dest, wxConvLibc.cWC2MB(src)); } -inline wchar_t *wxStrcat(wchar_t *dest, const char *src) - { return wxCRT_StrcatW(dest, wxConvLibc.cMB2WC(src)); } - -inline char *wxStrncat(char *dest, const char *src, size_t n) - { return wxCRT_StrncatA(dest, src, n); } -inline wchar_t *wxStrncat(wchar_t *dest, const wchar_t *src, size_t n) - { return wxCRT_StrncatW(dest, src, n); } -inline char *wxStrncat(char *dest, const wxString& src, size_t n) - { return wxCRT_StrncatA(dest, src.mb_str(), n); } -inline char *wxStrncat(char *dest, const wxCStrData& src, size_t n) - { return wxCRT_StrncatA(dest, src.AsCharBuf(), n); } -inline char *wxStrncat(char *dest, const wxScopedCharBuffer& src, size_t n) - { return wxCRT_StrncatA(dest, src.data(), n); } -inline wchar_t *wxStrncat(wchar_t *dest, const wxString& src, size_t n) - { return wxCRT_StrncatW(dest, src.wc_str(), n); } -inline wchar_t *wxStrncat(wchar_t *dest, const wxCStrData& src, size_t n) - { return wxCRT_StrncatW(dest, src.AsWCharBuf(), n); } -inline wchar_t *wxStrncat(wchar_t *dest, const wxScopedWCharBuffer& src, size_t n) - { return wxCRT_StrncatW(dest, src.data(), n); } -inline char *wxStrncat(char *dest, const wchar_t *src, size_t n) - { return wxCRT_StrncatA(dest, wxConvLibc.cWC2MB(src), n); } -inline wchar_t *wxStrncat(wchar_t *dest, const char *src, size_t n) - { return wxCRT_StrncatW(dest, wxConvLibc.cMB2WC(src), n); } - - -#define WX_STR_DECL(name, T1, T2) name(T1 s1, T2 s2) -#define WX_STR_CALL(func, a1, a2) func(a1, a2) - -// This macro defines string function for all possible variants of arguments, -// except for those taking wxString or wxCStrData as second argument. -// Parameters: -// rettype - return type -// name - name of the (overloaded) function to define -// crtA - function to call for char* versions (takes two arguments) -// crtW - ditto for wchar_t* function -// forString - function to call when the *first* argument is wxString; -// the second argument can be any string type, so this is -// typically a template -#define WX_STR_FUNC_NO_INVERT(rettype, name, crtA, crtW, forString) \ - inline rettype WX_STR_DECL(name, const char *, const char *) \ - { return WX_STR_CALL(crtA, s1, s2); } \ - inline rettype WX_STR_DECL(name, const char *, const wchar_t *) \ - { return WX_STR_CALL(forString, wxString(s1), wxString(s2)); } \ - inline rettype WX_STR_DECL(name, const char *, const wxScopedCharBuffer&) \ - { return WX_STR_CALL(crtA, s1, s2.data()); } \ - inline rettype WX_STR_DECL(name, const char *, const wxScopedWCharBuffer&) \ - { return WX_STR_CALL(forString, wxString(s1), s2.data()); } \ - \ - inline rettype WX_STR_DECL(name, const wchar_t *, const wchar_t *) \ - { return WX_STR_CALL(crtW, s1, s2); } \ - inline rettype WX_STR_DECL(name, const wchar_t *, const char *) \ - { return WX_STR_CALL(forString, wxString(s1), wxString(s2)); } \ - inline rettype WX_STR_DECL(name, const wchar_t *, const wxScopedWCharBuffer&) \ - { return WX_STR_CALL(crtW, s1, s2.data()); } \ - inline rettype WX_STR_DECL(name, const wchar_t *, const wxScopedCharBuffer&) \ - { return WX_STR_CALL(forString, wxString(s1), s2.data()); } \ - \ - inline rettype WX_STR_DECL(name, const wxScopedCharBuffer&, const char *) \ - { return WX_STR_CALL(crtA, s1.data(), s2); } \ - inline rettype WX_STR_DECL(name, const wxScopedCharBuffer&, const wchar_t *) \ - { return WX_STR_CALL(forString, wxString(s1), wxString(s2)); } \ - inline rettype WX_STR_DECL(name, const wxScopedCharBuffer&, const wxScopedCharBuffer&)\ - { return WX_STR_CALL(crtA, s1.data(), s2.data()); } \ - inline rettype WX_STR_DECL(name, const wxScopedCharBuffer&, const wxScopedWCharBuffer&) \ - { return WX_STR_CALL(forString, wxString(s1), wxString(s2)); } \ - \ - inline rettype WX_STR_DECL(name, const wxScopedWCharBuffer&, const wchar_t *) \ - { return WX_STR_CALL(crtW, s1.data(), s2); } \ - inline rettype WX_STR_DECL(name, const wxScopedWCharBuffer&, const char *) \ - { return WX_STR_CALL(forString, wxString(s1), wxString(s2)); } \ - inline rettype WX_STR_DECL(name, const wxScopedWCharBuffer&, const wxScopedWCharBuffer&) \ - { return WX_STR_CALL(crtW, s1.data(), s2.data()); } \ - inline rettype WX_STR_DECL(name, const wxScopedWCharBuffer&, const wxScopedCharBuffer&) \ - { return WX_STR_CALL(forString, wxString(s1), wxString(s2)); } \ - \ - inline rettype WX_STR_DECL(name, const wxString&, const char*) \ - { return WX_STR_CALL(forString, s1, s2); } \ - inline rettype WX_STR_DECL(name, const wxString&, const wchar_t*) \ - { return WX_STR_CALL(forString, s1, s2); } \ - inline rettype WX_STR_DECL(name, const wxString&, const wxScopedCharBuffer&) \ - { return WX_STR_CALL(forString, s1, s2); } \ - inline rettype WX_STR_DECL(name, const wxString&, const wxScopedWCharBuffer&) \ - { return WX_STR_CALL(forString, s1, s2); } \ - inline rettype WX_STR_DECL(name, const wxString&, const wxString&) \ - { return WX_STR_CALL(forString, s1, s2); } \ - inline rettype WX_STR_DECL(name, const wxString&, const wxCStrData&) \ - { return WX_STR_CALL(forString, s1, s2); } \ - \ - inline rettype WX_STR_DECL(name, const wxCStrData&, const char*) \ - { return WX_STR_CALL(forString, s1.AsString(), s2); } \ - inline rettype WX_STR_DECL(name, const wxCStrData&, const wchar_t*) \ - { return WX_STR_CALL(forString, s1.AsString(), s2); } \ - inline rettype WX_STR_DECL(name, const wxCStrData&, const wxScopedCharBuffer&) \ - { return WX_STR_CALL(forString, s1.AsString(), s2); } \ - inline rettype WX_STR_DECL(name, const wxCStrData&, const wxScopedWCharBuffer&) \ - { return WX_STR_CALL(forString, s1.AsString(), s2); } \ - inline rettype WX_STR_DECL(name, const wxCStrData&, const wxString&) \ - { return WX_STR_CALL(forString, s1.AsString(), s2); } \ - inline rettype WX_STR_DECL(name, const wxCStrData&, const wxCStrData&) \ - { return WX_STR_CALL(forString, s1.AsString(), s2); } - -// This defines strcmp-like function, i.e. one returning the result of -// comparison; see WX_STR_FUNC_NO_INVERT for explanation of the arguments -#define WX_STRCMP_FUNC(name, crtA, crtW, forString) \ - WX_STR_FUNC_NO_INVERT(int, name, crtA, crtW, forString) \ - \ - inline int WX_STR_DECL(name, const char *, const wxCStrData&) \ - { return -WX_STR_CALL(forString, s2.AsString(), s1); } \ - inline int WX_STR_DECL(name, const char *, const wxString&) \ - { return -WX_STR_CALL(forString, s2, s1); } \ - \ - inline int WX_STR_DECL(name, const wchar_t *, const wxCStrData&) \ - { return -WX_STR_CALL(forString, s2.AsString(), s1); } \ - inline int WX_STR_DECL(name, const wchar_t *, const wxString&) \ - { return -WX_STR_CALL(forString, s2, s1); } \ - \ - inline int WX_STR_DECL(name, const wxScopedCharBuffer&, const wxCStrData&) \ - { return -WX_STR_CALL(forString, s2.AsString(), s1.data()); } \ - inline int WX_STR_DECL(name, const wxScopedCharBuffer&, const wxString&) \ - { return -WX_STR_CALL(forString, s2, s1.data()); } \ - \ - inline int WX_STR_DECL(name, const wxScopedWCharBuffer&, const wxCStrData&) \ - { return -WX_STR_CALL(forString, s2.AsString(), s1.data()); } \ - inline int WX_STR_DECL(name, const wxScopedWCharBuffer&, const wxString&) \ - { return -WX_STR_CALL(forString, s2, s1.data()); } - - -// This defines a string function that is *not* strcmp-like, i.e. doesn't -// return the result of comparison and so if the second argument is a string, -// it has to be converted to char* or wchar_t* -#define WX_STR_FUNC(rettype, name, crtA, crtW, forString) \ - WX_STR_FUNC_NO_INVERT(rettype, name, crtA, crtW, forString) \ - \ - inline rettype WX_STR_DECL(name, const char *, const wxCStrData&) \ - { return WX_STR_CALL(crtA, s1, s2.AsCharBuf()); } \ - inline rettype WX_STR_DECL(name, const char *, const wxString&) \ - { return WX_STR_CALL(crtA, s1, s2.mb_str()); } \ - \ - inline rettype WX_STR_DECL(name, const wchar_t *, const wxCStrData&) \ - { return WX_STR_CALL(crtW, s1, s2.AsWCharBuf()); } \ - inline rettype WX_STR_DECL(name, const wchar_t *, const wxString&) \ - { return WX_STR_CALL(crtW, s1, s2.wc_str()); } \ - \ - inline rettype WX_STR_DECL(name, const wxScopedCharBuffer&, const wxCStrData&) \ - { return WX_STR_CALL(crtA, s1.data(), s2.AsCharBuf()); } \ - inline rettype WX_STR_DECL(name, const wxScopedCharBuffer&, const wxString&) \ - { return WX_STR_CALL(crtA, s1.data(), s2.mb_str()); } \ - \ - inline rettype WX_STR_DECL(name, const wxScopedWCharBuffer&, const wxCStrData&) \ - { return WX_STR_CALL(crtW, s1.data(), s2.AsWCharBuf()); } \ - inline rettype WX_STR_DECL(name, const wxScopedWCharBuffer&, const wxString&) \ - { return WX_STR_CALL(crtW, s1.data(), s2.wc_str()); } - -template -inline int wxStrcmp_String(const wxString& s1, const T& s2) - { return s1.compare(s2); } -WX_STRCMP_FUNC(wxStrcmp, wxCRT_StrcmpA, wxCRT_StrcmpW, wxStrcmp_String) - -template -inline int wxStricmp_String(const wxString& s1, const T& s2) - { return s1.CmpNoCase(s2); } -WX_STRCMP_FUNC(wxStricmp, wxCRT_StricmpA, wxCRT_StricmpW, wxStricmp_String) - -#if defined(wxCRT_StrcollA) && defined(wxCRT_StrcollW) - -// GCC 3.4 and other compilers have a bug that causes it to fail compilation if -// the template's implementation uses overloaded function declared later (see -// the wxStrcoll() call in wxStrcoll_String()), so we have to -// forward-declare the template and implement it below WX_STRCMP_FUNC. OTOH, -// this causes problems with GCC visibility in newer GCC versions. -#if !(wxCHECK_GCC_VERSION(3,5) && !wxCHECK_GCC_VERSION(4,7)) || defined(__clang__) - #define wxNEEDS_DECL_BEFORE_TEMPLATE -#endif - -#ifdef wxNEEDS_DECL_BEFORE_TEMPLATE -template -inline int wxStrcoll_String(const wxString& s1, const T& s2); -WX_STRCMP_FUNC(wxStrcoll, wxCRT_StrcollA, wxCRT_StrcollW, wxStrcoll_String) -#endif // wxNEEDS_DECL_BEFORE_TEMPLATE - -template -inline int wxStrcoll_String(const wxString& s1, const T& s2) -{ -#if wxUSE_UNICODE - // NB: strcoll() doesn't work correctly on UTF-8 strings, so we have to use - // wc_str() even if wxUSE_UNICODE_UTF8; the (const wchar_t*) cast is - // there just as optimization to avoid going through - // wxStrcoll: - return wxStrcoll((const wchar_t*)s1.wc_str(), s2); -#else - return wxStrcoll((const char*)s1.mb_str(), s2); -#endif -} - -#ifndef wxNEEDS_DECL_BEFORE_TEMPLATE -// this is exactly the same WX_STRCMP_FUNC line as above, insde the -// wxNEEDS_DECL_BEFORE_TEMPLATE case -WX_STRCMP_FUNC(wxStrcoll, wxCRT_StrcollA, wxCRT_StrcollW, wxStrcoll_String) -#endif - -#endif // defined(wxCRT_Strcoll[AW]) - -template -inline size_t wxStrspn_String(const wxString& s1, const T& s2) -{ - size_t pos = s1.find_first_not_of(s2); - return pos == wxString::npos ? s1.length() : pos; -} -WX_STR_FUNC(size_t, wxStrspn, wxCRT_StrspnA, wxCRT_StrspnW, wxStrspn_String) - -template -inline size_t wxStrcspn_String(const wxString& s1, const T& s2) -{ - size_t pos = s1.find_first_of(s2); - return pos == wxString::npos ? s1.length() : pos; -} -WX_STR_FUNC(size_t, wxStrcspn, wxCRT_StrcspnA, wxCRT_StrcspnW, wxStrcspn_String) - -#undef WX_STR_DECL -#undef WX_STR_CALL -#define WX_STR_DECL(name, T1, T2) name(T1 s1, T2 s2, size_t n) -#define WX_STR_CALL(func, a1, a2) func(a1, a2, n) - -template -inline int wxStrncmp_String(const wxString& s1, const T& s2, size_t n) - { return s1.compare(0, n, s2, 0, n); } -WX_STRCMP_FUNC(wxStrncmp, wxCRT_StrncmpA, wxCRT_StrncmpW, wxStrncmp_String) - -template -inline int wxStrnicmp_String(const wxString& s1, const T& s2, size_t n) - { return s1.substr(0, n).CmpNoCase(wxString(s2).substr(0, n)); } -WX_STRCMP_FUNC(wxStrnicmp, wxCRT_StrnicmpA, wxCRT_StrnicmpW, wxStrnicmp_String) - -#undef WX_STR_DECL -#undef WX_STR_CALL -#undef WX_STRCMP_FUNC -#undef WX_STR_FUNC -#undef WX_STR_FUNC_NO_INVERT - -#if defined(wxCRT_StrxfrmA) && defined(wxCRT_StrxfrmW) - -inline size_t wxStrxfrm(char *dest, const char *src, size_t n) - { return wxCRT_StrxfrmA(dest, src, n); } -inline size_t wxStrxfrm(wchar_t *dest, const wchar_t *src, size_t n) - { return wxCRT_StrxfrmW(dest, src, n); } -template -inline size_t wxStrxfrm(T *dest, const wxScopedCharTypeBuffer& src, size_t n) - { return wxStrxfrm(dest, src.data(), n); } -inline size_t wxStrxfrm(char *dest, const wxString& src, size_t n) - { return wxCRT_StrxfrmA(dest, src.mb_str(), n); } -inline size_t wxStrxfrm(wchar_t *dest, const wxString& src, size_t n) - { return wxCRT_StrxfrmW(dest, src.wc_str(), n); } -inline size_t wxStrxfrm(char *dest, const wxCStrData& src, size_t n) - { return wxCRT_StrxfrmA(dest, src.AsCharBuf(), n); } -inline size_t wxStrxfrm(wchar_t *dest, const wxCStrData& src, size_t n) - { return wxCRT_StrxfrmW(dest, src.AsWCharBuf(), n); } - -#endif // defined(wxCRT_Strxfrm[AW]) - -inline char *wxStrtok(char *str, const char *delim, char **saveptr) - { return wxCRT_StrtokA(str, delim, saveptr); } -inline wchar_t *wxStrtok(wchar_t *str, const wchar_t *delim, wchar_t **saveptr) - { return wxCRT_StrtokW(str, delim, saveptr); } -template -inline T *wxStrtok(T *str, const wxScopedCharTypeBuffer& delim, T **saveptr) - { return wxStrtok(str, delim.data(), saveptr); } -inline char *wxStrtok(char *str, const wxCStrData& delim, char **saveptr) - { return wxCRT_StrtokA(str, delim.AsCharBuf(), saveptr); } -inline wchar_t *wxStrtok(wchar_t *str, const wxCStrData& delim, wchar_t **saveptr) - { return wxCRT_StrtokW(str, delim.AsWCharBuf(), saveptr); } -inline char *wxStrtok(char *str, const wxString& delim, char **saveptr) - { return wxCRT_StrtokA(str, delim.mb_str(), saveptr); } -inline wchar_t *wxStrtok(wchar_t *str, const wxString& delim, wchar_t **saveptr) - { return wxCRT_StrtokW(str, delim.wc_str(), saveptr); } - -inline const char *wxStrstr(const char *haystack, const char *needle) - { return wxCRT_StrstrA(haystack, needle); } -inline const wchar_t *wxStrstr(const wchar_t *haystack, const wchar_t *needle) - { return wxCRT_StrstrW(haystack, needle); } -inline const char *wxStrstr(const char *haystack, const wxString& needle) - { return wxCRT_StrstrA(haystack, needle.mb_str()); } -inline const wchar_t *wxStrstr(const wchar_t *haystack, const wxString& needle) - { return wxCRT_StrstrW(haystack, needle.wc_str()); } -// these functions return char* pointer into the non-temporary conversion buffer -// used by c_str()'s implicit conversion to char*, for ANSI build compatibility -inline const char *wxStrstr(const wxString& haystack, const wxString& needle) - { return wxCRT_StrstrA(haystack.c_str(), needle.mb_str()); } -inline const char *wxStrstr(const wxCStrData& haystack, const wxString& needle) - { return wxCRT_StrstrA(haystack, needle.mb_str()); } -inline const char *wxStrstr(const wxCStrData& haystack, const wxCStrData& needle) - { return wxCRT_StrstrA(haystack, needle.AsCharBuf()); } -// if 'needle' is char/wchar_t, then the same is probably wanted as return value -inline const char *wxStrstr(const wxString& haystack, const char *needle) - { return wxCRT_StrstrA(haystack.c_str(), needle); } -inline const char *wxStrstr(const wxCStrData& haystack, const char *needle) - { return wxCRT_StrstrA(haystack, needle); } -inline const wchar_t *wxStrstr(const wxString& haystack, const wchar_t *needle) - { return wxCRT_StrstrW(haystack.c_str(), needle); } -inline const wchar_t *wxStrstr(const wxCStrData& haystack, const wchar_t *needle) - { return wxCRT_StrstrW(haystack, needle); } - -inline const char *wxStrchr(const char *s, char c) - { return wxCRT_StrchrA(s, c); } -inline const wchar_t *wxStrchr(const wchar_t *s, wchar_t c) - { return wxCRT_StrchrW(s, c); } -inline const char *wxStrrchr(const char *s, char c) - { return wxCRT_StrrchrA(s, c); } -inline const wchar_t *wxStrrchr(const wchar_t *s, wchar_t c) - { return wxCRT_StrrchrW(s, c); } -inline const char *wxStrchr(const char *s, const wxUniChar& uc) - { char c; return uc.GetAsChar(&c) ? wxCRT_StrchrA(s, c) : NULL; } -inline const wchar_t *wxStrchr(const wchar_t *s, const wxUniChar& c) - { return wxCRT_StrchrW(s, (wchar_t)c); } -inline const char *wxStrrchr(const char *s, const wxUniChar& uc) - { char c; return uc.GetAsChar(&c) ? wxCRT_StrrchrA(s, c) : NULL; } -inline const wchar_t *wxStrrchr(const wchar_t *s, const wxUniChar& c) - { return wxCRT_StrrchrW(s, (wchar_t)c); } -inline const char *wxStrchr(const char *s, const wxUniCharRef& uc) - { char c; return uc.GetAsChar(&c) ? wxCRT_StrchrA(s, c) : NULL; } -inline const wchar_t *wxStrchr(const wchar_t *s, const wxUniCharRef& c) - { return wxCRT_StrchrW(s, (wchar_t)c); } -inline const char *wxStrrchr(const char *s, const wxUniCharRef& uc) - { char c; return uc.GetAsChar(&c) ? wxCRT_StrrchrA(s, c) : NULL; } -inline const wchar_t *wxStrrchr(const wchar_t *s, const wxUniCharRef& c) - { return wxCRT_StrrchrW(s, (wchar_t)c); } -template -inline const T* wxStrchr(const wxScopedCharTypeBuffer& s, T c) - { return wxStrchr(s.data(), c); } -template -inline const T* wxStrrchr(const wxScopedCharTypeBuffer& s, T c) - { return wxStrrchr(s.data(), c); } -template -inline const T* wxStrchr(const wxScopedCharTypeBuffer& s, const wxUniChar& c) - { return wxStrchr(s.data(), (T)c); } -template -inline const T* wxStrrchr(const wxScopedCharTypeBuffer& s, const wxUniChar& c) - { return wxStrrchr(s.data(), (T)c); } -template -inline const T* wxStrchr(const wxScopedCharTypeBuffer& s, const wxUniCharRef& c) - { return wxStrchr(s.data(), (T)c); } -template -inline const T* wxStrrchr(const wxScopedCharTypeBuffer& s, const wxUniCharRef& c) - { return wxStrrchr(s.data(), (T)c); } -// these functions return char* pointer into the non-temporary conversion buffer -// used by c_str()'s implicit conversion to char*, for ANSI build compatibility -inline const char* wxStrchr(const wxString& s, char c) - { return wxCRT_StrchrA((const char*)s.c_str(), c); } -inline const char* wxStrrchr(const wxString& s, char c) - { return wxCRT_StrrchrA((const char*)s.c_str(), c); } -inline const char* wxStrchr(const wxString& s, int c) - { return wxCRT_StrchrA((const char*)s.c_str(), c); } -inline const char* wxStrrchr(const wxString& s, int c) - { return wxCRT_StrrchrA((const char*)s.c_str(), c); } -inline const char* wxStrchr(const wxString& s, const wxUniChar& uc) - { char c; return uc.GetAsChar(&c) ? wxCRT_StrchrA(s.c_str(), c) : NULL; } -inline const char* wxStrrchr(const wxString& s, const wxUniChar& uc) - { char c; return uc.GetAsChar(&c) ? wxCRT_StrrchrA(s.c_str(), c) : NULL; } -inline const char* wxStrchr(const wxString& s, const wxUniCharRef& uc) - { char c; return uc.GetAsChar(&c) ? wxCRT_StrchrA(s.c_str(), c) : NULL; } -inline const char* wxStrrchr(const wxString& s, const wxUniCharRef& uc) - { char c; return uc.GetAsChar(&c) ? wxCRT_StrrchrA(s.c_str(), c) : NULL; } -inline const wchar_t* wxStrchr(const wxString& s, wchar_t c) - { return wxCRT_StrchrW((const wchar_t*)s.c_str(), c); } -inline const wchar_t* wxStrrchr(const wxString& s, wchar_t c) - { return wxCRT_StrrchrW((const wchar_t*)s.c_str(), c); } -inline const char* wxStrchr(const wxCStrData& s, char c) - { return wxCRT_StrchrA(s.AsChar(), c); } -inline const char* wxStrrchr(const wxCStrData& s, char c) - { return wxCRT_StrrchrA(s.AsChar(), c); } -inline const char* wxStrchr(const wxCStrData& s, int c) - { return wxCRT_StrchrA(s.AsChar(), c); } -inline const char* wxStrrchr(const wxCStrData& s, int c) - { return wxCRT_StrrchrA(s.AsChar(), c); } -inline const char* wxStrchr(const wxCStrData& s, const wxUniChar& uc) - { char c; return uc.GetAsChar(&c) ? wxCRT_StrchrA(s, c) : NULL; } -inline const char* wxStrrchr(const wxCStrData& s, const wxUniChar& uc) - { char c; return uc.GetAsChar(&c) ? wxCRT_StrrchrA(s, c) : NULL; } -inline const char* wxStrchr(const wxCStrData& s, const wxUniCharRef& uc) - { char c; return uc.GetAsChar(&c) ? wxCRT_StrchrA(s, c) : NULL; } -inline const char* wxStrrchr(const wxCStrData& s, const wxUniCharRef& uc) - { char c; return uc.GetAsChar(&c) ? wxCRT_StrrchrA(s, c) : NULL; } -inline const wchar_t* wxStrchr(const wxCStrData& s, wchar_t c) - { return wxCRT_StrchrW(s.AsWChar(), c); } -inline const wchar_t* wxStrrchr(const wxCStrData& s, wchar_t c) - { return wxCRT_StrrchrW(s.AsWChar(), c); } - -inline const char *wxStrpbrk(const char *s, const char *accept) - { return wxCRT_StrpbrkA(s, accept); } -inline const wchar_t *wxStrpbrk(const wchar_t *s, const wchar_t *accept) - { return wxCRT_StrpbrkW(s, accept); } -inline const char *wxStrpbrk(const char *s, const wxString& accept) - { return wxCRT_StrpbrkA(s, accept.mb_str()); } -inline const char *wxStrpbrk(const char *s, const wxCStrData& accept) - { return wxCRT_StrpbrkA(s, accept.AsCharBuf()); } -inline const wchar_t *wxStrpbrk(const wchar_t *s, const wxString& accept) - { return wxCRT_StrpbrkW(s, accept.wc_str()); } -inline const wchar_t *wxStrpbrk(const wchar_t *s, const wxCStrData& accept) - { return wxCRT_StrpbrkW(s, accept.AsWCharBuf()); } -inline const char *wxStrpbrk(const wxString& s, const wxString& accept) - { return wxCRT_StrpbrkA(s.c_str(), accept.mb_str()); } -inline const char *wxStrpbrk(const wxString& s, const char *accept) - { return wxCRT_StrpbrkA(s.c_str(), accept); } -inline const wchar_t *wxStrpbrk(const wxString& s, const wchar_t *accept) - { return wxCRT_StrpbrkW(s.wc_str(), accept); } -inline const char *wxStrpbrk(const wxString& s, const wxCStrData& accept) - { return wxCRT_StrpbrkA(s.c_str(), accept.AsCharBuf()); } -inline const char *wxStrpbrk(const wxCStrData& s, const wxString& accept) - { return wxCRT_StrpbrkA(s.AsChar(), accept.mb_str()); } -inline const char *wxStrpbrk(const wxCStrData& s, const char *accept) - { return wxCRT_StrpbrkA(s.AsChar(), accept); } -inline const wchar_t *wxStrpbrk(const wxCStrData& s, const wchar_t *accept) - { return wxCRT_StrpbrkW(s.AsWChar(), accept); } -inline const char *wxStrpbrk(const wxCStrData& s, const wxCStrData& accept) - { return wxCRT_StrpbrkA(s.AsChar(), accept.AsCharBuf()); } -template -inline const T *wxStrpbrk(const S& s, const wxScopedCharTypeBuffer& accept) - { return wxStrpbrk(s, accept.data()); } - - -/* inlined non-const versions */ -template -inline char *wxStrstr(char *haystack, T needle) - { return const_cast(wxStrstr(const_cast(haystack), needle)); } -template -inline wchar_t *wxStrstr(wchar_t *haystack, T needle) - { return const_cast(wxStrstr(const_cast(haystack), needle)); } - -template -inline char * wxStrchr(char *s, T c) - { return const_cast(wxStrchr(const_cast(s), c)); } -template -inline wchar_t * wxStrchr(wchar_t *s, T c) - { return (wchar_t *)wxStrchr((const wchar_t *)s, c); } -template -inline char * wxStrrchr(char *s, T c) - { return const_cast(wxStrrchr(const_cast(s), c)); } -template -inline wchar_t * wxStrrchr(wchar_t *s, T c) - { return const_cast(wxStrrchr(const_cast(s), c)); } - -template -inline char * wxStrpbrk(char *s, T accept) - { return const_cast(wxStrpbrk(const_cast(s), accept)); } -template -inline wchar_t * wxStrpbrk(wchar_t *s, T accept) - { return const_cast(wxStrpbrk(const_cast(s), accept)); } - - -// ---------------------------------------------------------------------------- -// stdio.h functions -// ---------------------------------------------------------------------------- - -// NB: using fn_str() for mode is a hack to get the same type (char*/wchar_t*) -// as needed, the conversion itself doesn't matter, it's ASCII -inline FILE *wxFopen(const wxString& path, const wxString& mode) - { return wxCRT_Fopen(path.fn_str(), mode.fn_str()); } -inline FILE *wxFreopen(const wxString& path, const wxString& mode, FILE *stream) - { return wxCRT_Freopen(path.fn_str(), mode.fn_str(), stream); } -inline int wxRemove(const wxString& path) - { return wxCRT_Remove(path.fn_str()); } -inline int wxRename(const wxString& oldpath, const wxString& newpath) - { return wxCRT_Rename(oldpath.fn_str(), newpath.fn_str()); } - -extern WXDLLIMPEXP_BASE int wxPuts(const wxString& s); -extern WXDLLIMPEXP_BASE int wxFputs(const wxString& s, FILE *stream); -extern WXDLLIMPEXP_BASE void wxPerror(const wxString& s); - -extern WXDLLIMPEXP_BASE int wxFputc(const wxUniChar& c, FILE *stream); - -#define wxPutc(c, stream) wxFputc(c, stream) -#define wxPutchar(c) wxFputc(c, stdout) -#define wxFputchar(c) wxPutchar(c) - -// NB: We only provide ANSI version of fgets() because fgetws() interprets the -// stream according to current locale, which is rarely what is desired. -inline char *wxFgets(char *s, int size, FILE *stream) - { return wxCRT_FgetsA(s, size, stream); } -// This version calls ANSI version and converts the string using wxConvLibc -extern WXDLLIMPEXP_BASE wchar_t *wxFgets(wchar_t *s, int size, FILE *stream); - -#define wxGets(s) wxGets_is_insecure_and_dangerous_use_wxFgets_instead - -// NB: We only provide ANSI versions of this for the same reasons as in the -// case of wxFgets() above -inline int wxFgetc(FILE *stream) { return wxCRT_FgetcA(stream); } -inline int wxUngetc(int c, FILE *stream) { return wxCRT_UngetcA(c, stream); } - -#define wxGetc(stream) wxFgetc(stream) -#define wxGetchar() wxFgetc(stdin) -#define wxFgetchar() wxGetchar() - -// ---------------------------------------------------------------------------- -// stdlib.h functions -// ---------------------------------------------------------------------------- - -#ifdef wxCRT_AtoiW -inline int wxAtoi(const wxString& str) { return wxCRT_AtoiW(str.wc_str()); } -#else -inline int wxAtoi(const wxString& str) { return wxCRT_AtoiA(str.mb_str()); } -#endif - -#ifdef wxCRT_AtolW -inline long wxAtol(const wxString& str) { return wxCRT_AtolW(str.wc_str()); } -#else -inline long wxAtol(const wxString& str) { return wxCRT_AtolA(str.mb_str()); } -#endif - -#ifdef wxCRT_AtofW -inline double wxAtof(const wxString& str) { return wxCRT_AtofW(str.wc_str()); } -#else -inline double wxAtof(const wxString& str) { return wxCRT_AtofA(str.mb_str()); } -#endif - -inline double wxStrtod(const char *nptr, char **endptr) - { return wxCRT_StrtodA(nptr, endptr); } -inline double wxStrtod(const wchar_t *nptr, wchar_t **endptr) - { return wxCRT_StrtodW(nptr, endptr); } -template -inline double wxStrtod(const wxScopedCharTypeBuffer& nptr, T **endptr) - { return wxStrtod(nptr.data(), endptr); } - -// We implement wxStrto*() like this so that the code compiles when NULL is -// passed in - - if we had just char** and wchar_t** overloads for 'endptr', it -// would be ambiguous. The solution is to use a template so that endptr can be -// any type: when NULL constant is used, the type will be int and we can handle -// that case specially. Otherwise, we infer the type that 'nptr' should be -// converted to from the type of 'endptr'. We need wxStrtoxCharType template -// to make the code compile even for T=int (that's the case when it's not going -// to be ever used, but it still has to compile). -template struct wxStrtoxCharType {}; -template<> struct wxStrtoxCharType -{ - typedef const char* Type; - static char** AsPointer(char **p) { return p; } -}; -template<> struct wxStrtoxCharType -{ - typedef const wchar_t* Type; - static wchar_t** AsPointer(wchar_t **p) { return p; } -}; -template<> struct wxStrtoxCharType -{ - typedef const char* Type; /* this one is never used */ - static char** AsPointer(int WXUNUSED_UNLESS_DEBUG(p)) - { - wxASSERT_MSG( p == 0, "passing non-NULL int is invalid" ); - return NULL; - } -}; - -template -inline double wxStrtod(const wxString& nptr, T endptr) -{ - if ( endptr == 0 ) - { - // when we don't care about endptr, use the string representation that - // doesn't require any conversion (it doesn't matter for this function - // even if its UTF-8): - return wxStrtod(nptr.wx_str(), (wxStringCharType**)NULL); - } - else - { - // note that it is important to use c_str() here and not mb_str() or - // wc_str(), because we store the pointer into (possibly converted) - // buffer in endptr and so it must be valid even when wxStrtod() returns - typedef typename wxStrtoxCharType::Type CharType; - return wxStrtod((CharType)nptr.c_str(), - wxStrtoxCharType::AsPointer(endptr)); - } -} -template -inline double wxStrtod(const wxCStrData& nptr, T endptr) - { return wxStrtod(nptr.AsString(), endptr); } - - -#define WX_STRTOX_FUNC(rettype, name, implA, implW) \ - /* see wxStrtod() above for explanation of this code: */ \ - inline rettype name(const char *nptr, char **endptr, int base) \ - { return implA(nptr, endptr, base); } \ - inline rettype name(const wchar_t *nptr, wchar_t **endptr, int base) \ - { return implW(nptr, endptr, base); } \ - template \ - inline rettype name(const wxScopedCharTypeBuffer& nptr, T **endptr, int)\ - { return name(nptr.data(), endptr); } \ - template \ - inline rettype name(const wxString& nptr, T endptr, int base) \ - { \ - if ( endptr == 0 ) \ - return name(nptr.wx_str(), (wxStringCharType**)NULL, base); \ - else \ - { \ - typedef typename wxStrtoxCharType::Type CharType; \ - return name((CharType)nptr.c_str(), \ - wxStrtoxCharType::AsPointer(endptr), \ - base); \ - } \ - } \ - template \ - inline rettype name(const wxCStrData& nptr, T endptr, int base) \ - { return name(nptr.AsString(), endptr, base); } - -WX_STRTOX_FUNC(long, wxStrtol, wxCRT_StrtolA, wxCRT_StrtolW) -WX_STRTOX_FUNC(unsigned long, wxStrtoul, wxCRT_StrtoulA, wxCRT_StrtoulW) -#ifdef wxLongLong_t -WX_STRTOX_FUNC(wxLongLong_t, wxStrtoll, wxCRT_StrtollA, wxCRT_StrtollW) -WX_STRTOX_FUNC(wxULongLong_t, wxStrtoull, wxCRT_StrtoullA, wxCRT_StrtoullW) -#endif // wxLongLong_t - -#undef WX_STRTOX_FUNC - - -// mingw32 doesn't provide _tsystem() even though it provides other stdlib.h -// functions in their wide versions -#ifdef wxCRT_SystemW -inline int wxSystem(const wxString& str) { return wxCRT_SystemW(str.wc_str()); } -#else -inline int wxSystem(const wxString& str) { return wxCRT_SystemA(str.mb_str()); } -#endif - -inline char* wxGetenv(const char *name) { return wxCRT_GetenvA(name); } -inline wchar_t* wxGetenv(const wchar_t *name) { return wxCRT_GetenvW(name); } -inline char* wxGetenv(const wxString& name) { return wxCRT_GetenvA(name.mb_str()); } -inline char* wxGetenv(const wxCStrData& name) { return wxCRT_GetenvA(name.AsCharBuf()); } -inline char* wxGetenv(const wxScopedCharBuffer& name) { return wxCRT_GetenvA(name.data()); } -inline wchar_t* wxGetenv(const wxScopedWCharBuffer& name) { return wxCRT_GetenvW(name.data()); } - -// ---------------------------------------------------------------------------- -// time.h functions -// ---------------------------------------------------------------------------- - -inline size_t wxStrftime(char *s, size_t max, - const wxString& format, const struct tm *tm) - { return wxCRT_StrftimeA(s, max, format.mb_str(), tm); } - -inline size_t wxStrftime(wchar_t *s, size_t max, - const wxString& format, const struct tm *tm) - { return wxCRT_StrftimeW(s, max, format.wc_str(), tm); } - -// NB: we can't provide both char* and wchar_t* versions for obvious reasons -// and returning wxString wouldn't work either (it would be immediately -// destroyed and if assigned to char*/wchar_t*, the pointer would be -// invalid), so we only keep ASCII version, because the returned value -// is always ASCII anyway -#define wxAsctime asctime -#define wxCtime ctime - - -// ---------------------------------------------------------------------------- -// ctype.h functions -// ---------------------------------------------------------------------------- - -// FIXME-UTF8: we'd be better off implementing these ourselves, as the CRT -// version is locale-dependent -// FIXME-UTF8: these don't work when EOF is passed in because of wxUniChar, -// is this OK or not? - -inline bool wxIsalnum(const wxUniChar& c) { return wxCRT_IsalnumW(c) != 0; } -inline bool wxIsalpha(const wxUniChar& c) { return wxCRT_IsalphaW(c) != 0; } -inline bool wxIscntrl(const wxUniChar& c) { return wxCRT_IscntrlW(c) != 0; } -inline bool wxIsdigit(const wxUniChar& c) { return wxCRT_IsdigitW(c) != 0; } -inline bool wxIsgraph(const wxUniChar& c) { return wxCRT_IsgraphW(c) != 0; } -inline bool wxIslower(const wxUniChar& c) { return wxCRT_IslowerW(c) != 0; } -inline bool wxIsprint(const wxUniChar& c) { return wxCRT_IsprintW(c) != 0; } -inline bool wxIspunct(const wxUniChar& c) { return wxCRT_IspunctW(c) != 0; } -inline bool wxIsspace(const wxUniChar& c) { return wxCRT_IsspaceW(c) != 0; } -inline bool wxIsupper(const wxUniChar& c) { return wxCRT_IsupperW(c) != 0; } -inline bool wxIsxdigit(const wxUniChar& c) { return wxCRT_IsxdigitW(c) != 0; } - -inline wxUniChar wxTolower(const wxUniChar& c) { return wxCRT_TolowerW(c); } -inline wxUniChar wxToupper(const wxUniChar& c) { return wxCRT_ToupperW(c); } - -#if WXWIN_COMPATIBILITY_2_8 -// we had goofed and defined wxIsctrl() instead of (correct) wxIscntrl() in the -// initial versions of this header -- now it is too late to remove it so -// although we fixed the function/macro name above, still provide the -// backwards-compatible synonym. -wxDEPRECATED( inline int wxIsctrl(const wxUniChar& c) ); -inline int wxIsctrl(const wxUniChar& c) { return wxIscntrl(c); } -#endif // WXWIN_COMPATIBILITY_2_8 - -inline bool wxIsascii(const wxUniChar& c) { return c.IsAscii(); } - -#endif /* _WX_WXCRT_H_ */ diff --git a/Externals/wxWidgets3/include/wx/wxcrtbase.h b/Externals/wxWidgets3/include/wx/wxcrtbase.h deleted file mode 100644 index 9b84d737bd..0000000000 --- a/Externals/wxWidgets3/include/wx/wxcrtbase.h +++ /dev/null @@ -1,664 +0,0 @@ -/* - * Name: wx/wxcrtbase.h - * Purpose: Type-safe ANSI and Unicode builds compatible wrappers for - * CRT functions - * Author: Joel Farley, Ove Kaaven - * Modified by: Vadim Zeitlin, Robert Roebling, Ron Lee - * Created: 1998/06/12 - * Copyright: (c) 1998-2006 wxWidgets dev team - * Licence: wxWindows licence - */ - -/* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */ - -#ifndef _WX_WXCRTBASE_H_ -#define _WX_WXCRTBASE_H_ - -/* ------------------------------------------------------------------------- - headers and missing declarations - ------------------------------------------------------------------------- */ - -#include "wx/chartype.h" - -/* - Standard headers we need here. - - NB: don't include any wxWidgets headers here because almost all of them - include this one! - - NB2: User code should include wx/crt.h instead of including this - header directly. - - */ - -#include -#include -#include -#include -#include - -#if defined(__WINDOWS__) - #include -#endif - -#if defined(HAVE_STRTOK_R) && defined(__DARWIN__) && defined(_MSL_USING_MW_C_HEADERS) && _MSL_USING_MW_C_HEADERS - char *strtok_r(char *, const char *, char **); -#endif - -/* - Traditional MinGW doesn't declare isascii() in strict ANSI mode and we can't - declare it here ourselves as it's an inline function, so use our own - replacement instead. - */ -#ifndef isascii - #if defined(wxNEEDS_STRICT_ANSI_WORKAROUNDS) - #define wxNEED_ISASCII - #endif -#endif /* isascii */ - -#ifdef wxNEED_ISASCII - inline int isascii(int c) { return (unsigned)c < 0x80; } - - // Avoid further (re)definitions of it. - #define isascii isascii -#endif - -/* string.h functions */ - -#ifdef wxNEED_STRDUP - WXDLLIMPEXP_BASE char *strdup(const char* s); -#endif - - -/* ------------------------------------------------------------------------- - UTF-8 locale handling - ------------------------------------------------------------------------- */ - -#ifdef __cplusplus - #if wxUSE_UNICODE_UTF8 - /* flag indicating whether the current locale uses UTF-8 or not; must be - updated every time the locale is changed! */ - #if wxUSE_UTF8_LOCALE_ONLY - #define wxLocaleIsUtf8 true - #else - extern WXDLLIMPEXP_BASE bool wxLocaleIsUtf8; - #endif - /* function used to update the flag: */ - extern WXDLLIMPEXP_BASE void wxUpdateLocaleIsUtf8(); - #else /* !wxUSE_UNICODE_UTF8 */ - inline void wxUpdateLocaleIsUtf8() {} - #endif /* wxUSE_UNICODE_UTF8/!wxUSE_UNICODE_UTF8 */ -#endif /* __cplusplus */ - - -/* ------------------------------------------------------------------------- - string.h - ------------------------------------------------------------------------- */ - -#define wxCRT_StrcatA strcat -#define wxCRT_StrchrA strchr -#define wxCRT_StrcmpA strcmp -#define wxCRT_StrcpyA strcpy -#define wxCRT_StrcspnA strcspn -#define wxCRT_StrlenA strlen -#define wxCRT_StrncatA strncat -#define wxCRT_StrncmpA strncmp -#define wxCRT_StrncpyA strncpy -#define wxCRT_StrpbrkA strpbrk -#define wxCRT_StrrchrA strrchr -#define wxCRT_StrspnA strspn -#define wxCRT_StrstrA strstr - -#define wxCRT_StrcatW wcscat -#define wxCRT_StrchrW wcschr -#define wxCRT_StrcmpW wcscmp -#define wxCRT_StrcpyW wcscpy -#define wxCRT_StrcspnW wcscspn -#define wxCRT_StrncatW wcsncat -#define wxCRT_StrncmpW wcsncmp -#define wxCRT_StrncpyW wcsncpy -#define wxCRT_StrpbrkW wcspbrk -#define wxCRT_StrrchrW wcsrchr -#define wxCRT_StrspnW wcsspn -#define wxCRT_StrstrW wcsstr - -#define wxCRT_StrcollA strcoll -#define wxCRT_StrxfrmA strxfrm - -#define wxCRT_StrcollW wcscoll -#define wxCRT_StrxfrmW wcsxfrm - -/* Almost all compilers have strdup(), but VC++ and MinGW call it _strdup(). - And we need to declare it manually for MinGW in strict ANSI mode. */ -#if (defined(__VISUALC__) && __VISUALC__ >= 1400) - #define wxCRT_StrdupA _strdup -#elif defined(__MINGW32__) - wxDECL_FOR_STRICT_MINGW32(char*, _strdup, (const char *)) - #define wxCRT_StrdupA _strdup -#else - #define wxCRT_StrdupA strdup -#endif - -/* Windows compilers provide _wcsdup() except for (old) Cygwin */ -#if defined(__WINDOWS__) && !defined(__CYGWIN__) - wxDECL_FOR_STRICT_MINGW32(wchar_t*, _wcsdup, (const wchar_t*)) - #define wxCRT_StrdupW _wcsdup -#elif defined(HAVE_WCSDUP) - #define wxCRT_StrdupW wcsdup -#endif - -#ifdef wxHAVE_TCHAR_SUPPORT - /* we surely have wchar_t if we have TCHAR have wcslen() */ - #ifndef HAVE_WCSLEN - #define HAVE_WCSLEN - #endif -#endif /* wxHAVE_TCHAR_SUPPORT */ - -#ifdef HAVE_WCSLEN - #define wxCRT_StrlenW wcslen -#endif - -#define wxCRT_StrtodA strtod -#define wxCRT_StrtolA strtol -#define wxCRT_StrtoulA strtoul - -#ifdef __ANDROID__ // these functions are broken on android - -extern double android_wcstod(const wchar_t *nptr, wchar_t **endptr); -extern long android_wcstol(const wchar_t *nptr, wchar_t **endptr, int base); -extern unsigned long android_wcstoul(const wchar_t *nptr, wchar_t **endptr, int base); - -#define wxCRT_StrtodW android_wcstod -#define wxCRT_StrtolW android_wcstol -#define wxCRT_StrtoulW android_wcstoul -#else -#define wxCRT_StrtodW wcstod -#define wxCRT_StrtolW wcstol -#define wxCRT_StrtoulW wcstoul -#endif - -#ifdef __VISUALC__ - #define wxCRT_StrtollA _strtoi64 - #define wxCRT_StrtoullA _strtoui64 - #define wxCRT_StrtollW _wcstoi64 - #define wxCRT_StrtoullW _wcstoui64 -#else - /* Both of these functions are implemented in C++11 compilers */ - #if defined(__cplusplus) && __cplusplus >= 201103L - #ifndef HAVE_STRTOULL - #define HAVE_STRTOULL - #endif - #ifndef HAVE_WCSTOULL - #define HAVE_WCSTOULL - #endif - #endif - - #ifdef HAVE_STRTOULL - #define wxCRT_StrtollA strtoll - #define wxCRT_StrtoullA strtoull - #endif /* HAVE_STRTOULL */ - #ifdef HAVE_WCSTOULL - /* assume that we have wcstoull(), which is also C99, too */ - #define wxCRT_StrtollW wcstoll - #define wxCRT_StrtoullW wcstoull - #endif /* HAVE_WCSTOULL */ -#endif - -/* - Only VC8 and later provide strnlen() and wcsnlen() functions under Windows. - */ -#if wxCHECK_VISUALC_VERSION(8) - #ifndef HAVE_STRNLEN - #define HAVE_STRNLEN - #endif - #ifndef HAVE_WCSNLEN - #define HAVE_WCSNLEN - #endif -#endif - -#ifdef HAVE_STRNLEN - #define wxCRT_StrnlenA strnlen -#endif - -#ifdef HAVE_WCSNLEN - #define wxCRT_StrnlenW wcsnlen -#endif - -/* define wxCRT_StricmpA/W and wxCRT_StrnicmpA/W for various compilers */ - -#if defined(__BORLANDC__) - #define wxCRT_StricmpA stricmp - #define wxCRT_StrnicmpA strnicmp -#elif defined(__VISUALC__) || defined(__MINGW32__) - wxDECL_FOR_STRICT_MINGW32(int, _stricmp, (const char*, const char*)) - wxDECL_FOR_STRICT_MINGW32(int, _strnicmp, (const char*, const char*, size_t)) - - #define wxCRT_StricmpA _stricmp - #define wxCRT_StrnicmpA _strnicmp -#elif defined(__UNIX__) - #define wxCRT_StricmpA strcasecmp - #define wxCRT_StrnicmpA strncasecmp -/* #else -- use wxWidgets implementation */ -#endif - -#ifdef __VISUALC__ - #define wxCRT_StricmpW _wcsicmp - #define wxCRT_StrnicmpW _wcsnicmp -#elif defined(__UNIX__) - #ifdef HAVE_WCSCASECMP - #define wxCRT_StricmpW wcscasecmp - #endif - #ifdef HAVE_WCSNCASECMP - #define wxCRT_StrnicmpW wcsncasecmp - #endif -/* #else -- use wxWidgets implementation */ -#endif - -#ifdef HAVE_STRTOK_R - #define wxCRT_StrtokA(str, sep, last) strtok_r(str, sep, last) -#endif -/* FIXME-UTF8: detect and use wcstok() if available for wxCRT_StrtokW */ - -/* these are extern "C" because they are used by regex lib: */ -#ifdef __cplusplus -extern "C" { -#endif - -#ifndef wxCRT_StrlenW -WXDLLIMPEXP_BASE size_t wxCRT_StrlenW(const wchar_t *s); -#endif - -#ifndef wxCRT_StrncmpW -WXDLLIMPEXP_BASE int wxCRT_StrncmpW(const wchar_t *s1, const wchar_t *s2, size_t n); -#endif - -#ifdef __cplusplus -} -#endif - -/* FIXME-UTF8: remove this once we are Unicode only */ -#if wxUSE_UNICODE - #define wxCRT_StrlenNative wxCRT_StrlenW - #define wxCRT_StrncmpNative wxCRT_StrncmpW - #define wxCRT_ToupperNative wxCRT_ToupperW - #define wxCRT_TolowerNative wxCRT_TolowerW -#else - #define wxCRT_StrlenNative wxCRT_StrlenA - #define wxCRT_StrncmpNative wxCRT_StrncmpA - #define wxCRT_ToupperNative toupper - #define wxCRT_TolowerNative tolower -#endif - -#ifndef wxCRT_StrcatW -WXDLLIMPEXP_BASE wchar_t *wxCRT_StrcatW(wchar_t *dest, const wchar_t *src); -#endif - -#ifndef wxCRT_StrchrW -WXDLLIMPEXP_BASE const wchar_t *wxCRT_StrchrW(const wchar_t *s, wchar_t c); -#endif - -#ifndef wxCRT_StrcmpW -WXDLLIMPEXP_BASE int wxCRT_StrcmpW(const wchar_t *s1, const wchar_t *s2); -#endif - -#ifndef wxCRT_StrcollW -WXDLLIMPEXP_BASE int wxCRT_StrcollW(const wchar_t *s1, const wchar_t *s2); -#endif - -#ifndef wxCRT_StrcpyW -WXDLLIMPEXP_BASE wchar_t *wxCRT_StrcpyW(wchar_t *dest, const wchar_t *src); -#endif - -#ifndef wxCRT_StrcspnW -WXDLLIMPEXP_BASE size_t wxCRT_StrcspnW(const wchar_t *s, const wchar_t *reject); -#endif - -#ifndef wxCRT_StrncatW -WXDLLIMPEXP_BASE wchar_t *wxCRT_StrncatW(wchar_t *dest, const wchar_t *src, size_t n); -#endif - -#ifndef wxCRT_StrncpyW -WXDLLIMPEXP_BASE wchar_t *wxCRT_StrncpyW(wchar_t *dest, const wchar_t *src, size_t n); -#endif - -#ifndef wxCRT_StrpbrkW -WXDLLIMPEXP_BASE const wchar_t *wxCRT_StrpbrkW(const wchar_t *s, const wchar_t *accept); -#endif - -#ifndef wxCRT_StrrchrW -WXDLLIMPEXP_BASE const wchar_t *wxCRT_StrrchrW(const wchar_t *s, wchar_t c); -#endif - -#ifndef wxCRT_StrspnW -WXDLLIMPEXP_BASE size_t wxCRT_StrspnW(const wchar_t *s, const wchar_t *accept); -#endif - -#ifndef wxCRT_StrstrW -WXDLLIMPEXP_BASE const wchar_t *wxCRT_StrstrW(const wchar_t *haystack, const wchar_t *needle); -#endif - -#ifndef wxCRT_StrtodW -WXDLLIMPEXP_BASE double wxCRT_StrtodW(const wchar_t *nptr, wchar_t **endptr); -#endif - -#ifndef wxCRT_StrtolW -WXDLLIMPEXP_BASE long int wxCRT_StrtolW(const wchar_t *nptr, wchar_t **endptr, int base); -#endif - -#ifndef wxCRT_StrtoulW -WXDLLIMPEXP_BASE unsigned long int wxCRT_StrtoulW(const wchar_t *nptr, wchar_t **endptr, int base); -#endif - -#ifndef wxCRT_StrxfrmW -WXDLLIMPEXP_BASE size_t wxCRT_StrxfrmW(wchar_t *dest, const wchar_t *src, size_t n); -#endif - -#ifndef wxCRT_StrdupA -WXDLLIMPEXP_BASE char *wxCRT_StrdupA(const char *psz); -#endif - -#ifndef wxCRT_StrdupW -WXDLLIMPEXP_BASE wchar_t *wxCRT_StrdupW(const wchar_t *pwz); -#endif - -#ifndef wxCRT_StricmpA -WXDLLIMPEXP_BASE int wxCRT_StricmpA(const char *psz1, const char *psz2); -#endif - -#ifndef wxCRT_StricmpW -WXDLLIMPEXP_BASE int wxCRT_StricmpW(const wchar_t *psz1, const wchar_t *psz2); -#endif - -#ifndef wxCRT_StrnicmpA -WXDLLIMPEXP_BASE int wxCRT_StrnicmpA(const char *psz1, const char *psz2, size_t len); -#endif - -#ifndef wxCRT_StrnicmpW -WXDLLIMPEXP_BASE int wxCRT_StrnicmpW(const wchar_t *psz1, const wchar_t *psz2, size_t len); -#endif - -#ifndef wxCRT_StrtokA -WXDLLIMPEXP_BASE char *wxCRT_StrtokA(char *psz, const char *delim, char **save_ptr); -#endif - -#ifndef wxCRT_StrtokW -WXDLLIMPEXP_BASE wchar_t *wxCRT_StrtokW(wchar_t *psz, const wchar_t *delim, wchar_t **save_ptr); -#endif - -/* supply strtoll and strtoull, if needed */ -#ifdef wxLongLong_t - #ifndef wxCRT_StrtollA - WXDLLIMPEXP_BASE wxLongLong_t wxCRT_StrtollA(const char* nptr, - char** endptr, - int base); - WXDLLIMPEXP_BASE wxULongLong_t wxCRT_StrtoullA(const char* nptr, - char** endptr, - int base); - #endif - #ifndef wxCRT_StrtollW - WXDLLIMPEXP_BASE wxLongLong_t wxCRT_StrtollW(const wchar_t* nptr, - wchar_t** endptr, - int base); - WXDLLIMPEXP_BASE wxULongLong_t wxCRT_StrtoullW(const wchar_t* nptr, - wchar_t** endptr, - int base); - #endif -#endif /* wxLongLong_t */ - - -/* ------------------------------------------------------------------------- - stdio.h - ------------------------------------------------------------------------- */ - -#if defined(__UNIX__) || defined(__WXMAC__) - #define wxMBFILES 1 -#else - #define wxMBFILES 0 -#endif - - -/* these functions are only needed in the form used for filenames (i.e. char* - on Unix, wchar_t* on Windows), so we don't need to use A/W suffix: */ -#if wxMBFILES || !wxUSE_UNICODE /* ANSI filenames */ - - #define wxCRT_Fopen fopen - #define wxCRT_Freopen freopen - #define wxCRT_Remove remove - #define wxCRT_Rename rename - -#else /* Unicode filenames */ - wxDECL_FOR_STRICT_MINGW32(FILE*, _wfopen, (const wchar_t*, const wchar_t*)) - wxDECL_FOR_STRICT_MINGW32(FILE*, _wfreopen, (const wchar_t*, const wchar_t*, FILE*)) - wxDECL_FOR_STRICT_MINGW32(int, _wrename, (const wchar_t*, const wchar_t*)) - wxDECL_FOR_STRICT_MINGW32(int, _wremove, (const wchar_t*)) - - #define wxCRT_Rename _wrename - #define wxCRT_Remove _wremove - #define wxCRT_Fopen _wfopen - #define wxCRT_Freopen _wfreopen - -#endif /* wxMBFILES/!wxMBFILES */ - -#define wxCRT_PutsA puts -#define wxCRT_FputsA fputs -#define wxCRT_FgetsA fgets -#define wxCRT_FputcA fputc -#define wxCRT_FgetcA fgetc -#define wxCRT_UngetcA ungetc - -#ifdef wxHAVE_TCHAR_SUPPORT - #define wxCRT_PutsW _putws - #define wxCRT_FputsW fputws - #define wxCRT_FputcW fputwc -#endif -#ifdef HAVE_FPUTWS - #define wxCRT_FputsW fputws -#endif -#ifdef HAVE_PUTWS - #define wxCRT_PutsW putws -#endif -#ifdef HAVE_FPUTWC - #define wxCRT_FputcW fputwc -#endif -#define wxCRT_FgetsW fgetws - -#ifndef wxCRT_PutsW -WXDLLIMPEXP_BASE int wxCRT_PutsW(const wchar_t *ws); -#endif - -#ifndef wxCRT_FputsW -WXDLLIMPEXP_BASE int wxCRT_FputsW(const wchar_t *ch, FILE *stream); -#endif - -#ifndef wxCRT_FputcW -WXDLLIMPEXP_BASE int wxCRT_FputcW(wchar_t wc, FILE *stream); -#endif - -/* - NB: tmpnam() is unsafe and thus is not wrapped! - Use other wxWidgets facilities instead: - wxFileName::CreateTempFileName, wxTempFile, or wxTempFileOutputStream -*/ -#define wxTmpnam(x) wxTmpnam_is_insecure_use_wxTempFile_instead - -#define wxCRT_PerrorA perror -#ifdef wxHAVE_TCHAR_SUPPORT - #define wxCRT_PerrorW _wperror -#endif - -/* ------------------------------------------------------------------------- - stdlib.h - ------------------------------------------------------------------------- */ - -#define wxCRT_GetenvA getenv -#ifdef _tgetenv - #define wxCRT_GetenvW _wgetenv -#endif - -#ifndef wxCRT_GetenvW -WXDLLIMPEXP_BASE wchar_t * wxCRT_GetenvW(const wchar_t *name); -#endif - - -#define wxCRT_SystemA system -/* mingw32 doesn't provide _tsystem() or _wsystem(): */ -#if defined(_tsystem) - #define wxCRT_SystemW _wsystem -#endif - -#define wxCRT_AtofA atof -#define wxCRT_AtoiA atoi -#define wxCRT_AtolA atol - -#if defined(wxHAVE_TCHAR_SUPPORT) - wxDECL_FOR_STRICT_MINGW32(int, _wtoi, (const wchar_t*)) - wxDECL_FOR_STRICT_MINGW32(long, _wtol, (const wchar_t*)) - - #define wxCRT_AtoiW _wtoi - #define wxCRT_AtolW _wtol - /* _wtof doesn't exist */ -#else -#ifndef __VMS - #define wxCRT_AtofW(s) wcstod(s, NULL) -#endif - #define wxCRT_AtolW(s) wcstol(s, NULL, 10) - /* wcstoi doesn't exist */ -#endif - -/* ------------------------------------------------------------------------- - time.h - ------------------------------------------------------------------------- */ - -#define wxCRT_StrftimeA strftime -#ifdef __SGI__ - /* - IRIX provides not one but two versions of wcsftime(): XPG4 one which - uses "const char*" for the third parameter and so can't be used and the - correct, XPG5, one. Unfortunately we can't just define _XOPEN_SOURCE - high enough to get XPG5 version as this undefines other symbols which - make other functions we use unavailable (see for gory - details). So just declare the XPG5 version ourselves, we're extremely - unlikely to ever be compiled on a system without it. But if we ever do, - a configure test would need to be added for it (and _MIPS_SYMBOL_PRESENT - should be used to check for its presence during run-time, i.e. it would - probably be simpler to just always use our own wxCRT_StrftimeW() below - if it does ever become a problem). - */ -#ifdef __cplusplus - extern "C" -#endif - size_t - _xpg5_wcsftime(wchar_t *, size_t, const wchar_t *, const struct tm * ); - #define wxCRT_StrftimeW _xpg5_wcsftime -#else - /* - Assume it's always available under non-Unix systems as this does seem - to be the case for now. And under Unix we trust configure to detect it - (except for SGI special case above). - */ - #if defined(HAVE_WCSFTIME) || !defined(__UNIX__) - #define wxCRT_StrftimeW wcsftime - #endif -#endif - -#ifndef wxCRT_StrftimeW -WXDLLIMPEXP_BASE size_t wxCRT_StrftimeW(wchar_t *s, size_t max, - const wchar_t *fmt, - const struct tm *tm); -#endif - - - -/* ------------------------------------------------------------------------- - ctype.h - ------------------------------------------------------------------------- */ - -#define wxCRT_IsalnumW(c) iswalnum(c) -#define wxCRT_IsalphaW(c) iswalpha(c) -#define wxCRT_IscntrlW(c) iswcntrl(c) -#define wxCRT_IsdigitW(c) iswdigit(c) -#define wxCRT_IsgraphW(c) iswgraph(c) -#define wxCRT_IslowerW(c) iswlower(c) -#define wxCRT_IsprintW(c) iswprint(c) -#define wxCRT_IspunctW(c) iswpunct(c) -#define wxCRT_IsspaceW(c) iswspace(c) -#define wxCRT_IsupperW(c) iswupper(c) -#define wxCRT_IsxdigitW(c) iswxdigit(c) - -#ifdef __GLIBC__ - #if defined(__GLIBC__) && (__GLIBC__ == 2) && (__GLIBC_MINOR__ == 0) - /* /usr/include/wctype.h incorrectly declares translations */ - /* tables which provokes tons of compile-time warnings -- try */ - /* to correct this */ - #define wxCRT_TolowerW(wc) towctrans((wc), (wctrans_t)__ctype_tolower) - #define wxCRT_ToupperW(wc) towctrans((wc), (wctrans_t)__ctype_toupper) - #else /* !glibc 2.0 */ - #define wxCRT_TolowerW towlower - #define wxCRT_ToupperW towupper - #endif -#else /* !__GLIBC__ */ - /* There is a bug in MSVC RTL: toxxx() functions dosn't do anything - with signed chars < 0, so "fix" it here. */ - #define wxCRT_TolowerW(c) towlower((wxUChar)(wxChar)(c)) - #define wxCRT_ToupperW(c) towupper((wxUChar)(wxChar)(c)) -#endif /* __GLIBC__/!__GLIBC__ */ - -/* The Android platform, as of 2014, only support most wide-char function with - the exception of multi-byte encoding/decoding functions & wsprintf/wsscanf - See android-ndk-r9d/docs/STANDALONE-TOOLCHAIN.html (section 7.2) - In fact, mbstowcs/wcstombs are defined and compile, but don't work correctly -*/ - -#if defined(__WXQT__) && defined(__ANDROID__) - #define wxNEED_WX_MBSTOWCS - #undef HAVE_WCSRTOMBS - // TODO: use Qt built-in required functionality -#endif - -#if defined(wxNEED_WX_MBSTOWCS) && defined(__ANDROID__) - #warning "Custom mb/wchar conv. only works for ASCII, see Android NDK notes" - WXDLLIMPEXP_BASE size_t android_mbstowcs(wchar_t *, const char *, size_t); - WXDLLIMPEXP_BASE size_t android_wcstombs(char *, const wchar_t *, size_t); - #define wxMbstowcs android_mbstowcs - #define wxWcstombs android_wcstombs -#else - #define wxMbstowcs mbstowcs - #define wxWcstombs wcstombs -#endif - - -/* ------------------------------------------------------------------------- - wx wrappers for CRT functions in both char* and wchar_t* versions - ------------------------------------------------------------------------- */ - -#ifdef __cplusplus - -/* NB: this belongs to wxcrt.h and not this header, but it makes life easier - * for buffer.h and stringimpl.h (both of which must be included before - * string.h, which is required by wxcrt.h) to have them here: */ - -/* safe version of strlen() (returns 0 if passed NULL pointer) */ -inline size_t wxStrlen(const char *s) { return s ? wxCRT_StrlenA(s) : 0; } -inline size_t wxStrlen(const wchar_t *s) { return s ? wxCRT_StrlenW(s) : 0; } -#ifndef wxWCHAR_T_IS_WXCHAR16 - WXDLLIMPEXP_BASE size_t wxStrlen(const wxChar16 *s ); -#endif -#ifndef wxWCHAR_T_IS_WXCHAR32 - WXDLLIMPEXP_BASE size_t wxStrlen(const wxChar32 *s ); -#endif -#define wxWcslen wxCRT_StrlenW - -#define wxStrdupA wxCRT_StrdupA -#define wxStrdupW wxCRT_StrdupW -inline char* wxStrdup(const char *s) { return wxCRT_StrdupA(s); } -inline wchar_t* wxStrdup(const wchar_t *s) { return wxCRT_StrdupW(s); } -#ifndef wxWCHAR_T_IS_WXCHAR16 - WXDLLIMPEXP_BASE wxChar16* wxStrdup(const wxChar16* s); -#endif -#ifndef wxWCHAR_T_IS_WXCHAR32 - WXDLLIMPEXP_BASE wxChar32* wxStrdup(const wxChar32* s); -#endif - -#endif /* __cplusplus */ - -#endif /* _WX_WXCRTBASE_H_ */ diff --git a/Externals/wxWidgets3/include/wx/wxcrtvararg.h b/Externals/wxWidgets3/include/wx/wxcrtvararg.h deleted file mode 100644 index b1af0e656f..0000000000 --- a/Externals/wxWidgets3/include/wx/wxcrtvararg.h +++ /dev/null @@ -1,460 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/wxcrtvararg.h -// Purpose: Type-safe ANSI and Unicode builds compatible wrappers for -// printf(), scanf() and related CRT functions -// Author: Joel Farley, Ove KÃ¥ven -// Modified by: Vadim Zeitlin, Robert Roebling, Ron Lee -// Created: 2007-02-19 -// Copyright: (c) 2007 REA Elektronik GmbH -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_WXCRTVARARG_H_ -#define _WX_WXCRTVARARG_H_ - -// NB: User code should include wx/crt.h instead of including this -// header directly. - -#include "wx/wxcrt.h" -#include "wx/strvararg.h" - -#include "wx/string.h" - -// ---------------------------------------------------------------------------- -// CRT functions aliases -// ---------------------------------------------------------------------------- - -/* Required for wxPrintf() etc */ -#include - -/* printf() family saga */ - -/* - For many old Unix systems [v]snprintf()/vsscanf() exists in the system - libraries but not in the headers, so we need to declare it ourselves to be - able to use it. - */ -#ifdef __UNIX__ - -#if defined(HAVE_VSNPRINTF) && !defined(HAVE_VSNPRINTF_DECL) -#ifdef __cplusplus - extern "C" -#else - extern -#endif - int vsnprintf(char *str, size_t size, const char *format, va_list ap); -#endif /* !HAVE_VSNPRINTF_DECL */ - -#if defined(HAVE_SNPRINTF) && !defined(HAVE_SNPRINTF_DECL) -#ifdef __cplusplus - extern "C" -#else - extern -#endif - int snprintf(char *str, size_t size, const char *format, ...); -#endif /* !HAVE_SNPRINTF_DECL */ - -#if defined(HAVE_VSSCANF) && !defined(HAVE_VSSCANF_DECL) -#ifdef __cplusplus - extern "C" -#else - extern -#endif - int vsscanf(const char *str, const char *format, va_list ap); -#endif /* !HAVE_VSSCANF_DECL */ - -/* Wrapper for vsnprintf if it's 3rd parameter is non-const. Note: the - * same isn't done for snprintf below, the builtin wxSnprintf_ is used - * instead since it's already a simple wrapper */ -#if defined __cplusplus && defined HAVE_BROKEN_VSNPRINTF_DECL - inline int wx_fixed_vsnprintf(char *str, size_t size, const char *format, va_list ap) - { - return vsnprintf(str, size, (char*)format, ap); - } -#endif - -#endif /* __UNIX__ */ - -/* - mingw32 normally uses MSVCRT which has non-standard vswprintf() and so - normally _vsnwprintf() is used instead, the only exception is when mingw32 - is used with STLPort which does have a standard vswprintf() starting from - version 5.1 which we can use. - */ -#ifdef __MINGW32__ - #if defined(_STLPORT_VERSION) && _STLPORT_VERSION >= 0x510 - #ifndef HAVE_VSWPRINTF - #define HAVE_VSWPRINTF - #endif - #elif defined(HAVE_VSWPRINTF) - /* can't use non-standard vswprintf() */ - #undef HAVE_VSWPRINTF - #endif -#endif /* __MINGW32__ */ - -#if wxUSE_PRINTF_POS_PARAMS - /* - The systems where vsnprintf() supports positional parameters should - define the HAVE_UNIX98_PRINTF symbol. - - On systems which don't (e.g. Windows) we are forced to use - our wxVsnprintf() implementation. - */ - #if defined(HAVE_UNIX98_PRINTF) - #ifdef HAVE_VSWPRINTF - #define wxCRT_VsnprintfW vswprintf - #endif - #ifdef HAVE_BROKEN_VSNPRINTF_DECL - #define wxCRT_VsnprintfA wx_fixed_vsnprintf - #else - #define wxCRT_VsnprintfA vsnprintf - #endif - #else /* !HAVE_UNIX98_PRINTF */ - /* - The only compiler with positional parameters support under Windows - is VC++ 8.0 which provides a new xxprintf_p() functions family. - The 2003 PSDK includes a slightly earlier version of VC8 than the - main release and does not have the printf_p functions. - */ - #if defined _MSC_FULL_VER && _MSC_FULL_VER >= 140050727 - #define wxCRT_VsnprintfA _vsprintf_p - #define wxCRT_VsnprintfW _vswprintf_p - #endif - #endif /* HAVE_UNIX98_PRINTF/!HAVE_UNIX98_PRINTF */ -#else /* !wxUSE_PRINTF_POS_PARAMS */ - /* - We always want to define safe snprintf() function to be used instead of - sprintf(). Some compilers already have it (or rather vsnprintf() which - we really need...), otherwise we implement it using our own printf() - code. - - We define function with a trailing underscore here because the real one - is a wrapper around it as explained below - */ - - #if defined(__VISUALC__) || \ - (defined(__BORLANDC__) && __BORLANDC__ >= 0x540) - #define wxCRT_VsnprintfA _vsnprintf - #define wxCRT_VsnprintfW _vsnwprintf - #else - #if defined(HAVE__VSNWPRINTF) - #define wxCRT_VsnprintfW _vsnwprintf - #elif defined(HAVE_VSWPRINTF) - #define wxCRT_VsnprintfW vswprintf - #endif - - #if defined(HAVE_VSNPRINTF) - #ifdef HAVE_BROKEN_VSNPRINTF_DECL - #define wxCRT_VsnprintfA wx_fixed_vsnprintf - #else - #define wxCRT_VsnprintfA vsnprintf - #endif - #endif - #endif -#endif /* wxUSE_PRINTF_POS_PARAMS/!wxUSE_PRINTF_POS_PARAMS */ - -#ifndef wxCRT_VsnprintfW - /* no (suitable) vsnprintf(), cook our own */ - WXDLLIMPEXP_BASE int - wxCRT_VsnprintfW(wchar_t *buf, size_t len, const wchar_t *format, va_list argptr); - #define wxUSE_WXVSNPRINTFW 1 -#else - #define wxUSE_WXVSNPRINTFW 0 -#endif - -#ifndef wxCRT_VsnprintfA - /* no (suitable) vsnprintf(), cook our own */ - WXDLLIMPEXP_BASE int - wxCRT_VsnprintfA(char *buf, size_t len, const char *format, va_list argptr); - #define wxUSE_WXVSNPRINTFA 1 -#else - #define wxUSE_WXVSNPRINTFA 0 -#endif - -// for wxString code, define wxUSE_WXVSNPRINTF to indicate that wx -// implementation is used no matter what (in UTF-8 build, either *A or *W -// version may be called): -#if !wxUSE_UNICODE - #define wxUSE_WXVSNPRINTF wxUSE_WXVSNPRINTFA -#elif wxUSE_UNICODE_WCHAR - #define wxUSE_WXVSNPRINTF wxUSE_WXVSNPRINTFW -#elif wxUSE_UTF8_LOCALE_ONLY - #define wxUSE_WXVSNPRINTF wxUSE_WXVSNPRINTFA -#else // UTF-8 under any locale - #define wxUSE_WXVSNPRINTF (wxUSE_WXVSNPRINTFA && wxUSE_WXVSNPRINTFW) -#endif - -#define wxCRT_FprintfA fprintf -#define wxCRT_PrintfA printf -#define wxCRT_VfprintfA vfprintf -#define wxCRT_VprintfA vprintf -#define wxCRT_VsprintfA vsprintf - -/* - In Unicode mode we need to have all standard functions such as wprintf() and - so on but not all systems have them so use our own implementations in this - case. - */ -#if !defined(wxHAVE_TCHAR_SUPPORT) && !defined(HAVE_WPRINTF) - #define wxNEED_WPRINTF -#endif -#if !defined(wxHAVE_TCHAR_SUPPORT) && !defined(HAVE_VSWSCANF) && defined(HAVE_VSSCANF) - #define wxNEED_VSWSCANF -#endif - - -#if defined(wxNEED_WPRINTF) - /* - we need to implement all wide character printf functions either because - we don't have them at all or because they don't have the semantics we - need - */ - int wxCRT_PrintfW( const wchar_t *format, ... ); - int wxCRT_FprintfW( FILE *stream, const wchar_t *format, ... ); - int wxCRT_VfprintfW( FILE *stream, const wchar_t *format, va_list ap ); - int wxCRT_VprintfW( const wchar_t *format, va_list ap ); - int wxCRT_VsprintfW( wchar_t *str, const wchar_t *format, va_list ap ); -#else /* !wxNEED_WPRINTF */ - #define wxCRT_FprintfW fwprintf - #define wxCRT_PrintfW wprintf - #define wxCRT_VfprintfW vfwprintf - #define wxCRT_VprintfW vwprintf - - #if defined(__WINDOWS__) && !defined(HAVE_VSWPRINTF) - // only non-standard vswprintf() without buffer size argument can be used here - #define wxCRT_VsprintfW vswprintf - #endif -#endif /* wxNEED_WPRINTF */ - - -/* Required for wxScanf() etc. */ -#define wxCRT_ScanfA scanf -#define wxCRT_SscanfA sscanf -#define wxCRT_FscanfA fscanf - -/* vsscanf() may have a wrong declaration with non-const first parameter, fix - * this by wrapping it if necessary. */ -#if defined __cplusplus && defined HAVE_BROKEN_VSSCANF_DECL - inline int wxCRT_VsscanfA(const char *str, const char *format, va_list ap) - { - return vsscanf(const_cast(str), format, ap); - } -#else - #define wxCRT_VsscanfA vsscanf -#endif - -#if defined(wxNEED_WPRINTF) - int wxCRT_ScanfW(const wchar_t *format, ...); - int wxCRT_SscanfW(const wchar_t *str, const wchar_t *format, ...); - int wxCRT_FscanfW(FILE *stream, const wchar_t *format, ...); -#else - #define wxCRT_ScanfW wxVMS_USE_STD wscanf - #define wxCRT_SscanfW wxVMS_USE_STD swscanf - #define wxCRT_FscanfW wxVMS_USE_STD fwscanf -#endif -#ifdef wxNEED_VSWSCANF - int wxCRT_VsscanfW(const wchar_t *str, const wchar_t *format, va_list ap); -#else - #define wxCRT_VsscanfW wxVMS_USE_STD vswscanf -#endif - -// ---------------------------------------------------------------------------- -// user-friendly wrappers to CRT functions -// ---------------------------------------------------------------------------- - - // FIXME-UTF8: remove this -#if wxUSE_UNICODE - #define wxCRT_PrintfNative wxCRT_PrintfW - #define wxCRT_FprintfNative wxCRT_FprintfW -#else - #define wxCRT_PrintfNative wxCRT_PrintfA - #define wxCRT_FprintfNative wxCRT_FprintfA -#endif - - -WX_DEFINE_VARARG_FUNC_SANS_N0(int, wxPrintf, 1, (const wxFormatString&), - wxCRT_PrintfNative, wxCRT_PrintfA) -inline int wxPrintf(const wxFormatString& s) -{ - return wxPrintf("%s", s.InputAsString()); -} - -WX_DEFINE_VARARG_FUNC_SANS_N0(int, wxFprintf, 2, (FILE*, const wxFormatString&), - wxCRT_FprintfNative, wxCRT_FprintfA) -inline int wxFprintf(FILE *f, const wxFormatString& s) -{ - return wxFprintf(f, "%s", s.InputAsString()); -} - -// va_list versions of printf functions simply forward to the respective -// CRT function; note that they assume that va_list was created using -// wxArgNormalizer! -#if wxUSE_UNICODE_UTF8 - #if wxUSE_UTF8_LOCALE_ONLY - #define WX_VARARG_VFOO_IMPL(args, implW, implA) \ - return implA args - #else - #define WX_VARARG_VFOO_IMPL(args, implW, implA) \ - if ( wxLocaleIsUtf8 ) return implA args; \ - else return implW args - #endif -#elif wxUSE_UNICODE_WCHAR - #define WX_VARARG_VFOO_IMPL(args, implW, implA) \ - return implW args -#else // ANSI - #define WX_VARARG_VFOO_IMPL(args, implW, implA) \ - return implA args -#endif - -inline int -wxVprintf(const wxString& format, va_list ap) -{ - WX_VARARG_VFOO_IMPL((wxFormatString(format), ap), - wxCRT_VprintfW, wxCRT_VprintfA); -} - -inline int -wxVfprintf(FILE *f, const wxString& format, va_list ap) -{ - WX_VARARG_VFOO_IMPL((f, wxFormatString(format), ap), - wxCRT_VfprintfW, wxCRT_VfprintfA); -} - -#undef WX_VARARG_VFOO_IMPL - - -// wxSprintf() and friends have to be implemented in two forms, one for -// writing to char* buffer and one for writing to wchar_t*: - -#if !wxUSE_UTF8_LOCALE_ONLY -int WXDLLIMPEXP_BASE wxDoSprintfWchar(char *str, const wxChar *format, ...); -#endif -#if wxUSE_UNICODE_UTF8 -int WXDLLIMPEXP_BASE wxDoSprintfUtf8(char *str, const char *format, ...); -#endif -WX_DEFINE_VARARG_FUNC(int, wxSprintf, 2, (char*, const wxFormatString&), - wxDoSprintfWchar, wxDoSprintfUtf8) - -int WXDLLIMPEXP_BASE -wxVsprintf(char *str, const wxString& format, va_list argptr); - -#if !wxUSE_UTF8_LOCALE_ONLY -int WXDLLIMPEXP_BASE wxDoSnprintfWchar(char *str, size_t size, const wxChar *format, ...); -#endif -#if wxUSE_UNICODE_UTF8 -int WXDLLIMPEXP_BASE wxDoSnprintfUtf8(char *str, size_t size, const char *format, ...); -#endif -WX_DEFINE_VARARG_FUNC(int, wxSnprintf, 3, (char*, size_t, const wxFormatString&), - wxDoSnprintfWchar, wxDoSnprintfUtf8) - -int WXDLLIMPEXP_BASE -wxVsnprintf(char *str, size_t size, const wxString& format, va_list argptr); - -#if wxUSE_UNICODE - -#if !wxUSE_UTF8_LOCALE_ONLY -int WXDLLIMPEXP_BASE wxDoSprintfWchar(wchar_t *str, const wxChar *format, ...); -#endif -#if wxUSE_UNICODE_UTF8 -int WXDLLIMPEXP_BASE wxDoSprintfUtf8(wchar_t *str, const char *format, ...); -#endif -WX_DEFINE_VARARG_FUNC(int, wxSprintf, 2, (wchar_t*, const wxFormatString&), - wxDoSprintfWchar, wxDoSprintfUtf8) - -int WXDLLIMPEXP_BASE -wxVsprintf(wchar_t *str, const wxString& format, va_list argptr); - -#if !wxUSE_UTF8_LOCALE_ONLY -int WXDLLIMPEXP_BASE wxDoSnprintfWchar(wchar_t *str, size_t size, const wxChar *format, ...); -#endif -#if wxUSE_UNICODE_UTF8 -int WXDLLIMPEXP_BASE wxDoSnprintfUtf8(wchar_t *str, size_t size, const char *format, ...); -#endif -WX_DEFINE_VARARG_FUNC(int, wxSnprintf, 3, (wchar_t*, size_t, const wxFormatString&), - wxDoSnprintfWchar, wxDoSnprintfUtf8) - -int WXDLLIMPEXP_BASE -wxVsnprintf(wchar_t *str, size_t size, const wxString& format, va_list argptr); - -#endif // wxUSE_UNICODE - -// We can't use wxArgNormalizer for variadic arguments to wxScanf() etc. -// because they are writable, so instead of providing friendly template -// vararg-like functions, we just provide both char* and wchar_t* variants -// of these functions. The type of output variadic arguments for %s must match -// the type of 'str' and 'format' arguments. -// -// For compatibility with earlier wx versions, we also provide wxSscanf() -// version with the first argument (input string) wxString; for this version, -// the type of output string values is determined by the type of format string -// only. - -#define _WX_SCANFUNC_EXTRACT_ARGS_1(x) x -#define _WX_SCANFUNC_EXTRACT_ARGS_2(x,y) x, y -#define _WX_SCANFUNC_EXTRACT_ARGS(N, args) _WX_SCANFUNC_EXTRACT_ARGS_##N args - -#define _WX_VARARG_PASS_WRITABLE(i) a##i - -#define _WX_DEFINE_SCANFUNC(N, dummy1, name, impl, passfixed, numfixed, fixed)\ - template<_WX_VARARG_JOIN(N, _WX_VARARG_TEMPL)> \ - int name(_WX_SCANFUNC_EXTRACT_ARGS(numfixed, fixed), \ - _WX_VARARG_JOIN(N, _WX_VARARG_ARG)) \ - { \ - return impl(_WX_SCANFUNC_EXTRACT_ARGS(numfixed, passfixed), \ - _WX_VARARG_JOIN(N, _WX_VARARG_PASS_WRITABLE)); \ - } - -#define WX_DEFINE_SCANFUNC(name, numfixed, fixed, impl, passfixed) \ - _WX_VARARG_ITER(_WX_VARARG_MAX_ARGS, \ - _WX_DEFINE_SCANFUNC, \ - dummy1, name, impl, passfixed, numfixed, fixed) - -// this is needed to normalize the format string, see src/common/strvararg.cpp -// for more details -#ifdef __WINDOWS__ - #define wxScanfConvertFormatW(fmt) fmt -#else - const wxScopedWCharBuffer - WXDLLIMPEXP_BASE wxScanfConvertFormatW(const wchar_t *format); -#endif - -WX_DEFINE_SCANFUNC(wxScanf, 1, (const char *format), - wxCRT_ScanfA, (format)) -WX_DEFINE_SCANFUNC(wxScanf, 1, (const wchar_t *format), - wxCRT_ScanfW, (wxScanfConvertFormatW(format))) - -WX_DEFINE_SCANFUNC(wxFscanf, 2, (FILE *stream, const char *format), - wxCRT_FscanfA, (stream, format)) -WX_DEFINE_SCANFUNC(wxFscanf, 2, (FILE *stream, const wchar_t *format), - wxCRT_FscanfW, (stream, wxScanfConvertFormatW(format))) - -WX_DEFINE_SCANFUNC(wxSscanf, 2, (const char *str, const char *format), - wxCRT_SscanfA, (str, format)) -WX_DEFINE_SCANFUNC(wxSscanf, 2, (const wchar_t *str, const wchar_t *format), - wxCRT_SscanfW, (str, wxScanfConvertFormatW(format))) -WX_DEFINE_SCANFUNC(wxSscanf, 2, (const wxScopedCharBuffer& str, const char *format), - wxCRT_SscanfA, (str.data(), format)) -WX_DEFINE_SCANFUNC(wxSscanf, 2, (const wxScopedWCharBuffer& str, const wchar_t *format), - wxCRT_SscanfW, (str.data(), wxScanfConvertFormatW(format))) -WX_DEFINE_SCANFUNC(wxSscanf, 2, (const wxString& str, const char *format), - wxCRT_SscanfA, (str.mb_str(), format)) -WX_DEFINE_SCANFUNC(wxSscanf, 2, (const wxString& str, const wchar_t *format), - wxCRT_SscanfW, (str.wc_str(), wxScanfConvertFormatW(format))) -WX_DEFINE_SCANFUNC(wxSscanf, 2, (const wxCStrData& str, const char *format), - wxCRT_SscanfA, (str.AsCharBuf(), format)) -WX_DEFINE_SCANFUNC(wxSscanf, 2, (const wxCStrData& str, const wchar_t *format), - wxCRT_SscanfW, (str.AsWCharBuf(), wxScanfConvertFormatW(format))) - -// Visual C++ doesn't provide vsscanf() -#ifndef __VISUALC___ -int WXDLLIMPEXP_BASE wxVsscanf(const char *str, const char *format, va_list ap); -int WXDLLIMPEXP_BASE wxVsscanf(const wchar_t *str, const wchar_t *format, va_list ap); -int WXDLLIMPEXP_BASE wxVsscanf(const wxScopedCharBuffer& str, const char *format, va_list ap); -int WXDLLIMPEXP_BASE wxVsscanf(const wxScopedWCharBuffer& str, const wchar_t *format, va_list ap); -int WXDLLIMPEXP_BASE wxVsscanf(const wxString& str, const char *format, va_list ap); -int WXDLLIMPEXP_BASE wxVsscanf(const wxString& str, const wchar_t *format, va_list ap); -int WXDLLIMPEXP_BASE wxVsscanf(const wxCStrData& str, const char *format, va_list ap); -int WXDLLIMPEXP_BASE wxVsscanf(const wxCStrData& str, const wchar_t *format, va_list ap); -#endif // !__VISUALC__ - -#endif /* _WX_WXCRTVARARG_H_ */ diff --git a/Externals/wxWidgets3/include/wx/wxhtml.h b/Externals/wxWidgets3/include/wx/wxhtml.h deleted file mode 100644 index 9759dac060..0000000000 --- a/Externals/wxWidgets3/include/wx/wxhtml.h +++ /dev/null @@ -1,21 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/wxhtml.h -// Purpose: wxHTML library for wxWidgets -// Author: Vaclav Slavik -// Copyright: (c) 1999 Vaclav Slavik -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_HTML_H_ -#define _WX_HTML_H_ - -#include "wx/html/htmldefs.h" -#include "wx/html/htmltag.h" -#include "wx/html/htmlcell.h" -#include "wx/html/htmlpars.h" -#include "wx/html/htmlwin.h" -#include "wx/html/winpars.h" -#include "wx/filesys.h" -#include "wx/html/helpctrl.h" - -#endif // __WXHTML_H__ diff --git a/Externals/wxWidgets3/include/wx/wxprec.h b/Externals/wxWidgets3/include/wx/wxprec.h deleted file mode 100644 index e1fc0459cf..0000000000 --- a/Externals/wxWidgets3/include/wx/wxprec.h +++ /dev/null @@ -1,44 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/wxprec.h -// Purpose: Includes the appropriate files for precompiled headers -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// compiler detection; includes setup.h -#include "wx/defs.h" - -// check if to use precompiled headers: do it for most Windows compilers unless -// explicitly disabled by defining NOPCH -#if defined(__VISUALC__) || defined(__BORLANDC__) - // If user did not request NOCPH and we're not building using configure - // then assume user wants precompiled headers. - #if !defined(NOPCH) && !defined(__WX_SETUP_H__) - #define WX_PRECOMP - #endif -#endif - -#ifdef WX_PRECOMP - -// include "wx/chartype.h" first to ensure that UNICODE macro is correctly set -// _before_ including -#include "wx/chartype.h" - -// include standard Windows headers -#if defined(__WINDOWS__) - #include "wx/msw/wrapwin.h" - #include "wx/msw/private.h" -#endif -#if defined(__WXMSW__) - #include "wx/msw/wrapcctl.h" - #include "wx/msw/wrapcdlg.h" - #include "wx/msw/missing.h" -#endif - -// include the most common wx headers -#include "wx/wx.h" - -#endif // WX_PRECOMP diff --git a/Externals/wxWidgets3/include/wx/x11/app.h b/Externals/wxWidgets3/include/wx/x11/app.h deleted file mode 100644 index a3062ef14a..0000000000 --- a/Externals/wxWidgets3/include/wx/x11/app.h +++ /dev/null @@ -1,105 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/x11/app.h -// Purpose: wxApp class -// Author: Julian Smart -// Modified by: -// Created: 17/09/98 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_X11_APP_H_ -#define _WX_X11_APP_H_ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/gdicmn.h" -#include "wx/event.h" - -// ---------------------------------------------------------------------------- -// forward declarations -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxFrame; -class WXDLLIMPEXP_FWD_CORE wxWindow; -class WXDLLIMPEXP_FWD_CORE wxApp; -class WXDLLIMPEXP_FWD_CORE wxKeyEvent; -class WXDLLIMPEXP_FWD_BASE wxLog; -class WXDLLIMPEXP_FWD_CORE wxXVisualInfo; - -// ---------------------------------------------------------------------------- -// the wxApp class for wxX11 - see wxAppBase for more details -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxApp : public wxAppBase -{ -public: - wxApp(); - virtual ~wxApp(); - - // override base class (pure) virtuals - // ----------------------------------- - - virtual void Exit(); - - virtual void WakeUpIdle(); - - virtual bool OnInitGui(); - - // implementation from now on - // -------------------------- - - // Processes an X event. - virtual bool ProcessXEvent(WXEvent* event); - -public: - // Implementation - virtual bool Initialize(int& argc, wxChar **argv); - virtual void CleanUp(); - - WXWindow GetTopLevelWidget() const { return m_topLevelWidget; } - WXColormap GetMainColormap(WXDisplay* display); - long GetMaxRequestSize() const { return m_maxRequestSize; } - - // This handler is called when a property change event occurs - virtual bool HandlePropertyChange(WXEvent *event); - - // Values that can be passed on the command line. - // Returns -1, -1 if none specified. - const wxSize& GetInitialSize() const { return m_initialSize; } - bool GetShowIconic() const { return m_showIconic; } - -#if wxUSE_UNICODE - // Global context for Pango layout. Either use X11 - // or use Xft rendering according to GDK_USE_XFT - // environment variable - PangoContext* GetPangoContext(); -#endif - - wxXVisualInfo* GetVisualInfo(WXDisplay* WXUNUSED(display)) - { - // this should be implemented correctly for wxBitmap to work - // with multiple display - return m_visualInfo; - } - -public: - static long sm_lastMessageTime; - bool m_showIconic; - wxSize m_initialSize; - -#if !wxUSE_NANOX - wxXVisualInfo* m_visualInfo; -#endif - -protected: - WXWindow m_topLevelWidget; - WXColormap m_mainColormap; - long m_maxRequestSize; - - wxDECLARE_DYNAMIC_CLASS(wxApp); -}; - -#endif // _WX_X11_APP_H_ diff --git a/Externals/wxWidgets3/include/wx/x11/bitmap.h b/Externals/wxWidgets3/include/wx/x11/bitmap.h deleted file mode 100644 index c5cc209a3a..0000000000 --- a/Externals/wxWidgets3/include/wx/x11/bitmap.h +++ /dev/null @@ -1,148 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/x11/bitmap.h -// Purpose: wxBitmap class -// Author: Julian Smart, Robert Roebling -// Modified by: -// Created: 17/09/98 -// Copyright: (c) Julian Smart, Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_BITMAP_H_ -#define _WX_BITMAP_H_ - -#include "wx/defs.h" -#include "wx/object.h" -#include "wx/string.h" -#include "wx/palette.h" -#include "wx/gdiobj.h" - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxMask; -class WXDLLIMPEXP_FWD_CORE wxBitmap; -class WXDLLIMPEXP_FWD_CORE wxImage; - -//----------------------------------------------------------------------------- -// wxMask -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxMask: public wxObject -{ -public: - wxMask(); - wxMask(const wxMask& mask); - wxMask( const wxBitmap& bitmap, const wxColour& colour ); - wxMask( const wxBitmap& bitmap, int paletteIndex ); - wxMask( const wxBitmap& bitmap ); - virtual ~wxMask(); - - bool Create( const wxBitmap& bitmap, const wxColour& colour ); - bool Create( const wxBitmap& bitmap, int paletteIndex ); - bool Create( const wxBitmap& bitmap ); - - // implementation - WXPixmap GetBitmap() const { return m_bitmap; } - void SetBitmap( WXPixmap bitmap ) { m_bitmap = bitmap; } - - WXDisplay *GetDisplay() const { return m_display; } - void SetDisplay( WXDisplay *display ) { m_display = display; } - -private: - WXPixmap m_bitmap; - WXDisplay *m_display; - wxSize m_size; - -private: - wxDECLARE_DYNAMIC_CLASS(wxMask); -}; - -//----------------------------------------------------------------------------- -// wxBitmap -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase -{ -public: - wxBitmap() {} - wxBitmap( int width, int height, int depth = -1 ) { Create( width, height, depth ); } - wxBitmap( const wxSize& sz, int depth = -1 ) { Create( sz, depth ); } - - wxBitmap( const char bits[], int width, int height, int depth = 1 ); - wxBitmap( const char* const* bits ); -#ifdef wxNEEDS_CHARPP - // needed for old GCC - wxBitmap(char** data) - { - *this = wxBitmap(const_cast(data)); - } -#endif - wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_DEFAULT_TYPE ); - virtual ~wxBitmap(); - - static void InitStandardHandlers(); - - bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH); - bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH) - { return Create(sz.GetWidth(), sz.GetHeight(), depth); } - bool Create(int width, int height, const wxDC& WXUNUSED(dc)) - { return Create(width,height); } - - bool Create(const void* data, wxBitmapType type, - int width, int height, int depth = -1); - // create the wxBitmap using a _copy_ of the pixmap - bool Create(WXPixmap pixmap); - - int GetHeight() const; - int GetWidth() const; - int GetDepth() const; - -#if wxUSE_IMAGE - wxBitmap( const wxImage& image, int depth = -1, double WXUNUSED(scale) = 1.0 ) { (void)CreateFromImage(image, depth); } - wxImage ConvertToImage() const; - bool CreateFromImage(const wxImage& image, int depth = -1); -#endif // wxUSE_IMAGE - - // copies the contents and mask of the given (colour) icon to the bitmap - virtual bool CopyFromIcon(const wxIcon& icon); - - wxMask *GetMask() const; - void SetMask( wxMask *mask ); - - wxBitmap GetSubBitmap( const wxRect& rect ) const; - - bool SaveFile( const wxString &name, wxBitmapType type, const wxPalette *palette = NULL ) const; - bool LoadFile( const wxString &name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE ); - - wxPalette *GetPalette() const; - wxPalette *GetColourMap() const - { return GetPalette(); } - virtual void SetPalette(const wxPalette& palette); - - // implementation - // -------------- - - void SetHeight( int height ); - void SetWidth( int width ); - void SetDepth( int depth ); - void SetPixmap( WXPixmap pixmap ); - void SetBitmap( WXPixmap bitmap ); - - WXPixmap GetPixmap() const; - WXPixmap GetBitmap() const; - - WXPixmap GetDrawable() const; - - WXDisplay *GetDisplay() const; - -protected: - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; - -private: - wxDECLARE_DYNAMIC_CLASS(wxBitmap); -}; - -#endif // _WX_BITMAP_H_ diff --git a/Externals/wxWidgets3/include/wx/x11/brush.h b/Externals/wxWidgets3/include/wx/x11/brush.h deleted file mode 100644 index 6095b67210..0000000000 --- a/Externals/wxWidgets3/include/wx/x11/brush.h +++ /dev/null @@ -1,63 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/x11/brush.h -// Purpose: wxBrush class -// Author: Julian Smart, Robert Roebling -// Modified by: -// Created: 17/09/98 -// Copyright: (c) Julian Smart, Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_BRUSH_H_ -#define _WX_BRUSH_H_ - -#include "wx/gdiobj.h" - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxBrush; -class WXDLLIMPEXP_FWD_CORE wxColour; -class WXDLLIMPEXP_FWD_CORE wxBitmap; - -//----------------------------------------------------------------------------- -// wxBrush -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxBrush : public wxBrushBase -{ -public: - wxBrush() { } - - wxBrush( const wxColour &colour, wxBrushStyle style = wxBRUSHSTYLE_SOLID ); - wxBrush( const wxBitmap &stippleBitmap ); - virtual ~wxBrush(); - - bool operator==(const wxBrush& brush) const; - bool operator!=(const wxBrush& brush) const { return !(*this == brush); } - - wxBrushStyle GetStyle() const; - wxColour GetColour() const; - wxBitmap *GetStipple() const; - - void SetColour( const wxColour& col ); - void SetColour( unsigned char r, unsigned char g, unsigned char b ); - void SetStyle( wxBrushStyle style ); - void SetStipple( const wxBitmap& stipple ); - - - wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants") - wxBrush(const wxColour& col, int style); - - wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants") - void SetStyle(int style) { SetStyle((wxBrushStyle)style); } - -protected: - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; - - wxDECLARE_DYNAMIC_CLASS(wxBrush); -}; - -#endif // _WX_BRUSH_H_ diff --git a/Externals/wxWidgets3/include/wx/x11/chkconf.h b/Externals/wxWidgets3/include/wx/x11/chkconf.h deleted file mode 100644 index c552e838fb..0000000000 --- a/Externals/wxWidgets3/include/wx/x11/chkconf.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Name: wx/x11/chkconf.h - * Purpose: Compiler-specific configuration checking - * Author: Julian Smart - * Modified by: - * Created: 01/02/97 - * Copyright: (c) Julian Smart - * Licence: wxWindows licence - */ - -/* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */ - -#ifndef _WX_X11_CHKCONF_H_ -#define _WX_X11_CHKCONF_H_ - -/* wxPalette is always needed */ -#if !wxUSE_PALETTE -# error "wxX11 requires wxUSE_PALETTE=1" -#endif - -#if wxUSE_SOCKETS && !wxUSE_SELECT_DISPATCHER -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxSocket requires wxSelectDispatcher in wxX11" -# else -# undef wxUSE_SELECT_DISPATCHER -# define wxUSE_SELECT_DISPATCHER 1 -# endif -#endif - -#endif /* _WX_X11_CHKCONF_H_ */ diff --git a/Externals/wxWidgets3/include/wx/x11/clipbrd.h b/Externals/wxWidgets3/include/wx/x11/clipbrd.h deleted file mode 100644 index 4b00655205..0000000000 --- a/Externals/wxWidgets3/include/wx/x11/clipbrd.h +++ /dev/null @@ -1,76 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/x11/clipbrd.h -// Purpose: Clipboard functionality. -// Author: Robert Roebling -// Created: 17/09/98 -// Copyright: (c) Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_X11_CLIPBRD_H_ -#define _WX_X11_CLIPBRD_H_ - -#if wxUSE_CLIPBOARD - -#include "wx/object.h" -#include "wx/list.h" -#include "wx/dataobj.h" -#include "wx/control.h" -#include "wx/module.h" - -// ---------------------------------------------------------------------------- -// wxClipboard -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxClipboard : public wxClipboardBase -{ -public: - wxClipboard(); - virtual ~wxClipboard(); - - // open the clipboard before SetData() and GetData() - virtual bool Open(); - - // close the clipboard after SetData() and GetData() - virtual void Close(); - - // query whether the clipboard is opened - virtual bool IsOpened() const; - - // set the clipboard data. all other formats will be deleted. - virtual bool SetData( wxDataObject *data ); - - // add to the clipboard data. - virtual bool AddData( wxDataObject *data ); - - // ask if data in correct format is available - virtual bool IsSupported( const wxDataFormat& format ); - - // fill data with data on the clipboard (if available) - virtual bool GetData( wxDataObject& data ); - - // clears wxTheClipboard and the system's clipboard if possible - virtual void Clear(); - - // implementation from now on - bool m_open; - bool m_ownsClipboard; - bool m_ownsPrimarySelection; - wxDataObject *m_data; - - WXWindow m_clipboardWidget; /* for getting and offering data */ - WXWindow m_targetsWidget; /* for getting list of supported formats */ - bool m_waiting; /* querying data or formats is asynchronous */ - - bool m_formatSupported; - Atom m_targetRequested; - wxDataObject *m_receivedData; - -private: - wxDECLARE_DYNAMIC_CLASS(wxClipboard); - -}; - -#endif // wxUSE_CLIPBOARD - -#endif // _WX_X11_CLIPBRD_H_ diff --git a/Externals/wxWidgets3/include/wx/x11/colour.h b/Externals/wxWidgets3/include/wx/x11/colour.h deleted file mode 100644 index 568cf07b37..0000000000 --- a/Externals/wxWidgets3/include/wx/x11/colour.h +++ /dev/null @@ -1,70 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/x11/colour.h -// Purpose: wxColour class -// Author: Julian Smart, Robert Roebling -// Modified by: -// Created: 17/09/98 -// Copyright: (c) Julian Smart, Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_COLOUR_H_ -#define _WX_COLOUR_H_ - -#include "wx/defs.h" -#include "wx/object.h" -#include "wx/string.h" -#include "wx/gdiobj.h" -#include "wx/palette.h" - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxDC; -class WXDLLIMPEXP_FWD_CORE wxPaintDC; -class WXDLLIMPEXP_FWD_CORE wxBitmap; -class WXDLLIMPEXP_FWD_CORE wxWindow; - -class WXDLLIMPEXP_FWD_CORE wxColour; - -//----------------------------------------------------------------------------- -// wxColour -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxColour : public wxColourBase -{ -public: - // constructors - // ------------ - DEFINE_STD_WXCOLOUR_CONSTRUCTORS - - virtual ~wxColour(); - - bool operator==(const wxColour& col) const; - bool operator!=(const wxColour& col) const { return !(*this == col); } - - unsigned char Red() const; - unsigned char Green() const; - unsigned char Blue() const; - - // Implementation part - - void CalcPixel( WXColormap cmap ); - unsigned long GetPixel() const; - WXColor *GetColor() const; - -protected: - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; - - virtual void - InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a); - - virtual bool FromString(const wxString& str); - -private: - wxDECLARE_DYNAMIC_CLASS(wxColour); -}; - -#endif // _WX_COLOUR_H_ diff --git a/Externals/wxWidgets3/include/wx/x11/cursor.h b/Externals/wxWidgets3/include/wx/x11/cursor.h deleted file mode 100644 index 36c8f0e839..0000000000 --- a/Externals/wxWidgets3/include/wx/x11/cursor.h +++ /dev/null @@ -1,53 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/x11/cursor.h -// Purpose: wxCursor class -// Author: Julian Smart -// Modified by: -// Created: 17/09/98 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_CURSOR_H_ -#define _WX_CURSOR_H_ - -#include "wx/colour.h" - -class WXDLLIMPEXP_FWD_CORE wxImage; - -//----------------------------------------------------------------------------- -// wxCursor -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxCursor : public wxCursorBase -{ -public: - wxCursor(); - wxCursor(wxStockCursor id) { InitFromStock(id); } -#if WXWIN_COMPATIBILITY_2_8 - wxCursor(int id) { InitFromStock((wxStockCursor)id); } -#endif -#if wxUSE_IMAGE - wxCursor( const wxImage & image ); -#endif - - wxCursor(const wxString& name, - wxBitmapType type = wxCURSOR_DEFAULT_TYPE, - int hotSpotX = 0, int hotSpotY = 0); - virtual ~wxCursor(); - - // implementation - - WXCursor GetCursor() const; - -protected: - void InitFromStock(wxStockCursor); - - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; - -private: - wxDECLARE_DYNAMIC_CLASS(wxCursor); -}; - -#endif // _WX_CURSOR_H_ diff --git a/Externals/wxWidgets3/include/wx/x11/dataform.h b/Externals/wxWidgets3/include/wx/x11/dataform.h deleted file mode 100644 index 4dee2cd116..0000000000 --- a/Externals/wxWidgets3/include/wx/x11/dataform.h +++ /dev/null @@ -1,63 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/x11/dataform.h -// Purpose: declaration of the wxDataFormat class -// Author: Robert Roebling -// Modified by: -// Created: 19.10.99 (extracted from motif/dataobj.h) -// Copyright: (c) 1999 Robert Roebling -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_X11_DATAFORM_H -#define _WX_X11_DATAFORM_H - -class WXDLLIMPEXP_CORE wxDataFormat -{ -public: - // the clipboard formats under Xt are Atoms - typedef Atom NativeFormat; - - wxDataFormat(); - wxDataFormat( wxDataFormatId type ); - wxDataFormat( const wxString &id ); - wxDataFormat( NativeFormat format ); - - wxDataFormat& operator=(NativeFormat format) - { SetId(format); return *this; } - - // comparison (must have both versions) - bool operator==(NativeFormat format) const - { return m_format == (NativeFormat)format; } - bool operator!=(NativeFormat format) const - { return m_format != (NativeFormat)format; } - bool operator==(wxDataFormatId format) const - { return m_type == (wxDataFormatId)format; } - bool operator!=(wxDataFormatId format) const - { return m_type != (wxDataFormatId)format; } - - // explicit and implicit conversions to NativeFormat which is one of - // standard data types (implicit conversion is useful for preserving the - // compatibility with old code) - NativeFormat GetFormatId() const { return m_format; } - operator NativeFormat() const { return m_format; } - - void SetId( NativeFormat format ); - - // string ids are used for custom types - this SetId() must be used for - // application-specific formats - wxString GetId() const; - void SetId( const wxString& id ); - - // implementation - wxDataFormatId GetType() const; - -private: - wxDataFormatId m_type; - NativeFormat m_format; - - void PrepareFormats(); - void SetType( wxDataFormatId type ); -}; - - -#endif // _WX_X11_DATAFORM_H diff --git a/Externals/wxWidgets3/include/wx/x11/dataobj.h b/Externals/wxWidgets3/include/wx/x11/dataobj.h deleted file mode 100644 index ef13ccdd5f..0000000000 --- a/Externals/wxWidgets3/include/wx/x11/dataobj.h +++ /dev/null @@ -1,28 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/x11/dataobj.h -// Purpose: declaration of the wxDataObject class for Motif -// Author: Julian Smart -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_X11_DATAOBJ_H_ -#define _WX_X11_DATAOBJ_H_ - -// ---------------------------------------------------------------------------- -// wxDataObject is the same as wxDataObjectBase under wxMotif -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxDataObject : public wxDataObjectBase -{ -public: - wxDataObject(); - -#ifdef __DARWIN__ - virtual ~wxDataObject() { } -#endif - - virtual bool IsSupportedFormat( const wxDataFormat& format, Direction dir = Get ) const; -}; - -#endif //_WX_X11_DATAOBJ_H_ diff --git a/Externals/wxWidgets3/include/wx/x11/dataobj2.h b/Externals/wxWidgets3/include/wx/x11/dataobj2.h deleted file mode 100644 index 8b6cc6da64..0000000000 --- a/Externals/wxWidgets3/include/wx/x11/dataobj2.h +++ /dev/null @@ -1,91 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/x11/dataobj2.h -// Purpose: declaration of standard wxDataObjectSimple-derived classes -// Author: Robert Roebling -// Created: 19.10.99 (extracted from gtk/dataobj.h) -// Copyright: (c) 1998, 1999 Vadim Zeitlin, Robert Roebling -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_X11_DATAOBJ2_H_ -#define _WX_X11_DATAOBJ2_H_ - -// ---------------------------------------------------------------------------- -// wxBitmapDataObject is a specialization of wxDataObject for bitmaps -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxBitmapDataObject : public wxBitmapDataObjectBase -{ -public: - // ctors - wxBitmapDataObject(); - wxBitmapDataObject(const wxBitmap& bitmap); - - // destr - virtual ~wxBitmapDataObject(); - - // override base class virtual to update PNG data too - virtual void SetBitmap(const wxBitmap& bitmap); - - // implement base class pure virtuals - // ---------------------------------- - - virtual size_t GetDataSize() const { return m_pngSize; } - virtual bool GetDataHere(void *buf) const; - virtual bool SetData(size_t len, const void *buf); - // Must provide overloads to avoid hiding them (and warnings about it) - virtual size_t GetDataSize(const wxDataFormat&) const - { - return GetDataSize(); - } - virtual bool GetDataHere(const wxDataFormat&, void *buf) const - { - return GetDataHere(buf); - } - virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) - { - return SetData(len, buf); - } - -protected: - void Init() { m_pngData = NULL; m_pngSize = 0; } - void Clear() { free(m_pngData); } - void ClearAll() { Clear(); Init(); } - - size_t m_pngSize; - void *m_pngData; - - void DoConvertToPng(); -}; - -// ---------------------------------------------------------------------------- -// wxFileDataObject is a specialization of wxDataObject for file names -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxFileDataObject : public wxFileDataObjectBase -{ -public: - // implement base class pure virtuals - // ---------------------------------- - - void AddFile( const wxString &filename ); - - virtual size_t GetDataSize() const; - virtual bool GetDataHere(void *buf) const; - virtual bool SetData(size_t len, const void *buf); - // Must provide overloads to avoid hiding them (and warnings about it) - virtual size_t GetDataSize(const wxDataFormat&) const - { - return GetDataSize(); - } - virtual bool GetDataHere(const wxDataFormat&, void *buf) const - { - return GetDataHere(buf); - } - virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) - { - return SetData(len, buf); - } -}; - -#endif // _WX_X11_DATAOBJ2_H_ diff --git a/Externals/wxWidgets3/include/wx/x11/dc.h b/Externals/wxWidgets3/include/wx/x11/dc.h deleted file mode 100644 index 418e87d3c0..0000000000 --- a/Externals/wxWidgets3/include/wx/x11/dc.h +++ /dev/null @@ -1,52 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/x11/dc.h -// Purpose: wxDC class -// Author: Julian Smart -// Modified by: -// Created: 17/09/98 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DC_H_ -#define _WX_DC_H_ - -#include "wx/pen.h" -#include "wx/brush.h" -#include "wx/icon.h" -#include "wx/font.h" -#include "wx/gdicmn.h" - -//----------------------------------------------------------------------------- -// wxDC -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxX11DCImpl : public wxDCImpl -{ -public: - wxX11DCImpl( wxDC *owner ); - virtual ~wxX11DCImpl() { } - - virtual wxSize GetPPI() const; - -protected: - virtual void DoSetClippingRegion(wxCoord x, wxCoord y, - wxCoord width, wxCoord height); - virtual void DoGetSizeMM(int* width, int* height) const; - - // implementation - wxCoord XDEV2LOG(wxCoord x) const { return DeviceToLogicalX(x); } - wxCoord XDEV2LOGREL(wxCoord x) const { return DeviceToLogicalXRel(x); } - wxCoord YDEV2LOG(wxCoord y) const { return DeviceToLogicalY(y); } - wxCoord YDEV2LOGREL(wxCoord y) const { return DeviceToLogicalYRel(y); } - wxCoord XLOG2DEV(wxCoord x) const { return LogicalToDeviceX(x); } - wxCoord XLOG2DEVREL(wxCoord x) const { return LogicalToDeviceXRel(x); } - wxCoord YLOG2DEV(wxCoord y) const { return LogicalToDeviceY(y); } - wxCoord YLOG2DEVREL(wxCoord y) const { return LogicalToDeviceYRel(y); } - -private: - wxDECLARE_CLASS(wxX11DCImpl); -}; - -#endif -// _WX_DC_H_ diff --git a/Externals/wxWidgets3/include/wx/x11/dcclient.h b/Externals/wxWidgets3/include/wx/x11/dcclient.h deleted file mode 100644 index eebc6181d8..0000000000 --- a/Externals/wxWidgets3/include/wx/x11/dcclient.h +++ /dev/null @@ -1,180 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/x11/dcclient.h -// Purpose: wxClientDC, wxPaintDC and wxWindowDC classes -// Author: Julian Smart -// Modified by: -// Created: 17/09/98 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DCCLIENT_H_ -#define _WX_DCCLIENT_H_ - -#include "wx/dc.h" -#include "wx/dcclient.h" -#include "wx/x11/dc.h" -#include "wx/region.h" - -// ----------------------------------------------------------------------------- -// fwd declarations -// ----------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxWindow; - -//----------------------------------------------------------------------------- -// wxWindowDCImpl -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxWindowDCImpl : public wxX11DCImpl -{ -public: - wxWindowDCImpl( wxDC *owner ); - wxWindowDCImpl( wxDC *owner, wxWindow *win ); - - virtual ~wxWindowDCImpl(); - - virtual bool CanDrawBitmap() const { return true; } - virtual bool CanGetTextExtent() const { return true; } - -protected: - virtual void DoGetSize(int *width, int *height) const; - virtual bool DoFloodFill( wxCoord x, wxCoord y, const wxColour& col, - wxFloodFillStyle style = wxFLOOD_SURFACE ); - virtual bool DoGetPixel( wxCoord x, wxCoord y, wxColour *col ) const; - - virtual void DoDrawPoint(wxCoord x, wxCoord y); - virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2); - - virtual void DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y ); - virtual void DoDrawBitmap( const wxBitmap &bitmap, wxCoord x, wxCoord y, - bool useMask = false ); - - virtual void DoDrawArc(wxCoord x1, wxCoord y1, - wxCoord x2, wxCoord y2, - wxCoord xc, wxCoord yc); - virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h, - double sa, double ea); - - virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height); - virtual void DoDrawRoundedRectangle(wxCoord x, wxCoord y, - wxCoord width, wxCoord height, - double radius); - virtual void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height); - - virtual void DoCrossHair(wxCoord x, wxCoord y); - - virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y); - virtual void DoDrawRotatedText(const wxString &text, wxCoord x, wxCoord y, double angle); - - virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, - wxDC *source, wxCoord xsrc, wxCoord ysrc, - wxRasterOperationMode rop = wxCOPY, bool useMask = false, - wxCoord xsrcMask = -1, wxCoord ysrcMask = -1); - - virtual void DoSetClippingRegion(wxCoord x, wxCoord y, - wxCoord width, wxCoord height); - virtual void DoSetDeviceClippingRegion(const wxRegion& region); - - virtual void DoDrawLines(int n, const wxPoint points[], - wxCoord xoffset, wxCoord yoffset); - virtual void DoDrawPolygon(int n, const wxPoint points[], - wxCoord xoffset, wxCoord yoffset, - wxPolygonFillMode fillStyle = wxODDEVEN_RULE); - - -public: - virtual void Clear(); - - virtual void SetFont(const wxFont& font); - virtual void SetPen(const wxPen& pen); - virtual void SetBrush(const wxBrush& brush); - virtual void SetBackground(const wxBrush& brush); - virtual void SetBackgroundMode(int mode); - virtual void SetPalette(const wxPalette& palette); - virtual void SetLogicalFunction( wxRasterOperationMode function ); - - virtual void SetTextForeground(const wxColour& colour); - virtual void SetTextBackground(const wxColour& colour); - - virtual wxCoord GetCharHeight() const; - virtual wxCoord GetCharWidth() const; - - virtual int GetDepth() const; - virtual wxSize GetPPI() const; - - virtual void DestroyClippingRegion(); - WXWindow GetX11Window() const { return m_x11window; } - - virtual void ComputeScaleAndOrigin(); - - virtual void* GetCairoContext() const wxOVERRIDE; - -protected: - // implementation - // -------------- - virtual void DoGetTextExtent(const wxString& string, - wxCoord *x, wxCoord *y, - wxCoord *descent = NULL, - wxCoord *externalLeading = NULL, - const wxFont *theFont = NULL) const; - - void Init(); - - WXDisplay *m_display; - WXWindow m_x11window; - WXGC m_penGC; - WXGC m_brushGC; - WXGC m_textGC; - WXGC m_bgGC; - WXColormap m_cmap; - bool m_isMemDC; - bool m_isScreenDC; - wxRegion m_currentClippingRegion; - wxRegion m_paintClippingRegion; - -#if wxUSE_UNICODE - PangoContext *m_context; - PangoFontDescription *m_fontdesc; -#endif - - void SetUpDC(); - void Destroy(); - -private: - wxDECLARE_CLASS(wxWindowDCImpl); -}; - -//----------------------------------------------------------------------------- -// wxClientDC -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxClientDCImpl : public wxWindowDCImpl -{ -public: - wxClientDCImpl( wxDC *owner ) : wxWindowDCImpl( owner ) { } - wxClientDCImpl( wxDC *owner, wxWindow *win ); - -protected: - virtual void DoGetSize(int *width, int *height) const; - -private: - wxDECLARE_CLASS(wxClientDCImpl); -}; - -//----------------------------------------------------------------------------- -// wxPaintDC -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxPaintDCImpl : public wxClientDCImpl -{ -public: - wxPaintDCImpl( wxDC *owner ) : wxClientDCImpl( owner ) { } - wxPaintDCImpl( wxDC *owner, wxWindow *win ); - -private: - wxDECLARE_CLASS(wxPaintDCImpl); -}; - -#endif -// _WX_DCCLIENT_H_ diff --git a/Externals/wxWidgets3/include/wx/x11/dcmemory.h b/Externals/wxWidgets3/include/wx/x11/dcmemory.h deleted file mode 100644 index 3b08cff085..0000000000 --- a/Externals/wxWidgets3/include/wx/x11/dcmemory.h +++ /dev/null @@ -1,44 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/x11/dcmemory.h -// Purpose: wxMemoryDC class -// Author: Julian Smart -// Modified by: -// Created: 17/09/98 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DCMEMORY_H_ -#define _WX_DCMEMORY_H_ - -#include "wx/dc.h" -#include "wx/dcmemory.h" -#include "wx/x11/dcclient.h" - -class WXDLLIMPEXP_CORE wxMemoryDCImpl : public wxWindowDCImpl -{ -public: - wxMemoryDCImpl( wxDC* owner ); - wxMemoryDCImpl( wxDC* owner, wxBitmap& bitmap); - wxMemoryDCImpl( wxDC* owner, wxDC *dc ); - virtual ~wxMemoryDCImpl(); - - virtual const wxBitmap& GetSelectedBitmap() const; - virtual wxBitmap& GetSelectedBitmap(); - - // implementation - wxBitmap m_selected; - -protected: - virtual void DoGetSize( int *width, int *height ) const; - virtual void DoSelect(const wxBitmap& bitmap); - -private: - void Init(); - -private: - wxDECLARE_CLASS(wxMemoryDCImpl); -}; - -#endif -// _WX_DCMEMORY_H_ diff --git a/Externals/wxWidgets3/include/wx/x11/dcprint.h b/Externals/wxWidgets3/include/wx/x11/dcprint.h deleted file mode 100644 index e28eec0ec2..0000000000 --- a/Externals/wxWidgets3/include/wx/x11/dcprint.h +++ /dev/null @@ -1,28 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/x11/dcprint.h -// Purpose: wxPrinterDC class -// Author: Julian Smart -// Modified by: -// Created: 17/09/98 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DCPRINT_H_ -#define _WX_DCPRINT_H_ - -#include "wx/dc.h" - -class WXDLLIMPEXP_CORE wxPrinterDC: public wxDC -{ -public: - wxDECLARE_CLASS(wxPrinterDC); - - // Create a printer DC - wxPrinterDC(const wxString& driver, const wxString& device, const wxString& output, bool interactive = TRUE, wxPrintOrientation orientation = wxPORTRAIT); - - virtual ~wxPrinterDC(); -}; - -#endif - // _WX_DCPRINT_H_ diff --git a/Externals/wxWidgets3/include/wx/x11/dcscreen.h b/Externals/wxWidgets3/include/wx/x11/dcscreen.h deleted file mode 100644 index d0bab6a2f9..0000000000 --- a/Externals/wxWidgets3/include/wx/x11/dcscreen.h +++ /dev/null @@ -1,36 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/x11/dcscreen.h -// Purpose: wxScreenDC class -// Author: Julian Smart -// Modified by: -// Created: 17/09/98 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DCSCREEN_H_ -#define _WX_DCSCREEN_H_ - -#include "wx/dcclient.h" -#include "wx/x11/dcclient.h" - -//----------------------------------------------------------------------------- -// wxScreenDC -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxScreenDCImpl : public wxPaintDCImpl -{ -public: - wxScreenDCImpl( wxDC *owner); - virtual ~wxScreenDCImpl(); - -protected: - virtual void DoGetSize(int *width, int *height) const; - -private: - wxDECLARE_CLASS(wxScreenDCImpl); -}; - - -#endif - // _WX_DCSCREEN_H_ diff --git a/Externals/wxWidgets3/include/wx/x11/dnd.h b/Externals/wxWidgets3/include/wx/x11/dnd.h deleted file mode 100644 index aae6bd21ee..0000000000 --- a/Externals/wxWidgets3/include/wx/x11/dnd.h +++ /dev/null @@ -1,171 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/x11/dnd.h -// Purpose: declaration of wxDropTarget, wxDropSource classes -// Author: Julian Smart -// Copyright: (c) 1998 Vadim Zeitlin, Robert Roebling, Julian Smart -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DND_H_ -#define _WX_DND_H_ - -#include "wx/defs.h" - -#if wxUSE_DRAG_AND_DROP - -#include "wx/object.h" -#include "wx/string.h" -#include "wx/dataobj.h" -#include "wx/cursor.h" - -//------------------------------------------------------------------------- -// classes -//------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxWindow; - -class WXDLLIMPEXP_FWD_CORE wxDropTarget; -class WXDLLIMPEXP_FWD_CORE wxTextDropTarget; -class WXDLLIMPEXP_FWD_CORE wxFileDropTarget; -class WXDLLIMPEXP_FWD_CORE wxPrivateDropTarget; - -class WXDLLIMPEXP_FWD_CORE wxDropSource; - -//------------------------------------------------------------------------- -// wxDropTarget -//------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxDropTarget: public wxObject -{ -public: - - wxDropTarget(); - virtual ~wxDropTarget(); - - virtual void OnEnter() { } - virtual void OnLeave() { } - virtual bool OnDrop( long x, long y, const void *data, size_t size ) = 0; - - // Override these to indicate what kind of data you support: - - virtual size_t GetFormatCount() const = 0; - virtual wxDataFormat GetFormat(size_t n) const = 0; - - // implementation -}; - -//------------------------------------------------------------------------- -// wxTextDropTarget -//------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxTextDropTarget: public wxDropTarget -{ -public: - - wxTextDropTarget() {} - virtual bool OnDrop( long x, long y, const void *data, size_t size ); - virtual bool OnDropText( long x, long y, const char *psz ); - -protected: - - virtual size_t GetFormatCount() const; - virtual wxDataFormat GetFormat(size_t n) const; -}; - -//------------------------------------------------------------------------- -// wxPrivateDropTarget -//------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxPrivateDropTarget: public wxDropTarget -{ -public: - - wxPrivateDropTarget(); - - // you have to override OnDrop to get at the data - - // the string ID identifies the format of clipboard or DnD data. a word - // processor would e.g. add a wxTextDataObject and a wxPrivateDataObject - // to the clipboard - the latter with the Id "WXWORD_FORMAT". - - void SetId( const wxString& id ) - { m_id = id; } - - wxString GetId() - { return m_id; } - -private: - - virtual size_t GetFormatCount() const; - virtual wxDataFormat GetFormat(size_t n) const; - - wxString m_id; -}; - -// ---------------------------------------------------------------------------- -// A drop target which accepts files (dragged from File Manager or Explorer) -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxFileDropTarget: public wxDropTarget -{ -public: - - wxFileDropTarget() {} - - virtual bool OnDrop( long x, long y, const void *data, size_t size ); - virtual bool OnDropFiles( long x, long y, - size_t nFiles, const char * const aszFiles[] ); - -protected: - - virtual size_t GetFormatCount() const; - virtual wxDataFormat GetFormat(size_t n) const; -}; - -//------------------------------------------------------------------------- -// wxDropSource -//------------------------------------------------------------------------- - -enum wxDragResult -{ - wxDragError, // error prevented the d&d operation from completing - wxDragNone, // drag target didn't accept the data - wxDragCopy, // the data was successfully copied - wxDragMove, // the data was successfully moved - wxDragCancel // the operation was cancelled by user (not an error) -}; - -class WXDLLIMPEXP_CORE wxDropSource: public wxObject -{ -public: - - wxDropSource( wxWindow *win ); - wxDropSource( wxDataObject &data, wxWindow *win ); - - virtual ~wxDropSource(void); - - void SetData( wxDataObject &data ); - wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly); - - virtual bool GiveFeedback( wxDragResult WXUNUSED(effect), bool WXUNUSED(bScrolling) ) { return TRUE; } - - // implementation -#if 0 - void RegisterWindow(void); - void UnregisterWindow(void); - - wxWindow *m_window; - wxDragResult m_retValue; - wxDataObject *m_data; - - wxCursor m_defaultCursor; - wxCursor m_goaheadCursor; -#endif -}; - -#endif - -// wxUSE_DRAG_AND_DROP - -#endif -//_WX_DND_H_ diff --git a/Externals/wxWidgets3/include/wx/x11/font.h b/Externals/wxWidgets3/include/wx/x11/font.h deleted file mode 100644 index bd6100e4c4..0000000000 --- a/Externals/wxWidgets3/include/wx/x11/font.h +++ /dev/null @@ -1,162 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/x11/font.h -// Purpose: wxFont class -// Author: Julian Smart -// Modified by: -// Created: 17/09/98 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_FONT_H_ -#define _WX_FONT_H_ - -class wxXFont; - -// Font -class WXDLLIMPEXP_CORE wxFont : public wxFontBase -{ -public: - // ctors and such - wxFont() { } - - wxFont(const wxFontInfo& info) - { - Create(info.GetPointSize(), - info.GetFamily(), - info.GetStyle(), - info.GetWeight(), - info.IsUnderlined(), - info.GetFaceName(), - info.GetEncoding()); - - if ( info.IsUsingSizeInPixels() ) - SetPixelSize(info.GetPixelSize()); - } - - wxFont(int size, - wxFontFamily family, - wxFontStyle style, - wxFontWeight weight, - bool underlined = false, - const wxString& face = wxEmptyString, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT) - { - Create(size, family, style, weight, underlined, face, encoding); - } - - wxFont(const wxSize& pixelSize, - wxFontFamily family, - wxFontStyle style, - wxFontWeight weight, - bool underlined = false, - const wxString& face = wxEmptyString, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT) - { - Create(10, family, style, weight, underlined, face, encoding); - SetPixelSize(pixelSize); - } - - bool Create(int size, - wxFontFamily family, - wxFontStyle style, - wxFontWeight weight, - bool underlined = false, - const wxString& face = wxEmptyString, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT); - - wxFont(const wxNativeFontInfo& info); - - wxFont(const wxString &nativeInfoString) - { - Create(nativeInfoString); - } - - bool Create(const wxString& fontname, - wxFontEncoding fontenc = wxFONTENCODING_DEFAULT); - - // DELETEME: no longer seems to be implemented. - // bool Create(const wxNativeFontInfo& fontinfo); - - virtual ~wxFont(); - - // implement base class pure virtuals - virtual int GetPointSize() const; - virtual wxFontStyle GetStyle() const; - virtual wxFontWeight GetWeight() const; - virtual bool GetUnderlined() const; - virtual bool GetStrikethrough() const wxOVERRIDE; - virtual wxString GetFaceName() const; - virtual wxFontEncoding GetEncoding() const; - virtual const wxNativeFontInfo *GetNativeFontInfo() const; - - virtual bool IsFixedWidth() const; - - virtual void SetPointSize(int pointSize); - virtual void SetFamily(wxFontFamily family); - virtual void SetStyle(wxFontStyle style); - virtual void SetWeight(wxFontWeight weight); - virtual bool SetFaceName(const wxString& faceName); - virtual void SetUnderlined(bool underlined); - virtual void SetStrikethrough(bool strikethrough) wxOVERRIDE; - virtual void SetEncoding(wxFontEncoding encoding); - - wxDECLARE_COMMON_FONT_METHODS(); - - wxDEPRECATED_MSG("use wxFONT{FAMILY,STYLE,WEIGHT}_XXX constants") - wxFont(int size, - int family, - int style, - int weight, - bool underlined = false, - const wxString& face = wxEmptyString, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT) - { - (void)Create(size, (wxFontFamily)family, (wxFontStyle)style, (wxFontWeight)weight, underlined, face, encoding); - } - - // Implementation - -#if wxUSE_PANGO - // Set Pango attributes in the specified layout. Currently only - // underlined and strike-through attributes are handled by this function. - // - // If neither of them is specified, returns false, otherwise sets up the - // attributes and returns true. - bool SetPangoAttrs(PangoLayout* layout) const; -#else - // Find an existing, or create a new, XFontStruct - // based on this wxFont and the given scale. Append the - // font to list in the private data for future reference. - - // TODO This is a fairly basic implementation, that doesn't - // allow for different facenames, and also doesn't do a mapping - // between 'standard' facenames (e.g. Arial, Helvetica, Times Roman etc.) - // and the fonts that are available on a particular system. - // Maybe we need to scan the user's machine to build up a profile - // of the fonts and a mapping file. - - // Return font struct, and optionally the Motif font list - wxXFont *GetInternalFont(double scale = 1.0, - WXDisplay* display = NULL) const; - - // Helper function for convenient access of the above. - WXFontStructPtr GetFontStruct(double scale = 1.0, - WXDisplay* display = NULL) const; -#endif - -protected: - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; - - virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info ); - virtual wxFontFamily DoGetFamily() const; - - void Unshare(); - -private: - wxDECLARE_DYNAMIC_CLASS(wxFont); -}; - -#endif - // _WX_FONT_H_ diff --git a/Externals/wxWidgets3/include/wx/x11/glcanvas.h b/Externals/wxWidgets3/include/wx/x11/glcanvas.h deleted file mode 100644 index a02e0ba4b9..0000000000 --- a/Externals/wxWidgets3/include/wx/x11/glcanvas.h +++ /dev/null @@ -1,68 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/x11/glcanvas.h -// Purpose: wxGLCanvas, for using OpenGL with wxWidgets 2.0 for Motif. -// Uses the GLX extension. -// Author: Julian Smart and Wolfram Gloger -// Modified by: -// Created: 1995, 1999 -// Copyright: (c) Julian Smart, Wolfram Gloger -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GLCANVAS_H_ -#define _WX_GLCANVAS_H_ - -#include "wx/unix/glx11.h" - -class WXDLLIMPEXP_GL wxGLCanvas : public wxGLCanvasX11 -{ -public: - wxGLCanvas(wxWindow *parent, - const wxGLAttributes& dispAttrs, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxGLCanvasName, - const wxPalette& palette = wxNullPalette); - - wxEXPLICIT // avoid implicitly converting a wxWindow* to wxGLCanvas - wxGLCanvas(wxWindow *parent, - wxWindowID id = wxID_ANY, - const int *attribList = NULL, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxGLCanvasName, - const wxPalette& palette = wxNullPalette); - - bool Create(wxWindow *parent, - const wxGLAttributes& dispAttrs, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxGLCanvasName, - const wxPalette& palette = wxNullPalette); - - bool Create(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxGLCanvasName, - const int *attribList = NULL, - const wxPalette& palette = wxNullPalette); - - // implement wxGLCanvasX11 methods - // -------------------------------- - - virtual Window GetXWindow() const; - -protected: - virtual int GetColourIndex(const wxColour& col); - - wxDECLARE_CLASS(wxGLCanvas); -}; - -#endif // _WX_GLCANVAS_H_ diff --git a/Externals/wxWidgets3/include/wx/x11/joystick.h b/Externals/wxWidgets3/include/wx/x11/joystick.h deleted file mode 100644 index 1b982bd3ac..0000000000 --- a/Externals/wxWidgets3/include/wx/x11/joystick.h +++ /dev/null @@ -1,88 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/x11/joystick.h -// Purpose: wxJoystick class -// Author: Julian Smart -// Modified by: -// Created: 17/09/98 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_JOYSTICK_H_ -#define _WX_JOYSTICK_H_ - -#include "wx/event.h" - -class WXDLLIMPEXP_ADV wxJoystick: public wxObject -{ - wxDECLARE_DYNAMIC_CLASS(wxJoystick); -public: -/* -* Public interface - */ - - wxJoystick(int joystick = wxJOYSTICK1) { m_joystick = joystick; } - - // Attributes - //////////////////////////////////////////////////////////////////////////// - - wxPoint GetPosition() const; - int GetZPosition() const; - int GetButtonState() const; - int GetPOVPosition() const; - int GetPOVCTSPosition() const; - int GetRudderPosition() const; - int GetUPosition() const; - int GetVPosition() const; - int GetMovementThreshold() const; - void SetMovementThreshold(int threshold) ; - - // Capabilities - //////////////////////////////////////////////////////////////////////////// - - bool IsOk() const; // Checks that the joystick is functioning - static int GetNumberJoysticks() ; - int GetManufacturerId() const ; - int GetProductId() const ; - wxString GetProductName() const ; - int GetXMin() const; - int GetYMin() const; - int GetZMin() const; - int GetXMax() const; - int GetYMax() const; - int GetZMax() const; - int GetNumberButtons() const; - int GetNumberAxes() const; - int GetMaxButtons() const; - int GetMaxAxes() const; - int GetPollingMin() const; - int GetPollingMax() const; - int GetRudderMin() const; - int GetRudderMax() const; - int GetUMin() const; - int GetUMax() const; - int GetVMin() const; - int GetVMax() const; - - bool HasRudder() const; - bool HasZ() const; - bool HasU() const; - bool HasV() const; - bool HasPOV() const; - bool HasPOV4Dir() const; - bool HasPOVCTS() const; - - // Operations - //////////////////////////////////////////////////////////////////////////// - - // pollingFreq = 0 means that movement events are sent when above the threshold. - // If pollingFreq > 0, events are received every this many milliseconds. - bool SetCapture(wxWindow* win, int pollingFreq = 0); - bool ReleaseCapture(); - -protected: - int m_joystick; -}; - -#endif - // _WX_JOYSTICK_H_ diff --git a/Externals/wxWidgets3/include/wx/x11/minifram.h b/Externals/wxWidgets3/include/wx/x11/minifram.h deleted file mode 100644 index db88eea5a3..0000000000 --- a/Externals/wxWidgets3/include/wx/x11/minifram.h +++ /dev/null @@ -1,41 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/x11/minifram.h -// Purpose: wxMiniFrame class. A small frame for e.g. floating toolbars. -// If there is no equivalent on your platform, just make it a -// normal frame. -// Author: Julian Smart -// Modified by: -// Created: 17/09/98 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MINIFRAM_H_ -#define _WX_MINIFRAM_H_ - -#include "wx/frame.h" - -class WXDLLIMPEXP_CORE wxMiniFrame: public wxFrame { - - wxDECLARE_DYNAMIC_CLASS(wxMiniFrame); - -public: - inline wxMiniFrame() {} - inline wxMiniFrame(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE|wxTINY_CAPTION, - const wxString& name = wxFrameNameStr) - { - // Use wxFrame constructor in absence of more specific code. - Create(parent, id, title, pos, size, style, name); - } - - virtual ~wxMiniFrame() {} -protected: -}; - -#endif - // _WX_MINIFRAM_H_ diff --git a/Externals/wxWidgets3/include/wx/x11/nanox/X11/Xatom.h b/Externals/wxWidgets3/include/wx/x11/nanox/X11/Xatom.h deleted file mode 100644 index 60fba84c97..0000000000 --- a/Externals/wxWidgets3/include/wx/x11/nanox/X11/Xatom.h +++ /dev/null @@ -1,6 +0,0 @@ - -/* - * Xlib compatibility - */ - -/* Nothing yet */ diff --git a/Externals/wxWidgets3/include/wx/x11/nanox/X11/Xlib.h b/Externals/wxWidgets3/include/wx/x11/nanox/X11/Xlib.h deleted file mode 100644 index 6d19fe4607..0000000000 --- a/Externals/wxWidgets3/include/wx/x11/nanox/X11/Xlib.h +++ /dev/null @@ -1,356 +0,0 @@ -/* - * Xlib compatibility - */ - -#ifndef _DUMMY_XLIBH_ -#define _DUMMY_XLIBH_ - -/* Move away the typedef in XtoNX.h */ -#define XFontStruct XFontStruct1 -#include -#undef XFontStruct -#undef XCharStruct - -/* Data types */ - -typedef GR_PALETTE* Colormap; -typedef GR_DRAW_ID Drawable ; -typedef int Status; -typedef unsigned long VisualID; -typedef int Bool; -typedef long XID; -typedef GR_SCANCODE KeySym; -typedef GR_EVENT_KEYSTROKE XKeyEvent; -typedef struct { - GR_FONT_INFO info; - GR_FONT_ID fid; -} XFontStruct; -typedef struct { - short lbearing; /* origin to left edge of raster */ - short rbearing; /* origin to right edge of raster */ - short width; /* advance to next char's origin */ - short ascent; /* baseline to top edge of raster */ - short descent; /* baseline to bottom edge of raster */ - unsigned short attributes; /* per char flags (not predefined) */ -} XCharStruct; - -/* Configure window value mask bits */ -#define CWX (1<<0) -#define CWY (1<<1) -#define CWWidth (1<<2) -#define CWHeight (1<<3) -#define CWBorderWidth (1<<4) -#define CWSibling (1<<5) -#define CWStackMode (1<<6) - -/* Values */ - -typedef struct { - int x, y; - int width, height; - int border_width; - Window sibling; - int stack_mode; -} XWindowChanges; - -/* typedef unsigned long Time; */ - -#define Success 0 -#define GrabSuccess Success -#define GrabNotViewable (Success+1) -#define InputOutput 1 -#define InputOnly 2 -#define IsUnmapped 0 -#define IsUnviewable 1 -#define IsViewable 2 -/* Is this right? */ -#define PropertyChangeMask GR_EVENT_MASK_SELECTION_CHANGED -#define GraphicsExpose GR_EVENT_TYPE_EXPOSURE -#define GraphicsExposeMask GR_EVENT_MASK_EXPOSURE -#define ColormapChangeMask 0 -#define FillSolid 0 -#define LineSolid 0 -#define LineOnOffDash 0 -#define CapNotLast 0 -#define CapRound 0 -#define CapProjecting 0 -#define CapButt 0 -#define JoinRound 0 -#define JoinBevel 0 -#define JoinMiter 0 -#define IncludeInferiors 0 -#define ClipByChildren 0 -#define DoRed 0 -#define DoGreen 0 -#define DoBlue 0 -#define NoEventMask GR_EVENT_MASK_NONE -#define RevertToParent 0 -#define CurrentTime 0 -#define GrabModeAsync 0 - -#define GXcopy GR_MODE_COPY -#define GXclear GR_MODE_CLEAR -#ifndef GXxor -#define GXxor GR_MODE_OR -#endif -#define GXinvert GR_MODE_INVERT -#define GXorReverse GR_MODE_ORREVERSE -#define GXandReverse GR_MODE_ANDREVERSE -#define GXand GR_MODE_AND -#define GXor GR_MODE_OR -#define GXandInverted GR_MODE_ANDINVERTED -#define GXnoop GR_MODE_NOOP -#define GXnor GR_MODE_NOR -#define GXequiv GR_MODE_EQUIV -#define GXcopyInverted GR_MODE_COPYINVERTED -#define GXorInverted GR_MODE_ORINVERTED -#define GXnand GR_MODE_NAND -#define GXset GR_MODE_SET - -#define XSynchronize(display,sync) -#define XDefaultRootWindow(d) GR_ROOT_WINDOW_ID -#define RootWindowOfScreen(s) GR_ROOT_WINDOW_ID -#define XFreePixmap(d, p) GrDestroyWindow(p) -#define XFreeCursor(d, c) GrDestroyCursor(c) -#define XFreeGC(d, gc) GrDestroyGC(gc) -#define XSetBackground(d, gc, c) GrSetGCBackground(gc, c) -#define DefaultVisual(d, s) (NULL) -#define DefaultColormap(d, s) DefaultColormapOfScreen(NULL) -#define DefaultScreenOfDisplay(d) 0 -#define XSetFillStyle(d, gc, s) wxNoop() -#define XSetLineAttributes(d, gc, a, b, c, e) wxNoop() -#define XSetClipMask(d, gc, m) wxNoop() -#define XSetTSOrigin(d, gc, x, y) wxNoop() -#define XFillArc(d, w, gc, x, y, rx, ry, a1, a2) GrArcAngle(w, gc, x, y, rx, ry, a1, a2, GR_PIE) -#define XDrawArc(d, w, gc, x, y, rx, ry, a1, a2) GrArcAngle(w, gc, x, y, rx, ry, a1, a2, GR_ARC) -#define XDrawPoint(d, w, gc, x, y) GrPoint(w, gc, x, y) -#define XFillPolygon(d, w, gc, p, n, s, m) GrFillPoly(w, gc, n, p) -#define XDrawRectangle(d, w, gc, x, y, width, height) GrRect(w, gc, x, y, width, height) -#define XSetClipOrigin(d, gc, x, y) GrSetGCClipOrigin(gc, x, y) -#define XSetRegion(d, gc, r) GrSetGCRegion(gc, r) -#define XSetTile(d, gc, p) wxNoop() -#define XSetStipple(d, gc, p) wxNoop() -#define XSetSubwindowMode(d, gc, mode) wxNoop() -#define XFreeColormap(d, cmap) wxNoop() -#define XSetTransientForHint(d, w, p) wxNoop() -#define XUnionRegion(sr1,sr2,r) GrUnionRegion(r,sr1,sr2) -#define XIntersectRegion(sr1,sr2,r) GrIntersectRegion(r,sr1,sr2) -#define XEqualRegion(r1, r2) GrEqualRegion(r1, r2) -#define XEmptyRegion(r) GrEmptyRegion(r) -#define XOffsetRegion(r, x, y) GrOffsetRegion(r, x, y) -#define XClipBox(r, rect) GrGetRegionBox(r, rect) -#define XPointInRegion(r, x, y) GrPointInRegion(r, x, y) -#define XXorRegion(sr1, sr2, r) GrXorRegion(r, sr1, sr2) -/* TODO: Cannot find equivalent for this. */ -#define XIconifyWindow(d, w, s) 0 -#define XCreateWindowWithColor(d,p,x,y,w,h,bw,depth,cl,vis,backColor,foreColor) \ - GrNewWindow(p,x,y,w,h,bw,backColor,foreColor) -#define XLookupString(event, buf, len, sym, status) (*sym = (event)->scancode) -#define XBell(a, b) GrBell() -#define DisplayWidthMM(d, s) 100 -#define DisplayHeightMM(d, s) 100 - -/* These defines are wrongly defined in XtoNX.h, IMHO, - * since they reference a static global. - * Redefined as functions, below. - */ - -#undef DisplayWidth -#undef DisplayHeight -#undef DefaultDepth - -/* - * Data structure used by color operations - */ -typedef struct { - unsigned long pixel; - unsigned short red, green, blue; - char flags; /* do_red, do_green, do_blue */ - char pad; -} XColor; - -typedef struct { - int type; - Display *display; /* Display the event was read from */ - XID resourceid; /* resource id */ - unsigned long serial; /* serial number of failed request */ - unsigned char error_code; /* error code of failed request */ - unsigned char request_code; /* Major op-code of failed request */ - unsigned char minor_code; /* Minor op-code of failed request */ -} XErrorEvent; - -/* - * Visual structure; contains information about colormapping possible. - */ -typedef struct { - void *ext_data; /* hook for extension to hang data */ - VisualID visualid; /* visual id of this visual */ -#if defined(__cplusplus) || defined(c_plusplus) - int c_class; /* C++ class of screen (monochrome, etc.) */ -#else - int class; /* class of screen (monochrome, etc.) */ -#endif - unsigned long red_mask, green_mask, blue_mask; /* mask values */ - int bits_per_rgb; /* log base 2 of distinct color values */ - int map_entries; /* color map entries */ -} Visual; - -/* - * Depth structure; contains information for each possible depth. - */ -typedef struct { - int depth; /* this depth (Z) of the depth */ - int nvisuals; /* number of Visual types at this depth */ - Visual *visuals; /* list of visuals possible at this depth */ -} Depth; - -/* - * Information about the screen. The contents of this structure are - * implementation dependent. A Screen should be treated as opaque - * by application code. - */ - -struct _XDisplay; /* Forward declare before use for C++ */ - -typedef struct { - void *ext_data; /* hook for extension to hang data */ - struct _XDisplay *display;/* back pointer to display structure */ - Window root; /* Root window id. */ - int width, height; /* width and height of screen */ - int mwidth, mheight; /* width and height of in millimeters */ - int ndepths; /* number of depths possible */ - Depth *depths; /* list of allowable depths on the screen */ - int root_depth; /* bits per pixel */ - Visual *root_visual; /* root visual */ - GC default_gc; /* GC for the root root visual */ - Colormap cmap; /* default color map */ - unsigned long white_pixel; - unsigned long black_pixel; /* White and Black pixel values */ - int max_maps, min_maps; /* max and min color maps */ - int backing_store; /* Never, WhenMapped, Always */ - Bool save_unders; - long root_input_mask; /* initial root input mask */ -} Screen; - - -typedef struct { - int x, y; /* location of window */ - int width, height; /* width and height of window */ - int border_width; /* border width of window */ - int depth; /* depth of window */ - Visual *visual; /* the associated visual structure */ - Window root; /* root of screen containing window */ - int _class; /* InputOutput, InputOnly*/ - int bit_gravity; /* one of the bit gravity values */ - int win_gravity; /* one of the window gravity values */ - int backing_store; /* NotUseful, WhenMapped, Always */ - unsigned long backing_planes;/* planes to be preserved if possible */ - unsigned long backing_pixel;/* value to be used when restoring planes */ - Bool save_under; /* boolean, should bits under be saved? */ - Colormap colormap; /* color map to be associated with window */ - Bool map_installed; /* boolean, is color map currently installed*/ - int map_state; /* IsUnmapped, IsUnviewable, IsViewable */ - long all_event_masks; /* set of events all people have interest in*/ - long your_event_mask; /* my event mask */ - long do_not_propagate_mask;/* set of events that should not propagate */ - Bool override_redirect; /* boolean value for override-redirect */ - Screen *screen; /* back pointer to correct screen */ -} XWindowAttributes; - -typedef int (*XErrorHandler) ( /* WARNING, this type not in Xlib spec */ - Display* /* display */, - XErrorEvent* /* error_event */ -); - -/* events*/ - -/* What should this be? */ -#if 0 -#ifndef ResizeRequest -#define ResizeRequest ?? -#endif -#endif - -#ifndef MotionNotify -#define MotionNotify GR_EVENT_TYPE_MOUSE_POSITION -#define PointerMotionMask GR_EVENT_MASK_MOUSE_POSITION -#endif - -#define ButtonMotionMask GR_EVENT_MASK_MOUSE_POSITION -#define KeymapStateMask 0 -#define StructureNotifyMask GR_EVENT_MASK_UPDATE - -#ifdef ConfigureNotify -/* XtoNX.h gets it wrong */ -#undef ConfigureNotify -#endif -#define ConfigureNotify GR_EVENT_TYPE_UPDATE - -#ifndef FocusIn -#define FocusIn GR_EVENT_TYPE_FOCUS_IN -#define FocusOut GR_EVENT_TYPE_FOCUS_OUT -#define FocusChangeMask GR_EVENT_MASK_FOCUS_IN|GR_EVENT_MASK_FOCUS_OUT -#endif - -/* Fuunctions */ - -#ifdef __cplusplus -extern "C" { -#endif - -Display *XOpenDisplay(char *name); -Colormap DefaultColormapOfScreen(Screen* /* screen */) ; -int XSetGraphicsExposures( Display* /* display */, GC /* gc */, Bool /* graphics_exposures */) ; -int XWarpPointer( Display* /* display */, Window /* srcW */, Window /* destW */, - int /* srcX */, int /* srcY */, - unsigned int /* srcWidth */, - unsigned int /* srcHeight */, - int destX, int destY); -int XSetInputFocus(Display* /* display */, Window focus, int /* revert_to */, Time /* time */) ; -int XGetInputFocus(Display* /* display */, Window* /* focus_return */, int* /* revert_to_return */) ; -int XGrabPointer(Display* /* display */, Window /* grab_window */, - Bool /* owner_events */, unsigned int /* event_mask */, - int /* pointer_mode */, int /* keyboard_mode */, - Window /* confine_to */, Cursor /* cursor */, Time /* time */) ; -int XUngrabPointer(Display* /* display */, Time /* time */) ; -int XCopyArea(Display* /* display */, Drawable src, Drawable dest, GC gc, - int src_x, int src_y, unsigned int width, unsigned int height, - int dest_x, int dest_y) ; -int XCopyPlane(Display* /* display */, Drawable src, Drawable dest, GC gc, - int src_x, int src_y, unsigned int width, unsigned int height, - int dest_x, int dest_y, unsigned long /* plane */) ; - -XErrorHandler XSetErrorHandler (XErrorHandler /* handler */); -Screen *XScreenOfDisplay(Display* /* display */, - int /* screen_number */); -int DisplayWidth(Display* /* display */, int /* screen */); -int DisplayHeight(Display* /* display */, int /* screen */); -int DefaultDepth(Display* /* display */, int /* screen */); -int XAllocColor(Display* /* display */, Colormap /* cmap */, - XColor* color); -int XParseColor(Display* display, Colormap cmap, - const char* cname, XColor* color); -int XDrawLine(Display* display, Window win, GC gc, - int x1, int y1, int x2, int y2); -int XTextExtents( XFontStruct* font, char* s, int len, int* direction, - int* ascent, int* descent2, XCharStruct* overall); -int XPending(Display *d); -XFontStruct* XLoadQueryFont(Display* display, const char* fontSpec); -int XFreeFont(Display* display, XFontStruct* fontStruct); -int XQueryColor(Display* display, Colormap cmap, XColor* color); -Status XGetWindowAttributes(Display* display, Window w, - XWindowAttributes* window_attributes); - -int XConfigureWindow(Display* display, Window w, int mask, XWindowChanges* changes); -int XTranslateCoordinates(Display* display, Window srcWindow, Window destWindow, int srcX, int srcY, int* destX, int* destY, Window* childReturn); - -void wxNoop(); - -#ifdef __cplusplus -} -#endif - -#define XMaxRequestSize(display) 16384 - -#endif - /* _DUMMY_XLIBH_ */ diff --git a/Externals/wxWidgets3/include/wx/x11/nanox/X11/Xutil.h b/Externals/wxWidgets3/include/wx/x11/nanox/X11/Xutil.h deleted file mode 100644 index adf6bea03e..0000000000 --- a/Externals/wxWidgets3/include/wx/x11/nanox/X11/Xutil.h +++ /dev/null @@ -1,5 +0,0 @@ -/* - * Xlib compatibility - */ - -/* Nothing yet */ diff --git a/Externals/wxWidgets3/include/wx/x11/palette.h b/Externals/wxWidgets3/include/wx/x11/palette.h deleted file mode 100644 index 9c1ca7f553..0000000000 --- a/Externals/wxWidgets3/include/wx/x11/palette.h +++ /dev/null @@ -1,75 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/x11/palette.h -// Purpose: wxPalette class -// Author: Julian Smart -// Modified by: -// Created: 17/09/98 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PALETTE_H_ -#define _WX_PALETTE_H_ - -#include "wx/list.h" - -class WXDLLIMPEXP_FWD_CORE wxPalette; - -// Palette for one display -class wxXPalette : public wxObject -{ - wxDECLARE_DYNAMIC_CLASS(wxXPalette); - -public: - wxXPalette(); - - WXDisplay* m_display; - int m_pix_array_n; - unsigned char* m_red; - unsigned char* m_green; - unsigned char* m_blue; - unsigned long* m_pix_array; - WXColormap m_cmap; - bool m_destroyable; -}; - -class WXDLLIMPEXP_CORE wxPaletteRefData: public wxGDIRefData -{ - friend class WXDLLIMPEXP_FWD_CORE wxPalette; -public: - wxPaletteRefData(); - virtual ~wxPaletteRefData(); - -protected: - wxList m_palettes; -}; - -#define M_PALETTEDATA ((wxPaletteRefData *)m_refData) - -class WXDLLIMPEXP_CORE wxPalette : public wxPaletteBase -{ - wxDECLARE_DYNAMIC_CLASS(wxPalette); - -public: - wxPalette(); - - wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue); - virtual ~wxPalette(); - bool Create(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue); - int GetPixel(unsigned char red, unsigned char green, unsigned char blue) const; - bool GetRGB(int pixel, unsigned char *red, unsigned char *green, unsigned char *blue) const; - - // X-specific - WXColormap GetXColormap(WXDisplay* display = NULL) const; - bool TransferBitmap(void *data, int depth, int size); - bool TransferBitmap8(unsigned char *data, unsigned long size, void *dest, unsigned int bpp); - unsigned long *GetXPixArray(WXDisplay* display, int *pix_array_n); - void PutXColormap(WXDisplay* display, WXColormap cmap, bool destroyable); - virtual int GetColoursCount() const wxOVERRIDE; - -protected: - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; -}; - -#endif // _WX_PALETTE_H_ diff --git a/Externals/wxWidgets3/include/wx/x11/pen.h b/Externals/wxWidgets3/include/wx/x11/pen.h deleted file mode 100644 index b71eb45cc7..0000000000 --- a/Externals/wxWidgets3/include/wx/x11/pen.h +++ /dev/null @@ -1,76 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/x11/pen.h -// Purpose: wxPen class -// Author: Julian Smart -// Modified by: -// Created: 17/09/98 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PEN_H_ -#define _WX_PEN_H_ - -#include "wx/gdicmn.h" -#include "wx/gdiobj.h" - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxPen; -class WXDLLIMPEXP_FWD_CORE wxColour; -class WXDLLIMPEXP_FWD_CORE wxBitmap; - -typedef char wxX11Dash; - -//----------------------------------------------------------------------------- -// wxPen -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxPen: public wxPenBase -{ -public: - wxPen() { } - - wxPen( const wxColour &colour, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID ); - - wxPen( const wxBitmap &stipple, int width ); - virtual ~wxPen(); - - bool operator == ( const wxPen& pen ) const; - bool operator != (const wxPen& pen) const { return !(*this == pen); } - - void SetColour( const wxColour &colour ); - void SetColour( unsigned char red, unsigned char green, unsigned char blue ); - void SetCap( wxPenCap capStyle ); - void SetJoin( wxPenJoin joinStyle ); - void SetStyle( wxPenStyle style ); - void SetWidth( int width ); - void SetDashes( int number_of_dashes, const wxDash *dash ); - void SetStipple( const wxBitmap& stipple ); - - wxColour GetColour() const; - wxPenCap GetCap() const; - wxPenJoin GetJoin() const; - wxPenStyle GetStyle() const; - int GetWidth() const; - int GetDashes(wxDash **ptr) const; - int GetDashCount() const; - wxDash* GetDash() const; - wxBitmap* GetStipple() const; - - - wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants") - wxPen(const wxColour& col, int width, int style); - wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants") - void SetStyle(int style) { SetStyle((wxPenStyle)style); } - -protected: - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; - - wxDECLARE_DYNAMIC_CLASS(wxPen); -}; - -#endif // _WX_PEN_H_ diff --git a/Externals/wxWidgets3/include/wx/x11/popupwin.h b/Externals/wxWidgets3/include/wx/x11/popupwin.h deleted file mode 100644 index c1435a5ecb..0000000000 --- a/Externals/wxWidgets3/include/wx/x11/popupwin.h +++ /dev/null @@ -1,45 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/x11/popupwin.h -// Purpose: -// Author: Robert Roebling -// Created: -// Copyright: (c) 2001 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __GTKPOPUPWINH__ -#define __GTKPOPUPWINH__ - -#include "wx/defs.h" -#include "wx/panel.h" -#include "wx/icon.h" - -//----------------------------------------------------------------------------- -// wxPopUpWindow -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxPopupWindow: public wxPopupWindowBase -{ -public: - wxPopupWindow() { } - virtual ~wxPopupWindow() ; - - wxPopupWindow(wxWindow *parent, int flags = wxBORDER_NONE) - { (void)Create(parent, flags); } - - bool Create(wxWindow *parent, int flags = wxBORDER_NONE); - - virtual bool Show( bool show = TRUE ); - -protected: - virtual void DoMoveWindow(int x, int y, int width, int height); - virtual void DoSetSize(int x, int y, - int width, int height, - int sizeFlags = wxSIZE_AUTO); - -private: - wxDECLARE_EVENT_TABLE(); - wxDECLARE_DYNAMIC_CLASS(wxPopupWindow); -}; - -#endif // __GTKPOPUPWINDOWH__ diff --git a/Externals/wxWidgets3/include/wx/x11/print.h b/Externals/wxWidgets3/include/wx/x11/print.h deleted file mode 100644 index 82970f765f..0000000000 --- a/Externals/wxWidgets3/include/wx/x11/print.h +++ /dev/null @@ -1,51 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/x11/print.h -// Purpose: wxPrinter, wxPrintPreview classes -// Author: Julian Smart -// Modified by: -// Created: 17/09/98 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PRINT_H_ -#define _WX_PRINT_H_ - -#include "wx/prntbase.h" - -/* -* Represents the printer: manages printing a wxPrintout object -*/ - -class WXDLLIMPEXP_CORE wxPrinter: public wxPrinterBase -{ - wxDECLARE_DYNAMIC_CLASS(wxPrinter); - -public: - wxPrinter(wxPrintData *data = NULL); - virtual ~wxPrinter(); - - virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = TRUE); - virtual bool PrintDialog(wxWindow *parent); - virtual bool Setup(wxWindow *parent); -}; - -/* -* wxPrintPreview -* Programmer creates an object of this class to preview a wxPrintout. -*/ - -class WXDLLIMPEXP_CORE wxPrintPreview: public wxPrintPreviewBase -{ - wxDECLARE_CLASS(wxPrintPreview); - -public: - wxPrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting = NULL, wxPrintData *data = NULL); - virtual ~wxPrintPreview(); - - virtual bool Print(bool interactive); - virtual void DetermineScaling(); -}; - -#endif - // _WX_PRINT_H_ diff --git a/Externals/wxWidgets3/include/wx/x11/private.h b/Externals/wxWidgets3/include/wx/x11/private.h deleted file mode 100644 index d1436aec45..0000000000 --- a/Externals/wxWidgets3/include/wx/x11/private.h +++ /dev/null @@ -1,83 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/x11/private.h -// Purpose: Private declarations for X11 port -// Author: Julian Smart -// Modified by: -// Created: 17/09/98 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PRIVATE_H_ -#define _WX_PRIVATE_H_ - -#include "wx/defs.h" -#include "wx/hashmap.h" -#include "wx/utils.h" -#if defined( __cplusplus ) && defined( __VMS ) -#pragma message disable nosimpint -#endif -#include "X11/Xlib.h" -#include "X11/Xatom.h" -#include "X11/Xutil.h" -#if defined( __cplusplus ) && defined( __VMS ) -#pragma message enable nosimpint -#endif - -// Include common declarations -#include "wx/x11/privx.h" - -#if wxUSE_PANGO -#include -#endif - -class WXDLLIMPEXP_FWD_CORE wxMouseEvent; -class WXDLLIMPEXP_FWD_CORE wxKeyEvent; -class WXDLLIMPEXP_FWD_CORE wxWindow; - -// ---------------------------------------------------------------------------- -// Some Unicode <-> UTF8 macros stolen from GTK -// ---------------------------------------------------------------------------- - -#if wxUSE_UNICODE - #define wxGTK_CONV(s) wxConvUTF8.cWX2MB(s) - #define wxGTK_CONV_BACK(s) wxConvUTF8.cMB2WX(s) -#else - #define wxGTK_CONV(s) s.c_str() - #define wxGTK_CONV_BACK(s) s -#endif - -// ---------------------------------------------------------------------------- -// we maintain a hash table which contains the mapping from Widget to wxWindow -// corresponding to the window for this widget -// ---------------------------------------------------------------------------- - -WX_DECLARE_HASH_MAP(Window, wxWindow *, wxIntegerHash, wxIntegerEqual, wxWindowHash); - -// these hashes are defined in app.cpp -extern wxWindowHash *wxWidgetHashTable; -extern wxWindowHash *wxClientWidgetHashTable; - -extern void wxDeleteWindowFromTable(Window w); -extern wxWindow *wxGetWindowFromTable(Window w); -extern bool wxAddWindowToTable(Window w, wxWindow *win); - -extern void wxDeleteClientWindowFromTable(Window w); -extern wxWindow *wxGetClientWindowFromTable(Window w); -extern bool wxAddClientWindowToTable(Window w, wxWindow *win); - -// ---------------------------------------------------------------------------- -// TranslateXXXEvent() functions - translate X event to wxWindow one -// ---------------------------------------------------------------------------- -extern bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Window window, XEvent *xevent); -extern bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win, Window window, XEvent *xevent, bool isAscii = FALSE); - -extern Window wxGetWindowParent(Window window); - -// Set the window manager decorations according to the -// given wxWidgets style -bool wxSetWMDecorations(Window w, long style); -bool wxMWMIsRunning(Window w); - -#endif -// _WX_PRIVATE_H_ diff --git a/Externals/wxWidgets3/include/wx/x11/private/wrapxkb.h b/Externals/wxWidgets3/include/wx/x11/private/wrapxkb.h deleted file mode 100644 index d13100e7dc..0000000000 --- a/Externals/wxWidgets3/include/wx/x11/private/wrapxkb.h +++ /dev/null @@ -1,24 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/x11/private/wrapxkb.h -// Purpose: Private header wrapping X11/XKBlib.h inclusion. -// Author: Vadim Zeitlin -// Created: 2012-05-07 -// Copyright: (c) 2012 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _X11_PRIVATE_WRAPXKB_H_ -#define _X11_PRIVATE_WRAPXKB_H_ - -#ifdef HAVE_X11_XKBLIB_H - /* under HP-UX and Solaris 2.6, at least, XKBlib.h defines structures with - * field named "explicit" - which is, of course, an error for a C++ - * compiler. To be on the safe side, just redefine it everywhere. */ - #define explicit __wx_explicit - - #include - - #undef explicit -#endif // HAVE_X11_XKBLIB_H - -#endif // _X11_PRIVATE_WRAPXKB_H_ diff --git a/Externals/wxWidgets3/include/wx/x11/privx.h b/Externals/wxWidgets3/include/wx/x11/privx.h deleted file mode 100644 index c4de8021ea..0000000000 --- a/Externals/wxWidgets3/include/wx/x11/privx.h +++ /dev/null @@ -1,169 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/x11/privx.h -// Purpose: Private declarations common to X11 and Motif ports -// Author: Julian Smart -// Modified by: -// Created: 17/09/98 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PRIVX_H_ -#define _WX_PRIVX_H_ - -#include "wx/defs.h" -#include "wx/utils.h" -#include "wx/colour.h" - -#if defined( __cplusplus ) && defined( __VMS ) -#pragma message disable nosimpint -#endif -#include "X11/Xlib.h" -#include "X11/Xatom.h" -#include "X11/Xutil.h" -#if defined( __cplusplus ) && defined( __VMS ) -#pragma message enable nosimpint -#endif - -class WXDLLIMPEXP_FWD_CORE wxMouseEvent; -class WXDLLIMPEXP_FWD_CORE wxKeyEvent; -class WXDLLIMPEXP_FWD_CORE wxWindow; -class WXDLLIMPEXP_FWD_CORE wxRegion; - -// ---------------------------------------------------------------------------- -// key events related functions -// ---------------------------------------------------------------------------- - -WXPixel wxGetBestMatchingPixel(Display *display, XColor *desiredColor, Colormap cmap); -Pixmap XCreateInsensitivePixmap( Display *display, Pixmap pixmap ); - -extern XColor g_itemColors[]; -extern int wxComputeColours (Display *display, const wxColour * back, const wxColour * fore); - -// For convenience -inline Display* wxGlobalDisplay() { return (Display*) wxGetDisplay(); } - -#define wxMAX_RGB 0xff -#define wxMAX_SV 1000 -#define wxSIGN(x) ((x < 0) ? -x : x) -#define wxH_WEIGHT 4 -#define wxS_WEIGHT 1 -#define wxV_WEIGHT 2 - -typedef struct wx_hsv { - int h,s,v; - } wxHSV; - -#define wxMax3(x,y,z) ((x > y) ? ((x > z) ? x : z) : ((y > z) ? y : z)) -#define wxMin3(x,y,z) ((x < y) ? ((x < z) ? x : z) : ((y < z) ? y : z)) - -void wxHSVToXColor(wxHSV *hsv,XColor *xcolor); -void wxXColorToHSV(wxHSV *hsv,XColor *xcolor); -void wxAllocNearestColor(Display *display,Colormap colormap,XColor *xcolor); -void wxAllocColor(Display *display,Colormap colormap,XColor *xcolor); - -// For debugging -wxString wxGetXEventName(XEvent& event); - -#if wxUSE_NANOX -#define XEventGetWindow(event) event->general.wid -#define XEventGetType(event) event->general.type -#define XConfigureEventGetX(event) ((int) event->update.x) -#define XConfigureEventGetY(event) ((int) event->update.y) -#define XConfigureEventGetWidth(event) ((int) event->update.width) -#define XConfigureEventGetHeight(event) ((int) event->update.height) -#define XExposeEventGetX(event) event->exposure.x -#define XExposeEventGetY(event) event->exposure.y -#define XExposeEventGetWidth(event) event->exposure.width -#define XExposeEventGetHeight(event) event->exposure.height -#define XButtonEventGetTime(event) (wxGetLocalTime()) -#define XButtonEventLChanged(event) (event->button.changebuttons & GR_BUTTON_L) -#define XButtonEventMChanged(event) (event->button.changebuttons & GR_BUTTON_M) -#define XButtonEventRChanged(event) (event->button.changebuttons & GR_BUTTON_R) -#define XButtonEventLIsDown(x) ((x)->button.buttons & GR_BUTTON_L) -#define XButtonEventMIsDown(x) ((x)->button.buttons & GR_BUTTON_M) -#define XButtonEventRIsDown(x) ((x)->button.buttons & GR_BUTTON_R) -#define XButtonEventShiftIsDown(x) (x->button.modifiers & MWKMOD_SHIFT) -#define XButtonEventCtrlIsDown(x) (x->button.modifiers & MWKMOD_CTRL) -#define XButtonEventAltIsDown(x) (x->button.modifiers & MWKMOD_ALT) -#define XButtonEventMetaIsDown(x) (x->button.modifiers & MWKMOD_META) -#define XButtonEventGetX(event) (event->button.x) -#define XButtonEventGetY(event) (event->button.y) -#define XKeyEventGetTime(event) (wxGetLocalTime()) -#define XKeyEventGetX(event) (event->keystroke.x) -#define XKeyEventGetY(event) (event->keystroke.y) -#define XKeyEventShiftIsDown(x) (x->keystroke.modifiers & MWKMOD_SHIFT) -#define XKeyEventCtrlIsDown(x) (x->keystroke.modifiers & MWKMOD_CTRL) -#define XKeyEventAltIsDown(x) (x->keystroke.modifiers & MWKMOD_ALT) -#define XKeyEventMetaIsDown(x) (x->keystroke.modifiers & MWKMOD_META) -#define XFontStructGetAscent(f) f->info.baseline - -#else - -#define XEventGetWindow(event) event->xany.window -#define XEventGetType(event) event->xany.type -#define XConfigureEventGetX(event) event->xconfigure.x -#define XConfigureEventGetY(event) event->xconfigure.y -#define XConfigureEventGetWidth(event) event->xconfigure.width -#define XConfigureEventGetHeight(event) event->xconfigure.height -#define XExposeEventGetX(event) event->xexpose.x -#define XExposeEventGetY(event) event->xexpose.y -#define XExposeEventGetWidth(event) event->xexpose.width -#define XExposeEventGetHeight(event) event->xexpose.height -#define XButtonEventGetTime(event) (event->xbutton.time) -#define XButtonEventLChanged(event) (event->xbutton.button == Button1) -#define XButtonEventMChanged(event) (event->xbutton.button == Button2) -#define XButtonEventRChanged(event) (event->xbutton.button == Button3) -#define XButtonEventLIsDown(x) ((x)->xbutton.state & Button1Mask) -#define XButtonEventMIsDown(x) ((x)->xbutton.state & Button2Mask) -#define XButtonEventRIsDown(x) ((x)->xbutton.state & Button3Mask) -#define XButtonEventShiftIsDown(x) (x->xbutton.state & ShiftMask) -#define XButtonEventCtrlIsDown(x) (x->xbutton.state & ControlMask) -#define XButtonEventAltIsDown(x) (x->xbutton.state & Mod3Mask) -#define XButtonEventMetaIsDown(x) (x->xbutton.state & Mod1Mask) -#define XButtonEventGetX(event) (event->xbutton.x) -#define XButtonEventGetY(event) (event->xbutton.y) -#define XKeyEventGetTime(event) (event->xkey.time) -#define XKeyEventShiftIsDown(x) (x->xkey.state & ShiftMask) -#define XKeyEventCtrlIsDown(x) (x->xkey.state & ControlMask) -#define XKeyEventAltIsDown(x) (x->xkey.state & Mod3Mask) -#define XKeyEventMetaIsDown(x) (x->xkey.state & Mod1Mask) -#define XKeyEventGetX(event) (event->xkey.x) -#define XKeyEventGetY(event) (event->xkey.y) -#define XFontStructGetAscent(f) f->ascent -#endif - -// ---------------------------------------------------------------------------- -// Misc functions -// ---------------------------------------------------------------------------- - -bool wxDoSetShape( Display* xdisplay, Window xwindow, const wxRegion& region ); - -class WXDLLIMPEXP_CORE wxXVisualInfo -{ -public: - wxXVisualInfo(); - ~wxXVisualInfo(); - void Init( Display* dpy, XVisualInfo* visualInfo ); - - int m_visualType; // TrueColor, DirectColor etc. - int m_visualDepth; - int m_visualColormapSize; - void *m_visualColormap; - int m_visualScreen; - unsigned long m_visualRedMask; - unsigned long m_visualGreenMask; - unsigned long m_visualBlueMask; - int m_visualRedShift; - int m_visualGreenShift; - int m_visualBlueShift; - int m_visualRedPrec; - int m_visualGreenPrec; - int m_visualBluePrec; - - unsigned char *m_colorCube; -}; - -bool wxFillXVisualInfo( wxXVisualInfo* vi, Display* dpy ); - -#endif // _WX_PRIVX_H_ diff --git a/Externals/wxWidgets3/include/wx/x11/region.h b/Externals/wxWidgets3/include/wx/x11/region.h deleted file mode 100644 index 62779bdcec..0000000000 --- a/Externals/wxWidgets3/include/wx/x11/region.h +++ /dev/null @@ -1,122 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/x11/region.h -// Purpose: wxRegion class -// Author: Julian Smart -// Modified by: -// Created: 17/09/98 -// Copyright: (c) Julian Smart, Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_REGION_H_ -#define _WX_REGION_H_ - -#include "wx/list.h" - -// ---------------------------------------------------------------------------- -// wxRegion -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxRegion : public wxRegionBase -{ -public: - wxRegion() { } - - wxRegion( wxCoord x, wxCoord y, wxCoord w, wxCoord h ) - { - InitRect(x, y, w, h); - } - - wxRegion( const wxPoint& topLeft, const wxPoint& bottomRight ) - { - InitRect(topLeft.x, topLeft.y, - bottomRight.x - topLeft.x, bottomRight.y - topLeft.y); - } - - wxRegion( const wxRect& rect ) - { - InitRect(rect.x, rect.y, rect.width, rect.height); - } - - wxRegion( size_t n, const wxPoint *points, wxPolygonFillMode fillStyle = wxODDEVEN_RULE ); - - wxRegion( const wxBitmap& bmp) - { - Union(bmp); - } - wxRegion( const wxBitmap& bmp, - const wxColour& transColour, int tolerance = 0) - { - Union(bmp, transColour, tolerance); - } - - virtual ~wxRegion(); - - // wxRegionBase methods - virtual void Clear(); - virtual bool IsEmpty() const; - -public: - WXRegion *GetX11Region() const; - -protected: - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; - - // wxRegionBase pure virtuals - virtual bool DoIsEqual(const wxRegion& region) const; - virtual bool DoGetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const; - virtual wxRegionContain DoContainsPoint(wxCoord x, wxCoord y) const; - virtual wxRegionContain DoContainsRect(const wxRect& rect) const; - - virtual bool DoOffset(wxCoord x, wxCoord y); - virtual bool DoUnionWithRect(const wxRect& rect); - virtual bool DoUnionWithRegion(const wxRegion& region); - virtual bool DoIntersect(const wxRegion& region); - virtual bool DoSubtract(const wxRegion& region); - virtual bool DoXor(const wxRegion& region); - - // common part of ctors for a rectangle region - void InitRect(wxCoord x, wxCoord y, wxCoord w, wxCoord h); - -private: - wxDECLARE_DYNAMIC_CLASS(wxRegion); -}; - -// ---------------------------------------------------------------------------- -// wxRegionIterator: decomposes a region into rectangles -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxRegionIterator: public wxObject -{ -public: - wxRegionIterator(); - wxRegionIterator(const wxRegion& region); - - void Reset() { m_current = 0u; } - void Reset(const wxRegion& region); - - operator bool () const; - bool HaveRects() const; - - void operator ++ (); - void operator ++ (int); - - wxCoord GetX() const; - wxCoord GetY() const; - wxCoord GetW() const; - wxCoord GetWidth() const { return GetW(); } - wxCoord GetH() const; - wxCoord GetHeight() const { return GetH(); } - wxRect GetRect() const; - -private: - size_t m_current; - wxRegion m_region; - -private: - wxDECLARE_DYNAMIC_CLASS(wxRegionIterator); -}; - -#endif -// _WX_REGION_H_ diff --git a/Externals/wxWidgets3/include/wx/x11/reparent.h b/Externals/wxWidgets3/include/wx/x11/reparent.h deleted file mode 100644 index 43a1b8d34b..0000000000 --- a/Externals/wxWidgets3/include/wx/x11/reparent.h +++ /dev/null @@ -1,66 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/x11/reparent.h -// Purpose: Reparenting classes -// Author: Julian Smart -// Modified by: -// Created: 2002-03-09 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_REPARENT_H_ -#define _WX_REPARENT_H_ - -#include "wx/window.h" - -/* - * This class helps to reparent a specific window - */ - -class WXDLLIMPEXP_FWD_CORE wxAdoptedWindow; -class WXDLLIMPEXP_CORE wxReparenter: public wxObject -{ -public: - wxReparenter() {} - - // We assume that toReparent has had its X window set - // appropriately. toReparent is typically a wxAdoptedWindow. - bool Reparent(wxWindow* newParent, wxAdoptedWindow* toReparent); - - // Wait for an appropriate window to be created. - // If exactMatch is FALSE, a substring match is OK. - // If windowName is empty, then wait for the next overrideRedirect window. - bool WaitAndReparent(wxWindow* newParent, wxAdoptedWindow* toReparent, - const wxString& windowName = wxEmptyString, - bool exactMatch = TRUE); - -protected: - - bool ProcessXEvent(WXEvent* event); - WXWindow FindAClientWindow(WXWindow window, const wxString& name); - - static bool sm_done; - static wxAdoptedWindow* sm_toReparent; - static wxWindow* sm_newParent; - static wxString sm_name; - static bool sm_exactMatch; -}; - -/* - * A window that adopts its handle from the native - * toolkit. It has no parent until reparented. - */ - -class WXDLLIMPEXP_CORE wxAdoptedWindow: public wxWindow -{ - public: - wxAdoptedWindow(); - wxAdoptedWindow(WXWindow window); - virtual ~wxAdoptedWindow(); - - void SetHandle(WXWindow window) { m_mainWindow = window; m_clientWindow = window; } - WXWindow GetHandle() const { return X11GetMainWindow(); } -}; - -#endif -// _WX_REPARENT_H_ diff --git a/Externals/wxWidgets3/include/wx/x11/textctrl.h b/Externals/wxWidgets3/include/wx/x11/textctrl.h deleted file mode 100644 index 31b4350208..0000000000 --- a/Externals/wxWidgets3/include/wx/x11/textctrl.h +++ /dev/null @@ -1,384 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/x11/textctrl.h -// Purpose: -// Author: Robert Roebling -// Created: 01/02/97 -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __X11TEXTCTRLH__ -#define __X11TEXTCTRLH__ - -// Set to 1 to use wxUniv's implementation, 0 -// to use wxX11's. -#define wxUSE_UNIV_TEXTCTRL 1 - -#if wxUSE_UNIV_TEXTCTRL -#include "wx/univ/textctrl.h" -#else - -#include "wx/scrolwin.h" -#include "wx/arrstr.h" - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxTextCtrl; - -//----------------------------------------------------------------------------- -// helpers -//----------------------------------------------------------------------------- - -enum wxSourceUndo -{ - wxSOURCE_UNDO_LINE, - wxSOURCE_UNDO_ENTER, - wxSOURCE_UNDO_BACK, - wxSOURCE_UNDO_INSERT_LINE, - wxSOURCE_UNDO_DELETE, - wxSOURCE_UNDO_PASTE -}; - -class wxSourceUndoStep: public wxObject -{ -public: - wxSourceUndoStep( wxSourceUndo type, int y1, int y2, wxTextCtrl *owner ); - - void Undo(); - - wxSourceUndo m_type; - int m_y1; - int m_y2; - int m_cursorX; - int m_cursorY; - wxTextCtrl *m_owner; - wxString m_text; - wxArrayString m_lines; -}; - -class wxSourceLine -{ -public: - wxSourceLine( const wxString &text = wxEmptyString ) - { - m_text = text; - } - - wxString m_text; -}; - -WX_DECLARE_OBJARRAY(wxSourceLine, wxSourceLineArray); - -enum wxSourceLanguage -{ - wxSOURCE_LANG_NONE, - wxSOURCE_LANG_CPP, - wxSOURCE_LANG_PERL, - wxSOURCE_LANG_PYTHON -}; - -//----------------------------------------------------------------------------- -// wxTextCtrl -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxTextCtrl: public wxTextCtrlBase, public wxScrollHelper -{ -public: - wxTextCtrl() { Init(); } - wxTextCtrl(wxWindow *parent, - wxWindowID id, - const wxString &value = wxEmptyString, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString &name = wxTextCtrlNameStr); - virtual ~wxTextCtrl(); - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString &value = wxEmptyString, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString &name = wxTextCtrlNameStr); - - // required for scrolling with wxScrollHelper - // ------------------------------------------ - - virtual void PrepareDC(wxDC& dc) { DoPrepareDC(dc); } - - // implement base class pure virtuals - // ---------------------------------- - - virtual void ChangeValue(const wxString &value); - - virtual int GetLineLength(long lineNo) const; - virtual wxString GetLineText(long lineNo) const; - virtual int GetNumberOfLines() const; - - virtual bool IsModified() const; - virtual bool IsEditable() const; - - // more readable flag testing methods - // ---------------------------------- - - bool IsPassword() const { return (GetWindowStyle() & wxTE_PASSWORD) != 0; } - bool WrapLines() const { return false; } - - // If the return values from and to are the same, there is no selection. - virtual void GetSelection(long* from, long* to) const; - - // operations - // ---------- - - // editing - virtual void Clear(); - virtual void Replace(long from, long to, const wxString& value); - virtual void Remove(long from, long to); - - // clears the dirty flag - virtual void DiscardEdits(); - - virtual void SetMaxLength(unsigned long len); - - // writing text inserts it at the current position, appending always - // inserts it at the end - virtual void WriteText(const wxString& text); - virtual void AppendText(const wxString& text); - - // apply text attribute to the range of text (only works with richedit - // controls) - virtual bool SetStyle(long start, long end, const wxTextAttr& style); - - // translate between the position (which is just an index in the text ctrl - // considering all its contents as a single strings) and (x, y) coordinates - // which represent column and line. - virtual long XYToPosition(long x, long y) const; - virtual bool PositionToXY(long pos, long *x, long *y) const; - - virtual void ShowPosition(long pos); - - // Clipboard operations - virtual void Copy(); - virtual void Cut(); - virtual void Paste(); - - // Undo/redo - virtual void Undo(); - virtual void Redo() {} - - virtual bool CanUndo() const { return (m_undos.GetCount() > 0); } - virtual bool CanRedo() const { return false; } - - // Insertion point - virtual void SetInsertionPoint(long pos); - virtual void SetInsertionPointEnd(); - virtual long GetInsertionPoint() const; - virtual wxTextPos GetLastPosition() const; - - virtual void SetSelection(long from, long to); - virtual void SetEditable(bool editable); - - virtual bool Enable( bool enable = true ); - - void OnCut(wxCommandEvent& event); - void OnCopy(wxCommandEvent& event); - void OnPaste(wxCommandEvent& event); - void OnUndo(wxCommandEvent& event); - void OnRedo(wxCommandEvent& event); - - void OnUpdateCut(wxUpdateUIEvent& event); - void OnUpdateCopy(wxUpdateUIEvent& event); - void OnUpdatePaste(wxUpdateUIEvent& event); - void OnUpdateUndo(wxUpdateUIEvent& event); - void OnUpdateRedo(wxUpdateUIEvent& event); - - bool SetFont(const wxFont& font); - bool SetForegroundColour(const wxColour& colour); - bool SetBackgroundColour(const wxColour& colour); - - void SetModified() { m_modified = true; } - - // textctrl specific scrolling - virtual bool ScrollLines(int lines); - virtual bool ScrollPages(int pages); - - // not part of the wxTextCtrl API from now on.. - - void SetLanguage( wxSourceLanguage lang = wxSOURCE_LANG_NONE ); - - void Delete(); - void DeleteLine(); - - void Indent(); - void Unindent(); - - bool HasSelection(); - void ClearSelection(); - - int GetCursorX() { return m_cursorX; } - int GetCursorY() { return m_cursorY; } - bool IsModified() { return m_modified; } - bool OverwriteMode() { return m_overwrite; } - - // implementation from now on... - - int PosToPixel( int line, int pos ); - int PixelToPos( int line, int pixel ); - - void SearchForBrackets(); - - void DoChar( char c ); - void DoBack(); - void DoDelete(); - void DoReturn(); - void DoDClick(); - - wxString GetNextToken( wxString &line, size_t &pos ); - - void DrawLinePart( wxDC &dc, int x, int y, const wxString &toDraw, const wxString &origin, const wxColour &colour); - void DrawLine( wxDC &dc, int x, int y, const wxString &line, int lineNum ); - void OnPaint( wxPaintEvent &event ); - void OnEraseBackground( wxEraseEvent &event ); - void OnMouse( wxMouseEvent &event ); - void OnChar( wxKeyEvent &event ); - void OnSetFocus( wxFocusEvent& event ); - void OnKillFocus( wxFocusEvent& event ); - - void OnInternalIdle(); - void RefreshLine( int n ); - void RefreshDown( int n ); - void MoveCursor( int new_x, int new_y, bool shift = false, bool centre = false ); - void MyAdjustScrollbars(); - -protected: - // common part of all ctors - void Init(); - - virtual wxSize DoGetBestSize() const; - - virtual void DoSetValue(const wxString& value, int flags = 0); - - friend class wxSourceUndoStep; - - wxSourceLineArray m_lines; - - wxFont m_sourceFont; - wxColour m_sourceColour; - wxColour m_commentColour; - wxColour m_stringColour; - - int m_cursorX; - int m_cursorY; - - int m_selStartX,m_selStartY; - int m_selEndX,m_selEndY; - - int m_lineHeight; - int m_charWidth; - - int m_longestLine; - - bool m_overwrite; - bool m_modified; - bool m_editable; - bool m_ignoreInput; - - wxArrayString m_keywords; - wxColour m_keywordColour; - - wxArrayString m_defines; - wxColour m_defineColour; - - wxArrayString m_variables; - wxColour m_variableColour; - - wxSourceLanguage m_lang; - - wxList m_undos; - - bool m_capturing; - - int m_bracketX; - int m_bracketY; - -private: - wxDECLARE_EVENT_TABLE(); - wxDECLARE_DYNAMIC_CLASS(wxTextCtrl); -}; - -//----------------------------------------------------------------------------- -// this is superfluous here but helps to compile -//----------------------------------------------------------------------------- - -// cursor movement and also selection and delete operations -#define wxACTION_TEXT_GOTO wxT("goto") // to pos in numArg -#define wxACTION_TEXT_FIRST wxT("first") // go to pos 0 -#define wxACTION_TEXT_LAST wxT("last") // go to last pos -#define wxACTION_TEXT_HOME wxT("home") -#define wxACTION_TEXT_END wxT("end") -#define wxACTION_TEXT_LEFT wxT("left") -#define wxACTION_TEXT_RIGHT wxT("right") -#define wxACTION_TEXT_UP wxT("up") -#define wxACTION_TEXT_DOWN wxT("down") -#define wxACTION_TEXT_WORD_LEFT wxT("wordleft") -#define wxACTION_TEXT_WORD_RIGHT wxT("wordright") -#define wxACTION_TEXT_PAGE_UP wxT("pageup") -#define wxACTION_TEXT_PAGE_DOWN wxT("pagedown") - -// clipboard operations -#define wxACTION_TEXT_COPY wxT("copy") -#define wxACTION_TEXT_CUT wxT("cut") -#define wxACTION_TEXT_PASTE wxT("paste") - -// insert text at the cursor position: the text is in strArg of PerformAction -#define wxACTION_TEXT_INSERT wxT("insert") - -// if the action starts with either of these prefixes and the rest of the -// string is one of the movement commands, it means to select/delete text from -// the current cursor position to the new one -#define wxACTION_TEXT_PREFIX_SEL wxT("sel") -#define wxACTION_TEXT_PREFIX_DEL wxT("del") - -// mouse selection -#define wxACTION_TEXT_ANCHOR_SEL wxT("anchorsel") -#define wxACTION_TEXT_EXTEND_SEL wxT("extendsel") -#define wxACTION_TEXT_SEL_WORD wxT("wordsel") -#define wxACTION_TEXT_SEL_LINE wxT("linesel") - -// undo or redo -#define wxACTION_TEXT_UNDO wxT("undo") -#define wxACTION_TEXT_REDO wxT("redo") - -// ---------------------------------------------------------------------------- -// wxTextCtrl types -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxStdTextCtrlInputHandler : public wxStdInputHandler -{ -public: - wxStdTextCtrlInputHandler(wxInputHandler *inphand) : wxStdInputHandler(inphand) {} - - virtual bool HandleKey(wxInputConsumer *consumer, - const wxKeyEvent& event, - bool pressed) { return false; } - virtual bool HandleMouse(wxInputConsumer *consumer, const wxMouseEvent& event) { return false; } - virtual bool HandleMouseMove(wxInputConsumer *consumer, const wxMouseEvent& event) { return false; } - virtual bool HandleFocus(wxInputConsumer *consumer, const wxFocusEvent& event) { return false; } - -protected: - // get the position of the mouse click - static wxTextPos HitTest(const wxTextCtrl *text, const wxPoint& pos) { return 0; } - - // capture data - wxTextCtrl *m_winCapture; -}; - -#endif -// wxUSE_UNIV_TEXTCTRL - -#endif // __X11TEXTCTRLH__ diff --git a/Externals/wxWidgets3/include/wx/x11/toplevel.h b/Externals/wxWidgets3/include/wx/x11/toplevel.h deleted file mode 100644 index 0eec73778b..0000000000 --- a/Externals/wxWidgets3/include/wx/x11/toplevel.h +++ /dev/null @@ -1,116 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/x11/toplevel.h -// Purpose: wxTopLevelWindowX11 is the X11 implementation of wxTLW -// Author: Julian Smart -// Modified by: -// Created: 20.09.01 -// Copyright: (c) 2002 Julian Smart -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_X11_TOPLEVEL_H_ -#define _WX_X11_TOPLEVEL_H_ - -// ---------------------------------------------------------------------------- -// wxTopLevelWindowX11 -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxTopLevelWindowX11 : public wxTopLevelWindowBase -{ -public: - // constructors and such - wxTopLevelWindowX11() { Init(); } - - wxTopLevelWindowX11(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr) - { - Init(); - - (void)Create(parent, id, title, pos, size, style, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr); - - virtual ~wxTopLevelWindowX11(); - - // implement base class pure virtuals - virtual void Maximize(bool maximize = true); - virtual bool IsMaximized() const; - virtual void Iconize(bool iconize = true); - virtual bool IsIconized() const; - virtual void SetIcons(const wxIconBundle& icons); - virtual void Restore(); - - virtual bool Show( bool show = true ); - - virtual bool ShowFullScreen( bool show, long style = wxFULLSCREEN_ALL ); - virtual bool IsFullScreen() const { return m_fsIsShowing; } - - virtual void SetTitle( const wxString& title); - virtual wxString GetTitle() const; - - // implementation - void SetNeedResizeInIdle( bool set = true ) - { m_needResizeInIdle = set; } - void SetConfigureGeometry( int x, int y, int width, int height ) - { m_x = x; m_y = y; m_width = width; m_height = height; } - - virtual bool SetShape(const wxRegion& region); - - // For implementation purposes - sometimes decorations make the - // client area smaller - virtual wxPoint GetClientAreaOrigin() const; - - virtual void OnInternalIdle(); - -protected: - // common part of all ctors - void Init(); - - // set the icon for the window - void DoSetIcon( const wxIcon& icon ); - - // For implementation of delayed resize events - bool m_needResizeInIdle; - - virtual void DoGetClientSize( int *width, int *height ) const; - virtual void DoGetSize( int *width, int *height ) const; - virtual void DoSetClientSize(int width, int height); - virtual void DoSetSize(int x, int y, - int width, int height, - int sizeFlags = wxSIZE_AUTO); - virtual void DoGetPosition( int *x, int *y ) const; - - // Is the frame currently iconized? - bool m_iconized; - - // Should the frame be maximized when it will be shown? set by Maximize() - // when it is called while the frame is hidden - bool m_maximizeOnShow; - - // Data to save/restore when calling ShowFullScreen - long m_fsStyle; // Passed to ShowFullScreen - wxRect m_fsOldSize; - bool m_fsIsMaximized; - bool m_fsIsShowing; - wxString m_title; - - // Geometry - int m_x,m_y,m_width,m_height; -}; - -// list of all frames and modeless dialogs -//extern WXDLLIMPEXP_DATA_CORE(wxWindowList) wxModelessWindows; - -#endif // _WX_X11_TOPLEVEL_H_ diff --git a/Externals/wxWidgets3/include/wx/x11/window.h b/Externals/wxWidgets3/include/wx/x11/window.h deleted file mode 100644 index c0f0add91f..0000000000 --- a/Externals/wxWidgets3/include/wx/x11/window.h +++ /dev/null @@ -1,221 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/x11/window.h -// Purpose: wxWindow class -// Author: Julian Smart -// Modified by: -// Created: 17/09/98 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_WINDOW_H_ -#define _WX_WINDOW_H_ - -#include "wx/region.h" - -// ---------------------------------------------------------------------------- -// wxWindow class for Motif - see also wxWindowBase -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxWindowX11 : public wxWindowBase -{ - friend class WXDLLIMPEXP_FWD_CORE wxDC; - friend class WXDLLIMPEXP_FWD_CORE wxWindowDC; - -public: - wxWindowX11() { Init(); } - - wxWindowX11(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxPanelNameStr) - { - Init(); - Create(parent, id, pos, size, style, name); - } - - virtual ~wxWindowX11(); - - bool Create(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxPanelNameStr); - - virtual void Raise(); - virtual void Lower(); - - // SetLabel(), which does nothing in wxWindow - virtual void SetLabel(const wxString& label) wxOVERRIDE { m_Label = label; } - virtual wxString GetLabel() const wxOVERRIDE { return m_Label; } - - virtual bool Show( bool show = true ); - virtual bool Enable( bool enable = true ); - - virtual void SetFocus(); - - virtual void WarpPointer(int x, int y); - - virtual void Refresh( bool eraseBackground = true, - const wxRect *rect = (const wxRect *) NULL ); - virtual void Update(); - - virtual bool SetBackgroundColour( const wxColour &colour ); - virtual bool SetForegroundColour( const wxColour &colour ); - - virtual bool SetCursor( const wxCursor &cursor ); - virtual bool SetFont( const wxFont &font ); - - virtual int GetCharHeight() const; - virtual int GetCharWidth() const; - - virtual void ScrollWindow( int dx, int dy, const wxRect* rect = NULL ); - -#if wxUSE_DRAG_AND_DROP - virtual void SetDropTarget( wxDropTarget *dropTarget ); -#endif // wxUSE_DRAG_AND_DROP - - // Accept files for dragging - virtual void DragAcceptFiles(bool accept); - - // Get the unique identifier of a window - virtual WXWindow GetHandle() const { return X11GetMainWindow(); } - - // implementation from now on - // -------------------------- - - // accessors - // --------- - - // Get main X11 window - virtual WXWindow X11GetMainWindow() const; - - // Get X11 window representing the client area - virtual WXWindow GetClientAreaWindow() const; - - void SetLastClick(int button, long timestamp) - { m_lastButton = button; m_lastTS = timestamp; } - - int GetLastClickedButton() const { return m_lastButton; } - long GetLastClickTime() const { return m_lastTS; } - - // Gives window a chance to do something in response to a size message, e.g. - // arrange status bar, toolbar etc. - virtual bool PreResize(); - - // Generates paint events from m_updateRegion - void SendPaintEvents(); - - // Generates paint events from flag - void SendNcPaintEvents(); - - // Generates erase events from m_clearRegion - void SendEraseEvents(); - - // Clip to paint region? - bool GetClipPaintRegion() { return m_clipPaintRegion; } - - // Return clear region - wxRegion &GetClearRegion() { return m_clearRegion; } - - void NeedUpdateNcAreaInIdle( bool update = true ) { m_updateNcArea = update; } - - // Inserting into main window instead of client - // window. This is mostly for a wxWindow's own - // scrollbars. - void SetInsertIntoMain( bool insert = true ) { m_insertIntoMain = insert; } - bool GetInsertIntoMain() { return m_insertIntoMain; } - - // sets the fore/background colour for the given widget - static void DoChangeForegroundColour(WXWindow widget, wxColour& foregroundColour); - static void DoChangeBackgroundColour(WXWindow widget, wxColour& backgroundColour, bool changeArmColour = false); - - // I don't want users to override what's done in idle so everything that - // has to be done in idle time in order for wxX11 to work is done in - // OnInternalIdle - virtual void OnInternalIdle(); - -protected: - // Responds to colour changes: passes event on to children. - void OnSysColourChanged(wxSysColourChangedEvent& event); - - // For double-click detection - long m_lastTS; // last timestamp - int m_lastButton; // last pressed button - -protected: - WXWindow m_mainWindow; - WXWindow m_clientWindow; - bool m_insertIntoMain; - - bool m_winCaptured; - wxRegion m_clearRegion; - bool m_clipPaintRegion; - bool m_updateNcArea; - bool m_needsInputFocus; // Input focus set in OnIdle - - // implement the base class pure virtuals - virtual void DoGetTextExtent(const wxString& string, - int *x, int *y, - int *descent = NULL, - int *externalLeading = NULL, - const wxFont *font = NULL) const; - virtual void DoClientToScreen( int *x, int *y ) const; - virtual void DoScreenToClient( int *x, int *y ) const; - virtual void DoGetPosition( int *x, int *y ) const; - virtual void DoGetSize( int *width, int *height ) const; - virtual void DoGetClientSize( int *width, int *height ) const; - virtual void DoSetSize(int x, int y, - int width, int height, - int sizeFlags = wxSIZE_AUTO); - virtual void DoSetClientSize(int width, int height); - virtual void DoMoveWindow(int x, int y, int width, int height); - virtual void DoSetSizeHints(int minW, int minH, - int maxW, int maxH, - int incW, int incH); - virtual void DoCaptureMouse(); - virtual void DoReleaseMouse(); - virtual void KillFocus(); - -#if wxUSE_TOOLTIPS - virtual void DoSetToolTip( wxToolTip *tip ); -#endif // wxUSE_TOOLTIPS - -private: - // common part of all ctors - void Init(); - - wxString m_Label; - - wxDECLARE_DYNAMIC_CLASS(wxWindowX11); - wxDECLARE_NO_COPY_CLASS(wxWindowX11); - wxDECLARE_EVENT_TABLE(); -}; - -// ---------------------------------------------------------------------------- -// A little class to switch off `size optimization' while an instance of the -// object exists: this may be useful to temporarily disable the optimisation -// which consists to do nothing when the new size is equal to the old size - -// although quite useful usually to avoid flicker, sometimes it leads to -// undesired effects. -// -// Usage: create an instance of this class on the stack to disable the size -// optimisation, it will be reenabled as soon as the object goes out from scope. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxNoOptimize -{ -public: - wxNoOptimize() { ms_count++; } - ~wxNoOptimize() { ms_count--; } - - static bool CanOptimize() { return ms_count == 0; } - -protected: - static int ms_count; -}; - -#endif // _WX_WINDOW_H_ diff --git a/Externals/wxWidgets3/include/wx/xlocale.h b/Externals/wxWidgets3/include/wx/xlocale.h deleted file mode 100644 index 27493974d0..0000000000 --- a/Externals/wxWidgets3/include/wx/xlocale.h +++ /dev/null @@ -1,342 +0,0 @@ -////////////////////////////////////////////////////////////////////////////// -// Name: wx/xlocale.h -// Purpose: Header to provide some xlocale wrappers -// Author: Brian Vanderburg II, Vadim Zeitlin -// Created: 2008-01-07 -// Copyright: (c) 2008 Brian Vanderburg II -// 2008 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -/* - This header defines portable wrappers around xlocale foo_l() functions or - their MSVC proprietary _foo_l() equivalents when they are available and - implements these functions for the "C" locale [only] if they are not. This - allows the program running under the default user locale to still use "C" - locale for operations such as reading data from files where they are stored - using decimal point &c. - - TODO: Currently only the character classification and transformation - functions and number <-> string functions, are implemented, - we also need at least - - formatted IO: scanf_l(), printf_l() &c - - time: strftime_l(), strptime_l() - */ - -#ifndef _WX_XLOCALE_H_ -#define _WX_XLOCALE_H_ - -#include "wx/defs.h" // wxUSE_XLOCALE - -#if wxUSE_XLOCALE - -#include "wx/crt.h" // Includes wx/chartype.h, wx/wxcrt.h(wx/string.h) -#include "wx/intl.h" // wxLanguage - -// The platform-specific locale type -// If wxXLocale_t is not defined, then only "C" locale support is provided -#ifdef wxHAS_XLOCALE_SUPPORT - #if wxCHECK_VISUALC_VERSION(8) - typedef _locale_t wxXLocale_t; - #define wxXLOCALE_IDENT(name) _ ## name - #elif defined(HAVE_LOCALE_T) - #include - #include - #include - #include - - #if wxUSE_UNICODE - #include - #endif - - // Locale type and identifier name - typedef locale_t wxXLocale_t; - - #define wxXLOCALE_IDENT(name) name - #else - #error "Unknown xlocale support" - #endif -#endif // wxHAS_XLOCALE_SUPPORT - - -// wxXLocale is a wrapper around the native type representing a locale. -// -// It is not to be confused with wxLocale, which handles actually changing the -// locale, loading message catalogs, etc. This just stores a locale value. -// The similarity of names is unfortunate, but there doesn't seem to be any -// better alternative right now. Perhaps by wxWidgets 4.0 better naming could -// be used, or this class could become wxLocale (a wrapper for the value), and -// some other class could be used to load the language catalogs or something -// that would be clearer -#ifdef wxHAS_XLOCALE_SUPPORT - -class WXDLLIMPEXP_BASE wxXLocale -{ -public: - // Construct an uninitialized locale - wxXLocale() { m_locale = NULL; } - -#if wxUSE_INTL - // Construct from a symbolic language constant - wxXLocale(wxLanguage lang); -#endif - - // Construct from the given language string - wxXLocale(const char *loc) { Init(loc); } - - // Destroy the locale - ~wxXLocale() { Free(); } - - - // Get the global "C" locale object - static wxXLocale& GetCLocale(); - - // Check if the object represents a valid locale (notice that without - // wxHAS_XLOCALE_SUPPORT the only valid locale is the "C" one) - bool IsOk() const { return m_locale != NULL; } - - // Get the type - wxXLocale_t Get() const { return m_locale; } - - bool operator== (const wxXLocale& loc) const - { return m_locale == loc.m_locale; } - -private: - // Special ctor for the "C" locale, it's only used internally as the user - // code is supposed to use GetCLocale() - wxXLocale(struct wxXLocaleCTag * WXUNUSED(dummy)) { Init("C"); } - - // Create from the given language string (called from ctors) - void Init(const char *loc); - - // Free the locale if it's non-NULL - void Free(); - - - // The corresponding locale handle, NULL if invalid - wxXLocale_t m_locale; - - - // POSIX xlocale API provides a duplocale() function but MSVC locale API - // doesn't give us any means to copy a _locale_t object so we reduce the - // functionality to least common denominator here -- it shouldn't be a - // problem as copying the locale objects shouldn't be often needed - wxDECLARE_NO_COPY_CLASS(wxXLocale); -}; - -#else // !wxHAS_XLOCALE_SUPPORT - -// Skeleton version supporting only the "C" locale for the systems without -// xlocale support -class WXDLLIMPEXP_BASE wxXLocale -{ -public: - // Construct an uninitialized locale - wxXLocale() { m_isC = false; } - - // Construct from a symbolic language constant: unless the language is - // wxLANGUAGE_ENGLISH_US (which we suppose to be the same as "C" locale) - // the object will be invalid - wxXLocale(wxLanguage lang) - { - m_isC = lang == wxLANGUAGE_ENGLISH_US; - } - - // Construct from the given language string: unless the string is "C" or - // "POSIX" the object will be invalid - wxXLocale(const char *loc) - { - m_isC = loc && (strcmp(loc, "C") == 0 || strcmp(loc, "POSIX") == 0); - } - - // Default copy ctor, assignment operator and dtor are ok (or would be if - // we didn't use wxDECLARE_NO_COPY_CLASS() for consistency with the - // xlocale version) - - - // Get the global "C" locale object - static wxXLocale& GetCLocale(); - - // Check if the object represents a valid locale (notice that without - // wxHAS_XLOCALE_SUPPORT the only valid locale is the "C" one) - bool IsOk() const { return m_isC; } - -private: - // Special ctor for the "C" locale, it's only used internally as the user - // code is supposed to use GetCLocale() - wxXLocale(struct wxXLocaleCTag * WXUNUSED(dummy)) { m_isC = true; } - - // Without xlocale support this class can only represent "C" locale, if - // this is false the object is invalid - bool m_isC; - - - // although it's not a problem to copy the objects of this class, we use - // this macro in this implementation for consistency with the xlocale-based - // one which can't be copied when using MSVC locale API - wxDECLARE_NO_COPY_CLASS(wxXLocale); -}; - -#endif // wxHAS_XLOCALE_SUPPORT/!wxHAS_XLOCALE_SUPPORT - - -// A shorter synonym for the most commonly used locale object -#define wxCLocale (wxXLocale::GetCLocale()) -extern WXDLLIMPEXP_DATA_BASE(wxXLocale) wxNullXLocale; - -// Wrappers for various functions: -#ifdef wxHAS_XLOCALE_SUPPORT - - // ctype functions - #define wxCRT_Isalnum_lA wxXLOCALE_IDENT(isalnum_l) - #define wxCRT_Isalpha_lA wxXLOCALE_IDENT(isalpha_l) - #define wxCRT_Iscntrl_lA wxXLOCALE_IDENT(iscntrl_l) - #define wxCRT_Isdigit_lA wxXLOCALE_IDENT(isdigit_l) - #define wxCRT_Isgraph_lA wxXLOCALE_IDENT(isgraph_l) - #define wxCRT_Islower_lA wxXLOCALE_IDENT(islower_l) - #define wxCRT_Isprint_lA wxXLOCALE_IDENT(isprint_l) - #define wxCRT_Ispunct_lA wxXLOCALE_IDENT(ispunct_l) - #define wxCRT_Isspace_lA wxXLOCALE_IDENT(isspace_l) - #define wxCRT_Isupper_lA wxXLOCALE_IDENT(isupper_l) - #define wxCRT_Isxdigit_lA wxXLOCALE_IDENT(isxdigit_l) - #define wxCRT_Tolower_lA wxXLOCALE_IDENT(tolower_l) - #define wxCRT_Toupper_lA wxXLOCALE_IDENT(toupper_l) - - inline int wxIsalnum_l(char c, const wxXLocale& loc) - { return wxCRT_Isalnum_lA(static_cast(c), loc.Get()); } - inline int wxIsalpha_l(char c, const wxXLocale& loc) - { return wxCRT_Isalpha_lA(static_cast(c), loc.Get()); } - inline int wxIscntrl_l(char c, const wxXLocale& loc) - { return wxCRT_Iscntrl_lA(static_cast(c), loc.Get()); } - inline int wxIsdigit_l(char c, const wxXLocale& loc) - { return wxCRT_Isdigit_lA(static_cast(c), loc.Get()); } - inline int wxIsgraph_l(char c, const wxXLocale& loc) - { return wxCRT_Isgraph_lA(static_cast(c), loc.Get()); } - inline int wxIslower_l(char c, const wxXLocale& loc) - { return wxCRT_Islower_lA(static_cast(c), loc.Get()); } - inline int wxIsprint_l(char c, const wxXLocale& loc) - { return wxCRT_Isprint_lA(static_cast(c), loc.Get()); } - inline int wxIspunct_l(char c, const wxXLocale& loc) - { return wxCRT_Ispunct_lA(static_cast(c), loc.Get()); } - inline int wxIsspace_l(char c, const wxXLocale& loc) - { return wxCRT_Isspace_lA(static_cast(c), loc.Get()); } - inline int wxIsupper_l(char c, const wxXLocale& loc) - { return wxCRT_Isupper_lA(static_cast(c), loc.Get()); } - inline int wxIsxdigit_l(char c, const wxXLocale& loc) - { return wxCRT_Isxdigit_lA(static_cast(c), loc.Get()); } - inline int wxTolower_l(char c, const wxXLocale& loc) - { return wxCRT_Tolower_lA(static_cast(c), loc.Get()); } - inline int wxToupper_l(char c, const wxXLocale& loc) - { return wxCRT_Toupper_lA(static_cast(c), loc.Get()); } - - - // stdlib functions for numeric <-> string conversion - // NOTE: GNU libc does not have ato[fil]_l functions; - // MSVC++8 does not have _strto[u]ll_l functions; - // thus we take the minimal set of functions provided in both environments: - - #define wxCRT_Strtod_lA wxXLOCALE_IDENT(strtod_l) - #define wxCRT_Strtol_lA wxXLOCALE_IDENT(strtol_l) - #define wxCRT_Strtoul_lA wxXLOCALE_IDENT(strtoul_l) - - inline double wxStrtod_lA(const char *c, char **endptr, const wxXLocale& loc) - { return wxCRT_Strtod_lA(c, endptr, loc.Get()); } - inline long wxStrtol_lA(const char *c, char **endptr, int base, const wxXLocale& loc) - { return wxCRT_Strtol_lA(c, endptr, base, loc.Get()); } - inline unsigned long wxStrtoul_lA(const char *c, char **endptr, int base, const wxXLocale& loc) - { return wxCRT_Strtoul_lA(c, endptr, base, loc.Get()); } - - #if wxUSE_UNICODE - - // ctype functions - #define wxCRT_Isalnum_lW wxXLOCALE_IDENT(iswalnum_l) - #define wxCRT_Isalpha_lW wxXLOCALE_IDENT(iswalpha_l) - #define wxCRT_Iscntrl_lW wxXLOCALE_IDENT(iswcntrl_l) - #define wxCRT_Isdigit_lW wxXLOCALE_IDENT(iswdigit_l) - #define wxCRT_Isgraph_lW wxXLOCALE_IDENT(iswgraph_l) - #define wxCRT_Islower_lW wxXLOCALE_IDENT(iswlower_l) - #define wxCRT_Isprint_lW wxXLOCALE_IDENT(iswprint_l) - #define wxCRT_Ispunct_lW wxXLOCALE_IDENT(iswpunct_l) - #define wxCRT_Isspace_lW wxXLOCALE_IDENT(iswspace_l) - #define wxCRT_Isupper_lW wxXLOCALE_IDENT(iswupper_l) - #define wxCRT_Isxdigit_lW wxXLOCALE_IDENT(iswxdigit_l) - #define wxCRT_Tolower_lW wxXLOCALE_IDENT(towlower_l) - #define wxCRT_Toupper_lW wxXLOCALE_IDENT(towupper_l) - - inline int wxIsalnum_l(wchar_t c, const wxXLocale& loc) - { return wxCRT_Isalnum_lW(c, loc.Get()); } - inline int wxIsalpha_l(wchar_t c, const wxXLocale& loc) - { return wxCRT_Isalpha_lW(c, loc.Get()); } - inline int wxIscntrl_l(wchar_t c, const wxXLocale& loc) - { return wxCRT_Iscntrl_lW(c, loc.Get()); } - inline int wxIsdigit_l(wchar_t c, const wxXLocale& loc) - { return wxCRT_Isdigit_lW(c, loc.Get()); } - inline int wxIsgraph_l(wchar_t c, const wxXLocale& loc) - { return wxCRT_Isgraph_lW(c, loc.Get()); } - inline int wxIslower_l(wchar_t c, const wxXLocale& loc) - { return wxCRT_Islower_lW(c, loc.Get()); } - inline int wxIsprint_l(wchar_t c, const wxXLocale& loc) - { return wxCRT_Isprint_lW(c, loc.Get()); } - inline int wxIspunct_l(wchar_t c, const wxXLocale& loc) - { return wxCRT_Ispunct_lW(c, loc.Get()); } - inline int wxIsspace_l(wchar_t c, const wxXLocale& loc) - { return wxCRT_Isspace_lW(c, loc.Get()); } - inline int wxIsupper_l(wchar_t c, const wxXLocale& loc) - { return wxCRT_Isupper_lW(c, loc.Get()); } - inline int wxIsxdigit_l(wchar_t c, const wxXLocale& loc) - { return wxCRT_Isxdigit_lW(c, loc.Get()); } - inline wchar_t wxTolower_l(wchar_t c, const wxXLocale& loc) - { return wxCRT_Tolower_lW(c, loc.Get()); } - inline wchar_t wxToupper_l(wchar_t c, const wxXLocale& loc) - { return wxCRT_Toupper_lW(c, loc.Get()); } - - - // stdlib functions for numeric <-> string conversion - // (see notes above about missing functions) - #define wxCRT_Strtod_lW wxXLOCALE_IDENT(wcstod_l) - #define wxCRT_Strtol_lW wxXLOCALE_IDENT(wcstol_l) - #define wxCRT_Strtoul_lW wxXLOCALE_IDENT(wcstoul_l) - - inline double wxStrtod_l(const wchar_t *c, wchar_t **endptr, const wxXLocale& loc) - { return wxCRT_Strtod_lW(c, endptr, loc.Get()); } - inline long wxStrtol_l(const wchar_t *c, wchar_t **endptr, int base, const wxXLocale& loc) - { return wxCRT_Strtol_lW(c, endptr, base, loc.Get()); } - inline unsigned long wxStrtoul_l(const wchar_t *c, wchar_t **endptr, int base, const wxXLocale& loc) - { return wxCRT_Strtoul_lW(c, endptr, base, loc.Get()); } - #else // !wxUSE_UNICODE - inline double wxStrtod_l(const char *c, char **endptr, const wxXLocale& loc) - { return wxCRT_Strtod_lA(c, endptr, loc.Get()); } - inline long wxStrtol_l(const char *c, char **endptr, int base, const wxXLocale& loc) - { return wxCRT_Strtol_lA(c, endptr, base, loc.Get()); } - inline unsigned long wxStrtoul_l(const char *c, char **endptr, int base, const wxXLocale& loc) - { return wxCRT_Strtoul_lA(c, endptr, base, loc.Get()); } - #endif // wxUSE_UNICODE -#else // !wxHAS_XLOCALE_SUPPORT - // ctype functions - int WXDLLIMPEXP_BASE wxIsalnum_l(const wxUniChar& c, const wxXLocale& loc); - int WXDLLIMPEXP_BASE wxIsalpha_l(const wxUniChar& c, const wxXLocale& loc); - int WXDLLIMPEXP_BASE wxIscntrl_l(const wxUniChar& c, const wxXLocale& loc); - int WXDLLIMPEXP_BASE wxIsdigit_l(const wxUniChar& c, const wxXLocale& loc); - int WXDLLIMPEXP_BASE wxIsgraph_l(const wxUniChar& c, const wxXLocale& loc); - int WXDLLIMPEXP_BASE wxIslower_l(const wxUniChar& c, const wxXLocale& loc); - int WXDLLIMPEXP_BASE wxIsprint_l(const wxUniChar& c, const wxXLocale& loc); - int WXDLLIMPEXP_BASE wxIspunct_l(const wxUniChar& c, const wxXLocale& loc); - int WXDLLIMPEXP_BASE wxIsspace_l(const wxUniChar& c, const wxXLocale& loc); - int WXDLLIMPEXP_BASE wxIsupper_l(const wxUniChar& c, const wxXLocale& loc); - int WXDLLIMPEXP_BASE wxIsxdigit_l(const wxUniChar& c, const wxXLocale& loc); - int WXDLLIMPEXP_BASE wxTolower_l(const wxUniChar& c, const wxXLocale& loc); - int WXDLLIMPEXP_BASE wxToupper_l(const wxUniChar& c, const wxXLocale& loc); - - // stdlib functions - double WXDLLIMPEXP_BASE wxStrtod_l(const wchar_t* str, wchar_t **endptr, const wxXLocale& loc); - double WXDLLIMPEXP_BASE wxStrtod_l(const char* str, char **endptr, const wxXLocale& loc); - long WXDLLIMPEXP_BASE wxStrtol_l(const wchar_t* str, wchar_t **endptr, int base, const wxXLocale& loc); - long WXDLLIMPEXP_BASE wxStrtol_l(const char* str, char **endptr, int base, const wxXLocale& loc); - unsigned long WXDLLIMPEXP_BASE wxStrtoul_l(const wchar_t* str, wchar_t **endptr, int base, const wxXLocale& loc); - unsigned long WXDLLIMPEXP_BASE wxStrtoul_l(const char* str, char **endptr, int base, const wxXLocale& loc); - -#endif // wxHAS_XLOCALE_SUPPORT/!wxHAS_XLOCALE_SUPPORT - -#endif // wxUSE_XLOCALE - -#endif // _WX_XLOCALE_H_ diff --git a/Externals/wxWidgets3/include/wx/xpmdecod.h b/Externals/wxWidgets3/include/wx/xpmdecod.h deleted file mode 100644 index 68edc924e7..0000000000 --- a/Externals/wxWidgets3/include/wx/xpmdecod.h +++ /dev/null @@ -1,51 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/xpmdecod.h -// Purpose: wxXPMDecoder, XPM reader for wxImage and wxBitmap -// Author: Vaclav Slavik -// Copyright: (c) 2001 Vaclav Slavik -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_XPMDECOD_H_ -#define _WX_XPMDECOD_H_ - -#include "wx/defs.h" - -#if wxUSE_IMAGE && wxUSE_XPM - -class WXDLLIMPEXP_FWD_CORE wxImage; -class WXDLLIMPEXP_FWD_BASE wxInputStream; - -// -------------------------------------------------------------------------- -// wxXPMDecoder class -// -------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxXPMDecoder -{ -public: - // constructor, destructor, etc. - wxXPMDecoder() {} - ~wxXPMDecoder() {} - -#if wxUSE_STREAMS - // Is the stream XPM file? - // NOTE: this function modifies the current stream position - bool CanRead(wxInputStream& stream); - - // Read XPM file from the stream, parse it and create image from it - wxImage ReadFile(wxInputStream& stream); -#endif - - // Read directly from XPM data (as passed to wxBitmap ctor): - wxImage ReadData(const char* const* xpm_data); - -#ifdef __BORLANDC__ - // needed for Borland 5.5 - wxImage ReadData(char** xpm_data) - { return ReadData(const_cast(xpm_data)); } -#endif -}; - -#endif // wxUSE_IMAGE && wxUSE_XPM - -#endif // _WX_XPM_H_ diff --git a/Externals/wxWidgets3/include/wx/xpmhand.h b/Externals/wxWidgets3/include/wx/xpmhand.h deleted file mode 100644 index c7f8d0de20..0000000000 --- a/Externals/wxWidgets3/include/wx/xpmhand.h +++ /dev/null @@ -1,21 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/xpmhand.h -// Purpose: XPM handler base header -// Author: Julian Smart -// Modified by: -// Created: -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_XPMHAND_H_BASE_ -#define _WX_XPMHAND_H_BASE_ - -// Only wxMSW currently defines a separate XPM handler, since -// mostly Windows apps won't need XPMs. -#if defined(__WXMSW__) -#error xpmhand.h is no longer needed since wxImage now handles XPMs. -#endif - -#endif - // _WX_XPMHAND_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/xti.h b/Externals/wxWidgets3/include/wx/xti.h deleted file mode 100644 index f8ddce9bbd..0000000000 --- a/Externals/wxWidgets3/include/wx/xti.h +++ /dev/null @@ -1,469 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/xti.h -// Purpose: runtime metadata information (extended class info) -// Author: Stefan Csomor -// Modified by: Francesco Montorsi -// Created: 27/07/03 -// Copyright: (c) 1997 Julian Smart -// (c) 2003 Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_XTIH__ -#define _WX_XTIH__ - -// We want to support properties, event sources and events sinks through -// explicit declarations, using templates and specialization to make the -// effort as painless as possible. -// -// This means we have the following domains : -// -// - Type Information for categorizing built in types as well as custom types -// this includes information about enums, their values and names -// - Type safe value storage : a kind of wxVariant, called right now wxAny -// which will be merged with wxVariant -// - Property Information and Property Accessors providing access to a class' -// values and exposed event delegates -// - Information about event handlers -// - extended Class Information for accessing all these - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/defs.h" - -#if wxUSE_EXTENDED_RTTI - -class WXDLLIMPEXP_FWD_BASE wxAny; -class WXDLLIMPEXP_FWD_BASE wxAnyList; -class WXDLLIMPEXP_FWD_BASE wxObject; -class WXDLLIMPEXP_FWD_BASE wxString; -class WXDLLIMPEXP_FWD_BASE wxClassInfo; -class WXDLLIMPEXP_FWD_BASE wxHashTable; -class WXDLLIMPEXP_FWD_BASE wxObject; -class WXDLLIMPEXP_FWD_BASE wxPluginLibrary; -class WXDLLIMPEXP_FWD_BASE wxHashTable; -class WXDLLIMPEXP_FWD_BASE wxHashTable_Node; - -class WXDLLIMPEXP_FWD_BASE wxStringToAnyHashMap; -class WXDLLIMPEXP_FWD_BASE wxPropertyInfoMap; -class WXDLLIMPEXP_FWD_BASE wxPropertyAccessor; -class WXDLLIMPEXP_FWD_BASE wxObjectAllocatorAndCreator; -class WXDLLIMPEXP_FWD_BASE wxObjectAllocator; - - -#define wx_dynamic_cast(t, x) dynamic_cast(x) - -#include "wx/xtitypes.h" -#include "wx/xtihandler.h" - -// ---------------------------------------------------------------------------- -// wxClassInfo -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxObjectFunctor -{ -public: - virtual ~wxObjectFunctor(); - - // Invoke the actual event handler: - virtual void operator()(const wxObject *) = 0; -}; - -class WXDLLIMPEXP_FWD_BASE wxPropertyInfo; -class WXDLLIMPEXP_FWD_BASE wxHandlerInfo; - -typedef wxObject *(*wxObjectConstructorFn)(void); -typedef wxPropertyInfo *(*wxPropertyInfoFn)(void); -typedef wxHandlerInfo *(*wxHandlerInfoFn)(void); -typedef void (*wxVariantToObjectConverter)( const wxAny &data, wxObjectFunctor* fn ); -typedef wxObject* (*wxVariantToObjectPtrConverter) ( const wxAny& data); -typedef wxAny (*wxObjectToVariantConverter)( wxObject* ); - -WXDLLIMPEXP_BASE wxString wxAnyGetAsString( const wxAny& data); -WXDLLIMPEXP_BASE const wxObject* wxAnyGetAsObjectPtr( const wxAny& data); - -class WXDLLIMPEXP_BASE wxObjectWriter; -class WXDLLIMPEXP_BASE wxObjectWriterCallback; - -typedef bool (*wxObjectStreamingCallback) ( const wxObject *, wxObjectWriter *, \ - wxObjectWriterCallback *, const wxStringToAnyHashMap & ); - - - -class WXDLLIMPEXP_BASE wxClassInfo -{ - friend class WXDLLIMPEXP_BASE wxPropertyInfo; - friend class /* WXDLLIMPEXP_BASE */ wxHandlerInfo; - friend wxObject *wxCreateDynamicObject(const wxString& name); - -public: - wxClassInfo(const wxClassInfo **_Parents, - const wxChar *_UnitName, - const wxChar *_ClassName, - int size, - wxObjectConstructorFn ctor, - wxPropertyInfoFn _Props, - wxHandlerInfoFn _Handlers, - wxObjectAllocatorAndCreator* _Constructor, - const wxChar ** _ConstructorProperties, - const int _ConstructorPropertiesCount, - wxVariantToObjectPtrConverter _PtrConverter1, - wxVariantToObjectConverter _Converter2, - wxObjectToVariantConverter _Converter3, - wxObjectStreamingCallback _streamingCallback = NULL) : - m_className(_ClassName), - m_objectSize(size), - m_objectConstructor(ctor), - m_next(sm_first), - m_firstPropertyFn(_Props), - m_firstHandlerFn(_Handlers), - m_firstProperty(NULL), - m_firstHandler(NULL), - m_firstInited(false), - m_parents(_Parents), - m_unitName(_UnitName), - m_constructor(_Constructor), - m_constructorProperties(_ConstructorProperties), - m_constructorPropertiesCount(_ConstructorPropertiesCount), - m_variantOfPtrToObjectConverter(_PtrConverter1), - m_variantToObjectConverter(_Converter2), - m_objectToVariantConverter(_Converter3), - m_streamingCallback(_streamingCallback) - { - sm_first = this; - Register(); - } - - wxClassInfo(const wxChar *_UnitName, const wxChar *_ClassName, - const wxClassInfo **_Parents) : - m_className(_ClassName), - m_objectSize(0), - m_objectConstructor(NULL), - m_next(sm_first), - m_firstPropertyFn(NULL), - m_firstHandlerFn(NULL), - m_firstProperty(NULL), - m_firstHandler(NULL), - m_firstInited(true), - m_parents(_Parents), - m_unitName(_UnitName), - m_constructor(NULL), - m_constructorProperties(NULL), - m_constructorPropertiesCount(0), - m_variantOfPtrToObjectConverter(NULL), - m_variantToObjectConverter(NULL), - m_objectToVariantConverter(NULL), - m_streamingCallback(NULL) - { - sm_first = this; - Register(); - } - - // ctor compatible with old RTTI system - wxClassInfo(const wxChar *_ClassName, - const wxClassInfo *_Parent1, - const wxClassInfo *_Parent2, - int size, - wxObjectConstructorFn ctor) : - m_className(_ClassName), - m_objectSize(size), - m_objectConstructor(ctor), - m_next(sm_first), - m_firstPropertyFn(NULL), - m_firstHandlerFn(NULL), - m_firstProperty(NULL), - m_firstHandler(NULL), - m_firstInited(true), - m_parents(NULL), - m_unitName(NULL), - m_constructor(NULL), - m_constructorProperties(NULL), - m_constructorPropertiesCount(0), - m_variantOfPtrToObjectConverter(NULL), - m_variantToObjectConverter(NULL), - m_objectToVariantConverter(NULL), - m_streamingCallback(NULL) - { - sm_first = this; - m_parents[0] = _Parent1; - m_parents[1] = _Parent2; - m_parents[2] = NULL; - Register(); - } - - virtual ~wxClassInfo(); - - // allocates an instance of this class, this object does not have to be - // initialized or fully constructed as this call will be followed by a call to Create - virtual wxObject *AllocateObject() const - { return m_objectConstructor ? (*m_objectConstructor)() : 0; } - - // 'old naming' for AllocateObject staying here for backward compatibility - wxObject *CreateObject() const { return AllocateObject(); } - - // direct construction call for classes that cannot construct instances via alloc/create - wxObject *ConstructObject(int ParamCount, wxAny *Params) const; - - bool NeedsDirectConstruction() const; - - const wxChar *GetClassName() const - { return m_className; } - const wxChar *GetBaseClassName1() const - { return m_parents[0] ? m_parents[0]->GetClassName() : NULL; } - const wxChar *GetBaseClassName2() const - { return (m_parents[0] && m_parents[1]) ? m_parents[1]->GetClassName() : NULL; } - - const wxClassInfo *GetBaseClass1() const - { return m_parents[0]; } - const wxClassInfo *GetBaseClass2() const - { return m_parents[0] ? m_parents[1] : NULL; } - - const wxChar *GetIncludeName() const - { return m_unitName; } - const wxClassInfo **GetParents() const - { return m_parents; } - int GetSize() const - { return m_objectSize; } - bool IsDynamic() const - { return (NULL != m_objectConstructor); } - - wxObjectConstructorFn GetConstructor() const - { return m_objectConstructor; } - const wxClassInfo *GetNext() const - { return m_next; } - - // statics: - - static void CleanUp(); - static wxClassInfo *FindClass(const wxString& className); - static const wxClassInfo *GetFirst() - { return sm_first; } - - - // Climb upwards through inheritance hierarchy. - // Dual inheritance is catered for. - - bool IsKindOf(const wxClassInfo *info) const; - - wxDECLARE_CLASS_INFO_ITERATORS(); - - // if there is a callback registered with that class it will be called - // before this object will be written to disk, it can veto streaming out - // this object by returning false, if this class has not registered a - // callback, the search will go up the inheritance tree if no callback has - // been registered true will be returned by default - bool BeforeWriteObject( const wxObject *obj, wxObjectWriter *streamer, - wxObjectWriterCallback *writercallback, const wxStringToAnyHashMap &metadata) const; - - // gets the streaming callback from this class or any superclass - wxObjectStreamingCallback GetStreamingCallback() const; - - // returns the first property - wxPropertyInfo* GetFirstProperty() const - { EnsureInfosInited(); return m_firstProperty; } - - // returns the first handler - wxHandlerInfo* GetFirstHandler() const - { EnsureInfosInited(); return m_firstHandler; } - - // Call the Create upon an instance of the class, in the end the object is fully - // initialized - virtual bool Create (wxObject *object, int ParamCount, wxAny *Params) const; - - // get number of parameters for constructor - virtual int GetCreateParamCount() const - { return m_constructorPropertiesCount; } - - // get n-th constructor parameter - virtual const wxChar* GetCreateParamName(int n) const - { return m_constructorProperties[n]; } - - // Runtime access to objects for simple properties (get/set) by property - // name and variant data - virtual void SetProperty (wxObject *object, const wxChar *propertyName, - const wxAny &value) const; - virtual wxAny GetProperty (wxObject *object, const wxChar *propertyName) const; - - // Runtime access to objects for collection properties by property name - virtual wxAnyList GetPropertyCollection(wxObject *object, - const wxChar *propertyName) const; - virtual void AddToPropertyCollection(wxObject *object, const wxChar *propertyName, - const wxAny& value) const; - - // we must be able to cast variants to wxObject pointers, templates seem - // not to be suitable - void CallOnAny( const wxAny &data, wxObjectFunctor* functor ) const; - - wxObject* AnyToObjectPtr( const wxAny &data) const; - - wxAny ObjectPtrToAny( wxObject *object ) const; - - // find property by name - virtual const wxPropertyInfo *FindPropertyInfo (const wxChar *PropertyName) const; - - // find handler by name - virtual const wxHandlerInfo *FindHandlerInfo (const wxChar *handlerName) const; - - // find property by name - virtual wxPropertyInfo *FindPropertyInfoInThisClass (const wxChar *PropertyName) const; - - // find handler by name - virtual wxHandlerInfo *FindHandlerInfoInThisClass (const wxChar *handlerName) const; - - // puts all the properties of this class and its superclasses in the map, - // as long as there is not yet an entry with the same name (overriding mechanism) - void GetProperties( wxPropertyInfoMap &map ) const; - -private: - const wxChar *m_className; - int m_objectSize; - wxObjectConstructorFn m_objectConstructor; - - // class info object live in a linked list: - // pointers to its head and the next element in it - - static wxClassInfo *sm_first; - wxClassInfo *m_next; - - static wxHashTable *sm_classTable; - - wxPropertyInfoFn m_firstPropertyFn; - wxHandlerInfoFn m_firstHandlerFn; - - -protected: - void EnsureInfosInited() const - { - if ( !m_firstInited) - { - if ( m_firstPropertyFn != NULL) - m_firstProperty = (*m_firstPropertyFn)(); - if ( m_firstHandlerFn != NULL) - m_firstHandler = (*m_firstHandlerFn)(); - m_firstInited = true; - } - } - mutable wxPropertyInfo* m_firstProperty; - mutable wxHandlerInfo* m_firstHandler; - -private: - mutable bool m_firstInited; - - const wxClassInfo** m_parents; - const wxChar* m_unitName; - - wxObjectAllocatorAndCreator* m_constructor; - const wxChar ** m_constructorProperties; - const int m_constructorPropertiesCount; - wxVariantToObjectPtrConverter m_variantOfPtrToObjectConverter; - wxVariantToObjectConverter m_variantToObjectConverter; - wxObjectToVariantConverter m_objectToVariantConverter; - wxObjectStreamingCallback m_streamingCallback; - - const wxPropertyAccessor *FindAccessor (const wxChar *propertyName) const; - -protected: - // registers the class - void Register(); - void Unregister(); - - wxDECLARE_NO_COPY_CLASS(wxClassInfo); -}; - -WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxString& name); - -// ---------------------------------------------------------------------------- -// wxDynamicClassInfo -// ---------------------------------------------------------------------------- - -// this object leads to having a pure runtime-instantiation - -class WXDLLIMPEXP_BASE wxDynamicClassInfo : public wxClassInfo -{ - friend class WXDLLIMPEXP_BASE wxDynamicObject; - -public: - wxDynamicClassInfo( const wxChar *_UnitName, const wxChar *_ClassName, - const wxClassInfo* superClass ); - virtual ~wxDynamicClassInfo(); - - // constructs a wxDynamicObject with an instance - virtual wxObject *AllocateObject() const; - - // Call the Create method for a class - virtual bool Create (wxObject *object, int ParamCount, wxAny *Params) const; - - // get number of parameters for constructor - virtual int GetCreateParamCount() const; - - // get i-th constructor parameter - virtual const wxChar* GetCreateParamName(int i) const; - - // Runtime access to objects by property name, and variant data - virtual void SetProperty (wxObject *object, const wxChar *PropertyName, - const wxAny &Value) const; - virtual wxAny GetProperty (wxObject *object, const wxChar *PropertyName) const; - - // adds a property to this class at runtime - void AddProperty( const wxChar *propertyName, const wxTypeInfo* typeInfo ); - - // removes an existing runtime-property - void RemoveProperty( const wxChar *propertyName ); - - // renames an existing runtime-property - void RenameProperty( const wxChar *oldPropertyName, const wxChar *newPropertyName ); - - // as a handler to this class at runtime - void AddHandler( const wxChar *handlerName, wxObjectEventFunction address, - const wxClassInfo* eventClassInfo ); - - // removes an existing runtime-handler - void RemoveHandler( const wxChar *handlerName ); - - // renames an existing runtime-handler - void RenameHandler( const wxChar *oldHandlerName, const wxChar *newHandlerName ); - -private: - struct wxDynamicClassInfoInternal; - wxDynamicClassInfoInternal* m_data; -}; - -// ---------------------------------------------------------------------------- -// wxDECLARE class macros -// ---------------------------------------------------------------------------- - -#define _DECLARE_DYNAMIC_CLASS(name) \ - public: \ - static wxClassInfo ms_classInfo; \ - static const wxClassInfo* ms_classParents[]; \ - static wxPropertyInfo* GetPropertiesStatic(); \ - static wxHandlerInfo* GetHandlersStatic(); \ - static wxClassInfo *GetClassInfoStatic() \ - { return &name::ms_classInfo; } \ - virtual wxClassInfo *GetClassInfo() const \ - { return &name::ms_classInfo; } - -#define wxDECLARE_DYNAMIC_CLASS(name) \ - static wxObjectAllocatorAndCreator* ms_constructor; \ - static const wxChar * ms_constructorProperties[]; \ - static const int ms_constructorPropertiesCount; \ - _DECLARE_DYNAMIC_CLASS(name) - -#define wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(name) \ - wxDECLARE_NO_ASSIGN_CLASS(name); \ - wxDECLARE_DYNAMIC_CLASS(name) - -#define wxDECLARE_DYNAMIC_CLASS_NO_COPY(name) \ - wxDECLARE_NO_COPY_CLASS(name); \ - wxDECLARE_DYNAMIC_CLASS(name) - -#define wxDECLARE_CLASS(name) \ - wxDECLARE_DYNAMIC_CLASS(name) - -#define wxDECLARE_ABSTRACT_CLASS(name) _DECLARE_DYNAMIC_CLASS(name) -#define wxCLASSINFO(name) (&name::ms_classInfo) - -#endif // wxUSE_EXTENDED_RTTI -#endif // _WX_XTIH__ diff --git a/Externals/wxWidgets3/include/wx/xti2.h b/Externals/wxWidgets3/include/wx/xti2.h deleted file mode 100644 index c7abd2fa3d..0000000000 --- a/Externals/wxWidgets3/include/wx/xti2.h +++ /dev/null @@ -1,293 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/wxt2.h -// Purpose: runtime metadata information (extended class info) -// Author: Stefan Csomor -// Modified by: Francesco Montorsi -// Created: 27/07/03 -// Copyright: (c) 1997 Julian Smart -// (c) 2003 Stefan Csomor -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_XTI2H__ -#define _WX_XTI2H__ - -// ---------------------------------------------------------------------------- -// second part of xti headers, is included from object.h -// ---------------------------------------------------------------------------- - -#if wxUSE_EXTENDED_RTTI - -// ---------------------------------------------------------------------------- -// wxDynamicObject class, its instances connect to a 'super class instance' -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxDynamicObject : public wxObject -{ - friend class WXDLLIMPEXP_FWD_BASE wxDynamicClassInfo ; -public: - // instantiates this object with an instance of its superclass - wxDynamicObject(wxObject* superClassInstance, const wxDynamicClassInfo *info) ; - virtual ~wxDynamicObject(); - - void SetProperty (const wxChar *propertyName, const wxAny &value); - wxAny GetProperty (const wxChar *propertyName) const ; - - // get the runtime identity of this object - wxClassInfo *GetClassInfo() const - { -#ifdef _MSC_VER - return (wxClassInfo*) m_classInfo; -#else - wxDynamicClassInfo *nonconst = const_cast(m_classInfo); - return static_cast(nonconst); -#endif - } - - wxObject* GetSuperClassInstance() const - { - return m_superClassInstance ; - } -private : - // removes an existing runtime-property - void RemoveProperty( const wxChar *propertyName ) ; - - // renames an existing runtime-property - void RenameProperty( const wxChar *oldPropertyName , const wxChar *newPropertyName ) ; - - wxObject *m_superClassInstance ; - const wxDynamicClassInfo *m_classInfo; - struct wxDynamicObjectInternal; - wxDynamicObjectInternal *m_data; -}; - -// ---------------------------------------------------------------------------- -// String conversion templates supporting older compilers -// ---------------------------------------------------------------------------- - -#if wxUSE_FUNC_TEMPLATE_POINTER -# define wxTO_STRING(type) wxToStringConverter -# define wxTO_STRING_IMP(type) -# define wxFROM_STRING(type) wxFromStringConverter -# define wxFROM_STRING_IMP(type) -#else -# define wxTO_STRING(type) ToString##type -# define wxTO_STRING_IMP(type) \ - inline void ToString##type( const wxAny& data, wxString &result ) \ -{ wxToStringConverter(data, result); } - -# define wxFROM_STRING(type) FromString##type -# define wxFROM_STRING_IMP(type) \ - inline void FromString##type( const wxString& data, wxAny &result ) \ -{ wxFromStringConverter(data, result); } -#endif - -#include "wx/xtiprop.h" -#include "wx/xtictor.h" - -// ---------------------------------------------------------------------------- -// wxIMPLEMENT class macros for concrete classes -// ---------------------------------------------------------------------------- - -// Single inheritance with one base class - -#define _DEFAULT_CONSTRUCTOR(name) \ -wxObject* wxConstructorFor##name() \ -{ return new name; } - -#define _DEFAULT_CONVERTERS(name) \ -wxObject* wxVariantOfPtrToObjectConverter##name ( const wxAny &data ) \ -{ return data.As( (name**)NULL ); } \ - wxAny wxObjectToVariantConverter##name ( wxObject *data ) \ -{ return wxAny( wx_dynamic_cast(name*, data) ); } - -#define _TYPEINFO_CLASSES(n, toString, fromString ) \ - wxClassTypeInfo s_typeInfo##n(wxT_OBJECT, &n::ms_classInfo, \ - toString, fromString, typeid(n).name()); \ - wxClassTypeInfo s_typeInfoPtr##n(wxT_OBJECT_PTR, &n::ms_classInfo, \ - toString, fromString, typeid(n*).name()); - -#define _IMPLEMENT_DYNAMIC_CLASS(name, basename, unit, callback) \ - _DEFAULT_CONSTRUCTOR(name) \ - _DEFAULT_CONVERTERS(name) \ - \ - const wxClassInfo* name::ms_classParents[] = \ -{ &basename::ms_classInfo, NULL }; \ - wxClassInfo name::ms_classInfo(name::ms_classParents, wxT(unit), \ - wxT(#name), (int) sizeof(name), (wxObjectConstructorFn) wxConstructorFor##name, \ - name::GetPropertiesStatic, name::GetHandlersStatic, name::ms_constructor, \ - name::ms_constructorProperties, name::ms_constructorPropertiesCount, \ - wxVariantOfPtrToObjectConverter##name, NULL, wxObjectToVariantConverter##name, \ - callback); - -#define _IMPLEMENT_DYNAMIC_CLASS_WITH_COPY(name, basename, unit, callback ) \ - _DEFAULT_CONSTRUCTOR(name) \ - _DEFAULT_CONVERTERS(name) \ - void wxVariantToObjectConverter##name ( const wxAny &data, wxObjectFunctor* fn ) \ - { name o = data.As(); (*fn)( &o ); } \ - \ - const wxClassInfo* name::ms_classParents[] = { &basename::ms_classInfo,NULL }; \ - wxClassInfo name::ms_classInfo(name::ms_classParents, wxT(unit), \ - wxT(#name), (int) sizeof(name), (wxObjectConstructorFn) wxConstructorFor##name, \ - name::GetPropertiesStatic,name::GetHandlersStatic,name::ms_constructor, \ - name::ms_constructorProperties, name::ms_constructorPropertiesCount, \ - wxVariantOfPtrToObjectConverter##name, wxVariantToObjectConverter##name, \ - wxObjectToVariantConverter##name, callback); - -#define wxIMPLEMENT_DYNAMIC_CLASS_WITH_COPY( name, basename ) \ - _IMPLEMENT_DYNAMIC_CLASS_WITH_COPY( name, basename, "", NULL ) \ - _TYPEINFO_CLASSES(name, NULL, NULL) \ - const wxPropertyInfo *name::GetPropertiesStatic() \ -{ return (wxPropertyInfo*) NULL; } \ - const wxHandlerInfo *name::GetHandlersStatic() \ -{ return (wxHandlerInfo*) NULL; } \ - wxCONSTRUCTOR_DUMMY( name ) - -#define wxIMPLEMENT_DYNAMIC_CLASS( name, basename ) \ - _IMPLEMENT_DYNAMIC_CLASS( name, basename, "", NULL ) \ - _TYPEINFO_CLASSES(name, NULL, NULL) \ - wxPropertyInfo *name::GetPropertiesStatic() \ -{ return (wxPropertyInfo*) NULL; } \ - wxHandlerInfo *name::GetHandlersStatic() \ -{ return (wxHandlerInfo*) NULL; } \ - wxCONSTRUCTOR_DUMMY( name ) - -#define wxIMPLEMENT_DYNAMIC_CLASS_XTI( name, basename, unit ) \ - _IMPLEMENT_DYNAMIC_CLASS( name, basename, unit, NULL ) \ - _TYPEINFO_CLASSES(name, NULL, NULL) - -#define wxIMPLEMENT_DYNAMIC_CLASS_XTI_CALLBACK( name, basename, unit, callback )\ - _IMPLEMENT_DYNAMIC_CLASS( name, basename, unit, &callback ) \ - _TYPEINFO_CLASSES(name, NULL, NULL) - -#define wxIMPLEMENT_DYNAMIC_CLASS_WITH_COPY_XTI( name, basename, unit ) \ - _IMPLEMENT_DYNAMIC_CLASS_WITH_COPY( name, basename, unit, NULL ) \ - _TYPEINFO_CLASSES(name, NULL, NULL) - -#define wxIMPLEMENT_DYNAMIC_CLASS_WITH_COPY_AND_STREAMERS_XTI( name, basename, \ - unit, toString, \ - fromString ) \ - _IMPLEMENT_DYNAMIC_CLASS_WITH_COPY( name, basename, unit, NULL ) \ - _TYPEINFO_CLASSES(name, toString, fromString) - -// this is for classes that do not derive from wxObject, there are no creators for these - -#define wxIMPLEMENT_DYNAMIC_CLASS_NO_WXOBJECT_NO_BASE_XTI( name, unit ) \ - const wxClassInfo* name::ms_classParents[] = { NULL }; \ - wxClassInfo name::ms_classInfo(name::ms_classParents, wxEmptyString, \ - wxT(#name), (int) sizeof(name), (wxObjectConstructorFn) 0, \ - name::GetPropertiesStatic,name::GetHandlersStatic, 0, 0, \ - 0, 0, 0 ); \ - _TYPEINFO_CLASSES(name, NULL, NULL) - -// this is for subclasses that still do not derive from wxObject - -#define wxIMPLEMENT_DYNAMIC_CLASS_NO_WXOBJECT_XTI( name, basename, unit ) \ - const wxClassInfo* name::ms_classParents[] = { &basename::ms_classInfo, NULL }; \ - wxClassInfo name::ms_classInfo(name::ms_classParents, wxEmptyString, \ - wxT(#name), (int) sizeof(name), (wxObjectConstructorFn) 0, \ - name::GetPropertiesStatic,name::GetHandlersStatic, 0, 0, \ - 0, 0, 0 ); \ - _TYPEINFO_CLASSES(name, NULL, NULL) - - -// Multiple inheritance with two base classes - -#define _IMPLEMENT_DYNAMIC_CLASS2(name, basename, basename2, unit, callback) \ - _DEFAULT_CONSTRUCTOR(name) \ - _DEFAULT_CONVERTERS(name) \ - \ - const wxClassInfo* name::ms_classParents[] = \ -{ &basename::ms_classInfo,&basename2::ms_classInfo, NULL }; \ - wxClassInfo name::ms_classInfo(name::ms_classParents, wxT(unit), \ - wxT(#name), (int) sizeof(name), (wxObjectConstructorFn) wxConstructorFor##name, \ - name::GetPropertiesStatic,name::GetHandlersStatic,name::ms_constructor, \ - name::ms_constructorProperties, name::ms_constructorPropertiesCount, \ - wxVariantOfPtrToObjectConverter##name, NULL, wxObjectToVariantConverter##name, \ - callback); - -#define wxIMPLEMENT_DYNAMIC_CLASS2( name, basename, basename2) \ - _IMPLEMENT_DYNAMIC_CLASS2( name, basename, basename2, "", NULL) \ - _TYPEINFO_CLASSES(name, NULL, NULL) \ - wxPropertyInfo *name::GetPropertiesStatic() { return (wxPropertyInfo*) NULL; } \ - wxHandlerInfo *name::GetHandlersStatic() { return (wxHandlerInfo*) NULL; } \ - wxCONSTRUCTOR_DUMMY( name ) - -#define wxIMPLEMENT_DYNAMIC_CLASS2_XTI( name, basename, basename2, unit) \ - _IMPLEMENT_DYNAMIC_CLASS2( name, basename, basename2, unit, NULL) \ - _TYPEINFO_CLASSES(name, NULL, NULL) - - - -// ---------------------------------------------------------------------------- -// wxIMPLEMENT class macros for abstract classes -// ---------------------------------------------------------------------------- - -// Single inheritance with one base class - -#define _IMPLEMENT_ABSTRACT_CLASS(name, basename) \ - _DEFAULT_CONVERTERS(name) \ - \ - const wxClassInfo* name::ms_classParents[] = \ -{ &basename::ms_classInfo,NULL }; \ - wxClassInfo name::ms_classInfo(name::ms_classParents, wxEmptyString, \ - wxT(#name), (int) sizeof(name), (wxObjectConstructorFn) 0, \ - name::GetPropertiesStatic,name::GetHandlersStatic, 0, 0, \ - 0, wxVariantOfPtrToObjectConverter##name,0, \ - wxObjectToVariantConverter##name); \ - _TYPEINFO_CLASSES(name, NULL, NULL) - -#define wxIMPLEMENT_ABSTRACT_CLASS( name, basename ) \ - _IMPLEMENT_ABSTRACT_CLASS( name, basename ) \ - wxHandlerInfo *name::GetHandlersStatic() { return (wxHandlerInfo*) NULL; } \ - wxPropertyInfo *name::GetPropertiesStatic() { return (wxPropertyInfo*) NULL; } - -// Multiple inheritance with two base classes - -#define wxIMPLEMENT_ABSTRACT_CLASS2(name, basename1, basename2) \ - wxClassInfo name::ms_classInfo(wxT(#name), wxT(#basename1), \ - wxT(#basename2), (int) sizeof(name), \ - (wxObjectConstructorFn) 0); - -// templated streaming, every type that can be converted to wxString -// must have their specialization for these methods - -template -void wxStringReadValue( const wxString &s, T &data ); - -template -void wxStringWriteValue( wxString &s, const T &data); - -template -void wxToStringConverter( const wxAny &v, wxString &s ) -{ wxStringWriteValue(s, v.As()); } - -template -void wxFromStringConverter( const wxString &s, wxAny &v) -{ T d; wxStringReadValue(s, d); v = wxAny(d); } - -// -------------------------------------------------------------------------- -// Collection Support -// -------------------------------------------------------------------------- - -template void wxListCollectionToAnyList( - const collection_t& coll, wxAnyList &value ) -{ - for ( iter current = coll.GetFirst(); current; - current = current->GetNext() ) - { - value.Append( new wxAny(current->GetData()) ); - } -} - -template void wxArrayCollectionToVariantArray( - const collection_t& coll, wxAnyList &value ) -{ - for( size_t i = 0; i < coll.GetCount(); i++ ) - { - value.Append( new wxAny(coll[i]) ); - } -} - -#endif - -#endif // _WX_XTIH2__ diff --git a/Externals/wxWidgets3/include/wx/xtictor.h b/Externals/wxWidgets3/include/wx/xtictor.h deleted file mode 100644 index 6969463f38..0000000000 --- a/Externals/wxWidgets3/include/wx/xtictor.h +++ /dev/null @@ -1,509 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/xtictor.h -// Purpose: XTI constructors -// Author: Stefan Csomor -// Modified by: Francesco Montorsi -// Created: 27/07/03 -// Copyright: (c) 1997 Julian Smart -// (c) 2003 Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _XTICTOR_H_ -#define _XTICTOR_H_ - -#include "wx/defs.h" - -#if wxUSE_EXTENDED_RTTI - -#include "wx/xti.h" - -// ---------------------------------------------------------------------------- -// Constructor Bridges -// ---------------------------------------------------------------------------- - -// A constructor bridge allows to call a ctor with an arbitrary number -// or parameters during runtime -class WXDLLIMPEXP_BASE wxObjectAllocatorAndCreator -{ -public: - virtual ~wxObjectAllocatorAndCreator() { } - virtual bool Create(wxObject * &o, wxAny *args) = 0; -}; - -// a direct constructor bridge calls the operator new for this class and -// passes all params to the constructor. Needed for classes that cannot be -// instantiated using alloc-create semantics -class WXDLLIMPEXP_BASE wxObjectAllocator : public wxObjectAllocatorAndCreator -{ -public: - virtual bool Create(wxObject * &o, wxAny *args) = 0; -}; - - -// ---------------------------------------------------------------------------- -// Constructor Bridges for all Numbers of Params -// ---------------------------------------------------------------------------- - -// no params - -template -struct wxObjectAllocatorAndCreator_0 : public wxObjectAllocatorAndCreator -{ - bool Create(wxObject * &o, wxAny *) - { - Class *obj = wx_dynamic_cast(Class*, o); - return obj->Create(); - } -}; - -struct wxObjectAllocatorAndCreator_Dummy : public wxObjectAllocatorAndCreator -{ - bool Create(wxObject *&, wxAny *) - { - return true; - } -}; - -#define wxCONSTRUCTOR_0(klass) \ - wxObjectAllocatorAndCreator_0 constructor##klass; \ - wxObjectAllocatorAndCreator* klass::ms_constructor = &constructor##klass; \ - const wxChar *klass::ms_constructorProperties[] = { NULL }; \ - const int klass::ms_constructorPropertiesCount = 0; - -#define wxCONSTRUCTOR_DUMMY(klass) \ - wxObjectAllocatorAndCreator_Dummy constructor##klass; \ - wxObjectAllocatorAndCreator* klass::ms_constructor = &constructor##klass; \ - const wxChar *klass::ms_constructorProperties[] = { NULL }; \ - const int klass::ms_constructorPropertiesCount = 0; - -// direct constructor version - -template -struct wxDirectConstructorBridge_0 : public wxObjectAllocator -{ - bool Create(wxObject * &o, wxAny *args) - { - o = new Class( ); - return o != NULL; - } -}; - -#define wxDIRECT_CONSTRUCTOR_0(klass) \ - wxDirectConstructorBridge_0 constructor##klass; \ - wxObjectAllocatorAndCreator* klass::ms_constructor = &constructor##klass; \ - const wxChar *klass::ms_constructorProperties[] = { NULL }; \ - const int klass::ms_constructorPropertiesCount = 0; - - -// 1 param - -template -struct wxObjectAllocatorAndCreator_1 : public wxObjectAllocatorAndCreator -{ - bool Create(wxObject * &o, wxAny *args) - { - Class *obj = wx_dynamic_cast(Class*, o); - return obj->Create( - (args[0]).As(static_cast(NULL)) - ); - } -}; - -#define wxCONSTRUCTOR_1(klass,t0,v0) \ - wxObjectAllocatorAndCreator_1 constructor##klass; \ - wxObjectAllocatorAndCreator* klass::ms_constructor = &constructor##klass; \ - const wxChar *klass::ms_constructorProperties[] = { wxT(#v0) }; \ - const int klass::ms_constructorPropertiesCount = 1; - -// direct constructor version - -template -struct wxDirectConstructorBridge_1 : public wxObjectAllocator -{ - bool Create(wxObject * &o, wxAny *args) - { - o = new Class( - (args[0]).As(static_cast(NULL)) - ); - return o != NULL; - } -}; - -#define wxDIRECT_CONSTRUCTOR_1(klass,t0,v0) \ - wxDirectConstructorBridge_1 constructor##klass; \ - wxObjectAllocatorAndCreator* klass::ms_constructor = &constructor##klass; \ - const wxChar *klass::ms_constructorProperties[] = { wxT(#v0) }; \ - const int klass::ms_constructorPropertiesCount = 1; - - -// 2 params - -template -struct wxObjectAllocatorAndCreator_2 : public wxObjectAllocatorAndCreator -{ - bool Create(wxObject * &o, wxAny *args) - { - Class *obj = wx_dynamic_cast(Class*, o); - return obj->Create( - (args[0]).As(static_cast(NULL)), - (args[1]).As(static_cast(NULL)) - ); - } -}; - -#define wxCONSTRUCTOR_2(klass,t0,v0,t1,v1) \ - wxObjectAllocatorAndCreator_2 constructor##klass; \ - wxObjectAllocatorAndCreator* klass::ms_constructor = &constructor##klass; \ - const wxChar *klass::ms_constructorProperties[] = { wxT(#v0), wxT(#v1) }; \ - const int klass::ms_constructorPropertiesCount = 2; - -// direct constructor version - -template -struct wxDirectConstructorBridge_2 : public wxObjectAllocator -{ - bool Create(wxObject * &o, wxAny *args) - { - o = new Class( - (args[0]).As(static_cast(NULL)), - (args[1]).As(static_cast(NULL)) - ); - return o != NULL; - } -}; - -#define wxDIRECT_CONSTRUCTOR_2(klass,t0,v0,t1,v1) \ - wxDirectConstructorBridge_2 constructor##klass; \ - wxObjectAllocatorAndCreator* klass::ms_constructor = &constructor##klass; \ - const wxChar *klass::ms_constructorProperties[] = { wxT(#v0), wxT(#v1) }; \ - const int klass::ms_constructorPropertiesCount = 2; - - -// 3 params - -template -struct wxObjectAllocatorAndCreator_3 : public wxObjectAllocatorAndCreator -{ - bool Create(wxObject * &o, wxAny *args) - { - Class *obj = wx_dynamic_cast(Class*, o); - return obj->Create( - (args[0]).As(static_cast(NULL)), - (args[1]).As(static_cast(NULL)), - (args[2]).As(static_cast(NULL)) - ); - } -}; - -#define wxCONSTRUCTOR_3(klass,t0,v0,t1,v1,t2,v2) \ - wxObjectAllocatorAndCreator_3 constructor##klass; \ - wxObjectAllocatorAndCreator* klass::ms_constructor = &constructor##klass; \ - const wxChar *klass::ms_constructorProperties[] = { wxT(#v0), wxT(#v1), wxT(#v2) }; \ - const int klass::ms_constructorPropertiesCount = 3; - -// direct constructor version - -template -struct wxDirectConstructorBridge_3 : public wxObjectAllocator -{ - bool Create(wxObject * &o, wxAny *args) - { - o = new Class( - (args[0]).As(static_cast(NULL)), - (args[1]).As(static_cast(NULL)), - (args[2]).As(static_cast(NULL)) - ); - return o != NULL; - } -}; - -#define wxDIRECT_CONSTRUCTOR_3(klass,t0,v0,t1,v1,t2,v2) \ - wxDirectConstructorBridge_3 constructor##klass; \ - wxObjectAllocatorAndCreator* klass::ms_constructor = &constructor##klass; \ - const wxChar *klass::ms_constructorProperties[] = { wxT(#v0), wxT(#v1), wxT(#v2) }; \ - const int klass::ms_constructorPropertiesCount = 3; - - -// 4 params - -template -struct wxObjectAllocatorAndCreator_4 : public wxObjectAllocatorAndCreator -{ - bool Create(wxObject * &o, wxAny *args) - { - Class *obj = wx_dynamic_cast(Class*, o); - return obj->Create( - (args[0]).As(static_cast(NULL)), - (args[1]).As(static_cast(NULL)), - (args[2]).As(static_cast(NULL)), - (args[3]).As(static_cast(NULL)) - ); - } -}; - -#define wxCONSTRUCTOR_4(klass,t0,v0,t1,v1,t2,v2,t3,v3) \ - wxObjectAllocatorAndCreator_4 constructor##klass; \ - wxObjectAllocatorAndCreator* klass::ms_constructor = &constructor##klass; \ - const wxChar *klass::ms_constructorProperties[] = \ - { wxT(#v0), wxT(#v1), wxT(#v2), wxT(#v3) }; \ - const int klass::ms_constructorPropertiesCount = 4; - -// direct constructor version - -template -struct wxDirectConstructorBridge_4 : public wxObjectAllocator -{ - bool Create(wxObject * &o, wxAny *args) - { - o = new Class( - (args[0]).As(static_cast(NULL)), - (args[1]).As(static_cast(NULL)), - (args[2]).As(static_cast(NULL)), - (args[3]).As(static_cast(NULL)) - ); - return o != NULL; - } -}; - -#define wxDIRECT_CONSTRUCTOR_4(klass,t0,v0,t1,v1,t2,v2,t3,v3) \ - wxDirectConstructorBridge_4 constructor##klass; \ - wxObjectAllocatorAndCreator* klass::ms_constructor = &constructor##klass; \ - const wxChar *klass::ms_constructorProperties[] = \ - { wxT(#v0), wxT(#v1), wxT(#v2), wxT(#v3) }; \ - const int klass::ms_constructorPropertiesCount = 4; - - -// 5 params - -template -struct wxObjectAllocatorAndCreator_5 : public wxObjectAllocatorAndCreator -{ - bool Create(wxObject * &o, wxAny *args) - { - Class *obj = wx_dynamic_cast(Class*, o); - return obj->Create( - (args[0]).As(static_cast(NULL)), - (args[1]).As(static_cast(NULL)), - (args[2]).As(static_cast(NULL)), - (args[3]).As(static_cast(NULL)), - (args[4]).As(static_cast(NULL)) - ); - } -}; - -#define wxCONSTRUCTOR_5(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4) \ - wxObjectAllocatorAndCreator_5 constructor##klass; \ - wxObjectAllocatorAndCreator* klass::ms_constructor = &constructor##klass; \ - const wxChar *klass::ms_constructorProperties[] = \ - { wxT(#v0), wxT(#v1), wxT(#v2), wxT(#v3), wxT(#v4) }; \ - const int klass::ms_constructorPropertiesCount = 5; - -// direct constructor version - -template -struct wxDirectConstructorBridge_5 : public wxObjectAllocator -{ - bool Create(wxObject * &o, wxAny *args) - { - o = new Class( - (args[0]).As(static_cast(NULL)), - (args[1]).As(static_cast(NULL)), - (args[2]).As(static_cast(NULL)), - (args[3]).As(static_cast(NULL)), - (args[4]).As(static_cast(NULL)) - ); - return o != NULL; - } -}; - -#define wxDIRECT_CONSTRUCTOR_5(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4) \ - wxDirectConstructorBridge_5 constructor##klass; \ - wxObjectAllocatorAndCreator* klass::ms_constructor = &constructor##klass; \ - const wxChar *klass::ms_constructorProperties[] = \ - { wxT(#v0), wxT(#v1), wxT(#v2), wxT(#v3), wxT(#v4) }; \ - const int klass::ms_constructorPropertiesCount = 5; - - -// 6 params - -template -struct wxObjectAllocatorAndCreator_6 : public wxObjectAllocatorAndCreator -{ - bool Create(wxObject * &o, wxAny *args) - { - Class *obj = wx_dynamic_cast(Class*, o); - return obj->Create( - (args[0]).As(static_cast(NULL)), - (args[1]).As(static_cast(NULL)), - (args[2]).As(static_cast(NULL)), - (args[3]).As(static_cast(NULL)), - (args[4]).As(static_cast(NULL)), - (args[5]).As(static_cast(NULL)) - ); - } -}; - -#define wxCONSTRUCTOR_6(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4,t5,v5) \ - wxObjectAllocatorAndCreator_6 constructor##klass; \ - wxObjectAllocatorAndCreator* klass::ms_constructor = &constructor##klass; \ - const wxChar *klass::ms_constructorProperties[] = \ - { wxT(#v0), wxT(#v1), wxT(#v2), wxT(#v3), wxT(#v4), wxT(#v5) }; \ - const int klass::ms_constructorPropertiesCount = 6; - -// direct constructor version - -template -struct wxDirectConstructorBridge_6 : public wxObjectAllocator -{ - bool Create(wxObject * &o, wxAny *args) - { - o = new Class( - (args[0]).As(static_cast(NULL)), - (args[1]).As(static_cast(NULL)), - (args[2]).As(static_cast(NULL)), - (args[3]).As(static_cast(NULL)), - (args[4]).As(static_cast(NULL)), - (args[5]).As(static_cast(NULL)) - ); - return o != NULL; - } -}; - -#define wxDIRECT_CONSTRUCTOR_6(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4,t5,v5) \ - wxDirectConstructorBridge_6 constructor##klass; \ - wxObjectAllocatorAndCreator* klass::ms_constructor = &constructor##klass; \ - const wxChar *klass::ms_constructorProperties[] = { wxT(#v0), wxT(#v1), \ - wxT(#v2), wxT(#v3), wxT(#v4), wxT(#v5) }; \ - const int klass::ms_constructorPropertiesCount = 6; - - -// 7 params - -template -struct wxObjectAllocatorAndCreator_7 : public wxObjectAllocatorAndCreator -{ - bool Create(wxObject * &o, wxAny *args) - { - Class *obj = wx_dynamic_cast(Class*, o); - return obj->Create( - (args[0]).As(static_cast(NULL)), - (args[1]).As(static_cast(NULL)), - (args[2]).As(static_cast(NULL)), - (args[3]).As(static_cast(NULL)), - (args[4]).As(static_cast(NULL)), - (args[5]).As(static_cast(NULL)), - (args[6]).As(static_cast(NULL)) - ); - } -}; - -#define wxCONSTRUCTOR_7(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4,t5,v5,t6,v6) \ - wxObjectAllocatorAndCreator_7 constructor##klass; \ - wxObjectAllocatorAndCreator* klass::ms_constructor = &constructor##klass; \ - const wxChar *klass::ms_constructorProperties[] = { wxT(#v0), wxT(#v1), \ - wxT(#v2), wxT(#v3), wxT(#v4), wxT(#v5), wxT(#v6) }; \ - const int klass::ms_constructorPropertiesCount = 7; - -// direct constructor version - -template -struct wxDirectConstructorBridge_7 : public wxObjectAllocator -{ - bool Create(wxObject * &o, wxAny *args) - { - o = new Class( - (args[0]).As(static_cast(NULL)), - (args[1]).As(static_cast(NULL)), - (args[2]).As(static_cast(NULL)), - (args[3]).As(static_cast(NULL)), - (args[4]).As(static_cast(NULL)), - (args[5]).As(static_cast(NULL)), - (args[6]).As(static_cast(NULL)) - ); - return o != NULL; - } -}; - -#define wxDIRECT_CONSTRUCTOR_7(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4,t5,v5,t6,v6) \ - wxDirectConstructorBridge_7 constructor##klass; \ - wxObjectAllocatorAndCreator* klass::ms_constructor = &constructor##klass; \ - const wxChar *klass::ms_constructorProperties[] = \ - { wxT(#v0), wxT(#v1), wxT(#v2), wxT(#v3), wxT(#v4), wxT(#v5), wxT(#v6) }; \ - const int klass::ms_constructorPropertiesCount = 7; - - -// 8 params - -template -struct wxObjectAllocatorAndCreator_8 : public wxObjectAllocatorAndCreator -{ - bool Create(wxObject * &o, wxAny *args) - { - Class *obj = wx_dynamic_cast(Class*, o); - return obj->Create( - (args[0]).As(static_cast(NULL)), - (args[1]).As(static_cast(NULL)), - (args[2]).As(static_cast(NULL)), - (args[3]).As(static_cast(NULL)), - (args[4]).As(static_cast(NULL)), - (args[5]).As(static_cast(NULL)), - (args[6]).As(static_cast(NULL)), - (args[7]).As(static_cast(NULL)) - ); - } -}; - -#define wxCONSTRUCTOR_8(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4,t5,v5,t6,v6,t7,v7) \ - wxObjectAllocatorAndCreator_8 constructor##klass; \ - wxObjectAllocatorAndCreator* klass::ms_constructor = &constructor##klass; \ - const wxChar *klass::ms_constructorProperties[] = \ - { wxT(#v0), wxT(#v1), wxT(#v2), wxT(#v3), wxT(#v4), wxT(#v5), wxT(#v6), wxT(#v7) }; \ - const int klass::ms_constructorPropertiesCount = 8; - -// direct constructor version - -template -struct wxDirectConstructorBridge_8 : public wxObjectAllocator -{ - bool Create(wxObject * &o, wxAny *args) - { - o = new Class( - (args[0]).As(static_cast(NULL)), - (args[1]).As(static_cast(NULL)), - (args[2]).As(static_cast(NULL)), - (args[3]).As(static_cast(NULL)), - (args[4]).As(static_cast(NULL)), - (args[5]).As(static_cast(NULL)), - (args[6]).As(static_cast(NULL)), - (args[7]).As(static_cast(NULL)) - ); - return o != NULL; - } -}; - -#define wxDIRECT_CONSTRUCTOR_8(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4,t5,v5,t6,v6,t7,v7) \ - wxDirectConstructorBridge_8 constructor##klass; \ - wxObjectAllocatorAndCreator* klass::ms_constructor = &constructor##klass; \ - const wxChar *klass::ms_constructorProperties[] = \ - { wxT(#v0), wxT(#v1), wxT(#v2), wxT(#v3), wxT(#v4), wxT(#v5), wxT(#v6), wxT(#v7) }; \ - const int klass::ms_constructorPropertiesCount = 8; - -#endif // wxUSE_EXTENDED_RTTI -#endif // _XTICTOR_H_ diff --git a/Externals/wxWidgets3/include/wx/xtihandler.h b/Externals/wxWidgets3/include/wx/xtihandler.h deleted file mode 100644 index c63ddb3a36..0000000000 --- a/Externals/wxWidgets3/include/wx/xtihandler.h +++ /dev/null @@ -1,112 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/xtihandler.h -// Purpose: XTI handlers -// Author: Stefan Csomor -// Modified by: Francesco Montorsi -// Created: 27/07/03 -// Copyright: (c) 1997 Julian Smart -// (c) 2003 Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _XTIHANDLER_H_ -#define _XTIHANDLER_H_ - -#include "wx/defs.h" - -#if wxUSE_EXTENDED_RTTI - -#include "wx/xti.h" - -// copied from event.h which cannot be included at this place - -class WXDLLIMPEXP_FWD_BASE wxEvent; - -#ifdef __VISUALC__ -#define wxMSVC_FWD_MULTIPLE_BASES __multiple_inheritance -#else -#define wxMSVC_FWD_MULTIPLE_BASES -#endif - -class WXDLLIMPEXP_FWD_BASE wxMSVC_FWD_MULTIPLE_BASES wxEvtHandler; -typedef void (wxEvtHandler::*wxEventFunction)(wxEvent&); -typedef wxEventFunction wxObjectEventFunction; - -// ---------------------------------------------------------------------------- -// Handler Info -// -// this describes an event sink -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxHandlerInfo -{ - friend class WXDLLIMPEXP_BASE wxDynamicClassInfo; - -public: - wxHandlerInfo(wxHandlerInfo* &iter, - wxClassInfo* itsClass, - const wxString& name, - wxObjectEventFunction address, - const wxClassInfo* eventClassInfo) : - m_eventFunction(address), - m_name(name), - m_eventClassInfo(eventClassInfo), - m_itsClass(itsClass) - { - Insert(iter); - } - - ~wxHandlerInfo() - { Remove(); } - - // return the name of this handler - const wxString& GetName() const { return m_name; } - - // return the class info of the event - const wxClassInfo *GetEventClassInfo() const { return m_eventClassInfo; } - - // get the handler function pointer - wxObjectEventFunction GetEventFunction() const { return m_eventFunction; } - - // returns NULL if this is the last handler of this class - wxHandlerInfo* GetNext() const { return m_next; } - - // return the class this property is declared in - const wxClassInfo* GetDeclaringClass() const { return m_itsClass; } - -private: - - // inserts this handler at the end of the linked chain which begins - // with "iter" handler. - void Insert(wxHandlerInfo* &iter); - - // removes this handler from the linked chain of the m_itsClass handlers. - void Remove(); - - wxObjectEventFunction m_eventFunction; - wxString m_name; - const wxClassInfo* m_eventClassInfo; - wxHandlerInfo* m_next; - wxClassInfo* m_itsClass; -}; - -#define wxHANDLER(name,eventClassType) \ - static wxHandlerInfo _handlerInfo##name( first, class_t::GetClassInfoStatic(), \ - wxT(#name), (wxObjectEventFunction) (wxEventFunction) &name, \ - wxCLASSINFO( eventClassType ) ); - -#define wxBEGIN_HANDLERS_TABLE(theClass) \ - wxHandlerInfo *theClass::GetHandlersStatic() \ - { \ - typedef theClass class_t; \ - static wxHandlerInfo* first = NULL; - -#define wxEND_HANDLERS_TABLE() \ - return first; } - -#define wxEMPTY_HANDLERS_TABLE(theClass) \ - wxBEGIN_HANDLERS_TABLE(theClass) \ - wxEND_HANDLERS_TABLE() - -#endif // wxUSE_EXTENDED_RTTI -#endif // _XTIHANDLER_H_ diff --git a/Externals/wxWidgets3/include/wx/xtiprop.h b/Externals/wxWidgets3/include/wx/xtiprop.h deleted file mode 100644 index 8c18e2a35a..0000000000 --- a/Externals/wxWidgets3/include/wx/xtiprop.h +++ /dev/null @@ -1,556 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/xtiprop.h -// Purpose: XTI properties -// Author: Stefan Csomor -// Modified by: Francesco Montorsi -// Created: 27/07/03 -// Copyright: (c) 1997 Julian Smart -// (c) 2003 Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _XTIPROP_H_ -#define _XTIPROP_H_ - -#include "wx/defs.h" - -#if wxUSE_EXTENDED_RTTI - -#include "wx/xti.h" -#include "wx/any.h" - -/* -class WXDLLIMPEXP_BASE wxObject; -class WXDLLIMPEXP_BASE wxClassInfo; -class WXDLLIMPEXP_BASE wxDynamicClassInfo; -*/ -class WXDLLIMPEXP_BASE wxHashTable; -class WXDLLIMPEXP_BASE wxHashTable_Node; -class WXDLLIMPEXP_BASE wxEvent; -class WXDLLIMPEXP_BASE wxEvtHandler; - -// ---------------------------------------------------------------------------- -// Property Accessors -// -// wxPropertySetter/Getter/CollectionGetter/CollectionAdder are all property -// accessors which are managed by wxPropertyAccessor class which in turn is -// handled by wxPropertyInfo. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxPropertySetter -{ -public: - wxPropertySetter( const wxString name ) { m_name = name; } - virtual ~wxPropertySetter() {} - - virtual void Set( wxObject *object, const wxAny &variantValue ) const = 0; - const wxString& GetName() const { return m_name; } - -private: - wxString m_name; -}; - -class WXDLLIMPEXP_BASE wxPropertyGetter -{ -public: - wxPropertyGetter( const wxString name ) { m_name = name; } - virtual ~wxPropertyGetter() {} - - virtual void Get( const wxObject *object, wxAny& result) const = 0; - const wxString& GetName() const { return m_name; } - -private: - wxString m_name; -}; - -class WXDLLIMPEXP_BASE wxPropertyCollectionGetter -{ -public: - wxPropertyCollectionGetter( const wxString name ) { m_name = name; } - virtual ~wxPropertyCollectionGetter() {} - - virtual void Get( const wxObject *object, wxAnyList& result) const = 0; - const wxString& GetName() const { return m_name; } - -private: - wxString m_name; -}; - -template void WXDLLIMPEXP_BASE \ - wxCollectionToVariantArray( const coll_t& coll, wxAnyList& result ); - -class WXDLLIMPEXP_BASE wxPropertyCollectionAdder -{ -public: - wxPropertyCollectionAdder( const wxString name ) { m_name = name; } - virtual ~wxPropertyCollectionAdder() {} - - virtual void Add( wxObject *object, const wxAny &variantValue ) const= 0; - const wxString& GetName() const { return m_name; } - -private: - wxString m_name; -}; - -#define wxPROPERTY_SETTER( property, Klass, valueType, setterMethod ) \ -class wxPropertySetter##property : public wxPropertySetter \ -{ \ -public: \ - wxPropertySetter##property() : wxPropertySetter( wxT(#setterMethod) ) {} \ - virtual ~wxPropertySetter##property() {} \ - \ - void Set( wxObject *object, const wxAny &variantValue ) const \ - { \ - Klass *obj = dynamic_cast(object); \ - valueType tempobj; \ - if ( variantValue.GetAs(&tempobj) ) \ - obj->setterMethod(tempobj); \ - else \ - obj->setterMethod(*variantValue.As()); \ - } \ -}; - -#define wxPROPERTY_GETTER( property, Klass, valueType, gettermethod ) \ -class wxPropertyGetter##property : public wxPropertyGetter \ -{ \ -public: \ - wxPropertyGetter##property() : wxPropertyGetter( wxT(#gettermethod) ) {} \ - virtual ~wxPropertyGetter##property() {} \ - \ - void Get( const wxObject *object, wxAny &result) const \ - { \ - const Klass *obj = dynamic_cast(object); \ - result = wxAny( obj->gettermethod() ); \ - } \ -}; - -#define wxPROPERTY_COLLECTION_ADDER( property, Klass, valueType, addermethod ) \ -class wxPropertyCollectionAdder##property : public wxPropertyCollectionAdder \ -{ \ -public: \ - wxPropertyCollectionAdder##property() : wxPropertyCollectionAdder( wxT(#addermethod) ) {} \ - virtual ~wxPropertyCollectionAdder##property() {} \ - \ - void Add( wxObject *object, const wxAny &variantValue ) const \ - { \ - Klass *obj = dynamic_cast(object); \ - valueType tempobj; \ - if ( variantValue.GetAs(&tempobj) ) \ - obj->addermethod(tempobj); \ - else \ - obj->addermethod(*variantValue.As()); \ - } \ -}; - -#define wxPROPERTY_COLLECTION_GETTER( property, Klass, valueType, gettermethod ) \ -class wxPropertyCollectionGetter##property : public wxPropertyCollectionGetter \ -{ \ -public: \ - wxPropertyCollectionGetter##property() : wxPropertyCollectionGetter( wxT(#gettermethod) ) {} \ - virtual ~wxPropertyCollectionGetter##property() {} \ - \ - void Get( const wxObject *object, wxAnyList &result) const \ - { \ - const Klass *obj = dynamic_cast(object); \ - wxCollectionToVariantArray( obj->gettermethod(), result ); \ - } \ -}; - -class WXDLLIMPEXP_BASE wxPropertyAccessor -{ -public: - wxPropertyAccessor( wxPropertySetter *setter, wxPropertyGetter *getter, - wxPropertyCollectionAdder *adder, wxPropertyCollectionGetter *collectionGetter ) - { m_setter = setter; m_getter = getter; m_adder = adder; - m_collectionGetter = collectionGetter; } - - virtual ~wxPropertyAccessor() {} - - // Setting a simple property (non-collection) - virtual void SetProperty(wxObject *object, const wxAny &value) const - { - if ( m_setter ) - m_setter->Set( object, value ); - else - wxLogError( wxGetTranslation("SetProperty called w/o valid setter") ); - } - - // Getting a simple property (non-collection) - virtual void GetProperty(const wxObject *object, wxAny &result) const - { - if ( m_getter ) - m_getter->Get( object, result ); - else - wxLogError( wxGetTranslation("GetProperty called w/o valid getter") ); - } - - // Adding an element to a collection property - virtual void AddToPropertyCollection(wxObject *object, const wxAny &value) const - { - if ( m_adder ) - m_adder->Add( object, value ); - else - wxLogError( wxGetTranslation("AddToPropertyCollection called w/o valid adder") ); - } - - // Getting a collection property - virtual void GetPropertyCollection( const wxObject *obj, wxAnyList &result) const - { - if ( m_collectionGetter ) - m_collectionGetter->Get( obj, result); - else - wxLogError( wxGetTranslation("GetPropertyCollection called w/o valid collection getter") ); - } - - virtual bool HasSetter() const { return m_setter != NULL; } - virtual bool HasCollectionGetter() const { return m_collectionGetter != NULL; } - virtual bool HasGetter() const { return m_getter != NULL; } - virtual bool HasAdder() const { return m_adder != NULL; } - - virtual const wxString& GetCollectionGetterName() const - { return m_collectionGetter->GetName(); } - virtual const wxString& GetGetterName() const - { return m_getter->GetName(); } - virtual const wxString& GetSetterName() const - { return m_setter->GetName(); } - virtual const wxString& GetAdderName() const - { return m_adder->GetName(); } - -protected: - wxPropertySetter *m_setter; - wxPropertyCollectionAdder *m_adder; - wxPropertyGetter *m_getter; - wxPropertyCollectionGetter* m_collectionGetter; -}; - -class WXDLLIMPEXP_BASE wxGenericPropertyAccessor : public wxPropertyAccessor -{ -public: - wxGenericPropertyAccessor( const wxString &propName ); - virtual ~wxGenericPropertyAccessor(); - - void RenameProperty( const wxString& WXUNUSED_UNLESS_DEBUG(oldName), - const wxString& newName ) - { - wxASSERT( oldName == m_propertyName ); m_propertyName = newName; - } - - virtual bool HasSetter() const { return true; } - virtual bool HasGetter() const { return true; } - virtual bool HasAdder() const { return false; } - virtual bool HasCollectionGetter() const { return false; } - - virtual const wxString& GetGetterName() const - { return m_getterName; } - virtual const wxString& GetSetterName() const - { return m_setterName; } - - virtual void SetProperty(wxObject *object, const wxAny &value) const; - virtual void GetProperty(const wxObject *object, wxAny &value) const; - - // Adding an element to a collection property - virtual void AddToPropertyCollection(wxObject *WXUNUSED(object), - const wxAny &WXUNUSED(value)) const - { - wxLogError( wxGetTranslation("AddToPropertyCollection called on a generic accessor") ); - } - - // Getting a collection property - virtual void GetPropertyCollection( const wxObject *WXUNUSED(obj), - wxAnyList &WXUNUSED(result)) const - { - wxLogError ( wxGetTranslation("GetPropertyCollection called on a generic accessor") ); - } - -private: - struct wxGenericPropertyAccessorInternal; - wxGenericPropertyAccessorInternal* m_data; - wxString m_propertyName; - wxString m_setterName; - wxString m_getterName; -}; - -typedef long wxPropertyInfoFlags; -enum -{ - // will be removed in future releases - wxPROP_DEPRECATED = 0x00000001, - - // object graph property, will be streamed with priority (after constructor properties) - wxPROP_OBJECT_GRAPH = 0x00000002, - - // this will only be streamed out and in as enum/set, the internal representation - // is still a long - wxPROP_ENUM_STORE_LONG = 0x00000004, - - // don't stream out this property, needed eg to avoid streaming out children - // that are always created by their parents - wxPROP_DONT_STREAM = 0x00000008 -}; - - -// ---------------------------------------------------------------------------- -// Property Support -// -// wxPropertyInfo is used to inquire of the property by name. It doesn't -// provide access to the property, only information about it. If you -// want access, look at wxPropertyAccessor. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxPropertyInfo -{ - friend class /* WXDLLIMPEXP_BASE */ wxDynamicClassInfo; - -public: - wxPropertyInfo(wxPropertyInfo* &iter, - wxClassInfo* itsClass, - const wxString& name, - const wxString& typeName, - wxPropertyAccessor *accessor, - wxAny dv, - wxPropertyInfoFlags flags = 0, - const wxString& helpString = wxEmptyString, - const wxString& groupString = wxEmptyString) : - m_itsClass(itsClass), - m_name(name), - m_typeInfo(NULL), - m_typeName(typeName), - m_collectionElementTypeInfo(NULL), - m_accessor(accessor), - m_defaultValue(dv), - m_flags(flags), - m_helpString(helpString), - m_groupString(groupString) - { - Insert(iter); - } - - wxPropertyInfo(wxPropertyInfo* &iter, - wxClassInfo* itsClass, - const wxString& name, - wxEventSourceTypeInfo* type, - wxPropertyAccessor *accessor, - wxAny dv, - wxPropertyInfoFlags flags = 0, - const wxString& helpString = wxEmptyString, - const wxString& groupString = wxEmptyString) : - m_itsClass(itsClass), - m_name(name), - m_typeInfo(type), - m_collectionElementTypeInfo(NULL), - m_accessor(accessor), - m_defaultValue(dv), - m_flags(flags), - m_helpString(helpString), - m_groupString(groupString) - { - Insert(iter); - } - - wxPropertyInfo(wxPropertyInfo* &iter, - wxClassInfo* itsClass, const wxString& name, - const wxString& collectionTypeName, - const wxString& elementTypeName, - wxPropertyAccessor *accessor, - wxPropertyInfoFlags flags = 0, - const wxString& helpString = wxEmptyString, - const wxString& groupString = wxEmptyString) : - m_itsClass(itsClass), - m_name(name), - m_typeInfo(NULL), - m_typeName(collectionTypeName), - m_collectionElementTypeInfo(NULL), - m_collectionElementTypeName(elementTypeName), - m_accessor(accessor), - m_flags(flags), - m_helpString(helpString), - m_groupString(groupString) - { - Insert(iter); - } - - ~wxPropertyInfo() - { Remove(); } - - // return the class this property is declared in - const wxClassInfo* GetDeclaringClass() const { return m_itsClass; } - - // return the name of this property - const wxString& GetName() const { return m_name; } - - // returns the flags of this property - wxPropertyInfoFlags GetFlags() const { return m_flags; } - - // returns the short help string of this property - const wxString& GetHelpString() const { return m_helpString; } - - // returns the group string of this property - const wxString& GetGroupString() const { return m_groupString; } - - // return the element type info of this property (for collections, otherwise NULL) - const wxTypeInfo * GetCollectionElementTypeInfo() const - { - if ( m_collectionElementTypeInfo == NULL ) - m_collectionElementTypeInfo = wxTypeInfo::FindType(m_collectionElementTypeName); - return m_collectionElementTypeInfo; - } - - // return the type info of this property - const wxTypeInfo * GetTypeInfo() const - { - if ( m_typeInfo == NULL ) - m_typeInfo = wxTypeInfo::FindType(m_typeName); - return m_typeInfo; - } - - // return the accessor for this property - wxPropertyAccessor* GetAccessor() const { return m_accessor; } - - // returns NULL if this is the last property of this class - wxPropertyInfo* GetNext() const { return m_next; } - - // returns the default value of this property, its kind may be wxT_VOID if it is not valid - wxAny GetDefaultValue() const { return m_defaultValue; } - -private: - - // inserts this property at the end of the linked chain which begins - // with "iter" property. - void Insert(wxPropertyInfo* &iter); - - // removes this property from the linked chain of the m_itsClass properties. - void Remove(); - - wxClassInfo* m_itsClass; - wxString m_name; - mutable wxTypeInfo* m_typeInfo; - wxString m_typeName; - mutable wxTypeInfo* m_collectionElementTypeInfo; - wxString m_collectionElementTypeName; - wxPropertyAccessor* m_accessor; - wxAny m_defaultValue; - wxPropertyInfoFlags m_flags; - wxString m_helpString; - wxString m_groupString; - wxPropertyInfo* m_next; - - // FIXME: what's this comment about?? - // string representation of the default value - // to be assigned by the designer to the property - // when the component is dropped on the container. -}; - -// stl is giving problems when forwarding declarations, therefore we define it as a subclass - -WX_DECLARE_STRING_HASH_MAP_WITH_DECL( wxPropertyInfo*, wxPropertyInfoMapBase, - class WXDLLIMPEXP_BASE ); - -class WXDLLIMPEXP_BASE wxPropertyInfoMap : public wxPropertyInfoMapBase { -}; - -WX_DECLARE_STRING_HASH_MAP_WITH_DECL( wxAny, wxStringToAnyHashMapBase, - class WXDLLIMPEXP_BASE ); - -class WXDLLIMPEXP_FWD_BASE wxStringToAnyHashMap : public wxStringToAnyHashMapBase { -}; - -#define wxBEGIN_PROPERTIES_TABLE(theClass) \ - wxPropertyInfo *theClass::GetPropertiesStatic() \ - { \ - typedef theClass class_t; \ - static wxPropertyInfo* first = NULL; - -#define wxEND_PROPERTIES_TABLE() \ - return first; } - -#define wxHIDE_PROPERTY( pname ) \ - static wxPropertyInfo _propertyInfo##pname( first, class_t::GetClassInfoStatic(), \ - wxT(#pname), typeid(void).name(), NULL, wxAny(), wxPROP_DONT_STREAM, \ - wxEmptyString, wxEmptyString ); - -#define wxPROPERTY( pname, type, setter, getter, defaultValue, flags, help, group) \ - wxPROPERTY_SETTER( pname, class_t, type, setter ) \ - static wxPropertySetter##pname _setter##pname; \ - wxPROPERTY_GETTER( pname, class_t, type, getter ) \ - static wxPropertyGetter##pname _getter##pname; \ - static wxPropertyAccessor _accessor##pname( &_setter##pname, \ - &_getter##pname, NULL, NULL ); \ - static wxPropertyInfo _propertyInfo##pname( first, class_t::GetClassInfoStatic(), \ - wxT(#pname), typeid(type).name(), &_accessor##pname, \ - wxAny(defaultValue), flags, group, help ); - -#define wxPROPERTY_FLAGS( pname, flags, type, setter, getter,defaultValue, \ - pflags, help, group) \ - wxPROPERTY_SETTER( pname, class_t, type, setter ) \ - static wxPropertySetter##pname _setter##pname; \ - wxPROPERTY_GETTER( pname, class_t, type, getter ) \ - static wxPropertyGetter##pname _getter##pname; \ - static wxPropertyAccessor _accessor##pname( &_setter##pname, \ - &_getter##pname, NULL, NULL ); \ - static wxPropertyInfo _propertyInfo##pname( first, class_t::GetClassInfoStatic(), \ - wxT(#pname), typeid(flags).name(), &_accessor##pname, \ - wxAny(defaultValue), wxPROP_ENUM_STORE_LONG | pflags, help, group ); - -#define wxREADONLY_PROPERTY( pname, type, getter,defaultValue, flags, help, group) \ - wxPROPERTY_GETTER( pname, class_t, type, getter ) \ - static wxPropertyGetter##pname _getter##pname; \ - static wxPropertyAccessor _accessor##pname( NULL, &_getter##pname, NULL, NULL ); \ - static wxPropertyInfo _propertyInfo##pname( first, class_t::GetClassInfoStatic(), \ - wxT(#pname), typeid(type).name(),&_accessor##pname, \ - wxAny(defaultValue), flags, help, group ); - -#define wxREADONLY_PROPERTY_FLAGS( pname, flags, type, getter,defaultValue, \ - pflags, help, group) \ - wxPROPERTY_GETTER( pname, class_t, type, getter ) \ - static wxPropertyGetter##pname _getter##pname; \ - static wxPropertyAccessor _accessor##pname( NULL, &_getter##pname, NULL, NULL ); \ - static wxPropertyInfo _propertyInfo##pname( first, class_t::GetClassInfoStatic(), \ - wxT(#pname), typeid(flags).name(),&_accessor##pname, \ - wxAny(defaultValue), wxPROP_ENUM_STORE_LONG | pflags, help, group ); - -#define wxPROPERTY_COLLECTION( pname, colltype, addelemtype, adder, getter, \ - flags, help, group ) \ - wxPROPERTY_COLLECTION_ADDER( pname, class_t, addelemtype, adder ) \ - static wxPropertyCollectionAdder##pname _adder##pname; \ - wxPROPERTY_COLLECTION_GETTER( pname, class_t, colltype, getter ) \ - static wxPropertyCollectionGetter##pname _collectionGetter##pname; \ - static wxPropertyAccessor _accessor##pname( NULL, NULL,&_adder##pname, \ - &_collectionGetter##pname ); \ - static wxPropertyInfo _propertyInfo##pname( first, class_t::GetClassInfoStatic(), \ - wxT(#pname), typeid(colltype).name(),typeid(addelemtype).name(), \ - &_accessor##pname, flags, help, group ); - -#define wxREADONLY_PROPERTY_COLLECTION( pname, colltype, addelemtype, getter, \ - flags, help, group) \ - wxPROPERTY_COLLECTION_GETTER( pname, class_t, colltype, getter ) \ - static wxPropertyCollectionGetter##pname _collectionGetter##pname; \ - static wxPropertyAccessor _accessor##pname( NULL, NULL, NULL, \ - &_collectionGetter##pname ); \ - static wxPropertyInfo _propertyInfo##pname( first,class_t::GetClassInfoStatic(), \ - wxT(#pname), typeid(colltype).name(),typeid(addelemtype).name(), \ - &_accessor##pname, flags, help, group ); - -#define wxEVENT_PROPERTY( name, eventType, eventClass ) \ - static wxEventSourceTypeInfo _typeInfo##name( eventType, wxCLASSINFO( eventClass ) ); \ - static wxPropertyInfo _propertyInfo##name( first,class_t::GetClassInfoStatic(), \ - wxT(#name), &_typeInfo##name, NULL, wxAny() ); - -#define wxEVENT_RANGE_PROPERTY( name, eventType, lastEventType, eventClass ) \ - static wxEventSourceTypeInfo _typeInfo##name( eventType, lastEventType, \ - wxCLASSINFO( eventClass ) ); \ - static wxPropertyInfo _propertyInfo##name( first, class_t::GetClassInfoStatic(), \ - wxT(#name), &_typeInfo##name, NULL, wxAny() ); - -// ---------------------------------------------------------------------------- -// Implementation Helper for Simple Properties -// ---------------------------------------------------------------------------- - -#define wxIMPLEMENT_PROPERTY(name, type) \ -private: \ - type m_##name; \ -public: \ - void Set##name( type const & p) { m_##name = p; } \ - type const & Get##name() const { return m_##name; } - -#endif // wxUSE_EXTENDED_RTTI -#endif // _XTIPROP_H_ diff --git a/Externals/wxWidgets3/include/wx/xtistrm.h b/Externals/wxWidgets3/include/wx/xtistrm.h deleted file mode 100644 index 0621ead1ea..0000000000 --- a/Externals/wxWidgets3/include/wx/xtistrm.h +++ /dev/null @@ -1,408 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/xtistrm.h -// Purpose: streaming runtime metadata information (extended class info) -// Author: Stefan Csomor -// Modified by: -// Created: 27/07/03 -// Copyright: (c) 2003 Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_XTISTRMH__ -#define _WX_XTISTRMH__ - -#include "wx/defs.h" - -#if wxUSE_EXTENDED_RTTI - -#include "wx/object.h" - -const int wxInvalidObjectID = -2; -const int wxNullObjectID = -3; - -// Filer contains the interfaces for streaming objects in and out of XML, -// rendering them either to objects in memory, or to code. Note: We -// consider the process of generating code to be one of *depersisting* the -// object from xml, *not* of persisting the object to code from an object -// in memory. This distinction can be confusing, and should be kept -// in mind when looking at the property streamers and callback interfaces -// listed below. - - -// ---------------------------------------------------------------------------- -// wxObjectWriterCallback -// -// This class will be asked during the streaming-out process about every single -// property or object instance. It can veto streaming out by returning false -// or modify the value before it is streamed-out. -// ---------------------------------------------------------------------------- - -/* - class WXDLLIMPEXP_BASE wxClassInfo; - class WXDLLIMPEXP_BASE wxAnyList; - class WXDLLIMPEXP_BASE wxPropertyInfo; - class WXDLLIMPEXP_BASE wxAny; - class WXDLLIMPEXP_BASE wxHandlerInfo; - */ - -class WXDLLIMPEXP_BASE wxObjectWriter; -class WXDLLIMPEXP_BASE wxObjectReader; - -class WXDLLIMPEXP_BASE wxObjectWriterCallback -{ -public: - virtual ~wxObjectWriterCallback() {} - - // will be called before an object is written, may veto by returning false - virtual bool BeforeWriteObject( wxObjectWriter *WXUNUSED(writer), - const wxObject *WXUNUSED(object), - const wxClassInfo *WXUNUSED(classInfo), - const wxStringToAnyHashMap &WXUNUSED(metadata)) - { return true; } - - // will be called after this object has been written, may be - // needed for adjusting stacks - virtual void AfterWriteObject( wxObjectWriter *WXUNUSED(writer), - const wxObject *WXUNUSED(object), - const wxClassInfo *WXUNUSED(classInfo) ) - {} - - // will be called before a property gets written, may change the value, - // eg replace a concrete wxSize by wxSize( wxDefaultCoord, wxDefaultCoord ) - // or veto writing that property at all by returning false - virtual bool BeforeWriteProperty( wxObjectWriter *WXUNUSED(writer), - const wxObject *WXUNUSED(object), - const wxPropertyInfo *WXUNUSED(propInfo), - const wxAny &WXUNUSED(value) ) - { return true; } - - // will be called before a property gets written, may change the value, - // eg replace a concrete wxSize by wxSize( wxDefaultCoord, wxDefaultCoord ) - // or veto writing that property at all by returning false - virtual bool BeforeWriteProperty( wxObjectWriter *WXUNUSED(writer), - const wxObject *WXUNUSED(object), - const wxPropertyInfo *WXUNUSED(propInfo), - const wxAnyList &WXUNUSED(value) ) - { return true; } - - // will be called after a property has been written out, may be needed - // for adjusting stacks - virtual void AfterWriteProperty( wxObjectWriter *WXUNUSED(writer), - const wxPropertyInfo *WXUNUSED(propInfo) ) - {} - - // will be called before this delegate gets written - virtual bool BeforeWriteDelegate( wxObjectWriter *WXUNUSED(writer), - const wxObject *WXUNUSED(object), - const wxClassInfo* WXUNUSED(classInfo), - const wxPropertyInfo *WXUNUSED(propInfo), - const wxObject *&WXUNUSED(eventSink), - const wxHandlerInfo* &WXUNUSED(handlerInfo) ) - { return true; } - - virtual void AfterWriteDelegate( wxObjectWriter *WXUNUSED(writer), - const wxObject *WXUNUSED(object), - const wxClassInfo* WXUNUSED(classInfo), - const wxPropertyInfo *WXUNUSED(propInfo), - const wxObject *&WXUNUSED(eventSink), - const wxHandlerInfo* &WXUNUSED(handlerInfo) ) - { } -}; - -class WXDLLIMPEXP_BASE wxObjectWriterFunctor: public wxObjectFunctor -{ -}; - -class WXDLLIMPEXP_BASE wxObjectWriter: public wxObject -{ - friend class wxObjectWriterFunctor; -public: - wxObjectWriter(); - virtual ~wxObjectWriter(); - - // with this call you start writing out a new top-level object - void WriteObject(const wxObject *object, const wxClassInfo *classInfo, - wxObjectWriterCallback *writercallback, const wxString &name, - const wxStringToAnyHashMap &metadata); - - // Managing the object identity table a.k.a context - // - // these methods make sure that no object gets written twice, - // because sometimes multiple calls to the WriteObject will be - // made without wanting to have duplicate objects written, the - // object identity table will be reset manually - virtual void ClearObjectContext(); - - // gets the object Id for a passed in object in the context - int GetObjectID(const wxObject *obj); - - // returns true if this object has already been written in this context - bool IsObjectKnown( const wxObject *obj ); - - // - // streaming callbacks - // - // these callbacks really write out the values in the stream format - - // begins writing out a new toplevel entry which has the indicated unique name - virtual void DoBeginWriteTopLevelEntry( const wxString &name ) = 0; - - // ends writing out a new toplevel entry which has the indicated unique name - virtual void DoEndWriteTopLevelEntry( const wxString &name ) = 0; - - // start of writing an object having the passed in ID - virtual void DoBeginWriteObject(const wxObject *object, const wxClassInfo *classInfo, - int objectID, const wxStringToAnyHashMap &metadata ) = 0; - - // end of writing an toplevel object name param is used for unique - // identification within the container - virtual void DoEndWriteObject(const wxObject *object, - const wxClassInfo *classInfo, int objectID ) = 0; - - // writes a simple property in the stream format - virtual void DoWriteSimpleType( const wxAny &value ) = 0; - - // start of writing a complex property into the stream ( - virtual void DoBeginWriteProperty( const wxPropertyInfo *propInfo ) = 0; - - // end of writing a complex property into the stream - virtual void DoEndWriteProperty( const wxPropertyInfo *propInfo ) = 0; - - virtual void DoBeginWriteElement() = 0; - virtual void DoEndWriteElement() = 0; - // insert an object reference to an already written object - virtual void DoWriteRepeatedObject( int objectID ) = 0; - - // insert a null reference - virtual void DoWriteNullObject() = 0; - - // writes a delegate in the stream format - virtual void DoWriteDelegate( const wxObject *object, const wxClassInfo* classInfo, - const wxPropertyInfo *propInfo, const wxObject *eventSink, - int sinkObjectID, const wxClassInfo* eventSinkClassInfo, - const wxHandlerInfo* handlerIndo ) = 0; - - void WriteObject(const wxObject *object, const wxClassInfo *classInfo, - wxObjectWriterCallback *writercallback, bool isEmbedded, const wxStringToAnyHashMap &metadata ); - -protected: - struct wxObjectWriterInternal; - wxObjectWriterInternal* m_data; - - struct wxObjectWriterInternalPropertiesData; - - void WriteAllProperties( const wxObject * obj, const wxClassInfo* ci, - wxObjectWriterCallback *writercallback, - wxObjectWriterInternalPropertiesData * data ); - - void WriteOneProperty( const wxObject *obj, const wxClassInfo* ci, - const wxPropertyInfo* pi, wxObjectWriterCallback *writercallback, - wxObjectWriterInternalPropertiesData *data ); - - - void FindConnectEntry(const wxEvtHandler * evSource, - const wxEventSourceTypeInfo* dti, const wxObject* &sink, - const wxHandlerInfo *&handler); -}; - - -/* -Streaming callbacks for depersisting XML to code, or running objects -*/ - -class WXDLLIMPEXP_BASE wxObjectReaderCallback; - -/* -wxObjectReader handles streaming in a class from a arbitrary format. -While walking through it issues calls out to interfaces to readercallback -the guts from the underlying storage format. -*/ - -class WXDLLIMPEXP_BASE wxObjectReader: public wxObject -{ -public: - wxObjectReader(); - virtual ~wxObjectReader(); - - // the only thing wxObjectReader knows about is the class info by object ID - wxClassInfo *GetObjectClassInfo(int objectID); - bool HasObjectClassInfo( int objectID ); - void SetObjectClassInfo(int objectID, wxClassInfo* classInfo); - - // Reads the component the reader is pointed at from the underlying format. - // The return value is the root object ID, which can - // then be used to ask the depersister about that object - // if there was a problem you will get back wxInvalidObjectID and the current - // error log will carry the problems encoutered - virtual int ReadObject( const wxString &name, wxObjectReaderCallback *readercallback ) = 0; - -private: - struct wxObjectReaderInternal; - wxObjectReaderInternal *m_data; -}; - -// This abstract class matches the allocate-init/create model of creation of objects. -// At runtime, these will create actual instances, and manipulate them. -// When generating code, these will just create statements of C++ -// code to create the objects. - -class WXDLLIMPEXP_BASE wxObjectReaderCallback -{ -public: - virtual ~wxObjectReaderCallback() {} - - // allocate the new object on the heap, that object will have the passed in ID - virtual void AllocateObject(int objectID, wxClassInfo *classInfo, - wxStringToAnyHashMap &metadata) = 0; - - // initialize the already allocated object having the ID objectID with the Create method - // creation parameters which are objects are having their Ids passed in objectIDValues - // having objectId <> wxInvalidObjectID - - virtual void CreateObject(int objectID, - const wxClassInfo *classInfo, - int paramCount, - wxAny *VariantValues, - int *objectIDValues, - const wxClassInfo **objectClassInfos, - wxStringToAnyHashMap &metadata) = 0; - - // construct the new object on the heap, that object will have the passed in ID - // (for objects that don't support allocate-create type of creation) - // creation parameters which are objects are having their Ids passed in - // objectIDValues having objectId <> wxInvalidObjectID - - virtual void ConstructObject(int objectID, - const wxClassInfo *classInfo, - int paramCount, - wxAny *VariantValues, - int *objectIDValues, - const wxClassInfo **objectClassInfos, - wxStringToAnyHashMap &metadata) = 0; - - // destroy the heap-allocated object having the ID objectID, this may be used - // if an object is embedded in another object and set via value semantics, - // so the intermediate object can be destroyed after safely - virtual void DestroyObject(int objectID, wxClassInfo *classInfo) = 0; - - // set the corresponding property - virtual void SetProperty(int objectID, - const wxClassInfo *classInfo, - const wxPropertyInfo* propertyInfo, - const wxAny &VariantValue) = 0; - - // sets the corresponding property (value is an object) - virtual void SetPropertyAsObject(int objectID, - const wxClassInfo *classInfo, - const wxPropertyInfo* propertyInfo, - int valueObjectId) = 0; - - // adds an element to a property collection - virtual void AddToPropertyCollection( int objectID, - const wxClassInfo *classInfo, - const wxPropertyInfo* propertyInfo, - const wxAny &VariantValue) = 0; - - // sets the corresponding property (value is an object) - virtual void AddToPropertyCollectionAsObject(int objectID, - const wxClassInfo *classInfo, - const wxPropertyInfo* propertyInfo, - int valueObjectId) = 0; - - // sets the corresponding event handler - virtual void SetConnect(int EventSourceObjectID, - const wxClassInfo *EventSourceClassInfo, - const wxPropertyInfo *delegateInfo, - const wxClassInfo *EventSinkClassInfo, - const wxHandlerInfo* handlerInfo, - int EventSinkObjectID ) = 0; -}; - -/* -wxObjectRuntimeReaderCallback implements the callbacks that will bring back -an object into a life memory instance -*/ - -class WXDLLIMPEXP_BASE wxObjectRuntimeReaderCallback: public wxObjectReaderCallback -{ - struct wxObjectRuntimeReaderCallbackInternal; - wxObjectRuntimeReaderCallbackInternal * m_data; - -public: - wxObjectRuntimeReaderCallback(); - virtual ~wxObjectRuntimeReaderCallback(); - - // returns the object having the corresponding ID fully constructed - wxObject *GetObject(int objectID); - - // allocate the new object on the heap, that object will have the passed in ID - virtual void AllocateObject(int objectID, wxClassInfo *classInfo, - wxStringToAnyHashMap &metadata); - - // initialize the already allocated object having the ID objectID with - // the Create method creation parameters which are objects are having - // their Ids passed in objectIDValues having objectId <> wxInvalidObjectID - - virtual void CreateObject(int objectID, - const wxClassInfo *classInfo, - int paramCount, - wxAny *VariantValues, - int *objectIDValues, - const wxClassInfo **objectClassInfos, - wxStringToAnyHashMap &metadata - ); - - // construct the new object on the heap, that object will have the - // passed in ID (for objects that don't support allocate-create type of - // creation) creation parameters which are objects are having their Ids - // passed in objectIDValues having objectId <> wxInvalidObjectID - - virtual void ConstructObject(int objectID, - const wxClassInfo *classInfo, - int paramCount, - wxAny *VariantValues, - int *objectIDValues, - const wxClassInfo **objectClassInfos, - wxStringToAnyHashMap &metadata); - - // destroy the heap-allocated object having the ID objectID, this may be - // used if an object is embedded in another object and set via value semantics, - // so the intermediate object can be destroyed after safely - virtual void DestroyObject(int objectID, wxClassInfo *classInfo); - - // set the corresponding property - virtual void SetProperty(int objectID, - const wxClassInfo *classInfo, - const wxPropertyInfo* propertyInfo, - const wxAny &variantValue); - - // sets the corresponding property (value is an object) - virtual void SetPropertyAsObject(int objectId, - const wxClassInfo *classInfo, - const wxPropertyInfo* propertyInfo, - int valueObjectId); - - // adds an element to a property collection - virtual void AddToPropertyCollection( int objectID, - const wxClassInfo *classInfo, - const wxPropertyInfo* propertyInfo, - const wxAny &VariantValue); - - // sets the corresponding property (value is an object) - virtual void AddToPropertyCollectionAsObject(int objectID, - const wxClassInfo *classInfo, - const wxPropertyInfo* propertyInfo, - int valueObjectId); - - // sets the corresponding event handler - virtual void SetConnect(int eventSourceObjectID, - const wxClassInfo *eventSourceClassInfo, - const wxPropertyInfo *delegateInfo, - const wxClassInfo *eventSinkClassInfo, - const wxHandlerInfo* handlerInfo, - int eventSinkObjectID ); -}; - -#endif // wxUSE_EXTENDED_RTTI - -#endif diff --git a/Externals/wxWidgets3/include/wx/xtitypes.h b/Externals/wxWidgets3/include/wx/xtitypes.h deleted file mode 100644 index afd5c07b45..0000000000 --- a/Externals/wxWidgets3/include/wx/xtitypes.h +++ /dev/null @@ -1,532 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/xtitypes.h -// Purpose: enum, set, basic types support -// Author: Stefan Csomor -// Modified by: Francesco Montorsi -// Created: 27/07/03 -// Copyright: (c) 1997 Julian Smart -// (c) 2003 Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _XTITYPES_H_ -#define _XTITYPES_H_ - -#include "wx/defs.h" - -#if wxUSE_EXTENDED_RTTI - -#include "wx/string.h" -#include "wx/hashmap.h" -#include "wx/arrstr.h" -#include "wx/flags.h" -#include "wx/intl.h" -#include "wx/log.h" -#include - -class WXDLLIMPEXP_BASE wxClassInfo; - -// ---------------------------------------------------------------------------- -// Enum Support -// -// In the header files XTI requires no change from pure c++ code, however in the -// implementation, an enum needs to be enumerated eg: -// -// wxBEGIN_ENUM( wxFlavor ) -// wxENUM_MEMBER( Vanilla ) -// wxENUM_MEMBER( Chocolate ) -// wxENUM_MEMBER( Strawberry ) -// wxEND_ENUM( wxFlavor ) -// ---------------------------------------------------------------------------- - -struct WXDLLIMPEXP_BASE wxEnumMemberData -{ - const wxChar* m_name; - int m_value; -}; - -class WXDLLIMPEXP_BASE wxEnumData -{ -public: - wxEnumData( wxEnumMemberData* data ); - - // returns true if the member has been found and sets the int value - // pointed to accordingly (if ptr != null ) - // if not found returns false, value left unchanged - bool HasEnumMemberValue( const wxChar *name, int *value = NULL ) const; - - // returns the value of the member, if not found in debug mode an - // assert is issued, in release 0 is returned - int GetEnumMemberValue(const wxChar *name ) const; - - // returns the name of the enum member having the passed in value - // returns an emtpy string if not found - const wxChar *GetEnumMemberName(int value) const; - - // returns the number of members in this enum - int GetEnumCount() const { return m_count; } - - // returns the value of the nth member - int GetEnumMemberValueByIndex( int n ) const; - - // returns the value of the nth member - const wxChar *GetEnumMemberNameByIndex( int n ) const; - -private: - wxEnumMemberData *m_members; - int m_count; -}; - -#define wxBEGIN_ENUM( e ) \ - wxEnumMemberData s_enumDataMembers##e[] = { - -#define wxENUM_MEMBER( v ) { wxT(#v), v }, - -#define wxEND_ENUM( e ) \ - { NULL, 0 } }; \ - wxEnumData s_enumData##e( s_enumDataMembers##e ); \ - wxEnumData *wxGetEnumData(e) { return &s_enumData##e; } \ - template<> void wxStringReadValue(const wxString& s, e &data ) \ - { data = (e) s_enumData##e.GetEnumMemberValue(s.c_str()); } \ - template<> void wxStringWriteValue(wxString &s, const e &data ) \ - { s = s_enumData##e.GetEnumMemberName((int)data); } \ - void FromLong##e( long data, wxAny& result ) \ - { result = wxAny((e)data); } \ - void ToLong##e( const wxAny& data, long &result ) \ - { result = (long) (data).As(static_cast(NULL)); } \ - \ - wxTO_STRING_IMP( e ) \ - wxFROM_STRING_IMP( e ) \ - wxEnumTypeInfo s_typeInfo##e(wxT_ENUM, &s_enumData##e, \ - &wxTO_STRING( e ), &wxFROM_STRING( e ), &ToLong##e, \ - &FromLong##e, typeid(e).name() ); - - -// ---------------------------------------------------------------------------- -// Set Support -// -// in the header : -// -// enum wxFlavor -// { -// Vanilla, -// Chocolate, -// Strawberry, -// }; -// -// typedef wxBitset wxCoupe; -// -// in the implementation file : -// -// wxBEGIN_ENUM( wxFlavor ) -// wxENUM_MEMBER( Vanilla ) -// wxENUM_MEMBER( Chocolate ) -// wxENUM_MEMBER( Strawberry ) -// wxEND_ENUM( wxFlavor ) -// -// wxIMPLEMENT_SET_STREAMING( wxCoupe, wxFlavor ) -// -// implementation note: no partial specialization for streaming, but a delegation -// to a different class -// -// ---------------------------------------------------------------------------- - -void WXDLLIMPEXP_BASE wxSetStringToArray( const wxString &s, wxArrayString &array ); - -template -void wxSetFromString(const wxString &s, wxBitset &data ) -{ - wxEnumData* edata = wxGetEnumData((e) 0); - data.reset(); - - wxArrayString array; - wxSetStringToArray( s, array ); - wxString flag; - for ( int i = 0; i < array.Count(); ++i ) - { - flag = array[i]; - int ivalue; - if ( edata->HasEnumMemberValue( flag.c_str(), &ivalue ) ) - { - data.set( (e) ivalue ); - } - } -} - -template -void wxSetToString( wxString &s, const wxBitset &data ) -{ - wxEnumData* edata = wxGetEnumData((e) 0); - int count = edata->GetEnumCount(); - int i; - s.Clear(); - for ( i = 0; i < count; i++ ) - { - e value = (e) edata->GetEnumMemberValueByIndex(i); - if ( data.test( value ) ) - { - // this could also be done by the templated calls - if ( !s.empty() ) - s += wxT("|"); - s += edata->GetEnumMemberNameByIndex(i); - } - } -} - -#define wxIMPLEMENT_SET_STREAMING(SetName,e) \ - template<> void wxStringReadValue(const wxString &s, wxBitset &data ) \ - { wxSetFromString( s, data ); } \ - template<> void wxStringWriteValue( wxString &s, const wxBitset &data ) \ - { wxSetToString( s, data ); } \ - void FromLong##SetName( long data, wxAny& result ) \ - { result = wxAny(SetName((unsigned long)data)); } \ - void ToLong##SetName( const wxAny& data, long &result ) \ - { result = (long) (data).As(static_cast(NULL)).to_ulong(); } \ - wxTO_STRING_IMP( SetName ) \ - wxFROM_STRING_IMP( SetName ) \ - wxEnumTypeInfo s_typeInfo##SetName(wxT_SET, &s_enumData##e, \ - &wxTO_STRING( SetName ), &wxFROM_STRING( SetName ), \ - &ToLong##SetName, &FromLong##SetName, typeid(SetName).name() ); - -template -void wxFlagsFromString(const wxString &s, e &data ) -{ - wxEnumData* edata = wxGetEnumData((e*) 0); - data.m_data = 0; - - wxArrayString array; - wxSetStringToArray( s, array ); - wxString flag; - for ( size_t i = 0; i < array.Count(); ++i ) - { - flag = array[i]; - int ivalue; - if ( edata->HasEnumMemberValue( flag.c_str(), &ivalue ) ) - { - data.m_data |= ivalue; - } - } -} - -template -void wxFlagsToString( wxString &s, const e& data ) -{ - wxEnumData* edata = wxGetEnumData((e*) 0); - int count = edata->GetEnumCount(); - int i; - s.Clear(); - long dataValue = data.m_data; - for ( i = 0; i < count; i++ ) - { - int value = edata->GetEnumMemberValueByIndex(i); - // make this to allow for multi-bit constants to work - if ( value && ( dataValue & value ) == value ) - { - // clear the flags we just set - dataValue &= ~value; - // this could also be done by the templated calls - if ( !s.empty() ) - s +=wxT("|"); - s += edata->GetEnumMemberNameByIndex(i); - } - } -} - -#define wxBEGIN_FLAGS( e ) \ - wxEnumMemberData s_enumDataMembers##e[] = { - -#define wxFLAGS_MEMBER( v ) { wxT(#v), static_cast(v) }, - -#define wxEND_FLAGS( e ) \ - { NULL, 0 } }; \ - wxEnumData s_enumData##e( s_enumDataMembers##e ); \ - wxEnumData *wxGetEnumData(e*) { return &s_enumData##e; } \ - template<> void wxStringReadValue(const wxString &s, e &data ) \ - { wxFlagsFromString( s, data ); } \ - template<> void wxStringWriteValue( wxString &s, const e& data ) \ - { wxFlagsToString( s, data ); } \ - void FromLong##e( long data, wxAny& result ) \ - { result = wxAny(e(data)); } \ - void ToLong##e( const wxAny& data, long &result ) \ - { result = (long) (data).As(static_cast(NULL)).m_data; } \ - wxTO_STRING_IMP( e ) \ - wxFROM_STRING_IMP( e ) \ - wxEnumTypeInfo s_typeInfo##e(wxT_SET, &s_enumData##e, \ - &wxTO_STRING( e ), &wxFROM_STRING( e ), &ToLong##e, \ - &FromLong##e, typeid(e).name() ); - -// ---------------------------------------------------------------------------- -// Type Information -// ---------------------------------------------------------------------------- - -// All data exposed by the RTTI is characterized using the following classes. -// The first characterization is done by wxTypeKind. All enums up to and including -// wxT_CUSTOM represent so called simple types. These cannot be divided any further. -// They can be converted to and from wxStrings, that's all. -// Other wxTypeKinds can instead be splitted recursively into smaller parts until -// the simple types are reached. - -enum wxTypeKind -{ - wxT_VOID = 0, // unknown type - wxT_BOOL, - wxT_CHAR, - wxT_UCHAR, - wxT_INT, - wxT_UINT, - wxT_LONG, - wxT_ULONG, - wxT_LONGLONG, - wxT_ULONGLONG, - wxT_FLOAT, - wxT_DOUBLE, - wxT_STRING, // must be wxString - wxT_SET, // must be wxBitset<> template - wxT_ENUM, - wxT_CUSTOM, // user defined type (e.g. wxPoint) - - wxT_LAST_SIMPLE_TYPE_KIND = wxT_CUSTOM, - - wxT_OBJECT_PTR, // object reference - wxT_OBJECT, // embedded object - wxT_COLLECTION, // collection - - wxT_DELEGATE, // for connecting against an event source - - wxT_LAST_TYPE_KIND = wxT_DELEGATE // sentinel for bad data, asserts, debugging -}; - -class WXDLLIMPEXP_BASE wxAny; -class WXDLLIMPEXP_BASE wxTypeInfo; - -WX_DECLARE_STRING_HASH_MAP_WITH_DECL( wxTypeInfo*, wxTypeInfoMap, class WXDLLIMPEXP_BASE ); - -class WXDLLIMPEXP_BASE wxTypeInfo -{ -public: - typedef void (*wxVariant2StringFnc)( const wxAny& data, wxString &result ); - typedef void (*wxString2VariantFnc)( const wxString& data, wxAny &result ); - - wxTypeInfo(wxTypeKind kind, - wxVariant2StringFnc to = NULL, wxString2VariantFnc from = NULL, - const wxString &name = wxEmptyString): - m_toString(to), m_fromString(from), m_kind(kind), m_name(name) - { - Register(); - } -#if 0 // wxUSE_UNICODE - wxTypeInfo(wxTypeKind kind, - wxVariant2StringFnc to, wxString2VariantFnc from, - const char *name): - m_toString(to), m_fromString(from), m_kind(kind), - m_name(wxString::FromAscii(name)) - { - Register(); - } -#endif - - virtual ~wxTypeInfo() - { - Unregister(); - } - - // return the kind of this type (wxT_... constants) - wxTypeKind GetKind() const { return m_kind; } - - // returns the unique name of this type - const wxString& GetTypeName() const { return m_name; } - - // is this type a delegate type - bool IsDelegateType() const { return m_kind == wxT_DELEGATE; } - - // is this type a custom type - bool IsCustomType() const { return m_kind == wxT_CUSTOM; } - - // is this type an object type - bool IsObjectType() const { return m_kind == wxT_OBJECT || m_kind == wxT_OBJECT_PTR; } - - // can the content of this type be converted to and from strings ? - bool HasStringConverters() const { return m_toString != NULL && m_fromString != NULL; } - - // convert a wxAny holding data of this type into a string - void ConvertToString( const wxAny& data, wxString &result ) const - { - if ( m_toString ) - (*m_toString)( data, result ); - else - wxLogError( wxGetTranslation(wxT("String conversions not supported")) ); - } - - // convert a string into a wxAny holding the corresponding data in this type - void ConvertFromString( const wxString& data, wxAny &result ) const - { - if( m_fromString ) - (*m_fromString)( data, result ); - else - wxLogError( wxGetTranslation(wxT("String conversions not supported")) ); - } - - // statics: - - // looks for the corresponding type, will return NULL if not found - static wxTypeInfo *FindType( const wxString& typeName ); -private: - void Register(); - void Unregister(); - - wxVariant2StringFnc m_toString; - wxString2VariantFnc m_fromString; - - wxTypeKind m_kind; - wxString m_name; - - // the static list of all types we know about - static wxTypeInfoMap* ms_typeTable; -}; - -class WXDLLIMPEXP_BASE wxBuiltInTypeInfo : public wxTypeInfo -{ -public: - wxBuiltInTypeInfo( wxTypeKind kind, wxVariant2StringFnc to = NULL, - wxString2VariantFnc from = NULL, - const wxString &name = wxEmptyString ) : - wxTypeInfo( kind, to, from, name ) - { wxASSERT_MSG( GetKind() < wxT_SET, wxT("Illegal Kind for Base Type") ); } -}; - -class WXDLLIMPEXP_BASE wxCustomTypeInfo : public wxTypeInfo -{ -public: - wxCustomTypeInfo( const wxString &name, wxVariant2StringFnc to, - wxString2VariantFnc from ) : - wxTypeInfo( wxT_CUSTOM, to, from, name ) - {} -}; - -class WXDLLIMPEXP_BASE wxEnumTypeInfo : public wxTypeInfo -{ -public: - typedef void (*converterToLong_t)( const wxAny& data, long &result ); - typedef void (*converterFromLong_t)( long data, wxAny &result ); - - wxEnumTypeInfo( wxTypeKind kind, wxEnumData* enumInfo, wxVariant2StringFnc to, - wxString2VariantFnc from, converterToLong_t toLong, - converterFromLong_t fromLong, const wxString &name ) : - wxTypeInfo( kind, to, from, name ), m_toLong( toLong ), m_fromLong( fromLong ) - { - wxASSERT_MSG( kind == wxT_ENUM || kind == wxT_SET, - wxT("Illegal Kind for Enum Type")); - m_enumInfo = enumInfo; - } - - const wxEnumData* GetEnumData() const { return m_enumInfo; } - - // convert a wxAny holding data of this type into a long - void ConvertToLong( const wxAny& data, long &result ) const - { - if( m_toLong ) - (*m_toLong)( data, result ); - else - wxLogError( wxGetTranslation(wxT("Long Conversions not supported")) ); - } - - // convert a long into a wxAny holding the corresponding data in this type - void ConvertFromLong( long data, wxAny &result ) const - { - if( m_fromLong ) - (*m_fromLong)( data, result ); - else - wxLogError( wxGetTranslation(wxT("Long Conversions not supported")) ); - } - -private: - converterToLong_t m_toLong; - converterFromLong_t m_fromLong; - - wxEnumData *m_enumInfo; // Kind == wxT_ENUM or Kind == wxT_SET -}; - -class WXDLLIMPEXP_BASE wxClassTypeInfo : public wxTypeInfo -{ -public: - wxClassTypeInfo( wxTypeKind kind, wxClassInfo* classInfo, - wxVariant2StringFnc to = NULL, wxString2VariantFnc from = NULL, - const wxString &name = wxEmptyString); - - const wxClassInfo *GetClassInfo() const { return m_classInfo; } - -private: - wxClassInfo *m_classInfo; // Kind == wxT_OBJECT - could be NULL -}; - -class WXDLLIMPEXP_BASE wxCollectionTypeInfo : public wxTypeInfo -{ -public: - wxCollectionTypeInfo( const wxString &elementName, wxVariant2StringFnc to, - wxString2VariantFnc from , const wxString &name) : - wxTypeInfo( wxT_COLLECTION, to, from, name ) - { m_elementTypeName = elementName; m_elementType = NULL; } - - const wxTypeInfo* GetElementType() const - { - if ( m_elementType == NULL ) - m_elementType = wxTypeInfo::FindType( m_elementTypeName ); - return m_elementType; - } - -private: - mutable wxTypeInfo * m_elementType; - wxString m_elementTypeName; -}; - -class WXDLLIMPEXP_BASE wxEventSourceTypeInfo : public wxTypeInfo -{ -public: - wxEventSourceTypeInfo( int eventType, wxClassInfo* eventClass, - wxVariant2StringFnc to = NULL, - wxString2VariantFnc from = NULL ); - wxEventSourceTypeInfo( int eventType, int lastEventType, wxClassInfo* eventClass, - wxVariant2StringFnc to = NULL, wxString2VariantFnc from = NULL ); - - int GetEventType() const { return m_eventType; } - int GetLastEventType() const { return m_lastEventType; } - const wxClassInfo* GetEventClass() const { return m_eventClass; } - -private: - const wxClassInfo *m_eventClass; // (extended will merge into classinfo) - int m_eventType; - int m_lastEventType; -}; - -template const wxTypeInfo* wxGetTypeInfo( T * ) - { return wxTypeInfo::FindType(typeid(T).name()); } - -// this macro is for usage with custom, non-object derived classes and structs, -// wxPoint is such a custom type - -#if wxUSE_FUNC_TEMPLATE_POINTER - #define wxCUSTOM_TYPE_INFO( e, toString, fromString ) \ - wxCustomTypeInfo s_typeInfo##e(typeid(e).name(), &toString, &fromString); -#else - #define wxCUSTOM_TYPE_INFO( e, toString, fromString ) \ - void ToString##e( const wxAny& data, wxString &result ) \ - { toString(data, result); } \ - void FromString##e( const wxString& data, wxAny &result ) \ - { fromString(data, result); } \ - wxCustomTypeInfo s_typeInfo##e(typeid(e).name(), \ - &ToString##e, &FromString##e); -#endif - -#define wxCOLLECTION_TYPE_INFO( element, collection ) \ - wxCollectionTypeInfo s_typeInfo##collection( typeid(element).name(), \ - NULL, NULL, typeid(collection).name() ); - -// sometimes a compiler invents specializations that are nowhere called, -// use this macro to satisfy the refs, currently we don't have to play -// tricks, but if we will have to according to the compiler, we will use -// that macro for that - -#define wxILLEGAL_TYPE_SPECIALIZATION( a ) - -#endif // wxUSE_EXTENDED_RTTI -#endif // _XTITYPES_H_ diff --git a/Externals/wxWidgets3/include/wx/xtixml.h b/Externals/wxWidgets3/include/wx/xtixml.h deleted file mode 100644 index 100e0653e1..0000000000 --- a/Externals/wxWidgets3/include/wx/xtixml.h +++ /dev/null @@ -1,119 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/xtixml.h -// Purpose: xml streaming runtime metadata information (extended class info) -// Author: Stefan Csomor -// Modified by: -// Created: 27/07/03 -// Copyright: (c) 2003 Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_XTIXMLH__ -#define _WX_XTIXMLH__ - -#include "wx/defs.h" - -#if wxUSE_EXTENDED_RTTI - -#include "wx/string.h" -#include "wx/xtistrm.h" - -/* -class WXDLLIMPEXP_XML wxXmlNode; -class WXDLLIMPEXP_BASE wxPropertyInfo; -class WXDLLIMPEXP_BASE wxObject; -class WXDLLIMPEXP_BASE wxClassInfo; -class WXDLLIMPEXP_BASE wxAnyList; -class WXDLLIMPEXP_BASE wxHandlerInfo; -class WXDLLIMPEXP_BASE wxObjectWriterCallback; -*/ - -class WXDLLIMPEXP_XML wxObjectXmlWriter: public wxObjectWriter -{ -public: - - wxObjectXmlWriter( wxXmlNode * parent ); - virtual ~wxObjectXmlWriter(); - - // - // streaming callbacks - // - // these callbacks really write out the values in the stream format - // - - // - // streaming callbacks - // - // these callbacks really write out the values in the stream format - - // begins writing out a new toplevel entry which has the indicated unique name - virtual void DoBeginWriteTopLevelEntry( const wxString &name ); - - // ends writing out a new toplevel entry which has the indicated unique name - virtual void DoEndWriteTopLevelEntry( const wxString &name ); - - // start of writing an object having the passed in ID - virtual void DoBeginWriteObject(const wxObject *object, - const wxClassInfo *classInfo, int objectID, const wxStringToAnyHashMap &metadata ); - - // end of writing an toplevel object name param is used for unique - // identification within the container - virtual void DoEndWriteObject(const wxObject *object, - const wxClassInfo *classInfo, int objectID ); - - // writes a simple property in the stream format - virtual void DoWriteSimpleType( const wxAny &value ); - - // start of writing a complex property into the stream ( - virtual void DoBeginWriteProperty( const wxPropertyInfo *propInfo ); - - // end of writing a complex property into the stream - virtual void DoEndWriteProperty( const wxPropertyInfo *propInfo ); - - virtual void DoBeginWriteElement(); - virtual void DoEndWriteElement(); - - // insert an object reference to an already written object - virtual void DoWriteRepeatedObject( int objectID ); - - // insert a null reference - virtual void DoWriteNullObject(); - - // writes a delegate in the stream format - virtual void DoWriteDelegate( const wxObject *object, - const wxClassInfo* classInfo, const wxPropertyInfo *propInfo, - const wxObject *eventSink, int sinkObjectID, - const wxClassInfo* eventSinkClassInfo, const wxHandlerInfo* handlerIndo ); - -private: - struct wxObjectXmlWriterInternal; - wxObjectXmlWriterInternal* m_data; -}; - -/* -wxObjectXmlReader handles streaming in a class from XML -*/ - -class WXDLLIMPEXP_XML wxObjectXmlReader: public wxObjectReader -{ -public: - wxObjectXmlReader(wxXmlNode *parent) { m_parent = parent; } - virtual ~wxObjectXmlReader() {} - - // Reads a component from XML. The return value is the root object ID, which can - // then be used to ask the readercallback about that object - - virtual int ReadObject( const wxString &name, wxObjectReaderCallback *readercallback ); - -private: - int ReadComponent(wxXmlNode *parent, wxObjectReaderCallback *callbacks); - - // read the content of this node (simple type) and return the corresponding value - wxAny ReadValue(wxXmlNode *Node, const wxTypeInfo *type ); - - wxXmlNode * m_parent; -}; - -#endif // wxUSE_EXTENDED_RTTI - -#endif diff --git a/Externals/wxWidgets3/include/wx/zipstrm.h b/Externals/wxWidgets3/include/wx/zipstrm.h deleted file mode 100644 index 4866535bef..0000000000 --- a/Externals/wxWidgets3/include/wx/zipstrm.h +++ /dev/null @@ -1,560 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/zipstrm.h -// Purpose: Streams for Zip files -// Author: Mike Wetherell -// Copyright: (c) Mike Wetherell -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_WXZIPSTREAM_H__ -#define _WX_WXZIPSTREAM_H__ - -#include "wx/defs.h" - -#if wxUSE_ZIPSTREAM - -#include "wx/archive.h" -#include "wx/filename.h" - -// some methods from wxZipInputStream and wxZipOutputStream stream do not get -// exported/imported when compiled with Mingw versions before 3.4.2. So they -// are imported/exported individually as a workaround -#if (defined(__GNUWIN32__) || defined(__MINGW32__)) \ - && (!defined __GNUC__ \ - || !defined __GNUC_MINOR__ \ - || !defined __GNUC_PATCHLEVEL__ \ - || __GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ < 30402) -#define WXZIPFIX WXDLLIMPEXP_BASE -#else -#define WXZIPFIX -#endif - -///////////////////////////////////////////////////////////////////////////// -// constants - -// Compression Method, only 0 (store) and 8 (deflate) are supported here -// -enum wxZipMethod -{ - wxZIP_METHOD_STORE, - wxZIP_METHOD_SHRINK, - wxZIP_METHOD_REDUCE1, - wxZIP_METHOD_REDUCE2, - wxZIP_METHOD_REDUCE3, - wxZIP_METHOD_REDUCE4, - wxZIP_METHOD_IMPLODE, - wxZIP_METHOD_TOKENIZE, - wxZIP_METHOD_DEFLATE, - wxZIP_METHOD_DEFLATE64, - wxZIP_METHOD_BZIP2 = 12, - wxZIP_METHOD_DEFAULT = 0xffff -}; - -// Originating File-System. -// -// These are Pkware's values. Note that Info-zip disagree on some of them, -// most notably NTFS. -// -enum wxZipSystem -{ - wxZIP_SYSTEM_MSDOS, - wxZIP_SYSTEM_AMIGA, - wxZIP_SYSTEM_OPENVMS, - wxZIP_SYSTEM_UNIX, - wxZIP_SYSTEM_VM_CMS, - wxZIP_SYSTEM_ATARI_ST, - wxZIP_SYSTEM_OS2_HPFS, - wxZIP_SYSTEM_MACINTOSH, - wxZIP_SYSTEM_Z_SYSTEM, - wxZIP_SYSTEM_CPM, - wxZIP_SYSTEM_WINDOWS_NTFS, - wxZIP_SYSTEM_MVS, - wxZIP_SYSTEM_VSE, - wxZIP_SYSTEM_ACORN_RISC, - wxZIP_SYSTEM_VFAT, - wxZIP_SYSTEM_ALTERNATE_MVS, - wxZIP_SYSTEM_BEOS, - wxZIP_SYSTEM_TANDEM, - wxZIP_SYSTEM_OS_400 -}; - -// Dos/Win file attributes -// -enum wxZipAttributes -{ - wxZIP_A_RDONLY = 0x01, - wxZIP_A_HIDDEN = 0x02, - wxZIP_A_SYSTEM = 0x04, - wxZIP_A_SUBDIR = 0x10, - wxZIP_A_ARCH = 0x20, - - wxZIP_A_MASK = 0x37 -}; - -// Values for the flags field in the zip headers -// -enum wxZipFlags -{ - wxZIP_ENCRYPTED = 0x0001, - wxZIP_DEFLATE_NORMAL = 0x0000, // normal compression - wxZIP_DEFLATE_EXTRA = 0x0002, // extra compression - wxZIP_DEFLATE_FAST = 0x0004, // fast compression - wxZIP_DEFLATE_SUPERFAST = 0x0006, // superfast compression - wxZIP_DEFLATE_MASK = 0x0006, - wxZIP_SUMS_FOLLOW = 0x0008, // crc and sizes come after the data - wxZIP_ENHANCED = 0x0010, - wxZIP_PATCH = 0x0020, - wxZIP_STRONG_ENC = 0x0040, - wxZIP_LANG_ENC_UTF8 = 0x0800, // filename and comment are UTF8 - wxZIP_UNUSED = 0x0F80, - wxZIP_RESERVED = 0xF000 -}; - -// Forward decls -// -class WXDLLIMPEXP_FWD_BASE wxZipEntry; -class WXDLLIMPEXP_FWD_BASE wxZipInputStream; - - -///////////////////////////////////////////////////////////////////////////// -// wxZipNotifier - -class WXDLLIMPEXP_BASE wxZipNotifier -{ -public: - virtual ~wxZipNotifier() { } - - virtual void OnEntryUpdated(wxZipEntry& entry) = 0; -}; - - -///////////////////////////////////////////////////////////////////////////// -// Zip Entry - holds the meta data for a file in the zip - -class WXDLLIMPEXP_BASE wxZipEntry : public wxArchiveEntry -{ -public: - wxZipEntry(const wxString& name = wxEmptyString, - const wxDateTime& dt = wxDateTime::Now(), - wxFileOffset size = wxInvalidOffset); - virtual ~wxZipEntry(); - - wxZipEntry(const wxZipEntry& entry); - wxZipEntry& operator=(const wxZipEntry& entry); - - // Get accessors - wxDateTime GetDateTime() const wxOVERRIDE { return m_DateTime; } - wxFileOffset GetSize() const wxOVERRIDE { return m_Size; } - wxFileOffset GetOffset() const wxOVERRIDE { return m_Offset; } - wxString GetInternalName() const wxOVERRIDE { return m_Name; } - int GetMethod() const { return m_Method; } - int GetFlags() const { return m_Flags; } - wxUint32 GetCrc() const { return m_Crc; } - wxFileOffset GetCompressedSize() const { return m_CompressedSize; } - int GetSystemMadeBy() const { return m_SystemMadeBy; } - wxString GetComment() const { return m_Comment; } - wxUint32 GetExternalAttributes() const { return m_ExternalAttributes; } - wxPathFormat GetInternalFormat() const wxOVERRIDE { return wxPATH_UNIX; } - int GetMode() const; - const char *GetLocalExtra() const; - size_t GetLocalExtraLen() const; - const char *GetExtra() const; - size_t GetExtraLen() const; - wxString GetName(wxPathFormat format = wxPATH_NATIVE) const wxOVERRIDE; - - // is accessors - inline bool IsDir() const wxOVERRIDE; - inline bool IsText() const; - inline bool IsReadOnly() const wxOVERRIDE; - inline bool IsMadeByUnix() const; - - // set accessors - void SetDateTime(const wxDateTime& dt) wxOVERRIDE { m_DateTime = dt; } - void SetSize(wxFileOffset size) wxOVERRIDE { m_Size = size; } - void SetMethod(int method) { m_Method = (wxUint16)method; } - void SetComment(const wxString& comment) { m_Comment = comment; } - void SetExternalAttributes(wxUint32 attr ) { m_ExternalAttributes = attr; } - void SetSystemMadeBy(int system); - void SetMode(int mode); - void SetExtra(const char *extra, size_t len); - void SetLocalExtra(const char *extra, size_t len); - - inline void SetName(const wxString& name, - wxPathFormat format = wxPATH_NATIVE) wxOVERRIDE; - - static wxString GetInternalName(const wxString& name, - wxPathFormat format = wxPATH_NATIVE, - bool *pIsDir = NULL); - - // set is accessors - void SetIsDir(bool isDir = true) wxOVERRIDE; - inline void SetIsReadOnly(bool isReadOnly = true) wxOVERRIDE; - inline void SetIsText(bool isText = true); - - wxZipEntry *Clone() const { return ZipClone(); } - - void SetNotifier(wxZipNotifier& notifier); - void UnsetNotifier() wxOVERRIDE; - -protected: - // Internal attributes - enum { TEXT_ATTR = 1 }; - - // protected Get accessors - int GetVersionNeeded() const { return m_VersionNeeded; } - wxFileOffset GetKey() const { return m_Key; } - int GetVersionMadeBy() const { return m_VersionMadeBy; } - int GetDiskStart() const { return m_DiskStart; } - int GetInternalAttributes() const { return m_InternalAttributes; } - - void SetVersionNeeded(int version) { m_VersionNeeded = (wxUint16)version; } - void SetOffset(wxFileOffset offset) wxOVERRIDE { m_Offset = offset; } - void SetFlags(int flags) { m_Flags = (wxUint16)flags; } - void SetVersionMadeBy(int version) { m_VersionMadeBy = (wxUint8)version; } - void SetCrc(wxUint32 crc) { m_Crc = crc; } - void SetCompressedSize(wxFileOffset size) { m_CompressedSize = size; } - void SetKey(wxFileOffset offset) { m_Key = offset; } - void SetDiskStart(int start) { m_DiskStart = (wxUint16)start; } - void SetInternalAttributes(int attr) { m_InternalAttributes = (wxUint16)attr; } - - virtual wxZipEntry *ZipClone() const { return new wxZipEntry(*this); } - - void Notify(); - -private: - wxArchiveEntry* DoClone() const wxOVERRIDE { return ZipClone(); } - - size_t ReadLocal(wxInputStream& stream, wxMBConv& conv); - size_t WriteLocal(wxOutputStream& stream, wxMBConv& conv) const; - - size_t ReadCentral(wxInputStream& stream, wxMBConv& conv); - size_t WriteCentral(wxOutputStream& stream, wxMBConv& conv) const; - - size_t ReadDescriptor(wxInputStream& stream); - size_t WriteDescriptor(wxOutputStream& stream, wxUint32 crc, - wxFileOffset compressedSize, wxFileOffset size); - - bool LoadExtraInfo(const char* extraData, wxUint16 extraLen, bool localInfo); - - wxUint8 m_SystemMadeBy; // one of enum wxZipSystem - wxUint8 m_VersionMadeBy; // major * 10 + minor - - wxUint16 m_VersionNeeded; // ver needed to extract (20 i.e. v2.0) - wxUint16 m_Flags; - wxUint16 m_Method; // compression method (one of wxZipMethod) - wxDateTime m_DateTime; - wxUint32 m_Crc; - wxFileOffset m_CompressedSize; - wxFileOffset m_Size; - wxString m_Name; // in internal format - wxFileOffset m_Key; // the original offset for copied entries - wxFileOffset m_Offset; // file offset of the entry - - wxString m_Comment; - wxUint16 m_DiskStart; // for multidisk archives, not unsupported - wxUint16 m_InternalAttributes; // bit 0 set for text files - wxUint32 m_ExternalAttributes; // system specific depends on SystemMadeBy - - class wxZipMemory *m_Extra; - class wxZipMemory *m_LocalExtra; - - wxZipNotifier *m_zipnotifier; - class wxZipWeakLinks *m_backlink; - - friend class wxZipInputStream; - friend class wxZipOutputStream; - - wxDECLARE_DYNAMIC_CLASS(wxZipEntry); -}; - - -///////////////////////////////////////////////////////////////////////////// -// wxZipOutputStream - -WX_DECLARE_LIST_WITH_DECL(wxZipEntry, wxZipEntryList_, class WXDLLIMPEXP_BASE); - -class WXDLLIMPEXP_BASE wxZipOutputStream : public wxArchiveOutputStream -{ -public: - wxZipOutputStream(wxOutputStream& stream, - int level = -1, - wxMBConv& conv = wxConvLocal); - wxZipOutputStream(wxOutputStream *stream, - int level = -1, - wxMBConv& conv = wxConvLocal); - virtual WXZIPFIX ~wxZipOutputStream(); - - bool PutNextEntry(wxZipEntry *entry) { return DoCreate(entry); } - - bool WXZIPFIX PutNextEntry(const wxString& name, - const wxDateTime& dt = wxDateTime::Now(), - wxFileOffset size = wxInvalidOffset) wxOVERRIDE; - - bool WXZIPFIX PutNextDirEntry(const wxString& name, - const wxDateTime& dt = wxDateTime::Now()) wxOVERRIDE; - - bool WXZIPFIX CopyEntry(wxZipEntry *entry, wxZipInputStream& inputStream); - bool WXZIPFIX CopyArchiveMetaData(wxZipInputStream& inputStream); - - void WXZIPFIX Sync() wxOVERRIDE; - bool WXZIPFIX CloseEntry() wxOVERRIDE; - bool WXZIPFIX Close() wxOVERRIDE; - - void SetComment(const wxString& comment) { m_Comment = comment; } - - int GetLevel() const { return m_level; } - void WXZIPFIX SetLevel(int level); - -protected: - virtual size_t WXZIPFIX OnSysWrite(const void *buffer, size_t size) wxOVERRIDE; - virtual wxFileOffset OnSysTell() const wxOVERRIDE { return m_entrySize; } - - // this protected interface isn't yet finalised - struct Buffer { const char *m_data; size_t m_size; }; - virtual wxOutputStream* WXZIPFIX OpenCompressor(wxOutputStream& stream, - wxZipEntry& entry, - const Buffer bufs[]); - virtual bool WXZIPFIX CloseCompressor(wxOutputStream *comp); - - bool IsParentSeekable() const - { return m_offsetAdjustment != wxInvalidOffset; } - -private: - void Init(int level); - - bool WXZIPFIX PutNextEntry(wxArchiveEntry *entry) wxOVERRIDE; - bool WXZIPFIX CopyEntry(wxArchiveEntry *entry, wxArchiveInputStream& stream) wxOVERRIDE; - bool WXZIPFIX CopyArchiveMetaData(wxArchiveInputStream& stream) wxOVERRIDE; - - bool IsOpened() const { return m_comp || m_pending; } - - bool DoCreate(wxZipEntry *entry, bool raw = false); - void CreatePendingEntry(const void *buffer, size_t size); - void CreatePendingEntry(); - - class wxStoredOutputStream *m_store; - class wxZlibOutputStream2 *m_deflate; - class wxZipStreamLink *m_backlink; - wxZipEntryList_ m_entries; - char *m_initialData; - size_t m_initialSize; - wxZipEntry *m_pending; - bool m_raw; - wxFileOffset m_headerOffset; - size_t m_headerSize; - wxFileOffset m_entrySize; - wxUint32 m_crcAccumulator; - wxOutputStream *m_comp; - int m_level; - wxFileOffset m_offsetAdjustment; - wxString m_Comment; - bool m_endrecWritten; - - wxDECLARE_NO_COPY_CLASS(wxZipOutputStream); -}; - - -///////////////////////////////////////////////////////////////////////////// -// wxZipInputStream - -class WXDLLIMPEXP_BASE wxZipInputStream : public wxArchiveInputStream -{ -public: - typedef wxZipEntry entry_type; - - wxZipInputStream(wxInputStream& stream, wxMBConv& conv = wxConvLocal); - wxZipInputStream(wxInputStream *stream, wxMBConv& conv = wxConvLocal); - - virtual WXZIPFIX ~wxZipInputStream(); - - bool OpenEntry(wxZipEntry& entry) { return DoOpen(&entry); } - bool WXZIPFIX CloseEntry() wxOVERRIDE; - - wxZipEntry *GetNextEntry(); - - wxString WXZIPFIX GetComment(); - int WXZIPFIX GetTotalEntries(); - - virtual wxFileOffset GetLength() const wxOVERRIDE { return m_entry.GetSize(); } - -protected: - size_t WXZIPFIX OnSysRead(void *buffer, size_t size) wxOVERRIDE; - wxFileOffset OnSysTell() const wxOVERRIDE { return m_decomp ? m_decomp->TellI() : 0; } - - // this protected interface isn't yet finalised - virtual wxInputStream* WXZIPFIX OpenDecompressor(wxInputStream& stream); - virtual bool WXZIPFIX CloseDecompressor(wxInputStream *decomp); - -private: - void Init(); - void Init(const wxString& file); - - wxArchiveEntry *DoGetNextEntry() wxOVERRIDE { return GetNextEntry(); } - - bool WXZIPFIX OpenEntry(wxArchiveEntry& entry) wxOVERRIDE; - - wxStreamError ReadLocal(bool readEndRec = false); - wxStreamError ReadCentral(); - - wxUint32 ReadSignature(); - bool FindEndRecord(); - bool LoadEndRecord(); - - bool AtHeader() const { return m_headerSize == 0; } - bool AfterHeader() const { return m_headerSize > 0 && !m_decomp; } - bool IsOpened() const { return m_decomp != NULL; } - - wxZipStreamLink *MakeLink(wxZipOutputStream *out); - - bool DoOpen(wxZipEntry *entry = NULL, bool raw = false); - bool OpenDecompressor(bool raw = false); - - class wxStoredInputStream *m_store; - class wxZlibInputStream2 *m_inflate; - class wxRawInputStream *m_rawin; - wxZipEntry m_entry; - bool m_raw; - size_t m_headerSize; - wxUint32 m_crcAccumulator; - wxInputStream *m_decomp; - bool m_parentSeekable; - class wxZipWeakLinks *m_weaklinks; - class wxZipStreamLink *m_streamlink; - wxFileOffset m_offsetAdjustment; - wxFileOffset m_position; - wxUint32 m_signature; - size_t m_TotalEntries; - wxString m_Comment; - - friend bool wxZipOutputStream::CopyEntry( - wxZipEntry *entry, wxZipInputStream& inputStream); - friend bool wxZipOutputStream::CopyArchiveMetaData( - wxZipInputStream& inputStream); - - wxDECLARE_NO_COPY_CLASS(wxZipInputStream); -}; - - -///////////////////////////////////////////////////////////////////////////// -// Iterators - -#if wxUSE_STL || defined WX_TEST_ARCHIVE_ITERATOR -typedef wxArchiveIterator wxZipIter; -typedef wxArchiveIterator > wxZipPairIter; -#endif - - -///////////////////////////////////////////////////////////////////////////// -// wxZipClassFactory - -class WXDLLIMPEXP_BASE wxZipClassFactory : public wxArchiveClassFactory -{ -public: - typedef wxZipEntry entry_type; - typedef wxZipInputStream instream_type; - typedef wxZipOutputStream outstream_type; - typedef wxZipNotifier notifier_type; -#if wxUSE_STL || defined WX_TEST_ARCHIVE_ITERATOR - typedef wxZipIter iter_type; - typedef wxZipPairIter pairiter_type; -#endif - - wxZipClassFactory(); - - wxZipEntry *NewEntry() const - { return new wxZipEntry; } - wxZipInputStream *NewStream(wxInputStream& stream) const - { return new wxZipInputStream(stream, GetConv()); } - wxZipOutputStream *NewStream(wxOutputStream& stream) const - { return new wxZipOutputStream(stream, -1, GetConv()); } - wxZipInputStream *NewStream(wxInputStream *stream) const - { return new wxZipInputStream(stream, GetConv()); } - wxZipOutputStream *NewStream(wxOutputStream *stream) const - { return new wxZipOutputStream(stream, -1, GetConv()); } - - wxString GetInternalName(const wxString& name, - wxPathFormat format = wxPATH_NATIVE) const wxOVERRIDE - { return wxZipEntry::GetInternalName(name, format); } - - const wxChar * const *GetProtocols(wxStreamProtocolType type - = wxSTREAM_PROTOCOL) const wxOVERRIDE; - -protected: - wxArchiveEntry *DoNewEntry() const wxOVERRIDE - { return NewEntry(); } - wxArchiveInputStream *DoNewStream(wxInputStream& stream) const wxOVERRIDE - { return NewStream(stream); } - wxArchiveOutputStream *DoNewStream(wxOutputStream& stream) const wxOVERRIDE - { return NewStream(stream); } - wxArchiveInputStream *DoNewStream(wxInputStream *stream) const wxOVERRIDE - { return NewStream(stream); } - wxArchiveOutputStream *DoNewStream(wxOutputStream *stream) const wxOVERRIDE - { return NewStream(stream); } - -private: - wxDECLARE_DYNAMIC_CLASS(wxZipClassFactory); -}; - - -///////////////////////////////////////////////////////////////////////////// -// wxZipEntry inlines - -inline bool wxZipEntry::IsText() const -{ - return (m_InternalAttributes & TEXT_ATTR) != 0; -} - -inline bool wxZipEntry::IsDir() const -{ - return (m_ExternalAttributes & wxZIP_A_SUBDIR) != 0; -} - -inline bool wxZipEntry::IsReadOnly() const -{ - return (m_ExternalAttributes & wxZIP_A_RDONLY) != 0; -} - -inline bool wxZipEntry::IsMadeByUnix() const -{ - const int pattern = - (1 << wxZIP_SYSTEM_OPENVMS) | - (1 << wxZIP_SYSTEM_UNIX) | - (1 << wxZIP_SYSTEM_ATARI_ST) | - (1 << wxZIP_SYSTEM_ACORN_RISC) | - (1 << wxZIP_SYSTEM_BEOS) | (1 << wxZIP_SYSTEM_TANDEM); - - // note: some unix zippers put madeby = dos - return (m_SystemMadeBy == wxZIP_SYSTEM_MSDOS - && (m_ExternalAttributes & ~0xFFFF)) - || ((pattern >> m_SystemMadeBy) & 1); -} - -inline void wxZipEntry::SetIsText(bool isText) -{ - if (isText) - m_InternalAttributes |= TEXT_ATTR; - else - m_InternalAttributes &= ~TEXT_ATTR; -} - -inline void wxZipEntry::SetIsReadOnly(bool isReadOnly) -{ - if (isReadOnly) - SetMode(GetMode() & ~0222); - else - SetMode(GetMode() | 0200); -} - -inline void wxZipEntry::SetName(const wxString& name, - wxPathFormat format /*=wxPATH_NATIVE*/) -{ - bool isDir; - m_Name = GetInternalName(name, format, &isDir); - SetIsDir(isDir); -} - - -#endif // wxUSE_ZIPSTREAM - -#endif // _WX_WXZIPSTREAM_H__ diff --git a/Externals/wxWidgets3/include/wx/zstream.h b/Externals/wxWidgets3/include/wx/zstream.h deleted file mode 100644 index d7391440a7..0000000000 --- a/Externals/wxWidgets3/include/wx/zstream.h +++ /dev/null @@ -1,148 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/zstream.h -// Purpose: Memory stream classes -// Author: Guilhem Lavaux -// Modified by: Mike Wetherell -// Created: 11/07/98 -// Copyright: (c) Guilhem Lavaux -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// -#ifndef _WX_WXZSTREAM_H__ -#define _WX_WXZSTREAM_H__ - -#include "wx/defs.h" - -#if wxUSE_ZLIB && wxUSE_STREAMS - -#include "wx/stream.h" -#include "wx/versioninfo.h" - -// Compression level -enum wxZlibCompressionLevels { - wxZ_DEFAULT_COMPRESSION = -1, - wxZ_NO_COMPRESSION = 0, - wxZ_BEST_SPEED = 1, - wxZ_BEST_COMPRESSION = 9 -}; - -// Flags -enum wxZLibFlags { - wxZLIB_NO_HEADER = 0, // raw deflate stream, no header or checksum - wxZLIB_ZLIB = 1, // zlib header and checksum - wxZLIB_GZIP = 2, // gzip header and checksum, requires zlib 1.2.1+ - wxZLIB_AUTO = 3 // autodetect header zlib or gzip -}; - -class WXDLLIMPEXP_BASE wxZlibInputStream: public wxFilterInputStream { - public: - wxZlibInputStream(wxInputStream& stream, int flags = wxZLIB_AUTO); - wxZlibInputStream(wxInputStream *stream, int flags = wxZLIB_AUTO); - virtual ~wxZlibInputStream(); - - char Peek() wxOVERRIDE { return wxInputStream::Peek(); } - wxFileOffset GetLength() const wxOVERRIDE { return wxInputStream::GetLength(); } - - static bool CanHandleGZip(); - - bool SetDictionary(const char *data, size_t datalen); - bool SetDictionary(const wxMemoryBuffer &buf); - - protected: - size_t OnSysRead(void *buffer, size_t size) wxOVERRIDE; - wxFileOffset OnSysTell() const wxOVERRIDE { return m_pos; } - - private: - void Init(int flags); - - protected: - size_t m_z_size; - unsigned char *m_z_buffer; - struct z_stream_s *m_inflate; - wxFileOffset m_pos; - - wxDECLARE_NO_COPY_CLASS(wxZlibInputStream); -}; - -class WXDLLIMPEXP_BASE wxZlibOutputStream: public wxFilterOutputStream { - public: - wxZlibOutputStream(wxOutputStream& stream, int level = -1, int flags = wxZLIB_ZLIB); - wxZlibOutputStream(wxOutputStream *stream, int level = -1, int flags = wxZLIB_ZLIB); - virtual ~wxZlibOutputStream() { Close(); } - - void Sync() wxOVERRIDE { DoFlush(false); } - bool Close() wxOVERRIDE; - wxFileOffset GetLength() const wxOVERRIDE { return m_pos; } - - static bool CanHandleGZip(); - - bool SetDictionary(const char *data, size_t datalen); - bool SetDictionary(const wxMemoryBuffer &buf); - - protected: - size_t OnSysWrite(const void *buffer, size_t size) wxOVERRIDE; - wxFileOffset OnSysTell() const wxOVERRIDE { return m_pos; } - - virtual void DoFlush(bool final); - - private: - void Init(int level, int flags); - - protected: - size_t m_z_size; - unsigned char *m_z_buffer; - struct z_stream_s *m_deflate; - wxFileOffset m_pos; - - wxDECLARE_NO_COPY_CLASS(wxZlibOutputStream); -}; - -class WXDLLIMPEXP_BASE wxZlibClassFactory: public wxFilterClassFactory -{ -public: - wxZlibClassFactory(); - - wxFilterInputStream *NewStream(wxInputStream& stream) const wxOVERRIDE - { return new wxZlibInputStream(stream); } - wxFilterOutputStream *NewStream(wxOutputStream& stream) const wxOVERRIDE - { return new wxZlibOutputStream(stream, -1); } - wxFilterInputStream *NewStream(wxInputStream *stream) const wxOVERRIDE - { return new wxZlibInputStream(stream); } - wxFilterOutputStream *NewStream(wxOutputStream *stream) const wxOVERRIDE - { return new wxZlibOutputStream(stream, -1); } - - const wxChar * const *GetProtocols(wxStreamProtocolType type - = wxSTREAM_PROTOCOL) const wxOVERRIDE; - -private: - wxDECLARE_DYNAMIC_CLASS(wxZlibClassFactory); -}; - -class WXDLLIMPEXP_BASE wxGzipClassFactory: public wxFilterClassFactory -{ -public: - wxGzipClassFactory(); - - wxFilterInputStream *NewStream(wxInputStream& stream) const wxOVERRIDE - { return new wxZlibInputStream(stream); } - wxFilterOutputStream *NewStream(wxOutputStream& stream) const wxOVERRIDE - { return new wxZlibOutputStream(stream, -1); } - wxFilterInputStream *NewStream(wxInputStream *stream) const wxOVERRIDE - { return new wxZlibInputStream(stream); } - wxFilterOutputStream *NewStream(wxOutputStream *stream) const wxOVERRIDE - { return new wxZlibOutputStream(stream, -1); } - - const wxChar * const *GetProtocols(wxStreamProtocolType type - = wxSTREAM_PROTOCOL) const wxOVERRIDE; - -private: - wxDECLARE_DYNAMIC_CLASS(wxGzipClassFactory); -}; - -WXDLLIMPEXP_BASE wxVersionInfo wxGetZlibVersionInfo(); - -#endif - // wxUSE_ZLIB && wxUSE_STREAMS - -#endif - // _WX_WXZSTREAM_H__ - diff --git a/Externals/wxWidgets3/src/aui/auibar.cpp b/Externals/wxWidgets3/src/aui/auibar.cpp deleted file mode 100644 index a48cfd66d4..0000000000 --- a/Externals/wxWidgets3/src/aui/auibar.cpp +++ /dev/null @@ -1,2930 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// - -// Name: src/aui/auibar.cpp -// Purpose: wxaui: wx advanced user interface - docking window manager -// Author: Benjamin I. Williams -// Modified by: -// Created: 2005-05-17 -// Copyright: (C) Copyright 2005-2006, Kirix Corporation, All Rights Reserved -// Licence: wxWindows Library Licence, Version 3.1 -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_AUI - -#include "wx/statline.h" -#include "wx/dcbuffer.h" -#include "wx/sizer.h" -#include "wx/image.h" -#include "wx/settings.h" -#include "wx/menu.h" - -#include "wx/aui/auibar.h" -#include "wx/aui/framemanager.h" - -#ifdef __WXMAC__ -#include "wx/osx/private.h" -#endif - -#include "wx/arrimpl.cpp" -WX_DEFINE_OBJARRAY(wxAuiToolBarItemArray) - - -wxDEFINE_EVENT( wxEVT_AUITOOLBAR_TOOL_DROPDOWN, wxAuiToolBarEvent ); -wxDEFINE_EVENT( wxEVT_AUITOOLBAR_OVERFLOW_CLICK, wxAuiToolBarEvent ); -wxDEFINE_EVENT( wxEVT_AUITOOLBAR_RIGHT_CLICK, wxAuiToolBarEvent ); -wxDEFINE_EVENT( wxEVT_AUITOOLBAR_MIDDLE_CLICK, wxAuiToolBarEvent ); -wxDEFINE_EVENT( wxEVT_AUITOOLBAR_BEGIN_DRAG, wxAuiToolBarEvent ); - - -wxIMPLEMENT_CLASS(wxAuiToolBar, wxControl); -wxIMPLEMENT_DYNAMIC_CLASS(wxAuiToolBarEvent, wxEvent); - - -// missing wxITEM_* items -enum -{ - wxITEM_CONTROL = wxITEM_MAX, - wxITEM_LABEL, - wxITEM_SPACER -}; - -const int BUTTON_DROPDOWN_WIDTH = 10; - - -wxBitmap wxAuiBitmapFromBits(const unsigned char bits[], int w, int h, - const wxColour& color); - -static wxColor GetBaseColor() -{ - -#if defined( __WXMAC__ ) && wxOSX_USE_COCOA_OR_CARBON - wxColor baseColour = wxColour( wxMacCreateCGColorFromHITheme(kThemeBrushToolbarBackground)); -#else - wxColor baseColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); -#endif - - // the baseColour is too pale to use as our base colour, - // so darken it a bit -- - if ((255-baseColour.Red()) + - (255-baseColour.Green()) + - (255-baseColour.Blue()) < 60) - { - baseColour = baseColour.ChangeLightness(92); - } - - return baseColour; -} - - - -class ToolbarCommandCapture : public wxEvtHandler -{ -public: - - ToolbarCommandCapture() { m_lastId = 0; } - int GetCommandId() const { return m_lastId; } - - bool ProcessEvent(wxEvent& evt) wxOVERRIDE - { - if (evt.GetEventType() == wxEVT_MENU) - { - m_lastId = evt.GetId(); - return true; - } - - if (GetNextHandler()) - return GetNextHandler()->ProcessEvent(evt); - - return false; - } - -private: - int m_lastId; -}; - - - -static const unsigned char - DISABLED_TEXT_GREY_HUE = wxColour::AlphaBlend(0, 255, 0.4); -const wxColour DISABLED_TEXT_COLOR(DISABLED_TEXT_GREY_HUE, - DISABLED_TEXT_GREY_HUE, - DISABLED_TEXT_GREY_HUE); - -wxAuiGenericToolBarArt::wxAuiGenericToolBarArt() -{ - m_baseColour = GetBaseColor(); - - m_flags = 0; - m_textOrientation = wxAUI_TBTOOL_TEXT_BOTTOM; - m_highlightColour = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT); - - m_separatorSize = 7; - m_gripperSize = 7; - m_overflowSize = 16; - - wxColor darker1Colour = m_baseColour.ChangeLightness(85); - wxColor darker2Colour = m_baseColour.ChangeLightness(75); - wxColor darker3Colour = m_baseColour.ChangeLightness(60); - wxColor darker4Colour = m_baseColour.ChangeLightness(50); - wxColor darker5Colour = m_baseColour.ChangeLightness(40); - - m_gripperPen1 = wxPen(darker5Colour); - m_gripperPen2 = wxPen(darker3Colour); - m_gripperPen3 = *wxWHITE_PEN; - - static const unsigned char buttonDropdownBits[] = { 0xe0, 0xf1, 0xfb }; - static const unsigned char overflowBits[] = { 0x80, 0xff, 0x80, 0xc1, 0xe3, 0xf7 }; - - m_buttonDropDownBmp = wxAuiBitmapFromBits(buttonDropdownBits, 5, 3, - *wxBLACK); - m_disabledButtonDropDownBmp = wxAuiBitmapFromBits( - buttonDropdownBits, 5, 3, - wxColor(128,128,128)); - m_overflowBmp = wxAuiBitmapFromBits(overflowBits, 7, 6, *wxBLACK); - m_disabledOverflowBmp = wxAuiBitmapFromBits(overflowBits, 7, 6, wxColor(128,128,128)); - - m_font = *wxNORMAL_FONT; -} - -wxAuiGenericToolBarArt::~wxAuiGenericToolBarArt() -{ - m_font = *wxNORMAL_FONT; -} - - -wxAuiToolBarArt* wxAuiGenericToolBarArt::Clone() -{ - return static_cast(new wxAuiGenericToolBarArt); -} - -void wxAuiGenericToolBarArt::SetFlags(unsigned int flags) -{ - m_flags = flags; -} - -void wxAuiGenericToolBarArt::SetFont(const wxFont& font) -{ - m_font = font; -} - -void wxAuiGenericToolBarArt::SetTextOrientation(int orientation) -{ - m_textOrientation = orientation; -} - -unsigned int wxAuiGenericToolBarArt::GetFlags() -{ - return m_flags; -} - -wxFont wxAuiGenericToolBarArt::GetFont() -{ - return m_font; -} - -int wxAuiGenericToolBarArt::GetTextOrientation() -{ - return m_textOrientation; -} - -void wxAuiGenericToolBarArt::DrawBackground( - wxDC& dc, - wxWindow* WXUNUSED(wnd), - const wxRect& _rect) -{ - wxRect rect = _rect; - rect.height++; - wxColour startColour = m_baseColour.ChangeLightness(150); - wxColour endColour = m_baseColour.ChangeLightness(90); - dc.GradientFillLinear(rect, startColour, endColour, wxSOUTH); -} - -void wxAuiGenericToolBarArt::DrawPlainBackground(wxDC& dc, - wxWindow* WXUNUSED(wnd), - const wxRect& _rect) -{ - wxRect rect = _rect; - rect.height++; - - dc.SetBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)); - - dc.DrawRectangle(rect.GetX() - 1, rect.GetY() - 1, - rect.GetWidth() + 2, rect.GetHeight() + 1); -} - -void wxAuiGenericToolBarArt::DrawLabel( - wxDC& dc, - wxWindow* WXUNUSED(wnd), - const wxAuiToolBarItem& item, - const wxRect& rect) -{ - dc.SetFont(m_font); - dc.SetTextForeground(*wxBLACK); - - // we only care about the text height here since the text - // will get cropped based on the width of the item - int textWidth = 0, textHeight = 0; - dc.GetTextExtent(wxT("ABCDHgj"), &textWidth, &textHeight); - - // set the clipping region - wxRect clipRect = rect; - clipRect.width -= 1; - dc.SetClippingRegion(clipRect); - - int textX, textY; - textX = rect.x + 1; - textY = rect.y + (rect.height-textHeight)/2; - dc.DrawText(item.GetLabel(), textX, textY); - dc.DestroyClippingRegion(); -} - - -void wxAuiGenericToolBarArt::DrawButton( - wxDC& dc, - wxWindow* WXUNUSED(wnd), - const wxAuiToolBarItem& item, - const wxRect& rect) -{ - int textWidth = 0, textHeight = 0; - - if (m_flags & wxAUI_TB_TEXT) - { - dc.SetFont(m_font); - - int tx, ty; - - dc.GetTextExtent(wxT("ABCDHgj"), &tx, &textHeight); - textWidth = 0; - dc.GetTextExtent(item.GetLabel(), &textWidth, &ty); - } - - int bmpX = 0, bmpY = 0; - int textX = 0, textY = 0; - - if (m_textOrientation == wxAUI_TBTOOL_TEXT_BOTTOM) - { - bmpX = rect.x + - (rect.width/2) - - (item.GetBitmap().GetWidth()/2); - - bmpY = rect.y + - ((rect.height-textHeight)/2) - - (item.GetBitmap().GetHeight()/2); - - textX = rect.x + (rect.width/2) - (textWidth/2) + 1; - textY = rect.y + rect.height - textHeight - 1; - } - else if (m_textOrientation == wxAUI_TBTOOL_TEXT_RIGHT) - { - bmpX = rect.x + 3; - - bmpY = rect.y + - (rect.height/2) - - (item.GetBitmap().GetHeight()/2); - - textX = bmpX + 3 + item.GetBitmap().GetWidth(); - textY = rect.y + - (rect.height/2) - - (textHeight/2); - } - - - if (!(item.GetState() & wxAUI_BUTTON_STATE_DISABLED)) - { - if (item.GetState() & wxAUI_BUTTON_STATE_PRESSED) - { - dc.SetPen(wxPen(m_highlightColour)); - dc.SetBrush(wxBrush(m_highlightColour.ChangeLightness(150))); - dc.DrawRectangle(rect); - } - else if ((item.GetState() & wxAUI_BUTTON_STATE_HOVER) || item.IsSticky()) - { - dc.SetPen(wxPen(m_highlightColour)); - dc.SetBrush(wxBrush(m_highlightColour.ChangeLightness(170))); - - // draw an even lighter background for checked item hovers (since - // the hover background is the same color as the check background) - if (item.GetState() & wxAUI_BUTTON_STATE_CHECKED) - dc.SetBrush(wxBrush(m_highlightColour.ChangeLightness(180))); - - dc.DrawRectangle(rect); - } - else if (item.GetState() & wxAUI_BUTTON_STATE_CHECKED) - { - // it's important to put this code in an else statement after the - // hover, otherwise hovers won't draw properly for checked items - dc.SetPen(wxPen(m_highlightColour)); - dc.SetBrush(wxBrush(m_highlightColour.ChangeLightness(170))); - dc.DrawRectangle(rect); - } - } - - wxBitmap bmp; - if (item.GetState() & wxAUI_BUTTON_STATE_DISABLED) - bmp = item.GetDisabledBitmap(); - else - bmp = item.GetBitmap(); - - if ( bmp.IsOk() ) - dc.DrawBitmap(bmp, bmpX, bmpY, true); - - // set the item's text color based on if it is disabled - dc.SetTextForeground(*wxBLACK); - if (item.GetState() & wxAUI_BUTTON_STATE_DISABLED) - dc.SetTextForeground(DISABLED_TEXT_COLOR); - - if ( (m_flags & wxAUI_TB_TEXT) && !item.GetLabel().empty() ) - { - dc.DrawText(item.GetLabel(), textX, textY); - } -} - - -void wxAuiGenericToolBarArt::DrawDropDownButton( - wxDC& dc, - wxWindow* WXUNUSED(wnd), - const wxAuiToolBarItem& item, - const wxRect& rect) -{ - int textWidth = 0, textHeight = 0, textX = 0, textY = 0; - int bmpX = 0, bmpY = 0, dropBmpX = 0, dropBmpY = 0; - - wxRect buttonRect = wxRect(rect.x, - rect.y, - rect.width-BUTTON_DROPDOWN_WIDTH, - rect.height); - wxRect dropDownRect = wxRect(rect.x+rect.width-BUTTON_DROPDOWN_WIDTH-1, - rect.y, - BUTTON_DROPDOWN_WIDTH+1, - rect.height); - - if (m_flags & wxAUI_TB_TEXT) - { - dc.SetFont(m_font); - - int tx, ty; - if (m_flags & wxAUI_TB_TEXT) - { - dc.GetTextExtent(wxT("ABCDHgj"), &tx, &textHeight); - textWidth = 0; - } - - dc.GetTextExtent(item.GetLabel(), &textWidth, &ty); - } - - - - dropBmpX = dropDownRect.x + - (dropDownRect.width/2) - - (m_buttonDropDownBmp.GetWidth()/2); - dropBmpY = dropDownRect.y + - (dropDownRect.height/2) - - (m_buttonDropDownBmp.GetHeight()/2); - - - if (m_textOrientation == wxAUI_TBTOOL_TEXT_BOTTOM) - { - bmpX = buttonRect.x + - (buttonRect.width/2) - - (item.GetBitmap().GetWidth()/2); - bmpY = buttonRect.y + - ((buttonRect.height-textHeight)/2) - - (item.GetBitmap().GetHeight()/2); - - textX = rect.x + (rect.width/2) - (textWidth/2) + 1; - textY = rect.y + rect.height - textHeight - 1; - } - else if (m_textOrientation == wxAUI_TBTOOL_TEXT_RIGHT) - { - bmpX = rect.x + 3; - - bmpY = rect.y + - (rect.height/2) - - (item.GetBitmap().GetHeight()/2); - - textX = bmpX + 3 + item.GetBitmap().GetWidth(); - textY = rect.y + - (rect.height/2) - - (textHeight/2); - } - - - if (item.GetState() & wxAUI_BUTTON_STATE_PRESSED) - { - dc.SetPen(wxPen(m_highlightColour)); - dc.SetBrush(wxBrush(m_highlightColour.ChangeLightness(140))); - dc.DrawRectangle(buttonRect); - - dc.SetBrush(wxBrush(m_highlightColour.ChangeLightness(170))); - dc.DrawRectangle(dropDownRect); - } - else if (item.GetState() & wxAUI_BUTTON_STATE_HOVER || - item.IsSticky()) - { - dc.SetPen(wxPen(m_highlightColour)); - dc.SetBrush(wxBrush(m_highlightColour.ChangeLightness(170))); - dc.DrawRectangle(buttonRect); - dc.DrawRectangle(dropDownRect); - } - else if (item.GetState() & wxAUI_BUTTON_STATE_CHECKED) - { - // Notice that this branch must come after the hover one to ensure the - // correct appearance when the mouse hovers over a checked item.m_ - dc.SetPen(wxPen(m_highlightColour)); - dc.SetBrush(wxBrush(m_highlightColour.ChangeLightness(170))); - dc.DrawRectangle(buttonRect); - dc.DrawRectangle(dropDownRect); - } - - wxBitmap bmp; - wxBitmap dropbmp; - if (item.GetState() & wxAUI_BUTTON_STATE_DISABLED) - { - bmp = item.GetDisabledBitmap(); - dropbmp = m_disabledButtonDropDownBmp; - } - else - { - bmp = item.GetBitmap(); - dropbmp = m_buttonDropDownBmp; - } - - if (!bmp.IsOk()) - return; - - dc.DrawBitmap(bmp, bmpX, bmpY, true); - dc.DrawBitmap(dropbmp, dropBmpX, dropBmpY, true); - - // set the item's text color based on if it is disabled - dc.SetTextForeground(*wxBLACK); - if (item.GetState() & wxAUI_BUTTON_STATE_DISABLED) - dc.SetTextForeground(DISABLED_TEXT_COLOR); - - if ( (m_flags & wxAUI_TB_TEXT) && !item.GetLabel().empty() ) - { - dc.DrawText(item.GetLabel(), textX, textY); - } -} - -void wxAuiGenericToolBarArt::DrawControlLabel( - wxDC& dc, - wxWindow* WXUNUSED(wnd), - const wxAuiToolBarItem& item, - const wxRect& rect) -{ - if (!(m_flags & wxAUI_TB_TEXT)) - return; - - if (m_textOrientation != wxAUI_TBTOOL_TEXT_BOTTOM) - return; - - int textX = 0, textY = 0; - int textWidth = 0, textHeight = 0; - - dc.SetFont(m_font); - - int tx, ty; - if (m_flags & wxAUI_TB_TEXT) - { - dc.GetTextExtent(wxT("ABCDHgj"), &tx, &textHeight); - textWidth = 0; - } - - dc.GetTextExtent(item.GetLabel(), &textWidth, &ty); - - // don't draw the label if it is wider than the item width - if (textWidth > rect.width) - return; - - // set the label's text color - dc.SetTextForeground(*wxBLACK); - - textX = rect.x + (rect.width/2) - (textWidth/2) + 1; - textY = rect.y + rect.height - textHeight - 1; - - if ( (m_flags & wxAUI_TB_TEXT) && !item.GetLabel().empty() ) - { - dc.DrawText(item.GetLabel(), textX, textY); - } -} - -wxSize wxAuiGenericToolBarArt::GetLabelSize( - wxDC& dc, - wxWindow* WXUNUSED(wnd), - const wxAuiToolBarItem& item) -{ - dc.SetFont(m_font); - - // get label's height - int width = 0, height = 0; - dc.GetTextExtent(wxT("ABCDHgj"), &width, &height); - - // get item's width - width = item.GetMinSize().GetWidth(); - - if (width == -1) - { - // no width specified, measure the text ourselves - width = dc.GetTextExtent(item.GetLabel()).GetX(); - } - - return wxSize(width, height); -} - -wxSize wxAuiGenericToolBarArt::GetToolSize( - wxDC& dc, - wxWindow* WXUNUSED(wnd), - const wxAuiToolBarItem& item) -{ - if (!item.GetBitmap().IsOk() && !(m_flags & wxAUI_TB_TEXT)) - return wxSize(16,16); - - int width = item.GetBitmap().GetWidth(); - int height = item.GetBitmap().GetHeight(); - - if (m_flags & wxAUI_TB_TEXT) - { - dc.SetFont(m_font); - int tx, ty; - - if (m_textOrientation == wxAUI_TBTOOL_TEXT_BOTTOM) - { - dc.GetTextExtent(wxT("ABCDHgj"), &tx, &ty); - height += ty; - - if ( !item.GetLabel().empty() ) - { - dc.GetTextExtent(item.GetLabel(), &tx, &ty); - width = wxMax(width, tx+6); - } - } - else if ( m_textOrientation == wxAUI_TBTOOL_TEXT_RIGHT && - !item.GetLabel().empty() ) - { - width += 3; // space between left border and bitmap - width += 3; // space between bitmap and text - - if ( !item.GetLabel().empty() ) - { - dc.GetTextExtent(item.GetLabel(), &tx, &ty); - width += tx; - height = wxMax(height, ty); - } - } - } - - // if the tool has a dropdown button, add it to the width - if (item.HasDropDown()) - width += (BUTTON_DROPDOWN_WIDTH+4); - - return wxSize(width, height); -} - -void wxAuiGenericToolBarArt::DrawSeparator( - wxDC& dc, - wxWindow* WXUNUSED(wnd), - const wxRect& _rect) -{ - bool horizontal = true; - if (m_flags & wxAUI_TB_VERTICAL) - horizontal = false; - - wxRect rect = _rect; - - if (horizontal) - { - rect.x += (rect.width/2); - rect.width = 1; - int new_height = (rect.height*3)/4; - rect.y += (rect.height/2) - (new_height/2); - rect.height = new_height; - } - else - { - rect.y += (rect.height/2); - rect.height = 1; - int new_width = (rect.width*3)/4; - rect.x += (rect.width/2) - (new_width/2); - rect.width = new_width; - } - - wxColour startColour = m_baseColour.ChangeLightness(80); - wxColour endColour = m_baseColour.ChangeLightness(80); - dc.GradientFillLinear(rect, startColour, endColour, horizontal ? wxSOUTH : wxEAST); -} - -void wxAuiGenericToolBarArt::DrawGripper(wxDC& dc, - wxWindow* WXUNUSED(wnd), - const wxRect& rect) -{ - int i = 0; - while (1) - { - int x, y; - - if (m_flags & wxAUI_TB_VERTICAL) - { - x = rect.x + (i*4) + 5; - y = rect.y + 3; - if (x > rect.GetWidth()-5) - break; - } - else - { - x = rect.x + 3; - y = rect.y + (i*4) + 5; - if (y > rect.GetHeight()-5) - break; - } - - dc.SetPen(m_gripperPen1); - dc.DrawPoint(x, y); - dc.SetPen(m_gripperPen2); - dc.DrawPoint(x, y+1); - dc.DrawPoint(x+1, y); - dc.SetPen(m_gripperPen3); - dc.DrawPoint(x+2, y+1); - dc.DrawPoint(x+2, y+2); - dc.DrawPoint(x+1, y+2); - - i++; - } - -} - -void wxAuiGenericToolBarArt::DrawOverflowButton(wxDC& dc, - wxWindow* /*wnd*/, - const wxRect& rect, - int state) -{ - if (state & wxAUI_BUTTON_STATE_HOVER || - state & wxAUI_BUTTON_STATE_PRESSED) - { - wxColor light_gray_bg = m_highlightColour.ChangeLightness(170); - - if (m_flags & wxAUI_TB_VERTICAL) - { - dc.SetPen(wxPen(m_highlightColour)); - dc.DrawLine(rect.x, rect.y, rect.x+rect.width, rect.y); - dc.SetPen(wxPen(light_gray_bg)); - dc.SetBrush(wxBrush(light_gray_bg)); - dc.DrawRectangle(rect.x, rect.y+1, rect.width, rect.height); - } - else - { - dc.SetPen(wxPen(m_highlightColour)); - dc.DrawLine(rect.x, rect.y, rect.x, rect.y+rect.height); - dc.SetPen(wxPen(light_gray_bg)); - dc.SetBrush(wxBrush(light_gray_bg)); - dc.DrawRectangle(rect.x+1, rect.y, rect.width, rect.height); - } - } - - int x = rect.x+1+(rect.width-m_overflowBmp.GetWidth())/2; - int y = rect.y+1+(rect.height-m_overflowBmp.GetHeight())/2; - dc.DrawBitmap(m_overflowBmp, x, y, true); -} - -int wxAuiGenericToolBarArt::GetElementSize(int element_id) -{ - switch (element_id) - { - case wxAUI_TBART_SEPARATOR_SIZE: return m_separatorSize; - case wxAUI_TBART_GRIPPER_SIZE: return m_gripperSize; - case wxAUI_TBART_OVERFLOW_SIZE: return m_overflowSize; - default: return 0; - } -} - -void wxAuiGenericToolBarArt::SetElementSize(int element_id, int size) -{ - switch (element_id) - { - case wxAUI_TBART_SEPARATOR_SIZE: m_separatorSize = size; break; - case wxAUI_TBART_GRIPPER_SIZE: m_gripperSize = size; break; - case wxAUI_TBART_OVERFLOW_SIZE: m_overflowSize = size; break; - } -} - -int wxAuiGenericToolBarArt::ShowDropDown(wxWindow* wnd, - const wxAuiToolBarItemArray& items) -{ - wxMenu menuPopup; - - size_t items_added = 0; - - size_t i, count = items.GetCount(); - for (i = 0; i < count; ++i) - { - wxAuiToolBarItem& item = items.Item(i); - - if (item.GetKind() == wxITEM_NORMAL) - { - wxString text = item.GetShortHelp(); - if (text.empty()) - text = item.GetLabel(); - - if (text.empty()) - text = wxT(" "); - - wxMenuItem* m = new wxMenuItem(&menuPopup, item.GetId(), text, item.GetShortHelp()); - - m->SetBitmap(item.GetBitmap()); - menuPopup.Append(m); - items_added++; - } - else if (item.GetKind() == wxITEM_SEPARATOR) - { - if (items_added > 0) - menuPopup.AppendSeparator(); - } - } - - // find out where to put the popup menu of window items - wxPoint pt = ::wxGetMousePosition(); - pt = wnd->ScreenToClient(pt); - - // find out the screen coordinate at the bottom of the tab ctrl - wxRect cli_rect = wnd->GetClientRect(); - pt.y = cli_rect.y + cli_rect.height; - - ToolbarCommandCapture* cc = new ToolbarCommandCapture; - wnd->PushEventHandler(cc); - wnd->PopupMenu(&menuPopup, pt); - int command = cc->GetCommandId(); - wnd->PopEventHandler(true); - - return command; -} - - - - -static wxOrientation GetOrientation(long style) -{ - switch (style & wxAUI_ORIENTATION_MASK) - { - case wxAUI_TB_HORIZONTAL: - return wxHORIZONTAL; - case wxAUI_TB_VERTICAL: - return wxVERTICAL; - default: - wxFAIL_MSG("toolbar cannot be locked in both horizontal and vertical orientations (maybe no lock was intended?)"); - wxFALLTHROUGH; - case 0: - return wxBOTH; - } -} - -wxBEGIN_EVENT_TABLE(wxAuiToolBar, wxControl) - EVT_SIZE(wxAuiToolBar::OnSize) - EVT_IDLE(wxAuiToolBar::OnIdle) - EVT_ERASE_BACKGROUND(wxAuiToolBar::OnEraseBackground) - EVT_PAINT(wxAuiToolBar::OnPaint) - EVT_LEFT_DOWN(wxAuiToolBar::OnLeftDown) - EVT_LEFT_DCLICK(wxAuiToolBar::OnLeftDown) - EVT_LEFT_UP(wxAuiToolBar::OnLeftUp) - EVT_RIGHT_DOWN(wxAuiToolBar::OnRightDown) - EVT_RIGHT_DCLICK(wxAuiToolBar::OnRightDown) - EVT_RIGHT_UP(wxAuiToolBar::OnRightUp) - EVT_MIDDLE_DOWN(wxAuiToolBar::OnMiddleDown) - EVT_MIDDLE_DCLICK(wxAuiToolBar::OnMiddleDown) - EVT_MIDDLE_UP(wxAuiToolBar::OnMiddleUp) - EVT_MOTION(wxAuiToolBar::OnMotion) - EVT_LEAVE_WINDOW(wxAuiToolBar::OnLeaveWindow) - EVT_MOUSE_CAPTURE_LOST(wxAuiToolBar::OnCaptureLost) - EVT_SET_CURSOR(wxAuiToolBar::OnSetCursor) -wxEND_EVENT_TABLE() - -void wxAuiToolBar::Init() -{ - m_sizer = new wxBoxSizer(wxHORIZONTAL); - m_buttonWidth = -1; - m_buttonHeight = -1; - m_sizerElementCount = 0; - m_actionPos = wxDefaultPosition; - m_actionItem = NULL; - m_tipItem = NULL; - m_art = new wxAuiDefaultToolBarArt; - m_toolPacking = 2; - m_toolBorderPadding = 3; - m_toolTextOrientation = wxAUI_TBTOOL_TEXT_BOTTOM; - m_gripperSizerItem = NULL; - m_overflowSizerItem = NULL; - m_dragging = false; - m_gripperVisible = false; - m_overflowVisible = false; - m_overflowState = 0; - m_orientation = wxHORIZONTAL; -} - -bool wxAuiToolBar::Create(wxWindow* parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style) -{ - style = style|wxBORDER_NONE; - - if (!wxControl::Create(parent, id, pos, size, style)) - return false; - - m_windowStyle = style; - - m_gripperVisible = (style & wxAUI_TB_GRIPPER) ? true : false; - m_overflowVisible = (style & wxAUI_TB_OVERFLOW) ? true : false; - - m_orientation = GetOrientation(style); - if (m_orientation == wxBOTH) - { - m_orientation = wxHORIZONTAL; - } - - SetMargins(5, 5, 2, 2); - SetFont(*wxNORMAL_FONT); - SetArtFlags(); - SetExtraStyle(wxWS_EX_PROCESS_IDLE); - if (style & wxAUI_TB_HORZ_LAYOUT) - SetToolTextOrientation(wxAUI_TBTOOL_TEXT_RIGHT); - SetBackgroundStyle(wxBG_STYLE_CUSTOM); - - return true; -} - -wxAuiToolBar::~wxAuiToolBar() -{ - delete m_art; - delete m_sizer; -} - -void wxAuiToolBar::SetWindowStyleFlag(long style) -{ - GetOrientation(style); // assert if style is invalid - wxCHECK_RET(IsPaneValid(style), - "window settings and pane settings are incompatible"); - - wxControl::SetWindowStyleFlag(style); - - m_windowStyle = style; - - if (m_art) - { - SetArtFlags(); - } - - if (m_windowStyle & wxAUI_TB_GRIPPER) - m_gripperVisible = true; - else - m_gripperVisible = false; - - - if (m_windowStyle & wxAUI_TB_OVERFLOW) - m_overflowVisible = true; - else - m_overflowVisible = false; - - if (style & wxAUI_TB_HORZ_LAYOUT) - SetToolTextOrientation(wxAUI_TBTOOL_TEXT_RIGHT); - else - SetToolTextOrientation(wxAUI_TBTOOL_TEXT_BOTTOM); -} - -void wxAuiToolBar::SetArtProvider(wxAuiToolBarArt* art) -{ - delete m_art; - - m_art = art; - - if (m_art) - { - SetArtFlags(); - m_art->SetTextOrientation(m_toolTextOrientation); - } -} - -wxAuiToolBarArt* wxAuiToolBar::GetArtProvider() const -{ - return m_art; -} - - - - -wxAuiToolBarItem* wxAuiToolBar::AddTool(int tool_id, - const wxString& label, - const wxBitmap& bitmap, - const wxString& shortHelp_string, - wxItemKind kind) -{ - return AddTool(tool_id, - label, - bitmap, - wxNullBitmap, - kind, - shortHelp_string, - wxEmptyString, - NULL); -} - - -wxAuiToolBarItem* wxAuiToolBar::AddTool(int tool_id, - const wxString& label, - const wxBitmap& bitmap, - const wxBitmap& disabledBitmap, - wxItemKind kind, - const wxString& shortHelpString, - const wxString& longHelpString, - wxObject* WXUNUSED(client_data)) -{ - wxAuiToolBarItem item; - item.m_window = NULL; - item.m_label = label; - item.m_bitmap = bitmap; - item.m_disabledBitmap = disabledBitmap; - item.m_shortHelp = shortHelpString; - item.m_longHelp = longHelpString; - item.m_active = true; - item.m_dropDown = false; - item.m_spacerPixels = 0; - item.m_toolId = tool_id; - item.m_state = 0; - item.m_proportion = 0; - item.m_kind = kind; - item.m_sizerItem = NULL; - item.m_minSize = wxDefaultSize; - item.m_userData = 0; - item.m_sticky = false; - - if (item.m_toolId == wxID_ANY) - item.m_toolId = wxNewId(); - - if (!item.m_disabledBitmap.IsOk()) - { - // no disabled bitmap specified, we need to make one - if (item.m_bitmap.IsOk()) - { - item.m_disabledBitmap = item.m_bitmap.ConvertToDisabled(); - } - } - m_items.Add(item); - return &m_items.Last(); -} - -wxAuiToolBarItem* wxAuiToolBar::AddControl(wxControl* control, - const wxString& label) -{ - wxAuiToolBarItem item; - item.m_window = (wxWindow*)control; - item.m_label = label; - item.m_bitmap = wxNullBitmap; - item.m_disabledBitmap = wxNullBitmap; - item.m_active = true; - item.m_dropDown = false; - item.m_spacerPixels = 0; - item.m_toolId = control->GetId(); - item.m_state = 0; - item.m_proportion = 0; - item.m_kind = wxITEM_CONTROL; - item.m_sizerItem = NULL; - item.m_minSize = control->GetEffectiveMinSize(); - item.m_userData = 0; - item.m_sticky = false; - - m_items.Add(item); - return &m_items.Last(); -} - -wxAuiToolBarItem* wxAuiToolBar::AddLabel(int tool_id, - const wxString& label, - const int width) -{ - wxSize min_size = wxDefaultSize; - if (width != -1) - min_size.x = width; - - wxAuiToolBarItem item; - item.m_window = NULL; - item.m_label = label; - item.m_bitmap = wxNullBitmap; - item.m_disabledBitmap = wxNullBitmap; - item.m_active = true; - item.m_dropDown = false; - item.m_spacerPixels = 0; - item.m_toolId = tool_id; - item.m_state = 0; - item.m_proportion = 0; - item.m_kind = wxITEM_LABEL; - item.m_sizerItem = NULL; - item.m_minSize = min_size; - item.m_userData = 0; - item.m_sticky = false; - - if (item.m_toolId == wxID_ANY) - item.m_toolId = wxNewId(); - - m_items.Add(item); - return &m_items.Last(); -} - -wxAuiToolBarItem* wxAuiToolBar::AddSeparator() -{ - wxAuiToolBarItem item; - item.m_window = NULL; - item.m_label = wxEmptyString; - item.m_bitmap = wxNullBitmap; - item.m_disabledBitmap = wxNullBitmap; - item.m_active = true; - item.m_dropDown = false; - item.m_toolId = -1; - item.m_state = 0; - item.m_proportion = 0; - item.m_kind = wxITEM_SEPARATOR; - item.m_sizerItem = NULL; - item.m_minSize = wxDefaultSize; - item.m_userData = 0; - item.m_sticky = false; - - m_items.Add(item); - return &m_items.Last(); -} - -wxAuiToolBarItem* wxAuiToolBar::AddSpacer(int pixels) -{ - wxAuiToolBarItem item; - item.m_window = NULL; - item.m_label = wxEmptyString; - item.m_bitmap = wxNullBitmap; - item.m_disabledBitmap = wxNullBitmap; - item.m_active = true; - item.m_dropDown = false; - item.m_spacerPixels = pixels; - item.m_toolId = -1; - item.m_state = 0; - item.m_proportion = 0; - item.m_kind = wxITEM_SPACER; - item.m_sizerItem = NULL; - item.m_minSize = wxDefaultSize; - item.m_userData = 0; - item.m_sticky = false; - - m_items.Add(item); - return &m_items.Last(); -} - -wxAuiToolBarItem* wxAuiToolBar::AddStretchSpacer(int proportion) -{ - wxAuiToolBarItem item; - item.m_window = NULL; - item.m_label = wxEmptyString; - item.m_bitmap = wxNullBitmap; - item.m_disabledBitmap = wxNullBitmap; - item.m_active = true; - item.m_dropDown = false; - item.m_spacerPixels = 0; - item.m_toolId = -1; - item.m_state = 0; - item.m_proportion = proportion; - item.m_kind = wxITEM_SPACER; - item.m_sizerItem = NULL; - item.m_minSize = wxDefaultSize; - item.m_userData = 0; - item.m_sticky = false; - - m_items.Add(item); - return &m_items.Last(); -} - -void wxAuiToolBar::Clear() -{ - m_items.Clear(); - m_sizerElementCount = 0; -} - -bool wxAuiToolBar::DeleteTool(int tool_id) -{ - int idx = GetToolIndex(tool_id); - if (idx >= 0 && idx < (int)m_items.GetCount()) - { - m_items.RemoveAt(idx); - Realize(); - return true; - } - - return false; -} - -bool wxAuiToolBar::DeleteByIndex(int idx) -{ - if (idx >= 0 && idx < (int)m_items.GetCount()) - { - m_items.RemoveAt(idx); - Realize(); - return true; - } - - return false; -} - - -wxControl* wxAuiToolBar::FindControl(int id) -{ - wxWindow* wnd = FindWindow(id); - return (wxControl*)wnd; -} - -wxAuiToolBarItem* wxAuiToolBar::FindTool(int tool_id) const -{ - size_t i, count; - for (i = 0, count = m_items.GetCount(); i < count; ++i) - { - wxAuiToolBarItem& item = m_items.Item(i); - if (item.m_toolId == tool_id) - return &item; - } - - return NULL; -} - -wxAuiToolBarItem* wxAuiToolBar::FindToolByPosition(wxCoord x, wxCoord y) const -{ - size_t i, count; - for (i = 0, count = m_items.GetCount(); i < count; ++i) - { - wxAuiToolBarItem& item = m_items.Item(i); - - if (!item.m_sizerItem) - continue; - - wxRect rect = item.m_sizerItem->GetRect(); - if (rect.Contains(x,y)) - { - // if the item doesn't fit on the toolbar, return NULL - if (!GetToolFitsByIndex(i)) - return NULL; - - return &item; - } - } - - return NULL; -} - -wxAuiToolBarItem* wxAuiToolBar::FindToolByPositionWithPacking(wxCoord x, wxCoord y) const -{ - size_t i, count; - for (i = 0, count = m_items.GetCount(); i < count; ++i) - { - wxAuiToolBarItem& item = m_items.Item(i); - - if (!item.m_sizerItem) - continue; - - wxRect rect = item.m_sizerItem->GetRect(); - - // apply tool packing - if (i+1 < count) - rect.width += m_toolPacking; - - if (rect.Contains(x,y)) - { - // if the item doesn't fit on the toolbar, return NULL - if (!GetToolFitsByIndex(i)) - return NULL; - - return &item; - } - } - - return NULL; -} - -wxAuiToolBarItem* wxAuiToolBar::FindToolByIndex(int idx) const -{ - if (idx < 0) - return NULL; - - if (idx >= (int)m_items.size()) - return NULL; - - return &(m_items[idx]); -} - -void wxAuiToolBar::SetToolBitmapSize(const wxSize& WXUNUSED(size)) -{ - // TODO: wxToolBar compatibility -} - -wxSize wxAuiToolBar::GetToolBitmapSize() const -{ - // TODO: wxToolBar compatibility - return wxSize(16,15); -} - -void wxAuiToolBar::SetToolProportion(int tool_id, int proportion) -{ - wxAuiToolBarItem* item = FindTool(tool_id); - if (!item) - return; - - item->m_proportion = proportion; -} - -int wxAuiToolBar::GetToolProportion(int tool_id) const -{ - wxAuiToolBarItem* item = FindTool(tool_id); - if (!item) - return 0; - - return item->m_proportion; -} - -void wxAuiToolBar::SetToolSeparation(int separation) -{ - if (m_art) - m_art->SetElementSize(wxAUI_TBART_SEPARATOR_SIZE, separation); -} - -int wxAuiToolBar::GetToolSeparation() const -{ - if (m_art) - return m_art->GetElementSize(wxAUI_TBART_SEPARATOR_SIZE); - else - return 5; -} - - -void wxAuiToolBar::SetToolDropDown(int tool_id, bool dropdown) -{ - wxAuiToolBarItem* item = FindTool(tool_id); - if (!item) - return; - - item->SetHasDropDown(dropdown); -} - -bool wxAuiToolBar::GetToolDropDown(int tool_id) const -{ - wxAuiToolBarItem* item = FindTool(tool_id); - if (!item) - return false; - - return item->HasDropDown(); -} - -void wxAuiToolBar::SetToolSticky(int tool_id, bool sticky) -{ - // ignore separators - if (tool_id == -1) - return; - - wxAuiToolBarItem* item = FindTool(tool_id); - if (!item) - return; - - if (item->m_sticky == sticky) - return; - - item->m_sticky = sticky; - - Refresh(false); - Update(); -} - -bool wxAuiToolBar::GetToolSticky(int tool_id) const -{ - wxAuiToolBarItem* item = FindTool(tool_id); - if (!item) - return 0; - - return item->m_sticky; -} - - - - -void wxAuiToolBar::SetToolBorderPadding(int padding) -{ - m_toolBorderPadding = padding; -} - -int wxAuiToolBar::GetToolBorderPadding() const -{ - return m_toolBorderPadding; -} - -void wxAuiToolBar::SetToolTextOrientation(int orientation) -{ - m_toolTextOrientation = orientation; - - if (m_art) - { - m_art->SetTextOrientation(orientation); - } -} - -int wxAuiToolBar::GetToolTextOrientation() const -{ - return m_toolTextOrientation; -} - -void wxAuiToolBar::SetToolPacking(int packing) -{ - m_toolPacking = packing; -} - -int wxAuiToolBar::GetToolPacking() const -{ - return m_toolPacking; -} - - -void wxAuiToolBar::SetOrientation(int orientation) -{ - wxCHECK_RET(orientation == wxHORIZONTAL || - orientation == wxVERTICAL, - "invalid orientation value"); - if (orientation != m_orientation) - { - m_orientation = wxOrientation(orientation); - SetArtFlags(); - } -} - -void wxAuiToolBar::SetMargins(int left, int right, int top, int bottom) -{ - if (left != -1) - m_leftPadding = left; - if (right != -1) - m_rightPadding = right; - if (top != -1) - m_topPadding = top; - if (bottom != -1) - m_bottomPadding = bottom; -} - -bool wxAuiToolBar::GetGripperVisible() const -{ - return m_gripperVisible; -} - -void wxAuiToolBar::SetGripperVisible(bool visible) -{ - m_gripperVisible = visible; - if (visible) - m_windowStyle |= wxAUI_TB_GRIPPER; - else - m_windowStyle &= ~wxAUI_TB_GRIPPER; - Realize(); - Refresh(false); -} - - -bool wxAuiToolBar::GetOverflowVisible() const -{ - return m_overflowVisible; -} - -void wxAuiToolBar::SetOverflowVisible(bool visible) -{ - m_overflowVisible = visible; - if (visible) - m_windowStyle |= wxAUI_TB_OVERFLOW; - else - m_windowStyle &= ~wxAUI_TB_OVERFLOW; - Refresh(false); -} - -bool wxAuiToolBar::SetFont(const wxFont& font) -{ - bool res = wxWindow::SetFont(font); - - if (m_art) - { - m_art->SetFont(font); - } - - return res; -} - - -void wxAuiToolBar::SetHoverItem(wxAuiToolBarItem* pitem) -{ - if (pitem && (pitem->m_state & wxAUI_BUTTON_STATE_DISABLED)) - pitem = NULL; - - wxAuiToolBarItem* former_hover = NULL; - - size_t i, count; - for (i = 0, count = m_items.GetCount(); i < count; ++i) - { - wxAuiToolBarItem& item = m_items.Item(i); - if (item.m_state & wxAUI_BUTTON_STATE_HOVER) - former_hover = &item; - item.m_state &= ~wxAUI_BUTTON_STATE_HOVER; - } - - if (pitem) - { - pitem->m_state |= wxAUI_BUTTON_STATE_HOVER; - } - - if (former_hover != pitem) - { - Refresh(false); - Update(); - } -} - -void wxAuiToolBar::SetPressedItem(wxAuiToolBarItem* pitem) -{ - wxAuiToolBarItem* former_item = NULL; - - size_t i, count; - for (i = 0, count = m_items.GetCount(); i < count; ++i) - { - wxAuiToolBarItem& item = m_items.Item(i); - if (item.m_state & wxAUI_BUTTON_STATE_PRESSED) - former_item = &item; - item.m_state &= ~wxAUI_BUTTON_STATE_PRESSED; - } - - if (pitem) - { - pitem->m_state &= ~wxAUI_BUTTON_STATE_HOVER; - pitem->m_state |= wxAUI_BUTTON_STATE_PRESSED; - } - - if (former_item != pitem) - { - Refresh(false); - Update(); - } -} - -void wxAuiToolBar::RefreshOverflowState() -{ - if (!m_overflowSizerItem) - { - m_overflowState = 0; - return; - } - - int overflow_state = 0; - - wxRect overflow_rect = GetOverflowRect(); - - - // find out the mouse's current position - wxPoint pt = ::wxGetMousePosition(); - pt = this->ScreenToClient(pt); - - // find out if the mouse cursor is inside the dropdown rectangle - if (overflow_rect.Contains(pt.x, pt.y)) - { - if (::wxGetMouseState().LeftIsDown()) - overflow_state = wxAUI_BUTTON_STATE_PRESSED; - else - overflow_state = wxAUI_BUTTON_STATE_HOVER; - } - - if (overflow_state != m_overflowState) - { - m_overflowState = overflow_state; - Refresh(false); - Update(); - } - - m_overflowState = overflow_state; -} - -void wxAuiToolBar::ToggleTool(int tool_id, bool state) -{ - wxAuiToolBarItem* tool = FindTool(tool_id); - - if (tool && (tool->m_kind == wxITEM_CHECK || tool->m_kind == wxITEM_RADIO)) - { - if (tool->m_kind == wxITEM_RADIO) - { - int i, idx, count; - idx = GetToolIndex(tool_id); - count = (int)m_items.GetCount(); - - if (idx >= 0 && idx < count) - { - for (i = idx + 1; i < count; ++i) - { - if (m_items[i].m_kind != wxITEM_RADIO) - break; - m_items[i].m_state &= ~wxAUI_BUTTON_STATE_CHECKED; - } - for (i = idx - 1; i >= 0; i--) - { - if (m_items[i].m_kind != wxITEM_RADIO) - break; - m_items[i].m_state &= ~wxAUI_BUTTON_STATE_CHECKED; - } - } - - tool->m_state |= wxAUI_BUTTON_STATE_CHECKED; - } - else if (tool->m_kind == wxITEM_CHECK) - { - if (state == true) - tool->m_state |= wxAUI_BUTTON_STATE_CHECKED; - else - tool->m_state &= ~wxAUI_BUTTON_STATE_CHECKED; - } - } -} - -bool wxAuiToolBar::GetToolToggled(int tool_id) const -{ - wxAuiToolBarItem* tool = FindTool(tool_id); - - if (tool) - { - if ( (tool->m_kind != wxITEM_CHECK) && (tool->m_kind != wxITEM_RADIO) ) - return false; - - return (tool->m_state & wxAUI_BUTTON_STATE_CHECKED) ? true : false; - } - - return false; -} - -void wxAuiToolBar::EnableTool(int tool_id, bool state) -{ - wxAuiToolBarItem* tool = FindTool(tool_id); - - if (tool) - { - if (state == true) - tool->m_state &= ~wxAUI_BUTTON_STATE_DISABLED; - else - tool->m_state |= wxAUI_BUTTON_STATE_DISABLED; - } -} - -bool wxAuiToolBar::GetToolEnabled(int tool_id) const -{ - wxAuiToolBarItem* tool = FindTool(tool_id); - - if (tool) - return (tool->m_state & wxAUI_BUTTON_STATE_DISABLED) ? false : true; - - return false; -} - -wxString wxAuiToolBar::GetToolLabel(int tool_id) const -{ - wxAuiToolBarItem* tool = FindTool(tool_id); - wxASSERT_MSG(tool, wxT("can't find tool in toolbar item array")); - if (!tool) - return wxEmptyString; - - return tool->m_label; -} - -void wxAuiToolBar::SetToolLabel(int tool_id, const wxString& label) -{ - wxAuiToolBarItem* tool = FindTool(tool_id); - if (tool) - { - tool->m_label = label; - } -} - -wxBitmap wxAuiToolBar::GetToolBitmap(int tool_id) const -{ - wxAuiToolBarItem* tool = FindTool(tool_id); - wxASSERT_MSG(tool, wxT("can't find tool in toolbar item array")); - if (!tool) - return wxNullBitmap; - - return tool->m_bitmap; -} - -void wxAuiToolBar::SetToolBitmap(int tool_id, const wxBitmap& bitmap) -{ - wxAuiToolBarItem* tool = FindTool(tool_id); - if (tool) - { - tool->m_bitmap = bitmap; - } -} - -wxString wxAuiToolBar::GetToolShortHelp(int tool_id) const -{ - wxAuiToolBarItem* tool = FindTool(tool_id); - wxASSERT_MSG(tool, wxT("can't find tool in toolbar item array")); - if (!tool) - return wxEmptyString; - - return tool->m_shortHelp; -} - -void wxAuiToolBar::SetToolShortHelp(int tool_id, const wxString& help_string) -{ - wxAuiToolBarItem* tool = FindTool(tool_id); - if (tool) - { - tool->m_shortHelp = help_string; - } -} - -wxString wxAuiToolBar::GetToolLongHelp(int tool_id) const -{ - wxAuiToolBarItem* tool = FindTool(tool_id); - wxASSERT_MSG(tool, wxT("can't find tool in toolbar item array")); - if (!tool) - return wxEmptyString; - - return tool->m_longHelp; -} - -void wxAuiToolBar::SetToolLongHelp(int tool_id, const wxString& help_string) -{ - wxAuiToolBarItem* tool = FindTool(tool_id); - if (tool) - { - tool->m_longHelp = help_string; - } -} - -void wxAuiToolBar::SetCustomOverflowItems(const wxAuiToolBarItemArray& prepend, - const wxAuiToolBarItemArray& append) -{ - m_customOverflowPrepend = prepend; - m_customOverflowAppend = append; -} - -// get size of hint rectangle for a particular dock location -wxSize wxAuiToolBar::GetHintSize(int dock_direction) const -{ - switch (dock_direction) - { - case wxAUI_DOCK_TOP: - case wxAUI_DOCK_BOTTOM: - return m_horzHintSize; - case wxAUI_DOCK_RIGHT: - case wxAUI_DOCK_LEFT: - return m_vertHintSize; - default: - wxFAIL_MSG("invalid dock location value"); - } - return wxDefaultSize; -} - -bool wxAuiToolBar::IsPaneValid(const wxAuiPaneInfo& pane) const -{ - return IsPaneValid(m_windowStyle, pane); -} - -bool wxAuiToolBar::IsPaneValid(long style, const wxAuiPaneInfo& pane) -{ - if (style & wxAUI_TB_HORIZONTAL) - { - if (pane.IsLeftDockable() || pane.IsRightDockable()) - { - return false; - } - } - else if (style & wxAUI_TB_VERTICAL) - { - if (pane.IsTopDockable() || pane.IsBottomDockable()) - { - return false; - } - } - return true; -} - -bool wxAuiToolBar::IsPaneValid(long style) const -{ - wxAuiManager* manager = wxAuiManager::GetManager(const_cast(this)); - if (manager) - { - return IsPaneValid(style, manager->GetPane(const_cast(this))); - } - return true; -} - -void wxAuiToolBar::SetArtFlags() const -{ - unsigned int artflags = m_windowStyle & ~wxAUI_ORIENTATION_MASK; - if (m_orientation == wxVERTICAL) - { - artflags |= wxAUI_TB_VERTICAL; - } - m_art->SetFlags(artflags); -} - -size_t wxAuiToolBar::GetToolCount() const -{ - return m_items.size(); -} - -int wxAuiToolBar::GetToolIndex(int tool_id) const -{ - // this will prevent us from returning the index of the - // first separator in the toolbar since its id is equal to -1 - if (tool_id == -1) - return wxNOT_FOUND; - - size_t i, count = m_items.GetCount(); - for (i = 0; i < count; ++i) - { - wxAuiToolBarItem& item = m_items.Item(i); - if (item.m_toolId == tool_id) - return i; - } - - return wxNOT_FOUND; -} - -bool wxAuiToolBar::GetToolFitsByIndex(int tool_idx) const -{ - if (tool_idx < 0 || tool_idx >= (int)m_items.GetCount()) - return false; - - if (!m_items[tool_idx].m_sizerItem) - return false; - - int cli_w, cli_h; - GetClientSize(&cli_w, &cli_h); - - wxRect rect = m_items[tool_idx].m_sizerItem->GetRect(); - - if (m_orientation == wxVERTICAL) - { - // take the dropdown size into account - if (m_overflowVisible && m_overflowSizerItem) - cli_h -= m_overflowSizerItem->GetSize().y; - - if (rect.y+rect.height < cli_h) - return true; - } - else - { - // take the dropdown size into account - if (m_overflowVisible && m_overflowSizerItem) - cli_w -= m_overflowSizerItem->GetSize().x; - - if (rect.x+rect.width < cli_w) - return true; - } - - return false; -} - - -bool wxAuiToolBar::GetToolFits(int tool_id) const -{ - return GetToolFitsByIndex(GetToolIndex(tool_id)); -} - -wxRect wxAuiToolBar::GetToolRect(int tool_id) const -{ - wxAuiToolBarItem* tool = FindTool(tool_id); - if (tool && tool->m_sizerItem) - { - return tool->m_sizerItem->GetRect(); - } - - return wxRect(); -} - -bool wxAuiToolBar::GetToolBarFits() const -{ - if (m_items.GetCount() == 0) - { - // empty toolbar always 'fits' - return true; - } - - // entire toolbar content fits if the last tool fits - return GetToolFitsByIndex(m_items.GetCount() - 1); -} - -bool wxAuiToolBar::Realize() -{ - wxClientDC dc(this); - if (!dc.IsOk()) - return false; - - // calculate hint sizes for both horizontal and vertical - // in the order that leaves toolbar in correct final state - bool retval = false; - if (m_orientation == wxHORIZONTAL) - { - if (RealizeHelper(dc, false)) - { - m_vertHintSize = GetSize(); - if (RealizeHelper(dc, true)) - { - m_horzHintSize = GetSize(); - retval = true; - } - } - } - else - { - if (RealizeHelper(dc, true)) - { - m_horzHintSize = GetSize(); - if (RealizeHelper(dc, false)) - { - m_vertHintSize = GetSize(); - retval = true; - } - } - } - - Refresh(false); - return retval; -} - -bool wxAuiToolBar::RealizeHelper(wxClientDC& dc, bool horizontal) -{ - // Remove old sizer before adding any controls in this tool bar, which are - // elements of this sizer, to the new sizer below. - delete m_sizer; - m_sizer = NULL; - - // create the new sizer to add toolbar elements to - wxBoxSizer* sizer = new wxBoxSizer(horizontal ? wxHORIZONTAL : wxVERTICAL); - - // add gripper area - int separatorSize = m_art->GetElementSize(wxAUI_TBART_SEPARATOR_SIZE); - int gripperSize = m_art->GetElementSize(wxAUI_TBART_GRIPPER_SIZE); - if (gripperSize > 0 && m_gripperVisible) - { - if (horizontal) - m_gripperSizerItem = sizer->Add(gripperSize, 1, 0, wxEXPAND); - else - m_gripperSizerItem = sizer->Add(1, gripperSize, 0, wxEXPAND); - } - else - { - m_gripperSizerItem = NULL; - } - - // add "left" padding - if (m_leftPadding > 0) - { - if (horizontal) - sizer->Add(m_leftPadding, 1); - else - sizer->Add(1, m_leftPadding); - } - - size_t i, count; - for (i = 0, count = m_items.GetCount(); i < count; ++i) - { - wxAuiToolBarItem& item = m_items.Item(i); - wxSizerItem* m_sizerItem = NULL; - - switch (item.m_kind) - { - case wxITEM_LABEL: - { - wxSize size = m_art->GetLabelSize(dc, this, item); - m_sizerItem = sizer->Add(size.x + (m_toolBorderPadding*2), - size.y + (m_toolBorderPadding*2), - item.m_proportion, - item.m_alignment); - if (i+1 < count) - { - sizer->AddSpacer(m_toolPacking); - } - - break; - } - - case wxITEM_CHECK: - case wxITEM_NORMAL: - case wxITEM_RADIO: - { - wxSize size = m_art->GetToolSize(dc, this, item); - m_sizerItem = sizer->Add(size.x + (m_toolBorderPadding*2), - size.y + (m_toolBorderPadding*2), - 0, - item.m_alignment); - // add tool packing - if (i+1 < count) - { - sizer->AddSpacer(m_toolPacking); - } - - break; - } - - case wxITEM_SEPARATOR: - { - if (horizontal) - m_sizerItem = sizer->Add(separatorSize, 1, 0, wxEXPAND); - else - m_sizerItem = sizer->Add(1, separatorSize, 0, wxEXPAND); - - // add tool packing - if (i+1 < count) - { - sizer->AddSpacer(m_toolPacking); - } - - break; - } - - case wxITEM_SPACER: - if (item.m_proportion > 0) - m_sizerItem = sizer->AddStretchSpacer(item.m_proportion); - else - m_sizerItem = sizer->Add(item.m_spacerPixels, 1); - break; - - case wxITEM_CONTROL: - { - //m_sizerItem = sizer->Add(item.m_window, item.m_proportion, wxEXPAND); - wxSizerItem* ctrl_m_sizerItem; - - wxBoxSizer* vert_sizer = new wxBoxSizer(wxVERTICAL); - vert_sizer->AddStretchSpacer(1); - ctrl_m_sizerItem = vert_sizer->Add(item.m_window, 0, wxEXPAND); - vert_sizer->AddStretchSpacer(1); - if ( (m_windowStyle & wxAUI_TB_TEXT) && - m_toolTextOrientation == wxAUI_TBTOOL_TEXT_BOTTOM && - !item.GetLabel().empty() ) - { - wxSize s = GetLabelSize(item.GetLabel()); - vert_sizer->Add(1, s.y); - } - - - m_sizerItem = sizer->Add(vert_sizer, item.m_proportion, wxEXPAND); - - wxSize min_size = item.m_minSize; - - - // proportional items will disappear from the toolbar if - // their min width is not set to something really small - if (item.m_proportion != 0) - { - min_size.x = 1; - } - - if (min_size.IsFullySpecified()) - { - m_sizerItem->SetMinSize(min_size); - ctrl_m_sizerItem->SetMinSize(min_size); - } - - // add tool packing - if (i+1 < count) - { - sizer->AddSpacer(m_toolPacking); - } - } - } - - item.m_sizerItem = m_sizerItem; - } - - // add "right" padding - if (m_rightPadding > 0) - { - if (horizontal) - sizer->Add(m_rightPadding, 1); - else - sizer->Add(1, m_rightPadding); - } - - // add drop down area - m_overflowSizerItem = NULL; - - if (m_windowStyle & wxAUI_TB_OVERFLOW) - { - int overflow_size = m_art->GetElementSize(wxAUI_TBART_OVERFLOW_SIZE); - if (overflow_size > 0 && m_overflowVisible) - { - if (horizontal) - m_overflowSizerItem = sizer->Add(overflow_size, 1, 0, wxEXPAND); - else - m_overflowSizerItem = sizer->Add(1, overflow_size, 0, wxEXPAND); - } - else - { - m_overflowSizerItem = NULL; - } - } - - - // the outside sizer helps us apply the "top" and "bottom" padding - wxBoxSizer* outside_sizer = new wxBoxSizer(horizontal ? wxVERTICAL : wxHORIZONTAL); - - // add "top" padding - if (m_topPadding > 0) - { - if (horizontal) - outside_sizer->Add(1, m_topPadding); - else - outside_sizer->Add(m_topPadding, 1); - } - - // add the sizer that contains all of the toolbar elements - outside_sizer->Add(sizer, 1, wxEXPAND); - - // add "bottom" padding - if (m_bottomPadding > 0) - { - if (horizontal) - outside_sizer->Add(1, m_bottomPadding); - else - outside_sizer->Add(m_bottomPadding, 1); - } - - m_sizer = outside_sizer; - - // calculate the rock-bottom minimum size - for (i = 0, count = m_items.GetCount(); i < count; ++i) - { - wxAuiToolBarItem& item = m_items.Item(i); - if (item.m_sizerItem && item.m_proportion > 0 && item.m_minSize.IsFullySpecified()) - item.m_sizerItem->SetMinSize(0,0); - } - - m_absoluteMinSize = m_sizer->GetMinSize(); - - // reset the min sizes to what they were - for (i = 0, count = m_items.GetCount(); i < count; ++i) - { - wxAuiToolBarItem& item = m_items.Item(i); - if (item.m_sizerItem && item.m_proportion > 0 && item.m_minSize.IsFullySpecified()) - item.m_sizerItem->SetMinSize(item.m_minSize); - } - - // set control size - wxSize size = m_sizer->GetMinSize(); - m_minWidth = size.x; - m_minHeight = size.y; - - if ((m_windowStyle & wxAUI_TB_NO_AUTORESIZE) == 0) - { - wxSize curSize = GetClientSize(); - wxSize new_size = GetMinSize(); - if (new_size != curSize) - { - SetClientSize(new_size); - } - else - { - m_sizer->SetDimension(0, 0, curSize.x, curSize.y); - } - } - else - { - wxSize curSize = GetClientSize(); - m_sizer->SetDimension(0, 0, curSize.x, curSize.y); - } - - return true; -} - -int wxAuiToolBar::GetOverflowState() const -{ - return m_overflowState; -} - -wxRect wxAuiToolBar::GetOverflowRect() const -{ - wxRect cli_rect(wxPoint(0,0), GetClientSize()); - wxRect overflow_rect = m_overflowSizerItem->GetRect(); - int overflow_size = m_art->GetElementSize(wxAUI_TBART_OVERFLOW_SIZE); - - if (m_orientation == wxVERTICAL) - { - overflow_rect.y = cli_rect.height - overflow_size; - overflow_rect.x = 0; - overflow_rect.width = cli_rect.width; - overflow_rect.height = overflow_size; - } - else - { - overflow_rect.x = cli_rect.width - overflow_size; - overflow_rect.y = 0; - overflow_rect.width = overflow_size; - overflow_rect.height = cli_rect.height; - } - - return overflow_rect; -} - -wxSize wxAuiToolBar::GetLabelSize(const wxString& label) -{ - wxClientDC dc(this); - - int tx, ty; - int textWidth = 0, textHeight = 0; - - dc.SetFont(m_font); - - // get the text height - dc.GetTextExtent(wxT("ABCDHgj"), &tx, &textHeight); - - // get the text width - dc.GetTextExtent(label, &textWidth, &ty); - - return wxSize(textWidth, textHeight); -} - - -void wxAuiToolBar::DoIdleUpdate() -{ - wxEvtHandler* handler = GetEventHandler(); - - bool need_refresh = false; - - size_t i, count; - for (i = 0, count = m_items.GetCount(); i < count; ++i) - { - wxAuiToolBarItem& item = m_items.Item(i); - - if (item.m_toolId == -1) - continue; - - wxUpdateUIEvent evt(item.m_toolId); - evt.SetEventObject(this); - - if (handler->ProcessEvent(evt)) - { - if (evt.GetSetEnabled()) - { - bool is_enabled; - if (item.m_window) - is_enabled = item.m_window->IsThisEnabled(); - else - is_enabled = (item.m_state & wxAUI_BUTTON_STATE_DISABLED) ? false : true; - - bool new_enabled = evt.GetEnabled(); - if (new_enabled != is_enabled) - { - if (item.m_window) - { - item.m_window->Enable(new_enabled); - } - else - { - if (new_enabled) - item.m_state &= ~wxAUI_BUTTON_STATE_DISABLED; - else - item.m_state |= wxAUI_BUTTON_STATE_DISABLED; - } - need_refresh = true; - } - } - - if (evt.GetSetChecked()) - { - // make sure we aren't checking an item that can't be - if (item.m_kind != wxITEM_CHECK && item.m_kind != wxITEM_RADIO) - continue; - - bool is_checked = (item.m_state & wxAUI_BUTTON_STATE_CHECKED) ? true : false; - bool new_checked = evt.GetChecked(); - - if (new_checked != is_checked) - { - if (new_checked) - item.m_state |= wxAUI_BUTTON_STATE_CHECKED; - else - item.m_state &= ~wxAUI_BUTTON_STATE_CHECKED; - - need_refresh = true; - } - } - - } - } - - - if (need_refresh) - { - Refresh(false); - } -} - - -void wxAuiToolBar::OnSize(wxSizeEvent& WXUNUSED(evt)) -{ - int x, y; - GetClientSize(&x, &y); - - if (((x >= y) && m_absoluteMinSize.x > x) || - ((y > x) && m_absoluteMinSize.y > y)) - { - // hide all flexible items - size_t i, count; - for (i = 0, count = m_items.GetCount(); i < count; ++i) - { - wxAuiToolBarItem& item = m_items.Item(i); - if (item.m_sizerItem && item.m_proportion > 0 && item.m_sizerItem->IsShown()) - { - item.m_sizerItem->Show(false); - item.m_sizerItem->SetProportion(0); - } - } - } - else - { - // show all flexible items - size_t i, count; - for (i = 0, count = m_items.GetCount(); i < count; ++i) - { - wxAuiToolBarItem& item = m_items.Item(i); - if (item.m_sizerItem && item.m_proportion > 0 && !item.m_sizerItem->IsShown()) - { - item.m_sizerItem->Show(true); - item.m_sizerItem->SetProportion(item.m_proportion); - } - } - } - - m_sizer->SetDimension(0, 0, x, y); - - Refresh(false); - Update(); - - // idle events aren't sent while user is resizing frame (why?), - // but resizing toolbar here causes havoc, - // so force idle handler to run after size handling complete - QueueEvent(new wxIdleEvent); -} - - - -void wxAuiToolBar::DoSetSize(int x, - int y, - int width, - int height, - int sizeFlags) -{ - wxSize parent_size = GetParent()->GetClientSize(); - if (x + width > parent_size.x) - width = wxMax(0, parent_size.x - x); - if (y + height > parent_size.y) - height = wxMax(0, parent_size.y - y); - - wxWindow::DoSetSize(x, y, width, height, sizeFlags); -} - - -void wxAuiToolBar::OnIdle(wxIdleEvent& evt) -{ - // if orientation doesn't match dock, fix it - wxAuiManager* manager = wxAuiManager::GetManager(this); - if (manager) - { - wxAuiPaneInfo& pane = manager->GetPane(this); - // pane state member is public, so it might have been changed - // without going through wxPaneInfo::SetFlag() check - bool ok = pane.IsOk(); - wxCHECK2_MSG(!ok || IsPaneValid(m_windowStyle, pane), ok = false, - "window settings and pane settings are incompatible"); - if (ok) - { - wxOrientation newOrientation = m_orientation; - if (pane.IsDocked()) - { - switch (pane.dock_direction) - { - case wxAUI_DOCK_TOP: - case wxAUI_DOCK_BOTTOM: - newOrientation = wxHORIZONTAL; - break; - case wxAUI_DOCK_LEFT: - case wxAUI_DOCK_RIGHT: - newOrientation = wxVERTICAL; - break; - default: - wxFAIL_MSG("invalid dock location value"); - } - } - else if (pane.IsResizable() && - GetOrientation(m_windowStyle) == wxBOTH) - { - // changing orientation in OnSize causes havoc - int x, y; - GetClientSize(&x, &y); - - if (x > y) - { - newOrientation = wxHORIZONTAL; - } - else - { - newOrientation = wxVERTICAL; - } - } - if (newOrientation != m_orientation) - { - SetOrientation(newOrientation); - Realize(); - if (newOrientation == wxHORIZONTAL) - { - pane.best_size = GetHintSize(wxAUI_DOCK_TOP); - } - else - { - pane.best_size = GetHintSize(wxAUI_DOCK_LEFT); - } - if (pane.IsDocked()) - { - pane.floating_size = wxDefaultSize; - } - else - { - SetSize(GetParent()->GetClientSize()); - } - manager->Update(); - } - } - } - evt.Skip(); -} - -void wxAuiToolBar::UpdateWindowUI(long flags) -{ - if ( flags & wxUPDATE_UI_FROMIDLE ) - { - DoIdleUpdate(); - } - - wxControl::UpdateWindowUI(flags); -} - -void wxAuiToolBar::OnPaint(wxPaintEvent& WXUNUSED(evt)) -{ - wxAutoBufferedPaintDC dc(this); - wxRect cli_rect(wxPoint(0,0), GetClientSize()); - - - bool horizontal = m_orientation == wxHORIZONTAL; - - if (m_windowStyle & wxAUI_TB_PLAIN_BACKGROUND) - m_art->DrawPlainBackground(dc, this, cli_rect); - else - m_art->DrawBackground(dc, this, cli_rect); - - int gripperSize = m_art->GetElementSize(wxAUI_TBART_GRIPPER_SIZE); - int dropdown_size = m_art->GetElementSize(wxAUI_TBART_OVERFLOW_SIZE); - - // paint the gripper - if (gripperSize > 0 && m_gripperSizerItem) - { - wxRect gripper_rect = m_gripperSizerItem->GetRect(); - if (horizontal) - gripper_rect.width = gripperSize; - else - gripper_rect.height = gripperSize; - m_art->DrawGripper(dc, this, gripper_rect); - } - - // calculated how far we can draw items - int last_extent; - if (horizontal) - last_extent = cli_rect.width; - else - last_extent = cli_rect.height; - if (m_overflowVisible) - last_extent -= dropdown_size; - - // paint each individual tool - size_t i, count = m_items.GetCount(); - for (i = 0; i < count; ++i) - { - wxAuiToolBarItem& item = m_items.Item(i); - - if (!item.m_sizerItem) - continue; - - wxRect item_rect = item.m_sizerItem->GetRect(); - - - if ((horizontal && item_rect.x + item_rect.width >= last_extent) || - (!horizontal && item_rect.y + item_rect.height >= last_extent)) - { - break; - } - - switch ( item.m_kind ) - { - case wxITEM_NORMAL: - // draw a regular or dropdown button - if (!item.m_dropDown) - m_art->DrawButton(dc, this, item, item_rect); - else - m_art->DrawDropDownButton(dc, this, item, item_rect); - break; - - case wxITEM_CHECK: - case wxITEM_RADIO: - // draw a toggle button - m_art->DrawButton(dc, this, item, item_rect); - break; - - case wxITEM_SEPARATOR: - // draw a separator - m_art->DrawSeparator(dc, this, item_rect); - break; - - case wxITEM_LABEL: - // draw a text label only - m_art->DrawLabel(dc, this, item, item_rect); - break; - - case wxITEM_CONTROL: - // draw the control's label - m_art->DrawControlLabel(dc, this, item, item_rect); - break; - } - - // fire a signal to see if the item wants to be custom-rendered - OnCustomRender(dc, item, item_rect); - } - - // paint the overflow button - if (dropdown_size > 0 && m_overflowSizerItem && m_overflowVisible) - { - wxRect dropDownRect = GetOverflowRect(); - m_art->DrawOverflowButton(dc, this, dropDownRect, m_overflowState); - } -} - -void wxAuiToolBar::OnEraseBackground(wxEraseEvent& WXUNUSED(evt)) -{ - // empty -} - -void wxAuiToolBar::OnLeftDown(wxMouseEvent& evt) -{ - wxRect cli_rect(wxPoint(0,0), GetClientSize()); - - if (m_gripperSizerItem) - { - wxRect gripper_rect = m_gripperSizerItem->GetRect(); - if (gripper_rect.Contains(evt.GetX(), evt.GetY())) - { - // find aui manager - wxAuiManager* manager = wxAuiManager::GetManager(this); - if (!manager) - return; - - int x_drag_offset = evt.GetX() - gripper_rect.GetX(); - int y_drag_offset = evt.GetY() - gripper_rect.GetY(); - - // gripper was clicked - manager->StartPaneDrag(this, wxPoint(x_drag_offset, y_drag_offset)); - return; - } - } - - if (m_overflowSizerItem && m_overflowVisible && m_art) - { - wxRect overflow_rect = GetOverflowRect(); - - if (overflow_rect.Contains(evt.m_x, evt.m_y)) - { - wxAuiToolBarEvent e(wxEVT_AUITOOLBAR_OVERFLOW_CLICK, -1); - e.SetEventObject(this); - e.SetToolId(-1); - e.SetClickPoint(wxPoint(evt.GetX(), evt.GetY())); - bool processed = GetEventHandler()->ProcessEvent(e); - - if (processed) - { - DoIdleUpdate(); - } - else - { - size_t i, count; - wxAuiToolBarItemArray overflow_items; - - - // add custom overflow prepend items, if any - count = m_customOverflowPrepend.GetCount(); - for (i = 0; i < count; ++i) - overflow_items.Add(m_customOverflowPrepend[i]); - - // only show items that don't fit in the dropdown - count = m_items.GetCount(); - for (i = 0; i < count; ++i) - { - if (!GetToolFitsByIndex(i)) - overflow_items.Add(m_items[i]); - } - - // add custom overflow append items, if any - count = m_customOverflowAppend.GetCount(); - for (i = 0; i < count; ++i) - overflow_items.Add(m_customOverflowAppend[i]); - - int res = m_art->ShowDropDown(this, overflow_items); - m_overflowState = 0; - Refresh(false); - if (res != -1) - { - wxCommandEvent event(wxEVT_MENU, res); - event.SetEventObject(this); - GetParent()->GetEventHandler()->ProcessEvent(event); - } - } - - return; - } - } - - m_dragging = false; - m_actionPos = wxPoint(evt.GetX(), evt.GetY()); - m_actionItem = FindToolByPosition(evt.GetX(), evt.GetY()); - - if (m_actionItem) - { - if (m_actionItem->m_state & wxAUI_BUTTON_STATE_DISABLED) - { - m_actionPos = wxPoint(-1,-1); - m_actionItem = NULL; - return; - } - - UnsetToolTip(); - - // fire the tool dropdown event - wxAuiToolBarEvent e(wxEVT_AUITOOLBAR_TOOL_DROPDOWN, m_actionItem->m_toolId); - e.SetEventObject(this); - e.SetToolId(m_actionItem->m_toolId); - - int mouse_x = evt.GetX(); - wxRect rect = m_actionItem->m_sizerItem->GetRect(); - const bool dropDownHit = m_actionItem->m_dropDown && - mouse_x >= (rect.x+rect.width-BUTTON_DROPDOWN_WIDTH-1) && - mouse_x < (rect.x+rect.width); - e.SetDropDownClicked(dropDownHit); - - e.SetClickPoint(evt.GetPosition()); - e.SetItemRect(rect); - - // we only set the 'pressed button' state if we hit the actual button - // and not just the drop-down - SetPressedItem(dropDownHit ? 0 : m_actionItem); - - if(dropDownHit) - { - m_actionPos = wxPoint(-1,-1); - m_actionItem = NULL; - } - - if(!GetEventHandler()->ProcessEvent(e) || e.GetSkipped()) - CaptureMouse(); - - // Ensure hovered item is really ok, as mouse may have moved during - // event processing - wxPoint cursor_pos_after_evt = ScreenToClient(wxGetMousePosition()); - SetHoverItem(FindToolByPosition(cursor_pos_after_evt.x, cursor_pos_after_evt.y)); - - DoIdleUpdate(); - } -} - -void wxAuiToolBar::OnLeftUp(wxMouseEvent& evt) -{ - if (!HasCapture()) - return; - - SetPressedItem(NULL); - - wxAuiToolBarItem* hitItem; - hitItem = FindToolByPosition(evt.GetX(), evt.GetY()); - SetHoverItem(hitItem); - - if (m_dragging) - { - // TODO: it would make sense to send out an 'END_DRAG' event here, - // otherwise a client would never know what to do with the 'BEGIN_DRAG' - // event - - // OnCaptureLost() will be called now and this will reset all our state - // tracking variables - ReleaseMouse(); - } - else - { - if (m_actionItem && hitItem == m_actionItem) - { - UnsetToolTip(); - - wxCommandEvent e(wxEVT_MENU, m_actionItem->m_toolId); - e.SetEventObject(this); - - if (hitItem->m_kind == wxITEM_CHECK || hitItem->m_kind == wxITEM_RADIO) - { - const bool toggle = !(m_actionItem->m_state & wxAUI_BUTTON_STATE_CHECKED); - - ToggleTool(m_actionItem->m_toolId, toggle); - - // repaint immediately - Refresh(false); - Update(); - - e.SetInt(toggle); - } - - // we have to release the mouse *before* sending the event, because - // we don't know what a handler might do. It could open up a popup - // menu for example and that would make us lose our capture anyway. - - ReleaseMouse(); - - GetEventHandler()->ProcessEvent(e); - - // Ensure hovered item is really ok, as mouse may have moved during - // event processing - wxPoint cursor_pos_after_evt = ScreenToClient(wxGetMousePosition()); - SetHoverItem(FindToolByPosition(cursor_pos_after_evt.x, cursor_pos_after_evt.y)); - - DoIdleUpdate(); - } - else - ReleaseMouse(); - } -} - -void wxAuiToolBar::OnRightDown(wxMouseEvent& evt) -{ - if (HasCapture()) - return; - - wxRect cli_rect(wxPoint(0,0), GetClientSize()); - - if (m_gripperSizerItem) - { - wxRect gripper_rect = m_gripperSizerItem->GetRect(); - if (gripper_rect.Contains(evt.GetX(), evt.GetY())) - return; - } - - if (m_overflowSizerItem && m_art) - { - int dropdown_size = m_art->GetElementSize(wxAUI_TBART_OVERFLOW_SIZE); - if (dropdown_size > 0 && - evt.m_x > cli_rect.width - dropdown_size && - evt.m_y >= 0 && - evt.m_y < cli_rect.height) - { - return; - } - } - - m_actionPos = wxPoint(evt.GetX(), evt.GetY()); - m_actionItem = FindToolByPosition(evt.GetX(), evt.GetY()); - - if (m_actionItem && m_actionItem->m_state & wxAUI_BUTTON_STATE_DISABLED) - { - m_actionPos = wxPoint(-1,-1); - m_actionItem = NULL; - return; - } - - UnsetToolTip(); -} - -void wxAuiToolBar::OnRightUp(wxMouseEvent& evt) -{ - if (HasCapture()) - return; - - wxAuiToolBarItem* hitItem; - hitItem = FindToolByPosition(evt.GetX(), evt.GetY()); - - if (m_actionItem && hitItem == m_actionItem) - { - wxAuiToolBarEvent e(wxEVT_AUITOOLBAR_RIGHT_CLICK, m_actionItem->m_toolId); - e.SetEventObject(this); - e.SetToolId(m_actionItem->m_toolId); - e.SetClickPoint(m_actionPos); - GetEventHandler()->ProcessEvent(e); - DoIdleUpdate(); - } - else - { - // right-clicked on the invalid area of the toolbar - wxAuiToolBarEvent e(wxEVT_AUITOOLBAR_RIGHT_CLICK, -1); - e.SetEventObject(this); - e.SetToolId(-1); - e.SetClickPoint(m_actionPos); - GetEventHandler()->ProcessEvent(e); - DoIdleUpdate(); - } - - // reset member variables - m_actionPos = wxPoint(-1,-1); - m_actionItem = NULL; -} - -void wxAuiToolBar::OnMiddleDown(wxMouseEvent& evt) -{ - if (HasCapture()) - return; - - wxRect cli_rect(wxPoint(0,0), GetClientSize()); - - if (m_gripperSizerItem) - { - wxRect gripper_rect = m_gripperSizerItem->GetRect(); - if (gripper_rect.Contains(evt.GetX(), evt.GetY())) - return; - } - - if (m_overflowSizerItem && m_art) - { - int dropdown_size = m_art->GetElementSize(wxAUI_TBART_OVERFLOW_SIZE); - if (dropdown_size > 0 && - evt.m_x > cli_rect.width - dropdown_size && - evt.m_y >= 0 && - evt.m_y < cli_rect.height) - { - return; - } - } - - m_actionPos = wxPoint(evt.GetX(), evt.GetY()); - m_actionItem = FindToolByPosition(evt.GetX(), evt.GetY()); - - if (m_actionItem) - { - if (m_actionItem->m_state & wxAUI_BUTTON_STATE_DISABLED) - { - m_actionPos = wxPoint(-1,-1); - m_actionItem = NULL; - return; - } - } - - UnsetToolTip(); -} - -void wxAuiToolBar::OnMiddleUp(wxMouseEvent& evt) -{ - if (HasCapture()) - return; - - wxAuiToolBarItem* hitItem; - hitItem = FindToolByPosition(evt.GetX(), evt.GetY()); - - if (m_actionItem && hitItem == m_actionItem) - { - if (hitItem->m_kind == wxITEM_NORMAL) - { - wxAuiToolBarEvent e(wxEVT_AUITOOLBAR_MIDDLE_CLICK, m_actionItem->m_toolId); - e.SetEventObject(this); - e.SetToolId(m_actionItem->m_toolId); - e.SetClickPoint(m_actionPos); - GetEventHandler()->ProcessEvent(e); - DoIdleUpdate(); - } - } - - // reset member variables - m_actionPos = wxPoint(-1,-1); - m_actionItem = NULL; -} - -void wxAuiToolBar::OnMotion(wxMouseEvent& evt) -{ - const bool button_pressed = HasCapture(); - - // start a drag event - if (!m_dragging && button_pressed && - abs(evt.GetX() - m_actionPos.x) + abs(evt.GetY() - m_actionPos.y) > 5) - { - // TODO: sending this event only makes sense if there is an 'END_DRAG' - // event sent sometime in the future (see OnLeftUp()) - wxAuiToolBarEvent e(wxEVT_AUITOOLBAR_BEGIN_DRAG, GetId()); - e.SetEventObject(this); - e.SetToolId(m_actionItem->m_toolId); - m_dragging = GetEventHandler()->ProcessEvent(e) && !e.GetSkipped(); - - DoIdleUpdate(); - } - - if(m_dragging) - return; - - wxAuiToolBarItem* hitItem = FindToolByPosition(evt.GetX(), evt.GetY()); - if(button_pressed) - { - // if we have a button pressed we want it to be shown in 'depressed' - // state unless we move the mouse outside the button, then we want it - // to show as just 'highlighted' - if (hitItem == m_actionItem) - SetPressedItem(m_actionItem); - else - { - SetPressedItem(NULL); - SetHoverItem(m_actionItem); - } - } - else - { - SetHoverItem(hitItem); - - // tooltips handling - wxAuiToolBarItem* packingHitItem; - packingHitItem = FindToolByPositionWithPacking(evt.GetX(), evt.GetY()); - if (packingHitItem) - { - if (packingHitItem != m_tipItem) - { - m_tipItem = packingHitItem; - - if ( !packingHitItem->m_shortHelp.empty() ) - SetToolTip(packingHitItem->m_shortHelp); - else - UnsetToolTip(); - } - } - else - { - UnsetToolTip(); - m_tipItem = NULL; - } - - // figure out the dropdown button state (are we hovering or pressing it?) - RefreshOverflowState(); - } -} - -void wxAuiToolBar::DoResetMouseState() -{ - RefreshOverflowState(); - SetHoverItem(NULL); - SetPressedItem(NULL); - - m_tipItem = NULL; - - // we have to reset those here, because the mouse-up handlers which do - // it usually won't be called if we let go of a mouse button while we - // are outside of the window - m_actionPos = wxPoint(-1,-1); - m_actionItem = NULL; -} - -void wxAuiToolBar::OnLeaveWindow(wxMouseEvent& evt) -{ - if(HasCapture()) - { - evt.Skip(); - return; - } - - DoResetMouseState(); -} - -void wxAuiToolBar::OnCaptureLost(wxMouseCaptureLostEvent& WXUNUSED(evt)) -{ - m_dragging = false; - - DoResetMouseState(); -} - -void wxAuiToolBar::OnSetCursor(wxSetCursorEvent& evt) -{ - wxCursor cursor = wxNullCursor; - - if (m_gripperSizerItem) - { - wxRect gripper_rect = m_gripperSizerItem->GetRect(); - if (gripper_rect.Contains(evt.GetX(), evt.GetY())) - { - cursor = wxCursor(wxCURSOR_SIZING); - } - } - - evt.SetCursor(cursor); -} - - -#endif // wxUSE_AUI - diff --git a/Externals/wxWidgets3/src/aui/auibook.cpp b/Externals/wxWidgets3/src/aui/auibook.cpp deleted file mode 100644 index ff9064fc55..0000000000 --- a/Externals/wxWidgets3/src/aui/auibook.cpp +++ /dev/null @@ -1,3493 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/aui/auibook.cpp -// Purpose: wxaui: wx advanced user interface - notebook -// Author: Benjamin I. Williams -// Modified by: Jens Lody -// Created: 2006-06-28 -// Copyright: (C) Copyright 2006, Kirix Corporation, All Rights Reserved -// Licence: wxWindows Library Licence, Version 3.1 -/////////////////////////////////////////////////////////////////////////////// - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_AUI - -#include "wx/aui/auibook.h" - -#ifndef WX_PRECOMP - #include "wx/settings.h" - #include "wx/dcclient.h" - #include "wx/dcmemory.h" -#endif - -#include "wx/aui/tabmdi.h" - -#ifdef __WXMAC__ -#include "wx/osx/private.h" -#endif - -#include "wx/arrimpl.cpp" -WX_DEFINE_OBJARRAY(wxAuiNotebookPageArray) -WX_DEFINE_OBJARRAY(wxAuiTabContainerButtonArray) - -wxDEFINE_EVENT(wxEVT_AUINOTEBOOK_PAGE_CLOSE, wxAuiNotebookEvent); -wxDEFINE_EVENT(wxEVT_AUINOTEBOOK_PAGE_CLOSED, wxAuiNotebookEvent); -wxDEFINE_EVENT(wxEVT_AUINOTEBOOK_PAGE_CHANGING, wxAuiNotebookEvent); -wxDEFINE_EVENT(wxEVT_AUINOTEBOOK_PAGE_CHANGED, wxAuiNotebookEvent); -wxDEFINE_EVENT(wxEVT_AUINOTEBOOK_BUTTON, wxAuiNotebookEvent); -wxDEFINE_EVENT(wxEVT_AUINOTEBOOK_BEGIN_DRAG, wxAuiNotebookEvent); -wxDEFINE_EVENT(wxEVT_AUINOTEBOOK_END_DRAG, wxAuiNotebookEvent); -wxDEFINE_EVENT(wxEVT_AUINOTEBOOK_CANCEL_DRAG, wxAuiNotebookEvent); -wxDEFINE_EVENT(wxEVT_AUINOTEBOOK_DRAG_MOTION, wxAuiNotebookEvent); -wxDEFINE_EVENT(wxEVT_AUINOTEBOOK_ALLOW_DND, wxAuiNotebookEvent); -wxDEFINE_EVENT(wxEVT_AUINOTEBOOK_BG_DCLICK, wxAuiNotebookEvent); -wxDEFINE_EVENT(wxEVT_AUINOTEBOOK_DRAG_DONE, wxAuiNotebookEvent); -wxDEFINE_EVENT(wxEVT_AUINOTEBOOK_TAB_MIDDLE_UP, wxAuiNotebookEvent); -wxDEFINE_EVENT(wxEVT_AUINOTEBOOK_TAB_MIDDLE_DOWN, wxAuiNotebookEvent); -wxDEFINE_EVENT(wxEVT_AUINOTEBOOK_TAB_RIGHT_UP, wxAuiNotebookEvent); -wxDEFINE_EVENT(wxEVT_AUINOTEBOOK_TAB_RIGHT_DOWN, wxAuiNotebookEvent); - -wxIMPLEMENT_CLASS(wxAuiNotebook, wxControl); -wxIMPLEMENT_CLASS(wxAuiTabCtrl, wxControl); -wxIMPLEMENT_DYNAMIC_CLASS(wxAuiNotebookEvent, wxBookCtrlEvent); - - -// -- wxAuiTabContainer class implementation -- - - -// wxAuiTabContainer is a class which contains information about each -// tab. It also can render an entire tab control to a specified DC. -// It's not a window class itself, because this code will be used by -// the wxFrameMananger, where it is disadvantageous to have separate -// windows for each tab control in the case of "docked tabs" - -// A derived class, wxAuiTabCtrl, is an actual wxWindow-derived window -// which can be used as a tab control in the normal sense. - - -wxAuiTabContainer::wxAuiTabContainer() -{ - m_tabOffset = 0; - m_flags = 0; - m_art = new wxAuiDefaultTabArt; - - AddButton(wxAUI_BUTTON_LEFT, wxLEFT); - AddButton(wxAUI_BUTTON_RIGHT, wxRIGHT); - AddButton(wxAUI_BUTTON_WINDOWLIST, wxRIGHT); - AddButton(wxAUI_BUTTON_CLOSE, wxRIGHT); -} - -wxAuiTabContainer::~wxAuiTabContainer() -{ - delete m_art; -} - -void wxAuiTabContainer::SetArtProvider(wxAuiTabArt* art) -{ - delete m_art; - m_art = art; - - if (m_art) - { - m_art->SetFlags(m_flags); - } -} - -wxAuiTabArt* wxAuiTabContainer::GetArtProvider() const -{ - return m_art; -} - -void wxAuiTabContainer::SetFlags(unsigned int flags) -{ - m_flags = flags; - - // check for new close button settings - RemoveButton(wxAUI_BUTTON_LEFT); - RemoveButton(wxAUI_BUTTON_RIGHT); - RemoveButton(wxAUI_BUTTON_WINDOWLIST); - RemoveButton(wxAUI_BUTTON_CLOSE); - - - if (flags & wxAUI_NB_SCROLL_BUTTONS) - { - AddButton(wxAUI_BUTTON_LEFT, wxLEFT); - AddButton(wxAUI_BUTTON_RIGHT, wxRIGHT); - } - - if (flags & wxAUI_NB_WINDOWLIST_BUTTON) - { - AddButton(wxAUI_BUTTON_WINDOWLIST, wxRIGHT); - } - - if (flags & wxAUI_NB_CLOSE_BUTTON) - { - AddButton(wxAUI_BUTTON_CLOSE, wxRIGHT); - } - - if (m_art) - { - m_art->SetFlags(m_flags); - } -} - -unsigned int wxAuiTabContainer::GetFlags() const -{ - return m_flags; -} - - -void wxAuiTabContainer::SetNormalFont(const wxFont& font) -{ - m_art->SetNormalFont(font); -} - -void wxAuiTabContainer::SetSelectedFont(const wxFont& font) -{ - m_art->SetSelectedFont(font); -} - -void wxAuiTabContainer::SetMeasuringFont(const wxFont& font) -{ - m_art->SetMeasuringFont(font); -} - -void wxAuiTabContainer::SetColour(const wxColour& colour) -{ - m_art->SetColour(colour); -} - -void wxAuiTabContainer::SetActiveColour(const wxColour& colour) -{ - m_art->SetActiveColour(colour); -} - -void wxAuiTabContainer::SetRect(const wxRect& rect) -{ - m_rect = rect; - - if (m_art) - { - m_art->SetSizingInfo(rect.GetSize(), m_pages.GetCount()); - } -} - -bool wxAuiTabContainer::AddPage(wxWindow* page, - const wxAuiNotebookPage& info) -{ - wxAuiNotebookPage page_info; - page_info = info; - page_info.window = page; - page_info.hover = false; - - m_pages.Add(page_info); - - // let the art provider know how many pages we have - if (m_art) - { - m_art->SetSizingInfo(m_rect.GetSize(), m_pages.GetCount()); - } - - return true; -} - -bool wxAuiTabContainer::InsertPage(wxWindow* page, - const wxAuiNotebookPage& info, - size_t idx) -{ - wxAuiNotebookPage page_info; - page_info = info; - page_info.window = page; - page_info.hover = false; - - if (idx >= m_pages.GetCount()) - m_pages.Add(page_info); - else - m_pages.Insert(page_info, idx); - - // let the art provider know how many pages we have - if (m_art) - { - m_art->SetSizingInfo(m_rect.GetSize(), m_pages.GetCount()); - } - - return true; -} - -bool wxAuiTabContainer::MovePage(wxWindow* page, - size_t new_idx) -{ - int idx = GetIdxFromWindow(page); - if (idx == -1) - return false; - - // get page entry, make a copy of it - wxAuiNotebookPage p = GetPage(idx); - - // remove old page entry - RemovePage(page); - - // insert page where it should be - InsertPage(page, p, new_idx); - - return true; -} - -bool wxAuiTabContainer::RemovePage(wxWindow* wnd) -{ - size_t i, page_count = m_pages.GetCount(); - for (i = 0; i < page_count; ++i) - { - wxAuiNotebookPage& page = m_pages.Item(i); - if (page.window == wnd) - { - m_pages.RemoveAt(i); - - // let the art provider know how many pages we have - if (m_art) - { - m_art->SetSizingInfo(m_rect.GetSize(), m_pages.GetCount()); - } - - return true; - } - } - - return false; -} - -bool wxAuiTabContainer::SetActivePage(wxWindow* wnd) -{ - bool found = false; - - size_t i, page_count = m_pages.GetCount(); - for (i = 0; i < page_count; ++i) - { - wxAuiNotebookPage& page = m_pages.Item(i); - if (page.window == wnd) - { - page.active = true; - found = true; - } - else - { - page.active = false; - } - } - - return found; -} - -void wxAuiTabContainer::SetNoneActive() -{ - size_t i, page_count = m_pages.GetCount(); - for (i = 0; i < page_count; ++i) - { - wxAuiNotebookPage& page = m_pages.Item(i); - page.active = false; - } -} - -bool wxAuiTabContainer::SetActivePage(size_t page) -{ - if (page >= m_pages.GetCount()) - return false; - - return SetActivePage(m_pages.Item(page).window); -} - -int wxAuiTabContainer::GetActivePage() const -{ - size_t i, page_count = m_pages.GetCount(); - for (i = 0; i < page_count; ++i) - { - wxAuiNotebookPage& page = m_pages.Item(i); - if (page.active) - return i; - } - - return -1; -} - -wxWindow* wxAuiTabContainer::GetWindowFromIdx(size_t idx) const -{ - if (idx >= m_pages.GetCount()) - return NULL; - - return m_pages[idx].window; -} - -int wxAuiTabContainer::GetIdxFromWindow(wxWindow* wnd) const -{ - const size_t page_count = m_pages.GetCount(); - for ( size_t i = 0; i < page_count; ++i ) - { - wxAuiNotebookPage& page = m_pages.Item(i); - if (page.window == wnd) - return i; - } - return wxNOT_FOUND; -} - -wxAuiNotebookPage& wxAuiTabContainer::GetPage(size_t idx) -{ - wxASSERT_MSG(idx < m_pages.GetCount(), wxT("Invalid Page index")); - - return m_pages[idx]; -} - -const wxAuiNotebookPage& wxAuiTabContainer::GetPage(size_t idx) const -{ - wxASSERT_MSG(idx < m_pages.GetCount(), wxT("Invalid Page index")); - - return m_pages[idx]; -} - -wxAuiNotebookPageArray& wxAuiTabContainer::GetPages() -{ - return m_pages; -} - -size_t wxAuiTabContainer::GetPageCount() const -{ - return m_pages.GetCount(); -} - -void wxAuiTabContainer::AddButton(int id, - int location, - const wxBitmap& normalBitmap, - const wxBitmap& disabledBitmap) -{ - wxAuiTabContainerButton button; - button.id = id; - button.bitmap = normalBitmap; - button.disBitmap = disabledBitmap; - button.location = location; - button.curState = wxAUI_BUTTON_STATE_NORMAL; - - m_buttons.Add(button); -} - -void wxAuiTabContainer::RemoveButton(int id) -{ - size_t i, button_count = m_buttons.GetCount(); - - for (i = 0; i < button_count; ++i) - { - if (m_buttons.Item(i).id == id) - { - m_buttons.RemoveAt(i); - return; - } - } -} - - - -size_t wxAuiTabContainer::GetTabOffset() const -{ - return m_tabOffset; -} - -void wxAuiTabContainer::SetTabOffset(size_t offset) -{ - m_tabOffset = offset; -} - - - - -// Render() renders the tab catalog to the specified DC -// It is a virtual function and can be overridden to -// provide custom drawing capabilities -void wxAuiTabContainer::Render(wxDC* raw_dc, wxWindow* wnd) -{ - if (!raw_dc || !raw_dc->IsOk()) - return; - if (m_rect.IsEmpty()) - return; - - wxMemoryDC dc; - - // use the same layout direction as the window DC uses to ensure that the - // text is rendered correctly - dc.SetLayoutDirection(raw_dc->GetLayoutDirection()); - - wxBitmap bmp; - size_t i; - size_t page_count = m_pages.GetCount(); - size_t button_count = m_buttons.GetCount(); - - // create off-screen bitmap - bmp.Create(m_rect.GetWidth(), m_rect.GetHeight(),*raw_dc); - dc.SelectObject(bmp); - - if (!dc.IsOk()) - return; - - // ensure we show as many tabs as possible - while (m_tabOffset > 0 && IsTabVisible(page_count-1, m_tabOffset-1, &dc, wnd)) - --m_tabOffset; - - // find out if size of tabs is larger than can be - // afforded on screen - int total_width = 0; - int visible_width = 0; - for (i = 0; i < page_count; ++i) - { - wxAuiNotebookPage& page = m_pages.Item(i); - - // determine if a close button is on this tab - bool close_button = false; - if ((m_flags & wxAUI_NB_CLOSE_ON_ALL_TABS) != 0 || - ((m_flags & wxAUI_NB_CLOSE_ON_ACTIVE_TAB) != 0 && page.active)) - { - close_button = true; - } - - - int x_extent = 0; - wxSize size = m_art->GetTabSize(dc, - wnd, - page.caption, - page.bitmap, - page.active, - close_button ? - wxAUI_BUTTON_STATE_NORMAL : - wxAUI_BUTTON_STATE_HIDDEN, - &x_extent); - - if (i+1 < page_count) - total_width += x_extent; - else - total_width += size.x; - - if (i >= m_tabOffset) - { - if (i+1 < page_count) - visible_width += x_extent; - else - visible_width += size.x; - } - } - - if (total_width > m_rect.GetWidth() || m_tabOffset != 0) - { - // show left/right buttons - for (i = 0; i < button_count; ++i) - { - wxAuiTabContainerButton& button = m_buttons.Item(i); - if (button.id == wxAUI_BUTTON_LEFT || - button.id == wxAUI_BUTTON_RIGHT) - { - button.curState &= ~wxAUI_BUTTON_STATE_HIDDEN; - } - } - } - else - { - // hide left/right buttons - for (i = 0; i < button_count; ++i) - { - wxAuiTabContainerButton& button = m_buttons.Item(i); - if (button.id == wxAUI_BUTTON_LEFT || - button.id == wxAUI_BUTTON_RIGHT) - { - button.curState |= wxAUI_BUTTON_STATE_HIDDEN; - } - } - } - - // determine whether left button should be enabled - for (i = 0; i < button_count; ++i) - { - wxAuiTabContainerButton& button = m_buttons.Item(i); - if (button.id == wxAUI_BUTTON_LEFT) - { - if (m_tabOffset == 0) - button.curState |= wxAUI_BUTTON_STATE_DISABLED; - else - button.curState &= ~wxAUI_BUTTON_STATE_DISABLED; - } - if (button.id == wxAUI_BUTTON_RIGHT) - { - if (visible_width < m_rect.GetWidth() - ((int)button_count*16)) - button.curState |= wxAUI_BUTTON_STATE_DISABLED; - else - button.curState &= ~wxAUI_BUTTON_STATE_DISABLED; - } - } - - - - // draw background - m_art->DrawBackground(dc, wnd, m_rect); - - // draw buttons - int left_buttons_width = 0; - int right_buttons_width = 0; - - // draw the buttons on the right side - int offset = m_rect.x + m_rect.width; - for (i = 0; i < button_count; ++i) - { - wxAuiTabContainerButton& button = m_buttons.Item(button_count - i - 1); - - if (button.location != wxRIGHT) - continue; - if (button.curState & wxAUI_BUTTON_STATE_HIDDEN) - continue; - - wxRect button_rect = m_rect; - button_rect.SetY(1); - button_rect.SetWidth(offset); - - m_art->DrawButton(dc, - wnd, - button_rect, - button.id, - button.curState, - wxRIGHT, - &button.rect); - - offset -= button.rect.GetWidth(); - right_buttons_width += button.rect.GetWidth(); - } - - - - offset = 0; - - // draw the buttons on the left side - - for (i = 0; i < button_count; ++i) - { - wxAuiTabContainerButton& button = m_buttons.Item(button_count - i - 1); - - if (button.location != wxLEFT) - continue; - if (button.curState & wxAUI_BUTTON_STATE_HIDDEN) - continue; - - wxRect button_rect(offset, 1, 1000, m_rect.height); - - m_art->DrawButton(dc, - wnd, - button_rect, - button.id, - button.curState, - wxLEFT, - &button.rect); - - offset += button.rect.GetWidth(); - left_buttons_width += button.rect.GetWidth(); - } - - offset = left_buttons_width; - - if (offset == 0) - offset += m_art->GetIndentSize(); - - - // prepare the tab-close-button array - // make sure tab button entries which aren't used are marked as hidden - for (i = page_count; i < m_tabCloseButtons.GetCount(); ++i) - m_tabCloseButtons.Item(i).curState = wxAUI_BUTTON_STATE_HIDDEN; - - // make sure there are enough tab button entries to accommodate all tabs - while (m_tabCloseButtons.GetCount() < page_count) - { - wxAuiTabContainerButton tempbtn; - tempbtn.id = wxAUI_BUTTON_CLOSE; - tempbtn.location = wxCENTER; - tempbtn.curState = wxAUI_BUTTON_STATE_HIDDEN; - m_tabCloseButtons.Add(tempbtn); - } - - - // buttons before the tab offset must be set to hidden - for (i = 0; i < m_tabOffset; ++i) - { - m_tabCloseButtons.Item(i).curState = wxAUI_BUTTON_STATE_HIDDEN; - } - - - // draw the tabs - - size_t active = 999; - int active_offset = 0; - wxRect active_rect; - - int x_extent = 0; - wxRect rect = m_rect; - rect.y = 0; - rect.height = m_rect.height; - - for (i = m_tabOffset; i < page_count; ++i) - { - wxAuiNotebookPage& page = m_pages.Item(i); - wxAuiTabContainerButton& tab_button = m_tabCloseButtons.Item(i); - - // determine if a close button is on this tab - if ((m_flags & wxAUI_NB_CLOSE_ON_ALL_TABS) != 0 || - ((m_flags & wxAUI_NB_CLOSE_ON_ACTIVE_TAB) != 0 && page.active)) - { - if (tab_button.curState == wxAUI_BUTTON_STATE_HIDDEN) - { - tab_button.id = wxAUI_BUTTON_CLOSE; - tab_button.curState = wxAUI_BUTTON_STATE_NORMAL; - tab_button.location = wxCENTER; - } - } - else - { - tab_button.curState = wxAUI_BUTTON_STATE_HIDDEN; - } - - rect.x = offset; - rect.width = m_rect.width - right_buttons_width - offset - 2; - - if (rect.width <= 0) - break; - - m_art->DrawTab(dc, - wnd, - page, - rect, - tab_button.curState, - &page.rect, - &tab_button.rect, - &x_extent); - - if (page.active) - { - active = i; - active_offset = offset; - active_rect = rect; - } - - offset += x_extent; - } - - - // make sure to deactivate buttons which are off the screen to the right - for (++i; i < m_tabCloseButtons.GetCount(); ++i) - { - m_tabCloseButtons.Item(i).curState = wxAUI_BUTTON_STATE_HIDDEN; - } - - - // draw the active tab again so it stands in the foreground - if (active >= m_tabOffset && active < m_pages.GetCount()) - { - wxAuiNotebookPage& page = m_pages.Item(active); - - wxAuiTabContainerButton& tab_button = m_tabCloseButtons.Item(active); - - rect.x = active_offset; - m_art->DrawTab(dc, - wnd, - page, - active_rect, - tab_button.curState, - &page.rect, - &tab_button.rect, - &x_extent); - } - - - raw_dc->Blit(m_rect.x, m_rect.y, - m_rect.GetWidth(), m_rect.GetHeight(), - &dc, 0, 0); -} - -// Is the tab visible? -bool wxAuiTabContainer::IsTabVisible(int tabPage, int tabOffset, wxDC* dc, wxWindow* wnd) -{ - if (!dc || !dc->IsOk()) - return false; - - size_t i; - size_t page_count = m_pages.GetCount(); - size_t button_count = m_buttons.GetCount(); - - // Hasn't been rendered yet; assume it's visible - if (m_tabCloseButtons.GetCount() < page_count) - return true; - - // First check if both buttons are disabled - if so, there's no need to - // check further for visibility. - int arrowButtonVisibleCount = 0; - for (i = 0; i < button_count; ++i) - { - wxAuiTabContainerButton& button = m_buttons.Item(i); - if (button.id == wxAUI_BUTTON_LEFT || - button.id == wxAUI_BUTTON_RIGHT) - { - if ((button.curState & wxAUI_BUTTON_STATE_HIDDEN) == 0) - arrowButtonVisibleCount ++; - } - } - - // Tab must be visible - if (arrowButtonVisibleCount == 0) - return true; - - // If tab is less than the given offset, it must be invisible by definition - if (tabPage < tabOffset) - return false; - - // draw buttons - int left_buttons_width = 0; - int right_buttons_width = 0; - - // calculate size of the buttons on the right side - int offset = m_rect.x + m_rect.width; - for (i = 0; i < button_count; ++i) - { - wxAuiTabContainerButton& button = m_buttons.Item(button_count - i - 1); - - if (button.location != wxRIGHT) - continue; - if (button.curState & wxAUI_BUTTON_STATE_HIDDEN) - continue; - - offset -= button.rect.GetWidth(); - right_buttons_width += button.rect.GetWidth(); - } - - offset = 0; - - // calculate size of the buttons on the left side - for (i = 0; i < button_count; ++i) - { - wxAuiTabContainerButton& button = m_buttons.Item(button_count - i - 1); - - if (button.location != wxLEFT) - continue; - if (button.curState & wxAUI_BUTTON_STATE_HIDDEN) - continue; - - offset += button.rect.GetWidth(); - left_buttons_width += button.rect.GetWidth(); - } - - offset = left_buttons_width; - - if (offset == 0) - offset += m_art->GetIndentSize(); - - wxRect active_rect; - - wxRect rect = m_rect; - rect.y = 0; - rect.height = m_rect.height; - - // See if the given page is visible at the given tab offset (effectively scroll position) - for (i = tabOffset; i < page_count; ++i) - { - wxAuiNotebookPage& page = m_pages.Item(i); - wxAuiTabContainerButton& tab_button = m_tabCloseButtons.Item(i); - - rect.x = offset; - rect.width = m_rect.width - right_buttons_width - offset - 2; - - if (rect.width <= 0) - return false; // haven't found the tab, and we've run out of space, so return false - - int x_extent = 0; - m_art->GetTabSize(*dc, - wnd, - page.caption, - page.bitmap, - page.active, - tab_button.curState, - &x_extent); - - offset += x_extent; - - if (i == (size_t) tabPage) - { - // If not all of the tab is visible, and supposing there's space to display it all, - // we could do better so we return false. - if (((m_rect.width - right_buttons_width - offset - 2) <= 0) && ((m_rect.width - right_buttons_width - left_buttons_width) > x_extent)) - return false; - else - return true; - } - } - - // Shouldn't really get here, but if it does, assume the tab is visible to prevent - // further looping in calling code. - return true; -} - -// Make the tab visible if it wasn't already -void wxAuiTabContainer::MakeTabVisible(int tabPage, wxWindow* win) -{ - wxClientDC dc(win); - if (!IsTabVisible(tabPage, GetTabOffset(), & dc, win)) - { - int i; - for (i = 0; i < (int) m_pages.GetCount(); i++) - { - if (IsTabVisible(tabPage, i, & dc, win)) - { - SetTabOffset(i); - win->Refresh(); - return; - } - } - } -} - -// TabHitTest() tests if a tab was hit, passing the window pointer -// back if that condition was fulfilled. The function returns -// true if a tab was hit, otherwise false -bool wxAuiTabContainer::TabHitTest(int x, int y, wxWindow** hit) const -{ - if (!m_rect.Contains(x,y)) - return false; - - wxAuiTabContainerButton* btn = NULL; - if (ButtonHitTest(x, y, &btn) && !(btn->curState & wxAUI_BUTTON_STATE_DISABLED)) - { - if (m_buttons.Index(*btn) != wxNOT_FOUND) - return false; - } - - size_t i, page_count = m_pages.GetCount(); - - for (i = m_tabOffset; i < page_count; ++i) - { - wxAuiNotebookPage& page = m_pages.Item(i); - if (page.rect.Contains(x,y)) - { - if (hit) - *hit = page.window; - return true; - } - } - - return false; -} - -// ButtonHitTest() tests if a button was hit. The function returns -// true if a button was hit, otherwise false -bool wxAuiTabContainer::ButtonHitTest(int x, int y, - wxAuiTabContainerButton** hit) const -{ - if (!m_rect.Contains(x,y)) - return false; - - size_t i, button_count; - - - button_count = m_buttons.GetCount(); - for (i = 0; i < button_count; ++i) - { - wxAuiTabContainerButton& button = m_buttons.Item(i); - if (button.rect.Contains(x,y) && - !(button.curState & wxAUI_BUTTON_STATE_HIDDEN )) - { - if (hit) - *hit = &button; - return true; - } - } - - button_count = m_tabCloseButtons.GetCount(); - for (i = 0; i < button_count; ++i) - { - wxAuiTabContainerButton& button = m_tabCloseButtons.Item(i); - if (button.rect.Contains(x,y) && - !(button.curState & (wxAUI_BUTTON_STATE_HIDDEN | - wxAUI_BUTTON_STATE_DISABLED))) - { - if (hit) - *hit = &button; - return true; - } - } - - return false; -} - - - -// the utility function ShowWnd() is the same as show, -// except it handles wxAuiMDIChildFrame windows as well, -// as the Show() method on this class is "unplugged" -static void ShowWnd(wxWindow* wnd, bool show) -{ -#if wxUSE_MDI - if (wxDynamicCast(wnd, wxAuiMDIChildFrame)) - { - wxAuiMDIChildFrame* cf = (wxAuiMDIChildFrame*)wnd; - cf->DoShow(show); - } - else -#endif - { - wnd->Show(show); - } -} - - -// DoShowHide() this function shows the active window, then -// hides all of the other windows (in that order) -void wxAuiTabContainer::DoShowHide() -{ - wxAuiNotebookPageArray& pages = GetPages(); - size_t i, page_count = pages.GetCount(); - - // show new active page first - for (i = 0; i < page_count; ++i) - { - wxAuiNotebookPage& page = pages.Item(i); - if (page.active) - { - ShowWnd(page.window, true); - break; - } - } - - // hide all other pages - for (i = 0; i < page_count; ++i) - { - wxAuiNotebookPage& page = pages.Item(i); - if (!page.active) - ShowWnd(page.window, false); - } -} - - - - - - -// -- wxAuiTabCtrl class implementation -- - - - -wxBEGIN_EVENT_TABLE(wxAuiTabCtrl, wxControl) - EVT_PAINT(wxAuiTabCtrl::OnPaint) - EVT_ERASE_BACKGROUND(wxAuiTabCtrl::OnEraseBackground) - EVT_SIZE(wxAuiTabCtrl::OnSize) - EVT_LEFT_DOWN(wxAuiTabCtrl::OnLeftDown) - EVT_LEFT_DCLICK(wxAuiTabCtrl::OnLeftDClick) - EVT_LEFT_UP(wxAuiTabCtrl::OnLeftUp) - EVT_MIDDLE_DOWN(wxAuiTabCtrl::OnMiddleDown) - EVT_MIDDLE_UP(wxAuiTabCtrl::OnMiddleUp) - EVT_RIGHT_DOWN(wxAuiTabCtrl::OnRightDown) - EVT_RIGHT_UP(wxAuiTabCtrl::OnRightUp) - EVT_MOTION(wxAuiTabCtrl::OnMotion) - EVT_LEAVE_WINDOW(wxAuiTabCtrl::OnLeaveWindow) - EVT_AUINOTEBOOK_BUTTON(wxID_ANY, wxAuiTabCtrl::OnButton) - EVT_SET_FOCUS(wxAuiTabCtrl::OnSetFocus) - EVT_KILL_FOCUS(wxAuiTabCtrl::OnKillFocus) - EVT_CHAR(wxAuiTabCtrl::OnChar) - EVT_MOUSE_CAPTURE_LOST(wxAuiTabCtrl::OnCaptureLost) -wxEND_EVENT_TABLE() - - -wxAuiTabCtrl::wxAuiTabCtrl(wxWindow* parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style) : wxControl(parent, id, pos, size, style) -{ - SetName(wxT("wxAuiTabCtrl")); - m_clickPt = wxDefaultPosition; - m_isDragging = false; - m_hoverButton = NULL; - m_pressedButton = NULL; -} - -wxAuiTabCtrl::~wxAuiTabCtrl() -{ -} - -void wxAuiTabCtrl::OnPaint(wxPaintEvent&) -{ - wxPaintDC dc(this); - - dc.SetFont(GetFont()); - - if (GetPageCount() > 0) - Render(&dc, this); -} - -void wxAuiTabCtrl::OnEraseBackground(wxEraseEvent& WXUNUSED(evt)) -{ -} - -void wxAuiTabCtrl::OnSize(wxSizeEvent& evt) -{ - wxSize s = evt.GetSize(); - wxRect r(0, 0, s.GetWidth(), s.GetHeight()); - SetRect(r); -} - -void wxAuiTabCtrl::OnLeftDown(wxMouseEvent& evt) -{ - CaptureMouse(); - m_clickPt = wxDefaultPosition; - m_isDragging = false; - m_clickTab = NULL; - m_pressedButton = NULL; - - - wxWindow* wnd; - if (TabHitTest(evt.m_x, evt.m_y, &wnd)) - { - int new_selection = GetIdxFromWindow(wnd); - - // wxAuiNotebooks always want to receive this event - // even if the tab is already active, because they may - // have multiple tab controls - if ((new_selection != GetActivePage() || - wxDynamicCast(GetParent(), wxAuiNotebook)) && !m_hoverButton) - { - wxAuiNotebookEvent e(wxEVT_AUINOTEBOOK_PAGE_CHANGING, m_windowId); - e.SetSelection(new_selection); - e.SetOldSelection(GetActivePage()); - e.SetEventObject(this); - GetEventHandler()->ProcessEvent(e); - } - - m_clickPt.x = evt.m_x; - m_clickPt.y = evt.m_y; - m_clickTab = wnd; - } - - if (m_hoverButton) - { - m_pressedButton = m_hoverButton; - m_pressedButton->curState = wxAUI_BUTTON_STATE_PRESSED; - Refresh(); - Update(); - } -} - -void wxAuiTabCtrl::OnCaptureLost(wxMouseCaptureLostEvent& WXUNUSED(event)) -{ - if (m_isDragging) - { - m_isDragging = false; - - wxAuiNotebookEvent evt(wxEVT_AUINOTEBOOK_CANCEL_DRAG, m_windowId); - evt.SetSelection(GetIdxFromWindow(m_clickTab)); - evt.SetOldSelection(evt.GetSelection()); - evt.SetEventObject(this); - GetEventHandler()->ProcessEvent(evt); - } -} - -void wxAuiTabCtrl::OnLeftUp(wxMouseEvent& evt) -{ - if (GetCapture() == this) - ReleaseMouse(); - - if (m_isDragging) - { - m_isDragging = false; - - wxAuiNotebookEvent e(wxEVT_AUINOTEBOOK_END_DRAG, m_windowId); - e.SetSelection(GetIdxFromWindow(m_clickTab)); - e.SetOldSelection(e.GetSelection()); - e.SetEventObject(this); - GetEventHandler()->ProcessEvent(e); - - return; - } - - if (m_pressedButton) - { - // make sure we're still clicking the button - wxAuiTabContainerButton* button = NULL; - if (!ButtonHitTest(evt.m_x, evt.m_y, &button) || - button->curState & wxAUI_BUTTON_STATE_DISABLED) - return; - - if (button != m_pressedButton) - { - m_pressedButton = NULL; - return; - } - - Refresh(); - Update(); - - if (!(m_pressedButton->curState & wxAUI_BUTTON_STATE_DISABLED)) - { - wxAuiNotebookEvent e(wxEVT_AUINOTEBOOK_BUTTON, m_windowId); - e.SetSelection(GetIdxFromWindow(m_clickTab)); - e.SetInt(m_pressedButton->id); - e.SetEventObject(this); - GetEventHandler()->ProcessEvent(e); - } - - m_pressedButton = NULL; - } - - m_clickPt = wxDefaultPosition; - m_isDragging = false; - m_clickTab = NULL; -} - -void wxAuiTabCtrl::OnMiddleUp(wxMouseEvent& evt) -{ - wxWindow* wnd = NULL; - if (!TabHitTest(evt.m_x, evt.m_y, &wnd)) - return; - - wxAuiNotebookEvent e(wxEVT_AUINOTEBOOK_TAB_MIDDLE_UP, m_windowId); - e.SetEventObject(this); - e.SetSelection(GetIdxFromWindow(wnd)); - GetEventHandler()->ProcessEvent(e); -} - -void wxAuiTabCtrl::OnMiddleDown(wxMouseEvent& evt) -{ - wxWindow* wnd = NULL; - if (!TabHitTest(evt.m_x, evt.m_y, &wnd)) - return; - - wxAuiNotebookEvent e(wxEVT_AUINOTEBOOK_TAB_MIDDLE_DOWN, m_windowId); - e.SetEventObject(this); - e.SetSelection(GetIdxFromWindow(wnd)); - GetEventHandler()->ProcessEvent(e); -} - -void wxAuiTabCtrl::OnRightUp(wxMouseEvent& evt) -{ - wxWindow* wnd = NULL; - if (!TabHitTest(evt.m_x, evt.m_y, &wnd)) - return; - - wxAuiNotebookEvent e(wxEVT_AUINOTEBOOK_TAB_RIGHT_UP, m_windowId); - e.SetEventObject(this); - e.SetSelection(GetIdxFromWindow(wnd)); - GetEventHandler()->ProcessEvent(e); -} - -void wxAuiTabCtrl::OnRightDown(wxMouseEvent& evt) -{ - wxWindow* wnd = NULL; - if (!TabHitTest(evt.m_x, evt.m_y, &wnd)) - return; - - wxAuiNotebookEvent e(wxEVT_AUINOTEBOOK_TAB_RIGHT_DOWN, m_windowId); - e.SetEventObject(this); - e.SetSelection(GetIdxFromWindow(wnd)); - GetEventHandler()->ProcessEvent(e); -} - -void wxAuiTabCtrl::OnLeftDClick(wxMouseEvent& evt) -{ - wxWindow* wnd; - wxAuiTabContainerButton* button; - if (!TabHitTest(evt.m_x, evt.m_y, &wnd) && !ButtonHitTest(evt.m_x, evt.m_y, &button)) - { - wxAuiNotebookEvent e(wxEVT_AUINOTEBOOK_BG_DCLICK, m_windowId); - e.SetEventObject(this); - GetEventHandler()->ProcessEvent(e); - } -} - -void wxAuiTabCtrl::OnMotion(wxMouseEvent& evt) -{ - wxPoint pos = evt.GetPosition(); - - // check if the mouse is hovering above a button - wxAuiTabContainerButton* button; - if (ButtonHitTest(pos.x, pos.y, &button) && !(button->curState & wxAUI_BUTTON_STATE_DISABLED)) - { - if (m_hoverButton && button != m_hoverButton) - { - m_hoverButton->curState = wxAUI_BUTTON_STATE_NORMAL; - m_hoverButton = NULL; - Refresh(); - Update(); - } - - if (button->curState != wxAUI_BUTTON_STATE_HOVER) - { - button->curState = wxAUI_BUTTON_STATE_HOVER; - Refresh(); - Update(); - - m_hoverButton = button; - return; - } - } - else - { - if (m_hoverButton) - { - m_hoverButton->curState = wxAUI_BUTTON_STATE_NORMAL; - m_hoverButton = NULL; - Refresh(); - Update(); - } - } - - wxWindow* wnd = NULL; - if (evt.Moving() && TabHitTest(evt.m_x, evt.m_y, &wnd)) - { - SetHoverTab(wnd); - -#if wxUSE_TOOLTIPS - wxString tooltip(m_pages[GetIdxFromWindow(wnd)].tooltip); - - // If the text changes, set it else, keep old, to avoid - // 'moving tooltip' effect - if (GetToolTipText() != tooltip) - SetToolTip(tooltip); -#endif // wxUSE_TOOLTIPS - } - else - { - SetHoverTab(NULL); - -#if wxUSE_TOOLTIPS - UnsetToolTip(); -#endif // wxUSE_TOOLTIPS - } - - if (!evt.LeftIsDown() || m_clickPt == wxDefaultPosition) - return; - - if (m_isDragging) - { - wxAuiNotebookEvent e(wxEVT_AUINOTEBOOK_DRAG_MOTION, m_windowId); - e.SetSelection(GetIdxFromWindow(m_clickTab)); - e.SetOldSelection(e.GetSelection()); - e.SetEventObject(this); - GetEventHandler()->ProcessEvent(e); - return; - } - - - int drag_x_threshold = wxSystemSettings::GetMetric(wxSYS_DRAG_X); - int drag_y_threshold = wxSystemSettings::GetMetric(wxSYS_DRAG_Y); - - if (abs(pos.x - m_clickPt.x) > drag_x_threshold || - abs(pos.y - m_clickPt.y) > drag_y_threshold) - { - wxAuiNotebookEvent e(wxEVT_AUINOTEBOOK_BEGIN_DRAG, m_windowId); - e.SetSelection(GetIdxFromWindow(m_clickTab)); - e.SetOldSelection(e.GetSelection()); - e.SetEventObject(this); - GetEventHandler()->ProcessEvent(e); - - m_isDragging = true; - } -} - -void wxAuiTabCtrl::OnLeaveWindow(wxMouseEvent& WXUNUSED(event)) -{ - if (m_hoverButton) - { - m_hoverButton->curState = wxAUI_BUTTON_STATE_NORMAL; - m_hoverButton = NULL; - Refresh(); - Update(); - } - - SetHoverTab(NULL); -} - -void wxAuiTabCtrl::OnButton(wxAuiNotebookEvent& event) -{ - int button = event.GetInt(); - - if (button == wxAUI_BUTTON_LEFT || button == wxAUI_BUTTON_RIGHT) - { - if (button == wxAUI_BUTTON_LEFT) - { - if (GetTabOffset() > 0) - { - SetTabOffset(GetTabOffset()-1); - Refresh(); - Update(); - } - } - else - { - SetTabOffset(GetTabOffset()+1); - Refresh(); - Update(); - } - } - else if (button == wxAUI_BUTTON_WINDOWLIST) - { - int idx = GetArtProvider()->ShowDropDown(this, m_pages, GetActivePage()); - - if (idx != -1) - { - wxAuiNotebookEvent e(wxEVT_AUINOTEBOOK_PAGE_CHANGING, m_windowId); - e.SetSelection(idx); - e.SetOldSelection(GetActivePage()); - e.SetEventObject(this); - GetEventHandler()->ProcessEvent(e); - } - } - else - { - event.Skip(); - } -} - -void wxAuiTabCtrl::OnSetFocus(wxFocusEvent& WXUNUSED(event)) -{ - Refresh(); -} - -void wxAuiTabCtrl::OnKillFocus(wxFocusEvent& WXUNUSED(event)) -{ - Refresh(); -} - -void wxAuiTabCtrl::OnChar(wxKeyEvent& event) -{ - if (GetActivePage() == -1) - { - event.Skip(); - return; - } - - // We can't leave tab processing to the system; on Windows, tabs and keys - // get eaten by the system and not processed properly if we specify both - // wxTAB_TRAVERSAL and wxWANTS_CHARS. And if we specify just wxTAB_TRAVERSAL, - // we don't key arrow key events. - - int key = event.GetKeyCode(); - - if (key == WXK_NUMPAD_PAGEUP) - key = WXK_PAGEUP; - if (key == WXK_NUMPAD_PAGEDOWN) - key = WXK_PAGEDOWN; - if (key == WXK_NUMPAD_HOME) - key = WXK_HOME; - if (key == WXK_NUMPAD_END) - key = WXK_END; - if (key == WXK_NUMPAD_LEFT) - key = WXK_LEFT; - if (key == WXK_NUMPAD_RIGHT) - key = WXK_RIGHT; - - if (key == WXK_TAB || key == WXK_PAGEUP || key == WXK_PAGEDOWN) - { - bool bCtrlDown = event.ControlDown(); - bool bShiftDown = event.ShiftDown(); - - bool bForward = (key == WXK_TAB && !bShiftDown) || (key == WXK_PAGEDOWN); - bool bWindowChange = (key == WXK_PAGEUP) || (key == WXK_PAGEDOWN) || bCtrlDown; - bool bFromTab = (key == WXK_TAB); - - if (bFromTab && !bWindowChange) - { - // Handle ordinary tabs via Navigate. This is needed at least for wxGTK to tab properly. - Navigate(bForward ? wxNavigationKeyEvent::IsForward : wxNavigationKeyEvent::IsBackward); - return; - } - - wxAuiNotebook* nb = wxDynamicCast(GetParent(), wxAuiNotebook); - if (!nb) - { - event.Skip(); - return; - } - - wxNavigationKeyEvent keyEvent; - keyEvent.SetDirection(bForward); - keyEvent.SetWindowChange(bWindowChange); - keyEvent.SetFromTab(bFromTab); - keyEvent.SetEventObject(nb); - - if (!nb->GetEventHandler()->ProcessEvent(keyEvent)) - { - // Not processed? Do an explicit tab into the page. - wxWindow* win = GetWindowFromIdx(GetActivePage()); - if (win) - win->SetFocus(); - } - return; - } - - if (m_pages.GetCount() < 2) - { - event.Skip(); - return; - } - - int newPage = -1; - - int forwardKey, backwardKey; - if (GetLayoutDirection() == wxLayout_RightToLeft) - { - forwardKey = WXK_LEFT; - backwardKey = WXK_RIGHT; - } - else - { - forwardKey = WXK_RIGHT; - backwardKey = WXK_LEFT; - } - - if (key == forwardKey) - { - if (m_pages.GetCount() > 1) - { - if (GetActivePage() == -1) - newPage = 0; - else if (GetActivePage() < (int) (m_pages.GetCount() - 1)) - newPage = GetActivePage() + 1; - } - } - else if (key == backwardKey) - { - if (m_pages.GetCount() > 1) - { - if (GetActivePage() == -1) - newPage = (int) (m_pages.GetCount() - 1); - else if (GetActivePage() > 0) - newPage = GetActivePage() - 1; - } - } - else if (key == WXK_HOME) - { - newPage = 0; - } - else if (key == WXK_END) - { - newPage = (int) (m_pages.GetCount() - 1); - } - else - event.Skip(); - - if (newPage != -1) - { - wxAuiNotebookEvent e(wxEVT_AUINOTEBOOK_PAGE_CHANGING, m_windowId); - e.SetSelection(newPage); - e.SetOldSelection(newPage); - e.SetEventObject(this); - this->GetEventHandler()->ProcessEvent(e); - } - else - event.Skip(); -} - -// wxTabFrame is an interesting case. It's important that all child pages -// of the multi-notebook control are all actually children of that control -// (and not grandchildren). wxTabFrame facilitates this. There is one -// instance of wxTabFrame for each tab control inside the multi-notebook. -// It's important to know that wxTabFrame is not a real window, but it merely -// used to capture the dimensions/positioning of the internal tab control and -// it's managed page windows - -class wxTabFrame : public wxWindow -{ -public: - - wxTabFrame() - { - m_tabs = NULL; - m_rect = wxRect(0,0,200,200); - m_tabCtrlHeight = 20; - } - - ~wxTabFrame() - { - wxDELETE(m_tabs); - } - - void SetTabCtrlHeight(int h) - { - m_tabCtrlHeight = h; - } - -protected: - void DoSetSize(int x, int y, - int width, int height, - int WXUNUSED(sizeFlags = wxSIZE_AUTO)) wxOVERRIDE - { - m_rect = wxRect(x, y, width, height); - DoSizing(); - } - - void DoGetClientSize(int* x, int* y) const wxOVERRIDE - { - *x = m_rect.width; - *y = m_rect.height; - } - -public: - bool Show( bool WXUNUSED(show = true) ) wxOVERRIDE { return false; } - - void DoSizing() - { - if (!m_tabs) - return; - - if (m_tabs->IsFrozen() || m_tabs->GetParent()->IsFrozen()) - return; - - m_tab_rect = wxRect(m_rect.x, m_rect.y, m_rect.width, m_tabCtrlHeight); - if (m_tabs->GetFlags() & wxAUI_NB_BOTTOM) - { - m_tab_rect = wxRect (m_rect.x, m_rect.y + m_rect.height - m_tabCtrlHeight, m_rect.width, m_tabCtrlHeight); - m_tabs->SetSize (m_rect.x, m_rect.y + m_rect.height - m_tabCtrlHeight, m_rect.width, m_tabCtrlHeight); - m_tabs->SetRect (wxRect(0, 0, m_rect.width, m_tabCtrlHeight)); - } - else //TODO: if (GetFlags() & wxAUI_NB_TOP) - { - m_tab_rect = wxRect (m_rect.x, m_rect.y, m_rect.width, m_tabCtrlHeight); - m_tabs->SetSize (m_rect.x, m_rect.y, m_rect.width, m_tabCtrlHeight); - m_tabs->SetRect (wxRect(0, 0, m_rect.width, m_tabCtrlHeight)); - } - // TODO: else if (GetFlags() & wxAUI_NB_LEFT){} - // TODO: else if (GetFlags() & wxAUI_NB_RIGHT){} - - m_tabs->Refresh(); - m_tabs->Update(); - - wxAuiNotebookPageArray& pages = m_tabs->GetPages(); - size_t i, page_count = pages.GetCount(); - - for (i = 0; i < page_count; ++i) - { - wxAuiNotebookPage& page = pages.Item(i); - int border_space = m_tabs->GetArtProvider()->GetAdditionalBorderSpace(page.window); - - int height = m_rect.height - m_tabCtrlHeight - border_space; - if ( height < 0 ) - { - // avoid passing negative height to wxWindow::SetSize(), this - // results in assert failures/GTK+ warnings - height = 0; - } - int width = m_rect.width - 2 * border_space; - if (width < 0) - width = 0; - - if (m_tabs->GetFlags() & wxAUI_NB_BOTTOM) - { - page.window->SetSize(m_rect.x + border_space, - m_rect.y + border_space, - width, - height); - } - else //TODO: if (GetFlags() & wxAUI_NB_TOP) - { - page.window->SetSize(m_rect.x + border_space, - m_rect.y + m_tabCtrlHeight, - width, - height); - } - // TODO: else if (GetFlags() & wxAUI_NB_LEFT){} - // TODO: else if (GetFlags() & wxAUI_NB_RIGHT){} - -#if wxUSE_MDI - if (wxDynamicCast(page.window, wxAuiMDIChildFrame)) - { - wxAuiMDIChildFrame* wnd = (wxAuiMDIChildFrame*)page.window; - wnd->ApplyMDIChildFrameRect(); - } -#endif - } - } - -protected: - void DoGetSize(int* x, int* y) const wxOVERRIDE - { - if (x) - *x = m_rect.GetWidth(); - if (y) - *y = m_rect.GetHeight(); - } - -public: - void Update() wxOVERRIDE - { - // does nothing - } - - wxRect m_rect; - wxRect m_tab_rect; - wxAuiTabCtrl* m_tabs; - int m_tabCtrlHeight; -}; - - -const int wxAuiBaseTabCtrlId = 5380; - - -// -- wxAuiNotebook class implementation -- - -#define EVT_AUI_RANGE(id1, id2, event, func) \ - wx__DECLARE_EVT2(event, id1, id2, wxAuiNotebookEventHandler(func)) - -wxBEGIN_EVENT_TABLE(wxAuiNotebook, wxControl) - EVT_SIZE(wxAuiNotebook::OnSize) - EVT_CHILD_FOCUS(wxAuiNotebook::OnChildFocusNotebook) - EVT_AUI_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500, - wxEVT_AUINOTEBOOK_PAGE_CHANGING, - wxAuiNotebook::OnTabClicked) - EVT_AUI_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500, - wxEVT_AUINOTEBOOK_BEGIN_DRAG, - wxAuiNotebook::OnTabBeginDrag) - EVT_AUI_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500, - wxEVT_AUINOTEBOOK_END_DRAG, - wxAuiNotebook::OnTabEndDrag) - EVT_AUI_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500, - wxEVT_AUINOTEBOOK_CANCEL_DRAG, - wxAuiNotebook::OnTabCancelDrag) - EVT_AUI_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500, - wxEVT_AUINOTEBOOK_DRAG_MOTION, - wxAuiNotebook::OnTabDragMotion) - EVT_AUI_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500, - wxEVT_AUINOTEBOOK_BUTTON, - wxAuiNotebook::OnTabButton) - EVT_AUI_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500, - wxEVT_AUINOTEBOOK_TAB_MIDDLE_DOWN, - wxAuiNotebook::OnTabMiddleDown) - EVT_AUI_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500, - wxEVT_AUINOTEBOOK_TAB_MIDDLE_UP, - wxAuiNotebook::OnTabMiddleUp) - EVT_AUI_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500, - wxEVT_AUINOTEBOOK_TAB_RIGHT_DOWN, - wxAuiNotebook::OnTabRightDown) - EVT_AUI_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500, - wxEVT_AUINOTEBOOK_TAB_RIGHT_UP, - wxAuiNotebook::OnTabRightUp) - EVT_AUI_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500, - wxEVT_AUINOTEBOOK_BG_DCLICK, - wxAuiNotebook::OnTabBgDClick) - EVT_NAVIGATION_KEY(wxAuiNotebook::OnNavigationKeyNotebook) -wxEND_EVENT_TABLE() - -void wxAuiNotebook::Init() -{ - m_curPage = -1; - m_tabIdCounter = wxAuiBaseTabCtrlId; - m_dummyWnd = NULL; - m_tabCtrlHeight = 20; - m_requestedBmpSize = wxDefaultSize; - m_requestedTabCtrlHeight = -1; -} - -bool wxAuiNotebook::Create(wxWindow* parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style) -{ - if (!wxControl::Create(parent, id, pos, size, style)) - return false; - - InitNotebook(style); - - return true; -} - -// InitNotebook() contains common initialization -// code called by all constructors -void wxAuiNotebook::InitNotebook(long style) -{ - SetName(wxT("wxAuiNotebook")); - m_curPage = -1; - m_tabIdCounter = wxAuiBaseTabCtrlId; - m_dummyWnd = NULL; - m_flags = (unsigned int)style; - m_tabCtrlHeight = 20; - - m_normalFont = *wxNORMAL_FONT; - m_selectedFont = *wxNORMAL_FONT; - m_selectedFont.SetWeight(wxFONTWEIGHT_BOLD); - - SetArtProvider(new wxAuiDefaultTabArt); - - m_dummyWnd = new wxWindow(this, wxID_ANY, wxPoint(0,0), wxSize(0,0)); - m_dummyWnd->SetSize(200, 200); - m_dummyWnd->Show(false); - - m_mgr.SetManagedWindow(this); - m_mgr.SetFlags(wxAUI_MGR_DEFAULT); - m_mgr.SetDockSizeConstraint(1.0, 1.0); // no dock size constraint - - m_mgr.AddPane(m_dummyWnd, - wxAuiPaneInfo().Name(wxT("dummy")).Bottom().CaptionVisible(false).Show(false)); - - m_mgr.Update(); -} - -wxAuiNotebook::~wxAuiNotebook() -{ - // Indicate we're deleting pages - SendDestroyEvent(); - - while ( GetPageCount() > 0 ) - DeletePage(0); - - m_mgr.UnInit(); -} - -void wxAuiNotebook::SetArtProvider(wxAuiTabArt* art) -{ - m_tabs.SetArtProvider(art); - - // Update the height and do nothing else if it did something but otherwise - // (i.e. if the new art provider uses the same height as the old one) we - // need to manually set the art provider for all tabs ourselves. - if ( !UpdateTabCtrlHeight() ) - { - wxAuiPaneInfoArray& all_panes = m_mgr.GetAllPanes(); - const size_t pane_count = all_panes.GetCount(); - for (size_t i = 0; i < pane_count; ++i) - { - wxAuiPaneInfo& pane = all_panes.Item(i); - if (pane.name == wxT("dummy")) - continue; - wxTabFrame* tab_frame = (wxTabFrame*)pane.window; - wxAuiTabCtrl* tabctrl = tab_frame->m_tabs; - tabctrl->SetArtProvider(art->Clone()); - } - } -} - -// SetTabCtrlHeight() is the highest-level override of the -// tab height. A call to this function effectively enforces a -// specified tab ctrl height, overriding all other considerations, -// such as text or bitmap height. It overrides any call to -// SetUniformBitmapSize(). Specifying a height of -1 reverts -// any previous call and returns to the default behaviour - -void wxAuiNotebook::SetTabCtrlHeight(int height) -{ - m_requestedTabCtrlHeight = height; - - // if window is already initialized, recalculate the tab height - if (m_dummyWnd) - { - UpdateTabCtrlHeight(); - } -} - - -// SetUniformBitmapSize() ensures that all tabs will have -// the same height, even if some tabs don't have bitmaps -// Passing wxDefaultSize to this function will instruct -// the control to use dynamic tab height-- so when a tab -// with a large bitmap is added, the tab ctrl's height will -// automatically increase to accommodate the bitmap - -void wxAuiNotebook::SetUniformBitmapSize(const wxSize& size) -{ - m_requestedBmpSize = size; - - // if window is already initialized, recalculate the tab height - if (m_dummyWnd) - { - UpdateTabCtrlHeight(); - } -} - -// UpdateTabCtrlHeight() does the actual tab resizing. It's meant -// to be used internally -bool wxAuiNotebook::UpdateTabCtrlHeight() -{ - // get the tab ctrl height we will use - int height = CalculateTabCtrlHeight(); - - // if the tab control height needs to change, update - // all of our tab controls with the new height - if (m_tabCtrlHeight == height) - return false; - - wxAuiTabArt* art = m_tabs.GetArtProvider(); - - m_tabCtrlHeight = height; - - wxAuiPaneInfoArray& all_panes = m_mgr.GetAllPanes(); - size_t i, pane_count = all_panes.GetCount(); - for (i = 0; i < pane_count; ++i) - { - wxAuiPaneInfo& pane = all_panes.Item(i); - if (pane.name == wxT("dummy")) - continue; - wxTabFrame* tab_frame = (wxTabFrame*)pane.window; - wxAuiTabCtrl* tabctrl = tab_frame->m_tabs; - tab_frame->SetTabCtrlHeight(m_tabCtrlHeight); - tabctrl->SetArtProvider(art->Clone()); - tab_frame->DoSizing(); - } - - return true; -} - -void wxAuiNotebook::UpdateHintWindowSize() -{ - wxSize size = CalculateNewSplitSize(); - - // the placeholder hint window should be set to this size - wxAuiPaneInfo& info = m_mgr.GetPane(wxT("dummy")); - if (info.IsOk()) - { - info.MinSize(size); - info.BestSize(size); - m_dummyWnd->SetSize(size); - } -} - - -// calculates the size of the new split -wxSize wxAuiNotebook::CalculateNewSplitSize() -{ - // count number of tab controls - int tab_ctrl_count = 0; - wxAuiPaneInfoArray& all_panes = m_mgr.GetAllPanes(); - size_t i, pane_count = all_panes.GetCount(); - for (i = 0; i < pane_count; ++i) - { - wxAuiPaneInfo& pane = all_panes.Item(i); - if (pane.name == wxT("dummy")) - continue; - tab_ctrl_count++; - } - - wxSize new_split_size; - - // if there is only one tab control, the first split - // should happen around the middle - if (tab_ctrl_count < 2) - { - new_split_size = GetClientSize(); - new_split_size.x /= 2; - new_split_size.y /= 2; - } - else - { - // this is in place of a more complicated calculation - // that needs to be implemented - new_split_size = wxSize(180,180); - } - - return new_split_size; -} - -int wxAuiNotebook::CalculateTabCtrlHeight() -{ - // if a fixed tab ctrl height is specified, - // just return that instead of calculating a - // tab height - if (m_requestedTabCtrlHeight != -1) - return m_requestedTabCtrlHeight; - - // find out new best tab height - wxAuiTabArt* art = m_tabs.GetArtProvider(); - - return art->GetBestTabCtrlSize(this, - m_tabs.GetPages(), - m_requestedBmpSize); -} - - -wxAuiTabArt* wxAuiNotebook::GetArtProvider() const -{ - return m_tabs.GetArtProvider(); -} - -void wxAuiNotebook::SetWindowStyleFlag(long style) -{ - wxControl::SetWindowStyleFlag(style); - - m_flags = (unsigned int)style; - - // if the control is already initialized - if (m_mgr.GetManagedWindow() == (wxWindow*)this) - { - // let all of the tab children know about the new style - - wxAuiPaneInfoArray& all_panes = m_mgr.GetAllPanes(); - size_t i, pane_count = all_panes.GetCount(); - for (i = 0; i < pane_count; ++i) - { - wxAuiPaneInfo& pane = all_panes.Item(i); - if (pane.name == wxT("dummy")) - continue; - wxTabFrame* tabframe = (wxTabFrame*)pane.window; - wxAuiTabCtrl* tabctrl = tabframe->m_tabs; - tabctrl->SetFlags(m_flags); - tabframe->DoSizing(); - tabctrl->Refresh(); - tabctrl->Update(); - } - } -} - - -bool wxAuiNotebook::AddPage(wxWindow* page, - const wxString& caption, - bool select, - const wxBitmap& bitmap) -{ - return InsertPage(GetPageCount(), page, caption, select, bitmap); -} - -bool wxAuiNotebook::InsertPage(size_t page_idx, - wxWindow* page, - const wxString& caption, - bool select, - const wxBitmap& bitmap) -{ - wxASSERT_MSG(page, wxT("page pointer must be non-NULL")); - if (!page) - return false; - - page->Reparent(this); - - wxAuiNotebookPage info; - info.window = page; - info.caption = caption; - info.bitmap = bitmap; - info.active = false; - - // if there are currently no tabs, the first added - // tab must be active - if (m_tabs.GetPageCount() == 0) - info.active = true; - - m_tabs.InsertPage(page, info, page_idx); - - // if that was the first page added, even if - // select is false, it must become the "current page" - // (though no select events will be fired) - if (!select && m_tabs.GetPageCount() == 1) - select = true; - //m_curPage = GetPageIndex(page); - - wxAuiTabCtrl* active_tabctrl = GetActiveTabCtrl(); - if (page_idx >= active_tabctrl->GetPageCount()) - active_tabctrl->AddPage(page, info); - else - active_tabctrl->InsertPage(page, info, page_idx); - - UpdateTabCtrlHeight(); - DoSizing(); - active_tabctrl->DoShowHide(); - - // adjust selected index - if(m_curPage >= (int) page_idx) - m_curPage++; - - if (select) - { - SetSelectionToWindow(page); - } - - return true; -} - - -// DeletePage() removes a tab from the multi-notebook, -// and destroys the window as well -bool wxAuiNotebook::DeletePage(size_t page_idx) -{ - if (page_idx >= m_tabs.GetPageCount()) - return false; - - wxWindow* wnd = m_tabs.GetWindowFromIdx(page_idx); - - // hide the window in advance, as this will - // prevent flicker - ShowWnd(wnd, false); - - if (!RemovePage(page_idx)) - return false; - -#if wxUSE_MDI - // actually destroy the window now - if (wxDynamicCast(wnd, wxAuiMDIChildFrame)) - { - // delete the child frame with pending delete, as is - // customary with frame windows - if (!wxPendingDelete.Member(wnd)) - wxPendingDelete.Append(wnd); - } - else -#endif - { - wnd->Destroy(); - } - - return true; -} - - - -// RemovePage() removes a tab from the multi-notebook, -// but does not destroy the window -bool wxAuiNotebook::RemovePage(size_t page_idx) -{ - // save active window pointer - wxWindow* active_wnd = NULL; - if (m_curPage >= 0) - active_wnd = m_tabs.GetWindowFromIdx(m_curPage); - - // save pointer of window being deleted - wxWindow* wnd = m_tabs.GetWindowFromIdx(page_idx); - wxWindow* new_active = NULL; - - // make sure we found the page - if (!wnd) - return false; - - // find out which onscreen tab ctrl owns this tab - wxAuiTabCtrl* ctrl; - int ctrl_idx; - if (!FindTab(wnd, &ctrl, &ctrl_idx)) - return false; - - bool is_curpage = (m_curPage == (int)page_idx); - bool is_active_in_split = ctrl->GetPage(ctrl_idx).active; - - - // remove the tab from main catalog - if (!m_tabs.RemovePage(wnd)) - return false; - - // remove the tab from the onscreen tab ctrl - ctrl->RemovePage(wnd); - - if (is_active_in_split) - { - int ctrl_new_page_count = (int)ctrl->GetPageCount(); - - if (ctrl_idx >= ctrl_new_page_count) - ctrl_idx = ctrl_new_page_count-1; - - if (ctrl_idx >= 0 && ctrl_idx < (int)ctrl->GetPageCount()) - { - // set new page as active in the tab split - ctrl->SetActivePage(ctrl_idx); - - // if the page deleted was the current page for the - // entire tab control, then record the window - // pointer of the new active page for activation - if (is_curpage) - { - new_active = ctrl->GetWindowFromIdx(ctrl_idx); - } - } - } - else - { - // we are not deleting the active page, so keep it the same - new_active = active_wnd; - } - - - if (!new_active) - { - // we haven't yet found a new page to active, - // so select the next page from the main tab - // catalogue - - if (page_idx < m_tabs.GetPageCount()) - { - new_active = m_tabs.GetPage(page_idx).window; - } - - if (!new_active && m_tabs.GetPageCount() > 0) - { - new_active = m_tabs.GetPage(0).window; - } - } - - - RemoveEmptyTabFrames(); - - m_curPage = wxNOT_FOUND; - - // set new active pane unless we're being destroyed anyhow - if (new_active && !m_isBeingDeleted) - SetSelectionToWindow(new_active); - - return true; -} - -// GetPageIndex() returns the index of the page, or -1 if the -// page could not be located in the notebook -int wxAuiNotebook::GetPageIndex(wxWindow* page_wnd) const -{ - return m_tabs.GetIdxFromWindow(page_wnd); -} - - - -// SetPageText() changes the tab caption of the specified page -bool wxAuiNotebook::SetPageText(size_t page_idx, const wxString& text) -{ - if (page_idx >= m_tabs.GetPageCount()) - return false; - - // update our own tab catalog - wxAuiNotebookPage& page_info = m_tabs.GetPage(page_idx); - page_info.caption = text; - - // update what's on screen - wxAuiTabCtrl* ctrl; - int ctrl_idx; - if (FindTab(page_info.window, &ctrl, &ctrl_idx)) - { - wxAuiNotebookPage& info = ctrl->GetPage(ctrl_idx); - info.caption = text; - ctrl->Refresh(); - ctrl->Update(); - } - - return true; -} - -// returns the page caption -wxString wxAuiNotebook::GetPageText(size_t page_idx) const -{ - if (page_idx >= m_tabs.GetPageCount()) - return wxEmptyString; - - // update our own tab catalog - const wxAuiNotebookPage& page_info = m_tabs.GetPage(page_idx); - return page_info.caption; -} - -bool wxAuiNotebook::SetPageToolTip(size_t page_idx, const wxString& text) -{ - if (page_idx >= m_tabs.GetPageCount()) - return false; - - // update our own tab catalog - wxAuiNotebookPage& page_info = m_tabs.GetPage(page_idx); - page_info.tooltip = text; - - wxAuiTabCtrl* ctrl; - int ctrl_idx; - if (!FindTab(page_info.window, &ctrl, &ctrl_idx)) - return false; - - wxAuiNotebookPage& info = ctrl->GetPage(ctrl_idx); - info.tooltip = text; - - // NB: we don't update the tooltip if it is already being displayed, it - // typically never happens, no need to code that - return true; -} - -wxString wxAuiNotebook::GetPageToolTip(size_t page_idx) const -{ - if (page_idx >= m_tabs.GetPageCount()) - return wxString(); - - const wxAuiNotebookPage& page_info = m_tabs.GetPage(page_idx); - return page_info.tooltip; -} - -bool wxAuiNotebook::SetPageBitmap(size_t page_idx, const wxBitmap& bitmap) -{ - if (page_idx >= m_tabs.GetPageCount()) - return false; - - // update our own tab catalog - wxAuiNotebookPage& page_info = m_tabs.GetPage(page_idx); - page_info.bitmap = bitmap; - - // tab height might have changed - UpdateTabCtrlHeight(); - - // update what's on screen - wxAuiTabCtrl* ctrl; - int ctrl_idx; - if (FindTab(page_info.window, &ctrl, &ctrl_idx)) - { - wxAuiNotebookPage& info = ctrl->GetPage(ctrl_idx); - info.bitmap = bitmap; - ctrl->Refresh(); - ctrl->Update(); - } - - return true; -} - -// returns the page bitmap -wxBitmap wxAuiNotebook::GetPageBitmap(size_t page_idx) const -{ - if (page_idx >= m_tabs.GetPageCount()) - return wxBitmap(); - - // update our own tab catalog - const wxAuiNotebookPage& page_info = m_tabs.GetPage(page_idx); - return page_info.bitmap; -} - -// GetSelection() returns the index of the currently active page -int wxAuiNotebook::GetSelection() const -{ - return m_curPage; -} - -// SetSelection() sets the currently active page -int wxAuiNotebook::SetSelection(size_t new_page) -{ - return DoModifySelection(new_page, true); -} - -void wxAuiNotebook::SetSelectionToWindow(wxWindow *win) -{ - const int idx = m_tabs.GetIdxFromWindow(win); - wxCHECK_RET( idx != wxNOT_FOUND, wxT("invalid notebook page") ); - - - // since a tab was clicked, let the parent know that we received - // the focus, even if we will assign that focus immediately - // to the child tab in the SetSelection call below - // (the child focus event will also let wxAuiManager, if any, - // know that the notebook control has been activated) - - wxWindow* parent = GetParent(); - if (parent) - { - wxChildFocusEvent eventFocus(this); - parent->GetEventHandler()->ProcessEvent(eventFocus); - } - - - SetSelection(idx); -} - -// GetPageCount() returns the total number of -// pages managed by the multi-notebook -size_t wxAuiNotebook::GetPageCount() const -{ - return m_tabs.GetPageCount(); -} - -// GetPage() returns the wxWindow pointer of the -// specified page -wxWindow* wxAuiNotebook::GetPage(size_t page_idx) const -{ - wxASSERT(page_idx < m_tabs.GetPageCount()); - - return m_tabs.GetWindowFromIdx(page_idx); -} - -// DoSizing() performs all sizing operations in each tab control -void wxAuiNotebook::DoSizing() -{ - wxAuiPaneInfoArray& all_panes = m_mgr.GetAllPanes(); - size_t i, pane_count = all_panes.GetCount(); - for (i = 0; i < pane_count; ++i) - { - if (all_panes.Item(i).name == wxT("dummy")) - continue; - - wxTabFrame* tabframe = (wxTabFrame*)all_panes.Item(i).window; - tabframe->DoSizing(); - } -} - -// GetActiveTabCtrl() returns the active tab control. It is -// called to determine which control gets new windows being added -wxAuiTabCtrl* wxAuiNotebook::GetActiveTabCtrl() -{ - if (m_curPage >= 0 && m_curPage < (int)m_tabs.GetPageCount()) - { - wxAuiTabCtrl* ctrl; - int idx; - - // find the tab ctrl with the current page - if (FindTab(m_tabs.GetPage(m_curPage).window, - &ctrl, &idx)) - { - return ctrl; - } - } - - // no current page, just find the first tab ctrl - wxAuiPaneInfoArray& all_panes = m_mgr.GetAllPanes(); - size_t i, pane_count = all_panes.GetCount(); - for (i = 0; i < pane_count; ++i) - { - if (all_panes.Item(i).name == wxT("dummy")) - continue; - - wxTabFrame* tabframe = (wxTabFrame*)all_panes.Item(i).window; - return tabframe->m_tabs; - } - - // If there is no tabframe at all, create one - wxTabFrame* tabframe = new wxTabFrame; - tabframe->SetTabCtrlHeight(m_tabCtrlHeight); - tabframe->m_tabs = new wxAuiTabCtrl(this, - m_tabIdCounter++, - wxDefaultPosition, - wxDefaultSize, - wxNO_BORDER|wxWANTS_CHARS); - tabframe->m_tabs->SetFlags(m_flags); - tabframe->m_tabs->SetArtProvider(m_tabs.GetArtProvider()->Clone()); - m_mgr.AddPane(tabframe, - wxAuiPaneInfo().Center().CaptionVisible(false)); - - m_mgr.Update(); - - return tabframe->m_tabs; -} - -// FindTab() finds the tab control that currently contains the window as well -// as the index of the window in the tab control. It returns true if the -// window was found, otherwise false. -bool wxAuiNotebook::FindTab(wxWindow* page, wxAuiTabCtrl** ctrl, int* idx) -{ - wxAuiPaneInfoArray& all_panes = m_mgr.GetAllPanes(); - size_t i, pane_count = all_panes.GetCount(); - for (i = 0; i < pane_count; ++i) - { - if (all_panes.Item(i).name == wxT("dummy")) - continue; - - wxTabFrame* tabframe = (wxTabFrame*)all_panes.Item(i).window; - - int page_idx = tabframe->m_tabs->GetIdxFromWindow(page); - if (page_idx != -1) - { - *ctrl = tabframe->m_tabs; - *idx = page_idx; - return true; - } - } - - return false; -} - -void wxAuiNotebook::Split(size_t page, int direction) -{ - wxSize cli_size = GetClientSize(); - - // get the page's window pointer - wxWindow* wnd = GetPage(page); - if (!wnd) - return; - - // notebooks with 1 or less pages can't be split - if (GetPageCount() < 2) - return; - - // find out which tab control the page currently belongs to - wxAuiTabCtrl *src_tabs, *dest_tabs; - int src_idx = -1; - src_tabs = NULL; - if (!FindTab(wnd, &src_tabs, &src_idx)) - return; - if (!src_tabs || src_idx == -1) - return; - - // choose a split size - wxSize split_size; - if (GetPageCount() > 2) - { - split_size = CalculateNewSplitSize(); - } - else - { - // because there are two panes, always split them - // equally - split_size = GetClientSize(); - split_size.x /= 2; - split_size.y /= 2; - } - - - // create a new tab frame - wxTabFrame* new_tabs = new wxTabFrame; - new_tabs->m_rect = wxRect(wxPoint(0,0), split_size); - new_tabs->SetTabCtrlHeight(m_tabCtrlHeight); - new_tabs->m_tabs = new wxAuiTabCtrl(this, - m_tabIdCounter++, - wxDefaultPosition, - wxDefaultSize, - wxNO_BORDER|wxWANTS_CHARS); - new_tabs->m_tabs->SetArtProvider(m_tabs.GetArtProvider()->Clone()); - new_tabs->m_tabs->SetFlags(m_flags); - dest_tabs = new_tabs->m_tabs; - - // create a pane info structure with the information - // about where the pane should be added - wxAuiPaneInfo paneInfo = wxAuiPaneInfo().Bottom().CaptionVisible(false); - wxPoint mouse_pt; - - if (direction == wxLEFT) - { - paneInfo.Left(); - mouse_pt = wxPoint(0, cli_size.y/2); - } - else if (direction == wxRIGHT) - { - paneInfo.Right(); - mouse_pt = wxPoint(cli_size.x, cli_size.y/2); - } - else if (direction == wxTOP) - { - paneInfo.Top(); - mouse_pt = wxPoint(cli_size.x/2, 0); - } - else if (direction == wxBOTTOM) - { - paneInfo.Bottom(); - mouse_pt = wxPoint(cli_size.x/2, cli_size.y); - } - - m_mgr.AddPane(new_tabs, paneInfo, mouse_pt); - m_mgr.Update(); - - // remove the page from the source tabs - wxAuiNotebookPage page_info = src_tabs->GetPage(src_idx); - page_info.active = false; - src_tabs->RemovePage(page_info.window); - if (src_tabs->GetPageCount() > 0) - { - src_tabs->SetActivePage((size_t)0); - src_tabs->DoShowHide(); - src_tabs->Refresh(); - } - - - // add the page to the destination tabs - dest_tabs->InsertPage(page_info.window, page_info, 0); - - if (src_tabs->GetPageCount() == 0) - { - RemoveEmptyTabFrames(); - } - - DoSizing(); - dest_tabs->DoShowHide(); - dest_tabs->Refresh(); - - // force the set selection function reset the selection - m_curPage = -1; - - // set the active page to the one we just split off - SetSelectionToPage(page_info); - - UpdateHintWindowSize(); -} - - -void wxAuiNotebook::OnSize(wxSizeEvent& evt) -{ - UpdateHintWindowSize(); - - evt.Skip(); -} - -void wxAuiNotebook::OnTabClicked(wxAuiNotebookEvent& evt) -{ - wxAuiTabCtrl* ctrl = (wxAuiTabCtrl*)evt.GetEventObject(); - wxASSERT(ctrl != NULL); - - wxWindow* wnd = ctrl->GetWindowFromIdx(evt.GetSelection()); - wxASSERT(wnd != NULL); - - SetSelectionToWindow(wnd); -} - -void wxAuiNotebook::OnTabBgDClick(wxAuiNotebookEvent& evt) -{ - // select the tab ctrl which received the db click - int selection; - wxWindow* wnd; - wxAuiTabCtrl* ctrl = (wxAuiTabCtrl*)evt.GetEventObject(); - if ( (ctrl != NULL) - && ((selection = ctrl->GetActivePage()) != wxNOT_FOUND) - && ((wnd = ctrl->GetWindowFromIdx(selection)) != NULL)) - { - SetSelectionToWindow(wnd); - } - - // notify owner that the tabbar background has been double-clicked - wxAuiNotebookEvent e(wxEVT_AUINOTEBOOK_BG_DCLICK, m_windowId); - e.SetEventObject(this); - GetEventHandler()->ProcessEvent(e); -} - -void wxAuiNotebook::OnTabBeginDrag(wxAuiNotebookEvent&) -{ - m_lastDragX = 0; -} - -void wxAuiNotebook::OnTabDragMotion(wxAuiNotebookEvent& evt) -{ - wxPoint screen_pt = ::wxGetMousePosition(); - wxPoint client_pt = ScreenToClient(screen_pt); - wxPoint zero(0,0); - - wxAuiTabCtrl* src_tabs = (wxAuiTabCtrl*)evt.GetEventObject(); - wxAuiTabCtrl* dest_tabs = GetTabCtrlFromPoint(client_pt); - - if (dest_tabs == src_tabs) - { - if (src_tabs) - { - src_tabs->SetCursor(wxCursor(wxCURSOR_ARROW)); - } - - // always hide the hint for inner-tabctrl drag - m_mgr.HideHint(); - - // if tab moving is not allowed, leave - if (!(m_flags & wxAUI_NB_TAB_MOVE)) - { - return; - } - - wxPoint pt = dest_tabs->ScreenToClient(screen_pt); - wxWindow* dest_location_tab; - - // this is an inner-tab drag/reposition - if (dest_tabs->TabHitTest(pt.x, pt.y, &dest_location_tab)) - { - int src_idx = evt.GetSelection(); - int dest_idx = dest_tabs->GetIdxFromWindow(dest_location_tab); - - // prevent jumpy drag - if ((src_idx == dest_idx) || dest_idx == -1 || - (src_idx > dest_idx && m_lastDragX <= pt.x) || - (src_idx < dest_idx && m_lastDragX >= pt.x)) - { - m_lastDragX = pt.x; - return; - } - - - wxWindow* src_tab = dest_tabs->GetWindowFromIdx(src_idx); - dest_tabs->MovePage(src_tab, dest_idx); - m_tabs.MovePage(m_tabs.GetPage(src_idx).window, dest_idx); - dest_tabs->SetActivePage((size_t)dest_idx); - dest_tabs->DoShowHide(); - dest_tabs->Refresh(); - m_lastDragX = pt.x; - - } - - return; - } - - - // if external drag is allowed, check if the tab is being dragged - // over a different wxAuiNotebook control - if (m_flags & wxAUI_NB_TAB_EXTERNAL_MOVE) - { - wxWindow* tab_ctrl = ::wxFindWindowAtPoint(screen_pt); - - // if we aren't over any window, stop here - if (!tab_ctrl) - return; - - // make sure we are not over the hint window - if (!wxDynamicCast(tab_ctrl, wxFrame)) - { - while (tab_ctrl) - { - if (wxDynamicCast(tab_ctrl, wxAuiTabCtrl)) - break; - tab_ctrl = tab_ctrl->GetParent(); - } - - if (tab_ctrl) - { - wxAuiNotebook* nb = (wxAuiNotebook*)tab_ctrl->GetParent(); - - if (nb != this) - { - wxRect hint_rect = tab_ctrl->GetClientRect(); - tab_ctrl->ClientToScreen(&hint_rect.x, &hint_rect.y); - m_mgr.ShowHint(hint_rect); - return; - } - } - } - else - { - if (!dest_tabs) - { - // we are either over a hint window, or not over a tab - // window, and there is no where to drag to, so exit - return; - } - } - } - - - // if there are less than two panes, split can't happen, so leave - if (m_tabs.GetPageCount() < 2) - return; - - // if tab moving is not allowed, leave - if (!(m_flags & wxAUI_NB_TAB_SPLIT)) - return; - - - if (src_tabs) - { - src_tabs->SetCursor(wxCursor(wxCURSOR_SIZING)); - } - - - if (dest_tabs) - { - wxRect hint_rect = dest_tabs->GetRect(); - ClientToScreen(&hint_rect.x, &hint_rect.y); - m_mgr.ShowHint(hint_rect); - } - else - { - m_mgr.DrawHintRect(m_dummyWnd, client_pt, zero); - } -} - - - -void wxAuiNotebook::OnTabEndDrag(wxAuiNotebookEvent& evt) -{ - m_mgr.HideHint(); - - - wxAuiTabCtrl* src_tabs = (wxAuiTabCtrl*)evt.GetEventObject(); - wxCHECK_RET( src_tabs, wxT("no source object?") ); - - src_tabs->SetCursor(wxCursor(wxCURSOR_ARROW)); - - // get the mouse position, which will be used to determine the drop point - wxPoint mouse_screen_pt = ::wxGetMousePosition(); - wxPoint mouse_client_pt = ScreenToClient(mouse_screen_pt); - - - - // check for an external move - if (m_flags & wxAUI_NB_TAB_EXTERNAL_MOVE) - { - wxWindow* tab_ctrl = ::wxFindWindowAtPoint(mouse_screen_pt); - - while (tab_ctrl) - { - if (wxDynamicCast(tab_ctrl, wxAuiTabCtrl)) - break; - tab_ctrl = tab_ctrl->GetParent(); - } - - if (tab_ctrl) - { - wxAuiNotebook* nb = (wxAuiNotebook*)tab_ctrl->GetParent(); - - if (nb != this) - { - // find out from the destination control - // if it's ok to drop this tab here - wxAuiNotebookEvent e(wxEVT_AUINOTEBOOK_ALLOW_DND, m_windowId); - e.SetSelection(evt.GetSelection()); - e.SetOldSelection(evt.GetSelection()); - e.SetEventObject(this); - e.SetDragSource(this); - e.Veto(); // dropping must be explicitly approved by control owner - - nb->GetEventHandler()->ProcessEvent(e); - - if (!e.IsAllowed()) - { - // no answer or negative answer - m_mgr.HideHint(); - return; - } - - // drop was allowed - int src_idx = evt.GetSelection(); - wxWindow* src_page = src_tabs->GetWindowFromIdx(src_idx); - - // Check that it's not an impossible parent relationship - wxWindow* p = nb; - while (p && !p->IsTopLevel()) - { - if (p == src_page) - { - return; - } - p = p->GetParent(); - } - - // get main index of the page - int main_idx = m_tabs.GetIdxFromWindow(src_page); - wxCHECK_RET( main_idx != wxNOT_FOUND, wxT("no source page?") ); - - - // make a copy of the page info - wxAuiNotebookPage page_info = m_tabs.GetPage(main_idx); - - // remove the page from the source notebook - RemovePage(main_idx); - - // reparent the page - src_page->Reparent(nb); - - - // found out the insert idx - wxAuiTabCtrl* dest_tabs = (wxAuiTabCtrl*)tab_ctrl; - wxPoint pt = dest_tabs->ScreenToClient(mouse_screen_pt); - - wxWindow* target = NULL; - int insert_idx = -1; - dest_tabs->TabHitTest(pt.x, pt.y, &target); - if (target) - { - insert_idx = dest_tabs->GetIdxFromWindow(target); - } - - - // add the page to the new notebook - if (insert_idx == -1) - insert_idx = dest_tabs->GetPageCount(); - dest_tabs->InsertPage(page_info.window, page_info, insert_idx); - nb->m_tabs.InsertPage(page_info.window, page_info, insert_idx); - - nb->DoSizing(); - dest_tabs->DoShowHide(); - dest_tabs->Refresh(); - - // set the selection in the destination tab control - nb->SetSelectionToPage(page_info); - - // notify owner that the tab has been dragged - wxAuiNotebookEvent e2(wxEVT_AUINOTEBOOK_DRAG_DONE, m_windowId); - e2.SetSelection(evt.GetSelection()); - e2.SetOldSelection(evt.GetSelection()); - e2.SetEventObject(this); - GetEventHandler()->ProcessEvent(e2); - - return; - } - } - } - - - - - // only perform a tab split if it's allowed - wxAuiTabCtrl* dest_tabs = NULL; - - if ((m_flags & wxAUI_NB_TAB_SPLIT) && m_tabs.GetPageCount() >= 2) - { - // If the pointer is in an existing tab frame, do a tab insert - wxWindow* hit_wnd = ::wxFindWindowAtPoint(mouse_screen_pt); - wxTabFrame* tab_frame = (wxTabFrame*)GetTabFrameFromTabCtrl(hit_wnd); - int insert_idx = -1; - if (tab_frame) - { - dest_tabs = tab_frame->m_tabs; - - if (dest_tabs == src_tabs) - return; - - - wxPoint pt = dest_tabs->ScreenToClient(mouse_screen_pt); - wxWindow* target = NULL; - dest_tabs->TabHitTest(pt.x, pt.y, &target); - if (target) - { - insert_idx = dest_tabs->GetIdxFromWindow(target); - } - } - else - { - wxPoint zero(0,0); - wxRect rect = m_mgr.CalculateHintRect(m_dummyWnd, - mouse_client_pt, - zero); - if (rect.IsEmpty()) - { - // there is no suitable drop location here, exit out - return; - } - - // If there is no tabframe at all, create one - wxTabFrame* new_tabs = new wxTabFrame; - new_tabs->m_rect = wxRect(wxPoint(0,0), CalculateNewSplitSize()); - new_tabs->SetTabCtrlHeight(m_tabCtrlHeight); - new_tabs->m_tabs = new wxAuiTabCtrl(this, - m_tabIdCounter++, - wxDefaultPosition, - wxDefaultSize, - wxNO_BORDER|wxWANTS_CHARS); - new_tabs->m_tabs->SetArtProvider(m_tabs.GetArtProvider()->Clone()); - new_tabs->m_tabs->SetFlags(m_flags); - - m_mgr.AddPane(new_tabs, - wxAuiPaneInfo().Bottom().CaptionVisible(false), - mouse_client_pt); - m_mgr.Update(); - dest_tabs = new_tabs->m_tabs; - } - - - - // remove the page from the source tabs - wxAuiNotebookPage page_info = src_tabs->GetPage(evt.GetSelection()); - page_info.active = false; - src_tabs->RemovePage(page_info.window); - if (src_tabs->GetPageCount() > 0) - { - src_tabs->SetActivePage((size_t)0); - src_tabs->DoShowHide(); - src_tabs->Refresh(); - } - - - - // add the page to the destination tabs - if (insert_idx == -1) - insert_idx = dest_tabs->GetPageCount(); - dest_tabs->InsertPage(page_info.window, page_info, insert_idx); - - if (src_tabs->GetPageCount() == 0) - { - RemoveEmptyTabFrames(); - } - - DoSizing(); - dest_tabs->DoShowHide(); - dest_tabs->Refresh(); - - // force the set selection function reset the selection - m_curPage = -1; - - // set the active page to the one we just split off - SetSelectionToPage(page_info); - - UpdateHintWindowSize(); - } - - // notify owner that the tab has been dragged - wxAuiNotebookEvent e(wxEVT_AUINOTEBOOK_DRAG_DONE, m_windowId); - e.SetSelection(evt.GetSelection()); - e.SetOldSelection(evt.GetSelection()); - e.SetEventObject(this); - GetEventHandler()->ProcessEvent(e); -} - - - -void wxAuiNotebook::OnTabCancelDrag(wxAuiNotebookEvent& command_evt) -{ - wxAuiNotebookEvent& evt = (wxAuiNotebookEvent&)command_evt; - - m_mgr.HideHint(); - - wxAuiTabCtrl* src_tabs = (wxAuiTabCtrl*)evt.GetEventObject(); - wxCHECK_RET( src_tabs, wxT("no source object?") ); - - src_tabs->SetCursor(wxCursor(wxCURSOR_ARROW)); -} - -wxAuiTabCtrl* wxAuiNotebook::GetTabCtrlFromPoint(const wxPoint& pt) -{ - // if we've just removed the last tab from the source - // tab set, the remove the tab control completely - wxAuiPaneInfoArray& all_panes = m_mgr.GetAllPanes(); - size_t i, pane_count = all_panes.GetCount(); - for (i = 0; i < pane_count; ++i) - { - if (all_panes.Item(i).name == wxT("dummy")) - continue; - - wxTabFrame* tabframe = (wxTabFrame*)all_panes.Item(i).window; - if (tabframe->m_tab_rect.Contains(pt)) - return tabframe->m_tabs; - } - - return NULL; -} - -wxWindow* wxAuiNotebook::GetTabFrameFromTabCtrl(wxWindow* tab_ctrl) -{ - // if we've just removed the last tab from the source - // tab set, the remove the tab control completely - wxAuiPaneInfoArray& all_panes = m_mgr.GetAllPanes(); - size_t i, pane_count = all_panes.GetCount(); - for (i = 0; i < pane_count; ++i) - { - if (all_panes.Item(i).name == wxT("dummy")) - continue; - - wxTabFrame* tabframe = (wxTabFrame*)all_panes.Item(i).window; - if (tabframe->m_tabs == tab_ctrl) - { - return tabframe; - } - } - - return NULL; -} - -void wxAuiNotebook::RemoveEmptyTabFrames() -{ - // if we've just removed the last tab from the source - // tab set, the remove the tab control completely - wxAuiPaneInfoArray all_panes = m_mgr.GetAllPanes(); - size_t i, pane_count = all_panes.GetCount(); - for (i = 0; i < pane_count; ++i) - { - if (all_panes.Item(i).name == wxT("dummy")) - continue; - - wxTabFrame* tab_frame = (wxTabFrame*)all_panes.Item(i).window; - if (tab_frame->m_tabs->GetPageCount() == 0) - { - m_mgr.DetachPane(tab_frame); - - // use pending delete because sometimes during - // window closing, refreshs are pending - if (!wxPendingDelete.Member(tab_frame->m_tabs)) - wxPendingDelete.Append(tab_frame->m_tabs); - - tab_frame->m_tabs = NULL; - - delete tab_frame; - } - } - - - // check to see if there is still a center pane; - // if there isn't, make a frame the center pane - wxAuiPaneInfoArray panes = m_mgr.GetAllPanes(); - pane_count = panes.GetCount(); - wxWindow* first_good = NULL; - bool center_found = false; - for (i = 0; i < pane_count; ++i) - { - if (panes.Item(i).name == wxT("dummy")) - continue; - if (panes.Item(i).dock_direction == wxAUI_DOCK_CENTRE) - center_found = true; - if (!first_good) - first_good = panes.Item(i).window; - } - - if (!center_found && first_good) - { - m_mgr.GetPane(first_good).Centre(); - } - - if (!m_isBeingDeleted) - m_mgr.Update(); -} - -void wxAuiNotebook::OnChildFocusNotebook(wxChildFocusEvent& evt) -{ - evt.Skip(); - - // if we're dragging a tab, don't change the current selection. - // This code prevents a bug that used to happen when the hint window - // was hidden. In the bug, the focus would return to the notebook - // child, which would then enter this handler and call - // SetSelection, which is not desired turn tab dragging. - - wxAuiPaneInfoArray& all_panes = m_mgr.GetAllPanes(); - size_t i, pane_count = all_panes.GetCount(); - for (i = 0; i < pane_count; ++i) - { - wxAuiPaneInfo& pane = all_panes.Item(i); - if (pane.name == wxT("dummy")) - continue; - wxTabFrame* tabframe = (wxTabFrame*)pane.window; - if (tabframe->m_tabs->IsDragging()) - return; - } - - - // find the page containing the focused child - wxWindow* win = evt.GetWindow(); - while ( win ) - { - // pages have the notebook as the parent, so stop when we reach one - // (and also stop in the impossible case of no parent at all) - wxWindow* const parent = win->GetParent(); - if ( !parent || parent == this ) - break; - - win = parent; - } - - // change the tab selection to this page - int idx = m_tabs.GetIdxFromWindow(win); - if (idx != -1 && idx != m_curPage) - { - SetSelection(idx); - } -} - -void wxAuiNotebook::OnNavigationKeyNotebook(wxNavigationKeyEvent& event) -{ - if ( event.IsWindowChange() ) { - // change pages - // FIXME: the problem with this is that if we have a split notebook, - // we selection may go all over the place. - AdvanceSelection(event.GetDirection()); - } - else { - // we get this event in 3 cases - // - // a) one of our pages might have generated it because the user TABbed - // out from it in which case we should propagate the event upwards and - // our parent will take care of setting the focus to prev/next sibling - // - // or - // - // b) the parent panel wants to give the focus to us so that we - // forward it to our selected page. We can't deal with this in - // OnSetFocus() because we don't know which direction the focus came - // from in this case and so can't choose between setting the focus to - // first or last panel child - // - // or - // - // c) we ourselves (see MSWTranslateMessage) generated the event - // - wxWindow * const parent = GetParent(); - - // the wxObject* casts are required to avoid MinGW GCC 2.95.3 ICE - const bool isFromParent = event.GetEventObject() == (wxObject*) parent; - const bool isFromSelf = event.GetEventObject() == (wxObject*) this; - - if ( isFromParent || isFromSelf ) - { - // no, it doesn't come from child, case (b) or (c): forward to a - // page but only if direction is backwards (TAB) or from ourselves, - if ( GetSelection() != wxNOT_FOUND && - (!event.GetDirection() || isFromSelf) ) - { - // so that the page knows that the event comes from it's parent - // and is being propagated downwards - event.SetEventObject(this); - - wxWindow *page = GetPage(GetSelection()); - if ( !page->GetEventHandler()->ProcessEvent(event) ) - { - page->SetFocus(); - } - //else: page manages focus inside it itself - } - else // otherwise set the focus to the notebook itself - { - SetFocus(); - } - } - else - { - // it comes from our child, case (a), pass to the parent, but only - // if the direction is forwards. Otherwise set the focus to the - // notebook itself. The notebook is always the 'first' control of a - // page. - if ( !event.GetDirection() ) - { - SetFocus(); - } - else if ( parent ) - { - event.SetCurrentFocus(this); - parent->GetEventHandler()->ProcessEvent(event); - } - } - } -} - -void wxAuiNotebook::OnTabButton(wxAuiNotebookEvent& evt) -{ - wxAuiTabCtrl* tabs = (wxAuiTabCtrl*)evt.GetEventObject(); - - int button_id = evt.GetInt(); - - if (button_id == wxAUI_BUTTON_CLOSE) - { - int selection = evt.GetSelection(); - - if (selection == -1) - { - // if the close button is to the right, use the active - // page selection to determine which page to close - selection = tabs->GetActivePage(); - } - - if (selection != -1) - { - wxWindow* close_wnd = tabs->GetWindowFromIdx(selection); - - // ask owner if it's ok to close the tab - wxAuiNotebookEvent e(wxEVT_AUINOTEBOOK_PAGE_CLOSE, m_windowId); - e.SetSelection(m_tabs.GetIdxFromWindow(close_wnd)); - const int idx = m_tabs.GetIdxFromWindow(close_wnd); - e.SetSelection(idx); - e.SetOldSelection(evt.GetSelection()); - e.SetEventObject(this); - GetEventHandler()->ProcessEvent(e); - if (!e.IsAllowed()) - return; - - -#if wxUSE_MDI - if (wxDynamicCast(close_wnd, wxAuiMDIChildFrame)) - { - close_wnd->Close(); - } - else -#endif - { - int main_idx = m_tabs.GetIdxFromWindow(close_wnd); - wxCHECK_RET( main_idx != wxNOT_FOUND, wxT("no page to delete?") ); - - DeletePage(main_idx); - } - - // notify owner that the tab has been closed - wxAuiNotebookEvent e2(wxEVT_AUINOTEBOOK_PAGE_CLOSED, m_windowId); - e2.SetSelection(idx); - e2.SetEventObject(this); - GetEventHandler()->ProcessEvent(e2); - } - } -} - - -void wxAuiNotebook::OnTabMiddleDown(wxAuiNotebookEvent& evt) -{ - // patch event through to owner - wxAuiTabCtrl* tabs = (wxAuiTabCtrl*)evt.GetEventObject(); - wxWindow* wnd = tabs->GetWindowFromIdx(evt.GetSelection()); - - wxAuiNotebookEvent e(wxEVT_AUINOTEBOOK_TAB_MIDDLE_DOWN, m_windowId); - e.SetSelection(m_tabs.GetIdxFromWindow(wnd)); - e.SetEventObject(this); - GetEventHandler()->ProcessEvent(e); -} - -void wxAuiNotebook::OnTabMiddleUp(wxAuiNotebookEvent& evt) -{ - // if the wxAUI_NB_MIDDLE_CLICK_CLOSE is specified, middle - // click should act like a tab close action. However, first - // give the owner an opportunity to handle the middle up event - // for custom action - - wxAuiTabCtrl* tabs = (wxAuiTabCtrl*)evt.GetEventObject(); - wxWindow* wnd = tabs->GetWindowFromIdx(evt.GetSelection()); - - wxAuiNotebookEvent e(wxEVT_AUINOTEBOOK_TAB_MIDDLE_UP, m_windowId); - e.SetSelection(m_tabs.GetIdxFromWindow(wnd)); - e.SetEventObject(this); - if (GetEventHandler()->ProcessEvent(e)) - return; - if (!e.IsAllowed()) - return; - - // check if we are supposed to close on middle-up - if ((m_flags & wxAUI_NB_MIDDLE_CLICK_CLOSE) == 0) - return; - - // simulate the user pressing the close button on the tab - evt.SetInt(wxAUI_BUTTON_CLOSE); - OnTabButton(evt); -} - -void wxAuiNotebook::OnTabRightDown(wxAuiNotebookEvent& evt) -{ - // patch event through to owner - wxAuiTabCtrl* tabs = (wxAuiTabCtrl*)evt.GetEventObject(); - wxWindow* wnd = tabs->GetWindowFromIdx(evt.GetSelection()); - - wxAuiNotebookEvent e(wxEVT_AUINOTEBOOK_TAB_RIGHT_DOWN, m_windowId); - e.SetSelection(m_tabs.GetIdxFromWindow(wnd)); - e.SetEventObject(this); - GetEventHandler()->ProcessEvent(e); -} - -void wxAuiNotebook::OnTabRightUp(wxAuiNotebookEvent& evt) -{ - // patch event through to owner - wxAuiTabCtrl* tabs = (wxAuiTabCtrl*)evt.GetEventObject(); - wxWindow* wnd = tabs->GetWindowFromIdx(evt.GetSelection()); - - wxAuiNotebookEvent e(wxEVT_AUINOTEBOOK_TAB_RIGHT_UP, m_windowId); - e.SetSelection(m_tabs.GetIdxFromWindow(wnd)); - e.SetEventObject(this); - GetEventHandler()->ProcessEvent(e); -} - -// Sets the normal font -void wxAuiNotebook::SetNormalFont(const wxFont& font) -{ - m_normalFont = font; - GetArtProvider()->SetNormalFont(font); -} - -// Sets the selected tab font -void wxAuiNotebook::SetSelectedFont(const wxFont& font) -{ - m_selectedFont = font; - GetArtProvider()->SetSelectedFont(font); -} - -// Sets the measuring font -void wxAuiNotebook::SetMeasuringFont(const wxFont& font) -{ - GetArtProvider()->SetMeasuringFont(font); -} - -// Sets the tab font -bool wxAuiNotebook::SetFont(const wxFont& font) -{ - wxControl::SetFont(font); - - wxFont normalFont(font); - wxFont selectedFont(normalFont); - selectedFont.SetWeight(wxFONTWEIGHT_BOLD); - - SetNormalFont(normalFont); - SetSelectedFont(selectedFont); - SetMeasuringFont(selectedFont); - - return true; -} - -// Gets the tab control height -int wxAuiNotebook::GetTabCtrlHeight() const -{ - return m_tabCtrlHeight; -} - -// Gets the height of the notebook for a given page height -int wxAuiNotebook::GetHeightForPageHeight(int pageHeight) -{ - UpdateTabCtrlHeight(); - - int tabCtrlHeight = GetTabCtrlHeight(); - int decorHeight = 2; - return tabCtrlHeight + pageHeight + decorHeight; -} - -// Shows the window menu -bool wxAuiNotebook::ShowWindowMenu() -{ - wxAuiTabCtrl* tabCtrl = GetActiveTabCtrl(); - - int idx = tabCtrl->GetArtProvider()->ShowDropDown(tabCtrl, tabCtrl->GetPages(), tabCtrl->GetActivePage()); - - if (idx != -1) - { - wxAuiNotebookEvent e(wxEVT_AUINOTEBOOK_PAGE_CHANGING, tabCtrl->GetId()); - e.SetSelection(idx); - e.SetOldSelection(tabCtrl->GetActivePage()); - e.SetEventObject(tabCtrl); - GetEventHandler()->ProcessEvent(e); - - return true; - } - else - return false; -} - -void wxAuiNotebook::DoThaw() -{ - DoSizing(); - - wxBookCtrlBase::DoThaw(); -} - -void wxAuiNotebook::SetPageSize (const wxSize& WXUNUSED(size)) -{ - wxFAIL_MSG("Not implemented for wxAuiNotebook"); -} - -int wxAuiNotebook::HitTest (const wxPoint& WXUNUSED(pt), long* WXUNUSED(flags)) const -{ - wxFAIL_MSG("Not implemented for wxAuiNotebook"); - return wxNOT_FOUND; -} - -int wxAuiNotebook::GetPageImage(size_t WXUNUSED(n)) const -{ - wxFAIL_MSG("Not implemented for wxAuiNotebook"); - return -1; -} - -bool wxAuiNotebook::SetPageImage(size_t n, int imageId) -{ - return SetPageBitmap(n, GetImageList()->GetBitmap(imageId)); -} - -int wxAuiNotebook::ChangeSelection(size_t n) -{ - return DoModifySelection(n, false); -} - -bool wxAuiNotebook::AddPage(wxWindow *page, const wxString &text, bool select, - int imageId) -{ - if(HasImageList()) - { - return AddPage(page, text, select, GetImageList()->GetBitmap(imageId)); - } - else - { - return AddPage(page, text, select, wxNullBitmap); - } -} - -bool wxAuiNotebook::DeleteAllPages() -{ - size_t count = GetPageCount(); - for(size_t i = 0; i < count; i++) - { - DeletePage(0); - } - return true; -} - -bool wxAuiNotebook::InsertPage(size_t index, wxWindow *page, - const wxString &text, bool select, - int imageId) -{ - if(HasImageList()) - { - return InsertPage(index, page, text, select, - GetImageList()->GetBitmap(imageId)); - } - else - { - return InsertPage(index, page, text, select, wxNullBitmap); - } -} - -int wxAuiNotebook::DoModifySelection(size_t n, bool events) -{ - wxWindow* wnd = m_tabs.GetWindowFromIdx(n); - if (!wnd) - return m_curPage; - - // don't change the page unless necessary; - // however, clicking again on a tab should give it the focus. - if ((int)n == m_curPage) - { - wxAuiTabCtrl* ctrl; - int ctrl_idx; - if (FindTab(wnd, &ctrl, &ctrl_idx)) - { - if (FindFocus() != ctrl) - ctrl->SetFocus(); - } - return m_curPage; - } - - bool vetoed = false; - - wxAuiNotebookEvent evt(wxEVT_AUINOTEBOOK_PAGE_CHANGING, m_windowId); - - if(events) - { - evt.SetSelection(n); - evt.SetOldSelection(m_curPage); - evt.SetEventObject(this); - GetEventHandler()->ProcessEvent(evt); - vetoed = !evt.IsAllowed(); - } - - if (!vetoed) - { - int old_curpage = m_curPage; - m_curPage = n; - - // program allows the page change - if(events) - { - evt.SetEventType(wxEVT_AUINOTEBOOK_PAGE_CHANGED); - (void)GetEventHandler()->ProcessEvent(evt); - } - - - wxAuiTabCtrl* ctrl; - int ctrl_idx; - if (FindTab(wnd, &ctrl, &ctrl_idx)) - { - m_tabs.SetActivePage(wnd); - - ctrl->SetActivePage(ctrl_idx); - DoSizing(); - ctrl->DoShowHide(); - - ctrl->MakeTabVisible(ctrl_idx, ctrl); - - // set fonts - wxAuiPaneInfoArray& all_panes = m_mgr.GetAllPanes(); - size_t i, pane_count = all_panes.GetCount(); - for (i = 0; i < pane_count; ++i) - { - wxAuiPaneInfo& pane = all_panes.Item(i); - if (pane.name == wxT("dummy")) - continue; - wxAuiTabCtrl* tabctrl = ((wxTabFrame*)pane.window)->m_tabs; - if (tabctrl != ctrl) - tabctrl->SetSelectedFont(m_normalFont); - else - tabctrl->SetSelectedFont(m_selectedFont); - tabctrl->Refresh(); - } - - // Set the focus to the page if we're not currently focused on the tab. - // This is Firefox-like behaviour. - if (wnd->IsShownOnScreen() && FindFocus() != ctrl) - wnd->SetFocus(); - - return old_curpage; - } - } - - return m_curPage; -} - -void wxAuiTabCtrl::SetHoverTab(wxWindow* wnd) -{ - bool hoverChanged = false; - - const size_t page_count = m_pages.GetCount(); - for ( size_t i = 0; i < page_count; ++i ) - { - wxAuiNotebookPage& page = m_pages.Item(i); - bool oldHover = page.hover; - page.hover = (page.window == wnd); - if ( oldHover != page.hover ) - hoverChanged = true; - } - - if ( hoverChanged ) - { - Refresh(); - Update(); - } -} - - -#endif // wxUSE_AUI diff --git a/Externals/wxWidgets3/src/aui/barartmsw.cpp b/Externals/wxWidgets3/src/aui/barartmsw.cpp deleted file mode 100644 index 68700ca832..0000000000 --- a/Externals/wxWidgets3/src/aui/barartmsw.cpp +++ /dev/null @@ -1,506 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/aui/barartmsw.cpp -// Purpose: Implementation of wxAuiMSWToolBarArt -// Author: Tobias Taschner -// Created: 2015-09-22 -// Copyright: (c) 2015 wxWidgets development team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ -#pragma hdrstop -#endif - -#ifndef WX_PRECOMP - #include "wx/bitmap.h" - #include "wx/dcclient.h" - #include "wx/app.h" - #include "wx/dc.h" -#endif - -#include "wx/aui/auibar.h" -#include "wx/aui/framemanager.h" -#include "wx/msw/uxtheme.h" -#include "wx/msw/private.h" - -#if wxUSE_AUI - -#define RP_GRIPPER 1 -#define RP_GRIPPERVERT 2 -#define RP_BAND 3 -#define RP_CHEVRON 4 -#define RP_CHEVRONVERT 5 -#define RP_BACKGROUND 6 -#define RP_SPLITTER 7 -#define RP_SPLITTERVERT 8 - -#define CHEVS_NORMAL 1 -#define CHEVS_HOT 2 -#define CHEVS_PRESSED 3 - -#define TP_BUTTON 1 -#define TP_DROPDOWNBUTTON 2 -#define TP_SPLITBUTTON 3 -#define TP_SPLITBUTTONDROPDOWN 4 -#define TP_SEPARATOR 5 -#define TP_SEPARATORVERT 6 -#define TP_DROPDOWNBUTTONGLYPH 7 - -#define TS_NORMAL 1 -#define TS_HOT 2 -#define TS_PRESSED 3 -#define TS_DISABLED 4 -#define TS_CHECKED 5 -#define TS_HOTCHECKED 6 -#define TS_NEARHOT 7 -#define TS_OTHERSIDEHOT 8 - - -wxAuiMSWToolBarArt::wxAuiMSWToolBarArt() -{ - wxUxThemeEngine* te = wxUxThemeEngine::GetIfActive(); - if ( te && te->IsAppThemed() ) - { - m_themed = true; - - // Determine sizes from theme - wxWindow* window = static_cast(wxApp::GetInstance())->GetTopWindow(); - wxUxThemeHandle hTheme(window, L"Rebar"); - - SIZE overflowSize; - te->GetThemePartSize(hTheme, NULL, RP_CHEVRON, 0, - NULL, TS_TRUE, &overflowSize); - m_overflowSize = overflowSize.cx; - - SIZE gripperSize; - te->GetThemePartSize(hTheme, NULL, RP_GRIPPER, 0, - NULL, TS_TRUE, &gripperSize); - m_gripperSize = gripperSize.cx; - - wxUxThemeHandle hThemeToolbar(window, L"Toolbar"); - - SIZE seperatorSize; - te->GetThemePartSize(hThemeToolbar, NULL, TP_SEPARATOR, 0, - NULL, TS_TRUE, &seperatorSize); - m_separatorSize = seperatorSize.cx; - - SIZE buttonSize; - te->GetThemePartSize(hThemeToolbar, NULL, TP_BUTTON, 0, - NULL, TS_TRUE, &buttonSize); - m_buttonSize.Set(buttonSize.cx, buttonSize.cy); - } - else - m_themed = false; -} - -wxAuiToolBarArt* wxAuiMSWToolBarArt::Clone() -{ - return new wxAuiMSWToolBarArt; -} - -void wxAuiMSWToolBarArt::DrawBackground( - wxDC& dc, - wxWindow* wnd, - const wxRect& rect) -{ - if ( m_themed ) - { - RECT r; - wxCopyRectToRECT(rect, r); - - wxUxThemeHandle hTheme(wnd, L"Rebar"); - - wxUxThemeEngine::Get()->DrawThemeBackground( - hTheme, - GetHdcOf(dc.GetTempHDC()), - RP_BACKGROUND, - 0, - &r, - NULL); - } - else - wxAuiGenericToolBarArt::DrawBackground(dc, wnd, rect); -} - -void wxAuiMSWToolBarArt::DrawLabel( - wxDC& dc, - wxWindow* wnd, - const wxAuiToolBarItem& item, - const wxRect& rect) -{ - wxAuiGenericToolBarArt::DrawLabel(dc, wnd, item, rect); -} - -static const unsigned char -DISABLED_TEXT_GREY_HUE = wxColour::AlphaBlend(0, 255, 0.4); -const wxColour DISABLED_TEXT_COLOR(DISABLED_TEXT_GREY_HUE, - DISABLED_TEXT_GREY_HUE, - DISABLED_TEXT_GREY_HUE); - -void wxAuiMSWToolBarArt::DrawButton( - wxDC& dc, - wxWindow* wnd, - const wxAuiToolBarItem& item, - const wxRect& rect) -{ - if ( m_themed ) - { - RECT r; - wxCopyRectToRECT(rect, r); - - wxUxThemeHandle hTheme(wnd, L"Toolbar"); - - wxUxThemeEngine* te = wxUxThemeEngine::Get(); - - int btnState; - if ( item.GetState() & wxAUI_BUTTON_STATE_DISABLED ) - btnState = TS_DISABLED; - else if ( item.GetState() & wxAUI_BUTTON_STATE_PRESSED ) - btnState = TS_PRESSED; - else if ( item.GetState() & wxAUI_BUTTON_STATE_HOVER && - item.GetState() & wxAUI_BUTTON_STATE_CHECKED ) - btnState = TS_HOTCHECKED; - else if ( item.GetState() & wxAUI_BUTTON_STATE_CHECKED ) - btnState = TS_CHECKED; - else if ( item.GetState() & wxAUI_BUTTON_STATE_HOVER ) - btnState = TS_HOT; - else - btnState = TS_NORMAL; - - te->DrawThemeBackground( - hTheme, - GetHdcOf(dc.GetTempHDC()), - TP_BUTTON, - btnState, - &r, - NULL); - - int textWidth = 0, textHeight = 0; - - if ( m_flags & wxAUI_TB_TEXT ) - { - dc.SetFont(m_font); - - int tx, ty; - - dc.GetTextExtent(wxT("ABCDHgj"), &tx, &textHeight); - textWidth = 0; - dc.GetTextExtent(item.GetLabel(), &textWidth, &ty); - } - - int bmpX = 0, bmpY = 0; - int textX = 0, textY = 0; - - if ( m_textOrientation == wxAUI_TBTOOL_TEXT_BOTTOM ) - { - bmpX = rect.x + - (rect.width / 2) - - (item.GetBitmap().GetWidth() / 2); - - bmpY = rect.y + - ((rect.height - textHeight) / 2) - - (item.GetBitmap().GetHeight() / 2); - - textX = rect.x + (rect.width / 2) - (textWidth / 2) + 1; - textY = rect.y + rect.height - textHeight - 1; - } - else if ( m_textOrientation == wxAUI_TBTOOL_TEXT_RIGHT ) - { - bmpX = rect.x + 3; - - bmpY = rect.y + - (rect.height / 2) - - (item.GetBitmap().GetHeight() / 2); - - textX = bmpX + 3 + item.GetBitmap().GetWidth(); - textY = rect.y + - (rect.height / 2) - - (textHeight / 2); - } - - wxBitmap bmp; - if ( item.GetState() & wxAUI_BUTTON_STATE_DISABLED ) - bmp = item.GetDisabledBitmap(); - else - bmp = item.GetBitmap(); - - if ( bmp.IsOk() ) - dc.DrawBitmap(bmp, bmpX, bmpY, true); - - // set the item's text color based on if it is disabled - dc.SetTextForeground(*wxBLACK); - if ( item.GetState() & wxAUI_BUTTON_STATE_DISABLED ) - dc.SetTextForeground(DISABLED_TEXT_COLOR); - - if ( (m_flags & wxAUI_TB_TEXT) && !item.GetLabel().empty() ) - { - dc.DrawText(item.GetLabel(), textX, textY); - } - } - else - wxAuiGenericToolBarArt::DrawButton(dc, wnd, item, rect); -} - -void wxAuiMSWToolBarArt::DrawDropDownButton( - wxDC& dc, - wxWindow* wnd, - const wxAuiToolBarItem& item, - const wxRect& rect) -{ - if ( m_themed ) - { - wxUxThemeHandle hTheme(wnd, L"Toolbar"); - wxUxThemeEngine* const te = wxUxThemeEngine::Get(); - - int dropDownWidth = 14; - - int textWidth = 0, textHeight = 0, textX = 0, textY = 0; - int bmpX = 0, bmpY = 0; - - wxRect buttonRect = wxRect(rect.x, - rect.y, - rect.width - dropDownWidth, - rect.height); - wxRect dropDownRect = wxRect(rect.x + rect.width - dropDownWidth - 1, - rect.y, - dropDownWidth + 1, - rect.height); - - if ( m_flags & wxAUI_TB_TEXT ) - { - dc.SetFont(m_font); - - int tx, ty; - if ( m_flags & wxAUI_TB_TEXT ) - { - dc.GetTextExtent(wxT("ABCDHgj"), &tx, &textHeight); - textWidth = 0; - } - - dc.GetTextExtent(item.GetLabel(), &textWidth, &ty); - } - - RECT btnR; - wxCopyRectToRECT(buttonRect, btnR); - RECT dropDownR; - wxCopyRectToRECT(dropDownRect, dropDownR); - - int btnState; - if ( item.GetState() & wxAUI_BUTTON_STATE_DISABLED ) - btnState = TS_DISABLED; - else if ( item.GetState() & wxAUI_BUTTON_STATE_PRESSED ) - btnState = TS_PRESSED; - else if ( item.GetState() & wxAUI_BUTTON_STATE_HOVER ) - btnState = TS_HOT; - else - btnState = TS_NORMAL; - - te->DrawThemeBackground( - hTheme, - GetHdcOf(dc.GetTempHDC()), - TP_SPLITBUTTON, - btnState, - &btnR, - NULL); - - te->DrawThemeBackground( - hTheme, - GetHdcOf(dc.GetTempHDC()), - TP_SPLITBUTTONDROPDOWN, - btnState, - &dropDownR, - NULL); - - if ( m_textOrientation == wxAUI_TBTOOL_TEXT_BOTTOM ) - { - bmpX = buttonRect.x + - (buttonRect.width / 2) - - (item.GetBitmap().GetWidth() / 2); - bmpY = buttonRect.y + - ((buttonRect.height - textHeight) / 2) - - (item.GetBitmap().GetHeight() / 2); - - textX = rect.x + (rect.width / 2) - (textWidth / 2) + 1; - textY = rect.y + rect.height - textHeight - 1; - } - else if ( m_textOrientation == wxAUI_TBTOOL_TEXT_RIGHT ) - { - bmpX = rect.x + 3; - - bmpY = rect.y + - (rect.height / 2) - - (item.GetBitmap().GetHeight() / 2); - - textX = bmpX + 3 + item.GetBitmap().GetWidth(); - textY = rect.y + - (rect.height / 2) - - (textHeight / 2); - } - - wxBitmap bmp; - if ( item.GetState() & wxAUI_BUTTON_STATE_DISABLED ) - { - bmp = item.GetDisabledBitmap(); - } - else - { - bmp = item.GetBitmap(); - } - - if ( !bmp.IsOk() ) - return; - - dc.DrawBitmap(bmp, bmpX, bmpY, true); - - // set the item's text color based on if it is disabled - dc.SetTextForeground(*wxBLACK); - if ( item.GetState() & wxAUI_BUTTON_STATE_DISABLED ) - dc.SetTextForeground(DISABLED_TEXT_COLOR); - - if ( (m_flags & wxAUI_TB_TEXT) && !item.GetLabel().empty() ) - { - dc.DrawText(item.GetLabel(), textX, textY); - } - - } - else - wxAuiGenericToolBarArt::DrawDropDownButton(dc, wnd, item, rect); -} - -void wxAuiMSWToolBarArt::DrawControlLabel( - wxDC& dc, - wxWindow* wnd, - const wxAuiToolBarItem& item, - const wxRect& rect) -{ - wxAuiGenericToolBarArt::DrawControlLabel(dc, wnd, item, rect); -} - -void wxAuiMSWToolBarArt::DrawSeparator( - wxDC& dc, - wxWindow* wnd, - const wxRect& rect) -{ - if ( m_themed ) - { - RECT r; - wxCopyRectToRECT(rect, r); - - wxUxThemeHandle hTheme(wnd, L"Toolbar"); - - wxUxThemeEngine::Get()->DrawThemeBackground( - hTheme, - GetHdcOf(dc.GetTempHDC()), - (m_flags & wxAUI_TB_VERTICAL) ? TP_SEPARATORVERT : TP_SEPARATOR, - 0, - &r, - NULL); - } - else - wxAuiGenericToolBarArt::DrawSeparator(dc, wnd, rect); -} - -void wxAuiMSWToolBarArt::DrawGripper( - wxDC& dc, - wxWindow* wnd, - const wxRect& rect) -{ - if ( m_themed ) - { - RECT r; - wxCopyRectToRECT(rect, r); - - wxUxThemeHandle hTheme(wnd, L"Rebar"); - - wxUxThemeEngine::Get()->DrawThemeBackground( - hTheme, - GetHdcOf(dc.GetTempHDC()), - (m_flags & wxAUI_TB_VERTICAL) ? RP_GRIPPERVERT : RP_GRIPPER, - 0, - &r, - NULL); - } - else - wxAuiGenericToolBarArt::DrawGripper(dc, wnd, rect); -} - -void wxAuiMSWToolBarArt::DrawOverflowButton( - wxDC& dc, - wxWindow* wnd, - const wxRect& rect, - int state) -{ - if ( m_themed ) - { - RECT r; - wxCopyRectToRECT(rect, r); - - wxUxThemeHandle hTheme(wnd, L"Rebar"); - - int chevState; - if ( state & wxAUI_BUTTON_STATE_PRESSED ) - chevState = CHEVS_PRESSED; - else if ( state & wxAUI_BUTTON_STATE_HOVER ) - chevState = CHEVS_HOT; - else - chevState = CHEVS_NORMAL; - - wxUxThemeEngine::Get()->DrawThemeBackground( - hTheme, - GetHdcOf(dc.GetTempHDC()), - (m_flags & wxAUI_TB_VERTICAL) ? RP_CHEVRONVERT : RP_CHEVRON, - chevState, - &r, - NULL); - } - else - wxAuiGenericToolBarArt::DrawOverflowButton(dc, wnd, rect, state); -} - -wxSize wxAuiMSWToolBarArt::GetLabelSize( - wxDC& dc, - wxWindow* wnd, - const wxAuiToolBarItem& item) -{ - return wxAuiGenericToolBarArt::GetLabelSize(dc, wnd, item); -} - -wxSize wxAuiMSWToolBarArt::GetToolSize( - wxDC& dc, - wxWindow* wnd, - const wxAuiToolBarItem& item) -{ - if ( m_themed ) - { - if ( !item.GetBitmap().IsOk() && !(m_flags & wxAUI_TB_TEXT) ) - return m_buttonSize; - - wxSize size = wxAuiGenericToolBarArt::GetToolSize(dc, wnd, item); - - size.IncBy(3); // Add some padding for native theme - - return size; - } - else - return wxAuiGenericToolBarArt::GetToolSize(dc, wnd, item); -} - -int wxAuiMSWToolBarArt::GetElementSize(int element) -{ - return wxAuiGenericToolBarArt::GetElementSize(element); -} - -void wxAuiMSWToolBarArt::SetElementSize(int elementId, int size) -{ - wxAuiGenericToolBarArt::SetElementSize(elementId, size); -} - -int wxAuiMSWToolBarArt::ShowDropDown(wxWindow* wnd, - const wxAuiToolBarItemArray& items) -{ - return wxAuiGenericToolBarArt::ShowDropDown(wnd, items); -} - -#endif // wxUSE_AUI diff --git a/Externals/wxWidgets3/src/aui/descrip.mms b/Externals/wxWidgets3/src/aui/descrip.mms deleted file mode 100644 index 9eb2dff9e7..0000000000 --- a/Externals/wxWidgets3/src/aui/descrip.mms +++ /dev/null @@ -1,78 +0,0 @@ -#***************************************************************************** -# * -# Make file for VMS * -# Author : J.Jansen (joukj@hrem.nano.tudelft.nl) * -# Date : 2 April 2011 * -# * -#***************************************************************************** -.first - define wx [--.include.wx] - -.ifdef __WXMOTIF__ -CXX_DEFINE = /nowarn/define=(__WXMOTIF__=1)/name=(as_is,short)\ - /assume=(nostdnew,noglobal_array_new) -CC_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short) -.else -.ifdef __WXGTK__ -CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm\ - /nowarn/assume=(nostdnew,noglobal_array_new) -CC_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm -.else -.ifdef __WXGTK2__ -CXX_DEFINE = /define=(__WXGTK__=1,VMS_GTK2)/float=ieee/name=(as_is,short)/ieee=denorm\ - /nowarn/assume=(nostdnew,noglobal_array_new) -CC_DEFINE = /define=(__WXGTK__=1,VMS_GTK2)/float=ieee/name=(as_is,short)/ieee=denorm -.else -.ifdef __WXX11__ -CXX_DEFINE = /nowarn/define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\ - /name=(as_is,short)/assume=(nostdnew,noglobal_array_new) -CC_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\ - /name=(as_is,short) -.else -CXX_DEFINE = -CC_DEFINE = -.endif -.endif -.endif -.endif - -.suffixes : .cpp - -.cpp.obj : - cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp -.c.obj : - cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c - -OBJECTS = dockart.obj,floatpane.obj,framemanager.obj,auibook.obj,tabmdi.obj,\ - auibar.obj,tabart.obj - -SOURCES = dockart.cpp floatpane.cpp framemanager.cpp auibook.cpp tabmdi.cpp \ - auibar.cpp tabart.cpp - -all : $(SOURCES) - $(MMS)$(MMSQUALIFIERS) $(OBJECTS) -.ifdef __WXMOTIF__ - library [--.lib]libwx_motif.olb $(OBJECTS) -.else -.ifdef __WXGTK__ - library [--.lib]libwx_gtk.olb $(OBJECTS) -.else -.ifdef __WXGTK2__ - library [--.lib]libwx_gtk2.olb $(OBJECTS) -.else -.ifdef __WXX11__ - library [--.lib]libwx_x11_univ.olb $(OBJECTS) -.endif -.endif -.endif -.endif - -$(OBJECTS) : [--.include.wx]setup.h - -dockart.obj : dockart.cpp -floatpane.obj : floatpane.cpp -framemanager.obj : framemanager.cpp -auibook.obj : auibook.cpp -tabmdi.obj : tabmdi.cpp -auibar.obj : auibar.cpp -tabart.obj : tabart.cpp diff --git a/Externals/wxWidgets3/src/aui/dockart.cpp b/Externals/wxWidgets3/src/aui/dockart.cpp deleted file mode 100644 index b9a50a8c14..0000000000 --- a/Externals/wxWidgets3/src/aui/dockart.cpp +++ /dev/null @@ -1,752 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/aui/dockart.cpp -// Purpose: wxaui: wx advanced user interface - docking window manager -// Author: Benjamin I. Williams -// Modified by: -// Created: 2005-05-17 -// Copyright: (C) Copyright 2005-2006, Kirix Corporation, All Rights Reserved -// Licence: wxWindows Library Licence, Version 3.1 -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_AUI - -#include "wx/aui/framemanager.h" -#include "wx/aui/dockart.h" -#include "wx/aui/auibook.h" -#include "wx/aui/tabart.h" - -#ifndef WX_PRECOMP - #include "wx/settings.h" - #include "wx/dcclient.h" - #include "wx/image.h" -#endif - -#ifdef __WXMAC__ -#include "wx/osx/private.h" -#include "wx/graphics.h" -#include "wx/dcgraph.h" -#endif - -#ifdef __WXGTK__ -#include -#include "wx/renderer.h" -#ifdef __WXGTK20__ - #include "wx/gtk/private/gtk2-compat.h" -#else - #define gtk_widget_is_drawable GTK_WIDGET_DRAWABLE -#endif -#ifdef __WXGTK3__ - #include "wx/graphics.h" - #include "wx/gtk/private.h" -#endif -#endif - - -// -- wxAuiDefaultDockArt class implementation -- - -// wxAuiDefaultDockArt is an art provider class which does all of the drawing for -// wxAuiManager. This allows the library caller to customize the dock art -// (probably by deriving from this class), or to completely replace all drawing -// with custom dock art (probably by writing a new stand-alone class derived -// from the wxAuiDockArt base class). The active dock art class can be set via -// wxAuiManager::SetDockArt() -wxColor wxAuiLightContrastColour(const wxColour& c) -{ - int amount = 120; - - // if the color is especially dark, then - // make the contrast even lighter - if (c.Red() < 128 && c.Green() < 128 && c.Blue() < 128) - amount = 160; - - return c.ChangeLightness(amount); -} - -// wxAuiBitmapFromBits() is a utility function that creates a -// masked bitmap from raw bits (XBM format) -wxBitmap wxAuiBitmapFromBits(const unsigned char bits[], int w, int h, - const wxColour& color) -{ - wxImage img = wxBitmap((const char*)bits, w, h).ConvertToImage(); - img.Replace(0,0,0,123,123,123); - img.Replace(255,255,255,color.Red(),color.Green(),color.Blue()); - img.SetMaskColour(123,123,123); - return wxBitmap(img); -} - - -static void DrawGradientRectangle(wxDC& dc, - const wxRect& rect, - const wxColour& start_color, - const wxColour& end_color, - int direction) -{ - int rd, gd, bd, high = 0; - rd = end_color.Red() - start_color.Red(); - gd = end_color.Green() - start_color.Green(); - bd = end_color.Blue() - start_color.Blue(); - - if (direction == wxAUI_GRADIENT_VERTICAL) - high = rect.GetHeight()-1; - else - high = rect.GetWidth()-1; - - for (int i = 0; i <= high; ++i) - { - int r,g,b; - - - r = start_color.Red() + (high <= 0 ? 0 : (((i*rd*100)/high)/100)); - g = start_color.Green() + (high <= 0 ? 0 : (((i*gd*100)/high)/100)); - b = start_color.Blue() + (high <= 0 ? 0 : (((i*bd*100)/high)/100)); - - wxPen p(wxColor((unsigned char)r, - (unsigned char)g, - (unsigned char)b)); - dc.SetPen(p); - - if (direction == wxAUI_GRADIENT_VERTICAL) - dc.DrawLine(rect.x, rect.y+i, rect.x+rect.width, rect.y+i); - else - dc.DrawLine(rect.x+i, rect.y, rect.x+i, rect.y+rect.height); - } -} - -wxString wxAuiChopText(wxDC& dc, const wxString& text, int max_size) -{ - wxCoord x,y; - - // first check if the text fits with no problems - dc.GetTextExtent(text, &x, &y); - if (x <= max_size) - return text; - - size_t i, len = text.Length(); - size_t last_good_length = 0; - for (i = 0; i < len; ++i) - { - wxString s = text.Left(i); - s += wxT("..."); - - dc.GetTextExtent(s, &x, &y); - if (x > max_size) - break; - - last_good_length = i; - } - - wxString ret = text.Left(last_good_length); - ret += wxT("..."); - return ret; -} - -wxAuiDefaultDockArt::wxAuiDefaultDockArt() -{ -#if defined( __WXMAC__ ) && wxOSX_USE_COCOA_OR_CARBON - wxColor baseColour = wxColour( wxMacCreateCGColorFromHITheme(kThemeBrushToolbarBackground)); -#else - wxColor baseColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); -#endif - - // the baseColour is too pale to use as our base colour, - // so darken it a bit -- - if ((255-baseColour.Red()) + - (255-baseColour.Green()) + - (255-baseColour.Blue()) < 60) - { - baseColour = baseColour.ChangeLightness(92); - } - - m_baseColour = baseColour; - - m_activeCaptionColour = wxSystemSettings::GetColour(wxSYS_COLOUR_ACTIVECAPTION); - m_activeCaptionGradientColour = wxSystemSettings::GetColour(wxSYS_COLOUR_GRADIENTACTIVECAPTION); - m_activeCaptionTextColour = wxSystemSettings::GetColour(wxSYS_COLOUR_CAPTIONTEXT); - m_inactiveCaptionColour = wxSystemSettings::GetColour(wxSYS_COLOUR_INACTIVECAPTION); - m_inactiveCaptionGradientColour = wxSystemSettings::GetColour(wxSYS_COLOUR_GRADIENTINACTIVECAPTION); - m_inactiveCaptionTextColour = wxSystemSettings::GetColour(wxSYS_COLOUR_INACTIVECAPTIONTEXT); - - m_sashBrush = wxBrush(baseColour); - m_backgroundBrush = wxBrush(baseColour); - m_gripperBrush = wxBrush(baseColour); - - m_borderPen = wxPen(baseColour.ChangeLightness(75)); - m_gripperPen1 = wxPen(baseColour.ChangeLightness(40)); - m_gripperPen2 = wxPen(baseColour.ChangeLightness(60)); - m_gripperPen3 = *wxWHITE_PEN; - -#ifdef __WXMAC__ - m_captionFont = *wxSMALL_FONT; -#else - m_captionFont = wxFont(8, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL); -#endif - - // default metric values -#if defined( __WXMAC__ ) && wxOSX_USE_COCOA_OR_CARBON - SInt32 height; - GetThemeMetric( kThemeMetricSmallPaneSplitterHeight , &height ); - m_sashSize = height; -#elif defined(__WXGTK__) - m_sashSize = wxRendererNative::Get().GetSplitterParams(NULL).widthSash; -#else - m_sashSize = 4; -#endif - m_captionSize = 17; - m_borderSize = 1; - m_buttonSize = 14; - m_gripperSize = 9; - m_gradientType = wxAUI_GRADIENT_VERTICAL; - - InitBitmaps(); -} - -void -wxAuiDefaultDockArt::InitBitmaps () -{ - // some built in bitmaps -#if defined( __WXMAC__ ) - static const unsigned char close_bits[]={ - 0xFF, 0xFF, 0xFF, 0xFF, 0x0F, 0xFE, 0x03, 0xF8, 0x01, 0xF0, 0x19, 0xF3, - 0xB8, 0xE3, 0xF0, 0xE1, 0xE0, 0xE0, 0xF0, 0xE1, 0xB8, 0xE3, 0x19, 0xF3, - 0x01, 0xF0, 0x03, 0xF8, 0x0F, 0xFE, 0xFF, 0xFF }; -#elif defined(__WXGTK__) - static const unsigned char close_bits[]={ - 0xff, 0xff, 0xff, 0xff, 0x07, 0xf0, 0xfb, 0xef, 0xdb, 0xed, 0x8b, 0xe8, - 0x1b, 0xec, 0x3b, 0xee, 0x1b, 0xec, 0x8b, 0xe8, 0xdb, 0xed, 0xfb, 0xef, - 0x07, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; -#else - static const unsigned char close_bits[]={ - // reduced height, symmetric - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xcf, 0xf3, 0x9f, 0xf9, - 0x3f, 0xfc, 0x7f, 0xfe, 0x3f, 0xfc, 0x9f, 0xf9, 0xcf, 0xf3, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; - /* - // same height as maximize/restore - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe7, 0xe7, 0xcf, 0xf3, 0x9f, 0xf9, - 0x3f, 0xfc, 0x7f, 0xfe, 0x3f, 0xfc, 0x9f, 0xf9, 0xcf, 0xf3, 0xe7, 0xe7, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; - */ -#endif - - static const unsigned char maximize_bits[] = { - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x07, 0xf0, 0xf7, 0xf7, 0x07, 0xf0, - 0xf7, 0xf7, 0xf7, 0xf7, 0xf7, 0xf7, 0xf7, 0xf7, 0xf7, 0xf7, 0x07, 0xf0, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; - - static const unsigned char restore_bits[]={ - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0xf0, 0x1f, 0xf0, 0xdf, 0xf7, - 0x07, 0xf4, 0x07, 0xf4, 0xf7, 0xf5, 0xf7, 0xf1, 0xf7, 0xfd, 0xf7, 0xfd, - 0x07, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; - - static const unsigned char pin_bits[]={ - 0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0xfc,0xdf,0xfc,0xdf,0xfc, - 0xdf,0xfc,0xdf,0xfc,0xdf,0xfc,0x0f,0xf8,0x7f,0xff,0x7f,0xff, - 0x7f,0xff,0xff,0xff,0xff,0xff,0xff,0xff}; - -#ifdef __WXMAC__ - m_inactiveCloseBitmap = wxAuiBitmapFromBits(close_bits, 16, 16, *wxWHITE); - m_activeCloseBitmap = wxAuiBitmapFromBits(close_bits, 16, 16, *wxWHITE ); -#else - m_inactiveCloseBitmap = wxAuiBitmapFromBits(close_bits, 16, 16, m_inactiveCaptionTextColour); - m_activeCloseBitmap = wxAuiBitmapFromBits(close_bits, 16, 16, m_activeCaptionTextColour); -#endif - -#ifdef __WXMAC__ - m_inactiveMaximizeBitmap = wxAuiBitmapFromBits(maximize_bits, 16, 16, *wxWHITE); - m_activeMaximizeBitmap = wxAuiBitmapFromBits(maximize_bits, 16, 16, *wxWHITE ); -#else - m_inactiveMaximizeBitmap = wxAuiBitmapFromBits(maximize_bits, 16, 16, m_inactiveCaptionTextColour); - m_activeMaximizeBitmap = wxAuiBitmapFromBits(maximize_bits, 16, 16, m_activeCaptionTextColour); -#endif - -#ifdef __WXMAC__ - m_inactiveRestoreBitmap = wxAuiBitmapFromBits(restore_bits, 16, 16, *wxWHITE); - m_activeRestoreBitmap = wxAuiBitmapFromBits(restore_bits, 16, 16, *wxWHITE ); -#else - m_inactiveRestoreBitmap = wxAuiBitmapFromBits(restore_bits, 16, 16, m_inactiveCaptionTextColour); - m_activeRestoreBitmap = wxAuiBitmapFromBits(restore_bits, 16, 16, m_activeCaptionTextColour); -#endif - - m_inactivePinBitmap = wxAuiBitmapFromBits(pin_bits, 16, 16, m_inactiveCaptionTextColour); - m_activePinBitmap = wxAuiBitmapFromBits(pin_bits, 16, 16, m_activeCaptionTextColour); -} - -int wxAuiDefaultDockArt::GetMetric(int id) -{ - switch (id) - { - case wxAUI_DOCKART_SASH_SIZE: return m_sashSize; - case wxAUI_DOCKART_CAPTION_SIZE: return m_captionSize; - case wxAUI_DOCKART_GRIPPER_SIZE: return m_gripperSize; - case wxAUI_DOCKART_PANE_BORDER_SIZE: return m_borderSize; - case wxAUI_DOCKART_PANE_BUTTON_SIZE: return m_buttonSize; - case wxAUI_DOCKART_GRADIENT_TYPE: return m_gradientType; - default: wxFAIL_MSG(wxT("Invalid Metric Ordinal")); break; - } - - return 0; -} - -void wxAuiDefaultDockArt::SetMetric(int id, int new_val) -{ - switch (id) - { - case wxAUI_DOCKART_SASH_SIZE: m_sashSize = new_val; break; - case wxAUI_DOCKART_CAPTION_SIZE: m_captionSize = new_val; break; - case wxAUI_DOCKART_GRIPPER_SIZE: m_gripperSize = new_val; break; - case wxAUI_DOCKART_PANE_BORDER_SIZE: m_borderSize = new_val; break; - case wxAUI_DOCKART_PANE_BUTTON_SIZE: m_buttonSize = new_val; break; - case wxAUI_DOCKART_GRADIENT_TYPE: m_gradientType = new_val; break; - default: wxFAIL_MSG(wxT("Invalid Metric Ordinal")); break; - } -} - -wxColour wxAuiDefaultDockArt::GetColour(int id) -{ - switch (id) - { - case wxAUI_DOCKART_BACKGROUND_COLOUR: return m_backgroundBrush.GetColour(); - case wxAUI_DOCKART_SASH_COLOUR: return m_sashBrush.GetColour(); - case wxAUI_DOCKART_INACTIVE_CAPTION_COLOUR: return m_inactiveCaptionColour; - case wxAUI_DOCKART_INACTIVE_CAPTION_GRADIENT_COLOUR: return m_inactiveCaptionGradientColour; - case wxAUI_DOCKART_INACTIVE_CAPTION_TEXT_COLOUR: return m_inactiveCaptionTextColour; - case wxAUI_DOCKART_ACTIVE_CAPTION_COLOUR: return m_activeCaptionColour; - case wxAUI_DOCKART_ACTIVE_CAPTION_GRADIENT_COLOUR: return m_activeCaptionGradientColour; - case wxAUI_DOCKART_ACTIVE_CAPTION_TEXT_COLOUR: return m_activeCaptionTextColour; - case wxAUI_DOCKART_BORDER_COLOUR: return m_borderPen.GetColour(); - case wxAUI_DOCKART_GRIPPER_COLOUR: return m_gripperBrush.GetColour(); - default: wxFAIL_MSG(wxT("Invalid Metric Ordinal")); break; - } - - return wxColour(); -} - -void wxAuiDefaultDockArt::SetColour(int id, const wxColor& colour) -{ - switch (id) - { - case wxAUI_DOCKART_BACKGROUND_COLOUR: m_backgroundBrush.SetColour(colour); break; - case wxAUI_DOCKART_SASH_COLOUR: m_sashBrush.SetColour(colour); break; - case wxAUI_DOCKART_INACTIVE_CAPTION_COLOUR: m_inactiveCaptionColour = colour; break; - case wxAUI_DOCKART_INACTIVE_CAPTION_GRADIENT_COLOUR: m_inactiveCaptionGradientColour = colour; break; - case wxAUI_DOCKART_INACTIVE_CAPTION_TEXT_COLOUR: m_inactiveCaptionTextColour = colour; break; - case wxAUI_DOCKART_ACTIVE_CAPTION_COLOUR: m_activeCaptionColour = colour; break; - case wxAUI_DOCKART_ACTIVE_CAPTION_GRADIENT_COLOUR: m_activeCaptionGradientColour = colour; break; - case wxAUI_DOCKART_ACTIVE_CAPTION_TEXT_COLOUR: m_activeCaptionTextColour = colour; break; - case wxAUI_DOCKART_BORDER_COLOUR: m_borderPen.SetColour(colour); break; - case wxAUI_DOCKART_GRIPPER_COLOUR: - m_gripperBrush.SetColour(colour); - m_gripperPen1.SetColour(colour.ChangeLightness(40)); - m_gripperPen2.SetColour(colour.ChangeLightness(60)); - break; - default: wxFAIL_MSG(wxT("Invalid Metric Ordinal")); break; - } - - InitBitmaps(); -} - -void wxAuiDefaultDockArt::SetFont(int id, const wxFont& font) -{ - if (id == wxAUI_DOCKART_CAPTION_FONT) - m_captionFont = font; -} - -wxFont wxAuiDefaultDockArt::GetFont(int id) -{ - if (id == wxAUI_DOCKART_CAPTION_FONT) - return m_captionFont; - return wxNullFont; -} - -void wxAuiDefaultDockArt::DrawSash(wxDC& dc, wxWindow *window, int orientation, const wxRect& rect) -{ -#if defined( __WXMAC__ ) && wxOSX_USE_COCOA_OR_CARBON - wxUnusedVar(window); - wxUnusedVar(orientation); - - HIRect splitterRect = CGRectMake( rect.x , rect.y , rect.width , rect.height ); - CGContextRef cgContext ; - wxGCDCImpl *impl = (wxGCDCImpl*) dc.GetImpl(); - cgContext = (CGContextRef) impl->GetGraphicsContext()->GetNativeContext() ; - - HIThemeSplitterDrawInfo drawInfo ; - drawInfo.version = 0 ; - drawInfo.state = kThemeStateActive ; - drawInfo.adornment = kHIThemeSplitterAdornmentNone ; - HIThemeDrawPaneSplitter( &splitterRect , &drawInfo , cgContext , kHIThemeOrientationNormal ) ; - -#elif defined(__WXGTK__) - // clear out the rectangle first - dc.SetPen(*wxTRANSPARENT_PEN); - dc.SetBrush(m_sashBrush); - dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height); - -#if 0 - GdkRectangle gdk_rect; - if (orientation == wxVERTICAL ) - { - gdk_rect.x = rect.x; - gdk_rect.y = rect.y; - gdk_rect.width = m_sashSize; - gdk_rect.height = rect.height; - } - else - { - gdk_rect.x = rect.x; - gdk_rect.y = rect.y; - gdk_rect.width = rect.width; - gdk_rect.height = m_sashSize; - } -#endif - - if (!window) return; - if (!window->m_wxwindow) return; - if (!gtk_widget_is_drawable(window->m_wxwindow)) return; - -#ifdef __WXGTK3__ - cairo_t* cr = static_cast(dc.GetGraphicsContext()->GetNativeContext()); - // invert orientation for widget (horizontal GtkPaned has a vertical splitter) - wxOrientation orient = orientation == wxVERTICAL ? wxHORIZONTAL : wxVERTICAL; - GtkWidget* widget = wxGTKPrivate::GetSplitterWidget(orient); - GtkStyleContext* sc = gtk_widget_get_style_context(widget); - gtk_style_context_save(sc); - - gtk_style_context_add_class(sc, GTK_STYLE_CLASS_PANE_SEPARATOR); - gtk_render_handle(sc, cr, rect.x, rect.y, rect.width, rect.height); - - gtk_style_context_restore(sc); -#else - gtk_paint_handle - ( - gtk_widget_get_style(window->m_wxwindow), - window->GTKGetDrawingWindow(), - // flags & wxCONTROL_CURRENT ? GTK_STATE_PRELIGHT : GTK_STATE_NORMAL, - GTK_STATE_NORMAL, - GTK_SHADOW_NONE, - NULL /* no clipping */, - window->m_wxwindow, - "paned", - rect.x, - rect.y, - rect.width, - rect.height, - (orientation == wxVERTICAL) ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL - ); -#endif // !__WXGTK3__ - -#else - wxUnusedVar(window); - wxUnusedVar(orientation); - dc.SetPen(*wxTRANSPARENT_PEN); - dc.SetBrush(m_sashBrush); - dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height); -#endif -} - - -void wxAuiDefaultDockArt::DrawBackground(wxDC& dc, wxWindow *WXUNUSED(window), int, const wxRect& rect) -{ - dc.SetPen(*wxTRANSPARENT_PEN); -#ifdef __WXMAC__ - // we have to clear first, otherwise we are drawing a light striped pattern - // over an already darker striped background - dc.SetBrush(*wxWHITE_BRUSH) ; - dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height); -#endif - dc.SetBrush(m_backgroundBrush); - dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height); -} - -void wxAuiDefaultDockArt::DrawBorder(wxDC& dc, wxWindow* window, const wxRect& _rect, - wxAuiPaneInfo& pane) -{ - dc.SetPen(m_borderPen); - dc.SetBrush(*wxTRANSPARENT_BRUSH); - - wxRect rect = _rect; - int i, border_width = GetMetric(wxAUI_DOCKART_PANE_BORDER_SIZE); - - if (pane.IsToolbar()) - { - for (i = 0; i < border_width; ++i) - { - dc.SetPen(*wxWHITE_PEN); - dc.DrawLine(rect.x, rect.y, rect.x+rect.width, rect.y); - dc.DrawLine(rect.x, rect.y, rect.x, rect.y+rect.height); - dc.SetPen(m_borderPen); - dc.DrawLine(rect.x, rect.y+rect.height-1, - rect.x+rect.width, rect.y+rect.height-1); - dc.DrawLine(rect.x+rect.width-1, rect.y, - rect.x+rect.width-1, rect.y+rect.height); - rect.Deflate(1); - } - } - else - { - // notebooks draw the border themselves, so they can use native rendering (e.g. tabartgtk) - wxAuiTabArt* art = 0; - wxAuiNotebook* nb = wxDynamicCast(window, wxAuiNotebook); - if (nb) - art = nb->GetArtProvider(); - - if (art) - art->DrawBorder(dc, window, rect); - else - { - for (i = 0; i < border_width; ++i) - { - dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height); - rect.Deflate(1); - } - } - } -} - - -void wxAuiDefaultDockArt::DrawCaptionBackground(wxDC& dc, const wxRect& rect, bool active) -{ - if (m_gradientType == wxAUI_GRADIENT_NONE) - { - if (active) - dc.SetBrush(wxBrush(m_activeCaptionColour)); - else - dc.SetBrush(wxBrush(m_inactiveCaptionColour)); - - dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height); - } - else - { - if (active) - { - // on mac the gradients are expected to become darker from the top -#ifdef __WXMAC__ - DrawGradientRectangle(dc, rect, - m_activeCaptionColour, - m_activeCaptionGradientColour, - m_gradientType); -#else - // on other platforms, active gradients become lighter at the top - DrawGradientRectangle(dc, rect, - m_activeCaptionGradientColour, - m_activeCaptionColour, - m_gradientType); -#endif - } - else - { -#ifdef __WXMAC__ - // on mac the gradients are expected to become darker from the top - DrawGradientRectangle(dc, rect, - m_inactiveCaptionGradientColour, - m_inactiveCaptionColour, - m_gradientType); -#else - // on other platforms, inactive gradients become lighter at the bottom - DrawGradientRectangle(dc, rect, - m_inactiveCaptionColour, - m_inactiveCaptionGradientColour, - m_gradientType); -#endif - } - } -} - - -void wxAuiDefaultDockArt::DrawCaption(wxDC& dc, wxWindow *WXUNUSED(window), - const wxString& text, - const wxRect& rect, - wxAuiPaneInfo& pane) -{ - dc.SetPen(*wxTRANSPARENT_PEN); - dc.SetFont(m_captionFont); - - DrawCaptionBackground(dc, rect, - (pane.state & wxAuiPaneInfo::optionActive)?true:false); - - int caption_offset = 0; - if ( pane.icon.IsOk() ) - { - DrawIcon(dc, rect, pane); - - caption_offset += pane.icon.GetWidth() + 3; - } - - if (pane.state & wxAuiPaneInfo::optionActive) - dc.SetTextForeground(m_activeCaptionTextColour); - else - dc.SetTextForeground(m_inactiveCaptionTextColour); - - - wxCoord w,h; - dc.GetTextExtent(wxT("ABCDEFHXfgkj"), &w, &h); - - wxRect clip_rect = rect; - clip_rect.width -= 3; // text offset - clip_rect.width -= 2; // button padding - if (pane.HasCloseButton()) - clip_rect.width -= m_buttonSize; - if (pane.HasPinButton()) - clip_rect.width -= m_buttonSize; - if (pane.HasMaximizeButton()) - clip_rect.width -= m_buttonSize; - - wxString draw_text = wxAuiChopText(dc, text, clip_rect.width); - - dc.SetClippingRegion(clip_rect); - dc.DrawText(draw_text, rect.x+3 + caption_offset, rect.y+(rect.height/2)-(h/2)-1); - dc.DestroyClippingRegion(); -} - -void -wxAuiDefaultDockArt::DrawIcon(wxDC& dc, const wxRect& rect, wxAuiPaneInfo& pane) -{ - // Draw the icon centered vertically - dc.DrawBitmap(pane.icon, - rect.x+2, rect.y+(rect.height-pane.icon.GetHeight())/2, - true); -} - -void wxAuiDefaultDockArt::DrawGripper(wxDC& dc, wxWindow *WXUNUSED(window), - const wxRect& rect, - wxAuiPaneInfo& pane) -{ - dc.SetPen(*wxTRANSPARENT_PEN); - dc.SetBrush(m_gripperBrush); - - dc.DrawRectangle(rect.x, rect.y, rect.width,rect.height); - - if (!pane.HasGripperTop()) - { - int y = 5; - while (1) - { - dc.SetPen(m_gripperPen1); - dc.DrawPoint(rect.x+3, rect.y+y); - dc.SetPen(m_gripperPen2); - dc.DrawPoint(rect.x+3, rect.y+y+1); - dc.DrawPoint(rect.x+4, rect.y+y); - dc.SetPen(m_gripperPen3); - dc.DrawPoint(rect.x+5, rect.y+y+1); - dc.DrawPoint(rect.x+5, rect.y+y+2); - dc.DrawPoint(rect.x+4, rect.y+y+2); - - y += 4; - if (y > rect.GetHeight()-5) - break; - } - } - else - { - int x = 5; - while (1) - { - dc.SetPen(m_gripperPen1); - dc.DrawPoint(rect.x+x, rect.y+3); - dc.SetPen(m_gripperPen2); - dc.DrawPoint(rect.x+x+1, rect.y+3); - dc.DrawPoint(rect.x+x, rect.y+4); - dc.SetPen(m_gripperPen3); - dc.DrawPoint(rect.x+x+1, rect.y+5); - dc.DrawPoint(rect.x+x+2, rect.y+5); - dc.DrawPoint(rect.x+x+2, rect.y+4); - - x += 4; - if (x > rect.GetWidth()-5) - break; - } - } -} - -void wxAuiDefaultDockArt::DrawPaneButton(wxDC& dc, wxWindow *WXUNUSED(window), - int button, - int button_state, - const wxRect& _rect, - wxAuiPaneInfo& pane) -{ - wxBitmap bmp; - switch (button) - { - default: - case wxAUI_BUTTON_CLOSE: - if (pane.state & wxAuiPaneInfo::optionActive) - bmp = m_activeCloseBitmap; - else - bmp = m_inactiveCloseBitmap; - break; - case wxAUI_BUTTON_PIN: - if (pane.state & wxAuiPaneInfo::optionActive) - bmp = m_activePinBitmap; - else - bmp = m_inactivePinBitmap; - break; - case wxAUI_BUTTON_MAXIMIZE_RESTORE: - if (pane.IsMaximized()) - { - if (pane.state & wxAuiPaneInfo::optionActive) - bmp = m_activeRestoreBitmap; - else - bmp = m_inactiveRestoreBitmap; - } - else - { - if (pane.state & wxAuiPaneInfo::optionActive) - bmp = m_activeMaximizeBitmap; - else - bmp = m_inactiveMaximizeBitmap; - } - break; - } - - - wxRect rect = _rect; - - int old_y = rect.y; - rect.y = rect.y + (rect.height/2) - (bmp.GetHeight()/2); - rect.height = old_y + rect.height - rect.y - 1; - - - if (button_state == wxAUI_BUTTON_STATE_PRESSED) - { - rect.x++; - rect.y++; - } - - if (button_state == wxAUI_BUTTON_STATE_HOVER || - button_state == wxAUI_BUTTON_STATE_PRESSED) - { - if (pane.state & wxAuiPaneInfo::optionActive) - { - dc.SetBrush(wxBrush(m_activeCaptionColour.ChangeLightness(120))); - dc.SetPen(wxPen(m_activeCaptionColour.ChangeLightness(70))); - } - else - { - dc.SetBrush(wxBrush(m_inactiveCaptionColour.ChangeLightness(120))); - dc.SetPen(wxPen(m_inactiveCaptionColour.ChangeLightness(70))); - } - - // draw the background behind the button - dc.DrawRectangle(rect.x, rect.y, 15, 15); - } - - - // draw the button itself - dc.DrawBitmap(bmp, rect.x, rect.y, true); -} - - -#endif // wxUSE_AUI diff --git a/Externals/wxWidgets3/src/aui/floatpane.cpp b/Externals/wxWidgets3/src/aui/floatpane.cpp deleted file mode 100644 index adebf5f7c7..0000000000 --- a/Externals/wxWidgets3/src/aui/floatpane.cpp +++ /dev/null @@ -1,381 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/aui/floatpane.cpp -// Purpose: wxaui: wx advanced user interface - docking window manager -// Author: Benjamin I. Williams -// Modified by: -// Created: 2005-05-17 -// Copyright: (C) Copyright 2005-2006, Kirix Corporation, All Rights Reserved -// Licence: wxWindows Library Licence, Version 3.1 -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_AUI - -#include "wx/aui/framemanager.h" -#include "wx/aui/floatpane.h" -#include "wx/aui/dockart.h" - -#ifndef WX_PRECOMP -#endif - -#ifdef __WXMSW__ -#include "wx/msw/private.h" -#endif - -wxIMPLEMENT_CLASS(wxAuiFloatingFrame, wxAuiFloatingFrameBaseClass); - -wxAuiFloatingFrame::wxAuiFloatingFrame(wxWindow* parent, - wxAuiManager* owner_mgr, - const wxAuiPaneInfo& pane, - wxWindowID id /*= wxID_ANY*/, - long style /*=wxRESIZE_BORDER | wxSYSTEM_MENU | wxCAPTION | - wxFRAME_NO_TASKBAR | wxFRAME_FLOAT_ON_PARENT | - wxCLIP_CHILDREN - */) - : wxAuiFloatingFrameBaseClass(parent, id, wxEmptyString, - pane.floating_pos, pane.floating_size, - style | - (pane.HasCloseButton()?wxCLOSE_BOX:0) | - (pane.HasMaximizeButton()?wxMAXIMIZE_BOX:0) | - (pane.IsFixed()?0:wxRESIZE_BORDER) - ) -{ - m_ownerMgr = owner_mgr; - m_moving = false; - m_mgr.SetManagedWindow(this); - m_solidDrag = true; - - // find out if the system supports solid window drag. - // on non-msw systems, this is assumed to be the case -#ifdef __WXMSW__ - BOOL b = TRUE; - SystemParametersInfo(38 /*SPI_GETDRAGFULLWINDOWS*/, 0, &b, 0); - m_solidDrag = b ? true : false; -#endif - - SetExtraStyle(wxWS_EX_PROCESS_IDLE); -} - -wxAuiFloatingFrame::~wxAuiFloatingFrame() -{ - // if we do not do this, then we can crash... - if (m_ownerMgr && m_ownerMgr->m_actionWindow == this) - { - m_ownerMgr->m_actionWindow = NULL; - } - - m_mgr.UnInit(); -} - -void wxAuiFloatingFrame::SetPaneWindow(const wxAuiPaneInfo& pane) -{ - m_paneWindow = pane.window; - m_paneWindow->Reparent(this); - - wxAuiPaneInfo contained_pane = pane; - contained_pane.Dock().Center().Show(). - CaptionVisible(false). - PaneBorder(false). - Layer(0).Row(0).Position(0); - - // Carry over the minimum size - wxSize pane_min_size = pane.window->GetMinSize(); - - // if the frame window's max size is greater than the min size - // then set the max size to the min size as well - wxSize cur_max_size = GetMaxSize(); - if (cur_max_size.IsFullySpecified() && - (cur_max_size.x < pane.min_size.x || - cur_max_size.y < pane.min_size.y) - ) - { - SetMaxSize(pane_min_size); - } - - SetMinSize(pane.window->GetMinSize()); - - m_mgr.AddPane(m_paneWindow, contained_pane); - m_mgr.Update(); - - if (pane.min_size.IsFullySpecified()) - { - // because SetSizeHints() calls Fit() too (which sets the window - // size to its minimum allowed), we keep the size before calling - // SetSizeHints() and reset it afterwards... - wxSize tmp = GetSize(); - GetSizer()->SetSizeHints(this); - SetSize(tmp); - } - - SetTitle(pane.caption); - - // This code is slightly awkward because we need to reset wxRESIZE_BORDER - // before calling SetClientSize() below as doing it after setting the - // client size would actually change it, at least under MSW, where the - // total window size doesn't change and hence, as the borders size changes, - // the client size does change. - // - // So we must call it first but doing it generates a size event and updates - // pane.floating_size from inside it so we must also record its original - // value before doing it. - const bool hasFloatingSize = pane.floating_size != wxDefaultSize; - if (pane.IsFixed()) - { - SetWindowStyleFlag(GetWindowStyleFlag() & ~wxRESIZE_BORDER); - } - - if ( hasFloatingSize ) - { - SetSize(pane.floating_size); - } - else - { - wxSize size = pane.best_size; - if (size == wxDefaultSize) - size = pane.min_size; - if (size == wxDefaultSize) - size = m_paneWindow->GetSize(); - if (m_ownerMgr && pane.HasGripper()) - { - if (pane.HasGripperTop()) - size.y += m_ownerMgr->m_art->GetMetric(wxAUI_DOCKART_GRIPPER_SIZE); - else - size.x += m_ownerMgr->m_art->GetMetric(wxAUI_DOCKART_GRIPPER_SIZE); - } - - SetClientSize(size); - } -} - -wxAuiManager* wxAuiFloatingFrame::GetOwnerManager() const -{ - return m_ownerMgr; -} - -bool wxAuiFloatingFrame::IsTopNavigationDomain(NavigationKind kind) const -{ - switch ( kind ) - { - case Navigation_Tab: - break; - - case Navigation_Accel: - // Floating frames are often used as tool palettes and it's - // convenient for the accelerators defined in the parent frame to - // work in them, so don't block their propagation. - return false; - } - - return wxAuiFloatingFrameBaseClass::IsTopNavigationDomain(kind); -} - -void wxAuiFloatingFrame::OnSize(wxSizeEvent& WXUNUSED(event)) -{ - if (m_ownerMgr) - { - m_ownerMgr->OnFloatingPaneResized(m_paneWindow, GetRect()); - } -} - -void wxAuiFloatingFrame::OnClose(wxCloseEvent& evt) -{ - if (m_ownerMgr) - { - m_ownerMgr->OnFloatingPaneClosed(m_paneWindow, evt); - } - if (!evt.GetVeto()) - { - m_mgr.DetachPane(m_paneWindow); - Destroy(); - } -} - -void wxAuiFloatingFrame::OnMoveEvent(wxMoveEvent& event) -{ - if (!m_solidDrag) - { - // systems without solid window dragging need to be - // handled slightly differently, due to the lack of - // the constant stream of EVT_MOVING events - if (!isMouseDown()) - return; - OnMoveStart(); - OnMoving(event.GetRect(), wxNORTH); - m_moving = true; - return; - } - - - wxRect winRect = GetRect(); - - if (winRect == m_lastRect) - return; - - // skip the first move event - if (m_lastRect.IsEmpty()) - { - m_lastRect = winRect; - return; - } - - // as on OSX moving windows are not getting all move events, only sporadically, this difference - // is almost always big on OSX, so avoid this early exit opportunity -#ifndef __WXOSX__ - // skip if moving too fast to avoid massive redraws and - // jumping hint windows - if ((abs(winRect.x - m_lastRect.x) > 3) || - (abs(winRect.y - m_lastRect.y) > 3)) - { - m_last3Rect = m_last2Rect; - m_last2Rect = m_lastRect; - m_lastRect = winRect; - - // However still update the internally stored position to avoid - // snapping back to the old one later. - if (m_ownerMgr) - { - m_ownerMgr->GetPane(m_paneWindow). - floating_pos = winRect.GetPosition(); - } - - return; - } -#endif - - // prevent frame redocking during resize - if (m_lastRect.GetSize() != winRect.GetSize()) - { - m_last3Rect = m_last2Rect; - m_last2Rect = m_lastRect; - m_lastRect = winRect; - return; - } - - wxDirection dir = wxALL; - - int horiz_dist = abs(winRect.x - m_last3Rect.x); - int vert_dist = abs(winRect.y - m_last3Rect.y); - - if (vert_dist >= horiz_dist) - { - if (winRect.y < m_last3Rect.y) - dir = wxNORTH; - else - dir = wxSOUTH; - } - else - { - if (winRect.x < m_last3Rect.x) - dir = wxWEST; - else - dir = wxEAST; - } - - m_last3Rect = m_last2Rect; - m_last2Rect = m_lastRect; - m_lastRect = winRect; - - if (!isMouseDown()) - return; - - if (!m_moving) - { - OnMoveStart(); - m_moving = true; - } - - if (m_last3Rect.IsEmpty()) - return; - - if ( event.GetEventType() == wxEVT_MOVING ) - OnMoving(event.GetRect(), dir); - else - OnMoving(wxRect(event.GetPosition(),GetSize()), dir); -} - -void wxAuiFloatingFrame::OnIdle(wxIdleEvent& event) -{ - if (m_moving) - { - if (!isMouseDown()) - { - m_moving = false; - OnMoveFinished(); - } - else - { - event.RequestMore(); - } - } -} - -void wxAuiFloatingFrame::OnMoveStart() -{ - // notify the owner manager that the pane has started to move - if (m_ownerMgr) - { - m_ownerMgr->OnFloatingPaneMoveStart(m_paneWindow); - } -} - -void wxAuiFloatingFrame::OnMoving(const wxRect& WXUNUSED(window_rect), wxDirection dir) -{ - // notify the owner manager that the pane is moving - if (m_ownerMgr) - { - m_ownerMgr->OnFloatingPaneMoving(m_paneWindow, dir); - } - m_lastDirection = dir; -} - -void wxAuiFloatingFrame::OnMoveFinished() -{ - // notify the owner manager that the pane has finished moving - if (m_ownerMgr) - { - m_ownerMgr->OnFloatingPaneMoved(m_paneWindow, m_lastDirection); - } -} - -void wxAuiFloatingFrame::OnActivate(wxActivateEvent& event) -{ - if (m_ownerMgr && event.GetActive()) - { - m_ownerMgr->OnFloatingPaneActivated(m_paneWindow); - } -} - -// utility function which determines the state of the mouse button -// (independent of having a wxMouseEvent handy) - utimately a better -// mechanism for this should be found (possibly by adding the -// functionality to wxWidgets itself) -bool wxAuiFloatingFrame::isMouseDown() -{ - return wxGetMouseState().LeftIsDown(); -} - - -wxBEGIN_EVENT_TABLE(wxAuiFloatingFrame, wxAuiFloatingFrameBaseClass) - EVT_SIZE(wxAuiFloatingFrame::OnSize) - EVT_MOVE(wxAuiFloatingFrame::OnMoveEvent) - EVT_MOVING(wxAuiFloatingFrame::OnMoveEvent) - EVT_CLOSE(wxAuiFloatingFrame::OnClose) - EVT_IDLE(wxAuiFloatingFrame::OnIdle) - EVT_ACTIVATE(wxAuiFloatingFrame::OnActivate) -wxEND_EVENT_TABLE() - - -#endif // wxUSE_AUI diff --git a/Externals/wxWidgets3/src/aui/framemanager.cpp b/Externals/wxWidgets3/src/aui/framemanager.cpp deleted file mode 100644 index 5e24cd48cf..0000000000 --- a/Externals/wxWidgets3/src/aui/framemanager.cpp +++ /dev/null @@ -1,4858 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/aui/framemanager.cpp -// Purpose: wxaui: wx advanced user interface - docking window manager -// Author: Benjamin I. Williams -// Modified by: -// Created: 2005-05-17 -// Copyright: (C) Copyright 2005-2006, Kirix Corporation, All Rights Reserved -// Licence: wxWindows Library Licence, Version 3.1 -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_AUI - -#include "wx/aui/framemanager.h" -#include "wx/aui/dockart.h" -#include "wx/aui/floatpane.h" -#include "wx/aui/tabmdi.h" -#include "wx/aui/auibar.h" -#include "wx/mdi.h" - -#ifndef WX_PRECOMP - #include "wx/panel.h" - #include "wx/settings.h" - #include "wx/app.h" - #include "wx/dcclient.h" - #include "wx/dcscreen.h" - #include "wx/toolbar.h" - #include "wx/image.h" - #include "wx/statusbr.h" -#endif - -WX_CHECK_BUILD_OPTIONS("wxAUI") - -#include "wx/arrimpl.cpp" -WX_DECLARE_OBJARRAY(wxRect, wxAuiRectArray); -WX_DEFINE_OBJARRAY(wxAuiRectArray) -WX_DEFINE_OBJARRAY(wxAuiDockUIPartArray) -WX_DEFINE_OBJARRAY(wxAuiDockInfoArray) -WX_DEFINE_OBJARRAY(wxAuiPaneButtonArray) -WX_DEFINE_OBJARRAY(wxAuiPaneInfoArray) - -wxAuiPaneInfo wxAuiNullPaneInfo; -wxAuiDockInfo wxAuiNullDockInfo; -wxDEFINE_EVENT( wxEVT_AUI_PANE_BUTTON, wxAuiManagerEvent ); -wxDEFINE_EVENT( wxEVT_AUI_PANE_CLOSE, wxAuiManagerEvent ); -wxDEFINE_EVENT( wxEVT_AUI_PANE_MAXIMIZE, wxAuiManagerEvent ); -wxDEFINE_EVENT( wxEVT_AUI_PANE_RESTORE, wxAuiManagerEvent ); -wxDEFINE_EVENT( wxEVT_AUI_PANE_ACTIVATED, wxAuiManagerEvent ); -wxDEFINE_EVENT( wxEVT_AUI_RENDER, wxAuiManagerEvent ); -wxDEFINE_EVENT( wxEVT_AUI_FIND_MANAGER, wxAuiManagerEvent ); - -#ifdef __WXMAC__ - // a few defines to avoid nameclashes - #define __MAC_OS_X_MEMORY_MANAGER_CLEAN__ 1 - #define __AIFF__ - #include "wx/osx/private.h" -#endif - -#ifdef __WXMSW__ - #include "wx/msw/wrapwin.h" - #include "wx/msw/private.h" - #include "wx/msw/dc.h" -#endif - -wxIMPLEMENT_DYNAMIC_CLASS(wxAuiManagerEvent, wxEvent); -wxIMPLEMENT_CLASS(wxAuiManager, wxEvtHandler); - - - -const int auiToolBarLayer = 10; - -#ifndef __WXGTK20__ - - -class wxPseudoTransparentFrame : public wxFrame -{ -public: - wxPseudoTransparentFrame(wxWindow* parent = NULL, - wxWindowID id = wxID_ANY, - const wxString& title = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString &name = wxT("frame")) - : wxFrame(parent, id, title, pos, size, style | wxFRAME_SHAPED, name) - { - SetBackgroundStyle(wxBG_STYLE_CUSTOM); - m_amount=0; - m_maxWidth=0; - m_maxHeight=0; - m_lastWidth=0; - m_lastHeight=0; -#ifdef __WXGTK__ - m_canSetShape = false; // have to wait for window create event on GTK -#else - m_canSetShape = true; -#endif - m_region = wxRegion(0, 0, 0, 0); - SetTransparent(0); - } - - virtual bool SetTransparent(wxByte alpha) wxOVERRIDE - { - if (m_canSetShape) - { - int w=100; // some defaults - int h=100; - GetClientSize(&w, &h); - - m_maxWidth = w; - m_maxHeight = h; - m_amount = alpha; - m_region.Clear(); -// m_region.Union(0, 0, 1, m_maxWidth); - if (m_amount) - { - for (int y=0; y -#include "wx/gtk/private/gtk2-compat.h" - -static void -gtk_pseudo_window_realized_callback( GtkWidget *m_widget, void *WXUNUSED(win) ) -{ - wxSize disp = wxGetDisplaySize(); - int amount = 128; - wxRegion region; - for (int y=0; yAddChild(this); - - g_signal_connect( m_widget, "realize", - G_CALLBACK (gtk_pseudo_window_realized_callback), this ); - - // gtk_widget_modify_bg() is deprecated in 3.0 but doesn't seem to have - // any obvious replacement as gtk_widget_override_background_color() - // mentioned in the deprecation message it is itself deprecated in - // 3.16, so just continue using it for now. In longer term the best - // would probably be to catch "draw" signal and paint the background - // ourselves. - GdkColor col; - col.red = 128 * 256; - col.green = 192 * 256; - col.blue = 255 * 256; - - wxGCC_WARNING_SUPPRESS(deprecated-declarations) - gtk_widget_modify_bg( m_widget, GTK_STATE_NORMAL, &col ); - wxGCC_WARNING_RESTORE(deprecated-declarations) - } - - bool SetTransparent(wxByte WXUNUSED(alpha)) wxOVERRIDE - { - return true; - } - -protected: - virtual void DoSetSizeHints( int minW, int minH, - int maxW, int maxH, - int incW, int incH) wxOVERRIDE - { - // the real wxFrame method doesn't work for us because we're not really - // a top level window so skip it - wxWindow::DoSetSizeHints(minW, minH, maxW, maxH, incW, incH); - } - -private: - wxDECLARE_DYNAMIC_CLASS(wxPseudoTransparentFrame); -}; - -wxIMPLEMENT_DYNAMIC_CLASS(wxPseudoTransparentFrame, wxFrame); - -#endif - // __WXGTK20__ - - - -// -- static utility functions -- - -static wxBitmap wxPaneCreateStippleBitmap() -{ - unsigned char data[] = { 0,0,0,192,192,192, 192,192,192,0,0,0 }; - wxImage img(2,2,data,true); - return wxBitmap(img); -} - -static void DrawResizeHint(wxDC& dc, const wxRect& rect) -{ - wxBitmap stipple = wxPaneCreateStippleBitmap(); - wxBrush brush(stipple); - dc.SetBrush(brush); -#ifdef __WXMSW__ - wxMSWDCImpl *impl = (wxMSWDCImpl*) dc.GetImpl(); - PatBlt(GetHdcOf(*impl), rect.GetX(), rect.GetY(), rect.GetWidth(), rect.GetHeight(), PATINVERT); -#else - dc.SetPen(*wxTRANSPARENT_PEN); - - dc.SetLogicalFunction(wxXOR); - dc.DrawRectangle(rect); -#endif -} - - - -// CopyDocksAndPanes() - this utility function creates copies of -// the dock and pane info. wxAuiDockInfo's usually contain pointers -// to wxAuiPaneInfo classes, thus this function is necessary to reliably -// reconstruct that relationship in the new dock info and pane info arrays - -static void CopyDocksAndPanes(wxAuiDockInfoArray& dest_docks, - wxAuiPaneInfoArray& dest_panes, - const wxAuiDockInfoArray& src_docks, - const wxAuiPaneInfoArray& src_panes) -{ - dest_docks = src_docks; - dest_panes = src_panes; - int i, j, k, dock_count, pc1, pc2; - for (i = 0, dock_count = dest_docks.GetCount(); i < dock_count; ++i) - { - wxAuiDockInfo& dock = dest_docks.Item(i); - for (j = 0, pc1 = dock.panes.GetCount(); j < pc1; ++j) - for (k = 0, pc2 = src_panes.GetCount(); k < pc2; ++k) - if (dock.panes.Item(j) == &src_panes.Item(k)) - dock.panes.Item(j) = &dest_panes.Item(k); - } -} - -// GetMaxLayer() is an internal function which returns -// the highest layer inside the specified dock -static int GetMaxLayer(const wxAuiDockInfoArray& docks, - int dock_direction) -{ - int i, dock_count, max_layer = 0; - for (i = 0, dock_count = docks.GetCount(); i < dock_count; ++i) - { - wxAuiDockInfo& dock = docks.Item(i); - if (dock.dock_direction == dock_direction && - dock.dock_layer > max_layer && !dock.fixed) - max_layer = dock.dock_layer; - } - return max_layer; -} - - -// GetMaxRow() is an internal function which returns -// the highest layer inside the specified dock -static int GetMaxRow(const wxAuiPaneInfoArray& panes, int direction, int layer) -{ - int i, pane_count, max_row = 0; - for (i = 0, pane_count = panes.GetCount(); i < pane_count; ++i) - { - wxAuiPaneInfo& pane = panes.Item(i); - if (pane.dock_direction == direction && - pane.dock_layer == layer && - pane.dock_row > max_row) - max_row = pane.dock_row; - } - return max_row; -} - - - -// DoInsertDockLayer() is an internal function that inserts a new dock -// layer by incrementing all existing dock layer values by one -static void DoInsertDockLayer(wxAuiPaneInfoArray& panes, - int dock_direction, - int dock_layer) -{ - int i, pane_count; - for (i = 0, pane_count = panes.GetCount(); i < pane_count; ++i) - { - wxAuiPaneInfo& pane = panes.Item(i); - if (!pane.IsFloating() && - pane.dock_direction == dock_direction && - pane.dock_layer >= dock_layer) - pane.dock_layer++; - } -} - -// DoInsertDockLayer() is an internal function that inserts a new dock -// row by incrementing all existing dock row values by one -static void DoInsertDockRow(wxAuiPaneInfoArray& panes, - int dock_direction, - int dock_layer, - int dock_row) -{ - int i, pane_count; - for (i = 0, pane_count = panes.GetCount(); i < pane_count; ++i) - { - wxAuiPaneInfo& pane = panes.Item(i); - if (!pane.IsFloating() && - pane.dock_direction == dock_direction && - pane.dock_layer == dock_layer && - pane.dock_row >= dock_row) - pane.dock_row++; - } -} - -// DoInsertDockLayer() is an internal function that inserts a space for -// another dock pane by incrementing all existing dock row values by one -static void DoInsertPane(wxAuiPaneInfoArray& panes, - int dock_direction, - int dock_layer, - int dock_row, - int dock_pos) -{ - int i, pane_count; - for (i = 0, pane_count = panes.GetCount(); i < pane_count; ++i) - { - wxAuiPaneInfo& pane = panes.Item(i); - if (!pane.IsFloating() && - pane.dock_direction == dock_direction && - pane.dock_layer == dock_layer && - pane.dock_row == dock_row && - pane.dock_pos >= dock_pos) - pane.dock_pos++; - } -} - -// FindDocks() is an internal function that returns a list of docks which meet -// the specified conditions in the parameters and returns a sorted array -// (sorted by layer and then row) -static void FindDocks(wxAuiDockInfoArray& docks, - int dock_direction, - int dock_layer, - int dock_row, - wxAuiDockInfoPtrArray& arr) -{ - int begin_layer = dock_layer; - int end_layer = dock_layer; - int begin_row = dock_row; - int end_row = dock_row; - int dock_count = docks.GetCount(); - int layer, row, i, max_row = 0, max_layer = 0; - - // discover the maximum dock layer and the max row - for (i = 0; i < dock_count; ++i) - { - max_row = wxMax(max_row, docks.Item(i).dock_row); - max_layer = wxMax(max_layer, docks.Item(i).dock_layer); - } - - // if no dock layer was specified, search all dock layers - if (dock_layer == -1) - { - begin_layer = 0; - end_layer = max_layer; - } - - // if no dock row was specified, search all dock row - if (dock_row == -1) - { - begin_row = 0; - end_row = max_row; - } - - arr.Clear(); - - for (layer = begin_layer; layer <= end_layer; ++layer) - for (row = begin_row; row <= end_row; ++row) - for (i = 0; i < dock_count; ++i) - { - wxAuiDockInfo& d = docks.Item(i); - if (dock_direction == -1 || dock_direction == d.dock_direction) - { - if (d.dock_layer == layer && d.dock_row == row) - arr.Add(&d); - } - } -} - -// FindPaneInDock() looks up a specified window pointer inside a dock. -// If found, the corresponding wxAuiPaneInfo pointer is returned, otherwise NULL. -static wxAuiPaneInfo* FindPaneInDock(const wxAuiDockInfo& dock, wxWindow* window) -{ - int i, count = dock.panes.GetCount(); - for (i = 0; i < count; ++i) - { - wxAuiPaneInfo* p = dock.panes.Item(i); - if (p->window == window) - return p; - } - return NULL; -} - -// RemovePaneFromDocks() removes a pane window from all docks -// with a possible exception specified by parameter "ex_cept" -static void RemovePaneFromDocks(wxAuiDockInfoArray& docks, - wxAuiPaneInfo& pane, - wxAuiDockInfo* ex_cept = NULL ) -{ - int i, dock_count; - for (i = 0, dock_count = docks.GetCount(); i < dock_count; ++i) - { - wxAuiDockInfo& d = docks.Item(i); - if (&d == ex_cept) - continue; - wxAuiPaneInfo* pi = FindPaneInDock(d, pane.window); - if (pi) - d.panes.Remove(pi); - } -} - -/* -// This function works fine, and may be used in the future - -// RenumberDockRows() takes a dock and assigns sequential numbers -// to existing rows. Basically it takes out the gaps; so if a -// dock has rows with numbers 0,2,5, they will become 0,1,2 -static void RenumberDockRows(wxAuiDockInfoPtrArray& docks) -{ - int i, dock_count; - for (i = 0, dock_count = docks.GetCount(); i < dock_count; ++i) - { - wxAuiDockInfo& dock = *docks.Item(i); - dock.dock_row = i; - - int j, pane_count; - for (j = 0, pane_count = dock.panes.GetCount(); j < pane_count; ++j) - dock.panes.Item(j)->dock_row = i; - } -} -*/ - - -// SetActivePane() sets the active pane, as well as cycles through -// every other pane and makes sure that all others' active flags -// are turned off -void wxAuiManager::SetActivePane(wxWindow* active_pane) -{ - int i, pane_count; - wxAuiPaneInfo* active_paneinfo = NULL; - for (i = 0, pane_count = m_panes.GetCount(); i < pane_count; ++i) - { - wxAuiPaneInfo& pane = m_panes.Item(i); - pane.state &= ~wxAuiPaneInfo::optionActive; - if (pane.window == active_pane) - { - pane.state |= wxAuiPaneInfo::optionActive; - active_paneinfo = &pane; - } - } - - // send the 'activated' event after all panes have been updated - if ( active_paneinfo ) - { - wxAuiManagerEvent evt(wxEVT_AUI_PANE_ACTIVATED); - evt.SetManager(this); - evt.SetPane(active_paneinfo); - ProcessMgrEvent(evt); - } -} - - -// this function is used to sort panes by dock position -static int PaneSortFunc(wxAuiPaneInfo** p1, wxAuiPaneInfo** p2) -{ - return ((*p1)->dock_pos < (*p2)->dock_pos) ? -1 : 1; -} - - -bool wxAuiPaneInfo::IsValid() const -{ - // Should this RTTI and function call be rewritten as - // sending a new event type to allow other window types - // to check the pane settings? - wxAuiToolBar* toolbar = wxDynamicCast(window, wxAuiToolBar); - return !toolbar || toolbar->IsPaneValid(*this); -} - -// -- wxAuiManager class implementation -- - - -wxBEGIN_EVENT_TABLE(wxAuiManager, wxEvtHandler) - EVT_AUI_PANE_BUTTON(wxAuiManager::OnPaneButton) - EVT_AUI_RENDER(wxAuiManager::OnRender) - EVT_PAINT(wxAuiManager::OnPaint) - EVT_ERASE_BACKGROUND(wxAuiManager::OnEraseBackground) - EVT_SIZE(wxAuiManager::OnSize) - EVT_SET_CURSOR(wxAuiManager::OnSetCursor) - EVT_LEFT_DOWN(wxAuiManager::OnLeftDown) - EVT_LEFT_UP(wxAuiManager::OnLeftUp) - EVT_MOTION(wxAuiManager::OnMotion) - EVT_LEAVE_WINDOW(wxAuiManager::OnLeaveWindow) - EVT_MOUSE_CAPTURE_LOST(wxAuiManager::OnCaptureLost) - EVT_CHILD_FOCUS(wxAuiManager::OnChildFocus) - EVT_AUI_FIND_MANAGER(wxAuiManager::OnFindManager) -wxEND_EVENT_TABLE() - - -wxAuiManager::wxAuiManager(wxWindow* managed_wnd, unsigned int flags) -{ - m_action = actionNone; - m_actionWindow = NULL; - m_lastMouseMove = wxPoint(); - m_hoverButton = NULL; - m_art = new wxAuiDefaultDockArt; - m_hintWnd = NULL; - m_flags = flags; - m_skipping = false; - m_hasMaximized = false; - m_frame = NULL; - m_dockConstraintX = 0.3; - m_dockConstraintY = 0.3; - m_reserved = NULL; - m_currentDragItem = -1; - - if (managed_wnd) - { - SetManagedWindow(managed_wnd); - } -} - -wxAuiManager::~wxAuiManager() -{ - // NOTE: It's possible that the windows have already been destroyed by the - // time this dtor is called, so this loop can result in memory access via - // invalid pointers, resulting in a crash. So it will be disabled while - // waiting for a better solution. -#if 0 - for ( size_t i = 0; i < m_panes.size(); i++ ) - { - wxAuiPaneInfo& pinfo = m_panes[i]; - if (pinfo.window && !pinfo.window->GetParent()) - delete pinfo.window; - } -#endif - - delete m_art; -} - -// creates a floating frame for the windows -wxAuiFloatingFrame* wxAuiManager::CreateFloatingFrame(wxWindow* parent, - const wxAuiPaneInfo& paneInfo) -{ - return new wxAuiFloatingFrame(parent, this, paneInfo); -} - -bool wxAuiManager::CanDockPanel(const wxAuiPaneInfo & WXUNUSED(p)) -{ - // if a key modifier is pressed while dragging the frame, - // don't dock the window - return !(wxGetKeyState(WXK_CONTROL) || wxGetKeyState(WXK_ALT)); -} - -// GetPane() looks up a wxAuiPaneInfo structure based -// on the supplied window pointer. Upon failure, GetPane() -// returns an empty wxAuiPaneInfo, a condition which can be checked -// by calling wxAuiPaneInfo::IsOk(). -// -// The pane info's structure may then be modified. Once a pane's -// info is modified, wxAuiManager::Update() must be called to -// realize the changes in the UI. - -wxAuiPaneInfo& wxAuiManager::GetPane(wxWindow* window) -{ - int i, pane_count; - for (i = 0, pane_count = m_panes.GetCount(); i < pane_count; ++i) - { - wxAuiPaneInfo& p = m_panes.Item(i); - if (p.window == window) - return p; - } - return wxAuiNullPaneInfo; -} - -// this version of GetPane() looks up a pane based on a -// 'pane name', see above comment for more info -wxAuiPaneInfo& wxAuiManager::GetPane(const wxString& name) -{ - int i, pane_count; - for (i = 0, pane_count = m_panes.GetCount(); i < pane_count; ++i) - { - wxAuiPaneInfo& p = m_panes.Item(i); - if (p.name == name) - return p; - } - return wxAuiNullPaneInfo; -} - -// GetAllPanes() returns a reference to all the pane info structures -wxAuiPaneInfoArray& wxAuiManager::GetAllPanes() -{ - return m_panes; -} - -// HitTest() is an internal function which determines -// which UI item the specified coordinates are over -// (x,y) specify a position in client coordinates -wxAuiDockUIPart* wxAuiManager::HitTest(int x, int y) -{ - wxAuiDockUIPart* result = NULL; - - int i, part_count; - for (i = 0, part_count = m_uiParts.GetCount(); i < part_count; ++i) - { - wxAuiDockUIPart* item = &m_uiParts.Item(i); - - // we are not interested in typeDock, because this space - // isn't used to draw anything, just for measurements; - // besides, the entire dock area is covered with other - // rectangles, which we are interested in. - if (item->type == wxAuiDockUIPart::typeDock) - continue; - - // if we already have a hit on a more specific item, we are not - // interested in a pane hit. If, however, we don't already have - // a hit, returning a pane hit is necessary for some operations - if ((item->type == wxAuiDockUIPart::typePane || - item->type == wxAuiDockUIPart::typePaneBorder) && result) - continue; - - // if the point is inside the rectangle, we have a hit - if (item->rect.Contains(x,y)) - result = item; - } - - return result; -} - - -// SetFlags() and GetFlags() allow the owner to set various -// options which are global to wxAuiManager -void wxAuiManager::SetFlags(unsigned int flags) -{ - // find out if we have to call UpdateHintWindowConfig() - bool update_hint_wnd = false; - unsigned int hint_mask = wxAUI_MGR_TRANSPARENT_HINT | - wxAUI_MGR_VENETIAN_BLINDS_HINT | - wxAUI_MGR_RECTANGLE_HINT; - if ((flags & hint_mask) != (m_flags & hint_mask)) - update_hint_wnd = true; - - - // set the new flags - m_flags = flags; - - if (update_hint_wnd) - { - UpdateHintWindowConfig(); - } -} - -unsigned int wxAuiManager::GetFlags() const -{ - return m_flags; -} - -// Convenience function -bool wxAuiManager_HasLiveResize(wxAuiManager& manager) -{ - // With Core Graphics on Mac, it's not possible to show sash feedback, - // so we'll always use live update instead. -#if defined(__WXMAC__) - wxUnusedVar(manager); - return true; -#else - return (manager.GetFlags() & wxAUI_MGR_LIVE_RESIZE) == wxAUI_MGR_LIVE_RESIZE; -#endif -} - -// don't use these anymore as they are deprecated -// use Set/GetManagedFrame() instead -void wxAuiManager::SetFrame(wxFrame* frame) -{ - SetManagedWindow((wxWindow*)frame); -} - -wxFrame* wxAuiManager::GetFrame() const -{ - return (wxFrame*)m_frame; -} - - -// this function will return the aui manager for a given -// window. The |window| parameter should be any child window -// or grand-child window (and so on) of the frame/window -// managed by wxAuiManager. The |window| parameter does not -// need to be managed by the manager itself. -wxAuiManager* wxAuiManager::GetManager(wxWindow* window) -{ - wxAuiManagerEvent evt(wxEVT_AUI_FIND_MANAGER); - evt.SetManager(NULL); - evt.ResumePropagation(wxEVENT_PROPAGATE_MAX); - if (!window->GetEventHandler()->ProcessEvent(evt)) - return NULL; - - return evt.GetManager(); -} - - -void wxAuiManager::UpdateHintWindowConfig() -{ - // find out if the system can do transparent frames - bool can_do_transparent = false; - - wxWindow* w = m_frame; - while (w) - { - if (wxDynamicCast(w, wxFrame)) - { - wxFrame* f = static_cast(w); - can_do_transparent = f->CanSetTransparent(); - - break; - } - - w = w->GetParent(); - } - - // if there is an existing hint window, delete it - if (m_hintWnd) - { - m_hintWnd->Destroy(); - m_hintWnd = NULL; - } - - m_hintFadeMax = 50; - m_hintWnd = NULL; - - if ((m_flags & wxAUI_MGR_TRANSPARENT_HINT) && can_do_transparent) - { - // Make a window to use for a transparent hint - #if defined(__WXMSW__) || defined(__WXGTK__) - m_hintWnd = new wxFrame(m_frame, wxID_ANY, wxEmptyString, - wxDefaultPosition, wxSize(1,1), - wxFRAME_TOOL_WINDOW | - wxFRAME_FLOAT_ON_PARENT | - wxFRAME_NO_TASKBAR | - wxNO_BORDER); - - m_hintWnd->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_ACTIVECAPTION)); - #elif defined(__WXMAC__) - // Using a miniframe with float and tool styles keeps the parent - // frame activated and highlighted as such... - m_hintWnd = new wxMiniFrame(m_frame, wxID_ANY, wxEmptyString, - wxDefaultPosition, wxSize(1,1), - wxFRAME_FLOAT_ON_PARENT - | wxFRAME_TOOL_WINDOW ); - m_hintWnd->Connect(wxEVT_ACTIVATE, - wxActivateEventHandler(wxAuiManager::OnHintActivate), NULL, this); - - // Can't set the bg colour of a Frame in wxMac - wxPanel* p = new wxPanel(m_hintWnd); - - // The default wxSYS_COLOUR_ACTIVECAPTION colour is a light silver - // color that is really hard to see, especially transparent. - // Until a better system color is decided upon we'll just use - // blue. - p->SetBackgroundColour(*wxBLUE); - #endif - - } - else - { - if ((m_flags & wxAUI_MGR_TRANSPARENT_HINT) != 0 || - (m_flags & wxAUI_MGR_VENETIAN_BLINDS_HINT) != 0) - { - // system can't support transparent fade, or the venetian - // blinds effect was explicitly requested - m_hintWnd = new wxPseudoTransparentFrame(m_frame, - wxID_ANY, - wxEmptyString, - wxDefaultPosition, - wxSize(1,1), - wxFRAME_TOOL_WINDOW | - wxFRAME_FLOAT_ON_PARENT | - wxFRAME_NO_TASKBAR | - wxNO_BORDER); - m_hintFadeMax = 128; - } - } -} - - -// SetManagedWindow() is usually called once when the frame -// manager class is being initialized. "frame" specifies -// the frame which should be managed by the frame manager -void wxAuiManager::SetManagedWindow(wxWindow* wnd) -{ - wxASSERT_MSG(wnd, wxT("specified window must be non-NULL")); - - m_frame = wnd; - m_frame->PushEventHandler(this); - -#if wxUSE_MDI - // if the owner is going to manage an MDI parent frame, - // we need to add the MDI client window as the default - // center pane - - if (wxDynamicCast(m_frame, wxMDIParentFrame)) - { - wxMDIParentFrame* mdi_frame = (wxMDIParentFrame*)m_frame; - wxWindow* client_window = mdi_frame->GetClientWindow(); - - wxASSERT_MSG(client_window, wxT("Client window is NULL!")); - - AddPane(client_window, - wxAuiPaneInfo().Name(wxT("mdiclient")). - CenterPane().PaneBorder(false)); - } - else if (wxDynamicCast(m_frame, wxAuiMDIParentFrame)) - { - wxAuiMDIParentFrame* mdi_frame = (wxAuiMDIParentFrame*)m_frame; - wxAuiMDIClientWindow* client_window = mdi_frame->GetClientWindow(); - wxASSERT_MSG(client_window, wxT("Client window is NULL!")); - - AddPane(client_window, - wxAuiPaneInfo().Name(wxT("mdiclient")). - CenterPane().PaneBorder(false)); - } - -#endif - - UpdateHintWindowConfig(); -} - - -// UnInit() must be called, usually in the destructor -// of the frame class. If it is not called, usually this -// will result in a crash upon program exit -void wxAuiManager::UnInit() -{ - if (m_frame) - { - m_frame->RemoveEventHandler(this); - } -} - -// GetManagedWindow() returns the window pointer being managed -wxWindow* wxAuiManager::GetManagedWindow() const -{ - return m_frame; -} - -wxAuiDockArt* wxAuiManager::GetArtProvider() const -{ - return m_art; -} - -void wxAuiManager::ProcessMgrEvent(wxAuiManagerEvent& event) -{ - // first, give the owner frame a chance to override - if (m_frame) - { - if (m_frame->GetEventHandler()->ProcessEvent(event)) - return; - } - - ProcessEvent(event); -} - -// SetArtProvider() instructs wxAuiManager to use the -// specified art provider for all drawing calls. This allows -// plugable look-and-feel features. The pointer that is -// passed to this method subsequently belongs to wxAuiManager, -// and is deleted in the frame manager destructor -void wxAuiManager::SetArtProvider(wxAuiDockArt* art_provider) -{ - // delete the last art provider, if any - delete m_art; - - // assign the new art provider - m_art = art_provider; -} - - -bool wxAuiManager::AddPane(wxWindow* window, const wxAuiPaneInfo& paneInfo) -{ - wxASSERT_MSG(window, wxT("NULL window ptrs are not allowed")); - - // check if the pane has a valid window - if (!window) - return false; - - // check if the window is already managed by us - if (GetPane(paneInfo.window).IsOk()) - return false; - - // check if the pane name already exists, this could reveal a - // bug in the library user's application - bool already_exists = false; - if (!paneInfo.name.empty() && GetPane(paneInfo.name).IsOk()) - { - wxFAIL_MSG(wxT("A pane with that name already exists in the manager!")); - already_exists = true; - } - - // if the new pane is docked then we should undo maximize - if (paneInfo.IsDocked()) - RestoreMaximizedPane(); - - // special case: wxAuiToolBar style interacts with docking flags - wxAuiPaneInfo test(paneInfo); - wxAuiToolBar* toolbar = wxDynamicCast(window, wxAuiToolBar); - if (toolbar) - { - // if pane has default docking flags - const unsigned int dockMask = wxAuiPaneInfo::optionLeftDockable | - wxAuiPaneInfo::optionRightDockable | - wxAuiPaneInfo::optionTopDockable | - wxAuiPaneInfo::optionBottomDockable; - const unsigned int defaultDock = wxAuiPaneInfo(). - DefaultPane().state & dockMask; - if ((test.state & dockMask) == defaultDock) - { - // set docking flags based on toolbar style - if (toolbar->GetWindowStyleFlag() & wxAUI_TB_VERTICAL) - { - test.TopDockable(false).BottomDockable(false); - } - else if (toolbar->GetWindowStyleFlag() & wxAUI_TB_HORIZONTAL) - { - test.LeftDockable(false).RightDockable(false); - } - } - else - { - // see whether non-default docking flags are valid - test.window = window; - wxCHECK_MSG(test.IsValid(), false, - "toolbar style and pane docking flags are incompatible"); - } - } - - m_panes.Add(test); - - wxAuiPaneInfo& pinfo = m_panes.Last(); - - // set the pane window - pinfo.window = window; - - - // if the pane's name identifier is blank, create a random string - if (pinfo.name.empty() || already_exists) - { - pinfo.name.Printf(wxT("%08lx%08x%08x%08lx"), - (unsigned long)(wxPtrToUInt(pinfo.window) & 0xffffffff), - (unsigned int)time(NULL), - (unsigned int)clock(), - (unsigned long)m_panes.GetCount()); - } - - // set initial proportion (if not already set) - if (pinfo.dock_proportion == 0) - pinfo.dock_proportion = 100000; - - if (pinfo.HasMaximizeButton()) - { - wxAuiPaneButton button; - button.button_id = wxAUI_BUTTON_MAXIMIZE_RESTORE; - pinfo.buttons.Add(button); - } - - if (pinfo.HasPinButton()) - { - wxAuiPaneButton button; - button.button_id = wxAUI_BUTTON_PIN; - pinfo.buttons.Add(button); - } - - if (pinfo.HasCloseButton()) - { - wxAuiPaneButton button; - button.button_id = wxAUI_BUTTON_CLOSE; - pinfo.buttons.Add(button); - } - - if (pinfo.HasGripper()) - { - if (wxDynamicCast(pinfo.window, wxAuiToolBar)) - { - // prevent duplicate gripper -- both wxAuiManager and wxAuiToolBar - // have a gripper control. The toolbar's built-in gripper - // meshes better with the look and feel of the control than ours, - // so turn wxAuiManager's gripper off, and the toolbar's on. - - wxAuiToolBar* tb = static_cast(pinfo.window); - pinfo.SetFlag(wxAuiPaneInfo::optionGripper, false); - tb->SetGripperVisible(true); - } - } - - - if (pinfo.best_size == wxDefaultSize && - pinfo.window) - { - pinfo.best_size = pinfo.window->GetClientSize(); - -#if wxUSE_TOOLBAR - if (wxDynamicCast(pinfo.window, wxToolBar)) - { - // GetClientSize() doesn't get the best size for - // a toolbar under some newer versions of wxWidgets, - // so use GetBestSize() - pinfo.best_size = pinfo.window->GetBestSize(); - } -#endif // wxUSE_TOOLBAR - - if (pinfo.min_size != wxDefaultSize) - { - if (pinfo.best_size.x < pinfo.min_size.x) - pinfo.best_size.x = pinfo.min_size.x; - if (pinfo.best_size.y < pinfo.min_size.y) - pinfo.best_size.y = pinfo.min_size.y; - } - } - - - - return true; -} - -bool wxAuiManager::AddPane(wxWindow* window, - int direction, - const wxString& caption) -{ - wxAuiPaneInfo pinfo; - pinfo.Caption(caption); - switch (direction) - { - case wxTOP: pinfo.Top(); break; - case wxBOTTOM: pinfo.Bottom(); break; - case wxLEFT: pinfo.Left(); break; - case wxRIGHT: pinfo.Right(); break; - case wxCENTER: pinfo.CenterPane(); break; - } - return AddPane(window, pinfo); -} - -bool wxAuiManager::AddPane(wxWindow* window, - const wxAuiPaneInfo& paneInfo, - const wxPoint& drop_pos) -{ - if (!AddPane(window, paneInfo)) - return false; - - wxAuiPaneInfo& pane = GetPane(window); - - DoDrop(m_docks, m_panes, pane, drop_pos, wxPoint(0,0)); - - return true; -} - -bool wxAuiManager::InsertPane(wxWindow* window, const wxAuiPaneInfo& paneInfo, - int insert_level) -{ - wxASSERT_MSG(window, wxT("NULL window ptrs are not allowed")); - - // shift the panes around, depending on the insert level - switch (insert_level) - { - case wxAUI_INSERT_PANE: - DoInsertPane(m_panes, - paneInfo.dock_direction, - paneInfo.dock_layer, - paneInfo.dock_row, - paneInfo.dock_pos); - break; - case wxAUI_INSERT_ROW: - DoInsertDockRow(m_panes, - paneInfo.dock_direction, - paneInfo.dock_layer, - paneInfo.dock_row); - break; - case wxAUI_INSERT_DOCK: - DoInsertDockLayer(m_panes, - paneInfo.dock_direction, - paneInfo.dock_layer); - break; - } - - // if the window already exists, we are basically just moving/inserting the - // existing window. If it doesn't exist, we need to add it and insert it - wxAuiPaneInfo& existing_pane = GetPane(window); - if (!existing_pane.IsOk()) - { - return AddPane(window, paneInfo); - } - else - { - if (paneInfo.IsFloating()) - { - existing_pane.Float(); - if (paneInfo.floating_pos != wxDefaultPosition) - existing_pane.FloatingPosition(paneInfo.floating_pos); - if (paneInfo.floating_size != wxDefaultSize) - existing_pane.FloatingSize(paneInfo.floating_size); - } - else - { - // if the new pane is docked then we should undo maximize - RestoreMaximizedPane(); - - existing_pane.Direction(paneInfo.dock_direction); - existing_pane.Layer(paneInfo.dock_layer); - existing_pane.Row(paneInfo.dock_row); - existing_pane.Position(paneInfo.dock_pos); - } - } - - return true; -} - - -// DetachPane() removes a pane from the frame manager. This -// method will not destroy the window that is removed. -bool wxAuiManager::DetachPane(wxWindow* window) -{ - wxASSERT_MSG(window, wxT("NULL window ptrs are not allowed")); - - int i, count; - for (i = 0, count = m_panes.GetCount(); i < count; ++i) - { - wxAuiPaneInfo& p = m_panes.Item(i); - if (p.window == window) - { - if (p.frame) - { - // we have a floating frame which is being detached. We need to - // reparent it to m_frame and destroy the floating frame - - // reduce flicker - p.window->SetSize(1,1); - - if (p.frame->IsShown()) - p.frame->Show(false); - - // reparent to m_frame and destroy the pane - if (m_actionWindow == p.frame) - { - m_actionWindow = NULL; - } - - p.window->Reparent(m_frame); - p.frame->SetSizer(NULL); - p.frame->Destroy(); - p.frame = NULL; - } - - // make sure there are no references to this pane in our uiparts, - // just in case the caller doesn't call Update() immediately after - // the DetachPane() call. This prevets obscure crashes which would - // happen at window repaint if the caller forgets to call Update() - int pi, part_count; - for (pi = 0, part_count = (int)m_uiParts.GetCount(); pi < part_count; ++pi) - { - wxAuiDockUIPart& part = m_uiParts.Item(pi); - if (part.pane == &p) - { - m_uiParts.RemoveAt(pi); - part_count--; - pi--; - continue; - } - } - - m_panes.RemoveAt(i); - return true; - } - } - return false; -} - -// ClosePane() destroys or hides the pane depending on its flags -void wxAuiManager::ClosePane(wxAuiPaneInfo& paneInfo) -{ - // if we were maximized, restore - if (paneInfo.IsMaximized()) - { - RestorePane(paneInfo); - } - - // first, hide the window - if (paneInfo.window && paneInfo.window->IsShown()) - { - paneInfo.window->Show(false); - } - - // make sure that we are the parent of this window - if (paneInfo.window && paneInfo.window->GetParent() != m_frame) - { - paneInfo.window->Reparent(m_frame); - } - - // if we have a frame, destroy it - if (paneInfo.frame) - { - paneInfo.frame->Destroy(); - paneInfo.frame = NULL; - } - - // now we need to either destroy or hide the pane - if (paneInfo.IsDestroyOnClose()) - { - wxWindow * window = paneInfo.window; - DetachPane(window); - if (window) - { - window->Destroy(); - } - } - else - { - paneInfo.Hide(); - } -} - -void wxAuiManager::MaximizePane(wxAuiPaneInfo& paneInfo) -{ - int i, pane_count; - - // un-maximize and hide all other panes - for (i = 0, pane_count = m_panes.GetCount(); i < pane_count; ++i) - { - wxAuiPaneInfo& p = m_panes.Item(i); - if (!p.IsToolbar() && !p.IsFloating()) - { - p.Restore(); - - // save hidden state - p.SetFlag(wxAuiPaneInfo::savedHiddenState, - p.HasFlag(wxAuiPaneInfo::optionHidden)); - - // hide the pane, because only the newly - // maximized pane should show - p.Hide(); - } - } - - // mark ourselves maximized - paneInfo.Maximize(); - paneInfo.Show(); - m_hasMaximized = true; - - // last, show the window - if (paneInfo.window && !paneInfo.window->IsShown()) - { - paneInfo.window->Show(true); - } -} - -void wxAuiManager::RestorePane(wxAuiPaneInfo& paneInfo) -{ - int i, pane_count; - - // restore all the panes - for (i = 0, pane_count = m_panes.GetCount(); i < pane_count; ++i) - { - wxAuiPaneInfo& p = m_panes.Item(i); - if (!p.IsToolbar() && !p.IsFloating()) - { - p.SetFlag(wxAuiPaneInfo::optionHidden, - p.HasFlag(wxAuiPaneInfo::savedHiddenState)); - } - } - - // mark ourselves non-maximized - paneInfo.Restore(); - m_hasMaximized = false; - - // last, show the window - if (paneInfo.window && !paneInfo.window->IsShown()) - { - paneInfo.window->Show(true); - } -} - -void wxAuiManager::RestoreMaximizedPane() -{ - int i, pane_count; - - // restore all the panes - for (i = 0, pane_count = m_panes.GetCount(); i < pane_count; ++i) - { - wxAuiPaneInfo& p = m_panes.Item(i); - if (p.IsMaximized()) - { - RestorePane(p); - break; - } - } -} - -// EscapeDelimiters() changes ";" into "\;" and "|" into "\|" -// in the input string. This is an internal functions which is -// used for saving perspectives -static wxString EscapeDelimiters(const wxString& s) -{ - wxString result; - result.Alloc(s.length()); - const wxChar* ch = s.c_str(); - while (*ch) - { - if (*ch == wxT(';') || *ch == wxT('|')) - result += wxT('\\'); - result += *ch; - ++ch; - } - return result; -} - -wxString wxAuiManager::SavePaneInfo(wxAuiPaneInfo& pane) -{ - wxString result = wxT("name="); - result += EscapeDelimiters(pane.name); - result += wxT(";"); - - result += wxT("caption="); - result += EscapeDelimiters(pane.caption); - result += wxT(";"); - - result += wxString::Format(wxT("state=%u;"), pane.state); - result += wxString::Format(wxT("dir=%d;"), pane.dock_direction); - result += wxString::Format(wxT("layer=%d;"), pane.dock_layer); - result += wxString::Format(wxT("row=%d;"), pane.dock_row); - result += wxString::Format(wxT("pos=%d;"), pane.dock_pos); - result += wxString::Format(wxT("prop=%d;"), pane.dock_proportion); - result += wxString::Format(wxT("bestw=%d;"), pane.best_size.x); - result += wxString::Format(wxT("besth=%d;"), pane.best_size.y); - result += wxString::Format(wxT("minw=%d;"), pane.min_size.x); - result += wxString::Format(wxT("minh=%d;"), pane.min_size.y); - result += wxString::Format(wxT("maxw=%d;"), pane.max_size.x); - result += wxString::Format(wxT("maxh=%d;"), pane.max_size.y); - result += wxString::Format(wxT("floatx=%d;"), pane.floating_pos.x); - result += wxString::Format(wxT("floaty=%d;"), pane.floating_pos.y); - result += wxString::Format(wxT("floatw=%d;"), pane.floating_size.x); - result += wxString::Format(wxT("floath=%d"), pane.floating_size.y); - - return result; -} - -// Load a "pane" with the pane information settings in pane_part -void wxAuiManager::LoadPaneInfo(wxString pane_part, wxAuiPaneInfo &pane) -{ - // replace escaped characters so we can - // split up the string easily - pane_part.Replace(wxT("\\|"), wxT("\a")); - pane_part.Replace(wxT("\\;"), wxT("\b")); - - while(1) - { - wxString val_part = pane_part.BeforeFirst(wxT(';')); - pane_part = pane_part.AfterFirst(wxT(';')); - wxString val_name = val_part.BeforeFirst(wxT('=')); - wxString value = val_part.AfterFirst(wxT('=')); - val_name.MakeLower(); - val_name.Trim(true); - val_name.Trim(false); - value.Trim(true); - value.Trim(false); - - if (val_name.empty()) - break; - - if (val_name == wxT("name")) - pane.name = value; - else if (val_name == wxT("caption")) - pane.caption = value; - else if (val_name == wxT("state")) - pane.state = (unsigned int)wxAtoi(value.c_str()); - else if (val_name == wxT("dir")) - pane.dock_direction = wxAtoi(value.c_str()); - else if (val_name == wxT("layer")) - pane.dock_layer = wxAtoi(value.c_str()); - else if (val_name == wxT("row")) - pane.dock_row = wxAtoi(value.c_str()); - else if (val_name == wxT("pos")) - pane.dock_pos = wxAtoi(value.c_str()); - else if (val_name == wxT("prop")) - pane.dock_proportion = wxAtoi(value.c_str()); - else if (val_name == wxT("bestw")) - pane.best_size.x = wxAtoi(value.c_str()); - else if (val_name == wxT("besth")) - pane.best_size.y = wxAtoi(value.c_str()); - else if (val_name == wxT("minw")) - pane.min_size.x = wxAtoi(value.c_str()); - else if (val_name == wxT("minh")) - pane.min_size.y = wxAtoi(value.c_str()); - else if (val_name == wxT("maxw")) - pane.max_size.x = wxAtoi(value.c_str()); - else if (val_name == wxT("maxh")) - pane.max_size.y = wxAtoi(value.c_str()); - else if (val_name == wxT("floatx")) - pane.floating_pos.x = wxAtoi(value.c_str()); - else if (val_name == wxT("floaty")) - pane.floating_pos.y = wxAtoi(value.c_str()); - else if (val_name == wxT("floatw")) - pane.floating_size.x = wxAtoi(value.c_str()); - else if (val_name == wxT("floath")) - pane.floating_size.y = wxAtoi(value.c_str()); - else { - wxFAIL_MSG(wxT("Bad Perspective String")); - } - } - - // replace escaped characters so we can - // split up the string easily - pane.name.Replace(wxT("\a"), wxT("|")); - pane.name.Replace(wxT("\b"), wxT(";")); - pane.caption.Replace(wxT("\a"), wxT("|")); - pane.caption.Replace(wxT("\b"), wxT(";")); - pane_part.Replace(wxT("\a"), wxT("|")); - pane_part.Replace(wxT("\b"), wxT(";")); - - return; -} - - -// SavePerspective() saves all pane information as a single string. -// This string may later be fed into LoadPerspective() to restore -// all pane settings. This save and load mechanism allows an -// exact pane configuration to be saved and restored at a later time - -wxString wxAuiManager::SavePerspective() -{ - wxString result; - result.Alloc(500); - result = wxT("layout2|"); - - int pane_i, pane_count = m_panes.GetCount(); - for (pane_i = 0; pane_i < pane_count; ++pane_i) - { - wxAuiPaneInfo& pane = m_panes.Item(pane_i); - result += SavePaneInfo(pane)+wxT("|"); - } - - int dock_i, dock_count = m_docks.GetCount(); - for (dock_i = 0; dock_i < dock_count; ++dock_i) - { - wxAuiDockInfo& dock = m_docks.Item(dock_i); - - result += wxString::Format(wxT("dock_size(%d,%d,%d)=%d|"), - dock.dock_direction, dock.dock_layer, - dock.dock_row, dock.size); - } - - return result; -} - -// LoadPerspective() loads a layout which was saved with SavePerspective() -// If the "update" flag parameter is true, the GUI will immediately be updated - -bool wxAuiManager::LoadPerspective(const wxString& layout, bool update) -{ - wxString input = layout; - wxString part; - - // check layout string version - // 'layout1' = wxAUI 0.9.0 - wxAUI 0.9.2 - // 'layout2' = wxAUI 0.9.2 (wxWidgets 2.8) - part = input.BeforeFirst(wxT('|')); - input = input.AfterFirst(wxT('|')); - part.Trim(true); - part.Trim(false); - if (part != wxT("layout2")) - return false; - - // Mark all panes currently managed as hidden. Also, dock all panes that are dockable. - int pane_i, pane_count = m_panes.GetCount(); - for (pane_i = 0; pane_i < pane_count; ++pane_i) - { - wxAuiPaneInfo& p = m_panes.Item(pane_i); - if(p.IsDockable()) - p.Dock(); - p.Hide(); - } - - // clear out the dock array; this will be reconstructed - m_docks.Clear(); - - // replace escaped characters so we can - // split up the string easily - input.Replace(wxT("\\|"), wxT("\a")); - input.Replace(wxT("\\;"), wxT("\b")); - - m_hasMaximized = false; - while (1) - { - wxAuiPaneInfo pane; - - wxString pane_part = input.BeforeFirst(wxT('|')); - input = input.AfterFirst(wxT('|')); - pane_part.Trim(true); - - // if the string is empty, we're done parsing - if (pane_part.empty()) - break; - - if (pane_part.Left(9) == wxT("dock_size")) - { - wxString val_name = pane_part.BeforeFirst(wxT('=')); - wxString value = pane_part.AfterFirst(wxT('=')); - - long dir, layer, row, size; - wxString piece = val_name.AfterFirst(wxT('(')); - piece = piece.BeforeLast(wxT(')')); - piece.BeforeFirst(wxT(',')).ToLong(&dir); - piece = piece.AfterFirst(wxT(',')); - piece.BeforeFirst(wxT(',')).ToLong(&layer); - piece.AfterFirst(wxT(',')).ToLong(&row); - value.ToLong(&size); - - wxAuiDockInfo dock; - dock.dock_direction = dir; - dock.dock_layer = layer; - dock.dock_row = row; - dock.size = size; - m_docks.Add(dock); - continue; - } - - // Undo our escaping as LoadPaneInfo needs to take an unescaped - // name so it can be called by external callers - pane_part.Replace(wxT("\a"), wxT("|")); - pane_part.Replace(wxT("\b"), wxT(";")); - - LoadPaneInfo(pane_part, pane); - - if ( pane.IsMaximized() ) - m_hasMaximized = true; - - wxAuiPaneInfo& p = GetPane(pane.name); - if (!p.IsOk()) - { - // the pane window couldn't be found - // in the existing layout -- skip it - continue; - } - - p.SafeSet(pane); - } - - if (update) - Update(); - - return true; -} - -void wxAuiManager::GetPanePositionsAndSizes(wxAuiDockInfo& dock, - wxArrayInt& positions, - wxArrayInt& sizes) -{ - int caption_size = m_art->GetMetric(wxAUI_DOCKART_CAPTION_SIZE); - int pane_borderSize = m_art->GetMetric(wxAUI_DOCKART_PANE_BORDER_SIZE); - int gripperSize = m_art->GetMetric(wxAUI_DOCKART_GRIPPER_SIZE); - - positions.Empty(); - sizes.Empty(); - - int offset, action_pane = -1; - int pane_i, pane_count = dock.panes.GetCount(); - - // find the pane marked as our action pane - for (pane_i = 0; pane_i < pane_count; ++pane_i) - { - wxAuiPaneInfo& pane = *(dock.panes.Item(pane_i)); - - if (pane.HasFlag(wxAuiPaneInfo::actionPane)) - { - wxASSERT_MSG(action_pane==-1, wxT("Too many fixed action panes")); - action_pane = pane_i; - } - } - - // set up each panes default position, and - // determine the size (width or height, depending - // on the dock's orientation) of each pane - for (pane_i = 0; pane_i < pane_count; ++pane_i) - { - wxAuiPaneInfo& pane = *(dock.panes.Item(pane_i)); - positions.Add(pane.dock_pos); - int size = 0; - - if (pane.HasBorder()) - size += (pane_borderSize*2); - - if (dock.IsHorizontal()) - { - if (pane.HasGripper() && !pane.HasGripperTop()) - size += gripperSize; - size += pane.best_size.x; - } - else - { - if (pane.HasGripper() && pane.HasGripperTop()) - size += gripperSize; - - if (pane.HasCaption()) - size += caption_size; - size += pane.best_size.y; - } - - sizes.Add(size); - } - - // if there is no action pane, just return the default - // positions (as specified in pane.pane_pos) - if (action_pane == -1) - return; - - offset = 0; - for (pane_i = action_pane-1; pane_i >= 0; --pane_i) - { - int amount = positions[pane_i+1] - (positions[pane_i] + sizes[pane_i]); - - if (amount >= 0) - offset += amount; - else - positions[pane_i] -= -amount; - - offset += sizes[pane_i]; - } - - // if the dock mode is fixed, make sure none of the panes - // overlap; we will bump panes that overlap - offset = 0; - for (pane_i = action_pane; pane_i < pane_count; ++pane_i) - { - int amount = positions[pane_i] - offset; - if (amount >= 0) - offset += amount; - else - positions[pane_i] += -amount; - - offset += sizes[pane_i]; - } -} - - -void wxAuiManager::LayoutAddPane(wxSizer* cont, - wxAuiDockInfo& dock, - wxAuiPaneInfo& pane, - wxAuiDockUIPartArray& uiparts, - bool spacer_only) -{ - wxAuiDockUIPart part; - wxSizerItem* sizer_item; - - int caption_size = m_art->GetMetric(wxAUI_DOCKART_CAPTION_SIZE); - int gripperSize = m_art->GetMetric(wxAUI_DOCKART_GRIPPER_SIZE); - int pane_borderSize = m_art->GetMetric(wxAUI_DOCKART_PANE_BORDER_SIZE); - int pane_button_size = m_art->GetMetric(wxAUI_DOCKART_PANE_BUTTON_SIZE); - - // find out the orientation of the item (orientation for panes - // is the same as the dock's orientation) - int orientation; - if (dock.IsHorizontal()) - orientation = wxHORIZONTAL; - else - orientation = wxVERTICAL; - - // this variable will store the proportion - // value that the pane will receive - int pane_proportion = pane.dock_proportion; - - wxBoxSizer* horz_pane_sizer = new wxBoxSizer(wxHORIZONTAL); - wxBoxSizer* vert_pane_sizer = new wxBoxSizer(wxVERTICAL); - - if (pane.HasGripper()) - { - if (pane.HasGripperTop()) - sizer_item = vert_pane_sizer ->Add(1, gripperSize, 0, wxEXPAND); - else - sizer_item = horz_pane_sizer ->Add(gripperSize, 1, 0, wxEXPAND); - - part.type = wxAuiDockUIPart::typeGripper; - part.dock = &dock; - part.pane = &pane; - part.button = NULL; - part.orientation = orientation; - part.cont_sizer = horz_pane_sizer; - part.sizer_item = sizer_item; - uiparts.Add(part); - } - - if (pane.HasCaption()) - { - // create the caption sizer - wxBoxSizer* caption_sizer = new wxBoxSizer(wxHORIZONTAL); - - sizer_item = caption_sizer->Add(1, caption_size, 1, wxEXPAND); - - part.type = wxAuiDockUIPart::typeCaption; - part.dock = &dock; - part.pane = &pane; - part.button = NULL; - part.orientation = orientation; - part.cont_sizer = vert_pane_sizer; - part.sizer_item = sizer_item; - int caption_part_idx = uiparts.GetCount(); - uiparts.Add(part); - - // add pane buttons to the caption - int i, button_count; - for (i = 0, button_count = pane.buttons.GetCount(); - i < button_count; ++i) - { - wxAuiPaneButton& button = pane.buttons.Item(i); - - sizer_item = caption_sizer->Add(pane_button_size, - caption_size, - 0, wxEXPAND); - - part.type = wxAuiDockUIPart::typePaneButton; - part.dock = &dock; - part.pane = &pane; - part.button = &button; - part.orientation = orientation; - part.cont_sizer = caption_sizer; - part.sizer_item = sizer_item; - uiparts.Add(part); - } - - // if we have buttons, add a little space to the right - // of them to ease visual crowding - if (button_count >= 1) - { - caption_sizer->Add(3,1); - } - - // add the caption sizer - sizer_item = vert_pane_sizer->Add(caption_sizer, 0, wxEXPAND); - - uiparts.Item(caption_part_idx).sizer_item = sizer_item; - } - - // add the pane window itself - if (spacer_only) - { - sizer_item = vert_pane_sizer->Add(1, 1, 1, wxEXPAND); - } - else - { - sizer_item = vert_pane_sizer->Add(pane.window, 1, wxEXPAND); - // Don't do this because it breaks the pane size in floating windows - // BIW: Right now commenting this out is causing problems with - // an mdi client window as the center pane. - vert_pane_sizer->SetItemMinSize(pane.window, 1, 1); - } - - part.type = wxAuiDockUIPart::typePane; - part.dock = &dock; - part.pane = &pane; - part.button = NULL; - part.orientation = orientation; - part.cont_sizer = vert_pane_sizer; - part.sizer_item = sizer_item; - uiparts.Add(part); - - - // determine if the pane should have a minimum size; if the pane is - // non-resizable (fixed) then we must set a minimum size. Alternatively, - // if the pane.min_size is set, we must use that value as well - - wxSize min_size = pane.min_size; - if (pane.IsFixed()) - { - if (min_size == wxDefaultSize) - { - min_size = pane.best_size; - pane_proportion = 0; - } - } - - if (min_size != wxDefaultSize) - { - vert_pane_sizer->SetItemMinSize( - vert_pane_sizer->GetChildren().GetCount()-1, - min_size.x, min_size.y); - } - - - // add the vertical sizer (caption, pane window) to the - // horizontal sizer (gripper, vertical sizer) - horz_pane_sizer->Add(vert_pane_sizer, 1, wxEXPAND); - - // finally, add the pane sizer to the dock sizer - - if (pane.HasBorder()) - { - // allowing space for the pane's border - sizer_item = cont->Add(horz_pane_sizer, pane_proportion, - wxEXPAND | wxALL, pane_borderSize); - - part.type = wxAuiDockUIPart::typePaneBorder; - part.dock = &dock; - part.pane = &pane; - part.button = NULL; - part.orientation = orientation; - part.cont_sizer = cont; - part.sizer_item = sizer_item; - uiparts.Add(part); - } - else - { - sizer_item = cont->Add(horz_pane_sizer, pane_proportion, wxEXPAND); - } -} - -void wxAuiManager::LayoutAddDock(wxSizer* cont, - wxAuiDockInfo& dock, - wxAuiDockUIPartArray& uiparts, - bool spacer_only) -{ - wxSizerItem* sizer_item; - wxAuiDockUIPart part; - - int sashSize = m_art->GetMetric(wxAUI_DOCKART_SASH_SIZE); - int orientation = dock.IsHorizontal() ? wxHORIZONTAL : wxVERTICAL; - - // resizable bottom and right docks have a sash before them - if (!m_hasMaximized && !dock.fixed && (dock.dock_direction == wxAUI_DOCK_BOTTOM || - dock.dock_direction == wxAUI_DOCK_RIGHT)) - { - sizer_item = cont->Add(sashSize, sashSize, 0, wxEXPAND); - - part.type = wxAuiDockUIPart::typeDockSizer; - part.orientation = orientation; - part.dock = &dock; - part.pane = NULL; - part.button = NULL; - part.cont_sizer = cont; - part.sizer_item = sizer_item; - uiparts.Add(part); - } - - // create the sizer for the dock - wxSizer* dock_sizer = new wxBoxSizer(orientation); - - // add each pane to the dock - bool has_maximized_pane = false; - int pane_i, pane_count = dock.panes.GetCount(); - - if (dock.fixed) - { - wxArrayInt pane_positions, pane_sizes; - - // figure out the real pane positions we will - // use, without modifying the each pane's pane_pos member - GetPanePositionsAndSizes(dock, pane_positions, pane_sizes); - - int offset = 0; - for (pane_i = 0; pane_i < pane_count; ++pane_i) - { - wxAuiPaneInfo& pane = *(dock.panes.Item(pane_i)); - int pane_pos = pane_positions.Item(pane_i); - - if (pane.IsMaximized()) - has_maximized_pane = true; - - - int amount = pane_pos - offset; - if (amount > 0) - { - if (dock.IsVertical()) - sizer_item = dock_sizer->Add(1, amount, 0, wxEXPAND); - else - sizer_item = dock_sizer->Add(amount, 1, 0, wxEXPAND); - - part.type = wxAuiDockUIPart::typeBackground; - part.dock = &dock; - part.pane = NULL; - part.button = NULL; - part.orientation = (orientation==wxHORIZONTAL) ? wxVERTICAL:wxHORIZONTAL; - part.cont_sizer = dock_sizer; - part.sizer_item = sizer_item; - uiparts.Add(part); - - offset += amount; - } - - LayoutAddPane(dock_sizer, dock, pane, uiparts, spacer_only); - - offset += pane_sizes.Item(pane_i); - } - - // at the end add a very small stretchable background area - sizer_item = dock_sizer->Add(0,0, 1, wxEXPAND); - - part.type = wxAuiDockUIPart::typeBackground; - part.dock = &dock; - part.pane = NULL; - part.button = NULL; - part.orientation = orientation; - part.cont_sizer = dock_sizer; - part.sizer_item = sizer_item; - uiparts.Add(part); - } - else - { - for (pane_i = 0; pane_i < pane_count; ++pane_i) - { - wxAuiPaneInfo& pane = *(dock.panes.Item(pane_i)); - - if (pane.IsMaximized()) - has_maximized_pane = true; - - // if this is not the first pane being added, - // we need to add a pane sizer - if (!m_hasMaximized && pane_i > 0) - { - sizer_item = dock_sizer->Add(sashSize, sashSize, 0, wxEXPAND); - - part.type = wxAuiDockUIPart::typePaneSizer; - part.dock = &dock; - part.pane = dock.panes.Item(pane_i-1); - part.button = NULL; - part.orientation = (orientation==wxHORIZONTAL) ? wxVERTICAL:wxHORIZONTAL; - part.cont_sizer = dock_sizer; - part.sizer_item = sizer_item; - uiparts.Add(part); - } - - LayoutAddPane(dock_sizer, dock, pane, uiparts, spacer_only); - } - } - - if (dock.dock_direction == wxAUI_DOCK_CENTER || has_maximized_pane) - sizer_item = cont->Add(dock_sizer, 1, wxEXPAND); - else - sizer_item = cont->Add(dock_sizer, 0, wxEXPAND); - - part.type = wxAuiDockUIPart::typeDock; - part.dock = &dock; - part.pane = NULL; - part.button = NULL; - part.orientation = orientation; - part.cont_sizer = cont; - part.sizer_item = sizer_item; - uiparts.Add(part); - - if (dock.IsHorizontal()) - cont->SetItemMinSize(dock_sizer, 0, dock.size); - else - cont->SetItemMinSize(dock_sizer, dock.size, 0); - - // top and left docks have a sash after them - if (!m_hasMaximized && - !dock.fixed && - (dock.dock_direction == wxAUI_DOCK_TOP || - dock.dock_direction == wxAUI_DOCK_LEFT)) - { - sizer_item = cont->Add(sashSize, sashSize, 0, wxEXPAND); - - part.type = wxAuiDockUIPart::typeDockSizer; - part.dock = &dock; - part.pane = NULL; - part.button = NULL; - part.orientation = orientation; - part.cont_sizer = cont; - part.sizer_item = sizer_item; - uiparts.Add(part); - } -} - -wxSizer* wxAuiManager::LayoutAll(wxAuiPaneInfoArray& panes, - wxAuiDockInfoArray& docks, - wxAuiDockUIPartArray& uiparts, - bool spacer_only) -{ - wxBoxSizer* container = new wxBoxSizer(wxVERTICAL); - - int pane_borderSize = m_art->GetMetric(wxAUI_DOCKART_PANE_BORDER_SIZE); - int caption_size = m_art->GetMetric(wxAUI_DOCKART_CAPTION_SIZE); - wxSize cli_size = m_frame->GetClientSize(); - int i, dock_count, pane_count; - - - // empty all docks out - for (i = 0, dock_count = docks.GetCount(); i < dock_count; ++i) - { - wxAuiDockInfo& dock = docks.Item(i); - - // empty out all panes, as they will be readded below - dock.panes.Empty(); - - if (dock.fixed) - { - // always reset fixed docks' sizes, because - // the contained windows may have been resized - dock.size = 0; - } - } - - - // iterate through all known panes, filing each - // of them into the appropriate dock. If the - // pane does not exist in the dock, add it - for (i = 0, pane_count = panes.GetCount(); i < pane_count; ++i) - { - wxAuiPaneInfo& p = panes.Item(i); - - // find any docks with the same dock direction, dock layer, and - // dock row as the pane we are working on - wxAuiDockInfo* dock; - wxAuiDockInfoPtrArray arr; - FindDocks(docks, p.dock_direction, p.dock_layer, p.dock_row, arr); - - if (arr.GetCount() > 0) - { - // found the right dock - dock = arr.Item(0); - } - else - { - // dock was not found, so we need to create a new one - wxAuiDockInfo d; - d.dock_direction = p.dock_direction; - d.dock_layer = p.dock_layer; - d.dock_row = p.dock_row; - docks.Add(d); - dock = &docks.Last(); - } - - - if (p.IsDocked() && p.IsShown()) - { - // remove the pane from any existing docks except this one - RemovePaneFromDocks(docks, p, dock); - - // pane needs to be added to the dock, - // if it doesn't already exist - if (!FindPaneInDock(*dock, p.window)) - dock->panes.Add(&p); - } - else - { - // remove the pane from any existing docks - RemovePaneFromDocks(docks, p); - } - - } - - // remove any empty docks - for (i = docks.GetCount()-1; i >= 0; --i) - { - if (docks.Item(i).panes.GetCount() == 0) - docks.RemoveAt(i); - } - - // configure the docks further - for (i = 0, dock_count = docks.GetCount(); i < dock_count; ++i) - { - wxAuiDockInfo& dock = docks.Item(i); - int j, dock_pane_count = dock.panes.GetCount(); - - // sort the dock pane array by the pane's - // dock position (dock_pos), in ascending order - dock.panes.Sort(PaneSortFunc); - - // for newly created docks, set up their initial size - if (dock.size == 0) - { - int size = 0; - - for (j = 0; j < dock_pane_count; ++j) - { - wxAuiPaneInfo& pane = *dock.panes.Item(j); - wxSize pane_size = pane.best_size; - if (pane_size == wxDefaultSize) - pane_size = pane.min_size; - if (pane_size == wxDefaultSize) - pane_size = pane.window->GetSize(); - - if (dock.IsHorizontal()) - size = wxMax(pane_size.y, size); - else - size = wxMax(pane_size.x, size); - } - - // add space for the border (two times), but only - // if at least one pane inside the dock has a pane border - for (j = 0; j < dock_pane_count; ++j) - { - if (dock.panes.Item(j)->HasBorder()) - { - size += (pane_borderSize*2); - break; - } - } - - // if pane is on the top or bottom, add the caption height, - // but only if at least one pane inside the dock has a caption - if (dock.IsHorizontal()) - { - for (j = 0; j < dock_pane_count; ++j) - { - if (dock.panes.Item(j)->HasCaption()) - { - size += caption_size; - break; - } - } - } - - - // new dock's size may not be more than the dock constraint - // parameter specifies. See SetDockSizeConstraint() - - int max_dock_x_size = (int)(m_dockConstraintX * ((double)cli_size.x)); - int max_dock_y_size = (int)(m_dockConstraintY * ((double)cli_size.y)); - - if (dock.IsHorizontal()) - size = wxMin(size, max_dock_y_size); - else - size = wxMin(size, max_dock_x_size); - - // absolute minimum size for a dock is 10 pixels - if (size < 10) - size = 10; - - dock.size = size; - } - - - // determine the dock's minimum size - bool plus_border = false; - bool plus_caption = false; - int dock_min_size = 0; - for (j = 0; j < dock_pane_count; ++j) - { - wxAuiPaneInfo& pane = *dock.panes.Item(j); - if (pane.min_size != wxDefaultSize) - { - if (pane.HasBorder()) - plus_border = true; - if (pane.HasCaption()) - plus_caption = true; - if (dock.IsHorizontal()) - { - if (pane.min_size.y > dock_min_size) - dock_min_size = pane.min_size.y; - } - else - { - if (pane.min_size.x > dock_min_size) - dock_min_size = pane.min_size.x; - } - } - } - - if (plus_border) - dock_min_size += (pane_borderSize*2); - if (plus_caption && dock.IsHorizontal()) - dock_min_size += (caption_size); - - dock.min_size = dock_min_size; - - - // if the pane's current size is less than its - // minimum, increase the dock's size to its minimum - if (dock.size < dock.min_size) - dock.size = dock.min_size; - - - // determine the dock's mode (fixed or proportional); - // determine whether the dock has only toolbars - bool action_pane_marked = false; - dock.fixed = true; - dock.toolbar = true; - for (j = 0; j < dock_pane_count; ++j) - { - wxAuiPaneInfo& pane = *dock.panes.Item(j); - if (!pane.IsFixed()) - dock.fixed = false; - if (!pane.IsToolbar()) - dock.toolbar = false; - if (pane.HasFlag(wxAuiPaneInfo::optionDockFixed)) - dock.fixed = true; - if (pane.HasFlag(wxAuiPaneInfo::actionPane)) - action_pane_marked = true; - } - - - // if the dock mode is proportional and not fixed-pixel, - // reassign the dock_pos to the sequential 0, 1, 2, 3; - // e.g. remove gaps like 1, 2, 30, 500 - if (!dock.fixed) - { - for (j = 0; j < dock_pane_count; ++j) - { - wxAuiPaneInfo& pane = *dock.panes.Item(j); - pane.dock_pos = j; - } - } - - // if the dock mode is fixed, and none of the panes - // are being moved right now, make sure the panes - // do not overlap each other. If they do, we will - // adjust the positions of the panes - if (dock.fixed && !action_pane_marked) - { - wxArrayInt pane_positions, pane_sizes; - GetPanePositionsAndSizes(dock, pane_positions, pane_sizes); - - int offset = 0; - for (j = 0; j < dock_pane_count; ++j) - { - wxAuiPaneInfo& pane = *(dock.panes.Item(j)); - pane.dock_pos = pane_positions[j]; - - int amount = pane.dock_pos - offset; - if (amount >= 0) - offset += amount; - else - pane.dock_pos += -amount; - - offset += pane_sizes[j]; - } - } - } - - // discover the maximum dock layer - int max_layer = 0; - for (i = 0; i < dock_count; ++i) - max_layer = wxMax(max_layer, docks.Item(i).dock_layer); - - - // clear out uiparts - uiparts.Empty(); - - // create a bunch of box sizers, - // from the innermost level outwards. - wxSizer* cont = NULL; - wxSizer* middle = NULL; - int layer = 0; - int row, row_count; - - for (layer = 0; layer <= max_layer; ++layer) - { - wxAuiDockInfoPtrArray arr; - - // find any docks in this layer - FindDocks(docks, -1, layer, -1, arr); - - // if there aren't any, skip to the next layer - if (arr.IsEmpty()) - continue; - - wxSizer* old_cont = cont; - - // create a container which will hold this layer's - // docks (top, bottom, left, right) - cont = new wxBoxSizer(wxVERTICAL); - - - // find any top docks in this layer - FindDocks(docks, wxAUI_DOCK_TOP, layer, -1, arr); - if (!arr.IsEmpty()) - { - for (row = 0, row_count = arr.GetCount(); row < row_count; ++row) - LayoutAddDock(cont, *arr.Item(row), uiparts, spacer_only); - } - - - // fill out the middle layer (which consists - // of left docks, content area and right docks) - - middle = new wxBoxSizer(wxHORIZONTAL); - - // find any left docks in this layer - FindDocks(docks, wxAUI_DOCK_LEFT, layer, -1, arr); - if (!arr.IsEmpty()) - { - for (row = 0, row_count = arr.GetCount(); row < row_count; ++row) - LayoutAddDock(middle, *arr.Item(row), uiparts, spacer_only); - } - - // add content dock (or previous layer's sizer - // to the middle - if (!old_cont) - { - // find any center docks - FindDocks(docks, wxAUI_DOCK_CENTER, -1, -1, arr); - if (!arr.IsEmpty()) - { - for (row = 0,row_count = arr.GetCount(); rowAdd(1,1, 1, wxEXPAND); - wxAuiDockUIPart part; - part.type = wxAuiDockUIPart::typeBackground; - part.pane = NULL; - part.dock = NULL; - part.button = NULL; - part.cont_sizer = middle; - part.sizer_item = sizer_item; - uiparts.Add(part); - } - } - else - { - middle->Add(old_cont, 1, wxEXPAND); - } - - // find any right docks in this layer - FindDocks(docks, wxAUI_DOCK_RIGHT, layer, -1, arr); - if (!arr.IsEmpty()) - { - for (row = arr.GetCount()-1; row >= 0; --row) - LayoutAddDock(middle, *arr.Item(row), uiparts, spacer_only); - } - - if (middle->GetChildren().GetCount() > 0) - cont->Add(middle, 1, wxEXPAND); - else - delete middle; - - - - // find any bottom docks in this layer - FindDocks(docks, wxAUI_DOCK_BOTTOM, layer, -1, arr); - if (!arr.IsEmpty()) - { - for (row = arr.GetCount()-1; row >= 0; --row) - LayoutAddDock(cont, *arr.Item(row), uiparts, spacer_only); - } - - } - - if (!cont) - { - // no sizer available, because there are no docks, - // therefore we will create a simple background area - cont = new wxBoxSizer(wxVERTICAL); - wxSizerItem* sizer_item = cont->Add(1,1, 1, wxEXPAND); - wxAuiDockUIPart part; - part.type = wxAuiDockUIPart::typeBackground; - part.pane = NULL; - part.dock = NULL; - part.button = NULL; - part.cont_sizer = middle; - part.sizer_item = sizer_item; - uiparts.Add(part); - } - - container->Add(cont, 1, wxEXPAND); - return container; -} - - -// SetDockSizeConstraint() allows the dock constraints to be set. For example, -// specifying values of 0.5, 0.5 will mean that upon dock creation, a dock may -// not be larger than half of the window's size - -void wxAuiManager::SetDockSizeConstraint(double width_pct, double height_pct) -{ - m_dockConstraintX = wxMax(0.0, wxMin(1.0, width_pct)); - m_dockConstraintY = wxMax(0.0, wxMin(1.0, height_pct)); -} - -void wxAuiManager::GetDockSizeConstraint(double* width_pct, double* height_pct) const -{ - if (width_pct) - *width_pct = m_dockConstraintX; - - if (height_pct) - *height_pct = m_dockConstraintY; -} - - - -// Update() updates the layout. Whenever changes are made to -// one or more panes, this function should be called. It is the -// external entry point for running the layout engine. - -void wxAuiManager::Update() -{ - m_hoverButton = NULL; - m_actionPart = NULL; - - wxSizer* sizer; - int i, pane_count = m_panes.GetCount(); - - - // destroy floating panes which have been - // redocked or are becoming non-floating - for (i = 0; i < pane_count; ++i) - { - wxAuiPaneInfo& p = m_panes.Item(i); - - if (!p.IsFloating() && p.frame) - { - // because the pane is no longer in a floating, we need to - // reparent it to m_frame and destroy the floating frame - - // reduce flicker - p.window->SetSize(1,1); - - - // the following block is a workaround for bug #1531361 - // (see wxWidgets sourceforge page). On wxGTK (only), when - // a frame is shown/hidden, a move event unfortunately - // also gets fired. Because we may be dragging around - // a pane, we need to cancel that action here to prevent - // a spurious crash. - if (m_actionWindow == p.frame) - { - if (wxWindow::GetCapture() == m_frame) - m_frame->ReleaseMouse(); - m_action = actionNone; - m_actionWindow = NULL; - } - - // hide the frame - if (p.frame->IsShown()) - p.frame->Show(false); - - // reparent to m_frame and destroy the pane - if (m_actionWindow == p.frame) - { - m_actionWindow = NULL; - } - - p.window->Reparent(m_frame); - p.frame->SetSizer(NULL); - p.frame->Destroy(); - p.frame = NULL; - } - } - - - // delete old sizer first - m_frame->SetSizer(NULL); - - // create a layout for all of the panes - sizer = LayoutAll(m_panes, m_docks, m_uiParts, false); - - // hide or show panes as necessary, - // and float panes as necessary - for (i = 0; i < pane_count; ++i) - { - wxAuiPaneInfo& p = m_panes.Item(i); - - if (p.IsFloating()) - { - if (p.frame == NULL) - { - // we need to create a frame for this - // pane, which has recently been floated - wxAuiFloatingFrame* frame = CreateFloatingFrame(m_frame, p); - - // on MSW and Mac, if the owner desires transparent dragging, and - // the dragging is happening right now, then the floating - // window should have this style by default - if (m_action == actionDragFloatingPane && - (m_flags & wxAUI_MGR_TRANSPARENT_DRAG)) - frame->SetTransparent(150); - - frame->SetPaneWindow(p); - p.frame = frame; - - if (p.IsShown() && !frame->IsShown()) - frame->Show(); - } - else - { - // frame already exists, make sure its position - // and size reflect the information in wxAuiPaneInfo - if ((p.frame->GetPosition() != p.floating_pos) || (p.frame->GetSize() != p.floating_size)) - { - p.frame->SetSize(p.floating_pos.x, p.floating_pos.y, - p.floating_size.x, p.floating_size.y, - wxSIZE_USE_EXISTING); - /* - p.frame->SetSize(p.floating_pos.x, p.floating_pos.y, - wxDefaultCoord, wxDefaultCoord, - wxSIZE_USE_EXISTING); - //p.frame->Move(p.floating_pos.x, p.floating_pos.y); - */ - } - - // update whether the pane is resizable or not - long style = p.frame->GetWindowStyleFlag(); - if (p.IsFixed()) - style &= ~wxRESIZE_BORDER; - else - style |= wxRESIZE_BORDER; - p.frame->SetWindowStyleFlag(style); - - if (p.frame->GetLabel() != p.caption) - p.frame->SetLabel(p.caption); - - if (p.frame->IsShown() != p.IsShown()) - p.frame->Show(p.IsShown()); - } - } - else - { - if (p.window->IsShown() != p.IsShown()) - p.window->Show(p.IsShown()); - } - - // if "active panes" are no longer allowed, clear - // any optionActive values from the pane states - if ((m_flags & wxAUI_MGR_ALLOW_ACTIVE_PANE) == 0) - { - p.state &= ~wxAuiPaneInfo::optionActive; - } - } - - - // keep track of the old window rectangles so we can - // refresh those windows whose rect has changed - wxAuiRectArray old_pane_rects; - for (i = 0; i < pane_count; ++i) - { - wxRect r; - wxAuiPaneInfo& p = m_panes.Item(i); - - if (p.window && p.IsShown() && p.IsDocked()) - r = p.rect; - - old_pane_rects.Add(r); - } - - - - - // apply the new sizer - m_frame->SetSizer(sizer); - m_frame->SetAutoLayout(false); - DoFrameLayout(); - - - - // now that the frame layout is done, we need to check - // the new pane rectangles against the old rectangles that - // we saved a few lines above here. If the rectangles have - // changed, the corresponding panes must also be updated - for (i = 0; i < pane_count; ++i) - { - wxAuiPaneInfo& p = m_panes.Item(i); - if (p.window && p.window->IsShown() && p.IsDocked()) - { - if (p.rect != old_pane_rects[i]) - { - p.window->Refresh(); - p.window->Update(); - } - } - } - - - Repaint(); - - // set frame's minimum size - -/* - // N.B. More work needs to be done on frame minimum sizes; - // this is some interesting code that imposes the minimum size, - // but we may want to include a more flexible mechanism or - // options for multiple minimum-size modes, e.g. strict or lax - wxSize min_size = sizer->GetMinSize(); - wxSize frame_size = m_frame->GetSize(); - wxSize client_size = m_frame->GetClientSize(); - - wxSize minframe_size(min_size.x+frame_size.x-client_size.x, - min_size.y+frame_size.y-client_size.y ); - - m_frame->SetMinSize(minframe_size); - - if (frame_size.x < minframe_size.x || - frame_size.y < minframe_size.y) - sizer->Fit(m_frame); -*/ -} - - -// DoFrameLayout() is an internal function which invokes wxSizer::Layout -// on the frame's main sizer, then measures all the various UI items -// and updates their internal rectangles. This should always be called -// instead of calling m_frame->Layout() directly - -void wxAuiManager::DoFrameLayout() -{ - m_frame->Layout(); - - int i, part_count; - for (i = 0, part_count = m_uiParts.GetCount(); i < part_count; ++i) - { - wxAuiDockUIPart& part = m_uiParts.Item(i); - - // get the rectangle of the UI part - // originally, this code looked like this: - // part.rect = wxRect(part.sizer_item->GetPosition(), - // part.sizer_item->GetSize()); - // this worked quite well, with one exception: the mdi - // client window had a "deferred" size variable - // that returned the wrong size. It looks like - // a bug in wx, because the former size of the window - // was being returned. So, we will retrieve the part's - // rectangle via other means - - - part.rect = part.sizer_item->GetRect(); - int flag = part.sizer_item->GetFlag(); - int border = part.sizer_item->GetBorder(); - if (flag & wxTOP) - { - part.rect.y -= border; - part.rect.height += border; - } - if (flag & wxLEFT) - { - part.rect.x -= border; - part.rect.width += border; - } - if (flag & wxBOTTOM) - part.rect.height += border; - if (flag & wxRIGHT) - part.rect.width += border; - - - if (part.type == wxAuiDockUIPart::typeDock) - part.dock->rect = part.rect; - if (part.type == wxAuiDockUIPart::typePane) - part.pane->rect = part.rect; - } -} - -// GetPanePart() looks up the pane the pane border UI part (or the regular -// pane part if there is no border). This allows the caller to get the exact -// rectangle of the pane in question, including decorations like -// caption and border (if any). - -wxAuiDockUIPart* wxAuiManager::GetPanePart(wxWindow* wnd) -{ - int i, part_count; - for (i = 0, part_count = m_uiParts.GetCount(); i < part_count; ++i) - { - wxAuiDockUIPart& part = m_uiParts.Item(i); - if (part.type == wxAuiDockUIPart::typePaneBorder && - part.pane && part.pane->window == wnd) - return ∂ - } - for (i = 0, part_count = m_uiParts.GetCount(); i < part_count; ++i) - { - wxAuiDockUIPart& part = m_uiParts.Item(i); - if (part.type == wxAuiDockUIPart::typePane && - part.pane && part.pane->window == wnd) - return ∂ - } - return NULL; -} - - - -// GetDockPixelOffset() is an internal function which returns -// a dock's offset in pixels from the left side of the window -// (for horizontal docks) or from the top of the window (for -// vertical docks). This value is necessary for calculating -// pixel-pane/toolbar offsets when they are dragged. - -int wxAuiManager::GetDockPixelOffset(wxAuiPaneInfo& test) -{ - // the only way to accurately calculate the dock's - // offset is to actually run a theoretical layout - - int i, part_count, dock_count; - wxAuiDockInfoArray docks; - wxAuiPaneInfoArray panes; - wxAuiDockUIPartArray uiparts; - CopyDocksAndPanes(docks, panes, m_docks, m_panes); - panes.Add(test); - - wxSizer* sizer = LayoutAll(panes, docks, uiparts, true); - wxSize client_size = m_frame->GetClientSize(); - sizer->SetDimension(0, 0, client_size.x, client_size.y); - sizer->Layout(); - - for (i = 0, part_count = uiparts.GetCount(); i < part_count; ++i) - { - wxAuiDockUIPart& part = uiparts.Item(i); - part.rect = wxRect(part.sizer_item->GetPosition(), - part.sizer_item->GetSize()); - if (part.type == wxAuiDockUIPart::typeDock) - part.dock->rect = part.rect; - } - - delete sizer; - - for (i = 0, dock_count = docks.GetCount(); i < dock_count; ++i) - { - wxAuiDockInfo& dock = docks.Item(i); - if (test.dock_direction == dock.dock_direction && - test.dock_layer==dock.dock_layer && test.dock_row==dock.dock_row) - { - if (dock.IsVertical()) - return dock.rect.y; - else - return dock.rect.x; - } - } - - return 0; -} - - - -// ProcessDockResult() is a utility function used by DoDrop() - it checks -// if a dock operation is allowed, the new dock position is copied into -// the target info. If the operation was allowed, the function returns true. - -bool wxAuiManager::ProcessDockResult(wxAuiPaneInfo& target, - const wxAuiPaneInfo& new_pos) -{ - bool allowed = false; - switch (new_pos.dock_direction) - { - case wxAUI_DOCK_TOP: allowed = target.IsTopDockable(); break; - case wxAUI_DOCK_BOTTOM: allowed = target.IsBottomDockable(); break; - case wxAUI_DOCK_LEFT: allowed = target.IsLeftDockable(); break; - case wxAUI_DOCK_RIGHT: allowed = target.IsRightDockable(); break; - } - - if (allowed) - { - target = new_pos; - // Should this RTTI and function call be rewritten as - // sending a new event type to allow other window types - // to vary size based on dock location? - wxAuiToolBar* toolbar = wxDynamicCast(target.window, wxAuiToolBar); - if (toolbar) - { - wxSize hintSize = toolbar->GetHintSize(target.dock_direction); - if (target.best_size != hintSize) - { - target.best_size = hintSize; - target.floating_size = wxDefaultSize; - } - } - } - - return allowed; -} - - -// DoDrop() is an important function. It basically takes a mouse position, -// and determines where the pane's new position would be. If the pane is to be -// dropped, it performs the drop operation using the specified dock and pane -// arrays. By specifying copied dock and pane arrays when calling, a "what-if" -// scenario can be performed, giving precise coordinates for drop hints. -// If, however, wxAuiManager:m_docks and wxAuiManager::m_panes are specified -// as parameters, the changes will be made to the main state arrays - -const int auiInsertRowPixels = 10; -const int auiNewRowPixels = 40; -const int auiLayerInsertPixels = 40; -const int auiLayerInsertOffset = 5; - -bool wxAuiManager::DoDrop(wxAuiDockInfoArray& docks, - wxAuiPaneInfoArray& panes, - wxAuiPaneInfo& target, - const wxPoint& pt, - const wxPoint& offset) -{ - wxSize cli_size = m_frame->GetClientSize(); - - wxAuiPaneInfo drop = target; - - - // The result should always be shown - drop.Show(); - - - // Check to see if the pane has been dragged outside of the window - // (or near to the outside of the window), if so, dock it along the edge - - - int layer_insert_offset = auiLayerInsertOffset; - if (drop.IsToolbar()) - layer_insert_offset = 0; - - - if (pt.x < layer_insert_offset && - pt.x > layer_insert_offset-auiLayerInsertPixels && - pt.y > 0 && - pt.y < cli_size.y) - { - int new_layer = wxMax(wxMax(GetMaxLayer(docks, wxAUI_DOCK_LEFT), - GetMaxLayer(docks, wxAUI_DOCK_BOTTOM)), - GetMaxLayer(docks, wxAUI_DOCK_TOP)) + 1; - - if (drop.IsToolbar()) - new_layer = auiToolBarLayer; - - drop.Dock().Left(). - Layer(new_layer). - Row(0). - Position(pt.y - GetDockPixelOffset(drop) - offset.y); - return ProcessDockResult(target, drop); - } - else if (pt.y < layer_insert_offset && - pt.y > layer_insert_offset-auiLayerInsertPixels && - pt.x > 0 && - pt.x < cli_size.x) - { - int new_layer = wxMax(wxMax(GetMaxLayer(docks, wxAUI_DOCK_TOP), - GetMaxLayer(docks, wxAUI_DOCK_LEFT)), - GetMaxLayer(docks, wxAUI_DOCK_RIGHT)) + 1; - - if (drop.IsToolbar()) - new_layer = auiToolBarLayer; - - drop.Dock().Top(). - Layer(new_layer). - Row(0). - Position(pt.x - GetDockPixelOffset(drop) - offset.x); - return ProcessDockResult(target, drop); - } - else if (pt.x >= cli_size.x - layer_insert_offset && - pt.x < cli_size.x - layer_insert_offset + auiLayerInsertPixels && - pt.y > 0 && - pt.y < cli_size.y) - { - int new_layer = wxMax(wxMax(GetMaxLayer(docks, wxAUI_DOCK_RIGHT), - GetMaxLayer(docks, wxAUI_DOCK_TOP)), - GetMaxLayer(docks, wxAUI_DOCK_BOTTOM)) + 1; - - if (drop.IsToolbar()) - new_layer = auiToolBarLayer; - - drop.Dock().Right(). - Layer(new_layer). - Row(0). - Position(pt.y - GetDockPixelOffset(drop) - offset.y); - return ProcessDockResult(target, drop); - } - else if (pt.y >= cli_size.y - layer_insert_offset && - pt.y < cli_size.y - layer_insert_offset + auiLayerInsertPixels && - pt.x > 0 && - pt.x < cli_size.x) - { - int new_layer = wxMax( wxMax( GetMaxLayer(docks, wxAUI_DOCK_BOTTOM), - GetMaxLayer(docks, wxAUI_DOCK_LEFT)), - GetMaxLayer(docks, wxAUI_DOCK_RIGHT)) + 1; - - if (drop.IsToolbar()) - new_layer = auiToolBarLayer; - - drop.Dock().Bottom(). - Layer(new_layer). - Row(0). - Position(pt.x - GetDockPixelOffset(drop) - offset.x); - return ProcessDockResult(target, drop); - } - - - wxAuiDockUIPart* part = HitTest(pt.x, pt.y); - - - if (drop.IsToolbar()) - { - if (!part || !part->dock) - return false; - - // calculate the offset from where the dock begins - // to the point where the user dropped the pane - int dock_drop_offset = 0; - if (part->dock->IsHorizontal()) - dock_drop_offset = pt.x - part->dock->rect.x - offset.x; - else - dock_drop_offset = pt.y - part->dock->rect.y - offset.y; - - - // toolbars may only be moved in and to fixed-pane docks, - // otherwise we will try to float the pane. Also, the pane - // should float if being dragged over center pane windows - if (!part->dock->fixed || part->dock->dock_direction == wxAUI_DOCK_CENTER || - pt.x >= cli_size.x || pt.x <= 0 || pt.y >= cli_size.y || pt.y <= 0) - { - if (m_lastRect.IsEmpty() || m_lastRect.Contains(pt.x, pt.y )) - { - m_skipping = true; - } - else - { - if ((m_flags & wxAUI_MGR_ALLOW_FLOATING) && drop.IsFloatable()) - { - drop.Float(); - } - - m_skipping = false; - - return ProcessDockResult(target, drop); - } - - drop.Position(pt.x - GetDockPixelOffset(drop) - offset.x); - - return ProcessDockResult(target, drop); - } - - m_skipping = false; - - m_lastRect = part->dock->rect; - m_lastRect.Inflate( 15, 15 ); - - drop.Dock(). - Direction(part->dock->dock_direction). - Layer(part->dock->dock_layer). - Row(part->dock->dock_row). - Position(dock_drop_offset); - - if (( - ((pt.y < part->dock->rect.y + 1) && part->dock->IsHorizontal()) || - ((pt.x < part->dock->rect.x + 1) && part->dock->IsVertical()) - ) && part->dock->panes.GetCount() > 1) - { - if ((part->dock->dock_direction == wxAUI_DOCK_TOP) || - (part->dock->dock_direction == wxAUI_DOCK_LEFT)) - { - int row = drop.dock_row; - DoInsertDockRow(panes, part->dock->dock_direction, - part->dock->dock_layer, - part->dock->dock_row); - drop.dock_row = row; - } - else - { - DoInsertDockRow(panes, part->dock->dock_direction, - part->dock->dock_layer, - part->dock->dock_row+1); - drop.dock_row = part->dock->dock_row+1; - } - } - - if (( - ((pt.y > part->dock->rect.y + part->dock->rect.height - 2 ) && part->dock->IsHorizontal()) || - ((pt.x > part->dock->rect.x + part->dock->rect.width - 2 ) && part->dock->IsVertical()) - ) && part->dock->panes.GetCount() > 1) - { - if ((part->dock->dock_direction == wxAUI_DOCK_TOP) || - (part->dock->dock_direction == wxAUI_DOCK_LEFT)) - { - DoInsertDockRow(panes, part->dock->dock_direction, - part->dock->dock_layer, - part->dock->dock_row+1); - drop.dock_row = part->dock->dock_row+1; - } - else - { - int row = drop.dock_row; - DoInsertDockRow(panes, part->dock->dock_direction, - part->dock->dock_layer, - part->dock->dock_row); - drop.dock_row = row; - } - } - - return ProcessDockResult(target, drop); - } - - - - - if (!part) - return false; - - if (part->type == wxAuiDockUIPart::typePaneBorder || - part->type == wxAuiDockUIPart::typeCaption || - part->type == wxAuiDockUIPart::typeGripper || - part->type == wxAuiDockUIPart::typePaneButton || - part->type == wxAuiDockUIPart::typePane || - part->type == wxAuiDockUIPart::typePaneSizer || - part->type == wxAuiDockUIPart::typeDockSizer || - part->type == wxAuiDockUIPart::typeBackground) - { - if (part->type == wxAuiDockUIPart::typeDockSizer) - { - if (part->dock->panes.GetCount() != 1) - return false; - part = GetPanePart(part->dock->panes.Item(0)->window); - if (!part) - return false; - } - - - - // If a normal frame is being dragged over a toolbar, insert it - // along the edge under the toolbar, but over all other panes. - // (this could be done much better, but somehow factoring this - // calculation with the one at the beginning of this function) - if (part->dock && part->dock->toolbar) - { - int layer = 0; - - switch (part->dock->dock_direction) - { - case wxAUI_DOCK_LEFT: - layer = wxMax(wxMax(GetMaxLayer(docks, wxAUI_DOCK_LEFT), - GetMaxLayer(docks, wxAUI_DOCK_BOTTOM)), - GetMaxLayer(docks, wxAUI_DOCK_TOP)); - break; - case wxAUI_DOCK_TOP: - layer = wxMax(wxMax(GetMaxLayer(docks, wxAUI_DOCK_TOP), - GetMaxLayer(docks, wxAUI_DOCK_LEFT)), - GetMaxLayer(docks, wxAUI_DOCK_RIGHT)); - break; - case wxAUI_DOCK_RIGHT: - layer = wxMax(wxMax(GetMaxLayer(docks, wxAUI_DOCK_RIGHT), - GetMaxLayer(docks, wxAUI_DOCK_TOP)), - GetMaxLayer(docks, wxAUI_DOCK_BOTTOM)); - break; - case wxAUI_DOCK_BOTTOM: - layer = wxMax(wxMax(GetMaxLayer(docks, wxAUI_DOCK_BOTTOM), - GetMaxLayer(docks, wxAUI_DOCK_LEFT)), - GetMaxLayer(docks, wxAUI_DOCK_RIGHT)); - break; - } - - DoInsertDockRow(panes, part->dock->dock_direction, - layer, 0); - drop.Dock(). - Direction(part->dock->dock_direction). - Layer(layer).Row(0).Position(0); - return ProcessDockResult(target, drop); - } - - - if (!part->pane) - return false; - - part = GetPanePart(part->pane->window); - if (!part) - return false; - - bool insert_dock_row = false; - int insert_row = part->pane->dock_row; - int insert_dir = part->pane->dock_direction; - int insert_layer = part->pane->dock_layer; - - switch (part->pane->dock_direction) - { - case wxAUI_DOCK_TOP: - if (pt.y >= part->rect.y && - pt.y < part->rect.y+auiInsertRowPixels) - insert_dock_row = true; - break; - case wxAUI_DOCK_BOTTOM: - if (pt.y > part->rect.y+part->rect.height-auiInsertRowPixels && - pt.y <= part->rect.y + part->rect.height) - insert_dock_row = true; - break; - case wxAUI_DOCK_LEFT: - if (pt.x >= part->rect.x && - pt.x < part->rect.x+auiInsertRowPixels) - insert_dock_row = true; - break; - case wxAUI_DOCK_RIGHT: - if (pt.x > part->rect.x+part->rect.width-auiInsertRowPixels && - pt.x <= part->rect.x+part->rect.width) - insert_dock_row = true; - break; - case wxAUI_DOCK_CENTER: - { - // "new row pixels" will be set to the default, but - // must never exceed 20% of the window size - int new_row_pixels_x = auiNewRowPixels; - int new_row_pixels_y = auiNewRowPixels; - - if (new_row_pixels_x > (part->rect.width*20)/100) - new_row_pixels_x = (part->rect.width*20)/100; - - if (new_row_pixels_y > (part->rect.height*20)/100) - new_row_pixels_y = (part->rect.height*20)/100; - - - // determine if the mouse pointer is in a location that - // will cause a new row to be inserted. The hot spot positions - // are along the borders of the center pane - - insert_layer = 0; - insert_dock_row = true; - const wxRect& pr = part->rect; - if (pt.x >= pr.x && pt.x < pr.x + new_row_pixels_x) - insert_dir = wxAUI_DOCK_LEFT; - else if (pt.y >= pr.y && pt.y < pr.y + new_row_pixels_y) - insert_dir = wxAUI_DOCK_TOP; - else if (pt.x >= pr.x + pr.width - new_row_pixels_x && - pt.x < pr.x + pr.width) - insert_dir = wxAUI_DOCK_RIGHT; - else if (pt.y >= pr.y+ pr.height - new_row_pixels_y && - pt.y < pr.y + pr.height) - insert_dir = wxAUI_DOCK_BOTTOM; - else - return false; - - insert_row = GetMaxRow(panes, insert_dir, insert_layer) + 1; - } - } - - if (insert_dock_row) - { - DoInsertDockRow(panes, insert_dir, insert_layer, insert_row); - drop.Dock().Direction(insert_dir). - Layer(insert_layer). - Row(insert_row). - Position(0); - return ProcessDockResult(target, drop); - } - - // determine the mouse offset and the pane size, both in the - // direction of the dock itself, and perpendicular to the dock - - int mouseOffset, size; - - if (part->orientation == wxVERTICAL) - { - mouseOffset = pt.y - part->rect.y; - size = part->rect.GetHeight(); - } - else - { - mouseOffset = pt.x - part->rect.x; - size = part->rect.GetWidth(); - } - - int drop_position = part->pane->dock_pos; - - // if we are in the top/left part of the pane, - // insert the pane before the pane being hovered over - if (mouseOffset <= size/2) - { - drop_position = part->pane->dock_pos; - DoInsertPane(panes, - part->pane->dock_direction, - part->pane->dock_layer, - part->pane->dock_row, - part->pane->dock_pos); - } - - // if we are in the bottom/right part of the pane, - // insert the pane before the pane being hovered over - if (mouseOffset > size/2) - { - drop_position = part->pane->dock_pos+1; - DoInsertPane(panes, - part->pane->dock_direction, - part->pane->dock_layer, - part->pane->dock_row, - part->pane->dock_pos+1); - } - - drop.Dock(). - Direction(part->dock->dock_direction). - Layer(part->dock->dock_layer). - Row(part->dock->dock_row). - Position(drop_position); - return ProcessDockResult(target, drop); - } - - return false; -} - - -void wxAuiManager::OnHintFadeTimer(wxTimerEvent& WXUNUSED(event)) -{ - if (!m_hintWnd || m_hintFadeAmt >= m_hintFadeMax) - { - m_hintFadeTimer.Stop(); - Disconnect(m_hintFadeTimer.GetId(), wxEVT_TIMER, - wxTimerEventHandler(wxAuiManager::OnHintFadeTimer)); - return; - } - - m_hintFadeAmt += 4; - m_hintWnd->SetTransparent(m_hintFadeAmt); -} - -void wxAuiManager::ShowHint(const wxRect& rect) -{ - if (m_hintWnd) - { - // if the hint rect is the same as last time, don't do anything - if (m_lastHint == rect) - return; - m_lastHint = rect; - - m_hintFadeAmt = m_hintFadeMax; - - if ((m_flags & wxAUI_MGR_HINT_FADE) - && !((wxDynamicCast(m_hintWnd, wxPseudoTransparentFrame)) && - (m_flags & wxAUI_MGR_NO_VENETIAN_BLINDS_FADE)) - ) - m_hintFadeAmt = 0; - - m_hintWnd->SetSize(rect); - m_hintWnd->SetTransparent(m_hintFadeAmt); - - if (!m_hintWnd->IsShown()) - m_hintWnd->Show(); - - // if we are dragging a floating pane, set the focus - // back to that floating pane (otherwise it becomes unfocused) - if (m_action == actionDragFloatingPane && m_actionWindow) - m_actionWindow->SetFocus(); - - m_hintWnd->Raise(); - - - if (m_hintFadeAmt != m_hintFadeMax) // Only fade if we need to - { - // start fade in timer - m_hintFadeTimer.SetOwner(this); - m_hintFadeTimer.Start(5); - Connect(m_hintFadeTimer.GetId(), wxEVT_TIMER, - wxTimerEventHandler(wxAuiManager::OnHintFadeTimer)); - } - } - else // Not using a transparent hint window... - { - if (!(m_flags & wxAUI_MGR_RECTANGLE_HINT)) - return; - - if (m_lastHint != rect) - { - // remove the last hint rectangle - m_lastHint = rect; - m_frame->Refresh(); - m_frame->Update(); - } - - wxScreenDC screendc; - wxRegion clip(1, 1, 10000, 10000); - - // clip all floating windows, so we don't draw over them - int i, pane_count; - for (i = 0, pane_count = m_panes.GetCount(); i < pane_count; ++i) - { - wxAuiPaneInfo& pane = m_panes.Item(i); - - if (pane.IsFloating() && - pane.frame && - pane.frame->IsShown()) - { - wxRect r = pane.frame->GetRect(); -#ifdef __WXGTK__ - // wxGTK returns the client size, not the whole frame size - r.width += 15; - r.height += 35; - r.Inflate(5); -#endif - - clip.Subtract(r); - } - } - - // As we can only hide the hint by redrawing the managed window, we - // need to clip the region to the managed window too or we get - // nasty redrawn problems. - clip.Intersect(m_frame->GetRect()); - - screendc.SetDeviceClippingRegion(clip); - - wxBitmap stipple = wxPaneCreateStippleBitmap(); - wxBrush brush(stipple); - screendc.SetBrush(brush); - screendc.SetPen(*wxTRANSPARENT_PEN); - - screendc.DrawRectangle(rect.x, rect.y, 5, rect.height); - screendc.DrawRectangle(rect.x+5, rect.y, rect.width-10, 5); - screendc.DrawRectangle(rect.x+rect.width-5, rect.y, 5, rect.height); - screendc.DrawRectangle(rect.x+5, rect.y+rect.height-5, rect.width-10, 5); - } -} - -void wxAuiManager::HideHint() -{ - // hides a transparent window hint, if there is one - if (m_hintWnd) - { - if (m_hintWnd->IsShown()) - m_hintWnd->Show(false); - m_hintWnd->SetTransparent(0); - m_hintFadeTimer.Stop(); - // In case this is called while a hint fade is going, we need to - // disconnect the event handler. - Disconnect(m_hintFadeTimer.GetId(), wxEVT_TIMER, - wxTimerEventHandler(wxAuiManager::OnHintFadeTimer)); - m_lastHint = wxRect(); - return; - } - - // hides a painted hint by redrawing the frame window - if (!m_lastHint.IsEmpty()) - { - m_frame->Refresh(); - m_frame->Update(); - m_lastHint = wxRect(); - } -} - -void wxAuiManager::OnHintActivate(wxActivateEvent& WXUNUSED(event)) -{ - // Do nothing so this event isn't handled in the base handlers. - - // Letting the hint window activate without this handler can lead to - // weird behaviour on Mac where the menu is switched out to the top - // window's menu in MDI applications when it shouldn't be. So since - // we don't want user interaction with the hint window anyway, we just - // prevent it from activating here. -} - - - -void wxAuiManager::StartPaneDrag(wxWindow* pane_window, - const wxPoint& offset) -{ - wxAuiPaneInfo& pane = GetPane(pane_window); - if (!pane.IsOk()) - return; - - if (pane.IsToolbar()) - { - m_action = actionDragToolbarPane; - } - else - { - m_action = actionDragFloatingPane; - } - - m_actionWindow = pane_window; - m_actionOffset = offset; - m_frame->CaptureMouse(); - - if (pane.frame) - { - wxRect window_rect = pane.frame->GetRect(); - wxRect client_rect = pane.frame->GetClientRect(); - wxPoint client_pt = pane.frame->ClientToScreen(client_rect.GetTopLeft()); - wxPoint origin_pt = client_pt - window_rect.GetTopLeft(); - m_actionOffset += origin_pt; - } -} - - -// CalculateHintRect() calculates the drop hint rectangle. The method -// first calls DoDrop() to determine the exact position the pane would -// be at were if dropped. If the pane would indeed become docked at the -// specified drop point, the rectangle hint will be returned in -// screen coordinates. Otherwise, an empty rectangle is returned. -// |pane_window| is the window pointer of the pane being dragged, |pt| is -// the mouse position, in client coordinates. |offset| describes the offset -// that the mouse is from the upper-left corner of the item being dragged - -wxRect wxAuiManager::CalculateHintRect(wxWindow* pane_window, - const wxPoint& pt, - const wxPoint& offset) -{ - wxRect rect; - - // we need to paint a hint rectangle; to find out the exact hint rectangle, - // we will create a new temporary layout and then measure the resulting - // rectangle; we will create a copy of the docking structures (m_dock) - // so that we don't modify the real thing on screen - - int i, pane_count, part_count; - wxAuiDockInfoArray docks; - wxAuiPaneInfoArray panes; - wxAuiDockUIPartArray uiparts; - wxAuiPaneInfo hint = GetPane(pane_window); - hint.name = wxT("__HINT__"); - hint.PaneBorder(true); - hint.Show(); - - if (!hint.IsOk()) - return rect; - - CopyDocksAndPanes(docks, panes, m_docks, m_panes); - - // remove any pane already there which bears the same window; - // this happens when you are moving a pane around in a dock - for (i = 0, pane_count = panes.GetCount(); i < pane_count; ++i) - { - if (panes.Item(i).window == pane_window) - { - RemovePaneFromDocks(docks, panes.Item(i)); - panes.RemoveAt(i); - break; - } - } - - // find out where the new pane would be - if (!DoDrop(docks, panes, hint, pt, offset)) - { - return rect; - } - - panes.Add(hint); - - wxSizer* sizer = LayoutAll(panes, docks, uiparts, true); - wxSize client_size = m_frame->GetClientSize(); - sizer->SetDimension(0, 0, client_size.x, client_size.y); - sizer->Layout(); - - for (i = 0, part_count = uiparts.GetCount(); - i < part_count; ++i) - { - wxAuiDockUIPart& part = uiparts.Item(i); - - if (part.type == wxAuiDockUIPart::typePaneBorder && - part.pane && part.pane->name == wxT("__HINT__")) - { - rect = wxRect(part.sizer_item->GetPosition(), - part.sizer_item->GetSize()); - break; - } - } - - delete sizer; - - if (rect.IsEmpty()) - { - return rect; - } - - // actually show the hint rectangle on the screen - m_frame->ClientToScreen(&rect.x, &rect.y); - - if ( m_frame->GetLayoutDirection() == wxLayout_RightToLeft ) - { - // Mirror rectangle in RTL mode - rect.x -= rect.GetWidth(); - } - - return rect; -} - -// DrawHintRect() calculates the hint rectangle by calling -// CalculateHintRect(). If there is a rectangle, it shows it -// by calling ShowHint(), otherwise it hides any hint -// rectangle currently shown -void wxAuiManager::DrawHintRect(wxWindow* pane_window, - const wxPoint& pt, - const wxPoint& offset) -{ - wxRect rect = CalculateHintRect(pane_window, pt, offset); - - if (rect.IsEmpty()) - { - HideHint(); - } - else - { - ShowHint(rect); - } -} - -void wxAuiManager::OnFloatingPaneMoveStart(wxWindow* wnd) -{ - // try to find the pane - wxAuiPaneInfo& pane = GetPane(wnd); - wxASSERT_MSG(pane.IsOk(), wxT("Pane window not found")); - - if(!pane.frame) - return; - - if (m_flags & wxAUI_MGR_TRANSPARENT_DRAG) - pane.frame->SetTransparent(150); -} - -void wxAuiManager::OnFloatingPaneMoving(wxWindow* wnd, wxDirection dir) -{ - // try to find the pane - wxAuiPaneInfo& pane = GetPane(wnd); - wxASSERT_MSG(pane.IsOk(), wxT("Pane window not found")); - - if(!pane.frame) - return; - - wxPoint pt = ::wxGetMousePosition(); - -#if 0 - // Adapt pt to direction - if (dir == wxNORTH) - { - // move to pane's upper border - wxPoint pos( 0,0 ); - pos = wnd->ClientToScreen( pos ); - pt.y = pos.y; - // and some more pixels for the title bar - pt.y -= 5; - } - else if (dir == wxWEST) - { - // move to pane's left border - wxPoint pos( 0,0 ); - pos = wnd->ClientToScreen( pos ); - pt.x = pos.x; - } - else if (dir == wxEAST) - { - // move to pane's right border - wxPoint pos( wnd->GetSize().x, 0 ); - pos = wnd->ClientToScreen( pos ); - pt.x = pos.x; - } - else if (dir == wxSOUTH) - { - // move to pane's bottom border - wxPoint pos( 0, wnd->GetSize().y ); - pos = wnd->ClientToScreen( pos ); - pt.y = pos.y; - } -#else - wxUnusedVar(dir); -#endif - - wxPoint client_pt = m_frame->ScreenToClient(pt); - - // calculate the offset from the upper left-hand corner - // of the frame to the mouse pointer - wxPoint frame_pos = pane.frame->GetPosition(); - wxPoint action_offset(pt.x-frame_pos.x, pt.y-frame_pos.y); - - // no hint for toolbar floating windows - if (pane.IsToolbar() && m_action == actionDragFloatingPane) - { - wxAuiDockInfoArray docks; - wxAuiPaneInfoArray panes; - wxAuiDockUIPartArray uiparts; - wxAuiPaneInfo hint = pane; - - CopyDocksAndPanes(docks, panes, m_docks, m_panes); - - // find out where the new pane would be - if (!DoDrop(docks, panes, hint, client_pt)) - return; - if (hint.IsFloating()) - return; - - pane = hint; - m_action = actionDragToolbarPane; - m_actionWindow = pane.window; - - Update(); - - return; - } - - - // if a key modifier is pressed while dragging the frame, - // don't dock the window - if (!CanDockPanel(pane)) - { - HideHint(); - return; - } - - - DrawHintRect(wnd, client_pt, action_offset); - -#ifdef __WXGTK__ - // this cleans up some screen artifacts that are caused on GTK because - // we aren't getting the exact size of the window (see comment - // in DrawHintRect) - //Refresh(); -#endif - - - // reduces flicker - m_frame->Update(); -} - -void wxAuiManager::OnFloatingPaneMoved(wxWindow* wnd, wxDirection dir) -{ - // try to find the pane - wxAuiPaneInfo& pane = GetPane(wnd); - wxASSERT_MSG(pane.IsOk(), wxT("Pane window not found")); - - if(!pane.frame) - return; - - wxPoint pt = ::wxGetMousePosition(); - -#if 0 - // Adapt pt to direction - if (dir == wxNORTH) - { - // move to pane's upper border - wxPoint pos( 0,0 ); - pos = wnd->ClientToScreen( pos ); - pt.y = pos.y; - // and some more pixels for the title bar - pt.y -= 10; - } - else if (dir == wxWEST) - { - // move to pane's left border - wxPoint pos( 0,0 ); - pos = wnd->ClientToScreen( pos ); - pt.x = pos.x; - } - else if (dir == wxEAST) - { - // move to pane's right border - wxPoint pos( wnd->GetSize().x, 0 ); - pos = wnd->ClientToScreen( pos ); - pt.x = pos.x; - } - else if (dir == wxSOUTH) - { - // move to pane's bottom border - wxPoint pos( 0, wnd->GetSize().y ); - pos = wnd->ClientToScreen( pos ); - pt.y = pos.y; - } -#else - wxUnusedVar(dir); -#endif - - wxPoint client_pt = m_frame->ScreenToClient(pt); - - // calculate the offset from the upper left-hand corner - // of the frame to the mouse pointer - wxPoint frame_pos = pane.frame->GetPosition(); - wxPoint action_offset(pt.x-frame_pos.x, pt.y-frame_pos.y); - - // if a key modifier is pressed while dragging the frame, - // don't dock the window - if (CanDockPanel(pane)) - { - // do the drop calculation - DoDrop(m_docks, m_panes, pane, client_pt, action_offset); - } - - // if the pane is still floating, update its floating - // position (that we store) - if (pane.IsFloating()) - { - pane.floating_pos = pane.frame->GetPosition(); - - if (m_flags & wxAUI_MGR_TRANSPARENT_DRAG) - pane.frame->SetTransparent(255); - } - else if (m_hasMaximized) - { - RestoreMaximizedPane(); - } - - Update(); - - HideHint(); -} - -void wxAuiManager::OnFloatingPaneResized(wxWindow* wnd, const wxRect& rect) -{ - // try to find the pane - wxAuiPaneInfo& pane = GetPane(wnd); - wxASSERT_MSG(pane.IsOk(), wxT("Pane window not found")); - - pane.FloatingSize(rect.GetWidth(), rect.GetHeight()); - - // the top-left position may change as well as the size - pane.FloatingPosition(rect.x, rect.y); -} - - -void wxAuiManager::OnFloatingPaneClosed(wxWindow* wnd, wxCloseEvent& evt) -{ - // try to find the pane - wxAuiPaneInfo& pane = GetPane(wnd); - wxASSERT_MSG(pane.IsOk(), wxT("Pane window not found")); - - - // fire pane close event - wxAuiManagerEvent e(wxEVT_AUI_PANE_CLOSE); - e.SetPane(&pane); - e.SetCanVeto(evt.CanVeto()); - ProcessMgrEvent(e); - - if (e.GetVeto()) - { - evt.Veto(); - return; - } - else - { - // close the pane, but check that it - // still exists in our pane array first - // (the event handler above might have removed it) - - wxAuiPaneInfo& check = GetPane(wnd); - if (check.IsOk()) - { - ClosePane(pane); - } - } -} - - - -void wxAuiManager::OnFloatingPaneActivated(wxWindow* wnd) -{ - if ((GetFlags() & wxAUI_MGR_ALLOW_ACTIVE_PANE) && GetPane(wnd).IsOk()) - { - SetActivePane(wnd); - Repaint(); - } -} - -// OnRender() draws all of the pane captions, sashes, -// backgrounds, captions, grippers, pane borders and buttons. -// It renders the entire user interface. - -void wxAuiManager::OnRender(wxAuiManagerEvent& evt) -{ - // if the frame is about to be deleted, don't bother - if (!m_frame || wxPendingDelete.Member(m_frame)) - return; - - wxDC* dc = evt.GetDC(); - -#ifdef __WXMAC__ - dc->Clear() ; -#endif - int i, part_count; - for (i = 0, part_count = m_uiParts.GetCount(); - i < part_count; ++i) - { - wxAuiDockUIPart& part = m_uiParts.Item(i); - - // don't draw hidden pane items or items that aren't windows - if (part.sizer_item && - ((!part.sizer_item->IsWindow() && - !part.sizer_item->IsSpacer() && - !part.sizer_item->IsSizer()) || - !part.sizer_item->IsShown() || - part.rect.IsEmpty())) - continue; - - switch (part.type) - { - case wxAuiDockUIPart::typeDockSizer: - case wxAuiDockUIPart::typePaneSizer: - m_art->DrawSash(*dc, m_frame, part.orientation, part.rect); - break; - case wxAuiDockUIPart::typeBackground: - m_art->DrawBackground(*dc, m_frame, part.orientation, part.rect); - break; - case wxAuiDockUIPart::typeCaption: - m_art->DrawCaption(*dc, m_frame, part.pane->caption, part.rect, *part.pane); - break; - case wxAuiDockUIPart::typeGripper: - m_art->DrawGripper(*dc, m_frame, part.rect, *part.pane); - break; - case wxAuiDockUIPart::typePaneBorder: - m_art->DrawBorder(*dc, m_frame, part.rect, *part.pane); - break; - case wxAuiDockUIPart::typePaneButton: - m_art->DrawPaneButton(*dc, m_frame, part.button->button_id, - wxAUI_BUTTON_STATE_NORMAL, part.rect, *part.pane); - break; - } - } -} - - -// Render() fire a render event, which is normally handled by -// wxAuiManager::OnRender(). This allows the render function to -// be overridden via the render event. This can be useful for paintin -// custom graphics in the main window. Default behaviour can be -// invoked in the overridden function by calling OnRender() - -void wxAuiManager::Render(wxDC* dc) -{ - wxAuiManagerEvent e(wxEVT_AUI_RENDER); - e.SetManager(this); - e.SetDC(dc); - ProcessMgrEvent(e); -} - -void wxAuiManager::Repaint(wxDC* dc) -{ -#ifdef __WXMAC__ - if ( dc == NULL ) - { - m_frame->Refresh() ; - m_frame->Update() ; - return ; - } -#endif - int w, h; - m_frame->GetClientSize(&w, &h); - - // figure out which dc to use; if one - // has been specified, use it, otherwise - // make a client dc - wxClientDC* client_dc = NULL; - if (!dc) - { - client_dc = new wxClientDC(m_frame); - dc = client_dc; - } - - // if the frame has a toolbar, the client area - // origin will not be (0,0). - wxPoint pt = m_frame->GetClientAreaOrigin(); - if (pt.x != 0 || pt.y != 0) - dc->SetDeviceOrigin(pt.x, pt.y); - - // render all the items - Render(dc); - - // if we created a client_dc, delete it - if (client_dc) - delete client_dc; -} - -void wxAuiManager::OnPaint(wxPaintEvent& WXUNUSED(event)) -{ - wxPaintDC dc(m_frame); - Repaint(&dc); -} - -void wxAuiManager::OnEraseBackground(wxEraseEvent& event) -{ -#ifdef __WXMAC__ - event.Skip() ; -#else - wxUnusedVar(event); -#endif -} - -void wxAuiManager::OnSize(wxSizeEvent& event) -{ - if (m_frame) - { - DoFrameLayout(); - Repaint(); - -#if wxUSE_MDI - if (wxDynamicCast(m_frame, wxMDIParentFrame)) - { - // for MDI parent frames, this event must not - // be "skipped". In other words, the parent frame - // must not be allowed to resize the client window - // after we are finished processing sizing changes - return; - } -#endif - } - event.Skip(); -} - -void wxAuiManager::OnFindManager(wxAuiManagerEvent& evt) -{ - // get the window we are managing, if none, return NULL - wxWindow* window = GetManagedWindow(); - if (!window) - { - evt.SetManager(NULL); - return; - } - - // if we are managing a child frame, get the 'real' manager - if (wxDynamicCast(window, wxAuiFloatingFrame)) - { - wxAuiFloatingFrame* float_frame = static_cast(window); - evt.SetManager(float_frame->GetOwnerManager()); - return; - } - - // return pointer to ourself - evt.SetManager(this); -} - -void wxAuiManager::OnSetCursor(wxSetCursorEvent& event) -{ - // determine cursor - wxAuiDockUIPart* part = HitTest(event.GetX(), event.GetY()); - wxCursor cursor = wxNullCursor; - - if (part) - { - if (part->type == wxAuiDockUIPart::typeDockSizer || - part->type == wxAuiDockUIPart::typePaneSizer) - { - // a dock may not be resized if it has a single - // pane which is not resizable - if (part->type == wxAuiDockUIPart::typeDockSizer && part->dock && - part->dock->panes.GetCount() == 1 && - part->dock->panes.Item(0)->IsFixed()) - return; - - // panes that may not be resized do not get a sizing cursor - if (part->pane && part->pane->IsFixed()) - return; - - if (part->orientation == wxVERTICAL) - cursor = wxCursor(wxCURSOR_SIZEWE); - else - cursor = wxCursor(wxCURSOR_SIZENS); - } - else if (part->type == wxAuiDockUIPart::typeGripper) - { - cursor = wxCursor(wxCURSOR_SIZING); - } - } - - event.SetCursor(cursor); -} - - - -void wxAuiManager::UpdateButtonOnScreen(wxAuiDockUIPart* button_ui_part, - const wxMouseEvent& event) -{ - wxAuiDockUIPart* hit_test = HitTest(event.GetX(), event.GetY()); - if (!hit_test || !button_ui_part) - return; - - int state = wxAUI_BUTTON_STATE_NORMAL; - - if (hit_test == button_ui_part) - { - if (event.LeftDown()) - state = wxAUI_BUTTON_STATE_PRESSED; - else - state = wxAUI_BUTTON_STATE_HOVER; - } - else - { - if (event.LeftDown()) - state = wxAUI_BUTTON_STATE_HOVER; - } - - // now repaint the button with hover state - wxClientDC cdc(m_frame); - - // if the frame has a toolbar, the client area - // origin will not be (0,0). - wxPoint pt = m_frame->GetClientAreaOrigin(); - if (pt.x != 0 || pt.y != 0) - cdc.SetDeviceOrigin(pt.x, pt.y); - - if (hit_test->pane) - { - m_art->DrawPaneButton(cdc, m_frame, - button_ui_part->button->button_id, - state, - button_ui_part->rect, - *hit_test->pane); - } -} - -void wxAuiManager::OnLeftDown(wxMouseEvent& event) -{ - m_currentDragItem = -1; - - wxAuiDockUIPart* part = HitTest(event.GetX(), event.GetY()); - if (part) - { - if (part->type == wxAuiDockUIPart::typeDockSizer || - part->type == wxAuiDockUIPart::typePaneSizer) - { - // Removing this restriction so that a centre pane can be resized - //if (part->dock && part->dock->dock_direction == wxAUI_DOCK_CENTER) - // return; - - // a dock may not be resized if it has a single - // pane which is not resizable - if (part->type == wxAuiDockUIPart::typeDockSizer && part->dock && - part->dock->panes.GetCount() == 1 && - part->dock->panes.Item(0)->IsFixed()) - return; - - // panes that may not be resized should be ignored here - if (part->pane && part->pane->IsFixed()) - return; - - m_action = actionResize; - m_actionPart = part; - m_actionHintRect = wxRect(); - m_actionStart = wxPoint(event.m_x, event.m_y); - m_actionOffset = wxPoint(event.m_x - part->rect.x, - event.m_y - part->rect.y); - m_frame->CaptureMouse(); - } - else if (part->type == wxAuiDockUIPart::typePaneButton) - { - m_action = actionClickButton; - m_actionPart = part; - m_actionStart = wxPoint(event.m_x, event.m_y); - m_frame->CaptureMouse(); - - UpdateButtonOnScreen(part, event); - } - else if (part->type == wxAuiDockUIPart::typeCaption || - part->type == wxAuiDockUIPart::typeGripper) - { - // if we are managing a wxAuiFloatingFrame window, then - // we are an embedded wxAuiManager inside the wxAuiFloatingFrame. - // We want to initiate a toolbar drag in our owner manager - wxWindow* managed_wnd = GetManagedWindow(); - - if (part->pane && - part->pane->window && - managed_wnd && - wxDynamicCast(managed_wnd, wxAuiFloatingFrame)) - { - wxAuiFloatingFrame* floating_frame = (wxAuiFloatingFrame*)managed_wnd; - wxAuiManager* owner_mgr = floating_frame->GetOwnerManager(); - owner_mgr->StartPaneDrag(part->pane->window, - wxPoint(event.m_x - part->rect.x, - event.m_y - part->rect.y)); - return; - } - - - - if (GetFlags() & wxAUI_MGR_ALLOW_ACTIVE_PANE) - { - // set the caption as active - SetActivePane(part->pane->window); - Repaint(); - } - - if (part->dock && part->dock->dock_direction == wxAUI_DOCK_CENTER) - return; - - m_action = actionClickCaption; - m_actionPart = part; - m_actionStart = wxPoint(event.m_x, event.m_y); - m_actionOffset = wxPoint(event.m_x - part->rect.x, - event.m_y - part->rect.y); - m_frame->CaptureMouse(); - } -#ifdef __WXMAC__ - else - { - event.Skip(); - } -#endif - } -#ifdef __WXMAC__ - else - { - event.Skip(); - } -#else - event.Skip(); -#endif -} - -/// Ends a resize action, or for live update, resizes the sash -bool wxAuiManager::DoEndResizeAction(wxMouseEvent& event) -{ - // resize the dock or the pane - if (m_actionPart && m_actionPart->type==wxAuiDockUIPart::typeDockSizer) - { - // first, we must calculate the maximum size the dock may be - int sashSize = m_art->GetMetric(wxAUI_DOCKART_SASH_SIZE); - - int used_width = 0, used_height = 0; - - wxSize client_size = m_frame->GetClientSize(); - - size_t dock_i, dock_count = m_docks.GetCount(); - for (dock_i = 0; dock_i < dock_count; ++dock_i) - { - wxAuiDockInfo& dock = m_docks.Item(dock_i); - if (dock.dock_direction == wxAUI_DOCK_TOP || - dock.dock_direction == wxAUI_DOCK_BOTTOM) - { - used_height += dock.size; - } - if (dock.dock_direction == wxAUI_DOCK_LEFT || - dock.dock_direction == wxAUI_DOCK_RIGHT) - { - used_width += dock.size; - } - if (dock.resizable) - used_width += sashSize; - } - - - int available_width = client_size.GetWidth() - used_width; - int available_height = client_size.GetHeight() - used_height; - - -#if wxUSE_STATUSBAR - // if there's a status control, the available - // height decreases accordingly - if (wxDynamicCast(m_frame, wxFrame)) - { - wxFrame* frame = static_cast(m_frame); - wxStatusBar* status = frame->GetStatusBar(); - if (status) - { - wxSize status_client_size = status->GetClientSize(); - available_height -= status_client_size.GetHeight(); - } - } -#endif - - wxRect& rect = m_actionPart->dock->rect; - - wxPoint new_pos(event.m_x - m_actionOffset.x, - event.m_y - m_actionOffset.y); - int new_size, old_size = m_actionPart->dock->size; - - switch (m_actionPart->dock->dock_direction) - { - case wxAUI_DOCK_LEFT: - new_size = new_pos.x - rect.x; - if (new_size-old_size > available_width) - new_size = old_size+available_width; - m_actionPart->dock->size = new_size; - break; - case wxAUI_DOCK_TOP: - new_size = new_pos.y - rect.y; - if (new_size-old_size > available_height) - new_size = old_size+available_height; - m_actionPart->dock->size = new_size; - break; - case wxAUI_DOCK_RIGHT: - new_size = rect.x + rect.width - new_pos.x - - m_actionPart->rect.GetWidth(); - if (new_size-old_size > available_width) - new_size = old_size+available_width; - m_actionPart->dock->size = new_size; - break; - case wxAUI_DOCK_BOTTOM: - new_size = rect.y + rect.height - - new_pos.y - m_actionPart->rect.GetHeight(); - if (new_size-old_size > available_height) - new_size = old_size+available_height; - m_actionPart->dock->size = new_size; - break; - } - - Update(); - Repaint(NULL); - } - else if (m_actionPart && - m_actionPart->type == wxAuiDockUIPart::typePaneSizer) - { - wxAuiDockInfo& dock = *m_actionPart->dock; - wxAuiPaneInfo& pane = *m_actionPart->pane; - - int total_proportion = 0; - int dock_pixels = 0; - int new_pixsize = 0; - - int caption_size = m_art->GetMetric(wxAUI_DOCKART_CAPTION_SIZE); - int pane_borderSize = m_art->GetMetric(wxAUI_DOCKART_PANE_BORDER_SIZE); - int sashSize = m_art->GetMetric(wxAUI_DOCKART_SASH_SIZE); - - wxPoint new_pos(event.m_x - m_actionOffset.x, - event.m_y - m_actionOffset.y); - - // determine the pane rectangle by getting the pane part - wxAuiDockUIPart* pane_part = GetPanePart(pane.window); - wxASSERT_MSG(pane_part, - wxT("Pane border part not found -- shouldn't happen")); - - // determine the new pixel size that the user wants; - // this will help us recalculate the pane's proportion - if (dock.IsHorizontal()) - new_pixsize = new_pos.x - pane_part->rect.x; - else - new_pixsize = new_pos.y - pane_part->rect.y; - - // determine the size of the dock, based on orientation - if (dock.IsHorizontal()) - dock_pixels = dock.rect.GetWidth(); - else - dock_pixels = dock.rect.GetHeight(); - - // determine the total proportion of all resizable panes, - // and the total size of the dock minus the size of all - // the fixed panes - int i, dock_pane_count = dock.panes.GetCount(); - int pane_position = -1; - for (i = 0; i < dock_pane_count; ++i) - { - wxAuiPaneInfo& p = *dock.panes.Item(i); - if (p.window == pane.window) - pane_position = i; - - // while we're at it, subtract the pane sash - // width from the dock width, because this would - // skew our proportion calculations - if (i > 0) - dock_pixels -= sashSize; - - // also, the whole size (including decorations) of - // all fixed panes must also be subtracted, because they - // are not part of the proportion calculation - if (p.IsFixed()) - { - if (dock.IsHorizontal()) - dock_pixels -= p.best_size.x; - else - dock_pixels -= p.best_size.y; - } - else - { - total_proportion += p.dock_proportion; - } - } - - // new size can never be more than the number of dock pixels - if (new_pixsize > dock_pixels) - new_pixsize = dock_pixels; - - - // find a pane in our dock to 'steal' space from or to 'give' - // space to -- this is essentially what is done when a pane is - // resized; the pane should usually be the first non-fixed pane - // to the right of the action pane - int borrow_pane = -1; - for (i = pane_position+1; i < dock_pane_count; ++i) - { - wxAuiPaneInfo& p = *dock.panes.Item(i); - if (!p.IsFixed()) - { - borrow_pane = i; - break; - } - } - - - // demand that the pane being resized is found in this dock - // (this assert really never should be raised) - wxASSERT_MSG(pane_position != -1, wxT("Pane not found in dock")); - - // prevent division by zero - if (dock_pixels == 0 || total_proportion == 0 || borrow_pane == -1) - { - m_action = actionNone; - return false; - } - - // calculate the new proportion of the pane - int new_proportion = (new_pixsize*total_proportion)/dock_pixels; - - // default minimum size - int min_size = 0; - - // check against the pane's minimum size, if specified. please note - // that this is not enough to ensure that the minimum size will - // not be violated, because the whole frame might later be shrunk, - // causing the size of the pane to violate its minimum size - if (pane.min_size.IsFullySpecified()) - { - min_size = 0; - - if (pane.HasBorder()) - min_size += (pane_borderSize*2); - - // calculate minimum size with decorations (border,caption) - if (pane_part->orientation == wxVERTICAL) - { - min_size += pane.min_size.y; - if (pane.HasCaption()) - min_size += caption_size; - } - else - { - min_size += pane.min_size.x; - } - } - - - // for some reason, an arithmetic error somewhere is causing - // the proportion calculations to always be off by 1 pixel; - // for now we will add the 1 pixel on, but we really should - // determine what's causing this. - min_size++; - - int min_proportion = (min_size*total_proportion)/dock_pixels; - - if (new_proportion < min_proportion) - new_proportion = min_proportion; - - - - int prop_diff = new_proportion - pane.dock_proportion; - - // borrow the space from our neighbor pane to the - // right or bottom (depending on orientation); - // also make sure we don't make the neighbor too small - int prop_borrow = dock.panes.Item(borrow_pane)->dock_proportion; - - if (prop_borrow - prop_diff < 0) - { - // borrowing from other pane would make it too small, - // so cancel the resize operation - prop_borrow = min_proportion; - } - else - { - prop_borrow -= prop_diff; - } - - - dock.panes.Item(borrow_pane)->dock_proportion = prop_borrow; - pane.dock_proportion = new_proportion; - - - // repaint - Update(); - Repaint(NULL); - } - - return true; -} - -void wxAuiManager::OnLeftUp(wxMouseEvent& event) -{ - if (m_action == actionResize) - { - m_frame->ReleaseMouse(); - - if (!wxAuiManager_HasLiveResize(*this)) - { - // get rid of the hint rectangle - wxScreenDC dc; - DrawResizeHint(dc, m_actionHintRect); - } - if (m_currentDragItem != -1 && wxAuiManager_HasLiveResize(*this)) - m_actionPart = & (m_uiParts.Item(m_currentDragItem)); - - DoEndResizeAction(event); - - m_currentDragItem = -1; - - } - else if (m_action == actionClickButton) - { - m_hoverButton = NULL; - m_frame->ReleaseMouse(); - - if (m_actionPart) - { - UpdateButtonOnScreen(m_actionPart, event); - - // make sure we're still over the item that was originally clicked - if (m_actionPart == HitTest(event.GetX(), event.GetY())) - { - // fire button-click event - wxAuiManagerEvent e(wxEVT_AUI_PANE_BUTTON); - e.SetManager(this); - e.SetPane(m_actionPart->pane); - e.SetButton(m_actionPart->button->button_id); - ProcessMgrEvent(e); - } - } - } - else if (m_action == actionClickCaption) - { - m_frame->ReleaseMouse(); - } - else if (m_action == actionDragFloatingPane) - { - m_frame->ReleaseMouse(); - } - else if (m_action == actionDragToolbarPane) - { - m_frame->ReleaseMouse(); - - wxAuiPaneInfo& pane = GetPane(m_actionWindow); - wxASSERT_MSG(pane.IsOk(), wxT("Pane window not found")); - - // save the new positions - wxAuiDockInfoPtrArray docks; - FindDocks(m_docks, pane.dock_direction, - pane.dock_layer, pane.dock_row, docks); - if (docks.GetCount() == 1) - { - wxAuiDockInfo& dock = *docks.Item(0); - - wxArrayInt pane_positions, pane_sizes; - GetPanePositionsAndSizes(dock, pane_positions, pane_sizes); - - int i, dock_pane_count = dock.panes.GetCount(); - for (i = 0; i < dock_pane_count; ++i) - dock.panes.Item(i)->dock_pos = pane_positions[i]; - } - - pane.state &= ~wxAuiPaneInfo::actionPane; - Update(); - } - else - { - event.Skip(); - } - - m_action = actionNone; - m_lastMouseMove = wxPoint(); // see comment in OnMotion() -} - - -void wxAuiManager::OnMotion(wxMouseEvent& event) -{ - // sometimes when Update() is called from inside this method, - // a spurious mouse move event is generated; this check will make - // sure that only real mouse moves will get anywhere in this method; - // this appears to be a bug somewhere, and I don't know where the - // mouse move event is being generated. only verified on MSW - - wxPoint mouse_pos = event.GetPosition(); - if (m_lastMouseMove == mouse_pos) - return; - m_lastMouseMove = mouse_pos; - - - if (m_action == actionResize) - { - // It's necessary to reset m_actionPart since it destroyed - // by the Update within DoEndResizeAction. - if (m_currentDragItem != -1) - m_actionPart = & (m_uiParts.Item(m_currentDragItem)); - else - m_currentDragItem = m_uiParts.Index(* m_actionPart); - - if (m_actionPart) - { - wxPoint pos = m_actionPart->rect.GetPosition(); - if (m_actionPart->orientation == wxHORIZONTAL) - pos.y = wxMax(0, event.m_y - m_actionOffset.y); - else - pos.x = wxMax(0, event.m_x - m_actionOffset.x); - - if (wxAuiManager_HasLiveResize(*this)) - { - m_frame->ReleaseMouse(); - DoEndResizeAction(event); - m_frame->CaptureMouse(); - } - else - { - wxRect rect(m_frame->ClientToScreen(pos), - m_actionPart->rect.GetSize()); - wxScreenDC dc; - - if (!m_actionHintRect.IsEmpty()) - { - // remove old resize hint - DrawResizeHint(dc, m_actionHintRect); - m_actionHintRect = wxRect(); - } - - // draw new resize hint, if it's inside the managed frame - wxRect frameScreenRect = m_frame->GetScreenRect(); - if (frameScreenRect.Contains(rect)) - { - DrawResizeHint(dc, rect); - m_actionHintRect = rect; - } - } - } - } - else if (m_action == actionClickCaption) - { - int drag_x_threshold = wxSystemSettings::GetMetric(wxSYS_DRAG_X); - int drag_y_threshold = wxSystemSettings::GetMetric(wxSYS_DRAG_Y); - - // caption has been clicked. we need to check if the mouse - // is now being dragged. if it is, we need to change the - // mouse action to 'drag' - if (m_actionPart && - (abs(event.m_x - m_actionStart.x) > drag_x_threshold || - abs(event.m_y - m_actionStart.y) > drag_y_threshold)) - { - wxAuiPaneInfo* paneInfo = m_actionPart->pane; - - if (!paneInfo->IsToolbar()) - { - if ((m_flags & wxAUI_MGR_ALLOW_FLOATING) && - paneInfo->IsFloatable()) - { - m_action = actionDragFloatingPane; - - // set initial float position - wxPoint pt = m_frame->ClientToScreen(event.GetPosition()); - paneInfo->floating_pos = wxPoint(pt.x - m_actionOffset.x, - pt.y - m_actionOffset.y); - - // float the window - if (paneInfo->IsMaximized()) - RestorePane(*paneInfo); - paneInfo->Float(); - Update(); - - m_actionWindow = paneInfo->frame; - - // action offset is used here to make it feel "natural" to the user - // to drag a docked pane and suddenly have it become a floating frame. - // Sometimes, however, the offset where the user clicked on the docked - // caption is bigger than the width of the floating frame itself, so - // in that case we need to set the action offset to a sensible value - wxSize frame_size = m_actionWindow->GetSize(); - if (frame_size.x <= m_actionOffset.x) - m_actionOffset.x = 30; - } - } - else - { - m_action = actionDragToolbarPane; - m_actionWindow = paneInfo->window; - } - } - } - else if (m_action == actionDragFloatingPane) - { - if (m_actionWindow) - { - // We can't move the child window so we need to get the frame that - // we want to be really moving. This is probably not the best place - // to do this but at least it fixes the bug (#13177) for now. - if (!wxDynamicCast(m_actionWindow, wxAuiFloatingFrame)) - { - wxAuiPaneInfo& pane = GetPane(m_actionWindow); - m_actionWindow = pane.frame; - } - - wxPoint pt = m_frame->ClientToScreen(event.GetPosition()); - m_actionWindow->Move(pt.x - m_actionOffset.x, - pt.y - m_actionOffset.y); - } - } - else if (m_action == actionDragToolbarPane) - { - wxAuiPaneInfo& pane = GetPane(m_actionWindow); - wxASSERT_MSG(pane.IsOk(), wxT("Pane window not found")); - - pane.SetFlag(wxAuiPaneInfo::actionPane, true); - - wxPoint point = event.GetPosition(); - DoDrop(m_docks, m_panes, pane, point, m_actionOffset); - - // if DoDrop() decided to float the pane, set up - // the floating pane's initial position - if (pane.IsFloating()) - { - wxPoint pt = m_frame->ClientToScreen(event.GetPosition()); - pane.floating_pos = wxPoint(pt.x - m_actionOffset.x, - pt.y - m_actionOffset.y); - } - - // this will do the actual move operation; - // in the case that the pane has been floated, - // this call will create the floating pane - // and do the reparenting - Update(); - - // if the pane has been floated, change the mouse - // action actionDragFloatingPane so that subsequent - // EVT_MOTION() events will move the floating pane - if (pane.IsFloating()) - { - pane.state &= ~wxAuiPaneInfo::actionPane; - m_action = actionDragFloatingPane; - m_actionWindow = pane.frame; - } - } - else - { - wxAuiDockUIPart* part = HitTest(event.GetX(), event.GetY()); - if (part && part->type == wxAuiDockUIPart::typePaneButton) - { - if (part != m_hoverButton) - { - // make the old button normal - if (m_hoverButton) - { - UpdateButtonOnScreen(m_hoverButton, event); - Repaint(); - } - - // mouse is over a button, so repaint the - // button in hover mode - UpdateButtonOnScreen(part, event); - m_hoverButton = part; - - } - } - else - { - if (m_hoverButton) - { - m_hoverButton = NULL; - Repaint(); - } - else - { - event.Skip(); - } - } - } -} - -void wxAuiManager::OnLeaveWindow(wxMouseEvent& WXUNUSED(event)) -{ - if (m_hoverButton) - { - m_hoverButton = NULL; - Repaint(); - } -} - -void wxAuiManager::OnCaptureLost(wxMouseCaptureLostEvent& WXUNUSED(event)) -{ - // cancel the operation in progress, if any - if ( m_action != actionNone ) - { - m_action = actionNone; - HideHint(); - } -} - -void wxAuiManager::OnChildFocus(wxChildFocusEvent& event) -{ - // when a child pane has its focus set, we should change the - // pane's active state to reflect this. (this is only true if - // active panes are allowed by the owner) - if (GetFlags() & wxAUI_MGR_ALLOW_ACTIVE_PANE) - { - wxAuiPaneInfo& pane = GetPane(event.GetWindow()); - if (pane.IsOk() && (pane.state & wxAuiPaneInfo::optionActive) == 0) - { - SetActivePane(event.GetWindow()); - m_frame->Refresh(); - } - } - - event.Skip(); -} - - -// OnPaneButton() is an event handler that is called -// when a pane button has been pressed. -void wxAuiManager::OnPaneButton(wxAuiManagerEvent& evt) -{ - wxASSERT_MSG(evt.pane, wxT("Pane Info passed to wxAuiManager::OnPaneButton must be non-null")); - - wxAuiPaneInfo& pane = *(evt.pane); - - if (evt.button == wxAUI_BUTTON_CLOSE) - { - // fire pane close event - wxAuiManagerEvent e(wxEVT_AUI_PANE_CLOSE); - e.SetManager(this); - e.SetPane(evt.pane); - ProcessMgrEvent(e); - - if (!e.GetVeto()) - { - // close the pane, but check that it - // still exists in our pane array first - // (the event handler above might have removed it) - - wxAuiPaneInfo& check = GetPane(pane.window); - if (check.IsOk()) - { - ClosePane(pane); - } - - Update(); - } - } - else if (evt.button == wxAUI_BUTTON_MAXIMIZE_RESTORE && !pane.IsMaximized()) - { - // fire pane maximize event - wxAuiManagerEvent e(wxEVT_AUI_PANE_MAXIMIZE); - e.SetManager(this); - e.SetPane(evt.pane); - ProcessMgrEvent(e); - - if (!e.GetVeto()) - { - MaximizePane(pane); - Update(); - } - } - else if (evt.button == wxAUI_BUTTON_MAXIMIZE_RESTORE && pane.IsMaximized()) - { - // fire pane restore event - wxAuiManagerEvent e(wxEVT_AUI_PANE_RESTORE); - e.SetManager(this); - e.SetPane(evt.pane); - ProcessMgrEvent(e); - - if (!e.GetVeto()) - { - RestorePane(pane); - Update(); - } - } - else if (evt.button == wxAUI_BUTTON_PIN && - (m_flags & wxAUI_MGR_ALLOW_FLOATING) && pane.IsFloatable()) - { - if (pane.IsMaximized()) - { - // If the pane is maximized, the original state must be restored - // before trying to float the pane, otherwise the other panels - // wouldn't appear correctly when it becomes floating. - wxAuiManagerEvent e(wxEVT_AUI_PANE_RESTORE); - e.SetManager(this); - e.SetPane(evt.pane); - ProcessMgrEvent(e); - - if (e.GetVeto()) - { - // If it can't be restored, it can't be floated neither. - return; - } - - RestorePane(pane); - } - - pane.Float(); - Update(); - } -} - -#endif // wxUSE_AUI diff --git a/Externals/wxWidgets3/src/aui/tabart.cpp b/Externals/wxWidgets3/src/aui/tabart.cpp deleted file mode 100644 index b064591143..0000000000 --- a/Externals/wxWidgets3/src/aui/tabart.cpp +++ /dev/null @@ -1,1334 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/aui/tabart.cpp -// Purpose: wxaui: wx advanced user interface - notebook-art -// Author: Benjamin I. Williams -// Modified by: Jens Lody (moved from auibook.cpp in extra file) -// Created: 2012-03-21 -// Copyright: (C) Copyright 2006, Kirix Corporation, All Rights Reserved -// Licence: wxWindows Library Licence, Version 3.1 -/////////////////////////////////////////////////////////////////////////////// - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_AUI - -#ifndef WX_PRECOMP - #include "wx/dc.h" - #include "wx/dcclient.h" - #include "wx/settings.h" - #include "wx/bitmap.h" - #include "wx/menu.h" -#endif - -#include "wx/renderer.h" -#include "wx/aui/auibook.h" -#include "wx/aui/framemanager.h" -#include "wx/aui/dockart.h" - -#ifdef __WXMAC__ -#include "wx/osx/private.h" -#endif - - -// -- GUI helper classes and functions -- - -class wxAuiCommandCapture : public wxEvtHandler -{ -public: - - wxAuiCommandCapture() { m_lastId = 0; } - int GetCommandId() const { return m_lastId; } - - bool ProcessEvent(wxEvent& evt) wxOVERRIDE - { - if (evt.GetEventType() == wxEVT_MENU) - { - m_lastId = evt.GetId(); - return true; - } - - if (GetNextHandler()) - return GetNextHandler()->ProcessEvent(evt); - - return false; - } - -private: - int m_lastId; -}; - - -// these functions live in dockart.cpp -- they'll eventually -// be moved to a new utility cpp file - -wxBitmap wxAuiBitmapFromBits(const unsigned char bits[], int w, int h, - const wxColour& color); - -wxString wxAuiChopText(wxDC& dc, const wxString& text, int max_size); - -inline bool IsDarkColour(const wxColour& c) -{ - return (c.Red() + c.Green() + c.Blue()) * c.Alpha() * 2 < 3 * 255 * 255; -} - -static void DrawButtons(wxDC& dc, - const wxRect& _rect, - const wxBitmap& bmp, - const wxColour& bkcolour, - int button_state) -{ - wxRect rect = _rect; - - if (button_state == wxAUI_BUTTON_STATE_PRESSED) - { - rect.x++; - rect.y++; - } - - if (button_state == wxAUI_BUTTON_STATE_HOVER || - button_state == wxAUI_BUTTON_STATE_PRESSED) - { - dc.SetBrush(wxBrush(bkcolour.ChangeLightness(120))); - dc.SetPen(wxPen(bkcolour.ChangeLightness(75))); - - // draw the background behind the button - dc.DrawRectangle(rect.x, rect.y, 15, 15); - } - - // draw the button itself - dc.DrawBitmap(bmp, rect.x, rect.y, true); -} - -static void IndentPressedBitmap(wxRect* rect, int button_state) -{ - if (button_state == wxAUI_BUTTON_STATE_PRESSED) - { - rect->x++; - rect->y++; - } -} - -// -- bitmaps -- - -#if defined( __WXMAC__ ) - static const unsigned char close_bits[]={ - 0xFF, 0xFF, 0xFF, 0xFF, 0x0F, 0xFE, 0x03, 0xF8, 0x01, 0xF0, 0x19, 0xF3, - 0xB8, 0xE3, 0xF0, 0xE1, 0xE0, 0xE0, 0xF0, 0xE1, 0xB8, 0xE3, 0x19, 0xF3, - 0x01, 0xF0, 0x03, 0xF8, 0x0F, 0xFE, 0xFF, 0xFF }; -#elif defined( __WXGTK__) - static const unsigned char close_bits[]={ - 0xff, 0xff, 0xff, 0xff, 0x07, 0xf0, 0xfb, 0xef, 0xdb, 0xed, 0x8b, 0xe8, - 0x1b, 0xec, 0x3b, 0xee, 0x1b, 0xec, 0x8b, 0xe8, 0xdb, 0xed, 0xfb, 0xef, - 0x07, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; -#else - static const unsigned char close_bits[]={ - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe7, 0xf3, 0xcf, 0xf9, - 0x9f, 0xfc, 0x3f, 0xfe, 0x3f, 0xfe, 0x9f, 0xfc, 0xcf, 0xf9, 0xe7, 0xf3, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; -#endif - -static const unsigned char left_bits[] = { - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x7f, 0xfe, 0x3f, 0xfe, - 0x1f, 0xfe, 0x0f, 0xfe, 0x1f, 0xfe, 0x3f, 0xfe, 0x7f, 0xfe, 0xff, 0xfe, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; - -static const unsigned char right_bits[] = { - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xff, 0x9f, 0xff, 0x1f, 0xff, - 0x1f, 0xfe, 0x1f, 0xfc, 0x1f, 0xfe, 0x1f, 0xff, 0x9f, 0xff, 0xdf, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; - -static const unsigned char list_bits[] = { - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0x0f, 0xf8, 0xff, 0xff, 0x0f, 0xf8, 0x1f, 0xfc, 0x3f, 0xfe, 0x7f, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; - - - - - - -// -- wxAuiGenericTabArt class implementation -- - -wxAuiGenericTabArt::wxAuiGenericTabArt() -{ - m_normalFont = *wxNORMAL_FONT; - m_selectedFont = *wxNORMAL_FONT; - m_selectedFont.SetWeight(wxFONTWEIGHT_BOLD); - m_measuringFont = m_selectedFont; - - m_fixedTabWidth = 100; - m_tabCtrlHeight = 0; - -#if defined( __WXMAC__ ) && wxOSX_USE_COCOA_OR_CARBON - wxColor baseColour = wxColour( wxMacCreateCGColorFromHITheme(kThemeBrushToolbarBackground)); -#else - wxColor baseColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); -#endif - - // the baseColour is too pale to use as our base colour, - // so darken it a bit -- - if ((255-baseColour.Red()) + - (255-baseColour.Green()) + - (255-baseColour.Blue()) < 60) - { - baseColour = baseColour.ChangeLightness(92); - } - - m_activeColour = baseColour; - m_baseColour = baseColour; - wxColor borderColour = baseColour.ChangeLightness(75); - - m_borderPen = wxPen(borderColour); - m_baseColourPen = wxPen(m_baseColour); - m_baseColourBrush = wxBrush(m_baseColour); - - m_activeCloseBmp = wxAuiBitmapFromBits(close_bits, 16, 16, *wxBLACK); - m_disabledCloseBmp = wxAuiBitmapFromBits(close_bits, 16, 16, wxColour(128,128,128)); - - m_activeLeftBmp = wxAuiBitmapFromBits(left_bits, 16, 16, *wxBLACK); - m_disabledLeftBmp = wxAuiBitmapFromBits(left_bits, 16, 16, wxColour(128,128,128)); - - m_activeRightBmp = wxAuiBitmapFromBits(right_bits, 16, 16, *wxBLACK); - m_disabledRightBmp = wxAuiBitmapFromBits(right_bits, 16, 16, wxColour(128,128,128)); - - m_activeWindowListBmp = wxAuiBitmapFromBits(list_bits, 16, 16, *wxBLACK); - m_disabledWindowListBmp = wxAuiBitmapFromBits(list_bits, 16, 16, wxColour(128,128,128)); - - m_flags = 0; -} - -wxAuiGenericTabArt::~wxAuiGenericTabArt() -{ -} - -wxAuiTabArt* wxAuiGenericTabArt::Clone() -{ - return new wxAuiGenericTabArt(*this); -} - -void wxAuiGenericTabArt::SetFlags(unsigned int flags) -{ - m_flags = flags; -} - -void wxAuiGenericTabArt::SetSizingInfo(const wxSize& tab_ctrl_size, - size_t tab_count) -{ - m_fixedTabWidth = 100; - - int tot_width = (int)tab_ctrl_size.x - GetIndentSize() - 4; - - if (m_flags & wxAUI_NB_CLOSE_BUTTON) - tot_width -= m_activeCloseBmp.GetWidth(); - if (m_flags & wxAUI_NB_WINDOWLIST_BUTTON) - tot_width -= m_activeWindowListBmp.GetWidth(); - - if (tab_count > 0) - { - m_fixedTabWidth = tot_width/(int)tab_count; - } - - - if (m_fixedTabWidth < 100) - m_fixedTabWidth = 100; - - if (m_fixedTabWidth > tot_width/2) - m_fixedTabWidth = tot_width/2; - - if (m_fixedTabWidth > 220) - m_fixedTabWidth = 220; - - m_tabCtrlHeight = tab_ctrl_size.y; -} - - -void wxAuiGenericTabArt::DrawBorder(wxDC& dc, wxWindow* wnd, const wxRect& rect) -{ - int i, border_width = GetBorderWidth(wnd); - - wxRect theRect(rect); - for (i = 0; i < border_width; ++i) - { - dc.DrawRectangle(theRect.x, theRect.y, theRect.width, theRect.height); - theRect.Deflate(1); - } -} - -void wxAuiGenericTabArt::DrawBackground(wxDC& dc, - wxWindow* WXUNUSED(wnd), - const wxRect& rect) -{ - // draw background - - wxColor top_color = m_baseColour.ChangeLightness(90); - wxColor bottom_color = m_baseColour.ChangeLightness(170); - wxRect r; - - if (m_flags &wxAUI_NB_BOTTOM) - r = wxRect(rect.x, rect.y, rect.width+2, rect.height); - // TODO: else if (m_flags &wxAUI_NB_LEFT) {} - // TODO: else if (m_flags &wxAUI_NB_RIGHT) {} - else //for wxAUI_NB_TOP - r = wxRect(rect.x, rect.y, rect.width+2, rect.height-3); - - dc.GradientFillLinear(r, top_color, bottom_color, wxSOUTH); - - - // draw base lines - - dc.SetPen(m_borderPen); - int y = rect.GetHeight(); - int w = rect.GetWidth(); - - if (m_flags &wxAUI_NB_BOTTOM) - { - dc.SetBrush(wxBrush(bottom_color)); - dc.DrawRectangle(-1, 0, w+2, 4); - } - // TODO: else if (m_flags &wxAUI_NB_LEFT) {} - // TODO: else if (m_flags &wxAUI_NB_RIGHT) {} - else //for wxAUI_NB_TOP - { - dc.SetBrush(m_baseColourBrush); - dc.DrawRectangle(-1, y-4, w+2, 4); - } -} - - -// DrawTab() draws an individual tab. -// -// dc - output dc -// in_rect - rectangle the tab should be confined to -// caption - tab's caption -// active - whether or not the tab is active -// out_rect - actual output rectangle -// x_extent - the advance x; where the next tab should start - -void wxAuiGenericTabArt::DrawTab(wxDC& dc, - wxWindow* wnd, - const wxAuiNotebookPage& page, - const wxRect& in_rect, - int close_button_state, - wxRect* out_tab_rect, - wxRect* out_button_rect, - int* x_extent) -{ - wxCoord normal_textx, normal_texty; - wxCoord selected_textx, selected_texty; - wxCoord texty; - - // if the caption is empty, measure some temporary text - wxString caption = page.caption; - if (caption.empty()) - caption = wxT("Xj"); - - dc.SetFont(m_selectedFont); - dc.GetTextExtent(caption, &selected_textx, &selected_texty); - - dc.SetFont(m_normalFont); - dc.GetTextExtent(caption, &normal_textx, &normal_texty); - - // figure out the size of the tab - wxSize tab_size = GetTabSize(dc, - wnd, - page.caption, - page.bitmap, - page.active, - close_button_state, - x_extent); - - wxCoord tab_height = m_tabCtrlHeight - 3; - wxCoord tab_width = tab_size.x; - wxCoord tab_x = in_rect.x; - wxCoord tab_y = in_rect.y + in_rect.height - tab_height; - - - caption = page.caption; - - - // select pen, brush and font for the tab to be drawn - - if (page.active) - { - dc.SetFont(m_selectedFont); - texty = selected_texty; - } - else - { - dc.SetFont(m_normalFont); - texty = normal_texty; - } - - - // create points that will make the tab outline - - int clip_width = tab_width; - if (tab_x + clip_width > in_rect.x + in_rect.width) - clip_width = (in_rect.x + in_rect.width) - tab_x; - -/* - wxPoint clip_points[6]; - clip_points[0] = wxPoint(tab_x, tab_y+tab_height-3); - clip_points[1] = wxPoint(tab_x, tab_y+2); - clip_points[2] = wxPoint(tab_x+2, tab_y); - clip_points[3] = wxPoint(tab_x+clip_width-1, tab_y); - clip_points[4] = wxPoint(tab_x+clip_width+1, tab_y+2); - clip_points[5] = wxPoint(tab_x+clip_width+1, tab_y+tab_height-3); - - // FIXME: these ports don't provide wxRegion ctor from array of points -#if !defined(__WXDFB__) - // set the clipping region for the tab -- - wxRegion clipping_region(WXSIZEOF(clip_points), clip_points); - dc.SetClippingRegion(clipping_region); -#endif // !wxDFB && !wxCocoa -*/ - // since the above code above doesn't play well with WXDFB or WXCOCOA, - // we'll just use a rectangle for the clipping region for now -- - dc.SetClippingRegion(tab_x, tab_y, clip_width+1, tab_height-3); - - - wxPoint border_points[6]; - if (m_flags &wxAUI_NB_BOTTOM) - { - border_points[0] = wxPoint(tab_x, tab_y); - border_points[1] = wxPoint(tab_x, tab_y+tab_height-6); - border_points[2] = wxPoint(tab_x+2, tab_y+tab_height-4); - border_points[3] = wxPoint(tab_x+tab_width-2, tab_y+tab_height-4); - border_points[4] = wxPoint(tab_x+tab_width, tab_y+tab_height-6); - border_points[5] = wxPoint(tab_x+tab_width, tab_y); - } - else //if (m_flags & wxAUI_NB_TOP) {} - { - border_points[0] = wxPoint(tab_x, tab_y+tab_height-4); - border_points[1] = wxPoint(tab_x, tab_y+2); - border_points[2] = wxPoint(tab_x+2, tab_y); - border_points[3] = wxPoint(tab_x+tab_width-2, tab_y); - border_points[4] = wxPoint(tab_x+tab_width, tab_y+2); - border_points[5] = wxPoint(tab_x+tab_width, tab_y+tab_height-4); - } - // TODO: else if (m_flags &wxAUI_NB_LEFT) {} - // TODO: else if (m_flags &wxAUI_NB_RIGHT) {} - - int drawn_tab_yoff = border_points[1].y; - int drawn_tab_height = border_points[0].y - border_points[1].y; - - - wxColour text_colour; - if (page.active) - { - // draw active tab - - // draw base background color - wxRect r(tab_x, tab_y, tab_width, tab_height); - dc.SetPen(wxPen(m_activeColour)); - dc.SetBrush(wxBrush(m_activeColour)); - dc.DrawRectangle(r.x+1, r.y+1, r.width-1, r.height-4); - - // this white helps fill out the gradient at the top of the tab - dc.SetPen(*wxWHITE_PEN); - dc.SetBrush(*wxWHITE_BRUSH); - dc.DrawRectangle(r.x+2, r.y+1, r.width-3, r.height-4); - - text_colour = *wxBLACK; - - // these two points help the rounded corners appear more antialiased - dc.SetPen(wxPen(m_activeColour)); - dc.DrawPoint(r.x+2, r.y+1); - dc.DrawPoint(r.x+r.width-2, r.y+1); - - // set rectangle down a bit for gradient drawing - r.SetHeight(r.GetHeight()/2); - r.x += 2; - r.width -= 3; - r.y += r.height; - r.y -= 2; - - // draw gradient background - wxColor top_color = *wxWHITE; - wxColor bottom_color = m_activeColour; - dc.GradientFillLinear(r, bottom_color, top_color, wxNORTH); - } - else - { - // draw inactive tab - - wxRect r(tab_x, tab_y+1, tab_width, tab_height-3); - - // start the gradient up a bit and leave the inside border inset - // by a pixel for a 3D look. Only the top half of the inactive - // tab will have a slight gradient - r.x += 3; - r.y++; - r.width -= 4; - r.height /= 2; - r.height--; - - // -- draw top gradient fill for glossy look - wxColor top_color = m_baseColour.ChangeLightness(160); - wxColor bottom_color = m_baseColour; - dc.GradientFillLinear(r, top_color, bottom_color, wxSOUTH); - - text_colour = IsDarkColour(bottom_color) ? *wxWHITE : *wxBLACK; - - r.y += r.height; - r.y--; - - // -- draw bottom fill for glossy look - top_color = m_baseColour; - bottom_color = m_baseColour; - dc.GradientFillLinear(r, top_color, bottom_color, wxSOUTH); - } - - // draw tab outline - dc.SetPen(m_borderPen); - dc.SetBrush(*wxTRANSPARENT_BRUSH); - dc.DrawPolygon(WXSIZEOF(border_points), border_points); - - // there are two horizontal grey lines at the bottom of the tab control, - // this gets rid of the top one of those lines in the tab control - if (page.active) - { - if (m_flags &wxAUI_NB_BOTTOM) - dc.SetPen(wxPen(m_baseColour.ChangeLightness(170))); - // TODO: else if (m_flags &wxAUI_NB_LEFT) {} - // TODO: else if (m_flags &wxAUI_NB_RIGHT) {} - else //for wxAUI_NB_TOP - dc.SetPen(m_baseColourPen); - dc.DrawLine(border_points[0].x+1, - border_points[0].y, - border_points[5].x, - border_points[5].y); - } - - - int text_offset = tab_x + 8; - int close_button_width = 0; - if (close_button_state != wxAUI_BUTTON_STATE_HIDDEN) - { - close_button_width = m_activeCloseBmp.GetWidth(); - } - - int bitmap_offset = 0; - if (page.bitmap.IsOk()) - { - bitmap_offset = tab_x + 8; - - // draw bitmap - dc.DrawBitmap(page.bitmap, - bitmap_offset, - drawn_tab_yoff + (drawn_tab_height/2) - (page.bitmap.GetHeight()/2), - true); - - text_offset = bitmap_offset + page.bitmap.GetWidth(); - text_offset += 3; // bitmap padding - - } - else - { - text_offset = tab_x + 8; - } - - - wxString draw_text = wxAuiChopText(dc, - caption, - tab_width - (text_offset-tab_x) - close_button_width); - - // draw tab text - dc.SetTextForeground(text_colour); - dc.DrawText(draw_text, - text_offset, - drawn_tab_yoff + (drawn_tab_height)/2 - (texty/2) - 1); - - // draw focus rectangle - if (page.active && (wnd->FindFocus() == wnd)) - { - wxRect focusRectText(text_offset, (drawn_tab_yoff + (drawn_tab_height)/2 - (texty/2) - 1), - selected_textx, selected_texty); - - wxRect focusRect; - wxRect focusRectBitmap; - - if (page.bitmap.IsOk()) - focusRectBitmap = wxRect(bitmap_offset, drawn_tab_yoff + (drawn_tab_height/2) - (page.bitmap.GetHeight()/2), - page.bitmap.GetWidth(), page.bitmap.GetHeight()); - - if (page.bitmap.IsOk() && draw_text.IsEmpty()) - focusRect = focusRectBitmap; - else if (!page.bitmap.IsOk() && !draw_text.IsEmpty()) - focusRect = focusRectText; - else if (page.bitmap.IsOk() && !draw_text.IsEmpty()) - focusRect = focusRectText.Union(focusRectBitmap); - - focusRect.Inflate(2, 2); - - wxRendererNative::Get().DrawFocusRect(wnd, dc, focusRect, 0); - } - - // draw close button if necessary - if (close_button_state != wxAUI_BUTTON_STATE_HIDDEN) - { - wxBitmap bmp = m_disabledCloseBmp; - - if (close_button_state == wxAUI_BUTTON_STATE_HOVER || - close_button_state == wxAUI_BUTTON_STATE_PRESSED) - { - bmp = m_activeCloseBmp; - } - - int offsetY = tab_y-1; - if (m_flags & wxAUI_NB_BOTTOM) - offsetY = 1; - - wxRect rect(tab_x + tab_width - close_button_width - 1, - offsetY + (tab_height/2) - (bmp.GetHeight()/2), - close_button_width, - tab_height); - - IndentPressedBitmap(&rect, close_button_state); - dc.DrawBitmap(bmp, rect.x, rect.y, true); - - *out_button_rect = rect; - } - - *out_tab_rect = wxRect(tab_x, tab_y, tab_width, tab_height); - - dc.DestroyClippingRegion(); -} - -int wxAuiGenericTabArt::GetIndentSize() -{ - return 5; -} - -int wxAuiGenericTabArt::GetBorderWidth(wxWindow* wnd) -{ - wxAuiManager* mgr = wxAuiManager::GetManager(wnd); - if (mgr) - { - wxAuiDockArt* art = mgr->GetArtProvider(); - if (art) - return art->GetMetric(wxAUI_DOCKART_PANE_BORDER_SIZE); - } - return 1; -} - -int wxAuiGenericTabArt::GetAdditionalBorderSpace(wxWindow* WXUNUSED(wnd)) -{ - return 0; -} - -wxSize wxAuiGenericTabArt::GetTabSize(wxDC& dc, - wxWindow* WXUNUSED(wnd), - const wxString& caption, - const wxBitmap& bitmap, - bool WXUNUSED(active), - int close_button_state, - int* x_extent) -{ - wxCoord measured_textx, measured_texty, tmp; - - dc.SetFont(m_measuringFont); - dc.GetTextExtent(caption, &measured_textx, &measured_texty); - - dc.GetTextExtent(wxT("ABCDEFXj"), &tmp, &measured_texty); - - // add padding around the text - wxCoord tab_width = measured_textx; - wxCoord tab_height = measured_texty; - - // if the close button is showing, add space for it - if (close_button_state != wxAUI_BUTTON_STATE_HIDDEN) - tab_width += m_activeCloseBmp.GetWidth() + 3; - - // if there's a bitmap, add space for it - if (bitmap.IsOk()) - { - tab_width += bitmap.GetWidth(); - tab_width += 3; // right side bitmap padding - tab_height = wxMax(tab_height, bitmap.GetHeight()); - } - - // add padding - tab_width += 16; - tab_height += 10; - - if (m_flags & wxAUI_NB_TAB_FIXED_WIDTH) - { - tab_width = m_fixedTabWidth; - } - - *x_extent = tab_width; - - return wxSize(tab_width, tab_height); -} - - -void wxAuiGenericTabArt::DrawButton(wxDC& dc, - wxWindow* WXUNUSED(wnd), - const wxRect& in_rect, - int bitmap_id, - int button_state, - int orientation, - wxRect* out_rect) -{ - wxBitmap bmp; - wxRect rect; - - switch (bitmap_id) - { - case wxAUI_BUTTON_CLOSE: - if (button_state & wxAUI_BUTTON_STATE_DISABLED) - bmp = m_disabledCloseBmp; - else - bmp = m_activeCloseBmp; - break; - case wxAUI_BUTTON_LEFT: - if (button_state & wxAUI_BUTTON_STATE_DISABLED) - bmp = m_disabledLeftBmp; - else - bmp = m_activeLeftBmp; - break; - case wxAUI_BUTTON_RIGHT: - if (button_state & wxAUI_BUTTON_STATE_DISABLED) - bmp = m_disabledRightBmp; - else - bmp = m_activeRightBmp; - break; - case wxAUI_BUTTON_WINDOWLIST: - if (button_state & wxAUI_BUTTON_STATE_DISABLED) - bmp = m_disabledWindowListBmp; - else - bmp = m_activeWindowListBmp; - break; - } - - - if (!bmp.IsOk()) - return; - - rect = in_rect; - - if (orientation == wxLEFT) - { - rect.SetX(in_rect.x); - rect.SetY(((in_rect.y + in_rect.height)/2) - (bmp.GetHeight()/2)); - rect.SetWidth(bmp.GetWidth()); - rect.SetHeight(bmp.GetHeight()); - } - else - { - rect = wxRect(in_rect.x + in_rect.width - bmp.GetWidth(), - ((in_rect.y + in_rect.height)/2) - (bmp.GetHeight()/2), - bmp.GetWidth(), bmp.GetHeight()); - } - - IndentPressedBitmap(&rect, button_state); - dc.DrawBitmap(bmp, rect.x, rect.y, true); - - *out_rect = rect; -} - -int wxAuiGenericTabArt::ShowDropDown(wxWindow* wnd, - const wxAuiNotebookPageArray& pages, - int /*active_idx*/) -{ - wxMenu menuPopup; - - size_t i, count = pages.GetCount(); - for (i = 0; i < count; ++i) - { - const wxAuiNotebookPage& page = pages.Item(i); - wxString caption = page.caption; - - // if there is no caption, make it a space. This will prevent - // an assert in the menu code. - if (caption.IsEmpty()) - caption = wxT(" "); - - wxMenuItem* item = new wxMenuItem(NULL, 1000+i, caption); - if (page.bitmap.IsOk()) - item->SetBitmap(page.bitmap); - menuPopup.Append(item); - } - - // find out where to put the popup menu of window items - wxPoint pt = ::wxGetMousePosition(); - pt = wnd->ScreenToClient(pt); - - // find out the screen coordinate at the bottom of the tab ctrl - wxRect cli_rect = wnd->GetClientRect(); - pt.y = cli_rect.y + cli_rect.height; - - wxAuiCommandCapture* cc = new wxAuiCommandCapture; - wnd->PushEventHandler(cc); - wnd->PopupMenu(&menuPopup, pt); - int command = cc->GetCommandId(); - wnd->PopEventHandler(true); - - if (command >= 1000) - return command-1000; - - return -1; -} - -int wxAuiGenericTabArt::GetBestTabCtrlSize(wxWindow* wnd, - const wxAuiNotebookPageArray& pages, - const wxSize& requiredBmp_size) -{ - wxClientDC dc(wnd); - dc.SetFont(m_measuringFont); - - // sometimes a standard bitmap size needs to be enforced, especially - // if some tabs have bitmaps and others don't. This is important because - // it prevents the tab control from resizing when tabs are added. - wxBitmap measureBmp; - if (requiredBmp_size.IsFullySpecified()) - { - measureBmp.Create(requiredBmp_size.x, - requiredBmp_size.y); - } - - - int max_y = 0; - size_t i, page_count = pages.GetCount(); - for (i = 0; i < page_count; ++i) - { - wxAuiNotebookPage& page = pages.Item(i); - - wxBitmap bmp; - if (measureBmp.IsOk()) - bmp = measureBmp; - else - bmp = page.bitmap; - - // we don't use the caption text because we don't - // want tab heights to be different in the case - // of a very short piece of text on one tab and a very - // tall piece of text on another tab - int x_ext = 0; - wxSize s = GetTabSize(dc, - wnd, - wxT("ABCDEFGHIj"), - bmp, - true, - wxAUI_BUTTON_STATE_HIDDEN, - &x_ext); - - max_y = wxMax(max_y, s.y); - } - - return max_y+2; -} - -void wxAuiGenericTabArt::SetNormalFont(const wxFont& font) -{ - m_normalFont = font; -} - -void wxAuiGenericTabArt::SetSelectedFont(const wxFont& font) -{ - m_selectedFont = font; -} - -void wxAuiGenericTabArt::SetMeasuringFont(const wxFont& font) -{ - m_measuringFont = font; -} - -void wxAuiGenericTabArt::SetColour(const wxColour& colour) -{ - m_baseColour = colour; - m_borderPen = wxPen(m_baseColour.ChangeLightness(75)); - m_baseColourPen = wxPen(m_baseColour); - m_baseColourBrush = wxBrush(m_baseColour); -} - -void wxAuiGenericTabArt::SetActiveColour(const wxColour& colour) -{ - m_activeColour = colour; -} - -// -- wxAuiSimpleTabArt class implementation -- - -wxAuiSimpleTabArt::wxAuiSimpleTabArt() -{ - m_normalFont = *wxNORMAL_FONT; - m_selectedFont = *wxNORMAL_FONT; - m_selectedFont.SetWeight(wxFONTWEIGHT_BOLD); - m_measuringFont = m_selectedFont; - - m_flags = 0; - m_fixedTabWidth = 100; - - wxColour baseColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); - - wxColour backgroundColour = baseColour; - wxColour normaltabColour = baseColour; - wxColour selectedtabColour = *wxWHITE; - - m_normalTextColour = IsDarkColour(baseColour) ? *wxWHITE : *wxBLACK; - m_selectedTextColour = *wxBLACK; - - m_bkBrush = wxBrush(backgroundColour); - m_normalBkBrush = wxBrush(normaltabColour); - m_normalBkPen = wxPen(normaltabColour); - m_selectedBkBrush = wxBrush(selectedtabColour); - m_selectedBkPen = wxPen(selectedtabColour); - - m_activeCloseBmp = wxAuiBitmapFromBits(close_bits, 16, 16, *wxBLACK); - m_disabledCloseBmp = wxAuiBitmapFromBits(close_bits, 16, 16, wxColour(128,128,128)); - - m_activeLeftBmp = wxAuiBitmapFromBits(left_bits, 16, 16, *wxBLACK); - m_disabledLeftBmp = wxAuiBitmapFromBits(left_bits, 16, 16, wxColour(128,128,128)); - - m_activeRightBmp = wxAuiBitmapFromBits(right_bits, 16, 16, *wxBLACK); - m_disabledRightBmp = wxAuiBitmapFromBits(right_bits, 16, 16, wxColour(128,128,128)); - - m_activeWindowListBmp = wxAuiBitmapFromBits(list_bits, 16, 16, *wxBLACK); - m_disabledWindowListBmp = wxAuiBitmapFromBits(list_bits, 16, 16, wxColour(128,128,128)); - -} - -wxAuiSimpleTabArt::~wxAuiSimpleTabArt() -{ -} - -wxAuiTabArt* wxAuiSimpleTabArt::Clone() -{ - return new wxAuiSimpleTabArt(*this); -} - -void wxAuiSimpleTabArt::SetFlags(unsigned int flags) -{ - m_flags = flags; -} - -void wxAuiSimpleTabArt::SetSizingInfo(const wxSize& tab_ctrl_size, - size_t tab_count) -{ - m_fixedTabWidth = 100; - - int tot_width = (int)tab_ctrl_size.x - GetIndentSize() - 4; - - if (m_flags & wxAUI_NB_CLOSE_BUTTON) - tot_width -= m_activeCloseBmp.GetWidth(); - if (m_flags & wxAUI_NB_WINDOWLIST_BUTTON) - tot_width -= m_activeWindowListBmp.GetWidth(); - - if (tab_count > 0) - { - m_fixedTabWidth = tot_width/(int)tab_count; - } - - - if (m_fixedTabWidth < 100) - m_fixedTabWidth = 100; - - if (m_fixedTabWidth > tot_width/2) - m_fixedTabWidth = tot_width/2; - - if (m_fixedTabWidth > 220) - m_fixedTabWidth = 220; -} - -void wxAuiSimpleTabArt::SetColour(const wxColour& colour) -{ - m_bkBrush = wxBrush(colour); - m_normalBkBrush = wxBrush(colour); - m_normalBkPen = wxPen(colour); -} - -void wxAuiSimpleTabArt::SetActiveColour(const wxColour& colour) -{ - m_selectedBkBrush = wxBrush(colour); - m_selectedBkPen = wxPen(colour); -} - -void wxAuiSimpleTabArt::DrawBorder(wxDC& dc, wxWindow* wnd, const wxRect& rect) -{ - int i, border_width = GetBorderWidth(wnd); - - wxRect theRect(rect); - for (i = 0; i < border_width; ++i) - { - dc.DrawRectangle(theRect.x, theRect.y, theRect.width, theRect.height); - theRect.Deflate(1); - } -} - -void wxAuiSimpleTabArt::DrawBackground(wxDC& dc, - wxWindow* WXUNUSED(wnd), - const wxRect& rect) -{ - // draw background - dc.SetBrush(m_bkBrush); - dc.SetPen(*wxTRANSPARENT_PEN); - dc.DrawRectangle(-1, -1, rect.GetWidth()+2, rect.GetHeight()+2); - - // draw base line - dc.SetPen(*wxGREY_PEN); - dc.DrawLine(0, rect.GetHeight()-1, rect.GetWidth(), rect.GetHeight()-1); -} - - -// DrawTab() draws an individual tab. -// -// dc - output dc -// in_rect - rectangle the tab should be confined to -// caption - tab's caption -// active - whether or not the tab is active -// out_rect - actual output rectangle -// x_extent - the advance x; where the next tab should start - -void wxAuiSimpleTabArt::DrawTab(wxDC& dc, - wxWindow* wnd, - const wxAuiNotebookPage& page, - const wxRect& in_rect, - int close_button_state, - wxRect* out_tab_rect, - wxRect* out_button_rect, - int* x_extent) -{ - wxCoord normal_textx, normal_texty; - wxCoord selected_textx, selected_texty; - wxCoord textx, texty; - - // if the caption is empty, measure some temporary text - wxString caption = page.caption; - if (caption.empty()) - caption = wxT("Xj"); - - dc.SetFont(m_selectedFont); - dc.GetTextExtent(caption, &selected_textx, &selected_texty); - - dc.SetFont(m_normalFont); - dc.GetTextExtent(caption, &normal_textx, &normal_texty); - - // figure out the size of the tab - wxSize tab_size = GetTabSize(dc, - wnd, - page.caption, - page.bitmap, - page.active, - close_button_state, - x_extent); - - wxCoord tab_height = tab_size.y; - wxCoord tab_width = tab_size.x; - wxCoord tab_x = in_rect.x; - wxCoord tab_y = in_rect.y + in_rect.height - tab_height; - - caption = page.caption; - - // select pen, brush and font for the tab to be drawn - - if (page.active) - { - dc.SetPen(m_selectedBkPen); - dc.SetBrush(m_selectedBkBrush); - dc.SetFont(m_selectedFont); - textx = selected_textx; - texty = selected_texty; - } - else - { - dc.SetPen(m_normalBkPen); - dc.SetBrush(m_normalBkBrush); - dc.SetFont(m_normalFont); - textx = normal_textx; - texty = normal_texty; - } - - - // -- draw line -- - - wxPoint points[7]; - points[0].x = tab_x; - points[0].y = tab_y + tab_height - 1; - points[1].x = tab_x + tab_height - 3; - points[1].y = tab_y + 2; - points[2].x = tab_x + tab_height + 3; - points[2].y = tab_y; - points[3].x = tab_x + tab_width - 2; - points[3].y = tab_y; - points[4].x = tab_x + tab_width; - points[4].y = tab_y + 2; - points[5].x = tab_x + tab_width; - points[5].y = tab_y + tab_height - 1; - points[6] = points[0]; - - dc.SetClippingRegion(in_rect); - - dc.DrawPolygon(WXSIZEOF(points) - 1, points); - - dc.SetPen(*wxGREY_PEN); - - //dc.DrawLines(active ? WXSIZEOF(points) - 1 : WXSIZEOF(points), points); - dc.DrawLines(WXSIZEOF(points), points); - - - int text_offset; - - int close_button_width = 0; - if (close_button_state != wxAUI_BUTTON_STATE_HIDDEN) - { - close_button_width = m_activeCloseBmp.GetWidth(); - text_offset = tab_x + (tab_height/2) + ((tab_width-close_button_width)/2) - (textx/2); - } - else - { - text_offset = tab_x + (tab_height/3) + (tab_width/2) - (textx/2); - } - - // set minimum text offset - if (text_offset < tab_x + tab_height) - text_offset = tab_x + tab_height; - - // chop text if necessary - wxString draw_text = wxAuiChopText(dc, - caption, - tab_width - (text_offset-tab_x) - close_button_width); - - // draw tab text - dc.SetTextForeground(page.active ? m_selectedTextColour : m_normalTextColour); - dc.DrawText(draw_text, - text_offset, - (tab_y + tab_height)/2 - (texty/2) + 1); - - - // draw focus rectangle - if (page.active && (wnd->FindFocus() == wnd)) - { - wxRect focusRect(text_offset, ((tab_y + tab_height)/2 - (texty/2) + 1), - selected_textx, selected_texty); - - focusRect.Inflate(2, 2); - - wxRendererNative::Get().DrawFocusRect(wnd, dc, focusRect, 0); - } - - // draw close button if necessary - if (close_button_state != wxAUI_BUTTON_STATE_HIDDEN) - { - wxBitmap bmp; - if (page.active) - bmp = m_activeCloseBmp; - else - bmp = m_disabledCloseBmp; - - wxRect rect(tab_x + tab_width - close_button_width - 1, - tab_y + (tab_height/2) - (bmp.GetHeight()/2) + 1, - close_button_width, - tab_height - 1); - DrawButtons(dc, rect, bmp, *wxWHITE, close_button_state); - - *out_button_rect = rect; - } - - - *out_tab_rect = wxRect(tab_x, tab_y, tab_width, tab_height); - - dc.DestroyClippingRegion(); -} - -int wxAuiSimpleTabArt::GetIndentSize() -{ - return 0; -} - -int wxAuiSimpleTabArt::GetBorderWidth(wxWindow* wnd) -{ - wxAuiManager* mgr = wxAuiManager::GetManager(wnd); - if (mgr) - { - wxAuiDockArt* art = mgr->GetArtProvider(); - if (art) - return art->GetMetric(wxAUI_DOCKART_PANE_BORDER_SIZE); - } - return 1; -} - -int wxAuiSimpleTabArt::GetAdditionalBorderSpace(wxWindow* WXUNUSED(wnd)) -{ - return 0; -} - -wxSize wxAuiSimpleTabArt::GetTabSize(wxDC& dc, - wxWindow* WXUNUSED(wnd), - const wxString& caption, - const wxBitmap& WXUNUSED(bitmap), - bool WXUNUSED(active), - int close_button_state, - int* x_extent) -{ - wxCoord measured_textx, measured_texty; - - dc.SetFont(m_measuringFont); - dc.GetTextExtent(caption, &measured_textx, &measured_texty); - - wxCoord tab_height = measured_texty + 4; - wxCoord tab_width = measured_textx + tab_height + 5; - - if (close_button_state != wxAUI_BUTTON_STATE_HIDDEN) - tab_width += m_activeCloseBmp.GetWidth(); - - if (m_flags & wxAUI_NB_TAB_FIXED_WIDTH) - { - tab_width = m_fixedTabWidth; - } - - *x_extent = tab_width - (tab_height/2) - 1; - - return wxSize(tab_width, tab_height); -} - - -void wxAuiSimpleTabArt::DrawButton(wxDC& dc, - wxWindow* WXUNUSED(wnd), - const wxRect& in_rect, - int bitmap_id, - int button_state, - int orientation, - wxRect* out_rect) -{ - wxBitmap bmp; - wxRect rect; - - switch (bitmap_id) - { - case wxAUI_BUTTON_CLOSE: - if (button_state & wxAUI_BUTTON_STATE_DISABLED) - bmp = m_disabledCloseBmp; - else - bmp = m_activeCloseBmp; - break; - case wxAUI_BUTTON_LEFT: - if (button_state & wxAUI_BUTTON_STATE_DISABLED) - bmp = m_disabledLeftBmp; - else - bmp = m_activeLeftBmp; - break; - case wxAUI_BUTTON_RIGHT: - if (button_state & wxAUI_BUTTON_STATE_DISABLED) - bmp = m_disabledRightBmp; - else - bmp = m_activeRightBmp; - break; - case wxAUI_BUTTON_WINDOWLIST: - if (button_state & wxAUI_BUTTON_STATE_DISABLED) - bmp = m_disabledWindowListBmp; - else - bmp = m_activeWindowListBmp; - break; - } - - if (!bmp.IsOk()) - return; - - rect = in_rect; - - if (orientation == wxLEFT) - { - rect.SetX(in_rect.x); - rect.SetY(((in_rect.y + in_rect.height)/2) - (bmp.GetHeight()/2)); - rect.SetWidth(bmp.GetWidth()); - rect.SetHeight(bmp.GetHeight()); - } - else - { - rect = wxRect(in_rect.x + in_rect.width - bmp.GetWidth(), - ((in_rect.y + in_rect.height)/2) - (bmp.GetHeight()/2), - bmp.GetWidth(), bmp.GetHeight()); - } - - - DrawButtons(dc, rect, bmp, *wxWHITE, button_state); - - *out_rect = rect; -} - -int wxAuiSimpleTabArt::ShowDropDown(wxWindow* wnd, - const wxAuiNotebookPageArray& pages, - int active_idx) -{ - wxMenu menuPopup; - - size_t i, count = pages.GetCount(); - for (i = 0; i < count; ++i) - { - const wxAuiNotebookPage& page = pages.Item(i); - menuPopup.AppendCheckItem(1000+i, page.caption); - } - - if (active_idx != -1) - { - menuPopup.Check(1000+active_idx, true); - } - - // find out where to put the popup menu of window - // items. Subtract 100 for now to center the menu - // a bit, until a better mechanism can be implemented - wxPoint pt = ::wxGetMousePosition(); - pt = wnd->ScreenToClient(pt); - if (pt.x < 100) - pt.x = 0; - else - pt.x -= 100; - - // find out the screen coordinate at the bottom of the tab ctrl - wxRect cli_rect = wnd->GetClientRect(); - pt.y = cli_rect.y + cli_rect.height; - - wxAuiCommandCapture* cc = new wxAuiCommandCapture; - wnd->PushEventHandler(cc); - wnd->PopupMenu(&menuPopup, pt); - int command = cc->GetCommandId(); - wnd->PopEventHandler(true); - - if (command >= 1000) - return command-1000; - - return -1; -} - -int wxAuiSimpleTabArt::GetBestTabCtrlSize(wxWindow* wnd, - const wxAuiNotebookPageArray& WXUNUSED(pages), - const wxSize& WXUNUSED(requiredBmp_size)) -{ - wxClientDC dc(wnd); - dc.SetFont(m_measuringFont); - int x_ext = 0; - wxSize s = GetTabSize(dc, - wnd, - wxT("ABCDEFGHIj"), - wxNullBitmap, - true, - wxAUI_BUTTON_STATE_HIDDEN, - &x_ext); - return s.y+3; -} - -void wxAuiSimpleTabArt::SetNormalFont(const wxFont& font) -{ - m_normalFont = font; -} - -void wxAuiSimpleTabArt::SetSelectedFont(const wxFont& font) -{ - m_selectedFont = font; -} - -void wxAuiSimpleTabArt::SetMeasuringFont(const wxFont& font) -{ - m_measuringFont = font; -} - -#endif // wxUSE_AUI diff --git a/Externals/wxWidgets3/src/aui/tabartgtk.cpp b/Externals/wxWidgets3/src/aui/tabartgtk.cpp deleted file mode 100644 index 1c86fbe9d0..0000000000 --- a/Externals/wxWidgets3/src/aui/tabartgtk.cpp +++ /dev/null @@ -1,512 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/aui/tabartgtk.cpp -// Purpose: implementation of the wxAuiGTKTabArt -// Author: Jens Lody and Teodor Petrov -// Modified by: -// Created: 2012-03-23 -// Copyright: (c) 2012 Jens Lody -// and Teodor Petrov -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_AUI - -#ifndef WX_PRECOMP - #include "wx/dc.h" - #include "wx/dcclient.h" - #include "wx/settings.h" - #include "wx/image.h" -#endif - -#include "wx/gtk/dc.h" -#include "wx/gtk/private.h" - -#include - -#include "wx/aui/auibook.h" -#include "wx/aui/tabartgtk.h" -#include "wx/renderer.h" - -namespace -{ - -static int s_CloseIconSize = 16; // default size - -} - -wxAuiGtkTabArt::wxAuiGtkTabArt() - -{ -} - -wxAuiTabArt* wxAuiGtkTabArt::Clone() -{ - wxAuiGtkTabArt* clone = new wxAuiGtkTabArt(); - - clone->SetNormalFont(m_normalFont); - clone->SetSelectedFont(m_normalFont); - clone->SetMeasuringFont(m_normalFont); - - return clone; -} - -void wxAuiGtkTabArt::DrawBackground(wxDC& dc, wxWindow* WXUNUSED(wnd), const wxRect& rect) -{ - wxGTKDCImpl *impldc = (wxGTKDCImpl*) dc.GetImpl(); - GdkWindow* window = impldc->GetGDKWindow(); - - gtk_style_apply_default_background(gtk_widget_get_style(wxGTKPrivate::GetNotebookWidget()), - window, - true, - GTK_STATE_NORMAL, - NULL, - rect.x, rect.y, rect.width, rect.height); -} - -void wxAuiGtkTabArt::DrawBorder(wxDC& WXUNUSED(dc), wxWindow* wnd, const wxRect& rect) -{ - int generic_border_width = wxAuiGenericTabArt::GetBorderWidth(wnd); - - if (!wnd) return; - if (!wnd->m_wxwindow) return; - if (!gtk_widget_is_drawable(wnd->m_wxwindow)) return; - - GtkStyle *style_notebook = gtk_widget_get_style(wxGTKPrivate::GetNotebookWidget()); - - gtk_paint_box(style_notebook, wnd->GTKGetDrawingWindow(), GTK_STATE_NORMAL, GTK_SHADOW_OUT, - NULL, wnd->m_wxwindow, - const_cast("notebook"), - rect.x + generic_border_width + 1, rect.y + generic_border_width + 1, - rect.width - (generic_border_width + 1), rect.height - (generic_border_width + 1)); -} - -void ButtonStateAndShadow(int button_state, GtkStateType &state, GtkShadowType &shadow) -{ - - if (button_state & wxAUI_BUTTON_STATE_DISABLED) - { - state = GTK_STATE_INSENSITIVE; - shadow = GTK_SHADOW_ETCHED_IN; - } - else if (button_state & wxAUI_BUTTON_STATE_HOVER) - { - state = GTK_STATE_PRELIGHT; - shadow = GTK_SHADOW_OUT; - } - else if (button_state & wxAUI_BUTTON_STATE_PRESSED) - { - state = GTK_STATE_ACTIVE; - shadow = GTK_SHADOW_IN; - } - else - { - state = GTK_STATE_NORMAL; - shadow = GTK_SHADOW_OUT; - } -} - -wxRect DrawCloseButton(wxDC& dc, - GtkWidget *widget, - int button_state, - wxRect const &in_rect, - int orientation, - GdkRectangle* clipRect) -{ - GtkStyle *style_button = gtk_widget_get_style(wxGTKPrivate::GetButtonWidget()); - int xthickness = style_button->xthickness; - int ythickness = style_button->ythickness; - - wxBitmap bmp(gtk_widget_render_icon(widget, GTK_STOCK_CLOSE, GTK_ICON_SIZE_SMALL_TOOLBAR, "tab")); - - if(bmp.GetWidth() != s_CloseIconSize || bmp.GetHeight() != s_CloseIconSize) - { - wxImage img = bmp.ConvertToImage(); - img.Rescale(s_CloseIconSize, s_CloseIconSize); - bmp = img; - } - - int button_size = s_CloseIconSize + 2 * xthickness; - - wxRect out_rect; - - if (orientation == wxLEFT) - out_rect.x = in_rect.x - ythickness; - else - out_rect.x = in_rect.x + in_rect.width - button_size - ythickness; - - out_rect.y = in_rect.y + (in_rect.height - button_size) / 2; - out_rect.width = button_size; - out_rect.height = button_size; - - wxGTKDCImpl *impldc = (wxGTKDCImpl*) dc.GetImpl(); - GdkWindow* window = impldc->GetGDKWindow(); - - if (button_state == wxAUI_BUTTON_STATE_HOVER) - { - gtk_paint_box(style_button, window, - GTK_STATE_PRELIGHT, GTK_SHADOW_OUT, clipRect, widget, "button", - out_rect.x, out_rect.y, out_rect.width, out_rect.height); - } - else if (button_state == wxAUI_BUTTON_STATE_PRESSED) - { - gtk_paint_box(style_button, window, - GTK_STATE_ACTIVE, GTK_SHADOW_IN, clipRect, widget, "button", - out_rect.x, out_rect.y, out_rect.width, out_rect.height); - } - - - dc.DrawBitmap(bmp, out_rect.x + xthickness, out_rect.y + ythickness, true); - - return out_rect; -} - -void wxAuiGtkTabArt::DrawTab(wxDC& dc, wxWindow* wnd, const wxAuiNotebookPage& page, - const wxRect& in_rect, int close_button_state, wxRect* out_tab_rect, - wxRect* out_button_rect, int* x_extent) -{ - GtkWidget *widget = wnd->GetHandle(); - GtkStyle *style_notebook = gtk_widget_get_style(wxGTKPrivate::GetNotebookWidget()); - - wxRect const &window_rect = wnd->GetRect(); - - int focus_width = 0; - - gtk_widget_style_get(wxGTKPrivate::GetNotebookWidget(), - "focus-line-width", &focus_width, - NULL); - - int tab_pos; - if (m_flags &wxAUI_NB_BOTTOM) - tab_pos = wxAUI_NB_BOTTOM; - else //if (m_flags & wxAUI_NB_TOP) {} - tab_pos = wxAUI_NB_TOP; - - // TODO: else if (m_flags &wxAUI_NB_LEFT) {} - // TODO: else if (m_flags &wxAUI_NB_RIGHT) {} - - // figure out the size of the tab - wxSize tab_size = GetTabSize(dc, wnd, page.caption, page.bitmap, - page.active, close_button_state, x_extent); - - wxRect tab_rect = in_rect; - tab_rect.width = tab_size.x; - tab_rect.height = tab_size.y; - tab_rect.y += 2 * GTK_NOTEBOOK (wxGTKPrivate::GetNotebookWidget())->tab_hborder; - - if (page.active) - tab_rect.height += 2 * GTK_NOTEBOOK (wxGTKPrivate::GetNotebookWidget())->tab_hborder; - - int gap_rect_height = 10 * GTK_NOTEBOOK (wxGTKPrivate::GetNotebookWidget())->tab_hborder; - int gap_rect_x = 1, gap_start = 0, gap_width = 0; - int gap_rect_y = tab_rect.y - gap_rect_height; - int gap_rect_width = window_rect.width; - - switch (tab_pos) - { - case wxAUI_NB_TOP: - tab_rect.y -= 2 * GTK_NOTEBOOK (wxGTKPrivate::GetNotebookWidget())->tab_hborder; - if (!page.active) - tab_rect.y += 2 * GTK_NOTEBOOK (wxGTKPrivate::GetNotebookWidget())->tab_hborder; - gap_rect_y = tab_rect.y + tab_rect.height - GTK_NOTEBOOK (wxGTKPrivate::GetNotebookWidget())->tab_hborder / 2; - // fall through - case wxAUI_NB_BOTTOM: - gap_start = tab_rect.x - GTK_NOTEBOOK (wxGTKPrivate::GetNotebookWidget())->tab_vborder / 2; - gap_width = tab_rect.width; - break; - // TODO: case wxAUI_NB_LEFT: break; - // TODO: case wxAUI_NB_RIGHT: break; - } - tab_rect.y += GTK_NOTEBOOK (wxGTKPrivate::GetNotebookWidget())->tab_hborder / 2; - gap_rect_y += GTK_NOTEBOOK (wxGTKPrivate::GetNotebookWidget())->tab_hborder / 2; - - int padding = focus_width + GTK_NOTEBOOK (wxGTKPrivate::GetNotebookWidget())->tab_hborder; - - int clip_width = tab_rect.width; - if (tab_rect.x + tab_rect.width > in_rect.x + in_rect.width) - clip_width = (in_rect.x + in_rect.width) - tab_rect.x; - - dc.SetClippingRegion(tab_rect.x, tab_rect.y - GTK_NOTEBOOK (wxGTKPrivate::GetNotebookWidget())->tab_vborder, clip_width, tab_rect.height + GTK_NOTEBOOK (wxGTKPrivate::GetNotebookWidget())->tab_vborder); - - GdkRectangle area; - area.x = tab_rect.x - GTK_NOTEBOOK (wxGTKPrivate::GetNotebookWidget())->tab_vborder; - area.y = tab_rect.y - 2 * GTK_NOTEBOOK (wxGTKPrivate::GetNotebookWidget())->tab_hborder; - area.width = clip_width + GTK_NOTEBOOK (wxGTKPrivate::GetNotebookWidget())->tab_vborder; - area.height = tab_rect.height + 2 * GTK_NOTEBOOK (wxGTKPrivate::GetNotebookWidget())->tab_hborder; - - wxGTKDCImpl *impldc = (wxGTKDCImpl*) dc.GetImpl(); - GdkWindow* window = impldc->GetGDKWindow(); - - // Before drawing the active tab itself, draw a box without border, because some themes - // have transparent gaps and a line would be visible at the bottom of the tab - if (page.active) - gtk_paint_box(style_notebook, window, GTK_STATE_NORMAL, GTK_SHADOW_NONE, - NULL, widget, - const_cast("notebook"), - gap_rect_x, gap_rect_y, - gap_rect_width, gap_rect_height); - - if (tab_pos == wxAUI_NB_BOTTOM) - { - if (page.active) - { - gtk_paint_box_gap(style_notebook, window, GTK_STATE_NORMAL, GTK_SHADOW_OUT, - NULL, widget, - const_cast("notebook"), - gap_rect_x, gap_rect_y, - gap_rect_width, gap_rect_height, - GTK_POS_BOTTOM, gap_start , gap_width); - } - gtk_paint_extension(style_notebook, window, - page.active ? GTK_STATE_NORMAL : GTK_STATE_ACTIVE, GTK_SHADOW_OUT, - &area, widget, - const_cast("tab"), - tab_rect.x, tab_rect.y, - tab_rect.width, tab_rect.height, - GTK_POS_TOP); - } - else - { - if (page.active) - { - gtk_paint_box_gap(style_notebook, window, GTK_STATE_NORMAL, GTK_SHADOW_OUT, - NULL, widget, - const_cast("notebook"), - gap_rect_x, gap_rect_y, - gap_rect_width, gap_rect_height, - GTK_POS_TOP, gap_start , gap_width); - } - gtk_paint_extension(style_notebook, window, - page.active ? GTK_STATE_NORMAL : GTK_STATE_ACTIVE, GTK_SHADOW_OUT, - &area, widget, - const_cast("tab"), - tab_rect.x, tab_rect.y, - tab_rect.width, tab_rect.height, - GTK_POS_BOTTOM); - } - - // After drawing the inactive tab itself, draw a box with the same dimensions as the gap-box, - // otherwise we don't get a gap-box, if the active tab is invisible - if (!page.active) - gtk_paint_box(style_notebook, window, GTK_STATE_NORMAL, GTK_SHADOW_OUT, - NULL, widget, - const_cast("notebook"), - gap_rect_x, gap_rect_y, - gap_rect_width, gap_rect_height); - - wxCoord textX = tab_rect.x + padding + style_notebook->xthickness; - - int bitmap_offset = 0; - if (page.bitmap.IsOk()) - { - bitmap_offset = textX; - - // draw bitmap - int bitmapY = tab_rect.y +(tab_rect.height - page.bitmap.GetHeight()) / 2; - if(!page.active) - { - if (tab_pos == wxAUI_NB_TOP) - bitmapY += style_notebook->ythickness / 2; - else - bitmapY -= style_notebook->ythickness / 2; - } - dc.DrawBitmap(page.bitmap, - bitmap_offset, - bitmapY, - true); - - textX += page.bitmap.GetWidth() + padding; - } - - wxCoord textW, textH, textY; - - dc.SetFont(m_normalFont); - dc.GetTextExtent(page.caption, &textW, &textH); - textY = tab_rect.y + (tab_rect.height - textH) / 2; - if(!page.active) - { - if (tab_pos == wxAUI_NB_TOP) - textY += style_notebook->ythickness / 2; - else - textY -= style_notebook->ythickness / 2; - } - - // draw tab text - GdkColor text_colour = page.active ? style_notebook->fg[GTK_STATE_NORMAL] : style_notebook->fg[GTK_STATE_ACTIVE]; - dc.SetTextForeground(wxColor(text_colour)); - GdkRectangle focus_area; - - int padding_focus = padding - focus_width; - focus_area.x = tab_rect.x + padding_focus; - focus_area.y = textY - focus_width; - focus_area.width = tab_rect.width - 2 * padding_focus; - focus_area.height = textH + 2 * focus_width; - - if(page.active && (wnd->FindFocus() == wnd) && focus_area.x <= (area.x + area.width)) - { - // clipping seems not to work here, so we we have to recalc the focus-area manually - if((focus_area.x + focus_area.width) > (area.x + area.width)) - focus_area.width = area.x + area.width - focus_area.x + focus_width - GTK_NOTEBOOK (wxGTKPrivate::GetNotebookWidget())->tab_vborder; - gtk_paint_focus (style_notebook, window, - GTK_STATE_ACTIVE, NULL, widget, "tab", - focus_area.x, focus_area.y, focus_area.width, focus_area.height); - } - - dc.DrawText(page.caption, textX, textY); - - // draw close-button on tab (if enabled) - if (close_button_state != wxAUI_BUTTON_STATE_HIDDEN) - { - wxRect rect(tab_rect.x, tab_rect.y, tab_rect.width - style_notebook->xthickness, tab_rect.height); - if(!page.active) - { - if (tab_pos == wxAUI_NB_TOP) - rect.y += style_notebook->ythickness / 2; - else - rect.y -= style_notebook->ythickness / 2; - } - *out_button_rect = DrawCloseButton(dc, widget, close_button_state, rect, wxRIGHT, &area); - } - - if ( clip_width < tab_rect.width ) - tab_rect.width = clip_width; - *out_tab_rect = tab_rect; - - dc.DestroyClippingRegion(); -} - -wxRect DrawSimpleArrow(wxDC& dc, - GtkWidget *widget, - int button_state, - wxRect const &in_rect, - int orientation, - GtkArrowType arrow_type) -{ - int scroll_arrow_hlength, scroll_arrow_vlength; - gtk_widget_style_get(widget, - "scroll-arrow-hlength", &scroll_arrow_hlength, - "scroll-arrow-vlength", &scroll_arrow_vlength, - NULL); - - GtkStateType state; - GtkShadowType shadow; - ButtonStateAndShadow(button_state, state, shadow); - - wxRect out_rect; - - if (orientation == wxLEFT) - out_rect.x = in_rect.x; - else - out_rect.x = in_rect.x + in_rect.width - scroll_arrow_hlength; - out_rect.y = (in_rect.y + in_rect.height - 3 * gtk_widget_get_style(wxGTKPrivate::GetNotebookWidget())->ythickness - scroll_arrow_vlength) / 2; - out_rect.width = scroll_arrow_hlength; - out_rect.height = scroll_arrow_vlength; - - wxGTKDCImpl *impldc = (wxGTKDCImpl*) dc.GetImpl(); - GdkWindow* window = impldc->GetGDKWindow(); - gtk_paint_arrow (gtk_widget_get_style(wxGTKPrivate::GetButtonWidget()), window, state, shadow, NULL, widget, "notebook", - arrow_type, TRUE, out_rect.x, out_rect.y, out_rect.width, out_rect.height); - - return out_rect; -} - -void wxAuiGtkTabArt::DrawButton(wxDC& dc, wxWindow* wnd, - const wxRect& in_rect, - int bitmap_id, - int button_state, - int orientation, - wxRect* out_rect) -{ - GtkWidget *widget = wnd->GetHandle(); - wxRect rect = in_rect; - if (m_flags &wxAUI_NB_BOTTOM) - rect.y += 2 * gtk_widget_get_style(wxGTKPrivate::GetButtonWidget())->ythickness; - - switch (bitmap_id) - { - case wxAUI_BUTTON_CLOSE: - rect.y -= 2 * gtk_widget_get_style(wxGTKPrivate::GetButtonWidget())->ythickness; - rect = DrawCloseButton(dc, widget, button_state, rect, orientation, NULL); - break; - - case wxAUI_BUTTON_LEFT: - rect = DrawSimpleArrow(dc, widget, button_state, rect, orientation, GTK_ARROW_LEFT); - break; - - case wxAUI_BUTTON_RIGHT: - rect = DrawSimpleArrow(dc, widget, button_state, rect, orientation, GTK_ARROW_RIGHT); - break; - - case wxAUI_BUTTON_WINDOWLIST: - { - rect.height -= 4 * gtk_widget_get_style(wxGTKPrivate::GetButtonWidget())->ythickness; - rect.width = rect.height; - rect.x = in_rect.x + in_rect.width - rect.width; - - if (button_state == wxAUI_BUTTON_STATE_HOVER) - wxRendererNative::Get().DrawComboBoxDropButton(wnd, dc, rect, wxCONTROL_CURRENT); - else if (button_state == wxAUI_BUTTON_STATE_PRESSED) - wxRendererNative::Get().DrawComboBoxDropButton(wnd, dc, rect, wxCONTROL_PRESSED); - else - wxRendererNative::Get().DrawDropArrow(wnd, dc, rect); - } - break; - } - - *out_rect = rect; -} - - -int wxAuiGtkTabArt::GetBestTabCtrlSize(wxWindow* wnd, - const wxAuiNotebookPageArray& pages, - const wxSize& required_bmp_size) -{ - SetMeasuringFont(m_normalFont); - SetSelectedFont(m_normalFont); - int tab_height = 3 * gtk_widget_get_style(wxGTKPrivate::GetNotebookWidget())->ythickness + wxAuiGenericTabArt::GetBestTabCtrlSize(wnd, pages, required_bmp_size); - return tab_height; -} - -int wxAuiGtkTabArt::GetBorderWidth(wxWindow* wnd) -{ - return wxAuiGenericTabArt::GetBorderWidth(wnd) + wxMax(GTK_NOTEBOOK (wxGTKPrivate::GetNotebookWidget())->tab_hborder, - GTK_NOTEBOOK (wxGTKPrivate::GetNotebookWidget())->tab_vborder); -} - -int wxAuiGtkTabArt::GetAdditionalBorderSpace(wxWindow* wnd) -{ - return 2 * GetBorderWidth(wnd); -} - -wxSize wxAuiGtkTabArt::GetTabSize(wxDC& dc, - wxWindow* wnd, - const wxString& caption, - const wxBitmap& bitmap, - bool active, - int close_button_state, - int* x_extent) -{ - wxSize s = wxAuiGenericTabArt::GetTabSize(dc, wnd, caption, bitmap, active, close_button_state, x_extent); - - int overlap = 0; - gtk_widget_style_get (wnd->GetHandle(), - "focus-line-width", &overlap, - NULL); - *x_extent -= overlap; - return s; -} -#endif // wxUSE_AUI diff --git a/Externals/wxWidgets3/src/aui/tabartmsw.cpp b/Externals/wxWidgets3/src/aui/tabartmsw.cpp deleted file mode 100644 index 17f894a163..0000000000 --- a/Externals/wxWidgets3/src/aui/tabartmsw.cpp +++ /dev/null @@ -1,501 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/aui/tabartmsw.h -// Purpose: wxAuiMSWTabArt declaration -// Author: Tobias Taschner -// Created: 2015-09-26 -// Copyright: (c) 2015 wxWidgets development team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ -#pragma hdrstop -#endif - -#ifndef WX_PRECOMP - #include "wx/dc.h" -#endif - -#include "wx/aui/tabart.h" -#include "wx/aui/auibook.h" -#include "wx/msw/uxtheme.h" -#include "wx/msw/private.h" -#include "wx/renderer.h" - -#if wxUSE_AUI - -#ifndef CP_DROPDOWNBUTTON - - #define TABP_TABITEM 1 - #define TABP_TABITEMLEFTEDGE 2 - #define TABP_TABITEMRIGHTEDGE 3 - #define TABP_TABITEMBOTHEDGE 4 - #define TABP_TOPTABITEM 5 - #define TABP_TOPTABITEMLEFTEDGE 6 - #define TABP_TOPTABITEMRIGHTEDGE 7 - #define TABP_TOPTABITEMBOTHEDGE 8 - #define TABP_PANE 9 - #define TABP_BODY 10 - #define TABP_AEROWIZARDBODY 11 - - #define TIS_NORMAL 1 - #define TIS_HOT 2 - #define TIS_SELECTED 3 - #define TIS_DISABLED 4 - #define TIS_FOCUSED 5 - - #define TTP_CLOSE 5 - - #define TTCS_NORMAL 1 - #define TTCS_HOT 2 - #define TTCS_PRESSED 3 - - #define SPNP_UPHORZ 3 - #define SPNP_DOWNHORZ 4 - - #define CP_DROPDOWNBUTTON1 1 - - #define WP_CLOSEBUTTON 18 -#endif - -wxAuiMSWTabArt::wxAuiMSWTabArt() -{ - m_closeBtnSize = wxDefaultSize; - m_maxTabHeight = 0; - - wxUxThemeEngine* te = wxUxThemeEngine::GetIfActive(); - if ( te && te->IsAppThemed() ) - { - m_themed = true; - } - else - m_themed = false; -} - -wxAuiMSWTabArt::~wxAuiMSWTabArt() -{ -} - -wxAuiTabArt* wxAuiMSWTabArt::Clone() -{ - return new wxAuiMSWTabArt(*this); -} - -void wxAuiMSWTabArt::SetSizingInfo(const wxSize& tab_ctrl_size, - size_t tab_count) -{ - wxAuiGenericTabArt::SetSizingInfo(tab_ctrl_size, tab_count); -} - - -void wxAuiMSWTabArt::DrawBorder(wxDC& dc, wxWindow* wnd, const wxRect& rect) -{ - if ( !IsThemed() ) - { - wxAuiGenericTabArt::DrawBorder(dc, wnd, rect); - return; - } - - wxRect drawRect(rect); - - drawRect.y += m_maxTabHeight + wnd->FromDIP(1); - drawRect.height -= m_maxTabHeight; - - // Mask border not covered by native theme - wxRect topDrawRect(rect); - topDrawRect.height = drawRect.height; - dc.SetPen(wxPen(wnd->GetBackgroundColour(), GetBorderWidth(wnd))); - dc.DrawRectangle(topDrawRect); - - RECT r; - wxCopyRectToRECT(drawRect, r); - - wxUxThemeHandle hTheme(wnd, L"TAB"); - - wxUxThemeEngine::Get()->DrawThemeBackground( - hTheme, - GetHdcOf(dc.GetTempHDC()), - TABP_PANE, - 0, - &r, - NULL); -} - -void wxAuiMSWTabArt::DrawBackground(wxDC& dc, - wxWindow* wnd, - const wxRect& rect) -{ - if ( !IsThemed() ) - { - wxAuiGenericTabArt::DrawBackground(dc, wnd, rect); - return; - } - - int borderHeight = 2; - - wxRect drawRect = rect; - drawRect.height -= borderHeight; - - // Draw background - dc.SetBrush(wxBrush(wnd->GetBackgroundColour())); - dc.SetPen(*wxTRANSPARENT_PEN); - dc.DrawRectangle(drawRect); - - // Draw top border - drawRect.y = drawRect.height; - drawRect.height = borderHeight + 2; - - drawRect.Inflate(1, 0); - - RECT r; - wxCopyRectToRECT(drawRect, r); - - wxUxThemeHandle hTheme(wnd, L"TAB"); - - wxUxThemeEngine::Get()->DrawThemeBackground( - hTheme, - GetHdcOf(dc.GetTempHDC()), - TABP_PANE, - 0, - &r, - NULL); -} - -void wxAuiMSWTabArt::DrawTab(wxDC& dc, - wxWindow* wnd, - const wxAuiNotebookPage& page, - const wxRect& in_rect, - int close_button_state, - wxRect* out_tab_rect, - wxRect* out_button_rect, - int* x_extent) -{ - if ( !IsThemed() ) - { - wxAuiGenericTabArt::DrawTab(dc, wnd, page, in_rect, close_button_state, out_tab_rect, out_button_rect, x_extent); - return; - } - - if ( !m_closeBtnSize.IsFullySpecified() ) - InitSizes(wnd, dc); - - // figure out the size of the tab - wxSize tabSize = GetTabSize(dc, - wnd, - page.caption, - page.bitmap, - page.active, - close_button_state, - x_extent); - - wxCoord tabHeight = tabSize.y; - wxCoord tabWidth = tabSize.x; - wxCoord tabX = in_rect.x; - wxCoord tabY = 0; - - if (!page.active) - { - tabY += wnd->FromDIP(2); - tabHeight -= wnd->FromDIP(2); - } - else - { - tabX -= wnd->FromDIP(2); - tabWidth += wnd->FromDIP(4); - tabHeight += 2; - } - - int clipWidth = tabWidth; - if ( tabX + clipWidth > in_rect.x + in_rect.width ) - clipWidth = (in_rect.x + in_rect.width) - tabX; - dc.SetClippingRegion(tabX - wnd->FromDIP(2), tabY, clipWidth + wnd->FromDIP(4), tabHeight); - - - // draw tab - wxRect tabRect(tabX, tabY, tabWidth, tabHeight); - - int tabState; - if ( page.active ) - tabState = TIS_SELECTED; - else if ( page.hover ) - tabState = TIS_HOT; - else - tabState = TIS_NORMAL; - - wxUxThemeEngine* te = wxUxThemeEngine::Get(); - - wxUxThemeHandle hTabTheme(wnd, L"Tab"); - RECT tabR; - wxCopyRectToRECT(tabRect, tabR); - te->DrawThemeBackground(hTabTheme, GetHdcOf(dc.GetTempHDC()), TABP_TABITEM, - tabState, - &tabR, NULL); - - wxRect textRect = tabRect; - if ( !page.active ) - textRect.Offset(0, wnd->FromDIP(1)); - if ( close_button_state != wxAUI_BUTTON_STATE_HIDDEN ) - textRect.width -= m_closeBtnSize.x + wnd->FromDIP(3); - - dc.SetFont(wnd->GetFont()); - dc.DrawLabel(page.caption, page.bitmap, textRect, wxALIGN_CENTRE); - - // draw focus rectangle - if ( page.active && (wnd->FindFocus() == wnd) ) - { - wxRect focusRect = tabRect; - focusRect.Deflate(wnd->FromDIP(2)); - - wxRendererNative::Get().DrawFocusRect(wnd, dc, focusRect, 0); - } - - // draw close button - if ( close_button_state != wxAUI_BUTTON_STATE_HIDDEN ) - { - wxUxThemeHandle hToolTipTheme(wnd, L"TOOLTIP"); - - int btnState; - if ( close_button_state == wxAUI_BUTTON_STATE_HOVER ) - btnState = TTCS_HOT; - else if ( close_button_state == wxAUI_BUTTON_STATE_PRESSED ) - btnState = TTCS_PRESSED; - else - btnState = TTCS_NORMAL; - - int offsetY = tabY; - if ( wxGetWinVersion() < wxWinVersion_Vista ) - offsetY++; // WinXP theme needs a little more padding - - wxRect rect(tabX + tabWidth - m_closeBtnSize.x - wnd->FromDIP(4), - offsetY + (tabHeight / 2) - (m_closeBtnSize.y / 2), - m_closeBtnSize.x, - m_closeBtnSize.y); - - RECT btnR; - wxCopyRectToRECT(rect, btnR); - te->DrawThemeBackground(hToolTipTheme, GetHdcOf(dc.GetTempHDC()), TTP_CLOSE, btnState, &btnR, NULL); - - if ( out_button_rect ) - *out_button_rect = rect; - } - - *out_tab_rect = wxRect(tabX, tabY, tabWidth, tabHeight); - - dc.DestroyClippingRegion(); -} - -int wxAuiMSWTabArt::GetIndentSize() -{ - if ( IsThemed() ) - return 3; // This should be 1 but we can't draw into the border from DrawTab - else - return wxAuiGenericTabArt::GetIndentSize(); -} - -int wxAuiMSWTabArt::GetBorderWidth(wxWindow* wnd) -{ - return wxAuiGenericTabArt::GetBorderWidth(wnd); -} - -int wxAuiMSWTabArt::GetAdditionalBorderSpace(wxWindow* wnd) -{ - if ( IsThemed() ) - { - return 4; - } - else - return wxAuiGenericTabArt::GetAdditionalBorderSpace(wnd); -} - -wxSize wxAuiMSWTabArt::GetTabSize(wxDC& dc, - wxWindow* wnd, - const wxString& caption, - const wxBitmap& bitmap, - bool active, - int close_button_state, - int* x_extent) -{ - if ( !IsThemed() ) - return wxAuiGenericTabArt::GetTabSize(dc, wnd, caption, bitmap, active, close_button_state, x_extent); - - if ( !m_closeBtnSize.IsFullySpecified() ) - InitSizes(wnd, dc); - - wxCoord textWidth, textHeight, tmp; - - dc.SetFont(wnd->GetFont()); - dc.GetTextExtent(caption, &textWidth, &tmp); - dc.GetTextExtent("ABCDEFXj", &tmp, &textHeight); - - wxCoord tabWidth = wxMax(m_tabSize.x, textWidth); - wxCoord tabHeight = wxMax(m_tabSize.y, textHeight); - - // if the close button is showing, add space for it - if ( close_button_state != wxAUI_BUTTON_STATE_HIDDEN ) - { - tabWidth += m_closeBtnSize.x; - tabHeight = wxMax(tabHeight, m_closeBtnSize.y); - } - - // if there's a bitmap, add space for it - if ( bitmap.IsOk() ) - { - tabWidth += bitmap.GetWidth() + wnd->FromDIP(3); // bitmap padding - tabHeight = wxMax(tabHeight, bitmap.GetHeight() + wnd->FromDIP(2)); - } - - // add padding - tabWidth += wnd->FromDIP(12); - tabHeight += wnd->FromDIP(3); - - if ( m_flags & wxAUI_NB_TAB_FIXED_WIDTH ) - { - tabWidth = m_fixedTabWidth; - } - else - { - int minTabWidth = wnd->FromDIP(46); - if (tabWidth < minTabWidth) - tabWidth = minTabWidth; - } - - *x_extent = tabWidth; - - if (tabHeight > m_maxTabHeight) - m_maxTabHeight = tabHeight; - - return wxSize(tabWidth, tabHeight); -} - - -void wxAuiMSWTabArt::DrawButton(wxDC& dc, - wxWindow* wnd, - const wxRect& in_rect, - int bitmap_id, - int button_state, - int orientation, - wxRect* out_rect) -{ - if ( !IsThemed() ) - { - wxAuiGenericTabArt::DrawButton(dc, wnd, in_rect, bitmap_id, button_state, orientation, out_rect); - return; - } - - wxUxThemeEngine* te = wxUxThemeEngine::Get(); - - const wchar_t* themeId = NULL; - int part = 0; - - switch (bitmap_id) - { - case wxAUI_BUTTON_CLOSE: - themeId = L"Window"; - part = WP_CLOSEBUTTON; - break; - case wxAUI_BUTTON_LEFT: - themeId = L"Spin"; - part = SPNP_DOWNHORZ; - break; - case wxAUI_BUTTON_RIGHT: - themeId = L"Spin"; - part = SPNP_UPHORZ; - break; - case wxAUI_BUTTON_WINDOWLIST: - themeId = L"Combobox"; - part = CP_DROPDOWNBUTTON1; - break; - } - - wxRect rect = in_rect; - - if ( orientation == wxLEFT ) - { - rect.SetX(in_rect.x); - rect.SetY(((in_rect.y + in_rect.height) / 2) - (m_closeBtnSize.GetHeight() / 2)); - rect.SetWidth(m_closeBtnSize.GetWidth()); - rect.SetHeight(m_closeBtnSize.GetHeight()); - } - else - { - rect = wxRect(in_rect.x + in_rect.width - m_closeBtnSize.GetWidth(), - ((in_rect.y + in_rect.height) / 2) - (m_closeBtnSize.GetHeight() / 2), - m_closeBtnSize.GetWidth(), m_closeBtnSize.GetHeight()); - } - - if ( bitmap_id == wxAUI_BUTTON_LEFT || - bitmap_id == wxAUI_BUTTON_RIGHT ) - { - rect.y = in_rect.y; - rect.height = in_rect.height - 7; - } - - dc.SetPen(*wxTRANSPARENT_PEN); - dc.SetBrush(wxBrush(m_baseColour)); - dc.DrawRectangle(rect); - - int btnState; - if ( button_state == wxAUI_BUTTON_STATE_DISABLED ) - btnState = TTCS_PRESSED + 1; - else if ( button_state == wxAUI_BUTTON_STATE_HOVER ) - btnState = TTCS_HOT; - else if ( button_state == wxAUI_BUTTON_STATE_PRESSED ) - btnState = TTCS_PRESSED; - else - btnState = TTCS_NORMAL; - - wxUxThemeHandle hTheme(wnd, themeId); - - wxRect btnRect(rect); - btnRect.width -= wnd->FromDIP(1); - - RECT btnR; - wxCopyRectToRECT(btnRect, btnR); - te->DrawThemeBackground(hTheme, GetHdcOf(dc.GetTempHDC()), part, btnState, &btnR, NULL); - - if ( out_rect ) - *out_rect = rect; -} - -int wxAuiMSWTabArt::ShowDropDown(wxWindow* wnd, - const wxAuiNotebookPageArray& pages, - int active_idx) -{ - return wxAuiGenericTabArt::ShowDropDown(wnd, pages, active_idx); -} - -int wxAuiMSWTabArt::GetBestTabCtrlSize(wxWindow* wnd, - const wxAuiNotebookPageArray& pages, - const wxSize& requiredBmp_size) -{ - return wxAuiGenericTabArt::GetBestTabCtrlSize(wnd, pages, requiredBmp_size); -} - -void wxAuiMSWTabArt::InitSizes(wxWindow* wnd, wxDC& dc) -{ - wxUxThemeEngine* te = wxUxThemeEngine::Get(); - SIZE uxSize; - - // Borrow close button from tooltip (best fit on various backgrounds) - wxUxThemeHandle hTooltipTheme(wnd, L"Tooltip"); - - te->GetThemePartSize(hTooltipTheme, GetHdcOf(dc.GetTempHDC()), - TTP_CLOSE, 0, NULL, TS_TRUE, &uxSize); - m_closeBtnSize.Set(uxSize.cx, uxSize.cy); - - wxUxThemeHandle hTabTheme(wnd, L"Tab"); - te->GetThemePartSize(hTabTheme, GetHdcOf(dc.GetTempHDC()), - TABP_TABITEM, 0, NULL, TS_TRUE, &uxSize); - m_tabSize.Set(uxSize.cx, uxSize.cy); -} - -bool wxAuiMSWTabArt::IsThemed() const -{ - return - m_themed && - !(m_flags & wxAUI_NB_BOTTOM); // Native theme does not support bottom tabs -} - - -#endif // wxUSE_AUI diff --git a/Externals/wxWidgets3/src/aui/tabmdi.cpp b/Externals/wxWidgets3/src/aui/tabmdi.cpp deleted file mode 100644 index 4d619c2a3f..0000000000 --- a/Externals/wxWidgets3/src/aui/tabmdi.cpp +++ /dev/null @@ -1,903 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/aui/tabmdi.cpp -// Purpose: Generic MDI (Multiple Document Interface) classes -// Author: Hans Van Leemputten -// Modified by: Benjamin I. Williams / Kirix Corporation -// Created: 29/07/2002 -// Copyright: (c) Hans Van Leemputten -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// =========================================================================== -// declarations -// =========================================================================== - -// --------------------------------------------------------------------------- -// headers -// --------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_AUI -#if wxUSE_MDI - -#include "wx/aui/tabmdi.h" - -#ifndef WX_PRECOMP - #include "wx/panel.h" - #include "wx/menu.h" - #include "wx/intl.h" - #include "wx/log.h" - #include "wx/settings.h" -#endif //WX_PRECOMP - -#include "wx/stockitem.h" -#include "wx/aui/dockart.h" - -enum MDI_MENU_ID -{ - wxWINDOWCLOSE = 4001, - wxWINDOWCLOSEALL, - wxWINDOWNEXT, - wxWINDOWPREV -}; - -//----------------------------------------------------------------------------- -// wxAuiMDIParentFrame -//----------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxAuiMDIParentFrame, wxFrame); - -wxBEGIN_EVENT_TABLE(wxAuiMDIParentFrame, wxFrame) -#if wxUSE_MENUS - EVT_MENU (wxID_ANY, wxAuiMDIParentFrame::DoHandleMenu) - EVT_UPDATE_UI (wxID_ANY, wxAuiMDIParentFrame::DoHandleUpdateUI) -#endif -wxEND_EVENT_TABLE() - -wxAuiMDIParentFrame::wxAuiMDIParentFrame() -{ - Init(); -} - -wxAuiMDIParentFrame::wxAuiMDIParentFrame(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) -{ - Init(); - (void)Create(parent, id, title, pos, size, style, name); -} - -wxAuiMDIParentFrame::~wxAuiMDIParentFrame() -{ - // Avoid having GetActiveChild() called after m_pClientWindow is destroyed - SendDestroyEvent(); - // Make sure the client window is destructed before the menu bars are! - wxDELETE(m_pClientWindow); - -#if wxUSE_MENUS - wxDELETE(m_pMyMenuBar); - RemoveWindowMenu(GetMenuBar()); - wxDELETE(m_pWindowMenu); -#endif // wxUSE_MENUS -} - -bool wxAuiMDIParentFrame::Create(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) -{ -#if wxUSE_MENUS - // this style can be used to prevent a window from having the standard MDI - // "Window" menu - if (!(style & wxFRAME_NO_WINDOW_MENU)) - { - m_pWindowMenu = new wxMenu; - m_pWindowMenu->Append(wxWINDOWCLOSE, _("Cl&ose")); - m_pWindowMenu->Append(wxWINDOWCLOSEALL, _("Close All")); - m_pWindowMenu->AppendSeparator(); - m_pWindowMenu->Append(wxWINDOWNEXT, _("&Next")); - m_pWindowMenu->Append(wxWINDOWPREV, _("&Previous")); - } -#endif // wxUSE_MENUS - - if ( !wxFrame::Create(parent, id, title, pos, size, style, name) ) - return false; - - m_pClientWindow = OnCreateClient(); - return m_pClientWindow != NULL; -} - - -void wxAuiMDIParentFrame::SetArtProvider(wxAuiTabArt* provider) -{ - if (m_pClientWindow) - { - m_pClientWindow->SetArtProvider(provider); - } -} - -wxAuiTabArt* wxAuiMDIParentFrame::GetArtProvider() -{ - if (!m_pClientWindow) - return NULL; - - return m_pClientWindow->GetArtProvider(); -} - -wxAuiNotebook* wxAuiMDIParentFrame::GetNotebook() const -{ - return static_cast(m_pClientWindow); -} - - - -#if wxUSE_MENUS -void wxAuiMDIParentFrame::SetWindowMenu(wxMenu* pMenu) -{ - // Replace the window menu from the currently loaded menu bar. - wxMenuBar *pMenuBar = GetMenuBar(); - - if (m_pWindowMenu) - { - RemoveWindowMenu(pMenuBar); - wxDELETE(m_pWindowMenu); - } - - if (pMenu) - { - m_pWindowMenu = pMenu; - AddWindowMenu(pMenuBar); - } -} - -void wxAuiMDIParentFrame::SetMenuBar(wxMenuBar* pMenuBar) -{ - // Remove the Window menu from the old menu bar - RemoveWindowMenu(GetMenuBar()); - - // Add the Window menu to the new menu bar. - AddWindowMenu(pMenuBar); - - wxFrame::SetMenuBar(pMenuBar); - //m_pMyMenuBar = GetMenuBar(); -} -#endif // wxUSE_MENUS - -void wxAuiMDIParentFrame::SetChildMenuBar(wxAuiMDIChildFrame* pChild) -{ -#if wxUSE_MENUS - if (!pChild) - { - // No Child, set Our menu bar back. - if (m_pMyMenuBar) - SetMenuBar(m_pMyMenuBar); - else - SetMenuBar(GetMenuBar()); - - // Make sure we know our menu bar is in use - m_pMyMenuBar = NULL; - } - else - { - if (pChild->GetMenuBar() == NULL) - return; - - // Do we need to save the current bar? - if (m_pMyMenuBar == NULL) - m_pMyMenuBar = GetMenuBar(); - - SetMenuBar(pChild->GetMenuBar()); - } -#endif // wxUSE_MENUS -} - -bool wxAuiMDIParentFrame::ProcessEvent(wxEvent& event) -{ - // stops the same event being processed repeatedly - if (m_pLastEvt == &event) - return false; - m_pLastEvt = &event; - - // let the active child (if any) process the event first. - bool res = false; - wxAuiMDIChildFrame* pActiveChild = GetActiveChild(); - if (pActiveChild && - event.IsCommandEvent() && - event.GetEventObject() != m_pClientWindow && - !(event.GetEventType() == wxEVT_ACTIVATE || - event.GetEventType() == wxEVT_SET_FOCUS || - event.GetEventType() == wxEVT_KILL_FOCUS || - event.GetEventType() == wxEVT_CHILD_FOCUS || - event.GetEventType() == wxEVT_COMMAND_SET_FOCUS || - event.GetEventType() == wxEVT_COMMAND_KILL_FOCUS ) - ) - { - res = pActiveChild->GetEventHandler()->ProcessEvent(event); - } - - if (!res) - { - // if the event was not handled this frame will handle it, - // which is why we need the protection code at the beginning - // of this method - res = wxEvtHandler::ProcessEvent(event); - } - - m_pLastEvt = NULL; - - return res; -} - -wxAuiMDIChildFrame *wxAuiMDIParentFrame::GetActiveChild() const -{ - // We can be called before the client window is created, so check for its - // existence. - wxAuiMDIClientWindow* const client = GetClientWindow(); - return client ? client->GetActiveChild() : NULL; -} - -void wxAuiMDIParentFrame::SetActiveChild(wxAuiMDIChildFrame* pChildFrame) -{ - wxAuiMDIClientWindow* const client = GetClientWindow(); - if (client && client->GetActiveChild() != pChildFrame) - { - client->SetActiveChild(pChildFrame); - } -} - -wxAuiMDIClientWindow *wxAuiMDIParentFrame::GetClientWindow() const -{ - return m_pClientWindow; -} - -wxAuiMDIClientWindow *wxAuiMDIParentFrame::OnCreateClient() -{ - return new wxAuiMDIClientWindow( this ); -} - -void wxAuiMDIParentFrame::ActivateNext() -{ - if (m_pClientWindow && m_pClientWindow->GetSelection() != wxNOT_FOUND) - { - size_t active = m_pClientWindow->GetSelection() + 1; - if (active >= m_pClientWindow->GetPageCount()) - active = 0; - - m_pClientWindow->SetSelection(active); - } -} - -void wxAuiMDIParentFrame::ActivatePrevious() -{ - if (m_pClientWindow && m_pClientWindow->GetSelection() != wxNOT_FOUND) - { - int active = m_pClientWindow->GetSelection() - 1; - if (active < 0) - active = m_pClientWindow->GetPageCount() - 1; - - m_pClientWindow->SetSelection(active); - } -} - -void wxAuiMDIParentFrame::Init() -{ - m_pLastEvt = NULL; - m_pClientWindow = NULL; -#if wxUSE_MENUS - m_pWindowMenu = NULL; - m_pMyMenuBar = NULL; -#endif // wxUSE_MENUS -} - -#if wxUSE_MENUS -void wxAuiMDIParentFrame::RemoveWindowMenu(wxMenuBar* pMenuBar) -{ - if (pMenuBar && m_pWindowMenu) - { - // Remove old window menu - int pos = pMenuBar->FindMenu(_("&Window")); - if (pos != wxNOT_FOUND) - { - // DBG:: We're going to delete the wrong menu!!! - wxASSERT(m_pWindowMenu == pMenuBar->GetMenu(pos)); - pMenuBar->Remove(pos); - } - } -} - -void wxAuiMDIParentFrame::AddWindowMenu(wxMenuBar *pMenuBar) -{ - if (pMenuBar && m_pWindowMenu) - { - int pos = pMenuBar->FindMenu(wxGetStockLabel(wxID_HELP,wxSTOCK_NOFLAGS)); - if (pos == wxNOT_FOUND) - pMenuBar->Append(m_pWindowMenu, _("&Window")); - else - pMenuBar->Insert(pos, m_pWindowMenu, _("&Window")); - } -} - -void wxAuiMDIParentFrame::DoHandleMenu(wxCommandEvent& event) -{ - switch (event.GetId()) - { - case wxWINDOWCLOSE: - { - wxAuiMDIChildFrame* pActiveChild = GetActiveChild(); - if (pActiveChild) - pActiveChild->Close(); - break; - } - case wxWINDOWCLOSEALL: - { - wxAuiMDIChildFrame* pActiveChild; - while ((pActiveChild = GetActiveChild()) != NULL) - { - if (!pActiveChild->Close()) - { - return; // failure - } - } - break; - } - case wxWINDOWNEXT: - ActivateNext(); - break; - case wxWINDOWPREV: - ActivatePrevious(); - break; - default: - event.Skip(); - } -} - -void wxAuiMDIParentFrame::DoHandleUpdateUI(wxUpdateUIEvent& event) -{ - switch (event.GetId()) - { - case wxWINDOWCLOSE: - case wxWINDOWCLOSEALL: - { - wxAuiMDIClientWindow* client_window = GetClientWindow(); - wxCHECK_RET(client_window, wxS("Missing MDI Client Window")); - size_t pages = client_window->GetPageCount(); - event.Enable(pages >= 1); - break; - } - - case wxWINDOWNEXT: - case wxWINDOWPREV: - { - wxAuiMDIClientWindow* client_window = GetClientWindow(); - wxCHECK_RET(client_window, wxS("Missing MDI Client Window")); - size_t pages = client_window->GetPageCount(); - event.Enable(pages >= 2); - break; - } - - default: - event.Skip(); - } -} -#endif // wxUSE_MENUS - -void wxAuiMDIParentFrame::DoGetClientSize(int* width, int* height) const -{ - wxFrame::DoGetClientSize(width, height); -} - -void wxAuiMDIParentFrame::Tile(wxOrientation orient) -{ - wxAuiMDIClientWindow* client_window = GetClientWindow(); - wxASSERT_MSG(client_window, wxT("Missing MDI Client Window")); - - int cur_idx = client_window->GetSelection(); - if (cur_idx == -1) - return; - - if (orient == wxVERTICAL) - { - client_window->Split(cur_idx, wxLEFT); - } - else if (orient == wxHORIZONTAL) - { - client_window->Split(cur_idx, wxTOP); - } -} - - -//----------------------------------------------------------------------------- -// wxAuiMDIChildFrame -//----------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxAuiMDIChildFrame, wxPanel); - -wxBEGIN_EVENT_TABLE(wxAuiMDIChildFrame, wxPanel) - EVT_MENU_HIGHLIGHT_ALL(wxAuiMDIChildFrame::OnMenuHighlight) - EVT_ACTIVATE(wxAuiMDIChildFrame::OnActivate) - EVT_CLOSE(wxAuiMDIChildFrame::OnCloseWindow) -wxEND_EVENT_TABLE() - -wxAuiMDIChildFrame::wxAuiMDIChildFrame() -{ - Init(); -} - -wxAuiMDIChildFrame::wxAuiMDIChildFrame(wxAuiMDIParentFrame *parent, - wxWindowID id, - const wxString& title, - const wxPoint& WXUNUSED(pos), - const wxSize& size, - long style, - const wxString& name) -{ - Init(); - - // There are two ways to create an tabbed mdi child fram without - // making it the active document. Either Show(false) can be called - // before Create() (as is customary on some ports with wxFrame-type - // windows), or wxMINIMIZE can be passed in the style flags. Note that - // wxAuiMDIChildFrame is not really derived from wxFrame, as wxMDIChildFrame - // is, but those are the expected symantics. No style flag is passed - // onto the panel underneath. - if (style & wxMINIMIZE) - m_activateOnCreate = false; - - Create(parent, id, title, wxDefaultPosition, size, 0, name); -} - -wxAuiMDIChildFrame::~wxAuiMDIChildFrame() -{ - wxAuiMDIParentFrame* pParentFrame = GetMDIParentFrame(); - if (pParentFrame) - { - if (pParentFrame->GetActiveChild() == this) - { - pParentFrame->SetActiveChild(NULL); - pParentFrame->SetChildMenuBar(NULL); - } - wxAuiMDIClientWindow* pClientWindow = pParentFrame->GetClientWindow(); - wxASSERT(pClientWindow); - int idx = pClientWindow->GetPageIndex(this); - if (idx != wxNOT_FOUND) - { - pClientWindow->RemovePage(idx); - } - } - -#if wxUSE_MENUS - wxDELETE(m_pMenuBar); -#endif // wxUSE_MENUS -} - -bool wxAuiMDIChildFrame::Create(wxAuiMDIParentFrame* parent, - wxWindowID id, - const wxString& title, - const wxPoint& WXUNUSED(pos), - const wxSize& size, - long style, - const wxString& name) -{ - wxAuiMDIClientWindow* pClientWindow = parent->GetClientWindow(); - wxASSERT_MSG((pClientWindow != NULL), wxT("Missing MDI client window.")); - - // see comment in constructor - if (style & wxMINIMIZE) - m_activateOnCreate = false; - - wxSize cli_size = pClientWindow->GetClientSize(); - - // create the window off-screen to prevent flicker - wxPanel::Create(pClientWindow, - id, - wxPoint(cli_size.x+1, cli_size.y+1), - size, - wxNO_BORDER, name); - - DoShow(false); - - SetMDIParentFrame(parent); - - m_title = title; - - pClientWindow->AddPage(this, title, m_activateOnCreate); - - // Check that the parent notion of the active child coincides with our one. - // This is less obvious that it seems because we must honour - // m_activateOnCreate flag but only if it's not the first child because - // this one becomes active unconditionally. - wxASSERT_MSG - ( - (m_activateOnCreate || pClientWindow->GetPageCount() == 1) - == (parent->GetActiveChild() == this), - wxS("Logic error: child [not] activated when it should [not] have been.") - ); - - pClientWindow->Refresh(); - - return true; -} - -bool wxAuiMDIChildFrame::Destroy() -{ - wxAuiMDIParentFrame* pParentFrame = GetMDIParentFrame(); - wxASSERT_MSG(pParentFrame, wxT("Missing MDI Parent Frame")); - - wxAuiMDIClientWindow* pClientWindow = pParentFrame->GetClientWindow(); - wxASSERT_MSG(pClientWindow, wxT("Missing MDI Client Window")); - - if (pParentFrame->GetActiveChild() == this) - { - // deactivate ourself - wxActivateEvent event(wxEVT_ACTIVATE, false, GetId()); - event.SetEventObject(this); - GetEventHandler()->ProcessEvent(event); - - pParentFrame->SetChildMenuBar(NULL); - } - - size_t page_count = pClientWindow->GetPageCount(); - for (size_t pos = 0; pos < page_count; pos++) - { - if (pClientWindow->GetPage(pos) == this) - return pClientWindow->DeletePage(pos); - } - - return false; -} - -#if wxUSE_MENUS -void wxAuiMDIChildFrame::SetMenuBar(wxMenuBar *menu_bar) -{ - wxMenuBar *pOldMenuBar = m_pMenuBar; - m_pMenuBar = menu_bar; - - if (m_pMenuBar) - { - wxAuiMDIParentFrame* pParentFrame = GetMDIParentFrame(); - wxASSERT_MSG(pParentFrame, wxT("Missing MDI Parent Frame")); - - m_pMenuBar->SetParent(pParentFrame); - if (pParentFrame->GetActiveChild() == this) - { - // replace current menu bars - if (pOldMenuBar) - pParentFrame->SetChildMenuBar(NULL); - pParentFrame->SetChildMenuBar(this); - } - } -} - -wxMenuBar *wxAuiMDIChildFrame::GetMenuBar() const -{ - return m_pMenuBar; -} -#endif // wxUSE_MENUS - -void wxAuiMDIChildFrame::SetTitle(const wxString& title) -{ - m_title = title; - - wxAuiMDIParentFrame* pParentFrame = GetMDIParentFrame(); - wxASSERT_MSG(pParentFrame, wxT("Missing MDI Parent Frame")); - - wxAuiMDIClientWindow* pClientWindow = pParentFrame->GetClientWindow(); - if (pClientWindow != NULL) - { - size_t pos; - for (pos = 0; pos < pClientWindow->GetPageCount(); pos++) - { - if (pClientWindow->GetPage(pos) == this) - { - pClientWindow->SetPageText(pos, m_title); - break; - } - } - } -} - -wxString wxAuiMDIChildFrame::GetTitle() const -{ - return m_title; -} - -void wxAuiMDIChildFrame::SetIcons(const wxIconBundle& icons) -{ - // get icon with the system icon size - SetIcon(icons.GetIcon(-1)); - m_iconBundle = icons; -} - -const wxIconBundle& wxAuiMDIChildFrame::GetIcons() const -{ - return m_iconBundle; -} - -void wxAuiMDIChildFrame::SetIcon(const wxIcon& icon) -{ - wxAuiMDIParentFrame* pParentFrame = GetMDIParentFrame(); - wxASSERT_MSG(pParentFrame, wxT("Missing MDI Parent Frame")); - - m_icon = icon; - - wxBitmap bmp; - bmp.CopyFromIcon(m_icon); - - wxAuiMDIClientWindow* pClientWindow = pParentFrame->GetClientWindow(); - if (pClientWindow != NULL) - { - int idx = pClientWindow->GetPageIndex(this); - - if (idx != -1) - { - pClientWindow->SetPageBitmap((size_t)idx, bmp); - } - } -} - -const wxIcon& wxAuiMDIChildFrame::GetIcon() const -{ - return m_icon; -} - - -void wxAuiMDIChildFrame::Activate() -{ - wxAuiMDIParentFrame* pParentFrame = GetMDIParentFrame(); - wxASSERT_MSG(pParentFrame, wxT("Missing MDI Parent Frame")); - - wxAuiMDIClientWindow* pClientWindow = pParentFrame->GetClientWindow(); - - if (pClientWindow != NULL) - { - size_t pos; - for (pos = 0; pos < pClientWindow->GetPageCount(); pos++) - { - if (pClientWindow->GetPage(pos) == this) - { - pClientWindow->SetSelection(pos); - break; - } - } - } -} - -void wxAuiMDIChildFrame::OnMenuHighlight(wxMenuEvent& event) -{ -#if wxUSE_STATUSBAR - if (m_pMDIParentFrame) - { - // we don't have any help text for this item, - // but may be the MDI frame does? - m_pMDIParentFrame->OnMenuHighlight(event); - } -#else - wxUnusedVar(event); -#endif // wxUSE_STATUSBAR -} - -void wxAuiMDIChildFrame::OnActivate(wxActivateEvent& WXUNUSED(event)) -{ - // do nothing -} - -void wxAuiMDIChildFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event)) -{ - Destroy(); -} - -void wxAuiMDIChildFrame::SetMDIParentFrame(wxAuiMDIParentFrame* parentFrame) -{ - m_pMDIParentFrame = parentFrame; -} - -wxAuiMDIParentFrame* wxAuiMDIChildFrame::GetMDIParentFrame() const -{ - return m_pMDIParentFrame; -} - -void wxAuiMDIChildFrame::Init() -{ - m_activateOnCreate = true; - m_pMDIParentFrame = NULL; -#if wxUSE_MENUS - m_pMenuBar = NULL; -#endif // wxUSE_MENUS -} - -bool wxAuiMDIChildFrame::Show(bool show) -{ - // wxAuiMDIChildFrame uses m_activateOnCreate only to decide whether to - // activate the frame when it is created. After Create() is called, - // m_activateOnCreate will never be read again. Therefore, calling this - // function after Create() is pointless and you probably want to call - // Activate() instead. - wxCHECK_MSG( !GetHandle(), false, - wxS("Show() has no effect after Create(). Do you mean Activate()?") ); - - m_activateOnCreate = show; - - // do nothing - return true; -} - -void wxAuiMDIChildFrame::DoShow(bool show) -{ - wxWindow::Show(show); -} - -void wxAuiMDIChildFrame::DoSetSize(int x, int y, int width, int height, int sizeFlags) -{ - m_mdiNewRect = wxRect(x, y, width, height); -#ifdef __WXGTK__ - wxPanel::DoSetSize(x,y,width, height, sizeFlags); -#else - wxUnusedVar(sizeFlags); -#endif -} - -void wxAuiMDIChildFrame::DoMoveWindow(int x, int y, int width, int height) -{ - m_mdiNewRect = wxRect(x, y, width, height); -} - -void wxAuiMDIChildFrame::ApplyMDIChildFrameRect() -{ - if (m_mdiCurRect != m_mdiNewRect) - { - wxPanel::DoMoveWindow(m_mdiNewRect.x, m_mdiNewRect.y, - m_mdiNewRect.width, m_mdiNewRect.height); - m_mdiCurRect = m_mdiNewRect; - } -} - - -//----------------------------------------------------------------------------- -// wxAuiMDIClientWindow -//----------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxAuiMDIClientWindow, wxAuiNotebook); - -wxBEGIN_EVENT_TABLE(wxAuiMDIClientWindow, wxAuiNotebook) - EVT_AUINOTEBOOK_PAGE_CHANGED(wxID_ANY, wxAuiMDIClientWindow::OnPageChanged) - EVT_AUINOTEBOOK_PAGE_CLOSE(wxID_ANY, wxAuiMDIClientWindow::OnPageClose) - EVT_SIZE(wxAuiMDIClientWindow::OnSize) -wxEND_EVENT_TABLE() - -wxAuiMDIClientWindow::wxAuiMDIClientWindow() -{ -} - -wxAuiMDIClientWindow::wxAuiMDIClientWindow(wxAuiMDIParentFrame* parent, long style) -{ - CreateClient(parent, style); -} - -bool wxAuiMDIClientWindow::CreateClient(wxAuiMDIParentFrame* parent, long style) -{ - SetWindowStyleFlag(style); - - wxSize caption_icon_size = - wxSize(wxSystemSettings::GetMetric(wxSYS_SMALLICON_X), - wxSystemSettings::GetMetric(wxSYS_SMALLICON_Y)); - SetUniformBitmapSize(caption_icon_size); - - if (!wxAuiNotebook::Create(parent, - wxID_ANY, - wxPoint(0,0), - wxSize(100, 100), - wxAUI_NB_DEFAULT_STYLE | wxNO_BORDER)) - { - return false; - } - - wxColour bkcolour = wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE); - SetOwnBackgroundColour(bkcolour); - - m_mgr.GetArtProvider()->SetColour(wxAUI_DOCKART_BACKGROUND_COLOUR, bkcolour); - - return true; -} - -int wxAuiMDIClientWindow::SetSelection(size_t nPage) -{ - return wxAuiNotebook::SetSelection(nPage); -} - -wxAuiMDIChildFrame* wxAuiMDIClientWindow::GetActiveChild() -{ - const int sel = GetSelection(); - if ( sel == wxNOT_FOUND ) - return NULL; - - return wxStaticCast(GetPage(sel), wxAuiMDIChildFrame); -} - -void wxAuiMDIClientWindow::PageChanged(int old_selection, int new_selection) -{ - // don't do anything if the page doesn't actually change - if (old_selection == new_selection) - return; - - /* - // don't do anything if the new page is already active - if (new_selection != -1) - { - wxAuiMDIChildFrame* child = (wxAuiMDIChildFrame*)GetPage(new_selection); - if (child->GetMDIParentFrame()->GetActiveChild() == child) - return; - }*/ - - - // notify old active child that it has been deactivated - if ((old_selection != -1) && (old_selection < (int)GetPageCount())) - { - wxAuiMDIChildFrame* old_child = (wxAuiMDIChildFrame*)GetPage(old_selection); - wxASSERT_MSG(old_child, wxT("wxAuiMDIClientWindow::PageChanged - null page pointer")); - - wxActivateEvent event(wxEVT_ACTIVATE, false, old_child->GetId()); - event.SetEventObject(old_child); - old_child->GetEventHandler()->ProcessEvent(event); - } - - // notify new active child that it has been activated - if (new_selection != -1) - { - wxAuiMDIChildFrame* active_child = (wxAuiMDIChildFrame*)GetPage(new_selection); - wxASSERT_MSG(active_child, wxT("wxAuiMDIClientWindow::PageChanged - null page pointer")); - - wxActivateEvent event(wxEVT_ACTIVATE, true, active_child->GetId()); - event.SetEventObject(active_child); - active_child->GetEventHandler()->ProcessEvent(event); - - if (active_child->GetMDIParentFrame()) - { - active_child->GetMDIParentFrame()->SetActiveChild(active_child); - active_child->GetMDIParentFrame()->SetChildMenuBar(active_child); - } - } - - -} - -void wxAuiMDIClientWindow::OnPageClose(wxAuiNotebookEvent& evt) -{ - wxAuiMDIChildFrame* wnd; - wnd = static_cast(GetPage(evt.GetSelection())); - - wnd->Close(); - - // regardless of the result of wnd->Close(), we've - // already taken care of the close operations, so - // suppress further processing - evt.Veto(); -} - -void wxAuiMDIClientWindow::OnPageChanged(wxAuiNotebookEvent& evt) -{ - PageChanged(evt.GetOldSelection(), evt.GetSelection()); -} - -void wxAuiMDIClientWindow::OnSize(wxSizeEvent& evt) -{ - wxAuiNotebook::OnSize(evt); - - for (size_t pos = 0; pos < GetPageCount(); pos++) - ((wxAuiMDIChildFrame *)GetPage(pos))->ApplyMDIChildFrameRect(); -} - -#endif //wxUSE_AUI -#endif // wxUSE_MDI diff --git a/Externals/wxWidgets3/src/common/accelcmn.cpp b/Externals/wxWidgets3/src/common/accelcmn.cpp deleted file mode 100644 index f5bea8079a..0000000000 --- a/Externals/wxWidgets3/src/common/accelcmn.cpp +++ /dev/null @@ -1,390 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/accelcmn.cpp -// Purpose: implementation of platform-independent wxAcceleratorEntry parts -// Author: Vadim Zeitlin -// Created: 2007-05-05 -// Copyright: (c) 2007 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// for compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_ACCEL - -#ifndef WX_PRECOMP - #include "wx/accel.h" - #include "wx/string.h" - #include "wx/intl.h" - #include "wx/log.h" - #include "wx/crt.h" -#endif //WX_PRECOMP - -wxAcceleratorTable wxNullAcceleratorTable; - -// ============================================================================ -// wxAcceleratorEntry implementation -// ============================================================================ - -wxGCC_WARNING_SUPPRESS(missing-field-initializers) - -static const struct wxKeyName -{ - wxKeyCode code; - const char *name; - const char *display_name; -} wxKeyNames[] = -{ - { WXK_DELETE, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Delete") }, - { WXK_DELETE, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Del") }, - { WXK_BACK, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Back"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Backspace") }, - { WXK_INSERT, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Insert") }, - { WXK_INSERT, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Ins") }, - { WXK_RETURN, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Enter") }, - { WXK_RETURN, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Return") }, - { WXK_PAGEUP, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("PageUp"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Page Up") }, - { WXK_PAGEDOWN, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("PageDown"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Page Down") }, - { WXK_PAGEUP, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("PgUp") }, - { WXK_PAGEDOWN, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("PgDn") }, - { WXK_LEFT, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Left"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Left") }, - { WXK_RIGHT, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Right"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Right") }, - { WXK_UP, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Up"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Up") }, - { WXK_DOWN, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Down"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Down") }, - { WXK_HOME, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Home") }, - { WXK_END, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("End") }, - { WXK_SPACE, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Space") }, - { WXK_TAB, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Tab") }, - { WXK_ESCAPE, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Esc") }, - { WXK_ESCAPE, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Escape") }, - { WXK_CANCEL, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Cancel") }, - { WXK_CLEAR, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Clear") }, - { WXK_MENU, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Menu") }, - { WXK_PAUSE, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Pause") }, - { WXK_CAPITAL, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Capital") }, - { WXK_SELECT, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Select") }, - { WXK_PRINT, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Print") }, - { WXK_EXECUTE, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Execute") }, - { WXK_SNAPSHOT, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Snapshot") }, - { WXK_HELP, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Help") }, - { WXK_ADD, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Add") }, - { WXK_SEPARATOR, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Separator") }, - { WXK_SUBTRACT, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Subtract") }, - { WXK_DECIMAL, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Decimal") }, - { WXK_DIVIDE, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Divide") }, - { WXK_NUMLOCK, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num_lock"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num Lock") }, - { WXK_SCROLL, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Scroll_lock"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Scroll Lock") }, - { WXK_NUMPAD_SPACE, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_Space"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num Space") }, - { WXK_NUMPAD_TAB, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_Tab"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num Tab") }, - { WXK_NUMPAD_ENTER, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_Enter"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num Enter") }, - { WXK_NUMPAD_HOME, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_Home"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num Home") }, - { WXK_NUMPAD_LEFT, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_Left"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num left") }, - { WXK_NUMPAD_UP, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_Up"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num Up") }, - { WXK_NUMPAD_RIGHT, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_Right"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num Right") }, - { WXK_NUMPAD_DOWN, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_Down"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num Down") }, - { WXK_NUMPAD_PAGEUP, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_PageUp"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num Page Up") }, - { WXK_NUMPAD_PAGEDOWN, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_PageDown"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num Page Down") }, - { WXK_NUMPAD_PAGEUP, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_Prior") }, - { WXK_NUMPAD_PAGEDOWN, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_Next") }, - { WXK_NUMPAD_END, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_End"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num End") }, - { WXK_NUMPAD_BEGIN, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_Begin"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num Begin") }, - { WXK_NUMPAD_INSERT, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_Insert"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num Insert") }, - { WXK_NUMPAD_DELETE, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_Delete"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num Delete") }, - { WXK_NUMPAD_EQUAL, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_Equal"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num =") }, - { WXK_NUMPAD_MULTIPLY, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_Multiply"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num *") }, - { WXK_NUMPAD_ADD, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_Add"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num +") }, - { WXK_NUMPAD_SEPARATOR, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_Separator"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num ,") }, - { WXK_NUMPAD_SUBTRACT, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_Subtract"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num -") }, - { WXK_NUMPAD_DECIMAL, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_Decimal"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num .") }, - { WXK_NUMPAD_DIVIDE, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_Divide"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num /") }, - { WXK_WINDOWS_LEFT, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Windows_Left") }, - { WXK_WINDOWS_RIGHT, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Windows_Right") }, - { WXK_WINDOWS_MENU, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Windows_Menu") }, - { WXK_COMMAND, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Command") }, -}; - -wxGCC_WARNING_RESTORE(missing-field-initializers) - -// return true if the 2 strings refer to the same accel -// -// as accels can be either translated or not, check for both possibilities and -// also compare case-insensitively as the key names case doesn't count -static inline bool CompareAccelString(const wxString& str, const char *accel) -{ - return str.CmpNoCase(accel) == 0 -#if wxUSE_INTL - || str.CmpNoCase(wxGetTranslation(accel)) == 0 -#endif - ; -} - -// return prefixCode+number if the string is of the form "" and -// 0 if it isn't -// -// first and last parameter specify the valid domain for "number" part -static int IsNumberedAccelKey(const wxString& str, - const char *prefix, - wxKeyCode prefixCode, - unsigned first, - unsigned last) -{ - const size_t lenPrefix = wxStrlen(prefix); - if ( !CompareAccelString(str.Left(lenPrefix), prefix) ) - return 0; - - unsigned long num; - if ( !str.Mid(lenPrefix).ToULong(&num) ) - return 0; - - if ( num < first || num > last ) - { - // this must be a mistake, chances that this is a valid name of another - // key are vanishingly small - wxLogDebug(wxT("Invalid key string \"%s\""), str.c_str()); - return 0; - } - - return prefixCode + num - first; -} - -/* static */ -bool -wxAcceleratorEntry::ParseAccel(const wxString& text, int *flagsOut, int *keyOut) -{ - // the parser won't like trailing spaces - wxString label = text; - label.Trim(true); - - // For compatibility with the old wx versions which accepted (and actually - // even required) a TAB character in the string passed to this function we - // ignore anything up to the first TAB. Notice however that the correct - // input consists of just the accelerator itself and nothing else, this is - // done for compatibility and compatibility only. - int posTab = label.Find(wxT('\t')); - if ( posTab == wxNOT_FOUND ) - posTab = 0; - else - posTab++; - - // parse the accelerator string - int accelFlags = wxACCEL_NORMAL; - wxString current; - for ( size_t n = (size_t)posTab; n < label.length(); n++ ) - { - if ( (label[n] == '+') || (label[n] == '-') ) - { - if ( CompareAccelString(current, wxTRANSLATE("ctrl")) ) - accelFlags |= wxACCEL_CTRL; - else if ( CompareAccelString(current, wxTRANSLATE("alt")) ) - accelFlags |= wxACCEL_ALT; - else if ( CompareAccelString(current, wxTRANSLATE("shift")) ) - accelFlags |= wxACCEL_SHIFT; - else if ( CompareAccelString(current, wxTRANSLATE("rawctrl")) ) - accelFlags |= wxACCEL_RAW_CTRL; - else // not a recognized modifier name - { - // we may have "Ctrl-+", for example, but we still want to - // catch typos like "Crtl-A" so only give the warning if we - // have something before the current '+' or '-', else take - // it as a literal symbol - if ( current.empty() ) - { - current += label[n]; - - // skip clearing it below - continue; - } - else - { - wxLogDebug(wxT("Unknown accel modifier: '%s'"), - current.c_str()); - } - } - - current.clear(); - } - else // not special character - { - current += (wxChar) wxTolower(label[n]); - } - } - - int keyCode; - const size_t len = current.length(); - switch ( len ) - { - case 0: - wxLogDebug(wxT("No accel key found, accel string ignored.")); - return false; - - case 1: - // it's just a letter - keyCode = current[0U]; - - // if the key is used with any modifiers, make it an uppercase one - // because Ctrl-A and Ctrl-a are the same; but keep it as is if it's - // used alone as 'a' and 'A' are different - if ( accelFlags != wxACCEL_NORMAL ) - keyCode = wxToupper(keyCode); - break; - - default: - keyCode = IsNumberedAccelKey(current, wxTRANSLATE("F"), - WXK_F1, 1, 12); - if ( !keyCode ) - { - for ( size_t n = 0; n < WXSIZEOF(wxKeyNames); n++ ) - { - const wxKeyName& kn = wxKeyNames[n]; - if ( CompareAccelString(current, kn.name) ) - { - keyCode = kn.code; - break; - } - } - } - - if ( !keyCode ) - keyCode = IsNumberedAccelKey(current, wxTRANSLATE("KP_"), - WXK_NUMPAD0, 0, 9); - if ( !keyCode ) - keyCode = IsNumberedAccelKey(current, wxTRANSLATE("SPECIAL"), - WXK_SPECIAL1, 1, 20); - - if ( !keyCode ) - { - wxLogDebug(wxT("Unrecognized accel key '%s', accel string ignored."), - current.c_str()); - return false; - } - } - - - wxASSERT_MSG( keyCode, wxT("logic error: should have key code here") ); - - if ( flagsOut ) - *flagsOut = accelFlags; - if ( keyOut ) - *keyOut = keyCode; - - return true; -} - -/* static */ -wxAcceleratorEntry *wxAcceleratorEntry::Create(const wxString& str) -{ - const wxString accelStr = str.AfterFirst('\t'); - if ( accelStr.empty() ) - { - // It's ok to pass strings not containing any accelerators at all to - // this function, wxMenuItem code does it and we should just return - // NULL in this case. - return NULL; - } - - int flags, - keyCode; - if ( !ParseAccel(accelStr, &flags, &keyCode) ) - return NULL; - - return new wxAcceleratorEntry(flags, keyCode); -} - -bool wxAcceleratorEntry::FromString(const wxString& str) -{ - return ParseAccel(str, &m_flags, &m_keyCode); -} - -namespace -{ - -wxString PossiblyLocalize(const wxString& str, bool localize) -{ - return localize ? wxGetTranslation(str) : str; -} - -} - -wxString wxAcceleratorEntry::AsPossiblyLocalizedString(bool localized) const -{ - wxString text; - - int flags = GetFlags(); - if ( flags & wxACCEL_ALT ) - text += PossiblyLocalize(wxTRANSLATE("Alt+"), localized); - if ( flags & wxACCEL_CTRL ) - text += PossiblyLocalize(wxTRANSLATE("Ctrl+"), localized); - if ( flags & wxACCEL_SHIFT ) - text += PossiblyLocalize(wxTRANSLATE("Shift+"), localized); -#if defined(__WXMAC__) - if ( flags & wxACCEL_RAW_CTRL ) - text += PossiblyLocalize(wxTRANSLATE("RawCtrl+"), localized); -#endif - - const int code = GetKeyCode(); - - if ( code >= WXK_F1 && code <= WXK_F12 ) - text << PossiblyLocalize(wxTRANSLATE("F"), localized) - << code - WXK_F1 + 1; - else if ( code >= WXK_NUMPAD0 && code <= WXK_NUMPAD9 ) - text << PossiblyLocalize(wxTRANSLATE("KP_"), localized) - << code - WXK_NUMPAD0; - else if ( code >= WXK_SPECIAL1 && code <= WXK_SPECIAL20 ) - text << PossiblyLocalize(wxTRANSLATE("SPECIAL"), localized) - << code - WXK_SPECIAL1 + 1; - else // check the named keys - { - size_t n; - for ( n = 0; n < WXSIZEOF(wxKeyNames); n++ ) - { - const wxKeyName& kn = wxKeyNames[n]; - if ( code == kn.code ) - { - text << PossiblyLocalize(kn.display_name ? kn.display_name : kn.name, localized); - break; - } - } - - if ( n == WXSIZEOF(wxKeyNames) ) - { - // must be a simple key - if ( -#if !wxUSE_UNICODE - // we can't call wxIsalnum() for non-ASCII characters in ASCII - // build as they're only defined for the ASCII range (or EOF) - wxIsascii(code) && -#endif // ANSI - wxIsprint(code) ) - { - text << (wxChar)code; - } - else - { - wxFAIL_MSG( wxT("unknown keyboard accelerator code") ); - } - } - } - - return text; -} - -wxAcceleratorEntry *wxGetAccelFromString(const wxString& label) -{ - return wxAcceleratorEntry::Create(label); -} - -#endif // wxUSE_ACCEL - - - diff --git a/Externals/wxWidgets3/src/common/accesscmn.cpp b/Externals/wxWidgets3/src/common/accesscmn.cpp deleted file mode 100644 index 660f1090df..0000000000 --- a/Externals/wxWidgets3/src/common/accesscmn.cpp +++ /dev/null @@ -1,25 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/accesscmn.cpp -// Author: Julian Smart -// Modified by: -// Created: 2003-02-12 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_ACCESSIBILITY - -#include "wx/access.h" - -#endif - diff --git a/Externals/wxWidgets3/src/common/addremovectrl.cpp b/Externals/wxWidgets3/src/common/addremovectrl.cpp deleted file mode 100644 index f5595e269e..0000000000 --- a/Externals/wxWidgets3/src/common/addremovectrl.cpp +++ /dev/null @@ -1,92 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/addremovectrl.cpp -// Purpose: wxAddRemoveCtrl implementation. -// Author: Vadim Zeitlin -// Created: 2015-01-29 -// Copyright: (c) 2015 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// for compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_ADDREMOVECTRL - -#ifndef WX_PRECOMP -#endif // WX_PRECOMP - -#include "wx/addremovectrl.h" - -#include "wx/private/addremovectrl.h" - -// ============================================================================ -// wxAddRemoveCtrl implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// common part -// ---------------------------------------------------------------------------- - -extern -WXDLLIMPEXP_DATA_ADV(const char) wxAddRemoveCtrlNameStr[] = "wxAddRemoveCtrl"; - -bool -wxAddRemoveCtrl::Create(wxWindow* parent, - wxWindowID winid, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) -{ - if ( !wxPanel::Create(parent, winid, pos, size, style, name) ) - return false; - - // We don't do anything here, the buttons are created when we're given the - // adaptor to use them with in SetAdaptor(). - return true; -} - -wxAddRemoveCtrl::~wxAddRemoveCtrl() -{ - delete m_impl; -} - -void wxAddRemoveCtrl::SetAdaptor(wxAddRemoveAdaptor* adaptor) -{ - wxCHECK_RET( !m_impl, wxS("should be only called once") ); - - wxCHECK_RET( adaptor, wxS("should have a valid adaptor") ); - - wxWindow* const ctrlItems = adaptor->GetItemsCtrl(); - wxCHECK_RET( ctrlItems, wxS("should have a valid items control") ); - - m_impl = new wxAddRemoveImpl(adaptor, this, ctrlItems); -} - -void -wxAddRemoveCtrl::SetButtonsToolTips(const wxString& addtip, - const wxString& removetip) -{ - wxCHECK_RET( m_impl, wxS("can only be called after SetAdaptor()") ); - - m_impl->SetButtonsToolTips(addtip, removetip); -} - -wxSize wxAddRemoveCtrl::DoGetBestClientSize() const -{ - return m_impl ? m_impl->GetBestClientSize() : wxDefaultSize; -} - -#endif // wxUSE_ADDREMOVECTRL diff --git a/Externals/wxWidgets3/src/common/affinematrix2d.cpp b/Externals/wxWidgets3/src/common/affinematrix2d.cpp deleted file mode 100644 index 5013b31f15..0000000000 --- a/Externals/wxWidgets3/src/common/affinematrix2d.cpp +++ /dev/null @@ -1,186 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: affinematrix2d.cpp -// Purpose: implementation of wxAffineMatrix2D -// Author: Based on wxTransformMatrix by Chris Breeze, Julian Smart -// Created: 2011-04-05 -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_GEOMETRY - -#include "wx/affinematrix2d.h" -#include "wx/math.h" - -// sets the matrix to the respective values -void wxAffineMatrix2D::Set(const wxMatrix2D &mat2D, const wxPoint2DDouble &tr) -{ - m_11 = mat2D.m_11; - m_12 = mat2D.m_12; - m_21 = mat2D.m_21; - m_22 = mat2D.m_22; - m_tx = tr.m_x; - m_ty = tr.m_y; -} - -// gets the component valuess of the matrix -void wxAffineMatrix2D::Get(wxMatrix2D *mat2D, wxPoint2DDouble *tr) const -{ - mat2D->m_11 = m_11; - mat2D->m_12 = m_12; - mat2D->m_21 = m_21; - mat2D->m_22 = m_22; - - if ( tr ) - { - tr->m_x = m_tx; - tr->m_y = m_ty; - } -} - -// concatenates the matrix -// | t.m_11 t.m_12 0 | | m_11 m_12 0 | -// | t.m_21 t.m_22 0 | x | m_21 m_22 0 | -// | t.m_tx t.m_ty 1 | | m_tx m_ty 1 | -void wxAffineMatrix2D::Concat(const wxAffineMatrix2DBase &t) -{ - wxMatrix2D mat; - wxPoint2DDouble tr; - t.Get(&mat, &tr); - - m_tx += tr.m_x*m_11 + tr.m_y*m_21; - m_ty += tr.m_x*m_12 + tr.m_y*m_22; - wxDouble e11 = mat.m_11*m_11 + mat.m_12*m_21; - wxDouble e12 = mat.m_11*m_12 + mat.m_12*m_22; - wxDouble e21 = mat.m_21*m_11 + mat.m_22*m_21; - m_22 = mat.m_21*m_12 + mat.m_22*m_22; - m_11 = e11; - m_12 = e12; - m_21 = e21; -} - -// makes this its inverse matrix. -// Invert -// | m_11 m_12 0 | -// | m_21 m_22 0 | -// | m_tx m_ty 1 | -bool wxAffineMatrix2D::Invert() -{ - const wxDouble det = m_11*m_22 - m_12*m_21; - - if ( !det ) - return false; - - wxDouble ex = (m_21*m_ty - m_22*m_tx) / det; - m_ty = (-m_11*m_ty + m_12*m_tx) / det; - m_tx = ex; - wxDouble e11 = m_22 / det; - m_12 = -m_12 / det; - m_21 = -m_21 / det; - m_22 = m_11 / det; - m_11 = e11; - - return true; -} - -// returns true if the elements of the transformation matrix are equal -bool wxAffineMatrix2D::IsEqual(const wxAffineMatrix2DBase& t) const -{ - wxMatrix2D mat; - wxPoint2DDouble tr; - t.Get(&mat, &tr); - - return m_11 == mat.m_11 && m_12 == mat.m_12 && - m_21 == mat.m_21 && m_22 == mat.m_22 && - m_tx == tr.m_x && m_ty == tr.m_y; -} - -// -// transformations -// - -// add the translation to this matrix -// | 1 0 0 | | m_11 m_12 0 | -// | 0 1 0 | x | m_21 m_22 0 | -// | dx dy 1 | | m_tx m_ty 1 | -void wxAffineMatrix2D::Translate(wxDouble dx, wxDouble dy) -{ - m_tx += m_11 * dx + m_21 * dy; - m_ty += m_12 * dx + m_22 * dy; -} - -// add the scale to this matrix -// | xScale 0 0 | | m_11 m_12 0 | -// | 0 yScale 0 | x | m_21 m_22 0 | -// | 0 0 1 | | m_tx m_ty 1 | -void wxAffineMatrix2D::Scale(wxDouble xScale, wxDouble yScale) -{ - m_11 *= xScale; - m_12 *= xScale; - m_21 *= yScale; - m_22 *= yScale; -} - -// add the rotation to this matrix (clockwise, radians) -// | cos sin 0 | | m_11 m_12 0 | -// | -sin cos 0 | x | m_21 m_22 0 | -// | 0 0 1 | | m_tx m_ty 1 | -void wxAffineMatrix2D::Rotate(wxDouble cRadians) -{ - wxDouble c = cos(cRadians); - wxDouble s = sin(cRadians); - - wxDouble e11 = c*m_11 + s*m_21; - wxDouble e12 = c*m_12 + s*m_22; - m_21 = c*m_21 - s*m_11; - m_22 = c*m_22 - s*m_12; - m_11 = e11; - m_12 = e12; -} - -// -// apply the transforms -// - -// applies that matrix to the point -// | m_11 m_12 0 | -// | src.m_x src._my 1 | x | m_21 m_22 0 | -// | m_tx m_ty 1 | -wxPoint2DDouble -wxAffineMatrix2D::DoTransformPoint(const wxPoint2DDouble& src) const -{ - if ( IsIdentity() ) - return src; - - return wxPoint2DDouble(src.m_x * m_11 + src.m_y * m_21 + m_tx, - src.m_x * m_12 + src.m_y * m_22 + m_ty); -} - -// applies the matrix except for translations -// | m_11 m_12 0 | -// | src.m_x src._my 0 | x | m_21 m_22 0 | -// | m_tx m_ty 1 | -wxPoint2DDouble -wxAffineMatrix2D::DoTransformDistance(const wxPoint2DDouble& src) const -{ - if ( IsIdentity() ) - return src; - - return wxPoint2DDouble(src.m_x * m_11 + src.m_y * m_21, - src.m_x * m_12 + src.m_y * m_22); -} - -bool wxAffineMatrix2D::IsIdentity() const -{ - return m_11 == 1 && m_12 == 0 && - m_21 == 0 && m_22 == 1 && - m_tx == 0 && m_ty == 0; -} - -#endif // wxUSE_GEOMETRY diff --git a/Externals/wxWidgets3/src/common/anidecod.cpp b/Externals/wxWidgets3/src/common/anidecod.cpp deleted file mode 100644 index d62c00b455..0000000000 --- a/Externals/wxWidgets3/src/common/anidecod.cpp +++ /dev/null @@ -1,368 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/anidecod.cpp -// Purpose: wxANIDecoder, ANI reader for wxImage and wxAnimation -// Author: Francesco Montorsi -// Copyright: (c) Francesco Montorsi -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_STREAMS && wxUSE_ICO_CUR - -#include "wx/anidecod.h" - -#ifndef WX_PRECOMP - #include "wx/palette.h" -#endif - -#include -#include - -// static -wxCURHandler wxANIDecoder::sm_handler; - -//--------------------------------------------------------------------------- -// wxANIFrameInfo -//--------------------------------------------------------------------------- - -class wxANIFrameInfo -{ -public: - wxANIFrameInfo(unsigned int delay = 0, int idx = -1) - { m_delay=delay; m_imageIndex=idx; } - - unsigned int m_delay; - int m_imageIndex; -}; - -#include "wx/arrimpl.cpp" // this is a magic incantation which must be done! -WX_DEFINE_OBJARRAY(wxImageArray) - -#include "wx/arrimpl.cpp" // this is a magic incantation which must be done! -WX_DEFINE_OBJARRAY(wxANIFrameInfoArray) - - -//--------------------------------------------------------------------------- -// wxANIDecoder -//--------------------------------------------------------------------------- - -wxANIDecoder::wxANIDecoder() -{ -} - -wxANIDecoder::~wxANIDecoder() -{ -} - -bool wxANIDecoder::ConvertToImage(unsigned int frame, wxImage *image) const -{ - unsigned int idx = m_info[frame].m_imageIndex; - *image = m_images[idx]; // copy - return image->IsOk(); -} - - -//--------------------------------------------------------------------------- -// Data accessors -//--------------------------------------------------------------------------- - -wxSize wxANIDecoder::GetFrameSize(unsigned int WXUNUSED(frame)) const -{ - // all frames are of the same size... - return m_szAnimation; -} - -wxPoint wxANIDecoder::GetFramePosition(unsigned int WXUNUSED(frame)) const -{ - // all frames are of the same size... - return wxPoint(0,0); -} - -wxAnimationDisposal wxANIDecoder::GetDisposalMethod(unsigned int WXUNUSED(frame)) const -{ - // this disposal is implicit for all frames inside an ANI file - return wxANIM_TOBACKGROUND; -} - -long wxANIDecoder::GetDelay(unsigned int frame) const -{ - return m_info[frame].m_delay; -} - -wxColour wxANIDecoder::GetTransparentColour(unsigned int frame) const -{ - unsigned int idx = m_info[frame].m_imageIndex; - - if (!m_images[idx].HasMask()) - return wxNullColour; - - return wxColour(m_images[idx].GetMaskRed(), - m_images[idx].GetMaskGreen(), - m_images[idx].GetMaskBlue()); -} - - -//--------------------------------------------------------------------------- -// ANI reading and decoding -//--------------------------------------------------------------------------- - -bool wxANIDecoder::DoCanRead(wxInputStream& stream) const -{ - wxInt32 FCC1, FCC2; - wxUint32 datalen; - - wxInt32 riff32; - memcpy( &riff32, "RIFF", 4 ); - wxInt32 list32; - memcpy( &list32, "LIST", 4 ); - wxInt32 ico32; - memcpy( &ico32, "icon", 4 ); - wxInt32 anih32; - memcpy( &anih32, "anih", 4 ); - - if ( stream.IsSeekable() && stream.SeekI(0) == wxInvalidOffset ) - { - return false; - } - - if ( !stream.Read(&FCC1, 4) ) - return false; - - if ( FCC1 != riff32 ) - return false; - - // we have a riff file: - while ( stream.IsOk() ) - { - if ( FCC1 == anih32 ) - return true; // found the ANIH chunk - this should be an ANI file - - // we always have a data size: - stream.Read(&datalen, 4); - datalen = wxINT32_SWAP_ON_BE(datalen) ; - - // data should be padded to make even number of bytes - if (datalen % 2 == 1) datalen ++ ; - - // now either data or a FCC: - if ( (FCC1 == riff32) || (FCC1 == list32) ) - { - stream.Read(&FCC2, 4); - } - else - { - if ( stream.SeekI(stream.TellI() + datalen) == wxInvalidOffset ) - return false; - } - - // try to read next data chunk: - if ( !stream.Read(&FCC1, 4) ) - { - // reading failed -- either EOF or IO error, bail out anyhow - return false; - } - } - - return false; -} - -// the "anih" RIFF chunk -struct wxANIHeader -{ - wxInt32 cbSizeOf; // Num bytes in AniHeader (36 bytes) - wxInt32 cFrames; // Number of unique Icons in this cursor - wxInt32 cSteps; // Number of Blits before the animation cycles - wxInt32 cx; // width of the frames - wxInt32 cy; // height of the frames - wxInt32 cBitCount; // bit depth - wxInt32 cPlanes; // 1 - wxInt32 JifRate; // Default Jiffies (1/60th of a second) if rate chunk not present. - wxInt32 flags; // Animation Flag (see AF_ constants) - - // ANI files are always little endian so we need to swap bytes on big - // endian architectures -#ifdef WORDS_BIGENDIAN - void AdjustEndianness() - { - // this works because all our fields are wxInt32 and they must be - // packed without holes between them (if they're not, they wouldn't map - // to the file header!) - wxInt32 * const start = (wxInt32 *)this; - wxInt32 * const end = start + sizeof(wxANIHeader)/sizeof(wxInt32); - for ( wxInt32 *p = start; p != end; p++ ) - { - *p = wxINT32_SWAP_ALWAYS(*p); - } - } -#else - void AdjustEndianness() { } -#endif -}; - -bool wxANIDecoder::Load( wxInputStream& stream ) -{ - wxInt32 FCC1, FCC2; - wxUint32 datalen; - unsigned int globaldelay=0; - - wxInt32 riff32; - memcpy( &riff32, "RIFF", 4 ); - wxInt32 list32; - memcpy( &list32, "LIST", 4 ); - wxInt32 ico32; - memcpy( &ico32, "icon", 4 ); - wxInt32 anih32; - memcpy( &anih32, "anih", 4 ); - wxInt32 rate32; - memcpy( &rate32, "rate", 4 ); - wxInt32 seq32; - memcpy( &seq32, "seq ", 4 ); - - if ( stream.IsSeekable() && stream.SeekI(0) == wxInvalidOffset ) - { - return false; - } - - if ( !stream.Read(&FCC1, 4) ) - return false; - if ( FCC1 != riff32 ) - return false; - - m_nFrames = 0; - m_szAnimation = wxDefaultSize; - - m_images.Clear(); - m_info.Clear(); - - // we have a riff file: - while ( !stream.Eof() ) - { - // we always have a data size: - if (!stream.Read(&datalen, 4)) - return false; - - datalen = wxINT32_SWAP_ON_BE(datalen); - - //data should be padded to make even number of bytes - if (datalen % 2 == 1) datalen++; - - // now either data or a FCC: - if ( (FCC1 == riff32) || (FCC1 == list32) ) - { - if (!stream.Read(&FCC2, 4)) - return false; - } - else if ( FCC1 == anih32 ) - { - if ( datalen != sizeof(wxANIHeader) ) - return false; - - if (m_nFrames > 0) - return false; // already parsed an ani header? - - struct wxANIHeader header; - if (!stream.Read(&header, sizeof(wxANIHeader))) - return false; - header.AdjustEndianness(); - - // we should have a global frame size - m_szAnimation = wxSize(header.cx, header.cy); - - // save interesting info from the header - m_nFrames = header.cSteps; // NB: not cFrames!! - if ( m_nFrames == 0 ) - return false; - - globaldelay = header.JifRate * 1000 / 60; - - m_images.Alloc(header.cFrames); - m_info.Add(wxANIFrameInfo(), m_nFrames); - } - else if ( FCC1 == rate32 ) - { - // did we already process the anih32 chunk? - if (m_nFrames == 0) - return false; // rate chunks should always be placed after anih chunk - - wxASSERT(m_info.GetCount() == m_nFrames); - for (unsigned int i=0; i(type_); - - wxAnyTypeToVariantDataFactoryMap& anyToVariant = m_anyToVariant; - wxAnyTypeToVariantDataFactoryMap::const_iterator it; - it = anyToVariant.find(type); - if ( it != anyToVariant.end() ) - return it->second; - - // Not found, handle pre-registrations - size_t i = m_anyToVariantRegs.size(); - while ( i > 0 ) - { - i--; - wxAnyToVariantRegistration* reg = m_anyToVariantRegs[i]; - wxAnyValueType* assocType = reg->GetAssociatedType(); - if ( assocType ) - { - // Both variant data and wxAnyValueType have been - // now been properly initialized, so remove the - // pre-registration entry and move data to anyToVarian - // map. - anyToVariant[assocType] = reg->GetFactory(); - m_anyToVariantRegs.erase( m_anyToVariantRegs.begin() + i ); - } - } - - // Then try again - it = anyToVariant.find(type); - if ( it != anyToVariant.end() ) - return it->second; - - // Finally, attempt to find a compatible type - for ( it = anyToVariant.begin(); it != anyToVariant.end(); it++ ) - { - if ( type->IsSameType(it->first) ) - { - wxVariantDataFactory f = it->second; - anyToVariant[type] = f; - return f; - } - } - - // Nothing found - return NULL; - } - -private: - wxAnyTypeToVariantDataFactoryMap m_anyToVariant; - wxVector m_anyToVariantRegs; -}; - -static wxAnyValueTypeGlobals* g_wxAnyValueTypeGlobals = NULL; - - -WX_IMPLEMENT_ANY_VALUE_TYPE(wxAnyValueTypeImplVariantData) - -void wxPreRegisterAnyToVariant(wxAnyToVariantRegistration* reg) -{ - if ( !g_wxAnyValueTypeGlobals ) - g_wxAnyValueTypeGlobals = new wxAnyValueTypeGlobals(); - g_wxAnyValueTypeGlobals->PreRegisterAnyToVariant(reg); -} - -bool wxConvertAnyToVariant(const wxAny& any, wxVariant* variant) -{ - if ( any.IsNull() ) - { - variant->MakeNull(); - return true; - } - - // (signed) integer is a special case, because there is only one type - // in wxAny, and two ("long" and "longlong") in wxVariant. For better - // backwards compatibility, convert all values that fit in "long", - // and others to "longlong". - if ( wxANY_CHECK_TYPE(any, signed int) ) - { -#if defined(wxLongLong_t) && wxUSE_LONGLONG - wxLongLong_t ll = 0; - if ( any.GetAs(&ll) ) - { - // NB: Do not use LONG_MAX here. Explicitly using 32-bit - // integer constraint yields more consistent behaviour across - // builds. - if ( ll > wxINT32_MAX || ll < wxINT32_MIN ) - *variant = wxLongLong(ll); - else - *variant = (long) wxLongLong(ll).GetLo(); - } - else - { - return false; - } -#else - long l; - if ( any.GetAs(&l) ) - *variant = l; - else - return false; -#endif - return true; - } - - // Find matching factory function - wxVariantDataFactory f = - g_wxAnyValueTypeGlobals->FindVariantDataFactory(any.GetType()); - - wxVariantData* data = NULL; - - if ( f ) - { - data = f(any); - } - else - { - // Check if wxAny wrapped wxVariantData* - if ( !any.GetAs(&data) ) - { - // Ok, one last chance: while unlikely, it is possible that the - // wxAny actually contains wxVariant. - if ( wxANY_CHECK_TYPE(any, wxVariant) ) - *variant = any.As(); - return false; - } - - // Wrapper's GetValue() does not increase reference - // count, se have to do it before the data gets passed - // to a new variant. - data->IncRef(); - } - - variant->SetData(data); - return true; -} - -// -// This class is to make sure that wxAnyValueType instances -// etc. get freed correctly. We must use a separate wxAnyValueTypeGlobals -// because wxModule itself is instantiated too late. -// -class wxAnyValueTypeGlobalsManager : public wxModule -{ - wxDECLARE_DYNAMIC_CLASS(wxAnyValueTypeGlobalsManager); -public: - wxAnyValueTypeGlobalsManager() : wxModule() { } - virtual ~wxAnyValueTypeGlobalsManager() { } - - virtual bool OnInit() wxOVERRIDE - { - return true; - } - virtual void OnExit() wxOVERRIDE - { - wxDELETE(g_wxAnyValueTypeGlobals); - } -private: -}; - -wxIMPLEMENT_DYNAMIC_CLASS(wxAnyValueTypeGlobalsManager, wxModule); - -#endif // wxUSE_VARIANT - - -//------------------------------------------------------------------------- -// Dynamic conversion member functions -//------------------------------------------------------------------------- - -// -// Define integer minimum and maximum as helpers -#ifdef wxLongLong_t - #define UseIntMin (wxINT64_MIN) - #define UseIntMax (wxINT64_MAX) - #define UseUintMax (wxUINT64_MAX) -#else - #define UseIntMin (LONG_MIN) - #define UseIntMax (LONG_MAX) - #define UseUintMax (ULONG_MAX) -#endif - -namespace -{ - -const double UseIntMinF = static_cast(UseIntMin); -const double UseIntMaxF = static_cast(UseIntMax); -const double UseUintMaxF = static_cast(UseUintMax); - -} // anonymous namespace - -bool wxAnyValueTypeImplInt::ConvertValue(const wxAnyValueBuffer& src, - wxAnyValueType* dstType, - wxAnyValueBuffer& dst) const -{ - wxAnyBaseIntType value = GetValue(src); - if ( wxANY_VALUE_TYPE_CHECK_TYPE(dstType, wxString) ) - { -#if defined(wxLongLong_t) && wxUSE_LONGLONG - wxLongLong ll(value); - wxString s = ll.ToString(); -#else - wxString s = wxString::Format(wxS("%ld"), (long)value); -#endif - wxAnyValueTypeImpl::SetValue(s, dst); - } - else if ( wxANY_VALUE_TYPE_CHECK_TYPE(dstType, wxAnyBaseUintType) ) - { - if ( value < 0 ) - return false; - wxAnyBaseUintType ul = (wxAnyBaseUintType) value; - wxAnyValueTypeImplUint::SetValue(ul, dst); - } - else if ( wxANY_VALUE_TYPE_CHECK_TYPE(dstType, double) ) - { - double value2 = static_cast(value); - wxAnyValueTypeImplDouble::SetValue(value2, dst); - } - else if ( wxANY_VALUE_TYPE_CHECK_TYPE(dstType, bool) ) - { - bool value2 = value ? true : false; - wxAnyValueTypeImpl::SetValue(value2, dst); - } - else - return false; - - return true; -} - -bool wxAnyValueTypeImplUint::ConvertValue(const wxAnyValueBuffer& src, - wxAnyValueType* dstType, - wxAnyValueBuffer& dst) const -{ - wxAnyBaseUintType value = GetValue(src); - if ( wxANY_VALUE_TYPE_CHECK_TYPE(dstType, wxString) ) - { -#if defined(wxLongLong_t) && wxUSE_LONGLONG - wxULongLong ull(value); - wxString s = ull.ToString(); -#else - wxString s = wxString::Format(wxS("%lu"), (long)value); -#endif - wxAnyValueTypeImpl::SetValue(s, dst); - } - else if ( wxANY_VALUE_TYPE_CHECK_TYPE(dstType, wxAnyBaseIntType) ) - { - if ( value > UseIntMax ) - return false; - wxAnyBaseIntType l = (wxAnyBaseIntType) value; - wxAnyValueTypeImplInt::SetValue(l, dst); - } - else if ( wxANY_VALUE_TYPE_CHECK_TYPE(dstType, double) ) - { - double value2 = static_cast(value); - wxAnyValueTypeImplDouble::SetValue(value2, dst); - } - else if ( wxANY_VALUE_TYPE_CHECK_TYPE(dstType, bool) ) - { - bool value2 = value ? true : false; - wxAnyValueTypeImpl::SetValue(value2, dst); - } - else - return false; - - return true; -} - -// Convert wxString to destination wxAny value type -bool wxAnyConvertString(const wxString& value, - wxAnyValueType* dstType, - wxAnyValueBuffer& dst) -{ - if ( wxANY_VALUE_TYPE_CHECK_TYPE(dstType, wxString) ) - { - wxAnyValueTypeImpl::SetValue(value, dst); - } - else if ( wxANY_VALUE_TYPE_CHECK_TYPE(dstType, wxAnyBaseIntType) ) - { - wxAnyBaseIntType value2; -#ifdef wxLongLong_t - if ( !value.ToLongLong(&value2) ) -#else - if ( !value.ToLong(&value2) ) -#endif - return false; - wxAnyValueTypeImplInt::SetValue(value2, dst); - } - else if ( wxANY_VALUE_TYPE_CHECK_TYPE(dstType, wxAnyBaseUintType) ) - { - wxAnyBaseUintType value2; -#ifdef wxLongLong_t - if ( !value.ToULongLong(&value2) ) -#else - if ( !value.ToULong(&value2) ) -#endif - return false; - wxAnyValueTypeImplUint::SetValue(value2, dst); - } - else if ( wxANY_VALUE_TYPE_CHECK_TYPE(dstType, double) ) - { - double value2; - if ( !value.ToCDouble(&value2) ) - return false; - wxAnyValueTypeImplDouble::SetValue(value2, dst); - } - else if ( wxANY_VALUE_TYPE_CHECK_TYPE(dstType, bool) ) - { - bool value2; - wxString s(value); - s.MakeLower(); - if ( s == wxS("true") || - s == wxS("yes") || - s == wxS('1') ) - value2 = true; - else if ( s == wxS("false") || - s == wxS("no") || - s == wxS('0') ) - value2 = false; - else - return false; - - wxAnyValueTypeImpl::SetValue(value2, dst); - } - else - return false; - - return true; -} - -bool wxAnyValueTypeImpl::ConvertValue(const wxAnyValueBuffer& src, - wxAnyValueType* dstType, - wxAnyValueBuffer& dst) const -{ - bool value = GetValue(src); - if ( wxANY_VALUE_TYPE_CHECK_TYPE(dstType, wxAnyBaseIntType) ) - { - wxAnyBaseIntType value2 = static_cast(value); - wxAnyValueTypeImplInt::SetValue(value2, dst); - } - else if ( wxANY_VALUE_TYPE_CHECK_TYPE(dstType, wxAnyBaseUintType) ) - { - wxAnyBaseIntType value2 = static_cast(value); - wxAnyValueTypeImplUint::SetValue(value2, dst); - } - else if ( wxANY_VALUE_TYPE_CHECK_TYPE(dstType, wxString) ) - { - wxString s; - if ( value ) - s = wxS("true"); - else - s = wxS("false"); - wxAnyValueTypeImpl::SetValue(s, dst); - } - else - return false; - - return true; -} - -bool wxAnyValueTypeImplDouble::ConvertValue(const wxAnyValueBuffer& src, - wxAnyValueType* dstType, - wxAnyValueBuffer& dst) const -{ - double value = GetValue(src); - if ( wxANY_VALUE_TYPE_CHECK_TYPE(dstType, wxAnyBaseIntType) ) - { - if ( value < UseIntMinF || value > UseIntMaxF ) - return false; - wxAnyBaseUintType ul = static_cast(value); - wxAnyValueTypeImplUint::SetValue(ul, dst); - } - else if ( wxANY_VALUE_TYPE_CHECK_TYPE(dstType, wxAnyBaseUintType) ) - { - if ( value < 0.0 || value > UseUintMaxF ) - return false; - wxAnyBaseUintType ul = static_cast(value); - wxAnyValueTypeImplUint::SetValue(ul, dst); - } - else if ( wxANY_VALUE_TYPE_CHECK_TYPE(dstType, wxString) ) - { - wxString s = wxString::FromCDouble(value, 14); - wxAnyValueTypeImpl::SetValue(s, dst); - } - else - return false; - - return true; -} - -WX_IMPLEMENT_ANY_VALUE_TYPE(wxAnyValueTypeImplInt) -WX_IMPLEMENT_ANY_VALUE_TYPE(wxAnyValueTypeImplUint) -WX_IMPLEMENT_ANY_VALUE_TYPE(wxAnyValueTypeImpl) -WX_IMPLEMENT_ANY_VALUE_TYPE(wxAnyValueTypeImplDouble) - -WX_IMPLEMENT_ANY_VALUE_TYPE(wxAnyValueTypeImplwxString) -WX_IMPLEMENT_ANY_VALUE_TYPE(wxAnyValueTypeImplConstCharPtr) -WX_IMPLEMENT_ANY_VALUE_TYPE(wxAnyValueTypeImplConstWchar_tPtr) - -#if wxUSE_DATETIME -WX_IMPLEMENT_ANY_VALUE_TYPE(wxAnyValueTypeImpl) -#endif // wxUSE_DATETIME - -//WX_IMPLEMENT_ANY_VALUE_TYPE(wxAnyValueTypeImpl) -//WX_IMPLEMENT_ANY_VALUE_TYPE(wxAnyValueTypeImpl) - -//------------------------------------------------------------------------- -// wxAnyNullValueType implementation -//------------------------------------------------------------------------- - -class wxAnyNullValue -{ -protected: - // this field is unused, but can't be private to avoid Clang's - // "Private field 'm_dummy' is not used" warning - void* m_dummy; -}; - -template <> -class wxAnyValueTypeImpl : public wxAnyValueType -{ - WX_DECLARE_ANY_VALUE_TYPE(wxAnyValueTypeImpl) -public: - // Dummy implementations - virtual void DeleteValue(wxAnyValueBuffer& buf) const wxOVERRIDE - { - wxUnusedVar(buf); - } - - virtual void CopyBuffer(const wxAnyValueBuffer& src, - wxAnyValueBuffer& dst) const wxOVERRIDE - { - wxUnusedVar(src); - wxUnusedVar(dst); - } - - virtual bool ConvertValue(const wxAnyValueBuffer& src, - wxAnyValueType* dstType, - wxAnyValueBuffer& dst) const wxOVERRIDE - { - wxUnusedVar(src); - wxUnusedVar(dstType); - wxUnusedVar(dst); - return false; - } - -#if wxUSE_EXTENDED_RTTI - virtual const wxTypeInfo* GetTypeInfo() const - { - wxFAIL_MSG("Null Type Info not available"); - return NULL; - } -#endif - -private: -}; - -WX_IMPLEMENT_ANY_VALUE_TYPE(wxAnyValueTypeImpl) - -wxAnyValueType* wxAnyNullValueType = - wxAnyValueTypeImpl::GetInstance(); - -#include "wx/listimpl.cpp" -WX_DEFINE_LIST(wxAnyList) - -#endif // wxUSE_ANY diff --git a/Externals/wxWidgets3/src/common/appbase.cpp b/Externals/wxWidgets3/src/common/appbase.cpp deleted file mode 100644 index 249afa5018..0000000000 --- a/Externals/wxWidgets3/src/common/appbase.cpp +++ /dev/null @@ -1,1392 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/appbase.cpp -// Purpose: implements wxAppConsoleBase class -// Author: Vadim Zeitlin -// Modified by: -// Created: 19.06.2003 (extracted from common/appcmn.cpp) -// Copyright: (c) 2003 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// for compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#ifndef WX_PRECOMP - #ifdef __WINDOWS__ - #include "wx/msw/wrapwin.h" // includes windows.h for MessageBox() - #endif - #include "wx/list.h" - #include "wx/app.h" - #include "wx/intl.h" - #include "wx/log.h" - #include "wx/utils.h" - #include "wx/wxcrtvararg.h" -#endif //WX_PRECOMP - -#include "wx/apptrait.h" -#include "wx/cmdline.h" -#include "wx/confbase.h" -#include "wx/evtloop.h" -#include "wx/filename.h" -#include "wx/msgout.h" -#include "wx/scopedptr.h" -#include "wx/sysopt.h" -#include "wx/tokenzr.h" -#include "wx/thread.h" -#include "wx/stdpaths.h" - -#if wxUSE_EXCEPTIONS - // Do we have a C++ compiler with enough C++11 support for - // std::exception_ptr and functions working with it? - #if __cplusplus >= 201103L - // Any conforming C++11 compiler should have it, but g++ implementation - // of exception handling depends on the availability of the atomic int - // operations apparently, so all known version of g++ with C++11 support - // (4.7..4.9) fail to provide exception_ptr if the symbol below is not - // set to 2 (meaning "always available"), which is notably the case for - // MinGW-w64 without -march=486 switch, see #16634. - #ifdef __GNUC__ - // This symbol is always defined in the known g++ version, so - // assume that if it isn't defined, things changed for the better - // and optimistically suppose that exception_ptr is available. - #if !defined(__GCC_ATOMIC_INT_LOCK_FREE) \ - || __GCC_ATOMIC_INT_LOCK_FREE > 1 - #define HAS_EXCEPTION_PTR - #endif - #else - #define HAS_EXCEPTION_PTR - #endif - #elif wxCHECK_VISUALC_VERSION(11) - // VC++ supports it since version 10, even though it doesn't define - // __cplusplus to C++11 value, but MSVC 2010 doesn't have a way to test - // whether exception_ptr is valid, so we'd need to use a separate bool - // flag for it if we wanted to make it work. For now just settle for - // only using exception_ptr for VC11 and later. - #define HAS_EXCEPTION_PTR - #endif - - #ifdef HAS_EXCEPTION_PTR - #include // for std::current_exception() - #include // for std::swap() - #endif - - #if wxUSE_STL - #include - #include - #endif -#endif // wxUSE_EXCEPTIONS - -#if !defined(__WINDOWS__) - #include // for SIGTRAP used by wxTrap() -#endif //Win/Unix - -#include - -#if wxUSE_FONTMAP - #include "wx/fontmap.h" -#endif // wxUSE_FONTMAP - -#if wxDEBUG_LEVEL - #if wxUSE_STACKWALKER - #include "wx/stackwalk.h" - #ifdef __WINDOWS__ - #include "wx/msw/debughlp.h" - #endif - #endif // wxUSE_STACKWALKER - - #include "wx/recguard.h" -#endif // wxDEBUG_LEVEL - -// wxABI_VERSION can be defined when compiling applications but it should be -// left undefined when compiling the library itself, it is then set to its -// default value in version.h -#if wxABI_VERSION != wxMAJOR_VERSION * 10000 + wxMINOR_VERSION * 100 + 99 -#error "wxABI_VERSION should not be defined when compiling the library" -#endif - -// ---------------------------------------------------------------------------- -// private functions prototypes -// ---------------------------------------------------------------------------- - -#if wxDEBUG_LEVEL - // really just show the assert dialog - static bool DoShowAssertDialog(const wxString& msg); - - // prepare for showing the assert dialog, use the given traits or - // DoShowAssertDialog() as last fallback to really show it - static - void ShowAssertDialog(const wxString& file, - int line, - const wxString& func, - const wxString& cond, - const wxString& msg, - wxAppTraits *traits = NULL); -#endif // wxDEBUG_LEVEL - -#ifdef __WXDEBUG__ - // turn on the trace masks specified in the env variable WXTRACE - static void LINKAGEMODE SetTraceMasks(); -#endif // __WXDEBUG__ - -// ---------------------------------------------------------------------------- -// global vars -// ---------------------------------------------------------------------------- - -wxAppConsole *wxAppConsoleBase::ms_appInstance = NULL; - -wxAppInitializerFunction wxAppConsoleBase::ms_appInitFn = NULL; - -wxSocketManager *wxAppTraitsBase::ms_manager = NULL; - -WXDLLIMPEXP_DATA_BASE(wxList) wxPendingDelete; - -// ---------------------------------------------------------------------------- -// wxEventLoopPtr -// ---------------------------------------------------------------------------- - -// this defines wxEventLoopPtr -wxDEFINE_TIED_SCOPED_PTR_TYPE(wxEventLoopBase) - -// ============================================================================ -// wxAppConsoleBase implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// ctor/dtor -// ---------------------------------------------------------------------------- - -wxAppConsoleBase::wxAppConsoleBase() -{ - m_traits = NULL; - m_mainLoop = NULL; - m_bDoPendingEventProcessing = true; - - ms_appInstance = static_cast(this); - -#ifdef __WXDEBUG__ - SetTraceMasks(); -#if wxUSE_UNICODE - // In unicode mode the SetTraceMasks call can cause an apptraits to be - // created, but since we are still in the constructor the wrong kind will - // be created for GUI apps. Destroy it so it can be created again later. - wxDELETE(m_traits); -#endif -#endif - - wxEvtHandler::AddFilter(this); -} - -wxAppConsoleBase::~wxAppConsoleBase() -{ - wxEvtHandler::RemoveFilter(this); - - // we're being destroyed and using this object from now on may not work or - // even crash so don't leave dangling pointers to it - ms_appInstance = NULL; - - delete m_traits; -} - -// ---------------------------------------------------------------------------- -// initialization/cleanup -// ---------------------------------------------------------------------------- - -bool wxAppConsoleBase::Initialize(int& WXUNUSED(argc), wxChar **WXUNUSED(argv)) -{ -#if defined(__WINDOWS__) - SetErrorMode(SEM_FAILCRITICALERRORS|SEM_NOOPENFILEERRORBOX); -#endif - - return true; -} - -wxString wxAppConsoleBase::GetAppName() const -{ - wxString name = m_appName; - if ( name.empty() ) - { - if ( argv ) - { - // the application name is, by default, the name of its executable file - wxFileName::SplitPath(argv[0], NULL, &name, NULL); - } -#if wxUSE_STDPATHS - else // fall back to the executable file name, if we can determine it - { - const wxString pathExe = wxStandardPaths::Get().GetExecutablePath(); - if ( !pathExe.empty() ) - { - wxFileName::SplitPath(pathExe, NULL, &name, NULL); - } - } -#endif // wxUSE_STDPATHS - } - return name; -} - -wxString wxAppConsoleBase::GetAppDisplayName() const -{ - // use the explicitly provided display name, if any - if ( !m_appDisplayName.empty() ) - return m_appDisplayName; - - // if the application name was explicitly set, use it as is as capitalizing - // it won't always produce good results - if ( !m_appName.empty() ) - return m_appName; - - // if neither is set, use the capitalized version of the program file as - // it's the most reasonable default - return GetAppName().Capitalize(); -} - -wxEventLoopBase *wxAppConsoleBase::CreateMainLoop() -{ - return GetTraits()->CreateEventLoop(); -} - -void wxAppConsoleBase::CleanUp() -{ - wxDELETE(m_mainLoop); -} - -// ---------------------------------------------------------------------------- -// OnXXX() callbacks -// ---------------------------------------------------------------------------- - -bool wxAppConsoleBase::OnInit() -{ -#if wxUSE_CMDLINE_PARSER - wxCmdLineParser parser(argc, argv); - - OnInitCmdLine(parser); - - bool cont; - switch ( parser.Parse(false /* don't show usage */) ) - { - case -1: - cont = OnCmdLineHelp(parser); - break; - - case 0: - cont = OnCmdLineParsed(parser); - break; - - default: - cont = OnCmdLineError(parser); - break; - } - - if ( !cont ) - return false; -#endif // wxUSE_CMDLINE_PARSER - - return true; -} - -int wxAppConsoleBase::OnRun() -{ - return MainLoop(); -} - -void wxAppConsoleBase::OnLaunched() -{ -} - -int wxAppConsoleBase::OnExit() -{ - // Delete all pending objects first, they might use wxConfig to save their - // state during their destruction. - DeletePendingObjects(); - -#if wxUSE_CONFIG - // delete the config object if any (don't use Get() here, but Set() - // because Get() could create a new config object) - delete wxConfigBase::Set(NULL); -#endif // wxUSE_CONFIG - - return 0; -} - -void wxAppConsoleBase::Exit() -{ - if (m_mainLoop != NULL) - ExitMainLoop(); - else - exit(-1); -} - -// ---------------------------------------------------------------------------- -// traits stuff -// ---------------------------------------------------------------------------- - -wxAppTraits *wxAppConsoleBase::CreateTraits() -{ - return new wxConsoleAppTraits; -} - -wxAppTraits *wxAppConsoleBase::GetTraits() -{ - // FIXME-MT: protect this with a CS? - if ( !m_traits ) - { - m_traits = CreateTraits(); - - wxASSERT_MSG( m_traits, wxT("wxApp::CreateTraits() failed?") ); - } - - return m_traits; -} - -/* static */ -wxAppTraits *wxAppConsoleBase::GetTraitsIfExists() -{ - wxAppConsole * const app = GetInstance(); - return app ? app->GetTraits() : NULL; -} - -/* static */ -wxAppTraits& wxAppConsoleBase::GetValidTraits() -{ - static wxConsoleAppTraits s_traitsConsole; - wxAppTraits* const traits = (wxTheApp ? wxTheApp->GetTraits() : NULL); - - return *(traits ? traits : &s_traitsConsole); -} - -// ---------------------------------------------------------------------------- -// wxEventLoop redirection -// ---------------------------------------------------------------------------- - -int wxAppConsoleBase::MainLoop() -{ - wxEventLoopBaseTiedPtr mainLoop(&m_mainLoop, CreateMainLoop()); - - if (wxTheApp) - wxTheApp->OnLaunched(); - - return m_mainLoop ? m_mainLoop->Run() : -1; -} - -void wxAppConsoleBase::ExitMainLoop() -{ - // we should exit from the main event loop, not just any currently active - // (e.g. modal dialog) event loop - if ( m_mainLoop && m_mainLoop->IsRunning() ) - { - m_mainLoop->Exit(0); - } -} - -bool wxAppConsoleBase::Pending() -{ - // use the currently active message loop here, not m_mainLoop, because if - // we're showing a modal dialog (with its own event loop) currently the - // main event loop is not running anyhow - wxEventLoopBase * const loop = wxEventLoopBase::GetActive(); - - return loop && loop->Pending(); -} - -bool wxAppConsoleBase::Dispatch() -{ - // see comment in Pending() - wxEventLoopBase * const loop = wxEventLoopBase::GetActive(); - - return loop && loop->Dispatch(); -} - -bool wxAppConsoleBase::Yield(bool onlyIfNeeded) -{ - wxEventLoopBase * const loop = wxEventLoopBase::GetActive(); - if ( loop ) - return loop->Yield(onlyIfNeeded); - - wxScopedPtr tmpLoop(CreateMainLoop()); - return tmpLoop->Yield(onlyIfNeeded); -} - -void wxAppConsoleBase::WakeUpIdle() -{ - wxEventLoopBase * const loop = wxEventLoopBase::GetActive(); - - if ( loop ) - loop->WakeUp(); -} - -bool wxAppConsoleBase::ProcessIdle() -{ - // synthesize an idle event and check if more of them are needed - wxIdleEvent event; - event.SetEventObject(this); - ProcessEvent(event); - -#if wxUSE_LOG - // flush the logged messages if any (do this after processing the events - // which could have logged new messages) - wxLog::FlushActive(); -#endif - - // Garbage collect all objects previously scheduled for destruction. - DeletePendingObjects(); - - return event.MoreRequested(); -} - -bool wxAppConsoleBase::UsesEventLoop() const -{ - // in console applications we don't know whether we're going to have an - // event loop so assume we won't -- unless we already have one running - return wxEventLoopBase::GetActive() != NULL; -} - -// ---------------------------------------------------------------------------- -// events -// ---------------------------------------------------------------------------- - -/* static */ -bool wxAppConsoleBase::IsMainLoopRunning() -{ - const wxAppConsole * const app = GetInstance(); - - return app && app->m_mainLoop != NULL; -} - -int wxAppConsoleBase::FilterEvent(wxEvent& WXUNUSED(event)) -{ - // process the events normally by default - return Event_Skip; -} - -void wxAppConsoleBase::DelayPendingEventHandler(wxEvtHandler* toDelay) -{ - wxENTER_CRIT_SECT(m_handlersWithPendingEventsLocker); - - // move the handler from the list of handlers with processable pending events - // to the list of handlers with pending events which needs to be processed later - m_handlersWithPendingEvents.Remove(toDelay); - - if (m_handlersWithPendingDelayedEvents.Index(toDelay) == wxNOT_FOUND) - m_handlersWithPendingDelayedEvents.Add(toDelay); - - wxLEAVE_CRIT_SECT(m_handlersWithPendingEventsLocker); -} - -void wxAppConsoleBase::RemovePendingEventHandler(wxEvtHandler* toRemove) -{ - wxENTER_CRIT_SECT(m_handlersWithPendingEventsLocker); - - if (m_handlersWithPendingEvents.Index(toRemove) != wxNOT_FOUND) - { - m_handlersWithPendingEvents.Remove(toRemove); - - // check that the handler was present only once in the list - wxASSERT_MSG( m_handlersWithPendingEvents.Index(toRemove) == wxNOT_FOUND, - "Handler occurs twice in the m_handlersWithPendingEvents list!" ); - } - //else: it wasn't in this list at all, it's ok - - if (m_handlersWithPendingDelayedEvents.Index(toRemove) != wxNOT_FOUND) - { - m_handlersWithPendingDelayedEvents.Remove(toRemove); - - // check that the handler was present only once in the list - wxASSERT_MSG( m_handlersWithPendingDelayedEvents.Index(toRemove) == wxNOT_FOUND, - "Handler occurs twice in m_handlersWithPendingDelayedEvents list!" ); - } - //else: it wasn't in this list at all, it's ok - - wxLEAVE_CRIT_SECT(m_handlersWithPendingEventsLocker); -} - -void wxAppConsoleBase::AppendPendingEventHandler(wxEvtHandler* toAppend) -{ - wxENTER_CRIT_SECT(m_handlersWithPendingEventsLocker); - - if ( m_handlersWithPendingEvents.Index(toAppend) == wxNOT_FOUND ) - m_handlersWithPendingEvents.Add(toAppend); - - wxLEAVE_CRIT_SECT(m_handlersWithPendingEventsLocker); -} - -bool wxAppConsoleBase::HasPendingEvents() const -{ - wxENTER_CRIT_SECT(const_cast(this)->m_handlersWithPendingEventsLocker); - - bool has = !m_handlersWithPendingEvents.IsEmpty(); - - wxLEAVE_CRIT_SECT(const_cast(this)->m_handlersWithPendingEventsLocker); - - return has; -} - -void wxAppConsoleBase::SuspendProcessingOfPendingEvents() -{ - m_bDoPendingEventProcessing = false; -} - -void wxAppConsoleBase::ResumeProcessingOfPendingEvents() -{ - m_bDoPendingEventProcessing = true; -} - -void wxAppConsoleBase::ProcessPendingEvents() -{ - if ( m_bDoPendingEventProcessing ) - { - wxENTER_CRIT_SECT(m_handlersWithPendingEventsLocker); - - wxCHECK_RET( m_handlersWithPendingDelayedEvents.IsEmpty(), - "this helper list should be empty" ); - - // iterate until the list becomes empty: the handlers remove themselves - // from it when they don't have any more pending events - while (!m_handlersWithPendingEvents.IsEmpty()) - { - // In ProcessPendingEvents(), new handlers might be added - // and we can safely leave the critical section here. - wxLEAVE_CRIT_SECT(m_handlersWithPendingEventsLocker); - - // NOTE: we always call ProcessPendingEvents() on the first event handler - // with pending events because handlers auto-remove themselves - // from this list (see RemovePendingEventHandler) if they have no - // more pending events. - m_handlersWithPendingEvents[0]->ProcessPendingEvents(); - - wxENTER_CRIT_SECT(m_handlersWithPendingEventsLocker); - } - - // now the wxHandlersWithPendingEvents is surely empty; however some event - // handlers may have moved themselves into wxHandlersWithPendingDelayedEvents - // because of a selective wxYield call in progress. - // Now we need to move them back to wxHandlersWithPendingEvents so the next - // call to this function has the chance of processing them: - if (!m_handlersWithPendingDelayedEvents.IsEmpty()) - { - WX_APPEND_ARRAY(m_handlersWithPendingEvents, m_handlersWithPendingDelayedEvents); - m_handlersWithPendingDelayedEvents.Clear(); - } - - wxLEAVE_CRIT_SECT(m_handlersWithPendingEventsLocker); - } -} - -void wxAppConsoleBase::DeletePendingEvents() -{ - wxENTER_CRIT_SECT(m_handlersWithPendingEventsLocker); - - wxCHECK_RET( m_handlersWithPendingDelayedEvents.IsEmpty(), - "this helper list should be empty" ); - - for (unsigned int i=0; iDeletePendingEvents(); - - m_handlersWithPendingEvents.Clear(); - - wxLEAVE_CRIT_SECT(m_handlersWithPendingEventsLocker); -} - -// ---------------------------------------------------------------------------- -// delayed objects destruction -// ---------------------------------------------------------------------------- - -bool wxAppConsoleBase::IsScheduledForDestruction(wxObject *object) const -{ - return wxPendingDelete.Member(object); -} - -void wxAppConsoleBase::ScheduleForDestruction(wxObject *object) -{ - if ( !UsesEventLoop() ) - { - // we won't be able to delete it later so do it right now - delete object; - return; - } - //else: we either already have or will soon start an event loop - - if ( !wxPendingDelete.Member(object) ) - wxPendingDelete.Append(object); -} - -void wxAppConsoleBase::DeletePendingObjects() -{ - wxList::compatibility_iterator node = wxPendingDelete.GetFirst(); - while (node) - { - wxObject *obj = node->GetData(); - - // remove it from the list first so that if we get back here somehow - // during the object deletion (e.g. wxYield called from its dtor) we - // wouldn't try to delete it the second time - if ( wxPendingDelete.Member(obj) ) - wxPendingDelete.Erase(node); - - delete obj; - - // Deleting one object may have deleted other pending - // objects, so start from beginning of list again. - node = wxPendingDelete.GetFirst(); - } -} - -// ---------------------------------------------------------------------------- -// exception handling -// ---------------------------------------------------------------------------- - -#if wxUSE_EXCEPTIONS - -void -wxAppConsoleBase::HandleEvent(wxEvtHandler *handler, - wxEventFunction func, - wxEvent& event) const -{ - // by default, simply call the handler - (handler->*func)(event); -} - -void wxAppConsoleBase::CallEventHandler(wxEvtHandler *handler, - wxEventFunctor& functor, - wxEvent& event) const -{ - // If the functor holds a method then, for backward compatibility, call - // HandleEvent(): - wxEventFunction eventFunction = functor.GetEvtMethod(); - - if ( eventFunction ) - HandleEvent(handler, eventFunction, event); - else - functor(handler, event); -} - -void wxAppConsoleBase::OnUnhandledException() -{ -#ifdef __WXDEBUG__ - // we're called from an exception handler so we can re-throw the exception - // to recover its type - wxString what; - try - { - throw; - } -#if wxUSE_STL - catch ( std::exception& e ) - { - what.Printf("std::exception of type \"%s\", what() = \"%s\"", - typeid(e).name(), e.what()); - } -#endif // wxUSE_STL - catch ( ... ) - { - what = "unknown exception"; - } - - wxMessageOutputBest().Printf( - "*** Caught unhandled %s; terminating\n", what - ); -#endif // __WXDEBUG__ -} - -// ---------------------------------------------------------------------------- -// exceptions support -// ---------------------------------------------------------------------------- - -bool wxAppConsoleBase::OnExceptionInMainLoop() -{ - throw; -} - -#ifdef HAS_EXCEPTION_PTR -static std::exception_ptr gs_storedException; - -bool wxAppConsoleBase::StoreCurrentException() -{ - if ( gs_storedException ) - { - // We can't store more than one exception currently: while we could - // support this by just using a vector, it shouldn't be - // actually necessary because we should never have more than one active - // exception anyhow. - return false; - } - - gs_storedException = std::current_exception(); - - return true; -} - -void wxAppConsoleBase::RethrowStoredException() -{ - if ( gs_storedException ) - { - std::exception_ptr storedException; - std::swap(storedException, gs_storedException); - - std::rethrow_exception(storedException); - } -} - -#else // !HAS_EXCEPTION_PTR - -bool wxAppConsoleBase::StoreCurrentException() -{ - return false; -} - -void wxAppConsoleBase::RethrowStoredException() -{ -} - -#endif // HAS_EXCEPTION_PTR/!HAS_EXCEPTION_PTR - -#endif // wxUSE_EXCEPTIONS - -// ---------------------------------------------------------------------------- -// cmd line parsing -// ---------------------------------------------------------------------------- - -#if wxUSE_CMDLINE_PARSER - -#define OPTION_VERBOSE "verbose" - -void wxAppConsoleBase::OnInitCmdLine(wxCmdLineParser& parser) -{ - // the standard command line options - static const wxCmdLineEntryDesc cmdLineDesc[] = - { - { - wxCMD_LINE_SWITCH, - "h", - "help", - gettext_noop("show this help message"), - wxCMD_LINE_VAL_NONE, - wxCMD_LINE_OPTION_HELP - }, - -#if wxUSE_LOG - { - wxCMD_LINE_SWITCH, - NULL, - OPTION_VERBOSE, - gettext_noop("generate verbose log messages"), - wxCMD_LINE_VAL_NONE, - 0x0 - }, -#endif // wxUSE_LOG - - // terminator - wxCMD_LINE_DESC_END - }; - - parser.SetDesc(cmdLineDesc); -} - -bool wxAppConsoleBase::OnCmdLineParsed(wxCmdLineParser& parser) -{ -#if wxUSE_LOG - if ( parser.Found(OPTION_VERBOSE) ) - { - wxLog::SetVerbose(true); - } -#else - wxUnusedVar(parser); -#endif // wxUSE_LOG - - return true; -} - -bool wxAppConsoleBase::OnCmdLineHelp(wxCmdLineParser& parser) -{ - parser.Usage(); - - return false; -} - -bool wxAppConsoleBase::OnCmdLineError(wxCmdLineParser& parser) -{ - parser.Usage(); - - return false; -} - -#endif // wxUSE_CMDLINE_PARSER - -// ---------------------------------------------------------------------------- -// debugging support -// ---------------------------------------------------------------------------- - -/* static */ -bool wxAppConsoleBase::CheckBuildOptions(const char *optionsSignature, - const char *componentName) -{ -#if 0 // can't use wxLogTrace, not up and running yet - printf("checking build options object '%s' (ptr %p) in '%s'\n", - optionsSignature, optionsSignature, componentName); -#endif - - if ( strcmp(optionsSignature, WX_BUILD_OPTIONS_SIGNATURE) != 0 ) - { - wxString lib = wxString::FromAscii(WX_BUILD_OPTIONS_SIGNATURE); - wxString prog = wxString::FromAscii(optionsSignature); - wxString progName = wxString::FromAscii(componentName); - wxString msg; - - msg.Printf(wxT("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."), - lib.c_str(), progName.c_str(), prog.c_str()); - - wxLogFatalError(msg.c_str()); - - // normally wxLogFatalError doesn't return - return false; - } - - return true; -} - -void wxAppConsoleBase::OnAssertFailure(const wxChar *file, - int line, - const wxChar *func, - const wxChar *cond, - const wxChar *msg) -{ -#if wxDEBUG_LEVEL - ShowAssertDialog(file, line, func, cond, msg, GetTraits()); -#else - // this function is still present even in debug level 0 build for ABI - // compatibility reasons but is never called there and so can simply do - // nothing in it - wxUnusedVar(file); - wxUnusedVar(line); - wxUnusedVar(func); - wxUnusedVar(cond); - wxUnusedVar(msg); -#endif // wxDEBUG_LEVEL/!wxDEBUG_LEVEL -} - -void wxAppConsoleBase::OnAssert(const wxChar *file, - int line, - const wxChar *cond, - const wxChar *msg) -{ - OnAssertFailure(file, line, NULL, cond, msg); -} - -// ---------------------------------------------------------------------------- -// Miscellaneous other methods -// ---------------------------------------------------------------------------- - -void wxAppConsoleBase::SetCLocale() -{ - // We want to use the user locale by default in GUI applications in order - // to show the numbers, dates &c in the familiar format -- and also accept - // this format on input (especially important for decimal comma/dot). - wxSetlocale(LC_ALL, ""); -} - -// ============================================================================ -// other classes implementations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxConsoleAppTraitsBase -// ---------------------------------------------------------------------------- - -#if wxUSE_LOG - -wxLog *wxConsoleAppTraitsBase::CreateLogTarget() -{ - return new wxLogStderr; -} - -#endif // wxUSE_LOG - -wxMessageOutput *wxConsoleAppTraitsBase::CreateMessageOutput() -{ - return new wxMessageOutputStderr; -} - -#if wxUSE_FONTMAP - -wxFontMapper *wxConsoleAppTraitsBase::CreateFontMapper() -{ - return (wxFontMapper *)new wxFontMapperBase; -} - -#endif // wxUSE_FONTMAP - -wxRendererNative *wxConsoleAppTraitsBase::CreateRenderer() -{ - // console applications don't use renderers - return NULL; -} - -bool wxConsoleAppTraitsBase::ShowAssertDialog(const wxString& msg) -{ - return wxAppTraitsBase::ShowAssertDialog(msg); -} - -bool wxConsoleAppTraitsBase::HasStderr() -{ - // console applications always have stderr, even under Mac/Windows - return true; -} - -// ---------------------------------------------------------------------------- -// wxAppTraits -// ---------------------------------------------------------------------------- - -#if wxUSE_THREADS -void wxMutexGuiEnterImpl(); -void wxMutexGuiLeaveImpl(); - -void wxAppTraitsBase::MutexGuiEnter() -{ - wxMutexGuiEnterImpl(); -} - -void wxAppTraitsBase::MutexGuiLeave() -{ - wxMutexGuiLeaveImpl(); -} - -void WXDLLIMPEXP_BASE wxMutexGuiEnter() -{ - wxAppTraits * const traits = wxAppConsoleBase::GetTraitsIfExists(); - if ( traits ) - traits->MutexGuiEnter(); -} - -void WXDLLIMPEXP_BASE wxMutexGuiLeave() -{ - wxAppTraits * const traits = wxAppConsoleBase::GetTraitsIfExists(); - if ( traits ) - traits->MutexGuiLeave(); -} -#endif // wxUSE_THREADS - -bool wxAppTraitsBase::ShowAssertDialog(const wxString& msgOriginal) -{ -#if wxDEBUG_LEVEL - wxString msg; - -#if wxUSE_STACKWALKER - const wxString stackTrace = GetAssertStackTrace(); - if ( !stackTrace.empty() ) - { - msg << wxT("\n\nCall stack:\n") << stackTrace; - - wxMessageOutputDebug().Output(msg); - } -#endif // wxUSE_STACKWALKER - - return DoShowAssertDialog(msgOriginal + msg); -#else // !wxDEBUG_LEVEL - wxUnusedVar(msgOriginal); - - return false; -#endif // wxDEBUG_LEVEL/!wxDEBUG_LEVEL -} - -#if wxUSE_STACKWALKER -wxString wxAppTraitsBase::GetAssertStackTrace() -{ -#if wxDEBUG_LEVEL - -#if !defined(__WINDOWS__) - // on Unix stack frame generation may take some time, depending on the - // size of the executable mainly... warn the user that we are working - wxFprintf(stderr, "Collecting stack trace information, please wait..."); - fflush(stderr); -#endif // !__WINDOWS__ - - - class StackDump : public wxStackWalker - { - public: - StackDump() { m_numFrames = 0; } - - const wxString& GetStackTrace() const { return m_stackTrace; } - - protected: - virtual void OnStackFrame(const wxStackFrame& frame) wxOVERRIDE - { - // don't show more than maxLines or we could get a dialog too tall - // to be shown on screen: 20 should be ok everywhere as even with - // 15 pixel high characters it is still only 300 pixels... - if ( m_numFrames++ > 20 ) - return; - - m_stackTrace << wxString::Format(wxT("[%02u] "), m_numFrames); - - const wxString name = frame.GetName(); - if ( name.StartsWith("wxOnAssert") ) - { - // Ignore all frames until the wxOnAssert() one, they are - // internal to wxWidgets and not interesting for the user - // (but notice that if we never find the wxOnAssert() frame, - // e.g. because we don't have symbol info at all, we would show - // everything which is better than not showing anything). - m_stackTrace.clear(); - m_numFrames = 0; - return; - } - - if ( !name.empty() ) - { - m_stackTrace << wxString::Format(wxT("%-40s"), name.c_str()); - } - else - { - m_stackTrace << wxString::Format(wxT("%p"), frame.GetAddress()); - } - - if ( frame.HasSourceLocation() ) - { - m_stackTrace << wxT('\t') - << frame.GetFileName() - << wxT(':') - << frame.GetLine(); - } - - m_stackTrace << wxT('\n'); - } - - private: - wxString m_stackTrace; - unsigned m_numFrames; - }; - - StackDump dump; - dump.Walk(); - return dump.GetStackTrace(); -#else // !wxDEBUG_LEVEL - // this function is still present for ABI-compatibility even in debug level - // 0 build but is not used there and so can simply do nothing - return wxString(); -#endif // wxDEBUG_LEVEL/!wxDEBUG_LEVEL -} -#endif // wxUSE_STACKWALKER - - -// ============================================================================ -// global functions implementation -// ============================================================================ - -void wxExit() -{ - if ( wxTheApp ) - { - wxTheApp->Exit(); - } - else - { - // what else can we do? - exit(-1); - } -} - -void wxWakeUpIdle() -{ - if ( wxTheApp ) - { - wxTheApp->WakeUpIdle(); - } - //else: do nothing, what can we do? -} - -// wxASSERT() helper -bool wxAssertIsEqual(int x, int y) -{ - return x == y; -} - -void wxAbort() -{ - abort(); -} - -#if wxDEBUG_LEVEL - -// break into the debugger -#ifndef wxTrap - -void wxTrap() -{ -#if defined(__WINDOWS__) - DebugBreak(); -#elif defined(_MSL_USING_MW_C_HEADERS) && _MSL_USING_MW_C_HEADERS - Debugger(); -#elif defined(__UNIX__) - raise(SIGTRAP); -#else - // TODO -#endif // Win/Unix -} - -#endif // wxTrap already defined as a macro - -// default assert handler -static void -wxDefaultAssertHandler(const wxString& file, - int line, - const wxString& func, - const wxString& cond, - const wxString& msg) -{ - // If this option is set, we should abort immediately when assert happens. - if ( wxSystemOptions::GetOptionInt("exit-on-assert") ) - wxAbort(); - - // FIXME MT-unsafe - static int s_bInAssert = 0; - - wxRecursionGuard guard(s_bInAssert); - if ( guard.IsInside() ) - { - // can't use assert here to avoid infinite loops, so just trap - wxTrap(); - - return; - } - - if ( !wxTheApp ) - { - // by default, show the assert dialog box -- we can't customize this - // behaviour - ShowAssertDialog(file, line, func, cond, msg); - } - else - { - // let the app process it as it wants - // FIXME-UTF8: use wc_str(), not c_str(), when ANSI build is removed - wxTheApp->OnAssertFailure(file.c_str(), line, func.c_str(), - cond.c_str(), msg.c_str()); - } -} - -wxAssertHandler_t wxTheAssertHandler = wxDefaultAssertHandler; - -void wxSetDefaultAssertHandler() -{ - wxTheAssertHandler = wxDefaultAssertHandler; -} - -void wxOnAssert(const wxString& file, - int line, - const wxString& func, - const wxString& cond, - const wxString& msg) -{ - wxTheAssertHandler(file, line, func, cond, msg); -} - -void wxOnAssert(const wxString& file, - int line, - const wxString& func, - const wxString& cond) -{ - wxTheAssertHandler(file, line, func, cond, wxString()); -} - -void wxOnAssert(const wxChar *file, - int line, - const char *func, - const wxChar *cond, - const wxChar *msg) -{ - // this is the backwards-compatible version (unless we don't use Unicode) - // so it could be called directly from the user code and this might happen - // even when wxTheAssertHandler is NULL -#if wxUSE_UNICODE - if ( wxTheAssertHandler ) -#endif // wxUSE_UNICODE - wxTheAssertHandler(file, line, func, cond, msg); -} - -void wxOnAssert(const char *file, - int line, - const char *func, - const char *cond, - const wxString& msg) -{ - wxTheAssertHandler(file, line, func, cond, msg); -} - -void wxOnAssert(const char *file, - int line, - const char *func, - const char *cond, - const wxCStrData& msg) -{ - wxTheAssertHandler(file, line, func, cond, msg); -} - -#if wxUSE_UNICODE -void wxOnAssert(const char *file, - int line, - const char *func, - const char *cond) -{ - wxTheAssertHandler(file, line, func, cond, wxString()); -} - -void wxOnAssert(const char *file, - int line, - const char *func, - const char *cond, - const char *msg) -{ - wxTheAssertHandler(file, line, func, cond, msg); -} - -void wxOnAssert(const char *file, - int line, - const char *func, - const char *cond, - const wxChar *msg) -{ - wxTheAssertHandler(file, line, func, cond, msg); -} -#endif // wxUSE_UNICODE - -#endif // wxDEBUG_LEVEL - -// ============================================================================ -// private functions implementation -// ============================================================================ - -#ifdef __WXDEBUG__ - -static void LINKAGEMODE SetTraceMasks() -{ -#if wxUSE_LOG - wxString mask; - if ( wxGetEnv(wxT("WXTRACE"), &mask) ) - { - wxStringTokenizer tkn(mask, wxT(",;:")); - while ( tkn.HasMoreTokens() ) - wxLog::AddTraceMask(tkn.GetNextToken()); - } -#endif // wxUSE_LOG -} - -#endif // __WXDEBUG__ - -#if wxDEBUG_LEVEL - -bool wxTrapInAssert = false; - -static -bool DoShowAssertDialog(const wxString& msg) -{ - // under Windows we can show the dialog even in the console mode -#if defined(__WINDOWS__) - wxString msgDlg(msg); - - // this message is intentionally not translated -- it is for developers - // only -- and the less code we use here, less is the danger of recursively - // asserting and dying - msgDlg += wxT("\nDo you want to stop the program?\n") - wxT("You can also choose [Cancel] to suppress ") - wxT("further warnings."); - - switch ( ::MessageBox(NULL, msgDlg.t_str(), wxT("wxWidgets Debug Alert"), - MB_YESNOCANCEL | MB_ICONSTOP ) ) - { - case IDYES: - // If we called wxTrap() directly from here, the programmer would - // see this function and a few more calls between his own code and - // it in the stack trace which would be perfectly useless and often - // confusing. So instead just set the flag here and let the macros - // defined in wx/debug.h call wxTrap() themselves, this ensures - // that the debugger will show the line in the user code containing - // the failing assert. - wxTrapInAssert = true; - break; - - case IDCANCEL: - // stop the asserts - return true; - - //case IDNO: nothing to do - } -#else // !__WINDOWS__ - wxUnusedVar(msg); -#endif // __WINDOWS__/!__WINDOWS__ - - // continue with the asserts by default - return false; -} - -// show the standard assert dialog -static -void ShowAssertDialog(const wxString& file, - int line, - const wxString& func, - const wxString& cond, - const wxString& msgUser, - wxAppTraits *traits) -{ - // this variable can be set to true to suppress "assert failure" messages - static bool s_bNoAsserts = false; - - wxString msg; - msg.reserve(2048); - - // make life easier for people using VC++ IDE by using this format: like - // this, clicking on the message will take us immediately to the place of - // the failed assert - msg.Printf(wxT("%s(%d): assert \"%s\" failed"), file, line, cond); - - // add the function name, if any - if ( !func.empty() ) - msg << wxT(" in ") << func << wxT("()"); - - // and the message itself - if ( !msgUser.empty() ) - { - msg << wxT(": ") << msgUser; - } - else // no message given - { - msg << wxT('.'); - } - -#if wxUSE_THREADS - if ( !wxThread::IsMain() ) - { - msg += wxString::Format(" [in thread %lx]", wxThread::GetCurrentId()); - } -#endif // wxUSE_THREADS - - // log the assert in any case - wxMessageOutputDebug().Output(msg); - - if ( !s_bNoAsserts ) - { - if ( traits ) - { - // delegate showing assert dialog (if possible) to that class - s_bNoAsserts = traits->ShowAssertDialog(msg); - } - else // no traits object - { - // fall back to the function of last resort - s_bNoAsserts = DoShowAssertDialog(msg); - } - } -} - -#endif // wxDEBUG_LEVEL diff --git a/Externals/wxWidgets3/src/common/appcmn.cpp b/Externals/wxWidgets3/src/common/appcmn.cpp deleted file mode 100644 index fc784f6e7c..0000000000 --- a/Externals/wxWidgets3/src/common/appcmn.cpp +++ /dev/null @@ -1,514 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/appcmn.cpp -// Purpose: wxAppBase methods common to all platforms -// Author: Vadim Zeitlin -// Modified by: -// Created: 18.10.99 -// Copyright: (c) Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// --------------------------------------------------------------------------- -// headers -// --------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if defined(__BORLANDC__) - #pragma hdrstop -#endif - -#ifndef WX_PRECOMP - #include "wx/app.h" - #include "wx/window.h" - #include "wx/bitmap.h" - #include "wx/log.h" - #include "wx/msgdlg.h" - #include "wx/confbase.h" - #include "wx/utils.h" - #include "wx/wxcrtvararg.h" -#endif - -#include "wx/apptrait.h" -#include "wx/cmdline.h" -#include "wx/msgout.h" -#include "wx/thread.h" -#include "wx/vidmode.h" -#include "wx/evtloop.h" - -#if wxUSE_FONTMAP - #include "wx/fontmap.h" -#endif // wxUSE_FONTMAP - -// DLL options compatibility check: -#include "wx/build.h" -WX_CHECK_BUILD_OPTIONS("wxCore") - -// ============================================================================ -// wxAppBase implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// initialization -// ---------------------------------------------------------------------------- - -wxAppBase::wxAppBase() -{ - m_topWindow = NULL; - - m_useBestVisual = false; - m_forceTrueColour = false; - - m_isActive = true; - - // We don't want to exit the app if the user code shows a dialog from its - // OnInit() -- but this is what would happen if we set m_exitOnFrameDelete - // to Yes initially as this dialog would be the last top level window. - // OTOH, if we set it to No initially we'll have to overwrite it with Yes - // when we enter our OnRun() because we do want the default behaviour from - // then on. But this would be a problem if the user code calls - // SetExitOnFrameDelete(false) from OnInit(). - // - // So we use the special "Later" value which is such that - // GetExitOnFrameDelete() returns false for it but which we know we can - // safely (i.e. without losing the effect of the users SetExitOnFrameDelete - // call) overwrite in OnRun() - m_exitOnFrameDelete = Later; -} - -bool wxAppBase::Initialize(int& argcOrig, wxChar **argvOrig) -{ -#ifdef __WXOSX__ - // Mac OS X passes a process serial number command line argument when - // the application is launched from the Finder. This argument must be - // removed from the command line arguments before being handled by the - // application (otherwise applications would need to handle it) - // - // Notice that this has to be done for all ports that can be used under OS - // X (e.g. wxGTK) and not just wxOSX itself, hence this code is here and - // not in a port-specific file. - if ( argcOrig > 1 ) - { - static const wxChar *ARG_PSN = wxT("-psn_"); - if ( wxStrncmp(argvOrig[1], ARG_PSN, wxStrlen(ARG_PSN)) == 0 ) - { - // remove this argument - --argcOrig; - memmove(argvOrig + 1, argvOrig + 2, argcOrig * sizeof(wxChar*)); - } - } -#endif // __WXOSX__ - - if ( !wxAppConsole::Initialize(argcOrig, argvOrig) ) - return false; - - wxInitializeStockLists(); - - wxBitmap::InitStandardHandlers(); - - // for compatibility call the old initialization function too - if ( !OnInitGui() ) - return false; - - return true; -} - -// ---------------------------------------------------------------------------- -// cleanup -// ---------------------------------------------------------------------------- - -wxAppBase::~wxAppBase() -{ - // this destructor is required for Darwin -} - -void wxAppBase::CleanUp() -{ - // Clean up any still pending objects. Normally there shouldn't any as we - // already do this in OnExit(), but this could happen if the user code has - // somehow managed to create more of them since then or just forgot to call - // the base class OnExit(). - DeletePendingObjects(); - - // and any remaining TLWs (they remove themselves from wxTopLevelWindows - // when destroyed, so iterate until none are left) - while ( !wxTopLevelWindows.empty() ) - { - // do not use Destroy() here as it only puts the TLW in pending list - // but we want to delete them now - delete wxTopLevelWindows.GetFirst()->GetData(); - } - - // undo everything we did in Initialize() above - wxBitmap::CleanUpHandlers(); - - wxStockGDI::DeleteAll(); - - wxDeleteStockLists(); - - wxDELETE(wxTheColourDatabase); - - wxAppConsole::CleanUp(); -} - -// ---------------------------------------------------------------------------- -// various accessors -// ---------------------------------------------------------------------------- - -wxWindow* wxAppBase::GetTopWindow() const -{ - wxWindow* window = m_topWindow; - if (window == NULL && wxTopLevelWindows.GetCount() > 0) - window = wxTopLevelWindows.GetFirst()->GetData(); - return window; -} - -wxVideoMode wxAppBase::GetDisplayMode() const -{ - return wxVideoMode(); -} - -wxLayoutDirection wxAppBase::GetLayoutDirection() const -{ -#if wxUSE_INTL - const wxLocale *const locale = wxGetLocale(); - if ( locale ) - { - const wxLanguageInfo *const - info = wxLocale::GetLanguageInfo(locale->GetLanguage()); - - if ( info ) - return info->LayoutDirection; - } -#endif // wxUSE_INTL - - // we don't know - return wxLayout_Default; -} - -#if wxUSE_CMDLINE_PARSER - -// ---------------------------------------------------------------------------- -// GUI-specific command line options handling -// ---------------------------------------------------------------------------- - -#ifdef __WXUNIVERSAL__ -#define OPTION_THEME "theme" -#endif -#if defined(__WXDFB__) -#define OPTION_MODE "mode" -#endif - -void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser) -{ - // first add the standard non GUI options - wxAppConsole::OnInitCmdLine(parser); - - // the standard command line options - static const wxCmdLineEntryDesc cmdLineGUIDesc[] = - { -#ifdef __WXUNIVERSAL__ - { - wxCMD_LINE_OPTION, - NULL, - OPTION_THEME, - gettext_noop("specify the theme to use"), - wxCMD_LINE_VAL_STRING, - 0x0 - }, -#endif // __WXUNIVERSAL__ - -#if defined(__WXDFB__) - // VS: this is not specific to wxDFB, all fullscreen (framebuffer) ports - // should provide this option. That's why it is in common/appcmn.cpp - // and not dfb/app.cpp - { - wxCMD_LINE_OPTION, - NULL, - OPTION_MODE, - gettext_noop("specify display mode to use (e.g. 640x480-16)"), - wxCMD_LINE_VAL_STRING, - 0x0 - }, -#endif // __WXDFB__ - - // terminator - wxCMD_LINE_DESC_END - }; - - parser.SetDesc(cmdLineGUIDesc); -} - -bool wxAppBase::OnCmdLineParsed(wxCmdLineParser& parser) -{ -#ifdef __WXUNIVERSAL__ - wxString themeName; - if ( parser.Found(OPTION_THEME, &themeName) ) - { - wxTheme *theme = wxTheme::Create(themeName); - if ( !theme ) - { - wxLogError(_("Unsupported theme '%s'."), themeName.c_str()); - return false; - } - - // Delete the defaultly created theme and set the new theme. - delete wxTheme::Get(); - wxTheme::Set(theme); - } -#endif // __WXUNIVERSAL__ - -#if defined(__WXDFB__) - wxString modeDesc; - if ( parser.Found(OPTION_MODE, &modeDesc) ) - { - unsigned w, h, bpp; - if ( wxSscanf(modeDesc.c_str(), wxT("%ux%u-%u"), &w, &h, &bpp) != 3 ) - { - wxLogError(_("Invalid display mode specification '%s'."), modeDesc.c_str()); - return false; - } - - if ( !SetDisplayMode(wxVideoMode(w, h, bpp)) ) - return false; - } -#endif // __WXDFB__ - - return wxAppConsole::OnCmdLineParsed(parser); -} - -#endif // wxUSE_CMDLINE_PARSER - -// ---------------------------------------------------------------------------- -// OnXXX() hooks -// ---------------------------------------------------------------------------- - -bool wxAppBase::OnInitGui() -{ -#ifdef __WXUNIVERSAL__ - if ( !wxTheme::Get() && !wxTheme::CreateDefault() ) - return false; -#endif // __WXUNIVERSAL__ - - return true; -} - -int wxAppBase::OnRun() -{ - // see the comment in ctor: if the initial value hasn't been changed, use - // the default Yes from now on - if ( m_exitOnFrameDelete == Later ) - { - m_exitOnFrameDelete = Yes; - } - //else: it has been changed, assume the user knows what he is doing - - return wxAppConsole::OnRun(); -} - -int wxAppBase::OnExit() -{ -#ifdef __WXUNIVERSAL__ - delete wxTheme::Set(NULL); -#endif // __WXUNIVERSAL__ - - return wxAppConsole::OnExit(); -} - -wxAppTraits *wxAppBase::CreateTraits() -{ - return new wxGUIAppTraits; -} - -// ---------------------------------------------------------------------------- -// misc -// ---------------------------------------------------------------------------- - -void wxAppBase::SetActive(bool active, wxWindow * WXUNUSED(lastFocus)) -{ - if ( active == m_isActive ) - return; - - m_isActive = active; - - wxActivateEvent event(wxEVT_ACTIVATE_APP, active); - event.SetEventObject(this); - - (void)ProcessEvent(event); -} - -bool wxAppBase::SafeYield(wxWindow *win, bool onlyIfNeeded) -{ - wxWindowDisabler wd(win); - - wxEventLoopBase * const loop = wxEventLoopBase::GetActive(); - - return loop && loop->Yield(onlyIfNeeded); -} - -bool wxAppBase::SafeYieldFor(wxWindow *win, long eventsToProcess) -{ - wxWindowDisabler wd(win); - - wxEventLoopBase * const loop = wxEventLoopBase::GetActive(); - - return loop && loop->YieldFor(eventsToProcess); -} - - -// ---------------------------------------------------------------------------- -// idle handling -// ---------------------------------------------------------------------------- - -// Returns true if more time is needed. -bool wxAppBase::ProcessIdle() -{ - // call the base class version first to send the idle event to wxTheApp - // itself - bool needMore = wxAppConsoleBase::ProcessIdle(); - wxIdleEvent event; - wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst(); - while (node) - { - wxWindow* win = node->GetData(); - - // Don't send idle events to the windows that are about to be destroyed - // anyhow, this is wasteful and unexpected. - if ( !wxPendingDelete.Member(win) && win->SendIdleEvents(event) ) - needMore = true; - node = node->GetNext(); - } - - wxUpdateUIEvent::ResetUpdateTime(); - - return needMore; -} - -// ---------------------------------------------------------------------------- -// wxGUIAppTraitsBase -// ---------------------------------------------------------------------------- - -#if wxUSE_LOG - -wxLog *wxGUIAppTraitsBase::CreateLogTarget() -{ -#if wxUSE_LOGGUI -#ifndef __WXOSX_IPHONE__ - return new wxLogGui; -#else - return new wxLogStderr; -#endif -#else - // we must have something! - return new wxLogStderr; -#endif -} - -#endif // wxUSE_LOG - -wxMessageOutput *wxGUIAppTraitsBase::CreateMessageOutput() -{ - // The standard way of printing help on command line arguments (app --help) - // is (according to common practice): - // - console apps: to stderr (on any platform) - // - GUI apps: stderr on Unix platforms (!) - // stderr if available and message box otherwise on others - // (currently stderr only Windows if app running from console) -#ifdef __UNIX__ - return new wxMessageOutputStderr; -#else // !__UNIX__ - // wxMessageOutputMessageBox doesn't work under Motif - #ifdef __WXMOTIF__ - return new wxMessageOutputLog; - #elif wxUSE_MSGDLG - return new wxMessageOutputBest(wxMSGOUT_PREFER_STDERR); - #else - return new wxMessageOutputStderr; - #endif -#endif // __UNIX__/!__UNIX__ -} - -#if wxUSE_FONTMAP - -wxFontMapper *wxGUIAppTraitsBase::CreateFontMapper() -{ - return new wxFontMapper; -} - -#endif // wxUSE_FONTMAP - -wxRendererNative *wxGUIAppTraitsBase::CreateRenderer() -{ - // use the default native renderer by default - return NULL; -} - -bool wxGUIAppTraitsBase::ShowAssertDialog(const wxString& msg) -{ -#if wxDEBUG_LEVEL - // under MSW we prefer to use the base class version using ::MessageBox() - // even if wxMessageBox() is available because it has less chances to - // double fault our app than our wxMessageBox() - // - // under DFB the message dialog is not always functional right now - // - // and finally we can't use wxMessageBox() if it wasn't compiled in, of - // course -#if !defined(__WXMSW__) && !defined(__WXDFB__) && wxUSE_MSGDLG - - // we can't (safely) show the GUI dialog from another thread, only do it - // for the asserts in the main thread - if ( wxIsMainThread() ) - { - wxString msgDlg = msg; - -#if wxUSE_STACKWALKER - const wxString stackTrace = GetAssertStackTrace(); - if ( !stackTrace.empty() ) - msgDlg << wxT("\n\nCall stack:\n") << stackTrace; -#endif // wxUSE_STACKWALKER - - // this message is intentionally not translated -- it is for - // developpers only - msgDlg += wxT("\nDo you want to stop the program?\n") - wxT("You can also choose [Cancel] to suppress ") - wxT("further warnings."); - - switch ( wxMessageBox(msgDlg, wxT("wxWidgets Debug Alert"), - wxYES_NO | wxCANCEL | wxICON_STOP ) ) - { - case wxYES: - wxTrap(); - break; - - case wxCANCEL: - // no more asserts - return true; - - //case wxNO: nothing to do - } - - return false; - } -#endif // wxUSE_MSGDLG -#endif // wxDEBUG_LEVEL - - return wxAppTraitsBase::ShowAssertDialog(msg); -} - -bool wxGUIAppTraitsBase::HasStderr() -{ - // we consider that under Unix stderr always goes somewhere, even if the - // user doesn't always see it under GUI desktops -#ifdef __UNIX__ - return true; -#else - return false; -#endif -} - diff --git a/Externals/wxWidgets3/src/common/arcall.cpp b/Externals/wxWidgets3/src/common/arcall.cpp deleted file mode 100644 index 49776dcce5..0000000000 --- a/Externals/wxWidgets3/src/common/arcall.cpp +++ /dev/null @@ -1,40 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/arcall.cpp -// Purpose: wxArchive link all archive streams -// Author: Mike Wetherell -// Copyright: (c) 2006 Mike Wetherell -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_ARCHIVE_STREAMS - -#if wxUSE_ZIPSTREAM -#include "wx/zipstrm.h" -#endif -#if wxUSE_TARSTREAM -#include "wx/tarstrm.h" -#endif - -// Reference archive classes to ensure they are linked into a statically -// linked program that uses Find or GetFirst to look for an archive handler. -// It is in its own file so that the user can override this behaviour by -// providing their own implementation. - -void wxUseArchiveClasses() -{ -#if wxUSE_ZIPSTREAM - wxZipClassFactory(); -#endif -#if wxUSE_TARSTREAM - wxTarClassFactory(); -#endif -} - -#endif // wxUSE_ARCHIVE_STREAMS diff --git a/Externals/wxWidgets3/src/common/arcfind.cpp b/Externals/wxWidgets3/src/common/arcfind.cpp deleted file mode 100644 index 6f90d5cc50..0000000000 --- a/Externals/wxWidgets3/src/common/arcfind.cpp +++ /dev/null @@ -1,42 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/arcfind.cpp -// Purpose: Streams for archive formats -// Author: Mike Wetherell -// Copyright: (c) Mike Wetherell -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_ARCHIVE_STREAMS - -#include "wx/archive.h" - -// These functions are in a separate file so that statically linked apps -// that do not call them to search for archive handlers will only link in -// the archive classes they use. - -const wxArchiveClassFactory * -wxArchiveClassFactory::Find(const wxString& protocol, wxStreamProtocolType type) -{ - for (const wxArchiveClassFactory *f = GetFirst(); f; f = f->GetNext()) - if (f->CanHandle(protocol, type)) - return f; - - return NULL; -} - -// static -const wxArchiveClassFactory *wxArchiveClassFactory::GetFirst() -{ - if (!sm_first) - wxUseArchiveClasses(); - return sm_first; -} - -#endif // wxUSE_ARCHIVE_STREAMS diff --git a/Externals/wxWidgets3/src/common/archive.cpp b/Externals/wxWidgets3/src/common/archive.cpp deleted file mode 100644 index fc85b55b03..0000000000 --- a/Externals/wxWidgets3/src/common/archive.cpp +++ /dev/null @@ -1,97 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/archive.cpp -// Purpose: Streams for archive formats -// Author: Mike Wetherell -// Copyright: (c) Mike Wetherell -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_STREAMS && wxUSE_ARCHIVE_STREAMS - -#include "wx/archive.h" - -wxIMPLEMENT_ABSTRACT_CLASS(wxArchiveEntry, wxObject); -wxIMPLEMENT_ABSTRACT_CLASS(wxArchiveClassFactory, wxFilterClassFactoryBase); - - -///////////////////////////////////////////////////////////////////////////// -// wxArchiveInputStream - -wxArchiveInputStream::wxArchiveInputStream(wxInputStream& stream, - wxMBConv& conv) - : wxFilterInputStream(stream), - m_conv(conv) -{ -} - -wxArchiveInputStream::wxArchiveInputStream(wxInputStream *stream, - wxMBConv& conv) - : wxFilterInputStream(stream), - m_conv(conv) -{ -} - - -///////////////////////////////////////////////////////////////////////////// -// wxArchiveOutputStream - -wxArchiveOutputStream::wxArchiveOutputStream(wxOutputStream& stream, - wxMBConv& conv) - : wxFilterOutputStream(stream), - m_conv(conv) -{ -} - -wxArchiveOutputStream::wxArchiveOutputStream(wxOutputStream *stream, - wxMBConv& conv) - : wxFilterOutputStream(stream), - m_conv(conv) -{ -} - - -///////////////////////////////////////////////////////////////////////////// -// wxArchiveEntry - -void wxArchiveEntry::SetNotifier(wxArchiveNotifier& notifier) -{ - UnsetNotifier(); - m_notifier = ¬ifier; - m_notifier->OnEntryUpdated(*this); -} - -wxArchiveEntry& wxArchiveEntry::operator=(const wxArchiveEntry& WXUNUSED(e)) -{ - m_notifier = NULL; - return *this; -} - - -///////////////////////////////////////////////////////////////////////////// -// wxArchiveClassFactory - -wxArchiveClassFactory *wxArchiveClassFactory::sm_first = NULL; - -void wxArchiveClassFactory::Remove() -{ - if (m_next != this) - { - wxArchiveClassFactory **pp = &sm_first; - - while (*pp != this) - pp = &(*pp)->m_next; - - *pp = m_next; - - m_next = this; - } -} - -#endif // wxUSE_STREAMS && wxUSE_ARCHIVE_STREAMS diff --git a/Externals/wxWidgets3/src/common/arrstr.cpp b/Externals/wxWidgets3/src/common/arrstr.cpp deleted file mode 100644 index 94b64722ec..0000000000 --- a/Externals/wxWidgets3/src/common/arrstr.cpp +++ /dev/null @@ -1,577 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/arrstr.cpp -// Purpose: wxArrayString class -// Author: Vadim Zeitlin -// Modified by: -// Created: 29/01/98 -// Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// =========================================================================== -// headers, declarations, constants -// =========================================================================== - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include "wx/arrstr.h" -#include "wx/scopedarray.h" - -#include "wx/beforestd.h" -#include -#include -#include "wx/afterstd.h" - -// ============================================================================ -// ArrayString -// ============================================================================ - -wxArrayString::wxArrayString(size_t sz, const char** a) -{ -#if !wxUSE_STD_CONTAINERS - Init(false); -#endif - for (size_t i=0; i < sz; i++) - Add(a[i]); -} - -wxArrayString::wxArrayString(size_t sz, const wchar_t** a) -{ -#if !wxUSE_STD_CONTAINERS - Init(false); -#endif - for (size_t i=0; i < sz; i++) - Add(a[i]); -} - -wxArrayString::wxArrayString(size_t sz, const wxString* a) -{ -#if !wxUSE_STD_CONTAINERS - Init(false); -#endif - for (size_t i=0; i < sz; i++) - Add(a[i]); -} - -#if !wxUSE_STD_CONTAINERS - -// size increment = min(50% of current size, ARRAY_MAXSIZE_INCREMENT) -#define ARRAY_MAXSIZE_INCREMENT 4096 - -#ifndef ARRAY_DEFAULT_INITIAL_SIZE // also defined in dynarray.h -#define ARRAY_DEFAULT_INITIAL_SIZE (16) -#endif - -// ctor -void wxArrayString::Init(bool autoSort) -{ - m_nSize = - m_nCount = 0; - m_pItems = NULL; - m_compareFunction = NULL; - m_autoSort = autoSort; -} - -// copy ctor -wxArrayString::wxArrayString(const wxArrayString& src) -{ - Init(src.m_autoSort); - - *this = src; -} - -// assignment operator -wxArrayString& wxArrayString::operator=(const wxArrayString& src) -{ - if ( m_nSize > 0 ) - Clear(); - - Copy(src); - - m_autoSort = src.m_autoSort; - - return *this; -} - -void wxArrayString::Copy(const wxArrayString& src) -{ - if ( src.m_nCount > ARRAY_DEFAULT_INITIAL_SIZE ) - Alloc(src.m_nCount); - - for ( size_t n = 0; n < src.m_nCount; n++ ) - Add(src[n]); -} - -// grow the array -wxString *wxArrayString::Grow(size_t nIncrement) -{ - if ( (m_nSize - m_nCount) >= nIncrement ) - { - // We already have enough space. - return NULL; - } - - // if ARRAY_DEFAULT_INITIAL_SIZE were set to 0, the initially empty would - // be never resized! - #if ARRAY_DEFAULT_INITIAL_SIZE == 0 - #error "ARRAY_DEFAULT_INITIAL_SIZE must be > 0!" - #endif - - if ( m_nSize == 0 ) { - // was empty, alloc some memory - m_nSize = ARRAY_DEFAULT_INITIAL_SIZE; - if (m_nSize < nIncrement) - m_nSize = nIncrement; - m_pItems = new wxString[m_nSize]; - - // Nothing to free, we hadn't had any memory before. - return NULL; - } - else { - // otherwise when it's called for the first time, nIncrement would be 0 - // and the array would never be expanded - // add 50% but not too much - size_t ndefIncrement = m_nSize < ARRAY_DEFAULT_INITIAL_SIZE - ? ARRAY_DEFAULT_INITIAL_SIZE : m_nSize >> 1; - if ( ndefIncrement > ARRAY_MAXSIZE_INCREMENT ) - ndefIncrement = ARRAY_MAXSIZE_INCREMENT; - if ( nIncrement < ndefIncrement ) - nIncrement = ndefIncrement; - m_nSize += nIncrement; - wxString *pNew = new wxString[m_nSize]; - - // copy data to new location - for ( size_t j = 0; j < m_nCount; j++ ) - pNew[j] = m_pItems[j]; - - wxString* const pItemsOld = m_pItems; - - m_pItems = pNew; - - return pItemsOld; - } -} - -// deletes all the strings from the list -void wxArrayString::Empty() -{ - m_nCount = 0; -} - -// as Empty, but also frees memory -void wxArrayString::Clear() -{ - m_nSize = - m_nCount = 0; - - wxDELETEA(m_pItems); -} - -// dtor -wxArrayString::~wxArrayString() -{ - delete [] m_pItems; -} - -void wxArrayString::reserve(size_t nSize) -{ - Alloc(nSize); -} - -// pre-allocates memory (frees the previous data!) -void wxArrayString::Alloc(size_t nSize) -{ - // only if old buffer was not big enough - if ( nSize > m_nSize ) { - wxString *pNew = new wxString[nSize]; - if ( !pNew ) - return; - - for ( size_t j = 0; j < m_nCount; j++ ) - pNew[j] = m_pItems[j]; - delete [] m_pItems; - - m_pItems = pNew; - m_nSize = nSize; - } -} - -// minimizes the memory usage by freeing unused memory -void wxArrayString::Shrink() -{ - // only do it if we have some memory to free - if( m_nCount < m_nSize ) { - // allocates exactly as much memory as we need - wxString *pNew = new wxString[m_nCount]; - - // copy data to new location - for ( size_t j = 0; j < m_nCount; j++ ) - pNew[j] = m_pItems[j]; - delete [] m_pItems; - m_pItems = pNew; - m_nSize = m_nCount; - } -} - -// searches the array for an item (forward or backwards) -int wxArrayString::Index(const wxString& str, bool bCase, bool bFromEnd) const -{ - if ( m_autoSort ) { - // use binary search in the sorted array - wxASSERT_MSG( bCase && !bFromEnd, - wxT("search parameters ignored for auto sorted array") ); - - size_t i, - lo = 0, - hi = m_nCount; - int res; - while ( lo < hi ) { - i = (lo + hi)/2; - - res = str.compare(m_pItems[i]); - if ( res < 0 ) - hi = i; - else if ( res > 0 ) - lo = i + 1; - else - return i; - } - - return wxNOT_FOUND; - } - else { - // use linear search in unsorted array - if ( bFromEnd ) { - if ( m_nCount > 0 ) { - size_t ui = m_nCount; - do { - if ( m_pItems[--ui].IsSameAs(str, bCase) ) - return ui; - } - while ( ui != 0 ); - } - } - else { - for( size_t ui = 0; ui < m_nCount; ui++ ) { - if( m_pItems[ui].IsSameAs(str, bCase) ) - return ui; - } - } - } - - return wxNOT_FOUND; -} - -// add item at the end -size_t wxArrayString::Add(const wxString& str, size_t nInsert) -{ - if ( m_autoSort ) { - // insert the string at the correct position to keep the array sorted - size_t i, - lo = 0, - hi = m_nCount; - int res; - while ( lo < hi ) { - i = (lo + hi)/2; - - res = m_compareFunction ? m_compareFunction(str, m_pItems[i]) : str.Cmp(m_pItems[i]); - if ( res < 0 ) - hi = i; - else if ( res > 0 ) - lo = i + 1; - else { - lo = hi = i; - break; - } - } - - wxASSERT_MSG( lo == hi, wxT("binary search broken") ); - - Insert(str, lo, nInsert); - - return (size_t)lo; - } - else { - // Now that we must postpone freeing the old memory until we don't need it - // any more, i.e. don't reference "str" which could be a reference to one - // of our own strings. - wxScopedArray oldStrings(Grow(nInsert)); - - for (size_t i = 0; i < nInsert; i++) - { - // just append - m_pItems[m_nCount + i] = str; - } - size_t ret = m_nCount; - m_nCount += nInsert; - return ret; - } -} - -// add item at the given position -void wxArrayString::Insert(const wxString& str, size_t nIndex, size_t nInsert) -{ - wxCHECK_RET( nIndex <= m_nCount, wxT("bad index in wxArrayString::Insert") ); - wxCHECK_RET( m_nCount <= m_nCount + nInsert, - wxT("array size overflow in wxArrayString::Insert") ); - - wxScopedArray oldStrings(Grow(nInsert)); - - for (int j = m_nCount - nIndex - 1; j >= 0; j--) - m_pItems[nIndex + nInsert + j] = m_pItems[nIndex + j]; - - for (size_t i = 0; i < nInsert; i++) - { - m_pItems[nIndex + i] = str; - } - m_nCount += nInsert; -} - -// range insert (STL 23.2.4.3) -void -wxArrayString::insert(iterator it, const_iterator first, const_iterator last) -{ - const int idx = it - begin(); - - // grow it once - wxScopedArray oldStrings(Grow(last - first)); - - // reset "it" since it can change inside Grow() - it = begin() + idx; - - while ( first != last ) - { - it = insert(it, *first); - - // insert returns an iterator to the last element inserted but we need - // insert the next after this one, that is before the next one - ++it; - - ++first; - } -} - -void wxArrayString::resize(size_type n, value_type v) -{ - if ( n < m_nCount ) - m_nCount = n; - else if ( n > m_nCount ) - Add(v, n - m_nCount); -} - -// expand the array -void wxArrayString::SetCount(size_t count) -{ - Alloc(count); - - wxString s; - while ( m_nCount < count ) - m_pItems[m_nCount++] = s; -} - -// removes item from array (by index) -void wxArrayString::RemoveAt(size_t nIndex, size_t nRemove) -{ - wxCHECK_RET( nIndex < m_nCount, wxT("bad index in wxArrayString::Remove") ); - wxCHECK_RET( nIndex + nRemove <= m_nCount, - wxT("removing too many elements in wxArrayString::Remove") ); - - for ( size_t j = 0; j < m_nCount - nIndex -nRemove; j++) - m_pItems[nIndex + j] = m_pItems[nIndex + nRemove + j]; - - m_nCount -= nRemove; -} - -// removes item from array (by value) -void wxArrayString::Remove(const wxString& sz) -{ - int iIndex = Index(sz); - - wxCHECK_RET( iIndex != wxNOT_FOUND, - wxT("removing inexistent element in wxArrayString::Remove") ); - - RemoveAt(iIndex); -} - -// ---------------------------------------------------------------------------- -// sorting -// ---------------------------------------------------------------------------- - -// we need an adaptor as our predicates use qsort() convention and so return -// negative, null or positive value depending on whether the first item is less -// than, equal to or greater than the other one while we need a real boolean -// predicate now that we use std::sort() -struct wxSortPredicateAdaptor -{ - wxSortPredicateAdaptor(wxArrayString::CompareFunction compareFunction) - : m_compareFunction(compareFunction) - { - } - - bool operator()(const wxString& first, const wxString& second) const - { - return (*m_compareFunction)(first, second) < 0; - } - - wxArrayString::CompareFunction m_compareFunction; -}; - -void wxArrayString::Sort(CompareFunction compareFunction) -{ - wxCHECK_RET( !m_autoSort, wxT("can't use this method with sorted arrays") ); - - std::sort(m_pItems, m_pItems + m_nCount, - wxSortPredicateAdaptor(compareFunction)); -} - -struct wxSortPredicateAdaptor2 -{ - wxSortPredicateAdaptor2(wxArrayString::CompareFunction2 compareFunction) - : m_compareFunction(compareFunction) - { - } - - bool operator()(const wxString& first, const wxString& second) const - { - return (*m_compareFunction)(const_cast(&first), - const_cast(&second)) < 0; - } - - wxArrayString::CompareFunction2 m_compareFunction; -}; - -void wxArrayString::Sort(CompareFunction2 compareFunction) -{ - std::sort(m_pItems, m_pItems + m_nCount, - wxSortPredicateAdaptor2(compareFunction)); -} - -void wxArrayString::Sort(bool reverseOrder) -{ - if ( reverseOrder ) - std::sort(m_pItems, m_pItems + m_nCount, std::greater()); - else // normal sort - std::sort(m_pItems, m_pItems + m_nCount); -} - -bool wxArrayString::operator==(const wxArrayString& a) const -{ - if ( m_nCount != a.m_nCount ) - return false; - - for ( size_t n = 0; n < m_nCount; n++ ) - { - if ( Item(n) != a[n] ) - return false; - } - - return true; -} - -#endif // !wxUSE_STD_CONTAINERS - -// =========================================================================== -// wxJoin and wxSplit -// =========================================================================== - -#include "wx/tokenzr.h" - -wxString wxJoin(const wxArrayString& arr, const wxChar sep, const wxChar escape) -{ - size_t count = arr.size(); - if ( count == 0 ) - return wxEmptyString; - - wxString str; - - // pre-allocate memory using the estimation of the average length of the - // strings in the given array: this is very imprecise, of course, but - // better than nothing - str.reserve(count*(arr[0].length() + arr[count-1].length()) / 2); - - if ( escape == wxT('\0') ) - { - // escaping is disabled: - for ( size_t i = 0; i < count; i++ ) - { - if ( i ) - str += sep; - str += arr[i]; - } - } - else // use escape character - { - for ( size_t n = 0; n < count; n++ ) - { - if ( n ) - str += sep; - - for ( wxString::const_iterator i = arr[n].begin(), - end = arr[n].end(); - i != end; - ++i ) - { - const wxChar ch = *i; - if ( ch == sep ) - str += escape; // escape this separator - str += ch; - } - } - } - - str.Shrink(); // release extra memory if we allocated too much - return str; -} - -wxArrayString wxSplit(const wxString& str, const wxChar sep, const wxChar escape) -{ - if ( escape == wxT('\0') ) - { - // simple case: we don't need to honour the escape character - return wxStringTokenize(str, sep, wxTOKEN_RET_EMPTY_ALL); - } - - wxArrayString ret; - wxString curr; - wxChar prev = wxT('\0'); - - for ( wxString::const_iterator i = str.begin(), - end = str.end(); - i != end; - ++i ) - { - const wxChar ch = *i; - - if ( ch == sep ) - { - if ( prev == escape ) - { - // remove the escape character and don't consider this - // occurrence of 'sep' as a real separator - *curr.rbegin() = sep; - } - else // real separator - { - ret.push_back(curr); - curr.clear(); - } - } - else // normal character - { - curr += ch; - } - - prev = ch; - } - - // add the last token - if ( !curr.empty() || prev == sep ) - ret.Add(curr); - - return ret; -} diff --git a/Externals/wxWidgets3/src/common/artprov.cpp b/Externals/wxWidgets3/src/common/artprov.cpp deleted file mode 100644 index e7466eee26..0000000000 --- a/Externals/wxWidgets3/src/common/artprov.cpp +++ /dev/null @@ -1,458 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/artprov.cpp -// Purpose: wxArtProvider class -// Author: Vaclav Slavik -// Modified by: -// Created: 18/03/2002 -// Copyright: (c) Vaclav Slavik -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// --------------------------------------------------------------------------- -// headers -// --------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if defined(__BORLANDC__) - #pragma hdrstop -#endif - -#include "wx/artprov.h" - -#ifndef WX_PRECOMP - #include "wx/list.h" - #include "wx/log.h" - #include "wx/hashmap.h" - #include "wx/image.h" - #include "wx/module.h" -#endif - -// =========================================================================== -// implementation -// =========================================================================== - -#include "wx/listimpl.cpp" -WX_DECLARE_LIST(wxArtProvider, wxArtProvidersList); -WX_DEFINE_LIST(wxArtProvidersList) - -// ---------------------------------------------------------------------------- -// Cache class - stores already requested bitmaps -// ---------------------------------------------------------------------------- - -WX_DECLARE_EXPORTED_STRING_HASH_MAP(wxBitmap, wxArtProviderBitmapsHash); -WX_DECLARE_EXPORTED_STRING_HASH_MAP(wxIconBundle, wxArtProviderIconBundlesHash); - -class WXDLLEXPORT wxArtProviderCache -{ -public: - bool GetBitmap(const wxString& full_id, wxBitmap* bmp); - void PutBitmap(const wxString& full_id, const wxBitmap& bmp) - { m_bitmapsHash[full_id] = bmp; } - - bool GetIconBundle(const wxString& full_id, wxIconBundle* bmp); - void PutIconBundle(const wxString& full_id, const wxIconBundle& iconbundle) - { m_iconBundlesHash[full_id] = iconbundle; } - - void Clear(); - - static wxString ConstructHashID(const wxArtID& id, - const wxArtClient& client, - const wxSize& size); - - static wxString ConstructHashID(const wxArtID& id, - const wxArtClient& client); - -private: - wxArtProviderBitmapsHash m_bitmapsHash; // cache of wxBitmaps - wxArtProviderIconBundlesHash m_iconBundlesHash; // cache of wxIconBundles -}; - -bool wxArtProviderCache::GetBitmap(const wxString& full_id, wxBitmap* bmp) -{ - wxArtProviderBitmapsHash::iterator entry = m_bitmapsHash.find(full_id); - if ( entry == m_bitmapsHash.end() ) - { - return false; - } - else - { - *bmp = entry->second; - return true; - } -} - -bool wxArtProviderCache::GetIconBundle(const wxString& full_id, wxIconBundle* bmp) -{ - wxArtProviderIconBundlesHash::iterator entry = m_iconBundlesHash.find(full_id); - if ( entry == m_iconBundlesHash.end() ) - { - return false; - } - else - { - *bmp = entry->second; - return true; - } -} - -void wxArtProviderCache::Clear() -{ - m_bitmapsHash.clear(); - m_iconBundlesHash.clear(); -} - -/* static */ wxString -wxArtProviderCache::ConstructHashID(const wxArtID& id, - const wxArtClient& client) -{ - return id + wxT('-') + client; -} - - -/* static */ wxString -wxArtProviderCache::ConstructHashID(const wxArtID& id, - const wxArtClient& client, - const wxSize& size) -{ - return ConstructHashID(id, client) + wxT('-') + - wxString::Format(wxT("%d-%d"), size.x, size.y); -} - -// ============================================================================ -// wxArtProvider class -// ============================================================================ - -wxIMPLEMENT_ABSTRACT_CLASS(wxArtProvider, wxObject); - -wxArtProvidersList *wxArtProvider::sm_providers = NULL; -wxArtProviderCache *wxArtProvider::sm_cache = NULL; - -// ---------------------------------------------------------------------------- -// wxArtProvider ctors/dtor -// ---------------------------------------------------------------------------- - -wxArtProvider::~wxArtProvider() -{ - Remove(this); -} - -// ---------------------------------------------------------------------------- -// wxArtProvider operations on provider stack -// ---------------------------------------------------------------------------- - -/*static*/ void wxArtProvider::CommonAddingProvider() -{ - if ( !sm_providers ) - { - sm_providers = new wxArtProvidersList; - sm_cache = new wxArtProviderCache; - } - - sm_cache->Clear(); -} - -/*static*/ void wxArtProvider::Push(wxArtProvider *provider) -{ - CommonAddingProvider(); - sm_providers->Insert(provider); -} - -/*static*/ void wxArtProvider::PushBack(wxArtProvider *provider) -{ - CommonAddingProvider(); - sm_providers->Append(provider); -} - -/*static*/ bool wxArtProvider::Pop() -{ - wxCHECK_MSG( sm_providers, false, wxT("no wxArtProvider exists") ); - wxCHECK_MSG( !sm_providers->empty(), false, wxT("wxArtProviders stack is empty") ); - - delete sm_providers->GetFirst()->GetData(); - sm_cache->Clear(); - return true; -} - -/*static*/ bool wxArtProvider::Remove(wxArtProvider *provider) -{ - wxCHECK_MSG( sm_providers, false, wxT("no wxArtProvider exists") ); - - if ( sm_providers->DeleteObject(provider) ) - { - sm_cache->Clear(); - return true; - } - - return false; -} - -/*static*/ bool wxArtProvider::Delete(wxArtProvider *provider) -{ - // provider will remove itself from the stack in its dtor - delete provider; - - return true; -} - -/*static*/ void wxArtProvider::CleanUpProviders() -{ - if ( sm_providers ) - { - while ( !sm_providers->empty() ) - delete *sm_providers->begin(); - - wxDELETE(sm_providers); - wxDELETE(sm_cache); - } -} - -// ---------------------------------------------------------------------------- -// wxArtProvider: retrieving bitmaps/icons -// ---------------------------------------------------------------------------- - -void wxArtProvider::RescaleBitmap(wxBitmap& bmp, const wxSize& sizeNeeded) -{ - wxCHECK_RET( sizeNeeded.IsFullySpecified(), wxS("New size must be given") ); - -#if wxUSE_IMAGE - wxImage img = bmp.ConvertToImage(); - img.Rescale(sizeNeeded.x, sizeNeeded.y); - bmp = wxBitmap(img); -#else // !wxUSE_IMAGE - // Fallback method of scaling the bitmap - wxBitmap newBmp(sizeNeeded, bmp.GetDepth()); -#if defined(__WXMSW__) || defined(__WXOSX__) - // wxBitmap::UseAlpha() is used only on wxMSW and wxOSX. - newBmp.UseAlpha(bmp.HasAlpha()); -#endif // __WXMSW__ || __WXOSX__ - { - wxMemoryDC dc(newBmp); - double scX = (double)sizeNeeded.GetWidth() / bmp.GetWidth(); - double scY = (double)sizeNeeded.GetHeight() / bmp.GetHeight(); - dc.SetUserScale(scX, scY); - dc.DrawBitmap(bmp, 0, 0); - } - bmp = newBmp; -#endif // wxUSE_IMAGE/!wxUSE_IMAGE -} - -/*static*/ wxBitmap wxArtProvider::GetBitmap(const wxArtID& id, - const wxArtClient& client, - const wxSize& size) -{ - // safety-check against writing client,id,size instead of id,client,size: - wxASSERT_MSG( client.Last() == wxT('C'), wxT("invalid 'client' parameter") ); - - wxCHECK_MSG( sm_providers, wxNullBitmap, wxT("no wxArtProvider exists") ); - - wxString hashId = wxArtProviderCache::ConstructHashID(id, client, size); - - wxBitmap bmp; - if ( !sm_cache->GetBitmap(hashId, &bmp) ) - { - for (wxArtProvidersList::compatibility_iterator node = sm_providers->GetFirst(); - node; node = node->GetNext()) - { - bmp = node->GetData()->CreateBitmap(id, client, size); - if ( bmp.IsOk() ) - break; - } - - wxSize sizeNeeded = size; - if ( !bmp.IsOk() ) - { - // no bitmap created -- as a fallback, try if we can find desired - // icon in a bundle - wxIconBundle iconBundle = DoGetIconBundle(id, client); - if ( iconBundle.IsOk() ) - { - if ( sizeNeeded == wxDefaultSize ) - sizeNeeded = GetNativeSizeHint(client); - - wxIcon icon(iconBundle.GetIcon(sizeNeeded)); - if ( icon.IsOk() ) - { - // this icon may be not of the correct size, it will be - // rescaled below in such case - bmp.CopyFromIcon(icon); - } - } - } - - // if we didn't get the correct size, resize the bitmap - if ( bmp.IsOk() && sizeNeeded != wxDefaultSize ) - { - if ( bmp.GetSize() != sizeNeeded ) - { - RescaleBitmap(bmp, sizeNeeded); - } - } - - sm_cache->PutBitmap(hashId, bmp); - } - - return bmp; -} - -/*static*/ -wxIconBundle wxArtProvider::GetIconBundle(const wxArtID& id, const wxArtClient& client) -{ - wxIconBundle iconbundle(DoGetIconBundle(id, client)); - - if ( iconbundle.IsOk() ) - { - return iconbundle; - } - else - { - // fall back to single-icon bundle - return wxIconBundle(GetIcon(id, client)); - } -} - -/*static*/ -wxIconBundle wxArtProvider::DoGetIconBundle(const wxArtID& id, const wxArtClient& client) -{ - // safety-check against writing client,id,size instead of id,client,size: - wxASSERT_MSG( client.Last() == wxT('C'), wxT("invalid 'client' parameter") ); - - wxCHECK_MSG( sm_providers, wxNullIconBundle, wxT("no wxArtProvider exists") ); - - wxString hashId = wxArtProviderCache::ConstructHashID(id, client); - - wxIconBundle iconbundle; - if ( !sm_cache->GetIconBundle(hashId, &iconbundle) ) - { - for (wxArtProvidersList::compatibility_iterator node = sm_providers->GetFirst(); - node; node = node->GetNext()) - { - iconbundle = node->GetData()->CreateIconBundle(id, client); - if ( iconbundle.IsOk() ) - break; - } - - sm_cache->PutIconBundle(hashId, iconbundle); - } - - return iconbundle; -} - -/*static*/ wxIcon wxArtProvider::GetIcon(const wxArtID& id, - const wxArtClient& client, - const wxSize& size) -{ - wxBitmap bmp = GetBitmap(id, client, size); - - if ( !bmp.IsOk() ) - return wxNullIcon; - - wxIcon icon; - icon.CopyFromBitmap(bmp); - return icon; -} - -/* static */ -wxArtID wxArtProvider::GetMessageBoxIconId(int flags) -{ - switch ( flags & wxICON_MASK ) - { - default: - wxFAIL_MSG(wxT("incorrect message box icon flags")); - wxFALLTHROUGH; - - case wxICON_ERROR: - return wxART_ERROR; - - case wxICON_INFORMATION: - return wxART_INFORMATION; - - case wxICON_WARNING: - return wxART_WARNING; - - case wxICON_QUESTION: - return wxART_QUESTION; - } -} - -/*static*/ wxSize wxArtProvider::GetSizeHint(const wxArtClient& client, - bool platform_dependent) -{ - if (!platform_dependent) - { - wxArtProvidersList::compatibility_iterator node = sm_providers->GetFirst(); - if (node) - return node->GetData()->DoGetSizeHint(client); - } - - return GetNativeSizeHint(client); -} - -#ifndef wxHAS_NATIVE_ART_PROVIDER_IMPL -/*static*/ -wxSize wxArtProvider::GetNativeSizeHint(const wxArtClient& WXUNUSED(client)) -{ - // rather than returning some arbitrary value that doesn't make much - // sense (as 2.8 used to do), tell the caller that we don't have a clue: - return wxDefaultSize; -} - -/*static*/ -void wxArtProvider::InitNativeProvider() -{ -} -#endif // !wxHAS_NATIVE_ART_PROVIDER_IMPL - - -/* static */ -bool wxArtProvider::HasNativeProvider() -{ -#ifdef __WXGTK20__ - return true; -#else - return false; -#endif -} - -// ---------------------------------------------------------------------------- -// deprecated wxArtProvider methods -// ---------------------------------------------------------------------------- - -#if WXWIN_COMPATIBILITY_2_8 -/* static */ void wxArtProvider::Insert(wxArtProvider *provider) -{ - PushBack(provider); -} -#endif // WXWIN_COMPATIBILITY_2_8 - -// ============================================================================ -// wxArtProviderModule -// ============================================================================ - -class wxArtProviderModule: public wxModule -{ -public: - bool OnInit() wxOVERRIDE - { - // The order here is such that the native provider will be used first - // and the standard one last as all these default providers add - // themselves to the bottom of the stack. - wxArtProvider::InitNativeProvider(); -#if wxUSE_ARTPROVIDER_TANGO - wxArtProvider::InitTangoProvider(); -#endif // wxUSE_ARTPROVIDER_TANGO -#if wxUSE_ARTPROVIDER_STD - wxArtProvider::InitStdProvider(); -#endif // wxUSE_ARTPROVIDER_STD - return true; - } - void OnExit() wxOVERRIDE - { - wxArtProvider::CleanUpProviders(); - } - - wxDECLARE_DYNAMIC_CLASS(wxArtProviderModule); -}; - -wxIMPLEMENT_DYNAMIC_CLASS(wxArtProviderModule, wxModule); diff --git a/Externals/wxWidgets3/src/common/artstd.cpp b/Externals/wxWidgets3/src/common/artstd.cpp deleted file mode 100644 index 0f59d8cc5f..0000000000 --- a/Externals/wxWidgets3/src/common/artstd.cpp +++ /dev/null @@ -1,260 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/artstd.cpp -// Purpose: stock wxArtProvider instance with default wxWin art -// Author: Vaclav Slavik -// Modified by: -// Created: 18/03/2002 -// Copyright: (c) Vaclav Slavik -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// --------------------------------------------------------------------------- -// headers -// --------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if defined(__BORLANDC__) - #pragma hdrstop -#endif - -#if wxUSE_ARTPROVIDER_STD - -#ifndef WX_PRECOMP - #include "wx/image.h" -#endif - -#include "wx/artprov.h" - -// ---------------------------------------------------------------------------- -// wxDefaultArtProvider -// ---------------------------------------------------------------------------- - -class wxDefaultArtProvider : public wxArtProvider -{ -protected: - virtual wxBitmap CreateBitmap(const wxArtID& id, const wxArtClient& client, - const wxSize& size) wxOVERRIDE; -}; - -// ---------------------------------------------------------------------------- -// wxArtProvider::InitStdProvider -// ---------------------------------------------------------------------------- - -/*static*/ void wxArtProvider::InitStdProvider() -{ - wxArtProvider::PushBack(new wxDefaultArtProvider); -} - -// ---------------------------------------------------------------------------- -// helper macros -// ---------------------------------------------------------------------------- - -// Standard macro for getting a resource from XPM file: -#define ART(artId, xpmRc) \ - if ( id == artId ) return wxBitmap(xpmRc##_xpm); - -// ---------------------------------------------------------------------------- -// XPMs with the art -// ---------------------------------------------------------------------------- - -#ifndef __WXUNIVERSAL__ - #if defined(__WXGTK__) - #include "../../art/gtk/info.xpm" - #include "../../art/gtk/error.xpm" - #include "../../art/gtk/warning.xpm" - #include "../../art/gtk/question.xpm" - #elif defined(__WXMOTIF__) - #include "../../art/motif/info.xpm" - #include "../../art/motif/error.xpm" - #include "../../art/motif/warning.xpm" - #include "../../art/motif/question.xpm" - #endif -#endif // !__WXUNIVERSAL__ - -#if wxUSE_HTML - #include "../../art/htmsidep.xpm" - #include "../../art/htmoptns.xpm" - #include "../../art/htmbook.xpm" - #include "../../art/htmfoldr.xpm" - #include "../../art/htmpage.xpm" -#endif // wxUSE_HTML - -#include "../../art/missimg.xpm" -#include "../../art/addbookm.xpm" -#include "../../art/delbookm.xpm" -#include "../../art/back.xpm" -#include "../../art/forward.xpm" -#include "../../art/up.xpm" -#include "../../art/down.xpm" -#include "../../art/toparent.xpm" -#include "../../art/fileopen.xpm" -#include "../../art/print.xpm" -#include "../../art/helpicon.xpm" -#include "../../art/tipicon.xpm" -#include "../../art/home.xpm" -#include "../../art/first.xpm" -#include "../../art/last.xpm" -#include "../../art/repview.xpm" -#include "../../art/listview.xpm" -#include "../../art/new_dir.xpm" -#include "../../art/harddisk.xpm" -#include "../../art/cdrom.xpm" -#include "../../art/floppy.xpm" -#include "../../art/removable.xpm" -#include "../../art/folder.xpm" -#include "../../art/folder_open.xpm" -#include "../../art/dir_up.xpm" -#include "../../art/exefile.xpm" -#include "../../art/deffile.xpm" -#include "../../art/tick.xpm" -#include "../../art/cross.xpm" - -#include "../../art/filesave.xpm" -#include "../../art/filesaveas.xpm" -#include "../../art/copy.xpm" -#include "../../art/cut.xpm" -#include "../../art/paste.xpm" -#include "../../art/delete.xpm" -#include "../../art/new.xpm" -#include "../../art/undo.xpm" -#include "../../art/redo.xpm" -#include "../../art/plus.xpm" -#include "../../art/minus.xpm" -#include "../../art/close.xpm" -#include "../../art/quit.xpm" -#include "../../art/find.xpm" -#include "../../art/findrepl.xpm" -#include "../../art/fullscreen.xpm" -#include "../../art/edit.xpm" - -wxBitmap wxDefaultArtProvider_CreateBitmap(const wxArtID& id) -{ -#if !defined(__WXUNIVERSAL__) && (defined(__WXGTK__) || defined(__WXMOTIF__)) - // wxMessageBox icons: - ART(wxART_ERROR, error) - ART(wxART_INFORMATION, info) - ART(wxART_WARNING, warning) - ART(wxART_QUESTION, question) -#endif - - // standard icons: -#if wxUSE_HTML - ART(wxART_HELP_SIDE_PANEL, htmsidep) - ART(wxART_HELP_SETTINGS, htmoptns) - ART(wxART_HELP_BOOK, htmbook) - ART(wxART_HELP_FOLDER, htmfoldr) - ART(wxART_HELP_PAGE, htmpage) -#endif // wxUSE_HTML - ART(wxART_MISSING_IMAGE, missimg) - ART(wxART_ADD_BOOKMARK, addbookm) - ART(wxART_DEL_BOOKMARK, delbookm) - ART(wxART_GO_BACK, back) - ART(wxART_GO_FORWARD, forward) - ART(wxART_GO_UP, up) - ART(wxART_GO_DOWN, down) - ART(wxART_GO_TO_PARENT, toparent) - ART(wxART_GO_HOME, home) - ART(wxART_GOTO_FIRST, first) - ART(wxART_GOTO_LAST, last) - ART(wxART_FILE_OPEN, fileopen) - ART(wxART_PRINT, print) - ART(wxART_HELP, helpicon) - ART(wxART_TIP, tipicon) - ART(wxART_REPORT_VIEW, repview) - ART(wxART_LIST_VIEW, listview) - ART(wxART_NEW_DIR, new_dir) - ART(wxART_HARDDISK, harddisk) - ART(wxART_FLOPPY, floppy) - ART(wxART_CDROM, cdrom) - ART(wxART_REMOVABLE, removable) - ART(wxART_FOLDER, folder) - ART(wxART_FOLDER_OPEN, folder_open) - ART(wxART_GO_DIR_UP, dir_up) - ART(wxART_EXECUTABLE_FILE, exefile) - ART(wxART_NORMAL_FILE, deffile) - ART(wxART_TICK_MARK, tick) - ART(wxART_CROSS_MARK, cross) - - ART(wxART_FILE_SAVE, filesave) - ART(wxART_FILE_SAVE_AS, filesaveas) - ART(wxART_COPY, copy) - ART(wxART_CUT, cut) - ART(wxART_PASTE, paste) - ART(wxART_DELETE, delete) - ART(wxART_UNDO, undo) - ART(wxART_REDO, redo) - ART(wxART_PLUS, plus) - ART(wxART_MINUS, minus) - ART(wxART_CLOSE, close) - ART(wxART_QUIT, quit) - ART(wxART_FIND, find) - ART(wxART_FIND_AND_REPLACE, findrepl) - ART(wxART_FULL_SCREEN, fullscreen) - ART(wxART_NEW, new) - ART(wxART_EDIT, edit) - - - return wxNullBitmap; -} - -// ---------------------------------------------------------------------------- -// CreateBitmap routine -// ---------------------------------------------------------------------------- - -wxBitmap wxDefaultArtProvider::CreateBitmap(const wxArtID& id, - const wxArtClient& client, - const wxSize& reqSize) -{ - wxBitmap bmp = wxDefaultArtProvider_CreateBitmap(id); - -#if wxUSE_IMAGE && (!defined(__WXMSW__) || wxUSE_WXDIB) - if (bmp.IsOk()) - { - // fit into transparent image with desired size hint from the client - if (reqSize == wxDefaultSize) - { - // find out if there is a desired size for this client - wxSize bestSize = GetSizeHint(client); - if (bestSize != wxDefaultSize) - { - int bmp_w = bmp.GetWidth(); - int bmp_h = bmp.GetHeight(); - - if (bmp_w == 16 && bmp_h == 15 && bestSize == wxSize(16, 16)) - { - // Do nothing in this special but quite common case, because scaling - // with only a pixel difference will look horrible. - } - else if ((bmp_h < bestSize.x) && (bmp_w < bestSize.y)) - { - // the caller wants default size, which is larger than - // the image we have; to avoid degrading it visually by - // scaling it up, paste it into transparent image instead: - wxPoint offset((bestSize.x - bmp_w)/2, (bestSize.y - bmp_h)/2); - wxImage img = bmp.ConvertToImage(); - img.Resize(bestSize, offset); - bmp = wxBitmap(img); - } - else // scale (down or mixed, but not up) - { - wxImage img = bmp.ConvertToImage(); - bmp = wxBitmap - ( - img.Scale(bestSize.x, bestSize.y, - wxIMAGE_QUALITY_HIGH) - ); - } - } - } - } -#else - wxUnusedVar(client); - wxUnusedVar(reqSize); -#endif // wxUSE_IMAGE - - return bmp; -} - -#endif // wxUSE_ARTPROVIDER_STD diff --git a/Externals/wxWidgets3/src/common/arttango.cpp b/Externals/wxWidgets3/src/common/arttango.cpp deleted file mode 100644 index 94db4628da..0000000000 --- a/Externals/wxWidgets3/src/common/arttango.cpp +++ /dev/null @@ -1,329 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/arttango.cpp -// Purpose: art provider using embedded PNG versions of Tango icons -// Author: Vadim Zeitlin -// Created: 2010-12-27 -// Copyright: (c) 2010 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// for compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_ARTPROVIDER_TANGO - -#ifndef WX_PRECOMP - #include "wx/image.h" - #include "wx/log.h" -#endif // WX_PRECOMP - -#include "wx/artprov.h" - -#include "wx/mstream.h" - -// ---------------------------------------------------------------------------- -// image data -// ---------------------------------------------------------------------------- - -// All files in art/tango in alphabetical order: -#include "../../art/tango/application_x_executable.h" -#include "../../art/tango/dialog_error.h" -#include "../../art/tango/dialog_information.h" -#include "../../art/tango/dialog_warning.h" -#include "../../art/tango/document_new.h" -#include "../../art/tango/document_open.h" -#include "../../art/tango/document_print.h" -#include "../../art/tango/document_save.h" -#include "../../art/tango/document_save_as.h" -#include "../../art/tango/drive_harddisk.h" -#include "../../art/tango/drive_optical.h" -#include "../../art/tango/drive_removable_media.h" -#include "../../art/tango/edit_copy.h" -#include "../../art/tango/edit_cut.h" -#include "../../art/tango/edit_delete.h" -#include "../../art/tango/edit_find.h" -#include "../../art/tango/edit_find_replace.h" -#include "../../art/tango/edit_paste.h" -#include "../../art/tango/edit_redo.h" -#include "../../art/tango/edit_undo.h" -#include "../../art/tango/folder.h" -#include "../../art/tango/folder_new.h" -#include "../../art/tango/folder_open.h" -#include "../../art/tango/fullscreen.h" -#include "../../art/tango/go_down.h" -#include "../../art/tango/go_first.h" -#include "../../art/tango/go_home.h" -#include "../../art/tango/go_last.h" -#include "../../art/tango/go_next.h" -#include "../../art/tango/go_previous.h" -#include "../../art/tango/go_up.h" -#include "../../art/tango/image_missing.h" -#include "../../art/tango/text_x_generic.h" -#include "../../art/tango/list_add.h" -#include "../../art/tango/list_remove.h" - -// ---------------------------------------------------------------------------- -// art provider class -// ---------------------------------------------------------------------------- - -namespace -{ - -class wxTangoArtProvider : public wxArtProvider -{ -public: - wxTangoArtProvider() - { - m_imageHandledAdded = false; - } - -protected: - virtual wxBitmap CreateBitmap(const wxArtID& id, - const wxArtClient& client, - const wxSize& size) wxOVERRIDE; - -private: - bool m_imageHandledAdded; - - wxDECLARE_NO_COPY_CLASS(wxTangoArtProvider); -}; - -} // anonymous namespace - -// ============================================================================ -// implementation -// ============================================================================ - -wxBitmap -wxTangoArtProvider::CreateBitmap(const wxArtID& id, - const wxArtClient& client, - const wxSize& sizeHint) -{ - // Array indexed by the id names with pointers to image data in 16 and 32 - // pixel sizes as values. The order of the elements in this array is the - // same as the definition order in wx/artprov.h. While it's not very - // logical, this should make it simpler to add new icons later. Notice that - // most elements without Tango equivalents are simply omitted. - - // To avoid repetition use BITMAP_DATA to only specify the image name once - // (this is especially important if we decide to add more image sizes - // later). - #define BITMAP_ARRAY_NAME(name, size) \ - name ## _ ## size ## x ## size ## _png - #define BITMAP_DATA_FOR_SIZE(name, size) \ - BITMAP_ARRAY_NAME(name, size), sizeof(BITMAP_ARRAY_NAME(name, size)) - #define BITMAP_DATA(name) \ - BITMAP_DATA_FOR_SIZE(name, 16), BITMAP_DATA_FOR_SIZE(name, 24) - - static const struct BitmapEntry - { - const char *id; - const unsigned char *data16; - size_t len16; - const unsigned char *data24; - size_t len24; - } s_allBitmaps[] = - { - // Tango does have bookmark-new but no matching bookmark-delete and - // using mismatching icons would be ugly so we don't provide this one - // neither, we should add both of them if Tango ever adds the other one. - //{ wxART_ADD_BOOKMARK, BITMAP_DATA(bookmark_new)}, - //{ wxART_DEL_BOOKMARK, BITMAP_DATA() }, - - { wxART_GO_BACK, BITMAP_DATA(go_previous) }, - { wxART_GO_FORWARD, BITMAP_DATA(go_next) }, - { wxART_GO_UP, BITMAP_DATA(go_up) }, - { wxART_GO_DOWN, BITMAP_DATA(go_down) }, - // wxART_GO_TO_PARENT doesn't seem to exist in Tango - { wxART_GO_HOME, BITMAP_DATA(go_home) }, - { wxART_GOTO_FIRST, BITMAP_DATA(go_first) }, - { wxART_GOTO_LAST, BITMAP_DATA(go_last) }, - - { wxART_FILE_OPEN, BITMAP_DATA(document_open) }, - { wxART_FILE_SAVE, BITMAP_DATA(document_save) }, - { wxART_FILE_SAVE_AS, BITMAP_DATA(document_save_as) }, - { wxART_PRINT, BITMAP_DATA(document_print) }, - - // Should we use help-browser for wxART_HELP? - - { wxART_NEW_DIR, BITMAP_DATA(folder_new) }, - { wxART_HARDDISK, BITMAP_DATA(drive_harddisk) }, - // drive-removable-media seems to be better than media-floppy - { wxART_FLOPPY, BITMAP_DATA(drive_removable_media) }, - { wxART_CDROM, BITMAP_DATA(drive_optical) }, - { wxART_REMOVABLE, BITMAP_DATA(drive_removable_media) }, - - { wxART_FOLDER, BITMAP_DATA(folder) }, - { wxART_FOLDER_OPEN, BITMAP_DATA(folder_open) }, - // wxART_GO_DIR_UP doesn't seem to exist in Tango - - { wxART_EXECUTABLE_FILE, BITMAP_DATA(application_x_executable) }, - { wxART_NORMAL_FILE, BITMAP_DATA(text_x_generic) }, - - // There is no dialog-question in Tango so use the information icon - // too, this is better for consistency and we do have a precedent for - // doing this as Windows Vista/7 does the same thing natively. - { wxART_ERROR, BITMAP_DATA(dialog_error) }, - { wxART_QUESTION, BITMAP_DATA(dialog_information) }, - { wxART_WARNING, BITMAP_DATA(dialog_warning) }, - { wxART_INFORMATION, BITMAP_DATA(dialog_information) }, - - { wxART_MISSING_IMAGE, BITMAP_DATA(image_missing) }, - - { wxART_COPY, BITMAP_DATA(edit_copy) }, - { wxART_CUT, BITMAP_DATA(edit_cut) }, - { wxART_PASTE, BITMAP_DATA(edit_paste) }, - { wxART_DELETE, BITMAP_DATA(edit_delete) }, - { wxART_NEW, BITMAP_DATA(document_new) }, - { wxART_UNDO, BITMAP_DATA(edit_undo) }, - { wxART_REDO, BITMAP_DATA(edit_redo) }, - - { wxART_PLUS, BITMAP_DATA(list_add) }, - { wxART_MINUS, BITMAP_DATA(list_remove) }, - - // Surprisingly Tango doesn't seem to have neither wxART_CLOSE nor - // wxART_QUIT. We could use system-log-out for the latter but it - // doesn't seem quite right. - - { wxART_FIND, BITMAP_DATA(edit_find) }, - { wxART_FIND_AND_REPLACE, BITMAP_DATA(edit_find_replace) }, - { wxART_FULL_SCREEN, BITMAP_DATA(full_screen) }, - }; - - #undef BITMAP_ARRAY_NAME - #undef BITMAP_DATA_FOR_SIZE - #undef BITMAP_DATA - - for ( unsigned n = 0; n < WXSIZEOF(s_allBitmaps); n++ ) - { - const BitmapEntry& entry = s_allBitmaps[n]; - if ( entry.id != id ) - continue; - - // This is one of the bitmaps that we have, determine in which size we - // should return it. - - wxSize size; - bool sizeIsAHint; - if ( sizeHint == wxDefaultSize ) - { - // Use the normal platform-specific icon size. - size = GetNativeSizeHint(client); - - if ( size == wxDefaultSize ) - { - // If we failed to get it, determine the best size more or less - // arbitrarily. This definitely won't look good but then it - // shouldn't normally happen, all platforms should implement - // GetNativeSizeHint() properly. - if ( client == wxART_MENU || client == wxART_BUTTON ) - size = wxSize(16, 16); - else - size = wxSize(24, 24); - } - - // We should return the icon of exactly this size so it's more than - // just a hint. - sizeIsAHint = false; - } - else // We have a size hint - { - // Use it for determining the version of the icon to return. - size = sizeHint; - - // But we don't need to return the image of exactly the same size - // as the hint, after all it's just that, a hint. - sizeIsAHint = true; - } - - enum - { - TangoSize_16, - TangoSize_24 - } tangoSize; - - // We prefer to downscale the image rather than upscale it if possible - // so use the smaller one if we can, otherwise the large one. - if ( size.x <= 16 && size.y <= 16 ) - tangoSize = TangoSize_16; - else - tangoSize = TangoSize_24; - - const unsigned char *data; - size_t len; - switch ( tangoSize ) - { - default: - wxFAIL_MSG( "Unsupported Tango bitmap size" ); - wxFALLTHROUGH; - - case TangoSize_16: - data = entry.data16; - len = entry.len16; - break; - - case TangoSize_24: - data = entry.data24; - len = entry.len24; - break; - } - - wxMemoryInputStream is(data, len); - - // Before reading the image data from the stream for the first time, - // add the handler for PNG images: we do it here and not in, say, - // InitTangoProvider() to do it as lately as possible and so to avoid - // the asserts about adding an already added handler if the user code - // adds the handler itself. - if ( !m_imageHandledAdded ) - { - // Of course, if the user code did add it already, we have nothing - // to do. - if ( !wxImage::FindHandler(wxBITMAP_TYPE_PNG) ) - wxImage::AddHandler(new wxPNGHandler); - - // In any case, no need to do it again. - m_imageHandledAdded = true; - } - - wxImage image(is, wxBITMAP_TYPE_PNG); - if ( !image.IsOk() ) - { - // This should normally never happen as all the embedded images are - // well-formed. - wxLogDebug("Failed to load embedded PNG image for \"%s\"", id); - return wxNullBitmap; - } - - if ( !sizeIsAHint ) - { - // Notice that this won't do anything if the size is already right. - image.Rescale(size.x, size.y, wxIMAGE_QUALITY_HIGH); - } - - return image; - } - - // Not one of the bitmaps that we support. - return wxNullBitmap; -} - -/* static */ -void wxArtProvider::InitTangoProvider() -{ - wxArtProvider::PushBack(new wxTangoArtProvider); -} - -#endif // wxUSE_ARTPROVIDER_TANGO diff --git a/Externals/wxWidgets3/src/common/base64.cpp b/Externals/wxWidgets3/src/common/base64.cpp deleted file mode 100644 index af50821146..0000000000 --- a/Externals/wxWidgets3/src/common/base64.cpp +++ /dev/null @@ -1,240 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/base64.cpp -// Purpose: implementation of BASE64 encoding/decoding functions -// Author: Charles Reimers, Vadim Zeitlin -// Created: 2007-06-18 -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_BASE64 - -#include "wx/base64.h" - -size_t -wxBase64Encode(char *dst, size_t dstLen, const void *src_, size_t srcLen) -{ - wxCHECK_MSG( src_, wxCONV_FAILED, wxT("NULL input buffer") ); - - const unsigned char *src = static_cast(src_); - - static const char b64[] = - "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; - - - size_t encLen = 0; - - // encode blocks of 3 bytes into 4 base64 characters - for ( ; srcLen >= 3; srcLen -= 3, src += 3 ) - { - encLen += 4; - if ( dst ) - { - if ( encLen > dstLen ) - return wxCONV_FAILED; - - *dst++ = b64[src[0] >> 2]; - *dst++ = b64[((src[0] & 0x03) << 4) | ((src[1] & 0xf0) >> 4)]; - *dst++ = b64[((src[1] & 0x0f) << 2) | ((src[2] & 0xc0) >> 6)]; - *dst++ = b64[src[2] & 0x3f]; - } - } - - // finish with the remaining characters - if ( srcLen ) - { - encLen += 4; - if ( dst ) - { - if ( encLen > dstLen ) - return wxCONV_FAILED; - - // we have definitely one and maybe two bytes remaining - unsigned char next = srcLen == 2 ? src[1] : 0; - *dst++ = b64[src[0] >> 2]; - *dst++ = b64[((src[0] & 0x03) << 4) | ((next & 0xf0) >> 4)]; - *dst++ = srcLen == 2 ? b64[((next & 0x0f) << 2)] : '='; - *dst = '='; - } - } - - return encLen; -} - -size_t -wxBase64Decode(void *dst_, size_t dstLen, - const char *src, size_t srcLen, - wxBase64DecodeMode mode, - size_t *posErr) -{ - wxCHECK_MSG( src, wxCONV_FAILED, wxT("NULL input buffer") ); - - unsigned char *dst = static_cast(dst_); - - size_t decLen = 0; - - if ( srcLen == wxNO_LEN ) - srcLen = strlen(src); - - // this table contains the values, in base 64, of all valid characters and - // special values WSP or INV for white space and invalid characters - // respectively as well as a special PAD value for '=' - enum - { - WSP = 200, - INV, - PAD - }; - - static const unsigned char decode[256] = - { - WSP,INV,INV,INV,INV,INV,INV,INV,INV,WSP,WSP,INV,WSP,WSP,INV,INV, - INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV, - WSP,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,076,INV,INV,INV,077, - 064,065,066,067,070,071,072,073,074,075,INV,INV,INV,PAD,INV,INV, - INV,000,001,002,003,004,005,006,007,010,011,012,013,014,015,016, - 017,020,021,022,023,024,025,026,027,030,031,INV,INV,INV,INV,INV, - INV,032,033,034,035,036,037,040,041,042,043,044,045,046,047,050, - 051,052,053,054,055,056,057,060,061,062,063,INV,INV,INV,INV,INV, - INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV, - INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV, - INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV, - INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV, - INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV, - INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV, - INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV, - INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV, - }; - - // we decode input by groups of 4 characters but things are complicated by - // the fact that there can be whitespace and other junk in it too so keep - // record of where exactly we're inside the current quartet in this var - int n = 0; - unsigned char in[4]; // current quartet - bool end = false; // set when we find padding - size_t padLen = 0; // length lost to padding - const char *p; - for ( p = src; srcLen; p++, srcLen-- ) - { - const unsigned char c = decode[static_cast(*p)]; - switch ( c ) - { - case WSP: - if ( mode == wxBase64DecodeMode_SkipWS ) - continue; - wxFALLTHROUGH; - - case INV: - if ( mode == wxBase64DecodeMode_Relaxed ) - continue; - - // force the loop to stop and an error to be returned - n = -1; - srcLen = 1; - break; - - case PAD: - // set the flag telling us that we're past the end now - end = true; - - // there can be either a single '=' at the end of a quartet or - // "==" in positions 2 and 3 - if ( n == 3 ) - { - padLen = 1; - in[n++] = '\0'; - } - else if ( (n == 2) && (--srcLen && *++p == '=') ) - { - padLen = 2; - in[n++] = '\0'; - in[n++] = '\0'; - } - else // invalid padding - { - // force the loop terminate with an error - n = -1; - srcLen = 1; - } - break; - - default: - if ( end ) - { - // nothing is allowed after the end so provoke error return - n = -1; - srcLen = 1; - break; - } - - in[n++] = c; - } - - if ( n == 4 ) - { - // got entire block, decode - decLen += 3 - padLen; - if ( dst ) - { - if ( decLen > dstLen ) - return wxCONV_FAILED; - - // undo the bit shifting done during encoding - *dst++ = in[0] << 2 | in[1] >> 4; - - // be careful to not overwrite the output buffer with NUL pad - // bytes - if ( padLen != 2 ) - { - *dst++ = in[1] << 4 | in[2] >> 2; - if ( !padLen ) - *dst++ = in[2] << 6 | in[3]; - } - } - - n = 0; - } - } - - if ( n ) - { - if ( posErr ) - { - // notice that the error was on a previous position as we did one - // extra "p++" in the loop line after it - *posErr = p - src - 1; - } - - return wxCONV_FAILED; - } - - return decLen; -} - -wxMemoryBuffer wxBase64Decode(const char *src, - size_t srcLen, - wxBase64DecodeMode mode, - size_t *posErr) -{ - wxMemoryBuffer buf; - wxCHECK_MSG( src, buf, wxT("NULL input buffer") ); - - if ( srcLen == wxNO_LEN ) - srcLen = strlen(src); - - size_t len = wxBase64DecodedSize(srcLen); - len = wxBase64Decode(buf.GetWriteBuf(len), len, src, srcLen, mode, posErr); - if ( len == wxCONV_FAILED ) - len = 0; - - buf.SetDataLen(len); - - return buf; -} - -#endif // wxUSE_BASE64 diff --git a/Externals/wxWidgets3/src/common/bmpbase.cpp b/Externals/wxWidgets3/src/common/bmpbase.cpp deleted file mode 100644 index b04ffaddb9..0000000000 --- a/Externals/wxWidgets3/src/common/bmpbase.cpp +++ /dev/null @@ -1,231 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/bmpbase.cpp -// Purpose: wxBitmapBase -// Author: VaclavSlavik -// Created: 2001/04/11 -// Copyright: (c) 2001, Vaclav Slavik -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include "wx/bitmap.h" - -#ifndef WX_PRECOMP - #include "wx/colour.h" - #include "wx/icon.h" - #include "wx/image.h" -#endif // WX_PRECOMP - -#if wxUSE_IMAGE && wxUSE_LIBPNG && wxUSE_STREAMS - #define wxHAS_PNG_LOAD - - #include "wx/mstream.h" -#endif - -// ---------------------------------------------------------------------------- -// wxVariant support -// ---------------------------------------------------------------------------- - -#if wxUSE_VARIANT -IMPLEMENT_VARIANT_OBJECT_EXPORTED_SHALLOWCMP(wxBitmap,WXDLLEXPORT) -IMPLEMENT_VARIANT_OBJECT_EXPORTED_SHALLOWCMP(wxIcon,WXDLLEXPORT) -#endif - -#if wxUSE_EXTENDED_RTTI -//WX_IMPLEMENT_ANY_VALUE_TYPE(wxAnyValueTypeImpl) -//WX_IMPLEMENT_ANY_VALUE_TYPE(wxAnyValueTypeImpl) -#endif - -// ---------------------------------------------------------------------------- -// wxBitmapHelpers -// ---------------------------------------------------------------------------- - -// wxOSX has a native version and doesn't use this one. - -#ifndef __WXOSX__ - -/* static */ -wxBitmap wxBitmapHelpers::NewFromPNGData(const void* data, size_t size) -{ - wxBitmap bitmap; - -#ifdef wxHAS_PNG_LOAD - wxMemoryInputStream is(data, size); - wxImage image(is, wxBITMAP_TYPE_PNG); - if ( image.IsOk() ) - bitmap = wxBitmap(image); -#endif // wxHAS_PNG_LOAD - - return bitmap; -} - -#endif // !__WXOSX__ - -// ---------------------------------------------------------------------------- -// wxBitmapBase -// ---------------------------------------------------------------------------- - -#if wxUSE_BITMAP_BASE - -#ifndef WX_PRECOMP - #include "wx/log.h" - #include "wx/utils.h" - #include "wx/palette.h" - #include "wx/module.h" -#endif // WX_PRECOMP - - -wxIMPLEMENT_ABSTRACT_CLASS(wxBitmapBase, wxGDIObject); -wxIMPLEMENT_ABSTRACT_CLASS(wxBitmapHandler, wxObject); - -wxList wxBitmapBase::sm_handlers; - -void wxBitmapBase::AddHandler(wxBitmapHandler *handler) -{ - sm_handlers.Append(handler); -} - -void wxBitmapBase::InsertHandler(wxBitmapHandler *handler) -{ - sm_handlers.Insert(handler); -} - -bool wxBitmapBase::RemoveHandler(const wxString& name) -{ - wxBitmapHandler *handler = FindHandler(name); - if ( handler ) - { - sm_handlers.DeleteObject(handler); - return true; - } - else - return false; -} - -wxBitmapHandler *wxBitmapBase::FindHandler(const wxString& name) -{ - wxList::compatibility_iterator node = sm_handlers.GetFirst(); - while ( node ) - { - wxBitmapHandler *handler = (wxBitmapHandler *)node->GetData(); - if ( handler->GetName() == name ) - return handler; - node = node->GetNext(); - } - return NULL; -} - -wxBitmapHandler *wxBitmapBase::FindHandler(const wxString& extension, wxBitmapType bitmapType) -{ - wxList::compatibility_iterator node = sm_handlers.GetFirst(); - while ( node ) - { - wxBitmapHandler *handler = (wxBitmapHandler *)node->GetData(); - if ( handler->GetExtension() == extension && - (bitmapType == wxBITMAP_TYPE_ANY || handler->GetType() == bitmapType) ) - return handler; - node = node->GetNext(); - } - return NULL; -} - -wxBitmapHandler *wxBitmapBase::FindHandler(wxBitmapType bitmapType) -{ - wxList::compatibility_iterator node = sm_handlers.GetFirst(); - while ( node ) - { - wxBitmapHandler *handler = (wxBitmapHandler *)node->GetData(); - if (handler->GetType() == bitmapType) - return handler; - node = node->GetNext(); - } - return NULL; -} - -void wxBitmapBase::CleanUpHandlers() -{ - wxList::compatibility_iterator node = sm_handlers.GetFirst(); - while ( node ) - { - wxBitmapHandler *handler = (wxBitmapHandler *)node->GetData(); - wxList::compatibility_iterator next = node->GetNext(); - delete handler; - sm_handlers.Erase(node); - node = next; - } -} - -class wxBitmapBaseModule: public wxModule -{ - wxDECLARE_DYNAMIC_CLASS(wxBitmapBaseModule); -public: - wxBitmapBaseModule() {} - bool OnInit() wxOVERRIDE { wxBitmap::InitStandardHandlers(); return true; } - void OnExit() wxOVERRIDE { wxBitmap::CleanUpHandlers(); } -}; - -wxIMPLEMENT_DYNAMIC_CLASS(wxBitmapBaseModule, wxModule); - -#endif // wxUSE_BITMAP_BASE - -// ---------------------------------------------------------------------------- -// wxBitmap common -// ---------------------------------------------------------------------------- - -#if !(defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXX11__) || defined(__WXQT__)) - -wxBitmap::wxBitmap(const char* const* bits) -{ - wxCHECK2_MSG(bits != NULL, return, wxT("invalid bitmap data")); - -#if wxUSE_IMAGE && wxUSE_XPM - wxImage image(bits); - wxCHECK2_MSG(image.IsOk(), return, wxT("invalid bitmap data")); - - *this = wxBitmap(image); -#else - wxFAIL_MSG(wxT("creating bitmaps from XPMs not supported")); -#endif // wxUSE_IMAGE && wxUSE_XPM -} -#endif // !(defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXX11__)) - -// ---------------------------------------------------------------------------- -// wxMaskBase -// ---------------------------------------------------------------------------- - -bool wxMaskBase::Create(const wxBitmap& bitmap, const wxColour& colour) -{ - FreeData(); - - return InitFromColour(bitmap, colour); -} - -#if wxUSE_PALETTE - -bool wxMaskBase::Create(const wxBitmap& bitmap, int paletteIndex) -{ - wxPalette *pal = bitmap.GetPalette(); - - wxCHECK_MSG( pal, false, - wxT("Cannot create mask from palette index of a bitmap without palette") ); - - unsigned char r,g,b; - pal->GetRGB(paletteIndex, &r, &g, &b); - - return Create(bitmap, wxColour(r, g, b)); -} - -#endif // wxUSE_PALETTE - -bool wxMaskBase::Create(const wxBitmap& bitmap) -{ - FreeData(); - - return InitFromMonoBitmap(bitmap); -} diff --git a/Externals/wxWidgets3/src/common/bmpbtncmn.cpp b/Externals/wxWidgets3/src/common/bmpbtncmn.cpp deleted file mode 100644 index ff2ea043ce..0000000000 --- a/Externals/wxWidgets3/src/common/bmpbtncmn.cpp +++ /dev/null @@ -1,159 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/bmpbtncmn.cpp -// Purpose: wxBitmapButton common code -// Author: Julian Smart -// Modified by: -// Created: 04/01/98 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_BMPBUTTON - -#include "wx/bmpbuttn.h" - -#ifndef WX_PRECOMP - #include "wx/log.h" - #include "wx/dcmemory.h" - #include "wx/image.h" -#endif - -#include "wx/artprov.h" -#include "wx/renderer.h" - -// ---------------------------------------------------------------------------- -// XTI -// ---------------------------------------------------------------------------- - -wxDEFINE_FLAGS( wxBitmapButtonStyle ) -wxBEGIN_FLAGS( wxBitmapButtonStyle ) - // new style border flags, we put them first to - // use them for streaming out - wxFLAGS_MEMBER(wxBORDER_SIMPLE) - wxFLAGS_MEMBER(wxBORDER_SUNKEN) - wxFLAGS_MEMBER(wxBORDER_DOUBLE) - wxFLAGS_MEMBER(wxBORDER_RAISED) - wxFLAGS_MEMBER(wxBORDER_STATIC) - wxFLAGS_MEMBER(wxBORDER_NONE) - - // old style border flags - wxFLAGS_MEMBER(wxSIMPLE_BORDER) - wxFLAGS_MEMBER(wxSUNKEN_BORDER) - wxFLAGS_MEMBER(wxDOUBLE_BORDER) - wxFLAGS_MEMBER(wxRAISED_BORDER) - wxFLAGS_MEMBER(wxSTATIC_BORDER) - wxFLAGS_MEMBER(wxBORDER) - - // standard window styles - wxFLAGS_MEMBER(wxTAB_TRAVERSAL) - wxFLAGS_MEMBER(wxCLIP_CHILDREN) - wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) - wxFLAGS_MEMBER(wxWANTS_CHARS) - wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE) - wxFLAGS_MEMBER(wxALWAYS_SHOW_SB ) - wxFLAGS_MEMBER(wxVSCROLL) - wxFLAGS_MEMBER(wxHSCROLL) - - wxFLAGS_MEMBER(wxBU_AUTODRAW) - wxFLAGS_MEMBER(wxBU_LEFT) - wxFLAGS_MEMBER(wxBU_RIGHT) - wxFLAGS_MEMBER(wxBU_TOP) - wxFLAGS_MEMBER(wxBU_BOTTOM) -wxEND_FLAGS( wxBitmapButtonStyle ) - -wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxBitmapButton, wxButton, "wx/bmpbuttn.h"); - -wxBEGIN_PROPERTIES_TABLE(wxBitmapButton) - wxPROPERTY_FLAGS( WindowStyle, wxBitmapButtonStyle, long, \ - SetWindowStyleFlag, GetWindowStyleFlag, \ - wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, wxT("Helpstring"), \ - wxT("group")) // style -wxEND_PROPERTIES_TABLE() - -wxEMPTY_HANDLERS_TABLE(wxBitmapButton) - -wxCONSTRUCTOR_5( wxBitmapButton, wxWindow*, Parent, wxWindowID, Id, \ - wxBitmap, Bitmap, wxPoint, Position, wxSize, Size ) - -/* -TODO PROPERTIES : - -long "style" , wxBU_AUTODRAW -bool "default" , 0 -bitmap "selected" , -bitmap "focus" , -bitmap "disabled" , -*/ - -namespace -{ - -#ifdef wxHAS_DRAW_TITLE_BAR_BITMAP - -wxBitmap -GetCloseButtonBitmap(wxWindow *win, - const wxSize& size, - const wxColour& colBg, - int flags = 0) -{ - wxBitmap bmp; - bmp.CreateScaled(size.x, size.y, wxBITMAP_SCREEN_DEPTH, win->GetContentScaleFactor()); - wxMemoryDC dc(bmp); - dc.SetBackground(colBg); - dc.Clear(); - wxRendererNative::Get(). - DrawTitleBarBitmap(win, dc, win->FromDIP(size), wxTITLEBAR_BUTTON_CLOSE, flags); - return bmp; -} - -#endif // wxHAS_DRAW_TITLE_BAR_BITMAP - -} // anonymous namespace - -/* static */ -wxBitmapButton* -wxBitmapButtonBase::NewCloseButton(wxWindow* parent, wxWindowID winid) -{ - wxCHECK_MSG( parent, NULL, wxS("Must have a valid parent") ); - - const wxColour colBg = parent->GetBackgroundColour(); - -#ifdef wxHAS_DRAW_TITLE_BAR_BITMAP - const wxSize sizeBmp = wxArtProvider::GetSizeHint(wxART_BUTTON); - wxBitmap bmp = GetCloseButtonBitmap(parent, sizeBmp, colBg); -#else // !wxHAS_DRAW_TITLE_BAR_BITMAP - wxBitmap bmp = wxArtProvider::GetBitmap(wxART_CLOSE, wxART_BUTTON); -#endif // wxHAS_DRAW_TITLE_BAR_BITMAP - - wxBitmapButton* const button = new wxBitmapButton - ( - parent, - winid, - bmp, - wxDefaultPosition, - wxDefaultSize, - wxBORDER_NONE - ); - -#ifdef wxHAS_DRAW_TITLE_BAR_BITMAP - button->SetBitmapPressed( - GetCloseButtonBitmap(parent, sizeBmp, colBg, wxCONTROL_PRESSED)); - - button->SetBitmapCurrent( - GetCloseButtonBitmap(parent, sizeBmp, colBg, wxCONTROL_CURRENT)); -#endif // wxHAS_DRAW_TITLE_BAR_BITMAP - - // The button should blend with its parent background. - button->SetBackgroundColour(colBg); - - return button; -} - -#endif // wxUSE_BMPBUTTON diff --git a/Externals/wxWidgets3/src/common/bmpcboxcmn.cpp b/Externals/wxWidgets3/src/common/bmpcboxcmn.cpp deleted file mode 100644 index 1fa3c83ffa..0000000000 --- a/Externals/wxWidgets3/src/common/bmpcboxcmn.cpp +++ /dev/null @@ -1,243 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/bmpcboxcmn.cpp -// Purpose: wxBitmapComboBox -// Author: Jaakko Salli -// Created: 2008-04-09 -// Copyright: (c) 2008 Jaakko Salli -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include "wx/bmpcbox.h" - -#if wxUSE_BITMAPCOMBOBOX - -#ifndef WX_PRECOMP - #include "wx/log.h" - #include "wx/dc.h" - #include "wx/ctrlsub.h" -#endif - -#include "wx/settings.h" - -// For wxODCB_XXX flags -#include "wx/odcombo.h" - - -const char wxBitmapComboBoxNameStr[] = "bitmapComboBox"; - -#if defined(wxBITMAPCOMBOBOX_OWNERDRAWN_BASED) - -#define IMAGE_SPACING_RIGHT 4 // Space left of image - -#define IMAGE_SPACING_LEFT 4 // Space right of image, left of text - -#define EXTRA_FONT_HEIGHT 0 // Add to increase min. height of list items - -#define wxBCB_DEFAULT_ITEM_HEIGHT 13 - - -// This macros allows wxArrayPtrVoid to be used in more convenient manner -#define GetBitmapPtr(n) ((wxBitmap*)m_bitmaps[n]) - - -// ---------------------------------------------------------------------------- -// Initialization -// ---------------------------------------------------------------------------- - -void wxBitmapComboBoxBase::Init() -{ - m_fontHeight = 0; - m_imgAreaWidth = 0; - m_indent = 0; - m_usedImgSize = wxSize(-1, -1); -} - -void wxBitmapComboBoxBase::UpdateInternals() -{ - m_fontHeight = GetControl()->GetCharHeight() + EXTRA_FONT_HEIGHT; - - while ( m_bitmaps.GetCount() < GetItemContainer()->GetCount() ) - m_bitmaps.Add( new wxBitmap() ); -} - -// ---------------------------------------------------------------------------- -// Item manipulation -// ---------------------------------------------------------------------------- - -void wxBitmapComboBoxBase::DoSetItemBitmap(unsigned int n, const wxBitmap& bitmap) -{ - wxCHECK_RET( n < m_bitmaps.size(), "invalid item index" ); - *GetBitmapPtr(n) = bitmap; -} - -wxBitmap wxBitmapComboBoxBase::GetItemBitmap(unsigned int n) const -{ - wxCHECK_MSG( n < m_bitmaps.size(), wxNullBitmap, "invalid item index" ); - return *GetBitmapPtr(n); -} - -// ---------------------------------------------------------------------------- -// wxItemContainer methods -// ---------------------------------------------------------------------------- - -void wxBitmapComboBoxBase::BCBDoClear() -{ - for ( unsigned i = 0; i < m_bitmaps.size(); i++ ) - delete GetBitmapPtr(i); - - m_bitmaps.Empty(); - - m_usedImgSize.x = -1; - m_usedImgSize.y = -1; - - DetermineIndent(); -} - -void wxBitmapComboBoxBase::BCBDoDeleteOneItem(unsigned int n) -{ - delete GetBitmapPtr(n); - m_bitmaps.RemoveAt(n); -} - -// ---------------------------------------------------------------------------- -// Preparation and Calculations -// ---------------------------------------------------------------------------- - -bool wxBitmapComboBoxBase::OnAddBitmap(const wxBitmap& bitmap) -{ - if ( bitmap.IsOk() ) - { - int width = bitmap.GetWidth(); - int height = bitmap.GetHeight(); - - if ( m_usedImgSize.x < 0 ) - { - // If size not yet determined, get it from this image. - m_usedImgSize.x = width; - m_usedImgSize.y = height; - - // Adjust control size to vertically fit the bitmap - wxWindow* ctrl = GetControl(); - ctrl->InvalidateBestSize(); - wxSize newSz = ctrl->GetBestSize(); - wxSize sz = ctrl->GetSize(); - if ( newSz.y > sz.y ) - ctrl->SetSize(sz.x, newSz.y); - else - DetermineIndent(); - } - - wxCHECK_MSG( width == m_usedImgSize.x && height == m_usedImgSize.y, - false, - "you can only add images of same size" ); - - return true; - } - - return false; -} - -int wxBitmapComboBoxBase::DetermineIndent() -{ - // Recalculate amount of empty space needed in front of - // text in control itself. - int indent = m_imgAreaWidth = 0; - - if ( m_usedImgSize.x > 0 ) - { - indent = m_usedImgSize.x + IMAGE_SPACING_LEFT + IMAGE_SPACING_RIGHT; - m_imgAreaWidth = indent; - - indent -= 3; - } - - return indent; -} - -// ---------------------------------------------------------------------------- -// Item drawing and measuring -// ---------------------------------------------------------------------------- - -void wxBitmapComboBoxBase::DrawBackground(wxDC& dc, - const wxRect& rect, - int WXUNUSED(item), - int flags) const -{ - if ( flags & wxODCB_PAINTING_SELECTED ) - { - const int vSizeDec = 0; // Vertical size reduction of selection rectangle edges - - dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT)); - - wxColour selCol = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT); - dc.SetPen(selCol); - dc.SetBrush(selCol); - dc.DrawRectangle(rect.x, - rect.y+vSizeDec, - rect.width, - rect.height-(vSizeDec*2)); - } - else - { - dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT)); - - wxColour selCol = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW); - dc.SetPen(selCol); - dc.SetBrush(selCol); - dc.DrawRectangle(rect); - } -} - -void wxBitmapComboBoxBase::DrawItem(wxDC& dc, - const wxRect& rect, - int item, - const wxString& text, - int WXUNUSED(flags)) const -{ - const wxBitmap& bmp = *GetBitmapPtr(item); - if ( bmp.IsOk() ) - { - wxCoord w = bmp.GetWidth(); - wxCoord h = bmp.GetHeight(); - - // Draw the image centered - dc.DrawBitmap(bmp, - rect.x + (m_usedImgSize.x-w)/2 + IMAGE_SPACING_LEFT, - rect.y + (rect.height-h)/2, - true); - } - - if ( !text.empty() ) - dc.DrawText(text, - rect.x + m_imgAreaWidth + 1, - rect.y + (rect.height-dc.GetCharHeight())/2); -} - -wxCoord wxBitmapComboBoxBase::MeasureItem(size_t WXUNUSED(item)) const -{ - if ( m_usedImgSize.y >= 0 ) - { - int imgHeightArea = m_usedImgSize.y + 2; - return imgHeightArea > m_fontHeight ? imgHeightArea : m_fontHeight; - } - - return wxBCB_DEFAULT_ITEM_HEIGHT; -} - -#endif // wxBITMAPCOMBOBOX_OWNERDRAWN_BASED - -#endif // wxUSE_BITMAPCOMBOBOX diff --git a/Externals/wxWidgets3/src/common/bookctrl.cpp b/Externals/wxWidgets3/src/common/bookctrl.cpp deleted file mode 100644 index 3926058ab5..0000000000 --- a/Externals/wxWidgets3/src/common/bookctrl.cpp +++ /dev/null @@ -1,523 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/bookctrl.cpp -// Purpose: wxBookCtrlBase implementation -// Author: Vadim Zeitlin -// Modified by: -// Created: 19.08.03 -// Copyright: (c) 2003 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_BOOKCTRL - -#include "wx/imaglist.h" - -#include "wx/bookctrl.h" - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// event table -// ---------------------------------------------------------------------------- - -wxIMPLEMENT_ABSTRACT_CLASS(wxBookCtrlBase, wxControl); - -wxBEGIN_EVENT_TABLE(wxBookCtrlBase, wxControl) - EVT_SIZE(wxBookCtrlBase::OnSize) -#if wxUSE_HELP - EVT_HELP(wxID_ANY, wxBookCtrlBase::OnHelp) -#endif // wxUSE_HELP -wxEND_EVENT_TABLE() - -// ---------------------------------------------------------------------------- -// constructors and destructors -// ---------------------------------------------------------------------------- - -void wxBookCtrlBase::Init() -{ - m_selection = wxNOT_FOUND; - m_bookctrl = NULL; - m_fitToCurrentPage = false; - - m_internalBorder = 5; - - m_controlMargin = 0; - m_controlSizer = NULL; -} - -bool -wxBookCtrlBase::Create(wxWindow *parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) -{ - return wxControl::Create - ( - parent, - id, - pos, - size, - style, - wxDefaultValidator, - name - ); -} - -// ---------------------------------------------------------------------------- -// geometry -// ---------------------------------------------------------------------------- - -void wxBookCtrlBase::DoInvalidateBestSize() -{ - // notice that it is not necessary to invalidate our own best size - // explicitly if we have m_bookctrl as it will already invalidate the best - // size of its parent when its own size is invalidated and its parent is - // this control - if ( m_bookctrl ) - m_bookctrl->InvalidateBestSize(); - else - wxControl::InvalidateBestSize(); -} - -wxSize wxBookCtrlBase::CalcSizeFromPage(const wxSize& sizePage) const -{ - // Add the size of the controller and the border between if it's shown. - if ( !m_bookctrl || !m_bookctrl->IsShown() ) - return sizePage; - - // Notice that the controller size is its current size while we really want - // to have its best size. So we only take into account its size in the - // direction in which we should add it but not in the other one, where the - // controller size is determined by the size of wxBookCtrl itself. - const wxSize sizeController = GetControllerSize(); - - wxSize size = sizePage; - if ( IsVertical() ) - size.y += sizeController.y + GetInternalBorder(); - else // left/right aligned - size.x += sizeController.x + GetInternalBorder(); - - return size; -} - -void wxBookCtrlBase::SetPageSize(const wxSize& size) -{ - SetClientSize(CalcSizeFromPage(size)); -} - -wxSize wxBookCtrlBase::DoGetBestSize() const -{ - wxSize bestSize; - - if (m_fitToCurrentPage && GetCurrentPage()) - { - bestSize = GetCurrentPage()->GetBestSize(); - } - else - { - // iterate over all pages, get the largest width and height - const size_t nCount = m_pages.size(); - for ( size_t nPage = 0; nPage < nCount; nPage++ ) - { - const wxWindow * const pPage = m_pages[nPage]; - if ( pPage ) - bestSize.IncTo(pPage->GetBestSize()); - } - } - - // convert display area to window area, adding the size necessary for the - // tabs - wxSize best = CalcSizeFromPage(bestSize); - CacheBestSize(best); - return best; -} - -wxRect wxBookCtrlBase::GetPageRect() const -{ - const wxSize size = GetControllerSize(); - - wxPoint pt; - wxRect rectPage(pt, GetClientSize()); - - switch ( GetWindowStyle() & wxBK_ALIGN_MASK ) - { - default: - wxFAIL_MSG( wxT("unexpected alignment") ); - wxFALLTHROUGH; - - case wxBK_TOP: - rectPage.y = size.y + GetInternalBorder(); - wxFALLTHROUGH; - - case wxBK_BOTTOM: - rectPage.height -= size.y + GetInternalBorder(); - if (rectPage.height < 0) - rectPage.height = 0; - break; - - case wxBK_LEFT: - rectPage.x = size.x + GetInternalBorder(); - wxFALLTHROUGH; - - case wxBK_RIGHT: - rectPage.width -= size.x + GetInternalBorder(); - if (rectPage.width < 0) - rectPage.width = 0; - break; - } - - return rectPage; -} - -// Lay out controls -void wxBookCtrlBase::DoSize() -{ - if ( !m_bookctrl ) - { - // we're not fully created yet or OnSize() should be hidden by derived class - return; - } - - if (GetSizer()) - Layout(); - else - { - // resize controller and the page area to fit inside our new size - const wxSize sizeClient( GetClientSize() ), - sizeBorder( m_bookctrl->GetSize() - m_bookctrl->GetClientSize() ), - sizeCtrl( GetControllerSize() ); - - m_bookctrl->SetClientSize( sizeCtrl.x - sizeBorder.x, sizeCtrl.y - sizeBorder.y ); - // if this changes the visibility of the scrollbars the best size changes, relayout in this case - wxSize sizeCtrl2 = GetControllerSize(); - if ( sizeCtrl != sizeCtrl2 ) - { - wxSize sizeBorder2 = m_bookctrl->GetSize() - m_bookctrl->GetClientSize(); - m_bookctrl->SetClientSize( sizeCtrl2.x - sizeBorder2.x, sizeCtrl2.y - sizeBorder2.y ); - } - - const wxSize sizeNew = m_bookctrl->GetSize(); - wxPoint posCtrl; - switch ( GetWindowStyle() & wxBK_ALIGN_MASK ) - { - default: - wxFAIL_MSG( wxT("unexpected alignment") ); - wxFALLTHROUGH; - - case wxBK_TOP: - case wxBK_LEFT: - // posCtrl is already ok - break; - - case wxBK_BOTTOM: - posCtrl.y = sizeClient.y - sizeNew.y; - break; - - case wxBK_RIGHT: - posCtrl.x = sizeClient.x - sizeNew.x; - break; - } - - if ( m_bookctrl->GetPosition() != posCtrl ) - m_bookctrl->Move(posCtrl); - } - - // resize all pages to fit the new control size - const wxRect pageRect = GetPageRect(); - const unsigned pagesCount = m_pages.GetCount(); - for ( unsigned int i = 0; i < pagesCount; ++i ) - { - wxWindow * const page = m_pages[i]; - if ( !page ) - { - wxASSERT_MSG( AllowNullPage(), - wxT("Null page in a control that does not allow null pages?") ); - continue; - } - - page->SetSize(pageRect); - } -} - -void wxBookCtrlBase::OnSize(wxSizeEvent& event) -{ - event.Skip(); - - DoSize(); -} - -wxSize wxBookCtrlBase::GetControllerSize() const -{ - // For at least some book controls (e.g. wxChoicebook) it may make sense to - // (temporarily?) hide the controller and we shouldn't leave extra space - // for the hidden control in this case. - if ( !m_bookctrl || !m_bookctrl->IsShown() ) - return wxSize(0, 0); - - const wxSize sizeClient = GetClientSize(); - - wxSize size; - - // Ask for the best width/height considering the other direction. - if ( IsVertical() ) - { - size.x = sizeClient.x; - size.y = m_bookctrl->GetBestHeight(sizeClient.x); - } - else // left/right aligned - { - size.x = m_bookctrl->GetBestWidth(sizeClient.y); - size.y = sizeClient.y; - } - - return size; -} - -// ---------------------------------------------------------------------------- -// miscellaneous stuff -// ---------------------------------------------------------------------------- - -#if wxUSE_HELP - -void wxBookCtrlBase::OnHelp(wxHelpEvent& event) -{ - // determine where does this even originate from to avoid redirecting it - // back to the page which generated it (resulting in an infinite loop) - - // notice that we have to check in the hard(er) way instead of just testing - // if the event object == this because the book control can have other - // subcontrols inside it (e.g. wxSpinButton in case of a notebook in wxUniv) - wxWindow *source = wxStaticCast(event.GetEventObject(), wxWindow); - while ( source && source != this && source->GetParent() != this ) - { - source = source->GetParent(); - } - - if ( source && m_pages.Index(source) == wxNOT_FOUND ) - { - // this event is for the book control itself, redirect it to the - // corresponding page - wxWindow *page = NULL; - - if ( event.GetOrigin() == wxHelpEvent::Origin_HelpButton ) - { - // show help for the page under the mouse - const int pagePos = HitTest(ScreenToClient(event.GetPosition())); - - if ( pagePos != wxNOT_FOUND) - { - page = GetPage((size_t)pagePos); - } - } - else // event from keyboard or unknown source - { - // otherwise show the current page help - page = GetCurrentPage(); - } - - if ( page ) - { - // change event object to the page to avoid infinite recursion if - // we get this event ourselves if the page doesn't handle it - event.SetEventObject(page); - - if ( page->GetEventHandler()->ProcessEvent(event) ) - { - // don't call event.Skip() - return; - } - } - } - //else: event coming from one of our pages already - - event.Skip(); -} - -#endif // wxUSE_HELP - -// ---------------------------------------------------------------------------- -// pages management -// ---------------------------------------------------------------------------- - -bool -wxBookCtrlBase::InsertPage(size_t nPage, - wxWindow *page, - const wxString& WXUNUSED(text), - bool WXUNUSED(bSelect), - int WXUNUSED(imageId)) -{ - wxCHECK_MSG( page || AllowNullPage(), false, - wxT("NULL page in wxBookCtrlBase::InsertPage()") ); - wxCHECK_MSG( nPage <= m_pages.size(), false, - wxT("invalid page index in wxBookCtrlBase::InsertPage()") ); - - m_pages.Insert(page, nPage); - if ( page ) - page->SetSize(GetPageRect()); - - DoInvalidateBestSize(); - - return true; -} - -bool wxBookCtrlBase::DeletePage(size_t nPage) -{ - wxWindow *page = DoRemovePage(nPage); - if ( !(page || AllowNullPage()) ) - return false; - - // delete NULL is harmless - delete page; - - return true; -} - -wxWindow *wxBookCtrlBase::DoRemovePage(size_t nPage) -{ - wxCHECK_MSG( nPage < m_pages.size(), NULL, - wxT("invalid page index in wxBookCtrlBase::DoRemovePage()") ); - - wxWindow *pageRemoved = m_pages[nPage]; - m_pages.RemoveAt(nPage); - DoInvalidateBestSize(); - - return pageRemoved; -} - -int wxBookCtrlBase::GetNextPage(bool forward) const -{ - int nPage; - - int nMax = GetPageCount(); - if ( nMax-- ) // decrement it to get the last valid index - { - int nSel = GetSelection(); - - // change selection wrapping if it becomes invalid - nPage = forward ? nSel == nMax ? 0 - : nSel + 1 - : nSel == 0 ? nMax - : nSel - 1; - } - else // notebook is empty, no next page - { - nPage = wxNOT_FOUND; - } - - return nPage; -} - -int wxBookCtrlBase::FindPage(const wxWindow* page) const -{ - const size_t nCount = m_pages.size(); - for ( size_t nPage = 0; nPage < nCount; nPage++ ) - { - if ( m_pages[nPage] == page ) - return (int)nPage; - } - - return wxNOT_FOUND; -} - -bool wxBookCtrlBase::DoSetSelectionAfterInsertion(size_t n, bool bSelect) -{ - if ( bSelect ) - SetSelection(n); - else if ( m_selection == wxNOT_FOUND ) - ChangeSelection(0); - else // We're not going to select this page. - return false; - - // Return true to indicate that we selected this page. - return true; -} - -void wxBookCtrlBase::DoSetSelectionAfterRemoval(size_t n) -{ - if ( m_selection >= (int)n ) - { - // ensure that the selection is valid - int sel; - if ( GetPageCount() == 0 ) - sel = wxNOT_FOUND; - else - sel = m_selection ? m_selection - 1 : 0; - - // if deleting current page we shouldn't try to hide it - m_selection = m_selection == (int)n ? wxNOT_FOUND - : m_selection - 1; - - if ( sel != wxNOT_FOUND && sel != m_selection ) - SetSelection(sel); - } -} - -int wxBookCtrlBase::DoSetSelection(size_t n, int flags) -{ - wxCHECK_MSG( n < GetPageCount(), wxNOT_FOUND, - wxT("invalid page index in wxBookCtrlBase::DoSetSelection()") ); - - const int oldSel = GetSelection(); - - if ( n != (size_t)oldSel ) - { - wxBookCtrlEvent *event = CreatePageChangingEvent(); - bool allowed = false; - - if ( flags & SetSelection_SendEvent ) - { - event->SetSelection(n); - event->SetOldSelection(oldSel); - event->SetEventObject(this); - - allowed = !GetEventHandler()->ProcessEvent(*event) || event->IsAllowed(); - } - - if ( !(flags & SetSelection_SendEvent) || allowed) - { - if ( oldSel != wxNOT_FOUND ) - DoShowPage(m_pages[oldSel], false); - - wxWindow *page = m_pages[n]; - page->SetSize(GetPageRect()); - DoShowPage(page, true); - - // change selection now to ignore the selection change event - UpdateSelectedPage(n); - - if ( flags & SetSelection_SendEvent ) - { - // program allows the page change - MakeChangedEvent(*event); - (void)GetEventHandler()->ProcessEvent(*event); - } - } - - delete event; - } - - return oldSel; -} - -wxIMPLEMENT_DYNAMIC_CLASS(wxBookCtrlEvent, wxNotifyEvent); - -#endif // wxUSE_BOOKCTRL diff --git a/Externals/wxWidgets3/src/common/btncmn.cpp b/Externals/wxWidgets3/src/common/btncmn.cpp deleted file mode 100644 index 912605ba5c..0000000000 --- a/Externals/wxWidgets3/src/common/btncmn.cpp +++ /dev/null @@ -1,121 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/btncmn.cpp -// Purpose: implementation of wxButtonBase -// Author: Vadim Zeitlin -// Created: 2007-04-08 -// Copyright: (c) 2007 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// for compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_BUTTON - -#ifndef WX_PRECOMP - #include "wx/button.h" - #include "wx/toplevel.h" -#endif //WX_PRECOMP - -extern WXDLLEXPORT_DATA(const char) wxButtonNameStr[] = "button"; - -// ---------------------------------------------------------------------------- -// XTI -// ---------------------------------------------------------------------------- - -wxDEFINE_FLAGS( wxButtonStyle ) -wxBEGIN_FLAGS( wxButtonStyle ) -// new style border flags, we put them first to -// use them for streaming out -wxFLAGS_MEMBER(wxBORDER_SIMPLE) -wxFLAGS_MEMBER(wxBORDER_SUNKEN) -wxFLAGS_MEMBER(wxBORDER_DOUBLE) -wxFLAGS_MEMBER(wxBORDER_RAISED) -wxFLAGS_MEMBER(wxBORDER_STATIC) -wxFLAGS_MEMBER(wxBORDER_NONE) - -// old style border flags -wxFLAGS_MEMBER(wxSIMPLE_BORDER) -wxFLAGS_MEMBER(wxSUNKEN_BORDER) -wxFLAGS_MEMBER(wxDOUBLE_BORDER) -wxFLAGS_MEMBER(wxRAISED_BORDER) -wxFLAGS_MEMBER(wxSTATIC_BORDER) -wxFLAGS_MEMBER(wxBORDER) - -// standard window styles -wxFLAGS_MEMBER(wxTAB_TRAVERSAL) -wxFLAGS_MEMBER(wxCLIP_CHILDREN) -wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) -wxFLAGS_MEMBER(wxWANTS_CHARS) -wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE) -wxFLAGS_MEMBER(wxALWAYS_SHOW_SB ) -wxFLAGS_MEMBER(wxVSCROLL) -wxFLAGS_MEMBER(wxHSCROLL) - -wxFLAGS_MEMBER(wxBU_LEFT) -wxFLAGS_MEMBER(wxBU_RIGHT) -wxFLAGS_MEMBER(wxBU_TOP) -wxFLAGS_MEMBER(wxBU_BOTTOM) -wxFLAGS_MEMBER(wxBU_EXACTFIT) -wxEND_FLAGS( wxButtonStyle ) - -wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxButton, wxControl, "wx/button.h"); - -wxBEGIN_PROPERTIES_TABLE(wxButton) -wxEVENT_PROPERTY( Click, wxEVT_BUTTON, wxCommandEvent ) - -wxPROPERTY( Font, wxFont, SetFont, GetFont, wxEMPTY_PARAMETER_VALUE, \ - 0 /*flags*/, wxT("The font associated with the button label"), wxT("group")) -wxPROPERTY( Label, wxString, SetLabel, GetLabel, wxString(), \ - 0 /*flags*/, wxT("The button label"), wxT("group") ) - -wxPROPERTY_FLAGS( WindowStyle, wxButtonStyle, long, SetWindowStyleFlag, \ - GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \ - wxT("The button style"), wxT("group")) // style -wxEND_PROPERTIES_TABLE() - -wxEMPTY_HANDLERS_TABLE(wxButton) - -wxCONSTRUCTOR_6( wxButton, wxWindow*, Parent, wxWindowID, Id, wxString, \ - Label, wxPoint, Position, wxSize, Size, long, WindowStyle ) - - -// ============================================================================ -// implementation -// ============================================================================ - -wxWindow *wxButtonBase::SetDefault() -{ - wxTopLevelWindow * const - tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow); - - wxCHECK_MSG( tlw, NULL, wxT("button without top level window?") ); - - return tlw->SetDefaultItem(this); -} - -void wxAnyButtonBase::SetBitmapPosition(wxDirection dir) -{ - wxASSERT_MSG( !(dir & ~wxDIRECTION_MASK), "non-direction flag used" ); - wxASSERT_MSG( !!(dir & wxLEFT) + - !!(dir & wxRIGHT) + - !!(dir & wxTOP) + - !!(dir & wxBOTTOM) == 1, - "exactly one direction flag must be set" ); - - DoSetBitmapPosition(dir); - -} -#endif // wxUSE_BUTTON diff --git a/Externals/wxWidgets3/src/common/cairo.cpp b/Externals/wxWidgets3/src/common/cairo.cpp deleted file mode 100644 index 7d4984efb2..0000000000 --- a/Externals/wxWidgets3/src/common/cairo.cpp +++ /dev/null @@ -1,429 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/cairo.cpp -// Purpose: Cairo library -// Author: Anthony Betaudeau -// Created: 2007-08-25 -// Copyright: (c) Anthony Bretaudeau -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - - -// For compilers that support precompilation, includes "wx/wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_CAIRO - -// keep cairo.h from defining dllimport as we're defining the symbols inside -// the wx dll in order to load them dynamically. -#define cairo_public - -#include -#include "wx/dynlib.h" - -#ifdef __WXMSW__ -#include "wx/msw/wrapwin.h" -#endif - -#ifdef __WXMAC__ -#include "wx/osx/private.h" -#include -#endif - -#ifndef WX_PRECOMP - #include "wx/module.h" - #include "wx/log.h" -#endif - -#define wxCAIRO_METHOD_TYPE(name) \ - wxCairo##name##_t - -#define wxCAIRO_STATIC_METHOD_DEFINE(rettype, name, args, argnames, defret) \ - static wxCAIRO_METHOD_TYPE(name) name; - -#define wxCAIRO_STATIC_VOIDMETHOD_DEFINE(name, args, argnames) \ - wxCAIRO_STATIC_METHOD_DEFINE(void, name, args, argnames, NULL) - -#define wxFOR_ALL_CAIRO_VOIDMETHODS(m) \ - m( cairo_append_path, \ - (cairo_t *cr, const cairo_path_t *path), (cr, path) ) \ - m( cairo_arc, \ - (cairo_t *cr, double xc, double yc, double radius, double angle1, double angle2), (cr, xc, yc, radius, angle1, angle2) ) \ - m( cairo_arc_negative, \ - (cairo_t *cr, double xc, double yc, double radius, double angle1, double angle2), (cr, xc, yc, radius, angle1, angle2) ) \ - m( cairo_clip, \ - (cairo_t *cr), (cr) ) \ - m( cairo_close_path, \ - (cairo_t *cr), (cr) ) \ - m( cairo_curve_to, \ - (cairo_t *cr, double x1, double y1, double x2, double y2, double x3, double y3), (cr, x1, y1, x2, y2, x3, y3) ) \ - m( cairo_destroy, \ - (cairo_t *cr), (cr) ) \ - m( cairo_fill, \ - (cairo_t *cr), (cr) ) \ - m( cairo_fill_preserve, \ - (cairo_t *cr), (cr) ) \ - m( cairo_font_extents, \ - (cairo_t *cr, cairo_font_extents_t *extents), (cr, extents) ) \ - m( cairo_font_face_destroy, \ - (cairo_font_face_t *font_face), (font_face) ) \ - m( cairo_get_current_point, \ - (cairo_t *cr, double *x, double *y), (cr, x, y) ) \ - m( cairo_get_matrix, \ - (cairo_t *cr, cairo_matrix_t *matrix), (cr, matrix) ) \ - m( cairo_line_to, \ - (cairo_t *cr, double x, double y), (cr, x, y) ) \ - m( cairo_matrix_init, \ - (cairo_matrix_t *matrix, double xx, double yx, double xy, double yy, double x0, double y0), (matrix, xx, yx, xy, yy, x0, y0) ) \ - m( cairo_matrix_multiply, \ - (cairo_matrix_t *result, const cairo_matrix_t *a, const cairo_matrix_t *b), (result, a, b) ) \ - m( cairo_matrix_rotate, \ - (cairo_matrix_t *matrix, double radians), (matrix, radians) ) \ - m( cairo_matrix_scale, \ - (cairo_matrix_t *matrix, double sx, double sy), (matrix, sx, sy) ) \ - m( cairo_matrix_transform_distance, \ - (const cairo_matrix_t *matrix, double *dx, double *dy), (matrix, dx, dy) ) \ - m( cairo_matrix_transform_point, \ - (const cairo_matrix_t *matrix, double *x, double *y), (matrix, x, y) ) \ - m( cairo_matrix_translate, \ - (cairo_matrix_t *matrix, double tx, double ty), (matrix, tx, ty) ) \ - m( cairo_move_to, \ - (cairo_t *cr, double x, double y), (cr, x, y) ) \ - m( cairo_new_path, \ - (cairo_t *cr), (cr) ) \ - m( cairo_paint, \ - (cairo_t *cr), (cr) ) \ - m( cairo_paint_with_alpha, \ - (cairo_t *cr, double alpha), (cr, alpha) ) \ - m( cairo_path_destroy, \ - (cairo_path_t *path), (path) ) \ - m( cairo_pattern_add_color_stop_rgba, \ - (cairo_pattern_t *pattern, double offset, double red, double green, double blue, double alpha), (pattern, offset, red, green, blue, alpha) ) \ - m( cairo_pattern_destroy, \ - (cairo_pattern_t *pattern), (pattern) ) \ - m( cairo_pattern_set_extend, \ - (cairo_pattern_t *pattern, cairo_extend_t extend), (pattern, extend) ) \ - m( cairo_pattern_set_filter, \ - (cairo_pattern_t *pattern, cairo_filter_t filter), (pattern, filter) ) \ - m( cairo_pop_group_to_source, \ - (cairo_t *cr), (cr) ) \ - m( cairo_push_group, \ - (cairo_t *cr), (cr) ) \ - m( cairo_rectangle, \ - (cairo_t *cr, double x, double y, double width, double height), (cr, x, y, width, height) ) \ - m( cairo_reset_clip, \ - (cairo_t *cr), (cr) ) \ - m( cairo_restore, \ - (cairo_t *cr), (cr) ) \ - m( cairo_rotate, \ - (cairo_t *cr, double angle), (cr, angle) ) \ - m( cairo_save, \ - (cairo_t *cr), (cr) ) \ - m( cairo_scale, \ - (cairo_t *cr, double sx, double sy), (cr, sx, sy) ) \ - m( cairo_select_font_face, \ - (cairo_t *cr, const char *family, cairo_font_slant_t slant, cairo_font_weight_t weight), (cr, family, slant, weight) ) \ - m( cairo_set_antialias, \ - (cairo_t *cr, cairo_antialias_t antialias), (cr, antialias) ) \ - m( cairo_set_dash, \ - (cairo_t *cr, const double *dashes, int num_dashes, double offset), (cr, dashes, num_dashes, offset) ) \ - m( cairo_set_fill_rule, \ - (cairo_t *cr, cairo_fill_rule_t fill_rule), (cr, fill_rule) ) \ - m( cairo_set_font_face, \ - (cairo_t *cr, cairo_font_face_t *font_face), (cr, font_face) ) \ - m( cairo_set_font_size, \ - (cairo_t *cr, double size), (cr, size) ) \ - m( cairo_set_line_cap, \ - (cairo_t *cr, cairo_line_cap_t line_cap), (cr, line_cap) ) \ - m( cairo_set_line_join, \ - (cairo_t *cr, cairo_line_join_t line_join), (cr, line_join) ) \ - m( cairo_set_line_width, \ - (cairo_t *cr, double width), (cr, width) ) \ - m( cairo_set_matrix, \ - (cairo_t *cr, const cairo_matrix_t *matrix), (cr, matrix) ) \ - m( cairo_set_operator, \ - (cairo_t *cr, cairo_operator_t op), (cr, op) ) \ - m( cairo_set_source, \ - (cairo_t *cr, cairo_pattern_t *source), (cr, source) ) \ - m( cairo_set_source_rgba, \ - (cairo_t *cr, double red, double green, double blue, double alpha), (cr, red, green, blue, alpha) ) \ - m( cairo_show_text, \ - (cairo_t *cr, const char *utf8), (cr, utf8) ) \ - m( cairo_stroke, \ - (cairo_t *cr), (cr) ) \ - m( cairo_stroke_extents, \ - (cairo_t *cr, double *x1, double *y1, double *x2, double *y2), (cr, x1, y1, x2, y2) ) \ - m( cairo_stroke_preserve, \ - (cairo_t *cr), (cr) ) \ - m( cairo_surface_destroy, \ - (cairo_surface_t *surface), (surface) ) \ - m( cairo_text_extents, \ - (cairo_t *cr, const char *utf8, cairo_text_extents_t *extents), (cr, utf8, extents) ) \ - m( cairo_transform, \ - (cairo_t *cr, const cairo_matrix_t *matrix), (cr, matrix) ) \ - m( cairo_translate, \ - (cairo_t *cr, double tx, double ty), (cr, tx, ty) ) \ - m( cairo_surface_flush, \ - (cairo_surface_t *surface), (surface) ) \ - -#ifdef __WXMAC__ -#define wxCAIRO_PLATFORM_METHODS(m) \ - m( cairo_font_face_t*, cairo_quartz_font_face_create_for_cgfont, \ - (CGFontRef font), (font), NULL ) \ - m( cairo_surface_t*, cairo_quartz_surface_create_for_cg_context, \ - (CGContextRef cgContext, unsigned int width, unsigned int height), (cgContext, width, height), NULL ) -#elif defined(__WXMSW__) -#define wxCAIRO_PLATFORM_METHODS(m) \ - m( cairo_surface_t*, cairo_win32_surface_create, \ - (HDC hdc), (hdc), NULL ) \ - m( cairo_surface_t*, cairo_win32_printing_surface_create, \ - (HDC hdc), (hdc), NULL ) -#else -#define wxCAIRO_PLATFORM_METHODS(m) -#endif - -#define wxFOR_ALL_CAIRO_METHODS(m) \ - m( cairo_path_t*, cairo_copy_path, \ - (cairo_t *cr), (cr), NULL ) \ - m( cairo_t*, cairo_create, \ - (cairo_surface_t *target), (target), NULL) \ - m( cairo_surface_t*, cairo_get_target, \ - (cairo_t *cr), (cr), NULL) \ - m( cairo_surface_t*, cairo_image_surface_create, \ - (cairo_format_t format, int width, int height), (format, width, height), NULL ) \ - m( cairo_surface_t*, cairo_image_surface_create_for_data, \ - (unsigned char *data, cairo_format_t format, int width, int height, int stride), (data, format, width, height, stride), NULL) \ - m( cairo_bool_t, cairo_in_fill, \ - (cairo_t *cr, double x, double y), (cr, x, y), false ) \ - m( cairo_status_t, cairo_matrix_invert, \ - (cairo_matrix_t *matrix), (matrix), NULL) \ - m( cairo_pattern_t*, cairo_pattern_create_for_surface, \ - (cairo_surface_t *surface), (surface), NULL) \ - m( cairo_pattern_t*, cairo_pattern_create_linear, \ - (double x0, double y0, double x1, double y1), (x0, y0, x1, y1), NULL) \ - m( cairo_pattern_t*, cairo_pattern_create_radial, \ - (double cx0, double cy0, double radius0, double cx1, double cy1, double radius1), (cx0, cy0, radius0, cx1, cy1, radius1), NULL) \ - m( cairo_status_t, cairo_pattern_status, \ - (cairo_pattern_t *pattern), (pattern), 4) \ - m( cairo_t*, cairo_reference, \ - (cairo_t *cr), (cr), NULL ) \ - m( cairo_surface_t*, cairo_surface_create_similar, \ - (cairo_surface_t *other, cairo_content_t content, int width, int height), (other, content, width, height), NULL) \ - m( int, cairo_format_stride_for_width, \ - (cairo_format_t format, int width), (format, width), 0) \ - m( int, cairo_version, \ - (), (), 0) \ - m( int, cairo_image_surface_get_width, \ - (cairo_surface_t *surface), (surface), 0) \ - m( int, cairo_image_surface_get_height, \ - (cairo_surface_t *surface), (surface), 0) \ - m( int, cairo_image_surface_get_stride, \ - (cairo_surface_t *surface), (surface), 0) \ - m( unsigned char *, cairo_image_surface_get_data, \ - (cairo_surface_t *surface), (surface), NULL) \ - m( cairo_format_t, cairo_image_surface_get_format, \ - (cairo_surface_t *surface), (surface), CAIRO_FORMAT_INVALID) \ - m( cairo_surface_type_t, cairo_surface_get_type, \ - (cairo_surface_t *surface), (surface), -1) \ - m( const char *, cairo_version_string, \ - (), () , NULL ) \ - wxCAIRO_PLATFORM_METHODS(m) - -#define wxCAIRO_DECLARE_TYPE(rettype, name, args, argnames, defret) \ - typedef rettype (*wxCAIRO_METHOD_TYPE(name)) args ; \ - wxCAIRO_METHOD_TYPE(name) wxDL_METHOD_NAME(name); - -#define wxCAIRO_DECLARE_VOIDTYPE(name, args, argnames) \ - wxCAIRO_DECLARE_TYPE(void, name, args, argnames, NULL) - -wxFOR_ALL_CAIRO_VOIDMETHODS(wxCAIRO_DECLARE_VOIDTYPE) -wxFOR_ALL_CAIRO_METHODS(wxCAIRO_DECLARE_TYPE) - - -class wxCairo -{ -public: - static bool Initialize(); - - // for internal use only - static void CleanUp(); - -private: - // the single wxCairo instance or NULL - static wxCairo *ms_lib; - - wxCairo(); - ~wxCairo(); - - wxDynamicLibrary m_libCairo; - wxDynamicLibrary m_libPangoCairo; - - // true if we successfully loaded the libraries and can use them - // - // note that this field must have this name as it's used by wxDL_XXX macros - bool m_ok; - -public: - - wxFOR_ALL_CAIRO_VOIDMETHODS(wxCAIRO_STATIC_VOIDMETHOD_DEFINE) - wxFOR_ALL_CAIRO_METHODS(wxCAIRO_STATIC_METHOD_DEFINE) -#if wxUSE_PANGO // untested, uncomment to test compilation. - //wxFOR_ALL_PANGO_METHODS(wxDL_STATIC_METHOD_DEFINE) -#endif - - wxDECLARE_NO_COPY_CLASS(wxCairo); -}; - -#define wxINIT_CAIRO_VOIDFUNC(name, params, args) \ - wxCAIRO_METHOD_TYPE(name) wxCairo::name = NULL; - -#define wxINIT_CAIRO_FUNC(rettype, name, params, args, defret) \ - wxCAIRO_METHOD_TYPE(name) wxCairo::name = NULL; - -wxFOR_ALL_CAIRO_VOIDMETHODS(wxINIT_CAIRO_VOIDFUNC) -wxFOR_ALL_CAIRO_METHODS(wxINIT_CAIRO_FUNC) - -#undef wxINIT_CAIRO_FUNC - -wxCairo *wxCairo::ms_lib = NULL; - -//---------------------------------------------------------------------------- -// wxCairoLibrary -//---------------------------------------------------------------------------- - -wxCairo::wxCairo() -{ - wxLogNull log; - -#ifdef __WXMSW__ - wxString cairoDllStr("libcairo-2.dll"); -#else - wxString cairoDllStr("libcairo.so.2"); -#endif - m_libCairo.Load(cairoDllStr); - m_ok = m_libCairo.IsLoaded(); - if ( !m_ok ) - return; - -#if wxUSE_PANGO - m_libPangoCairo.Load("libpangocairo-1.0.so.0"); - m_ok = m_libPangoCairo.IsLoaded(); - if ( !m_ok ) - { - m_libCairo.Unload(); - return; - } -#endif - - -#define wxDO_LOAD_FUNC(name, nameStr) \ - name = (wxCAIRO_METHOD_TYPE(name))m_libCairo.RawGetSymbol(nameStr); \ - if ( !name ) \ - return; - -#define wxLOAD_CAIRO_VOIDFUNC(name, params, args) \ - wxDO_LOAD_FUNC(name, wxSTRINGIZE_T(name)) - -#define wxLOAD_CAIRO_FUNC(rettype, name, params, args, defret) \ - wxDO_LOAD_FUNC(name, wxSTRINGIZE_T(name)) - -wxFOR_ALL_CAIRO_VOIDMETHODS(wxLOAD_CAIRO_VOIDFUNC) -wxFOR_ALL_CAIRO_METHODS(wxLOAD_CAIRO_FUNC) - -#undef wxLOAD_CAIRO_FUNC - - m_ok = true; -} - -wxCairo::~wxCairo() -{ -} - -/* static */ bool wxCairo::Initialize() -{ - if ( !ms_lib ) - { - ms_lib = new wxCairo(); - if ( !ms_lib->m_ok ) - { - delete ms_lib; - ms_lib = NULL; - } - } - - return ms_lib != NULL; -} - -/* static */ void wxCairo::CleanUp() -{ - if (ms_lib) - { - delete ms_lib; - ms_lib = NULL; - } -} - -// ============================================================================ -// implementation of the functions themselves -// ============================================================================ - -bool wxCairoInit() -{ - return wxCairo::Initialize(); -} - -#ifndef __WXGTK__ -extern "C" -{ - -#define wxIMPL_CAIRO_FUNC(rettype, name, params, args, defret) \ - rettype name params \ - { \ - wxASSERT_MSG(wxCairo::Initialize(), "Cairo not initialized"); \ - return wxCairo::name args; \ - } - -#define wxIMPL_CAIRO_VOIDFUNC(name, params, args) \ - wxIMPL_CAIRO_FUNC(void, name, params, args, NULL) - -// we currently link directly to Cairo on GTK since it is usually available there, -// so don't use our cairo_xyz wrapper functions until the decision is made to -// always load Cairo dynamically there. - -wxFOR_ALL_CAIRO_VOIDMETHODS(wxIMPL_CAIRO_VOIDFUNC) -wxFOR_ALL_CAIRO_METHODS(wxIMPL_CAIRO_FUNC) - -} // extern "C" -#endif // !__WXGTK__ - -//---------------------------------------------------------------------------- -// wxCairoModule -//---------------------------------------------------------------------------- - -class wxCairoModule : public wxModule -{ -public: - wxCairoModule() { } - virtual bool OnInit() wxOVERRIDE; - virtual void OnExit() wxOVERRIDE; - -private: - wxDECLARE_DYNAMIC_CLASS(wxCairoModule); -}; - -bool wxCairoModule::OnInit() -{ - return true; -} - -void wxCairoModule::OnExit() -{ - wxCairo::CleanUp(); -} - -wxIMPLEMENT_DYNAMIC_CLASS(wxCairoModule, wxModule); - -#endif // wxUSE_CAIRO diff --git a/Externals/wxWidgets3/src/common/calctrlcmn.cpp b/Externals/wxWidgets3/src/common/calctrlcmn.cpp deleted file mode 100644 index 5ab2542251..0000000000 --- a/Externals/wxWidgets3/src/common/calctrlcmn.cpp +++ /dev/null @@ -1,199 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/calctrlcmn.cpp -// Author: Marcin Wojdyr -// Created: 2008-03-26 -// Copyright: (C) Marcin Wojdyr -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#ifndef WX_PRECOMP -#endif //WX_PRECOMP - -#if wxUSE_CALENDARCTRL || wxUSE_DATEPICKCTRL || wxUSE_TIMEPICKCTRL - -#include "wx/dateevt.h" -wxIMPLEMENT_DYNAMIC_CLASS(wxDateEvent, wxCommandEvent); -wxDEFINE_EVENT(wxEVT_DATE_CHANGED, wxDateEvent); -wxDEFINE_EVENT(wxEVT_TIME_CHANGED, wxDateEvent); - -#endif // wxUSE_CALENDARCTRL || wxUSE_DATEPICKCTRL || wxUSE_TIMEPICKCTRL - - -#if wxUSE_CALENDARCTRL - -#include "wx/calctrl.h" - -// ---------------------------------------------------------------------------- -// XTI -// ---------------------------------------------------------------------------- - -wxDEFINE_FLAGS( wxCalendarCtrlStyle ) -wxBEGIN_FLAGS( wxCalendarCtrlStyle ) -// new style border flags, we put them first to -// use them for streaming out -wxFLAGS_MEMBER(wxBORDER_SIMPLE) -wxFLAGS_MEMBER(wxBORDER_SUNKEN) -wxFLAGS_MEMBER(wxBORDER_DOUBLE) -wxFLAGS_MEMBER(wxBORDER_RAISED) -wxFLAGS_MEMBER(wxBORDER_STATIC) -wxFLAGS_MEMBER(wxBORDER_NONE) - -// old style border flags -wxFLAGS_MEMBER(wxSIMPLE_BORDER) -wxFLAGS_MEMBER(wxSUNKEN_BORDER) -wxFLAGS_MEMBER(wxDOUBLE_BORDER) -wxFLAGS_MEMBER(wxRAISED_BORDER) -wxFLAGS_MEMBER(wxSTATIC_BORDER) -wxFLAGS_MEMBER(wxBORDER) - -// standard window styles -wxFLAGS_MEMBER(wxTAB_TRAVERSAL) -wxFLAGS_MEMBER(wxCLIP_CHILDREN) -wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) -wxFLAGS_MEMBER(wxWANTS_CHARS) -wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE) -wxFLAGS_MEMBER(wxALWAYS_SHOW_SB ) -wxFLAGS_MEMBER(wxVSCROLL) -wxFLAGS_MEMBER(wxHSCROLL) - -wxFLAGS_MEMBER(wxCAL_SUNDAY_FIRST) -wxFLAGS_MEMBER(wxCAL_MONDAY_FIRST) -wxFLAGS_MEMBER(wxCAL_SHOW_HOLIDAYS) -wxFLAGS_MEMBER(wxCAL_NO_YEAR_CHANGE) -wxFLAGS_MEMBER(wxCAL_NO_MONTH_CHANGE) -wxFLAGS_MEMBER(wxCAL_SEQUENTIAL_MONTH_SELECTION) -wxFLAGS_MEMBER(wxCAL_SHOW_SURROUNDING_WEEKS) - -wxEND_FLAGS( wxCalendarCtrlStyle ) - -wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxCalendarCtrl, wxControl, "wx/calctrl.h"); - -wxBEGIN_PROPERTIES_TABLE(wxCalendarCtrl) -wxEVENT_RANGE_PROPERTY( Updated, wxEVT_CALENDAR_SEL_CHANGED, \ - wxEVT_CALENDAR_WEEKDAY_CLICKED, wxCalendarEvent ) - -wxHIDE_PROPERTY( Children ) - -wxPROPERTY( Date,wxDateTime, SetDate, GetDate, wxEMPTY_PARAMETER_VALUE, \ - 0 /*flags*/, wxT("Helpstring"), wxT("group")) -wxPROPERTY_FLAGS( WindowStyle, wxCalendarCtrlStyle, long, \ - SetWindowStyleFlag, GetWindowStyleFlag, \ - wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, wxT("Helpstring"), \ - wxT("group")) // style -wxEND_PROPERTIES_TABLE() - -wxEMPTY_HANDLERS_TABLE(wxCalendarCtrl) - -wxCONSTRUCTOR_6( wxCalendarCtrl, wxWindow*, Parent, wxWindowID, Id, \ - wxDateTime, Date, wxPoint, Position, wxSize, Size, long, WindowStyle ) - -// ---------------------------------------------------------------------------- -// events -// ---------------------------------------------------------------------------- -wxIMPLEMENT_DYNAMIC_CLASS(wxCalendarEvent, wxDateEvent); - -wxDEFINE_EVENT( wxEVT_CALENDAR_SEL_CHANGED, wxCalendarEvent ); -wxDEFINE_EVENT( wxEVT_CALENDAR_PAGE_CHANGED, wxCalendarEvent ); -wxDEFINE_EVENT( wxEVT_CALENDAR_DOUBLECLICKED, wxCalendarEvent ); -wxDEFINE_EVENT( wxEVT_CALENDAR_WEEKDAY_CLICKED, wxCalendarEvent ); -wxDEFINE_EVENT( wxEVT_CALENDAR_WEEK_CLICKED, wxCalendarEvent ); - -// deprecated events -wxDEFINE_EVENT( wxEVT_CALENDAR_DAY_CHANGED, wxCalendarEvent ); -wxDEFINE_EVENT( wxEVT_CALENDAR_MONTH_CHANGED, wxCalendarEvent ); -wxDEFINE_EVENT( wxEVT_CALENDAR_YEAR_CHANGED, wxCalendarEvent ); - - -wxCalendarDateAttr wxCalendarDateAttr::m_mark(wxCAL_BORDER_SQUARE); - -bool wxCalendarCtrlBase::EnableMonthChange(bool enable) -{ - const long styleOrig = GetWindowStyle(); - long style = enable ? styleOrig & ~wxCAL_NO_MONTH_CHANGE - : styleOrig | wxCAL_NO_MONTH_CHANGE; - if ( style == styleOrig ) - return false; - - SetWindowStyle(style); - - return true; -} - -bool wxCalendarCtrlBase::GenerateAllChangeEvents(const wxDateTime& dateOld) -{ - const wxDateTime::Tm tm1 = dateOld.GetTm(), - tm2 = GetDate().GetTm(); - - bool pageChanged = false; - - GenerateEvent(wxEVT_CALENDAR_SEL_CHANGED); - if ( tm1.year != tm2.year || tm1.mon != tm2.mon ) - { - GenerateEvent(wxEVT_CALENDAR_PAGE_CHANGED); - - pageChanged = true; - } - - // send also one of the deprecated events - if ( tm1.year != tm2.year ) - GenerateEvent(wxEVT_CALENDAR_YEAR_CHANGED); - else if ( tm1.mon != tm2.mon ) - GenerateEvent(wxEVT_CALENDAR_MONTH_CHANGED); - else - GenerateEvent(wxEVT_CALENDAR_DAY_CHANGED); - - return pageChanged; -} - -void wxCalendarCtrlBase::EnableHolidayDisplay(bool display) -{ - long style = GetWindowStyle(); - if ( display ) - style |= wxCAL_SHOW_HOLIDAYS; - else - style &= ~wxCAL_SHOW_HOLIDAYS; - - if ( style == GetWindowStyle() ) - return; - - SetWindowStyle(style); - - if ( display ) - SetHolidayAttrs(); - else - ResetHolidayAttrs(); - - RefreshHolidays(); -} - -bool wxCalendarCtrlBase::SetHolidayAttrs() -{ - if ( !HasFlag(wxCAL_SHOW_HOLIDAYS) ) - return false; - - ResetHolidayAttrs(); - - wxDateTime::Tm tm = GetDate().GetTm(); - wxDateTime dtStart(1, tm.mon, tm.year), - dtEnd = dtStart.GetLastMonthDay(); - - wxDateTimeArray hol; - wxDateTimeHolidayAuthority::GetHolidaysInRange(dtStart, dtEnd, hol); - - const size_t count = hol.GetCount(); - for ( size_t n = 0; n < count; n++ ) - { - SetHoliday(hol[n].GetDay()); - } - - return true; -} - -#endif // wxUSE_CALENDARCTRL - diff --git a/Externals/wxWidgets3/src/common/checkboxcmn.cpp b/Externals/wxWidgets3/src/common/checkboxcmn.cpp deleted file mode 100644 index f081665877..0000000000 --- a/Externals/wxWidgets3/src/common/checkboxcmn.cpp +++ /dev/null @@ -1,90 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/checkboxcmn.cpp -// Purpose: wxCheckBox common code -// Author: Julian Smart -// Modified by: -// Created: 04/01/98 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_CHECKBOX - -#include "wx/checkbox.h" - -extern WXDLLEXPORT_DATA(const char) wxCheckBoxNameStr[] = "check"; - -// ---------------------------------------------------------------------------- -// XTI -// ---------------------------------------------------------------------------- - -wxDEFINE_FLAGS( wxCheckBoxStyle ) -wxBEGIN_FLAGS( wxCheckBoxStyle ) - // new style border flags, we put them first to - // use them for streaming out - wxFLAGS_MEMBER(wxBORDER_SIMPLE) - wxFLAGS_MEMBER(wxBORDER_SUNKEN) - wxFLAGS_MEMBER(wxBORDER_DOUBLE) - wxFLAGS_MEMBER(wxBORDER_RAISED) - wxFLAGS_MEMBER(wxBORDER_STATIC) - wxFLAGS_MEMBER(wxBORDER_NONE) - - // old style border flags - wxFLAGS_MEMBER(wxSIMPLE_BORDER) - wxFLAGS_MEMBER(wxSUNKEN_BORDER) - wxFLAGS_MEMBER(wxDOUBLE_BORDER) - wxFLAGS_MEMBER(wxRAISED_BORDER) - wxFLAGS_MEMBER(wxSTATIC_BORDER) - wxFLAGS_MEMBER(wxNO_BORDER) - - // standard window styles - wxFLAGS_MEMBER(wxTAB_TRAVERSAL) - wxFLAGS_MEMBER(wxCLIP_CHILDREN) - wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) - wxFLAGS_MEMBER(wxWANTS_CHARS) - wxFLAGS_MEMBER(wxNO_FULL_REPAINT_ON_RESIZE) - wxFLAGS_MEMBER(wxALWAYS_SHOW_SB ) - wxFLAGS_MEMBER(wxVSCROLL) - wxFLAGS_MEMBER(wxHSCROLL) - -wxEND_FLAGS( wxCheckBoxStyle ) - -wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxCheckBox, wxControl, "wx/checkbox.h"); - -wxBEGIN_PROPERTIES_TABLE(wxCheckBox) - wxEVENT_PROPERTY( Click, wxEVT_CHECKBOX, wxCommandEvent ) - - wxPROPERTY( Font, wxFont, SetFont, GetFont, wxEMPTY_PARAMETER_VALUE, \ - 0 /*flags*/, wxT("Helpstring"), wxT("group")) - wxPROPERTY( Label,wxString, SetLabel, GetLabel, wxString(), \ - 0 /*flags*/, wxT("Helpstring"), wxT("group")) - wxPROPERTY( Value,bool, SetValue, GetValue, wxEMPTY_PARAMETER_VALUE, \ - 0 /*flags*/, wxT("Helpstring"), wxT("group")) - - wxPROPERTY_FLAGS( WindowStyle, wxCheckBoxStyle, long, SetWindowStyleFlag, \ - GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \ - wxT("Helpstring"), wxT("group")) // style -wxEND_PROPERTIES_TABLE() - -wxEMPTY_HANDLERS_TABLE(wxCheckBox) - -wxCONSTRUCTOR_6( wxCheckBox, wxWindow*, Parent, wxWindowID, Id, \ - wxString, Label, wxPoint, Position, wxSize, Size, long, WindowStyle ) - - -#endif // wxUSE_CHECKBOX diff --git a/Externals/wxWidgets3/src/common/checklstcmn.cpp b/Externals/wxWidgets3/src/common/checklstcmn.cpp deleted file mode 100644 index 58758ecfa3..0000000000 --- a/Externals/wxWidgets3/src/common/checklstcmn.cpp +++ /dev/null @@ -1,119 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/checklstcmn.cpp -// Purpose: wxCheckListBox common code -// Author: Vadim Zeitlin -// Modified by: -// Created: 16.11.97 -// Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_CHECKLISTBOX - -#include "wx/checklst.h" - -#ifndef WX_PRECOMP - #include "wx/object.h" - #include "wx/colour.h" - #include "wx/font.h" - #include "wx/bitmap.h" - #include "wx/window.h" - #include "wx/listbox.h" - #include "wx/dcmemory.h" - #include "wx/settings.h" - #include "wx/log.h" -#endif - -// ---------------------------------------------------------------------------- -// XTI -// ---------------------------------------------------------------------------- - -wxDEFINE_FLAGS( wxCheckListBoxStyle ) -wxBEGIN_FLAGS( wxCheckListBoxStyle ) - // new style border flags, we put them first to - // use them for streaming out - wxFLAGS_MEMBER(wxBORDER_SIMPLE) - wxFLAGS_MEMBER(wxBORDER_SUNKEN) - wxFLAGS_MEMBER(wxBORDER_DOUBLE) - wxFLAGS_MEMBER(wxBORDER_RAISED) - wxFLAGS_MEMBER(wxBORDER_STATIC) - wxFLAGS_MEMBER(wxBORDER_NONE) - - // old style border flags - wxFLAGS_MEMBER(wxSIMPLE_BORDER) - wxFLAGS_MEMBER(wxSUNKEN_BORDER) - wxFLAGS_MEMBER(wxDOUBLE_BORDER) - wxFLAGS_MEMBER(wxRAISED_BORDER) - wxFLAGS_MEMBER(wxSTATIC_BORDER) - wxFLAGS_MEMBER(wxBORDER) - - // standard window styles - wxFLAGS_MEMBER(wxTAB_TRAVERSAL) - wxFLAGS_MEMBER(wxCLIP_CHILDREN) - wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) - wxFLAGS_MEMBER(wxWANTS_CHARS) - wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE) - wxFLAGS_MEMBER(wxALWAYS_SHOW_SB ) - wxFLAGS_MEMBER(wxVSCROLL) - wxFLAGS_MEMBER(wxHSCROLL) - - wxFLAGS_MEMBER(wxLB_SINGLE) - wxFLAGS_MEMBER(wxLB_MULTIPLE) - wxFLAGS_MEMBER(wxLB_EXTENDED) - wxFLAGS_MEMBER(wxLB_HSCROLL) - wxFLAGS_MEMBER(wxLB_ALWAYS_SB) - wxFLAGS_MEMBER(wxLB_NEEDED_SB) - wxFLAGS_MEMBER(wxLB_SORT) - wxFLAGS_MEMBER(wxLB_OWNERDRAW) - -wxEND_FLAGS( wxCheckListBoxStyle ) - -wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxCheckListBox, wxListBox, "wx/checklst.h"); - -wxBEGIN_PROPERTIES_TABLE(wxCheckListBox) - wxEVENT_PROPERTY( Toggle, wxEVT_CHECKLISTBOX, wxCommandEvent ) - wxPROPERTY_FLAGS( WindowStyle, wxCheckListBoxStyle, long, SetWindowStyleFlag, \ - GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, wxLB_OWNERDRAW /*flags*/, \ - wxT("Helpstring"), wxT("group")) // style -wxEND_PROPERTIES_TABLE() - -wxEMPTY_HANDLERS_TABLE(wxCheckListBox) - -wxCONSTRUCTOR_4( wxCheckListBox, wxWindow*, Parent, wxWindowID, Id, \ - wxPoint, Position, wxSize, Size ) - - -// ============================================================================ -// implementation -// ============================================================================ - -unsigned int wxCheckListBoxBase::GetCheckedItems(wxArrayInt& checkedItems) const -{ - unsigned int const numberOfItems = GetCount(); - - checkedItems.clear(); - for ( unsigned int i = 0; i < numberOfItems; ++i ) - { - if ( IsChecked(i) ) - checkedItems.push_back(i); - } - - return checkedItems.size(); -} - -#endif diff --git a/Externals/wxWidgets3/src/common/choiccmn.cpp b/Externals/wxWidgets3/src/common/choiccmn.cpp deleted file mode 100644 index 7018527266..0000000000 --- a/Externals/wxWidgets3/src/common/choiccmn.cpp +++ /dev/null @@ -1,132 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/choiccmn.cpp -// Purpose: common (to all ports) wxChoice functions -// Author: Vadim Zeitlin -// Modified by: -// Created: 26.07.99 -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_CHOICE - -#include "wx/choice.h" - -#include "wx/private/textmeasure.h" - -#ifndef WX_PRECOMP -#endif - -const char wxChoiceNameStr[] = "choice"; - - -wxDEFINE_FLAGS( wxChoiceStyle ) -wxBEGIN_FLAGS( wxChoiceStyle ) -// new style border flags, we put them first to -// use them for streaming out -wxFLAGS_MEMBER(wxBORDER_SIMPLE) -wxFLAGS_MEMBER(wxBORDER_SUNKEN) -wxFLAGS_MEMBER(wxBORDER_DOUBLE) -wxFLAGS_MEMBER(wxBORDER_RAISED) -wxFLAGS_MEMBER(wxBORDER_STATIC) -wxFLAGS_MEMBER(wxBORDER_NONE) - -// old style border flags -wxFLAGS_MEMBER(wxSIMPLE_BORDER) -wxFLAGS_MEMBER(wxSUNKEN_BORDER) -wxFLAGS_MEMBER(wxDOUBLE_BORDER) -wxFLAGS_MEMBER(wxRAISED_BORDER) -wxFLAGS_MEMBER(wxSTATIC_BORDER) -wxFLAGS_MEMBER(wxBORDER) - -// standard window styles -wxFLAGS_MEMBER(wxTAB_TRAVERSAL) -wxFLAGS_MEMBER(wxCLIP_CHILDREN) -wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) -wxFLAGS_MEMBER(wxWANTS_CHARS) -wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE) -wxFLAGS_MEMBER(wxALWAYS_SHOW_SB ) -wxFLAGS_MEMBER(wxVSCROLL) -wxFLAGS_MEMBER(wxHSCROLL) - -wxEND_FLAGS( wxChoiceStyle ) - -wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxChoice, wxControl, "wx/choice.h"); - -wxBEGIN_PROPERTIES_TABLE(wxChoice) -wxEVENT_PROPERTY( Select, wxEVT_CHOICE, wxCommandEvent ) - -wxPROPERTY( Font, wxFont, SetFont, GetFont , wxEMPTY_PARAMETER_VALUE, \ - 0 /*flags*/, wxT("Helpstring"), wxT("group")) -wxPROPERTY_COLLECTION( Choices, wxArrayString, wxString, AppendString, \ - GetStrings, 0 /*flags*/, wxT("Helpstring"), wxT("group")) -wxPROPERTY( Selection,int, SetSelection, GetSelection, wxEMPTY_PARAMETER_VALUE, \ - 0 /*flags*/, wxT("Helpstring"), wxT("group")) - -/* - TODO PROPERTIES - selection (long) - content (list) - item - */ - -wxPROPERTY_FLAGS( WindowStyle, wxChoiceStyle, long, SetWindowStyleFlag, \ - GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \ - wxT("Helpstring"), wxT("group")) // style -wxEND_PROPERTIES_TABLE() - -wxEMPTY_HANDLERS_TABLE(wxChoice) - -wxCONSTRUCTOR_4( wxChoice, wxWindow*, Parent, wxWindowID, Id, \ - wxPoint, Position, wxSize, Size ) - -// ============================================================================ -// implementation -// ============================================================================ - -wxChoiceBase::~wxChoiceBase() -{ - // this destructor is required for Darwin -} - -wxSize wxChoiceBase::DoGetBestSize() const -{ - // a reasonable width for an empty choice list - wxSize best(80, -1); - - const unsigned int nItems = GetCount(); - if ( nItems > 0 ) - { - wxTextMeasure txm(this); - best.x = txm.GetLargestStringExtent(GetStrings()).x; - } - - return best; -} - -// ---------------------------------------------------------------------------- -// misc -// ---------------------------------------------------------------------------- - -void wxChoiceBase::Command(wxCommandEvent& event) -{ - SetSelection(event.GetInt()); - (void)GetEventHandler()->ProcessEvent(event); -} - -#endif // wxUSE_CHOICE diff --git a/Externals/wxWidgets3/src/common/clipcmn.cpp b/Externals/wxWidgets3/src/common/clipcmn.cpp deleted file mode 100644 index bea674f526..0000000000 --- a/Externals/wxWidgets3/src/common/clipcmn.cpp +++ /dev/null @@ -1,111 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/clipcmn.cpp -// Purpose: common (to all ports) wxClipboard functions -// Author: Robert Roebling -// Modified by: -// Created: 28.06.99 -// Copyright: (c) Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_CLIPBOARD - -#include "wx/clipbrd.h" - -#ifndef WX_PRECOMP - #include "wx/dataobj.h" - #include "wx/module.h" -#endif - -// --------------------------------------------------------- -// wxClipboardEvent -// --------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxClipboardEvent,wxEvent); - -wxDEFINE_EVENT( wxEVT_CLIPBOARD_CHANGED, wxClipboardEvent ); - -bool wxClipboardEvent::SupportsFormat( const wxDataFormat &format ) const -{ -#ifdef __WXGTK20__ - for (wxVector::size_type n = 0; n < m_formats.size(); n++) - { - if (m_formats[n] == format) - return true; - } - - return false; -#else - // All other ports just query the clipboard directly - // from here - wxClipboard* clipboard = (wxClipboard*) GetEventObject(); - return clipboard->IsSupported( format ); -#endif -} - -void wxClipboardEvent::AddFormat(const wxDataFormat& format) -{ - m_formats.push_back( format ); -} - -// --------------------------------------------------------- -// wxClipboardBase -// --------------------------------------------------------- - -static wxClipboard *gs_clipboard = NULL; - -/*static*/ wxClipboard *wxClipboardBase::Get() -{ - if ( !gs_clipboard ) - { - gs_clipboard = new wxClipboard; - } - return gs_clipboard; -} - -bool wxClipboardBase::IsSupportedAsync( wxEvtHandler *sink ) -{ - // We just imitate an asynchronous API on most platforms. - // This method is overridden uner GTK. - wxClipboardEvent *event = new wxClipboardEvent(wxEVT_CLIPBOARD_CHANGED); - event->SetEventObject( this ); - - sink->QueueEvent( event ); - - return true; -} - - -// ---------------------------------------------------------------------------- -// wxClipboardModule: module responsible for destroying the global clipboard -// object -// ---------------------------------------------------------------------------- - -class wxClipboardModule : public wxModule -{ -public: - bool OnInit() wxOVERRIDE { return true; } - void OnExit() wxOVERRIDE { wxDELETE(gs_clipboard); } - -private: - wxDECLARE_DYNAMIC_CLASS(wxClipboardModule); -}; - -wxIMPLEMENT_DYNAMIC_CLASS(wxClipboardModule, wxModule); - -#endif // wxUSE_CLIPBOARD diff --git a/Externals/wxWidgets3/src/common/clntdata.cpp b/Externals/wxWidgets3/src/common/clntdata.cpp deleted file mode 100644 index 1cb5595785..0000000000 --- a/Externals/wxWidgets3/src/common/clntdata.cpp +++ /dev/null @@ -1,82 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/clntdata.cpp -// Purpose: A mixin class for holding a wxClientData or void pointer -// Author: Robin Dunn -// Modified by: -// Created: 9-Oct-2001 -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include "wx/clntdata.h" - - -// ---------------------------------------------------------------------------- - - -wxClientDataContainer::wxClientDataContainer() -{ - // no client data (yet) - m_clientData = NULL; - m_clientDataType = wxClientData_None; -} - -wxClientDataContainer::~wxClientDataContainer() -{ - // we only delete object data, not untyped - if ( m_clientDataType == wxClientData_Object ) - delete m_clientObject; -} - -void wxClientDataContainer::DoSetClientObject( wxClientData *data ) -{ - wxASSERT_MSG( m_clientDataType != wxClientData_Void, - wxT("can't have both object and void client data") ); - - if ( m_clientObject ) - delete m_clientObject; - - m_clientObject = data; - m_clientDataType = wxClientData_Object; -} - -wxClientData *wxClientDataContainer::DoGetClientObject() const -{ - // it's not an error to call GetClientObject() on a window which doesn't - // have client data at all - NULL will be returned - wxASSERT_MSG( m_clientDataType != wxClientData_Void, - wxT("this window doesn't have object client data") ); - - return m_clientObject; -} - -void wxClientDataContainer::DoSetClientData( void *data ) -{ - wxASSERT_MSG( m_clientDataType != wxClientData_Object, - wxT("can't have both object and void client data") ); - - m_clientData = data; - m_clientDataType = wxClientData_Void; -} - -void *wxClientDataContainer::DoGetClientData() const -{ - // it's not an error to call GetClientData() on a window which doesn't have - // client data at all - NULL will be returned - wxASSERT_MSG( m_clientDataType != wxClientData_Object, - wxT("this window doesn't have void client data") ); - - return m_clientData; -} - - -// ---------------------------------------------------------------------------- - - diff --git a/Externals/wxWidgets3/src/common/clrpickercmn.cpp b/Externals/wxWidgets3/src/common/clrpickercmn.cpp deleted file mode 100644 index 6f5f118c93..0000000000 --- a/Externals/wxWidgets3/src/common/clrpickercmn.cpp +++ /dev/null @@ -1,139 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/clrpickercmn.cpp -// Purpose: wxColourPickerCtrl class implementation -// Author: Francesco Montorsi (readapted code written by Vadim Zeitlin) -// Modified by: -// Created: 15/04/2006 -// Copyright: (c) Vadim Zeitlin, Francesco Montorsi -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_COLOURPICKERCTRL - -#include "wx/clrpicker.h" - -#ifndef WX_PRECOMP - #include "wx/textctrl.h" -#endif - -const char wxColourPickerCtrlNameStr[] = "colourpicker"; -const char wxColourPickerWidgetNameStr[] = "colourpickerwidget"; - -// ============================================================================ -// implementation -// ============================================================================ - -wxDEFINE_EVENT(wxEVT_COLOURPICKER_CHANGED, wxColourPickerEvent); -wxIMPLEMENT_DYNAMIC_CLASS(wxColourPickerCtrl, wxPickerBase); -wxIMPLEMENT_DYNAMIC_CLASS(wxColourPickerEvent, wxEvent); - -// ---------------------------------------------------------------------------- -// wxColourPickerCtrl -// ---------------------------------------------------------------------------- - -#define M_PICKER ((wxColourPickerWidget*)m_picker) - -bool wxColourPickerCtrl::Create( wxWindow *parent, wxWindowID id, - const wxColour &col, - const wxPoint &pos, const wxSize &size, - long style, const wxValidator& validator, - const wxString &name ) -{ - if (!wxPickerBase::CreateBase(parent, id, col.GetAsString(), pos, size, - style, validator, name)) - return false; - - // we are not interested to the ID of our picker as we connect - // to its "changed" event dynamically... - m_picker = new wxColourPickerWidget(this, wxID_ANY, col, - wxDefaultPosition, wxDefaultSize, - GetPickerStyle(style)); - - // complete sizer creation - wxPickerBase::PostCreation(); - - m_picker->Connect(wxEVT_COLOURPICKER_CHANGED, - wxColourPickerEventHandler(wxColourPickerCtrl::OnColourChange), - NULL, this); - - return true; -} - -void wxColourPickerCtrl::SetColour(const wxColour &col) -{ - M_PICKER->SetColour(col); - UpdateTextCtrlFromPicker(); -} - -bool wxColourPickerCtrl::SetColour(const wxString &text) -{ - wxColour col(text); // smart wxString->wxColour conversion - if ( !col.IsOk() ) - return false; - M_PICKER->SetColour(col); - UpdateTextCtrlFromPicker(); - - return true; -} - -void wxColourPickerCtrl::UpdatePickerFromTextCtrl() -{ - wxASSERT(m_text); - - // wxString -> wxColour conversion - wxColour col(m_text->GetValue()); - if ( !col.IsOk() ) - return; // invalid user input - - if (M_PICKER->GetColour() != col) - { - M_PICKER->SetColour(col); - - // fire an event - wxColourPickerEvent event(this, GetId(), col); - GetEventHandler()->ProcessEvent(event); - } -} - -void wxColourPickerCtrl::UpdateTextCtrlFromPicker() -{ - if (!m_text) - return; // no textctrl to update - - // Take care to use ChangeValue() here and not SetValue() to avoid - // infinite recursion. - m_text->ChangeValue(M_PICKER->GetColour().GetAsString()); -} - - - -// ---------------------------------------------------------------------------- -// wxColourPickerCtrl - event handlers -// ---------------------------------------------------------------------------- - -void wxColourPickerCtrl::OnColourChange(wxColourPickerEvent &ev) -{ - UpdateTextCtrlFromPicker(); - - // the wxColourPickerWidget sent us a colour-change notification. - // forward this event to our parent - wxColourPickerEvent event(this, GetId(), ev.GetColour()); - GetEventHandler()->ProcessEvent(event); -} - -#endif // wxUSE_COLOURPICKERCTRL diff --git a/Externals/wxWidgets3/src/common/cmdline.cpp b/Externals/wxWidgets3/src/common/cmdline.cpp deleted file mode 100644 index 6d452e19a1..0000000000 --- a/Externals/wxWidgets3/src/common/cmdline.cpp +++ /dev/null @@ -1,1679 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/cmdline.cpp -// Purpose: wxCmdLineParser implementation -// Author: Vadim Zeitlin -// Modified by: -// Created: 05.01.00 -// Copyright: (c) 2000 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#ifndef WX_PRECOMP - #include "wx/dynarray.h" - #include "wx/string.h" - #include "wx/log.h" - #include "wx/intl.h" - #include "wx/app.h" -#endif //WX_PRECOMP - -#include "wx/cmdline.h" - -#if wxUSE_CMDLINE_PARSER - -#include -#include // for LC_ALL - -#include "wx/datetime.h" -#include "wx/msgout.h" -#include "wx/filename.h" -#include "wx/apptrait.h" -#include "wx/scopeguard.h" - -// ---------------------------------------------------------------------------- -// private functions -// ---------------------------------------------------------------------------- - -static wxString GetTypeName(wxCmdLineParamType type); - -static wxString GetOptionName(wxString::const_iterator p, - wxString::const_iterator end, - const wxChar *allowedChars); - -static wxString GetShortOptionName(wxString::const_iterator p, - wxString::const_iterator end); - -static wxString GetLongOptionName(wxString::const_iterator p, - wxString::const_iterator end); - -// ---------------------------------------------------------------------------- -// private structs -// ---------------------------------------------------------------------------- - - -class wxCmdLineArgImpl: public wxCmdLineArg -{ -public: - wxCmdLineArgImpl(wxCmdLineEntryType k, - const wxString& shrt, - const wxString& lng, - wxCmdLineParamType typ); - - wxCmdLineArgImpl& SetDoubleVal(double val); - wxCmdLineArgImpl& SetLongVal(long val); - wxCmdLineArgImpl& SetStrVal(const wxString& val); -#if wxUSE_DATETIME - wxCmdLineArgImpl& SetDateVal(const wxDateTime& val); -#endif // wxUSE_DATETIME - - bool HasValue() const { return m_hasVal; } - wxCmdLineArgImpl& SetHasValue() { m_hasVal = true; return *this; } - - wxCmdLineArgImpl& SetNegated() { m_isNegated = true; return *this; } - - // Reset to the initial state, called before parsing another command line. - void Reset() - { - m_hasVal = - m_isNegated = false; - } - -public: - wxCmdLineEntryType kind; - wxString shortName, - longName; - wxCmdLineParamType type; - - // from wxCmdLineArg - virtual wxCmdLineEntryType GetKind() const wxOVERRIDE { return kind; } - virtual wxString GetShortName() const wxOVERRIDE { - wxASSERT_MSG( kind == wxCMD_LINE_OPTION || kind == wxCMD_LINE_SWITCH, - wxT("kind mismatch in wxCmdLineArg") ); - return shortName; - } - virtual wxString GetLongName() const wxOVERRIDE { - wxASSERT_MSG( kind == wxCMD_LINE_OPTION || kind == wxCMD_LINE_SWITCH, - wxT("kind mismatch in wxCmdLineArg") ); - return longName; - } - virtual wxCmdLineParamType GetType() const wxOVERRIDE { - wxASSERT_MSG( kind == wxCMD_LINE_OPTION, - wxT("kind mismatch in wxCmdLineArg") ); - return type; - } - double GetDoubleVal() const wxOVERRIDE; - long GetLongVal() const wxOVERRIDE; - const wxString& GetStrVal() const wxOVERRIDE; -#if wxUSE_DATETIME - const wxDateTime& GetDateVal() const wxOVERRIDE; -#endif // wxUSE_DATETIME - bool IsNegated() const wxOVERRIDE { - wxASSERT_MSG( kind == wxCMD_LINE_SWITCH, - wxT("kind mismatch in wxCmdLineArg") ); - return m_isNegated; - } - -private: - // can't use union easily here, so just store all possible data fields, we - // don't waste much (might still use union later if the number of supported - // types increases) - - void Check(wxCmdLineParamType typ) const; - - bool m_hasVal; - bool m_isNegated; - - double m_doubleVal; - long m_longVal; - wxString m_strVal; -#if wxUSE_DATETIME - wxDateTime m_dateVal; -#endif // wxUSE_DATETIME - -}; - -// an internal representation of an option -struct wxCmdLineOption: public wxCmdLineArgImpl -{ - wxCmdLineOption(wxCmdLineEntryType k, - const wxString& shrt, - const wxString& lng, - const wxString& desc, - wxCmdLineParamType typ, - int fl) - : wxCmdLineArgImpl(k, shrt, lng, typ) - { - description = desc; - - flags = fl; - } - - wxString description; - int flags; -}; - -struct wxCmdLineParam -{ - wxCmdLineParam(const wxString& desc, - wxCmdLineParamType typ, - int fl) - : description(desc) - { - type = typ; - flags = fl; - } - - wxString description; - wxCmdLineParamType type; - int flags; -}; - -WX_DECLARE_OBJARRAY(wxCmdLineOption, wxArrayOptions); -WX_DECLARE_OBJARRAY(wxCmdLineParam, wxArrayParams); -WX_DECLARE_OBJARRAY(wxCmdLineArgImpl, wxArrayArgs); - -#include "wx/arrimpl.cpp" - -WX_DEFINE_OBJARRAY(wxArrayOptions) -WX_DEFINE_OBJARRAY(wxArrayParams) -WX_DEFINE_OBJARRAY(wxArrayArgs) - -// the parser internal state -struct wxCmdLineParserData -{ - // options - wxString m_switchChars; // characters which may start an option - bool m_enableLongOptions; // true if long options are enabled - wxString m_logo; // some extra text to show in Usage() - - // cmd line data - wxArrayString m_arguments; // == argv, argc == m_arguments.GetCount() - wxArrayOptions m_options; // all possible options and switches - wxArrayParams m_paramDesc; // description of all possible params - wxArrayString m_parameters; // all params found - wxArrayArgs m_parsedArguments; // all options and parameters in parsing order - - // methods - wxCmdLineParserData(); - void SetArguments(int argc, char **argv); -#if wxUSE_UNICODE - void SetArguments(int argc, wxChar **argv); - void SetArguments(int argc, const wxCmdLineArgsArray& argv); -#endif // wxUSE_UNICODE - void SetArguments(const wxString& cmdline); - - int FindOption(const wxString& name); - int FindOptionByLongName(const wxString& name); - - // Find the option by either its short or long name. - // - // Asserts and returns NULL if option with this name is not found. - const wxCmdLineOption* FindOptionByAnyName(const wxString& name); -}; - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxCmdLineArg -// ---------------------------------------------------------------------------- - -wxCmdLineArgImpl::wxCmdLineArgImpl(wxCmdLineEntryType k, - const wxString& shrt, - const wxString& lng, - wxCmdLineParamType typ) -{ - // wxCMD_LINE_USAGE_TEXT uses only description, shortName and longName is empty - if ( k != wxCMD_LINE_USAGE_TEXT && k != wxCMD_LINE_PARAM) - { - wxASSERT_MSG - ( - !shrt.empty() || !lng.empty(), - wxT("option should have at least one name") - ); - - wxASSERT_MSG - ( - GetShortOptionName(shrt.begin(), shrt.end()).Len() == shrt.Len(), - wxT("Short option contains invalid characters") - ); - - wxASSERT_MSG - ( - GetLongOptionName(lng.begin(), lng.end()).Len() == lng.Len(), - wxT("Long option contains invalid characters") - ); - } - - kind = k; - - shortName = shrt; - longName = lng; - - type = typ; - - Reset(); -} - -void wxCmdLineArgImpl::Check(wxCmdLineParamType WXUNUSED_UNLESS_DEBUG(typ)) const -{ - // NB: Type is always wxCMD_LINE_VAL_NONE for booleans, so mismatch between - // switches / options / params is well checked by this test - // The parameters have type == wxCMD_LINE_VAL_STRING and thus can be - // retrieved only by GetStrVal() - wxASSERT_MSG( type == typ, wxT("type mismatch in wxCmdLineArg") ); -} - -double wxCmdLineArgImpl::GetDoubleVal() const -{ - Check(wxCMD_LINE_VAL_DOUBLE); - return m_doubleVal; -} - -long wxCmdLineArgImpl::GetLongVal() const -{ - Check(wxCMD_LINE_VAL_NUMBER); - return m_longVal; -} - -const wxString& wxCmdLineArgImpl::GetStrVal() const -{ - Check(wxCMD_LINE_VAL_STRING); - return m_strVal; -} - -#if wxUSE_DATETIME -const wxDateTime& wxCmdLineArgImpl::GetDateVal() const -{ - Check(wxCMD_LINE_VAL_DATE); - return m_dateVal; -} -#endif // wxUSE_DATETIME - -wxCmdLineArgImpl& wxCmdLineArgImpl::SetDoubleVal(double val) -{ - Check(wxCMD_LINE_VAL_DOUBLE); - m_doubleVal = val; - m_hasVal = true; - return *this; -} - -wxCmdLineArgImpl& wxCmdLineArgImpl::SetLongVal(long val) -{ - Check(wxCMD_LINE_VAL_NUMBER); - m_longVal = val; - m_hasVal = true; - return *this; -} - -wxCmdLineArgImpl& wxCmdLineArgImpl::SetStrVal(const wxString& val) -{ - Check(wxCMD_LINE_VAL_STRING); - m_strVal = val; - m_hasVal = true; - return *this; -} - -#if wxUSE_DATETIME -wxCmdLineArgImpl& wxCmdLineArgImpl::SetDateVal(const wxDateTime& val) -{ - Check(wxCMD_LINE_VAL_DATE); - m_dateVal = val; - m_hasVal = true; - return *this; -} -#endif // wxUSE_DATETIME - -// ---------------------------------------------------------------------------- -// wxCmdLineArgsArrayRef -// ---------------------------------------------------------------------------- - -size_t wxCmdLineArgs::size() const -{ - return m_parser.m_data->m_parsedArguments.GetCount(); -} - -// ---------------------------------------------------------------------------- -// wxCmdLineArgsArrayRef::const_iterator -// ---------------------------------------------------------------------------- - -wxCmdLineArgs::const_iterator::reference - wxCmdLineArgs::const_iterator::operator *() const -{ - return m_parser->m_data->m_parsedArguments[m_index]; -} - -wxCmdLineArgs::const_iterator::pointer - wxCmdLineArgs::const_iterator::operator ->() const -{ - return &**this; -} - -wxCmdLineArgs::const_iterator &wxCmdLineArgs::const_iterator::operator ++ () -{ - ++m_index; - return *this; -} - -wxCmdLineArgs::const_iterator wxCmdLineArgs::const_iterator::operator ++ (int) -{ - wxCmdLineArgs::const_iterator tmp(*this); - ++*this; - return tmp; -} - -wxCmdLineArgs::const_iterator &wxCmdLineArgs::const_iterator::operator -- () -{ - --m_index; - return *this; -} - -wxCmdLineArgs::const_iterator wxCmdLineArgs::const_iterator::operator -- (int) -{ - wxCmdLineArgs::const_iterator tmp(*this); - --*this; - return tmp; -} - -// ---------------------------------------------------------------------------- -// wxCmdLineParserData -// ---------------------------------------------------------------------------- - -wxCmdLineParserData::wxCmdLineParserData() -{ - m_enableLongOptions = true; -#ifdef __UNIX_LIKE__ - m_switchChars = wxT("-"); -#else // !Unix - m_switchChars = wxT("/-"); -#endif -} - -namespace -{ - -// Small helper function setting locale for all categories. -// -// We define it because wxSetlocale() can't be easily used with wxScopeGuard as -// it has several overloads -- while this one can. -inline char *SetAllLocaleFacets(const char *loc) -{ - return wxSetlocale(LC_ALL, loc); -} - -} // private namespace - -void wxCmdLineParserData::SetArguments(int argc, char **argv) -{ - m_arguments.clear(); - - // Command-line arguments are supposed to be in the user locale encoding - // (what else?) but wxLocale probably wasn't initialized yet as we're - // called early during the program startup and so our locale might not have - // been set from the environment yet. To work around this problem we - // temporarily change the locale here. The only drawback is that changing - // the locale is thread-unsafe but precisely because we're called so early - // it's hopefully safe to assume that no other threads had been created yet. - char * const locOld = SetAllLocaleFacets(NULL); - SetAllLocaleFacets(""); - wxON_BLOCK_EXIT1( SetAllLocaleFacets, locOld ); - - for ( int n = 0; n < argc; n++ ) - { - // try to interpret the string as being in the current locale - wxString arg(argv[n]); - - // but just in case we guessed wrongly and the conversion failed, do - // try to salvage at least something - if ( arg.empty() && argv[n][0] != '\0' ) - arg = wxString(argv[n], wxConvISO8859_1); - - m_arguments.push_back(arg); - } -} - -#if wxUSE_UNICODE - -void wxCmdLineParserData::SetArguments(int argc, wxChar **argv) -{ - m_arguments.clear(); - - for ( int n = 0; n < argc; n++ ) - { - m_arguments.push_back(argv[n]); - } -} - -void wxCmdLineParserData::SetArguments(int WXUNUSED(argc), - const wxCmdLineArgsArray& argv) -{ - m_arguments = argv.GetArguments(); -} - -#endif // wxUSE_UNICODE - -void wxCmdLineParserData::SetArguments(const wxString& cmdLine) -{ - m_arguments.clear(); - - if(wxTheApp && wxTheApp->argc > 0) - m_arguments.push_back(wxTheApp->argv[0]); - else - m_arguments.push_back(wxEmptyString); - - wxArrayString args = wxCmdLineParser::ConvertStringToArgs(cmdLine); - - WX_APPEND_ARRAY(m_arguments, args); -} - -int wxCmdLineParserData::FindOption(const wxString& name) -{ - if ( !name.empty() ) - { - size_t count = m_options.GetCount(); - for ( size_t n = 0; n < count; n++ ) - { - if ( m_options[n].shortName == name ) - { - // found - return n; - } - } - } - - return wxNOT_FOUND; -} - -int wxCmdLineParserData::FindOptionByLongName(const wxString& name) -{ - size_t count = m_options.GetCount(); - for ( size_t n = 0; n < count; n++ ) - { - if ( m_options[n].longName == name ) - { - // found - return n; - } - } - - return wxNOT_FOUND; -} - -const wxCmdLineOption* -wxCmdLineParserData::FindOptionByAnyName(const wxString& name) -{ - int i = FindOption(name); - if ( i == wxNOT_FOUND ) - { - i = FindOptionByLongName(name); - - if ( i == wxNOT_FOUND ) - { - wxFAIL_MSG( wxS("Unknown option ") + name ); - return NULL; - } - } - - return &m_options[(size_t)i]; -} - -// ---------------------------------------------------------------------------- -// construction and destruction -// ---------------------------------------------------------------------------- - -void wxCmdLineParser::Init() -{ - m_data = new wxCmdLineParserData; -} - -void wxCmdLineParser::SetCmdLine(int argc, char **argv) -{ - m_data->SetArguments(argc, argv); -} - -#if wxUSE_UNICODE - -void wxCmdLineParser::SetCmdLine(int argc, wxChar **argv) -{ - m_data->SetArguments(argc, argv); -} - -void wxCmdLineParser::SetCmdLine(int argc, const wxCmdLineArgsArray& argv) -{ - m_data->SetArguments(argc, argv); -} - -#endif // wxUSE_UNICODE - -void wxCmdLineParser::SetCmdLine(const wxString& cmdline) -{ - m_data->SetArguments(cmdline); -} - -wxCmdLineParser::~wxCmdLineParser() -{ - delete m_data; -} - -// ---------------------------------------------------------------------------- -// options -// ---------------------------------------------------------------------------- - -void wxCmdLineParser::SetSwitchChars(const wxString& switchChars) -{ - m_data->m_switchChars = switchChars; -} - -void wxCmdLineParser::EnableLongOptions(bool enable) -{ - m_data->m_enableLongOptions = enable; -} - -bool wxCmdLineParser::AreLongOptionsEnabled() const -{ - return m_data->m_enableLongOptions; -} - -void wxCmdLineParser::SetLogo(const wxString& logo) -{ - m_data->m_logo = logo; -} - -// ---------------------------------------------------------------------------- -// command line construction -// ---------------------------------------------------------------------------- - -void wxCmdLineParser::SetDesc(const wxCmdLineEntryDesc *desc) -{ - for ( ;; desc++ ) - { - switch ( desc->kind ) - { - case wxCMD_LINE_SWITCH: - AddSwitch(desc->shortName, desc->longName, - wxGetTranslation(desc->description), - desc->flags); - break; - - case wxCMD_LINE_OPTION: - AddOption(desc->shortName, desc->longName, - wxGetTranslation(desc->description), - desc->type, desc->flags); - break; - - case wxCMD_LINE_PARAM: - AddParam(wxGetTranslation(desc->description), - desc->type, desc->flags); - break; - - case wxCMD_LINE_USAGE_TEXT: - AddUsageText(wxGetTranslation(desc->description)); - break; - - default: - wxFAIL_MSG( wxT("unknown command line entry type") ); - wxFALLTHROUGH; - - case wxCMD_LINE_NONE: - return; - } - } -} - -void wxCmdLineParser::AddSwitch(const wxString& shortName, - const wxString& longName, - const wxString& desc, - int flags) -{ - wxASSERT_MSG( m_data->FindOption(shortName) == wxNOT_FOUND, - wxT("duplicate switch") ); - - wxCmdLineOption *option = new wxCmdLineOption(wxCMD_LINE_SWITCH, - shortName, longName, desc, - wxCMD_LINE_VAL_NONE, flags); - - m_data->m_options.Add(option); -} - -void wxCmdLineParser::AddOption(const wxString& shortName, - const wxString& longName, - const wxString& desc, - wxCmdLineParamType type, - int flags) -{ - wxASSERT_MSG( m_data->FindOption(shortName) == wxNOT_FOUND, - wxT("duplicate option") ); - - wxCmdLineOption *option = new wxCmdLineOption(wxCMD_LINE_OPTION, - shortName, longName, desc, - type, flags); - - m_data->m_options.Add(option); -} - -void wxCmdLineParser::AddParam(const wxString& desc, - wxCmdLineParamType type, - int flags) -{ - // do some consistency checks: a required parameter can't follow an - // optional one and nothing should follow a parameter with MULTIPLE flag -#if wxDEBUG_LEVEL - if ( !m_data->m_paramDesc.IsEmpty() ) - { - wxCmdLineParam& param = m_data->m_paramDesc.Last(); - - wxASSERT_MSG( !(param.flags & wxCMD_LINE_PARAM_MULTIPLE), - wxT("all parameters after the one with wxCMD_LINE_PARAM_MULTIPLE style will be ignored") ); - - if ( !(flags & wxCMD_LINE_PARAM_OPTIONAL) ) - { - wxASSERT_MSG( !(param.flags & wxCMD_LINE_PARAM_OPTIONAL), - wxT("a required parameter can't follow an optional one") ); - } - } -#endif // wxDEBUG_LEVEL - - wxCmdLineParam *param = new wxCmdLineParam(desc, type, flags); - - m_data->m_paramDesc.Add(param); -} - -void wxCmdLineParser::AddUsageText(const wxString& text) -{ - wxASSERT_MSG( !text.empty(), wxT("text can't be empty") ); - - wxCmdLineOption *option = new wxCmdLineOption(wxCMD_LINE_USAGE_TEXT, - wxEmptyString, wxEmptyString, - text, wxCMD_LINE_VAL_NONE, 0); - - m_data->m_options.Add(option); -} - -// ---------------------------------------------------------------------------- -// access to parse command line -// ---------------------------------------------------------------------------- - -bool wxCmdLineParser::Found(const wxString& name) const -{ - const wxCmdLineOption* const opt = m_data->FindOptionByAnyName(name); - - return opt && opt->HasValue(); -} - -wxCmdLineSwitchState wxCmdLineParser::FoundSwitch(const wxString& name) const -{ - const wxCmdLineOption* const opt = m_data->FindOptionByAnyName(name); - - if ( !opt || !opt->HasValue() ) - return wxCMD_SWITCH_NOT_FOUND; - - return opt->IsNegated() ? wxCMD_SWITCH_OFF : wxCMD_SWITCH_ON; -} - -bool wxCmdLineParser::Found(const wxString& name, wxString *value) const -{ - const wxCmdLineOption* const opt = m_data->FindOptionByAnyName(name); - - if ( !opt || !opt->HasValue() ) - return false; - - wxCHECK_MSG( value, false, wxT("NULL pointer in wxCmdLineOption::Found") ); - - *value = opt->GetStrVal(); - - return true; -} - -bool wxCmdLineParser::Found(const wxString& name, long *value) const -{ - const wxCmdLineOption* const opt = m_data->FindOptionByAnyName(name); - - if ( !opt || !opt->HasValue() ) - return false; - - wxCHECK_MSG( value, false, wxT("NULL pointer in wxCmdLineOption::Found") ); - - *value = opt->GetLongVal(); - - return true; -} - -bool wxCmdLineParser::Found(const wxString& name, double *value) const -{ - const wxCmdLineOption* const opt = m_data->FindOptionByAnyName(name); - - if ( !opt || !opt->HasValue() ) - return false; - - wxCHECK_MSG( value, false, wxT("NULL pointer in wxCmdLineOption::Found") ); - - *value = opt->GetDoubleVal(); - - return true; -} - -#if wxUSE_DATETIME -bool wxCmdLineParser::Found(const wxString& name, wxDateTime *value) const -{ - const wxCmdLineOption* const opt = m_data->FindOptionByAnyName(name); - - if ( !opt || !opt->HasValue() ) - return false; - - wxCHECK_MSG( value, false, wxT("NULL pointer in wxCmdLineOption::Found") ); - - *value = opt->GetDateVal(); - - return true; -} -#endif // wxUSE_DATETIME - -size_t wxCmdLineParser::GetParamCount() const -{ - return m_data->m_parameters.size(); -} - -wxString wxCmdLineParser::GetParam(size_t n) const -{ - wxCHECK_MSG( n < GetParamCount(), wxEmptyString, wxT("invalid param index") ); - - return m_data->m_parameters[n]; -} - -// Resets switches and options -void wxCmdLineParser::Reset() -{ - for ( size_t i = 0; i < m_data->m_options.GetCount(); i++ ) - { - m_data->m_options[i].Reset(); - } - - m_data->m_parsedArguments.Empty(); -} - - -// ---------------------------------------------------------------------------- -// the real work is done here -// ---------------------------------------------------------------------------- - -int wxCmdLineParser::Parse(bool showUsage) -{ - bool maybeOption = true; // can the following arg be an option? - bool ok = true; // true until an error is detected - bool helpRequested = false; // true if "-h" was given - bool hadRepeatableParam = false; // true if found param with MULTIPLE flag - - size_t currentParam = 0; // the index in m_paramDesc - - size_t countParam = m_data->m_paramDesc.GetCount(); - wxString errorMsg; - - Reset(); - - // parse everything - m_data->m_parameters.clear(); - wxString arg; - size_t count = m_data->m_arguments.size(); - for ( size_t n = 1; ok && (n < count); n++ ) // 0 is program name - { - arg = m_data->m_arguments[n]; - - // special case: "--" should be discarded and all following arguments - // should be considered as parameters, even if they start with '-' and - // not like options (this is POSIX-like) - if ( arg == wxT("--") ) - { - maybeOption = false; - - continue; - } -#ifdef __WXOSX__ - if ( arg == wxS("-ApplePersistenceIgnoreState") || - arg == wxS("-AppleTextDirection") || - arg == wxS("-AppleLocale") || - arg == wxS("-AppleLanguages") ) - { - maybeOption = false; - n++; - - continue; - } -#endif - - // empty argument or just '-' is not an option but a parameter - if ( maybeOption && arg.length() > 1 && - // FIXME-UTF8: use wc_str() after removing ANSI build - wxStrchr(m_data->m_switchChars.c_str(), arg[0u]) ) - { - bool isLong; - wxString name; - int optInd = wxNOT_FOUND; // init to suppress warnings - - // an option or a switch: find whether it's a long or a short one - if ( arg.length() >= 3 && arg[0u] == wxT('-') && arg[1u] == wxT('-') ) - { - // a long one - isLong = true; - - // Skip leading "--" - wxString::const_iterator p = arg.begin() + 2; - - bool longOptionsEnabled = AreLongOptionsEnabled(); - - name = GetLongOptionName(p, arg.end()); - - if (longOptionsEnabled) - { - wxString errorOpt; - - optInd = m_data->FindOptionByLongName(name); - if ( optInd == wxNOT_FOUND ) - { - // Check if this could be a negatable long option. - if ( name.Last() == '-' ) - { - name.RemoveLast(); - - optInd = m_data->FindOptionByLongName(name); - if ( optInd != wxNOT_FOUND ) - { - if ( !(m_data->m_options[optInd].flags & - wxCMD_LINE_SWITCH_NEGATABLE) ) - { - errorOpt.Printf - ( - _("Option '%s' can't be negated"), - name - ); - optInd = wxNOT_FOUND; - } - } - } - - if ( optInd == wxNOT_FOUND ) - { - if ( errorOpt.empty() ) - { - errorOpt.Printf - ( - _("Unknown long option '%s'"), - name - ); - } - - errorMsg << errorOpt << wxT('\n'); - } - } - } - else - { - optInd = wxNOT_FOUND; // Sanity check - - // Print the argument including leading "--" - name.Prepend( wxT("--") ); - errorMsg << wxString::Format(_("Unknown option '%s'"), name.c_str()) - << wxT('\n'); - } - - } - else // not a long option - { - isLong = false; - - // a short one: as they can be cumulated, we try to find the - // longest substring which is a valid option - wxString::const_iterator p = arg.begin() + 1; - - name = GetShortOptionName(p, arg.end()); - - size_t len = name.length(); - do - { - if ( len == 0 ) - { - // we couldn't find a valid option name in the - // beginning of this string - errorMsg << wxString::Format(_("Unknown option '%s'"), name.c_str()) - << wxT('\n'); - - break; - } - else - { - optInd = m_data->FindOption(name.Left(len)); - - // will try with one character less the next time - len--; - } - } - while ( optInd == wxNOT_FOUND ); - - len++; // compensates extra len-- above - if ( (optInd != wxNOT_FOUND) && (len != name.length()) ) - { - // first of all, the option name is only part of this - // string - name = name.Left(len); - - // our option is only part of this argument, there is - // something else in it - it is either the value of this - // option or other switches if it is a switch - if ( m_data->m_options[(size_t)optInd].kind - == wxCMD_LINE_SWITCH ) - { - // if the switch is negatable and it is just followed - // by '-' the '-' is considered to be part of this - // switch - if ( (m_data->m_options[(size_t)optInd].flags & - wxCMD_LINE_SWITCH_NEGATABLE) && - arg[len] == '-' ) - ++len; - - // pretend that all the rest of the argument is the - // next argument, in fact - wxString arg2 = arg[0u]; - arg2 += arg.Mid(len + 1); // +1 for leading '-' - - m_data->m_arguments.insert - (m_data->m_arguments.begin() + n + 1, arg2); - count++; - - // only leave the part which wasn't extracted into the - // next argument in this one - arg = arg.Left(len + 1); - } - //else: it's our value, we'll deal with it below - } - } - - if ( optInd == wxNOT_FOUND ) - { - ok = false; - - continue; // will break, in fact - } - - // look at what follows: - - // +1 for leading '-' - wxString::const_iterator p = arg.begin() + 1 + name.length(); - wxString::const_iterator end = arg.end(); - - if ( isLong ) - ++p; // for another leading '-' - - wxCmdLineOption& opt = m_data->m_options[(size_t)optInd]; - if ( opt.kind == wxCMD_LINE_SWITCH ) - { - // we must check that there is no value following the switch - bool negated = (opt.flags & wxCMD_LINE_SWITCH_NEGATABLE) && - p != arg.end() && *p == '-'; - - if ( !negated && p != arg.end() ) - { - errorMsg << wxString::Format(_("Unexpected characters following option '%s'."), name.c_str()) - << wxT('\n'); - ok = false; - } - else // no value, as expected - { - // nothing more to do - opt.SetHasValue(); - if ( negated ) - opt.SetNegated(); - - if ( opt.flags & wxCMD_LINE_OPTION_HELP ) - { - helpRequested = true; - - // it's not an error, but we still stop here - ok = false; - } - } - } - else // it's an option. not a switch - { - switch ( p == end ? '\0' : (*p).GetValue() ) - { - case '=': - case ':': - // the value follows - ++p; - break; - - case '\0': - // the value is in the next argument - if ( ++n == count ) - { - // ... but there is none - errorMsg << wxString::Format(_("Option '%s' requires a value."), - name.c_str()) - << wxT('\n'); - - ok = false; - } - else - { - // ... take it from there - p = m_data->m_arguments[n].begin(); - end = m_data->m_arguments[n].end(); - } - break; - - default: - // the value is right here: this may be legal or - // not depending on the option style - if ( opt.flags & wxCMD_LINE_NEEDS_SEPARATOR ) - { - errorMsg << wxString::Format(_("Separator expected after the option '%s'."), - name.c_str()) - << wxT('\n'); - - ok = false; - } - } - - if ( ok ) - { - wxString value(p, end); - switch ( opt.type ) - { - default: - wxFAIL_MSG( wxT("unknown option type") ); - wxFALLTHROUGH; - - case wxCMD_LINE_VAL_STRING: - opt.SetStrVal(value); - break; - - case wxCMD_LINE_VAL_NUMBER: - { - long val; - if ( value.ToLong(&val) ) - { - opt.SetLongVal(val); - } - else - { - errorMsg << wxString::Format(_("'%s' is not a correct numeric value for option '%s'."), - value.c_str(), name.c_str()) - << wxT('\n'); - - ok = false; - } - } - break; - - case wxCMD_LINE_VAL_DOUBLE: - { - double val; - if ( value.ToDouble(&val) ) - { - opt.SetDoubleVal(val); - } - else - { - errorMsg << wxString::Format(_("'%s' is not a correct numeric value for option '%s'."), - value.c_str(), name.c_str()) - << wxT('\n'); - - ok = false; - } - } - break; - -#if wxUSE_DATETIME - case wxCMD_LINE_VAL_DATE: - { - wxDateTime dt; - wxString::const_iterator endDate; - if ( !dt.ParseDate(value, &endDate) || endDate != value.end() ) - { - errorMsg << wxString::Format(_("Option '%s': '%s' cannot be converted to a date."), - name.c_str(), value.c_str()) - << wxT('\n'); - - ok = false; - } - else - { - opt.SetDateVal(dt); - } - } - break; -#endif // wxUSE_DATETIME - } - } - } - - if (ok) - m_data->m_parsedArguments.push_back (opt); - } - else // not an option, must be a parameter - { - if ( currentParam < countParam ) - { - wxCmdLineParam& param = m_data->m_paramDesc[currentParam]; - - // TODO check the param type - - m_data->m_parameters.push_back(arg); - m_data->m_parsedArguments.push_back ( - wxCmdLineArgImpl(wxCMD_LINE_PARAM, wxString(), wxString(), - wxCMD_LINE_VAL_STRING).SetStrVal(arg)); - - if ( !(param.flags & wxCMD_LINE_PARAM_MULTIPLE) ) - { - currentParam++; - } - else - { - wxASSERT_MSG( currentParam == countParam - 1, - wxT("all parameters after the one with wxCMD_LINE_PARAM_MULTIPLE style are ignored") ); - - // remember that we did have this last repeatable parameter - hadRepeatableParam = true; - } - } - else - { - errorMsg << wxString::Format(_("Unexpected parameter '%s'"), arg.c_str()) - << wxT('\n'); - - ok = false; - } - } - } - - // verify that all mandatory options were given - if ( ok ) - { - size_t countOpt = m_data->m_options.GetCount(); - for ( size_t n = 0; ok && (n < countOpt); n++ ) - { - wxCmdLineOption& opt = m_data->m_options[n]; - if ( (opt.flags & wxCMD_LINE_OPTION_MANDATORY) && !opt.HasValue() ) - { - wxString optName; - if ( !opt.longName ) - { - optName = opt.shortName; - } - else - { - if ( AreLongOptionsEnabled() ) - { - optName.Printf( _("%s (or %s)"), - opt.shortName.c_str(), - opt.longName.c_str() ); - } - else - { - optName.Printf( wxT("%s"), - opt.shortName.c_str() ); - } - } - - errorMsg << wxString::Format(_("The value for the option '%s' must be specified."), - optName.c_str()) - << wxT('\n'); - - ok = false; - } - } - - for ( ; ok && (currentParam < countParam); currentParam++ ) - { - wxCmdLineParam& param = m_data->m_paramDesc[currentParam]; - if ( (currentParam == countParam - 1) && - (param.flags & wxCMD_LINE_PARAM_MULTIPLE) && - hadRepeatableParam ) - { - // special case: currentParam wasn't incremented, but we did - // have it, so don't give error - continue; - } - - if ( !(param.flags & wxCMD_LINE_PARAM_OPTIONAL) ) - { - errorMsg << wxString::Format(_("The required parameter '%s' was not specified."), - param.description.c_str()) - << wxT('\n'); - - ok = false; - } - } - } - - // if there was an error during parsing the command line, show this error - // and also the usage message if it had been requested - if ( !ok && (!errorMsg.empty() || (helpRequested && showUsage)) ) - { - wxMessageOutput* msgOut = wxMessageOutput::Get(); - if ( msgOut ) - { - wxString usage; - if ( showUsage ) - usage = GetUsageString(); - - msgOut->Printf( wxT("%s%s"), usage.c_str(), errorMsg.c_str() ); - } - else - { - wxFAIL_MSG( wxT("no wxMessageOutput object?") ); - } - } - - return ok ? 0 : helpRequested ? -1 : 1; -} - -// ---------------------------------------------------------------------------- -// give the usage message -// ---------------------------------------------------------------------------- - -void wxCmdLineParser::Usage() const -{ - wxMessageOutput* msgOut = wxMessageOutput::Get(); - if ( msgOut ) - { - msgOut->Printf( wxT("%s"), GetUsageString().c_str() ); - } - else - { - wxFAIL_MSG( wxT("no wxMessageOutput object?") ); - } -} - -wxString wxCmdLineParser::GetUsageString() const -{ - wxString appname; - if ( m_data->m_arguments.empty() ) - { - if ( wxTheApp ) - appname = wxTheApp->GetAppName(); - } - else // use argv[0] - { - appname = wxFileName(m_data->m_arguments[0]).GetName(); - } - - // we construct the brief cmd line desc on the fly, but not the detailed - // help message below because we want to align the options descriptions - // and for this we must first know the longest one of them - wxString usage; - wxArrayString namesOptions, descOptions; - - if ( !m_data->m_logo.empty() ) - { - usage << m_data->m_logo << wxT('\n'); - } - - usage << wxString::Format(_("Usage: %s"), appname.c_str()); - - // the switch char is usually '-' but this can be changed with - // SetSwitchChars() and then the first one of possible chars is used - wxChar chSwitch = !m_data->m_switchChars ? wxT('-') - : m_data->m_switchChars[0u]; - - bool areLongOptionsEnabled = AreLongOptionsEnabled(); - size_t n, count = m_data->m_options.GetCount(); - for ( n = 0; n < count; n++ ) - { - wxCmdLineOption& opt = m_data->m_options[n]; - wxString option, negator; - - if ( opt.kind != wxCMD_LINE_USAGE_TEXT ) - { - usage << wxT(' '); - if ( !(opt.flags & wxCMD_LINE_OPTION_MANDATORY) ) - { - usage << wxT('['); - } - - if ( opt.flags & wxCMD_LINE_SWITCH_NEGATABLE ) - negator = wxT("[-]"); - - if ( !opt.shortName.empty() ) - { - usage << chSwitch << opt.shortName << negator; - } - else if ( areLongOptionsEnabled && !opt.longName.empty() ) - { - usage << wxT("--") << opt.longName << negator; - } - else - { - if (!opt.longName.empty()) - { - wxFAIL_MSG( wxT("option with only a long name while long ") - wxT("options are disabled") ); - } - else - { - wxFAIL_MSG( wxT("option without neither short nor long name") ); - } - } - - if ( !opt.shortName.empty() ) - { - option << wxT(" ") << chSwitch << opt.shortName; - } - - if ( areLongOptionsEnabled && !opt.longName.empty() ) - { - option << (option.empty() ? wxT(" ") : wxT(", ")) - << wxT("--") << opt.longName; - } - - if ( opt.kind != wxCMD_LINE_SWITCH ) - { - wxString val; - val << wxT('<') << GetTypeName(opt.type) << wxT('>'); - usage << wxT(' ') << val; - option << (!opt.longName ? wxT(':') : wxT('=')) << val; - } - - if ( !(opt.flags & wxCMD_LINE_OPTION_MANDATORY) ) - { - usage << wxT(']'); - } - } - - namesOptions.push_back(option); - descOptions.push_back(opt.description); - } - - count = m_data->m_paramDesc.GetCount(); - for ( n = 0; n < count; n++ ) - { - wxCmdLineParam& param = m_data->m_paramDesc[n]; - - usage << wxT(' '); - if ( param.flags & wxCMD_LINE_PARAM_OPTIONAL ) - { - usage << wxT('['); - } - - usage << param.description; - - if ( param.flags & wxCMD_LINE_PARAM_MULTIPLE ) - { - usage << wxT("..."); - } - - if ( param.flags & wxCMD_LINE_PARAM_OPTIONAL ) - { - usage << wxT(']'); - } - } - - usage << wxT('\n'); - - // set to number of our own options, not counting the standard ones - count = namesOptions.size(); - - // get option names & descriptions for standard options, if any: - wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits() : NULL; - wxString stdDesc; - if ( traits ) - stdDesc = traits->GetStandardCmdLineOptions(namesOptions, descOptions); - - // now construct the detailed help message - size_t len, lenMax = 0; - for ( n = 0; n < namesOptions.size(); n++ ) - { - len = namesOptions[n].length(); - if ( len > lenMax ) - lenMax = len; - } - - for ( n = 0; n < namesOptions.size(); n++ ) - { - if ( n == count ) - usage << wxT('\n') << stdDesc; - - len = namesOptions[n].length(); - // desc contains text if name is empty - if (len == 0) - { - usage << descOptions[n] << wxT('\n'); - } - else - { - usage << namesOptions[n] - << wxString(wxT(' '), lenMax - len) << wxT('\t') - << descOptions[n] - << wxT('\n'); - } - } - - return usage; -} - -// ---------------------------------------------------------------------------- -// private functions -// ---------------------------------------------------------------------------- - -static wxString GetTypeName(wxCmdLineParamType type) -{ - wxString s; - switch ( type ) - { - default: - wxFAIL_MSG( wxT("unknown option type") ); - wxFALLTHROUGH; - - case wxCMD_LINE_VAL_STRING: - s = _("str"); - break; - - case wxCMD_LINE_VAL_NUMBER: - s = _("num"); - break; - - case wxCMD_LINE_VAL_DOUBLE: - s = _("double"); - break; - - case wxCMD_LINE_VAL_DATE: - s = _("date"); - break; - } - - return s; -} - -/* -Returns a string which is equal to the string pointed to by p, but up to the -point where p contains an character that's not allowed. -Allowable characters are letters and numbers, and characters pointed to by -the parameter allowedChars. - -For example, if p points to "abcde-@-_", and allowedChars is "-_", -this function returns "abcde-". -*/ -static wxString GetOptionName(wxString::const_iterator p, - wxString::const_iterator end, - const wxChar *allowedChars) -{ - wxString argName; - - while ( p != end && (wxIsalnum(*p) || wxStrchr(allowedChars, *p)) ) - { - argName += *p++; - } - - return argName; -} - -// Besides alphanumeric characters, short and long options can -// have other characters. - -// A short option additionally can have these -#define wxCMD_LINE_CHARS_ALLOWED_BY_SHORT_OPTION wxT("_?") - -// A long option can have the same characters as a short option and a '-'. -#define wxCMD_LINE_CHARS_ALLOWED_BY_LONG_OPTION \ - wxCMD_LINE_CHARS_ALLOWED_BY_SHORT_OPTION wxT("-") - -static wxString GetShortOptionName(wxString::const_iterator p, - wxString::const_iterator end) -{ - return GetOptionName(p, end, wxCMD_LINE_CHARS_ALLOWED_BY_SHORT_OPTION); -} - -static wxString GetLongOptionName(wxString::const_iterator p, - wxString::const_iterator end) -{ - return GetOptionName(p, end, wxCMD_LINE_CHARS_ALLOWED_BY_LONG_OPTION); -} - -#endif // wxUSE_CMDLINE_PARSER - -// ---------------------------------------------------------------------------- -// global functions -// ---------------------------------------------------------------------------- - -/* - This function is mainly used under Windows (as under Unix we always get the - command line arguments as argc/argv anyhow) and so it tries to follow - Windows conventions for the command line handling, not Unix ones. For - instance, backslash is not special except when it precedes double quote when - it does quote it. - - TODO: Rewrite this to follow the even more complicated rule used by Windows - CommandLineToArgv(): - - * A string of backslashes not followed by a quotation mark has no special - meaning. - * An even number of backslashes followed by a quotation mark is treated as - pairs of protected backslashes, followed by a word terminator. - * An odd number of backslashes followed by a quotation mark is treated as - pairs of protected backslashes, followed by a protected quotation mark. - - See http://blogs.msdn.com/b/oldnewthing/archive/2010/09/17/10063629.aspx - - It could also be useful to provide a converse function which is also - non-trivial, see - - http://blogs.msdn.com/b/twistylittlepassagesallalike/archive/2011/04/23/everyone-quotes-arguments-the-wrong-way.aspx - */ - -/* static */ -wxArrayString -wxCmdLineParser::ConvertStringToArgs(const wxString& cmdline, - wxCmdLineSplitType type) -{ - wxArrayString args; - - wxString arg; - arg.reserve(1024); - - const wxString::const_iterator end = cmdline.end(); - wxString::const_iterator p = cmdline.begin(); - - for ( ;; ) - { - // skip white space - while ( p != end && (*p == ' ' || *p == '\t') ) - ++p; - - // anything left? - if ( p == end ) - break; - - // parse this parameter - bool lastBS = false, - isInsideQuotes = false; - wxChar chDelim = '\0'; - for ( arg.clear(); p != end; ++p ) - { - const wxChar ch = *p; - - if ( type == wxCMD_LINE_SPLIT_DOS ) - { - if ( ch == '"' ) - { - if ( !lastBS ) - { - isInsideQuotes = !isInsideQuotes; - - // don't put quote in arg - continue; - } - //else: quote has no special meaning but the backslash - // still remains -- makes no sense but this is what - // Windows does - } - // note that backslash does *not* quote the space, only quotes do - else if ( !isInsideQuotes && (ch == ' ' || ch == '\t') ) - { - ++p; // skip this space anyhow - break; - } - - lastBS = !lastBS && ch == '\\'; - } - else // type == wxCMD_LINE_SPLIT_UNIX - { - if ( !lastBS ) - { - if ( isInsideQuotes ) - { - if ( ch == chDelim ) - { - isInsideQuotes = false; - - continue; // don't use the quote itself - } - } - else // not in quotes and not escaped - { - if ( ch == '\'' || ch == '"' ) - { - isInsideQuotes = true; - chDelim = ch; - - continue; // don't use the quote itself - } - - if ( ch == ' ' || ch == '\t' ) - { - ++p; // skip this space anyhow - break; - } - } - - lastBS = ch == '\\'; - if ( lastBS ) - continue; - } - else // escaped by backslash, just use as is - { - lastBS = false; - } - } - - arg += ch; - } - - args.push_back(arg); - } - - return args; -} diff --git a/Externals/wxWidgets3/src/common/cmdproc.cpp b/Externals/wxWidgets3/src/common/cmdproc.cpp deleted file mode 100644 index 09fb2c8478..0000000000 --- a/Externals/wxWidgets3/src/common/cmdproc.cpp +++ /dev/null @@ -1,352 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/cmdproc.cpp -// Purpose: wxCommand and wxCommandProcessor classes -// Author: Julian Smart (extracted from docview.h by VZ) -// Modified by: -// Created: 05.11.00 -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#ifndef WX_PRECOMP - #include "wx/intl.h" - #include "wx/string.h" - #include "wx/menu.h" - #include "wx/accel.h" -#endif //WX_PRECOMP - -#include "wx/cmdproc.h" - -// ============================================================================ -// implementation -// ============================================================================ - -wxIMPLEMENT_CLASS(wxCommand, wxObject); -wxIMPLEMENT_DYNAMIC_CLASS(wxCommandProcessor, wxObject); - -// ---------------------------------------------------------------------------- -// wxCommand -// ---------------------------------------------------------------------------- - -wxCommand::wxCommand(bool canUndoIt, const wxString& name) -{ - m_canUndo = canUndoIt; - m_commandName = name; -} - -// ---------------------------------------------------------------------------- -// Command processor -// ---------------------------------------------------------------------------- - -wxCommandProcessor::wxCommandProcessor(int maxCommands) -{ - m_maxNoCommands = maxCommands; -#if wxUSE_MENUS - m_commandEditMenu = NULL; -#endif // wxUSE_MENUS - -#if wxUSE_ACCEL - m_undoAccelerator = '\t' + wxAcceleratorEntry(wxACCEL_CTRL, 'Z').ToString(); - m_redoAccelerator = '\t' + wxAcceleratorEntry(wxACCEL_CTRL, 'Y').ToString(); -#endif // wxUSE_ACCEL - - m_lastSavedCommand = - m_currentCommand = wxList::compatibility_iterator(); -} - -wxCommandProcessor::~wxCommandProcessor() -{ - ClearCommands(); -} - -bool wxCommandProcessor::DoCommand(wxCommand& cmd) -{ - return cmd.Do(); -} - -bool wxCommandProcessor::UndoCommand(wxCommand& cmd) -{ - return cmd.Undo(); -} - -// Pass a command to the processor. The processor calls Do(); -// if successful, is appended to the command history unless -// storeIt is false. -bool wxCommandProcessor::Submit(wxCommand *command, bool storeIt) -{ - wxCHECK_MSG( command, false, wxT("no command in wxCommandProcessor::Submit") ); - - if ( !DoCommand(*command) ) - { - // the user code expects the command to be deleted anyhow - delete command; - - return false; - } - - if ( storeIt ) - Store(command); - else - delete command; - - return true; -} - -void wxCommandProcessor::Store(wxCommand *command) -{ - wxCHECK_RET( command, wxT("no command in wxCommandProcessor::Store") ); - - // Correct a bug: we must chop off the current 'branch' - // so that we're at the end of the command list. - if (!m_currentCommand) - ClearCommands(); - else - { - wxList::compatibility_iterator node = m_currentCommand->GetNext(); - while (node) - { - wxList::compatibility_iterator next = node->GetNext(); - - // Make sure m_lastSavedCommand won't point to freed memory - if ( m_lastSavedCommand && m_lastSavedCommand == node ) - m_lastSavedCommand = wxList::compatibility_iterator(); - - delete (wxCommand *)node->GetData(); - m_commands.Erase(node); - - node = next; - } - } - - if ( (int)m_commands.GetCount() == m_maxNoCommands ) - { - wxList::compatibility_iterator firstNode = m_commands.GetFirst(); - - // Make sure m_lastSavedCommand won't point to freed memory - if ( m_lastSavedCommand && m_lastSavedCommand == firstNode ) - m_lastSavedCommand = wxList::compatibility_iterator(); - - wxCommand *firstCommand = (wxCommand *)firstNode->GetData(); - delete firstCommand; - m_commands.Erase(firstNode); - } - - m_commands.Append(command); - m_currentCommand = m_commands.GetLast(); - SetMenuStrings(); -} - -bool wxCommandProcessor::Undo() -{ - wxCommand *command = GetCurrentCommand(); - if ( command && command->CanUndo() ) - { - if ( UndoCommand(*command) ) - { - m_currentCommand = m_currentCommand->GetPrevious(); - SetMenuStrings(); - return true; - } - } - - return false; -} - -bool wxCommandProcessor::Redo() -{ - wxCommand *redoCommand = NULL; - wxList::compatibility_iterator redoNode -#if !wxUSE_STD_CONTAINERS - = NULL // just to avoid warnings -#endif // !wxUSE_STD_CONTAINERS - ; - - if ( m_currentCommand ) - { - // is there anything to redo? - if ( m_currentCommand->GetNext() ) - { - redoCommand = (wxCommand *)m_currentCommand->GetNext()->GetData(); - redoNode = m_currentCommand->GetNext(); - } - } - else // no current command, redo the first one - { - if (m_commands.GetCount() > 0) - { - redoCommand = (wxCommand *)m_commands.GetFirst()->GetData(); - redoNode = m_commands.GetFirst(); - } - } - - if (redoCommand) - { - bool success = DoCommand(*redoCommand); - if (success) - { - m_currentCommand = redoNode; - SetMenuStrings(); - return true; - } - } - return false; -} - -bool wxCommandProcessor::CanUndo() const -{ - wxCommand *command = GetCurrentCommand(); - - return command && command->CanUndo(); -} - -bool wxCommandProcessor::CanRedo() const -{ - if (m_currentCommand && !m_currentCommand->GetNext()) - return false; - - if (m_currentCommand && m_currentCommand->GetNext()) - return true; - - if (!m_currentCommand && (m_commands.GetCount() > 0)) - return true; - - return false; -} - -void wxCommandProcessor::Initialize() -{ - m_currentCommand = m_commands.GetLast(); - SetMenuStrings(); -} - -void wxCommandProcessor::SetMenuStrings() -{ -#if wxUSE_MENUS - if (m_commandEditMenu) - { - wxString undoLabel = GetUndoMenuLabel(); - wxString redoLabel = GetRedoMenuLabel(); - - m_commandEditMenu->SetLabel(wxID_UNDO, undoLabel); - m_commandEditMenu->Enable(wxID_UNDO, CanUndo()); - - m_commandEditMenu->SetLabel(wxID_REDO, redoLabel); - m_commandEditMenu->Enable(wxID_REDO, CanRedo()); - } -#endif // wxUSE_MENUS -} - -// Gets the current Undo menu label. -wxString wxCommandProcessor::GetUndoMenuLabel() const -{ - wxString buf; - if (m_currentCommand) - { - wxCommand *command = (wxCommand *)m_currentCommand->GetData(); - wxString commandName(command->GetName()); - if (commandName.empty()) commandName = _("Unnamed command"); - bool canUndo = command->CanUndo(); - if (canUndo) - buf = wxString(_("&Undo ")) + commandName + m_undoAccelerator; - else - buf = wxString(_("Can't &Undo ")) + commandName + m_undoAccelerator; - } - else - { - buf = _("&Undo") + m_undoAccelerator; - } - - return buf; -} - -// Gets the current Undo menu label. -wxString wxCommandProcessor::GetRedoMenuLabel() const -{ - wxString buf; - if (m_currentCommand) - { - // We can redo, if we're not at the end of the history. - if (m_currentCommand->GetNext()) - { - wxCommand *redoCommand = (wxCommand *)m_currentCommand->GetNext()->GetData(); - wxString redoCommandName(redoCommand->GetName()); - if (redoCommandName.empty()) redoCommandName = _("Unnamed command"); - buf = wxString(_("&Redo ")) + redoCommandName + m_redoAccelerator; - } - else - { - buf = _("&Redo") + m_redoAccelerator; - } - } - else - { - if (m_commands.GetCount() == 0) - { - buf = _("&Redo") + m_redoAccelerator; - } - else - { - // currentCommand is NULL but there are commands: this means that - // we've undone to the start of the list, but can redo the first. - wxCommand *redoCommand = (wxCommand *)m_commands.GetFirst()->GetData(); - wxString redoCommandName(redoCommand->GetName()); - if (redoCommandName.empty()) redoCommandName = _("Unnamed command"); - buf = wxString(_("&Redo ")) + redoCommandName + m_redoAccelerator; - } - } - return buf; -} - -void wxCommandProcessor::ClearCommands() -{ - wxList::compatibility_iterator node = m_commands.GetFirst(); - while (node) - { - wxCommand *command = (wxCommand *)node->GetData(); - delete command; - m_commands.Erase(node); - node = m_commands.GetFirst(); - } - - m_currentCommand = wxList::compatibility_iterator(); - m_lastSavedCommand = wxList::compatibility_iterator(); -} - -bool wxCommandProcessor::IsDirty() const -{ - if ( !m_lastSavedCommand ) - { - // We have never been saved, so we are dirty if and only if we have any - // commands at all. - // - // NB: The ugly "!!" test is needed to avoid warnings both from MSVC in - // non-STL build and g++ in STL build. - return !!m_currentCommand; - } - - if ( !m_currentCommand ) - { - // This only happens if all commands were undone after saving the - // document: we're dirty then. - return true; - } - - // Finally if both iterators are valid, we may just compare them. - return m_currentCommand != m_lastSavedCommand; -} - diff --git a/Externals/wxWidgets3/src/common/cmndata.cpp b/Externals/wxWidgets3/src/common/cmndata.cpp deleted file mode 100644 index f4eff7fb2a..0000000000 --- a/Externals/wxWidgets3/src/common/cmndata.cpp +++ /dev/null @@ -1,397 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/cmndata.cpp -// Purpose: Common GDI data -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_PRINTING_ARCHITECTURE - -#include "wx/cmndata.h" - -#ifndef WX_PRECOMP - #if defined(__WXMSW__) - #include "wx/msw/wrapcdlg.h" - #endif // MSW - #include - #include "wx/string.h" - #include "wx/utils.h" - #include "wx/app.h" - #include "wx/log.h" - #include "wx/gdicmn.h" -#endif - -#include "wx/prntbase.h" -#include "wx/printdlg.h" -#include "wx/paper.h" - - -wxIMPLEMENT_DYNAMIC_CLASS(wxPrintData, wxObject); -wxIMPLEMENT_DYNAMIC_CLASS(wxPrintDialogData, wxObject); -wxIMPLEMENT_DYNAMIC_CLASS(wxPageSetupDialogData, wxObject); - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// Print data -// ---------------------------------------------------------------------------- - -wxPrintData::wxPrintData() -{ - m_bin = wxPRINTBIN_DEFAULT; - m_media = wxPRINTMEDIA_DEFAULT; - m_printMode = wxPRINT_MODE_PRINTER; - m_printOrientation = wxPORTRAIT; - m_printOrientationReversed = false; - m_printNoCopies = 1; - m_printCollate = false; - - // New, 24/3/99 - m_printerName = wxEmptyString; - m_colour = true; - m_duplexMode = wxDUPLEX_SIMPLEX; - m_printQuality = wxPRINT_QUALITY_HIGH; - - // we intentionally don't initialize paper id and size at all, like this - // the default system settings will be used for them - m_paperId = wxPAPER_NONE; - m_paperSize = wxDefaultSize; - - m_privData = NULL; - m_privDataLen = 0; - - m_nativeData = wxPrintFactory::GetFactory()->CreatePrintNativeData(); -} - -wxPrintData::wxPrintData(const wxPrintData& printData) - : wxObject() -{ - m_nativeData = NULL; - m_privData = NULL; - (*this) = printData; -} - -void wxPrintData::SetPrivData( char *privData, int len ) -{ - wxDELETEA(m_privData); - m_privDataLen = len; - if (m_privDataLen > 0) - { - m_privData = new char[m_privDataLen]; - memcpy( m_privData, privData, m_privDataLen ); - } -} - -wxPrintData::~wxPrintData() -{ - m_nativeData->m_ref--; - if (m_nativeData->m_ref == 0) - delete m_nativeData; - - if (m_privData) - delete [] m_privData; -} - -void wxPrintData::ConvertToNative() -{ - m_nativeData->TransferFrom( *this ) ; -} - -void wxPrintData::ConvertFromNative() -{ - m_nativeData->TransferTo( *this ) ; -} - -wxPrintData& wxPrintData::operator=(const wxPrintData& data) -{ - if ( &data == this ) - return *this; - - m_printNoCopies = data.m_printNoCopies; - m_printCollate = data.m_printCollate; - m_printOrientation = data.m_printOrientation; - m_printOrientationReversed = data.m_printOrientationReversed; - m_printerName = data.m_printerName; - m_colour = data.m_colour; - m_duplexMode = data.m_duplexMode; - m_printQuality = data.m_printQuality; - m_paperId = data.m_paperId; - m_paperSize = data.m_paperSize; - m_bin = data.m_bin; - m_media = data.m_media; - m_printMode = data.m_printMode; - m_filename = data.m_filename; - - // UnRef old m_nativeData - if (m_nativeData) - { - m_nativeData->m_ref--; - if (m_nativeData->m_ref == 0) - delete m_nativeData; - } - // Set Ref new one - m_nativeData = data.GetNativeData(); - m_nativeData->m_ref++; - - wxDELETEA(m_privData); - m_privDataLen = data.GetPrivDataLen(); - if (m_privDataLen > 0) - { - m_privData = new char[m_privDataLen]; - memcpy( m_privData, data.GetPrivData(), m_privDataLen ); - } - - return *this; -} - -// Is this data OK for showing the print dialog? -bool wxPrintData::IsOk() const -{ - m_nativeData->TransferFrom( *this ); - - return m_nativeData->IsOk(); -} - -// ---------------------------------------------------------------------------- -// Print dialog data -// ---------------------------------------------------------------------------- - -wxPrintDialogData::wxPrintDialogData() -{ - m_printFromPage = 0; - m_printToPage = 0; - m_printMinPage = 0; - m_printMaxPage = 0; - m_printNoCopies = 1; - m_printAllPages = false; - m_printCollate = false; - m_printToFile = false; - m_printSelection = false; - m_printEnableSelection = false; - m_printEnablePageNumbers = true; - - wxPrintFactory* factory = wxPrintFactory::GetFactory(); - m_printEnablePrintToFile = ! factory->HasOwnPrintToFile(); - - m_printEnableHelp = false; -} - -wxPrintDialogData::wxPrintDialogData(const wxPrintDialogData& dialogData) - : wxObject() -{ - (*this) = dialogData; -} - -wxPrintDialogData::wxPrintDialogData(const wxPrintData& printData) -{ - m_printFromPage = 1; - m_printToPage = 0; - m_printMinPage = 1; - m_printMaxPage = 9999; - m_printNoCopies = 1; - // On Mac the Print dialog always defaults to "All Pages" -#ifdef __WXMAC__ - m_printAllPages = true; -#else - m_printAllPages = false; -#endif - m_printCollate = false; - m_printToFile = false; - m_printSelection = false; - m_printEnableSelection = false; - m_printEnablePageNumbers = true; - m_printEnablePrintToFile = true; - m_printEnableHelp = false; - m_printData = printData; -} - -wxPrintDialogData::~wxPrintDialogData() -{ -} - -void wxPrintDialogData::operator=(const wxPrintDialogData& data) -{ - m_printFromPage = data.m_printFromPage; - m_printToPage = data.m_printToPage; - m_printMinPage = data.m_printMinPage; - m_printMaxPage = data.m_printMaxPage; - m_printNoCopies = data.m_printNoCopies; - m_printAllPages = data.m_printAllPages; - m_printCollate = data.m_printCollate; - m_printToFile = data.m_printToFile; - m_printSelection = data.m_printSelection; - m_printEnableSelection = data.m_printEnableSelection; - m_printEnablePageNumbers = data.m_printEnablePageNumbers; - m_printEnableHelp = data.m_printEnableHelp; - m_printEnablePrintToFile = data.m_printEnablePrintToFile; - m_printData = data.m_printData; -} - -void wxPrintDialogData::operator=(const wxPrintData& data) -{ - m_printData = data; -} - -// ---------------------------------------------------------------------------- -// wxPageSetupDialogData -// ---------------------------------------------------------------------------- - -wxPageSetupDialogData::wxPageSetupDialogData() -{ - m_paperSize = wxSize(0,0); - - CalculatePaperSizeFromId(); - - m_minMarginTopLeft = - m_minMarginBottomRight = - m_marginTopLeft = - m_marginBottomRight = wxPoint(0,0); - - // Flags - m_defaultMinMargins = false; - m_enableMargins = true; - m_enableOrientation = true; - m_enablePaper = true; - m_enablePrinter = true; - m_enableHelp = false; - m_getDefaultInfo = false; -} - -wxPageSetupDialogData::wxPageSetupDialogData(const wxPageSetupDialogData& dialogData) - : wxObject() -{ - (*this) = dialogData; -} - -wxPageSetupDialogData::wxPageSetupDialogData(const wxPrintData& printData) -{ - m_paperSize = wxSize(0,0); - m_minMarginTopLeft = - m_minMarginBottomRight = - m_marginTopLeft = - m_marginBottomRight = wxPoint(0,0); - - // Flags - m_defaultMinMargins = false; - m_enableMargins = true; - m_enableOrientation = true; - m_enablePaper = true; - m_enablePrinter = true; - m_enableHelp = false; - m_getDefaultInfo = false; - - m_printData = printData; - - // The wxPrintData paper size overrides these values, unless the size cannot - // be found. - CalculatePaperSizeFromId(); -} - -wxPageSetupDialogData::~wxPageSetupDialogData() -{ -} - -wxPageSetupDialogData& wxPageSetupDialogData::operator=(const wxPageSetupDialogData& data) -{ - m_paperSize = data.m_paperSize; - m_minMarginTopLeft = data.m_minMarginTopLeft; - m_minMarginBottomRight = data.m_minMarginBottomRight; - m_marginTopLeft = data.m_marginTopLeft; - m_marginBottomRight = data.m_marginBottomRight; - m_defaultMinMargins = data.m_defaultMinMargins; - m_enableMargins = data.m_enableMargins; - m_enableOrientation = data.m_enableOrientation; - m_enablePaper = data.m_enablePaper; - m_enablePrinter = data.m_enablePrinter; - m_getDefaultInfo = data.m_getDefaultInfo; - m_enableHelp = data.m_enableHelp; - - m_printData = data.m_printData; - - return *this; -} - -wxPageSetupDialogData& wxPageSetupDialogData::operator=(const wxPrintData& data) -{ - m_printData = data; - CalculatePaperSizeFromId(); - - return *this; -} - -// If a corresponding paper type is found in the paper database, will set the m_printData -// paper size id member as well. -void wxPageSetupDialogData::SetPaperSize(const wxSize& sz) -{ - m_paperSize = sz; - - CalculateIdFromPaperSize(); -} - -// Sets the wxPrintData id, plus the paper width/height if found in the paper database. -void wxPageSetupDialogData::SetPaperSize(wxPaperSize id) -{ - m_printData.SetPaperId(id); - - CalculatePaperSizeFromId(); -} - -void wxPageSetupDialogData::SetPrintData(const wxPrintData& printData) -{ - m_printData = printData; - CalculatePaperSizeFromId(); -} - -// Use paper size defined in this object to set the wxPrintData -// paper id -void wxPageSetupDialogData::CalculateIdFromPaperSize() -{ - wxASSERT_MSG( (wxThePrintPaperDatabase != NULL), - wxT("wxThePrintPaperDatabase should not be NULL. Do not create global print dialog data objects.") ); - - wxSize sz = GetPaperSize(); - - wxPaperSize id = wxThePrintPaperDatabase->GetSize(wxSize(sz.x* 10, sz.y * 10)); - if (id != wxPAPER_NONE) - { - m_printData.SetPaperId(id); - } -} - -// Use paper id in wxPrintData to set this object's paper size -void wxPageSetupDialogData::CalculatePaperSizeFromId() -{ - wxASSERT_MSG( (wxThePrintPaperDatabase != NULL), - wxT("wxThePrintPaperDatabase should not be NULL. Do not create global print dialog data objects.") ); - - wxSize sz = wxThePrintPaperDatabase->GetSize(m_printData.GetPaperId()); - - if (sz != wxSize(0, 0)) - { - // sz is in 10ths of a mm, while paper size is in mm - m_paperSize.x = sz.x / 10; - m_paperSize.y = sz.y / 10; - } -} - -#endif // wxUSE_PRINTING_ARCHITECTURE diff --git a/Externals/wxWidgets3/src/common/colourcmn.cpp b/Externals/wxWidgets3/src/common/colourcmn.cpp deleted file mode 100644 index fb193c3898..0000000000 --- a/Externals/wxWidgets3/src/common/colourcmn.cpp +++ /dev/null @@ -1,363 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/colourcmn.cpp -// Purpose: wxColourBase implementation -// Author: Francesco Montorsi -// Modified by: -// Created: 20/4/2006 -// Copyright: (c) Francesco Montorsi -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include "wx/colour.h" - -#ifndef WX_PRECOMP - #include "wx/log.h" - #include "wx/utils.h" - #include "wx/gdicmn.h" - #include "wx/wxcrtvararg.h" -#endif - -#if wxUSE_VARIANT -IMPLEMENT_VARIANT_OBJECT_EXPORTED(wxColour,WXDLLEXPORT) -#endif - - -// ---------------------------------------------------------------------------- -// XTI -// ---------------------------------------------------------------------------- - -#if wxUSE_EXTENDED_RTTI - -#include - -template<> void wxStringReadValue(const wxString &s, wxColour &data ) -{ - if ( !data.Set(s) ) - { - wxLogError(_("String To Colour : Incorrect colour specification : %s"), - s.c_str() ); - data = wxNullColour; - } -} - -template<> void wxStringWriteValue(wxString &s, const wxColour &data ) -{ - s = data.GetAsString(wxC2S_HTML_SYNTAX); -} - -wxTO_STRING_IMP( wxColour ) -wxFROM_STRING_IMP( wxColour ) - -wxIMPLEMENT_DYNAMIC_CLASS_WITH_COPY_AND_STREAMERS_XTI( wxColour, wxObject, \ - "wx/colour.h", &wxTO_STRING( wxColour ), &wxFROM_STRING( wxColour )) -//WX_IMPLEMENT_ANY_VALUE_TYPE(wxAnyValueTypeImpl) -wxBEGIN_PROPERTIES_TABLE(wxColour) -wxREADONLY_PROPERTY( Red, unsigned char, Red, wxEMPTY_PARAMETER_VALUE, \ - 0 /*flags*/, wxT("Helpstring"), wxT("group")) -wxREADONLY_PROPERTY( Green, unsigned char, Green, wxEMPTY_PARAMETER_VALUE, \ - 0 /*flags*/, wxT("Helpstring"), wxT("group")) -wxREADONLY_PROPERTY( Blue, unsigned char, Blue, wxEMPTY_PARAMETER_VALUE, \ - 0 /*flags*/, wxT("Helpstring"), wxT("group")) -wxEND_PROPERTIES_TABLE() - -wxDIRECT_CONSTRUCTOR_3( wxColour, unsigned char, Red, \ - unsigned char, Green, unsigned char, Blue ) - -wxEMPTY_HANDLERS_TABLE(wxColour) -#else - -#if wxCOLOUR_IS_GDIOBJECT -wxIMPLEMENT_DYNAMIC_CLASS(wxColour, wxGDIObject); -#else -wxIMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject); -#endif - -#endif - -// ============================================================================ -// wxString <-> wxColour conversions -// ============================================================================ - -bool wxColourBase::FromString(const wxString& str) -{ - if ( str.empty() ) - return false; // invalid or empty string - - if ( wxStrnicmp(str, wxT("RGB"), 3) == 0 ) - { - // CSS-like RGB specification - // according to http://www.w3.org/TR/css3-color/#colorunits - // values outside 0-255 range are allowed but should be clipped - int red, green, blue, - alpha = wxALPHA_OPAQUE; - if ( str.length() > 3 && (str[3] == wxT('a') || str[3] == wxT('A')) ) - { - // We can't use sscanf() for the alpha value as sscanf() uses the - // current locale while the floating point numbers in CSS always - // use point as decimal separator, regardless of locale. So parse - // the tail of the string manually by putting it in a buffer and - // using wxString::ToCDouble() below. Notice that we can't use "%s" - // for this as it stops at white space and we need "%c" to avoid - // this and really get all the rest of the string into the buffer. - - const unsigned len = str.length(); // always big enough - wxCharBuffer alphaBuf(len); - char * const alphaPtr = alphaBuf.data(); - - for ( unsigned n = 0; n < len; n++ ) - alphaPtr[n] = '\0'; - - // Construct the format string which ensures that the last argument - // receives all the rest of the string. - wxString formatStr; - formatStr << wxS("( %d , %d , %d , %") << len << 'c'; - - // Notice that we use sscanf() here because if the string is not - // ASCII it can't represent a valid RGB colour specification anyhow - // and like this we can be sure that %c corresponds to "char *" - // while with wxSscanf() it depends on the type of the string - // passed as first argument: if it is a wide string, then %c - // expects "wchar_t *" matching parameter under MSW for example. - if ( sscanf(str.c_str() + 4, - formatStr.mb_str(), - &red, &green, &blue, alphaPtr) != 4 ) - return false; - - // Notice that we must explicitly specify the length to get rid of - // trailing NULs. - wxString alphaStr(alphaPtr, wxStrlen(alphaPtr)); - if ( alphaStr.empty() || alphaStr.Last() != ')' ) - return false; - - alphaStr.RemoveLast(); - alphaStr.Trim(); - - double a; - if ( !alphaStr.ToCDouble(&a) ) - return false; - - alpha = wxRound(a * 255); - } - else // no 'a' following "rgb" - { - if ( wxSscanf(str.wx_str() + 3, wxT("( %d , %d , %d )"), - &red, &green, &blue) != 3 ) - return false; - } - - Set((unsigned char)wxClip(red, 0, 255), - (unsigned char)wxClip(green, 0, 255), - (unsigned char)wxClip(blue, 0, 255), - (unsigned char)wxClip(alpha, 0, 255)); - } - else if ( str[0] == wxT('#') && wxStrlen(str) == 7 ) - { - // hexadecimal prefixed with # (HTML syntax) - unsigned long tmp; - if (wxSscanf(str.wx_str() + 1, wxT("%lx"), &tmp) != 1) - return false; - - Set((unsigned char)(tmp >> 16), - (unsigned char)(tmp >> 8), - (unsigned char)tmp); - } - else if (wxTheColourDatabase) // a colour name ? - { - // we can't do - // *this = wxTheColourDatabase->Find(str) - // because this place can be called from constructor - // and 'this' could not be available yet - wxColour clr = wxTheColourDatabase->Find(str); - if (clr.IsOk()) - Set((unsigned char)clr.Red(), - (unsigned char)clr.Green(), - (unsigned char)clr.Blue()); - } - - if (IsOk()) - return true; - - wxLogDebug(wxT("wxColour::Set - couldn't set to colour string '%s'"), str); - return false; -} - -wxString wxColourBase::GetAsString(long flags) const -{ - wxString colName; - - const bool isOpaque = Alpha() == wxALPHA_OPAQUE; - - // we can't use the name format if the colour is not opaque as the alpha - // information would be lost - if ( (flags & wxC2S_NAME) && isOpaque ) - { - colName = wxTheColourDatabase->FindName( - static_cast(*this)).MakeLower(); - } - - if ( colName.empty() ) - { - const int red = Red(), - blue = Blue(), - green = Green(); - - if ( flags & wxC2S_CSS_SYNTAX ) - { - // no name for this colour; return it in CSS syntax - if ( isOpaque ) - { - colName.Printf(wxT("rgb(%d, %d, %d)"), red, green, blue); - } - else // use rgba() form - { - colName.Printf(wxT("rgba(%d, %d, %d, %s)"), - red, green, blue, - wxString::FromCDouble(Alpha() / 255., 3)); - } - } - else if ( flags & wxC2S_HTML_SYNTAX ) - { - wxASSERT_MSG( isOpaque, "alpha is lost in HTML syntax" ); - - // no name for this colour; return it in HTML syntax - colName.Printf(wxT("#%02X%02X%02X"), red, green, blue); - } - } - - // this function should alway returns a non-empty string - wxASSERT_MSG(!colName.empty(), - wxT("Invalid wxColour -> wxString conversion flags")); - - return colName; -} - -// static -void wxColourBase::MakeMono(unsigned char* r, unsigned char* g, unsigned char* b, - bool on) -{ - *r = *g = *b = on ? 255 : 0; -} - -// static -void wxColourBase::MakeGrey(unsigned char* r, unsigned char* g, unsigned char* b - /*, unsigned char brightness */ - ) -{ - *r = *g = *b = (wxByte)(((*b)*117UL + (*g)*601UL + (*r)*306UL) >> 10); -} - -// static -void wxColourBase::MakeGrey(unsigned char* r, unsigned char* g, unsigned char* b, - double weight_r, double weight_g, double weight_b) -{ - double luma = (*r) * weight_r + (*g) * weight_g + (*b) * weight_b; - *r = *g = *b = (wxByte)wxRound(luma); -} - -// static -void wxColourBase::MakeDisabled(unsigned char* r, unsigned char* g, unsigned char* b, - unsigned char brightness) -{ - //MakeGrey(r, g, b, brightness); // grey no-blend version - *r = AlphaBlend(*r, brightness, 0.4); - *g = AlphaBlend(*g, brightness, 0.4); - *b = AlphaBlend(*b, brightness, 0.4); -} - -wxColour& wxColourBase::MakeDisabled(unsigned char brightness) -{ - unsigned char r = Red(), - g = Green(), - b = Blue(); - MakeDisabled(&r, &g, &b, brightness); - Set(r, g, b, Alpha()); - return static_cast(*this); -} - -// AlphaBlend is used by ChangeLightness and MakeDisabled - -// static -unsigned char wxColourBase::AlphaBlend(unsigned char fg, unsigned char bg, - double alpha) -{ - double result = bg + (alpha * (fg - bg)); - result = wxMax(result, 0.0); - result = wxMin(result, 255.0); - return (unsigned char)result; -} - -// ChangeLightness() is a utility function that simply darkens -// or lightens a color, based on the specified percentage -// ialpha of 0 would be completely black, 100 completely white -// an ialpha of 100 returns the same colour - -// static -void wxColourBase::ChangeLightness(unsigned char* r, unsigned char* g, unsigned char* b, - int ialpha) -{ - if (ialpha == 100) return; - - // ialpha is 0..200 where 0 is completely black - // and 200 is completely white and 100 is the same - // convert that to normal alpha 0.0 - 1.0 - ialpha = wxMax(ialpha, 0); - ialpha = wxMin(ialpha, 200); - double alpha = ((double)(ialpha - 100.0))/100.0; - - unsigned char bg; - if (ialpha > 100) - { - // blend with white - bg = 255; - alpha = 1.0 - alpha; // 0 = transparent fg; 1 = opaque fg - } - else - { - // blend with black - bg = 0; - alpha = 1.0 + alpha; // 0 = transparent fg; 1 = opaque fg - } - - *r = AlphaBlend(*r, bg, alpha); - *g = AlphaBlend(*g, bg, alpha); - *b = AlphaBlend(*b, bg, alpha); -} - -wxColour wxColourBase::ChangeLightness(int ialpha) const -{ - wxByte r = Red(); - wxByte g = Green(); - wxByte b = Blue(); - ChangeLightness(&r, &g, &b, ialpha); - return wxColour(r,g,b); -} - -// wxColour <-> wxString utilities, used by wxConfig -wxString wxToString(const wxColourBase& col) -{ - return col.IsOk() ? col.GetAsString(wxC2S_CSS_SYNTAX) - : wxString(); -} - -bool wxFromString(const wxString& str, wxColourBase *col) -{ - wxCHECK_MSG( col, false, wxT("NULL output parameter") ); - - if ( str.empty() ) - { - *col = wxNullColour; - return true; - } - - return col->Set(str); -} - - diff --git a/Externals/wxWidgets3/src/common/colourdata.cpp b/Externals/wxWidgets3/src/common/colourdata.cpp deleted file mode 100644 index 3ad774195f..0000000000 --- a/Externals/wxWidgets3/src/common/colourdata.cpp +++ /dev/null @@ -1,180 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/colourdata.cpp -// Author: Julian Smart -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_COLOURDLG || wxUSE_COLOURPICKERCTRL - -#include "wx/colourdata.h" -#include "wx/tokenzr.h" - -// ---------------------------------------------------------------------------- -// wxColourData -// ---------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxColourData, wxObject); - -wxColourData::wxColourData() -{ - m_chooseFull = false; - m_chooseAlpha = false; - m_dataColour.Set(0,0,0); - // m_custColours are wxNullColours initially -} - -wxColourData::wxColourData(const wxColourData& data) - : wxObject() -{ - (*this) = data; -} - -wxColourData::~wxColourData() -{ -} - -void wxColourData::SetCustomColour(int i, const wxColour& colour) -{ - wxCHECK_RET( i >= 0 && i < NUM_CUSTOM, wxT("custom colour index out of range") ); - - m_custColours[i] = colour; -} - -wxColour wxColourData::GetCustomColour(int i) const -{ - wxCHECK_MSG( i >= 0 && i < NUM_CUSTOM, wxColour(0,0,0), - wxT("custom colour index out of range") ); - - return m_custColours[i]; -} - -wxColourData& wxColourData::operator=(const wxColourData& data) -{ - for ( int i = 0; i < NUM_CUSTOM; i++) - m_custColours[i] = data.m_custColours[i]; - - m_dataColour = data.m_dataColour; - m_chooseFull = data.m_chooseFull; - m_chooseAlpha = data.m_chooseAlpha; - - return *this; -} - -// ---------------------------------------------------------------------------- -// [de]serialization -// ---------------------------------------------------------------------------- - -// separator used between different fields -static const char wxCOL_DATA_SEP = ','; - -wxString wxColourData::ToString() const -{ - wxString str(m_chooseFull ? '1' : '0'); - - for ( int i = 0; i < NUM_CUSTOM; i++ ) - { - str += wxCOL_DATA_SEP; - - const wxColour& clr = m_custColours[i]; - if ( clr.IsOk() ) - str += clr.GetAsString(wxC2S_HTML_SYNTAX); - } - - str.Append(wxCOL_DATA_SEP); - str.Append(m_chooseAlpha ? '1' : '0'); - - return str; -} - -bool wxColourData::FromString(const wxString& str) -{ - wxStringTokenizer tokenizer(str, wxCOL_DATA_SEP); - wxString token = tokenizer.GetNextToken(); - m_chooseFull = token == '1'; - bool success = m_chooseFull || token == '0'; - for (int i = 0; success && i < NUM_CUSTOM; i++) - { - token = tokenizer.GetNextToken(); - if (token.empty()) - m_custColours[i] = wxColour(); - else - success = m_custColours[i].Set(token); - } - - if ( success ) - { - token = tokenizer.GetNextToken(); - m_chooseAlpha = token == wxS("1"); - success = m_chooseAlpha || token == wxS("0"); - } - - return success; -} - -#if wxUSE_COLOURDLG - -#include "wx/colordlg.h" - -wxColour wxGetColourFromUser(wxWindow *parent, - const wxColour& colInit, - const wxString& caption, - wxColourData *ptrData) -{ - // contains serialized representation of wxColourData used the last time - // the dialog was shown: we want to reuse it the next time in order to show - // the same custom colours to the user (and we can't just have static - // wxColourData itself because it's a GUI object and so should be destroyed - // before GUI shutdown and doing it during static cleanup is too late) - static wxString s_strColourData; - - wxColourData data; - if ( !ptrData ) - { - ptrData = &data; - if ( !s_strColourData.empty() ) - { - if ( !data.FromString(s_strColourData) ) - { - wxFAIL_MSG( "bug in wxColourData::FromString()?" ); - } - -#ifdef __WXMSW__ - // we don't get back the "choose full" flag value from the native - // dialog and so we can't preserve it between runs, so we decide to - // always use it as it seems better than not using it (user can - // just ignore the extra controls in the dialog but having to click - // a button each time to show them would be very annoying - data.SetChooseFull(true); -#endif // __WXMSW__ - } - } - - if ( colInit.IsOk() ) - { - ptrData->SetColour(colInit); - } - - wxColour colRet; - wxColourDialog dialog(parent, ptrData); - if (!caption.empty()) - dialog.SetTitle(caption); - if ( dialog.ShowModal() == wxID_OK ) - { - *ptrData = dialog.GetColourData(); - colRet = ptrData->GetColour(); - s_strColourData = ptrData->ToString(); - } - //else: leave colRet invalid - - return colRet; -} - -#endif // wxUSE_COLOURDLG -#endif // wxUSE_COLOURDLG || wxUSE_COLOURPICKERCTRL diff --git a/Externals/wxWidgets3/src/common/combocmn.cpp b/Externals/wxWidgets3/src/common/combocmn.cpp deleted file mode 100644 index d451d68c47..0000000000 --- a/Externals/wxWidgets3/src/common/combocmn.cpp +++ /dev/null @@ -1,2984 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/combocmn.cpp -// Purpose: wxComboCtrlBase -// Author: Jaakko Salli -// Modified by: -// Created: Apr-30-2006 -// Copyright: (c) 2005 Jaakko Salli -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include "wx/combo.h" - -#ifdef __WXMSW__ -#include "wx/msw/private.h" -#endif - -#if wxUSE_COMBOBOX -#include "wx/combobox.h" -extern WXDLLEXPORT_DATA(const char) wxComboBoxNameStr[] = "comboBox"; - -// ---------------------------------------------------------------------------- -// XTI -// ---------------------------------------------------------------------------- - -wxDEFINE_FLAGS( wxComboBoxStyle ) -wxBEGIN_FLAGS( wxComboBoxStyle ) -// new style border flags, we put them first to -// use them for streaming out -wxFLAGS_MEMBER(wxBORDER_SIMPLE) -wxFLAGS_MEMBER(wxBORDER_SUNKEN) -wxFLAGS_MEMBER(wxBORDER_DOUBLE) -wxFLAGS_MEMBER(wxBORDER_RAISED) -wxFLAGS_MEMBER(wxBORDER_STATIC) -wxFLAGS_MEMBER(wxBORDER_NONE) - -// old style border flags -wxFLAGS_MEMBER(wxSIMPLE_BORDER) -wxFLAGS_MEMBER(wxSUNKEN_BORDER) -wxFLAGS_MEMBER(wxDOUBLE_BORDER) -wxFLAGS_MEMBER(wxRAISED_BORDER) -wxFLAGS_MEMBER(wxSTATIC_BORDER) -wxFLAGS_MEMBER(wxBORDER) - -// standard window styles -wxFLAGS_MEMBER(wxTAB_TRAVERSAL) -wxFLAGS_MEMBER(wxCLIP_CHILDREN) -wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) -wxFLAGS_MEMBER(wxWANTS_CHARS) -wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE) -wxFLAGS_MEMBER(wxALWAYS_SHOW_SB ) -wxFLAGS_MEMBER(wxVSCROLL) -wxFLAGS_MEMBER(wxHSCROLL) - -wxFLAGS_MEMBER(wxCB_SIMPLE) -wxFLAGS_MEMBER(wxCB_SORT) -wxFLAGS_MEMBER(wxCB_READONLY) -wxFLAGS_MEMBER(wxCB_DROPDOWN) - -wxEND_FLAGS( wxComboBoxStyle ) - -wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxComboBox, wxControl, "wx/combobox.h"); - -wxBEGIN_PROPERTIES_TABLE(wxComboBox) -wxEVENT_PROPERTY( Select, wxEVT_COMBOBOX, wxCommandEvent ) -wxEVENT_PROPERTY( TextEnter, wxEVT_TEXT_ENTER, wxCommandEvent ) - -// TODO DELEGATES -wxPROPERTY( Font, wxFont, SetFont, GetFont, wxEMPTY_PARAMETER_VALUE, \ - 0 /*flags*/, wxT("Helpstring"), wxT("group")) -wxPROPERTY_COLLECTION( Choices, wxArrayString, wxString, AppendString, \ - GetStrings, 0 /*flags*/, wxT("Helpstring"), wxT("group")) -wxPROPERTY( Value,wxString, SetValue, GetValue, wxEMPTY_PARAMETER_VALUE, \ - 0 /*flags*/, wxT("Helpstring"), wxT("group")) -wxPROPERTY( Selection,int, SetSelection, GetSelection, wxEMPTY_PARAMETER_VALUE, \ - 0 /*flags*/, wxT("Helpstring"), wxT("group")) - -wxPROPERTY_FLAGS( WindowStyle, wxComboBoxStyle, long, SetWindowStyleFlag, \ - GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \ - wxT("Helpstring"), wxT("group")) // style -wxEND_PROPERTIES_TABLE() - -wxEMPTY_HANDLERS_TABLE(wxComboBox) - -wxCONSTRUCTOR_5( wxComboBox, wxWindow*, Parent, wxWindowID, Id, \ - wxString, Value, wxPoint, Position, wxSize, Size ) - -#endif // wxUSE_COMBOBOX - -#if wxUSE_COMBOCTRL - -#ifndef WX_PRECOMP - #include "wx/app.h" - #include "wx/log.h" - #include "wx/dcclient.h" - #include "wx/settings.h" - #include "wx/timer.h" - #include "wx/textctrl.h" -#endif - -#include "wx/tooltip.h" - -// constants -// ---------------------------------------------------------------------------- - -#define DEFAULT_DROPBUTTON_WIDTH 19 - -#define BMP_BUTTON_MARGIN 4 - -#define DEFAULT_POPUP_HEIGHT 400 - -#define DEFAULT_TEXT_INDENT 3 - -#define COMBO_MARGIN 2 // spacing right of wxTextCtrl - - -#if defined(__WXMSW__) - -// Let's use wxFrame as a fall-back solution until wxMSW gets wxNonOwnedWindow -#include "wx/frame.h" -#define wxCC_GENERIC_TLW_IS_FRAME -#define wxComboCtrlGenericTLW wxFrame - -#define USE_TRANSIENT_POPUP 1 // Use wxPopupWindowTransient (preferred, if it works properly on platform) -#define TRANSIENT_POPUPWIN_IS_PERFECT 0 // wxPopupTransientWindow works, its child can have focus, and common - // native controls work on it like normal. -#define POPUPWIN_IS_PERFECT 0 // Same, but for non-transient popup window. -#define TEXTCTRL_TEXT_CENTERED 0 // 1 if text in textctrl is vertically centered -#define FOCUS_RING 0 // No focus ring on wxMSW - -//#undef wxUSE_POPUPWIN -//#define wxUSE_POPUPWIN 0 - -#elif defined(__WXGTK__) - -// NB: It is not recommended to use wxDialog as popup on wxGTK, because of -// this bug: If wxDialog is hidden, its position becomes corrupt -// between hide and next show, but without internal coordinates being -// reflected (or something like that - atleast commenting out ->Hide() -// seemed to eliminate the position change). - -#include "wx/dialog.h" -#define wxComboCtrlGenericTLW wxDialog - -#if defined(__WXGTK20__) -# include "wx/gtk/private.h" -#else -# include "wx/gtk1/private.h" -#endif - -// NB: Let's not be afraid to use wxGTK's wxPopupTransientWindow as a -// 'perfect' popup, as it can successfully host child controls even in -// popups that are shown in modal dialogs. - -#define USE_TRANSIENT_POPUP 1 // Use wxPopupWindowTransient (preferred, if it works properly on platform) -#define TRANSIENT_POPUPWIN_IS_PERFECT 1 // wxPopupTransientWindow works, its child can have focus, and common - // native controls work on it like normal. -#define POPUPWIN_IS_PERFECT 1 // Same, but for non-transient popup window. -#define TEXTCTRL_TEXT_CENTERED 1 // 1 if text in textctrl is vertically centered -#define FOCUS_RING 0 // No focus ring on wxGTK - -#elif defined(__WXMAC__) - -#include "wx/nonownedwnd.h" -#define wxCC_GENERIC_TLW_IS_NONOWNEDWINDOW -#define wxComboCtrlGenericTLW wxNonOwnedWindow - -#define USE_TRANSIENT_POPUP 1 // Use wxPopupWindowTransient (preferred, if it works properly on platform) -#define TRANSIENT_POPUPWIN_IS_PERFECT 1 // wxPopupTransientWindow works, its child can have focus, and common - // native controls work on it like normal. -#define POPUPWIN_IS_PERFECT 1 // Same, but for non-transient popup window. -#define TEXTCTRL_TEXT_CENTERED 1 // 1 if text in textctrl is vertically centered -#define FOCUS_RING 3 // Reserve room for the textctrl's focus ring to display - -#undef DEFAULT_DROPBUTTON_WIDTH -#define DEFAULT_DROPBUTTON_WIDTH 22 -#undef COMBO_MARGIN -#define COMBO_MARGIN FOCUS_RING - -#else - -#include "wx/dialog.h" -#define wxComboCtrlGenericTLW wxDialog - -#define USE_TRANSIENT_POPUP 0 // Use wxPopupWindowTransient (preferred, if it works properly on platform) -#define TRANSIENT_POPUPWIN_IS_PERFECT 0 // wxPopupTransientWindow works, its child can have focus, and common - // native controls work on it like normal. -#define POPUPWIN_IS_PERFECT 0 // Same, but for non-transient popup window. -#define TEXTCTRL_TEXT_CENTERED 1 // 1 if text in textctrl is vertically centered -#define FOCUS_RING 0 - -#endif - - -// Popupwin is really only supported on wxMSW and wxGTK, regardless -// what the wxUSE_POPUPWIN says. -// FIXME: Why isn't wxUSE_POPUPWIN reliable any longer? (it was in wxW2.6.2) -#if (!defined(__WXMSW__) && !defined(__WXGTK__) && !defined(__WXMAC__)) -#undef wxUSE_POPUPWIN -#define wxUSE_POPUPWIN 0 -#endif - - -#if wxUSE_POPUPWIN - #include "wx/popupwin.h" -#else - #undef USE_TRANSIENT_POPUP - #define USE_TRANSIENT_POPUP 0 -#endif - - -// Define different types of popup windows -enum -{ - POPUPWIN_NONE = 0, - POPUPWIN_WXPOPUPTRANSIENTWINDOW = 1, - POPUPWIN_WXPOPUPWINDOW = 2, - POPUPWIN_GENERICTLW = 3 -}; - - -#if USE_TRANSIENT_POPUP - // wxPopupTransientWindow is implemented - - #define wxComboPopupWindowBase wxPopupTransientWindow - #define PRIMARY_POPUP_TYPE POPUPWIN_WXPOPUPTRANSIENTWINDOW - #define USES_WXPOPUPTRANSIENTWINDOW 1 - - #if TRANSIENT_POPUPWIN_IS_PERFECT - // - #elif POPUPWIN_IS_PERFECT - #define wxComboPopupWindowBase2 wxPopupWindow - #define SECONDARY_POPUP_TYPE POPUPWIN_WXPOPUPWINDOW - #define USES_WXPOPUPWINDOW 1 - #else - #define wxComboPopupWindowBase2 wxComboCtrlGenericTLW - #define SECONDARY_POPUP_TYPE POPUPWIN_GENERICTLW - #define USES_GENERICTLW 1 - #endif - -#elif wxUSE_POPUPWIN - // wxPopupWindow (but not wxPopupTransientWindow) is properly implemented - - #define wxComboPopupWindowBase wxPopupWindow - #define PRIMARY_POPUP_TYPE POPUPWIN_WXPOPUPWINDOW - #define USES_WXPOPUPWINDOW 1 - - #if !POPUPWIN_IS_PERFECT - #define wxComboPopupWindowBase2 wxComboCtrlGenericTLW - #define SECONDARY_POPUP_TYPE POPUPWIN_GENERICTLW - #define USES_GENERICTLW 1 - #endif - -#else - // wxPopupWindow is not implemented - - #define wxComboPopupWindowBase wxComboCtrlGenericTLW - #define PRIMARY_POPUP_TYPE POPUPWIN_GENERICTLW - #define USES_GENERICTLW 1 - -#endif - - -#ifndef USES_WXPOPUPTRANSIENTWINDOW - #define USES_WXPOPUPTRANSIENTWINDOW 0 -#endif - -#ifndef USES_WXPOPUPWINDOW - #define USES_WXPOPUPWINDOW 0 -#endif - -#ifndef USES_GENERICTLW - #define USES_GENERICTLW 0 -#endif - - -#if USES_WXPOPUPWINDOW - #define INSTALL_TOPLEV_HANDLER 1 -#else - #define INSTALL_TOPLEV_HANDLER 0 -#endif - - -// Returns true if given popup window type can be classified as perfect -// on this platform. -static inline bool IsPopupWinTypePerfect( wxByte popupWinType ) -{ -#if POPUPWIN_IS_PERFECT && TRANSIENT_POPUPWIN_IS_PERFECT - wxUnusedVar(popupWinType); - return true; -#else - return ( popupWinType == POPUPWIN_GENERICTLW - #if POPUPWIN_IS_PERFECT - || popupWinType == POPUPWIN_WXPOPUPWINDOW - #endif - #if TRANSIENT_POPUPWIN_IS_PERFECT - || popupWinType == POPUPWIN_WXPOPUPTRANSIENTWINDOW - #endif - ); -#endif -} - - -// -// ** TODO ** -// * wxComboPopupWindow for external use (ie. replace old wxUniv wxPopupComboWindow) -// - - -// ---------------------------------------------------------------------------- -// wxComboFrameEventHandler takes care of hiding the popup when events happen -// in its top level parent. -// ---------------------------------------------------------------------------- - -#if INSTALL_TOPLEV_HANDLER - -// -// This will no longer be necessary after wxTransientPopupWindow -// works well on all platforms. -// - -class wxComboFrameEventHandler : public wxEvtHandler -{ -public: - wxComboFrameEventHandler( wxComboCtrlBase* pCb ); - virtual ~wxComboFrameEventHandler(); - - void OnPopup(); - - void OnIdle( wxIdleEvent& event ); - void OnMouseEvent( wxMouseEvent& event ); - void OnActivate( wxActivateEvent& event ); - void OnResize( wxSizeEvent& event ); - void OnMove( wxMoveEvent& event ); - void OnMenuEvent( wxMenuEvent& event ); - void OnClose( wxCloseEvent& event ); - -protected: - wxWindow* m_focusStart; - wxComboCtrlBase* m_combo; - -private: - wxDECLARE_EVENT_TABLE(); -}; - -wxBEGIN_EVENT_TABLE(wxComboFrameEventHandler, wxEvtHandler) - EVT_IDLE(wxComboFrameEventHandler::OnIdle) - EVT_LEFT_DOWN(wxComboFrameEventHandler::OnMouseEvent) - EVT_RIGHT_DOWN(wxComboFrameEventHandler::OnMouseEvent) - EVT_SIZE(wxComboFrameEventHandler::OnResize) - EVT_MOVE(wxComboFrameEventHandler::OnMove) - EVT_MENU_HIGHLIGHT(wxID_ANY,wxComboFrameEventHandler::OnMenuEvent) - EVT_MENU_OPEN(wxComboFrameEventHandler::OnMenuEvent) - EVT_ACTIVATE(wxComboFrameEventHandler::OnActivate) - EVT_CLOSE(wxComboFrameEventHandler::OnClose) -wxEND_EVENT_TABLE() - -wxComboFrameEventHandler::wxComboFrameEventHandler( wxComboCtrlBase* combo ) - : wxEvtHandler() -{ - m_combo = combo; -} - -wxComboFrameEventHandler::~wxComboFrameEventHandler() -{ -} - -void wxComboFrameEventHandler::OnPopup() -{ - m_focusStart = ::wxWindow::FindFocus(); -} - -void wxComboFrameEventHandler::OnIdle( wxIdleEvent& event ) -{ - wxWindow* winFocused = ::wxWindow::FindFocus(); - - wxWindow* popup = m_combo->GetPopupControl()->GetControl(); - wxWindow* winpopup = m_combo->GetPopupWindow(); - - if ( !winFocused || ( - winFocused != m_focusStart && - winFocused != popup && - winFocused->GetParent() != popup && - winFocused != winpopup && - winFocused->GetParent() != winpopup && - winFocused != m_combo && - winFocused != m_combo->GetButton() // GTK (atleast) requires this - ) - ) - { - m_combo->HidePopup(true); - } - - event.Skip(); -} - -void wxComboFrameEventHandler::OnMenuEvent( wxMenuEvent& event ) -{ - m_combo->HidePopup(true); - event.Skip(); -} - -void wxComboFrameEventHandler::OnMouseEvent( wxMouseEvent& event ) -{ - m_combo->HidePopup(true); - event.Skip(); -} - -void wxComboFrameEventHandler::OnClose( wxCloseEvent& event ) -{ - m_combo->HidePopup(true); - event.Skip(); -} - -void wxComboFrameEventHandler::OnActivate( wxActivateEvent& event ) -{ - m_combo->HidePopup(true); - event.Skip(); -} - -void wxComboFrameEventHandler::OnResize( wxSizeEvent& event ) -{ - m_combo->HidePopup(true); - event.Skip(); -} - -void wxComboFrameEventHandler::OnMove( wxMoveEvent& event ) -{ - m_combo->HidePopup(true); - event.Skip(); -} - -#endif // INSTALL_TOPLEV_HANDLER - -// ---------------------------------------------------------------------------- -// wxComboPopupWindow is, in essence, wxPopupWindow customized for -// wxComboCtrl. -// ---------------------------------------------------------------------------- - -class wxComboPopupWindow : public wxComboPopupWindowBase -{ -public: - - wxComboPopupWindow( wxComboCtrlBase *parent, - int style ) - #if USES_WXPOPUPWINDOW || USES_WXPOPUPTRANSIENTWINDOW - : wxComboPopupWindowBase(parent,style) - #else - : wxComboPopupWindowBase(parent, - wxID_ANY, - wxEmptyString, - wxPoint(-21,-21), - wxSize(20,20), - style) - #endif - { - m_inShow = 0; - } - -#if USES_WXPOPUPTRANSIENTWINDOW - virtual bool Show( bool show ) wxOVERRIDE; - virtual bool ProcessLeftDown(wxMouseEvent& event) wxOVERRIDE; -protected: - virtual void OnDismiss() wxOVERRIDE; -#endif - -private: - wxByte m_inShow; -}; - - -#if USES_WXPOPUPTRANSIENTWINDOW -bool wxComboPopupWindow::Show( bool show ) -{ - // Guard against recursion - if ( m_inShow ) - return wxComboPopupWindowBase::Show(show); - - m_inShow++; - - wxPopupTransientWindow* const - ptw = static_cast(this); - - if ( show != ptw->IsShown() ) - { - if ( show ) - // We used to do wxPopupTransientWindow::Popup here, - // but this would hide normal Show, which we are - // also going to need. - ptw->Show(); - else - ptw->Dismiss(); - } - - m_inShow--; - - return true; -} - -bool wxComboPopupWindow::ProcessLeftDown(wxMouseEvent& event) -{ - return wxPopupTransientWindow::ProcessLeftDown(event); -} - -// First thing that happens when a transient popup closes is that this method gets called. -void wxComboPopupWindow::OnDismiss() -{ - wxComboCtrlBase* combo = (wxComboCtrlBase*) GetParent(); - wxASSERT_MSG( wxDynamicCast(combo, wxComboCtrlBase), - wxT("parent might not be wxComboCtrl, but check wxIMPLEMENT_DYNAMIC_CLASS2() macro for correctness") ); - - combo->OnPopupDismiss(true); -} -#endif // USES_WXPOPUPTRANSIENTWINDOW - - -// ---------------------------------------------------------------------------- -// wxComboPopupWindowEvtHandler does bulk of the custom event handling -// of a popup window. It is separate so we can have different types -// of popup windows. -// ---------------------------------------------------------------------------- - -class wxComboPopupWindowEvtHandler : public wxEvtHandler -{ -public: - - wxComboPopupWindowEvtHandler( wxComboCtrlBase *parent ) - { - m_combo = parent; - } - - void OnSizeEvent( wxSizeEvent& event ); - void OnKeyEvent(wxKeyEvent& event); -#if USES_GENERICTLW - void OnActivate( wxActivateEvent& event ); -#endif - -private: - wxComboCtrlBase* m_combo; - - wxDECLARE_EVENT_TABLE(); -}; - - -wxBEGIN_EVENT_TABLE(wxComboPopupWindowEvtHandler, wxEvtHandler) - EVT_KEY_DOWN(wxComboPopupWindowEvtHandler::OnKeyEvent) - EVT_KEY_UP(wxComboPopupWindowEvtHandler::OnKeyEvent) - EVT_CHAR(wxComboPopupWindowEvtHandler::OnKeyEvent) -#if USES_GENERICTLW - EVT_ACTIVATE(wxComboPopupWindowEvtHandler::OnActivate) -#endif - EVT_SIZE(wxComboPopupWindowEvtHandler::OnSizeEvent) -wxEND_EVENT_TABLE() - - -void wxComboPopupWindowEvtHandler::OnSizeEvent( wxSizeEvent& WXUNUSED(event) ) -{ - // Block the event so that the popup control does not get auto-resized. -} - -void wxComboPopupWindowEvtHandler::OnKeyEvent( wxKeyEvent& event ) -{ - // Relay keyboard event to the main child controls - wxWindowList children = m_combo->GetPopupWindow()->GetChildren(); - wxWindowList::iterator node = children.begin(); - wxWindow* child = (wxWindow*)*node; - child->GetEventHandler()->ProcessEvent(event); -} - -#if USES_GENERICTLW -void wxComboPopupWindowEvtHandler::OnActivate( wxActivateEvent& event ) -{ - if ( !event.GetActive() ) - { - // Tell combo control that we are dismissed. - m_combo->HidePopup(true); - - event.Skip(); - } -} -#endif - - -// ---------------------------------------------------------------------------- -// wxComboPopup -// -// ---------------------------------------------------------------------------- - -wxComboPopup::~wxComboPopup() -{ -} - -void wxComboPopup::OnPopup() -{ -} - -void wxComboPopup::OnDismiss() -{ -} - -wxComboCtrl* wxComboPopup::GetComboCtrl() const -{ - return wxStaticCast(m_combo, wxComboCtrl); -} - -wxSize wxComboPopup::GetAdjustedSize( int minWidth, - int prefHeight, - int WXUNUSED(maxHeight) ) -{ - return wxSize(minWidth,prefHeight); -} - -void wxComboPopup::DefaultPaintComboControl( wxComboCtrlBase* combo, - wxDC& dc, const wxRect& rect ) -{ - if ( combo->GetWindowStyle() & wxCB_READONLY ) // ie. no textctrl - { - combo->PrepareBackground(dc,rect,0); - - dc.DrawText( combo->GetValue(), - rect.x + combo->m_marginLeft, - (rect.height-dc.GetCharHeight())/2 + rect.y ); - } -} - -void wxComboPopup::PaintComboControl( wxDC& dc, const wxRect& rect ) -{ - DefaultPaintComboControl(m_combo,dc,rect); -} - -void wxComboPopup::OnComboKeyEvent( wxKeyEvent& event ) -{ - event.Skip(); -} - -void wxComboPopup::OnComboCharEvent( wxKeyEvent& event ) -{ - event.Skip(); -} - -void wxComboPopup::OnComboDoubleClick() -{ -} - -void wxComboPopup::SetStringValue( const wxString& WXUNUSED(value) ) -{ -} - -bool wxComboPopup::FindItem(const wxString& WXUNUSED(item), - wxString* WXUNUSED(trueItem)) -{ - return true; -} - -bool wxComboPopup::LazyCreate() -{ - return false; -} - -void wxComboPopup::Dismiss() -{ - m_combo->HidePopup(true); -} - -void wxComboPopup::DestroyPopup() -{ - // Here we make sure that the popup control's Destroy() gets called. - // This is necessary for the wxPersistentWindow to work properly. - wxWindow* popupCtrl = GetControl(); - if ( popupCtrl ) - { - // While all wxComboCtrl examples have m_popupInterface and - // popupCtrl as the same class (that will be deleted via the - // Destroy() call below), it is technically still possible to - // have implementations where they are in fact not same - // multiple-inherited class. Here we use C++ RTTI to check for - // this rare case. - #ifndef wxNO_RTTI - // It is probably better to delete m_popupInterface first, so - // that it retains access to its popup control window. - if ( dynamic_cast(this) != - dynamic_cast(popupCtrl) ) - delete this; - #endif - popupCtrl->Destroy(); - } - else - { - delete this; - } -} - -// ---------------------------------------------------------------------------- -// input handling -// ---------------------------------------------------------------------------- - -// -// This is pushed to the event handler queue of the child textctrl. -// -class wxComboBoxExtraInputHandler : public wxEvtHandler -{ -public: - - wxComboBoxExtraInputHandler( wxComboCtrlBase* combo ) - : wxEvtHandler() - { - m_combo = combo; - } - virtual ~wxComboBoxExtraInputHandler() { } - void OnKey(wxKeyEvent& event); - void OnFocus(wxFocusEvent& event); - -protected: - wxComboCtrlBase* m_combo; - -private: - wxDECLARE_EVENT_TABLE(); -}; - - -wxBEGIN_EVENT_TABLE(wxComboBoxExtraInputHandler, wxEvtHandler) - EVT_KEY_DOWN(wxComboBoxExtraInputHandler::OnKey) - EVT_KEY_UP(wxComboBoxExtraInputHandler::OnKey) - EVT_CHAR(wxComboBoxExtraInputHandler::OnKey) - EVT_SET_FOCUS(wxComboBoxExtraInputHandler::OnFocus) - EVT_KILL_FOCUS(wxComboBoxExtraInputHandler::OnFocus) -wxEND_EVENT_TABLE() - - -void wxComboBoxExtraInputHandler::OnKey(wxKeyEvent& event) -{ - // Let the wxComboCtrl event handler have a go first. - wxComboCtrlBase* combo = m_combo; - - wxKeyEvent redirectedEvent(event); - redirectedEvent.SetId(combo->GetId()); - redirectedEvent.SetEventObject(combo); - - if ( !combo->GetEventHandler()->ProcessEvent(redirectedEvent) ) - { - // Don't let TAB through to the text ctrl - looks ugly - if ( event.GetKeyCode() != WXK_TAB ) - event.Skip(); - } -} - -void wxComboBoxExtraInputHandler::OnFocus(wxFocusEvent& event) -{ - // FIXME: This code does run when control is clicked, - // yet on Windows it doesn't select all the text. - if ( event.GetEventType() == wxEVT_SET_FOCUS && - !(m_combo->GetInternalFlags() & wxCC_NO_TEXT_AUTO_SELECT) ) - { - if ( m_combo->GetTextCtrl() ) - m_combo->GetTextCtrl()->SelectAll(); - else - m_combo->SelectAll(); - } - - // Send focus indication to parent. - // NB: This is needed for cases where the textctrl gets focus - // instead of its parent. While this may trigger multiple - // wxEVT_SET_FOCUSes (since m_text->SetFocus is called - // from combo's focus event handler), they should be quite - // harmless. - wxFocusEvent evt2(event); - evt2.SetId(m_combo->GetId()); - evt2.SetEventObject(m_combo); - m_combo->GetEventHandler()->ProcessEvent(evt2); - - event.Skip(); -} - - -// -// This is pushed to the event handler queue of the control in popup. -// - -class wxComboPopupEvtHandler : public wxEvtHandler -{ -public: - - wxComboPopupEvtHandler( wxComboCtrlBase* combo ) - : wxEvtHandler() - { - m_combo = combo; - m_beenInside = false; - - // Let's make it so that the popup control will not receive mouse - // events until mouse left button has been up. - m_blockEventsToPopup = true; - } - virtual ~wxComboPopupEvtHandler() { } - - void OnMouseEvent( wxMouseEvent& event ); - - // Called from wxComboCtrlBase::OnPopupDismiss - void OnPopupDismiss() - { - m_beenInside = false; - m_blockEventsToPopup = true; - } - -protected: - wxComboCtrlBase* m_combo; - - bool m_beenInside; - bool m_blockEventsToPopup; - -private: - wxDECLARE_EVENT_TABLE(); -}; - - -wxBEGIN_EVENT_TABLE(wxComboPopupEvtHandler, wxEvtHandler) - EVT_MOUSE_EVENTS(wxComboPopupEvtHandler::OnMouseEvent) -wxEND_EVENT_TABLE() - - -void wxComboPopupEvtHandler::OnMouseEvent( wxMouseEvent& event ) -{ - wxPoint pt = event.GetPosition(); - wxSize sz = m_combo->GetPopupControl()->GetControl()->GetClientSize(); - int evtType = event.GetEventType(); - bool isInside = pt.x >= 0 && pt.y >= 0 && pt.x < sz.x && pt.y < sz.y; - bool relayToButton = false; - - event.Skip(); - - if ( !isInside || !m_combo->IsPopupShown() ) - { - // Mouse is outside the popup or popup is not actually shown (yet) - - if ( evtType == wxEVT_MOTION || - evtType == wxEVT_LEFT_DOWN || - evtType == wxEVT_LEFT_UP || - evtType == wxEVT_RIGHT_DOWN ) - { - // Block motion and click events outside the popup - event.Skip(false); - } - } - else - { - // Mouse is inside the popup, which is fully shown - - m_beenInside = true; - - // Do not let the popup control respond to mouse events until - // mouse press used to display the popup has been lifted. This - // is important for users with slower mouse fingers or mouse - // drivers. Note that we have some redundancy here, just in - // case the popup is some native control that does not emit all - // mouse event types. - if ( evtType == wxEVT_MOTION ) - { - if ( m_blockEventsToPopup ) - { - if ( event.LeftIsDown() ) - event.Skip(false); - else - m_blockEventsToPopup = false; - } - } - else if ( evtType == wxEVT_LEFT_DOWN ) - { - if ( m_blockEventsToPopup ) - m_blockEventsToPopup = false; - } - else if ( evtType == wxEVT_LEFT_UP ) - { - if ( m_blockEventsToPopup ) - { - // On first left up, stop blocking mouse events (but still - // block this one) - m_blockEventsToPopup = false; - event.Skip(false); - - // Also, this button press was (probably) used to display - // the popup, so relay it back to the drop-down button - // (which supposedly originated it). This is necessary to - // refresh it properly. - relayToButton = true; - } - } - else if ( m_blockEventsToPopup ) - { - event.Skip(false); - } - } - - // - // Some mouse events to popup that happen outside it, before cursor - // has been inside the popup, need to be ignored by it but relayed to - // the dropbutton. - // - if ( evtType == wxEVT_LEFT_UP ) - { - if ( !m_combo->IsPopupShown() ) - { - event.Skip(false); - relayToButton = true; - } - else if ( !isInside && !m_beenInside ) - { - // Popup is shown but the cursor is not inside, nor it has been - relayToButton = true; - } - } - - if ( relayToButton ) - { - wxWindow* btn = m_combo->GetButton(); - if ( btn ) - btn->GetEventHandler()->ProcessEvent(event); - else - // Bypass the event handling mechanism. Using it would be - // confusing for the platform-specific wxComboCtrl - // implementations. - m_combo->HandleButtonMouseEvent(event, 0); - } -} - -// ---------------------------------------------------------------------------- -// wxComboCtrlTextCtrl -// ---------------------------------------------------------------------------- - -class wxComboCtrlTextCtrl : public wxTextCtrl -{ -public: - wxComboCtrlTextCtrl() : wxTextCtrl() { } - virtual ~wxComboCtrlTextCtrl() { } - - virtual wxWindow *GetMainWindowOfCompositeControl() wxOVERRIDE - { - wxComboCtrl* combo = (wxComboCtrl*) GetParent(); - - // Returning this instead of just 'parent' lets FindFocus work - // correctly even when parent control is a child of a composite - // generic control (as is case with wxGenericDatePickerCtrl). - return combo->GetMainWindowOfCompositeControl(); - } -}; - -// ---------------------------------------------------------------------------- -// wxComboCtrlBase -// ---------------------------------------------------------------------------- - - -wxBEGIN_EVENT_TABLE(wxComboCtrlBase, wxControl) - EVT_SIZE(wxComboCtrlBase::OnSizeEvent) - EVT_SET_FOCUS(wxComboCtrlBase::OnFocusEvent) - EVT_KILL_FOCUS(wxComboCtrlBase::OnFocusEvent) - EVT_IDLE(wxComboCtrlBase::OnIdleEvent) - //EVT_BUTTON(wxID_ANY,wxComboCtrlBase::OnButtonClickEvent) - EVT_KEY_DOWN(wxComboCtrlBase::OnKeyEvent) - EVT_CHAR(wxComboCtrlBase::OnCharEvent) - EVT_SYS_COLOUR_CHANGED(wxComboCtrlBase::OnSysColourChanged) -wxEND_EVENT_TABLE() - - -wxIMPLEMENT_ABSTRACT_CLASS(wxComboCtrlBase, wxControl); - -void wxComboCtrlBase::Init() -{ - m_winPopup = NULL; - m_popup = NULL; - m_popupWinState = Hidden; - m_btn = NULL; - m_text = NULL; - m_popupInterface = NULL; - - m_popupEvtHandler = NULL; - m_textEvtHandler = NULL; - -#if INSTALL_TOPLEV_HANDLER - m_toplevEvtHandler = NULL; -#endif - - m_mainCtrlWnd = this; - - m_heightPopup = -1; - m_widthMinPopup = -1; - m_anchorSide = 0; - m_widthCustomPaint = 0; - m_widthCustomBorder = 0; - - m_btnState = 0; - m_btnWidDefault = 0; - m_blankButtonBg = false; - m_ignoreEvtText = 0; - m_popupWinType = POPUPWIN_NONE; - m_btnWid = m_btnHei = -1; - m_btnSide = wxRIGHT; - m_btnSpacingX = 0; - - m_extLeft = 0; - m_extRight = 0; - m_marginLeft = -1; - m_iFlags = 0; - m_textCtrlStyle = 0; - m_timeCanAcceptClick = 0; - - m_resetFocus = false; - m_hasTcBgCol = false; -} - -bool wxComboCtrlBase::Create(wxWindow *parent, - wxWindowID id, - const wxString& value, - const wxPoint& pos, - const wxSize& size, - long style, - const wxValidator& validator, - const wxString& name) -{ - if ( !wxControl::Create(parent, - id, - pos, - size, - style | wxWANTS_CHARS, - validator, - name) ) - return false; - - m_valueString = value; - - // Get colours - OnThemeChange(); - m_marginLeft = GetNativeTextIndent(); - - m_iFlags |= wxCC_IFLAG_CREATED; - - // If x and y indicate valid size, wxSizeEvent won't be - // emitted automatically, so we need to add artificial one. - if ( size.x > 0 && size.y > 0 ) - { - wxSizeEvent evt(size,GetId()); - evt.SetEventObject(this); - GetEventHandler()->AddPendingEvent(evt); - } - - return true; -} - -void wxComboCtrlBase::InstallInputHandlers() -{ - if ( m_text ) - { - m_textEvtHandler = new wxComboBoxExtraInputHandler(this); - m_text->PushEventHandler(m_textEvtHandler); - } -} - -void -wxComboCtrlBase::CreateTextCtrl(int style) -{ - if ( !(m_windowStyle & wxCB_READONLY) ) - { - if ( m_text ) - m_text->Destroy(); - - // wxTE_PROCESS_TAB is needed because on Windows, wxTAB_TRAVERSAL is - // not used by the wxPropertyGrid and therefore the tab is processed by - // looking at ancestors to see if they have wxTAB_TRAVERSAL. The - // navigation event is then sent to the wrong window. - style |= wxTE_PROCESS_TAB | m_textCtrlStyle; - - if ( HasFlag(wxTE_PROCESS_ENTER) ) - style |= wxTE_PROCESS_ENTER; - - // Ignore EVT_TEXT generated by the constructor (but only - // if the event redirector already exists) - // NB: This must be " = 1" instead of "++"; - if ( m_textEvtHandler ) - m_ignoreEvtText = 1; - else - m_ignoreEvtText = 0; - - m_text = new wxComboCtrlTextCtrl(); - m_text->Create(this, wxID_ANY, m_valueString, - wxDefaultPosition, wxSize(10,-1), - style); - - // Connecting the events is currently the most reliable way - wxWindowID id = m_text->GetId(); - m_text->Connect(id, wxEVT_TEXT, - wxCommandEventHandler(wxComboCtrlBase::OnTextCtrlEvent), - NULL, this); - if ( style & wxTE_PROCESS_ENTER ) - { - m_text->Connect(id, wxEVT_TEXT_ENTER, - wxCommandEventHandler(wxComboCtrlBase::OnTextCtrlEvent), - NULL, this); - } - - m_text->SetHint(m_hintText); - } -} - -void wxComboCtrlBase::OnThemeChange() -{ - // Because wxComboCtrl has transparent parts on most platforms, we - // don't want to touch the actual background colour. Instead, we just - // usually re-obtain m_tcBgCol here. - -#if defined(__WXMSW__) || defined(__WXGTK__) - wxVisualAttributes vattrs = wxComboBox::GetClassDefaultAttributes(); -#else - wxVisualAttributes vattrs; - vattrs.colFg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT); - vattrs.colBg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW); -#endif - - if ( !m_hasTcBgCol ) - m_tcBgCol = vattrs.colBg; - -#ifndef __WXMAC__ - // Only change the colours if application has not specified - // custom ones. - if ( !m_hasFgCol ) - { - SetOwnForegroundColour(vattrs.colFg); - } - if ( !HasTransparentBackground() ) - { - SetOwnBackgroundColour(GetParent()->GetBackgroundColour()); - } -#endif // !__WXMAC__ -} - -wxComboCtrlBase::~wxComboCtrlBase() -{ - if ( HasCapture() ) - ReleaseMouse(); - -#if INSTALL_TOPLEV_HANDLER - delete ((wxComboFrameEventHandler*)m_toplevEvtHandler); - m_toplevEvtHandler = NULL; -#endif - - DestroyPopup(); - - if ( m_text ) - m_text->RemoveEventHandler(m_textEvtHandler); - - delete m_textEvtHandler; -} - - -// ---------------------------------------------------------------------------- -// geometry stuff -// ---------------------------------------------------------------------------- - -// Recalculates button and textctrl areas -void wxComboCtrlBase::CalculateAreas( int btnWidth ) -{ - wxSize sz = GetClientSize(); - int customBorder = m_widthCustomBorder; - int btnBorder; // border for button only - - // check if button should really be outside the border: we'll do it it if - // its platform default or bitmap+pushbutton background is used, but not if - // there is vertical size adjustment or horizontal spacing. - if ( ( (m_iFlags & wxCC_BUTTON_OUTSIDE_BORDER) || - (m_bmpNormal.IsOk() && m_blankButtonBg) ) && - m_btnSpacingX == 0 && - m_btnHei <= 0 ) - { - m_iFlags |= wxCC_IFLAG_BUTTON_OUTSIDE; - btnBorder = 0; - } - else if ( (m_iFlags & wxCC_BUTTON_COVERS_BORDER) && - m_btnSpacingX == 0 && !m_bmpNormal.IsOk() ) - { - m_iFlags &= ~(wxCC_IFLAG_BUTTON_OUTSIDE); - btnBorder = 0; - } - else - { - m_iFlags &= ~(wxCC_IFLAG_BUTTON_OUTSIDE); - btnBorder = customBorder; - } - - // Defaul indentation - if ( m_marginLeft < 0 ) - m_marginLeft = GetNativeTextIndent(); - - int butWidth = btnWidth; - - if ( butWidth <= 0 ) - butWidth = m_btnWidDefault; - else - m_btnWidDefault = butWidth; - - if ( butWidth <= 0 ) - return; - - int butHeight = sz.y - btnBorder*2; - - // Adjust button width - if ( m_btnWid > 0 ) - butWidth = m_btnWid; - else - { - // Adjust button width to match aspect ratio - // (but only if control is smaller than best size). - int bestHeight = GetBestSize().y; - int height = GetSize().y; - - if ( height < bestHeight ) - { - // Make very small buttons square, as it makes - // them accommodate arrow image better and still - // looks decent. - if ( height > FromDIP(18) ) - butWidth = (height*butWidth)/bestHeight; - else - butWidth = butHeight; - } - } - - // Adjust button height - if ( m_btnHei > 0 ) - butHeight = m_btnHei; - - // Use size of normal bitmap if... - // It is larger - // OR - // button width is set to default and blank button bg is not drawn - if ( m_bmpNormal.IsOk() ) - { - int bmpReqWidth = m_bmpNormal.GetWidth(); - int bmpReqHeight = m_bmpNormal.GetHeight(); - - // If drawing blank button background, we need to add some margin. - if ( m_blankButtonBg ) - { - bmpReqWidth += BMP_BUTTON_MARGIN*2; - bmpReqHeight += BMP_BUTTON_MARGIN*2; - } - - if ( butWidth < bmpReqWidth || ( m_btnWid == 0 && !m_blankButtonBg ) ) - butWidth = bmpReqWidth; - if ( butHeight < bmpReqHeight || ( m_btnHei == 0 && !m_blankButtonBg ) ) - butHeight = bmpReqHeight; - - // Need to fix height? - if ( (sz.y-(customBorder*2)) < butHeight && btnWidth == 0 ) - { - int newY = butHeight+(customBorder*2); - SetClientSize(wxDefaultCoord,newY); - if ( m_bmpNormal.IsOk() || m_btnArea.width != butWidth || m_btnArea.height != butHeight ) - m_iFlags |= wxCC_IFLAG_HAS_NONSTANDARD_BUTTON; - else - m_iFlags &= ~wxCC_IFLAG_HAS_NONSTANDARD_BUTTON; - - sz.y = newY; - } - } - - int butAreaWid = butWidth + (m_btnSpacingX*2); - - m_btnSize.x = butWidth; - m_btnSize.y = butHeight; - - m_btnArea.x = ( m_btnSide==wxRIGHT ? sz.x - butAreaWid - btnBorder : btnBorder ); - m_btnArea.y = btnBorder + FOCUS_RING; - m_btnArea.width = butAreaWid; - m_btnArea.height = sz.y - ((btnBorder+FOCUS_RING)*2); - - m_tcArea.x = ( m_btnSide==wxRIGHT ? 0 : butAreaWid ) + customBorder; - m_tcArea.y = customBorder + FOCUS_RING; - m_tcArea.width = sz.x - butAreaWid - (customBorder*2) - FOCUS_RING; - m_tcArea.height = sz.y - ((customBorder+FOCUS_RING)*2); - -/* - if ( m_text ) - { - ::wxMessageBox(wxString::Format(wxT("ButtonArea (%i,%i,%i,%i)\n"),m_btnArea.x,m_btnArea.y,m_btnArea.width,m_btnArea.height) + - wxString::Format(wxT("TextCtrlArea (%i,%i,%i,%i)"),m_tcArea.x,m_tcArea.y,m_tcArea.width,m_tcArea.height)); - } -*/ -} - -void wxComboCtrlBase::PositionTextCtrl( int textCtrlXAdjust, int textCtrlYAdjust ) -{ - if ( !m_text ) - return; - - wxSize sz = GetClientSize(); - - int customBorder = m_widthCustomBorder; - if ( (m_text->GetWindowStyleFlag() & wxBORDER_MASK) == wxNO_BORDER ) - { - int x; - - if ( !m_widthCustomPaint ) - { - // No special custom paint area - we can use 0 left margin - // with wxTextCtrl. - if ( m_text->SetMargins(0) ) - textCtrlXAdjust = 0; - x = m_tcArea.x + m_marginLeft + textCtrlXAdjust; - } - else - { - // There is special custom paint area - it is better to - // use some margin with the wxTextCtrl. - m_text->SetMargins(m_marginLeft); - x = m_tcArea.x + m_widthCustomPaint + - m_marginLeft + textCtrlXAdjust; - } - - // Centre textctrl vertically, if needed -#if !TEXTCTRL_TEXT_CENTERED - int tcSizeY = m_text->GetBestSize().y; - int diff0 = sz.y - tcSizeY; - int y = textCtrlYAdjust + (diff0/2); -#else - wxUnusedVar(textCtrlYAdjust); - int y = 0; -#endif - - if ( y < customBorder ) - y = customBorder; - - m_text->SetSize(x, - y, - m_tcArea.width - m_tcArea.x - x, - -1 ); - - // Make sure textctrl doesn't exceed the bottom custom border - wxSize tsz = m_text->GetSize(); - int diff1 = (y + tsz.y) - (sz.y - customBorder); - if ( diff1 >= 0 ) - { - tsz.y = tsz.y - diff1 - 1; - m_text->SetSize(tsz); - } - } - else - { - // If it has border, have textctrl fill the entire text field. - int w = m_tcArea.width - m_widthCustomPaint; - if (w < 0) w = 0; - m_text->SetSize( m_tcArea.x + m_widthCustomPaint, - m_tcArea.y, - w, - m_tcArea.height ); - } -} - -wxSize wxComboCtrlBase::DoGetBestSize() const -{ - int width = m_text ? m_text->GetBestSize().x : 80; - - return GetSizeFromTextSize(width); -} - -wxSize wxComboCtrlBase::DoGetSizeFromTextSize(int xlen, int ylen) const -{ - // Calculate close-to-native control height - - int fhei; - -#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) - fhei = EDIT_HEIGHT_FROM_CHAR_HEIGHT(GetCharHeight()); -#elif defined(__WXGTK__) && !defined(__WXUNIVERSAL__) - // Control creation is not entirely cheap, so cache the heights to - // avoid repeatedly creating dummy controls: - static wxString s_last_font; - static int s_last_fhei = -1; - wxString fontdesc; - if ( m_font.IsOk() ) - fontdesc = m_font.GetNativeFontInfoDesc(); - if ( s_last_fhei != -1 && fontdesc == s_last_font ) - { - fhei = s_last_fhei; - } - else - { - wxComboBox* cb = new wxComboBox; -#ifndef __WXGTK3__ - // GTK3 returns zero for the preferred size of a hidden widget - cb->Hide(); -#endif - cb->Create(const_cast(this), wxID_ANY); - if ( m_font.IsOk() ) - cb->SetFont(m_font); - s_last_font = fontdesc; - s_last_fhei = fhei = cb->GetBestSize().y; - cb->Destroy(); - } -#else - if ( m_font.IsOk() ) - fhei = (m_font.GetPointSize()*2) + 5; - else if ( wxNORMAL_FONT->IsOk() ) - fhei = (wxNORMAL_FONT->GetPointSize()*2) + 5; - else - fhei = 22; -#endif // only for wxComboBox on MSW or GTK - - // Need to force height to accommodate bitmap? - int btnSizeY = m_btnSize.y; - if ( m_bmpNormal.IsOk() && fhei < btnSizeY ) - fhei = btnSizeY; - - // Control height doesn't depend on border -/* - // Add border - int border = m_windowStyle & wxBORDER_MASK; - if ( border == wxSIMPLE_BORDER ) - fhei += 2; - else if ( border == wxNO_BORDER ) - fhei += (m_widthCustomBorder*2); - else - // Sunken etc. - fhei += 4; -*/ - -#ifdef __WXMAC__ - // these are the numbers from the HIG: - switch ( m_windowVariant ) - { - case wxWINDOW_VARIANT_NORMAL: - default : - fhei = 22; - break; - case wxWINDOW_VARIANT_SMALL: - fhei = 19; - break; - case wxWINDOW_VARIANT_MINI: - fhei = 15; - break; - } -#endif - - fhei += 2 * FOCUS_RING; - - // Calculate width - int fwid = xlen + FOCUS_RING + COMBO_MARGIN + DEFAULT_DROPBUTTON_WIDTH; - - // Add the margins we have previously set - wxPoint marg( GetMargins() ); - fwid += wxMax(0, marg.x); - fhei += wxMax(0, marg.y); - - if ( ylen > 0 ) - fhei += ylen - GetCharHeight(); - - return wxSize(fwid, fhei); -} - -void wxComboCtrlBase::OnSizeEvent( wxSizeEvent& event ) -{ - if ( !IsCreated() ) - return; - - // defined by actual wxComboCtrls - OnResize(); - - event.Skip(); -} - -// ---------------------------------------------------------------------------- -// standard operations -// ---------------------------------------------------------------------------- - -bool wxComboCtrlBase::Enable(bool enable) -{ - if ( !wxControl::Enable(enable) ) - return false; - - if ( m_btn ) - m_btn->Enable(enable); - if ( m_text ) - m_text->Enable(enable); - - Refresh(); - - return true; -} - -bool wxComboCtrlBase::Show(bool show) -{ - if ( !wxControl::Show(show) ) - return false; - - if (m_btn) - m_btn->Show(show); - - if (m_text) - m_text->Show(show); - - return true; -} - -bool wxComboCtrlBase::SetFont ( const wxFont& font ) -{ - if ( !wxControl::SetFont(font) ) - return false; - - if ( m_text ) - { - // Without hiding the wxTextCtrl there would be some - // visible 'flicker' (at least on Windows XP). - m_text->Hide(); - m_text->SetFont(font); - OnResize(); - m_text->Show(); - } - - return true; -} - -#if wxUSE_TOOLTIPS -void wxComboCtrlBase::DoSetToolTip(wxToolTip *tooltip) -{ - wxControl::DoSetToolTip(tooltip); - - // Set tool tip for button and text box - if ( tooltip ) - { - const wxString &tip = tooltip->GetTip(); - if ( m_text ) m_text->SetToolTip(tip); - if ( m_btn ) m_btn->SetToolTip(tip); - } - else - { - if ( m_text ) m_text->SetToolTip( NULL ); - if ( m_btn ) m_btn->SetToolTip( NULL ); - } -} -#endif // wxUSE_TOOLTIPS - -bool wxComboCtrlBase::SetForegroundColour(const wxColour& colour) -{ - if ( wxControl::SetForegroundColour(colour) ) - { - if ( m_text ) - m_text->SetForegroundColour(colour); - return true; - } - return false; -} - -bool wxComboCtrlBase::SetBackgroundColour(const wxColour& colour) -{ - if ( m_text ) - m_text->SetBackgroundColour(colour); - m_tcBgCol = colour; - m_hasTcBgCol = true; - return true; -} - -wxColour wxComboCtrlBase::GetBackgroundColour() const -{ - if ( m_text ) - return m_text->GetBackgroundColour(); - return m_tcBgCol; -} - -// ---------------------------------------------------------------------------- -// painting -// ---------------------------------------------------------------------------- - -#if (!defined(__WXMSW__)) || defined(__WXUNIVERSAL__) -// prepare combo box background on area in a way typical on platform -void wxComboCtrlBase::PrepareBackground( wxDC& dc, const wxRect& rect, int flags ) const -{ - wxSize sz = GetClientSize(); - bool isEnabled; - bool doDrawFocusRect; // also selected - - // For smaller size control (and for disabled background) use less spacing - int focusSpacingX; - int focusSpacingY; - - if ( !(flags & wxCONTROL_ISSUBMENU) ) - { - // Drawing control - isEnabled = IsEnabled(); - doDrawFocusRect = ShouldDrawFocus() && !(m_iFlags & wxCC_FULL_BUTTON); - - // Windows-style: for smaller size control (and for disabled background) use less spacing - focusSpacingX = isEnabled ? 2 : 1; - focusSpacingY = sz.y > (GetCharHeight()+2) && isEnabled ? 2 : 1; - } - else - { - // Drawing a list item - isEnabled = true; // they are never disabled - doDrawFocusRect = (flags & wxCONTROL_SELECTED) != 0; - - focusSpacingX = 0; - focusSpacingY = 0; - } - - // Set the background sub-rectangle for selection, disabled etc - wxRect selRect(rect); - selRect.y += focusSpacingY; - selRect.height -= (focusSpacingY*2); - - int wcp = 0; - - if ( !(flags & wxCONTROL_ISSUBMENU) ) - wcp += m_widthCustomPaint; - - selRect.x += wcp + focusSpacingX; - selRect.width -= wcp + (focusSpacingX*2); - - wxColour bgCol; - wxColour fgCol; - - bool doDrawSelRect = true; - - // Determine foreground colour - if ( isEnabled ) - { - if ( doDrawFocusRect ) - { - fgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT); - } - else if ( m_hasFgCol ) - { - // Honour the custom foreground colour - fgCol = GetForegroundColour(); - } - else - { - fgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT); - } - } - else - { - fgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT); - } - - // Determine background colour - if ( isEnabled ) - { - if ( doDrawFocusRect ) - { - bgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT); - } - else if ( m_hasTcBgCol ) - { - // Honour the custom background colour - bgCol = m_tcBgCol; - } - else - { -#ifndef __WXMAC__ // see note in OnThemeChange - doDrawSelRect = false; - bgCol = GetBackgroundColour(); -#else - bgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW); -#endif - } - } - else - { -#ifndef __WXMAC__ // see note in OnThemeChange - bgCol = GetBackgroundColour(); -#else - bgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW); -#endif - } - - dc.SetTextForeground( fgCol ); - dc.SetBrush( bgCol ); - if ( doDrawSelRect ) - { - dc.SetPen( bgCol ); - dc.DrawRectangle( selRect ); - } - - // Don't clip exactly to the selection rectangle so we can draw - // to the non-selected area in front of it. - wxRect clipRect(rect.x,rect.y, - (selRect.x+selRect.width)-rect.x,rect.height); - dc.SetClippingRegion(clipRect); -} -#else -// Save the library size a bit for platforms that re-implement this. -void wxComboCtrlBase::PrepareBackground( wxDC&, const wxRect&, int ) const -{ -} -#endif - -void wxComboCtrlBase::DrawButton( wxDC& dc, const wxRect& rect, int flags ) -{ - int drawState = m_btnState; - - if ( (m_iFlags & wxCC_BUTTON_STAYS_DOWN) && - GetPopupWindowState() >= Animating ) - drawState |= wxCONTROL_PRESSED; - - wxRect drawRect(rect.x+m_btnSpacingX, - rect.y+((rect.height-m_btnSize.y)/2), - m_btnSize.x, - m_btnSize.y); - - // Make sure area is not larger than the control - if ( drawRect.y < rect.y ) - drawRect.y = rect.y; - if ( drawRect.height > rect.height ) - drawRect.height = rect.height; - - bool enabled = IsEnabled(); - - if ( !enabled ) - drawState |= wxCONTROL_DISABLED; - - // Need to clear button background even if m_btn is present - // and also when using custom bitmap for the button - if ( (flags & Button_PaintBackground) && - (!HasTransparentBackground() || - !(m_iFlags & wxCC_IFLAG_BUTTON_OUTSIDE)) ) - { - wxColour bgCol; - - if ( m_iFlags & wxCC_IFLAG_BUTTON_OUTSIDE ) - bgCol = GetParent()->GetBackgroundColour(); - else - bgCol = GetBackgroundColour(); - - dc.SetBrush(bgCol); - dc.SetPen(bgCol); - dc.DrawRectangle(rect); - } - - if ( !m_bmpNormal.IsOk() ) - { - if ( flags & Button_BitmapOnly ) - return; - - // Draw standard button - wxRendererNative::Get().DrawComboBoxDropButton(this, - dc, - drawRect, - drawState); - } - else - { - // Draw bitmap - - wxBitmap* pBmp; - - if ( !enabled ) - pBmp = &m_bmpDisabled; - else if ( m_btnState & wxCONTROL_PRESSED ) - pBmp = &m_bmpPressed; - else if ( m_btnState & wxCONTROL_CURRENT ) - pBmp = &m_bmpHover; - else - pBmp = &m_bmpNormal; - - if ( m_blankButtonBg ) - { - if ( !(flags & Button_BitmapOnly) ) - { - wxRendererNative::Get().DrawPushButton(this, - dc, - drawRect, - drawState); - } - } - - // Draw bitmap centered in drawRect - dc.DrawBitmap(*pBmp, - drawRect.x + (drawRect.width-pBmp->GetWidth())/2, - drawRect.y + (drawRect.height-pBmp->GetHeight())/2, - true); - } -} - -void wxComboCtrlBase::RecalcAndRefresh() -{ - if ( IsCreated() ) - { - wxSizeEvent evt(GetSize(),GetId()); - evt.SetEventObject(this); - GetEventHandler()->ProcessEvent(evt); - Refresh(); - } -} - -// ---------------------------------------------------------------------------- -// miscellaneous event handlers -// ---------------------------------------------------------------------------- - -void wxComboCtrlBase::OnTextCtrlEvent(wxCommandEvent& event) -{ - // Avoid infinite recursion - if ( event.GetEventObject() == this ) - { - event.Skip(); - return; - } - - if ( event.GetEventType() == wxEVT_TEXT ) - { - if ( m_ignoreEvtText > 0 ) - { - m_ignoreEvtText--; - return; - } - } - - // For safety, completely re-create a new wxCommandEvent - wxCommandEvent evt2(event); - evt2.SetId(GetId()); - evt2.SetEventObject(this); - HandleWindowEvent(evt2); - - event.StopPropagation(); -} - -// call if cursor is on button area or mouse is captured for the button -bool wxComboCtrlBase::HandleButtonMouseEvent( wxMouseEvent& event, - int flags ) -{ - int type = event.GetEventType(); - - if ( type == wxEVT_MOTION ) - { - if ( (flags & wxCC_MF_ON_BUTTON) && - IsPopupWindowState(Hidden) ) - { - if ( !(m_btnState & wxCONTROL_CURRENT) ) - { - // Mouse hover begins - m_btnState |= wxCONTROL_CURRENT; - if ( HasCapture() ) // Retain pressed state. - m_btnState |= wxCONTROL_PRESSED; - Refresh(); - } - } - else if ( (m_btnState & wxCONTROL_CURRENT) ) - { - // Mouse hover ends - m_btnState &= ~(wxCONTROL_CURRENT|wxCONTROL_PRESSED); - Refresh(); - } - } - else if ( type == wxEVT_LEFT_DOWN || type == wxEVT_LEFT_DCLICK ) - { - if ( flags & (wxCC_MF_ON_CLICK_AREA|wxCC_MF_ON_BUTTON) ) - { - m_btnState |= wxCONTROL_PRESSED; - Refresh(); - - if ( !(m_iFlags & wxCC_POPUP_ON_MOUSE_UP) ) - OnButtonClick(); - else - // If showing popup now, do not capture mouse or there will be interference - CaptureMouse(); - } - } - else if ( type == wxEVT_LEFT_UP ) - { - - // Only accept event if mouse was left-press was previously accepted - if ( HasCapture() ) - ReleaseMouse(); - - if ( m_btnState & wxCONTROL_PRESSED ) - { - // If mouse was inside, fire the click event. - if ( m_iFlags & wxCC_POPUP_ON_MOUSE_UP ) - { - if ( flags & (wxCC_MF_ON_CLICK_AREA|wxCC_MF_ON_BUTTON) ) - OnButtonClick(); - } - - m_btnState &= ~(wxCONTROL_PRESSED); - Refresh(); - } - } - else if ( type == wxEVT_LEAVE_WINDOW ) - { - if ( m_btnState & (wxCONTROL_CURRENT|wxCONTROL_PRESSED) ) - { - m_btnState &= ~(wxCONTROL_CURRENT); - - // Mouse hover ends - if ( IsPopupWindowState(Hidden) ) - { - m_btnState &= ~(wxCONTROL_PRESSED); - Refresh(); - } - } - } - else - return false; - - // Never have 'hot' state when popup is being shown - // (this is mostly needed because of the animation). - if ( !IsPopupWindowState(Hidden) ) - m_btnState &= ~wxCONTROL_CURRENT; - - return true; -} - -// returns true if event was consumed or filtered -bool wxComboCtrlBase::PreprocessMouseEvent( wxMouseEvent& event, - int WXUNUSED(flags) ) -{ - wxMilliClock_t t = ::wxGetLocalTimeMillis(); - int evtType = event.GetEventType(); - -#if USES_WXPOPUPWINDOW || USES_GENERICTLW - if ( m_popupWinType != POPUPWIN_WXPOPUPTRANSIENTWINDOW ) - { - if ( IsPopupWindowState(Visible) && - ( evtType == wxEVT_LEFT_DOWN || evtType == wxEVT_RIGHT_DOWN ) ) - { - HidePopup(true); - return true; - } - } -#endif - - // Filter out clicks on button immediately after popup dismiss - if ( evtType == wxEVT_LEFT_DOWN && t < m_timeCanAcceptClick ) - { - event.SetEventType(0); - return true; - } - - return false; -} - -void wxComboCtrlBase::HandleNormalMouseEvent( wxMouseEvent& event ) -{ - int evtType = event.GetEventType(); - - if ( (evtType == wxEVT_LEFT_DOWN || evtType == wxEVT_LEFT_DCLICK) && - (m_windowStyle & wxCB_READONLY) ) - { - if ( GetPopupWindowState() >= Animating ) - { - #if USES_WXPOPUPWINDOW - // Click here always hides the popup. - if ( m_popupWinType == POPUPWIN_WXPOPUPWINDOW ) - HidePopup(true); - #endif - } - else - { - if ( !(m_windowStyle & wxCC_SPECIAL_DCLICK) ) - { - // In read-only mode, clicking the text is the - // same as clicking the button. - OnButtonClick(); - } - else if ( /*evtType == wxEVT_LEFT_UP || */evtType == wxEVT_LEFT_DCLICK ) - { - //if ( m_popupInterface->CycleValue() ) - // Refresh(); - if ( m_popupInterface ) - m_popupInterface->OnComboDoubleClick(); - } - } - } - else if ( evtType == wxEVT_MOUSEWHEEL ) - { - if ( IsPopupShown() ) - { - // relay (some) mouse events to the popup - m_popup->GetEventHandler()->ProcessEvent(event); - } - else if ( event.GetWheelAxis() == 0 && - event.GetWheelRotation() != 0 && - event.GetModifiers() == 0 ) - { - // Translate mousewheel actions into key up/down. This is - // the simplest way of getting native behaviour: scrolling the - // wheel moves selection up/down by one item. - wxKeyEvent kevent(wxEVT_KEY_DOWN); - kevent.m_keyCode = event.GetWheelRotation() > 0 - ? WXK_UP - : WXK_DOWN; - GetEventHandler()->ProcessEvent(kevent); - } - else - { - event.Skip(); - } - } - else if ( evtType ) - { - event.Skip(); - } -} - -void wxComboCtrlBase::OnKeyEvent(wxKeyEvent& event) -{ - if ( IsPopupShown() ) - { - // pass it to the popped up control - GetPopupControl()->GetControl()->GetEventHandler()->ProcessEvent(event); - } - else // no popup - { - wxWindow* mainCtrl = GetMainWindowOfCompositeControl(); - - if ( mainCtrl->GetParent()->HasFlag(wxTAB_TRAVERSAL) ) - { - if ( mainCtrl->HandleAsNavigationKey(event) ) - return; - } - - if ( IsKeyPopupToggle(event) ) - { - OnButtonClick(); - return; - } - - int comboStyle = GetWindowStyle(); - wxComboPopup* popupInterface = GetPopupControl(); - - if ( !popupInterface ) - { - event.Skip(); - return; - } - - int keycode = event.GetKeyCode(); - - if ( (comboStyle & wxCB_READONLY) || - (keycode != WXK_RIGHT && keycode != WXK_LEFT) ) - { - popupInterface->OnComboKeyEvent(event); - } - else - event.Skip(); - } -} - -void wxComboCtrlBase::OnCharEvent(wxKeyEvent& event) -{ - if ( IsPopupShown() ) - { - // pass it to the popped up control - GetPopupControl()->GetControl()->GetEventHandler()->ProcessEvent(event); - } - else // no popup - { - wxComboPopup* popupInterface = GetPopupControl(); - if ( popupInterface ) - { - popupInterface->OnComboCharEvent(event); - } - else - { - event.Skip(); - } - } -} - -void wxComboCtrlBase::OnFocusEvent( wxFocusEvent& event ) -{ - // On Mac, setting focus here led to infinite recursion so - // m_resetFocus is used as a guard - - if ( event.GetEventType() == wxEVT_SET_FOCUS ) - { - if ( !m_resetFocus && GetTextCtrl() && !GetTextCtrl()->HasFocus() ) - { - m_resetFocus = true; - GetTextCtrl()->SetFocus(); - m_resetFocus = false; - } - } - - Refresh(); -} - -void wxComboCtrlBase::OnIdleEvent( wxIdleEvent& WXUNUSED(event) ) -{ - if ( m_resetFocus ) - { - m_resetFocus = false; - if ( GetTextCtrl() ) - GetTextCtrl()->SetFocus(); - } -} - -void wxComboCtrlBase::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event)) -{ - OnThemeChange(); - // left margin may also have changed - if ( !(m_iFlags & wxCC_IFLAG_LEFT_MARGIN_SET) ) - m_marginLeft = GetNativeTextIndent(); - RecalcAndRefresh(); -} - -// ---------------------------------------------------------------------------- -// popup handling -// ---------------------------------------------------------------------------- - -// Create popup window and the child control -void wxComboCtrlBase::CreatePopup() -{ - wxComboPopup* popupInterface = m_popupInterface; - wxWindow* popup; - - if ( !m_winPopup ) - { -#ifdef wxComboPopupWindowBase2 - if ( m_iFlags & wxCC_IFLAG_USE_ALT_POPUP ) - { - #if !USES_GENERICTLW - m_winPopup = new wxComboPopupWindowBase2( this, wxNO_BORDER ); - #else - int tlwFlags = wxNO_BORDER; - #ifdef wxCC_GENERIC_TLW_IS_FRAME - tlwFlags |= wxFRAME_NO_TASKBAR; - #endif - - #ifdef wxCC_GENERIC_TLW_IS_NONOWNEDWINDOW - m_winPopup = new wxComboPopupWindowBase2( this, wxID_ANY, - wxPoint(-21,-21), wxSize(20, 20), - tlwFlags ); - #else - m_winPopup = new wxComboPopupWindowBase2( this, wxID_ANY, wxEmptyString, - wxPoint(-21,-21), wxSize(20, 20), - tlwFlags ); - #endif - #endif - m_popupWinType = SECONDARY_POPUP_TYPE; - } - else -#endif // wxComboPopupWindowBase2 - { - m_winPopup = new wxComboPopupWindow( this, wxNO_BORDER ); - m_popupWinType = PRIMARY_POPUP_TYPE; - } - m_popupWinEvtHandler = new wxComboPopupWindowEvtHandler(this); - m_winPopup->PushEventHandler(m_popupWinEvtHandler); - } - - popupInterface->Create(m_winPopup); - m_popup = popup = popupInterface->GetControl(); - - m_popupEvtHandler = new wxComboPopupEvtHandler(this); - popup->PushEventHandler( m_popupEvtHandler ); - - // This may be helpful on some platforms - // (eg. it bypasses a wxGTK popupwindow bug where - // window is not initially hidden when it should be) - m_winPopup->Hide(); - - popupInterface->m_iFlags |= wxCP_IFLAG_CREATED; -} - -// Destroy popup window and the child control -void wxComboCtrlBase::DestroyPopup() -{ - HidePopup(true); - - if ( m_popup ) - m_popup->RemoveEventHandler(m_popupEvtHandler); - - wxDELETE(m_popupEvtHandler); - - if ( m_popupInterface ) - { - // NB: DestroyPopup() performs 'delete this'. - m_popupInterface->DestroyPopup(); - m_popupInterface = NULL; - } - - if ( m_winPopup ) - { - m_winPopup->RemoveEventHandler(m_popupWinEvtHandler); - wxDELETE(m_popupWinEvtHandler); - m_winPopup->Destroy(); - m_winPopup = NULL; - } - - m_popup = NULL; -} - -void wxComboCtrlBase::DoSetPopupControl(wxComboPopup* iface) -{ - wxCHECK_RET( iface, wxT("no popup interface set for wxComboCtrl") ); - - DestroyPopup(); - - iface->InitBase(this); - iface->Init(); - - m_popupInterface = iface; - - if ( !iface->LazyCreate() ) - { - CreatePopup(); - } - else - { - m_popup = NULL; - } - - // This must be done after creation - if ( !m_valueString.empty() ) - { - iface->SetStringValue(m_valueString); - //Refresh(); - } -} - -// Ensures there is atleast the default popup -void wxComboCtrlBase::EnsurePopupControl() -{ - if ( !m_popupInterface ) - SetPopupControl(NULL); -} - -void wxComboCtrlBase::OnButtonClick() -{ - // Derived classes can override this method for totally custom - // popup action - switch ( GetPopupWindowState() ) - { - case Hidden: - { - Popup(); - break; - } - - case Animating: - case Visible: - { - HidePopup(true); - break; - } - } -} - -void wxComboCtrlBase::Popup() -{ - wxCommandEvent event(wxEVT_COMBOBOX_DROPDOWN, GetId()); - event.SetEventObject(this); - HandleWindowEvent(event); - - ShowPopup(); -} - -void wxComboCtrlBase::ShowPopup() -{ - EnsurePopupControl(); - wxCHECK_RET( !IsPopupWindowState(Visible), wxT("popup window already shown") ); - - if ( IsPopupWindowState(Animating) ) - return; - - SetFocus(); - - // Space above and below - int screenHeight; - wxPoint scrPos; - int spaceAbove; - int spaceBelow; - int maxHeightPopup; - wxSize ctrlSz = GetSize(); - - screenHeight = wxSystemSettings::GetMetric( wxSYS_SCREEN_Y ); - scrPos = GetParent()->ClientToScreen(GetPosition()); - - spaceAbove = scrPos.y; - spaceBelow = screenHeight - spaceAbove - ctrlSz.y; - - maxHeightPopup = spaceBelow; - if ( spaceAbove > spaceBelow ) - maxHeightPopup = spaceAbove; - - // Width - int widthPopup = ctrlSz.x + m_extLeft + m_extRight; - - if ( widthPopup < m_widthMinPopup ) - widthPopup = m_widthMinPopup; - - wxWindow* winPopup = m_winPopup; - wxWindow* popup; - - // Need to disable tab traversal of parent - // - // NB: This is to fix a bug in wxMSW. In theory it could also be fixed - // by, for instance, adding check to window.cpp:wxWindowMSW::MSWProcessMessage - // that if transient popup is open, then tab traversal is to be ignored. - // However, I think this code would still be needed for cases where - // transient popup doesn't work yet (wxWinCE?). - wxWindow* mainCtrl = GetMainWindowOfCompositeControl(); - wxWindow* parent = mainCtrl->GetParent(); - int parentFlags = parent->GetWindowStyle(); - if ( parentFlags & wxTAB_TRAVERSAL ) - { - parent->SetWindowStyle( parentFlags & ~(wxTAB_TRAVERSAL) ); - m_iFlags |= wxCC_IFLAG_PARENT_TAB_TRAVERSAL; - } - - if ( !winPopup ) - { - CreatePopup(); - winPopup = m_winPopup; - popup = m_popup; - } - else - { - popup = m_popup; - } - - winPopup->Enable(); - - wxASSERT( !m_popup || m_popup == popup ); // Consistency check. - - wxSize adjustedSize = m_popupInterface->GetAdjustedSize(widthPopup, - m_heightPopup<=0?DEFAULT_POPUP_HEIGHT:m_heightPopup, - maxHeightPopup); - - popup->SetSize(adjustedSize); - popup->Move(0,0); - m_popupInterface->OnPopup(); - - // - // Reposition and resize popup window - // - - wxSize szp = popup->GetSize(); - - int popupX; - int popupY = scrPos.y + ctrlSz.y; - - // Default anchor is wxLEFT - int anchorSide = m_anchorSide; - if ( !anchorSide ) - anchorSide = wxLEFT; - - int rightX = scrPos.x + ctrlSz.x + m_extRight - szp.x; - int leftX = scrPos.x - m_extLeft; - - if ( wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft ) - leftX -= ctrlSz.x; - - int screenWidth = wxSystemSettings::GetMetric( wxSYS_SCREEN_X ); - - // If there is not enough horizontal space, anchor on the other side. - // If there is no space even then, place the popup at x 0. - if ( anchorSide == wxRIGHT ) - { - if ( rightX < 0 ) - { - if ( (leftX+szp.x) < screenWidth ) - anchorSide = wxLEFT; - else - anchorSide = 0; - } - } - else - { - if ( (leftX+szp.x) >= screenWidth ) - { - if ( rightX >= 0 ) - anchorSide = wxRIGHT; - else - anchorSide = 0; - } - } - - // Select x coordinate according to the anchor side - if ( anchorSide == wxRIGHT ) - popupX = rightX; - else if ( anchorSide == wxLEFT ) - popupX = leftX; - else - popupX = 0; - - int showFlags = CanDeferShow; - - if ( spaceBelow < szp.y ) - { - popupY = scrPos.y - szp.y; - showFlags |= ShowAbove; - } - -#if INSTALL_TOPLEV_HANDLER - // Put top level window event handler into place - if ( m_popupWinType == POPUPWIN_WXPOPUPWINDOW ) - { - if ( !m_toplevEvtHandler ) - m_toplevEvtHandler = new wxComboFrameEventHandler(this); - - wxWindow* toplev = ::wxGetTopLevelParent( this ); - wxASSERT( toplev ); - ((wxComboFrameEventHandler*)m_toplevEvtHandler)->OnPopup(); - toplev->PushEventHandler( m_toplevEvtHandler ); - } -#endif - - // Set string selection (must be this way instead of SetStringSelection) - if ( m_text ) - { - if ( !(m_iFlags & wxCC_NO_TEXT_AUTO_SELECT) ) - m_text->SelectAll(); - - m_popupInterface->SetStringValue( m_text->GetValue() ); - } - else - { - // This is neede since focus/selection indication may change when popup is shown - Refresh(); - } - - // This must be after SetStringValue - m_popupWinState = Animating; - - wxRect popupWinRect( popupX, popupY, szp.x, szp.y ); - - m_popup = popup; - if ( (m_iFlags & wxCC_IFLAG_DISABLE_POPUP_ANIM) || - AnimateShow( popupWinRect, showFlags ) ) - { - DoShowPopup( popupWinRect, showFlags ); - } -} - - -#ifdef __WXMAC__ -bool wxComboCtrlBase::AnimateShow( const wxRect& rect, int WXUNUSED(flags) ) -{ - // Overridden AnimateShow() will call Raise() and ShowWithEffect() so do - // here to avoid duplication. Raise and Show are needed for some contained - // control's scrollbars, selection highlights, hit-test accuracy and popup - // close via left mousedown when the mouse is not over the parent app. - if ( GetPopupWindow() ) - { - GetPopupWindow()->SetSize(rect); - GetPopupWindow()->Raise(); - GetPopupWindow()->Show(); - } - return true; -} -#else -bool wxComboCtrlBase::AnimateShow( const wxRect& WXUNUSED(rect), int WXUNUSED(flags) ) -{ - return true; -} -#endif - -void wxComboCtrlBase::DoShowPopup( const wxRect& rect, int WXUNUSED(flags) ) -{ - wxWindow* winPopup = m_winPopup; - - if ( IsPopupWindowState(Animating) ) - { - // Make sure the popup window is shown in the right position. - // Should not matter even if animation already did this. - - // Some platforms (GTK) may like SetSize and Move to be separate - // (though the bug was probably fixed). - winPopup->SetSize( rect ); - -#if USES_WXPOPUPTRANSIENTWINDOW - if ( m_popupWinType == POPUPWIN_WXPOPUPTRANSIENTWINDOW ) - ((wxPopupTransientWindow*)winPopup)->Popup(m_popup); - else -#endif - winPopup->Show(); - - m_popupWinState = Visible; - - // If popup window was a generic top-level window, or the - // wxPopupWindow implementation on this platform is classified as - // perfect, then we should be able to safely set focus to the popup - // control. - // In x11 backend, popup window neither generic top-level nor - // perfect native window. So shouldn't be set focus to the popup control - // same in the OnPopupDismiss function. -#if !defined(__WXX11__) - if ( IsPopupWinTypePerfect(m_popupWinType) ) - m_popup->SetFocus(); -#endif - } - else if ( IsPopupWindowState(Hidden) ) - { - // Animation was aborted - - wxASSERT( !winPopup->IsShown() ); - - m_popupWinState = Hidden; - } - - Refresh(); -} - -void wxComboCtrlBase::OnPopupDismiss(bool generateEvent) -{ - // Just in case, avoid double dismiss - if ( IsPopupWindowState(Hidden) ) - return; - - // This must be set before focus - otherwise there will be recursive - // OnPopupDismisses. - m_popupWinState = Hidden; - - //SetFocus(); - m_winPopup->Disable(); - - // Inform popup control itself - m_popupInterface->OnDismiss(); - - if ( m_popupEvtHandler ) - ((wxComboPopupEvtHandler*)m_popupEvtHandler)->OnPopupDismiss(); - -#if INSTALL_TOPLEV_HANDLER - // Remove top level window event handler - if ( m_toplevEvtHandler ) - { - wxWindow* toplev = ::wxGetTopLevelParent( this ); - if ( toplev ) - toplev->RemoveEventHandler( m_toplevEvtHandler ); - } -#endif - - m_timeCanAcceptClick = ::wxGetLocalTimeMillis(); - - if ( m_popupWinType == POPUPWIN_WXPOPUPTRANSIENTWINDOW ) - m_timeCanAcceptClick += 150; - - // If cursor not on dropdown button, then clear its state - // (technically not required by all ports, but do it for all just in case) - if ( !m_btnArea.Contains(ScreenToClient(::wxGetMousePosition())) ) - m_btnState = 0; - - // Return parent's tab traversal flag. - // See ShowPopup for notes. - if ( m_iFlags & wxCC_IFLAG_PARENT_TAB_TRAVERSAL ) - { - wxWindow* parent = GetParent(); - parent->SetWindowStyle( parent->GetWindowStyle() | wxTAB_TRAVERSAL ); - m_iFlags &= ~(wxCC_IFLAG_PARENT_TAB_TRAVERSAL); - } - - // refresh control (necessary even if m_text) - Refresh(); - -#if !defined(__WXX11__) - SetFocus(); -#endif - - if ( generateEvent ) - { - wxCommandEvent event(wxEVT_COMBOBOX_CLOSEUP, GetId()); - event.SetEventObject(this); - HandleWindowEvent(event); - } -} - -void wxComboCtrlBase::HidePopup(bool generateEvent) -{ - // Should be able to call this without popup interface - if ( IsPopupWindowState(Hidden) ) - return; - - // transfer value and show it in textctrl, if any - if ( !IsPopupWindowState(Animating) ) - SetValueByUser( m_popupInterface->GetStringValue() ); - - m_winPopup->Hide(); - - OnPopupDismiss(generateEvent); -} - -// ---------------------------------------------------------------------------- -// customization methods -// ---------------------------------------------------------------------------- - -void wxComboCtrlBase::SetButtonPosition( int width, int height, - int side, int spacingX ) -{ - m_btnWid = width; - m_btnHei = height; - m_btnSide = side; - m_btnSpacingX = spacingX; - - if ( width > 0 || height > 0 || spacingX ) - m_iFlags |= wxCC_IFLAG_HAS_NONSTANDARD_BUTTON; - - RecalcAndRefresh(); -} - -wxSize wxComboCtrlBase::GetButtonSize() -{ - if ( m_btnSize.x > 0 ) - return m_btnSize; - - wxSize retSize(m_btnWid,m_btnHei); - - // Need to call CalculateAreas now if button size is - // is not explicitly specified. - if ( retSize.x <= 0 || retSize.y <= 0) - { - OnResize(); - - retSize = m_btnSize; - } - - return retSize; -} - -void wxComboCtrlBase::SetButtonBitmaps( const wxBitmap& bmpNormal, - bool blankButtonBg, - const wxBitmap& bmpPressed, - const wxBitmap& bmpHover, - const wxBitmap& bmpDisabled ) -{ - m_bmpNormal = bmpNormal; - m_blankButtonBg = blankButtonBg; - - if ( bmpPressed.IsOk() ) - m_bmpPressed = bmpPressed; - else - m_bmpPressed = bmpNormal; - - if ( bmpHover.IsOk() ) - m_bmpHover = bmpHover; - else - m_bmpHover = bmpNormal; - - if ( bmpDisabled.IsOk() ) - m_bmpDisabled = bmpDisabled; - else - m_bmpDisabled = bmpNormal; - - RecalcAndRefresh(); -} - -void wxComboCtrlBase::SetCustomPaintWidth( int width ) -{ - if ( m_text ) - { - // move textctrl accordingly - wxRect r = m_text->GetRect(); - int inc = width - m_widthCustomPaint; - r.x += inc; - r.width -= inc; - m_text->SetSize( r ); - } - - m_widthCustomPaint = width; - - RecalcAndRefresh(); -} - -bool wxComboCtrlBase::DoSetMargins(const wxPoint& margins) -{ - // For general sanity's sake, we ignore top margin. Instead - // we will always try to center the text vertically. - bool res = true; - - if ( margins.x != -1 ) - { - m_marginLeft = margins.x; - m_iFlags |= wxCC_IFLAG_LEFT_MARGIN_SET; - } - else - { - m_marginLeft = GetNativeTextIndent(); - m_iFlags &= ~(wxCC_IFLAG_LEFT_MARGIN_SET); - } - - if ( margins.y != -1 ) - { - res = false; - } - - RecalcAndRefresh(); - - return res; -} - -wxPoint wxComboCtrlBase::DoGetMargins() const -{ - return wxPoint(m_marginLeft, -1); -} - -#if WXWIN_COMPATIBILITY_2_8 -void wxComboCtrlBase::SetTextIndent( int indent ) -{ - if ( indent < 0 ) - { - m_marginLeft = GetNativeTextIndent(); - m_iFlags &= ~(wxCC_IFLAG_LEFT_MARGIN_SET); - } - else - { - m_marginLeft = indent; - m_iFlags |= wxCC_IFLAG_LEFT_MARGIN_SET; - } - - RecalcAndRefresh(); -} - -wxCoord wxComboCtrlBase::GetTextIndent() const -{ - return m_marginLeft; -} -#endif - -wxCoord wxComboCtrlBase::GetNativeTextIndent() const -{ - return DEFAULT_TEXT_INDENT; -} - -void wxComboCtrlBase::SetTextCtrlStyle( int style ) -{ - m_textCtrlStyle = style; - - if ( m_text ) - m_text->SetWindowStyle(style); -} - -// ---------------------------------------------------------------------------- -// wxTextEntry interface -// ---------------------------------------------------------------------------- - -wxString wxComboCtrlBase::DoGetValue() const -{ - if ( m_text ) - return m_text->GetValue(); - return m_valueString; -} - -void wxComboCtrlBase::SetValueWithEvent(const wxString& value, - bool withEvent) -{ - DoSetValue(value, withEvent ? SetValue_SendEvent : 0); -} - -void wxComboCtrlBase::OnSetValue(const wxString& value) -{ - // Note: before wxComboCtrl inherited from wxTextEntry, - // this code used to be in SetValueWithEvent(). - - // Since wxComboPopup may want to paint the combo as well, we need - // to set the string value here (as well as sometimes in ShowPopup). - if ( m_valueString != value ) - { - bool found = true; - wxString trueValue = value; - - // Conform to wxComboBox behaviour: read-only control can only accept - // valid list items and empty string - if ( m_popupInterface && HasFlag(wxCB_READONLY) && value.length() ) - { - found = m_popupInterface->FindItem(value, - &trueValue); - } - - if ( found ) - { - m_valueString = trueValue; - - EnsurePopupControl(); - - if ( m_popupInterface ) - m_popupInterface->SetStringValue(trueValue); - } - } - - Refresh(); -} - -void wxComboCtrlBase::SetValueByUser(const wxString& value) -{ - // NB: Order of function calls is important here. Otherwise - // the SelectAll() may not work. - - if ( m_text ) - { - m_text->SetValue(value); - - if ( !(m_iFlags & wxCC_NO_TEXT_AUTO_SELECT) ) - m_text->SelectAll(); - } - - OnSetValue(value); -} - -// In this SetValue variant wxComboPopup::SetStringValue is not called -void wxComboCtrlBase::SetText(const wxString& value) -{ - // Unlike in SetValue(), this must be called here or - // the behaviour will no be consistent in readonlys. - EnsurePopupControl(); - - m_valueString = value; - - if ( m_text ) - { - m_ignoreEvtText++; - m_text->SetValue( value ); - } - - Refresh(); -} - -void wxComboCtrlBase::Copy() -{ - if ( m_text ) - m_text->Copy(); -} - -void wxComboCtrlBase::Cut() -{ - if ( m_text ) - m_text->Cut(); -} - -void wxComboCtrlBase::Paste() -{ - if ( m_text ) - m_text->Paste(); -} - -void wxComboCtrlBase::SetInsertionPoint(long pos) -{ - if ( m_text ) - m_text->SetInsertionPoint(pos); -} - -long wxComboCtrlBase::GetInsertionPoint() const -{ - if ( m_text ) - return m_text->GetInsertionPoint(); - - return 0; -} - -long wxComboCtrlBase::GetLastPosition() const -{ - if ( m_text ) - return m_text->GetLastPosition(); - - return 0; -} - -void wxComboCtrlBase::WriteText(const wxString& text) -{ - if ( m_text ) - { - m_text->WriteText(text); - OnSetValue(m_text->GetValue()); - } - else - { - OnSetValue(text); - } -} - -void wxComboCtrlBase::DoSetValue(const wxString& value, int flags) -{ - if ( m_text ) - { - if ( flags & SetValue_SendEvent ) - m_text->SetValue(value); - else - m_text->ChangeValue(value); - } - - OnSetValue(value); -} - -void wxComboCtrlBase::Replace(long from, long to, const wxString& value) -{ - if ( m_text ) - { - m_text->Replace(from, to, value); - OnSetValue(m_text->GetValue()); - } -} - -void wxComboCtrlBase::Remove(long from, long to) -{ - if ( m_text ) - { - m_text->Remove(from, to); - OnSetValue(m_text->GetValue()); - } -} - -void wxComboCtrlBase::SetSelection(long from, long to) -{ - if ( m_text ) - m_text->SetSelection(from, to); -} - -void wxComboCtrlBase::GetSelection(long *from, long *to) const -{ - if ( m_text ) - { - m_text->GetSelection(from, to); - } - else - { - *from = 0; - *to = 0; - } -} - -bool wxComboCtrlBase::IsEditable() const -{ - if ( m_text ) - return m_text->IsEditable(); - return false; -} - -void wxComboCtrlBase::SetEditable(bool editable) -{ - if ( m_text ) - m_text->SetEditable(editable); -} - -void wxComboCtrlBase::Undo() -{ - if ( m_text ) - m_text->Undo(); -} - -void wxComboCtrlBase::Redo() -{ - if ( m_text ) - m_text->Redo(); -} - -bool wxComboCtrlBase::CanUndo() const -{ - if ( m_text ) - return m_text->CanUndo(); - - return false; -} - -bool wxComboCtrlBase::CanRedo() const -{ - if ( m_text ) - return m_text->CanRedo(); - - return false; -} - -bool wxComboCtrlBase::SetHint(const wxString& hint) -{ - m_hintText = hint; - bool res = true; - if ( m_text ) - res = m_text->SetHint(hint); - Refresh(); - return res; -} - -wxString wxComboCtrlBase::GetHint() const -{ - return m_hintText; -} - -#endif // wxUSE_COMBOCTRL diff --git a/Externals/wxWidgets3/src/common/config.cpp b/Externals/wxWidgets3/src/common/config.cpp deleted file mode 100644 index c4382ef656..0000000000 --- a/Externals/wxWidgets3/src/common/config.cpp +++ /dev/null @@ -1,543 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/config.cpp -// Purpose: implementation of wxConfigBase class -// Author: Vadim Zeitlin -// Modified by: -// Created: 07.04.98 -// Copyright: (c) 1997 Karsten Ballueder Ballueder@usa.net -// Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif //__BORLANDC__ - -#ifndef wxUSE_CONFIG_NATIVE - #define wxUSE_CONFIG_NATIVE 1 -#endif - -#include "wx/config.h" - -#ifndef WX_PRECOMP - #include "wx/intl.h" - #include "wx/log.h" - #include "wx/app.h" - #include "wx/utils.h" - #include "wx/arrstr.h" - #include "wx/math.h" -#endif //WX_PRECOMP - -#if wxUSE_CONFIG && ((wxUSE_FILE && wxUSE_TEXTFILE) || wxUSE_CONFIG_NATIVE) - -#include "wx/apptrait.h" -#include "wx/file.h" - -#include -#include -#include // for INT_MAX -#include // for FLT_MAX - -// ---------------------------------------------------------------------------- -// global and class static variables -// ---------------------------------------------------------------------------- - -wxConfigBase *wxConfigBase::ms_pConfig = NULL; -bool wxConfigBase::ms_bAutoCreate = true; - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxAppTraitsBase -// ---------------------------------------------------------------------------- - -wxConfigBase *wxAppTraitsBase::CreateConfig() -{ - return new - #if defined(__WINDOWS__) && wxUSE_CONFIG_NATIVE - wxRegConfig(wxTheApp->GetAppName(), wxTheApp->GetVendorName()); - #else // either we're under Unix or wish to use files even under Windows - wxFileConfig(wxTheApp->GetAppName()); - #endif -} - -// ---------------------------------------------------------------------------- -// wxConfigBase -// ---------------------------------------------------------------------------- -wxIMPLEMENT_ABSTRACT_CLASS(wxConfigBase, wxObject); - -// Not all args will always be used by derived classes, but including them all -// in each class ensures compatibility. -wxConfigBase::wxConfigBase(const wxString& appName, - const wxString& vendorName, - const wxString& WXUNUSED(localFilename), - const wxString& WXUNUSED(globalFilename), - long style) - : m_appName(appName), m_vendorName(vendorName), m_style(style) -{ - m_bExpandEnvVars = true; - m_bRecordDefaults = false; -} - -wxConfigBase::~wxConfigBase() -{ - // required here for Darwin -} - -wxConfigBase *wxConfigBase::Set(wxConfigBase *pConfig) -{ - wxConfigBase *pOld = ms_pConfig; - ms_pConfig = pConfig; - return pOld; -} - -wxConfigBase *wxConfigBase::Create() -{ - if ( ms_bAutoCreate && ms_pConfig == NULL ) { - wxAppTraits * const traits = wxTheApp ? wxTheApp->GetTraits() : NULL; - wxCHECK_MSG( traits, NULL, wxT("create wxApp before calling this") ); - - ms_pConfig = traits->CreateConfig(); - } - - return ms_pConfig; -} - -// ---------------------------------------------------------------------------- -// wxConfigBase reading entries -// ---------------------------------------------------------------------------- - -// implement both Read() overloads for the given type in terms of DoRead() -#define IMPLEMENT_READ_FOR_TYPE(name, type, deftype, extra) \ - bool wxConfigBase::Read(const wxString& key, type *val) const \ - { \ - wxCHECK_MSG( val, false, wxT("wxConfig::Read(): NULL parameter") ); \ - \ - if ( !DoRead##name(key, val) ) \ - return false; \ - \ - *val = extra(*val); \ - \ - return true; \ - } \ - \ - bool wxConfigBase::Read(const wxString& key, \ - type *val, \ - deftype defVal) const \ - { \ - wxCHECK_MSG( val, false, wxT("wxConfig::Read(): NULL parameter") ); \ - \ - bool read = DoRead##name(key, val); \ - if ( !read ) \ - { \ - if ( IsRecordingDefaults() ) \ - { \ - ((wxConfigBase *)this)->DoWrite##name(key, defVal); \ - } \ - \ - *val = defVal; \ - } \ - \ - *val = extra(*val); \ - \ - return read; \ - } - - -IMPLEMENT_READ_FOR_TYPE(String, wxString, const wxString&, ExpandEnvVars) -IMPLEMENT_READ_FOR_TYPE(Long, long, long, long) -IMPLEMENT_READ_FOR_TYPE(Double, double, double, double) -IMPLEMENT_READ_FOR_TYPE(Bool, bool, bool, bool) - -#undef IMPLEMENT_READ_FOR_TYPE - -// int is stored as long -bool wxConfigBase::Read(const wxString& key, int *pi) const -{ - long l = *pi; - bool r = Read(key, &l); - wxASSERT_MSG( l < INT_MAX, wxT("int overflow in wxConfig::Read") ); - *pi = (int)l; - return r; -} - -bool wxConfigBase::Read(const wxString& key, int *pi, int defVal) const -{ - long l = *pi; - bool r = Read(key, &l, defVal); - wxASSERT_MSG( l < INT_MAX, wxT("int overflow in wxConfig::Read") ); - *pi = (int)l; - return r; -} - -// Read floats as doubles then just type cast it down. -bool wxConfigBase::Read(const wxString& key, float* val) const -{ - wxCHECK_MSG( val, false, wxT("wxConfig::Read(): NULL parameter") ); - - double temp; - if ( !Read(key, &temp) ) - return false; - - wxCHECK_MSG( fabs(temp) <= FLT_MAX, false, - wxT("float overflow in wxConfig::Read") ); - wxCHECK_MSG( (temp == 0.0) || (fabs(temp) >= FLT_MIN), false, - wxT("float underflow in wxConfig::Read") ); - - *val = static_cast(temp); - - return true; -} - -bool wxConfigBase::Read(const wxString& key, float* val, float defVal) const -{ - wxCHECK_MSG( val, false, wxT("wxConfig::Read(): NULL parameter") ); - - if ( Read(key, val) ) - return true; - - *val = defVal; - return false; -} - -// the DoReadXXX() for the other types have implementation in the base class -// but can be overridden in the derived ones -bool wxConfigBase::DoReadBool(const wxString& key, bool* val) const -{ - wxCHECK_MSG( val, false, wxT("wxConfig::Read(): NULL parameter") ); - - long l; - if ( !DoReadLong(key, &l) ) - return false; - - if ( l != 0 && l != 1 ) - { - // Don't assert here as this could happen in the result of user editing - // the file directly and this not indicate a bug in the program but - // still complain that something is wrong. - wxLogWarning(_("Invalid value %ld for a boolean key \"%s\" in " - "config file."), - l, key); - } - - *val = l != 0; - - return true; -} - -bool wxConfigBase::DoReadDouble(const wxString& key, double* val) const -{ - wxString str; - if ( Read(key, &str) ) - { - if ( str.ToCDouble(val) ) - return true; - - // Previous versions of wxFileConfig wrote the numbers out using the - // current locale and not the C one as now, so attempt to parse the - // string as a number in the current locale too, for compatibility. - if ( str.ToDouble(val) ) - return true; - } - - return false; -} - -// string reading helper -wxString wxConfigBase::ExpandEnvVars(const wxString& str) const -{ - wxString tmp; // Required for BC++ - if (IsExpandingEnvVars()) - tmp = wxExpandEnvVars(str); - else - tmp = str; - return tmp; -} - -// ---------------------------------------------------------------------------- -// wxConfigBase writing -// ---------------------------------------------------------------------------- - -bool wxConfigBase::DoWriteDouble(const wxString& key, double val) -{ - // Notice that we always write out the numbers in C locale and not the - // current one. This makes the config files portable between machines using - // different locales. - return DoWriteString(key, wxString::FromCDouble(val)); -} - -bool wxConfigBase::DoWriteBool(const wxString& key, bool value) -{ - return DoWriteLong(key, value ? 1l : 0l); -} - -// ---------------------------------------------------------------------------- -// wxConfigPathChanger -// ---------------------------------------------------------------------------- - -wxConfigPathChanger::wxConfigPathChanger(const wxConfigBase *pContainer, - const wxString& strEntry) -{ - m_bChanged = false; - m_pContainer = const_cast(pContainer); - - // the path is everything which precedes the last slash and the name is - // everything after it -- and this works correctly if there is no slash too - wxString strPath = strEntry.BeforeLast(wxCONFIG_PATH_SEPARATOR, &m_strName); - - // except in the special case of "/keyname" when there is nothing before "/" - if ( strPath.empty() && - ((!strEntry.empty()) && strEntry[0] == wxCONFIG_PATH_SEPARATOR) ) - { - strPath = wxCONFIG_PATH_SEPARATOR; - } - - if ( !strPath.empty() ) - { - if ( m_pContainer->GetPath() != strPath ) - { - // we do change the path so restore it later - m_bChanged = true; - - /* JACS: work around a memory bug that causes an assert - when using wxRegConfig, related to reference-counting. - Can be reproduced by removing .wc_str() below and - adding the following code to the config sample OnInit under - Windows: - - pConfig->SetPath(wxT("MySettings")); - pConfig->SetPath(wxT("..")); - int value; - pConfig->Read(wxT("MainWindowX"), & value); - */ - m_strOldPath = m_pContainer->GetPath().wc_str(); - if ( *m_strOldPath.c_str() != wxCONFIG_PATH_SEPARATOR ) - m_strOldPath += wxCONFIG_PATH_SEPARATOR; - m_pContainer->SetPath(strPath); - } - } -} - -void wxConfigPathChanger::UpdateIfDeleted() -{ - // we don't have to do anything at all if we didn't change the path - if ( !m_bChanged ) - return; - - // find the deepest still existing parent path of the original path - while ( !m_pContainer->HasGroup(m_strOldPath) ) - { - m_strOldPath = m_strOldPath.BeforeLast(wxCONFIG_PATH_SEPARATOR); - if ( m_strOldPath.empty() ) - m_strOldPath = wxCONFIG_PATH_SEPARATOR; - } -} - -wxConfigPathChanger::~wxConfigPathChanger() -{ - // only restore path if it was changed - if ( m_bChanged ) { - m_pContainer->SetPath(m_strOldPath); - } -} - -// this is a wxConfig method but it's mainly used with wxConfigPathChanger -/* static */ -wxString wxConfigBase::RemoveTrailingSeparator(const wxString& key) -{ - wxString path(key); - - // don't remove the only separator from a root group path! - while ( path.length() > 1 ) - { - if ( *path.rbegin() != wxCONFIG_PATH_SEPARATOR ) - break; - - path.erase(path.end() - 1); - } - - return path; -} - -#endif // wxUSE_CONFIG - -// ---------------------------------------------------------------------------- -// static & global functions -// ---------------------------------------------------------------------------- - -// understands both Unix and Windows (but only under Windows) environment -// variables expansion: i.e. $var, $(var) and ${var} are always understood -// and in addition under Windows %var% is also. - -// don't change the values the enum elements: they must be equal -// to the matching [closing] delimiter. -enum Bracket -{ - Bracket_None, - Bracket_Normal = ')', - Bracket_Curly = '}', -#ifdef __WINDOWS__ - Bracket_Windows = '%', // yeah, Windows people are a bit strange ;-) -#endif - Bracket_Max -}; - -wxString wxExpandEnvVars(const wxString& str) -{ - wxString strResult; - strResult.Alloc(str.length()); - - size_t m; - for ( size_t n = 0; n < str.length(); n++ ) { - switch ( str[n].GetValue() ) { -#ifdef __WINDOWS__ - case wxT('%'): -#endif // __WINDOWS__ - case wxT('$'): - { - Bracket bracket; - #ifdef __WINDOWS__ - if ( str[n] == wxT('%') ) - bracket = Bracket_Windows; - else - #endif // __WINDOWS__ - if ( n == str.length() - 1 ) { - bracket = Bracket_None; - } - else { - switch ( str[n + 1].GetValue() ) { - case wxT('('): - bracket = Bracket_Normal; - n++; // skip the bracket - break; - - case wxT('{'): - bracket = Bracket_Curly; - n++; // skip the bracket - break; - - default: - bracket = Bracket_None; - } - } - - m = n + 1; - - while ( m < str.length() && (wxIsalnum(str[m]) || str[m] == wxT('_')) ) - m++; - - wxString strVarName(str.c_str() + n + 1, m - n - 1); - - // NB: use wxGetEnv instead of wxGetenv as otherwise variables - // set through wxSetEnv may not be read correctly! - bool expanded = false; - wxString tmp; - if (wxGetEnv(strVarName, &tmp)) - { - strResult += tmp; - expanded = true; - } - else - { - // variable doesn't exist => don't change anything - #ifdef __WINDOWS__ - if ( bracket != Bracket_Windows ) - #endif - if ( bracket != Bracket_None ) - strResult << str[n - 1]; - strResult << str[n] << strVarName; - } - - // check the closing bracket - if ( bracket != Bracket_None ) { - if ( m == str.length() || str[m] != (wxChar)bracket ) { - // under MSW it's common to have '%' characters in the registry - // and it's annoying to have warnings about them each time, so - // ignroe them silently if they are not used for env vars - // - // under Unix, OTOH, this warning could be useful for the user to - // understand why isn't the variable expanded as intended - #ifndef __WINDOWS__ - wxLogWarning(_("Environment variables expansion failed: missing '%c' at position %u in '%s'."), - (char)bracket, (unsigned int) (m + 1), str.c_str()); - #endif // __WINDOWS__ - } - else { - // skip closing bracket unless the variables wasn't expanded - if ( !expanded ) - strResult << (wxChar)bracket; - m++; - } - } - - n = m - 1; // skip variable name - } - break; - - case wxT('\\'): - // backslash can be used to suppress special meaning of % and $ - if ( n != str.length() - 1 && - (str[n + 1] == wxT('%') || str[n + 1] == wxT('$')) ) { - strResult += str[++n]; - - break; - } - wxFALLTHROUGH; - - default: - strResult += str[n]; - } - } - - return strResult; -} - -// this function is used to properly interpret '..' in path -void wxSplitPath(wxArrayString& aParts, const wxString& path) -{ - aParts.clear(); - - wxString strCurrent; - wxString::const_iterator pc = path.begin(); - for ( ;; ) { - if ( pc == path.end() || *pc == wxCONFIG_PATH_SEPARATOR ) { - if ( strCurrent == wxT(".") ) { - // ignore - } - else if ( strCurrent == wxT("..") ) { - // go up one level - if ( aParts.size() == 0 ) - { - wxLogWarning(_("'%s' has extra '..', ignored."), path); - } - else - { - aParts.erase(aParts.end() - 1); - } - - strCurrent.Empty(); - } - else if ( !strCurrent.empty() ) { - aParts.push_back(strCurrent); - strCurrent.Empty(); - } - //else: - // could log an error here, but we prefer to ignore extra '/' - - if ( pc == path.end() ) - break; - } - else - strCurrent += *pc; - - ++pc; - } -} diff --git a/Externals/wxWidgets3/src/common/containr.cpp b/Externals/wxWidgets3/src/common/containr.cpp deleted file mode 100644 index c663417043..0000000000 --- a/Externals/wxWidgets3/src/common/containr.cpp +++ /dev/null @@ -1,758 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/containr.cpp -// Purpose: implementation of wxControlContainer -// Author: Vadim Zeitlin -// Modified by: -// Created: 06.08.01 -// Copyright: (c) 2001 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#ifndef WX_PRECOMP - #include "wx/containr.h" -#endif - -#ifndef WX_PRECOMP - #include "wx/log.h" - #include "wx/event.h" - #include "wx/window.h" - #include "wx/scrolbar.h" - #include "wx/radiobut.h" -#endif //WX_PRECOMP - -// trace mask for focus messages -#define TRACE_FOCUS wxT("focus") - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxControlContainerBase -// ---------------------------------------------------------------------------- - -void wxControlContainerBase::UpdateParentCanFocus() -{ - // In the ports where it does something non trivial, the parent window - // should only be focusable if it doesn't have any focusable children - // (e.g. native focus handling in wxGTK totally breaks down otherwise). - m_winParent->SetCanFocus(m_acceptsFocusSelf && !m_acceptsFocusChildren); -} - -bool wxControlContainerBase::UpdateCanFocusChildren() -{ - const bool acceptsFocusChildren = HasAnyFocusableChildren(); - if ( acceptsFocusChildren != m_acceptsFocusChildren ) - { - m_acceptsFocusChildren = acceptsFocusChildren; - - UpdateParentCanFocus(); - } - - return m_acceptsFocusChildren; -} - -bool wxControlContainerBase::HasAnyFocusableChildren() const -{ - const wxWindowList& children = m_winParent->GetChildren(); - for ( wxWindowList::const_iterator i = children.begin(), - end = children.end(); - i != end; - ++i ) - { - const wxWindow * const child = *i; - - if ( !m_winParent->IsClientAreaChild(child) ) - continue; - - // Here we check whether the child can accept the focus at all, as we - // want to try focusing it later even if it can't accept it right now. - if ( child->AcceptsFocusRecursively() ) - return true; - } - - return false; -} - -bool wxControlContainerBase::HasAnyChildrenAcceptingFocus() const -{ - const wxWindowList& children = m_winParent->GetChildren(); - for ( wxWindowList::const_iterator i = children.begin(), - end = children.end(); - i != end; - ++i ) - { - const wxWindow * const child = *i; - - if ( !m_winParent->IsClientAreaChild(child) ) - continue; - - // Here we check if the child accepts focus right now as we need to - // know if we can give the focus to it or not. - if ( child->CanAcceptFocus() ) - return true; - } - - return false; -} - -bool wxControlContainerBase::DoSetFocus() -{ - wxLogTrace(TRACE_FOCUS, wxT("SetFocus on wxPanel 0x%p."), - m_winParent->GetHandle()); - - if (m_inSetFocus) - return true; - - // when the panel gets the focus we move the focus to either the last - // window that had the focus or the first one that can get it unless the - // focus had been already set to some other child - - wxWindow *win = wxWindow::FindFocus(); - while ( win ) - { - if ( win == m_winParent ) - { - // our child already has focus, don't take it away from it - return true; - } - - if ( win->IsTopLevel() ) - { - // don't look beyond the first top level parent - useless and - // unnecessary - break; - } - - win = win->GetParent(); - } - - // protect against infinite recursion: - m_inSetFocus = true; - - bool ret = SetFocusToChild(); - - m_inSetFocus = false; - - return ret; -} - -bool wxControlContainerBase::AcceptsFocus() const -{ - return m_acceptsFocusSelf && m_winParent->CanBeFocused(); -} - -bool wxControlContainerBase::SetFocusToChild() -{ - return wxSetFocusToChild(m_winParent, &m_winLastFocused); -} - -#ifndef wxHAS_NATIVE_TAB_TRAVERSAL - -// ---------------------------------------------------------------------------- -// generic wxControlContainer -// ---------------------------------------------------------------------------- - -wxControlContainer::wxControlContainer() -{ - m_winLastFocused = NULL; -} - -void wxControlContainer::SetLastFocus(wxWindow *win) -{ - // the panel itself should never get the focus at all but if it does happen - // temporarily (as it seems to do under wxGTK), at the very least don't - // forget our previous m_winLastFocused - if ( win != m_winParent ) - { - // if we're setting the focus - if ( win ) - { - // find the last _immediate_ child which got focus - wxWindow *winParent = win; - while ( winParent != m_winParent ) - { - win = winParent; - winParent = win->GetParent(); - - // Yes, this can happen, though in a totally pathological case. - // like when detaching a menubar from a frame with a child - // which has pushed itself as an event handler for the menubar. - // (under wxGTK) - - wxASSERT_MSG( winParent, - wxT("Setting last focus for a window that is not our child?") ); - } - } - - m_winLastFocused = win; - - if ( win ) - { - wxLogTrace(TRACE_FOCUS, wxT("Set last focus to %s(%s)"), - win->GetClassInfo()->GetClassName(), - win->GetLabel().c_str()); - } - else - { - wxLogTrace(TRACE_FOCUS, wxT("No more last focus")); - } - } -} - -// -------------------------------------------------------------------- -// The following four functions are used to find other radio buttons -// within the same group. Used by wxSetFocusToChild on wxMSW -// -------------------------------------------------------------------- - -#if wxUSE_RADIOBTN - -wxRadioButton* wxGetPreviousButtonInGroup(wxRadioButton *btn) -{ - if ( btn->HasFlag(wxRB_GROUP) || btn->HasFlag(wxRB_SINGLE) ) - return NULL; - - const wxWindowList& siblings = btn->GetParent()->GetChildren(); - wxWindowList::compatibility_iterator nodeThis = siblings.Find(btn); - wxCHECK_MSG( nodeThis, NULL, wxT("radio button not a child of its parent?") ); - - // Iterate over all previous siblings until we find the next radio button - wxWindowList::compatibility_iterator nodeBefore = nodeThis->GetPrevious(); - wxRadioButton *prevBtn = 0; - while (nodeBefore) - { - prevBtn = wxDynamicCast(nodeBefore->GetData(), wxRadioButton); - if (prevBtn) - break; - - nodeBefore = nodeBefore->GetPrevious(); - } - - if (!prevBtn || prevBtn->HasFlag(wxRB_SINGLE)) - { - // no more buttons in group - return NULL; - } - - return prevBtn; -} - -wxRadioButton* wxGetNextButtonInGroup(wxRadioButton *btn) -{ - if (btn->HasFlag(wxRB_SINGLE)) - return NULL; - - const wxWindowList& siblings = btn->GetParent()->GetChildren(); - wxWindowList::compatibility_iterator nodeThis = siblings.Find(btn); - wxCHECK_MSG( nodeThis, NULL, wxT("radio button not a child of its parent?") ); - - // Iterate over all previous siblings until we find the next radio button - wxWindowList::compatibility_iterator nodeNext = nodeThis->GetNext(); - wxRadioButton *nextBtn = 0; - while (nodeNext) - { - nextBtn = wxDynamicCast(nodeNext->GetData(), wxRadioButton); - if (nextBtn) - break; - - nodeNext = nodeNext->GetNext(); - } - - if ( !nextBtn || nextBtn->HasFlag(wxRB_GROUP) || nextBtn->HasFlag(wxRB_SINGLE) ) - { - // no more buttons or the first button of the next group - return NULL; - } - - return nextBtn; -} - -wxRadioButton* wxGetFirstButtonInGroup(wxRadioButton *btn) -{ - while (true) - { - wxRadioButton* prevBtn = wxGetPreviousButtonInGroup(btn); - if (!prevBtn) - return btn; - - btn = prevBtn; - } -} - -wxRadioButton* wxGetLastButtonInGroup(wxRadioButton *btn) -{ - while (true) - { - wxRadioButton* nextBtn = wxGetNextButtonInGroup(btn); - if (!nextBtn) - return btn; - - btn = nextBtn; - } -} - -wxRadioButton* wxGetSelectedButtonInGroup(wxRadioButton *btn) -{ - // Find currently selected button - if (btn->GetValue()) - return btn; - - if (btn->HasFlag(wxRB_SINGLE)) - return NULL; - - wxRadioButton *selBtn; - - // First check all previous buttons - for (selBtn = wxGetPreviousButtonInGroup(btn); selBtn; selBtn = wxGetPreviousButtonInGroup(selBtn)) - if (selBtn->GetValue()) - return selBtn; - - // Now all following buttons - for (selBtn = wxGetNextButtonInGroup(btn); selBtn; selBtn = wxGetNextButtonInGroup(selBtn)) - if (selBtn->GetValue()) - return selBtn; - - return NULL; -} - -#endif // __WXMSW__ - -// ---------------------------------------------------------------------------- -// Keyboard handling - this is the place where the TAB traversal logic is -// implemented. As this code is common to all ports, this ensures consistent -// behaviour even if we don't specify how exactly the wxNavigationKeyEvent are -// generated and this is done in platform specific code which also ensures that -// we can follow the given platform standards. -// ---------------------------------------------------------------------------- - -void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event ) -{ - // for a TLW we shouldn't involve the parent window, it has nothing to do - // with keyboard navigation inside this TLW - wxWindow *parent = m_winParent->IsTopLevel() ? NULL - : m_winParent->GetParent(); - - // the event is propagated downwards if the event emitter was our parent - bool goingDown = event.GetEventObject() == parent; - - const wxWindowList& children = m_winParent->GetChildren(); - - // if we have exactly one notebook-like child window (actually it could be - // any window that returns true from its HasMultiplePages()), then - // [Shift-]Ctrl-Tab and Ctrl-PageUp/Down keys should iterate over its pages - // even if the focus is outside of the control because this is how the - // standard MSW properties dialogs behave and we do it under other platforms - // as well because it seems like a good idea -- but we can always put this - // block inside "#ifdef __WXMSW__" if it's not suitable there - if ( event.IsWindowChange() && !goingDown ) - { - // check if we have a unique notebook-like child - wxWindow *bookctrl = NULL; - for ( wxWindowList::const_iterator i = children.begin(), - end = children.end(); - i != end; - ++i ) - { - wxWindow * const window = *i; - if ( window->HasMultiplePages() ) - { - if ( bookctrl ) - { - // this is the second book-like control already so don't do - // anything as we don't know which one should have its page - // changed - bookctrl = NULL; - break; - } - - bookctrl = window; - } - } - - if ( bookctrl ) - { - // make sure that we don't bubble up the event again from the book - // control resulting in infinite recursion - wxNavigationKeyEvent eventCopy(event); - eventCopy.SetEventObject(m_winParent); - if ( bookctrl->GetEventHandler()->ProcessEvent(eventCopy) ) - return; - } - } - - // there is not much to do if we don't have children and we're not - // interested in "notebook page change" events here - if ( !children.GetCount() || event.IsWindowChange() ) - { - // let the parent process it unless it already comes from our parent - // of we don't have any - if ( goingDown || - !parent || !parent->GetEventHandler()->ProcessEvent(event) ) - { - event.Skip(); - } - - return; - } - - // where are we going? - const bool forward = event.GetDirection(); - - // the node of the children list from which we should start looking for the - // next acceptable child - wxWindowList::compatibility_iterator node, start_node; - - // we should start from the first/last control and not from the one which - // had focus the last time if we're propagating the event downwards because - // for our parent we look like a single control - if ( goingDown ) - { - // just to be sure it's not used (normally this is not necessary, but - // doesn't hurt neither) - m_winLastFocused = NULL; - - // start from first or last depending on where we're going - node = forward ? children.GetFirst() : children.GetLast(); - } - else // going up - { - // try to find the child which has the focus currently - - // the event emitter might have done this for us - wxWindow *winFocus = event.GetCurrentFocus(); - - // but if not, we might know where the focus was ourselves - if (!winFocus) - winFocus = m_winLastFocused; - - // if still no luck, do it the hard way - if (!winFocus) - winFocus = wxWindow::FindFocus(); - - if ( winFocus ) - { -#if defined(__WXMSW__) && wxUSE_RADIOBTN - // If we are in a radio button group, start from the first item in the - // group - if ( event.IsFromTab() && wxIsKindOf(winFocus, wxRadioButton ) ) - winFocus = wxGetFirstButtonInGroup((wxRadioButton*)winFocus); -#endif // __WXMSW__ - // ok, we found the focus - now is it our child? - start_node = children.Find( winFocus ); - } - - if ( !start_node && m_winLastFocused ) - { - // window which has focus isn't our child, fall back to the one - // which had the focus the last time - start_node = children.Find( m_winLastFocused ); - } - - // if we still didn't find anything, we should start with the first one - if ( !start_node ) - { - start_node = children.GetFirst(); - } - - // and the first child which we can try setting focus to is the next or - // the previous one - node = forward ? start_node->GetNext() : start_node->GetPrevious(); - } - - // we want to cycle over all elements passing by NULL - for ( ;; ) - { - // don't go into infinite loop - if ( start_node && node && node == start_node ) - break; - - // Have we come to the last or first item on the panel? - if ( !node ) - { - if ( !start_node ) - { - // exit now as otherwise we'd loop forever - break; - } - - if ( !goingDown ) - { - // Check if our (maybe grand) parent is another panel: if this - // is the case, they will know what to do with this navigation - // key and so give them the chance to process it instead of - // looping inside this panel (normally, the focus will go to - // the next/previous item after this panel in the parent - // panel). - wxWindow *focusedParent = m_winParent; - while ( parent ) - { - // We don't want to tab into a different dialog or frame or - // even an MDI child frame, so test for this explicitly - // (and in particular don't just use IsTopLevel() which - // would return false in the latter case). - if ( focusedParent->IsTopNavigationDomain(wxWindow::Navigation_Tab) ) - break; - - event.SetCurrentFocus( focusedParent ); - if ( parent->GetEventHandler()->ProcessEvent( event ) ) - return; - - focusedParent = parent; - - parent = parent->GetParent(); - } - } - //else: as the focus came from our parent, we definitely don't want - // to send it back to it! - - // no, we are not inside another panel so process this ourself - node = forward ? children.GetFirst() : children.GetLast(); - - continue; - } - - wxWindow *child = node->GetData(); - - // don't TAB to another TLW - if ( child->IsTopLevel() ) - { - node = forward ? node->GetNext() : node->GetPrevious(); - - continue; - } - -#if defined(__WXMSW__) && wxUSE_RADIOBTN - if ( event.IsFromTab() ) - { - if ( wxIsKindOf(child, wxRadioButton) ) - { - // only radio buttons with either wxRB_GROUP or wxRB_SINGLE - // can be tabbed to - if ( child->HasFlag(wxRB_GROUP) ) - { - // need to tab into the active button within a group - wxRadioButton *rb = wxGetSelectedButtonInGroup((wxRadioButton*)child); - if ( rb ) - child = rb; - } - else if ( !child->HasFlag(wxRB_SINGLE) ) - { - node = forward ? node->GetNext() : node->GetPrevious(); - continue; - } - } - } - else if ( m_winLastFocused && - wxIsKindOf(m_winLastFocused, wxRadioButton) && - !m_winLastFocused->HasFlag(wxRB_SINGLE) ) - { - wxRadioButton * const - lastBtn = static_cast(m_winLastFocused); - - // cursor keys don't navigate out of a radio button group so - // find the correct radio button to focus - if ( forward ) - { - child = wxGetNextButtonInGroup(lastBtn); - if ( !child ) - { - // no next button in group, set it to the first button - child = wxGetFirstButtonInGroup(lastBtn); - } - } - else - { - child = wxGetPreviousButtonInGroup(lastBtn); - if ( !child ) - { - // no previous button in group, set it to the last button - child = wxGetLastButtonInGroup(lastBtn); - } - } - - if ( child == m_winLastFocused ) - { - // must be a group consisting of only one button therefore - // no need to send a navigation event - event.Skip(false); - return; - } - } -#endif // __WXMSW__ - - if ( child->CanAcceptFocusFromKeyboard() ) - { - // if we're setting the focus to a child panel we should prevent it - // from giving it to the child which had the focus the last time - // and instead give it to the first/last child depending from which - // direction we're coming - event.SetEventObject(m_winParent); - - // disable propagation for this call as otherwise the event might - // bounce back to us. - wxPropagationDisabler disableProp(event); - if ( !child->GetEventHandler()->ProcessEvent(event) ) - { - // set it first in case SetFocusFromKbd() results in focus - // change too - m_winLastFocused = child; - - // everything is simple: just give focus to it - child->SetFocusFromKbd(); - } - //else: the child manages its focus itself - - event.Skip( false ); - - return; - } - - node = forward ? node->GetNext() : node->GetPrevious(); - } - - // we cycled through all of our children and none of them wanted to accept - // focus - event.Skip(); -} - -void wxControlContainer::HandleOnWindowDestroy(wxWindowBase *child) -{ - if ( child == m_winLastFocused ) - m_winLastFocused = NULL; -} - -// ---------------------------------------------------------------------------- -// focus handling -// ---------------------------------------------------------------------------- - -void wxControlContainer::HandleOnFocus(wxFocusEvent& event) -{ - wxLogTrace(TRACE_FOCUS, wxT("OnFocus on wxPanel 0x%p, name: %s"), - m_winParent->GetHandle(), - m_winParent->GetName().c_str() ); - - DoSetFocus(); - - event.Skip(); -} - - -#else - // wxHAS_NATIVE_TAB_TRAVERSAL - -bool wxControlContainer::SetFocusToChild() -{ - return wxSetFocusToChild(m_winParent, NULL); -} - - -#endif // !wxHAS_NATIVE_TAB_TRAVERSAL - -// ---------------------------------------------------------------------------- -// SetFocusToChild(): this function is used by wxPanel but also by wxFrame in -// wxMSW, this is why it is outside of wxControlContainer class -// ---------------------------------------------------------------------------- - -bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused) -{ - wxCHECK_MSG( win, false, wxT("wxSetFocusToChild(): invalid window") ); - // wxCHECK_MSG( childLastFocused, false, - // wxT("wxSetFocusToChild(): NULL child poonter") ); - - if ( childLastFocused && *childLastFocused ) - { - // It might happen that the window got reparented - if ( (*childLastFocused)->GetParent() == win ) - { - // And it also could have become hidden in the meanwhile - // We want to focus on the deepest widget visible - wxWindow *deepestVisibleWindow = NULL; - - while ( *childLastFocused ) - { - if ( (*childLastFocused)->IsShown() ) - { - if ( !deepestVisibleWindow ) - deepestVisibleWindow = *childLastFocused; - } - else - deepestVisibleWindow = NULL; - - *childLastFocused = (*childLastFocused)->GetParent(); - } - - if ( deepestVisibleWindow ) - { - *childLastFocused = deepestVisibleWindow; - - wxLogTrace(TRACE_FOCUS, - wxT("SetFocusToChild() => last child (0x%p)."), - (*childLastFocused)->GetHandle()); - - // not SetFocusFromKbd(): we're restoring focus back to the old - // window and not setting it as the result of a kbd action - (*childLastFocused)->SetFocus(); - return true; - } - } - else - { - // it doesn't count as such any more - *childLastFocused = NULL; - } - } - - // set the focus to the first child who wants it - wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst(); - while ( node ) - { - wxWindow *child = node->GetData(); - node = node->GetNext(); - - // skip special windows: - if ( !win->IsClientAreaChild(child) ) - continue; - - if ( child->CanAcceptFocusFromKeyboard() && !child->IsTopLevel() ) - { -#if defined(__WXMSW__) && wxUSE_RADIOBTN - // If a radiobutton is the first focusable child, search for the - // selected radiobutton in the same group - wxRadioButton* btn = wxDynamicCast(child, wxRadioButton); - if (btn) - { - wxRadioButton* selected = wxGetSelectedButtonInGroup(btn); - if (selected) - child = selected; - } -#endif // __WXMSW__ - - wxLogTrace(TRACE_FOCUS, - wxT("SetFocusToChild() => first child (0x%p)."), - child->GetHandle()); - - if (childLastFocused) - *childLastFocused = child; - child->SetFocusFromKbd(); - return true; - } - } - - return false; -} - diff --git a/Externals/wxWidgets3/src/common/convauto.cpp b/Externals/wxWidgets3/src/common/convauto.cpp deleted file mode 100644 index 6a5fba4ecb..0000000000 --- a/Externals/wxWidgets3/src/common/convauto.cpp +++ /dev/null @@ -1,346 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/convauto.cpp -// Purpose: implementation of wxConvAuto -// Author: Vadim Zeitlin -// Created: 2006-04-04 -// Copyright: (c) 2006 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// for compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include "wx/convauto.h" - -// we use latin1 by default as it seems the least bad choice: the files we need -// to detect input of don't always come from the user system (they are often -// received from other machines) and so using wxFONTENCODING_SYSTEM doesn't -// seem to be a good idea and there is no other reasonable alternative -wxFontEncoding wxConvAuto::ms_defaultMBEncoding = wxFONTENCODING_ISO8859_1; - -namespace -{ - -const char BOM_UTF32BE[] = { '\x00', '\x00', '\xFE', '\xFF' }; -const char BOM_UTF32LE[] = { '\xFF', '\xFE', '\x00', '\x00' }; -const char BOM_UTF16BE[] = { '\xFE', '\xFF' }; -const char BOM_UTF16LE[] = { '\xFF', '\xFE' }; -const char BOM_UTF8[] = { '\xEF', '\xBB', '\xBF' }; - -} // anonymous namespace - -// ============================================================================ -// implementation -// ============================================================================ - -/* static */ -void wxConvAuto::SetFallbackEncoding(wxFontEncoding enc) -{ - wxASSERT_MSG( enc != wxFONTENCODING_DEFAULT, - wxT("wxFONTENCODING_DEFAULT doesn't make sense here") ); - - ms_defaultMBEncoding = enc; -} - -/* static */ -const char* wxConvAuto::GetBOMChars(wxBOM bom, size_t* count) -{ - wxCHECK_MSG( count , NULL, wxS("count pointer must be provided") ); - - switch ( bom ) - { - case wxBOM_UTF32BE: *count = WXSIZEOF(BOM_UTF32BE); return BOM_UTF32BE; - case wxBOM_UTF32LE: *count = WXSIZEOF(BOM_UTF32LE); return BOM_UTF32LE; - case wxBOM_UTF16BE: *count = WXSIZEOF(BOM_UTF16BE); return BOM_UTF16BE; - case wxBOM_UTF16LE: *count = WXSIZEOF(BOM_UTF16LE); return BOM_UTF16LE; - case wxBOM_UTF8 : *count = WXSIZEOF(BOM_UTF8 ); return BOM_UTF8; - case wxBOM_Unknown: - case wxBOM_None: - wxFAIL_MSG( wxS("Invalid BOM type") ); - return NULL; - } - - wxFAIL_MSG( wxS("Unknown BOM type") ); - return NULL; -} - -/* static */ -wxBOM wxConvAuto::DetectBOM(const char *src, size_t srcLen) -{ - // examine the buffer for BOM presence - // - // quoting from http://www.unicode.org/faq/utf_bom.html#BOM: - // - // Bytes Encoding Form - // - // 00 00 FE FF UTF-32, big-endian - // FF FE 00 00 UTF-32, little-endian - // FE FF UTF-16, big-endian - // FF FE UTF-16, little-endian - // EF BB BF UTF-8 - // - // as some BOMs are prefixes of other ones we may need to read more bytes - // to disambiguate them - - switch ( srcLen ) - { - case 0: - return wxBOM_Unknown; - - case 1: - if ( src[0] == '\x00' || src[0] == '\xFF' || - src[0] == '\xFE' || src[0] == '\xEF') - { - // this could be a BOM but we don't know yet - return wxBOM_Unknown; - } - break; - - case 2: - case 3: - if ( src[0] == '\xEF' && src[1] == '\xBB' ) - { - if ( srcLen == 3 ) - return src[2] == '\xBF' ? wxBOM_UTF8 : wxBOM_None; - - return wxBOM_Unknown; - } - - if ( src[0] == '\xFE' && src[1] == '\xFF' ) - return wxBOM_UTF16BE; - - if ( src[0] == '\xFF' && src[1] == '\xFE' ) - { - // if the next byte is 0, it could be an UTF-32LE BOM but if it - // isn't we can be sure it's UTF-16LE - if ( srcLen == 3 && src[2] != '\x00' ) - return wxBOM_UTF16LE; - - return wxBOM_Unknown; - } - - if ( src[0] == '\x00' && src[1] == '\x00' ) - { - // this could only be UTF-32BE, check that the data we have so - // far allows for it - if ( srcLen == 3 && src[2] != '\xFE' ) - return wxBOM_None; - - return wxBOM_Unknown; - } - break; - - default: - // we have at least 4 characters so we may finally decide whether - // we have a BOM or not - if ( src[0] == '\xEF' && src[1] == '\xBB' && src[2] == '\xBF' ) - return wxBOM_UTF8; - - if ( src[0] == '\x00' && src[1] == '\x00' && - src[2] == '\xFE' && src[3] == '\xFF' ) - return wxBOM_UTF32BE; - - if ( src[0] == '\xFF' && src[1] == '\xFE' && - src[2] == '\x00' && src[3] == '\x00' ) - return wxBOM_UTF32LE; - - if ( src[0] == '\xFE' && src[1] == '\xFF' ) - return wxBOM_UTF16BE; - - if ( src[0] == '\xFF' && src[1] == '\xFE' ) - return wxBOM_UTF16LE; - } - - return wxBOM_None; -} - -void wxConvAuto::InitFromBOM(wxBOM bomType) -{ - m_consumedBOM = false; - - switch ( bomType ) - { - case wxBOM_Unknown: - wxFAIL_MSG( "shouldn't be called for this BOM type" ); - break; - - case wxBOM_None: - // use the default - break; - - case wxBOM_UTF32BE: - m_conv = new wxMBConvUTF32BE; - m_ownsConv = true; - break; - - case wxBOM_UTF32LE: - m_conv = new wxMBConvUTF32LE; - m_ownsConv = true; - break; - - case wxBOM_UTF16BE: - m_conv = new wxMBConvUTF16BE; - m_ownsConv = true; - break; - - case wxBOM_UTF16LE: - m_conv = new wxMBConvUTF16LE; - m_ownsConv = true; - break; - - case wxBOM_UTF8: - InitWithUTF8(); - break; - - default: - wxFAIL_MSG( "unknown BOM type" ); - } - - if ( !m_conv ) - { - // we end up here if there is no BOM or we didn't recognize it somehow - // (this shouldn't happen but still don't crash if it does), so use the - // default encoding - InitWithUTF8(); - m_consumedBOM = true; // as there is nothing to consume - } -} - -void wxConvAuto::SkipBOM(const char **src, size_t *len) const -{ - int ofs; - switch ( m_bomType ) - { - case wxBOM_Unknown: - wxFAIL_MSG( "shouldn't be called for this BOM type" ); - return; - - case wxBOM_None: - ofs = 0; - break; - - case wxBOM_UTF32BE: - case wxBOM_UTF32LE: - ofs = 4; - break; - - case wxBOM_UTF16BE: - case wxBOM_UTF16LE: - ofs = 2; - break; - - case wxBOM_UTF8: - ofs = 3; - break; - - default: - wxFAIL_MSG( "unknown BOM type" ); - return; - } - - *src += ofs; - if ( *len != (size_t)-1 ) - *len -= ofs; -} - -bool wxConvAuto::InitFromInput(const char *src, size_t len) -{ - m_bomType = DetectBOM(src, len == wxNO_LEN ? strlen(src) : len); - if ( m_bomType == wxBOM_Unknown ) - return false; - - InitFromBOM(m_bomType); - - return true; -} - -size_t -wxConvAuto::ToWChar(wchar_t *dst, size_t dstLen, - const char *src, size_t srcLen) const -{ - // we check BOM and create the appropriate conversion the first time we're - // called but we also need to ensure that the BOM is skipped not only - // during this initial call but also during the first call with non-NULL - // dst as typically we're first called with NULL dst to calculate the - // needed buffer size - wxConvAuto *self = const_cast(this); - - - if ( !m_conv ) - { - if ( !self->InitFromInput(src, srcLen) ) - { - // there is not enough data to determine whether we have a BOM or - // not, so fail for now -- the caller is supposed to call us again - // with more data - return wxCONV_FAILED; - } - } - - if ( !m_consumedBOM ) - { - SkipBOM(&src, &srcLen); - if ( srcLen == 0 ) - { - // there is nothing left except the BOM so we'd return 0 below but - // this is unexpected: decoding a non-empty string must either fail - // or return something non-empty, in particular this would break - // the code in wxTextInputStream::NextChar() - // - // so still return an error as we need some more data to be able to - // decode it - return wxCONV_FAILED; - } - } - - // try to convert using the auto-detected encoding - size_t rc = m_conv->ToWChar(dst, dstLen, src, srcLen); - if ( rc == wxCONV_FAILED && m_bomType == wxBOM_None ) - { - // if the conversion failed but we didn't really detect anything and - // simply tried UTF-8 by default, retry it using the fall-back - if ( m_encDefault != wxFONTENCODING_MAX ) - { - if ( m_ownsConv ) - delete m_conv; - - self->m_conv = new wxCSConv(m_encDefault == wxFONTENCODING_DEFAULT - ? GetFallbackEncoding() - : m_encDefault); - self->m_ownsConv = true; - - rc = m_conv->ToWChar(dst, dstLen, src, srcLen); - } - } - - // don't skip the BOM again the next time if we really consumed it - if ( rc != wxCONV_FAILED && dst && !m_consumedBOM ) - self->m_consumedBOM = true; - - return rc; -} - -size_t -wxConvAuto::FromWChar(char *dst, size_t dstLen, - const wchar_t *src, size_t srcLen) const -{ - if ( !m_conv ) - { - // default to UTF-8 for the multibyte output - const_cast(this)->InitWithUTF8(); - } - - return m_conv->FromWChar(dst, dstLen, src, srcLen); -} diff --git a/Externals/wxWidgets3/src/common/cshelp.cpp b/Externals/wxWidgets3/src/common/cshelp.cpp deleted file mode 100644 index 67e7860947..0000000000 --- a/Externals/wxWidgets3/src/common/cshelp.cpp +++ /dev/null @@ -1,502 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/cshelp.cpp -// Purpose: Context sensitive help class implementation -// Author: Julian Smart, Vadim Zeitlin -// Modified by: -// Created: 08/09/2000 -// Copyright: (c) 2000 Julian Smart, Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_HELP - -#ifndef WX_PRECOMP - #include "wx/app.h" - #include "wx/module.h" -#endif - -#include "wx/tipwin.h" -#include "wx/cshelp.h" - -#if wxUSE_MS_HTML_HELP - #include "wx/msw/helpchm.h" // for ShowContextHelpPopup - #include "wx/utils.h" // for wxGetMousePosition() -#endif - -// ---------------------------------------------------------------------------- -// wxContextHelpEvtHandler private class -// ---------------------------------------------------------------------------- - -// This class exists in order to eat events until the left mouse button is -// pressed -class wxContextHelpEvtHandler: public wxEvtHandler -{ -public: - wxContextHelpEvtHandler(wxContextHelp* contextHelp) - { - m_contextHelp = contextHelp; - } - - virtual bool ProcessEvent(wxEvent& event) wxOVERRIDE; - -//// Data - wxContextHelp* m_contextHelp; - - wxDECLARE_NO_COPY_CLASS(wxContextHelpEvtHandler); -}; - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxContextHelp -// ---------------------------------------------------------------------------- - -/* - * Invokes context-sensitive help - */ - - -wxIMPLEMENT_DYNAMIC_CLASS(wxContextHelp, wxObject); - -wxContextHelp::wxContextHelp(wxWindow* win, bool beginHelp) -{ - m_inHelp = false; - - if (beginHelp) - BeginContextHelp(win); -} - -wxContextHelp::~wxContextHelp() -{ - if (m_inHelp) - EndContextHelp(); -} - -// Not currently needed, but on some systems capture may not work as -// expected so we'll leave it here for now. -#ifdef __WXMOTIF__ -static void wxPushOrPopEventHandlers(wxContextHelp* help, wxWindow* win, bool push) -{ - if (push) - win->PushEventHandler(new wxContextHelpEvtHandler(help)); - else - win->PopEventHandler(true); - - wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst(); - while (node) - { - wxWindow* child = node->GetData(); - wxPushOrPopEventHandlers(help, child, push); - - node = node->GetNext(); - } -} -#endif - -// Begin 'context help mode' -bool wxContextHelp::BeginContextHelp(wxWindow* win) -{ - if (!win) - win = wxTheApp->GetTopWindow(); - if (!win) - return false; - - wxCursor cursor(wxCURSOR_QUESTION_ARROW); - wxCursor oldCursor = win->GetCursor(); - win->SetCursor(cursor); - -#ifdef __WXMAC__ - wxSetCursor(cursor); -#endif - - m_status = false; - -#ifdef __WXMOTIF__ - wxPushOrPopEventHandlers(this, win, true); -#else - win->PushEventHandler(new wxContextHelpEvtHandler(this)); -#endif - - win->CaptureMouse(); - - EventLoop(); - - win->ReleaseMouse(); - -#ifdef __WXMOTIF__ - wxPushOrPopEventHandlers(this, win, false); -#else - win->PopEventHandler(true); -#endif - - win->SetCursor(oldCursor); - -#ifdef __WXMAC__ - wxSetCursor(wxNullCursor); -#endif - - if (m_status) - { - wxPoint pt; - wxWindow* winAtPtr = wxFindWindowAtPointer(pt); - -#if 0 - if (winAtPtr) - { - printf("Picked %s (%d)\n", winAtPtr->GetName().c_str(), - winAtPtr->GetId()); - } -#endif - - if (winAtPtr) - DispatchEvent(winAtPtr, pt); - } - - return true; -} - -bool wxContextHelp::EndContextHelp() -{ - m_inHelp = false; - - return true; -} - -bool wxContextHelp::EventLoop() -{ - m_inHelp = true; - - while ( m_inHelp ) - { - if (wxTheApp->Pending()) - { - wxTheApp->Dispatch(); - } - else - { - wxTheApp->ProcessIdle(); - } - } - - return true; -} - -bool wxContextHelpEvtHandler::ProcessEvent(wxEvent& event) -{ - if (event.GetEventType() == wxEVT_LEFT_DOWN) - { - m_contextHelp->SetStatus(true); - m_contextHelp->EndContextHelp(); - return true; - } - - if ((event.GetEventType() == wxEVT_CHAR) || - (event.GetEventType() == wxEVT_KEY_DOWN) || - (event.GetEventType() == wxEVT_ACTIVATE) || - (event.GetEventType() == wxEVT_MOUSE_CAPTURE_CHANGED)) - { - // May have already been set to true by a left-click - //m_contextHelp->SetStatus(false); - m_contextHelp->EndContextHelp(); - return true; - } - - if ((event.GetEventType() == wxEVT_PAINT) || - (event.GetEventType() == wxEVT_ERASE_BACKGROUND)) - { - event.Skip(); - return false; - } - - return true; -} - -// Dispatch the help event to the relevant window -bool wxContextHelp::DispatchEvent(wxWindow* win, const wxPoint& pt) -{ - wxCHECK_MSG( win, false, wxT("win parameter can't be NULL") ); - - wxHelpEvent helpEvent(wxEVT_HELP, win->GetId(), pt, - wxHelpEvent::Origin_HelpButton); - helpEvent.SetEventObject(win); - - return win->GetEventHandler()->ProcessEvent(helpEvent); -} - -// ---------------------------------------------------------------------------- -// wxContextHelpButton -// ---------------------------------------------------------------------------- - -/* - * wxContextHelpButton - * You can add this to your dialogs (especially on non-Windows platforms) - * to put the application into context help mode. - */ - -static const char * csquery_xpm[] = { -"12 11 2 1", -" c None", -". c #000000", -" ", -" .... ", -" .. .. ", -" .. .. ", -" .. ", -" .. ", -" .. ", -" ", -" .. ", -" .. ", -" "}; - - -wxIMPLEMENT_CLASS(wxContextHelpButton, wxBitmapButton); - -wxBEGIN_EVENT_TABLE(wxContextHelpButton, wxBitmapButton) - EVT_BUTTON(wxID_CONTEXT_HELP, wxContextHelpButton::OnContextHelp) -wxEND_EVENT_TABLE() - -bool wxContextHelpButton::Create(wxWindow* parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style) -{ - return wxBitmapButton::Create(parent, id, - wxBitmap(csquery_xpm), - pos, size, style); -} - -void wxContextHelpButton::OnContextHelp(wxCommandEvent& WXUNUSED(event)) -{ - wxContextHelp contextHelp(GetParent()); -} - -// ---------------------------------------------------------------------------- -// wxHelpProvider -// ---------------------------------------------------------------------------- - -wxHelpProvider *wxHelpProvider::ms_helpProvider = NULL; - -// trivial implementation of some methods which we don't want to make pure -// virtual for convenience - -void wxHelpProvider::AddHelp(wxWindowBase * WXUNUSED(window), - const wxString& WXUNUSED(text)) -{ -} - -void wxHelpProvider::AddHelp(wxWindowID WXUNUSED(id), - const wxString& WXUNUSED(text)) -{ -} - -// removes the association -void wxHelpProvider::RemoveHelp(wxWindowBase* WXUNUSED(window)) -{ -} - -wxHelpProvider::~wxHelpProvider() -{ -} - -wxString wxHelpProvider::GetHelpTextMaybeAtPoint(wxWindowBase *window) -{ - if ( m_helptextAtPoint != wxDefaultPosition || - m_helptextOrigin != wxHelpEvent::Origin_Unknown ) - { - wxCHECK_MSG( window, wxEmptyString, wxT("window must not be NULL") ); - - wxPoint pt = m_helptextAtPoint; - wxHelpEvent::Origin origin = m_helptextOrigin; - - m_helptextAtPoint = wxDefaultPosition; - m_helptextOrigin = wxHelpEvent::Origin_Unknown; - - return window->GetHelpTextAtPoint(pt, origin); - } - - return GetHelp(window); -} - -// ---------------------------------------------------------------------------- -// wxSimpleHelpProvider -// ---------------------------------------------------------------------------- - -#define WINHASH_KEY(w) wxPtrToUInt(w) - -wxString wxSimpleHelpProvider::GetHelp(const wxWindowBase *window) -{ - wxSimpleHelpProviderHashMap::iterator it = m_hashWindows.find(WINHASH_KEY(window)); - - if ( it == m_hashWindows.end() ) - { - it = m_hashIds.find(window->GetId()); - if ( it == m_hashIds.end() ) - return wxEmptyString; - } - - return it->second; -} - -void wxSimpleHelpProvider::AddHelp(wxWindowBase *window, const wxString& text) -{ - m_hashWindows.erase(WINHASH_KEY(window)); - m_hashWindows[WINHASH_KEY(window)] = text; -} - -void wxSimpleHelpProvider::AddHelp(wxWindowID id, const wxString& text) -{ - wxSimpleHelpProviderHashMap::key_type key = (wxSimpleHelpProviderHashMap::key_type)id; - m_hashIds.erase(key); - m_hashIds[key] = text; -} - -// removes the association -void wxSimpleHelpProvider::RemoveHelp(wxWindowBase* window) -{ - m_hashWindows.erase(WINHASH_KEY(window)); -} - -bool wxSimpleHelpProvider::ShowHelp(wxWindowBase *window) -{ -#if wxUSE_MS_HTML_HELP || wxUSE_TIPWINDOW -#if wxUSE_MS_HTML_HELP - // m_helptextAtPoint will be reset by GetHelpTextMaybeAtPoint(), stash it - const wxPoint posTooltip = m_helptextAtPoint; -#endif // wxUSE_MS_HTML_HELP - - const wxString text = GetHelpTextMaybeAtPoint(window); - - if ( !text.empty() ) - { - // use the native help popup style if it's available -#if wxUSE_MS_HTML_HELP - if ( !wxCHMHelpController::ShowContextHelpPopup - ( - text, - posTooltip, - (wxWindow *)window - ) ) -#endif // wxUSE_MS_HTML_HELP - { -#if wxUSE_TIPWINDOW - static wxTipWindow* s_tipWindow = NULL; - - if ( s_tipWindow ) - { - // Prevent s_tipWindow being nulled in OnIdle, thereby removing - // the chance for the window to be closed by ShowHelp - s_tipWindow->SetTipWindowPtr(NULL); - s_tipWindow->Close(); - } - - s_tipWindow = new wxTipWindow((wxWindow *)window, text, - 100, &s_tipWindow); -#else // !wxUSE_TIPWINDOW - // we tried wxCHMHelpController but it failed and we don't have - // wxTipWindow to fall back on, so - return false; -#endif // wxUSE_TIPWINDOW - } - - return true; - } -#else // !wxUSE_MS_HTML_HELP && !wxUSE_TIPWINDOW - wxUnusedVar(window); -#endif // wxUSE_MS_HTML_HELP || wxUSE_TIPWINDOW - - return false; -} - -// ---------------------------------------------------------------------------- -// wxHelpControllerHelpProvider -// ---------------------------------------------------------------------------- - -wxHelpControllerHelpProvider::wxHelpControllerHelpProvider(wxHelpControllerBase* hc) -{ - m_helpController = hc; -} - -bool wxHelpControllerHelpProvider::ShowHelp(wxWindowBase *window) -{ - const wxString text = GetHelpTextMaybeAtPoint(window); - - if ( text.empty() ) - return false; - - if ( m_helpController ) - { - // if it's a numeric topic, show it - long topic; - if ( text.ToLong(&topic) ) - return m_helpController->DisplayContextPopup(topic); - - // otherwise show the text directly - if ( m_helpController->DisplayTextPopup(text, wxGetMousePosition()) ) - return true; - } - - // if there is no help controller or it's not capable of showing the help, - // fallback to the default method - return wxSimpleHelpProvider::ShowHelp(window); -} - -// Convenience function for turning context id into wxString -wxString wxContextId(int id) -{ - return wxString::Format(wxT("%d"), id); -} - -// ---------------------------------------------------------------------------- -// wxHelpProviderModule: module responsible for cleaning up help provider. -// ---------------------------------------------------------------------------- - -class wxHelpProviderModule : public wxModule -{ -public: - bool OnInit() wxOVERRIDE; - void OnExit() wxOVERRIDE; - -private: - wxDECLARE_DYNAMIC_CLASS(wxHelpProviderModule); -}; - -wxIMPLEMENT_DYNAMIC_CLASS(wxHelpProviderModule, wxModule); - -bool wxHelpProviderModule::OnInit() -{ - // Probably we don't want to do anything by default, - // since it could pull in extra code - // wxHelpProvider::Set(new wxSimpleHelpProvider); - - return true; -} - -void wxHelpProviderModule::OnExit() -{ - if (wxHelpProvider::Get()) - { - delete wxHelpProvider::Get(); - wxHelpProvider::Set(NULL); - } -} - -#endif // wxUSE_HELP diff --git a/Externals/wxWidgets3/src/common/ctrlcmn.cpp b/Externals/wxWidgets3/src/common/ctrlcmn.cpp deleted file mode 100644 index 84c13bc238..0000000000 --- a/Externals/wxWidgets3/src/common/ctrlcmn.cpp +++ /dev/null @@ -1,600 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/ctrlcmn.cpp -// Purpose: wxControl common interface -// Author: Vadim Zeitlin -// Modified by: -// Created: 26.07.99 -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_CONTROLS - -#include "wx/control.h" - -#ifndef WX_PRECOMP - #include "wx/dc.h" - #include "wx/log.h" - #include "wx/radiobut.h" - #include "wx/statbmp.h" - #include "wx/bitmap.h" - #include "wx/utils.h" // for wxStripMenuCodes() - #include "wx/settings.h" -#endif - -#include "wx/private/markupparser.h" - -const char wxControlNameStr[] = "control"; - -// ============================================================================ -// implementation -// ============================================================================ - -wxControlBase::~wxControlBase() -{ - // this destructor is required for Darwin -} - -bool wxControlBase::Create(wxWindow *parent, - wxWindowID id, - const wxPoint &pos, - const wxSize &size, - long style, - const wxValidator& wxVALIDATOR_PARAM(validator), - const wxString &name) -{ - bool ret = wxWindow::Create(parent, id, pos, size, style, name); - -#if wxUSE_VALIDATORS - if ( ret ) - SetValidator(validator); -#endif // wxUSE_VALIDATORS - - return ret; -} - -bool wxControlBase::CreateControl(wxWindowBase *parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style, - const wxValidator& validator, - const wxString& name) -{ - // even if it's possible to create controls without parents in some port, - // it should surely be discouraged because it doesn't work at all under - // Windows - wxCHECK_MSG( parent, false, wxT("all controls must have parents") ); - - if ( !CreateBase(parent, id, pos, size, style, validator, name) ) - return false; - - parent->AddChild(this); - - return true; -} - -void wxControlBase::Command(wxCommandEvent& event) -{ - (void)GetEventHandler()->ProcessEvent(event); -} - -void wxControlBase::InitCommandEvent(wxCommandEvent& event) const -{ - event.SetEventObject(const_cast(this)); - - // event.SetId(GetId()); -- this is usuall done in the event ctor - - switch ( m_clientDataType ) - { - case wxClientData_Void: - event.SetClientData(GetClientData()); - break; - - case wxClientData_Object: - event.SetClientObject(GetClientObject()); - break; - - case wxClientData_None: - // nothing to do - ; - } -} - -bool wxControlBase::SetFont(const wxFont& font) -{ - InvalidateBestSize(); - return wxWindow::SetFont(font); -} - -// wxControl-specific processing after processing the update event -void wxControlBase::DoUpdateWindowUI(wxUpdateUIEvent& event) -{ - // call inherited - wxWindowBase::DoUpdateWindowUI(event); - - // update label - if ( event.GetSetText() ) - { - if ( event.GetText() != GetLabel() ) - SetLabel(event.GetText()); - } - - // Unfortunately we don't yet have common base class for - // wxRadioButton, so we handle updates of radiobuttons here. - // TODO: If once wxRadioButtonBase will exist, move this code there. -#if wxUSE_RADIOBTN - if ( event.GetSetChecked() ) - { - wxRadioButton *radiobtn = wxDynamicCastThis(wxRadioButton); - if ( radiobtn ) - radiobtn->SetValue(event.GetChecked()); - } -#endif // wxUSE_RADIOBTN -} - -wxSize wxControlBase::DoGetSizeFromTextSize(int WXUNUSED(xlen), - int WXUNUSED(ylen)) const -{ - return wxSize(-1, -1); -} - -/* static */ -wxString wxControlBase::GetLabelText(const wxString& label) -{ - // we don't want strip the TABs here, just the mnemonics - return wxStripMenuCodes(label, wxStrip_Mnemonics); -} - -/* static */ -wxString wxControlBase::RemoveMnemonics(const wxString& str) -{ - // we don't want strip the TABs here, just the mnemonics - return wxStripMenuCodes(str, wxStrip_Mnemonics); -} - -/* static */ -wxString wxControlBase::EscapeMnemonics(const wxString& text) -{ - wxString label(text); - label.Replace("&", "&&"); - return label; -} - -/* static */ -int wxControlBase::FindAccelIndex(const wxString& label, wxString *labelOnly) -{ - // the character following MNEMONIC_PREFIX is the accelerator for this - // control unless it is MNEMONIC_PREFIX too - this allows to insert - // literal MNEMONIC_PREFIX chars into the label - static const wxChar MNEMONIC_PREFIX = wxT('&'); - - if ( labelOnly ) - { - labelOnly->Empty(); - labelOnly->Alloc(label.length()); - } - - int indexAccel = -1; - for ( wxString::const_iterator pc = label.begin(); pc != label.end(); ++pc ) - { - if ( *pc == MNEMONIC_PREFIX ) - { - ++pc; // skip it - if ( pc == label.end() ) - break; - else if ( *pc != MNEMONIC_PREFIX ) - { - if ( indexAccel == -1 ) - { - // remember it (-1 is for MNEMONIC_PREFIX itself - indexAccel = pc - label.begin() - 1; - } - else - { - wxFAIL_MSG(wxT("duplicate accel char in control label")); - } - } - } - - if ( labelOnly ) - { - *labelOnly += *pc; - } - } - - return indexAccel; -} - -wxBorder wxControlBase::GetDefaultBorder() const -{ - return wxBORDER_THEME; -} - -/* static */ wxVisualAttributes -wxControlBase::GetCompositeControlsDefaultAttributes(wxWindowVariant WXUNUSED(variant)) -{ - wxVisualAttributes attrs; - attrs.font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); - attrs.colFg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT); - attrs.colBg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW); - - return attrs; -} - -// ---------------------------------------------------------------------------- -// wxControl markup support -// ---------------------------------------------------------------------------- - -#if wxUSE_MARKUP - -/* static */ -wxString wxControlBase::RemoveMarkup(const wxString& markup) -{ - return wxMarkupParser::Strip(markup); -} - -bool wxControlBase::DoSetLabelMarkup(const wxString& markup) -{ - const wxString label = RemoveMarkup(markup); - if ( label.empty() && !markup.empty() ) - return false; - - SetLabel(label); - - return true; -} - -#endif // wxUSE_MARKUP - -// ---------------------------------------------------------------------------- -// wxControlBase - ellipsization code -// ---------------------------------------------------------------------------- - -#define wxELLIPSE_REPLACEMENT wxS("...") - -namespace -{ - -struct EllipsizeCalculator -{ - EllipsizeCalculator(const wxString& s, const wxDC& dc, - int maxFinalWidthPx, int replacementWidthPx) - : - m_initialCharToRemove(0), - m_nCharsToRemove(0), - m_outputNeedsUpdate(true), - m_str(s), - m_dc(dc), - m_maxFinalWidthPx(maxFinalWidthPx), - m_replacementWidthPx(replacementWidthPx) - { - m_isOk = dc.GetPartialTextExtents(s, m_charOffsetsPx); - wxASSERT( m_charOffsetsPx.GetCount() == s.length() ); - } - - bool IsOk() const { return m_isOk; } - - bool EllipsizationNotNeeded() const - { - // NOTE: charOffsetsPx[n] is the width in pixels of the first n characters (with the last one INCLUDED) - // thus charOffsetsPx[len-1] is the total width of the string - return m_charOffsetsPx.Last() <= m_maxFinalWidthPx; - } - - void Init(size_t initialCharToRemove, size_t nCharsToRemove) - { - m_initialCharToRemove = initialCharToRemove; - m_nCharsToRemove = nCharsToRemove; - } - - void RemoveFromEnd() - { - m_nCharsToRemove++; - } - - void RemoveFromStart() - { - m_initialCharToRemove--; - m_nCharsToRemove++; - } - - size_t GetFirstRemoved() const { return m_initialCharToRemove; } - size_t GetLastRemoved() const { return m_initialCharToRemove + m_nCharsToRemove - 1; } - - const wxString& GetEllipsizedText() - { - if ( m_outputNeedsUpdate ) - { - wxASSERT(m_initialCharToRemove <= m_str.length() - 1); // see valid range for initialCharToRemove above - wxASSERT(m_nCharsToRemove >= 1 && m_nCharsToRemove <= m_str.length() - m_initialCharToRemove); // see valid range for nCharsToRemove above - - // erase m_nCharsToRemove characters after m_initialCharToRemove (included); - // e.g. if we have the string "foobar" (len = 6) - // ^ - // \--- m_initialCharToRemove = 2 - // and m_nCharsToRemove = 2, then we get "foar" - m_output = m_str; - m_output.replace(m_initialCharToRemove, m_nCharsToRemove, wxELLIPSE_REPLACEMENT); - } - - return m_output; - } - - bool IsShortEnough() - { - if ( m_nCharsToRemove == m_str.length() ) - return true; // that's the best we could do - - // Width calculation using partial extents is just an inaccurate - // estimate: partial extents have sub-pixel precision and are rounded - // by GetPartialTextExtents(); replacing part of the string with "..." - // may change them too thanks to changes in ligatures, kerning etc. - // - // The correct algorithm would be to call GetTextExtent() in every step - // of ellipsization, but that would be too expensive, especially when - // the difference is just a few pixels. So we use partial extents to - // estimate string width and only verify it with GetTextExtent() when - // it looks good. - - int estimatedWidth = m_replacementWidthPx; // length of "..." - - // length of text before the removed part: - if ( m_initialCharToRemove > 0 ) - estimatedWidth += m_charOffsetsPx[m_initialCharToRemove - 1]; - - // length of text after the removed part: - - if ( GetLastRemoved() < m_str.length() ) - estimatedWidth += m_charOffsetsPx.Last() - m_charOffsetsPx[GetLastRemoved()]; - - if ( estimatedWidth > m_maxFinalWidthPx ) - return false; - - return m_dc.GetTextExtent(GetEllipsizedText()).GetWidth() <= m_maxFinalWidthPx; - } - - // calculation state: - - // REMEMBER: indexes inside the string have a valid range of [0;len-1] if not otherwise constrained - // lengths/counts of characters (e.g. nCharsToRemove) have a - // valid range of [0;len] if not otherwise constrained - // NOTE: since this point we know we have for sure a non-empty string from which we need - // to remove _at least_ one character (thus nCharsToRemove below is constrained to be >= 1) - - // index of first character to erase, valid range is [0;len-1]: - size_t m_initialCharToRemove; - // how many chars do we need to erase? valid range is [0;len-m_initialCharToRemove] - size_t m_nCharsToRemove; - - wxString m_output; - bool m_outputNeedsUpdate; - - // inputs: - wxString m_str; - const wxDC& m_dc; - int m_maxFinalWidthPx; - int m_replacementWidthPx; - wxArrayInt m_charOffsetsPx; - - bool m_isOk; -}; - -} // anonymous namespace - -/* static and protected */ -wxString wxControlBase::DoEllipsizeSingleLine(const wxString& curLine, const wxDC& dc, - wxEllipsizeMode mode, int maxFinalWidthPx, - int replacementWidthPx) -{ - wxASSERT_MSG(replacementWidthPx > 0, "Invalid parameters"); - wxASSERT_LEVEL_2_MSG(!curLine.Contains('\n'), - "Use Ellipsize() instead!"); - - wxASSERT_MSG( mode != wxELLIPSIZE_NONE, "shouldn't be called at all then" ); - - // NOTE: this function assumes that any mnemonic/tab character has already - // been handled if it was necessary to handle them (see Ellipsize()) - - if (maxFinalWidthPx <= 0) - return wxEmptyString; - - size_t len = curLine.length(); - if (len <= 1 ) - return curLine; - - EllipsizeCalculator calc(curLine, dc, maxFinalWidthPx, replacementWidthPx); - - if ( !calc.IsOk() ) - return curLine; - - if ( calc.EllipsizationNotNeeded() ) - return curLine; - - // let's compute the range of characters to remove depending on the ellipsization mode: - switch (mode) - { - case wxELLIPSIZE_START: - { - calc.Init(0, 1); - while ( !calc.IsShortEnough() ) - calc.RemoveFromEnd(); - - // always show at least one character of the string: - if ( calc.m_nCharsToRemove == len ) - return wxString(wxELLIPSE_REPLACEMENT) + curLine[len-1]; - - break; - } - - case wxELLIPSIZE_MIDDLE: - { - // NOTE: the following piece of code works also when len == 1 - - // start the removal process from the middle of the string - // i.e. separe the string in three parts: - // - the first one to preserve, valid range [0;initialCharToRemove-1] or the empty range if initialCharToRemove==0 - // - the second one to remove, valid range [initialCharToRemove;endCharToRemove] - // - the third one to preserve, valid range [endCharToRemove+1;len-1] or the empty range if endCharToRemove==len-1 - // NOTE: empty range != range [0;0] since the range [0;0] contains 1 character (the zero-th one)! - - calc.Init(len/2, 0); - - bool removeFromStart = true; - - while ( !calc.IsShortEnough() ) - { - const bool canRemoveFromStart = calc.GetFirstRemoved() > 0; - const bool canRemoveFromEnd = calc.GetLastRemoved() < len - 1; - - if ( !canRemoveFromStart && !canRemoveFromEnd ) - { - // we need to remove all the characters of the string! - break; - } - - // Remove from the beginning in even steps and from the end - // in odd steps, unless we exhausted one side already: - removeFromStart = !removeFromStart; - if ( removeFromStart && !canRemoveFromStart ) - removeFromStart = false; - else if ( !removeFromStart && !canRemoveFromEnd ) - removeFromStart = true; - - if ( removeFromStart ) - calc.RemoveFromStart(); - else - calc.RemoveFromEnd(); - } - - // Always show at least one character of the string. - // Additionally, if there's only one character left, prefer - // "a..." to "...a": - if ( calc.m_nCharsToRemove == len || - calc.m_nCharsToRemove == len - 1 ) - { - return curLine[0] + wxString(wxELLIPSE_REPLACEMENT); - } - } - break; - - case wxELLIPSIZE_END: - { - calc.Init(len - 1, 1); - while ( !calc.IsShortEnough() ) - calc.RemoveFromStart(); - - // always show at least one character of the string: - if ( calc.m_nCharsToRemove == len ) - return curLine[0] + wxString(wxELLIPSE_REPLACEMENT); - - break; - } - - case wxELLIPSIZE_NONE: - default: - wxFAIL_MSG("invalid ellipsize mode"); - return curLine; - } - - return calc.GetEllipsizedText(); -} - -/* static */ -wxString wxControlBase::Ellipsize(const wxString& label, const wxDC& dc, - wxEllipsizeMode mode, int maxFinalWidth, - int flags) -{ - if (mode == wxELLIPSIZE_NONE) - return label; - - wxString ret; - - // these cannot be cached between different Ellipsize() calls as they can - // change because of e.g. a font change; however we calculate them only once - // when ellipsizing multiline labels: - int replacementWidth = dc.GetTextExtent(wxELLIPSE_REPLACEMENT).GetWidth(); - - // NB: we must handle correctly labels with newlines: - wxString curLine; - for ( wxString::const_iterator pc = label.begin(); ; ++pc ) - { - if ( pc == label.end() || *pc == wxS('\n') ) - { - curLine = DoEllipsizeSingleLine(curLine, dc, mode, maxFinalWidth, - replacementWidth); - - // add this (ellipsized) row to the rest of the label - ret << curLine; - if ( pc == label.end() ) - break; - - ret << *pc; - curLine.clear(); - } - // we need to remove mnemonics from the label for correct calculations - else if ( *pc == wxS('&') && (flags & wxELLIPSIZE_FLAGS_PROCESS_MNEMONICS) ) - { - // pc+1 is safe: at worst we'll be at end() - wxString::const_iterator next = pc + 1; - if ( next != label.end() && *next == wxS('&') ) - curLine += wxS('&'); // && becomes & - //else: remove this ampersand - } - // we need also to expand tabs to properly calc their size - else if ( *pc == wxS('\t') && (flags & wxELLIPSIZE_FLAGS_EXPAND_TABS) ) - { - // Windows natively expands the TABs to 6 spaces. Do the same: - curLine += wxS(" "); - } - else - { - curLine += *pc; - } - } - - return ret; -} - -// ---------------------------------------------------------------------------- -// wxStaticBitmap -// ---------------------------------------------------------------------------- - -#if wxUSE_STATBMP - -wxStaticBitmapBase::~wxStaticBitmapBase() -{ - // this destructor is required for Darwin -} - -wxSize wxStaticBitmapBase::DoGetBestSize() const -{ - wxSize best; - wxBitmap bmp = GetBitmap(); - if ( bmp.IsOk() ) - best = bmp.GetScaledSize(); - else - // this is completely arbitrary - best = wxSize(16, 16); - CacheBestSize(best); - return best; -} - -#endif // wxUSE_STATBMP - -#endif // wxUSE_CONTROLS diff --git a/Externals/wxWidgets3/src/common/ctrlsub.cpp b/Externals/wxWidgets3/src/common/ctrlsub.cpp deleted file mode 100644 index afba9ce85b..0000000000 --- a/Externals/wxWidgets3/src/common/ctrlsub.cpp +++ /dev/null @@ -1,309 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/ctrlsub.cpp -// Purpose: wxItemContainer implementation -// Author: Vadim Zeitlin -// Modified by: -// Created: 22.10.99 -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_CONTROLS - -#ifndef WX_PRECOMP - #include "wx/ctrlsub.h" - #include "wx/arrstr.h" -#endif - -wxIMPLEMENT_ABSTRACT_CLASS(wxControlWithItems, wxControl); - -// ============================================================================ -// wxItemContainerImmutable implementation -// ============================================================================ - -wxItemContainerImmutable::~wxItemContainerImmutable() -{ - // this destructor is required for Darwin -} - -// ---------------------------------------------------------------------------- -// selection -// ---------------------------------------------------------------------------- - -wxString wxItemContainerImmutable::GetStringSelection() const -{ - wxString s; - - int sel = GetSelection(); - if ( sel != wxNOT_FOUND ) - s = GetString((unsigned int)sel); - - return s; -} - -bool wxItemContainerImmutable::SetStringSelection(const wxString& s) -{ - const int sel = FindString(s); - if ( sel == wxNOT_FOUND ) - return false; - - SetSelection(sel); - - return true; -} - -wxArrayString wxItemContainerImmutable::GetStrings() const -{ - wxArrayString result; - - const unsigned int count = GetCount(); - result.Alloc(count); - for ( unsigned int n = 0; n < count; n++ ) - result.Add(GetString(n)); - - return result; -} - -// ============================================================================ -// wxItemContainer implementation -// ============================================================================ - -wxItemContainer::~wxItemContainer() -{ - // this destructor is required for Darwin -} - -// ---------------------------------------------------------------------------- -// deleting items -// ---------------------------------------------------------------------------- - -void wxItemContainer::Clear() -{ - if ( HasClientObjectData() ) - { - const unsigned count = GetCount(); - for ( unsigned i = 0; i < count; ++i ) - ResetItemClientObject(i); - } - - SetClientDataType(wxClientData_None); - - DoClear(); -} - -void wxItemContainer::Delete(unsigned int pos) -{ - wxCHECK_RET( pos < GetCount(), wxT("invalid index") ); - - if ( HasClientObjectData() ) - ResetItemClientObject(pos); - - DoDeleteOneItem(pos); - - if ( IsEmpty() ) - { - SetClientDataType(wxClientData_None); - } -} - -// ---------------------------------------------------------------------------- -// -// ---------------------------------------------------------------------------- - -int wxItemContainer::DoInsertItemsInLoop(const wxArrayStringsAdapter& items, - unsigned int pos, - void **clientData, - wxClientDataType type) -{ - int n = wxNOT_FOUND; - - const unsigned int count = items.GetCount(); - for ( unsigned int i = 0; i < count; ++i ) - { - n = DoInsertOneItem(items[i], pos++); - if ( n == wxNOT_FOUND ) - break; - - AssignNewItemClientData(n, clientData, i, type); - } - - return n; -} - -int -wxItemContainer::DoInsertOneItem(const wxString& WXUNUSED(item), - unsigned int WXUNUSED(pos)) -{ - wxFAIL_MSG( wxT("Must be overridden if DoInsertItemsInLoop() is used") ); - - return wxNOT_FOUND; -} - - -// ---------------------------------------------------------------------------- -// client data -// ---------------------------------------------------------------------------- - -void wxItemContainer::SetClientObject(unsigned int n, wxClientData *data) -{ - wxASSERT_MSG( !HasClientUntypedData(), - wxT("can't have both object and void client data") ); - - wxCHECK_RET( IsValid(n), "Invalid index passed to SetClientObject()" ); - - if ( HasClientObjectData() ) - { - wxClientData * clientDataOld - = static_cast(DoGetItemClientData(n)); - if ( clientDataOld ) - delete clientDataOld; - } - else // didn't have any client data so far - { - // now we have object client data - DoInitItemClientData(); - - SetClientDataType(wxClientData_Object); - } - - DoSetItemClientData(n, data); -} - -wxClientData *wxItemContainer::GetClientObject(unsigned int n) const -{ - wxCHECK_MSG( HasClientObjectData(), NULL, - wxT("this window doesn't have object client data") ); - - wxCHECK_MSG( IsValid(n), NULL, - "Invalid index passed to GetClientObject()" ); - - return static_cast(DoGetItemClientData(n)); -} - -wxClientData *wxItemContainer::DetachClientObject(unsigned int n) -{ - wxClientData * const data = GetClientObject(n); - if ( data ) - { - // reset the pointer as we don't own it any more - DoSetItemClientData(n, NULL); - } - - return data; -} - -void wxItemContainer::SetClientData(unsigned int n, void *data) -{ - if ( !HasClientData() ) - { - DoInitItemClientData(); - SetClientDataType(wxClientData_Void); - } - - wxASSERT_MSG( HasClientUntypedData(), - wxT("can't have both object and void client data") ); - - wxCHECK_RET( IsValid(n), "Invalid index passed to SetClientData()" ); - - DoSetItemClientData(n, data); -} - -void *wxItemContainer::GetClientData(unsigned int n) const -{ - wxCHECK_MSG( HasClientUntypedData(), NULL, - wxT("this window doesn't have void client data") ); - - wxCHECK_MSG( IsValid(n), NULL, - "Invalid index passed to GetClientData()" ); - - return DoGetItemClientData(n); -} - -void wxItemContainer::AssignNewItemClientData(unsigned int pos, - void **clientData, - unsigned int n, - wxClientDataType type) -{ - switch ( type ) - { - case wxClientData_Object: - SetClientObject - ( - pos, - (reinterpret_cast(clientData))[n] - ); - break; - - case wxClientData_Void: - SetClientData(pos, clientData[n]); - break; - - default: - wxFAIL_MSG( wxT("unknown client data type") ); - wxFALLTHROUGH; - - case wxClientData_None: - // nothing to do - break; - } -} - -void wxItemContainer::ResetItemClientObject(unsigned int n) -{ - wxClientData * const data = GetClientObject(n); - if ( data ) - { - delete data; - DoSetItemClientData(n, NULL); - } -} - -// ============================================================================ -// wxControlWithItems implementation -// ============================================================================ - -void -wxControlWithItemsBase::InitCommandEventWithItems(wxCommandEvent& event, int n) -{ - InitCommandEvent(event); - - if ( n != wxNOT_FOUND ) - { - if ( HasClientObjectData() ) - event.SetClientObject(GetClientObject(n)); - else if ( HasClientUntypedData() ) - event.SetClientData(GetClientData(n)); - } -} - -void wxControlWithItemsBase::SendSelectionChangedEvent(wxEventType eventType) -{ - const int n = GetSelection(); - if ( n == wxNOT_FOUND ) - return; - - wxCommandEvent event(eventType, m_windowId); - event.SetInt(n); - event.SetEventObject(this); - event.SetString(GetStringSelection()); - InitCommandEventWithItems(event, n); - - HandleWindowEvent(event); -} - -#endif // wxUSE_CONTROLS diff --git a/Externals/wxWidgets3/src/common/datavcmn.cpp b/Externals/wxWidgets3/src/common/datavcmn.cpp deleted file mode 100644 index 6775d5fc53..0000000000 --- a/Externals/wxWidgets3/src/common/datavcmn.cpp +++ /dev/null @@ -1,2697 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/datavcmn.cpp -// Purpose: wxDataViewCtrl base classes and common parts -// Author: Robert Roebling -// Created: 2006/02/20 -// Copyright: (c) 2006, Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_DATAVIEWCTRL - -#include "wx/dataview.h" - -#ifndef WX_PRECOMP - #include "wx/dc.h" - #include "wx/settings.h" - #include "wx/log.h" - #include "wx/crt.h" -#endif - -#include "wx/datectrl.h" -#include "wx/spinctrl.h" -#include "wx/choice.h" -#include "wx/imaglist.h" -#include "wx/renderer.h" - -const char wxDataViewCtrlNameStr[] = "dataviewCtrl"; - -namespace -{ - -// Custom handler pushed on top of the edit control used by wxDataViewCtrl to -// forward some events to the main control itself. -class wxDataViewEditorCtrlEvtHandler: public wxEvtHandler -{ -public: - wxDataViewEditorCtrlEvtHandler(wxWindow *editor, wxDataViewRenderer *owner) - { - m_editorCtrl = editor; - m_owner = owner; - - m_finished = false; - } - - void SetFocusOnIdle( bool focus = true ) { m_focusOnIdle = focus; } - -protected: - void OnChar( wxKeyEvent &event ); - void OnTextEnter( wxCommandEvent &event ); - void OnKillFocus( wxFocusEvent &event ); - void OnIdle( wxIdleEvent &event ); - -private: - wxDataViewRenderer *m_owner; - wxWindow *m_editorCtrl; - bool m_finished; - bool m_focusOnIdle; - -private: - wxDECLARE_EVENT_TABLE(); -}; - -} // anonymous namespace - -// --------------------------------------------------------- -// wxDataViewItemAttr -// --------------------------------------------------------- - -wxFont wxDataViewItemAttr::GetEffectiveFont(const wxFont& font) const -{ - if ( !HasFont() ) - return font; - - wxFont f(font); - if ( GetBold() ) - f.MakeBold(); - if ( GetItalic() ) - f.MakeItalic(); - return f; -} - - -// --------------------------------------------------------- -// wxDataViewModelNotifier -// --------------------------------------------------------- - -#include "wx/listimpl.cpp" -WX_DEFINE_LIST(wxDataViewModelNotifiers) - -bool wxDataViewModelNotifier::ItemsAdded( const wxDataViewItem &parent, const wxDataViewItemArray &items ) -{ - size_t count = items.GetCount(); - size_t i; - for (i = 0; i < count; i++) - if (!ItemAdded( parent, items[i] )) return false; - - return true; -} - -bool wxDataViewModelNotifier::ItemsDeleted( const wxDataViewItem &parent, const wxDataViewItemArray &items ) -{ - size_t count = items.GetCount(); - size_t i; - for (i = 0; i < count; i++) - if (!ItemDeleted( parent, items[i] )) return false; - - return true; -} - -bool wxDataViewModelNotifier::ItemsChanged( const wxDataViewItemArray &items ) -{ - size_t count = items.GetCount(); - size_t i; - for (i = 0; i < count; i++) - if (!ItemChanged( items[i] )) return false; - - return true; -} - -// --------------------------------------------------------- -// wxDataViewModel -// --------------------------------------------------------- - -wxDataViewModel::wxDataViewModel() -{ - m_notifiers.DeleteContents( true ); -} - -bool wxDataViewModel::ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item ) -{ - bool ret = true; - - wxDataViewModelNotifiers::iterator iter; - for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter) - { - wxDataViewModelNotifier* notifier = *iter; - if (!notifier->ItemAdded( parent, item )) - ret = false; - } - - return ret; -} - -bool wxDataViewModel::ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item ) -{ - bool ret = true; - - wxDataViewModelNotifiers::iterator iter; - for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter) - { - wxDataViewModelNotifier* notifier = *iter; - if (!notifier->ItemDeleted( parent, item )) - ret = false; - } - - return ret; -} - -bool wxDataViewModel::ItemChanged( const wxDataViewItem &item ) -{ - bool ret = true; - - wxDataViewModelNotifiers::iterator iter; - for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter) - { - wxDataViewModelNotifier* notifier = *iter; - if (!notifier->ItemChanged( item )) - ret = false; - } - - return ret; -} - -bool wxDataViewModel::ItemsAdded( const wxDataViewItem &parent, const wxDataViewItemArray &items ) -{ - bool ret = true; - - wxDataViewModelNotifiers::iterator iter; - for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter) - { - wxDataViewModelNotifier* notifier = *iter; - if (!notifier->ItemsAdded( parent, items )) - ret = false; - } - - return ret; -} - -bool wxDataViewModel::ItemsDeleted( const wxDataViewItem &parent, const wxDataViewItemArray &items ) -{ - bool ret = true; - - wxDataViewModelNotifiers::iterator iter; - for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter) - { - wxDataViewModelNotifier* notifier = *iter; - if (!notifier->ItemsDeleted( parent, items )) - ret = false; - } - - return ret; -} - -bool wxDataViewModel::ItemsChanged( const wxDataViewItemArray &items ) -{ - bool ret = true; - - wxDataViewModelNotifiers::iterator iter; - for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter) - { - wxDataViewModelNotifier* notifier = *iter; - if (!notifier->ItemsChanged( items )) - ret = false; - } - - return ret; -} - -bool wxDataViewModel::ValueChanged( const wxDataViewItem &item, unsigned int col ) -{ - bool ret = true; - - wxDataViewModelNotifiers::iterator iter; - for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter) - { - wxDataViewModelNotifier* notifier = *iter; - if (!notifier->ValueChanged( item, col )) - ret = false; - } - - return ret; -} - -bool wxDataViewModel::Cleared() -{ - bool ret = true; - - wxDataViewModelNotifiers::iterator iter; - for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter) - { - wxDataViewModelNotifier* notifier = *iter; - if (!notifier->Cleared()) - ret = false; - } - - return ret; -} - -bool wxDataViewModel::BeforeReset() -{ - bool ret = true; - - wxDataViewModelNotifiers::iterator iter; - for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter) - { - wxDataViewModelNotifier* notifier = *iter; - if (!notifier->BeforeReset()) - ret = false; - } - - return ret; -} - -bool wxDataViewModel::AfterReset() -{ - bool ret = true; - - wxDataViewModelNotifiers::iterator iter; - for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter) - { - wxDataViewModelNotifier* notifier = *iter; - if (!notifier->AfterReset()) - ret = false; - } - - return ret; -} - -void wxDataViewModel::Resort() -{ - wxDataViewModelNotifiers::iterator iter; - for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter) - { - wxDataViewModelNotifier* notifier = *iter; - notifier->Resort(); - } -} - -void wxDataViewModel::AddNotifier( wxDataViewModelNotifier *notifier ) -{ - m_notifiers.push_back( notifier ); - notifier->SetOwner( this ); -} - -void wxDataViewModel::RemoveNotifier( wxDataViewModelNotifier *notifier ) -{ - m_notifiers.DeleteObject( notifier ); -} - -int wxDataViewModel::Compare( const wxDataViewItem &item1, const wxDataViewItem &item2, - unsigned int column, bool ascending ) const -{ - wxVariant value1,value2; - GetValue( value1, item1, column ); - GetValue( value2, item2, column ); - - if (!ascending) - { - wxVariant temp = value1; - value1 = value2; - value2 = temp; - } - - if (value1.GetType() == wxT("string")) - { - wxString str1 = value1.GetString(); - wxString str2 = value2.GetString(); - int res = str1.Cmp( str2 ); - if (res) - return res; - } - else if (value1.GetType() == wxT("long")) - { - long l1 = value1.GetLong(); - long l2 = value2.GetLong(); - if (l1 < l2) - return -1; - else if (l1 > l2) - return 1; - } - else if (value1.GetType() == wxT("double")) - { - double d1 = value1.GetDouble(); - double d2 = value2.GetDouble(); - if (d1 < d2) - return -1; - else if (d1 > d2) - return 1; - } -#if wxUSE_DATETIME - else if (value1.GetType() == wxT("datetime")) - { - wxDateTime dt1 = value1.GetDateTime(); - wxDateTime dt2 = value2.GetDateTime(); - if (dt1.IsEarlierThan(dt2)) - return -1; - if (dt2.IsEarlierThan(dt1)) - return 1; - } -#endif // wxUSE_DATETIME - else if (value1.GetType() == wxT("bool")) - { - bool b1 = value1.GetBool(); - bool b2 = value2.GetBool(); - - if (b1 != b2) - return b1 ? 1 : -1; - } - else if (value1.GetType() == wxT("wxDataViewIconText")) - { - wxDataViewIconText iconText1, iconText2; - - iconText1 << value1; - iconText2 << value2; - - int res = iconText1.GetText().Cmp(iconText2.GetText()); - if (res != 0) - return res; - } - - - // items must be different - wxUIntPtr id1 = wxPtrToUInt(item1.GetID()), - id2 = wxPtrToUInt(item2.GetID()); - - return ascending ? id1 - id2 : id2 - id1; -} - -// --------------------------------------------------------- -// wxDataViewIndexListModel -// --------------------------------------------------------- - -static int my_sort( int *v1, int *v2 ) -{ - return *v2-*v1; -} - - -wxDataViewIndexListModel::wxDataViewIndexListModel( unsigned int initial_size ) -{ - // IDs are ordered until an item gets deleted or inserted - m_ordered = true; - - // build initial index - unsigned int i; - for (i = 1; i < initial_size+1; i++) - m_hash.Add( wxDataViewItem(wxUIntToPtr(i)) ); - m_nextFreeID = initial_size + 1; -} - -void wxDataViewIndexListModel::Reset( unsigned int new_size ) -{ - /* wxDataViewModel:: */ BeforeReset(); - - m_hash.Clear(); - - // IDs are ordered until an item gets deleted or inserted - m_ordered = true; - - // build initial index - unsigned int i; - for (i = 1; i < new_size+1; i++) - m_hash.Add( wxDataViewItem(wxUIntToPtr(i)) ); - - m_nextFreeID = new_size + 1; - - /* wxDataViewModel:: */ AfterReset(); -} - -void wxDataViewIndexListModel::RowPrepended() -{ - m_ordered = false; - - unsigned int id = m_nextFreeID; - m_nextFreeID++; - - wxDataViewItem item( wxUIntToPtr(id) ); - m_hash.Insert( item, 0 ); - ItemAdded( wxDataViewItem(0), item ); - -} - -void wxDataViewIndexListModel::RowInserted( unsigned int before ) -{ - m_ordered = false; - - unsigned int id = m_nextFreeID; - m_nextFreeID++; - - wxDataViewItem item( wxUIntToPtr(id) ); - m_hash.Insert( item, before ); - ItemAdded( wxDataViewItem(0), item ); -} - -void wxDataViewIndexListModel::RowAppended() -{ - unsigned int id = m_nextFreeID; - m_nextFreeID++; - - wxDataViewItem item( wxUIntToPtr(id) ); - m_hash.Add( item ); - ItemAdded( wxDataViewItem(0), item ); -} - -void wxDataViewIndexListModel::RowDeleted( unsigned int row ) -{ - m_ordered = false; - - wxDataViewItem item( m_hash[row] ); - m_hash.RemoveAt( row ); - /* wxDataViewModel:: */ ItemDeleted( wxDataViewItem(0), item ); -} - -void wxDataViewIndexListModel::RowsDeleted( const wxArrayInt &rows ) -{ - m_ordered = false; - - wxDataViewItemArray array; - unsigned int i; - for (i = 0; i < rows.GetCount(); i++) - { - wxDataViewItem item( m_hash[rows[i]] ); - array.Add( item ); - } - - wxArrayInt sorted = rows; - sorted.Sort( my_sort ); - for (i = 0; i < sorted.GetCount(); i++) - m_hash.RemoveAt( sorted[i] ); - - /* wxDataViewModel:: */ ItemsDeleted( wxDataViewItem(0), array ); -} - -void wxDataViewIndexListModel::RowChanged( unsigned int row ) -{ - /* wxDataViewModel:: */ ItemChanged( GetItem(row) ); -} - -void wxDataViewIndexListModel::RowValueChanged( unsigned int row, unsigned int col ) -{ - /* wxDataViewModel:: */ ValueChanged( GetItem(row), col ); -} - -unsigned int wxDataViewIndexListModel::GetRow( const wxDataViewItem &item ) const -{ - if (m_ordered) - return wxPtrToUInt(item.GetID())-1; - - // assert for not found - return (unsigned int) m_hash.Index( item ); -} - -wxDataViewItem wxDataViewIndexListModel::GetItem( unsigned int row ) const -{ - wxASSERT( row < m_hash.GetCount() ); - return wxDataViewItem( m_hash[row] ); -} - -unsigned int wxDataViewIndexListModel::GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const -{ - if (item.IsOk()) - return 0; - - children = m_hash; - - return m_hash.GetCount(); -} - -// --------------------------------------------------------- -// wxDataViewVirtualListModel -// --------------------------------------------------------- - -#ifndef __WXMAC__ - -wxDataViewVirtualListModel::wxDataViewVirtualListModel( unsigned int initial_size ) -{ - m_size = initial_size; -} - -void wxDataViewVirtualListModel::Reset( unsigned int new_size ) -{ - /* wxDataViewModel:: */ BeforeReset(); - - m_size = new_size; - - /* wxDataViewModel:: */ AfterReset(); -} - -void wxDataViewVirtualListModel::RowPrepended() -{ - m_size++; - wxDataViewItem item( wxUIntToPtr(1) ); - ItemAdded( wxDataViewItem(0), item ); -} - -void wxDataViewVirtualListModel::RowInserted( unsigned int before ) -{ - m_size++; - wxDataViewItem item( wxUIntToPtr(before+1) ); - ItemAdded( wxDataViewItem(0), item ); -} - -void wxDataViewVirtualListModel::RowAppended() -{ - m_size++; - wxDataViewItem item( wxUIntToPtr(m_size) ); - ItemAdded( wxDataViewItem(0), item ); -} - -void wxDataViewVirtualListModel::RowDeleted( unsigned int row ) -{ - m_size--; - wxDataViewItem item( wxUIntToPtr(row+1) ); - /* wxDataViewModel:: */ ItemDeleted( wxDataViewItem(0), item ); -} - -void wxDataViewVirtualListModel::RowsDeleted( const wxArrayInt &rows ) -{ - m_size -= rows.GetCount(); - - wxArrayInt sorted = rows; - sorted.Sort( my_sort ); - - wxDataViewItemArray array; - unsigned int i; - for (i = 0; i < sorted.GetCount(); i++) - { - wxDataViewItem item( wxUIntToPtr(sorted[i]+1) ); - array.Add( item ); - } - /* wxDataViewModel:: */ ItemsDeleted( wxDataViewItem(0), array ); -} - -void wxDataViewVirtualListModel::RowChanged( unsigned int row ) -{ - /* wxDataViewModel:: */ ItemChanged( GetItem(row) ); -} - -void wxDataViewVirtualListModel::RowValueChanged( unsigned int row, unsigned int col ) -{ - /* wxDataViewModel:: */ ValueChanged( GetItem(row), col ); -} - -unsigned int wxDataViewVirtualListModel::GetRow( const wxDataViewItem &item ) const -{ - return wxPtrToUInt( item.GetID() ) -1; -} - -wxDataViewItem wxDataViewVirtualListModel::GetItem( unsigned int row ) const -{ - return wxDataViewItem( wxUIntToPtr(row+1) ); -} - -bool wxDataViewVirtualListModel::HasDefaultCompare() const -{ - return true; -} - -int wxDataViewVirtualListModel::Compare(const wxDataViewItem& item1, - const wxDataViewItem& item2, - unsigned int WXUNUSED(column), - bool ascending) const -{ - unsigned int pos1 = wxPtrToUInt(item1.GetID()); // -1 not needed here - unsigned int pos2 = wxPtrToUInt(item2.GetID()); // -1 not needed here - - if (ascending) - return pos1 - pos2; - else - return pos2 - pos1; -} - -unsigned int wxDataViewVirtualListModel::GetChildren( const wxDataViewItem &WXUNUSED(item), wxDataViewItemArray &WXUNUSED(children) ) const -{ - return 0; // should we report an error ? -} - -#endif // __WXMAC__ - -//----------------------------------------------------------------------------- -// wxDataViewIconText -//----------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxDataViewIconText,wxObject); - -IMPLEMENT_VARIANT_OBJECT_EXPORTED(wxDataViewIconText, WXDLLIMPEXP_ADV) - -// --------------------------------------------------------- -// wxDataViewRendererBase -// --------------------------------------------------------- - -wxIMPLEMENT_ABSTRACT_CLASS(wxDataViewRendererBase, wxObject); - -wxDataViewRendererBase::wxDataViewRendererBase( const wxString &varianttype, - wxDataViewCellMode WXUNUSED(mode), - int WXUNUSED(align) ) -{ - m_variantType = varianttype; - m_owner = NULL; -} - -wxDataViewRendererBase::~wxDataViewRendererBase() -{ - if ( m_editorCtrl ) - DestroyEditControl(); -} - -wxDataViewCtrl* wxDataViewRendererBase::GetView() const -{ - return const_cast(this)->GetOwner()->GetOwner(); -} - -bool wxDataViewRendererBase::StartEditing( const wxDataViewItem &item, wxRect labelRect ) -{ - wxDataViewCtrl* dv_ctrl = GetOwner()->GetOwner(); - - // Before doing anything we send an event asking if editing of this item is really wanted. - wxDataViewEvent start_event( wxEVT_DATAVIEW_ITEM_START_EDITING, dv_ctrl->GetId() ); - start_event.SetDataViewColumn( GetOwner() ); - start_event.SetModel( dv_ctrl->GetModel() ); - start_event.SetItem( item ); - start_event.SetEventObject( dv_ctrl ); - dv_ctrl->GetEventHandler()->ProcessEvent( start_event ); - if( !start_event.IsAllowed() ) - return false; - - unsigned int col = GetOwner()->GetModelColumn(); - const wxVariant& value = CheckedGetValue(dv_ctrl->GetModel(), item, col); - - m_editorCtrl = CreateEditorCtrl( dv_ctrl->GetMainWindow(), labelRect, value ); - - // there might be no editor control for the given item - if(!m_editorCtrl) - return false; - - wxDataViewEditorCtrlEvtHandler *handler = - new wxDataViewEditorCtrlEvtHandler( m_editorCtrl, (wxDataViewRenderer*) this ); - - m_editorCtrl->PushEventHandler( handler ); - -#if defined(__WXGTK20__) && !defined(wxUSE_GENERICDATAVIEWCTRL) - handler->SetFocusOnIdle(); -#else - m_editorCtrl->SetFocus(); -#endif - - return true; -} - -void wxDataViewRendererBase::NotifyEditingStarted(const wxDataViewItem& item) -{ - // Remember the item being edited for use in FinishEditing() later. - m_item = item; - - wxDataViewColumn* const column = GetOwner(); - wxDataViewCtrl* const dv_ctrl = column->GetOwner(); - - wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_EDITING_STARTED, dv_ctrl->GetId() ); - event.SetDataViewColumn( column ); - event.SetModel( dv_ctrl->GetModel() ); - event.SetItem( item ); - event.SetEventObject( dv_ctrl ); - dv_ctrl->GetEventHandler()->ProcessEvent( event ); -} - -void wxDataViewRendererBase::DestroyEditControl() -{ - // Remove our event handler first to prevent it from (recursively) calling - // us again as it would do via a call to FinishEditing() when the editor - // loses focus when we hide it below. - wxEvtHandler * const handler = m_editorCtrl->PopEventHandler(); - - // Hide the control immediately but don't delete it yet as there could be - // some pending messages for it. - m_editorCtrl->Hide(); - - wxPendingDelete.Append(handler); - wxPendingDelete.Append(m_editorCtrl); - - // Ensure that DestroyEditControl() is not called again for this control. - m_editorCtrl.Release(); -} - -void wxDataViewRendererBase::CancelEditing() -{ - if (!m_editorCtrl) - return; - - DestroyEditControl(); -} - -bool wxDataViewRendererBase::FinishEditing() -{ - if (!m_editorCtrl) - return true; - - // Try to get the value, normally we should succeed but if we fail, don't - // return immediately, we still need to destroy the edit control. - wxVariant value; - const bool gotValue = GetValueFromEditorCtrl(m_editorCtrl, value); - - wxDataViewCtrl* dv_ctrl = GetOwner()->GetOwner(); - - DestroyEditControl(); - - dv_ctrl->GetMainWindow()->SetFocus(); - - if ( !gotValue ) - return false; - - bool isValid = Validate(value); - unsigned int col = GetOwner()->GetModelColumn(); - - // Now we should send Editing Done event - wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_EDITING_DONE, dv_ctrl->GetId() ); - event.SetDataViewColumn( GetOwner() ); - event.SetModel( dv_ctrl->GetModel() ); - event.SetItem( m_item ); - event.SetValue( value ); - event.SetColumn( col ); - event.SetEditCanceled( !isValid ); - event.SetEventObject( dv_ctrl ); - dv_ctrl->GetEventHandler()->ProcessEvent( event ); - - bool accepted = false; - if ( isValid && event.IsAllowed() ) - { - dv_ctrl->GetModel()->ChangeValue(value, m_item, col); - accepted = true; - } - - m_item = wxDataViewItem(); - - return accepted; -} - -wxVariant -wxDataViewRendererBase::CheckedGetValue(const wxDataViewModel* model, - const wxDataViewItem& item, - unsigned column) const -{ - wxVariant value; - model->GetValue(value, item, column); - - // We always allow the cell to be null, regardless of the renderer type. - if ( !value.IsNull() ) - { - if ( value.GetType() != GetVariantType() ) - { - // If you're seeing this message, this indicates that either your - // renderer is using the wrong type, or your model returns values - // of the wrong type. - wxLogDebug("Wrong type returned from the model for column %u: " - "%s required but actual type is %s", - column, - GetVariantType(), - value.GetType()); - - // Don't return data of mismatching type, this could be unexpected. - value.MakeNull(); - } - } - - return value; -} - -bool -wxDataViewRendererBase::PrepareForItem(const wxDataViewModel *model, - const wxDataViewItem& item, - unsigned column) -{ - // Now check if we have a value and remember it for rendering it later. - // Notice that we do it even if it's null, as the cell should be empty then - // and not show the last used value. - const wxVariant& value = CheckedGetValue(model, item, column); - SetValue(value); - - if ( !value.IsNull() ) - { - // Also set up the attributes for this item if it's not empty. - wxDataViewItemAttr attr; - model->GetAttr(item, column, attr); - SetAttr(attr); - } - - // Finally determine the enabled/disabled state and apply it, even to the - // empty cells. - bool enabled = true; - switch ( GetMode() ) - { - case wxDATAVIEW_CELL_INERT: - enabled = false; - break; - - case wxDATAVIEW_CELL_ACTIVATABLE: - case wxDATAVIEW_CELL_EDITABLE: - enabled = model->IsEnabled(item, column); - break; - } - - SetEnabled(enabled); - - return true; -} - - -int wxDataViewRendererBase::GetEffectiveAlignment() const -{ - int alignment = GetAlignment(); - - if ( alignment == wxDVR_DEFAULT_ALIGNMENT ) - { - // if we don't have an explicit alignment ourselves, use that of the - // column in horizontal direction and default vertical alignment - alignment = GetOwner()->GetAlignment() | wxALIGN_CENTRE_VERTICAL; - } - - return alignment; -} - -// ---------------------------------------------------------------------------- -// wxDataViewCustomRendererBase -// ---------------------------------------------------------------------------- - -bool wxDataViewCustomRendererBase::ActivateCell(const wxRect& cell, - wxDataViewModel *model, - const wxDataViewItem & item, - unsigned int col, - const wxMouseEvent* mouseEvent) -{ - // Compatibility code - if ( mouseEvent ) - return LeftClick(mouseEvent->GetPosition(), cell, model, item, col); - else - return Activate(cell, model, item, col); -} - -void wxDataViewCustomRendererBase::RenderBackground(wxDC* dc, const wxRect& rect) -{ - if ( !m_attr.HasBackgroundColour() ) - return; - - const wxColour& colour = m_attr.GetBackgroundColour(); - wxDCPenChanger changePen(*dc, colour); - wxDCBrushChanger changeBrush(*dc, colour); - - dc->DrawRectangle(rect); -} - -void -wxDataViewCustomRendererBase::WXCallRender(wxRect rectCell, wxDC *dc, int state) -{ - wxCHECK_RET( dc, "no DC to draw on in custom renderer?" ); - - // adjust the rectangle ourselves to account for the alignment - wxRect rectItem = rectCell; - const int align = GetEffectiveAlignment(); - - const wxSize size = GetSize(); - - // take alignment into account only if there is enough space, otherwise - // show as much contents as possible - // - // notice that many existing renderers (e.g. wxDataViewSpinRenderer) - // return hard-coded size which can be more than they need and if we - // trusted their GetSize() we'd draw the text out of cell bounds - // entirely - - if ( size.x >= 0 && size.x < rectCell.width ) - { - if ( align & wxALIGN_CENTER_HORIZONTAL ) - rectItem.x += (rectCell.width - size.x)/2; - else if ( align & wxALIGN_RIGHT ) - rectItem.x += rectCell.width - size.x; - // else: wxALIGN_LEFT is the default - - rectItem.width = size.x; - } - - if ( size.y >= 0 && size.y < rectCell.height ) - { - if ( align & wxALIGN_CENTER_VERTICAL ) - rectItem.y += (rectCell.height - size.y)/2; - else if ( align & wxALIGN_BOTTOM ) - rectItem.y += rectCell.height - size.y; - // else: wxALIGN_TOP is the default - - rectItem.height = size.y; - } - - - // set up the DC attributes - - // override custom foreground with the standard one for the selected items - // because we currently don't allow changing the selection background and - // custom colours may be unreadable on it - wxColour col; - if ( state & wxDATAVIEW_CELL_SELECTED ) - col = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT); - else if ( m_attr.HasColour() ) - col = m_attr.GetColour(); - else // use default foreground - col = GetOwner()->GetOwner()->GetForegroundColour(); - - wxDCTextColourChanger changeFg(*dc, col); - - wxDCFontChanger changeFont(*dc); - if ( m_attr.HasFont() ) - changeFont.Set(m_attr.GetEffectiveFont(dc->GetFont())); - - Render(rectItem, dc, state); -} - -wxSize wxDataViewCustomRendererBase::GetTextExtent(const wxString& str) const -{ - const wxDataViewCtrl *view = GetView(); - - if ( m_attr.HasFont() ) - { - wxFont font(m_attr.GetEffectiveFont(view->GetFont())); - wxSize size; - view->GetTextExtent(str, &size.x, &size.y, NULL, NULL, &font); - return size; - } - else - { - return view->GetTextExtent(str); - } -} - -void -wxDataViewCustomRendererBase::RenderText(const wxString& text, - int xoffset, - wxRect rect, - wxDC *dc, - int state) -{ - wxRect rectText = rect; - rectText.x += xoffset; - rectText.width -= xoffset; - - int flags = 0; - if ( state & wxDATAVIEW_CELL_SELECTED ) - flags |= wxCONTROL_SELECTED | wxCONTROL_FOCUSED; - if ( !GetOwner()->GetOwner()->IsEnabled() ) - flags |= wxCONTROL_DISABLED; - - wxRendererNative::Get().DrawItemText( - GetOwner()->GetOwner(), - *dc, - text, - rectText, - GetEffectiveAlignment(), - flags, - GetEllipsizeMode()); -} - -void wxDataViewCustomRendererBase::SetEnabled(bool enabled) -{ - // The native base renderer needs to know about the enabled state as well - // but in the generic case the base class method is pure, so we can't just - // call it unconditionally. -#ifndef wxHAS_GENERIC_DATAVIEWCTRL - wxDataViewRenderer::SetEnabled(enabled); -#endif // !wxHAS_GENERIC_DATAVIEWCTRL - - m_enabled = enabled; -} - -//----------------------------------------------------------------------------- -// wxDataViewEditorCtrlEvtHandler -//----------------------------------------------------------------------------- - -wxBEGIN_EVENT_TABLE(wxDataViewEditorCtrlEvtHandler, wxEvtHandler) - EVT_CHAR (wxDataViewEditorCtrlEvtHandler::OnChar) - EVT_KILL_FOCUS (wxDataViewEditorCtrlEvtHandler::OnKillFocus) - EVT_IDLE (wxDataViewEditorCtrlEvtHandler::OnIdle) - EVT_TEXT_ENTER (-1, wxDataViewEditorCtrlEvtHandler::OnTextEnter) -wxEND_EVENT_TABLE() - -void wxDataViewEditorCtrlEvtHandler::OnIdle( wxIdleEvent &event ) -{ - if (m_focusOnIdle) - { - m_focusOnIdle = false; - if (wxWindow::FindFocus() != m_editorCtrl) - m_editorCtrl->SetFocus(); - } - - event.Skip(); -} - -void wxDataViewEditorCtrlEvtHandler::OnTextEnter( wxCommandEvent &WXUNUSED(event) ) -{ - m_finished = true; - m_owner->FinishEditing(); -} - -void wxDataViewEditorCtrlEvtHandler::OnChar( wxKeyEvent &event ) -{ - switch ( event.m_keyCode ) - { - case WXK_ESCAPE: - m_finished = true; - m_owner->CancelEditing(); - break; - - case WXK_RETURN: - if ( !event.HasAnyModifiers() ) - { - m_finished = true; - m_owner->FinishEditing(); - break; - } - wxFALLTHROUGH; // Ctrl/Alt/Shift-Enter is not handled specially - - default: - event.Skip(); - } -} - -void wxDataViewEditorCtrlEvtHandler::OnKillFocus( wxFocusEvent &event ) -{ - if (!m_finished) - { - m_finished = true; - m_owner->FinishEditing(); - } - - event.Skip(); -} - -// --------------------------------------------------------- -// wxDataViewColumnBase -// --------------------------------------------------------- - -void wxDataViewColumnBase::Init(wxDataViewRenderer *renderer, - unsigned int model_column) -{ - m_renderer = renderer; - m_model_column = model_column; - m_owner = NULL; - m_renderer->SetOwner( (wxDataViewColumn*) this ); -} - -wxDataViewColumnBase::~wxDataViewColumnBase() -{ - delete m_renderer; -} - -// --------------------------------------------------------- -// wxDataViewCtrlBase -// --------------------------------------------------------- - -wxIMPLEMENT_ABSTRACT_CLASS(wxDataViewCtrlBase, wxControl); - -wxDataViewCtrlBase::wxDataViewCtrlBase() -{ - m_model = NULL; - m_expander_column = 0; - m_indent = 8; -} - -wxDataViewCtrlBase::~wxDataViewCtrlBase() -{ - if (m_model) - { - m_model->DecRef(); - m_model = NULL; - } -} - -bool wxDataViewCtrlBase::AssociateModel( wxDataViewModel *model ) -{ - if (m_model) - { - m_model->DecRef(); // discard old model, if any - } - - // add our own reference to the new model: - m_model = model; - if (m_model) - { - m_model->IncRef(); - } - - return true; -} - -wxDataViewModel* wxDataViewCtrlBase::GetModel() -{ - return m_model; -} - -const wxDataViewModel* wxDataViewCtrlBase::GetModel() const -{ - return m_model; -} - -void wxDataViewCtrlBase::ExpandAncestors( const wxDataViewItem & item ) -{ - if (!m_model) return; - - if (!item.IsOk()) return; - - wxVector parentChain; - - // at first we get all the parents of the selected item - wxDataViewItem parent = m_model->GetParent(item); - while (parent.IsOk()) - { - parentChain.push_back(parent); - parent = m_model->GetParent(parent); - } - - // then we expand the parents, starting at the root - while (!parentChain.empty()) - { - Expand(parentChain.back()); - parentChain.pop_back(); - } -} - -wxDataViewItem wxDataViewCtrlBase::GetCurrentItem() const -{ - return HasFlag(wxDV_MULTIPLE) ? DoGetCurrentItem() - : GetSelection(); -} - -void wxDataViewCtrlBase::SetCurrentItem(const wxDataViewItem& item) -{ - wxCHECK_RET( item.IsOk(), "Can't make current an invalid item." ); - - if ( HasFlag(wxDV_MULTIPLE) ) - DoSetCurrentItem(item); - else - Select(item); -} - -wxDataViewItem wxDataViewCtrlBase::GetSelection() const -{ - if ( GetSelectedItemsCount() != 1 ) - return wxDataViewItem(); - - wxDataViewItemArray selections; - GetSelections(selections); - return selections[0]; -} - -namespace -{ - -// Helper to account for inconsistent signature of wxDataViewProgressRenderer -// ctor: it takes an extra "label" argument as first parameter, unlike all the -// other renderers. -template -struct RendererFactory -{ - static Renderer* - New(wxDataViewCellMode mode, int align) - { - return new Renderer(Renderer::GetDefaultType(), mode, align); - } -}; - -template <> -struct RendererFactory -{ - static wxDataViewProgressRenderer* - New(wxDataViewCellMode mode, int align) - { - return new wxDataViewProgressRenderer( - wxString(), - wxDataViewProgressRenderer::GetDefaultType(), - mode, - align - ); - } -}; - -template -wxDataViewColumn* -CreateColumnWithRenderer(const LabelType& label, - unsigned model_column, - wxDataViewCellMode mode, - int width, - wxAlignment align, - int flags) -{ - // For compatibility reason, handle wxALIGN_NOT as wxDVR_DEFAULT_ALIGNMENT - // when creating the renderer here because a lot of existing code, - // including our own dataview sample, uses wxALIGN_NOT just because it's - // the default value of the alignment argument in AppendXXXColumn() - // methods, but this doesn't mean that it actually wants to top-align the - // column text. - // - // This does make it impossible to create top-aligned text using these - // functions, but it can always be done by creating the renderer with the - // desired alignment explicitly and should be so rarely needed in practice - // (without speaking that vertical alignment is completely unsupported in - // native OS X version), that it's preferable to do the right thing by - // default here rather than account for it. - return new wxDataViewColumn( - label, - RendererFactory::New( - mode, - align & wxALIGN_BOTTOM - ? align - : align | wxALIGN_CENTRE_VERTICAL - ), - model_column, - width, - align, - flags - ); -} - -// Common implementation of all {Append,Prepend}XXXColumn() below. -template -wxDataViewColumn* -AppendColumnWithRenderer(wxDataViewCtrlBase* dvc, - const LabelType& label, - unsigned model_column, - wxDataViewCellMode mode, - int width, - wxAlignment align, - int flags) -{ - wxDataViewColumn* const - col = CreateColumnWithRenderer( - label, model_column, mode, width, align, flags - ); - - dvc->AppendColumn(col); - return col; -} - -template -wxDataViewColumn* -PrependColumnWithRenderer(wxDataViewCtrlBase* dvc, - const LabelType& label, - unsigned model_column, - wxDataViewCellMode mode, - int width, - wxAlignment align, - int flags) -{ - wxDataViewColumn* const - col = CreateColumnWithRenderer( - label, model_column, mode, width, align, flags - ); - - dvc->PrependColumn(col); - return col; -} - -} // anonymous namespace - -wxDataViewColumn * -wxDataViewCtrlBase::AppendTextColumn( const wxString &label, unsigned int model_column, - wxDataViewCellMode mode, int width, wxAlignment align, int flags ) -{ - return AppendColumnWithRenderer( - this, label, model_column, mode, width, align, flags - ); -} - -wxDataViewColumn * -wxDataViewCtrlBase::AppendIconTextColumn( const wxString &label, unsigned int model_column, - wxDataViewCellMode mode, int width, wxAlignment align, int flags ) -{ - return AppendColumnWithRenderer( - this, label, model_column, mode, width, align, flags - ); -} - -wxDataViewColumn * -wxDataViewCtrlBase::AppendToggleColumn( const wxString &label, unsigned int model_column, - wxDataViewCellMode mode, int width, wxAlignment align, int flags ) -{ - return AppendColumnWithRenderer( - this, label, model_column, mode, width, align, flags - ); -} - -wxDataViewColumn * -wxDataViewCtrlBase::AppendProgressColumn( const wxString &label, unsigned int model_column, - wxDataViewCellMode mode, int width, wxAlignment align, int flags ) -{ - return AppendColumnWithRenderer( - this, label, model_column, mode, width, align, flags - ); -} - -wxDataViewColumn * -wxDataViewCtrlBase::AppendDateColumn( const wxString &label, unsigned int model_column, - wxDataViewCellMode mode, int width, wxAlignment align, int flags ) -{ - return AppendColumnWithRenderer( - this, label, model_column, mode, width, align, flags - ); -} - -wxDataViewColumn * -wxDataViewCtrlBase::AppendBitmapColumn( const wxString &label, unsigned int model_column, - wxDataViewCellMode mode, int width, wxAlignment align, int flags ) -{ - return AppendColumnWithRenderer( - this, label, model_column, mode, width, align, flags - ); -} - -wxDataViewColumn * -wxDataViewCtrlBase::AppendTextColumn( const wxBitmap &label, unsigned int model_column, - wxDataViewCellMode mode, int width, wxAlignment align, int flags ) -{ - return AppendColumnWithRenderer( - this, label, model_column, mode, width, align, flags - ); -} - -wxDataViewColumn * -wxDataViewCtrlBase::AppendIconTextColumn( const wxBitmap &label, unsigned int model_column, - wxDataViewCellMode mode, int width, wxAlignment align, int flags ) -{ - return AppendColumnWithRenderer( - this, label, model_column, mode, width, align, flags - ); -} - -wxDataViewColumn * -wxDataViewCtrlBase::AppendToggleColumn( const wxBitmap &label, unsigned int model_column, - wxDataViewCellMode mode, int width, wxAlignment align, int flags ) -{ - return AppendColumnWithRenderer( - this, label, model_column, mode, width, align, flags - ); -} - -wxDataViewColumn * -wxDataViewCtrlBase::AppendProgressColumn( const wxBitmap &label, unsigned int model_column, - wxDataViewCellMode mode, int width, wxAlignment align, int flags ) -{ - return AppendColumnWithRenderer( - this, label, model_column, mode, width, align, flags - ); -} - -wxDataViewColumn * -wxDataViewCtrlBase::AppendDateColumn( const wxBitmap &label, unsigned int model_column, - wxDataViewCellMode mode, int width, wxAlignment align, int flags ) -{ - return AppendColumnWithRenderer( - this, label, model_column, mode, width, align, flags - ); -} - -wxDataViewColumn * -wxDataViewCtrlBase::AppendBitmapColumn( const wxBitmap &label, unsigned int model_column, - wxDataViewCellMode mode, int width, wxAlignment align, int flags ) -{ - return AppendColumnWithRenderer( - this, label, model_column, mode, width, align, flags - ); -} - -wxDataViewColumn * -wxDataViewCtrlBase::PrependTextColumn( const wxString &label, unsigned int model_column, - wxDataViewCellMode mode, int width, wxAlignment align, int flags ) -{ - return PrependColumnWithRenderer( - this, label, model_column, mode, width, align, flags - ); -} - -wxDataViewColumn * -wxDataViewCtrlBase::PrependIconTextColumn( const wxString &label, unsigned int model_column, - wxDataViewCellMode mode, int width, wxAlignment align, int flags ) -{ - return PrependColumnWithRenderer( - this, label, model_column, mode, width, align, flags - ); -} - -wxDataViewColumn * -wxDataViewCtrlBase::PrependToggleColumn( const wxString &label, unsigned int model_column, - wxDataViewCellMode mode, int width, wxAlignment align, int flags ) -{ - return PrependColumnWithRenderer( - this, label, model_column, mode, width, align, flags - ); -} - -wxDataViewColumn * -wxDataViewCtrlBase::PrependProgressColumn( const wxString &label, unsigned int model_column, - wxDataViewCellMode mode, int width, wxAlignment align, int flags ) -{ - return PrependColumnWithRenderer( - this, label, model_column, mode, width, align, flags - ); -} - -wxDataViewColumn * -wxDataViewCtrlBase::PrependDateColumn( const wxString &label, unsigned int model_column, - wxDataViewCellMode mode, int width, wxAlignment align, int flags ) -{ - return PrependColumnWithRenderer( - this, label, model_column, mode, width, align, flags - ); -} - -wxDataViewColumn * -wxDataViewCtrlBase::PrependBitmapColumn( const wxString &label, unsigned int model_column, - wxDataViewCellMode mode, int width, wxAlignment align, int flags ) -{ - return PrependColumnWithRenderer( - this, label, model_column, mode, width, align, flags - ); -} - -wxDataViewColumn * -wxDataViewCtrlBase::PrependTextColumn( const wxBitmap &label, unsigned int model_column, - wxDataViewCellMode mode, int width, wxAlignment align, int flags ) -{ - return PrependColumnWithRenderer( - this, label, model_column, mode, width, align, flags - ); -} - -wxDataViewColumn * -wxDataViewCtrlBase::PrependIconTextColumn( const wxBitmap &label, unsigned int model_column, - wxDataViewCellMode mode, int width, wxAlignment align, int flags ) -{ - return PrependColumnWithRenderer( - this, label, model_column, mode, width, align, flags - ); -} - -wxDataViewColumn * -wxDataViewCtrlBase::PrependToggleColumn( const wxBitmap &label, unsigned int model_column, - wxDataViewCellMode mode, int width, wxAlignment align, int flags ) -{ - return PrependColumnWithRenderer( - this, label, model_column, mode, width, align, flags - ); -} - -wxDataViewColumn * -wxDataViewCtrlBase::PrependProgressColumn( const wxBitmap &label, unsigned int model_column, - wxDataViewCellMode mode, int width, wxAlignment align, int flags ) -{ - return PrependColumnWithRenderer( - this, label, model_column, mode, width, align, flags - ); -} - -wxDataViewColumn * -wxDataViewCtrlBase::PrependDateColumn( const wxBitmap &label, unsigned int model_column, - wxDataViewCellMode mode, int width, wxAlignment align, int flags ) -{ - return PrependColumnWithRenderer( - this, label, model_column, mode, width, align, flags - ); -} - -wxDataViewColumn * -wxDataViewCtrlBase::PrependBitmapColumn( const wxBitmap &label, unsigned int model_column, - wxDataViewCellMode mode, int width, wxAlignment align, int flags ) -{ - return PrependColumnWithRenderer( - this, label, model_column, mode, width, align, flags - ); -} - -bool -wxDataViewCtrlBase::AppendColumn( wxDataViewColumn *col ) -{ - col->SetOwner( (wxDataViewCtrl*) this ); - return true; -} - -bool -wxDataViewCtrlBase::PrependColumn( wxDataViewColumn *col ) -{ - col->SetOwner( (wxDataViewCtrl*) this ); - return true; -} - -bool -wxDataViewCtrlBase::InsertColumn( unsigned int WXUNUSED(pos), wxDataViewColumn *col ) -{ - col->SetOwner( (wxDataViewCtrl*) this ); - return true; -} - -void wxDataViewCtrlBase::StartEditor(const wxDataViewItem& item, unsigned int column) -{ - EditItem(item, GetColumn(column)); -} - -// --------------------------------------------------------- -// wxDataViewEvent -// --------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxDataViewEvent,wxNotifyEvent); - -wxDEFINE_EVENT( wxEVT_DATAVIEW_SELECTION_CHANGED, wxDataViewEvent ); - -wxDEFINE_EVENT( wxEVT_DATAVIEW_ITEM_ACTIVATED, wxDataViewEvent ); -wxDEFINE_EVENT( wxEVT_DATAVIEW_ITEM_COLLAPSING, wxDataViewEvent ); -wxDEFINE_EVENT( wxEVT_DATAVIEW_ITEM_COLLAPSED, wxDataViewEvent ); -wxDEFINE_EVENT( wxEVT_DATAVIEW_ITEM_EXPANDING, wxDataViewEvent ); -wxDEFINE_EVENT( wxEVT_DATAVIEW_ITEM_EXPANDED, wxDataViewEvent ); -wxDEFINE_EVENT( wxEVT_DATAVIEW_ITEM_EDITING_STARTED, wxDataViewEvent ); -wxDEFINE_EVENT( wxEVT_DATAVIEW_ITEM_START_EDITING, wxDataViewEvent ); -wxDEFINE_EVENT( wxEVT_DATAVIEW_ITEM_EDITING_DONE, wxDataViewEvent ); -wxDEFINE_EVENT( wxEVT_DATAVIEW_ITEM_VALUE_CHANGED, wxDataViewEvent ); - -wxDEFINE_EVENT( wxEVT_DATAVIEW_ITEM_CONTEXT_MENU, wxDataViewEvent ); - -wxDEFINE_EVENT( wxEVT_DATAVIEW_COLUMN_HEADER_CLICK, wxDataViewEvent ); -wxDEFINE_EVENT( wxEVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK, wxDataViewEvent ); -wxDEFINE_EVENT( wxEVT_DATAVIEW_COLUMN_SORTED, wxDataViewEvent ); -wxDEFINE_EVENT( wxEVT_DATAVIEW_COLUMN_REORDERED, wxDataViewEvent ); - -wxDEFINE_EVENT( wxEVT_DATAVIEW_CACHE_HINT, wxDataViewEvent ); - -wxDEFINE_EVENT( wxEVT_DATAVIEW_ITEM_BEGIN_DRAG, wxDataViewEvent ); -wxDEFINE_EVENT( wxEVT_DATAVIEW_ITEM_DROP_POSSIBLE, wxDataViewEvent ); -wxDEFINE_EVENT( wxEVT_DATAVIEW_ITEM_DROP, wxDataViewEvent ); - - -#if wxUSE_SPINCTRL - -// ------------------------------------- -// wxDataViewSpinRenderer -// ------------------------------------- - -wxDataViewSpinRenderer::wxDataViewSpinRenderer( int min, int max, wxDataViewCellMode mode, int alignment ) : - wxDataViewCustomRenderer(wxT("long"), mode, alignment ) -{ - m_min = min; - m_max = max; -} - -wxWindow* wxDataViewSpinRenderer::CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ) -{ - long l = value; - wxString str; - str.Printf( wxT("%d"), (int) l ); - wxSpinCtrl *sc = new wxSpinCtrl( parent, wxID_ANY, str, - labelRect.GetTopLeft(), labelRect.GetSize(), wxSP_ARROW_KEYS|wxTE_PROCESS_ENTER, m_min, m_max, l ); -#ifdef __WXMAC__ - const wxSize size = sc->GetSize(); - wxPoint pt = sc->GetPosition(); - sc->SetSize( pt.x - 4, pt.y - 4, size.x, size.y ); -#endif - - return sc; -} - -bool wxDataViewSpinRenderer::GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value ) -{ - wxSpinCtrl *sc = (wxSpinCtrl*) editor; - long l = sc->GetValue(); - value = l; - return true; -} - -bool wxDataViewSpinRenderer::Render( wxRect rect, wxDC *dc, int state ) -{ - wxString str; - str.Printf(wxT("%d"), (int) m_data ); - RenderText( str, 0, rect, dc, state ); - return true; -} - -wxSize wxDataViewSpinRenderer::GetSize() const -{ - wxSize sz = GetTextExtent(wxString::Format("%d", (int)m_data)); - - // Allow some space for the spin buttons, which is approximately the size - // of a scrollbar (and getting pixel-exact value would be complicated). - // Also add some whitespace between the text and the button: - sz.x += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X); - sz.x += GetTextExtent("M").x; - - return sz; -} - -bool wxDataViewSpinRenderer::SetValue( const wxVariant &value ) -{ - m_data = value.GetLong(); - return true; -} - -bool wxDataViewSpinRenderer::GetValue( wxVariant &value ) const -{ - value = m_data; - return true; -} - -#endif // wxUSE_SPINCTRL - -// ------------------------------------- -// wxDataViewChoiceRenderer -// ------------------------------------- - -#if defined(wxHAS_GENERIC_DATAVIEWCTRL) - -wxDataViewChoiceRenderer::wxDataViewChoiceRenderer( const wxArrayString& choices, wxDataViewCellMode mode, int alignment ) : - wxDataViewCustomRenderer(wxT("string"), mode, alignment ) -{ - m_choices = choices; -} - -wxWindow* wxDataViewChoiceRenderer::CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ) -{ - wxChoice* c = new wxChoice - ( - parent, - wxID_ANY, - labelRect.GetTopLeft(), - wxSize(labelRect.GetWidth(), -1), - m_choices - ); - c->Move(labelRect.GetRight() - c->GetRect().width, wxDefaultCoord); - c->SetStringSelection( value.GetString() ); - return c; -} - -bool wxDataViewChoiceRenderer::GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value ) -{ - wxChoice *c = (wxChoice*) editor; - wxString s = c->GetStringSelection(); - value = s; - return true; -} - -bool wxDataViewChoiceRenderer::Render( wxRect rect, wxDC *dc, int state ) -{ - RenderText( m_data, 0, rect, dc, state ); - return true; -} - -wxSize wxDataViewChoiceRenderer::GetSize() const -{ - wxSize sz; - - for ( wxArrayString::const_iterator i = m_choices.begin(); i != m_choices.end(); ++i ) - sz.IncTo(GetTextExtent(*i)); - - // Allow some space for the right-side button, which is approximately the - // size of a scrollbar (and getting pixel-exact value would be complicated). - // Also add some whitespace between the text and the button: - sz.x += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X); - sz.x += GetTextExtent("M").x; - - return sz; -} - -bool wxDataViewChoiceRenderer::SetValue( const wxVariant &value ) -{ - m_data = value.GetString(); - return true; -} - -bool wxDataViewChoiceRenderer::GetValue( wxVariant &value ) const -{ - value = m_data; - return true; -} - -// ---------------------------------------------------------------------------- -// wxDataViewChoiceByIndexRenderer -// ---------------------------------------------------------------------------- - -wxDataViewChoiceByIndexRenderer::wxDataViewChoiceByIndexRenderer( const wxArrayString &choices, - wxDataViewCellMode mode, int alignment ) : - wxDataViewChoiceRenderer( choices, mode, alignment ) -{ -} - -wxWindow* wxDataViewChoiceByIndexRenderer::CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ) -{ - wxVariant string_value = GetChoice( value.GetLong() ); - - return wxDataViewChoiceRenderer::CreateEditorCtrl( parent, labelRect, string_value ); -} - -bool wxDataViewChoiceByIndexRenderer::GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value ) -{ - wxVariant string_value; - if (!wxDataViewChoiceRenderer::GetValueFromEditorCtrl( editor, string_value )) - return false; - - value = (long) GetChoices().Index( string_value.GetString() ); - return true; -} - -bool wxDataViewChoiceByIndexRenderer::SetValue( const wxVariant &value ) -{ - wxVariant string_value = GetChoice( value.GetLong() ); - return wxDataViewChoiceRenderer::SetValue( string_value ); -} - -bool wxDataViewChoiceByIndexRenderer::GetValue( wxVariant &value ) const -{ - wxVariant string_value; - if (!wxDataViewChoiceRenderer::GetValue( string_value )) - return false; - - value = (long) GetChoices().Index( string_value.GetString() ); - return true; -} - -#endif - -// --------------------------------------------------------- -// wxDataViewDateRenderer -// --------------------------------------------------------- - -#if (defined(wxHAS_GENERIC_DATAVIEWCTRL) || defined(__WXGTK__)) && wxUSE_DATEPICKCTRL - -wxDataViewDateRenderer::wxDataViewDateRenderer(const wxString& varianttype, - wxDataViewCellMode mode, int align) - : wxDataViewCustomRenderer(varianttype, mode, align) -{ -} - -wxWindow * -wxDataViewDateRenderer::CreateEditorCtrl(wxWindow *parent, wxRect labelRect, const wxVariant& value) -{ - return new wxDatePickerCtrl - ( - parent, - wxID_ANY, - value.GetDateTime(), - labelRect.GetTopLeft(), - labelRect.GetSize() - ); -} - -bool wxDataViewDateRenderer::GetValueFromEditorCtrl(wxWindow *editor, wxVariant& value) -{ - wxDatePickerCtrl *ctrl = static_cast(editor); - value = ctrl->GetValue(); - return true; -} - -bool wxDataViewDateRenderer::SetValue(const wxVariant& value) -{ - m_date = value.GetDateTime(); - return true; -} - -bool wxDataViewDateRenderer::GetValue(wxVariant& value) const -{ - value = m_date; - return true; -} - -bool wxDataViewDateRenderer::Render(wxRect cell, wxDC* dc, int state) -{ - wxString tmp = m_date.FormatDate(); - RenderText( tmp, 0, cell, dc, state ); - return true; -} - -wxSize wxDataViewDateRenderer::GetSize() const -{ - return GetTextExtent(m_date.FormatDate()); -} - -#endif // (defined(wxHAS_GENERIC_DATAVIEWCTRL) || defined(__WXGTK__)) && wxUSE_DATEPICKCTRL - -//----------------------------------------------------------------------------- -// wxDataViewListStore -//----------------------------------------------------------------------------- - -wxDataViewListStore::wxDataViewListStore() -{ -} - -wxDataViewListStore::~wxDataViewListStore() -{ - wxVector::iterator it; - for (it = m_data.begin(); it != m_data.end(); ++it) - { - wxDataViewListStoreLine* line = *it; - delete line; - } -} - -void wxDataViewListStore::PrependColumn( const wxString &varianttype ) -{ - m_cols.Insert( varianttype, 0 ); -} - -void wxDataViewListStore::InsertColumn( unsigned int pos, const wxString &varianttype ) -{ - m_cols.Insert( varianttype, pos ); -} - -void wxDataViewListStore::AppendColumn( const wxString &varianttype ) -{ - m_cols.Add( varianttype ); -} - -unsigned int wxDataViewListStore::GetColumnCount() const -{ - return m_cols.GetCount(); -} - -unsigned int wxDataViewListStore::GetItemCount() const -{ - return m_data.size(); -} - -wxString wxDataViewListStore::GetColumnType( unsigned int pos ) const -{ - return m_cols[pos]; -} - -void wxDataViewListStore::AppendItem( const wxVector &values, wxUIntPtr data ) -{ - wxDataViewListStoreLine *line = new wxDataViewListStoreLine( data ); - line->m_values = values; - m_data.push_back( line ); - - RowAppended(); -} - -void wxDataViewListStore::PrependItem( const wxVector &values, wxUIntPtr data ) -{ - wxDataViewListStoreLine *line = new wxDataViewListStoreLine( data ); - line->m_values = values; - m_data.insert( m_data.begin(), line ); - - RowPrepended(); -} - -void wxDataViewListStore::InsertItem( unsigned int row, const wxVector &values, - wxUIntPtr data ) -{ - wxDataViewListStoreLine *line = new wxDataViewListStoreLine( data ); - line->m_values = values; - m_data.insert( m_data.begin()+row, line ); - - RowInserted( row ); -} - -void wxDataViewListStore::DeleteItem( unsigned int row ) -{ - wxVector::iterator it = m_data.begin() + row; - delete *it; - m_data.erase( it ); - - RowDeleted( row ); -} - -void wxDataViewListStore::DeleteAllItems() -{ - wxVector::iterator it; - for (it = m_data.begin(); it != m_data.end(); ++it) - { - wxDataViewListStoreLine* line = *it; - delete line; - } - - m_data.clear(); - - Reset( 0 ); -} - -void wxDataViewListStore::ClearColumns() -{ - m_cols.clear(); -} - -void wxDataViewListStore::SetItemData( const wxDataViewItem& item, wxUIntPtr data ) -{ - wxDataViewListStoreLine* line = m_data[GetRow(item)]; - if (!line) return; - - line->SetData( data ); -} - -wxUIntPtr wxDataViewListStore::GetItemData( const wxDataViewItem& item ) const -{ - wxDataViewListStoreLine* line = m_data[GetRow(item)]; - if (!line) return 0; - - return line->GetData(); -} - -void wxDataViewListStore::GetValueByRow( wxVariant &value, unsigned int row, unsigned int col ) const -{ - wxDataViewListStoreLine *line = m_data[row]; - value = line->m_values[col]; -} - -bool wxDataViewListStore::SetValueByRow( const wxVariant &value, unsigned int row, unsigned int col ) -{ - wxDataViewListStoreLine *line = m_data[row]; - line->m_values[col] = value; - - return true; -} - -//----------------------------------------------------------------------------- -// wxDataViewListCtrl -//----------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxDataViewListCtrl,wxDataViewCtrl); - -wxBEGIN_EVENT_TABLE(wxDataViewListCtrl,wxDataViewCtrl) - EVT_SIZE( wxDataViewListCtrl::OnSize ) -wxEND_EVENT_TABLE() - -wxDataViewListCtrl::wxDataViewListCtrl() -{ -} - -wxDataViewListCtrl::wxDataViewListCtrl( wxWindow *parent, wxWindowID id, - const wxPoint& pos, const wxSize& size, long style, - const wxValidator& validator ) -{ - Create( parent, id, pos, size, style, validator ); -} - -wxDataViewListCtrl::~wxDataViewListCtrl() -{ -} - - -bool wxDataViewListCtrl::Create( wxWindow *parent, wxWindowID id, - const wxPoint& pos, const wxSize& size, long style, - const wxValidator& validator ) -{ - if ( !wxDataViewCtrl::Create( parent, id, pos, size, style, validator ) ) - return false; - - wxDataViewListStore *store = new wxDataViewListStore; - AssociateModel( store ); - store->DecRef(); - - return true; -} - -bool wxDataViewListCtrl::AppendColumn( wxDataViewColumn *column, const wxString &varianttype ) -{ - GetStore()->AppendColumn( varianttype ); - return wxDataViewCtrl::AppendColumn( column ); -} - -bool wxDataViewListCtrl::PrependColumn( wxDataViewColumn *column, const wxString &varianttype ) -{ - GetStore()->PrependColumn( varianttype ); - return wxDataViewCtrl::PrependColumn( column ); -} - -bool wxDataViewListCtrl::InsertColumn( unsigned int pos, wxDataViewColumn *column, const wxString &varianttype ) -{ - GetStore()->InsertColumn( pos, varianttype ); - return wxDataViewCtrl::InsertColumn( pos, column ); -} - -bool wxDataViewListCtrl::PrependColumn( wxDataViewColumn *col ) -{ - return PrependColumn( col, col->GetRenderer()->GetVariantType() ); -} - -bool wxDataViewListCtrl::InsertColumn( unsigned int pos, wxDataViewColumn *col ) -{ - return InsertColumn( pos, col, col->GetRenderer()->GetVariantType() ); -} - -bool wxDataViewListCtrl::AppendColumn( wxDataViewColumn *col ) -{ - return AppendColumn( col, col->GetRenderer()->GetVariantType() ); -} - -bool wxDataViewListCtrl::ClearColumns() -{ - GetStore()->ClearColumns(); - return wxDataViewCtrl::ClearColumns(); -} - -wxDataViewColumn *wxDataViewListCtrl::AppendTextColumn( const wxString &label, - wxDataViewCellMode mode, int width, wxAlignment align, int flags ) -{ - GetStore()->AppendColumn( wxT("string") ); - - wxDataViewColumn *ret = new wxDataViewColumn( label, - new wxDataViewTextRenderer( wxT("string"), mode ), - GetStore()->GetColumnCount()-1, width, align, flags ); - - wxDataViewCtrl::AppendColumn( ret ); - - return ret; -} - -wxDataViewColumn *wxDataViewListCtrl::AppendToggleColumn( const wxString &label, - wxDataViewCellMode mode, int width, wxAlignment align, int flags ) -{ - GetStore()->AppendColumn( wxT("bool") ); - - wxDataViewColumn *ret = new wxDataViewColumn( label, - new wxDataViewToggleRenderer( wxT("bool"), mode ), - GetStore()->GetColumnCount()-1, width, align, flags ); - - return wxDataViewCtrl::AppendColumn( ret ) ? ret : NULL; -} - -wxDataViewColumn *wxDataViewListCtrl::AppendProgressColumn( const wxString &label, - wxDataViewCellMode mode, int width, wxAlignment align, int flags ) -{ - GetStore()->AppendColumn( wxT("long") ); - - wxDataViewColumn *ret = new wxDataViewColumn( label, - new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode ), - GetStore()->GetColumnCount()-1, width, align, flags ); - - return wxDataViewCtrl::AppendColumn( ret ) ? ret : NULL; -} - -wxDataViewColumn *wxDataViewListCtrl::AppendIconTextColumn( const wxString &label, - wxDataViewCellMode mode, int width, wxAlignment align, int flags ) -{ - GetStore()->AppendColumn( wxT("wxDataViewIconText") ); - - wxDataViewColumn *ret = new wxDataViewColumn( label, - new wxDataViewIconTextRenderer( wxT("wxDataViewIconText"), mode ), - GetStore()->GetColumnCount()-1, width, align, flags ); - - return wxDataViewCtrl::AppendColumn( ret ) ? ret : NULL; -} - -void wxDataViewListCtrl::OnSize( wxSizeEvent &event ) -{ - event.Skip( true ); -} - -//----------------------------------------------------------------------------- -// wxDataViewTreeStore -//----------------------------------------------------------------------------- - -wxDataViewTreeStoreNode::wxDataViewTreeStoreNode( - wxDataViewTreeStoreNode *parent, - const wxString &text, const wxIcon &icon, wxClientData *data ) -{ - m_parent = parent; - m_text = text; - m_icon = icon; - m_data = data; -} - -wxDataViewTreeStoreNode::~wxDataViewTreeStoreNode() -{ - if (m_data) - delete m_data; -} - -#include "wx/listimpl.cpp" -WX_DEFINE_LIST(wxDataViewTreeStoreNodeList) - -wxDataViewTreeStoreContainerNode::wxDataViewTreeStoreContainerNode( - wxDataViewTreeStoreNode *parent, const wxString &text, - const wxIcon &icon, const wxIcon &expanded, wxClientData *data ) : - wxDataViewTreeStoreNode( parent, text, icon, data ) -{ - m_iconExpanded = expanded; - m_isExpanded = false; - m_children.DeleteContents(true); -} - -wxDataViewTreeStoreContainerNode::~wxDataViewTreeStoreContainerNode() -{ -} - -//----------------------------------------------------------------------------- - -wxDataViewTreeStore::wxDataViewTreeStore() -{ - m_root = new wxDataViewTreeStoreContainerNode( NULL, wxEmptyString ); -} - -wxDataViewTreeStore::~wxDataViewTreeStore() -{ - delete m_root; -} - -wxDataViewItem wxDataViewTreeStore::AppendItem( const wxDataViewItem& parent, - const wxString &text, const wxIcon &icon, wxClientData *data ) -{ - wxDataViewTreeStoreContainerNode *parent_node = FindContainerNode( parent ); - if (!parent_node) return wxDataViewItem(0); - - wxDataViewTreeStoreNode *node = - new wxDataViewTreeStoreNode( parent_node, text, icon, data ); - parent_node->GetChildren().Append( node ); - - return node->GetItem(); -} - -wxDataViewItem wxDataViewTreeStore::PrependItem( const wxDataViewItem& parent, - const wxString &text, const wxIcon &icon, wxClientData *data ) -{ - wxDataViewTreeStoreContainerNode *parent_node = FindContainerNode( parent ); - if (!parent_node) return wxDataViewItem(0); - - wxDataViewTreeStoreNode *node = - new wxDataViewTreeStoreNode( parent_node, text, icon, data ); - parent_node->GetChildren().Insert( node ); - - return node->GetItem(); -} - -wxDataViewItem -wxDataViewTreeStore::InsertItem(const wxDataViewItem& parent, - const wxDataViewItem& previous, - const wxString& text, - const wxIcon& icon, - wxClientData *data) -{ - wxDataViewTreeStoreContainerNode *parent_node = FindContainerNode( parent ); - if (!parent_node) return wxDataViewItem(0); - - wxDataViewTreeStoreNode *previous_node = FindNode( previous ); - int pos = parent_node->GetChildren().IndexOf( previous_node ); - if (pos == wxNOT_FOUND) return wxDataViewItem(0); - - wxDataViewTreeStoreNode *node = - new wxDataViewTreeStoreNode( parent_node, text, icon, data ); - parent_node->GetChildren().Insert( (size_t) pos, node ); - - return node->GetItem(); -} - -wxDataViewItem wxDataViewTreeStore::PrependContainer( const wxDataViewItem& parent, - const wxString &text, const wxIcon &icon, const wxIcon &expanded, - wxClientData *data ) -{ - wxDataViewTreeStoreContainerNode *parent_node = FindContainerNode( parent ); - if (!parent_node) return wxDataViewItem(0); - - wxDataViewTreeStoreContainerNode *node = - new wxDataViewTreeStoreContainerNode( parent_node, text, icon, expanded, data ); - parent_node->GetChildren().Insert( node ); - - return node->GetItem(); -} - -wxDataViewItem -wxDataViewTreeStore::AppendContainer(const wxDataViewItem& parent, - const wxString &text, - const wxIcon& icon, - const wxIcon& expanded, - wxClientData * data) -{ - wxDataViewTreeStoreContainerNode *parent_node = FindContainerNode( parent ); - if (!parent_node) return wxDataViewItem(0); - - wxDataViewTreeStoreContainerNode *node = - new wxDataViewTreeStoreContainerNode( parent_node, text, icon, expanded, data ); - parent_node->GetChildren().Append( node ); - - return node->GetItem(); -} - -wxDataViewItem -wxDataViewTreeStore::InsertContainer(const wxDataViewItem& parent, - const wxDataViewItem& previous, - const wxString& text, - const wxIcon& icon, - const wxIcon& expanded, - wxClientData * data) -{ - wxDataViewTreeStoreContainerNode *parent_node = FindContainerNode( parent ); - if (!parent_node) return wxDataViewItem(0); - - wxDataViewTreeStoreNode *previous_node = FindNode( previous ); - int pos = parent_node->GetChildren().IndexOf( previous_node ); - if (pos == wxNOT_FOUND) return wxDataViewItem(0); - - wxDataViewTreeStoreContainerNode *node = - new wxDataViewTreeStoreContainerNode( parent_node, text, icon, expanded, data ); - parent_node->GetChildren().Insert( (size_t) pos, node ); - - return node->GetItem(); -} - -bool wxDataViewTreeStore::IsContainer( const wxDataViewItem& item ) const -{ - wxDataViewTreeStoreNode *node = FindNode( item ); - if (!node) return false; - - return node->IsContainer(); -} - -wxDataViewItem wxDataViewTreeStore::GetNthChild( const wxDataViewItem& parent, unsigned int pos ) const -{ - wxDataViewTreeStoreContainerNode *parent_node = FindContainerNode( parent ); - if (!parent_node) return wxDataViewItem(0); - - wxDataViewTreeStoreNodeList::compatibility_iterator node = parent_node->GetChildren().Item( pos ); - if (node) - return wxDataViewItem(node->GetData()); - - return wxDataViewItem(0); -} - -int wxDataViewTreeStore::GetChildCount( const wxDataViewItem& parent ) const -{ - wxDataViewTreeStoreNode *node = FindNode( parent ); - if (!node) return -1; - - if (!node->IsContainer()) - return 0; - - wxDataViewTreeStoreContainerNode *container_node = (wxDataViewTreeStoreContainerNode*) node; - return (int) container_node->GetChildren().GetCount(); -} - -void wxDataViewTreeStore::SetItemText( const wxDataViewItem& item, const wxString &text ) -{ - wxDataViewTreeStoreNode *node = FindNode( item ); - if (!node) return; - - node->SetText( text ); -} - -wxString wxDataViewTreeStore::GetItemText( const wxDataViewItem& item ) const -{ - wxDataViewTreeStoreNode *node = FindNode( item ); - if (!node) return wxEmptyString; - - return node->GetText(); -} - -void wxDataViewTreeStore::SetItemIcon( const wxDataViewItem& item, const wxIcon &icon ) -{ - wxDataViewTreeStoreNode *node = FindNode( item ); - if (!node) return; - - node->SetIcon( icon ); -} - -const wxIcon &wxDataViewTreeStore::GetItemIcon( const wxDataViewItem& item ) const -{ - wxDataViewTreeStoreNode *node = FindNode( item ); - if (!node) return wxNullIcon; - - return node->GetIcon(); -} - -void wxDataViewTreeStore::SetItemExpandedIcon( const wxDataViewItem& item, const wxIcon &icon ) -{ - wxDataViewTreeStoreContainerNode *node = FindContainerNode( item ); - if (!node) return; - - node->SetExpandedIcon( icon ); -} - -const wxIcon &wxDataViewTreeStore::GetItemExpandedIcon( const wxDataViewItem& item ) const -{ - wxDataViewTreeStoreContainerNode *node = FindContainerNode( item ); - if (!node) return wxNullIcon; - - return node->GetExpandedIcon(); -} - -void wxDataViewTreeStore::SetItemData( const wxDataViewItem& item, wxClientData *data ) -{ - wxDataViewTreeStoreNode *node = FindNode( item ); - if (!node) return; - - node->SetData( data ); -} - -wxClientData *wxDataViewTreeStore::GetItemData( const wxDataViewItem& item ) const -{ - wxDataViewTreeStoreNode *node = FindNode( item ); - if (!node) return NULL; - - return node->GetData(); -} - -void wxDataViewTreeStore::DeleteItem( const wxDataViewItem& item ) -{ - if (!item.IsOk()) return; - - wxDataViewItem parent_item = GetParent( item ); - - wxDataViewTreeStoreContainerNode *parent_node = FindContainerNode( parent_item ); - if (!parent_node) return; - - parent_node->GetChildren().DeleteObject( FindNode(item) ); -} - -void wxDataViewTreeStore::DeleteChildren( const wxDataViewItem& item ) -{ - wxDataViewTreeStoreContainerNode *node = FindContainerNode( item ); - if (!node) return; - - node->GetChildren().clear(); -} - -void wxDataViewTreeStore::DeleteAllItems() -{ - DeleteChildren(wxDataViewItem(m_root)); -} - -void -wxDataViewTreeStore::GetValue(wxVariant &variant, - const wxDataViewItem &item, - unsigned int WXUNUSED(col)) const -{ - // if (col != 0) return; - - wxDataViewTreeStoreNode *node = FindNode( item ); - if (!node) return; - - wxIcon icon( node->GetIcon()); - if (node->IsContainer()) - { - wxDataViewTreeStoreContainerNode *container = (wxDataViewTreeStoreContainerNode*) node; - if (container->IsExpanded() && container->GetExpandedIcon().IsOk()) - icon = container->GetExpandedIcon(); - } - - wxDataViewIconText data( node->GetText(), icon ); - - variant << data; -} - -bool -wxDataViewTreeStore::SetValue(const wxVariant& variant, - const wxDataViewItem& item, - unsigned int WXUNUSED(col)) -{ - // if (col != 0) return false; - - wxDataViewTreeStoreNode *node = FindNode( item ); - if (!node) return false; - - wxDataViewIconText data; - - data << variant; - - node->SetText( data.GetText() ); - node->SetIcon( data.GetIcon() ); - - return true; -} - -wxDataViewItem wxDataViewTreeStore::GetParent( const wxDataViewItem &item ) const -{ - wxDataViewTreeStoreNode *node = FindNode( item ); - if (!node) return wxDataViewItem(0); - - wxDataViewTreeStoreNode *parent = node->GetParent(); - if (!parent) return wxDataViewItem(0); - - if (parent == m_root) - return wxDataViewItem(0); - - return parent->GetItem(); -} - -unsigned int wxDataViewTreeStore::GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const -{ - wxDataViewTreeStoreContainerNode *node = FindContainerNode( item ); - if (!node) return 0; - - wxDataViewTreeStoreNodeList::iterator iter; - for (iter = node->GetChildren().begin(); iter != node->GetChildren().end(); iter++) - { - wxDataViewTreeStoreNode* child = *iter; - children.Add( child->GetItem() ); - } - - return node->GetChildren().GetCount(); -} - -int wxDataViewTreeStore::Compare( const wxDataViewItem &item1, const wxDataViewItem &item2, - unsigned int WXUNUSED(column), bool WXUNUSED(ascending) ) const -{ - wxDataViewTreeStoreNode *node1 = FindNode( item1 ); - wxDataViewTreeStoreNode *node2 = FindNode( item2 ); - - if (!node1 || !node2) - return 0; - - wxDataViewTreeStoreContainerNode* parent1 = - (wxDataViewTreeStoreContainerNode*) node1->GetParent(); - wxDataViewTreeStoreContainerNode* parent2 = - (wxDataViewTreeStoreContainerNode*) node2->GetParent(); - - if (parent1 != parent2) - { - wxLogError( wxT("Comparing items with different parent.") ); - return 0; - } - - if (node1->IsContainer() && !node2->IsContainer()) - return -1; - - if (node2->IsContainer() && !node1->IsContainer()) - return 1; - - return parent1->GetChildren().IndexOf( node1 ) - parent2->GetChildren().IndexOf( node2 ); -} - -wxDataViewTreeStoreNode *wxDataViewTreeStore::FindNode( const wxDataViewItem &item ) const -{ - if (!item.IsOk()) - return m_root; - - return (wxDataViewTreeStoreNode*) item.GetID(); -} - -wxDataViewTreeStoreContainerNode *wxDataViewTreeStore::FindContainerNode( const wxDataViewItem &item ) const -{ - if (!item.IsOk()) - return (wxDataViewTreeStoreContainerNode*) m_root; - - wxDataViewTreeStoreNode* node = (wxDataViewTreeStoreNode*) item.GetID(); - - if (!node->IsContainer()) - return NULL; - - return (wxDataViewTreeStoreContainerNode*) node; -} - -//----------------------------------------------------------------------------- -// wxDataViewTreeCtrl -//----------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxDataViewTreeCtrl,wxDataViewCtrl); - -wxBEGIN_EVENT_TABLE(wxDataViewTreeCtrl,wxDataViewCtrl) - EVT_DATAVIEW_ITEM_EXPANDED(-1, wxDataViewTreeCtrl::OnExpanded) - EVT_DATAVIEW_ITEM_COLLAPSED(-1, wxDataViewTreeCtrl::OnCollapsed) - EVT_SIZE( wxDataViewTreeCtrl::OnSize ) -wxEND_EVENT_TABLE() - -bool wxDataViewTreeCtrl::Create( wxWindow *parent, wxWindowID id, - const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator ) -{ - if ( !wxDataViewCtrl::Create( parent, id, pos, size, style, validator ) ) - return false; - - // create the standard model and a column in the tree - wxDataViewTreeStore *store = new wxDataViewTreeStore; - AssociateModel( store ); - store->DecRef(); - - AppendIconTextColumn - ( - wxString(), // no label (header is not shown anyhow) - 0, // the only model column - wxDATAVIEW_CELL_EDITABLE, - -1, // default width - wxALIGN_NOT, // and alignment - 0 // not resizable - ); - - return true; -} - -wxDataViewItem wxDataViewTreeCtrl::AppendItem( const wxDataViewItem& parent, - const wxString &text, int iconIndex, wxClientData *data ) -{ - wxDataViewItem res = GetStore()-> - AppendItem( parent, text, GetImage(iconIndex), data ); - - GetStore()->ItemAdded( parent, res ); - - return res; -} - -wxDataViewItem wxDataViewTreeCtrl::PrependItem( const wxDataViewItem& parent, - const wxString &text, int iconIndex, wxClientData *data ) -{ - wxDataViewItem res = GetStore()-> - PrependItem( parent, text, GetImage(iconIndex), data ); - - GetStore()->ItemAdded( parent, res ); - - return res; -} - -wxDataViewItem wxDataViewTreeCtrl::InsertItem( const wxDataViewItem& parent, const wxDataViewItem& previous, - const wxString &text, int iconIndex, wxClientData *data ) -{ - wxDataViewItem res = GetStore()-> - InsertItem( parent, previous, text, GetImage(iconIndex), data ); - - GetStore()->ItemAdded( parent, res ); - - return res; -} - -wxDataViewItem wxDataViewTreeCtrl::PrependContainer( const wxDataViewItem& parent, - const wxString &text, int iconIndex, int expandedIndex, wxClientData *data ) -{ - wxDataViewItem res = GetStore()-> - PrependContainer( parent, text, - GetImage(iconIndex), GetImage(expandedIndex), data ); - - GetStore()->ItemAdded( parent, res ); - - return res; -} - -wxDataViewItem wxDataViewTreeCtrl::AppendContainer( const wxDataViewItem& parent, - const wxString &text, int iconIndex, int expandedIndex, wxClientData *data ) -{ - wxDataViewItem res = GetStore()-> - AppendContainer( parent, text, - GetImage(iconIndex), GetImage(expandedIndex), data ); - - GetStore()->ItemAdded( parent, res ); - - return res; -} - -wxDataViewItem wxDataViewTreeCtrl::InsertContainer( const wxDataViewItem& parent, const wxDataViewItem& previous, - const wxString &text, int iconIndex, int expandedIndex, wxClientData *data ) -{ - wxDataViewItem res = GetStore()-> - InsertContainer( parent, previous, text, - GetImage(iconIndex), GetImage(expandedIndex), data ); - - GetStore()->ItemAdded( parent, res ); - - return res; -} - -void wxDataViewTreeCtrl::SetItemText( const wxDataViewItem& item, const wxString &text ) -{ - GetStore()->SetItemText(item,text); - - // notify control - GetStore()->ValueChanged( item, 0 ); -} - -void wxDataViewTreeCtrl::SetItemIcon( const wxDataViewItem& item, const wxIcon &icon ) -{ - GetStore()->SetItemIcon(item,icon); - - // notify control - GetStore()->ValueChanged( item, 0 ); -} - -void wxDataViewTreeCtrl::SetItemExpandedIcon( const wxDataViewItem& item, const wxIcon &icon ) -{ - GetStore()->SetItemExpandedIcon(item,icon); - - // notify control - GetStore()->ValueChanged( item, 0 ); -} - -void wxDataViewTreeCtrl::DeleteItem( const wxDataViewItem& item ) -{ - wxDataViewItem parent_item = GetStore()->GetParent( item ); - - GetStore()->DeleteItem(item); - - // notify control - GetStore()->ItemDeleted( parent_item, item ); -} - -void wxDataViewTreeCtrl::DeleteChildren( const wxDataViewItem& item ) -{ - wxDataViewTreeStoreContainerNode *node = GetStore()->FindContainerNode( item ); - if (!node) return; - - wxDataViewItemArray array; - wxDataViewTreeStoreNodeList::iterator iter; - for (iter = node->GetChildren().begin(); iter != node->GetChildren().end(); iter++) - { - wxDataViewTreeStoreNode* child = *iter; - array.Add( child->GetItem() ); - } - - GetStore()->DeleteChildren( item ); - - // notify control - GetStore()->ItemsDeleted( item, array ); -} - -void wxDataViewTreeCtrl::DeleteAllItems() -{ - GetStore()->DeleteAllItems(); - - GetStore()->Cleared(); -} - -void wxDataViewTreeCtrl::OnExpanded( wxDataViewEvent &event ) -{ - if (HasImageList()) return; - - wxDataViewTreeStoreContainerNode* container = GetStore()->FindContainerNode( event.GetItem() ); - if (!container) return; - - container->SetExpanded( true ); - - GetStore()->ItemChanged( event.GetItem() ); -} - -void wxDataViewTreeCtrl::OnCollapsed( wxDataViewEvent &event ) -{ - if (HasImageList()) return; - - wxDataViewTreeStoreContainerNode* container = GetStore()->FindContainerNode( event.GetItem() ); - if (!container) return; - - container->SetExpanded( false ); - - GetStore()->ItemChanged( event.GetItem() ); -} - -void wxDataViewTreeCtrl::OnSize( wxSizeEvent &event ) -{ -#if defined(wxUSE_GENERICDATAVIEWCTRL) - // automatically resize our only column to take the entire control width - if ( GetColumnCount() ) - { - wxSize size = GetClientSize(); - GetColumn(0)->SetWidth(size.x); - } -#endif - event.Skip( true ); -} - -#endif // wxUSE_DATAVIEWCTRL - diff --git a/Externals/wxWidgets3/src/common/datetime.cpp b/Externals/wxWidgets3/src/common/datetime.cpp deleted file mode 100644 index ae6b9a384b..0000000000 --- a/Externals/wxWidgets3/src/common/datetime.cpp +++ /dev/null @@ -1,2309 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/datetime.cpp -// Purpose: implementation of time/date related classes -// (for formatting&parsing see datetimefmt.cpp) -// Author: Vadim Zeitlin -// Modified by: -// Created: 11.05.99 -// Copyright: (c) 1999 Vadim Zeitlin -// parts of code taken from sndcal library by Scott E. Lee: -// -// Copyright 1993-1995, Scott E. Lee, all rights reserved. -// Permission granted to use, copy, modify, distribute and sell -// so long as the above copyright and this permission statement -// are retained in all copies. -// -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -/* - * Implementation notes: - * - * 1. the time is stored as a 64bit integer containing the signed number of - * milliseconds since Jan 1. 1970 (the Unix Epoch) - so it is always - * expressed in GMT. - * - * 2. the range is thus something about 580 million years, but due to current - * algorithms limitations, only dates from Nov 24, 4714BC are handled - * - * 3. standard ANSI C functions are used to do time calculations whenever - * possible, i.e. when the date is in the range Jan 1, 1970 to 2038 - * - * 4. otherwise, the calculations are done by converting the date to/from JDN - * first (the range limitation mentioned above comes from here: the - * algorithm used by Scott E. Lee's code only works for positive JDNs, more - * or less) - * - * 5. the object constructed for the given DD-MM-YYYY HH:MM:SS corresponds to - * this moment in local time and may be converted to the object - * corresponding to the same date/time in another time zone by using - * ToTimezone() - * - * 6. the conversions to the current (or any other) timezone are done when the - * internal time representation is converted to the broken-down one in - * wxDateTime::Tm. - */ - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if !defined(wxUSE_DATETIME) || wxUSE_DATETIME - -#ifndef WX_PRECOMP - #ifdef __WINDOWS__ - #include "wx/msw/wrapwin.h" - #endif - #include "wx/string.h" - #include "wx/log.h" - #include "wx/intl.h" - #include "wx/stopwatch.h" // for wxGetLocalTimeMillis() - #include "wx/module.h" - #include "wx/crt.h" -#endif // WX_PRECOMP - -#include "wx/thread.h" -#include "wx/time.h" -#include "wx/tokenzr.h" - -#include - -#ifdef __WINDOWS__ - #include - #include -#endif - -#include "wx/datetime.h" - -// ---------------------------------------------------------------------------- -// wxXTI -// ---------------------------------------------------------------------------- - -#if wxUSE_EXTENDED_RTTI - -template<> void wxStringReadValue(const wxString &s , wxDateTime &data ) -{ - data.ParseFormat(s,"%Y-%m-%d %H:%M:%S", NULL); -} - -template<> void wxStringWriteValue(wxString &s , const wxDateTime &data ) -{ - s = data.Format("%Y-%m-%d %H:%M:%S"); -} - -wxCUSTOM_TYPE_INFO(wxDateTime, wxToStringConverter , wxFromStringConverter) - -#endif // wxUSE_EXTENDED_RTTI - -// ---------------------------------------------------------------------------- -// macros -// ---------------------------------------------------------------------------- - -// debugging helper: just a convenient replacement of wxCHECK() -#define wxDATETIME_CHECK(expr, msg) \ - wxCHECK2_MSG(expr, *this = wxInvalidDateTime; return *this, msg) - -// ---------------------------------------------------------------------------- -// private classes -// ---------------------------------------------------------------------------- - -class wxDateTimeHolidaysModule : public wxModule -{ -public: - virtual bool OnInit() wxOVERRIDE - { - wxDateTimeHolidayAuthority::AddAuthority(new wxDateTimeWorkDays); - - return true; - } - - virtual void OnExit() wxOVERRIDE - { - wxDateTimeHolidayAuthority::ClearAllAuthorities(); - wxDateTimeHolidayAuthority::ms_authorities.clear(); - } - -private: - wxDECLARE_DYNAMIC_CLASS(wxDateTimeHolidaysModule); -}; - -wxIMPLEMENT_DYNAMIC_CLASS(wxDateTimeHolidaysModule, wxModule); - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -// some trivial ones -static const int MONTHS_IN_YEAR = 12; - -static const int SEC_PER_MIN = 60; - -static const int MIN_PER_HOUR = 60; - -static const long SECONDS_PER_DAY = 86400l; - -static const int DAYS_PER_WEEK = 7; - -static const long MILLISECONDS_PER_DAY = 86400000l; - -// this is the integral part of JDN of the midnight of Jan 1, 1970 -// (i.e. JDN(Jan 1, 1970) = 2440587.5) -static const long EPOCH_JDN = 2440587l; - -// these values are only used in asserts so don't define them if asserts are -// disabled to avoid warnings about unused static variables -#if wxDEBUG_LEVEL -// the date of JDN -0.5 (as we don't work with fractional parts, this is the -// reference date for us) is Nov 24, 4714BC -static const int JDN_0_YEAR = -4713; -static const int JDN_0_MONTH = wxDateTime::Nov; -static const int JDN_0_DAY = 24; -#endif // wxDEBUG_LEVEL - -// the constants used for JDN calculations -static const long JDN_OFFSET = 32046l; -static const long DAYS_PER_5_MONTHS = 153l; -static const long DAYS_PER_4_YEARS = 1461l; -static const long DAYS_PER_400_YEARS = 146097l; - -// this array contains the cumulated number of days in all previous months for -// normal and leap years -static const wxDateTime::wxDateTime_t gs_cumulatedDays[2][MONTHS_IN_YEAR] = -{ - { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334 }, - { 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335 } -}; - -const long wxDateTime::TIME_T_FACTOR = 1000l; - -// ---------------------------------------------------------------------------- -// global data -// ---------------------------------------------------------------------------- - -const char wxDefaultDateTimeFormat[] = "%c"; -const char wxDefaultTimeSpanFormat[] = "%H:%M:%S"; - -// in the fine tradition of ANSI C we use our equivalent of (time_t)-1 to -// indicate an invalid wxDateTime object -const wxDateTime wxDefaultDateTime; - -wxDateTime::Country wxDateTime::ms_country = wxDateTime::Country_Unknown; - -// ---------------------------------------------------------------------------- -// private functions -// ---------------------------------------------------------------------------- - -// debugger helper: this function can be called from a debugger to show what -// the date really is -extern const char *wxDumpDate(const wxDateTime* dt) -{ - static char buf[128]; - - wxString fmt(dt->Format("%Y-%m-%d (%a) %H:%M:%S")); - wxStrlcpy(buf, - (fmt + " (" + dt->GetValue().ToString() + " ticks)").ToAscii(), - WXSIZEOF(buf)); - - return buf; -} - -// get the number of days in the given month of the given year -static inline -wxDateTime::wxDateTime_t GetNumOfDaysInMonth(int year, wxDateTime::Month month) -{ - // the number of days in month in Julian/Gregorian calendar: the first line - // is for normal years, the second one is for the leap ones - static const wxDateTime::wxDateTime_t daysInMonth[2][MONTHS_IN_YEAR] = - { - { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }, - { 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 } - }; - - return daysInMonth[wxDateTime::IsLeapYear(year)][month]; -} - -// return the integral part of the JDN for the midnight of the given date (to -// get the real JDN you need to add 0.5, this is, in fact, JDN of the -// noon of the previous day) -static long GetTruncatedJDN(wxDateTime::wxDateTime_t day, - wxDateTime::Month mon, - int year) -{ - // CREDIT: code below is by Scott E. Lee (but bugs are mine) - - // check the date validity - wxASSERT_MSG( - (year > JDN_0_YEAR) || - ((year == JDN_0_YEAR) && (mon > JDN_0_MONTH)) || - ((year == JDN_0_YEAR) && (mon == JDN_0_MONTH) && (day >= JDN_0_DAY)), - wxT("date out of range - can't convert to JDN") - ); - - // make the year positive to avoid problems with negative numbers division - year += 4800; - - // months are counted from March here - int month; - if ( mon >= wxDateTime::Mar ) - { - month = mon - 2; - } - else - { - month = mon + 10; - year--; - } - - // now we can simply add all the contributions together - return ((year / 100) * DAYS_PER_400_YEARS) / 4 - + ((year % 100) * DAYS_PER_4_YEARS) / 4 - + (month * DAYS_PER_5_MONTHS + 2) / 5 - + day - - JDN_OFFSET; -} - -#ifdef wxHAS_STRFTIME - -// this function is a wrapper around strftime(3) adding error checking -// NOTE: not static because used by datetimefmt.cpp -wxString CallStrftime(const wxString& format, const tm* tm) -{ - wxChar buf[4096]; - // Create temp wxString here to work around mingw/cygwin bug 1046059 - // http://sourceforge.net/tracker/?func=detail&atid=102435&aid=1046059&group_id=2435 - wxString s; - - if ( !wxStrftime(buf, WXSIZEOF(buf), format, tm) ) - { - // There is one special case in which strftime() can return 0 without - // indicating an error: "%p" may give empty string depending on the - // locale, so check for it explicitly. Apparently it's really the only - // exception. - if ( format != wxS("%p") ) - { - // if the format is valid, buffer must be too small? - wxFAIL_MSG(wxT("strftime() failed")); - } - - buf[0] = '\0'; - } - - s = buf; - return s; -} - -#endif // wxHAS_STRFTIME - -// if year and/or month have invalid values, replace them with the current ones -static void ReplaceDefaultYearMonthWithCurrent(int *year, - wxDateTime::Month *month) -{ - struct tm *tmNow = NULL; - struct tm tmstruct; - - if ( *year == wxDateTime::Inv_Year ) - { - tmNow = wxDateTime::GetTmNow(&tmstruct); - - *year = 1900 + tmNow->tm_year; - } - - if ( *month == wxDateTime::Inv_Month ) - { - if ( !tmNow ) - tmNow = wxDateTime::GetTmNow(&tmstruct); - - *month = (wxDateTime::Month)tmNow->tm_mon; - } -} - -// fill the struct tm with default values -// NOTE: not static because used by datetimefmt.cpp -void InitTm(struct tm& tm) -{ - // struct tm may have etxra fields (undocumented and with unportable - // names) which, nevertheless, must be set to 0 - memset(&tm, 0, sizeof(struct tm)); - - tm.tm_mday = 1; // mday 0 is invalid - tm.tm_year = 76; // any valid year - tm.tm_isdst = -1; // auto determine -} - -// ============================================================================ -// implementation of wxDateTime -// ============================================================================ - -// ---------------------------------------------------------------------------- -// struct Tm -// ---------------------------------------------------------------------------- - -wxDateTime::Tm::Tm() -{ - year = (wxDateTime_t)wxDateTime::Inv_Year; - mon = wxDateTime::Inv_Month; - mday = - yday = 0; - hour = - min = - sec = - msec = 0; - wday = wxDateTime::Inv_WeekDay; -} - -wxDateTime::Tm::Tm(const struct tm& tm, const TimeZone& tz) - : m_tz(tz) -{ - msec = 0; - sec = (wxDateTime::wxDateTime_t)tm.tm_sec; - min = (wxDateTime::wxDateTime_t)tm.tm_min; - hour = (wxDateTime::wxDateTime_t)tm.tm_hour; - mday = (wxDateTime::wxDateTime_t)tm.tm_mday; - mon = (wxDateTime::Month)tm.tm_mon; - year = 1900 + tm.tm_year; - wday = (wxDateTime::wxDateTime_t)tm.tm_wday; - yday = (wxDateTime::wxDateTime_t)tm.tm_yday; -} - -bool wxDateTime::Tm::IsValid() const -{ - if ( mon == wxDateTime::Inv_Month ) - return false; - - // We need to check this here to avoid crashing in GetNumOfDaysInMonth() if - // somebody passed us "(wxDateTime::Month)1000". - wxCHECK_MSG( mon >= wxDateTime::Jan && mon < wxDateTime::Inv_Month, false, - wxS("Invalid month value") ); - - // we allow for the leap seconds, although we don't use them (yet) - return (year != wxDateTime::Inv_Year) && (mon != wxDateTime::Inv_Month) && - (mday > 0 && mday <= GetNumOfDaysInMonth(year, mon)) && - (hour < 24) && (min < 60) && (sec < 62) && (msec < 1000); -} - -void wxDateTime::Tm::ComputeWeekDay() -{ - // compute the week day from day/month/year: we use the dumbest algorithm - // possible: just compute our JDN and then use the (simple to derive) - // formula: weekday = (JDN + 1.5) % 7 - wday = (wxDateTime::wxDateTime_t)((GetTruncatedJDN(mday, mon, year) + 2) % 7); -} - -void wxDateTime::Tm::AddMonths(int monDiff) -{ - // normalize the months field - while ( monDiff < -mon ) - { - year--; - - monDiff += MONTHS_IN_YEAR; - } - - while ( monDiff + mon >= MONTHS_IN_YEAR ) - { - year++; - - monDiff -= MONTHS_IN_YEAR; - } - - mon = (wxDateTime::Month)(mon + monDiff); - - wxASSERT_MSG( mon >= 0 && mon < MONTHS_IN_YEAR, wxT("logic error") ); - - // NB: we don't check here that the resulting date is valid, this function - // is private and the caller must check it if needed -} - -void wxDateTime::Tm::AddDays(int dayDiff) -{ - // normalize the days field - while ( dayDiff + mday < 1 ) - { - AddMonths(-1); - - dayDiff += GetNumOfDaysInMonth(year, mon); - } - - mday = (wxDateTime::wxDateTime_t)( mday + dayDiff ); - while ( mday > GetNumOfDaysInMonth(year, mon) ) - { - mday -= GetNumOfDaysInMonth(year, mon); - - AddMonths(1); - } - - wxASSERT_MSG( mday > 0 && mday <= GetNumOfDaysInMonth(year, mon), - wxT("logic error") ); -} - -// ---------------------------------------------------------------------------- -// class TimeZone -// ---------------------------------------------------------------------------- - -wxDateTime::TimeZone::TimeZone(wxDateTime::TZ tz) -{ - switch ( tz ) - { - case wxDateTime::Local: - // get the offset from C RTL: it returns the difference GMT-local - // while we want to have the offset _from_ GMT, hence the '-' - m_offset = -wxGetTimeZone(); - break; - - case wxDateTime::GMT_12: - case wxDateTime::GMT_11: - case wxDateTime::GMT_10: - case wxDateTime::GMT_9: - case wxDateTime::GMT_8: - case wxDateTime::GMT_7: - case wxDateTime::GMT_6: - case wxDateTime::GMT_5: - case wxDateTime::GMT_4: - case wxDateTime::GMT_3: - case wxDateTime::GMT_2: - case wxDateTime::GMT_1: - m_offset = -3600*(wxDateTime::GMT0 - tz); - break; - - case wxDateTime::GMT0: - case wxDateTime::GMT1: - case wxDateTime::GMT2: - case wxDateTime::GMT3: - case wxDateTime::GMT4: - case wxDateTime::GMT5: - case wxDateTime::GMT6: - case wxDateTime::GMT7: - case wxDateTime::GMT8: - case wxDateTime::GMT9: - case wxDateTime::GMT10: - case wxDateTime::GMT11: - case wxDateTime::GMT12: - case wxDateTime::GMT13: - m_offset = 3600*(tz - wxDateTime::GMT0); - break; - - case wxDateTime::A_CST: - // Central Standard Time in use in Australia = UTC + 9.5 - m_offset = 60l*(9*MIN_PER_HOUR + MIN_PER_HOUR/2); - break; - - default: - wxFAIL_MSG( wxT("unknown time zone") ); - } -} - -// ---------------------------------------------------------------------------- -// static functions -// ---------------------------------------------------------------------------- - -/* static */ -struct tm *wxDateTime::GetTmNow(struct tm *tmstruct) -{ - time_t t = GetTimeNow(); - return wxLocaltime_r(&t, tmstruct); -} - -/* static */ -bool wxDateTime::IsLeapYear(int year, wxDateTime::Calendar cal) -{ - if ( year == Inv_Year ) - year = GetCurrentYear(); - - if ( cal == Gregorian ) - { - // in Gregorian calendar leap years are those divisible by 4 except - // those divisible by 100 unless they're also divisible by 400 - // (in some countries, like Russia and Greece, additional corrections - // exist, but they won't manifest themselves until 2700) - return (year % 4 == 0) && ((year % 100 != 0) || (year % 400 == 0)); - } - else if ( cal == Julian ) - { - // in Julian calendar the rule is simpler - return year % 4 == 0; - } - else - { - wxFAIL_MSG(wxT("unknown calendar")); - - return false; - } -} - -/* static */ -int wxDateTime::GetCentury(int year) -{ - return year > 0 ? year / 100 : year / 100 - 1; -} - -/* static */ -int wxDateTime::ConvertYearToBC(int year) -{ - // year 0 is BC 1 - return year > 0 ? year : year - 1; -} - -/* static */ -int wxDateTime::GetCurrentYear(wxDateTime::Calendar cal) -{ - switch ( cal ) - { - case Gregorian: - return Now().GetYear(); - - case Julian: - wxFAIL_MSG(wxT("TODO")); - break; - - default: - wxFAIL_MSG(wxT("unsupported calendar")); - break; - } - - return Inv_Year; -} - -/* static */ -wxDateTime::Month wxDateTime::GetCurrentMonth(wxDateTime::Calendar cal) -{ - switch ( cal ) - { - case Gregorian: - return Now().GetMonth(); - - case Julian: - wxFAIL_MSG(wxT("TODO")); - break; - - default: - wxFAIL_MSG(wxT("unsupported calendar")); - break; - } - - return Inv_Month; -} - -/* static */ -wxDateTime::wxDateTime_t wxDateTime::GetNumberOfDays(int year, Calendar cal) -{ - if ( year == Inv_Year ) - { - // take the current year if none given - year = GetCurrentYear(); - } - - switch ( cal ) - { - case Gregorian: - case Julian: - return IsLeapYear(year) ? 366 : 365; - - default: - wxFAIL_MSG(wxT("unsupported calendar")); - break; - } - - return 0; -} - -/* static */ -wxDateTime::wxDateTime_t wxDateTime::GetNumberOfDays(wxDateTime::Month month, - int year, - wxDateTime::Calendar cal) -{ - wxCHECK_MSG( month < MONTHS_IN_YEAR, 0, wxT("invalid month") ); - - if ( cal == Gregorian || cal == Julian ) - { - if ( year == Inv_Year ) - { - // take the current year if none given - year = GetCurrentYear(); - } - - return GetNumOfDaysInMonth(year, month); - } - else - { - wxFAIL_MSG(wxT("unsupported calendar")); - - return 0; - } -} - -namespace -{ - -// helper function used by GetEnglish/WeekDayName(): returns 0 if flags is -// Name_Full and 1 if it is Name_Abbr or -1 if the flags is incorrect (and -// asserts in this case) -// -// the return value of this function is used as an index into 2D array -// containing full names in its first row and abbreviated ones in the 2nd one -int NameArrayIndexFromFlag(wxDateTime::NameFlags flags) -{ - switch ( flags ) - { - case wxDateTime::Name_Full: - return 0; - - case wxDateTime::Name_Abbr: - return 1; - - default: - wxFAIL_MSG( "unknown wxDateTime::NameFlags value" ); - } - - return -1; -} - -} // anonymous namespace - -/* static */ -wxString wxDateTime::GetEnglishMonthName(Month month, NameFlags flags) -{ - wxCHECK_MSG( month != Inv_Month, wxEmptyString, "invalid month" ); - - static const char *const monthNames[2][MONTHS_IN_YEAR] = - { - { "January", "February", "March", "April", "May", "June", - "July", "August", "September", "October", "November", "December" }, - { "Jan", "Feb", "Mar", "Apr", "May", "Jun", - "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" } - }; - - const int idx = NameArrayIndexFromFlag(flags); - if ( idx == -1 ) - return wxString(); - - return monthNames[idx][month]; -} - -/* static */ -wxString wxDateTime::GetMonthName(wxDateTime::Month month, - wxDateTime::NameFlags flags) -{ -#ifdef wxHAS_STRFTIME - wxCHECK_MSG( month != Inv_Month, wxEmptyString, wxT("invalid month") ); - - // notice that we must set all the fields to avoid confusing libc (GNU one - // gets confused to a crash if we don't do this) - tm tm; - InitTm(tm); - tm.tm_mon = month; - - return CallStrftime(flags == Name_Abbr ? wxT("%b") : wxT("%B"), &tm); -#else // !wxHAS_STRFTIME - return GetEnglishMonthName(month, flags); -#endif // wxHAS_STRFTIME/!wxHAS_STRFTIME -} - -/* static */ -wxString wxDateTime::GetEnglishWeekDayName(WeekDay wday, NameFlags flags) -{ - wxCHECK_MSG( wday != Inv_WeekDay, wxEmptyString, wxT("invalid weekday") ); - - static const char *const weekdayNames[2][DAYS_PER_WEEK] = - { - { "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", - "Saturday" }, - { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" }, - }; - - const int idx = NameArrayIndexFromFlag(flags); - if ( idx == -1 ) - return wxString(); - - return weekdayNames[idx][wday]; -} - -/* static */ -wxString wxDateTime::GetWeekDayName(wxDateTime::WeekDay wday, - wxDateTime::NameFlags flags) -{ -#ifdef wxHAS_STRFTIME - wxCHECK_MSG( wday != Inv_WeekDay, wxEmptyString, wxT("invalid weekday") ); - - // take some arbitrary Sunday (but notice that the day should be such that - // after adding wday to it below we still have a valid date, e.g. don't - // take 28 here!) - tm tm; - InitTm(tm); - tm.tm_mday = 21; - tm.tm_mon = Nov; - tm.tm_year = 99; - - // and offset it by the number of days needed to get the correct wday - tm.tm_mday += wday; - - // call mktime() to normalize it... - (void)mktime(&tm); - - // ... and call strftime() - return CallStrftime(flags == Name_Abbr ? wxT("%a") : wxT("%A"), &tm); -#else // !wxHAS_STRFTIME - return GetEnglishWeekDayName(wday, flags); -#endif // wxHAS_STRFTIME/!wxHAS_STRFTIME -} - -/* static */ -void wxDateTime::GetAmPmStrings(wxString *am, wxString *pm) -{ - tm tm; - InitTm(tm); - wxChar buffer[64]; - // @Note: Do not call 'CallStrftime' here! CallStrftime checks the return code - // and causes an assertion failed if the buffer is to small (which is good) - OR - - // if strftime does not return anything because the format string is invalid - OR - - // if there are no 'am' / 'pm' tokens defined for the current locale (which is not good). - // wxDateTime::ParseTime will try several different formats to parse the time. - // As a result, GetAmPmStrings might get called, even if the current locale - // does not define any 'am' / 'pm' tokens. In this case, wxStrftime would - // assert, even though it is a perfectly legal use. - if ( am ) - { - if (wxStrftime(buffer, WXSIZEOF(buffer), wxT("%p"), &tm) > 0) - *am = wxString(buffer); - else - *am = wxString(); - } - if ( pm ) - { - tm.tm_hour = 13; - if (wxStrftime(buffer, WXSIZEOF(buffer), wxT("%p"), &tm) > 0) - *pm = wxString(buffer); - else - *pm = wxString(); - } -} - - -// ---------------------------------------------------------------------------- -// Country stuff: date calculations depend on the country (DST, work days, -// ...), so we need to know which rules to follow. -// ---------------------------------------------------------------------------- - -/* static */ -wxDateTime::Country wxDateTime::GetCountry() -{ - // TODO use LOCALE_ICOUNTRY setting under Win32 - if ( ms_country == Country_Unknown ) - { - // try to guess from the time zone name - time_t t = time(NULL); - struct tm tmstruct; - struct tm *tm = wxLocaltime_r(&t, &tmstruct); - - wxString tz = CallStrftime(wxT("%Z"), tm); - if ( tz == wxT("WET") || tz == wxT("WEST") ) - { - ms_country = UK; - } - else if ( tz == wxT("CET") || tz == wxT("CEST") ) - { - ms_country = Country_EEC; - } - else if ( tz == wxT("MSK") || tz == wxT("MSD") ) - { - ms_country = Russia; - } - else if ( tz == wxT("AST") || tz == wxT("ADT") || - tz == wxT("EST") || tz == wxT("EDT") || - tz == wxT("CST") || tz == wxT("CDT") || - tz == wxT("MST") || tz == wxT("MDT") || - tz == wxT("PST") || tz == wxT("PDT") ) - { - ms_country = USA; - } - else - { - // well, choose a default one - ms_country = USA; - } - } - - return ms_country; -} - -/* static */ -void wxDateTime::SetCountry(wxDateTime::Country country) -{ - ms_country = country; -} - -/* static */ -bool wxDateTime::IsWestEuropeanCountry(Country country) -{ - if ( country == Country_Default ) - { - country = GetCountry(); - } - - return (Country_WesternEurope_Start <= country) && - (country <= Country_WesternEurope_End); -} - -// ---------------------------------------------------------------------------- -// DST calculations: we use 3 different rules for the West European countries, -// USA and for the rest of the world. This is undoubtedly false for many -// countries, but I lack the necessary info (and the time to gather it), -// please add the other rules here! -// ---------------------------------------------------------------------------- - -/* static */ -bool wxDateTime::IsDSTApplicable(int year, Country country) -{ - if ( year == Inv_Year ) - { - // take the current year if none given - year = GetCurrentYear(); - } - - if ( country == Country_Default ) - { - country = GetCountry(); - } - - switch ( country ) - { - case USA: - case UK: - // DST was first observed in the US and UK during WWI, reused - // during WWII and used again since 1966 - return year >= 1966 || - (year >= 1942 && year <= 1945) || - (year == 1918 || year == 1919); - - default: - // assume that it started after WWII - return year > 1950; - } -} - -/* static */ -wxDateTime wxDateTime::GetBeginDST(int year, Country country) -{ - if ( year == Inv_Year ) - { - // take the current year if none given - year = GetCurrentYear(); - } - - if ( country == Country_Default ) - { - country = GetCountry(); - } - - if ( !IsDSTApplicable(year, country) ) - { - return wxInvalidDateTime; - } - - wxDateTime dt; - - if ( IsWestEuropeanCountry(country) || (country == Russia) ) - { - // DST begins at 1 a.m. GMT on the last Sunday of March - if ( !dt.SetToLastWeekDay(Sun, Mar, year) ) - { - // weird... - wxFAIL_MSG( wxT("no last Sunday in March?") ); - } - - dt += wxTimeSpan::Hours(1); - } - else switch ( country ) - { - case USA: - switch ( year ) - { - case 1918: - case 1919: - // don't know for sure - assume it was in effect all year - - case 1943: - case 1944: - case 1945: - dt.Set(1, Jan, year); - break; - - case 1942: - // DST was installed Feb 2, 1942 by the Congress - dt.Set(2, Feb, year); - break; - - // Oil embargo changed the DST period in the US - case 1974: - dt.Set(6, Jan, 1974); - break; - - case 1975: - dt.Set(23, Feb, 1975); - break; - - default: - // before 1986, DST begun on the last Sunday of April, but - // in 1986 Reagan changed it to begin at 2 a.m. of the - // first Sunday in April - if ( year < 1986 ) - { - if ( !dt.SetToLastWeekDay(Sun, Apr, year) ) - { - // weird... - wxFAIL_MSG( wxT("no first Sunday in April?") ); - } - } - else if ( year > 2006 ) - // Energy Policy Act of 2005, Pub. L. no. 109-58, 119 Stat 594 (2005). - // Starting in 2007, daylight time begins in the United States on the - // second Sunday in March and ends on the first Sunday in November - { - if ( !dt.SetToWeekDay(Sun, 2, Mar, year) ) - { - // weird... - wxFAIL_MSG( wxT("no second Sunday in March?") ); - } - } - else - { - if ( !dt.SetToWeekDay(Sun, 1, Apr, year) ) - { - // weird... - wxFAIL_MSG( wxT("no first Sunday in April?") ); - } - } - - dt += wxTimeSpan::Hours(2); - - // TODO what about timezone?? - } - - break; - - default: - // assume Mar 30 as the start of the DST for the rest of the world - // - totally bogus, of course - dt.Set(30, Mar, year); - } - - return dt; -} - -/* static */ -wxDateTime wxDateTime::GetEndDST(int year, Country country) -{ - if ( year == Inv_Year ) - { - // take the current year if none given - year = GetCurrentYear(); - } - - if ( country == Country_Default ) - { - country = GetCountry(); - } - - if ( !IsDSTApplicable(year, country) ) - { - return wxInvalidDateTime; - } - - wxDateTime dt; - - if ( IsWestEuropeanCountry(country) || (country == Russia) ) - { - // DST ends at 1 a.m. GMT on the last Sunday of October - if ( !dt.SetToLastWeekDay(Sun, Oct, year) ) - { - // weirder and weirder... - wxFAIL_MSG( wxT("no last Sunday in October?") ); - } - - dt += wxTimeSpan::Hours(1); - } - else switch ( country ) - { - case USA: - switch ( year ) - { - case 1918: - case 1919: - // don't know for sure - assume it was in effect all year - - case 1943: - case 1944: - dt.Set(31, Dec, year); - break; - - case 1945: - // the time was reset after the end of the WWII - dt.Set(30, Sep, year); - break; - - default: // default for switch (year) - if ( year > 2006 ) - // Energy Policy Act of 2005, Pub. L. no. 109-58, 119 Stat 594 (2005). - // Starting in 2007, daylight time begins in the United States on the - // second Sunday in March and ends on the first Sunday in November - { - if ( !dt.SetToWeekDay(Sun, 1, Nov, year) ) - { - // weird... - wxFAIL_MSG( wxT("no first Sunday in November?") ); - } - } - else - // pre-2007 - // DST ends at 2 a.m. on the last Sunday of October - { - if ( !dt.SetToLastWeekDay(Sun, Oct, year) ) - { - // weirder and weirder... - wxFAIL_MSG( wxT("no last Sunday in October?") ); - } - } - - dt += wxTimeSpan::Hours(2); - - // TODO: what about timezone?? - } - break; - - default: // default for switch (country) - // assume October 26th as the end of the DST - totally bogus too - dt.Set(26, Oct, year); - } - - return dt; -} - -// ---------------------------------------------------------------------------- -// constructors and assignment operators -// ---------------------------------------------------------------------------- - -// return the current time with ms precision -/* static */ wxDateTime wxDateTime::UNow() -{ - return wxDateTime(wxGetUTCTimeMillis()); -} - -// the values in the tm structure contain the local time -wxDateTime& wxDateTime::Set(const struct tm& tm) -{ - struct tm tm2(tm); - time_t timet = mktime(&tm2); - - if ( timet == (time_t)-1 ) - { - // mktime() rather unintuitively fails for Jan 1, 1970 if the hour is - // less than timezone - try to make it work for this case - if ( tm2.tm_year == 70 && tm2.tm_mon == 0 && tm2.tm_mday == 1 ) - { - return Set((time_t)( - wxGetTimeZone() + - tm2.tm_hour * MIN_PER_HOUR * SEC_PER_MIN + - tm2.tm_min * SEC_PER_MIN + - tm2.tm_sec)); - } - - wxFAIL_MSG( wxT("mktime() failed") ); - - *this = wxInvalidDateTime; - - return *this; - } - - // mktime() only adjusts tm_wday, tm_yday and tm_isdst fields normally, if - // it changed anything else, it must have performed the DST adjustment. But - // the trouble with this is that different implementations do it - // differently, e.g. GNU libc moves the time forward if the specified time - // is invalid in the local time zone, while MSVC CRT moves it backwards - // which is especially pernicious as it can change the date if the DST - // starts at midnight, as it does in some time zones (see #15419), and this - // is completely unexpected for the code working with dates only. - // - // So standardize on moving the time forwards to have consistent behaviour - // under all platforms and to avoid the problem above. - if ( tm2.tm_hour != tm.tm_hour ) - { - tm2 = tm; - tm2.tm_hour++; - if ( tm2.tm_hour == 24 ) - { - // This shouldn't normally happen as the DST never starts at 23:00 - // but if it does, we have a problem as we need to adjust the day - // as well. However we stop here, i.e. we don't adjust the month - // (or the year) because mktime() is supposed to take care of this - // for us. - tm2.tm_hour = 0; - tm2.tm_mday++; - } - - timet = mktime(&tm2); - } - - return Set(timet); -} - -wxDateTime& wxDateTime::Set(wxDateTime_t hour, - wxDateTime_t minute, - wxDateTime_t second, - wxDateTime_t millisec) -{ - // we allow seconds to be 61 to account for the leap seconds, even if we - // don't use them really - wxDATETIME_CHECK( hour < 24 && - second < 62 && - minute < 60 && - millisec < 1000, - wxT("Invalid time in wxDateTime::Set()") ); - - // get the current date from system - struct tm tmstruct; - struct tm *tm = GetTmNow(&tmstruct); - - wxDATETIME_CHECK( tm, wxT("wxLocaltime_r() failed") ); - - // make a copy so it isn't clobbered by the call to mktime() below - struct tm tm1(*tm); - - // adjust the time - tm1.tm_hour = hour; - tm1.tm_min = minute; - tm1.tm_sec = second; - - // and the DST in case it changes on this date - struct tm tm2(tm1); - mktime(&tm2); - if ( tm2.tm_isdst != tm1.tm_isdst ) - tm1.tm_isdst = tm2.tm_isdst; - - (void)Set(tm1); - - // and finally adjust milliseconds - return SetMillisecond(millisec); -} - -wxDateTime& wxDateTime::Set(wxDateTime_t day, - Month month, - int year, - wxDateTime_t hour, - wxDateTime_t minute, - wxDateTime_t second, - wxDateTime_t millisec) -{ - wxDATETIME_CHECK( hour < 24 && - second < 62 && - minute < 60 && - millisec < 1000, - wxT("Invalid time in wxDateTime::Set()") ); - - ReplaceDefaultYearMonthWithCurrent(&year, &month); - - wxDATETIME_CHECK( (0 < day) && (day <= GetNumberOfDays(month, year)), - wxT("Invalid date in wxDateTime::Set()") ); - - // the range of time_t type (inclusive) - static const int yearMinInRange = 1970; - static const int yearMaxInRange = 2037; - - // test only the year instead of testing for the exact end of the Unix - // time_t range - it doesn't bring anything to do more precise checks - if ( year >= yearMinInRange && year <= yearMaxInRange ) - { - // use the standard library version if the date is in range - this is - // probably more efficient than our code - struct tm tm; - tm.tm_year = year - 1900; - tm.tm_mon = month; - tm.tm_mday = day; - tm.tm_hour = hour; - tm.tm_min = minute; - tm.tm_sec = second; - tm.tm_isdst = -1; // mktime() will guess it - - (void)Set(tm); - - // and finally adjust milliseconds - if (IsValid()) - SetMillisecond(millisec); - - return *this; - } - else - { - // do time calculations ourselves: we want to calculate the number of - // milliseconds between the given date and the epoch - - // get the JDN for the midnight of this day - m_time = GetTruncatedJDN(day, month, year); - m_time -= EPOCH_JDN; - m_time *= SECONDS_PER_DAY * TIME_T_FACTOR; - - // JDN corresponds to GMT, we take localtime - Add(wxTimeSpan(hour, minute, second + wxGetTimeZone(), millisec)); - } - - return *this; -} - -wxDateTime& wxDateTime::Set(double jdn) -{ - // so that m_time will be 0 for the midnight of Jan 1, 1970 which is jdn - // EPOCH_JDN + 0.5 - jdn -= EPOCH_JDN + 0.5; - - m_time.Assign(jdn*MILLISECONDS_PER_DAY); - - // JDNs always are in UTC, so we don't need any adjustments for time zone - - return *this; -} - -wxDateTime& wxDateTime::ResetTime() -{ - Tm tm = GetTm(); - - if ( tm.hour || tm.min || tm.sec || tm.msec ) - { - tm.msec = - tm.sec = - tm.min = - tm.hour = 0; - - Set(tm); - } - - return *this; -} - -wxDateTime wxDateTime::GetDateOnly() const -{ - Tm tm = GetTm(); - tm.msec = - tm.sec = - tm.min = - tm.hour = 0; - return wxDateTime(tm); -} - -// ---------------------------------------------------------------------------- -// DOS Date and Time Format functions -// ---------------------------------------------------------------------------- -// the dos date and time value is an unsigned 32 bit value in the format: -// YYYYYYYMMMMDDDDDhhhhhmmmmmmsssss -// -// Y = year offset from 1980 (0-127) -// M = month (1-12) -// D = day of month (1-31) -// h = hour (0-23) -// m = minute (0-59) -// s = bisecond (0-29) each bisecond indicates two seconds -// ---------------------------------------------------------------------------- - -wxDateTime& wxDateTime::SetFromDOS(unsigned long ddt) -{ - struct tm tm; - InitTm(tm); - - long year = ddt & 0xFE000000; - year >>= 25; - year += 80; - tm.tm_year = year; - - long month = ddt & 0x1E00000; - month >>= 21; - month -= 1; - tm.tm_mon = month; - - long day = ddt & 0x1F0000; - day >>= 16; - tm.tm_mday = day; - - long hour = ddt & 0xF800; - hour >>= 11; - tm.tm_hour = hour; - - long minute = ddt & 0x7E0; - minute >>= 5; - tm.tm_min = minute; - - long second = ddt & 0x1F; - tm.tm_sec = second * 2; - - return Set(mktime(&tm)); -} - -unsigned long wxDateTime::GetAsDOS() const -{ - unsigned long ddt; - time_t ticks = GetTicks(); - struct tm tmstruct; - struct tm *tm = wxLocaltime_r(&ticks, &tmstruct); - wxCHECK_MSG( tm, ULONG_MAX, wxT("time can't be represented in DOS format") ); - - long year = tm->tm_year; - year -= 80; - year <<= 25; - - long month = tm->tm_mon; - month += 1; - month <<= 21; - - long day = tm->tm_mday; - day <<= 16; - - long hour = tm->tm_hour; - hour <<= 11; - - long minute = tm->tm_min; - minute <<= 5; - - long second = tm->tm_sec; - second /= 2; - - ddt = year | month | day | hour | minute | second; - return ddt; -} - -// ---------------------------------------------------------------------------- -// time_t <-> broken down time conversions -// ---------------------------------------------------------------------------- - -wxDateTime::Tm wxDateTime::GetTm(const TimeZone& tz) const -{ - wxASSERT_MSG( IsValid(), wxT("invalid wxDateTime") ); - - time_t time = GetTicks(); - if ( time != (time_t)-1 ) - { - // use C RTL functions - struct tm tmstruct; - tm *tm; - if ( tz.GetOffset() == -wxGetTimeZone() ) - { - // we are working with local time - tm = wxLocaltime_r(&time, &tmstruct); - - // should never happen - wxCHECK_MSG( tm, Tm(), wxT("wxLocaltime_r() failed") ); - } - else - { - time += (time_t)tz.GetOffset(); -#if defined(__VMS__) // time is unsigned so avoid warning - int time2 = (int) time; - if ( time2 >= 0 ) -#else - if ( time >= 0 ) -#endif - { - tm = wxGmtime_r(&time, &tmstruct); - - // should never happen - wxCHECK_MSG( tm, Tm(), wxT("wxGmtime_r() failed") ); - } - else - { - tm = (struct tm *)NULL; - } - } - - if ( tm ) - { - // adjust the milliseconds - Tm tm2(*tm, tz); - long timeOnly = (m_time % MILLISECONDS_PER_DAY).ToLong(); - tm2.msec = (wxDateTime_t)(timeOnly % 1000); - return tm2; - } - //else: use generic code below - } - - // remember the time and do the calculations with the date only - this - // eliminates rounding errors of the floating point arithmetics - - wxLongLong timeMidnight = m_time + tz.GetOffset() * 1000; - - long timeOnly = (timeMidnight % MILLISECONDS_PER_DAY).ToLong(); - - // we want to always have positive time and timeMidnight to be really - // the midnight before it - if ( timeOnly < 0 ) - { - timeOnly = MILLISECONDS_PER_DAY + timeOnly; - } - - timeMidnight -= timeOnly; - - // calculate the Gregorian date from JDN for the midnight of our date: - // this will yield day, month (in 1..12 range) and year - - // actually, this is the JDN for the noon of the previous day - long jdn = (timeMidnight / MILLISECONDS_PER_DAY).ToLong() + EPOCH_JDN; - - // CREDIT: code below is by Scott E. Lee (but bugs are mine) - - wxASSERT_MSG( jdn > -2, wxT("JDN out of range") ); - - // calculate the century - long temp = (jdn + JDN_OFFSET) * 4 - 1; - long century = temp / DAYS_PER_400_YEARS; - - // then the year and day of year (1 <= dayOfYear <= 366) - temp = ((temp % DAYS_PER_400_YEARS) / 4) * 4 + 3; - long year = (century * 100) + (temp / DAYS_PER_4_YEARS); - long dayOfYear = (temp % DAYS_PER_4_YEARS) / 4 + 1; - - // and finally the month and day of the month - temp = dayOfYear * 5 - 3; - long month = temp / DAYS_PER_5_MONTHS; - long day = (temp % DAYS_PER_5_MONTHS) / 5 + 1; - - // month is counted from March - convert to normal - if ( month < 10 ) - { - month += 3; - } - else - { - year += 1; - month -= 9; - } - - // year is offset by 4800 - year -= 4800; - - // check that the algorithm gave us something reasonable - wxASSERT_MSG( (0 < month) && (month <= 12), wxT("invalid month") ); - wxASSERT_MSG( (1 <= day) && (day < 32), wxT("invalid day") ); - - // construct Tm from these values - Tm tm; - tm.year = (int)year; - tm.yday = (wxDateTime_t)(dayOfYear - 1); // use C convention for day number - tm.mon = (Month)(month - 1); // algorithm yields 1 for January, not 0 - tm.mday = (wxDateTime_t)day; - tm.msec = (wxDateTime_t)(timeOnly % 1000); - timeOnly -= tm.msec; - timeOnly /= 1000; // now we have time in seconds - - tm.sec = (wxDateTime_t)(timeOnly % SEC_PER_MIN); - timeOnly -= tm.sec; - timeOnly /= SEC_PER_MIN; // now we have time in minutes - - tm.min = (wxDateTime_t)(timeOnly % MIN_PER_HOUR); - timeOnly -= tm.min; - - tm.hour = (wxDateTime_t)(timeOnly / MIN_PER_HOUR); - - return tm; -} - -wxDateTime& wxDateTime::SetYear(int year) -{ - wxASSERT_MSG( IsValid(), wxT("invalid wxDateTime") ); - - Tm tm(GetTm()); - tm.year = year; - Set(tm); - - return *this; -} - -wxDateTime& wxDateTime::SetMonth(Month month) -{ - wxASSERT_MSG( IsValid(), wxT("invalid wxDateTime") ); - - Tm tm(GetTm()); - tm.mon = month; - Set(tm); - - return *this; -} - -wxDateTime& wxDateTime::SetDay(wxDateTime_t mday) -{ - wxASSERT_MSG( IsValid(), wxT("invalid wxDateTime") ); - - Tm tm(GetTm()); - tm.mday = mday; - Set(tm); - - return *this; -} - -wxDateTime& wxDateTime::SetHour(wxDateTime_t hour) -{ - wxASSERT_MSG( IsValid(), wxT("invalid wxDateTime") ); - - Tm tm(GetTm()); - tm.hour = hour; - Set(tm); - - return *this; -} - -wxDateTime& wxDateTime::SetMinute(wxDateTime_t min) -{ - wxASSERT_MSG( IsValid(), wxT("invalid wxDateTime") ); - - Tm tm(GetTm()); - tm.min = min; - Set(tm); - - return *this; -} - -wxDateTime& wxDateTime::SetSecond(wxDateTime_t sec) -{ - wxASSERT_MSG( IsValid(), wxT("invalid wxDateTime") ); - - Tm tm(GetTm()); - tm.sec = sec; - Set(tm); - - return *this; -} - -wxDateTime& wxDateTime::SetMillisecond(wxDateTime_t millisecond) -{ - wxASSERT_MSG( IsValid(), wxT("invalid wxDateTime") ); - - // we don't need to use GetTm() for this one - m_time -= m_time % 1000l; - m_time += millisecond; - - return *this; -} - -// ---------------------------------------------------------------------------- -// wxDateTime arithmetics -// ---------------------------------------------------------------------------- - -wxDateTime& wxDateTime::Add(const wxDateSpan& diff) -{ - Tm tm(GetTm()); - - tm.year += diff.GetYears(); - tm.AddMonths(diff.GetMonths()); - - // check that the resulting date is valid - if ( tm.mday > GetNumOfDaysInMonth(tm.year, tm.mon) ) - { - // We suppose that when adding one month to Jan 31 we want to get Feb - // 28 (or 29), i.e. adding a month to the last day of the month should - // give the last day of the next month which is quite logical. - // - // Unfortunately, there is no logic way to understand what should - // Jan 30 + 1 month be - Feb 28 too or Feb 27 (assuming non leap year)? - // We make it Feb 28 (last day too), but it is highly questionable. - tm.mday = GetNumOfDaysInMonth(tm.year, tm.mon); - } - - tm.AddDays(diff.GetTotalDays()); - - Set(tm); - - wxASSERT_MSG( IsSameTime(tm), - wxT("Add(wxDateSpan) shouldn't modify time") ); - - return *this; -} - -wxDateSpan wxDateTime::DiffAsDateSpan(const wxDateTime& dt) const -{ - wxASSERT_MSG( IsValid() && dt.IsValid(), wxT("invalid wxDateTime")); - - // If dt is larger than this, calculations below needs to be inverted. - int inv = 1; - if ( dt > *this ) - inv = -1; - - int y = GetYear() - dt.GetYear(); - int m = GetMonth() - dt.GetMonth(); - int d = GetDay() - dt.GetDay(); - - // If month diff is negative, dt is the year before, so decrease year - // and set month diff to its inverse, e.g. January - December should be 1, - // not -11. - if ( m * inv < 0 || (m == 0 && d * inv < 0)) - { - m += inv * MONTHS_IN_YEAR; - y -= inv; - } - - // Same logic for days as for months above. - if ( d * inv < 0 ) - { - // Use number of days in month from the month which end date we're - // crossing. That is month before this for positive diff, and this - // month for negative diff. - // If we're on january and using previous month, we get december - // previous year, but don't care, december has same amount of days - // every year. - wxDateTime::Month monthfordays = GetMonth(); - if (inv > 0 && monthfordays == wxDateTime::Jan) - monthfordays = wxDateTime::Dec; - else if (inv > 0) - monthfordays = static_cast(monthfordays - 1); - - d += inv * wxDateTime::GetNumberOfDays(monthfordays, GetYear()); - m -= inv; - } - - int w = d / DAYS_PER_WEEK; - - // Remove weeks from d, since wxDateSpan only keep days as the ones - // not in complete weeks - d -= w * DAYS_PER_WEEK; - - return wxDateSpan(y, m, w, d); -} - -// ---------------------------------------------------------------------------- -// Weekday and monthday stuff -// ---------------------------------------------------------------------------- - -// convert Sun, Mon, ..., Sat into 6, 0, ..., 5 -static inline int ConvertWeekDayToMondayBase(int wd) -{ - return wd == wxDateTime::Sun ? 6 : wd - 1; -} - -/* static */ -wxDateTime -wxDateTime::SetToWeekOfYear(int year, wxDateTime_t numWeek, WeekDay wd) -{ - wxASSERT_MSG( numWeek > 0, - wxT("invalid week number: weeks are counted from 1") ); - - // Jan 4 always lies in the 1st week of the year - wxDateTime dt(4, Jan, year); - dt.SetToWeekDayInSameWeek(wd); - dt += wxDateSpan::Weeks(numWeek - 1); - - return dt; -} - -wxDateTime& wxDateTime::SetToLastMonthDay(Month month, - int year) -{ - // take the current month/year if none specified - if ( year == Inv_Year ) - year = GetYear(); - if ( month == Inv_Month ) - month = GetMonth(); - - return Set(GetNumOfDaysInMonth(year, month), month, year); -} - -wxDateTime& wxDateTime::SetToWeekDayInSameWeek(WeekDay weekday, WeekFlags flags) -{ - wxDATETIME_CHECK( weekday != Inv_WeekDay, wxT("invalid weekday") ); - - int wdayDst = weekday, - wdayThis = GetWeekDay(); - if ( wdayDst == wdayThis ) - { - // nothing to do - return *this; - } - - if ( flags == Default_First ) - { - flags = GetCountry() == USA ? Sunday_First : Monday_First; - } - - // the logic below based on comparing weekday and wdayThis works if Sun (0) - // is the first day in the week, but breaks down for Monday_First case so - // we adjust the week days in this case - if ( flags == Monday_First ) - { - if ( wdayThis == Sun ) - wdayThis += 7; - if ( wdayDst == Sun ) - wdayDst += 7; - } - //else: Sunday_First, nothing to do - - // go forward or back in time to the day we want - if ( wdayDst < wdayThis ) - { - return Subtract(wxDateSpan::Days(wdayThis - wdayDst)); - } - else // weekday > wdayThis - { - return Add(wxDateSpan::Days(wdayDst - wdayThis)); - } -} - -wxDateTime& wxDateTime::SetToNextWeekDay(WeekDay weekday) -{ - wxDATETIME_CHECK( weekday != Inv_WeekDay, wxT("invalid weekday") ); - - int diff; - WeekDay wdayThis = GetWeekDay(); - if ( weekday == wdayThis ) - { - // nothing to do - return *this; - } - else if ( weekday < wdayThis ) - { - // need to advance a week - diff = 7 - (wdayThis - weekday); - } - else // weekday > wdayThis - { - diff = weekday - wdayThis; - } - - return Add(wxDateSpan::Days(diff)); -} - -wxDateTime& wxDateTime::SetToPrevWeekDay(WeekDay weekday) -{ - wxDATETIME_CHECK( weekday != Inv_WeekDay, wxT("invalid weekday") ); - - int diff; - WeekDay wdayThis = GetWeekDay(); - if ( weekday == wdayThis ) - { - // nothing to do - return *this; - } - else if ( weekday > wdayThis ) - { - // need to go to previous week - diff = 7 - (weekday - wdayThis); - } - else // weekday < wdayThis - { - diff = wdayThis - weekday; - } - - return Subtract(wxDateSpan::Days(diff)); -} - -bool wxDateTime::SetToWeekDay(WeekDay weekday, - int n, - Month month, - int year) -{ - wxCHECK_MSG( weekday != Inv_WeekDay, false, wxT("invalid weekday") ); - - // we don't check explicitly that -5 <= n <= 5 because we will return false - // anyhow in such case - but may be should still give an assert for it? - - // take the current month/year if none specified - ReplaceDefaultYearMonthWithCurrent(&year, &month); - - wxDateTime dt; - - // TODO this probably could be optimised somehow... - - if ( n > 0 ) - { - // get the first day of the month - dt.Set(1, month, year); - - // get its wday - WeekDay wdayFirst = dt.GetWeekDay(); - - // go to the first weekday of the month - int diff = weekday - wdayFirst; - if ( diff < 0 ) - diff += 7; - - // add advance n-1 weeks more - diff += 7*(n - 1); - - dt += wxDateSpan::Days(diff); - } - else // count from the end of the month - { - // get the last day of the month - dt.SetToLastMonthDay(month, year); - - // get its wday - WeekDay wdayLast = dt.GetWeekDay(); - - // go to the last weekday of the month - int diff = wdayLast - weekday; - if ( diff < 0 ) - diff += 7; - - // and rewind n-1 weeks from there - diff += 7*(-n - 1); - - dt -= wxDateSpan::Days(diff); - } - - // check that it is still in the same month - if ( dt.GetMonth() == month ) - { - *this = dt; - - return true; - } - else - { - // no such day in this month - return false; - } -} - -static inline -wxDateTime::wxDateTime_t GetDayOfYearFromTm(const wxDateTime::Tm& tm) -{ - return (wxDateTime::wxDateTime_t)(gs_cumulatedDays[wxDateTime::IsLeapYear(tm.year)][tm.mon] + tm.mday); -} - -wxDateTime::wxDateTime_t wxDateTime::GetDayOfYear(const TimeZone& tz) const -{ - return GetDayOfYearFromTm(GetTm(tz)); -} - -wxDateTime::wxDateTime_t -wxDateTime::GetWeekOfYear(wxDateTime::WeekFlags flags, const TimeZone& tz) const -{ - if ( flags == Default_First ) - { - flags = GetCountry() == USA ? Sunday_First : Monday_First; - } - - Tm tm(GetTm(tz)); - wxDateTime_t nDayInYear = GetDayOfYearFromTm(tm); - - int wdTarget = GetWeekDay(tz); - int wdYearStart = wxDateTime(1, Jan, GetYear()).GetWeekDay(); - int week; - if ( flags == Sunday_First ) - { - // FIXME: First week is not calculated correctly. - week = (nDayInYear - wdTarget + 7) / 7; - if ( wdYearStart == Wed || wdYearStart == Thu ) - week++; - } - else // week starts with monday - { - // adjust the weekdays to non-US style. - wdYearStart = ConvertWeekDayToMondayBase(wdYearStart); - - // quoting from http://www.cl.cam.ac.uk/~mgk25/iso-time.html: - // - // Week 01 of a year is per definition the first week that has the - // Thursday in this year, which is equivalent to the week that - // contains the fourth day of January. In other words, the first - // week of a new year is the week that has the majority of its - // days in the new year. Week 01 might also contain days from the - // previous year and the week before week 01 of a year is the last - // week (52 or 53) of the previous year even if it contains days - // from the new year. A week starts with Monday (day 1) and ends - // with Sunday (day 7). - // - - // if Jan 1 is Thursday or less, it is in the first week of this year - int dayCountFix = wdYearStart < 4 ? 6 : -1; - - // count the number of week - week = (nDayInYear + wdYearStart + dayCountFix) / DAYS_PER_WEEK; - - // check if we happen to be at the last week of previous year: - if ( week == 0 ) - { - week = wxDateTime(31, Dec, GetYear() - 1).GetWeekOfYear(); - } - else if ( week == 53 ) - { - int wdYearEnd = (wdYearStart + 364 + IsLeapYear(GetYear())) - % DAYS_PER_WEEK; - - // Week 53 only if last day of year is Thursday or later. - if ( wdYearEnd < 3 ) - week = 1; - } - } - - return (wxDateTime::wxDateTime_t)week; -} - -int wxDateTime::GetWeekBasedYear(const TimeZone& tz) const -{ - const wxDateTime::Tm tm = GetTm(tz); - - int year = tm.year; - - // The week-based year can only be different from the normal year for few - // days in the beginning and the end of the year. - if ( tm.yday > 361 ) - { - if ( GetWeekOfYear(Monday_First, tz) == 1 ) - year++; - } - else if ( tm.yday < 5 ) - { - if ( GetWeekOfYear(Monday_First, tz) == 53 ) - year--; - } - - return year; -} - -wxDateTime::wxDateTime_t wxDateTime::GetWeekOfMonth(wxDateTime::WeekFlags flags, - const TimeZone& tz) const -{ - Tm tm = GetTm(tz); - const wxDateTime dateFirst = wxDateTime(1, tm.mon, tm.year); - const wxDateTime::WeekDay wdFirst = dateFirst.GetWeekDay(); - - if ( flags == Default_First ) - { - flags = GetCountry() == USA ? Sunday_First : Monday_First; - } - - // compute offset of dateFirst from the beginning of the week - int firstOffset; - if ( flags == Sunday_First ) - firstOffset = wdFirst - Sun; - else - firstOffset = wdFirst == Sun ? DAYS_PER_WEEK - 1 : wdFirst - Mon; - - return (wxDateTime::wxDateTime_t)((tm.mday - 1 + firstOffset)/7 + 1); -} - -wxDateTime& wxDateTime::SetToYearDay(wxDateTime::wxDateTime_t yday) -{ - int year = GetYear(); - wxDATETIME_CHECK( (0 < yday) && (yday <= GetNumberOfDays(year)), - wxT("invalid year day") ); - - bool isLeap = IsLeapYear(year); - for ( Month mon = Jan; mon < Inv_Month; wxNextMonth(mon) ) - { - // for Dec, we can't compare with gs_cumulatedDays[mon + 1], but we - // don't need it neither - because of the CHECK above we know that - // yday lies in December then - if ( (mon == Dec) || (yday <= gs_cumulatedDays[isLeap][mon + 1]) ) - { - Set((wxDateTime::wxDateTime_t)(yday - gs_cumulatedDays[isLeap][mon]), mon, year); - - break; - } - } - - return *this; -} - -// ---------------------------------------------------------------------------- -// Julian day number conversion and related stuff -// ---------------------------------------------------------------------------- - -double wxDateTime::GetJulianDayNumber() const -{ - return m_time.ToDouble() / MILLISECONDS_PER_DAY + EPOCH_JDN + 0.5; -} - -double wxDateTime::GetRataDie() const -{ - // March 1 of the year 0 is Rata Die day -306 and JDN 1721119.5 - return GetJulianDayNumber() - 1721119.5 - 306; -} - -// ---------------------------------------------------------------------------- -// timezone and DST stuff -// ---------------------------------------------------------------------------- - -int wxDateTime::IsDST(wxDateTime::Country country) const -{ - wxCHECK_MSG( country == Country_Default, -1, - wxT("country support not implemented") ); - - // use the C RTL for the dates in the standard range - time_t timet = GetTicks(); - if ( timet != (time_t)-1 ) - { - struct tm tmstruct; - tm *tm = wxLocaltime_r(&timet, &tmstruct); - - wxCHECK_MSG( tm, -1, wxT("wxLocaltime_r() failed") ); - - return tm->tm_isdst; - } - else - { - int year = GetYear(); - - if ( !IsDSTApplicable(year, country) ) - { - // no DST time in this year in this country - return -1; - } - - return IsBetween(GetBeginDST(year, country), GetEndDST(year, country)); - } -} - -wxDateTime& wxDateTime::MakeTimezone(const TimeZone& tz, bool noDST) -{ - long secDiff = wxGetTimeZone() + tz.GetOffset(); - - // We are converting from the local time, but local time zone does not - // include the DST offset (as it varies depending on the date), so we have - // to handle DST manually, unless a special flag inhibiting this was - // specified. - // - // Notice that we also shouldn't add the DST offset if we're already in the - // local time zone, as indicated by offset of 0, converting from local time - // to local time zone shouldn't change it, whether DST is in effect or not. - if ( !noDST && secDiff && (IsDST() == 1) ) - { - // FIXME we assume that the DST is always shifted by 1 hour - secDiff -= 3600; - } - - return Add(wxTimeSpan::Seconds(secDiff)); -} - -wxDateTime& wxDateTime::MakeFromTimezone(const TimeZone& tz, bool noDST) -{ - long secDiff = wxGetTimeZone() + tz.GetOffset(); - - // See comment in MakeTimezone() above, the logic here is exactly the same. - if ( !noDST && secDiff && (IsDST() == 1) ) - { - // FIXME we assume that the DST is always shifted by 1 hour - secDiff -= 3600; - } - - return Subtract(wxTimeSpan::Seconds(secDiff)); -} - -// ============================================================================ -// wxDateTimeHolidayAuthority and related classes -// ============================================================================ - -#include "wx/arrimpl.cpp" - -WX_DEFINE_OBJARRAY(wxDateTimeArray) - -static int wxCMPFUNC_CONV -wxDateTimeCompareFunc(wxDateTime **first, wxDateTime **second) -{ - wxDateTime dt1 = **first, - dt2 = **second; - - return dt1 == dt2 ? 0 : dt1 < dt2 ? -1 : +1; -} - -// ---------------------------------------------------------------------------- -// wxDateTimeHolidayAuthority -// ---------------------------------------------------------------------------- - -wxHolidayAuthoritiesArray wxDateTimeHolidayAuthority::ms_authorities; - -/* static */ -bool wxDateTimeHolidayAuthority::IsHoliday(const wxDateTime& dt) -{ - size_t count = ms_authorities.size(); - for ( size_t n = 0; n < count; n++ ) - { - if ( ms_authorities[n]->DoIsHoliday(dt) ) - { - return true; - } - } - - return false; -} - -/* static */ -size_t -wxDateTimeHolidayAuthority::GetHolidaysInRange(const wxDateTime& dtStart, - const wxDateTime& dtEnd, - wxDateTimeArray& holidays) -{ - wxDateTimeArray hol; - - holidays.Clear(); - - const size_t countAuth = ms_authorities.size(); - for ( size_t nAuth = 0; nAuth < countAuth; nAuth++ ) - { - ms_authorities[nAuth]->DoGetHolidaysInRange(dtStart, dtEnd, hol); - - WX_APPEND_ARRAY(holidays, hol); - } - - holidays.Sort(wxDateTimeCompareFunc); - - return holidays.size(); -} - -/* static */ -void wxDateTimeHolidayAuthority::ClearAllAuthorities() -{ - WX_CLEAR_ARRAY(ms_authorities); -} - -/* static */ -void wxDateTimeHolidayAuthority::AddAuthority(wxDateTimeHolidayAuthority *auth) -{ - ms_authorities.push_back(auth); -} - -wxDateTimeHolidayAuthority::~wxDateTimeHolidayAuthority() -{ - // required here for Darwin -} - -// ---------------------------------------------------------------------------- -// wxDateTimeWorkDays -// ---------------------------------------------------------------------------- - -bool wxDateTimeWorkDays::DoIsHoliday(const wxDateTime& dt) const -{ - wxDateTime::WeekDay wd = dt.GetWeekDay(); - - return (wd == wxDateTime::Sun) || (wd == wxDateTime::Sat); -} - -size_t wxDateTimeWorkDays::DoGetHolidaysInRange(const wxDateTime& dtStart, - const wxDateTime& dtEnd, - wxDateTimeArray& holidays) const -{ - if ( dtStart > dtEnd ) - { - wxFAIL_MSG( wxT("invalid date range in GetHolidaysInRange") ); - - return 0u; - } - - holidays.Empty(); - - // instead of checking all days, start with the first Sat after dtStart and - // end with the last Sun before dtEnd - wxDateTime dtSatFirst = dtStart.GetNextWeekDay(wxDateTime::Sat), - dtSatLast = dtEnd.GetPrevWeekDay(wxDateTime::Sat), - dtSunFirst = dtStart.GetNextWeekDay(wxDateTime::Sun), - dtSunLast = dtEnd.GetPrevWeekDay(wxDateTime::Sun), - dt; - - for ( dt = dtSatFirst; dt <= dtSatLast; dt += wxDateSpan::Week() ) - { - holidays.Add(dt); - } - - for ( dt = dtSunFirst; dt <= dtSunLast; dt += wxDateSpan::Week() ) - { - holidays.Add(dt); - } - - return holidays.GetCount(); -} - -// ============================================================================ -// other helper functions -// ============================================================================ - -// ---------------------------------------------------------------------------- -// iteration helpers: can be used to write a for loop over enum variable like -// this: -// for ( m = wxDateTime::Jan; m < wxDateTime::Inv_Month; wxNextMonth(m) ) -// ---------------------------------------------------------------------------- - -WXDLLIMPEXP_BASE void wxNextMonth(wxDateTime::Month& m) -{ - wxASSERT_MSG( m < wxDateTime::Inv_Month, wxT("invalid month") ); - - // no wrapping or the for loop above would never end! - m = (wxDateTime::Month)(m + 1); -} - -WXDLLIMPEXP_BASE void wxPrevMonth(wxDateTime::Month& m) -{ - wxASSERT_MSG( m < wxDateTime::Inv_Month, wxT("invalid month") ); - - m = m == wxDateTime::Jan ? wxDateTime::Inv_Month - : (wxDateTime::Month)(m - 1); -} - -WXDLLIMPEXP_BASE void wxNextWDay(wxDateTime::WeekDay& wd) -{ - wxASSERT_MSG( wd < wxDateTime::Inv_WeekDay, wxT("invalid week day") ); - - // no wrapping or the for loop above would never end! - wd = (wxDateTime::WeekDay)(wd + 1); -} - -WXDLLIMPEXP_BASE void wxPrevWDay(wxDateTime::WeekDay& wd) -{ - wxASSERT_MSG( wd < wxDateTime::Inv_WeekDay, wxT("invalid week day") ); - - wd = wd == wxDateTime::Sun ? wxDateTime::Inv_WeekDay - : (wxDateTime::WeekDay)(wd - 1); -} - -#ifdef __WINDOWS__ - -wxDateTime& wxDateTime::SetFromMSWSysTime(const SYSTEMTIME& st) -{ - return Set(st.wDay, - static_cast(wxDateTime::Jan + st.wMonth - 1), - st.wYear, - st.wHour, st.wMinute, st.wSecond, st.wMilliseconds); -} - -wxDateTime& wxDateTime::SetFromMSWSysDate(const SYSTEMTIME& st) -{ - return Set(st.wDay, - static_cast(wxDateTime::Jan + st.wMonth - 1), - st.wYear, - 0, 0, 0, 0); -} - -void wxDateTime::GetAsMSWSysTime(SYSTEMTIME* st) const -{ - const wxDateTime::Tm tm(GetTm()); - - st->wYear = (WXWORD)tm.year; - st->wMonth = (WXWORD)(tm.mon - wxDateTime::Jan + 1); - st->wDay = tm.mday; - - st->wDayOfWeek = 0; - st->wHour = tm.hour; - st->wMinute = tm.min; - st->wSecond = tm.sec; - st->wMilliseconds = tm.msec; -} - -void wxDateTime::GetAsMSWSysDate(SYSTEMTIME* st) const -{ - const wxDateTime::Tm tm(GetTm()); - - st->wYear = (WXWORD)tm.year; - st->wMonth = (WXWORD)(tm.mon - wxDateTime::Jan + 1); - st->wDay = tm.mday; - - st->wDayOfWeek = - st->wHour = - st->wMinute = - st->wSecond = - st->wMilliseconds = 0; -} - -#endif // __WINDOWS__ - -#endif // wxUSE_DATETIME diff --git a/Externals/wxWidgets3/src/common/datetimefmt.cpp b/Externals/wxWidgets3/src/common/datetimefmt.cpp deleted file mode 100644 index 0d2bb3498b..0000000000 --- a/Externals/wxWidgets3/src/common/datetimefmt.cpp +++ /dev/null @@ -1,2397 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/datetimefmt.cpp -// Purpose: wxDateTime formatting & parsing code -// Author: Vadim Zeitlin -// Modified by: -// Created: 11.05.99 -// Copyright: (c) 1999 Vadim Zeitlin -// parts of code taken from sndcal library by Scott E. Lee: -// -// Copyright 1993-1995, Scott E. Lee, all rights reserved. -// Permission granted to use, copy, modify, distribute and sell -// so long as the above copyright and this permission statement -// are retained in all copies. -// -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if !defined(wxUSE_DATETIME) || wxUSE_DATETIME - -#ifndef WX_PRECOMP - #ifdef __WINDOWS__ - #include "wx/msw/wrapwin.h" - #endif - #include "wx/string.h" - #include "wx/log.h" - #include "wx/intl.h" - #include "wx/stopwatch.h" // for wxGetLocalTimeMillis() - #include "wx/module.h" - #include "wx/crt.h" -#endif // WX_PRECOMP - -#include "wx/thread.h" - -#include - -#ifdef __WINDOWS__ - #include - #include -#endif - -#include "wx/datetime.h" -#include "wx/time.h" - -// ============================================================================ -// implementation of wxDateTime -// ============================================================================ - -// ---------------------------------------------------------------------------- -// helpers shared between datetime.cpp and datetimefmt.cpp -// ---------------------------------------------------------------------------- - -extern void InitTm(struct tm& tm); - -extern wxString CallStrftime(const wxString& format, const tm* tm); - -// ---------------------------------------------------------------------------- -// constants (see also datetime.cpp) -// ---------------------------------------------------------------------------- - -static const int DAYS_PER_WEEK = 7; - -static const int HOURS_PER_DAY = 24; - -static const int SEC_PER_MIN = 60; - -static const int MIN_PER_HOUR = 60; - -// ---------------------------------------------------------------------------- -// parsing helpers -// ---------------------------------------------------------------------------- - -namespace -{ - -// all the functions below taking non-const wxString::const_iterator p advance -// it until the end of the match - -// scans all digits (but no more than len) and returns the resulting number -bool GetNumericToken(size_t len, - wxString::const_iterator& p, - const wxString::const_iterator& end, - unsigned long *number) -{ - size_t n = 1; - wxString s; - while ( p != end && wxIsdigit(*p) ) - { - s += *p++; - - if ( len && ++n > len ) - break; - } - - return !s.empty() && s.ToULong(number); -} - -// scans all alphabetic characters and returns the resulting string -wxString -GetAlphaToken(wxString::const_iterator& p, - const wxString::const_iterator& end) -{ - wxString s; - while ( p != end && wxIsalpha(*p) ) - { - s += *p++; - } - - return s; -} - -enum -{ - DateLang_English = 1, - DateLang_Local = 2 -}; - -// return the month if the string is a month name or Inv_Month otherwise -// -// flags can contain wxDateTime::Name_Abbr/Name_Full or both of them and lang -// can be either DateLang_Local (default) to interpret string as a localized -// month name or DateLang_English to parse it as a standard English name or -// their combination to interpret it in any way -wxDateTime::Month -GetMonthFromName(wxString::const_iterator& p, - const wxString::const_iterator& end, - int flags, - int lang) -{ - const wxString::const_iterator pOrig = p; - const wxString name = GetAlphaToken(p, end); - if ( name.empty() ) - return wxDateTime::Inv_Month; - - wxDateTime::Month mon; - for ( mon = wxDateTime::Jan; mon < wxDateTime::Inv_Month; wxNextMonth(mon) ) - { - // case-insensitive comparison either one of or with both abbreviated - // and not versions - if ( flags & wxDateTime::Name_Full ) - { - if ( lang & DateLang_English ) - { - if ( name.CmpNoCase(wxDateTime::GetEnglishMonthName(mon, - wxDateTime::Name_Full)) == 0 ) - break; - } - - if ( lang & DateLang_Local ) - { - if ( name.CmpNoCase(wxDateTime::GetMonthName(mon, - wxDateTime::Name_Full)) == 0 ) - break; - } - } - - if ( flags & wxDateTime::Name_Abbr ) - { - if ( lang & DateLang_English ) - { - if ( name.CmpNoCase(wxDateTime::GetEnglishMonthName(mon, - wxDateTime::Name_Abbr)) == 0 ) - break; - } - - if ( lang & DateLang_Local ) - { - // some locales (e.g. French one) use periods for the - // abbreviated month names but it's never part of name so - // compare it specially - wxString nameAbbr = wxDateTime::GetMonthName(mon, - wxDateTime::Name_Abbr); - const bool hasPeriod = *nameAbbr.rbegin() == '.'; - if ( hasPeriod ) - nameAbbr.erase(nameAbbr.end() - 1); - - if ( name.CmpNoCase(nameAbbr) == 0 ) - { - if ( hasPeriod ) - { - // skip trailing period if it was part of the match - if ( *p == '.' ) - ++p; - else // no match as no matching period - continue; - } - - break; - } - } - } - } - - if ( mon == wxDateTime::Inv_Month ) - p = pOrig; - - return mon; -} - -// return the weekday if the string is a weekday name or Inv_WeekDay otherwise -// -// flags and lang parameters have the same meaning as for GetMonthFromName() -// above -wxDateTime::WeekDay -GetWeekDayFromName(wxString::const_iterator& p, - const wxString::const_iterator& end, - int flags, int lang) -{ - const wxString::const_iterator pOrig = p; - const wxString name = GetAlphaToken(p, end); - if ( name.empty() ) - return wxDateTime::Inv_WeekDay; - - wxDateTime::WeekDay wd; - for ( wd = wxDateTime::Sun; wd < wxDateTime::Inv_WeekDay; wxNextWDay(wd) ) - { - if ( flags & wxDateTime::Name_Full ) - { - if ( lang & DateLang_English ) - { - if ( name.CmpNoCase(wxDateTime::GetEnglishWeekDayName(wd, - wxDateTime::Name_Full)) == 0 ) - break; - } - - if ( lang & DateLang_Local ) - { - if ( name.CmpNoCase(wxDateTime::GetWeekDayName(wd, - wxDateTime::Name_Full)) == 0 ) - break; - } - } - - if ( flags & wxDateTime::Name_Abbr ) - { - if ( lang & DateLang_English ) - { - if ( name.CmpNoCase(wxDateTime::GetEnglishWeekDayName(wd, - wxDateTime::Name_Abbr)) == 0 ) - break; - } - - if ( lang & DateLang_Local ) - { - if ( name.CmpNoCase(wxDateTime::GetWeekDayName(wd, - wxDateTime::Name_Abbr)) == 0 ) - break; - } - } - } - - if ( wd == wxDateTime::Inv_WeekDay ) - p = pOrig; - - return wd; -} - -// parses string starting at given iterator using the specified format and, -// optionally, a fall back format (and optionally another one... but it stops -// there, really) -// -// if unsuccessful, returns invalid wxDateTime without changing p; otherwise -// advance p to the end of the match and returns wxDateTime containing the -// results of the parsing -wxDateTime -ParseFormatAt(wxString::const_iterator& p, - const wxString::const_iterator& end, - const wxString& fmt, - const wxString& fmtAlt = wxString()) -{ - const wxString str(p, end); - wxString::const_iterator endParse; - wxDateTime dt; - - // Use a default date outside of the DST period to avoid problems with - // parsing the time differently depending on the today's date (which is used - // as the fall back date if none is explicitly specified). - static const wxDateTime dtDef(1, wxDateTime::Jan, 2012); - - if ( dt.ParseFormat(str, fmt, dtDef, &endParse) || - (!fmtAlt.empty() && dt.ParseFormat(str, fmtAlt, dtDef, &endParse)) ) - { - p += endParse - str.begin(); - } - //else: all formats failed - - return dt; -} - -} // anonymous namespace - -// ---------------------------------------------------------------------------- -// wxDateTime to/from text representations -// ---------------------------------------------------------------------------- - -wxString wxDateTime::Format(const wxString& formatp, const TimeZone& tz) const -{ - wxCHECK_MSG( !formatp.empty(), wxEmptyString, - wxT("NULL format in wxDateTime::Format") ); - - wxString format = formatp; -#ifdef __WXOSX__ - if ( format.Contains("%c") ) - format.Replace("%c", wxLocale::GetInfo(wxLOCALE_DATE_TIME_FMT)); - if ( format.Contains("%x") ) - format.Replace("%x", wxLocale::GetInfo(wxLOCALE_SHORT_DATE_FMT)); - if ( format.Contains("%X") ) - format.Replace("%X", wxLocale::GetInfo(wxLOCALE_TIME_FMT)); -#endif - // we have to use our own implementation if the date is out of range of - // strftime() -#ifdef wxHAS_STRFTIME - time_t time = GetTicks(); - - bool canUseStrftime = time != (time_t)-1; - - // We also can't use strftime() if we use non standard specifier: either - // our own extension "%l" or one of "%g", "%G", "%V", "%z" which are POSIX - // but not supported under Windows. - for ( wxString::const_iterator p = format.begin(); - canUseStrftime && p != format.end(); - ++p ) - { - if ( *p != '%' ) - continue; - - // set the default format - switch ( (*++p).GetValue() ) - { - case 'l': -#ifdef __WINDOWS__ - case 'g': - case 'G': - case 'V': - case 'z': -#endif // __WINDOWS__ - canUseStrftime = false; - break; - } - } - - if ( canUseStrftime ) - { - // use strftime() - struct tm tmstruct; - struct tm *tm; - if ( tz.GetOffset() == -wxGetTimeZone() ) - { - // we are working with local time - tm = wxLocaltime_r(&time, &tmstruct); - - // should never happen - wxCHECK_MSG( tm, wxEmptyString, wxT("wxLocaltime_r() failed") ); - } - else - { - time += (int)tz.GetOffset(); - -#if defined(__VMS__) // time is unsigned so avoid warning - int time2 = (int) time; - if ( time2 >= 0 ) -#else - if ( time >= 0 ) -#endif - { - tm = wxGmtime_r(&time, &tmstruct); - - // should never happen - wxCHECK_MSG( tm, wxEmptyString, wxT("wxGmtime_r() failed") ); - } - else - { - tm = (struct tm *)NULL; - } - } - - if ( tm ) - { - return CallStrftime(format, tm); - } - } - //else: use generic code below -#endif // wxHAS_STRFTIME - - // we only parse ANSI C format specifications here, no POSIX 2 - // complications, no GNU extensions but we do add support for a "%l" format - // specifier allowing to get the number of milliseconds - Tm tm = GetTm(tz); - - // used for calls to strftime() when we only deal with time - struct tm tmTimeOnly; - memset(&tmTimeOnly, 0, sizeof(tmTimeOnly)); - tmTimeOnly.tm_hour = tm.hour; - tmTimeOnly.tm_min = tm.min; - tmTimeOnly.tm_sec = tm.sec; - tmTimeOnly.tm_mday = 1; // any date will do, use 1976-01-01 - tmTimeOnly.tm_mon = 0; - tmTimeOnly.tm_year = 76; - tmTimeOnly.tm_isdst = 0; // no DST, we adjust for tz ourselves - - wxString tmp, res, fmt; - for ( wxString::const_iterator p = format.begin(); p != format.end(); ++p ) - { - if ( *p != wxT('%') ) - { - // copy as is - res += *p; - - continue; - } - - // set the default format - switch ( (*++p).GetValue() ) - { - case wxT('Y'): // year has 4 digits - case wxT('G'): // (and ISO week year too) - case wxT('z'): // time zone as well - fmt = wxT("%04d"); - break; - - case wxT('j'): // day of year has 3 digits - case wxT('l'): // milliseconds have 3 digits - fmt = wxT("%03d"); - break; - - case wxT('w'): // week day as number has only one - fmt = wxT("%d"); - break; - - default: - // it's either another valid format specifier in which case - // the format is "%02d" (for all the rest) or we have the - // field width preceding the format in which case it will - // override the default format anyhow - fmt = wxT("%02d"); - } - - bool restart = true; - while ( restart ) - { - restart = false; - - // start of the format specification - switch ( (*p).GetValue() ) - { - case wxT('a'): // a weekday name - case wxT('A'): - // second parameter should be true for abbreviated names - res += GetWeekDayName(tm.GetWeekDay(), - *p == wxT('a') ? Name_Abbr : Name_Full); - break; - - case wxT('b'): // a month name - case wxT('B'): - res += GetMonthName(tm.mon, - *p == wxT('b') ? Name_Abbr : Name_Full); - break; - - case wxT('c'): // locale default date and time representation - case wxT('x'): // locale default date representation -#ifdef wxHAS_STRFTIME - // - // the problem: there is no way to know what do these format - // specifications correspond to for the current locale. - // - // the solution: use a hack and still use strftime(): first - // find the YEAR which is a year in the strftime() range (1970 - // - 2038) whose Jan 1 falls on the same week day as the Jan 1 - // of the real year. Then make a copy of the format and - // replace all occurrences of YEAR in it with some unique - // string not appearing anywhere else in it, then use - // strftime() to format the date in year YEAR and then replace - // YEAR back by the real year and the unique replacement - // string back with YEAR. Notice that "all occurrences of YEAR" - // means all occurrences of 4 digit as well as 2 digit form! - // - // the bugs: we assume that neither of %c nor %x contains any - // fields which may change between the YEAR and real year. For - // example, the week number (%U, %W) and the day number (%j) - // will change if one of these years is leap and the other one - // is not! - { - // find the YEAR: normally, for any year X, Jan 1 of the - // year X + 28 is the same weekday as Jan 1 of X (because - // the weekday advances by 1 for each normal X and by 2 - // for each leap X, hence by 5 every 4 years or by 35 - // which is 0 mod 7 every 28 years) but this rule breaks - // down if there are years between X and Y which are - // divisible by 4 but not leap (i.e. divisible by 100 but - // not 400), hence the correction. - - int yearReal = GetYear(tz); - int mod28 = yearReal % 28; - - // be careful to not go too far - we risk to leave the - // supported range - int year; - if ( mod28 < 10 ) - { - year = 1988 + mod28; // 1988 == 0 (mod 28) - } - else - { - year = 1970 + mod28 - 10; // 1970 == 10 (mod 28) - } - - int nCentury = year / 100, - nCenturyReal = yearReal / 100; - - // need to adjust for the years divisble by 400 which are - // not leap but are counted like leap ones if we just take - // the number of centuries in between for nLostWeekDays - int nLostWeekDays = (nCentury - nCenturyReal) - - (nCentury / 4 - nCenturyReal / 4); - - // we have to gain back the "lost" weekdays: note that the - // effect of this loop is to not do anything to - // nLostWeekDays (which we won't use any more), but to - // (indirectly) set the year correctly - while ( (nLostWeekDays % 7) != 0 ) - { - nLostWeekDays += (year++ % 4) ? 1 : 2; - } - - // finally move the year below 2000 so that the 2-digit - // year number can never match the month or day of the - // month when we do the replacements below - if ( year >= 2000 ) - year -= 28; - - wxASSERT_MSG( year >= 1970 && year < 2000, - wxT("logic error in wxDateTime::Format") ); - - - // use strftime() to format the same date but in supported - // year - // - // NB: we assume that strftime() doesn't check for the - // date validity and will happily format the date - // corresponding to Feb 29 of a non leap year (which - // may happen if yearReal was leap and year is not) - struct tm tmAdjusted; - InitTm(tmAdjusted); - tmAdjusted.tm_hour = tm.hour; - tmAdjusted.tm_min = tm.min; - tmAdjusted.tm_sec = tm.sec; - tmAdjusted.tm_wday = tm.GetWeekDay(); - tmAdjusted.tm_yday = GetDayOfYear(); - tmAdjusted.tm_mday = tm.mday; - tmAdjusted.tm_mon = tm.mon; - tmAdjusted.tm_year = year - 1900; - tmAdjusted.tm_isdst = 0; // no DST, already adjusted - wxString str = CallStrftime(*p == wxT('c') ? wxT("%c") - : wxT("%x"), - &tmAdjusted); - - // now replace the replacement year with the real year: - // notice that we have to replace the 4 digit year with - // a unique string not appearing in strftime() output - // first to prevent the 2 digit year from matching any - // substring of the 4 digit year (but any day, month, - // hours or minutes components should be safe because - // they are never in 70-99 range) - wxString replacement("|"); - while ( str.find(replacement) != wxString::npos ) - replacement += '|'; - - str.Replace(wxString::Format("%d", year), - replacement); - str.Replace(wxString::Format("%d", year % 100), - wxString::Format("%d", yearReal % 100)); - str.Replace(replacement, - wxString::Format("%d", yearReal)); - - res += str; - } -#else // !wxHAS_STRFTIME - // Use "%m/%d/%y %H:%M:%S" format instead - res += wxString::Format(wxT("%02d/%02d/%04d %02d:%02d:%02d"), - tm.mon+1,tm.mday, tm.year, tm.hour, tm.min, tm.sec); -#endif // wxHAS_STRFTIME/!wxHAS_STRFTIME - break; - - case wxT('d'): // day of a month (01-31) - res += wxString::Format(fmt, tm.mday); - break; - - case wxT('g'): // 2-digit week-based year - res += wxString::Format(fmt, GetWeekBasedYear() % 100); - break; - - case wxT('G'): // week-based year with century - res += wxString::Format(fmt, GetWeekBasedYear()); - break; - - case wxT('H'): // hour in 24h format (00-23) - res += wxString::Format(fmt, tm.hour); - break; - - case wxT('I'): // hour in 12h format (01-12) - { - // 24h -> 12h, 0h -> 12h too - int hour12 = tm.hour > 12 ? tm.hour - 12 - : tm.hour ? tm.hour : 12; - res += wxString::Format(fmt, hour12); - } - break; - - case wxT('j'): // day of the year - res += wxString::Format(fmt, GetDayOfYear(tz)); - break; - - case wxT('l'): // milliseconds (NOT STANDARD) - res += wxString::Format(fmt, GetMillisecond(tz)); - break; - - case wxT('m'): // month as a number (01-12) - res += wxString::Format(fmt, tm.mon + 1); - break; - - case wxT('M'): // minute as a decimal number (00-59) - res += wxString::Format(fmt, tm.min); - break; - - case wxT('p'): // AM or PM string -#ifdef wxHAS_STRFTIME - res += CallStrftime(wxT("%p"), &tmTimeOnly); -#else // !wxHAS_STRFTIME - res += (tmTimeOnly.tm_hour > 12) ? wxT("pm") : wxT("am"); -#endif // wxHAS_STRFTIME/!wxHAS_STRFTIME - break; - - case wxT('S'): // second as a decimal number (00-61) - res += wxString::Format(fmt, tm.sec); - break; - - case wxT('U'): // week number in the year (Sunday 1st week day) - res += wxString::Format(fmt, GetWeekOfYear(Sunday_First, tz)); - break; - - case wxT('V'): // ISO week number - case wxT('W'): // week number in the year (Monday 1st week day) - res += wxString::Format(fmt, GetWeekOfYear(Monday_First, tz)); - break; - - case wxT('w'): // weekday as a number (0-6), Sunday = 0 - res += wxString::Format(fmt, tm.GetWeekDay()); - break; - - // case wxT('x'): -- handled with "%c" - - case wxT('X'): // locale default time representation - // just use strftime() to format the time for us -#ifdef wxHAS_STRFTIME - res += CallStrftime(wxT("%X"), &tmTimeOnly); -#else // !wxHAS_STRFTIME - res += wxString::Format(wxT("%02d:%02d:%02d"),tm.hour, tm.min, tm.sec); -#endif // wxHAS_STRFTIME/!wxHAS_STRFTIME - break; - - case wxT('y'): // year without century (00-99) - res += wxString::Format(fmt, tm.year % 100); - break; - - case wxT('Y'): // year with century - res += wxString::Format(fmt, tm.year); - break; - - case wxT('z'): // time zone as [-+]HHMM - { - int ofs = tz.GetOffset(); - - // The time zone offset does not include the DST, but - // we do need to take it into account when showing the - // time in the local time zone to the user. - if ( ofs == -wxGetTimeZone() && IsDST() == 1 ) - { - // FIXME: As elsewhere in wxDateTime, we assume - // that the DST is always 1 hour, but this is not - // true in general. - ofs += 3600; - } - - if ( ofs < 0 ) - { - res += '-'; - ofs = -ofs; - } - else - { - res += '+'; - } - - // Converts seconds to HHMM representation. - res += wxString::Format(fmt, - 100*(ofs/3600) + (ofs/60)%60); - } - break; - - case wxT('Z'): // timezone name -#ifdef wxHAS_STRFTIME - res += CallStrftime(wxT("%Z"), &tmTimeOnly); -#endif - break; - - default: - // is it the format width? - for ( fmt.clear(); - *p == wxT('-') || *p == wxT('+') || - *p == wxT(' ') || wxIsdigit(*p); - ++p ) - { - fmt += *p; - } - - if ( !fmt.empty() ) - { - // we've only got the flags and width so far in fmt - fmt.Prepend(wxT('%')); - fmt.Append(wxT('d')); - - restart = true; - - break; - } - - // no, it wasn't the width - wxFAIL_MSG(wxT("unknown format specifier")); - - wxFALLTHROUGH; - - case wxT('%'): // a percent sign - res += *p; - break; - - case 0: // the end of string - wxFAIL_MSG(wxT("missing format at the end of string")); - - // just put the '%' which was the last char in format - res += wxT('%'); - break; - } - } - } - - return res; -} - -// this function parses a string in (strict) RFC 822 format: see the section 5 -// of the RFC for the detailed description, but briefly it's something of the -// form "Sat, 18 Dec 1999 00:48:30 +0100" -// -// this function is "strict" by design - it must reject anything except true -// RFC822 time specs. -bool -wxDateTime::ParseRfc822Date(const wxString& date, wxString::const_iterator *end) -{ - const wxString::const_iterator pEnd = date.end(); - wxString::const_iterator p = date.begin(); - - // 1. week day - const wxDateTime::WeekDay - wd = GetWeekDayFromName(p, pEnd, Name_Abbr, DateLang_English); - if ( wd == Inv_WeekDay ) - return false; - //else: ignore week day for now, we could also check that it really - // corresponds to the specified date - - // 2. separating comma - if ( *p++ != ',' || *p++ != ' ' ) - return false; - - // 3. day number - if ( !wxIsdigit(*p) ) - return false; - - wxDateTime_t day = (wxDateTime_t)(*p++ - '0'); - if ( wxIsdigit(*p) ) - { - day *= 10; - day = (wxDateTime_t)(day + (*p++ - '0')); - } - - if ( *p++ != ' ' ) - return false; - - // 4. month name - const Month mon = GetMonthFromName(p, pEnd, Name_Abbr, DateLang_English); - if ( mon == Inv_Month ) - return false; - - if ( *p++ != ' ' ) - return false; - - // 5. year - if ( !wxIsdigit(*p) ) - return false; - - int year = *p++ - '0'; - if ( !wxIsdigit(*p) ) // should have at least 2 digits in the year - return false; - - year *= 10; - year += *p++ - '0'; - - // is it a 2 digit year (as per original RFC 822) or a 4 digit one? - if ( wxIsdigit(*p) ) - { - year *= 10; - year += *p++ - '0'; - - if ( !wxIsdigit(*p) ) - { - // no 3 digit years please - return false; - } - - year *= 10; - year += *p++ - '0'; - } - - if ( *p++ != ' ' ) - return false; - - // 6. time in hh:mm:ss format with seconds being optional - if ( !wxIsdigit(*p) ) - return false; - - wxDateTime_t hour = (wxDateTime_t)(*p++ - '0'); - - if ( !wxIsdigit(*p) ) - return false; - - hour *= 10; - hour = (wxDateTime_t)(hour + (*p++ - '0')); - - if ( *p++ != ':' ) - return false; - - if ( !wxIsdigit(*p) ) - return false; - - wxDateTime_t min = (wxDateTime_t)(*p++ - '0'); - - if ( !wxIsdigit(*p) ) - return false; - - min *= 10; - min += (wxDateTime_t)(*p++ - '0'); - - wxDateTime_t sec = 0; - if ( *p == ':' ) - { - p++; - if ( !wxIsdigit(*p) ) - return false; - - sec = (wxDateTime_t)(*p++ - '0'); - - if ( !wxIsdigit(*p) ) - return false; - - sec *= 10; - sec += (wxDateTime_t)(*p++ - '0'); - } - - if ( *p++ != ' ' ) - return false; - - // 7. now the interesting part: the timezone - int offset = 0; // just to suppress warnings - if ( *p == '-' || *p == '+' ) - { - // the explicit offset given: it has the form of hhmm - bool plus = *p++ == '+'; - - if ( !wxIsdigit(*p) || !wxIsdigit(*(p + 1)) ) - return false; - - - // hours - offset = MIN_PER_HOUR*(10*(*p - '0') + (*(p + 1) - '0')); - - p += 2; - - if ( !wxIsdigit(*p) || !wxIsdigit(*(p + 1)) ) - return false; - - // minutes - offset += 10*(*p - '0') + (*(p + 1) - '0'); - - if ( !plus ) - offset = -offset; - - p += 2; - } - else // not numeric - { - // the symbolic timezone given: may be either military timezone or one - // of standard abbreviations - if ( !*(p + 1) ) - { - // military: Z = UTC, J unused, A = -1, ..., Y = +12 - static const int offsets[26] = - { - //A B C D E F G H I J K L M - -1, -2, -3, -4, -5, -6, -7, -8, -9, 0, -10, -11, -12, - //N O P R Q S T U V W Z Y Z - +1, +2, +3, +4, +5, +6, +7, +8, +9, +10, +11, +12, 0 - }; - - if ( *p < wxT('A') || *p > wxT('Z') || *p == wxT('J') ) - return false; - - offset = offsets[*p++ - 'A']; - } - else - { - // abbreviation - const wxString tz(p, date.end()); - if ( tz == wxT("UT") || tz == wxT("UTC") || tz == wxT("GMT") ) - offset = 0; - else if ( tz == wxT("AST") ) - offset = AST - GMT0; - else if ( tz == wxT("ADT") ) - offset = ADT - GMT0; - else if ( tz == wxT("EST") ) - offset = EST - GMT0; - else if ( tz == wxT("EDT") ) - offset = EDT - GMT0; - else if ( tz == wxT("CST") ) - offset = CST - GMT0; - else if ( tz == wxT("CDT") ) - offset = CDT - GMT0; - else if ( tz == wxT("MST") ) - offset = MST - GMT0; - else if ( tz == wxT("MDT") ) - offset = MDT - GMT0; - else if ( tz == wxT("PST") ) - offset = PST - GMT0; - else if ( tz == wxT("PDT") ) - offset = PDT - GMT0; - else - return false; - - p += tz.length(); - } - - // make it minutes - offset *= MIN_PER_HOUR; - } - - - // the spec was correct, construct the date from the values we found - Set(day, mon, year, hour, min, sec); - - // As always, dealing with the time zone is the most interesting part: we - // can't just use MakeFromTimeZone() here because it wouldn't handle the - // DST correctly because the TZ specified in the string is DST-invariant - // and so we have to manually shift to the UTC first and then convert to - // the local TZ. - *this -= wxTimeSpan::Minutes(offset); - MakeFromUTC(); - - if ( end ) - *end = p; - - return true; -} - -const char* wxDateTime::ParseRfc822Date(const char* date) -{ - wxString::const_iterator end; - wxString dateStr(date); - if ( !ParseRfc822Date(dateStr, &end) ) - return NULL; - - return date + dateStr.IterOffsetInMBStr(end); -} - -const wchar_t* wxDateTime::ParseRfc822Date(const wchar_t* date) -{ - wxString::const_iterator end; - wxString dateStr(date); - if ( !ParseRfc822Date(dateStr, &end) ) - return NULL; - - return date + (end - dateStr.begin()); -} - -bool -wxDateTime::ParseFormat(const wxString& date, - const wxString& format, - const wxDateTime& dateDef, - wxString::const_iterator *endParse) -{ - wxCHECK_MSG( !format.empty(), false, "format can't be empty" ); - wxCHECK_MSG( endParse, false, "end iterator pointer must be specified" ); - - wxString str; - unsigned long num; - - // what fields have we found? - bool haveWDay = false, - haveYDay = false, - haveDay = false, - haveMon = false, - haveYear = false, - haveHour = false, - haveMin = false, - haveSec = false, - haveMsec = false; - - bool hourIsIn12hFormat = false, // or in 24h one? - isPM = false; // AM by default - - bool haveTimeZone = false; - - // and the value of the items we have (init them to get rid of warnings) - wxDateTime_t msec = 0, - sec = 0, - min = 0, - hour = 0; - WeekDay wday = Inv_WeekDay; - wxDateTime_t yday = 0, - mday = 0; - wxDateTime::Month mon = Inv_Month; - int year = 0; - long timeZone = 0; // time zone in seconds as expected in Tm structure - - wxString::const_iterator input = date.begin(); - const wxString::const_iterator end = date.end(); - for ( wxString::const_iterator fmt = format.begin(); fmt != format.end(); ++fmt ) - { - if ( *fmt != wxT('%') ) - { - if ( wxIsspace(*fmt) ) - { - // a white space in the format string matches 0 or more white - // spaces in the input - while ( input != end && wxIsspace(*input) ) - { - input++; - } - } - else // !space - { - // any other character (not whitespace, not '%') must be - // matched by itself in the input - if ( input == end || *input++ != *fmt ) - { - // no match - return false; - } - } - - // done with this format char - continue; - } - - // start of a format specification - - // parse the optional width - size_t width = 0; - while ( wxIsdigit(*++fmt) ) - { - width *= 10; - width += *fmt - '0'; - } - - // the default widths for the various fields - if ( !width ) - { - switch ( (*fmt).GetValue() ) - { - case wxT('Y'): // year has 4 digits - width = 4; - break; - - case wxT('j'): // day of year has 3 digits - case wxT('l'): // milliseconds have 3 digits - width = 3; - break; - - case wxT('w'): // week day as number has only one - width = 1; - break; - - default: - // default for all other fields - width = 2; - } - } - - // then the format itself - switch ( (*fmt).GetValue() ) - { - case wxT('a'): // a weekday name - case wxT('A'): - { - wday = GetWeekDayFromName - ( - input, end, - *fmt == 'a' ? Name_Abbr : Name_Full, - DateLang_Local - ); - if ( wday == Inv_WeekDay ) - { - // no match - return false; - } - } - haveWDay = true; - break; - - case wxT('b'): // a month name - case wxT('B'): - { - mon = GetMonthFromName - ( - input, end, - *fmt == 'b' ? Name_Abbr : Name_Full, - DateLang_Local - ); - if ( mon == Inv_Month ) - { - // no match - return false; - } - } - haveMon = true; - break; - - case wxT('c'): // locale default date and time representation - { - wxDateTime dt; - -#if wxUSE_INTL - const wxString - fmtDateTime = wxLocale::GetInfo(wxLOCALE_DATE_TIME_FMT); - if ( !fmtDateTime.empty() ) - dt = ParseFormatAt(input, end, fmtDateTime); -#endif // wxUSE_INTL - if ( !dt.IsValid() ) - { - // also try the format which corresponds to ctime() - // output (i.e. the "C" locale default) - dt = ParseFormatAt(input, end, wxS("%a %b %d %H:%M:%S %Y")); - } - - if ( !dt.IsValid() ) - { - // and finally also the two generic date/time formats - dt = ParseFormatAt(input, end, wxS("%x %X"), wxS("%X %x")); - } - - if ( !dt.IsValid() ) - return false; - - const Tm tm = dt.GetTm(); - - hour = tm.hour; - min = tm.min; - sec = tm.sec; - - year = tm.year; - mon = tm.mon; - mday = tm.mday; - - haveDay = haveMon = haveYear = - haveHour = haveMin = haveSec = true; - } - break; - - case wxT('d'): // day of a month (01-31) - case 'e': // day of a month (1-31) (GNU extension) - if ( !GetNumericToken(width, input, end, &num) || - (num > 31) || (num < 1) ) - { - // no match - return false; - } - - // we can't check whether the day range is correct yet, will - // do it later - assume ok for now - haveDay = true; - mday = (wxDateTime_t)num; - break; - - case wxT('H'): // hour in 24h format (00-23) - if ( !GetNumericToken(width, input, end, &num) || (num > 23) ) - { - // no match - return false; - } - - haveHour = true; - hour = (wxDateTime_t)num; - break; - - case wxT('I'): // hour in 12h format (01-12) - if ( !GetNumericToken(width, input, end, &num) || - !num || (num > 12) ) - { - // no match - return false; - } - - haveHour = true; - hourIsIn12hFormat = true; - hour = (wxDateTime_t)(num % 12); // 12 should be 0 - break; - - case wxT('j'): // day of the year - if ( !GetNumericToken(width, input, end, &num) || - !num || (num > 366) ) - { - // no match - return false; - } - - haveYDay = true; - yday = (wxDateTime_t)num; - break; - - case wxT('l'): // milliseconds (0-999) - if ( !GetNumericToken(width, input, end, &num) ) - return false; - - haveMsec = true; - msec = (wxDateTime_t)num; - break; - - case wxT('m'): // month as a number (01-12) - if ( !GetNumericToken(width, input, end, &num) || - !num || (num > 12) ) - { - // no match - return false; - } - - haveMon = true; - mon = (Month)(num - 1); - break; - - case wxT('M'): // minute as a decimal number (00-59) - if ( !GetNumericToken(width, input, end, &num) || - (num > 59) ) - { - // no match - return false; - } - - haveMin = true; - min = (wxDateTime_t)num; - break; - - case wxT('p'): // AM or PM string - { - wxString am, pm; - GetAmPmStrings(&am, &pm); - - // we can never match %p in locales which don't use AM/PM - if ( am.empty() || pm.empty() ) - return false; - - const size_t pos = input - date.begin(); - if ( date.compare(pos, pm.length(), pm) == 0 ) - { - isPM = true; - input += pm.length(); - } - else if ( date.compare(pos, am.length(), am) == 0 ) - { - input += am.length(); - } - else // no match - { - return false; - } - } - break; - - case wxT('r'): // time as %I:%M:%S %p - { - wxDateTime dt; - if ( !dt.ParseFormat(wxString(input, end), - wxS("%I:%M:%S %p"), &input) ) - return false; - - haveHour = haveMin = haveSec = true; - - const Tm tm = dt.GetTm(); - hour = tm.hour; - min = tm.min; - sec = tm.sec; - } - break; - - case wxT('R'): // time as %H:%M - { - const wxDateTime - dt = ParseFormatAt(input, end, wxS("%H:%M")); - if ( !dt.IsValid() ) - return false; - - haveHour = - haveMin = true; - - const Tm tm = dt.GetTm(); - hour = tm.hour; - min = tm.min; - } - break; - - case wxT('S'): // second as a decimal number (00-61) - if ( !GetNumericToken(width, input, end, &num) || - (num > 61) ) - { - // no match - return false; - } - - haveSec = true; - sec = (wxDateTime_t)num; - break; - - case wxT('T'): // time as %H:%M:%S - { - const wxDateTime - dt = ParseFormatAt(input, end, wxS("%H:%M:%S")); - if ( !dt.IsValid() ) - return false; - - haveHour = - haveMin = - haveSec = true; - - const Tm tm = dt.GetTm(); - hour = tm.hour; - min = tm.min; - sec = tm.sec; - } - break; - - case wxT('w'): // weekday as a number (0-6), Sunday = 0 - if ( !GetNumericToken(width, input, end, &num) || - (wday > 6) ) - { - // no match - return false; - } - - haveWDay = true; - wday = (WeekDay)num; - break; - - case wxT('x'): // locale default date representation - { -#if wxUSE_INTL - wxString - fmtDate = wxLocale::GetInfo(wxLOCALE_SHORT_DATE_FMT), - fmtDateAlt = wxLocale::GetInfo(wxLOCALE_LONG_DATE_FMT); -#else // !wxUSE_INTL - wxString fmtDate, fmtDateAlt; -#endif // wxUSE_INTL/!wxUSE_INTL - if ( fmtDate.empty() ) - { - if ( IsWestEuropeanCountry(GetCountry()) || - GetCountry() == Russia ) - { - fmtDate = wxS("%d/%m/%Y"); - fmtDateAlt = wxS("%m/%d/%Y"); - } - else // assume USA - { - fmtDate = wxS("%m/%d/%Y"); - fmtDateAlt = wxS("%d/%m/%Y"); - } - } - - wxDateTime - dt = ParseFormatAt(input, end, fmtDate, fmtDateAlt); - - if ( !dt.IsValid() ) - { - // try with short years too - fmtDate.Replace("%Y","%y"); - fmtDateAlt.Replace("%Y","%y"); - dt = ParseFormatAt(input, end, fmtDate, fmtDateAlt); - - if ( !dt.IsValid() ) - return false; - } - - const Tm tm = dt.GetTm(); - - haveDay = - haveMon = - haveYear = true; - - year = tm.year; - mon = tm.mon; - mday = tm.mday; - } - - break; - - case wxT('X'): // locale default time representation - { -#if wxUSE_INTL - wxString fmtTime = wxLocale::GetInfo(wxLOCALE_TIME_FMT), - fmtTimeAlt; -#else // !wxUSE_INTL - wxString fmtTime, fmtTimeAlt; -#endif // wxUSE_INTL/!wxUSE_INTL - if ( fmtTime.empty() ) - { - // try to parse what follows as "%H:%M:%S" and, if this - // fails, as "%I:%M:%S %p" - this should catch the most - // common cases - fmtTime = "%T"; - fmtTimeAlt = "%r"; - } - - const wxDateTime - dt = ParseFormatAt(input, end, fmtTime, fmtTimeAlt); - if ( !dt.IsValid() ) - return false; - - haveHour = - haveMin = - haveSec = true; - - const Tm tm = dt.GetTm(); - hour = tm.hour; - min = tm.min; - sec = tm.sec; - } - break; - - case wxT('y'): // year without century (00-99) - if ( !GetNumericToken(width, input, end, &num) || - (num > 99) ) - { - // no match - return false; - } - - haveYear = true; - - // TODO should have an option for roll over date instead of - // hard coding it here - year = (num > 30 ? 1900 : 2000) + (wxDateTime_t)num; - break; - - case wxT('Y'): // year with century - if ( !GetNumericToken(width, input, end, &num) ) - { - // no match - return false; - } - - haveYear = true; - year = (wxDateTime_t)num; - break; - - case wxT('z'): - { - // check that we have something here at all - if ( input == end ) - return false; - - // and then check that it's either plus or minus sign - bool minusFound; - if ( *input == wxT('-') ) - minusFound = true; - else if ( *input == wxT('+') ) - minusFound = false; - else - return false; // no match - - // here should follow 4 digits HHMM - ++input; - unsigned long tzHourMin; - if ( !GetNumericToken(4, input, end, &tzHourMin) ) - return false; // no match - - const unsigned hours = tzHourMin / 100; - const unsigned minutes = tzHourMin % 100; - - if ( hours > 12 || minutes > 59 ) - return false; // bad format - - timeZone = 3600*hours + 60*minutes; - if ( minusFound ) - timeZone = -timeZone; - - haveTimeZone = true; - } - break; - - case wxT('Z'): // timezone name - // FIXME: currently we just ignore everything that looks like a - // time zone here - GetAlphaToken(input, end); - break; - - case wxT('%'): // a percent sign - if ( input == end || *input++ != wxT('%') ) - { - // no match - return false; - } - break; - - case 0: // the end of string - wxFAIL_MSG(wxT("unexpected format end")); - - wxFALLTHROUGH; - - default: // not a known format spec - return false; - } - } - - // format matched, try to construct a date from what we have now - Tm tmDef; - if ( dateDef.IsValid() ) - { - // take this date as default - tmDef = dateDef.GetTm(); - } - else if ( IsValid() ) - { - // if this date is valid, don't change it - tmDef = GetTm(); - } - else - { - // no default and this date is invalid - fall back to Today() - tmDef = Today().GetTm(); - } - - Tm tm = tmDef; - - // set the date - if ( haveMon ) - { - tm.mon = mon; - } - - if ( haveYear ) - { - tm.year = year; - } - - // TODO we don't check here that the values are consistent, if both year - // day and month/day were found, we just ignore the year day and we - // also always ignore the week day - if ( haveDay ) - { - if ( mday > GetNumberOfDays(tm.mon, tm.year) ) - return false; - - tm.mday = mday; - } - else if ( haveYDay ) - { - if ( yday > GetNumberOfDays(tm.year) ) - return false; - - Tm tm2 = wxDateTime(1, Jan, tm.year).SetToYearDay(yday).GetTm(); - - tm.mon = tm2.mon; - tm.mday = tm2.mday; - } - - // deal with AM/PM - if ( haveHour && hourIsIn12hFormat && isPM ) - { - // translate to 24hour format - hour += 12; - } - //else: either already in 24h format or no translation needed - - // set the time - if ( haveHour ) - { - tm.hour = hour; - } - - if ( haveMin ) - { - tm.min = min; - } - - if ( haveSec ) - { - tm.sec = sec; - } - - if ( haveMsec ) - tm.msec = msec; - - Set(tm); - - // If a time zone was specified and it is not the local time zone, we need - // to shift the time accordingly. - // - // Note that avoiding the call to MakeFromTimeZone is necessary to avoid - // DST problems. - if ( haveTimeZone && timeZone != -wxGetTimeZone() ) - MakeFromTimezone(timeZone); - - // finally check that the week day is consistent -- if we had it - if ( haveWDay && GetWeekDay() != wday ) - return false; - - *endParse = input; - - return true; -} - -const char* -wxDateTime::ParseFormat(const char* date, - const wxString& format, - const wxDateTime& dateDef) -{ - wxString::const_iterator end; - wxString dateStr(date); - if ( !ParseFormat(dateStr, format, dateDef, &end) ) - return NULL; - - return date + dateStr.IterOffsetInMBStr(end); -} - -const wchar_t* -wxDateTime::ParseFormat(const wchar_t* date, - const wxString& format, - const wxDateTime& dateDef) -{ - wxString::const_iterator end; - wxString dateStr(date); - if ( !ParseFormat(dateStr, format, dateDef, &end) ) - return NULL; - - return date + (end - dateStr.begin()); -} - -bool -wxDateTime::ParseDateTime(const wxString& date, wxString::const_iterator *end) -{ - wxCHECK_MSG( end, false, "end iterator pointer must be specified" ); - - wxDateTime - dtDate, - dtTime; - - wxString::const_iterator - endTime, - endDate, - endBoth; - - // If we got a date in the beginning, see if there is a time specified - // after the date - if ( dtDate.ParseDate(date, &endDate) ) - { - // Skip spaces, as the ParseTime() function fails on spaces - while ( endDate != date.end() && wxIsspace(*endDate) ) - ++endDate; - - const wxString timestr(endDate, date.end()); - if ( !dtTime.ParseTime(timestr, &endTime) ) - return false; - - endBoth = endDate + (endTime - timestr.begin()); - } - else // no date in the beginning - { - // check if we have a time followed by a date - if ( !dtTime.ParseTime(date, &endTime) ) - return false; - - while ( endTime != date.end() && wxIsspace(*endTime) ) - ++endTime; - - const wxString datestr(endTime, date.end()); - if ( !dtDate.ParseDate(datestr, &endDate) ) - return false; - - endBoth = endTime + (endDate - datestr.begin()); - } - - Set(dtDate.GetDay(), dtDate.GetMonth(), dtDate.GetYear(), - dtTime.GetHour(), dtTime.GetMinute(), dtTime.GetSecond(), - dtTime.GetMillisecond()); - - *end = endBoth; - - return true; -} - -const char* wxDateTime::ParseDateTime(const char* date) -{ - wxString::const_iterator end; - wxString dateStr(date); - if ( !ParseDateTime(dateStr, &end) ) - return NULL; - - return date + dateStr.IterOffsetInMBStr(end); -} - -const wchar_t* wxDateTime::ParseDateTime(const wchar_t* date) -{ - wxString::const_iterator end; - wxString dateStr(date); - if ( !ParseDateTime(dateStr, &end) ) - return NULL; - - return date + (end - dateStr.begin()); -} - -bool -wxDateTime::ParseDate(const wxString& date, wxString::const_iterator *end) -{ - wxCHECK_MSG( end, false, "end iterator pointer must be specified" ); - - // this is a simplified version of ParseDateTime() which understands only - // "today" (for wxDate compatibility) and digits only otherwise (and not - // all esoteric constructions ParseDateTime() knows about) - - const wxString::const_iterator pBegin = date.begin(); - const wxString::const_iterator pEnd = date.end(); - - wxString::const_iterator p = pBegin; - while ( p != pEnd && wxIsspace(*p) ) - p++; - - // some special cases - static struct - { - const char *str; - int dayDiffFromToday; - } literalDates[] = - { - { wxTRANSLATE("today"), 0 }, - { wxTRANSLATE("yesterday"), -1 }, - { wxTRANSLATE("tomorrow"), 1 }, - }; - - const size_t lenRest = pEnd - p; - for ( size_t n = 0; n < WXSIZEOF(literalDates); n++ ) - { - const wxString dateStr = wxGetTranslation(literalDates[n].str); - size_t len = dateStr.length(); - - if ( len > lenRest ) - continue; - - const wxString::const_iterator pEndStr = p + len; - if ( wxString(p, pEndStr).CmpNoCase(dateStr) == 0 ) - { - // nothing can follow this, so stop here - - p = pEndStr; - - int dayDiffFromToday = literalDates[n].dayDiffFromToday; - *this = Today(); - if ( dayDiffFromToday ) - { - *this += wxDateSpan::Days(dayDiffFromToday); - } - - *end = pEndStr; - - return true; - } - } - - // We try to guess what we have here: for each new (numeric) token, we - // determine if it can be a month, day or a year. Of course, there is an - // ambiguity as some numbers may be days as well as months, so we also - // have the ability to back track. - - // what do we have? - bool haveDay = false, // the months day? - haveWDay = false, // the day of week? - haveMon = false, // the month? - haveYear = false; // the year? - - bool monWasNumeric = false; // was month specified as a number? - - // and the value of the items we have (init them to get rid of warnings) - WeekDay wday = Inv_WeekDay; - wxDateTime_t day = 0; - wxDateTime::Month mon = Inv_Month; - int year = 0; - - // tokenize the string - while ( p != pEnd ) - { - // skip white space and date delimiters - if ( wxStrchr(".,/-\t\r\n ", *p) ) - { - ++p; - continue; - } - - // modify copy of the iterator as we're not sure if the next token is - // still part of the date at all - wxString::const_iterator pCopy = p; - - // we can have either alphabetic or numeric token, start by testing if - // it's the latter - unsigned long val; - if ( GetNumericToken(10 /* max length */, pCopy, pEnd, &val) ) - { - // guess what this number is - - bool isDay = false, - isMonth = false, - isYear = false; - - if ( !haveMon && val > 0 && val <= 12 ) - { - // assume it is month - isMonth = true; - } - else // not the month - { - if ( haveDay ) - { - // this can only be the year - isYear = true; - } - else // may be either day or year - { - // use a leap year if we don't have the year yet to allow - // dates like 2/29/1976 which would be rejected otherwise - wxDateTime_t max_days = (wxDateTime_t)( - haveMon - ? GetNumberOfDays(mon, haveYear ? year : 1976) - : 31 - ); - - // can it be day? - if ( (val == 0) || (val > (unsigned long)max_days) ) - { - // no - isYear = true; - } - else // yes, suppose it's the day - { - isDay = true; - } - } - } - - if ( isYear ) - { - if ( haveYear ) - break; - - haveYear = true; - - year = (wxDateTime_t)val; - } - else if ( isDay ) - { - if ( haveDay ) - break; - - haveDay = true; - - day = (wxDateTime_t)val; - } - else if ( isMonth ) - { - haveMon = true; - monWasNumeric = true; - - mon = (Month)(val - 1); - } - } - else // not a number - { - // be careful not to overwrite the current mon value - Month mon2 = GetMonthFromName - ( - pCopy, pEnd, - Name_Full | Name_Abbr, - DateLang_Local | DateLang_English - ); - if ( mon2 != Inv_Month ) - { - // it's a month - if ( haveMon ) - { - // but we already have a month - maybe we guessed wrong - // when we had interpreted that numeric value as a month - // and it was the day number instead? - if ( haveDay || !monWasNumeric ) - break; - - // assume we did and change our mind: reinterpret the month - // value as a day (notice that there is no need to check - // that it is valid as month values are always < 12, but - // the days are counted from 1 unlike the months) - day = (wxDateTime_t)(mon + 1); - haveDay = true; - } - - mon = mon2; - - haveMon = true; - } - else // not a valid month name - { - WeekDay wday2 = GetWeekDayFromName - ( - pCopy, pEnd, - Name_Full | Name_Abbr, - DateLang_Local | DateLang_English - ); - if ( wday2 != Inv_WeekDay ) - { - // a week day - if ( haveWDay ) - break; - - wday = wday2; - - haveWDay = true; - } - else // not a valid weekday name - { - // try the ordinals - static const char *const ordinals[] = - { - wxTRANSLATE("first"), - wxTRANSLATE("second"), - wxTRANSLATE("third"), - wxTRANSLATE("fourth"), - wxTRANSLATE("fifth"), - wxTRANSLATE("sixth"), - wxTRANSLATE("seventh"), - wxTRANSLATE("eighth"), - wxTRANSLATE("ninth"), - wxTRANSLATE("tenth"), - wxTRANSLATE("eleventh"), - wxTRANSLATE("twelfth"), - wxTRANSLATE("thirteenth"), - wxTRANSLATE("fourteenth"), - wxTRANSLATE("fifteenth"), - wxTRANSLATE("sixteenth"), - wxTRANSLATE("seventeenth"), - wxTRANSLATE("eighteenth"), - wxTRANSLATE("nineteenth"), - wxTRANSLATE("twentieth"), - // that's enough - otherwise we'd have problems with - // composite (or not) ordinals - }; - - size_t n; - for ( n = 0; n < WXSIZEOF(ordinals); n++ ) - { - const wxString ord = wxGetTranslation(ordinals[n]); - const size_t len = ord.length(); - if ( date.compare(p - pBegin, len, ord) == 0 ) - { - p += len; - break; - } - } - - if ( n == WXSIZEOF(ordinals) ) - { - // stop here - something unknown - break; - } - - // it's a day - if ( haveDay ) - { - // don't try anything here (as in case of numeric day - // above) - the symbolic day spec should always - // precede the month/year - break; - } - - haveDay = true; - - day = (wxDateTime_t)(n + 1); - } - } - } - - // advance iterator past a successfully parsed token - p = pCopy; - } - - // either no more tokens or the scan was stopped by something we couldn't - // parse - in any case, see if we can construct a date from what we have - if ( !haveDay && !haveWDay ) - return false; - - if ( haveWDay && (haveMon || haveYear || haveDay) && - !(haveDay && haveMon && haveYear) ) - { - // without adjectives (which we don't support here) the week day only - // makes sense completely separately or with the full date - // specification (what would "Wed 1999" mean?) - return false; - } - - if ( !haveWDay && haveYear && !(haveDay && haveMon) ) - { - // may be we have month and day instead of day and year? - if ( haveDay && !haveMon ) - { - if ( day <= 12 ) - { - // exchange day and month - mon = (wxDateTime::Month)(day - 1); - - // we're in the current year then - if ( (year > 0) && (year <= (int)GetNumberOfDays(mon, Inv_Year)) ) - { - day = (wxDateTime_t)year; - - haveMon = true; - haveYear = false; - } - //else: no, can't exchange, leave haveMon == false - } - } - - if ( !haveMon ) - return false; - } - - if ( !haveMon ) - { - mon = GetCurrentMonth(); - } - - if ( !haveYear ) - { - year = GetCurrentYear(); - } - - if ( haveDay ) - { - // normally we check the day above but the check is optimistic in case - // we find the day before its month/year so we have to redo it now - if ( day > GetNumberOfDays(mon, year) ) - return false; - - Set(day, mon, year); - - if ( haveWDay ) - { - // check that it is really the same - if ( GetWeekDay() != wday ) - return false; - } - } - else // haveWDay - { - *this = Today(); - - SetToWeekDayInSameWeek(wday); - } - - *end = p; - - return true; -} - -const char* wxDateTime::ParseDate(const char* date) -{ - wxString::const_iterator end; - wxString dateStr(date); - if ( !ParseDate(dateStr, &end) ) - return NULL; - - return date + dateStr.IterOffsetInMBStr(end); -} - -const wchar_t* wxDateTime::ParseDate(const wchar_t* date) -{ - wxString::const_iterator end; - wxString dateStr(date); - if ( !ParseDate(dateStr, &end) ) - return NULL; - - return date + (end - dateStr.begin()); -} - -bool -wxDateTime::ParseTime(const wxString& time, wxString::const_iterator *end) -{ - wxCHECK_MSG( end, false, "end iterator pointer must be specified" ); - - // first try some extra things - static const struct - { - const char *name; - wxDateTime_t hour; - } stdTimes[] = - { - { wxTRANSLATE("noon"), 12 }, - { wxTRANSLATE("midnight"), 00 }, - // anything else? - }; - - for ( size_t n = 0; n < WXSIZEOF(stdTimes); n++ ) - { - const wxString timeString = wxGetTranslation(stdTimes[n].name); - if ( timeString.CmpNoCase(wxString(time, timeString.length())) == 0 ) - { - Set(stdTimes[n].hour, 0, 0); - - if ( end ) - *end = time.begin() + timeString.length(); - - return true; - } - } - - // try all time formats we may think about in the order from longest to - // shortest - static const char *const timeFormats[] = - { - "%I:%M:%S %p", // 12hour with AM/PM - "%H:%M:%S", // could be the same or 24 hour one so try it too - "%I:%M %p", // 12hour with AM/PM but without seconds - "%H:%M", // and a possibly 24 hour version without seconds - "%I %p", // just hour with AM/AM - "%H", // just hour in 24 hour version - "%X", // possibly something from above or maybe something - // completely different -- try it last - - // TODO: parse timezones - }; - - for ( size_t nFmt = 0; nFmt < WXSIZEOF(timeFormats); nFmt++ ) - { - if ( ParseFormat(time, timeFormats[nFmt], end) ) - return true; - } - - return false; -} - -const char* wxDateTime::ParseTime(const char* date) -{ - wxString::const_iterator end; - wxString dateStr(date); - if ( !ParseTime(dateStr, &end) ) - return NULL; - - return date + dateStr.IterOffsetInMBStr(end); -} - -const wchar_t* wxDateTime::ParseTime(const wchar_t* date) -{ - wxString::const_iterator end; - wxString dateStr(date); - if ( !ParseTime(dateStr, &end) ) - return NULL; - - return date + (end - dateStr.begin()); -} - -// ---------------------------------------------------------------------------- -// Workdays and holidays support -// ---------------------------------------------------------------------------- - -bool wxDateTime::IsWorkDay(Country WXUNUSED(country)) const -{ - return !wxDateTimeHolidayAuthority::IsHoliday(*this); -} - -// ============================================================================ -// wxDateSpan -// ============================================================================ - -wxDateSpan WXDLLIMPEXP_BASE operator*(int n, const wxDateSpan& ds) -{ - wxDateSpan ds1(ds); - return ds1.Multiply(n); -} - -// ============================================================================ -// wxTimeSpan -// ============================================================================ - -wxTimeSpan WXDLLIMPEXP_BASE operator*(int n, const wxTimeSpan& ts) -{ - return wxTimeSpan(ts).Multiply(n); -} - -// this enum is only used in wxTimeSpan::Format() below but we can't declare -// it locally to the method as it provokes an internal compiler error in egcs -// 2.91.60 when building with -O2 -enum TimeSpanPart -{ - Part_Week, - Part_Day, - Part_Hour, - Part_Min, - Part_Sec, - Part_MSec -}; - -// not all strftime(3) format specifiers make sense here because, for example, -// a time span doesn't have a year nor a timezone -// -// Here are the ones which are supported (all of them are supported by strftime -// as well): -// %H hour in 24 hour format -// %M minute (00 - 59) -// %S second (00 - 59) -// %% percent sign -// -// Also, for MFC CTimeSpan compatibility, we support -// %D number of days -// -// And, to be better than MFC :-), we also have -// %E number of wEeks -// %l milliseconds (000 - 999) -wxString wxTimeSpan::Format(const wxString& format) const -{ - // we deal with only positive time spans here and just add the sign in - // front for the negative ones - if ( IsNegative() ) - { - wxString str(Negate().Format(format)); - return "-" + str; - } - - wxCHECK_MSG( !format.empty(), wxEmptyString, - wxT("NULL format in wxTimeSpan::Format") ); - - wxString str; - str.Alloc(format.length()); - - // Suppose we have wxTimeSpan ts(1 /* hour */, 2 /* min */, 3 /* sec */) - // - // Then, of course, ts.Format("%H:%M:%S") must return "01:02:03", but the - // question is what should ts.Format("%S") do? The code here returns "3273" - // in this case (i.e. the total number of seconds, not just seconds % 60) - // because, for me, this call means "give me entire time interval in - // seconds" and not "give me the seconds part of the time interval" - // - // If we agree that it should behave like this, it is clear that the - // interpretation of each format specifier depends on the presence of the - // other format specs in the string: if there was "%H" before "%M", we - // should use GetMinutes() % 60, otherwise just GetMinutes() &c - - // we remember the most important unit found so far - TimeSpanPart partBiggest = Part_MSec; - - for ( wxString::const_iterator pch = format.begin(); pch != format.end(); ++pch ) - { - wxChar ch = *pch; - - if ( ch == wxT('%') ) - { - // the start of the format specification of the printf() below - wxString fmtPrefix(wxT('%')); - - // the number - long n; - - // the number of digits for the format string, 0 if unused - unsigned digits = 0; - - ch = *++pch; // get the format spec char - switch ( ch ) - { - default: - wxFAIL_MSG( wxT("invalid format character") ); - wxFALLTHROUGH; - - case wxT('%'): - str += ch; - - // skip the part below switch - continue; - - case wxT('D'): - n = GetDays(); - if ( partBiggest < Part_Day ) - { - n %= DAYS_PER_WEEK; - } - else - { - partBiggest = Part_Day; - } - break; - - case wxT('E'): - partBiggest = Part_Week; - n = GetWeeks(); - break; - - case wxT('H'): - n = GetHours(); - if ( partBiggest < Part_Hour ) - { - n %= HOURS_PER_DAY; - } - else - { - partBiggest = Part_Hour; - } - - digits = 2; - break; - - case wxT('l'): - n = GetMilliseconds().ToLong(); - if ( partBiggest < Part_MSec ) - { - n %= 1000; - } - //else: no need to reset partBiggest to Part_MSec, it is - // the least significant one anyhow - - digits = 3; - break; - - case wxT('M'): - n = GetMinutes(); - if ( partBiggest < Part_Min ) - { - n %= MIN_PER_HOUR; - } - else - { - partBiggest = Part_Min; - } - - digits = 2; - break; - - case wxT('S'): - n = GetSeconds().ToLong(); - if ( partBiggest < Part_Sec ) - { - n %= SEC_PER_MIN; - } - else - { - partBiggest = Part_Sec; - } - - digits = 2; - break; - } - - if ( digits ) - { - fmtPrefix << wxT("0") << digits; - } - - str += wxString::Format(fmtPrefix + wxT("ld"), n); - } - else - { - // normal character, just copy - str += ch; - } - } - - return str; -} - -#endif // wxUSE_DATETIME diff --git a/Externals/wxWidgets3/src/common/datstrm.cpp b/Externals/wxWidgets3/src/common/datstrm.cpp deleted file mode 100644 index 904e692e51..0000000000 --- a/Externals/wxWidgets3/src/common/datstrm.cpp +++ /dev/null @@ -1,851 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/datstrm.cpp -// Purpose: Data stream classes -// Author: Guilhem Lavaux -// Modified by: Mickael Gilabert -// Created: 28/06/98 -// Copyright: (c) Guilhem Lavaux -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_STREAMS - -#include "wx/datstrm.h" - -#ifndef WX_PRECOMP - #include "wx/math.h" -#endif //WX_PRECOMP - -namespace -{ - -// helper unions used to swap bytes of floats and doubles -union Float32Data -{ - wxFloat32 f; - wxUint32 i; -}; - -union Float64Data -{ - wxFloat64 f; - wxUint32 i[2]; -}; - -} // anonymous namespace - -// ---------------------------------------------------------------------------- -// wxDataStreamBase -// ---------------------------------------------------------------------------- - -wxDataStreamBase::wxDataStreamBase(const wxMBConv& conv) -#if wxUSE_UNICODE - : m_conv(conv.Clone()) -#endif // wxUSE_UNICODE -{ - // It is unused in non-Unicode build, so suppress a warning there. - wxUnusedVar(conv); - - m_be_order = false; - - // For compatibility with the existing data files, we use extended - // precision if it is available, i.e. if wxUSE_APPLE_IEEE is on. -#if wxUSE_APPLE_IEEE - m_useExtendedPrecision = true; -#endif // wxUSE_APPLE_IEEE -} - -#if wxUSE_UNICODE -void wxDataStreamBase::SetConv( const wxMBConv &conv ) -{ - delete m_conv; - m_conv = conv.Clone(); -} -#endif - -wxDataStreamBase::~wxDataStreamBase() -{ -#if wxUSE_UNICODE - delete m_conv; -#endif // wxUSE_UNICODE -} - -// --------------------------------------------------------------------------- -// wxDataInputStream -// --------------------------------------------------------------------------- - -wxDataInputStream::wxDataInputStream(wxInputStream& s, const wxMBConv& conv) - : wxDataStreamBase(conv), - m_input(&s) -{ -} - -#if wxHAS_INT64 -wxUint64 wxDataInputStream::Read64() -{ - wxUint64 tmp; - Read64(&tmp, 1); - return tmp; -} -#endif // wxHAS_INT64 - -wxUint32 wxDataInputStream::Read32() -{ - wxUint32 i32; - - m_input->Read(&i32, 4); - - if (m_be_order) - return wxUINT32_SWAP_ON_LE(i32); - else - return wxUINT32_SWAP_ON_BE(i32); -} - -wxUint16 wxDataInputStream::Read16() -{ - wxUint16 i16; - - m_input->Read(&i16, 2); - - if (m_be_order) - return wxUINT16_SWAP_ON_LE(i16); - else - return wxUINT16_SWAP_ON_BE(i16); -} - -wxUint8 wxDataInputStream::Read8() -{ - wxUint8 buf; - - m_input->Read(&buf, 1); - return (wxUint8)buf; -} - -double wxDataInputStream::ReadDouble() -{ -#if wxUSE_APPLE_IEEE - if ( m_useExtendedPrecision ) - { - char buf[10]; - - m_input->Read(buf, 10); - return wxConvertFromIeeeExtended((const wxInt8 *)buf); - } - else -#endif // wxUSE_APPLE_IEEE - { - Float64Data floatData; - - if ( m_be_order == (wxBYTE_ORDER == wxBIG_ENDIAN) ) - { - floatData.i[0] = Read32(); - floatData.i[1] = Read32(); - } - else - { - floatData.i[1] = Read32(); - floatData.i[0] = Read32(); - } - - return static_cast(floatData.f); - } -} - -float wxDataInputStream::ReadFloat() -{ -#if wxUSE_APPLE_IEEE - if ( m_useExtendedPrecision ) - { - return (float)ReadDouble(); - } - else -#endif // wxUSE_APPLE_IEEE - { - Float32Data floatData; - - floatData.i = Read32(); - return static_cast(floatData.f); - } -} - -wxString wxDataInputStream::ReadString() -{ - wxString ret; - - const size_t len = Read32(); - if ( len > 0 ) - { -#if wxUSE_UNICODE - wxCharBuffer tmp(len); - if ( tmp ) - { - m_input->Read(tmp.data(), len); - ret = m_conv->cMB2WX(tmp.data()); - } -#else - wxStringBuffer buf(ret, len); - if ( buf ) - m_input->Read(buf, len); -#endif - } - - return ret; -} - -#if wxUSE_LONGLONG - -template -static -void DoReadLL(T *buffer, size_t size, wxInputStream *input, bool be_order) -{ - typedef T DataType; - unsigned char *pchBuffer = new unsigned char[size * 8]; - // TODO: Check for overflow when size is of type uint and is > than 512m - input->Read(pchBuffer, size * 8); - size_t idx_base = 0; - if ( be_order ) - { - for ( size_t uiIndex = 0; uiIndex != size; ++uiIndex ) - { - buffer[uiIndex] = 0l; - for ( unsigned ui = 0; ui != 8; ++ui ) - { - buffer[uiIndex] = buffer[uiIndex] * 256l + - DataType((unsigned long) pchBuffer[idx_base + ui]); - } - - idx_base += 8; - } - } - else // little endian - { - for ( size_t uiIndex=0; uiIndex!=size; ++uiIndex ) - { - buffer[uiIndex] = 0l; - for ( unsigned ui=0; ui!=8; ++ui ) - buffer[uiIndex] = buffer[uiIndex] * 256l + - DataType((unsigned long) pchBuffer[idx_base + 7 - ui]); - idx_base += 8; - } - } - delete[] pchBuffer; -} - -template -static void DoWriteLL(const T *buffer, size_t size, wxOutputStream *output, bool be_order) -{ - typedef T DataType; - unsigned char *pchBuffer = new unsigned char[size * 8]; - size_t idx_base = 0; - if ( be_order ) - { - for ( size_t uiIndex = 0; uiIndex != size; ++uiIndex ) - { - DataType i64 = buffer[uiIndex]; - for ( unsigned ui = 0; ui != 8; ++ui ) - { - pchBuffer[idx_base + 7 - ui] = - (unsigned char) (i64.GetLo() & 255l); - i64 >>= 8l; - } - - idx_base += 8; - } - } - else // little endian - { - for ( size_t uiIndex=0; uiIndex != size; ++uiIndex ) - { - DataType i64 = buffer[uiIndex]; - for (unsigned ui=0; ui!=8; ++ui) - { - pchBuffer[idx_base + ui] = - (unsigned char) (i64.GetLo() & 255l); - i64 >>= 8l; - } - - idx_base += 8; - } - } - - // TODO: Check for overflow when size is of type uint and is > than 512m - output->Write(pchBuffer, size * 8); - delete[] pchBuffer; -} - -#endif // wxUSE_LONGLONG - -#ifdef wxLongLong_t - -template -static -void DoReadI64(T *buffer, size_t size, wxInputStream *input, bool be_order) -{ - typedef T DataType; - unsigned char *pchBuffer = (unsigned char*) buffer; - // TODO: Check for overflow when size is of type uint and is > than 512m - input->Read(pchBuffer, size * 8); - if ( be_order ) - { - for ( wxUint32 i = 0; i < size; i++ ) - { - DataType v = wxUINT64_SWAP_ON_LE(*buffer); - *(buffer++) = v; - } - } - else // little endian - { - for ( wxUint32 i=0; i -static -void DoWriteI64(const T *buffer, size_t size, wxOutputStream *output, bool be_order) -{ - typedef T DataType; - if ( be_order ) - { - for ( size_t i = 0; i < size; i++ ) - { - DataType i64 = wxUINT64_SWAP_ON_LE(*buffer); - buffer++; - output->Write(&i64, 8); - } - } - else // little endian - { - for ( size_t i=0; i < size; i++ ) - { - DataType i64 = wxUINT64_SWAP_ON_BE(*buffer); - buffer++; - output->Write(&i64, 8); - } - } -} - -#endif // wxLongLong_t - - -#if wxHAS_INT64 -void wxDataInputStream::Read64(wxUint64 *buffer, size_t size) -{ -#ifndef wxLongLong_t - DoReadLL(buffer, size, m_input, m_be_order); -#else - DoReadI64(buffer, size, m_input, m_be_order); -#endif -} - -void wxDataInputStream::Read64(wxInt64 *buffer, size_t size) -{ -#ifndef wxLongLong_t - DoReadLL(buffer, size, m_input, m_be_order); -#else - DoReadI64(buffer, size, m_input, m_be_order); -#endif -} -#endif // wxHAS_INT64 - -#if defined(wxLongLong_t) && wxUSE_LONGLONG -void wxDataInputStream::Read64(wxULongLong *buffer, size_t size) -{ - DoReadLL(buffer, size, m_input, m_be_order); -} - -void wxDataInputStream::Read64(wxLongLong *buffer, size_t size) -{ - DoReadLL(buffer, size, m_input, m_be_order); -} -#endif // wxLongLong_t - -#if wxUSE_LONGLONG -void wxDataInputStream::ReadLL(wxULongLong *buffer, size_t size) -{ - DoReadLL(buffer, size, m_input, m_be_order); -} - -void wxDataInputStream::ReadLL(wxLongLong *buffer, size_t size) -{ - DoReadLL(buffer, size, m_input, m_be_order); -} - -wxLongLong wxDataInputStream::ReadLL(void) -{ - wxLongLong ll; - DoReadLL(&ll, (size_t)1, m_input, m_be_order); - return ll; -} -#endif // wxUSE_LONGLONG - -void wxDataInputStream::Read32(wxUint32 *buffer, size_t size) -{ - m_input->Read(buffer, size * 4); - - if (m_be_order) - { - for (wxUint32 i=0; iRead(buffer, size * 2); - - if (m_be_order) - { - for (wxUint32 i=0; iRead(buffer, size); -} - -void wxDataInputStream::ReadDouble(double *buffer, size_t size) -{ - for (wxUint32 i=0; i>(wxString& s) -{ - s = ReadString(); - return *this; -} - -wxDataInputStream& wxDataInputStream::operator>>(wxInt8& c) -{ - c = (wxInt8)Read8(); - return *this; -} - -wxDataInputStream& wxDataInputStream::operator>>(wxInt16& i) -{ - i = (wxInt16)Read16(); - return *this; -} - -wxDataInputStream& wxDataInputStream::operator>>(wxInt32& i) -{ - i = (wxInt32)Read32(); - return *this; -} - -wxDataInputStream& wxDataInputStream::operator>>(wxUint8& c) -{ - c = Read8(); - return *this; -} - -wxDataInputStream& wxDataInputStream::operator>>(wxUint16& i) -{ - i = Read16(); - return *this; -} - -wxDataInputStream& wxDataInputStream::operator>>(wxUint32& i) -{ - i = Read32(); - return *this; -} - -#if wxHAS_INT64 -wxDataInputStream& wxDataInputStream::operator>>(wxUint64& i) -{ - i = Read64(); - return *this; -} - -wxDataInputStream& wxDataInputStream::operator>>(wxInt64& i) -{ - i = Read64(); - return *this; -} -#endif // wxHAS_INT64 - -#if defined(wxLongLong_t) && wxUSE_LONGLONG -wxDataInputStream& wxDataInputStream::operator>>(wxULongLong& i) -{ - i = ReadLL(); - return *this; -} - -wxDataInputStream& wxDataInputStream::operator>>(wxLongLong& i) -{ - i = ReadLL(); - return *this; -} -#endif // wxLongLong_t - -wxDataInputStream& wxDataInputStream::operator>>(double& d) -{ - d = ReadDouble(); - return *this; -} - -wxDataInputStream& wxDataInputStream::operator>>(float& f) -{ - f = ReadFloat(); - return *this; -} - -// --------------------------------------------------------------------------- -// wxDataOutputStream -// --------------------------------------------------------------------------- - -wxDataOutputStream::wxDataOutputStream(wxOutputStream& s, const wxMBConv& conv) - : wxDataStreamBase(conv), - m_output(&s) -{ -} - -#if wxHAS_INT64 -void wxDataOutputStream::Write64(wxUint64 i) -{ - Write64(&i, 1); -} - -void wxDataOutputStream::Write64(wxInt64 i) -{ - Write64(&i, 1); -} -#endif // wxHAS_INT64 - -void wxDataOutputStream::Write32(wxUint32 i) -{ - wxUint32 i32; - - if (m_be_order) - i32 = wxUINT32_SWAP_ON_LE(i); - else - i32 = wxUINT32_SWAP_ON_BE(i); - m_output->Write(&i32, 4); -} - -void wxDataOutputStream::Write16(wxUint16 i) -{ - wxUint16 i16; - - if (m_be_order) - i16 = wxUINT16_SWAP_ON_LE(i); - else - i16 = wxUINT16_SWAP_ON_BE(i); - - m_output->Write(&i16, 2); -} - -void wxDataOutputStream::Write8(wxUint8 i) -{ - m_output->Write(&i, 1); -} - -void wxDataOutputStream::WriteString(const wxString& string) -{ -#if wxUSE_UNICODE - const wxWX2MBbuf buf = string.mb_str(*m_conv); -#else - const wxWX2MBbuf buf = string.mb_str(); -#endif - size_t len = strlen(buf); - Write32(len); - if (len > 0) - m_output->Write(buf, len); -} - -void wxDataOutputStream::WriteDouble(double d) -{ -#if wxUSE_APPLE_IEEE - if ( m_useExtendedPrecision ) - { - char buf[10]; - - wxConvertToIeeeExtended(d, (wxInt8 *)buf); - m_output->Write(buf, 10); - } - else -#endif // wxUSE_APPLE_IEEE - { - Float64Data floatData; - - floatData.f = (wxFloat64)d; - - if ( m_be_order == (wxBYTE_ORDER == wxBIG_ENDIAN) ) - { - Write32(floatData.i[0]); - Write32(floatData.i[1]); - } - else - { - Write32(floatData.i[1]); - Write32(floatData.i[0]); - } - } -} - -void wxDataOutputStream::WriteFloat(float f) -{ -#if wxUSE_APPLE_IEEE - if ( m_useExtendedPrecision ) - { - WriteDouble((double)f); - } - else -#endif // wxUSE_APPLE_IEEE - { - Float32Data floatData; - - floatData.f = (wxFloat32)f; - Write32(floatData.i); - } -} - -#if wxHAS_INT64 -void wxDataOutputStream::Write64(const wxUint64 *buffer, size_t size) -{ -#ifndef wxLongLong_t - DoWriteLL(buffer, size, m_output, m_be_order); -#else - DoWriteI64(buffer, size, m_output, m_be_order); -#endif -} - -void wxDataOutputStream::Write64(const wxInt64 *buffer, size_t size) -{ -#ifndef wxLongLong_t - DoWriteLL(buffer, size, m_output, m_be_order); -#else - DoWriteI64(buffer, size, m_output, m_be_order); -#endif -} -#endif // wxHAS_INT64 - -#if defined(wxLongLong_t) && wxUSE_LONGLONG -void wxDataOutputStream::Write64(const wxULongLong *buffer, size_t size) -{ - DoWriteLL(buffer, size, m_output, m_be_order); -} - -void wxDataOutputStream::Write64(const wxLongLong *buffer, size_t size) -{ - DoWriteLL(buffer, size, m_output, m_be_order); -} -#endif // wxLongLong_t - -#if wxUSE_LONGLONG -void wxDataOutputStream::WriteLL(const wxULongLong *buffer, size_t size) -{ - DoWriteLL(buffer, size, m_output, m_be_order); -} - -void wxDataOutputStream::WriteLL(const wxLongLong *buffer, size_t size) -{ - DoWriteLL(buffer, size, m_output, m_be_order); -} - -void wxDataOutputStream::WriteLL(const wxLongLong &ll) -{ - WriteLL(&ll, 1); -} - -void wxDataOutputStream::WriteLL(const wxULongLong &ll) -{ - WriteLL(&ll, 1); -} -#endif // wxUSE_LONGLONG - -void wxDataOutputStream::Write32(const wxUint32 *buffer, size_t size) -{ - if (m_be_order) - { - for (wxUint32 i=0; iWrite(&i32, 4); - } - } - else - { - for (wxUint32 i=0; iWrite(&i32, 4); - } - } -} - -void wxDataOutputStream::Write16(const wxUint16 *buffer, size_t size) -{ - if (m_be_order) - { - for (wxUint32 i=0; iWrite(&i16, 2); - } - } - else - { - for (wxUint32 i=0; iWrite(&i16, 2); - } - } -} - -void wxDataOutputStream::Write8(const wxUint8 *buffer, size_t size) -{ - m_output->Write(buffer, size); -} - -void wxDataOutputStream::WriteDouble(const double *buffer, size_t size) -{ - for (wxUint32 i=0; iInheritAttributes(window); - return impl; -} - -wxDCImpl* wxNativeDCFactory::CreateClientDC( wxClientDC *owner, wxWindow *window ) -{ - wxDCImpl * const impl = new wxClientDCImpl( owner, window ); - impl->InheritAttributes(window); - return impl; -} - -wxDCImpl* wxNativeDCFactory::CreatePaintDC( wxPaintDC *owner, wxWindow *window ) -{ - wxDCImpl * const impl = new wxPaintDCImpl( owner, window ); - impl->InheritAttributes(window); - return impl; -} - -wxDCImpl* wxNativeDCFactory::CreateMemoryDC( wxMemoryDC *owner ) -{ - return new wxMemoryDCImpl( owner ); -} - -wxDCImpl* wxNativeDCFactory::CreateMemoryDC(wxMemoryDC *owner, wxBitmap& bitmap) -{ - // the bitmap may be modified when it's selected into a memory DC so make - // sure changing this bitmap doesn't affect any other shallow copies of it - // (see wxMemoryDC::SelectObject()) - // - // notice that we don't provide any ctor equivalent to SelectObjectAsSource - // method because this should be rarely needed and easy to work around by - // using the default ctor and calling SelectObjectAsSource itself - if ( bitmap.IsOk() ) - bitmap.UnShare(); - - return new wxMemoryDCImpl(owner, bitmap); -} - -wxDCImpl* wxNativeDCFactory::CreateMemoryDC( wxMemoryDC *owner, wxDC *dc ) -{ - return new wxMemoryDCImpl( owner, dc ); -} - -wxDCImpl* wxNativeDCFactory::CreateScreenDC( wxScreenDC *owner ) -{ - return new wxScreenDCImpl( owner ); -} - -#if wxUSE_PRINTING_ARCHITECTURE -wxDCImpl *wxNativeDCFactory::CreatePrinterDC( wxPrinterDC *owner, const wxPrintData &data ) -{ - wxPrintFactory *factory = wxPrintFactory::GetFactory(); - return factory->CreatePrinterDCImpl( owner, data ); -} -#endif - -//----------------------------------------------------------------------------- -// wxWindowDC -//----------------------------------------------------------------------------- - -wxIMPLEMENT_ABSTRACT_CLASS(wxWindowDC, wxDC); - -wxWindowDC::wxWindowDC(wxWindow *win) - : wxDC(wxDCFactory::Get()->CreateWindowDC(this, win)) -{ -} - -//----------------------------------------------------------------------------- -// wxClientDC -//----------------------------------------------------------------------------- - -wxIMPLEMENT_ABSTRACT_CLASS(wxClientDC, wxWindowDC); - -wxClientDC::wxClientDC(wxWindow *win) - : wxWindowDC(wxDCFactory::Get()->CreateClientDC(this, win)) -{ -} - -//----------------------------------------------------------------------------- -// wxMemoryDC -//----------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxDC); - -wxMemoryDC::wxMemoryDC() - : wxDC(wxDCFactory::Get()->CreateMemoryDC(this)) -{ -} - -wxMemoryDC::wxMemoryDC(wxBitmap& bitmap) - : wxDC(wxDCFactory::Get()->CreateMemoryDC(this, bitmap)) -{ -} - -wxMemoryDC::wxMemoryDC(wxDC *dc) - : wxDC(wxDCFactory::Get()->CreateMemoryDC(this, dc)) -{ -} - -void wxMemoryDC::SelectObject(wxBitmap& bmp) -{ - if ( bmp.IsSameAs(GetSelectedBitmap()) ) - { - // Nothing to do, this bitmap is already selected. - return; - } - - // make sure that the given wxBitmap is not sharing its data with other - // wxBitmap instances as its contents will be modified by any drawing - // operation done on this DC - if (bmp.IsOk()) - bmp.UnShare(); - - GetImpl()->DoSelect(bmp); -} - -void wxMemoryDC::SelectObjectAsSource(const wxBitmap& bmp) -{ - GetImpl()->DoSelect(bmp); -} - -const wxBitmap& wxMemoryDC::GetSelectedBitmap() const -{ - return GetImpl()->GetSelectedBitmap(); -} - -wxBitmap& wxMemoryDC::GetSelectedBitmap() -{ - return GetImpl()->GetSelectedBitmap(); -} - - -//----------------------------------------------------------------------------- -// wxPaintDC -//----------------------------------------------------------------------------- - -wxIMPLEMENT_ABSTRACT_CLASS(wxPaintDC, wxClientDC); - -wxPaintDC::wxPaintDC(wxWindow *win) - : wxClientDC(wxDCFactory::Get()->CreatePaintDC(this, win)) -{ -} - -//----------------------------------------------------------------------------- -// wxScreenDC -//----------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC); - -wxScreenDC::wxScreenDC() - : wxDC(wxDCFactory::Get()->CreateScreenDC(this)) -{ -} - -//----------------------------------------------------------------------------- -// wxPrinterDC -//----------------------------------------------------------------------------- - -#if wxUSE_PRINTING_ARCHITECTURE - -wxIMPLEMENT_DYNAMIC_CLASS(wxPrinterDC, wxDC); - -wxPrinterDC::wxPrinterDC() - : wxDC(wxDCFactory::Get()->CreatePrinterDC(this, wxPrintData())) -{ -} - -wxPrinterDC::wxPrinterDC(const wxPrintData& data) - : wxDC(wxDCFactory::Get()->CreatePrinterDC(this, data)) -{ -} - -wxRect wxPrinterDC::GetPaperRect() const -{ - return GetImpl()->GetPaperRect(); -} - -int wxPrinterDC::GetResolution() const -{ - return GetImpl()->GetResolution(); -} - -#endif // wxUSE_PRINTING_ARCHITECTURE - -//----------------------------------------------------------------------------- -// wxDCImpl -//----------------------------------------------------------------------------- - -wxIMPLEMENT_ABSTRACT_CLASS(wxDCImpl, wxObject); - -wxDCImpl::wxDCImpl( wxDC *owner ) - : m_window(NULL) - , m_colour(wxColourDisplay()) - , m_ok(true) - , m_clipping(false) - , m_isInteractive(0) - , m_isBBoxValid(false) - , m_logicalOriginX(0), m_logicalOriginY(0) - , m_deviceOriginX(0), m_deviceOriginY(0) - , m_deviceLocalOriginX(0), m_deviceLocalOriginY(0) - , m_logicalScaleX(1.0), m_logicalScaleY(1.0) - , m_userScaleX(1.0), m_userScaleY(1.0) - , m_scaleX(1.0), m_scaleY(1.0) - , m_signX(1), m_signY(1) - , m_contentScaleFactor(1) - , m_minX(0), m_minY(0), m_maxX(0), m_maxY(0) - , m_clipX1(0), m_clipY1(0), m_clipX2(0), m_clipY2(0) - , m_logicalFunction(wxCOPY) - , m_backgroundMode(wxBRUSHSTYLE_TRANSPARENT) - , m_mappingMode(wxMM_TEXT) - , m_pen() - , m_brush() - , m_backgroundBrush() - , m_textForegroundColour(*wxBLACK) - , m_textBackgroundColour(*wxWHITE) - , m_font() -#if wxUSE_PALETTE - , m_palette() - , m_hasCustomPalette(false) -#endif // wxUSE_PALETTE -{ - m_owner = owner; - - m_mm_to_pix_x = (double)wxGetDisplaySize().GetWidth() / - (double)wxGetDisplaySizeMM().GetWidth(); - m_mm_to_pix_y = (double)wxGetDisplaySize().GetHeight() / - (double)wxGetDisplaySizeMM().GetHeight(); - - ResetBoundingBox(); - ResetClipping(); -} - -wxDCImpl::~wxDCImpl() -{ -} - -// ---------------------------------------------------------------------------- -// clipping -// ---------------------------------------------------------------------------- - -void wxDCImpl::DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h) -{ - if ( m_clipping ) - { - m_clipX1 = wxMax( m_clipX1, x ); - m_clipY1 = wxMax( m_clipY1, y ); - m_clipX2 = wxMin( m_clipX2, (x + w) ); - m_clipY2 = wxMin( m_clipY2, (y + h) ); - } - else - { - m_clipping = true; - - m_clipX1 = x; - m_clipY1 = y; - m_clipX2 = x + w; - m_clipY2 = y + h; - } -} - -// ---------------------------------------------------------------------------- -// coordinate conversions and transforms -// ---------------------------------------------------------------------------- - -wxCoord wxDCImpl::DeviceToLogicalX(wxCoord x) const -{ - return wxRound( (double)((x - m_deviceOriginX - m_deviceLocalOriginX) * m_signX) / m_scaleX ) + m_logicalOriginX ; -} - -wxCoord wxDCImpl::DeviceToLogicalY(wxCoord y) const -{ - return wxRound( (double)((y - m_deviceOriginY - m_deviceLocalOriginY) * m_signY) / m_scaleY ) + m_logicalOriginY ; -} - -wxCoord wxDCImpl::DeviceToLogicalXRel(wxCoord x) const -{ - return wxRound((double)(x) / m_scaleX); -} - -wxCoord wxDCImpl::DeviceToLogicalYRel(wxCoord y) const -{ - return wxRound((double)(y) / m_scaleY); -} - -wxCoord wxDCImpl::LogicalToDeviceX(wxCoord x) const -{ - return wxRound( (double)((x - m_logicalOriginX) * m_signX) * m_scaleX) + m_deviceOriginX + m_deviceLocalOriginX; -} - -wxCoord wxDCImpl::LogicalToDeviceY(wxCoord y) const -{ - return wxRound( (double)((y - m_logicalOriginY) * m_signY) * m_scaleY) + m_deviceOriginY + m_deviceLocalOriginY; -} - -wxCoord wxDCImpl::LogicalToDeviceXRel(wxCoord x) const -{ - return wxRound((double)(x) * m_scaleX); -} - -wxCoord wxDCImpl::LogicalToDeviceYRel(wxCoord y) const -{ - return wxRound((double)(y) * m_scaleY); -} - -void wxDCImpl::ComputeScaleAndOrigin() -{ - m_scaleX = m_logicalScaleX * m_userScaleX; - m_scaleY = m_logicalScaleY * m_userScaleY; -} - -void wxDCImpl::SetMapMode( wxMappingMode mode ) -{ - switch (mode) - { - case wxMM_TWIPS: - SetLogicalScale( twips2mm*m_mm_to_pix_x, twips2mm*m_mm_to_pix_y ); - break; - case wxMM_POINTS: - SetLogicalScale( pt2mm*m_mm_to_pix_x, pt2mm*m_mm_to_pix_y ); - break; - case wxMM_METRIC: - SetLogicalScale( m_mm_to_pix_x, m_mm_to_pix_y ); - break; - case wxMM_LOMETRIC: - SetLogicalScale( m_mm_to_pix_x/10.0, m_mm_to_pix_y/10.0 ); - break; - default: - case wxMM_TEXT: - SetLogicalScale( 1.0, 1.0 ); - break; - } - m_mappingMode = mode; -} - -void wxDCImpl::SetUserScale( double x, double y ) -{ - // allow negative ? -> no - m_userScaleX = x; - m_userScaleY = y; - ComputeScaleAndOrigin(); -} - -void wxDCImpl::SetLogicalScale( double x, double y ) -{ - // allow negative ? - m_logicalScaleX = x; - m_logicalScaleY = y; - ComputeScaleAndOrigin(); -} - -void wxDCImpl::SetLogicalOrigin( wxCoord x, wxCoord y ) -{ - m_logicalOriginX = x * m_signX; - m_logicalOriginY = y * m_signY; - ComputeScaleAndOrigin(); -} - -void wxDCImpl::SetDeviceOrigin( wxCoord x, wxCoord y ) -{ - m_deviceOriginX = x; - m_deviceOriginY = y; - ComputeScaleAndOrigin(); -} - -void wxDCImpl::SetDeviceLocalOrigin( wxCoord x, wxCoord y ) -{ - m_deviceLocalOriginX = x; - m_deviceLocalOriginY = y; - ComputeScaleAndOrigin(); -} - -void wxDCImpl::SetAxisOrientation( bool xLeftRight, bool yBottomUp ) -{ - // only wxPostScripDC has m_signX = -1, we override SetAxisOrientation there - // wxWidgets 2.9: no longer override it - m_signX = (xLeftRight ? 1 : -1); - m_signY = (yBottomUp ? -1 : 1); - ComputeScaleAndOrigin(); -} - -bool wxDCImpl::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const -{ - wxTextMeasure tm(GetOwner(), &m_font); - return tm.GetPartialTextExtents(text, widths, m_scaleX); -} - -void wxDCImpl::GetMultiLineTextExtent(const wxString& text, - wxCoord *x, - wxCoord *y, - wxCoord *h, - const wxFont *font) const -{ - wxTextMeasure tm(GetOwner(), font && font->IsOk() ? font : &m_font); - tm.GetMultiLineTextExtent(text, x, y, h); -} - -void wxDCImpl::DoDrawCheckMark(wxCoord x1, wxCoord y1, - wxCoord width, wxCoord height) -{ - wxCHECK_RET( IsOk(), wxT("invalid window dc") ); - - wxCoord x2 = x1 + width, - y2 = y1 + height; - - // the pen width is calibrated to give 3 for width == height == 10 - wxDCPenChanger pen( *m_owner, wxPen(GetTextForeground(), (width + height + 1)/7)); - - // we're drawing a scaled version of wx/generic/tick.xpm here - wxCoord x3 = x1 + (4*width) / 10, // x of the tick bottom - y3 = y1 + height / 2; // y of the left tick branch - DoDrawLine(x1, y3, x3, y2); - DoDrawLine(x3, y2, x2, y1); - - CalcBoundingBox(x1, y1); - CalcBoundingBox(x2, y2); -} - -bool -wxDCImpl::DoStretchBlit(wxCoord xdest, wxCoord ydest, - wxCoord dstWidth, wxCoord dstHeight, - wxDC *source, - wxCoord xsrc, wxCoord ysrc, - wxCoord srcWidth, wxCoord srcHeight, - wxRasterOperationMode rop, - bool useMask, - wxCoord xsrcMask, - wxCoord ysrcMask) -{ - wxCHECK_MSG( srcWidth && srcHeight && dstWidth && dstHeight, false, - wxT("invalid blit size") ); - - // emulate the stretching by modifying the DC scale - double xscale = (double)srcWidth/dstWidth, - yscale = (double)srcHeight/dstHeight; - - double xscaleOld, yscaleOld; - GetUserScale(&xscaleOld, &yscaleOld); - SetUserScale(xscaleOld/xscale, yscaleOld/yscale); - - bool rc = DoBlit(wxCoord(xdest*xscale), wxCoord(ydest*yscale), - wxCoord(dstWidth*xscale), wxCoord(dstHeight*yscale), - source, - xsrc, ysrc, rop, useMask, xsrcMask, ysrcMask); - - SetUserScale(xscaleOld, yscaleOld); - - return rc; -} - -void wxDCImpl::DrawLines(const wxPointList *list, wxCoord xoffset, wxCoord yoffset) -{ - int n = list->GetCount(); - wxPoint *points = new wxPoint[n]; - - int i = 0; - for ( wxPointList::compatibility_iterator node = list->GetFirst(); node; node = node->GetNext(), i++ ) - { - wxPoint *point = node->GetData(); - points[i].x = point->x; - points[i].y = point->y; - } - - DoDrawLines(n, points, xoffset, yoffset); - - delete [] points; -} - -void wxDCImpl::DrawPolygon(const wxPointList *list, - wxCoord xoffset, wxCoord yoffset, - wxPolygonFillMode fillStyle) -{ - int n = list->GetCount(); - wxPoint *points = new wxPoint[n]; - - int i = 0; - for ( wxPointList::compatibility_iterator node = list->GetFirst(); node; node = node->GetNext(), i++ ) - { - wxPoint *point = node->GetData(); - points[i].x = point->x; - points[i].y = point->y; - } - - DoDrawPolygon(n, points, xoffset, yoffset, fillStyle); - - delete [] points; -} - -void -wxDCImpl::DoDrawPolyPolygon(int n, - const int count[], - const wxPoint points[], - wxCoord xoffset, wxCoord yoffset, - wxPolygonFillMode fillStyle) -{ - if ( n == 1 ) - { - DoDrawPolygon(count[0], points, xoffset, yoffset, fillStyle); - return; - } - - int i, j, lastOfs; - wxPoint* pts; - - for (i = j = lastOfs = 0; i < n; i++) - { - lastOfs = j; - j += count[i]; - } - pts = new wxPoint[j+n-1]; - for (i = 0; i < j; i++) - pts[i] = points[i]; - for (i = 2; i <= n; i++) - { - lastOfs -= count[n-i]; - pts[j++] = pts[lastOfs]; - } - - { - wxDCPenChanger setTransp(*m_owner, *wxTRANSPARENT_PEN); - DoDrawPolygon(j, pts, xoffset, yoffset, fillStyle); - } - - for (i = j = 0; i < n; i++) - { - DoDrawLines(count[i], pts+j, xoffset, yoffset); - j += count[i]; - } - delete[] pts; -} - -#if wxUSE_SPLINES - -void wxDCImpl::DrawSpline(wxCoord x1, wxCoord y1, - wxCoord x2, wxCoord y2, - wxCoord x3, wxCoord y3) -{ - wxPoint points[] = { wxPoint(x1, y1), wxPoint(x2, y2), wxPoint(x3, y3) }; - DrawSpline(WXSIZEOF(points), points); -} - -void wxDCImpl::DrawSpline(int n, const wxPoint points[]) -{ - wxPointList list; - for ( int i = 0; i < n; i++ ) - list.Append(const_cast(&points[i])); - - DrawSpline(&list); -} - -// ----------------------------------- spline code ---------------------------------------- - -void wx_quadratic_spline(double a1, double b1, double a2, double b2, - double a3, double b3, double a4, double b4); -void wx_clear_stack(); -int wx_spline_pop(double *x1, double *y1, double *x2, double *y2, double *x3, - double *y3, double *x4, double *y4); -void wx_spline_push(double x1, double y1, double x2, double y2, double x3, double y3, - double x4, double y4); -static bool wx_spline_add_point(double x, double y); -static void wx_spline_draw_point_array(wxDC *dc); - -static wxPointList wx_spline_point_list; - -#define half(z1, z2) ((z1+z2)/2.0) -#define THRESHOLD 5 - -/* iterative version */ - -void wx_quadratic_spline(double a1, double b1, double a2, double b2, double a3, double b3, double a4, - double b4) -{ - double xmid, ymid; - double x1, y1, x2, y2, x3, y3, x4, y4; - - wx_clear_stack(); - wx_spline_push(a1, b1, a2, b2, a3, b3, a4, b4); - - while (wx_spline_pop(&x1, &y1, &x2, &y2, &x3, &y3, &x4, &y4)) { - xmid = (double)half(x2, x3); - ymid = (double)half(y2, y3); - if (fabs(x1 - xmid) < THRESHOLD && fabs(y1 - ymid) < THRESHOLD && - fabs(xmid - x4) < THRESHOLD && fabs(ymid - y4) < THRESHOLD) { - wx_spline_add_point( x1, y1 ); - wx_spline_add_point( xmid, ymid ); - } else { - wx_spline_push(xmid, ymid, (double)half(xmid, x3), (double)half(ymid, y3), - (double)half(x3, x4), (double)half(y3, y4), x4, y4); - wx_spline_push(x1, y1, (double)half(x1, x2), (double)half(y1, y2), - (double)half(x2, xmid), (double)half(y2, ymid), xmid, ymid); - } - } -} - -/* utilities used by spline drawing routines */ - -typedef struct wx_spline_stack_struct { - double x1, y1, x2, y2, x3, y3, x4, y4; -} Stack; - -#define SPLINE_STACK_DEPTH 20 -static Stack wx_spline_stack[SPLINE_STACK_DEPTH]; -static Stack *wx_stack_top; -static int wx_stack_count; - -void wx_clear_stack() -{ - wx_stack_top = wx_spline_stack; - wx_stack_count = 0; -} - -void wx_spline_push(double x1, double y1, double x2, double y2, double x3, double y3, double x4, double y4) -{ - wx_stack_top->x1 = x1; - wx_stack_top->y1 = y1; - wx_stack_top->x2 = x2; - wx_stack_top->y2 = y2; - wx_stack_top->x3 = x3; - wx_stack_top->y3 = y3; - wx_stack_top->x4 = x4; - wx_stack_top->y4 = y4; - wx_stack_top++; - wx_stack_count++; -} - -int wx_spline_pop(double *x1, double *y1, double *x2, double *y2, - double *x3, double *y3, double *x4, double *y4) -{ - if (wx_stack_count == 0) - return (0); - wx_stack_top--; - wx_stack_count--; - *x1 = wx_stack_top->x1; - *y1 = wx_stack_top->y1; - *x2 = wx_stack_top->x2; - *y2 = wx_stack_top->y2; - *x3 = wx_stack_top->x3; - *y3 = wx_stack_top->y3; - *x4 = wx_stack_top->x4; - *y4 = wx_stack_top->y4; - return (1); -} - -static bool wx_spline_add_point(double x, double y) -{ - wxPoint *point = new wxPoint( wxRound(x), wxRound(y) ); - wx_spline_point_list.Append(point ); - return true; -} - -static void wx_spline_draw_point_array(wxDC *dc) -{ - dc->DrawLines(&wx_spline_point_list, 0, 0 ); - wxPointList::compatibility_iterator node = wx_spline_point_list.GetFirst(); - while (node) - { - wxPoint *point = node->GetData(); - delete point; - wx_spline_point_list.Erase(node); - node = wx_spline_point_list.GetFirst(); - } -} - -void wxDCImpl::DoDrawSpline( const wxPointList *points ) -{ - wxCHECK_RET( IsOk(), wxT("invalid window dc") ); - - const wxPoint *p; - double cx1, cy1, cx2, cy2, cx3, cy3, cx4, cy4; - double x1, y1, x2, y2; - - wxPointList::compatibility_iterator node = points->GetFirst(); - if (!node) - // empty list - return; - - p = node->GetData(); - - x1 = p->x; - y1 = p->y; - - node = node->GetNext(); - p = node->GetData(); - - x2 = p->x; - y2 = p->y; - cx1 = (double)((x1 + x2) / 2); - cy1 = (double)((y1 + y2) / 2); - cx2 = (double)((cx1 + x2) / 2); - cy2 = (double)((cy1 + y2) / 2); - - wx_spline_add_point(x1, y1); - - while ((node = node->GetNext()) -#if !wxUSE_STD_CONTAINERS - != NULL -#endif // !wxUSE_STD_CONTAINERS - ) - { - p = node->GetData(); - x1 = x2; - y1 = y2; - x2 = p->x; - y2 = p->y; - cx4 = (double)(x1 + x2) / 2; - cy4 = (double)(y1 + y2) / 2; - cx3 = (double)(x1 + cx4) / 2; - cy3 = (double)(y1 + cy4) / 2; - - wx_quadratic_spline(cx1, cy1, cx2, cy2, cx3, cy3, cx4, cy4); - - cx1 = cx4; - cy1 = cy4; - cx2 = (double)(cx1 + x2) / 2; - cy2 = (double)(cy1 + y2) / 2; - } - - wx_spline_add_point( cx1, cy1 ); - wx_spline_add_point( x2, y2 ); - - wx_spline_draw_point_array( m_owner ); -} - -#endif // wxUSE_SPLINES - - - -void wxDCImpl::DoGradientFillLinear(const wxRect& rect, - const wxColour& initialColour, - const wxColour& destColour, - wxDirection nDirection) -{ - // save old pen - wxPen oldPen = m_pen; - wxBrush oldBrush = m_brush; - - wxUint8 nR1 = initialColour.Red(); - wxUint8 nG1 = initialColour.Green(); - wxUint8 nB1 = initialColour.Blue(); - wxUint8 nR2 = destColour.Red(); - wxUint8 nG2 = destColour.Green(); - wxUint8 nB2 = destColour.Blue(); - wxUint8 nR, nG, nB; - - if ( nDirection == wxEAST || nDirection == wxWEST ) - { - wxInt32 x = rect.GetWidth(); - wxInt32 w = x; // width of area to shade - wxInt32 xDelta = w/256; // height of one shade bend - if (xDelta < 1) - xDelta = 1; - - while (x >= xDelta) - { - x -= xDelta; - if (nR1 > nR2) - nR = nR1 - (nR1-nR2)*(w-x)/w; - else - nR = nR1 + (nR2-nR1)*(w-x)/w; - - if (nG1 > nG2) - nG = nG1 - (nG1-nG2)*(w-x)/w; - else - nG = nG1 + (nG2-nG1)*(w-x)/w; - - if (nB1 > nB2) - nB = nB1 - (nB1-nB2)*(w-x)/w; - else - nB = nB1 + (nB2-nB1)*(w-x)/w; - - wxColour colour(nR,nG,nB); - SetPen(wxPen(colour, 1, wxPENSTYLE_SOLID)); - SetBrush(wxBrush(colour)); - if(nDirection == wxEAST) - DoDrawRectangle(rect.GetRight()-x-xDelta+1, rect.GetTop(), - xDelta, rect.GetHeight()); - else //nDirection == wxWEST - DoDrawRectangle(rect.GetLeft()+x, rect.GetTop(), - xDelta, rect.GetHeight()); - } - } - else // nDirection == wxNORTH || nDirection == wxSOUTH - { - wxInt32 y = rect.GetHeight(); - wxInt32 w = y; // height of area to shade - wxInt32 yDelta = w/255; // height of one shade bend - if (yDelta < 1) - yDelta = 1; - - while (y > 0) - { - y -= yDelta; - if (nR1 > nR2) - nR = nR1 - (nR1-nR2)*(w-y)/w; - else - nR = nR1 + (nR2-nR1)*(w-y)/w; - - if (nG1 > nG2) - nG = nG1 - (nG1-nG2)*(w-y)/w; - else - nG = nG1 + (nG2-nG1)*(w-y)/w; - - if (nB1 > nB2) - nB = nB1 - (nB1-nB2)*(w-y)/w; - else - nB = nB1 + (nB2-nB1)*(w-y)/w; - - wxColour colour(nR,nG,nB); - SetPen(wxPen(colour, 1, wxPENSTYLE_SOLID)); - SetBrush(wxBrush(colour)); - if(nDirection == wxNORTH) - DoDrawRectangle(rect.GetLeft(), rect.GetTop()+y, - rect.GetWidth(), yDelta); - else //nDirection == wxSOUTH - DoDrawRectangle(rect.GetLeft(), rect.GetBottom()-y-yDelta+1, - rect.GetWidth(), yDelta); - } - } - - SetPen(oldPen); - SetBrush(oldBrush); -} - -void wxDCImpl::DoGradientFillConcentric(const wxRect& rect, - const wxColour& initialColour, - const wxColour& destColour, - const wxPoint& circleCenter) -{ - // save the old pen and ensure it is restored on exit - const wxPen penOrig = m_pen; - wxON_BLOCK_EXIT_SET(m_pen, penOrig); - - wxUint8 nR1 = destColour.Red(); - wxUint8 nG1 = destColour.Green(); - wxUint8 nB1 = destColour.Blue(); - wxUint8 nR2 = initialColour.Red(); - wxUint8 nG2 = initialColour.Green(); - wxUint8 nB2 = initialColour.Blue(); - wxUint8 nR, nG, nB; - - - //Radius - double cx = rect.GetWidth() / 2; - double cy = rect.GetHeight() / 2; - double dRadius; - if (cx < cy) - dRadius = cx; - else - dRadius = cy; - - //Offset of circle - double ptX, ptY; - ptX = circleCenter.x; - ptY = circleCenter.y; - double nCircleOffX = ptX - cx; - double nCircleOffY = ptY - cy; - - double dGradient; - double dx, dy; - - for ( wxInt32 x = 0; x < rect.GetWidth(); x++ ) - { - for ( wxInt32 y = 0; y < rect.GetHeight(); y++ ) - { - //get color difference - dx = x; - dy = y; - - dGradient = ((dRadius - sqrt( (dx - cx - nCircleOffX) * (dx - cx - nCircleOffX) - +(dy - cy - nCircleOffY) * (dy - cy - nCircleOffY) - ) - ) * 100 - ) / dRadius; - - //normalize Gradient - if (dGradient < 0) - dGradient = 0.0; - - //get dest colors - nR = (wxUint8)(nR1 + ((nR2 - nR1) * dGradient / 100)); - nG = (wxUint8)(nG1 + ((nG2 - nG1) * dGradient / 100)); - nB = (wxUint8)(nB1 + ((nB2 - nB1) * dGradient / 100)); - - //set the pixel - SetPen(wxColour(nR,nG,nB)); - DoDrawPoint(x + rect.GetLeft(), y + rect.GetTop()); - } - } -} - -void wxDCImpl::InheritAttributes(wxWindow *win) -{ - wxCHECK_RET( win, "window can't be NULL" ); - - SetFont(win->GetFont()); - SetTextForeground(win->GetForegroundColour()); - SetTextBackground(win->GetBackgroundColour()); - SetBackground(win->GetBackgroundColour()); - SetLayoutDirection(win->GetLayoutDirection()); -} - -void wxDCImpl::DoGetFontMetrics(int *height, - int *ascent, - int *descent, - int *internalLeading, - int *externalLeading, - int *averageWidth) const -{ - // Average width is typically the same as width of 'x'. - wxCoord h, d; - DoGetTextExtent("x", averageWidth, &h, &d, externalLeading); - - if ( height ) - *height = h; - if ( ascent ) - *ascent = h - d; - if ( descent ) - *descent = d; - if ( internalLeading ) - *internalLeading = 0; -} - -//----------------------------------------------------------------------------- -// wxDC -//----------------------------------------------------------------------------- - -wxIMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject); - -void wxDC::CopyAttributes(const wxDC& dc) -{ - SetFont(dc.GetFont()); - SetTextForeground(dc.GetTextForeground()); - SetTextBackground(dc.GetTextBackground()); - SetBackground(dc.GetBackground()); - SetLayoutDirection(dc.GetLayoutDirection()); -} - -void wxDC::DrawLabel(const wxString& text, - const wxBitmap& bitmap, - const wxRect& rect, - int alignment, - int indexAccel, - wxRect *rectBounding) -{ - // find the text position - wxCoord widthText, heightText, heightLine; - GetMultiLineTextExtent(text, &widthText, &heightText, &heightLine); - - wxCoord width, height; - if ( bitmap.IsOk() ) - { - width = widthText + bitmap.GetWidth(); - height = bitmap.GetHeight(); - } - else // no bitmap - { - width = widthText; - height = heightText; - } - - wxCoord x, y; - if ( alignment & wxALIGN_RIGHT ) - { - x = rect.GetRight() - width; - } - else if ( alignment & wxALIGN_CENTRE_HORIZONTAL ) - { - x = (rect.GetLeft() + rect.GetRight() + 1 - width) / 2; - } - else // alignment & wxALIGN_LEFT - { - x = rect.GetLeft(); - } - - if ( alignment & wxALIGN_BOTTOM ) - { - y = rect.GetBottom() - height; - } - else if ( alignment & wxALIGN_CENTRE_VERTICAL ) - { - y = (rect.GetTop() + rect.GetBottom() + 1 - height) / 2; - } - else // alignment & wxALIGN_TOP - { - y = rect.GetTop(); - } - - // draw the bitmap first - wxCoord x0 = x, - y0 = y, - width0 = width; - if ( bitmap.IsOk() ) - { - DrawBitmap(bitmap, x, y, true /* use mask */); - - wxCoord offset = bitmap.GetWidth() + 4; - x += offset; - width -= offset; - - y += (height - heightText) / 2; - } - - // we will draw the underscore under the accel char later - wxCoord startUnderscore = 0, - endUnderscore = 0, - yUnderscore = 0; - - // split the string into lines and draw each of them separately - // - // NB: while wxDC::DrawText() on some platforms supports drawing multi-line - // strings natively, this is not the case for all of them, notably not - // wxMSW which uses this function for multi-line texts, so we may only - // call DrawText() for single-line strings from here to avoid infinite - // recursion. - wxString curLine; - for ( wxString::const_iterator pc = text.begin(); ; ++pc ) - { - if ( pc == text.end() || *pc == '\n' ) - { - int xRealStart = x; // init it here to avoid compielr warnings - - if ( !curLine.empty() ) - { - // NB: can't test for !(alignment & wxALIGN_LEFT) because - // wxALIGN_LEFT is 0 - if ( alignment & (wxALIGN_RIGHT | wxALIGN_CENTRE_HORIZONTAL) ) - { - wxCoord widthLine; - GetTextExtent(curLine, &widthLine, NULL); - - if ( alignment & wxALIGN_RIGHT ) - { - xRealStart += width - widthLine; - } - else // if ( alignment & wxALIGN_CENTRE_HORIZONTAL ) - { - xRealStart += (width - widthLine) / 2; - } - } - //else: left aligned, nothing to do - - DrawText(curLine, xRealStart, y); - } - - y += heightLine; - - // do we have underscore in this line? we can check yUnderscore - // because it is set below to just y + heightLine if we do - if ( y == yUnderscore ) - { - // adjust the horz positions to account for the shift - startUnderscore += xRealStart; - endUnderscore += xRealStart; - } - - if ( pc == text.end() ) - break; - - curLine.clear(); - } - else // not end of line - { - if ( pc - text.begin() == indexAccel ) - { - // remember to draw underscore here - GetTextExtent(curLine, &startUnderscore, NULL); - curLine += *pc; - GetTextExtent(curLine, &endUnderscore, NULL); - - yUnderscore = y + heightLine; - } - else - { - curLine += *pc; - } - } - } - - // draw the underscore if found - if ( startUnderscore != endUnderscore ) - { - // it should be of the same colour as text - SetPen(wxPen(GetTextForeground(), 0, wxPENSTYLE_SOLID)); - - // This adjustment is relatively arbitrary: we need to draw the - // underline slightly higher to avoid overflowing the character cell - // but whether we should do it 1, 2 or 3 pixels higher is not clear. - // - // The currently used value seems to be compatible with native MSW - // behaviour, i.e. it results in the same appearance of the owner-drawn - // and normal labels. - yUnderscore -= 2; - - DrawLine(startUnderscore, yUnderscore, endUnderscore, yUnderscore); - } - - // return bounding rect if requested - if ( rectBounding ) - { - *rectBounding = wxRect(x, y - heightText, widthText, heightText); - } - - CalcBoundingBox(x0, y0); - CalcBoundingBox(x0 + width0, y0 + height); -} - -#if WXWIN_COMPATIBILITY_2_8 - // for compatibility with the old code when wxCoord was long everywhere -void wxDC::GetTextExtent(const wxString& string, - long *x, long *y, - long *descent, - long *externalLeading, - const wxFont *theFont) const - { - wxCoord x2, y2, descent2, externalLeading2; - m_pimpl->DoGetTextExtent(string, &x2, &y2, - &descent2, &externalLeading2, - theFont); - if ( x ) - *x = x2; - if ( y ) - *y = y2; - if ( descent ) - *descent = descent2; - if ( externalLeading ) - *externalLeading = externalLeading2; - } - -void wxDC::GetLogicalOrigin(long *x, long *y) const - { - wxCoord x2, y2; - m_pimpl->DoGetLogicalOrigin(&x2, &y2); - if ( x ) - *x = x2; - if ( y ) - *y = y2; - } - -void wxDC::GetDeviceOrigin(long *x, long *y) const - { - wxCoord x2, y2; - m_pimpl->DoGetDeviceOrigin(&x2, &y2); - if ( x ) - *x = x2; - if ( y ) - *y = y2; - } - -void wxDC::GetClippingBox(long *x, long *y, long *w, long *h) const - { - wxCoord xx,yy,ww,hh; - m_pimpl->DoGetClippingBox(&xx, &yy, &ww, &hh); - if (x) *x = xx; - if (y) *y = yy; - if (w) *w = ww; - if (h) *h = hh; - } - -void wxDC::DrawObject(wxDrawObject* drawobject) -{ - drawobject->Draw(*this); - CalcBoundingBox(drawobject->MinX(),drawobject->MinY()); - CalcBoundingBox(drawobject->MaxX(),drawobject->MaxY()); -} - -#endif // WXWIN_COMPATIBILITY_2_8 - -/* -Notes for wxWidgets DrawEllipticArcRot(...) - -wxDCBase::DrawEllipticArcRot(...) draws a rotated elliptic arc or an ellipse. -It uses wxDCBase::CalculateEllipticPoints(...) and wxDCBase::Rotate(...), -which are also new. - -All methods are generic, so they can be implemented in wxDCBase. -DoDrawEllipticArcRot(...) is virtual, so it can be called from deeper -methods like (WinCE) wxDC::DoDrawArc(...). - -CalculateEllipticPoints(...) fills a given list of wxPoints with some points -of an elliptic arc. The algorithm is pixel-based: In every row (in flat -parts) or every column (in steep parts) only one pixel is calculated. -Trigonometric calculation (sin, cos, tan, atan) is only done if the -starting angle is not equal to the ending angle. The calculation of the -pixels is done using simple arithmetic only and should perform not too -bad even on devices without floating point processor. I didn't test this yet. - -Rotate(...) rotates a list of point pixel-based, you will see rounding errors. -For instance: an ellipse rotated 180 degrees is drawn -slightly different from the original. - -The points are then moved to an array and used to draw a polyline and/or polygon -(with center added, the pie). -The result looks quite similar to the native ellipse, only e few pixels differ. - -The performance on a desktop system (Athlon 1800, WinXP) is about 7 times -slower as DrawEllipse(...), which calls the native API. -An rotated ellipse outside the clipping region takes nearly the same time, -while an native ellipse outside takes nearly no time to draw. - -If you draw an arc with this new method, you will see the starting and ending angles -are calculated properly. -If you use DrawEllipticArc(...), you will see they are only correct for circles -and not properly calculated for ellipses. - -Peter Lenhard -p.lenhard@t-online.de -*/ - -float wxDCImpl::GetFontPointSizeAdjustment(float dpi) -{ - // wxMSW has long-standing bug where wxFont point size is interpreted as - // "pixel size corresponding to given point size *on screen*". In other - // words, on a typical 600dpi printer and a typical 96dpi screen, fonts - // are ~6 times smaller when printing. Unfortunately, this bug is so severe - // that *all* printing code has to account for it and consequently, other - // ports need to emulate this bug too: - const wxSize screenPPI = wxGetDisplayPPI(); - return float(screenPPI.y) / dpi; -} diff --git a/Externals/wxWidgets3/src/common/dcbufcmn.cpp b/Externals/wxWidgets3/src/common/dcbufcmn.cpp deleted file mode 100644 index f946a814d9..0000000000 --- a/Externals/wxWidgets3/src/common/dcbufcmn.cpp +++ /dev/null @@ -1,171 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/dcbufcmn.cpp -// Purpose: Buffered DC implementation -// Author: Ron Lee, Jaakko Salli -// Modified by: -// Created: Sep-20-2006 -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include "wx/dcbuffer.h" - -#ifndef WX_PRECOMP - #include "wx/module.h" -#endif - -// ============================================================================ -// implementation -// ============================================================================ - -wxIMPLEMENT_DYNAMIC_CLASS(wxBufferedDC, wxMemoryDC); -wxIMPLEMENT_ABSTRACT_CLASS(wxBufferedPaintDC, wxBufferedDC); - -// ---------------------------------------------------------------------------- -// wxSharedDCBufferManager: helper class maintaining backing store bitmap -// ---------------------------------------------------------------------------- - -class wxSharedDCBufferManager : public wxModule -{ -public: - wxSharedDCBufferManager() { } - - virtual bool OnInit() wxOVERRIDE { return true; } - virtual void OnExit() wxOVERRIDE { wxDELETE(ms_buffer); } - - static wxBitmap* GetBuffer(wxDC* dc, int w, int h) - { - if ( ms_usingSharedBuffer ) - return DoCreateBuffer(dc, w, h); - - if ( !ms_buffer || - w > ms_buffer->GetScaledWidth() || - h > ms_buffer->GetScaledHeight() ) - { - delete ms_buffer; - - ms_buffer = DoCreateBuffer(dc, w, h); - } - - ms_usingSharedBuffer = true; - return ms_buffer; - } - - static void ReleaseBuffer(wxBitmap* buffer) - { - if ( buffer == ms_buffer ) - { - wxASSERT_MSG( ms_usingSharedBuffer, wxT("shared buffer already released") ); - ms_usingSharedBuffer = false; - } - else - { - delete buffer; - } - } - -private: - static wxBitmap* DoCreateBuffer(wxDC* dc, int w, int h) - { - const double scale = dc ? dc->GetContentScaleFactor() : 1.0; - wxBitmap* const buffer = new wxBitmap; - - // we must always return a valid bitmap but creating a bitmap of - // size 0 would fail, so create a 1*1 bitmap in this case - buffer->CreateScaled(wxMax(w, 1), wxMax(h, 1), -1, scale); - - return buffer; - } - - static wxBitmap *ms_buffer; - static bool ms_usingSharedBuffer; - - wxDECLARE_DYNAMIC_CLASS(wxSharedDCBufferManager); -}; - -wxBitmap* wxSharedDCBufferManager::ms_buffer = NULL; -bool wxSharedDCBufferManager::ms_usingSharedBuffer = false; - -wxIMPLEMENT_DYNAMIC_CLASS(wxSharedDCBufferManager, wxModule); - -// ============================================================================ -// wxBufferedDC -// ============================================================================ - -void wxBufferedDC::UseBuffer(wxCoord w, wxCoord h) -{ - wxCHECK_RET( w >= -1 && h >= -1, "Invalid buffer size" ); - - if ( !m_buffer || !m_buffer->IsOk() ) - { - if ( w == -1 || h == -1 ) - m_dc->GetSize(&w, &h); - - m_buffer = wxSharedDCBufferManager::GetBuffer(m_dc, w, h); - m_style |= wxBUFFER_USES_SHARED_BUFFER; - m_area.Set(w,h); - } - else - m_area = m_buffer->GetSize(); - - SelectObject(*m_buffer); - - // now that the DC is valid we can inherit the attributes (fonts, colours, - // layout direction, ...) from the original DC - if ( m_dc && m_dc->IsOk() ) - CopyAttributes(*m_dc); -} - -void wxBufferedDC::UnMask() -{ - wxCHECK_RET( m_dc, wxT("no underlying wxDC?") ); - wxASSERT_MSG( m_buffer && m_buffer->IsOk(), wxT("invalid backing store") ); - - wxCoord x = 0, - y = 0; - - // Ensure the scale matches the device - SetUserScale(1.0, 1.0); - - if ( m_style & wxBUFFER_CLIENT_AREA ) - GetDeviceOrigin(&x, &y); - - // It's possible that the buffer may be bigger than the area that needs to - // be drawn (the client size of the window is smaller than the bitmap, or - // a shared bitmap has been reused for a smaller area, etc.) so avoid - // blitting too much if possible, but only use the real DC size if the - // wxBUFFER_VIRTUAL_AREA style is not set. - int width = m_area.GetWidth(), - height = m_area.GetHeight(); - - if (!(m_style & wxBUFFER_VIRTUAL_AREA)) - { - int widthDC, - heightDC; - m_dc->GetSize(&widthDC, &heightDC); - width = wxMin(width, widthDC); - height = wxMin(height, heightDC); - } - - const wxPoint origin = GetLogicalOrigin(); - m_dc->Blit(-origin.x, -origin.y, width, height, this, -x, -y); - m_dc = NULL; - - if ( m_style & wxBUFFER_USES_SHARED_BUFFER ) - wxSharedDCBufferManager::ReleaseBuffer(m_buffer); -} diff --git a/Externals/wxWidgets3/src/common/dcgraph.cpp b/Externals/wxWidgets3/src/common/dcgraph.cpp deleted file mode 100644 index eb2ce4f059..0000000000 --- a/Externals/wxWidgets3/src/common/dcgraph.cpp +++ /dev/null @@ -1,1261 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/dcgraph.cpp -// Purpose: graphics context methods common to all platforms -// Author: Stefan Csomor -// Modified by: -// Created: -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if defined(__BORLANDC__) - #pragma hdrstop -#endif - -#if wxUSE_GRAPHICS_CONTEXT - -#include "wx/dcgraph.h" - -#ifndef WX_PRECOMP - #include "wx/icon.h" - #include "wx/dcclient.h" - #include "wx/dcmemory.h" - #include "wx/math.h" - #include "wx/geometry.h" -#endif - -//----------------------------------------------------------------------------- -// constants -//----------------------------------------------------------------------------- - -static const double RAD2DEG = 180.0 / M_PI; - -//----------------------------------------------------------------------------- -// Local functions -//----------------------------------------------------------------------------- - -static wxCompositionMode TranslateRasterOp(wxRasterOperationMode function) -{ - switch ( function ) - { - case wxCOPY: // src - // since we are supporting alpha, _OVER is closer to the intention than _SOURCE - // since the latter would overwrite even when alpha is not set to opaque - return wxCOMPOSITION_OVER; - - case wxOR: // src OR dst - return wxCOMPOSITION_ADD; - - case wxNO_OP: // dst - return wxCOMPOSITION_DEST; // ignore the source - - case wxCLEAR: // 0 - return wxCOMPOSITION_CLEAR;// clear dst - - case wxXOR: // src XOR dst - return wxCOMPOSITION_XOR; - - case wxAND: // src AND dst - case wxAND_INVERT: // (NOT src) AND dst - case wxAND_REVERSE:// src AND (NOT dst) - case wxEQUIV: // (NOT src) XOR dst - case wxINVERT: // NOT dst - case wxNAND: // (NOT src) OR (NOT dst) - case wxNOR: // (NOT src) AND (NOT dst) - case wxOR_INVERT: // (NOT src) OR dst - case wxOR_REVERSE: // src OR (NOT dst) - case wxSET: // 1 - case wxSRC_INVERT: // NOT src - break; - } - - return wxCOMPOSITION_INVALID; -} - -//----------------------------------------------------------------------------- -// wxDC bridge class -//----------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxGCDC, wxDC); - -wxGCDC::wxGCDC(const wxWindowDC& dc) : - wxDC( new wxGCDCImpl( this, dc ) ) -{ -} - -wxGCDC::wxGCDC( const wxMemoryDC& dc) : - wxDC( new wxGCDCImpl( this, dc ) ) -{ -} - -#if wxUSE_PRINTING_ARCHITECTURE -wxGCDC::wxGCDC( const wxPrinterDC& dc) : - wxDC( new wxGCDCImpl( this, dc ) ) -{ -} -#endif - -#if defined(__WXMSW__) && wxUSE_ENH_METAFILE -wxGCDC::wxGCDC(const wxEnhMetaFileDC& dc) - : wxDC(new wxGCDCImpl(this, dc)) -{ -} -#endif - -wxGCDC::wxGCDC(wxGraphicsContext* context) : - wxDC( new wxGCDCImpl( this ) ) -{ - SetGraphicsContext(context); -} - -wxGCDC::wxGCDC() : - wxDC( new wxGCDCImpl( this ) ) -{ -} - -wxGCDC::~wxGCDC() -{ -} - -wxIMPLEMENT_ABSTRACT_CLASS(wxGCDCImpl, wxDCImpl); - -wxGCDCImpl::wxGCDCImpl( wxDC *owner ) : - wxDCImpl( owner ) -{ - Init(wxGraphicsContext::Create()); -} - -void wxGCDCImpl::SetGraphicsContext( wxGraphicsContext* ctx ) -{ - delete m_graphicContext; - m_graphicContext = ctx; - if ( m_graphicContext ) - { - m_matrixOriginal = m_graphicContext->GetTransform(); - m_ok = true; - // apply the stored transformations to the passed in context - ComputeScaleAndOrigin(); - m_graphicContext->SetFont( m_font , m_textForegroundColour ); - m_graphicContext->SetPen( m_pen ); - m_graphicContext->SetBrush( m_brush); - } -} - -wxGCDCImpl::wxGCDCImpl( wxDC *owner, const wxWindowDC& dc ) : - wxDCImpl( owner ) -{ - Init(wxGraphicsContext::Create(dc)); - m_window = dc.GetWindow(); -} - -wxGCDCImpl::wxGCDCImpl( wxDC *owner, const wxMemoryDC& dc ) : - wxDCImpl( owner ) -{ - Init(wxGraphicsContext::Create(dc)); -} - -#if wxUSE_PRINTING_ARCHITECTURE -wxGCDCImpl::wxGCDCImpl( wxDC *owner, const wxPrinterDC& dc ) : - wxDCImpl( owner ) -{ - Init(wxGraphicsContext::Create(dc)); -} -#endif - -#if defined(__WXMSW__) && wxUSE_ENH_METAFILE -wxGCDCImpl::wxGCDCImpl(wxDC *owner, const wxEnhMetaFileDC& dc) - : wxDCImpl(owner) -{ - Init(wxGraphicsContext::Create(dc)); -} -#endif - -wxGCDCImpl::wxGCDCImpl(wxDC* owner, int) - : wxDCImpl(owner) -{ - // derived class will set a context - Init(NULL); -} - -void wxGCDCImpl::Init(wxGraphicsContext* ctx) -{ - m_ok = false; - m_colour = true; - m_mm_to_pix_x = mm2pt; - m_mm_to_pix_y = mm2pt; - - m_pen = *wxBLACK_PEN; - m_font = *wxNORMAL_FONT; - m_brush = *wxWHITE_BRUSH; - - m_graphicContext = NULL; - if (ctx) - SetGraphicsContext(ctx); - - m_logicalFunctionSupported = true; -} - -wxGCDCImpl::~wxGCDCImpl() -{ - delete m_graphicContext; -} - -void wxGCDCImpl::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, - bool useMask ) -{ - wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoDrawBitmap - invalid DC") ); - wxCHECK_RET( bmp.IsOk(), wxT("wxGCDC(cg)::DoDrawBitmap - invalid bitmap") ); - - int w = bmp.GetScaledWidth(); - int h = bmp.GetScaledHeight(); - if ( bmp.GetDepth() == 1 ) - { - m_graphicContext->SetPen(*wxTRANSPARENT_PEN); - m_graphicContext->SetBrush(m_textBackgroundColour); - m_graphicContext->DrawRectangle( x, y, w, h ); - m_graphicContext->SetBrush(m_textForegroundColour); - m_graphicContext->DrawBitmap( bmp, x, y, w, h ); - m_graphicContext->SetBrush( m_graphicContext->CreateBrush(m_brush)); - m_graphicContext->SetPen( m_graphicContext->CreatePen(m_pen)); - } - else // not a monochrome bitmap, handle it normally - { - // make a copy in case we need to remove its mask, if we don't modify - // it the copy is cheap as bitmaps are reference-counted - wxBitmap bmpCopy(bmp); - if ( !useMask && bmp.GetMask() ) - bmpCopy.SetMask(NULL); - - m_graphicContext->DrawBitmap( bmpCopy, x, y, w, h ); - } - - CalcBoundingBox(x, y); - CalcBoundingBox(x + w, y + h); -} - -void wxGCDCImpl::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y ) -{ - wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoDrawIcon - invalid DC") ); - wxCHECK_RET( icon.IsOk(), wxT("wxGCDC(cg)::DoDrawIcon - invalid icon") ); - - wxCoord w = icon.GetWidth(); - wxCoord h = icon.GetHeight(); - - m_graphicContext->DrawIcon( icon , x, y, w, h ); - - CalcBoundingBox(x, y); - CalcBoundingBox(x + w, y + h); -} - -bool wxGCDCImpl::StartDoc( const wxString& message ) -{ - return m_graphicContext->StartDoc(message); -} - -void wxGCDCImpl::EndDoc() -{ - m_graphicContext->EndDoc(); -} - -void wxGCDCImpl::StartPage() -{ - m_graphicContext->StartPage(); -} - -void wxGCDCImpl::EndPage() -{ - m_graphicContext->EndPage(); -} - -void wxGCDCImpl::Flush() -{ - m_graphicContext->Flush(); -} - -void wxGCDCImpl::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord w, wxCoord h ) -{ - wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoSetClippingRegion - invalid DC") ); - - m_graphicContext->Clip( x, y, w, h ); - - wxDCImpl::DoSetClippingRegion(x, y, w, h); -} - -void wxGCDCImpl::DoSetDeviceClippingRegion( const wxRegion ®ion ) -{ - // region is in device coordinates - wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoSetDeviceClippingRegion - invalid DC") ); - - if (region.Empty()) - { - //DestroyClippingRegion(); - return; - } - - wxRegion logRegion( region ); - wxCoord x, y, w, h; - - logRegion.Offset( DeviceToLogicalX(0), DeviceToLogicalY(0) ); - logRegion.GetBox( x, y, w, h ); - - m_graphicContext->Clip( logRegion ); - if ( m_clipping ) - { - m_clipX1 = wxMax( m_clipX1, x ); - m_clipY1 = wxMax( m_clipY1, y ); - m_clipX2 = wxMin( m_clipX2, (x + w) ); - m_clipY2 = wxMin( m_clipY2, (y + h) ); - } - else - { - m_clipping = true; - - m_clipX1 = x; - m_clipY1 = y; - m_clipX2 = x + w; - m_clipY2 = y + h; - } -} - -void wxGCDCImpl::DestroyClippingRegion() -{ - m_graphicContext->ResetClip(); - // currently the clip eg of a window extends to the area between the scrollbars - // so we must explicitly make sure it only covers the area we want it to draw - int width, height ; - GetOwner()->GetSize( &width , &height ) ; - m_graphicContext->Clip( DeviceToLogicalX(0) , DeviceToLogicalY(0) , DeviceToLogicalXRel(width), DeviceToLogicalYRel(height) ); - - m_graphicContext->SetPen( m_pen ); - m_graphicContext->SetBrush( m_brush ); - - m_clipping = false; -} - -void wxGCDCImpl::DoGetSizeMM( int* width, int* height ) const -{ - int w = 0, h = 0; - - GetOwner()->GetSize( &w, &h ); - if (width) - *width = long( double(w) / (m_scaleX * m_mm_to_pix_x) ); - if (height) - *height = long( double(h) / (m_scaleY * m_mm_to_pix_y) ); -} - -void wxGCDCImpl::SetTextForeground( const wxColour &col ) -{ - wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::SetTextForeground - invalid DC") ); - - // don't set m_textForegroundColour to an invalid colour as we'd crash - // later then (we use m_textForegroundColour.GetColor() without checking - // in a few places) - if ( col.IsOk() ) - { - m_textForegroundColour = col; - m_graphicContext->SetFont( m_font, m_textForegroundColour ); - } -} - -void wxGCDCImpl::SetTextBackground( const wxColour &col ) -{ - wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::SetTextBackground - invalid DC") ); - - m_textBackgroundColour = col; -} - -wxSize wxGCDCImpl::GetPPI() const -{ - return wxSize(72, 72); -} - -int wxGCDCImpl::GetDepth() const -{ - return 32; -} - -void wxGCDCImpl::ComputeScaleAndOrigin() -{ - wxDCImpl::ComputeScaleAndOrigin(); - - if ( m_graphicContext ) - { - m_matrixCurrent = m_graphicContext->CreateMatrix(); - - // the logical origin sets the origin to have new coordinates - m_matrixCurrent.Translate( m_deviceOriginX - m_logicalOriginX * m_signX * m_scaleX, - m_deviceOriginY - m_logicalOriginY * m_signY * m_scaleY); - - m_matrixCurrent.Scale( m_scaleX * m_signX, m_scaleY * m_signY ); - - m_graphicContext->SetTransform( m_matrixOriginal ); - m_graphicContext->ConcatTransform( m_matrixCurrent ); - } -} - -void* wxGCDCImpl::GetHandle() const -{ - void* cgctx = NULL; - wxGraphicsContext* gc = GetGraphicsContext(); - if (gc) { - cgctx = gc->GetNativeContext(); - } - return cgctx; -} - -void wxGCDCImpl::SetPalette( const wxPalette& WXUNUSED(palette) ) -{ - -} - -void wxGCDCImpl::SetBackgroundMode( int mode ) -{ - m_backgroundMode = mode; -} - -void wxGCDCImpl::SetFont( const wxFont &font ) -{ - m_font = font; - if ( m_graphicContext ) - { - m_graphicContext->SetFont(font, m_textForegroundColour); - } -} - -void wxGCDCImpl::SetPen( const wxPen &pen ) -{ - m_pen = pen; - if ( m_graphicContext ) - { - m_graphicContext->SetPen( m_pen ); - } -} - -void wxGCDCImpl::SetBrush( const wxBrush &brush ) -{ - m_brush = brush; - if ( m_graphicContext ) - { - m_graphicContext->SetBrush( m_brush ); - } -} - -void wxGCDCImpl::SetBackground( const wxBrush &brush ) -{ - m_backgroundBrush = brush; - if (!m_backgroundBrush.IsOk()) - return; -} - -void wxGCDCImpl::SetLogicalFunction( wxRasterOperationMode function ) -{ - m_logicalFunction = function; - - wxCompositionMode mode = TranslateRasterOp( function ); - m_logicalFunctionSupported = mode != wxCOMPOSITION_INVALID; - if (m_logicalFunctionSupported) - m_logicalFunctionSupported = m_graphicContext->SetCompositionMode(mode); - - if ( function == wxXOR ) - m_graphicContext->SetAntialiasMode(wxANTIALIAS_NONE); - else - m_graphicContext->SetAntialiasMode(wxANTIALIAS_DEFAULT); -} - -bool wxGCDCImpl::DoFloodFill(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), - const wxColour& WXUNUSED(col), - wxFloodFillStyle WXUNUSED(style)) -{ - return false; -} - -bool wxGCDCImpl::DoGetPixel( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), wxColour *WXUNUSED(col) ) const -{ - // wxCHECK_MSG( 0 , false, wxT("wxGCDC(cg)::DoGetPixel - not implemented") ); - return false; -} - -void wxGCDCImpl::DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 ) -{ - wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoDrawLine - invalid DC") ); - - if ( !m_logicalFunctionSupported ) - return; - - m_graphicContext->StrokeLine(x1,y1,x2,y2); - - CalcBoundingBox(x1, y1); - CalcBoundingBox(x2, y2); -} - -void wxGCDCImpl::DoCrossHair( wxCoord x, wxCoord y ) -{ - wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoCrossHair - invalid DC") ); - - if ( !m_logicalFunctionSupported ) - return; - - int w = 0, h = 0; - - GetOwner()->GetSize( &w, &h ); - - m_graphicContext->StrokeLine(0,y,w,y); - m_graphicContext->StrokeLine(x,0,x,h); - - CalcBoundingBox(0, 0); - CalcBoundingBox(w, h); -} - -void wxGCDCImpl::DoDrawArc( wxCoord x1, wxCoord y1, - wxCoord x2, wxCoord y2, - wxCoord xc, wxCoord yc ) -{ - wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoDrawArc - invalid DC") ); - - if ( !m_logicalFunctionSupported ) - return; - - double dx = x1 - xc; - double dy = y1 - yc; - double radius = sqrt((double)(dx * dx + dy * dy)); - wxCoord rad = (wxCoord)radius; - double sa, ea; - if (x1 == x2 && y1 == y2) - { - sa = 0.0; - ea = 360.0; - } - else if (radius == 0.0) - { - sa = ea = 0.0; - } - else - { - sa = (x1 - xc == 0) ? - (y1 - yc < 0) ? 90.0 : -90.0 : - -atan2(double(y1 - yc), double(x1 - xc)) * RAD2DEG; - ea = (x2 - xc == 0) ? - (y2 - yc < 0) ? 90.0 : -90.0 : - -atan2(double(y2 - yc), double(x2 - xc)) * RAD2DEG; - } - - bool fill = m_brush.GetStyle() != wxBRUSHSTYLE_TRANSPARENT; - - wxGraphicsPath path = m_graphicContext->CreatePath(); - if ( fill && ((x1!=x2)||(y1!=y2)) ) - path.MoveToPoint( xc, yc ); - // since these angles (ea,sa) are measured counter-clockwise, we invert them to - // get clockwise angles - path.AddArc( xc, yc , rad, wxDegToRad(-sa), wxDegToRad(-ea), false ); - if ( fill && ((x1!=x2)||(y1!=y2)) ) - path.AddLineToPoint( xc, yc ); - m_graphicContext->DrawPath(path); - - wxRect2DDouble box = path.GetBox(); - CalcBoundingBox(wxRound(box.m_x), wxRound(box.m_y)); - CalcBoundingBox(wxRound(box.m_x + box.m_width), - wxRound(box.m_y + box.m_height)); -} - -void wxGCDCImpl::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord w, wxCoord h, - double sa, double ea ) -{ - wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoDrawEllipticArc - invalid DC") ); - - if ( !m_logicalFunctionSupported ) - return; - - wxCoord dx = x + w / 2.0; - wxCoord dy = y + h / 2.0; - wxDouble factor = ((wxDouble) w) / h; - m_graphicContext->PushState(); - m_graphicContext->Translate(dx, dy); - m_graphicContext->Scale(factor, 1.0); - wxGraphicsPath path = m_graphicContext->CreatePath(); - - // If end angle equals start angle we want draw a full ellipse. - if (ea == sa) - { - ea += 360.0; - } - // since these angles (ea,sa) are measured counter-clockwise, we invert them to - // get clockwise angles - if ( m_brush.GetStyle() != wxBRUSHSTYLE_TRANSPARENT ) - { - path.MoveToPoint( 0, 0 ); - path.AddArc( 0, 0, h/2.0, wxDegToRad(-sa), wxDegToRad(-ea), false ); - path.AddLineToPoint( 0, 0 ); - m_graphicContext->FillPath( path ); - - path = m_graphicContext->CreatePath(); - path.AddArc( 0, 0, h/2.0, wxDegToRad(-sa), wxDegToRad(-ea), false ); - m_graphicContext->StrokePath( path ); - } - else - { - path.AddArc( 0, 0, h/2.0, wxDegToRad(-sa), wxDegToRad(-ea), false ); - m_graphicContext->DrawPath( path ); - } - - wxRect2DDouble box = path.GetBox(); - // apply the transformation to the box - box.m_x *= factor; - box.m_width *= factor; - box.m_x += dx; - box.m_y += dy; - - CalcBoundingBox(wxRound(box.m_x), wxRound(box.m_y)); - CalcBoundingBox(wxRound(box.m_x + box.m_width), - wxRound(box.m_y + box.m_height)); - - m_graphicContext->PopState(); -} - -void wxGCDCImpl::DoDrawPoint( wxCoord x, wxCoord y ) -{ - wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoDrawPoint - invalid DC") ); - - DoDrawLine( x , y , x + 1 , y + 1 ); -} - -void wxGCDCImpl::DoDrawLines(int n, const wxPoint points[], - wxCoord xoffset, wxCoord yoffset) -{ - wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoDrawLines - invalid DC") ); - wxASSERT_MSG( n > 0, wxT("wxGCDC(cg)::DoDrawLines - number of points too small") ); - - if ( !m_logicalFunctionSupported ) - return; - - int minX = points[0].x; - int minY = points[0].y; - int maxX = minX; - int maxY = minY; - - wxPoint2DDouble* pointsD = new wxPoint2DDouble[n]; - for( int i = 0; i < n; ++i) - { - wxPoint p = points[i]; - pointsD[i].m_x = p.x + xoffset; - pointsD[i].m_y = p.y + yoffset; - - if (p.x < minX) minX = p.x; - else if (p.x > maxX) maxX = p.x; - if (p.y < minY) minY = p.y; - else if (p.y > maxY) maxY = p.y; - } - - m_graphicContext->StrokeLines( n , pointsD); - delete[] pointsD; - - CalcBoundingBox(minX + xoffset, minY + yoffset); - CalcBoundingBox(maxX + xoffset, maxY + yoffset); -} - -#if wxUSE_SPLINES -void wxGCDCImpl::DoDrawSpline(const wxPointList *points) -{ - wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoDrawSpline - invalid DC") ); - - if ( !m_logicalFunctionSupported ) - return; - - wxGraphicsPath path = m_graphicContext->CreatePath(); - - wxPointList::compatibility_iterator node = points->GetFirst(); - if ( !node ) - // empty list - return; - - const wxPoint *p = node->GetData(); - - wxCoord x1 = p->x; - wxCoord y1 = p->y; - - node = node->GetNext(); - p = node->GetData(); - - wxCoord x2 = p->x; - wxCoord y2 = p->y; - wxCoord cx1 = ( x1 + x2 ) / 2; - wxCoord cy1 = ( y1 + y2 ) / 2; - - path.MoveToPoint( x1 , y1 ); - path.AddLineToPoint( cx1 , cy1 ); -#if !wxUSE_STD_CONTAINERS - - while ((node = node->GetNext()) != NULL) -#else - - while ((node = node->GetNext())) -#endif // !wxUSE_STD_CONTAINERS - - { - p = node->GetData(); - x1 = x2; - y1 = y2; - x2 = p->x; - y2 = p->y; - wxCoord cx4 = (x1 + x2) / 2; - wxCoord cy4 = (y1 + y2) / 2; - - path.AddQuadCurveToPoint(x1 , y1 ,cx4 , cy4 ); - - cx1 = cx4; - cy1 = cy4; - } - - path.AddLineToPoint( x2 , y2 ); - - m_graphicContext->StrokePath( path ); - - wxRect2DDouble box = path.GetBox(); - CalcBoundingBox(wxRound(box.m_x), wxRound(box.m_y)); - CalcBoundingBox(wxRound(box.m_x + box.m_width), - wxRound(box.m_y + box.m_height)); -} -#endif // wxUSE_SPLINES - -void wxGCDCImpl::DoDrawPolygon( int n, const wxPoint points[], - wxCoord xoffset, wxCoord yoffset, - wxPolygonFillMode fillStyle ) -{ - wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoDrawPolygon - invalid DC") ); - - if ( n <= 0 || - (m_brush.GetStyle() == wxBRUSHSTYLE_TRANSPARENT && - m_pen.GetStyle() == wxPENSTYLE_TRANSPARENT) ) - return; - if ( !m_logicalFunctionSupported ) - return; - - bool closeIt = false; - if (points[n-1] != points[0]) - closeIt = true; - - int minX = points[0].x; - int minY = points[0].y; - int maxX = minX; - int maxY = minY; - - wxPoint2DDouble* pointsD = new wxPoint2DDouble[n+(closeIt?1:0)]; - for( int i = 0; i < n; ++i) - { - wxPoint p = points[i]; - pointsD[i].m_x = p.x + xoffset; - pointsD[i].m_y = p.y + yoffset; - - if (p.x < minX) minX = p.x; - else if (p.x > maxX) maxX = p.x; - if (p.y < minY) minY = p.y; - else if (p.y > maxY) maxY = p.y; - } - if ( closeIt ) - pointsD[n] = pointsD[0]; - - m_graphicContext->DrawLines( n+(closeIt?1:0) , pointsD, fillStyle); - delete[] pointsD; - - CalcBoundingBox(minX + xoffset, minY + yoffset); - CalcBoundingBox(maxX + xoffset, maxY + yoffset); -} - -void wxGCDCImpl::DoDrawPolyPolygon(int n, - const int count[], - const wxPoint points[], - wxCoord xoffset, - wxCoord yoffset, - wxPolygonFillMode fillStyle) -{ - wxASSERT(n > 1); - wxGraphicsPath path = m_graphicContext->CreatePath(); - - int i = 0; - for ( int j = 0; j < n; ++j) - { - wxPoint start = points[i]; - path.MoveToPoint( start.x+ xoffset, start.y+ yoffset); - ++i; - int l = count[j]; - for ( int k = 1; k < l; ++k) - { - path.AddLineToPoint( points[i].x+ xoffset, points[i].y+ yoffset); - ++i; - } - // close the polygon - if ( start != points[i-1]) - path.AddLineToPoint( start.x+ xoffset, start.y+ yoffset); - } - m_graphicContext->DrawPath( path , fillStyle); - - wxRect2DDouble box = path.GetBox(); - CalcBoundingBox(wxRound(box.m_x), wxRound(box.m_y)); - CalcBoundingBox(wxRound(box.m_x + box.m_width), - wxRound(box.m_y + box.m_height)); -} - -void wxGCDCImpl::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord w, wxCoord h) -{ - wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoDrawRectangle - invalid DC") ); - - if ( !m_logicalFunctionSupported ) - return; - - // CMB: draw nothing if transformed w or h is 0 - if (w == 0 || h == 0) - return; - - CalcBoundingBox(x, y); - CalcBoundingBox(x + w, y + h); - - if (m_pen.IsOk() && m_pen.GetStyle() != wxPENSTYLE_TRANSPARENT && m_pen.GetWidth() > 0) - { - // outline is one pixel larger than what raster-based wxDC implementations draw - w -= 1; - h -= 1; - } - m_graphicContext->DrawRectangle(x,y,w,h); -} - -void wxGCDCImpl::DoDrawRoundedRectangle(wxCoord x, wxCoord y, - wxCoord w, wxCoord h, - double radius) -{ - wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoDrawRoundedRectangle - invalid DC") ); - - if ( !m_logicalFunctionSupported ) - return; - - if (radius < 0.0) - radius = - radius * ((w < h) ? w : h); - - // CMB: draw nothing if transformed w or h is 0 - if (w == 0 || h == 0) - return; - - CalcBoundingBox(x, y); - CalcBoundingBox(x + w, y + h); - - if (m_pen.IsOk() && m_pen.GetStyle() != wxPENSTYLE_TRANSPARENT && m_pen.GetWidth() > 0) - { - // outline is one pixel larger than what raster-based wxDC implementations draw - w -= 1; - h -= 1; - } - m_graphicContext->DrawRoundedRectangle( x,y,w,h,radius); -} - -void wxGCDCImpl::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord w, wxCoord h) -{ - wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoDrawEllipse - invalid DC") ); - - if ( !m_logicalFunctionSupported ) - return; - - CalcBoundingBox(x, y); - CalcBoundingBox(x + w, y + h); - - m_graphicContext->DrawEllipse(x,y,w,h); -} - -bool wxGCDCImpl::CanDrawBitmap() const -{ - return true; -} - -bool wxGCDCImpl::DoBlit( - wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, - wxDC *source, wxCoord xsrc, wxCoord ysrc, - wxRasterOperationMode logical_func , bool useMask, - wxCoord xsrcMask, wxCoord ysrcMask ) -{ - return DoStretchBlit( xdest, ydest, width, height, - source, xsrc, ysrc, width, height, logical_func, useMask, - xsrcMask,ysrcMask ); -} - -bool wxGCDCImpl::DoStretchBlit( - wxCoord xdest, wxCoord ydest, wxCoord dstWidth, wxCoord dstHeight, - wxDC *source, wxCoord xsrc, wxCoord ysrc, wxCoord srcWidth, wxCoord srcHeight, - wxRasterOperationMode logical_func , bool useMask, - wxCoord xsrcMask, wxCoord ysrcMask ) -{ - wxCHECK_MSG( IsOk(), false, wxT("wxGCDC(cg)::DoStretchBlit - invalid DC") ); - wxCHECK_MSG( source->IsOk(), false, wxT("wxGCDC(cg)::DoStretchBlit - invalid source DC") ); - - if ( logical_func == wxNO_OP ) - return true; - - wxCompositionMode mode = TranslateRasterOp(logical_func); - if ( mode == wxCOMPOSITION_INVALID ) - { - wxFAIL_MSG( wxT("Blitting is not supported with this logical operation.") ); - return false; - } - - wxRect subrect(source->LogicalToDeviceX(xsrc), - source->LogicalToDeviceY(ysrc), - source->LogicalToDeviceXRel(srcWidth), - source->LogicalToDeviceYRel(srcHeight)); - const wxRect subrectOrig = subrect; - // clip the subrect down to the size of the source DC - wxRect clip; - source->GetSize(&clip.width, &clip.height); - subrect.Intersect(clip); - if (subrect.width == 0) - return true; - - bool retval = true; - - wxCompositionMode formerMode = m_graphicContext->GetCompositionMode(); - if (m_graphicContext->SetCompositionMode(mode)) - { - wxAntialiasMode formerAa = m_graphicContext->GetAntialiasMode(); - if (mode == wxCOMPOSITION_XOR) - { - m_graphicContext->SetAntialiasMode(wxANTIALIAS_NONE); - } - - if (xsrcMask == -1 && ysrcMask == -1) - { - xsrcMask = xsrc; - ysrcMask = ysrc; - } - - wxBitmap blit = source->GetAsBitmap( &subrect ); - - if ( blit.IsOk() ) - { - if ( !useMask && blit.GetMask() ) - blit.SetMask(NULL); - - double x = xdest; - double y = ydest; - double w = dstWidth; - double h = dstHeight; - // adjust dest rect if source rect is clipped - if (subrect.width != subrectOrig.width || subrect.height != subrectOrig.height) - { - x += (subrect.x - subrectOrig.x) / double(subrectOrig.width) * dstWidth; - y += (subrect.y - subrectOrig.y) / double(subrectOrig.height) * dstHeight; - w *= double(subrect.width) / subrectOrig.width; - h *= double(subrect.height) / subrectOrig.height; - } - m_graphicContext->DrawBitmap(blit, x, y, w, h); - } - else - { - wxFAIL_MSG( wxT("Cannot Blit. Unable to get contents of DC as bitmap.") ); - retval = false; - } - - if (mode == wxCOMPOSITION_XOR) - { - m_graphicContext->SetAntialiasMode(formerAa); - } - } - // reset composition - m_graphicContext->SetCompositionMode(formerMode); - - CalcBoundingBox(xdest, ydest); - CalcBoundingBox(xdest + dstWidth, ydest + dstHeight); - - return retval; -} - -void wxGCDCImpl::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, - double angle) -{ - wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoDrawRotatedText - invalid DC") ); - - if ( text.empty() ) - return; - if ( !m_logicalFunctionSupported ) - return; - - // we test that we have some font because otherwise we should still use the - // "else" part below to avoid that DrawRotatedText(angle = 180) and - // DrawRotatedText(angle = 0) use different fonts (we can't use the default - // font for drawing rotated fonts unfortunately) - if ( (angle == 0.0) && m_font.IsOk() ) - { - DoDrawText(text, x, y); - - // Bounding box already updated by DoDrawText(), no need to do it again. - return; - } - - // Get extent of whole text. - wxCoord w, h, heightLine; - GetOwner()->GetMultiLineTextExtent(text, &w, &h, &heightLine); - - // Compute the shift for the origin of the next line. - const double rad = wxDegToRad(angle); - const double dx = heightLine * sin(rad); - const double dy = heightLine * cos(rad); - - // Draw all text line by line - const wxArrayString lines = wxSplit(text, '\n', '\0'); - for ( size_t lineNum = 0; lineNum < lines.size(); lineNum++ ) - { - // Calculate origin for each line to avoid accumulation of - // rounding errors. - if ( m_backgroundMode == wxTRANSPARENT ) - m_graphicContext->DrawText( lines[lineNum], x + wxRound(lineNum*dx), y + wxRound(lineNum*dy), wxDegToRad(angle )); - else - m_graphicContext->DrawText( lines[lineNum], x + wxRound(lineNum*dx), y + wxRound(lineNum*dy), wxDegToRad(angle ), m_graphicContext->CreateBrush(m_textBackgroundColour) ); - } - - // call the bounding box by adding all four vertices of the rectangle - // containing the text to it (simpler and probably not slower than - // determining which of them is really topmost/leftmost/...) - - // "upper left" and "upper right" - CalcBoundingBox(x, y); - CalcBoundingBox(x + wxCoord(w*cos(rad)), y - wxCoord(w*sin(rad))); - - // "bottom left" and "bottom right" - x += (wxCoord)(h*sin(rad)); - y += (wxCoord)(h*cos(rad)); - CalcBoundingBox(x, y); - CalcBoundingBox(x + wxCoord(w*cos(rad)), y - wxCoord(w*sin(rad))); -} - -void wxGCDCImpl::DoDrawText(const wxString& str, wxCoord x, wxCoord y) -{ - // For compatibility with other ports (notably wxGTK) and because it's - // genuinely useful, we allow passing multiline strings to DrawText(). - // However there is no native OSX function to draw them directly so we - // instead reuse the generic DrawLabel() method to render them. Of course, - // DrawLabel() itself will call back to us but with single line strings - // only so there won't be any infinite recursion here. - if ( str.find('\n') != wxString::npos ) - { - GetOwner()->DrawLabel(str, wxRect(x, y, 0, 0)); - return; - } - - wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoDrawText - invalid DC") ); - - if ( str.empty() ) - return; - - if ( !m_logicalFunctionSupported ) - return; - - if ( m_backgroundMode == wxTRANSPARENT ) - m_graphicContext->DrawText( str, x ,y); - else - m_graphicContext->DrawText( str, x ,y , m_graphicContext->CreateBrush(m_textBackgroundColour) ); - - wxCoord w, h; - GetOwner()->GetTextExtent(str, &w, &h); - CalcBoundingBox(x, y); - CalcBoundingBox(x + w, y + h); -} - -bool wxGCDCImpl::CanGetTextExtent() const -{ - wxCHECK_MSG( IsOk(), false, wxT("wxGCDC(cg)::CanGetTextExtent - invalid DC") ); - - return true; -} - -void wxGCDCImpl::DoGetTextExtent( const wxString &str, wxCoord *width, wxCoord *height, - wxCoord *descent, wxCoord *externalLeading , - const wxFont *theFont ) const -{ - wxCHECK_RET( m_graphicContext, wxT("wxGCDC(cg)::DoGetTextExtent - invalid DC") ); - - if ( theFont ) - { - m_graphicContext->SetFont( *theFont, m_textForegroundColour ); - } - - wxDouble h , d , e , w; - - m_graphicContext->GetTextExtent( str, &w, &h, &d, &e ); - - if ( height ) - *height = (wxCoord)(h+0.5); - if ( descent ) - *descent = (wxCoord)(d+0.5); - if ( externalLeading ) - *externalLeading = (wxCoord)(e+0.5); - if ( width ) - *width = (wxCoord)(w+0.5); - - if ( theFont ) - { - m_graphicContext->SetFont( m_font, m_textForegroundColour ); - } -} - -bool wxGCDCImpl::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const -{ - wxCHECK_MSG( m_graphicContext, false, wxT("wxGCDC(cg)::DoGetPartialTextExtents - invalid DC") ); - widths.Clear(); - widths.Add(0,text.Length()); - if ( text.IsEmpty() ) - return true; - - wxArrayDouble widthsD; - - m_graphicContext->GetPartialTextExtents( text, widthsD ); - for ( size_t i = 0; i < widths.GetCount(); ++i ) - widths[i] = (wxCoord)(widthsD[i] + 0.5); - - return true; -} - -wxCoord wxGCDCImpl::GetCharWidth(void) const -{ - wxCoord width = 0; - DoGetTextExtent( wxT("g") , &width , NULL , NULL , NULL , NULL ); - - return width; -} - -wxCoord wxGCDCImpl::GetCharHeight(void) const -{ - wxCoord height = 0; - DoGetTextExtent( wxT("g") , NULL , &height , NULL , NULL , NULL ); - - return height; -} - -void wxGCDCImpl::Clear(void) -{ - wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::Clear - invalid DC") ); - // TODO better implementation / incorporate size info into wxGCDC or context - m_graphicContext->SetBrush( m_backgroundBrush ); - wxPen p = *wxTRANSPARENT_PEN; - m_graphicContext->SetPen( p ); - wxCompositionMode formerMode = m_graphicContext->GetCompositionMode(); - m_graphicContext->SetCompositionMode(wxCOMPOSITION_SOURCE); - // maximum positive coordinate Cairo can handle is 2^23 - 1 - DoDrawRectangle( - DeviceToLogicalX(0), DeviceToLogicalY(0), - DeviceToLogicalXRel(0x007fffff), DeviceToLogicalYRel(0x007fffff)); - m_graphicContext->SetCompositionMode(formerMode); - m_graphicContext->SetPen( m_pen ); - m_graphicContext->SetBrush( m_brush ); -} - -void wxGCDCImpl::DoGetSize(int *width, int *height) const -{ - wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoGetSize - invalid DC") ); - wxDouble w,h; - m_graphicContext->GetSize( &w, &h ); - if ( height ) - *height = (int) (h+0.5); - if ( width ) - *width = (int) (w+0.5); -} - -void wxGCDCImpl::DoGradientFillLinear(const wxRect& rect, - const wxColour& initialColour, - const wxColour& destColour, - wxDirection nDirection ) -{ - wxPoint start; - wxPoint end; - switch( nDirection) - { - case wxWEST : - start = rect.GetRightBottom(); - start.x++; - end = rect.GetLeftBottom(); - break; - case wxEAST : - start = rect.GetLeftBottom(); - end = rect.GetRightBottom(); - end.x++; - break; - case wxNORTH : - start = rect.GetLeftBottom(); - start.y++; - end = rect.GetLeftTop(); - break; - case wxSOUTH : - start = rect.GetLeftTop(); - end = rect.GetLeftBottom(); - end.y++; - break; - default : - break; - } - - if (rect.width == 0 || rect.height == 0) - return; - - m_graphicContext->SetBrush( m_graphicContext->CreateLinearGradientBrush( - start.x,start.y,end.x,end.y, initialColour, destColour)); - m_graphicContext->SetPen(*wxTRANSPARENT_PEN); - m_graphicContext->DrawRectangle(rect.x,rect.y,rect.width,rect.height); - m_graphicContext->SetPen(m_pen); - m_graphicContext->SetBrush(m_brush); - - CalcBoundingBox(rect.x, rect.y); - CalcBoundingBox(rect.x + rect.width, rect.y + rect.height); -} - -void wxGCDCImpl::DoGradientFillConcentric(const wxRect& rect, - const wxColour& initialColour, - const wxColour& destColour, - const wxPoint& circleCenter) -{ - //Radius - wxInt32 cx = rect.GetWidth() / 2; - wxInt32 cy = rect.GetHeight() / 2; - wxInt32 nRadius; - if (cx < cy) - nRadius = cx; - else - nRadius = cy; - - // make sure the background is filled (todo move into specific platform implementation ?) - m_graphicContext->SetPen(*wxTRANSPARENT_PEN); - m_graphicContext->SetBrush( wxBrush( destColour) ); - m_graphicContext->DrawRectangle(rect.x,rect.y,rect.width,rect.height); - - m_graphicContext->SetBrush( m_graphicContext->CreateRadialGradientBrush( - rect.x+circleCenter.x,rect.y+circleCenter.y, - rect.x+circleCenter.x,rect.y+circleCenter.y, - nRadius,initialColour,destColour)); - - m_graphicContext->DrawRectangle(rect.x,rect.y,rect.width,rect.height); - m_graphicContext->SetPen(m_pen); - m_graphicContext->SetBrush(m_brush); - - CalcBoundingBox(rect.x, rect.y); - CalcBoundingBox(rect.x + rect.width, rect.y + rect.height); -} - -void wxGCDCImpl::DoDrawCheckMark(wxCoord x, wxCoord y, - wxCoord width, wxCoord height) -{ - wxDCImpl::DoDrawCheckMark(x,y,width,height); -} - -#ifdef __WXMSW__ -wxRect wxGCDCImpl::MSWApplyGDIPlusTransform(const wxRect& r) const -{ - wxGraphicsContext* const gc = GetGraphicsContext(); - wxCHECK_MSG( gc, r, wxT("Invalid wxGCDC") ); - - double x = 0, - y = 0; - gc->GetTransform().TransformPoint(&x, &y); - - wxRect rect(r); - rect.Offset(x, y); - - return rect; -} -#endif // __WXMSW__ - -#endif // wxUSE_GRAPHICS_CONTEXT diff --git a/Externals/wxWidgets3/src/common/dcsvg.cpp b/Externals/wxWidgets3/src/common/dcsvg.cpp deleted file mode 100644 index 5f09c623c0..0000000000 --- a/Externals/wxWidgets3/src/common/dcsvg.cpp +++ /dev/null @@ -1,858 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/svg.cpp -// Purpose: SVG sample -// Author: Chris Elliott -// Modified by: -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - - -// For compilers that support precompilation, includes "wx/wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ -#pragma hdrstop -#endif - -#if wxUSE_SVG - -#ifndef WX_PRECOMP - #include "wx/dcmemory.h" - #include "wx/dcscreen.h" - #include "wx/icon.h" - #include "wx/image.h" - #include "wx/math.h" -#endif - -#include "wx/base64.h" -#include "wx/dcsvg.h" -#include "wx/wfstream.h" -#include "wx/filename.h" -#include "wx/mstream.h" - -#include "wx/private/markupparser.h" - -// ---------------------------------------------------------- -// Global utilities -// ---------------------------------------------------------- - -namespace -{ - -// This function returns a string representation of a floating point number in -// C locale (i.e. always using "." for the decimal separator) and with the -// fixed precision (which is 2 for some unknown reason but this is what it was -// in this code originally). -inline wxString NumStr(double f) -{ - return wxString::FromCDouble(f, 2); -} - -// Return the colour representation as HTML-like "#rrggbb" string and also -// returns its alpha as opacity number in 0..1 range. -wxString Col2SVG(wxColour c, float *opacity) -{ - if ( c.Alpha() != wxALPHA_OPAQUE ) - { - *opacity = c.Alpha() / 255.0f; - - // Remove the alpha before using GetAsString(wxC2S_HTML_SYNTAX) as it - // doesn't support colours with alpha channel. - c = wxColour(c.GetRGB()); - } - else // No alpha. - { - *opacity = 1.; - } - - return c.GetAsString(wxC2S_HTML_SYNTAX); -} - -wxString wxPenString(wxColour c, int style = wxPENSTYLE_SOLID) -{ - float opacity; - wxString s = wxT("stroke:") + Col2SVG(c, &opacity) + wxT("; "); - - switch ( style ) - { - case wxPENSTYLE_SOLID: - s += wxString::Format(wxT("stroke-opacity:%s; "), NumStr(opacity)); - break; - case wxPENSTYLE_TRANSPARENT: - s += wxT("stroke-opacity:0.0; "); - break; - default : - wxASSERT_MSG(false, wxT("wxSVGFileDC::Requested Pen Style not available")); - } - - return s; -} - -wxString wxBrushString(wxColour c, int style = wxBRUSHSTYLE_SOLID) -{ - float opacity; - wxString s = wxT("fill:") + Col2SVG(c, &opacity) + wxT("; "); - - switch ( style ) - { - case wxBRUSHSTYLE_SOLID: - s += wxString::Format(wxT("fill-opacity:%s; "), NumStr(opacity)); - break; - case wxBRUSHSTYLE_TRANSPARENT: - s += wxT("fill-opacity:0.0; "); - break; - default : - wxASSERT_MSG(false, wxT("wxSVGFileDC::Requested Brush Style not available")); - } - - return s; -} - -} // anonymous namespace - -// ---------------------------------------------------------------------------- -// wxSVGBitmapEmbedHandler -// ---------------------------------------------------------------------------- - -bool -wxSVGBitmapEmbedHandler::ProcessBitmap(const wxBitmap& bmp, - wxCoord x, wxCoord y, - wxOutputStream& stream) const -{ - static int sub_images = 0; - - if ( wxImage::FindHandler(wxBITMAP_TYPE_PNG) == NULL ) - wxImage::AddHandler(new wxPNGHandler); - - // write the bitmap as a PNG to a memory stream and Base64 encode - wxMemoryOutputStream mem; - bmp.ConvertToImage().SaveFile(mem, wxBITMAP_TYPE_PNG); - wxString data = wxBase64Encode(mem.GetOutputStreamBuffer()->GetBufferStart(), - mem.GetSize()); - - // write image meta information - wxString s; - s += wxString::Format(" "; // last line - } - - // write to the SVG file - const wxCharBuffer buf = s.utf8_str(); - stream.Write(buf, strlen((const char *)buf)); - - return stream.IsOk(); -} - -// ---------------------------------------------------------- -// wxSVGBitmapFileHandler -// ---------------------------------------------------------- - -bool -wxSVGBitmapFileHandler::ProcessBitmap(const wxBitmap& bmp, - wxCoord x, wxCoord y, - wxOutputStream& stream) const -{ - static int sub_images = 0; - - if ( wxImage::FindHandler(wxBITMAP_TYPE_PNG) == NULL ) - wxImage::AddHandler(new wxPNGHandler); - - // find a suitable file name - wxString sPNG; - do - { - sPNG = wxString::Format("image%d.png", sub_images++); - } - while (wxFile::Exists(sPNG)); - - if ( !bmp.SaveFile(sPNG, wxBITMAP_TYPE_PNG) ) - return false; - - // reference the bitmap from the SVG doc using only filename & ext - sPNG = sPNG.AfterLast(wxFileName::GetPathSeparator()); - - // reference the bitmap from the SVG doc - wxString s; - s += wxString::Format(" \n\n", sPNG); - - // write to the SVG file - const wxCharBuffer buf = s.utf8_str(); - stream.Write(buf, strlen((const char *)buf)); - - return stream.IsOk(); -} - -// ---------------------------------------------------------- -// wxSVGFileDC (specialisations) -// ---------------------------------------------------------- - -void wxSVGFileDC::SetBitmapHandler(wxSVGBitmapHandler* handler) -{ - ((wxSVGFileDCImpl*)GetImpl())->SetBitmapHandler(handler); -} - -// ---------------------------------------------------------- -// wxSVGFileDCImpl -// ---------------------------------------------------------- - -wxIMPLEMENT_ABSTRACT_CLASS(wxSVGFileDCImpl, wxDC); - -wxSVGFileDCImpl::wxSVGFileDCImpl( wxSVGFileDC *owner, const wxString &filename, - int width, int height, double dpi ) : - wxDCImpl( owner ) - { - Init( filename, width, height, dpi ); - } - -void wxSVGFileDCImpl::Init (const wxString &filename, int Width, int Height, double dpi) -{ - m_width = Width; - m_height = Height; - - m_dpi = dpi; - - m_OK = true; - - m_clipUniqueId = 0; - m_clipNestingLevel = 0; - - m_mm_to_pix_x = dpi/25.4; - m_mm_to_pix_y = dpi/25.4; - - m_backgroundBrush = *wxTRANSPARENT_BRUSH; - m_textForegroundColour = *wxBLACK; - m_textBackgroundColour = *wxWHITE; - m_colour = wxColourDisplay(); - - m_pen = *wxBLACK_PEN; - m_font = *wxNORMAL_FONT; - m_brush = *wxWHITE_BRUSH; - - m_graphics_changed = true; - - ////////////////////code here - - m_bmp_handler = NULL; - m_outfile = new wxFileOutputStream(filename); - m_OK = m_outfile->IsOk(); - if (m_OK) - { - m_filename = filename; - m_sub_images = 0; - wxString s; - s = wxT("\n"); - write(s); - s = wxT("\n"); - write(s); - s = wxT("\n"), NumStr(float(Width)/dpi*2.54), NumStr(float(Height)/dpi*2.54), Width, Height ); - write(s); - s = wxT("SVG Picture created as ") + wxFileName(filename).GetFullName() + wxT(" \n"); - write(s); - s = wxString (wxT("Picture generated by wxSVG ")) + wxSVGVersion + wxT(" \n"); - write(s); - s = wxT("\n"); - write(s); - } -} - -wxSVGFileDCImpl::~wxSVGFileDCImpl() -{ - wxString s = wxT(" \n \n"); - write(s); - delete m_outfile; -} - -void wxSVGFileDCImpl::DoGetSizeMM( int *width, int *height ) const -{ - if (width) - *width = wxRound( (double)m_width / m_mm_to_pix_x ); - - if (height) - *height = wxRound( (double)m_height / m_mm_to_pix_y ); -} - -wxSize wxSVGFileDCImpl::GetPPI() const -{ - return wxSize( wxRound(m_dpi), wxRound(m_dpi) ); -} - -void wxSVGFileDCImpl::DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) -{ - NewGraphicsIfNeeded(); - wxString s; - s.Printf ( wxT(" \n"), x1,y1,x2,y2 ); - if (m_OK) - { - write(s); - } - CalcBoundingBox(x1, y1); - CalcBoundingBox(x2, y2); -} - -void wxSVGFileDCImpl::DoDrawLines(int n, const wxPoint points[], wxCoord xoffset , wxCoord yoffset ) -{ - for ( int i = 1; i < n; i++ ) - { - DoDrawLine ( points [i-1].x + xoffset, points [i-1].y + yoffset, - points [ i ].x + xoffset, points [ i ].y + yoffset ); - } -} - -void wxSVGFileDCImpl::DoDrawPoint (wxCoord x1, wxCoord y1) -{ - wxString s; - NewGraphicsIfNeeded(); - s = wxT(" \n"); - write(s); - DoDrawLine ( x1,y1,x1,y1 ); - s = wxT(""); - write(s); -} - -void wxSVGFileDCImpl::DoDrawCheckMark(wxCoord x1, wxCoord y1, wxCoord width, wxCoord height) -{ - wxDCImpl::DoDrawCheckMark (x1,y1,width,height); -} - -void wxSVGFileDCImpl::DoDrawText(const wxString& text, wxCoord x1, wxCoord y1) -{ - DoDrawRotatedText(text, x1,y1,0.0); -} - -void wxSVGFileDCImpl::DoDrawRotatedText(const wxString& sText, wxCoord x, wxCoord y, double angle) -{ - //known bug; if the font is drawn in a scaled DC, it will not behave exactly as wxMSW - NewGraphicsIfNeeded(); - wxString s, sTmp; - - // calculate bounding box - wxCoord w, h, desc; - DoGetTextExtent(sText, &w, &h, &desc); - - double rad = wxDegToRad(angle); - - // wxT("upper left") and wxT("upper right") - CalcBoundingBox(x, y); - CalcBoundingBox((wxCoord)(x + w*cos(rad)), (wxCoord)(y - h*sin(rad))); - - // wxT("bottom left") and wxT("bottom right") - CalcBoundingBox((wxCoord)(x + h*sin(rad)), (wxCoord)(y + h*cos(rad))); - CalcBoundingBox((wxCoord)(x + h*sin(rad) + w*cos(rad)), (wxCoord)(y + h*cos(rad) - w*sin(rad))); - - if (m_backgroundMode == wxBRUSHSTYLE_SOLID) - { - // draw background first - // just like DoDrawRectangle except we pass the text color to it and set the border to a 1 pixel wide text background - - sTmp.Printf ( wxT(" "), NumStr(-angle), x,y ); - s += sTmp + wxT("\n"); - write(s); - } - - // convert x,y to SVG text x,y (the coordinates of the text baseline) - x = (wxCoord)(x + (h-desc)*sin(rad)); - y = (wxCoord)(y + (h-desc)*cos(rad)); - - //now do the text itself - s.Printf (wxT(" 0) s += wxT("style=\"font-family:") + sTmp + wxT("; "); - else s += wxT("style=\" "); - - wxString fontweight; - switch ( m_font.GetWeight() ) - { - case wxFONTWEIGHT_MAX: - wxFAIL_MSG( wxS("invalid font weight value") ); - wxFALLTHROUGH; - - case wxFONTWEIGHT_NORMAL: - fontweight = wxS("normal"); - break; - - case wxFONTWEIGHT_LIGHT: - fontweight = wxS("lighter"); - break; - - case wxFONTWEIGHT_BOLD: - fontweight = wxS("bold"); - break; - } - - wxASSERT_MSG( !fontweight.empty(), wxS("unknown font weight value") ); - - s += wxT("font-weight:") + fontweight + wxT("; "); - - wxString fontstyle; - switch ( m_font.GetStyle() ) - { - case wxFONTSTYLE_MAX: - wxFAIL_MSG( wxS("invalid font style value") ); - wxFALLTHROUGH; - - case wxFONTSTYLE_NORMAL: - fontstyle = wxS("normal"); - break; - - case wxFONTSTYLE_ITALIC: - fontstyle = wxS("italic"); - break; - - case wxFONTSTYLE_SLANT: - fontstyle = wxS("oblique"); - break; - } - - wxASSERT_MSG( !fontstyle.empty(), wxS("unknown font style value") ); - - s += wxT("font-style:") + fontstyle + wxT("; "); - - sTmp.Printf (wxT("font-size:%dpt; "), m_font.GetPointSize() ); - s += sTmp; - //text will be solid, unless alpha value isn't opaque in the foreground colour - s += wxBrushString(m_textForegroundColour) + wxPenString(m_textForegroundColour); - sTmp.Printf ( wxT("stroke-width:0;\" transform=\"rotate( %s %d %d ) \" >"), NumStr(-angle), x,y ); - s += sTmp + wxMarkupParser::Quote(sText) + wxT(" ") + wxT("\n"); - if (m_OK) - { - write(s); - } -} - -void wxSVGFileDCImpl::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) -{ - DoDrawRoundedRectangle(x, y, width, height, 0); -} - -void wxSVGFileDCImpl::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius ) - -{ - NewGraphicsIfNeeded(); - wxString s; - - s.Printf ( wxT(" \n"); - write(s); - - CalcBoundingBox(x, y); - CalcBoundingBox(x + width, y + height); -} - -void wxSVGFileDCImpl::DoDrawPolygon(int n, const wxPoint points[], - wxCoord xoffset, wxCoord yoffset, - wxPolygonFillMode fillStyle) -{ - NewGraphicsIfNeeded(); - wxString s, sTmp; - s = wxT(" \n"); - write(s); -} - -void wxSVGFileDCImpl::DoDrawEllipse (wxCoord x, wxCoord y, wxCoord width, wxCoord height) - -{ - NewGraphicsIfNeeded(); - - int rh = height /2; - int rw = width /2; - - wxString s; - s.Printf ( wxT(" \n"); - - write(s); - - CalcBoundingBox(x, y); - CalcBoundingBox(x + width, y + height); -} - -void wxSVGFileDCImpl::DoDrawArc(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCoord xc, wxCoord yc) -{ - /* Draws an arc of a circle, centred on (xc, yc), with starting point - (x1, y1) and ending at (x2, y2). The current pen is used for the outline - and the current brush for filling the shape. - - The arc is drawn in an anticlockwise direction from the start point to - the end point. - - Might be better described as Pie drawing */ - - NewGraphicsIfNeeded(); - wxString s; - - // we need the radius of the circle which has two estimates - double r1 = sqrt ( double( (x1-xc)*(x1-xc) ) + double( (y1-yc)*(y1-yc) ) ); - double r2 = sqrt ( double( (x2-xc)*(x2-xc) ) + double( (y2-yc)*(y2-yc) ) ); - - wxASSERT_MSG( (fabs ( r2-r1 ) <= 3), wxT("wxSVGFileDC::DoDrawArc Error in getting radii of circle")); - if ( fabs ( r2-r1 ) > 3 ) //pixels - { - s = wxT(" \n"); - write(s); - } - - double theta1 = atan2((double)(yc-y1),(double)(x1-xc)); - if ( theta1 < 0 ) theta1 = theta1 + M_PI * 2; - double theta2 = atan2((double)(yc-y2), (double)(x2-xc)); - if ( theta2 < 0 ) theta2 = theta2 + M_PI * 2; - if ( theta2 < theta1 ) theta2 = theta2 + M_PI *2; - - int fArc; // flag for large or small arc 0 means less than 180 degrees - if ( fabs(theta2 - theta1) > M_PI ) fArc = 1; else fArc = 0; - - int fSweep = 0; // flag for sweep always 0 - - s.Printf ( wxT(" \n"); - - - if (m_OK) - { - write(s); - } -} - -void wxSVGFileDCImpl::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea) -{ - /* - Draws an arc of an ellipse. The current pen is used for drawing the arc - and the current brush is used for drawing the pie. This function is - currently only available for X window and PostScript device contexts. - - x and y specify the x and y coordinates of the upper-left corner of the - rectangle that contains the ellipse. - - width and height specify the width and height of the rectangle that - contains the ellipse. - - start and end specify the start and end of the arc relative to the - three-o'clock position from the center of the rectangle. Angles are - specified in degrees (360 is a complete circle). Positive values mean - counter-clockwise motion. If start is equal to end, a complete ellipse - will be drawn. */ - - //known bug: SVG draws with the current pen along the radii, but this does not happen in wxMSW - - NewGraphicsIfNeeded(); - - wxString s; - //radius - double rx = w / 2; - double ry = h / 2; - // center - double xc = x + rx; - double yc = y + ry; - - double xs, ys, xe, ye; - xs = xc + rx * cos (wxDegToRad(sa)); - xe = xc + rx * cos (wxDegToRad(ea)); - ys = yc - ry * sin (wxDegToRad(sa)); - ye = yc - ry * sin (wxDegToRad(ea)); - - ///now same as circle arc... - - double theta1 = atan2(ys-yc, xs-xc); - double theta2 = atan2(ye-yc, xe-xc); - - int fArc; // flag for large or small arc 0 means less than 180 degrees - if ( (theta2 - theta1) > 0 ) fArc = 1; else fArc = 0; - - int fSweep; - if ( fabs(theta2 - theta1) > M_PI) fSweep = 1; else fSweep = 0; - - s.Printf ( wxT(" \n"); - - if (m_OK) - { - write(s); - } -} - -void wxSVGFileDCImpl::DoSetClippingRegion( int x, int y, int width, int height ) -{ - wxString svg; - - // End current graphics group to ensure proper xml nesting (e.g. so that - // graphics can be subsequently changed inside the clipping region) - svg << "\n" - "\n" - "\n" - "\n" - "\n" - "\n" - "\n"; - - write(svg); - - // Re-apply current graphics to ensure proper xml nesting - DoStartNewGraphics(); - - m_clipUniqueId++; - m_clipNestingLevel++; -} - -void wxSVGFileDCImpl::DestroyClippingRegion() -{ - wxString svg; - - // End current graphics element to ensure proper xml nesting (e.g. graphics - // might have been changed inside the clipping region) - svg << "\n"; - - // Close clipping group elements - for ( size_t i = 0; i < m_clipUniqueId; i++ ) - { - svg << ""; - } - svg << "\n"; - - write(svg); - - // Re-apply current graphics (e.g. brush may have been changed inside one - // of the clipped regions - that change will have been lost after xml - // elements for the clipped region have been closed). - DoStartNewGraphics(); - - m_clipUniqueId = 0; -} - -void wxSVGFileDCImpl::DoGetTextExtent(const wxString& string, wxCoord *w, wxCoord *h, wxCoord *descent , wxCoord *externalLeading , const wxFont *font) const - -{ - wxScreenDC sDC; - - sDC.SetFont (m_font); - if ( font != NULL ) sDC.SetFont ( *font ); - sDC.GetTextExtent(string, w, h, descent, externalLeading ); -} - -wxCoord wxSVGFileDCImpl::GetCharHeight() const -{ - wxScreenDC sDC; - sDC.SetFont (m_font); - - return sDC.GetCharHeight(); - -} - -wxCoord wxSVGFileDCImpl::GetCharWidth() const -{ - wxScreenDC sDC; - sDC.SetFont (m_font); - - return sDC.GetCharWidth(); -} - - -// ---------------------------------------------------------- -// wxSVGFileDCImpl - set functions -// ---------------------------------------------------------- - -void wxSVGFileDCImpl::SetBackground( const wxBrush &brush ) -{ - m_backgroundBrush = brush; -} - - -void wxSVGFileDCImpl::SetBackgroundMode( int mode ) -{ - m_backgroundMode = mode; -} - -void wxSVGFileDCImpl::SetBitmapHandler(wxSVGBitmapHandler* handler) -{ - delete m_bmp_handler; - m_bmp_handler = handler; -} - -void wxSVGFileDCImpl::SetBrush(const wxBrush& brush) -{ - m_brush = brush; - - m_graphics_changed = true; -} - - -void wxSVGFileDCImpl::SetPen(const wxPen& pen) -{ - // width, color, ends, joins : currently implemented - // dashes, stipple : not implemented - m_pen = pen; - - m_graphics_changed = true; -} - -void wxSVGFileDCImpl::NewGraphicsIfNeeded() -{ - if ( !m_graphics_changed ) - return; - - m_graphics_changed = false; - - write(wxS("\n")); - - DoStartNewGraphics(); -} - -void wxSVGFileDCImpl::DoStartNewGraphics() -{ - wxString s, sBrush, sPenCap, sPenJoin, sPenStyle, sLast; - - sBrush = wxS(""), - m_pen.GetWidth(), NumStr(m_logicalOriginX), NumStr(m_logicalOriginY), NumStr(m_scaleX), NumStr(m_scaleY) ); - - s = sBrush + sPenCap + sPenJoin + sPenStyle + sLast + wxT("\n"); - write(s); -} - - -void wxSVGFileDCImpl::SetFont(const wxFont& font) - -{ - m_font = font; -} - -// export a bitmap as a raster image in png -bool wxSVGFileDCImpl::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, - wxDC* source, wxCoord xsrc, wxCoord ysrc, - wxRasterOperationMode logicalFunc /*= wxCOPY*/, bool useMask /*= false*/, - wxCoord /*xsrcMask = -1*/, wxCoord /*ysrcMask = -1*/) -{ - if (logicalFunc != wxCOPY) - { - wxASSERT_MSG(false, wxT("wxSVGFileDC::DoBlit Call requested nonCopy mode; this is not possible")); - return false; - } - if (useMask != false) - { - wxASSERT_MSG(false, wxT("wxSVGFileDC::DoBlit Call requested false mask; this is not possible")); - return false; - } - wxBitmap myBitmap (width, height); - wxMemoryDC memDC; - memDC.SelectObject( myBitmap ); - memDC.Blit(0, 0, width, height, source, xsrc, ysrc); - memDC.SelectObject( wxNullBitmap ); - DoDrawBitmap(myBitmap, xdest, ydest); - return false; -} - -void wxSVGFileDCImpl::DoDrawIcon(const class wxIcon & myIcon, wxCoord x, wxCoord y) -{ - wxBitmap myBitmap (myIcon.GetWidth(), myIcon.GetHeight() ); - wxMemoryDC memDC; - memDC.SelectObject( myBitmap ); - memDC.DrawIcon(myIcon,0,0); - memDC.SelectObject( wxNullBitmap ); - DoDrawBitmap(myBitmap, x, y); -} - -void wxSVGFileDCImpl::DoDrawBitmap(const class wxBitmap & bmp, wxCoord x, wxCoord y , bool WXUNUSED(bTransparent) /*=0*/ ) -{ - NewGraphicsIfNeeded(); - - // If we don't have any bitmap handler yet, use the default one. - if ( !m_bmp_handler ) - m_bmp_handler = new wxSVGBitmapFileHandler(); - - m_bmp_handler->ProcessBitmap(bmp, x, y, *m_outfile); -} - -void wxSVGFileDCImpl::write(const wxString &s) -{ - const wxCharBuffer buf = s.utf8_str(); - m_outfile->Write(buf, strlen((const char *)buf)); - m_OK = m_outfile->IsOk(); -} - - -#ifdef __BORLANDC__ -#pragma warn .rch -#pragma warn .ccc -#endif - -#endif // wxUSE_SVG - diff --git a/Externals/wxWidgets3/src/common/debugrpt.cpp b/Externals/wxWidgets3/src/common/debugrpt.cpp deleted file mode 100644 index 4200249ccc..0000000000 --- a/Externals/wxWidgets3/src/common/debugrpt.cpp +++ /dev/null @@ -1,746 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/debugrpt.cpp -// Purpose: wxDebugReport and related classes implementation -// Author: Vadim Zeitlin -// Modified by: -// Created: 2005-01-17 -// Copyright: (c) 2005 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#ifndef WX_PRECOMP - #include "wx/app.h" - #include "wx/log.h" - #include "wx/intl.h" - #include "wx/utils.h" -#endif // WX_PRECOMP - -#if wxUSE_DEBUGREPORT && wxUSE_XML - -#include "wx/debugrpt.h" -#if wxUSE_FFILE - #include "wx/ffile.h" -#elif wxUSE_FILE - #include "wx/file.h" -#endif - -#include "wx/filename.h" -#include "wx/dir.h" -#include "wx/dynlib.h" - -#include "wx/xml/xml.h" - -#if wxUSE_STACKWALKER - #include "wx/stackwalk.h" -#endif - -#if wxUSE_CRASHREPORT - #include "wx/msw/crashrpt.h" -#endif - -#if wxUSE_ZIPSTREAM - #include "wx/wfstream.h" - #include "wx/zipstrm.h" -#endif // wxUSE_ZIPSTREAM - -WX_CHECK_BUILD_OPTIONS("wxQA") - -// ---------------------------------------------------------------------------- -// XmlStackWalker: stack walker specialization which dumps stack in XML -// ---------------------------------------------------------------------------- - -#if wxUSE_STACKWALKER - -class XmlStackWalker : public wxStackWalker -{ -public: - XmlStackWalker(wxXmlNode *nodeStack) - { - m_isOk = false; - m_nodeStack = nodeStack; - } - - bool IsOk() const { return m_isOk; } - -protected: - virtual void OnStackFrame(const wxStackFrame& frame) wxOVERRIDE; - - wxXmlNode *m_nodeStack; - bool m_isOk; -}; - -// ---------------------------------------------------------------------------- -// local functions -// ---------------------------------------------------------------------------- - -static inline void -HexProperty(wxXmlNode *node, const wxChar *name, unsigned long value) -{ - node->AddAttribute(name, wxString::Format(wxT("%08lx"), value)); -} - -static inline void -NumProperty(wxXmlNode *node, const wxChar *name, unsigned long value) -{ - node->AddAttribute(name, wxString::Format(wxT("%lu"), value)); -} - -static inline void -TextElement(wxXmlNode *node, const wxChar *name, const wxString& value) -{ - wxXmlNode *nodeChild = new wxXmlNode(wxXML_ELEMENT_NODE, name); - node->AddChild(nodeChild); - nodeChild->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, value)); -} - -#if wxUSE_CRASHREPORT && defined(__INTEL__) - -static inline void -HexElement(wxXmlNode *node, const wxChar *name, unsigned long value) -{ - TextElement(node, name, wxString::Format(wxT("%08lx"), value)); -} - -#endif // wxUSE_CRASHREPORT - -// ============================================================================ -// XmlStackWalker implementation -// ============================================================================ - -void XmlStackWalker::OnStackFrame(const wxStackFrame& frame) -{ - m_isOk = true; - - wxXmlNode *nodeFrame = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("frame")); - m_nodeStack->AddChild(nodeFrame); - - NumProperty(nodeFrame, wxT("level"), frame.GetLevel()); - wxString func = frame.GetName(); - if ( !func.empty() ) - { - nodeFrame->AddAttribute(wxT("function"), func); - HexProperty(nodeFrame, wxT("offset"), frame.GetOffset()); - } - - if ( frame.HasSourceLocation() ) - { - nodeFrame->AddAttribute(wxT("file"), frame.GetFileName()); - NumProperty(nodeFrame, wxT("line"), frame.GetLine()); - } - - const size_t nParams = frame.GetParamCount(); - if ( nParams ) - { - wxXmlNode *nodeParams = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("parameters")); - nodeFrame->AddChild(nodeParams); - - for ( size_t n = 0; n < nParams; n++ ) - { - wxXmlNode * - nodeParam = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("parameter")); - nodeParams->AddChild(nodeParam); - - NumProperty(nodeParam, wxT("number"), n); - - wxString type, name, value; - if ( !frame.GetParam(n, &type, &name, &value) ) - continue; - - if ( !type.empty() ) - TextElement(nodeParam, wxT("type"), type); - - if ( !name.empty() ) - TextElement(nodeParam, wxT("name"), name); - - if ( !value.empty() ) - TextElement(nodeParam, wxT("value"), value); - } - } -} - -#endif // wxUSE_STACKWALKER - -// ============================================================================ -// wxDebugReport implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// initialization and cleanup -// ---------------------------------------------------------------------------- - -wxDebugReport::wxDebugReport() -{ - // get a temporary directory name - wxString appname = GetReportName(); - - // we can't use CreateTempFileName() because it creates a file, not a - // directory, so do our best to create a unique name ourselves - // - // of course, this doesn't protect us against malicious users... -#if wxUSE_DATETIME - m_dir.Printf(wxT("%s%c%s_dbgrpt-%lu-%s"), - wxFileName::GetTempDir(), wxFILE_SEP_PATH, appname, - wxGetProcessId(), - wxDateTime::Now().Format(wxT("%Y%m%dT%H%M%S"))); -#else - m_dir.Printf(wxT("%s%c%s_dbgrpt-%lu"), - wxFileName::GetTempDir(), wxFILE_SEP_PATH, appname, - wxGetProcessId()); -#endif - - // as we are going to save the process state there use restrictive - // permissions - if ( !wxMkdir(m_dir, 0700) ) - { - wxLogSysError(_("Failed to create directory \"%s\""), m_dir.c_str()); - wxLogError(_("Debug report couldn't be created.")); - - Reset(); - } -} - -wxDebugReport::~wxDebugReport() -{ - if ( !m_dir.empty() ) - { - // remove all files in this directory - wxDir dir(m_dir); - wxString file; - for ( bool cont = dir.GetFirst(&file); cont; cont = dir.GetNext(&file) ) - { - if ( wxRemove(wxFileName(m_dir, file).GetFullPath()) != 0 ) - { - wxLogSysError(_("Failed to remove debug report file \"%s\""), - file.c_str()); - m_dir.clear(); - break; - } - } - } - - if ( !m_dir.empty() ) - { - if ( wxRmDir(m_dir.fn_str()) != 0 ) - { - wxLogSysError(_("Failed to clean up debug report directory \"%s\""), - m_dir.c_str()); - } - } -} - -// ---------------------------------------------------------------------------- -// various helpers -// ---------------------------------------------------------------------------- - -wxString wxDebugReport::GetReportName() const -{ - if ( wxTheApp ) - return wxTheApp->GetAppName(); - - return wxT("wx"); -} - -void -wxDebugReport::AddFile(const wxString& filename, const wxString& description) -{ - wxString name; - wxFileName fn(filename); - if ( fn.IsAbsolute() ) - { - // we need to copy the file to the debug report directory: give it the - // same name there - name = fn.GetFullName(); - - if (!wxCopyFile(fn.GetFullPath(), - wxFileName(GetDirectory(), name).GetFullPath())) - return; - } - else // file relative to the report directory - { - name = filename; - - wxASSERT_MSG( wxFileName(GetDirectory(), name).FileExists(), - wxT("file should exist in debug report directory") ); - } - - m_files.Add(name); - m_descriptions.Add(description); -} - -bool -wxDebugReport::AddText(const wxString& filename, - const wxString& text, - const wxString& description) -{ -#if wxUSE_FFILE || wxUSE_FILE - wxASSERT_MSG( !wxFileName(filename).IsAbsolute(), - wxT("filename should be relative to debug report directory") ); - - const wxString fullPath = wxFileName(GetDirectory(), filename).GetFullPath(); -#if wxUSE_FFILE - wxFFile file(fullPath, wxT("w")); -#elif wxUSE_FILE - wxFile file(fullPath, wxFile::write); -#endif - if ( !file.IsOpened() || !file.Write(text, wxConvAuto()) ) - return false; - - AddFile(filename, description); - - return true; -#else // !wxUSE_FFILE && !wxUSE_FILE - return false; -#endif -} - -void wxDebugReport::RemoveFile(const wxString& name) -{ - const int n = m_files.Index(name); - wxCHECK_RET( n != wxNOT_FOUND, wxT("No such file in wxDebugReport") ); - - m_files.RemoveAt(n); - m_descriptions.RemoveAt(n); - - wxRemove(wxFileName(GetDirectory(), name).GetFullPath()); -} - -bool wxDebugReport::GetFile(size_t n, wxString *name, wxString *desc) const -{ - if ( n >= m_files.GetCount() ) - return false; - - if ( name ) - *name = m_files[n]; - if ( desc ) - *desc = m_descriptions[n]; - - return true; -} - -void wxDebugReport::AddAll(Context context) -{ -#if wxUSE_STACKWALKER - AddContext(context); -#endif // wxUSE_STACKWALKER - -#if wxUSE_CRASHREPORT - AddDump(context); -#endif // wxUSE_CRASHREPORT - -#if !wxUSE_STACKWALKER && !wxUSE_CRASHREPORT - wxUnusedVar(context); -#endif -} - -// ---------------------------------------------------------------------------- -// adding basic text information about current context -// ---------------------------------------------------------------------------- - -#if wxUSE_STACKWALKER - -bool wxDebugReport::DoAddSystemInfo(wxXmlNode *nodeSystemInfo) -{ - nodeSystemInfo->AddAttribute(wxT("description"), wxGetOsDescription()); - - return true; -} - -bool wxDebugReport::DoAddLoadedModules(wxXmlNode *nodeModules) -{ - wxDynamicLibraryDetailsArray modules(wxDynamicLibrary::ListLoaded()); - const size_t count = modules.GetCount(); - if ( !count ) - return false; - - for ( size_t n = 0; n < count; n++ ) - { - const wxDynamicLibraryDetails& info = modules[n]; - - wxXmlNode *nodeModule = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("module")); - nodeModules->AddChild(nodeModule); - - wxString path = info.GetPath(); - if ( path.empty() ) - path = info.GetName(); - if ( !path.empty() ) - nodeModule->AddAttribute(wxT("path"), path); - - void *addr = NULL; - size_t len = 0; - if ( info.GetAddress(&addr, &len) ) - { - HexProperty(nodeModule, wxT("address"), wxPtrToUInt(addr)); - HexProperty(nodeModule, wxT("size"), len); - } - - wxString ver = info.GetVersion(); - if ( !ver.empty() ) - { - nodeModule->AddAttribute(wxT("version"), ver); - } - } - - return true; -} - -bool wxDebugReport::DoAddExceptionInfo(wxXmlNode *nodeContext) -{ -#if wxUSE_CRASHREPORT - wxCrashContext c; - if ( !c.code ) - return false; - - wxXmlNode *nodeExc = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("exception")); - nodeContext->AddChild(nodeExc); - - HexProperty(nodeExc, wxT("code"), c.code); - nodeExc->AddAttribute(wxT("name"), c.GetExceptionString()); - HexProperty(nodeExc, wxT("address"), wxPtrToUInt(c.addr)); - -#ifdef __INTEL__ - wxXmlNode *nodeRegs = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("registers")); - nodeContext->AddChild(nodeRegs); - HexElement(nodeRegs, wxT("eax"), c.regs.eax); - HexElement(nodeRegs, wxT("ebx"), c.regs.ebx); - HexElement(nodeRegs, wxT("ecx"), c.regs.edx); - HexElement(nodeRegs, wxT("edx"), c.regs.edx); - HexElement(nodeRegs, wxT("esi"), c.regs.esi); - HexElement(nodeRegs, wxT("edi"), c.regs.edi); - - HexElement(nodeRegs, wxT("ebp"), c.regs.ebp); - HexElement(nodeRegs, wxT("esp"), c.regs.esp); - HexElement(nodeRegs, wxT("eip"), c.regs.eip); - - HexElement(nodeRegs, wxT("cs"), c.regs.cs); - HexElement(nodeRegs, wxT("ds"), c.regs.ds); - HexElement(nodeRegs, wxT("es"), c.regs.es); - HexElement(nodeRegs, wxT("fs"), c.regs.fs); - HexElement(nodeRegs, wxT("gs"), c.regs.gs); - HexElement(nodeRegs, wxT("ss"), c.regs.ss); - - HexElement(nodeRegs, wxT("flags"), c.regs.flags); -#endif // __INTEL__ - - return true; -#else // !wxUSE_CRASHREPORT - wxUnusedVar(nodeContext); - - return false; -#endif // wxUSE_CRASHREPORT/!wxUSE_CRASHREPORT -} - -bool wxDebugReport::AddContext(wxDebugReport::Context ctx) -{ - wxCHECK_MSG( IsOk(), false, wxT("use IsOk() first") ); - - // create XML dump of current context - wxXmlDocument xmldoc; - wxXmlNode *nodeRoot = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("report")); - xmldoc.SetRoot(nodeRoot); - nodeRoot->AddAttribute(wxT("version"), wxT("1.0")); - nodeRoot->AddAttribute(wxT("kind"), ctx == Context_Current ? wxT("user") - : wxT("exception")); - - // add system information - wxXmlNode *nodeSystemInfo = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("system")); - if ( DoAddSystemInfo(nodeSystemInfo) ) - nodeRoot->AddChild(nodeSystemInfo); - else - delete nodeSystemInfo; - - // add information about the loaded modules - wxXmlNode *nodeModules = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("modules")); - if ( DoAddLoadedModules(nodeModules) ) - nodeRoot->AddChild(nodeModules); - else - delete nodeModules; - - // add CPU context information: this only makes sense for exceptions as our - // current context is not very interesting otherwise - if ( ctx == Context_Exception ) - { - wxXmlNode *nodeContext = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("context")); - if ( DoAddExceptionInfo(nodeContext) ) - nodeRoot->AddChild(nodeContext); - else - delete nodeContext; - } - - // add stack traceback -#if wxUSE_STACKWALKER - wxXmlNode *nodeStack = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("stack")); - XmlStackWalker sw(nodeStack); -#if wxUSE_ON_FATAL_EXCEPTION - if ( ctx == Context_Exception ) - { - sw.WalkFromException(); - } - else // Context_Current -#endif // wxUSE_ON_FATAL_EXCEPTION - { - sw.Walk(); - } - - if ( sw.IsOk() ) - nodeRoot->AddChild(nodeStack); - else - delete nodeStack; -#endif // wxUSE_STACKWALKER - - // finally let the user add any extra information he needs - DoAddCustomContext(nodeRoot); - - - // save the entire context dump in a file - wxFileName fn(m_dir, GetReportName(), wxT("xml")); - - if ( !xmldoc.Save(fn.GetFullPath()) ) - return false; - - AddFile(fn.GetFullName(), _("process context description")); - - return true; -} - -#endif // wxUSE_STACKWALKER - -// ---------------------------------------------------------------------------- -// adding core dump -// ---------------------------------------------------------------------------- - -#if wxUSE_CRASHREPORT - -bool wxDebugReport::AddDump(Context ctx) -{ - wxCHECK_MSG( IsOk(), false, wxT("use IsOk() first") ); - - wxFileName fn(m_dir, GetReportName(), wxT("dmp")); - wxCrashReport::SetFileName(fn.GetFullPath()); - - if ( !(ctx == Context_Exception ? wxCrashReport::Generate() - : wxCrashReport::GenerateNow()) ) - return false; - - AddFile(fn.GetFullName(), _("dump of the process state (binary)")); - - return true; -} - -#endif // wxUSE_CRASHREPORT - -// ---------------------------------------------------------------------------- -// report processing -// ---------------------------------------------------------------------------- - -bool wxDebugReport::Process() -{ - if ( !GetFilesCount() ) - { - wxLogError(_("Debug report generation has failed.")); - - return false; - } - - if ( !DoProcess() ) - { - wxLogError(_("Processing debug report has failed, leaving the files in \"%s\" directory."), - GetDirectory().c_str()); - - Reset(); - - return false; - } - - return true; -} - -bool wxDebugReport::DoProcess() -{ - wxString msg(_("A debug report has been generated. It can be found in")); - msg << wxT("\n") - wxT("\t") << GetDirectory() << wxT("\n\n") - << _("And includes the following files:\n"); - - wxString name, desc; - const size_t count = GetFilesCount(); - for ( size_t n = 0; n < count; n++ ) - { - GetFile(n, &name, &desc); - msg += wxString::Format("\t%s: %s\n", name, desc); - } - - msg += _("\nPlease send this report to the program maintainer, thank you!\n"); - - wxLogMessage(wxT("%s"), msg.c_str()); - - // we have to do this or the report would be deleted, and we don't even - // have any way to ask the user if he wants to keep it from here - Reset(); - - return true; -} - -// ============================================================================ -// wxDebugReport-derived classes -// ============================================================================ - -#if wxUSE_ZIPSTREAM - -// ---------------------------------------------------------------------------- -// wxDebugReportCompress -// ---------------------------------------------------------------------------- - -void wxDebugReportCompress::SetCompressedFileDirectory(const wxString& dir) -{ - wxASSERT_MSG( m_zipfile.empty(), "Too late: call this before Process()" ); - - m_zipDir = dir; -} - -void wxDebugReportCompress::SetCompressedFileBaseName(const wxString& name) -{ - wxASSERT_MSG( m_zipfile.empty(), "Too late: call this before Process()" ); - - m_zipName = name; -} - -bool wxDebugReportCompress::DoProcess() -{ -#define HAS_FILE_STREAMS (wxUSE_STREAMS && (wxUSE_FILE || wxUSE_FFILE)) -#if HAS_FILE_STREAMS - const size_t count = GetFilesCount(); - if ( !count ) - return false; - - // create the compressed report file outside of the directory with the - // report files as it will be deleted by wxDebugReport dtor but we want to - // keep this one: for this we simply treat the directory name as the name - // of the file so that its last component becomes our base name - wxFileName fn(GetDirectory()); - if ( !m_zipDir.empty() ) - fn.SetPath(m_zipDir); - if ( !m_zipName.empty() ) - fn.SetName(m_zipName); - fn.SetExt("zip"); - - // create the streams - const wxString ofullPath = fn.GetFullPath(); -#if wxUSE_FFILE - wxFFileOutputStream os(ofullPath, wxT("wb")); -#elif wxUSE_FILE - wxFileOutputStream os(ofullPath); -#endif - if ( !os.IsOk() ) - return false; - wxZipOutputStream zos(os, 9); - - // add all files to the ZIP one - wxString name, desc; - for ( size_t n = 0; n < count; n++ ) - { - GetFile(n, &name, &desc); - - wxZipEntry *ze = new wxZipEntry(name); - ze->SetComment(desc); - - if ( !zos.PutNextEntry(ze) ) - return false; - - const wxString ifullPath = wxFileName(GetDirectory(), name).GetFullPath(); -#if wxUSE_FFILE - wxFFileInputStream is(ifullPath); -#elif wxUSE_FILE - wxFileInputStream is(ifullPath); -#endif - if ( !is.IsOk() || !zos.Write(is).IsOk() ) - return false; - } - - if ( !zos.Close() ) - return false; - - m_zipfile = ofullPath; - - return true; -#else - return false; -#endif // HAS_FILE_STREAMS -} - -// ---------------------------------------------------------------------------- -// wxDebugReportUpload -// ---------------------------------------------------------------------------- - -wxDebugReportUpload::wxDebugReportUpload(const wxString& url, - const wxString& input, - const wxString& action, - const wxString& curl) - : m_uploadURL(url), - m_inputField(input), - m_curlCmd(curl) -{ - if ( m_uploadURL.Last() != wxT('/') ) - m_uploadURL += wxT('/'); - m_uploadURL += action; -} - -bool wxDebugReportUpload::DoProcess() -{ - if ( !wxDebugReportCompress::DoProcess() ) - return false; - - - wxArrayString output, errors; - int rc = wxExecute(wxString::Format - ( - wxT("%s -F \"%s=@%s\" %s"), - m_curlCmd.c_str(), - m_inputField.c_str(), - GetCompressedFileName().c_str(), - m_uploadURL.c_str() - ), - output, - errors); - if ( rc == -1 ) - { - wxLogError(_("Failed to execute curl, please install it in PATH.")); - } - else if ( rc != 0 ) - { - const size_t count = errors.GetCount(); - if ( count ) - { - for ( size_t n = 0; n < count; n++ ) - { - wxLogWarning(wxT("%s"), errors[n].c_str()); - } - } - - wxLogError(_("Failed to upload the debug report (error code %d)."), rc); - } - else // rc == 0 - { - if ( OnServerReply(output) ) - return true; - } - - return false; -} - -#endif // wxUSE_ZIPSTREAM - -#endif // wxUSE_DEBUGREPORT diff --git a/Externals/wxWidgets3/src/common/descrip.mms b/Externals/wxWidgets3/src/common/descrip.mms deleted file mode 100644 index 122ef1ccb6..0000000000 --- a/Externals/wxWidgets3/src/common/descrip.mms +++ /dev/null @@ -1,724 +0,0 @@ -#***************************************************************************** -# * -# Make file for VMS * -# Author : J.Jansen (joukj@hrem.nano.tudelft.nl) * -# Date : 25 February 2016 * -# * -#***************************************************************************** -.first - define wx [--.include.wx] - -.ifdef __WXMOTIF__ -CXX_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)\ - /assume=(nostdnew,noglobal_array_new)/incl=[-.regex] -CC_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)/incl=[-.regex] -.else -.ifdef __WXGTK__ -CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm\ - /assume=(nostdnew,noglobal_array_new)/incl=[-.regex] -CC_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm\ - /incl=[-.regex] -.else -.ifdef __WXGTK2__ -CXX_DEFINE = /define=(__WXGTK__=1,VMS_GTK2=1)/float=ieee/name=(as_is,short)/ieee=denorm\ - /assume=(nostdnew,noglobal_array_new)/incl=[-.regex] -CC_DEFINE = /define=(__WXGTK__=1,VMS_GTK2=1)/float=ieee/name=(as_is,short)\ - /ieee=denorm/incl=[-.regex] -.else -.ifdef __WXX11__ -CXX_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\ - /name=(as_is,short)/assume=(nostdnew,noglobal_array_new)/incl=[-.regex] -CC_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\ - /name=(as_is,short)/incl=[-.regex] -.else -CXX_DEFINE = -CC_DEFINE = -.endif -.endif -.endif -.endif - -YACC=bison/yacc - -SED=gsed - -LEX=flex - -.suffixes : .cpp - -.cpp.obj : - cxx /object=$(MMS$TARGET_NAME).obj $(CXX_DEFINE) $(MMS$TARGET_NAME).cpp -.c.obj : - cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c - -OBJECTS = \ - accelcmn.obj,\ - anidecod.obj,\ - animatecmn.obj,\ - appbase.obj,\ - appcmn.obj,\ - arrstr.obj,\ - artprov.obj,\ - artstd.obj,\ - base64.obj,\ - bmpbase.obj,\ - btncmn.obj,\ - bmpcboxcmn.obj,\ - bookctrl.obj,\ - calctrlcmn.obj,\ - choiccmn.obj,\ - clipcmn.obj,\ - clntdata.obj,\ - cmdline.obj,\ - cmdproc.obj,\ - cmndata.obj,\ - config.obj,\ - containr.obj,\ - convauto.obj,\ - colourcmn.obj,\ - cshelp.obj,\ - ctrlcmn.obj,\ - ctrlsub.obj,\ - datetime.obj,\ - datstrm.obj,\ - dcbase.obj,\ - dcbufcmn.obj,\ - dircmn.obj,\ - dlgcmn.obj,\ - dobjcmn.obj,\ - docmdi.obj,\ - docview.obj,\ - dpycmn.obj,\ - dynarray.obj,\ - dynlib.obj,\ - encconv.obj,\ - event.obj,\ - evtloopcmn.obj,\ - extended.obj,\ - fddlgcmn.obj,\ - ffile.obj,\ - file.obj,\ - fileback.obj,\ - fileconf.obj,\ - filename.obj,\ - filefn.obj,\ - filesys.obj,\ - filectrlcmn.obj,\ - fldlgcmn.obj,\ - fmapbase.obj,\ - fontcmn.obj,\ - fontenumcmn.obj,\ - fontmap.obj,\ - framecmn.obj - -OBJECTS1=fs_inet.obj,\ - ftp.obj,\ - gaugecmn.obj,\ - gbsizer.obj,\ - gdicmn.obj,\ - gifdecod.obj,\ - hash.obj,\ - hashmap.obj,\ - helpbase.obj,\ - http.obj,\ - hyperlnkcmn.obj,\ - iconbndl.obj,\ - init.obj,\ - imagall.obj,\ - imagbmp.obj,\ - image.obj,\ - imagfill.obj,\ - imaggif.obj,\ - imagiff.obj,\ - imagjpeg.obj,\ - imagpcx.obj,\ - imagpng.obj,\ - imagpnm.obj,\ - imagtga.obj,\ - imagtiff.obj,\ - imagxpm.obj,\ - intl.obj,\ - ipcbase.obj,\ - layout.obj,\ - lboxcmn.obj,\ - list.obj,\ - log.obj,\ - longlong.obj,\ - memory.obj,\ - menucmn.obj,\ - mimecmn.obj,\ - module.obj,\ - msgout.obj,\ - mstream.obj,\ - nbkbase.obj,\ - object.obj,\ - paper.obj,\ - platinfo.obj,\ - popupcmn.obj,\ - prntbase.obj,\ - process.obj,\ - protocol.obj,\ - quantize.obj,\ - radiocmn.obj,\ - rendcmn.obj,\ - sckaddr.obj,\ - sckfile.obj,\ - sckipc.obj,\ - sckstrm.obj,\ - sizer.obj,\ - socket.obj,\ - settcmn.obj,\ - statbar.obj,\ - stattextcmn.obj,\ - stdpbase.obj,\ - stockitem.obj,\ - stopwatch.obj,\ - strconv.obj,\ - stream.obj,\ - string.obj,\ - stringimpl.obj,\ - strvararg.obj,\ - sysopt.obj - -OBJECTS2=tbarbase.obj,srchcmn.obj,\ - textbuf.obj,\ - textcmn.obj,\ - textfile.obj,\ - textentrycmn.obj,\ - timercmn.obj,\ - timerimpl.obj,\ - tokenzr.obj,\ - toplvcmn.obj,\ - treebase.obj,\ - txtstrm.obj,\ - url.obj,\ - utilscmn.obj,\ - rgncmn.obj,\ - unichar.obj,\ - uri.obj,\ - valgen.obj,\ - validate.obj,\ - valtext.obj,\ - variant.obj,\ - wfstream.obj,\ - wincmn.obj,\ - wxcrt.obj,\ - xpmdecod.obj,\ - zipstrm.obj,\ - zstream.obj,\ - clrpickercmn.obj,\ - filepickercmn.obj,\ - fontpickercmn.obj,\ - pickerbase.obj - -OBJECTS3=listctrlcmn.obj,socketiohandler.obj,fdiodispatcher.obj,\ - selectdispatcher.obj,overlaycmn.obj,windowid.obj,sstream.obj,\ - wrapsizer.obj,headerctrlcmn.obj,headercolcmn.obj,\ - rearrangectrl.obj,spinctrlcmn.obj,datetimefmt.obj,xlocale.obj,\ - regex.obj,any.obj,archive.obj,fs_arc.obj,arcall.obj,\ - arcfind.obj,tarstrm.obj,datavcmn.obj,debugrpt.obj,\ - translation.obj,languageinfo.obj,filehistorycmn.obj,\ - stdstream.obj,uiactioncmn.obj,arttango.obj,mediactrlcmn.obj,\ - panelcmn.obj,checkboxcmn.obj,statboxcmn.obj,slidercmn.obj,\ - statlinecmn.obj,radiobtncmn.obj,bmpbtncmn.obj,checklstcmn.obj,\ - statbmpcmn.obj,dirctrlcmn.obj,gridcmn.obj,odcombocmn.obj,\ - spinbtncmn.obj,scrolbarcmn.obj,colourdata.obj,fontdata.obj,\ - valnum.obj,numformatter.obj,markupparser.obj,\ - affinematrix2d.obj,richtooltipcmn.obj,persist.obj,time.obj,\ - textmeasurecmn.obj,modalhook.obj,threadinfo.obj,\ - addremovectrl.obj,notifmsgcmn.obj - -OBJECTS_MOTIF=radiocmn.obj,combocmn.obj - -OBJECTS_X11=accesscmn.obj,dndcmn.obj,dpycmn.obj,dseldlg.obj,\ - dynload.obj,effects.obj,fddlgcmn.obj,fs_mem.obj,\ - gbsizer.obj,geometry.obj,matrix.obj,radiocmn.obj,\ - taskbarcmn.obj,xti.obj,xtistrm.obj,xtixml.obj,\ - combocmn.obj - - -OBJECTS_GTK2=fontutilcmn.obj,cairo.obj - -SOURCES = \ - accelcmn.cpp,\ - anidecod.cpp,\ - animatecmn.cpp,\ - any.cpp,\ - appbase.cpp,\ - appcmn.cpp,\ - arrstr.cpp,\ - artprov.cpp,\ - artstd.cpp,\ - base64.cpp,\ - bmpbase.cpp,\ - btncmn.cpp,\ - bmpcboxcmn.cpp,\ - bookctrl.cpp,\ - calctrlcmn.cpp,\ - cairo.cpp,\ - choiccmn.cpp,\ - clipcmn.cpp,\ - clntdata.cpp,\ - cmdline.cpp,\ - cmdproc.cpp,\ - cmndata.cpp,\ - config.cpp,\ - containr.cpp,\ - convauto.cpp,\ - colourcmn.cpp,\ - cshelp.cpp,\ - ctrlcmn.cpp,\ - ctrlsub.cpp,\ - datetime.cpp,\ - datstrm.cpp,\ - dcbase.cpp,\ - dcbufcmn.cpp,\ - dircmn.cpp,\ - dlgcmn.cpp,\ - dobjcmn.cpp,\ - docmdi.cpp,\ - docview.cpp,\ - dpycmn.cpp,\ - dynarray.cpp,\ - dynlib.cpp,\ - encconv.cpp,\ - event.cpp,\ - evtloopcmn.cpp,\ - extended.c,\ - ffile.cpp,\ - fddlgcmn.cpp,\ - fdiodispatcher.cpp,\ - file.cpp,\ - fileback.cpp,\ - fileconf.cpp,\ - filename.cpp,\ - filefn.cpp,\ - filesys.cpp,\ - filectrlcmn.cpp,\ - fldlgcmn.cpp,\ - fmapbase.cpp,\ - fontcmn.cpp,\ - fontenumcmn.cpp,\ - fontmap.cpp,\ - fontutilcmn.cpp,\ - framecmn.cpp,\ - fs_inet.cpp,\ - ftp.cpp,\ - gaugecmn.cpp,\ - gbsizer.cpp,\ - gdicmn.cpp,\ - gifdecod.cpp,\ - socketiohandler.cpp,\ - hash.cpp,\ - hashmap.cpp,\ - helpbase.cpp,\ - http.cpp,\ - hyperlnkcmn.cpp,\ - iconbndl.cpp,\ - init.cpp,\ - imagall.cpp,\ - imagbmp.cpp,\ - image.cpp,\ - imagfill.cpp,\ - imaggif.cpp,\ - imagiff.cpp,\ - imagjpeg.cpp,\ - imagpcx.cpp,\ - imagpng.cpp,\ - imagpnm.cpp,\ - imagtga.cpp,\ - imagtiff.cpp,\ - imagxpm.cpp,\ - intl.cpp,\ - ipcbase.cpp,\ - layout.cpp,\ - lboxcmn.cpp,\ - list.cpp,\ - listctrlcmn.cpp,\ - log.cpp,\ - longlong.cpp,\ - memory.cpp,\ - menucmn.cpp,\ - mimecmn.cpp,\ - module.cpp,\ - msgout.cpp,\ - mstream.cpp,\ - nbkbase.cpp,\ - object.cpp,\ - overlaycmn.cpp,\ - paper.cpp,\ - platinfo.cpp,\ - popupcmn.cpp,\ - prntbase.cpp,\ - process.cpp,\ - protocol.cpp,\ - quantize.cpp,\ - radiocmn.cpp,\ - rendcmn.cpp,\ - rgncmn.cpp,\ - sckaddr.cpp,\ - sckfile.cpp,\ - sckipc.cpp,\ - sckstrm.cpp,\ - sizer.cpp,\ - socket.cpp,\ - selectdispatcher.cpp,\ - settcmn.cpp,\ - sstream.cpp,\ - statbar.cpp,\ - stattextcmn.cpp,\ - stdpbase.cpp,\ - stockitem.cpp,\ - stopwatch.cpp,\ - srchcmn.cpp,\ - strconv.cpp,\ - stream.cpp,\ - strvararg.cpp,\ - sysopt.cpp,\ - string.cpp,\ - stringimpl.cpp,\ - tbarbase.cpp,\ - textbuf.cpp,\ - textcmn.cpp,\ - textfile.cpp,\ - textentrycmn.cpp,\ - timercmn.cpp,\ - timerimpl.cpp,\ - tokenzr.cpp,\ - toplvcmn.cpp,\ - treebase.cpp,\ - txtstrm.cpp,\ - unichar.cpp,\ - url.cpp,\ - utilscmn.cpp,\ - valgen.cpp,\ - validate.cpp,\ - valtext.cpp,\ - variant.cpp,\ - wfstream.cpp,\ - wincmn.cpp,\ - wxcrt.cpp,\ - xpmdecod.cpp,\ - zipstrm.cpp,\ - zstream.cpp,\ - clrpickercmn.cpp,\ - filepickercmn.cpp,\ - fontpickercmn.cpp,\ - pickerbase.cpp,\ - accesscmn.cpp,\ - dndcmn.cpp,\ - dpycmn.cpp,\ - dseldlg.cpp,\ - dynload.cpp,\ - effects.cpp,\ - fddlgcmn.cpp,\ - fs_mem.cpp,\ - gbsizer.cpp,\ - geometry.cpp,\ - matrix.cpp,\ - radiocmn.cpp,\ - regex.cpp,\ - taskbarcmn.cpp,\ - uri.cpp,\ - xti.cpp,\ - xtistrm.cpp,\ - xtixml.cpp,\ - wrapsizer.cpp,archive.cpp,fs_arc.cpp,arcall.cpp,arcfind.cpp,\ - tarstrm.cpp,datavcmn.cpp,debugrpt.cpp,uiactioncmn.cpp,\ - arttango.cpp,mediactrlcmn.cpp,panelcmn.cpp,checkboxcmn.cpp,\ - statboxcmn.cpp,slidercmn.cpp,statlinecmn.cpp,radiobtncmn.cpp,\ - bmpbtncmn.cpp,checklstcmn.cpp,statbmpcmn.cpp,dirctrlcmn.cpp,\ - gridcmn.cpp,odcombocmn.cpp,spinbtncmn.cpp,scrolbarcmn.cpp,\ - colourdata.cpp,fontdata.cpp affinematrix2d.cpp\ - richtooltipcmn.cpp persist.cpp time.cpp textmeasurecmn.cpp \ - modalhook.cpp - -all : $(SOURCES) - $(MMS)$(MMSQUALIFIERS) $(OBJECTS) - $(MMS)$(MMSQUALIFIERS) $(OBJECTS1) - $(MMS)$(MMSQUALIFIERS) $(OBJECTS2) - $(MMS)$(MMSQUALIFIERS) $(OBJECTS3) -.ifdef __WXMOTIF__ - $(MMS)$(MMSQUALIFIERS) $(OBJECTS_MOTIF) - library [--.lib]libwx_motif.olb $(OBJECTS) - library [--.lib]libwx_motif.olb $(OBJECTS1) - library [--.lib]libwx_motif.olb $(OBJECTS2) - library [--.lib]libwx_motif.olb $(OBJECTS3) - library [--.lib]libwx_motif.olb $(OBJECTS_MOTIF) -.else -.ifdef __WXGTK__ - $(MMS)$(MMSQUALIFIERS) $(OBJECTS_X11) - library [--.lib]libwx_gtk.olb $(OBJECTS) - library [--.lib]libwx_gtk.olb $(OBJECTS1) - library [--.lib]libwx_gtk.olb $(OBJECTS2) - library [--.lib]libwx_gtk.olb $(OBJECTS3) - library [--.lib]libwx_gtk.olb $(OBJECTS_X11) -.else -.ifdef __WXGTK2__ - $(MMS)$(MMSQUALIFIERS) $(OBJECTS_X11) - $(MMS)$(MMSQUALIFIERS) $(OBJECTS_GTK2) - library [--.lib]libwx_gtk2.olb $(OBJECTS) - library [--.lib]libwx_gtk2.olb $(OBJECTS1) - library [--.lib]libwx_gtk2.olb $(OBJECTS2) - library [--.lib]libwx_gtk2.olb $(OBJECTS3) - library [--.lib]libwx_gtk2.olb $(OBJECTS_X11) - library [--.lib]libwx_gtk2.olb $(OBJECTS_GTK2) -.else -.ifdef __WXX11__ - $(MMS)$(MMSQUALIFIERS) $(OBJECTS_X11) - library [--.lib]libwx_x11_univ.olb $(OBJECTS) - library [--.lib]libwx_x11_univ.olb $(OBJECTS1) - library [--.lib]libwx_x11_univ.olb $(OBJECTS2) - library [--.lib]libwx_x11_univ.olb $(OBJECTS3) - library [--.lib]libwx_x11_univ.olb $(OBJECTS_X11) -.endif -.endif -.endif -.endif - -$(OBJECTS) : [--.include.wx]setup.h -$(OBJECTS1) : [--.include.wx]setup.h -$(OBJECTS2) : [--.include.wx]setup.h -$(OBJECTS3) : [--.include.wx]setup.h -$(OBJECTS_X11) : [--.include.wx]setup.h -$(OBJECTS_GTK2) : [--.include.wx]setup.h -$(OBJECTS_MOTIF) : [--.include.wx]setup.h - -accelcmn.obj : accelcmn.cpp -anidecod.obj : anidecod.cpp -animatecmn.obj : animatecmn.cpp -any.obj : any.cpp -appbase.obj : appbase.cpp -appcmn.obj : appcmn.cpp -arrstr.obj : arrstr.cpp -artprov.obj : artprov.cpp -artstd.obj : artstd.cpp -base64.obj : base64.cpp -bmpbase.obj : bmpbase.cpp -btncmn.obj : btncmn.cpp -bmpcboxcmn.obj : bmpcboxcmn.cpp -bookctrl.obj : bookctrl.cpp -choiccmn.obj : choiccmn.cpp -clipcmn.obj : clipcmn.cpp -clntdata.obj : clntdata.cpp -cmdline.obj : cmdline.cpp -cmdproc.obj : cmdproc.cpp -cmndata.obj : cmndata.cpp -config.obj : config.cpp -containr.obj : containr.cpp -convauto.obj : convauto.cpp -colourcmn.obj : colourcmn.cpp -cshelp.obj : cshelp.cpp -ctrlcmn.obj : ctrlcmn.cpp -ctrlsub.obj : ctrlsub.cpp -datetime.obj : datetime.cpp -datstrm.obj : datstrm.cpp -dcbase.obj : dcbase.cpp -dcbufcmn.obj : dcbufcmn.cpp -dircmn.obj : dircmn.cpp -dlgcmn.obj : dlgcmn.cpp -dobjcmn.obj : dobjcmn.cpp -docmdi.obj : docmdi.cpp -docview.obj : docview.cpp -dynarray.obj : dynarray.cpp -dynlib.obj : dynlib.cpp -encconv.obj : encconv.cpp -event.obj : event.cpp -evtloopcmn.obj : evtloopcmn.cpp -extended.obj : extended.c -ffile.obj : ffile.cpp -fddlgcmn.obj : fddlgcmn.cpp -fdiodispatcher.obj : fdiodispatcher.cpp -file.obj : file.cpp -fileback.obj : fileback.cpp -fileconf.obj : fileconf.cpp -filefn.obj : filefn.cpp -filename.obj : filename.cpp -filesys.obj : filesys.cpp -fldlgcmn.obj : fldlgcmn.cpp -fmapbase.obj : fmapbase.cpp -fontcmn.obj : fontcmn.cpp -fontenumcmn.obj : fontenumcmn.cpp -fontmap.obj : fontmap.cpp -fontutilcmn.obj : fontutilcmn.cpp -framecmn.obj : framecmn.cpp -fs_inet.obj : fs_inet.cpp -ftp.obj : ftp.cpp -gaugecmn.obj : gaugecmn.cpp -gbsizer.obj : gbsizer.cpp -gdicmn.obj : gdicmn.cpp -gifdecod.obj : gifdecod.cpp -socketiohandler.obj : socketiohandler.cpp -hash.obj : hash.cpp -hashmap.obj : hashmap.cpp -helpbase.obj : helpbase.cpp -http.obj : http.cpp - cxx$(CXX_DEFINE)/warn=disable=(UNSCOMZER)/obj=http.obj \ - http.cpp -hyperlnkcmn.obj : hyperlnkcmn.cpp -iconbndl.obj : iconbndl.cpp -init.obj : init.cpp -imagall.obj : imagall.cpp -imagbmp.obj : imagbmp.cpp -image.obj : image.cpp -imagfill.obj : imagfill.cpp -imaggif.obj : imaggif.cpp -imagiff.obj : imagiff.cpp -imagjpeg.obj : imagjpeg.cpp -imagpcx.obj : imagpcx.cpp -imagpng.obj : imagpng.cpp -imagpnm.obj : imagpnm.cpp -imagtga.obj : imagtga.cpp -imagtiff.obj : imagtiff.cpp -imagxpm.obj : imagxpm.cpp -intl.obj : intl.cpp -ipcbase.obj : ipcbase.cpp -layout.obj : layout.cpp -lboxcmn.obj : lboxcmn.cpp -list.obj : list.cpp -log.obj : log.cpp -longlong.obj : longlong.cpp -memory.obj : memory.cpp -menucmn.obj : menucmn.cpp -mimecmn.obj : mimecmn.cpp -module.obj : module.cpp -msgout.obj : msgout.cpp -mstream.obj : mstream.cpp -nbkbase.obj : nbkbase.cpp -object.obj : object.cpp -paper.obj : paper.cpp -platinfo.obj : platinfo.cpp -popupcmn.obj : popupcmn.cpp -prntbase.obj : prntbase.cpp -process.obj : process.cpp - cxx /object=process.obj$(CXX_DEFINE)/warn=disable=(UNSCOMZER) process.cpp -protocol.obj : protocol.cpp -quantize.obj : quantize.cpp -radiocmn.obj : radiocmn.cpp -rendcmn.obj : rendcmn.cpp -rgncmn.obj : rgncmn.cpp -sckaddr.obj : sckaddr.cpp -sckfile.obj : sckfile.cpp -sckipc.obj : sckipc.cpp -sckstrm.obj : sckstrm.cpp -selectdispatcher.obj : selectdispatcher.cpp -sizer.obj : sizer.cpp -socket.obj : socket.cpp -settcmn.obj : settcmn.cpp -statbar.obj : statbar.cpp -stattextcmn.obj : stattextcmn.cpp -stdpbase.obj : stdpbase.cpp -stockitem.obj : stockitem.cpp -stopwatch.obj : stopwatch.cpp -strconv.obj : strconv.cpp -stream.obj : stream.cpp -strvararg.obj : strvararg.cpp -sysopt.obj : sysopt.cpp -string.obj : string.cpp -stringimpl.obj : stringimpl.cpp -tbarbase.obj : tbarbase.cpp -textbuf.obj : textbuf.cpp -textcmn.obj : textcmn.cpp -textfile.obj : textfile.cpp -timercmn.obj : timercmn.cpp -timerimpl.obj : timerimpl.cpp -tokenzr.obj : tokenzr.cpp -toplvcmn.obj : toplvcmn.cpp -treebase.obj : treebase.cpp -txtstrm.obj : txtstrm.cpp -unichar.obj : unichar.cpp -url.obj : url.cpp -utilscmn.obj : utilscmn.cpp -valgen.obj : valgen.cpp -validate.obj : validate.cpp -valtext.obj : valtext.cpp -variant.obj : variant.cpp -wfstream.obj : wfstream.cpp -wincmn.obj : wincmn.cpp -wxcrt.obj : wxcrt.cpp -xpmdecod.obj : xpmdecod.cpp -zipstrm.obj : zipstrm.cpp -zstream.obj : zstream.cpp -accesscmn.obj : accesscmn.cpp -dndcmn.obj : dndcmn.cpp -dpycmn.obj : dpycmn.cpp -dseldlg.obj : dseldlg.cpp -dynload.obj : dynload.cpp -effects.obj : effects.cpp -fddlgcmn.obj : fddlgcmn.cpp -fs_mem.obj : fs_mem.cpp -gbsizer.obj : gbsizer.cpp -geometry.obj : geometry.cpp -matrix.obj : matrix.cpp -radiocmn.obj : radiocmn.cpp -regex.obj : regex.cpp -taskbarcmn.obj : taskbarcmn.cpp -xti.obj : xti.cpp -xtistrm.obj : xtistrm.cpp -xtixml.obj : xtixml.cpp -uri.obj : uri.cpp -dpycmn.obj : dpycmn.cpp -combocmn.obj : combocmn.cpp -clrpickercmn.obj : clrpickercmn.cpp -filepickercmn.obj : filepickercmn.cpp -fontpickercmn.obj : fontpickercmn.cpp -pickerbase.obj : pickerbase.cpp -listctrlcmn.obj : listctrlcmn.cpp -srchcmn.obj : srchcmn.cpp -textentrycmn.obj : textentrycmn.cpp -filectrlcmn.obj : filectrlcmn.cpp -cairo.obj : cairo.cpp - cxx$(CXX_DEFINE)/obj=cairo.obj cairo.cpp -overlaycmn.obj : overlaycmn.cpp -windowid.obj : windowid.cpp -calctrlcmn.obj : calctrlcmn.cpp -sstream.obj : sstream.cpp -wrapsizer.obj : wrapsizer.cpp -headerctrlcmn.obj : headerctrlcmn.cpp -headercolcmn.obj : headercolcmn.cpp -rearrangectrl.obj : rearrangectrl.cpp -spinctrlcmn.obj : spinctrlcmn.cpp -datetimefmt.obj : datetimefmt.cpp -xlocale.obj : xlocale.cpp -archive.obj : archive.cpp -fs_arc.obj : fs_arc.cpp -arcall.obj : arcall.cpp -arcfind.obj : arcfind.cpp -tarstrm.obj : tarstrm.cpp -datavcmn.obj : datavcmn.cpp -debugrpt.obj : debugrpt.cpp -translation.obj : translation.cpp -languageinfo.obj : languageinfo.cpp -filehistorycmn.obj : filehistorycmn.cpp -stdstream.obj : stdstream.cpp -uiactioncmn.obj : uiactioncmn.cpp -arttango.obj : arttango.cpp -mediactrlcmn.obj : mediactrlcmn.cpp -panelcmn.obj : panelcmn.cpp -checkboxcmn.obj : checkboxcmn.cpp -statboxcmn.obj : statboxcmn.cpp -slidercmn.obj : slidercmn.cpp -statlinecmn.obj : statlinecmn.cpp -radiobtncmn.obj : radiobtncmn.cpp -bmpbtncmn.obj : bmpbtncmn.cpp -checklstcmn.obj : checklstcmn.cpp -statbmpcmn.obj : statbmpcmn.cpp -dirctrlcmn.obj : dirctrlcmn.cpp -gridcmn.obj : gridcmn.cpp -odcombocmn.obj : odcombocmn.cpp -spinbtncmn.obj : spinbtncmn.cpp -scrolbarcmn.obj : scrolbarcmn.cpp -colourdata.obj : colourdata.cpp -fontdata.obj : fontdata.cpp -valnum.obj : valnum.cpp -numformatter.obj : numformatter.cpp -markupparser.obj : markupparser.cpp -affinematrix2d.obj : affinematrix2d.cpp -richtooltipcmn.obj : richtooltipcmn.cpp -persist.obj : persist.cpp -time.obj : time.cpp -textmeasurecmn.obj : textmeasurecmn.cpp -modalhook.obj : modalhook.cpp -threadinfo.obj : threadinfo.cpp -addremovectrl.obj : addremovectrl.cpp -notifmsgcmn.obj : notifmsgcmn.cpp diff --git a/Externals/wxWidgets3/src/common/dircmn.cpp b/Externals/wxWidgets3/src/common/dircmn.cpp deleted file mode 100644 index 45b95cb18f..0000000000 --- a/Externals/wxWidgets3/src/common/dircmn.cpp +++ /dev/null @@ -1,404 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/dircmn.cpp -// Purpose: wxDir methods common to all implementations -// Author: Vadim Zeitlin -// Modified by: -// Created: 19.05.01 -// Copyright: (c) 2001 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#ifndef WX_PRECOMP - #include "wx/string.h" - #include "wx/log.h" - #include "wx/intl.h" - #include "wx/filefn.h" - #include "wx/arrstr.h" -#endif //WX_PRECOMP - -#include "wx/dir.h" -#include "wx/filename.h" - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxDirTraverser -// ---------------------------------------------------------------------------- - -wxDirTraverseResult -wxDirTraverser::OnOpenError(const wxString& WXUNUSED(dirname)) -{ - return wxDIR_IGNORE; -} - -// ---------------------------------------------------------------------------- -// wxDir::HasFiles() and HasSubDirs() -// ---------------------------------------------------------------------------- - -// dumb generic implementation - -bool wxDir::HasFiles(const wxString& spec) const -{ - wxString s; - return GetFirst(&s, spec, wxDIR_FILES | wxDIR_HIDDEN); -} - -// we have a (much) faster version for Unix -#if (defined(__CYGWIN__) && defined(__WINDOWS__)) || !defined(__UNIX_LIKE__) || defined(__WINE__) - -bool wxDir::HasSubDirs(const wxString& spec) const -{ - wxString s; - return GetFirst(&s, spec, wxDIR_DIRS | wxDIR_HIDDEN); -} - -#endif // !Unix - -// ---------------------------------------------------------------------------- -// wxDir::GetNameWithSep() -// ---------------------------------------------------------------------------- - -wxString wxDir::GetNameWithSep() const -{ - // Note that for historical reasons (i.e. because GetName() was there - // first) we implement this one in terms of GetName() even though it might - // actually make more sense to reverse this logic. - - wxString name = GetName(); - if ( !name.empty() ) - { - // Notice that even though GetName() isn't supposed to return the - // separator, it can still be present for the root directory name. - if ( name.Last() != wxFILE_SEP_PATH ) - name += wxFILE_SEP_PATH; - } - - return name; -} - -// ---------------------------------------------------------------------------- -// wxDir::Traverse() -// ---------------------------------------------------------------------------- - -size_t wxDir::Traverse(wxDirTraverser& sink, - const wxString& filespec, - int flags) const -{ - wxCHECK_MSG( IsOpened(), (size_t)-1, - wxT("dir must be opened before traversing it") ); - - // the total number of files found - size_t nFiles = 0; - - // the name of this dir with path delimiter at the end - const wxString prefix = GetNameWithSep(); - - // first, recurse into subdirs - if ( flags & wxDIR_DIRS ) - { - wxString dirname; - for ( bool cont = GetFirst(&dirname, wxEmptyString, - (flags & ~(wxDIR_FILES | wxDIR_DOTDOT)) - | wxDIR_DIRS); - cont; - cont = cont && GetNext(&dirname) ) - { - const wxString fulldirname = prefix + dirname; - - switch ( sink.OnDir(fulldirname) ) - { - default: - wxFAIL_MSG(wxT("unexpected OnDir() return value") ); - wxFALLTHROUGH; - - case wxDIR_STOP: - cont = false; - break; - - case wxDIR_CONTINUE: - { - wxDir subdir; - - // don't give the error messages for the directories - // which we can't open: there can be all sorts of good - // reason for this (e.g. insufficient privileges) and - // this shouldn't be treated as an error -- instead - // let the user code decide what to do - bool ok; - do - { - wxLogNull noLog; - ok = subdir.Open(fulldirname); - if ( !ok ) - { - // ask the user code what to do - bool tryagain; - switch ( sink.OnOpenError(fulldirname) ) - { - default: - wxFAIL_MSG(wxT("unexpected OnOpenError() return value") ); - wxFALLTHROUGH; - - case wxDIR_STOP: - cont = false; - wxFALLTHROUGH; - - case wxDIR_IGNORE: - tryagain = false; - break; - - case wxDIR_CONTINUE: - tryagain = true; - } - - if ( !tryagain ) - break; - } - } - while ( !ok ); - - if ( ok ) - { - nFiles += subdir.Traverse(sink, filespec, flags); - } - } - break; - - case wxDIR_IGNORE: - // nothing to do - ; - } - } - } - - // now enum our own files - if ( flags & wxDIR_FILES ) - { - flags &= ~wxDIR_DIRS; - - wxString filename; - bool cont = GetFirst(&filename, filespec, flags); - while ( cont ) - { - wxDirTraverseResult res = sink.OnFile(prefix + filename); - if ( res == wxDIR_STOP ) - break; - - wxASSERT_MSG( res == wxDIR_CONTINUE, - wxT("unexpected OnFile() return value") ); - - nFiles++; - - cont = GetNext(&filename); - } - } - - return nFiles; -} - -// ---------------------------------------------------------------------------- -// wxDir::GetAllFiles() -// ---------------------------------------------------------------------------- - -class wxDirTraverserSimple : public wxDirTraverser -{ -public: - wxDirTraverserSimple(wxArrayString& files) : m_files(files) { } - - virtual wxDirTraverseResult OnFile(const wxString& filename) wxOVERRIDE - { - m_files.push_back(filename); - return wxDIR_CONTINUE; - } - - virtual wxDirTraverseResult OnDir(const wxString& WXUNUSED(dirname)) wxOVERRIDE - { - return wxDIR_CONTINUE; - } - -private: - wxArrayString& m_files; - - wxDECLARE_NO_COPY_CLASS(wxDirTraverserSimple); -}; - -/* static */ -size_t wxDir::GetAllFiles(const wxString& dirname, - wxArrayString *files, - const wxString& filespec, - int flags) -{ - wxCHECK_MSG( files, (size_t)-1, wxT("NULL pointer in wxDir::GetAllFiles") ); - - size_t nFiles = 0; - - wxDir dir(dirname); - if ( dir.IsOpened() ) - { - wxDirTraverserSimple traverser(*files); - - nFiles += dir.Traverse(traverser, filespec, flags); - } - - return nFiles; -} - -// ---------------------------------------------------------------------------- -// wxDir::FindFirst() -// ---------------------------------------------------------------------------- - -class wxDirTraverserFindFirst : public wxDirTraverser -{ -public: - wxDirTraverserFindFirst() { } - - virtual wxDirTraverseResult OnFile(const wxString& filename) wxOVERRIDE - { - m_file = filename; - return wxDIR_STOP; - } - - virtual wxDirTraverseResult OnDir(const wxString& WXUNUSED(dirname)) wxOVERRIDE - { - return wxDIR_CONTINUE; - } - - const wxString& GetFile() const - { - return m_file; - } - -private: - wxString m_file; - - wxDECLARE_NO_COPY_CLASS(wxDirTraverserFindFirst); -}; - -/* static */ -wxString wxDir::FindFirst(const wxString& dirname, - const wxString& filespec, - int flags) -{ - wxDir dir(dirname); - if ( dir.IsOpened() ) - { - wxDirTraverserFindFirst traverser; - - dir.Traverse(traverser, filespec, flags | wxDIR_FILES); - return traverser.GetFile(); - } - - return wxEmptyString; -} - - -// ---------------------------------------------------------------------------- -// wxDir::GetTotalSize() -// ---------------------------------------------------------------------------- - -#if wxUSE_LONGLONG - -class wxDirTraverserSumSize : public wxDirTraverser -{ -public: - wxDirTraverserSumSize() { } - - virtual wxDirTraverseResult OnFile(const wxString& filename) wxOVERRIDE - { - // wxFileName::GetSize won't use this class again as - // we're passing it a file and not a directory; - // thus we are sure to avoid an endless loop - wxULongLong sz = wxFileName::GetSize(filename); - - if (sz == wxInvalidSize) - { - // if the GetSize() failed (this can happen because e.g. a - // file is locked by another process), we can proceed but - // we need to at least warn the user that the resulting - // final size could be not reliable (if e.g. the locked - // file is very big). - m_skippedFiles.Add(filename); - return wxDIR_CONTINUE; - } - - m_sz += sz; - return wxDIR_CONTINUE; - } - - virtual wxDirTraverseResult OnDir(const wxString& WXUNUSED(dirname)) wxOVERRIDE - { - return wxDIR_CONTINUE; - } - - wxULongLong GetTotalSize() const - { return m_sz; } - const wxArrayString& GetSkippedFiles() const - { return m_skippedFiles; } - -protected: - wxULongLong m_sz; - wxArrayString m_skippedFiles; -}; - -wxULongLong wxDir::GetTotalSize(const wxString &dirname, wxArrayString *filesSkipped) -{ - if (!wxDirExists(dirname)) - return wxInvalidSize; - - // to get the size of this directory and its contents we need - // to recursively walk it... - wxDir dir(dirname); - if ( !dir.IsOpened() ) - return wxInvalidSize; - - wxDirTraverserSumSize traverser; - if (dir.Traverse(traverser) == (size_t)-1 ) - return wxInvalidSize; - - if (filesSkipped) - *filesSkipped = traverser.GetSkippedFiles(); - - return traverser.GetTotalSize(); -} - -#endif // wxUSE_LONGLONG - -// ---------------------------------------------------------------------------- -// wxDir helpers -// ---------------------------------------------------------------------------- - -/* static */ -bool wxDir::Exists(const wxString& dir) -{ - return wxFileName::DirExists(dir); -} - -/* static */ -bool wxDir::Make(const wxString &dir, int perm, int flags) -{ - return wxFileName::Mkdir(dir, perm, flags); -} - -/* static */ -bool wxDir::Remove(const wxString &dir, int flags) -{ - return wxFileName::Rmdir(dir, flags); -} - diff --git a/Externals/wxWidgets3/src/common/dirctrlcmn.cpp b/Externals/wxWidgets3/src/common/dirctrlcmn.cpp deleted file mode 100644 index 34215a83ad..0000000000 --- a/Externals/wxWidgets3/src/common/dirctrlcmn.cpp +++ /dev/null @@ -1,88 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/dirctrlcmn.cpp -// Purpose: wxGenericDirCtrl common code -// Author: Harm van der Heijden, Robert Roebling, Julian Smart -// Modified by: -// Created: 12/12/98 -// Copyright: (c) Harm van der Heijden, Robert Roebling and Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_DIRDLG || wxUSE_FILEDLG - -#include "wx/generic/dirctrlg.h" - -extern WXDLLEXPORT_DATA(const char) wxDirDialogNameStr[] = "wxDirCtrl"; -extern WXDLLEXPORT_DATA(const char) wxDirDialogDefaultFolderStr[] = "/"; -extern WXDLLEXPORT_DATA(const char) wxDirSelectorPromptStr[] = "Select a directory"; - -//----------------------------------------------------------------------------- -// XTI -//----------------------------------------------------------------------------- - -wxDEFINE_FLAGS( wxGenericDirCtrlStyle ) -wxBEGIN_FLAGS( wxGenericDirCtrlStyle ) - // new style border flags, we put them first to - // use them for streaming out - wxFLAGS_MEMBER(wxBORDER_SIMPLE) - wxFLAGS_MEMBER(wxBORDER_SUNKEN) - wxFLAGS_MEMBER(wxBORDER_DOUBLE) - wxFLAGS_MEMBER(wxBORDER_RAISED) - wxFLAGS_MEMBER(wxBORDER_STATIC) - wxFLAGS_MEMBER(wxBORDER_NONE) - - // old style border flags - wxFLAGS_MEMBER(wxSIMPLE_BORDER) - wxFLAGS_MEMBER(wxSUNKEN_BORDER) - wxFLAGS_MEMBER(wxDOUBLE_BORDER) - wxFLAGS_MEMBER(wxRAISED_BORDER) - wxFLAGS_MEMBER(wxSTATIC_BORDER) - wxFLAGS_MEMBER(wxBORDER) - - // standard window styles - wxFLAGS_MEMBER(wxTAB_TRAVERSAL) - wxFLAGS_MEMBER(wxCLIP_CHILDREN) - wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) - wxFLAGS_MEMBER(wxWANTS_CHARS) - wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE) - wxFLAGS_MEMBER(wxALWAYS_SHOW_SB ) - wxFLAGS_MEMBER(wxVSCROLL) - wxFLAGS_MEMBER(wxHSCROLL) - - wxFLAGS_MEMBER(wxDIRCTRL_DIR_ONLY) - wxFLAGS_MEMBER(wxDIRCTRL_3D_INTERNAL) - wxFLAGS_MEMBER(wxDIRCTRL_SELECT_FIRST) - wxFLAGS_MEMBER(wxDIRCTRL_SHOW_FILTERS) -wxEND_FLAGS( wxGenericDirCtrlStyle ) - -wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxGenericDirCtrl, wxControl, "wx/dirctrl.h"); - -wxBEGIN_PROPERTIES_TABLE(wxGenericDirCtrl) - wxHIDE_PROPERTY( Children ) - - wxPROPERTY( DefaultPath, wxString, SetDefaultPath, GetDefaultPath, \ - wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, wxT("Helpstring"), wxT("group")) - wxPROPERTY( Filter, wxString, SetFilter, GetFilter, wxEMPTY_PARAMETER_VALUE, \ - 0 /*flags*/, wxT("Helpstring"), wxT("group") ) - wxPROPERTY( DefaultFilter, int, SetFilterIndex, GetFilterIndex, \ - wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, wxT("Helpstring"), wxT("group") ) - - wxPROPERTY_FLAGS( WindowStyle, wxGenericDirCtrlStyle, long, SetWindowStyleFlag, \ - GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0, wxT("Helpstring"), \ - wxT("group") ) -wxEND_PROPERTIES_TABLE() - -wxEMPTY_HANDLERS_TABLE(wxGenericDirCtrl) - -wxCONSTRUCTOR_8( wxGenericDirCtrl, wxWindow*, Parent, wxWindowID, Id, \ - wxString, DefaultPath, wxPoint, Position, wxSize, Size, \ - long, WindowStyle, wxString, Filter, int, DefaultFilter ) - -#endif // wxUSE_DIRDLG || wxUSE_FILEDLG diff --git a/Externals/wxWidgets3/src/common/dlgcmn.cpp b/Externals/wxWidgets3/src/common/dlgcmn.cpp deleted file mode 100644 index 5067471b11..0000000000 --- a/Externals/wxWidgets3/src/common/dlgcmn.cpp +++ /dev/null @@ -1,981 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/dlgcmn.cpp -// Purpose: common (to all ports) wxDialog functions -// Author: Vadim Zeitlin -// Modified by: -// Created: 28.06.99 -// Copyright: (c) Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include "wx/dialog.h" - -#ifndef WX_PRECOMP - #include "wx/app.h" - #include "wx/button.h" - #include "wx/dcclient.h" - #include "wx/intl.h" - #include "wx/settings.h" - #include "wx/stattext.h" - #include "wx/sizer.h" - #include "wx/containr.h" -#endif - -#include "wx/statline.h" -#include "wx/sysopt.h" -#include "wx/module.h" -#include "wx/bookctrl.h" -#include "wx/scrolwin.h" -#include "wx/textwrapper.h" -#include "wx/modalhook.h" - -#if wxUSE_DISPLAY -#include "wx/display.h" -#endif - -extern WXDLLEXPORT_DATA(const char) wxDialogNameStr[] = "dialog"; - -// ---------------------------------------------------------------------------- -// XTI -// ---------------------------------------------------------------------------- - -wxDEFINE_FLAGS( wxDialogStyle ) -wxBEGIN_FLAGS( wxDialogStyle ) -// new style border flags, we put them first to -// use them for streaming out -wxFLAGS_MEMBER(wxBORDER_SIMPLE) -wxFLAGS_MEMBER(wxBORDER_SUNKEN) -wxFLAGS_MEMBER(wxBORDER_DOUBLE) -wxFLAGS_MEMBER(wxBORDER_RAISED) -wxFLAGS_MEMBER(wxBORDER_STATIC) -wxFLAGS_MEMBER(wxBORDER_NONE) - -// old style border flags -wxFLAGS_MEMBER(wxSIMPLE_BORDER) -wxFLAGS_MEMBER(wxSUNKEN_BORDER) -wxFLAGS_MEMBER(wxDOUBLE_BORDER) -wxFLAGS_MEMBER(wxRAISED_BORDER) -wxFLAGS_MEMBER(wxSTATIC_BORDER) -wxFLAGS_MEMBER(wxNO_BORDER) - -// standard window styles -wxFLAGS_MEMBER(wxTAB_TRAVERSAL) -wxFLAGS_MEMBER(wxCLIP_CHILDREN) - -// dialog styles -wxFLAGS_MEMBER(wxSTAY_ON_TOP) -wxFLAGS_MEMBER(wxCAPTION) -wxFLAGS_MEMBER(wxSYSTEM_MENU) -wxFLAGS_MEMBER(wxRESIZE_BORDER) -wxFLAGS_MEMBER(wxCLOSE_BOX) -wxFLAGS_MEMBER(wxMAXIMIZE_BOX) -wxFLAGS_MEMBER(wxMINIMIZE_BOX) -wxEND_FLAGS( wxDialogStyle ) - -wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxDialog, wxTopLevelWindow, "wx/dialog.h"); - -wxBEGIN_PROPERTIES_TABLE(wxDialog) -wxPROPERTY( Title, wxString, SetTitle, GetTitle, wxString(), \ - 0 /*flags*/, wxT("Helpstring"), wxT("group")) - -wxPROPERTY_FLAGS( WindowStyle, wxDialogStyle, long, SetWindowStyleFlag, \ - GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \ - wxT("Helpstring"), wxT("group")) // style -wxEND_PROPERTIES_TABLE() - -wxEMPTY_HANDLERS_TABLE(wxDialog) - -wxCONSTRUCTOR_6( wxDialog, wxWindow*, Parent, wxWindowID, Id, \ - wxString, Title, wxPoint, Position, wxSize, Size, long, WindowStyle) - -// ---------------------------------------------------------------------------- -// wxDialogBase -// ---------------------------------------------------------------------------- - -wxBEGIN_EVENT_TABLE(wxDialogBase, wxTopLevelWindow) - EVT_BUTTON(wxID_ANY, wxDialogBase::OnButton) - - EVT_CLOSE(wxDialogBase::OnCloseWindow) - - EVT_CHAR_HOOK(wxDialogBase::OnCharHook) -wxEND_EVENT_TABLE() - -wxDialogLayoutAdapter* wxDialogBase::sm_layoutAdapter = NULL; -bool wxDialogBase::sm_layoutAdaptation = false; - -wxDialogBase::wxDialogBase() -{ - m_returnCode = 0; - m_affirmativeId = wxID_OK; - m_escapeId = wxID_ANY; - m_layoutAdaptationLevel = 3; - m_layoutAdaptationDone = FALSE; - m_layoutAdaptationMode = wxDIALOG_ADAPTATION_MODE_DEFAULT; - - // the dialogs have this flag on by default to prevent the events from the - // dialog controls from reaching the parent frame which is usually - // undesirable and can lead to unexpected and hard to find bugs - SetExtraStyle(GetExtraStyle() | wxWS_EX_BLOCK_EVENTS); -} - -wxWindow *wxDialogBase::CheckIfCanBeUsedAsParent(wxWindow *parent) const -{ - if ( !parent ) - return NULL; - - extern WXDLLIMPEXP_DATA_BASE(wxList) wxPendingDelete; - if ( wxPendingDelete.Member(parent) || parent->IsBeingDeleted() ) - { - // this window is being deleted and we shouldn't create any children - // under it - return NULL; - } - - if ( parent->HasExtraStyle(wxWS_EX_TRANSIENT) ) - { - // this window is not being deleted yet but it's going to disappear - // soon so still don't parent this window under it - return NULL; - } - - if ( !parent->IsShownOnScreen() ) - { - // using hidden parent won't work correctly neither - return NULL; - } - - if ( parent == this ) - { - // not sure if this can really happen but it doesn't hurt to guard - // against this clearly invalid situation - return NULL; - } - - return parent; -} - -wxWindow * -wxDialogBase::GetParentForModalDialog(wxWindow *parent, long style) const -{ - // creating a parent-less modal dialog will result (under e.g. wxGTK2) - // in an unfocused dialog, so try to find a valid parent for it unless we - // were explicitly asked not to - if ( style & wxDIALOG_NO_PARENT ) - return NULL; - - // first try the given parent - if ( parent ) - parent = CheckIfCanBeUsedAsParent(wxGetTopLevelParent(parent)); - - // then the currently active window - if ( !parent ) - parent = CheckIfCanBeUsedAsParent( - wxGetTopLevelParent(wxGetActiveWindow())); - - // and finally the application main window - if ( !parent && wxTheApp ) - parent = CheckIfCanBeUsedAsParent(wxTheApp->GetTopWindow()); - - return parent; -} - -#if wxUSE_STATTEXT - -wxSizer *wxDialogBase::CreateTextSizer(const wxString& message) -{ - wxTextSizerWrapper wrapper(this); - - return CreateTextSizer(message, wrapper); -} - -wxSizer *wxDialogBase::CreateTextSizer(const wxString& message, - wxTextSizerWrapper& wrapper) -{ - // I admit that this is complete bogus, but it makes - // message boxes work for pda screens temporarily.. - int widthMax = -1; - const bool is_pda = wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA; - if (is_pda) - { - widthMax = wxSystemSettings::GetMetric( wxSYS_SCREEN_X ) - 25; - } - - return wrapper.CreateSizer(message, widthMax); -} - -#endif // wxUSE_STATTEXT - -wxSizer *wxDialogBase::CreateButtonSizer(long flags) -{ -#if wxUSE_BUTTON - - return CreateStdDialogButtonSizer(flags); - -#else // !wxUSE_BUTTON - wxUnusedVar(flags); - - return NULL; -#endif // wxUSE_BUTTON/!wxUSE_BUTTON -} - -wxSizer *wxDialogBase::CreateSeparatedSizer(wxSizer *sizer) -{ - // Mac Human Interface Guidelines recommend not to use static lines as - // grouping elements -#if wxUSE_STATLINE && !defined(__WXMAC__) - wxBoxSizer *topsizer = new wxBoxSizer(wxVERTICAL); - topsizer->Add(new wxStaticLine(this), - wxSizerFlags().Expand().DoubleBorder(wxBOTTOM)); - topsizer->Add(sizer, wxSizerFlags().Expand()); - sizer = topsizer; -#endif // wxUSE_STATLINE - - return sizer; -} - -wxSizer *wxDialogBase::CreateSeparatedButtonSizer(long flags) -{ - wxSizer *sizer = CreateButtonSizer(flags); - if ( !sizer ) - return NULL; - - return CreateSeparatedSizer(sizer); -} - -#if wxUSE_BUTTON - -wxStdDialogButtonSizer *wxDialogBase::CreateStdDialogButtonSizer( long flags ) -{ - wxStdDialogButtonSizer *sizer = new wxStdDialogButtonSizer(); - - wxButton *ok = NULL; - wxButton *yes = NULL; - wxButton *no = NULL; - - if (flags & wxOK) - { - ok = new wxButton(this, wxID_OK); - sizer->AddButton(ok); - } - - if (flags & wxCANCEL) - { - wxButton *cancel = new wxButton(this, wxID_CANCEL); - sizer->AddButton(cancel); - } - - if (flags & wxYES) - { - yes = new wxButton(this, wxID_YES); - sizer->AddButton(yes); - } - - if (flags & wxNO) - { - no = new wxButton(this, wxID_NO); - sizer->AddButton(no); - } - - if (flags & wxAPPLY) - { - wxButton *apply = new wxButton(this, wxID_APPLY); - sizer->AddButton(apply); - } - - if (flags & wxCLOSE) - { - wxButton *close = new wxButton(this, wxID_CLOSE); - sizer->AddButton(close); - } - - if (flags & wxHELP) - { - wxButton *help = new wxButton(this, wxID_HELP); - sizer->AddButton(help); - } - - if (flags & wxNO_DEFAULT) - { - if (no) - { - no->SetDefault(); - no->SetFocus(); - } - } - else - { - if (ok) - { - ok->SetDefault(); - ok->SetFocus(); - } - else if (yes) - { - yes->SetDefault(); - yes->SetFocus(); - } - } - - if (flags & wxOK) - SetAffirmativeId(wxID_OK); - else if (flags & wxYES) - SetAffirmativeId(wxID_YES); - else if (flags & wxCLOSE) - SetAffirmativeId(wxID_CLOSE); - - sizer->Realize(); - - return sizer; -} - -#endif // wxUSE_BUTTON - -// ---------------------------------------------------------------------------- -// standard buttons handling -// ---------------------------------------------------------------------------- - -void wxDialogBase::EndDialog(int rc) -{ - if ( IsModal() ) - EndModal(rc); - else - Hide(); -} - -void wxDialogBase::AcceptAndClose() -{ - if ( Validate() && TransferDataFromWindow() ) - { - EndDialog(m_affirmativeId); - } -} - -void wxDialogBase::SetAffirmativeId(int affirmativeId) -{ - m_affirmativeId = affirmativeId; -} - -void wxDialogBase::SetEscapeId(int escapeId) -{ - m_escapeId = escapeId; -} - -bool wxDialogBase::EmulateButtonClickIfPresent(int id) -{ -#if wxUSE_BUTTON - wxButton *btn = wxDynamicCast(FindWindow(id), wxButton); - - if ( !btn || !btn->IsEnabled() || !btn->IsShown() ) - return false; - - wxCommandEvent event(wxEVT_BUTTON, id); - event.SetEventObject(btn); - btn->GetEventHandler()->ProcessEvent(event); - - return true; -#else // !wxUSE_BUTTON - wxUnusedVar(id); - return false; -#endif // wxUSE_BUTTON/!wxUSE_BUTTON -} - -bool wxDialogBase::SendCloseButtonClickEvent() -{ - int idCancel = GetEscapeId(); - switch ( idCancel ) - { - case wxID_NONE: - // The user doesn't want this dialog to close "implicitly". - break; - - case wxID_ANY: - // this value is special: it means translate Esc to wxID_CANCEL - // but if there is no such button, then fall back to wxID_OK - if ( EmulateButtonClickIfPresent(wxID_CANCEL) ) - return true; - idCancel = GetAffirmativeId(); - wxFALLTHROUGH; - - default: - // translate Esc to button press for the button with given id - if ( EmulateButtonClickIfPresent(idCancel) ) - return true; - } - - return false; -} - -bool wxDialogBase::IsEscapeKey(const wxKeyEvent& event) -{ - // For most platforms, Esc key is used to close the dialogs. - // - // Notice that we intentionally don't check for modifiers here, Shift-Esc, - // Alt-Esc and so on still close the dialog, typically. - return event.GetKeyCode() == WXK_ESCAPE; -} - -void wxDialogBase::OnCharHook(wxKeyEvent& event) -{ - if ( IsEscapeKey(event) ) - { - if ( SendCloseButtonClickEvent() ) - { - // Skip the call to event.Skip() below, we did handle this key. - return; - } - } - - event.Skip(); -} - -void wxDialogBase::OnButton(wxCommandEvent& event) -{ - const int id = event.GetId(); - if ( id == GetAffirmativeId() ) - { - AcceptAndClose(); - } - else if ( id == wxID_APPLY ) - { - if ( Validate() ) - TransferDataFromWindow(); - - // TODO: disable the Apply button until things change again - } - else if ( id == GetEscapeId() || - (id == wxID_CANCEL && GetEscapeId() == wxID_ANY) ) - { - EndDialog(wxID_CANCEL); - } - else // not a standard button - { - event.Skip(); - } -} - -// ---------------------------------------------------------------------------- -// compatibility methods for supporting the modality API -// ---------------------------------------------------------------------------- - -wxDEFINE_EVENT( wxEVT_WINDOW_MODAL_DIALOG_CLOSED , wxWindowModalDialogEvent ); - -wxIMPLEMENT_DYNAMIC_CLASS(wxWindowModalDialogEvent, wxCommandEvent); - -void wxDialogBase::ShowWindowModal () -{ - int retval = ShowModal(); - // wxWindowModalDialogEvent relies on GetReturnCode() returning correct - // code. Rather than doing it manually in all ShowModal() overrides for - // native dialogs (and getting accidentally broken again), set it here. - // The worst that can happen is that it will be set twice to the same - // value. - SetReturnCode(retval); - SendWindowModalDialogEvent ( wxEVT_WINDOW_MODAL_DIALOG_CLOSED ); -} - -void wxDialogBase::SendWindowModalDialogEvent ( wxEventType type ) -{ - wxWindowModalDialogEvent event ( type, GetId()); - event.SetEventObject(this); - - if ( !GetEventHandler()->ProcessEvent(event) ) - { - // the event is not propagated upwards to the parent automatically - // because the dialog is a top level window, so do it manually as - // in 9 cases of 10 the message must be processed by the dialog - // owner and not the dialog itself - (void)GetParent()->GetEventHandler()->ProcessEvent(event); - } -} - - -wxDialogModality wxDialogBase::GetModality() const -{ - return IsModal() ? wxDIALOG_MODALITY_APP_MODAL : wxDIALOG_MODALITY_NONE; -} - -// ---------------------------------------------------------------------------- -// other event handlers -// ---------------------------------------------------------------------------- - -void wxDialogBase::OnCloseWindow(wxCloseEvent& WXUNUSED(event)) -{ - // We'll send a Cancel message by default, which may close the dialog. - - // Check for looping if the Cancel event handler calls Close(). - // - // VZ: this is horrible and MT-unsafe. Can't we reuse some of these global - // lists here? don't dare to change it now, but should be done later! - static wxList closing; - - if ( closing.Member(this) ) - return; - - closing.Append(this); - - // When a previously hidden (necessarily modeless) dialog is being closed, - // we must not perform the usual validation and data transfer steps as they - // had been already done when it was hidden and doing it again now would be - // unexpected and could result in e.g. the dialog asking for confirmation - // before discarding the changes being shown again, which doesn't make - // sense as the dialog is not being closed in response to any user action. - if ( !IsShown() || !SendCloseButtonClickEvent() ) - { - // If the handler didn't close the dialog (e.g. because there is no - // button with matching id) we still want to close it when the user - // clicks the "x" button in the title bar, otherwise we shouldn't even - // have put it there. - // - // Notice that using wxID_CLOSE might have been a better choice but we - // use wxID_CANCEL for compatibility reasons. - EndDialog(wxID_CANCEL); - } - - closing.DeleteObject(this); -} - -void wxDialogBase::OnSysColourChanged(wxSysColourChangedEvent& event) -{ -#ifndef __WXGTK__ - SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)); - Refresh(); -#endif - - event.Skip(); -} - -/// Do the adaptation -bool wxDialogBase::DoLayoutAdaptation() -{ - if (GetLayoutAdapter()) - { - wxWindow* focusWindow = wxFindFocusDescendant(this); // from event.h - if (GetLayoutAdapter()->DoLayoutAdaptation((wxDialog*) this)) - { - if (focusWindow) - focusWindow->SetFocus(); - return true; - } - else - return false; - } - else - return false; -} - -/// Can we do the adaptation? -bool wxDialogBase::CanDoLayoutAdaptation() -{ - // Check if local setting overrides the global setting - bool layoutEnabled = (GetLayoutAdaptationMode() == wxDIALOG_ADAPTATION_MODE_ENABLED) || (IsLayoutAdaptationEnabled() && (GetLayoutAdaptationMode() != wxDIALOG_ADAPTATION_MODE_DISABLED)); - - return (layoutEnabled && !m_layoutAdaptationDone && GetLayoutAdaptationLevel() != 0 && GetLayoutAdapter() != NULL && GetLayoutAdapter()->CanDoLayoutAdaptation((wxDialog*) this)); -} - -/// Set scrolling adapter class, returning old adapter -wxDialogLayoutAdapter* wxDialogBase::SetLayoutAdapter(wxDialogLayoutAdapter* adapter) -{ - wxDialogLayoutAdapter* oldLayoutAdapter = sm_layoutAdapter; - sm_layoutAdapter = adapter; - return oldLayoutAdapter; -} - -/*! - * Standard adapter - */ - -wxIMPLEMENT_CLASS(wxDialogLayoutAdapter, wxObject); - -wxIMPLEMENT_CLASS(wxStandardDialogLayoutAdapter, wxDialogLayoutAdapter); - -// Allow for caption size on wxWidgets < 2.9 -#if defined(__WXGTK__) && !wxCHECK_VERSION(2,9,0) -#define wxEXTRA_DIALOG_HEIGHT 30 -#else -#define wxEXTRA_DIALOG_HEIGHT 0 -#endif - -/// Indicate that adaptation should be done -bool wxStandardDialogLayoutAdapter::CanDoLayoutAdaptation(wxDialog* dialog) -{ - if (dialog->GetSizer()) - { - wxSize windowSize, displaySize; - return MustScroll(dialog, windowSize, displaySize) != 0; - } - else - return false; -} - -bool wxStandardDialogLayoutAdapter::DoLayoutAdaptation(wxDialog* dialog) -{ - if (dialog->GetSizer()) - { -#if wxUSE_BOOKCTRL - wxBookCtrlBase* bookContentWindow = wxDynamicCast(dialog->GetContentWindow(), wxBookCtrlBase); - - if (bookContentWindow) - { - // If we have a book control, make all the pages (that use sizers) scrollable - wxWindowList windows; - for (size_t i = 0; i < bookContentWindow->GetPageCount(); i++) - { - wxWindow* page = bookContentWindow->GetPage(i); - - wxScrolledWindow* scrolledWindow = wxDynamicCast(page, wxScrolledWindow); - if (scrolledWindow) - windows.Append(scrolledWindow); - else if (page->GetSizer()) - { - // Create a scrolled window and reparent - scrolledWindow = CreateScrolledWindow(page); - wxSizer* oldSizer = page->GetSizer(); - - wxSizer* newSizer = new wxBoxSizer(wxVERTICAL); - newSizer->Add(scrolledWindow,1, wxEXPAND, 0); - - page->SetSizer(newSizer, false /* don't delete the old sizer */); - - scrolledWindow->SetSizer(oldSizer); - - ReparentControls(page, scrolledWindow); - - windows.Append(scrolledWindow); - } - } - - FitWithScrolling(dialog, windows); - } - else -#endif // wxUSE_BOOKCTRL - { -#if wxUSE_BUTTON - // If we have an arbitrary dialog, create a scrolling area for the main content, and a button sizer - // for the main buttons. - wxScrolledWindow* scrolledWindow = CreateScrolledWindow(dialog); - - int buttonSizerBorder = 0; - - // First try to find a wxStdDialogButtonSizer - wxSizer* buttonSizer = FindButtonSizer(true /* find std button sizer */, dialog, dialog->GetSizer(), buttonSizerBorder); - - // Next try to find a wxBoxSizer containing the controls - if (!buttonSizer && dialog->GetLayoutAdaptationLevel() > wxDIALOG_ADAPTATION_STANDARD_SIZER) - buttonSizer = FindButtonSizer(false /* find ordinary sizer */, dialog, dialog->GetSizer(), buttonSizerBorder); - - // If we still don't have a button sizer, collect any 'loose' buttons in the layout - if (!buttonSizer && dialog->GetLayoutAdaptationLevel() > wxDIALOG_ADAPTATION_ANY_SIZER) - { - int count = 0; - wxStdDialogButtonSizer* stdButtonSizer = new wxStdDialogButtonSizer; - buttonSizer = stdButtonSizer; - - FindLooseButtons(dialog, stdButtonSizer, dialog->GetSizer(), count); - if (count > 0) - stdButtonSizer->Realize(); - else - { - wxDELETE(buttonSizer); - } - } - - if (buttonSizerBorder == 0) - buttonSizerBorder = 5; - - ReparentControls(dialog, scrolledWindow, buttonSizer); - - wxBoxSizer* newTopSizer = new wxBoxSizer(wxVERTICAL); - wxSizer* oldSizer = dialog->GetSizer(); - - dialog->SetSizer(newTopSizer, false /* don't delete old sizer */); - - newTopSizer->Add(scrolledWindow, 1, wxEXPAND|wxALL, 0); - if (buttonSizer) - newTopSizer->Add(buttonSizer, 0, wxEXPAND|wxALL, buttonSizerBorder); - - scrolledWindow->SetSizer(oldSizer); - - FitWithScrolling(dialog, scrolledWindow); -#endif // wxUSE_BUTTON - } - } - - dialog->SetLayoutAdaptationDone(true); - return true; -} - -// Create the scrolled window -wxScrolledWindow* wxStandardDialogLayoutAdapter::CreateScrolledWindow(wxWindow* parent) -{ - wxScrolledWindow* scrolledWindow = new wxScrolledWindow(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL|wxVSCROLL|wxHSCROLL|wxBORDER_NONE); - return scrolledWindow; -} - -#if wxUSE_BUTTON - -/// Find and remove the button sizer, if any -wxSizer* wxStandardDialogLayoutAdapter::FindButtonSizer(bool stdButtonSizer, wxDialog* dialog, wxSizer* sizer, int& retBorder, int accumlatedBorder) -{ - for ( wxSizerItemList::compatibility_iterator node = sizer->GetChildren().GetFirst(); - node; node = node->GetNext() ) - { - wxSizerItem *item = node->GetData(); - wxSizer *childSizer = item->GetSizer(); - - if ( childSizer ) - { - int newBorder = accumlatedBorder; - if (item->GetFlag() & wxALL) - newBorder += item->GetBorder(); - - if (stdButtonSizer) // find wxStdDialogButtonSizer - { - wxStdDialogButtonSizer* buttonSizer = wxDynamicCast(childSizer, wxStdDialogButtonSizer); - if (buttonSizer) - { - sizer->Detach(childSizer); - retBorder = newBorder; - return buttonSizer; - } - } - else // find a horizontal box sizer containing standard buttons - { - wxBoxSizer* buttonSizer = wxDynamicCast(childSizer, wxBoxSizer); - if (buttonSizer && IsOrdinaryButtonSizer(dialog, buttonSizer)) - { - sizer->Detach(childSizer); - retBorder = newBorder; - return buttonSizer; - } - } - - wxSizer* s = FindButtonSizer(stdButtonSizer, dialog, childSizer, retBorder, newBorder); - if (s) - return s; - } - } - return NULL; -} - -/// Check if this sizer contains standard buttons, and so can be repositioned in the dialog -bool wxStandardDialogLayoutAdapter::IsOrdinaryButtonSizer(wxDialog* dialog, wxBoxSizer* sizer) -{ - if (sizer->GetOrientation() != wxHORIZONTAL) - return false; - - for ( wxSizerItemList::compatibility_iterator node = sizer->GetChildren().GetFirst(); - node; node = node->GetNext() ) - { - wxSizerItem *item = node->GetData(); - wxButton *childButton = wxDynamicCast(item->GetWindow(), wxButton); - - if (childButton && IsStandardButton(dialog, childButton)) - return true; - } - return false; -} - -/// Check if this is a standard button -bool wxStandardDialogLayoutAdapter::IsStandardButton(wxDialog* dialog, wxButton* button) -{ - wxWindowID id = button->GetId(); - - return (id == wxID_OK || id == wxID_CANCEL || id == wxID_YES || id == wxID_NO || id == wxID_SAVE || - id == wxID_APPLY || id == wxID_HELP || id == wxID_CONTEXT_HELP || dialog->IsMainButtonId(id)); -} - -/// Find 'loose' main buttons in the existing layout and add them to the standard dialog sizer -bool wxStandardDialogLayoutAdapter::FindLooseButtons(wxDialog* dialog, wxStdDialogButtonSizer* buttonSizer, wxSizer* sizer, int& count) -{ - wxSizerItemList::compatibility_iterator node = sizer->GetChildren().GetFirst(); - while (node) - { - wxSizerItemList::compatibility_iterator next = node->GetNext(); - wxSizerItem *item = node->GetData(); - wxSizer *childSizer = item->GetSizer(); - wxButton *childButton = wxDynamicCast(item->GetWindow(), wxButton); - - if (childButton && IsStandardButton(dialog, childButton)) - { - sizer->Detach(childButton); - buttonSizer->AddButton(childButton); - count ++; - } - - if (childSizer) - FindLooseButtons(dialog, buttonSizer, childSizer, count); - - node = next; - } - return true; -} - -#endif // wxUSE_BUTTON - -/// Reparent the controls to the scrolled window -void wxStandardDialogLayoutAdapter::ReparentControls(wxWindow* parent, wxWindow* reparentTo, wxSizer* buttonSizer) -{ - DoReparentControls(parent, reparentTo, buttonSizer); -} - -void wxStandardDialogLayoutAdapter::DoReparentControls(wxWindow* parent, wxWindow* reparentTo, wxSizer* buttonSizer) -{ - wxWindowList::compatibility_iterator node = parent->GetChildren().GetFirst(); - while (node) - { - wxWindowList::compatibility_iterator next = node->GetNext(); - - wxWindow *win = node->GetData(); - - // Don't reparent the scrolled window or buttons in the button sizer - if (win != reparentTo && (!buttonSizer || !buttonSizer->GetItem(win))) - { - win->Reparent(reparentTo); -#ifdef __WXMSW__ - // Restore correct tab order - ::SetWindowPos((HWND) win->GetHWND(), HWND_BOTTOM, -1, -1, -1, -1, SWP_NOMOVE|SWP_NOSIZE); -#endif - } - - node = next; - } -} - -/// Find whether scrolling will be necessary for the dialog, returning wxVERTICAL, wxHORIZONTAL or both -int wxStandardDialogLayoutAdapter::MustScroll(wxDialog* dialog, wxSize& windowSize, wxSize& displaySize) -{ - return DoMustScroll(dialog, windowSize, displaySize); -} - -/// Find whether scrolling will be necessary for the dialog, returning wxVERTICAL, wxHORIZONTAL or both -int wxStandardDialogLayoutAdapter::DoMustScroll(wxDialog* dialog, wxSize& windowSize, wxSize& displaySize) -{ - wxSize minWindowSize = dialog->GetSizer()->GetMinSize(); - windowSize = dialog->GetSize(); - windowSize = wxSize(wxMax(windowSize.x, minWindowSize.x), wxMax(windowSize.y, minWindowSize.y)); -#if wxUSE_DISPLAY - displaySize = wxDisplay(wxDisplay::GetFromWindow(dialog)).GetClientArea().GetSize(); -#else - displaySize = wxGetClientDisplayRect().GetSize(); -#endif - - int flags = 0; - - if (windowSize.y >= (displaySize.y - wxEXTRA_DIALOG_HEIGHT)) - flags |= wxVERTICAL; - if (windowSize.x >= displaySize.x) - flags |= wxHORIZONTAL; - - return flags; -} - -// A function to fit the dialog around its contents, and then adjust for screen size. -// If scrolled windows are passed, scrolling is enabled in the required orientation(s). -bool wxStandardDialogLayoutAdapter::FitWithScrolling(wxDialog* dialog, wxWindowList& windows) -{ - return DoFitWithScrolling(dialog, windows); -} - -// A function to fit the dialog around its contents, and then adjust for screen size. -// If a scrolled window is passed, scrolling is enabled in the required orientation(s). -bool wxStandardDialogLayoutAdapter::FitWithScrolling(wxDialog* dialog, wxScrolledWindow* scrolledWindow) -{ - return DoFitWithScrolling(dialog, scrolledWindow); -} - -// A function to fit the dialog around its contents, and then adjust for screen size. -// If a scrolled window is passed, scrolling is enabled in the required orientation(s). -bool wxStandardDialogLayoutAdapter::DoFitWithScrolling(wxDialog* dialog, wxScrolledWindow* scrolledWindow) -{ - wxWindowList windows; - windows.Append(scrolledWindow); - return DoFitWithScrolling(dialog, windows); -} - -bool wxStandardDialogLayoutAdapter::DoFitWithScrolling(wxDialog* dialog, wxWindowList& windows) -{ - wxSizer* sizer = dialog->GetSizer(); - if (!sizer) - return false; - - sizer->SetSizeHints(dialog); - - wxSize windowSize, displaySize; - int scrollFlags = DoMustScroll(dialog, windowSize, displaySize); - int scrollBarSize = 20; - - if (scrollFlags) - { - int scrollBarExtraX = 0, scrollBarExtraY = 0; - bool resizeHorizontally = (scrollFlags & wxHORIZONTAL) != 0; - bool resizeVertically = (scrollFlags & wxVERTICAL) != 0; - - if (windows.GetCount() != 0) - { - // Allow extra for a scrollbar, assuming we resizing in one direction only. - if ((resizeVertically && !resizeHorizontally) && (windowSize.x < (displaySize.x - scrollBarSize))) - scrollBarExtraX = scrollBarSize; - if ((resizeHorizontally && !resizeVertically) && (windowSize.y < (displaySize.y - scrollBarSize))) - scrollBarExtraY = scrollBarSize; - } - - wxWindowList::compatibility_iterator node = windows.GetFirst(); - while (node) - { - wxWindow *win = node->GetData(); - wxScrolledWindow* scrolledWindow = wxDynamicCast(win, wxScrolledWindow); - if (scrolledWindow) - { - scrolledWindow->SetScrollRate(resizeHorizontally ? 10 : 0, resizeVertically ? 10 : 0); - - if (scrolledWindow->GetSizer()) - scrolledWindow->GetSizer()->Fit(scrolledWindow); - } - - node = node->GetNext(); - } - - wxSize limitTo = windowSize + wxSize(scrollBarExtraX, scrollBarExtraY); - if (resizeVertically) - limitTo.y = displaySize.y - wxEXTRA_DIALOG_HEIGHT; - if (resizeHorizontally) - limitTo.x = displaySize.x; - - dialog->SetMinSize(limitTo); - dialog->SetSize(limitTo); - - dialog->SetSizeHints( limitTo.x, limitTo.y, dialog->GetMaxWidth(), dialog->GetMaxHeight() ); - } - - return true; -} - -/*! - * Module to initialise standard adapter - */ - -class wxDialogLayoutAdapterModule: public wxModule -{ - wxDECLARE_DYNAMIC_CLASS(wxDialogLayoutAdapterModule); -public: - wxDialogLayoutAdapterModule() {} - virtual void OnExit() wxOVERRIDE { delete wxDialogBase::SetLayoutAdapter(NULL); } - virtual bool OnInit() wxOVERRIDE { wxDialogBase::SetLayoutAdapter(new wxStandardDialogLayoutAdapter); return true; } -}; - -wxIMPLEMENT_DYNAMIC_CLASS(wxDialogLayoutAdapterModule, wxModule); diff --git a/Externals/wxWidgets3/src/common/dndcmn.cpp b/Externals/wxWidgets3/src/common/dndcmn.cpp deleted file mode 100644 index 5bd9e13454..0000000000 --- a/Externals/wxWidgets3/src/common/dndcmn.cpp +++ /dev/null @@ -1,30 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/dndcmn.cpp -// Author: Robert Roebling -// Modified by: -// Created: 19.10.99 -// Copyright: (c) wxWidgets Team -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include "wx/dnd.h" - -#if wxUSE_DRAG_AND_DROP - -bool wxIsDragResultOk(wxDragResult res) -{ - return res == wxDragCopy || res == wxDragMove || res == wxDragLink; -} - -#endif - diff --git a/Externals/wxWidgets3/src/common/dobjcmn.cpp b/Externals/wxWidgets3/src/common/dobjcmn.cpp deleted file mode 100644 index 10ba0a267a..0000000000 --- a/Externals/wxWidgets3/src/common/dobjcmn.cpp +++ /dev/null @@ -1,676 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/dobjcmn.cpp -// Purpose: implementation of data object methods common to all platforms -// Author: Vadim Zeitlin, Robert Roebling -// Modified by: -// Created: 19.10.99 -// Copyright: (c) wxWidgets Team -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_DATAOBJ - -#include "wx/dataobj.h" - -#ifndef WX_PRECOMP - #include "wx/app.h" -#endif - -#include "wx/textbuf.h" - -// ---------------------------------------------------------------------------- -// lists -// ---------------------------------------------------------------------------- - -#include "wx/listimpl.cpp" - -WX_DEFINE_LIST(wxSimpleDataObjectList) - -// ---------------------------------------------------------------------------- -// globals -// ---------------------------------------------------------------------------- - -static wxDataFormat dataFormatInvalid; -WXDLLEXPORT const wxDataFormat& wxFormatInvalid = dataFormatInvalid; - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxDataObjectBase -// ---------------------------------------------------------------------------- - -wxDataObjectBase::~wxDataObjectBase() -{ -} - -bool wxDataObjectBase::IsSupported(const wxDataFormat& format, - Direction dir) const -{ - size_t nFormatCount = GetFormatCount( dir ); - if ( nFormatCount == 1 ) - { - return format == GetPreferredFormat( dir ); - } - else - { - wxDataFormat *formats = new wxDataFormat[nFormatCount]; - GetAllFormats( formats, dir ); - - size_t n; - for ( n = 0; n < nFormatCount; n++ ) - { - if ( formats[n] == format ) - break; - } - - delete [] formats; - - // found? - return n < nFormatCount; - } -} - -// ---------------------------------------------------------------------------- -// wxDataObjectComposite -// ---------------------------------------------------------------------------- - -wxDataObjectComposite::wxDataObjectComposite() -{ - m_preferred = 0; - m_receivedFormat = wxFormatInvalid; -} - -wxDataObjectComposite::~wxDataObjectComposite() -{ - WX_CLEAR_LIST( wxSimpleDataObjectList, m_dataObjects ); -} - -wxDataObjectSimple * -wxDataObjectComposite::GetObject(const wxDataFormat& format, wxDataObjectBase::Direction dir) const -{ - wxSimpleDataObjectList::compatibility_iterator node = m_dataObjects.GetFirst(); - - while ( node ) - { - wxDataObjectSimple *dataObj = node->GetData(); - - if (dataObj->IsSupported(format,dir)) - return dataObj; - node = node->GetNext(); - } - return NULL; -} - -void wxDataObjectComposite::Add(wxDataObjectSimple *dataObject, bool preferred) -{ - if ( preferred ) - m_preferred = m_dataObjects.GetCount(); - - m_dataObjects.Append( dataObject ); -} - -wxDataFormat wxDataObjectComposite::GetReceivedFormat() const -{ - return m_receivedFormat; -} - -wxDataFormat -wxDataObjectComposite::GetPreferredFormat(Direction WXUNUSED(dir)) const -{ - wxSimpleDataObjectList::compatibility_iterator node = m_dataObjects.Item( m_preferred ); - - wxCHECK_MSG( node, wxFormatInvalid, wxT("no preferred format") ); - - wxDataObjectSimple* dataObj = node->GetData(); - - return dataObj->GetFormat(); -} - -#if defined(__WXMSW__) - -size_t wxDataObjectComposite::GetBufferOffset( const wxDataFormat& format ) -{ - wxDataObjectSimple *dataObj = GetObject(format); - - wxCHECK_MSG( dataObj, 0, - wxT("unsupported format in wxDataObjectComposite")); - - return dataObj->GetBufferOffset( format ); -} - - -const void* wxDataObjectComposite::GetSizeFromBuffer( const void* buffer, - size_t* size, - const wxDataFormat& format ) -{ - wxDataObjectSimple *dataObj = GetObject(format); - - wxCHECK_MSG( dataObj, NULL, - wxT("unsupported format in wxDataObjectComposite")); - - return dataObj->GetSizeFromBuffer( buffer, size, format ); -} - - -void* wxDataObjectComposite::SetSizeInBuffer( void* buffer, size_t size, - const wxDataFormat& format ) -{ - wxDataObjectSimple *dataObj = GetObject( format ); - - wxCHECK_MSG( dataObj, NULL, - wxT("unsupported format in wxDataObjectComposite")); - - return dataObj->SetSizeInBuffer( buffer, size, format ); -} - -#endif - -size_t wxDataObjectComposite::GetFormatCount(Direction dir) const -{ - size_t n = 0; - - // NOTE: some wxDataObjectSimple objects may return a number greater than 1 - // from GetFormatCount(): this is the case of e.g. wxTextDataObject - // under wxMac and wxGTK - wxSimpleDataObjectList::compatibility_iterator node; - for ( node = m_dataObjects.GetFirst(); node; node = node->GetNext() ) - n += node->GetData()->GetFormatCount(dir); - - return n; -} - -void wxDataObjectComposite::GetAllFormats(wxDataFormat *formats, - Direction dir) const -{ - size_t index(0); - wxSimpleDataObjectList::compatibility_iterator node; - - for ( node = m_dataObjects.GetFirst(); node; node = node->GetNext() ) - { - // NOTE: some wxDataObjectSimple objects may return more than 1 format - // from GetAllFormats(): this is the case of e.g. wxTextDataObject - // under wxMac and wxGTK - node->GetData()->GetAllFormats(formats+index, dir); - index += node->GetData()->GetFormatCount(dir); - } -} - -size_t wxDataObjectComposite::GetDataSize(const wxDataFormat& format) const -{ - wxDataObjectSimple *dataObj = GetObject(format); - - wxCHECK_MSG( dataObj, 0, - wxT("unsupported format in wxDataObjectComposite")); - - return dataObj->GetDataSize(); -} - -bool wxDataObjectComposite::GetDataHere(const wxDataFormat& format, - void *buf) const -{ - wxDataObjectSimple *dataObj = GetObject( format ); - - wxCHECK_MSG( dataObj, false, - wxT("unsupported format in wxDataObjectComposite")); - - return dataObj->GetDataHere( buf ); -} - -bool wxDataObjectComposite::SetData(const wxDataFormat& format, - size_t len, - const void *buf) -{ - wxDataObjectSimple *dataObj = GetObject( format ); - - wxCHECK_MSG( dataObj, false, - wxT("unsupported format in wxDataObjectComposite")); - - m_receivedFormat = format; - - // Notice that we must pass "format" here as wxTextDataObject, that we can - // have as one of our "simple" sub-objects actually is not that simple and - // can support multiple formats (ASCII/UTF-8/UTF-16/...) and so needs to - // know which one it is given. - return dataObj->SetData( format, len, buf ); -} - -// ---------------------------------------------------------------------------- -// wxTextDataObject -// ---------------------------------------------------------------------------- - -#ifdef wxNEEDS_UTF8_FOR_TEXT_DATAOBJ - -// FIXME-UTF8: we should be able to merge wchar_t and UTF-8 versions once we -// have a way to get UTF-8 string (and its length) in both builds -// without loss of efficiency (i.e. extra buffer copy/strlen call) - -#if wxUSE_UNICODE_WCHAR - -static inline wxMBConv& GetConv(const wxDataFormat& format) -{ - // use UTF8 for wxDF_UNICODETEXT and UCS4 for wxDF_TEXT - return format == wxDF_UNICODETEXT ? wxConvUTF8 : wxConvLibc; -} - -size_t wxTextDataObject::GetDataSize(const wxDataFormat& format) const -{ - wxCharBuffer buffer = GetConv(format).cWX2MB( GetText().c_str() ); - - return buffer ? strlen( buffer ) : 0; -} - -bool wxTextDataObject::GetDataHere(const wxDataFormat& format, void *buf) const -{ - if ( !buf ) - return false; - - wxCharBuffer buffer = GetConv(format).cWX2MB( GetText().c_str() ); - if ( !buffer ) - return false; - - memcpy( (char*) buf, buffer, GetDataSize(format) ); - // strcpy( (char*) buf, buffer ); - - return true; -} - -bool wxTextDataObject::SetData(const wxDataFormat& format, - size_t len, const void *buf) -{ - if ( buf == NULL ) - return false; - - wxWCharBuffer buffer = GetConv(format).cMB2WC((const char*)buf, len, NULL); - - SetText( buffer ); - - return true; -} - -#else // wxUSE_UNICODE_UTF8 - -size_t wxTextDataObject::GetDataSize(const wxDataFormat& format) const -{ - const wxString& text = GetText(); - if ( format == wxDF_UNICODETEXT || wxLocaleIsUtf8 ) - { - return text.utf8_length(); - } - else // wxDF_TEXT - { - const wxCharBuffer buf(wxConvLocal.cWC2MB(text.wc_str())); - return buf ? strlen(buf) : 0; - } -} - -bool wxTextDataObject::GetDataHere(const wxDataFormat& format, void *buf) const -{ - if ( !buf ) - return false; - - const wxString& text = GetText(); - if ( format == wxDF_UNICODETEXT || wxLocaleIsUtf8 ) - { - memcpy(buf, text.utf8_str(), text.utf8_length()); - } - else // wxDF_TEXT - { - const wxCharBuffer bufLocal(wxConvLocal.cWC2MB(text.wc_str())); - if ( !bufLocal ) - return false; - - memcpy(buf, bufLocal, strlen(bufLocal)); - } - - return true; -} - -bool wxTextDataObject::SetData(const wxDataFormat& format, - size_t len, const void *buf_) -{ - const char * const buf = static_cast(buf_); - - if ( buf == NULL ) - return false; - - if ( format == wxDF_UNICODETEXT || wxLocaleIsUtf8 ) - { - // normally the data is in UTF-8 so we could use FromUTF8Unchecked() - // but it's not absolutely clear what GTK+ does if the clipboard data - // is not in UTF-8 so do an extra check for tranquility, it shouldn't - // matter much if we lose a bit of performance when pasting from - // clipboard - SetText(wxString::FromUTF8(buf, len)); - } - else // wxDF_TEXT, convert from current (non-UTF8) locale - { - SetText(wxConvLocal.cMB2WC(buf, len, NULL)); - } - - return true; -} - -#endif // wxUSE_UNICODE_WCHAR/wxUSE_UNICODE_UTF8 - -#elif defined(wxNEEDS_UTF16_FOR_TEXT_DATAOBJ) - -namespace -{ - -inline wxMBConv& GetConv(const wxDataFormat& format) -{ - static wxMBConvUTF16 s_UTF16Converter; - - return format == wxDF_UNICODETEXT ? static_cast(s_UTF16Converter) - : static_cast(wxConvLocal); -} - -} // anonymous namespace - -size_t wxTextDataObject::GetDataSize(const wxDataFormat& format) const -{ - return GetConv(format).WC2MB(NULL, GetText().wc_str(), 0); -} - -bool wxTextDataObject::GetDataHere(const wxDataFormat& format, void *buf) const -{ - if ( buf == NULL ) - return false; - - wxCharBuffer buffer(GetConv(format).cWX2MB(GetText().c_str())); - - memcpy(buf, buffer.data(), buffer.length()); - - return true; -} - -bool wxTextDataObject::SetData(const wxDataFormat& format, - size_t WXUNUSED(len), - const void *buf) -{ - if ( buf == NULL ) - return false; - - SetText(GetConv(format).cMB2WX(static_cast(buf))); - - return true; -} - -#else // !wxNEEDS_UTF{8,16}_FOR_TEXT_DATAOBJ - -// NB: This branch, using native wxChar for the clipboard, is only used under -// Windows currently. It's just a coincidence, but Windows is also the only -// platform where we need to convert the text to the native EOL format, so -// wxTextBuffer::Translate() is only used here and not in the code above. - -size_t wxTextDataObject::GetDataSize() const -{ - return (wxTextBuffer::Translate(GetText()).length() + 1)*sizeof(wxChar); -} - -bool wxTextDataObject::GetDataHere(void *buf) const -{ - const wxString textNative = wxTextBuffer::Translate(GetText()); - - // NOTE: use wxTmemcpy() instead of wxStrncpy() to allow - // retrieval of strings with embedded NULLs - wxTmemcpy(static_cast(buf), - textNative.t_str(), - textNative.length() + 1); - - return true; -} - -bool wxTextDataObject::SetData(size_t len, const void *buf) -{ - const wxString - text = wxString(static_cast(buf), len/sizeof(wxChar)); - SetText(wxTextBuffer::Translate(text, wxTextFileType_Unix)); - - return true; -} - -#endif // different wxTextDataObject implementations - -// ---------------------------------------------------------------------------- -// wxHTMLDataObject -// ---------------------------------------------------------------------------- - -size_t wxHTMLDataObject::GetDataSize() const -{ - // Ensure that the temporary string returned by GetHTML() is kept alive for - // as long as we need it here. - const wxString& htmlStr = GetHTML(); - const wxScopedCharBuffer buffer(htmlStr.utf8_str()); - - size_t size = buffer.length(); - -#ifdef __WXMSW__ - // On Windows we need to add some stuff to the string to satisfy - // its clipboard format requirements. - size += 400; -#endif - - return size; -} - -bool wxHTMLDataObject::GetDataHere(void *buf) const -{ - if ( !buf ) - return false; - - // Windows and Mac always use UTF-8, and docs suggest GTK does as well. - const wxString& htmlStr = GetHTML(); - const wxScopedCharBuffer html(htmlStr.utf8_str()); - if ( !html ) - return false; - - char* const buffer = static_cast(buf); - -#ifdef __WXMSW__ - // add the extra info that the MSW clipboard format requires. - - // Create a template string for the HTML header... - strcpy(buffer, - "Version:0.9\r\n" - "StartHTML:00000000\r\n" - "EndHTML:00000000\r\n" - "StartFragment:00000000\r\n" - "EndFragment:00000000\r\n" - "\r\n" - "\r\n"); - - // Append the HTML... - strcat(buffer, html); - strcat(buffer, "\r\n"); - // Finish up the HTML format... - strcat(buffer, - "\r\n" - "\r\n" - ""); - - // Now go back, calculate all the lengths, and write out the - // necessary header information. Note, wsprintf() truncates the - // string when you overwrite it so you follow up with code to replace - // the 0 appended at the end with a '\r'... - char *ptr = strstr(buffer, "StartHTML"); - sprintf(ptr+10, "%08u", (unsigned)(strstr(buffer, "") - buffer)); - *(ptr+10+8) = '\r'; - - ptr = strstr(buffer, "EndHTML"); - sprintf(ptr+8, "%08u", (unsigned)strlen(buffer)); - *(ptr+8+8) = '\r'; - - ptr = strstr(buffer, "StartFragment"); - sprintf(ptr+14, "%08u", (unsigned)(strstr(buffer, "", fragmentStart) + 3; - int endCommentStart = html.rfind(" ${OPENWINHOME}/lib - - The call wxExpandPath can convert these back! - */ -wxChar * -wxContractPath (const wxString& filename, - const wxString& envname, - const wxString& user) -{ - static wxChar dest[_MAXPATHLEN]; - - if (filename.empty()) - return NULL; - - wxStrcpy (dest, filename); -#ifdef __WINDOWS__ - wxUnix2DosFilename(dest); -#endif - - // Handle environment - wxString val; - wxChar *tcp; - if (!envname.empty() && !(val = wxGetenv (envname)).empty() && - (tcp = wxStrstr (dest, val)) != NULL) - { - wxStrcpy (wxFileFunctionsBuffer, tcp + val.length()); - *tcp++ = wxT('$'); - *tcp++ = wxT('{'); - wxStrcpy (tcp, envname); - wxStrcat (tcp, wxT("}")); - wxStrcat (tcp, wxFileFunctionsBuffer); - } - - // Handle User's home (ignore root homes!) - val = wxGetUserHome (user); - if (val.empty()) - return dest; - - const size_t len = val.length(); - if (len <= 2) - return dest; - - if (wxStrncmp(dest, val, len) == 0) - { - wxStrcpy(wxFileFunctionsBuffer, wxT("~")); - if (!user.empty()) - wxStrcat(wxFileFunctionsBuffer, user); - wxStrcat(wxFileFunctionsBuffer, dest + len); - wxStrcpy (dest, wxFileFunctionsBuffer); - } - - return dest; -} - -#endif // #if WXWIN_COMPATIBILITY_2_8 - -// Return just the filename, not the path (basename) -wxChar *wxFileNameFromPath (wxChar *path) -{ - wxString p = path; - wxString n = wxFileNameFromPath(p); - - return path + p.length() - n.length(); -} - -wxString wxFileNameFromPath (const wxString& path) -{ - return wxFileName(path).GetFullName(); -} - -// Return just the directory, or NULL if no directory -wxChar * -wxPathOnly (wxChar *path) -{ - if (path && *path) - { - static wxChar buf[_MAXPATHLEN]; - - int l = wxStrlen(path); - int i = l - 1; - if ( i >= _MAXPATHLEN ) - return NULL; - - // Local copy - wxStrcpy (buf, path); - - // Search backward for a backward or forward slash - while (i > -1) - { - // Unix like or Windows - if (path[i] == wxT('/') || path[i] == wxT('\\')) - { - buf[i] = 0; - return buf; - } -#ifdef __VMS__ - if (path[i] == wxT(']')) - { - buf[i+1] = 0; - return buf; - } -#endif - i --; - } - -#if defined(__WINDOWS__) - // Try Drive specifier - if (wxIsalpha (buf[0]) && buf[1] == wxT(':')) - { - // A:junk --> A:. (since A:.\junk Not A:\junk) - buf[2] = wxT('.'); - buf[3] = wxT('\0'); - return buf; - } -#endif - } - return NULL; -} - -// Return just the directory, or NULL if no directory -wxString wxPathOnly (const wxString& path) -{ - if (!path.empty()) - { - wxChar buf[_MAXPATHLEN]; - - int l = path.length(); - int i = l - 1; - - if ( i >= _MAXPATHLEN ) - return wxString(); - - // Local copy - wxStrcpy(buf, path); - - // Search backward for a backward or forward slash - while (i > -1) - { - // Unix like or Windows - if (path[i] == wxT('/') || path[i] == wxT('\\')) - { - // Don't return an empty string - if (i == 0) - i ++; - buf[i] = 0; - return wxString(buf); - } -#ifdef __VMS__ - if (path[i] == wxT(']')) - { - buf[i+1] = 0; - return wxString(buf); - } -#endif - i --; - } - -#if defined(__WINDOWS__) - // Try Drive specifier - if (wxIsalpha (buf[0]) && buf[1] == wxT(':')) - { - // A:junk --> A:. (since A:.\junk Not A:\junk) - buf[2] = wxT('.'); - buf[3] = wxT('\0'); - return wxString(buf); - } -#endif - } - return wxEmptyString; -} - -// Utility for converting delimiters in DOS filenames to UNIX style -// and back again - or we get nasty problems with delimiters. -// Also, convert to lower case, since case is significant in UNIX. - -#if defined(__WXMAC__) && !defined(__WXOSX_IPHONE__) - -#define kDefaultPathStyle kCFURLPOSIXPathStyle - -wxString wxMacFSRefToPath( const FSRef *fsRef , CFStringRef additionalPathComponent ) -{ - CFURLRef fullURLRef; - fullURLRef = CFURLCreateFromFSRef(NULL, fsRef); - if ( fullURLRef == NULL) - return wxEmptyString; - - if ( additionalPathComponent ) - { - CFURLRef parentURLRef = fullURLRef ; - fullURLRef = CFURLCreateCopyAppendingPathComponent(NULL, parentURLRef, - additionalPathComponent,false); - CFRelease( parentURLRef ) ; - } - wxCFStringRef cfString( CFURLCopyFileSystemPath(fullURLRef, kDefaultPathStyle )); - CFRelease( fullURLRef ) ; - - return wxCFStringRef::AsStringWithNormalizationFormC(cfString); -} - -OSStatus wxMacPathToFSRef( const wxString&path , FSRef *fsRef ) -{ - OSStatus err = noErr ; - CFMutableStringRef cfMutableString = CFStringCreateMutableCopy(NULL, 0, wxCFStringRef(path)); - CFStringNormalize(cfMutableString,kCFStringNormalizationFormD); - CFURLRef url = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, cfMutableString , kDefaultPathStyle, false); - CFRelease( cfMutableString ); - if ( NULL != url ) - { - if ( CFURLGetFSRef(url, fsRef) == false ) - err = fnfErr ; - CFRelease( url ) ; - } - else - { - err = fnfErr ; - } - return err ; -} - -wxString wxMacHFSUniStrToString( ConstHFSUniStr255Param uniname ) -{ - wxCFStringRef cfname( CFStringCreateWithCharacters( kCFAllocatorDefault, - uniname->unicode, - uniname->length ) ); - return wxCFStringRef::AsStringWithNormalizationFormC(cfname); -} - -#ifndef __LP64__ - -wxString wxMacFSSpec2MacFilename( const FSSpec *spec ) -{ - FSRef fsRef ; - if ( FSpMakeFSRef( spec , &fsRef) == noErr ) - { - return wxMacFSRefToPath( &fsRef ) ; - } - return wxEmptyString ; -} - -void wxMacFilename2FSSpec( const wxString& path , FSSpec *spec ) -{ - OSStatus err = noErr; - FSRef fsRef; - wxMacPathToFSRef( path , &fsRef ); - err = FSGetCatalogInfo(&fsRef, kFSCatInfoNone, NULL, NULL, spec, NULL); - verify_noerr( err ); -} -#endif - -#endif // __WXMAC__ - - -#if WXWIN_COMPATIBILITY_2_8 - -template -static void wxDoDos2UnixFilename(T *s) -{ - if (s) - while (*s) - { - if (*s == wxT('\\')) - *s = wxT('/'); -#ifdef __WINDOWS__ - else - *s = wxTolower(*s); // Case INDEPENDENT -#endif - s++; - } -} - -void wxDos2UnixFilename(char *s) { wxDoDos2UnixFilename(s); } -void wxDos2UnixFilename(wchar_t *s) { wxDoDos2UnixFilename(s); } - -template -static void -#if defined(__WINDOWS__) -wxDoUnix2DosFilename(T *s) -#else -wxDoUnix2DosFilename(T *WXUNUSED(s) ) -#endif -{ -// Yes, I really mean this to happen under DOS only! JACS -#if defined(__WINDOWS__) - if (s) - while (*s) - { - if (*s == wxT('/')) - *s = wxT('\\'); - s++; - } -#endif -} - -void wxUnix2DosFilename(char *s) { wxDoUnix2DosFilename(s); } -void wxUnix2DosFilename(wchar_t *s) { wxDoUnix2DosFilename(s); } - -#endif // #if WXWIN_COMPATIBILITY_2_8 - -// Concatenate two files to form third -bool -wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& file3) -{ -#if wxUSE_FILE - - wxFile in1(file1), in2(file2); - wxTempFile out(file3); - - if ( !in1.IsOpened() || !in2.IsOpened() || !out.IsOpened() ) - return false; - - ssize_t ofs; - unsigned char buf[1024]; - - for( int i=0; i<2; i++) - { - wxFile *in = i==0 ? &in1 : &in2; - do{ - if ( (ofs = in->Read(buf,WXSIZEOF(buf))) == wxInvalidOffset ) return false; - if ( ofs > 0 ) - if ( !out.Write(buf,ofs) ) - return false; - } while ( ofs == (ssize_t)WXSIZEOF(buf) ); - } - - return out.Commit(); - -#else - - wxUnusedVar(file1); - wxUnusedVar(file2); - wxUnusedVar(file3); - return false; - -#endif -} - -// helper of generic implementation of wxCopyFile() -#if !defined(__WIN32__) && wxUSE_FILE - -static bool -wxDoCopyFile(wxFile& fileIn, - const wxStructStat& fbuf, - const wxString& filenameDst, - bool overwrite) -{ - // reset the umask as we want to create the file with exactly the same - // permissions as the original one - wxCHANGE_UMASK(0); - - // create file2 with the same permissions than file1 and open it for - // writing - - wxFile fileOut; - if ( !fileOut.Create(filenameDst, overwrite, fbuf.st_mode & 0777) ) - return false; - - // copy contents of file1 to file2 - char buf[4096]; - for ( ;; ) - { - ssize_t count = fileIn.Read(buf, WXSIZEOF(buf)); - if ( count == wxInvalidOffset ) - return false; - - // end of file? - if ( !count ) - break; - - if ( fileOut.Write(buf, count) < (size_t)count ) - return false; - } - - // we can expect fileIn to be closed successfully, but we should ensure - // that fileOut was closed as some write errors (disk full) might not be - // detected before doing this - return fileIn.Close() && fileOut.Close(); -} - -#endif // generic implementation of wxCopyFile - -// Copy files -bool -wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite) -{ -#if defined(__WIN32__) - // CopyFile() copies file attributes and modification time too, so use it - // instead of our code if available - // - // NB: 3rd parameter is bFailIfExists i.e. the inverse of overwrite - if ( !::CopyFile(file1.t_str(), file2.t_str(), !overwrite) ) - { - wxLogSysError(_("Failed to copy the file '%s' to '%s'"), - file1.c_str(), file2.c_str()); - - return false; - } -#elif wxUSE_FILE // !Win32 - - wxStructStat fbuf; - // get permissions of file1 - if ( wxStat( file1, &fbuf) != 0 ) - { - // the file probably doesn't exist or we haven't the rights to read - // from it anyhow - wxLogSysError(_("Impossible to get permissions for file '%s'"), - file1.c_str()); - return false; - } - - // open file1 for reading - wxFile fileIn(file1, wxFile::read); - if ( !fileIn.IsOpened() ) - return false; - - // remove file2, if it exists. This is needed for creating - // file2 with the correct permissions in the next step - if ( wxFileExists(file2) && (!overwrite || !wxRemoveFile(file2))) - { - wxLogSysError(_("Impossible to overwrite the file '%s'"), - file2.c_str()); - return false; - } - - wxDoCopyFile(fileIn, fbuf, file2, overwrite); - -#if defined(__WXMAC__) - // copy the resource fork of the file too if it's present - wxString pathRsrcOut; - wxFile fileRsrcIn; - - { - // suppress error messages from this block as resource forks don't have - // to exist - wxLogNull noLog; - - // it's not enough to check for file existence: it always does on HFS - // but is empty for files without resources - if ( fileRsrcIn.Open(file1 + wxT("/..namedfork/rsrc")) && - fileRsrcIn.Length() > 0 ) - { - // we must be using HFS or another filesystem with resource fork - // support, suppose that destination file system also is HFS[-like] - pathRsrcOut = file2 + wxT("/..namedfork/rsrc"); - } - else // check if we have resource fork in separate file (non-HFS case) - { - wxFileName fnRsrc(file1); - fnRsrc.SetName(wxT("._") + fnRsrc.GetName()); - - fileRsrcIn.Close(); - if ( fileRsrcIn.Open( fnRsrc.GetFullPath() ) ) - { - fnRsrc = file2; - fnRsrc.SetName(wxT("._") + fnRsrc.GetName()); - - pathRsrcOut = fnRsrc.GetFullPath(); - } - } - } - - if ( !pathRsrcOut.empty() ) - { - if ( !wxDoCopyFile(fileRsrcIn, fbuf, pathRsrcOut, overwrite) ) - return false; - } -#endif // wxMac - - if ( chmod(file2.fn_str(), fbuf.st_mode) != 0 ) - { - wxLogSysError(_("Impossible to set permissions for the file '%s'"), - file2.c_str()); - return false; - } - -#else // !Win32 && ! wxUSE_FILE - - // impossible to simulate with wxWidgets API - wxUnusedVar(file1); - wxUnusedVar(file2); - wxUnusedVar(overwrite); - return false; - -#endif // __WINDOWS__ && __WIN32__ - - return true; -} - -bool -wxRenameFile(const wxString& file1, const wxString& file2, bool overwrite) -{ - if ( !overwrite && wxFileExists(file2) ) - { - wxLogSysError - ( - _("Failed to rename the file '%s' to '%s' because the destination file already exists."), - file1.c_str(), file2.c_str() - ); - - return false; - } - - // Normal system call - if ( wxRename (file1, file2) == 0 ) - return true; - - // Try to copy - if (wxCopyFile(file1, file2, overwrite)) { - wxRemoveFile(file1); - return true; - } - // Give up - wxLogSysError(_("File '%s' couldn't be renamed '%s'"), file1, file2); - return false; -} - -bool wxRemoveFile(const wxString& file) -{ -#if defined(__VISUALC__) \ - || defined(__BORLANDC__) \ - || defined(__GNUWIN32__) - int res = wxRemove(file); -#elif defined(__WXMAC__) - int res = unlink(file.fn_str()); -#else - int res = unlink(file.fn_str()); -#endif - if ( res ) - { - wxLogSysError(_("File '%s' couldn't be removed"), file); - } - return res == 0; -} - -bool wxMkdir(const wxString& dir, int perm) -{ -#if defined(__WXMAC__) && !defined(__UNIX__) - if ( mkdir(dir.fn_str(), 0) != 0 ) - - // assume mkdir() has 2 args on non Windows-OS/2 platforms and on Windows too - // for the GNU compiler -#elif (!defined(__WINDOWS__)) || \ - (defined(__GNUWIN32__) && !defined(__MINGW32__)) || \ - defined(__WINE__) - const wxChar *dirname = dir.c_str(); - #if defined(MSVCRT) - wxUnusedVar(perm); - if ( mkdir(wxFNCONV(dirname)) != 0 ) - #else - if ( mkdir(wxFNCONV(dirname), perm) != 0 ) - #endif -#else // !MSW and !OS/2 VAC++ - wxUnusedVar(perm); - if ( wxMkDir(dir.fn_str()) != 0 ) -#endif // !MSW/MSW - { - wxLogSysError(_("Directory '%s' couldn't be created"), dir); - return false; - } - - return true; -} - -bool wxRmdir(const wxString& dir, int WXUNUSED(flags)) -{ -#if defined(__VMS__) - return false; //to be changed since rmdir exists in VMS7.x -#else - if ( wxRmDir(dir.fn_str()) != 0 ) - { - wxLogSysError(_("Directory '%s' couldn't be deleted"), dir); - return false; - } - - return true; -#endif -} - -// does the path exists? (may have or not '/' or '\\' at the end) -bool wxDirExists(const wxString& pathName) -{ - return wxFileName::DirExists(pathName); -} - -#if WXWIN_COMPATIBILITY_2_8 - -// Get a temporary filename, opening and closing the file. -wxChar *wxGetTempFileName(const wxString& prefix, wxChar *buf) -{ - wxString filename; - if ( !wxGetTempFileName(prefix, filename) ) - return NULL; - - if ( buf ) - wxStrcpy(buf, filename); - else - buf = MYcopystring(filename); - - return buf; -} - -bool wxGetTempFileName(const wxString& prefix, wxString& buf) -{ -#if wxUSE_FILE - buf = wxFileName::CreateTempFileName(prefix); - - return !buf.empty(); -#else // !wxUSE_FILE - wxUnusedVar(prefix); - wxUnusedVar(buf); - - return false; -#endif // wxUSE_FILE/!wxUSE_FILE -} - -#endif // #if WXWIN_COMPATIBILITY_2_8 - -// Get first file name matching given wild card. - -static wxScopedPtr gs_dir; -static wxString gs_dirPath; - -wxString wxFindFirstFile(const wxString& spec, int flags) -{ - wxFileName::SplitPath(spec, &gs_dirPath, NULL, NULL); - if ( gs_dirPath.empty() ) - gs_dirPath = wxT("."); - if ( !wxEndsWithPathSeparator(gs_dirPath ) ) - gs_dirPath << wxFILE_SEP_PATH; - - gs_dir.reset(new wxDir(gs_dirPath)); - - if ( !gs_dir->IsOpened() ) - { - wxLogSysError(_("Cannot enumerate files '%s'"), spec); - return wxEmptyString; - } - - int dirFlags; - switch (flags) - { - case wxDIR: dirFlags = wxDIR_DIRS; break; - case wxFILE: dirFlags = wxDIR_FILES; break; - default: dirFlags = wxDIR_DIRS | wxDIR_FILES; break; - } - - wxString result; - gs_dir->GetFirst(&result, wxFileNameFromPath(spec), dirFlags); - if ( result.empty() ) - return result; - - return gs_dirPath + result; -} - -wxString wxFindNextFile() -{ - wxCHECK_MSG( gs_dir, "", "You must call wxFindFirstFile before!" ); - - wxString result; - if ( !gs_dir->GetNext(&result) || result.empty() ) - return result; - - return gs_dirPath + result; -} - - -// Get current working directory. -// If buf is NULL, allocates space using new, else copies into buf. -// wxGetWorkingDirectory() is obsolete, use wxGetCwd() -// wxDoGetCwd() is their common core to be moved -// to wxGetCwd() once wxGetWorkingDirectory() will be removed. -// Do not expose wxDoGetCwd in headers! - -wxChar *wxDoGetCwd(wxChar *buf, int sz) -{ - if ( !buf ) - { - buf = new wxChar[sz + 1]; - } - - bool ok = false; - - // for the compilers which have Unicode version of _getcwd(), call it - // directly, for the others call the ANSI version and do the translation -#if !wxUSE_UNICODE - #define cbuf buf -#else // wxUSE_UNICODE - bool needsANSI = true; - - #if !defined(HAVE_WGETCWD) - char cbuf[_MAXPATHLEN]; - #endif - - #ifdef HAVE_WGETCWD - char *cbuf = NULL; // never really used because needsANSI will always be false - { - ok = _wgetcwd(buf, sz) != NULL; - needsANSI = false; - } - #endif - - if ( needsANSI ) -#endif // wxUSE_UNICODE - { - #if defined(_MSC_VER) || defined(__MINGW32__) - ok = _getcwd(cbuf, sz) != NULL; - #else // !Win32/VC++ !Mac - ok = getcwd(cbuf, sz) != NULL; - #endif // platform - - #if wxUSE_UNICODE - // finally convert the result to Unicode if needed - wxConvFile.MB2WC(buf, cbuf, sz); - #endif // wxUSE_UNICODE - } - - if ( !ok ) - { - wxLogSysError(_("Failed to get the working directory")); - - // VZ: the old code used to return "." on error which didn't make any - // sense at all to me - empty string is a better error indicator - // (NULL might be even better but I'm afraid this could lead to - // problems with the old code assuming the return is never NULL) - buf[0] = wxT('\0'); - } - else // ok, but we might need to massage the path into the right format - { -// MBN: we hope that in the case the user is compiling a GTK+/Motif app, -// he needs Unix as opposed to Win32 pathnames -#if defined( __CYGWIN__ ) && defined( __WINDOWS__ ) - // another example of DOS/Unix mix (Cygwin) - wxString pathUnix = buf; -#if wxUSE_UNICODE - #if CYGWIN_VERSION_DLL_MAJOR >= 1007 - cygwin_conv_path(CCP_POSIX_TO_WIN_W, pathUnix.mb_str(wxConvFile), buf, sz); - #else - char bufA[_MAXPATHLEN]; - cygwin_conv_to_full_win32_path(pathUnix.mb_str(wxConvFile), bufA); - wxConvFile.MB2WC(buf, bufA, sz); - #endif -#else - #if CYGWIN_VERSION_DLL_MAJOR >= 1007 - cygwin_conv_path(CCP_POSIX_TO_WIN_A, pathUnix, buf, sz); - #else - cygwin_conv_to_full_win32_path(pathUnix, buf); - #endif -#endif // wxUSE_UNICODE -#endif // __CYGWIN__ - } - - return buf; - -#if !wxUSE_UNICODE - #undef cbuf -#endif - -} - -wxString wxGetCwd() -{ - wxString str; - wxDoGetCwd(wxStringBuffer(str, _MAXPATHLEN), _MAXPATHLEN); - return str; -} - -bool wxSetWorkingDirectory(const wxString& d) -{ - bool success = false; -#if defined(__UNIX__) || defined(__WXMAC__) - success = (chdir(d.fn_str()) == 0); -#elif defined(__WINDOWS__) - success = (SetCurrentDirectory(d.t_str()) != 0); -#endif - if ( !success ) - { - wxLogSysError(_("Could not set current working directory")); - } - return success; -} - -// Get the OS directory if appropriate (such as the Windows directory). -// On non-Windows platform, probably just return the empty string. -wxString wxGetOSDirectory() -{ -#if defined(__WINDOWS__) - wxChar buf[MAX_PATH]; - if ( !GetWindowsDirectory(buf, MAX_PATH) ) - { - wxLogLastError(wxS("GetWindowsDirectory")); - } - - return wxString(buf); -#else - return wxEmptyString; -#endif -} - -bool wxEndsWithPathSeparator(const wxString& filename) -{ - return !filename.empty() && wxIsPathSeparator(filename.Last()); -} - -// find a file in a list of directories, returns false if not found -bool wxFindFileInPath(wxString *pStr, const wxString& szPath, const wxString& szFile) -{ - // we assume that it's not empty - wxCHECK_MSG( !szFile.empty(), false, - wxT("empty file name in wxFindFileInPath")); - - // skip path separator in the beginning of the file name if present - wxString szFile2; - if ( wxIsPathSeparator(szFile[0u]) ) - szFile2 = szFile.Mid(1); - else - szFile2 = szFile; - - wxStringTokenizer tkn(szPath, wxPATH_SEP); - - while ( tkn.HasMoreTokens() ) - { - wxString strFile = tkn.GetNextToken(); - if ( !wxEndsWithPathSeparator(strFile) ) - strFile += wxFILE_SEP_PATH; - strFile += szFile2; - - if ( wxFileExists(strFile) ) - { - *pStr = strFile; - return true; - } - } - - return false; -} - -#if WXWIN_COMPATIBILITY_2_8 -void WXDLLIMPEXP_BASE wxSplitPath(const wxString& fileName, - wxString *pstrPath, - wxString *pstrName, - wxString *pstrExt) -{ - wxFileName::SplitPath(fileName, pstrPath, pstrName, pstrExt); -} -#endif // #if WXWIN_COMPATIBILITY_2_8 - -#if wxUSE_DATETIME - -time_t WXDLLIMPEXP_BASE wxFileModificationTime(const wxString& filename) -{ - wxDateTime mtime; - if ( !wxFileName(filename).GetTimes(NULL, &mtime, NULL) ) - return (time_t)-1; - - return mtime.GetTicks(); -} - -#endif // wxUSE_DATETIME - - -// Parses the filterStr, returning the number of filters. -// Returns 0 if none or if there's a problem. -// filterStr is in the form: "All files (*.*)|*.*|JPEG Files (*.jpeg)|*.jpeg" - -int WXDLLIMPEXP_BASE wxParseCommonDialogsFilter(const wxString& filterStr, - wxArrayString& descriptions, - wxArrayString& filters) -{ - descriptions.Clear(); - filters.Clear(); - - wxString str(filterStr); - - wxString description, filter; - int pos = 0; - while( pos != wxNOT_FOUND ) - { - pos = str.Find(wxT('|')); - if ( pos == wxNOT_FOUND ) - { - // if there are no '|'s at all in the string just take the entire - // string as filter and make description empty for later autocompletion - if ( filters.IsEmpty() ) - { - descriptions.Add(wxEmptyString); - filters.Add(filterStr); - } - else - { - wxFAIL_MSG( wxT("missing '|' in the wildcard string!") ); - } - - break; - } - - description = str.Left(pos); - str = str.Mid(pos + 1); - pos = str.Find(wxT('|')); - if ( pos == wxNOT_FOUND ) - { - filter = str; - } - else - { - filter = str.Left(pos); - str = str.Mid(pos + 1); - } - - descriptions.Add(description); - filters.Add(filter); - } - -#if defined(__WXMOTIF__) - // split it so there is one wildcard per entry - for( size_t i = 0 ; i < descriptions.GetCount() ; i++ ) - { - pos = filters[i].Find(wxT(';')); - if (pos != wxNOT_FOUND) - { - // first split only filters - descriptions.Insert(descriptions[i],i+1); - filters.Insert(filters[i].Mid(pos+1),i+1); - filters[i]=filters[i].Left(pos); - - // autoreplace new filter in description with pattern: - // C/C++ Files(*.cpp;*.c;*.h)|*.cpp;*.c;*.h - // cause split into: - // C/C++ Files(*.cpp)|*.cpp - // C/C++ Files(*.c;*.h)|*.c;*.h - // and next iteration cause another split into: - // C/C++ Files(*.cpp)|*.cpp - // C/C++ Files(*.c)|*.c - // C/C++ Files(*.h)|*.h - for ( size_t k=i;kbefore.Find(wxT(')'),true)) - { - before = before.Left(pos+1); - before << filters[k]; - pos = after.Find(wxT(')')); - int pos1 = after.Find(wxT('(')); - if (pos != wxNOT_FOUND && (pos -* -* The match procedure is public domain code (from ircII's reg.c) -* but modified to suit our tastes (RN: No "%" syntax I guess) -*/ - -bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special ) -{ - if (text.empty()) - { - /* Match if both are empty. */ - return pat.empty(); - } - - const wxChar *m = pat.c_str(), - *n = text.c_str(), - *ma = NULL, - *na = NULL; - int just = 0, - acount = 0, - count = 0; - - if (dot_special && (*n == wxT('.'))) - { - /* Never match so that hidden Unix files - * are never found. */ - return false; - } - - for (;;) - { - if (*m == wxT('*')) - { - ma = ++m; - na = n; - just = 1; - acount = count; - } - else if (*m == wxT('?')) - { - m++; - if (!*n++) - return false; - } - else - { - if (*m == wxT('\\')) - { - m++; - /* Quoting "nothing" is a bad thing */ - if (!*m) - return false; - } - if (!*m) - { - /* - * If we are out of both strings or we just - * saw a wildcard, then we can say we have a - * match - */ - if (!*n) - return true; - if (just) - return true; - just = 0; - goto not_matched; - } - /* - * We could check for *n == NULL at this point, but - * since it's more common to have a character there, - * check to see if they match first (m and n) and - * then if they don't match, THEN we can check for - * the NULL of n - */ - just = 0; - if (*m == *n) - { - m++; - count++; - n++; - } - else - { - - not_matched: - - /* - * If there are no more characters in the - * string, but we still need to find another - * character (*m != NULL), then it will be - * impossible to match it - */ - if (!*n) - return false; - - if (ma) - { - m = ma; - n = ++na; - count = acount; - } - else - return false; - } - } - } -} - -#ifdef __VISUALC__ - #pragma warning(default:4706) // assignment within conditional expression -#endif // VC++ diff --git a/Externals/wxWidgets3/src/common/filehistorycmn.cpp b/Externals/wxWidgets3/src/common/filehistorycmn.cpp deleted file mode 100644 index 4654188081..0000000000 --- a/Externals/wxWidgets3/src/common/filehistorycmn.cpp +++ /dev/null @@ -1,307 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/filehistorycmn.cpp -// Purpose: wxFileHistory class -// Author: Julian Smart, Vaclav Slavik, Vadim Zeitlin -// Created: 2010-05-03 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include "wx/filehistory.h" - -#if wxUSE_FILE_HISTORY - -#include "wx/menu.h" -#include "wx/confbase.h" -#include "wx/filename.h" - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// private helpers -// ---------------------------------------------------------------------------- - -namespace -{ - -// return the string used for the MRU list items in the menu -// -// NB: the index n is 0-based, as usual, but the strings start from 1 -wxString GetMRUEntryLabel(int n, const wxString& path) -{ - // we need to quote '&' characters which are used for mnemonics - wxString pathInMenu(path); - pathInMenu.Replace("&", "&&"); - - return wxString::Format("&%d %s", n + 1, pathInMenu); -} - -} // anonymous namespace - -// ---------------------------------------------------------------------------- -// File history (a.k.a. MRU, most recently used, files list) -// ---------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxFileHistory, wxObject); - -wxFileHistoryBase::wxFileHistoryBase(size_t maxFiles, wxWindowID idBase) -{ - m_fileMaxFiles = maxFiles; - m_idBase = idBase; -} - -/* static */ -wxString wxFileHistoryBase::NormalizeFileName(const wxFileName& fn) -{ - // We specifically exclude wxPATH_NORM_LONG here as it can take a long time - // (several seconds) for network file paths under MSW, resulting in huge - // delays when opening a program using wxFileHistory. We also exclude - // wxPATH_NORM_ENV_VARS as the file names here are supposed to be "real" - // file names and not have any environment variables in them. - wxFileName fnNorm(fn); - fnNorm.Normalize(wxPATH_NORM_DOTS | - wxPATH_NORM_TILDE | - wxPATH_NORM_CASE | - wxPATH_NORM_ABSOLUTE); - return fnNorm.GetFullPath(); -} - -void wxFileHistoryBase::AddFileToHistory(const wxString& file) -{ - // Check if we don't already have this file. Notice that we avoid - // wxFileName::operator==(wxString) here as it converts the string to - // wxFileName and then normalizes it using all normalizations which is too - // slow (see the comment above), so we use our own quick normalization - // functions and a string comparison. - const wxFileName fnNew(file); - const wxString newFile = NormalizeFileName(fnNew); - size_t i, - numFiles = m_fileHistory.size(); - for ( i = 0; i < numFiles; i++ ) - { - if ( newFile == NormalizeFileName(m_fileHistory[i]) ) - { - // we do have it, move it to the top of the history - RemoveFileFromHistory(i); - numFiles--; - break; - } - } - - // if we already have a full history, delete the one at the end - if ( numFiles == m_fileMaxFiles ) - { - RemoveFileFromHistory(--numFiles); - } - - // add a new menu item to all file menus (they will be updated below) - for ( wxList::compatibility_iterator node = m_fileMenus.GetFirst(); - node; - node = node->GetNext() ) - { - wxMenu * const menu = (wxMenu *)node->GetData(); - - if ( !numFiles && menu->GetMenuItemCount() ) - menu->AppendSeparator(); - - // label doesn't matter, it will be set below anyhow, but it can't - // be empty (this is supposed to indicate a stock item) - menu->Append(m_idBase + numFiles, " "); - } - - // insert the new file in the beginning of the file history - m_fileHistory.insert(m_fileHistory.begin(), file); - numFiles++; - - // update the labels in all menus - for ( i = 0; i < numFiles; i++ ) - { - // if in same directory just show the filename; otherwise the full path - const wxFileName fnOld(m_fileHistory[i]); - - wxString pathInMenu; - if ( (fnOld.GetPath() == fnNew.GetPath()) && fnOld.HasName() ) - { - pathInMenu = fnOld.GetFullName(); - } - else // file in different directory or it's not a file but a directory - { - // absolute path; could also set relative path - pathInMenu = m_fileHistory[i]; - } - - for ( wxList::compatibility_iterator node = m_fileMenus.GetFirst(); - node; - node = node->GetNext() ) - { - wxMenu * const menu = (wxMenu *)node->GetData(); - - menu->SetLabel(m_idBase + i, GetMRUEntryLabel(i, pathInMenu)); - } - } -} - -void wxFileHistoryBase::RemoveFileFromHistory(size_t i) -{ - size_t numFiles = m_fileHistory.size(); - wxCHECK_RET( i < numFiles, - wxT("invalid index in wxFileHistoryBase::RemoveFileFromHistory") ); - - // delete the element from the array - m_fileHistory.RemoveAt(i); - numFiles--; - - for ( wxList::compatibility_iterator node = m_fileMenus.GetFirst(); - node; - node = node->GetNext() ) - { - wxMenu * const menu = (wxMenu *) node->GetData(); - - // shift filenames up - for ( size_t j = i; j < numFiles; j++ ) - { - menu->SetLabel(m_idBase + j, GetMRUEntryLabel(j, m_fileHistory[j])); - } - - // delete the last menu item which is unused now - const wxWindowID lastItemId = m_idBase + numFiles; - if ( menu->FindItem(lastItemId) ) - menu->Delete(lastItemId); - - // delete the last separator too if no more files are left - if ( m_fileHistory.empty() ) - { - const wxMenuItemList::compatibility_iterator - nodeLast = menu->GetMenuItems().GetLast(); - if ( nodeLast ) - { - wxMenuItem * const lastMenuItem = nodeLast->GetData(); - if ( lastMenuItem->IsSeparator() ) - menu->Delete(lastMenuItem); - } - //else: menu is empty somehow - } - } -} - -void wxFileHistoryBase::UseMenu(wxMenu *menu) -{ - if ( !m_fileMenus.Member(menu) ) - m_fileMenus.Append(menu); -} - -void wxFileHistoryBase::RemoveMenu(wxMenu *menu) -{ - m_fileMenus.DeleteObject(menu); -} - -#if wxUSE_CONFIG -void wxFileHistoryBase::Load(const wxConfigBase& config) -{ - RemoveExistingHistory(); - - m_fileHistory.Clear(); - - wxString buf; - buf.Printf(wxT("file%d"), 1); - - wxString historyFile; - while ((m_fileHistory.GetCount() < m_fileMaxFiles) && - config.Read(buf, &historyFile) && !historyFile.empty()) - { - m_fileHistory.Add(historyFile); - - buf.Printf(wxT("file%d"), (int)m_fileHistory.GetCount()+1); - historyFile = wxEmptyString; - } - - AddFilesToMenu(); -} - -void wxFileHistoryBase::Save(wxConfigBase& config) -{ - size_t i; - for (i = 0; i < m_fileMaxFiles; i++) - { - wxString buf; - buf.Printf(wxT("file%d"), (int)i+1); - if (i < m_fileHistory.GetCount()) - config.Write(buf, wxString(m_fileHistory[i])); - else - config.Write(buf, wxEmptyString); - } -} -#endif // wxUSE_CONFIG - -void wxFileHistoryBase::AddFilesToMenu() -{ - if ( m_fileHistory.empty() ) - return; - - for ( wxList::compatibility_iterator node = m_fileMenus.GetFirst(); - node; - node = node->GetNext() ) - { - AddFilesToMenu((wxMenu *) node->GetData()); - } -} - -void wxFileHistoryBase::AddFilesToMenu(wxMenu* menu) -{ - if ( m_fileHistory.empty() ) - return; - - if ( menu->GetMenuItemCount() ) - menu->AppendSeparator(); - - for ( size_t i = 0; i < m_fileHistory.GetCount(); i++ ) - { - menu->Append(m_idBase + i, GetMRUEntryLabel(i, m_fileHistory[i])); - } -} - -void wxFileHistoryBase::RemoveExistingHistory() -{ - size_t count = m_fileHistory.GetCount(); - if ( !count ) - return; - - for ( wxList::compatibility_iterator node = m_fileMenus.GetFirst(); - node; - node = node->GetNext() ) - { - wxMenu * const menu = static_cast(node->GetData()); - - // Notice that we remove count+1 items from the menu as we also remove - // the separator preceding them. - for ( size_t n = 0; n <= count; n++ ) - { - const wxMenuItemList::compatibility_iterator - nodeLast = menu->GetMenuItems().GetLast(); - if ( nodeLast ) - { - wxMenuItem * const lastMenuItem = nodeLast->GetData(); - menu->Delete(lastMenuItem); - } - } - } -} - -#endif // wxUSE_FILE_HISTORY diff --git a/Externals/wxWidgets3/src/common/filename.cpp b/Externals/wxWidgets3/src/common/filename.cpp deleted file mode 100644 index edcacc3b1d..0000000000 --- a/Externals/wxWidgets3/src/common/filename.cpp +++ /dev/null @@ -1,2777 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/filename.cpp -// Purpose: wxFileName - encapsulates a file path -// Author: Robert Roebling, Vadim Zeitlin -// Modified by: -// Created: 28.12.2000 -// Copyright: (c) 2000 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -/* - Here are brief descriptions of the filename formats supported by this class: - - wxPATH_UNIX: standard Unix format, used under Darwin as well, absolute file - names have the form: - /dir1/dir2/.../dirN/filename, "." and ".." stand for the - current and parent directory respectively, "~" is parsed as the - user HOME and "~username" as the HOME of that user - - wxPATH_DOS: DOS/Windows format, absolute file names have the form: - drive:\dir1\dir2\...\dirN\filename.ext where drive is a single - letter. "." and ".." as for Unix but no "~". - - There are also UNC names of the form \\share\fullpath and - MSW unique volume names of the form \\?\Volume{GUID}\fullpath. - - The latter provide a uniform way to access a volume regardless of - its current mount point, i.e. you can change a volume's mount - point from D: to E:, or even remove it, and still be able to - access it through its unique volume name. More on the subject can - be found in MSDN's article "Naming a Volume" that is currently at - http://msdn.microsoft.com/en-us/library/aa365248(VS.85).aspx. - - - wxPATH_MAC: Mac OS 8/9 only, not used any longer, absolute file - names have the form - volume:dir1:...:dirN:filename - and the relative file names are either - :dir1:...:dirN:filename - or just - filename - (although :filename works as well). - Since the volume is just part of the file path, it is not - treated like a separate entity as it is done under DOS and - VMS, it is just treated as another dir. - - wxPATH_VMS: VMS native format, absolute file names have the form - :[dir1.dir2.dir3]file.txt - or - :[000000.dir1.dir2.dir3]file.txt - - the is the physical device (i.e. disk). 000000 is the - root directory on the device which can be omitted. - - Note that VMS uses different separators unlike Unix: - : always after the device. If the path does not contain : than - the default (the device of the current directory) is assumed. - [ start of directory specification - . separator between directory and subdirectory - ] between directory and file - */ - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ -#pragma hdrstop -#endif - -#ifndef WX_PRECOMP - #ifdef __WINDOWS__ - #include "wx/msw/wrapwin.h" // For GetShort/LongPathName - #endif - #include "wx/dynarray.h" - #include "wx/intl.h" - #include "wx/log.h" - #include "wx/utils.h" - #include "wx/crt.h" -#endif - -#include "wx/filename.h" -#include "wx/private/filename.h" -#include "wx/tokenzr.h" -#include "wx/config.h" // for wxExpandEnvVars -#include "wx/dynlib.h" -#include "wx/dir.h" -#include "wx/longlong.h" - -#if defined(__WIN32__) && defined(__MINGW32__) - #include "wx/msw/gccpriv.h" -#endif - -#ifdef __WINDOWS__ - #include "wx/msw/private.h" - #include // for CLSID_ShellLink - #include "wx/msw/missing.h" - #include "wx/msw/ole/oleutils.h" - #include "wx/msw/private/comptr.h" -#endif - -#if defined(__WXMAC__) - #include "wx/osx/private.h" // includes mac headers -#endif - -// utime() is POSIX so should normally be available on all Unices -#ifdef __UNIX_LIKE__ -#include -#include -#include -#include -#endif - -#ifndef S_ISREG - #define S_ISREG(mode) ((mode) & S_IFREG) -#endif -#ifndef S_ISDIR - #define S_ISDIR(mode) ((mode) & S_IFDIR) -#endif - -#if wxUSE_LONGLONG -extern const wxULongLong wxInvalidSize = (unsigned)-1; -#endif // wxUSE_LONGLONG - -namespace -{ - -// ---------------------------------------------------------------------------- -// private classes -// ---------------------------------------------------------------------------- - -// small helper class which opens and closes the file - we use it just to get -// a file handle for the given file name to pass it to some Win32 API function -#if defined(__WIN32__) - -class wxFileHandle -{ -public: - enum OpenMode - { - ReadAttr, - WriteAttr - }; - - wxFileHandle(const wxString& filename, OpenMode mode, int flags = 0) - { - // be careful and use FILE_{READ,WRITE}_ATTRIBUTES here instead of the - // usual GENERIC_{READ,WRITE} as we don't want the file access time to - // be changed when we open it because this class is used for setting - // access time (see #10567) - m_hFile = ::CreateFile - ( - filename.t_str(), // name - mode == ReadAttr ? FILE_READ_ATTRIBUTES // access mask - : FILE_WRITE_ATTRIBUTES, - FILE_SHARE_READ | // sharing mode - FILE_SHARE_WRITE, // (allow everything) - NULL, // no secutity attr - OPEN_EXISTING, // creation disposition - flags, // flags - NULL // no template file - ); - - if ( m_hFile == INVALID_HANDLE_VALUE ) - { - if ( mode == ReadAttr ) - { - wxLogSysError(_("Failed to open '%s' for reading"), - filename.c_str()); - } - else - { - wxLogSysError(_("Failed to open '%s' for writing"), - filename.c_str()); - } - } - } - - ~wxFileHandle() - { - if ( m_hFile != INVALID_HANDLE_VALUE ) - { - if ( !::CloseHandle(m_hFile) ) - { - wxLogSysError(_("Failed to close file handle")); - } - } - } - - // return true only if the file could be opened successfully - bool IsOk() const { return m_hFile != INVALID_HANDLE_VALUE; } - - // get the handle - operator HANDLE() const { return m_hFile; } - -private: - HANDLE m_hFile; -}; - -#endif // __WIN32__ - -// ---------------------------------------------------------------------------- -// private functions -// ---------------------------------------------------------------------------- - -#if wxUSE_DATETIME && defined(__WIN32__) - -// Convert between wxDateTime and FILETIME which is a 64-bit value representing -// the number of 100-nanosecond intervals since January 1, 1601 UTC. -// -// This is the offset between FILETIME epoch and the Unix/wxDateTime Epoch. -static wxInt64 EPOCH_OFFSET_IN_MSEC = wxLL(11644473600000); - -static void ConvertFileTimeToWx(wxDateTime *dt, const FILETIME &ft) -{ - wxLongLong t(ft.dwHighDateTime, ft.dwLowDateTime); - t /= 10000; // Convert hundreds of nanoseconds to milliseconds. - t -= EPOCH_OFFSET_IN_MSEC; - - *dt = wxDateTime(t); -} - -static void ConvertWxToFileTime(FILETIME *ft, const wxDateTime& dt) -{ - // Undo the conversions above. - wxLongLong t(dt.GetValue()); - t += EPOCH_OFFSET_IN_MSEC; - t *= 10000; - - ft->dwHighDateTime = t.GetHi(); - ft->dwLowDateTime = t.GetLo(); -} - -#endif // wxUSE_DATETIME && __WIN32__ - -// return a string with the volume par -static wxString wxGetVolumeString(const wxString& volume, wxPathFormat format) -{ - wxString path; - - if ( !volume.empty() ) - { - format = wxFileName::GetFormat(format); - - // Special Windows UNC paths hack, part 2: undo what we did in - // SplitPath() and make an UNC path if we have a drive which is not a - // single letter (hopefully the network shares can't be one letter only - // although I didn't find any authoritative docs on this) - if ( format == wxPATH_DOS && volume.length() > 1 ) - { - // We also have to check for Windows unique volume names here and - // return it with '\\?\' prepended to it - if ( wxFileName::IsMSWUniqueVolumeNamePath("\\\\?\\" + volume + "\\", - format) ) - { - path << "\\\\?\\" << volume; - } - else - { - // it must be a UNC path - path << wxFILE_SEP_PATH_DOS << wxFILE_SEP_PATH_DOS << volume; - } - } - else if ( format == wxPATH_DOS || format == wxPATH_VMS ) - { - path << volume << wxFileName::GetVolumeSeparator(format); - } - // else ignore - } - - return path; -} - -// return true if the character is a DOS path separator i.e. either a slash or -// a backslash -inline bool IsDOSPathSep(wxUniChar ch) -{ - return ch == wxFILE_SEP_PATH_DOS || ch == wxFILE_SEP_PATH_UNIX; -} - -// return true if the format used is the DOS/Windows one and the string looks -// like a UNC path -static bool IsUNCPath(const wxString& path, wxPathFormat format) -{ - return format == wxPATH_DOS && - path.length() >= 4 && // "\\a" can't be a UNC path - IsDOSPathSep(path[0u]) && - IsDOSPathSep(path[1u]) && - !IsDOSPathSep(path[2u]); -} - -// Under Unix-ish systems (basically everything except Windows but we can't -// just test for non-__WIN32__ because Cygwin defines it, yet we want to use -// lstat() under it, so test for all the rest explicitly) we may work either -// with the file itself or its target if it's a symbolic link and we should -// dereference it, as determined by wxFileName::ShouldFollowLink() and the -// absence of the wxFILE_EXISTS_NO_FOLLOW flag. StatAny() can be used to stat -// the appropriate file with an extra twist that it also works when there is no -// wxFileName object at all, as is the case in static methods. - -#if defined(__UNIX_LIKE__) || defined(__WXMAC__) - #define wxHAVE_LSTAT -#endif - -#ifdef wxHAVE_LSTAT - -// Private implementation, don't call directly, use one of the overloads below. -bool DoStatAny(wxStructStat& st, wxString path, bool dereference) -{ - // We need to remove any trailing slashes from the path because they could - // interfere with the symlink following decision: even if we use lstat(), - // it would still follow the symlink if we pass it a path with a slash at - // the end because the symlink resolution would happen while following the - // path and not for the last path element itself. - - while ( wxEndsWithPathSeparator(path) ) - { - const size_t posLast = path.length() - 1; - if ( !posLast ) - { - // Don't turn "/" into empty string. - break; - } - - path.erase(posLast); - } - - int ret = dereference ? wxStat(path, &st) : wxLstat(path, &st); - return ret == 0; -} - -// Overloads to use for a case when we don't have wxFileName object and when we -// do have one. -inline -bool StatAny(wxStructStat& st, const wxString& path, int flags) -{ - return DoStatAny(st, path, !(flags & wxFILE_EXISTS_NO_FOLLOW)); -} - -inline -bool StatAny(wxStructStat& st, const wxFileName& fn) -{ - return DoStatAny(st, fn.GetFullPath(), fn.ShouldFollowLink()); -} - -#endif // wxHAVE_LSTAT - -// ---------------------------------------------------------------------------- -// private constants -// ---------------------------------------------------------------------------- - -// length of \\?\Volume{xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}\ string -static const size_t wxMSWUniqueVolumePrefixLength = 49; - -} // anonymous namespace - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxFileName construction -// ---------------------------------------------------------------------------- - -void wxFileName::Assign( const wxFileName &filepath ) -{ - m_volume = filepath.GetVolume(); - m_dirs = filepath.GetDirs(); - m_name = filepath.GetName(); - m_ext = filepath.GetExt(); - m_relative = filepath.m_relative; - m_hasExt = filepath.m_hasExt; - m_dontFollowLinks = filepath.m_dontFollowLinks; -} - -void wxFileName::Assign(const wxString& volume, - const wxString& path, - const wxString& name, - const wxString& ext, - bool hasExt, - wxPathFormat format) -{ - // we should ignore paths which look like UNC shares because we already - // have the volume here and the UNC notation (\\server\path) is only valid - // for paths which don't start with a volume, so prevent SetPath() from - // recognizing "\\foo\bar" in "c:\\foo\bar" as an UNC path - // - // note also that this is a rather ugly way to do what we want (passing - // some kind of flag telling to ignore UNC paths to SetPath() would be - // better) but this is the safest thing to do to avoid breaking backwards - // compatibility in 2.8 - if ( IsUNCPath(path, format) ) - { - // remove one of the 2 leading backslashes to ensure that it's not - // recognized as an UNC path by SetPath() - wxString pathNonUNC(path, 1, wxString::npos); - SetPath(pathNonUNC, format); - } - else // no UNC complications - { - SetPath(path, format); - } - - m_volume = volume; - m_ext = ext; - m_name = name; - - m_hasExt = hasExt; -} - -void wxFileName::SetPath( const wxString& pathOrig, wxPathFormat format ) -{ - m_dirs.Clear(); - - if ( pathOrig.empty() ) - { - // no path at all - m_relative = true; - - return; - } - - format = GetFormat( format ); - - // 0) deal with possible volume part first - wxString volume, - path; - SplitVolume(pathOrig, &volume, &path, format); - if ( !volume.empty() ) - { - m_relative = false; - - SetVolume(volume); - } - - // 1) Determine if the path is relative or absolute. - - if ( path.empty() ) - { - // we had only the volume - return; - } - - wxChar leadingChar = path[0u]; - - switch (format) - { - case wxPATH_MAC: - m_relative = leadingChar == wxT(':'); - - // We then remove a leading ":". The reason is in our - // storage form for relative paths: - // ":dir:file.txt" actually means "./dir/file.txt" in - // DOS notation and should get stored as - // (relative) (dir) (file.txt) - // "::dir:file.txt" actually means "../dir/file.txt" - // stored as (relative) (..) (dir) (file.txt) - // This is important only for the Mac as an empty dir - // actually means , whereas under DOS, double - // slashes can be ignored: "\\\\" is the same as "\\". - if (m_relative) - path.erase( 0, 1 ); - break; - - case wxPATH_VMS: - // TODO: what is the relative path format here? - m_relative = false; - break; - - default: - wxFAIL_MSG( wxT("Unknown path format") ); - wxFALLTHROUGH; - - case wxPATH_UNIX: - m_relative = leadingChar != wxT('/'); - break; - - case wxPATH_DOS: - m_relative = !IsPathSeparator(leadingChar, format); - break; - - } - - // 2) Break up the path into its members. If the original path - // was just "/" or "\\", m_dirs will be empty. We know from - // the m_relative field, if this means "nothing" or "root dir". - - wxStringTokenizer tn( path, GetPathSeparators(format) ); - - while ( tn.HasMoreTokens() ) - { - wxString token = tn.GetNextToken(); - - // Remove empty token under DOS and Unix, interpret them - // as .. under Mac. - if (token.empty()) - { - if (format == wxPATH_MAC) - m_dirs.Add( wxT("..") ); - // else ignore - } - else - { - m_dirs.Add( token ); - } - } -} - -void wxFileName::Assign(const wxString& fullpath, - wxPathFormat format) -{ - wxString volume, path, name, ext; - bool hasExt; - SplitPath(fullpath, &volume, &path, &name, &ext, &hasExt, format); - - Assign(volume, path, name, ext, hasExt, format); -} - -void wxFileName::Assign(const wxString& fullpathOrig, - const wxString& fullname, - wxPathFormat format) -{ - // always recognize fullpath as directory, even if it doesn't end with a - // slash - wxString fullpath = fullpathOrig; - if ( !fullpath.empty() && !wxEndsWithPathSeparator(fullpath) ) - { - fullpath += GetPathSeparator(format); - } - - wxString volume, path, name, ext; - bool hasExt; - - // do some consistency checks: the name should be really just the filename - // and the path should be really just a path - wxString volDummy, pathDummy, nameDummy, extDummy; - - SplitPath(fullname, &volDummy, &pathDummy, &name, &ext, &hasExt, format); - - wxASSERT_MSG( volDummy.empty() && pathDummy.empty(), - wxT("the file name shouldn't contain the path") ); - - SplitPath(fullpath, &volume, &path, &nameDummy, &extDummy, format); - -#ifndef __VMS - // This test makes no sense on an OpenVMS system. - wxASSERT_MSG( nameDummy.empty() && extDummy.empty(), - wxT("the path shouldn't contain file name nor extension") ); -#endif - Assign(volume, path, name, ext, hasExt, format); -} - -void wxFileName::Assign(const wxString& pathOrig, - const wxString& name, - const wxString& ext, - wxPathFormat format) -{ - wxString volume, - path; - SplitVolume(pathOrig, &volume, &path, format); - - Assign(volume, path, name, ext, format); -} - -void wxFileName::AssignDir(const wxString& dir, wxPathFormat format) -{ - Assign(dir, wxEmptyString, format); -} - -void wxFileName::Clear() -{ - m_dirs.clear(); - m_volume.clear(); - m_name.clear(); - m_ext.clear(); - - // we don't have any absolute path for now - m_relative = true; - - // nor any extension - m_hasExt = false; - - // follow symlinks by default - m_dontFollowLinks = false; -} - -/* static */ -wxFileName wxFileName::FileName(const wxString& file, wxPathFormat format) -{ - return wxFileName(file, format); -} - -/* static */ -wxFileName wxFileName::DirName(const wxString& dir, wxPathFormat format) -{ - wxFileName fn; - fn.AssignDir(dir, format); - return fn; -} - -// ---------------------------------------------------------------------------- -// existence tests -// ---------------------------------------------------------------------------- - -namespace -{ - -#if defined(__WINDOWS__) - -void RemoveTrailingSeparatorsFromPath(wxString& strPath) -{ - // Windows fails to find directory named "c:\dir\" even if "c:\dir" exists, - // so remove all trailing backslashes from the path - but don't do this for - // the paths "d:\" (which are different from "d:"), for just "\" or for - // windows unique volume names ("\\?\Volume{GUID}\") - while ( wxEndsWithPathSeparator( strPath ) ) - { - size_t len = strPath.length(); - if ( len == 1 || (len == 3 && strPath[len - 2] == wxT(':')) || - (len == wxMSWUniqueVolumePrefixLength && - wxFileName::IsMSWUniqueVolumeNamePath(strPath))) - { - break; - } - - strPath.Truncate(len - 1); - } -} - -#endif // __WINDOWS_ - -bool -wxFileSystemObjectExists(const wxString& path, int flags) -{ - - // Should the existence of file/directory with this name be accepted, i.e. - // result in the true return value from this function? - const bool acceptFile = (flags & wxFILE_EXISTS_REGULAR) != 0; - const bool acceptDir = (flags & wxFILE_EXISTS_DIR) != 0; - - wxString strPath(path); - -#if defined(__WINDOWS__) - if ( acceptDir ) - { - // Ensure that the path doesn't have any trailing separators when - // checking for directories. - RemoveTrailingSeparatorsFromPath(strPath); - } - - // we must use GetFileAttributes() instead of the ANSI C functions because - // it can cope with network (UNC) paths unlike them - DWORD ret = ::GetFileAttributes(strPath.t_str()); - - if ( ret == INVALID_FILE_ATTRIBUTES ) - return false; - - if ( ret & FILE_ATTRIBUTE_DIRECTORY ) - return acceptDir; - - // Anything else must be a file (perhaps we should check for - // FILE_ATTRIBUTE_REPARSE_POINT?) - return acceptFile; -#else // Non-MSW, non-OS/2 - wxStructStat st; - if ( !StatAny(st, strPath, flags) ) - return false; - - if ( S_ISREG(st.st_mode) ) - return acceptFile; - if ( S_ISDIR(st.st_mode) ) - return acceptDir; - if ( S_ISLNK(st.st_mode) ) - { - // Take care to not test for "!= 0" here as this would erroneously - // return true if only wxFILE_EXISTS_NO_FOLLOW, which is part of - // wxFILE_EXISTS_SYMLINK, is set too. - return (flags & wxFILE_EXISTS_SYMLINK) == wxFILE_EXISTS_SYMLINK; - } - if ( S_ISBLK(st.st_mode) || S_ISCHR(st.st_mode) ) - return (flags & wxFILE_EXISTS_DEVICE) != 0; - if ( S_ISFIFO(st.st_mode) ) - return (flags & wxFILE_EXISTS_FIFO) != 0; - if ( S_ISSOCK(st.st_mode) ) - return (flags & wxFILE_EXISTS_SOCKET) != 0; - - return flags & wxFILE_EXISTS_ANY; -#endif // Platforms -} - -} // anonymous namespace - -bool wxFileName::FileExists() const -{ - int flags = wxFILE_EXISTS_REGULAR; - if ( !ShouldFollowLink() ) - flags |= wxFILE_EXISTS_NO_FOLLOW; - - return wxFileSystemObjectExists(GetFullPath(), flags); -} - -/* static */ -bool wxFileName::FileExists( const wxString &filePath ) -{ - return wxFileSystemObjectExists(filePath, wxFILE_EXISTS_REGULAR); -} - -bool wxFileName::DirExists() const -{ - int flags = wxFILE_EXISTS_DIR; - if ( !ShouldFollowLink() ) - flags |= wxFILE_EXISTS_NO_FOLLOW; - - return Exists(GetPath(), flags); -} - -/* static */ -bool wxFileName::DirExists( const wxString &dirPath ) -{ - return wxFileSystemObjectExists(dirPath, wxFILE_EXISTS_DIR); -} - -bool wxFileName::Exists(int flags) const -{ - // Notice that wxFILE_EXISTS_NO_FOLLOW may be specified in the flags even - // if our DontFollowLink() hadn't been called and we do honour it then. But - // if the user took the care of calling DontFollowLink(), it is always - // taken into account. - if ( !ShouldFollowLink() ) - flags |= wxFILE_EXISTS_NO_FOLLOW; - - return wxFileSystemObjectExists(GetFullPath(), flags); -} - -/* static */ -bool wxFileName::Exists(const wxString& path, int flags) -{ - return wxFileSystemObjectExists(path, flags); -} - -// ---------------------------------------------------------------------------- -// CWD and HOME stuff -// ---------------------------------------------------------------------------- - -void wxFileName::AssignCwd(const wxString& volume) -{ - AssignDir(wxFileName::GetCwd(volume)); -} - -/* static */ -wxString wxFileName::GetCwd(const wxString& volume) -{ - // if we have the volume, we must get the current directory on this drive - // and to do this we have to chdir to this volume - at least under Windows, - // I don't know how to get the current drive on another volume elsewhere - // (TODO) - wxString cwdOld; - if ( !volume.empty() ) - { - cwdOld = wxGetCwd(); - SetCwd(volume + GetVolumeSeparator()); - } - - wxString cwd = ::wxGetCwd(); - - if ( !volume.empty() ) - { - SetCwd(cwdOld); - } - - return cwd; -} - -bool wxFileName::SetCwd() const -{ - return wxFileName::SetCwd( GetPath() ); -} - -bool wxFileName::SetCwd( const wxString &cwd ) -{ - return ::wxSetWorkingDirectory( cwd ); -} - -void wxFileName::AssignHomeDir() -{ - AssignDir(wxFileName::GetHomeDir()); -} - -wxString wxFileName::GetHomeDir() -{ - return ::wxGetHomeDir(); -} - - -// ---------------------------------------------------------------------------- -// CreateTempFileName -// ---------------------------------------------------------------------------- - -#if wxUSE_FILE || wxUSE_FFILE - - -#if !defined wx_fdopen && defined HAVE_FDOPEN - #define wx_fdopen fdopen -#endif - -// NB: GetTempFileName() under Windows creates the file, so using -// O_EXCL there would fail -#ifdef __WINDOWS__ - #define wxOPEN_EXCL 0 -#else - #define wxOPEN_EXCL O_EXCL -#endif - - -#ifdef wxOpenOSFHandle -#define WX_HAVE_DELETE_ON_CLOSE -// On Windows create a file with the FILE_FLAGS_DELETE_ON_CLOSE flags. -// -static int wxOpenWithDeleteOnClose(const wxString& filename) -{ - DWORD access = GENERIC_READ | GENERIC_WRITE; - - DWORD disposition = OPEN_ALWAYS; - - DWORD attributes = FILE_ATTRIBUTE_TEMPORARY | - FILE_FLAG_DELETE_ON_CLOSE; - - HANDLE h = ::CreateFile(filename.t_str(), access, 0, NULL, - disposition, attributes, NULL); - - return wxOpenOSFHandle(h, wxO_BINARY); -} -#endif // wxOpenOSFHandle - - -// Helper to open the file -// -static int wxTempOpen(const wxString& path, bool *deleteOnClose) -{ -#ifdef WX_HAVE_DELETE_ON_CLOSE - if (*deleteOnClose) - return wxOpenWithDeleteOnClose(path); -#endif - - *deleteOnClose = false; - - return wxOpen(path, wxO_BINARY | O_RDWR | O_CREAT | wxOPEN_EXCL, 0600); -} - - -#if wxUSE_FFILE -// Helper to open the file and attach it to the wxFFile -// -static bool wxTempOpen(wxFFile *file, const wxString& path, bool *deleteOnClose) -{ -#ifndef wx_fdopen - *deleteOnClose = false; - return file->Open(path, wxT("w+b")); -#else // wx_fdopen - int fd = wxTempOpen(path, deleteOnClose); - if (fd == -1) - return false; - file->Attach(wx_fdopen(fd, "w+b"), path); - return file->IsOpened(); -#endif // wx_fdopen -} -#endif // wxUSE_FFILE - - -#if !wxUSE_FILE - #define WXFILEARGS(x, y) y -#elif !wxUSE_FFILE - #define WXFILEARGS(x, y) x -#else - #define WXFILEARGS(x, y) x, y -#endif - - -// Implementation of wxFileName::CreateTempFileName(). -// -static wxString wxCreateTempImpl( - const wxString& prefix, - WXFILEARGS(wxFile *fileTemp, wxFFile *ffileTemp), - bool *deleteOnClose = NULL) -{ -#if wxUSE_FILE && wxUSE_FFILE - wxASSERT(fileTemp == NULL || ffileTemp == NULL); -#endif - wxString path, dir, name; - bool wantDeleteOnClose = false; - - if (deleteOnClose) - { - // set the result to false initially - wantDeleteOnClose = *deleteOnClose; - *deleteOnClose = false; - } - else - { - // easier if it alwasys points to something - deleteOnClose = &wantDeleteOnClose; - } - - // use the directory specified by the prefix - wxFileName::SplitPath(prefix, &dir, &name, NULL /* extension */); - - if (dir.empty()) - { - dir = wxFileName::GetTempDir(); - } - -#if defined(__WINDOWS__) - if (!::GetTempFileName(dir.t_str(), name.t_str(), 0, - wxStringBuffer(path, MAX_PATH + 1))) - { - wxLogLastError(wxT("GetTempFileName")); - - path.clear(); - } - -#else // !Windows - path = dir; - - if ( !wxEndsWithPathSeparator(dir) && - (name.empty() || !wxIsPathSeparator(name[0u])) ) - { - path += wxFILE_SEP_PATH; - } - - path += name; - -#if defined(HAVE_MKSTEMP) - // scratch space for mkstemp() - path += wxT("XXXXXX"); - - // we need to copy the path to the buffer in which mkstemp() can modify it - wxCharBuffer buf(path.fn_str()); - - // cast is safe because the string length doesn't change - int fdTemp = mkstemp( (char*)(const char*) buf ); - if ( fdTemp == -1 ) - { - // this might be not necessary as mkstemp() on most systems should have - // already done it but it doesn't hurt neither... - path.clear(); - } - else // mkstemp() succeeded - { - path = wxConvFile.cMB2WX( (const char*) buf ); - - #if wxUSE_FILE - // avoid leaking the fd - if ( fileTemp ) - { - fileTemp->Attach(fdTemp); - } - else - #endif - - #if wxUSE_FFILE - if ( ffileTemp ) - { - #ifdef wx_fdopen - ffileTemp->Attach(wx_fdopen(fdTemp, "r+b"), path); - #else - ffileTemp->Open(path, wxT("r+b")); - close(fdTemp); - #endif - } - else - #endif - - { - close(fdTemp); - } - } -#else // !HAVE_MKSTEMP - -#ifdef HAVE_MKTEMP - // same as above - path += wxT("XXXXXX"); - - wxCharBuffer buf = wxConvFile.cWX2MB( path ); - if ( !mktemp( (char*)(const char*) buf ) ) - { - path.clear(); - } - else - { - path = wxConvFile.cMB2WX( (const char*) buf ); - } -#else // !HAVE_MKTEMP - // generate the unique file name ourselves - path << (unsigned int)getpid(); - - wxString pathTry; - - static const size_t numTries = 1000; - for ( size_t n = 0; n < numTries; n++ ) - { - // 3 hex digits is enough for numTries == 1000 < 4096 - pathTry = path + wxString::Format(wxT("%.03x"), (unsigned int) n); - if ( !wxFileName::FileExists(pathTry) ) - { - break; - } - - pathTry.clear(); - } - - path = pathTry; -#endif // HAVE_MKTEMP/!HAVE_MKTEMP - -#endif // HAVE_MKSTEMP/!HAVE_MKSTEMP - -#endif // Windows/!Windows - - if ( path.empty() ) - { - wxLogSysError(_("Failed to create a temporary file name")); - } - else - { - bool ok = true; - - // open the file - of course, there is a race condition here, this is - // why we always prefer using mkstemp()... - #if wxUSE_FILE - if ( fileTemp && !fileTemp->IsOpened() ) - { - *deleteOnClose = wantDeleteOnClose; - int fd = wxTempOpen(path, deleteOnClose); - if (fd != -1) - fileTemp->Attach(fd); - else - ok = false; - } - #endif - - #if wxUSE_FFILE - if ( ffileTemp && !ffileTemp->IsOpened() ) - { - *deleteOnClose = wantDeleteOnClose; - ok = wxTempOpen(ffileTemp, path, deleteOnClose); - } - #endif - - if ( !ok ) - { - // FIXME: If !ok here should we loop and try again with another - // file name? That is the standard recourse if open(O_EXCL) - // fails, though of course it should be protected against - // possible infinite looping too. - - wxLogError(_("Failed to open temporary file.")); - - path.clear(); - } - } - - return path; -} - - -static bool wxCreateTempImpl( - const wxString& prefix, - WXFILEARGS(wxFile *fileTemp, wxFFile *ffileTemp), - wxString *name) -{ - bool deleteOnClose = true; - - *name = wxCreateTempImpl(prefix, - WXFILEARGS(fileTemp, ffileTemp), - &deleteOnClose); - - bool ok = !name->empty(); - - if (deleteOnClose) - name->clear(); -#ifdef __UNIX__ - else if (ok && wxRemoveFile(*name)) - name->clear(); -#endif - - return ok; -} - - -static void wxAssignTempImpl( - wxFileName *fn, - const wxString& prefix, - WXFILEARGS(wxFile *fileTemp, wxFFile *ffileTemp)) -{ - wxString tempname; - tempname = wxCreateTempImpl(prefix, WXFILEARGS(fileTemp, ffileTemp)); - - if ( tempname.empty() ) - { - // error, failed to get temp file name - fn->Clear(); - } - else // ok - { - fn->Assign(tempname); - } -} - - -void wxFileName::AssignTempFileName(const wxString& prefix) -{ - wxAssignTempImpl(this, prefix, WXFILEARGS(NULL, NULL)); -} - -/* static */ -wxString wxFileName::CreateTempFileName(const wxString& prefix) -{ - return wxCreateTempImpl(prefix, WXFILEARGS(NULL, NULL)); -} - -#endif // wxUSE_FILE || wxUSE_FFILE - - -#if wxUSE_FILE - -wxString wxCreateTempFileName(const wxString& prefix, - wxFile *fileTemp, - bool *deleteOnClose) -{ - return wxCreateTempImpl(prefix, WXFILEARGS(fileTemp, NULL), deleteOnClose); -} - -bool wxCreateTempFile(const wxString& prefix, - wxFile *fileTemp, - wxString *name) -{ - return wxCreateTempImpl(prefix, WXFILEARGS(fileTemp, NULL), name); -} - -void wxFileName::AssignTempFileName(const wxString& prefix, wxFile *fileTemp) -{ - wxAssignTempImpl(this, prefix, WXFILEARGS(fileTemp, NULL)); -} - -/* static */ -wxString -wxFileName::CreateTempFileName(const wxString& prefix, wxFile *fileTemp) -{ - return wxCreateTempFileName(prefix, fileTemp); -} - -#endif // wxUSE_FILE - - -#if wxUSE_FFILE - -wxString wxCreateTempFileName(const wxString& prefix, - wxFFile *fileTemp, - bool *deleteOnClose) -{ - return wxCreateTempImpl(prefix, WXFILEARGS(NULL, fileTemp), deleteOnClose); -} - -bool wxCreateTempFile(const wxString& prefix, - wxFFile *fileTemp, - wxString *name) -{ - return wxCreateTempImpl(prefix, WXFILEARGS(NULL, fileTemp), name); - -} - -void wxFileName::AssignTempFileName(const wxString& prefix, wxFFile *fileTemp) -{ - wxAssignTempImpl(this, prefix, WXFILEARGS(NULL, fileTemp)); -} - -/* static */ -wxString -wxFileName::CreateTempFileName(const wxString& prefix, wxFFile *fileTemp) -{ - return wxCreateTempFileName(prefix, fileTemp); -} - -#endif // wxUSE_FFILE - - -// ---------------------------------------------------------------------------- -// directory operations -// ---------------------------------------------------------------------------- - -// helper of GetTempDir(): check if the given directory exists and return it if -// it does or an empty string otherwise -namespace -{ - -wxString CheckIfDirExists(const wxString& dir) -{ - return wxFileName::DirExists(dir) ? dir : wxString(); -} - -} // anonymous namespace - -wxString wxFileName::GetTempDir() -{ - // first try getting it from environment: this allows overriding the values - // used by default if the user wants to create temporary files in another - // directory - wxString dir = CheckIfDirExists(wxGetenv("TMPDIR")); - if ( dir.empty() ) - { - dir = CheckIfDirExists(wxGetenv("TMP")); - if ( dir.empty() ) - dir = CheckIfDirExists(wxGetenv("TEMP")); - } - - // if no environment variables are set, use the system default - if ( dir.empty() ) - { -#if defined(__WINDOWS__) - if ( !::GetTempPath(MAX_PATH, wxStringBuffer(dir, MAX_PATH + 1)) ) - { - wxLogLastError(wxT("GetTempPath")); - } -#endif // systems with native way - } - - if ( !dir.empty() ) - { - // remove any trailing path separators, we don't want to ever return - // them from this function for consistency - const size_t lastNonSep = dir.find_last_not_of(GetPathSeparators()); - if ( lastNonSep == wxString::npos ) - { - // the string consists entirely of separators, leave only one - dir = GetPathSeparator(); - } - else - { - dir.erase(lastNonSep + 1); - } - } - - // fall back to hard coded value - else - { -#ifdef __UNIX_LIKE__ - dir = CheckIfDirExists("/tmp"); - if ( dir.empty() ) -#endif // __UNIX_LIKE__ - dir = "."; - } - - return dir; -} - -bool wxFileName::Mkdir( int perm, int flags ) const -{ - return wxFileName::Mkdir(GetPath(), perm, flags); -} - -bool wxFileName::Mkdir( const wxString& dir, int perm, int flags ) -{ - if ( flags & wxPATH_MKDIR_FULL ) - { - // split the path in components - wxFileName filename; - filename.AssignDir(dir); - - wxString currPath; - if ( filename.HasVolume()) - { - currPath << wxGetVolumeString(filename.GetVolume(), wxPATH_NATIVE); - } - - wxArrayString dirs = filename.GetDirs(); - size_t count = dirs.GetCount(); - for ( size_t i = 0; i < count; i++ ) - { - if ( i > 0 || filename.IsAbsolute() ) - currPath += wxFILE_SEP_PATH; - currPath += dirs[i]; - - if (!DirExists(currPath)) - { - if (!wxMkdir(currPath, perm)) - { - // no need to try creating further directories - return false; - } - } - } - - return true; - - } - - return ::wxMkdir( dir, perm ); -} - -bool wxFileName::Rmdir(int flags) const -{ - return wxFileName::Rmdir( GetPath(), flags ); -} - -bool wxFileName::Rmdir(const wxString& dir, int flags) -{ -#ifdef __WINDOWS__ - if ( flags & wxPATH_RMDIR_RECURSIVE ) - { - // SHFileOperation needs double null termination string - // but without separator at the end of the path - wxString path(dir); - if ( path.Last() == wxFILE_SEP_PATH ) - path.RemoveLast(); - path += wxT('\0'); - - SHFILEOPSTRUCT fileop; - wxZeroMemory(fileop); - fileop.wFunc = FO_DELETE; - fileop.pFrom = path.t_str(); - fileop.fFlags = FOF_SILENT | FOF_NOCONFIRMATION; - fileop.fFlags |= FOF_NOERRORUI; - - int ret = SHFileOperation(&fileop); - if ( ret != 0 ) - { - // SHFileOperation may return non-Win32 error codes, so the error - // message can be incorrect - wxLogApiError(wxT("SHFileOperation"), ret); - return false; - } - - return true; - } - else if ( flags & wxPATH_RMDIR_FULL ) -#else // !__WINDOWS__ - if ( flags != 0 ) // wxPATH_RMDIR_FULL or wxPATH_RMDIR_RECURSIVE -#endif // !__WINDOWS__ - { -#ifndef __WINDOWS__ - if ( flags & wxPATH_RMDIR_RECURSIVE ) - { - // When deleting the tree recursively, we are supposed to delete - // this directory itself even when it is a symlink -- but without - // following it. Do it here as wxRmdir() would simply follow if - // called for a symlink. - if ( wxFileName::Exists(dir, wxFILE_EXISTS_SYMLINK) ) - { - return wxRemoveFile(dir); - } - } -#endif // !__WINDOWS__ - - wxString path(dir); - if ( path.Last() != wxFILE_SEP_PATH ) - path += wxFILE_SEP_PATH; - - wxDir d(path); - - if ( !d.IsOpened() ) - return false; - - wxString filename; - - // First delete all subdirectories: notice that we don't follow - // symbolic links, potentially leading outside this directory, to avoid - // unpleasant surprises. - bool cont = d.GetFirst(&filename, wxString(), - wxDIR_DIRS | wxDIR_HIDDEN | wxDIR_NO_FOLLOW); - while ( cont ) - { - wxFileName::Rmdir(path + filename, flags); - cont = d.GetNext(&filename); - } - -#ifndef __WINDOWS__ - if ( flags & wxPATH_RMDIR_RECURSIVE ) - { - // Delete all files too and, for the same reasons as above, don't - // follow symlinks which could refer to the files outside of this - // directory and just delete the symlinks themselves. - cont = d.GetFirst(&filename, wxString(), - wxDIR_FILES | wxDIR_HIDDEN | wxDIR_NO_FOLLOW); - while ( cont ) - { - ::wxRemoveFile(path + filename); - cont = d.GetNext(&filename); - } - } -#endif // !__WINDOWS__ - } - - return ::wxRmdir(dir); -} - -// ---------------------------------------------------------------------------- -// path normalization -// ---------------------------------------------------------------------------- - -bool wxFileName::Normalize(int flags, - const wxString& cwd, - wxPathFormat format) -{ - // deal with env vars renaming first as this may seriously change the path - if ( flags & wxPATH_NORM_ENV_VARS ) - { - wxString pathOrig = GetFullPath(format); - wxString path = wxExpandEnvVars(pathOrig); - if ( path != pathOrig ) - { - Assign(path); - } - } - - // the existing path components - wxArrayString dirs = GetDirs(); - - // the path to prepend in front to make the path absolute - wxFileName curDir; - - format = GetFormat(format); - - // set up the directory to use for making the path absolute later - if ( (flags & wxPATH_NORM_ABSOLUTE) && !IsAbsolute(format) ) - { - if ( cwd.empty() ) - { - curDir.AssignCwd(GetVolume()); - } - else // cwd provided - { - curDir.AssignDir(cwd); - } - } - - // handle ~ stuff under Unix only - if ( (format == wxPATH_UNIX) && (flags & wxPATH_NORM_TILDE) && m_relative ) - { - if ( !dirs.IsEmpty() ) - { - wxString dir = dirs[0u]; - if ( !dir.empty() && dir[0u] == wxT('~') ) - { - // to make the path absolute use the home directory - curDir.AssignDir(wxGetUserHome(dir.c_str() + 1)); - dirs.RemoveAt(0u); - } - } - } - - // transform relative path into abs one - if ( curDir.IsOk() ) - { - // this path may be relative because it doesn't have the volume name - // and still have m_relative=true; in this case we shouldn't modify - // our directory components but just set the current volume - if ( !HasVolume() && curDir.HasVolume() ) - { - SetVolume(curDir.GetVolume()); - - if ( !m_relative ) - { - // yes, it was the case - we don't need curDir then - curDir.Clear(); - } - } - - // finally, prepend curDir to the dirs array - wxArrayString dirsNew = curDir.GetDirs(); - WX_PREPEND_ARRAY(dirs, dirsNew); - - // if we used e.g. tilde expansion previously and wxGetUserHome didn't - // return for some reason an absolute path, then curDir maybe not be absolute! - if ( !curDir.m_relative ) - { - // we have prepended an absolute path and thus we are now an absolute - // file name too - m_relative = false; - } - // else if (flags & wxPATH_NORM_ABSOLUTE): - // should we warn the user that we didn't manage to make the path absolute? - } - - // now deal with ".", ".." and the rest - m_dirs.Empty(); - size_t count = dirs.GetCount(); - for ( size_t n = 0; n < count; n++ ) - { - wxString dir = dirs[n]; - - if ( flags & wxPATH_NORM_DOTS ) - { - if ( dir == wxT(".") ) - { - // just ignore - continue; - } - - if ( dir == wxT("..") ) - { - if ( m_dirs.empty() ) - { - // We have more ".." than directory components so far. - // Don't treat this as an error as the path could have been - // entered by user so try to handle it reasonably: if the - // path is absolute, just ignore the extra ".." because - // "/.." is the same as "/". Otherwise, i.e. for relative - // paths, keep ".." unchanged because removing it would - // modify the file a relative path refers to. - if ( !m_relative ) - continue; - - } - else // Normal case, go one step up. - { - m_dirs.pop_back(); - continue; - } - } - } - - m_dirs.Add(dir); - } - -#if defined(__WIN32__) && wxUSE_OLE - if ( (flags & wxPATH_NORM_SHORTCUT) ) - { - wxString filename; - if (GetShortcutTarget(GetFullPath(format), filename)) - { - m_relative = false; - Assign(filename); - } - } -#endif - -#if defined(__WIN32__) - if ( (flags & wxPATH_NORM_LONG) && (format == wxPATH_DOS) ) - { - Assign(GetLongPath()); - } -#endif // Win32 - - // Change case (this should be kept at the end of the function, to ensure - // that the path doesn't change any more after we normalize its case) - if ( (flags & wxPATH_NORM_CASE) && !IsCaseSensitive(format) ) - { - m_volume.MakeLower(); - m_name.MakeLower(); - m_ext.MakeLower(); - - // directory entries must be made lower case as well - count = m_dirs.GetCount(); - for ( size_t i = 0; i < count; i++ ) - { - m_dirs[i].MakeLower(); - } - } - - return true; -} - -bool wxFileName::ReplaceEnvVariable(const wxString& envname, - const wxString& replacementFmtString, - wxPathFormat format) -{ - // look into stringForm for the contents of the given environment variable - wxString val; - if (envname.empty() || - !wxGetEnv(envname, &val)) - return false; - if (val.empty()) - return false; - - wxString stringForm = GetPath(wxPATH_GET_VOLUME, format); - // do not touch the file name and the extension - - wxString replacement = wxString::Format(replacementFmtString, envname); - stringForm.Replace(val, replacement); - - // Now assign ourselves the modified path: - Assign(stringForm, GetFullName(), format); - - return true; -} - -bool wxFileName::ReplaceHomeDir(wxPathFormat format) -{ - wxString homedir = wxGetHomeDir(); - if (homedir.empty()) - return false; - - wxString stringForm = GetPath(wxPATH_GET_VOLUME, format); - // do not touch the file name and the extension - - stringForm.Replace(homedir, "~"); - - // Now assign ourselves the modified path: - Assign(stringForm, GetFullName(), format); - - return true; -} - -// ---------------------------------------------------------------------------- -// get the shortcut target -// ---------------------------------------------------------------------------- - -#if defined(__WIN32__) && wxUSE_OLE - -bool wxFileName::GetShortcutTarget(const wxString& shortcutPath, - wxString& targetFilename, - wxString* arguments) const -{ - wxString path, file, ext; - wxFileName::SplitPath(shortcutPath, & path, & file, & ext); - - HRESULT hres; - wxCOMPtr psl; - bool success = false; - - // Assume it's not a shortcut if it doesn't end with lnk - if (ext.CmpNoCase(wxT("lnk"))!=0) - return false; - - // Ensure OLE is initialized. - wxOleInitializer oleInit; - - // create a ShellLink object - hres = CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, - IID_IShellLink, (LPVOID*) &psl); - - if (SUCCEEDED(hres)) - { - wxCOMPtr ppf; - hres = psl->QueryInterface( IID_IPersistFile, (LPVOID *) &ppf); - if (SUCCEEDED(hres)) - { - WCHAR wsz[MAX_PATH]; - - MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, shortcutPath.mb_str(), -1, wsz, - MAX_PATH); - - hres = ppf->Load(wsz, 0); - if (SUCCEEDED(hres)) - { - wxChar buf[2048]; - // Wrong prototype in early versions -#if defined(__MINGW32__) && !wxCHECK_W32API_VERSION(2, 2) - psl->GetPath((CHAR*) buf, 2048, NULL, SLGP_UNCPRIORITY); -#else - psl->GetPath(buf, 2048, NULL, SLGP_UNCPRIORITY); -#endif - targetFilename = wxString(buf); - success = (shortcutPath != targetFilename); - - psl->GetArguments(buf, 2048); - wxString args(buf); - if (!args.empty() && arguments) - { - *arguments = args; - } - } - } - } - return success; -} - -#endif // __WIN32__ - - -// ---------------------------------------------------------------------------- -// absolute/relative paths -// ---------------------------------------------------------------------------- - -bool wxFileName::IsAbsolute(wxPathFormat format) const -{ - // unix paths beginning with ~ are reported as being absolute - if ( format == wxPATH_UNIX ) - { - if ( !m_dirs.IsEmpty() ) - { - wxString dir = m_dirs[0u]; - - if (!dir.empty() && dir[0u] == wxT('~')) - return true; - } - } - - // if our path doesn't start with a path separator, it's not an absolute - // path - if ( m_relative ) - return false; - - if ( !GetVolumeSeparator(format).empty() ) - { - // this format has volumes and an absolute path must have one, it's not - // enough to have the full path to be an absolute file under Windows - if ( GetVolume().empty() ) - return false; - } - - return true; -} - -bool wxFileName::MakeRelativeTo(const wxString& pathBase, wxPathFormat format) -{ - wxFileName fnBase = wxFileName::DirName(pathBase, format); - - // get cwd only once - small time saving - wxString cwd = wxGetCwd(); - - // Normalize the paths but avoid changing the case or turning a shortcut - // into a file that it points to. - const int normFlags = wxPATH_NORM_ALL & - ~(wxPATH_NORM_CASE | wxPATH_NORM_SHORTCUT); - Normalize(normFlags, cwd, format); - fnBase.Normalize(normFlags, cwd, format); - - bool withCase = IsCaseSensitive(format); - - // we can't do anything if the files live on different volumes - if ( !GetVolume().IsSameAs(fnBase.GetVolume(), withCase) ) - { - // nothing done - return false; - } - - // same drive, so we don't need our volume - m_volume.clear(); - - // remove common directories starting at the top - while ( !m_dirs.IsEmpty() && !fnBase.m_dirs.IsEmpty() && - m_dirs[0u].IsSameAs(fnBase.m_dirs[0u], withCase) ) - { - m_dirs.RemoveAt(0); - fnBase.m_dirs.RemoveAt(0); - } - - // add as many ".." as needed - size_t count = fnBase.m_dirs.GetCount(); - for ( size_t i = 0; i < count; i++ ) - { - m_dirs.Insert(wxT(".."), 0u); - } - - switch ( GetFormat(format) ) - { - case wxPATH_NATIVE: - case wxPATH_MAX: - wxFAIL_MSG( wxS("unreachable") ); - wxFALLTHROUGH; - - case wxPATH_UNIX: - case wxPATH_DOS: - // a directory made relative with respect to itself is '.' under - // Unix and DOS, by definition (but we don't have to insert "./" - // for the files) - if ( m_dirs.IsEmpty() && IsDir() ) - { - m_dirs.Add(wxT('.')); - } - break; - - case wxPATH_MAC: - case wxPATH_VMS: - break; - } - - m_relative = true; - - // we were modified - return true; -} - -// ---------------------------------------------------------------------------- -// filename kind tests -// ---------------------------------------------------------------------------- - -bool wxFileName::SameAs(const wxFileName& filepath, wxPathFormat format) const -{ - wxFileName fn1 = *this, - fn2 = filepath; - - // get cwd only once - small time saving - wxString cwd = wxGetCwd(); - fn1.Normalize(wxPATH_NORM_ALL | wxPATH_NORM_CASE, cwd, format); - fn2.Normalize(wxPATH_NORM_ALL | wxPATH_NORM_CASE, cwd, format); - - if ( fn1.GetFullPath() == fn2.GetFullPath() ) - return true; - -#ifdef wxHAVE_LSTAT - wxStructStat st1, st2; - if ( StatAny(st1, fn1) && StatAny(st2, fn2) ) - { - if ( st1.st_ino == st2.st_ino && st1.st_dev == st2.st_dev ) - return true; - } - //else: It's not an error if one or both files don't exist. -#endif // wxHAVE_LSTAT - - return false; -} - -/* static */ -bool wxFileName::IsCaseSensitive( wxPathFormat format ) -{ - // only Unix filenames are truly case-sensitive - return GetFormat(format) == wxPATH_UNIX; -} - -/* static */ -wxString wxFileName::GetForbiddenChars(wxPathFormat format) -{ - // Inits to forbidden characters that are common to (almost) all platforms. - wxString strForbiddenChars = wxT("*?"); - - // If asserts, wxPathFormat has been changed. In case of a new path format - // addition, the following code might have to be updated. - wxCOMPILE_TIME_ASSERT(wxPATH_MAX == 5, wxPathFormatChanged); - switch ( GetFormat(format) ) - { - default : - wxFAIL_MSG( wxT("Unknown path format") ); - wxFALLTHROUGH; - - case wxPATH_UNIX: - break; - - case wxPATH_MAC: - // On a Mac even names with * and ? are allowed (Tested with OS - // 9.2.1 and OS X 10.2.5) - strForbiddenChars.clear(); - break; - - case wxPATH_DOS: - strForbiddenChars += wxT("\\/:\"<>|"); - break; - - case wxPATH_VMS: - break; - } - - return strForbiddenChars; -} - -/* static */ -wxString wxFileName::GetVolumeSeparator(wxPathFormat format) -{ - wxString sepVol; - - if ( (GetFormat(format) == wxPATH_DOS) || - (GetFormat(format) == wxPATH_VMS) ) - { - sepVol = wxFILE_SEP_DSK; - } - //else: leave empty - - return sepVol; -} - -/* static */ -wxString wxFileName::GetPathSeparators(wxPathFormat format) -{ - wxString seps; - switch ( GetFormat(format) ) - { - case wxPATH_DOS: - // accept both as native APIs do but put the native one first as - // this is the one we use in GetFullPath() - seps << wxFILE_SEP_PATH_DOS << wxFILE_SEP_PATH_UNIX; - break; - - default: - wxFAIL_MSG( wxT("Unknown wxPATH_XXX style") ); - wxFALLTHROUGH; - - case wxPATH_UNIX: - seps = wxFILE_SEP_PATH_UNIX; - break; - - case wxPATH_MAC: - seps = wxFILE_SEP_PATH_MAC; - break; - - case wxPATH_VMS: - seps = wxFILE_SEP_PATH_VMS; - break; - } - - return seps; -} - -/* static */ -wxString wxFileName::GetPathTerminators(wxPathFormat format) -{ - format = GetFormat(format); - - // under VMS the end of the path is ']', not the path separator used to - // separate the components - return format == wxPATH_VMS ? wxString(wxT(']')) : GetPathSeparators(format); -} - -/* static */ -bool wxFileName::IsPathSeparator(wxChar ch, wxPathFormat format) -{ - // wxString::Find() doesn't work as expected with NUL - it will always find - // it, so test for it separately - return ch != wxT('\0') && GetPathSeparators(format).Find(ch) != wxNOT_FOUND; -} - -/* static */ -bool -wxFileName::IsMSWUniqueVolumeNamePath(const wxString& path, wxPathFormat format) -{ - // return true if the format used is the DOS/Windows one and the string begins - // with a Windows unique volume name ("\\?\Volume{guid}\") - return format == wxPATH_DOS && - path.length() >= wxMSWUniqueVolumePrefixLength && - path.StartsWith(wxS("\\\\?\\Volume{")) && - path[wxMSWUniqueVolumePrefixLength - 1] == wxFILE_SEP_PATH_DOS; -} - -// ---------------------------------------------------------------------------- -// path components manipulation -// ---------------------------------------------------------------------------- - -/* static */ bool wxFileName::IsValidDirComponent(const wxString& dir) -{ - if ( dir.empty() ) - { - wxFAIL_MSG( wxT("empty directory passed to wxFileName::InsertDir()") ); - - return false; - } - - const size_t len = dir.length(); - for ( size_t n = 0; n < len; n++ ) - { - if ( dir[n] == GetVolumeSeparator() || IsPathSeparator(dir[n]) ) - { - wxFAIL_MSG( wxT("invalid directory component in wxFileName") ); - - return false; - } - } - - return true; -} - -bool wxFileName::AppendDir( const wxString& dir ) -{ - if (!IsValidDirComponent(dir)) - return false; - m_dirs.Add(dir); - return true; -} - -void wxFileName::PrependDir( const wxString& dir ) -{ - InsertDir(0, dir); -} - -bool wxFileName::InsertDir(size_t before, const wxString& dir) -{ - if (!IsValidDirComponent(dir)) - return false; - m_dirs.Insert(dir, before); - return true; -} - -void wxFileName::RemoveDir(size_t pos) -{ - m_dirs.RemoveAt(pos); -} - -// ---------------------------------------------------------------------------- -// accessors -// ---------------------------------------------------------------------------- - -void wxFileName::SetFullName(const wxString& fullname) -{ - SplitPath(fullname, NULL /* no volume */, NULL /* no path */, - &m_name, &m_ext, &m_hasExt); -} - -wxString wxFileName::GetFullName() const -{ - wxString fullname = m_name; - if ( m_hasExt ) - { - fullname << wxFILE_SEP_EXT << m_ext; - } - - return fullname; -} - -wxString wxFileName::GetPath( int flags, wxPathFormat format ) const -{ - format = GetFormat( format ); - - wxString fullpath; - - // return the volume with the path as well if requested - if ( flags & wxPATH_GET_VOLUME ) - { - fullpath += wxGetVolumeString(GetVolume(), format); - } - - // the leading character - switch ( format ) - { - case wxPATH_MAC: - if ( m_relative ) - fullpath += wxFILE_SEP_PATH_MAC; - break; - - case wxPATH_DOS: - if ( !m_relative ) - fullpath += wxFILE_SEP_PATH_DOS; - break; - - default: - wxFAIL_MSG( wxT("Unknown path format") ); - wxFALLTHROUGH; - - case wxPATH_UNIX: - if ( !m_relative ) - { - fullpath += wxFILE_SEP_PATH_UNIX; - } - break; - - case wxPATH_VMS: - // no leading character here but use this place to unset - // wxPATH_GET_SEPARATOR flag: under VMS it doesn't make sense - // as, if I understand correctly, there should never be a dot - // before the closing bracket - flags &= ~wxPATH_GET_SEPARATOR; - } - - if ( m_dirs.empty() ) - { - // there is nothing more - return fullpath; - } - - // then concatenate all the path components using the path separator - if ( format == wxPATH_VMS ) - { - fullpath += wxT('['); - } - - const size_t dirCount = m_dirs.GetCount(); - for ( size_t i = 0; i < dirCount; i++ ) - { - switch (format) - { - case wxPATH_MAC: - if ( m_dirs[i] == wxT(".") ) - { - // skip appending ':', this shouldn't be done in this - // case as "::" is interpreted as ".." under Unix - continue; - } - - // convert back from ".." to nothing - if ( !m_dirs[i].IsSameAs(wxT("..")) ) - fullpath += m_dirs[i]; - break; - - default: - wxFAIL_MSG( wxT("Unexpected path format") ); - wxFALLTHROUGH; - - case wxPATH_DOS: - case wxPATH_UNIX: - fullpath += m_dirs[i]; - break; - - case wxPATH_VMS: - // TODO: What to do with ".." under VMS - - // convert back from ".." to nothing - if ( !m_dirs[i].IsSameAs(wxT("..")) ) - fullpath += m_dirs[i]; - break; - } - - if ( (flags & wxPATH_GET_SEPARATOR) || (i != dirCount - 1) ) - fullpath += GetPathSeparator(format); - } - - if ( format == wxPATH_VMS ) - { - fullpath += wxT(']'); - } - - return fullpath; -} - -wxString wxFileName::GetFullPath( wxPathFormat format ) const -{ - // we already have a function to get the path - wxString fullpath = GetPath(wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR, - format); - - // now just add the file name and extension to it - fullpath += GetFullName(); - - return fullpath; -} - -// Return the short form of the path (returns identity on non-Windows platforms) -wxString wxFileName::GetShortPath() const -{ - wxString path(GetFullPath()); - -#if defined(__WINDOWS__) && defined(__WIN32__) - DWORD sz = ::GetShortPathName(path.t_str(), NULL, 0); - if ( sz != 0 ) - { - wxString pathOut; - if ( ::GetShortPathName - ( - path.t_str(), - wxStringBuffer(pathOut, sz), - sz - ) != 0 ) - { - return pathOut; - } - } -#endif // Windows - - return path; -} - -// Return the long form of the path (returns identity on non-Windows platforms) -wxString wxFileName::GetLongPath() const -{ - wxString pathOut, - path = GetFullPath(); - -#if defined(__WIN32__) - - DWORD dwSize = ::GetLongPathName(path.t_str(), NULL, 0); - if ( dwSize > 0 ) - { - if ( ::GetLongPathName - ( - path.t_str(), - wxStringBuffer(pathOut, dwSize), - dwSize - ) != 0 ) - { - return pathOut; - } - } - - // Some other error occured. - // We need to call FindFirstFile on each component in turn. - - WIN32_FIND_DATA findFileData; - HANDLE hFind; - - if ( HasVolume() ) - pathOut = GetVolume() + - GetVolumeSeparator(wxPATH_DOS) + - GetPathSeparator(wxPATH_DOS); - else - pathOut.clear(); - - wxArrayString dirs = GetDirs(); - dirs.Add(GetFullName()); - - wxString tmpPath; - - size_t count = dirs.GetCount(); - for ( size_t i = 0; i < count; i++ ) - { - const wxString& dir = dirs[i]; - - // We're using pathOut to collect the long-name path, but using a - // temporary for appending the last path component which may be - // short-name - tmpPath = pathOut + dir; - - // We must not process "." or ".." here as they would be (unexpectedly) - // replaced by the corresponding directory names so just leave them - // alone - // - // And we can't pass a drive and root dir to FindFirstFile (VZ: why?) - if ( tmpPath.empty() || dir == '.' || dir == ".." || - tmpPath.Last() == GetVolumeSeparator(wxPATH_DOS) ) - { - tmpPath += wxFILE_SEP_PATH; - pathOut = tmpPath; - continue; - } - - hFind = ::FindFirstFile(tmpPath.t_str(), &findFileData); - if (hFind == INVALID_HANDLE_VALUE) - { - // Error: most likely reason is that path doesn't exist, so - // append any unprocessed parts and return - for ( i += 1; i < count; i++ ) - tmpPath += wxFILE_SEP_PATH + dirs[i]; - - return tmpPath; - } - - pathOut += findFileData.cFileName; - if ( (i < (count-1)) ) - pathOut += wxFILE_SEP_PATH; - - ::FindClose(hFind); - } -#else // !Win32 - pathOut = path; -#endif // Win32/!Win32 - - return pathOut; -} - -wxPathFormat wxFileName::GetFormat( wxPathFormat format ) -{ - if (format == wxPATH_NATIVE) - { -#if defined(__WINDOWS__) - format = wxPATH_DOS; -#elif defined(__VMS) - format = wxPATH_VMS; -#else - format = wxPATH_UNIX; -#endif - } - return format; -} - -#ifdef wxHAS_FILESYSTEM_VOLUMES - -/* static */ -wxString wxFileName::GetVolumeString(char drive, int flags) -{ - wxASSERT_MSG( !(flags & ~wxPATH_GET_SEPARATOR), "invalid flag specified" ); - - wxString vol(drive); - vol += wxFILE_SEP_DSK; - if ( flags & wxPATH_GET_SEPARATOR ) - vol += wxFILE_SEP_PATH; - - return vol; -} - -#endif // wxHAS_FILESYSTEM_VOLUMES - -// ---------------------------------------------------------------------------- -// path splitting function -// ---------------------------------------------------------------------------- - -/* static */ -void -wxFileName::SplitVolume(const wxString& fullpathWithVolume, - wxString *pstrVolume, - wxString *pstrPath, - wxPathFormat format) -{ - format = GetFormat(format); - - wxString fullpath = fullpathWithVolume; - - if ( IsMSWUniqueVolumeNamePath(fullpath, format) ) - { - // special Windows unique volume names hack: transform - // \\?\Volume{guid}\path into Volume{guid}:path - // note: this check must be done before the check for UNC path - - // we know the last backslash from the unique volume name is located - // there from IsMSWUniqueVolumeNamePath - fullpath[wxMSWUniqueVolumePrefixLength - 1] = wxFILE_SEP_DSK; - - // paths starting with a unique volume name should always be absolute - fullpath.insert(wxMSWUniqueVolumePrefixLength, 1, wxFILE_SEP_PATH_DOS); - - // remove the leading "\\?\" part - fullpath.erase(0, 4); - } - else if ( IsUNCPath(fullpath, format) ) - { - // special Windows UNC paths hack: transform \\share\path into share:path - - fullpath.erase(0, 2); - - size_t posFirstSlash = - fullpath.find_first_of(GetPathTerminators(format)); - if ( posFirstSlash != wxString::npos ) - { - fullpath[posFirstSlash] = wxFILE_SEP_DSK; - - // UNC paths are always absolute, right? (FIXME) - fullpath.insert(posFirstSlash + 1, 1, wxFILE_SEP_PATH_DOS); - } - } - - // We separate the volume here - if ( format == wxPATH_DOS || format == wxPATH_VMS ) - { - wxString sepVol = GetVolumeSeparator(format); - - // we have to exclude the case of a colon in the very beginning of the - // string as it can't be a volume separator (nor can this be a valid - // DOS file name at all but we'll leave dealing with this to our caller) - size_t posFirstColon = fullpath.find_first_of(sepVol); - if ( posFirstColon && posFirstColon != wxString::npos ) - { - if ( pstrVolume ) - { - *pstrVolume = fullpath.Left(posFirstColon); - } - - // remove the volume name and the separator from the full path - fullpath.erase(0, posFirstColon + sepVol.length()); - } - } - - if ( pstrPath ) - *pstrPath = fullpath; -} - -/* static */ -void wxFileName::SplitPath(const wxString& fullpathWithVolume, - wxString *pstrVolume, - wxString *pstrPath, - wxString *pstrName, - wxString *pstrExt, - bool *hasExt, - wxPathFormat format) -{ - format = GetFormat(format); - - wxString fullpath; - SplitVolume(fullpathWithVolume, pstrVolume, &fullpath, format); - - // find the positions of the last dot and last path separator in the path - size_t posLastDot = fullpath.find_last_of(wxFILE_SEP_EXT); - size_t posLastSlash = fullpath.find_last_of(GetPathTerminators(format)); - - // check whether this dot occurs at the very beginning of a path component - if ( (posLastDot != wxString::npos) && - (posLastDot == 0 || - IsPathSeparator(fullpath[posLastDot - 1]) || - (format == wxPATH_VMS && fullpath[posLastDot - 1] == wxT(']'))) ) - { - // dot may be (and commonly -- at least under Unix -- is) the first - // character of the filename, don't treat the entire filename as - // extension in this case - posLastDot = wxString::npos; - } - - // if we do have a dot and a slash, check that the dot is in the name part - if ( (posLastDot != wxString::npos) && - (posLastSlash != wxString::npos) && - (posLastDot < posLastSlash) ) - { - // the dot is part of the path, not the start of the extension - posLastDot = wxString::npos; - } - - // now fill in the variables provided by user - if ( pstrPath ) - { - if ( posLastSlash == wxString::npos ) - { - // no path at all - pstrPath->Empty(); - } - else - { - // take everything up to the path separator but take care to make - // the path equal to something like '/', not empty, for the files - // immediately under root directory - size_t len = posLastSlash; - - // this rule does not apply to mac since we do not start with colons (sep) - // except for relative paths - if ( !len && format != wxPATH_MAC) - len++; - - *pstrPath = fullpath.Left(len); - - // special VMS hack: remove the initial bracket - if ( format == wxPATH_VMS ) - { - if ( (*pstrPath)[0u] == wxT('[') ) - pstrPath->erase(0, 1); - } - } - } - - if ( pstrName ) - { - // take all characters starting from the one after the last slash and - // up to, but excluding, the last dot - size_t nStart = posLastSlash == wxString::npos ? 0 : posLastSlash + 1; - size_t count; - if ( posLastDot == wxString::npos ) - { - // take all until the end - count = wxString::npos; - } - else if ( posLastSlash == wxString::npos ) - { - count = posLastDot; - } - else // have both dot and slash - { - count = posLastDot - posLastSlash - 1; - } - - *pstrName = fullpath.Mid(nStart, count); - } - - // finally deal with the extension here: we have an added complication that - // extension may be empty (but present) as in "foo." where trailing dot - // indicates the empty extension at the end -- and hence we must remember - // that we have it independently of pstrExt - if ( posLastDot == wxString::npos ) - { - // no extension - if ( pstrExt ) - pstrExt->clear(); - if ( hasExt ) - *hasExt = false; - } - else - { - // take everything after the dot - if ( pstrExt ) - *pstrExt = fullpath.Mid(posLastDot + 1); - if ( hasExt ) - *hasExt = true; - } -} - -/* static */ -void wxFileName::SplitPath(const wxString& fullpath, - wxString *path, - wxString *name, - wxString *ext, - wxPathFormat format) -{ - wxString volume; - SplitPath(fullpath, &volume, path, name, ext, format); - - if ( path ) - { - path->Prepend(wxGetVolumeString(volume, format)); - } -} - -/* static */ -wxString wxFileName::StripExtension(const wxString& fullpath) -{ - wxFileName fn(fullpath); - fn.SetExt(""); - return fn.GetFullPath(); -} - -// ---------------------------------------------------------------------------- -// file permissions functions -// ---------------------------------------------------------------------------- - -bool wxFileName::SetPermissions(int permissions) -{ - // Don't do anything for a symlink but first make sure it is one. - if ( m_dontFollowLinks && - Exists(GetFullPath(), wxFILE_EXISTS_SYMLINK|wxFILE_EXISTS_NO_FOLLOW) ) - { - // Looks like changing permissions for a symlinc is only supported - // on BSD where lchmod is present and correctly implemented. - // http://lists.gnu.org/archive/html/bug-coreutils/2009-09/msg00268.html - return false; - } - -#ifdef __WINDOWS__ - int accMode = 0; - - if ( permissions & (wxS_IRUSR|wxS_IRGRP|wxS_IROTH) ) - accMode = _S_IREAD; - - if ( permissions & (wxS_IWUSR|wxS_IWGRP|wxS_IWOTH) ) - accMode |= _S_IWRITE; - - permissions = accMode; -#endif // __WINDOWS__ - - return wxChmod(GetFullPath(), permissions) == 0; -} - -// ---------------------------------------------------------------------------- -// time functions -// ---------------------------------------------------------------------------- - -#if wxUSE_DATETIME - -bool wxFileName::SetTimes(const wxDateTime *dtAccess, - const wxDateTime *dtMod, - const wxDateTime *dtCreate) const -{ -#if defined(__WIN32__) - FILETIME ftAccess, ftCreate, ftWrite; - - if ( dtCreate ) - ConvertWxToFileTime(&ftCreate, *dtCreate); - if ( dtAccess ) - ConvertWxToFileTime(&ftAccess, *dtAccess); - if ( dtMod ) - ConvertWxToFileTime(&ftWrite, *dtMod); - - wxString path; - int flags; - if ( IsDir() ) - { - path = GetPath(); - flags = FILE_FLAG_BACKUP_SEMANTICS; - } - else // file - { - path = GetFullPath(); - flags = 0; - } - - wxFileHandle fh(path, wxFileHandle::WriteAttr, flags); - if ( fh.IsOk() ) - { - if ( ::SetFileTime(fh, - dtCreate ? &ftCreate : NULL, - dtAccess ? &ftAccess : NULL, - dtMod ? &ftWrite : NULL) ) - { - return true; - } - } -#elif defined(__UNIX_LIKE__) - wxUnusedVar(dtCreate); - - if ( !dtAccess && !dtMod ) - { - // can't modify the creation time anyhow, don't try - return true; - } - - // if dtAccess or dtMod is not specified, use the other one (which must be - // non NULL because of the test above) for both times - utimbuf utm; - utm.actime = dtAccess ? dtAccess->GetTicks() : dtMod->GetTicks(); - utm.modtime = dtMod ? dtMod->GetTicks() : dtAccess->GetTicks(); - if ( utime(GetFullPath().fn_str(), &utm) == 0 ) - { - return true; - } -#else // other platform - wxUnusedVar(dtAccess); - wxUnusedVar(dtMod); - wxUnusedVar(dtCreate); -#endif // platforms - - wxLogSysError(_("Failed to modify file times for '%s'"), - GetFullPath().c_str()); - - return false; -} - -bool wxFileName::Touch() const -{ -#if defined(__UNIX_LIKE__) - // under Unix touching file is simple: just pass NULL to utime() - if ( utime(GetFullPath().fn_str(), NULL) == 0 ) - { - return true; - } - - wxLogSysError(_("Failed to touch the file '%s'"), GetFullPath().c_str()); - - return false; -#else // other platform - wxDateTime dtNow = wxDateTime::Now(); - - return SetTimes(&dtNow, &dtNow, NULL /* don't change create time */); -#endif // platforms -} - -bool wxFileName::GetTimes(wxDateTime *dtAccess, - wxDateTime *dtMod, - wxDateTime *dtCreate) const -{ -#if defined(__WIN32__) - // we must use different methods for the files and directories under - // Windows as CreateFile(GENERIC_READ) doesn't work for the directories and - // CreateFile(FILE_FLAG_BACKUP_SEMANTICS) works -- but only under NT and - // not 9x - bool ok; - FILETIME ftAccess, ftCreate, ftWrite; - if ( IsDir() ) - { - // implemented in msw/dir.cpp - extern bool wxGetDirectoryTimes(const wxString& dirname, - FILETIME *, FILETIME *, FILETIME *); - - // we should pass the path without the trailing separator to - // wxGetDirectoryTimes() - ok = wxGetDirectoryTimes(GetPath(wxPATH_GET_VOLUME), - &ftAccess, &ftCreate, &ftWrite); - } - else // file - { - wxFileHandle fh(GetFullPath(), wxFileHandle::ReadAttr); - if ( fh.IsOk() ) - { - ok = ::GetFileTime(fh, - dtCreate ? &ftCreate : NULL, - dtAccess ? &ftAccess : NULL, - dtMod ? &ftWrite : NULL) != 0; - } - else - { - ok = false; - } - } - - if ( ok ) - { - if ( dtCreate ) - ConvertFileTimeToWx(dtCreate, ftCreate); - if ( dtAccess ) - ConvertFileTimeToWx(dtAccess, ftAccess); - if ( dtMod ) - ConvertFileTimeToWx(dtMod, ftWrite); - - return true; - } -#elif defined(wxHAVE_LSTAT) - // no need to test for IsDir() here - wxStructStat stBuf; - if ( StatAny(stBuf, *this) ) - { - // Android defines st_*time fields as unsigned long, but time_t as long, - // hence the static_casts. - if ( dtAccess ) - dtAccess->Set(static_cast(stBuf.st_atime)); - if ( dtMod ) - dtMod->Set(static_cast(stBuf.st_mtime)); - if ( dtCreate ) - dtCreate->Set(static_cast(stBuf.st_ctime)); - - return true; - } -#else // other platform - wxUnusedVar(dtAccess); - wxUnusedVar(dtMod); - wxUnusedVar(dtCreate); -#endif // platforms - - wxLogSysError(_("Failed to retrieve file times for '%s'"), - GetFullPath().c_str()); - - return false; -} - -#endif // wxUSE_DATETIME - - -// ---------------------------------------------------------------------------- -// file size functions -// ---------------------------------------------------------------------------- - -#if wxUSE_LONGLONG - -/* static */ -wxULongLong wxFileName::GetSize(const wxString &filename) -{ - if (!wxFileExists(filename)) - return wxInvalidSize; - -#if defined(__WIN32__) - wxFileHandle f(filename, wxFileHandle::ReadAttr); - if (!f.IsOk()) - return wxInvalidSize; - - DWORD lpFileSizeHigh; - DWORD ret = GetFileSize(f, &lpFileSizeHigh); - if ( ret == INVALID_FILE_SIZE && ::GetLastError() != NO_ERROR ) - return wxInvalidSize; - - return wxULongLong(lpFileSizeHigh, ret); -#else // ! __WIN32__ - wxStructStat st; - if (wxStat( filename, &st) != 0) - return wxInvalidSize; - return wxULongLong(st.st_size); -#endif -} - -/* static */ -wxString wxFileName::GetHumanReadableSize(const wxULongLong &bs, - const wxString &nullsize, - int precision, - wxSizeConvention conv) -{ - // deal with trivial case first - if ( bs == 0 || bs == wxInvalidSize ) - return nullsize; - - // depending on the convention used the multiplier may be either 1000 or - // 1024 and the binary infix may be empty (for "KB") or "i" (for "KiB") - double multiplier = 1024.; - wxString biInfix; - - switch ( conv ) - { - case wxSIZE_CONV_TRADITIONAL: - // nothing to do, this corresponds to the default values of both - // the multiplier and infix string - break; - - case wxSIZE_CONV_IEC: - biInfix = "i"; - break; - - case wxSIZE_CONV_SI: - multiplier = 1000; - break; - } - - const double kiloByteSize = multiplier; - const double megaByteSize = multiplier * kiloByteSize; - const double gigaByteSize = multiplier * megaByteSize; - const double teraByteSize = multiplier * gigaByteSize; - - const double bytesize = bs.ToDouble(); - - wxString result; - if ( bytesize < kiloByteSize ) - result.Printf("%s B", bs.ToString()); - else if ( bytesize < megaByteSize ) - result.Printf("%.*f K%sB", precision, bytesize/kiloByteSize, biInfix); - else if (bytesize < gigaByteSize) - result.Printf("%.*f M%sB", precision, bytesize/megaByteSize, biInfix); - else if (bytesize < teraByteSize) - result.Printf("%.*f G%sB", precision, bytesize/gigaByteSize, biInfix); - else - result.Printf("%.*f T%sB", precision, bytesize/teraByteSize, biInfix); - - return result; -} - -wxULongLong wxFileName::GetSize() const -{ - return GetSize(GetFullPath()); -} - -wxString wxFileName::GetHumanReadableSize(const wxString& failmsg, - int precision, - wxSizeConvention conv) const -{ - return GetHumanReadableSize(GetSize(), failmsg, precision, conv); -} - -#endif // wxUSE_LONGLONG - diff --git a/Externals/wxWidgets3/src/common/filepickercmn.cpp b/Externals/wxWidgets3/src/common/filepickercmn.cpp deleted file mode 100644 index ad3be2a644..0000000000 --- a/Externals/wxWidgets3/src/common/filepickercmn.cpp +++ /dev/null @@ -1,248 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/filepickercmn.cpp -// Purpose: wxFilePickerCtrl class implementation -// Author: Francesco Montorsi (readapted code written by Vadim Zeitlin) -// Modified by: -// Created: 15/04/2006 -// Copyright: (c) Vadim Zeitlin, Francesco Montorsi -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL - -#include "wx/filepicker.h" -#include "wx/filename.h" - -#ifndef WX_PRECOMP - #include "wx/textctrl.h" -#endif - -// ============================================================================ -// implementation -// ============================================================================ - -const char wxFilePickerCtrlNameStr[] = "filepicker"; -const char wxFilePickerWidgetNameStr[] = "filepickerwidget"; -const char wxDirPickerCtrlNameStr[] = "dirpicker"; -const char wxDirPickerWidgetNameStr[] = "dirpickerwidget"; -const char wxFilePickerWidgetLabel[] = wxTRANSLATE("Browse"); -const char wxDirPickerWidgetLabel[] = wxTRANSLATE("Browse"); - -wxDEFINE_EVENT( wxEVT_FILEPICKER_CHANGED, wxFileDirPickerEvent ); -wxDEFINE_EVENT( wxEVT_DIRPICKER_CHANGED, wxFileDirPickerEvent ); -wxIMPLEMENT_DYNAMIC_CLASS(wxFileDirPickerEvent, wxCommandEvent); - -// ---------------------------------------------------------------------------- -// wxFileDirPickerCtrlBase -// ---------------------------------------------------------------------------- - -bool wxFileDirPickerCtrlBase::CreateBase(wxWindow *parent, - wxWindowID id, - const wxString &path, - const wxString &message, - const wxString &wildcard, - const wxPoint &pos, - const wxSize &size, - long style, - const wxValidator& validator, - const wxString &name ) -{ - if (!wxPickerBase::CreateBase(parent, id, path, pos, size, - style, validator, name)) - return false; - - if (!HasFlag(wxFLP_OPEN) && !HasFlag(wxFLP_SAVE)) - m_windowStyle |= wxFLP_OPEN; // wxFD_OPEN is the default - - // check that the styles are not contradictory - wxASSERT_MSG( !(HasFlag(wxFLP_SAVE) && HasFlag(wxFLP_OPEN)), - wxT("can't specify both wxFLP_SAVE and wxFLP_OPEN at once") ); - - wxASSERT_MSG( !HasFlag(wxFLP_SAVE) || !HasFlag(wxFLP_FILE_MUST_EXIST), - wxT("wxFLP_FILE_MUST_EXIST can't be used with wxFLP_SAVE" ) ); - - wxASSERT_MSG( !HasFlag(wxFLP_OPEN) || !HasFlag(wxFLP_OVERWRITE_PROMPT), - wxT("wxFLP_OVERWRITE_PROMPT can't be used with wxFLP_OPEN") ); - - // create a wxFilePickerWidget or a wxDirPickerWidget... - m_pickerIface = CreatePicker(this, path, message, wildcard); - if ( !m_pickerIface ) - return false; - m_picker = m_pickerIface->AsControl(); - - // complete sizer creation - wxPickerBase::PostCreation(); - - DoConnect( m_picker, this ); - - // default's wxPickerBase textctrl limit is too small for this control: - // make it bigger - if (m_text) m_text->SetMaxLength(512); - - return true; -} - -wxString wxFileDirPickerCtrlBase::GetPath() const -{ - return m_pickerIface->GetPath(); -} - -void wxFileDirPickerCtrlBase::SetPath(const wxString &path) -{ - m_pickerIface->SetPath(path); - UpdateTextCtrlFromPicker(); -} - -void wxFileDirPickerCtrlBase::UpdatePickerFromTextCtrl() -{ - wxASSERT(m_text); - - // remove the eventually present path-separator from the end of the textctrl - // string otherwise we would generate a wxFileDirPickerEvent when changing - // from e.g. /home/user to /home/user/ and we want to avoid it ! - wxString newpath(GetTextCtrlValue()); - - // Notice that we use to check here whether the current path is valid, i.e. - // if the corresponding file or directory exists for the controls with - // wxFLP_FILE_MUST_EXIST or wxDIRP_DIR_MUST_EXIST flag, however we don't do - // this any more as we still must notify the program about any changes in - // the control, otherwise its view of it would be different from what is - // actually shown on the screen, resulting in very confusing UI. - - if (m_pickerIface->GetPath() != newpath) - { - m_pickerIface->SetPath(newpath); - - // update current working directory, if necessary - // NOTE: the path separator is required because if newpath is "C:" - // then no change would happen - if (IsCwdToUpdate()) - wxSetWorkingDirectory(newpath); - - // fire an event - wxFileDirPickerEvent event(GetEventType(), this, GetId(), newpath); - GetEventHandler()->ProcessEvent(event); - } -} - -void wxFileDirPickerCtrlBase::UpdateTextCtrlFromPicker() -{ - if (!m_text) - return; // no textctrl to update - - // Take care to use ChangeValue() here and not SetValue() to avoid - // generating an event that would trigger UpdateTextCtrlFromPicker() - // resulting in infinite recursion. - m_text->ChangeValue(m_pickerIface->GetPath()); -} - - - -// ---------------------------------------------------------------------------- -// wxFileDirPickerCtrlBase - event handlers -// ---------------------------------------------------------------------------- - -void wxFileDirPickerCtrlBase::OnFileDirChange(wxFileDirPickerEvent &ev) -{ - UpdateTextCtrlFromPicker(); - - // the wxFilePickerWidget sent us a colour-change notification. - // forward this event to our parent - wxFileDirPickerEvent event(GetEventType(), this, GetId(), ev.GetPath()); - GetEventHandler()->ProcessEvent(event); -} - -#endif // wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL - -// ---------------------------------------------------------------------------- -// wxFileDirPickerCtrl -// ---------------------------------------------------------------------------- - -#if wxUSE_FILEPICKERCTRL - -wxIMPLEMENT_DYNAMIC_CLASS(wxFilePickerCtrl, wxPickerBase); - -bool wxFilePickerCtrl::Create(wxWindow *parent, - wxWindowID id, - const wxString& path, - const wxString& message, - const wxString& wildcard, - const wxPoint& pos, - const wxSize& size, - long style, - const wxValidator& validator, - const wxString& name) -{ - if ( !wxFileDirPickerCtrlBase::CreateBase - ( - parent, id, path, message, wildcard, - pos, size, style, validator, name - ) ) - return false; - - if ( HasTextCtrl() ) - GetTextCtrl()->AutoCompleteFileNames(); - - return true; -} - -wxString wxFilePickerCtrl::GetTextCtrlValue() const -{ - // filter it through wxFileName to remove any spurious path separator - return wxFileName(m_text->GetValue()).GetFullPath(); -} - -#endif // wxUSE_FILEPICKERCTRL - -// ---------------------------------------------------------------------------- -// wxDirPickerCtrl -// ---------------------------------------------------------------------------- - -#if wxUSE_DIRPICKERCTRL -wxIMPLEMENT_DYNAMIC_CLASS(wxDirPickerCtrl, wxPickerBase); - -bool wxDirPickerCtrl::Create(wxWindow *parent, - wxWindowID id, - const wxString& path, - const wxString& message, - const wxPoint& pos, - const wxSize& size, - long style, - const wxValidator& validator, - const wxString& name) -{ - if ( !wxFileDirPickerCtrlBase::CreateBase - ( - parent, id, path, message, wxString(), - pos, size, style, validator, name - ) ) - return false; - - if ( HasTextCtrl() ) - GetTextCtrl()->AutoCompleteDirectories(); - - return true; -} - -wxString wxDirPickerCtrl::GetTextCtrlValue() const -{ - // filter it through wxFileName to remove any spurious path separator - return wxFileName::DirName(m_text->GetValue()).GetPath(); -} - -#endif // wxUSE_DIRPICKERCTRL diff --git a/Externals/wxWidgets3/src/common/filesys.cpp b/Externals/wxWidgets3/src/common/filesys.cpp deleted file mode 100644 index 1a04946aea..0000000000 --- a/Externals/wxWidgets3/src/common/filesys.cpp +++ /dev/null @@ -1,805 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/filesys.cpp -// Purpose: wxFileSystem class - interface for opening files -// Author: Vaclav Slavik -// Copyright: (c) 1999 Vaclav Slavik -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - - -#if wxUSE_FILESYSTEM - -#include "wx/filesys.h" - -#ifndef WX_PRECOMP - #include "wx/log.h" - #include "wx/module.h" -#endif - -#include "wx/sysopt.h" -#include "wx/wfstream.h" -#include "wx/mimetype.h" -#include "wx/filename.h" -#include "wx/tokenzr.h" -#include "wx/uri.h" -#include "wx/private/fileback.h" -#include "wx/utils.h" - -// ---------------------------------------------------------------------------- -// wxFSFile -// ---------------------------------------------------------------------------- - -const wxString& wxFSFile::GetMimeType() const -{ - if ( m_MimeType.empty() && !m_Location.empty() ) - { - wxConstCast(this, wxFSFile)->m_MimeType = - wxFileSystemHandler::GetMimeTypeFromExt(m_Location); - } - - return m_MimeType; -} - -// ---------------------------------------------------------------------------- -// wxFileSystemHandler -// ---------------------------------------------------------------------------- - -wxIMPLEMENT_ABSTRACT_CLASS(wxFileSystemHandler, wxObject); - - -/* static */ -wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location) -{ - wxString ext, mime; - wxString loc = GetRightLocation(location); - wxChar c; - int l = loc.length(), l2; - - l2 = l; - for (int i = l-1; i >= 0; i--) - { - c = loc[(unsigned int) i]; - if ( c == wxT('#') ) - l2 = i + 1; - if ( c == wxT('.') ) - { - ext = loc.Right(l2-i-1); - break; - } - if ( (c == wxT('/')) || (c == wxT('\\')) || (c == wxT(':')) ) - return wxEmptyString; - } - -#if wxUSE_MIMETYPE - static bool s_MinimalMimeEnsured = false; - - // Don't use mime types manager if the application doesn't need it and it would be - // cause an unacceptable delay, especially on startup. -#if wxUSE_SYSTEM_OPTIONS - if ( !wxSystemOptions::GetOptionInt(wxT("filesys.no-mimetypesmanager")) ) -#endif - { - if (!s_MinimalMimeEnsured) - { - static const wxFileTypeInfo fallbacks[] = - { - wxFileTypeInfo(wxT("image/jpeg"), - wxEmptyString, - wxEmptyString, - wxT("JPEG image (from fallback)"), - wxT("jpg"), wxT("jpeg"), wxT("JPG"), wxT("JPEG"), wxNullPtr), - wxFileTypeInfo(wxT("image/gif"), - wxEmptyString, - wxEmptyString, - wxT("GIF image (from fallback)"), - wxT("gif"), wxT("GIF"), wxNullPtr), - wxFileTypeInfo(wxT("image/png"), - wxEmptyString, - wxEmptyString, - wxT("PNG image (from fallback)"), - wxT("png"), wxT("PNG"), wxNullPtr), - wxFileTypeInfo(wxT("image/bmp"), - wxEmptyString, - wxEmptyString, - wxT("windows bitmap image (from fallback)"), - wxT("bmp"), wxT("BMP"), wxNullPtr), - wxFileTypeInfo(wxT("text/html"), - wxEmptyString, - wxEmptyString, - wxT("HTML document (from fallback)"), - wxT("htm"), wxT("html"), wxT("HTM"), wxT("HTML"), wxNullPtr), - // must terminate the table with this! - wxFileTypeInfo() - }; - wxTheMimeTypesManager->AddFallbacks(fallbacks); - s_MinimalMimeEnsured = true; - } - - wxFileType *ft = wxTheMimeTypesManager->GetFileTypeFromExtension(ext); - if ( !ft || !ft -> GetMimeType(&mime) ) - { - mime = wxEmptyString; - } - - delete ft; - - return mime; - } - else -#endif - { - if ( ext.IsSameAs(wxT("htm"), false) || ext.IsSameAs(wxT("html"), false) ) - return wxT("text/html"); - if ( ext.IsSameAs(wxT("jpg"), false) || ext.IsSameAs(wxT("jpeg"), false) ) - return wxT("image/jpeg"); - if ( ext.IsSameAs(wxT("gif"), false) ) - return wxT("image/gif"); - if ( ext.IsSameAs(wxT("png"), false) ) - return wxT("image/png"); - if ( ext.IsSameAs(wxT("bmp"), false) ) - return wxT("image/bmp"); - return wxEmptyString; - } -} - - - -/* static */ -wxString wxFileSystemHandler::GetProtocol(const wxString& location) -{ - wxString s = wxEmptyString; - int i, l = location.length(); - bool fnd = false; - - for (i = l-1; (i >= 0) && ((location[i] != wxT('#')) || (!fnd)); i--) { - if ((location[i] == wxT(':')) && (i != 1 /*win: C:\path*/)) fnd = true; - } - if (!fnd) return wxT("file"); - for (++i; (i < l) && (location[i] != wxT(':')); i++) s << location[i]; - return s; -} - - -/* static */ -wxString wxFileSystemHandler::GetLeftLocation(const wxString& location) -{ - int i; - bool fnd = false; - - for (i = location.length()-1; i >= 0; i--) { - if ((location[i] == wxT(':')) && (i != 1 /*win: C:\path*/)) fnd = true; - else if (fnd && (location[i] == wxT('#'))) return location.Left(i); - } - return wxEmptyString; -} - -/* static */ -wxString wxFileSystemHandler::GetRightLocation(const wxString& location) -{ - int i, len = location.length(); - for (i = len-1; i >= 0; i--) - { - if (location[i] == wxT('#')) - len = i; - if (location[i] != wxT(':')) - continue; - - // C: on Windows - if (i == 1) - continue; - if (i >= 2 && wxIsalpha(location[i-1]) && location[i-2] == wxT('/')) - continue; - - // Could be the protocol - break; - } - if (i == 0) return wxEmptyString; - - const static wxString protocol(wxT("file:")); - if (i < (int)protocol.length() - 1 || location.compare(0, i + 1, protocol)) - return location.Mid(i + 1, len - i - 1); - - int s = ++i; // Start position - // Check if there are three '/'s after "file:" - int end = wxMin(len, s + 3); - while (i < end && location[i] == wxT('/')) - i++; - if (i == s + 2) // Host is specified, e.g. "file://host/path" - return location.Mid(s, len - s); - if (i > s) - { - // Remove the last '/' if it is preceding "C:/...". - // Otherwise, keep it. - if (i + 1 >= len || location[i + 1] != wxT(':')) - i--; - else if (i + 4 < len) - { - // Check if ':' was encoded - const static wxString colonLower(wxT("%3a")); - const static wxString colonUpper(wxT("%3A")); - wxString sub =location.Mid(i + 1, 3); - if (sub == colonLower || sub == colonUpper) - i--; - } - } - return location.Mid(i, len - i); -} - -/* static */ -wxString wxFileSystemHandler::GetAnchor(const wxString& location) -{ - wxChar c; - int l = location.length(); - - for (int i = l-1; i >= 0; i--) { - c = location[i]; - if (c == wxT('#')) - return location.Right(l-i-1); - else if ((c == wxT('/')) || (c == wxT('\\')) || (c == wxT(':'))) - return wxEmptyString; - } - return wxEmptyString; -} - - -wxString wxFileSystemHandler::FindFirst(const wxString& WXUNUSED(spec), - int WXUNUSED(flags)) -{ - return wxEmptyString; -} - -wxString wxFileSystemHandler::FindNext() -{ - return wxEmptyString; -} - -//-------------------------------------------------------------------------------- -// wxLocalFSHandler -//-------------------------------------------------------------------------------- - - -wxString wxLocalFSHandler::ms_root; - -bool wxLocalFSHandler::CanOpen(const wxString& location) -{ - return GetProtocol(location) == wxT("file"); -} - -wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location) -{ - // location has Unix path separators - wxString right = GetRightLocation(location); - wxFileName fn = wxFileSystem::URLToFileName(right); - wxString fullpath = ms_root + fn.GetFullPath(); - - if (!wxFileExists(fullpath)) - return NULL; - - // we need to check whether we can really read from this file, otherwise - // wxFSFile is not going to work -#if wxUSE_FFILE - wxFFileInputStream *is = new wxFFileInputStream(fullpath); -#elif wxUSE_FILE - wxFileInputStream *is = new wxFileInputStream(fullpath); -#else -#error One of wxUSE_FILE or wxUSE_FFILE must be set to 1 for wxFSHandler to work -#endif - if ( !is->IsOk() ) - { - delete is; - return NULL; - } - - return new wxFSFile(is, - location, - wxEmptyString, - GetAnchor(location) -#if wxUSE_DATETIME - ,wxDateTime(wxFileModificationTime(fullpath)) -#endif // wxUSE_DATETIME - ); -} - -wxString wxLocalFSHandler::FindFirst(const wxString& spec, int flags) -{ - wxFileName fn = wxFileSystem::URLToFileName(GetRightLocation(spec)); - const wxString found = wxFindFirstFile(ms_root + fn.GetFullPath(), flags); - if ( found.empty() ) - return found; - return wxFileSystem::FileNameToURL(found); -} - -wxString wxLocalFSHandler::FindNext() -{ - const wxString found = wxFindNextFile(); - if ( found.empty() ) - return found; - return wxFileSystem::FileNameToURL(found); -} - - - -//----------------------------------------------------------------------------- -// wxFileSystem -//----------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxFileSystem, wxObject); -wxIMPLEMENT_ABSTRACT_CLASS(wxFSFile, wxObject); - - -wxList wxFileSystem::m_Handlers; - - -wxFileSystem::~wxFileSystem() -{ - WX_CLEAR_HASH_MAP(wxFSHandlerHash, m_LocalHandlers) -} - - -static wxString MakeCorrectPath(const wxString& path) -{ - wxString p(path); - wxString r; - int i, j, cnt; - - cnt = p.length(); - for (i = 0; i < cnt; i++) - if (p.GetChar(i) == wxT('\\')) p.GetWritableChar(i) = wxT('/'); // Want to be windows-safe - - if (p.Left(2) == wxT("./")) { p = p.Mid(2); cnt -= 2; } - - if (cnt < 3) return p; - - r << p.GetChar(0) << p.GetChar(1); - - // skip trailing ../.., if any - for (i = 2; i < cnt && (p.GetChar(i) == wxT('/') || p.GetChar(i) == wxT('.')); i++) r << p.GetChar(i); - - // remove back references: translate dir1/../dir2 to dir2 - for (; i < cnt; i++) - { - r << p.GetChar(i); - if (p.GetChar(i) == wxT('/') && p.GetChar(i-1) == wxT('.') && p.GetChar(i-2) == wxT('.')) - { - for (j = r.length() - 2; j >= 0 && r.GetChar(j) != wxT('/') && r.GetChar(j) != wxT(':'); j--) {} - if (j >= 0 && r.GetChar(j) != wxT(':')) - { - for (j = j - 1; j >= 0 && r.GetChar(j) != wxT('/') && r.GetChar(j) != wxT(':'); j--) {} - r.Remove(j + 1); - } - } - } - - for (; i < cnt; i++) r << p.GetChar(i); - - return r; -} - - -void wxFileSystem::ChangePathTo(const wxString& location, bool is_dir) -{ - int i, pathpos = -1; - - m_Path = MakeCorrectPath(location); - - if (is_dir) - { - if (!m_Path.empty() && m_Path.Last() != wxT('/') && m_Path.Last() != wxT(':')) - m_Path << wxT('/'); - } - - else - { - for (i = m_Path.length()-1; i >= 0; i--) - { - if (m_Path[(unsigned int) i] == wxT('/')) - { - if ((i > 1) && (m_Path[(unsigned int) (i-1)] == wxT('/')) && (m_Path[(unsigned int) (i-2)] == wxT(':'))) - { - i -= 2; - continue; - } - else - { - pathpos = i; - break; - } - } - else if (m_Path[(unsigned int) i] == wxT(':')) { - pathpos = i; - break; - } - } - if (pathpos == -1) - { - for (i = 0; i < (int) m_Path.length(); i++) - { - if (m_Path[(unsigned int) i] == wxT(':')) - { - m_Path.Remove(i+1); - break; - } - } - if (i == (int) m_Path.length()) - m_Path = wxEmptyString; - } - else - { - m_Path.Remove(pathpos+1); - } - } -} - - - -wxFileSystemHandler *wxFileSystem::MakeLocal(wxFileSystemHandler *h) -{ - wxClassInfo *classinfo = h->GetClassInfo(); - - if (classinfo->IsDynamic()) - { - wxFileSystemHandler*& local = m_LocalHandlers[classinfo]; - if (!local) - local = (wxFileSystemHandler*)classinfo->CreateObject(); - return local; - } - else - { - return h; - } -} - - - -wxFSFile* wxFileSystem::OpenFile(const wxString& location, int flags) -{ - if ((flags & wxFS_READ) == 0) - return NULL; - - wxString loc = MakeCorrectPath(location); - unsigned i, ln; - wxChar meta; - wxFSFile *s = NULL; - wxList::compatibility_iterator node; - - ln = loc.length(); - meta = 0; - for (i = 0; i < ln; i++) - { - switch ( loc[i].GetValue() ) - { - case wxT('/') : case wxT(':') : case wxT('#') : - meta = loc[i]; - break; - } - if (meta != 0) break; - } - m_LastName = wxEmptyString; - - // try relative paths first : - if (meta != wxT(':')) - { - node = m_Handlers.GetFirst(); - while (node) - { - wxFileSystemHandler *h = (wxFileSystemHandler*) node -> GetData(); - if (h->CanOpen(m_Path + loc)) - { - s = MakeLocal(h)->OpenFile(*this, m_Path + loc); - if (s) { m_LastName = m_Path + loc; break; } - } - node = node->GetNext(); - } - } - - // if failed, try absolute paths : - if (s == NULL) - { - node = m_Handlers.GetFirst(); - while (node) - { - wxFileSystemHandler *h = (wxFileSystemHandler*) node->GetData(); - if (h->CanOpen(loc)) - { - s = MakeLocal(h)->OpenFile(*this, loc); - if (s) { m_LastName = loc; break; } - } - node = node->GetNext(); - } - } - - if (s && (flags & wxFS_SEEKABLE) != 0 && !s->GetStream()->IsSeekable()) - { - wxBackedInputStream *stream; - stream = new wxBackedInputStream(s->DetachStream()); - stream->FindLength(); - s->SetStream(stream); - } - - return (s); -} - - - -wxString wxFileSystem::FindFirst(const wxString& spec, int flags) -{ - wxList::compatibility_iterator node; - wxString spec2(spec); - - m_FindFileHandler = NULL; - - for (int i = spec2.length()-1; i >= 0; i--) - if (spec2[(unsigned int) i] == wxT('\\')) spec2.GetWritableChar(i) = wxT('/'); // Want to be windows-safe - - node = m_Handlers.GetFirst(); - while (node) - { - wxFileSystemHandler *h = (wxFileSystemHandler*) node -> GetData(); - if (h -> CanOpen(m_Path + spec2)) - { - m_FindFileHandler = MakeLocal(h); - return m_FindFileHandler -> FindFirst(m_Path + spec2, flags); - } - node = node->GetNext(); - } - - node = m_Handlers.GetFirst(); - while (node) - { - wxFileSystemHandler *h = (wxFileSystemHandler*) node -> GetData(); - if (h -> CanOpen(spec2)) - { - m_FindFileHandler = MakeLocal(h); - return m_FindFileHandler -> FindFirst(spec2, flags); - } - node = node->GetNext(); - } - - return wxEmptyString; -} - - - -wxString wxFileSystem::FindNext() -{ - if (m_FindFileHandler == NULL) return wxEmptyString; - else return m_FindFileHandler -> FindNext(); -} - -bool wxFileSystem::FindFileInPath(wxString *pStr, - const wxString& path, - const wxString& basename) -{ - // we assume that it's not empty - wxCHECK_MSG( !basename.empty(), false, - wxT("empty file name in wxFileSystem::FindFileInPath")); - - wxString name; - // skip path separator in the beginning of the file name if present - if ( wxIsPathSeparator(basename[0u]) ) - name = basename.substr(1); - else - name = basename; - - wxStringTokenizer tokenizer(path, wxPATH_SEP); - while ( tokenizer.HasMoreTokens() ) - { - wxString strFile = tokenizer.GetNextToken(); - if ( !wxEndsWithPathSeparator(strFile) ) - strFile += wxFILE_SEP_PATH; - strFile += name; - - wxFSFile *file = OpenFile(strFile); - if ( file ) - { - delete file; - *pStr = strFile; - return true; - } - } - - return false; -} - -void wxFileSystem::AddHandler(wxFileSystemHandler *handler) -{ - // prepend the handler to the beginning of the list because handlers added - // last should have the highest priority to allow overriding them - m_Handlers.Insert((size_t)0, handler); -} - -wxFileSystemHandler* wxFileSystem::RemoveHandler(wxFileSystemHandler *handler) -{ - // if handler has already been removed (or deleted) - // we return NULL. This is by design in case - // CleanUpHandlers() is called before RemoveHandler - // is called, as we cannot control the order - // which modules are unloaded - if (!m_Handlers.DeleteObject(handler)) - return NULL; - - return handler; -} - - -bool wxFileSystem::HasHandlerForPath(const wxString &location) -{ - for ( wxList::compatibility_iterator node = m_Handlers.GetFirst(); - node; node = node->GetNext() ) - { - wxFileSystemHandler *h = (wxFileSystemHandler*) node->GetData(); - if (h->CanOpen(location)) - return true; - } - - return false; -} - -void wxFileSystem::CleanUpHandlers() -{ - WX_CLEAR_LIST(wxList, m_Handlers); -} - -static const wxString g_unixPathString(wxT("/")); -static const wxString g_nativePathString(wxFILE_SEP_PATH); - -// Returns the native path for a file URL -wxFileName wxFileSystem::URLToFileName(const wxString& url) -{ - wxString path = url; - - if ( path.Find(wxT("file://")) == 0 ) - { - path = path.Mid(7); - } - else if ( path.Find(wxT("file:")) == 0 ) - { - path = path.Mid(5); - } - // Remove preceding double slash on Mac Classic -#if defined(__WXMAC__) && !defined(__UNIX__) - else if ( path.Find(wxT("//")) == 0 ) - path = path.Mid(2); -#endif - - path = wxURI::Unescape(path); - -#ifdef __WINDOWS__ - // file urls either start with a forward slash (local harddisk), - // otherwise they have a servername/sharename notation, - // which only exists on msw and corresponds to a unc - if ( path.length() > 1 && (path[0u] == wxT('/') && path [1u] != wxT('/')) ) - { - path = path.Mid(1); - } - else if ( (url.Find(wxT("file://")) == 0) && - (path.Find(wxT('/')) != wxNOT_FOUND) && - (path.length() > 1) && (path[1u] != wxT(':')) ) - { - path = wxT("//") + path; - } -#endif - - path.Replace(g_unixPathString, g_nativePathString); - - return wxFileName(path, wxPATH_NATIVE); -} - -// Escapes non-ASCII and others characters in file: URL to be valid URLs -static wxString EscapeFileNameCharsInURL(const char *in) -{ - wxString s; - - for ( const unsigned char *p = (const unsigned char*)in; *p; ++p ) - { - const unsigned char c = *p; - - // https://tools.ietf.org/html/rfc1738#section-5 - if ( (c >= '0' && c <= '9') || - (c >= 'a' && c <= 'z') || - (c >= 'A' && c <= 'Z') || - strchr("/:$-_.+!*'(),", c) ) // Plus '/' and ':' - { - s << c; - } - else - { - s << wxString::Format("%%%02x", c); - } - } - - return s; -} - -// Returns the file URL for a native path -wxString wxFileSystem::FileNameToURL(const wxFileName& filename) -{ - wxFileName fn = filename; - fn.Normalize(wxPATH_NORM_DOTS | wxPATH_NORM_TILDE | wxPATH_NORM_ABSOLUTE); - wxString url = fn.GetFullPath(wxPATH_NATIVE); - -#ifndef __UNIX__ - // unc notation, wxMSW - if ( url.Find(wxT("\\\\")) == 0 ) - { - url = url.Mid(2); - } - else - { - url = wxT("/") + url; - } -#endif - - url.Replace(g_nativePathString, g_unixPathString); - - // Do wxURI- and common practice-compatible escaping: encode the string - // into UTF-8, then escape anything non-ASCII: - return wxT("file://") + EscapeFileNameCharsInURL(url.utf8_str()); -} - - -///// Module: - -class wxFileSystemModule : public wxModule -{ - wxDECLARE_DYNAMIC_CLASS(wxFileSystemModule); - - public: - wxFileSystemModule() : - wxModule(), - m_handler(NULL) - { - } - - virtual bool OnInit() wxOVERRIDE - { - m_handler = new wxLocalFSHandler; - wxFileSystem::AddHandler(m_handler); - return true; - } - virtual void OnExit() wxOVERRIDE - { - delete wxFileSystem::RemoveHandler(m_handler); - - wxFileSystem::CleanUpHandlers(); - } - - private: - wxFileSystemHandler* m_handler; - -}; - -wxIMPLEMENT_DYNAMIC_CLASS(wxFileSystemModule, wxModule); - -//// wxFSInputStream - -wxFSInputStream::wxFSInputStream(const wxString& filename, int flags) -{ - wxFileSystem fs; - m_file = fs.OpenFile(filename, flags | wxFS_READ); - - if ( m_file ) - { - wxInputStream* const stream = m_file->GetStream(); - if ( stream ) - { - // Notice that we pass the stream by reference: it shouldn't be - // deleted by us as it's owned by m_file already. - InitParentStream(*stream); - } - } -} - -wxFSInputStream::~wxFSInputStream() -{ - delete m_file; -} - -#endif - // wxUSE_FILESYSTEM diff --git a/Externals/wxWidgets3/src/common/filtall.cpp b/Externals/wxWidgets3/src/common/filtall.cpp deleted file mode 100644 index bfdf31324b..0000000000 --- a/Externals/wxWidgets3/src/common/filtall.cpp +++ /dev/null @@ -1,35 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/filtall.cpp -// Purpose: Link all filter streams -// Author: Mike Wetherell -// Copyright: (c) 2006 Mike Wetherell -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_STREAMS - -#if wxUSE_ZLIB -#include "wx/zstream.h" -#endif - -// Reference filter classes to ensure they are linked into a statically -// linked program that uses Find or GetFirst to look for an filter handler. -// It is in its own file so that the user can override this behaviour by -// providing their own implementation. - -void wxUseFilterClasses() -{ -#if wxUSE_ZLIB - wxZlibClassFactory(); - wxGzipClassFactory(); -#endif -} - -#endif // wxUSE_STREAMS diff --git a/Externals/wxWidgets3/src/common/filtfind.cpp b/Externals/wxWidgets3/src/common/filtfind.cpp deleted file mode 100644 index 9e25441fa2..0000000000 --- a/Externals/wxWidgets3/src/common/filtfind.cpp +++ /dev/null @@ -1,42 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/filtfind.cpp -// Purpose: Streams for filter formats -// Author: Mike Wetherell -// Copyright: (c) Mike Wetherell -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_STREAMS - -#include "wx/stream.h" - -// These functions are in a separate file so that statically linked apps -// that do not call them to search for filter handlers will only link in -// the filter classes they use. - -const wxFilterClassFactory * -wxFilterClassFactory::Find(const wxString& protocol, wxStreamProtocolType type) -{ - for (const wxFilterClassFactory *f = GetFirst(); f; f = f->GetNext()) - if (f->CanHandle(protocol, type)) - return f; - - return NULL; -} - -// static -const wxFilterClassFactory *wxFilterClassFactory::GetFirst() -{ - if (!sm_first) - wxUseFilterClasses(); - return sm_first; -} - -#endif // wxUSE_STREAMS diff --git a/Externals/wxWidgets3/src/common/fldlgcmn.cpp b/Externals/wxWidgets3/src/common/fldlgcmn.cpp deleted file mode 100644 index 5bbe74356a..0000000000 --- a/Externals/wxWidgets3/src/common/fldlgcmn.cpp +++ /dev/null @@ -1,395 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/fldlgcmn.cpp -// Purpose: wxFileDialog common functions -// Author: John Labenski -// Modified by: -// Created: 14.06.03 (extracted from src/*/filedlg.cpp) -// Copyright: (c) Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_FILEDLG - -#include "wx/filedlg.h" -#include "wx/dirdlg.h" -#include "wx/filename.h" - -#ifndef WX_PRECOMP - #include "wx/string.h" - #include "wx/intl.h" - #include "wx/window.h" -#endif // WX_PRECOMP - -extern WXDLLEXPORT_DATA(const char) wxFileDialogNameStr[] = "filedlg"; -extern WXDLLEXPORT_DATA(const char) wxFileSelectorPromptStr[] = "Select a file"; -extern WXDLLEXPORT_DATA(const char) wxFileSelectorDefaultWildcardStr[] = -#if defined(__WXMSW__) - "*.*" -#else // Unix/Mac - "*" -#endif - ; - -//---------------------------------------------------------------------------- -// wxFileDialogBase -//---------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxFileDialogBase, wxDialog); - -void wxFileDialogBase::Init() -{ - m_filterIndex = 0; - m_windowStyle = 0; - m_extraControl = NULL; - m_extraControlCreator = NULL; -} - -bool wxFileDialogBase::Create(wxWindow *parent, - const wxString& message, - const wxString& defaultDir, - const wxString& defaultFile, - const wxString& wildCard, - long style, - const wxPoint& WXUNUSED(pos), - const wxSize& WXUNUSED(sz), - const wxString& WXUNUSED(name)) -{ - m_message = message; - m_dir = defaultDir; - m_fileName = defaultFile; - m_wildCard = wildCard; - - m_parent = parent; - -#ifdef __WXOSX__ - /* - [DS] - Remove the (for OS X unnecessary) wxFD_FILE_MUST_EXIST flag. Using it - causes problems when having an extra panel (either a custom one or - by showing the filetype filters through calling - wxSystemOptions::SetOption(wxOSX_FILEDIALOG_ALWAYS_SHOW_TYPES, 1) ). - Presumably the style flag conflicts with other style flags and an - assert in wxRegion::DoOffset is triggered later on. - Another solution was to override GetWindowStyleFlag() to not include - wxFD_FILE_MUST_EXIST in its return value, but as other wxFileDialog - style flags (that are actually used) dont't seem to cause problems - this seemed an easier solution. - */ - style &= ~wxFD_FILE_MUST_EXIST; -#endif - - m_windowStyle = style; - m_filterIndex = 0; - - if (!HasFdFlag(wxFD_OPEN) && !HasFdFlag(wxFD_SAVE)) - m_windowStyle |= wxFD_OPEN; // wxFD_OPEN is the default - - // check that the styles are not contradictory - wxASSERT_MSG( !(HasFdFlag(wxFD_SAVE) && HasFdFlag(wxFD_OPEN)), - wxT("can't specify both wxFD_SAVE and wxFD_OPEN at once") ); - - wxASSERT_MSG( !HasFdFlag(wxFD_SAVE) || - (!HasFdFlag(wxFD_MULTIPLE) && !HasFdFlag(wxFD_FILE_MUST_EXIST)), - wxT("wxFD_MULTIPLE or wxFD_FILE_MUST_EXIST can't be used with wxFD_SAVE" ) ); - - wxASSERT_MSG( !HasFdFlag(wxFD_OPEN) || !HasFdFlag(wxFD_OVERWRITE_PROMPT), - wxT("wxFD_OVERWRITE_PROMPT can't be used with wxFD_OPEN") ); - - if ( wildCard.empty() || wildCard == wxFileSelectorDefaultWildcardStr ) - { - m_wildCard = wxString::Format(_("All files (%s)|%s"), - wxFileSelectorDefaultWildcardStr, - wxFileSelectorDefaultWildcardStr); - } - else // have wild card - { - // convert m_wildCard from "*.bar" to "bar files (*.bar)|*.bar" - if ( m_wildCard.Find(wxT('|')) == wxNOT_FOUND ) - { - wxString::size_type nDot = m_wildCard.find(wxT("*.")); - if ( nDot != wxString::npos ) - nDot++; - else - nDot = 0; - - m_wildCard = wxString::Format - ( - _("%s files (%s)|%s"), - wildCard.c_str() + nDot, - wildCard.c_str(), - wildCard.c_str() - ); - } - } - - return true; -} - -wxString wxFileDialogBase::AppendExtension(const wxString &filePath, - const wxString &extensionList) -{ - // strip off path, to avoid problems with "path.bar/foo" - wxString fileName = filePath.AfterLast(wxFILE_SEP_PATH); - - // if fileName is of form "foo.bar" it's ok, return it - int idx_dot = fileName.Find(wxT('.'), true); - if ((idx_dot != wxNOT_FOUND) && (idx_dot < (int)fileName.length() - 1)) - return filePath; - - // get the first extension from extensionList, or all of it - wxString ext = extensionList.BeforeFirst(wxT(';')); - - // if ext == "foo" or "foo." there's no extension - int idx_ext_dot = ext.Find(wxT('.'), true); - if ((idx_ext_dot == wxNOT_FOUND) || (idx_ext_dot == (int)ext.length() - 1)) - return filePath; - else - ext = ext.AfterLast(wxT('.')); - - // if ext == "*" or "bar*" or "b?r" or " " then its not valid - if ((ext.Find(wxT('*')) != wxNOT_FOUND) || - (ext.Find(wxT('?')) != wxNOT_FOUND) || - (ext.Strip(wxString::both).empty())) - return filePath; - - // if fileName doesn't have a '.' then add one - if (filePath.Last() != wxT('.')) - ext = wxT(".") + ext; - - return filePath + ext; -} - -bool wxFileDialogBase::SetExtraControlCreator(ExtraControlCreatorFunction creator) -{ - wxCHECK_MSG( !m_extraControlCreator, false, - "wxFileDialog::SetExtraControl() called second time" ); - - m_extraControlCreator = creator; - return SupportsExtraControl(); -} - -bool wxFileDialogBase::CreateExtraControl() -{ - if (!m_extraControlCreator || m_extraControl) - return false; - m_extraControl = (*m_extraControlCreator)(this); - return true; -} - -wxSize wxFileDialogBase::GetExtraControlSize() -{ - if ( !m_extraControlCreator ) - return wxDefaultSize; - - // create the extra control in an empty dialog just to find its size: this - // is not terribly efficient but we do need to know the size before - // creating the native dialog and this seems to be the only way - wxDialog dlg(NULL, wxID_ANY, ""); - return (*m_extraControlCreator)(&dlg)->GetSize(); -} - -void wxFileDialogBase::SetPath(const wxString& path) -{ - wxString ext; - wxFileName::SplitPath(path, &m_dir, &m_fileName, &ext); - if ( !ext.empty() ) - { - SetFilterIndexFromExt(ext); - - m_fileName << wxT('.') << ext; - } - - m_path = path; -} - -void wxFileDialogBase::SetDirectory(const wxString& dir) -{ - m_dir = dir; - m_path = wxFileName(m_dir, m_fileName).GetFullPath(); -} - -void wxFileDialogBase::SetFilename(const wxString& name) -{ - m_fileName = name; - m_path = wxFileName(m_dir, m_fileName).GetFullPath(); -} - -void wxFileDialogBase::SetFilterIndexFromExt(const wxString& ext) -{ - // if filter is of form "All files (*)|*|..." set correct filter index - if ( !ext.empty() && m_wildCard.find(wxT('|')) != wxString::npos ) - { - int filterIndex = -1; - - wxArrayString descriptions, filters; - // don't care about errors, handled already by wxFileDialog - (void)wxParseCommonDialogsFilter(m_wildCard, descriptions, filters); - for (size_t n=0; n= 0) - SetFilterIndex(filterIndex); - } -} - -//---------------------------------------------------------------------------- -// wxFileDialog convenience functions -//---------------------------------------------------------------------------- - -wxString wxFileSelector(const wxString& title, - const wxString& defaultDir, - const wxString& defaultFileName, - const wxString& defaultExtension, - const wxString& filter, - int flags, - wxWindow *parent, - int x, int y) -{ - // The defaultExtension, if non-empty, is - // appended to the filename if the user fails to type an extension. The new - // implementation (taken from wxFileSelectorEx) appends the extension - // automatically, by looking at the filter specification. In fact this - // should be better than the native Microsoft implementation because - // Windows only allows *one* default extension, whereas here we do the - // right thing depending on the filter the user has chosen. - - // If there's a default extension specified but no filter, we create a - // suitable filter. - - wxString filter2; - if ( !defaultExtension.empty() && filter.empty() ) - filter2 = wxString(wxT("*.")) + defaultExtension; - else if ( !filter.empty() ) - filter2 = filter; - - wxFileDialog fileDialog(parent, title, defaultDir, - defaultFileName, filter2, - flags, wxPoint(x, y)); - - fileDialog.SetFilterIndexFromExt(defaultExtension); - - wxString filename; - if ( fileDialog.ShowModal() == wxID_OK ) - { - filename = fileDialog.GetPath(); - } - - return filename; -} - -//---------------------------------------------------------------------------- -// wxFileSelectorEx -//---------------------------------------------------------------------------- - -wxString wxFileSelectorEx(const wxString& title, - const wxString& defaultDir, - const wxString& defaultFileName, - int* defaultFilterIndex, - const wxString& filter, - int flags, - wxWindow* parent, - int x, - int y) - -{ - wxFileDialog fileDialog(parent, - title, - defaultDir, - defaultFileName, - filter, - flags, wxPoint(x, y)); - - wxString filename; - if ( fileDialog.ShowModal() == wxID_OK ) - { - if ( defaultFilterIndex ) - *defaultFilterIndex = fileDialog.GetFilterIndex(); - - filename = fileDialog.GetPath(); - } - - return filename; -} - -//---------------------------------------------------------------------------- -// wxDefaultFileSelector - Generic load/save dialog (for internal use only) -//---------------------------------------------------------------------------- - -static wxString wxDefaultFileSelector(bool load, - const wxString& what, - const wxString& extension, - const wxString& default_name, - wxWindow *parent) -{ - wxString prompt; - wxString str; - if (load) - str = _("Load %s file"); - else - str = _("Save %s file"); - prompt.Printf(str, what); - - wxString wild; - wxString ext; - if ( !extension.empty() ) - { - if ( extension[0u] == wxT('.') ) - ext = extension.substr(1); - else - ext = extension; - - wild.Printf(wxT("*.%s"), ext); - } - else // no extension specified - { - wild = wxFileSelectorDefaultWildcardStr; - } - - return wxFileSelector(prompt, wxEmptyString, default_name, ext, wild, - load ? (wxFD_OPEN | wxFD_FILE_MUST_EXIST) : wxFD_SAVE, - parent); -} - -//---------------------------------------------------------------------------- -// wxLoadFileSelector -//---------------------------------------------------------------------------- - -WXDLLEXPORT wxString wxLoadFileSelector(const wxString& what, - const wxString& extension, - const wxString& default_name, - wxWindow *parent) -{ - return wxDefaultFileSelector(true, what, extension, default_name, parent); -} - -//---------------------------------------------------------------------------- -// wxSaveFileSelector -//---------------------------------------------------------------------------- - -WXDLLEXPORT wxString wxSaveFileSelector(const wxString& what, - const wxString& extension, - const wxString& default_name, - wxWindow *parent) -{ - return wxDefaultFileSelector(false, what, extension, default_name, parent); -} - - -//---------------------------------------------------------------------------- -// wxDirDialogBase -//---------------------------------------------------------------------------- - -#endif // wxUSE_FILEDLG diff --git a/Externals/wxWidgets3/src/common/fmapbase.cpp b/Externals/wxWidgets3/src/common/fmapbase.cpp deleted file mode 100644 index 9bef0110dc..0000000000 --- a/Externals/wxWidgets3/src/common/fmapbase.cpp +++ /dev/null @@ -1,872 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/fmapbase.cpp -// Purpose: wxFontMapperBase class implementation -// Author: Vadim Zeitlin -// Modified by: -// Created: 21.06.2003 (extracted from common/fontmap.cpp) -// Copyright: (c) 1999-2003 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// for compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_FONTMAP - -#ifndef WX_PRECOMP - #include "wx/app.h" - #include "wx/log.h" - #include "wx/intl.h" - #include "wx/module.h" - #include "wx/wxcrtvararg.h" -#endif //WX_PRECOMP - -#if defined(__WINDOWS__) - #include "wx/msw/private.h" // includes windows.h for LOGFONT - #include "wx/msw/winundef.h" -#endif - -#include "wx/fontmap.h" -#include "wx/fmappriv.h" - -#include "wx/apptrait.h" - -// wxMemoryConfig uses wxFileConfig -#if wxUSE_CONFIG && wxUSE_FILECONFIG - #include "wx/config.h" - #include "wx/memconf.h" -#endif - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -// encodings supported by GetEncodingDescription -static const wxFontEncoding gs_encodings[] = -{ - wxFONTENCODING_ISO8859_1, - wxFONTENCODING_ISO8859_2, - wxFONTENCODING_ISO8859_3, - wxFONTENCODING_ISO8859_4, - wxFONTENCODING_ISO8859_5, - wxFONTENCODING_ISO8859_6, - wxFONTENCODING_ISO8859_7, - wxFONTENCODING_ISO8859_8, - wxFONTENCODING_ISO8859_9, - wxFONTENCODING_ISO8859_10, - wxFONTENCODING_ISO8859_11, - wxFONTENCODING_ISO8859_12, - wxFONTENCODING_ISO8859_13, - wxFONTENCODING_ISO8859_14, - wxFONTENCODING_ISO8859_15, - wxFONTENCODING_KOI8, - wxFONTENCODING_KOI8_U, - wxFONTENCODING_CP866, - wxFONTENCODING_CP874, - wxFONTENCODING_CP932, - wxFONTENCODING_CP936, - wxFONTENCODING_CP949, - wxFONTENCODING_CP950, - wxFONTENCODING_CP1250, - wxFONTENCODING_CP1251, - wxFONTENCODING_CP1252, - wxFONTENCODING_CP1253, - wxFONTENCODING_CP1254, - wxFONTENCODING_CP1255, - wxFONTENCODING_CP1256, - wxFONTENCODING_CP1257, - wxFONTENCODING_CP1258, - wxFONTENCODING_CP1361, - wxFONTENCODING_CP437, - wxFONTENCODING_UTF7, - wxFONTENCODING_UTF8, - wxFONTENCODING_UTF16BE, - wxFONTENCODING_UTF16LE, - wxFONTENCODING_UTF32BE, - wxFONTENCODING_UTF32LE, - wxFONTENCODING_EUC_JP, - wxFONTENCODING_DEFAULT, - wxFONTENCODING_ISO2022_JP, - - wxFONTENCODING_MACROMAN, - wxFONTENCODING_MACJAPANESE, - wxFONTENCODING_MACCHINESETRAD, - wxFONTENCODING_MACKOREAN, - wxFONTENCODING_MACARABIC, - wxFONTENCODING_MACHEBREW, - wxFONTENCODING_MACGREEK, - wxFONTENCODING_MACCYRILLIC, - wxFONTENCODING_MACDEVANAGARI, - wxFONTENCODING_MACGURMUKHI, - wxFONTENCODING_MACGUJARATI, - wxFONTENCODING_MACORIYA, - wxFONTENCODING_MACBENGALI, - wxFONTENCODING_MACTAMIL, - wxFONTENCODING_MACTELUGU, - wxFONTENCODING_MACKANNADA, - wxFONTENCODING_MACMALAJALAM, - wxFONTENCODING_MACSINHALESE, - wxFONTENCODING_MACBURMESE, - wxFONTENCODING_MACKHMER, - wxFONTENCODING_MACTHAI, - wxFONTENCODING_MACLAOTIAN, - wxFONTENCODING_MACGEORGIAN, - wxFONTENCODING_MACARMENIAN, - wxFONTENCODING_MACCHINESESIMP, - wxFONTENCODING_MACTIBETAN, - wxFONTENCODING_MACMONGOLIAN, - wxFONTENCODING_MACETHIOPIC, - wxFONTENCODING_MACCENTRALEUR, - wxFONTENCODING_MACVIATNAMESE, - wxFONTENCODING_MACARABICEXT, - wxFONTENCODING_MACSYMBOL, - wxFONTENCODING_MACDINGBATS, - wxFONTENCODING_MACTURKISH, - wxFONTENCODING_MACCROATIAN, - wxFONTENCODING_MACICELANDIC, - wxFONTENCODING_MACROMANIAN, - wxFONTENCODING_MACCELTIC, - wxFONTENCODING_MACGAELIC, - wxFONTENCODING_MACKEYBOARD -}; - -// the descriptions for them -static const char* const gs_encodingDescs[] = -{ - wxTRANSLATE( "Western European (ISO-8859-1)" ), - wxTRANSLATE( "Central European (ISO-8859-2)" ), - wxTRANSLATE( "Esperanto (ISO-8859-3)" ), - wxTRANSLATE( "Baltic (old) (ISO-8859-4)" ), - wxTRANSLATE( "Cyrillic (ISO-8859-5)" ), - wxTRANSLATE( "Arabic (ISO-8859-6)" ), - wxTRANSLATE( "Greek (ISO-8859-7)" ), - wxTRANSLATE( "Hebrew (ISO-8859-8)" ), - wxTRANSLATE( "Turkish (ISO-8859-9)" ), - wxTRANSLATE( "Nordic (ISO-8859-10)" ), - wxTRANSLATE( "Thai (ISO-8859-11)" ), - wxTRANSLATE( "Indian (ISO-8859-12)" ), - wxTRANSLATE( "Baltic (ISO-8859-13)" ), - wxTRANSLATE( "Celtic (ISO-8859-14)" ), - wxTRANSLATE( "Western European with Euro (ISO-8859-15)" ), - wxTRANSLATE( "KOI8-R" ), - wxTRANSLATE( "KOI8-U" ), - wxTRANSLATE( "Windows/DOS OEM Cyrillic (CP 866)" ), - wxTRANSLATE( "Windows Thai (CP 874)" ), - wxTRANSLATE( "Windows Japanese (CP 932) or Shift-JIS" ), - wxTRANSLATE( "Windows Chinese Simplified (CP 936) or GB-2312" ), - wxTRANSLATE( "Windows Korean (CP 949)" ), - wxTRANSLATE( "Windows Chinese Traditional (CP 950) or Big-5" ), - wxTRANSLATE( "Windows Central European (CP 1250)" ), - wxTRANSLATE( "Windows Cyrillic (CP 1251)" ), - wxTRANSLATE( "Windows Western European (CP 1252)" ), - wxTRANSLATE( "Windows Greek (CP 1253)" ), - wxTRANSLATE( "Windows Turkish (CP 1254)" ), - wxTRANSLATE( "Windows Hebrew (CP 1255)" ), - wxTRANSLATE( "Windows Arabic (CP 1256)" ), - wxTRANSLATE( "Windows Baltic (CP 1257)" ), - wxTRANSLATE( "Windows Vietnamese (CP 1258)" ), - wxTRANSLATE( "Windows Johab (CP 1361)" ), - wxTRANSLATE( "Windows/DOS OEM (CP 437)" ), - wxTRANSLATE( "Unicode 7 bit (UTF-7)" ), - wxTRANSLATE( "Unicode 8 bit (UTF-8)" ), -#ifdef WORDS_BIGENDIAN - wxTRANSLATE( "Unicode 16 bit (UTF-16)" ), - wxTRANSLATE( "Unicode 16 bit Little Endian (UTF-16LE)" ), - wxTRANSLATE( "Unicode 32 bit (UTF-32)" ), - wxTRANSLATE( "Unicode 32 bit Little Endian (UTF-32LE)" ), -#else // WORDS_BIGENDIAN - wxTRANSLATE( "Unicode 16 bit Big Endian (UTF-16BE)" ), - wxTRANSLATE( "Unicode 16 bit (UTF-16)" ), - wxTRANSLATE( "Unicode 32 bit Big Endian (UTF-32BE)" ), - wxTRANSLATE( "Unicode 32 bit (UTF-32)" ), -#endif // WORDS_BIGENDIAN - wxTRANSLATE( "Extended Unix Codepage for Japanese (EUC-JP)" ), - wxTRANSLATE( "US-ASCII" ), - wxTRANSLATE( "ISO-2022-JP" ), - - wxTRANSLATE( "MacRoman" ), - wxTRANSLATE( "MacJapanese" ), - wxTRANSLATE( "MacChineseTrad" ), - wxTRANSLATE( "MacKorean" ), - wxTRANSLATE( "MacArabic" ), - wxTRANSLATE( "MacHebrew" ), - wxTRANSLATE( "MacGreek" ), - wxTRANSLATE( "MacCyrillic" ), - wxTRANSLATE( "MacDevanagari" ), - wxTRANSLATE( "MacGurmukhi" ), - wxTRANSLATE( "MacGujarati" ), - wxTRANSLATE( "MacOriya" ), - wxTRANSLATE( "MacBengali" ), - wxTRANSLATE( "MacTamil" ), - wxTRANSLATE( "MacTelugu" ), - wxTRANSLATE( "MacKannada" ), - wxTRANSLATE( "MacMalayalam" ), - wxTRANSLATE( "MacSinhalese" ), - wxTRANSLATE( "MacBurmese" ), - wxTRANSLATE( "MacKhmer" ), - wxTRANSLATE( "MacThai" ), - wxTRANSLATE( "MacLaotian" ), - wxTRANSLATE( "MacGeorgian" ), - wxTRANSLATE( "MacArmenian" ), - wxTRANSLATE( "MacChineseSimp" ), - wxTRANSLATE( "MacTibetan" ), - wxTRANSLATE( "MacMongolian" ), - wxTRANSLATE( "MacEthiopic" ), - wxTRANSLATE( "MacCentralEurRoman" ), - wxTRANSLATE( "MacVietnamese" ), - wxTRANSLATE( "MacExtArabic" ), - wxTRANSLATE( "MacSymbol" ), - wxTRANSLATE( "MacDingbats" ), - wxTRANSLATE( "MacTurkish" ), - wxTRANSLATE( "MacCroatian" ), - wxTRANSLATE( "MacIcelandic" ), - wxTRANSLATE( "MacRomanian" ), - wxTRANSLATE( "MacCeltic" ), - wxTRANSLATE( "MacGaelic" ), - wxTRANSLATE( "MacKeyboardGlyphs" ) -}; - -// and the internal names (these are not translated on purpose!) -static const wxChar* const gs_encodingNames[][9] = -{ - // names from the columns correspond to these OS: - // Linux Solaris and IRIX HP-UX AIX - { wxT("ISO-8859-1"), wxT("ISO8859-1"), wxT("iso88591"), wxT("8859-1"), wxT("iso_8859_1"), NULL }, - { wxT("ISO-8859-2"), wxT("ISO8859-2"), wxT("iso88592"), wxT("8859-2"), NULL }, - { wxT("ISO-8859-3"), wxT("ISO8859-3"), wxT("iso88593"), wxT("8859-3"), NULL }, - { wxT("ISO-8859-4"), wxT("ISO8859-4"), wxT("iso88594"), wxT("8859-4"), NULL }, - { wxT("ISO-8859-5"), wxT("ISO8859-5"), wxT("iso88595"), wxT("8859-5"), NULL }, - { wxT("ISO-8859-6"), wxT("ISO8859-6"), wxT("iso88596"), wxT("8859-6"), NULL }, - { wxT("ISO-8859-7"), wxT("ISO8859-7"), wxT("iso88597"), wxT("8859-7"), NULL }, - { wxT("ISO-8859-8"), wxT("ISO8859-8"), wxT("iso88598"), wxT("8859-8"), NULL }, - { wxT("ISO-8859-9"), wxT("ISO8859-9"), wxT("iso88599"), wxT("8859-9"), NULL }, - { wxT("ISO-8859-10"), wxT("ISO8859-10"), wxT("iso885910"), wxT("8859-10"), NULL }, - { wxT("ISO-8859-11"), wxT("ISO8859-11"), wxT("iso885911"), wxT("8859-11"), NULL }, - { wxT("ISO-8859-12"), wxT("ISO8859-12"), wxT("iso885912"), wxT("8859-12"), NULL }, - { wxT("ISO-8859-13"), wxT("ISO8859-13"), wxT("iso885913"), wxT("8859-13"), NULL }, - { wxT("ISO-8859-14"), wxT("ISO8859-14"), wxT("iso885914"), wxT("8859-14"), NULL }, - { wxT("ISO-8859-15"), wxT("ISO8859-15"), wxT("iso885915"), wxT("8859-15"), NULL }, - - // although koi8-ru is not strictly speaking the same as koi8-r, - // they are similar enough to make mapping it to koi8 better than - // not recognizing it at all - { wxT( "KOI8-R" ), wxT( "KOI8-RU" ), NULL }, - { wxT( "KOI8-U" ), NULL }, - - { wxT( "WINDOWS-866" ), wxT( "CP866" ), NULL }, - - { wxT( "WINDOWS-874" ), wxT( "CP874" ), wxT( "MS874" ), wxT( "IBM-874" ), NULL }, - { wxT( "WINDOWS-932" ), wxT( "CP932" ), wxT( "MS932" ), wxT( "IBM-932" ), wxT( "SJIS" ), wxT( "SHIFT-JIS" ), wxT( "SHIFT_JIS" ), NULL }, - { wxT( "WINDOWS-936" ), wxT( "CP936" ), wxT( "MS936" ), wxT( "IBM-936" ), wxT( "GB2312" ), wxT( "gbk" ),wxT( "GBK" ), NULL }, - { wxT( "WINDOWS-949" ), wxT( "CP949" ), wxT( "MS949" ), wxT( "IBM-949" ), wxT( "EUC-KR" ), wxT( "eucKR" ), wxT( "euc_kr" ), NULL }, - { wxT( "WINDOWS-950" ), wxT( "CP950" ), wxT( "MS950" ), wxT( "IBM-950" ), wxT( "BIG5" ), wxT( "BIG-5" ), wxT( "BIG-FIVE" ), NULL }, - { wxT( "WINDOWS-1250" ),wxT( "CP1250" ),wxT( "MS1250" ),wxT( "IBM-1250" ),NULL }, - { wxT( "WINDOWS-1251" ),wxT( "CP1251" ),wxT( "MS1251" ),wxT( "IBM-1251" ),NULL }, - { wxT( "WINDOWS-1252" ),wxT( "CP1252" ),wxT( "MS1252" ),wxT( "IBM-1252" ),NULL }, - { wxT( "WINDOWS-1253" ),wxT( "CP1253" ),wxT( "MS1253" ),wxT( "IBM-1253" ),NULL }, - { wxT( "WINDOWS-1254" ),wxT( "CP1254" ),wxT( "MS1254" ),wxT( "IBM-1254" ),NULL }, - { wxT( "WINDOWS-1255" ),wxT( "CP1255" ),wxT( "MS1255" ),wxT( "IBM-1255" ),NULL }, - { wxT( "WINDOWS-1256" ),wxT( "CP1256" ),wxT( "MS1256" ),wxT( "IBM-1256" ),NULL }, - { wxT( "WINDOWS-1257" ),wxT( "CP1257" ),wxT( "MS1257" ),wxT( "IBM-1257" ),NULL }, - { wxT( "WINDOWS-1258" ),wxT( "CP1258" ),wxT( "MS1258" ),wxT( "IBM-1258" ),NULL }, - { wxT( "WINDOWS-1361" ),wxT( "CP1361" ),wxT( "MS1361" ),wxT( "IBM-1361" ), wxT( "JOHAB" ), NULL }, - { wxT( "WINDOWS-437" ), wxT( "CP437" ), wxT( "MS437" ), wxT( "IBM-437" ), NULL }, - - { wxT( "UTF-7" ), wxT("UTF7"), NULL }, - { wxT( "UTF-8" ), wxT("UTF8"), NULL }, -#ifdef WORDS_BIGENDIAN - { wxT( "UTF-16BE" ), wxT("UTF16BE"), wxT("UCS-2BE"), wxT("UCS2BE"), wxT("UTF-16"), wxT("UTF16"), wxT("UCS-2"), wxT("UCS2"), NULL }, - { wxT( "UTF-16LE" ), wxT("UTF16LE"), wxT("UCS-2LE"), wxT("UCS2LE"), NULL }, - { wxT( "UTF-32BE" ), wxT("UTF32BE"), wxT("UCS-4BE" ), wxT("UTF-32"), wxT("UTF32"), wxT("UCS-4"), wxT("UCS4"), NULL }, - { wxT( "UTF-32LE" ), wxT("UTF32LE"), wxT("UCS-4LE"), wxT("UCS4LE"), NULL }, -#else // WORDS_BIGENDIAN - { wxT("UTF-16BE"), wxT("UTF16BE"), wxT("UCS-2BE"), wxT("UCS2BE"), NULL }, - { wxT("UTF-16LE"), wxT("UTF16LE"), wxT("UCS-2LE"), wxT("UTF-16"), wxT("UTF16"), wxT("UCS-2"), wxT("UCS2"), NULL }, - { wxT("UTF-32BE"), wxT("UTF32BE"), wxT("UCS-4BE"), wxT("UCS4BE"), NULL }, - { wxT("UTF-32LE"), wxT("UTF32LE"), wxT("UCS-4LE"), wxT("UCS4LE"), wxT("UTF-32"), wxT("UTF32"), wxT("UCS-4"), wxT("UCS4"), NULL }, -#endif // WORDS_BIGENDIAN - - { wxT( "EUC-JP" ), wxT( "eucJP" ), wxT( "euc_jp" ), wxT( "IBM-eucJP" ), NULL }, - - // 646 is for Solaris, roman8 -- for HP-UX - { wxT( "US-ASCII" ), wxT( "ASCII" ), wxT("C"), wxT("POSIX"), wxT("ANSI_X3.4-1968"), - wxT("646"), wxT("roman8"), wxT( "" ), NULL }, - - { wxT( "ISO-2022-JP" ), NULL }, - - - { wxT( "MacRoman" ), NULL }, - { wxT( "MacJapanese" ), NULL }, - { wxT( "MacChineseTrad" ), NULL }, - { wxT( "MacKorean" ), NULL }, - { wxT( "MacArabic" ), NULL }, - { wxT( "MacHebrew" ), NULL }, - { wxT( "MacGreek" ), NULL }, - { wxT( "MacCyrillic" ), NULL }, - { wxT( "MacDevanagari" ), NULL }, - { wxT( "MacGurmukhi" ), NULL }, - { wxT( "MacGujarati" ), NULL }, - { wxT( "MacOriya" ), NULL }, - { wxT( "MacBengali" ), NULL }, - { wxT( "MacTamil" ), NULL }, - { wxT( "MacTelugu" ), NULL }, - { wxT( "MacKannada" ), NULL }, - { wxT( "MacMalayalam" ), NULL }, - { wxT( "MacSinhalese" ), NULL }, - { wxT( "MacBurmese" ), NULL }, - { wxT( "MacKhmer" ), NULL }, - { wxT( "MacThai" ), NULL }, - { wxT( "MacLaotian" ), NULL }, - { wxT( "MacGeorgian" ), NULL }, - { wxT( "MacArmenian" ), NULL }, - { wxT( "MacChineseSimp" ), NULL }, - { wxT( "MacTibetan" ), NULL }, - { wxT( "MacMongolian" ), NULL }, - { wxT( "MacEthiopic" ), NULL }, - { wxT( "MacCentralEurRoman" ), NULL }, - { wxT( "MacVietnamese" ), NULL }, - { wxT( "MacExtArabic" ), NULL }, - { wxT( "MacSymbol" ), NULL }, - { wxT( "MacDingbats" ), NULL }, - { wxT( "MacTurkish" ), NULL }, - { wxT( "MacCroatian" ), NULL }, - { wxT( "MacIcelandic" ), NULL }, - { wxT( "MacRomanian" ), NULL }, - { wxT( "MacCeltic" ), NULL }, - { wxT( "MacGaelic" ), NULL }, - { wxT( "MacKeyboardGlyphs" ), NULL } -}; - -wxCOMPILE_TIME_ASSERT( WXSIZEOF(gs_encodingDescs) == WXSIZEOF(gs_encodings), EncodingsArraysNotInSync ); -wxCOMPILE_TIME_ASSERT( WXSIZEOF(gs_encodingNames) == WXSIZEOF(gs_encodings), EncodingsArraysNotInSync ); - -// ---------------------------------------------------------------------------- -// private classes -// ---------------------------------------------------------------------------- - -// clean up the font mapper object -class wxFontMapperModule : public wxModule -{ -public: - wxFontMapperModule() : wxModule() { } - - virtual bool OnInit() wxOVERRIDE - { - // a dummy wxFontMapperBase object could have been created during the - // program startup before wxApp was created, we have to delete it to - // allow creating the real font mapper next time it is needed now that - // we can create it (when the modules are initialized, wxApp object - // already exists) - wxFontMapperBase *fm = wxFontMapperBase::Get(); - if ( fm && fm->IsDummy() ) - wxFontMapperBase::Reset(); - - return true; - } - - virtual void OnExit() wxOVERRIDE - { - wxFontMapperBase::Reset(); - } - - wxDECLARE_DYNAMIC_CLASS(wxFontMapperModule); -}; - -wxIMPLEMENT_DYNAMIC_CLASS(wxFontMapperModule, wxModule); - - -// ============================================================================ -// wxFontMapperBase implementation -// ============================================================================ - -wxFontMapper *wxFontMapperBase::sm_instance = NULL; - -// ---------------------------------------------------------------------------- -// ctor and dtor -// ---------------------------------------------------------------------------- - -wxFontMapperBase::wxFontMapperBase() -{ -#if wxUSE_CONFIG && wxUSE_FILECONFIG - m_configDummy = NULL; -#endif // wxUSE_CONFIG -} - -wxFontMapperBase::~wxFontMapperBase() -{ -#if wxUSE_CONFIG && wxUSE_FILECONFIG - if ( m_configDummy ) - delete m_configDummy; -#endif // wxUSE_CONFIG -} - -/* static */ -wxFontMapperBase *wxFontMapperBase::Get() -{ - if ( !sm_instance ) - { - wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits() : NULL; - if ( traits ) - { - sm_instance = traits->CreateFontMapper(); - - wxASSERT_MSG( sm_instance, - wxT("wxAppTraits::CreateFontMapper() failed") ); - } - - if ( !sm_instance ) - { - // last resort: we must create something because the existing code - // relies on always having a valid font mapper object - sm_instance = (wxFontMapper *)new wxFontMapperBase; - } - } - - return (wxFontMapperBase*)sm_instance; -} - -/* static */ -wxFontMapper *wxFontMapperBase::Set(wxFontMapper *mapper) -{ - wxFontMapper *old = sm_instance; - sm_instance = mapper; - return old; -} - -/* static */ -void wxFontMapperBase::Reset() -{ - if ( sm_instance ) - { - // we need a cast as wxFontMapper is not fully declared here and so the - // compiler can't know that it derives from wxFontMapperBase (but - // run-time behaviour will be correct because the dtor is virtual) - delete (wxFontMapperBase *)sm_instance; - sm_instance = NULL; - } -} - -#if wxUSE_CONFIG && wxUSE_FILECONFIG - -// ---------------------------------------------------------------------------- -// config usage customisation -// ---------------------------------------------------------------------------- - - -static wxString gs_defaultConfigPath(FONTMAPPER_ROOT_PATH); - -/* static */ -const wxString& wxFontMapperBase::GetDefaultConfigPath() -{ - // NB: we return const wxString& and not wxString for compatibility - // with 2.8 that returned const wxChar* - return gs_defaultConfigPath; -} - -void wxFontMapperBase::SetConfigPath(const wxString& prefix) -{ - wxCHECK_RET( !prefix.empty() && prefix[0] == wxCONFIG_PATH_SEPARATOR, - wxT("an absolute path should be given to wxFontMapper::SetConfigPath()") ); - - m_configRootPath = prefix; -} - -// ---------------------------------------------------------------------------- -// get config object and path for it -// ---------------------------------------------------------------------------- - -wxConfigBase *wxFontMapperBase::GetConfig() -{ - wxConfigBase *config = wxConfig::Get(false); - - // If there is no global configuration, use an internal memory configuration - if ( !config ) - { - if ( !m_configDummy ) - m_configDummy = new wxMemoryConfig; - config = m_configDummy; - - // FIXME: ideally, we should add keys from dummy config to a real one later, - // but it is a low-priority task because typical wxWin application - // either doesn't use wxConfig at all or creates wxConfig object in - // wxApp::OnInit(), before any real interaction with the user takes - // place... - } - - return config; -} - -const wxString& wxFontMapperBase::GetConfigPath() -{ - if ( !m_configRootPath ) - { - // use the default - m_configRootPath = GetDefaultConfigPath(); - } - - return m_configRootPath; -} - -// ---------------------------------------------------------------------------- -// config helpers -// ---------------------------------------------------------------------------- - -bool wxFontMapperBase::ChangePath(const wxString& pathNew, wxString *pathOld) -{ - wxConfigBase *config = GetConfig(); - if ( !config ) - return false; - - *pathOld = config->GetPath(); - - wxString path = GetConfigPath(); - if ( path.empty() || path.Last() != wxCONFIG_PATH_SEPARATOR ) - { - path += wxCONFIG_PATH_SEPARATOR; - } - - wxASSERT_MSG( !pathNew || (pathNew[0] != wxCONFIG_PATH_SEPARATOR), - wxT("should be a relative path") ); - - path += pathNew; - - config->SetPath(path); - - return true; -} - -void wxFontMapperBase::RestorePath(const wxString& pathOld) -{ - GetConfig()->SetPath(pathOld); -} - -#endif - -// ---------------------------------------------------------------------------- -// charset/encoding correspondence -// ---------------------------------------------------------------------------- - -wxFontEncoding -wxFontMapperBase::CharsetToEncoding(const wxString& charset, - bool WXUNUSED(interactive)) -{ - int enc = NonInteractiveCharsetToEncoding(charset); - if ( enc == wxFONTENCODING_UNKNOWN ) - { - // we should return wxFONTENCODING_SYSTEM from here for unknown - // encodings - enc = wxFONTENCODING_SYSTEM; - } - - return (wxFontEncoding)enc; -} - -int -wxFontMapperBase::NonInteractiveCharsetToEncoding(const wxString& charset) -{ - wxFontEncoding encoding = wxFONTENCODING_SYSTEM; - - // we're going to modify it, make a copy - wxString cs = charset; - -#if wxUSE_CONFIG && wxUSE_FILECONFIG - // first try the user-defined settings - wxFontMapperPathChanger path(this, FONTMAPPER_CHARSET_PATH); - if ( path.IsOk() ) - { - wxConfigBase *config = GetConfig(); - - // do we have an encoding for this charset? - long value = config->Read(charset, -1l); - if ( value != -1 ) - { - if ( value == wxFONTENCODING_UNKNOWN ) - { - // don't try to find it, in particular don't ask the user - return value; - } - - if ( value >= 0 && value <= wxFONTENCODING_MAX ) - { - encoding = (wxFontEncoding)value; - } - else - { - wxLogDebug(wxT("corrupted config data: invalid encoding %ld for charset '%s' ignored"), - value, charset.c_str()); - } - } - - if ( encoding == wxFONTENCODING_SYSTEM ) - { - // may be we have an alias? - config->SetPath(FONTMAPPER_CHARSET_ALIAS_PATH); - - wxString alias = config->Read(charset); - if ( !alias.empty() ) - { - // yes, we do - use it instead - cs = alias; - } - } - } -#endif // wxUSE_CONFIG - - // if didn't find it there, try to recognize it ourselves - if ( encoding == wxFONTENCODING_SYSTEM ) - { - // trim any spaces - cs.Trim(true); - cs.Trim(false); - - // discard the optional quotes - if ( !cs.empty() ) - { - if ( cs[0u] == wxT('"') && cs.Last() == wxT('"') ) - { - cs = wxString(cs.c_str(), cs.length() - 1); - } - } - - for ( size_t i = 0; i < WXSIZEOF(gs_encodingNames); ++i ) - { - for ( const wxChar* const* encName = gs_encodingNames[i]; *encName; ++encName ) - { - if ( cs.CmpNoCase(*encName) == 0 ) - return gs_encodings[i]; - } - } - - cs.MakeUpper(); - - if ( cs.Left(3) == wxT("ISO") ) - { - // the dash is optional (or, to be exact, it is not, but - // several broken programs "forget" it) - const wxChar *p = cs.c_str() + 3; - if ( *p == wxT('-') ) - p++; - - unsigned int value; - if ( wxSscanf(p, wxT("8859-%u"), &value) == 1 ) - { - // make it 0 based and check that it is strictly positive in - // the process (no such thing as iso8859-0 encoding) - if ( (value-- > 0) && - (value < wxFONTENCODING_ISO8859_MAX - - wxFONTENCODING_ISO8859_1) ) - { - // it's a valid ISO8859 encoding - value += wxFONTENCODING_ISO8859_1; - encoding = (wxFontEncoding)value; - } - } - } - else if ( cs.Left(4) == wxT("8859") ) - { - const wxChar *p = cs.c_str(); - - unsigned int value; - if ( wxSscanf(p, wxT("8859-%u"), &value) == 1 ) - { - // make it 0 based and check that it is strictly positive in - // the process (no such thing as iso8859-0 encoding) - if ( (value-- > 0) && - (value < wxFONTENCODING_ISO8859_MAX - - wxFONTENCODING_ISO8859_1) ) - { - // it's a valid ISO8859 encoding - value += wxFONTENCODING_ISO8859_1; - encoding = (wxFontEncoding)value; - } - } - } - else // check for Windows charsets - { - size_t len; - if ( cs.Left(7) == wxT("WINDOWS") ) - { - len = 7; - } - else if ( cs.Left(2) == wxT("CP") ) - { - len = 2; - } - else // not a Windows encoding - { - len = 0; - } - - if ( len ) - { - const wxChar *p = cs.c_str() + len; - if ( *p == wxT('-') ) - p++; - - unsigned int value; - if ( wxSscanf(p, wxT("%u"), &value) == 1 ) - { - if ( value >= 1250 ) - { - value -= 1250; - if ( value < wxFONTENCODING_CP12_MAX - - wxFONTENCODING_CP1250 ) - { - // a valid Windows code page - value += wxFONTENCODING_CP1250; - encoding = (wxFontEncoding)value; - } - } - - switch ( value ) - { - case 866: - encoding = wxFONTENCODING_CP866; - break; - - case 874: - encoding = wxFONTENCODING_CP874; - break; - - case 932: - encoding = wxFONTENCODING_CP932; - break; - - case 936: - encoding = wxFONTENCODING_CP936; - break; - - case 949: - encoding = wxFONTENCODING_CP949; - break; - - case 950: - encoding = wxFONTENCODING_CP950; - break; - - case 1258: - encoding = wxFONTENCODING_CP1258; - break; - - case 1361: - encoding = wxFONTENCODING_CP1361; - break; - } - } - } - } - //else: unknown - } - - return encoding; -} - -/* static */ -size_t wxFontMapperBase::GetSupportedEncodingsCount() -{ - return WXSIZEOF(gs_encodings); -} - -/* static */ -wxFontEncoding wxFontMapperBase::GetEncoding(size_t n) -{ - wxCHECK_MSG( n < WXSIZEOF(gs_encodings), wxFONTENCODING_SYSTEM, - wxT("wxFontMapper::GetEncoding(): invalid index") ); - - return gs_encodings[n]; -} - -/* static */ -wxString wxFontMapperBase::GetEncodingDescription(wxFontEncoding encoding) -{ - if ( encoding == wxFONTENCODING_DEFAULT ) - { - return _("Default encoding"); - } - - const size_t count = WXSIZEOF(gs_encodingDescs); - - for ( size_t i = 0; i < count; i++ ) - { - if ( gs_encodings[i] == encoding ) - { - return wxGetTranslation(gs_encodingDescs[i]); - } - } - - wxString str; - str.Printf(_("Unknown encoding (%d)"), encoding); - - return str; -} - -/* static */ -wxString wxFontMapperBase::GetEncodingName(wxFontEncoding encoding) -{ - if ( encoding == wxFONTENCODING_DEFAULT ) - { - return _("default"); - } - - const size_t count = WXSIZEOF(gs_encodingNames); - - for ( size_t i = 0; i < count; i++ ) - { - if ( gs_encodings[i] == encoding ) - { - return gs_encodingNames[i][0]; - } - } - - wxString str; - str.Printf(_("unknown-%d"), encoding); - - return str; -} - -/* static */ -const wxChar** wxFontMapperBase::GetAllEncodingNames(wxFontEncoding encoding) -{ - static const wxChar* const dummy[] = { NULL }; - - for ( size_t i = 0; i < WXSIZEOF(gs_encodingNames); i++ ) - { - if ( gs_encodings[i] == encoding ) - { - return const_cast(gs_encodingNames[i]); - } - } - - return const_cast(dummy); -} - -/* static */ -wxFontEncoding wxFontMapperBase::GetEncodingFromName(const wxString& name) -{ - const size_t count = WXSIZEOF(gs_encodingNames); - - for ( size_t i = 0; i < count; i++ ) - { - for ( const wxChar* const* encName = gs_encodingNames[i]; *encName; ++encName ) - { - if ( name.CmpNoCase(*encName) == 0 ) - return gs_encodings[i]; - } - } - - return wxFONTENCODING_MAX; -} - -#endif // wxUSE_FONTMAP diff --git a/Externals/wxWidgets3/src/common/fontcmn.cpp b/Externals/wxWidgets3/src/common/fontcmn.cpp deleted file mode 100644 index da8e05d239..0000000000 --- a/Externals/wxWidgets3/src/common/fontcmn.cpp +++ /dev/null @@ -1,1138 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/fontcmn.cpp -// Purpose: implementation of wxFontBase methods -// Author: Vadim Zeitlin -// Modified by: -// Created: 20.09.99 -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include "wx/font.h" - -#ifndef WX_PRECOMP - #include "wx/dc.h" - #include "wx/intl.h" - #include "wx/math.h" - #include "wx/dcscreen.h" - #include "wx/log.h" - #include "wx/gdicmn.h" -#endif // WX_PRECOMP - -#if defined(__WXMSW__) - #include "wx/msw/private.h" // includes windows.h for LOGFONT - #include "wx/msw/winundef.h" -#endif - -#include "wx/fontutil.h" // for wxNativeFontInfo -#include "wx/fontmap.h" -#include "wx/fontenum.h" - -#include "wx/tokenzr.h" - -// debugger helper: this function can be called from a debugger to show what -// the date really is -extern const char *wxDumpFont(const wxFont *font) -{ - static char buf[256]; - - const wxFontWeight weight = font->GetWeight(); - - wxString s; - s.Printf(wxS("%s-%s-%s-%d-%d"), - font->GetFaceName(), - weight == wxFONTWEIGHT_NORMAL - ? wxT("normal") - : weight == wxFONTWEIGHT_BOLD - ? wxT("bold") - : wxT("light"), - font->GetStyle() == wxFONTSTYLE_NORMAL - ? wxT("regular") - : wxT("italic"), - font->GetPointSize(), - font->GetEncoding()); - - wxStrlcpy(buf, s.mb_str(), WXSIZEOF(buf)); - return buf; -} - -// ---------------------------------------------------------------------------- -// XTI -// ---------------------------------------------------------------------------- - -wxBEGIN_ENUM( wxFontFamily ) -wxENUM_MEMBER( wxFONTFAMILY_DEFAULT ) -wxENUM_MEMBER( wxFONTFAMILY_DECORATIVE ) -wxENUM_MEMBER( wxFONTFAMILY_ROMAN ) -wxENUM_MEMBER( wxFONTFAMILY_SCRIPT ) -wxENUM_MEMBER( wxFONTFAMILY_SWISS ) -wxENUM_MEMBER( wxFONTFAMILY_MODERN ) -wxENUM_MEMBER( wxFONTFAMILY_TELETYPE ) -wxEND_ENUM( wxFontFamily ) - -wxBEGIN_ENUM( wxFontStyle ) -wxENUM_MEMBER( wxFONTSTYLE_NORMAL ) -wxENUM_MEMBER( wxFONTSTYLE_ITALIC ) -wxENUM_MEMBER( wxFONTSTYLE_SLANT ) -wxEND_ENUM( wxFontStyle ) - -wxBEGIN_ENUM( wxFontWeight ) -wxENUM_MEMBER( wxFONTWEIGHT_NORMAL ) -wxENUM_MEMBER( wxFONTWEIGHT_LIGHT ) -wxENUM_MEMBER( wxFONTWEIGHT_BOLD ) -wxEND_ENUM( wxFontWeight ) - -wxIMPLEMENT_DYNAMIC_CLASS_WITH_COPY_XTI(wxFont, wxGDIObject, "wx/font.h"); - -//WX_IMPLEMENT_ANY_VALUE_TYPE(wxAnyValueTypeImpl) - -wxBEGIN_PROPERTIES_TABLE(wxFont) -wxPROPERTY( Size,int, SetPointSize, GetPointSize, 12, 0 /*flags*/, \ - wxT("Helpstring"), wxT("group")) -wxPROPERTY( Family, wxFontFamily , SetFamily, GetFamily, (wxFontFamily)wxDEFAULT, \ - 0 /*flags*/, wxT("Helpstring"), wxT("group")) // wxFontFamily -wxPROPERTY( Style, wxFontStyle, SetStyle, GetStyle, (wxFontStyle)wxNORMAL, 0 /*flags*/, \ - wxT("Helpstring"), wxT("group")) // wxFontStyle -wxPROPERTY( Weight, wxFontWeight, SetWeight, GetWeight, (wxFontWeight)wxNORMAL, 0 /*flags*/, \ - wxT("Helpstring"), wxT("group")) // wxFontWeight -wxPROPERTY( Underlined, bool, SetUnderlined, GetUnderlined, false, 0 /*flags*/, \ - wxT("Helpstring"), wxT("group")) -wxPROPERTY( Strikethrough, bool, SetStrikethrough, GetStrikethrough, false, 0, \ - wxT("Helpstring"), wxT("group")) -wxPROPERTY( Face, wxString, SetFaceName, GetFaceName, wxEMPTY_PARAMETER_VALUE, \ - 0 /*flags*/, wxT("Helpstring"), wxT("group")) -wxPROPERTY( Encoding, wxFontEncoding, SetEncoding, GetEncoding, \ - wxFONTENCODING_DEFAULT, 0 /*flags*/, wxT("Helpstring"), wxT("group")) -wxEND_PROPERTIES_TABLE() - -wxCONSTRUCTOR_6( wxFont, int, Size, wxFontFamily, Family, wxFontStyle, Style, wxFontWeight, Weight, \ - bool, Underlined, wxString, Face ) - -wxEMPTY_HANDLERS_TABLE(wxFont) - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxFontBase -// ---------------------------------------------------------------------------- - -wxFontEncoding wxFontBase::ms_encodingDefault = wxFONTENCODING_SYSTEM; - -/* static */ -void wxFontBase::SetDefaultEncoding(wxFontEncoding encoding) -{ - // GetDefaultEncoding() should return something != wxFONTENCODING_DEFAULT - // and, besides, using this value here doesn't make any sense - wxCHECK_RET( encoding != wxFONTENCODING_DEFAULT, - wxT("can't set default encoding to wxFONTENCODING_DEFAULT") ); - - ms_encodingDefault = encoding; -} - -wxFontBase::~wxFontBase() -{ - // this destructor is required for Darwin -} - -/* static */ -wxFont *wxFontBase::New(int size, - wxFontFamily family, - wxFontStyle style, - wxFontWeight weight, - bool underlined, - const wxString& face, - wxFontEncoding encoding) -{ - return new wxFont(size, family, style, weight, underlined, face, encoding); -} - -/* static */ -wxFont *wxFontBase::New(const wxSize& pixelSize, - wxFontFamily family, - wxFontStyle style, - wxFontWeight weight, - bool underlined, - const wxString& face, - wxFontEncoding encoding) -{ - return new wxFont(pixelSize, family, style, weight, underlined, - face, encoding); -} - -/* static */ -wxFont *wxFontBase::New(int pointSize, - wxFontFamily family, - int flags, - const wxString& face, - wxFontEncoding encoding) -{ - return New(pointSize, family, - GetStyleFromFlags(flags), - GetWeightFromFlags(flags), - GetUnderlinedFromFlags(flags), - face, encoding); -} - -/* static */ -wxFont *wxFontBase::New(const wxSize& pixelSize, - wxFontFamily family, - int flags, - const wxString& face, - wxFontEncoding encoding) -{ - return New(pixelSize, family, - GetStyleFromFlags(flags), - GetWeightFromFlags(flags), - GetUnderlinedFromFlags(flags), - face, encoding); -} - -/* static */ -wxFont *wxFontBase::New(const wxNativeFontInfo& info) -{ - return new wxFont(info); -} - -/* static */ -wxFont *wxFontBase::New(const wxString& strNativeFontDesc) -{ - wxNativeFontInfo fontInfo; - if ( !fontInfo.FromString(strNativeFontDesc) ) - return new wxFont(*wxNORMAL_FONT); - - return New(fontInfo); -} - -bool wxFontBase::IsFixedWidth() const -{ - return GetFamily() == wxFONTFAMILY_TELETYPE; -} - -wxSize wxFontBase::GetPixelSize() const -{ - wxScreenDC dc; - dc.SetFont(*(wxFont *)this); - return wxSize(dc.GetCharWidth(), dc.GetCharHeight()); -} - -bool wxFontBase::IsUsingSizeInPixels() const -{ - return false; -} - -void wxFontBase::SetPixelSize( const wxSize& pixelSize ) -{ - wxCHECK_RET( pixelSize.GetWidth() >= 0 && pixelSize.GetHeight() > 0, - "Negative values for the pixel size or zero pixel height are not allowed" ); - - wxScreenDC dc; - - // NOTE: this algorithm for adjusting the font size is used by all - // implementations of wxFont except under wxMSW and wxGTK where - // native support to font creation using pixel-size is provided. - - int largestGood = 0; - int smallestBad = 0; - - bool initialGoodFound = false; - bool initialBadFound = false; - - // NB: this assignment was separated from the variable definition - // in order to fix a gcc v3.3.3 compiler crash - int currentSize = GetPointSize(); - while (currentSize > 0) - { - dc.SetFont(*static_cast(this)); - - // if currentSize (in points) results in a font that is smaller - // than required by pixelSize it is considered a good size - // NOTE: the pixel size width may be zero - if (dc.GetCharHeight() <= pixelSize.GetHeight() && - (pixelSize.GetWidth() == 0 || - dc.GetCharWidth() <= pixelSize.GetWidth())) - { - largestGood = currentSize; - initialGoodFound = true; - } - else - { - smallestBad = currentSize; - initialBadFound = true; - } - if (!initialGoodFound) - { - currentSize /= 2; - } - else if (!initialBadFound) - { - currentSize *= 2; - } - else - { - int distance = smallestBad - largestGood; - if (distance == 1) - break; - - currentSize = largestGood + distance / 2; - } - - SetPointSize(currentSize); - } - - if (currentSize != largestGood) - SetPointSize(largestGood); -} - -void wxFontBase::DoSetNativeFontInfo(const wxNativeFontInfo& info) -{ -#ifdef wxNO_NATIVE_FONTINFO - SetPointSize(info.pointSize); - SetFamily(info.family); - SetStyle(info.style); - SetWeight(info.weight); - SetUnderlined(info.underlined); - SetStrikethrough(info.strikethrough); - SetFaceName(info.faceName); - SetEncoding(info.encoding); -#else - (void)info; -#endif -} - -wxString wxFontBase::GetNativeFontInfoDesc() const -{ - wxCHECK_MSG( IsOk(), wxEmptyString, wxT("invalid font") ); - - wxString fontDesc; - const wxNativeFontInfo *fontInfo = GetNativeFontInfo(); - if ( fontInfo ) - { - fontDesc = fontInfo->ToString(); - wxASSERT_MSG(!fontDesc.empty(), wxT("This should be a non-empty string!")); - } - else - { - wxFAIL_MSG(wxT("Derived class should have created the wxNativeFontInfo!")); - } - - return fontDesc; -} - -wxString wxFontBase::GetNativeFontInfoUserDesc() const -{ - wxCHECK_MSG( IsOk(), wxEmptyString, wxT("invalid font") ); - - wxString fontDesc; - const wxNativeFontInfo *fontInfo = GetNativeFontInfo(); - if ( fontInfo ) - { - fontDesc = fontInfo->ToUserString(); - wxASSERT_MSG(!fontDesc.empty(), wxT("This should be a non-empty string!")); - } - else - { - wxFAIL_MSG(wxT("Derived class should have created the wxNativeFontInfo!")); - } - - return fontDesc; -} - -bool wxFontBase::SetNativeFontInfo(const wxString& info) -{ - wxNativeFontInfo fontInfo; - if ( !info.empty() && fontInfo.FromString(info) ) - { - SetNativeFontInfo(fontInfo); - return true; - } - - return false; -} - -bool wxFontBase::SetNativeFontInfoUserDesc(const wxString& info) -{ - wxNativeFontInfo fontInfo; - if ( !info.empty() && fontInfo.FromUserString(info) ) - { - SetNativeFontInfo(fontInfo); - return true; - } - - return false; -} - -bool wxFontBase::operator==(const wxFont& font) const -{ - // either it is the same font, i.e. they share the same common data or they - // have different ref datas but still describe the same font - return IsSameAs(font) || - ( - IsOk() == font.IsOk() && - GetPointSize() == font.GetPointSize() && - // in wxGTK1 GetPixelSize() calls GetInternalFont() which uses - // operator==() resulting in infinite recursion so we can't use it - // in that port - // in wxQT, GetPixelSize is too slow to be used here -#if (!defined(__WXGTK__) || defined(__WXGTK20__)) && !defined(__WXQT__) - GetPixelSize() == font.GetPixelSize() && -#endif - GetFamily() == font.GetFamily() && - GetStyle() == font.GetStyle() && - GetWeight() == font.GetWeight() && - GetUnderlined() == font.GetUnderlined() && - GetStrikethrough() == font.GetStrikethrough() && - GetFaceName().IsSameAs(font.GetFaceName(), false) && - GetEncoding() == font.GetEncoding() - ); -} - -wxFontFamily wxFontBase::GetFamily() const -{ - wxCHECK_MSG( IsOk(), wxFONTFAMILY_UNKNOWN, wxS("invalid font") ); - - // Don't return wxFONTFAMILY_UNKNOWN from here because it prevents the code - // like wxFont(size, wxNORMAL_FONT->GetFamily(), ...) from working (see - // #12330). This is really just a hack but it allows to keep compatibility - // and doesn't really have any bad drawbacks so do this until someone comes - // up with a better idea. - const wxFontFamily family = DoGetFamily(); - - return family == wxFONTFAMILY_UNKNOWN ? wxFONTFAMILY_DEFAULT : family; -} - -wxString wxFontBase::GetFamilyString() const -{ - wxCHECK_MSG( IsOk(), "wxFONTFAMILY_DEFAULT", "invalid font" ); - - switch ( GetFamily() ) - { - case wxFONTFAMILY_DECORATIVE: return "wxFONTFAMILY_DECORATIVE"; - case wxFONTFAMILY_ROMAN: return "wxFONTFAMILY_ROMAN"; - case wxFONTFAMILY_SCRIPT: return "wxFONTFAMILY_SCRIPT"; - case wxFONTFAMILY_SWISS: return "wxFONTFAMILY_SWISS"; - case wxFONTFAMILY_MODERN: return "wxFONTFAMILY_MODERN"; - case wxFONTFAMILY_TELETYPE: return "wxFONTFAMILY_TELETYPE"; - case wxFONTFAMILY_UNKNOWN: return "wxFONTFAMILY_UNKNOWN"; - default: return "wxFONTFAMILY_DEFAULT"; - } -} - -wxString wxFontBase::GetStyleString() const -{ - wxCHECK_MSG( IsOk(), "wxFONTSTYLE_DEFAULT", "invalid font" ); - - switch ( GetStyle() ) - { - case wxFONTSTYLE_NORMAL: return "wxFONTSTYLE_NORMAL"; - case wxFONTSTYLE_SLANT: return "wxFONTSTYLE_SLANT"; - case wxFONTSTYLE_ITALIC: return "wxFONTSTYLE_ITALIC"; - default: return "wxFONTSTYLE_DEFAULT"; - } -} - -wxString wxFontBase::GetWeightString() const -{ - wxCHECK_MSG( IsOk(), "wxFONTWEIGHT_DEFAULT", "invalid font" ); - - switch ( GetWeight() ) - { - case wxFONTWEIGHT_NORMAL: return "wxFONTWEIGHT_NORMAL"; - case wxFONTWEIGHT_BOLD: return "wxFONTWEIGHT_BOLD"; - case wxFONTWEIGHT_LIGHT: return "wxFONTWEIGHT_LIGHT"; - default: return "wxFONTWEIGHT_DEFAULT"; - } -} - -bool wxFontBase::SetFaceName(const wxString& facename) -{ -#if wxUSE_FONTENUM - if (!wxFontEnumerator::IsValidFacename(facename)) - { - UnRef(); // make IsOk() return false - return false; - } -#else // !wxUSE_FONTENUM - wxUnusedVar(facename); -#endif // wxUSE_FONTENUM/!wxUSE_FONTENUM - - return true; -} - -void wxFontBase::SetSymbolicSize(wxFontSymbolicSize size) -{ - SetSymbolicSizeRelativeTo(size, wxNORMAL_FONT->GetPointSize()); -} - -/* static */ -int wxFontBase::AdjustToSymbolicSize(wxFontSymbolicSize size, int base) -{ - // Using a fixed factor (1.2, from CSS2) is a bad idea as explained at - // http://www.w3.org/TR/CSS21/fonts.html#font-size-props so use the values - // from http://style.cleverchimp.com/font_size_intervals/altintervals.html - // instead. - static const float factors[] = { 0.60f, 0.75f, 0.89f, 1.f, 1.2f, 1.5f, 2.f }; - - wxCOMPILE_TIME_ASSERT - ( - WXSIZEOF(factors) == wxFONTSIZE_XX_LARGE - wxFONTSIZE_XX_SMALL + 1, - WrongFontSizeFactorsSize - ); - - return wxRound(factors[size - wxFONTSIZE_XX_SMALL]*base); -} - -wxFont& wxFont::MakeBold() -{ - SetWeight(wxFONTWEIGHT_BOLD); - return *this; -} - -wxFont wxFont::Bold() const -{ - wxFont font(*this); - font.MakeBold(); - return font; -} - -wxFont wxFont::GetBaseFont() const -{ - wxFont font(*this); - font.SetStyle(wxFONTSTYLE_NORMAL); - font.SetWeight(wxFONTWEIGHT_NORMAL ); - font.SetUnderlined(false); - font.SetStrikethrough(false); - return font; -} - -wxFont& wxFont::MakeItalic() -{ - SetStyle(wxFONTSTYLE_ITALIC); - return *this; -} - -wxFont wxFont::Italic() const -{ - wxFont font(*this); - font.MakeItalic(); - return font; -} - -wxFont& wxFont::MakeUnderlined() -{ - SetUnderlined(true); - return *this; -} - -wxFont wxFont::Underlined() const -{ - wxFont font(*this); - font.MakeUnderlined(); - return font; -} - -wxFont wxFont::Strikethrough() const -{ - wxFont font(*this); - font.MakeStrikethrough(); - return font; -} - -wxFont& wxFont::MakeStrikethrough() -{ - SetStrikethrough(true); - return *this; -} - -wxFont& wxFont::Scale(float x) -{ - SetPointSize(int(x*GetPointSize() + 0.5)); - return *this; -} - -wxFont wxFont::Scaled(float x) const -{ - wxFont font(*this); - font.Scale(x); - return font; -} - -// ---------------------------------------------------------------------------- -// wxNativeFontInfo -// ---------------------------------------------------------------------------- - -// Up to now, there are no native implementations of this function: -void wxNativeFontInfo::SetFaceName(const wxArrayString& facenames) -{ -#if wxUSE_FONTENUM - for (size_t i=0; i < facenames.GetCount(); i++) - { - if (wxFontEnumerator::IsValidFacename(facenames[i])) - { - SetFaceName(facenames[i]); - return; - } - } - - // set the first valid facename we can find on this system - wxString validfacename = wxFontEnumerator::GetFacenames().Item(0); - wxLogTrace(wxT("font"), wxT("Falling back to '%s'"), validfacename.c_str()); - SetFaceName(validfacename); -#else // !wxUSE_FONTENUM - SetFaceName(facenames[0]); -#endif // wxUSE_FONTENUM/!wxUSE_FONTENUM -} - - -#ifdef wxNO_NATIVE_FONTINFO - -// These are the generic forms of FromString()/ToString. -// -// convert to/from the string representation: the general format is -// "version;the rest..." with currently defined versions being: -// -// 0;pointsize;family;style;weight;underlined;facename;encoding -// 1;pointsize;family;style;weight;underlined;strikethrough;facename;encoding - -bool wxNativeFontInfo::FromString(const wxString& s) -{ - long l; - unsigned long version; - - wxStringTokenizer tokenizer(s, wxT(";")); - - wxString token = tokenizer.GetNextToken(); - if ( !token.ToULong(&version) || version > 1 ) - return false; - - token = tokenizer.GetNextToken(); - if ( !token.ToLong(&l) ) - return false; - pointSize = (int)l; - - token = tokenizer.GetNextToken(); - if ( !token.ToLong(&l) ) - return false; - family = (wxFontFamily)l; - - token = tokenizer.GetNextToken(); - if ( !token.ToLong(&l) ) - return false; - style = (wxFontStyle)l; - - token = tokenizer.GetNextToken(); - if ( !token.ToLong(&l) ) - return false; - weight = (wxFontWeight)l; - - token = tokenizer.GetNextToken(); - if ( !token.ToLong(&l) ) - return false; - underlined = l != 0; - - if ( version == 1 ) - { - token = tokenizer.GetNextToken(); - if ( !token.ToLong(&l) ) - return false; - strikethrough = l != 0; - } - - faceName = tokenizer.GetNextToken(); - -#ifndef __WXMAC__ - if( !faceName ) - return false; -#endif - - token = tokenizer.GetNextToken(); - if ( !token.ToLong(&l) ) - return false; - encoding = (wxFontEncoding)l; - - return true; -} - -wxString wxNativeFontInfo::ToString() const -{ - wxString s; - - s.Printf(wxT("%d;%d;%d;%d;%d;%d;%d;%s;%d"), - 1, // version - pointSize, - family, - (int)style, - (int)weight, - underlined, - strikethrough, - faceName.GetData(), - (int)encoding); - - return s; -} - -void wxNativeFontInfo::Init() -{ - pointSize = 0; - family = wxFONTFAMILY_DEFAULT; - style = wxFONTSTYLE_NORMAL; - weight = wxFONTWEIGHT_NORMAL; - underlined = false; - strikethrough = false; - faceName.clear(); - encoding = wxFONTENCODING_DEFAULT; -} - -int wxNativeFontInfo::GetPointSize() const -{ - return pointSize; -} - -wxFontStyle wxNativeFontInfo::GetStyle() const -{ - return style; -} - -wxFontWeight wxNativeFontInfo::GetWeight() const -{ - return weight; -} - -bool wxNativeFontInfo::GetUnderlined() const -{ - return underlined; -} - -bool wxNativeFontInfo::GetStrikethrough() const -{ - return strikethrough; -} - -wxString wxNativeFontInfo::GetFaceName() const -{ - return faceName; -} - -wxFontFamily wxNativeFontInfo::GetFamily() const -{ - return family; -} - -wxFontEncoding wxNativeFontInfo::GetEncoding() const -{ - return encoding; -} - -void wxNativeFontInfo::SetPointSize(int pointsize) -{ - pointSize = pointsize; -} - -void wxNativeFontInfo::SetStyle(wxFontStyle style_) -{ - style = style_; -} - -void wxNativeFontInfo::SetWeight(wxFontWeight weight_) -{ - weight = weight_; -} - -void wxNativeFontInfo::SetUnderlined(bool underlined_) -{ - underlined = underlined_; -} - -void wxNativeFontInfo::SetStrikethrough(bool strikethrough_) -{ - strikethrough = strikethrough_; -} - -bool wxNativeFontInfo::SetFaceName(const wxString& facename_) -{ - faceName = facename_; - return true; -} - -void wxNativeFontInfo::SetFamily(wxFontFamily family_) -{ - family = family_; -} - -void wxNativeFontInfo::SetEncoding(wxFontEncoding encoding_) -{ - encoding = encoding_; -} - -#endif // generic wxNativeFontInfo implementation - -// conversion to/from user-readable string: this is used in the generic -// versions and under MSW as well because there is no standard font description -// format there anyhow (but there is a well-defined standard for X11 fonts used -// by wxGTK and wxMotif) - -#if defined(wxNO_NATIVE_FONTINFO) || defined(__WXMSW__) || defined(__WXOSX__) - -wxString wxNativeFontInfo::ToUserString() const -{ - wxString desc; - - // first put the adjectives, if any - this is English-centric, of course, - // but what else can we do? - if ( GetUnderlined() ) - { - desc << _("underlined"); - } - - if ( GetStrikethrough() ) - { - desc << _(" strikethrough"); - } - - switch ( GetWeight() ) - { - default: - wxFAIL_MSG( wxT("unknown font weight") ); - wxFALLTHROUGH; - - case wxFONTWEIGHT_NORMAL: - break; - - case wxFONTWEIGHT_LIGHT: - desc << _(" light"); - break; - - case wxFONTWEIGHT_BOLD: - desc << _(" bold"); - break; - } - - switch ( GetStyle() ) - { - default: - wxFAIL_MSG( wxT("unknown font style") ); - wxFALLTHROUGH; - - case wxFONTSTYLE_NORMAL: - break; - - // we don't distinguish between the two for now anyhow... - case wxFONTSTYLE_ITALIC: - case wxFONTSTYLE_SLANT: - desc << _(" italic"); - break; - } - - wxString face = GetFaceName(); - if ( !face.empty() ) - { - if (face.Contains(' ') || face.Contains(';') || face.Contains(',')) - { - face.Replace("'", ""); - // eventually remove quote characters: most systems do not - // allow them in a facename anyway so this usually does nothing - - // make it possible for FromUserString() function to understand - // that the different words which compose this facename are - // not different adjectives or other data but rather all parts - // of the facename - desc << wxT(" '") << face << wxT("'"); - } - else - desc << wxT(' ') << face; - } - else // no face name specified - { - // use the family - wxString familyStr; - switch ( GetFamily() ) - { - case wxFONTFAMILY_DECORATIVE: - familyStr = "decorative"; - break; - - case wxFONTFAMILY_ROMAN: - familyStr = "roman"; - break; - - case wxFONTFAMILY_SCRIPT: - familyStr = "script"; - break; - - case wxFONTFAMILY_SWISS: - familyStr = "swiss"; - break; - - case wxFONTFAMILY_MODERN: - familyStr = "modern"; - break; - - case wxFONTFAMILY_TELETYPE: - familyStr = "teletype"; - break; - - case wxFONTFAMILY_DEFAULT: - case wxFONTFAMILY_UNKNOWN: - break; - - default: - wxFAIL_MSG( "unknown font family" ); - } - - if ( !familyStr.empty() ) - desc << " '" << familyStr << " family'"; - } - - int size = GetPointSize(); - if ( size != wxNORMAL_FONT->GetPointSize() ) - { - desc << wxT(' ') << size; - } - -#if wxUSE_FONTMAP - wxFontEncoding enc = GetEncoding(); - if ( enc != wxFONTENCODING_DEFAULT && enc != wxFONTENCODING_SYSTEM ) - { - desc << wxT(' ') << wxFontMapper::GetEncodingName(enc); - } -#endif // wxUSE_FONTMAP - - return desc.Strip(wxString::both).MakeLower(); -} - -bool wxNativeFontInfo::FromUserString(const wxString& s) -{ - // reset to the default state - Init(); - - // ToUserString() will quote the facename if it contains spaces, commas - // or semicolons: we must be able to understand that quoted text is - // a single token: - wxString toparse(s); - - // parse a more or less free form string - wxStringTokenizer tokenizer(toparse, wxT(";, "), wxTOKEN_STRTOK); - - wxString face; - unsigned long size; - bool weightfound = false, pointsizefound = false; -#if wxUSE_FONTMAP - bool encodingfound = false; -#endif - bool insideQuotes = false; - - while ( tokenizer.HasMoreTokens() ) - { - wxString token = tokenizer.GetNextToken(); - - // normalize it - token.Trim(true).Trim(false).MakeLower(); - if (insideQuotes) - { - if (token.StartsWith("'") || - token.EndsWith("'")) - { - insideQuotes = false; - - // add this last token to the facename: - face += " " + token; - - // normalize facename: - face = face.Trim(true).Trim(false); - face.Replace("'", ""); - - continue; - } - } - else - { - if (token.StartsWith("'")) - insideQuotes = true; - } - - // look for the known tokens - if ( insideQuotes ) - { - // only the facename may be quoted: - face += " " + token; - continue; - } - if ( token == wxT("underlined") || token == _("underlined") ) - { - SetUnderlined(true); - } - else if ( token == wxT("strikethrough") || token == _("strikethrough") ) - { - SetStrikethrough(true); - } - else if ( token == wxT("underlinedstrikethrough") ) - { - SetUnderlined(true); - SetStrikethrough(true); - } - else if ( token == wxT("light") || token == _("light") ) - { - SetWeight(wxFONTWEIGHT_LIGHT); - weightfound = true; - } - else if ( token == wxT("bold") || token == _("bold") ) - { - SetWeight(wxFONTWEIGHT_BOLD); - weightfound = true; - } - else if ( token == wxT("italic") || token == _("italic") ) - { - SetStyle(wxFONTSTYLE_ITALIC); - } - else if ( token.ToULong(&size) ) - { - SetPointSize(size); - pointsizefound = true; - } - else - { -#if wxUSE_FONTMAP - // try to interpret this as an encoding - wxFontEncoding encoding = wxFontMapper::Get()->CharsetToEncoding(token, false); - if ( encoding != wxFONTENCODING_DEFAULT && - encoding != wxFONTENCODING_SYSTEM ) // returned when the recognition failed - { - SetEncoding(encoding); - encodingfound = true; - } - else - { -#endif // wxUSE_FONTMAP - - // assume it is the face name - if ( !face.empty() ) - { - face += wxT(' '); - } - - face += token; - - // skip the code which resets face below - continue; - -#if wxUSE_FONTMAP - } -#endif // wxUSE_FONTMAP - } - - // if we had had the facename, we shouldn't continue appending tokens - // to it (i.e. "foo bold bar" shouldn't result in the facename "foo - // bar") - if ( !face.empty() ) - { - wxString familyStr; - if ( face.EndsWith(" family", &familyStr) ) - { - // it's not a facename but rather a font family - wxFontFamily family; - if ( familyStr == "decorative" ) - family = wxFONTFAMILY_DECORATIVE; - else if ( familyStr == "roman" ) - family = wxFONTFAMILY_ROMAN; - else if ( familyStr == "script" ) - family = wxFONTFAMILY_SCRIPT; - else if ( familyStr == "swiss" ) - family = wxFONTFAMILY_SWISS; - else if ( familyStr == "modern" ) - family = wxFONTFAMILY_MODERN; - else if ( familyStr == "teletype" ) - family = wxFONTFAMILY_TELETYPE; - else - return false; - - SetFamily(family); - } - // NB: the check on the facename is implemented in wxFontBase::SetFaceName - // and not in wxNativeFontInfo::SetFaceName thus we need to explicitly - // call here wxFontEnumerator::IsValidFacename - else if ( -#if wxUSE_FONTENUM - !wxFontEnumerator::IsValidFacename(face) || -#endif // wxUSE_FONTENUM - !SetFaceName(face) ) - { - SetFaceName(wxNORMAL_FONT->GetFaceName()); - } - - face.clear(); - } - } - - // we might not have flushed it inside the loop - if ( !face.empty() ) - { - // NB: the check on the facename is implemented in wxFontBase::SetFaceName - // and not in wxNativeFontInfo::SetFaceName thus we need to explicitly - // call here wxFontEnumerator::IsValidFacename - if ( -#if wxUSE_FONTENUM - !wxFontEnumerator::IsValidFacename(face) || -#endif // wxUSE_FONTENUM - !SetFaceName(face) ) - { - SetFaceName(wxNORMAL_FONT->GetFaceName()); - } - } - - // set point size to default value if size was not given - if ( !pointsizefound ) - SetPointSize(wxNORMAL_FONT->GetPointSize()); - - // set font weight to default value if weight was not given - if ( !weightfound ) - SetWeight(wxFONTWEIGHT_NORMAL); - -#if wxUSE_FONTMAP - // set font encoding to default value if encoding was not given - if ( !encodingfound ) - SetEncoding(wxFONTENCODING_SYSTEM); -#endif // wxUSE_FONTMAP - - return true; -} - -#endif // generic or wxMSW - - -// wxFont <-> wxString utilities, used by wxConfig -wxString wxToString(const wxFontBase& font) -{ - return font.IsOk() ? font.GetNativeFontInfoDesc() - : wxString(); -} - -bool wxFromString(const wxString& str, wxFontBase *font) -{ - wxCHECK_MSG( font, false, wxT("NULL output parameter") ); - - if ( str.empty() ) - { - *font = wxNullFont; - return true; - } - - return font->SetNativeFontInfo(str); -} - - diff --git a/Externals/wxWidgets3/src/common/fontdata.cpp b/Externals/wxWidgets3/src/common/fontdata.cpp deleted file mode 100644 index 6417eb8bb8..0000000000 --- a/Externals/wxWidgets3/src/common/fontdata.cpp +++ /dev/null @@ -1,94 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/fontdata.cpp -// Author: Julian Smart -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_FONTDLG || wxUSE_FONTPICKERCTRL - -#include "wx/fontdata.h" - -wxIMPLEMENT_DYNAMIC_CLASS(wxFontData, wxObject); - -wxFontData::wxFontData() -{ - m_showHelp = false; - m_allowSymbols = true; - m_enableEffects = true; - m_minSize = 0; - m_maxSize = 0; - - m_encoding = wxFONTENCODING_SYSTEM; -} - -wxFontData::~wxFontData() -{ -} - -wxFontData::wxFontData(const wxFontData& data) - : wxObject(), - m_fontColour(data.m_fontColour), - m_showHelp(data.m_showHelp), - m_allowSymbols(data.m_allowSymbols), - m_enableEffects(data.m_enableEffects), - m_initialFont(data.m_initialFont), - m_chosenFont(data.m_chosenFont), - m_minSize(data.m_minSize), - m_maxSize(data.m_maxSize), - m_encoding(data.m_encoding), - m_encodingInfo(data.m_encodingInfo) -{ -} - -wxFontData& wxFontData::operator=(const wxFontData& data) -{ - if (&data != this) - { - wxObject::operator=(data); - m_fontColour = data.m_fontColour; - m_showHelp = data.m_showHelp; - m_allowSymbols = data.m_allowSymbols; - m_enableEffects = data.m_enableEffects; - m_initialFont = data.m_initialFont; - m_chosenFont = data.m_chosenFont; - m_minSize = data.m_minSize; - m_maxSize = data.m_maxSize; - m_encoding = data.m_encoding; - m_encodingInfo = data.m_encodingInfo; - } - return *this; -} -#endif // wxUSE_FONTDLG || wxUSE_FONTPICKERCTRL - -#if wxUSE_FONTDLG - -#include "wx/fontdlg.h" - -wxFont wxGetFontFromUser(wxWindow *parent, const wxFont& fontInit, const wxString& caption) -{ - wxFontData data; - if ( fontInit.IsOk() ) - { - data.SetInitialFont(fontInit); - } - - wxFont fontRet; - wxFontDialog dialog(parent, data); - if (!caption.empty()) - dialog.SetTitle(caption); - if ( dialog.ShowModal() == wxID_OK ) - { - fontRet = dialog.GetFontData().GetChosenFont(); - } - //else: leave it invalid - - return fontRet; -} -#endif // wxUSE_FONTDLG diff --git a/Externals/wxWidgets3/src/common/fontenumcmn.cpp b/Externals/wxWidgets3/src/common/fontenumcmn.cpp deleted file mode 100644 index 423f8dbb64..0000000000 --- a/Externals/wxWidgets3/src/common/fontenumcmn.cpp +++ /dev/null @@ -1,134 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/fontenumcmn.cpp -// Purpose: wxFontEnumerator class -// Author: Vadim Zeitlin -// Modified by: -// Created: 7/5/2006 -// Copyright: (c) 1999-2003 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_FONTENUM - -#include "wx/fontenum.h" - -// ============================================================================ -// implementation -// ============================================================================ - -// A simple wxFontEnumerator which doesn't perform any filtering and -// just returns all facenames and encodings found in the system -class wxSimpleFontEnumerator : public wxFontEnumerator -{ -public: - wxSimpleFontEnumerator() { } - - // called by EnumerateFacenames - virtual bool OnFacename(const wxString& facename) wxOVERRIDE - { - m_arrFacenames.Add(facename); - return true; - } - - // called by EnumerateEncodings - virtual bool OnFontEncoding(const wxString& WXUNUSED(facename), - const wxString& encoding) wxOVERRIDE - { - m_arrEncodings.Add(encoding); - return true; - } - -public: - wxArrayString m_arrFacenames, m_arrEncodings; -}; - - -/* static */ -wxArrayString wxFontEnumerator::GetFacenames(wxFontEncoding encoding, bool fixedWidthOnly) -{ - wxSimpleFontEnumerator temp; - temp.EnumerateFacenames(encoding, fixedWidthOnly); - return temp.m_arrFacenames; -} - -/* static */ -wxArrayString wxFontEnumerator::GetEncodings(const wxString& facename) -{ - wxSimpleFontEnumerator temp; - temp.EnumerateEncodings(facename); - return temp.m_arrEncodings; -} - -/* static */ -bool wxFontEnumerator::IsValidFacename(const wxString &facename) -{ - // we cache the result of wxFontEnumerator::GetFacenames supposing that - // the array of face names won't change in the session of this program - static wxArrayString s_arr = wxFontEnumerator::GetFacenames(); - -#ifdef __WXMSW__ - // Quoting the MSDN: - // "MS Shell Dlg is a mapping mechanism that enables - // U.S. English Microsoft Windows NT, and Microsoft Windows 2000 to - // support locales that have characters that are not contained in code - // page 1252. It is not a font but a face name for a nonexistent font." - // Thus we need to consider "Ms Shell Dlg" and "Ms Shell Dlg 2" as valid - // font face names even if they are not enumerated by wxFontEnumerator - if (facename.IsSameAs(wxT("Ms Shell Dlg"), false) || - facename.IsSameAs(wxT("Ms Shell Dlg 2"), false)) - return true; -#endif - - // is given font face name a valid one ? - if (s_arr.Index(facename, false) == wxNOT_FOUND) - return false; - - return true; -} - -#ifdef wxHAS_UTF8_FONTS -bool wxFontEnumerator::EnumerateEncodingsUTF8(const wxString& facename) -{ - // name of UTF-8 encoding: no need to use wxFontMapper for it as it's - // unlikely to change - const wxString utf8(wxT("UTF-8")); - - // all fonts are in UTF-8 only if this code is used - if ( !facename.empty() ) - { - OnFontEncoding(facename, utf8); - return true; - } - - // so enumerating all facenames supporting this encoding is the same as - // enumerating all facenames - const wxArrayString facenames(GetFacenames(wxFONTENCODING_UTF8)); - const size_t count = facenames.size(); - if ( !count ) - return false; - - for ( size_t n = 0; n < count; n++ ) - { - OnFontEncoding(facenames[n], utf8); - } - - return true; -} -#endif // wxHAS_UTF8_FONTS - -#endif // wxUSE_FONTENUM diff --git a/Externals/wxWidgets3/src/common/fontmap.cpp b/Externals/wxWidgets3/src/common/fontmap.cpp deleted file mode 100644 index ffac05c213..0000000000 --- a/Externals/wxWidgets3/src/common/fontmap.cpp +++ /dev/null @@ -1,522 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/fontmap.cpp -// Purpose: wxFontMapper class -// Author: Vadim Zeitlin -// Modified by: -// Created: 04.11.99 -// Copyright: (c) 1999-2003 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_FONTMAP - -#include "wx/fontmap.h" - -#ifndef WX_PRECOMP - #include "wx/app.h" - #include "wx/log.h" - #include "wx/intl.h" - #include "wx/msgdlg.h" - #include "wx/choicdlg.h" -#endif // PCH - -#if wxUSE_CONFIG - #include "wx/config.h" -#endif // wxUSE_CONFIG - -#if defined(__WXMSW__) - #include "wx/msw/private.h" // includes windows.h for LOGFONT - #include "wx/msw/winundef.h" -#endif - -#include "wx/fmappriv.h" -#include "wx/fontutil.h" -#include "wx/fontdlg.h" -#include "wx/encinfo.h" - -#include "wx/encconv.h" - -// ---------------------------------------------------------------------------- -// XTI -// ---------------------------------------------------------------------------- - -wxBEGIN_ENUM( wxFontEncoding ) -wxENUM_MEMBER( wxFONTENCODING_SYSTEM ) -wxENUM_MEMBER( wxFONTENCODING_DEFAULT ) - -wxENUM_MEMBER( wxFONTENCODING_ISO8859_1 ) -wxENUM_MEMBER( wxFONTENCODING_ISO8859_2 ) -wxENUM_MEMBER( wxFONTENCODING_ISO8859_3 ) -wxENUM_MEMBER( wxFONTENCODING_ISO8859_4 ) -wxENUM_MEMBER( wxFONTENCODING_ISO8859_5 ) -wxENUM_MEMBER( wxFONTENCODING_ISO8859_6 ) -wxENUM_MEMBER( wxFONTENCODING_ISO8859_7 ) -wxENUM_MEMBER( wxFONTENCODING_ISO8859_8 ) -wxENUM_MEMBER( wxFONTENCODING_ISO8859_9 ) -wxENUM_MEMBER( wxFONTENCODING_ISO8859_10 ) -wxENUM_MEMBER( wxFONTENCODING_ISO8859_11 ) -wxENUM_MEMBER( wxFONTENCODING_ISO8859_12 ) -wxENUM_MEMBER( wxFONTENCODING_ISO8859_13 ) -wxENUM_MEMBER( wxFONTENCODING_ISO8859_14 ) -wxENUM_MEMBER( wxFONTENCODING_ISO8859_15 ) -wxENUM_MEMBER( wxFONTENCODING_ISO8859_MAX ) -wxENUM_MEMBER( wxFONTENCODING_KOI8 ) -wxENUM_MEMBER( wxFONTENCODING_KOI8_U ) -wxENUM_MEMBER( wxFONTENCODING_ALTERNATIVE ) -wxENUM_MEMBER( wxFONTENCODING_BULGARIAN ) -wxENUM_MEMBER( wxFONTENCODING_CP437 ) -wxENUM_MEMBER( wxFONTENCODING_CP850 ) -wxENUM_MEMBER( wxFONTENCODING_CP852 ) -wxENUM_MEMBER( wxFONTENCODING_CP855 ) -wxENUM_MEMBER( wxFONTENCODING_CP866 ) - -wxENUM_MEMBER( wxFONTENCODING_CP874 ) -wxENUM_MEMBER( wxFONTENCODING_CP932 ) -wxENUM_MEMBER( wxFONTENCODING_CP936 ) -wxENUM_MEMBER( wxFONTENCODING_CP949 ) -wxENUM_MEMBER( wxFONTENCODING_CP950 ) -wxENUM_MEMBER( wxFONTENCODING_CP1250 ) -wxENUM_MEMBER( wxFONTENCODING_CP1251 ) -wxENUM_MEMBER( wxFONTENCODING_CP1252 ) -wxENUM_MEMBER( wxFONTENCODING_CP1253 ) -wxENUM_MEMBER( wxFONTENCODING_CP1254 ) -wxENUM_MEMBER( wxFONTENCODING_CP1255 ) -wxENUM_MEMBER( wxFONTENCODING_CP1256 ) -wxENUM_MEMBER( wxFONTENCODING_CP1257 ) -wxENUM_MEMBER( wxFONTENCODING_CP1258 ) -wxENUM_MEMBER( wxFONTENCODING_CP1361 ) -wxENUM_MEMBER( wxFONTENCODING_CP12_MAX ) -wxENUM_MEMBER( wxFONTENCODING_UTF7 ) -wxENUM_MEMBER( wxFONTENCODING_UTF8 ) -wxENUM_MEMBER( wxFONTENCODING_GB2312 ) -wxENUM_MEMBER( wxFONTENCODING_BIG5 ) -wxENUM_MEMBER( wxFONTENCODING_SHIFT_JIS ) -wxENUM_MEMBER( wxFONTENCODING_EUC_JP ) -wxENUM_MEMBER( wxFONTENCODING_UNICODE ) -wxEND_ENUM( wxFontEncoding ) - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -// the config paths we use -#if wxUSE_CONFIG - -static const wxChar* FONTMAPPER_FONT_FROM_ENCODING_PATH = wxT("Encodings"); -static const wxChar* FONTMAPPER_FONT_DONT_ASK = wxT("none"); - -#endif // wxUSE_CONFIG - -// ---------------------------------------------------------------------------- -// private classes -// ---------------------------------------------------------------------------- - -// it may happen that while we're showing a dialog asking the user about -// something, another request for an encoding mapping arrives: in this case it -// is best to not do anything because otherwise we risk to enter an infinite -// loop so we create an object of this class on stack to test for this in all -// interactive functions -class ReentrancyBlocker -{ -public: - ReentrancyBlocker(bool& flag) : m_flagOld(flag), m_flag(flag) - { m_flag = true; } - ~ReentrancyBlocker() { m_flag = m_flagOld; } - -private: - bool m_flagOld; - bool& m_flag; - - wxDECLARE_NO_COPY_CLASS(ReentrancyBlocker); -}; - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// ctor and dtor -// ---------------------------------------------------------------------------- - -wxFontMapper::wxFontMapper() -{ - m_windowParent = NULL; -} - -wxFontMapper::~wxFontMapper() -{ -} - -/* static */ -wxFontMapper *wxFontMapper::Get() -{ - wxFontMapperBase *fontmapper = wxFontMapperBase::Get(); - wxASSERT_MSG( !fontmapper->IsDummy(), - wxT("GUI code requested a wxFontMapper but we only have a wxFontMapperBase.") ); - - // Now return it anyway because there's a chance the GUI code might just - // only want to call wxFontMapperBase functions and it's better than - // crashing by returning NULL - return (wxFontMapper *)fontmapper; -} - -wxFontEncoding -wxFontMapper::CharsetToEncoding(const wxString& charset, bool interactive) -{ - // try the ways not needing the users intervention first - int encoding = wxFontMapperBase::NonInteractiveCharsetToEncoding(charset); - - // if we failed to find the encoding, ask the user -- unless disabled - if ( encoding == wxFONTENCODING_UNKNOWN ) - { - // this is the special value which disables asking the user (he had - // chosen to suppress this the last time) - encoding = wxFONTENCODING_SYSTEM; - } -#if wxUSE_CHOICEDLG - else if ( (encoding == wxFONTENCODING_SYSTEM) && interactive ) - { - // prepare the dialog data - - // the dialog title - wxString title(m_titleDialog); - if ( !title ) - title << wxTheApp->GetAppDisplayName() << _(": unknown charset"); - - // the message - wxString msg; - msg.Printf(_("The charset '%s' is unknown. You may select\nanother charset to replace it with or choose\n[Cancel] if it cannot be replaced"), charset); - - // the list of choices - const size_t count = GetSupportedEncodingsCount(); - - wxString *encodingNamesTranslated = new wxString[count]; - - for ( size_t i = 0; i < count; i++ ) - { - encodingNamesTranslated[i] = GetEncodingDescription(GetEncoding(i)); - } - - // the parent window - wxWindow *parent = m_windowParent; - if ( !parent ) - parent = wxTheApp->GetTopWindow(); - - // do ask the user and get back the index in encodings table - int n = wxGetSingleChoiceIndex(msg, title, - count, - encodingNamesTranslated, - parent); - - delete [] encodingNamesTranslated; - - if ( n != -1 ) - { - encoding = GetEncoding(n); - } - -#if wxUSE_CONFIG && wxUSE_FILECONFIG - // save the result in the config now - wxFontMapperPathChanger path(this, FONTMAPPER_CHARSET_PATH); - if ( path.IsOk() ) - { - wxConfigBase *config = GetConfig(); - - // remember the alt encoding for this charset -- or remember that - // we don't know it - long value = n == -1 ? (long)wxFONTENCODING_UNKNOWN : (long)encoding; - if ( !config->Write(charset, value) ) - { - wxLogError(_("Failed to remember the encoding for the charset '%s'."), charset); - } - } -#endif // wxUSE_CONFIG - } -#else - wxUnusedVar(interactive); -#endif // wxUSE_CHOICEDLG - - return (wxFontEncoding)encoding; -} - -// ---------------------------------------------------------------------------- -// support for unknown encodings: we maintain a map between the -// (platform-specific) strings identifying them and our wxFontEncodings they -// correspond to which is used by GetFontForEncoding() function -// ---------------------------------------------------------------------------- - -bool wxFontMapper::TestAltEncoding(const wxString& configEntry, - wxFontEncoding encReplacement, - wxNativeEncodingInfo *info) -{ - if ( wxGetNativeFontEncoding(encReplacement, info) && - wxTestFontEncoding(*info) ) - { -#if wxUSE_CONFIG && wxUSE_FILECONFIG - // remember the mapping in the config - wxFontMapperPathChanger path(this, FONTMAPPER_FONT_FROM_ENCODING_PATH); - - if ( path.IsOk() ) - { - GetConfig()->Write(configEntry, info->ToString()); - } -#else - wxUnusedVar(configEntry); -#endif // wxUSE_CONFIG - return true; - } - - return false; -} - -bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding, - wxNativeEncodingInfo *info, - const wxString& facename, - bool interactive) -{ -#if wxUSE_GUI - // we need a flag to prevent infinite recursion which happens, for - // example, when GetAltForEncoding() is called from an OnPaint() handler: - // in this case, wxYield() which is called from wxMessageBox() we use here - // will lead to another call of OnPaint() and hence to another call of - // GetAltForEncoding() -- and it is impossible to catch this from the user - // code because we are called from wxFont ctor implicitly. - - // assume we're always called from the main thread, so that it is safe to - // use a static var - static bool s_inGetAltForEncoding = false; - - if ( interactive && s_inGetAltForEncoding ) - return false; - - ReentrancyBlocker blocker(s_inGetAltForEncoding); -#endif // wxUSE_GUI - - wxCHECK_MSG( info, false, wxT("bad pointer in GetAltForEncoding") ); - - info->facename = facename; - - if ( encoding == wxFONTENCODING_DEFAULT ) - { - encoding = wxFont::GetDefaultEncoding(); - } - - // if we failed to load the system default encoding, something is really - // wrong and we'd better stop now -- otherwise we will go into endless - // recursion trying to create the font in the msg box with the error - // message - if ( encoding == wxFONTENCODING_SYSTEM ) - { - wxLogFatalError(_("can't load any font, aborting")); - - // wxLogFatalError doesn't return - } - - wxString configEntry, - encName = GetEncodingName(encoding); - if ( !facename.empty() ) - { - configEntry = facename + wxT("_"); - } - configEntry += encName; - -#if wxUSE_CONFIG && wxUSE_FILECONFIG - // do we have a font spec for this encoding? - wxString fontinfo; - wxFontMapperPathChanger path(this, FONTMAPPER_FONT_FROM_ENCODING_PATH); - if ( path.IsOk() ) - { - fontinfo = GetConfig()->Read(configEntry); - } - - // this special value means that we don't know of fonts for this - // encoding but, moreover, have already asked the user as well and he - // didn't specify any font neither - if ( fontinfo == FONTMAPPER_FONT_DONT_ASK ) - { - interactive = false; - } - else // use the info entered the last time - { - if ( !fontinfo.empty() && !facename.empty() ) - { - // we tried to find a match with facename -- now try without it - fontinfo = GetConfig()->Read(encName); - } - - if ( !fontinfo.empty() ) - { - if ( info->FromString(fontinfo) ) - { - if ( wxTestFontEncoding(*info) ) - { - // ok, got something - return true; - } - //else: no such fonts, look for something else - // (should we erase the outdated value?) - } - else - { - wxLogDebug(wxT("corrupted config data: string '%s' is not a valid font encoding info"), - fontinfo); - } - } - //else: there is no information in config about this encoding - } -#endif // wxUSE_CONFIG - - // now try to map this encoding to a compatible one which we have on this - // system - wxFontEncodingArray equiv = wxEncodingConverter::GetAllEquivalents(encoding); - size_t count = equiv.GetCount(); - bool foundEquivEncoding = false; - wxFontEncoding equivEncoding = wxFONTENCODING_SYSTEM; - if ( count ) - { - for ( size_t i = 0; i < count && !foundEquivEncoding; i++ ) - { - // don't test for encoding itself, we already know we don't have it - if ( equiv[i] == encoding ) - continue; - - if ( TestAltEncoding(configEntry, equiv[i], info) ) - { - equivEncoding = equiv[i]; - - foundEquivEncoding = true; - } - } - } - - // ask the user -#if wxUSE_FONTDLG - if ( interactive ) - { - wxString title(m_titleDialog); - if ( !title ) - title << wxTheApp->GetAppDisplayName() << _(": unknown encoding"); - - // built the message - wxString encDesc = GetEncodingDescription(encoding), - msg; - if ( foundEquivEncoding ) - { - // ask the user if he wants to override found alternative encoding - msg.Printf(_("No font for displaying text in encoding '%s' found,\nbut an alternative encoding '%s' is available.\nDo you want to use this encoding (otherwise you will have to choose another one)?"), - encDesc, GetEncodingDescription(equivEncoding)); - } - else - { - msg.Printf(_("No font for displaying text in encoding '%s' found.\nWould you like to select a font to be used for this encoding\n(otherwise the text in this encoding will not be shown correctly)?"), - encDesc); - } - - // the question is different in 2 cases so the answer has to be - // interpreted differently as well - int answer = foundEquivEncoding ? wxNO : wxYES; - - if ( wxMessageBox(msg, title, - wxICON_QUESTION | wxYES_NO, - m_windowParent) == answer ) - { - wxFontData data; - data.SetEncoding(encoding); - data.EncodingInfo() = *info; - wxFontDialog dialog(m_windowParent, data); - if ( dialog.ShowModal() == wxID_OK ) - { - wxFontData retData = dialog.GetFontData(); - - *info = retData.EncodingInfo(); - info->encoding = retData.GetEncoding(); - -#if wxUSE_CONFIG && wxUSE_FILECONFIG - // remember this in the config - wxFontMapperPathChanger path2(this, - FONTMAPPER_FONT_FROM_ENCODING_PATH); - if ( path2.IsOk() ) - { - GetConfig()->Write(configEntry, info->ToString()); - } -#endif // wxUSE_CONFIG - - return true; - } - //else: the user canceled the font selection dialog - } - else - { - // the user doesn't want to select a font for this encoding - // or selected to use equivalent encoding - // - // remember it to avoid asking the same question again later -#if wxUSE_CONFIG && wxUSE_FILECONFIG - wxFontMapperPathChanger path2(this, - FONTMAPPER_FONT_FROM_ENCODING_PATH); - if ( path2.IsOk() ) - { - GetConfig()->Write - ( - configEntry, - foundEquivEncoding - ? (const wxChar*)info->ToString().c_str() - : FONTMAPPER_FONT_DONT_ASK - ); - } -#endif // wxUSE_CONFIG - } - } - //else: we're in non-interactive mode -#else - wxUnusedVar(equivEncoding); -#endif // wxUSE_FONTDLG - - return foundEquivEncoding; -} - -bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding, - wxFontEncoding *encodingAlt, - const wxString& facename, - bool interactive) -{ - wxCHECK_MSG( encodingAlt, false, - wxT("wxFontEncoding::GetAltForEncoding(): NULL pointer") ); - - wxNativeEncodingInfo info; - if ( !GetAltForEncoding(encoding, &info, facename, interactive) ) - return false; - - *encodingAlt = info.encoding; - - return true; -} - -bool wxFontMapper::IsEncodingAvailable(wxFontEncoding encoding, - const wxString& facename) -{ - wxNativeEncodingInfo info; - - if ( !wxGetNativeFontEncoding(encoding, &info) ) - return false; - - info.facename = facename; - return wxTestFontEncoding(info); -} - -#endif // wxUSE_FONTMAP diff --git a/Externals/wxWidgets3/src/common/fontmgrcmn.cpp b/Externals/wxWidgets3/src/common/fontmgrcmn.cpp deleted file mode 100644 index 1559d0ad7d..0000000000 --- a/Externals/wxWidgets3/src/common/fontmgrcmn.cpp +++ /dev/null @@ -1,338 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/fontmgrcmn.cpp -// Purpose: font management for ports that don't have their own -// Author: Vaclav Slavik -// Created: 2006-11-18 -// Copyright: (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com) -// (c) 2006 REA Elektronik GmbH -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include "wx/private/fontmgr.h" - -#include "wx/listimpl.cpp" -#include "wx/hashmap.h" - -WX_DECLARE_LIST(wxFontInstance, wxFontInstanceList); -WX_DEFINE_LIST(wxFontInstanceList) -WX_DEFINE_LIST(wxFontBundleList) - -WX_DECLARE_HASH_MAP(wxString, wxFontBundle*, - wxStringHash, wxStringEqual, - wxFontBundleHashBase); -// in STL build, hash class is typedef to a template, so it can't be forward -// declared, as we do; solve it by having a dummy class: -class wxFontBundleHash : public wxFontBundleHashBase -{ -}; - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxFontFaceBase -// ---------------------------------------------------------------------------- - -wxFontFaceBase::wxFontFaceBase() - : m_refCnt(0) -{ - m_instances = new wxFontInstanceList; - m_instances->DeleteContents(true); -} - -wxFontFaceBase::~wxFontFaceBase() -{ - delete m_instances; -} - -void wxFontFaceBase::Acquire() -{ - m_refCnt++; -} - -void wxFontFaceBase::Release() -{ - if ( --m_refCnt == 0 ) - { - m_instances->Clear(); - } -} - -wxFontInstance *wxFontFaceBase::GetFontInstance(float ptSize, bool aa) -{ - wxASSERT_MSG( m_refCnt > 0, wxT("font library not loaded!") ); - - for ( wxFontInstanceList::const_iterator i = m_instances->begin(); - i != m_instances->end(); ++i ) - { - if ( (*i)->GetPointSize() == ptSize && (*i)->IsAntiAliased() == aa ) - return *i; - } - - wxFontInstance *i = CreateFontInstance(ptSize, aa); - m_instances->Append(i); - return i; -} - -// ---------------------------------------------------------------------------- -// wxFontBundleBase -// ---------------------------------------------------------------------------- - -wxFontBundleBase::wxFontBundleBase() -{ - for (int i = 0; i < FaceType_Max; i++) - m_faces[i] = NULL; -} - -wxFontBundleBase::~wxFontBundleBase() -{ - for (int i = 0; i < FaceType_Max; i++) - delete m_faces[i]; -} - -wxFontFace *wxFontBundleBase::GetFace(FaceType type) const -{ - wxFontFace *f = m_faces[type]; - - wxCHECK_MSG( f, NULL, wxT("no such face in font bundle") ); - - f->Acquire(); - - return f; -} - -wxFontFace * -wxFontBundleBase::GetFaceForFont(const wxFontMgrFontRefData& font) const -{ - wxASSERT_MSG( font.GetFaceName().empty() || - GetName().CmpNoCase(font.GetFaceName()) == 0, - wxT("calling GetFaceForFont for incompatible font") ); - - int type = FaceType_Regular; - - if ( font.GetWeight() == wxFONTWEIGHT_BOLD ) - type |= FaceType_Bold; - - // FIXME -- this should read "if ( font->GetStyle() == wxFONTSTYLE_ITALIC )", - // but since DFB doesn't support slant, we try to display it with italic - // face (better than nothing...) - if ( font.GetStyle() == wxFONTSTYLE_ITALIC - || font.GetStyle() == wxFONTSTYLE_SLANT ) - { - if ( HasFace((FaceType)(type | FaceType_Italic)) ) - type |= FaceType_Italic; - } - - if ( !HasFace((FaceType)type) ) - { - // if we can't get the exact font requested, substitute it with - // some other variant: - for (int i = 0; i < FaceType_Max; i++) - { - if ( HasFace((FaceType)i) ) - return GetFace((FaceType)i); - } - - wxFAIL_MSG( wxT("no face") ); - return NULL; - } - - return GetFace((FaceType)type); -} - -// ---------------------------------------------------------------------------- -// wxFontsManagerBase -// ---------------------------------------------------------------------------- - -wxFontsManager *wxFontsManagerBase::ms_instance = NULL; - -wxFontsManagerBase::wxFontsManagerBase() -{ - m_hash = new wxFontBundleHash(); - m_list = new wxFontBundleList; - m_list->DeleteContents(true); -} - -wxFontsManagerBase::~wxFontsManagerBase() -{ - delete m_hash; - delete m_list; -} - -/* static */ -wxFontsManager *wxFontsManagerBase::Get() -{ - if ( !ms_instance ) - ms_instance = new wxFontsManager(); - return ms_instance; -} - -/* static */ -void wxFontsManagerBase::CleanUp() -{ - wxDELETE(ms_instance); -} - -wxFontBundle *wxFontsManagerBase::GetBundle(const wxString& name) const -{ - return (*m_hash)[name.Lower()]; -} - -wxFontBundle * -wxFontsManagerBase::GetBundleForFont(const wxFontMgrFontRefData& font) const -{ - wxFontBundle *bundle = NULL; - - wxString facename = font.GetFaceName(); - if ( !facename.empty() ) - bundle = GetBundle(facename); - - if ( !bundle ) - { - facename = GetDefaultFacename((wxFontFamily)font.GetFamily()); - if ( !facename.empty() ) - bundle = GetBundle(facename); - } - - if ( !bundle ) - { - if ( m_list->GetFirst() ) - bundle = m_list->GetFirst()->GetData(); - else - wxFAIL_MSG(wxT("Fatal error, no fonts available!")); - } - - return bundle; -} - -void wxFontsManagerBase::AddBundle(wxFontBundle *bundle) -{ - (*m_hash)[bundle->GetName().Lower()] = bundle; - m_list->Append(bundle); -} - - -// ---------------------------------------------------------------------------- -// wxFontMgrFontRefData -// ---------------------------------------------------------------------------- - -wxFontMgrFontRefData::wxFontMgrFontRefData(int size, - wxFontFamily family, - wxFontStyle style, - wxFontWeight weight, - bool underlined, - const wxString& faceName, - wxFontEncoding encoding) -{ - if ( family == wxFONTFAMILY_DEFAULT ) - family = wxFONTFAMILY_SWISS; - if ( size == wxDEFAULT ) - size = 12; - - m_info.family = (wxFontFamily)family; - m_info.faceName = faceName; - m_info.style = (wxFontStyle)style; - m_info.weight = (wxFontWeight)weight; - m_info.pointSize = size; - m_info.underlined = underlined; - m_info.encoding = encoding; - - m_fontFace = NULL; - m_fontBundle = NULL; - m_fontValid = false; -} - -wxFontMgrFontRefData::wxFontMgrFontRefData(const wxFontMgrFontRefData& data) -{ - m_info = data.m_info; - - m_fontFace = data.m_fontFace; - m_fontBundle = data.m_fontBundle; - m_fontValid = data.m_fontValid; - if ( m_fontFace ) - m_fontFace->Acquire(); -} - -wxFontMgrFontRefData::~wxFontMgrFontRefData() -{ - if ( m_fontFace ) - m_fontFace->Release(); -} - -wxFontBundle *wxFontMgrFontRefData::GetFontBundle() const -{ - wxConstCast(this, wxFontMgrFontRefData)->EnsureValidFont(); - return m_fontBundle; -} - -wxFontInstance * -wxFontMgrFontRefData::GetFontInstance(float scale, bool antialiased) const -{ - wxConstCast(this, wxFontMgrFontRefData)->EnsureValidFont(); - return m_fontFace->GetFontInstance(m_info.pointSize * scale, - antialiased); -} - -void wxFontMgrFontRefData::SetPointSize(int pointSize) -{ - m_info.pointSize = pointSize; - m_fontValid = false; -} - -void wxFontMgrFontRefData::SetFamily(wxFontFamily family) -{ - m_info.family = family; - m_fontValid = false; -} - -void wxFontMgrFontRefData::SetStyle(wxFontStyle style) -{ - m_info.style = style; - m_fontValid = false; -} - -void wxFontMgrFontRefData::SetWeight(wxFontWeight weight) -{ - m_info.weight = weight; - m_fontValid = false; -} - -void wxFontMgrFontRefData::SetFaceName(const wxString& faceName) -{ - m_info.faceName = faceName; - m_fontValid = false; -} - -void wxFontMgrFontRefData::SetUnderlined(bool underlined) -{ - m_info.underlined = underlined; - m_fontValid = false; -} - -void wxFontMgrFontRefData::SetEncoding(wxFontEncoding encoding) -{ - m_info.encoding = encoding; - m_fontValid = false; -} - -void wxFontMgrFontRefData::EnsureValidFont() -{ - if ( !m_fontValid ) - { - wxFontFace *old = m_fontFace; - - m_fontBundle = wxFontsManager::Get()->GetBundleForFont(*this); - m_fontFace = m_fontBundle->GetFaceForFont(*this); - - if ( old ) - old->Release(); - } -} diff --git a/Externals/wxWidgets3/src/common/fontpickercmn.cpp b/Externals/wxWidgets3/src/common/fontpickercmn.cpp deleted file mode 100644 index 3e7e1f849c..0000000000 --- a/Externals/wxWidgets3/src/common/fontpickercmn.cpp +++ /dev/null @@ -1,169 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/fontpickercmn.cpp -// Purpose: wxFontPickerCtrl class implementation -// Author: Francesco Montorsi -// Modified by: -// Created: 15/04/2006 -// Copyright: (c) Francesco Montorsi -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_FONTPICKERCTRL - -#include "wx/fontpicker.h" - -#ifndef WX_PRECOMP - #include "wx/textctrl.h" -#endif - -#include "wx/fontenum.h" -#include "wx/tokenzr.h" - -// ============================================================================ -// implementation -// ============================================================================ - -const char wxFontPickerCtrlNameStr[] = "fontpicker"; -const char wxFontPickerWidgetNameStr[] = "fontpickerwidget"; - -wxDEFINE_EVENT(wxEVT_FONTPICKER_CHANGED, wxFontPickerEvent); -wxIMPLEMENT_DYNAMIC_CLASS(wxFontPickerCtrl, wxPickerBase); -wxIMPLEMENT_DYNAMIC_CLASS(wxFontPickerEvent, wxCommandEvent); - -// ---------------------------------------------------------------------------- -// wxFontPickerCtrl -// ---------------------------------------------------------------------------- - -bool wxFontPickerCtrl::Create( wxWindow *parent, wxWindowID id, - const wxFont &initial, - const wxPoint &pos, const wxSize &size, - long style, const wxValidator& validator, - const wxString &name ) -{ - if (!wxPickerBase::CreateBase(parent, id, - Font2String(initial.IsOk() ? initial - : *wxNORMAL_FONT), - pos, size, style, validator, name)) - return false; - - // the picker of a wxFontPickerCtrl is a wxFontPickerWidget - m_picker = new wxFontPickerWidget(this, wxID_ANY, initial, - wxDefaultPosition, wxDefaultSize, - GetPickerStyle(style)); - // complete sizer creation - wxPickerBase::PostCreation(); - - m_picker->Connect(wxEVT_FONTPICKER_CHANGED, - wxFontPickerEventHandler(wxFontPickerCtrl::OnFontChange), - NULL, this); - - return true; -} - -wxString wxFontPickerCtrl::Font2String(const wxFont &f) -{ - wxString ret = f.GetNativeFontInfoUserDesc(); -#ifdef __WXMSW__ - // on wxMSW the encoding of the font is appended at the end of the string; - // since encoding is not very user-friendly we remove it. - wxFontEncoding enc = f.GetEncoding(); - if ( enc != wxFONTENCODING_DEFAULT && enc != wxFONTENCODING_SYSTEM ) - ret = ret.BeforeLast(wxT(' ')); -#endif - return ret; -} - -wxFont wxFontPickerCtrl::String2Font(const wxString &s) -{ - wxString str(s); - wxFont ret; - double n; - - // put a limit on the maximum point size which the user can enter - // NOTE: we suppose the last word of given string is the pointsize - wxString size = str.AfterLast(wxT(' ')); - if (size.ToDouble(&n)) - { - if (n < 1) - str = str.Left(str.length() - size.length()) + wxT("1"); - else if (n >= m_nMaxPointSize) - str = str.Left(str.length() - size.length()) + - wxString::Format(wxT("%d"), m_nMaxPointSize); - } - - if (!ret.SetNativeFontInfoUserDesc(str)) - return wxNullFont; - - return ret; -} - -void wxFontPickerCtrl::SetSelectedFont(const wxFont &f) -{ - GetPickerWidget()->SetSelectedFont(f); - UpdateTextCtrlFromPicker(); -} - -void wxFontPickerCtrl::UpdatePickerFromTextCtrl() -{ - wxASSERT(m_text); - - // NB: we don't use the wxFont::wxFont(const wxString &) constructor - // since that constructor expects the native font description - // string returned by wxFont::GetNativeFontInfoDesc() and not - // the user-friendly one returned by wxFont::GetNativeFontInfoUserDesc() - wxFont f = String2Font(m_text->GetValue()); - if (!f.IsOk()) - return; // invalid user input - - if (GetPickerWidget()->GetSelectedFont() != f) - { - GetPickerWidget()->SetSelectedFont(f); - - // fire an event - wxFontPickerEvent event(this, GetId(), f); - GetEventHandler()->ProcessEvent(event); - } -} - -void wxFontPickerCtrl::UpdateTextCtrlFromPicker() -{ - if (!m_text) - return; // no textctrl to update - - // Take care to use ChangeValue() here and not SetValue() to avoid - // infinite recursion. - m_text->ChangeValue(Font2String(GetPickerWidget()->GetSelectedFont())); -} - - - -// ---------------------------------------------------------------------------- -// wxFontPickerCtrl - event handlers -// ---------------------------------------------------------------------------- - -void wxFontPickerCtrl::OnFontChange(wxFontPickerEvent &ev) -{ - UpdateTextCtrlFromPicker(); - - // the wxFontPickerWidget sent us a colour-change notification. - // forward this event to our parent - wxFontPickerEvent event(this, GetId(), ev.GetFont()); - GetEventHandler()->ProcessEvent(event); -} - -#endif // wxUSE_FONTPICKERCTRL diff --git a/Externals/wxWidgets3/src/common/fontutilcmn.cpp b/Externals/wxWidgets3/src/common/fontutilcmn.cpp deleted file mode 100644 index f13e717862..0000000000 --- a/Externals/wxWidgets3/src/common/fontutilcmn.cpp +++ /dev/null @@ -1,65 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/fontutilcmn.cpp -// Purpose: Font helper functions common for all ports -// Author: Vaclav Slavik -// Modified by: -// Created: 2006-12-20 -// Copyright: (c) Vadim Zeitlin, Vaclav Slavik -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include "wx/fontutil.h" -#include "wx/encinfo.h" - -// ============================================================================ -// implementation -// ============================================================================ - -#ifdef wxHAS_UTF8_FONTS - -// ---------------------------------------------------------------------------- -// wxNativeEncodingInfo -// ---------------------------------------------------------------------------- - -bool wxNativeEncodingInfo::FromString(const wxString& WXUNUSED(s)) -{ - return false; -} - -wxString wxNativeEncodingInfo::ToString() const -{ - return wxEmptyString; -} - -bool wxTestFontEncoding(const wxNativeEncodingInfo& WXUNUSED(info)) -{ - return true; -} - -bool wxGetNativeFontEncoding(wxFontEncoding encoding, - wxNativeEncodingInfo *info) -{ - // all encodings are available because we translate text in any encoding to - // UTF-8 internally anyhow - info->facename.clear(); - info->encoding = encoding; - - return true; -} - -#endif // wxHAS_UTF8_FONTS diff --git a/Externals/wxWidgets3/src/common/framecmn.cpp b/Externals/wxWidgets3/src/common/framecmn.cpp deleted file mode 100644 index d4ad7d58dd..0000000000 --- a/Externals/wxWidgets3/src/common/framecmn.cpp +++ /dev/null @@ -1,682 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/framecmn.cpp -// Purpose: common (for all platforms) wxFrame functions -// Author: Julian Smart, Vadim Zeitlin -// Created: 01/02/97 -// Copyright: (c) 1998 Robert Roebling and Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include "wx/frame.h" - -#ifndef WX_PRECOMP - #include "wx/app.h" - #include "wx/menu.h" - #include "wx/menuitem.h" - #include "wx/dcclient.h" - #include "wx/toolbar.h" - #include "wx/statusbr.h" -#endif // WX_PRECOMP - -extern WXDLLEXPORT_DATA(const char) wxFrameNameStr[] = "frame"; -extern WXDLLEXPORT_DATA(const char) wxStatusLineNameStr[] = "status_line"; - -// ---------------------------------------------------------------------------- -// event table -// ---------------------------------------------------------------------------- - -#if wxUSE_MENUS - -#if wxUSE_STATUSBAR -wxBEGIN_EVENT_TABLE(wxFrameBase, wxTopLevelWindow) - EVT_MENU_OPEN(wxFrameBase::OnMenuOpen) - EVT_MENU_CLOSE(wxFrameBase::OnMenuClose) - - EVT_MENU_HIGHLIGHT_ALL(wxFrameBase::OnMenuHighlight) -wxEND_EVENT_TABLE() -#endif // wxUSE_STATUSBAR - -/* static */ -bool wxFrameBase::ShouldUpdateMenuFromIdle() -{ - // Usually this is determined at compile time and is determined by whether - // the platform supports wxEVT_MENU_OPEN, however in wxGTK we need to also - // check if we're using the global menu bar as we don't get EVT_MENU_OPEN - // for it and need to fall back to idle time updating even if normally - // wxUSE_IDLEMENUUPDATES is set to 0 for wxGTK. -#ifdef __WXGTK20__ - if ( wxApp::GTKIsUsingGlobalMenu() ) - return true; -#endif // !__WXGTK__ - - return wxUSE_IDLEMENUUPDATES != 0; -} - -#endif // wxUSE_MENUS - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// XTI -// ---------------------------------------------------------------------------- - -wxDEFINE_FLAGS( wxFrameStyle ) -wxBEGIN_FLAGS( wxFrameStyle ) -// new style border flags, we put them first to -// use them for streaming out -wxFLAGS_MEMBER(wxBORDER_SIMPLE) -wxFLAGS_MEMBER(wxBORDER_SUNKEN) -wxFLAGS_MEMBER(wxBORDER_DOUBLE) -wxFLAGS_MEMBER(wxBORDER_RAISED) -wxFLAGS_MEMBER(wxBORDER_STATIC) -wxFLAGS_MEMBER(wxBORDER_NONE) - -// old style border flags -wxFLAGS_MEMBER(wxSIMPLE_BORDER) -wxFLAGS_MEMBER(wxSUNKEN_BORDER) -wxFLAGS_MEMBER(wxDOUBLE_BORDER) -wxFLAGS_MEMBER(wxRAISED_BORDER) -wxFLAGS_MEMBER(wxSTATIC_BORDER) -wxFLAGS_MEMBER(wxBORDER) - -// standard window styles -wxFLAGS_MEMBER(wxTAB_TRAVERSAL) -wxFLAGS_MEMBER(wxCLIP_CHILDREN) -wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) -wxFLAGS_MEMBER(wxWANTS_CHARS) -wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE) -wxFLAGS_MEMBER(wxALWAYS_SHOW_SB ) -wxFLAGS_MEMBER(wxVSCROLL) -wxFLAGS_MEMBER(wxHSCROLL) - -// frame styles -wxFLAGS_MEMBER(wxSTAY_ON_TOP) -wxFLAGS_MEMBER(wxCAPTION) -wxFLAGS_MEMBER(wxSYSTEM_MENU) -wxFLAGS_MEMBER(wxRESIZE_BORDER) -wxFLAGS_MEMBER(wxCLOSE_BOX) -wxFLAGS_MEMBER(wxMAXIMIZE_BOX) -wxFLAGS_MEMBER(wxMINIMIZE_BOX) - -wxFLAGS_MEMBER(wxFRAME_TOOL_WINDOW) -wxFLAGS_MEMBER(wxFRAME_FLOAT_ON_PARENT) - -wxFLAGS_MEMBER(wxFRAME_SHAPED) -wxEND_FLAGS( wxFrameStyle ) - -wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxFrame, wxTopLevelWindow, "wx/frame.h"); - -wxBEGIN_PROPERTIES_TABLE(wxFrame) -wxEVENT_PROPERTY( Menu, wxEVT_MENU, wxCommandEvent) - -wxPROPERTY( Title,wxString, SetTitle, GetTitle, wxString(), 0 /*flags*/, \ - wxT("Helpstring"), wxT("group")) -wxPROPERTY_FLAGS( WindowStyle, wxFrameStyle, long, SetWindowStyleFlag, \ - GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \ - wxT("Helpstring"), wxT("group")) // style -#if wxUSE_MENUS -wxPROPERTY( MenuBar, wxMenuBar *, SetMenuBar, GetMenuBar, wxEMPTY_PARAMETER_VALUE, \ - 0 /*flags*/, wxT("Helpstring"), wxT("group")) -#endif -wxEND_PROPERTIES_TABLE() - -wxEMPTY_HANDLERS_TABLE(wxFrame) - -wxCONSTRUCTOR_6( wxFrame, wxWindow*, Parent, wxWindowID, Id, wxString, Title, \ - wxPoint, Position, wxSize, Size, long, WindowStyle) - -// ---------------------------------------------------------------------------- -// construction/destruction -// ---------------------------------------------------------------------------- - -wxFrameBase::wxFrameBase() -{ -#if wxUSE_MENUS - m_frameMenuBar = NULL; -#endif // wxUSE_MENUS - -#if wxUSE_TOOLBAR - m_frameToolBar = NULL; -#endif // wxUSE_TOOLBAR - -#if wxUSE_STATUSBAR - m_frameStatusBar = NULL; -#endif // wxUSE_STATUSBAR - - m_statusBarPane = 0; -} - -wxFrameBase::~wxFrameBase() -{ - SendDestroyEvent(); - - DeleteAllBars(); -} - -wxFrame *wxFrameBase::New(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) -{ - return new wxFrame(parent, id, title, pos, size, style, name); -} - -void wxFrameBase::DeleteAllBars() -{ -#if wxUSE_MENUS - wxDELETE(m_frameMenuBar); -#endif // wxUSE_MENUS - -#if wxUSE_STATUSBAR - wxDELETE(m_frameStatusBar); -#endif // wxUSE_STATUSBAR - -#if wxUSE_TOOLBAR - wxDELETE(m_frameToolBar); -#endif // wxUSE_TOOLBAR -} - -bool wxFrameBase::IsOneOfBars(const wxWindow *win) const -{ -#if wxUSE_MENUS - if ( win == GetMenuBar() ) - return true; -#endif // wxUSE_MENUS - -#if wxUSE_STATUSBAR - if ( win == GetStatusBar() ) - return true; -#endif // wxUSE_STATUSBAR - -#if wxUSE_TOOLBAR - if ( win == GetToolBar() ) - return true; -#endif // wxUSE_TOOLBAR - - wxUnusedVar(win); - - return false; -} - -// ---------------------------------------------------------------------------- -// wxFrame size management: we exclude the areas taken by menu/status/toolbars -// from the client area, so the client area is what's really available for the -// frame contents -// ---------------------------------------------------------------------------- - -// get the origin of the client area in the client coordinates -wxPoint wxFrameBase::GetClientAreaOrigin() const -{ - wxPoint pt = wxTopLevelWindow::GetClientAreaOrigin(); - -#if wxUSE_TOOLBAR && !defined(__WXUNIVERSAL__) - wxToolBar *toolbar = GetToolBar(); - if ( toolbar && toolbar->IsShown() ) - { - int w, h; - toolbar->GetSize(&w, &h); - - if ( toolbar->GetWindowStyleFlag() & wxTB_VERTICAL ) - { - pt.x += w; - } - else - { - pt.y += h; - } - } -#endif // wxUSE_TOOLBAR - - return pt; -} - -// ---------------------------------------------------------------------------- -// misc -// ---------------------------------------------------------------------------- - -#if wxUSE_MENUS - -bool wxFrameBase::ProcessCommand(int id) -{ - wxMenuItem* const item = FindItemInMenuBar(id); - if ( !item ) - return false; - - return ProcessCommand(item); -} - -bool wxFrameBase::ProcessCommand(wxMenuItem *item) -{ - wxCHECK_MSG( item, false, wxS("Menu item can't be NULL") ); - - if (!item->IsEnabled()) - return true; - - if ((item->GetKind() == wxITEM_RADIO) && item->IsChecked() ) - return true; - - int checked; - if (item->IsCheckable()) - { - item->Toggle(); - - // use the new value - checked = item->IsChecked(); - } - else // Uncheckable item. - { - checked = -1; - } - - wxMenu* const menu = item->GetMenu(); - wxCHECK_MSG( menu, false, wxS("Menu item should be attached to a menu") ); - - return menu->SendEvent(item->GetId(), checked); -} - -#endif // wxUSE_MENUS - -// Do the UI update processing for this window. This is -// provided for the application to call if it wants to -// force a UI update, particularly for the menus and toolbar. -void wxFrameBase::UpdateWindowUI(long flags) -{ - wxWindowBase::UpdateWindowUI(flags); - -#if wxUSE_TOOLBAR - if (GetToolBar()) - GetToolBar()->UpdateWindowUI(flags); -#endif - -#if wxUSE_MENUS - if (GetMenuBar()) - { - // If coming from an idle event, we only want to update the menus if - // we're in the wxUSE_IDLEMENUUPDATES configuration, otherwise they - // will be update when the menu is opened later - if ( !(flags & wxUPDATE_UI_FROMIDLE) || ShouldUpdateMenuFromIdle() ) - DoMenuUpdates(); - } -#endif // wxUSE_MENUS -} - -// ---------------------------------------------------------------------------- -// event handlers for status bar updates from menus -// ---------------------------------------------------------------------------- - -#if wxUSE_MENUS && wxUSE_STATUSBAR - -void wxFrameBase::OnMenuHighlight(wxMenuEvent& event) -{ - event.Skip(); - -#if wxUSE_STATUSBAR - (void)ShowMenuHelp(event.GetMenuId()); -#endif // wxUSE_STATUSBAR -} - -void wxFrameBase::OnMenuOpen(wxMenuEvent& event) -{ - event.Skip(); - - if ( !ShouldUpdateMenuFromIdle() ) - { - // as we didn't update the menus from idle time, do it now - DoMenuUpdates(event.GetMenu()); - } -} - -void wxFrameBase::OnMenuClose(wxMenuEvent& event) -{ - event.Skip(); - - DoGiveHelp(wxEmptyString, false); -} - -#endif // wxUSE_MENUS && wxUSE_STATUSBAR - -// Implement internal behaviour (menu updating on some platforms) -void wxFrameBase::OnInternalIdle() -{ - wxTopLevelWindow::OnInternalIdle(); - -#if wxUSE_MENUS - if ( ShouldUpdateMenuFromIdle() && wxUpdateUIEvent::CanUpdate(this) ) - DoMenuUpdates(); -#endif -} - -// ---------------------------------------------------------------------------- -// status bar stuff -// ---------------------------------------------------------------------------- - -#if wxUSE_STATUSBAR - -wxStatusBar* wxFrameBase::CreateStatusBar(int number, - long style, - wxWindowID id, - const wxString& name) -{ - // the main status bar can only be created once (or else it should be - // deleted before calling CreateStatusBar() again) - wxCHECK_MSG( !m_frameStatusBar, NULL, - wxT("recreating status bar in wxFrame") ); - - SetStatusBar(OnCreateStatusBar(number, style, id, name)); - - return m_frameStatusBar; -} - -wxStatusBar *wxFrameBase::OnCreateStatusBar(int number, - long style, - wxWindowID id, - const wxString& name) -{ - wxStatusBar *statusBar = new wxStatusBar(this, id, style, name); - - statusBar->SetFieldsCount(number); - - return statusBar; -} - -void wxFrameBase::SetStatusText(const wxString& text, int number) -{ - wxCHECK_RET( m_frameStatusBar != NULL, wxT("no statusbar to set text for") ); - - m_frameStatusBar->SetStatusText(text, number); -} - -void wxFrameBase::SetStatusWidths(int n, const int widths_field[] ) -{ - wxCHECK_RET( m_frameStatusBar != NULL, wxT("no statusbar to set widths for") ); - - m_frameStatusBar->SetStatusWidths(n, widths_field); - - PositionStatusBar(); -} - -void wxFrameBase::PushStatusText(const wxString& text, int number) -{ - wxCHECK_RET( m_frameStatusBar != NULL, wxT("no statusbar to set text for") ); - - m_frameStatusBar->PushStatusText(text, number); -} - -void wxFrameBase::PopStatusText(int number) -{ - wxCHECK_RET( m_frameStatusBar != NULL, wxT("no statusbar to set text for") ); - - m_frameStatusBar->PopStatusText(number); -} - -bool wxFrameBase::ShowMenuHelp(int menuId) -{ -#if wxUSE_MENUS - // if no help string found, we will clear the status bar text - // - // NB: wxID_NONE is used for (sub)menus themselves by wxMSW - wxString helpString; - if ( menuId != wxID_SEPARATOR && menuId != wxID_NONE ) - { - const wxMenuItem * const item = FindItemInMenuBar(menuId); - if ( item && !item->IsSeparator() ) - helpString = item->GetHelp(); - - // notice that it's ok if we don't find the item because it might - // belong to the popup menu, so don't assert here - } - - DoGiveHelp(helpString, true); - - return !helpString.empty(); -#else // !wxUSE_MENUS - return false; -#endif // wxUSE_MENUS/!wxUSE_MENUS -} - -void wxFrameBase::SetStatusBar(wxStatusBar *statBar) -{ - bool hadBar = m_frameStatusBar != NULL; - m_frameStatusBar = statBar; - - if ( (m_frameStatusBar != NULL) != hadBar ) - { - PositionStatusBar(); - - DoLayout(); - } -} - -#endif // wxUSE_STATUSBAR - -#if wxUSE_MENUS || wxUSE_TOOLBAR -void wxFrameBase::DoGiveHelp(const wxString& help, bool show) -{ -#if wxUSE_STATUSBAR - if ( m_statusBarPane < 0 ) - { - // status bar messages disabled - return; - } - - wxStatusBar *statbar = GetStatusBar(); - if ( !statbar ) - return; - - wxString text; - if ( show ) - { - // remember the old status bar text if this is the first time we're - // called since the menu has been opened as we're going to overwrite it - // in our DoGiveHelp() and we want to restore it when the menu is - // closed - // - // note that it would be logical to do this in OnMenuOpen() but under - // MSW we get an EVT_MENU_HIGHLIGHT before EVT_MENU_OPEN, strangely - // enough, and so this doesn't work and instead we use the ugly trick - // with using special m_oldStatusText value as "menu opened" (but it is - // arguably better than adding yet another member variable to wxFrame - // on all platforms) - if ( m_oldStatusText.empty() ) - { - m_oldStatusText = statbar->GetStatusText(m_statusBarPane); - if ( m_oldStatusText.empty() ) - { - // use special value to prevent us from doing this the next time - m_oldStatusText += wxT('\0'); - } - } - - m_lastHelpShown = - text = help; - } - else // hide help, restore the original text - { - // clear the last shown help string but remember its value - wxString lastHelpShown; - lastHelpShown.swap(m_lastHelpShown); - - // also clear the old status text but remember it too to restore it - // below - text.swap(m_oldStatusText); - - if ( statbar->GetStatusText(m_statusBarPane) != lastHelpShown ) - { - // if the text was changed with an explicit SetStatusText() call - // from the user code in the meanwhile, do not overwrite it with - // the old status bar contents -- this is almost certainly not what - // the user expects and would be very hard to avoid from user code - return; - } - } - - statbar->SetStatusText(text, m_statusBarPane); -#else - wxUnusedVar(help); - wxUnusedVar(show); -#endif // wxUSE_STATUSBAR -} -#endif // wxUSE_MENUS || wxUSE_TOOLBAR - - -// ---------------------------------------------------------------------------- -// toolbar stuff -// ---------------------------------------------------------------------------- - -#if wxUSE_TOOLBAR - -wxToolBar* wxFrameBase::CreateToolBar(long style, - wxWindowID id, - const wxString& name) -{ - // the main toolbar can't be recreated (unless it was explicitly deleted - // before) - wxCHECK_MSG( !m_frameToolBar, NULL, - wxT("recreating toolbar in wxFrame") ); - - if ( style == -1 ) - { - // use default style - // - // NB: we don't specify the default value in the method declaration - // because - // a) this allows us to have different defaults for different - // platforms (even if we don't have them right now) - // b) we don't need to include wx/toolbar.h in the header then - style = wxTB_DEFAULT_STYLE; - } - - SetToolBar(OnCreateToolBar(style, id, name)); - - return m_frameToolBar; -} - -wxToolBar* wxFrameBase::OnCreateToolBar(long style, - wxWindowID id, - const wxString& name) -{ - return new wxToolBar(this, id, - wxDefaultPosition, wxDefaultSize, - style, name); -} - -void wxFrameBase::SetToolBar(wxToolBar *toolbar) -{ - if ( (toolbar != NULL) != (m_frameToolBar != NULL) ) - { - // the toolbar visibility must have changed so we need to both position - // the toolbar itself (if it appeared) and to relayout the frame - // contents in any case - - if ( toolbar ) - { - // we need to assign it to m_frameToolBar for PositionToolBar() to - // do anything - m_frameToolBar = toolbar; - PositionToolBar(); - } - //else: tricky: do not reset m_frameToolBar yet as otherwise DoLayout() - // wouldn't recognize the (still existing) toolbar as one of our - // bars and wouldn't layout the single child of the frame correctly - - - // and this is even more tricky: we want DoLayout() to recognize the - // old toolbar for the purpose of not counting it among our non-bar - // children but we don't want to reserve any more space for it so we - // temporarily hide it - if ( m_frameToolBar ) - m_frameToolBar->Hide(); - - DoLayout(); - - if ( m_frameToolBar ) - m_frameToolBar->Show(); - } - - // this might have been already done above but it's simpler to just always - // do it unconditionally instead of testing for whether we already did it - m_frameToolBar = toolbar; -} - -#endif // wxUSE_TOOLBAR - -// ---------------------------------------------------------------------------- -// menus -// ---------------------------------------------------------------------------- - -#if wxUSE_MENUS - -// update all menus -void wxFrameBase::DoMenuUpdates(wxMenu* menu) -{ - if (menu) - { - menu->UpdateUI(); - } - else - { - wxMenuBar* bar = GetMenuBar(); - if (bar != NULL) - bar->UpdateMenus(); - } -} - -void wxFrameBase::DetachMenuBar() -{ - if ( m_frameMenuBar ) - { - m_frameMenuBar->Detach(); - m_frameMenuBar = NULL; - } -} - -void wxFrameBase::AttachMenuBar(wxMenuBar *menubar) -{ - if ( menubar ) - { - menubar->Attach((wxFrame *)this); - m_frameMenuBar = menubar; - } -} - -void wxFrameBase::SetMenuBar(wxMenuBar *menubar) -{ - if ( menubar == GetMenuBar() ) - { - // nothing to do - return; - } - - DetachMenuBar(); - - this->AttachMenuBar(menubar); -} - -wxMenuItem *wxFrameBase::FindItemInMenuBar(int menuId) const -{ - const wxMenuBar * const menuBar = GetMenuBar(); - - return menuBar ? menuBar->FindItem(menuId) : NULL; -} - -#endif // wxUSE_MENUS diff --git a/Externals/wxWidgets3/src/common/fs_arc.cpp b/Externals/wxWidgets3/src/common/fs_arc.cpp deleted file mode 100644 index 14f3134b5f..0000000000 --- a/Externals/wxWidgets3/src/common/fs_arc.cpp +++ /dev/null @@ -1,523 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/fs_arc.cpp -// Purpose: wxArchive file system -// Author: Vaclav Slavik, Mike Wetherell -// Copyright: (c) 1999 Vaclav Slavik, (c) 2006 Mike Wetherell -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ -#pragma hdrstop -#endif - -#if wxUSE_FS_ARCHIVE - -#include "wx/fs_arc.h" - -#ifndef WX_PRECOMP - #include "wx/intl.h" - #include "wx/log.h" -#endif - -#include "wx/archive.h" -#include "wx/private/fileback.h" - -//--------------------------------------------------------------------------- -// wxArchiveFSCacheDataImpl -// -// Holds the catalog of an archive file, and if it is being read from a -// non-seekable stream, a copy of its backing file. -// -// This class is actually the reference counted implementation for the -// wxArchiveFSCacheData class below. It was done that way to allow sharing -// between instances of wxFileSystem, though that's a feature not used in this -// version. -//--------------------------------------------------------------------------- - -WX_DECLARE_STRING_HASH_MAP(wxArchiveEntry*, wxArchiveFSEntryHash); - -struct wxArchiveFSEntry -{ - wxArchiveEntry *entry; - wxArchiveFSEntry *next; -}; - -class wxArchiveFSCacheDataImpl -{ -public: - wxArchiveFSCacheDataImpl(const wxArchiveClassFactory& factory, - const wxBackingFile& backer); - wxArchiveFSCacheDataImpl(const wxArchiveClassFactory& factory, - wxInputStream *stream); - - ~wxArchiveFSCacheDataImpl(); - - void Release() { if (--m_refcount == 0) delete this; } - wxArchiveFSCacheDataImpl *AddRef() { m_refcount++; return this; } - - wxArchiveEntry *Get(const wxString& name); - wxInputStream *NewStream() const; - - wxArchiveFSEntry *GetNext(wxArchiveFSEntry *fse); - -private: - wxArchiveFSEntry *AddToCache(wxArchiveEntry *entry); - void CloseStreams(); - - int m_refcount; - - wxArchiveFSEntryHash m_hash; - wxArchiveFSEntry *m_begin; - wxArchiveFSEntry **m_endptr; - - wxBackingFile m_backer; - wxInputStream *m_stream; - wxArchiveInputStream *m_archive; -}; - -wxArchiveFSCacheDataImpl::wxArchiveFSCacheDataImpl( - const wxArchiveClassFactory& factory, - const wxBackingFile& backer) - : m_refcount(1), - m_begin(NULL), - m_endptr(&m_begin), - m_backer(backer), - m_stream(new wxBackedInputStream(backer)), - m_archive(factory.NewStream(*m_stream)) -{ -} - -wxArchiveFSCacheDataImpl::wxArchiveFSCacheDataImpl( - const wxArchiveClassFactory& factory, - wxInputStream *stream) - : m_refcount(1), - m_begin(NULL), - m_endptr(&m_begin), - m_stream(stream), - m_archive(factory.NewStream(*m_stream)) -{ -} - -wxArchiveFSCacheDataImpl::~wxArchiveFSCacheDataImpl() -{ - WX_CLEAR_HASH_MAP(wxArchiveFSEntryHash, m_hash); - - wxArchiveFSEntry *entry = m_begin; - - while (entry) - { - wxArchiveFSEntry *next = entry->next; - delete entry; - entry = next; - } - - CloseStreams(); -} - -wxArchiveFSEntry *wxArchiveFSCacheDataImpl::AddToCache(wxArchiveEntry *entry) -{ - m_hash[entry->GetName(wxPATH_UNIX)] = entry; - wxArchiveFSEntry *fse = new wxArchiveFSEntry; - *m_endptr = fse; - (*m_endptr)->entry = entry; - (*m_endptr)->next = NULL; - m_endptr = &(*m_endptr)->next; - return fse; -} - -void wxArchiveFSCacheDataImpl::CloseStreams() -{ - wxDELETE(m_archive); - wxDELETE(m_stream); -} - -wxArchiveEntry *wxArchiveFSCacheDataImpl::Get(const wxString& name) -{ - wxArchiveFSEntryHash::iterator it = m_hash.find(name); - - if (it != m_hash.end()) - return it->second; - - if (!m_archive) - return NULL; - - wxArchiveEntry *entry; - - while ((entry = m_archive->GetNextEntry()) != NULL) - { - AddToCache(entry); - - if (entry->GetName(wxPATH_UNIX) == name) - return entry; - } - - CloseStreams(); - - return NULL; -} - -wxInputStream* wxArchiveFSCacheDataImpl::NewStream() const -{ - if (m_backer) - return new wxBackedInputStream(m_backer); - else - return NULL; -} - -wxArchiveFSEntry *wxArchiveFSCacheDataImpl::GetNext(wxArchiveFSEntry *fse) -{ - wxArchiveFSEntry *next = fse ? fse->next : m_begin; - - if (!next && m_archive) - { - wxArchiveEntry *entry = m_archive->GetNextEntry(); - - if (entry) - next = AddToCache(entry); - else - CloseStreams(); - } - - return next; -} - -//--------------------------------------------------------------------------- -// wxArchiveFSCacheData -// -// This is the inteface for wxArchiveFSCacheDataImpl above. Holds the catalog -// of an archive file, and if it is being read from a non-seekable stream, a -// copy of its backing file. -//--------------------------------------------------------------------------- - -class wxArchiveFSCacheData -{ -public: - wxArchiveFSCacheData() : m_impl(NULL) { } - wxArchiveFSCacheData(const wxArchiveClassFactory& factory, - const wxBackingFile& backer); - wxArchiveFSCacheData(const wxArchiveClassFactory& factory, - wxInputStream *stream); - - wxArchiveFSCacheData(const wxArchiveFSCacheData& data); - wxArchiveFSCacheData& operator=(const wxArchiveFSCacheData& data); - - ~wxArchiveFSCacheData() { if (m_impl) m_impl->Release(); } - - wxArchiveEntry *Get(const wxString& name) { return m_impl->Get(name); } - wxInputStream *NewStream() const { return m_impl->NewStream(); } - wxArchiveFSEntry *GetNext(wxArchiveFSEntry *fse) - { return m_impl->GetNext(fse); } - -private: - wxArchiveFSCacheDataImpl *m_impl; -}; - -wxArchiveFSCacheData::wxArchiveFSCacheData( - const wxArchiveClassFactory& factory, - const wxBackingFile& backer) - : m_impl(new wxArchiveFSCacheDataImpl(factory, backer)) -{ -} - -wxArchiveFSCacheData::wxArchiveFSCacheData( - const wxArchiveClassFactory& factory, - wxInputStream *stream) - : m_impl(new wxArchiveFSCacheDataImpl(factory, stream)) -{ -} - -wxArchiveFSCacheData::wxArchiveFSCacheData(const wxArchiveFSCacheData& data) - : m_impl(data.m_impl ? data.m_impl->AddRef() : NULL) -{ -} - -wxArchiveFSCacheData& wxArchiveFSCacheData::operator=( - const wxArchiveFSCacheData& data) -{ - if (data.m_impl != m_impl) - { - if (m_impl) - m_impl->Release(); - - m_impl = data.m_impl; - - if (m_impl) - m_impl->AddRef(); - } - - return *this; -} - -//--------------------------------------------------------------------------- -// wxArchiveFSCache -// -// wxArchiveFSCacheData caches a single archive, and this class holds a -// collection of them to cache all the archives accessed by this instance -// of wxFileSystem. -//--------------------------------------------------------------------------- - -WX_DECLARE_STRING_HASH_MAP(wxArchiveFSCacheData, wxArchiveFSCacheDataHash); - -class wxArchiveFSCache -{ -public: - wxArchiveFSCache() { } - ~wxArchiveFSCache() { } - - wxArchiveFSCacheData* Add(const wxString& name, - const wxArchiveClassFactory& factory, - wxInputStream *stream); - - wxArchiveFSCacheData *Get(const wxString& name); - -private: - wxArchiveFSCacheDataHash m_hash; -}; - -wxArchiveFSCacheData* wxArchiveFSCache::Add( - const wxString& name, - const wxArchiveClassFactory& factory, - wxInputStream *stream) -{ - wxArchiveFSCacheData& data = m_hash[name]; - - if (stream->IsSeekable()) - data = wxArchiveFSCacheData(factory, stream); - else - data = wxArchiveFSCacheData(factory, wxBackingFile(stream)); - - return &data; -} - -wxArchiveFSCacheData *wxArchiveFSCache::Get(const wxString& name) -{ - wxArchiveFSCacheDataHash::iterator it; - - if ((it = m_hash.find(name)) != m_hash.end()) - return &it->second; - - return NULL; -} - -//---------------------------------------------------------------------------- -// wxArchiveFSHandler -//---------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxArchiveFSHandler, wxFileSystemHandler); - -wxArchiveFSHandler::wxArchiveFSHandler() - : wxFileSystemHandler() -{ - m_Archive = NULL; - m_FindEntry = NULL; - m_ZipFile = m_Pattern = m_BaseDir = wxEmptyString; - m_AllowDirs = m_AllowFiles = true; - m_DirsFound = NULL; - m_cache = NULL; -} - -wxArchiveFSHandler::~wxArchiveFSHandler() -{ - Cleanup(); - delete m_cache; -} - -void wxArchiveFSHandler::Cleanup() -{ - wxDELETE(m_DirsFound); -} - -bool wxArchiveFSHandler::CanOpen(const wxString& location) -{ - wxString p = GetProtocol(location); - return wxArchiveClassFactory::Find(p) != NULL; -} - -wxFSFile* wxArchiveFSHandler::OpenFile( - wxFileSystem& WXUNUSED(fs), - const wxString& location) -{ - wxString right = GetRightLocation(location); - wxString left = GetLeftLocation(location); - wxString protocol = GetProtocol(location); - wxString key = left + wxT("#") + protocol + wxT(":"); - - if (right.Contains(wxT("./"))) - { - if (right.GetChar(0) != wxT('/')) right = wxT('/') + right; - wxFileName rightPart(right, wxPATH_UNIX); - rightPart.Normalize(wxPATH_NORM_DOTS, wxT("/"), wxPATH_UNIX); - right = rightPart.GetFullPath(wxPATH_UNIX); - } - - if (!right.empty() && right.GetChar(0) == wxT('/')) right = right.Mid(1); - - if (!m_cache) - m_cache = new wxArchiveFSCache; - - const wxArchiveClassFactory *factory; - factory = wxArchiveClassFactory::Find(protocol); - if (!factory) - return NULL; - - wxArchiveFSCacheData *cached = m_cache->Get(key); - if (!cached) - { - wxFSFile *leftFile = m_fs.OpenFile(left); - if (!leftFile) - return NULL; - cached = m_cache->Add(key, *factory, leftFile->DetachStream()); - delete leftFile; - } - - wxArchiveEntry *entry = cached->Get(right); - if (!entry) - return NULL; - - wxInputStream *leftStream = cached->NewStream(); - if (!leftStream) - { - wxFSFile *leftFile = m_fs.OpenFile(left); - if (!leftFile) - return NULL; - leftStream = leftFile->DetachStream(); - delete leftFile; - } - - wxArchiveInputStream *s = factory->NewStream(leftStream); - if ( !s ) - return NULL; - - s->OpenEntry(*entry); - - if (!s->IsOk()) - { - delete s; - return NULL; - } - - return new wxFSFile(s, - key + right, - wxEmptyString, - GetAnchor(location) -#if wxUSE_DATETIME - , entry->GetDateTime() -#endif // wxUSE_DATETIME - ); -} - -wxString wxArchiveFSHandler::FindFirst(const wxString& spec, int flags) -{ - wxString right = GetRightLocation(spec); - wxString left = GetLeftLocation(spec); - wxString protocol = GetProtocol(spec); - wxString key = left + wxT("#") + protocol + wxT(":"); - - if (!right.empty() && right.Last() == wxT('/')) right.RemoveLast(); - - if (!m_cache) - m_cache = new wxArchiveFSCache; - - const wxArchiveClassFactory *factory; - factory = wxArchiveClassFactory::Find(protocol); - if (!factory) - return wxEmptyString; - - m_Archive = m_cache->Get(key); - if (!m_Archive) - { - wxFSFile *leftFile = m_fs.OpenFile(left); - if (!leftFile) - return wxEmptyString; - m_Archive = m_cache->Add(key, *factory, leftFile->DetachStream()); - delete leftFile; - } - - m_FindEntry = NULL; - - switch (flags) - { - case wxFILE: - m_AllowDirs = false, m_AllowFiles = true; break; - case wxDIR: - m_AllowDirs = true, m_AllowFiles = false; break; - default: - m_AllowDirs = m_AllowFiles = true; break; - } - - m_ZipFile = key; - - m_Pattern = right.AfterLast(wxT('/')); - m_BaseDir = right.BeforeLast(wxT('/')); - if (m_BaseDir.StartsWith(wxT("/"))) - m_BaseDir = m_BaseDir.Mid(1); - - if (m_Archive) - { - if (m_AllowDirs) - { - delete m_DirsFound; - m_DirsFound = new wxArchiveFilenameHashMap(); - if (right.empty()) // allow "/" to match the archive root - return spec; - } - return DoFind(); - } - return wxEmptyString; -} - -wxString wxArchiveFSHandler::FindNext() -{ - if (!m_Archive) return wxEmptyString; - return DoFind(); -} - -wxString wxArchiveFSHandler::DoFind() -{ - wxString namestr, dir, filename; - wxString match = wxEmptyString; - - while (match == wxEmptyString) - { - m_FindEntry = m_Archive->GetNext(m_FindEntry); - - if (!m_FindEntry) - { - m_Archive = NULL; - m_FindEntry = NULL; - break; - } - namestr = m_FindEntry->entry->GetName(wxPATH_UNIX); - - if (m_AllowDirs) - { - dir = namestr.BeforeLast(wxT('/')); - while (!dir.empty()) - { - if( m_DirsFound->find(dir) == m_DirsFound->end() ) - { - (*m_DirsFound)[dir] = 1; - filename = dir.AfterLast(wxT('/')); - dir = dir.BeforeLast(wxT('/')); - if (!filename.empty() && m_BaseDir == dir && - wxMatchWild(m_Pattern, filename, false)) - match = m_ZipFile + dir + wxT("/") + filename; - } - else - break; // already tranversed - } - } - - filename = namestr.AfterLast(wxT('/')); - dir = namestr.BeforeLast(wxT('/')); - if (m_AllowFiles && !filename.empty() && m_BaseDir == dir && - wxMatchWild(m_Pattern, filename, false)) - match = m_ZipFile + namestr; - } - - return match; -} - -#endif // wxUSE_FS_ARCHIVE diff --git a/Externals/wxWidgets3/src/common/fs_filter.cpp b/Externals/wxWidgets3/src/common/fs_filter.cpp deleted file mode 100644 index 5dccb89298..0000000000 --- a/Externals/wxWidgets3/src/common/fs_filter.cpp +++ /dev/null @@ -1,91 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/fs_filter.cpp -// Purpose: wxFilter file system handler -// Author: Mike Wetherell -// Copyright: (c) 2006 Mike Wetherell -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_FILESYSTEM - -#include "wx/fs_filter.h" - -#ifndef WX_PRECOMP -#endif - -#include "wx/scopedptr.h" - -wxDEFINE_SCOPED_PTR_TYPE(wxFSFile) -wxDEFINE_SCOPED_PTR_TYPE(wxInputStream) - -//---------------------------------------------------------------------------- -// wxFilterFSHandler -//---------------------------------------------------------------------------- - -bool wxFilterFSHandler::CanOpen(const wxString& location) -{ - return wxFilterClassFactory::Find(GetProtocol(location)) != NULL; -} - -wxFSFile* wxFilterFSHandler::OpenFile( - wxFileSystem& fs, - const wxString& location) -{ - wxString right = GetRightLocation(location); - if (!right.empty()) - return NULL; - - wxString protocol = GetProtocol(location); - const wxFilterClassFactory *factory = wxFilterClassFactory::Find(protocol); - if (!factory) - return NULL; - - wxString left = GetLeftLocation(location); - wxFSFilePtr leftFile(fs.OpenFile(left)); - if (!leftFile.get()) - return NULL; - - wxInputStreamPtr leftStream(leftFile->DetachStream()); - if (!leftStream.get() || !leftStream->IsOk()) - return NULL; - - wxInputStreamPtr stream(factory->NewStream(leftStream.release())); - - // The way compressed streams are supposed to be served is e.g.: - // Content-type: application/postscript - // Content-encoding: gzip - // So the mime type should be just the mime type of the lhs. However check - // whether the mime type is that of this compression format (e.g. - // application/gzip). If so pop any extension and try GetMimeTypeFromExt, - // e.g. if it were '.ps.gz' pop the '.gz' and try looking up '.ps' - wxString mime = leftFile->GetMimeType(); - if (factory->CanHandle(mime, wxSTREAM_MIMETYPE)) - mime = GetMimeTypeFromExt(factory->PopExtension(left)); - - return new wxFSFile(stream.release(), - left + wxT("#") + protocol + wxT(":") + right, - mime, - GetAnchor(location) -#if wxUSE_DATETIME - , leftFile->GetModificationTime() -#endif // wxUSE_DATETIME - ); -} - -wxString wxFilterFSHandler::FindFirst(const wxString& WXUNUSED(spec), int WXUNUSED(flags)) -{ - return wxEmptyString; -} - -wxString wxFilterFSHandler::FindNext() -{ - return wxEmptyString; -} - -#endif //wxUSE_FILESYSTEM diff --git a/Externals/wxWidgets3/src/common/fs_inet.cpp b/Externals/wxWidgets3/src/common/fs_inet.cpp deleted file mode 100644 index 6f3ff4fc56..0000000000 --- a/Externals/wxWidgets3/src/common/fs_inet.cpp +++ /dev/null @@ -1,165 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/fs_inet.cpp -// Purpose: HTTP and FTP file system -// Author: Vaclav Slavik -// Copyright: (c) 1999 Vaclav Slavik -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if !wxUSE_SOCKETS - #undef wxUSE_FS_INET - #define wxUSE_FS_INET 0 -#endif - -#if wxUSE_FILESYSTEM && wxUSE_FS_INET - -#ifndef WX_PRECOMP - #include "wx/module.h" -#endif - -#include "wx/wfstream.h" -#include "wx/url.h" -#include "wx/filesys.h" -#include "wx/fs_inet.h" - -// ---------------------------------------------------------------------------- -// Helper classes -// ---------------------------------------------------------------------------- - -// This stream deletes the file when destroyed -class wxTemporaryFileInputStream : public wxFileInputStream -{ -public: - wxTemporaryFileInputStream(const wxString& filename) : - wxFileInputStream(filename), m_filename(filename) {} - - virtual ~wxTemporaryFileInputStream() - { - // NB: copied from wxFileInputStream dtor, we need to do it before - // wxRemoveFile - if (m_file_destroy) - { - delete m_file; - m_file_destroy = false; - } - wxRemoveFile(m_filename); - } - -protected: - wxString m_filename; -}; - - -// ---------------------------------------------------------------------------- -// wxInternetFSHandler -// ---------------------------------------------------------------------------- - -static wxString StripProtocolAnchor(const wxString& location) -{ - wxString myloc(location.BeforeLast(wxT('#'))); - if (myloc.empty()) myloc = location.AfterFirst(wxT(':')); - else myloc = myloc.AfterFirst(wxT(':')); - - // fix malformed url: - if (!myloc.Left(2).IsSameAs(wxT("//"))) - { - if (myloc.GetChar(0) != wxT('/')) myloc = wxT("//") + myloc; - else myloc = wxT("/") + myloc; - } - if (myloc.Mid(2).Find(wxT('/')) == wxNOT_FOUND) myloc << wxT('/'); - - return myloc; -} - - -bool wxInternetFSHandler::CanOpen(const wxString& location) -{ -#if wxUSE_URL - wxString p = GetProtocol(location); - if ((p == wxT("http")) || (p == wxT("ftp"))) - { - wxURL url(p + wxT(":") + StripProtocolAnchor(location)); - return (url.GetError() == wxURL_NOERR); - } -#endif - return false; -} - - -wxFSFile* wxInternetFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), - const wxString& location) -{ -#if !wxUSE_URL - return NULL; -#else - wxString right = - GetProtocol(location) + wxT(":") + StripProtocolAnchor(location); - - wxURL url(right); - if (url.GetError() == wxURL_NOERR) - { - wxInputStream *s = url.GetInputStream(); - wxString content = url.GetProtocol().GetContentType(); - if (s) - { - wxString tmpfile = - wxFileName::CreateTempFileName(wxT("wxhtml")); - - { // now copy streams content to temporary file: - wxFileOutputStream sout(tmpfile); - s->Read(sout); - } - delete s; - - return new wxFSFile(new wxTemporaryFileInputStream(tmpfile), - right, - content, - GetAnchor(location) -#if wxUSE_DATETIME - , wxDateTime::Now() -#endif // wxUSE_DATETIME - ); - } - } - - return NULL; // incorrect URL -#endif -} - - -class wxFileSystemInternetModule : public wxModule -{ - wxDECLARE_DYNAMIC_CLASS(wxFileSystemInternetModule); - - public: - wxFileSystemInternetModule() : - wxModule(), - m_handler(NULL) - { - } - - virtual bool OnInit() wxOVERRIDE - { - m_handler = new wxInternetFSHandler; - wxFileSystem::AddHandler(m_handler); - return true; - } - - virtual void OnExit() wxOVERRIDE - { - delete wxFileSystem::RemoveHandler(m_handler); - } - - private: - wxFileSystemHandler* m_handler; -}; - -wxIMPLEMENT_DYNAMIC_CLASS(wxFileSystemInternetModule, wxModule); - -#endif // wxUSE_FILESYSTEM && wxUSE_FS_INET diff --git a/Externals/wxWidgets3/src/common/fs_mem.cpp b/Externals/wxWidgets3/src/common/fs_mem.cpp deleted file mode 100644 index 281cdbbc88..0000000000 --- a/Externals/wxWidgets3/src/common/fs_mem.cpp +++ /dev/null @@ -1,279 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/fs_mem.cpp -// Purpose: in-memory file system -// Author: Vaclav Slavik -// Copyright: (c) 2000 Vaclav Slavik -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_FILESYSTEM && wxUSE_STREAMS - -#include "wx/fs_mem.h" - -#ifndef WX_PRECOMP - #include "wx/intl.h" - #include "wx/log.h" - #include "wx/wxcrtvararg.h" - #if wxUSE_GUI - #include "wx/image.h" - #endif // wxUSE_GUI -#endif - -#include "wx/mstream.h" - -// represents a file entry in wxMemoryFS -class wxMemoryFSFile -{ -public: - wxMemoryFSFile(const void *data, size_t len, const wxString& mime) - { - m_Data = new char[len]; - memcpy(m_Data, data, len); - m_Len = len; - m_MimeType = mime; - InitTime(); - } - - wxMemoryFSFile(const wxMemoryOutputStream& stream, const wxString& mime) - { - m_Len = stream.GetSize(); - m_Data = new char[m_Len]; - stream.CopyTo(m_Data, m_Len); - m_MimeType = mime; - InitTime(); - } - - virtual ~wxMemoryFSFile() - { - delete[] m_Data; - } - - char *m_Data; - size_t m_Len; - wxString m_MimeType; -#if wxUSE_DATETIME - wxDateTime m_Time; -#endif // wxUSE_DATETIME - -private: - void InitTime() - { -#if wxUSE_DATETIME - m_Time = wxDateTime::Now(); -#endif // wxUSE_DATETIME - } - - wxDECLARE_NO_COPY_CLASS(wxMemoryFSFile); -}; - -#if wxUSE_BASE - - -//-------------------------------------------------------------------------------- -// wxMemoryFSHandler -//-------------------------------------------------------------------------------- - - -wxMemoryFSHash wxMemoryFSHandlerBase::m_Hash; - - -wxMemoryFSHandlerBase::wxMemoryFSHandlerBase() : wxFileSystemHandler() -{ -} - -wxMemoryFSHandlerBase::~wxMemoryFSHandlerBase() -{ - // as only one copy of FS handler is supposed to exist, we may silently - // delete static data here. (There is no way how to remove FS handler from - // wxFileSystem other than releasing _all_ handlers.) - WX_CLEAR_HASH_MAP(wxMemoryFSHash, m_Hash); -} - -bool wxMemoryFSHandlerBase::CanOpen(const wxString& location) -{ - return GetProtocol(location) == "memory"; -} - -wxFSFile * wxMemoryFSHandlerBase::OpenFile(wxFileSystem& WXUNUSED(fs), - const wxString& location) -{ - wxMemoryFSHash::const_iterator i = m_Hash.find(GetRightLocation(location)); - if ( i == m_Hash.end() ) - return NULL; - - const wxMemoryFSFile * const obj = i->second; - - return new wxFSFile - ( - new wxMemoryInputStream(obj->m_Data, obj->m_Len), - location, - obj->m_MimeType, - GetAnchor(location) -#if wxUSE_DATETIME - , obj->m_Time -#endif // wxUSE_DATETIME - ); -} - -wxString wxMemoryFSHandlerBase::FindFirst(const wxString& url, int flags) -{ - if ( (flags & wxDIR) && !(flags & wxFILE) ) - { - // we only store files, not directories, so we don't risk finding - // anything - return wxString(); - } - - const wxString spec = GetRightLocation(url); - if ( spec.find_first_of("?*") == wxString::npos ) - { - // simple case: there are no wildcard characters so we can return - // either 0 or 1 results and we can find the potential match quickly - return m_Hash.count(spec) ? url : wxString(); - } - //else: deal with wildcards in FindNext() - - m_findArgument = spec; - m_findIter = m_Hash.begin(); - - return FindNext(); -} - -wxString wxMemoryFSHandlerBase::FindNext() -{ - // m_findArgument is used to indicate that search is in progress, we reset - // it to empty string after iterating over all elements - while ( !m_findArgument.empty() ) - { - // test for the match before (possibly) clearing m_findArgument below - const bool found = m_findIter->first.Matches(m_findArgument); - - // advance m_findIter first as we need to do it anyhow, whether it - // matches or not - const wxMemoryFSHash::const_iterator current = m_findIter; - - if ( ++m_findIter == m_Hash.end() ) - m_findArgument.clear(); - - if ( found ) - return "memory:" + current->first; - } - - return wxString(); -} - -bool wxMemoryFSHandlerBase::CheckDoesntExist(const wxString& filename) -{ - if ( m_Hash.count(filename) ) - { - wxLogError(_("Memory VFS already contains file '%s'!"), filename); - return false; - } - - return true; -} - - -/*static*/ -void wxMemoryFSHandlerBase::AddFileWithMimeType(const wxString& filename, - const wxString& textdata, - const wxString& mimetype) -{ - const wxCharBuffer buf(textdata.To8BitData()); - - AddFileWithMimeType(filename, buf.data(), buf.length(), mimetype); -} - - -/*static*/ -void wxMemoryFSHandlerBase::AddFileWithMimeType(const wxString& filename, - const void *binarydata, size_t size, - const wxString& mimetype) -{ - if ( !CheckDoesntExist(filename) ) - return; - - m_Hash[filename] = new wxMemoryFSFile(binarydata, size, mimetype); -} - -/*static*/ -void wxMemoryFSHandlerBase::AddFile(const wxString& filename, - const wxString& textdata) -{ - AddFileWithMimeType(filename, textdata, wxEmptyString); -} - - -/*static*/ -void wxMemoryFSHandlerBase::AddFile(const wxString& filename, - const void *binarydata, size_t size) -{ - AddFileWithMimeType(filename, binarydata, size, wxEmptyString); -} - - - -/*static*/ void wxMemoryFSHandlerBase::RemoveFile(const wxString& filename) -{ - wxMemoryFSHash::iterator i = m_Hash.find(filename); - if ( i == m_Hash.end() ) - { - wxLogError(_("Trying to remove file '%s' from memory VFS, " - "but it is not loaded!"), - filename); - return; - } - - delete i->second; - m_Hash.erase(i); -} - -#endif // wxUSE_BASE - -#if wxUSE_GUI - -#if wxUSE_IMAGE -/*static*/ void -wxMemoryFSHandler::AddFile(const wxString& filename, - const wxImage& image, - wxBitmapType type) -{ - if ( !CheckDoesntExist(filename) ) - return; - - wxMemoryOutputStream mems; - if ( image.IsOk() && image.SaveFile(mems, type) ) - { - m_Hash[filename] = new wxMemoryFSFile - ( - mems, - wxImage::FindHandler(type)->GetMimeType() - ); - } - else - { - wxLogError(_("Failed to store image '%s' to memory VFS!"), filename); - } -} - -/*static*/ void -wxMemoryFSHandler::AddFile(const wxString& filename, - const wxBitmap& bitmap, - wxBitmapType type) -{ - wxImage img = bitmap.ConvertToImage(); - AddFile(filename, img, type); -} - -#endif // wxUSE_IMAGE - -#endif // wxUSE_GUI - - -#endif // wxUSE_FILESYSTEM && wxUSE_FS_ZIP diff --git a/Externals/wxWidgets3/src/common/fswatchercmn.cpp b/Externals/wxWidgets3/src/common/fswatchercmn.cpp deleted file mode 100644 index 133aaa5a2d..0000000000 --- a/Externals/wxWidgets3/src/common/fswatchercmn.cpp +++ /dev/null @@ -1,334 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/fswatchercmn.cpp -// Purpose: wxMswFileSystemWatcher -// Author: Bartosz Bekier -// Created: 2009-05-26 -// Copyright: (c) 2009 Bartosz Bekier -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_FSWATCHER - -#include "wx/fswatcher.h" -#include "wx/private/fswatcher.h" - -// ============================================================================ -// helpers -// ============================================================================ - -wxDEFINE_EVENT(wxEVT_FSWATCHER, wxFileSystemWatcherEvent); - -static wxString GetFSWEventChangeTypeName(int type) -{ - switch (type) - { - case wxFSW_EVENT_CREATE: - return "CREATE"; - case wxFSW_EVENT_DELETE: - return "DELETE"; - case wxFSW_EVENT_RENAME: - return "RENAME"; - case wxFSW_EVENT_MODIFY: - return "MODIFY"; - case wxFSW_EVENT_ACCESS: - return "ACCESS"; - case wxFSW_EVENT_ATTRIB: // Currently this is wxGTK-only - return "ATTRIBUTE"; -#ifdef wxHAS_INOTIFY - case wxFSW_EVENT_UNMOUNT: // Currently this is wxGTK-only - return "UNMOUNT"; -#endif - case wxFSW_EVENT_WARNING: - return "WARNING"; - case wxFSW_EVENT_ERROR: - return "ERROR"; - } - - // should never be reached! - wxFAIL_MSG("Unknown change type"); - return "INVALID_TYPE"; -} - - -// ============================================================================ -// wxFileSystemWatcherEvent implementation -// ============================================================================ - -wxIMPLEMENT_DYNAMIC_CLASS(wxFileSystemWatcherEvent, wxEvent); - -wxString wxFileSystemWatcherEvent::ToString() const -{ - if (IsError()) - { - return wxString::Format("FSW_EVT type=%d (%s) message='%s'", m_changeType, - GetFSWEventChangeTypeName(m_changeType), GetErrorDescription()); - } - return wxString::Format("FSW_EVT type=%d (%s) path='%s'", m_changeType, - GetFSWEventChangeTypeName(m_changeType), GetPath().GetFullPath()); -} - - -// ============================================================================ -// wxFileSystemWatcherEvent implementation -// ============================================================================ - -wxFileSystemWatcherBase::wxFileSystemWatcherBase() : - m_service(0), m_owner(this) -{ -} - -wxFileSystemWatcherBase::~wxFileSystemWatcherBase() -{ - RemoveAll(); - if (m_service) - { - delete m_service; - } -} - -bool wxFileSystemWatcherBase::Add(const wxFileName& path, int events) -{ - wxFSWPathType type = wxFSWPath_None; - if ( path.FileExists() ) - { - type = wxFSWPath_File; - } - else if ( path.DirExists() ) - { - type = wxFSWPath_Dir; - } - else - { - // Don't overreact to being passed a non-existent item. It may have - // only just been deleted, in which case doing nothing is correct - wxLogTrace(wxTRACE_FSWATCHER, - "Can't monitor non-existent path \"%s\" for changes.", - path.GetFullPath()); - return false; - } - - return AddAny(path, events, type); -} - -bool -wxFileSystemWatcherBase::AddAny(const wxFileName& path, - int events, - wxFSWPathType type, - const wxString& filespec) -{ - wxString canonical = GetCanonicalPath(path); - if (canonical.IsEmpty()) - return false; - - // adding a path in a platform specific way - wxFSWatchInfo watch(canonical, events, type, filespec); - if ( !m_service->Add(watch) ) - return false; - - // on success, either add path to our 'watch-list' - // or, if already watched, inc the refcount. This may happen if - // a dir is Add()ed, then later AddTree() is called on a parent dir - wxFSWatchInfoMap::iterator it = m_watches.find(canonical); - if ( it == m_watches.end() ) - { - wxFSWatchInfoMap::value_type val(canonical, watch); - m_watches.insert(val); - } - else - { - wxFSWatchInfo& watch2 = it->second; - const int count = watch2.IncRef(); - - wxLogTrace(wxTRACE_FSWATCHER, - "'%s' is now watched %d times", canonical, count); - - wxUnusedVar(count); // could be unused if debug tracing is disabled - } - return true; -} - -bool wxFileSystemWatcherBase::Remove(const wxFileName& path) -{ - // args validation & consistency checks - wxString canonical = GetCanonicalPath(path); - if (canonical.IsEmpty()) - return false; - - wxFSWatchInfoMap::iterator it = m_watches.find(canonical); - wxCHECK_MSG(it != m_watches.end(), false, - wxString::Format("Path '%s' is not watched", canonical)); - - // Decrement the watch's refcount and remove from watch-list if 0 - bool ret = true; - wxFSWatchInfo& watch = it->second; - if ( !watch.DecRef() ) - { - // remove in a platform specific way - ret = m_service->Remove(watch); - - m_watches.erase(it); - } - return ret; -} - -bool wxFileSystemWatcherBase::AddTree(const wxFileName& path, int events, - const wxString& filespec) -{ - if (!path.DirExists()) - return false; - - // OPT could be optimised if we stored information about relationships - // between paths - class AddTraverser : public wxDirTraverser - { - public: - AddTraverser(wxFileSystemWatcherBase* watcher, int events, - const wxString& filespec) : - m_watcher(watcher), m_events(events), m_filespec(filespec) - { - } - - virtual wxDirTraverseResult OnFile(const wxString& WXUNUSED(filename)) wxOVERRIDE - { - // There is no need to watch individual files as we watch the - // parent directory which will notify us about any changes in them. - return wxDIR_CONTINUE; - } - - virtual wxDirTraverseResult OnDir(const wxString& dirname) wxOVERRIDE - { - if ( m_watcher->AddAny(wxFileName::DirName(dirname), - m_events, wxFSWPath_Tree, m_filespec) ) - { - wxLogTrace(wxTRACE_FSWATCHER, - "--- AddTree adding directory '%s' ---", dirname); - } - return wxDIR_CONTINUE; - } - - private: - wxFileSystemWatcherBase* m_watcher; - int m_events; - wxString m_filespec; - }; - - wxDir dir(path.GetFullPath()); - // Prevent asserts or infinite loops in trees containing symlinks - int flags = wxDIR_DIRS; - if ( !path.ShouldFollowLink() ) - { - flags |= wxDIR_NO_FOLLOW; - } - AddTraverser traverser(this, events, filespec); - dir.Traverse(traverser, filespec, flags); - - // Add the path itself explicitly as Traverse() doesn't return it. - AddAny(path.GetPathWithSep(), events, wxFSWPath_Tree, filespec); - - return true; -} - -bool wxFileSystemWatcherBase::RemoveTree(const wxFileName& path) -{ - if (!path.DirExists()) - return false; - - // OPT could be optimised if we stored information about relationships - // between paths - class RemoveTraverser : public wxDirTraverser - { - public: - RemoveTraverser(wxFileSystemWatcherBase* watcher, - const wxString& filespec) : - m_watcher(watcher), m_filespec(filespec) - { - } - - virtual wxDirTraverseResult OnFile(const wxString& WXUNUSED(filename)) wxOVERRIDE - { - // We never watch the individual files when watching the tree, so - // nothing to do here. - return wxDIR_CONTINUE; - } - - virtual wxDirTraverseResult OnDir(const wxString& dirname) wxOVERRIDE - { - m_watcher->Remove(wxFileName::DirName(dirname)); - return wxDIR_CONTINUE; - } - - private: - wxFileSystemWatcherBase* m_watcher; - wxString m_filespec; - }; - - // If AddTree() used a filespec, we must use the same one - wxString canonical = GetCanonicalPath(path); - wxFSWatchInfoMap::iterator it = m_watches.find(canonical); - wxCHECK_MSG( it != m_watches.end(), false, - wxString::Format("Path '%s' is not watched", canonical) ); - wxFSWatchInfo watch = it->second; - const wxString filespec = watch.GetFilespec(); - -#if defined(__WINDOWS__) - // When there's no filespec, the wxMSW AddTree() would have set a watch - // on only the passed 'path'. We must therefore remove only this - if (filespec.empty()) - { - return Remove(path); - } - // Otherwise fall through to the generic implementation -#endif // __WINDOWS__ - - wxDir dir(path.GetFullPath()); - // AddTree() might have used the wxDIR_NO_FOLLOW to prevent asserts or - // infinite loops in trees containing symlinks. We need to do the same - // or we'll try to remove unwatched items. Let's hope the caller used - // the same ShouldFollowLink() setting as in AddTree()... - int flags = wxDIR_DIRS; - if ( !path.ShouldFollowLink() ) - { - flags |= wxDIR_NO_FOLLOW; - } - RemoveTraverser traverser(this, filespec); - dir.Traverse(traverser, filespec, flags); - - // As in AddTree() above, handle the path itself explicitly. - Remove(path); - - return true; -} - -bool wxFileSystemWatcherBase::RemoveAll() -{ - const bool ret = m_service->RemoveAll(); - m_watches.clear(); - return ret; -} - -int wxFileSystemWatcherBase::GetWatchedPathsCount() const -{ - return m_watches.size(); -} - -int wxFileSystemWatcherBase::GetWatchedPaths(wxArrayString* paths) const -{ - wxCHECK_MSG( paths != NULL, -1, "Null array passed to retrieve paths"); - - wxFSWatchInfoMap::const_iterator it = m_watches.begin(); - for ( ; it != m_watches.end(); ++it) - { - paths->push_back(it->first); - } - - return m_watches.size(); -} - -#endif // wxUSE_FSWATCHER diff --git a/Externals/wxWidgets3/src/common/ftp.cpp b/Externals/wxWidgets3/src/common/ftp.cpp deleted file mode 100644 index e253956890..0000000000 --- a/Externals/wxWidgets3/src/common/ftp.cpp +++ /dev/null @@ -1,1023 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/ftp.cpp -// Purpose: FTP protocol -// Author: Guilhem Lavaux -// Modified by: Mark Johnson, wxWindows@mj10777.de -// 20000917 : RmDir, GetLastResult, GetList -// Vadim Zeitlin (numerous fixes and rewrites to all part of the -// code, support ASCII/Binary modes, better error reporting, more -// robust Abort(), support for arbitrary FTP commands, ...) -// Randall Fox (support for active mode) -// Created: 07/07/1997 -// Copyright: (c) 1997, 1998 Guilhem Lavaux -// (c) 1998-2004 wxWidgets team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_PROTOCOL_FTP - -#ifndef WX_PRECOMP - #include - #include "wx/string.h" - #include "wx/utils.h" - #include "wx/log.h" - #include "wx/intl.h" - #include "wx/wxcrtvararg.h" -#endif // WX_PRECOMP - -#include "wx/sckaddr.h" -#include "wx/socket.h" -#include "wx/url.h" -#include "wx/sckstrm.h" -#include "wx/protocol/protocol.h" -#include "wx/protocol/ftp.h" - -#include - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -// the length of FTP status code (3 digits) -static const size_t LEN_CODE = 3; - -// ---------------------------------------------------------------------------- -// macros -// ---------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxFTP, wxProtocol); -IMPLEMENT_PROTOCOL(wxFTP, wxT("ftp"), wxT("ftp"), true) - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxFTP constructor and destructor -// ---------------------------------------------------------------------------- - -wxFTP::wxFTP() -{ - m_streaming = false; - m_currentTransfermode = NONE; - - m_username = wxT("anonymous"); - m_password << wxGetUserId() << wxT('@') << wxGetFullHostName(); - - m_bPassive = true; - m_bEncounteredError = false; -} - -wxFTP::~wxFTP() -{ - if ( m_streaming ) - { - // if we are streaming, this will issue - // an FTP ABORT command, to tell the server we are aborting - (void)Abort(); - } - - // now this issues a "QUIT" command to tell the server we are - Close(); -} - -// ---------------------------------------------------------------------------- -// wxFTP connect and login methods -// ---------------------------------------------------------------------------- - -bool wxFTP::Connect(const wxSockAddress& addr, bool WXUNUSED(wait)) -{ - if ( !wxProtocol::Connect(addr) ) - { - m_lastError = wxPROTO_NETERR; - return false; - } - - if ( !m_username ) - { - m_lastError = wxPROTO_CONNERR; - return false; - } - - // we should have 220 welcome message - if ( !CheckResult('2') ) - { - Close(); - return false; - } - - wxString command; - command.Printf(wxT("USER %s"), m_username.c_str()); - char rc = SendCommand(command); - if ( rc == '2' ) - { - // 230 return: user accepted without password - m_lastError = wxPROTO_NOERR; - return true; - } - - if ( rc != '3' ) - { - m_lastError = wxPROTO_CONNERR; - Close(); - return false; - } - - command.Printf(wxT("PASS %s"), m_password.c_str()); - if ( !CheckCommand(command, '2') ) - { - m_lastError = wxPROTO_CONNERR; - Close(); - return false; - } - - m_lastError = wxPROTO_NOERR; - return true; -} - -bool wxFTP::Connect(const wxString& host, unsigned short port) -{ - wxIPV4address addr; - addr.Hostname(host); - - if ( port ) - addr.Service(port); - else if (!addr.Service(wxT("ftp"))) - addr.Service(21); - - return Connect(addr); -} - -bool wxFTP::Close() -{ - if ( m_streaming ) - { - m_lastError = wxPROTO_STREAMING; - return false; - } - - if ( IsConnected() ) - { - if ( !CheckCommand(wxT("QUIT"), '2') ) - { - m_lastError = wxPROTO_CONNERR; - wxLogDebug(wxT("Failed to close connection gracefully.")); - } - } - - return wxSocketClient::Close(); -} - -// ============================================================================ -// low level methods -// ============================================================================ - -wxSocketBase *wxFTP::AcceptIfActive(wxSocketBase *sock) -{ - if ( m_bPassive ) - return sock; - - // now wait for a connection from server - wxSocketServer *sockSrv = (wxSocketServer *)sock; - if ( !sockSrv->WaitForAccept() ) - { - m_lastError = wxPROTO_CONNERR; - wxLogError(_("Timeout while waiting for FTP server to connect, try passive mode.")); - wxDELETE(sock); - } - else - { - m_lastError = wxPROTO_NOERR; - sock = sockSrv->Accept(true); - delete sockSrv; - } - - return sock; -} - -bool wxFTP::Abort() -{ - if ( !m_streaming ) - return true; - - m_streaming = false; - if ( !CheckCommand(wxT("ABOR"), '4') ) - return false; - - return CheckResult('2'); -} - - -// ---------------------------------------------------------------------------- -// Send command to FTP server -// ---------------------------------------------------------------------------- - -char wxFTP::SendCommand(const wxString& command) -{ - if ( m_streaming ) - { - m_lastError = wxPROTO_STREAMING; - return 0; - } - - wxString tmp_str = command + wxT("\r\n"); - const wxWX2MBbuf tmp_buf = tmp_str.mb_str(); - if ( Write(static_cast(tmp_buf), strlen(tmp_buf)).Error()) - { - m_lastError = wxPROTO_NETERR; - return 0; - } - - // don't show the passwords in the logs (even in debug ones) - wxString cmd, password; - if ( command.Upper().StartsWith(wxT("PASS "), &password) ) - { - cmd << wxT("PASS ") << wxString(wxT('*'), password.length()); - } - else - { - cmd = command; - } - - LogRequest(cmd); - - m_lastError = wxPROTO_NOERR; - return GetResult(); -} - -// ---------------------------------------------------------------------------- -// Receive servers reply -// ---------------------------------------------------------------------------- - -char wxFTP::GetResult() -{ - // if we've already had a read or write timeout error, the connection is - // probably toast, so don't bother, it just wastes the users time - if ( m_bEncounteredError ) - return 0; - - wxString code; - - // m_lastResult will contain the entire server response, possibly on - // multiple lines - m_lastResult.clear(); - - // we handle multiline replies here according to RFC 959: it says that a - // reply may either be on 1 line of the form "xyz ..." or on several lines - // in whuch case it looks like - // xyz-... - // ... - // xyz ... - // and the intermeidate lines may start with xyz or not - bool badReply = false; - bool firstLine = true; - bool endOfReply = false; - while ( !endOfReply && !badReply ) - { - wxString line; - m_lastError = ReadLine(this,line); - if ( m_lastError ) - { - m_bEncounteredError = true; - return 0; - } - - LogResponse(line); - - if ( !m_lastResult.empty() ) - { - // separate from last line - m_lastResult += wxT('\n'); - } - - m_lastResult += line; - - // unless this is an intermediate line of a multiline reply, it must - // contain the code in the beginning and '-' or ' ' following it - if ( line.Len() < LEN_CODE + 1 ) - { - if ( firstLine ) - { - badReply = true; - } - } - else // line has at least 4 chars - { - // this is the char which tells us what we're dealing with - wxChar chMarker = line.GetChar(LEN_CODE); - - if ( firstLine ) - { - code = wxString(line, LEN_CODE); - - switch ( chMarker ) - { - case wxT(' '): - endOfReply = true; - break; - - case wxT('-'): - firstLine = false; - break; - - default: - // unexpected - badReply = true; - } - } - else // subsequent line of multiline reply - { - if ( line.compare(0, LEN_CODE, code) == 0 ) - { - if ( chMarker == wxT(' ') ) - { - endOfReply = true; - } - } - } - } - } - - if ( badReply ) - { - wxLogDebug(wxT("Broken FTP server: '%s' is not a valid reply."), - m_lastResult.c_str()); - - m_lastError = wxPROTO_PROTERR; - - return 0; - } - else - m_lastError = wxPROTO_NOERR; - - // if we got here we must have a non empty code string - return (char)code[0u]; -} - -// ---------------------------------------------------------------------------- -// wxFTP simple commands -// ---------------------------------------------------------------------------- - -bool wxFTP::SetTransferMode(TransferMode transferMode) -{ - if ( transferMode == m_currentTransfermode ) - { - // nothing to do - return true; - } - - wxString mode; - switch ( transferMode ) - { - default: - wxFAIL_MSG(wxT("unknown FTP transfer mode")); - wxFALLTHROUGH; - - case BINARY: - mode = wxT('I'); - break; - - case ASCII: - mode = wxT('A'); - break; - } - - if ( !DoSimpleCommand(wxT("TYPE"), mode) ) - { - wxLogError(_("Failed to set FTP transfer mode to %s."), - (transferMode == ASCII ? _("ASCII") : _("binary"))); - - return false; - } - - // If we get here the operation has been successfully completed - // Set the status-member - m_currentTransfermode = transferMode; - - return true; -} - -bool wxFTP::DoSimpleCommand(const wxChar *command, const wxString& arg) -{ - wxString fullcmd = command; - if ( !arg.empty() ) - { - fullcmd << wxT(' ') << arg; - } - - if ( !CheckCommand(fullcmd, '2') ) - { - wxLogDebug(wxT("FTP command '%s' failed."), fullcmd.c_str()); - m_lastError = wxPROTO_NETERR; - - return false; - } - - m_lastError = wxPROTO_NOERR; - return true; -} - -bool wxFTP::ChDir(const wxString& dir) -{ - // some servers might not understand ".." if they use different directory - // tree conventions, but they always understand CDUP - should we use it if - // dir == ".."? OTOH, do such servers (still) exist? - - return DoSimpleCommand(wxT("CWD"), dir); -} - -bool wxFTP::MkDir(const wxString& dir) -{ - return DoSimpleCommand(wxT("MKD"), dir); -} - -bool wxFTP::RmDir(const wxString& dir) -{ - return DoSimpleCommand(wxT("RMD"), dir); -} - -wxString wxFTP::Pwd() -{ - wxString path; - - if ( CheckCommand(wxT("PWD"), '2') ) - { - // the result is at least that long if CheckCommand() succeeded - wxString::const_iterator p = m_lastResult.begin() + LEN_CODE + 1; - if ( *p != wxT('"') ) - { - wxLogDebug(wxT("Missing starting quote in reply for PWD: %s"), - wxString(p, m_lastResult.end())); - } - else - { - for ( ++p; *p; ++p ) - { - if ( *p == wxT('"') ) - { - // check if the quote is doubled - ++p; - if ( !*p || *p != wxT('"') ) - { - // no, this is the end - break; - } - //else: yes, it is: this is an embedded quote in the - // filename, treat as normal char - } - - path += *p; - } - - if ( !*p ) - { - wxLogDebug(wxT("Missing ending quote in reply for PWD: %s"), - m_lastResult.c_str() + LEN_CODE + 1); - } - } - } - else - { - m_lastError = wxPROTO_PROTERR; - wxLogDebug(wxT("FTP PWD command failed.")); - } - - return path; -} - -bool wxFTP::Rename(const wxString& src, const wxString& dst) -{ - wxString str; - - str = wxT("RNFR ") + src; - if ( !CheckCommand(str, '3') ) - return false; - - str = wxT("RNTO ") + dst; - - return CheckCommand(str, '2'); -} - -bool wxFTP::RmFile(const wxString& path) -{ - wxString str; - str = wxT("DELE ") + path; - - return CheckCommand(str, '2'); -} - -// ---------------------------------------------------------------------------- -// wxFTP port methods -// ---------------------------------------------------------------------------- - -wxSocketBase *wxFTP::GetPort() -{ - /* - PASSIVE: Client sends a "PASV" to the server. The server responds with - an address and port number which it will be listening on. Then - the client connects to the server at the specified address and - port. - - ACTIVE: Client sends the server a PORT command which includes an - address and port number which the client will be listening on. - The server then connects to the client at that address and - port. - */ - - wxSocketBase *socket = m_bPassive ? GetPassivePort() : GetActivePort(); - if ( !socket ) - { - m_bEncounteredError = true; - return NULL; - } - - // Now set the time for the new socket to the default or user selected - // timeout period - socket->SetTimeout(m_uiDefaultTimeout); - - return socket; -} - -wxString wxFTP::GetPortCmdArgument(const wxIPV4address& addrLocal, - const wxIPV4address& addrNew) -{ - // Just fills in the return value with the local IP - // address of the current socket. Also it fill in the - // PORT which the client will be listening on - - wxString addrIP = addrLocal.IPAddress(); - int portNew = addrNew.Service(); - - // We need to break the PORT number in bytes - addrIP.Replace(wxT("."), wxT(",")); - addrIP << wxT(',') - << wxString::Format(wxT("%d"), portNew >> 8) << wxT(',') - << wxString::Format(wxT("%d"), portNew & 0xff); - - // Now we have a value like "10,0,0,1,5,23" - return addrIP; -} - -wxSocketBase *wxFTP::GetActivePort() -{ - // we need an address to listen on - wxIPV4address addrNew, addrLocal; - GetLocal(addrLocal); - addrNew.AnyAddress(); - addrNew.Service(0); // pick an open port number. - - wxSocketServer *sockSrv = new wxSocketServer(addrNew); - if (!sockSrv->IsOk()) - { - // We use IsOk() here to see if everything is ok - m_lastError = wxPROTO_PROTERR; - delete sockSrv; - return NULL; - } - - //gets the new address, actually it is just the port number - sockSrv->GetLocal(addrNew); - - // Now we create the argument of the PORT command, we send in both - // addresses because the addrNew has an IP of "0.0.0.0", so we need the - // value in addrLocal - wxString port = GetPortCmdArgument(addrLocal, addrNew); - if ( !DoSimpleCommand(wxT("PORT"), port) ) - { - m_lastError = wxPROTO_PROTERR; - delete sockSrv; - wxLogError(_("The FTP server doesn't support the PORT command.")); - return NULL; - } - - m_lastError = wxPROTO_NOERR; - sockSrv->Notify(false); // Don't send any events - return sockSrv; -} - -wxSocketBase *wxFTP::GetPassivePort() -{ - if ( !DoSimpleCommand(wxT("PASV")) ) - { - m_lastError = wxPROTO_PROTERR; - wxLogError(_("The FTP server doesn't support passive mode.")); - return NULL; - } - - size_t addrStart = m_lastResult.find(wxT('(')); - size_t addrEnd = (addrStart == wxString::npos) - ? wxString::npos - : m_lastResult.find(wxT(')'), addrStart); - - if ( addrEnd == wxString::npos ) - { - m_lastError = wxPROTO_PROTERR; - return NULL; - } - - // get the port number and address - int a[6]; - wxString straddr(m_lastResult, addrStart + 1, addrEnd - (addrStart + 1)); - wxSscanf(straddr, wxT("%d,%d,%d,%d,%d,%d"), - &a[2],&a[3],&a[4],&a[5],&a[0],&a[1]); - - wxUint32 hostaddr = (wxUint16)a[2] << 24 | - (wxUint16)a[3] << 16 | - (wxUint16)a[4] << 8 | - a[5]; - wxUint16 port = (wxUint16)(a[0] << 8 | a[1]); - - wxIPV4address addr; - addr.Hostname(hostaddr); - addr.Service(port); - - wxSocketClient *client = new wxSocketClient(); - if ( !client->Connect(addr) ) - { - m_lastError = wxPROTO_CONNERR; - delete client; - return NULL; - } - - client->Notify(false); - - m_lastError = wxPROTO_NOERR; - return client; -} - - -// ---------------------------------------------------------------------------- -// wxFTP download and upload -// ---------------------------------------------------------------------------- - -class wxInputFTPStream : public wxSocketInputStream -{ -public: - wxInputFTPStream(wxFTP *ftp, wxSocketBase *sock) - : wxSocketInputStream(*sock) - { - m_ftp = ftp; - // socket timeout automatically set in GetPort function - } - - virtual ~wxInputFTPStream() - { - delete m_i_socket; // keep at top - - // when checking the result, the stream will - // almost always show an error, even if the file was - // properly transferred, thus, let's just grab the result - - // we are looking for "226 transfer completed" - char code = m_ftp->GetResult(); - if ('2' == code) - { - // it was a good transfer. - // we're done! - m_ftp->m_streaming = false; - return; - } - // did we timeout? - if (0 == code) - { - // the connection is probably toast. issue an abort, and - // then a close. there won't be any more waiting - // for this connection - m_ftp->Abort(); - m_ftp->Close(); - return; - } - // There was a problem with the transfer and the server - // has acknowledged it. If we issue an "ABORT" now, the user - // would get the "226" for the abort and think the xfer was - // complete, thus, don't do anything here, just return - } - - wxFTP *m_ftp; - - wxDECLARE_NO_COPY_CLASS(wxInputFTPStream); -}; - -class wxOutputFTPStream : public wxSocketOutputStream -{ -public: - wxOutputFTPStream(wxFTP *ftp_clt, wxSocketBase *sock) - : wxSocketOutputStream(*sock), m_ftp(ftp_clt) - { - } - - virtual ~wxOutputFTPStream(void) - { - if ( IsOk() ) - { - // close data connection first, this will generate "transfer - // completed" reply - delete m_o_socket; - - // read this reply - m_ftp->GetResult(); // save result so user can get to it - - m_ftp->m_streaming = false; - } - else - { - // abort data connection first - m_ftp->Abort(); - - // and close it after - delete m_o_socket; - } - } - - wxFTP *m_ftp; - - wxDECLARE_NO_COPY_CLASS(wxOutputFTPStream); -}; - -wxInputStream *wxFTP::GetInputStream(const wxString& path) -{ - if ( ( m_currentTransfermode == NONE ) && !SetTransferMode(BINARY) ) - { - m_lastError = wxPROTO_CONNERR; - return NULL; - } - - wxSocketBase *sock = GetPort(); - - if ( !sock ) - { - m_lastError = wxPROTO_NETERR; - return NULL; - } - - wxString tmp_str = wxT("RETR ") + wxURI::Unescape(path); - if ( !CheckCommand(tmp_str, '1') ) - { - delete sock; - - return NULL; - } - - sock = AcceptIfActive(sock); - if ( !sock ) - { - m_lastError = wxPROTO_CONNERR; - return NULL; - } - - m_streaming = true; - - wxInputFTPStream *in_stream = new wxInputFTPStream(this, sock); - - m_lastError = wxPROTO_NOERR; - return in_stream; -} - -wxOutputStream *wxFTP::GetOutputStream(const wxString& path) -{ - if ( ( m_currentTransfermode == NONE ) && !SetTransferMode(BINARY) ) - { - m_lastError = wxPROTO_CONNERR; - return NULL; - } - - wxSocketBase *sock = GetPort(); - - wxString tmp_str = wxT("STOR ") + path; - if ( !CheckCommand(tmp_str, '1') ) - { - delete sock; - - return NULL; - } - - sock = AcceptIfActive(sock); - - m_streaming = true; - - m_lastError = wxPROTO_NOERR; - return new wxOutputFTPStream(this, sock); -} - -// ---------------------------------------------------------------------------- -// FTP directory listing -// ---------------------------------------------------------------------------- - -bool wxFTP::GetList(wxArrayString& files, - const wxString& wildcard, - bool details) -{ - wxSocketBase *sock = GetPort(); - if (!sock) { - m_lastError = wxPROTO_NETERR; - return false; - } - - // NLST : List of Filenames (including Directory's !) - // LIST : depending on BS of FTP-Server - // - Unix : result like "ls" command - // - Windows : like "dir" command - // - others : ? - wxString line(details ? wxT("LIST") : wxT("NLST")); - if ( !wildcard.empty() ) - { - line << wxT(' ') << wildcard; - } - - if ( !CheckCommand(line, '1') ) - { - m_lastError = wxPROTO_PROTERR; - wxLogDebug(wxT("FTP 'LIST' command returned unexpected result from server")); - delete sock; - return false; - } - - sock = AcceptIfActive(sock); - if ( !sock ) { - m_lastError = wxPROTO_CONNERR; - return false; - } - - files.Empty(); - while (ReadLine(sock, line) == wxPROTO_NOERR ) - { - files.Add(line); - } - - delete sock; - - // the file list should be terminated by "226 Transfer complete"" - m_lastError = wxPROTO_NOERR; - return CheckResult('2'); -} - -bool wxFTP::FileExists(const wxString& fileName) -{ - // This function checks if the file specified in fileName exists in the - // current dir. It does so by simply doing an NLST (via GetList). - // If this succeeds (and the list is not empty) the file exists. - - bool retval = false; - wxArrayString fileList; - - if ( GetList(fileList, fileName, false) ) - { - // Some ftp-servers (Ipswitch WS_FTP Server 1.0.5 does this) - // displays this behaviour when queried on a nonexistent file: - // NLST this_file_does_not_exist - // 150 Opening ASCII data connection for directory listing - // (no data transferred) - // 226 Transfer complete - // Here wxFTP::GetList(...) will succeed but it will return an empty - // list. - retval = !fileList.IsEmpty(); - } - - return retval; -} - -// ---------------------------------------------------------------------------- -// FTP GetSize -// ---------------------------------------------------------------------------- - -int wxFTP::GetFileSize(const wxString& fileName) -{ - // return the filesize of the given file if possible - // return -1 otherwise (predominantly if file doesn't exist - // in current dir) - - int filesize = -1; - - // Check for existence of file via wxFTP::FileExists(...) - if ( FileExists(fileName) ) - { - wxString command; - - // First try "SIZE" command using BINARY(IMAGE) transfermode - // Especially UNIX ftp-servers distinguish between the different - // transfermodes and reports different filesizes accordingly. - // The BINARY size is the interesting one: How much memory - // will we need to hold this file? - TransferMode oldTransfermode = m_currentTransfermode; - SetTransferMode(BINARY); - command << wxT("SIZE ") << fileName; - - bool ok = CheckCommand(command, '2'); - - if ( ok ) - { - // The answer should be one line: "213 \n" - // 213 is File Status (STD9) - // "SIZE" is not described anywhere..? It works on most servers - int statuscode; - if ( wxSscanf(GetLastResult().c_str(), wxT("%i %i"), - &statuscode, &filesize) == 2 ) - { - // We've gotten a good reply. - ok = true; - } - else - { - // Something bad happened.. A "2yz" reply with no size - // Fallback - ok = false; - } - } - - // Set transfermode back to the original. Only the "SIZE"-command - // is dependent on transfermode - if ( oldTransfermode != NONE ) - { - SetTransferMode(oldTransfermode); - } - - // this is not a direct else clause.. The size command might return an - // invalid "2yz" reply - if ( !ok ) - { - // The server didn't understand the "SIZE"-command or it - // returned an invalid reply. - // We now try to get details for the file with a "LIST"-command - // and then parse the output from there.. - wxArrayString fileList; - if ( GetList(fileList, fileName, true) ) - { - if ( !fileList.IsEmpty() ) - { - // We _should_ only get one line in return, but just to be - // safe we run through the line(s) returned and look for a - // substring containing the name we are looking for. We - // stop the iteration at the first occurrence of the - // filename. The search is not case-sensitive. - const size_t numFiles = fileList.size(); - size_t i; - for ( i = 0; i < fileList.GetCount(); i++ ) - { - if ( fileList[i].Upper().Contains(fileName.Upper()) ) - break; - } - - if ( i != numFiles ) - { - // The index i points to the first occurrence of - // fileName in the array Now we have to find out what - // format the LIST has returned. There are two - // "schools": Unix-like - // - // '-rw-rw-rw- owner group size month day time filename' - // - // or Windows-like - // - // 'date size filename' - - // check if the first character is '-'. This would - // indicate Unix-style (this also limits this function - // to searching for files, not directories) - if ( fileList[i].Mid(0, 1) == wxT("-") ) - { - - if ( wxSscanf(fileList[i].c_str(), - wxT("%*s %*s %*s %*s %i %*s %*s %*s %*s"), - &filesize) != 9 ) - { - // Hmm... Invalid response - wxLogDebug(wxT("Invalid LIST response")); - } - } - else // Windows-style response (?) - { - if ( wxSscanf(fileList[i].c_str(), - wxT("%*s %*s %i %*s"), - &filesize) != 4 ) - { - // something bad happened..? - wxLogDebug(wxT("Invalid or unknown LIST response")); - } - } - } - } - } - } - } - - // filesize might still be -1 when exiting - return filesize; -} - -#endif // wxUSE_PROTOCOL_FTP - diff --git a/Externals/wxWidgets3/src/common/gaugecmn.cpp b/Externals/wxWidgets3/src/common/gaugecmn.cpp deleted file mode 100644 index e08f48e4e4..0000000000 --- a/Externals/wxWidgets3/src/common/gaugecmn.cpp +++ /dev/null @@ -1,223 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/gaugecmn.cpp -// Purpose: wxGaugeBase: common to all ports methods of wxGauge -// Author: Vadim Zeitlin -// Modified by: -// Created: 20.02.01 -// Copyright: (c) 2001 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#ifndef WX_PRECOMP -#endif //WX_PRECOMP - -#if wxUSE_GAUGE - -#include "wx/gauge.h" -#include "wx/appprogress.h" - -const char wxGaugeNameStr[] = "gauge"; - -// ============================================================================ -// implementation -// ============================================================================ - -wxGaugeBase::~wxGaugeBase() -{ - // this destructor is required for Darwin - delete m_appProgressIndicator; -} - -// ---------------------------------------------------------------------------- -// XTI -// ---------------------------------------------------------------------------- - -wxDEFINE_FLAGS( wxGaugeStyle ) -wxBEGIN_FLAGS( wxGaugeStyle ) -// new style border flags, we put them first to -// use them for streaming out -wxFLAGS_MEMBER(wxBORDER_SIMPLE) -wxFLAGS_MEMBER(wxBORDER_SUNKEN) -wxFLAGS_MEMBER(wxBORDER_DOUBLE) -wxFLAGS_MEMBER(wxBORDER_RAISED) -wxFLAGS_MEMBER(wxBORDER_STATIC) -wxFLAGS_MEMBER(wxBORDER_NONE) - -// old style border flags -wxFLAGS_MEMBER(wxSIMPLE_BORDER) -wxFLAGS_MEMBER(wxSUNKEN_BORDER) -wxFLAGS_MEMBER(wxDOUBLE_BORDER) -wxFLAGS_MEMBER(wxRAISED_BORDER) -wxFLAGS_MEMBER(wxSTATIC_BORDER) -wxFLAGS_MEMBER(wxBORDER) - -// standard window styles -wxFLAGS_MEMBER(wxTAB_TRAVERSAL) -wxFLAGS_MEMBER(wxCLIP_CHILDREN) -wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) -wxFLAGS_MEMBER(wxWANTS_CHARS) -wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE) -wxFLAGS_MEMBER(wxALWAYS_SHOW_SB ) -wxFLAGS_MEMBER(wxVSCROLL) -wxFLAGS_MEMBER(wxHSCROLL) - -wxFLAGS_MEMBER(wxGA_HORIZONTAL) -wxFLAGS_MEMBER(wxGA_VERTICAL) -wxFLAGS_MEMBER(wxGA_SMOOTH) -wxFLAGS_MEMBER(wxGA_PROGRESS) -wxEND_FLAGS( wxGaugeStyle ) - -wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxGauge, wxControl, "wx/gauge.h"); - -wxBEGIN_PROPERTIES_TABLE(wxGauge) -wxPROPERTY( Value, int, SetValue, GetValue, 0, 0 /*flags*/, \ - wxT("Helpstring"), wxT("group")) -wxPROPERTY( Range, int, SetRange, GetRange, 0, 0 /*flags*/, \ - wxT("Helpstring"), wxT("group")) - -wxPROPERTY_FLAGS( WindowStyle, wxGaugeStyle, long, SetWindowStyleFlag, \ - GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \ - wxT("Helpstring"), wxT("group")) // style -wxEND_PROPERTIES_TABLE() - -wxEMPTY_HANDLERS_TABLE(wxGauge) - -wxCONSTRUCTOR_6( wxGauge, wxWindow*, Parent, wxWindowID, Id, int, Range, \ - wxPoint, Position, wxSize, Size, long, WindowStyle ) - -// ---------------------------------------------------------------------------- -// wxGauge creation -// ---------------------------------------------------------------------------- - -void wxGaugeBase::InitProgressIndicatorIfNeeded() -{ - m_appProgressIndicator = NULL; - if ( HasFlag(wxGA_PROGRESS) ) - { - wxWindow* topParent = wxGetTopLevelParent(this); - if ( topParent != NULL ) - { - m_appProgressIndicator = - new wxAppProgressIndicator(topParent, GetRange()); - } - } -} - -bool wxGaugeBase::Create(wxWindow *parent, - wxWindowID id, - int range, - const wxPoint& pos, - const wxSize& size, - long style, - const wxValidator& validator, - const wxString& name) -{ - if ( !wxControl::Create(parent, id, pos, size, style, validator, name) ) - return false; - - SetName(name); - -#if wxUSE_VALIDATORS - SetValidator(validator); -#endif // wxUSE_VALIDATORS - - SetRange(range); - SetValue(0); - -#if wxGAUGE_EMULATE_INDETERMINATE_MODE - m_nDirection = wxRIGHT; -#endif - - InitProgressIndicatorIfNeeded(); - - return true; -} - -// ---------------------------------------------------------------------------- -// wxGauge determinate mode range/position -// ---------------------------------------------------------------------------- - -void wxGaugeBase::SetRange(int range) -{ - m_rangeMax = range; - - if ( m_appProgressIndicator ) - m_appProgressIndicator->SetRange(m_rangeMax); -} - -int wxGaugeBase::GetRange() const -{ - return m_rangeMax; -} - -void wxGaugeBase::SetValue(int pos) -{ - m_gaugePos = pos; - - if ( m_appProgressIndicator ) - { - m_appProgressIndicator->SetValue(pos); - if ( pos == 0 ) - { - m_appProgressIndicator->Reset(); - } - } -} - -int wxGaugeBase::GetValue() const -{ - return m_gaugePos; -} - -// ---------------------------------------------------------------------------- -// wxGauge indeterminate mode -// ---------------------------------------------------------------------------- - -void wxGaugeBase::Pulse() -{ -#if wxGAUGE_EMULATE_INDETERMINATE_MODE - // simulate indeterminate mode - int curr = GetValue(), max = GetRange(); - - if (m_nDirection == wxRIGHT) - { - if (curr < max) - SetValue(curr + 1); - else - { - SetValue(max - 1); - m_nDirection = wxLEFT; - } - } - else - { - if (curr > 0) - SetValue(curr - 1); - else - { - SetValue(1); - m_nDirection = wxRIGHT; - } - } -#endif - - if ( m_appProgressIndicator ) - m_appProgressIndicator->Pulse(); -} - -#endif // wxUSE_GAUGE diff --git a/Externals/wxWidgets3/src/common/gbsizer.cpp b/Externals/wxWidgets3/src/common/gbsizer.cpp deleted file mode 100644 index 3b291872a4..0000000000 --- a/Externals/wxWidgets3/src/common/gbsizer.cpp +++ /dev/null @@ -1,797 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/gbsizer.cpp -// Purpose: wxGridBagSizer: A sizer that can lay out items in a grid, -// with items at specified cells, and with the option of row -// and/or column spanning -// -// Author: Robin Dunn -// Created: 03-Nov-2003 -// Copyright: (c) Robin Dunn -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include "wx/gbsizer.h" - -//--------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxGBSizerItem, wxSizerItem); -wxIMPLEMENT_CLASS(wxGridBagSizer, wxFlexGridSizer); - -const wxGBSpan wxDefaultSpan; - -//--------------------------------------------------------------------------- -// wxGBSizerItem -//--------------------------------------------------------------------------- - -wxGBSizerItem::wxGBSizerItem( int width, - int height, - const wxGBPosition& pos, - const wxGBSpan& span, - int flag, - int border, - wxObject* userData) - : wxSizerItem(width, height, 0, flag, border, userData), - m_pos(pos), - m_span(span), - m_gbsizer(NULL) -{ -} - - -wxGBSizerItem::wxGBSizerItem( wxWindow *window, - const wxGBPosition& pos, - const wxGBSpan& span, - int flag, - int border, - wxObject* userData ) - : wxSizerItem(window, 0, flag, border, userData), - m_pos(pos), - m_span(span), - m_gbsizer(NULL) -{ -} - - -wxGBSizerItem::wxGBSizerItem( wxSizer *sizer, - const wxGBPosition& pos, - const wxGBSpan& span, - int flag, - int border, - wxObject* userData ) - : wxSizerItem(sizer, 0, flag, border, userData), - m_pos(pos), - m_span(span), - m_gbsizer(NULL) -{ -} - -wxGBSizerItem::wxGBSizerItem() - : wxSizerItem(), - m_pos(-1,-1), - m_gbsizer(NULL) -{ -} - -//--------------------------------------------------------------------------- - - -void wxGBSizerItem::GetPos(int& row, int& col) const -{ - row = m_pos.GetRow(); - col = m_pos.GetCol(); -} - -void wxGBSizerItem::GetSpan(int& rowspan, int& colspan) const -{ - rowspan = m_span.GetRowspan(); - colspan = m_span.GetColspan(); -} - - -bool wxGBSizerItem::SetPos( const wxGBPosition& pos ) -{ - if (m_gbsizer) - { - wxCHECK_MSG( !m_gbsizer->CheckForIntersection(pos, m_span, this), false, - wxT("An item is already at that position") ); - } - m_pos = pos; - return true; -} - -bool wxGBSizerItem::SetSpan( const wxGBSpan& span ) -{ - if (m_gbsizer) - { - wxCHECK_MSG( !m_gbsizer->CheckForIntersection(m_pos, span, this), false, - wxT("An item is already at that position") ); - } - m_span = span; - return true; -} - - -inline bool InRange(int val, int min, int max) -{ - return (val >= min && val <= max); -} - -bool wxGBSizerItem::Intersects(const wxGBSizerItem& other) -{ - return Intersects(other.GetPos(), other.GetSpan()); -} - -bool wxGBSizerItem::Intersects(const wxGBPosition& pos, const wxGBSpan& span) -{ - - int row, col, endrow, endcol; - int otherrow, othercol, otherendrow, otherendcol; - - GetPos(row, col); - GetEndPos(endrow, endcol); - - otherrow = pos.GetRow(); - othercol = pos.GetCol(); - otherendrow = otherrow + span.GetRowspan() - 1; - otherendcol = othercol + span.GetColspan() - 1; - - // is the other item's start or end in the range of this one? - if (( InRange(otherrow, row, endrow) && InRange(othercol, col, endcol) ) || - ( InRange(otherendrow, row, endrow) && InRange(otherendcol, col, endcol) )) - return true; - - // is this item's start or end in the range of the other one? - if (( InRange(row, otherrow, otherendrow) && InRange(col, othercol, otherendcol) ) || - ( InRange(endrow, otherrow, otherendrow) && InRange(endcol, othercol, otherendcol) )) - return true; - - return false; -} - - -void wxGBSizerItem::GetEndPos(int& row, int& col) -{ - row = m_pos.GetRow() + m_span.GetRowspan() - 1; - col = m_pos.GetCol() + m_span.GetColspan() - 1; -} - - -//--------------------------------------------------------------------------- -// wxGridBagSizer -//--------------------------------------------------------------------------- - -wxGridBagSizer::wxGridBagSizer(int vgap, int hgap ) - : wxFlexGridSizer(1, vgap, hgap), - m_emptyCellSize(10,20) - -{ -} - - -wxSizerItem* wxGridBagSizer::Add( wxWindow *window, - const wxGBPosition& pos, const wxGBSpan& span, - int flag, int border, wxObject* userData ) -{ - wxGBSizerItem* item = new wxGBSizerItem(window, pos, span, flag, border, userData); - if ( Add(item) ) - return item; - else - { - delete item; - return NULL; - } -} - -wxSizerItem* wxGridBagSizer::Add( wxSizer *sizer, - const wxGBPosition& pos, const wxGBSpan& span, - int flag, int border, wxObject* userData ) -{ - wxGBSizerItem* item = new wxGBSizerItem(sizer, pos, span, flag, border, userData); - if ( Add(item) ) - return item; - else - { - delete item; - return NULL; - } -} - -wxSizerItem* wxGridBagSizer::Add( int width, int height, - const wxGBPosition& pos, const wxGBSpan& span, - int flag, int border, wxObject* userData ) -{ - wxGBSizerItem* item = new wxGBSizerItem(width, height, pos, span, flag, border, userData); - if ( Add(item) ) - return item; - else - { - delete item; - return NULL; - } -} - -wxSizerItem* wxGridBagSizer::Add( wxGBSizerItem *item ) -{ - wxCHECK_MSG( !CheckForIntersection(item), NULL, - wxT("An item is already at that position") ); - m_children.Append(item); - item->SetGBSizer(this); - if ( item->GetWindow() ) - item->GetWindow()->SetContainingSizer( this ); - - // extend the number of rows/columns of the underlying wxFlexGridSizer if - // necessary - int row, col; - item->GetEndPos(row, col); - row++; - col++; - - if ( row > GetRows() ) - SetRows(row); - if ( col > GetCols() ) - SetCols(col); - - return item; -} - - - -//--------------------------------------------------------------------------- - -wxSize wxGridBagSizer::GetCellSize(int row, int col) const -{ - wxCHECK_MSG( (row < m_rows) && (col < m_cols), - wxDefaultSize, - wxT("Invalid cell.")); - return wxSize( m_colWidths[col], m_rowHeights[row] ); -} - - -wxGBPosition wxGridBagSizer::GetItemPosition(wxWindow *window) -{ - wxGBPosition badpos(-1,-1); - wxGBSizerItem* item = FindItem(window); - wxCHECK_MSG(item, badpos, wxT("Failed to find item.")); - return item->GetPos(); -} - - -wxGBPosition wxGridBagSizer::GetItemPosition(wxSizer *sizer) -{ - wxGBPosition badpos(-1,-1); - wxGBSizerItem* item = FindItem(sizer); - wxCHECK_MSG(item, badpos, wxT("Failed to find item.")); - return item->GetPos(); -} - - -wxGBPosition wxGridBagSizer::GetItemPosition(size_t index) -{ - wxGBPosition badpos(-1,-1); - wxSizerItemList::compatibility_iterator node = m_children.Item( index ); - wxCHECK_MSG( node, badpos, wxT("Failed to find item.") ); - wxGBSizerItem* item = (wxGBSizerItem*)node->GetData(); - return item->GetPos(); -} - - - -bool wxGridBagSizer::SetItemPosition(wxWindow *window, const wxGBPosition& pos) -{ - wxGBSizerItem* item = FindItem(window); - wxCHECK_MSG(item, false, wxT("Failed to find item.")); - return item->SetPos(pos); -} - - -bool wxGridBagSizer::SetItemPosition(wxSizer *sizer, const wxGBPosition& pos) -{ - wxGBSizerItem* item = FindItem(sizer); - wxCHECK_MSG(item, false, wxT("Failed to find item.")); - return item->SetPos(pos); -} - - -bool wxGridBagSizer::SetItemPosition(size_t index, const wxGBPosition& pos) -{ - wxSizerItemList::compatibility_iterator node = m_children.Item( index ); - wxCHECK_MSG( node, false, wxT("Failed to find item.") ); - wxGBSizerItem* item = (wxGBSizerItem*)node->GetData(); - return item->SetPos(pos); -} - - - -wxGBSpan wxGridBagSizer::GetItemSpan(wxWindow *window) -{ - wxGBSizerItem* item = FindItem(window); - wxCHECK_MSG( item, wxGBSpan::Invalid(), wxT("Failed to find item.") ); - return item->GetSpan(); -} - - -wxGBSpan wxGridBagSizer::GetItemSpan(wxSizer *sizer) -{ - wxGBSizerItem* item = FindItem(sizer); - wxCHECK_MSG( item, wxGBSpan::Invalid(), wxT("Failed to find item.") ); - return item->GetSpan(); -} - - -wxGBSpan wxGridBagSizer::GetItemSpan(size_t index) -{ - wxSizerItemList::compatibility_iterator node = m_children.Item( index ); - wxCHECK_MSG( node, wxGBSpan::Invalid(), wxT("Failed to find item.") ); - wxGBSizerItem* item = (wxGBSizerItem*)node->GetData(); - return item->GetSpan(); -} - - - -bool wxGridBagSizer::SetItemSpan(wxWindow *window, const wxGBSpan& span) -{ - wxGBSizerItem* item = FindItem(window); - wxCHECK_MSG(item, false, wxT("Failed to find item.")); - return item->SetSpan(span); -} - - -bool wxGridBagSizer::SetItemSpan(wxSizer *sizer, const wxGBSpan& span) -{ - wxGBSizerItem* item = FindItem(sizer); - wxCHECK_MSG(item, false, wxT("Failed to find item.")); - return item->SetSpan(span); -} - - -bool wxGridBagSizer::SetItemSpan(size_t index, const wxGBSpan& span) -{ - wxSizerItemList::compatibility_iterator node = m_children.Item( index ); - wxCHECK_MSG( node, false, wxT("Failed to find item.") ); - wxGBSizerItem* item = (wxGBSizerItem*)node->GetData(); - return item->SetSpan(span); -} - - - - -wxGBSizerItem* wxGridBagSizer::FindItem(wxWindow* window) -{ - wxSizerItemList::compatibility_iterator node = m_children.GetFirst(); - while (node) - { - wxGBSizerItem* item = (wxGBSizerItem*)node->GetData(); - if ( item->GetWindow() == window ) - return item; - node = node->GetNext(); - } - return NULL; -} - - -wxGBSizerItem* wxGridBagSizer::FindItem(wxSizer* sizer) -{ - wxSizerItemList::compatibility_iterator node = m_children.GetFirst(); - while (node) - { - wxGBSizerItem* item = (wxGBSizerItem*)node->GetData(); - if ( item->GetSizer() == sizer ) - return item; - node = node->GetNext(); - } - return NULL; -} - - - - -wxGBSizerItem* wxGridBagSizer::FindItemAtPosition(const wxGBPosition& pos) -{ - wxSizerItemList::compatibility_iterator node = m_children.GetFirst(); - while (node) - { - wxGBSizerItem* item = (wxGBSizerItem*)node->GetData(); - if ( item->Intersects(pos, wxDefaultSpan) ) - return item; - node = node->GetNext(); - } - return NULL; -} - - - - -wxGBSizerItem* wxGridBagSizer::FindItemAtPoint(const wxPoint& pt) -{ - wxSizerItemList::compatibility_iterator node = m_children.GetFirst(); - while (node) - { - wxGBSizerItem* item = (wxGBSizerItem*)node->GetData(); - wxRect rect(item->GetPosition(), item->GetSize()); - rect.Inflate(m_hgap, m_vgap); - if ( rect.Contains(pt) ) - return item; - node = node->GetNext(); - } - return NULL; -} - - - - -wxGBSizerItem* wxGridBagSizer::FindItemWithData(const wxObject* userData) -{ - wxSizerItemList::compatibility_iterator node = m_children.GetFirst(); - while (node) - { - wxGBSizerItem* item = (wxGBSizerItem*)node->GetData(); - if ( item->GetUserData() == userData ) - return item; - node = node->GetNext(); - } - return NULL; -} - - - - -//--------------------------------------------------------------------------- - -// Figure out what all the min row heights and col widths are, and calculate -// min size from that. -wxSize wxGridBagSizer::CalcMin() -{ - int idx; - - if (m_children.GetCount() == 0) - return m_emptyCellSize; - - m_rowHeights.Empty(); - m_colWidths.Empty(); - - wxSizerItemList::compatibility_iterator node = m_children.GetFirst(); - while (node) - { - wxGBSizerItem* item = (wxGBSizerItem*)node->GetData(); - if ( item->IsShown() ) - { - int row, col, endrow, endcol; - - item->GetPos(row, col); - item->GetEndPos(endrow, endcol); - - // fill heights and widths up to this item if needed - while ( (int)m_rowHeights.GetCount() <= endrow ) - m_rowHeights.Add(m_emptyCellSize.GetHeight()); - while ( (int)m_colWidths.GetCount() <= endcol ) - m_colWidths.Add(m_emptyCellSize.GetWidth()); - - // See if this item increases the size of its row(s) or col(s) - wxSize size(item->CalcMin()); - for (idx=row; idx <= endrow; idx++) - m_rowHeights[idx] = wxMax(m_rowHeights[idx], size.GetHeight() / (endrow-row+1)); - for (idx=col; idx <= endcol; idx++) - m_colWidths[idx] = wxMax(m_colWidths[idx], size.GetWidth() / (endcol-col+1)); - } - node = node->GetNext(); - } - - AdjustForOverflow(); - AdjustForFlexDirection(); - - // Now traverse the heights and widths arrays calcing the totals, including gaps - int width = 0; - m_cols = m_colWidths.GetCount(); - for (idx=0; idx < m_cols; idx++) - width += m_colWidths[idx] + ( idx == m_cols-1 ? 0 : m_hgap ); - - int height = 0; - m_rows = m_rowHeights.GetCount(); - for (idx=0; idx < m_rows; idx++) - height += m_rowHeights[idx] + ( idx == m_rows-1 ? 0 : m_vgap ); - - m_calculatedMinSize = wxSize(width, height); - return m_calculatedMinSize; -} - - - -void wxGridBagSizer::RecalcSizes() -{ - // We can't lay out our elements if we don't have at least a single row and - // a single column. Notice that this may happen even if we have some - // children but all of them are hidden, so checking for m_children being - // non-empty is not enough, see #15475. - if ( m_rowHeights.empty() || m_colWidths.empty() ) - return; - - wxPoint pt( GetPosition() ); - wxSize sz( GetSize() ); - - m_rows = m_rowHeights.GetCount(); - m_cols = m_colWidths.GetCount(); - int idx, width, height; - - AdjustForGrowables(sz); - - // Find the start positions on the window of the rows and columns - wxArrayInt rowpos; - rowpos.Add(0, m_rows); - int y = pt.y; - for (idx=0; idx < m_rows; idx++) - { - height = m_rowHeights[idx] + m_vgap; - rowpos[idx] = y; - y += height; - } - - wxArrayInt colpos; - colpos.Add(0, m_cols); - int x = pt.x; - for (idx=0; idx < m_cols; idx++) - { - width = m_colWidths[idx] + m_hgap; - colpos[idx] = x; - x += width; - } - - - // Now iterate the children, setting each child's dimensions - wxSizerItemList::compatibility_iterator node = m_children.GetFirst(); - while (node) - { - int row, col, endrow, endcol; - wxGBSizerItem* item = (wxGBSizerItem*)node->GetData(); - - if ( item->IsShown() ) - { - item->GetPos(row, col); - item->GetEndPos(endrow, endcol); - - height = 0; - for(idx=row; idx <= endrow; idx++) - height += m_rowHeights[idx]; - height += (endrow - row) * m_vgap; // add a vgap for every row spanned - - width = 0; - for (idx=col; idx <= endcol; idx++) - width += m_colWidths[idx]; - width += (endcol - col) * m_hgap; // add a hgap for every col spanned - - SetItemBounds(item, colpos[col], rowpos[row], width, height); - } - - node = node->GetNext(); - } -} - - -// Sometimes CalcMin can result in some rows or cols having too much space in -// them because as it traverses the items it makes some assumptions when -// items span to other cells. But those assumptions can become invalid later -// on when other items are fitted into the same rows or columns that the -// spanning item occupies. This method tries to find those situations and -// fixes them. -void wxGridBagSizer::AdjustForOverflow() -{ - int row, col; - - for (row=0; row<(int)m_rowHeights.GetCount(); row++) - { - int rowExtra=INT_MAX; - int rowHeight = m_rowHeights[row]; - for (col=0; col<(int)m_colWidths.GetCount(); col++) - { - wxGBPosition pos(row,col); - wxGBSizerItem* item = FindItemAtPosition(pos); - if ( !item || !item->IsShown() ) - continue; - - int endrow, endcol; - item->GetEndPos(endrow, endcol); - - // If the item starts in this position and doesn't span rows, then - // just look at the whole item height - if ( item->GetPos() == pos && endrow == row ) - { - int itemHeight = item->CalcMin().GetHeight(); - rowExtra = wxMin(rowExtra, rowHeight - itemHeight); - continue; - } - - // Otherwise, only look at spanning items if they end on this row - if ( endrow == row ) - { - // first deduct the portions of the item that are on prior rows - int itemHeight = item->CalcMin().GetHeight(); - for (int r=item->GetPos().GetRow(); rIsShown() ) - continue; - - int endrow, endcol; - item->GetEndPos(endrow, endcol); - - if ( item->GetPos() == pos && endcol == col ) - { - int itemWidth = item->CalcMin().GetWidth(); - colExtra = wxMin(colExtra, colWidth - itemWidth); - continue; - } - - if ( endcol == col ) - { - int itemWidth = item->CalcMin().GetWidth(); - for (int c=item->GetPos().GetCol(); cGetPos(), item->GetSpan(), excludeItem); -} - -bool wxGridBagSizer::CheckForIntersection(const wxGBPosition& pos, const wxGBSpan& span, wxGBSizerItem* excludeItem) -{ - wxSizerItemList::compatibility_iterator node = m_children.GetFirst(); - while (node) - { - wxGBSizerItem* item = (wxGBSizerItem*)node->GetData(); - node = node->GetNext(); - - if ( excludeItem && item == excludeItem ) - continue; - - if ( item->Intersects(pos, span) ) - return true; - - } - return false; -} - - -// Assumes a 10x10 grid, and returns the first empty cell found. This is -// really stupid but it is only used by the Add methods that match the base -// class virtuals, which should normally not be used anyway... -wxGBPosition wxGridBagSizer::FindEmptyCell() -{ - int row, col; - - for (row=0; row<10; row++) - for (col=0; col<10; col++) - { - wxGBPosition pos(row, col); - if ( !CheckForIntersection(pos, wxDefaultSpan) ) - return pos; - } - return wxGBPosition(-1, -1); -} - - -//--------------------------------------------------------------------------- - -// The Add base class virtuals should not be used with this class, but -// we'll try to make them automatically select a location for the item -// anyway. - -wxSizerItem* wxGridBagSizer::Add( wxWindow *window, int, int flag, int border, wxObject* userData ) -{ - return Add(window, FindEmptyCell(), wxDefaultSpan, flag, border, userData); -} - -wxSizerItem* wxGridBagSizer::Add( wxSizer *sizer, int, int flag, int border, wxObject* userData ) -{ - return Add(sizer, FindEmptyCell(), wxDefaultSpan, flag, border, userData); -} - -wxSizerItem* wxGridBagSizer::Add( int width, int height, int, int flag, int border, wxObject* userData ) -{ - return Add(width, height, FindEmptyCell(), wxDefaultSpan, flag, border, userData); -} - - - -// The Insert nad Prepend base class virtuals that are not appropriate for -// this class and should not be used. Their implementation in this class -// simply fails. - -wxSizerItem* wxGridBagSizer::Add( wxSizerItem * ) -{ - wxFAIL_MSG(wxT("Invalid Add form called.")); - return NULL; -} - -wxSizerItem* wxGridBagSizer::Prepend( wxWindow *, int, int, int, wxObject* ) -{ - wxFAIL_MSG(wxT("Prepend should not be used with wxGridBagSizer.")); - return NULL; -} - -wxSizerItem* wxGridBagSizer::Prepend( wxSizer *, int, int, int, wxObject* ) -{ - wxFAIL_MSG(wxT("Prepend should not be used with wxGridBagSizer.")); - return NULL; -} - -wxSizerItem* wxGridBagSizer::Prepend( int, int, int, int, int, wxObject* ) -{ - wxFAIL_MSG(wxT("Prepend should not be used with wxGridBagSizer.")); - return NULL; -} - -wxSizerItem* wxGridBagSizer::Prepend( wxSizerItem * ) -{ - wxFAIL_MSG(wxT("Prepend should not be used with wxGridBagSizer.")); - return NULL; -} - - -wxSizerItem* wxGridBagSizer::Insert( size_t, wxWindow *, int, int, int, wxObject* ) -{ - wxFAIL_MSG(wxT("Insert should not be used with wxGridBagSizer.")); - return NULL; -} - -wxSizerItem* wxGridBagSizer::Insert( size_t, wxSizer *, int, int, int, wxObject* ) -{ - wxFAIL_MSG(wxT("Insert should not be used with wxGridBagSizer.")); - return NULL; -} - -wxSizerItem* wxGridBagSizer::Insert( size_t, int, int, int, int, int, wxObject* ) -{ - wxFAIL_MSG(wxT("Insert should not be used with wxGridBagSizer.")); - return NULL; -} - -wxSizerItem* wxGridBagSizer::Insert( size_t, wxSizerItem * ) -{ - wxFAIL_MSG(wxT("Insert should not be used with wxGridBagSizer.")); - return NULL; -} - - -//--------------------------------------------------------------------------- -//--------------------------------------------------------------------------- diff --git a/Externals/wxWidgets3/src/common/gdicmn.cpp b/Externals/wxWidgets3/src/common/gdicmn.cpp deleted file mode 100644 index 96a5417167..0000000000 --- a/Externals/wxWidgets3/src/common/gdicmn.cpp +++ /dev/null @@ -1,873 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/gdicmn.cpp -// Purpose: Common GDI classes -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include "wx/gdicmn.h" -#include "wx/gdiobj.h" - -#ifndef WX_PRECOMP - #include "wx/log.h" - #include "wx/pen.h" - #include "wx/brush.h" - #include "wx/palette.h" - #include "wx/icon.h" - #include "wx/iconbndl.h" - #include "wx/cursor.h" - #include "wx/settings.h" - #include "wx/bitmap.h" - #include "wx/colour.h" - #include "wx/font.h" - #include "wx/math.h" -#endif - - -wxIMPLEMENT_ABSTRACT_CLASS(wxGDIObject, wxObject); - - -WXDLLIMPEXP_DATA_CORE(wxBrushList*) wxTheBrushList; -WXDLLIMPEXP_DATA_CORE(wxFontList*) wxTheFontList; -WXDLLIMPEXP_DATA_CORE(wxPenList*) wxThePenList; - -WXDLLIMPEXP_DATA_CORE(wxColourDatabase*) wxTheColourDatabase; - -WXDLLIMPEXP_DATA_CORE(wxBitmap) wxNullBitmap; -WXDLLIMPEXP_DATA_CORE(wxBrush) wxNullBrush; -WXDLLIMPEXP_DATA_CORE(wxColour) wxNullColour; -WXDLLIMPEXP_DATA_CORE(wxCursor) wxNullCursor; -WXDLLIMPEXP_DATA_CORE(wxFont) wxNullFont; -WXDLLIMPEXP_DATA_CORE(wxIcon) wxNullIcon; -WXDLLIMPEXP_DATA_CORE(wxPen) wxNullPen; -#if wxUSE_PALETTE -WXDLLIMPEXP_DATA_CORE(wxPalette) wxNullPalette; -#endif -WXDLLIMPEXP_DATA_CORE(wxIconBundle) wxNullIconBundle; - -const wxSize wxDefaultSize(wxDefaultCoord, wxDefaultCoord); -const wxPoint wxDefaultPosition(wxDefaultCoord, wxDefaultCoord); - -#include "wx/listimpl.cpp" -WX_DEFINE_LIST(wxPointList) - - -#if wxUSE_EXTENDED_RTTI - -// wxPoint - -template<> void wxStringReadValue(const wxString &s , wxPoint &data ) -{ - wxSscanf(s, wxT("%d,%d"), &data.x , &data.y ) ; -} - -template<> void wxStringWriteValue(wxString &s , const wxPoint &data ) -{ - s = wxString::Format(wxT("%d,%d"), data.x , data.y ) ; -} - -wxCUSTOM_TYPE_INFO(wxPoint, wxToStringConverter , wxFromStringConverter) - -template<> void wxStringReadValue(const wxString &s , wxSize &data ) -{ - wxSscanf(s, wxT("%d,%d"), &data.x , &data.y ) ; -} - -template<> void wxStringWriteValue(wxString &s , const wxSize &data ) -{ - s = wxString::Format(wxT("%d,%d"), data.x , data.y ) ; -} - -wxCUSTOM_TYPE_INFO(wxSize, wxToStringConverter , wxFromStringConverter) - -#endif - -wxRect::wxRect(const wxPoint& point1, const wxPoint& point2) -{ - x = point1.x; - y = point1.y; - width = point2.x - point1.x; - height = point2.y - point1.y; - - if (width < 0) - { - width = -width; - x = point2.x; - } - width++; - - if (height < 0) - { - height = -height; - y = point2.y; - } - height++; -} - -wxRect& wxRect::Union(const wxRect& rect) -{ - // ignore empty rectangles: union with an empty rectangle shouldn't extend - // this one to (0, 0) - if ( !width || !height ) - { - *this = rect; - } - else if ( rect.width && rect.height ) - { - int x1 = wxMin(x, rect.x); - int y1 = wxMin(y, rect.y); - int y2 = wxMax(y + height, rect.height + rect.y); - int x2 = wxMax(x + width, rect.width + rect.x); - - x = x1; - y = y1; - width = x2 - x1; - height = y2 - y1; - } - //else: we're not empty and rect is empty - - return *this; -} - -wxRect& wxRect::Inflate(wxCoord dx, wxCoord dy) -{ - if (-2*dx>width) - { - // Don't allow deflate to eat more width than we have, - // a well-defined rectangle cannot have negative width. - x+=width/2; - width=0; - } - else - { - // The inflate is valid. - x-=dx; - width+=2*dx; - } - - if (-2*dy>height) - { - // Don't allow deflate to eat more height than we have, - // a well-defined rectangle cannot have negative height. - y+=height/2; - height=0; - } - else - { - // The inflate is valid. - y-=dy; - height+=2*dy; - } - - return *this; -} - -bool wxRect::Contains(int cx, int cy) const -{ - return ( (cx >= x) && (cy >= y) - && ((cy - y) < height) - && ((cx - x) < width) - ); -} - -bool wxRect::Contains(const wxRect& rect) const -{ - return Contains(rect.GetTopLeft()) && Contains(rect.GetBottomRight()); -} - -wxRect& wxRect::Intersect(const wxRect& rect) -{ - int x2 = GetRight(), - y2 = GetBottom(); - - if ( x < rect.x ) - x = rect.x; - if ( y < rect.y ) - y = rect.y; - if ( x2 > rect.GetRight() ) - x2 = rect.GetRight(); - if ( y2 > rect.GetBottom() ) - y2 = rect.GetBottom(); - - width = x2 - x + 1; - height = y2 - y + 1; - - if ( width <= 0 || height <= 0 ) - { - width = - height = 0; - } - - return *this; -} - -bool wxRect::Intersects(const wxRect& rect) const -{ - wxRect r = Intersect(rect); - - // if there is no intersection, both width and height are 0 - return r.width != 0; -} - -wxRect& wxRect::operator+=(const wxRect& rect) -{ - *this = *this + rect; - return *this; -} - - -wxRect& wxRect::operator*=(const wxRect& rect) -{ - *this = *this * rect; - return *this; -} - - -wxRect operator+(const wxRect& r1, const wxRect& r2) -{ - int x1 = wxMin(r1.x, r2.x); - int y1 = wxMin(r1.y, r2.y); - int y2 = wxMax(r1.y+r1.height, r2.height+r2.y); - int x2 = wxMax(r1.x+r1.width, r2.width+r2.x); - return wxRect(x1, y1, x2-x1, y2-y1); -} - -wxRect operator*(const wxRect& r1, const wxRect& r2) -{ - int x1 = wxMax(r1.x, r2.x); - int y1 = wxMax(r1.y, r2.y); - int y2 = wxMin(r1.y+r1.height, r2.height+r2.y); - int x2 = wxMin(r1.x+r1.width, r2.width+r2.x); - return wxRect(x1, y1, x2-x1, y2-y1); -} - -wxRealPoint::wxRealPoint(const wxPoint& pt) - : x(pt.x), y(pt.y) -{ -} - -// ============================================================================ -// wxColourDatabase -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxColourDatabase ctor/dtor -// ---------------------------------------------------------------------------- - -wxColourDatabase::wxColourDatabase () -{ - // will be created on demand in Initialize() - m_map = NULL; -} - -wxColourDatabase::~wxColourDatabase () -{ - if ( m_map ) - { - WX_CLEAR_HASH_MAP(wxStringToColourHashMap, *m_map); - - delete m_map; - } -} - -// Colour database stuff -void wxColourDatabase::Initialize() -{ - if ( m_map ) - { - // already initialized - return; - } - - m_map = new wxStringToColourHashMap; - - static const struct wxColourDesc - { - const wxChar *name; - unsigned char r,g,b; - } - wxColourTable[] = - { - {wxT("AQUAMARINE"),112, 219, 147}, - {wxT("BLACK"),0, 0, 0}, - {wxT("BLUE"), 0, 0, 255}, - {wxT("BLUE VIOLET"), 159, 95, 159}, - {wxT("BROWN"), 165, 42, 42}, - {wxT("CADET BLUE"), 95, 159, 159}, - {wxT("CORAL"), 255, 127, 0}, - {wxT("CORNFLOWER BLUE"), 66, 66, 111}, - {wxT("CYAN"), 0, 255, 255}, - {wxT("DARK GREY"), 47, 47, 47}, // ? - - {wxT("DARK GREEN"), 47, 79, 47}, - {wxT("DARK OLIVE GREEN"), 79, 79, 47}, - {wxT("DARK ORCHID"), 153, 50, 204}, - {wxT("DARK SLATE BLUE"), 107, 35, 142}, - {wxT("DARK SLATE GREY"), 47, 79, 79}, - {wxT("DARK TURQUOISE"), 112, 147, 219}, - {wxT("DIM GREY"), 84, 84, 84}, - {wxT("FIREBRICK"), 142, 35, 35}, - {wxT("FOREST GREEN"), 35, 142, 35}, - {wxT("GOLD"), 204, 127, 50}, - {wxT("GOLDENROD"), 219, 219, 112}, - {wxT("GREY"), 128, 128, 128}, - {wxT("GREEN"), 0, 255, 0}, - {wxT("GREEN YELLOW"), 147, 219, 112}, - {wxT("INDIAN RED"), 79, 47, 47}, - {wxT("KHAKI"), 159, 159, 95}, - {wxT("LIGHT BLUE"), 191, 216, 216}, - {wxT("LIGHT GREY"), 192, 192, 192}, - {wxT("LIGHT STEEL BLUE"), 143, 143, 188}, - {wxT("LIME GREEN"), 50, 204, 50}, - {wxT("LIGHT MAGENTA"), 255, 119, 255}, - {wxT("MAGENTA"), 255, 0, 255}, - {wxT("MAROON"), 142, 35, 107}, - {wxT("MEDIUM AQUAMARINE"), 50, 204, 153}, - {wxT("MEDIUM GREY"), 100, 100, 100}, - {wxT("MEDIUM BLUE"), 50, 50, 204}, - {wxT("MEDIUM FOREST GREEN"), 107, 142, 35}, - {wxT("MEDIUM GOLDENROD"), 234, 234, 173}, - {wxT("MEDIUM ORCHID"), 147, 112, 219}, - {wxT("MEDIUM SEA GREEN"), 66, 111, 66}, - {wxT("MEDIUM SLATE BLUE"), 127, 0, 255}, - {wxT("MEDIUM SPRING GREEN"), 127, 255, 0}, - {wxT("MEDIUM TURQUOISE"), 112, 219, 219}, - {wxT("MEDIUM VIOLET RED"), 219, 112, 147}, - {wxT("MIDNIGHT BLUE"), 47, 47, 79}, - {wxT("NAVY"), 35, 35, 142}, - {wxT("ORANGE"), 204, 50, 50}, - {wxT("ORANGE RED"), 255, 0, 127}, - {wxT("ORCHID"), 219, 112, 219}, - {wxT("PALE GREEN"), 143, 188, 143}, - {wxT("PINK"), 255, 192, 203}, - {wxT("PLUM"), 234, 173, 234}, - {wxT("PURPLE"), 176, 0, 255}, - {wxT("RED"), 255, 0, 0}, - {wxT("SALMON"), 111, 66, 66}, - {wxT("SEA GREEN"), 35, 142, 107}, - {wxT("SIENNA"), 142, 107, 35}, - {wxT("SKY BLUE"), 50, 153, 204}, - {wxT("SLATE BLUE"), 0, 127, 255}, - {wxT("SPRING GREEN"), 0, 255, 127}, - {wxT("STEEL BLUE"), 35, 107, 142}, - {wxT("TAN"), 219, 147, 112}, - {wxT("THISTLE"), 216, 191, 216}, - {wxT("TURQUOISE"), 173, 234, 234}, - {wxT("VIOLET"), 79, 47, 79}, - {wxT("VIOLET RED"), 204, 50, 153}, - {wxT("WHEAT"), 216, 216, 191}, - {wxT("WHITE"), 255, 255, 255}, - {wxT("YELLOW"), 255, 255, 0}, - {wxT("YELLOW GREEN"), 153, 204, 50} - }; - - size_t n; - - for ( n = 0; n < WXSIZEOF(wxColourTable); n++ ) - { - const wxColourDesc& cc = wxColourTable[n]; - (*m_map)[cc.name] = new wxColour(cc.r, cc.g, cc.b); - } -} - -// ---------------------------------------------------------------------------- -// wxColourDatabase operations -// ---------------------------------------------------------------------------- - -void wxColourDatabase::AddColour(const wxString& name, const wxColour& colour) -{ - Initialize(); - - // canonicalize the colour names before using them as keys: they should be - // in upper case - wxString colName = name; - colName.MakeUpper(); - - // ... and we also allow both grey/gray - wxString colNameAlt = colName; - if ( !colNameAlt.Replace(wxT("GRAY"), wxT("GREY")) ) - { - // but in this case it is not necessary so avoid extra search below - colNameAlt.clear(); - } - - wxStringToColourHashMap::iterator it = m_map->find(colName); - if ( it == m_map->end() && !colNameAlt.empty() ) - it = m_map->find(colNameAlt); - if ( it != m_map->end() ) - { - *(it->second) = colour; - } - else // new colour - { - (*m_map)[colName] = new wxColour(colour); - } -} - -wxColour wxColourDatabase::Find(const wxString& colour) const -{ - wxColourDatabase * const self = wxConstCast(this, wxColourDatabase); - self->Initialize(); - - // make the comparaison case insensitive and also match both grey and gray - wxString colName = colour; - colName.MakeUpper(); - wxString colNameAlt = colName; - if ( !colNameAlt.Replace(wxT("GRAY"), wxT("GREY")) ) - colNameAlt.clear(); - - wxStringToColourHashMap::iterator it = m_map->find(colName); - if ( it == m_map->end() && !colNameAlt.empty() ) - it = m_map->find(colNameAlt); - if ( it != m_map->end() ) - return *(it->second); - - // we did not find any result in existing colours: - // we won't use wxString -> wxColour conversion because the - // wxColour::Set(const wxString &) function which does that conversion - // internally uses this function (wxColourDatabase::Find) and we want - // to avoid infinite recursion ! - return wxNullColour; -} - -wxString wxColourDatabase::FindName(const wxColour& colour) const -{ - wxColourDatabase * const self = wxConstCast(this, wxColourDatabase); - self->Initialize(); - - typedef wxStringToColourHashMap::iterator iterator; - - for ( iterator it = m_map->begin(), en = m_map->end(); it != en; ++it ) - { - if ( *(it->second) == colour ) - return it->first; - } - - return wxEmptyString; -} - -// ============================================================================ -// stock objects -// ============================================================================ - -static wxStockGDI gs_wxStockGDI_instance; -wxStockGDI* wxStockGDI::ms_instance = &gs_wxStockGDI_instance; -wxObject* wxStockGDI::ms_stockObject[ITEMCOUNT]; - -wxStockGDI::wxStockGDI() -{ -} - -wxStockGDI::~wxStockGDI() -{ -} - -void wxStockGDI::DeleteAll() -{ - for (unsigned i = 0; i < ITEMCOUNT; i++) - { - wxDELETE(ms_stockObject[i]); - } -} - -const wxBrush* wxStockGDI::GetBrush(Item item) -{ - wxBrush* brush = static_cast(ms_stockObject[item]); - if (brush == NULL) - { - switch (item) - { - case BRUSH_BLACK: - brush = new wxBrush(*GetColour(COLOUR_BLACK), wxBRUSHSTYLE_SOLID); - break; - case BRUSH_BLUE: - brush = new wxBrush(*GetColour(COLOUR_BLUE), wxBRUSHSTYLE_SOLID); - break; - case BRUSH_CYAN: - brush = new wxBrush(*GetColour(COLOUR_CYAN), wxBRUSHSTYLE_SOLID); - break; - case BRUSH_GREEN: - brush = new wxBrush(*GetColour(COLOUR_GREEN), wxBRUSHSTYLE_SOLID); - break; - case BRUSH_YELLOW: - brush = new wxBrush(*GetColour(COLOUR_YELLOW), wxBRUSHSTYLE_SOLID); - break; - case BRUSH_GREY: - brush = new wxBrush(wxColour(wxT("GREY")), wxBRUSHSTYLE_SOLID); - break; - case BRUSH_LIGHTGREY: - brush = new wxBrush(*GetColour(COLOUR_LIGHTGREY), wxBRUSHSTYLE_SOLID); - break; - case BRUSH_MEDIUMGREY: - brush = new wxBrush(wxColour(wxT("MEDIUM GREY")), wxBRUSHSTYLE_SOLID); - break; - case BRUSH_RED: - brush = new wxBrush(*GetColour(COLOUR_RED), wxBRUSHSTYLE_SOLID); - break; - case BRUSH_TRANSPARENT: - brush = new wxBrush(*GetColour(COLOUR_BLACK), wxBRUSHSTYLE_TRANSPARENT); - break; - case BRUSH_WHITE: - brush = new wxBrush(*GetColour(COLOUR_WHITE), wxBRUSHSTYLE_SOLID); - break; - default: - wxFAIL; - } - ms_stockObject[item] = brush; - } - return brush; -} - -const wxColour* wxStockGDI::GetColour(Item item) -{ - wxColour* colour = static_cast(ms_stockObject[item]); - if (colour == NULL) - { - switch (item) - { - case COLOUR_BLACK: - colour = new wxColour(0, 0, 0); - break; - case COLOUR_BLUE: - colour = new wxColour(0, 0, 255); - break; - case COLOUR_CYAN: - colour = new wxColour(wxT("CYAN")); - break; - case COLOUR_GREEN: - colour = new wxColour(0, 255, 0); - break; - case COLOUR_YELLOW: - colour = new wxColour(255, 255, 0); - break; - case COLOUR_LIGHTGREY: - colour = new wxColour(wxT("LIGHT GREY")); - break; - case COLOUR_RED: - colour = new wxColour(255, 0, 0); - break; - case COLOUR_WHITE: - colour = new wxColour(255, 255, 255); - break; - default: - wxFAIL; - } - ms_stockObject[item] = colour; - } - return colour; -} - -const wxCursor* wxStockGDI::GetCursor(Item item) -{ - wxCursor* cursor = static_cast(ms_stockObject[item]); - if (cursor == NULL) - { - switch (item) - { - case CURSOR_CROSS: - cursor = new wxCursor(wxCURSOR_CROSS); - break; - case CURSOR_HOURGLASS: - cursor = new wxCursor(wxCURSOR_WAIT); - break; - case CURSOR_STANDARD: - cursor = new wxCursor(wxCURSOR_ARROW); - break; - default: - wxFAIL; - } - ms_stockObject[item] = cursor; - } - return cursor; -} - -const wxFont* wxStockGDI::GetFont(Item item) -{ - wxFont* font = static_cast(ms_stockObject[item]); - if (font == NULL) - { - switch (item) - { - case FONT_ITALIC: - font = new wxFont(GetFont(FONT_NORMAL)->GetPointSize(), - wxFONTFAMILY_ROMAN, wxFONTSTYLE_ITALIC, wxFONTWEIGHT_NORMAL); - break; - case FONT_NORMAL: - font = new wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); - break; - case FONT_SMALL: - font = new wxFont(GetFont(FONT_NORMAL)->GetPointSize() - // Using the font 2 points smaller than the normal one - // results in font so small as to be unreadable under MSW. - // We might want to actually use -1 under the other - // platforms too but for now be conservative and keep -2 - // there for compatibility with the old behaviour as the - // small font seems to be readable enough there as it is. -#ifdef __WXMSW__ - - 1, -#else - - 2, -#endif - wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL); - break; - case FONT_SWISS: - font = new wxFont(GetFont(FONT_NORMAL)->GetPointSize(), - wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL); - break; - default: - wxFAIL; - } - ms_stockObject[item] = font; - } - return font; -} - -const wxPen* wxStockGDI::GetPen(Item item) -{ - wxPen* pen = static_cast(ms_stockObject[item]); - if (pen == NULL) - { - switch (item) - { - case PEN_BLACK: - pen = new wxPen(*GetColour(COLOUR_BLACK), 1, wxPENSTYLE_SOLID); - break; - case PEN_BLACKDASHED: - pen = new wxPen(*GetColour(COLOUR_BLACK), 1, wxPENSTYLE_SHORT_DASH); - break; - case PEN_BLUE: - pen = new wxPen(*GetColour(COLOUR_BLUE), 1, wxPENSTYLE_SOLID); - break; - case PEN_CYAN: - pen = new wxPen(*GetColour(COLOUR_CYAN), 1, wxPENSTYLE_SOLID); - break; - case PEN_GREEN: - pen = new wxPen(*GetColour(COLOUR_GREEN), 1, wxPENSTYLE_SOLID); - break; - case PEN_YELLOW: - pen = new wxPen(*GetColour(COLOUR_YELLOW), 1, wxPENSTYLE_SOLID); - break; - case PEN_GREY: - pen = new wxPen(wxColour(wxT("GREY")), 1, wxPENSTYLE_SOLID); - break; - case PEN_LIGHTGREY: - pen = new wxPen(*GetColour(COLOUR_LIGHTGREY), 1, wxPENSTYLE_SOLID); - break; - case PEN_MEDIUMGREY: - pen = new wxPen(wxColour(wxT("MEDIUM GREY")), 1, wxPENSTYLE_SOLID); - break; - case PEN_RED: - pen = new wxPen(*GetColour(COLOUR_RED), 1, wxPENSTYLE_SOLID); - break; - case PEN_TRANSPARENT: - pen = new wxPen(*GetColour(COLOUR_BLACK), 1, wxPENSTYLE_TRANSPARENT); - break; - case PEN_WHITE: - pen = new wxPen(*GetColour(COLOUR_WHITE), 1, wxPENSTYLE_SOLID); - break; - default: - wxFAIL; - } - ms_stockObject[item] = pen; - } - return pen; -} - -void wxInitializeStockLists() -{ - wxTheColourDatabase = new wxColourDatabase; - - wxTheBrushList = new wxBrushList; - wxThePenList = new wxPenList; - wxTheFontList = new wxFontList; -} - -void wxDeleteStockLists() -{ - wxDELETE(wxTheBrushList); - wxDELETE(wxThePenList); - wxDELETE(wxTheFontList); - - // wxTheColourDatabase is cleaned up by wxAppBase::CleanUp() -} - -// ============================================================================ -// wxTheXXXList stuff (semi-obsolete) -// ============================================================================ - -wxGDIObjListBase::wxGDIObjListBase() -{ -} - -wxGDIObjListBase::~wxGDIObjListBase() -{ - for (wxList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext()) - { - delete static_cast(node->GetData()); - } -} - -wxPen *wxPenList::FindOrCreatePen (const wxColour& colour, int width, wxPenStyle style) -{ - for ( wxList::compatibility_iterator node = list.GetFirst(); - node; - node = node->GetNext() ) - { - wxPen * const pen = (wxPen *) node->GetData(); - if ( pen->GetWidth () == width && - pen->GetStyle () == style && - pen->GetColour() == colour ) - return pen; - } - - wxPen* pen = NULL; - wxPen penTmp(colour, width, style); - if (penTmp.IsOk()) - { - pen = new wxPen(penTmp); - list.Append(pen); - } - - return pen; -} - -wxBrush *wxBrushList::FindOrCreateBrush (const wxColour& colour, wxBrushStyle style) -{ - for ( wxList::compatibility_iterator node = list.GetFirst(); - node; - node = node->GetNext() ) - { - wxBrush * const brush = (wxBrush *) node->GetData (); - if ( brush->GetStyle() == style && brush->GetColour() == colour ) - return brush; - } - - wxBrush* brush = NULL; - wxBrush brushTmp(colour, style); - if (brushTmp.IsOk()) - { - brush = new wxBrush(brushTmp); - list.Append(brush); - } - - return brush; -} - -wxFont *wxFontList::FindOrCreateFont(int pointSize, - wxFontFamily family, - wxFontStyle style, - wxFontWeight weight, - bool underline, - const wxString& facename, - wxFontEncoding encoding) -{ - // In all ports but wxOSX, the effective family of a font created using - // wxFONTFAMILY_DEFAULT is wxFONTFAMILY_SWISS so this is what we need to - // use for comparison. - // - // In wxOSX the original wxFONTFAMILY_DEFAULT seems to be kept and it uses - // a different font than wxFONTFAMILY_SWISS anyhow so we just preserve it. -#ifndef __WXOSX__ - if ( family == wxFONTFAMILY_DEFAULT ) - family = wxFONTFAMILY_SWISS; -#endif // !__WXOSX__ - - wxFont *font; - wxList::compatibility_iterator node; - for (node = list.GetFirst(); node; node = node->GetNext()) - { - font = (wxFont *)node->GetData(); - if ( - font->GetPointSize () == pointSize && - font->GetStyle () == style && - font->GetWeight () == weight && - font->GetUnderlined () == underline ) - { - // empty facename matches anything at all: this is bad because - // depending on which fonts are already created, we might get back - // a different font if we create it with empty facename, but it is - // still better than never matching anything in the cache at all - // in this case - bool same; - const wxString fontFaceName(font->GetFaceName()); - - if (facename.empty() || fontFaceName.empty()) - same = font->GetFamily() == family; - else - same = fontFaceName == facename; - - if ( same && (encoding != wxFONTENCODING_DEFAULT) ) - { - // have to match the encoding too - same = font->GetEncoding() == encoding; - } - - if ( same ) - { - return font; - } - } - } - - // font not found, create the new one - font = NULL; - wxFont fontTmp(pointSize, family, style, weight, underline, facename, encoding); - if (fontTmp.IsOk()) - { - font = new wxFont(fontTmp); - list.Append(font); - } - - return font; -} - -wxSize wxGetDisplaySize() -{ - int x, y; - wxDisplaySize(& x, & y); - return wxSize(x, y); -} - -wxRect wxGetClientDisplayRect() -{ - int x, y, width, height; - wxClientDisplayRect(&x, &y, &width, &height); // call plat-specific version - return wxRect(x, y, width, height); -} - -wxSize wxGetDisplaySizeMM() -{ - int x, y; - wxDisplaySizeMM(& x, & y); - return wxSize(x, y); -} - -wxSize wxGetDisplayPPI() -{ - const wxSize pixels = wxGetDisplaySize(); - const wxSize mm = wxGetDisplaySizeMM(); - - return wxSize((int)((pixels.x * inches2mm) / mm.x), - (int)((pixels.y * inches2mm) / mm.y)); -} - -wxResourceCache::~wxResourceCache () -{ - wxList::compatibility_iterator node = GetFirst (); - while (node) { - wxObject *item = (wxObject *)node->GetData(); - delete item; - - node = node->GetNext (); - } -} diff --git a/Externals/wxWidgets3/src/common/geometry.cpp b/Externals/wxWidgets3/src/common/geometry.cpp deleted file mode 100644 index 3f1cd03a89..0000000000 --- a/Externals/wxWidgets3/src/common/geometry.cpp +++ /dev/null @@ -1,410 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/geometry.cpp -// Purpose: Common Geometry Classes -// Author: Stefan Csomor -// Modified by: -// Created: 08/05/99 -// Copyright: (c) 1999 Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_GEOMETRY - -#include "wx/geometry.h" - -#ifndef WX_PRECOMP - #include "wx/log.h" -#endif - -#include - -#include "wx/datstrm.h" - -// -// wxPoint2D -// - -// -// wxRect2D -// - -// wxDouble version - -// for the following calculations always remember -// that the right and bottom edges are not part of a rect - -bool wxRect2DDouble::Intersects( const wxRect2DDouble &rect ) const -{ - wxDouble left,right,bottom,top; - left = wxMax ( m_x , rect.m_x ); - right = wxMin ( m_x+m_width, rect.m_x + rect.m_width ); - top = wxMax ( m_y , rect.m_y ); - bottom = wxMin ( m_y+m_height, rect.m_y + rect.m_height ); - - if ( left < right && top < bottom ) - { - return true; - } - return false; -} - -void wxRect2DDouble::Intersect( const wxRect2DDouble &src1 , const wxRect2DDouble &src2 , wxRect2DDouble *dest ) -{ - wxDouble left,right,bottom,top; - left = wxMax ( src1.m_x , src2.m_x ); - right = wxMin ( src1.m_x+src1.m_width, src2.m_x + src2.m_width ); - top = wxMax ( src1.m_y , src2.m_y ); - bottom = wxMin ( src1.m_y+src1.m_height, src2.m_y + src2.m_height ); - - if ( left < right && top < bottom ) - { - dest->m_x = left; - dest->m_y = top; - dest->m_width = right - left; - dest->m_height = bottom - top; - } - else - { - dest->m_width = dest->m_height = 0; - } -} - -void wxRect2DDouble::Union( const wxRect2DDouble &src1 , const wxRect2DDouble &src2 , wxRect2DDouble *dest ) -{ - wxDouble left,right,bottom,top; - - left = wxMin ( src1.m_x , src2.m_x ); - right = wxMax ( src1.m_x+src1.m_width, src2.m_x + src2.m_width ); - top = wxMin ( src1.m_y , src2.m_y ); - bottom = wxMax ( src1.m_y+src1.m_height, src2.m_y + src2.m_height ); - - dest->m_x = left; - dest->m_y = top; - dest->m_width = right - left; - dest->m_height = bottom - top; -} - -void wxRect2DDouble::Union( const wxPoint2DDouble &pt ) -{ - wxDouble x = pt.m_x; - wxDouble y = pt.m_y; - - if ( x < m_x ) - { - SetLeft( x ); - } - else if ( x < m_x + m_width ) - { - // contained - } - else - { - SetRight( x ); - } - - if ( y < m_y ) - { - SetTop( y ); - } - else if ( y < m_y + m_height ) - { - // contained - } - else - { - SetBottom( y ); - } -} - -void wxRect2DDouble::ConstrainTo( const wxRect2DDouble &rect ) -{ - if ( GetLeft() < rect.GetLeft() ) - SetLeft( rect.GetLeft() ); - - if ( GetRight() > rect.GetRight() ) - SetRight( rect.GetRight() ); - - if ( GetBottom() > rect.GetBottom() ) - SetBottom( rect.GetBottom() ); - - if ( GetTop() < rect.GetTop() ) - SetTop( rect.GetTop() ); -} - -wxRect2DDouble& wxRect2DDouble::operator=( const wxRect2DDouble &r ) -{ - m_x = r.m_x; - m_y = r.m_y; - m_width = r.m_width; - m_height = r.m_height; - return *this; -} - -// integer version - -// for the following calculations always remember -// that the right and bottom edges are not part of a rect - -// wxPoint2D - -#if wxUSE_STREAMS -void wxPoint2DInt::WriteTo( wxDataOutputStream &stream ) const -{ - stream.Write32( m_x ); - stream.Write32( m_y ); -} - -void wxPoint2DInt::ReadFrom( wxDataInputStream &stream ) -{ - m_x = stream.Read32(); - m_y = stream.Read32(); -} -#endif // wxUSE_STREAMS - -wxDouble wxPoint2DInt::GetVectorAngle() const -{ - if ( m_x == 0 ) - { - if ( m_y >= 0 ) - return 90; - else - return 270; - } - if ( m_y == 0 ) - { - if ( m_x >= 0 ) - return 0; - else - return 180; - } - - // casts needed for MIPSpro compiler under SGI - wxDouble deg = atan2( (double)m_y , (double)m_x ) * 180 / M_PI; - if ( deg < 0 ) - { - deg += 360; - } - return deg; -} - - -void wxPoint2DInt::SetVectorAngle( wxDouble degrees ) -{ - wxDouble length = GetVectorLength(); - m_x = (int)(length * cos( degrees / 180 * M_PI )); - m_y = (int)(length * sin( degrees / 180 * M_PI )); -} - -wxDouble wxPoint2DDouble::GetVectorAngle() const -{ - if ( wxIsNullDouble(m_x) ) - { - if ( m_y >= 0 ) - return 90; - else - return 270; - } - if ( wxIsNullDouble(m_y) ) - { - if ( m_x >= 0 ) - return 0; - else - return 180; - } - wxDouble deg = atan2( m_y , m_x ) * 180 / M_PI; - if ( deg < 0 ) - { - deg += 360; - } - return deg; -} - -void wxPoint2DDouble::SetVectorAngle( wxDouble degrees ) -{ - wxDouble length = GetVectorLength(); - m_x = length * cos( degrees / 180 * M_PI ); - m_y = length * sin( degrees / 180 * M_PI ); -} - -// wxRect2D - -bool wxRect2DInt::Intersects( const wxRect2DInt &rect ) const -{ - wxInt32 left,right,bottom,top; - left = wxMax ( m_x , rect.m_x ); - right = wxMin ( m_x+m_width, rect.m_x + rect.m_width ); - top = wxMax ( m_y , rect.m_y ); - bottom = wxMin ( m_y+m_height, rect.m_y + rect.m_height ); - - if ( left < right && top < bottom ) - { - return true; - } - return false; -} - -void wxRect2DInt::Intersect( const wxRect2DInt &src1 , const wxRect2DInt &src2 , wxRect2DInt *dest ) -{ - wxInt32 left,right,bottom,top; - left = wxMax ( src1.m_x , src2.m_x ); - right = wxMin ( src1.m_x+src1.m_width, src2.m_x + src2.m_width ); - top = wxMax ( src1.m_y , src2.m_y ); - bottom = wxMin ( src1.m_y+src1.m_height, src2.m_y + src2.m_height ); - - if ( left < right && top < bottom ) - { - dest->m_x = left; - dest->m_y = top; - dest->m_width = right - left; - dest->m_height = bottom - top; - } - else - { - dest->m_width = dest->m_height = 0; - } -} - -void wxRect2DInt::Union( const wxRect2DInt &src1 , const wxRect2DInt &src2 , wxRect2DInt *dest ) -{ - wxInt32 left,right,bottom,top; - - left = wxMin ( src1.m_x , src2.m_x ); - right = wxMax ( src1.m_x+src1.m_width, src2.m_x + src2.m_width ); - top = wxMin ( src1.m_y , src2.m_y ); - bottom = wxMax ( src1.m_y+src1.m_height, src2.m_y + src2.m_height ); - - dest->m_x = left; - dest->m_y = top; - dest->m_width = right - left; - dest->m_height = bottom - top; -} - -void wxRect2DInt::Union( const wxPoint2DInt &pt ) -{ - wxInt32 x = pt.m_x; - wxInt32 y = pt.m_y; - - if ( x < m_x ) - { - SetLeft( x ); - } - else if ( x < m_x + m_width ) - { - // contained - } - else - { - SetRight( x ); - } - - if ( y < m_y ) - { - SetTop( y ); - } - else if ( y < m_y + m_height ) - { - // contained - } - else - { - SetBottom( y ); - } -} - -void wxRect2DInt::ConstrainTo( const wxRect2DInt &rect ) -{ - if ( GetLeft() < rect.GetLeft() ) - SetLeft( rect.GetLeft() ); - - if ( GetRight() > rect.GetRight() ) - SetRight( rect.GetRight() ); - - if ( GetBottom() > rect.GetBottom() ) - SetBottom( rect.GetBottom() ); - - if ( GetTop() < rect.GetTop() ) - SetTop( rect.GetTop() ); -} - -wxRect2DInt& wxRect2DInt::operator=( const wxRect2DInt &r ) -{ - m_x = r.m_x; - m_y = r.m_y; - m_width = r.m_width; - m_height = r.m_height; - return *this; -} - -#if wxUSE_STREAMS -void wxRect2DInt::WriteTo( wxDataOutputStream &stream ) const -{ - stream.Write32( m_x ); - stream.Write32( m_y ); - stream.Write32( m_width ); - stream.Write32( m_height ); -} - -void wxRect2DInt::ReadFrom( wxDataInputStream &stream ) -{ - m_x = stream.Read32(); - m_y = stream.Read32(); - m_width = stream.Read32(); - m_height = stream.Read32(); -} -#endif // wxUSE_STREAMS - - -// wxTransform2D - -void wxTransform2D::Transform( wxRect2DInt* r ) const -{ - wxPoint2DInt a = r->GetLeftTop(), b = r->GetRightBottom(); - Transform( &a ); - Transform( &b ); - *r = wxRect2DInt( a, b ); -} - -wxPoint2DInt wxTransform2D::Transform( const wxPoint2DInt &pt ) const -{ - wxPoint2DInt res = pt; - Transform( &res ); - return res; -} - -wxRect2DInt wxTransform2D::Transform( const wxRect2DInt &r ) const -{ - wxRect2DInt res = r; - Transform( &res ); - return res; -} - -void wxTransform2D::InverseTransform( wxRect2DInt* r ) const -{ - wxPoint2DInt a = r->GetLeftTop(), b = r->GetRightBottom(); - InverseTransform( &a ); - InverseTransform( &b ); - *r = wxRect2DInt( a , b ); -} - -wxPoint2DInt wxTransform2D::InverseTransform( const wxPoint2DInt &pt ) const -{ - wxPoint2DInt res = pt; - InverseTransform( &res ); - return res; -} - -wxRect2DInt wxTransform2D::InverseTransform( const wxRect2DInt &r ) const -{ - wxRect2DInt res = r; - InverseTransform( &res ); - return res; -} - -#endif // wxUSE_GEOMETRY diff --git a/Externals/wxWidgets3/src/common/gifdecod.cpp b/Externals/wxWidgets3/src/common/gifdecod.cpp deleted file mode 100644 index bea6addc38..0000000000 --- a/Externals/wxWidgets3/src/common/gifdecod.cpp +++ /dev/null @@ -1,941 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/gifdecod.cpp -// Purpose: wxGIFDecoder, GIF reader for wxImage and wxAnimation -// Author: Guillermo Rodriguez Garcia -// Version: 3.04 -// Copyright: (c) Guillermo Rodriguez Garcia -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_STREAMS && wxUSE_GIF - -#ifndef WX_PRECOMP - #include "wx/palette.h" - #include "wx/intl.h" - #include "wx/log.h" -#endif - -#include -#include -#include "wx/gifdecod.h" -#include "wx/scopedarray.h" -#include "wx/scopedptr.h" -#include "wx/scopeguard.h" - -enum -{ - GIF_MARKER_EXT = '!', // 0x21 - GIF_MARKER_SEP = ',', // 0x2C - GIF_MARKER_ENDOFDATA = ';', // 0x3B - - GIF_MARKER_EXT_GRAPHICS_CONTROL = 0xF9, - GIF_MARKER_EXT_COMMENT = 0xFE, - GIF_MARKER_EXT_APP = 0xFF -}; - -#define GetFrame(n) ((GIFImage*)m_frames[n]) - -//--------------------------------------------------------------------------- -// GIFImage -//--------------------------------------------------------------------------- - -// internal class for storing GIF image data -class GIFImage -{ -public: - // def ctor - GIFImage(); - - unsigned int w; // width - unsigned int h; // height - unsigned int left; // x coord (in logical screen) - unsigned int top; // y coord (in logical screen) - int transparent; // transparent color index (-1 = none) - wxAnimationDisposal disposal; // disposal method - long delay; // delay in ms (-1 = unused) - unsigned char *p; // bitmap - unsigned char *pal; // palette - unsigned int ncolours; // number of colours - wxString comment; - - wxDECLARE_NO_COPY_CLASS(GIFImage); -}; - -wxDECLARE_SCOPED_PTR(GIFImage, GIFImagePtr) -wxDEFINE_SCOPED_PTR(GIFImage, GIFImagePtr) - - -//--------------------------------------------------------------------------- -// GIFImage constructor -//--------------------------------------------------------------------------- -GIFImage::GIFImage() -{ - w = 0; - h = 0; - left = 0; - top = 0; - transparent = 0; - disposal = wxANIM_DONOTREMOVE; - delay = -1; - p = (unsigned char *) NULL; - pal = (unsigned char *) NULL; - ncolours = 0; -} - -//--------------------------------------------------------------------------- -// wxGIFDecoder constructor and destructor -//--------------------------------------------------------------------------- - -wxGIFDecoder::wxGIFDecoder() -{ -} - -wxGIFDecoder::~wxGIFDecoder() -{ - Destroy(); -} - -void wxGIFDecoder::Destroy() -{ - wxASSERT(m_nFrames==m_frames.GetCount()); - for (unsigned int i=0; ip); - free(f->pal); - delete f; - } - - m_frames.Clear(); - m_nFrames = 0; -} - - -//--------------------------------------------------------------------------- -// Convert this image to a wxImage object -//--------------------------------------------------------------------------- - -// This function was designed by Vaclav Slavik - -bool wxGIFDecoder::ConvertToImage(unsigned int frame, wxImage *image) const -{ - unsigned char *src, *dst, *pal; - unsigned long i; - int transparent; - - // just in case... - image->Destroy(); - - // create the image - wxSize sz = GetFrameSize(frame); - image->Create(sz.GetWidth(), sz.GetHeight()); - image->SetType(wxBITMAP_TYPE_GIF); - - if (!image->IsOk()) - return false; - - pal = GetPalette(frame); - src = GetData(frame); - dst = image->GetData(); - transparent = GetTransparentColourIndex(frame); - - // set transparent colour mask - if (transparent != -1) - { - for (i = 0; i < GetNcolours(frame); i++) - { - if ((pal[3 * i + 0] == 255) && - (pal[3 * i + 1] == 0) && - (pal[3 * i + 2] == 255)) - { - pal[3 * i + 2] = 254; - } - } - - pal[3 * transparent + 0] = 255, - pal[3 * transparent + 1] = 0, - pal[3 * transparent + 2] = 255; - - image->SetMaskColour(255, 0, 255); - } - else - image->SetMask(false); - -#if wxUSE_PALETTE - unsigned char r[256]; - unsigned char g[256]; - unsigned char b[256]; - - for (i = 0; i < 256; i++) - { - r[i] = pal[3*i + 0]; - g[i] = pal[3*i + 1]; - b[i] = pal[3*i + 2]; - } - - image->SetPalette(wxPalette(GetNcolours(frame), r, g, b)); -#endif // wxUSE_PALETTE - - // copy image data - unsigned long npixel = sz.GetWidth() * sz.GetHeight(); - for (i = 0; i < npixel; i++, src++) - { - *(dst++) = pal[3 * (*src) + 0]; - *(dst++) = pal[3 * (*src) + 1]; - *(dst++) = pal[3 * (*src) + 2]; - } - - wxString comment = GetFrame(frame)->comment; - if ( !comment.empty() ) - { - image->SetOption(wxIMAGE_OPTION_GIF_COMMENT, comment); - } - - return true; -} - - -//--------------------------------------------------------------------------- -// Data accessors -//--------------------------------------------------------------------------- - -// Get data for current frame - -wxSize wxGIFDecoder::GetFrameSize(unsigned int frame) const -{ - return wxSize(GetFrame(frame)->w, GetFrame(frame)->h); -} - -wxPoint wxGIFDecoder::GetFramePosition(unsigned int frame) const -{ - return wxPoint(GetFrame(frame)->left, GetFrame(frame)->top); -} - -wxAnimationDisposal wxGIFDecoder::GetDisposalMethod(unsigned int frame) const -{ - return GetFrame(frame)->disposal; -} - -long wxGIFDecoder::GetDelay(unsigned int frame) const -{ - return GetFrame(frame)->delay; -} - -wxColour wxGIFDecoder::GetTransparentColour(unsigned int frame) const -{ - unsigned char *pal = GetFrame(frame)->pal; - int n = GetFrame(frame)->transparent; - if (n == -1) - return wxNullColour; - - return wxColour(pal[n*3 + 0], - pal[n*3 + 1], - pal[n*3 + 2]); -} - -unsigned char* wxGIFDecoder::GetData(unsigned int frame) const { return (GetFrame(frame)->p); } -unsigned char* wxGIFDecoder::GetPalette(unsigned int frame) const { return (GetFrame(frame)->pal); } -unsigned int wxGIFDecoder::GetNcolours(unsigned int frame) const { return (GetFrame(frame)->ncolours); } -int wxGIFDecoder::GetTransparentColourIndex(unsigned int frame) const { return (GetFrame(frame)->transparent); } - - - -//--------------------------------------------------------------------------- -// GIF reading and decoding -//--------------------------------------------------------------------------- - -// getcode: -// Reads the next code from the file stream, with size 'bits' -// -int wxGIFDecoder::getcode(wxInputStream& stream, int bits, int ab_fin) -{ - unsigned int mask; // bit mask - unsigned int code; // code (result) - - // get remaining bits from last byte read - mask = (1 << bits) - 1; - code = (m_lastbyte >> (8 - m_restbits)) & mask; - - // keep reading new bytes while needed - while (bits > m_restbits) - { - // if no bytes left in this block, read the next block - if (m_restbyte == 0) - { - m_restbyte = stream.GetC(); - - /* Some encoders are a bit broken: instead of issuing - * an end-of-image symbol (ab_fin) they come up with - * a zero-length subblock!! We catch this here so - * that the decoder sees an ab_fin code. - */ - if (m_restbyte == 0) - { - code = ab_fin; - break; - } - - // prefetch data - stream.Read((void *) m_buffer, m_restbyte); - if (stream.LastRead() != m_restbyte) - { - code = ab_fin; - return code; - } - m_bufp = m_buffer; - } - - // read next byte and isolate the bits we need - m_lastbyte = (unsigned char) (*m_bufp++); - mask = (1 << (bits - m_restbits)) - 1; - code = code + ((m_lastbyte & mask) << m_restbits); - m_restbyte--; - - // adjust total number of bits extracted from the buffer - m_restbits = m_restbits + 8; - } - - // find number of bits remaining for next code - m_restbits = (m_restbits - bits); - - return code; -} - - -// dgif: -// GIF decoding function. The initial code size (aka root size) -// is 'bits'. Supports interlaced images (interl == 1). -// Returns wxGIF_OK (== 0) on success, or an error code if something -// fails (see header file for details) -wxGIFErrorCode -wxGIFDecoder::dgif(wxInputStream& stream, GIFImage *img, int interl, int bits) -{ - static const int allocSize = 4096 + 1; - - wxScopedArray ab_prefix(allocSize); // alphabet (prefixes) - if ( !ab_prefix ) - return wxGIF_MEMERR; - - wxScopedArray ab_tail(allocSize); // alphabet (tails) - if ( !ab_tail ) - return wxGIF_MEMERR; - - wxScopedArray stack(allocSize); // decompression stack - if ( !stack ) - return wxGIF_MEMERR; - - int ab_clr; // clear code - int ab_fin; // end of info code - int ab_bits; // actual symbol width, in bits - int ab_free; // first free position in alphabet - int ab_max; // last possible character in alphabet - int pass; // pass number in interlaced images - int pos; // index into decompresion stack - unsigned int x, y; // position in image buffer - - int code, readcode, lastcode, abcabca; - - // these won't change - ab_clr = (1 << bits); - ab_fin = (1 << bits) + 1; - - // these will change through the decompression process - ab_bits = bits + 1; - ab_free = (1 << bits) + 2; - ab_max = (1 << ab_bits) - 1; - lastcode = -1; - abcabca = -1; - pass = 1; - pos = x = y = 0; - - // reset decoder vars - m_restbits = 0; - m_restbyte = 0; - m_lastbyte = 0; - - do - { - // get next code - readcode = code = getcode(stream, ab_bits, ab_fin); - - // end of image? - if (code == ab_fin) break; - - // reset alphabet? - if (code == ab_clr) - { - // reset main variables - ab_bits = bits + 1; - ab_free = (1 << bits) + 2; - ab_max = (1 << ab_bits) - 1; - lastcode = -1; - abcabca = -1; - - // skip to next code - continue; - } - - // unknown code: special case (like in ABCABCA) - if (code >= ab_free) - { - code = lastcode; // take last string - stack[pos++] = abcabca; // add first character - } - - // build the string for this code in the stack - while (code > ab_clr) - { - stack[pos++] = ab_tail[code]; - code = ab_prefix[code]; - - // Don't overflow. This shouldn't happen with normal - // GIF files, the allocSize of 4096+1 is enough. This - // will only happen with badly formed GIFs. - if (pos >= allocSize) - return wxGIF_INVFORMAT; - } - - if (pos >= allocSize) - return wxGIF_INVFORMAT; - - stack[pos] = code; // push last code into the stack - abcabca = code; // save for special case - - // make new entry in alphabet (only if NOT just cleared) - if (lastcode != -1) - { - // Normally, after the alphabet is full and can't grow any - // further (ab_free == 4096), encoder should (must?) emit CLEAR - // to reset it. This checks whether we really got it, otherwise - // the GIF is damaged. - if (ab_free > ab_max) - return wxGIF_INVFORMAT; - - // This assert seems unnecessary since the condition above - // eliminates the only case in which it went false. But I really - // don't like being forced to ask "Who in .text could have - // written there?!" And I wouldn't have been forced to ask if - // this line had already been here. - wxASSERT(ab_free < allocSize); - - ab_prefix[ab_free] = lastcode; - ab_tail[ab_free] = code; - ab_free++; - - if ((ab_free > ab_max) && (ab_bits < 12)) - { - ab_bits++; - ab_max = (1 << ab_bits) - 1; - } - } - - // dump stack data to the image buffer - while (pos >= 0) - { - (img->p)[x + (y * (img->w))] = (char) stack[pos]; - pos--; - - if (++x >= (img->w)) - { - x = 0; - - if (interl) - { - // support for interlaced images - switch (pass) - { - case 1: y += 8; break; - case 2: y += 8; break; - case 3: y += 4; break; - case 4: y += 2; break; - } - - /* loop until a valid y coordinate has been - found, Or if the maximum number of passes has - been reached, exit the loop, and stop image - decoding (At this point the image is successfully - decoded). - If we don't loop, but merely set y to some other - value, that new value might still be invalid depending - on the height of the image. This would cause out of - bounds writing. - */ - while (y >= (img->h)) - { - switch (++pass) - { - case 2: y = 4; break; - case 3: y = 2; break; - case 4: y = 1; break; - - default: - /* - It's possible we arrive here. For example this - happens when the image is interlaced, and the - height is 1. Looking at the above cases, the - lowest possible y is 1. While the only valid - one would be 0 for an image of height 1. So - 'eventually' the loop will arrive here. - This case makes sure this while loop is - exited, as well as the 2 other ones. - */ - - // Set y to a valid coordinate so the local - // while loop will be exited. (y = 0 always - // is >= img->h since if img->h == 0 the - // image is never decoded) - y = 0; - - // This will exit the other outer while loop - pos = -1; - - // This will halt image decoding. - code = ab_fin; - - break; - } - } - } - else - { - // non-interlaced - y++; -/* -Normally image decoding is finished when an End of Information code is -encountered (code == ab_fin) however some broken encoders write wrong -"block byte counts" (The first byte value after the "code size" byte), -being one value too high. It might very well be possible other variants -of this problem occur as well. The only sensible solution seems to -be to check for clipping. -Example of wrong encoding: -(1 * 1 B/W image, raster data stream follows in hex bytes) - -02 << B/W images have a code size of 2 -02 << Block byte count -44 << LZW packed -00 << Zero byte count (terminates data stream) - -Because the block byte count is 2, the zero byte count is used in the -decoding process, and decoding is continued after this byte. (While it -should signal an end of image) - -It should be: -02 -02 -44 -01 << When decoded this correctly includes the End of Information code -00 - -Or (Worse solution): -02 -01 -44 -00 -(The 44 doesn't include an End of Information code, but at least the -decoder correctly skips to 00 now after decoding, and signals this -as an End of Information itself) -*/ - if (y >= img->h) - { - code = ab_fin; - break; - } - } - } - } - - pos = 0; - lastcode = readcode; - } - while (code != ab_fin); - - return wxGIF_OK; -} - - -// CanRead: -// Returns true if the file looks like a valid GIF, false otherwise. -// -bool wxGIFDecoder::DoCanRead(wxInputStream &stream) const -{ - unsigned char buf[3]; - - if ( !stream.Read(buf, WXSIZEOF(buf)) ) - return false; - - return memcmp(buf, "GIF", WXSIZEOF(buf)) == 0; -} - - -// LoadGIF: -// Reads and decodes one or more GIF images, depending on whether -// animated GIF support is enabled. Can read GIFs with any bit -// size (color depth), but the output images are always expanded -// to 8 bits per pixel. Also, the image palettes always contain -// 256 colors, although some of them may be unused. Returns wxGIF_OK -// (== 0) on success, or an error code if something fails (see -// header file for details) -// -wxGIFErrorCode wxGIFDecoder::LoadGIF(wxInputStream& stream) -{ - unsigned int global_ncolors = 0; - int bits, interl, i; - wxAnimationDisposal disposal; - long size; - long delay; - unsigned char type = 0; - unsigned char pal[768]; - unsigned char buf[16]; - bool anim = true; - - // check GIF signature - if (!CanRead(stream)) - return wxGIF_INVFORMAT; - - // check for animated GIF support (ver. >= 89a) - - static const unsigned int headerSize = (3 + 3); - stream.Read(buf, headerSize); - if (stream.LastRead() != headerSize) - { - return wxGIF_INVFORMAT; - } - - if (memcmp(buf + 3, "89a", 3) < 0) - { - anim = false; - } - - // read logical screen descriptor block (LSDB) - static const unsigned int lsdbSize = (2 + 2 + 1 + 1 + 1); - stream.Read(buf, lsdbSize); - if (stream.LastRead() != lsdbSize) - { - return wxGIF_INVFORMAT; - } - - m_szAnimation.SetWidth( buf[0] + 256 * buf[1] ); - m_szAnimation.SetHeight( buf[2] + 256 * buf[3] ); - - if (anim && ((m_szAnimation.GetWidth() == 0) || (m_szAnimation.GetHeight() == 0))) - { - return wxGIF_INVFORMAT; - } - - // load global color map if available - if ((buf[4] & 0x80) == 0x80) - { - int backgroundColIndex = buf[5]; - - global_ncolors = 2 << (buf[4] & 0x07); - unsigned int numBytes = 3 * global_ncolors; - stream.Read(pal, numBytes); - if (stream.LastRead() != numBytes) - { - return wxGIF_INVFORMAT; - } - - m_background.Set(pal[backgroundColIndex*3 + 0], - pal[backgroundColIndex*3 + 1], - pal[backgroundColIndex*3 + 2]); - } - - // transparent colour, disposal method and delay default to unused - int transparent = -1; - disposal = wxANIM_UNSPECIFIED; - delay = -1; - wxString comment; - - bool done = false; - while (!done) - { - type = stream.GetC(); - - /* - If the end of file has been reached (or an error) and a ";" - (GIF_MARKER_ENDOFDATA) hasn't been encountered yet, exit the loop. (Without this - check the while loop would loop endlessly.) Later on, in the next while - loop, the file will be treated as being truncated (But still - be decoded as far as possible). returning wxGIF_TRUNCATED is not - possible here since some init code is done after this loop. - */ - if (stream.Eof())// || !stream.IsOk()) - { - /* - type is set to some bogus value, so there's no - need to continue evaluating it. - */ - break; // Alternative : "return wxGIF_INVFORMAT;" - } - - switch (type) - { - case GIF_MARKER_ENDOFDATA: - done = true; - break; - case GIF_MARKER_EXT: - switch (stream.GetC()) - { - case GIF_MARKER_EXT_GRAPHICS_CONTROL: - { - // graphics control extension, parse it - - static const unsigned int gceSize = 6; - stream.Read(buf, gceSize); - if (stream.LastRead() != gceSize) - { - Destroy(); - return wxGIF_INVFORMAT; - } - - // read delay and convert from 1/100 of a second to ms - delay = 10 * (buf[2] + 256 * buf[3]); - - // read transparent colour index, if used - transparent = buf[1] & 0x01 ? buf[4] : -1; - - // read disposal method - disposal = (wxAnimationDisposal)(((buf[1] & 0x1C) >> 2) - 1); - break; - } - case GIF_MARKER_EXT_COMMENT: - { - int len = stream.GetC(); - while (len) - { - if ( stream.Eof() ) - { - done = true; - break; - } - - wxCharBuffer charbuf(len); - stream.Read(charbuf.data(), len); - if ( (int) stream.LastRead() != len ) - { - done = true; - break; - } - - comment += wxConvertMB2WX(charbuf.data()); - - len = stream.GetC(); - } - - break; - } - default: - // other extension, skip - while ((i = stream.GetC()) != 0) - { - if (stream.Eof() || (stream.LastRead() == 0) || - stream.SeekI(i, wxFromCurrent) == wxInvalidOffset) - { - done = true; - break; - } - } - break; - } - break; - case GIF_MARKER_SEP: - { - // allocate memory for IMAGEN struct - GIFImagePtr pimg(new GIFImage()); - - wxScopeGuard guardDestroy = wxMakeObjGuard(*this, &wxGIFDecoder::Destroy); - - if ( !pimg.get() ) - return wxGIF_MEMERR; - - // fill in the data - static const unsigned int idbSize = (2 + 2 + 2 + 2 + 1); - stream.Read(buf, idbSize); - if (stream.LastRead() != idbSize) - return wxGIF_INVFORMAT; - - pimg->comment = comment; - comment.clear(); - pimg->left = buf[0] + 256 * buf[1]; - pimg->top = buf[2] + 256 * buf[3]; - /* - pimg->left = buf[4] + 256 * buf[5]; - pimg->top = buf[4] + 256 * buf[5]; - */ - pimg->w = buf[4] + 256 * buf[5]; - pimg->h = buf[6] + 256 * buf[7]; - - if ( anim ) - { - // some GIF images specify incorrect animation size but we can - // still open them if we fix up the animation size, see #9465 - if ( m_nFrames == 0 ) - { - if ( pimg->w > (unsigned)m_szAnimation.x ) - m_szAnimation.x = pimg->w; - if ( pimg->h > (unsigned)m_szAnimation.y ) - m_szAnimation.y = pimg->h; - } - else // subsequent frames - { - // check that we have valid size - if ( (!pimg->w || pimg->w > (unsigned)m_szAnimation.x) || - (!pimg->h || pimg->h > (unsigned)m_szAnimation.y) ) - { - wxLogError(_("Incorrect GIF frame size (%u, %d) for " - "the frame #%u"), - pimg->w, pimg->h, m_nFrames); - return wxGIF_INVFORMAT; - } - } - } - - interl = ((buf[8] & 0x40)? 1 : 0); - size = pimg->w * pimg->h; - - pimg->transparent = transparent; - pimg->disposal = disposal; - pimg->delay = delay; - - // allocate memory for image and palette - pimg->p = (unsigned char *) malloc((unsigned int)size); - pimg->pal = (unsigned char *) malloc(768); - - if ((!pimg->p) || (!pimg->pal)) - return wxGIF_MEMERR; - - // load local color map if available, else use global map - if ((buf[8] & 0x80) == 0x80) - { - unsigned int local_ncolors = 2 << (buf[8] & 0x07); - unsigned int numBytes = 3 * local_ncolors; - stream.Read(pimg->pal, numBytes); - pimg->ncolours = local_ncolors; - if (stream.LastRead() != numBytes) - return wxGIF_INVFORMAT; - } - else - { - memcpy(pimg->pal, pal, 768); - pimg->ncolours = global_ncolors; - } - - // get initial code size from first byte in raster data - bits = stream.GetC(); - if (bits == 0) - return wxGIF_INVFORMAT; - - // decode image - wxGIFErrorCode result = dgif(stream, pimg.get(), interl, bits); - if (result != wxGIF_OK) - return result; - - guardDestroy.Dismiss(); - - // add the image to our frame array - m_frames.Add(pimg.release()); - m_nFrames++; - - // if this is not an animated GIF, exit after first image - if (!anim) - done = true; - break; - } - } - } - - if (m_nFrames <= 0) - { - Destroy(); - return wxGIF_INVFORMAT; - } - - // try to read to the end of the stream - while (type != GIF_MARKER_ENDOFDATA) - { - if (!stream.IsOk()) - return wxGIF_TRUNCATED; - - type = stream.GetC(); - - switch (type) - { - case GIF_MARKER_EXT: - // extension type - (void) stream.GetC(); - - // skip all data - while ((i = stream.GetC()) != 0) - { - if (stream.Eof() || (stream.LastRead() == 0) || - stream.SeekI(i, wxFromCurrent) == wxInvalidOffset) - { - Destroy(); - return wxGIF_INVFORMAT; - } - } - break; - case GIF_MARKER_SEP: - { - // image descriptor block - static const unsigned int idbSize = (2 + 2 + 2 + 2 + 1); - stream.Read(buf, idbSize); - if (stream.LastRead() != idbSize) - { - Destroy(); - return wxGIF_INVFORMAT; - } - - // local color map - if ((buf[8] & 0x80) == 0x80) - { - unsigned int local_ncolors = 2 << (buf[8] & 0x07); - wxFileOffset numBytes = 3 * local_ncolors; - if (stream.SeekI(numBytes, wxFromCurrent) == wxInvalidOffset) - { - Destroy(); - return wxGIF_INVFORMAT; - } - } - - // initial code size - (void) stream.GetC(); - if (stream.Eof() || (stream.LastRead() == 0)) - { - Destroy(); - return wxGIF_INVFORMAT; - } - - // skip all data - while ((i = stream.GetC()) != 0) - { - if (stream.Eof() || (stream.LastRead() == 0) || - stream.SeekI(i, wxFromCurrent) == wxInvalidOffset) - { - Destroy(); - return wxGIF_INVFORMAT; - } - } - break; - } - default: - if ((type != GIF_MARKER_ENDOFDATA) && (type != 00)) // testing - { - // images are OK, but couldn't read to the end of the stream - return wxGIF_TRUNCATED; - } - break; - } - } - - return wxGIF_OK; -} - -#endif // wxUSE_STREAMS && wxUSE_GIF diff --git a/Externals/wxWidgets3/src/common/glcmn.cpp b/Externals/wxWidgets3/src/common/glcmn.cpp deleted file mode 100644 index 1db976b914..0000000000 --- a/Externals/wxWidgets3/src/common/glcmn.cpp +++ /dev/null @@ -1,607 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/glcmn.cpp -// Purpose: wxGLCanvasBase implementation -// Author: Vadim Zeitlin -// Created: 2007-04-09 -// Copyright: (c) 2007 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// for compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_GLCANVAS - -#ifndef WX_PRECOMP - #include "wx/log.h" -#endif // WX_PRECOMP - -#include "wx/glcanvas.h" - -// DLL options compatibility check: -#include "wx/build.h" -WX_CHECK_BUILD_OPTIONS("wxGL") - -wxIMPLEMENT_CLASS(wxGLApp, wxApp); - -// ============================================================================ -// implementation -// ============================================================================ - -void wxGLAttribsBase::AddAttribBits(int searchVal, int combineVal) -{ - // Search for searchVal - wxVector::iterator it = m_GLValues.begin(); - while ( it != m_GLValues.end() && *it != searchVal ) - it++; - // Have we searchVal? - if ( it != m_GLValues.end() ) - { - if ( ++it == m_GLValues.end() ) - { - m_GLValues.push_back(combineVal); - } - else - { - *it |= combineVal; - } - } - else - { - // Add the identifier and the bits - m_GLValues.push_back(searchVal); - m_GLValues.push_back(combineVal); - } -} - -// ============================================================================ - -wxGLCanvasBase::wxGLCanvasBase() -{ -#if WXWIN_COMPATIBILITY_2_8 - m_glContext = NULL; -#endif - - // we always paint background entirely ourselves so prevent wx from erasing - // it to avoid flicker - SetBackgroundStyle(wxBG_STYLE_CUSTOM); -} - -bool wxGLCanvasBase::SetCurrent(const wxGLContext& context) const -{ - // although on MSW it works even if the window is still hidden, it doesn't - // work in other ports (notably X11-based ones) and documentation mentions - // that SetCurrent() can only be called for a shown window, so check for it - wxASSERT_MSG( IsShown(), wxT("can't make hidden GL canvas current") ); - - - return context.SetCurrent(*static_cast(this)); -} - -bool wxGLCanvasBase::SetColour(const wxString& colour) -{ - wxColour col = wxTheColourDatabase->Find(colour); - if ( !col.IsOk() ) - return false; - -#ifdef wxHAS_OPENGL_ES - wxGLAPI::glColor3f((GLfloat) (col.Red() / 256.), (GLfloat) (col.Green() / 256.), - (GLfloat) (col.Blue() / 256.)); -#else - GLboolean isRGBA; - glGetBooleanv(GL_RGBA_MODE, &isRGBA); - if ( isRGBA ) - { - glColor3f((GLfloat) (col.Red() / 256.), (GLfloat) (col.Green() / 256.), - (GLfloat) (col.Blue() / 256.)); - } - else // indexed colour - { - GLint pix = GetColourIndex(col); - if ( pix == -1 ) - { - wxLogError(_("Failed to allocate colour for OpenGL")); - return false; - } - - glIndexi(pix); - } -#endif - return true; -} - -wxGLCanvasBase::~wxGLCanvasBase() -{ -#if WXWIN_COMPATIBILITY_2_8 - delete m_glContext; -#endif // WXWIN_COMPATIBILITY_2_8 -} - -#if WXWIN_COMPATIBILITY_2_8 - -wxGLContext *wxGLCanvasBase::GetContext() const -{ - return m_glContext; -} - -void wxGLCanvasBase::SetCurrent() -{ - if ( m_glContext ) - SetCurrent(*m_glContext); -} - -void wxGLCanvasBase::OnSize(wxSizeEvent& WXUNUSED(event)) -{ -} - -#endif // WXWIN_COMPATIBILITY_2_8 - -/* static */ -bool wxGLCanvasBase::IsExtensionInList(const char *list, const char *extension) -{ - if ( !list ) - return false; - - for ( const char *p = list; *p; p++ ) - { - // advance up to the next possible match - p = wxStrstr(p, extension); - if ( !p ) - break; - - // check that the extension appears at the beginning/ending of the list - // or is preceded/followed by a space to avoid mistakenly finding - // "glExtension" in a list containing some "glFunkyglExtension" - if ( (p == list || p[-1] == ' ') ) - { - char c = p[strlen(extension)]; - if ( c == '\0' || c == ' ' ) - return true; - } - } - - return false; -} - -/* static */ -bool wxGLCanvasBase::ParseAttribList(const int *attribList, - wxGLAttributes& dispAttrs, - wxGLContextAttrs* ctxAttrs) -{ - // Some attributes are usually needed - dispAttrs.PlatformDefaults(); - if ( ctxAttrs ) - ctxAttrs->PlatformDefaults(); - - if ( !attribList ) - { - // Set default attributes - dispAttrs.Defaults(); - dispAttrs.EndList(); - if ( ctxAttrs ) - ctxAttrs->EndList(); - return true; - } - - int src = 0; - int minColo[4] = {0, 0, 0, 0}; - int minAcum[4] = {0, 0, 0, 0}; - int num = 0; - while ( attribList[src] ) - { - // Check a non zero-terminated list. This may help a bit with malformed lists. - if ( ++num > 200 ) - { - wxFAIL_MSG("The attributes list is not zero-terminated"); - } - - switch ( attribList[src++] ) - { - // Pixel format attributes - - case WX_GL_RGBA: - dispAttrs.RGBA(); - break; - - case WX_GL_BUFFER_SIZE: - dispAttrs.BufferSize(attribList[src++]); - break; - - case WX_GL_LEVEL: - dispAttrs.Level(attribList[src++]); - break; - - case WX_GL_DOUBLEBUFFER: - dispAttrs.DoubleBuffer(); - break; - - case WX_GL_STEREO: - dispAttrs.Stereo(); - break; - - case WX_GL_AUX_BUFFERS: - dispAttrs.AuxBuffers(attribList[src++]); - break; - - case WX_GL_MIN_RED: - minColo[0] = attribList[src++]; - break; - - case WX_GL_MIN_GREEN: - minColo[1] = attribList[src++]; - break; - - case WX_GL_MIN_BLUE: - minColo[2] = attribList[src++]; - break; - - case WX_GL_MIN_ALPHA: - minColo[3] = attribList[src++]; - break; - - case WX_GL_DEPTH_SIZE: - dispAttrs.Depth(attribList[src++]); - break; - - case WX_GL_STENCIL_SIZE: - dispAttrs.Stencil(attribList[src++]); - break; - - case WX_GL_MIN_ACCUM_RED: - minAcum[0] = attribList[src++]; - break; - - case WX_GL_MIN_ACCUM_GREEN: - minAcum[1] = attribList[src++]; - break; - - case WX_GL_MIN_ACCUM_BLUE: - minAcum[2] = attribList[src++]; - break; - - case WX_GL_MIN_ACCUM_ALPHA: - minAcum[3] = attribList[src++]; - break; - - case WX_GL_SAMPLE_BUFFERS: - dispAttrs.SampleBuffers(attribList[src++]); - break; - - case WX_GL_SAMPLES: - dispAttrs.Samplers(attribList[src++]); - break; - - case WX_GL_FRAMEBUFFER_SRGB: - dispAttrs.FrameBuffersRGB(); - break; - - // Context attributes - - case WX_GL_CORE_PROFILE: - if ( ctxAttrs ) - ctxAttrs->CoreProfile(); - break; - - case WX_GL_MAJOR_VERSION: - if ( ctxAttrs ) - ctxAttrs->MajorVersion(attribList[src]); - src++; - break; - - case WX_GL_MINOR_VERSION: - if ( ctxAttrs ) - ctxAttrs->MinorVersion(attribList[src]); - src++; - break; - - case wx_GL_COMPAT_PROFILE: - if ( ctxAttrs ) - ctxAttrs->CompatibilityProfile(); - break; - - case WX_GL_FORWARD_COMPAT: - if ( ctxAttrs ) - ctxAttrs->ForwardCompatible(); - break; - - case WX_GL_ES2: - if ( ctxAttrs ) - ctxAttrs->ES2(); - break; - - case WX_GL_DEBUG: - if ( ctxAttrs ) - ctxAttrs->DebugCtx(); - break; - - case WX_GL_ROBUST_ACCESS: - if ( ctxAttrs ) - ctxAttrs->Robust(); - break; - - case WX_GL_NO_RESET_NOTIFY: - if ( ctxAttrs ) - ctxAttrs->NoResetNotify(); - break; - - case WX_GL_LOSE_ON_RESET: - if ( ctxAttrs ) - ctxAttrs->LoseOnReset(); - break; - - case WX_GL_RESET_ISOLATION: - if ( ctxAttrs ) - ctxAttrs->ResetIsolation(); - break; - - case WX_GL_RELEASE_FLUSH: - if ( ctxAttrs ) - ctxAttrs->ReleaseFlush(1); - break; - - case WX_GL_RELEASE_NONE: - if ( ctxAttrs ) - ctxAttrs->ReleaseFlush(0); - break; - - default: - wxFAIL_MSG("Unexpected value in attributes list"); - return false; - } - } - - // Set color and accumulation - if ( minColo[0] || minColo[1] || minColo[2] || minColo[3] ) - dispAttrs.MinRGBA(minColo[0], minColo[1], minColo[2], minColo[3]); - if ( minAcum[0] || minAcum[1] || minAcum[2] || minAcum[3] ) - dispAttrs.MinAcumRGBA(minAcum[0], minAcum[1], minAcum[2], minAcum[3]); - - // The attributes lists must be zero-terminated - dispAttrs.EndList(); - if ( ctxAttrs ) - ctxAttrs->EndList(); - - return true; -} - -// ============================================================================ -// compatibility layer for OpenGL 3 and OpenGL ES -// ============================================================================ - -static wxGLAPI s_glAPI; - -#if wxUSE_OPENGL_EMULATION - -#include "wx/vector.h" - -static GLenum s_mode; - -static GLfloat s_currentTexCoord[2]; -static GLfloat s_currentColor[4]; -static GLfloat s_currentNormal[3]; - -// TODO move this into a different construct with locality for all attributes -// of a vertex - -static wxVector s_texCoords; -static wxVector s_vertices; -static wxVector s_normals; -static wxVector s_colors; - -static bool s_texCoordsUsed; -static bool s_colorsUsed; -static bool s_normalsUsed; - -bool SetState( int flag, bool desired ) -{ - bool former = glIsEnabled( flag ); - if ( former != desired ) - { - if ( desired ) - glEnableClientState(flag); - else - glDisableClientState(flag); - } - return former; -} - -void RestoreState( int flag, bool desired ) -{ - if ( desired ) - glEnableClientState(flag); - else - glDisableClientState(flag); -} -#endif - -wxGLAPI::wxGLAPI() -{ -#if wxUSE_OPENGL_EMULATION - s_mode = 0xFF; -#endif -} - -wxGLAPI::~wxGLAPI() -{ -} - -void wxGLAPI::glFrustum(GLfloat left, GLfloat right, GLfloat bottom, - GLfloat top, GLfloat zNear, GLfloat zFar) -{ -#if wxUSE_OPENGL_EMULATION - ::glFrustumf(left, right, bottom, top, zNear, zFar); -#else - ::glFrustum(left, right, bottom, top, zNear, zFar); -#endif -} - -void wxGLAPI::glBegin(GLenum mode) -{ -#if wxUSE_OPENGL_EMULATION - if ( s_mode != 0xFF ) - { - wxFAIL_MSG("nested glBegin"); - } - - s_mode = mode; - s_texCoordsUsed = false; - s_colorsUsed = false; - s_normalsUsed = false; - - s_texCoords.clear(); - s_normals.clear(); - s_colors.clear(); - s_vertices.clear(); -#else - ::glBegin(mode); -#endif -} - -void wxGLAPI::glTexCoord2f(GLfloat s, GLfloat t) -{ -#if wxUSE_OPENGL_EMULATION - if ( s_mode == 0xFF ) - { - wxFAIL_MSG("glTexCoord2f called outside glBegin/glEnd"); - } - - else - { - s_texCoordsUsed = true; - s_currentTexCoord[0] = s; - s_currentTexCoord[1] = t; - } -#else - ::glTexCoord2f(s,t); -#endif -} - -void wxGLAPI::glVertex3f(GLfloat x, GLfloat y, GLfloat z) -{ -#if wxUSE_OPENGL_EMULATION - if ( s_mode == 0xFF ) - { - wxFAIL_MSG("glVertex3f called outside glBegin/glEnd"); - } - else - { - s_texCoords.push_back(s_currentTexCoord[0]); - s_texCoords.push_back(s_currentTexCoord[1]); - - s_normals.push_back(s_currentNormal[0]); - s_normals.push_back(s_currentNormal[1]); - s_normals.push_back(s_currentNormal[2]); - - s_colors.push_back(s_currentColor[0]); - s_colors.push_back(s_currentColor[1]); - s_colors.push_back(s_currentColor[2]); - s_colors.push_back(s_currentColor[3]); - - s_vertices.push_back(x); - s_vertices.push_back(y); - s_vertices.push_back(z); - } -#else - ::glVertex3f(x,y,z); -#endif -} - -void wxGLAPI::glNormal3f(GLfloat nx, GLfloat ny, GLfloat nz) -{ -#if wxUSE_OPENGL_EMULATION - if ( s_mode == 0xFF ) - ::glNormal3f(nx,ny,nz); - else - { - s_normalsUsed = true; - s_currentNormal[0] = nx; - s_currentNormal[1] = ny; - s_currentNormal[2] = nz; - } -#else - ::glNormal3f(nx,ny,nz); -#endif -} - -void wxGLAPI::glColor4f(GLfloat r, GLfloat g, GLfloat b, GLfloat a) -{ -#if wxUSE_OPENGL_EMULATION - if ( s_mode == 0xFF ) - ::glColor4f(r,g,b,a); - else - { - s_colorsUsed = true; - s_currentColor[0] = r; - s_currentColor[1] = g; - s_currentColor[2] = b; - s_currentColor[3] = a; - } -#else - ::glColor4f(r,g,b,a); -#endif -} - -void wxGLAPI::glColor3f(GLfloat r, GLfloat g, GLfloat b) -{ -#if wxUSE_OPENGL_EMULATION - glColor4f(r,g,b,1.0); -#else - ::glColor3f(r,g,b); -#endif -} - -void wxGLAPI::glEnd() -{ -#if wxUSE_OPENGL_EMULATION - bool formerColors = SetState( GL_COLOR_ARRAY, s_colorsUsed ); - bool formerNormals = SetState( GL_NORMAL_ARRAY, s_normalsUsed ); - bool formerTexCoords = SetState( GL_TEXTURE_COORD_ARRAY, s_texCoordsUsed ); - bool formerVertex = glIsEnabled(GL_VERTEX_ARRAY); - - if( !formerVertex ) - glEnableClientState(GL_VERTEX_ARRAY); - - if ( s_colorsUsed ) - glColorPointer( 4, GL_FLOAT, 0, &s_colors[0] ); - - if ( s_normalsUsed ) - glNormalPointer( GL_FLOAT, 0, &s_normals[0] ); - - if ( s_texCoordsUsed ) - glTexCoordPointer( 2, GL_FLOAT, 0, &s_texCoords[0] ); - - glVertexPointer(3, GL_FLOAT, 0, &s_vertices[0]); - glDrawArrays( s_mode, 0, s_vertices.size() / 3 ); - - if ( s_colorsUsed != formerColors ) - RestoreState( GL_COLOR_ARRAY, formerColors ); - - if ( s_normalsUsed != formerNormals ) - RestoreState( GL_NORMAL_ARRAY, formerColors ); - - if ( s_texCoordsUsed != formerTexCoords ) - RestoreState( GL_TEXTURE_COORD_ARRAY, formerColors ); - - if( !formerVertex ) - glDisableClientState(GL_VERTEX_ARRAY); - - s_mode = 0xFF; -#else - ::glEnd(); -#endif -} - -#endif // wxUSE_GLCANVAS - diff --git a/Externals/wxWidgets3/src/common/graphcmn.cpp b/Externals/wxWidgets3/src/common/graphcmn.cpp deleted file mode 100644 index a9db8b48d9..0000000000 --- a/Externals/wxWidgets3/src/common/graphcmn.cpp +++ /dev/null @@ -1,927 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/graphcmn.cpp -// Purpose: graphics context methods common to all platforms -// Author: Stefan Csomor -// Modified by: -// Created: -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if defined(__BORLANDC__) - #pragma hdrstop -#endif - -#if wxUSE_GRAPHICS_CONTEXT - -#include "wx/graphics.h" - -#ifndef WX_PRECOMP - #include "wx/icon.h" - #include "wx/bitmap.h" - #include "wx/dcmemory.h" - #include "wx/math.h" - #include "wx/region.h" - #include "wx/log.h" -#endif - -#include "wx/private/graphics.h" - -//----------------------------------------------------------------------------- - -//----------------------------------------------------------------------------- -// wxGraphicsObject -//----------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxGraphicsObject, wxObject); - -wxGraphicsObjectRefData::wxGraphicsObjectRefData( wxGraphicsRenderer* renderer ) -{ - m_renderer = renderer; -} -wxGraphicsObjectRefData::wxGraphicsObjectRefData( const wxGraphicsObjectRefData* data ) -{ - m_renderer = data->m_renderer; -} -wxGraphicsRenderer* wxGraphicsObjectRefData::GetRenderer() const -{ - return m_renderer ; -} - -wxGraphicsObjectRefData* wxGraphicsObjectRefData::Clone() const -{ - return new wxGraphicsObjectRefData(this); -} - -wxGraphicsObject::wxGraphicsObject() -{ -} - -wxGraphicsObject::wxGraphicsObject( wxGraphicsRenderer* renderer ) -{ - SetRefData( new wxGraphicsObjectRefData(renderer)); -} - -wxGraphicsObject::~wxGraphicsObject() -{ -} - -bool wxGraphicsObject::IsNull() const -{ - return m_refData == NULL; -} - -wxGraphicsRenderer* wxGraphicsObject::GetRenderer() const -{ - return ( IsNull() ? NULL : GetGraphicsData()->GetRenderer() ); -} - -wxGraphicsObjectRefData* wxGraphicsObject::GetGraphicsData() const -{ - return (wxGraphicsObjectRefData*) m_refData; -} - -wxObjectRefData* wxGraphicsObject::CreateRefData() const -{ - wxLogDebug(wxT("A Null Object cannot be changed")); - return NULL; -} - -wxObjectRefData* wxGraphicsObject::CloneRefData(const wxObjectRefData* data) const -{ - const wxGraphicsObjectRefData* ptr = (const wxGraphicsObjectRefData*) data; - return ptr->Clone(); -} - -//----------------------------------------------------------------------------- -// pens etc. -//----------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxGraphicsPen, wxGraphicsObject); -wxIMPLEMENT_DYNAMIC_CLASS(wxGraphicsBrush, wxGraphicsObject); -wxIMPLEMENT_DYNAMIC_CLASS(wxGraphicsFont, wxGraphicsObject); -wxIMPLEMENT_DYNAMIC_CLASS(wxGraphicsBitmap, wxGraphicsObject); - -WXDLLIMPEXP_DATA_CORE(wxGraphicsPen) wxNullGraphicsPen; -WXDLLIMPEXP_DATA_CORE(wxGraphicsBrush) wxNullGraphicsBrush; -WXDLLIMPEXP_DATA_CORE(wxGraphicsFont) wxNullGraphicsFont; -WXDLLIMPEXP_DATA_CORE(wxGraphicsBitmap) wxNullGraphicsBitmap; - -//----------------------------------------------------------------------------- -// matrix -//----------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxGraphicsMatrix, wxGraphicsObject); -WXDLLIMPEXP_DATA_CORE(wxGraphicsMatrix) wxNullGraphicsMatrix; - -// concatenates the matrix -void wxGraphicsMatrix::Concat( const wxGraphicsMatrix *t ) -{ - AllocExclusive(); - GetMatrixData()->Concat(t->GetMatrixData()); -} - -// sets the matrix to the respective values -void wxGraphicsMatrix::Set(wxDouble a, wxDouble b, wxDouble c, wxDouble d, - wxDouble tx, wxDouble ty) -{ - AllocExclusive(); - GetMatrixData()->Set(a,b,c,d,tx,ty); -} - -// gets the component valuess of the matrix -void wxGraphicsMatrix::Get(wxDouble* a, wxDouble* b, wxDouble* c, - wxDouble* d, wxDouble* tx, wxDouble* ty) const -{ - GetMatrixData()->Get(a, b, c, d, tx, ty); -} - -// makes this the inverse matrix -void wxGraphicsMatrix::Invert() -{ - AllocExclusive(); - GetMatrixData()->Invert(); -} - -// returns true if the elements of the transformation matrix are equal ? -bool wxGraphicsMatrix::IsEqual( const wxGraphicsMatrix* t) const -{ - return GetMatrixData()->IsEqual(t->GetMatrixData()); -} - -// return true if this is the identity matrix -bool wxGraphicsMatrix::IsIdentity() const -{ - return GetMatrixData()->IsIdentity(); -} - -// add the translation to this matrix -void wxGraphicsMatrix::Translate( wxDouble dx , wxDouble dy ) -{ - AllocExclusive(); - GetMatrixData()->Translate(dx,dy); -} - -// add the scale to this matrix -void wxGraphicsMatrix::Scale( wxDouble xScale , wxDouble yScale ) -{ - AllocExclusive(); - GetMatrixData()->Scale(xScale,yScale); -} - -// add the rotation to this matrix (radians) -void wxGraphicsMatrix::Rotate( wxDouble angle ) -{ - AllocExclusive(); - GetMatrixData()->Rotate(angle); -} - -// -// apply the transforms -// - -// applies that matrix to the point -void wxGraphicsMatrix::TransformPoint( wxDouble *x, wxDouble *y ) const -{ - GetMatrixData()->TransformPoint(x,y); -} - -// applies the matrix except for translations -void wxGraphicsMatrix::TransformDistance( wxDouble *dx, wxDouble *dy ) const -{ - GetMatrixData()->TransformDistance(dx,dy); -} - -// returns the native representation -void * wxGraphicsMatrix::GetNativeMatrix() const -{ - return GetMatrixData()->GetNativeMatrix(); -} - -//----------------------------------------------------------------------------- -// path -//----------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxGraphicsPath, wxGraphicsObject); -WXDLLIMPEXP_DATA_CORE(wxGraphicsPath) wxNullGraphicsPath; - -// convenience functions, for using wxPoint2DDouble etc - -wxPoint2DDouble wxGraphicsPath::GetCurrentPoint() const -{ - wxDouble x,y; - GetCurrentPoint(&x,&y); - return wxPoint2DDouble(x,y); -} - -void wxGraphicsPath::MoveToPoint( const wxPoint2DDouble& p) -{ - MoveToPoint( p.m_x , p.m_y); -} - -void wxGraphicsPath::AddLineToPoint( const wxPoint2DDouble& p) -{ - AddLineToPoint( p.m_x , p.m_y); -} - -void wxGraphicsPath::AddCurveToPoint( const wxPoint2DDouble& c1, const wxPoint2DDouble& c2, const wxPoint2DDouble& e) -{ - AddCurveToPoint(c1.m_x, c1.m_y, c2.m_x, c2.m_y, e.m_x, e.m_y); -} - -void wxGraphicsPath::AddArc( const wxPoint2DDouble& c, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise) -{ - AddArc(c.m_x, c.m_y, r, startAngle, endAngle, clockwise); -} - -wxRect2DDouble wxGraphicsPath::GetBox() const -{ - wxDouble x,y,w,h; - GetBox(&x,&y,&w,&h); - return wxRect2DDouble( x,y,w,h ); -} - -bool wxGraphicsPath::Contains( const wxPoint2DDouble& c, wxPolygonFillMode fillStyle ) const -{ - return Contains( c.m_x, c.m_y, fillStyle); -} - -// true redirections - -// begins a new subpath at (x,y) -void wxGraphicsPath::MoveToPoint( wxDouble x, wxDouble y ) -{ - AllocExclusive(); - GetPathData()->MoveToPoint(x,y); -} - -// adds a straight line from the current point to (x,y) -void wxGraphicsPath::AddLineToPoint( wxDouble x, wxDouble y ) -{ - AllocExclusive(); - GetPathData()->AddLineToPoint(x,y); -} - -// adds a cubic Bezier curve from the current point, using two control points and an end point -void wxGraphicsPath::AddCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble cx2, wxDouble cy2, wxDouble x, wxDouble y ) -{ - AllocExclusive(); - GetPathData()->AddCurveToPoint(cx1,cy1,cx2,cy2,x,y); -} - -// adds another path -void wxGraphicsPath::AddPath( const wxGraphicsPath& path ) -{ - AllocExclusive(); - GetPathData()->AddPath(path.GetPathData()); -} - -// closes the current sub-path -void wxGraphicsPath::CloseSubpath() -{ - AllocExclusive(); - GetPathData()->CloseSubpath(); -} - -// gets the last point of the current path, (0,0) if not yet set -void wxGraphicsPath::GetCurrentPoint( wxDouble* x, wxDouble* y) const -{ - GetPathData()->GetCurrentPoint(x,y); -} - -// adds an arc of a circle centering at (x,y) with radius (r) from startAngle to endAngle -void wxGraphicsPath::AddArc( wxDouble x, wxDouble y, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise ) -{ - AllocExclusive(); - GetPathData()->AddArc(x,y,r,startAngle,endAngle,clockwise); -} - -// -// These are convenience functions which - if not available natively will be assembled -// using the primitives from above -// - -// adds a quadratic Bezier curve from the current point, using a control point and an end point -void wxGraphicsPath::AddQuadCurveToPoint( wxDouble cx, wxDouble cy, wxDouble x, wxDouble y ) -{ - AllocExclusive(); - GetPathData()->AddQuadCurveToPoint(cx,cy,x,y); -} - -// appends a rectangle as a new closed subpath -void wxGraphicsPath::AddRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h ) -{ - AllocExclusive(); - GetPathData()->AddRectangle(x,y,w,h); -} - -// appends an ellipsis as a new closed subpath fitting the passed rectangle -void wxGraphicsPath::AddCircle( wxDouble x, wxDouble y, wxDouble r ) -{ - AllocExclusive(); - GetPathData()->AddCircle(x,y,r); -} - -// appends a an arc to two tangents connecting (current) to (x1,y1) and (x1,y1) to (x2,y2), also a straight line from (current) to (x1,y1) -void wxGraphicsPath::AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r ) -{ - GetPathData()->AddArcToPoint(x1,y1,x2,y2,r); -} - -// appends an ellipse -void wxGraphicsPath::AddEllipse( wxDouble x, wxDouble y, wxDouble w, wxDouble h) -{ - AllocExclusive(); - GetPathData()->AddEllipse(x,y,w,h); -} - -// appends a rounded rectangle -void wxGraphicsPath::AddRoundedRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h, wxDouble radius) -{ - AllocExclusive(); - GetPathData()->AddRoundedRectangle(x,y,w,h,radius); -} - -// returns the native path -void * wxGraphicsPath::GetNativePath() const -{ - return GetPathData()->GetNativePath(); -} - -// give the native path returned by GetNativePath() back (there might be some deallocations necessary) -void wxGraphicsPath::UnGetNativePath(void *p)const -{ - GetPathData()->UnGetNativePath(p); -} - -// transforms each point of this path by the matrix -void wxGraphicsPath::Transform( const wxGraphicsMatrix& matrix ) -{ - AllocExclusive(); - GetPathData()->Transform(matrix.GetMatrixData()); -} - -// gets the bounding box enclosing all points (possibly including control points) -void wxGraphicsPath::GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) const -{ - GetPathData()->GetBox(x,y,w,h); -} - -bool wxGraphicsPath::Contains( wxDouble x, wxDouble y, wxPolygonFillMode fillStyle ) const -{ - return GetPathData()->Contains(x,y,fillStyle); -} - -// -// Emulations, these mus be implemented in the ...Data classes in order to allow for proper overrides -// - -void wxGraphicsPathData::AddQuadCurveToPoint( wxDouble cx, wxDouble cy, wxDouble x, wxDouble y ) -{ - // calculate using degree elevation to a cubic bezier - wxPoint2DDouble c1; - wxPoint2DDouble c2; - - wxPoint2DDouble start; - GetCurrentPoint(&start.m_x,&start.m_y); - wxPoint2DDouble end(x,y); - wxPoint2DDouble c(cx,cy); - c1 = wxDouble(1/3.0) * start + wxDouble(2/3.0) * c; - c2 = wxDouble(2/3.0) * c + wxDouble(1/3.0) * end; - AddCurveToPoint(c1.m_x,c1.m_y,c2.m_x,c2.m_y,x,y); -} - -void wxGraphicsPathData::AddRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h ) -{ - MoveToPoint(x,y); - AddLineToPoint(x,y+h); - AddLineToPoint(x+w,y+h); - AddLineToPoint(x+w,y); - CloseSubpath(); -} - -void wxGraphicsPathData::AddCircle( wxDouble x, wxDouble y, wxDouble r ) -{ - MoveToPoint(x+r,y); - AddArc( x,y,r,0,2*M_PI,false); - CloseSubpath(); -} - -void wxGraphicsPathData::AddEllipse( wxDouble x, wxDouble y, wxDouble w, wxDouble h) -{ - if (w <= 0. || h <= 0.) - return; - - wxDouble rw = w/2; - wxDouble rh = h/2; - wxDouble xc = x + rw; - wxDouble yc = y + rh; - wxGraphicsMatrix m = GetRenderer()->CreateMatrix(); - m.Translate(xc,yc); - m.Scale(rw/rh,1.0); - wxGraphicsPath p = GetRenderer()->CreatePath(); - p.AddCircle(0,0,rh); - p.Transform(m); - AddPath(p.GetPathData()); -} - -void wxGraphicsPathData::AddRoundedRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h, wxDouble radius) -{ - if ( radius == 0 ) - AddRectangle(x,y,w,h); - else - { - MoveToPoint( x + w, y + h / 2); - AddArcToPoint(x + w, y + h, x + w / 2, y + h, radius); - AddArcToPoint(x, y + h, x, y + h / 2, radius); - AddArcToPoint(x, y , x + w / 2, y, radius); - AddArcToPoint(x + w, y, x + w, y + h / 2, radius); - CloseSubpath(); - } -} - -// draws a an arc to two tangents connecting (current) to (x1,y1) and (x1,y1) to (x2,y2), also a straight line from (current) to (x1,y1) -void wxGraphicsPathData::AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r ) -{ - wxPoint2DDouble current; - GetCurrentPoint(¤t.m_x,¤t.m_y); - wxPoint2DDouble p1(x1,y1); - wxPoint2DDouble p2(x2,y2); - - wxPoint2DDouble v1 = current - p1; - v1.Normalize(); - wxPoint2DDouble v2 = p2 - p1; - v2.Normalize(); - - wxDouble alpha = v1.GetVectorAngle() - v2.GetVectorAngle(); - - if ( alpha < 0 ) - alpha = 360 + alpha; - // TODO obtuse angles - - alpha = wxDegToRad(alpha); - - wxDouble dist = r / sin(alpha/2) * cos(alpha/2); - // calculate tangential points - wxPoint2DDouble t1 = dist*v1 + p1; - - wxPoint2DDouble nv1 = v1; - nv1.SetVectorAngle(v1.GetVectorAngle()-90); - wxPoint2DDouble c = t1 + r*nv1; - - wxDouble a1 = v1.GetVectorAngle()+90; - wxDouble a2 = v2.GetVectorAngle()-90; - - AddLineToPoint(t1.m_x,t1.m_y); - AddArc(c.m_x,c.m_y,r,wxDegToRad(a1),wxDegToRad(a2),true); - AddLineToPoint(p2.m_x,p2.m_y); -} - -//----------------------------------------------------------------------------- -// wxGraphicsGradientStops -//----------------------------------------------------------------------------- - -void wxGraphicsGradientStops::Add(const wxGraphicsGradientStop& stop) -{ - for ( wxVector::iterator it = m_stops.begin(); - it != m_stops.end(); - ++it ) - { - if ( stop.GetPosition() < it->GetPosition() ) - { - if ( it != m_stops.begin() ) - { - m_stops.insert(it, stop); - } - else // we shouldn't be inserting it at the beginning - { - wxFAIL_MSG( "invalid gradient stop position < 0" ); - } - - return; - } - } - - if ( stop.GetPosition() == 1. ) - { - m_stops.insert(m_stops.end() - 1, stop); - } - else - { - wxFAIL_MSG( "invalid gradient stop position > 1" ); - } -} - -void * wxGraphicsBitmap::GetNativeBitmap() const -{ - return GetBitmapData()->GetNativeBitmap(); -} - -//----------------------------------------------------------------------------- -// wxGraphicsContext Convenience Methods -//----------------------------------------------------------------------------- - -wxIMPLEMENT_ABSTRACT_CLASS(wxGraphicsContext, wxObject); - - -wxGraphicsContext::wxGraphicsContext(wxGraphicsRenderer* renderer) : - wxGraphicsObject(renderer), - m_antialias(wxANTIALIAS_DEFAULT), - m_composition(wxCOMPOSITION_OVER), - m_interpolation(wxINTERPOLATION_DEFAULT), - m_enableOffset(false) -{ -} - -wxGraphicsContext::~wxGraphicsContext() -{ -} - -bool wxGraphicsContext::StartDoc(const wxString& WXUNUSED(message)) -{ - return true; -} - -void wxGraphicsContext::EndDoc() -{ -} - -void wxGraphicsContext::StartPage(wxDouble WXUNUSED(width), - wxDouble WXUNUSED(height)) -{ -} - -void wxGraphicsContext::EndPage() -{ -} - -void wxGraphicsContext::Flush() -{ -} - -void wxGraphicsContext::EnableOffset(bool enable) -{ - m_enableOffset = enable; -} - -#if 0 -void wxGraphicsContext::SetAlpha( wxDouble WXUNUSED(alpha) ) -{ -} - -wxDouble wxGraphicsContext::GetAlpha() const -{ - return 1.0; -} -#endif - -void wxGraphicsContext::GetDPI( wxDouble* dpiX, wxDouble* dpiY) -{ - *dpiX = 72.0; - *dpiY = 72.0; -} - -// sets the pen -void wxGraphicsContext::SetPen( const wxGraphicsPen& pen ) -{ - m_pen = pen; -} - -void wxGraphicsContext::SetPen( const wxPen& pen ) -{ - if ( !pen.IsOk() || pen.GetStyle() == wxPENSTYLE_TRANSPARENT ) - SetPen( wxNullGraphicsPen ); - else - SetPen( CreatePen( pen ) ); -} - -// sets the brush for filling -void wxGraphicsContext::SetBrush( const wxGraphicsBrush& brush ) -{ - m_brush = brush; -} - -void wxGraphicsContext::SetBrush( const wxBrush& brush ) -{ - if ( !brush.IsOk() || brush.GetStyle() == wxBRUSHSTYLE_TRANSPARENT ) - SetBrush( wxNullGraphicsBrush ); - else - SetBrush( CreateBrush( brush ) ); -} - -// sets the brush for filling -void wxGraphicsContext::SetFont( const wxGraphicsFont& font ) -{ - m_font = font; -} - -void wxGraphicsContext::SetFont( const wxFont& font, const wxColour& colour ) -{ - if ( font.IsOk() ) - SetFont( CreateFont( font, colour ) ); - else - SetFont( wxNullGraphicsFont ); -} - -void wxGraphicsContext::DrawPath( const wxGraphicsPath& path, wxPolygonFillMode fillStyle ) -{ - FillPath( path , fillStyle ); - StrokePath( path ); -} - -void -wxGraphicsContext::DoDrawRotatedText(const wxString &str, - wxDouble x, - wxDouble y, - wxDouble angle) -{ - Translate(x,y); - Rotate( -angle ); - DrawText( str , 0, 0 ); - Rotate( angle ); - Translate(-x,-y); -} - -void -wxGraphicsContext::DoDrawFilledText(const wxString &str, - wxDouble x, - wxDouble y, - const wxGraphicsBrush& backgroundBrush) -{ - wxGraphicsBrush formerBrush = m_brush; - wxGraphicsPen formerPen = m_pen; - wxDouble width; - wxDouble height; - wxDouble descent; - wxDouble externalLeading; - GetTextExtent( str , &width, &height, &descent, &externalLeading ); - SetBrush( backgroundBrush ); - // to make sure our 'OffsetToPixelBoundaries' doesn't move the fill shape - SetPen( wxNullGraphicsPen ); - - DrawRectangle(x , y, width, height); - - DrawText( str, x ,y); - SetBrush( formerBrush ); - SetPen( formerPen ); -} - -void -wxGraphicsContext::DoDrawRotatedFilledText(const wxString &str, - wxDouble x, wxDouble y, - wxDouble angle, - const wxGraphicsBrush& backgroundBrush) -{ - wxGraphicsBrush formerBrush = m_brush; - wxGraphicsPen formerPen = m_pen; - - wxDouble width; - wxDouble height; - wxDouble descent; - wxDouble externalLeading; - GetTextExtent( str , &width, &height, &descent, &externalLeading ); - SetBrush( backgroundBrush ); - // to make sure our 'OffsetToPixelBoundaries' doesn't move the fill shape - SetPen( wxNullGraphicsPen ); - - wxGraphicsPath path = CreatePath(); - path.MoveToPoint( x , y ); - path.AddLineToPoint( (int) (x + sin(angle) * height) , (int) (y + cos(angle) * height) ); - path.AddLineToPoint( - (int) (x + sin(angle) * height + cos(angle) * width) , - (int) (y + cos(angle) * height - sin(angle) * width)); - path.AddLineToPoint((int) (x + cos(angle) * width) , (int) (y - sin(angle) * width) ); - FillPath( path ); - DrawText( str, x ,y, angle); - SetBrush( formerBrush ); - SetPen( formerPen ); -} - -void wxGraphicsContext::StrokeLine( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2) -{ - wxGraphicsPath path = CreatePath(); - path.MoveToPoint(x1, y1); - path.AddLineToPoint( x2, y2 ); - StrokePath( path ); -} - -void wxGraphicsContext::DrawRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h) -{ - wxGraphicsPath path = CreatePath(); - path.AddRectangle( x , y , w , h ); - DrawPath( path ); -} - -void wxGraphicsContext::DrawEllipse( wxDouble x, wxDouble y, wxDouble w, wxDouble h) -{ - wxGraphicsPath path = CreatePath(); - path.AddEllipse(x,y,w,h); - DrawPath(path); -} - -void wxGraphicsContext::DrawRoundedRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h, wxDouble radius) -{ - wxGraphicsPath path = CreatePath(); - path.AddRoundedRectangle(x,y,w,h,radius); - DrawPath(path); -} - -void wxGraphicsContext::StrokeLines( size_t n, const wxPoint2DDouble *points) -{ - wxASSERT(n > 1); - wxGraphicsPath path = CreatePath(); - path.MoveToPoint(points[0].m_x, points[0].m_y); - for ( size_t i = 1; i < n; ++i) - path.AddLineToPoint( points[i].m_x, points[i].m_y ); - StrokePath( path ); -} - -void wxGraphicsContext::DrawLines( size_t n, const wxPoint2DDouble *points, wxPolygonFillMode fillStyle) -{ - wxASSERT(n > 1); - wxGraphicsPath path = CreatePath(); - path.MoveToPoint(points[0].m_x, points[0].m_y); - for ( size_t i = 1; i < n; ++i) - path.AddLineToPoint( points[i].m_x, points[i].m_y ); - DrawPath( path , fillStyle); -} - -void wxGraphicsContext::StrokeLines( size_t n, const wxPoint2DDouble *beginPoints, const wxPoint2DDouble *endPoints) -{ - wxASSERT(n > 0); - wxGraphicsPath path = CreatePath(); - for ( size_t i = 0; i < n; ++i) - { - path.MoveToPoint(beginPoints[i].m_x, beginPoints[i].m_y); - path.AddLineToPoint( endPoints[i].m_x, endPoints[i].m_y ); - } - StrokePath( path ); -} - -// create a 'native' matrix corresponding to these values -wxGraphicsMatrix wxGraphicsContext::CreateMatrix( wxDouble a, wxDouble b, wxDouble c, wxDouble d, - wxDouble tx, wxDouble ty) const -{ - return GetRenderer()->CreateMatrix(a,b,c,d,tx,ty); -} - -wxGraphicsPath wxGraphicsContext::CreatePath() const -{ - return GetRenderer()->CreatePath(); -} - -wxGraphicsPen wxGraphicsContext::CreatePen(const wxPen& pen) const -{ - return GetRenderer()->CreatePen(pen); -} - -wxGraphicsBrush wxGraphicsContext::CreateBrush(const wxBrush& brush ) const -{ - return GetRenderer()->CreateBrush(brush); -} - -wxGraphicsBrush -wxGraphicsContext::CreateLinearGradientBrush( - wxDouble x1, wxDouble y1, - wxDouble x2, wxDouble y2, - const wxColour& c1, const wxColour& c2) const -{ - return GetRenderer()->CreateLinearGradientBrush - ( - x1, y1, - x2, y2, - wxGraphicsGradientStops(c1,c2) - ); -} - -wxGraphicsBrush -wxGraphicsContext::CreateLinearGradientBrush( - wxDouble x1, wxDouble y1, - wxDouble x2, wxDouble y2, - const wxGraphicsGradientStops& gradientStops) const -{ - return GetRenderer()->CreateLinearGradientBrush(x1,y1,x2,y2, gradientStops); -} - -wxGraphicsBrush -wxGraphicsContext::CreateRadialGradientBrush( - wxDouble xo, wxDouble yo, - wxDouble xc, wxDouble yc, wxDouble radius, - const wxColour &oColor, const wxColour &cColor) const -{ - return GetRenderer()->CreateRadialGradientBrush - ( - xo, yo, - xc, yc, radius, - wxGraphicsGradientStops(oColor, cColor) - ); -} - -wxGraphicsBrush -wxGraphicsContext::CreateRadialGradientBrush( - wxDouble xo, wxDouble yo, - wxDouble xc, wxDouble yc, wxDouble radius, - const wxGraphicsGradientStops& gradientStops) const -{ - return GetRenderer()->CreateRadialGradientBrush - ( - xo, yo, - xc, yc, radius, - gradientStops - ); -} - -wxGraphicsFont wxGraphicsContext::CreateFont( const wxFont &font , const wxColour &col ) const -{ - return GetRenderer()->CreateFont(font,col); -} - -wxGraphicsFont -wxGraphicsContext::CreateFont(double size, - const wxString& facename, - int flags, - const wxColour& col) const -{ - return GetRenderer()->CreateFont(size, facename, flags, col); -} - -wxGraphicsBitmap wxGraphicsContext::CreateBitmap( const wxBitmap& bmp ) const -{ - return GetRenderer()->CreateBitmap(bmp); -} - -#if wxUSE_IMAGE -wxGraphicsBitmap wxGraphicsContext::CreateBitmapFromImage(const wxImage& image) const -{ - return GetRenderer()->CreateBitmapFromImage(image); -} -#endif // wxUSE_IMAGE - -wxGraphicsBitmap wxGraphicsContext::CreateSubBitmap( const wxGraphicsBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) const -{ - return GetRenderer()->CreateSubBitmap(bmp,x,y,w,h); -} - -/* static */ wxGraphicsContext* wxGraphicsContext::Create( const wxWindowDC& dc) -{ - return wxGraphicsRenderer::GetDefaultRenderer()->CreateContext(dc); -} - -/* static */ wxGraphicsContext* wxGraphicsContext::Create( const wxMemoryDC& dc) -{ - return wxGraphicsRenderer::GetDefaultRenderer()->CreateContext(dc); -} - -#if wxUSE_PRINTING_ARCHITECTURE -/* static */ wxGraphicsContext* wxGraphicsContext::Create( const wxPrinterDC& dc) -{ - return wxGraphicsRenderer::GetDefaultRenderer()->CreateContext(dc); -} -#endif - -#ifdef __WXMSW__ -#if wxUSE_ENH_METAFILE -/* static */ wxGraphicsContext* wxGraphicsContext::Create( const wxEnhMetaFileDC& dc) -{ - return wxGraphicsRenderer::GetDefaultRenderer()->CreateContext(dc); -} -#endif -#endif - -wxGraphicsContext* wxGraphicsContext::CreateFromNative( void * context ) -{ - return wxGraphicsRenderer::GetDefaultRenderer()->CreateContextFromNativeContext(context); -} - -wxGraphicsContext* wxGraphicsContext::CreateFromNativeWindow( void * window ) -{ - return wxGraphicsRenderer::GetDefaultRenderer()->CreateContextFromNativeWindow(window); -} - -wxGraphicsContext* wxGraphicsContext::Create( wxWindow* window ) -{ - return wxGraphicsRenderer::GetDefaultRenderer()->CreateContext(window); -} - -#if wxUSE_IMAGE -/* static */ wxGraphicsContext* wxGraphicsContext::Create(wxImage& image) -{ - return wxGraphicsRenderer::GetDefaultRenderer()->CreateContextFromImage(image); -} -#endif // wxUSE_IMAGE - -wxGraphicsContext* wxGraphicsContext::Create() -{ - return wxGraphicsRenderer::GetDefaultRenderer()->CreateMeasuringContext(); -} - -//----------------------------------------------------------------------------- -// wxGraphicsRenderer -//----------------------------------------------------------------------------- - -wxIMPLEMENT_ABSTRACT_CLASS(wxGraphicsRenderer, wxObject); - -#endif // wxUSE_GRAPHICS_CONTEXT diff --git a/Externals/wxWidgets3/src/common/gridcmn.cpp b/Externals/wxWidgets3/src/common/gridcmn.cpp deleted file mode 100644 index 3431bfc93f..0000000000 --- a/Externals/wxWidgets3/src/common/gridcmn.cpp +++ /dev/null @@ -1,88 +0,0 @@ -/////////////////////////////////////////////////////////////////////////// -// Name: src/common/gridcmn.cpp -// Purpose: wxGrid common code -// Author: Michael Bedward (based on code by Julian Smart, Robin Dunn) -// Modified by: Robin Dunn, Vadim Zeitlin, Santiago Palacios -// Created: 1/08/1999 -// Copyright: (c) Michael Bedward (mbedward@ozemail.com.au) -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx/wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_GRID - -#include "wx/grid.h" - -#ifndef WX_PRECOMP - #include "wx/utils.h" - #include "wx/dcclient.h" - #include "wx/settings.h" - #include "wx/log.h" - #include "wx/textctrl.h" - #include "wx/checkbox.h" - #include "wx/combobox.h" - #include "wx/valtext.h" - #include "wx/intl.h" - #include "wx/math.h" - #include "wx/listbox.h" -#endif - -// ---------------------------------------------------------------------------- -// XTI -// ---------------------------------------------------------------------------- - -wxDEFINE_FLAGS( wxGridStyle ) -wxBEGIN_FLAGS( wxGridStyle ) - // new style border flags, we put them first to - // use them for streaming out - wxFLAGS_MEMBER(wxBORDER_SIMPLE) - wxFLAGS_MEMBER(wxBORDER_SUNKEN) - wxFLAGS_MEMBER(wxBORDER_DOUBLE) - wxFLAGS_MEMBER(wxBORDER_RAISED) - wxFLAGS_MEMBER(wxBORDER_STATIC) - wxFLAGS_MEMBER(wxBORDER_NONE) - - // old style border flags - wxFLAGS_MEMBER(wxSIMPLE_BORDER) - wxFLAGS_MEMBER(wxSUNKEN_BORDER) - wxFLAGS_MEMBER(wxDOUBLE_BORDER) - wxFLAGS_MEMBER(wxRAISED_BORDER) - wxFLAGS_MEMBER(wxSTATIC_BORDER) - wxFLAGS_MEMBER(wxBORDER) - - // standard window styles - wxFLAGS_MEMBER(wxTAB_TRAVERSAL) - wxFLAGS_MEMBER(wxCLIP_CHILDREN) - wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) - wxFLAGS_MEMBER(wxWANTS_CHARS) - wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE) - wxFLAGS_MEMBER(wxALWAYS_SHOW_SB) - wxFLAGS_MEMBER(wxVSCROLL) - wxFLAGS_MEMBER(wxHSCROLL) -wxEND_FLAGS( wxGridStyle ) - -wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxGrid, wxScrolledWindow, "wx/grid.h"); - -wxBEGIN_PROPERTIES_TABLE(wxGrid) - wxHIDE_PROPERTY( Children ) - wxPROPERTY_FLAGS( WindowStyle, wxGridStyle, long, SetWindowStyleFlag, \ - GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \ - wxT("Helpstring"), wxT("group")) // style -wxEND_PROPERTIES_TABLE() - -wxEMPTY_HANDLERS_TABLE(wxGrid) - -wxCONSTRUCTOR_5( wxGrid, wxWindow*, Parent, wxWindowID, Id, wxPoint, Position, \ - wxSize, Size, long, WindowStyle ) - -/* - TODO : Expose more information of a list's layout, etc. via appropriate objects (e.g., NotebookPageInfo) -*/ - -#endif // wxUSE_GRID diff --git a/Externals/wxWidgets3/src/common/hash.cpp b/Externals/wxWidgets3/src/common/hash.cpp deleted file mode 100644 index 74389735c9..0000000000 --- a/Externals/wxWidgets3/src/common/hash.cpp +++ /dev/null @@ -1,382 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/hash.cpp -// Purpose: wxHashTable implementation -// Author: Julian Smart -// Modified by: VZ at 25.02.00: type safe hashes with WX_DECLARE_HASH() -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#ifndef WX_PRECOMP - #include "wx/hash.h" - #include "wx/object.h" -#endif - -wxHashTableBase_Node::wxHashTableBase_Node( long key, void* value, - wxHashTableBase* table ) - : m_value( value ), m_hashPtr( table ) -{ - m_key.integer = key; -} - -wxHashTableBase_Node::wxHashTableBase_Node( const wxString& key, void* value, - wxHashTableBase* table ) - : m_value( value ), m_hashPtr( table ) -{ - m_key.string = new wxString(key); -} - -wxHashTableBase_Node::~wxHashTableBase_Node() -{ - if( m_hashPtr ) m_hashPtr->DoRemoveNode( this ); -} - -// - -wxHashTableBase::wxHashTableBase() - : m_size( 0 ), m_count( 0 ), m_table( NULL ), m_keyType( wxKEY_NONE ), - m_deleteContents( false ) -{ -} - -void wxHashTableBase::Create( wxKeyType keyType, size_t size ) -{ - m_keyType = keyType; - m_size = size; - m_table = new wxHashTableBase_Node*[ m_size ]; - - for( size_t i = 0; i < m_size; ++i ) - m_table[i] = NULL; -} - -void wxHashTableBase::Clear() -{ - for( size_t i = 0; i < m_size; ++i ) - { - Node* end = m_table[i]; - - if( end == NULL ) - continue; - - Node *curr, *next = end->GetNext(); - - do - { - curr = next; - next = curr->GetNext(); - - DoDestroyNode( curr ); - - delete curr; - } - while( curr != end ); - - m_table[i] = NULL; - } - - m_count = 0; -} - -void wxHashTableBase::DoRemoveNode( wxHashTableBase_Node* node ) -{ - size_t bucket = ( m_keyType == wxKEY_INTEGER ? - node->m_key.integer : - MakeKey( *node->m_key.string ) ) % m_size; - - if( node->GetNext() == node ) - { - // single-node chain (common case) - m_table[bucket] = NULL; - } - else - { - Node *start = m_table[bucket], *curr; - Node* prev = start; - - for( curr = prev->GetNext(); curr != node; - prev = curr, curr = curr->GetNext() ) ; - - DoUnlinkNode( bucket, node, prev ); - } - - DoDestroyNode( node ); -} - -void wxHashTableBase::DoDestroyNode( wxHashTableBase_Node* node ) -{ - // if it is called from DoRemoveNode, node has already been - // removed, from other places it does not matter - node->m_hashPtr = NULL; - - if( m_keyType == wxKEY_STRING ) - delete node->m_key.string; - if( m_deleteContents ) - DoDeleteContents( node ); -} - -void wxHashTableBase::Destroy() -{ - Clear(); - - wxDELETEA(m_table); - m_size = 0; -} - -void wxHashTableBase::DoInsertNode( size_t bucket, wxHashTableBase_Node* node ) -{ - if( m_table[bucket] == NULL ) - { - m_table[bucket] = node->m_next = node; - } - else - { - Node *prev = m_table[bucket]; - Node *next = prev->m_next; - - prev->m_next = node; - node->m_next = next; - m_table[bucket] = node; - } - - ++m_count; -} - -void wxHashTableBase::DoPut( long key, long hash, void* data ) -{ - wxASSERT( m_keyType == wxKEY_INTEGER ); - - size_t bucket = size_t(hash) % m_size; - Node* node = new wxHashTableBase_Node( key, data, this ); - - DoInsertNode( bucket, node ); -} - -void wxHashTableBase::DoPut( const wxString& key, long hash, void* data ) -{ - wxASSERT( m_keyType == wxKEY_STRING ); - - size_t bucket = size_t(hash) % m_size; - Node* node = new wxHashTableBase_Node( key, data, this ); - - DoInsertNode( bucket, node ); -} - -void* wxHashTableBase::DoGet( long key, long hash ) const -{ - wxASSERT( m_keyType == wxKEY_INTEGER ); - - size_t bucket = size_t(hash) % m_size; - - if( m_table[bucket] == NULL ) - return NULL; - - Node *first = m_table[bucket]->GetNext(), - *curr = first; - - do - { - if( curr->m_key.integer == key ) - return curr->m_value; - - curr = curr->GetNext(); - } - while( curr != first ); - - return NULL; -} - -void* wxHashTableBase::DoGet( const wxString& key, long hash ) const -{ - wxASSERT( m_keyType == wxKEY_STRING ); - - size_t bucket = size_t(hash) % m_size; - - if( m_table[bucket] == NULL ) - return NULL; - - Node *first = m_table[bucket]->GetNext(), - *curr = first; - - do - { - if( *curr->m_key.string == key ) - return curr->m_value; - - curr = curr->GetNext(); - } - while( curr != first ); - - return NULL; -} - -void wxHashTableBase::DoUnlinkNode( size_t bucket, wxHashTableBase_Node* node, - wxHashTableBase_Node* prev ) -{ - if( node == m_table[bucket] ) - m_table[bucket] = prev; - - if( prev == node && prev == node->GetNext() ) - m_table[bucket] = NULL; - else - prev->m_next = node->m_next; - - DoDestroyNode( node ); - --m_count; -} - -void* wxHashTableBase::DoDelete( long key, long hash ) -{ - wxASSERT( m_keyType == wxKEY_INTEGER ); - - size_t bucket = size_t(hash) % m_size; - - if( m_table[bucket] == NULL ) - return NULL; - - Node *first = m_table[bucket]->GetNext(), - *curr = first, - *prev = m_table[bucket]; - - do - { - if( curr->m_key.integer == key ) - { - void* retval = curr->m_value; - curr->m_value = NULL; - - DoUnlinkNode( bucket, curr, prev ); - delete curr; - - return retval; - } - - prev = curr; - curr = curr->GetNext(); - } - while( curr != first ); - - return NULL; -} - -void* wxHashTableBase::DoDelete( const wxString& key, long hash ) -{ - wxASSERT( m_keyType == wxKEY_STRING ); - - size_t bucket = size_t(hash) % m_size; - - if( m_table[bucket] == NULL ) - return NULL; - - Node *first = m_table[bucket]->GetNext(), - *curr = first, - *prev = m_table[bucket]; - - do - { - if( *curr->m_key.string == key ) - { - void* retval = curr->m_value; - curr->m_value = NULL; - - DoUnlinkNode( bucket, curr, prev ); - delete curr; - - return retval; - } - - prev = curr; - curr = curr->GetNext(); - } - while( curr != first ); - - return NULL; -} - -long wxHashTableBase::MakeKey( const wxString& str ) -{ - long int_key = 0; - - const wxStringCharType *p = str.wx_str(); - while( *p ) - int_key += *p++; - - return int_key; -} - -// ---------------------------------------------------------------------------- -// wxHashTable -// ---------------------------------------------------------------------------- - -wxHashTable::wxHashTable( const wxHashTable& table ) - : wxHashTableBase() -{ - DoCopy( table ); -} - -const wxHashTable& wxHashTable::operator=( const wxHashTable& table ) -{ - Destroy(); - DoCopy( table ); - - return *this; -} - -void wxHashTable::DoCopy( const wxHashTable& WXUNUSED(table) ) -{ - Create( m_keyType, m_size ); - - wxFAIL; -} - -void wxHashTable::DoDeleteContents( wxHashTableBase_Node* node ) -{ - delete ((wxHashTable_Node*)node)->GetData(); -} - -void wxHashTable::GetNextNode( size_t bucketStart ) -{ - for( size_t i = bucketStart; i < m_size; ++i ) - { - if( m_table[i] != NULL ) - { - m_curr = ((Node*)m_table[i])->GetNext(); - m_currBucket = i; - return; - } - } - - m_curr = NULL; - m_currBucket = 0; -} - -wxHashTable::Node* wxHashTable::Next() -{ - if( m_curr == NULL ) - GetNextNode( 0 ); - else - { - m_curr = m_curr->GetNext(); - - if( m_curr == ( (Node*)m_table[m_currBucket] )->GetNext() ) - GetNextNode( m_currBucket + 1 ); - } - - return m_curr; -} - diff --git a/Externals/wxWidgets3/src/common/hashmap.cpp b/Externals/wxWidgets3/src/common/hashmap.cpp deleted file mode 100644 index a9c10e34f2..0000000000 --- a/Externals/wxWidgets3/src/common/hashmap.cpp +++ /dev/null @@ -1,141 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/hashmap.cpp -// Purpose: wxHashMap implementation -// Author: Mattia Barbon -// Modified by: -// Created: 29/01/2002 -// Copyright: (c) Mattia Barbon -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include "wx/hashmap.h" - -/* FYI: This is the "One-at-a-Time" algorithm by Bob Jenkins */ -/* from requirements by Colin Plumb. */ -/* (http://burtleburtle.net/bob/hash/doobs.html) */ -/* adapted from Perl sources ( hv.h ) */ -template -static unsigned long DoStringHash(T *k) -{ - unsigned long hash = 0; - - while( *k ) - { - hash += *k++; - hash += (hash << 10); - hash ^= (hash >> 6); - } - hash += (hash << 3); - hash ^= (hash >> 11); - - return hash + (hash << 15); -} - -unsigned long wxStringHash::stringHash( const char* k ) - { return DoStringHash(k); } - -unsigned long wxStringHash::stringHash( const wchar_t* k ) - { return DoStringHash(k); } - - -#ifdef wxNEEDS_WX_HASH_MAP - -/* from SGI STL */ -const unsigned long _wxHashTableBase2::ms_primes[prime_count] = -{ - 7ul, 13ul, 29ul, - 53ul, 97ul, 193ul, 389ul, 769ul, - 1543ul, 3079ul, 6151ul, 12289ul, 24593ul, - 49157ul, 98317ul, 196613ul, 393241ul, 786433ul, - 1572869ul, 3145739ul, 6291469ul, 12582917ul, 25165843ul, - 50331653ul, 100663319ul, 201326611ul, 402653189ul, 805306457ul, - 1610612741ul, 3221225473ul, 4294967291ul -}; - -unsigned long _wxHashTableBase2::GetNextPrime( unsigned long n ) -{ - const unsigned long* ptr = &ms_primes[0]; - for( size_t i = 0; i < prime_count; ++i, ++ptr ) - { - if( n < *ptr ) - return *ptr; - } - - /* someone might try to alloc a 2^32-element hash table */ - wxFAIL_MSG( wxT("hash table too big?") ); - - /* quiet warning */ - return 0; -} - -unsigned long _wxHashTableBase2::GetPreviousPrime( unsigned long n ) -{ - const unsigned long* ptr = &ms_primes[prime_count - 1]; - - for( size_t i = 0; i < prime_count; ++i, --ptr ) - { - if( n > *ptr ) - return *ptr; - } - - /* quiet warning */ - return 1; -} - -void _wxHashTableBase2::DeleteNodes( size_t buckets, - _wxHashTable_NodeBase** table, - NodeDtor dtor ) -{ - size_t i; - - for( i = 0; i < buckets; ++i ) - { - _wxHashTable_NodeBase* node = table[i]; - _wxHashTable_NodeBase* tmp; - - while( node ) - { - tmp = node->m_next; - dtor( node ); - node = tmp; - } - } - - memset( table, 0, buckets * sizeof(void*) ); -} - -void _wxHashTableBase2::CopyHashTable( _wxHashTable_NodeBase** srcTable, - size_t srcBuckets, - _wxHashTableBase2* dst, - _wxHashTable_NodeBase** dstTable, - BucketFromNode func, ProcessNode proc ) -{ - for( size_t i = 0; i < srcBuckets; ++i ) - { - _wxHashTable_NodeBase* nextnode; - - for( _wxHashTable_NodeBase* node = srcTable[i]; node; node = nextnode ) - { - size_t bucket = func( dst, node ); - - nextnode = node->m_next; - _wxHashTable_NodeBase* newnode = proc( node ); - newnode->m_next = dstTable[bucket]; - dstTable[bucket] = newnode; - } - } -} - -_wxHashTable_NodeBase* _wxHashTableBase2::DummyProcessNode(_wxHashTable_NodeBase* node) -{ - return node; -} - -#endif // wxNEEDS_WX_HASH_MAP diff --git a/Externals/wxWidgets3/src/common/headercolcmn.cpp b/Externals/wxWidgets3/src/common/headercolcmn.cpp deleted file mode 100644 index efc958498e..0000000000 --- a/Externals/wxWidgets3/src/common/headercolcmn.cpp +++ /dev/null @@ -1,93 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/headercolcmn.cpp -// Purpose: wxHeaderColumn implementation -// Author: Vadim Zeitlin -// Created: 2008-12-02 -// Copyright: (c) 2008 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// for compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_HEADERCTRL - -#include "wx/headercol.h" - -// ============================================================================ -// wxHeaderColumn implementation -// ============================================================================ - -int wxHeaderColumn::GetFromIndividualFlags() const -{ - int flags = 0; - - if ( IsResizeable() ) - flags |= wxCOL_RESIZABLE; - if ( IsSortable() ) - flags |= wxCOL_SORTABLE; - if ( IsReorderable() ) - flags |= wxCOL_REORDERABLE; - if ( IsHidden() ) - flags |= wxCOL_HIDDEN; - - return flags; -} - -// ============================================================================ -// wxSettableHeaderColumn implementation -// ============================================================================ - -void wxSettableHeaderColumn::SetIndividualFlags(int flags) -{ - SetResizeable((flags & wxCOL_RESIZABLE) != 0); - SetSortable((flags & wxCOL_SORTABLE) != 0); - SetReorderable((flags & wxCOL_REORDERABLE) != 0); - SetHidden((flags & wxCOL_HIDDEN) != 0); -} - -void wxSettableHeaderColumn::ChangeFlag(int flag, bool set) -{ - if ( HasFlag(flag) != set ) - ToggleFlag(flag); -} - -void wxSettableHeaderColumn::SetFlag(int flag) -{ - int flags = GetFlags(); - if ( !(flags & flag) ) - SetFlags(flags | flag); -} - -void wxSettableHeaderColumn::ClearFlag(int flag) -{ - int flags = GetFlags(); - if ( flags & flag ) - SetFlags(flags & ~flag); -} - -void wxSettableHeaderColumn::ToggleFlag(int flag) -{ - int flags = GetFlags(); - if ( flags & flag ) - flags &= ~flag; - else - flags |= flag; - - SetFlags(flags); -} - -#endif // wxUSE_HEADERCTRL - diff --git a/Externals/wxWidgets3/src/common/headerctrlcmn.cpp b/Externals/wxWidgets3/src/common/headerctrlcmn.cpp deleted file mode 100644 index 54bb90119e..0000000000 --- a/Externals/wxWidgets3/src/common/headerctrlcmn.cpp +++ /dev/null @@ -1,494 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/headerctrlcmn.cpp -// Purpose: implementation of wxHeaderCtrlBase -// Author: Vadim Zeitlin -// Created: 2008-12-02 -// Copyright: (c) 2008 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// for compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_HEADERCTRL - -#ifndef WX_PRECOMP - #include "wx/menu.h" -#endif // WX_PRECOMP - -#include "wx/headerctrl.h" -#include "wx/rearrangectrl.h" -#include "wx/renderer.h" - -namespace -{ - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -const unsigned int wxNO_COLUMN = static_cast(-1); - -// ---------------------------------------------------------------------------- -// wxHeaderColumnsRearrangeDialog: dialog for customizing our columns -// ---------------------------------------------------------------------------- - -#if wxUSE_REARRANGECTRL - -class wxHeaderColumnsRearrangeDialog : public wxRearrangeDialog -{ -public: - wxHeaderColumnsRearrangeDialog(wxWindow *parent, - const wxArrayInt& order, - const wxArrayString& items) - : wxRearrangeDialog - ( - parent, - _("Please select the columns to show and define their order:"), - _("Customize Columns"), - order, - items - ) - { - } -}; - -#endif // wxUSE_REARRANGECTRL - -} // anonymous namespace - -// ============================================================================ -// wxHeaderCtrlBase implementation -// ============================================================================ - -extern WXDLLIMPEXP_DATA_CORE(const char) wxHeaderCtrlNameStr[] = "wxHeaderCtrl"; - -wxBEGIN_EVENT_TABLE(wxHeaderCtrlBase, wxControl) - EVT_HEADER_SEPARATOR_DCLICK(wxID_ANY, wxHeaderCtrlBase::OnSeparatorDClick) -#if wxUSE_MENUS - EVT_HEADER_RIGHT_CLICK(wxID_ANY, wxHeaderCtrlBase::OnRClick) -#endif // wxUSE_MENUS -wxEND_EVENT_TABLE() - -void wxHeaderCtrlBase::ScrollWindow(int dx, - int WXUNUSED_UNLESS_DEBUG(dy), - const wxRect * WXUNUSED_UNLESS_DEBUG(rect)) - -{ - // this doesn't make sense at all - wxASSERT_MSG( !dy, "header window can't be scrolled vertically" ); - - // this would actually be nice to support for "frozen" headers but it isn't - // supported currently - wxASSERT_MSG( !rect, "header window can't be scrolled partially" ); - - DoScrollHorz(dx); -} - -void wxHeaderCtrlBase::SetColumnCount(unsigned int count) -{ - if ( count != GetColumnCount() ) - OnColumnCountChanging(count); - - // still call DoSetCount() even if the count didn't really change in order - // to update all the columns - DoSetCount(count); -} - -int wxHeaderCtrlBase::GetColumnTitleWidth(const wxHeaderColumn& col) -{ - int w = wxWindowBase::GetTextExtent(col.GetTitle()).x; - - // add some margin: - w += wxRendererNative::Get().GetHeaderButtonMargin(this); - - // if a bitmap is used, add space for it and 2px border: - wxBitmap bmp = col.GetBitmap(); - if ( bmp.IsOk() ) - w += bmp.GetWidth() + 2; - - return w; -} - -// ---------------------------------------------------------------------------- -// wxHeaderCtrlBase event handling -// ---------------------------------------------------------------------------- - -void wxHeaderCtrlBase::OnSeparatorDClick(wxHeaderCtrlEvent& event) -{ - const unsigned col = event.GetColumn(); - const wxHeaderColumn& column = GetColumn(col); - - if ( !column.IsResizeable() ) - { - event.Skip(); - return; - } - - int w = GetColumnTitleWidth(column); - - if ( !UpdateColumnWidthToFit(col, w) ) - event.Skip(); - else - UpdateColumn(col); -} - -#if wxUSE_MENUS - -void wxHeaderCtrlBase::OnRClick(wxHeaderCtrlEvent& event) -{ - if ( !HasFlag(wxHD_ALLOW_HIDE) ) - { - event.Skip(); - return; - } - - ShowColumnsMenu(ScreenToClient(wxGetMousePosition())); -} - -#endif // wxUSE_MENUS - -// ---------------------------------------------------------------------------- -// wxHeaderCtrlBase column reordering -// ---------------------------------------------------------------------------- - -void wxHeaderCtrlBase::SetColumnsOrder(const wxArrayInt& order) -{ - const unsigned count = GetColumnCount(); - wxCHECK_RET( order.size() == count, "wrong number of columns" ); - - // check the array validity - wxArrayInt seen(count, 0); - for ( unsigned n = 0; n < count; n++ ) - { - const unsigned idx = order[n]; - wxCHECK_RET( idx < count, "invalid column index" ); - wxCHECK_RET( !seen[idx], "duplicate column index" ); - - seen[idx] = 1; - } - - DoSetColumnsOrder(order); - - // TODO-RTL: do we need to reverse the array? -} - -void wxHeaderCtrlBase::ResetColumnsOrder() -{ - const unsigned count = GetColumnCount(); - wxArrayInt order(count); - for ( unsigned n = 0; n < count; n++ ) - order[n] = n; - - DoSetColumnsOrder(order); -} - -wxArrayInt wxHeaderCtrlBase::GetColumnsOrder() const -{ - const wxArrayInt order = DoGetColumnsOrder(); - - wxASSERT_MSG( order.size() == GetColumnCount(), "invalid order array" ); - - return order; -} - -unsigned int wxHeaderCtrlBase::GetColumnAt(unsigned int pos) const -{ - wxCHECK_MSG( pos < GetColumnCount(), wxNO_COLUMN, "invalid position" ); - - return GetColumnsOrder()[pos]; -} - -unsigned int wxHeaderCtrlBase::GetColumnPos(unsigned int idx) const -{ - const unsigned count = GetColumnCount(); - - wxCHECK_MSG( idx < count, wxNO_COLUMN, "invalid index" ); - - const wxArrayInt order = GetColumnsOrder(); - int pos = order.Index(idx); - wxCHECK_MSG( pos != wxNOT_FOUND, wxNO_COLUMN, "column unexpectedly not displayed at all" ); - - return (unsigned int)pos; -} - -/* static */ -void wxHeaderCtrlBase::MoveColumnInOrderArray(wxArrayInt& order, - unsigned int idx, - unsigned int pos) -{ - int posOld = order.Index(idx); - wxASSERT_MSG( posOld != wxNOT_FOUND, "invalid index" ); - - if ( pos != (unsigned int)posOld ) - { - order.RemoveAt(posOld); - order.Insert(idx, pos); - } -} - -void -wxHeaderCtrlBase::DoResizeColumnIndices(wxArrayInt& colIndices, unsigned int count) -{ - // update the column indices array if necessary - const unsigned countOld = colIndices.size(); - if ( count > countOld ) - { - // all new columns have default positions equal to their indices - for ( unsigned n = countOld; n < count; n++ ) - colIndices.push_back(n); - } - else if ( count < countOld ) - { - // filter out all the positions which are invalid now while keeping the - // order of the remaining ones - wxArrayInt colIndicesNew; - colIndicesNew.reserve(count); - for ( unsigned n = 0; n < countOld; n++ ) - { - const unsigned idx = colIndices[n]; - if ( idx < count ) - colIndicesNew.push_back(idx); - } - - colIndices.swap(colIndicesNew); - } - //else: count didn't really change, nothing to do - - wxASSERT_MSG( colIndices.size() == count, "logic error" ); -} - -// ---------------------------------------------------------------------------- -// wxHeaderCtrl extra UI -// ---------------------------------------------------------------------------- - -#if wxUSE_MENUS - -void wxHeaderCtrlBase::AddColumnsItems(wxMenu& menu, int idColumnsBase) -{ - const unsigned count = GetColumnCount(); - for ( unsigned n = 0; n < count; n++ ) - { - const wxHeaderColumn& col = GetColumn(n); - menu.AppendCheckItem(idColumnsBase + n, col.GetTitle()); - if ( col.IsShown() ) - menu.Check(n, true); - } -} - -bool wxHeaderCtrlBase::ShowColumnsMenu(const wxPoint& pt, const wxString& title) -{ - // construct the menu with the entries for all columns - wxMenu menu; - if ( !title.empty() ) - menu.SetTitle(title); - - AddColumnsItems(menu); - - // ... and an extra one to show the customization dialog if the user is - // allowed to reorder the columns too - const unsigned count = GetColumnCount(); - if ( HasFlag(wxHD_ALLOW_REORDER) ) - { - menu.AppendSeparator(); - menu.Append(count, _("&Customize...")); - } - - // do show the menu and get the user selection - const int rc = GetPopupMenuSelectionFromUser(menu, pt); - if ( rc == wxID_NONE ) - return false; - - if ( static_cast(rc) == count ) - { - return ShowCustomizeDialog(); - } - else // a column selected from the menu - { - UpdateColumnVisibility(rc, !GetColumn(rc).IsShown()); - } - - return true; -} - -#endif // wxUSE_MENUS - -bool wxHeaderCtrlBase::ShowCustomizeDialog() -{ -#if wxUSE_REARRANGECTRL - // prepare the data for showing the dialog - wxArrayInt order = GetColumnsOrder(); - - const unsigned count = GetColumnCount(); - - // notice that titles are always in the index order, they will be shown - // rearranged according to the display order in the dialog - wxArrayString titles; - titles.reserve(count); - for ( unsigned n = 0; n < count; n++ ) - titles.push_back(GetColumn(n).GetTitle()); - - // this loop is however over positions and not indices - unsigned pos; - for ( pos = 0; pos < count; pos++ ) - { - int& idx = order[pos]; - if ( GetColumn(idx).IsHidden() ) - { - // indicate that this one is hidden - idx = ~idx; - } - } - - // do show it - wxHeaderColumnsRearrangeDialog dlg(this, order, titles); - if ( dlg.ShowModal() == wxID_OK ) - { - // and apply the changes - order = dlg.GetOrder(); - for ( pos = 0; pos < count; pos++ ) - { - int& idx = order[pos]; - const bool show = idx >= 0; - if ( !show ) - { - // make all indices positive for passing them to SetColumnsOrder() - idx = ~idx; - } - - if ( show != GetColumn(idx).IsShown() ) - UpdateColumnVisibility(idx, show); - } - - UpdateColumnsOrder(order); - SetColumnsOrder(order); - - return true; - } -#endif // wxUSE_REARRANGECTRL - - return false; -} - -// ============================================================================ -// wxHeaderCtrlSimple implementation -// ============================================================================ - -void wxHeaderCtrlSimple::Init() -{ - m_sortKey = wxNO_COLUMN; -} - -const wxHeaderColumn& wxHeaderCtrlSimple::GetColumn(unsigned int idx) const -{ - return m_cols[idx]; -} - -void wxHeaderCtrlSimple::DoInsert(const wxHeaderColumnSimple& col, unsigned int idx) -{ - m_cols.insert(m_cols.begin() + idx, col); - - UpdateColumnCount(); -} - -void wxHeaderCtrlSimple::DoDelete(unsigned int idx) -{ - m_cols.erase(m_cols.begin() + idx); - if ( idx == m_sortKey ) - m_sortKey = wxNO_COLUMN; - - UpdateColumnCount(); -} - -void wxHeaderCtrlSimple::DeleteAllColumns() -{ - m_cols.clear(); - m_sortKey = wxNO_COLUMN; - - UpdateColumnCount(); -} - - -void wxHeaderCtrlSimple::DoShowColumn(unsigned int idx, bool show) -{ - if ( show != m_cols[idx].IsShown() ) - { - m_cols[idx].SetHidden(!show); - - UpdateColumn(idx); - } -} - -void wxHeaderCtrlSimple::DoShowSortIndicator(unsigned int idx, bool ascending) -{ - RemoveSortIndicator(); - - m_cols[idx].SetSortOrder(ascending); - m_sortKey = idx; - - UpdateColumn(idx); -} - -void wxHeaderCtrlSimple::RemoveSortIndicator() -{ - if ( m_sortKey != wxNO_COLUMN ) - { - const unsigned sortOld = m_sortKey; - m_sortKey = wxNO_COLUMN; - - m_cols[sortOld].UnsetAsSortKey(); - - UpdateColumn(sortOld); - } -} - -bool -wxHeaderCtrlSimple::UpdateColumnWidthToFit(unsigned int idx, int widthTitle) -{ - const int widthContents = GetBestFittingWidth(idx); - if ( widthContents == -1 ) - return false; - - m_cols[idx].SetWidth(wxMax(widthContents, widthTitle)); - - return true; -} - -// ============================================================================ -// wxHeaderCtrlEvent implementation -// ============================================================================ - -wxIMPLEMENT_DYNAMIC_CLASS(wxHeaderCtrlEvent, wxNotifyEvent); - -wxDEFINE_EVENT( wxEVT_HEADER_CLICK, wxHeaderCtrlEvent); -wxDEFINE_EVENT( wxEVT_HEADER_RIGHT_CLICK, wxHeaderCtrlEvent); -wxDEFINE_EVENT( wxEVT_HEADER_MIDDLE_CLICK, wxHeaderCtrlEvent); - -wxDEFINE_EVENT( wxEVT_HEADER_DCLICK, wxHeaderCtrlEvent); -wxDEFINE_EVENT( wxEVT_HEADER_RIGHT_DCLICK, wxHeaderCtrlEvent); -wxDEFINE_EVENT( wxEVT_HEADER_MIDDLE_DCLICK, wxHeaderCtrlEvent); - -wxDEFINE_EVENT( wxEVT_HEADER_SEPARATOR_DCLICK, wxHeaderCtrlEvent); - -wxDEFINE_EVENT( wxEVT_HEADER_BEGIN_RESIZE, wxHeaderCtrlEvent); -wxDEFINE_EVENT( wxEVT_HEADER_RESIZING, wxHeaderCtrlEvent); -wxDEFINE_EVENT( wxEVT_HEADER_END_RESIZE, wxHeaderCtrlEvent); - -wxDEFINE_EVENT( wxEVT_HEADER_BEGIN_REORDER, wxHeaderCtrlEvent); -wxDEFINE_EVENT( wxEVT_HEADER_END_REORDER, wxHeaderCtrlEvent); - -wxDEFINE_EVENT( wxEVT_HEADER_DRAGGING_CANCELLED, wxHeaderCtrlEvent); - -#endif // wxUSE_HEADERCTRL diff --git a/Externals/wxWidgets3/src/common/helpbase.cpp b/Externals/wxWidgets3/src/common/helpbase.cpp deleted file mode 100644 index fe64f7a694..0000000000 --- a/Externals/wxWidgets3/src/common/helpbase.cpp +++ /dev/null @@ -1,27 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/helpbase.cpp -// Purpose: Help system base classes -// Author: Julian Smart -// Modified by: -// Created: 04/01/98 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_HELP - -#ifndef WX_PRECOMP -#endif - -#include "wx/helpbase.h" - -wxIMPLEMENT_CLASS(wxHelpControllerBase, wxObject); - -#endif // wxUSE_HELP diff --git a/Externals/wxWidgets3/src/common/http.cpp b/Externals/wxWidgets3/src/common/http.cpp deleted file mode 100644 index a4621c0731..0000000000 --- a/Externals/wxWidgets3/src/common/http.cpp +++ /dev/null @@ -1,533 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/http.cpp -// Purpose: HTTP protocol -// Author: Guilhem Lavaux -// Modified by: Simo Virokannas (authentication, Dec 2005) -// Created: August 1997 -// Copyright: (c) 1997, 1998 Guilhem Lavaux -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_PROTOCOL_HTTP - -#include -#include - -#ifndef WX_PRECOMP - #include "wx/string.h" -#endif - -#include "wx/tokenzr.h" -#include "wx/socket.h" -#include "wx/protocol/protocol.h" -#include "wx/url.h" -#include "wx/protocol/http.h" -#include "wx/sckstrm.h" -#include "wx/thread.h" - - -// ---------------------------------------------------------------------------- -// wxHTTP -// ---------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxHTTP, wxProtocol); -IMPLEMENT_PROTOCOL(wxHTTP, wxT("http"), wxT("80"), true) - -wxHTTP::wxHTTP() - : wxProtocol() -{ - m_addr = NULL; - m_read = false; - m_proxy_mode = false; - m_http_response = 0; -} - -wxHTTP::~wxHTTP() -{ - ClearHeaders(); - - delete m_addr; -} - -void wxHTTP::ClearHeaders() -{ - m_headers.clear(); -} - -void wxHTTP::ClearCookies() -{ - m_cookies.clear(); -} - -wxString wxHTTP::GetContentType() const -{ - return GetHeader(wxT("Content-Type")); -} - -void wxHTTP::SetProxyMode(bool on) -{ - m_proxy_mode = on; -} - -wxHTTP::wxHeaderIterator wxHTTP::FindHeader(const wxString& header) -{ - wxHeaderIterator it = m_headers.begin(); - for ( wxHeaderIterator en = m_headers.end(); it != en; ++it ) - { - if ( header.CmpNoCase(it->first) == 0 ) - break; - } - - return it; -} - -wxHTTP::wxHeaderConstIterator wxHTTP::FindHeader(const wxString& header) const -{ - wxHeaderConstIterator it = m_headers.begin(); - for ( wxHeaderConstIterator en = m_headers.end(); it != en; ++it ) - { - if ( header.CmpNoCase(it->first) == 0 ) - break; - } - - return it; -} - -wxHTTP::wxCookieIterator wxHTTP::FindCookie(const wxString& cookie) -{ - wxCookieIterator it = m_cookies.begin(); - for ( wxCookieIterator en = m_cookies.end(); it != en; ++it ) - { - if ( cookie.CmpNoCase(it->first) == 0 ) - break; - } - - return it; -} - -wxHTTP::wxCookieConstIterator wxHTTP::FindCookie(const wxString& cookie) const -{ - wxCookieConstIterator it = m_cookies.begin(); - for ( wxCookieConstIterator en = m_cookies.end(); it != en; ++it ) - { - if ( cookie.CmpNoCase(it->first) == 0 ) - break; - } - - return it; -} - -void wxHTTP::SetHeader(const wxString& header, const wxString& h_data) -{ - if (m_read) { - ClearHeaders(); - m_read = false; - } - - wxHeaderIterator it = FindHeader(header); - if (it != m_headers.end()) - it->second = h_data; - else - m_headers[header] = h_data; -} - -wxString wxHTTP::GetHeader(const wxString& header) const -{ - wxHeaderConstIterator it = FindHeader(header); - - return it == m_headers.end() ? wxGetEmptyString() : it->second; -} - -wxString wxHTTP::GetCookie(const wxString& cookie) const -{ - wxCookieConstIterator it = FindCookie(cookie); - - return it == m_cookies.end() ? wxGetEmptyString() : it->second; -} - -wxString wxHTTP::GenerateAuthString(const wxString& user, const wxString& pass) const -{ - // TODO: Use wxBase64Encode() now that we have it instead of reproducing it - - static const char *base64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; - - wxString buf; - wxString toencode; - - buf.Printf(wxT("Basic ")); - - toencode.Printf(wxT("%s:%s"),user.c_str(),pass.c_str()); - - size_t len = toencode.length(); - const wxChar *from = toencode.c_str(); - while (len >= 3) { // encode full blocks first - buf << wxString::Format(wxT("%c%c"), base64[(from[0] >> 2) & 0x3f], base64[((from[0] << 4) & 0x30) | ((from[1] >> 4) & 0xf)]); - buf << wxString::Format(wxT("%c%c"), base64[((from[1] << 2) & 0x3c) | ((from[2] >> 6) & 0x3)], base64[from[2] & 0x3f]); - from += 3; - len -= 3; - } - if (len > 0) { // pad the remaining characters - buf << wxString::Format(wxT("%c"), base64[(from[0] >> 2) & 0x3f]); - if (len == 1) { - buf << wxString::Format(wxT("%c="), base64[(from[0] << 4) & 0x30]); - } else { - buf << wxString::Format(wxT("%c%c"), base64[((from[0] << 4) & 0x30) | ((from[1] >> 4) & 0xf)], base64[(from[1] << 2) & 0x3c]); - } - buf << wxT("="); - } - - return buf; -} - -void wxHTTP::SetPostBuffer(const wxString& post_buf) -{ - // Use To8BitData() for backwards compatibility in this deprecated method. - // The new code should use the other overload or SetPostText() and specify - // the encoding to use for the text explicitly. - wxScopedCharBuffer scb = post_buf.To8BitData(); - if ( scb.length() ) - { - m_postBuffer.Clear(); - m_postBuffer.AppendData(scb.data(), scb.length()); - } -} - -bool -wxHTTP::SetPostBuffer(const wxString& contentType, - const wxMemoryBuffer& data) -{ - m_postBuffer = data; - m_contentType = contentType; - - return !m_postBuffer.IsEmpty(); -} - -bool -wxHTTP::SetPostText(const wxString& contentType, - const wxString& data, - const wxMBConv& conv) -{ -#if wxUSE_UNICODE - wxScopedCharBuffer scb = data.mb_str(conv); - const size_t len = scb.length(); - const char* const buf = scb.data(); -#else // !wxUSE_UNICODE - const size_t len = data.length(); - const char* const buf = data.mb_str(conv); -#endif // wxUSE_UNICODE/!wxUSE_UNICODE - - if ( !len ) - return false; - - m_postBuffer.Clear(); - m_postBuffer.AppendData(buf, len); - m_contentType = contentType; - - return true; -} - -void wxHTTP::SendHeaders() -{ - typedef wxStringToStringHashMap::iterator iterator; - wxString buf; - - for (iterator it = m_headers.begin(), en = m_headers.end(); it != en; ++it ) - { - buf.Printf(wxT("%s: %s\r\n"), it->first.c_str(), it->second.c_str()); - - const wxWX2MBbuf cbuf = buf.mb_str(); - Write(cbuf, strlen(cbuf)); - } -} - -bool wxHTTP::ParseHeaders() -{ - wxString line; - wxStringTokenizer tokenzr; - - ClearHeaders(); - ClearCookies(); - m_read = true; - - for ( ;; ) - { - m_lastError = ReadLine(this, line); - if (m_lastError != wxPROTO_NOERR) - return false; - - if ( line.empty() ) - break; - - wxString left_str = line.BeforeFirst(':'); - if(!left_str.CmpNoCase("Set-Cookie")) - { - wxString cookieName = line.AfterFirst(':').Strip(wxString::both).BeforeFirst('='); - wxString cookieValue = line.AfterFirst(':').Strip(wxString::both).AfterFirst('=').BeforeFirst(';'); - m_cookies[cookieName] = cookieValue; - - // For compatibility - m_headers[left_str] = line.AfterFirst(':').Strip(wxString::both); - } - else - { - m_headers[left_str] = line.AfterFirst(':').Strip(wxString::both); - } - } - return true; -} - -bool wxHTTP::Connect(const wxString& host, unsigned short port) -{ - wxIPV4address *addr; - - if (m_addr) { - wxDELETE(m_addr); - Close(); - } - - m_addr = addr = new wxIPV4address(); - - if (!addr->Hostname(host)) { - wxDELETE(m_addr); - m_lastError = wxPROTO_NETERR; - return false; - } - - if ( port ) - addr->Service(port); - else if (!addr->Service(wxT("http"))) - addr->Service(80); - - wxString hostHdr = host; - if ( port && port != 80 ) - hostHdr << wxT(":") << port; - SetHeader(wxT("Host"), hostHdr); - - m_lastError = wxPROTO_NOERR; - return true; -} - -bool wxHTTP::Connect(const wxSockAddress& addr, bool WXUNUSED(wait)) -{ - if (m_addr) { - delete m_addr; - Close(); - } - - m_addr = addr.Clone(); - - wxIPV4address *ipv4addr = wxDynamicCast(&addr, wxIPV4address); - if ( ipv4addr ) - { - wxString hostHdr = ipv4addr->OrigHostname(); - unsigned short port = ipv4addr->Service(); - if ( port && port != 80 ) - hostHdr << wxT(":") << port; - SetHeader(wxT("Host"), hostHdr); - } - - m_lastError = wxPROTO_NOERR; - return true; -} - -bool wxHTTP::BuildRequest(const wxString& path, const wxString& method) -{ - // Use the data in the post buffer, if any. - if ( !m_postBuffer.IsEmpty() ) - { - wxString len; - len << m_postBuffer.GetDataLen(); - - // Content length must be correct, so always set, possibly - // overriding the value set explicitly by a previous call to - // SetHeader("Content-Length"). - SetHeader(wxS("Content-Length"), len); - - // However if the user had explicitly set the content type, don't - // override it with the content type passed to SetPostText(). - if ( !m_contentType.empty() && GetContentType().empty() ) - SetHeader(wxS("Content-Type"), m_contentType); - } - - m_http_response = 0; - - // If there is no User-Agent defined, define it. - if ( GetHeader(wxT("User-Agent")).empty() ) - SetHeader(wxT("User-Agent"), wxVERSION_STRING); - - // Send authentication information - if (!m_username.empty() || !m_password.empty()) { - SetHeader(wxT("Authorization"), GenerateAuthString(m_username, m_password)); - } - - wxString buf; - buf.Printf(wxT("%s %s HTTP/1.0\r\n"), method, path); - const wxWX2MBbuf pathbuf = buf.mb_str(); - Write(pathbuf, strlen(pathbuf)); - SendHeaders(); - Write("\r\n", 2); - - if ( !m_postBuffer.IsEmpty() ) { - Write(m_postBuffer.GetData(), m_postBuffer.GetDataLen()); - - m_postBuffer.Clear(); - } - - wxString tmp_str; - m_lastError = ReadLine(this, tmp_str); - if (m_lastError != wxPROTO_NOERR) - return false; - - if (!tmp_str.Contains(wxT("HTTP/"))) { - // TODO: support HTTP v0.9 which can have no header. - // FIXME: tmp_str is not put back in the in-queue of the socket. - m_lastError = wxPROTO_NOERR; - SetHeader(wxT("Content-Length"), wxT("-1")); - SetHeader(wxT("Content-Type"), wxT("none/none")); - RestoreState(); - return true; - } - - wxStringTokenizer token(tmp_str,wxT(' ')); - wxString tmp_str2; - bool ret_value; - - token.NextToken(); - tmp_str2 = token.NextToken(); - - m_http_response = wxAtoi(tmp_str2); - - switch ( tmp_str2[0u].GetValue() ) - { - case wxT('1'): - /* INFORMATION / SUCCESS */ - break; - - case wxT('2'): - /* SUCCESS */ - break; - - case wxT('3'): - /* REDIRECTION */ - break; - - default: - m_lastError = wxPROTO_NOFILE; - RestoreState(); - return false; - } - - m_lastError = wxPROTO_NOERR; - ret_value = ParseHeaders(); - - return ret_value; -} - -bool wxHTTP::Abort(void) -{ - return wxSocketClient::Close(); -} - -// ---------------------------------------------------------------------------- -// wxHTTPStream and wxHTTP::GetInputStream -// ---------------------------------------------------------------------------- - -class wxHTTPStream : public wxSocketInputStream -{ -public: - wxHTTP *m_http; - size_t m_httpsize; - unsigned long m_read_bytes; - - wxHTTPStream(wxHTTP *http) : wxSocketInputStream(*http) - { - m_http = http; - m_httpsize = 0; - m_read_bytes = 0; - } - - size_t GetSize() const wxOVERRIDE { return m_httpsize; } - virtual ~wxHTTPStream(void) { m_http->Abort(); } - -protected: - size_t OnSysRead(void *buffer, size_t bufsize) wxOVERRIDE; - - wxDECLARE_NO_COPY_CLASS(wxHTTPStream); -}; - -size_t wxHTTPStream::OnSysRead(void *buffer, size_t bufsize) -{ - if (m_read_bytes >= m_httpsize) - { - m_lasterror = wxSTREAM_EOF; - return 0; - } - - size_t ret = wxSocketInputStream::OnSysRead(buffer, bufsize); - m_read_bytes += ret; - - if (m_httpsize==(size_t)-1 && m_lasterror == wxSTREAM_READ_ERROR ) - { - // if m_httpsize is (size_t) -1 this means read until connection closed - // which is equivalent to getting a READ_ERROR, for clients however this - // must be translated into EOF, as it is the expected way of signalling - // end end of the content - m_lasterror = wxSTREAM_EOF; - } - - return ret; -} - -wxInputStream *wxHTTP::GetInputStream(const wxString& path) -{ - wxHTTPStream *inp_stream; - - wxString new_path; - - m_lastError = wxPROTO_CONNERR; // all following returns share this type of error - if (!m_addr) - return NULL; - - // We set m_connected back to false so wxSocketBase will know what to do. -#ifdef __WXMAC__ - wxSocketClient::Connect(*m_addr , false ); - wxSocketClient::WaitOnConnect(10); - - if (!wxSocketClient::IsConnected()) - return NULL; -#else - if (!wxProtocol::Connect(*m_addr)) - return NULL; -#endif - - // Use the user-specified method if any or determine the method to use - // automatically depending on whether we have anything to post or not. - wxString method = m_method; - if (method.empty()) - method = m_postBuffer.IsEmpty() ? wxS("GET"): wxS("POST"); - - if (!BuildRequest(path, method)) - return NULL; - - inp_stream = new wxHTTPStream(this); - - if (!GetHeader(wxT("Content-Length")).empty()) - inp_stream->m_httpsize = wxAtoi(GetHeader(wxT("Content-Length"))); - else - inp_stream->m_httpsize = (size_t)-1; - - inp_stream->m_read_bytes = 0; - - // no error; reset m_lastError - m_lastError = wxPROTO_NOERR; - return inp_stream; -} - -#endif // wxUSE_PROTOCOL_HTTP diff --git a/Externals/wxWidgets3/src/common/hyperlnkcmn.cpp b/Externals/wxWidgets3/src/common/hyperlnkcmn.cpp deleted file mode 100644 index aacbec2149..0000000000 --- a/Externals/wxWidgets3/src/common/hyperlnkcmn.cpp +++ /dev/null @@ -1,141 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/hyperlnkcmn.cpp -// Purpose: Hyperlink control -// Author: David Norris , Otto Wyss -// Modified by: Ryan Norton, Francesco Montorsi -// Created: 04/02/2005 -// Copyright: (c) 2005 David Norris -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -//--------------------------------------------------------------------------- -// Pre-compiled header stuff -//--------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_HYPERLINKCTRL - -//--------------------------------------------------------------------------- -// Includes -//--------------------------------------------------------------------------- - -#include "wx/hyperlink.h" - -#ifndef WX_PRECOMP - #include "wx/menu.h" - #include "wx/log.h" - #include "wx/dataobj.h" -#endif - -// ============================================================================ -// implementation -// ============================================================================ - -wxDEFINE_FLAGS( wxHyperlinkStyle ) -wxBEGIN_FLAGS( wxHyperlinkStyle ) -// new style border flags, we put them first to -// use them for streaming out -wxFLAGS_MEMBER(wxBORDER_SIMPLE) -wxFLAGS_MEMBER(wxBORDER_SUNKEN) -wxFLAGS_MEMBER(wxBORDER_DOUBLE) -wxFLAGS_MEMBER(wxBORDER_RAISED) -wxFLAGS_MEMBER(wxBORDER_STATIC) -wxFLAGS_MEMBER(wxBORDER_NONE) - -// old style border flags -wxFLAGS_MEMBER(wxSIMPLE_BORDER) -wxFLAGS_MEMBER(wxSUNKEN_BORDER) -wxFLAGS_MEMBER(wxDOUBLE_BORDER) -wxFLAGS_MEMBER(wxRAISED_BORDER) -wxFLAGS_MEMBER(wxSTATIC_BORDER) -wxFLAGS_MEMBER(wxBORDER) - -// standard window styles -wxFLAGS_MEMBER(wxTAB_TRAVERSAL) -wxFLAGS_MEMBER(wxCLIP_CHILDREN) -wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) -wxFLAGS_MEMBER(wxWANTS_CHARS) -wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE) -wxFLAGS_MEMBER(wxALWAYS_SHOW_SB ) -wxFLAGS_MEMBER(wxVSCROLL) -wxFLAGS_MEMBER(wxHSCROLL) - -wxFLAGS_MEMBER(wxHL_CONTEXTMENU) -wxFLAGS_MEMBER(wxHL_ALIGN_LEFT) -wxFLAGS_MEMBER(wxHL_ALIGN_RIGHT) -wxFLAGS_MEMBER(wxHL_ALIGN_CENTRE) -wxEND_FLAGS( wxHyperlinkStyle ) - -wxIMPLEMENT_DYNAMIC_CLASS_XTI( wxHyperlinkCtrl, wxControl, "wx/hyperlink.h"); - -wxIMPLEMENT_DYNAMIC_CLASS(wxHyperlinkEvent, wxCommandEvent); -wxDEFINE_EVENT( wxEVT_HYPERLINK, wxHyperlinkEvent ); - -wxBEGIN_PROPERTIES_TABLE(wxHyperlinkCtrl) -wxPROPERTY( Label, wxString, SetLabel, GetLabel, wxString(), \ - 0 /*flags*/, wxT("The link label"), wxT("group") ) - -wxPROPERTY( URL, wxString, SetURL, GetURL, wxString(), \ - 0 /*flags*/, wxT("The link URL"), wxT("group") ) -wxPROPERTY_FLAGS( WindowStyle, wxHyperlinkStyle, long, SetWindowStyleFlag, \ - GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \ - wxT("The link style"), wxT("group")) // style -wxEND_PROPERTIES_TABLE() - -wxEMPTY_HANDLERS_TABLE(wxHyperlinkCtrl) - -wxCONSTRUCTOR_7( wxHyperlinkCtrl, wxWindow*, Parent, wxWindowID, Id, wxString, \ - Label, wxString, URL, wxPoint, Position, wxSize, Size, long, WindowStyle ) - - -const char wxHyperlinkCtrlNameStr[] = "hyperlink"; - -// ---------------------------------------------------------------------------- -// wxHyperlinkCtrlBase -// ---------------------------------------------------------------------------- - -void -wxHyperlinkCtrlBase::CheckParams(const wxString& label, - const wxString& url, - long style) -{ -#if wxDEBUG_LEVEL - wxASSERT_MSG(!url.empty() || !label.empty(), - wxT("Both URL and label are empty ?")); - - int alignment = (int)((style & wxHL_ALIGN_LEFT) != 0) + - (int)((style & wxHL_ALIGN_CENTRE) != 0) + - (int)((style & wxHL_ALIGN_RIGHT) != 0); - wxASSERT_MSG(alignment == 1, - wxT("Specify exactly one align flag!")); -#else // !wxDEBUG_LEVEL - wxUnusedVar(label); - wxUnusedVar(url); - wxUnusedVar(style); -#endif // wxDEBUG_LEVEL/!wxDEBUG_LEVEL -} - -void wxHyperlinkCtrlBase::SendEvent() -{ - wxString url = GetURL(); - wxHyperlinkEvent linkEvent(this, GetId(), url); - if (!GetEventHandler()->ProcessEvent(linkEvent)) // was the event skipped ? - { - if (!wxLaunchDefaultBrowser(url)) - { - wxLogWarning(wxT("Could not launch the default browser with url '%s' !"), url.c_str()); - } - } -} - -#endif // wxUSE_HYPERLINKCTRL diff --git a/Externals/wxWidgets3/src/common/iconbndl.cpp b/Externals/wxWidgets3/src/common/iconbndl.cpp deleted file mode 100644 index c4563120fb..0000000000 --- a/Externals/wxWidgets3/src/common/iconbndl.cpp +++ /dev/null @@ -1,320 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/iconbndl.cpp -// Purpose: wxIconBundle -// Author: Mattia Barbon, Vadim Zeitlin -// Created: 23.03.2002 -// Copyright: (c) Mattia barbon -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include "wx/iconbndl.h" - -#ifndef WX_PRECOMP - #include "wx/settings.h" - #include "wx/log.h" - #include "wx/intl.h" - #include "wx/bitmap.h" - #include "wx/image.h" - #include "wx/stream.h" -#endif - -#include "wx/wfstream.h" - -#include "wx/arrimpl.cpp" -WX_DEFINE_OBJARRAY(wxIconArray) - -wxIMPLEMENT_DYNAMIC_CLASS(wxIconBundle, wxGDIObject); - -#define M_ICONBUNDLEDATA static_cast(m_refData) - -// ---------------------------------------------------------------------------- -// wxIconBundleRefData -// ---------------------------------------------------------------------------- - -class WXDLLEXPORT wxIconBundleRefData : public wxGDIRefData -{ -public: - wxIconBundleRefData() { } - - // We need the copy ctor for CloneGDIRefData() but notice that we use the - // base class default ctor in it and not the copy one which it doesn't have. - wxIconBundleRefData(const wxIconBundleRefData& other) - : wxGDIRefData(), - m_icons(other.m_icons) - { - } - - // default assignment operator and dtor are ok - - virtual bool IsOk() const wxOVERRIDE { return !m_icons.empty(); } - - wxIconArray m_icons; -}; - -// ============================================================================ -// wxIconBundle implementation -// ============================================================================ - -wxIconBundle::wxIconBundle() -{ -} - -#if wxUSE_STREAMS && wxUSE_IMAGE - -#if wxUSE_FFILE || wxUSE_FILE -wxIconBundle::wxIconBundle(const wxString& file, wxBitmapType type) - : wxGDIObject() -{ - AddIcon(file, type); -} -#endif // wxUSE_FFILE || wxUSE_FILE - -wxIconBundle::wxIconBundle(wxInputStream& stream, wxBitmapType type) - : wxGDIObject() -{ - AddIcon(stream, type); -} -#endif // wxUSE_STREAMS && wxUSE_IMAGE - -wxIconBundle::wxIconBundle(const wxIcon& icon) - : wxGDIObject() -{ - AddIcon(icon); -} - -wxGDIRefData *wxIconBundle::CreateGDIRefData() const -{ - return new wxIconBundleRefData; -} - -wxGDIRefData *wxIconBundle::CloneGDIRefData(const wxGDIRefData *data) const -{ - return new wxIconBundleRefData(*static_cast(data)); -} - -void wxIconBundle::DeleteIcons() -{ - UnRef(); -} - -#if wxUSE_STREAMS && wxUSE_IMAGE - -namespace -{ - -// Adds icon from 'input' to the bundle. Shows 'errorMessage' on failure -// (it must contain "%d", because it is used to report # of image in the file -// that failed to load): -void DoAddIcon(wxIconBundle& bundle, - wxInputStream& input, - wxBitmapType type, - const wxString& errorMessage) -{ - wxImage image; - - const wxFileOffset posOrig = input.TellI(); - - const size_t count = wxImage::GetImageCount(input, type); - for ( size_t i = 0; i < count; ++i ) - { - if ( i ) - { - // the call to LoadFile() for the first sub-image updated the - // stream position but we need to start reading the subsequent - // sub-image at the image beginning too - input.SeekI(posOrig); - } - - if ( !image.LoadFile(input, type, i) ) - { - wxLogError(errorMessage, i); - continue; - } - - if ( type == wxBITMAP_TYPE_ANY ) - { - // store the type so that we don't need to try all handlers again - // for the subsequent images, they should all be of the same type - type = image.GetType(); - } - - wxIcon tmp; - tmp.CopyFromBitmap(wxBitmap(image)); - bundle.AddIcon(tmp); - } -} - -} // anonymous namespace - -#if wxUSE_FFILE || wxUSE_FILE - -void wxIconBundle::AddIcon(const wxString& file, wxBitmapType type) -{ -#ifdef __WXMAC__ - // Deal with standard icons - if ( type == wxBITMAP_TYPE_ICON_RESOURCE ) - { - wxIcon tmp(file, type); - if (tmp.IsOk()) - { - AddIcon(tmp); - return; - } - } -#endif // __WXMAC__ - -#if wxUSE_FFILE - wxFFileInputStream stream(file); -#elif wxUSE_FILE - wxFileInputStream stream(file); -#endif - DoAddIcon - ( - *this, - stream, type, - wxString::Format(_("Failed to load image %%d from file '%s'."), file) - ); -} - -#endif // wxUSE_FFILE || wxUSE_FILE - -void wxIconBundle::AddIcon(wxInputStream& stream, wxBitmapType type) -{ - DoAddIcon(*this, stream, type, _("Failed to load image %d from stream.")); -} - -#endif // wxUSE_STREAMS && wxUSE_IMAGE - -wxIcon wxIconBundle::GetIcon(const wxSize& size, int flags) const -{ - wxASSERT( size == wxDefaultSize || (size.x >= 0 && size.y > 0) ); - - // We need the standard system icon size when using FALLBACK_SYSTEM. - wxCoord sysX = 0, - sysY = 0; - if ( flags & FALLBACK_SYSTEM ) - { - sysX = wxSystemSettings::GetMetric(wxSYS_ICON_X); - sysY = wxSystemSettings::GetMetric(wxSYS_ICON_Y); - } - - // If size == wxDefaultSize, we use system default icon size by convention. - wxCoord sizeX = size.x; - wxCoord sizeY = size.y; - if ( size == wxDefaultSize ) - { - wxASSERT_MSG( flags == FALLBACK_SYSTEM, - wxS("Must have valid size if not using FALLBACK_SYSTEM") ); - - sizeX = sysX; - sizeY = sysY; - } - - // Iterate over all icons searching for the exact match or the closest icon - // for FALLBACK_NEAREST_LARGER. - wxIcon iconBest; - int bestDiff = 0; - bool bestIsLarger = false; - bool bestIsSystem = false; - - const size_t count = GetIconCount(); - - const wxIconArray& iconArray = M_ICONBUNDLEDATA->m_icons; - for ( size_t i = 0; i < count; i++ ) - { - const wxIcon& icon = iconArray[i]; - if ( !icon.IsOk() ) - continue; - wxCoord sx = icon.GetWidth(), - sy = icon.GetHeight(); - - // Exact match ends search immediately in any case. - if ( sx == sizeX && sy == sizeY ) - { - iconBest = icon; - break; - } - - if ( flags & FALLBACK_SYSTEM ) - { - if ( sx == sysX && sy == sysY ) - { - iconBest = icon; - bestIsSystem = true; - continue; - } - } - - if ( !bestIsSystem && (flags & FALLBACK_NEAREST_LARGER) ) - { - bool iconLarger = (sx >= sizeX) && (sy >= sizeY); - int iconDiff = abs(sx - sizeX) + abs(sy - sizeY); - - // Use current icon as candidate for the best icon, if either: - // - we have no candidate yet - // - we have no candidate larger than desired size and current icon is - // - current icon is closer to desired size than candidate - if ( !iconBest.IsOk() || - (!bestIsLarger && iconLarger) || - (iconLarger && (iconDiff < bestDiff)) ) - { - iconBest = icon; - bestIsLarger = iconLarger; - bestDiff = iconDiff; - continue; - } - } - } - - return iconBest; -} - -wxIcon wxIconBundle::GetIconOfExactSize(const wxSize& size) const -{ - return GetIcon(size, FALLBACK_NONE); -} - -void wxIconBundle::AddIcon(const wxIcon& icon) -{ - wxCHECK_RET( icon.IsOk(), wxT("invalid icon") ); - - AllocExclusive(); - - wxIconArray& iconArray = M_ICONBUNDLEDATA->m_icons; - - // replace existing icon with the same size if we already have it - const size_t count = iconArray.size(); - for ( size_t i = 0; i < count; ++i ) - { - wxIcon& tmp = iconArray[i]; - if ( tmp.IsOk() && - tmp.GetWidth() == icon.GetWidth() && - tmp.GetHeight() == icon.GetHeight() ) - { - tmp = icon; - return; - } - } - - // if we don't, add an icon with new size - iconArray.Add(icon); -} - -size_t wxIconBundle::GetIconCount() const -{ - return IsOk() ? M_ICONBUNDLEDATA->m_icons.size() : 0; -} - -wxIcon wxIconBundle::GetIconByIndex(size_t n) const -{ - wxCHECK_MSG( n < GetIconCount(), wxNullIcon, wxT("invalid index") ); - - return M_ICONBUNDLEDATA->m_icons[n]; -} diff --git a/Externals/wxWidgets3/src/common/imagall.cpp b/Externals/wxWidgets3/src/common/imagall.cpp deleted file mode 100644 index 7916f1f404..0000000000 --- a/Externals/wxWidgets3/src/common/imagall.cpp +++ /dev/null @@ -1,63 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/imagall.cpp -// Purpose: wxImage access all handler -// Author: Sylvain Bougnoux -// Copyright: (c) Sylvain Bougnoux -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_IMAGE - -#ifndef WX_PRECOMP - #include "wx/image.h" -#endif - -//----------------------------------------------------------------------------- -// This function allows dynamic access to all image handlers compile within -// the library. This function should be in a separate file as some compilers -// link against the whole object file as long as just one of is function is called! - -void wxInitAllImageHandlers() -{ -#if wxUSE_LIBPNG - wxImage::AddHandler( new wxPNGHandler ); -#endif -#if wxUSE_LIBJPEG - wxImage::AddHandler( new wxJPEGHandler ); -#endif -#if wxUSE_LIBTIFF - wxImage::AddHandler( new wxTIFFHandler ); -#endif -#if wxUSE_GIF - wxImage::AddHandler( new wxGIFHandler ); -#endif -#if wxUSE_PNM - wxImage::AddHandler( new wxPNMHandler ); -#endif -#if wxUSE_PCX - wxImage::AddHandler( new wxPCXHandler ); -#endif -#if wxUSE_IFF - wxImage::AddHandler( new wxIFFHandler ); -#endif -#if wxUSE_ICO_CUR - wxImage::AddHandler( new wxICOHandler ); - wxImage::AddHandler( new wxCURHandler ); - wxImage::AddHandler( new wxANIHandler ); -#endif -#if wxUSE_TGA - wxImage::AddHandler( new wxTGAHandler ); -#endif -#if wxUSE_XPM - wxImage::AddHandler( new wxXPMHandler ); -#endif -} - -#endif // wxUSE_IMAGE diff --git a/Externals/wxWidgets3/src/common/imagbmp.cpp b/Externals/wxWidgets3/src/common/imagbmp.cpp deleted file mode 100644 index 4696f85eec..0000000000 --- a/Externals/wxWidgets3/src/common/imagbmp.cpp +++ /dev/null @@ -1,1797 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/imagbmp.cpp -// Purpose: wxImage BMP,ICO and CUR handlers -// Author: Robert Roebling, Chris Elliott -// Copyright: (c) Robert Roebling, Chris Elliott -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_IMAGE - -#include "wx/imagbmp.h" - -#ifndef WX_PRECOMP - #ifdef __WXMSW__ - #include "wx/msw/wrapwin.h" - #endif - #include "wx/log.h" - #include "wx/app.h" - #include "wx/bitmap.h" - #include "wx/palette.h" - #include "wx/intl.h" - #include "wx/math.h" -#endif - -#include "wx/filefn.h" -#include "wx/wfstream.h" -#include "wx/quantize.h" -#include "wx/scopeguard.h" -#include "wx/scopedarray.h" -#include "wx/scopedptr.h" -#include "wx/anidecod.h" - -// For memcpy -#include - -// ---------------------------------------------------------------------------- -// private functions -// ---------------------------------------------------------------------------- - -#if wxUSE_ICO_CUR - -static bool CanReadICOOrCUR(wxInputStream *stream, wxUint16 resourceType); - -#endif // wxUSE_ICO_CUR - -//----------------------------------------------------------------------------- -// wxBMPHandler -//----------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxBMPHandler,wxImageHandler); - -#if wxUSE_STREAMS - -#ifndef BI_RGB - #define BI_RGB 0 -#endif - -#ifndef BI_RLE8 -#define BI_RLE8 1 -#endif - -#ifndef BI_RLE4 -#define BI_RLE4 2 -#endif - -#ifndef BI_BITFIELDS -#define BI_BITFIELDS 3 -#endif - -#define poffset (line * width * 3 + column * 3) - -bool wxBMPHandler::SaveFile(wxImage *image, - wxOutputStream& stream, - bool verbose) -{ - return SaveDib(image, stream, verbose, true/*IsBmp*/, false/*IsMask*/); -} - -bool wxBMPHandler::SaveDib(wxImage *image, - wxOutputStream& stream, - bool verbose, - bool IsBmp, - bool IsMask) - -{ - wxCHECK_MSG( image, false, wxT("invalid pointer in wxBMPHandler::SaveFile") ); - - if ( !image->IsOk() ) - { - if ( verbose ) - { - wxLogError(_("BMP: Couldn't save invalid image.")); - } - return false; - } - - // For icons, save alpha channel if available. - const bool saveAlpha = !IsBmp && image->HasAlpha(); - - // get the format of the BMP file to save, - // else (and always if alpha channel is present) use 24bpp - unsigned format = wxBMP_24BPP; - if ( image->HasOption(wxIMAGE_OPTION_BMP_FORMAT) && !saveAlpha ) - format = image->GetOptionInt(wxIMAGE_OPTION_BMP_FORMAT); - - wxUint16 bpp; // # of bits per pixel - int palette_size; // # of color map entries, ie. 2^bpp colors - - // set the bpp and appropriate palette_size, and do additional checks - if ( (format == wxBMP_1BPP) || (format == wxBMP_1BPP_BW) ) - { - bpp = 1; - palette_size = 2; - } - else if ( format == wxBMP_4BPP ) - { - bpp = 4; - palette_size = 16; - } - else if ( (format == wxBMP_8BPP) || (format == wxBMP_8BPP_GREY) || - (format == wxBMP_8BPP_RED) || (format == wxBMP_8BPP_PALETTE) ) - { - // need to set a wxPalette to use this, HOW TO CHECK IF VALID, SIZE? - if ((format == wxBMP_8BPP_PALETTE) -#if wxUSE_PALETTE - && !image->HasPalette() -#endif // wxUSE_PALETTE - ) - { - if ( verbose ) - { - wxLogError(_("BMP: wxImage doesn't have own wxPalette.")); - } - return false; - } - bpp = 8; - palette_size = 256; - } - else // you get 24bpp or 32bpp with alpha - { - format = wxBMP_24BPP; - bpp = saveAlpha ? 32 : 24; - palette_size = 0; - } - - unsigned width = image->GetWidth(); - unsigned row_padding = (4 - ((width * bpp + 7) / 8) % 4) % 4; // # bytes to pad to dword - unsigned row_width = (width * bpp + 7) / 8 + row_padding; // # of bytes per row - - struct - { - // BitmapHeader: - wxUint16 magic; // format magic, always 'BM' - wxUint32 filesize; // total file size, inc. headers - wxUint32 reserved; // for future use - wxUint32 data_offset; // image data offset in the file - - // BitmapInfoHeader: - wxUint32 bih_size; // 2nd part's size - wxUint32 width, height; // bitmap's dimensions - wxUint16 planes; // num of planes - wxUint16 bpp; // bits per pixel - wxUint32 compression; // compression method - wxUint32 size_of_bmp; // size of the bitmap - wxUint32 h_res, v_res; // image resolution in pixels-per-meter - wxUint32 num_clrs; // number of colors used - wxUint32 num_signif_clrs;// number of significant colors - } hdr; - - wxUint32 hdr_size = 14/*BitmapHeader*/ + 40/*BitmapInfoHeader*/; - - hdr.magic = wxUINT16_SWAP_ON_BE(0x4D42/*'BM'*/); - hdr.filesize = wxUINT32_SWAP_ON_BE( hdr_size + palette_size*4 + - row_width * image->GetHeight() ); - hdr.reserved = 0; - hdr.data_offset = wxUINT32_SWAP_ON_BE(hdr_size + palette_size*4); - - hdr.bih_size = wxUINT32_SWAP_ON_BE(hdr_size - 14); - hdr.width = wxUINT32_SWAP_ON_BE(image->GetWidth()); - if ( IsBmp ) - { - hdr.height = wxUINT32_SWAP_ON_BE(image->GetHeight()); - } - else - { - hdr.height = wxUINT32_SWAP_ON_BE(2 * image->GetHeight()); - } - hdr.planes = wxUINT16_SWAP_ON_BE(1); // always 1 plane - hdr.bpp = wxUINT16_SWAP_ON_BE(bpp); - hdr.compression = 0; // RGB uncompressed - hdr.size_of_bmp = wxUINT32_SWAP_ON_BE(row_width * image->GetHeight()); - - // get the resolution from the image options or fall back to 72dpi standard - // for the BMP format if not specified - int hres, vres; - switch ( GetResolutionFromOptions(*image, &hres, &vres) ) - { - default: - wxFAIL_MSG( wxT("unexpected image resolution units") ); - wxFALLTHROUGH; - - case wxIMAGE_RESOLUTION_NONE: - hres = - vres = 72; - wxFALLTHROUGH;// fall through to convert it to correct units - - case wxIMAGE_RESOLUTION_INCHES: - // convert resolution in inches to resolution in centimeters - hres = (int)(10*mm2inches*hres); - vres = (int)(10*mm2inches*vres); - wxFALLTHROUGH;// fall through to convert it to resolution in meters - - case wxIMAGE_RESOLUTION_CM: - // convert resolution in centimeters to resolution in meters - hres *= 100; - vres *= 100; - break; - } - - hdr.h_res = wxUINT32_SWAP_ON_BE(hres); - hdr.v_res = wxUINT32_SWAP_ON_BE(vres); - hdr.num_clrs = wxUINT32_SWAP_ON_BE(palette_size); // # colors in colormap - hdr.num_signif_clrs = 0; // all colors are significant - - if ( IsBmp ) - { - if (// VS: looks ugly but compilers tend to do ugly things with structs, - // like aligning hdr.filesize's ofset to dword :( - // VZ: we should add padding then... - !stream.WriteAll(&hdr.magic, 2) || - !stream.WriteAll(&hdr.filesize, 4) || - !stream.WriteAll(&hdr.reserved, 4) || - !stream.WriteAll(&hdr.data_offset, 4) - ) - { - if (verbose) - { - wxLogError(_("BMP: Couldn't write the file (Bitmap) header.")); - } - return false; - } - } - if ( !IsMask ) - { - if ( - !stream.WriteAll(&hdr.bih_size, 4) || - !stream.WriteAll(&hdr.width, 4) || - !stream.WriteAll(&hdr.height, 4) || - !stream.WriteAll(&hdr.planes, 2) || - !stream.WriteAll(&hdr.bpp, 2) || - !stream.WriteAll(&hdr.compression, 4) || - !stream.WriteAll(&hdr.size_of_bmp, 4) || - !stream.WriteAll(&hdr.h_res, 4) || - !stream.WriteAll(&hdr.v_res, 4) || - !stream.WriteAll(&hdr.num_clrs, 4) || - !stream.WriteAll(&hdr.num_signif_clrs, 4) - ) - { - if (verbose) - { - wxLogError(_("BMP: Couldn't write the file (BitmapInfo) header.")); - } - return false; - } - } - -#if wxUSE_PALETTE - wxScopedPtr palette; // entries for quantized images -#endif // wxUSE_PALETTE - wxScopedArray rgbquad; // for the RGBQUAD bytes for the colormap - wxScopedPtr q_image; // destination for quantized image - - // if <24bpp use quantization to reduce colors for *some* of the formats - if ( (format == wxBMP_1BPP) || (format == wxBMP_4BPP) || - (format == wxBMP_8BPP) || (format == wxBMP_8BPP_PALETTE) ) - { - // make a new palette and quantize the image - if (format != wxBMP_8BPP_PALETTE) - { - q_image.reset(new wxImage()); - - // I get a delete error using Quantize when desired colors > 236 - int quantize = ((palette_size > 236) ? 236 : palette_size); - // fill the destination too, it gives much nicer 4bpp images -#if wxUSE_PALETTE - wxPalette* paletteTmp; - wxQuantize::Quantize( *image, *q_image, &paletteTmp, quantize, 0, - wxQUANTIZE_FILL_DESTINATION_IMAGE ); - palette.reset(paletteTmp); -#else // !wxUSE_PALETTE - wxQuantize::Quantize( *image, *q_image, NULL, quantize, 0, - wxQUANTIZE_FILL_DESTINATION_IMAGE ); -#endif // wxUSE_PALETTE/!wxUSE_PALETTE - } - else - { -#if wxUSE_PALETTE - palette.reset(new wxPalette(image->GetPalette())); -#endif // wxUSE_PALETTE - } - - int i; - unsigned char r, g, b; - wxScopedArray rgbquadTmp(palette_size*4); - rgbquad.swap(rgbquadTmp); - - for (i = 0; i < palette_size; i++) - { -#if wxUSE_PALETTE - if ( !palette->GetRGB(i, &r, &g, &b) ) -#endif // wxUSE_PALETTE - r = g = b = 0; - - rgbquad[i*4] = b; - rgbquad[i*4+1] = g; - rgbquad[i*4+2] = r; - rgbquad[i*4+3] = 0; - } - } - // make a 256 entry greyscale colormap or 2 entry black & white - else if ( (format == wxBMP_8BPP_GREY) || (format == wxBMP_8BPP_RED) || - (format == wxBMP_1BPP_BW) ) - { - wxScopedArray rgbquadTmp(palette_size*4); - rgbquad.swap(rgbquadTmp); - - for ( int i = 0; i < palette_size; i++ ) - { - // if 1BPP_BW then the value should be either 0 or 255 - wxUint8 c = (wxUint8)((i > 0) && (format == wxBMP_1BPP_BW) ? 255 : i); - - rgbquad[i*4] = - rgbquad[i*4+1] = - rgbquad[i*4+2] = c; - rgbquad[i*4+3] = 0; - } - } - - // if the colormap was made, then it needs to be written - if (rgbquad) - { - if ( !IsMask ) - { - if ( !stream.WriteAll(rgbquad.get(), palette_size*4) ) - { - if (verbose) - { - wxLogError(_("BMP: Couldn't write RGB color map.")); - } - return false; - } - } - } - - // pointer to the image data, use quantized if available - const unsigned char* const data = q_image && q_image->IsOk() - ? q_image->GetData() - : image->GetData(); - const unsigned char* const alpha = saveAlpha ? image->GetAlpha() : NULL; - - wxScopedArray buffer(row_width); - memset(buffer.get(), 0, row_width); - int y; unsigned x; - long int pixel; - const int dstPixLen = saveAlpha ? 4 : 3; - - for (y = image->GetHeight() -1; y >= 0; y--) - { - if ( format == wxBMP_24BPP ) // 3 bytes per pixel red,green,blue - { - for ( x = 0; x < width; x++ ) - { - pixel = 3*(y*width + x); - - buffer[dstPixLen*x ] = data[pixel+2]; - buffer[dstPixLen*x + 1] = data[pixel+1]; - buffer[dstPixLen*x + 2] = data[pixel]; - if ( saveAlpha ) - buffer[dstPixLen*x + 3] = alpha[y*width + x]; - } - } - else if ((format == wxBMP_8BPP) || // 1 byte per pixel in color - (format == wxBMP_8BPP_PALETTE)) - { - for (x = 0; x < width; x++) - { - pixel = 3*(y*width + x); -#if wxUSE_PALETTE - buffer[x] = (wxUint8)palette->GetPixel( data[pixel], - data[pixel+1], - data[pixel+2] ); -#else - // FIXME: what should this be? use some std palette maybe? - buffer[x] = 0; -#endif // wxUSE_PALETTE - } - } - else if ( format == wxBMP_8BPP_GREY ) // 1 byte per pix, rgb ave to grey - { - for (x = 0; x < width; x++) - { - pixel = 3*(y*width + x); - buffer[x] = (wxUint8)(.299*data[pixel] + - .587*data[pixel+1] + - .114*data[pixel+2]); - } - } - else if ( format == wxBMP_8BPP_RED ) // 1 byte per pixel, red as greys - { - for (x = 0; x < width; x++) - { - buffer[x] = (wxUint8)data[3*(y*width + x)]; - } - } - else if ( format == wxBMP_4BPP ) // 4 bpp in color - { - for (x = 0; x < width; x+=2) - { - pixel = 3*(y*width + x); - - // fill buffer, ignore if > width -#if wxUSE_PALETTE - buffer[x/2] = (wxUint8)( - ((wxUint8)palette->GetPixel(data[pixel], - data[pixel+1], - data[pixel+2]) << 4) | - (((x+1) > width) - ? 0 - : ((wxUint8)palette->GetPixel(data[pixel+3], - data[pixel+4], - data[pixel+5]) )) ); -#else - // FIXME: what should this be? use some std palette maybe? - buffer[x/2] = 0; -#endif // wxUSE_PALETTE - } - } - else if ( format == wxBMP_1BPP ) // 1 bpp in "color" - { - for (x = 0; x < width; x+=8) - { - pixel = 3*(y*width + x); - -#if wxUSE_PALETTE - buffer[x/8] = (wxUint8)( - ((wxUint8)palette->GetPixel(data[pixel], data[pixel+1], data[pixel+2]) << 7) | - (((x+1) > width) ? 0 : ((wxUint8)palette->GetPixel(data[pixel+3], data[pixel+4], data[pixel+5]) << 6)) | - (((x+2) > width) ? 0 : ((wxUint8)palette->GetPixel(data[pixel+6], data[pixel+7], data[pixel+8]) << 5)) | - (((x+3) > width) ? 0 : ((wxUint8)palette->GetPixel(data[pixel+9], data[pixel+10], data[pixel+11]) << 4)) | - (((x+4) > width) ? 0 : ((wxUint8)palette->GetPixel(data[pixel+12], data[pixel+13], data[pixel+14]) << 3)) | - (((x+5) > width) ? 0 : ((wxUint8)palette->GetPixel(data[pixel+15], data[pixel+16], data[pixel+17]) << 2)) | - (((x+6) > width) ? 0 : ((wxUint8)palette->GetPixel(data[pixel+18], data[pixel+19], data[pixel+20]) << 1)) | - (((x+7) > width) ? 0 : ((wxUint8)palette->GetPixel(data[pixel+21], data[pixel+22], data[pixel+23]) )) ); -#else - // FIXME: what should this be? use some std palette maybe? - buffer[x/8] = 0; -#endif // wxUSE_PALETTE - } - } - else if ( format == wxBMP_1BPP_BW ) // 1 bpp B&W colormap from red color ONLY - { - for (x = 0; x < width; x+=8) - { - pixel = 3*(y*width + x); - - buffer[x/8] = (wxUint8)( - (((wxUint8)(data[pixel] /128.)) << 7) | - (((x+1) > width) ? 0 : (((wxUint8)(data[pixel+3] /128.)) << 6)) | - (((x+2) > width) ? 0 : (((wxUint8)(data[pixel+6] /128.)) << 5)) | - (((x+3) > width) ? 0 : (((wxUint8)(data[pixel+9] /128.)) << 4)) | - (((x+4) > width) ? 0 : (((wxUint8)(data[pixel+12]/128.)) << 3)) | - (((x+5) > width) ? 0 : (((wxUint8)(data[pixel+15]/128.)) << 2)) | - (((x+6) > width) ? 0 : (((wxUint8)(data[pixel+18]/128.)) << 1)) | - (((x+7) > width) ? 0 : (((wxUint8)(data[pixel+21]/128.)) )) ); - } - } - - if ( !stream.WriteAll(buffer.get(), row_width) ) - { - if (verbose) - { - wxLogError(_("BMP: Couldn't write data.")); - } - return false; - } - } - - return true; -} - - -struct BMPPalette -{ - static void Free(BMPPalette* pal) { delete [] pal; } - - unsigned char r, g, b; -}; - -bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height, - int bpp, int ncolors, int comp, - wxFileOffset bmpOffset, wxInputStream& stream, - bool verbose, bool IsBmp, bool hasPalette, - int colEntrySize) -{ - wxInt32 aDword, rmask = 0, gmask = 0, bmask = 0, amask = 0; - int rshift = 0, gshift = 0, bshift = 0, ashift = 0; - int rbits = 0, gbits = 0, bbits = 0; - wxInt32 dbuf[4]; - wxInt8 bbuf[4]; - wxUint8 aByte; - wxUint16 aWord; - - // allocate space for palette if needed: - BMPPalette *cmap; - - if ( bpp < 16 ) - { - cmap = new BMPPalette[ncolors]; - if ( !cmap ) - { - if (verbose) - { - wxLogError(_("BMP: Couldn't allocate memory.")); - } - return false; - } - } - else // no palette - { - cmap = NULL; - } - - wxON_BLOCK_EXIT1(&BMPPalette::Free, cmap); - - bool isUpsideDown = true; - - if (height < 0) - { - isUpsideDown = false; - height = -height; - } - - // destroy existing here instead of: - image->Destroy(); - image->Create(width, height); - - unsigned char *ptr = image->GetData(); - - if ( !ptr ) - { - if ( verbose ) - { - wxLogError( _("BMP: Couldn't allocate memory.") ); - } - return false; - } - - unsigned char *alpha; - if ( bpp == 32 ) - { - // tell the image to allocate an alpha buffer - image->SetAlpha(); - alpha = image->GetAlpha(); - if ( !alpha ) - { - if ( verbose ) - { - wxLogError(_("BMP: Couldn't allocate memory.")); - } - return false; - } - } - else // no alpha - { - alpha = NULL; - } - - // Reading the palette, if it exists: - if ( bpp < 16 && ncolors != 0 ) - { - wxScopedArray - r(ncolors), - g(ncolors), - b(ncolors); - for (int j = 0; j < ncolors; j++) - { - if (hasPalette) - { - if ( !stream.ReadAll(bbuf, colEntrySize) ) - return false; - - cmap[j].b = bbuf[0]; - cmap[j].g = bbuf[1]; - cmap[j].r = bbuf[2]; - - r[j] = cmap[j].r; - g[j] = cmap[j].g; - b[j] = cmap[j].b; - } - else - { - //used in reading .ico file mask - r[j] = cmap[j].r = - g[j] = cmap[j].g = - b[j] = cmap[j].b = ( j ? 255 : 0 ); - } - } - -#if wxUSE_PALETTE - // Set the palette for the wxImage - image->SetPalette(wxPalette(ncolors, r.get(), g.get(), b.get())); -#endif // wxUSE_PALETTE - } - else if ( bpp == 16 || bpp == 32 ) - { - if ( comp == BI_BITFIELDS ) - { - int bit; - if ( !stream.ReadAll(dbuf, 4 * 3) ) - return false; - - rmask = wxINT32_SWAP_ON_BE(dbuf[0]); - gmask = wxINT32_SWAP_ON_BE(dbuf[1]); - bmask = wxINT32_SWAP_ON_BE(dbuf[2]); - // find shift amount (Least significant bit of mask) - for (bit = bpp-1; bit>=0; bit--) - { - if (bmask & (1 << bit)) - bshift = bit; - if (gmask & (1 << bit)) - gshift = bit; - if (rmask & (1 << bit)) - rshift = bit; - } - // Find number of bits in mask (MSB-LSB+1) - for (bit = 0; bit < bpp; bit++) - { - if (bmask & (1 << bit)) - bbits = bit-bshift+1; - if (gmask & (1 << bit)) - gbits = bit-gshift+1; - if (rmask & (1 << bit)) - rbits = bit-rshift+1; - } - } - else if ( bpp == 16 ) - { - rmask = 0x7C00; - gmask = 0x03E0; - bmask = 0x001F; - rshift = 10; - gshift = 5; - bshift = 0; - rbits = 5; - gbits = 5; - bbits = 5; - } - else if ( bpp == 32 ) - { - rmask = 0x00FF0000; - gmask = 0x0000FF00; - bmask = 0x000000FF; - amask = 0xFF000000; - - ashift = 24; - rshift = 16; - gshift = 8; - bshift = 0; - rbits = 8; - gbits = 8; - bbits = 8; - } - } - - /* - * Reading the image data - */ - if ( IsBmp ) - { - // NOTE: seeking a positive amount in wxFromCurrent mode allows us to - // load even non-seekable streams (see wxInputStream::SeekI docs)! - const wxFileOffset pos = stream.TellI(); - if ( pos == wxInvalidOffset || - (bmpOffset > pos && - stream.SeekI(bmpOffset - pos, wxFromCurrent) == wxInvalidOffset) ) - return false; - //else: icon, just carry on - } - - unsigned char *data = ptr; - - /* set the whole image to the background color */ - if ( bpp < 16 && (comp == BI_RLE4 || comp == BI_RLE8) ) - { - for (int i = 0; i < width * height; i++) - { - *ptr++ = cmap[0].r; - *ptr++ = cmap[0].g; - *ptr++ = cmap[0].b; - } - ptr = data; - } - - int linesize = ((width * bpp + 31) / 32) * 4; - - // flag indicating if we have any not fully transparent alpha values: this - // is used to account for the bitmaps which use 32bpp format (normally - // meaning that they have alpha channel) but have only zeroes in it so that - // without this hack they appear fully transparent -- and as this is - // unlikely intentional, we consider that they don't have alpha at all in - // this case (see #10915) - bool hasValidAlpha = false; - - for ( int row = 0; row < height; row++ ) - { - int line = isUpsideDown ? height - 1 - row : row; - - int linepos = 0; - for ( int column = 0; column < width ; ) - { - if ( bpp < 16 ) - { - linepos++; - aByte = stream.GetC(); - if ( !stream.IsOk() ) - return false; - - if ( bpp == 1 ) - { - for (int bit = 0; bit < 8 && column < width; bit++) - { - int index = ((aByte & (0x80 >> bit)) ? 1 : 0); - ptr[poffset] = cmap[index].r; - ptr[poffset + 1] = cmap[index].g; - ptr[poffset + 2] = cmap[index].b; - column++; - } - } - else if ( bpp == 4 ) - { - if ( comp == BI_RLE4 ) - { - wxUint8 first; - first = aByte; - aByte = stream.GetC(); - if ( !stream.IsOk() ) - return false; - - if ( first == 0 ) - { - if ( aByte == 0 ) - { - // end of scanline marker - column = width; - row--; - } - else if ( aByte == 1 ) - { - // end of RLE data marker, stop decoding - column = width; - row = height; - } - else if ( aByte == 2 ) - { - // delta marker, move in image - aByte = stream.GetC(); - if ( !stream.IsOk() ) - return false; - column += aByte; - linepos = column * bpp / 4; - aByte = stream.GetC(); - if ( !stream.IsOk() ) - return false; - row += aByte; // upside down - } - else - { - int absolute = aByte; - wxUint8 nibble[2] ; - int readBytes = 0 ; - for (int k = 0; k < absolute; k++) - { - if ( !(k % 2 ) ) - { - ++readBytes ; - aByte = stream.GetC(); - if ( !stream.IsOk() ) - return false; - nibble[0] = (wxUint8)( (aByte & 0xF0) >> 4 ) ; - nibble[1] = (wxUint8)( aByte & 0x0F ) ; - } - ptr[poffset ] = cmap[nibble[k%2]].r; - ptr[poffset + 1] = cmap[nibble[k%2]].g; - ptr[poffset + 2] = cmap[nibble[k%2]].b; - column++; - if ( k % 2 ) - linepos++; - } - if ( readBytes & 0x01 ) - { - aByte = stream.GetC(); - if ( !stream.IsOk() ) - return false; - } - } - } - else - { - wxUint8 nibble[2] ; - nibble[0] = (wxUint8)( (aByte & 0xF0) >> 4 ) ; - nibble[1] = (wxUint8)( aByte & 0x0F ) ; - - for ( int l = 0; l < first && column < width; l++ ) - { - ptr[poffset ] = cmap[nibble[l%2]].r; - ptr[poffset + 1] = cmap[nibble[l%2]].g; - ptr[poffset + 2] = cmap[nibble[l%2]].b; - column++; - if ( l % 2 ) - linepos++; - } - } - } - else - { - for (int nibble = 0; nibble < 2 && column < width; nibble++) - { - int index = ((aByte & (0xF0 >> (nibble * 4))) >> (!nibble * 4)); - if ( index >= 16 ) - index = 15; - ptr[poffset] = cmap[index].r; - ptr[poffset + 1] = cmap[index].g; - ptr[poffset + 2] = cmap[index].b; - column++; - } - } - } - else if ( bpp == 8 ) - { - if ( comp == BI_RLE8 ) - { - unsigned char first; - first = aByte; - aByte = stream.GetC(); - if ( !stream.IsOk() ) - return false; - - if ( first == 0 ) - { - if ( aByte == 0 ) - { - // end of scanline marker - column = width; - row--; - } - else if ( aByte == 1 ) - { - // end of RLE data marker, stop decoding - column = width; - row = height; - } - else if ( aByte == 2 ) - { - // delta marker, move in image - aByte = stream.GetC(); - if ( !stream.IsOk() ) - return false; - column += aByte; - linepos = column * bpp / 8; - aByte = stream.GetC(); - if ( !stream.IsOk() ) - return false; - row -= aByte; - } - else - { - int absolute = aByte; - for (int k = 0; k < absolute; k++) - { - linepos++; - aByte = stream.GetC(); - if ( !stream.IsOk() ) - return false; - ptr[poffset ] = cmap[aByte].r; - ptr[poffset + 1] = cmap[aByte].g; - ptr[poffset + 2] = cmap[aByte].b; - column++; - } - if ( absolute & 0x01 ) - { - aByte = stream.GetC(); - if ( !stream.IsOk() ) - return false; - } - } - } - else - { - for ( int l = 0; l < first && column < width; l++ ) - { - ptr[poffset ] = cmap[aByte].r; - ptr[poffset + 1] = cmap[aByte].g; - ptr[poffset + 2] = cmap[aByte].b; - column++; - linepos++; - } - } - } - else - { - ptr[poffset ] = cmap[aByte].r; - ptr[poffset + 1] = cmap[aByte].g; - ptr[poffset + 2] = cmap[aByte].b; - column++; - // linepos += size; seems to be wrong, RR - } - } - } - else if ( bpp == 24 ) - { - if ( !stream.ReadAll(bbuf, 3) ) - return false; - linepos += 3; - ptr[poffset ] = (unsigned char)bbuf[2]; - ptr[poffset + 1] = (unsigned char)bbuf[1]; - ptr[poffset + 2] = (unsigned char)bbuf[0]; - column++; - } - else if ( bpp == 16 ) - { - unsigned char temp; - if ( !stream.ReadAll(&aWord, 2) ) - return false; - wxUINT16_SWAP_ON_BE_IN_PLACE(aWord); - linepos += 2; - /* Use the masks and calculated amount of shift - to retrieve the color data out of the word. Then - shift it left by (8 - number of bits) such that - the image has the proper dynamic range */ - temp = (unsigned char)(((aWord & rmask) >> rshift) << (8-rbits)); - ptr[poffset] = temp; - temp = (unsigned char)(((aWord & gmask) >> gshift) << (8-gbits)); - ptr[poffset + 1] = temp; - temp = (unsigned char)(((aWord & bmask) >> bshift) << (8-bbits)); - ptr[poffset + 2] = temp; - column++; - } - else - { - unsigned char temp; - if ( !stream.ReadAll(&aDword, 4) ) - return false; - - wxINT32_SWAP_ON_BE_IN_PLACE(aDword); - linepos += 4; - temp = (unsigned char)((aDword & rmask) >> rshift); - ptr[poffset] = temp; - temp = (unsigned char)((aDword & gmask) >> gshift); - ptr[poffset + 1] = temp; - temp = (unsigned char)((aDword & bmask) >> bshift); - ptr[poffset + 2] = temp; - if ( alpha ) - { - temp = (unsigned char)((aDword & amask) >> ashift); - alpha[line * width + column] = temp; - - if ( temp != wxALPHA_TRANSPARENT ) - hasValidAlpha = true; - } - column++; - } - } - while ( (linepos < linesize) && (comp != 1) && (comp != 2) ) - { - ++linepos; - if ( !stream.ReadAll(&aByte, 1) ) - break; - } - } - - image->SetMask(false); - - // check if we had any valid alpha values in this bitmap - if ( alpha && !hasValidAlpha ) - { - // we didn't, so finally discard the alpha channel completely - image->ClearAlpha(); - } - - const wxStreamError err = stream.GetLastError(); - return err == wxSTREAM_NO_ERROR || err == wxSTREAM_EOF; -} - -bool wxBMPHandler::LoadDib(wxImage *image, wxInputStream& stream, - bool verbose, bool IsBmp) -{ - wxUint16 aWord; - wxInt32 dbuf[4]; - wxInt8 bbuf[4]; - - // offset to bitmap data - wxFileOffset offset; - // DIB header size (used to distinguish different versions of DIB header) - wxInt32 hdrSize; - if ( IsBmp ) - { - // read the header off the .BMP format file - if ( !stream.ReadAll(bbuf, 2) || - !stream.ReadAll(dbuf, 16) ) - return false; - - #if 0 // unused - wxInt32 size = wxINT32_SWAP_ON_BE(dbuf[0]); - #endif - offset = wxINT32_SWAP_ON_BE(dbuf[2]); - hdrSize = wxINT32_SWAP_ON_BE(dbuf[3]); - } - else - { - if ( !stream.ReadAll(dbuf, 4) ) - return false; - - offset = wxInvalidOffset; // not used in loading ICO/CUR DIBs - hdrSize = wxINT32_SWAP_ON_BE(dbuf[0]); - } - - // Bitmap files come in old v1 format using BITMAPCOREHEADER or a newer - // format (typically BITMAPV5HEADER, in use since Windows 98, but we don't - // really support any features specific to later formats such as gamma - // correction or ICC profiles, so it doesn't matter much to us). - const bool usesV1 = hdrSize == 12; - - int width; - int height; - if ( usesV1 ) - { - wxInt16 buf[2]; - if ( !stream.ReadAll(buf, sizeof(buf)) ) - return false; - - width = wxINT16_SWAP_ON_BE((short)buf[0]); - height = wxINT16_SWAP_ON_BE((short)buf[1]); - } - else // We have at least BITMAPINFOHEADER - { - if ( !stream.ReadAll(dbuf, 4 * 2) ) - return false; - - width = wxINT32_SWAP_ON_BE((int)dbuf[0]); - height = wxINT32_SWAP_ON_BE((int)dbuf[1]); - } - if ( !IsBmp)height = height / 2; // for icons divide by 2 - - if ( width > 32767 ) - { - if (verbose) - { - wxLogError( _("DIB Header: Image width > 32767 pixels for file.") ); - } - return false; - } - if ( height > 32767 ) - { - if (verbose) - { - wxLogError( _("DIB Header: Image height > 32767 pixels for file.") ); - } - return false; - } - - if ( !stream.ReadAll(&aWord, 2) ) - return false; - - /* - TODO - int planes = (int)wxUINT16_SWAP_ON_BE( aWord ); - */ - if ( !stream.ReadAll(&aWord, 2) ) - return false; - - int bpp = wxUINT16_SWAP_ON_BE((int)aWord); - if ( bpp != 1 && bpp != 4 && bpp != 8 && bpp != 16 && bpp != 24 && bpp != 32 ) - { - if (verbose) - { - wxLogError( _("DIB Header: Unknown bitdepth in file.") ); - } - return false; - } - - class Resolution - { - public: - Resolution() - { - m_valid = false; - - // Still initialize them as some compilers are smart enough to - // give "use of possibly uninitialized variable" for them (but not - // smart enough to see that this is not really the case). - m_x = - m_y = 0; - } - - void Init(int x, int y) - { - m_x = x; - m_y = y; - m_valid = true; - } - - bool IsValid() const { return m_valid; } - - int GetX() const { return m_x; } - int GetY() const { return m_y; } - - private: - int m_x, m_y; - bool m_valid; - } res; - int comp; - int ncolors; - - if ( usesV1 ) - { - // The only possible format is BI_RGB and colours count is not used. - comp = BI_RGB; - ncolors = 0; - } - else // We have at least BITMAPINFOHEADER - { - if ( !stream.ReadAll(dbuf, 4 * 4) ) - return false; - - comp = wxINT32_SWAP_ON_BE((int)dbuf[0]); - if ( comp != BI_RGB && comp != BI_RLE4 && comp != BI_RLE8 && - comp != BI_BITFIELDS ) - { - if (verbose) - { - wxLogError( _("DIB Header: Unknown encoding in file.") ); - } - return false; - } - - if ( !stream.ReadAll(dbuf, 4 * 2) ) - return false; - - ncolors = wxINT32_SWAP_ON_BE( (int)dbuf[0] ); - res.Init(dbuf[2]/100, dbuf[3]/100); - } - if (ncolors == 0) - ncolors = 1 << bpp; - /* some more sanity checks */ - if (((comp == BI_RLE4) && (bpp != 4)) || - ((comp == BI_RLE8) && (bpp != 8)) || - ((comp == BI_BITFIELDS) && (bpp != 16 && bpp != 32))) - { - if (verbose) - { - wxLogError( _("DIB Header: Encoding doesn't match bitdepth.") ); - } - return false; - } - - //read DIB; this is the BMP image or the XOR part of an icon image - if ( !DoLoadDib(image, width, height, bpp, ncolors, comp, offset, stream, - verbose, IsBmp, true, - usesV1 ? 3 : 4) ) - { - if (verbose) - { - wxLogError( _("Error in reading image DIB.") ); - } - return false; - } - - if ( !IsBmp ) - { - //read Icon mask which is monochrome - //there is no palette, so we will create one - wxImage mask; - if ( !DoLoadDib(&mask, width, height, 1, 2, BI_RGB, offset, stream, - verbose, IsBmp, false) ) - { - if (verbose) - { - wxLogError( _("ICO: Error in reading mask DIB.") ); - } - return false; - } - image->SetMaskFromImage(mask, 255, 255, 255); - - } - - // the resolution in the bitmap header is in meters, convert to centimeters - if ( res.IsValid() ) - { - image->SetOption(wxIMAGE_OPTION_RESOLUTIONUNIT, wxIMAGE_RESOLUTION_CM); - image->SetOption(wxIMAGE_OPTION_RESOLUTIONX, res.GetX()); - image->SetOption(wxIMAGE_OPTION_RESOLUTIONY, res.GetY()); - } - - return true; -} - -bool wxBMPHandler::LoadFile(wxImage *image, wxInputStream& stream, - bool verbose, int WXUNUSED(index)) -{ - // Read a single DIB fom the file: - return LoadDib(image, stream, verbose, true/*isBmp*/); -} - -bool wxBMPHandler::DoCanRead(wxInputStream& stream) -{ - unsigned char hdr[2]; - - if ( !stream.ReadAll(hdr, WXSIZEOF(hdr)) ) // it's ok to modify the stream position here - return false; - - // do we have the BMP file signature? - return hdr[0] == 'B' && hdr[1] == 'M'; -} - -#endif // wxUSE_STREAMS - - -#if wxUSE_ICO_CUR -//----------------------------------------------------------------------------- -// wxICOHandler -//----------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxICOHandler, wxBMPHandler); - -#if wxUSE_STREAMS - -struct ICONDIRENTRY -{ - wxUint8 bWidth; // Width of the image - wxUint8 bHeight; // Height of the image (times 2) - wxUint8 bColorCount; // Number of colors in image (0 if >=8bpp) - wxUint8 bReserved; // Reserved - - // these two are different in icons and cursors: - // icon or cursor - wxUint16 wPlanes; // Color Planes or XHotSpot - wxUint16 wBitCount; // Bits per pixel or YHotSpot - - wxUint32 dwBytesInRes; // how many bytes in this resource? - wxUint32 dwImageOffset; // where in the file is this image -}; - -struct ICONDIR -{ - wxUint16 idReserved; // Reserved - wxUint16 idType; // resource type (1 for icons, 2 for cursors) - wxUint16 idCount; // how many images? -}; - - -bool wxICOHandler::SaveFile(wxImage *image, - wxOutputStream& stream, - bool verbose) - -{ - // sanity check; icon must be no larger than 256x256 - if ( image->GetHeight () > 256 ) - { - if ( verbose ) - { - wxLogError(_("ICO: Image too tall for an icon.")); - } - return false; - } - if ( image->GetWidth () > 256 ) - { - if ( verbose ) - { - wxLogError(_("ICO: Image too wide for an icon.")); - } - return false; - } - - const int images = 1; // only generate one image - - // VS: This is a hack of sort - since ICO and CUR files are almost - // identical, we have all the meat in wxICOHandler and check for - // the actual (handler) type when the code has to distinguish between - // the two formats - int type = (this->GetType() == wxBITMAP_TYPE_CUR) ? 2 : 1; - - // write a header, (ICONDIR) - // Calculate the header size - wxUint32 offset = 3 * sizeof(wxUint16); - - ICONDIR IconDir; - IconDir.idReserved = 0; - IconDir.idType = wxUINT16_SWAP_ON_BE((wxUint16)type); - IconDir.idCount = wxUINT16_SWAP_ON_BE((wxUint16)images); - if ( !stream.WriteAll(&IconDir.idReserved, sizeof(IconDir.idReserved)) || - !stream.WriteAll(&IconDir.idType, sizeof(IconDir.idType)) || - !stream.WriteAll(&IconDir.idCount, sizeof(IconDir.idCount)) ) - { - if ( verbose ) - { - wxLogError(_("ICO: Error writing the image file!")); - } - return false; - } - - // for each iamage write a description ICONDIRENTRY: - ICONDIRENTRY icondirentry; - for (int img = 0; img < images; img++) - { - wxImage mask; - - if ( image->HasMask() ) - { - // make another image with black/white: - mask = image->ConvertToMono (image->GetMaskRed(), image->GetMaskGreen(), image->GetMaskBlue() ); - - // now we need to change the masked regions to black: - unsigned char r = image->GetMaskRed(); - unsigned char g = image->GetMaskGreen(); - unsigned char b = image->GetMaskBlue(); - if ( (r != 0) || (g != 0) || (b != 0) ) - { - // Go round and apply black to the masked bits: - int i, j; - for (i = 0; i < mask.GetWidth(); i++) - { - for (j = 0; j < mask.GetHeight(); j++) - { - if ((r == mask.GetRed(i, j)) && - (g == mask.GetGreen(i, j))&& - (b == mask.GetBlue(i, j)) ) - image->SetRGB(i, j, 0, 0, 0 ); - } - } - } - } - else - { - // just make a black mask all over: - mask = image->Copy(); - int i, j; - for (i = 0; i < mask.GetWidth(); i++) - for (j = 0; j < mask.GetHeight(); j++) - mask.SetRGB(i, j, 0, 0, 0 ); - } - // Set the formats for image and mask - - // The format depends on the number of the colours used, so count them, - // but stop at 257 because we have to use 24 bpp anyhow if we have that - // many of them. - const int colours = image->CountColours(257); - int bppFormat; - int bpp; - if ( image->HasAlpha() ) - { - // Icons with alpha channel are always stored in ARGB format. - bppFormat = wxBMP_24BPP; - bpp = 32; - } - else if ( colours > 256 ) - { - bppFormat = wxBMP_24BPP; - bpp = 24; - } - else if ( colours > 16 ) - { - bppFormat = wxBMP_8BPP; - bpp = 8; - } - else if ( colours > 2 ) - { - bppFormat = wxBMP_4BPP; - bpp = 4; - } - else - { - bppFormat = wxBMP_1BPP; - bpp = 1; - } - image->SetOption(wxIMAGE_OPTION_BMP_FORMAT, bppFormat); - - // monochome bitmap: - mask.SetOption(wxIMAGE_OPTION_BMP_FORMAT, wxBMP_1BPP_BW); - bool IsBmp = false; - bool IsMask = false; - - //calculate size and offset of image and mask - wxCountingOutputStream cStream; - bool bResult; -#if wxUSE_LIBPNG - // Typically, icons larger then 128x128 are saved as PNG images. - bool saveAsPNG = false; - if ( image->GetHeight() > 128 || image->GetWidth() > 128 ) - { - wxPNGHandler handlerPNG; - bResult = handlerPNG.SaveFile(image, cStream, verbose); - if ( !bResult ) - { - if ( verbose ) - { - wxLogError(_("ICO: Error writing the image file!")); - } - return false; - } - - saveAsPNG = true; - } - if ( !saveAsPNG ) -#endif // wxUSE_LIBPNG - { - bResult = SaveDib(image, cStream, verbose, IsBmp, IsMask); - if ( !bResult ) - { - if ( verbose ) - { - wxLogError(_("ICO: Error writing the image file!")); - } - return false; - } - IsMask = true; - - bResult = SaveDib(&mask, cStream, verbose, IsBmp, IsMask); - if ( !bResult ) - { - if ( verbose ) - { - wxLogError(_("ICO: Error writing the image file!")); - } - return false; - } - } - wxUint32 Size = cStream.GetSize(); - - // wxCountingOutputStream::IsOk() always returns true for now and this - // "if" provokes VC++ warnings in optimized build -#if 0 - if ( !cStream.IsOk() ) - { - if ( verbose ) - { - wxLogError(_("ICO: Error writing the image file!")); - } - return false; - } -#endif // 0 - - offset = offset + sizeof(ICONDIRENTRY); - - // Notice that the casts work correctly for width/height of 256 as it's - // represented by 0 in ICO file format -- and larger values are not - // allowed at all. - icondirentry.bWidth = (wxUint8)image->GetWidth(); - icondirentry.bHeight = (wxUint8)image->GetHeight(); - icondirentry.bColorCount = 0; - icondirentry.bReserved = 0; - icondirentry.wPlanes = wxUINT16_SWAP_ON_BE(1); - icondirentry.wBitCount = wxUINT16_SWAP_ON_BE(bpp); - if ( type == 2 /*CUR*/) - { - int hx = image->HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X) ? - image->GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X) : - image->GetWidth() / 2; - int hy = image->HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y) ? - image->GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y) : - image->GetHeight() / 2; - - // actually write the values of the hot spot here: - icondirentry.wPlanes = wxUINT16_SWAP_ON_BE((wxUint16)hx); - icondirentry.wBitCount = wxUINT16_SWAP_ON_BE((wxUint16)hy); - } - icondirentry.dwBytesInRes = wxUINT32_SWAP_ON_BE(Size); - icondirentry.dwImageOffset = wxUINT32_SWAP_ON_BE(offset); - - // increase size to allow for the data written: - offset += Size; - - // write to stream: - if ( !stream.WriteAll(&icondirentry.bWidth, sizeof(icondirentry.bWidth)) || - !stream.WriteAll(&icondirentry.bHeight, sizeof(icondirentry.bHeight)) || - !stream.WriteAll(&icondirentry.bColorCount, sizeof(icondirentry.bColorCount)) || - !stream.WriteAll(&icondirentry.bReserved, sizeof(icondirentry.bReserved)) || - !stream.WriteAll(&icondirentry.wPlanes, sizeof(icondirentry.wPlanes)) || - !stream.WriteAll(&icondirentry.wBitCount, sizeof(icondirentry.wBitCount)) || - !stream.WriteAll(&icondirentry.dwBytesInRes, sizeof(icondirentry.dwBytesInRes)) || - !stream.WriteAll(&icondirentry.dwImageOffset, sizeof(icondirentry.dwImageOffset)) ) - { - if ( verbose ) - { - wxLogError(_("ICO: Error writing the image file!")); - } - return false; - } - - // actually save it: -#if wxUSE_LIBPNG - if ( saveAsPNG ) - { - wxPNGHandler handlerPNG; - bResult = handlerPNG.SaveFile(image, stream, verbose); - if ( !bResult ) - { - if ( verbose ) - { - wxLogError(_("ICO: Error writing the image file!")); - } - return false; - } - } - else -#endif // wxUSE_LIBPNG - { - IsMask = false; - bResult = SaveDib(image, stream, verbose, IsBmp, IsMask); - if ( !bResult ) - { - if ( verbose ) - { - wxLogError(_("ICO: Error writing the image file!")); - } - return false; - } - IsMask = true; - - bResult = SaveDib(&mask, stream, verbose, IsBmp, IsMask); - if ( !bResult ) - { - if ( verbose ) - { - wxLogError(_("ICO: Error writing the image file!")); - } - return false; - } - } - - } // end of for loop - - return true; -} - -bool wxICOHandler::LoadFile(wxImage *image, wxInputStream& stream, - bool verbose, int index) -{ - if ( stream.IsSeekable() && stream.SeekI(0) == wxInvalidOffset ) - { - return false; - } - - return DoLoadFile(image, stream, verbose, index); -} - -bool wxICOHandler::DoLoadFile(wxImage *image, wxInputStream& stream, - bool verbose, int index) -{ - bool bResult wxDUMMY_INITIALIZE(false); - - ICONDIR IconDir; - - if ( !stream.ReadAll(&IconDir, sizeof(IconDir)) ) - return false; - - wxUint16 nIcons = wxUINT16_SWAP_ON_BE(IconDir.idCount); - - // nType is 1 for Icons, 2 for Cursors: - wxUint16 nType = wxUINT16_SWAP_ON_BE(IconDir.idType); - - // loop round the icons and choose the best one: - wxScopedArray pIconDirEntry(nIcons); - ICONDIRENTRY *pCurrentEntry = pIconDirEntry.get(); - int wMax = 0; - int colmax = 0; - int iSel = wxNOT_FOUND; - - // remember how many bytes we read from the stream: - wxFileOffset alreadySeeked = sizeof(IconDir); - - for (unsigned int i = 0; i < nIcons; i++ ) - { - if ( !stream.ReadAll(pCurrentEntry, sizeof(ICONDIRENTRY)) ) - return false; - - alreadySeeked += stream.LastRead(); - - // ICO file format uses only a single byte for width and if it is 0, it - // means that the width is actually 256 pixels. - const wxUint16 - widthReal = pCurrentEntry->bWidth ? pCurrentEntry->bWidth : 256; - - // bHeight and bColorCount are wxUint8 - if ( widthReal >= wMax ) - { - // see if we have more colors, ==0 indicates > 8bpp: - if ( pCurrentEntry->bColorCount == 0 ) - pCurrentEntry->bColorCount = 255; - if ( pCurrentEntry->bColorCount >= colmax ) - { - iSel = i; - wMax = widthReal; - colmax = pCurrentEntry->bColorCount; - } - } - - pCurrentEntry++; - } - - if ( index != -1 ) - { - // VS: Note that we *have* to run the loop above even if index != -1, because - // it reads ICONDIRENTRies. - iSel = index; - } - - if ( iSel == wxNOT_FOUND || iSel < 0 || iSel >= nIcons ) - { - wxLogError(_("ICO: Invalid icon index.")); - bResult = false; - } - else - { - // seek to selected icon: - pCurrentEntry = pIconDirEntry.get() + iSel; - - // NOTE: seeking a positive amount in wxFromCurrent mode allows us to - // load even non-seekable streams (see wxInputStream::SeekI docs)! - wxFileOffset offset = wxUINT32_SWAP_ON_BE(pCurrentEntry->dwImageOffset) - alreadySeeked; - if (offset != 0 && stream.SeekI(offset, wxFromCurrent) == wxInvalidOffset) - return false; - -#if wxUSE_LIBPNG - // We can't fall back to loading an icon in the usual BMP format after - // trying to load it as PNG if we have an unseekable stream, so to - // avoid breaking the existing code which does successfully load icons - // from such streams, we only try to load them as PNGs if we can unwind - // back later. - // - // Ideal would be to modify LoadDib() to accept the first 8 bytes not - // coming from the stream but from the signature buffer below, as then - // we'd be able to load PNG icons from any kind of streams. - bool isPNG; - if ( stream.IsSeekable() ) - { - // Check for the PNG signature first to avoid wasting time on - // trying to load typical ICO files which are not PNGs at all. - static const unsigned char signaturePNG[] = - { - 0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A - }; - static const int signatureLen = WXSIZEOF(signaturePNG); - - unsigned char signature[signatureLen]; - if ( !stream.ReadAll(signature, signatureLen) ) - return false; - - isPNG = memcmp(signature, signaturePNG, signatureLen) == 0; - - // Rewind to the beginning of the image in any case. - if ( stream.SeekI(-signatureLen, wxFromCurrent) == wxInvalidOffset ) - return false; - } - else // Not seekable stream - { - isPNG = false; - } - - if ( isPNG ) - { - wxPNGHandler handlerPNG; - bResult = handlerPNG.LoadFile(image, stream, verbose); - } - else -#endif // wxUSE_LIBPNG - { - bResult = LoadDib(image, stream, verbose, false /* not BMP */); - } - bool bIsCursorType = (this->GetType() == wxBITMAP_TYPE_CUR) || (this->GetType() == wxBITMAP_TYPE_ANI); - if ( bResult && bIsCursorType && nType == 2 ) - { - // it is a cursor, so let's set the hotspot: - image->SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X, wxUINT16_SWAP_ON_BE(pCurrentEntry->wPlanes)); - image->SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y, wxUINT16_SWAP_ON_BE(pCurrentEntry->wBitCount)); - } - } - - return bResult; -} - -int wxICOHandler::DoGetImageCount(wxInputStream& stream) -{ - // It's ok to modify the stream position in this function. - - if ( stream.IsSeekable() && stream.SeekI(0) == wxInvalidOffset ) - { - return 0; - } - - ICONDIR IconDir; - - if ( !stream.ReadAll(&IconDir, sizeof(IconDir)) ) - return 0; - - return (int)wxUINT16_SWAP_ON_BE(IconDir.idCount); -} - -bool wxICOHandler::DoCanRead(wxInputStream& stream) -{ - return CanReadICOOrCUR(&stream, 1 /*for identifying an icon*/); - -} - -#endif // wxUSE_STREAMS - - -//----------------------------------------------------------------------------- -// wxCURHandler -//----------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxCURHandler, wxICOHandler); - -#if wxUSE_STREAMS - -bool wxCURHandler::DoCanRead(wxInputStream& stream) -{ - return CanReadICOOrCUR(&stream, 2 /*for identifying a cursor*/); -} - -#endif // wxUSE_STREAMS - -//----------------------------------------------------------------------------- -// wxANIHandler -//----------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxANIHandler, wxCURHandler); - -#if wxUSE_STREAMS - -bool wxANIHandler::LoadFile(wxImage *image, wxInputStream& stream, - bool WXUNUSED(verbose), int index) -{ - wxANIDecoder decoder; - if (!decoder.Load(stream)) - return false; - - return decoder.ConvertToImage(index != -1 ? (size_t)index : 0, image); -} - -bool wxANIHandler::DoCanRead(wxInputStream& stream) -{ - wxANIDecoder decod; - return decod.CanRead(stream); - // it's ok to modify the stream position here -} - -int wxANIHandler::DoGetImageCount(wxInputStream& stream) -{ - wxANIDecoder decoder; - if (!decoder.Load(stream)) // it's ok to modify the stream position here - return wxNOT_FOUND; - - return decoder.GetFrameCount(); -} - -static bool CanReadICOOrCUR(wxInputStream *stream, wxUint16 resourceType) -{ - // It's ok to modify the stream position in this function. - - if ( stream->IsSeekable() && stream->SeekI(0) == wxInvalidOffset ) - { - return false; - } - - ICONDIR iconDir; - if ( !stream->ReadAll(&iconDir, sizeof(iconDir)) ) - { - return false; - } - - return !iconDir.idReserved // reserved, must be 0 - && wxUINT16_SWAP_ON_BE(iconDir.idType) == resourceType // either 1 or 2 - && iconDir.idCount; // must contain at least one image -} - -#endif // wxUSE_STREAMS - -#endif // wxUSE_ICO_CUR - -#endif // wxUSE_IMAGE diff --git a/Externals/wxWidgets3/src/common/image.cpp b/Externals/wxWidgets3/src/common/image.cpp deleted file mode 100644 index f28abb2e66..0000000000 --- a/Externals/wxWidgets3/src/common/image.cpp +++ /dev/null @@ -1,3697 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/image.cpp -// Purpose: wxImage -// Author: Robert Roebling -// Copyright: (c) Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_IMAGE - -#include "wx/image.h" - -#ifndef WX_PRECOMP - #include "wx/log.h" - #include "wx/hash.h" - #include "wx/utils.h" - #include "wx/math.h" - #include "wx/module.h" - #include "wx/palette.h" - #include "wx/intl.h" - #include "wx/colour.h" -#endif - -#include "wx/wfstream.h" -#include "wx/xpmdecod.h" - -// For memcpy -#include - -// make the code compile with either wxFile*Stream or wxFFile*Stream: -#define HAS_FILE_STREAMS (wxUSE_STREAMS && (wxUSE_FILE || wxUSE_FFILE)) - -#if HAS_FILE_STREAMS - #if wxUSE_FFILE - typedef wxFFileInputStream wxImageFileInputStream; - typedef wxFFileOutputStream wxImageFileOutputStream; - #elif wxUSE_FILE - typedef wxFileInputStream wxImageFileInputStream; - typedef wxFileOutputStream wxImageFileOutputStream; - #endif // wxUSE_FILE/wxUSE_FFILE -#endif // HAS_FILE_STREAMS - -#if wxUSE_VARIANT -IMPLEMENT_VARIANT_OBJECT_EXPORTED_SHALLOWCMP(wxImage,WXDLLEXPORT) -#endif - -//----------------------------------------------------------------------------- -// global data -//----------------------------------------------------------------------------- - -wxList wxImage::sm_handlers; -wxImage wxNullImage; - -//----------------------------------------------------------------------------- -// wxImageRefData -//----------------------------------------------------------------------------- - -class wxImageRefData: public wxObjectRefData -{ -public: - wxImageRefData(); - virtual ~wxImageRefData(); - - int m_width; - int m_height; - wxBitmapType m_type; - unsigned char *m_data; - - bool m_hasMask; - unsigned char m_maskRed,m_maskGreen,m_maskBlue; - - // alpha channel data, may be NULL for the formats without alpha support - unsigned char *m_alpha; - - bool m_ok; - - // if true, m_data is pointer to static data and shouldn't be freed - bool m_static; - - // same as m_static but for m_alpha - bool m_staticAlpha; - - // global and per-object flags determining LoadFile() behaviour - int m_loadFlags; - static int sm_defaultLoadFlags; - -#if wxUSE_PALETTE - wxPalette m_palette; -#endif // wxUSE_PALETTE - - wxArrayString m_optionNames; - wxArrayString m_optionValues; - - wxDECLARE_NO_COPY_CLASS(wxImageRefData); -}; - -// For compatibility, if nothing else, loading is verbose by default. -int wxImageRefData::sm_defaultLoadFlags = wxImage::Load_Verbose; - -wxImageRefData::wxImageRefData() -{ - m_width = 0; - m_height = 0; - m_type = wxBITMAP_TYPE_INVALID; - m_data = - m_alpha = (unsigned char *) NULL; - - m_maskRed = 0; - m_maskGreen = 0; - m_maskBlue = 0; - m_hasMask = false; - - m_ok = false; - m_static = - m_staticAlpha = false; - - m_loadFlags = sm_defaultLoadFlags; -} - -wxImageRefData::~wxImageRefData() -{ - if ( !m_static ) - free( m_data ); - if ( !m_staticAlpha ) - free( m_alpha ); -} - - -//----------------------------------------------------------------------------- -// wxImage -//----------------------------------------------------------------------------- - -#define M_IMGDATA static_cast(m_refData) - -wxIMPLEMENT_DYNAMIC_CLASS(wxImage, wxObject); - -bool wxImage::Create(const char* const* xpmData) -{ -#if wxUSE_XPM - UnRef(); - - wxXPMDecoder decoder; - (*this) = decoder.ReadData(xpmData); - return IsOk(); -#else - wxUnusedVar(xpmData); - return false; -#endif -} - -bool wxImage::Create( int width, int height, bool clear ) -{ - UnRef(); - - m_refData = new wxImageRefData(); - - M_IMGDATA->m_data = (unsigned char *) malloc( width*height*3 ); - if (!M_IMGDATA->m_data) - { - UnRef(); - return false; - } - - M_IMGDATA->m_width = width; - M_IMGDATA->m_height = height; - M_IMGDATA->m_ok = true; - - if (clear) - { - Clear(); - } - - return true; -} - -bool wxImage::Create( int width, int height, unsigned char* data, bool static_data ) -{ - UnRef(); - - wxCHECK_MSG( data, false, wxT("NULL data in wxImage::Create") ); - - m_refData = new wxImageRefData(); - - M_IMGDATA->m_data = data; - M_IMGDATA->m_width = width; - M_IMGDATA->m_height = height; - M_IMGDATA->m_ok = true; - M_IMGDATA->m_static = static_data; - - return true; -} - -bool wxImage::Create( int width, int height, unsigned char* data, unsigned char* alpha, bool static_data ) -{ - UnRef(); - - wxCHECK_MSG( data, false, wxT("NULL data in wxImage::Create") ); - - m_refData = new wxImageRefData(); - - M_IMGDATA->m_data = data; - M_IMGDATA->m_alpha = alpha; - M_IMGDATA->m_width = width; - M_IMGDATA->m_height = height; - M_IMGDATA->m_ok = true; - M_IMGDATA->m_static = static_data; - M_IMGDATA->m_staticAlpha = static_data; - - return true; -} - -void wxImage::Destroy() -{ - UnRef(); -} - -void wxImage::Clear(unsigned char value) -{ - memset(M_IMGDATA->m_data, value, M_IMGDATA->m_width*M_IMGDATA->m_height*3); -} - -wxObjectRefData* wxImage::CreateRefData() const -{ - return new wxImageRefData; -} - -wxObjectRefData* wxImage::CloneRefData(const wxObjectRefData* that) const -{ - const wxImageRefData* refData = static_cast(that); - wxCHECK_MSG(refData->m_ok, NULL, wxT("invalid image") ); - - wxImageRefData* refData_new = new wxImageRefData; - refData_new->m_width = refData->m_width; - refData_new->m_height = refData->m_height; - refData_new->m_maskRed = refData->m_maskRed; - refData_new->m_maskGreen = refData->m_maskGreen; - refData_new->m_maskBlue = refData->m_maskBlue; - refData_new->m_hasMask = refData->m_hasMask; - refData_new->m_ok = true; - unsigned size = unsigned(refData->m_width) * unsigned(refData->m_height); - if (refData->m_alpha != NULL) - { - refData_new->m_alpha = (unsigned char*)malloc(size); - memcpy(refData_new->m_alpha, refData->m_alpha, size); - } - size *= 3; - refData_new->m_data = (unsigned char*)malloc(size); - memcpy(refData_new->m_data, refData->m_data, size); -#if wxUSE_PALETTE - refData_new->m_palette = refData->m_palette; -#endif - refData_new->m_optionNames = refData->m_optionNames; - refData_new->m_optionValues = refData->m_optionValues; - return refData_new; -} - -// returns a new image with the same dimensions, alpha, and mask as *this -// if on_its_side is true, width and height are swapped -wxImage wxImage::MakeEmptyClone(int flags) const -{ - wxImage image; - - wxCHECK_MSG( IsOk(), image, wxS("invalid image") ); - - long height = M_IMGDATA->m_height; - long width = M_IMGDATA->m_width; - - if ( flags & Clone_SwapOrientation ) - wxSwap( width, height ); - - if ( !image.Create( width, height, false ) ) - { - wxFAIL_MSG( wxS("unable to create image") ); - return image; - } - - if ( M_IMGDATA->m_alpha ) - { - image.SetAlpha(); - wxCHECK2_MSG( image.GetAlpha(), return wxImage(), - wxS("unable to create alpha channel") ); - } - - if ( M_IMGDATA->m_hasMask ) - { - image.SetMaskColour( M_IMGDATA->m_maskRed, - M_IMGDATA->m_maskGreen, - M_IMGDATA->m_maskBlue ); - } - - return image; -} - -wxImage wxImage::Copy() const -{ - wxImage image; - - wxCHECK_MSG( IsOk(), image, wxT("invalid image") ); - - image.m_refData = CloneRefData(m_refData); - - return image; -} - -wxImage wxImage::ShrinkBy( int xFactor , int yFactor ) const -{ - if( xFactor == 1 && yFactor == 1 ) - return *this; - - wxImage image; - - wxCHECK_MSG( IsOk(), image, wxT("invalid image") ); - - // can't scale to/from 0 size - wxCHECK_MSG( (xFactor > 0) && (yFactor > 0), image, - wxT("invalid new image size") ); - - long old_height = M_IMGDATA->m_height, - old_width = M_IMGDATA->m_width; - - wxCHECK_MSG( (old_height > 0) && (old_width > 0), image, - wxT("invalid old image size") ); - - long width = old_width / xFactor ; - long height = old_height / yFactor ; - - image.Create( width, height, false ); - - char unsigned *data = image.GetData(); - - wxCHECK_MSG( data, image, wxT("unable to create image") ); - - bool hasMask = false ; - unsigned char maskRed = 0; - unsigned char maskGreen = 0; - unsigned char maskBlue = 0 ; - - const unsigned char *source_data = M_IMGDATA->m_data; - unsigned char *target_data = data; - const unsigned char *source_alpha = 0 ; - unsigned char *target_alpha = 0 ; - if (M_IMGDATA->m_hasMask) - { - hasMask = true ; - maskRed = M_IMGDATA->m_maskRed; - maskGreen = M_IMGDATA->m_maskGreen; - maskBlue =M_IMGDATA->m_maskBlue ; - - image.SetMaskColour( M_IMGDATA->m_maskRed, - M_IMGDATA->m_maskGreen, - M_IMGDATA->m_maskBlue ); - } - else - { - source_alpha = M_IMGDATA->m_alpha ; - if ( source_alpha ) - { - image.SetAlpha() ; - target_alpha = image.GetAlpha() ; - } - } - - for (long y = 0; y < height; y++) - { - for (long x = 0; x < width; x++) - { - unsigned long avgRed = 0 ; - unsigned long avgGreen = 0; - unsigned long avgBlue = 0; - unsigned long avgAlpha = 0 ; - unsigned long counter = 0 ; - // determine average - for ( int y1 = 0 ; y1 < yFactor ; ++y1 ) - { - long y_offset = (y * yFactor + y1) * old_width; - for ( int x1 = 0 ; x1 < xFactor ; ++x1 ) - { - const unsigned char *pixel = source_data + 3 * ( y_offset + x * xFactor + x1 ) ; - unsigned char red = pixel[0] ; - unsigned char green = pixel[1] ; - unsigned char blue = pixel[2] ; - unsigned char alpha = 255 ; - if ( source_alpha ) - alpha = *(source_alpha + y_offset + x * xFactor + x1) ; - if ( !hasMask || red != maskRed || green != maskGreen || blue != maskBlue ) - { - if ( alpha > 0 ) - { - avgRed += red ; - avgGreen += green ; - avgBlue += blue ; - } - avgAlpha += alpha ; - counter++ ; - } - } - } - if ( counter == 0 ) - { - *(target_data++) = M_IMGDATA->m_maskRed ; - *(target_data++) = M_IMGDATA->m_maskGreen ; - *(target_data++) = M_IMGDATA->m_maskBlue ; - } - else - { - if ( source_alpha ) - *(target_alpha++) = (unsigned char)(avgAlpha / counter ) ; - *(target_data++) = (unsigned char)(avgRed / counter); - *(target_data++) = (unsigned char)(avgGreen / counter); - *(target_data++) = (unsigned char)(avgBlue / counter); - } - } - } - - // In case this is a cursor, make sure the hotspot is scaled accordingly: - if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X) ) - image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X, - (GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X))/xFactor); - if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y) ) - image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y, - (GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y))/yFactor); - - return image; -} - -wxImage -wxImage::Scale( int width, int height, wxImageResizeQuality quality ) const -{ - wxImage image; - - wxCHECK_MSG( IsOk(), image, wxT("invalid image") ); - - // can't scale to/from 0 size - wxCHECK_MSG( (width > 0) && (height > 0), image, - wxT("invalid new image size") ); - - long old_height = M_IMGDATA->m_height, - old_width = M_IMGDATA->m_width; - wxCHECK_MSG( (old_height > 0) && (old_width > 0), image, - wxT("invalid old image size") ); - - // If the image's new width and height are the same as the original, no - // need to waste time or CPU cycles - if ( old_width == width && old_height == height ) - return *this; - - // Resample the image using the method as specified. - switch ( quality ) - { - case wxIMAGE_QUALITY_NEAREST: - if ( old_width % width == 0 && old_width >= width && - old_height % height == 0 && old_height >= height ) - { - return ShrinkBy( old_width / width , old_height / height ); - } - - image = ResampleNearest(width, height); - break; - - case wxIMAGE_QUALITY_BILINEAR: - image = ResampleBilinear(width, height); - break; - - case wxIMAGE_QUALITY_BICUBIC: - image = ResampleBicubic(width, height); - break; - - case wxIMAGE_QUALITY_BOX_AVERAGE: - image = ResampleBox(width, height); - break; - - case wxIMAGE_QUALITY_HIGH: - image = width < old_width && height < old_height - ? ResampleBox(width, height) - : ResampleBicubic(width, height); - break; - } - - // If the original image has a mask, apply the mask to the new image - if (M_IMGDATA->m_hasMask) - { - image.SetMaskColour( M_IMGDATA->m_maskRed, - M_IMGDATA->m_maskGreen, - M_IMGDATA->m_maskBlue ); - } - - // In case this is a cursor, make sure the hotspot is scaled accordingly: - if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X) ) - image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X, - (GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X)*width)/old_width); - if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y) ) - image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y, - (GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y)*height)/old_height); - - return image; -} - -wxImage wxImage::ResampleNearest(int width, int height) const -{ - wxImage image; - image.Create( width, height, false ); - - unsigned char *data = image.GetData(); - - wxCHECK_MSG( data, image, wxT("unable to create image") ); - - const unsigned char *source_data = M_IMGDATA->m_data; - unsigned char *target_data = data; - const unsigned char *source_alpha = 0 ; - unsigned char *target_alpha = 0 ; - - if ( !M_IMGDATA->m_hasMask ) - { - source_alpha = M_IMGDATA->m_alpha ; - if ( source_alpha ) - { - image.SetAlpha() ; - target_alpha = image.GetAlpha() ; - } - } - - long old_height = M_IMGDATA->m_height, - old_width = M_IMGDATA->m_width; - long x_delta = (old_width<<16) / width; - long y_delta = (old_height<<16) / height; - - unsigned char* dest_pixel = target_data; - - long y = 0; - for ( long j = 0; j < height; j++ ) - { - const unsigned char* src_line = &source_data[(y>>16)*old_width*3]; - const unsigned char* src_alpha_line = source_alpha ? &source_alpha[(y>>16)*old_width] : 0 ; - - long x = 0; - for ( long i = 0; i < width; i++ ) - { - const unsigned char* src_pixel = &src_line[(x>>16)*3]; - const unsigned char* src_alpha_pixel = source_alpha ? &src_alpha_line[(x>>16)] : 0 ; - dest_pixel[0] = src_pixel[0]; - dest_pixel[1] = src_pixel[1]; - dest_pixel[2] = src_pixel[2]; - dest_pixel += 3; - if ( source_alpha ) - *(target_alpha++) = *src_alpha_pixel ; - x += x_delta; - } - - y += y_delta; - } - - return image; -} - -namespace -{ - -struct BoxPrecalc -{ - int boxStart; - int boxEnd; -}; - -inline int BoxBetween(int value, int low, int high) -{ - return wxMax(wxMin(value, high), low); -} - -void ResampleBoxPrecalc(wxVector& boxes, int oldDim) -{ - const int newDim = boxes.size(); - const double scale_factor_1 = double(oldDim) / newDim; - const int scale_factor_2 = (int)(scale_factor_1 / 2); - - for ( int dst = 0; dst < newDim; ++dst ) - { - // Source pixel in the Y direction - const int src_p = int(dst * scale_factor_1); - - BoxPrecalc& precalc = boxes[dst]; - precalc.boxStart = BoxBetween(int(src_p - scale_factor_1/2.0 + 1), - 0, oldDim - 1); - precalc.boxEnd = BoxBetween(wxMax(precalc.boxStart + 1, - int(src_p + scale_factor_2)), - 0, oldDim - 1); - } -} - -} // anonymous namespace - -wxImage wxImage::ResampleBox(int width, int height) const -{ - // This function implements a simple pre-blur/box averaging method for - // downsampling that gives reasonably smooth results To scale the image - // down we will need to gather a grid of pixels of the size of the scale - // factor in each direction and then do an averaging of the pixels. - - wxImage ret_image(width, height, false); - - wxVector vPrecalcs(height); - wxVector hPrecalcs(width); - - ResampleBoxPrecalc(vPrecalcs, M_IMGDATA->m_height); - ResampleBoxPrecalc(hPrecalcs, M_IMGDATA->m_width); - - - const unsigned char* src_data = M_IMGDATA->m_data; - const unsigned char* src_alpha = M_IMGDATA->m_alpha; - unsigned char* dst_data = ret_image.GetData(); - unsigned char* dst_alpha = NULL; - - if ( src_alpha ) - { - ret_image.SetAlpha(); - dst_alpha = ret_image.GetAlpha(); - } - - int averaged_pixels, src_pixel_index; - double sum_r, sum_g, sum_b, sum_a; - - for ( int y = 0; y < height; y++ ) // Destination image - Y direction - { - // Source pixel in the Y direction - const BoxPrecalc& vPrecalc = vPrecalcs[y]; - - for ( int x = 0; x < width; x++ ) // Destination image - X direction - { - // Source pixel in the X direction - const BoxPrecalc& hPrecalc = hPrecalcs[x]; - - // Box of pixels to average - averaged_pixels = 0; - sum_r = sum_g = sum_b = sum_a = 0.0; - - for ( int j = vPrecalc.boxStart; j <= vPrecalc.boxEnd; ++j ) - { - for ( int i = hPrecalc.boxStart; i <= hPrecalc.boxEnd; ++i ) - { - // Calculate the actual index in our source pixels - src_pixel_index = j * M_IMGDATA->m_width + i; - - sum_r += src_data[src_pixel_index * 3 + 0]; - sum_g += src_data[src_pixel_index * 3 + 1]; - sum_b += src_data[src_pixel_index * 3 + 2]; - if ( src_alpha ) - sum_a += src_alpha[src_pixel_index]; - - averaged_pixels++; - } - } - - // Calculate the average from the sum and number of averaged pixels - dst_data[0] = (unsigned char)(sum_r / averaged_pixels); - dst_data[1] = (unsigned char)(sum_g / averaged_pixels); - dst_data[2] = (unsigned char)(sum_b / averaged_pixels); - dst_data += 3; - if ( src_alpha ) - *dst_alpha++ = (unsigned char)(sum_a / averaged_pixels); - } - } - - return ret_image; -} - -namespace -{ - -struct BilinearPrecalc -{ - int offset1; - int offset2; - double dd; - double dd1; -}; - -void ResampleBilinearPrecalc(wxVector& precalcs, int oldDim) -{ - const int newDim = precalcs.size(); - const double scale_factor = double(oldDim) / newDim; - const int srcpixmax = oldDim - 1; - - for ( int dsty = 0; dsty < newDim; dsty++ ) - { - // We need to calculate the source pixel to interpolate from - Y-axis - double srcpix = double(dsty) * scale_factor; - double srcpix1 = int(srcpix); - double srcpix2 = srcpix1 == srcpixmax ? srcpix1 : srcpix1 + 1.0; - - BilinearPrecalc& precalc = precalcs[dsty]; - - precalc.dd = srcpix - (int)srcpix; - precalc.dd1 = 1.0 - precalc.dd; - precalc.offset1 = srcpix1 < 0.0 - ? 0 - : srcpix1 > srcpixmax - ? srcpixmax - : (int)srcpix1; - precalc.offset2 = srcpix2 < 0.0 - ? 0 - : srcpix2 > srcpixmax - ? srcpixmax - : (int)srcpix2; - } -} - -} // anonymous namespace - -wxImage wxImage::ResampleBilinear(int width, int height) const -{ - // This function implements a Bilinear algorithm for resampling. - wxImage ret_image(width, height, false); - const unsigned char* src_data = M_IMGDATA->m_data; - const unsigned char* src_alpha = M_IMGDATA->m_alpha; - unsigned char* dst_data = ret_image.GetData(); - unsigned char* dst_alpha = NULL; - - if ( src_alpha ) - { - ret_image.SetAlpha(); - dst_alpha = ret_image.GetAlpha(); - } - - wxVector vPrecalcs(height); - wxVector hPrecalcs(width); - ResampleBilinearPrecalc(vPrecalcs, M_IMGDATA->m_height); - ResampleBilinearPrecalc(hPrecalcs, M_IMGDATA->m_width); - - // initialize alpha values to avoid g++ warnings about possibly - // uninitialized variables - double r1, g1, b1, a1 = 0; - double r2, g2, b2, a2 = 0; - - for ( int dsty = 0; dsty < height; dsty++ ) - { - // We need to calculate the source pixel to interpolate from - Y-axis - const BilinearPrecalc& vPrecalc = vPrecalcs[dsty]; - const int y_offset1 = vPrecalc.offset1; - const int y_offset2 = vPrecalc.offset2; - const double dy = vPrecalc.dd; - const double dy1 = vPrecalc.dd1; - - - for ( int dstx = 0; dstx < width; dstx++ ) - { - // X-axis of pixel to interpolate from - const BilinearPrecalc& hPrecalc = hPrecalcs[dstx]; - - const int x_offset1 = hPrecalc.offset1; - const int x_offset2 = hPrecalc.offset2; - const double dx = hPrecalc.dd; - const double dx1 = hPrecalc.dd1; - - int src_pixel_index00 = y_offset1 * M_IMGDATA->m_width + x_offset1; - int src_pixel_index01 = y_offset1 * M_IMGDATA->m_width + x_offset2; - int src_pixel_index10 = y_offset2 * M_IMGDATA->m_width + x_offset1; - int src_pixel_index11 = y_offset2 * M_IMGDATA->m_width + x_offset2; - - // first line - r1 = src_data[src_pixel_index00 * 3 + 0] * dx1 + src_data[src_pixel_index01 * 3 + 0] * dx; - g1 = src_data[src_pixel_index00 * 3 + 1] * dx1 + src_data[src_pixel_index01 * 3 + 1] * dx; - b1 = src_data[src_pixel_index00 * 3 + 2] * dx1 + src_data[src_pixel_index01 * 3 + 2] * dx; - if ( src_alpha ) - a1 = src_alpha[src_pixel_index00] * dx1 + src_alpha[src_pixel_index01] * dx; - - // second line - r2 = src_data[src_pixel_index10 * 3 + 0] * dx1 + src_data[src_pixel_index11 * 3 + 0] * dx; - g2 = src_data[src_pixel_index10 * 3 + 1] * dx1 + src_data[src_pixel_index11 * 3 + 1] * dx; - b2 = src_data[src_pixel_index10 * 3 + 2] * dx1 + src_data[src_pixel_index11 * 3 + 2] * dx; - if ( src_alpha ) - a2 = src_alpha[src_pixel_index10] * dx1 + src_alpha[src_pixel_index11] * dx; - - // result lines - - dst_data[0] = static_cast(r1 * dy1 + r2 * dy + .5); - dst_data[1] = static_cast(g1 * dy1 + g2 * dy + .5); - dst_data[2] = static_cast(b1 * dy1 + b2 * dy + .5); - dst_data += 3; - - if ( src_alpha ) - *dst_alpha++ = static_cast(a1 * dy1 + a2 * dy); - } - } - - return ret_image; -} - -// The following two local functions are for the B-spline weighting of the -// bicubic sampling algorithm -static inline double spline_cube(double value) -{ - return value <= 0.0 ? 0.0 : value * value * value; -} - -static inline double spline_weight(double value) -{ - return (spline_cube(value + 2) - - 4 * spline_cube(value + 1) + - 6 * spline_cube(value) - - 4 * spline_cube(value - 1)) / 6; -} - - -namespace -{ - -struct BicubicPrecalc -{ - double weight[4]; - int offset[4]; -}; - -void ResampleBicubicPrecalc(wxVector &aWeight, int oldDim) -{ - const int newDim = aWeight.size(); - for ( int dstd = 0; dstd < newDim; dstd++ ) - { - // We need to calculate the source pixel to interpolate from - Y-axis - const double srcpixd = static_cast(dstd * oldDim) / newDim; - const double dd = srcpixd - static_cast(srcpixd); - - BicubicPrecalc &precalc = aWeight[dstd]; - - for ( int k = -1; k <= 2; k++ ) - { - precalc.offset[k + 1] = srcpixd + k < 0.0 - ? 0 - : srcpixd + k >= oldDim - ? oldDim - 1 - : static_cast(srcpixd + k); - - precalc.weight[k + 1] = spline_weight(k - dd); - } - } -} - -} // anonymous namespace - -// This is the bicubic resampling algorithm -wxImage wxImage::ResampleBicubic(int width, int height) const -{ - // This function implements a Bicubic B-Spline algorithm for resampling. - // This method is certainly a little slower than wxImage's default pixel - // replication method, however for most reasonably sized images not being - // upsampled too much on a fairly average CPU this difference is hardly - // noticeable and the results are far more pleasing to look at. - // - // This particular bicubic algorithm does pixel weighting according to a - // B-Spline that basically implements a Gaussian bell-like weighting - // kernel. Because of this method the results may appear a bit blurry when - // upsampling by large factors. This is basically because a slight - // gaussian blur is being performed to get the smooth look of the upsampled - // image. - - // Edge pixels: 3-4 possible solutions - // - (Wrap/tile) Wrap the image, take the color value from the opposite - // side of the image. - // - (Mirror) Duplicate edge pixels, so that pixel at coordinate (2, n), - // where n is nonpositive, will have the value of (2, 1). - // - (Ignore) Simply ignore the edge pixels and apply the kernel only to - // pixels which do have all neighbours. - // - (Clamp) Choose the nearest pixel along the border. This takes the - // border pixels and extends them out to infinity. - // - // NOTE: below the y_offset and x_offset variables are being set for edge - // pixels using the "Mirror" method mentioned above - - wxImage ret_image; - - ret_image.Create(width, height, false); - - const unsigned char* src_data = M_IMGDATA->m_data; - const unsigned char* src_alpha = M_IMGDATA->m_alpha; - unsigned char* dst_data = ret_image.GetData(); - unsigned char* dst_alpha = NULL; - - if ( src_alpha ) - { - ret_image.SetAlpha(); - dst_alpha = ret_image.GetAlpha(); - } - - // Precalculate weights - wxVector vPrecalcs(height); - wxVector hPrecalcs(width); - - ResampleBicubicPrecalc(vPrecalcs, M_IMGDATA->m_height); - ResampleBicubicPrecalc(hPrecalcs, M_IMGDATA->m_width); - - for ( int dsty = 0; dsty < height; dsty++ ) - { - // We need to calculate the source pixel to interpolate from - Y-axis - const BicubicPrecalc& vPrecalc = vPrecalcs[dsty]; - - for ( int dstx = 0; dstx < width; dstx++ ) - { - // X-axis of pixel to interpolate from - const BicubicPrecalc& hPrecalc = hPrecalcs[dstx]; - - // Sums for each color channel - double sum_r = 0, sum_g = 0, sum_b = 0, sum_a = 0; - - // Here we actually determine the RGBA values for the destination pixel - for ( int k = -1; k <= 2; k++ ) - { - // Y offset - const int y_offset = vPrecalc.offset[k + 1]; - - // Loop across the X axis - for ( int i = -1; i <= 2; i++ ) - { - // X offset - const int x_offset = hPrecalc.offset[i + 1]; - - // Calculate the exact position where the source data - // should be pulled from based on the x_offset and y_offset - int src_pixel_index = y_offset*M_IMGDATA->m_width + x_offset; - - // Calculate the weight for the specified pixel according - // to the bicubic b-spline kernel we're using for - // interpolation - const double - pixel_weight = vPrecalc.weight[k + 1] * hPrecalc.weight[i + 1]; - - // Create a sum of all velues for each color channel - // adjusted for the pixel's calculated weight - sum_r += src_data[src_pixel_index * 3 + 0] * pixel_weight; - sum_g += src_data[src_pixel_index * 3 + 1] * pixel_weight; - sum_b += src_data[src_pixel_index * 3 + 2] * pixel_weight; - if ( src_alpha ) - sum_a += src_alpha[src_pixel_index] * pixel_weight; - } - } - - // Put the data into the destination image. The summed values are - // of double data type and are rounded here for accuracy - dst_data[0] = (unsigned char)(sum_r + 0.5); - dst_data[1] = (unsigned char)(sum_g + 0.5); - dst_data[2] = (unsigned char)(sum_b + 0.5); - dst_data += 3; - - if ( src_alpha ) - *dst_alpha++ = (unsigned char)sum_a; - } - } - - return ret_image; -} - -// Blur in the horizontal direction -wxImage wxImage::BlurHorizontal(int blurRadius) const -{ - wxImage ret_image(MakeEmptyClone()); - - wxCHECK( ret_image.IsOk(), ret_image ); - - const unsigned char* src_data = M_IMGDATA->m_data; - unsigned char* dst_data = ret_image.GetData(); - const unsigned char* src_alpha = M_IMGDATA->m_alpha; - unsigned char* dst_alpha = ret_image.GetAlpha(); - - // number of pixels we average over - const int blurArea = blurRadius*2 + 1; - - // Horizontal blurring algorithm - average all pixels in the specified blur - // radius in the X or horizontal direction - for ( int y = 0; y < M_IMGDATA->m_height; y++ ) - { - // Variables used in the blurring algorithm - long sum_r = 0, - sum_g = 0, - sum_b = 0, - sum_a = 0; - - long pixel_idx; - const unsigned char *src; - unsigned char *dst; - - // Calculate the average of all pixels in the blur radius for the first - // pixel of the row - for ( int kernel_x = -blurRadius; kernel_x <= blurRadius; kernel_x++ ) - { - // To deal with the pixels at the start of a row so it's not - // grabbing GOK values from memory at negative indices of the - // image's data or grabbing from the previous row - if ( kernel_x < 0 ) - pixel_idx = y * M_IMGDATA->m_width; - else - pixel_idx = kernel_x + y * M_IMGDATA->m_width; - - src = src_data + pixel_idx*3; - sum_r += src[0]; - sum_g += src[1]; - sum_b += src[2]; - if ( src_alpha ) - sum_a += src_alpha[pixel_idx]; - } - - dst = dst_data + y * M_IMGDATA->m_width*3; - dst[0] = (unsigned char)(sum_r / blurArea); - dst[1] = (unsigned char)(sum_g / blurArea); - dst[2] = (unsigned char)(sum_b / blurArea); - if ( src_alpha ) - dst_alpha[y * M_IMGDATA->m_width] = (unsigned char)(sum_a / blurArea); - - // Now average the values of the rest of the pixels by just moving the - // blur radius box along the row - for ( int x = 1; x < M_IMGDATA->m_width; x++ ) - { - // Take care of edge pixels on the left edge by essentially - // duplicating the edge pixel - if ( x - blurRadius - 1 < 0 ) - pixel_idx = y * M_IMGDATA->m_width; - else - pixel_idx = (x - blurRadius - 1) + y * M_IMGDATA->m_width; - - // Subtract the value of the pixel at the left side of the blur - // radius box - src = src_data + pixel_idx*3; - sum_r -= src[0]; - sum_g -= src[1]; - sum_b -= src[2]; - if ( src_alpha ) - sum_a -= src_alpha[pixel_idx]; - - // Take care of edge pixels on the right edge - if ( x + blurRadius > M_IMGDATA->m_width - 1 ) - pixel_idx = M_IMGDATA->m_width - 1 + y * M_IMGDATA->m_width; - else - pixel_idx = x + blurRadius + y * M_IMGDATA->m_width; - - // Add the value of the pixel being added to the end of our box - src = src_data + pixel_idx*3; - sum_r += src[0]; - sum_g += src[1]; - sum_b += src[2]; - if ( src_alpha ) - sum_a += src_alpha[pixel_idx]; - - // Save off the averaged data - dst = dst_data + x*3 + y*M_IMGDATA->m_width*3; - dst[0] = (unsigned char)(sum_r / blurArea); - dst[1] = (unsigned char)(sum_g / blurArea); - dst[2] = (unsigned char)(sum_b / blurArea); - if ( src_alpha ) - dst_alpha[x + y * M_IMGDATA->m_width] = (unsigned char)(sum_a / blurArea); - } - } - - return ret_image; -} - -// Blur in the vertical direction -wxImage wxImage::BlurVertical(int blurRadius) const -{ - wxImage ret_image(MakeEmptyClone()); - - wxCHECK( ret_image.IsOk(), ret_image ); - - const unsigned char* src_data = M_IMGDATA->m_data; - unsigned char* dst_data = ret_image.GetData(); - const unsigned char* src_alpha = M_IMGDATA->m_alpha; - unsigned char* dst_alpha = ret_image.GetAlpha(); - - // number of pixels we average over - const int blurArea = blurRadius*2 + 1; - - // Vertical blurring algorithm - same as horizontal but switched the - // opposite direction - for ( int x = 0; x < M_IMGDATA->m_width; x++ ) - { - // Variables used in the blurring algorithm - long sum_r = 0, - sum_g = 0, - sum_b = 0, - sum_a = 0; - - long pixel_idx; - const unsigned char *src; - unsigned char *dst; - - // Calculate the average of all pixels in our blur radius box for the - // first pixel of the column - for ( int kernel_y = -blurRadius; kernel_y <= blurRadius; kernel_y++ ) - { - // To deal with the pixels at the start of a column so it's not - // grabbing GOK values from memory at negative indices of the - // image's data or grabbing from the previous column - if ( kernel_y < 0 ) - pixel_idx = x; - else - pixel_idx = x + kernel_y * M_IMGDATA->m_width; - - src = src_data + pixel_idx*3; - sum_r += src[0]; - sum_g += src[1]; - sum_b += src[2]; - if ( src_alpha ) - sum_a += src_alpha[pixel_idx]; - } - - dst = dst_data + x*3; - dst[0] = (unsigned char)(sum_r / blurArea); - dst[1] = (unsigned char)(sum_g / blurArea); - dst[2] = (unsigned char)(sum_b / blurArea); - if ( src_alpha ) - dst_alpha[x] = (unsigned char)(sum_a / blurArea); - - // Now average the values of the rest of the pixels by just moving the - // box along the column from top to bottom - for ( int y = 1; y < M_IMGDATA->m_height; y++ ) - { - // Take care of pixels that would be beyond the top edge by - // duplicating the top edge pixel for the column - if ( y - blurRadius - 1 < 0 ) - pixel_idx = x; - else - pixel_idx = x + (y - blurRadius - 1) * M_IMGDATA->m_width; - - // Subtract the value of the pixel at the top of our blur radius box - src = src_data + pixel_idx*3; - sum_r -= src[0]; - sum_g -= src[1]; - sum_b -= src[2]; - if ( src_alpha ) - sum_a -= src_alpha[pixel_idx]; - - // Take care of the pixels that would be beyond the bottom edge of - // the image similar to the top edge - if ( y + blurRadius > M_IMGDATA->m_height - 1 ) - pixel_idx = x + (M_IMGDATA->m_height - 1) * M_IMGDATA->m_width; - else - pixel_idx = x + (blurRadius + y) * M_IMGDATA->m_width; - - // Add the value of the pixel being added to the end of our box - src = src_data + pixel_idx*3; - sum_r += src[0]; - sum_g += src[1]; - sum_b += src[2]; - if ( src_alpha ) - sum_a += src_alpha[pixel_idx]; - - // Save off the averaged data - dst = dst_data + (x + y * M_IMGDATA->m_width) * 3; - dst[0] = (unsigned char)(sum_r / blurArea); - dst[1] = (unsigned char)(sum_g / blurArea); - dst[2] = (unsigned char)(sum_b / blurArea); - if ( src_alpha ) - dst_alpha[x + y * M_IMGDATA->m_width] = (unsigned char)(sum_a / blurArea); - } - } - - return ret_image; -} - -// The new blur function -wxImage wxImage::Blur(int blurRadius) const -{ - wxImage ret_image; - ret_image.Create(M_IMGDATA->m_width, M_IMGDATA->m_height, false); - - // Blur the image in each direction - ret_image = BlurHorizontal(blurRadius); - ret_image = ret_image.BlurVertical(blurRadius); - - return ret_image; -} - -wxImage wxImage::Rotate90( bool clockwise ) const -{ - wxImage image(MakeEmptyClone(Clone_SwapOrientation)); - - wxCHECK( image.IsOk(), image ); - - long height = M_IMGDATA->m_height; - long width = M_IMGDATA->m_width; - - if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X) ) - { - int hot_x = GetOptionInt( wxIMAGE_OPTION_CUR_HOTSPOT_X ); - image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y, - clockwise ? hot_x : width - 1 - hot_x); - } - - if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y) ) - { - int hot_y = GetOptionInt( wxIMAGE_OPTION_CUR_HOTSPOT_Y ); - image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X, - clockwise ? height - 1 - hot_y : hot_y); - } - - unsigned char *data = image.GetData(); - unsigned char *target_data; - - // we rotate the image in 21-pixel (63-byte) wide strips - // to make better use of cpu cache - memory transfers - // (note: while much better than single-pixel "strips", - // our vertical strips will still generally straddle 64-byte cachelines) - for (long ii = 0; ii < width; ) - { - long next_ii = wxMin(ii + 21, width); - - for (long j = 0; j < height; j++) - { - const unsigned char *source_data - = M_IMGDATA->m_data + (j*width + ii)*3; - - for (long i = ii; i < next_ii; i++) - { - if ( clockwise ) - { - target_data = data + ((i + 1)*height - j - 1)*3; - } - else - { - target_data = data + (height*(width - 1 - i) + j)*3; - } - memcpy( target_data, source_data, 3 ); - source_data += 3; - } - } - - ii = next_ii; - } - - const unsigned char *source_alpha = M_IMGDATA->m_alpha; - - if ( source_alpha ) - { - unsigned char *alpha_data = image.GetAlpha(); - unsigned char *target_alpha = 0 ; - - for (long ii = 0; ii < width; ) - { - long next_ii = wxMin(ii + 64, width); - - for (long j = 0; j < height; j++) - { - source_alpha = M_IMGDATA->m_alpha + j*width + ii; - - for (long i = ii; i < next_ii; i++) - { - if ( clockwise ) - { - target_alpha = alpha_data + (i+1)*height - j - 1; - } - else - { - target_alpha = alpha_data + height*(width - i - 1) + j; - } - - *target_alpha = *source_alpha++; - } - } - - ii = next_ii; - } - } - - return image; -} - -wxImage wxImage::Rotate180() const -{ - wxImage image(MakeEmptyClone()); - - wxCHECK( image.IsOk(), image ); - - long height = M_IMGDATA->m_height; - long width = M_IMGDATA->m_width; - - if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X) ) - { - image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X, - width - 1 - GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X)); - } - - if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y) ) - { - image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y, - height - 1 - GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y)); - } - - unsigned char *data = image.GetData(); - unsigned char *alpha = image.GetAlpha(); - const unsigned char *source_data = M_IMGDATA->m_data; - unsigned char *target_data = data + width * height * 3; - - for (long j = 0; j < height; j++) - { - for (long i = 0; i < width; i++) - { - target_data -= 3; - memcpy( target_data, source_data, 3 ); - source_data += 3; - } - } - - if ( alpha ) - { - const unsigned char *src_alpha = M_IMGDATA->m_alpha; - unsigned char *dest_alpha = alpha + width * height; - - for (long j = 0; j < height; ++j) - { - for (long i = 0; i < width; ++i) - { - *(--dest_alpha) = *(src_alpha++); - } - } - } - - return image; -} - -wxImage wxImage::Mirror( bool horizontally ) const -{ - wxImage image(MakeEmptyClone()); - - wxCHECK( image.IsOk(), image ); - - long height = M_IMGDATA->m_height; - long width = M_IMGDATA->m_width; - - unsigned char *data = image.GetData(); - unsigned char *alpha = image.GetAlpha(); - const unsigned char *source_data = M_IMGDATA->m_data; - unsigned char *target_data; - - if (horizontally) - { - for (long j = 0; j < height; j++) - { - data += width*3; - target_data = data-3; - for (long i = 0; i < width; i++) - { - memcpy( target_data, source_data, 3 ); - source_data += 3; - target_data -= 3; - } - } - - if (alpha != NULL) - { - // src_alpha starts at the first pixel and increases by 1 after each step - // (a step here is the copy of the alpha value of one pixel) - const unsigned char *src_alpha = M_IMGDATA->m_alpha; - // dest_alpha starts just beyond the first line, decreases before each step, - // and after each line is finished, increases by 2 widths (skipping the line - // just copied and the line that will be copied next) - unsigned char *dest_alpha = alpha + width; - - for (long jj = 0; jj < height; ++jj) - { - for (long i = 0; i < width; ++i) { - *(--dest_alpha) = *(src_alpha++); // copy one pixel - } - dest_alpha += 2 * width; // advance beyond the end of the next line - } - } - } - else - { - for (long i = 0; i < height; i++) - { - target_data = data + 3*width*(height-1-i); - memcpy( target_data, source_data, (size_t)3*width ); - source_data += 3*width; - } - - if ( alpha ) - { - // src_alpha starts at the first pixel and increases by 1 width after each step - // (a step here is the copy of the alpha channel of an entire line) - const unsigned char *src_alpha = M_IMGDATA->m_alpha; - // dest_alpha starts just beyond the last line (beyond the whole image) - // and decreases by 1 width before each step - unsigned char *dest_alpha = alpha + width * height; - - for (long jj = 0; jj < height; ++jj) - { - dest_alpha -= width; - memcpy( dest_alpha, src_alpha, (size_t)width ); - src_alpha += width; - } - } - } - - return image; -} - -wxImage wxImage::GetSubImage( const wxRect &rect ) const -{ - wxImage image; - - wxCHECK_MSG( IsOk(), image, wxT("invalid image") ); - - wxCHECK_MSG( (rect.GetLeft()>=0) && (rect.GetTop()>=0) && - (rect.GetRight()<=GetWidth()) && (rect.GetBottom()<=GetHeight()), - image, wxT("invalid subimage size") ); - - const int subwidth = rect.GetWidth(); - const int subheight = rect.GetHeight(); - - image.Create( subwidth, subheight, false ); - - const unsigned char *src_data = GetData(); - const unsigned char *src_alpha = M_IMGDATA->m_alpha; - unsigned char *subdata = image.GetData(); - unsigned char *subalpha = NULL; - - wxCHECK_MSG( subdata, image, wxT("unable to create image") ); - - if ( src_alpha ) { - image.SetAlpha(); - subalpha = image.GetAlpha(); - wxCHECK_MSG( subalpha, image, wxT("unable to create alpha channel")); - } - - if (M_IMGDATA->m_hasMask) - image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue ); - - const int width = GetWidth(); - const int pixsoff = rect.GetLeft() + width * rect.GetTop(); - - src_data += 3 * pixsoff; - src_alpha += pixsoff; // won't be used if was NULL, so this is ok - - for (long j = 0; j < subheight; ++j) - { - memcpy( subdata, src_data, 3 * subwidth ); - subdata += 3 * subwidth; - src_data += 3 * width; - if (subalpha != NULL) { - memcpy( subalpha, src_alpha, subwidth ); - subalpha += subwidth; - src_alpha += width; - } - } - - return image; -} - -wxImage wxImage::Size( const wxSize& size, const wxPoint& pos, - int r_, int g_, int b_ ) const -{ - wxImage image; - - wxCHECK_MSG( IsOk(), image, wxT("invalid image") ); - wxCHECK_MSG( (size.GetWidth() > 0) && (size.GetHeight() > 0), image, wxT("invalid size") ); - - int width = GetWidth(), height = GetHeight(); - image.Create(size.GetWidth(), size.GetHeight(), false); - - unsigned char r = (unsigned char)r_; - unsigned char g = (unsigned char)g_; - unsigned char b = (unsigned char)b_; - if ((r_ == -1) && (g_ == -1) && (b_ == -1)) - { - GetOrFindMaskColour( &r, &g, &b ); - image.SetMaskColour(r, g, b); - } - - image.SetRGB(wxRect(), r, g, b); - - // we have two coordinate systems: - // source: starting at 0,0 of source image - // destination starting at 0,0 of destination image - // Documentation says: - // "The image is pasted into a new image [...] at the position pos relative - // to the upper left of the new image." this means the transition rule is: - // "dest coord" = "source coord" + pos; - - // calculate the intersection using source coordinates: - wxRect srcRect(0, 0, width, height); - wxRect dstRect(-pos, size); - - srcRect.Intersect(dstRect); - - if (!srcRect.IsEmpty()) - { - // insertion point is needed in destination coordinates. - // NB: it is not always "pos"! - wxPoint ptInsert = srcRect.GetTopLeft() + pos; - - if ((srcRect.GetWidth() == width) && (srcRect.GetHeight() == height)) - image.Paste(*this, ptInsert.x, ptInsert.y); - else - image.Paste(GetSubImage(srcRect), ptInsert.x, ptInsert.y); - } - - return image; -} - -void wxImage::Paste( const wxImage &image, int x, int y ) -{ - wxCHECK_RET( IsOk(), wxT("invalid image") ); - wxCHECK_RET( image.IsOk(), wxT("invalid image") ); - - AllocExclusive(); - - int xx = 0; - int yy = 0; - int width = image.GetWidth(); - int height = image.GetHeight(); - - if (x < 0) - { - xx = -x; - width += x; - } - if (y < 0) - { - yy = -y; - height += y; - } - - if ((x+xx)+width > M_IMGDATA->m_width) - width = M_IMGDATA->m_width - (x+xx); - if ((y+yy)+height > M_IMGDATA->m_height) - height = M_IMGDATA->m_height - (y+yy); - - if (width < 1) return; - if (height < 1) return; - - // If we can, copy the data using memcpy() as this is the fastest way. But - // for this the image being pasted must have "compatible" mask with this - // one meaning that either it must not have one at all or it must use the - // same masked colour. - if ( !image.HasMask() || - ((HasMask() && - (GetMaskRed()==image.GetMaskRed()) && - (GetMaskGreen()==image.GetMaskGreen()) && - (GetMaskBlue()==image.GetMaskBlue()))) ) - { - const unsigned char* source_data = image.GetData() + 3*(xx + yy*image.GetWidth()); - int source_step = image.GetWidth()*3; - - unsigned char* target_data = GetData() + 3*((x+xx) + (y+yy)*M_IMGDATA->m_width); - int target_step = M_IMGDATA->m_width*3; - for (int j = 0; j < height; j++) - { - memcpy( target_data, source_data, width*3 ); - source_data += source_step; - target_data += target_step; - } - } - - // Copy over the alpha channel from the original image - if ( image.HasAlpha() ) - { - if ( !HasAlpha() ) - InitAlpha(); - - const unsigned char* source_data = image.GetAlpha() + xx + yy*image.GetWidth(); - int source_step = image.GetWidth(); - - unsigned char* target_data = GetAlpha() + (x+xx) + (y+yy)*M_IMGDATA->m_width; - int target_step = M_IMGDATA->m_width; - - for (int j = 0; j < height; j++, - source_data += source_step, - target_data += target_step) - { - memcpy( target_data, source_data, width ); - } - } - - if (!HasMask() && image.HasMask()) - { - unsigned char r = image.GetMaskRed(); - unsigned char g = image.GetMaskGreen(); - unsigned char b = image.GetMaskBlue(); - - const unsigned char* source_data = image.GetData() + 3*(xx + yy*image.GetWidth()); - int source_step = image.GetWidth()*3; - - unsigned char* target_data = GetData() + 3*((x+xx) + (y+yy)*M_IMGDATA->m_width); - int target_step = M_IMGDATA->m_width*3; - - for (int j = 0; j < height; j++) - { - for (int i = 0; i < width*3; i+=3) - { - if ((source_data[i] != r) || - (source_data[i+1] != g) || - (source_data[i+2] != b)) - { - memcpy( target_data+i, source_data+i, 3 ); - } - } - source_data += source_step; - target_data += target_step; - } - } -} - -void wxImage::Replace( unsigned char r1, unsigned char g1, unsigned char b1, - unsigned char r2, unsigned char g2, unsigned char b2 ) -{ - wxCHECK_RET( IsOk(), wxT("invalid image") ); - - AllocExclusive(); - - unsigned char *data = GetData(); - - const int w = GetWidth(); - const int h = GetHeight(); - - for (int j = 0; j < h; j++) - for (int i = 0; i < w; i++) - { - if ((data[0] == r1) && (data[1] == g1) && (data[2] == b1)) - { - data[0] = r2; - data[1] = g2; - data[2] = b2; - } - data += 3; - } -} - -wxImage wxImage::ConvertToGreyscale(void) const -{ - return ConvertToGreyscale(0.299, 0.587, 0.114); -} - -wxImage wxImage::ConvertToGreyscale(double weight_r, double weight_g, double weight_b) const -{ - wxImage image; - wxCHECK_MSG(IsOk(), image, "invalid image"); - - const int w = M_IMGDATA->m_width; - const int h = M_IMGDATA->m_height; - size_t size = size_t(w) * h; - image.Create(w, h, false); - const unsigned char* alpha = M_IMGDATA->m_alpha; - if (alpha) - { - image.SetAlpha(); - memcpy(image.GetAlpha(), alpha, size); - } - const unsigned char mask_r = M_IMGDATA->m_maskRed; - const unsigned char mask_g = M_IMGDATA->m_maskGreen; - const unsigned char mask_b = M_IMGDATA->m_maskBlue; - const bool hasMask = M_IMGDATA->m_hasMask; - if (hasMask) - image.SetMaskColour(mask_r, mask_g, mask_b); - - const unsigned char* src = M_IMGDATA->m_data; - unsigned char* dst = image.GetData(); - while (size--) - { - unsigned char r = *src++; - unsigned char g = *src++; - unsigned char b = *src++; - if (!hasMask || r != mask_r || g != mask_g || b != mask_b) - wxColour::MakeGrey(&r, &g, &b, weight_r, weight_g, weight_b); - *dst++ = r; - *dst++ = g; - *dst++ = b; - } - return image; -} - -wxImage wxImage::ConvertToMono( unsigned char r, unsigned char g, unsigned char b ) const -{ - wxImage image; - - wxCHECK_MSG( IsOk(), image, wxT("invalid image") ); - - image.Create( M_IMGDATA->m_width, M_IMGDATA->m_height, false ); - - unsigned char *data = image.GetData(); - - wxCHECK_MSG( data, image, wxT("unable to create image") ); - - if (M_IMGDATA->m_hasMask) - { - if (M_IMGDATA->m_maskRed == r && M_IMGDATA->m_maskGreen == g && - M_IMGDATA->m_maskBlue == b) - image.SetMaskColour( 255, 255, 255 ); - else - image.SetMaskColour( 0, 0, 0 ); - } - - long size = M_IMGDATA->m_height * M_IMGDATA->m_width; - - unsigned char *srcd = M_IMGDATA->m_data; - unsigned char *tard = image.GetData(); - - for ( long i = 0; i < size; i++, srcd += 3, tard += 3 ) - { - bool on = (srcd[0] == r) && (srcd[1] == g) && (srcd[2] == b); - wxColourBase::MakeMono(tard + 0, tard + 1, tard + 2, on); - } - - return image; -} - -wxImage wxImage::ConvertToDisabled(unsigned char brightness) const -{ - wxImage image; - wxCHECK_MSG(IsOk(), image, "invalid image"); - - const int w = M_IMGDATA->m_width; - const int h = M_IMGDATA->m_height; - size_t size = size_t(w) * h; - image.Create(w, h, false); - const unsigned char* alpha = M_IMGDATA->m_alpha; - if (alpha) - { - image.SetAlpha(); - memcpy(image.GetAlpha(), alpha, size); - } - const unsigned char mask_r = M_IMGDATA->m_maskRed; - const unsigned char mask_g = M_IMGDATA->m_maskGreen; - const unsigned char mask_b = M_IMGDATA->m_maskBlue; - const bool hasMask = M_IMGDATA->m_hasMask; - if (hasMask) - image.SetMaskColour(mask_r, mask_g, mask_b); - - const unsigned char* src = M_IMGDATA->m_data; - unsigned char* dst = image.GetData(); - while (size--) - { - unsigned char r = *src++; - unsigned char g = *src++; - unsigned char b = *src++; - if (!hasMask || r != mask_r || g != mask_g || b != mask_b) - wxColour::MakeDisabled(&r, &g, &b, brightness); - *dst++ = r; - *dst++ = g; - *dst++ = b; - } - return image; -} - -int wxImage::GetWidth() const -{ - wxCHECK_MSG( IsOk(), 0, wxT("invalid image") ); - - return M_IMGDATA->m_width; -} - -int wxImage::GetHeight() const -{ - wxCHECK_MSG( IsOk(), 0, wxT("invalid image") ); - - return M_IMGDATA->m_height; -} - -wxBitmapType wxImage::GetType() const -{ - wxCHECK_MSG( IsOk(), wxBITMAP_TYPE_INVALID, wxT("invalid image") ); - - return M_IMGDATA->m_type; -} - -void wxImage::SetType(wxBitmapType type) -{ - wxCHECK_RET( IsOk(), "must create the image before setting its type"); - - // type can be wxBITMAP_TYPE_INVALID to reset the image type to default - wxASSERT_MSG( type != wxBITMAP_TYPE_MAX, "invalid bitmap type" ); - - M_IMGDATA->m_type = type; -} - -long wxImage::XYToIndex(int x, int y) const -{ - if ( IsOk() && - x >= 0 && y >= 0 && - x < M_IMGDATA->m_width && y < M_IMGDATA->m_height ) - { - return y*M_IMGDATA->m_width + x; - } - - return -1; -} - -void wxImage::SetRGB( int x, int y, unsigned char r, unsigned char g, unsigned char b ) -{ - long pos = XYToIndex(x, y); - wxCHECK_RET( pos != -1, wxT("invalid image coordinates") ); - - AllocExclusive(); - - pos *= 3; - - M_IMGDATA->m_data[ pos ] = r; - M_IMGDATA->m_data[ pos+1 ] = g; - M_IMGDATA->m_data[ pos+2 ] = b; -} - -void wxImage::SetRGB( const wxRect& rect_, unsigned char r, unsigned char g, unsigned char b ) -{ - wxCHECK_RET( IsOk(), wxT("invalid image") ); - - AllocExclusive(); - - wxRect rect(rect_); - wxRect imageRect(0, 0, GetWidth(), GetHeight()); - if ( rect == wxRect() ) - { - rect = imageRect; - } - else - { - wxCHECK_RET( imageRect.Contains(rect.GetTopLeft()) && - imageRect.Contains(rect.GetBottomRight()), - wxT("invalid bounding rectangle") ); - } - - int x1 = rect.GetLeft(), - y1 = rect.GetTop(), - x2 = rect.GetRight() + 1, - y2 = rect.GetBottom() + 1; - - unsigned char *data wxDUMMY_INITIALIZE(NULL); - int x, y, width = GetWidth(); - for (y = y1; y < y2; y++) - { - data = M_IMGDATA->m_data + (y*width + x1)*3; - for (x = x1; x < x2; x++) - { - *data++ = r; - *data++ = g; - *data++ = b; - } - } -} - -unsigned char wxImage::GetRed( int x, int y ) const -{ - long pos = XYToIndex(x, y); - wxCHECK_MSG( pos != -1, 0, wxT("invalid image coordinates") ); - - pos *= 3; - - return M_IMGDATA->m_data[pos]; -} - -unsigned char wxImage::GetGreen( int x, int y ) const -{ - long pos = XYToIndex(x, y); - wxCHECK_MSG( pos != -1, 0, wxT("invalid image coordinates") ); - - pos *= 3; - - return M_IMGDATA->m_data[pos+1]; -} - -unsigned char wxImage::GetBlue( int x, int y ) const -{ - long pos = XYToIndex(x, y); - wxCHECK_MSG( pos != -1, 0, wxT("invalid image coordinates") ); - - pos *= 3; - - return M_IMGDATA->m_data[pos+2]; -} - -bool wxImage::IsOk() const -{ - // image of 0 width or height can't be considered ok - at least because it - // causes crashes in ConvertToBitmap() if we don't catch it in time - wxImageRefData *data = M_IMGDATA; - return data && data->m_ok && data->m_width && data->m_height; -} - -unsigned char *wxImage::GetData() const -{ - wxCHECK_MSG( IsOk(), (unsigned char *)NULL, wxT("invalid image") ); - - return M_IMGDATA->m_data; -} - -void wxImage::SetData( unsigned char *data, bool static_data ) -{ - wxCHECK_RET( IsOk(), wxT("invalid image") ); - - wxImageRefData *newRefData = new wxImageRefData(); - - newRefData->m_width = M_IMGDATA->m_width; - newRefData->m_height = M_IMGDATA->m_height; - newRefData->m_data = data; - newRefData->m_ok = true; - newRefData->m_maskRed = M_IMGDATA->m_maskRed; - newRefData->m_maskGreen = M_IMGDATA->m_maskGreen; - newRefData->m_maskBlue = M_IMGDATA->m_maskBlue; - newRefData->m_hasMask = M_IMGDATA->m_hasMask; - newRefData->m_static = static_data; - - UnRef(); - - m_refData = newRefData; -} - -void wxImage::SetData( unsigned char *data, int new_width, int new_height, bool static_data ) -{ - wxImageRefData *newRefData = new wxImageRefData(); - - if (m_refData) - { - newRefData->m_width = new_width; - newRefData->m_height = new_height; - newRefData->m_data = data; - newRefData->m_ok = true; - newRefData->m_maskRed = M_IMGDATA->m_maskRed; - newRefData->m_maskGreen = M_IMGDATA->m_maskGreen; - newRefData->m_maskBlue = M_IMGDATA->m_maskBlue; - newRefData->m_hasMask = M_IMGDATA->m_hasMask; - } - else - { - newRefData->m_width = new_width; - newRefData->m_height = new_height; - newRefData->m_data = data; - newRefData->m_ok = true; - } - newRefData->m_static = static_data; - - UnRef(); - - m_refData = newRefData; -} - -// ---------------------------------------------------------------------------- -// alpha channel support -// ---------------------------------------------------------------------------- - -void wxImage::SetAlpha(int x, int y, unsigned char alpha) -{ - wxCHECK_RET( HasAlpha(), wxT("no alpha channel") ); - - long pos = XYToIndex(x, y); - wxCHECK_RET( pos != -1, wxT("invalid image coordinates") ); - - AllocExclusive(); - - M_IMGDATA->m_alpha[pos] = alpha; -} - -unsigned char wxImage::GetAlpha(int x, int y) const -{ - wxCHECK_MSG( HasAlpha(), 0, wxT("no alpha channel") ); - - long pos = XYToIndex(x, y); - wxCHECK_MSG( pos != -1, 0, wxT("invalid image coordinates") ); - - return M_IMGDATA->m_alpha[pos]; -} - -bool -wxImage::ConvertColourToAlpha(unsigned char r, unsigned char g, unsigned char b) -{ - SetAlpha(NULL); - - const int w = M_IMGDATA->m_width; - const int h = M_IMGDATA->m_height; - - unsigned char *alpha = GetAlpha(); - unsigned char *data = GetData(); - - for ( int y = 0; y < h; y++ ) - { - for ( int x = 0; x < w; x++ ) - { - *alpha++ = *data; - *data++ = r; - *data++ = g; - *data++ = b; - } - } - - return true; -} - -void wxImage::SetAlpha( unsigned char *alpha, bool static_data ) -{ - wxCHECK_RET( IsOk(), wxT("invalid image") ); - - AllocExclusive(); - - if ( !alpha ) - { - alpha = (unsigned char *)malloc(M_IMGDATA->m_width*M_IMGDATA->m_height); - } - - if( !M_IMGDATA->m_staticAlpha ) - free(M_IMGDATA->m_alpha); - - M_IMGDATA->m_alpha = alpha; - M_IMGDATA->m_staticAlpha = static_data; -} - -unsigned char *wxImage::GetAlpha() const -{ - wxCHECK_MSG( IsOk(), (unsigned char *)NULL, wxT("invalid image") ); - - return M_IMGDATA->m_alpha; -} - -void wxImage::InitAlpha() -{ - wxCHECK_RET( !HasAlpha(), wxT("image already has an alpha channel") ); - - // initialize memory for alpha channel - SetAlpha(); - - unsigned char *alpha = M_IMGDATA->m_alpha; - const size_t lenAlpha = M_IMGDATA->m_width * M_IMGDATA->m_height; - - if ( HasMask() ) - { - // use the mask to initialize the alpha channel. - const unsigned char * const alphaEnd = alpha + lenAlpha; - - const unsigned char mr = M_IMGDATA->m_maskRed; - const unsigned char mg = M_IMGDATA->m_maskGreen; - const unsigned char mb = M_IMGDATA->m_maskBlue; - for ( unsigned char *src = M_IMGDATA->m_data; - alpha < alphaEnd; - src += 3, alpha++ ) - { - *alpha = (src[0] == mr && src[1] == mg && src[2] == mb) - ? wxIMAGE_ALPHA_TRANSPARENT - : wxIMAGE_ALPHA_OPAQUE; - } - - M_IMGDATA->m_hasMask = false; - } - else // no mask - { - // make the image fully opaque - memset(alpha, wxIMAGE_ALPHA_OPAQUE, lenAlpha); - } -} - -void wxImage::ClearAlpha() -{ - wxCHECK_RET( HasAlpha(), wxT("image already doesn't have an alpha channel") ); - - AllocExclusive(); - - if ( !M_IMGDATA->m_staticAlpha ) - free( M_IMGDATA->m_alpha ); - - M_IMGDATA->m_alpha = NULL; -} - - -// ---------------------------------------------------------------------------- -// mask support -// ---------------------------------------------------------------------------- - -void wxImage::SetMaskColour( unsigned char r, unsigned char g, unsigned char b ) -{ - wxCHECK_RET( IsOk(), wxT("invalid image") ); - - AllocExclusive(); - - M_IMGDATA->m_maskRed = r; - M_IMGDATA->m_maskGreen = g; - M_IMGDATA->m_maskBlue = b; - M_IMGDATA->m_hasMask = true; -} - -bool wxImage::GetOrFindMaskColour( unsigned char *r, unsigned char *g, unsigned char *b ) const -{ - wxCHECK_MSG( IsOk(), false, wxT("invalid image") ); - - if (M_IMGDATA->m_hasMask) - { - if (r) *r = M_IMGDATA->m_maskRed; - if (g) *g = M_IMGDATA->m_maskGreen; - if (b) *b = M_IMGDATA->m_maskBlue; - return true; - } - else - { - FindFirstUnusedColour(r, g, b); - return false; - } -} - -unsigned char wxImage::GetMaskRed() const -{ - wxCHECK_MSG( IsOk(), 0, wxT("invalid image") ); - - return M_IMGDATA->m_maskRed; -} - -unsigned char wxImage::GetMaskGreen() const -{ - wxCHECK_MSG( IsOk(), 0, wxT("invalid image") ); - - return M_IMGDATA->m_maskGreen; -} - -unsigned char wxImage::GetMaskBlue() const -{ - wxCHECK_MSG( IsOk(), 0, wxT("invalid image") ); - - return M_IMGDATA->m_maskBlue; -} - -void wxImage::SetMask( bool mask ) -{ - wxCHECK_RET( IsOk(), wxT("invalid image") ); - - AllocExclusive(); - - M_IMGDATA->m_hasMask = mask; -} - -bool wxImage::HasMask() const -{ - wxCHECK_MSG( IsOk(), false, wxT("invalid image") ); - - return M_IMGDATA->m_hasMask; -} - -bool wxImage::IsTransparent(int x, int y, unsigned char threshold) const -{ - long pos = XYToIndex(x, y); - wxCHECK_MSG( pos != -1, false, wxT("invalid image coordinates") ); - - // check mask - if ( M_IMGDATA->m_hasMask ) - { - const unsigned char *p = M_IMGDATA->m_data + 3*pos; - if ( p[0] == M_IMGDATA->m_maskRed && - p[1] == M_IMGDATA->m_maskGreen && - p[2] == M_IMGDATA->m_maskBlue ) - { - return true; - } - } - - // then check alpha - if ( M_IMGDATA->m_alpha ) - { - if ( M_IMGDATA->m_alpha[pos] < threshold ) - { - // transparent enough - return true; - } - } - - // not transparent - return false; -} - -bool wxImage::SetMaskFromImage(const wxImage& mask, - unsigned char mr, unsigned char mg, unsigned char mb) -{ - // check that the images are the same size - if ( (M_IMGDATA->m_height != mask.GetHeight() ) || (M_IMGDATA->m_width != mask.GetWidth () ) ) - { - wxLogError( _("Image and mask have different sizes.") ); - return false; - } - - // find unused colour - unsigned char r,g,b ; - if (!FindFirstUnusedColour(&r, &g, &b)) - { - wxLogError( _("No unused colour in image being masked.") ); - return false ; - } - - AllocExclusive(); - - unsigned char *imgdata = GetData(); - unsigned char *maskdata = mask.GetData(); - - const int w = GetWidth(); - const int h = GetHeight(); - - for (int j = 0; j < h; j++) - { - for (int i = 0; i < w; i++) - { - if ((maskdata[0] == mr) && (maskdata[1] == mg) && (maskdata[2] == mb)) - { - imgdata[0] = r; - imgdata[1] = g; - imgdata[2] = b; - } - imgdata += 3; - maskdata += 3; - } - } - - SetMaskColour(r, g, b); - SetMask(true); - - return true; -} - -bool wxImage::ConvertAlphaToMask(unsigned char threshold) -{ - if ( !HasAlpha() ) - return false; - - unsigned char mr, mg, mb; - if ( !FindFirstUnusedColour(&mr, &mg, &mb) ) - { - wxLogError( _("No unused colour in image being masked.") ); - return false; - } - - return ConvertAlphaToMask(mr, mg, mb, threshold); -} - -bool wxImage::ConvertAlphaToMask(unsigned char mr, - unsigned char mg, - unsigned char mb, - unsigned char threshold) -{ - if ( !HasAlpha() ) - return false; - - AllocExclusive(); - - SetMask(true); - SetMaskColour(mr, mg, mb); - - unsigned char *imgdata = GetData(); - unsigned char *alphadata = GetAlpha(); - - int w = GetWidth(); - int h = GetHeight(); - - for (int y = 0; y < h; y++) - { - for (int x = 0; x < w; x++, imgdata += 3, alphadata++) - { - if (*alphadata < threshold) - { - imgdata[0] = mr; - imgdata[1] = mg; - imgdata[2] = mb; - } - } - } - - if ( !M_IMGDATA->m_staticAlpha ) - free(M_IMGDATA->m_alpha); - - M_IMGDATA->m_alpha = NULL; - M_IMGDATA->m_staticAlpha = false; - - return true; -} - -// ---------------------------------------------------------------------------- -// Palette functions -// ---------------------------------------------------------------------------- - -#if wxUSE_PALETTE - -bool wxImage::HasPalette() const -{ - if (!IsOk()) - return false; - - return M_IMGDATA->m_palette.IsOk(); -} - -const wxPalette& wxImage::GetPalette() const -{ - wxCHECK_MSG( IsOk(), wxNullPalette, wxT("invalid image") ); - - return M_IMGDATA->m_palette; -} - -void wxImage::SetPalette(const wxPalette& palette) -{ - wxCHECK_RET( IsOk(), wxT("invalid image") ); - - AllocExclusive(); - - M_IMGDATA->m_palette = palette; -} - -#endif // wxUSE_PALETTE - -// ---------------------------------------------------------------------------- -// Option functions (arbitrary name/value mapping) -// ---------------------------------------------------------------------------- - -void wxImage::SetOption(const wxString& name, const wxString& value) -{ - AllocExclusive(); - - int idx = M_IMGDATA->m_optionNames.Index(name, false); - if ( idx == wxNOT_FOUND ) - { - M_IMGDATA->m_optionNames.Add(name); - M_IMGDATA->m_optionValues.Add(value); - } - else - { - M_IMGDATA->m_optionNames[idx] = name; - M_IMGDATA->m_optionValues[idx] = value; - } -} - -void wxImage::SetOption(const wxString& name, int value) -{ - wxString valStr; - valStr.Printf(wxT("%d"), value); - SetOption(name, valStr); -} - -wxString wxImage::GetOption(const wxString& name) const -{ - if ( !M_IMGDATA ) - return wxEmptyString; - - int idx = M_IMGDATA->m_optionNames.Index(name, false); - if ( idx == wxNOT_FOUND ) - return wxEmptyString; - else - return M_IMGDATA->m_optionValues[idx]; -} - -int wxImage::GetOptionInt(const wxString& name) const -{ - return wxAtoi(GetOption(name)); -} - -bool wxImage::HasOption(const wxString& name) const -{ - return M_IMGDATA ? M_IMGDATA->m_optionNames.Index(name, false) != wxNOT_FOUND - : false; -} - -// ---------------------------------------------------------------------------- -// image I/O -// ---------------------------------------------------------------------------- - -/* static */ -void wxImage::SetDefaultLoadFlags(int flags) -{ - wxImageRefData::sm_defaultLoadFlags = flags; -} - -/* static */ -int wxImage::GetDefaultLoadFlags() -{ - return wxImageRefData::sm_defaultLoadFlags; -} - -void wxImage::SetLoadFlags(int flags) -{ - AllocExclusive(); - - M_IMGDATA->m_loadFlags = flags; -} - -int wxImage::GetLoadFlags() const -{ - return M_IMGDATA ? M_IMGDATA->m_loadFlags : wxImageRefData::sm_defaultLoadFlags; -} - -// Under Windows we can load wxImage not only from files but also from -// resources. -#if defined(__WINDOWS__) && wxUSE_WXDIB && wxUSE_IMAGE - #define HAS_LOAD_FROM_RESOURCE -#endif - -#ifdef HAS_LOAD_FROM_RESOURCE - -#include "wx/msw/dib.h" -#include "wx/msw/private.h" - -static wxImage LoadImageFromResource(const wxString &name, wxBitmapType type) -{ - AutoHBITMAP - hBitmap, - hMask; - - if ( type == wxBITMAP_TYPE_BMP_RESOURCE ) - { - hBitmap.Init( ::LoadBitmap(wxGetInstance(), name.t_str()) ); - - if ( !hBitmap ) - { - wxLogError(_("Failed to load bitmap \"%s\" from resources."), name); - } - } - else if ( type == wxBITMAP_TYPE_ICO_RESOURCE ) - { - const HICON hIcon = ::LoadIcon(wxGetInstance(), name.t_str()); - - if ( !hIcon ) - { - wxLogError(_("Failed to load icon \"%s\" from resources."), name); - } - else - { - AutoIconInfo info; - if ( !info.GetFrom(hIcon) ) - return wxImage(); - - hBitmap.Init(info.hbmColor); - hMask.Init(info.hbmMask); - - // Reset the fields to prevent them from being destroyed, we took - // ownership of them. - info.hbmColor = - info.hbmMask = 0; - } - } - else if ( type == wxBITMAP_TYPE_CUR_RESOURCE ) - { - wxLogDebug(wxS("Loading cursors from resources is not implemented.")); - } - else - { - wxFAIL_MSG(wxS("Invalid bitmap resource type.")); - } - - if ( !hBitmap ) - return wxImage(); - - wxImage image = wxDIB(hBitmap).ConvertToImage(); - if ( hMask ) - { - const wxImage mask = wxDIB(hMask).ConvertToImage(); - image.SetMaskFromImage(mask, 255, 255, 255); - } - else - { - // Light gray colour is a default mask - image.SetMaskColour(0xc0, 0xc0, 0xc0); - } - - // We could have already loaded alpha from the resources, but if not, - // initialize it now using the mask. - if ( !image.HasAlpha() ) - image.InitAlpha(); - - return image; -} - -#endif // HAS_LOAD_FROM_RESOURCE - -bool wxImage::LoadFile( const wxString& filename, - wxBitmapType type, - int WXUNUSED_UNLESS_STREAMS(index) ) -{ -#ifdef HAS_LOAD_FROM_RESOURCE - if ( type == wxBITMAP_TYPE_BMP_RESOURCE - || type == wxBITMAP_TYPE_ICO_RESOURCE - || type == wxBITMAP_TYPE_CUR_RESOURCE) - { - const wxImage image = ::LoadImageFromResource(filename, type); - if ( image.IsOk() ) - { - *this = image; - return true; - } - } -#endif // HAS_LOAD_FROM_RESOURCE - -#if HAS_FILE_STREAMS - wxImageFileInputStream stream(filename); - if ( stream.IsOk() ) - { - wxBufferedInputStream bstream( stream ); - if ( LoadFile(bstream, type, index) ) - return true; - } - - wxLogError(_("Failed to load image from file \"%s\"."), filename); -#endif // HAS_FILE_STREAMS - - return false; -} - -bool wxImage::LoadFile( const wxString& WXUNUSED_UNLESS_STREAMS(filename), - const wxString& WXUNUSED_UNLESS_STREAMS(mimetype), - int WXUNUSED_UNLESS_STREAMS(index) ) -{ -#if HAS_FILE_STREAMS - wxImageFileInputStream stream(filename); - if ( stream.IsOk() ) - { - wxBufferedInputStream bstream( stream ); - if ( LoadFile(bstream, mimetype, index) ) - return true; - } - - wxLogError(_("Failed to load image from file \"%s\"."), filename); -#endif // HAS_FILE_STREAMS - - return false; -} - - -bool wxImage::SaveFile( const wxString& filename ) const -{ - wxString ext = filename.AfterLast('.').Lower(); - - wxImageHandler *handler = FindHandler(ext, wxBITMAP_TYPE_ANY); - if ( !handler) - { - wxLogError(_("Can't save image to file '%s': unknown extension."), - filename); - return false; - } - - return SaveFile(filename, handler->GetType()); -} - -bool wxImage::SaveFile( const wxString& WXUNUSED_UNLESS_STREAMS(filename), - wxBitmapType WXUNUSED_UNLESS_STREAMS(type) ) const -{ -#if HAS_FILE_STREAMS - wxCHECK_MSG( IsOk(), false, wxT("invalid image") ); - - ((wxImage*)this)->SetOption(wxIMAGE_OPTION_FILENAME, filename); - - wxImageFileOutputStream stream(filename); - - if ( stream.IsOk() ) - { - wxBufferedOutputStream bstream( stream ); - return SaveFile(bstream, type); - } -#endif // HAS_FILE_STREAMS - - return false; -} - -bool wxImage::SaveFile( const wxString& WXUNUSED_UNLESS_STREAMS(filename), - const wxString& WXUNUSED_UNLESS_STREAMS(mimetype) ) const -{ -#if HAS_FILE_STREAMS - wxCHECK_MSG( IsOk(), false, wxT("invalid image") ); - - ((wxImage*)this)->SetOption(wxIMAGE_OPTION_FILENAME, filename); - - wxImageFileOutputStream stream(filename); - - if ( stream.IsOk() ) - { - wxBufferedOutputStream bstream( stream ); - return SaveFile(bstream, mimetype); - } -#endif // HAS_FILE_STREAMS - - return false; -} - -bool wxImage::CanRead( const wxString& WXUNUSED_UNLESS_STREAMS(name) ) -{ -#if HAS_FILE_STREAMS - wxImageFileInputStream stream(name); - return CanRead(stream); -#else - return false; -#endif -} - -int wxImage::GetImageCount( const wxString& WXUNUSED_UNLESS_STREAMS(name), - wxBitmapType WXUNUSED_UNLESS_STREAMS(type) ) -{ -#if HAS_FILE_STREAMS - wxImageFileInputStream stream(name); - if (stream.IsOk()) - return GetImageCount(stream, type); -#endif - - return 0; -} - -#if wxUSE_STREAMS - -bool wxImage::CanRead( wxInputStream &stream ) -{ - const wxList& list = GetHandlers(); - - for ( wxList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext() ) - { - wxImageHandler *handler=(wxImageHandler*)node->GetData(); - if (handler->CanRead( stream )) - return true; - } - - return false; -} - -int wxImage::GetImageCount( wxInputStream &stream, wxBitmapType type ) -{ - wxImageHandler *handler; - - if ( type == wxBITMAP_TYPE_ANY ) - { - const wxList& list = GetHandlers(); - - for ( wxList::compatibility_iterator node = list.GetFirst(); - node; - node = node->GetNext() ) - { - handler = (wxImageHandler*)node->GetData(); - if ( handler->CanRead(stream) ) - { - const int count = handler->GetImageCount(stream); - if ( count >= 0 ) - return count; - } - - } - - wxLogWarning(_("No handler found for image type.")); - return 0; - } - - handler = FindHandler(type); - - if ( !handler ) - { - wxLogWarning(_("No image handler for type %d defined."), type); - return false; - } - - if ( handler->CanRead(stream) ) - { - return handler->GetImageCount(stream); - } - else - { - wxLogError(_("Image file is not of type %d."), type); - return 0; - } -} - -bool wxImage::DoLoad(wxImageHandler& handler, wxInputStream& stream, int index) -{ - // save the options values which can be clobbered by the handler (e.g. many - // of them call Destroy() before trying to load the file) - const unsigned maxWidth = GetOptionInt(wxIMAGE_OPTION_MAX_WIDTH), - maxHeight = GetOptionInt(wxIMAGE_OPTION_MAX_HEIGHT); - - // Preserve the original stream position if possible to rewind back to it - // if we failed to load the file -- maybe the next handler that we try can - // succeed after us then. - wxFileOffset posOld = wxInvalidOffset; - if ( stream.IsSeekable() ) - posOld = stream.TellI(); - - if ( !handler.LoadFile(this, stream, - (M_IMGDATA->m_loadFlags & Load_Verbose) != 0, index) ) - { - if ( posOld != wxInvalidOffset ) - stream.SeekI(posOld); - - return false; - } - - // rescale the image to the specified size if needed - if ( maxWidth || maxHeight ) - { - const unsigned widthOrig = GetWidth(), - heightOrig = GetHeight(); - - // this uses the same (trivial) algorithm as the JPEG handler - unsigned width = widthOrig, - height = heightOrig; - while ( (maxWidth && width > maxWidth) || - (maxHeight && height > maxHeight) ) - { - width /= 2; - height /= 2; - } - - if ( width != widthOrig || height != heightOrig ) - { - // get the original size if it was set by the image handler - // but also in order to restore it after Rescale - int widthOrigOption = GetOptionInt(wxIMAGE_OPTION_ORIGINAL_WIDTH), - heightOrigOption = GetOptionInt(wxIMAGE_OPTION_ORIGINAL_HEIGHT); - - Rescale(width, height, wxIMAGE_QUALITY_HIGH); - - SetOption(wxIMAGE_OPTION_ORIGINAL_WIDTH, widthOrigOption ? widthOrigOption : widthOrig); - SetOption(wxIMAGE_OPTION_ORIGINAL_HEIGHT, heightOrigOption ? heightOrigOption : heightOrig); - } - } - - // Set this after Rescale, which currently does not preserve it - M_IMGDATA->m_type = handler.GetType(); - - return true; -} - -bool wxImage::LoadFile( wxInputStream& stream, wxBitmapType type, int index ) -{ - AllocExclusive(); - - wxImageHandler *handler; - - if ( type == wxBITMAP_TYPE_ANY ) - { - if ( !stream.IsSeekable() ) - { - // The error message about image data format being unknown below - // would be misleading in this case as we are not even going to try - // any handlers because CanRead() never does anything for not - // seekable stream, so try to be more precise here. - wxLogError(_("Can't automatically determine the image format " - "for non-seekable input.")); - return false; - } - - const wxList& list = GetHandlers(); - for ( wxList::compatibility_iterator node = list.GetFirst(); - node; - node = node->GetNext() ) - { - handler = (wxImageHandler*)node->GetData(); - if ( handler->CanRead(stream) && DoLoad(*handler, stream, index) ) - return true; - } - - wxLogWarning( _("Unknown image data format.") ); - - return false; - } - //else: have specific type - - handler = FindHandler(type); - if ( !handler ) - { - wxLogWarning( _("No image handler for type %d defined."), type ); - return false; - } - - if ( stream.IsSeekable() && !handler->CanRead(stream) ) - { - wxLogError(_("This is not a %s."), handler->GetName()); - return false; - } - - return DoLoad(*handler, stream, index); -} - -bool wxImage::LoadFile( wxInputStream& stream, const wxString& mimetype, int index ) -{ - UnRef(); - - m_refData = new wxImageRefData; - - wxImageHandler *handler = FindHandlerMime(mimetype); - - if ( !handler ) - { - wxLogWarning( _("No image handler for type %s defined."), mimetype.GetData() ); - return false; - } - - if ( stream.IsSeekable() && !handler->CanRead(stream) ) - { - wxLogError(_("Image is not of type %s."), mimetype); - return false; - } - - return DoLoad(*handler, stream, index); -} - -bool wxImage::DoSave(wxImageHandler& handler, wxOutputStream& stream) const -{ - wxImage * const self = const_cast(this); - if ( !handler.SaveFile(self, stream) ) - return false; - - M_IMGDATA->m_type = handler.GetType(); - return true; -} - -bool wxImage::SaveFile( wxOutputStream& stream, wxBitmapType type ) const -{ - wxCHECK_MSG( IsOk(), false, wxT("invalid image") ); - - wxImageHandler *handler = FindHandler(type); - if ( !handler ) - { - wxLogWarning( _("No image handler for type %d defined."), type ); - return false; - } - - return DoSave(*handler, stream); -} - -bool wxImage::SaveFile( wxOutputStream& stream, const wxString& mimetype ) const -{ - wxCHECK_MSG( IsOk(), false, wxT("invalid image") ); - - wxImageHandler *handler = FindHandlerMime(mimetype); - if ( !handler ) - { - wxLogWarning( _("No image handler for type %s defined."), mimetype.GetData() ); - return false; - } - - return DoSave(*handler, stream); -} - -#endif // wxUSE_STREAMS - -// ---------------------------------------------------------------------------- -// image I/O handlers -// ---------------------------------------------------------------------------- - -void wxImage::AddHandler( wxImageHandler *handler ) -{ - // Check for an existing handler of the type being added. - if (FindHandler( handler->GetType() ) == 0) - { - sm_handlers.Append( handler ); - } - else - { - // This is not documented behaviour, merely the simplest 'fix' - // for preventing duplicate additions. If someone ever has - // a good reason to add and remove duplicate handlers (and they - // may) we should probably refcount the duplicates. - // also an issue in InsertHandler below. - - wxLogDebug( wxT("Adding duplicate image handler for '%s'"), - handler->GetName().c_str() ); - delete handler; - } -} - -void wxImage::InsertHandler( wxImageHandler *handler ) -{ - // Check for an existing handler of the type being added. - if (FindHandler( handler->GetType() ) == 0) - { - sm_handlers.Insert( handler ); - } - else - { - // see AddHandler for additional comments. - wxLogDebug( wxT("Inserting duplicate image handler for '%s'"), - handler->GetName().c_str() ); - delete handler; - } -} - -bool wxImage::RemoveHandler( const wxString& name ) -{ - wxImageHandler *handler = FindHandler(name); - if (handler) - { - sm_handlers.DeleteObject(handler); - delete handler; - return true; - } - else - return false; -} - -wxImageHandler *wxImage::FindHandler( const wxString& name ) -{ - wxList::compatibility_iterator node = sm_handlers.GetFirst(); - while (node) - { - wxImageHandler *handler = (wxImageHandler*)node->GetData(); - if (handler->GetName().Cmp(name) == 0) return handler; - - node = node->GetNext(); - } - return NULL; -} - -wxImageHandler *wxImage::FindHandler( const wxString& extension, wxBitmapType bitmapType ) -{ - wxList::compatibility_iterator node = sm_handlers.GetFirst(); - while (node) - { - wxImageHandler *handler = (wxImageHandler*)node->GetData(); - if ((bitmapType == wxBITMAP_TYPE_ANY) || (handler->GetType() == bitmapType)) - { - if (handler->GetExtension() == extension) - return handler; - if (handler->GetAltExtensions().Index(extension, false) != wxNOT_FOUND) - return handler; - } - node = node->GetNext(); - } - return NULL; -} - -wxImageHandler *wxImage::FindHandler(wxBitmapType bitmapType ) -{ - wxList::compatibility_iterator node = sm_handlers.GetFirst(); - while (node) - { - wxImageHandler *handler = (wxImageHandler *)node->GetData(); - if (handler->GetType() == bitmapType) return handler; - node = node->GetNext(); - } - return NULL; -} - -wxImageHandler *wxImage::FindHandlerMime( const wxString& mimetype ) -{ - wxList::compatibility_iterator node = sm_handlers.GetFirst(); - while (node) - { - wxImageHandler *handler = (wxImageHandler *)node->GetData(); - if (handler->GetMimeType().IsSameAs(mimetype, false)) return handler; - node = node->GetNext(); - } - return NULL; -} - -void wxImage::InitStandardHandlers() -{ -#if wxUSE_STREAMS - AddHandler(new wxBMPHandler); -#endif // wxUSE_STREAMS -} - -void wxImage::CleanUpHandlers() -{ - wxList::compatibility_iterator node = sm_handlers.GetFirst(); - while (node) - { - wxImageHandler *handler = (wxImageHandler *)node->GetData(); - wxList::compatibility_iterator next = node->GetNext(); - delete handler; - node = next; - } - - sm_handlers.Clear(); -} - -wxString wxImage::GetImageExtWildcard() -{ - wxString fmts; - - wxList& Handlers = wxImage::GetHandlers(); - wxList::compatibility_iterator Node = Handlers.GetFirst(); - while ( Node ) - { - wxImageHandler* Handler = (wxImageHandler*)Node->GetData(); - fmts += wxT("*.") + Handler->GetExtension(); - for (size_t i = 0; i < Handler->GetAltExtensions().size(); i++) - fmts += wxT(";*.") + Handler->GetAltExtensions()[i]; - Node = Node->GetNext(); - if ( Node ) fmts += wxT(";"); - } - - return wxT("(") + fmts + wxT(")|") + fmts; -} - -wxImage::HSVValue wxImage::RGBtoHSV(const RGBValue& rgb) -{ - const double red = rgb.red / 255.0, - green = rgb.green / 255.0, - blue = rgb.blue / 255.0; - - // find the min and max intensity (and remember which one was it for the - // latter) - double minimumRGB = red; - if ( green < minimumRGB ) - minimumRGB = green; - if ( blue < minimumRGB ) - minimumRGB = blue; - - enum { RED, GREEN, BLUE } chMax = RED; - double maximumRGB = red; - if ( green > maximumRGB ) - { - chMax = GREEN; - maximumRGB = green; - } - if ( blue > maximumRGB ) - { - chMax = BLUE; - maximumRGB = blue; - } - - const double value = maximumRGB; - - double hue = 0.0, saturation; - const double deltaRGB = maximumRGB - minimumRGB; - if ( wxIsNullDouble(deltaRGB) ) - { - // Gray has no color - hue = 0.0; - saturation = 0.0; - } - else - { - switch ( chMax ) - { - case RED: - hue = (green - blue) / deltaRGB; - break; - - case GREEN: - hue = 2.0 + (blue - red) / deltaRGB; - break; - - case BLUE: - hue = 4.0 + (red - green) / deltaRGB; - break; - } - - hue /= 6.0; - - if ( hue < 0.0 ) - hue += 1.0; - - saturation = deltaRGB / maximumRGB; - } - - return HSVValue(hue, saturation, value); -} - -wxImage::RGBValue wxImage::HSVtoRGB(const HSVValue& hsv) -{ - double red, green, blue; - - if ( wxIsNullDouble(hsv.saturation) ) - { - // Grey - red = hsv.value; - green = hsv.value; - blue = hsv.value; - } - else // not grey - { - double hue = hsv.hue * 6.0; // sector 0 to 5 - int i = (int)floor(hue); - double f = hue - i; // fractional part of h - double p = hsv.value * (1.0 - hsv.saturation); - - switch (i) - { - case 0: - red = hsv.value; - green = hsv.value * (1.0 - hsv.saturation * (1.0 - f)); - blue = p; - break; - - case 1: - red = hsv.value * (1.0 - hsv.saturation * f); - green = hsv.value; - blue = p; - break; - - case 2: - red = p; - green = hsv.value; - blue = hsv.value * (1.0 - hsv.saturation * (1.0 - f)); - break; - - case 3: - red = p; - green = hsv.value * (1.0 - hsv.saturation * f); - blue = hsv.value; - break; - - case 4: - red = hsv.value * (1.0 - hsv.saturation * (1.0 - f)); - green = p; - blue = hsv.value; - break; - - default: // case 5: - red = hsv.value; - green = p; - blue = hsv.value * (1.0 - hsv.saturation * f); - break; - } - } - - return RGBValue((unsigned char)(red * 255.0), - (unsigned char)(green * 255.0), - (unsigned char)(blue * 255.0)); -} - -/* - * Rotates the hue of each pixel of the image. angle is a double in the range - * -1.0..1.0 where -1.0 is -360 degrees and 1.0 is 360 degrees - */ -void wxImage::RotateHue(double angle) -{ - AllocExclusive(); - - unsigned char *srcBytePtr; - unsigned char *dstBytePtr; - unsigned long count; - wxImage::HSVValue hsv; - wxImage::RGBValue rgb; - - wxASSERT (angle >= -1.0 && angle <= 1.0); - count = M_IMGDATA->m_width * M_IMGDATA->m_height; - if ( count > 0 && !wxIsNullDouble(angle) ) - { - srcBytePtr = M_IMGDATA->m_data; - dstBytePtr = srcBytePtr; - do - { - rgb.red = *srcBytePtr++; - rgb.green = *srcBytePtr++; - rgb.blue = *srcBytePtr++; - hsv = RGBtoHSV(rgb); - - hsv.hue = hsv.hue + angle; - if (hsv.hue > 1.0) - hsv.hue = hsv.hue - 1.0; - else if (hsv.hue < 0.0) - hsv.hue = hsv.hue + 1.0; - - rgb = HSVtoRGB(hsv); - *dstBytePtr++ = rgb.red; - *dstBytePtr++ = rgb.green; - *dstBytePtr++ = rgb.blue; - } while (--count != 0); - } -} - -//----------------------------------------------------------------------------- -// wxImageHandler -//----------------------------------------------------------------------------- - -wxIMPLEMENT_ABSTRACT_CLASS(wxImageHandler, wxObject); - -#if wxUSE_STREAMS -int wxImageHandler::GetImageCount( wxInputStream& stream ) -{ - // NOTE: this code is the same of wxAnimationDecoder::CanRead and - // wxImageHandler::CallDoCanRead - - if ( !stream.IsSeekable() ) - return false; // can't test unseekable stream - - wxFileOffset posOld = stream.TellI(); - int n = DoGetImageCount(stream); - - // restore the old position to be able to test other formats and so on - if ( stream.SeekI(posOld) == wxInvalidOffset ) - { - wxLogDebug(wxT("Failed to rewind the stream in wxImageHandler!")); - - // reading would fail anyhow as we're not at the right position - return false; - } - - return n; -} - -bool wxImageHandler::CanRead( const wxString& name ) -{ - wxImageFileInputStream stream(name); - if ( !stream.IsOk() ) - { - wxLogError(_("Failed to check format of image file \"%s\"."), name); - - return false; - } - - return CanRead(stream); -} - -bool wxImageHandler::CallDoCanRead(wxInputStream& stream) -{ - // NOTE: this code is the same of wxAnimationDecoder::CanRead and - // wxImageHandler::GetImageCount - - if ( !stream.IsSeekable() ) - return false; // can't test unseekable stream - - wxFileOffset posOld = stream.TellI(); - bool ok = DoCanRead(stream); - - // restore the old position to be able to test other formats and so on - if ( stream.SeekI(posOld) == wxInvalidOffset ) - { - wxLogDebug(wxT("Failed to rewind the stream in wxImageHandler!")); - - // reading would fail anyhow as we're not at the right position - return false; - } - - return ok; -} - -#endif // wxUSE_STREAMS - -/* static */ -wxImageResolution -wxImageHandler::GetResolutionFromOptions(const wxImage& image, int *x, int *y) -{ - wxCHECK_MSG( x && y, wxIMAGE_RESOLUTION_NONE, wxT("NULL pointer") ); - - if ( image.HasOption(wxIMAGE_OPTION_RESOLUTIONX) && - image.HasOption(wxIMAGE_OPTION_RESOLUTIONY) ) - { - *x = image.GetOptionInt(wxIMAGE_OPTION_RESOLUTIONX); - *y = image.GetOptionInt(wxIMAGE_OPTION_RESOLUTIONY); - } - else if ( image.HasOption(wxIMAGE_OPTION_RESOLUTION) ) - { - *x = - *y = image.GetOptionInt(wxIMAGE_OPTION_RESOLUTION); - } - else // no resolution options specified - { - *x = - *y = 0; - - return wxIMAGE_RESOLUTION_NONE; - } - - // get the resolution unit too - int resUnit = image.GetOptionInt(wxIMAGE_OPTION_RESOLUTIONUNIT); - if ( !resUnit ) - { - // this is the default - resUnit = wxIMAGE_RESOLUTION_INCHES; - } - - return (wxImageResolution)resUnit; -} - -// ---------------------------------------------------------------------------- -// image histogram stuff -// ---------------------------------------------------------------------------- - -bool -wxImageHistogram::FindFirstUnusedColour(unsigned char *r, - unsigned char *g, - unsigned char *b, - unsigned char r2, - unsigned char g2, - unsigned char b2) const -{ - unsigned long key = MakeKey(r2, g2, b2); - - while ( find(key) != end() ) - { - // color already used - r2++; - if ( r2 >= 255 ) - { - r2 = 0; - g2++; - if ( g2 >= 255 ) - { - g2 = 0; - b2++; - if ( b2 >= 255 ) - { - wxLogError(_("No unused colour in image.") ); - return false; - } - } - } - - key = MakeKey(r2, g2, b2); - } - - if ( r ) - *r = r2; - if ( g ) - *g = g2; - if ( b ) - *b = b2; - - return true; -} - -bool -wxImage::FindFirstUnusedColour(unsigned char *r, - unsigned char *g, - unsigned char *b, - unsigned char r2, - unsigned char g2, - unsigned char b2) const -{ - wxImageHistogram histogram; - - ComputeHistogram(histogram); - - return histogram.FindFirstUnusedColour(r, g, b, r2, g2, b2); -} - - - -// GRG, Dic/99 -// Counts and returns the number of different colours. Optionally stops -// when it exceeds 'stopafter' different colours. This is useful, for -// example, to see if the image can be saved as 8-bit (256 colour or -// less, in this case it would be invoked as CountColours(256)). Default -// value for stopafter is -1 (don't care). -// -unsigned long wxImage::CountColours( unsigned long stopafter ) const -{ - wxHashTable h; - wxObject dummy; - unsigned char r, g, b; - unsigned char *p; - unsigned long size, nentries, key; - - p = GetData(); - size = GetWidth() * GetHeight(); - nentries = 0; - - for (unsigned long j = 0; (j < size) && (nentries <= stopafter) ; j++) - { - r = *(p++); - g = *(p++); - b = *(p++); - key = wxImageHistogram::MakeKey(r, g, b); - - if (h.Get(key) == NULL) - { - h.Put(key, &dummy); - nentries++; - } - } - - return nentries; -} - - -unsigned long wxImage::ComputeHistogram( wxImageHistogram &h ) const -{ - unsigned char *p = GetData(); - unsigned long nentries = 0; - - h.clear(); - - const unsigned long size = GetWidth() * GetHeight(); - - unsigned char r, g, b; - for ( unsigned long n = 0; n < size; n++ ) - { - r = *p++; - g = *p++; - b = *p++; - - wxImageHistogramEntry& entry = h[wxImageHistogram::MakeKey(r, g, b)]; - - if ( entry.value++ == 0 ) - entry.index = nentries++; - } - - return nentries; -} - -/* - * Rotation code by Carlos Moreno - */ - -static const double wxROTATE_EPSILON = 1e-10; - -// Auxiliary function to rotate a point (x,y) with respect to point p0 -// make it inline and use a straight return to facilitate optimization -// also, the function receives the sine and cosine of the angle to avoid -// repeating the time-consuming calls to these functions -- sin/cos can -// be computed and stored in the calling function. - -static inline wxRealPoint -wxRotatePoint(const wxRealPoint& p, double cos_angle, double sin_angle, - const wxRealPoint& p0) -{ - return wxRealPoint(p0.x + (p.x - p0.x) * cos_angle - (p.y - p0.y) * sin_angle, - p0.y + (p.y - p0.y) * cos_angle + (p.x - p0.x) * sin_angle); -} - -static inline wxRealPoint -wxRotatePoint(double x, double y, double cos_angle, double sin_angle, - const wxRealPoint & p0) -{ - return wxRotatePoint (wxRealPoint(x,y), cos_angle, sin_angle, p0); -} - -wxImage wxImage::Rotate(double angle, - const wxPoint& centre_of_rotation, - bool interpolating, - wxPoint *offset_after_rotation) const -{ - // screen coordinates are a mirror image of "real" coordinates - angle = -angle; - - const bool has_alpha = HasAlpha(); - - const int w = GetWidth(); - const int h = GetHeight(); - - int i; - - // Create pointer-based array to accelerate access to wxImage's data - unsigned char ** data = new unsigned char * [h]; - data[0] = GetData(); - for (i = 1; i < h; i++) - data[i] = data[i - 1] + (3 * w); - - // Same for alpha channel - unsigned char ** alpha = NULL; - if (has_alpha) - { - alpha = new unsigned char * [h]; - alpha[0] = GetAlpha(); - for (i = 1; i < h; i++) - alpha[i] = alpha[i - 1] + w; - } - - // precompute coefficients for rotation formula - const double cos_angle = cos(angle); - const double sin_angle = sin(angle); - - // Create new Image to store the result - // First, find rectangle that covers the rotated image; to do that, - // rotate the four corners - - const wxRealPoint p0(centre_of_rotation.x, centre_of_rotation.y); - - wxRealPoint p1 = wxRotatePoint (0, 0, cos_angle, sin_angle, p0); - wxRealPoint p2 = wxRotatePoint (0, h, cos_angle, sin_angle, p0); - wxRealPoint p3 = wxRotatePoint (w, 0, cos_angle, sin_angle, p0); - wxRealPoint p4 = wxRotatePoint (w, h, cos_angle, sin_angle, p0); - - int x1a = (int) floor (wxMin (wxMin(p1.x, p2.x), wxMin(p3.x, p4.x))); - int y1a = (int) floor (wxMin (wxMin(p1.y, p2.y), wxMin(p3.y, p4.y))); - int x2a = (int) ceil (wxMax (wxMax(p1.x, p2.x), wxMax(p3.x, p4.x))); - int y2a = (int) ceil (wxMax (wxMax(p1.y, p2.y), wxMax(p3.y, p4.y))); - - // Create rotated image - wxImage rotated (x2a - x1a + 1, y2a - y1a + 1, false); - // With alpha channel - if (has_alpha) - rotated.SetAlpha(); - - if (offset_after_rotation != NULL) - { - *offset_after_rotation = wxPoint (x1a, y1a); - } - - // the rotated (destination) image is always accessed sequentially via this - // pointer, there is no need for pointer-based arrays here - unsigned char *dst = rotated.GetData(); - - unsigned char *alpha_dst = has_alpha ? rotated.GetAlpha() : NULL; - - // if the original image has a mask, use its RGB values as the blank pixel, - // else, fall back to default (black). - unsigned char blank_r = 0; - unsigned char blank_g = 0; - unsigned char blank_b = 0; - - if (HasMask()) - { - blank_r = GetMaskRed(); - blank_g = GetMaskGreen(); - blank_b = GetMaskBlue(); - rotated.SetMaskColour( blank_r, blank_g, blank_b ); - } - - // Now, for each point of the rotated image, find where it came from, by - // performing an inverse rotation (a rotation of -angle) and getting the - // pixel at those coordinates - - const int rH = rotated.GetHeight(); - const int rW = rotated.GetWidth(); - - // do the (interpolating) test outside of the loops, so that it is done - // only once, instead of repeating it for each pixel. - if (interpolating) - { - for (int y = 0; y < rH; y++) - { - for (int x = 0; x < rW; x++) - { - wxRealPoint src = wxRotatePoint (x + x1a, y + y1a, cos_angle, -sin_angle, p0); - - if (-0.25 < src.x && src.x < w - 0.75 && - -0.25 < src.y && src.y < h - 0.75) - { - // interpolate using the 4 enclosing grid-points. Those - // points can be obtained using floor and ceiling of the - // exact coordinates of the point - int x1, y1, x2, y2; - - if (0 < src.x && src.x < w - 1) - { - x1 = wxRound(floor(src.x)); - x2 = wxRound(ceil(src.x)); - } - else // else means that x is near one of the borders (0 or width-1) - { - x1 = x2 = wxRound (src.x); - } - - if (0 < src.y && src.y < h - 1) - { - y1 = wxRound(floor(src.y)); - y2 = wxRound(ceil(src.y)); - } - else - { - y1 = y2 = wxRound (src.y); - } - - // get four points and the distances (square of the distance, - // for efficiency reasons) for the interpolation formula - - // GRG: Do not calculate the points until they are - // really needed -- this way we can calculate - // just one, instead of four, if d1, d2, d3 - // or d4 are < wxROTATE_EPSILON - - const double d1 = (src.x - x1) * (src.x - x1) + (src.y - y1) * (src.y - y1); - const double d2 = (src.x - x2) * (src.x - x2) + (src.y - y1) * (src.y - y1); - const double d3 = (src.x - x2) * (src.x - x2) + (src.y - y2) * (src.y - y2); - const double d4 = (src.x - x1) * (src.x - x1) + (src.y - y2) * (src.y - y2); - - // Now interpolate as a weighted average of the four surrounding - // points, where the weights are the distances to each of those points - - // If the point is exactly at one point of the grid of the source - // image, then don't interpolate -- just assign the pixel - - // d1,d2,d3,d4 are positive -- no need for abs() - if (d1 < wxROTATE_EPSILON) - { - unsigned char *p = data[y1] + (3 * x1); - *(dst++) = *(p++); - *(dst++) = *(p++); - *(dst++) = *p; - - if (has_alpha) - *(alpha_dst++) = *(alpha[y1] + x1); - } - else if (d2 < wxROTATE_EPSILON) - { - unsigned char *p = data[y1] + (3 * x2); - *(dst++) = *(p++); - *(dst++) = *(p++); - *(dst++) = *p; - - if (has_alpha) - *(alpha_dst++) = *(alpha[y1] + x2); - } - else if (d3 < wxROTATE_EPSILON) - { - unsigned char *p = data[y2] + (3 * x2); - *(dst++) = *(p++); - *(dst++) = *(p++); - *(dst++) = *p; - - if (has_alpha) - *(alpha_dst++) = *(alpha[y2] + x2); - } - else if (d4 < wxROTATE_EPSILON) - { - unsigned char *p = data[y2] + (3 * x1); - *(dst++) = *(p++); - *(dst++) = *(p++); - *(dst++) = *p; - - if (has_alpha) - *(alpha_dst++) = *(alpha[y2] + x1); - } - else - { - // weights for the weighted average are proportional to the inverse of the distance - unsigned char *v1 = data[y1] + (3 * x1); - unsigned char *v2 = data[y1] + (3 * x2); - unsigned char *v3 = data[y2] + (3 * x2); - unsigned char *v4 = data[y2] + (3 * x1); - - const double w1 = 1/d1, w2 = 1/d2, w3 = 1/d3, w4 = 1/d4; - - // GRG: Unrolled. - - *(dst++) = (unsigned char) - ( (w1 * *(v1++) + w2 * *(v2++) + - w3 * *(v3++) + w4 * *(v4++)) / - (w1 + w2 + w3 + w4) ); - *(dst++) = (unsigned char) - ( (w1 * *(v1++) + w2 * *(v2++) + - w3 * *(v3++) + w4 * *(v4++)) / - (w1 + w2 + w3 + w4) ); - *(dst++) = (unsigned char) - ( (w1 * *v1 + w2 * *v2 + - w3 * *v3 + w4 * *v4) / - (w1 + w2 + w3 + w4) ); - - if (has_alpha) - { - v1 = alpha[y1] + (x1); - v2 = alpha[y1] + (x2); - v3 = alpha[y2] + (x2); - v4 = alpha[y2] + (x1); - - *(alpha_dst++) = (unsigned char) - ( (w1 * *v1 + w2 * *v2 + - w3 * *v3 + w4 * *v4) / - (w1 + w2 + w3 + w4) ); - } - } - } - else - { - *(dst++) = blank_r; - *(dst++) = blank_g; - *(dst++) = blank_b; - - if (has_alpha) - *(alpha_dst++) = 0; - } - } - } - } - else // not interpolating - { - for (int y = 0; y < rH; y++) - { - for (int x = 0; x < rW; x++) - { - wxRealPoint src = wxRotatePoint (x + x1a, y + y1a, cos_angle, -sin_angle, p0); - - const int xs = wxRound (src.x); // wxRound rounds to the - const int ys = wxRound (src.y); // closest integer - - if (0 <= xs && xs < w && 0 <= ys && ys < h) - { - unsigned char *p = data[ys] + (3 * xs); - *(dst++) = *(p++); - *(dst++) = *(p++); - *(dst++) = *p; - - if (has_alpha) - *(alpha_dst++) = *(alpha[ys] + (xs)); - } - else - { - *(dst++) = blank_r; - *(dst++) = blank_g; - *(dst++) = blank_b; - - if (has_alpha) - *(alpha_dst++) = 255; - } - } - } - } - - delete [] data; - delete [] alpha; - - return rotated; -} - - - - - -// A module to allow wxImage initialization/cleanup -// without calling these functions from app.cpp or from -// the user's application. - -class wxImageModule: public wxModule -{ - wxDECLARE_DYNAMIC_CLASS(wxImageModule); -public: - wxImageModule() {} - bool OnInit() wxOVERRIDE { wxImage::InitStandardHandlers(); return true; } - void OnExit() wxOVERRIDE { wxImage::CleanUpHandlers(); } -}; - -wxIMPLEMENT_DYNAMIC_CLASS(wxImageModule, wxModule); - - -#endif // wxUSE_IMAGE diff --git a/Externals/wxWidgets3/src/common/imagfill.cpp b/Externals/wxWidgets3/src/common/imagfill.cpp deleted file mode 100644 index 825d60715f..0000000000 --- a/Externals/wxWidgets3/src/common/imagfill.cpp +++ /dev/null @@ -1,322 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/imagfill.cpp -// Purpose: FloodFill for wxImage -// Author: Julian Smart -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_IMAGE && !defined(__WXMSW__) -// we have no use for this code in wxMSW... - -#ifndef WX_PRECOMP - #include "wx/brush.h" - #include "wx/dc.h" - #include "wx/dcmemory.h" - #include "wx/image.h" -#endif - -// DoFloodFill -// Fills with the colour extracted from fillBrush, starting at x,y until either -// a color different from the start pixel is reached (wxFLOOD_SURFACE) -// or fill color is reached (wxFLOOD_BORDER) - -static bool LINKAGEMODE MatchPixel(wxImage *img, int x, int y, int w, int h, const wxColour& c) -{ - if ((x<0)||(x>=w)||(y<0)||(y>=h)) return false; - - unsigned char r = img->GetRed(x,y); - unsigned char g = img->GetGreen(x,y); - unsigned char b = img->GetBlue(x,y); - return c.Red() == r && c.Green() == g && c.Blue() == b ; -} - -static bool LINKAGEMODE MatchBoundaryPixel(wxImage *img, int x, int y, int w, int h, const wxColour & fill, const wxColour& bound) -{ - if ((x<0)||(x>=w)||(y<0)||(y>=h)) return true; - - unsigned char r = img->GetRed(x,y); - unsigned char g = img->GetGreen(x,y); - unsigned char b = img->GetBlue(x,y); - if ( fill.Red() == r && fill.Green() == g && fill.Blue() == b ) - return true; - if ( bound.Red() == r && bound.Green() == g && bound.Blue() == b ) - return true; - return false; -} - - -static void LINKAGEMODE -wxImageFloodFill(wxImage *image, - wxCoord x, wxCoord y, const wxBrush & fillBrush, - const wxColour& testColour, int style) -{ - /* A diamond flood-fill using a circular queue system. - Each pixel surrounding the current pixel is added to - the queue if it meets the criteria, then is retrieved in - its turn. Code originally based on http://www.drawit.co.nz/Developers.htm, - with explicit permission to use this for wxWidgets granted by Andrew Empson - (no copyright claimed) - */ - - int width = image->GetWidth(); - int height = image->GetHeight(); - - //Draw using a pen made from the current brush colour - //Potentially allows us to use patterned flood fills in future code - wxColour fillColour = fillBrush.GetColour(); - unsigned char r = fillColour.Red(); - unsigned char g = fillColour.Green(); - unsigned char b = fillColour.Blue(); - - //initial test : - if (style == wxFLOOD_SURFACE) - { - //if wxFLOOD_SURFACE, if fill colour is same as required, we don't do anything - if ( image->GetRed(x,y) != r - || image->GetGreen(x,y) != g - || image->GetBlue (x,y) != b ) - { - //prepare memory for queue - //queue save, start, read - size_t *qs, *qst, *qr; - - //queue size (physical) - long qSz= height * width * 2; - qst = new size_t [qSz]; - - //temporary x and y locations - int xt, yt; - - for (int i=0; i < qSz; i++) - qst[i] = 0; - - // start queue - qs=qr=qst; - *qs=xt=x; - qs++; - *qs=yt=y; - qs++; - - image->SetRGB(xt,yt,r,g,b); - - //Main queue loop - while(qr!=qs) - { - //Add new members to queue - //Above current pixel - if(MatchPixel(image,xt,yt-1,width,height,testColour)) - { - *qs=xt; - qs++; - *qs=yt-1; - qs++; - image->SetRGB(xt,yt-1,r,g,b); - - //Loop back to beginning of queue - if(qs>=(qst+qSz)) qs=qst; - } - - //Below current pixel - if(MatchPixel(image,xt,yt+1,width,height,testColour)) - { - *qs=xt; - qs++; - *qs=yt+1; - qs++; - image->SetRGB(xt,yt+1,r,g,b); - if(qs>=(qst+qSz)) qs=qst; - } - - //Left of current pixel - if(MatchPixel(image,xt-1,yt,width,height,testColour)) - { - *qs=xt-1; - qs++; - *qs=yt; - qs++; - image->SetRGB(xt-1,yt,r,g,b); - if(qs>=(qst+qSz)) qs=qst; - } - - //Right of current pixel - if(MatchPixel(image,xt+1,yt,width,height,testColour)) - { - *qs=xt+1; - qs++; - *qs=yt; - qs++; - image->SetRGB(xt+1,yt,r,g,b); - if(qs>=(qst+qSz)) qs=qst; - } - - //Retrieve current queue member - qr+=2; - - //Loop back to the beginning - if(qr>=(qst+qSz)) qr=qst; - xt=*qr; - yt=*(qr+1); - - //Go Back to beginning of loop - } - - delete[] qst; - } - } - else - { - //style is wxFLOOD_BORDER - // fill up to testColor border - if already testColour don't do anything - if ( image->GetRed(x,y) != testColour.Red() - || image->GetGreen(x,y) != testColour.Green() - || image->GetBlue(x,y) != testColour.Blue() ) - { - //prepare memory for queue - //queue save, start, read - size_t *qs, *qst, *qr; - - //queue size (physical) - long qSz= height * width * 2; - qst = new size_t [qSz]; - - //temporary x and y locations - int xt, yt; - - for (int i=0; i < qSz; i++) - qst[i] = 0; - - // start queue - qs=qr=qst; - *qs=xt=x; - qs++; - *qs=yt=y; - qs++; - - image->SetRGB(xt,yt,r,g,b); - - //Main queue loop - while (qr!=qs) - { - //Add new members to queue - //Above current pixel - if(!MatchBoundaryPixel(image,xt,yt-1,width,height,fillColour,testColour)) - { - *qs=xt; - qs++; - *qs=yt-1; - qs++; - image->SetRGB(xt,yt-1,r,g,b); - - //Loop back to beginning of queue - if(qs>=(qst+qSz)) qs=qst; - } - - //Below current pixel - if(!MatchBoundaryPixel(image,xt,yt+1,width,height,fillColour,testColour)) - { - *qs=xt; - qs++; - *qs=yt+1; - qs++; - image->SetRGB(xt,yt+1,r,g,b); - if(qs>=(qst+qSz)) qs=qst; - } - - //Left of current pixel - if(!MatchBoundaryPixel(image,xt-1,yt,width,height,fillColour,testColour)) - { - *qs=xt-1; - qs++; - *qs=yt; - qs++; - image->SetRGB(xt-1,yt,r,g,b); - if(qs>=(qst+qSz)) qs=qst; - } - - //Right of current pixel - if(!MatchBoundaryPixel(image,xt+1,yt,width,height,fillColour,testColour)) - { - *qs=xt+1; - qs++; - *qs=yt; - qs++; - image->SetRGB(xt+1,yt,r,g,b); - if(qs>=(qst+qSz)) qs=qst; - } - - //Retrieve current queue member - qr+=2; - - //Loop back to the beginning - if(qr>=(qst+qSz)) qr=qst; - xt=*qr; - yt=*(qr+1); - - //Go Back to beginning of loop - } - - delete[] qst; - } - } - //all done, -} - - -bool wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y, - const wxColour& col, wxFloodFillStyle style) -{ - if (dc->GetBrush().IsTransparent()) - return true; - - int height = 0; - int width = 0; - dc->GetSize(&width, &height); - - //it would be nice to fail if we don't get a sensible size... - wxCHECK_MSG(width >= 1 && height >= 1, false, - wxT("In FloodFill, dc.GetSize routine failed, method not supported by this DC")); - - const int x_dev = dc->LogicalToDeviceX(x); - const int y_dev = dc->LogicalToDeviceY(y); - - // if start point is outside dc, can't do anything - if (!wxRect(0, 0, width, height).Contains(x_dev, y_dev)) - return false; - - wxBitmap bitmap(width, height); - wxMemoryDC memdc(bitmap); - // match dc scales - double sx, sy; - dc->GetUserScale(&sx, &sy); - memdc.SetUserScale(sx, sy); - dc->GetLogicalScale(&sx, &sy); - memdc.SetLogicalScale(sx, sy); - - // get logical size and origin - const int w_log = dc->DeviceToLogicalXRel(width); - const int h_log = dc->DeviceToLogicalYRel(height); - const int x0_log = dc->DeviceToLogicalX(0); - const int y0_log = dc->DeviceToLogicalY(0); - - memdc.Blit(0, 0, w_log, h_log, dc, x0_log, y0_log); - memdc.SelectObject(wxNullBitmap); - - wxImage image = bitmap.ConvertToImage(); - wxImageFloodFill(&image, x_dev, y_dev, dc->GetBrush(), col, style); - bitmap = wxBitmap(image); - memdc.SelectObject(bitmap); - dc->Blit(x0_log, y0_log, w_log, h_log, &memdc, 0, 0); - - return true; -} - -#endif // wxUSE_IMAGE diff --git a/Externals/wxWidgets3/src/common/imaggif.cpp b/Externals/wxWidgets3/src/common/imaggif.cpp deleted file mode 100644 index c75775fb15..0000000000 --- a/Externals/wxWidgets3/src/common/imaggif.cpp +++ /dev/null @@ -1,808 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/imaggif.cpp -// Purpose: wxGIFHandler -// Author: Vaclav Slavik, Guillermo Rodriguez Garcia, Gershon Elber, Troels K -// Copyright: (c) 1999-2011 Vaclav Slavik, Guillermo Rodriguez Garcia, Gershon Elber, Troels K -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_IMAGE && wxUSE_GIF - -#ifndef WX_PRECOMP - #include "wx/intl.h" - #include "wx/log.h" - #include "wx/palette.h" - #include "wx/utils.h" -#endif - -#include "wx/imaggif.h" -#include "wx/gifdecod.h" -#include "wx/stream.h" -#include "wx/anidecod.h" // wxImageArray -#include "wx/scopedarray.h" - -#define GIF89_HDR "GIF89a" -#define NETSCAPE_LOOP "NETSCAPE2.0" - -// see members.aol.com/royalef/gifabout.htm -// members.aol.com/royalef/gif89a.txt - -enum -{ - GIF_MARKER_EXT = '!', // 0x21 - GIF_MARKER_SEP = ',', // 0x2C - GIF_MARKER_ENDOFDATA = ';', // 0x3B - - GIF_MARKER_EXT_GRAPHICS_CONTROL = 0xF9, - GIF_MARKER_EXT_COMMENT = 0xFE, - GIF_MARKER_EXT_APP = 0xFF -}; - -#define LZ_MAX_CODE 4095 // Biggest code possible in 12 bits. -#define FLUSH_OUTPUT 4096 // Impossible code, to signal flush. -#define FIRST_CODE 4097 // Impossible code, to signal first. - -#define HT_SIZE 8192 // 12bits = 4096 or twice as big! -#define HT_KEY_MASK 0x1FFF // 13bits keys - -#define HT_GET_KEY(l) (l >> 12) -#define HT_GET_CODE(l) (l & 0x0FFF) -#define HT_PUT_KEY(l) (l << 12) -#define HT_PUT_CODE(l) (l & 0x0FFF) - -struct wxRGB -{ - wxUint8 red; - wxUint8 green; - wxUint8 blue; -}; - -struct GifHashTableType -{ - wxUint32 HTable[HT_SIZE]; -}; - -wxIMPLEMENT_DYNAMIC_CLASS(wxGIFHandler,wxImageHandler); - -//---------------------------------------------------------------------------- -// Forward declarations -//---------------------------------------------------------------------------- - -static int wxGIFHandler_KeyItem(unsigned long item); - -#if wxUSE_STREAMS - -static int wxGIFHandler_BitSize(int n); - -#if wxUSE_PALETTE -static bool wxGIFHandler_GetPalette(const wxImage& image, - wxRGB *pal, int *palCount, int *mask_index); -#endif -static -int wxGIFHandler_PaletteFind(const wxRGB& clr, const wxRGB *array, int count); - -static bool wxGIFHandler_Write(wxOutputStream *, const void *buf, size_t len); -static bool wxGIFHandler_WriteByte(wxOutputStream *, wxUint8); -static bool wxGIFHandler_WriteWord(wxOutputStream *, wxUint16); -static bool wxGIFHandler_WriteHeader(wxOutputStream *, int width, int height, - bool loop, const wxRGB *pal, int palCount); -static bool wxGIFHandler_WriteRect(wxOutputStream *, int width, int height); -#if wxUSE_PALETTE -static bool wxGIFHandler_WriteTerm(wxOutputStream *); -#endif -static bool wxGIFHandler_WriteZero(wxOutputStream *); -static bool wxGIFHandler_WritePalette(wxOutputStream *, - const wxRGB *pal, size_t palCount, int bpp); -static bool wxGIFHandler_WriteControl(wxOutputStream *, - int maskIndex, int delayMilliSecs); -static bool wxGIFHandler_WriteComment(wxOutputStream *, const wxString&); -static bool wxGIFHandler_WriteLoop(wxOutputStream *); - -static bool wxGIFHandler_BufferedOutput(wxOutputStream *, wxUint8 *buf, int c); -#endif // wxUSE_STREAMS - -//----------------------------------------------------------------------------- -// wxGIFHandler -//----------------------------------------------------------------------------- - -#if wxUSE_STREAMS - -bool wxGIFHandler::LoadFile(wxImage *image, wxInputStream& stream, - bool verbose, int index) -{ - wxGIFDecoder decod; - switch ( decod.LoadGIF(stream) ) - { - case wxGIF_OK: - break; - - case wxGIF_INVFORMAT: - if ( verbose ) - wxLogError(_("GIF: error in GIF image format.")); - return false; - - case wxGIF_MEMERR: - if ( verbose ) - wxLogError(_("GIF: not enough memory.")); - return false; - - case wxGIF_TRUNCATED: - if ( verbose ) - wxLogError(_("GIF: data stream seems to be truncated.")); - - // go on; image data is OK - break; - } - - return decod.ConvertToImage(index != -1 ? (size_t)index : 0, image); -} - -bool wxGIFHandler::SaveFile(wxImage *image, - wxOutputStream& stream, bool verbose) -{ -#if wxUSE_PALETTE - wxRGB pal[256]; - int palCount; - int maskIndex; - - return wxGIFHandler_GetPalette(*image, pal, &palCount, &maskIndex) - && DoSaveFile(*image, &stream, verbose, true /*first?*/, 0, - false /*loop?*/, pal, palCount, maskIndex) - && wxGIFHandler_WriteTerm(&stream); -#else - wxUnusedVar(image); - wxUnusedVar(stream); - wxUnusedVar(verbose); - return false; -#endif -} - -bool wxGIFHandler::DoCanRead( wxInputStream& stream ) -{ - wxGIFDecoder decod; - return decod.CanRead(stream); - // it's ok to modify the stream position here -} - -int wxGIFHandler::DoGetImageCount( wxInputStream& stream ) -{ - wxGIFDecoder decod; - wxGIFErrorCode error = decod.LoadGIF(stream); - if ( (error != wxGIF_OK) && (error != wxGIF_TRUNCATED) ) - return -1; - - // NOTE: this function modifies the current stream position but it's ok - // (see wxImageHandler::GetImageCount) - - return decod.GetFrameCount(); -} - -bool wxGIFHandler::DoSaveFile(const wxImage& image, wxOutputStream *stream, - bool WXUNUSED(verbose), bool first, int delayMilliSecs, bool loop, - const wxRGB *pal, int palCount, int maskIndex) -{ - const unsigned long colorcount = image.CountColours(256+1); - bool ok = colorcount && (colorcount <= 256); - if (!ok) - { - return false; - } - - int width = image.GetWidth(); - int height = image.GetHeight(); - wxCHECK_MSG( width && height, false, wxS("can't save 0-sized file") ); - - int width_even = width + ((width % 2) ? 1 : 0); - - if (first) - { - ok = wxGIFHandler_WriteHeader(stream, width, height, loop, - pal, palCount); - } - - ok = ok - && wxGIFHandler_WriteComment(stream, - image.GetOption(wxIMAGE_OPTION_GIF_COMMENT)) - && wxGIFHandler_WriteControl(stream, maskIndex, delayMilliSecs) - && wxGIFHandler_WriteByte(stream, GIF_MARKER_SEP) - && wxGIFHandler_WriteRect(stream, width, height); - - // local palette - if (first) - { - // we already saved the (global) palette - ok = ok && wxGIFHandler_WriteZero(stream); - } - else - { - const int bpp = wxGIFHandler_BitSize(palCount); - wxUint8 b; - - b = 0x80; - b |=(bpp - 1) << 5; - b |=(bpp - 1); - b &=~0x40; // clear interlaced - - ok = ok && wxGIFHandler_WriteByte(stream, b) - && wxGIFHandler_WritePalette(stream, pal, palCount, bpp); - } - - if (!ok) - { - return false; - } - - if (!InitHashTable()) - { - wxLogError(_("Couldn't initialize GIF hash table.")); - return false; - } - - const wxUint8 *src = image.GetData(); - wxScopedArray eightBitData(width); - - SetupCompress(stream, 8); - - m_pixelCount = height * width_even; - for (int y = 0; y < height; y++) - { - m_pixelCount -= width_even; - for (int x = 0; x < width; x++) - { - wxRGB rgb; - rgb.red = src[0]; - rgb.green = src[1]; - rgb.blue = src[2]; - int index = wxGIFHandler_PaletteFind(rgb, pal, palCount); - wxASSERT(index != wxNOT_FOUND); - eightBitData[x] = (wxUint8)index; - src+=3; - } - - ok = CompressLine(stream, eightBitData.get(), width); - if (!ok) - { - break; - } - } - - wxDELETE(m_hashTable); - - return ok; -} - -bool wxGIFHandler::SaveAnimation(const wxImageArray& images, - wxOutputStream *stream, bool verbose, int delayMilliSecs) -{ -#if wxUSE_PALETTE - bool ok = true; - size_t i; - - wxSize size(0,0); - for (i = 0; (i < images.GetCount()) && ok; i++) - { - const wxImage& image = images.Item(i); - wxSize temp(image.GetWidth(), image.GetHeight()); - ok = ok && image.HasPalette(); - if (i) - { - ok = ok && (size == temp); - } - else - { - size = temp; - } - } - - for (i = 0; (i < images.GetCount()) && ok; i++) - { - const wxImage& image = images.Item(i); - - wxRGB pal[256]; - int palCount; - int maskIndex; - - ok = wxGIFHandler_GetPalette(image, pal, &palCount, &maskIndex) - && DoSaveFile(image, stream, verbose, i == 0 /*first?*/, delayMilliSecs, - true /*loop?*/, pal, palCount, maskIndex); - } - - return ok && wxGIFHandler_WriteTerm(stream); -#else - wxUnusedVar(images); - wxUnusedVar(stream); - wxUnusedVar(verbose); - wxUnusedVar(delayMilliSecs); - - return false; -#endif -} - -bool wxGIFHandler::CompressOutput(wxOutputStream *stream, int code) -{ - if (code == FLUSH_OUTPUT) - { - while (m_crntShiftState > 0) - { - // Get rid of what is left in DWord, and flush it. - if (!wxGIFHandler_BufferedOutput(stream, m_LZBuf, - m_crntShiftDWord & 0xff)) - { - return false; - } - m_crntShiftDWord >>= 8; - m_crntShiftState -= 8; - } - m_crntShiftState = 0; // For next time. - if (!wxGIFHandler_BufferedOutput(stream, m_LZBuf, FLUSH_OUTPUT)) - { - return false; - } - } - else - { - m_crntShiftDWord |= ((long) code) << m_crntShiftState; - m_crntShiftState += m_runningBits; - while (m_crntShiftState >= 8) - { - // Dump out full bytes: - if (!wxGIFHandler_BufferedOutput(stream, m_LZBuf, - m_crntShiftDWord & 0xff)) - { - return false; - } - m_crntShiftDWord >>= 8; - m_crntShiftState -= 8; - } - } - - // If code can't fit into RunningBits bits, must raise its size. Note - // however that codes above LZ_MAX_CODE are used for special signaling. - if ( (m_runningCode >= m_maxCode1) && (code <= LZ_MAX_CODE)) - { - m_maxCode1 = 1 << ++m_runningBits; - } - return true; -} - -bool wxGIFHandler::SetupCompress(wxOutputStream *stream, int bpp) -{ - m_LZBuf[0] = 0; // Nothing was output yet. - m_clearCode = (1 << bpp); - m_EOFCode = m_clearCode + 1; - m_runningCode = m_EOFCode + 1; - m_runningBits = bpp + 1; // Number of bits per code. - m_maxCode1 = 1 << m_runningBits; // Max. code + 1. - m_crntCode = FIRST_CODE; // Signal that this is first one! - m_crntShiftState = 0; // No information in CrntShiftDWord. - m_crntShiftDWord = 0; - - // Clear hash table and send Clear to make sure the decoder does the same. - ClearHashTable(); - - return wxGIFHandler_WriteByte(stream, (wxUint8)bpp) - && CompressOutput(stream, m_clearCode); -} - -bool wxGIFHandler::CompressLine(wxOutputStream *stream, - const wxUint8 *line, int lineLen) -{ - int i = 0, crntCode, newCode; - unsigned long newKey; - wxUint8 pixel; - if (m_crntCode == FIRST_CODE) // It's first time! - crntCode = line[i++]; - else - crntCode = m_crntCode; // Get last code in compression. - - while (i < lineLen) - { - // Decode lineLen items. - pixel = line[i++]; // Get next pixel from stream. - // Form a new unique key to search hash table for the code combines - // crntCode as Prefix string with Pixel as postfix char. - newKey = (((unsigned long) crntCode) << 8) + pixel; - if ((newCode = ExistsHashTable(newKey)) >= 0) - { - // This Key is already there, or the string is old one, so - // simply take new code as our crntCode: - crntCode = newCode; - } - else - { - // Put it in hash table, output the prefix code, and make our - // crntCode equal to Pixel. - if (!CompressOutput(stream, crntCode)) - { - return false; - } - - crntCode = pixel; - - // If however the HashTable is full, we send a clear first and - // Clear the hash table. - if (m_runningCode >= LZ_MAX_CODE) - { - // Time to do some clearance: - if (!CompressOutput(stream, m_clearCode)) - { - return false; - } - - m_runningCode = m_EOFCode + 1; - m_runningBits = 8 + 1; - m_maxCode1 = 1 << m_runningBits; - ClearHashTable(); - } - else - { - // Put this unique key with its relative Code in hash table: - InsertHashTable(newKey, m_runningCode++); - } - } - } - // Preserve the current state of the compression algorithm: - m_crntCode = crntCode; - if (m_pixelCount == 0) - { - // We are done - output last Code and flush output buffers: - if (!CompressOutput(stream, crntCode) - || !CompressOutput(stream, m_EOFCode) - || !CompressOutput(stream, FLUSH_OUTPUT)) - { - return false; - } - } - - return true; -} - -#endif // wxUSE_STREAMS - -bool wxGIFHandler::InitHashTable() -{ - if (!m_hashTable) - { - m_hashTable = new GifHashTableType(); - } - - if (!m_hashTable) - { - return false; - } - - ClearHashTable(); - - return true; -} - -void wxGIFHandler::ClearHashTable() -{ - int index = HT_SIZE; - wxUint32 *HTable = m_hashTable->HTable; - - while (--index>=0) - { - HTable[index] = 0xfffffffful; - } -} - -void wxGIFHandler::InsertHashTable(unsigned long key, int code) -{ - int hKey = wxGIFHandler_KeyItem(key); - wxUint32 *HTable = m_hashTable->HTable; - - while (HT_GET_KEY(HTable[hKey]) != 0xFFFFFL) - { - hKey = (hKey + 1) & HT_KEY_MASK; - } - HTable[hKey] = HT_PUT_KEY(key) | HT_PUT_CODE(code); -} - - -int wxGIFHandler::ExistsHashTable(unsigned long key) -{ - int hKey = wxGIFHandler_KeyItem(key); - wxUint32 *HTable = m_hashTable->HTable, HTKey; - - while ((HTKey = HT_GET_KEY(HTable[hKey])) != 0xFFFFFL) - { - if (key == HTKey) - { - return HT_GET_CODE(HTable[hKey]); - } - hKey = (hKey + 1) & HT_KEY_MASK; - } - return -1; -} - -// --------------------------------------------------------------------------- -// implementation of global private functions -// --------------------------------------------------------------------------- - -int wxGIFHandler_KeyItem(unsigned long item) -{ - return ((item >> 12) ^ item) & HT_KEY_MASK; -} - -#if wxUSE_STREAMS - -int wxGIFHandler_BitSize(int n) -{ - int i; - for (i = 1; i <= 8; i++) - { - if ((1 << i) >= n) - { - break; - } - } - return i; -} - -#if wxUSE_PALETTE -bool wxGIFHandler_GetPalette(const wxImage& image, - wxRGB *pal, int *pPalCount, int *pMaskIndex) -{ - if (!image.HasPalette()) - { - return false; - } - - const wxPalette& palette = image.GetPalette(); - int palCount = palette.GetColoursCount(); - - for (int i = 0; i < palCount; ++i) - { - if (!palette.GetRGB(i, &pal[i].red, &pal[i].green, &pal[i].blue)) - { - break; - } - } - if (image.HasMask()) - { - wxRGB mask; - - mask.red = image.GetMaskRed(); - mask.green = image.GetMaskGreen(); - mask.blue = image.GetMaskBlue(); - *pMaskIndex = wxGIFHandler_PaletteFind(mask, pal, palCount); - if ( (*pMaskIndex == wxNOT_FOUND) && (palCount < 256)) - { - *pMaskIndex = palCount; - pal[palCount++] = mask; - } - } - else - { - *pMaskIndex = wxNOT_FOUND; - } - *pPalCount = palCount; - - return true; -} -#endif // wxUSE_PALETTE - -int wxGIFHandler_PaletteFind(const wxRGB& clr, const wxRGB *array, int count) -{ - for (int i = 0; i < count; i++) - { - if ( (clr.red == array[i].red) - && (clr.green == array[i].green) - && (clr.blue == array[i].blue)) - { - return i; - } - } - - return wxNOT_FOUND; -} - -bool wxGIFHandler_Write(wxOutputStream *stream, const void *buf, size_t len) -{ - return (len == stream->Write(buf, len).LastWrite()); -} - -bool wxGIFHandler_WriteByte(wxOutputStream *stream, wxUint8 byte) -{ - return wxGIFHandler_Write(stream, &byte, sizeof(byte)); -} - -bool wxGIFHandler_WriteWord(wxOutputStream *stream, wxUint16 word) -{ - wxUint8 buf[2]; - - buf[0] = word & 0xff; - buf[1] = (word >> 8) & 0xff; - return wxGIFHandler_Write(stream, &buf, sizeof(buf)); -} - -bool wxGIFHandler_WriteHeader(wxOutputStream *stream, int width, int height, - bool loop, const wxRGB *pal, int palCount) -{ - const int bpp = wxGIFHandler_BitSize(palCount); - wxUint8 buf[3]; - - bool ok = wxGIFHandler_Write(stream, GIF89_HDR, sizeof(GIF89_HDR)-1) - && wxGIFHandler_WriteWord(stream, (wxUint16) width) - && wxGIFHandler_WriteWord(stream, (wxUint16) height); - - buf[0] = 0x80; - buf[0] |=(bpp - 1) << 5; - buf[0] |=(bpp - 1); - buf[1] = 0; // background color == entry 0 - buf[2] = 0; // aspect ratio 1:1 - ok = ok && wxGIFHandler_Write(stream, buf, sizeof(buf)) - && wxGIFHandler_WritePalette(stream, pal, palCount, bpp); - - if (loop) - { - ok = ok && wxGIFHandler_WriteLoop(stream); - } - - return ok; -} - -bool wxGIFHandler_WriteRect(wxOutputStream *stream, int width, int height) -{ - return wxGIFHandler_WriteWord(stream, 0) // left - && wxGIFHandler_WriteWord(stream, 0) // top - && wxGIFHandler_WriteWord(stream, (wxUint16) width) - && wxGIFHandler_WriteWord(stream, (wxUint16) height); -} - -#if wxUSE_PALETTE -bool wxGIFHandler_WriteTerm(wxOutputStream *stream) -{ - return wxGIFHandler_WriteByte(stream, GIF_MARKER_ENDOFDATA); -} -#endif - -bool wxGIFHandler_WriteZero(wxOutputStream *stream) -{ - return wxGIFHandler_WriteByte(stream, 0); -} - -bool wxGIFHandler_WritePalette(wxOutputStream *stream, - const wxRGB *array, size_t count, int bpp) -{ - wxUint8 buf[3]; - for (int i = 0; (i < (1 << bpp)); i++) - { - if (i < (int)count) - { - buf[0] = array[i].red; - buf[1] = array[i].green; - buf[2] = array[i].blue; - } - else - { - buf[0] = buf[1] = buf[2] = 0; - } - - if ( !wxGIFHandler_Write(stream, buf, sizeof(buf)) ) - { - return false; - } - } - - return true; -} - -bool wxGIFHandler_WriteControl(wxOutputStream *stream, - int maskIndex, int delayMilliSecs) -{ - wxUint8 buf[8]; - const wxUint16 delay = delayMilliSecs / 10; - - buf[0] = GIF_MARKER_EXT; // extension marker - buf[1] = GIF_MARKER_EXT_GRAPHICS_CONTROL; - buf[2] = 4; // length of block - buf[3] = (maskIndex != wxNOT_FOUND) ? 1 : 0; // has transparency - buf[4] = delay & 0xff; // delay time - buf[5] = (delay >> 8) & 0xff; // delay time second byte - buf[6] = (maskIndex != wxNOT_FOUND) ? (wxUint8) maskIndex : 0; - buf[7] = 0; - return wxGIFHandler_Write(stream, buf, sizeof(buf)); -} - -bool wxGIFHandler_WriteComment(wxOutputStream *stream, const wxString& comment) -{ - if ( comment.empty() ) - { - return true; - } - - // Write comment header. - wxUint8 buf[2]; - buf[0] = GIF_MARKER_EXT; - buf[1] = GIF_MARKER_EXT_COMMENT; - if ( !wxGIFHandler_Write(stream, buf, sizeof(buf)) ) - { - return false; - } - - /* - If comment is longer than 255 bytes write it in blocks of maximum 255 - bytes each. - */ - wxCharBuffer text( comment.mb_str() ); - - size_t pos = 0, fullLength = text.length(); - - do - { - size_t blockLength = wxMin(fullLength - pos, 255); - - if ( !wxGIFHandler_WriteByte(stream, (wxUint8) blockLength) - || !wxGIFHandler_Write(stream, &text.data()[pos], blockLength) ) - { - return false; - } - - pos += blockLength; - }while (pos < fullLength); - - - // Write comment footer. - return wxGIFHandler_WriteZero(stream); -} - -bool wxGIFHandler_WriteLoop(wxOutputStream *stream) -{ - wxUint8 buf[4]; - const int loopcount = 0; // infinite - - buf[0] = GIF_MARKER_EXT; - buf[1] = GIF_MARKER_EXT_APP; - buf[2] = 0x0B; - bool ok = wxGIFHandler_Write(stream, buf, 3) - && wxGIFHandler_Write(stream, NETSCAPE_LOOP, sizeof(NETSCAPE_LOOP)-1); - - buf[0] = 3; - buf[1] = 1; - buf[2] = loopcount & 0xFF; - buf[3] = loopcount >> 8; - - return ok && wxGIFHandler_Write(stream, buf, 4) - && wxGIFHandler_WriteZero(stream); -} - -bool wxGIFHandler_BufferedOutput(wxOutputStream *stream, wxUint8 *buf, int c) -{ - bool ok = true; - - if (c == FLUSH_OUTPUT) - { - // Flush everything out. - if (buf[0]) - { - ok = wxGIFHandler_Write(stream, buf, buf[0]+1); - } - // Mark end of compressed data, by an empty block (see GIF doc): - wxGIFHandler_WriteZero(stream); - } - else - { - if (buf[0] == 255) - { - // Dump out this buffer - it is full: - ok = wxGIFHandler_Write(stream, buf, buf[0] + 1); - buf[0] = 0; - } - buf[++buf[0]] = c; - } - - return ok; -} - -#endif // wxUSE_STREAMS - -#endif // wxUSE_IMAGE && wxUSE_GIF diff --git a/Externals/wxWidgets3/src/common/imagiff.cpp b/Externals/wxWidgets3/src/common/imagiff.cpp deleted file mode 100644 index 0b5558d5bd..0000000000 --- a/Externals/wxWidgets3/src/common/imagiff.cpp +++ /dev/null @@ -1,789 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/imagiff.cpp -// Purpose: wxImage handler for Amiga IFF images -// Author: Steffen Gutmann, Thomas Meyer -// Copyright: (c) Steffen Gutmann, 2002 -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// Parts of this source are based on the iff loading algorithm found -// in xviff.c. Permission by the original author, Thomas Meyer, and -// by the author of xv, John Bradley for using the iff loading part -// in wxWidgets has been gratefully given. - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_IMAGE && wxUSE_IFF - -#ifndef WX_PRECOMP - #include "wx/log.h" - #include "wx/intl.h" -#endif - -#include "wx/imagiff.h" -#include "wx/wfstream.h" - -#if wxUSE_PALETTE - #include "wx/palette.h" -#endif // wxUSE_PALETTE - -#include -#include - - -// -------------------------------------------------------------------------- -// Constants -// -------------------------------------------------------------------------- - -// Error codes: -// Note that the error code wxIFF_TRUNCATED means that the image itself -// is most probably OK, but the decoder didn't reach the end of the data -// stream; this means that if it was not reading directly from file, -// the stream will not be correctly positioned. -// - -enum -{ - wxIFF_OK = 0, /* everything was OK */ - wxIFF_INVFORMAT, /* error in iff header */ - wxIFF_MEMERR, /* error allocating memory */ - wxIFF_TRUNCATED /* file appears to be truncated */ -}; - -// -------------------------------------------------------------------------- -// wxIFFDecoder class -// -------------------------------------------------------------------------- - -// internal class for storing IFF image data -class IFFImage -{ -public: - unsigned int w; /* width */ - unsigned int h; /* height */ - int transparent; /* transparent color (-1 = none) */ - int colors; /* number of colors */ - unsigned char *p; /* bitmap */ - unsigned char *pal; /* palette */ - - IFFImage() : w(0), h(0), colors(0), p(0), pal(0) {} - ~IFFImage() { delete [] p; delete [] pal; } -}; - -class WXDLLEXPORT wxIFFDecoder -{ -private: - IFFImage *m_image; // image data - wxInputStream *m_f; // input stream - unsigned char *databuf; - unsigned char *decomp_mem; - - void Destroy(); - -public: - // get data of current frame - unsigned char* GetData() const; - unsigned char* GetPalette() const; - int GetNumColors() const; - unsigned int GetWidth() const; - unsigned int GetHeight() const; - int GetTransparentColour() const; - - // constructor, destructor, etc. - wxIFFDecoder(wxInputStream *s); - ~wxIFFDecoder() { Destroy(); } - - // NOTE: this function modifies the current stream position - bool CanRead(); - - int ReadIFF(); - bool ConvertToImage(wxImage *image) const; -}; - - -//--------------------------------------------------------------------------- -// wxIFFDecoder constructor and destructor -//--------------------------------------------------------------------------- - -wxIFFDecoder::wxIFFDecoder(wxInputStream *s) -{ - m_f = s; - m_image = 0; - databuf = 0; - decomp_mem = 0; -} - -void wxIFFDecoder::Destroy() -{ - wxDELETE(m_image); - wxDELETEA(databuf); - wxDELETEA(decomp_mem); -} - -//--------------------------------------------------------------------------- -// Convert this image to a wxImage object -//--------------------------------------------------------------------------- - -// This function was designed by Vaclav Slavik - -bool wxIFFDecoder::ConvertToImage(wxImage *image) const -{ - // just in case... - image->Destroy(); - - // create the image - image->Create(GetWidth(), GetHeight()); - - if (!image->IsOk()) - return false; - - unsigned char *pal = GetPalette(); - unsigned char *src = GetData(); - unsigned char *dst = image->GetData(); - int colors = GetNumColors(); - int transparent = GetTransparentColour(); - long i; - - // set transparent colour mask - if (transparent != -1) - { - for (i = 0; i < colors; i++) - { - if ((pal[3 * i + 0] == 255) && - (pal[3 * i + 1] == 0) && - (pal[3 * i + 2] == 255)) - { - pal[3 * i + 2] = 254; - } - } - - pal[3 * transparent + 0] = 255, - pal[3 * transparent + 1] = 0, - pal[3 * transparent + 2] = 255; - - image->SetMaskColour(255, 0, 255); - } - else - image->SetMask(false); - -#if wxUSE_PALETTE - if (pal && colors > 0) - { - unsigned char* r = new unsigned char[colors]; - unsigned char* g = new unsigned char[colors]; - unsigned char* b = new unsigned char[colors]; - - for (i = 0; i < colors; i++) - { - r[i] = pal[3*i + 0]; - g[i] = pal[3*i + 1]; - b[i] = pal[3*i + 2]; - } - - image->SetPalette(wxPalette(colors, r, g, b)); - - delete [] r; - delete [] g; - delete [] b; - } -#endif // wxUSE_PALETTE - - // copy image data - for (i = 0; i < (long)(GetWidth() * GetHeight()); i++, src += 3, dst += 3) - { - dst[0] = src[0]; - dst[1] = src[1]; - dst[2] = src[2]; - } - - return true; -} - - -//--------------------------------------------------------------------------- -// Data accessors -//--------------------------------------------------------------------------- - -// Get data for current frame - -unsigned char* wxIFFDecoder::GetData() const { return (m_image->p); } -unsigned char* wxIFFDecoder::GetPalette() const { return (m_image->pal); } -int wxIFFDecoder::GetNumColors() const { return m_image->colors; } -unsigned int wxIFFDecoder::GetWidth() const { return (m_image->w); } -unsigned int wxIFFDecoder::GetHeight() const { return (m_image->h); } -int wxIFFDecoder::GetTransparentColour() const { return m_image->transparent; } - -//--------------------------------------------------------------------------- -// IFF reading and decoding -//--------------------------------------------------------------------------- - -// -// CanRead: -// Returns true if the file looks like a valid IFF, false otherwise. -// -bool wxIFFDecoder::CanRead() -{ - unsigned char buf[12]; - - if ( !m_f->Read(buf, WXSIZEOF(buf)) ) - return false; - - return (memcmp(buf, "FORM", 4) == 0) && (memcmp(buf+8, "ILBM", 4) == 0); -} - - -// ReadIFF: -// Based on xv source code by Thomas Meyer -// Permission for use in wxWidgets has been gratefully given. - -typedef unsigned char byte; - -/************************************************************************* -void decomprle(source, destination, source length, buffer size) - -Decompress run-length encoded data from source to destination. Terminates -when source is decoded completely or destination buffer is full. - -The decruncher is as optimized as I could make it, without risking -safety in case of corrupt BODY chunks. -**************************************************************************/ - -static void decomprle(const byte *sptr, byte *dptr, long slen, long dlen) -{ - byte codeByte, dataByte; - - while ((slen > 0) && (dlen > 0)) { - // read control byte - codeByte = *sptr++; - - if (codeByte < 0x80) { - codeByte++; - if ((slen > (long) codeByte) && (dlen >= (long) codeByte)) { - slen -= codeByte + 1; - dlen -= codeByte; - while (codeByte > 0) { - *dptr++ = *sptr++; - codeByte--; - } - } - else slen = 0; - } - - else if (codeByte > 0x80) { - codeByte = 0x81 - (codeByte & 0x7f); - if ((slen > (long) 0) && (dlen >= (long) codeByte)) { - dataByte = *sptr++; - slen -= 2; - dlen -= codeByte; - while (codeByte > 0) { - *dptr++ = dataByte; - codeByte--; - } - } - else slen = 0; - } - } -} - -/******************************************/ -static unsigned int iff_getword(const byte *ptr) -{ - unsigned int v; - - v = *ptr++; - v = (v << 8) + *ptr; - return v; -} - -/******************************************/ -static unsigned long iff_getlong(const byte *ptr) -{ - unsigned long l; - - l = *ptr++; - l = (l << 8) + *ptr++; - l = (l << 8) + *ptr++; - l = (l << 8) + *ptr; - return l; -} - -// Define internal ILBM types -#define ILBM_NORMAL 0 -#define ILBM_EHB 1 -#define ILBM_HAM 2 -#define ILBM_HAM8 3 -#define ILBM_24BIT 4 - -int wxIFFDecoder::ReadIFF() -{ - Destroy(); - - m_image = new IFFImage(); - if (m_image == 0) { - Destroy(); - return wxIFF_MEMERR; - } - - // compute file length - wxFileOffset currentPos = m_f->TellI(); - if (m_f->SeekI(0, wxFromEnd) == wxInvalidOffset) { - Destroy(); - return wxIFF_MEMERR; - } - - long filesize = m_f->TellI(); - if (m_f->SeekI(currentPos, wxFromStart) == wxInvalidOffset) { - Destroy(); - return wxIFF_MEMERR; - } - - // allocate memory for complete file - if ((databuf = new byte[filesize]) == 0) { - Destroy(); - return wxIFF_MEMERR; - } - - m_f->Read(databuf, filesize); - const byte *dataend = databuf + filesize; - - // initialize work pointer. used to trace the buffer for IFF chunks - const byte *dataptr = databuf; - - // check for minmal size - if (dataptr + 12 > dataend) { - Destroy(); - return wxIFF_INVFORMAT; - } - - // check if we really got an IFF file - if (strncmp((char *)dataptr, "FORM", 4) != 0) { - Destroy(); - return wxIFF_INVFORMAT; - } - - dataptr = dataptr + 8; // skip ID and length of FORM - - // check if the IFF file is an ILBM (picture) file - if (strncmp((char *) dataptr, "ILBM", 4) != 0) { - Destroy(); - return wxIFF_INVFORMAT; - } - - wxLogTrace(wxT("iff"), wxT("IFF ILBM file recognized")); - - dataptr = dataptr + 4; // skip ID - - // - // main decoding loop. searches IFF chunks and handles them. - // terminates when BODY chunk was found or dataptr ran over end of file - // - bool BMHDok = false, CAMGok = false; - int bmhd_width = 0, bmhd_height = 0, bmhd_bitplanes = 0, bmhd_transcol = -1; - byte bmhd_compression = 0; - long camg_viewmode = 0; - int colors = 0; - while (dataptr + 8 <= dataend) { - // get chunk length and make even - long chunkLen = (iff_getlong(dataptr + 4) + 1) & 0xfffffffe; - if (chunkLen < 0) { // format error? - break; - } - bool truncated = (dataptr + 8 + chunkLen > dataend); - - if (strncmp((char *)dataptr, "BMHD", 4) == 0) { // BMHD chunk? - if (chunkLen < 12 + 2 || truncated) { - break; - } - bmhd_width = iff_getword(dataptr + 8); // width of picture - bmhd_height= iff_getword(dataptr + 8 + 2); // height of picture - bmhd_bitplanes = *(dataptr + 8 + 8); // # of bitplanes - // bmhd_masking = *(dataptr + 8 + 9); -- unused currently - bmhd_compression = *(dataptr + 8 + 10); // get compression - bmhd_transcol = iff_getword(dataptr + 8 + 12); - BMHDok = true; // got BMHD - dataptr += 8 + chunkLen; // to next chunk - } - else if (strncmp((char *)dataptr, "CMAP", 4) == 0) { // CMAP ? - if (truncated) { - break; - } - const byte *cmapptr = dataptr + 8; - colors = chunkLen / 3; // calc no of colors - - wxDELETE(m_image->pal); - m_image->colors = colors; - if (colors > 0) { - m_image->pal = new byte[3*colors]; - if (!m_image->pal) { - Destroy(); - return wxIFF_MEMERR; - } - - // copy colors to color map - for (int i=0; i < colors; i++) { - m_image->pal[3*i + 0] = *cmapptr++; - m_image->pal[3*i + 1] = *cmapptr++; - m_image->pal[3*i + 2] = *cmapptr++; - } - } - - wxLogTrace(wxT("iff"), wxT("Read %d colors from IFF file."), - colors); - - dataptr += 8 + chunkLen; // to next chunk - } else if (strncmp((char *)dataptr, "CAMG", 4) == 0) { // CAMG ? - if (chunkLen < 4 || truncated) { - break; - } - camg_viewmode = iff_getlong(dataptr + 8); // get viewmodes - CAMGok = true; // got CAMG - dataptr += 8 + chunkLen; // to next chunk - } - else if (strncmp((char *)dataptr, "BODY", 4) == 0) { // BODY ? - if (!BMHDok) { // BMHD found? - break; - } - const byte *bodyptr = dataptr + 8; // -> BODY data - - if (truncated) { - chunkLen = dataend - dataptr; - } - - // - // if BODY is compressed, allocate buffer for decrunched BODY - // and decompress it (run length encoding) - // - if (bmhd_compression == 1) { - // calc size of decrunch buffer - (size of the actual pic. - // decompressed in interleaved Amiga bitplane format) - - size_t decomp_bufsize = (((bmhd_width + 15) >> 4) << 1) - * bmhd_height * bmhd_bitplanes; - - if ((decomp_mem = new byte[decomp_bufsize]) == 0) { - Destroy(); - return wxIFF_MEMERR; - } - - decomprle(bodyptr, decomp_mem, chunkLen, decomp_bufsize); - bodyptr = decomp_mem; // -> uncompressed BODY - chunkLen = decomp_bufsize; - wxDELETEA(databuf); - } - - // the following determines the type of the ILBM file. - // it's either NORMAL, EHB, HAM, HAM8 or 24BIT - - int fmt = ILBM_NORMAL; // assume normal ILBM - if (bmhd_bitplanes == 24) { - fmt = ILBM_24BIT; - } else if (bmhd_bitplanes == 8) { - if (CAMGok && (camg_viewmode & 0x800)) { - fmt = ILBM_HAM8; - } - } else if ((bmhd_bitplanes > 5) && CAMGok) { - if (camg_viewmode & 0x80) { - fmt = ILBM_EHB; - } else if (camg_viewmode & 0x800) { - fmt = ILBM_HAM; - } - } - - wxLogTrace(wxT("iff"), - wxT("LoadIFF: %s %dx%d, planes=%d (%d cols), comp=%d"), - (fmt==ILBM_NORMAL) ? "Normal ILBM" : - (fmt==ILBM_HAM) ? "HAM ILBM" : - (fmt==ILBM_HAM8) ? "HAM8 ILBM" : - (fmt==ILBM_EHB) ? "EHB ILBM" : - (fmt==ILBM_24BIT) ? "24BIT ILBM" : "unknown ILBM", - bmhd_width, bmhd_height, bmhd_bitplanes, - 1< m_image->colors) { - byte *pal = new byte[colors*3]; - if (!pal) { - Destroy(); - return wxIFF_MEMERR; - } - int i; - for (i = 0; i < m_image->colors; i++) { - pal[3*i + 0] = m_image->pal[3*i + 0]; - pal[3*i + 1] = m_image->pal[3*i + 1]; - pal[3*i + 2] = m_image->pal[3*i + 2]; - } - for (; i < colors; i++) { - pal[3*i + 0] = 0; - pal[3*i + 1] = 0; - pal[3*i + 2] = 0; - } - delete m_image->pal; - m_image->pal = pal; - m_image->colors = colors; - } - - for (int i=0; i < colors; i++) { - m_image->pal[3*i + 0] = (m_image->pal[3*i + 0] >> 4) * 17; - m_image->pal[3*i + 1] = (m_image->pal[3*i + 1] >> 4) * 17; - m_image->pal[3*i + 2] = (m_image->pal[3*i + 2] >> 4) * 17; - } - } - - m_image->p = new byte[bmhd_width * bmhd_height * 3]; - byte *picptr = m_image->p; - if (!picptr) { - Destroy(); - return wxIFF_MEMERR; - } - - byte *pal = m_image->pal; - int lineskip = ((bmhd_width + 15) >> 4) << 1; - int height = chunkLen / (lineskip * bmhd_bitplanes); - - if (bmhd_height < height) { - height = bmhd_height; - } - - if (fmt == ILBM_HAM || fmt == ILBM_HAM8 || fmt == ILBM_24BIT) { - byte *pic = picptr; - const byte *workptr = bodyptr; - - for (int i=0; i < height; i++) { - byte bitmsk = 0x80; - const byte *workptr2 = workptr; - - // at start of each line, init RGB values to background - byte rval = pal[0]; - byte gval = pal[1]; - byte bval = pal[2]; - - for (int j=0; j < bmhd_width; j++) { - long col = 0; - long colbit = 1; - const byte *workptr3 = workptr2; - for (int k=0; k < bmhd_bitplanes; k++) { - if (*workptr3 & bitmsk) { - col += colbit; - } - workptr3 += lineskip; - colbit <<= 1; - } - - if (fmt==ILBM_HAM) { - int c = (col & 0x0f); - switch (col & 0x30) { - case 0x00: if (c >= 0 && c < colors) { - rval = pal[3*c + 0]; - gval = pal[3*c + 1]; - bval = pal[3*c + 2]; - } - break; - - case 0x10: bval = c * 17; - break; - - case 0x20: rval = c * 17; - break; - - case 0x30: gval = c * 17; - break; - } - } else if (fmt == ILBM_HAM8) { - int c = (col & 0x3f); - switch(col & 0xc0) { - case 0x00: if (c >= 0 && c < colors) { - rval = pal[3*c + 0]; - gval = pal[3*c + 1]; - bval = pal[3*c + 2]; - } - break; - - case 0x40: bval = (bval & 3) | (c << 2); - break; - - case 0x80: rval = (rval & 3) | (c << 2); - break; - - case 0xc0: gval = (rval & 3) | (c << 2); - } - } else { - rval = col & 0xff; - gval = (col >> 8) & 0xff; - bval = (col >> 16) & 0xff; - } - - *pic++ = rval; - *pic++ = gval; - *pic++ = bval; - - bitmsk = bitmsk >> 1; - if (bitmsk == 0) { - bitmsk = 0x80; - workptr2++; - } - } - workptr += lineskip * bmhd_bitplanes; - } - } else if ((fmt == ILBM_NORMAL) || (fmt == ILBM_EHB)) { - if (fmt == ILBM_EHB) { - wxLogTrace(wxT("iff"), wxT("Doubling CMAP for EHB mode")); - - for (int i=0; i<32; i++) { - pal[3*(i + 32) + 0] = pal[3*i + 0] >> 1; - pal[3*(i + 32) + 1] = pal[3*i + 1] >> 1; - pal[3*(i + 32) + 2] = pal[3*i + 2] >> 1; - } - } - - byte *pic = picptr; // ptr to buffer - const byte *workptr = bodyptr; // ptr to pic, planar format - - if (bmhd_height < height) { - height = bmhd_height; - } - - for (int i=0; i < height; i++) { - byte bitmsk = 0x80; // left most bit (mask) - const byte *workptr2 = workptr; // work ptr to source - for (int j=0; j < bmhd_width; j++) { - long col = 0; - long colbit = 1; - const byte *workptr3 = workptr2; // 1st byte in 1st pln - - for (int k=0; k < bmhd_bitplanes; k++) { - if (*workptr3 & bitmsk) { // if bit set in this pln - col = col + colbit; // add bit to chunky byte - } - workptr3 += lineskip; // go to next line - colbit <<= 1; // shift color bit - } - - if (col >= 0 && col < colors) { - pic[0] = pal[3*col + 0]; - pic[1] = pal[3*col + 1]; - pic[2] = pal[3*col + 2]; - } else { - pic[0] = pic[1] = pic[2] = 0; - } - pic += 3; - bitmsk = bitmsk >> 1; // shift mask to next bit - if (bitmsk == 0) { // if mask is zero - bitmsk = 0x80; // reset mask - workptr2++; // mv ptr to next byte - } - } - - workptr += lineskip * bmhd_bitplanes; // to next line - } - } else { - break; // unknown format - } - - m_image->w = bmhd_width; - m_image->h = height; - m_image->transparent = bmhd_transcol; - - wxLogTrace(wxT("iff"), wxT("Loaded IFF picture %s"), - truncated? "truncated" : "completely"); - - return (truncated? wxIFF_TRUNCATED : wxIFF_OK); - } else { - wxLogTrace(wxT("iff"), wxT("Skipping unknown chunk '%c%c%c%c'"), - *dataptr, *(dataptr+1), *(dataptr+2), *(dataptr+3)); - - dataptr = dataptr + 8 + chunkLen; // skip unknown chunk - } - } - - Destroy(); - return wxIFF_INVFORMAT; -} - - - -//----------------------------------------------------------------------------- -// wxIFFHandler -//----------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxIFFHandler, wxImageHandler); - -#if wxUSE_STREAMS - -bool wxIFFHandler::LoadFile(wxImage *image, wxInputStream& stream, - bool verbose, int WXUNUSED(index)) -{ - wxIFFDecoder *decod; - int error; - bool ok; - - decod = new wxIFFDecoder(&stream); - error = decod->ReadIFF(); - - if ((error != wxIFF_OK) && (error != wxIFF_TRUNCATED)) - { - if (verbose) - { - switch (error) - { - case wxIFF_INVFORMAT: - wxLogError(_("IFF: error in IFF image format.")); - break; - case wxIFF_MEMERR: - wxLogError(_("IFF: not enough memory.")); - break; - default: - wxLogError(_("IFF: unknown error!!!")); - break; - } - } - delete decod; - return false; - } - - if ((error == wxIFF_TRUNCATED) && verbose) - { - wxLogError(_("IFF: data stream seems to be truncated.")); - /* go on; image data is OK */ - } - - ok = decod->ConvertToImage(image); - delete decod; - - return ok; -} - -bool wxIFFHandler::SaveFile(wxImage * WXUNUSED(image), - wxOutputStream& WXUNUSED(stream), bool verbose) -{ - if (verbose) - { - wxLogDebug(wxT("IFF: the handler is read-only!!")); - } - - return false; -} - -bool wxIFFHandler::DoCanRead(wxInputStream& stream) -{ - wxIFFDecoder decod(&stream); - - return decod.CanRead(); - // it's ok to modify the stream position here -} - -#endif // wxUSE_STREAMS - -#endif // wxUSE_IFF diff --git a/Externals/wxWidgets3/src/common/imagjpeg.cpp b/Externals/wxWidgets3/src/common/imagjpeg.cpp deleted file mode 100644 index e215a7a76a..0000000000 --- a/Externals/wxWidgets3/src/common/imagjpeg.cpp +++ /dev/null @@ -1,521 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/imagjpeg.cpp -// Purpose: wxImage JPEG handler -// Author: Vaclav Slavik -// Copyright: (c) Vaclav Slavik -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_IMAGE && wxUSE_LIBJPEG - -#include "wx/imagjpeg.h" -#include "wx/versioninfo.h" - -#ifndef WX_PRECOMP - #include "wx/log.h" - #include "wx/app.h" - #include "wx/intl.h" - #include "wx/bitmap.h" - #include "wx/module.h" -#endif - -// A hack based on one from tif_jpeg.c to overcome the problem on Windows -// of rpcndr.h defining boolean with a different type to the jpeg headers. -// -// This hack is only necessary for an external jpeg library, the builtin one -// usually used on Windows doesn't use the type boolean, so always works. -// -#ifdef wxHACK_BOOLEAN - #define HAVE_BOOLEAN - #define boolean wxHACK_BOOLEAN -#endif - -extern "C" -{ - #if defined(__WXMSW__) - #define XMD_H - #endif - #include "jpeglib.h" -} - -#ifndef HAVE_WXJPEG_BOOLEAN -typedef boolean wxjpeg_boolean; -#endif - -#include "wx/filefn.h" -#include "wx/wfstream.h" - -// For memcpy -#include -// For JPEG library error handling -#include - -// ---------------------------------------------------------------------------- -// types -// ---------------------------------------------------------------------------- - -// the standard definition of METHODDEF(type) from jmorecfg.h is "static type" -// which means that we can't declare the method functions as extern "C" - the -// compiler (rightfully) complains about the multiple storage classes in -// declaration -// -// so we only add extern "C" when using our own, modified, jmorecfg.h - and use -// whatever we have in the system headers if this is what we use hoping that it -// should be ok (can't do anything else) -#ifdef JPEG_METHOD_LINKAGE - #define CPP_METHODDEF(type) extern "C" METHODDEF(type) -#else // not using our jmorecfg.h header - #define CPP_METHODDEF(type) METHODDEF(type) -#endif - -//----------------------------------------------------------------------------- -// wxJPEGHandler -//----------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxJPEGHandler,wxImageHandler); - -#if wxUSE_STREAMS - -//------------- JPEG Data Source Manager - -#define JPEG_IO_BUFFER_SIZE 2048 - -typedef struct { - struct jpeg_source_mgr pub; /* public fields */ - - JOCTET* buffer; /* start of buffer */ - wxInputStream *stream; -} wx_source_mgr; - -typedef wx_source_mgr * wx_src_ptr; - -extern "C" -{ - -CPP_METHODDEF(void) wx_init_source ( j_decompress_ptr WXUNUSED(cinfo) ) -{ -} - -CPP_METHODDEF(wxjpeg_boolean) wx_fill_input_buffer ( j_decompress_ptr cinfo ) -{ - wx_src_ptr src = (wx_src_ptr) cinfo->src; - - src->pub.next_input_byte = src->buffer; - src->pub.bytes_in_buffer = src->stream->Read(src->buffer, JPEG_IO_BUFFER_SIZE).LastRead(); - - if (src->pub.bytes_in_buffer == 0) // check for end-of-stream - { - // Insert a fake EOI marker - src->buffer[0] = 0xFF; - src->buffer[1] = JPEG_EOI; - src->pub.bytes_in_buffer = 2; - } - return TRUE; -} - -CPP_METHODDEF(void) wx_skip_input_data ( j_decompress_ptr cinfo, long num_bytes ) -{ - if (num_bytes > 0) - { - wx_src_ptr src = (wx_src_ptr) cinfo->src; - - while (num_bytes > (long)src->pub.bytes_in_buffer) - { - num_bytes -= (long) src->pub.bytes_in_buffer; - src->pub.fill_input_buffer(cinfo); - } - src->pub.next_input_byte += (size_t) num_bytes; - src->pub.bytes_in_buffer -= (size_t) num_bytes; - } -} - -CPP_METHODDEF(void) wx_term_source ( j_decompress_ptr cinfo ) -{ - wx_src_ptr src = (wx_src_ptr) cinfo->src; - - if (src->pub.bytes_in_buffer > 0) - src->stream->SeekI(-(long)src->pub.bytes_in_buffer, wxFromCurrent); - delete[] src->buffer; -} - - -// JPEG error manager: - -#ifdef __VISUALC__ - // We don't care about the size of this struct, but we still get an - // annoying warning C4324 here: - // - // 'wx_error_mgr' : structure was padded due to __declspec(align()) - // - // and suppressing it seems to be the only way to avoid it. - #pragma warning(push) - #pragma warning(disable: 4324) -#endif - -struct wx_error_mgr : public jpeg_error_mgr -{ - jmp_buf setjmp_buffer; /* for return to caller */ -}; - -#ifdef __VISUALC__ - #pragma warning(pop) -#endif - -/* - * Here's the routine that will replace the standard error_exit method: - */ - -CPP_METHODDEF(void) wx_error_exit (j_common_ptr cinfo) -{ - /* cinfo->err really points to a wx_error_mgr struct, so coerce pointer */ - wx_error_mgr * const jerr = (wx_error_mgr *) cinfo->err; - - /* Always display the message. */ - /* We could postpone this until after returning, if we chose. */ - (*cinfo->err->output_message) (cinfo); - - /* Return control to the setjmp point */ - longjmp(jerr->setjmp_buffer, 1); -} - -/* - * This will replace the standard output_message method when the user - * wants us to be silent (verbose==false). We must have such method instead of - * simply using NULL for cinfo->err->output_message because it's called - * unconditionally from within libjpeg when there's "garbage input". - */ -CPP_METHODDEF(void) wx_ignore_message (j_common_ptr WXUNUSED(cinfo)) -{ -} - -void wx_jpeg_io_src( j_decompress_ptr cinfo, wxInputStream& infile ) -{ - wx_src_ptr src; - - if (cinfo->src == NULL) { /* first time for this JPEG object? */ - cinfo->src = (struct jpeg_source_mgr *) - (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, - sizeof(wx_source_mgr)); - } - src = (wx_src_ptr) cinfo->src; - src->pub.bytes_in_buffer = 0; /* forces fill_input_buffer on first read */ - src->buffer = new JOCTET[JPEG_IO_BUFFER_SIZE]; - src->pub.next_input_byte = NULL; /* until buffer loaded */ - src->stream = &infile; - - src->pub.init_source = wx_init_source; - src->pub.fill_input_buffer = wx_fill_input_buffer; - src->pub.skip_input_data = wx_skip_input_data; - src->pub.resync_to_restart = jpeg_resync_to_restart; /* use default method */ - src->pub.term_source = wx_term_source; -} - -} // extern "C" - -static inline void wx_cmyk_to_rgb(unsigned char* rgb, const unsigned char* cmyk) -{ - int k = 255 - cmyk[3]; - int k2 = cmyk[3]; - int c; - - c = k + k2 * (255 - cmyk[0]) / 255; - rgb[0] = (unsigned char)((c > 255) ? 0 : (255 - c)); - - c = k + k2 * (255 - cmyk[1]) / 255; - rgb[1] = (unsigned char)((c > 255) ? 0 : (255 - c)); - - c = k + k2 * (255 - cmyk[2]) / 255; - rgb[2] = (unsigned char)((c > 255) ? 0 : (255 - c)); -} - -// temporarily disable the warning C4611 (interaction between '_setjmp' and -// C++ object destruction is non-portable) - I don't see any dtors here -#ifdef __VISUALC__ - #pragma warning(disable:4611) -#endif /* VC++ */ - -bool wxJPEGHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose, int WXUNUSED(index) ) -{ - wxCHECK_MSG( image, false, "NULL image pointer" ); - - struct jpeg_decompress_struct cinfo; - wx_error_mgr jerr; - unsigned char *ptr; - - // save this before calling Destroy() - const unsigned maxWidth = image->GetOptionInt(wxIMAGE_OPTION_MAX_WIDTH), - maxHeight = image->GetOptionInt(wxIMAGE_OPTION_MAX_HEIGHT); - image->Destroy(); - - cinfo.err = jpeg_std_error( &jerr ); - jerr.error_exit = wx_error_exit; - - if (!verbose) - cinfo.err->output_message = wx_ignore_message; - - /* Establish the setjmp return context for wx_error_exit to use. */ - if (setjmp(jerr.setjmp_buffer)) { - /* If we get here, the JPEG code has signaled an error. - * We need to clean up the JPEG object, close the input file, and return. - */ - if (verbose) - { - wxLogError(_("JPEG: Couldn't load - file is probably corrupted.")); - } - (cinfo.src->term_source)(&cinfo); - jpeg_destroy_decompress(&cinfo); - if (image->IsOk()) image->Destroy(); - return false; - } - - jpeg_create_decompress( &cinfo ); - wx_jpeg_io_src( &cinfo, stream ); - jpeg_read_header( &cinfo, TRUE ); - - int bytesPerPixel; - if ((cinfo.out_color_space == JCS_CMYK) || (cinfo.out_color_space == JCS_YCCK)) - { - cinfo.out_color_space = JCS_CMYK; - bytesPerPixel = 4; - } - else // all the rest is treated as RGB - { - cinfo.out_color_space = JCS_RGB; - bytesPerPixel = 3; - } - - // scale the picture to fit in the specified max size if necessary - if ( maxWidth > 0 || maxHeight > 0 ) - { - unsigned& scale = cinfo.scale_denom; - while ( (maxWidth && (cinfo.image_width / scale > maxWidth)) || - (maxHeight && (cinfo.image_height / scale > maxHeight)) ) - { - scale *= 2; - } - } - - jpeg_start_decompress( &cinfo ); - - image->Create( cinfo.output_width, cinfo.output_height ); - if (!image->IsOk()) { - jpeg_finish_decompress( &cinfo ); - jpeg_destroy_decompress( &cinfo ); - return false; - } - image->SetMask( false ); - ptr = image->GetData(); - - unsigned stride = cinfo.output_width * bytesPerPixel; - JSAMPARRAY tempbuf = (*cinfo.mem->alloc_sarray) - ((j_common_ptr) &cinfo, JPOOL_IMAGE, stride, 1 ); - - while ( cinfo.output_scanline < cinfo.output_height ) - { - jpeg_read_scanlines( &cinfo, tempbuf, 1 ); - if (cinfo.out_color_space == JCS_RGB) - { - memcpy( ptr, tempbuf[0], stride ); - ptr += stride; - } - else // CMYK - { - const unsigned char* inptr = (const unsigned char*) tempbuf[0]; - for (size_t i = 0; i < cinfo.output_width; i++) - { - wx_cmyk_to_rgb(ptr, inptr); - ptr += 3; - inptr += 4; - } - } - } - - // set up resolution if available: it's part of optional JFIF APP0 chunk - if ( cinfo.saw_JFIF_marker ) - { - image->SetOption(wxIMAGE_OPTION_RESOLUTIONX, cinfo.X_density); - image->SetOption(wxIMAGE_OPTION_RESOLUTIONY, cinfo.Y_density); - - // we use the same values for this option as libjpeg so we don't need - // any conversion here - image->SetOption(wxIMAGE_OPTION_RESOLUTIONUNIT, cinfo.density_unit); - } - - if ( cinfo.image_width != cinfo.output_width || cinfo.image_height != cinfo.output_height ) - { - // save the original image size - image->SetOption(wxIMAGE_OPTION_ORIGINAL_WIDTH, cinfo.image_width); - image->SetOption(wxIMAGE_OPTION_ORIGINAL_HEIGHT, cinfo.image_height); - } - - jpeg_finish_decompress( &cinfo ); - jpeg_destroy_decompress( &cinfo ); - return true; -} - -typedef struct { - struct jpeg_destination_mgr pub; - - wxOutputStream *stream; - JOCTET * buffer; -} wx_destination_mgr; - -typedef wx_destination_mgr * wx_dest_ptr; - -#define OUTPUT_BUF_SIZE 4096 /* choose an efficiently fwrite'able size */ - -extern "C" -{ - -CPP_METHODDEF(void) wx_init_destination (j_compress_ptr cinfo) -{ - wx_dest_ptr dest = (wx_dest_ptr) cinfo->dest; - - /* Allocate the output buffer --- it will be released when done with image */ - dest->buffer = (JOCTET *) - (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, - OUTPUT_BUF_SIZE * sizeof(JOCTET)); - dest->pub.next_output_byte = dest->buffer; - dest->pub.free_in_buffer = OUTPUT_BUF_SIZE; -} - -CPP_METHODDEF(wxjpeg_boolean) wx_empty_output_buffer (j_compress_ptr cinfo) -{ - wx_dest_ptr dest = (wx_dest_ptr) cinfo->dest; - - dest->stream->Write(dest->buffer, OUTPUT_BUF_SIZE); - dest->pub.next_output_byte = dest->buffer; - dest->pub.free_in_buffer = OUTPUT_BUF_SIZE; - return TRUE; -} - -CPP_METHODDEF(void) wx_term_destination (j_compress_ptr cinfo) -{ - wx_dest_ptr dest = (wx_dest_ptr) cinfo->dest; - size_t datacount = OUTPUT_BUF_SIZE - dest->pub.free_in_buffer; - /* Write any data remaining in the buffer */ - if (datacount > 0) - dest->stream->Write(dest->buffer, datacount); -} - -GLOBAL(void) wx_jpeg_io_dest (j_compress_ptr cinfo, wxOutputStream& outfile) -{ - wx_dest_ptr dest; - - if (cinfo->dest == NULL) { /* first time for this JPEG object? */ - cinfo->dest = (struct jpeg_destination_mgr *) - (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, - sizeof(wx_destination_mgr)); - } - - dest = (wx_dest_ptr) cinfo->dest; - dest->pub.init_destination = wx_init_destination; - dest->pub.empty_output_buffer = wx_empty_output_buffer; - dest->pub.term_destination = wx_term_destination; - dest->stream = &outfile; -} - -} // extern "C" - -bool wxJPEGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbose ) -{ - struct jpeg_compress_struct cinfo; - wx_error_mgr jerr; - JSAMPROW row_pointer[1]; /* pointer to JSAMPLE row[s] */ - JSAMPLE *image_buffer; - int stride; /* physical row width in image buffer */ - - cinfo.err = jpeg_std_error(&jerr); - jerr.error_exit = wx_error_exit; - - if (!verbose) - cinfo.err->output_message = wx_ignore_message; - - /* Establish the setjmp return context for wx_error_exit to use. */ - if (setjmp(jerr.setjmp_buffer)) - { - /* If we get here, the JPEG code has signaled an error. - * We need to clean up the JPEG object, close the input file, and return. - */ - if (verbose) - { - wxLogError(_("JPEG: Couldn't save image.")); - } - jpeg_destroy_compress(&cinfo); - return false; - } - - jpeg_create_compress(&cinfo); - wx_jpeg_io_dest(&cinfo, stream); - - cinfo.image_width = image->GetWidth(); - cinfo.image_height = image->GetHeight(); - cinfo.input_components = 3; - cinfo.in_color_space = JCS_RGB; - jpeg_set_defaults(&cinfo); - - // TODO: 3rd parameter is force_baseline, what value should this be? - // Code says: "If force_baseline is TRUE, the computed quantization table entries - // are limited to 1..255 for JPEG baseline compatibility." - // 'Quality' is a number between 0 (terrible) and 100 (very good). - // The default (in jcparam.c, jpeg_set_defaults) is 75, - // and force_baseline is TRUE. - if (image->HasOption(wxIMAGE_OPTION_QUALITY)) - jpeg_set_quality(&cinfo, image->GetOptionInt(wxIMAGE_OPTION_QUALITY), TRUE); - - // set the resolution fields in the output file - int resX, resY; - wxImageResolution res = GetResolutionFromOptions(*image, &resX, &resY); - if ( res != wxIMAGE_RESOLUTION_NONE ) - { - cinfo.X_density = resX; - cinfo.Y_density = resY; - - // it so happens that wxIMAGE_RESOLUTION_INCHES/CM values are the same - // ones as used by libjpeg, so we can assign them directly - cinfo.density_unit = res; - } - - jpeg_start_compress(&cinfo, TRUE); - - stride = cinfo.image_width * 3; /* JSAMPLEs per row in image_buffer */ - image_buffer = image->GetData(); - while (cinfo.next_scanline < cinfo.image_height) { - row_pointer[0] = &image_buffer[cinfo.next_scanline * stride]; - jpeg_write_scanlines( &cinfo, row_pointer, 1 ); - } - jpeg_finish_compress(&cinfo); - jpeg_destroy_compress(&cinfo); - - return true; -} - -#ifdef __VISUALC__ - #pragma warning(default:4611) -#endif /* VC++ */ - -bool wxJPEGHandler::DoCanRead( wxInputStream& stream ) -{ - unsigned char hdr[2]; - - if ( !stream.Read(hdr, WXSIZEOF(hdr)) ) // it's ok to modify the stream position here - return false; - - return hdr[0] == 0xFF && hdr[1] == 0xD8; -} - -#endif // wxUSE_STREAMS - -/*static*/ wxVersionInfo wxJPEGHandler::GetLibraryVersionInfo() -{ - return wxVersionInfo("libjpeg", JPEG_LIB_VERSION/10, JPEG_LIB_VERSION%10); -} - -#endif // wxUSE_LIBJPEG diff --git a/Externals/wxWidgets3/src/common/imagpcx.cpp b/Externals/wxWidgets3/src/common/imagpcx.cpp deleted file mode 100644 index 15bb97daf4..0000000000 --- a/Externals/wxWidgets3/src/common/imagpcx.cpp +++ /dev/null @@ -1,501 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/imagpcx.cpp -// Purpose: wxImage PCX handler -// Author: Guillermo Rodriguez Garcia -// Version: 1.1 -// Copyright: (c) 1999 Guillermo Rodriguez Garcia -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_IMAGE && wxUSE_PCX - -#ifndef WX_PRECOMP - #include "wx/object.h" - #include "wx/list.h" - #include "wx/log.h" - #include "wx/intl.h" - #include "wx/palette.h" - #include "wx/hash.h" - #include "wx/module.h" -#endif - -#include "wx/imagpcx.h" -#include "wx/wfstream.h" - -//----------------------------------------------------------------------------- -// wxPCXHandler -//----------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxPCXHandler,wxImageHandler); - -#if wxUSE_STREAMS - -//----------------------------------------------------------------------------- -// RLE encoding and decoding -//----------------------------------------------------------------------------- - -void RLEencode(unsigned char *p, unsigned int size, wxOutputStream& s) -{ - unsigned int data, last, cont; - - // Write 'size' bytes. The PCX official specs say there will be - // a decoding break at the end of each scanline, so in order to - // force this decoding break use this function to write, at most, - // _one_ complete scanline at a time. - - last = (unsigned char) *(p++); - cont = 1; - size--; - - while (size-- > 0) - { - data = (unsigned char) *(p++); - - // Up to 63 bytes with the same value can be stored using - // a single { cont, value } pair. - // - if ((data == last) && (cont < 63)) - { - cont++; - } - else - { - // need to write a 'counter' byte? - if ((cont > 1) || ((last & 0xC0) == 0xC0)) - s.PutC((char) (cont | 0xC0)); - - s.PutC((char) last); - last = data; - cont = 1; - } - } - - // write the last one and return; - if ((cont > 1) || ((last & 0xC0) == 0xC0)) - s.PutC((char) (cont | 0xC0)); - - s.PutC((char) last); -} - -void RLEdecode(unsigned char *p, unsigned int size, wxInputStream& s) -{ - // Read 'size' bytes. The PCX official specs say there will be - // a decoding break at the end of each scanline (but not at the - // end of each plane inside a scanline). Only use this function - // to read one or more _complete_ scanlines. Else, more than - // 'size' bytes might be read and the buffer might overflow. - - while (size != 0) - { - unsigned int data = (unsigned char)s.GetC(); - - // If ((data & 0xC0) != 0xC0), then the value read is a data - // byte. Else, it is a counter (cont = val & 0x3F) and the - // next byte is the data byte. - - if ((data & 0xC0) != 0xC0) - { - *(p++) = (unsigned char)data; - size--; - } - else - { - unsigned int cont = data & 0x3F; - if (cont > size) // can happen only if the file is malformed - break; - data = (unsigned char)s.GetC(); - for (unsigned int i = 1; i <= cont; i++) - *(p++) = (unsigned char)data; - size -= cont; - } - } -} - - -//----------------------------------------------------------------------------- -// PCX reading and saving -//----------------------------------------------------------------------------- - -// PCX header -#define HDR_MANUFACTURER 0 -#define HDR_VERSION 1 -#define HDR_ENCODING 2 -#define HDR_BITSPERPIXEL 3 -#define HDR_XMIN 4 -#define HDR_YMIN 6 -#define HDR_XMAX 8 -#define HDR_YMAX 10 -#define HDR_NPLANES 65 -#define HDR_BYTESPERLINE 66 -#define HDR_PALETTEINFO 68 - -// image formats -enum { - wxPCX_8BIT, // 8 bpp, 1 plane (8 bit) - wxPCX_24BIT // 8 bpp, 3 planes (24 bit) -}; - -// error codes -enum { - wxPCX_OK = 0, // everything was OK - wxPCX_INVFORMAT = 1, // error in pcx file format - wxPCX_MEMERR = 2, // error allocating memory - wxPCX_VERERR = 3 // error in pcx version number -}; - - -// ReadPCX: -// Loads a PCX file into the wxImage object pointed by image. -// Returns wxPCX_OK on success, or an error code otherwise -// (see above for error codes) -// -int ReadPCX(wxImage *image, wxInputStream& stream) -{ - unsigned char hdr[128]; // PCX header - unsigned char pal[768]; // palette for 8 bit images - unsigned char *p; // space to store one scanline - unsigned char *dst; // pointer into wxImage data - unsigned int width, height; // size of the image - unsigned int bytesperline; // bytes per line (each plane) - int bitsperpixel; // bits per pixel (each plane) - int nplanes; // number of planes - int encoding; // is the image RLE encoded? - int format; // image format (8 bit, 24 bit) - unsigned int i, j; - - // Read PCX header and check the version number (it must - // be at least 5 or higher for 8 bit and 24 bit images). - - stream.Read(hdr, 128); - - if (hdr[HDR_VERSION] < 5) return wxPCX_VERERR; - - // Extract all image info from the PCX header. - - encoding = hdr[HDR_ENCODING]; - nplanes = hdr[HDR_NPLANES]; - bitsperpixel = hdr[HDR_BITSPERPIXEL]; - bytesperline = hdr[HDR_BYTESPERLINE] + 256 * hdr[HDR_BYTESPERLINE + 1]; - width = (hdr[HDR_XMAX] + 256 * hdr[HDR_XMAX + 1]) - - (hdr[HDR_XMIN] + 256 * hdr[HDR_XMIN + 1]) + 1; - height = (hdr[HDR_YMAX] + 256 * hdr[HDR_YMAX + 1]) - - (hdr[HDR_YMIN] + 256 * hdr[HDR_YMIN + 1]) + 1; - - // Check image format. Currently supported formats are - // 8 bits (8 bpp, 1 plane) and 24 bits (8 bpp, 3 planes). - - if ((nplanes == 3) && (bitsperpixel == 8)) - format = wxPCX_24BIT; - else if ((nplanes == 1) && (bitsperpixel == 8)) - format = wxPCX_8BIT; - else - return wxPCX_INVFORMAT; - - // If the image is of type wxPCX_8BIT, then there is - // a palette at the end of the image data. If we were - // working with a file, we could seek at the end to the - // end (SeekI(-769, wxFromEnd) and read the palette - // before proceeding. Unfortunately, this would prevent - // loading several PCXs in a single stream, so we can't - // do it. Thus, 8-bit images will have to be decoded in - // two passes: one to read and decode the image data, - // and another to replace 'colour indexes' with RGB - // values. - - // Resize the image and allocate memory for a scanline. - - image->Create(width, height); - - if (!image->IsOk()) - return wxPCX_MEMERR; - - if ((p = (unsigned char *) malloc(bytesperline * nplanes)) == NULL) - return wxPCX_MEMERR; - - // Now start reading the file, line by line, and store - // the data in the format required by wxImage. - - dst = image->GetData(); - - for (j = height; j; j--) - { - if (encoding) - RLEdecode(p, bytesperline * nplanes, stream); - else - stream.Read(p, bytesperline * nplanes); - - switch (format) - { - case wxPCX_8BIT: - { - for (i = 0; i < width; i++) - { - // first pass, just store the colour index - *dst = p[i]; - dst += 3; - } - break; - } - case wxPCX_24BIT: - { - for (i = 0; i < width; i++) - { - *(dst++) = p[i]; - *(dst++) = p[i + bytesperline]; - *(dst++) = p[i + 2 * bytesperline]; - } - break; - } - } - } - - free(p); - - // For 8 bit images, we read the palette, and then do a second - // pass replacing indexes with their RGB values; - - if (format == wxPCX_8BIT) - { - unsigned char index; - - if (stream.GetC() != 12) - return wxPCX_INVFORMAT; - - stream.Read(pal, 768); - - p = image->GetData(); - for (unsigned long k = height * width; k; k--) - { - index = *p; - *(p++) = pal[3 * index]; - *(p++) = pal[3 * index + 1]; - *(p++) = pal[3 * index + 2]; - } - -#if wxUSE_PALETTE - unsigned char r[256]; - unsigned char g[256]; - unsigned char b[256]; - for (i = 0; i < 256; i++) - { - r[i] = pal[3*i + 0]; - g[i] = pal[3*i + 1]; - b[i] = pal[3*i + 2]; - } - image->SetPalette(wxPalette(256, r, g, b)); -#endif // wxUSE_PALETTE - } - - return wxPCX_OK; -} - -// SavePCX: -// Saves a PCX file into the wxImage object pointed by image. -// Returns wxPCX_OK on success, or an error code otherwise -// (see above for error codes). Will try to save as 8-bit -// PCX if possible, and then fall back to 24-bit if there -// are more than 256 different colours. -// -int SavePCX(wxImage *image, wxOutputStream& stream) -{ - unsigned char hdr[128]; // PCX header - unsigned char pal[768]; // palette for 8 bit images - unsigned char *p; // space to store one scanline - unsigned char *src; // pointer into wxImage data - unsigned int width, height; // size of the image - unsigned int bytesperline; // bytes per line (each plane) - unsigned char nplanes = 3; // number of planes - int format = wxPCX_24BIT; // image format (8 bit, 24 bit) - wxImageHistogram histogram; // image histogram - unsigned long key; // key in the hashtable - unsigned int i; - - // See if we can save as 8 bit. - - if (image->CountColours(256) <= 256) - { - image->ComputeHistogram(histogram); - format = wxPCX_8BIT; - nplanes = 1; - } - - // Get image dimensions, calculate bytesperline (must be even, - // according to PCX specs) and allocate space for one complete - // scanline. - - if (!image->IsOk()) - return wxPCX_INVFORMAT; - - width = image->GetWidth(); - height = image->GetHeight(); - bytesperline = width; - if (bytesperline % 2) - bytesperline++; - - if ((p = (unsigned char *) malloc(bytesperline * nplanes)) == NULL) - return wxPCX_MEMERR; - - // Build header data and write it to the stream. Initially, - // set all bytes to zero (most values default to zero). - - memset(hdr, 0, sizeof(hdr)); - - hdr[HDR_MANUFACTURER] = 10; - hdr[HDR_VERSION] = 5; - hdr[HDR_ENCODING] = 1; - hdr[HDR_NPLANES] = nplanes; - hdr[HDR_BITSPERPIXEL] = 8; - hdr[HDR_BYTESPERLINE] = (unsigned char)(bytesperline % 256); - hdr[HDR_BYTESPERLINE + 1] = (unsigned char)(bytesperline / 256); - hdr[HDR_XMAX] = (unsigned char)((width - 1) % 256); - hdr[HDR_XMAX + 1] = (unsigned char)((width - 1) / 256); - hdr[HDR_YMAX] = (unsigned char)((height - 1) % 256); - hdr[HDR_YMAX + 1] = (unsigned char)((height - 1) / 256); - hdr[HDR_PALETTEINFO] = 1; - - stream.Write(hdr, 128); - - // Encode image data line by line and write it to the stream - - src = image->GetData(); - - for (; height; height--) - { - switch (format) - { - case wxPCX_8BIT: - { - unsigned char r, g, b; - - for (i = 0; i < width; i++) - { - r = *(src++); - g = *(src++); - b = *(src++); - key = (r << 16) | (g << 8) | b; - - p[i] = (unsigned char)histogram[key].index; - } - break; - } - case wxPCX_24BIT: - { - for (i = 0; i < width; i++) - { - p[i] = *(src++); - p[i + bytesperline] = *(src++); - p[i + 2 * bytesperline] = *(src++); - } - break; - } - } - - RLEencode(p, bytesperline * nplanes, stream); - } - - free(p); - - // For 8 bit images, build the palette and write it to the stream: - if (format == wxPCX_8BIT) - { - // zero unused colours - memset(pal, 0, sizeof(pal)); - - unsigned long index; - - for (wxImageHistogram::iterator entry = histogram.begin(); - entry != histogram.end(); ++entry ) - { - key = entry->first; - index = entry->second.index; - pal[3 * index] = (unsigned char)(key >> 16); - pal[3 * index + 1] = (unsigned char)(key >> 8); - pal[3 * index + 2] = (unsigned char)(key); - } - - stream.PutC(12); - stream.Write(pal, 768); - } - - return wxPCX_OK; -} - -//----------------------------------------------------------------------------- -// wxPCXHandler -//----------------------------------------------------------------------------- - -bool wxPCXHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose, int WXUNUSED(index) ) -{ - int error; - - if (!CanRead(stream)) - { - if (verbose) - { - wxLogError(_("PCX: this is not a PCX file.")); - } - - return false; - } - - image->Destroy(); - - if ((error = ReadPCX(image, stream)) != wxPCX_OK) - { - if (verbose) - { - switch (error) - { - case wxPCX_INVFORMAT: wxLogError(_("PCX: image format unsupported")); break; - case wxPCX_MEMERR: wxLogError(_("PCX: couldn't allocate memory")); break; - case wxPCX_VERERR: wxLogError(_("PCX: version number too low")); break; - default: wxLogError(_("PCX: unknown error !!!")); - } - } - image->Destroy(); - return false; - } - - return true; -} - -bool wxPCXHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbose ) -{ - int error; - - if ((error = SavePCX(image, stream)) != wxPCX_OK) - { - if (verbose) - { - switch (error) - { - case wxPCX_INVFORMAT: wxLogError(_("PCX: invalid image")); break; - case wxPCX_MEMERR: wxLogError(_("PCX: couldn't allocate memory")); break; - default: wxLogError(_("PCX: unknown error !!!")); - } - } - } - - return (error == wxPCX_OK); -} - -bool wxPCXHandler::DoCanRead( wxInputStream& stream ) -{ - unsigned char c = stream.GetC(); // it's ok to modify the stream position here - if ( !stream ) - return false; - - // not very safe, but this is all we can get from PCX header :-( - return c == 10; -} - -#endif // wxUSE_STREAMS - -#endif // wxUSE_IMAGE && wxUSE_PCX diff --git a/Externals/wxWidgets3/src/common/imagpng.cpp b/Externals/wxWidgets3/src/common/imagpng.cpp deleted file mode 100644 index 11b63b58fa..0000000000 --- a/Externals/wxWidgets3/src/common/imagpng.cpp +++ /dev/null @@ -1,850 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/imagpng.cpp -// Purpose: wxImage PNG handler -// Author: Robert Roebling -// Copyright: (c) Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_IMAGE && wxUSE_LIBPNG - -#include "wx/imagpng.h" -#include "wx/versioninfo.h" - -#ifndef WX_PRECOMP - #include "wx/log.h" - #include "wx/intl.h" - #include "wx/palette.h" - #include "wx/stream.h" -#endif - -#include "png.h" - -// For memcpy -#include - -// ---------------------------------------------------------------------------- -// local functions -// ---------------------------------------------------------------------------- - -// init the alpha channel for the image and fill it with 1s up to (x, y) -static unsigned char *InitAlpha(wxImage *image, png_uint_32 x, png_uint_32 y); - -// is the pixel with this value of alpha a fully opaque one? -static inline -bool IsOpaque(unsigned char a) -{ - return a == 0xff; -} - -// ============================================================================ -// wxPNGHandler implementation -// ============================================================================ - -wxIMPLEMENT_DYNAMIC_CLASS(wxPNGHandler,wxImageHandler); - -#if wxUSE_STREAMS - -#ifndef PNGLINKAGEMODE - #ifdef PNGAPI - #define PNGLINKAGEMODE PNGAPI - #else - #define PNGLINKAGEMODE LINKAGEMODE - #endif -#endif - - -// VS: wxPNGInfoStruct declared below is a hack that needs some explanation. -// First, let me describe what's the problem: libpng uses jmp_buf in -// its png_struct structure. Unfortunately, this structure is -// compiler-specific and may vary in size, so if you use libpng compiled -// as DLL with another compiler than the main executable, it may not work. -// Luckily, it is still possible to use setjmp() & longjmp() as long as the -// structure is not part of png_struct. -// -// Sadly, there's no clean way to attach user-defined data to png_struct. -// There is only one customizable place, png_struct.io_ptr, which is meant -// only for I/O routines and is set with png_set_read_fn or -// png_set_write_fn. The hacky part is that we use io_ptr to store -// a pointer to wxPNGInfoStruct that holds I/O structures _and_ jmp_buf. - -struct wxPNGInfoStruct -{ - jmp_buf jmpbuf; - bool verbose; - - union - { - wxInputStream *in; - wxOutputStream *out; - } stream; -}; - -#define WX_PNG_INFO(png_ptr) ((wxPNGInfoStruct*)png_get_io_ptr(png_ptr)) - -// ---------------------------------------------------------------------------- -// helper functions -// ---------------------------------------------------------------------------- - -extern "C" -{ - -static void PNGLINKAGEMODE wx_PNG_stream_reader( png_structp png_ptr, png_bytep data, - png_size_t length ) -{ - WX_PNG_INFO(png_ptr)->stream.in->Read(data, length); -} - -static void PNGLINKAGEMODE wx_PNG_stream_writer( png_structp png_ptr, png_bytep data, - png_size_t length ) -{ - WX_PNG_INFO(png_ptr)->stream.out->Write(data, length); -} - -static void -PNGLINKAGEMODE wx_PNG_warning(png_structp png_ptr, png_const_charp message) -{ - wxPNGInfoStruct *info = png_ptr ? WX_PNG_INFO(png_ptr) : NULL; - if ( !info || info->verbose ) - { - wxLogWarning( wxString::FromAscii(message) ); - } -} - -// from pngerror.c -// so that the libpng doesn't send anything on stderr -static void -PNGLINKAGEMODE wx_PNG_error(png_structp png_ptr, png_const_charp message) -{ - wx_PNG_warning(NULL, message); - - // we're not using libpng built-in jump buffer (see comment before - // wxPNGInfoStruct above) so we have to return ourselves, otherwise libpng - // would just abort - longjmp(WX_PNG_INFO(png_ptr)->jmpbuf, 1); -} - -} // extern "C" - -// ---------------------------------------------------------------------------- -// LoadFile() helpers -// ---------------------------------------------------------------------------- - -unsigned char *InitAlpha(wxImage *image, png_uint_32 x, png_uint_32 y) -{ - // create alpha channel - image->SetAlpha(); - - unsigned char *alpha = image->GetAlpha(); - - // set alpha for the pixels we had so far - png_uint_32 end = y * image->GetWidth() + x; - for ( png_uint_32 i = 0; i < end; i++ ) - { - // all the previous pixels were opaque - *alpha++ = 0xff; - } - - return alpha; -} - -// ---------------------------------------------------------------------------- -// reading PNGs -// ---------------------------------------------------------------------------- - -bool wxPNGHandler::DoCanRead( wxInputStream& stream ) -{ - unsigned char hdr[4]; - - if ( !stream.Read(hdr, WXSIZEOF(hdr)) ) // it's ok to modify the stream position here - return false; - - return memcmp(hdr, "\211PNG", WXSIZEOF(hdr)) == 0; -} - -// convert data from RGB to wxImage format -static -void CopyDataFromPNG(wxImage *image, - unsigned char **lines, - png_uint_32 width, - png_uint_32 height, - int color_type) -{ - // allocated on demand if we have any non-opaque pixels - unsigned char *alpha = NULL; - - unsigned char *ptrDst = image->GetData(); - if ( !(color_type & PNG_COLOR_MASK_COLOR) ) - { - // grey image: GAGAGA... where G == grey component and A == alpha - for ( png_uint_32 y = 0; y < height; y++ ) - { - const unsigned char *ptrSrc = lines[y]; - for ( png_uint_32 x = 0; x < width; x++ ) - { - unsigned char g = *ptrSrc++; - unsigned char a = *ptrSrc++; - - // the first time we encounter a transparent pixel we must - // allocate alpha channel for the image - if ( !IsOpaque(a) && !alpha ) - alpha = InitAlpha(image, x, y); - - if ( alpha ) - *alpha++ = a; - - *ptrDst++ = g; - *ptrDst++ = g; - *ptrDst++ = g; - } - } - } - else // colour image: RGBRGB... - { - for ( png_uint_32 y = 0; y < height; y++ ) - { - const unsigned char *ptrSrc = lines[y]; - for ( png_uint_32 x = 0; x < width; x++ ) - { - unsigned char r = *ptrSrc++; - unsigned char g = *ptrSrc++; - unsigned char b = *ptrSrc++; - unsigned char a = *ptrSrc++; - - // the logic here is the same as for the grey case - if ( !IsOpaque(a) && !alpha ) - alpha = InitAlpha(image, x, y); - - if ( alpha ) - *alpha++ = a; - - *ptrDst++ = r; - *ptrDst++ = g; - *ptrDst++ = b; - } - } - } -} - -// temporarily disable the warning C4611 (interaction between '_setjmp' and -// C++ object destruction is non-portable) - I don't see any dtors here -#ifdef __VISUALC__ - #pragma warning(disable:4611) -#endif /* VC++ */ - -bool -wxPNGHandler::LoadFile(wxImage *image, - wxInputStream& stream, - bool verbose, - int WXUNUSED(index)) -{ - // VZ: as this function uses setjmp() the only fool-proof error handling - // method is to use goto (setjmp is not really C++ dtors friendly...) - - unsigned char **lines = NULL; - png_infop info_ptr = (png_infop) NULL; - wxPNGInfoStruct wxinfo; - - png_uint_32 i, width, height = 0; - int bit_depth, color_type, interlace_type; - - wxinfo.verbose = verbose; - wxinfo.stream.in = &stream; - - image->Destroy(); - - png_structp png_ptr = png_create_read_struct - ( - PNG_LIBPNG_VER_STRING, - NULL, - wx_PNG_error, - wx_PNG_warning - ); - if (!png_ptr) - goto error; - - // NB: please see the comment near wxPNGInfoStruct declaration for - // explanation why this line is mandatory - png_set_read_fn( png_ptr, &wxinfo, wx_PNG_stream_reader); - - info_ptr = png_create_info_struct( png_ptr ); - if (!info_ptr) - goto error; - - if (setjmp(wxinfo.jmpbuf)) - goto error; - - png_read_info( png_ptr, info_ptr ); - png_get_IHDR( png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, &interlace_type, NULL, NULL ); - - if (color_type == PNG_COLOR_TYPE_PALETTE) - png_set_expand( png_ptr ); - - // Fix for Bug [ 439207 ] Monochrome PNG images come up black - if (bit_depth < 8) - png_set_expand( png_ptr ); - - png_set_strip_16( png_ptr ); - png_set_packing( png_ptr ); - if (png_get_valid( png_ptr, info_ptr, PNG_INFO_tRNS)) - png_set_expand( png_ptr ); - png_set_filler( png_ptr, 0xff, PNG_FILLER_AFTER ); - - image->Create((int)width, (int)height, (bool) false /* no need to init pixels */); - - if (!image->IsOk()) - goto error; - - // initialize all line pointers to NULL to ensure that they can be safely - // free()d if an error occurs before all of them could be allocated - lines = (unsigned char **)calloc(height, sizeof(unsigned char *)); - if ( !lines ) - goto error; - - for (i = 0; i < height; i++) - { - if ((lines[i] = (unsigned char *)malloc( (size_t)(width * 4))) == NULL) - goto error; - } - - png_read_image( png_ptr, lines ); - png_read_end( png_ptr, info_ptr ); - -#if wxUSE_PALETTE - if (color_type == PNG_COLOR_TYPE_PALETTE) - { - png_colorp palette = NULL; - int numPalette = 0; - - (void) png_get_PLTE(png_ptr, info_ptr, &palette, &numPalette); - - unsigned char* r = new unsigned char[numPalette]; - unsigned char* g = new unsigned char[numPalette]; - unsigned char* b = new unsigned char[numPalette]; - - for (int j = 0; j < numPalette; j++) - { - r[j] = palette[j].red; - g[j] = palette[j].green; - b[j] = palette[j].blue; - } - - image->SetPalette(wxPalette(numPalette, r, g, b)); - delete[] r; - delete[] g; - delete[] b; - } -#endif // wxUSE_PALETTE - - - // set the image resolution if it's available - png_uint_32 resX, resY; - int unitType; - if (png_get_pHYs(png_ptr, info_ptr, &resX, &resY, &unitType) - == PNG_INFO_pHYs) - { - wxImageResolution res = wxIMAGE_RESOLUTION_CM; - - switch (unitType) - { - default: - wxLogWarning(_("Unknown PNG resolution unit %d"), unitType); - wxFALLTHROUGH; - - case PNG_RESOLUTION_UNKNOWN: - image->SetOption(wxIMAGE_OPTION_RESOLUTIONX, resX); - image->SetOption(wxIMAGE_OPTION_RESOLUTIONY, resY); - - res = wxIMAGE_RESOLUTION_NONE; - break; - - case PNG_RESOLUTION_METER: - /* - Convert meters to centimeters. - Use a string to not lose precision (converting to cm and then - to inch would result in integer rounding error). - If an app wants an int, GetOptionInt will convert and round - down for them. - */ - image->SetOption(wxIMAGE_OPTION_RESOLUTIONX, - wxString::FromCDouble((double) resX / 100.0, 2)); - image->SetOption(wxIMAGE_OPTION_RESOLUTIONY, - wxString::FromCDouble((double) resY / 100.0, 2)); - break; - } - - image->SetOption(wxIMAGE_OPTION_RESOLUTIONUNIT, res); - } - - - png_destroy_read_struct( &png_ptr, &info_ptr, (png_infopp) NULL ); - - // loaded successfully, now init wxImage with this data - CopyDataFromPNG(image, lines, width, height, color_type); - - for ( i = 0; i < height; i++ ) - free( lines[i] ); - free( lines ); - - return true; - -error: - if (verbose) - { - wxLogError(_("Couldn't load a PNG image - file is corrupted or not enough memory.")); - } - - if ( image->IsOk() ) - { - image->Destroy(); - } - - if ( lines ) - { - for ( unsigned int n = 0; n < height; n++ ) - free( lines[n] ); - - free( lines ); - } - - if ( png_ptr ) - { - if ( info_ptr ) - { - png_destroy_read_struct( &png_ptr, &info_ptr, (png_infopp) NULL ); - free(info_ptr); - } - else - png_destroy_read_struct( &png_ptr, (png_infopp) NULL, (png_infopp) NULL ); - } - return false; -} - -// ---------------------------------------------------------------------------- -// SaveFile() palette helpers -// ---------------------------------------------------------------------------- - -typedef wxLongToLongHashMap PaletteMap; - -static unsigned long PaletteMakeKey(const png_color_8& clr) -{ - return (wxImageHistogram::MakeKey(clr.red, clr.green, clr.blue) << 8) | clr.alpha; -} - -static long PaletteFind(const PaletteMap& palette, const png_color_8& clr) -{ - unsigned long value = PaletteMakeKey(clr); - PaletteMap::const_iterator it = palette.find(value); - - return (it != palette.end()) ? it->second : wxNOT_FOUND; -} - -static long PaletteAdd(PaletteMap *palette, const png_color_8& clr) -{ - unsigned long value = PaletteMakeKey(clr); - PaletteMap::const_iterator it = palette->find(value); - size_t index; - - if (it == palette->end()) - { - index = palette->size(); - (*palette)[value] = index; - } - else - { - index = it->second; - } - - return index; -} - -// ---------------------------------------------------------------------------- -// writing PNGs -// ---------------------------------------------------------------------------- - -bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbose ) -{ - wxPNGInfoStruct wxinfo; - - wxinfo.verbose = verbose; - wxinfo.stream.out = &stream; - - png_structp png_ptr = png_create_write_struct - ( - PNG_LIBPNG_VER_STRING, - NULL, - wx_PNG_error, - wx_PNG_warning - ); - if (!png_ptr) - { - if (verbose) - { - wxLogError(_("Couldn't save PNG image.")); - } - return false; - } - - png_infop info_ptr = png_create_info_struct(png_ptr); - if (info_ptr == NULL) - { - png_destroy_write_struct( &png_ptr, (png_infopp)NULL ); - if (verbose) - { - wxLogError(_("Couldn't save PNG image.")); - } - return false; - } - - if (setjmp(wxinfo.jmpbuf)) - { - png_destroy_write_struct( &png_ptr, (png_infopp)NULL ); - if (verbose) - { - wxLogError(_("Couldn't save PNG image.")); - } - return false; - } - - // NB: please see the comment near wxPNGInfoStruct declaration for - // explanation why this line is mandatory - png_set_write_fn( png_ptr, &wxinfo, wx_PNG_stream_writer, NULL); - - const int iHeight = image->GetHeight(); - const int iWidth = image->GetWidth(); - - const bool bHasPngFormatOption - = image->HasOption(wxIMAGE_OPTION_PNG_FORMAT); - - int iColorType = bHasPngFormatOption - ? image->GetOptionInt(wxIMAGE_OPTION_PNG_FORMAT) - : wxPNG_TYPE_COLOUR; - - bool bHasAlpha = image->HasAlpha(); - bool bHasMask = image->HasMask(); - - bool bUsePalette = iColorType == wxPNG_TYPE_PALETTE -#if wxUSE_PALETTE - || (!bHasPngFormatOption && image->HasPalette() ) -#endif - ; - - png_color_8 mask = { 0, 0, 0, 0, 0 }; - - if (bHasMask) - { - mask.red = image->GetMaskRed(); - mask.green = image->GetMaskGreen(); - mask.blue = image->GetMaskBlue(); - } - - PaletteMap palette; - - if (bUsePalette) - { - png_color png_rgb [PNG_MAX_PALETTE_LENGTH]; - png_byte png_trans[PNG_MAX_PALETTE_LENGTH]; - - const unsigned char *pColors = image->GetData(); - const unsigned char* pAlpha = image->GetAlpha(); - - if (bHasMask && !pAlpha) - { - // Mask must be first - PaletteAdd(&palette, mask); - } - - for (int y = 0; y < iHeight; y++) - { - for (int x = 0; x < iWidth; x++) - { - png_color_8 rgba; - - rgba.red = *pColors++; - rgba.green = *pColors++; - rgba.blue = *pColors++; - rgba.gray = 0; - rgba.alpha = (pAlpha && !bHasMask) ? *pAlpha++ : 0; - - // save in our palette - long index = PaletteAdd(&palette, rgba); - - if (index < PNG_MAX_PALETTE_LENGTH) - { - // save in libpng's palette - png_rgb[index].red = rgba.red; - png_rgb[index].green = rgba.green; - png_rgb[index].blue = rgba.blue; - png_trans[index] = rgba.alpha; - } - else - { - bUsePalette = false; - break; - } - } - } - - if (bUsePalette) - { - png_set_PLTE(png_ptr, info_ptr, png_rgb, palette.size()); - - if (bHasMask && !pAlpha) - { - wxASSERT(PaletteFind(palette, mask) == 0); - png_trans[0] = 0; - png_set_tRNS(png_ptr, info_ptr, png_trans, 1, NULL); - } - else if (pAlpha && !bHasMask) - { - png_set_tRNS(png_ptr, info_ptr, png_trans, palette.size(), NULL); - } - } - } - - /* - If saving palettised was requested but it was decided we can't use a - palette then reset the colour type to RGB. - */ - if (!bUsePalette && iColorType == wxPNG_TYPE_PALETTE) - { - iColorType = wxPNG_TYPE_COLOUR; - } - - bool bUseAlpha = !bUsePalette && (bHasAlpha || bHasMask); - - int iPngColorType; - - if (bUsePalette) - { - iPngColorType = PNG_COLOR_TYPE_PALETTE; - iColorType = wxPNG_TYPE_PALETTE; - } - else if ( iColorType==wxPNG_TYPE_COLOUR ) - { - iPngColorType = bUseAlpha ? PNG_COLOR_TYPE_RGB_ALPHA - : PNG_COLOR_TYPE_RGB; - } - else - { - iPngColorType = bUseAlpha ? PNG_COLOR_TYPE_GRAY_ALPHA - : PNG_COLOR_TYPE_GRAY; - } - - if (image->HasOption(wxIMAGE_OPTION_PNG_FILTER)) - png_set_filter( png_ptr, PNG_FILTER_TYPE_BASE, image->GetOptionInt(wxIMAGE_OPTION_PNG_FILTER) ); - - if (image->HasOption(wxIMAGE_OPTION_PNG_COMPRESSION_LEVEL)) - png_set_compression_level( png_ptr, image->GetOptionInt(wxIMAGE_OPTION_PNG_COMPRESSION_LEVEL) ); - - if (image->HasOption(wxIMAGE_OPTION_PNG_COMPRESSION_MEM_LEVEL)) - png_set_compression_mem_level( png_ptr, image->GetOptionInt(wxIMAGE_OPTION_PNG_COMPRESSION_MEM_LEVEL) ); - - if (image->HasOption(wxIMAGE_OPTION_PNG_COMPRESSION_STRATEGY)) - png_set_compression_strategy( png_ptr, image->GetOptionInt(wxIMAGE_OPTION_PNG_COMPRESSION_STRATEGY) ); - - if (image->HasOption(wxIMAGE_OPTION_PNG_COMPRESSION_BUFFER_SIZE)) - png_set_compression_buffer_size( png_ptr, image->GetOptionInt(wxIMAGE_OPTION_PNG_COMPRESSION_BUFFER_SIZE) ); - - int iBitDepth = !bUsePalette && image->HasOption(wxIMAGE_OPTION_PNG_BITDEPTH) - ? image->GetOptionInt(wxIMAGE_OPTION_PNG_BITDEPTH) - : 8; - - png_set_IHDR( png_ptr, info_ptr, image->GetWidth(), image->GetHeight(), - iBitDepth, iPngColorType, - PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE, - PNG_FILTER_TYPE_BASE); - - int iElements; - png_color_8 sig_bit; - - if ( iPngColorType & PNG_COLOR_MASK_COLOR ) - { - sig_bit.red = - sig_bit.green = - sig_bit.blue = (png_byte)iBitDepth; - iElements = 3; - } - else // grey - { - sig_bit.gray = (png_byte)iBitDepth; - iElements = 1; - } - - if ( bUseAlpha ) - { - sig_bit.alpha = (png_byte)iBitDepth; - iElements++; - } - - if ( iBitDepth == 16 ) - iElements *= 2; - - // save the image resolution if we have it - int resX, resY; - switch ( GetResolutionFromOptions(*image, &resX, &resY) ) - { - case wxIMAGE_RESOLUTION_INCHES: - { - const double INCHES_IN_METER = 10000.0 / 254; - resX = int(resX * INCHES_IN_METER); - resY = int(resY * INCHES_IN_METER); - } - break; - - case wxIMAGE_RESOLUTION_CM: - resX *= 100; - resY *= 100; - break; - - case wxIMAGE_RESOLUTION_NONE: - break; - - default: - wxFAIL_MSG( wxT("unsupported image resolution units") ); - } - - if ( resX && resY ) - png_set_pHYs( png_ptr, info_ptr, resX, resY, PNG_RESOLUTION_METER ); - - png_set_sBIT( png_ptr, info_ptr, &sig_bit ); - png_write_info( png_ptr, info_ptr ); - png_set_shift( png_ptr, &sig_bit ); - png_set_packing( png_ptr ); - - unsigned char * - data = (unsigned char *)malloc( image->GetWidth() * iElements ); - if ( !data ) - { - png_destroy_write_struct( &png_ptr, (png_infopp)NULL ); - return false; - } - - const unsigned char * - pAlpha = (const unsigned char *)(bHasAlpha ? image->GetAlpha() : NULL); - - const unsigned char *pColors = image->GetData(); - - for (int y = 0; y != iHeight; ++y) - { - unsigned char *pData = data; - for (int x = 0; x != iWidth; x++) - { - png_color_8 clr; - clr.red = *pColors++; - clr.green = *pColors++; - clr.blue = *pColors++; - clr.gray = 0; - clr.alpha = (bUsePalette && pAlpha) ? *pAlpha++ : 0; // use with wxPNG_TYPE_PALETTE only - - switch ( iColorType ) - { - default: - wxFAIL_MSG( wxT("unknown wxPNG_TYPE_XXX") ); - wxFALLTHROUGH; - - case wxPNG_TYPE_COLOUR: - *pData++ = clr.red; - if ( iBitDepth == 16 ) - *pData++ = 0; - *pData++ = clr.green; - if ( iBitDepth == 16 ) - *pData++ = 0; - *pData++ = clr.blue; - if ( iBitDepth == 16 ) - *pData++ = 0; - break; - - case wxPNG_TYPE_GREY: - { - // where do these coefficients come from? maybe we - // should have image options for them as well? - unsigned uiColor = - (unsigned) (76.544*(unsigned)clr.red + - 150.272*(unsigned)clr.green + - 36.864*(unsigned)clr.blue); - - *pData++ = (unsigned char)((uiColor >> 8) & 0xFF); - if ( iBitDepth == 16 ) - *pData++ = (unsigned char)(uiColor & 0xFF); - } - break; - - case wxPNG_TYPE_GREY_RED: - *pData++ = clr.red; - if ( iBitDepth == 16 ) - *pData++ = 0; - break; - - case wxPNG_TYPE_PALETTE: - *pData++ = (unsigned char) PaletteFind(palette, clr); - break; - } - - if ( bUseAlpha ) - { - unsigned char uchAlpha = 255; - if ( bHasAlpha ) - uchAlpha = *pAlpha++; - - if ( bHasMask ) - { - if ( (clr.red == mask.red) - && (clr.green == mask.green) - && (clr.blue == mask.blue) ) - uchAlpha = 0; - } - - *pData++ = uchAlpha; - if ( iBitDepth == 16 ) - *pData++ = 0; - } - } - - png_bytep row_ptr = data; - png_write_rows( png_ptr, &row_ptr, 1 ); - } - - free(data); - png_write_end( png_ptr, info_ptr ); - png_destroy_write_struct( &png_ptr, (png_infopp)&info_ptr ); - - return true; -} - -#ifdef __VISUALC__ - #pragma warning(default:4611) -#endif /* VC++ */ - -#endif // wxUSE_STREAMS - -/*static*/ wxVersionInfo wxPNGHandler::GetLibraryVersionInfo() -{ - // The version string seems to always have a leading space and a trailing - // new line, get rid of them both. - wxString str = png_get_header_version(NULL) + 1; - str.Replace("\n", ""); - - return wxVersionInfo("libpng", - PNG_LIBPNG_VER_MAJOR, - PNG_LIBPNG_VER_MINOR, - PNG_LIBPNG_VER_RELEASE, - str); -} - -#endif // wxUSE_LIBPNG diff --git a/Externals/wxWidgets3/src/common/imagpnm.cpp b/Externals/wxWidgets3/src/common/imagpnm.cpp deleted file mode 100644 index b244dc2aaf..0000000000 --- a/Externals/wxWidgets3/src/common/imagpnm.cpp +++ /dev/null @@ -1,215 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/imagpnm.cpp -// Purpose: wxImage PNM handler -// Author: Sylvain Bougnoux -// Copyright: (c) Sylvain Bougnoux -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_IMAGE && wxUSE_PNM - -#include "wx/imagpnm.h" - -#ifndef WX_PRECOMP - #include "wx/intl.h" - #include "wx/log.h" -#endif - -#include "wx/txtstrm.h" - -//----------------------------------------------------------------------------- -// wxBMPHandler -//----------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxPNMHandler,wxImageHandler); - -#if wxUSE_STREAMS - -void Skip_Comment(wxInputStream &stream) -{ - wxTextInputStream text_stream(stream); - - if (stream.Peek()==wxT('#')) - { - text_stream.ReadLine(); - Skip_Comment(stream); - } -} - -bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose, int WXUNUSED(index) ) -{ - wxUint32 width, height; - wxUint16 maxval; - char c(0); - - image->Destroy(); - - /* - * Read the PNM header - */ - - wxBufferedInputStream buf_stream(stream); - wxTextInputStream text_stream(buf_stream); - - Skip_Comment(buf_stream); - if (buf_stream.GetC()==wxT('P')) c=buf_stream.GetC(); - - switch (c) - { - case wxT('2'): // ASCII Grey - case wxT('3'): // ASCII RGB - case wxT('5'): // RAW Grey - case wxT('6'): break; - default: - if (verbose) - { - wxLogError(_("PNM: File format is not recognized.")); - } - return false; - } - - text_stream.ReadLine(); // for the \n - Skip_Comment(buf_stream); - text_stream >> width >> height ; - Skip_Comment(buf_stream); - text_stream >> maxval; - - //cout << line << " " << width << " " << height << " " << maxval << endl; - image->Create( width, height ); - unsigned char *ptr = image->GetData(); - if (!ptr) - { - if (verbose) - { - wxLogError( _("PNM: Couldn't allocate memory.") ); - } - return false; - } - - - if (c=='2') // Ascii GREY - { - wxUint32 value, size=width*height; - for (wxUint32 i=0; iSetMask( false ); - - const wxStreamError err = buf_stream.GetLastError(); - return err == wxSTREAM_NO_ERROR || err == wxSTREAM_EOF; -} - -bool wxPNMHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool WXUNUSED(verbose) ) -{ - wxTextOutputStream text_stream(stream); - - //text_stream << "P6" << endl - //<< image->GetWidth() << " " << image->GetHeight() << endl - //<< "255" << endl; - text_stream << wxT("P6\n") << image->GetWidth() << wxT(" ") << image->GetHeight() << wxT("\n255\n"); - stream.Write(image->GetData(),3*image->GetWidth()*image->GetHeight()); - - return stream.IsOk(); -} - -bool wxPNMHandler::DoCanRead( wxInputStream& stream ) -{ - Skip_Comment(stream); - - // it's ok to modify the stream position here - if ( stream.GetC() == 'P' ) - { - switch ( stream.GetC() ) - { - case '2': // ASCII Grey - case '3': // ASCII RGB - case '5': // RAW Grey - case '6': // RAW RGB - return true; - } - } - - return false; -} - - -#endif // wxUSE_STREAMS - -#endif // wxUSE_IMAGE && wxUSE_PNM diff --git a/Externals/wxWidgets3/src/common/imagtga.cpp b/Externals/wxWidgets3/src/common/imagtga.cpp deleted file mode 100644 index dc14db549d..0000000000 --- a/Externals/wxWidgets3/src/common/imagtga.cpp +++ /dev/null @@ -1,873 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/imagtga.cpp -// Purpose: wxImage TGA handler -// Author: Seth Jackson -// Copyright: (c) 2005 Seth Jackson -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_IMAGE && wxUSE_TGA - -#ifndef WX_PRECOMP - #include "wx/palette.h" -#endif - -#include "wx/imagtga.h" -#include "wx/log.h" -#include "wx/scopeguard.h" - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -// TGA error codes. -enum -{ - wxTGA_OK, - wxTGA_INVFORMAT, - wxTGA_MEMERR, - wxTGA_IOERR -}; - -// TGA header bytes. -enum -{ - HDR_OFFSET = 0, - HDR_COLORTYPE = 1, - HDR_IMAGETYPE = 2, - HDR_PALETTESTART = 3, - HDR_PALETTELENGTH = 5, - HDR_PALETTEBITS = 7, - HDR_XORIGIN = 8, - HDR_YORIGIN = 10, - HDR_WIDTH = 12, - HDR_HEIGHT = 14, - HDR_BPP = 16, - HDR_ORIENTATION = 17, - HDR_SIZE -}; - -// TGA color types. -enum -{ - wxTGA_UNMAPPED = 0, - wxTGA_MAPPED = 1 -}; - -// ============================================================================ -// implementation -// ============================================================================ - -wxIMPLEMENT_DYNAMIC_CLASS(wxTGAHandler, wxImageHandler); - -#if wxUSE_STREAMS - -// ---------------------------------------------------------------------------- -// worker functions -// ---------------------------------------------------------------------------- - -static -void FlipTGA(unsigned char* imageData, int width, int height, short pixelSize) -{ - int lineLength = width * pixelSize; - unsigned char *line1 = imageData; - unsigned char *line2 = &imageData[lineLength * (height - 1)]; - - unsigned char temp; - for ( ; line1 < line2; line2 -= (lineLength * 2)) - { - for (int index = 0; index < lineLength; line1++, line2++, index++) - { - temp = *line1; - *line1 = *line2; - *line2 = temp; - } - } -} - -// return wxTGA_OK or wxTGA_IOERR -static -int DecodeRLE(unsigned char* imageData, unsigned long imageSize, - short pixelSize, wxInputStream& stream) -{ - unsigned long outputLength = 0; - unsigned char current; - unsigned int length; - unsigned char buf[4]; - - while (outputLength < imageSize) - { - int ch = stream.GetC(); - if ( ch == wxEOF ) - return wxTGA_IOERR; - - current = ch; - - // RLE packet. - if ( current & 0x80 ) - { - // Get the run length of the packet. - current &= 0x7f; - - current++; - - length = current; - - outputLength += current * pixelSize; - - if (outputLength > imageSize) - { - return wxTGA_IOERR; - } - - // Repeat the pixel length times. - if ( !stream.Read(buf, pixelSize) ) - return wxTGA_IOERR; - - for (unsigned int i = 0; i < length; i++) - { - memcpy(imageData, buf, pixelSize); - - imageData += pixelSize; - } - } - else // Raw packet. - { - // Get the run length of the packet. - current++; - - length = current * pixelSize; - - outputLength += length; - - if (outputLength > imageSize) - { - return wxTGA_IOERR; - } - - // Write the next length pixels directly to the image data. - if ( !stream.Read(imageData, length) ) - return wxTGA_IOERR; - - imageData += length; - } - } - - return wxTGA_OK; -} - -/* -Mimic the behaviour of wxPalette.GetRGB and the way the TGA image handler -used it. That is: don't check the return value of GetRGB and continue decoding -using previous RGB values. - -It might be better to check for palette index bounds and stop decoding if -it's out of range (and add something like wxTGA_DATAERR to indicate unexpected -pixel data). -*/ -static -void Palette_GetRGB(const unsigned char *palette, unsigned int paletteCount, - unsigned int index, - unsigned char *red, unsigned char *green, unsigned char *blue) -{ - if (index >= paletteCount) - { - return; - } - - *red = palette[index]; - *green = palette[(paletteCount * 1) + index]; - *blue = palette[(paletteCount * 2) + index]; -} - -static -void Palette_SetRGB(unsigned char *palette, unsigned int paletteCount, - unsigned int index, - unsigned char red, unsigned char green, unsigned char blue) -{ - palette[index] = red; - palette[(paletteCount * 1) + index] = green; - palette[(paletteCount * 2) + index] = blue; -} - -static -int ReadTGA(wxImage* image, wxInputStream& stream) -{ - // Read in the TGA header - unsigned char hdr[HDR_SIZE]; - stream.Read(hdr, HDR_SIZE); - - short offset = hdr[HDR_OFFSET] + HDR_SIZE; - short colorType = hdr[HDR_COLORTYPE]; - short imageType = hdr[HDR_IMAGETYPE]; - unsigned int paletteLength = hdr[HDR_PALETTELENGTH] - + 256 * hdr[HDR_PALETTELENGTH + 1]; - int width = (hdr[HDR_WIDTH] + 256 * hdr[HDR_WIDTH + 1]) - - (hdr[HDR_XORIGIN] + 256 * hdr[HDR_XORIGIN + 1]); - int height = (hdr[HDR_HEIGHT] + 256 * hdr[HDR_HEIGHT + 1]) - - (hdr[HDR_YORIGIN] + 256 * hdr[HDR_YORIGIN + 1]); - short bpp = hdr[HDR_BPP]; - short orientation = hdr[HDR_ORIENTATION] & 0x20; - - image->Create(width, height); - - if (!image->IsOk()) - { - return wxTGA_MEMERR; - } - - const short pixelSize = bpp / 8; - - const unsigned long imageSize = width * height * pixelSize; - - unsigned char *imageData = (unsigned char* )malloc(imageSize); - - if (!imageData) - { - return wxTGA_MEMERR; - } - - wxON_BLOCK_EXIT1(free, imageData); - - unsigned char *dst = image->GetData(); - - unsigned char* alpha = NULL; - if (bpp == 16 || bpp == 32) - { - image->SetAlpha(); - - alpha = image->GetAlpha(); - } - - // Seek from the offset we got from the TGA header. - if (stream.SeekI(offset, wxFromStart) == wxInvalidOffset) - return wxTGA_INVFORMAT; - - unsigned char *palette = NULL; - // Load a palette if we have one. - if (colorType == wxTGA_MAPPED) - { - unsigned char buf[3]; - - palette = (unsigned char *) malloc(paletteLength * 3); - - for (unsigned int i = 0; i < paletteLength; i++) - { - stream.Read(buf, 3); - - Palette_SetRGB(palette, paletteLength, i, buf[2], buf[1], buf[0]); - } - -#if wxUSE_PALETTE - // Set the palette of the image. - image->SetPalette(wxPalette((int) paletteLength, &palette[0], - &palette[paletteLength * 1], &palette[paletteLength * 2])); -#endif // wxUSE_PALETTE - - } - - wxON_BLOCK_EXIT1(free, palette); - - // Handle the various TGA formats we support. - - switch (imageType) - { - // Raw indexed. - - case 1: - { - unsigned char r = 0; - unsigned char g = 0; - unsigned char b = 0; - - // No compression read the data directly to imageData. - - stream.Read(imageData, imageSize); - - // If orientation == 0, then the image is stored upside down. - // We need to store it right side up. - - if (orientation == 0) - { - FlipTGA(imageData, width, height, pixelSize); - } - - // Handle the different pixel depths. - - switch (bpp) - { - // 8 bpp. - - case 8: - { - for (unsigned long index = 0; index < imageSize; index += pixelSize) - { - Palette_GetRGB(palette, paletteLength, - imageData[index], &r, &g, &b); - - *(dst++) = r; - *(dst++) = g; - *(dst++) = b; - } - } - break; - - // 16 bpp. - - case 16: - { - for (unsigned long index = 0; index < imageSize; index += pixelSize) - { - Palette_GetRGB(palette, paletteLength, - imageData[index], &r, &g, &b); - - *(dst++) = r; - *(dst++) = g; - *(dst++) = b; - *(alpha++) = (imageData[index + 1] & 0x80) ? 0 : 255; - } - } - break; - - default: - return wxTGA_INVFORMAT; - } - } - break; - - // Raw RGB. - - case 2: - { - // No compression read the data directly to imageData. - - stream.Read(imageData, imageSize); - - // If orientation == 0, then the image is stored upside down. - // We need to store it right side up. - - if (orientation == 0) - { - FlipTGA(imageData, width, height, pixelSize); - } - - // Handle the different pixel depths. - - switch (bpp) - { - //16 bpp. - - case 16: - { - unsigned char temp; - - for (unsigned long index = 0; index < imageSize; index += pixelSize) - { - temp = (imageData[index + 1] & 0x7c) << 1; - temp |= temp >> 5; - *(dst++) = temp; - - temp = ((imageData[index + 1] & 0x03) << 6) | ((imageData[index] & 0xe0) >> 2); - temp |= temp >> 5; - *(dst++) = temp; - - temp = (imageData[index] & 0x1f) << 3; - temp |= temp >> 5; - *(dst++) = temp; - - *(alpha++) = (imageData[index + 1] & 0x80) ? 0 : 255; - } - } - break; - - // 24 bpp. - - case 24: - { - for (unsigned long index = 0; index < imageSize; index += pixelSize) - { - *(dst++) = imageData[index + 2]; - *(dst++) = imageData[index + 1]; - *(dst++) = imageData[index]; - } - } - break; - - // 32 bpp. - - case 32: - { - for (unsigned long index = 0; index < imageSize; index += pixelSize) - { - *(dst++) = imageData[index + 2]; - *(dst++) = imageData[index + 1]; - *(dst++) = imageData[index]; - *(alpha++) = imageData[index + 3]; - } - } - break; - - default: - return wxTGA_INVFORMAT; - } - } - break; - - // Raw grayscale. - - case 3: - { - // No compression read the data directly to imageData. - - stream.Read(imageData, imageSize); - - // If orientation == 0, then the image is stored upside down. - // We need to store it right side up. - - if (orientation == 0) - { - FlipTGA(imageData, width, height, pixelSize); - } - - // Handle the different pixel depths. - - switch (bpp) - { - // 8 bpp. - - case 8: - { - for (unsigned long index = 0; index < imageSize; index += pixelSize) - { - *(dst++) = imageData[index]; - *(dst++) = imageData[index]; - *(dst++) = imageData[index]; - } - } - break; - - // 16 bpp. - - case 16: - { - for (unsigned long index = 0; index < imageSize; index += pixelSize) - { - *(dst++) = imageData[index]; - *(dst++) = imageData[index]; - *(dst++) = imageData[index]; - *(alpha++) = imageData[index + 1]; - } - } - break; - - default: - return wxTGA_INVFORMAT; - } - } - break; - - // RLE indexed. - - case 9: - { - unsigned char r = 0; - unsigned char g = 0; - unsigned char b = 0; - - // Decode the RLE data. - - int rc = DecodeRLE(imageData, imageSize, pixelSize, stream); - if ( rc != wxTGA_OK ) - return rc; - - // If orientation == 0, then the image is stored upside down. - // We need to store it right side up. - - if (orientation == 0) - { - FlipTGA(imageData, width, height, pixelSize); - } - - // Handle the different pixel depths. - - switch (bpp) - { - // 8 bpp. - - case 8: - { - for (unsigned long index = 0; index < imageSize; index += pixelSize) - { - Palette_GetRGB(palette, paletteLength, - imageData[index], &r, &g, &b); - - *(dst++) = r; - *(dst++) = g; - *(dst++) = b; - } - } - break; - - // 16 bpp. - - case 16: - { - for (unsigned long index = 0; index < imageSize; index += pixelSize) - { - Palette_GetRGB(palette, paletteLength, - imageData[index], &r, &g, &b); - - *(dst++) = r; - *(dst++) = g; - *(dst++) = b; - *(alpha++) = (imageData[index + 1] & 0x80) ? 0 : 255; - } - } - break; - - default: - return wxTGA_INVFORMAT; - } - } - break; - - // RLE RGB. - - case 10: - { - // Decode the RLE data. - - int rc = DecodeRLE(imageData, imageSize, pixelSize, stream); - if ( rc != wxTGA_OK ) - return rc; - - // If orientation == 0, then the image is stored upside down. - // We need to store it right side up. - - if (orientation == 0) - { - FlipTGA(imageData, width, height, pixelSize); - } - - // Handle the different pixel depths. - - switch (bpp) - { - //16 bpp. - - case 16: - { - unsigned char temp; - - for (unsigned long index = 0; index < imageSize; index += pixelSize) - { - temp = (imageData[index + 1] & 0x7c) << 1; - temp |= temp >> 5; - *(dst++) = temp; - - temp = ((imageData[index + 1] & 0x03) << 6) | ((imageData[index] & 0xe0) >> 2); - temp |= temp >> 5; - *(dst++) = temp; - - temp = (imageData[index] & 0x1f) << 3; - temp |= temp >> 5; - *(dst++) = temp; - - *(alpha++) = (imageData[index + 1] & 0x80) ? 0 : 255; - } - } - break; - - // 24 bpp. - - case 24: - { - for (unsigned long index = 0; index < imageSize; index += pixelSize) - { - *(dst++) = imageData[index + 2]; - *(dst++) = imageData[index + 1]; - *(dst++) = imageData[index]; - } - } - break; - - // 32 bpp. - - case 32: - { - for (unsigned long index = 0; index < imageSize; index += pixelSize) - { - *(dst++) = imageData[index + 2]; - *(dst++) = imageData[index + 1]; - *(dst++) = imageData[index]; - *(alpha++) = imageData[index + 3]; - } - } - break; - - default: - return wxTGA_INVFORMAT; - } - } - break; - - // RLE grayscale. - - case 11: - { - // Decode the RLE data. - - int rc = DecodeRLE(imageData, imageSize, pixelSize, stream); - if ( rc != wxTGA_OK ) - return rc; - - // If orientation == 0, then the image is stored upside down. - // We need to store it right side up. - - if (orientation == 0) - { - FlipTGA(imageData, width, height, pixelSize); - } - - // Handle the different pixel depths. - - switch (bpp) - { - // 8 bpp. - - case 8: - { - for (unsigned long index = 0; index < imageSize; index += pixelSize) - { - *(dst++) = imageData[index]; - *(dst++) = imageData[index]; - *(dst++) = imageData[index]; - } - } - break; - - // 16 bpp. - - case 16: - { - for (unsigned long index = 0; index < imageSize; index += pixelSize) - { - *(dst++) = imageData[index]; - *(dst++) = imageData[index]; - *(dst++) = imageData[index]; - *(alpha++) = imageData[index + 1]; - } - } - break; - - default: - return wxTGA_INVFORMAT; - } - } - break; - - default: - return wxTGA_INVFORMAT; - } - - return wxTGA_OK; -} - -static -int SaveTGA(const wxImage& image, wxOutputStream *stream) -{ - bool hasAlpha = image.HasAlpha(); - unsigned bytesPerPixel = 3 + (hasAlpha ? 1 : 0); - wxSize size = image.GetSize(); - size_t scanlineSize = size.x * bytesPerPixel; - unsigned char *scanlineData = (unsigned char *) malloc(scanlineSize); - if (!scanlineData) - { - return wxTGA_MEMERR; - } - - wxON_BLOCK_EXIT1(free, scanlineData); - - // Compose and write the TGA header - unsigned char hdr[HDR_SIZE]; - (void) memset(&hdr, 0, HDR_SIZE); - - hdr[HDR_COLORTYPE] = wxTGA_UNMAPPED; - hdr[HDR_IMAGETYPE] = 2 /* Uncompressed truecolour */; - - hdr[HDR_WIDTH] = size.x & 0xFF; - hdr[HDR_WIDTH + 1] = (size.x >> 8) & 0xFF; - - hdr[HDR_HEIGHT] = size.y & 0xFF; - hdr[HDR_HEIGHT + 1] = (size.y >> 8) & 0xFF; - - hdr[HDR_BPP] = hasAlpha ? 32 : 24; - hdr[HDR_ORIENTATION] = 1 << 5; // set bit to indicate top-down order - if (hasAlpha) - { - hdr[HDR_ORIENTATION] |= 8; // number of alpha bits - } - - if ( !stream->Write(hdr, HDR_SIZE) ) - { - return wxTGA_IOERR; - } - - - // Write image data, converting RGB to BGR and adding alpha if applicable - - unsigned char *src = image.GetData(); - unsigned char *alpha = image.GetAlpha(); - for (int y = 0; y < size.y; ++y) - { - unsigned char *dst = scanlineData; - for (int x = 0; x < size.x; ++x) - { - dst[0] = src[2]; - dst[1] = src[1]; - dst[2] = src[0]; - if (alpha) - { - dst[3] = *(alpha++); - } - src += 3; - dst += bytesPerPixel; - } - if ( !stream->Write(scanlineData, scanlineSize) ) - { - return wxTGA_IOERR; - } - } - - return wxTGA_OK; -} - -// ---------------------------------------------------------------------------- -// wxTGAHandler -// ---------------------------------------------------------------------------- - -bool wxTGAHandler::LoadFile(wxImage* image, - wxInputStream& stream, - bool verbose, - int WXUNUSED(index)) -{ - if ( !CanRead(stream) ) - { - if ( verbose ) - { - wxLogError(wxT("TGA: this is not a TGA file.")); - } - - return false; - } - - image->Destroy(); - - int error = ReadTGA(image, stream); - if ( error != wxTGA_OK ) - { - if ( verbose ) - { - switch ( error ) - { - case wxTGA_INVFORMAT: - wxLogError(wxT("TGA: image format unsupported.")); - break; - - case wxTGA_MEMERR: - wxLogError(wxT("TGA: couldn't allocate memory.")); - break; - - case wxTGA_IOERR: - wxLogError(wxT("TGA: couldn't read image data.")); - break; - - default: - wxLogError(wxT("TGA: unknown error!")); - } - } - - image->Destroy(); - - return false; - } - - return true; -} - -bool wxTGAHandler::SaveFile(wxImage* image, wxOutputStream& stream, bool verbose) -{ - int error = SaveTGA(*image, &stream); - - if ( error != wxTGA_OK ) - { - if ( verbose ) - { - switch ( error ) - { - case wxTGA_MEMERR: - wxLogError(wxT("TGA: couldn't allocate memory.")); - break; - - case wxTGA_IOERR: - wxLogError(wxT("TGA: couldn't write image data.")); - break; - - default: - wxLogError(wxT("TGA: unknown error!")); - } - } - - return false; - } - - return true; -} - -bool wxTGAHandler::DoCanRead(wxInputStream& stream) -{ - // read the fixed-size TGA headers - unsigned char hdr[HDR_SIZE]; - stream.Read(hdr, HDR_SIZE); // it's ok to modify the stream position here - - // Check whether we can read the file or not. - - short colorType = hdr[HDR_COLORTYPE]; - if ( colorType != wxTGA_UNMAPPED && colorType != wxTGA_MAPPED ) - { - return false; - } - - short imageType = hdr[HDR_IMAGETYPE]; - if ( imageType == 0 || imageType == 32 || imageType == 33 ) - { - return false; - } - - short bpp = hdr[HDR_BPP]; - if ( bpp != 8 && bpp != 16 && bpp != 24 && bpp != 32 ) - { - return false; - } - - return true; -} - -#endif // wxUSE_STREAMS - -#endif // wxUSE_IMAGE && wxUSE_TGA diff --git a/Externals/wxWidgets3/src/common/imagtiff.cpp b/Externals/wxWidgets3/src/common/imagtiff.cpp deleted file mode 100644 index ed8cb22fd4..0000000000 --- a/Externals/wxWidgets3/src/common/imagtiff.cpp +++ /dev/null @@ -1,903 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/imagtiff.cpp -// Purpose: wxImage TIFF handler -// Author: Robert Roebling -// Copyright: (c) Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_IMAGE && wxUSE_LIBTIFF - -#include "wx/imagtiff.h" -#include "wx/versioninfo.h" - -#ifndef WX_PRECOMP - #include "wx/log.h" - #include "wx/app.h" - #include "wx/intl.h" - #include "wx/bitmap.h" - #include "wx/module.h" - #include "wx/wxcrtvararg.h" -#endif - -extern "C" -{ - #include "tiff.h" - #include "tiffio.h" -} -#include "wx/filefn.h" -#include "wx/wfstream.h" - -#ifndef TIFFLINKAGEMODE - #define TIFFLINKAGEMODE LINKAGEMODE -#endif - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// TIFF library error/warning handlers -// ---------------------------------------------------------------------------- - -static wxString -FormatTiffMessage(const char *module, const char *fmt, va_list ap) -{ - char buf[512]; - if ( wxCRT_VsnprintfA(buf, WXSIZEOF(buf), fmt, ap) <= 0 ) - { - // this isn't supposed to happen, but if it does, it's better - // than nothing - strcpy(buf, "Incorrectly formatted TIFF message"); - } - buf[WXSIZEOF(buf)-1] = 0; // make sure it is always NULL-terminated - - wxString msg(buf); - if ( module ) - msg += wxString::Format(_(" (in module \"%s\")"), module); - - return msg; -} - -extern "C" -{ - -static void -TIFFwxWarningHandler(const char* module, const char *fmt, va_list ap) -{ - wxLogWarning("%s", FormatTiffMessage(module, fmt, ap)); -} - -static void -TIFFwxErrorHandler(const char* module, const char *fmt, va_list ap) -{ - wxLogError("%s", FormatTiffMessage(module, fmt, ap)); -} - -} // extern "C" - -//----------------------------------------------------------------------------- -// wxTIFFHandler -//----------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxTIFFHandler,wxImageHandler); - -wxTIFFHandler::wxTIFFHandler() -{ - m_name = wxT("TIFF file"); - m_extension = wxT("tif"); - m_altExtensions.Add(wxT("tiff")); - m_type = wxBITMAP_TYPE_TIFF; - m_mime = wxT("image/tiff"); - TIFFSetWarningHandler((TIFFErrorHandler) TIFFwxWarningHandler); - TIFFSetErrorHandler((TIFFErrorHandler) TIFFwxErrorHandler); -} - -#if wxUSE_STREAMS - -// helper to translate our, possibly 64 bit, wxFileOffset to TIFF, always 32 -// bit, toff_t -static toff_t wxFileOffsetToTIFF(wxFileOffset ofs) -{ - if ( ofs == wxInvalidOffset ) - return (toff_t)-1; - - toff_t tofs = wx_truncate_cast(toff_t, ofs); - wxCHECK_MSG( (wxFileOffset)tofs == ofs, (toff_t)-1, - wxT("TIFF library doesn't support large files") ); - - return tofs; -} - -// another helper to convert standard seek mode to our -static wxSeekMode wxSeekModeFromTIFF(int whence) -{ - switch ( whence ) - { - case SEEK_SET: - return wxFromStart; - - case SEEK_CUR: - return wxFromCurrent; - - case SEEK_END: - return wxFromEnd; - - default: - return wxFromCurrent; - } -} - -extern "C" -{ - -tsize_t TIFFLINKAGEMODE -wxTIFFNullProc(thandle_t WXUNUSED(handle), - tdata_t WXUNUSED(buf), - tsize_t WXUNUSED(size)) -{ - return (tsize_t) -1; -} - -tsize_t TIFFLINKAGEMODE -wxTIFFReadProc(thandle_t handle, tdata_t buf, tsize_t size) -{ - wxInputStream *stream = (wxInputStream*) handle; - stream->Read( (void*) buf, (size_t) size ); - return wx_truncate_cast(tsize_t, stream->LastRead()); -} - -tsize_t TIFFLINKAGEMODE -wxTIFFWriteProc(thandle_t handle, tdata_t buf, tsize_t size) -{ - wxOutputStream *stream = (wxOutputStream*) handle; - stream->Write( (void*) buf, (size_t) size ); - return wx_truncate_cast(tsize_t, stream->LastWrite()); -} - -toff_t TIFFLINKAGEMODE -wxTIFFSeekIProc(thandle_t handle, toff_t off, int whence) -{ - wxInputStream *stream = (wxInputStream*) handle; - - return wxFileOffsetToTIFF(stream->SeekI((wxFileOffset)off, - wxSeekModeFromTIFF(whence))); -} - -toff_t TIFFLINKAGEMODE -wxTIFFSeekOProc(thandle_t handle, toff_t off, int whence) -{ - wxOutputStream *stream = (wxOutputStream*) handle; - - toff_t offset = wxFileOffsetToTIFF( - stream->SeekO((wxFileOffset)off, wxSeekModeFromTIFF(whence)) ); - - if (offset != (toff_t) -1 || whence != SEEK_SET) - { - return offset; - } - - - /* - Try to workaround problems with libtiff seeking past the end of streams. - - This occurs when libtiff is writing tag entries past the end of a - stream but hasn't written the directory yet (which will be placed - before the tags and contain offsets to the just written tags). - The behaviour for seeking past the end of a stream is not consistent - and doesn't work with for example wxMemoryOutputStream. When this type - of seeking fails (with SEEK_SET), fill in the gap with zeroes and try - again. - */ - - wxFileOffset streamLength = stream->GetLength(); - if (streamLength != wxInvalidOffset && (wxFileOffset) off > streamLength) - { - if (stream->SeekO(streamLength, wxFromStart) == wxInvalidOffset) - { - return (toff_t) -1; - } - - for (wxFileOffset i = 0; i < (wxFileOffset) off - streamLength; ++i) - { - stream->PutC(0); - } - } - - return wxFileOffsetToTIFF( stream->TellO() ); -} - -int TIFFLINKAGEMODE -wxTIFFCloseIProc(thandle_t WXUNUSED(handle)) -{ - // there is no need to close the input stream - return 0; -} - -int TIFFLINKAGEMODE -wxTIFFCloseOProc(thandle_t handle) -{ - wxOutputStream *stream = (wxOutputStream*) handle; - - return stream->Close() ? 0 : -1; -} - -toff_t TIFFLINKAGEMODE -wxTIFFSizeProc(thandle_t handle) -{ - wxStreamBase *stream = (wxStreamBase*) handle; - return (toff_t) stream->GetSize(); -} - -int TIFFLINKAGEMODE -wxTIFFMapProc(thandle_t WXUNUSED(handle), - tdata_t* WXUNUSED(pbase), - toff_t* WXUNUSED(psize)) -{ - return 0; -} - -void TIFFLINKAGEMODE -wxTIFFUnmapProc(thandle_t WXUNUSED(handle), - tdata_t WXUNUSED(base), - toff_t WXUNUSED(size)) -{ -} - -} // extern "C" - -TIFF* -TIFFwxOpen(wxInputStream &stream, const char* name, const char* mode) -{ - TIFF* tif = TIFFClientOpen(name, mode, - (thandle_t) &stream, - wxTIFFReadProc, wxTIFFNullProc, - wxTIFFSeekIProc, wxTIFFCloseIProc, wxTIFFSizeProc, - wxTIFFMapProc, wxTIFFUnmapProc); - - return tif; -} - -TIFF* -TIFFwxOpen(wxOutputStream &stream, const char* name, const char* mode) -{ - TIFF* tif = TIFFClientOpen(name, mode, - (thandle_t) &stream, - wxTIFFNullProc, wxTIFFWriteProc, - wxTIFFSeekOProc, wxTIFFCloseOProc, wxTIFFSizeProc, - wxTIFFMapProc, wxTIFFUnmapProc); - - return tif; -} - -bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose, int index ) -{ - if (index == -1) - index = 0; - - image->Destroy(); - - TIFF *tif = TIFFwxOpen( stream, "image", "r" ); - - if (!tif) - { - if (verbose) - { - wxLogError( _("TIFF: Error loading image.") ); - } - - return false; - } - - if (!TIFFSetDirectory( tif, (tdir_t)index )) - { - if (verbose) - { - wxLogError( _("Invalid TIFF image index.") ); - } - - TIFFClose( tif ); - - return false; - } - - uint32 w, h; - uint32 *raster; - - TIFFGetField( tif, TIFFTAG_IMAGEWIDTH, &w ); - TIFFGetField( tif, TIFFTAG_IMAGELENGTH, &h ); - - uint16 samplesPerPixel = 0; - (void) TIFFGetFieldDefaulted(tif, TIFFTAG_SAMPLESPERPIXEL, &samplesPerPixel); - - uint16 bitsPerSample = 0; - (void) TIFFGetFieldDefaulted(tif, TIFFTAG_BITSPERSAMPLE, &bitsPerSample); - - uint16 extraSamples; - uint16* samplesInfo; - TIFFGetFieldDefaulted(tif, TIFFTAG_EXTRASAMPLES, - &extraSamples, &samplesInfo); - - uint16 photometric; - if (!TIFFGetField(tif, TIFFTAG_PHOTOMETRIC, &photometric)) - { - photometric = PHOTOMETRIC_MINISWHITE; - } - const bool hasAlpha = (extraSamples >= 1 - && ((samplesInfo[0] == EXTRASAMPLE_UNSPECIFIED) - || samplesInfo[0] == EXTRASAMPLE_ASSOCALPHA - || samplesInfo[0] == EXTRASAMPLE_UNASSALPHA)) - || (extraSamples == 0 && samplesPerPixel == 4 - && photometric == PHOTOMETRIC_RGB); - - // guard against integer overflow during multiplication which could result - // in allocating a too small buffer and then overflowing it - const double bytesNeeded = (double)w * (double)h * sizeof(uint32); - if ( bytesNeeded >= wxUINT32_MAX ) - { - if ( verbose ) - { - wxLogError( _("TIFF: Image size is abnormally big.") ); - } - - TIFFClose(tif); - - return false; - } - - raster = (uint32*) _TIFFmalloc( (uint32)bytesNeeded ); - - if (!raster) - { - if (verbose) - { - wxLogError( _("TIFF: Couldn't allocate memory.") ); - } - - TIFFClose( tif ); - - return false; - } - - image->Create( (int)w, (int)h ); - if (!image->IsOk()) - { - if (verbose) - { - wxLogError( _("TIFF: Couldn't allocate memory.") ); - } - - _TIFFfree( raster ); - TIFFClose( tif ); - - return false; - } - - if ( hasAlpha ) - image->SetAlpha(); - - uint16 planarConfig = PLANARCONFIG_CONTIG; - (void) TIFFGetField(tif, TIFFTAG_PLANARCONFIG, &planarConfig); - - bool ok = true; - char msg[1024] = ""; - if - ( - (planarConfig == PLANARCONFIG_CONTIG && samplesPerPixel == 2 - && extraSamples == 1) - && - ( - ( !TIFFRGBAImageOK(tif, msg) ) - || (bitsPerSample == 8) - ) - ) - { - const bool isGreyScale = (bitsPerSample == 8); - unsigned char *buf = (unsigned char *)_TIFFmalloc(TIFFScanlineSize(tif)); - uint32 pos = 0; - const bool minIsWhite = (photometric == PHOTOMETRIC_MINISWHITE); - const int minValue = minIsWhite ? 255 : 0; - const int maxValue = 255 - minValue; - - /* - Decode to ABGR format as that is what the code, that converts to - wxImage, later on expects (normally TIFFReadRGBAImageOriented is - used to decode which uses an ABGR layout). - */ - for (uint32 y = 0; y < h; ++y) - { - if (TIFFReadScanline(tif, buf, y, 0) != 1) - { - ok = false; - break; - } - - if (isGreyScale) - { - for (uint32 x = 0; x < w; ++x) - { - uint8 val = minIsWhite ? 255 - buf[x*2] : buf[x*2]; - uint8 alpha = minIsWhite ? 255 - buf[x*2+1] : buf[x*2+1]; - raster[pos] = val + (val << 8) + (val << 16) - + (alpha << 24); - pos++; - } - } - else - { - for (uint32 x = 0; x < w; ++x) - { - int mask = buf[x*2/8] << ((x*2)%8); - - uint8 val = mask & 128 ? maxValue : minValue; - raster[pos] = val + (val << 8) + (val << 16) - + ((mask & 64 ? maxValue : minValue) << 24); - pos++; - } - } - } - - _TIFFfree(buf); - } - else - { - ok = TIFFReadRGBAImageOriented( tif, w, h, raster, - ORIENTATION_TOPLEFT, 0 ) != 0; - } - - - if (!ok) - { - if (verbose) - { - wxLogError( _("TIFF: Error reading image.") ); - } - - _TIFFfree( raster ); - image->Destroy(); - TIFFClose( tif ); - - return false; - } - - unsigned char *ptr = image->GetData(); - - unsigned char *alpha = image->GetAlpha(); - - uint32 pos = 0; - - for (uint32 i = 0; i < h; i++) - { - for (uint32 j = 0; j < w; j++) - { - *(ptr++) = (unsigned char)TIFFGetR(raster[pos]); - *(ptr++) = (unsigned char)TIFFGetG(raster[pos]); - *(ptr++) = (unsigned char)TIFFGetB(raster[pos]); - if ( hasAlpha ) - *(alpha++) = (unsigned char)TIFFGetA(raster[pos]); - - pos++; - } - } - - - image->SetOption(wxIMAGE_OPTION_TIFF_PHOTOMETRIC, photometric); - - uint16 compression; - /* - Copy some baseline TIFF tags which helps when re-saving a TIFF - to be similar to the original image. - */ - if (samplesPerPixel) - { - image->SetOption(wxIMAGE_OPTION_TIFF_SAMPLESPERPIXEL, samplesPerPixel); - } - - if (bitsPerSample) - { - image->SetOption(wxIMAGE_OPTION_TIFF_BITSPERSAMPLE, bitsPerSample); - } - - if ( TIFFGetFieldDefaulted(tif, TIFFTAG_COMPRESSION, &compression) ) - { - image->SetOption(wxIMAGE_OPTION_TIFF_COMPRESSION, compression); - } - - // Set the resolution unit. - wxImageResolution resUnit = wxIMAGE_RESOLUTION_NONE; - uint16 tiffRes; - if ( TIFFGetFieldDefaulted(tif, TIFFTAG_RESOLUTIONUNIT, &tiffRes) ) - { - switch (tiffRes) - { - default: - wxLogWarning(_("Unknown TIFF resolution unit %d ignored"), - tiffRes); - wxFALLTHROUGH; - - case RESUNIT_NONE: - resUnit = wxIMAGE_RESOLUTION_NONE; - break; - - case RESUNIT_INCH: - resUnit = wxIMAGE_RESOLUTION_INCHES; - break; - - case RESUNIT_CENTIMETER: - resUnit = wxIMAGE_RESOLUTION_CM; - break; - } - } - - image->SetOption(wxIMAGE_OPTION_RESOLUTIONUNIT, resUnit); - - /* - Set the image resolution if it's available. Resolution tag is not - dependent on RESOLUTIONUNIT != RESUNIT_NONE (according to TIFF spec). - */ - float resX, resY; - - if ( TIFFGetField(tif, TIFFTAG_XRESOLUTION, &resX) ) - { - /* - Use a string value to not lose precision. - rounding to int as cm and then converting to inch may - result in whole integer rounding error, eg. 201 instead of 200 dpi. - If an app wants an int, GetOptionInt will convert and round down. - */ - image->SetOption(wxIMAGE_OPTION_RESOLUTIONX, - wxString::FromCDouble((double) resX)); - } - - if ( TIFFGetField(tif, TIFFTAG_YRESOLUTION, &resY) ) - { - image->SetOption(wxIMAGE_OPTION_RESOLUTIONY, - wxString::FromCDouble((double) resY)); - } - - _TIFFfree( raster ); - - TIFFClose( tif ); - - return true; -} - -int wxTIFFHandler::DoGetImageCount( wxInputStream& stream ) -{ - TIFF *tif = TIFFwxOpen( stream, "image", "r" ); - - if (!tif) - return 0; - - int dircount = 0; // according to the libtiff docs, dircount should be set to 1 here??? - do { - dircount++; - } while (TIFFReadDirectory(tif)); - - TIFFClose( tif ); - - // NOTE: this function modifies the current stream position but it's ok - // (see wxImageHandler::GetImageCount) - - return dircount; -} - -bool wxTIFFHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbose ) -{ - TIFF *tif = TIFFwxOpen( stream, "image", "w" ); - - if (!tif) - { - if (verbose) - { - wxLogError( _("TIFF: Error saving image.") ); - } - - return false; - } - - const int imageWidth = image->GetWidth(); - TIFFSetField(tif, TIFFTAG_IMAGEWIDTH, (uint32) imageWidth); - TIFFSetField(tif, TIFFTAG_IMAGELENGTH, (uint32)image->GetHeight()); - TIFFSetField(tif, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT); - TIFFSetField(tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG); - - // save the image resolution if we have it - int xres, yres; - const wxImageResolution res = GetResolutionFromOptions(*image, &xres, &yres); - uint16 tiffRes; - switch ( res ) - { - default: - wxFAIL_MSG( wxT("unknown image resolution units") ); - wxFALLTHROUGH; - - case wxIMAGE_RESOLUTION_NONE: - tiffRes = RESUNIT_NONE; - break; - - case wxIMAGE_RESOLUTION_INCHES: - tiffRes = RESUNIT_INCH; - break; - - case wxIMAGE_RESOLUTION_CM: - tiffRes = RESUNIT_CENTIMETER; - break; - } - - if ( tiffRes != RESUNIT_NONE ) - { - TIFFSetField(tif, TIFFTAG_RESOLUTIONUNIT, tiffRes); - TIFFSetField(tif, TIFFTAG_XRESOLUTION, (float)xres); - TIFFSetField(tif, TIFFTAG_YRESOLUTION, (float)yres); - } - - - int spp = image->GetOptionInt(wxIMAGE_OPTION_TIFF_SAMPLESPERPIXEL); - if ( !spp ) - spp = 3; - - int bps = image->GetOptionInt(wxIMAGE_OPTION_TIFF_BITSPERSAMPLE); - if ( !bps ) - { - bps = 8; - } - else if (bps == 1) - { - // One bit per sample combined with 3 samples per pixel is - // not allowed and crashes libtiff. - spp = 1; - } - - int photometric = PHOTOMETRIC_RGB; - - if ( image->HasOption(wxIMAGE_OPTION_TIFF_PHOTOMETRIC) ) - { - photometric = image->GetOptionInt(wxIMAGE_OPTION_TIFF_PHOTOMETRIC); - if (photometric == PHOTOMETRIC_MINISWHITE - || photometric == PHOTOMETRIC_MINISBLACK) - { - // either b/w or greyscale - spp = 1; - } - } - else if (spp <= 2) - { - photometric = PHOTOMETRIC_MINISWHITE; - } - - const bool hasAlpha = image->HasAlpha(); - - int compression = image->GetOptionInt(wxIMAGE_OPTION_TIFF_COMPRESSION); - if ( !compression || (compression == COMPRESSION_JPEG && hasAlpha) ) - { - // We can't use COMPRESSION_LZW because current version of libtiff - // doesn't implement it ("no longer implemented due to Unisys patent - // enforcement") and other compression methods are lossy so we - // shouldn't use them by default -- and the only remaining one is none. - // Also JPEG compression for alpha images is not a good idea (viewers - // not opening the image properly). - compression = COMPRESSION_NONE; - } - - if - ( - (photometric == PHOTOMETRIC_RGB && spp == 4) - || (photometric <= PHOTOMETRIC_MINISBLACK && spp == 2) - ) - { - // Compensate for user passing a SamplesPerPixel that includes - // the alpha channel. - spp--; - } - - - int extraSamples = hasAlpha ? 1 : 0; - - TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, spp + extraSamples); - TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, bps); - TIFFSetField(tif, TIFFTAG_PHOTOMETRIC, photometric); - TIFFSetField(tif, TIFFTAG_COMPRESSION, compression); - - if (extraSamples) - { - uint16 extra[] = { EXTRASAMPLE_UNSPECIFIED }; - TIFFSetField(tif, TIFFTAG_EXTRASAMPLES, (long) 1, &extra); - } - - // scanlinesize is determined by spp+extraSamples and bps - const tsize_t linebytes = - (tsize_t)((imageWidth * (spp + extraSamples) * bps + 7) / 8); - - unsigned char *buf; - - const bool isColouredImage = (spp > 1) - && (photometric != PHOTOMETRIC_MINISWHITE) - && (photometric != PHOTOMETRIC_MINISBLACK); - - - if (TIFFScanlineSize(tif) > linebytes || !isColouredImage || hasAlpha) - { - buf = (unsigned char *)_TIFFmalloc(TIFFScanlineSize(tif)); - if (!buf) - { - if (verbose) - { - wxLogError( _("TIFF: Couldn't allocate memory.") ); - } - - TIFFClose( tif ); - - return false; - } - } - else - { - buf = NULL; - } - - TIFFSetField(tif, TIFFTAG_ROWSPERSTRIP,TIFFDefaultStripSize(tif, (uint32) -1)); - - const int bitsPerPixel = (spp + extraSamples) * bps; - const int bytesPerPixel = (bitsPerPixel + 7) / 8; - const int pixelsPerByte = 8 / bitsPerPixel; - int remainingPixelCount = 0; - - if (pixelsPerByte) - { - // How many pixels to write in the last byte column? - remainingPixelCount = imageWidth % pixelsPerByte; - if (!remainingPixelCount) remainingPixelCount = pixelsPerByte; - } - - const bool minIsWhite = (photometric == PHOTOMETRIC_MINISWHITE); - unsigned char *ptr = image->GetData(); - for ( int row = 0; row < image->GetHeight(); row++ ) - { - if ( buf ) - { - if (isColouredImage) - { - // colour image - if (hasAlpha) - { - for ( int column = 0; column < imageWidth; column++ ) - { - buf[column*4 ] = ptr[column*3 ]; - buf[column*4 + 1] = ptr[column*3 + 1]; - buf[column*4 + 2] = ptr[column*3 + 2]; - buf[column*4 + 3] = image->GetAlpha(column, row); - } - } - else - { - memcpy(buf, ptr, imageWidth * 3); - } - } - else if (spp * bps == 8) // greyscale image - { - for ( int column = 0; column < imageWidth; column++ ) - { - uint8 value = ptr[column*3 + 1]; - if (minIsWhite) - { - value = 255 - value; - } - - buf[column * bytesPerPixel] = value; - - if (hasAlpha) - { - value = image->GetAlpha(column, row); - buf[column*bytesPerPixel+1] - = minIsWhite ? 255 - value : value; - } - } - } - else // black and white image - { - for ( int column = 0; column < linebytes; column++ ) - { - uint8 reverse = 0; - int pixelsPerByteCount = (column + 1 != linebytes) - ? pixelsPerByte - : remainingPixelCount; - for ( int bp = 0; bp < pixelsPerByteCount; bp++ ) - { - if ( (ptr[column * 3 * pixelsPerByte + bp*3 + 1] <=127) - == minIsWhite ) - { - // check only green as this is sufficient - reverse |= (uint8) (128 >> (bp * bitsPerPixel)); - } - - if (hasAlpha - && (image->GetAlpha(column * pixelsPerByte + bp, - row) <= 127) == minIsWhite) - { - reverse |= (uint8) (64 >> (bp * bitsPerPixel)); - } - } - - buf[column] = reverse; - } - } - } - - if ( TIFFWriteScanline(tif, buf ? buf : ptr, (uint32)row, 0) < 0 ) - { - if (verbose) - { - wxLogError( _("TIFF: Error writing image.") ); - } - - TIFFClose( tif ); - if (buf) - _TIFFfree(buf); - - return false; - } - - ptr += imageWidth * 3; - } - - (void) TIFFClose(tif); - - if (buf) - _TIFFfree(buf); - - return true; -} - -bool wxTIFFHandler::DoCanRead( wxInputStream& stream ) -{ - unsigned char hdr[2]; - - if ( !stream.Read(&hdr[0], WXSIZEOF(hdr)) ) // it's ok to modify the stream position here - return false; - - return (hdr[0] == 'I' && hdr[1] == 'I') || - (hdr[0] == 'M' && hdr[1] == 'M'); -} - -#endif // wxUSE_STREAMS - -/*static*/ wxVersionInfo wxTIFFHandler::GetLibraryVersionInfo() -{ - int major, - minor, - micro; - - const wxString ver(::TIFFGetVersion()); - if ( wxSscanf(ver, "LIBTIFF, Version %d.%d.%d", &major, &minor, µ) != 3 ) - { - wxLogDebug("Unrecognized libtiff version string \"%s\"", ver); - - major = - minor = - micro = 0; - } - - wxString copyright; - const wxString desc = ver.BeforeFirst('\n', ©right); - copyright.Replace("\n", ""); - - return wxVersionInfo("libtiff", major, minor, micro, desc, copyright); -} - -#endif // wxUSE_LIBTIFF diff --git a/Externals/wxWidgets3/src/common/imagxpm.cpp b/Externals/wxWidgets3/src/common/imagxpm.cpp deleted file mode 100644 index 7379c6064d..0000000000 --- a/Externals/wxWidgets3/src/common/imagxpm.cpp +++ /dev/null @@ -1,264 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/imagxpm.cpp -// Purpose: wxXPMHandler -// Author: Vaclav Slavik, Robert Roebling -// Copyright: (c) 2001 Vaclav Slavik -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -/* - -This file is partially based on source code of ImageMagick by John Cristy. Its -license is as follows: - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% % -% % -% % -% X X PPPP M M % -% X X P P MM MM % -% X PPPP M M M % -% X X P M M % -% X X P M M % -% % -% % -% Read/Write ImageMagick Image Format. % -% % -% % -% Software Design % -% John Cristy % -% July 1992 % -% % -% % -% Copyright (C) 2001 ImageMagick Studio, a non-profit organization dedicated % -% to making software imaging solutions freely available. % -% % -% Permission is hereby granted, free of charge, to any person obtaining a % -% copy of this software and associated documentation files ("ImageMagick"), % -% to deal in ImageMagick without restriction, including without limitation % -% the rights to use, copy, modify, merge, publish, distribute, sublicense, % -% and/or sell copies of ImageMagick, and to permit persons to whom the % -% ImageMagick is furnished to do so, subject to the following conditions: % -% % -% The above copyright notice and this permission notice shall be included in % -% all copies or substantial portions of ImageMagick. % -% % -% The software is provided "as is", without warranty of any kind, express or % -% implied, including but not limited to the warranties of merchantability, % -% fitness for a particular purpose and noninfringement. In no event shall % -% ImageMagick Studio be liable for any claim, damages or other liability, % -% whether in an action of contract, tort or otherwise, arising from, out of % -% or in connection with ImageMagick or the use or other dealings in % -% ImageMagick. % -% % -% Except as contained in this notice, the name of the ImageMagick Studio % -% shall not be used in advertising or otherwise to promote the sale, use or % -% other dealings in ImageMagick without prior written authorization from the % -% ImageMagick Studio. % -% % -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% -% -*/ - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_XPM - -#ifndef WX_PRECOMP - #include "wx/log.h" - #include "wx/intl.h" - #include "wx/utils.h" -#endif - -#include "wx/imagxpm.h" -#include "wx/wfstream.h" -#include "wx/xpmdecod.h" -#include "wx/filename.h" - -wxIMPLEMENT_DYNAMIC_CLASS(wxXPMHandler,wxImageHandler); - -//----------------------------------------------------------------------------- -// wxXPMHandler -//----------------------------------------------------------------------------- - -#if wxUSE_STREAMS - -bool wxXPMHandler::LoadFile(wxImage *image, - wxInputStream& stream, - bool WXUNUSED(verbose), int WXUNUSED(index)) -{ - wxXPMDecoder decoder; - - wxImage img = decoder.ReadFile(stream); - if ( !img.IsOk() ) - return false; - *image = img; - return true; -} - -namespace -{ - -// Make the given string a valid C identifier. -// -// All invalid characters are simply replaced by underscores and underscore is -// also prepended in the beginning if the initial character is not alphabetic. -void -MakeValidCIdent(wxString* str) -{ - const wxChar chUnderscore = wxT('_'); - - for ( wxString::iterator it = str->begin(); it != str->end(); ++it ) - { - const wxChar ch = *it; - if ( wxIsdigit(ch) ) - { - if ( it == str->begin() ) - { - // Identifiers can't start with a digit. - str->insert(0, chUnderscore); // prepend underscore - it = str->begin(); // restart as string changed - continue; - } - } - else if ( !wxIsalpha(ch) && ch != chUnderscore ) - { - // Not a valid character in C identifiers. - *it = chUnderscore; - } - } - - // Double underscores are not allowed in normal C identifiers and are - // useless anyhow. - str->Replace(wxT("__"), wxT("_")); -} - -} // anonymous namespace - -bool wxXPMHandler::SaveFile(wxImage * image, - wxOutputStream& stream, bool WXUNUSED(verbose)) -{ - // 1. count colours: - #define MaxCixels 92 - static const char Cixel[MaxCixels+1] = - " .XoO+@#$%&*=-;:>,<1234567890qwertyuipasdfghjk" - "lzxcvbnmMNBVCZASDFGHJKLPIUYTREWQ!~^/()_`'][{}|"; - int i, j, k; - - wxImageHistogram histogram; - int cols = int(image->ComputeHistogram(histogram)); - - int chars_per_pixel = 1; - for ( k = MaxCixels; cols > k; k *= MaxCixels) - chars_per_pixel++; - - // 2. write the header: - wxString sName; - if ( image->HasOption(wxIMAGE_OPTION_FILENAME) ) - { - sName = wxFileName(image->GetOption(wxIMAGE_OPTION_FILENAME)).GetName(); - MakeValidCIdent(&sName); - sName << wxT("_xpm"); - } - - if ( !sName.empty() ) - sName = wxString(wxT("/* XPM */\nstatic const char *")) + sName; - else - sName = wxT("/* XPM */\nstatic const char *xpm_data"); - stream.Write( (const char*) sName.ToAscii(), sName.Len() ); - - char tmpbuf[200]; - // VS: 200b is safe upper bound for anything produced by sprintf below - // (<101 bytes the string, neither %i can expand into more than 10 chars) - sprintf(tmpbuf, - "[] = {\n" - "/* columns rows colors chars-per-pixel */\n" - "\"%i %i %i %i\",\n", - image->GetWidth(), image->GetHeight(), cols, chars_per_pixel); - stream.Write(tmpbuf, strlen(tmpbuf)); - - // 3. create color symbols table: - char *symbols_data = new char[cols * (chars_per_pixel+1)]; - char **symbols = new char*[cols]; - - // 2a. find mask colour: - unsigned long mask_key = 0x1000000 /*invalid RGB value*/; - if (image->HasMask()) - mask_key = (image->GetMaskRed() << 16) | - (image->GetMaskGreen() << 8) | image->GetMaskBlue(); - - // 2b. generate colour table: - for (wxImageHistogram::iterator entry = histogram.begin(); - entry != histogram.end(); ++entry ) - { - unsigned long index = entry->second.index; - symbols[index] = symbols_data + index * (chars_per_pixel+1); - char *sym = symbols[index]; - - for (j = 0; j < chars_per_pixel; j++) - { - sym[j] = Cixel[index % MaxCixels]; - index /= MaxCixels; - } - sym[j] = '\0'; - - unsigned long key = entry->first; - - if (key == 0) - sprintf( tmpbuf, "\"%s c Black\",\n", sym); - else if (key == mask_key) - sprintf( tmpbuf, "\"%s c None\",\n", sym); - else - { - wxByte r = wxByte(key >> 16); - wxByte g = wxByte(key >> 8); - wxByte b = wxByte(key); - sprintf(tmpbuf, "\"%s c #%02X%02X%02X\",\n", sym, r, g, b); - } - stream.Write( tmpbuf, strlen(tmpbuf) ); - } - - stream.Write("/* pixels */\n", 13); - - unsigned char *data = image->GetData(); - for (j = 0; j < image->GetHeight(); j++) - { - char tmp_c; - tmp_c = '\"'; stream.Write(&tmp_c, 1); - for (i = 0; i < image->GetWidth(); i++, data += 3) - { - unsigned long key = (data[0] << 16) | (data[1] << 8) | (data[2]); - stream.Write(symbols[histogram[key].index], chars_per_pixel); - } - tmp_c = '\"'; stream.Write(&tmp_c, 1); - if ( j + 1 < image->GetHeight() ) - { - tmp_c = ','; stream.Write(&tmp_c, 1); - } - tmp_c = '\n'; stream.Write(&tmp_c, 1); - } - stream.Write("};\n", 3 ); - - // Clean up: - delete[] symbols; - delete[] symbols_data; - - return true; -} - -bool wxXPMHandler::DoCanRead(wxInputStream& stream) -{ - wxXPMDecoder decoder; - return decoder.CanRead(stream); - // it's ok to modify the stream position here -} - -#endif // wxUSE_STREAMS - -#endif // wxUSE_XPM diff --git a/Externals/wxWidgets3/src/common/init.cpp b/Externals/wxWidgets3/src/common/init.cpp deleted file mode 100644 index 7e47e6007b..0000000000 --- a/Externals/wxWidgets3/src/common/init.cpp +++ /dev/null @@ -1,566 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/init.cpp -// Purpose: initialisation for the library -// Author: Vadim Zeitlin -// Modified by: -// Created: 04.10.99 -// Copyright: (c) Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif //__BORLANDC__ - -#ifndef WX_PRECOMP - #include "wx/app.h" - #include "wx/filefn.h" - #include "wx/log.h" - #include "wx/intl.h" - #include "wx/module.h" -#endif - -#include "wx/init.h" -#include "wx/thread.h" - -#include "wx/scopedptr.h" -#include "wx/except.h" - -#if defined(__WINDOWS__) - #include "wx/msw/private.h" - #include "wx/msw/msvcrt.h" - - #ifdef wxCrtSetDbgFlag - static struct EnableMemLeakChecking - { - EnableMemLeakChecking() - { - // check for memory leaks on program exit (another useful flag - // is _CRTDBG_DELAY_FREE_MEM_DF which doesn't free deallocated - // memory which may be used to simulate low-memory condition) - wxCrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF); - } - } gs_enableLeakChecks; - #endif // wxCrtSetDbgFlag -#endif // __WINDOWS__ - -#if wxUSE_UNICODE && defined(__WXOSX__) - #include -#endif - -// ---------------------------------------------------------------------------- -// private classes -// ---------------------------------------------------------------------------- - -// we need a dummy app object if the user doesn't want to create a real one -class wxDummyConsoleApp : public wxAppConsole -{ -public: - wxDummyConsoleApp() { } - - virtual int OnRun() wxOVERRIDE { wxFAIL_MSG( wxT("unreachable code") ); return 0; } - virtual bool DoYield(bool, long) { return true; } - - wxDECLARE_NO_COPY_CLASS(wxDummyConsoleApp); -}; - -// we need a special kind of auto pointer to wxApp which not only deletes the -// pointer it holds in its dtor but also resets the global application pointer -wxDECLARE_SCOPED_PTR(wxAppConsole, wxAppPtrBase) -wxDEFINE_SCOPED_PTR(wxAppConsole, wxAppPtrBase) - -class wxAppPtr : public wxAppPtrBase -{ -public: - wxEXPLICIT wxAppPtr(wxAppConsole *ptr = NULL) : wxAppPtrBase(ptr) { } - ~wxAppPtr() - { - if ( get() ) - { - // the pointer is going to be deleted in the base class dtor, don't - // leave the dangling pointer! - wxApp::SetInstance(NULL); - } - } - - void Set(wxAppConsole *ptr) - { - reset(ptr); - - wxApp::SetInstance(ptr); - } - - wxDECLARE_NO_COPY_CLASS(wxAppPtr); -}; - -// class to ensure that wxAppBase::CleanUp() is called if our Initialize() -// fails -class wxCallAppCleanup -{ -public: - wxCallAppCleanup(wxAppConsole *app) : m_app(app) { } - ~wxCallAppCleanup() { if ( m_app ) m_app->CleanUp(); } - - void Dismiss() { m_app = NULL; } - -private: - wxAppConsole *m_app; -}; - -// ---------------------------------------------------------------------------- -// private functions -// ---------------------------------------------------------------------------- - -// suppress warnings about unused variables -static inline void Use(void *) { } - -#define WX_SUPPRESS_UNUSED_WARN(x) Use(&x) - -// ---------------------------------------------------------------------------- -// initialization data -// ---------------------------------------------------------------------------- - -static struct InitData -{ - InitData() - { - nInitCount = 0; - -#if wxUSE_UNICODE - argc = argcOrig = 0; - // argv = argvOrig = NULL; -- not even really needed -#endif // wxUSE_UNICODE - } - - // critical section protecting this struct - wxCRIT_SECT_DECLARE_MEMBER(csInit); - - // number of times wxInitialize() was called minus the number of times - // wxUninitialize() was - size_t nInitCount; - -#if wxUSE_UNICODE - int argc; - - // if we receive the command line arguments as ASCII and have to convert - // them to Unicode ourselves (this is the case under Unix but not Windows, - // for example), we remember the converted argv here because we'll have to - // free it when doing cleanup to avoid memory leaks - wchar_t **argv; - - // we also need to keep two copies, one passed to other functions, and one - // unmodified original; somebody may modify the former, so we need to have - // the latter to be able to free everything correctly - int argcOrig; - wchar_t **argvOrig; -#endif // wxUSE_UNICODE - - wxDECLARE_NO_COPY_CLASS(InitData); -} gs_initData; - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// command line arguments ANSI -> Unicode conversion -// ---------------------------------------------------------------------------- - -#if wxUSE_UNICODE - -static void ConvertArgsToUnicode(int argc, char **argv) -{ - gs_initData.argvOrig = new wchar_t *[argc + 1]; - gs_initData.argv = new wchar_t *[argc + 1]; - - int wargc = 0; - for ( int i = 0; i < argc; i++ ) - { -#ifdef __DARWIN__ - wxWCharBuffer buf(wxConvFileName->cMB2WX(argv[i])); -#else - wxWCharBuffer buf(wxConvLocal.cMB2WX(argv[i])); -#endif - if ( !buf ) - { - wxLogWarning(_("Command line argument %d couldn't be converted to Unicode and will be ignored."), - i); - } - else // converted ok - { - gs_initData.argvOrig[wargc] = gs_initData.argv[wargc] = wxStrdup(buf); - wargc++; - } - } - - gs_initData.argcOrig = gs_initData.argc = wargc; - gs_initData.argvOrig[wargc] =gs_initData.argv[wargc] = NULL; -} - -static void FreeConvertedArgs() -{ - if ( gs_initData.argvOrig ) - { - for ( int i = 0; i < gs_initData.argcOrig; i++ ) - { - free(gs_initData.argvOrig[i]); - // gs_initData.argv[i] normally points to the same data - } - - wxDELETEA(gs_initData.argvOrig); - wxDELETEA(gs_initData.argv); - gs_initData.argcOrig = gs_initData.argc = 0; - } -} - -#endif // wxUSE_UNICODE - -// ---------------------------------------------------------------------------- -// start up -// ---------------------------------------------------------------------------- - -// initialization which is always done (not customizable) before wxApp creation -static bool DoCommonPreInit() -{ -#if wxUSE_UNICODE && defined(__WXOSX__) - // In OS X and iOS, wchar_t CRT functions convert to char* and fail under - // some locales. The safest fix is to set LC_CTYPE to UTF-8 to ensure that - // they can handle any input. - // - // Note that this must be done for any app, Cocoa or console, whether or - // not it uses wxLocale. - // - // See http://stackoverflow.com/questions/11713745/why-does-the-printf-family-of-functions-care-about-locale - setlocale(LC_CTYPE, "UTF-8"); -#endif // wxUSE_UNICODE && defined(__WXOSX__) - -#if wxUSE_LOG - // Reset logging in case we were cleaned up and are being reinitialized. - wxLog::DoCreateOnDemand(); - - // force wxLog to create a log target now: we do it because wxTheApp - // doesn't exist yet so wxLog will create a special log target which is - // safe to use even when the GUI is not available while without this call - // we could create wxApp in wxEntryStart() below, then log an error about - // e.g. failure to establish connection to the X server and wxLog would - // send it to wxLogGui (because wxTheApp does exist already) which, of - // course, can't be used in this case - // - // notice also that this does nothing if the user had set up a custom log - // target before -- which is fine as we want to give him this possibility - // (as it's impossible to override logging by overriding wxAppTraits:: - // CreateLogTarget() before wxApp is created) and we just assume he knows - // what he is doing - wxLog::GetActiveTarget(); -#endif // wxUSE_LOG - -#ifdef __WINDOWS__ - // GUI applications obtain HINSTANCE in their WinMain() but we also need to - // initialize the global wxhInstance variable for the console programs as - // they may need it too, so set it here if it wasn't done yet - if ( !wxGetInstance() ) - { - wxSetInstance(::GetModuleHandle(NULL)); - } -#endif // __WINDOWS__ - - return true; -} - -// non customizable initialization done after wxApp creation and initialization -static bool DoCommonPostInit() -{ - wxModule::RegisterModules(); - - if ( !wxModule::InitializeModules() ) - { - wxLogError(_("Initialization failed in post init, aborting.")); - return false; - } - - return true; -} - -bool wxEntryStart(int& argc, wxChar **argv) -{ - // do minimal, always necessary, initialization - // -------------------------------------------- - - // initialize wxRTTI - if ( !DoCommonPreInit() ) - return false; - - - // first of all, we need an application object - // ------------------------------------------- - - // the user might have already created it himself somehow - wxAppPtr app(wxTheApp); - if ( !app.get() ) - { - // if not, he might have used wxIMPLEMENT_APP() to give us a - // function to create it - wxAppInitializerFunction fnCreate = wxApp::GetInitializerFunction(); - - if ( fnCreate ) - { - // he did, try to create the custom wxApp object - app.Set((*fnCreate)()); - } - } - - if ( !app.get() ) - { - // either wxIMPLEMENT_APP() was not used at all or it failed -- in - // any case we still need something - app.Set(new wxDummyConsoleApp); - } - - - // wxApp initialization: this can be customized - // -------------------------------------------- - - if ( !app->Initialize(argc, argv) ) - return false; - - // remember, possibly modified (e.g. due to removal of toolkit-specific - // parameters), command line arguments in member variables - app->argc = argc; - app->argv = argv; - - wxCallAppCleanup callAppCleanup(app.get()); - - - // common initialization after wxTheApp creation - // --------------------------------------------- - - if ( !DoCommonPostInit() ) - return false; - - - // prevent the smart pointer from destroying its contents - app.release(); - - // and the cleanup object from doing cleanup - callAppCleanup.Dismiss(); - -#if wxUSE_LOG - // now that we have a valid wxApp (wxLogGui would have crashed if we used - // it before now), we can delete the temporary sink we had created for the - // initialization messages -- the next time logging function is called, the - // sink will be recreated but this time wxAppTraits will be used - delete wxLog::SetActiveTarget(NULL); -#endif // wxUSE_LOG - - return true; -} - -#if wxUSE_UNICODE - -// we provide a wxEntryStart() wrapper taking "char *" pointer too -bool wxEntryStart(int& argc, char **argv) -{ - ConvertArgsToUnicode(argc, argv); - - if ( !wxEntryStart(gs_initData.argc, gs_initData.argv) ) - { - FreeConvertedArgs(); - - return false; - } - - return true; -} - -#endif // wxUSE_UNICODE - -// ---------------------------------------------------------------------------- -// clean up -// ---------------------------------------------------------------------------- - -// cleanup done before destroying wxTheApp -static void DoCommonPreCleanup() -{ -#if wxUSE_LOG - // flush the logged messages if any and don't use the current probably - // unsafe log target any more: the default one (wxLogGui) can't be used - // after the resources are freed which happens when we return and the user - // supplied one might be even more unsafe (using any wxWidgets GUI function - // is unsafe starting from now) - // - // notice that wxLog will still recreate a default log target if any - // messages are logged but that one will be safe to use until the very end - delete wxLog::SetActiveTarget(NULL); -#endif // wxUSE_LOG -} - -// cleanup done after destroying wxTheApp -static void DoCommonPostCleanup() -{ - wxModule::CleanUpModules(); - - // we can't do this in wxApp itself because it doesn't know if argv had - // been allocated -#if wxUSE_UNICODE - FreeConvertedArgs(); -#endif // wxUSE_UNICODE - - // use Set(NULL) and not Get() to avoid creating a message output object on - // demand when we just want to delete it - delete wxMessageOutput::Set(NULL); - -#if wxUSE_LOG - // call this first as it has a side effect: in addition to flushing all - // logs for this thread, it also flushes everything logged from other - // threads - wxLog::FlushActive(); - - // and now delete the last logger as well - // - // we still don't disable log target auto-vivification even if any log - // objects created now will result in memory leaks because it seems better - // to leak memory which doesn't matter much considering the application is - // exiting anyhow than to not show messages which could still be logged - // from the user code (e.g. static dtors and such) - delete wxLog::SetActiveTarget(NULL); -#endif // wxUSE_LOG -} - -void wxEntryCleanup() -{ - DoCommonPreCleanup(); - - - // delete the application object - if ( wxTheApp ) - { - wxTheApp->CleanUp(); - - // reset the global pointer to it to NULL before destroying it as in - // some circumstances this can result in executing the code using - // wxTheApp and using half-destroyed object is no good - wxAppConsole * const app = wxApp::GetInstance(); - wxApp::SetInstance(NULL); - delete app; - } - - - DoCommonPostCleanup(); -} - -// ---------------------------------------------------------------------------- -// wxEntry -// ---------------------------------------------------------------------------- - -// for MSW the real wxEntry is defined in msw/main.cpp -#ifndef __WINDOWS__ - #define wxEntryReal wxEntry -#endif // !__WINDOWS__ - -int wxEntryReal(int& argc, wxChar **argv) -{ - // library initialization - wxInitializer initializer(argc, argv); - - if ( !initializer.IsOk() ) - { -#if wxUSE_LOG - // flush any log messages explaining why we failed - delete wxLog::SetActiveTarget(NULL); -#endif - return -1; - } - - wxTRY - { - // app initialization - if ( !wxTheApp->CallOnInit() ) - { - // don't call OnExit() if OnInit() failed - return -1; - } - - // ensure that OnExit() is called if OnInit() had succeeded - class CallOnExit - { - public: - ~CallOnExit() { wxTheApp->OnExit(); } - } callOnExit; - - WX_SUPPRESS_UNUSED_WARN(callOnExit); - - // app execution - return wxTheApp->OnRun(); - } - wxCATCH_ALL( wxTheApp->OnUnhandledException(); return -1; ) -} - -#if wxUSE_UNICODE - -// as with wxEntryStart, we provide an ANSI wrapper -int wxEntry(int& argc, char **argv) -{ - ConvertArgsToUnicode(argc, argv); - - return wxEntry(gs_initData.argc, gs_initData.argv); -} - -#endif // wxUSE_UNICODE - -// ---------------------------------------------------------------------------- -// wxInitialize/wxUninitialize -// ---------------------------------------------------------------------------- - -bool wxInitialize() -{ - int argc = 0; - return wxInitialize(argc, (wxChar**)NULL); -} - -bool wxInitialize(int& argc, wxChar **argv) -{ - wxCRIT_SECT_LOCKER(lockInit, gs_initData.csInit); - - if ( gs_initData.nInitCount++ ) - { - // already initialized - return true; - } - - return wxEntryStart(argc, argv); -} - -#if wxUSE_UNICODE -bool wxInitialize(int& argc, char **argv) -{ - wxCRIT_SECT_LOCKER(lockInit, gs_initData.csInit); - - if ( gs_initData.nInitCount++ ) - { - // already initialized - return true; - } - - return wxEntryStart(argc, argv); -} -#endif // wxUSE_UNICODE - -void wxUninitialize() -{ - wxCRIT_SECT_LOCKER(lockInit, gs_initData.csInit); - - if ( --gs_initData.nInitCount == 0 ) - { - wxEntryCleanup(); - } -} diff --git a/Externals/wxWidgets3/src/common/intl.cpp b/Externals/wxWidgets3/src/common/intl.cpp deleted file mode 100644 index 17501e421f..0000000000 --- a/Externals/wxWidgets3/src/common/intl.cpp +++ /dev/null @@ -1,1920 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/intl.cpp -// Purpose: Internationalization and localisation for wxWidgets -// Author: Vadim Zeitlin -// Modified by: Michael N. Filippov -// (2003/09/30 - PluralForms support) -// Created: 29/01/98 -// Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declaration -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_INTL - -#ifndef WX_PRECOMP - #include "wx/dynarray.h" - #include "wx/string.h" - #include "wx/intl.h" - #include "wx/log.h" - #include "wx/utils.h" - #include "wx/app.h" - #include "wx/hashmap.h" - #include "wx/module.h" -#endif // WX_PRECOMP - -#include - -// standard headers -#include -#include -#ifdef HAVE_LANGINFO_H - #include -#endif - -#ifdef __WIN32__ - #include "wx/dynlib.h" - #include "wx/msw/private.h" -#endif - -#include "wx/file.h" -#include "wx/filename.h" -#include "wx/tokenzr.h" -#include "wx/fontmap.h" -#include "wx/scopedptr.h" -#include "wx/apptrait.h" -#include "wx/stdpaths.h" -#include "wx/hashset.h" - -#if defined(__WXOSX__) - #include "wx/osx/core/cfref.h" - #include - #include - #include "wx/osx/core/cfstring.h" -#endif - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -#define TRACE_I18N wxS("i18n") - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// global functions -// ---------------------------------------------------------------------------- - -static wxLocale *wxSetLocale(wxLocale *pLocale); - -namespace -{ - -// get just the language part ("en" in "en_GB") -inline wxString ExtractLang(const wxString& langFull) -{ - return langFull.BeforeFirst('_'); -} - -// helper functions of GetSystemLanguage() -#ifdef __UNIX__ - -// get everything else (including the leading '_') -inline wxString ExtractNotLang(const wxString& langFull) -{ - size_t pos = langFull.find('_'); - if ( pos != wxString::npos ) - return langFull.substr(pos); - else - return wxString(); -} - -#endif // __UNIX__ - -} // anonymous namespace - -// ---------------------------------------------------------------------------- -// wxLanguageInfo -// ---------------------------------------------------------------------------- - -#ifdef __WINDOWS__ - -// helper used by wxLanguageInfo::GetLocaleName() and elsewhere to determine -// whether the locale is Unicode-only (it is if this function returns empty -// string) -static wxString wxGetANSICodePageForLocale(LCID lcid) -{ - wxString cp; - - wxChar buffer[16]; - if ( ::GetLocaleInfo(lcid, LOCALE_IDEFAULTANSICODEPAGE, - buffer, WXSIZEOF(buffer)) > 0 ) - { - if ( buffer[0] != wxT('0') || buffer[1] != wxT('\0') ) - cp = buffer; - //else: this locale doesn't use ANSI code page - } - - return cp; -} - -wxUint32 wxLanguageInfo::GetLCID() const -{ - return MAKELCID(MAKELANGID(WinLang, WinSublang), SORT_DEFAULT); -} - -wxString wxLanguageInfo::GetLocaleName() const -{ - wxString locale; - - const LCID lcid = GetLCID(); - - wxChar buffer[256]; - buffer[0] = wxT('\0'); - if ( !::GetLocaleInfo(lcid, LOCALE_SENGLANGUAGE, buffer, WXSIZEOF(buffer)) ) - { - wxLogLastError(wxT("GetLocaleInfo(LOCALE_SENGLANGUAGE)")); - return locale; - } - - locale << buffer; - if ( ::GetLocaleInfo(lcid, LOCALE_SENGCOUNTRY, - buffer, WXSIZEOF(buffer)) > 0 ) - { - locale << wxT('_') << buffer; - } - - const wxString cp = wxGetANSICodePageForLocale(lcid); - if ( !cp.empty() ) - { - locale << wxT('.') << cp; - } - - return locale; -} - -#endif // __WINDOWS__ - -// ---------------------------------------------------------------------------- -// wxLocale -// ---------------------------------------------------------------------------- - -#include "wx/arrimpl.cpp" -WX_DECLARE_USER_EXPORTED_OBJARRAY(wxLanguageInfo, wxLanguageInfoArray, WXDLLIMPEXP_BASE); -WX_DEFINE_OBJARRAY(wxLanguageInfoArray) - -wxLanguageInfoArray *wxLocale::ms_languagesDB = NULL; - -/*static*/ void wxLocale::CreateLanguagesDB() -{ - if (ms_languagesDB == NULL) - { - ms_languagesDB = new wxLanguageInfoArray; - InitLanguagesDB(); - } -} - -/*static*/ void wxLocale::DestroyLanguagesDB() -{ - wxDELETE(ms_languagesDB); -} - - -void wxLocale::DoCommonInit() -{ - // Store the current locale in order to be able to restore it in the dtor. - m_pszOldLocale = wxSetlocale(LC_ALL, NULL); - if ( m_pszOldLocale ) - m_pszOldLocale = wxStrdup(m_pszOldLocale); - - - m_pOldLocale = wxSetLocale(this); - - // Set translations object, but only if the user didn't do so yet. - // This is to preserve compatibility with wx-2.8 where wxLocale was - // the only API for translations. wxLocale works as a stack, with - // latest-created one being the active one: - // wxLocale loc_fr(wxLANGUAGE_FRENCH); - // // _() returns French - // { - // wxLocale loc_cs(wxLANGUAGE_CZECH); - // // _() returns Czech - // } - // // _() returns French again - wxTranslations *oldTrans = wxTranslations::Get(); - if ( !oldTrans || - (m_pOldLocale && oldTrans == &m_pOldLocale->m_translations) ) - { - wxTranslations::SetNonOwned(&m_translations); - } - - m_language = wxLANGUAGE_UNKNOWN; - m_initialized = false; -} - -// NB: this function has (desired) side effect of changing current locale -bool wxLocale::Init(const wxString& name, - const wxString& shortName, - const wxString& locale, - bool bLoadDefault -#if WXWIN_COMPATIBILITY_2_8 - ,bool WXUNUSED_UNLESS_DEBUG(bConvertEncoding) -#endif - ) -{ -#if WXWIN_COMPATIBILITY_2_8 - wxASSERT_MSG( bConvertEncoding, - wxS("wxLocale::Init with bConvertEncoding=false is no longer supported, add charset to your catalogs") ); -#endif - - bool ret = DoInit(name, shortName, locale); - - // NB: don't use 'lang' here, 'language' may be wxLANGUAGE_DEFAULT - wxTranslations *t = wxTranslations::Get(); - if ( t ) - { - t->SetLanguage(shortName); - - if ( bLoadDefault ) - t->AddStdCatalog(); - } - - return ret; -} - -bool wxLocale::DoInit(const wxString& name, - const wxString& shortName, - const wxString& locale) -{ - wxASSERT_MSG( !m_initialized, - wxS("you can't call wxLocale::Init more than once") ); - - m_initialized = true; - m_strLocale = name; - m_strShort = shortName; - m_language = wxLANGUAGE_UNKNOWN; - - // change current locale (default: same as long name) - wxString szLocale(locale); - if ( szLocale.empty() ) - { - // the argument to setlocale() - szLocale = shortName; - - wxCHECK_MSG( !szLocale.empty(), false, - wxS("no locale to set in wxLocale::Init()") ); - } - - if ( !wxSetlocale(LC_ALL, szLocale) ) - { - wxLogError(_("locale '%s' cannot be set."), szLocale); - } - - // the short name will be used to look for catalog files as well, - // so we need something here - if ( m_strShort.empty() ) { - // FIXME I don't know how these 2 letter abbreviations are formed, - // this wild guess is surely wrong - if ( !szLocale.empty() ) - { - m_strShort += (wxChar)wxTolower(szLocale[0]); - if ( szLocale.length() > 1 ) - m_strShort += (wxChar)wxTolower(szLocale[1]); - } - } - - return true; -} - - -#if defined(__UNIX__) && wxUSE_UNICODE && !defined(__WXMAC__) -static const char *wxSetlocaleTryUTF8(int c, const wxString& lc) -{ - const char *l = NULL; - - // NB: We prefer to set UTF-8 locale if it's possible and only fall back to - // non-UTF-8 locale if it fails - - if ( !lc.empty() ) - { - wxString buf(lc); - wxString buf2; - buf2 = buf + wxS(".UTF-8"); - l = wxSetlocale(c, buf2); - if ( !l ) - { - buf2 = buf + wxS(".utf-8"); - l = wxSetlocale(c, buf2); - } - if ( !l ) - { - buf2 = buf + wxS(".UTF8"); - l = wxSetlocale(c, buf2); - } - if ( !l ) - { - buf2 = buf + wxS(".utf8"); - l = wxSetlocale(c, buf2); - } - } - - // if we can't set UTF-8 locale, try non-UTF-8 one: - if ( !l ) - l = wxSetlocale(c, lc); - - return l; -} -#else -#define wxSetlocaleTryUTF8(c, lc) wxSetlocale(c, lc) -#endif - -bool wxLocale::Init(int language, int flags) -{ -#if WXWIN_COMPATIBILITY_2_8 - wxASSERT_MSG( !(flags & wxLOCALE_CONV_ENCODING), - wxS("wxLOCALE_CONV_ENCODING is no longer supported, add charset to your catalogs") ); -#endif - - bool ret = true; - - int lang = language; - if (lang == wxLANGUAGE_DEFAULT) - { - // auto detect the language - lang = GetSystemLanguage(); - } - - // We failed to detect system language, so we will use English: - if (lang == wxLANGUAGE_UNKNOWN) - { - return false; - } - - const wxLanguageInfo *info = GetLanguageInfo(lang); - - // Unknown language: - if (info == NULL) - { - wxLogError(wxS("Unknown language %i."), lang); - return false; - } - - wxString name = info->Description; - wxString canonical = info->CanonicalName; - wxString locale; - - // Set the locale: -#if defined(__UNIX__) && !defined(__WXMAC__) - if (language != wxLANGUAGE_DEFAULT) - locale = info->CanonicalName; - - const char *retloc = wxSetlocaleTryUTF8(LC_ALL, locale); - - const wxString langOnly = ExtractLang(locale); - if ( !retloc ) - { - // Some C libraries don't like xx_YY form and require xx only - retloc = wxSetlocaleTryUTF8(LC_ALL, langOnly); - } - -#if wxUSE_FONTMAP - // some systems (e.g. FreeBSD and HP-UX) don't have xx_YY aliases but - // require the full xx_YY.encoding form, so try using UTF-8 because this is - // the only thing we can do generically - // - // TODO: add encodings applicable to each language to the lang DB and try - // them all in turn here - if ( !retloc ) - { - const wxChar **names = - wxFontMapperBase::GetAllEncodingNames(wxFONTENCODING_UTF8); - while ( *names ) - { - retloc = wxSetlocale(LC_ALL, locale + wxS('.') + *names++); - if ( retloc ) - break; - } - } -#endif // wxUSE_FONTMAP - - if ( !retloc ) - { - // Some C libraries (namely glibc) still use old ISO 639, - // so will translate the abbrev for them - wxString localeAlt; - if ( langOnly == wxS("he") ) - localeAlt = wxS("iw") + ExtractNotLang(locale); - else if ( langOnly == wxS("id") ) - localeAlt = wxS("in") + ExtractNotLang(locale); - else if ( langOnly == wxS("yi") ) - localeAlt = wxS("ji") + ExtractNotLang(locale); - else if ( langOnly == wxS("nb") ) - localeAlt = wxS("no_NO"); - else if ( langOnly == wxS("nn") ) - localeAlt = wxS("no_NY"); - - if ( !localeAlt.empty() ) - { - retloc = wxSetlocaleTryUTF8(LC_ALL, localeAlt); - if ( !retloc ) - retloc = wxSetlocaleTryUTF8(LC_ALL, ExtractLang(localeAlt)); - } - } - - if ( !retloc ) - ret = false; - -#ifdef __AIX__ - // at least in AIX 5.2 libc is buggy and the string returned from - // setlocale(LC_ALL) can't be passed back to it because it returns 6 - // strings (one for each locale category), i.e. for C locale we get back - // "C C C C C C" - // - // this contradicts IBM own docs but this is not of much help, so just work - // around it in the crudest possible manner - char* p = const_cast(wxStrchr(retloc, ' ')); - if ( p ) - *p = '\0'; -#endif // __AIX__ - -#elif defined(__WIN32__) - const char *retloc = "C"; - if ( language != wxLANGUAGE_DEFAULT ) - { - if ( info->WinLang == 0 ) - { - wxLogWarning(wxS("Locale '%s' not supported by OS."), name.c_str()); - // retloc already set to "C" - } - else // language supported by Windows - { - const wxUint32 lcid = info->GetLCID(); - - // change locale used by Windows functions - ::SetThreadLocale(lcid); - - // SetThreadUILanguage() is available on XP, but with unclear - // behavior, so avoid calling it there. - if ( wxGetWinVersion() >= wxWinVersion_Vista ) - { - wxLoadedDLL dllKernel32(wxS("kernel32.dll")); - typedef LANGID(WINAPI *SetThreadUILanguage_t)(LANGID); - SetThreadUILanguage_t pfnSetThreadUILanguage = NULL; - wxDL_INIT_FUNC(pfn, SetThreadUILanguage, dllKernel32); - if (pfnSetThreadUILanguage) - pfnSetThreadUILanguage(LANGIDFROMLCID(lcid)); - } - - // and also call setlocale() to change locale used by the CRT - locale = info->GetLocaleName(); - if ( locale.empty() ) - { - ret = false; - } - else // have a valid locale - { - retloc = wxSetlocale(LC_ALL, locale); - } - } - } - else // language == wxLANGUAGE_DEFAULT - { - retloc = wxSetlocale(LC_ALL, wxEmptyString); - } - -#if wxUSE_UNICODE && (defined(__VISUALC__) || defined(__MINGW32__)) - // VC++ setlocale() (also used by Mingw) can't set locale to languages that - // can only be written using Unicode, therefore wxSetlocale() call fails - // for such languages but we don't want to report it as an error -- so that - // at least message catalogs can be used. - if ( !retloc ) - { - if ( wxGetANSICodePageForLocale(LOCALE_USER_DEFAULT).empty() ) - { - // we set the locale to a Unicode-only language, don't treat the - // inability of CRT to use it as an error - retloc = "C"; - } - } -#endif // CRT not handling Unicode-only languages - - if ( !retloc ) - ret = false; -#elif defined(__WXMAC__) - if (lang == wxLANGUAGE_DEFAULT) - locale = wxEmptyString; - else - locale = info->CanonicalName; - - const char *retloc = wxSetlocale(LC_ALL, locale); - - if ( !retloc ) - { - // Some C libraries don't like xx_YY form and require xx only - retloc = wxSetlocale(LC_ALL, ExtractLang(locale)); - } -#else - wxUnusedVar(flags); - return false; - #define WX_NO_LOCALE_SUPPORT -#endif - -#ifndef WX_NO_LOCALE_SUPPORT - if ( !ret ) - { - wxLogWarning(_("Cannot set locale to language \"%s\"."), name.c_str()); - - // As we failed to change locale, there is no need to restore the - // previous one: it's still valid. - free(const_cast(m_pszOldLocale)); - m_pszOldLocale = NULL; - - // continue nevertheless and try to load at least the translations for - // this language - } - - if ( !DoInit(name, canonical, retloc) ) - { - ret = false; - } - - if (IsOk()) // setlocale() succeeded - m_language = lang; - - // NB: don't use 'lang' here, 'language' - wxTranslations *t = wxTranslations::Get(); - if ( t ) - { - t->SetLanguage(static_cast(language)); - - if ( flags & wxLOCALE_LOAD_DEFAULT ) - t->AddStdCatalog(); - } - - return ret; -#endif // !WX_NO_LOCALE_SUPPORT -} - -namespace -{ - -#ifndef __WXOSX__ -// Small helper function: get the value of the given environment variable and -// return true only if the variable was found and has non-empty value. -inline bool wxGetNonEmptyEnvVar(const wxString& name, wxString* value) -{ - return wxGetEnv(name, value) && !value->empty(); -} -#endif - -} // anonymous namespace - -/*static*/ int wxLocale::GetSystemLanguage() -{ - CreateLanguagesDB(); - - // init i to avoid compiler warning - size_t i = 0, - count = ms_languagesDB->GetCount(); - -#if defined(__UNIX__) - // first get the string identifying the language from the environment - wxString langFull; -#ifdef __WXOSX__ - wxCFRef userLocaleRef(CFLocaleCopyCurrent()); - - // because the locale identifier (kCFLocaleIdentifier) is formatted a little bit differently, eg - // az_Cyrl_AZ@calendar=buddhist;currency=JPY we just recreate the base info as expected by wx here - - wxCFStringRef str(wxCFRetain((CFStringRef)CFLocaleGetValue(userLocaleRef, kCFLocaleLanguageCode))); - langFull = str.AsString()+"_"; - str.reset(wxCFRetain((CFStringRef)CFLocaleGetValue(userLocaleRef, kCFLocaleCountryCode))); - langFull += str.AsString(); -#else - if (!wxGetNonEmptyEnvVar(wxS("LC_ALL"), &langFull) && - !wxGetNonEmptyEnvVar(wxS("LC_MESSAGES"), &langFull) && - !wxGetNonEmptyEnvVar(wxS("LANG"), &langFull)) - { - // no language specified, treat it as English - return wxLANGUAGE_ENGLISH_US; - } - - if ( langFull == wxS("C") || langFull == wxS("POSIX") ) - { - // default C locale is English too - return wxLANGUAGE_ENGLISH_US; - } -#endif - - // the language string has the following form - // - // lang[_LANG][.encoding][@modifier] - // - // (see environ(5) in the Open Unix specification) - // - // where lang is the primary language, LANG is a sublang/territory, - // encoding is the charset to use and modifier "allows the user to select - // a specific instance of localization data within a single category" - // - // for example, the following strings are valid: - // fr - // fr_FR - // de_DE.iso88591 - // de_DE@euro - // de_DE.iso88591@euro - - // for now we don't use the encoding, although we probably should (doing - // translations of the msg catalogs on the fly as required) (TODO) - // - // we need the modified for languages like Valencian: ca_ES@valencia - // though, remember it - wxString modifier; - size_t posModifier = langFull.find_first_of(wxS("@")); - if ( posModifier != wxString::npos ) - modifier = langFull.Mid(posModifier); - - size_t posEndLang = langFull.find_first_of(wxS("@.")); - if ( posEndLang != wxString::npos ) - { - langFull.Truncate(posEndLang); - } - - // do we have just the language (or sublang too)? - const bool justLang = langFull.find('_') == wxString::npos; - - // 0. Make sure the lang is according to latest ISO 639 - // (this is necessary because glibc uses iw and in instead - // of he and id respectively). - - // the language itself (second part is the dialect/sublang) - wxString langOrig = ExtractLang(langFull); - - wxString lang; - if ( langOrig == wxS("iw")) - lang = wxS("he"); - else if (langOrig == wxS("in")) - lang = wxS("id"); - else if (langOrig == wxS("ji")) - lang = wxS("yi"); - else if (langOrig == wxS("no_NO")) - lang = wxS("nb_NO"); - else if (langOrig == wxS("no_NY")) - lang = wxS("nn_NO"); - else if (langOrig == wxS("no")) - lang = wxS("nb_NO"); - else - lang = langOrig; - - // did we change it? - if ( lang != langOrig ) - { - langFull = lang + ExtractNotLang(langFull); - } - - // 1. Try to find the language either as is: - // a) With modifier if set - if ( !modifier.empty() ) - { - wxString langFullWithModifier = langFull + modifier; - for ( i = 0; i < count; i++ ) - { - if ( ms_languagesDB->Item(i).CanonicalName == langFullWithModifier ) - break; - } - } - - // b) Without modifier - if ( modifier.empty() || i == count ) - { - for ( i = 0; i < count; i++ ) - { - if ( ms_languagesDB->Item(i).CanonicalName == langFull ) - break; - } - } - - // 2. If langFull is of the form xx_YY, try to find xx: - if ( i == count && !justLang ) - { - for ( i = 0; i < count; i++ ) - { - if ( ms_languagesDB->Item(i).CanonicalName == lang ) - { - break; - } - } - } - - // 3. If langFull is of the form xx, try to find any xx_YY record: - if ( i == count && justLang ) - { - for ( i = 0; i < count; i++ ) - { - if ( ExtractLang(ms_languagesDB->Item(i).CanonicalName) - == langFull ) - { - break; - } - } - } - - - if ( i == count ) - { - // In addition to the format above, we also can have full language - // names in LANG env var - for example, SuSE is known to use - // LANG="german" - so check for use of non-standard format and try to - // find the name in verbose description. - for ( i = 0; i < count; i++ ) - { - if (ms_languagesDB->Item(i).Description.CmpNoCase(langFull) == 0) - { - break; - } - } - } -#elif defined(__WIN32__) - LCID lcid = GetUserDefaultLCID(); - if ( lcid != 0 ) - { - wxUint32 lang = PRIMARYLANGID(LANGIDFROMLCID(lcid)); - wxUint32 sublang = SUBLANGID(LANGIDFROMLCID(lcid)); - - for ( i = 0; i < count; i++ ) - { - if (ms_languagesDB->Item(i).WinLang == lang && - ms_languagesDB->Item(i).WinSublang == sublang) - { - break; - } - } - } - //else: leave wxlang == wxLANGUAGE_UNKNOWN -#endif // Unix/Win32 - - if ( i < count ) - { - // we did find a matching entry, use it - return ms_languagesDB->Item(i).Language; - } - - // no info about this language in the database - return wxLANGUAGE_UNKNOWN; -} - -// ---------------------------------------------------------------------------- -// encoding stuff -// ---------------------------------------------------------------------------- - -// this is a bit strange as under Windows we get the encoding name using its -// numeric value and under Unix we do it the other way round, but this just -// reflects the way different systems provide the encoding info - -/* static */ -wxString wxLocale::GetSystemEncodingName() -{ - wxString encname; - -#if defined(__WIN32__) - // FIXME: what is the error return value for GetACP()? - UINT codepage = ::GetACP(); - encname.Printf(wxS("windows-%u"), codepage); -#elif defined(__WXMAC__) - encname = wxCFStringRef::AsString( - CFStringGetNameOfEncoding(CFStringGetSystemEncoding()) - ); -#elif defined(__UNIX_LIKE__) - -#if defined(HAVE_LANGINFO_H) && defined(CODESET) - // GNU libc provides current character set this way (this conforms - // to Unix98) - char *oldLocale = strdup(setlocale(LC_CTYPE, NULL)); - setlocale(LC_CTYPE, ""); - const char *alang = nl_langinfo(CODESET); - setlocale(LC_CTYPE, oldLocale); - free(oldLocale); - - if ( alang ) - { - encname = wxString::FromAscii( alang ); - } - else // nl_langinfo() failed -#endif // HAVE_LANGINFO_H - { - // if we can't get at the character set directly, try to see if it's in - // the environment variables (in most cases this won't work, but I was - // out of ideas) - char *lang = getenv( "LC_ALL"); - char *dot = lang ? strchr(lang, '.') : NULL; - if (!dot) - { - lang = getenv( "LC_CTYPE" ); - if ( lang ) - dot = strchr(lang, '.' ); - } - if (!dot) - { - lang = getenv( "LANG"); - if ( lang ) - dot = strchr(lang, '.'); - } - - if ( dot ) - { - encname = wxString::FromAscii( dot+1 ); - } - } -#endif // Win32/Unix - - return encname; -} - -/* static */ -wxFontEncoding wxLocale::GetSystemEncoding() -{ -#if defined(__WIN32__) - UINT codepage = ::GetACP(); - - // wxWidgets only knows about CP1250-1257, 874, 932, 936, 949, 950 - if ( codepage >= 1250 && codepage <= 1257 ) - { - return (wxFontEncoding)(wxFONTENCODING_CP1250 + codepage - 1250); - } - - if ( codepage == 874 ) - { - return wxFONTENCODING_CP874; - } - - if ( codepage == 932 ) - { - return wxFONTENCODING_CP932; - } - - if ( codepage == 936 ) - { - return wxFONTENCODING_CP936; - } - - if ( codepage == 949 ) - { - return wxFONTENCODING_CP949; - } - - if ( codepage == 950 ) - { - return wxFONTENCODING_CP950; - } -#elif defined(__WXMAC__) - CFStringEncoding encoding = 0 ; - encoding = CFStringGetSystemEncoding() ; - return wxMacGetFontEncFromSystemEnc( encoding ) ; -#elif defined(__UNIX_LIKE__) && wxUSE_FONTMAP - const wxString encname = GetSystemEncodingName(); - if ( !encname.empty() ) - { - wxFontEncoding enc = wxFontMapperBase::GetEncodingFromName(encname); - - // on some modern Linux systems (RedHat 8) the default system locale - // is UTF8 -- but it isn't supported by wxGTK1 in ANSI build at all so - // don't even try to use it in this case -#if !wxUSE_UNICODE && \ - ((defined(__WXGTK__) && !defined(__WXGTK20__)) || defined(__WXMOTIF__)) - if ( enc == wxFONTENCODING_UTF8 ) - { - // the most similar supported encoding... - enc = wxFONTENCODING_ISO8859_1; - } -#endif // !wxUSE_UNICODE - - // GetEncodingFromName() returns wxFONTENCODING_DEFAULT for C locale - // (a.k.a. US-ASCII) which is arguably a bug but keep it like this for - // backwards compatibility and just take care to not return - // wxFONTENCODING_DEFAULT from here as this surely doesn't make sense - if ( enc == wxFONTENCODING_DEFAULT ) - { - // we don't have wxFONTENCODING_ASCII, so use the closest one - return wxFONTENCODING_ISO8859_1; - } - - if ( enc != wxFONTENCODING_MAX ) - { - return enc; - } - //else: return wxFONTENCODING_SYSTEM below - } -#endif // Win32/Unix - - return wxFONTENCODING_SYSTEM; -} - -/* static */ -void wxLocale::AddLanguage(const wxLanguageInfo& info) -{ - CreateLanguagesDB(); - ms_languagesDB->Add(info); -} - -/* static */ -const wxLanguageInfo *wxLocale::GetLanguageInfo(int lang) -{ - CreateLanguagesDB(); - - // calling GetLanguageInfo(wxLANGUAGE_DEFAULT) is a natural thing to do, so - // make it work - if ( lang == wxLANGUAGE_DEFAULT ) - lang = GetSystemLanguage(); - - const size_t count = ms_languagesDB->GetCount(); - for ( size_t i = 0; i < count; i++ ) - { - if ( ms_languagesDB->Item(i).Language == lang ) - { - // We need to create a temporary here in order to make this work with BCC in final build mode - wxLanguageInfo *ptr = &ms_languagesDB->Item(i); - return ptr; - } - } - - return NULL; -} - -/* static */ -wxString wxLocale::GetLanguageName(int lang) -{ - if ( lang == wxLANGUAGE_DEFAULT || lang == wxLANGUAGE_UNKNOWN ) - return wxEmptyString; - - const wxLanguageInfo *info = GetLanguageInfo(lang); - if ( !info ) - return wxEmptyString; - else - return info->Description; -} - -/* static */ -wxString wxLocale::GetLanguageCanonicalName(int lang) -{ - if ( lang == wxLANGUAGE_DEFAULT || lang == wxLANGUAGE_UNKNOWN ) - return wxEmptyString; - - const wxLanguageInfo *info = GetLanguageInfo(lang); - if ( !info ) - return wxEmptyString; - else - return info->CanonicalName; -} - -/* static */ -const wxLanguageInfo *wxLocale::FindLanguageInfo(const wxString& locale) -{ - CreateLanguagesDB(); - - const wxLanguageInfo *infoRet = NULL; - - const size_t count = ms_languagesDB->GetCount(); - for ( size_t i = 0; i < count; i++ ) - { - const wxLanguageInfo *info = &ms_languagesDB->Item(i); - - if ( wxStricmp(locale, info->CanonicalName) == 0 || - wxStricmp(locale, info->Description) == 0 ) - { - // exact match, stop searching - infoRet = info; - break; - } - - if ( wxStricmp(locale, info->CanonicalName.BeforeFirst(wxS('_'))) == 0 ) - { - // a match -- but maybe we'll find an exact one later, so continue - // looking - // - // OTOH, maybe we had already found a language match and in this - // case don't overwrite it because the entry for the default - // country always appears first in ms_languagesDB - if ( !infoRet ) - infoRet = info; - } - } - - return infoRet; -} - -wxString wxLocale::GetSysName() const -{ - return wxSetlocale(LC_ALL, NULL); -} - -// clean up -wxLocale::~wxLocale() -{ - // Restore old translations object. - // See DoCommonInit() for explanation of why this is needed for backward - // compatibility. - if ( wxTranslations::Get() == &m_translations ) - { - if ( m_pOldLocale ) - wxTranslations::SetNonOwned(&m_pOldLocale->m_translations); - else - wxTranslations::Set(NULL); - } - - // restore old locale pointer - wxSetLocale(m_pOldLocale); - - if ( m_pszOldLocale ) - { - wxSetlocale(LC_ALL, m_pszOldLocale); - free(const_cast(m_pszOldLocale)); - } -} - - -// check if the given locale is provided by OS and C run time -/* static */ -bool wxLocale::IsAvailable(int lang) -{ - const wxLanguageInfo *info = wxLocale::GetLanguageInfo(lang); - if ( !info ) - { - // The language is unknown (this normally only happens when we're - // passed wxLANGUAGE_DEFAULT), so we can't support it. - wxASSERT_MSG( lang == wxLANGUAGE_DEFAULT, - wxS("No info for a valid language?") ); - return false; - } - -#if defined(__WIN32__) - if ( !info->WinLang ) - return false; - - if ( !::IsValidLocale(info->GetLCID(), LCID_INSTALLED) ) - return false; - -#elif defined(__UNIX__) - - // Test if setting the locale works, then set it back. - char * const oldLocale = wxStrdupA(setlocale(LC_ALL, NULL)); - - // Some platforms don't like xx_YY form and require xx only so test for - // it too. - const bool - available = wxSetlocaleTryUTF8(LC_ALL, info->CanonicalName) || - wxSetlocaleTryUTF8(LC_ALL, ExtractLang(info->CanonicalName)); - - // restore the original locale - wxSetlocale(LC_ALL, oldLocale); - - free(oldLocale); - - if ( !available ) - return false; -#endif - - return true; -} - - -bool wxLocale::AddCatalog(const wxString& domain) -{ - wxTranslations *t = wxTranslations::Get(); - if ( !t ) - return false; - return t->AddCatalog(domain); -} - -bool wxLocale::AddCatalog(const wxString& domain, wxLanguage msgIdLanguage) -{ - wxTranslations *t = wxTranslations::Get(); - if ( !t ) - return false; - return t->AddCatalog(domain, msgIdLanguage); -} - -// add a catalog to our linked list -bool wxLocale::AddCatalog(const wxString& szDomain, - wxLanguage msgIdLanguage, - const wxString& msgIdCharset) -{ - wxTranslations *t = wxTranslations::Get(); - if ( !t ) - return false; -#if wxUSE_UNICODE - wxUnusedVar(msgIdCharset); - return t->AddCatalog(szDomain, msgIdLanguage); -#else - return t->AddCatalog(szDomain, msgIdLanguage, msgIdCharset); -#endif -} - -bool wxLocale::IsLoaded(const wxString& domain) const -{ - wxTranslations *t = wxTranslations::Get(); - if ( !t ) - return false; - return t->IsLoaded(domain); -} - -wxString wxLocale::GetHeaderValue(const wxString& header, - const wxString& domain) const -{ - wxTranslations *t = wxTranslations::Get(); - if ( !t ) - return wxEmptyString; - return t->GetHeaderValue(header, domain); -} - -// ---------------------------------------------------------------------------- -// accessors for locale-dependent data -// ---------------------------------------------------------------------------- - -#if defined(__WINDOWS__) || defined(__WXOSX__) - -namespace -{ - -bool IsAtTwoSingleQuotes(const wxString& fmt, wxString::const_iterator p) -{ - if ( p != fmt.end() && *p == '\'') - { - ++p; - if ( p != fmt.end() && *p == '\'') - { - return true; - } - } - - return false; -} - -} // anonymous namespace - -// This function translates from Unicode date formats described at -// -// http://unicode.org/reports/tr35/tr35-6.html#Date_Format_Patterns -// -// to strftime()-like syntax. This translation is not lossless but we try to do -// our best. - -// The function is only exported because it is used in the unit test, it is not -// part of the public API. -WXDLLIMPEXP_BASE -wxString wxTranslateFromUnicodeFormat(const wxString& fmt) -{ - wxString fmtWX; - fmtWX.reserve(fmt.length()); - - char chLast = '\0'; - size_t lastCount = 0; - - const char* formatchars = - "dghHmMsSy" -#ifdef __WINDOWS__ - "t" -#else - "EawD" -#endif - ; - for ( wxString::const_iterator p = fmt.begin(); /* end handled inside */; ++p ) - { - if ( p != fmt.end() ) - { - if ( *p == chLast ) - { - lastCount++; - continue; - } - - const wxUniChar ch = (*p).GetValue(); - if ( ch.IsAscii() && strchr(formatchars, ch) ) - { - // these characters come in groups, start counting them - chLast = ch; - lastCount = 1; - continue; - } - } - - // interpret any special characters we collected so far - if ( lastCount ) - { - switch ( chLast ) - { - case 'd': - switch ( lastCount ) - { - case 1: // d - case 2: // dd - // these two are the same as we don't distinguish - // between 1 and 2 digits for days - fmtWX += "%d"; - break; -#ifdef __WINDOWS__ - case 3: // ddd - fmtWX += "%a"; - break; - - case 4: // dddd - fmtWX += "%A"; - break; -#endif - default: - wxFAIL_MSG( "too many 'd's" ); - } - break; -#ifndef __WINDOWS__ - case 'D': - switch ( lastCount ) - { - case 1: // D - case 2: // DD - case 3: // DDD - fmtWX += "%j"; - break; - - default: - wxFAIL_MSG( "wrong number of 'D's" ); - } - break; - case 'w': - switch ( lastCount ) - { - case 1: // w - case 2: // ww - fmtWX += "%W"; - break; - - default: - wxFAIL_MSG( "wrong number of 'w's" ); - } - break; - case 'E': - switch ( lastCount ) - { - case 1: // E - case 2: // EE - case 3: // EEE - fmtWX += "%a"; - break; - case 4: // EEEE - fmtWX += "%A"; - break; - case 5: // EEEEE - case 6: // EEEEEE - // no "narrow form" in strftime(), use abbrev. - fmtWX += "%a"; - break; - - default: - wxFAIL_MSG( "wrong number of 'E's" ); - } - break; -#endif - case 'M': - switch ( lastCount ) - { - case 1: // M - case 2: // MM - // as for 'd' and 'dd' above - fmtWX += "%m"; - break; - - case 3: - fmtWX += "%b"; - break; - - case 4: - fmtWX += "%B"; - break; - - case 5: - // no "narrow form" in strftime(), use abbrev. - fmtWX += "%b"; - break; - - default: - wxFAIL_MSG( "too many 'M's" ); - } - break; - - case 'y': - switch ( lastCount ) - { - case 1: // y - case 2: // yy - fmtWX += "%y"; - break; - - case 4: // yyyy - fmtWX += "%Y"; - break; - - default: - wxFAIL_MSG( "wrong number of 'y's" ); - } - break; - - case 'H': - switch ( lastCount ) - { - case 1: // H - case 2: // HH - fmtWX += "%H"; - break; - - default: - wxFAIL_MSG( "wrong number of 'H's" ); - } - break; - - case 'h': - switch ( lastCount ) - { - case 1: // h - case 2: // hh - fmtWX += "%I"; - break; - - default: - wxFAIL_MSG( "wrong number of 'h's" ); - } - break; - - case 'm': - switch ( lastCount ) - { - case 1: // m - case 2: // mm - fmtWX += "%M"; - break; - - default: - wxFAIL_MSG( "wrong number of 'm's" ); - } - break; - - case 's': - switch ( lastCount ) - { - case 1: // s - case 2: // ss - fmtWX += "%S"; - break; - - default: - wxFAIL_MSG( "wrong number of 's's" ); - } - break; - - case 'g': - // strftime() doesn't have era string, - // ignore this format - wxASSERT_MSG( lastCount <= 2, "too many 'g's" ); - - break; -#ifndef __WINDOWS__ - case 'a': - fmtWX += "%p"; - break; -#endif -#ifdef __WINDOWS__ - case 't': - switch ( lastCount ) - { - case 1: // t - case 2: // tt - fmtWX += "%p"; - break; - - default: - wxFAIL_MSG( "too many 't's" ); - } - break; -#endif - default: - wxFAIL_MSG( "unreachable" ); - } - - chLast = '\0'; - lastCount = 0; - } - - if ( p == fmt.end() ) - break; - - /* - Handle single quotes: - "Two single quotes represents [sic] a literal single quote, either - inside or outside single quotes. Text within single quotes is not - interpreted in any way (except for two adjacent single quotes)." - */ - - if ( IsAtTwoSingleQuotes(fmt, p) ) - { - fmtWX += '\''; - ++p; // the 2nd single quote is skipped by the for loop's increment - continue; - } - - bool isEndQuote = false; - if ( *p == '\'' ) - { - ++p; - while ( p != fmt.end() ) - { - if ( IsAtTwoSingleQuotes(fmt, p) ) - { - fmtWX += '\''; - p += 2; - continue; - } - - if ( *p == '\'' ) - { - isEndQuote = true; - break; - } - - fmtWX += *p; - ++p; - } - } - - if ( p == fmt.end() ) - break; - - if ( !isEndQuote ) - { - // not a special character so must be just a separator, treat as is - if ( *p == wxT('%') ) - { - // this one needs to be escaped - fmtWX += wxT('%'); - } - - fmtWX += *p; - } - } - - return fmtWX; -} - - -#endif // __WINDOWS__ || __WXOSX__ - -#if defined(__WINDOWS__) - -namespace -{ - -LCTYPE GetLCTYPEFormatFromLocalInfo(wxLocaleInfo index) -{ - switch ( index ) - { - case wxLOCALE_SHORT_DATE_FMT: - return LOCALE_SSHORTDATE; - - case wxLOCALE_LONG_DATE_FMT: - return LOCALE_SLONGDATE; - - case wxLOCALE_TIME_FMT: - return LOCALE_STIMEFORMAT; - - default: - wxFAIL_MSG( "no matching LCTYPE" ); - } - - return 0; -} - -wxString -GetInfoFromLCID(LCID lcid, - wxLocaleInfo index, - wxLocaleCategory cat = wxLOCALE_CAT_DEFAULT) -{ - wxString str; - - wxChar buf[256]; - buf[0] = wxT('\0'); - - switch ( index ) - { - case wxLOCALE_THOUSANDS_SEP: - if ( ::GetLocaleInfo(lcid, LOCALE_STHOUSAND, buf, WXSIZEOF(buf)) ) - str = buf; - break; - - case wxLOCALE_DECIMAL_POINT: - if ( ::GetLocaleInfo(lcid, - cat == wxLOCALE_CAT_MONEY - ? LOCALE_SMONDECIMALSEP - : LOCALE_SDECIMAL, - buf, - WXSIZEOF(buf)) ) - { - str = buf; - - // As we get our decimal point separator from Win32 and not the - // CRT there is a possibility of mismatch between them and this - // can easily happen if the user code called setlocale() - // instead of using wxLocale to change the locale. And this can - // result in very strange bugs elsewhere in the code as the - // assumptions that formatted strings do use the decimal - // separator actually fail, so check for it here. - wxASSERT_MSG - ( - wxString::Format("%.3f", 1.23).find(str) != wxString::npos, - "Decimal separator mismatch -- did you use setlocale()?" - "If so, use wxLocale to change the locale instead." - ); - } - break; - - case wxLOCALE_SHORT_DATE_FMT: - case wxLOCALE_LONG_DATE_FMT: - case wxLOCALE_TIME_FMT: - if ( ::GetLocaleInfo(lcid, GetLCTYPEFormatFromLocalInfo(index), - buf, WXSIZEOF(buf)) ) - { - return wxTranslateFromUnicodeFormat(buf); - } - break; - - case wxLOCALE_DATE_TIME_FMT: - // there doesn't seem to be any specific setting for this, so just - // combine date and time ones - // - // we use the short date because this is what "%c" uses by default - // ("%#c" uses long date but we have no way to specify the - // alternate representation here) - { - const wxString - datefmt = GetInfoFromLCID(lcid, wxLOCALE_SHORT_DATE_FMT); - if ( datefmt.empty() ) - break; - - const wxString - timefmt = GetInfoFromLCID(lcid, wxLOCALE_TIME_FMT); - if ( timefmt.empty() ) - break; - - str << datefmt << ' ' << timefmt; - } - break; - - default: - wxFAIL_MSG( "unknown wxLocaleInfo" ); - } - - return str; -} - -} // anonymous namespace - -/* static */ -wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory cat) -{ - const wxLanguageInfo * const - info = wxGetLocale() ? GetLanguageInfo(wxGetLocale()->GetLanguage()) - : NULL; - if ( !info ) - { - // wxSetLocale() hadn't been called yet of failed, hence CRT must be - // using "C" locale -- but check it to detect bugs that would happen if - // this were not the case. - wxASSERT_MSG( strcmp(setlocale(LC_ALL, NULL), "C") == 0, - wxS("You probably called setlocale() directly instead ") - wxS("of using wxLocale and now there is a ") - wxS("mismatch between C/C++ and Windows locale.\n") - wxS("Things are going to break, please only change ") - wxS("locale by creating wxLocale objects to avoid this!") ); - - - // Return the hard coded values for C locale. This is really the right - // thing to do as there is no LCID we can use in the code below in this - // case, even LOCALE_INVARIANT is not quite the same as C locale (the - // only difference is that it uses %Y instead of %y in the date format - // but this difference is significant enough). - switch ( index ) - { - case wxLOCALE_THOUSANDS_SEP: - return wxString(); - - case wxLOCALE_DECIMAL_POINT: - return "."; - - case wxLOCALE_SHORT_DATE_FMT: - return "%m/%d/%y"; - - case wxLOCALE_LONG_DATE_FMT: - return "%A, %B %d, %Y"; - - case wxLOCALE_TIME_FMT: - return "%H:%M:%S"; - - case wxLOCALE_DATE_TIME_FMT: - return "%m/%d/%y %H:%M:%S"; - - default: - wxFAIL_MSG( "unknown wxLocaleInfo" ); - } - } - - return GetInfoFromLCID(info->GetLCID(), index, cat); -} - -/* static */ -wxString wxLocale::GetOSInfo(wxLocaleInfo index, wxLocaleCategory cat) -{ - return GetInfoFromLCID(::GetThreadLocale(), index, cat); -} - -#elif defined(__WXOSX__) - -/* static */ -wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory WXUNUSED(cat)) -{ - CFLocaleRef userLocaleRefRaw; - if ( wxGetLocale() ) - { - userLocaleRefRaw = CFLocaleCreate - ( - kCFAllocatorDefault, - wxCFStringRef(wxGetLocale()->GetCanonicalName()) - ); - } - else // no current locale, use the default one - { - userLocaleRefRaw = CFLocaleCopyCurrent(); - } - - wxCFRef userLocaleRef(userLocaleRefRaw); - - CFStringRef cfstr = 0; - switch ( index ) - { - case wxLOCALE_THOUSANDS_SEP: - cfstr = (CFStringRef) CFLocaleGetValue(userLocaleRef, kCFLocaleGroupingSeparator); - break; - - case wxLOCALE_DECIMAL_POINT: - cfstr = (CFStringRef) CFLocaleGetValue(userLocaleRef, kCFLocaleDecimalSeparator); - break; - - case wxLOCALE_SHORT_DATE_FMT: - case wxLOCALE_LONG_DATE_FMT: - case wxLOCALE_DATE_TIME_FMT: - case wxLOCALE_TIME_FMT: - { - CFDateFormatterStyle dateStyle = kCFDateFormatterNoStyle; - CFDateFormatterStyle timeStyle = kCFDateFormatterNoStyle; - switch (index ) - { - case wxLOCALE_SHORT_DATE_FMT: - dateStyle = kCFDateFormatterShortStyle; - break; - case wxLOCALE_LONG_DATE_FMT: - dateStyle = kCFDateFormatterFullStyle; - break; - case wxLOCALE_DATE_TIME_FMT: - dateStyle = kCFDateFormatterFullStyle; - timeStyle = kCFDateFormatterMediumStyle; - break; - case wxLOCALE_TIME_FMT: - timeStyle = kCFDateFormatterMediumStyle; - break; - default: - wxFAIL_MSG( "unexpected time locale" ); - return wxString(); - } - wxCFRef dateFormatter( CFDateFormatterCreate - (NULL, userLocaleRef, dateStyle, timeStyle)); - wxCFStringRef cfs = wxCFRetain( CFDateFormatterGetFormat(dateFormatter )); - wxString format = wxTranslateFromUnicodeFormat(cfs.AsString()); - // we always want full years - format.Replace("%y","%Y"); - return format; - } - break; - - default: - wxFAIL_MSG( "Unknown locale info" ); - return wxString(); - } - - wxCFStringRef str(wxCFRetain(cfstr)); - return str.AsString(); -} - -#else // !__WINDOWS__ && !__WXOSX__, assume generic POSIX - -namespace -{ - -wxString GetDateFormatFromLangInfo(wxLocaleInfo index) -{ -#ifdef HAVE_LANGINFO_H - // array containing parameters for nl_langinfo() indexes by offset of index - // from wxLOCALE_SHORT_DATE_FMT - static const nl_item items[] = - { - D_FMT, D_T_FMT, D_T_FMT, T_FMT, - }; - - const int nlidx = index - wxLOCALE_SHORT_DATE_FMT; - if ( nlidx < 0 || nlidx >= (int)WXSIZEOF(items) ) - { - wxFAIL_MSG( "logic error in GetInfo() code" ); - return wxString(); - } - - const wxString fmt(nl_langinfo(items[nlidx])); - - // just return the format returned by nl_langinfo() except for long date - // format which we need to recover from date/time format ourselves (but not - // if we failed completely) - if ( fmt.empty() || index != wxLOCALE_LONG_DATE_FMT ) - return fmt; - - // this is not 100% precise but the idea is that a typical date/time format - // under POSIX systems is a combination of a long date format with time one - // so we should be able to get just the long date format by removing all - // time-specific format specifiers - static const char *timeFmtSpecs = "HIklMpPrRsSTXzZ"; - static const char *timeSep = " :./-"; - - wxString fmtDateOnly; - const wxString::const_iterator end = fmt.end(); - wxString::const_iterator lastSep = end; - for ( wxString::const_iterator p = fmt.begin(); p != end; ++p ) - { - if ( strchr(timeSep, *p) ) - { - if ( lastSep == end ) - lastSep = p; - - // skip it for now, we'll discard it if it's followed by a time - // specifier later or add it to fmtDateOnly if it is not - continue; - } - - if ( *p == '%' && - (p + 1 != end) && strchr(timeFmtSpecs, p[1]) ) - { - // time specified found: skip it and any preceding separators - ++p; - lastSep = end; - continue; - } - - if ( lastSep != end ) - { - fmtDateOnly += wxString(lastSep, p); - lastSep = end; - } - - fmtDateOnly += *p; - } - - return fmtDateOnly; -#else // !HAVE_LANGINFO_H - wxUnusedVar(index); - - // no fallback, let the application deal with unavailability of - // nl_langinfo() itself as there is no good way for us to do it (well, we - // could try to reverse engineer the format from strftime() output but this - // looks like too much trouble considering the relatively small number of - // systems without nl_langinfo() still in use) - return wxString(); -#endif // HAVE_LANGINFO_H/!HAVE_LANGINFO_H -} - -} // anonymous namespace - -/* static */ -wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory cat) -{ -// TODO: as of 2014 Android doesn't has complete locale support (use java api) -#if !(defined(__WXQT__) && defined(__ANDROID__)) - lconv * const lc = localeconv(); - if ( !lc ) - return wxString(); - - switch ( index ) - { - case wxLOCALE_THOUSANDS_SEP: - if ( cat == wxLOCALE_CAT_NUMBER ) - return lc->thousands_sep; - else if ( cat == wxLOCALE_CAT_MONEY ) - return lc->mon_thousands_sep; - - wxFAIL_MSG( "invalid wxLocaleCategory" ); - break; - - - case wxLOCALE_DECIMAL_POINT: - if ( cat == wxLOCALE_CAT_NUMBER ) - return lc->decimal_point; - else if ( cat == wxLOCALE_CAT_MONEY ) - return lc->mon_decimal_point; - - wxFAIL_MSG( "invalid wxLocaleCategory" ); - break; - - case wxLOCALE_SHORT_DATE_FMT: - case wxLOCALE_LONG_DATE_FMT: - case wxLOCALE_DATE_TIME_FMT: - case wxLOCALE_TIME_FMT: - if ( cat != wxLOCALE_CAT_DATE && cat != wxLOCALE_CAT_DEFAULT ) - { - wxFAIL_MSG( "invalid wxLocaleCategory" ); - break; - } - - return GetDateFormatFromLangInfo(index); - - - default: - wxFAIL_MSG( "unknown wxLocaleInfo value" ); - } -#endif - return wxString(); -} - -#endif // platform - -#ifndef __WINDOWS__ - -/* static */ -wxString wxLocale::GetOSInfo(wxLocaleInfo index, wxLocaleCategory cat) -{ - return GetInfo(index, cat); -} - -#endif // !__WINDOWS__ - -// ---------------------------------------------------------------------------- -// global functions and variables -// ---------------------------------------------------------------------------- - -// retrieve/change current locale -// ------------------------------ - -// the current locale object -static wxLocale *g_pLocale = NULL; - -wxLocale *wxGetLocale() -{ - return g_pLocale; -} - -wxLocale *wxSetLocale(wxLocale *pLocale) -{ - wxLocale *pOld = g_pLocale; - g_pLocale = pLocale; - return pOld; -} - - - -// ---------------------------------------------------------------------------- -// wxLocale module (for lazy destruction of languagesDB) -// ---------------------------------------------------------------------------- - -class wxLocaleModule: public wxModule -{ - wxDECLARE_DYNAMIC_CLASS(wxLocaleModule); - public: - wxLocaleModule() {} - - bool OnInit() wxOVERRIDE - { - return true; - } - - void OnExit() wxOVERRIDE - { - wxLocale::DestroyLanguagesDB(); - } -}; - -wxIMPLEMENT_DYNAMIC_CLASS(wxLocaleModule, wxModule); - -#endif // wxUSE_INTL diff --git a/Externals/wxWidgets3/src/common/ipcbase.cpp b/Externals/wxWidgets3/src/common/ipcbase.cpp deleted file mode 100644 index 13c3f2e55c..0000000000 --- a/Externals/wxWidgets3/src/common/ipcbase.cpp +++ /dev/null @@ -1,130 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/ipcbase.cpp -// Purpose: IPC base classes -// Author: Julian Smart -// Modified by: -// Created: 04/01/98 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#ifndef WX_PRECOMP -#endif - -#include "wx/ipcbase.h" - -wxIMPLEMENT_ABSTRACT_CLASS(wxServerBase, wxObject) -wxIMPLEMENT_ABSTRACT_CLASS(wxClientBase, wxObject) -wxIMPLEMENT_ABSTRACT_CLASS(wxConnectionBase, wxObject) - -wxConnectionBase::wxConnectionBase(void *buffer, size_t bytes) - : m_buffer((char *)buffer), - m_buffersize(bytes), - m_deletebufferwhendone(false), - m_connected(true) -{ - if ( buffer == NULL ) - { // behave like next constructor - m_buffersize = 0; - m_deletebufferwhendone = true; - } -} - -wxConnectionBase::wxConnectionBase() - : m_buffer(NULL), - m_buffersize(0), - m_deletebufferwhendone(true), - m_connected(true) -{ -} - -wxConnectionBase::wxConnectionBase(const wxConnectionBase& copy) - : wxObject(), - m_buffer(copy.m_buffer), - m_buffersize(copy.m_buffersize), - m_deletebufferwhendone(false), - m_connected(copy.m_connected) - -{ - // copy constructor would require ref-counted pointer to buffer - wxFAIL_MSG( wxT("Copy constructor of wxConnectionBase not implemented") ); -} - - -wxConnectionBase::~wxConnectionBase() -{ - if ( m_deletebufferwhendone ) - delete [] m_buffer; -} - -/* static */ -wxString wxConnectionBase::GetTextFromData(const void* data, - size_t size, - wxIPCFormat fmt) -{ - wxString s; - switch ( fmt ) - { - case wxIPC_TEXT: - // normally the string should be NUL-terminated and size should - // include the total size of the buffer, including NUL -- but don't - // crash (by trying to access (size_t)-1 bytes) if it doesn't - if ( size ) - size--; - - s = wxString(static_cast(data), size); - break; - -#if wxUSE_UNICODE - // TODO: we should handle both wxIPC_UTF16TEXT and wxIPC_UTF32TEXT here - // for inter-platform IPC - case wxIPC_UNICODETEXT: - wxASSERT_MSG( !(size % sizeof(wchar_t)), "invalid buffer size" ); - if ( size ) - { - size /= sizeof(wchar_t); - size--; - } - - s = wxString(static_cast(data), size); - break; - - case wxIPC_UTF8TEXT: - if ( size ) - size--; - - s = wxString::FromUTF8(static_cast(data), size); - break; -#endif // wxUSE_UNICODE - - default: - wxFAIL_MSG( "non-string IPC format in GetTextFromData()" ); - } - - return s; -} - -void *wxConnectionBase::GetBufferAtLeast( size_t bytes ) -{ - if ( m_buffersize >= bytes ) - return m_buffer; - else - { // need to resize buffer - if ( m_deletebufferwhendone ) - { // we're in charge of buffer, increase it - delete [] m_buffer; - m_buffer = new char[bytes]; - m_buffersize = bytes; - return m_buffer; - } // user-supplied buffer, fail - else - return NULL; - } -} diff --git a/Externals/wxWidgets3/src/common/languageinfo.cpp b/Externals/wxWidgets3/src/common/languageinfo.cpp deleted file mode 100644 index 9929b0f656..0000000000 --- a/Externals/wxWidgets3/src/common/languageinfo.cpp +++ /dev/null @@ -1,801 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/languageinfo.cpp -// Purpose: wxLocale::InitLanguagesDB() -// Author: Vadim Zeitlin, Vaclav Slavik -// Created: 2010-04-23 -// Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declaration -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include "wx/intl.h" - -#if wxUSE_INTL - -#ifdef __WIN32__ - #include "wx/msw/private.h" -#endif - -// ---------------------------------------------------------------------------- -// default languages table & initialization -// ---------------------------------------------------------------------------- - - -// --- --- --- generated code begins here --- --- --- - -// This table is generated by misc/languages/genlang.py -// When making changes, please put them into misc/languages/langtabl.txt - -#if !defined(__WIN32__) - -#define SETWINLANG(info,lang,sublang) - -#else - -#define SETWINLANG(info,lang,sublang) \ - info.WinLang = lang, info.WinSublang = sublang; - -#ifndef LANG_AFRIKAANS -#define LANG_AFRIKAANS (0) -#endif -#ifndef LANG_ALBANIAN -#define LANG_ALBANIAN (0) -#endif -#ifndef LANG_ARABIC -#define LANG_ARABIC (0) -#endif -#ifndef LANG_ARMENIAN -#define LANG_ARMENIAN (0) -#endif -#ifndef LANG_ASSAMESE -#define LANG_ASSAMESE (0) -#endif -#ifndef LANG_AZERI -#define LANG_AZERI (0) -#endif -#ifndef LANG_BASQUE -#define LANG_BASQUE (0) -#endif -#ifndef LANG_BELARUSIAN -#define LANG_BELARUSIAN (0) -#endif -#ifndef LANG_BENGALI -#define LANG_BENGALI (0) -#endif -#ifndef LANG_BOSNIAN -#define LANG_BOSNIAN (0) -#endif -#ifndef LANG_BULGARIAN -#define LANG_BULGARIAN (0) -#endif -#ifndef LANG_CATALAN -#define LANG_CATALAN (0) -#endif -#ifndef LANG_CHINESE -#define LANG_CHINESE (0) -#endif -#ifndef LANG_CROATIAN -#define LANG_CROATIAN (0) -#endif -#ifndef LANG_CZECH -#define LANG_CZECH (0) -#endif -#ifndef LANG_DANISH -#define LANG_DANISH (0) -#endif -#ifndef LANG_DUTCH -#define LANG_DUTCH (0) -#endif -#ifndef LANG_ENGLISH -#define LANG_ENGLISH (0) -#endif -#ifndef LANG_ESTONIAN -#define LANG_ESTONIAN (0) -#endif -#ifndef LANG_FAEROESE -#define LANG_FAEROESE (0) -#endif -#ifndef LANG_FARSI -#define LANG_FARSI (0) -#endif -#ifndef LANG_FINNISH -#define LANG_FINNISH (0) -#endif -#ifndef LANG_FRENCH -#define LANG_FRENCH (0) -#endif -#ifndef LANG_FRISIAN -#define LANG_FRISIAN (0) -#endif -#ifndef LANG_GEORGIAN -#define LANG_GEORGIAN (0) -#endif -#ifndef LANG_GERMAN -#define LANG_GERMAN (0) -#endif -#ifndef LANG_GREEK -#define LANG_GREEK (0) -#endif -#ifndef LANG_GUJARATI -#define LANG_GUJARATI (0) -#endif -#ifndef LANG_HEBREW -#define LANG_HEBREW (0) -#endif -#ifndef LANG_HINDI -#define LANG_HINDI (0) -#endif -#ifndef LANG_HUNGARIAN -#define LANG_HUNGARIAN (0) -#endif -#ifndef LANG_ICELANDIC -#define LANG_ICELANDIC (0) -#endif -#ifndef LANG_INDONESIAN -#define LANG_INDONESIAN (0) -#endif -#ifndef LANG_ITALIAN -#define LANG_ITALIAN (0) -#endif -#ifndef LANG_JAPANESE -#define LANG_JAPANESE (0) -#endif -#ifndef LANG_KABYLE -#define LANG_KABYLE (0) -#endif -#ifndef LANG_KANNADA -#define LANG_KANNADA (0) -#endif -#ifndef LANG_KASHMIRI -#define LANG_KASHMIRI (0) -#endif -#ifndef LANG_KAZAK -#define LANG_KAZAK (0) -#endif -#ifndef LANG_KONKANI -#define LANG_KONKANI (0) -#endif -#ifndef LANG_KOREAN -#define LANG_KOREAN (0) -#endif -#ifndef LANG_LATVIAN -#define LANG_LATVIAN (0) -#endif -#ifndef LANG_LITHUANIAN -#define LANG_LITHUANIAN (0) -#endif -#ifndef LANG_MACEDONIAN -#define LANG_MACEDONIAN (0) -#endif -#ifndef LANG_MALAY -#define LANG_MALAY (0) -#endif -#ifndef LANG_MALAYALAM -#define LANG_MALAYALAM (0) -#endif -#ifndef LANG_MANIPURI -#define LANG_MANIPURI (0) -#endif -#ifndef LANG_MARATHI -#define LANG_MARATHI (0) -#endif -#ifndef LANG_NEPALI -#define LANG_NEPALI (0) -#endif -#ifndef LANG_NORWEGIAN -#define LANG_NORWEGIAN (0) -#endif -#ifndef LANG_ORIYA -#define LANG_ORIYA (0) -#endif -#ifndef LANG_POLISH -#define LANG_POLISH (0) -#endif -#ifndef LANG_PORTUGUESE -#define LANG_PORTUGUESE (0) -#endif -#ifndef LANG_PUNJABI -#define LANG_PUNJABI (0) -#endif -#ifndef LANG_ROMANIAN -#define LANG_ROMANIAN (0) -#endif -#ifndef LANG_RUSSIAN -#define LANG_RUSSIAN (0) -#endif -#ifndef LANG_SAMI -#define LANG_SAMI (0) -#endif -#ifndef LANG_SANSKRIT -#define LANG_SANSKRIT (0) -#endif -#ifndef LANG_SERBIAN -#define LANG_SERBIAN (0) -#endif -#ifndef LANG_SINDHI -#define LANG_SINDHI (0) -#endif -#ifndef LANG_SLOVAK -#define LANG_SLOVAK (0) -#endif -#ifndef LANG_SLOVENIAN -#define LANG_SLOVENIAN (0) -#endif -#ifndef LANG_SPANISH -#define LANG_SPANISH (0) -#endif -#ifndef LANG_SWAHILI -#define LANG_SWAHILI (0) -#endif -#ifndef LANG_SWEDISH -#define LANG_SWEDISH (0) -#endif -#ifndef LANG_TAMIL -#define LANG_TAMIL (0) -#endif -#ifndef LANG_TATAR -#define LANG_TATAR (0) -#endif -#ifndef LANG_TELUGU -#define LANG_TELUGU (0) -#endif -#ifndef LANG_THAI -#define LANG_THAI (0) -#endif -#ifndef LANG_TURKISH -#define LANG_TURKISH (0) -#endif -#ifndef LANG_UKRAINIAN -#define LANG_UKRAINIAN (0) -#endif -#ifndef LANG_URDU -#define LANG_URDU (0) -#endif -#ifndef LANG_UZBEK -#define LANG_UZBEK (0) -#endif -#ifndef LANG_VIETNAMESE -#define LANG_VIETNAMESE (0) -#endif -#ifndef SUBLANG_ARABIC_ALGERIA -#define SUBLANG_ARABIC_ALGERIA SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_ARABIC_BAHRAIN -#define SUBLANG_ARABIC_BAHRAIN SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_ARABIC_EGYPT -#define SUBLANG_ARABIC_EGYPT SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_ARABIC_IRAQ -#define SUBLANG_ARABIC_IRAQ SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_ARABIC_JORDAN -#define SUBLANG_ARABIC_JORDAN SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_ARABIC_KUWAIT -#define SUBLANG_ARABIC_KUWAIT SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_ARABIC_LEBANON -#define SUBLANG_ARABIC_LEBANON SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_ARABIC_LIBYA -#define SUBLANG_ARABIC_LIBYA SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_ARABIC_MOROCCO -#define SUBLANG_ARABIC_MOROCCO SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_ARABIC_OMAN -#define SUBLANG_ARABIC_OMAN SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_ARABIC_QATAR -#define SUBLANG_ARABIC_QATAR SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_ARABIC_SAUDI_ARABIA -#define SUBLANG_ARABIC_SAUDI_ARABIA SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_ARABIC_SYRIA -#define SUBLANG_ARABIC_SYRIA SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_ARABIC_TUNISIA -#define SUBLANG_ARABIC_TUNISIA SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_ARABIC_UAE -#define SUBLANG_ARABIC_UAE SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_ARABIC_YEMEN -#define SUBLANG_ARABIC_YEMEN SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_AZERI_CYRILLIC -#define SUBLANG_AZERI_CYRILLIC SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_AZERI_LATIN -#define SUBLANG_AZERI_LATIN SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_BOSNIAN_BOSNIA_HERZEGOVINA_LATIN -#define SUBLANG_BOSNIAN_BOSNIA_HERZEGOVINA_LATIN SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_CHINESE_SIMPLIFIED -#define SUBLANG_CHINESE_SIMPLIFIED SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_CHINESE_TRADITIONAL -#define SUBLANG_CHINESE_TRADITIONAL SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_CHINESE_HONGKONG -#define SUBLANG_CHINESE_HONGKONG SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_CHINESE_MACAU -#define SUBLANG_CHINESE_MACAU SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_CHINESE_SINGAPORE -#define SUBLANG_CHINESE_SINGAPORE SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_DUTCH -#define SUBLANG_DUTCH SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_DUTCH_BELGIAN -#define SUBLANG_DUTCH_BELGIAN SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_ENGLISH_UK -#define SUBLANG_ENGLISH_UK SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_ENGLISH_US -#define SUBLANG_ENGLISH_US SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_ENGLISH_AUS -#define SUBLANG_ENGLISH_AUS SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_ENGLISH_BELIZE -#define SUBLANG_ENGLISH_BELIZE SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_ENGLISH_CAN -#define SUBLANG_ENGLISH_CAN SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_ENGLISH_CARIBBEAN -#define SUBLANG_ENGLISH_CARIBBEAN SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_ENGLISH_EIRE -#define SUBLANG_ENGLISH_EIRE SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_ENGLISH_JAMAICA -#define SUBLANG_ENGLISH_JAMAICA SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_ENGLISH_NZ -#define SUBLANG_ENGLISH_NZ SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_ENGLISH_PHILIPPINES -#define SUBLANG_ENGLISH_PHILIPPINES SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_ENGLISH_SOUTH_AFRICA -#define SUBLANG_ENGLISH_SOUTH_AFRICA SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_ENGLISH_TRINIDAD -#define SUBLANG_ENGLISH_TRINIDAD SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_ENGLISH_ZIMBABWE -#define SUBLANG_ENGLISH_ZIMBABWE SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_FRENCH -#define SUBLANG_FRENCH SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_FRENCH_BELGIAN -#define SUBLANG_FRENCH_BELGIAN SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_FRENCH_CANADIAN -#define SUBLANG_FRENCH_CANADIAN SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_FRENCH_LUXEMBOURG -#define SUBLANG_FRENCH_LUXEMBOURG SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_FRENCH_MONACO -#define SUBLANG_FRENCH_MONACO SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_FRENCH_SWISS -#define SUBLANG_FRENCH_SWISS SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_GERMAN -#define SUBLANG_GERMAN SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_GERMAN_AUSTRIAN -#define SUBLANG_GERMAN_AUSTRIAN SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_GERMAN_LIECHTENSTEIN -#define SUBLANG_GERMAN_LIECHTENSTEIN SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_GERMAN_LUXEMBOURG -#define SUBLANG_GERMAN_LUXEMBOURG SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_GERMAN_SWISS -#define SUBLANG_GERMAN_SWISS SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_ITALIAN -#define SUBLANG_ITALIAN SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_ITALIAN_SWISS -#define SUBLANG_ITALIAN_SWISS SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_KASHMIRI_INDIA -#define SUBLANG_KASHMIRI_INDIA SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_KOREAN -#define SUBLANG_KOREAN SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_LITHUANIAN -#define SUBLANG_LITHUANIAN SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_MALAY_BRUNEI_DARUSSALAM -#define SUBLANG_MALAY_BRUNEI_DARUSSALAM SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_MALAY_MALAYSIA -#define SUBLANG_MALAY_MALAYSIA SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_NEPALI_INDIA -#define SUBLANG_NEPALI_INDIA SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_NORWEGIAN_BOKMAL -#define SUBLANG_NORWEGIAN_BOKMAL SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_NORWEGIAN_NYNORSK -#define SUBLANG_NORWEGIAN_NYNORSK SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_PORTUGUESE -#define SUBLANG_PORTUGUESE SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_PORTUGUESE_BRAZILIAN -#define SUBLANG_PORTUGUESE_BRAZILIAN SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_SERBIAN_CYRILLIC -#define SUBLANG_SERBIAN_CYRILLIC SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_SERBIAN_LATIN -#define SUBLANG_SERBIAN_LATIN SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_SPANISH -#define SUBLANG_SPANISH SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_SPANISH_ARGENTINA -#define SUBLANG_SPANISH_ARGENTINA SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_SPANISH_BOLIVIA -#define SUBLANG_SPANISH_BOLIVIA SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_SPANISH_CHILE -#define SUBLANG_SPANISH_CHILE SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_SPANISH_COLOMBIA -#define SUBLANG_SPANISH_COLOMBIA SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_SPANISH_COSTA_RICA -#define SUBLANG_SPANISH_COSTA_RICA SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_SPANISH_DOMINICAN_REPUBLIC -#define SUBLANG_SPANISH_DOMINICAN_REPUBLIC SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_SPANISH_ECUADOR -#define SUBLANG_SPANISH_ECUADOR SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_SPANISH_EL_SALVADOR -#define SUBLANG_SPANISH_EL_SALVADOR SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_SPANISH_GUATEMALA -#define SUBLANG_SPANISH_GUATEMALA SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_SPANISH_HONDURAS -#define SUBLANG_SPANISH_HONDURAS SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_SPANISH_MEXICAN -#define SUBLANG_SPANISH_MEXICAN SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_SPANISH_MODERN -#define SUBLANG_SPANISH_MODERN SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_SPANISH_NICARAGUA -#define SUBLANG_SPANISH_NICARAGUA SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_SPANISH_PANAMA -#define SUBLANG_SPANISH_PANAMA SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_SPANISH_PARAGUAY -#define SUBLANG_SPANISH_PARAGUAY SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_SPANISH_PERU -#define SUBLANG_SPANISH_PERU SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_SPANISH_PUERTO_RICO -#define SUBLANG_SPANISH_PUERTO_RICO SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_SPANISH_URUGUAY -#define SUBLANG_SPANISH_URUGUAY SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_SPANISH_VENEZUELA -#define SUBLANG_SPANISH_VENEZUELA SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_SWEDISH -#define SUBLANG_SWEDISH SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_SWEDISH_FINLAND -#define SUBLANG_SWEDISH_FINLAND SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_URDU_INDIA -#define SUBLANG_URDU_INDIA SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_URDU_PAKISTAN -#define SUBLANG_URDU_PAKISTAN SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_UZBEK_CYRILLIC -#define SUBLANG_UZBEK_CYRILLIC SUBLANG_DEFAULT -#endif -#ifndef SUBLANG_UZBEK_LATIN -#define SUBLANG_UZBEK_LATIN SUBLANG_DEFAULT -#endif - - -#endif // __WIN32__ - -#define LNG(wxlang, canonical, winlang, winsublang, layout, desc) \ - info.Language = wxlang; \ - info.CanonicalName = wxT(canonical); \ - info.LayoutDirection = layout; \ - info.Description = wxT(desc); \ - SETWINLANG(info, winlang, winsublang) \ - AddLanguage(info); - -void wxLocale::InitLanguagesDB() -{ - wxLanguageInfo info; - - LNG(wxLANGUAGE_ABKHAZIAN, "ab" , 0 , 0 , wxLayout_LeftToRight, "Abkhazian") - LNG(wxLANGUAGE_AFAR, "aa" , 0 , 0 , wxLayout_LeftToRight, "Afar") - LNG(wxLANGUAGE_AFRIKAANS, "af_ZA", LANG_AFRIKAANS , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Afrikaans") - LNG(wxLANGUAGE_ALBANIAN, "sq_AL", LANG_ALBANIAN , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Albanian") - LNG(wxLANGUAGE_AMHARIC, "am" , 0 , 0 , wxLayout_LeftToRight, "Amharic") - LNG(wxLANGUAGE_ARABIC, "ar" , LANG_ARABIC , SUBLANG_DEFAULT , wxLayout_RightToLeft, "Arabic") - LNG(wxLANGUAGE_ARABIC_ALGERIA, "ar_DZ", LANG_ARABIC , SUBLANG_ARABIC_ALGERIA , wxLayout_RightToLeft, "Arabic (Algeria)") - LNG(wxLANGUAGE_ARABIC_BAHRAIN, "ar_BH", LANG_ARABIC , SUBLANG_ARABIC_BAHRAIN , wxLayout_RightToLeft, "Arabic (Bahrain)") - LNG(wxLANGUAGE_ARABIC_EGYPT, "ar_EG", LANG_ARABIC , SUBLANG_ARABIC_EGYPT , wxLayout_RightToLeft, "Arabic (Egypt)") - LNG(wxLANGUAGE_ARABIC_IRAQ, "ar_IQ", LANG_ARABIC , SUBLANG_ARABIC_IRAQ , wxLayout_RightToLeft, "Arabic (Iraq)") - LNG(wxLANGUAGE_ARABIC_JORDAN, "ar_JO", LANG_ARABIC , SUBLANG_ARABIC_JORDAN , wxLayout_RightToLeft, "Arabic (Jordan)") - LNG(wxLANGUAGE_ARABIC_KUWAIT, "ar_KW", LANG_ARABIC , SUBLANG_ARABIC_KUWAIT , wxLayout_RightToLeft, "Arabic (Kuwait)") - LNG(wxLANGUAGE_ARABIC_LEBANON, "ar_LB", LANG_ARABIC , SUBLANG_ARABIC_LEBANON , wxLayout_RightToLeft, "Arabic (Lebanon)") - LNG(wxLANGUAGE_ARABIC_LIBYA, "ar_LY", LANG_ARABIC , SUBLANG_ARABIC_LIBYA , wxLayout_RightToLeft, "Arabic (Libya)") - LNG(wxLANGUAGE_ARABIC_MOROCCO, "ar_MA", LANG_ARABIC , SUBLANG_ARABIC_MOROCCO , wxLayout_RightToLeft, "Arabic (Morocco)") - LNG(wxLANGUAGE_ARABIC_OMAN, "ar_OM", LANG_ARABIC , SUBLANG_ARABIC_OMAN , wxLayout_RightToLeft, "Arabic (Oman)") - LNG(wxLANGUAGE_ARABIC_QATAR, "ar_QA", LANG_ARABIC , SUBLANG_ARABIC_QATAR , wxLayout_RightToLeft, "Arabic (Qatar)") - LNG(wxLANGUAGE_ARABIC_SAUDI_ARABIA, "ar_SA", LANG_ARABIC , SUBLANG_ARABIC_SAUDI_ARABIA , wxLayout_RightToLeft, "Arabic (Saudi Arabia)") - LNG(wxLANGUAGE_ARABIC_SUDAN, "ar_SD", 0 , 0 , wxLayout_RightToLeft, "Arabic (Sudan)") - LNG(wxLANGUAGE_ARABIC_SYRIA, "ar_SY", LANG_ARABIC , SUBLANG_ARABIC_SYRIA , wxLayout_RightToLeft, "Arabic (Syria)") - LNG(wxLANGUAGE_ARABIC_TUNISIA, "ar_TN", LANG_ARABIC , SUBLANG_ARABIC_TUNISIA , wxLayout_RightToLeft, "Arabic (Tunisia)") - LNG(wxLANGUAGE_ARABIC_UAE, "ar_AE", LANG_ARABIC , SUBLANG_ARABIC_UAE , wxLayout_RightToLeft, "Arabic (Uae)") - LNG(wxLANGUAGE_ARABIC_YEMEN, "ar_YE", LANG_ARABIC , SUBLANG_ARABIC_YEMEN , wxLayout_RightToLeft, "Arabic (Yemen)") - LNG(wxLANGUAGE_ARMENIAN, "hy" , LANG_ARMENIAN , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Armenian") - LNG(wxLANGUAGE_ASSAMESE, "as" , LANG_ASSAMESE , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Assamese") - LNG(wxLANGUAGE_ASTURIAN, "ast" , 0 , 0 , wxLayout_LeftToRight, "Asturian") - LNG(wxLANGUAGE_AYMARA, "ay" , 0 , 0 , wxLayout_LeftToRight, "Aymara") - LNG(wxLANGUAGE_AZERI, "az" , LANG_AZERI , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Azeri") - LNG(wxLANGUAGE_AZERI_CYRILLIC, "az" , LANG_AZERI , SUBLANG_AZERI_CYRILLIC , wxLayout_LeftToRight, "Azeri (Cyrillic)") - LNG(wxLANGUAGE_AZERI_LATIN, "az" , LANG_AZERI , SUBLANG_AZERI_LATIN , wxLayout_LeftToRight, "Azeri (Latin)") - LNG(wxLANGUAGE_BASHKIR, "ba" , 0 , 0 , wxLayout_LeftToRight, "Bashkir") - LNG(wxLANGUAGE_BASQUE, "eu_ES", LANG_BASQUE , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Basque") - LNG(wxLANGUAGE_BELARUSIAN, "be_BY", LANG_BELARUSIAN, SUBLANG_DEFAULT , wxLayout_LeftToRight, "Belarusian") - LNG(wxLANGUAGE_BENGALI, "bn" , LANG_BENGALI , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Bengali") - LNG(wxLANGUAGE_BHUTANI, "dz" , 0 , 0 , wxLayout_LeftToRight, "Bhutani") - LNG(wxLANGUAGE_BIHARI, "bh" , 0 , 0 , wxLayout_LeftToRight, "Bihari") - LNG(wxLANGUAGE_BISLAMA, "bi" , 0 , 0 , wxLayout_LeftToRight, "Bislama") - LNG(wxLANGUAGE_BOSNIAN, "bs" , LANG_BOSNIAN , SUBLANG_BOSNIAN_BOSNIA_HERZEGOVINA_LATIN, wxLayout_LeftToRight, "Bosnian") - LNG(wxLANGUAGE_BRETON, "br" , 0 , 0 , wxLayout_LeftToRight, "Breton") - LNG(wxLANGUAGE_BULGARIAN, "bg_BG", LANG_BULGARIAN , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Bulgarian") - LNG(wxLANGUAGE_BURMESE, "my" , 0 , 0 , wxLayout_LeftToRight, "Burmese") - LNG(wxLANGUAGE_CATALAN, "ca_ES", LANG_CATALAN , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Catalan") - LNG(wxLANGUAGE_CHINESE, "zh_TW", LANG_CHINESE , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Chinese") - LNG(wxLANGUAGE_CHINESE_SIMPLIFIED, "zh_CN", LANG_CHINESE , SUBLANG_CHINESE_SIMPLIFIED , wxLayout_LeftToRight, "Chinese (Simplified)") - LNG(wxLANGUAGE_CHINESE_TRADITIONAL, "zh_TW", LANG_CHINESE , SUBLANG_CHINESE_TRADITIONAL , wxLayout_LeftToRight, "Chinese (Traditional)") - LNG(wxLANGUAGE_CHINESE_HONGKONG, "zh_HK", LANG_CHINESE , SUBLANG_CHINESE_HONGKONG , wxLayout_LeftToRight, "Chinese (Hongkong)") - LNG(wxLANGUAGE_CHINESE_MACAU, "zh_MO", LANG_CHINESE , SUBLANG_CHINESE_MACAU , wxLayout_LeftToRight, "Chinese (Macau)") - LNG(wxLANGUAGE_CHINESE_SINGAPORE, "zh_SG", LANG_CHINESE , SUBLANG_CHINESE_SINGAPORE , wxLayout_LeftToRight, "Chinese (Singapore)") - LNG(wxLANGUAGE_CHINESE_TAIWAN, "zh_TW", LANG_CHINESE , SUBLANG_CHINESE_TRADITIONAL , wxLayout_LeftToRight, "Chinese (Taiwan)") - LNG(wxLANGUAGE_CORSICAN, "co" , 0 , 0 , wxLayout_LeftToRight, "Corsican") - LNG(wxLANGUAGE_CROATIAN, "hr_HR", LANG_CROATIAN , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Croatian") - LNG(wxLANGUAGE_CZECH, "cs_CZ", LANG_CZECH , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Czech") - LNG(wxLANGUAGE_DANISH, "da_DK", LANG_DANISH , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Danish") - LNG(wxLANGUAGE_DUTCH, "nl_NL", LANG_DUTCH , SUBLANG_DUTCH , wxLayout_LeftToRight, "Dutch") - LNG(wxLANGUAGE_DUTCH_BELGIAN, "nl_BE", LANG_DUTCH , SUBLANG_DUTCH_BELGIAN , wxLayout_LeftToRight, "Dutch (Belgian)") - LNG(wxLANGUAGE_ENGLISH, "en_GB", LANG_ENGLISH , SUBLANG_ENGLISH_UK , wxLayout_LeftToRight, "English") - LNG(wxLANGUAGE_ENGLISH_UK, "en_GB", LANG_ENGLISH , SUBLANG_ENGLISH_UK , wxLayout_LeftToRight, "English (U.K.)") - LNG(wxLANGUAGE_ENGLISH_US, "en_US", LANG_ENGLISH , SUBLANG_ENGLISH_US , wxLayout_LeftToRight, "English (U.S.)") - LNG(wxLANGUAGE_ENGLISH_AUSTRALIA, "en_AU", LANG_ENGLISH , SUBLANG_ENGLISH_AUS , wxLayout_LeftToRight, "English (Australia)") - LNG(wxLANGUAGE_ENGLISH_BELIZE, "en_BZ", LANG_ENGLISH , SUBLANG_ENGLISH_BELIZE , wxLayout_LeftToRight, "English (Belize)") - LNG(wxLANGUAGE_ENGLISH_BOTSWANA, "en_BW", 0 , 0 , wxLayout_LeftToRight, "English (Botswana)") - LNG(wxLANGUAGE_ENGLISH_CANADA, "en_CA", LANG_ENGLISH , SUBLANG_ENGLISH_CAN , wxLayout_LeftToRight, "English (Canada)") - LNG(wxLANGUAGE_ENGLISH_CARIBBEAN, "en_CB", LANG_ENGLISH , SUBLANG_ENGLISH_CARIBBEAN , wxLayout_LeftToRight, "English (Caribbean)") - LNG(wxLANGUAGE_ENGLISH_DENMARK, "en_DK", 0 , 0 , wxLayout_LeftToRight, "English (Denmark)") - LNG(wxLANGUAGE_ENGLISH_EIRE, "en_IE", LANG_ENGLISH , SUBLANG_ENGLISH_EIRE , wxLayout_LeftToRight, "English (Eire)") - LNG(wxLANGUAGE_ENGLISH_JAMAICA, "en_JM", LANG_ENGLISH , SUBLANG_ENGLISH_JAMAICA , wxLayout_LeftToRight, "English (Jamaica)") - LNG(wxLANGUAGE_ENGLISH_NEW_ZEALAND, "en_NZ", LANG_ENGLISH , SUBLANG_ENGLISH_NZ , wxLayout_LeftToRight, "English (New Zealand)") - LNG(wxLANGUAGE_ENGLISH_PHILIPPINES, "en_PH", LANG_ENGLISH , SUBLANG_ENGLISH_PHILIPPINES , wxLayout_LeftToRight, "English (Philippines)") - LNG(wxLANGUAGE_ENGLISH_SOUTH_AFRICA, "en_ZA", LANG_ENGLISH , SUBLANG_ENGLISH_SOUTH_AFRICA , wxLayout_LeftToRight, "English (South Africa)") - LNG(wxLANGUAGE_ENGLISH_TRINIDAD, "en_TT", LANG_ENGLISH , SUBLANG_ENGLISH_TRINIDAD , wxLayout_LeftToRight, "English (Trinidad)") - LNG(wxLANGUAGE_ENGLISH_ZIMBABWE, "en_ZW", LANG_ENGLISH , SUBLANG_ENGLISH_ZIMBABWE , wxLayout_LeftToRight, "English (Zimbabwe)") - LNG(wxLANGUAGE_ESPERANTO, "eo" , 0 , 0 , wxLayout_LeftToRight, "Esperanto") - LNG(wxLANGUAGE_ESTONIAN, "et_EE", LANG_ESTONIAN , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Estonian") - LNG(wxLANGUAGE_FAEROESE, "fo_FO", LANG_FAEROESE , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Faeroese") - LNG(wxLANGUAGE_FARSI, "fa_IR", LANG_FARSI , SUBLANG_DEFAULT , wxLayout_RightToLeft, "Farsi") - LNG(wxLANGUAGE_FIJI, "fj" , 0 , 0 , wxLayout_LeftToRight, "Fiji") - LNG(wxLANGUAGE_FINNISH, "fi_FI", LANG_FINNISH , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Finnish") - LNG(wxLANGUAGE_FRENCH, "fr_FR", LANG_FRENCH , SUBLANG_FRENCH , wxLayout_LeftToRight, "French") - LNG(wxLANGUAGE_FRENCH_BELGIAN, "fr_BE", LANG_FRENCH , SUBLANG_FRENCH_BELGIAN , wxLayout_LeftToRight, "French (Belgian)") - LNG(wxLANGUAGE_FRENCH_CANADIAN, "fr_CA", LANG_FRENCH , SUBLANG_FRENCH_CANADIAN , wxLayout_LeftToRight, "French (Canadian)") - LNG(wxLANGUAGE_FRENCH_LUXEMBOURG, "fr_LU", LANG_FRENCH , SUBLANG_FRENCH_LUXEMBOURG , wxLayout_LeftToRight, "French (Luxembourg)") - LNG(wxLANGUAGE_FRENCH_MONACO, "fr_MC", LANG_FRENCH , SUBLANG_FRENCH_MONACO , wxLayout_LeftToRight, "French (Monaco)") - LNG(wxLANGUAGE_FRENCH_SWISS, "fr_CH", LANG_FRENCH , SUBLANG_FRENCH_SWISS , wxLayout_LeftToRight, "French (Swiss)") - LNG(wxLANGUAGE_FRISIAN, "fy" , LANG_FRISIAN , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Frisian") - LNG(wxLANGUAGE_GALICIAN, "gl_ES", 0 , 0 , wxLayout_LeftToRight, "Galician") - LNG(wxLANGUAGE_GEORGIAN, "ka_GE", LANG_GEORGIAN , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Georgian") - LNG(wxLANGUAGE_GERMAN, "de_DE", LANG_GERMAN , SUBLANG_GERMAN , wxLayout_LeftToRight, "German") - LNG(wxLANGUAGE_GERMAN_AUSTRIAN, "de_AT", LANG_GERMAN , SUBLANG_GERMAN_AUSTRIAN , wxLayout_LeftToRight, "German (Austrian)") - LNG(wxLANGUAGE_GERMAN_BELGIUM, "de_BE", 0 , 0 , wxLayout_LeftToRight, "German (Belgium)") - LNG(wxLANGUAGE_GERMAN_LIECHTENSTEIN, "de_LI", LANG_GERMAN , SUBLANG_GERMAN_LIECHTENSTEIN , wxLayout_LeftToRight, "German (Liechtenstein)") - LNG(wxLANGUAGE_GERMAN_LUXEMBOURG, "de_LU", LANG_GERMAN , SUBLANG_GERMAN_LUXEMBOURG , wxLayout_LeftToRight, "German (Luxembourg)") - LNG(wxLANGUAGE_GERMAN_SWISS, "de_CH", LANG_GERMAN , SUBLANG_GERMAN_SWISS , wxLayout_LeftToRight, "German (Swiss)") - LNG(wxLANGUAGE_GREEK, "el_GR", LANG_GREEK , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Greek") - LNG(wxLANGUAGE_GREENLANDIC, "kl_GL", 0 , 0 , wxLayout_LeftToRight, "Greenlandic") - LNG(wxLANGUAGE_GUARANI, "gn" , 0 , 0 , wxLayout_LeftToRight, "Guarani") - LNG(wxLANGUAGE_GUJARATI, "gu" , LANG_GUJARATI , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Gujarati") - LNG(wxLANGUAGE_HAUSA, "ha" , 0 , 0 , wxLayout_LeftToRight, "Hausa") - LNG(wxLANGUAGE_HEBREW, "he_IL", LANG_HEBREW , SUBLANG_DEFAULT , wxLayout_RightToLeft, "Hebrew") - LNG(wxLANGUAGE_HINDI, "hi_IN", LANG_HINDI , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Hindi") - LNG(wxLANGUAGE_HUNGARIAN, "hu_HU", LANG_HUNGARIAN , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Hungarian") - LNG(wxLANGUAGE_ICELANDIC, "is_IS", LANG_ICELANDIC , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Icelandic") - LNG(wxLANGUAGE_INDONESIAN, "id_ID", LANG_INDONESIAN, SUBLANG_DEFAULT , wxLayout_LeftToRight, "Indonesian") - LNG(wxLANGUAGE_INTERLINGUA, "ia" , 0 , 0 , wxLayout_LeftToRight, "Interlingua") - LNG(wxLANGUAGE_INTERLINGUE, "ie" , 0 , 0 , wxLayout_LeftToRight, "Interlingue") - LNG(wxLANGUAGE_INUKTITUT, "iu" , 0 , 0 , wxLayout_LeftToRight, "Inuktitut") - LNG(wxLANGUAGE_INUPIAK, "ik" , 0 , 0 , wxLayout_LeftToRight, "Inupiak") - LNG(wxLANGUAGE_IRISH, "ga_IE", 0 , 0 , wxLayout_LeftToRight, "Irish") - LNG(wxLANGUAGE_ITALIAN, "it_IT", LANG_ITALIAN , SUBLANG_ITALIAN , wxLayout_LeftToRight, "Italian") - LNG(wxLANGUAGE_ITALIAN_SWISS, "it_CH", LANG_ITALIAN , SUBLANG_ITALIAN_SWISS , wxLayout_LeftToRight, "Italian (Swiss)") - LNG(wxLANGUAGE_JAPANESE, "ja_JP", LANG_JAPANESE , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Japanese") - LNG(wxLANGUAGE_JAVANESE, "jv" , 0 , 0 , wxLayout_LeftToRight, "Javanese") - LNG(wxLANGUAGE_KABYLE, "kab" , LANG_KABYLE , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Kabyle") - LNG(wxLANGUAGE_KANNADA, "kn" , LANG_KANNADA , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Kannada") - LNG(wxLANGUAGE_KASHMIRI, "ks" , LANG_KASHMIRI , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Kashmiri") - LNG(wxLANGUAGE_KASHMIRI_INDIA, "ks_IN", LANG_KASHMIRI , SUBLANG_KASHMIRI_INDIA , wxLayout_LeftToRight, "Kashmiri (India)") - LNG(wxLANGUAGE_KAZAKH, "kk" , LANG_KAZAK , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Kazakh") - LNG(wxLANGUAGE_KERNEWEK, "kw_GB", 0 , 0 , wxLayout_LeftToRight, "Kernewek") - LNG(wxLANGUAGE_KHMER, "km" , 0 , 0 , wxLayout_LeftToRight, "Khmer") - LNG(wxLANGUAGE_KINYARWANDA, "rw" , 0 , 0 , wxLayout_LeftToRight, "Kinyarwanda") - LNG(wxLANGUAGE_KIRGHIZ, "ky" , 0 , 0 , wxLayout_LeftToRight, "Kirghiz") - LNG(wxLANGUAGE_KIRUNDI, "rn" , 0 , 0 , wxLayout_LeftToRight, "Kirundi") - LNG(wxLANGUAGE_KONKANI, "" , LANG_KONKANI , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Konkani") - LNG(wxLANGUAGE_KOREAN, "ko_KR", LANG_KOREAN , SUBLANG_KOREAN , wxLayout_LeftToRight, "Korean") - LNG(wxLANGUAGE_KURDISH, "ku_TR", 0 , 0 , wxLayout_LeftToRight, "Kurdish") - LNG(wxLANGUAGE_LAOTHIAN, "lo" , 0 , 0 , wxLayout_LeftToRight, "Laothian") - LNG(wxLANGUAGE_LATIN, "la" , 0 , 0 , wxLayout_LeftToRight, "Latin") - LNG(wxLANGUAGE_LATVIAN, "lv_LV", LANG_LATVIAN , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Latvian") - LNG(wxLANGUAGE_LINGALA, "ln" , 0 , 0 , wxLayout_LeftToRight, "Lingala") - LNG(wxLANGUAGE_LITHUANIAN, "lt_LT", LANG_LITHUANIAN, SUBLANG_LITHUANIAN , wxLayout_LeftToRight, "Lithuanian") - LNG(wxLANGUAGE_MACEDONIAN, "mk_MK", LANG_MACEDONIAN, SUBLANG_DEFAULT , wxLayout_LeftToRight, "Macedonian") - LNG(wxLANGUAGE_MALAGASY, "mg" , 0 , 0 , wxLayout_LeftToRight, "Malagasy") - LNG(wxLANGUAGE_MALAY, "ms_MY", LANG_MALAY , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Malay") - LNG(wxLANGUAGE_MALAYALAM, "ml" , LANG_MALAYALAM , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Malayalam") - LNG(wxLANGUAGE_MALAY_BRUNEI_DARUSSALAM, "ms_BN", LANG_MALAY , SUBLANG_MALAY_BRUNEI_DARUSSALAM , wxLayout_LeftToRight, "Malay (Brunei Darussalam)") - LNG(wxLANGUAGE_MALAY_MALAYSIA, "ms_MY", LANG_MALAY , SUBLANG_MALAY_MALAYSIA , wxLayout_LeftToRight, "Malay (Malaysia)") - LNG(wxLANGUAGE_MALTESE, "mt_MT", 0 , 0 , wxLayout_LeftToRight, "Maltese") - LNG(wxLANGUAGE_MANIPURI, "" , LANG_MANIPURI , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Manipuri") - LNG(wxLANGUAGE_MAORI, "mi" , 0 , 0 , wxLayout_LeftToRight, "Maori") - LNG(wxLANGUAGE_MARATHI, "mr_IN", LANG_MARATHI , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Marathi") - LNG(wxLANGUAGE_MOLDAVIAN, "mo" , 0 , 0 , wxLayout_LeftToRight, "Moldavian") - LNG(wxLANGUAGE_MONGOLIAN, "mn" , 0 , 0 , wxLayout_LeftToRight, "Mongolian") - LNG(wxLANGUAGE_NAURU, "na" , 0 , 0 , wxLayout_LeftToRight, "Nauru") - LNG(wxLANGUAGE_NEPALI, "ne_NP", LANG_NEPALI , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Nepali") - LNG(wxLANGUAGE_NEPALI_INDIA, "ne_IN", LANG_NEPALI , SUBLANG_NEPALI_INDIA , wxLayout_LeftToRight, "Nepali (India)") - LNG(wxLANGUAGE_NORWEGIAN_BOKMAL, "nb_NO", LANG_NORWEGIAN , SUBLANG_NORWEGIAN_BOKMAL , wxLayout_LeftToRight, "Norwegian (Bokmal)") - LNG(wxLANGUAGE_NORWEGIAN_NYNORSK, "nn_NO", LANG_NORWEGIAN , SUBLANG_NORWEGIAN_NYNORSK , wxLayout_LeftToRight, "Norwegian (Nynorsk)") - LNG(wxLANGUAGE_OCCITAN, "oc" , 0 , 0 , wxLayout_LeftToRight, "Occitan") - LNG(wxLANGUAGE_ORIYA, "or" , LANG_ORIYA , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Oriya") - LNG(wxLANGUAGE_OROMO, "om" , 0 , 0 , wxLayout_LeftToRight, "(Afan) Oromo") - LNG(wxLANGUAGE_PASHTO, "ps" , 0 , 0 , wxLayout_LeftToRight, "Pashto, Pushto") - LNG(wxLANGUAGE_POLISH, "pl_PL", LANG_POLISH , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Polish") - LNG(wxLANGUAGE_PORTUGUESE, "pt_PT", LANG_PORTUGUESE, SUBLANG_PORTUGUESE , wxLayout_LeftToRight, "Portuguese") - LNG(wxLANGUAGE_PORTUGUESE_BRAZILIAN, "pt_BR", LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN , wxLayout_LeftToRight, "Portuguese (Brazilian)") - LNG(wxLANGUAGE_PUNJABI, "pa" , LANG_PUNJABI , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Punjabi") - LNG(wxLANGUAGE_QUECHUA, "qu" , 0 , 0 , wxLayout_LeftToRight, "Quechua") - LNG(wxLANGUAGE_RHAETO_ROMANCE, "rm" , 0 , 0 , wxLayout_LeftToRight, "Rhaeto-Romance") - LNG(wxLANGUAGE_ROMANIAN, "ro_RO", LANG_ROMANIAN , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Romanian") - LNG(wxLANGUAGE_RUSSIAN, "ru_RU", LANG_RUSSIAN , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Russian") - LNG(wxLANGUAGE_RUSSIAN_UKRAINE, "ru_UA", 0 , 0 , wxLayout_LeftToRight, "Russian (Ukraine)") - LNG(wxLANGUAGE_SAMI, "se_NO", LANG_SAMI , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Northern Sami") - LNG(wxLANGUAGE_SAMOAN, "sm" , 0 , 0 , wxLayout_LeftToRight, "Samoan") - LNG(wxLANGUAGE_SANGHO, "sg" , 0 , 0 , wxLayout_LeftToRight, "Sangho") - LNG(wxLANGUAGE_SANSKRIT, "sa" , LANG_SANSKRIT , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Sanskrit") - LNG(wxLANGUAGE_SCOTS_GAELIC, "gd" , 0 , 0 , wxLayout_LeftToRight, "Scots Gaelic") - LNG(wxLANGUAGE_SERBIAN, "sr_RS", LANG_SERBIAN , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Serbian") - LNG(wxLANGUAGE_SERBIAN_CYRILLIC, "sr_RS", LANG_SERBIAN , SUBLANG_SERBIAN_CYRILLIC , wxLayout_LeftToRight, "Serbian (Cyrillic)") - LNG(wxLANGUAGE_SERBIAN_LATIN, "sr_RS@latin", LANG_SERBIAN , SUBLANG_SERBIAN_LATIN , wxLayout_LeftToRight, "Serbian (Latin)") - LNG(wxLANGUAGE_SERBIAN_CYRILLIC, "sr_YU", LANG_SERBIAN , SUBLANG_SERBIAN_CYRILLIC , wxLayout_LeftToRight, "Serbian (Cyrillic)") - LNG(wxLANGUAGE_SERBIAN_LATIN, "sr_YU@latin", LANG_SERBIAN , SUBLANG_SERBIAN_LATIN , wxLayout_LeftToRight, "Serbian (Latin)") - LNG(wxLANGUAGE_SERBO_CROATIAN, "sh" , 0 , 0 , wxLayout_LeftToRight, "Serbo-Croatian") - LNG(wxLANGUAGE_SESOTHO, "st" , 0 , 0 , wxLayout_LeftToRight, "Sesotho") - LNG(wxLANGUAGE_SETSWANA, "tn" , 0 , 0 , wxLayout_LeftToRight, "Setswana") - LNG(wxLANGUAGE_SHONA, "sn" , 0 , 0 , wxLayout_LeftToRight, "Shona") - LNG(wxLANGUAGE_SINDHI, "sd" , LANG_SINDHI , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Sindhi") - LNG(wxLANGUAGE_SINHALESE, "si" , 0 , 0 , wxLayout_LeftToRight, "Sinhalese") - LNG(wxLANGUAGE_SISWATI, "ss" , 0 , 0 , wxLayout_LeftToRight, "Siswati") - LNG(wxLANGUAGE_SLOVAK, "sk_SK", LANG_SLOVAK , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Slovak") - LNG(wxLANGUAGE_SLOVENIAN, "sl_SI", LANG_SLOVENIAN , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Slovenian") - LNG(wxLANGUAGE_SOMALI, "so" , 0 , 0 , wxLayout_LeftToRight, "Somali") - LNG(wxLANGUAGE_SPANISH, "es_ES", LANG_SPANISH , SUBLANG_SPANISH , wxLayout_LeftToRight, "Spanish") - LNG(wxLANGUAGE_SPANISH_ARGENTINA, "es_AR", LANG_SPANISH , SUBLANG_SPANISH_ARGENTINA , wxLayout_LeftToRight, "Spanish (Argentina)") - LNG(wxLANGUAGE_SPANISH_BOLIVIA, "es_BO", LANG_SPANISH , SUBLANG_SPANISH_BOLIVIA , wxLayout_LeftToRight, "Spanish (Bolivia)") - LNG(wxLANGUAGE_SPANISH_CHILE, "es_CL", LANG_SPANISH , SUBLANG_SPANISH_CHILE , wxLayout_LeftToRight, "Spanish (Chile)") - LNG(wxLANGUAGE_SPANISH_COLOMBIA, "es_CO", LANG_SPANISH , SUBLANG_SPANISH_COLOMBIA , wxLayout_LeftToRight, "Spanish (Colombia)") - LNG(wxLANGUAGE_SPANISH_COSTA_RICA, "es_CR", LANG_SPANISH , SUBLANG_SPANISH_COSTA_RICA , wxLayout_LeftToRight, "Spanish (Costa Rica)") - LNG(wxLANGUAGE_SPANISH_DOMINICAN_REPUBLIC, "es_DO", LANG_SPANISH , SUBLANG_SPANISH_DOMINICAN_REPUBLIC, wxLayout_LeftToRight, "Spanish (Dominican republic)") - LNG(wxLANGUAGE_SPANISH_ECUADOR, "es_EC", LANG_SPANISH , SUBLANG_SPANISH_ECUADOR , wxLayout_LeftToRight, "Spanish (Ecuador)") - LNG(wxLANGUAGE_SPANISH_EL_SALVADOR, "es_SV", LANG_SPANISH , SUBLANG_SPANISH_EL_SALVADOR , wxLayout_LeftToRight, "Spanish (El Salvador)") - LNG(wxLANGUAGE_SPANISH_GUATEMALA, "es_GT", LANG_SPANISH , SUBLANG_SPANISH_GUATEMALA , wxLayout_LeftToRight, "Spanish (Guatemala)") - LNG(wxLANGUAGE_SPANISH_HONDURAS, "es_HN", LANG_SPANISH , SUBLANG_SPANISH_HONDURAS , wxLayout_LeftToRight, "Spanish (Honduras)") - LNG(wxLANGUAGE_SPANISH_MEXICAN, "es_MX", LANG_SPANISH , SUBLANG_SPANISH_MEXICAN , wxLayout_LeftToRight, "Spanish (Mexican)") - LNG(wxLANGUAGE_SPANISH_MODERN, "es_ES", LANG_SPANISH , SUBLANG_SPANISH_MODERN , wxLayout_LeftToRight, "Spanish (Modern)") - LNG(wxLANGUAGE_SPANISH_NICARAGUA, "es_NI", LANG_SPANISH , SUBLANG_SPANISH_NICARAGUA , wxLayout_LeftToRight, "Spanish (Nicaragua)") - LNG(wxLANGUAGE_SPANISH_PANAMA, "es_PA", LANG_SPANISH , SUBLANG_SPANISH_PANAMA , wxLayout_LeftToRight, "Spanish (Panama)") - LNG(wxLANGUAGE_SPANISH_PARAGUAY, "es_PY", LANG_SPANISH , SUBLANG_SPANISH_PARAGUAY , wxLayout_LeftToRight, "Spanish (Paraguay)") - LNG(wxLANGUAGE_SPANISH_PERU, "es_PE", LANG_SPANISH , SUBLANG_SPANISH_PERU , wxLayout_LeftToRight, "Spanish (Peru)") - LNG(wxLANGUAGE_SPANISH_PUERTO_RICO, "es_PR", LANG_SPANISH , SUBLANG_SPANISH_PUERTO_RICO , wxLayout_LeftToRight, "Spanish (Puerto Rico)") - LNG(wxLANGUAGE_SPANISH_URUGUAY, "es_UY", LANG_SPANISH , SUBLANG_SPANISH_URUGUAY , wxLayout_LeftToRight, "Spanish (Uruguay)") - LNG(wxLANGUAGE_SPANISH_US, "es_US", 0 , 0 , wxLayout_LeftToRight, "Spanish (U.S.)") - LNG(wxLANGUAGE_SPANISH_VENEZUELA, "es_VE", LANG_SPANISH , SUBLANG_SPANISH_VENEZUELA , wxLayout_LeftToRight, "Spanish (Venezuela)") - LNG(wxLANGUAGE_SUNDANESE, "su" , 0 , 0 , wxLayout_LeftToRight, "Sundanese") - LNG(wxLANGUAGE_SWAHILI, "sw_KE", LANG_SWAHILI , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Swahili") - LNG(wxLANGUAGE_SWEDISH, "sv_SE", LANG_SWEDISH , SUBLANG_SWEDISH , wxLayout_LeftToRight, "Swedish") - LNG(wxLANGUAGE_SWEDISH_FINLAND, "sv_FI", LANG_SWEDISH , SUBLANG_SWEDISH_FINLAND , wxLayout_LeftToRight, "Swedish (Finland)") - LNG(wxLANGUAGE_TAGALOG, "tl_PH", 0 , 0 , wxLayout_LeftToRight, "Tagalog") - LNG(wxLANGUAGE_TAJIK, "tg" , 0 , 0 , wxLayout_LeftToRight, "Tajik") - LNG(wxLANGUAGE_TAMIL, "ta" , LANG_TAMIL , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Tamil") - LNG(wxLANGUAGE_TATAR, "tt" , LANG_TATAR , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Tatar") - LNG(wxLANGUAGE_TELUGU, "te" , LANG_TELUGU , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Telugu") - LNG(wxLANGUAGE_THAI, "th_TH", LANG_THAI , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Thai") - LNG(wxLANGUAGE_TIBETAN, "bo" , 0 , 0 , wxLayout_LeftToRight, "Tibetan") - LNG(wxLANGUAGE_TIGRINYA, "ti" , 0 , 0 , wxLayout_LeftToRight, "Tigrinya") - LNG(wxLANGUAGE_TONGA, "to" , 0 , 0 , wxLayout_LeftToRight, "Tonga") - LNG(wxLANGUAGE_TSONGA, "ts" , 0 , 0 , wxLayout_LeftToRight, "Tsonga") - LNG(wxLANGUAGE_TURKISH, "tr_TR", LANG_TURKISH , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Turkish") - LNG(wxLANGUAGE_TURKMEN, "tk" , 0 , 0 , wxLayout_LeftToRight, "Turkmen") - LNG(wxLANGUAGE_TWI, "tw" , 0 , 0 , wxLayout_LeftToRight, "Twi") - LNG(wxLANGUAGE_UIGHUR, "ug" , 0 , 0 , wxLayout_LeftToRight, "Uighur") - LNG(wxLANGUAGE_UKRAINIAN, "uk_UA", LANG_UKRAINIAN , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Ukrainian") - LNG(wxLANGUAGE_URDU, "ur" , LANG_URDU , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Urdu") - LNG(wxLANGUAGE_URDU_INDIA, "ur_IN", LANG_URDU , SUBLANG_URDU_INDIA , wxLayout_LeftToRight, "Urdu (India)") - LNG(wxLANGUAGE_URDU_PAKISTAN, "ur_PK", LANG_URDU , SUBLANG_URDU_PAKISTAN , wxLayout_LeftToRight, "Urdu (Pakistan)") - LNG(wxLANGUAGE_UZBEK, "uz" , LANG_UZBEK , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Uzbek") - LNG(wxLANGUAGE_UZBEK_CYRILLIC, "uz" , LANG_UZBEK , SUBLANG_UZBEK_CYRILLIC , wxLayout_LeftToRight, "Uzbek (Cyrillic)") - LNG(wxLANGUAGE_UZBEK_LATIN, "uz" , LANG_UZBEK , SUBLANG_UZBEK_LATIN , wxLayout_LeftToRight, "Uzbek (Latin)") - LNG(wxLANGUAGE_VALENCIAN, "ca_ES@valencia", 0 , 0 , wxLayout_LeftToRight, "Valencian (Southern Catalan)") - LNG(wxLANGUAGE_VIETNAMESE, "vi_VN", LANG_VIETNAMESE, SUBLANG_DEFAULT , wxLayout_LeftToRight, "Vietnamese") - LNG(wxLANGUAGE_VOLAPUK, "vo" , 0 , 0 , wxLayout_LeftToRight, "Volapuk") - LNG(wxLANGUAGE_WELSH, "cy" , 0 , 0 , wxLayout_LeftToRight, "Welsh") - LNG(wxLANGUAGE_WOLOF, "wo" , 0 , 0 , wxLayout_LeftToRight, "Wolof") - LNG(wxLANGUAGE_XHOSA, "xh" , 0 , 0 , wxLayout_LeftToRight, "Xhosa") - LNG(wxLANGUAGE_YIDDISH, "yi" , 0 , 0 , wxLayout_LeftToRight, "Yiddish") - LNG(wxLANGUAGE_YORUBA, "yo" , 0 , 0 , wxLayout_LeftToRight, "Yoruba") - LNG(wxLANGUAGE_ZHUANG, "za" , 0 , 0 , wxLayout_LeftToRight, "Zhuang") - LNG(wxLANGUAGE_ZULU, "zu" , 0 , 0 , wxLayout_LeftToRight, "Zulu") - -} -#undef LNG - -// --- --- --- generated code ends here --- --- --- - -#endif // wxUSE_INTL diff --git a/Externals/wxWidgets3/src/common/layout.cpp b/Externals/wxWidgets3/src/common/layout.cpp deleted file mode 100644 index 1e4f0e01d2..0000000000 --- a/Externals/wxWidgets3/src/common/layout.cpp +++ /dev/null @@ -1,1025 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/layout.cpp -// Purpose: Constraint layout system classes -// Author: Julian Smart -// Modified by: -// Created: 04/01/98 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================= -// declarations -// ============================================================================= - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_CONSTRAINTS - -#include "wx/layout.h" - -#ifndef WX_PRECOMP - #include "wx/window.h" - #include "wx/utils.h" - #include "wx/dialog.h" - #include "wx/msgdlg.h" - #include "wx/intl.h" -#endif - - -wxIMPLEMENT_DYNAMIC_CLASS(wxIndividualLayoutConstraint, wxObject); -wxIMPLEMENT_DYNAMIC_CLASS(wxLayoutConstraints, wxObject); - - -inline void wxGetAsIs(wxWindowBase* win, int* w, int* h) -{ -#if 1 - // The old way. Works for me. - win->GetSize(w, h); -#endif - -#if 0 - // Vadim's change. Breaks wxPython's LayoutAnchors - win->GetBestSize(w, h); -#endif - -#if 0 - // Proposed compromise. Doesn't work. - int sw, sh, bw, bh; - win->GetSize(&sw, &sh); - win->GetBestSize(&bw, &bh); - if (w) - *w = wxMax(sw, bw); - if (h) - *h = wxMax(sh, bh); -#endif -} - - -wxIndividualLayoutConstraint::wxIndividualLayoutConstraint() -{ - myEdge = wxTop; - relationship = wxUnconstrained; - margin = 0; - value = 0; - percent = 0; - otherEdge = wxTop; - done = false; - otherWin = NULL; -} - -void wxIndividualLayoutConstraint::Set(wxRelationship rel, wxWindowBase *otherW, wxEdge otherE, int val, int marg) -{ - if (rel == wxSameAs) - { - // If Set is called by the user with wxSameAs then call SameAs to do - // it since it will actually use wxPercent instead. - SameAs(otherW, otherE, marg); - return; - } - - relationship = rel; - otherWin = otherW; - otherEdge = otherE; - - if ( rel == wxPercentOf ) - { - percent = val; - } - else - { - value = val; - } - - margin = marg; -} - -void wxIndividualLayoutConstraint::LeftOf(wxWindowBase *sibling, int marg) -{ - Set(wxLeftOf, sibling, wxLeft, 0, marg); -} - -void wxIndividualLayoutConstraint::RightOf(wxWindowBase *sibling, int marg) -{ - Set(wxRightOf, sibling, wxRight, 0, marg); -} - -void wxIndividualLayoutConstraint::Above(wxWindowBase *sibling, int marg) -{ - Set(wxAbove, sibling, wxTop, 0, marg); -} - -void wxIndividualLayoutConstraint::Below(wxWindowBase *sibling, int marg) -{ - Set(wxBelow, sibling, wxBottom, 0, marg); -} - -// -// 'Same edge' alignment -// -void wxIndividualLayoutConstraint::SameAs(wxWindowBase *otherW, wxEdge edge, int marg) -{ - Set(wxPercentOf, otherW, edge, 100, marg); -} - -// The edge is a percentage of the other window's edge -void wxIndividualLayoutConstraint::PercentOf(wxWindowBase *otherW, wxEdge wh, int per) -{ - Set(wxPercentOf, otherW, wh, per); -} - -// -// Edge has absolute value -// -void wxIndividualLayoutConstraint::Absolute(int val) -{ - value = val; - relationship = wxAbsolute; -} - -// Reset constraint if it mentions otherWin -bool wxIndividualLayoutConstraint::ResetIfWin(wxWindowBase *otherW) -{ - if (otherW == otherWin) - { - myEdge = wxTop; - relationship = wxAsIs; - margin = 0; - value = 0; - percent = 0; - otherEdge = wxTop; - otherWin = NULL; - return true; - } - - return false; -} - -// Try to satisfy constraint -bool wxIndividualLayoutConstraint::SatisfyConstraint(wxLayoutConstraints *constraints, wxWindowBase *win) -{ - if (relationship == wxAbsolute) - { - done = true; - return true; - } - - switch (myEdge) - { - case wxLeft: - { - switch (relationship) - { - case wxLeftOf: - { - // We can know this edge if: otherWin is win's - // parent, or otherWin has a satisfied constraint, - // or otherWin has no constraint. - int edgePos = GetEdge(otherEdge, win, otherWin); - if (edgePos != -1) - { - value = edgePos - margin; - done = true; - return true; - } - else - return false; - } - case wxRightOf: - { - int edgePos = GetEdge(otherEdge, win, otherWin); - if (edgePos != -1) - { - value = edgePos + margin; - done = true; - return true; - } - else - return false; - } - case wxPercentOf: - { - int edgePos = GetEdge(otherEdge, win, otherWin); - if (edgePos != -1) - { - value = (int)(edgePos*(((float)percent)*0.01) + margin); - done = true; - return true; - } - else - return false; - } - case wxUnconstrained: - { - // We know the left-hand edge position if we know - // the right-hand edge and we know the width; OR if - // we know the centre and the width. - if (constraints->right.GetDone() && constraints->width.GetDone()) - { - value = (constraints->right.GetValue() - constraints->width.GetValue() + margin); - done = true; - return true; - } - else if (constraints->centreX.GetDone() && constraints->width.GetDone()) - { - value = (int)(constraints->centreX.GetValue() - (constraints->width.GetValue()/2) + margin); - done = true; - return true; - } - else - return false; - } - case wxAsIs: - { - int y; - win->GetPosition(&value, &y); - done = true; - return true; - } - default: - break; - } - break; - } - case wxRight: - { - switch (relationship) - { - case wxLeftOf: - { - // We can know this edge if: otherWin is win's - // parent, or otherWin has a satisfied constraint, - // or otherWin has no constraint. - int edgePos = GetEdge(otherEdge, win, otherWin); - if (edgePos != -1) - { - value = edgePos - margin; - done = true; - return true; - } - else - return false; - } - case wxRightOf: - { - int edgePos = GetEdge(otherEdge, win, otherWin); - if (edgePos != -1) - { - value = edgePos + margin; - done = true; - return true; - } - else - return false; - } - case wxPercentOf: - { - int edgePos = GetEdge(otherEdge, win, otherWin); - if (edgePos != -1) - { - value = (int)(edgePos*(((float)percent)*0.01) - margin); - done = true; - return true; - } - else - return false; - } - case wxUnconstrained: - { - // We know the right-hand edge position if we know the - // left-hand edge and we know the width, OR if we know the - // centre edge and the width. - if (constraints->left.GetDone() && constraints->width.GetDone()) - { - value = (constraints->left.GetValue() + constraints->width.GetValue() - margin); - done = true; - return true; - } - else if (constraints->centreX.GetDone() && constraints->width.GetDone()) - { - value = (int)(constraints->centreX.GetValue() + (constraints->width.GetValue()/2) - margin); - done = true; - return true; - } - else - return false; - } - case wxAsIs: - { - int x, y; - int w, h; - wxGetAsIs(win, &w, &h); - win->GetPosition(&x, &y); - value = x + w; - done = true; - return true; - } - default: - break; - } - break; - } - case wxTop: - { - switch (relationship) - { - case wxAbove: - { - // We can know this edge if: otherWin is win's - // parent, or otherWin has a satisfied constraint, - // or otherWin has no constraint. - int edgePos = GetEdge(otherEdge, win, otherWin); - if (edgePos != -1) - { - value = edgePos - margin; - done = true; - return true; - } - else - return false; - } - case wxBelow: - { - int edgePos = GetEdge(otherEdge, win, otherWin); - if (edgePos != -1) - { - value = edgePos + margin; - done = true; - return true; - } - else - return false; - } - case wxPercentOf: - { - int edgePos = GetEdge(otherEdge, win, otherWin); - if (edgePos != -1) - { - value = (int)(edgePos*(((float)percent)*0.01) + margin); - done = true; - return true; - } - else - return false; - } - case wxUnconstrained: - { - // We know the top edge position if we know the bottom edge - // and we know the height; OR if we know the centre edge and - // the height. - if (constraints->bottom.GetDone() && constraints->height.GetDone()) - { - value = (constraints->bottom.GetValue() - constraints->height.GetValue() + margin); - done = true; - return true; - } - else if (constraints->centreY.GetDone() && constraints->height.GetDone()) - { - value = (constraints->centreY.GetValue() - (constraints->height.GetValue()/2) + margin); - done = true; - return true; - } - else - return false; - } - case wxAsIs: - { - int x; - win->GetPosition(&x, &value); - done = true; - return true; - } - default: - break; - } - break; - } - case wxBottom: - { - switch (relationship) - { - case wxAbove: - { - // We can know this edge if: otherWin is win's parent, - // or otherWin has a satisfied constraint, or - // otherWin has no constraint. - int edgePos = GetEdge(otherEdge, win, otherWin); - if (edgePos != -1) - { - value = edgePos + margin; - done = true; - return true; - } - else - return false; - } - case wxBelow: - { - int edgePos = GetEdge(otherEdge, win, otherWin); - if (edgePos != -1) - { - value = edgePos - margin; - done = true; - return true; - } - else - return false; - } - case wxPercentOf: - { - int edgePos = GetEdge(otherEdge, win, otherWin); - if (edgePos != -1) - { - value = (int)(edgePos*(((float)percent)*0.01) - margin); - done = true; - return true; - } - else - return false; - } - case wxUnconstrained: - { - // We know the bottom edge position if we know the top edge - // and we know the height; OR if we know the centre edge and - // the height. - if (constraints->top.GetDone() && constraints->height.GetDone()) - { - value = (constraints->top.GetValue() + constraints->height.GetValue() - margin); - done = true; - return true; - } - else if (constraints->centreY.GetDone() && constraints->height.GetDone()) - { - value = (constraints->centreY.GetValue() + (constraints->height.GetValue()/2) - margin); - done = true; - return true; - } - else - return false; - } - case wxAsIs: - { - int x, y; - int w, h; - wxGetAsIs(win, &w, &h); - win->GetPosition(&x, &y); - value = h + y; - done = true; - return true; - } - default: - break; - } - break; - } - case wxCentreX: - { - switch (relationship) - { - case wxLeftOf: - { - // We can know this edge if: otherWin is win's parent, or - // otherWin has a satisfied constraint, or otherWin has no - // constraint. - int edgePos = GetEdge(otherEdge, win, otherWin); - if (edgePos != -1) - { - value = edgePos - margin; - done = true; - return true; - } - else - return false; - } - case wxRightOf: - { - int edgePos = GetEdge(otherEdge, win, otherWin); - if (edgePos != -1) - { - value = edgePos + margin; - done = true; - return true; - } - else - return false; - } - case wxPercentOf: - { - int edgePos = GetEdge(otherEdge, win, otherWin); - if (edgePos != -1) - { - value = (int)(edgePos*(((float)percent)*0.01) + margin); - done = true; - return true; - } - else - return false; - } - case wxUnconstrained: - { - // We know the centre position if we know - // the left-hand edge and we know the width, OR - // the right-hand edge and the width - if (constraints->left.GetDone() && constraints->width.GetDone()) - { - value = (int)(constraints->left.GetValue() + (constraints->width.GetValue()/2) + margin); - done = true; - return true; - } - else if (constraints->right.GetDone() && constraints->width.GetDone()) - { - value = (int)(constraints->left.GetValue() - (constraints->width.GetValue()/2) + margin); - done = true; - return true; - } - else - return false; - } - default: - break; - } - break; - } - case wxCentreY: - { - switch (relationship) - { - case wxAbove: - { - // We can know this edge if: otherWin is win's parent, - // or otherWin has a satisfied constraint, or otherWin - // has no constraint. - int edgePos = GetEdge(otherEdge, win, otherWin); - if (edgePos != -1) - { - value = edgePos - margin; - done = true; - return true; - } - else - return false; - } - case wxBelow: - { - int edgePos = GetEdge(otherEdge, win, otherWin); - if (edgePos != -1) - { - value = edgePos + margin; - done = true; - return true; - } - else - return false; - } - case wxPercentOf: - { - int edgePos = GetEdge(otherEdge, win, otherWin); - if (edgePos != -1) - { - value = (int)(edgePos*(((float)percent)*0.01) + margin); - done = true; - return true; - } - else - return false; - } - case wxUnconstrained: - { - // We know the centre position if we know - // the top edge and we know the height, OR - // the bottom edge and the height. - if (constraints->bottom.GetDone() && constraints->height.GetDone()) - { - value = (int)(constraints->bottom.GetValue() - (constraints->height.GetValue()/2) + margin); - done = true; - return true; - } - else if (constraints->top.GetDone() && constraints->height.GetDone()) - { - value = (int)(constraints->top.GetValue() + (constraints->height.GetValue()/2) + margin); - done = true; - return true; - } - else - return false; - } - default: - break; - } - break; - } - case wxWidth: - { - switch (relationship) - { - case wxPercentOf: - { - int edgePos = GetEdge(otherEdge, win, otherWin); - if (edgePos != -1) - { - value = (int)(edgePos*(((float)percent)*0.01)); - done = true; - return true; - } - else - return false; - } - case wxAsIs: - { - if (win) - { - int h; - wxGetAsIs(win, &value, &h); - done = true; - return true; - } - else return false; - } - case wxUnconstrained: - { - // We know the width if we know the left edge and the right edge, OR - // if we know the left edge and the centre, OR - // if we know the right edge and the centre - if (constraints->left.GetDone() && constraints->right.GetDone()) - { - value = constraints->right.GetValue() - constraints->left.GetValue(); - done = true; - return true; - } - else if (constraints->centreX.GetDone() && constraints->left.GetDone()) - { - value = (int)(2*(constraints->centreX.GetValue() - constraints->left.GetValue())); - done = true; - return true; - } - else if (constraints->centreX.GetDone() && constraints->right.GetDone()) - { - value = (int)(2*(constraints->right.GetValue() - constraints->centreX.GetValue())); - done = true; - return true; - } - else - return false; - } - default: - break; - } - break; - } - case wxHeight: - { - switch (relationship) - { - case wxPercentOf: - { - int edgePos = GetEdge(otherEdge, win, otherWin); - if (edgePos != -1) - { - value = (int)(edgePos*(((float)percent)*0.01)); - done = true; - return true; - } - else - return false; - } - case wxAsIs: - { - if (win) - { - int w; - wxGetAsIs(win, &w, &value); - done = true; - return true; - } - else return false; - } - case wxUnconstrained: - { - // We know the height if we know the top edge and the bottom edge, OR - // if we know the top edge and the centre, OR - // if we know the bottom edge and the centre - if (constraints->top.GetDone() && constraints->bottom.GetDone()) - { - value = constraints->bottom.GetValue() - constraints->top.GetValue(); - done = true; - return true; - } - else if (constraints->top.GetDone() && constraints->centreY.GetDone()) - { - value = (int)(2*(constraints->centreY.GetValue() - constraints->top.GetValue())); - done = true; - return true; - } - else if (constraints->bottom.GetDone() && constraints->centreY.GetDone()) - { - value = (int)(2*(constraints->bottom.GetValue() - constraints->centreY.GetValue())); - done = true; - return true; - } - else - return false; - } - default: - break; - } - break; - } - default: - break; - } - return false; -} - -// Get the value of this edge or dimension, or if this is not determinable, -1. -int wxIndividualLayoutConstraint::GetEdge(wxEdge which, - wxWindowBase *thisWin, - wxWindowBase *other) const -{ - // If the edge or dimension belongs to the parent, then we know the - // dimension is obtainable immediately. E.g. a wxExpandSizer may contain a - // button (but the button's true parent is a panel, not the sizer) - if (other->GetChildren().Find((wxWindow*)thisWin)) - { - switch (which) - { - case wxLeft: - { - return 0; - } - case wxTop: - { - return 0; - } - case wxRight: - { - int w, h; - other->GetClientSizeConstraint(&w, &h); - return w; - } - case wxBottom: - { - int w, h; - other->GetClientSizeConstraint(&w, &h); - return h; - } - case wxWidth: - { - int w, h; - other->GetClientSizeConstraint(&w, &h); - return w; - } - case wxHeight: - { - int w, h; - other->GetClientSizeConstraint(&w, &h); - return h; - } - case wxCentreX: - case wxCentreY: - { - int w, h; - other->GetClientSizeConstraint(&w, &h); - if (which == wxCentreX) - return (int)(w/2); - else - return (int)(h/2); - } - default: - return -1; - } - } - switch (which) - { - case wxLeft: - { - wxLayoutConstraints *constr = other->GetConstraints(); - // If no constraints, it means the window is not dependent - // on anything, and therefore we know its value immediately - if (constr) - { - if (constr->left.GetDone()) - return constr->left.GetValue(); - else - return -1; - } - else - { - int x, y; - other->GetPosition(&x, &y); - return x; - } - } - case wxTop: - { - wxLayoutConstraints *constr = other->GetConstraints(); - // If no constraints, it means the window is not dependent - // on anything, and therefore we know its value immediately - if (constr) - { - if (constr->top.GetDone()) - return constr->top.GetValue(); - else - return -1; - } - else - { - int x, y; - other->GetPosition(&x, &y); - return y; - } - } - case wxRight: - { - wxLayoutConstraints *constr = other->GetConstraints(); - // If no constraints, it means the window is not dependent - // on anything, and therefore we know its value immediately - if (constr) - { - if (constr->right.GetDone()) - return constr->right.GetValue(); - else - return -1; - } - else - { - int x, y, w, h; - other->GetPosition(&x, &y); - other->GetSize(&w, &h); - return (int)(x + w); - } - } - case wxBottom: - { - wxLayoutConstraints *constr = other->GetConstraints(); - // If no constraints, it means the window is not dependent - // on anything, and therefore we know its value immediately - if (constr) - { - if (constr->bottom.GetDone()) - return constr->bottom.GetValue(); - else - return -1; - } - else - { - int x, y, w, h; - other->GetPosition(&x, &y); - other->GetSize(&w, &h); - return (int)(y + h); - } - } - case wxWidth: - { - wxLayoutConstraints *constr = other->GetConstraints(); - // If no constraints, it means the window is not dependent - // on anything, and therefore we know its value immediately - if (constr) - { - if (constr->width.GetDone()) - return constr->width.GetValue(); - else - return -1; - } - else - { - int w, h; - other->GetSize(&w, &h); - return w; - } - } - case wxHeight: - { - wxLayoutConstraints *constr = other->GetConstraints(); - // If no constraints, it means the window is not dependent - // on anything, and therefore we know its value immediately - if (constr) - { - if (constr->height.GetDone()) - return constr->height.GetValue(); - else - return -1; - } - else - { - int w, h; - other->GetSize(&w, &h); - return h; - } - } - case wxCentreX: - { - wxLayoutConstraints *constr = other->GetConstraints(); - // If no constraints, it means the window is not dependent - // on anything, and therefore we know its value immediately - if (constr) - { - if (constr->centreX.GetDone()) - return constr->centreX.GetValue(); - else - return -1; - } - else - { - int x, y, w, h; - other->GetPosition(&x, &y); - other->GetSize(&w, &h); - return (int)(x + (w/2)); - } - } - case wxCentreY: - { - wxLayoutConstraints *constr = other->GetConstraints(); - // If no constraints, it means the window is not dependent - // on anything, and therefore we know its value immediately - if (constr) - { - if (constr->centreY.GetDone()) - return constr->centreY.GetValue(); - else - return -1; - } - else - { - int x, y, w, h; - other->GetPosition(&x, &y); - other->GetSize(&w, &h); - return (int)(y + (h/2)); - } - } - default: - break; - } - return -1; -} - -wxLayoutConstraints::wxLayoutConstraints() -{ - left.SetEdge(wxLeft); - top.SetEdge(wxTop); - right.SetEdge(wxRight); - bottom.SetEdge(wxBottom); - centreX.SetEdge(wxCentreX); - centreY.SetEdge(wxCentreY); - width.SetEdge(wxWidth); - height.SetEdge(wxHeight); -} - -bool wxLayoutConstraints::SatisfyConstraints(wxWindowBase *win, int *nChanges) -{ - int noChanges = 0; - - bool done = width.GetDone(); - bool newDone = (done ? true : width.SatisfyConstraint(this, win)); - if (newDone != done) - noChanges ++; - - done = height.GetDone(); - newDone = (done ? true : height.SatisfyConstraint(this, win)); - if (newDone != done) - noChanges ++; - - done = left.GetDone(); - newDone = (done ? true : left.SatisfyConstraint(this, win)); - if (newDone != done) - noChanges ++; - - done = top.GetDone(); - newDone = (done ? true : top.SatisfyConstraint(this, win)); - if (newDone != done) - noChanges ++; - - done = right.GetDone(); - newDone = (done ? true : right.SatisfyConstraint(this, win)); - if (newDone != done) - noChanges ++; - - done = bottom.GetDone(); - newDone = (done ? true : bottom.SatisfyConstraint(this, win)); - if (newDone != done) - noChanges ++; - - done = centreX.GetDone(); - newDone = (done ? true : centreX.SatisfyConstraint(this, win)); - if (newDone != done) - noChanges ++; - - done = centreY.GetDone(); - newDone = (done ? true : centreY.SatisfyConstraint(this, win)); - if (newDone != done) - noChanges ++; - - *nChanges = noChanges; - - return AreSatisfied(); -} - -#endif // wxUSE_CONSTRAINTS diff --git a/Externals/wxWidgets3/src/common/lboxcmn.cpp b/Externals/wxWidgets3/src/common/lboxcmn.cpp deleted file mode 100644 index 80e169ba16..0000000000 --- a/Externals/wxWidgets3/src/common/lboxcmn.cpp +++ /dev/null @@ -1,372 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/lboxcmn.cpp -// Purpose: wxListBox class methods common to all platforms -// Author: Vadim Zeitlin -// Modified by: -// Created: 22.10.99 -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_LISTBOX - -#include "wx/listbox.h" - -#ifndef WX_PRECOMP - #include "wx/dynarray.h" - #include "wx/arrstr.h" - #include "wx/log.h" - #include "wx/dcclient.h" -#endif - -// the spacing between the lines (in report mode) -static const int LINE_SPACING = 0; - -#ifdef __WXGTK__ -static const int EXTRA_HEIGHT = 6; -#else -static const int EXTRA_HEIGHT = 4; -#endif - -extern WXDLLEXPORT_DATA(const char) wxListBoxNameStr[] = "listBox"; - -// ============================================================================ -// implementation -// ============================================================================ - -wxListBoxBase::~wxListBoxBase() -{ - // this destructor is required for Darwin -} - -// ---------------------------------------------------------------------------- -// XTI -// ---------------------------------------------------------------------------- - -wxDEFINE_FLAGS( wxListBoxStyle ) -wxBEGIN_FLAGS( wxListBoxStyle ) -// new style border flags, we put them first to -// use them for streaming out -wxFLAGS_MEMBER(wxBORDER_SIMPLE) -wxFLAGS_MEMBER(wxBORDER_SUNKEN) -wxFLAGS_MEMBER(wxBORDER_DOUBLE) -wxFLAGS_MEMBER(wxBORDER_RAISED) -wxFLAGS_MEMBER(wxBORDER_STATIC) -wxFLAGS_MEMBER(wxBORDER_NONE) - -// old style border flags -wxFLAGS_MEMBER(wxSIMPLE_BORDER) -wxFLAGS_MEMBER(wxSUNKEN_BORDER) -wxFLAGS_MEMBER(wxDOUBLE_BORDER) -wxFLAGS_MEMBER(wxRAISED_BORDER) -wxFLAGS_MEMBER(wxSTATIC_BORDER) -wxFLAGS_MEMBER(wxBORDER) - -// standard window styles -wxFLAGS_MEMBER(wxTAB_TRAVERSAL) -wxFLAGS_MEMBER(wxCLIP_CHILDREN) -wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) -wxFLAGS_MEMBER(wxWANTS_CHARS) -wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE) -wxFLAGS_MEMBER(wxALWAYS_SHOW_SB ) -wxFLAGS_MEMBER(wxVSCROLL) -wxFLAGS_MEMBER(wxHSCROLL) - -wxFLAGS_MEMBER(wxLB_SINGLE) -wxFLAGS_MEMBER(wxLB_MULTIPLE) -wxFLAGS_MEMBER(wxLB_EXTENDED) -wxFLAGS_MEMBER(wxLB_HSCROLL) -wxFLAGS_MEMBER(wxLB_ALWAYS_SB) -wxFLAGS_MEMBER(wxLB_NEEDED_SB) -wxFLAGS_MEMBER(wxLB_SORT) -wxEND_FLAGS( wxListBoxStyle ) - -wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxListBox, wxControl, "wx/listbox.h"); - -wxBEGIN_PROPERTIES_TABLE(wxListBox) -wxEVENT_PROPERTY( Select, wxEVT_LISTBOX, wxCommandEvent ) -wxEVENT_PROPERTY( DoubleClick, wxEVT_LISTBOX_DCLICK, wxCommandEvent ) - -wxPROPERTY( Font, wxFont, SetFont, GetFont , wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \ - wxT("Helpstring"), wxT("group")) -wxPROPERTY_COLLECTION( Choices, wxArrayString, wxString, AppendString, \ - GetStrings, 0 /*flags*/, wxT("Helpstring"), wxT("group") ) -wxPROPERTY( Selection, int, SetSelection, GetSelection, wxEMPTY_PARAMETER_VALUE, \ - 0 /*flags*/, wxT("Helpstring"), wxT("group") ) - -wxPROPERTY_FLAGS( WindowStyle, wxListBoxStyle, long, SetWindowStyleFlag, \ - GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \ - wxT("Helpstring"), wxT("group")) // style -wxEND_PROPERTIES_TABLE() - -wxEMPTY_HANDLERS_TABLE(wxListBox) - -wxCONSTRUCTOR_4( wxListBox, wxWindow*, Parent, wxWindowID, Id, \ - wxPoint, Position, wxSize, Size ) - -/* - TODO PROPERTIES - selection - content - item - */ - -// ---------------------------------------------------------------------------- -// selection -// ---------------------------------------------------------------------------- - -bool wxListBoxBase::SetStringSelection(const wxString& s, bool select) -{ - const int sel = FindString(s); - if ( sel == wxNOT_FOUND ) - return false; - - SetSelection(sel, select); - - return true; -} - -void wxListBoxBase::SetSelection(int n) -{ - if ( !HasMultipleSelection() ) - DoChangeSingleSelection(n); - - DoSetSelection(n, true); -} - -void wxListBoxBase::DeselectAll(int itemToLeaveSelected) -{ - if ( HasMultipleSelection() ) - { - wxArrayInt selections; - GetSelections(selections); - - size_t count = selections.GetCount(); - for ( size_t n = 0; n < count; n++ ) - { - int item = selections[n]; - if ( item != itemToLeaveSelected ) - Deselect(item); - } - } - else // single selection - { - int sel = GetSelection(); - if ( sel != wxNOT_FOUND && sel != itemToLeaveSelected ) - { - Deselect(sel); - } - } -} - -void wxListBoxBase::UpdateOldSelections() -{ - // When the control becomes empty, any previously remembered selections are - // invalid anyhow, so just forget them. - if ( IsEmpty() ) - { - m_oldSelections.clear(); - return; - } - - // We need to remember the selection even in single-selection case on - // Windows, so that we don't send an event when the user clicks on an - // already selected item. -#ifndef __WXMSW__ - if (HasFlag(wxLB_MULTIPLE) || HasFlag(wxLB_EXTENDED)) -#endif - { - GetSelections( m_oldSelections ); - } -} - -bool wxListBoxBase::SendEvent(wxEventType evtType, int item, bool selected) -{ - wxCommandEvent event(evtType, GetId()); - event.SetEventObject(this); - - event.SetInt(item); - event.SetString(GetString(item)); - event.SetExtraLong(selected); - - if ( HasClientObjectData() ) - event.SetClientObject(GetClientObject(item)); - else if ( HasClientUntypedData() ) - event.SetClientData(GetClientData(item)); - - return HandleWindowEvent(event); -} - -bool wxListBoxBase::DoChangeSingleSelection(int item) -{ - // As we don't use m_oldSelections in single selection mode, we store the - // last item that we notified the user about in it in this case because we - // need to remember it to be able to filter out the dummy selection changes - // that we get when the user clicks on an already selected item. - if ( !m_oldSelections.empty() && *m_oldSelections.begin() == item ) - { - // Same item as the last time. - return false; - } - - m_oldSelections.clear(); - m_oldSelections.push_back(item); - - return true; -} - -bool wxListBoxBase::CalcAndSendEvent() -{ - wxArrayInt selections; - GetSelections(selections); - bool selected = true; - - if ( selections.empty() && m_oldSelections.empty() ) - { - // nothing changed, just leave - return false; - } - - const size_t countSel = selections.size(), - countSelOld = m_oldSelections.size(); - if ( countSel == countSelOld ) - { - bool changed = false; - for ( size_t idx = 0; idx < countSel; idx++ ) - { - if (selections[idx] != m_oldSelections[idx]) - { - changed = true; - break; - } - } - - // nothing changed, just leave - if ( !changed ) - return false; - } - - int item = wxNOT_FOUND; - if ( selections.empty() ) - { - selected = false; - item = m_oldSelections[0]; - } - else // we [still] have some selections - { - // Now test if any new item is selected - bool any_new_selected = false; - for ( size_t idx = 0; idx < countSel; idx++ ) - { - item = selections[idx]; - if ( m_oldSelections.Index(item) == wxNOT_FOUND ) - { - any_new_selected = true; - break; - } - } - - if ( !any_new_selected ) - { - // No new items selected, now test if any new item is deselected - bool any_new_deselected = false; - for ( size_t idx = 0; idx < countSelOld; idx++ ) - { - item = m_oldSelections[idx]; - if ( selections.Index(item) == wxNOT_FOUND ) - { - any_new_deselected = true; - break; - } - } - - if ( any_new_deselected ) - { - // indicate that this is a selection - selected = false; - } - else - { - item = wxNOT_FOUND; // this should be impossible - } - } - } - - wxASSERT_MSG( item != wxNOT_FOUND, - "Logic error in wxListBox selection event generation code" ); - - m_oldSelections = selections; - - return SendEvent(wxEVT_LISTBOX, item, selected); -} - -// ---------------------------------------------------------------------------- -// misc -// ---------------------------------------------------------------------------- - -void wxListBoxBase::Command(wxCommandEvent& event) -{ - SetSelection(event.GetInt(), event.GetExtraLong() != 0); - (void)GetEventHandler()->ProcessEvent(event); -} - -// ---------------------------------------------------------------------------- -// SetFirstItem() and such -// ---------------------------------------------------------------------------- - -void wxListBoxBase::SetFirstItem(const wxString& s) -{ - int n = FindString(s); - - wxCHECK_RET( n != wxNOT_FOUND, wxT("invalid string in wxListBox::SetFirstItem") ); - - DoSetFirstItem(n); -} - -void wxListBoxBase::AppendAndEnsureVisible(const wxString& s) -{ - Append(s); - EnsureVisible(GetCount() - 1); -} - -void wxListBoxBase::EnsureVisible(int WXUNUSED(n)) -{ - // the base class version does nothing (the only alternative would be to - // call SetFirstItem() but this is probably even more stupid) -} - -wxCoord wxListBoxBase::GetLineHeight() const -{ - wxListBoxBase *self = wxConstCast(this, wxListBoxBase); - - wxClientDC dc( self ); - dc.SetFont( GetFont() ); - - wxCoord y; - dc.GetTextExtent(wxT("H"), NULL, &y); - - y += EXTRA_HEIGHT; - - return y + LINE_SPACING; -} - -int wxListBoxBase::GetCountPerPage() const -{ - return GetClientSize().y / GetLineHeight(); -} -#endif // wxUSE_LISTBOX diff --git a/Externals/wxWidgets3/src/common/list.cpp b/Externals/wxWidgets3/src/common/list.cpp deleted file mode 100644 index efaf12a195..0000000000 --- a/Externals/wxWidgets3/src/common/list.cpp +++ /dev/null @@ -1,757 +0,0 @@ -//////////////////////////////////////////////////////////////////////////////// -// Name: src/common/list.cpp -// Purpose: wxList implementation -// Author: Julian Smart -// Modified by: VZ at 16/11/98: WX_DECLARE_LIST() and typesafe lists added -// Created: 04/01/98 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -//////////////////////////////////////////////////////////////////////////////// - -// ============================================================================= -// declarations -// ============================================================================= - -// ----------------------------------------------------------------------------- -// headers -// ----------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include -#include -#include - -#ifndef WX_PRECOMP - #include "wx/list.h" - #include "wx/crt.h" -#endif - -#if !wxUSE_STD_CONTAINERS - -// ============================================================================= -// implementation -// ============================================================================= - -// ----------------------------------------------------------------------------- -// wxListKey -// ----------------------------------------------------------------------------- -wxListKey wxDefaultListKey; - -bool wxListKey::operator==(wxListKeyValue value) const -{ - switch ( m_keyType ) - { - default: - wxFAIL_MSG(wxT("bad key type.")); - // let compiler optimize the line above away in release build - // by not putting return here... - - case wxKEY_STRING: - return *m_key.string == *value.string; - - case wxKEY_INTEGER: - return m_key.integer == value.integer; - } -} - -// ----------------------------------------------------------------------------- -// wxNodeBase -// ----------------------------------------------------------------------------- - -wxNodeBase::wxNodeBase(wxListBase *list, - wxNodeBase *previous, wxNodeBase *next, - void *data, const wxListKey& key) -{ - m_list = list; - m_data = data; - m_previous = previous; - m_next = next; - - switch ( key.GetKeyType() ) - { - case wxKEY_NONE: - break; - - case wxKEY_INTEGER: - m_key.integer = key.GetNumber(); - break; - - case wxKEY_STRING: - // to be free()d later - m_key.string = new wxString(key.GetString()); - break; - - default: - wxFAIL_MSG(wxT("invalid key type")); - } - - if ( previous ) - previous->m_next = this; - - if ( next ) - next->m_previous = this; -} - -wxNodeBase::~wxNodeBase() -{ - // handle the case when we're being deleted from the list by the user (i.e. - // not by the list itself from DeleteNode) - we must do it for - // compatibility with old code - if ( m_list != NULL ) - { - if ( m_list->m_keyType == wxKEY_STRING ) - { - delete m_key.string; - } - - m_list->DetachNode(this); - } -} - -int wxNodeBase::IndexOf() const -{ - wxCHECK_MSG( m_list, wxNOT_FOUND, wxT("node doesn't belong to a list in IndexOf")); - - // It would be more efficient to implement IndexOf() completely inside - // wxListBase (only traverse the list once), but this is probably a more - // reusable way of doing it. Can always be optimized at a later date (since - // IndexOf() resides in wxListBase as well) if efficiency is a problem. - int i; - wxNodeBase *prev = m_previous; - - for( i = 0; prev; i++ ) - { - prev = prev->m_previous; - } - - return i; -} - -// ----------------------------------------------------------------------------- -// wxListBase -// ----------------------------------------------------------------------------- - -void wxListBase::Init(wxKeyType keyType) -{ - m_nodeFirst = - m_nodeLast = NULL; - m_count = 0; - m_destroy = false; - m_keyType = keyType; -} - -wxListBase::wxListBase(size_t count, void *elements[]) -{ - Init(); - - for ( size_t n = 0; n < count; n++ ) - { - Append(elements[n]); - } -} - -void wxListBase::DoCopy(const wxListBase& list) -{ - wxASSERT_MSG( !list.m_destroy, - wxT("copying list which owns it's elements is a bad idea") ); - - m_destroy = list.m_destroy; - m_keyType = list.m_keyType; - m_nodeFirst = - m_nodeLast = NULL; - - switch (m_keyType) - { - case wxKEY_INTEGER: - { - for ( wxNodeBase *node = list.GetFirst(); node; node = node->GetNext() ) - { - Append(node->GetKeyInteger(), node->GetData()); - } - break; - } - - case wxKEY_STRING: - { - for ( wxNodeBase *node = list.GetFirst(); node; node = node->GetNext() ) - { - Append(node->GetKeyString(), node->GetData()); - } - break; - } - - default: - { - for ( wxNodeBase *node = list.GetFirst(); node; node = node->GetNext() ) - { - Append(node->GetData()); - } - break; - } - } - - wxASSERT_MSG( m_count == list.m_count, wxT("logic error in wxList::DoCopy") ); -} - -wxListBase::~wxListBase() -{ - wxNodeBase *each = m_nodeFirst; - while ( each != NULL ) - { - wxNodeBase *next = each->GetNext(); - DoDeleteNode(each); - each = next; - } -} - -wxNodeBase *wxListBase::AppendCommon(wxNodeBase *node) -{ - if ( !m_nodeFirst ) - { - m_nodeFirst = node; - m_nodeLast = m_nodeFirst; - } - else - { - m_nodeLast->m_next = node; - m_nodeLast = node; - } - - m_count++; - - return node; -} - -wxNodeBase *wxListBase::Append(void *object) -{ - // all objects in a keyed list should have a key - wxCHECK_MSG( m_keyType == wxKEY_NONE, NULL, - wxT("need a key for the object to append") ); - - // we use wxDefaultListKey even though it is the default parameter value - // because gcc under Mac OS X seems to miscompile this call otherwise - wxNodeBase *node = CreateNode(m_nodeLast, NULL, object, - wxDefaultListKey); - - return AppendCommon(node); -} - -wxNodeBase *wxListBase::Append(long key, void *object) -{ - wxCHECK_MSG( (m_keyType == wxKEY_INTEGER) || - (m_keyType == wxKEY_NONE && m_count == 0), - NULL, - wxT("can't append object with numeric key to this list") ); - - wxNodeBase *node = CreateNode(m_nodeLast, NULL, object, key); - return AppendCommon(node); -} - -wxNodeBase *wxListBase::Append (const wxString& key, void *object) -{ - wxCHECK_MSG( (m_keyType == wxKEY_STRING) || - (m_keyType == wxKEY_NONE && m_count == 0), - NULL, - wxT("can't append object with string key to this list") ); - - wxNodeBase *node = CreateNode(m_nodeLast, NULL, object, key); - return AppendCommon(node); -} - -wxNodeBase *wxListBase::Insert(wxNodeBase *position, void *object) -{ - // all objects in a keyed list should have a key - wxCHECK_MSG( m_keyType == wxKEY_NONE, NULL, - wxT("need a key for the object to insert") ); - - wxCHECK_MSG( !position || position->m_list == this, NULL, - wxT("can't insert before a node from another list") ); - - // previous and next node for the node being inserted - wxNodeBase *prev, *next; - if ( position ) - { - prev = position->GetPrevious(); - next = position; - } - else - { - // inserting in the beginning of the list - prev = NULL; - next = m_nodeFirst; - } - - // wxDefaultListKey: see comment in Append() above - wxNodeBase *node = CreateNode(prev, next, object, wxDefaultListKey); - if ( !m_nodeFirst ) - { - m_nodeLast = node; - } - - if ( prev == NULL ) - { - m_nodeFirst = node; - } - - m_count++; - - return node; -} - -wxNodeBase *wxListBase::Item(size_t n) const -{ - for ( wxNodeBase *current = GetFirst(); current; current = current->GetNext() ) - { - if ( n-- == 0 ) - { - return current; - } - } - - wxFAIL_MSG( wxT("invalid index in wxListBase::Item") ); - - return NULL; -} - -wxNodeBase *wxListBase::Find(const wxListKey& key) const -{ - wxASSERT_MSG( m_keyType == key.GetKeyType(), - wxT("this list is not keyed on the type of this key") ); - - for ( wxNodeBase *current = GetFirst(); current; current = current->GetNext() ) - { - if ( key == current->m_key ) - { - return current; - } - } - - // not found - return NULL; -} - -wxNodeBase *wxListBase::Find(const void *object) const -{ - for ( wxNodeBase *current = GetFirst(); current; current = current->GetNext() ) - { - if ( current->GetData() == object ) - return current; - } - - // not found - return NULL; -} - -int wxListBase::IndexOf(void *object) const -{ - wxNodeBase *node = Find( object ); - - return node ? node->IndexOf() : wxNOT_FOUND; -} - -void wxListBase::DoDeleteNode(wxNodeBase *node) -{ - // free node's data - if ( m_keyType == wxKEY_STRING ) - { - free(node->m_key.string); - } - - if ( m_destroy ) - { - node->DeleteData(); - } - - // so that the node knows that it's being deleted by the list - node->m_list = NULL; - delete node; -} - -wxNodeBase *wxListBase::DetachNode(wxNodeBase *node) -{ - wxCHECK_MSG( node, NULL, wxT("detaching NULL wxNodeBase") ); - wxCHECK_MSG( node->m_list == this, NULL, - wxT("detaching node which is not from this list") ); - - // update the list - wxNodeBase **prevNext = node->GetPrevious() ? &node->GetPrevious()->m_next - : &m_nodeFirst; - wxNodeBase **nextPrev = node->GetNext() ? &node->GetNext()->m_previous - : &m_nodeLast; - - *prevNext = node->GetNext(); - *nextPrev = node->GetPrevious(); - - m_count--; - - // mark the node as not belonging to this list any more - node->m_list = NULL; - - return node; -} - -bool wxListBase::DeleteNode(wxNodeBase *node) -{ - if ( !DetachNode(node) ) - return false; - - DoDeleteNode(node); - - return true; -} - -bool wxListBase::DeleteObject(void *object) -{ - for ( wxNodeBase *current = GetFirst(); current; current = current->GetNext() ) - { - if ( current->GetData() == object ) - { - DeleteNode(current); - return true; - } - } - - // not found - return false; -} - -void wxListBase::Clear() -{ - wxNodeBase *current = m_nodeFirst; - while ( current ) - { - wxNodeBase *next = current->GetNext(); - DoDeleteNode(current); - current = next; - } - - m_nodeFirst = - m_nodeLast = NULL; - - m_count = 0; -} - -void wxListBase::ForEach(wxListIterateFunction F) -{ - for ( wxNodeBase *current = GetFirst(); current; current = current->GetNext() ) - { - (*F)(current->GetData()); - } -} - -void *wxListBase::FirstThat(wxListIterateFunction F) -{ - for ( wxNodeBase *current = GetFirst(); current; current = current->GetNext() ) - { - if ( (*F)(current->GetData()) ) - return current->GetData(); - } - - return NULL; -} - -void *wxListBase::LastThat(wxListIterateFunction F) -{ - for ( wxNodeBase *current = GetLast(); current; current = current->GetPrevious() ) - { - if ( (*F)(current->GetData()) ) - return current->GetData(); - } - - return NULL; -} - -// (stefan.hammes@urz.uni-heidelberg.de) -// -// function for sorting lists. the concept is borrowed from 'qsort'. -// by giving a sort function, arbitrary lists can be sorted. -// method: -// - put wxObject pointers into an array -// - sort the array with qsort -// - put back the sorted wxObject pointers into the list -// -// CAVE: the sort function receives pointers to wxObject pointers (wxObject **), -// so dereference right! -// EXAMPLE: -// int listcompare(const void *arg1, const void *arg2) -// { -// return(compare(**(wxString **)arg1, -// **(wxString **)arg2)); -// } -// -// void main() -// { -// wxListBase list; -// -// list.Append(new wxString("DEF")); -// list.Append(new wxString("GHI")); -// list.Append(new wxString("ABC")); -// list.Sort(listcompare); -// } - -void wxListBase::Sort(const wxSortCompareFunction compfunc) -{ - // allocate an array for the wxObject pointers of the list - const size_t num = GetCount(); - void **objArray = new void *[num]; - void **objPtr = objArray; - - // go through the list and put the pointers into the array - wxNodeBase *node; - for ( node = GetFirst(); node; node = node->GetNext() ) - { - *objPtr++ = node->GetData(); - } - - // sort the array - qsort((void *)objArray,num,sizeof(wxObject *), - compfunc); - - // put the sorted pointers back into the list - objPtr = objArray; - for ( node = GetFirst(); node; node = node->GetNext() ) - { - node->SetData(*objPtr++); - } - - // free the array - delete[] objArray; -} - -void wxListBase::Reverse() -{ - wxNodeBase* node = m_nodeFirst; - wxNodeBase* tmp; - - while (node) - { - // swap prev and next pointers - tmp = node->m_next; - node->m_next = node->m_previous; - node->m_previous = tmp; - - // this is the node that was next before swapping - node = tmp; - } - - // swap first and last node - tmp = m_nodeFirst; m_nodeFirst = m_nodeLast; m_nodeLast = tmp; -} - -void wxListBase::DeleteNodes(wxNodeBase* first, wxNodeBase* last) -{ - wxNodeBase* node = first; - - while (node != last) - { - wxNodeBase* next = node->GetNext(); - DeleteNode(node); - node = next; - } -} - -// ============================================================================ -// compatibility section from now on -// ============================================================================ - -#ifdef wxLIST_COMPATIBILITY - -// ----------------------------------------------------------------------------- -// wxList (a.k.a. wxObjectList) -// ----------------------------------------------------------------------------- - -wxList::wxList( int key_type ) - : wxObjectList( (wxKeyType)key_type ) -{ -} - -void wxObjectListNode::DeleteData() -{ - delete (wxObject *)GetData(); -} - -// ---------------------------------------------------------------------------- -// wxStringList -// ---------------------------------------------------------------------------- - -static inline wxChar* MYcopystring(const wxChar* s) -{ - wxChar* copy = new wxChar[wxStrlen(s) + 1]; - return wxStrcpy(copy, s); -} - -// instead of WX_DEFINE_LIST(wxStringListBase) we define this function -// ourselves -void wxStringListNode::DeleteData() -{ - delete [] (char *)GetData(); -} - -bool wxStringList::Delete(const wxChar *s) -{ - wxStringListNode *current; - - for ( current = GetFirst(); current; current = current->GetNext() ) - { - if ( wxStrcmp(current->GetData(), s) == 0 ) - { - DeleteNode(current); - return true; - } - } - - // not found - return false; -} - -void wxStringList::DoCopy(const wxStringList& other) -{ - wxASSERT( GetCount() == 0 ); // this list must be empty before copying! - - size_t count = other.GetCount(); - for ( size_t n = 0; n < count; n++ ) - { - Add(other.Item(n)->GetData()); - } -} - -wxStringList::wxStringList() -{ - DeleteContents(true); -} - -// Variable argument list, terminated by a zero -// Makes new storage for the strings -wxStringList::wxStringList (const wxChar *first, ...) -{ - DeleteContents(true); - if ( !first ) - return; - - va_list ap; - va_start(ap, first); - - const wxChar *s = first; - for (;;) - { - Add(s); - - // icc gives this warning in its own va_arg() macro, argh -#ifdef __INTELC__ - #pragma warning(push) - #pragma warning(disable: 1684) -#endif - - s = va_arg(ap, const wxChar *); - -#ifdef __INTELC__ - #pragma warning(pop) -#endif - - if ( !s ) - break; - } - - va_end(ap); -} - -// Only makes new strings if arg is true -wxChar **wxStringList::ListToArray(bool new_copies) const -{ - wxChar **string_array = new wxChar *[GetCount()]; - wxStringListNode *node = GetFirst(); - for (size_t i = 0; i < GetCount(); i++) - { - wxChar *s = node->GetData(); - if ( new_copies ) - string_array[i] = MYcopystring(s); - else - string_array[i] = s; - node = node->GetNext(); - } - - return string_array; -} - -// Checks whether s is a member of the list -bool wxStringList::Member(const wxChar *s) const -{ - for ( wxStringListNode *node = GetFirst(); node; node = node->GetNext() ) - { - const wxChar *s1 = node->GetData(); - if (s == s1 || wxStrcmp (s, s1) == 0) - return true; - } - - return false; -} - -extern "C" -{ -static int LINKAGEMODE - -wx_comparestrings(const void *arg1, const void *arg2) -{ - wxChar **s1 = (wxChar **) arg1; - wxChar **s2 = (wxChar **) arg2; - - return wxStrcmp (*s1, *s2); -} - -} // end of extern "C" (required because of GCC Bug c++/33078 - -// Sort a list of strings - deallocates old nodes, allocates new -void wxStringList::Sort() -{ - size_t N = GetCount(); - wxChar **array = new wxChar *[N]; - wxStringListNode *node; - - size_t i = 0; - for ( node = GetFirst(); node; node = node->GetNext() ) - { - array[i++] = node->GetData(); - } - - qsort (array, N, sizeof (wxChar *), wx_comparestrings); - - i = 0; - for ( node = GetFirst(); node; node = node->GetNext() ) - node->SetData( array[i++] ); - - delete [] array; -} - -wxNode *wxStringList::Add(const wxChar *s) -{ - return (wxNode *)(wxStringListBase::Node *) - wxStringListBase::Append(MYcopystring(s)); -} - -wxNode *wxStringList::Prepend(const wxChar *s) -{ - return (wxNode *)(wxStringListBase::Node *) - wxStringListBase::Insert(MYcopystring(s)); -} - -#endif // wxLIST_COMPATIBILITY - -#else // wxUSE_STD_CONTAINERS = 1 - - #include "wx/listimpl.cpp" - WX_DEFINE_LIST(wxObjectList) - -// with wxUSE_STD_CONTAINERS wxStringList contains wxString objects, not pointers -void _WX_LIST_HELPER_wxStringListBase::DeleteFunction( wxString WXUNUSED(X) ) -{ -} - -_WX_LIST_HELPER_wxStringListBase::BaseListType _WX_LIST_HELPER_wxStringListBase::EmptyList; - -#endif // !wxUSE_STD_CONTAINERS diff --git a/Externals/wxWidgets3/src/common/listctrlcmn.cpp b/Externals/wxWidgets3/src/common/listctrlcmn.cpp deleted file mode 100644 index 25f29b8042..0000000000 --- a/Externals/wxWidgets3/src/common/listctrlcmn.cpp +++ /dev/null @@ -1,254 +0,0 @@ -//////////////////////////////////////////////////////////////////////////////// -// Name: src/common/listctrlcmn.cpp -// Purpose: Common defines for wxListCtrl and wxListCtrl-based classes. -// Author: Kevin Ollivier -// Created: 09/15/06 -// Copyright: (c) Kevin Ollivier -// Licence: wxWindows licence -//////////////////////////////////////////////////////////////////////////////// - -// ============================================================================= -// declarations -// ============================================================================= - -// ----------------------------------------------------------------------------- -// headers -// ----------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_LISTCTRL - -#include "wx/listctrl.h" - -#ifndef WX_PRECOMP - #include "wx/dcclient.h" -#endif - -const char wxListCtrlNameStr[] = "listCtrl"; - -// ListCtrl events -wxDEFINE_EVENT( wxEVT_LIST_BEGIN_DRAG, wxListEvent ); -wxDEFINE_EVENT( wxEVT_LIST_BEGIN_RDRAG, wxListEvent ); -wxDEFINE_EVENT( wxEVT_LIST_BEGIN_LABEL_EDIT, wxListEvent ); -wxDEFINE_EVENT( wxEVT_LIST_END_LABEL_EDIT, wxListEvent ); -wxDEFINE_EVENT( wxEVT_LIST_DELETE_ITEM, wxListEvent ); -wxDEFINE_EVENT( wxEVT_LIST_DELETE_ALL_ITEMS, wxListEvent ); -wxDEFINE_EVENT( wxEVT_LIST_ITEM_SELECTED, wxListEvent ); -wxDEFINE_EVENT( wxEVT_LIST_ITEM_DESELECTED, wxListEvent ); -wxDEFINE_EVENT( wxEVT_LIST_KEY_DOWN, wxListEvent ); -wxDEFINE_EVENT( wxEVT_LIST_INSERT_ITEM, wxListEvent ); -wxDEFINE_EVENT( wxEVT_LIST_COL_CLICK, wxListEvent ); -wxDEFINE_EVENT( wxEVT_LIST_COL_RIGHT_CLICK, wxListEvent ); -wxDEFINE_EVENT( wxEVT_LIST_COL_BEGIN_DRAG, wxListEvent ); -wxDEFINE_EVENT( wxEVT_LIST_COL_DRAGGING, wxListEvent ); -wxDEFINE_EVENT( wxEVT_LIST_COL_END_DRAG, wxListEvent ); -wxDEFINE_EVENT( wxEVT_LIST_ITEM_RIGHT_CLICK, wxListEvent ); -wxDEFINE_EVENT( wxEVT_LIST_ITEM_MIDDLE_CLICK, wxListEvent ); -wxDEFINE_EVENT( wxEVT_LIST_ITEM_ACTIVATED, wxListEvent ); -wxDEFINE_EVENT( wxEVT_LIST_ITEM_FOCUSED, wxListEvent ); -wxDEFINE_EVENT( wxEVT_LIST_ITEM_CHECKED, wxListEvent ); -wxDEFINE_EVENT( wxEVT_LIST_ITEM_UNCHECKED, wxListEvent ); -wxDEFINE_EVENT( wxEVT_LIST_CACHE_HINT, wxListEvent ); - -// ----------------------------------------------------------------------------- -// XTI -// ----------------------------------------------------------------------------- - -wxDEFINE_FLAGS( wxListCtrlStyle ) -wxBEGIN_FLAGS( wxListCtrlStyle ) -// new style border flags, we put them first to -// use them for streaming out -wxFLAGS_MEMBER(wxBORDER_SIMPLE) -wxFLAGS_MEMBER(wxBORDER_SUNKEN) -wxFLAGS_MEMBER(wxBORDER_DOUBLE) -wxFLAGS_MEMBER(wxBORDER_RAISED) -wxFLAGS_MEMBER(wxBORDER_STATIC) -wxFLAGS_MEMBER(wxBORDER_NONE) - -// old style border flags -wxFLAGS_MEMBER(wxSIMPLE_BORDER) -wxFLAGS_MEMBER(wxSUNKEN_BORDER) -wxFLAGS_MEMBER(wxDOUBLE_BORDER) -wxFLAGS_MEMBER(wxRAISED_BORDER) -wxFLAGS_MEMBER(wxSTATIC_BORDER) -wxFLAGS_MEMBER(wxBORDER) - -// standard window styles -wxFLAGS_MEMBER(wxTAB_TRAVERSAL) -wxFLAGS_MEMBER(wxCLIP_CHILDREN) -wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) -wxFLAGS_MEMBER(wxWANTS_CHARS) -wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE) -wxFLAGS_MEMBER(wxALWAYS_SHOW_SB ) -wxFLAGS_MEMBER(wxVSCROLL) -wxFLAGS_MEMBER(wxHSCROLL) - -wxFLAGS_MEMBER(wxLC_LIST) -wxFLAGS_MEMBER(wxLC_REPORT) -wxFLAGS_MEMBER(wxLC_ICON) -wxFLAGS_MEMBER(wxLC_SMALL_ICON) -wxFLAGS_MEMBER(wxLC_ALIGN_TOP) -wxFLAGS_MEMBER(wxLC_ALIGN_LEFT) -wxFLAGS_MEMBER(wxLC_AUTOARRANGE) -wxFLAGS_MEMBER(wxLC_USER_TEXT) -wxFLAGS_MEMBER(wxLC_EDIT_LABELS) -wxFLAGS_MEMBER(wxLC_NO_HEADER) -wxFLAGS_MEMBER(wxLC_SINGLE_SEL) -wxFLAGS_MEMBER(wxLC_SORT_ASCENDING) -wxFLAGS_MEMBER(wxLC_SORT_DESCENDING) -wxFLAGS_MEMBER(wxLC_VIRTUAL) -wxEND_FLAGS( wxListCtrlStyle ) - -#if ((!defined(__WXMSW__) && !defined(__WXQT__) && !(defined(__WXMAC__) && wxOSX_USE_CARBON)) || defined(__WXUNIVERSAL__)) -wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxListCtrl, wxGenericListCtrl, "wx/listctrl.h"); -#else -wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxListCtrl, wxControl, "wx/listctrl.h"); -#endif - -wxBEGIN_PROPERTIES_TABLE(wxListCtrl) -wxEVENT_PROPERTY( TextUpdated, wxEVT_TEXT, wxCommandEvent ) - -wxPROPERTY_FLAGS( WindowStyle, wxListCtrlStyle, long, SetWindowStyleFlag, \ - GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \ - wxT("Helpstring"), wxT("group")) // style -wxEND_PROPERTIES_TABLE() - -wxEMPTY_HANDLERS_TABLE(wxListCtrl) - -wxCONSTRUCTOR_5( wxListCtrl, wxWindow*, Parent, wxWindowID, Id, \ - wxPoint, Position, wxSize, Size, long, WindowStyle ) - -/* - TODO : Expose more information of a list's layout etc. via appropriate objects - (see NotebookPageInfo) - */ - -wxIMPLEMENT_DYNAMIC_CLASS(wxListView, wxListCtrl); -wxIMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject); -wxIMPLEMENT_DYNAMIC_CLASS(wxListEvent, wxNotifyEvent); - -// ---------------------------------------------------------------------------- -// wxListCtrlBase implementation -// ---------------------------------------------------------------------------- - -long -wxListCtrlBase::AppendColumn(const wxString& heading, - wxListColumnFormat format, - int width) -{ - return InsertColumn(GetColumnCount(), heading, format, width); -} - -long -wxListCtrlBase::InsertColumn(long col, - const wxString& heading, - int format, - int width) -{ - wxListItem item; - item.m_mask = wxLIST_MASK_TEXT | wxLIST_MASK_FORMAT; - item.m_text = heading; - if ( width >= 0 - || width == wxLIST_AUTOSIZE - || width == wxLIST_AUTOSIZE_USEHEADER ) - { - item.m_mask |= wxLIST_MASK_WIDTH; - item.m_width = width; - } - item.m_format = format; - - return InsertColumn(col, item); -} - -long wxListCtrlBase::InsertColumn(long col, const wxListItem& info) -{ - long rc = DoInsertColumn(col, info); - if ( rc != -1 ) - { - // As our best size calculation depends on the column headers, - // invalidate the previously cached best size when a column is added. - InvalidateBestSize(); - } - - return rc; -} - -wxSize wxListCtrlBase::DoGetBestClientSize() const -{ - // There is no obvious way to determine the best size in icon and list - // modes so just don't do it for now. - if ( !InReportView() ) - return wxControl::DoGetBestClientSize(); - - int totalWidth; - wxClientDC dc(const_cast(this)); - - // In report mode, we use only the column headers, not items, to determine - // the best width. The reason for this is that it's easier (we can't just - // iterate over all items, especially not in a virtual control, so we'd - // have to do something relatively complicated such as checking the size of - // some items in the beginning and the end only) and also because the - // columns are usually static while the list contents is dynamic so it - // usually doesn't make much sense to adjust the control size to it anyhow. - // And finally, scrollbars can always be used with the items while the - // headers are just truncated if there is not enough place for them. - const int columns = GetColumnCount(); - if ( HasFlag(wxLC_NO_HEADER) || !columns ) - { - // Use some arbitrary width. - totalWidth = 50*dc.GetCharWidth(); - } - else // We do have columns, use them to determine the best width. - { - totalWidth = 0; - for ( int col = 0; col < columns; col++ ) - { - totalWidth += GetColumnWidth(col); - } - } - - // Use some arbitrary height, there is no good way to determine it. - return wxSize(totalWidth, 10*dc.GetCharHeight()); -} - -void wxListCtrlBase::SetAlternateRowColour(const wxColour& colour) -{ - wxASSERT(HasFlag(wxLC_VIRTUAL)); - m_alternateRowColour.SetBackgroundColour(colour); -} - -void wxListCtrlBase::EnableAlternateRowColours(bool enable) -{ - if ( enable ) - { - // This code is copied from wxDataViewMainWindow::OnPaint() - - // Determine the alternate rows colour automatically from the - // background colour. - const wxColour bgColour = GetBackgroundColour(); - - // Depending on the background, alternate row color - // will be 3% more dark or 50% brighter. - int alpha = bgColour.GetRGB() > 0x808080 ? 97 : 150; - SetAlternateRowColour(bgColour.ChangeLightness(alpha)); - } - else // Disable striping by setting invalid alternative colour. - { - SetAlternateRowColour(wxColour()); - } -} - -wxListItemAttr *wxListCtrlBase::OnGetItemAttr(long item) const -{ - return (m_alternateRowColour.GetBackgroundColour().IsOk() && (item % 2)) - ? wxConstCast(&m_alternateRowColour, wxListItemAttr) - : NULL; // no attributes by default -} - -#endif // wxUSE_LISTCTRL diff --git a/Externals/wxWidgets3/src/common/log.cpp b/Externals/wxWidgets3/src/common/log.cpp deleted file mode 100644 index 94a6aede7b..0000000000 --- a/Externals/wxWidgets3/src/common/log.cpp +++ /dev/null @@ -1,1122 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/log.cpp -// Purpose: Assorted wxLogXXX functions, and wxLog (sink for logs) -// Author: Vadim Zeitlin -// Modified by: -// Created: 29/01/98 -// Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_LOG - -// wxWidgets -#ifndef WX_PRECOMP - #include "wx/log.h" - #include "wx/app.h" - #include "wx/arrstr.h" - #include "wx/intl.h" - #include "wx/string.h" - #include "wx/utils.h" -#endif //WX_PRECOMP - -#include "wx/apptrait.h" -#include "wx/datetime.h" -#include "wx/file.h" -#include "wx/msgout.h" -#include "wx/textfile.h" -#include "wx/thread.h" -#include "wx/private/threadinfo.h" -#include "wx/crt.h" -#include "wx/vector.h" - -// other standard headers -#include - -#include - -#include - -#if defined(__WINDOWS__) - #include "wx/msw/private.h" // includes windows.h -#endif - -#undef wxLOG_COMPONENT -const char *wxLOG_COMPONENT = ""; - -// this macro allows to define an object which will be initialized before any -// other function in this file is called: this is necessary to allow log -// functions to be used during static initialization (this is not advisable -// anyhow but we should at least try to not crash) and to also ensure that they -// are initialized by the time static initialization is done, i.e. before any -// threads are created hopefully -// -// the net effect of all this is that you can use Get##name() function to -// access the object without worrying about it being not initialized -// -// see also WX_DEFINE_GLOBAL_CONV2() in src/common/strconv.cpp -#define WX_DEFINE_GLOBAL_VAR(type, name) \ - inline type& Get##name() \ - { \ - static type s_##name; \ - return s_##name; \ - } \ - \ - type *gs_##name##Ptr = &Get##name() - -#if wxUSE_THREADS - -namespace -{ - -// contains messages logged by the other threads and waiting to be shown until -// Flush() is called in the main one -typedef wxVector wxLogRecords; -wxLogRecords gs_bufferedLogRecords; - -#define WX_DEFINE_LOG_CS(name) WX_DEFINE_GLOBAL_VAR(wxCriticalSection, name##CS) - -// this critical section is used for buffering the messages from threads other -// than main, i.e. it protects all accesses to gs_bufferedLogRecords above -WX_DEFINE_LOG_CS(BackgroundLog); - -// this one is used for protecting TraceMasks() from concurrent access -WX_DEFINE_LOG_CS(TraceMask); - -// and this one is used for GetComponentLevels() -WX_DEFINE_LOG_CS(Levels); - -} // anonymous namespace - -#endif // wxUSE_THREADS - -// ---------------------------------------------------------------------------- -// non member functions -// ---------------------------------------------------------------------------- - -// define this to enable wrapping of log messages -//#define LOG_PRETTY_WRAP - -#ifdef LOG_PRETTY_WRAP - static void wxLogWrap(FILE *f, const char *pszPrefix, const char *psz); -#endif - -// ---------------------------------------------------------------------------- -// module globals -// ---------------------------------------------------------------------------- - -namespace -{ - -// this struct is used to store information about the previous log message used -// by OnLog() to (optionally) avoid logging multiple copies of the same message -struct PreviousLogInfo -{ - PreviousLogInfo() - { - numRepeated = 0; - } - - - // previous message itself - wxString msg; - - // its level - wxLogLevel level; - - // other information about it - wxLogRecordInfo info; - - // the number of times it was already repeated - unsigned numRepeated; -}; - -PreviousLogInfo gs_prevLog; - - -// map containing all components for which log level was explicitly set -// -// NB: all accesses to it must be protected by GetLevelsCS() critical section -WX_DEFINE_GLOBAL_VAR(wxStringToNumHashMap, ComponentLevels); - -// ---------------------------------------------------------------------------- -// wxLogOutputBest: wxLog wrapper around wxMessageOutputBest -// ---------------------------------------------------------------------------- - -class wxLogOutputBest : public wxLog -{ -public: - wxLogOutputBest() { } - -protected: - virtual void DoLogText(const wxString& msg) wxOVERRIDE - { - wxMessageOutputBest().Output(msg); - } - -private: - wxDECLARE_NO_COPY_CLASS(wxLogOutputBest); -}; - -} // anonymous namespace - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// helper global functions -// ---------------------------------------------------------------------------- - -void wxSafeShowMessage(const wxString& title, const wxString& text) -{ -#ifdef __WINDOWS__ - ::MessageBox(NULL, text.t_str(), title.t_str(), MB_OK | MB_ICONSTOP); -#else - wxFprintf(stderr, wxS("%s: %s\n"), title.c_str(), text.c_str()); - fflush(stderr); -#endif -} - -// ---------------------------------------------------------------------------- -// wxLogFormatter class implementation -// ---------------------------------------------------------------------------- - -wxString -wxLogFormatter::Format(wxLogLevel level, - const wxString& msg, - const wxLogRecordInfo& info) const -{ - wxString prefix; - - // don't time stamp debug messages under MSW as debug viewers usually - // already have an option to do it -#ifdef __WINDOWS__ - if ( level != wxLOG_Debug && level != wxLOG_Trace ) -#endif // __WINDOWS__ - prefix = FormatTime(info.timestamp); - - switch ( level ) - { - case wxLOG_Error: - prefix += _("Error: "); - break; - - case wxLOG_Warning: - prefix += _("Warning: "); - break; - - // don't prepend "debug/trace" prefix under MSW as it goes to the debug - // window anyhow and so can't be confused with something else -#ifndef __WINDOWS__ - case wxLOG_Debug: - // this prefix (as well as the one below) is intentionally not - // translated as nobody translates debug messages anyhow - prefix += "Debug: "; - break; - - case wxLOG_Trace: - prefix += "Trace: "; - break; -#endif // !__WINDOWS__ - } - - return prefix + msg; -} - -wxString -wxLogFormatter::FormatTime(time_t t) const -{ - wxString str; - wxLog::TimeStamp(&str, t); - - return str; -} - - -// ---------------------------------------------------------------------------- -// wxLog class implementation -// ---------------------------------------------------------------------------- - -unsigned wxLog::LogLastRepeatIfNeeded() -{ - const unsigned count = gs_prevLog.numRepeated; - - if ( gs_prevLog.numRepeated ) - { - wxString msg; -#if wxUSE_INTL - if ( gs_prevLog.numRepeated == 1 ) - { - // We use a separate message for this case as "repeated 1 time" - // looks somewhat strange. - msg = _("The previous message repeated once."); - } - else - { - // Notice that we still use wxPLURAL() to ensure that multiple - // numbers of times are correctly formatted, even though we never - // actually use the singular string. - msg.Printf(wxPLURAL("The previous message repeated %u time.", - "The previous message repeated %u times.", - gs_prevLog.numRepeated), - gs_prevLog.numRepeated); - } -#else - msg.Printf(wxS("The previous message was repeated %u time(s)."), - gs_prevLog.numRepeated); -#endif - gs_prevLog.numRepeated = 0; - gs_prevLog.msg.clear(); - DoLogRecord(gs_prevLog.level, msg, gs_prevLog.info); - } - - return count; -} - -wxLog::~wxLog() -{ - // Flush() must be called before destroying the object as otherwise some - // messages could be lost - if ( gs_prevLog.numRepeated ) - { - wxMessageOutputDebug().Printf - ( -#if wxUSE_INTL - wxPLURAL - ( - "Last repeated message (\"%s\", %u time) wasn't output", - "Last repeated message (\"%s\", %u times) wasn't output", - gs_prevLog.numRepeated - ), -#else - wxS("Last repeated message (\"%s\", %u time(s)) wasn't output"), -#endif - gs_prevLog.msg, - gs_prevLog.numRepeated - ); - } - - delete m_formatter; -} - -// ---------------------------------------------------------------------------- -// wxLog logging functions -// ---------------------------------------------------------------------------- - -/* static */ -void -wxLog::OnLog(wxLogLevel level, const wxString& msg, time_t t) -{ - wxLogRecordInfo info; - info.timestamp = t; -#if wxUSE_THREADS - info.threadId = wxThread::GetCurrentId(); -#endif // wxUSE_THREADS - - OnLog(level, msg, info); -} - -/* static */ -void -wxLog::OnLog(wxLogLevel level, - const wxString& msg, - const wxLogRecordInfo& info) -{ - // fatal errors can't be suppressed nor handled by the custom log target - // and always terminate the program - if ( level == wxLOG_FatalError ) - { - wxSafeShowMessage(wxS("Fatal Error"), msg); - - wxAbort(); - } - - wxLog *logger; - -#if wxUSE_THREADS - if ( !wxThread::IsMain() ) - { - logger = wxThreadInfo.logger; - if ( !logger ) - { - if ( ms_pLogger ) - { - // buffer the messages until they can be shown from the main - // thread - wxCriticalSectionLocker lock(GetBackgroundLogCS()); - - gs_bufferedLogRecords.push_back(wxLogRecord(level, msg, info)); - - // ensure that our Flush() will be called soon - wxWakeUpIdle(); - } - //else: we don't have any logger at all, there is no need to log - // anything - - return; - } - //else: we have a thread-specific logger, we can send messages to it - // directly - } - else -#endif // wxUSE_THREADS - { - logger = GetMainThreadActiveTarget(); - if ( !logger ) - return; - } - - logger->CallDoLogNow(level, msg, info); -} - -void -wxLog::CallDoLogNow(wxLogLevel level, - const wxString& msg, - const wxLogRecordInfo& info) -{ - if ( GetRepetitionCounting() ) - { - if ( msg == gs_prevLog.msg ) - { - gs_prevLog.numRepeated++; - - // nothing else to do, in particular, don't log the - // repeated message - return; - } - - LogLastRepeatIfNeeded(); - - // reset repetition counter for a new message - gs_prevLog.msg = msg; - gs_prevLog.level = level; - gs_prevLog.info = info; - } - - // handle extra data which may be passed to us by wxLogXXX() - wxString prefix, suffix; - wxUIntPtr num = 0; - if ( info.GetNumValue(wxLOG_KEY_SYS_ERROR_CODE, &num) ) - { - const long err = static_cast(num); - - suffix.Printf(_(" (error %ld: %s)"), err, wxSysErrorMsg(err)); - } - -#if wxUSE_LOG_TRACE - wxString str; - if ( level == wxLOG_Trace && info.GetStrValue(wxLOG_KEY_TRACE_MASK, &str) ) - { - prefix = "(" + str + ") "; - } -#endif // wxUSE_LOG_TRACE - - DoLogRecord(level, prefix + msg + suffix, info); -} - -void wxLog::DoLogRecord(wxLogLevel level, - const wxString& msg, - const wxLogRecordInfo& info) -{ -#if WXWIN_COMPATIBILITY_2_8 - // call the old DoLog() to ensure that existing custom log classes still - // work - // - // as the user code could have defined it as either taking "const char *" - // (in ANSI build) or "const wxChar *" (in ANSI/Unicode), we have no choice - // but to call both of them - DoLog(level, (const char*)msg.mb_str(), info.timestamp); - DoLog(level, (const wchar_t*)msg.wc_str(), info.timestamp); -#else // !WXWIN_COMPATIBILITY_2_8 - wxUnusedVar(info); -#endif // WXWIN_COMPATIBILITY_2_8/!WXWIN_COMPATIBILITY_2_8 - - // Use wxLogFormatter to format the message - DoLogTextAtLevel(level, m_formatter->Format (level, msg, info)); -} - -void wxLog::DoLogTextAtLevel(wxLogLevel level, const wxString& msg) -{ - // we know about debug messages (because using wxMessageOutputDebug is the - // right thing to do in 99% of all cases and also for compatibility) but - // anything else needs to be handled in the derived class - if ( level == wxLOG_Debug || level == wxLOG_Trace ) - { - wxMessageOutputDebug().Output(msg + wxS('\n')); - } - else - { - DoLogText(msg); - } -} - -void wxLog::DoLogText(const wxString& WXUNUSED(msg)) -{ - // in 2.8-compatible build the derived class might override DoLog() or - // DoLogString() instead so we can't have this assert there -#if !WXWIN_COMPATIBILITY_2_8 - wxFAIL_MSG( "must be overridden if it is called" ); -#endif // WXWIN_COMPATIBILITY_2_8 -} - -#if WXWIN_COMPATIBILITY_2_8 - -void wxLog::DoLog(wxLogLevel WXUNUSED(level), const char *szString, time_t t) -{ - DoLogString(szString, t); -} - -void wxLog::DoLog(wxLogLevel WXUNUSED(level), const wchar_t *wzString, time_t t) -{ - DoLogString(wzString, t); -} - -#endif // WXWIN_COMPATIBILITY_2_8 - -// ---------------------------------------------------------------------------- -// wxLog active target management -// ---------------------------------------------------------------------------- - -wxLog *wxLog::GetActiveTarget() -{ -#if wxUSE_THREADS - if ( !wxThread::IsMain() ) - { - // check if we have a thread-specific log target - wxLog * const logger = wxThreadInfo.logger; - - // the code below should be only executed for the main thread as - // CreateLogTarget() is not meant for auto-creating log targets for - // worker threads so skip it in any case - return logger ? logger : ms_pLogger; - } -#endif // wxUSE_THREADS - - return GetMainThreadActiveTarget(); -} - -/* static */ -wxLog *wxLog::GetMainThreadActiveTarget() -{ - if ( ms_bAutoCreate && ms_pLogger == NULL ) { - // prevent infinite recursion if someone calls wxLogXXX() from - // wxApp::CreateLogTarget() - static bool s_bInGetActiveTarget = false; - if ( !s_bInGetActiveTarget ) { - s_bInGetActiveTarget = true; - - // ask the application to create a log target for us - if ( wxTheApp != NULL ) - ms_pLogger = wxTheApp->GetTraits()->CreateLogTarget(); - else - ms_pLogger = new wxLogOutputBest; - - s_bInGetActiveTarget = false; - - // do nothing if it fails - what can we do? - } - } - - return ms_pLogger; -} - -wxLog *wxLog::SetActiveTarget(wxLog *pLogger) -{ - if ( ms_pLogger != NULL ) { - // flush the old messages before changing because otherwise they might - // get lost later if this target is not restored - ms_pLogger->Flush(); - } - - wxLog *pOldLogger = ms_pLogger; - ms_pLogger = pLogger; - - return pOldLogger; -} - -#if wxUSE_THREADS -/* static */ -wxLog *wxLog::SetThreadActiveTarget(wxLog *logger) -{ - wxASSERT_MSG( !wxThread::IsMain(), "use SetActiveTarget() for main thread" ); - - wxLog * const oldLogger = wxThreadInfo.logger; - if ( oldLogger ) - oldLogger->Flush(); - - wxThreadInfo.logger = logger; - - return oldLogger; -} -#endif // wxUSE_THREADS - -void wxLog::DontCreateOnDemand() -{ - ms_bAutoCreate = false; - - // this is usually called at the end of the program and we assume that it - // is *always* called at the end - so we free memory here to avoid false - // memory leak reports from wxWin memory tracking code - ClearTraceMasks(); -} - -void wxLog::DoCreateOnDemand() -{ - ms_bAutoCreate = true; -} - -// ---------------------------------------------------------------------------- -// wxLog components levels -// ---------------------------------------------------------------------------- - -/* static */ -void wxLog::SetComponentLevel(const wxString& component, wxLogLevel level) -{ - if ( component.empty() ) - { - SetLogLevel(level); - } - else - { - wxCRIT_SECT_LOCKER(lock, GetLevelsCS()); - - GetComponentLevels()[component] = level; - } -} - -/* static */ -wxLogLevel wxLog::GetComponentLevel(wxString component) -{ - wxCRIT_SECT_LOCKER(lock, GetLevelsCS()); - - const wxStringToNumHashMap& componentLevels = GetComponentLevels(); - while ( !component.empty() ) - { - wxStringToNumHashMap::const_iterator - it = componentLevels.find(component); - if ( it != componentLevels.end() ) - return static_cast(it->second); - - component = component.BeforeLast('/'); - } - - return GetLogLevel(); -} - -// ---------------------------------------------------------------------------- -// wxLog trace masks -// ---------------------------------------------------------------------------- - -namespace -{ - -// because IsAllowedTraceMask() may be called during static initialization -// (this is not recommended but it may still happen, see #11592) we can't use a -// simple static variable which might be not initialized itself just yet to -// store the trace masks, but need this accessor function which will ensure -// that the variable is always correctly initialized before being accessed -// -// notice that this doesn't make accessing it MT-safe, of course, you need to -// serialize accesses to it using GetTraceMaskCS() for this -wxArrayString& TraceMasks() -{ - static wxArrayString s_traceMasks; - - return s_traceMasks; -} - -} // anonymous namespace - -/* static */ const wxArrayString& wxLog::GetTraceMasks() -{ - // because of this function signature (it returns a reference, not the - // object), it is inherently MT-unsafe so there is no need to acquire the - // lock here anyhow - - return TraceMasks(); -} - -void wxLog::AddTraceMask(const wxString& str) -{ - wxCRIT_SECT_LOCKER(lock, GetTraceMaskCS()); - - TraceMasks().push_back(str); -} - -void wxLog::RemoveTraceMask(const wxString& str) -{ - wxCRIT_SECT_LOCKER(lock, GetTraceMaskCS()); - - int index = TraceMasks().Index(str); - if ( index != wxNOT_FOUND ) - TraceMasks().RemoveAt((size_t)index); -} - -void wxLog::ClearTraceMasks() -{ - wxCRIT_SECT_LOCKER(lock, GetTraceMaskCS()); - - TraceMasks().Clear(); -} - -/*static*/ bool wxLog::IsAllowedTraceMask(const wxString& mask) -{ - wxCRIT_SECT_LOCKER(lock, GetTraceMaskCS()); - - const wxArrayString& masks = GetTraceMasks(); - for ( wxArrayString::const_iterator it = masks.begin(), - en = masks.end(); - it != en; - ++it ) - { - if ( *it == mask) - return true; - } - - return false; -} - -// ---------------------------------------------------------------------------- -// wxLog miscellaneous other methods -// ---------------------------------------------------------------------------- - -#if wxUSE_DATETIME - -void wxLog::TimeStamp(wxString *str) -{ - if ( !ms_timestamp.empty() ) - { - *str = wxDateTime::UNow().Format(ms_timestamp); - *str += wxS(": "); - } -} - -void wxLog::TimeStamp(wxString *str, time_t t) -{ - if ( !ms_timestamp.empty() ) - { - *str = wxDateTime(t).Format(ms_timestamp); - *str += wxS(": "); - } -} - -#else // !wxUSE_DATETIME - -void wxLog::TimeStamp(wxString*) -{ -} - -void wxLog::TimeStamp(wxString*, time_t) -{ -} - -#endif // wxUSE_DATETIME/!wxUSE_DATETIME - -#if wxUSE_THREADS - -void wxLog::FlushThreadMessages() -{ - // check if we have queued messages from other threads - wxLogRecords bufferedLogRecords; - - { - wxCriticalSectionLocker lock(GetBackgroundLogCS()); - bufferedLogRecords.swap(gs_bufferedLogRecords); - - // release the lock now to not keep it while we are logging the - // messages below, allowing background threads to run - } - - if ( !bufferedLogRecords.empty() ) - { - for ( wxLogRecords::const_iterator it = bufferedLogRecords.begin(); - it != bufferedLogRecords.end(); - ++it ) - { - CallDoLogNow(it->level, it->msg, it->info); - } - } -} - -/* static */ -bool wxLog::IsThreadLoggingEnabled() -{ - return !wxThreadInfo.loggingDisabled; -} - -/* static */ -bool wxLog::EnableThreadLogging(bool enable) -{ - const bool wasEnabled = !wxThreadInfo.loggingDisabled; - wxThreadInfo.loggingDisabled = !enable; - return wasEnabled; -} - -#endif // wxUSE_THREADS - -wxLogFormatter *wxLog::SetFormatter(wxLogFormatter* formatter) -{ - wxLogFormatter* formatterOld = m_formatter; - m_formatter = formatter ? formatter : new wxLogFormatter; - - return formatterOld; -} - -void wxLog::Flush() -{ - LogLastRepeatIfNeeded(); -} - -/* static */ -void wxLog::FlushActive() -{ - if ( ms_suspendCount ) - return; - - wxLog * const log = GetActiveTarget(); - if ( log ) - { -#if wxUSE_THREADS - if ( wxThread::IsMain() ) - log->FlushThreadMessages(); -#endif // wxUSE_THREADS - - log->Flush(); - } -} - -// ---------------------------------------------------------------------------- -// wxLogBuffer implementation -// ---------------------------------------------------------------------------- - -void wxLogBuffer::Flush() -{ - wxLog::Flush(); - - if ( !m_str.empty() ) - { - wxMessageOutputBest out; - out.Printf(wxS("%s"), m_str.c_str()); - m_str.clear(); - } -} - -void wxLogBuffer::DoLogTextAtLevel(wxLogLevel level, const wxString& msg) -{ - // don't put debug messages in the buffer, we don't want to show - // them to the user in a msg box, log them immediately - switch ( level ) - { - case wxLOG_Debug: - case wxLOG_Trace: - wxLog::DoLogTextAtLevel(level, msg); - break; - - default: - m_str << msg << wxS("\n"); - } -} - -// ---------------------------------------------------------------------------- -// wxLogStderr class implementation -// ---------------------------------------------------------------------------- - -wxLogStderr::wxLogStderr(FILE *fp) -{ - if ( fp == NULL ) - m_fp = stderr; - else - m_fp = fp; -} - -void wxLogStderr::DoLogText(const wxString& msg) -{ - // First send it to stderr, even if we don't have it (e.g. in a Windows GUI - // application under) it's not a problem to try to use it and it's easier - // than determining whether we do have it or not. - wxMessageOutputStderr(m_fp).Output(msg); - - // under GUI systems such as Windows or Mac, programs usually don't have - // stderr at all, so show the messages also somewhere else, typically in - // the debugger window so that they go at least somewhere instead of being - // simply lost - if ( m_fp == stderr ) - { - wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits() : NULL; - if ( traits && !traits->HasStderr() ) - { - wxMessageOutputDebug().Output(msg + wxS('\n')); - } - } -} - -// ---------------------------------------------------------------------------- -// wxLogStream implementation -// ---------------------------------------------------------------------------- - -#if wxUSE_STD_IOSTREAM -#include "wx/ioswrap.h" -wxLogStream::wxLogStream(wxSTD ostream *ostr) -{ - if ( ostr == NULL ) - m_ostr = &wxSTD cerr; - else - m_ostr = ostr; -} - -void wxLogStream::DoLogText(const wxString& msg) -{ - (*m_ostr) << msg << wxSTD endl; -} -#endif // wxUSE_STD_IOSTREAM - -// ---------------------------------------------------------------------------- -// wxLogChain -// ---------------------------------------------------------------------------- - -wxLogChain::wxLogChain(wxLog *logger) -{ - m_bPassMessages = true; - - m_logNew = logger; - - // Notice that we use GetActiveTarget() here instead of directly calling - // SetActiveTarget() to trigger wxLog auto-creation: if we're created as - // the first logger, we should still chain with the standard, implicit and - // possibly still not created standard logger instead of disabling normal - // logging entirely. - m_logOld = wxLog::GetActiveTarget(); - wxLog::SetActiveTarget(this); -} - -wxLogChain::~wxLogChain() -{ - wxLog::SetActiveTarget(m_logOld); - - if ( m_logNew != this ) - delete m_logNew; -} - -void wxLogChain::SetLog(wxLog *logger) -{ - if ( m_logNew != this ) - delete m_logNew; - - m_logNew = logger; -} - -void wxLogChain::Flush() -{ - if ( m_logOld ) - m_logOld->Flush(); - - // be careful to avoid infinite recursion - if ( m_logNew && m_logNew != this ) - m_logNew->Flush(); -} - -void wxLogChain::DoLogRecord(wxLogLevel level, - const wxString& msg, - const wxLogRecordInfo& info) -{ - // let the previous logger show it - if ( m_logOld && IsPassingMessages() ) - m_logOld->LogRecord(level, msg, info); - - // and also send it to the new one - if ( m_logNew ) - { - // don't call m_logNew->LogRecord() to avoid infinite recursion when - // m_logNew is this object itself - if ( m_logNew != this ) - m_logNew->LogRecord(level, msg, info); - else - wxLog::DoLogRecord(level, msg, info); - } -} - -#ifdef __VISUALC__ - // "'this' : used in base member initializer list" - so what? - #pragma warning(disable:4355) -#endif // VC++ - -// ---------------------------------------------------------------------------- -// wxLogInterposer -// ---------------------------------------------------------------------------- - -wxLogInterposer::wxLogInterposer() - : wxLogChain(this) -{ -} - -// ---------------------------------------------------------------------------- -// wxLogInterposerTemp -// ---------------------------------------------------------------------------- - -wxLogInterposerTemp::wxLogInterposerTemp() - : wxLogChain(this) -{ - DetachOldLog(); -} - -#ifdef __VISUALC__ - #pragma warning(default:4355) -#endif // VC++ - -// ============================================================================ -// Global functions/variables -// ============================================================================ - -// ---------------------------------------------------------------------------- -// static variables -// ---------------------------------------------------------------------------- - -bool wxLog::ms_bRepetCounting = false; - -wxLog *wxLog::ms_pLogger = NULL; -bool wxLog::ms_doLog = true; -bool wxLog::ms_bAutoCreate = true; -bool wxLog::ms_bVerbose = false; - -wxLogLevel wxLog::ms_logLevel = wxLOG_Max; // log everything by default - -size_t wxLog::ms_suspendCount = 0; - -wxString wxLog::ms_timestamp(wxS("%X")); // time only, no date - -#if WXWIN_COMPATIBILITY_2_8 -wxTraceMask wxLog::ms_ulTraceMask = (wxTraceMask)0; -#endif // wxDEBUG_LEVEL - -// ---------------------------------------------------------------------------- -// stdout error logging helper -// ---------------------------------------------------------------------------- - -// helper function: wraps the message and justifies it under given position -// (looks more pretty on the terminal). Also adds newline at the end. -// -// TODO this is now disabled until I find a portable way of determining the -// terminal window size (ok, I found it but does anybody really cares?) -#ifdef LOG_PRETTY_WRAP -static void wxLogWrap(FILE *f, const char *pszPrefix, const char *psz) -{ - size_t nMax = 80; // FIXME - size_t nStart = strlen(pszPrefix); - fputs(pszPrefix, f); - - size_t n; - while ( *psz != '\0' ) { - for ( n = nStart; (n < nMax) && (*psz != '\0'); n++ ) - putc(*psz++, f); - - // wrapped? - if ( *psz != '\0' ) { - /*putc('\n', f);*/ - for ( n = 0; n < nStart; n++ ) - putc(' ', f); - - // as we wrapped, squeeze all white space - while ( isspace(*psz) ) - psz++; - } - } - - putc('\n', f); -} -#endif //LOG_PRETTY_WRAP - -// ---------------------------------------------------------------------------- -// error code/error message retrieval functions -// ---------------------------------------------------------------------------- - -// get error code from syste -unsigned long wxSysErrorCode() -{ -#if defined(__WINDOWS__) - return ::GetLastError(); -#else //Unix - return errno; -#endif //Win/Unix -} - -// get error message from system -const wxChar *wxSysErrorMsg(unsigned long nErrCode) -{ - if ( nErrCode == 0 ) - nErrCode = wxSysErrorCode(); - -#if defined(__WINDOWS__) - static wxChar s_szBuf[1024]; - - // get error message from system - LPVOID lpMsgBuf; - if ( ::FormatMessage - ( - FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, - NULL, - nErrCode, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPTSTR)&lpMsgBuf, - 0, - NULL - ) == 0 ) - { - // if this happens, something is seriously wrong, so don't use _() here - // for safety - wxSprintf(s_szBuf, wxS("unknown error %lx"), nErrCode); - return s_szBuf; - } - - - // copy it to our buffer and free memory - // Crashes on SmartPhone (FIXME) - if( lpMsgBuf != 0 ) - { - wxStrlcpy(s_szBuf, (const wxChar *)lpMsgBuf, WXSIZEOF(s_szBuf)); - - LocalFree(lpMsgBuf); - - // returned string is capitalized and ended with '\r\n' - bad - s_szBuf[0] = (wxChar)wxTolower(s_szBuf[0]); - size_t len = wxStrlen(s_szBuf); - if ( len > 0 ) { - // truncate string - if ( s_szBuf[len - 2] == wxS('\r') ) - s_szBuf[len - 2] = wxS('\0'); - } - } - else - { - s_szBuf[0] = wxS('\0'); - } - - return s_szBuf; -#else // !__WINDOWS__ - #if wxUSE_UNICODE - static wchar_t s_wzBuf[1024]; - wxConvCurrent->MB2WC(s_wzBuf, strerror((int)nErrCode), - WXSIZEOF(s_wzBuf) - 1); - return s_wzBuf; - #else - return strerror((int)nErrCode); - #endif -#endif // __WINDOWS__/!__WINDOWS__ -} - -#endif // wxUSE_LOG diff --git a/Externals/wxWidgets3/src/common/longlong.cpp b/Externals/wxWidgets3/src/common/longlong.cpp deleted file mode 100644 index ac6d23e229..0000000000 --- a/Externals/wxWidgets3/src/common/longlong.cpp +++ /dev/null @@ -1,1362 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/longlong.cpp -// Purpose: implementation of wxLongLongNative -// Author: Jeffrey C. Ollie , Vadim Zeitlin -// Remarks: this class is not public in wxWidgets 2.0! It is intentionally -// not documented and is for private use only. -// Modified by: -// Created: 10.02.99 -// Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// headers -// ============================================================================ - -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_LONGLONG - -#include "wx/longlong.h" - -#ifndef WX_PRECOMP - #include "wx/math.h" // for fabs() -#endif - -#if wxUSE_STREAMS - #include "wx/txtstrm.h" -#endif - -#include // for memset() - -#include "wx/ioswrap.h" - -// ============================================================================ -// implementation -// ============================================================================ - -#if wxUSE_LONGLONG_NATIVE - -// ---------------------------------------------------------------------------- -// misc -// ---------------------------------------------------------------------------- - -void *wxLongLongNative::asArray() const -{ - static unsigned char temp[8]; - - temp[0] = wx_truncate_cast(unsigned char, ((m_ll >> 56) & 0xFF)); - temp[1] = wx_truncate_cast(unsigned char, ((m_ll >> 48) & 0xFF)); - temp[2] = wx_truncate_cast(unsigned char, ((m_ll >> 40) & 0xFF)); - temp[3] = wx_truncate_cast(unsigned char, ((m_ll >> 32) & 0xFF)); - temp[4] = wx_truncate_cast(unsigned char, ((m_ll >> 24) & 0xFF)); - temp[5] = wx_truncate_cast(unsigned char, ((m_ll >> 16) & 0xFF)); - temp[6] = wx_truncate_cast(unsigned char, ((m_ll >> 8) & 0xFF)); - temp[7] = wx_truncate_cast(unsigned char, ((m_ll >> 0) & 0xFF)); - - return temp; -} - -void *wxULongLongNative::asArray() const -{ - static unsigned char temp[8]; - - temp[0] = wx_truncate_cast(unsigned char, ((m_ll >> 56) & 0xFF)); - temp[1] = wx_truncate_cast(unsigned char, ((m_ll >> 48) & 0xFF)); - temp[2] = wx_truncate_cast(unsigned char, ((m_ll >> 40) & 0xFF)); - temp[3] = wx_truncate_cast(unsigned char, ((m_ll >> 32) & 0xFF)); - temp[4] = wx_truncate_cast(unsigned char, ((m_ll >> 24) & 0xFF)); - temp[5] = wx_truncate_cast(unsigned char, ((m_ll >> 16) & 0xFF)); - temp[6] = wx_truncate_cast(unsigned char, ((m_ll >> 8) & 0xFF)); - temp[7] = wx_truncate_cast(unsigned char, ((m_ll >> 0) & 0xFF)); - - return temp; -} - -#if wxUSE_LONGLONG_WX -wxLongLongNative::wxLongLongNative(wxLongLongWx ll) -{ - // assign first to avoid precision loss! - m_ll = ll.GetHi(); - m_ll <<= 32; - m_ll |= ll.GetLo(); -} - -wxLongLongNative& wxLongLongNative::operator=(wxLongLongWx ll) -{ - // assign first to avoid precision loss! - m_ll = ll.GetHi(); - m_ll <<= 32; - m_ll |= ll.GetLo(); - return *this; -} - -wxLongLongNative& wxLongLongNative::operator=(const class wxULongLongWx &ll) -{ - // assign first to avoid precision loss! - m_ll = ll.GetHi(); - m_ll <<= 32; - m_ll |= ll.GetLo(); - return *this; -} - -wxULongLongNative::wxULongLongNative(const class wxULongLongWx &ll) -{ - // assign first to avoid precision loss! - m_ll = ll.GetHi(); - m_ll <<= 32; - m_ll |= ((unsigned long) ll.GetLo()); -} - -wxULongLongNative& wxULongLongNative::operator=(wxLongLongWx ll) -{ - // assign first to avoid precision loss! - m_ll = ll.GetHi(); - m_ll <<= 32; - m_ll |= ((unsigned long) ll.GetLo()); - return *this; -} - -wxULongLongNative& wxULongLongNative::operator=(const class wxULongLongWx &ll) -{ - // assign first to avoid precision loss! - m_ll = ll.GetHi(); - m_ll <<= 32; - m_ll |= ((unsigned long) ll.GetLo()); - return *this; -} -#endif - -#endif // wxUSE_LONGLONG_NATIVE - -// ============================================================================ -// wxLongLongWx: emulation of 'long long' using 2 longs -// ============================================================================ - -#if wxUSE_LONGLONG_WX - -// Set value from unsigned wxULongLongWx -wxLongLongWx &wxLongLongWx::operator=(const class wxULongLongWx &ll) -{ - m_hi = (unsigned long) ll.GetHi(); - m_lo = ll.GetLo(); - return *this; -} - -// assignment -wxLongLongWx& wxLongLongWx::Assign(double d) -{ - bool positive = d >= 0; - d = fabs(d); - if ( d <= ULONG_MAX ) - { - m_hi = 0; - m_lo = (long)d; - } - else - { - m_hi = (unsigned long)(d / (1.0 + (double)ULONG_MAX)); - m_lo = (unsigned long)(d - ((double)m_hi * (1.0 + (double)ULONG_MAX))); - } - -#ifdef wxLONGLONG_TEST_MODE - m_ll = (wxLongLong_t)d; - - Check(); -#endif // wxLONGLONG_TEST_MODE - - if ( !positive ) - Negate(); - - return *this; -} - -double wxLongLongWx::ToDouble() const -{ - double d = m_hi; - d *= 1.0 + (double)ULONG_MAX; - d += m_lo; - -#ifdef wxLONGLONG_TEST_MODE - wxASSERT( d == m_ll ); -#endif // wxLONGLONG_TEST_MODE - - return d; -} - -double wxULongLongWx::ToDouble() const -{ - unsigned double d = m_hi; - d *= 1.0 + (double)ULONG_MAX; - d += m_lo; - -#ifdef wxLONGLONG_TEST_MODE - wxASSERT( d == m_ll ); -#endif // wxLONGLONG_TEST_MODE - - return d; -} - -wxLongLongWx wxLongLongWx::operator<<(int shift) const -{ - wxLongLongWx ll(*this); - ll <<= shift; - - return ll; -} - -wxULongLongWx wxULongLongWx::operator<<(int shift) const -{ - wxULongLongWx ll(*this); - ll <<= shift; - - return ll; -} - -wxLongLongWx& wxLongLongWx::operator<<=(int shift) -{ - if (shift != 0) - { - if (shift < 32) - { - m_hi <<= shift; - m_hi |= m_lo >> (32 - shift); - m_lo <<= shift; - } - else - { - m_hi = m_lo << (shift - 32); - m_lo = 0; - } - } - -#ifdef wxLONGLONG_TEST_MODE - m_ll <<= shift; - - Check(); -#endif // wxLONGLONG_TEST_MODE - - return *this; -} - -wxULongLongWx& wxULongLongWx::operator<<=(int shift) -{ - if (shift != 0) - { - if (shift < 32) - { - m_hi <<= shift; - m_hi |= m_lo >> (32 - shift); - m_lo <<= shift; - } - else - { - m_hi = m_lo << (shift - 32); - m_lo = 0; - } - } - -#ifdef wxLONGLONG_TEST_MODE - m_ll <<= shift; - - Check(); -#endif // wxLONGLONG_TEST_MODE - - return *this; -} - -wxLongLongWx wxLongLongWx::operator>>(int shift) const -{ - wxLongLongWx ll(*this); - ll >>= shift; - - return ll; -} - -wxULongLongWx wxULongLongWx::operator>>(int shift) const -{ - wxULongLongWx ll(*this); - ll >>= shift; - - return ll; -} - -wxLongLongWx& wxLongLongWx::operator>>=(int shift) -{ - if (shift != 0) - { - if (shift < 32) - { - m_lo >>= shift; - m_lo |= m_hi << (32 - shift); - m_hi >>= shift; - } - else - { - m_lo = m_hi >> (shift - 32); - m_hi = (m_hi < 0 ? -1L : 0); - } - } - -#ifdef wxLONGLONG_TEST_MODE - m_ll >>= shift; - - Check(); -#endif // wxLONGLONG_TEST_MODE - - return *this; -} - -wxULongLongWx& wxULongLongWx::operator>>=(int shift) -{ - if (shift != 0) - { - if (shift < 32) - { - m_lo >>= shift; - m_lo |= m_hi << (32 - shift); - m_hi >>= shift; - } - else - { - m_lo = m_hi >> (shift - 32); - m_hi = 0; - } - } - -#ifdef wxLONGLONG_TEST_MODE - m_ll >>= shift; - - Check(); -#endif // wxLONGLONG_TEST_MODE - - return *this; -} - -wxLongLongWx wxLongLongWx::operator+(const wxLongLongWx& ll) const -{ - wxLongLongWx res(*this); - res += ll; - - return res; -} - -wxULongLongWx wxULongLongWx::operator+(const wxULongLongWx& ll) const -{ - wxULongLongWx res(*this); - res += ll; - - return res; -} - -wxLongLongWx wxLongLongWx::operator+(long l) const -{ - wxLongLongWx res(*this); - res += l; - - return res; -} - -wxULongLongWx wxULongLongWx::operator+(unsigned long l) const -{ - wxULongLongWx res(*this); - res += l; - - return res; -} - -wxLongLongWx& wxLongLongWx::operator+=(const wxLongLongWx& ll) -{ - unsigned long previous = m_lo; - - m_lo += ll.m_lo; - m_hi += ll.m_hi; - - if ((m_lo < previous) || (m_lo < ll.m_lo)) - m_hi++; - -#ifdef wxLONGLONG_TEST_MODE - m_ll += ll.m_ll; - - Check(); -#endif // wxLONGLONG_TEST_MODE - - return *this; -} - -wxULongLongWx& wxULongLongWx::operator+=(const wxULongLongWx& ll) -{ - unsigned long previous = m_lo; - - m_lo += ll.m_lo; - m_hi += ll.m_hi; - - if ((m_lo < previous) || (m_lo < ll.m_lo)) - m_hi++; - -#ifdef wxLONGLONG_TEST_MODE - m_ll += ll.m_ll; - - Check(); -#endif // wxLONGLONG_TEST_MODE - - return *this; -} - -wxLongLongWx& wxLongLongWx::operator+=(long l) -{ - unsigned long previous = m_lo; - - m_lo += l; - if (l < 0) - m_hi += -1l; - - if ((m_lo < previous) || (m_lo < (unsigned long)l)) - m_hi++; - -#ifdef wxLONGLONG_TEST_MODE - m_ll += l; - - Check(); -#endif // wxLONGLONG_TEST_MODE - - return *this; -} - -wxULongLongWx& wxULongLongWx::operator+=(unsigned long l) -{ - unsigned long previous = m_lo; - - m_lo += l; - - if ((m_lo < previous) || (m_lo < l)) - m_hi++; - -#ifdef wxLONGLONG_TEST_MODE - m_ll += l; - - Check(); -#endif // wxLONGLONG_TEST_MODE - - return *this; -} - -// pre increment -wxLongLongWx& wxLongLongWx::operator++() -{ - m_lo++; - if (m_lo == 0) - m_hi++; - -#ifdef wxLONGLONG_TEST_MODE - m_ll++; - - Check(); -#endif // wxLONGLONG_TEST_MODE - - return *this; -} - -wxULongLongWx& wxULongLongWx::operator++() -{ - m_lo++; - if (m_lo == 0) - m_hi++; - -#ifdef wxLONGLONG_TEST_MODE - m_ll++; - - Check(); -#endif // wxLONGLONG_TEST_MODE - - return *this; -} - -// negation -wxLongLongWx wxLongLongWx::operator-() const -{ - wxLongLongWx res(*this); - res.Negate(); - - return res; -} - -wxLongLongWx& wxLongLongWx::Negate() -{ - m_hi = ~m_hi; - m_lo = ~m_lo; - - m_lo++; - if ( m_lo == 0 ) - m_hi++; - -#ifdef wxLONGLONG_TEST_MODE - m_ll = -m_ll; - - Check(); -#endif // wxLONGLONG_TEST_MODE - - return *this; -} - -// subtraction - -wxLongLongWx wxLongLongWx::operator-(const wxLongLongWx& ll) const -{ - wxLongLongWx res(*this); - res -= ll; - - return res; -} - -wxLongLongWx wxULongLongWx::operator-(const wxULongLongWx& ll) const -{ - wxASSERT(m_hi <= LONG_MAX ); - wxASSERT(ll.m_hi <= LONG_MAX ); - - wxLongLongWx res( (long)m_hi , m_lo ); - wxLongLongWx op( (long)ll.m_hi , ll.m_lo ); - res -= op; - - return res; -} - -wxLongLongWx& wxLongLongWx::operator-=(const wxLongLongWx& ll) -{ - unsigned long previous = m_lo; - - m_lo -= ll.m_lo; - m_hi -= ll.m_hi; - - if (previous < ll.m_lo) - m_hi--; - -#ifdef wxLONGLONG_TEST_MODE - m_ll -= ll.m_ll; - - Check(); -#endif // wxLONGLONG_TEST_MODE - - return *this; -} - -wxULongLongWx& wxULongLongWx::operator-=(const wxULongLongWx& ll) -{ - unsigned long previous = m_lo; - - m_lo -= ll.m_lo; - m_hi -= ll.m_hi; - - if (previous < ll.m_lo) - m_hi--; - -#ifdef wxLONGLONG_TEST_MODE - m_ll -= ll.m_ll; - - Check(); -#endif // wxLONGLONG_TEST_MODE - - return *this; -} - -// pre decrement -wxLongLongWx& wxLongLongWx::operator--() -{ - m_lo--; - if (m_lo == 0xFFFFFFFF) - m_hi--; - -#ifdef wxLONGLONG_TEST_MODE - m_ll--; - - Check(); -#endif // wxLONGLONG_TEST_MODE - - return *this; -} - -wxULongLongWx& wxULongLongWx::operator--() -{ - m_lo--; - if (m_lo == 0xFFFFFFFF) - m_hi--; - -#ifdef wxLONGLONG_TEST_MODE - m_ll--; - - Check(); -#endif // wxLONGLONG_TEST_MODE - - return *this; -} - -// comparison operators - -bool wxLongLongWx::operator<(const wxLongLongWx& ll) const -{ - if ( m_hi < ll.m_hi ) - return true; - else if ( m_hi == ll.m_hi ) - return m_lo < ll.m_lo; - else - return false; -} - -bool wxULongLongWx::operator<(const wxULongLongWx& ll) const -{ - if ( m_hi < ll.m_hi ) - return true; - else if ( m_hi == ll.m_hi ) - return m_lo < ll.m_lo; - else - return false; -} - -bool wxLongLongWx::operator>(const wxLongLongWx& ll) const -{ - if ( m_hi > ll.m_hi ) - return true; - else if ( m_hi == ll.m_hi ) - return m_lo > ll.m_lo; - else - return false; -} - -bool wxULongLongWx::operator>(const wxULongLongWx& ll) const -{ - if ( m_hi > ll.m_hi ) - return true; - else if ( m_hi == ll.m_hi ) - return m_lo > ll.m_lo; - else - return false; -} - -// bitwise operators - -wxLongLongWx wxLongLongWx::operator&(const wxLongLongWx& ll) const -{ - return wxLongLongWx(m_hi & ll.m_hi, m_lo & ll.m_lo); -} - -wxULongLongWx wxULongLongWx::operator&(const wxULongLongWx& ll) const -{ - return wxULongLongWx(m_hi & ll.m_hi, m_lo & ll.m_lo); -} - -wxLongLongWx wxLongLongWx::operator|(const wxLongLongWx& ll) const -{ - return wxLongLongWx(m_hi | ll.m_hi, m_lo | ll.m_lo); -} - -wxULongLongWx wxULongLongWx::operator|(const wxULongLongWx& ll) const -{ - return wxULongLongWx(m_hi | ll.m_hi, m_lo | ll.m_lo); -} - -wxLongLongWx wxLongLongWx::operator^(const wxLongLongWx& ll) const -{ - return wxLongLongWx(m_hi ^ ll.m_hi, m_lo ^ ll.m_lo); -} - -wxULongLongWx wxULongLongWx::operator^(const wxULongLongWx& ll) const -{ - return wxULongLongWx(m_hi ^ ll.m_hi, m_lo ^ ll.m_lo); -} - -wxLongLongWx& wxLongLongWx::operator&=(const wxLongLongWx& ll) -{ - m_lo &= ll.m_lo; - m_hi &= ll.m_hi; - -#ifdef wxLONGLONG_TEST_MODE - m_ll &= ll.m_ll; - - Check(); -#endif // wxLONGLONG_TEST_MODE - - return *this; -} - -wxULongLongWx& wxULongLongWx::operator&=(const wxULongLongWx& ll) -{ - m_lo &= ll.m_lo; - m_hi &= ll.m_hi; - -#ifdef wxLONGLONG_TEST_MODE - m_ll &= ll.m_ll; - - Check(); -#endif // wxLONGLONG_TEST_MODE - - return *this; -} - -wxLongLongWx& wxLongLongWx::operator|=(const wxLongLongWx& ll) -{ - m_lo |= ll.m_lo; - m_hi |= ll.m_hi; - -#ifdef wxLONGLONG_TEST_MODE - m_ll |= ll.m_ll; - - Check(); -#endif // wxLONGLONG_TEST_MODE - - return *this; -} - -wxULongLongWx& wxULongLongWx::operator|=(const wxULongLongWx& ll) -{ - m_lo |= ll.m_lo; - m_hi |= ll.m_hi; - -#ifdef wxLONGLONG_TEST_MODE - m_ll |= ll.m_ll; - - Check(); -#endif // wxLONGLONG_TEST_MODE - - return *this; -} - -wxLongLongWx& wxLongLongWx::operator^=(const wxLongLongWx& ll) -{ - m_lo ^= ll.m_lo; - m_hi ^= ll.m_hi; - -#ifdef wxLONGLONG_TEST_MODE - m_ll ^= ll.m_ll; - - Check(); -#endif // wxLONGLONG_TEST_MODE - - return *this; -} - -wxULongLongWx& wxULongLongWx::operator^=(const wxULongLongWx& ll) -{ - m_lo ^= ll.m_lo; - m_hi ^= ll.m_hi; - -#ifdef wxLONGLONG_TEST_MODE - m_ll ^= ll.m_ll; - - Check(); -#endif // wxLONGLONG_TEST_MODE - - return *this; -} - -wxLongLongWx wxLongLongWx::operator~() const -{ - return wxLongLongWx(~m_hi, ~m_lo); -} - -wxULongLongWx wxULongLongWx::operator~() const -{ - return wxULongLongWx(~m_hi, ~m_lo); -} - -// multiplication - -wxLongLongWx wxLongLongWx::operator*(const wxLongLongWx& ll) const -{ - wxLongLongWx res(*this); - res *= ll; - - return res; -} - -wxULongLongWx wxULongLongWx::operator*(const wxULongLongWx& ll) const -{ - wxULongLongWx res(*this); - res *= ll; - - return res; -} - -wxLongLongWx& wxLongLongWx::operator*=(const wxLongLongWx& ll) -{ - wxLongLongWx t(m_hi, m_lo); - wxLongLongWx q(ll.m_hi, ll.m_lo); - - m_hi = m_lo = 0; - -#ifdef wxLONGLONG_TEST_MODE - wxLongLong_t llOld = m_ll; - m_ll = 0; -#endif // wxLONGLONG_TEST_MODE - - int counter = 0; - do - { - if ((q.m_lo & 1) != 0) - *this += t; - q >>= 1; - t <<= 1; - counter++; - } - while ((counter < 64) && ((q.m_hi != 0) || (q.m_lo != 0))); - -#ifdef wxLONGLONG_TEST_MODE - m_ll = llOld * ll.m_ll; - - Check(); -#endif // wxLONGLONG_TEST_MODE - - return *this; -} - -wxULongLongWx& wxULongLongWx::operator*=(const wxULongLongWx& ll) -{ - wxULongLongWx t(m_hi, m_lo); - wxULongLongWx q(ll.m_hi, ll.m_lo); - - m_hi = m_lo = 0; - -#ifdef wxLONGLONG_TEST_MODE - wxULongLong_t llOld = m_ll; - m_ll = 0; -#endif // wxLONGLONG_TEST_MODE - - int counter = 0; - do - { - if ((q.m_lo & 1) != 0) - *this += t; - q >>= 1; - t <<= 1; - counter++; - } - while ((counter < 64) && ((q.m_hi != 0) || (q.m_lo != 0))); - -#ifdef wxLONGLONG_TEST_MODE - m_ll = llOld * ll.m_ll; - - Check(); -#endif // wxLONGLONG_TEST_MODE - - return *this; -} - -// division - -#define IS_MSB_SET(ll) ((ll.GetHi()) & (1 << (8*sizeof(long) - 1))) - -void wxLongLongWx::Divide(const wxLongLongWx& divisorIn, - wxLongLongWx& quotient, - wxLongLongWx& remainderIO) const -{ - if ((divisorIn.m_lo == 0) && (divisorIn.m_hi == 0)) - { - // provoke division by zero error and silence the compilers warnings - // about an expression without effect and unused variable - long dummy = divisorIn.m_lo/divisorIn.m_hi; - dummy += 0; - } - - // VZ: I'm writing this in a hurry and it's surely not the fastest way to - // do this - any improvements are more than welcome - // - // code inspired by the snippet at - // http://www.bearcave.com/software/divide.htm - // - // Copyright notice: - // - // Use of this program, for any purpose, is granted the author, Ian - // Kaplan, as long as this copyright notice is included in the source - // code or any source code derived from this program. The user assumes - // all responsibility for using this code. - - // init everything - wxULongLongWx dividend, divisor, remainder; - - quotient = 0l; - remainder = 0l; - - // always do unsigned division and adjust the signs later: in C integer - // division, the sign of the remainder is the same as the sign of the - // dividend, while the sign of the quotient is the product of the signs of - // the dividend and divisor. Of course, we also always have - // - // dividend = quotient*divisor + remainder - // - // with 0 <= abs(remainder) < abs(divisor) - bool negRemainder = GetHi() < 0; - bool negQuotient = false; // assume positive - if ( GetHi() < 0 ) - { - negQuotient = !negQuotient; - dividend = -*this; - } else { - dividend = *this; - } - if ( divisorIn.GetHi() < 0 ) - { - negQuotient = !negQuotient; - divisor = -divisorIn; - } else { - divisor = divisorIn; - } - - // check for some particular cases - if ( divisor > dividend ) - { - remainder = dividend; - } - else if ( divisor == dividend ) - { - quotient = 1l; - } - else - { - // here: dividend > divisor and both are positive: do unsigned division - size_t nBits = 64u; - wxLongLongWx d; - - while ( remainder < divisor ) - { - remainder <<= 1; - if ( IS_MSB_SET(dividend) ) - { - remainder |= 1; - } - - d = dividend; - dividend <<= 1; - - nBits--; - } - - // undo the last loop iteration - dividend = d; - remainder >>= 1; - nBits++; - - for ( size_t i = 0; i < nBits; i++ ) - { - remainder <<= 1; - if ( IS_MSB_SET(dividend) ) - { - remainder |= 1; - } - - wxLongLongWx t = remainder - divisor; - dividend <<= 1; - quotient <<= 1; - if ( !IS_MSB_SET(t) ) - { - quotient |= 1; - - remainder = t; - } - } - } - - remainderIO = remainder; - - // adjust signs - if ( negRemainder ) - { - remainderIO = -remainderIO; - } - - if ( negQuotient ) - { - quotient = -quotient; - } -} - -void wxULongLongWx::Divide(const wxULongLongWx& divisorIn, - wxULongLongWx& quotient, - wxULongLongWx& remainder) const -{ - if ((divisorIn.m_lo == 0) && (divisorIn.m_hi == 0)) - { - // provoke division by zero error and silence the compilers warnings - // about an expression without effect and unused variable - unsigned long dummy = divisorIn.m_lo/divisorIn.m_hi; - dummy += 0; - } - - // VZ: I'm writing this in a hurry and it's surely not the fastest way to - // do this - any improvements are more than welcome - // - // code inspired by the snippet at - // http://www.bearcave.com/software/divide.htm - // - // Copyright notice: - // - // Use of this program, for any purpose, is granted the author, Ian - // Kaplan, as long as this copyright notice is included in the source - // code or any source code derived from this program. The user assumes - // all responsibility for using this code. - - // init everything - wxULongLongWx dividend = *this, - divisor = divisorIn; - - quotient = 0l; - remainder = 0l; - - // check for some particular cases - if ( divisor > dividend ) - { - remainder = dividend; - } - else if ( divisor == dividend ) - { - quotient = 1l; - } - else - { - // here: dividend > divisor - size_t nBits = 64u; - wxULongLongWx d; - - while ( remainder < divisor ) - { - remainder <<= 1; - if ( IS_MSB_SET(dividend) ) - { - remainder |= 1; - } - - d = dividend; - dividend <<= 1; - - nBits--; - } - - // undo the last loop iteration - dividend = d; - remainder >>= 1; - nBits++; - - for ( size_t i = 0; i < nBits; i++ ) - { - remainder <<= 1; - if ( IS_MSB_SET(dividend) ) - { - remainder |= 1; - } - - wxULongLongWx t = remainder - divisor; - dividend <<= 1; - quotient <<= 1; - if ( !IS_MSB_SET(t) ) - { - quotient |= 1; - - remainder = t; - } - } - } -} - -wxLongLongWx wxLongLongWx::operator/(const wxLongLongWx& ll) const -{ - wxLongLongWx quotient, remainder; - - Divide(ll, quotient, remainder); - - return quotient; -} - -wxULongLongWx wxULongLongWx::operator/(const wxULongLongWx& ll) const -{ - wxULongLongWx quotient, remainder; - - Divide(ll, quotient, remainder); - - return quotient; -} - -wxLongLongWx& wxLongLongWx::operator/=(const wxLongLongWx& ll) -{ - wxLongLongWx quotient, remainder; - - Divide(ll, quotient, remainder); - - *this = quotient; - - return *this; -} - -wxULongLongWx& wxULongLongWx::operator/=(const wxULongLongWx& ll) -{ - wxULongLongWx quotient, remainder; - - Divide(ll, quotient, remainder); - - *this = quotient; - - return *this; -} - -wxLongLongWx wxLongLongWx::operator%(const wxLongLongWx& ll) const -{ - wxLongLongWx quotient, remainder; - - Divide(ll, quotient, remainder); - - return remainder; -} - -wxULongLongWx wxULongLongWx::operator%(const wxULongLongWx& ll) const -{ - wxULongLongWx quotient, remainder; - - Divide(ll, quotient, remainder); - - return remainder; -} - -// ---------------------------------------------------------------------------- -// misc -// ---------------------------------------------------------------------------- - -// temporary - just for testing -void *wxLongLongWx::asArray(void) const -{ - static unsigned char temp[8]; - - temp[0] = (char)((m_hi >> 24) & 0xFF); - temp[1] = (char)((m_hi >> 16) & 0xFF); - temp[2] = (char)((m_hi >> 8) & 0xFF); - temp[3] = (char)((m_hi >> 0) & 0xFF); - temp[4] = (char)((m_lo >> 24) & 0xFF); - temp[5] = (char)((m_lo >> 16) & 0xFF); - temp[6] = (char)((m_lo >> 8) & 0xFF); - temp[7] = (char)((m_lo >> 0) & 0xFF); - - return temp; -} - -void *wxULongLongWx::asArray(void) const -{ - static unsigned char temp[8]; - - temp[0] = (char)((m_hi >> 24) & 0xFF); - temp[1] = (char)((m_hi >> 16) & 0xFF); - temp[2] = (char)((m_hi >> 8) & 0xFF); - temp[3] = (char)((m_hi >> 0) & 0xFF); - temp[4] = (char)((m_lo >> 24) & 0xFF); - temp[5] = (char)((m_lo >> 16) & 0xFF); - temp[6] = (char)((m_lo >> 8) & 0xFF); - temp[7] = (char)((m_lo >> 0) & 0xFF); - - return temp; -} - -#endif // wxUSE_LONGLONG_WX - -#define LL_TO_STRING(name) \ - wxString name::ToString() const \ - { \ - /* TODO: this is awfully inefficient, anything better? */ \ - wxString result; \ - \ - name ll = *this; \ - \ - bool neg = ll < 0; \ - if ( neg ) \ - { \ - while ( ll != 0 ) \ - { \ - long digit = (ll % 10).ToLong(); \ - result.Prepend((wxChar)(wxT('0') - digit)); \ - ll /= 10; \ - } \ - } \ - else \ - { \ - while ( ll != 0 ) \ - { \ - long digit = (ll % 10).ToLong(); \ - result.Prepend((wxChar)(wxT('0') + digit)); \ - ll /= 10; \ - } \ - } \ - \ - if ( result.empty() ) \ - result = wxT('0'); \ - else if ( neg ) \ - result.Prepend(wxT('-')); \ - \ - return result; \ - } - -#define ULL_TO_STRING(name) \ - wxString name::ToString() const \ - { \ - /* TODO: this is awfully inefficient, anything better? */ \ - wxString result; \ - \ - name ll = *this; \ - \ - while ( ll != 0 ) \ - { \ - result.Prepend((wxChar)(wxT('0') + (ll % 10).ToULong())); \ - ll /= 10; \ - } \ - \ - if ( result.empty() ) \ - result = wxT('0'); \ - \ - return result; \ - } - -#if wxUSE_LONGLONG_NATIVE - LL_TO_STRING(wxLongLongNative) - ULL_TO_STRING(wxULongLongNative) -#endif - -#if wxUSE_LONGLONG_WX - LL_TO_STRING(wxLongLongWx) - ULL_TO_STRING(wxULongLongWx) -#endif - -#if wxUSE_STD_IOSTREAM - -// input/output -WXDLLIMPEXP_BASE -wxSTD ostream& operator<< (wxSTD ostream& o, const wxLongLong& ll) -{ - return o << ll.ToString(); -} - -WXDLLIMPEXP_BASE -wxSTD ostream& operator<< (wxSTD ostream& o, const wxULongLong& ll) -{ - return o << ll.ToString(); -} - -#endif // wxUSE_STD_IOSTREAM - -WXDLLIMPEXP_BASE wxString& operator<< (wxString& s, const wxLongLong& ll) -{ - return s << ll.ToString(); -} - -WXDLLIMPEXP_BASE wxString& operator<< (wxString& s, const wxULongLong& ll) -{ - return s << ll.ToString(); -} - -#if wxUSE_STREAMS - -WXDLLIMPEXP_BASE wxTextOutputStream& operator<< (wxTextOutputStream& o, const wxULongLong& ll) -{ - return o << ll.ToString(); -} - -WXDLLIMPEXP_BASE wxTextOutputStream& operator<< (wxTextOutputStream& o, const wxLongLong& ll) -{ - return o << ll.ToString(); -} - -#define READ_STRING_CHAR(s, idx, len) ((idx!=len) ? (wxChar)s[idx++] : wxT('\0')) - -WXDLLIMPEXP_BASE class wxTextInputStream &operator>>(class wxTextInputStream &o, wxULongLong &ll) -{ - wxString s = o.ReadWord(); - - ll = wxULongLong(0l, 0l); - size_t length = s.length(); - size_t idx = 0; - - wxChar ch = READ_STRING_CHAR(s, idx, length); - - // Skip WS - while (ch==wxT(' ') || ch==wxT('\t')) - ch = READ_STRING_CHAR(s, idx, length); - - // Read number - wxULongLong multiplier(0l, 10l); - while (ch>=wxT('0') && ch<=wxT('9')) { - long lValue = (unsigned) (ch - wxT('0')); - ll = ll * multiplier + wxULongLong(0l, lValue); - ch = READ_STRING_CHAR(s, idx, length); - } - - return o; -} - -WXDLLIMPEXP_BASE class wxTextInputStream &operator>>(class wxTextInputStream &o, wxLongLong &ll) -{ - wxString s = o.ReadWord(); - - ll = wxLongLong(0l, 0l); - size_t length = s.length(); - size_t idx = 0; - - wxChar ch = READ_STRING_CHAR(s, idx, length); - - // Skip WS - while (ch==wxT(' ') || ch==wxT('\t')) - ch = READ_STRING_CHAR(s, idx, length); - - // Ask for sign - int iSign = 1; - if (ch==wxT('-') || ch==wxT('+')) { - iSign = ((ch==wxT('-')) ? -1 : 1); - ch = READ_STRING_CHAR(s, idx, length); - } - - // Read number - wxLongLong multiplier(0l, 10l); - while (ch>=wxT('0') && ch<=wxT('9')) { - long lValue = (unsigned) (ch - wxT('0')); - ll = ll * multiplier + wxLongLong(0l, lValue); - ch = READ_STRING_CHAR(s, idx, length); - } - -#if wxUSE_LONGLONG_NATIVE - ll = ll * wxLongLong((wxLongLong_t) iSign); -#else - ll = ll * wxLongLong((long) iSign); -#endif - - return o; -} - -#if wxUSE_LONGLONG_NATIVE - -WXDLLIMPEXP_BASE class wxTextOutputStream &operator<<(class wxTextOutputStream &o, wxULongLong_t value) -{ - return o << wxULongLong(value).ToString(); -} - -WXDLLIMPEXP_BASE class wxTextOutputStream &operator<<(class wxTextOutputStream &o, wxLongLong_t value) -{ - return o << wxLongLong(value).ToString(); -} - -WXDLLIMPEXP_BASE class wxTextInputStream &operator>>(class wxTextInputStream &o, wxULongLong_t &value) -{ - wxULongLong ll; - o >> ll; - value = ll.GetValue(); - return o; -} - -WXDLLIMPEXP_BASE class wxTextInputStream &operator>>(class wxTextInputStream &o, wxLongLong_t &value) -{ - wxLongLong ll; - o >> ll; - value = ll.GetValue(); - return o; -} - -#endif // wxUSE_LONGLONG_NATIVE - -#endif // wxUSE_STREAMS - -#endif // wxUSE_LONGLONG diff --git a/Externals/wxWidgets3/src/common/markupparser.cpp b/Externals/wxWidgets3/src/common/markupparser.cpp deleted file mode 100644 index 2b26a04c6a..0000000000 --- a/Externals/wxWidgets3/src/common/markupparser.cpp +++ /dev/null @@ -1,483 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/markupparser.cpp -// Purpose: Implementation of wxMarkupParser. -// Author: Vadim Zeitlin -// Created: 2011-02-16 -// Copyright: (c) 2011 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// for compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_MARKUP - -#ifndef WX_PRECOMP - #include "wx/log.h" -#endif - -#include "wx/private/markupparser.h" - -#include "wx/stack.h" - -namespace -{ - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -// Array containing the predefined XML 1.0 entities. -const struct XMLEntity -{ - const char *name; - int len; // == strlen(name) - char value; -} xmlEntities[] = -{ - { "lt", 2, '<' }, - { "gt", 2, '>' }, - { "amp", 3, '&' }, - { "apos", 4, '\''}, - { "quot", 4, '"' }, -}; - -// ---------------------------------------------------------------------------- -// helper functions -// ---------------------------------------------------------------------------- - -wxString -ExtractUntil(char ch, wxString::const_iterator& it, wxString::const_iterator end) -{ - wxString str; - for ( ; it != end; ++it ) - { - if ( *it == ch ) - return str; - - str += *it; - } - - // Return empty string to indicate that we didn't find ch at all. - return wxString(); -} - -} // anonymous namespace - -// ============================================================================ -// wxMarkupParser implementation -// ============================================================================ - -wxString -wxMarkupParser::ParseAttrs(wxString attrs, TagAndAttrs& tagAndAttrs) -{ - if ( tagAndAttrs.name.CmpNoCase("span") != 0 && !attrs.empty() ) - { - return wxString::Format("tag \"%s\" can't have attributes", - tagAndAttrs.name); - } - - // TODO: Parse more attributes described at - // http://library.gnome.org/devel/pango/stable/PangoMarkupFormat.html - // and at least ignore them gracefully instead of giving errors (but - // quite a few of them could be supported as well, notable font_desc). - - wxMarkupSpanAttributes& spanAttrs = tagAndAttrs.attrs; - - while ( !attrs.empty() ) - { - wxString rest; - const wxString attr = attrs.BeforeFirst(' ', &rest); - attrs = rest; - - // The "original" versions are used for error messages only. - wxString valueOrig; - const wxString nameOrig = attr.BeforeFirst('=', &valueOrig); - - const wxString name = nameOrig.Lower(); - wxString value = valueOrig.Lower(); - - // All attributes values must be quoted. - if ( value.length() < 2 || - (value[0] != value.Last()) || - (value[0] != '"' && value[0] != '\'') ) - { - return wxString::Format("bad quoting for value of \"%s\"", - nameOrig); - } - - value.assign(value, 1, value.length() - 2); - - if ( name == "foreground" || name == "fgcolor" || name == "color" ) - { - spanAttrs.m_fgCol = value; - } - else if ( name == "background" || name == "bgcolor" ) - { - spanAttrs.m_bgCol = value; - } - else if ( name == "font_family" || name == "face" ) - { - spanAttrs.m_fontFace = value; - } - else if ( name == "font_weight" || name == "weight" ) - { - unsigned long weight; - - if ( value == "ultralight" || value == "light" || value == "normal" ) - spanAttrs.m_isBold = wxMarkupSpanAttributes::No; - else if ( value == "bold" || value == "ultrabold" || value == "heavy" ) - spanAttrs.m_isBold = wxMarkupSpanAttributes::Yes; - else if ( value.ToULong(&weight) ) - spanAttrs.m_isBold = weight >= 600 ? wxMarkupSpanAttributes::Yes - : wxMarkupSpanAttributes::No; - else - return wxString::Format("invalid font weight \"%s\"", valueOrig); - } - else if ( name == "font_style" || name == "style" ) - { - if ( value == "normal" ) - spanAttrs.m_isItalic = wxMarkupSpanAttributes::No; - else if ( value == "oblique" || value == "italic" ) - spanAttrs.m_isItalic = wxMarkupSpanAttributes::Yes; - else - return wxString::Format("invalid font style \"%s\"", valueOrig); - } - else if ( name == "size" ) - { - unsigned long size; - if ( value.ToULong(&size) ) - { - spanAttrs.m_sizeKind = wxMarkupSpanAttributes::Size_PointParts; - spanAttrs.m_fontSize = size; - } - else if ( value == "smaller" || value == "larger" ) - { - spanAttrs.m_sizeKind = wxMarkupSpanAttributes::Size_Relative; - spanAttrs.m_fontSize = value == "smaller" ? -1 : +1; - } - else // Must be a CSS-like size specification - { - int cssSize = 1; - if ( value.StartsWith("xx-", &rest) ) - cssSize = 3; - else if ( value.StartsWith("x-", &rest) ) - cssSize = 2; - else if ( value == "medium" ) - cssSize = 0; - else - rest = value; - - if ( cssSize != 0 ) - { - if ( rest == "small" ) - cssSize = -cssSize; - else if ( rest != "large" ) - return wxString::Format("invalid font size \"%s\"", - valueOrig); - } - - spanAttrs.m_sizeKind = wxMarkupSpanAttributes::Size_Symbolic; - spanAttrs.m_fontSize = cssSize; - } - } - } - - return wxString(); -} - -bool wxMarkupParser::OutputTag(const TagAndAttrs& tagAndAttrs, bool start) -{ - if ( tagAndAttrs.name.CmpNoCase("span") == 0 ) - { - if ( start ) - m_output.OnSpanStart(tagAndAttrs.attrs); - else - m_output.OnSpanEnd(tagAndAttrs.attrs); - - return true; - } - else // non-span tag - { - static const struct TagHandler - { - const char *name; - void (wxMarkupParserOutput::*startFunc)(); - void (wxMarkupParserOutput::*endFunc)(); - } tagHandlers[] = - { - { "b", &wxMarkupParserOutput::OnBoldStart, - &wxMarkupParserOutput::OnBoldEnd }, - { "i", &wxMarkupParserOutput::OnItalicStart, - &wxMarkupParserOutput::OnItalicEnd }, - { "u", &wxMarkupParserOutput::OnUnderlinedStart, - &wxMarkupParserOutput::OnUnderlinedEnd }, - { "s", &wxMarkupParserOutput::OnStrikethroughStart, - &wxMarkupParserOutput::OnStrikethroughEnd }, - { "big", &wxMarkupParserOutput::OnBigStart, - &wxMarkupParserOutput::OnBigEnd }, - { "small", &wxMarkupParserOutput::OnSmallStart, - &wxMarkupParserOutput::OnSmallEnd }, - { "tt", &wxMarkupParserOutput::OnTeletypeStart, - &wxMarkupParserOutput::OnTeletypeEnd }, - }; - - for ( unsigned n = 0; n < WXSIZEOF(tagHandlers); n++ ) - { - const TagHandler& h = tagHandlers[n]; - - if ( tagAndAttrs.name.CmpNoCase(h.name) == 0 ) - { - if ( start ) - (m_output.*(h.startFunc))(); - else - (m_output.*(h.endFunc))(); - - return true; - } - } - } - - // Unknown tag name. - return false; -} - -bool wxMarkupParser::Parse(const wxString& text) -{ - // The stack containing the names and corresponding attributes (which are - // actually only used for tags) of all of the currently opened tag - // or none if we're not inside any tag. - wxStack tags; - - // Current run of text. - wxString current; - - const wxString::const_iterator end = text.end(); - for ( wxString::const_iterator it = text.begin(); it != end; ++it ) - { - switch ( (*it).GetValue() ) - { - case '<': - { - // Flush the text preceding the tag, if any. - if ( !current.empty() ) - { - m_output.OnText(current); - current.clear(); - } - - // This variable is used only in the debugging messages - // and doesn't need to be defined if they're not compiled - // at all (it actually would result in unused variable - // messages in this case). -#if wxUSE_LOG_DEBUG || !defined(HAVE_VARIADIC_MACROS) - // Remember the tag starting position for the error - // messages. - const size_t pos = it - text.begin(); -#endif - bool start = true; - if ( ++it != end && *it == '/' ) - { - start = false; - ++it; - } - - const wxString tag = ExtractUntil('>', it, end); - if ( tag.empty() ) - { - wxLogDebug("%s at %lu.", - it == end ? "Unclosed tag starting" - : "Empty tag", - pos); - return false; - } - - if ( start ) - { - wxString attrs; - const wxString name = tag.BeforeFirst(' ', &attrs); - - TagAndAttrs tagAndAttrs(name); - const wxString err = ParseAttrs(attrs, tagAndAttrs); - if ( !err.empty() ) - { - wxLogDebug("Bad attributes for \"%s\" " - "at %lu: %s.", - name, pos, err); - return false; - } - - tags.push(tagAndAttrs); - } - else // end tag - { - if ( tags.empty() || tags.top().name != tag ) - { - wxLogDebug("Unmatched closing tag \"%s\" at %lu.", - tag, pos); - return false; - } - } - - if ( !OutputTag(tags.top(), start) ) - { - wxLogDebug("Unknown tag at %lu.", pos); - return false; - } - - if ( !start ) - tags.pop(); - } - break; - - case '>': - wxLogDebug("'>' should be escaped as \">\"; at %lu.", - it - text.begin()); - break; - - case '&': - // Processing is somewhat complicated: we need to recognize at - // least the "<" entity to allow escaping left square - // brackets in the markup and, in fact, we recognize all of the - // standard XML entities for consistency with Pango markup - // parsing. - // - // However we also allow '&' to appear unescaped, i.e. directly - // and not as "&" when it is used to introduce the mnemonic - // for the label. In this case we simply leave it alone. - // - // Notice that this logic makes it impossible to have a label - // with "lt;" inside it and using "l" as mnemonic but hopefully - // this shouldn't be a problem in practice. - { - const size_t pos = it - text.begin() + 1; - - unsigned n; - for ( n = 0; n < WXSIZEOF(xmlEntities); n++ ) - { - const XMLEntity& xmlEnt = xmlEntities[n]; - if ( text.compare(pos, xmlEnt.len, xmlEnt.name) == 0 - && text[pos + xmlEnt.len] == ';' ) - { - // Escape the ampersands if needed to protect them - // from being interpreted as mnemonics indicators. - if ( xmlEnt.value == '&' ) - current += "&&"; - else - current += xmlEnt.value; - - it += xmlEnt.len + 1; // +1 for '&' itself - - break; - } - } - - if ( n < WXSIZEOF(xmlEntities) ) - break; - wxFALLTHROUGH;//else: fall through, '&' is not special - } - - default: - current += *it; - } - } - - if ( !tags.empty() ) - { - wxLogDebug("Missing closing tag for \"%s\"", tags.top().name); - return false; - } - - if ( !current.empty() ) - m_output.OnText(current); - - return true; -} - -/* static */ -wxString wxMarkupParser::Quote(const wxString& text) -{ - wxString quoted; - quoted.reserve(text.length()); - - for ( wxString::const_iterator it = text.begin(); it != text.end(); ++it ) - { - unsigned n; - for ( n = 0; n < WXSIZEOF(xmlEntities); n++ ) - { - const XMLEntity& xmlEnt = xmlEntities[n]; - if ( *it == xmlEnt.value ) - { - quoted << '&' << xmlEnt.name << ';'; - break; - } - } - - if ( n == WXSIZEOF(xmlEntities) ) - quoted += *it; - } - - return quoted; -} - -/* static */ -wxString wxMarkupParser::Strip(const wxString& text) -{ - class StripOutput : public wxMarkupParserOutput - { - public: - StripOutput() { } - - const wxString& GetText() const { return m_text; } - - virtual void OnText(const wxString& text) wxOVERRIDE { m_text += text; } - - virtual void OnBoldStart() wxOVERRIDE { } - virtual void OnBoldEnd() wxOVERRIDE { } - - virtual void OnItalicStart() wxOVERRIDE { } - virtual void OnItalicEnd() wxOVERRIDE { } - - virtual void OnUnderlinedStart() wxOVERRIDE { } - virtual void OnUnderlinedEnd() wxOVERRIDE { } - - virtual void OnStrikethroughStart() wxOVERRIDE { } - virtual void OnStrikethroughEnd() wxOVERRIDE { } - - virtual void OnBigStart() wxOVERRIDE { } - virtual void OnBigEnd() wxOVERRIDE { } - - virtual void OnSmallStart() wxOVERRIDE { } - virtual void OnSmallEnd() wxOVERRIDE { } - - virtual void OnTeletypeStart() wxOVERRIDE { } - virtual void OnTeletypeEnd() wxOVERRIDE { } - - virtual void OnSpanStart(const wxMarkupSpanAttributes& WXUNUSED(a)) wxOVERRIDE { } - virtual void OnSpanEnd(const wxMarkupSpanAttributes& WXUNUSED(a)) wxOVERRIDE { } - - private: - wxString m_text; - }; - - StripOutput output; - wxMarkupParser parser(output); - if ( !parser.Parse(text) ) - return wxString(); - - return output.GetText(); -} - -#endif // wxUSE_MARKUP diff --git a/Externals/wxWidgets3/src/common/matrix.cpp b/Externals/wxWidgets3/src/common/matrix.cpp deleted file mode 100644 index 1175af8342..0000000000 --- a/Externals/wxWidgets3/src/common/matrix.cpp +++ /dev/null @@ -1,600 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/matrix.cpp -// Purpose: wxTransformMatrix class -// Author: Chris Breeze, Julian Smart -// Modified by: Klaas Holwerda -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// Note: this is intended to be used in wxDC at some point to replace -// the current system of scaling/translation. It is not yet used. - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include "wx/matrix.h" - -#ifndef WX_PRECOMP - #include "wx/math.h" -#endif - -static const double pi = M_PI; - -wxTransformMatrix::wxTransformMatrix(void) -{ - m_isIdentity = false; - - Identity(); -} - -wxTransformMatrix::wxTransformMatrix(const wxTransformMatrix& mat) - : wxObject() -{ - (*this) = mat; -} - -double wxTransformMatrix::GetValue(int col, int row) const -{ - if (row < 0 || row > 2 || col < 0 || col > 2) - return 0.0; - - return m_matrix[col][row]; -} - -void wxTransformMatrix::SetValue(int col, int row, double value) -{ - if (row < 0 || row > 2 || col < 0 || col > 2) - return; - - m_matrix[col][row] = value; - m_isIdentity = IsIdentity1(); -} - -void wxTransformMatrix::operator = (const wxTransformMatrix& mat) -{ - int i, j; - for (i = 0; i < 3; i++) - { - for (j = 0; j < 3; j++) - { - m_matrix[i][j] = mat.m_matrix[i][j]; - } - } - m_isIdentity = mat.m_isIdentity; -} - -bool wxTransformMatrix::operator == (const wxTransformMatrix& mat) const -{ - if (m_isIdentity && mat.m_isIdentity) - return true; - - int i, j; - for (i = 0; i < 3; i++) - { - for (j = 0; j < 3; j++) - { - if ( !wxIsSameDouble(m_matrix[i][j], mat.m_matrix[i][j]) ) - return false; - } - } - return true; -} - -bool wxTransformMatrix::operator != (const wxTransformMatrix& mat) const -{ - return (! ((*this) == mat)); -} - -double& wxTransformMatrix::operator()(int col, int row) -{ - if (row < 0 || row > 2 || col < 0 || col > 2) - return m_matrix[0][0]; - - return m_matrix[col][row]; -} - -double wxTransformMatrix::operator()(int col, int row) const -{ - if (row < 0 || row > 2 || col < 0 || col > 2) - return 0.0; - - return m_matrix[col][row]; -} - -// Invert matrix -bool wxTransformMatrix::Invert(void) -{ - double inverseMatrix[3][3]; - - // calculate the adjoint - inverseMatrix[0][0] = wxCalculateDet(m_matrix[1][1],m_matrix[2][1],m_matrix[1][2],m_matrix[2][2]); - inverseMatrix[0][1] = -wxCalculateDet(m_matrix[0][1],m_matrix[2][1],m_matrix[0][2],m_matrix[2][2]); - inverseMatrix[0][2] = wxCalculateDet(m_matrix[0][1],m_matrix[1][1],m_matrix[0][2],m_matrix[1][2]); - - inverseMatrix[1][0] = -wxCalculateDet(m_matrix[1][0],m_matrix[2][0],m_matrix[1][2],m_matrix[2][2]); - inverseMatrix[1][1] = wxCalculateDet(m_matrix[0][0],m_matrix[2][0],m_matrix[0][2],m_matrix[2][2]); - inverseMatrix[1][2] = -wxCalculateDet(m_matrix[0][0],m_matrix[1][0],m_matrix[0][2],m_matrix[1][2]); - - inverseMatrix[2][0] = wxCalculateDet(m_matrix[1][0],m_matrix[2][0],m_matrix[1][1],m_matrix[2][1]); - inverseMatrix[2][1] = -wxCalculateDet(m_matrix[0][0],m_matrix[2][0],m_matrix[0][1],m_matrix[2][1]); - inverseMatrix[2][2] = wxCalculateDet(m_matrix[0][0],m_matrix[1][0],m_matrix[0][1],m_matrix[1][1]); - - // now divide by the determinant - double det = m_matrix[0][0] * inverseMatrix[0][0] + m_matrix[0][1] * inverseMatrix[1][0] + m_matrix[0][2] * inverseMatrix[2][0]; - if ( wxIsNullDouble(det) ) - return false; - - inverseMatrix[0][0] /= det; inverseMatrix[1][0] /= det; inverseMatrix[2][0] /= det; - inverseMatrix[0][1] /= det; inverseMatrix[1][1] /= det; inverseMatrix[2][1] /= det; - inverseMatrix[0][2] /= det; inverseMatrix[1][2] /= det; inverseMatrix[2][2] /= det; - - for (int i = 0; i < 3; i++) - { - for (int j = 0; j < 3; j++) - { - m_matrix[i][j] = inverseMatrix[i][j]; - } - } - m_isIdentity = IsIdentity1(); - return true; -} - -// Make into identity matrix -bool wxTransformMatrix::Identity(void) -{ - m_matrix[0][0] = m_matrix[1][1] = m_matrix[2][2] = 1.0; - m_matrix[1][0] = m_matrix[2][0] = m_matrix[0][1] = m_matrix[2][1] = m_matrix[0][2] = m_matrix[1][2] = 0.0; - m_isIdentity = true; - - return true; -} - -// Scale by scale (isotropic scaling i.e. the same in x and y): -// | scale 0 0 | -// matrix' = | 0 scale 0 | x matrix -// | 0 0 scale | -// -bool wxTransformMatrix::Scale(double scale) -{ - int i, j; - for (i = 0; i < 3; i++) - { - for (j = 0; j < 3; j++) - { - m_matrix[i][j] *= scale; - } - } - m_isIdentity = IsIdentity1(); - - return true; -} - - -// scale a matrix in 2D -// -// xs 0 xc(1-xs) -// 0 ys yc(1-ys) -// 0 0 1 -// -wxTransformMatrix& wxTransformMatrix::Scale(const double &xs, const double &ys,const double &xc, const double &yc) -{ - double r00,r10,r20,r01,r11,r21; - - if (m_isIdentity) - { - double tx = xc*(1-xs); - double ty = yc*(1-ys); - r00 = xs; - r10 = 0; - r20 = tx; - r01 = 0; - r11 = ys; - r21 = ty; - } - else if ( !wxIsNullDouble(xc) || !wxIsNullDouble(yc) ) - { - double tx = xc*(1-xs); - double ty = yc*(1-ys); - r00 = xs * m_matrix[0][0]; - r10 = xs * m_matrix[1][0]; - r20 = xs * m_matrix[2][0] + tx; - r01 = ys * m_matrix[0][1]; - r11 = ys * m_matrix[1][1]; - r21 = ys * m_matrix[2][1] + ty; - } - else - { - r00 = xs * m_matrix[0][0]; - r10 = xs * m_matrix[1][0]; - r20 = xs * m_matrix[2][0]; - r01 = ys * m_matrix[0][1]; - r11 = ys * m_matrix[1][1]; - r21 = ys * m_matrix[2][1]; - } - - m_matrix[0][0] = r00; - m_matrix[1][0] = r10; - m_matrix[2][0] = r20; - m_matrix[0][1] = r01; - m_matrix[1][1] = r11; - m_matrix[2][1] = r21; - -/* or like this - // first translate to origin O - (*this).Translate(-x_cen, -y_cen); - - // now do the scaling - wxTransformMatrix scale; - scale.m_matrix[0][0] = x_fac; - scale.m_matrix[1][1] = y_fac; - scale.m_isIdentity = IsIdentity1(); - - *this = scale * (*this); - - // translate back from origin to x_cen, y_cen - (*this).Translate(x_cen, y_cen); -*/ - - m_isIdentity = IsIdentity1(); - - return *this; -} - - -// mirror a matrix in x, y -// -// -1 0 0 Y-mirror -// 0 -1 0 X-mirror -// 0 0 -1 Z-mirror -wxTransformMatrix& wxTransformMatrix::Mirror(bool x, bool y) -{ - wxTransformMatrix temp; - if (x) - { - temp.m_matrix[1][1] = -1; - temp.m_isIdentity=false; - } - if (y) - { - temp.m_matrix[0][0] = -1; - temp.m_isIdentity=false; - } - - *this = temp * (*this); - m_isIdentity = IsIdentity1(); - return *this; -} - -// Translate by dx, dy: -// | 1 0 dx | -// matrix' = | 0 1 dy | x matrix -// | 0 0 1 | -// -bool wxTransformMatrix::Translate(double dx, double dy) -{ - int i; - for (i = 0; i < 3; i++) - m_matrix[i][0] += dx * m_matrix[i][2]; - for (i = 0; i < 3; i++) - m_matrix[i][1] += dy * m_matrix[i][2]; - - m_isIdentity = IsIdentity1(); - - return true; -} - -// Rotate clockwise by the given number of degrees: -// | cos sin 0 | -// matrix' = | -sin cos 0 | x matrix -// | 0 0 1 | -bool wxTransformMatrix::Rotate(double degrees) -{ - Rotate(-degrees,0,0); - return true; -} - -// counter clockwise rotate around a point -// -// cos(r) -sin(r) x(1-cos(r))+y(sin(r) -// sin(r) cos(r) y(1-cos(r))-x(sin(r) -// 0 0 1 -wxTransformMatrix& wxTransformMatrix::Rotate(const double °rees, const double &x, const double &y) -{ - double angle = degrees * pi / 180.0; - double c = cos(angle); - double s = sin(angle); - double r00,r10,r20,r01,r11,r21; - - if (m_isIdentity) - { - double tx = x*(1-c)+y*s; - double ty = y*(1-c)-x*s; - r00 = c ; - r10 = -s; - r20 = tx; - r01 = s; - r11 = c; - r21 = ty; - } - else if ( !wxIsNullDouble(x) || !wxIsNullDouble(y) ) - { - double tx = x*(1-c)+y*s; - double ty = y*(1-c)-x*s; - r00 = c * m_matrix[0][0] - s * m_matrix[0][1] + tx * m_matrix[0][2]; - r10 = c * m_matrix[1][0] - s * m_matrix[1][1] + tx * m_matrix[1][2]; - r20 = c * m_matrix[2][0] - s * m_matrix[2][1] + tx;// * m_matrix[2][2]; - r01 = c * m_matrix[0][1] + s * m_matrix[0][0] + ty * m_matrix[0][2]; - r11 = c * m_matrix[1][1] + s * m_matrix[1][0] + ty * m_matrix[1][2]; - r21 = c * m_matrix[2][1] + s * m_matrix[2][0] + ty;// * m_matrix[2][2]; - } - else - { - r00 = c * m_matrix[0][0] - s * m_matrix[0][1]; - r10 = c * m_matrix[1][0] - s * m_matrix[1][1]; - r20 = c * m_matrix[2][0] - s * m_matrix[2][1]; - r01 = c * m_matrix[0][1] + s * m_matrix[0][0]; - r11 = c * m_matrix[1][1] + s * m_matrix[1][0]; - r21 = c * m_matrix[2][1] + s * m_matrix[2][0]; - } - - m_matrix[0][0] = r00; - m_matrix[1][0] = r10; - m_matrix[2][0] = r20; - m_matrix[0][1] = r01; - m_matrix[1][1] = r11; - m_matrix[2][1] = r21; - -/* or like this - wxTransformMatrix rotate; - rotate.m_matrix[2][0] = tx; - rotate.m_matrix[2][1] = ty; - - rotate.m_matrix[0][0] = c; - rotate.m_matrix[0][1] = s; - - rotate.m_matrix[1][0] = -s; - rotate.m_matrix[1][1] = c; - - rotate.m_isIdentity=false; - *this = rotate * (*this); -*/ - m_isIdentity = IsIdentity1(); - - return *this; -} - -// Transform a point from logical to device coordinates -bool wxTransformMatrix::TransformPoint(double x, double y, double& tx, double& ty) const -{ - if (IsIdentity()) - { - tx = x; ty = y; return true; - } - - tx = x * m_matrix[0][0] + y * m_matrix[1][0] + m_matrix[2][0]; - ty = x * m_matrix[0][1] + y * m_matrix[1][1] + m_matrix[2][1]; - - return true; -} - -// Transform a point from device to logical coordinates. - -// Example of use: -// wxTransformMatrix mat = dc.GetTransformation(); -// mat.Invert(); -// mat.InverseTransformPoint(x, y, x1, y1); -// OR (shorthand:) -// dc.LogicalToDevice(x, y, x1, y1); -// The latter is slightly less efficient if we're doing several -// conversions, since the matrix is inverted several times. -bool wxTransformMatrix::InverseTransformPoint(double x, double y, double& tx, double& ty) const -{ - if (IsIdentity()) - { - tx = x; - ty = y; - return true; - } - - const double z = (1.0 - m_matrix[0][2] * x - m_matrix[1][2] * y) / m_matrix[2][2]; - if ( wxIsNullDouble(z) ) - return false; - - tx = x * m_matrix[0][0] + y * m_matrix[1][0] + z * m_matrix[2][0]; - ty = x * m_matrix[0][1] + y * m_matrix[1][1] + z * m_matrix[2][1]; - return true; -} - -wxTransformMatrix& wxTransformMatrix::operator*=(const double& t) -{ - for (int i = 0; i < 3; i++) - for (int j = 0; j < 3; j++) - m_matrix[i][j]*= t; - m_isIdentity = IsIdentity1(); - return *this; -} - -wxTransformMatrix& wxTransformMatrix::operator/=(const double& t) -{ - for (int i = 0; i < 3; i++) - for (int j = 0; j < 3; j++) - m_matrix[i][j]/= t; - m_isIdentity = IsIdentity1(); - return *this; -} - -wxTransformMatrix& wxTransformMatrix::operator+=(const wxTransformMatrix& mat) -{ - for (int i = 0; i < 3; i++) - for (int j = 0; j < 3; j++) - m_matrix[i][j] += mat.m_matrix[i][j]; - m_isIdentity = IsIdentity1(); - return *this; -} - -wxTransformMatrix& wxTransformMatrix::operator-=(const wxTransformMatrix& mat) -{ - for (int i = 0; i < 3; i++) - for (int j = 0; j < 3; j++) - m_matrix[i][j] -= mat.m_matrix[i][j]; - m_isIdentity = IsIdentity1(); - return *this; -} - -wxTransformMatrix& wxTransformMatrix::operator*=(const wxTransformMatrix& mat) -{ - - if (mat.m_isIdentity) - return *this; - if (m_isIdentity) - { - *this = mat; - return *this; - } - else - { - wxTransformMatrix result; - for (int i = 0; i < 3; i++) - { - for (int j = 0; j < 3; j++) - { - double sum = 0; - for (int k = 0; k < 3; k++) - sum += m_matrix[k][i] * mat.m_matrix[j][k]; - result.m_matrix[j][i] = sum; - } - } - *this = result; - } - - m_isIdentity = IsIdentity1(); - return *this; -} - - -// constant operators -wxTransformMatrix wxTransformMatrix::operator*(const double& t) const -{ - wxTransformMatrix result = *this; - result *= t; - result.m_isIdentity = result.IsIdentity1(); - return result; -} - -wxTransformMatrix wxTransformMatrix::operator/(const double& t) const -{ - wxTransformMatrix result = *this; -// wxASSERT(t!=0); - result /= t; - result.m_isIdentity = result.IsIdentity1(); - return result; -} - -wxTransformMatrix wxTransformMatrix::operator+(const wxTransformMatrix& m) const -{ - wxTransformMatrix result = *this; - result += m; - result.m_isIdentity = result.IsIdentity1(); - return result; -} - -wxTransformMatrix wxTransformMatrix::operator-(const wxTransformMatrix& m) const -{ - wxTransformMatrix result = *this; - result -= m; - result.m_isIdentity = result.IsIdentity1(); - return result; -} - - -wxTransformMatrix wxTransformMatrix::operator*(const wxTransformMatrix& m) const -{ - wxTransformMatrix result = *this; - result *= m; - result.m_isIdentity = result.IsIdentity1(); - return result; -} - - -wxTransformMatrix wxTransformMatrix::operator-() const -{ - wxTransformMatrix result = *this; - for (int i = 0; i < 3; i++) - for (int j = 0; j < 3; j++) - result.m_matrix[i][j] = -(this->m_matrix[i][j]); - result.m_isIdentity = result.IsIdentity1(); - return result; -} - -static double CheckInt(double getal) -{ - // check if the number is very close to an integer - if ( (ceil(getal) - getal) < 0.0001) - return ceil(getal); - - else if ( (getal - floor(getal)) < 0.0001) - return floor(getal); - - return getal; - -} - -double wxTransformMatrix::Get_scaleX() -{ - double scale_factor; - double rot_angle = CheckInt(atan2(m_matrix[1][0],m_matrix[0][0])*180/pi); - if ( !wxIsSameDouble(rot_angle, 90) && !wxIsSameDouble(rot_angle, -90) ) - scale_factor = m_matrix[0][0]/cos((rot_angle/180)*pi); - else - scale_factor = m_matrix[0][0]/sin((rot_angle/180)*pi); // er kan nl. niet door 0 gedeeld worden ! - - scale_factor = CheckInt(scale_factor); - if (scale_factor < 0) - scale_factor = -scale_factor; - - return scale_factor; -} - -double wxTransformMatrix::Get_scaleY() -{ - double scale_factor; - double rot_angle = CheckInt(atan2(m_matrix[1][0],m_matrix[0][0])*180/pi); - if ( !wxIsSameDouble(rot_angle, 90) && !wxIsSameDouble(rot_angle, -90) ) - scale_factor = m_matrix[1][1]/cos((rot_angle/180)*pi); - else - scale_factor = m_matrix[1][1]/sin((rot_angle/180)*pi); // er kan nl. niet door 0 gedeeld worden ! - - scale_factor = CheckInt(scale_factor); - if (scale_factor < 0) - - scale_factor = -scale_factor; - - return scale_factor; - -} - -double wxTransformMatrix::GetRotation() -{ - double temp1 = GetValue(0,0); // for angle calculation - double temp2 = GetValue(0,1); // - - // Rotation - double rot_angle = atan2(temp2,temp1)*180/pi; - - rot_angle = CheckInt(rot_angle); - return rot_angle; -} - -void wxTransformMatrix::SetRotation(double rotation) -{ - double x=GetValue(2,0); - double y=GetValue(2,1); - Rotate(-GetRotation(), x, y); - Rotate(rotation, x, y); -} diff --git a/Externals/wxWidgets3/src/common/mediactrlcmn.cpp b/Externals/wxWidgets3/src/common/mediactrlcmn.cpp deleted file mode 100644 index 32b488f69a..0000000000 --- a/Externals/wxWidgets3/src/common/mediactrlcmn.cpp +++ /dev/null @@ -1,540 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/mediactrlcmn.cpp -// Purpose: wxMediaCtrl common code -// Author: Ryan Norton -// Modified by: -// Created: 11/07/04 -// Copyright: (c) Ryan Norton -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// TODO: Platform specific backend defaults? - -//=========================================================================== -// Declarations -//=========================================================================== - -//--------------------------------------------------------------------------- -// Includes -//--------------------------------------------------------------------------- - -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_MEDIACTRL - -#ifndef WX_PRECOMP - #include "wx/hash.h" - #include "wx/log.h" -#endif - -#include "wx/mediactrl.h" - -//=========================================================================== -// -// Implementation -// -//=========================================================================== - -//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -// RTTI and Event implementations -//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -wxIMPLEMENT_CLASS(wxMediaCtrl, wxControl); -wxDEFINE_EVENT( wxEVT_MEDIA_STATECHANGED, wxMediaEvent ); -wxDEFINE_EVENT( wxEVT_MEDIA_PLAY, wxMediaEvent ); -wxDEFINE_EVENT( wxEVT_MEDIA_PAUSE, wxMediaEvent ); -wxIMPLEMENT_CLASS(wxMediaBackend, wxObject); -wxIMPLEMENT_DYNAMIC_CLASS(wxMediaEvent, wxEvent); -wxDEFINE_EVENT( wxEVT_MEDIA_FINISHED, wxMediaEvent ); -wxDEFINE_EVENT( wxEVT_MEDIA_LOADED, wxMediaEvent ); -wxDEFINE_EVENT( wxEVT_MEDIA_STOP, wxMediaEvent ); - -//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -// -// wxMediaCtrl -// -//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -//--------------------------------------------------------------------------- -// wxMediaBackend Destructor -// -// This is here because the DARWIN gcc compiler badly screwed up and -// needs the destructor implementation in the source -//--------------------------------------------------------------------------- -wxMediaBackend::~wxMediaBackend() -{ -} - -//--------------------------------------------------------------------------- -// wxMediaCtrl::Create (file version) -// wxMediaCtrl::Create (URL version) -// -// Searches for a backend that is installed on the system (backends -// starting with lower characters in the alphabet are given priority), -// and creates the control from it -// -// This searches by searching the global RTTI hashtable, class by class, -// attempting to call CreateControl on each one found that is a derivative -// of wxMediaBackend - if it succeeded Create returns true, otherwise -// it keeps iterating through the hashmap. -//--------------------------------------------------------------------------- -bool wxMediaCtrl::Create(wxWindow* parent, wxWindowID id, - const wxString& fileName, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& szBackend, - const wxValidator& validator, - const wxString& name) -{ - if(!szBackend.empty()) - { - wxClassInfo* pClassInfo = wxClassInfo::FindClass(szBackend); - - if(!pClassInfo || !DoCreate(pClassInfo, parent, id, - pos, size, style, validator, name)) - { - m_imp = NULL; - return false; - } - - if (!fileName.empty()) - { - if (!Load(fileName)) - { - wxDELETE(m_imp); - return false; - } - } - - SetInitialSize(size); - return true; - } - else - { - wxClassInfo::const_iterator it = wxClassInfo::begin_classinfo(); - - const wxClassInfo* classInfo; - - while((classInfo = NextBackend(&it)) != NULL) - { - if(!DoCreate(classInfo, parent, id, - pos, size, style, validator, name)) - continue; - - if (!fileName.empty()) - { - if (Load(fileName)) - { - SetInitialSize(size); - return true; - } - else - delete m_imp; - } - else - { - SetInitialSize(size); - return true; - } - } - - m_imp = NULL; - return false; - } -} - -bool wxMediaCtrl::Create(wxWindow* parent, wxWindowID id, - const wxURI& location, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& szBackend, - const wxValidator& validator, - const wxString& name) -{ - if(!szBackend.empty()) - { - wxClassInfo* pClassInfo = wxClassInfo::FindClass(szBackend); - if(!pClassInfo || !DoCreate(pClassInfo, parent, id, - pos, size, style, validator, name)) - { - m_imp = NULL; - return false; - } - - if (!Load(location)) - { - wxDELETE(m_imp); - return false; - } - - SetInitialSize(size); - return true; - } - else - { - wxClassInfo::const_iterator it = wxClassInfo::begin_classinfo(); - - const wxClassInfo* classInfo; - - while((classInfo = NextBackend(&it)) != NULL) - { - if(!DoCreate(classInfo, parent, id, - pos, size, style, validator, name)) - continue; - - if (Load(location)) - { - SetInitialSize(size); - return true; - } - else - delete m_imp; - } - - m_imp = NULL; - return false; - } -} - -//--------------------------------------------------------------------------- -// wxMediaCtrl::DoCreate -// -// Attempts to create the control from a backend -//--------------------------------------------------------------------------- -bool wxMediaCtrl::DoCreate(const wxClassInfo* classInfo, - wxWindow* parent, wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style, - const wxValidator& validator, - const wxString& name) -{ - m_imp = (wxMediaBackend*)classInfo->CreateObject(); - - if( m_imp->CreateControl(this, parent, id, pos, size, - style, validator, name) ) - { - return true; - } - - delete m_imp; - return false; -} - -//--------------------------------------------------------------------------- -// wxMediaCtrl::NextBackend (static) -// -// -// Search through the RTTI hashmap one at a -// time, attempting to create each derivative -// of wxMediaBackend -// -// -// STL isn't compatible with and will have a compilation error -// on a wxNode, however, wxHashTable::compatibility_iterator is -// incompatible with the old 2.4 stable version - but since -// we're in 2.5+ only we don't need to worry about the new version -//--------------------------------------------------------------------------- -const wxClassInfo* wxMediaCtrl::NextBackend(wxClassInfo::const_iterator* it) -{ - for ( wxClassInfo::const_iterator end = wxClassInfo::end_classinfo(); - *it != end; ++(*it) ) - { - const wxClassInfo* classInfo = **it; - if ( classInfo->IsKindOf(wxCLASSINFO(wxMediaBackend)) && - classInfo != wxCLASSINFO(wxMediaBackend) ) - { - ++(*it); - return classInfo; - } - } - - // - // Nope - couldn't successfully find one... fail - // - return NULL; -} - - -//--------------------------------------------------------------------------- -// wxMediaCtrl Destructor -// -// Free up the backend if it exists -//--------------------------------------------------------------------------- -wxMediaCtrl::~wxMediaCtrl() -{ - if (m_imp) - delete m_imp; -} - -//--------------------------------------------------------------------------- -// wxMediaCtrl::Load (file version) -// wxMediaCtrl::Load (URL version) -// wxMediaCtrl::Load (URL & Proxy version) -// wxMediaCtrl::Load (wxInputStream version) -// -// Here we call load of the backend - keeping -// track of whether it was successful or not - which -// will determine which later method calls work -//--------------------------------------------------------------------------- -bool wxMediaCtrl::Load(const wxString& fileName) -{ - if(m_imp) - return (m_bLoaded = m_imp->Load(fileName)); - return false; -} - -bool wxMediaCtrl::Load(const wxURI& location) -{ - if(m_imp) - return (m_bLoaded = m_imp->Load(location)); - return false; -} - -bool wxMediaCtrl::Load(const wxURI& location, const wxURI& proxy) -{ - if(m_imp) - return (m_bLoaded = m_imp->Load(location, proxy)); - return false; -} - -//--------------------------------------------------------------------------- -// wxMediaCtrl::Play -// wxMediaCtrl::Pause -// wxMediaCtrl::Stop -// wxMediaCtrl::GetPlaybackRate -// wxMediaCtrl::SetPlaybackRate -// wxMediaCtrl::Seek --> SetPosition -// wxMediaCtrl::Tell --> GetPosition -// wxMediaCtrl::Length --> GetDuration -// wxMediaCtrl::GetState -// wxMediaCtrl::DoGetBestSize -// wxMediaCtrl::SetVolume -// wxMediaCtrl::GetVolume -// wxMediaCtrl::ShowInterface -// wxMediaCtrl::GetDownloadProgress -// wxMediaCtrl::GetDownloadTotal -// -// 1) Check to see whether the backend exists and is loading -// 2) Call the backend's version of the method, returning success -// if the backend's version succeeds -//--------------------------------------------------------------------------- -bool wxMediaCtrl::Play() -{ - if(m_imp && m_bLoaded) - return m_imp->Play(); - return 0; -} - -bool wxMediaCtrl::Pause() -{ - if(m_imp && m_bLoaded) - return m_imp->Pause(); - return 0; -} - -bool wxMediaCtrl::Stop() -{ - if(m_imp && m_bLoaded) - return m_imp->Stop(); - return 0; -} - -double wxMediaCtrl::GetPlaybackRate() -{ - if(m_imp && m_bLoaded) - return m_imp->GetPlaybackRate(); - return 0; -} - -bool wxMediaCtrl::SetPlaybackRate(double dRate) -{ - if(m_imp && m_bLoaded) - return m_imp->SetPlaybackRate(dRate); - return false; -} - -wxFileOffset wxMediaCtrl::Seek(wxFileOffset where, wxSeekMode mode) -{ - wxFileOffset offset; - - switch (mode) - { - case wxFromStart: - offset = where; - break; - case wxFromEnd: - offset = Length() - where; - break; -// case wxFromCurrent: - default: - offset = Tell() + where; - break; - } - - if(m_imp && m_bLoaded && m_imp->SetPosition(offset)) - return offset; - return wxInvalidOffset; -} - -wxFileOffset wxMediaCtrl::Tell() -{ - if(m_imp && m_bLoaded) - return (wxFileOffset) m_imp->GetPosition().ToLong(); - return wxInvalidOffset; -} - -wxFileOffset wxMediaCtrl::Length() -{ - if(m_imp && m_bLoaded) - return (wxFileOffset) m_imp->GetDuration().ToLong(); - return wxInvalidOffset; -} - -wxMediaState wxMediaCtrl::GetState() -{ - if(m_imp && m_bLoaded) - return m_imp->GetState(); - return wxMEDIASTATE_STOPPED; -} - -wxSize wxMediaCtrl::DoGetBestSize() const -{ - if(m_imp) - return m_imp->GetVideoSize(); - return wxSize(0,0); -} - -double wxMediaCtrl::GetVolume() -{ - if(m_imp && m_bLoaded) - return m_imp->GetVolume(); - return 0.0; -} - -bool wxMediaCtrl::SetVolume(double dVolume) -{ - if(m_imp && m_bLoaded) - return m_imp->SetVolume(dVolume); - return false; -} - -bool wxMediaCtrl::ShowPlayerControls(wxMediaCtrlPlayerControls flags) -{ - if(m_imp) - return m_imp->ShowPlayerControls(flags); - return false; -} - -wxFileOffset wxMediaCtrl::GetDownloadProgress() -{ - if(m_imp && m_bLoaded) - return (wxFileOffset) m_imp->GetDownloadProgress().ToLong(); - return wxInvalidOffset; -} - -wxFileOffset wxMediaCtrl::GetDownloadTotal() -{ - if(m_imp && m_bLoaded) - return (wxFileOffset) m_imp->GetDownloadTotal().ToLong(); - return wxInvalidOffset; -} - -//--------------------------------------------------------------------------- -// wxMediaCtrl::DoMoveWindow -// -// 1) Call parent's version so that our control's window moves where -// it's supposed to -// 2) If the backend exists and is loaded, move the video -// of the media to where our control's window is now located -//--------------------------------------------------------------------------- -void wxMediaCtrl::DoMoveWindow(int x, int y, int w, int h) -{ - wxControl::DoMoveWindow(x,y,w,h); - - if(m_imp) - m_imp->Move(x, y, w, h); -} - -//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -// -// wxMediaBackendCommonBase -// -//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -void wxMediaBackendCommonBase::NotifyMovieSizeChanged() -{ - // our best size changed after opening a new file - m_ctrl->InvalidateBestSize(); - m_ctrl->SetSize(m_ctrl->GetSize()); - - // if the parent of the control has a sizer ask it to refresh our size - wxWindow * const parent = m_ctrl->GetParent(); - if ( parent->GetSizer() ) - { - m_ctrl->GetParent()->Layout(); - m_ctrl->GetParent()->Refresh(); - m_ctrl->GetParent()->Update(); - } -} - -void wxMediaBackendCommonBase::NotifyMovieLoaded() -{ - NotifyMovieSizeChanged(); - - // notify about movie being fully loaded - QueueEvent(wxEVT_MEDIA_LOADED); -} - -bool wxMediaBackendCommonBase::SendStopEvent() -{ - wxMediaEvent theEvent(wxEVT_MEDIA_STOP, m_ctrl->GetId()); - - return !m_ctrl->GetEventHandler()->ProcessEvent(theEvent) || theEvent.IsAllowed(); -} - -void wxMediaBackendCommonBase::QueueEvent(wxEventType evtType) -{ - wxMediaEvent theEvent(evtType, m_ctrl->GetId()); - m_ctrl->GetEventHandler()->AddPendingEvent(theEvent); -} - -void wxMediaBackendCommonBase::QueuePlayEvent() -{ - QueueEvent(wxEVT_MEDIA_STATECHANGED); - QueueEvent(wxEVT_MEDIA_PLAY); -} - -void wxMediaBackendCommonBase::QueuePauseEvent() -{ - QueueEvent(wxEVT_MEDIA_STATECHANGED); - QueueEvent(wxEVT_MEDIA_PAUSE); -} - -void wxMediaBackendCommonBase::QueueStopEvent() -{ - QueueEvent(wxEVT_MEDIA_STATECHANGED); - QueueEvent(wxEVT_MEDIA_STOP); -} - - -// -// Force link default backends in - -// see http://wiki.wxwidgets.org/wiki.pl?RTTI -// -#include "wx/html/forcelnk.h" - -#ifdef __WXMSW__ // MSW has huge backends so we do it separately -FORCE_LINK(wxmediabackend_am) -FORCE_LINK(wxmediabackend_wmp10) -#else -FORCE_LINK(basewxmediabackends) -#endif - -#endif //wxUSE_MEDIACTRL diff --git a/Externals/wxWidgets3/src/common/memory.cpp b/Externals/wxWidgets3/src/common/memory.cpp deleted file mode 100644 index f31d76136f..0000000000 --- a/Externals/wxWidgets3/src/common/memory.cpp +++ /dev/null @@ -1,1143 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/memory.cpp -// Purpose: Memory checking implementation -// Author: Arthur Seaton, Julian Smart -// Modified by: -// Created: 04/01/98 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_MEMORY_TRACING || wxUSE_DEBUG_CONTEXT - -#include "wx/memory.h" - -#ifndef WX_PRECOMP - #ifdef __WINDOWS__ - #include "wx/msw/wrapwin.h" - #endif - #include "wx/utils.h" - #include "wx/app.h" - #include "wx/hash.h" - #include "wx/log.h" -#endif - -#if wxUSE_THREADS - #include "wx/thread.h" -#endif - -#include - -#include "wx/ioswrap.h" - -#if !(defined(__VMS__) && ( __VMS_VER < 70000000 ) ) -#include -#endif - -#include -#include - -#if wxUSE_THREADS -#define USE_THREADSAFE_MEMORY_ALLOCATION 1 -#else -#define USE_THREADSAFE_MEMORY_ALLOCATION 0 -#endif - - -#ifdef new -#undef new -#endif - -// wxDebugContext wxTheDebugContext; -/* - Redefine new and delete so that we can pick up situations where: - - we overwrite or underwrite areas of malloc'd memory. - - we use uninitialise variables - Only do this in debug mode. - - We change new to get enough memory to allocate a struct, followed - by the caller's requested memory, followed by a tag. The struct - is used to create a doubly linked list of these areas and also - contains another tag. The tags are used to determine when the area - has been over/under written. -*/ - - -/* - Values which are used to set the markers which will be tested for - under/over write. There are 3 of these, one in the struct, one - immediately after the struct but before the caller requested memory and - one immediately after the requested memory. -*/ -#define MemStartCheck 0x23A8 -#define MemMidCheck 0xA328 -#define MemEndCheck 0x8A32 -#define MemFillChar 0xAF -#define MemStructId 0x666D - -/* - External interface for the wxMemStruct class. Others are - defined inline within the class def. Here we only need to be able - to add and delete nodes from the list and handle errors in some way. -*/ - -/* - Used for internal "this shouldn't happen" type of errors. -*/ -void wxMemStruct::ErrorMsg (const char * mesg) -{ - wxLogMessage(wxT("wxWidgets memory checking error: %s"), mesg); - PrintNode (); -} - -/* - Used when we find an overwrite or an underwrite error. -*/ -void wxMemStruct::ErrorMsg () -{ - wxLogMessage(wxT("wxWidgets over/underwrite memory error:")); - PrintNode (); -} - - -/* - We want to find out if pointers have been overwritten as soon as is - possible, so test everything before we dereference it. Of course it's still - quite possible that, if things have been overwritten, this function will - fall over, but the only way of dealing with that would cost too much in terms - of time. -*/ -int wxMemStruct::AssertList () -{ - if ((wxDebugContext::GetHead() && !wxDebugContext::GetHead()->AssertIt()) || - (wxDebugContext::GetTail() && !wxDebugContext::GetTail()->AssertIt())) - { - ErrorMsg ("Head or tail pointers trashed"); - return 0; - } - return 1; -} - - -/* - Check that the thing we're pointing to has the correct id for a wxMemStruct - object and also that it's previous and next pointers are pointing at objects - which have valid ids. - This is definitely not perfect since we could fall over just trying to access - any of the slots which we use here, but I think it's about the best that I - can do without doing something like taking all new wxMemStruct pointers and - comparing them against all known pointer within the list and then only - doing this sort of check _after_ you've found the pointer in the list. That - would be safer, but also much more time consuming. -*/ -int wxMemStruct::AssertIt () -{ - return (m_id == MemStructId && - (m_prev == 0 || m_prev->m_id == MemStructId) && - (m_next == 0 || m_next->m_id == MemStructId)); -} - - -/* - Additions are always at the tail of the list. - Returns 0 on error, non-zero on success. -*/ -int wxMemStruct::Append () -{ - if (! AssertList ()) - return 0; - - if (wxDebugContext::GetHead () == 0) { - if (wxDebugContext::GetTail () != 0) { - ErrorMsg ("Null list should have a null tail pointer"); - return 0; - } - (void) wxDebugContext::SetHead (this); - (void) wxDebugContext::SetTail (this); - } else { - wxDebugContext::GetTail ()->m_next = this; - this->m_prev = wxDebugContext::GetTail (); - (void) wxDebugContext::SetTail (this); - } - return 1; -} - - -/* - Don't actually free up anything here as the space which is used - by the node will be free'd up when the whole block is free'd. - Returns 0 on error, non-zero on success. -*/ -int wxMemStruct::Unlink () -{ - if (! AssertList ()) - return 0; - - if (wxDebugContext::GetHead () == 0 || wxDebugContext::GetTail () == 0) { - ErrorMsg ("Trying to remove node from empty list"); - return 0; - } - - // Handle the part of the list before this node. - if (m_prev == 0) { - if (this != wxDebugContext::GetHead ()) { - ErrorMsg ("No previous node for non-head node"); - return 0; - } - (void) wxDebugContext::SetHead (m_next); - } else { - if (! m_prev->AssertIt ()) { - ErrorMsg ("Trashed previous pointer"); - return 0; - } - - if (m_prev->m_next != this) { - ErrorMsg ("List is inconsistent"); - return 0; - } - m_prev->m_next = m_next; - } - - // Handle the part of the list after this node. - if (m_next == 0) { - if (this != wxDebugContext::GetTail ()) { - ErrorMsg ("No next node for non-tail node"); - return 0; - } - (void) wxDebugContext::SetTail (m_prev); - } else { - if (! m_next->AssertIt ()) { - ErrorMsg ("Trashed next pointer"); - return 0; - } - - if (m_next->m_prev != this) { - ErrorMsg ("List is inconsistent"); - return 0; - } - m_next->m_prev = m_prev; - } - - return 1; -} - - - -/* - Checks a node and block of memory to see that the markers are still - intact. -*/ -int wxMemStruct::CheckBlock () -{ - int nFailures = 0; - - if (m_firstMarker != MemStartCheck) { - nFailures++; - ErrorMsg (); - } - - char * pointer = wxDebugContext::MidMarkerPos ((char *) this); - if (* (wxMarkerType *) pointer != MemMidCheck) { - nFailures++; - ErrorMsg (); - } - - pointer = wxDebugContext::EndMarkerPos ((char *) this, RequestSize ()); - if (* (wxMarkerType *) pointer != MemEndCheck) { - nFailures++; - ErrorMsg (); - } - - return nFailures; -} - - -/* - Check the list of nodes to see if they are all ok. -*/ -int wxMemStruct::CheckAllPrevious () -{ - int nFailures = 0; - - for (wxMemStruct * st = this->m_prev; st != 0; st = st->m_prev) { - if (st->AssertIt ()) - nFailures += st->CheckBlock (); - else - return -1; - } - - return nFailures; -} - - -/* - When we delete a node we set the id slot to a specific value and then test - against this to see if a nodes have been deleted previously. I don't - just set the entire memory to the fillChar because then I'd be overwriting - useful stuff like the vtbl which may be needed to output the error message - including the file name and line numbers. Without this info the whole point - of this class is lost! -*/ -void wxMemStruct::SetDeleted () -{ - m_id = MemFillChar; -} - -int wxMemStruct::IsDeleted () -{ - return (m_id == MemFillChar); -} - - -/* - Print out a single node. There are many far better ways of doing this - but this will suffice for now. -*/ -void wxMemStruct::PrintNode () -{ - if (m_isObject) - { - wxObject *obj = (wxObject *)m_actualData; - wxClassInfo *info = obj->GetClassInfo(); - - // Let's put this in standard form so IDEs can load the file at the appropriate - // line - wxString msg; - - if (m_fileName) - msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum); - - if (info && info->GetClassName()) - msg += info->GetClassName(); - else - msg += wxT("object"); - - wxString msg2; - msg2.Printf(wxT(" at 0x%lX, size %d"), (long)GetActualData(), (int)RequestSize()); - msg += msg2; - - wxLogMessage(msg); - } - else - { - wxString msg; - - if (m_fileName) - msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum); - msg += wxT("non-object data"); - wxString msg2; - msg2.Printf(wxT(" at 0x%lX, size %d\n"), (long)GetActualData(), (int)RequestSize()); - msg += msg2; - - wxLogMessage(msg); - } -} - -void wxMemStruct::Dump () -{ - if (!ValidateNode()) return; - - if (m_isObject) - { - wxObject *obj = (wxObject *)m_actualData; - - wxString msg; - if (m_fileName) - msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum); - - - /* TODO: We no longer have a stream (using wxLogDebug) so we can't dump it. - * Instead, do what wxObject::Dump does. - * What should we do long-term, eliminate Dumping? Or specify - * that MyClass::Dump should use wxLogDebug? Ugh. - obj->Dump(wxDebugContext::GetStream()); - */ - - if (obj->GetClassInfo() && obj->GetClassInfo()->GetClassName()) - msg += obj->GetClassInfo()->GetClassName(); - else - msg += wxT("unknown object class"); - - wxString msg2; - msg2.Printf(wxT(" at 0x%lX, size %d"), (long)GetActualData(), (int)RequestSize()); - msg += msg2; - - wxDebugContext::OutputDumpLine(msg.c_str()); - } - else - { - wxString msg; - if (m_fileName) - msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum); - - wxString msg2; - msg2.Printf(wxT("non-object data at 0x%lX, size %d"), (long)GetActualData(), (int)RequestSize() ); - msg += msg2; - wxDebugContext::OutputDumpLine(msg.c_str()); - } -} - - -/* - Validate a node. Check to see that the node is "clean" in the sense - that nothing has over/underwritten it etc. -*/ -int wxMemStruct::ValidateNode () -{ - char * startPointer = (char *) this; - if (!AssertIt ()) { - if (IsDeleted ()) - ErrorMsg ("Object already deleted"); - else { - // Can't use the error routines as we have no recognisable object. -#ifndef __WXGTK__ - wxLogMessage(wxT("Can't verify memory struct - all bets are off!")); -#endif - } - return 0; - } - -/* - int i; - for (i = 0; i < wxDebugContext::TotSize (requestSize ()); i++) - cout << startPointer [i]; - cout << endl; -*/ - if (Marker () != MemStartCheck) - ErrorMsg (); - if (* (wxMarkerType *) wxDebugContext::MidMarkerPos (startPointer) != MemMidCheck) - ErrorMsg (); - if (* (wxMarkerType *) wxDebugContext::EndMarkerPos (startPointer, - RequestSize ()) != - MemEndCheck) - ErrorMsg (); - - // Back to before the extra buffer and check that - // we can still read what we originally wrote. - if (Marker () != MemStartCheck || - * (wxMarkerType *) wxDebugContext::MidMarkerPos (startPointer) - != MemMidCheck || - * (wxMarkerType *) wxDebugContext::EndMarkerPos (startPointer, - RequestSize ()) != MemEndCheck) - { - ErrorMsg (); - return 0; - } - - return 1; -} - -/* - The wxDebugContext class. -*/ - -wxMemStruct *wxDebugContext::m_head = NULL; -wxMemStruct *wxDebugContext::m_tail = NULL; - -bool wxDebugContext::m_checkPrevious = false; -int wxDebugContext::debugLevel = 1; -bool wxDebugContext::debugOn = true; -wxMemStruct *wxDebugContext::checkPoint = NULL; - -// For faster alignment calculation -static wxMarkerType markerCalc[2]; -int wxDebugContext::m_balign = (int)((char *)&markerCalc[1] - (char*)&markerCalc[0]); -int wxDebugContext::m_balignmask = (int)((char *)&markerCalc[1] - (char*)&markerCalc[0]) - 1; - -// Pointer to global function to call at shutdown -wxShutdownNotifyFunction wxDebugContext::sm_shutdownFn; - -wxDebugContext::wxDebugContext(void) -{ -} - -wxDebugContext::~wxDebugContext(void) -{ -} - -/* - Work out the positions of the markers by creating an array of 2 markers - and comparing the addresses of the 2 elements. Use this number as the - alignment for markers. -*/ -size_t wxDebugContext::CalcAlignment () -{ - wxMarkerType ar[2]; - return (char *) &ar[1] - (char *) &ar[0]; -} - - -char * wxDebugContext::StructPos (const char * buf) -{ - return (char *) buf; -} - -char * wxDebugContext::MidMarkerPos (const char * buf) -{ - return StructPos (buf) + PaddedSize (sizeof (wxMemStruct)); -} - -char * wxDebugContext::CallerMemPos (const char * buf) -{ - return MidMarkerPos (buf) + PaddedSize (sizeof(wxMarkerType)); -} - - -char * wxDebugContext::EndMarkerPos (const char * buf, size_t size) -{ - return CallerMemPos (buf) + PaddedSize (size); -} - - -/* - Slightly different as this takes a pointer to the start of the caller - requested region and returns a pointer to the start of the buffer. - */ -char * wxDebugContext::StartPos (const char * caller) -{ - return ((char *) (caller - wxDebugContext::PaddedSize (sizeof(wxMarkerType)) - - wxDebugContext::PaddedSize (sizeof (wxMemStruct)))); -} - -/* - We may need padding between various parts of the allocated memory. - Given a size of memory, this returns the amount of memory which should - be allocated in order to allow for alignment of the following object. - - I don't know how portable this stuff is, but it seems to work for me at - the moment. It would be real nice if I knew more about this! - - // Note: this function is now obsolete (along with CalcAlignment) - // because the calculations are done statically, for greater speed. -*/ -size_t wxDebugContext::GetPadding (size_t size) -{ - size_t pad = size % CalcAlignment (); - return (pad) ? sizeof(wxMarkerType) - pad : 0; -} - -size_t wxDebugContext::PaddedSize (size_t size) -{ - // Added by Terry Farnham to replace - // slow GetPadding call. - int padb; - - padb = size & m_balignmask; - if(padb) - return(size + m_balign - padb); - else - return(size); -} - -/* - Returns the total amount of memory which we need to get from the system - in order to satisfy a caller request. This includes space for the struct - plus markers and the caller's memory as well. -*/ -size_t wxDebugContext::TotSize (size_t reqSize) -{ - return (PaddedSize (sizeof (wxMemStruct)) + PaddedSize (reqSize) + - 2 * sizeof(wxMarkerType)); -} - - -/* - Traverse the list of nodes executing the given function on each node. -*/ -void wxDebugContext::TraverseList (PmSFV func, wxMemStruct *from) -{ - if (!from) - from = wxDebugContext::GetHead (); - - wxMemStruct * st = NULL; - for (st = from; st != 0; st = st->m_next) - { - void* data = st->GetActualData(); -// if ((data != (void*)m_debugStream) && (data != (void*) m_streamBuf)) - if (data != (void*) wxLog::GetActiveTarget()) - { - (st->*func) (); - } - } -} - - -/* - Print out the list. - */ -bool wxDebugContext::PrintList (void) -{ - TraverseList ((PmSFV)&wxMemStruct::PrintNode, (checkPoint ? checkPoint->m_next : NULL)); - - return true; -} - -bool wxDebugContext::Dump(void) -{ - { - const wxChar* appName = wxT("application"); - wxString appNameStr; - if (wxTheApp) - { - appNameStr = wxTheApp->GetAppName(); - appName = appNameStr.c_str(); - OutputDumpLine(wxT("----- Memory dump of %s at %s -----"), appName, static_cast(wxNow().c_str())); - } - else - { - OutputDumpLine( wxT("----- Memory dump -----") ); - } - } - - TraverseList ((PmSFV)&wxMemStruct::Dump, (checkPoint ? checkPoint->m_next : NULL)); - - OutputDumpLine(wxEmptyString); - OutputDumpLine(wxEmptyString); - - return true; -} - -struct wxDebugStatsStruct -{ - long instanceCount; - long totalSize; - wxChar *instanceClass; - wxDebugStatsStruct *next; -}; - -static wxDebugStatsStruct *FindStatsStruct(wxDebugStatsStruct *st, wxChar *name) -{ - while (st) - { - if (wxStrcmp(st->instanceClass, name) == 0) - return st; - st = st->next; - } - return NULL; -} - -static wxDebugStatsStruct *InsertStatsStruct(wxDebugStatsStruct *head, wxDebugStatsStruct *st) -{ - st->next = head; - return st; -} - -bool wxDebugContext::PrintStatistics(bool detailed) -{ - { - const wxChar* appName = wxT("application"); - wxString appNameStr; - if (wxTheApp) - { - appNameStr = wxTheApp->GetAppName(); - appName = appNameStr.c_str(); - OutputDumpLine(wxT("----- Memory statistics of %s at %s -----"), appName, static_cast(wxNow().c_str())); - } - else - { - OutputDumpLine( wxT("----- Memory statistics -----") ); - } - } - - bool currentMode = GetDebugMode(); - SetDebugMode(false); - - long noNonObjectNodes = 0; - long noObjectNodes = 0; - long totalSize = 0; - - wxDebugStatsStruct *list = NULL; - - wxMemStruct *from = (checkPoint ? checkPoint->m_next : NULL ); - if (!from) - from = wxDebugContext::GetHead (); - - wxMemStruct *st; - for (st = from; st != 0; st = st->m_next) - { - void* data = st->GetActualData(); - if (detailed && (data != (void*) wxLog::GetActiveTarget())) - { - wxChar *className = (wxChar*) wxT("nonobject"); - if (st->m_isObject && st->GetActualData()) - { - wxObject *obj = (wxObject *)st->GetActualData(); - if (obj->GetClassInfo()->GetClassName()) - className = (wxChar*)obj->GetClassInfo()->GetClassName(); - } - wxDebugStatsStruct *stats = FindStatsStruct(list, className); - if (!stats) - { - stats = (wxDebugStatsStruct *)malloc(sizeof(wxDebugStatsStruct)); - stats->instanceClass = className; - stats->instanceCount = 0; - stats->totalSize = 0; - list = InsertStatsStruct(list, stats); - } - stats->instanceCount ++; - stats->totalSize += st->RequestSize(); - } - - if (data != (void*) wxLog::GetActiveTarget()) - { - totalSize += st->RequestSize(); - if (st->m_isObject) - noObjectNodes ++; - else - noNonObjectNodes ++; - } - } - - if (detailed) - { - while (list) - { - OutputDumpLine(wxT("%ld objects of class %s, total size %ld"), - list->instanceCount, list->instanceClass, list->totalSize); - wxDebugStatsStruct *old = list; - list = old->next; - free((char *)old); - } - OutputDumpLine(wxEmptyString); - } - - SetDebugMode(currentMode); - - OutputDumpLine(wxT("Number of object items: %ld"), noObjectNodes); - OutputDumpLine(wxT("Number of non-object items: %ld"), noNonObjectNodes); - OutputDumpLine(wxT("Total allocated size: %ld"), totalSize); - OutputDumpLine(wxEmptyString); - OutputDumpLine(wxEmptyString); - - return true; -} - -bool wxDebugContext::PrintClasses(void) -{ - { - const wxChar* appName = wxT("application"); - wxString appNameStr; - if (wxTheApp) - { - appNameStr = wxTheApp->GetAppName(); - appName = appNameStr.c_str(); - wxLogMessage(wxT("----- Classes in %s -----"), appName); - } - } - - int n = 0; - const wxClassInfo *info; - - for (wxClassInfo::const_iterator node = wxClassInfo::begin_classinfo(), - end = wxClassInfo::end_classinfo(); - node != end; ++node) - { - info = *node; - if (info->GetClassName()) - { - wxString msg(info->GetClassName()); - msg += wxT(" "); - - if (info->GetBaseClassName1() && !info->GetBaseClassName2()) - { - msg += wxT("is a "); - msg += info->GetBaseClassName1(); - } - else if (info->GetBaseClassName1() && info->GetBaseClassName2()) - { - msg += wxT("is a "); - msg += info->GetBaseClassName1() ; - msg += wxT(", "); - msg += info->GetBaseClassName2() ; - } - if (info->GetConstructor()) - msg += wxT(": dynamic"); - - wxLogMessage(msg); - } - n ++; - } - wxLogMessage(wxEmptyString); - wxLogMessage(wxT("There are %d classes derived from wxObject."), n); - wxLogMessage(wxEmptyString); - wxLogMessage(wxEmptyString); - return true; -} - -void wxDebugContext::SetCheckpoint(bool all) -{ - if (all) - checkPoint = NULL; - else - checkPoint = m_tail; -} - -// Checks all nodes since checkpoint, or since start. -int wxDebugContext::Check(bool checkAll) -{ - int nFailures = 0; - - wxMemStruct *from = (checkPoint ? checkPoint->m_next : NULL ); - if (!from || checkAll) - from = wxDebugContext::GetHead (); - - for (wxMemStruct * st = from; st != 0; st = st->m_next) - { - if (st->AssertIt ()) - nFailures += st->CheckBlock (); - else - return -1; - } - - return nFailures; -} - -// Count the number of non-wxDebugContext-related objects -// that are outstanding -int wxDebugContext::CountObjectsLeft(bool sinceCheckpoint) -{ - int n = 0; - - wxMemStruct *from = NULL; - if (sinceCheckpoint && checkPoint) - from = checkPoint->m_next; - else - from = wxDebugContext::GetHead () ; - - for (wxMemStruct * st = from; st != 0; st = st->m_next) - { - void* data = st->GetActualData(); - if (data != (void*) wxLog::GetActiveTarget()) - n ++; - } - - return n ; -} - -// This function is used to output the dump -void wxDebugContext::OutputDumpLine(const wxChar *szFormat, ...) -{ - // a buffer of 2048 bytes should be long enough for a file name - // and a class name - wxChar buf[2048]; - int count; - va_list argptr; - va_start(argptr, szFormat); - buf[WXSIZEOF(buf)-1] = wxT('\0'); - - // keep 3 bytes for a \r\n\0 - count = wxVsnprintf(buf, WXSIZEOF(buf)-3, szFormat, argptr); - - if ( count < 0 ) - count = WXSIZEOF(buf)-3; - buf[count]=wxT('\r'); - buf[count+1]=wxT('\n'); - buf[count+2]=wxT('\0'); - - wxMessageOutputDebug dbgout; - dbgout.Printf(buf); -} - -void wxDebugContext::SetShutdownNotifyFunction(wxShutdownNotifyFunction shutdownFn) -{ - sm_shutdownFn = shutdownFn; -} - - -#if USE_THREADSAFE_MEMORY_ALLOCATION -static bool memSectionOk = false; - -class MemoryCriticalSection : public wxCriticalSection -{ -public: - MemoryCriticalSection() { - memSectionOk = true; - } - ~MemoryCriticalSection() { - memSectionOk = false; - } -}; - -class MemoryCriticalSectionLocker -{ -public: - inline MemoryCriticalSectionLocker(wxCriticalSection& critsect) - : m_critsect(critsect), m_locked(memSectionOk) { if(m_locked) m_critsect.Enter(); } - inline ~MemoryCriticalSectionLocker() { if(m_locked) m_critsect.Leave(); } - -private: - // no assignment operator nor copy ctor - MemoryCriticalSectionLocker(const MemoryCriticalSectionLocker&); - MemoryCriticalSectionLocker& operator=(const MemoryCriticalSectionLocker&); - - wxCriticalSection& m_critsect; - bool m_locked; -}; - -static MemoryCriticalSection memLocker; - -#endif // USE_THREADSAFE_MEMORY_ALLOCATION - - -#if !(defined(__WINDOWS__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE))) -#if wxUSE_GLOBAL_MEMORY_OPERATORS -void * operator new (size_t size, wxChar * fileName, int lineNum) -{ - return wxDebugAlloc(size, fileName, lineNum, false, false); -} - -void * operator new (size_t size) -{ - return wxDebugAlloc(size, NULL, 0, false); -} - -void operator delete (void * buf) -{ - wxDebugFree(buf, false); -} - -#if wxUSE_ARRAY_MEMORY_OPERATORS -void * operator new[] (size_t size) -{ - return wxDebugAlloc(size, NULL, 0, false, true); -} - -void * operator new[] (size_t size, wxChar * fileName, int lineNum) -{ - return wxDebugAlloc(size, fileName, lineNum, false, true); -} - -void operator delete[] (void * buf) -{ - wxDebugFree(buf, true); -} -#endif // wxUSE_ARRAY_MEMORY_OPERATORS -#endif // wxUSE_GLOBAL_MEMORY_OPERATORS -#endif // !(defined(__WINDOWS__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE))) - -// TODO: store whether this is a vector or not. -void * wxDebugAlloc(size_t size, wxChar * fileName, int lineNum, bool isObject, bool WXUNUSED(isVect) ) -{ -#if USE_THREADSAFE_MEMORY_ALLOCATION - MemoryCriticalSectionLocker lock(memLocker); -#endif - - // If not in debugging allocation mode, do the normal thing - // so we don't leave any trace of ourselves in the node list. - - if (!wxDebugContext::GetDebugMode()) - { - return (void *)malloc(size); - } - - int totSize = wxDebugContext::TotSize (size); - char * buf = (char *) malloc(totSize); - if (!buf) { - wxLogMessage(wxT("Call to malloc (%ld) failed."), (long)size); - return 0; - } - wxMemStruct * st = (wxMemStruct *)buf; - st->m_firstMarker = MemStartCheck; - st->m_reqSize = size; - st->m_fileName = fileName; - st->m_lineNum = lineNum; - st->m_id = MemStructId; - st->m_prev = 0; - st->m_next = 0; - st->m_isObject = isObject; - - // Errors from Append() shouldn't really happen - but just in case! - if (st->Append () == 0) { - st->ErrorMsg ("Trying to append new node"); - } - - if (wxDebugContext::GetCheckPrevious ()) { - if (st->CheckAllPrevious () < 0) { - st->ErrorMsg ("Checking previous nodes"); - } - } - - // Set up the extra markers at the middle and end. - char * ptr = wxDebugContext::MidMarkerPos (buf); - * (wxMarkerType *) ptr = MemMidCheck; - ptr = wxDebugContext::EndMarkerPos (buf, size); - * (wxMarkerType *) ptr = MemEndCheck; - - // pointer returned points to the start of the caller's - // usable area. - void *m_actualData = (void *) wxDebugContext::CallerMemPos (buf); - st->m_actualData = m_actualData; - - return m_actualData; -} - -// TODO: check whether was allocated as a vector -void wxDebugFree(void * buf, bool WXUNUSED(isVect) ) -{ -#if USE_THREADSAFE_MEMORY_ALLOCATION - MemoryCriticalSectionLocker lock(memLocker); -#endif - - if (!buf) - return; - - // If not in debugging allocation mode, do the normal thing - // so we don't leave any trace of ourselves in the node list. - if (!wxDebugContext::GetDebugMode()) - { - free((char *)buf); - return; - } - - // Points to the start of the entire allocated area. - char * startPointer = wxDebugContext::StartPos ((char *) buf); - // Find the struct and make sure that it's identifiable. - wxMemStruct * st = (wxMemStruct *) wxDebugContext::StructPos (startPointer); - - if (! st->ValidateNode ()) - return; - - // If this is the current checkpoint, we need to - // move the checkpoint back so it points to a valid - // node. - if (st == wxDebugContext::checkPoint) - wxDebugContext::checkPoint = wxDebugContext::checkPoint->m_prev; - - if (! st->Unlink ()) - { - st->ErrorMsg ("Unlinking deleted node"); - } - - // Now put in the fill char into the id slot and the caller requested - // memory locations. - st->SetDeleted (); - (void) memset (wxDebugContext::CallerMemPos (startPointer), MemFillChar, - st->RequestSize ()); - - free((char *)st); -} - -// Trace: send output to the current debugging stream -void wxTrace(const wxChar * ...) -{ -#if 1 - wxFAIL_MSG(wxT("wxTrace is now obsolete. Please use wxDebugXXX instead.")); -#else - va_list ap; - static wxChar buffer[512]; - - va_start(ap, fmt); - -#ifdef __WINDOWS__ - wvsprintf(buffer,fmt,ap) ; -#else - vsprintf(buffer,fmt,ap) ; -#endif - - va_end(ap); - - if (wxDebugContext::HasStream()) - { - wxDebugContext::GetStream() << buffer; - wxDebugContext::GetStream().flush(); - } - else -#ifdef __WINDOWS__ -#ifdef __WIN32__ - OutputDebugString((LPCTSTR)buffer) ; -#else - OutputDebugString((const char*) buffer) ; -#endif -#else - fprintf(stderr, buffer); -#endif -#endif -} - -// Trace with level -void wxTraceLevel(int, const wxChar * ...) -{ -#if 1 - wxFAIL_MSG(wxT("wxTrace is now obsolete. Please use wxDebugXXX instead.")); -#else - if (wxDebugContext::GetLevel() < level) - return; - - va_list ap; - static wxChar buffer[512]; - - va_start(ap, fmt); - -#ifdef __WINDOWS__ - wxWvsprintf(buffer,fmt,ap) ; -#else - vsprintf(buffer,fmt,ap) ; -#endif - - va_end(ap); - - if (wxDebugContext::HasStream()) - { - wxDebugContext::GetStream() << buffer; - wxDebugContext::GetStream().flush(); - } - else -#ifdef __WINDOWS__ -#ifdef __WIN32__ - OutputDebugString((LPCTSTR)buffer) ; -#else - OutputDebugString((const char*) buffer) ; -#endif -#else - fprintf(stderr, buffer); -#endif -#endif -} - -//---------------------------------------------------------------------------- -// Final cleanup after all global objects in all files have been destroyed -//---------------------------------------------------------------------------- - -// Don't set it to 0 by dynamic initialization -// Some compilers will really do the assignment later -// All global variables are initialized to 0 at the very beginning, and this is just fine. -int wxDebugContextDumpDelayCounter::sm_count; - -wxDebugContextDumpDelayCounter::wxDebugContextDumpDelayCounter() -{ - sm_count++; -} - -wxDebugContextDumpDelayCounter::~wxDebugContextDumpDelayCounter() -{ - if ( !--sm_count ) - { - // Notify app if we've been asked to do that - if( wxDebugContext::sm_shutdownFn ) - wxDebugContext::sm_shutdownFn(); - DoDump(); - } -} - -void wxDebugContextDumpDelayCounter::DoDump() -{ - if (wxDebugContext::CountObjectsLeft(true) > 0) - { - wxDebugContext::OutputDumpLine(wxT("There were memory leaks.\n")); - wxDebugContext::Dump(); - wxDebugContext::PrintStatistics(); - } -} - -// Even if there is nothing else, make sure that there is at -// least one cleanup counter object -static wxDebugContextDumpDelayCounter wxDebugContextDumpDelayCounter_One; - -#endif // wxUSE_MEMORY_TRACING || wxUSE_DEBUG_CONTEXT diff --git a/Externals/wxWidgets3/src/common/menucmn.cpp b/Externals/wxWidgets3/src/common/menucmn.cpp deleted file mode 100644 index 2808af69d6..0000000000 --- a/Externals/wxWidgets3/src/common/menucmn.cpp +++ /dev/null @@ -1,1112 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/menucmn.cpp -// Purpose: wxMenu and wxMenuBar methods common to all ports -// Author: Vadim Zeitlin -// Modified by: -// Created: 26.10.99 -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_MENUS - -#ifndef WX_PRECOMP - #include "wx/intl.h" - #include "wx/log.h" - #include "wx/menu.h" - #include "wx/frame.h" -#endif - -#include "wx/stockitem.h" - -// ---------------------------------------------------------------------------- -// template lists -// ---------------------------------------------------------------------------- - -#include "wx/listimpl.cpp" - -WX_DEFINE_LIST(wxMenuList) -WX_DEFINE_LIST(wxMenuItemList) - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// XTI for wxMenu(Bar) -// ---------------------------------------------------------------------------- - -wxDEFINE_FLAGS( wxMenuStyle ) -wxBEGIN_FLAGS( wxMenuStyle ) -wxFLAGS_MEMBER(wxMENU_TEAROFF) -wxEND_FLAGS( wxMenuStyle ) - -wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxMenu, wxEvtHandler, "wx/menu.h"); -wxCOLLECTION_TYPE_INFO( wxMenuItem *, wxMenuItemList ) ; - -#if wxUSE_EXTENDED_RTTI -template<> void wxCollectionToVariantArray( wxMenuItemList const &theList, - wxAnyList &value) -{ - wxListCollectionToAnyList( theList, value ) ; -} -#endif - -wxBEGIN_PROPERTIES_TABLE(wxMenu) -wxEVENT_PROPERTY( Select, wxEVT_MENU, wxCommandEvent) - -wxPROPERTY( Title, wxString, SetTitle, GetTitle, wxString(), \ - 0 /*flags*/, wxT("Helpstring"), wxT("group") ) - -wxREADONLY_PROPERTY_FLAGS( MenuStyle, wxMenuStyle, long, GetStyle, \ - wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, wxT("Helpstring"), \ - wxT("group")) // style - -wxPROPERTY_COLLECTION( MenuItems, wxMenuItemList, wxMenuItem*, Append, \ - GetMenuItems, 0 /*flags*/, wxT("Helpstring"), wxT("group")) -wxEND_PROPERTIES_TABLE() - -wxEMPTY_HANDLERS_TABLE(wxMenu) - -wxDIRECT_CONSTRUCTOR_2( wxMenu, wxString, Title, long, MenuStyle ) - -wxDEFINE_FLAGS( wxMenuBarStyle ) - -wxBEGIN_FLAGS( wxMenuBarStyle ) -wxFLAGS_MEMBER(wxMB_DOCKABLE) -wxEND_FLAGS( wxMenuBarStyle ) - -#if wxUSE_EXTENDED_RTTI -// the negative id would lead the window (its superclass !) to -// vetoe streaming out otherwise -bool wxMenuBarStreamingCallback( const wxObject *WXUNUSED(object), wxObjectWriter *, - wxObjectWriterCallback *, const wxStringToAnyHashMap & ) -{ - return true; -} -#endif - -wxIMPLEMENT_DYNAMIC_CLASS_XTI_CALLBACK(wxMenuBar, wxWindow, "wx/menu.h", \ - wxMenuBarStreamingCallback) - - -#if wxUSE_EXTENDED_RTTI -WX_DEFINE_LIST( wxMenuInfoHelperList ) - -wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxMenuInfoHelper, wxObject, "wx/menu.h"); - -wxBEGIN_PROPERTIES_TABLE(wxMenuInfoHelper) -wxREADONLY_PROPERTY( Menu, wxMenu*, GetMenu, wxEMPTY_PARAMETER_VALUE, \ - 0 /*flags*/, wxT("Helpstring"), wxT("group")) - -wxREADONLY_PROPERTY( Title, wxString, GetTitle, wxString(), \ - 0 /*flags*/, wxT("Helpstring"), wxT("group")) -wxEND_PROPERTIES_TABLE() - -wxEMPTY_HANDLERS_TABLE(wxMenuInfoHelper) - -wxCONSTRUCTOR_2( wxMenuInfoHelper, wxMenu*, Menu, wxString, Title ) - -wxCOLLECTION_TYPE_INFO( wxMenuInfoHelper *, wxMenuInfoHelperList ) ; - -template<> void wxCollectionToVariantArray( wxMenuInfoHelperList const &theList, - wxAnyList &value) -{ - wxListCollectionToAnyList( theList, value ) ; -} - -#endif - -wxBEGIN_PROPERTIES_TABLE(wxMenuBar) -wxPROPERTY_COLLECTION( MenuInfos, wxMenuInfoHelperList, wxMenuInfoHelper*, AppendMenuInfo, \ - GetMenuInfos, 0 /*flags*/, wxT("Helpstring"), wxT("group")) -wxEND_PROPERTIES_TABLE() - -wxEMPTY_HANDLERS_TABLE(wxMenuBar) - -wxCONSTRUCTOR_DUMMY( wxMenuBar ) - -#if wxUSE_EXTENDED_RTTI - -const wxMenuInfoHelperList& wxMenuBarBase::GetMenuInfos() const -{ - wxMenuInfoHelperList* list = const_cast< wxMenuInfoHelperList* > (& m_menuInfos); - WX_CLEAR_LIST( wxMenuInfoHelperList, *list); - for (size_t i = 0 ; i < GetMenuCount(); ++i) - { - wxMenuInfoHelper* info = new wxMenuInfoHelper(); - info->Create( GetMenu(i), GetMenuLabel(i)); - list->Append(info); - } - return m_menuInfos; -} - -#endif - -// ---------------------------------------------------------------------------- -// XTI for wxMenuItem -// ---------------------------------------------------------------------------- - -#if wxUSE_EXTENDED_RTTI - -bool wxMenuItemStreamingCallback( const wxObject *object, wxObjectWriter *, - wxObjectWriterCallback *, const wxStringToAnyHashMap & ) -{ - const wxMenuItem * mitem = wx_dynamic_cast(const wxMenuItem*, object); - if ( mitem->GetMenu() && !mitem->GetMenu()->GetTitle().empty() ) - { - // we don't stream out the first two items for menus with a title, - // they will be reconstructed - if ( mitem->GetMenu()->FindItemByPosition(0) == mitem || - mitem->GetMenu()->FindItemByPosition(1) == mitem ) - return false; - } - return true; -} - -#endif - -wxBEGIN_ENUM( wxItemKind ) -wxENUM_MEMBER( wxITEM_SEPARATOR ) -wxENUM_MEMBER( wxITEM_NORMAL ) -wxENUM_MEMBER( wxITEM_CHECK ) -wxENUM_MEMBER( wxITEM_RADIO ) -wxEND_ENUM( wxItemKind ) - -wxIMPLEMENT_DYNAMIC_CLASS_XTI_CALLBACK(wxMenuItem, wxObject, "wx/menuitem.h", \ - wxMenuItemStreamingCallback) - -wxBEGIN_PROPERTIES_TABLE(wxMenuItem) -wxPROPERTY( Parent, wxMenu*, SetMenu, GetMenu, wxEMPTY_PARAMETER_VALUE, \ - 0 /*flags*/, wxT("Helpstring"), wxT("group") ) -wxPROPERTY( Id, int, SetId, GetId, wxEMPTY_PARAMETER_VALUE, \ - 0 /*flags*/, wxT("Helpstring"), wxT("group") ) -wxPROPERTY( ItemLabel, wxString, SetItemLabel, GetItemLabel, wxString(), \ - 0 /*flags*/, wxT("Helpstring"), wxT("group") ) -wxPROPERTY( Help, wxString, SetHelp, GetHelp, wxString(), \ - 0 /*flags*/, wxT("Helpstring"), wxT("group") ) -wxREADONLY_PROPERTY( Kind, wxItemKind, GetKind, wxEMPTY_PARAMETER_VALUE, \ - 0 /*flags*/, wxT("Helpstring"), wxT("group") ) -wxPROPERTY( SubMenu, wxMenu*, SetSubMenu, GetSubMenu, wxEMPTY_PARAMETER_VALUE, \ - 0 /*flags*/, wxT("Helpstring"), wxT("group") ) -wxPROPERTY( Enabled, bool, Enable, IsEnabled, wxAny((bool)true), \ - 0 /*flags*/, wxT("Helpstring"), wxT("group") ) -wxPROPERTY( Checked, bool, Check, IsChecked, wxAny((bool)false), \ - 0 /*flags*/, wxT("Helpstring"), wxT("group") ) -wxPROPERTY( Checkable, bool, SetCheckable, IsCheckable, wxAny((bool)false), \ - 0 /*flags*/, wxT("Helpstring"), wxT("group") ) -wxEND_PROPERTIES_TABLE() - -wxEMPTY_HANDLERS_TABLE(wxMenuItem) - -wxDIRECT_CONSTRUCTOR_6( wxMenuItem, wxMenu*, Parent, int, Id, wxString, \ - Text, wxString, Help, wxItemKind, Kind, wxMenu*, SubMenu ) - -// ---------------------------------------------------------------------------- -// wxMenuItemBase -// ---------------------------------------------------------------------------- - -wxMenuItemBase::wxMenuItemBase(wxMenu *parentMenu, - int itemid, - const wxString& text, - const wxString& help, - wxItemKind kind, - wxMenu *subMenu) -{ - switch ( itemid ) - { - case wxID_ANY: - m_id = wxWindow::NewControlId(); - break; - - case wxID_SEPARATOR: - m_id = wxID_SEPARATOR; - - // there is a lot of existing code just doing Append(wxID_SEPARATOR) - // and it makes sense to omit the following optional parameters, - // including the kind one which doesn't default to wxITEM_SEPARATOR, - // of course, so override it here - kind = wxITEM_SEPARATOR; - break; - - case wxID_NONE: - // (popup) menu titles in wxMSW use this ID to indicate that - // it's not a real menu item, so we don't want the check below to - // apply to it - m_id = itemid; - break; - - default: - // ids are limited to 16 bits under MSW so portable code shouldn't - // use ids outside of this range (negative ids generated by wx are - // fine though) - wxASSERT_MSG( (itemid >= 0 && itemid < SHRT_MAX) || - (itemid >= wxID_AUTO_LOWEST && itemid <= wxID_AUTO_HIGHEST), - wxS("invalid itemid value") ); - m_id = itemid; - } - - // notice that parentMenu can be NULL: the item can be attached to the menu - // later with SetMenu() - - m_parentMenu = parentMenu; - m_subMenu = subMenu; - m_isEnabled = true; - m_isChecked = false; - m_kind = kind; - - SetItemLabel(text); - SetHelp(help); -} - -wxMenuItemBase::~wxMenuItemBase() -{ - delete m_subMenu; -} - -#if wxUSE_ACCEL - -wxAcceleratorEntry *wxMenuItemBase::GetAccel() const -{ - return wxAcceleratorEntry::Create(GetItemLabel()); -} - -void wxMenuItemBase::SetAccel(wxAcceleratorEntry *accel) -{ - wxString text = m_text.BeforeFirst(wxT('\t')); - if ( accel ) - { - text += wxT('\t'); - text += accel->ToString(); - } - - SetItemLabel(text); -} - -#endif // wxUSE_ACCEL - -void wxMenuItemBase::SetItemLabel(const wxString& str) -{ - m_text = str; - - if ( m_text.empty() && !IsSeparator() ) - { - wxASSERT_MSG( wxIsStockID(GetId()), - wxT("A non-stock menu item with an empty label?") ); - m_text = wxGetStockLabel(GetId(), wxSTOCK_WITH_ACCELERATOR | - wxSTOCK_WITH_MNEMONIC); - } -} - -void wxMenuItemBase::SetHelp(const wxString& str) -{ - m_help = str; - - if ( m_help.empty() && !IsSeparator() && wxIsStockID(GetId()) ) - { - // get a stock help string - m_help = wxGetStockHelpString(GetId()); - } -} - -wxString wxMenuItemBase::GetLabelText(const wxString& text) -{ - return wxStripMenuCodes(text); -} - -#if WXWIN_COMPATIBILITY_2_8 -wxString wxMenuItemBase::GetLabelFromText(const wxString& text) -{ - return GetLabelText(text); -} -#endif - -bool wxMenuBase::ms_locked = true; - -// ---------------------------------------------------------------------------- -// wxMenu ctor and dtor -// ---------------------------------------------------------------------------- - -void wxMenuBase::Init(long style) -{ - m_menuBar = NULL; - m_menuParent = NULL; - - m_invokingWindow = NULL; - m_style = style; - m_clientData = NULL; - m_eventHandler = this; -} - -wxMenuBase::~wxMenuBase() -{ - WX_CLEAR_LIST(wxMenuItemList, m_items); -} - -// ---------------------------------------------------------------------------- -// wxMenu item adding/removing -// ---------------------------------------------------------------------------- - -void wxMenuBase::AddSubMenu(wxMenu *submenu) -{ - wxCHECK_RET( submenu, wxT("can't add a NULL submenu") ); - - submenu->SetParent((wxMenu *)this); -} - -wxMenuItem* wxMenuBase::DoAppend(wxMenuItem *item) -{ - wxCHECK_MSG( item, NULL, wxT("invalid item in wxMenu::Append()") ); - - m_items.Append(item); - item->SetMenu((wxMenu*)this); - if ( item->IsSubMenu() ) - { - AddSubMenu(item->GetSubMenu()); - } - - return item; -} - -wxMenuItem* wxMenuBase::Insert(size_t pos, wxMenuItem *item) -{ - wxCHECK_MSG( item, NULL, wxT("invalid item in wxMenu::Insert") ); - - if ( pos == GetMenuItemCount() ) - { - return DoAppend(item); - } - else - { - wxCHECK_MSG( pos < GetMenuItemCount(), NULL, - wxT("invalid index in wxMenu::Insert") ); - - return DoInsert(pos, item); - } -} - -wxMenuItem* wxMenuBase::DoInsert(size_t pos, wxMenuItem *item) -{ - wxCHECK_MSG( item, NULL, wxT("invalid item in wxMenu::Insert()") ); - - wxMenuItemList::compatibility_iterator node = m_items.Item(pos); - wxCHECK_MSG( node, NULL, wxT("invalid index in wxMenu::Insert()") ); - - m_items.Insert(node, item); - item->SetMenu((wxMenu*)this); - if ( item->IsSubMenu() ) - { - AddSubMenu(item->GetSubMenu()); - } - - return item; -} - -wxMenuItem *wxMenuBase::Remove(wxMenuItem *item) -{ - wxCHECK_MSG( item, NULL, wxT("invalid item in wxMenu::Remove") ); - - wxMenuItemList::compatibility_iterator node = m_items.Find(item); - - // if we get here, the item is valid or one of Remove() functions is broken - wxCHECK_MSG( node, NULL, wxT("removing item not in the menu?") ); - - // call DoRemove() before removing the item from the list of items as the - // existing code in port-specific implementation may rely on the item still - // being there (this is the case for at least wxMSW) - wxMenuItem* const item2 = DoRemove(item); - - // we detach the item, but we do delete the list node (i.e. don't call - // DetachNode() here!) - m_items.Erase(node); - - return item2; -} - -wxMenuItem *wxMenuBase::DoRemove(wxMenuItem *item) -{ - item->SetMenu(NULL); - wxMenu *submenu = item->GetSubMenu(); - if ( submenu ) - { - submenu->SetParent(NULL); - if ( submenu->IsAttached() ) - submenu->Detach(); - } - - return item; -} - -bool wxMenuBase::Delete(wxMenuItem *item) -{ - wxCHECK_MSG( item, false, wxT("invalid item in wxMenu::Delete") ); - - return DoDelete(item); -} - -bool wxMenuBase::DoDelete(wxMenuItem *item) -{ - wxMenuItem *item2 = Remove(item); - wxCHECK_MSG( item2, false, wxT("failed to delete menu item") ); - - // don't delete the submenu - item2->SetSubMenu(NULL); - - delete item2; - - return true; -} - -bool wxMenuBase::Destroy(wxMenuItem *item) -{ - wxCHECK_MSG( item, false, wxT("invalid item in wxMenu::Destroy") ); - - return DoDestroy(item); -} - -bool wxMenuBase::DoDestroy(wxMenuItem *item) -{ - wxMenuItem *item2 = Remove(item); - wxCHECK_MSG( item2, false, wxT("failed to delete menu item") ); - - delete item2; - - return true; -} - -// ---------------------------------------------------------------------------- -// wxMenu searching for items -// ---------------------------------------------------------------------------- - -// Finds the item id matching the given string, wxNOT_FOUND if not found. -int wxMenuBase::FindItem(const wxString& text) const -{ - wxString label = wxMenuItem::GetLabelText(text); - for ( wxMenuItemList::compatibility_iterator node = m_items.GetFirst(); - node; - node = node->GetNext() ) - { - wxMenuItem *item = node->GetData(); - if ( item->IsSubMenu() ) - { - int rc = item->GetSubMenu()->FindItem(label); - if ( rc != wxNOT_FOUND ) - return rc; - } - - // we execute this code for submenus as well to alllow finding them by - // name just like the ordinary items - if ( !item->IsSeparator() ) - { - if ( item->GetItemLabelText() == label ) - return item->GetId(); - } - } - - return wxNOT_FOUND; -} - -// recursive search for item by id -wxMenuItem *wxMenuBase::FindItem(int itemId, wxMenu **itemMenu) const -{ - if ( itemMenu ) - *itemMenu = NULL; - - wxMenuItem *item = NULL; - for ( wxMenuItemList::compatibility_iterator node = m_items.GetFirst(); - node && !item; - node = node->GetNext() ) - { - item = node->GetData(); - - if ( item->GetId() == itemId ) - { - if ( itemMenu ) - *itemMenu = (wxMenu *)this; - } - else if ( item->IsSubMenu() ) - { - item = item->GetSubMenu()->FindItem(itemId, itemMenu); - } - else - { - // don't exit the loop - item = NULL; - } - } - - return item; -} - -// non recursive search -wxMenuItem *wxMenuBase::FindChildItem(int itemid, size_t *ppos) const -{ - wxMenuItem *item = NULL; - wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst(); - - size_t pos; - for ( pos = 0; node; pos++ ) - { - if ( node->GetData()->GetId() == itemid ) - { - item = node->GetData(); - - break; - } - - node = node->GetNext(); - } - - if ( ppos ) - { - *ppos = item ? pos : (size_t)wxNOT_FOUND; - } - - return item; -} - -// find by position -wxMenuItem* wxMenuBase::FindItemByPosition(size_t position) const -{ - wxCHECK_MSG( position < m_items.GetCount(), NULL, - wxT("wxMenu::FindItemByPosition(): invalid menu index") ); - - return m_items.Item( position )->GetData(); -} - -// ---------------------------------------------------------------------------- -// wxMenu helpers used by derived classes -// ---------------------------------------------------------------------------- - -void wxMenuBase::UpdateUI(wxEvtHandler* source) -{ - wxWindow * const win = GetWindow(); - - if ( !source && win ) - source = win->GetEventHandler(); - if ( !source ) - source = GetEventHandler(); - if ( !source ) - source = this; - - wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst(); - while ( node ) - { - wxMenuItem* item = node->GetData(); - if ( !item->IsSeparator() ) - { - wxWindowID itemid = item->GetId(); - wxUpdateUIEvent event(itemid); - event.SetEventObject( this ); - - if ( source->ProcessEvent(event) ) - { - // if anything changed, update the changed attribute - if (event.GetSetText()) - SetLabel(itemid, event.GetText()); - if (event.GetSetChecked()) - Check(itemid, event.GetChecked()); - if (event.GetSetEnabled()) - Enable(itemid, event.GetEnabled()); - } - - // recurse to the submenus - if ( item->GetSubMenu() ) - item->GetSubMenu()->UpdateUI(source); - } - //else: item is a separator (which doesn't process update UI events) - - node = node->GetNext(); - } -} - -bool wxMenuBase::SendEvent(int itemid, int checked) -{ - wxCommandEvent event(wxEVT_MENU, itemid); - event.SetInt(checked); - - return DoProcessEvent(this, event, GetWindow()); -} - -/* static */ -bool wxMenuBase::DoProcessEvent(wxMenuBase* menu, wxEvent& event, wxWindow* win) -{ - event.SetEventObject(menu); - - if ( menu ) - { - wxMenuBar* const mb = menu->GetMenuBar(); - - // Try the menu's event handler first - wxEvtHandler *handler = menu->GetEventHandler(); - if ( handler ) - { - // Indicate to the event processing code that we're going to pass - // this event to another handler if it's not processed here to - // prevent it from passing the event to wxTheApp: this will be done - // below if we do have the associated window. - if ( win || mb ) - event.SetWillBeProcessedAgain(); - - if ( handler->SafelyProcessEvent(event) ) - return true; - } - - // If this menu is part of the menu bar, try the event there. this - if ( mb ) - { - if ( mb->HandleWindowEvent(event) ) - return true; - - // If this already propagated it upwards to the window containing - // the menu bar, we don't have to handle it in this window again - // below. - if ( event.ShouldPropagate() ) - return false; - } - } - - // Try the window the menu was popped up from. - if ( win ) - return win->HandleWindowEvent(event); - - // Not processed. - return false; -} - -/* static */ -bool -wxMenuBase::ProcessMenuEvent(wxMenu* menu, wxMenuEvent& event, wxWindow* win) -{ - // Try to process the event in the usual places first. - if ( DoProcessEvent(menu, event, win) ) - return true; - - // But the menu events should also reach the TLW parent if they were not - // processed before so, as it's not a command event and hence doesn't - // bubble up by default, send it there explicitly if not done yet. - wxWindow* const tlw = wxGetTopLevelParent(win); - if ( tlw != win && tlw->HandleWindowEvent(event) ) - return true; - - return false; -} - -// ---------------------------------------------------------------------------- -// wxMenu attaching/detaching to/from menu bar -// ---------------------------------------------------------------------------- - -wxMenuBar* wxMenuBase::GetMenuBar() const -{ - if(GetParent()) - return GetParent()->GetMenuBar(); - return m_menuBar; -} - -void wxMenuBase::Attach(wxMenuBarBase *menubar) -{ - // use Detach() instead! - wxASSERT_MSG( menubar, wxT("menu can't be attached to NULL menubar") ); - - // use IsAttached() to prevent this from happening - wxASSERT_MSG( !m_menuBar, wxT("attaching menu twice?") ); - - m_menuBar = (wxMenuBar *)menubar; -} - -void wxMenuBase::Detach() -{ - // use IsAttached() to prevent this from happening - wxASSERT_MSG( m_menuBar, wxT("detaching unattached menu?") ); - - m_menuBar = NULL; -} - -// ---------------------------------------------------------------------------- -// wxMenu invoking window handling -// ---------------------------------------------------------------------------- - -void wxMenuBase::SetInvokingWindow(wxWindow *win) -{ - wxASSERT_MSG( !GetParent(), - "should only be called for top level popup menus" ); - wxASSERT_MSG( !IsAttached(), - "menus attached to menu bar can't have invoking window" ); - - m_invokingWindow = win; -} - -wxWindow *wxMenuBase::GetWindow() const -{ - // only the top level menus have non-NULL invoking window or a pointer to - // the menu bar so recurse upwards until we find it - const wxMenuBase *menu = this; - while ( menu->GetParent() ) - { - menu = menu->GetParent(); - } - - return menu->GetMenuBar() ? menu->GetMenuBar()->GetFrame() - : menu->GetInvokingWindow(); -} - -// ---------------------------------------------------------------------------- -// wxMenu functions forwarded to wxMenuItem -// ---------------------------------------------------------------------------- - -void wxMenuBase::Enable( int itemid, bool enable ) -{ - wxMenuItem *item = FindItem(itemid); - - wxCHECK_RET( item, wxT("wxMenu::Enable: no such item") ); - - item->Enable(enable); -} - -bool wxMenuBase::IsEnabled( int itemid ) const -{ - wxMenuItem *item = FindItem(itemid); - - wxCHECK_MSG( item, false, wxT("wxMenu::IsEnabled: no such item") ); - - return item->IsEnabled(); -} - -void wxMenuBase::Check( int itemid, bool enable ) -{ - wxMenuItem *item = FindItem(itemid); - - wxCHECK_RET( item, wxT("wxMenu::Check: no such item") ); - - item->Check(enable); -} - -bool wxMenuBase::IsChecked( int itemid ) const -{ - wxMenuItem *item = FindItem(itemid); - - wxCHECK_MSG( item, false, wxT("wxMenu::IsChecked: no such item") ); - - return item->IsChecked(); -} - -void wxMenuBase::SetLabel( int itemid, const wxString &label ) -{ - wxMenuItem *item = FindItem(itemid); - - wxCHECK_RET( item, wxT("wxMenu::SetLabel: no such item") ); - - item->SetItemLabel(label); -} - -wxString wxMenuBase::GetLabel( int itemid ) const -{ - wxMenuItem *item = FindItem(itemid); - - wxCHECK_MSG( item, wxEmptyString, wxT("wxMenu::GetLabel: no such item") ); - - return item->GetItemLabel(); -} - -void wxMenuBase::SetHelpString( int itemid, const wxString& helpString ) -{ - wxMenuItem *item = FindItem(itemid); - - wxCHECK_RET( item, wxT("wxMenu::SetHelpString: no such item") ); - - item->SetHelp( helpString ); -} - -wxString wxMenuBase::GetHelpString( int itemid ) const -{ - wxMenuItem *item = FindItem(itemid); - - wxCHECK_MSG( item, wxEmptyString, wxT("wxMenu::GetHelpString: no such item") ); - - return item->GetHelp(); -} - -// ---------------------------------------------------------------------------- -// wxMenuBarBase ctor and dtor -// ---------------------------------------------------------------------------- - -wxMenuBarBase::wxMenuBarBase() -{ - // not attached yet - m_menuBarFrame = NULL; -} - -wxMenuBarBase::~wxMenuBarBase() -{ - WX_CLEAR_LIST(wxMenuList, m_menus); -} - -// ---------------------------------------------------------------------------- -// wxMenuBar item access: the base class versions manage m_menus list, the -// derived class should reflect the changes in the real menubar -// ---------------------------------------------------------------------------- - -wxMenu *wxMenuBarBase::GetMenu(size_t pos) const -{ - wxMenuList::compatibility_iterator node = m_menus.Item(pos); - wxCHECK_MSG( node, NULL, wxT("bad index in wxMenuBar::GetMenu()") ); - - return node->GetData(); -} - -bool wxMenuBarBase::Append(wxMenu *menu, const wxString& title) -{ - wxCHECK_MSG( menu, false, wxT("can't append NULL menu") ); - wxCHECK_MSG( !title.empty(), false, wxT("can't append menu with empty title") ); - - m_menus.Append(menu); - menu->Attach(this); - - return true; -} - -bool wxMenuBarBase::Insert(size_t pos, wxMenu *menu, - const wxString& title) -{ - if ( pos == m_menus.GetCount() ) - { - return wxMenuBarBase::Append(menu, title); - } - else // not at the end - { - wxCHECK_MSG( menu, false, wxT("can't insert NULL menu") ); - - wxMenuList::compatibility_iterator node = m_menus.Item(pos); - wxCHECK_MSG( node, false, wxT("bad index in wxMenuBar::Insert()") ); - - m_menus.Insert(node, menu); - menu->Attach(this); - - return true; - } -} - -wxMenu *wxMenuBarBase::Replace(size_t pos, wxMenu *menu, - const wxString& WXUNUSED(title)) -{ - wxCHECK_MSG( menu, NULL, wxT("can't insert NULL menu") ); - - wxMenuList::compatibility_iterator node = m_menus.Item(pos); - wxCHECK_MSG( node, NULL, wxT("bad index in wxMenuBar::Replace()") ); - - wxMenu *menuOld = node->GetData(); - node->SetData(menu); - - menu->Attach(this); - menuOld->Detach(); - - return menuOld; -} - -wxMenu *wxMenuBarBase::Remove(size_t pos) -{ - wxMenuList::compatibility_iterator node = m_menus.Item(pos); - wxCHECK_MSG( node, NULL, wxT("bad index in wxMenuBar::Remove()") ); - - wxMenu *menu = node->GetData(); - m_menus.Erase(node); - menu->Detach(); - - return menu; -} - -int wxMenuBarBase::FindMenu(const wxString& title) const -{ - wxString label = wxMenuItem::GetLabelText(title); - - size_t count = GetMenuCount(); - for ( size_t i = 0; i < count; i++ ) - { - wxString title2 = GetMenuLabel(i); - if ( (title2 == title) || - (wxMenuItem::GetLabelText(title2) == label) ) - { - // found - return (int)i; - } - } - - return wxNOT_FOUND; - -} - -// ---------------------------------------------------------------------------- -// wxMenuBar attaching/detaching to/from the frame -// ---------------------------------------------------------------------------- - -void wxMenuBarBase::Attach(wxFrame *frame) -{ - wxASSERT_MSG( !IsAttached(), wxT("menubar already attached!") ); - - SetParent(frame); - m_menuBarFrame = frame; -} - -void wxMenuBarBase::Detach() -{ - wxASSERT_MSG( IsAttached(), wxT("detaching unattached menubar") ); - - m_menuBarFrame = NULL; - SetParent(NULL); -} - -// ---------------------------------------------------------------------------- -// wxMenuBar searching for items -// ---------------------------------------------------------------------------- - -wxMenuItem *wxMenuBarBase::FindItem(int itemid, wxMenu **menu) const -{ - if ( menu ) - *menu = NULL; - - wxMenuItem *item = NULL; - size_t count = GetMenuCount(), i; - wxMenuList::const_iterator it; - for ( i = 0, it = m_menus.begin(); !item && (i < count); i++, it++ ) - { - item = (*it)->FindItem(itemid, menu); - } - - return item; -} - -int wxMenuBarBase::FindMenuItem(const wxString& menu, const wxString& item) const -{ - wxString label = wxMenuItem::GetLabelText(menu); - - int i = 0; - wxMenuList::compatibility_iterator node; - for ( node = m_menus.GetFirst(); node; node = node->GetNext(), i++ ) - { - if ( label == wxMenuItem::GetLabelText(GetMenuLabel(i)) ) - return node->GetData()->FindItem(item); - } - - return wxNOT_FOUND; -} - -// --------------------------------------------------------------------------- -// wxMenuBar functions forwarded to wxMenuItem -// --------------------------------------------------------------------------- - -void wxMenuBarBase::Enable(int itemid, bool enable) -{ - wxMenuItem *item = FindItem(itemid); - - wxCHECK_RET( item, wxT("attempt to enable an item which doesn't exist") ); - - item->Enable(enable); -} - -void wxMenuBarBase::Check(int itemid, bool check) -{ - wxMenuItem *item = FindItem(itemid); - - wxCHECK_RET( item, wxT("attempt to check an item which doesn't exist") ); - wxCHECK_RET( item->IsCheckable(), wxT("attempt to check an uncheckable item") ); - - item->Check(check); -} - -bool wxMenuBarBase::IsChecked(int itemid) const -{ - wxMenuItem *item = FindItem(itemid); - - wxCHECK_MSG( item, false, wxT("wxMenuBar::IsChecked(): no such item") ); - - return item->IsChecked(); -} - -bool wxMenuBarBase::IsEnabled(int itemid) const -{ - wxMenuItem *item = FindItem(itemid); - - wxCHECK_MSG( item, false, wxT("wxMenuBar::IsEnabled(): no such item") ); - - return item->IsEnabled(); -} - -void wxMenuBarBase::SetLabel(int itemid, const wxString& label) -{ - wxMenuItem *item = FindItem(itemid); - - wxCHECK_RET( item, wxT("wxMenuBar::SetLabel(): no such item") ); - - item->SetItemLabel(label); -} - -wxString wxMenuBarBase::GetLabel(int itemid) const -{ - wxMenuItem *item = FindItem(itemid); - - wxCHECK_MSG( item, wxEmptyString, - wxT("wxMenuBar::GetLabel(): no such item") ); - - return item->GetItemLabel(); -} - -void wxMenuBarBase::SetHelpString(int itemid, const wxString& helpString) -{ - wxMenuItem *item = FindItem(itemid); - - wxCHECK_RET( item, wxT("wxMenuBar::SetHelpString(): no such item") ); - - item->SetHelp(helpString); -} - -wxString wxMenuBarBase::GetHelpString(int itemid) const -{ - wxMenuItem *item = FindItem(itemid); - - wxCHECK_MSG( item, wxEmptyString, - wxT("wxMenuBar::GetHelpString(): no such item") ); - - return item->GetHelp(); -} - -void wxMenuBarBase::UpdateMenus() -{ - wxMenu* menu; - int nCount = GetMenuCount(); - for (int n = 0; n < nCount; n++) - { - menu = GetMenu( n ); - if (menu != NULL) - menu->UpdateUI(); - } -} - -#if WXWIN_COMPATIBILITY_2_8 -// get or change the label of the menu at given position -void wxMenuBarBase::SetLabelTop(size_t pos, const wxString& label) -{ - SetMenuLabel(pos, label); -} - -wxString wxMenuBarBase::GetLabelTop(size_t pos) const -{ - return GetMenuLabelText(pos); -} -#endif - -#endif // wxUSE_MENUS diff --git a/Externals/wxWidgets3/src/common/mimecmn.cpp b/Externals/wxWidgets3/src/common/mimecmn.cpp deleted file mode 100644 index ae86108b92..0000000000 --- a/Externals/wxWidgets3/src/common/mimecmn.cpp +++ /dev/null @@ -1,763 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/mimecmn.cpp -// Purpose: classes and functions to manage MIME types -// Author: Vadim Zeitlin -// Modified by: -// Chris Elliott (biol75@york.ac.uk) 5 Dec 00: write support for Win32 -// Created: 23.09.98 -// Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows licence (part of wxExtra library) -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// for compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_MIMETYPE - -#include "wx/mimetype.h" - -#ifndef WX_PRECOMP - #include "wx/dynarray.h" - #include "wx/string.h" - #include "wx/intl.h" - #include "wx/log.h" - #include "wx/module.h" - #include "wx/crt.h" -#endif //WX_PRECOMP - -#include "wx/file.h" -#include "wx/iconloc.h" -#include "wx/confbase.h" - -// other standard headers -#include - -// implementation classes: -#if defined(__WINDOWS__) - #include "wx/msw/mimetype.h" -#elif ( defined(__DARWIN__) ) - #include "wx/osx/mimetype.h" -#else // Unix - #include "wx/unix/mimetype.h" -#endif - -// ============================================================================ -// common classes -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxMimeTypeCommands -// ---------------------------------------------------------------------------- - -void -wxMimeTypeCommands::AddOrReplaceVerb(const wxString& verb, const wxString& cmd) -{ - int n = m_verbs.Index(verb, false /* ignore case */); - if ( n == wxNOT_FOUND ) - { - m_verbs.Add(verb); - m_commands.Add(cmd); - } - else - { - m_commands[n] = cmd; - } -} - -wxString -wxMimeTypeCommands::GetCommandForVerb(const wxString& verb, size_t *idx) const -{ - wxString s; - - int n = m_verbs.Index(verb); - if ( n != wxNOT_FOUND ) - { - s = m_commands[(size_t)n]; - if ( idx ) - *idx = n; - } - else if ( idx ) - { - // different from any valid index - *idx = (size_t)-1; - } - - return s; -} - -wxString wxMimeTypeCommands::GetVerbCmd(size_t n) const -{ - return m_verbs[n] + wxT('=') + m_commands[n]; -} - -// ---------------------------------------------------------------------------- -// wxFileTypeInfo -// ---------------------------------------------------------------------------- - -void wxFileTypeInfo::DoVarArgInit(const wxString& mimeType, - const wxString& openCmd, - const wxString& printCmd, - const wxString& desc, - va_list argptr) -{ - m_mimeType = mimeType; - m_openCmd = openCmd; - m_printCmd = printCmd; - m_desc = desc; - - for ( ;; ) - { - // icc gives this warning in its own va_arg() macro, argh -#ifdef __INTELC__ - #pragma warning(push) - #pragma warning(disable: 1684) -#endif - - wxArgNormalizedString ext(WX_VA_ARG_STRING(argptr)); - -#ifdef __INTELC__ - #pragma warning(pop) -#endif - if ( !ext ) - { - // NULL terminates the list - break; - } - - m_exts.Add(ext.GetString()); - } -} - -void wxFileTypeInfo::VarArgInit(const wxString *mimeType, - const wxString *openCmd, - const wxString *printCmd, - const wxString *desc, - ...) -{ - va_list argptr; - va_start(argptr, desc); - - DoVarArgInit(*mimeType, *openCmd, *printCmd, *desc, argptr); - - va_end(argptr); -} - - -wxFileTypeInfo::wxFileTypeInfo(const wxArrayString& sArray) -{ - m_mimeType = sArray [0u]; - m_openCmd = sArray [1u]; - m_printCmd = sArray [2u]; - m_desc = sArray [3u]; - - size_t count = sArray.GetCount(); - for ( size_t i = 4; i < count; i++ ) - { - m_exts.Add(sArray[i]); - } -} - -#include "wx/arrimpl.cpp" -WX_DEFINE_OBJARRAY(wxArrayFileTypeInfo) - -// ============================================================================ -// implementation of the wrapper classes -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxFileType -// ---------------------------------------------------------------------------- - -/* static */ -wxString wxFileType::ExpandCommand(const wxString& command, - const wxFileType::MessageParameters& params) -{ - bool hasFilename = false; - - // We consider that only the file names with spaces in them need to be - // handled specially. This is not perfect, but this can be done easily - // under all platforms while handling the file names with quotes in them, - // for example, needs to be done differently. - const bool needToQuoteFilename = params.GetFileName().find_first_of(" \t") - != wxString::npos; - - wxString str; - for ( const wxChar *pc = command.c_str(); *pc != wxT('\0'); pc++ ) { - if ( *pc == wxT('%') ) { - switch ( *++pc ) { - case wxT('s'): - // don't quote the file name if it's already quoted: notice - // that we check for a quote following it and not preceding - // it as at least under Windows we can have commands - // containing "file://%s" (with quotes) in them so the - // argument may be quoted even if there is no quote - // directly before "%s" itself - if ( needToQuoteFilename && pc[1] != '"' ) - str << wxT('"') << params.GetFileName() << wxT('"'); - else - str << params.GetFileName(); - hasFilename = true; - break; - - case wxT('t'): - // '%t' expands into MIME type (quote it too just to be - // consistent) - str << wxT('\'') << params.GetMimeType() << wxT('\''); - break; - - case wxT('{'): - { - const wxChar *pEnd = wxStrchr(pc, wxT('}')); - if ( pEnd == NULL ) { - wxString mimetype; - wxLogWarning(_("Unmatched '{' in an entry for mime type %s."), - params.GetMimeType().c_str()); - str << wxT("%{"); - } - else { - wxString param(pc + 1, pEnd - pc - 1); - str << wxT('\'') << params.GetParamValue(param) << wxT('\''); - pc = pEnd; - } - } - break; - - case wxT('n'): - case wxT('F'): - // TODO %n is the number of parts, %F is an array containing - // the names of temp files these parts were written to - // and their mime types. - break; - - default: - wxLogDebug(wxT("Unknown field %%%c in command '%s'."), - *pc, command.c_str()); - str << *pc; - } - } - else { - str << *pc; - } - } - - // metamail(1) man page states that if the mailcap entry doesn't have '%s' - // the program will accept the data on stdin so normally we should append - // "< %s" to the end of the command in such case, but not all commands - // behave like this, in particular a common test is 'test -n "$DISPLAY"' - // and appending "< %s" to this command makes the test fail... I don't - // know of the correct solution, try to guess what we have to do. - - // test now carried out on reading file so test should never get here - if ( !hasFilename && !str.empty() -#ifdef __UNIX__ - && !str.StartsWith(wxT("test ")) -#endif // Unix - ) - { - str << wxT(" < "); - if ( needToQuoteFilename ) - str << '"'; - str << params.GetFileName(); - if ( needToQuoteFilename ) - str << '"'; - } - - return str; -} - -wxFileType::wxFileType(const wxFileTypeInfo& info) -{ - m_info = &info; - m_impl = NULL; -} - -wxFileType::wxFileType() -{ - m_info = NULL; - m_impl = new wxFileTypeImpl; -} - -wxFileType::~wxFileType() -{ - if ( m_impl ) - delete m_impl; -} - -bool wxFileType::GetExtensions(wxArrayString& extensions) -{ - if ( m_info ) - { - extensions = m_info->GetExtensions(); - return true; - } - - return m_impl->GetExtensions(extensions); -} - -bool wxFileType::GetMimeType(wxString *mimeType) const -{ - wxCHECK_MSG( mimeType, false, wxT("invalid parameter in GetMimeType") ); - - if ( m_info ) - { - *mimeType = m_info->GetMimeType(); - - return true; - } - - return m_impl->GetMimeType(mimeType); -} - -bool wxFileType::GetMimeTypes(wxArrayString& mimeTypes) const -{ - if ( m_info ) - { - mimeTypes.Clear(); - mimeTypes.Add(m_info->GetMimeType()); - - return true; - } - - return m_impl->GetMimeTypes(mimeTypes); -} - -bool wxFileType::GetIcon(wxIconLocation *iconLoc) const -{ - if ( m_info ) - { - if ( iconLoc ) - { - iconLoc->SetFileName(m_info->GetIconFile()); -#ifdef __WINDOWS__ - iconLoc->SetIndex(m_info->GetIconIndex()); -#endif // __WINDOWS__ - } - - return true; - } - - return m_impl->GetIcon(iconLoc); -} - -bool -wxFileType::GetIcon(wxIconLocation *iconloc, - const MessageParameters& params) const -{ - if ( !GetIcon(iconloc) ) - { - return false; - } - - // we may have "%s" in the icon location string, at least under Windows, so - // expand this - if ( iconloc ) - { - iconloc->SetFileName(ExpandCommand(iconloc->GetFileName(), params)); - } - - return true; -} - -bool wxFileType::GetDescription(wxString *desc) const -{ - wxCHECK_MSG( desc, false, wxT("invalid parameter in GetDescription") ); - - if ( m_info ) - { - *desc = m_info->GetDescription(); - - return true; - } - - return m_impl->GetDescription(desc); -} - -bool -wxFileType::GetOpenCommand(wxString *openCmd, - const wxFileType::MessageParameters& params) const -{ - wxCHECK_MSG( openCmd, false, wxT("invalid parameter in GetOpenCommand") ); - - if ( m_info ) - { - *openCmd = ExpandCommand(m_info->GetOpenCommand(), params); - - return true; - } - - return m_impl->GetOpenCommand(openCmd, params); -} - -wxString wxFileType::GetOpenCommand(const wxString& filename) const -{ - wxString cmd; - if ( !GetOpenCommand(&cmd, filename) ) - { - // return empty string to indicate an error - cmd.clear(); - } - - return cmd; -} - -bool -wxFileType::GetPrintCommand(wxString *printCmd, - const wxFileType::MessageParameters& params) const -{ - wxCHECK_MSG( printCmd, false, wxT("invalid parameter in GetPrintCommand") ); - - if ( m_info ) - { - *printCmd = ExpandCommand(m_info->GetPrintCommand(), params); - - return true; - } - - return m_impl->GetPrintCommand(printCmd, params); -} - -wxString -wxFileType::GetExpandedCommand(const wxString& verb, - const wxFileType::MessageParameters& params) const -{ - return m_impl->GetExpandedCommand(verb, params); -} - - -size_t wxFileType::GetAllCommands(wxArrayString *verbs, - wxArrayString *commands, - const wxFileType::MessageParameters& params) const -{ - if ( verbs ) - verbs->Clear(); - if ( commands ) - commands->Clear(); - -#if defined (__WINDOWS__) || defined(__UNIX__) - return m_impl->GetAllCommands(verbs, commands, params); -#else // !__WINDOWS__ || __UNIX__ - // we don't know how to retrieve all commands, so just try the 2 we know - // about - size_t count = 0; - wxString cmd; - if ( GetOpenCommand(&cmd, params) ) - { - if ( verbs ) - verbs->Add(wxT("Open")); - if ( commands ) - commands->Add(cmd); - count++; - } - - if ( GetPrintCommand(&cmd, params) ) - { - if ( verbs ) - verbs->Add(wxT("Print")); - if ( commands ) - commands->Add(cmd); - - count++; - } - - return count; -#endif // __WINDOWS__/| __UNIX__ -} - -bool wxFileType::Unassociate() -{ -#if defined(__WINDOWS__) - return m_impl->Unassociate(); -#elif defined(__UNIX__) - return m_impl->Unassociate(this); -#else - wxFAIL_MSG( wxT("not implemented") ); // TODO - return false; -#endif -} - -bool wxFileType::SetCommand(const wxString& cmd, - const wxString& verb, - bool overwriteprompt) -{ -#if defined (__WINDOWS__) || defined(__UNIX__) - return m_impl->SetCommand(cmd, verb, overwriteprompt); -#else - wxUnusedVar(cmd); - wxUnusedVar(verb); - wxUnusedVar(overwriteprompt); - wxFAIL_MSG(wxT("not implemented")); - return false; -#endif -} - -bool wxFileType::SetDefaultIcon(const wxString& cmd, int index) -{ - wxString sTmp = cmd; -#ifdef __WINDOWS__ - // VZ: should we do this? - // chris elliott : only makes sense in MS windows - if ( sTmp.empty() ) - GetOpenCommand(&sTmp, wxFileType::MessageParameters(wxEmptyString, wxEmptyString)); -#endif - wxCHECK_MSG( !sTmp.empty(), false, wxT("need the icon file") ); - -#if defined (__WINDOWS__) || defined(__UNIX__) - return m_impl->SetDefaultIcon (cmd, index); -#else - wxUnusedVar(index); - wxFAIL_MSG(wxT("not implemented")); - return false; -#endif -} - -// ---------------------------------------------------------------------------- -// wxMimeTypesManagerFactory -// ---------------------------------------------------------------------------- - -wxMimeTypesManagerFactory *wxMimeTypesManagerFactory::m_factory = NULL; - -/* static */ -void wxMimeTypesManagerFactory::Set(wxMimeTypesManagerFactory *factory) -{ - delete m_factory; - - m_factory = factory; -} - -/* static */ -wxMimeTypesManagerFactory *wxMimeTypesManagerFactory::Get() -{ - if ( !m_factory ) - m_factory = new wxMimeTypesManagerFactory; - - return m_factory; -} - -wxMimeTypesManagerImpl *wxMimeTypesManagerFactory::CreateMimeTypesManagerImpl() -{ - return new wxMimeTypesManagerImpl; -} - -// ---------------------------------------------------------------------------- -// wxMimeTypesManager -// ---------------------------------------------------------------------------- - -void wxMimeTypesManager::EnsureImpl() -{ - if ( !m_impl ) - m_impl = wxMimeTypesManagerFactory::Get()->CreateMimeTypesManagerImpl(); -} - -bool wxMimeTypesManager::IsOfType(const wxString& mimeType, - const wxString& wildcard) -{ - wxASSERT_MSG( mimeType.Find(wxT('*')) == wxNOT_FOUND, - wxT("first MIME type can't contain wildcards") ); - - // all comparaisons are case insensitive (2nd arg of IsSameAs() is false) - if ( wildcard.BeforeFirst(wxT('/')). - IsSameAs(mimeType.BeforeFirst(wxT('/')), false) ) - { - wxString strSubtype = wildcard.AfterFirst(wxT('/')); - - if ( strSubtype == wxT("*") || - strSubtype.IsSameAs(mimeType.AfterFirst(wxT('/')), false) ) - { - // matches (either exactly or it's a wildcard) - return true; - } - } - - return false; -} - -wxMimeTypesManager::wxMimeTypesManager() -{ - m_impl = NULL; -} - -wxMimeTypesManager::~wxMimeTypesManager() -{ - if ( m_impl ) - delete m_impl; -} - -bool wxMimeTypesManager::Unassociate(wxFileType *ft) -{ - EnsureImpl(); - -#if defined(__UNIX__) && !defined(__CYGWIN__) && !defined(__WINE__) - return m_impl->Unassociate(ft); -#else - return ft->Unassociate(); -#endif -} - - -wxFileType * -wxMimeTypesManager::Associate(const wxFileTypeInfo& ftInfo) -{ - EnsureImpl(); - -#if defined(__WINDOWS__) || defined(__UNIX__) - return m_impl->Associate(ftInfo); -#else // other platforms - wxUnusedVar(ftInfo); - wxFAIL_MSG( wxT("not implemented") ); // TODO - return NULL; -#endif // platforms -} - -wxFileType * -wxMimeTypesManager::GetFileTypeFromExtension(const wxString& ext) -{ - EnsureImpl(); - - wxString::const_iterator i = ext.begin(); - const wxString::const_iterator end = ext.end(); - wxString extWithoutDot; - if ( i != end && *i == '.' ) - extWithoutDot.assign(++i, ext.end()); - else - extWithoutDot = ext; - - wxCHECK_MSG( !ext.empty(), NULL, wxT("extension can't be empty") ); - - wxFileType *ft = m_impl->GetFileTypeFromExtension(extWithoutDot); - - if ( !ft ) { - // check the fallbacks - // - // TODO linear search is potentially slow, perhaps we should use a - // sorted array? - size_t count = m_fallbacks.GetCount(); - for ( size_t n = 0; n < count; n++ ) { - if ( m_fallbacks[n].GetExtensions().Index(ext) != wxNOT_FOUND ) { - ft = new wxFileType(m_fallbacks[n]); - - break; - } - } - } - - return ft; -} - -wxFileType * -wxMimeTypesManager::GetFileTypeFromMimeType(const wxString& mimeType) -{ - EnsureImpl(); - wxFileType *ft = m_impl->GetFileTypeFromMimeType(mimeType); - - if ( !ft ) { - // check the fallbacks - // - // TODO linear search is potentially slow, perhaps we should use a - // sorted array? - size_t count = m_fallbacks.GetCount(); - for ( size_t n = 0; n < count; n++ ) { - if ( wxMimeTypesManager::IsOfType(mimeType, - m_fallbacks[n].GetMimeType()) ) { - ft = new wxFileType(m_fallbacks[n]); - - break; - } - } - } - - return ft; -} - -void wxMimeTypesManager::AddFallbacks(const wxFileTypeInfo *filetypes) -{ - EnsureImpl(); - for ( const wxFileTypeInfo *ft = filetypes; ft && ft->IsValid(); ft++ ) { - AddFallback(*ft); - } -} - -size_t wxMimeTypesManager::EnumAllFileTypes(wxArrayString& mimetypes) -{ - EnsureImpl(); - size_t countAll = m_impl->EnumAllFileTypes(mimetypes); - - // add the fallback filetypes - size_t count = m_fallbacks.GetCount(); - for ( size_t n = 0; n < count; n++ ) { - if ( mimetypes.Index(m_fallbacks[n].GetMimeType()) == wxNOT_FOUND ) { - mimetypes.Add(m_fallbacks[n].GetMimeType()); - countAll++; - } - } - - return countAll; -} - -void wxMimeTypesManager::Initialize(int mcapStyle, - const wxString& sExtraDir) -{ -#if defined(__UNIX__) && !defined(__CYGWIN__) && !defined(__WINE__) - EnsureImpl(); - - m_impl->Initialize(mcapStyle, sExtraDir); -#else - (void)mcapStyle; - (void)sExtraDir; -#endif // Unix -} - -// and this function clears all the data from the manager -void wxMimeTypesManager::ClearData() -{ -#if defined(__UNIX__) && !defined(__CYGWIN__) && !defined(__WINE__) - EnsureImpl(); - - m_impl->ClearData(); -#endif // Unix -} - -// ---------------------------------------------------------------------------- -// global data and wxMimeTypeCmnModule -// ---------------------------------------------------------------------------- - -// private object -static wxMimeTypesManager gs_mimeTypesManager; - -// and public pointer -wxMimeTypesManager *wxTheMimeTypesManager = &gs_mimeTypesManager; - -class wxMimeTypeCmnModule: public wxModule -{ -public: - wxMimeTypeCmnModule() : wxModule() { } - - virtual bool OnInit() wxOVERRIDE { return true; } - virtual void OnExit() wxOVERRIDE - { - wxMimeTypesManagerFactory::Set(NULL); - - if ( gs_mimeTypesManager.m_impl != NULL ) - { - wxDELETE(gs_mimeTypesManager.m_impl); - gs_mimeTypesManager.m_fallbacks.Clear(); - } - } - - wxDECLARE_DYNAMIC_CLASS(wxMimeTypeCmnModule); -}; - -wxIMPLEMENT_DYNAMIC_CLASS(wxMimeTypeCmnModule, wxModule); - -#endif // wxUSE_MIMETYPE diff --git a/Externals/wxWidgets3/src/common/modalhook.cpp b/Externals/wxWidgets3/src/common/modalhook.cpp deleted file mode 100644 index 20250381ea..0000000000 --- a/Externals/wxWidgets3/src/common/modalhook.cpp +++ /dev/null @@ -1,119 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/modalhook.cpp -// Purpose: wxModalDialogHook implementation -// Author: Vadim Zeitlin -// Created: 2013-05-19 -// Copyright: (c) 2013 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// for compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include "wx/modalhook.h" - -#ifndef WX_PRECOMP -#endif // WX_PRECOMP - -wxModalDialogHook::Hooks wxModalDialogHook::ms_hooks; - -// ============================================================================ -// wxModalDialogHook implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// Hooks management -// ---------------------------------------------------------------------------- - -void wxModalDialogHook::Register() -{ -#if wxDEBUG_LEVEL - for ( Hooks::const_iterator it = ms_hooks.begin(); - it != ms_hooks.end(); - ++it) - { - if ( *it == this ) - { - wxFAIL_MSG( wxS("Registering already registered hook?") ); - return; - } - } -#endif // wxDEBUG_LEVEL - - ms_hooks.insert(ms_hooks.begin(), this); -} - -void wxModalDialogHook::Unregister() -{ - if ( !DoUnregister() ) - { - wxFAIL_MSG( wxS("Unregistering not registered hook?") ); - } -} - -bool wxModalDialogHook::DoUnregister() -{ - for ( Hooks::iterator it = ms_hooks.begin(); - it != ms_hooks.end(); - ++it ) - { - if ( *it == this ) - { - ms_hooks.erase(it); - return true; - } - } - - return false; -} - -// ---------------------------------------------------------------------------- -// Invoking hooks methods -// ---------------------------------------------------------------------------- - -/* static */ -int wxModalDialogHook::CallEnter(wxDialog* dialog) -{ - // Make a copy of the hooks list to avoid problems if it's modified while - // we're iterating over it: this is unlikely to happen in our case, but - // quite possible in CallExit() as the hooks may remove themselves after - // the call to their Exit(), so do it here for symmetry as well. - const Hooks hooks = ms_hooks; - - for ( Hooks::const_iterator it = hooks.begin(); it != hooks.end(); ++it ) - { - const int rc = (*it)->Enter(dialog); - if ( rc != wxID_NONE ) - { - // Skip calling all the rest of the hooks if one of them preempts - // showing the dialog completely. - return rc; - } - } - - return wxID_NONE; -} - -/* static */ -void wxModalDialogHook::CallExit(wxDialog* dialog) -{ - // See comment in CallEnter() for the reasons for making a copy here. - const Hooks hooks = ms_hooks; - - for ( Hooks::const_iterator it = hooks.begin(); it != hooks.end(); ++it ) - { - (*it)->Exit(dialog); - } -} diff --git a/Externals/wxWidgets3/src/common/module.cpp b/Externals/wxWidgets3/src/common/module.cpp deleted file mode 100644 index b8438d4602..0000000000 --- a/Externals/wxWidgets3/src/common/module.cpp +++ /dev/null @@ -1,224 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/module.cpp -// Purpose: Modules initialization/destruction -// Author: Wolfram Gloger/adapted by Guilhem Lavaux -// Modified by: -// Created: 04/11/98 -// Copyright: (c) Wolfram Gloger and Guilhem Lavaux -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include "wx/module.h" - -#ifndef WX_PRECOMP - #include "wx/hash.h" - #include "wx/intl.h" - #include "wx/log.h" -#endif - -#include "wx/listimpl.cpp" - -#define TRACE_MODULE wxT("module") - -WX_DEFINE_LIST(wxModuleList) - -wxIMPLEMENT_ABSTRACT_CLASS(wxModule, wxObject) - -wxModuleList wxModule::m_modules; - -void wxModule::RegisterModule(wxModule* module) -{ - module->m_state = State_Registered; - m_modules.Append(module); -} - -void wxModule::UnregisterModule(wxModule* module) -{ - m_modules.DeleteObject(module); - delete module; -} - -// Collect up all module-derived classes, create an instance of each, -// and register them. -void wxModule::RegisterModules() -{ - for (wxClassInfo::const_iterator it = wxClassInfo::begin_classinfo(), - end = wxClassInfo::end_classinfo(); - it != end; ++it) - { - const wxClassInfo* classInfo = *it; - - if ( classInfo->IsKindOf(wxCLASSINFO(wxModule)) && - (classInfo != (& (wxModule::ms_classInfo))) ) - { - wxLogTrace(TRACE_MODULE, wxT("Registering module %s"), - classInfo->GetClassName()); - wxModule* module = (wxModule *)classInfo->CreateObject(); - wxModule::RegisterModule(module); - } - } -} - -bool wxModule::DoInitializeModule(wxModule *module, - wxModuleList &initializedModules) -{ - if ( module->m_state == State_Initializing ) - { - wxLogError(_("Circular dependency involving module \"%s\" detected."), - module->GetClassInfo()->GetClassName()); - return false; - } - - module->m_state = State_Initializing; - - // translate named dependencies to the normal ones first - if ( !module->ResolveNamedDependencies() ) - return false; - - const wxArrayClassInfo& dependencies = module->m_dependencies; - - // satisfy module dependencies by loading them before the current module - for ( unsigned int i = 0; i < dependencies.size(); ++i ) - { - wxClassInfo * cinfo = dependencies[i]; - - // Check if the module is already initialized - wxModuleList::compatibility_iterator node; - for ( node = initializedModules.GetFirst(); node; node = node->GetNext() ) - { - if ( node->GetData()->GetClassInfo() == cinfo ) - break; - } - - if ( node ) - { - // this dependency is already initialized, nothing to do - continue; - } - - // find the module in the registered modules list - for ( node = m_modules.GetFirst(); node; node = node->GetNext() ) - { - wxModule *moduleDep = node->GetData(); - if ( moduleDep->GetClassInfo() == cinfo ) - { - if ( !DoInitializeModule(moduleDep, initializedModules ) ) - { - // failed to initialize a dependency, so fail this one too - return false; - } - - break; - } - } - - if ( !node ) - { - wxLogError(_("Dependency \"%s\" of module \"%s\" doesn't exist."), - cinfo->GetClassName(), - module->GetClassInfo()->GetClassName()); - return false; - } - } - - if ( !module->Init() ) - { - wxLogError(_("Module \"%s\" initialization failed"), - module->GetClassInfo()->GetClassName()); - return false; - } - - wxLogTrace(TRACE_MODULE, wxT("Module \"%s\" initialized"), - module->GetClassInfo()->GetClassName()); - - module->m_state = State_Initialized; - initializedModules.Append(module); - - return true; -} - -// Initialize user-defined modules -bool wxModule::InitializeModules() -{ - wxModuleList initializedModules; - - for ( wxModuleList::compatibility_iterator node = m_modules.GetFirst(); - node; - node = node->GetNext() ) - { - wxModule *module = node->GetData(); - - // the module could have been already initialized as dependency of - // another one - if ( module->m_state == State_Registered ) - { - if ( !DoInitializeModule( module, initializedModules ) ) - { - // failed to initialize all modules, so clean up the already - // initialized ones - DoCleanUpModules(initializedModules); - - return false; - } - } - } - - // remember the real initialisation order - m_modules = initializedModules; - - return true; -} - -// Clean up all currently initialized modules -void wxModule::DoCleanUpModules(const wxModuleList& modules) -{ - // cleanup user-defined modules in the reverse order compared to their - // initialization -- this ensures that dependencies are respected - for ( wxModuleList::compatibility_iterator node = modules.GetLast(); - node; - node = node->GetPrevious() ) - { - wxLogTrace(TRACE_MODULE, wxT("Cleanup module %s"), - node->GetData()->GetClassInfo()->GetClassName()); - - wxModule * module = node->GetData(); - - wxASSERT_MSG( module->m_state == State_Initialized, - wxT("not initialized module being cleaned up") ); - - module->Exit(); - module->m_state = State_Registered; - } - - // clear all modules, even the non-initialized ones - WX_CLEAR_LIST(wxModuleList, m_modules); -} - -bool wxModule::ResolveNamedDependencies() -{ - // first resolve required dependencies - for ( size_t i = 0; i < m_namedDependencies.size(); ++i ) - { - wxClassInfo *info = wxClassInfo::FindClass(m_namedDependencies[i]); - - if ( !info ) - { - // required dependency not found - return false; - } - - // add it even if it is not derived from wxModule because - // DoInitializeModule() will make sure a module with the same class - // info exists and fail if it doesn't - m_dependencies.Add(info); - } - - return true; -} diff --git a/Externals/wxWidgets3/src/common/mousemanager.cpp b/Externals/wxWidgets3/src/common/mousemanager.cpp deleted file mode 100644 index e6a14b290e..0000000000 --- a/Externals/wxWidgets3/src/common/mousemanager.cpp +++ /dev/null @@ -1,187 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/mousemanager.cpp -// Purpose: implementation of wxMouseEventsManager class -// Author: Vadim Zeitlin -// Created: 2009-04-21 -// Copyright: (c) 2009 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// for compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#ifndef WX_PRECOMP - #include "wx/settings.h" - #include "wx/window.h" -#endif // WX_PRECOMP - -#include "wx/mousemanager.h" - -// ---------------------------------------------------------------------------- -// event tables -// ---------------------------------------------------------------------------- - -wxBEGIN_EVENT_TABLE(wxMouseEventsManager, wxEvtHandler) - EVT_MOUSE_CAPTURE_LOST(wxMouseEventsManager::OnCaptureLost) - EVT_LEFT_DOWN(wxMouseEventsManager::OnLeftDown) - EVT_LEFT_UP(wxMouseEventsManager::OnLeftUp) - EVT_MOTION(wxMouseEventsManager::OnMove) -wxEND_EVENT_TABLE() - -// ============================================================================ -// wxMouseEventsManager implementation -// ============================================================================ - -void wxMouseEventsManager::Init() -{ - m_win = NULL; - m_state = State_Normal; - m_item = wxNOT_FOUND; -} - -bool wxMouseEventsManager::Create(wxWindow *win) -{ - wxASSERT_MSG( !m_win, "Create() must not be called twice" ); - - m_win = win; - win->PushEventHandler(this); - - return true; -} - -wxMouseEventsManager::~wxMouseEventsManager() -{ - if ( m_win ) - m_win->RemoveEventHandler(this); -} - -void wxMouseEventsManager::OnCaptureLost(wxMouseCaptureLostEvent& WXUNUSED(event)) -{ - switch ( m_state ) - { - case State_Normal: - wxFAIL_MSG( "mouse shouldn't be captured in normal state" ); - break; - - case State_Pressed: - MouseClickCancelled(m_item); - break; - - case State_Dragging: - MouseDragCancelled(m_item); - break; - } - - m_state = State_Normal; - m_item = wxNOT_FOUND; -} - -void wxMouseEventsManager::OnLeftDown(wxMouseEvent& event) -{ - wxASSERT_MSG( m_state == State_Normal, - "state hasn't been reset to normal somehow" ); - - m_posLast = event.GetPosition(); - m_item = MouseHitTest(m_posLast); - if ( m_item == wxNOT_FOUND ) - { - event.Skip(); - return; - } - - m_state = State_Pressed; - m_win->SetFocus(); - m_win->CaptureMouse(); - MouseClickBegin(m_item); -} - -void wxMouseEventsManager::OnLeftUp(wxMouseEvent& event) -{ - switch ( m_state ) - { - case State_Normal: - // ignore it, the mouse hasn't been pressed over any item initially - // so releasing it shouldn't do anything - event.Skip(); - - // skip releasing the capture below - return; - - case State_Pressed: - if ( MouseHitTest(event.GetPosition()) == m_item ) - { - // mouse released over the same item, so it was a click - MouseClicked(m_item); - } - break; - - case State_Dragging: - MouseDragEnd(m_item, event.GetPosition()); - break; - } - - m_state = State_Normal; - m_item = wxNOT_FOUND; - m_win->ReleaseMouse(); -} - -void wxMouseEventsManager::OnMove(wxMouseEvent& event) -{ - switch ( m_state ) - { - case State_Normal: - event.Skip(); - break; - - case State_Pressed: - wxASSERT_MSG( event.LeftIsDown(), - "should have detected mouse being released" ); - - { - // it's probably a bad idea to query the system for these - // values every time the mouse is moved so cache them on the - // assumption that they don't change -- which is wrong, of - // course, the user can change them but it doesn't happen often - static const int - dragMinX = wxSystemSettings::GetMetric(wxSYS_DRAG_X); - static const int - dragMinY = wxSystemSettings::GetMetric(wxSYS_DRAG_Y); - - const wxPoint& pos = event.GetPosition(); - const wxPoint ofs = pos - m_posLast; - if ( abs(ofs.x) > dragMinX || abs(ofs.y) > dragMinY ) - { - // the mouse left the rectangle inside which its movements - // are considered to be too small to constitute a start of - // drag operation, do [attempt to] start it now - if ( MouseDragBegin(m_item, pos) ) - { - m_state = State_Dragging; - } - } - else // still didn't move far enough away - { - event.Skip(); - } - } - break; - - case State_Dragging: - m_posLast = event.GetPosition(); - MouseDragging(m_item, m_posLast); - break; - } -} - diff --git a/Externals/wxWidgets3/src/common/msgout.cpp b/Externals/wxWidgets3/src/common/msgout.cpp deleted file mode 100644 index 9003413e57..0000000000 --- a/Externals/wxWidgets3/src/common/msgout.cpp +++ /dev/null @@ -1,211 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/msgout.cpp -// Purpose: wxMessageOutput implementation -// Author: Mattia Barbon -// Modified by: -// Created: 17.07.02 -// Copyright: (c) the wxWidgets team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// --------------------------------------------------------------------------- -// headers -// --------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if defined(__BORLANDC__) - #pragma hdrstop -#endif - -#ifndef WX_PRECOMP - #include "wx/string.h" - #include "wx/ffile.h" - #include "wx/app.h" - #include "wx/intl.h" - #include "wx/log.h" - #if wxUSE_GUI - #include "wx/msgdlg.h" - #endif // wxUSE_GUI -#endif - -#include "wx/msgout.h" -#include "wx/apptrait.h" -#include -#include - -#if defined(__WINDOWS__) - #include "wx/msw/private.h" -#endif - -// =========================================================================== -// implementation -// =========================================================================== - -#if wxUSE_BASE - -// ---------------------------------------------------------------------------- -// wxMessageOutput -// ---------------------------------------------------------------------------- - -wxMessageOutput* wxMessageOutput::ms_msgOut = 0; - -wxMessageOutput* wxMessageOutput::Get() -{ - if ( !ms_msgOut && wxTheApp ) - { - ms_msgOut = wxTheApp->GetTraits()->CreateMessageOutput(); - } - - return ms_msgOut; -} - -wxMessageOutput* wxMessageOutput::Set(wxMessageOutput* msgout) -{ - wxMessageOutput* old = ms_msgOut; - ms_msgOut = msgout; - return old; -} - -#if !wxUSE_UTF8_LOCALE_ONLY -void wxMessageOutput::DoPrintfWchar(const wxChar *format, ...) -{ - va_list args; - va_start(args, format); - wxString out; - - out.PrintfV(format, args); - va_end(args); - - Output(out); -} -#endif // !wxUSE_UTF8_LOCALE_ONLY - -#if wxUSE_UNICODE_UTF8 -void wxMessageOutput::DoPrintfUtf8(const char *format, ...) -{ - va_list args; - va_start(args, format); - wxString out; - - out.PrintfV(format, args); - va_end(args); - - Output(out); -} -#endif // wxUSE_UNICODE_UTF8 - -// ---------------------------------------------------------------------------- -// wxMessageOutputBest -// ---------------------------------------------------------------------------- - -void wxMessageOutputBest::Output(const wxString& str) -{ -#ifdef __WINDOWS__ - // decide whether to use console output or not - wxAppTraits * const traits = wxTheApp ? wxTheApp->GetTraits() : NULL; - const bool hasStderr = traits ? traits->CanUseStderr() : false; - - if ( !(m_flags & wxMSGOUT_PREFER_MSGBOX) ) - { - if ( hasStderr && traits->WriteToStderr(AppendLineFeedIfNeeded(str)) ) - return; - } - - wxString title; - if ( wxTheApp ) - title = wxTheApp->GetAppDisplayName(); - else // Use some title to avoid default "Error" - title = _("Message"); - - ::MessageBox(NULL, str.t_str(), title.t_str(), MB_ICONINFORMATION | MB_OK); -#else // !__WINDOWS__ - wxUnusedVar(m_flags); - - // TODO: use the native message box for the other ports too - wxMessageOutputStderr::Output(str); -#endif // __WINDOWS__/!__WINDOWS__ -} - -// ---------------------------------------------------------------------------- -// wxMessageOutputStderr -// ---------------------------------------------------------------------------- - -wxString wxMessageOutputStderr::AppendLineFeedIfNeeded(const wxString& str) -{ - wxString strLF(str); - if ( strLF.empty() || *strLF.rbegin() != '\n' ) - strLF += '\n'; - - return strLF; -} - -void wxMessageOutputStderr::Output(const wxString& str) -{ - const wxString strWithLF = AppendLineFeedIfNeeded(str); - - fprintf(m_fp, "%s", (const char*) strWithLF.mb_str(wxConvWhateverWorks)); - fflush(m_fp); -} - -// ---------------------------------------------------------------------------- -// wxMessageOutputDebug -// ---------------------------------------------------------------------------- - -void wxMessageOutputDebug::Output(const wxString& str) -{ -#if defined(__WINDOWS__) - wxString out(AppendLineFeedIfNeeded(str)); - out.Replace(wxT("\t"), wxT(" ")); - out.Replace(wxT("\n"), wxT("\r\n")); - ::OutputDebugString(out.t_str()); -#else - // TODO: use native debug output function for the other ports too - wxMessageOutputStderr::Output(str); -#endif // platform -} - -// ---------------------------------------------------------------------------- -// wxMessageOutputLog -// ---------------------------------------------------------------------------- - -void wxMessageOutputLog::Output(const wxString& str) -{ - wxString out(str); - - out.Replace(wxT("\t"), wxT(" ")); - - wxLogMessage(wxT("%s"), out.c_str()); -} - -#endif // wxUSE_BASE - -// ---------------------------------------------------------------------------- -// wxMessageOutputMessageBox -// ---------------------------------------------------------------------------- - -#if wxUSE_GUI && wxUSE_MSGDLG - -extern WXDLLEXPORT_DATA(const char) wxMessageBoxCaptionStr[] = "Message"; - -void wxMessageOutputMessageBox::Output(const wxString& str) -{ - wxString out(str); - - // the native MSW msg box understands the TABs, others don't -#ifndef __WINDOWS__ - out.Replace(wxT("\t"), wxT(" ")); -#endif - - wxString title = wxT("wxWidgets") ; - if (wxTheApp) title = wxTheApp->GetAppDisplayName(); - - ::wxMessageBox(out, title); -} - -#endif // wxUSE_GUI diff --git a/Externals/wxWidgets3/src/common/mstream.cpp b/Externals/wxWidgets3/src/common/mstream.cpp deleted file mode 100644 index f6332c1fa3..0000000000 --- a/Externals/wxWidgets3/src/common/mstream.cpp +++ /dev/null @@ -1,206 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/mstream.cpp -// Purpose: "Memory stream" classes -// Author: Guilhem Lavaux -// Modified by: VZ (23.11.00): general code review -// Created: 04/01/98 -// Copyright: (c) Guilhem Lavaux -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_STREAMS - -#include "wx/mstream.h" - -#ifndef WX_PRECOMP - #include "wx/stream.h" -#endif //WX_PRECOMP - -#include - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxMemoryInputStream -// ---------------------------------------------------------------------------- - -wxIMPLEMENT_ABSTRACT_CLASS(wxMemoryInputStream, wxInputStream); - -wxMemoryInputStream::wxMemoryInputStream(const void *data, size_t len) -{ - m_i_streambuf = new wxStreamBuffer(wxStreamBuffer::read); - m_i_streambuf->SetBufferIO(const_cast(data), len); - m_i_streambuf->SetIntPosition(0); // seek to start pos - m_i_streambuf->Fixed(true); - - m_length = len; -} - -wxMemoryInputStream::wxMemoryInputStream(const wxMemoryOutputStream& stream) -{ - const wxFileOffset lenFile = stream.GetLength(); - if ( lenFile == wxInvalidOffset ) - { - m_i_streambuf = NULL; - m_lasterror = wxSTREAM_EOF; - return; - } - - const size_t len = wx_truncate_cast(size_t, lenFile); - wxASSERT_MSG( len == lenFile + size_t(0), wxT("huge files not supported") ); - - m_i_streambuf = new wxStreamBuffer(wxStreamBuffer::read); - m_i_streambuf->SetBufferIO(len); // create buffer - stream.CopyTo(m_i_streambuf->GetBufferStart(), len); - m_i_streambuf->SetIntPosition(0); // seek to start pos - m_i_streambuf->Fixed(true); - m_length = len; -} - -void -wxMemoryInputStream::InitFromStream(wxInputStream& stream, wxFileOffset lenFile) -{ - if ( lenFile == wxInvalidOffset ) - lenFile = stream.GetLength(); - - if ( lenFile == wxInvalidOffset ) - { - m_i_streambuf = NULL; - m_lasterror = wxSTREAM_EOF; - return; - } - - const size_t len = wx_truncate_cast(size_t, lenFile); - wxASSERT_MSG( (wxFileOffset)len == lenFile, wxT("huge files not supported") ); - - m_i_streambuf = new wxStreamBuffer(wxStreamBuffer::read); - m_i_streambuf->SetBufferIO(len); // create buffer - stream.Read(m_i_streambuf->GetBufferStart(), len); - m_i_streambuf->SetIntPosition(0); // seek to start pos - m_i_streambuf->Fixed(true); - m_length = stream.LastRead(); -} - -bool wxMemoryInputStream::CanRead() const -{ - return m_i_streambuf->GetIntPosition() != m_length; -} - -wxMemoryInputStream::~wxMemoryInputStream() -{ - delete m_i_streambuf; -} - -char wxMemoryInputStream::Peek() -{ - char *buf = (char *)m_i_streambuf->GetBufferStart(); - size_t pos = m_i_streambuf->GetIntPosition(); - if ( pos == m_length ) - { - m_lasterror = wxSTREAM_READ_ERROR; - - return 0; - } - - return buf[pos]; -} - -size_t wxMemoryInputStream::OnSysRead(void *buffer, size_t nbytes) -{ - size_t pos = m_i_streambuf->GetIntPosition(); - if ( pos == m_length ) - { - m_lasterror = wxSTREAM_EOF; - - return 0; - } - - m_i_streambuf->Read(buffer, nbytes); - m_lasterror = wxSTREAM_NO_ERROR; - - return m_i_streambuf->GetIntPosition() - pos; -} - -wxFileOffset wxMemoryInputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode) -{ - return m_i_streambuf->Seek(pos, mode); -} - -wxFileOffset wxMemoryInputStream::OnSysTell() const -{ - return m_i_streambuf->Tell(); -} - -// ---------------------------------------------------------------------------- -// wxMemoryOutputStream -// ---------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxMemoryOutputStream, wxOutputStream); - -wxMemoryOutputStream::wxMemoryOutputStream(void *data, size_t len) -{ - m_o_streambuf = new wxStreamBuffer(wxStreamBuffer::write); - if ( data ) - m_o_streambuf->SetBufferIO(data, len); - m_o_streambuf->Fixed(false); - m_o_streambuf->Flushable(false); -} - -wxMemoryOutputStream::~wxMemoryOutputStream() -{ - delete m_o_streambuf; -} - -size_t wxMemoryOutputStream::OnSysWrite(const void *buffer, size_t nbytes) -{ - size_t oldpos = m_o_streambuf->GetIntPosition(); - m_o_streambuf->Write(buffer, nbytes); - size_t newpos = m_o_streambuf->GetIntPosition(); - - // FIXME can someone please explain what this does? (VZ) - if ( !newpos ) - newpos = m_o_streambuf->GetBufferSize(); - - return newpos - oldpos; -} - -wxFileOffset wxMemoryOutputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode) -{ - return m_o_streambuf->Seek(pos, mode); -} - -wxFileOffset wxMemoryOutputStream::OnSysTell() const -{ - return m_o_streambuf->Tell(); -} - -size_t wxMemoryOutputStream::CopyTo(void *buffer, size_t len) const -{ - wxCHECK_MSG( buffer, 0, wxT("must have buffer to CopyTo") ); - - if ( len > GetSize() ) - len = GetSize(); - - memcpy(buffer, m_o_streambuf->GetBufferStart(), len); - - return len; -} - -#endif // wxUSE_STREAMS diff --git a/Externals/wxWidgets3/src/common/nbkbase.cpp b/Externals/wxWidgets3/src/common/nbkbase.cpp deleted file mode 100644 index 42de7672f3..0000000000 --- a/Externals/wxWidgets3/src/common/nbkbase.cpp +++ /dev/null @@ -1,204 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/nbkbase.cpp -// Purpose: common wxNotebook methods -// Author: Vadim Zeitlin -// Modified by: -// Created: 02.07.01 -// Copyright: (c) 2001 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_NOTEBOOK - -#ifndef WX_PRECOMP -#endif //WX_PRECOMP - -#include "wx/notebook.h" - -// ============================================================================ -// implementation -// ============================================================================ - -extern WXDLLEXPORT_DATA(const char) wxNotebookNameStr[] = "notebook"; - -wxDEFINE_EVENT( wxEVT_NOTEBOOK_PAGE_CHANGED, wxBookCtrlEvent ); -wxDEFINE_EVENT( wxEVT_NOTEBOOK_PAGE_CHANGING, wxBookCtrlEvent ); - -// ---------------------------------------------------------------------------- -// XTI -// ---------------------------------------------------------------------------- - -#include "wx/listimpl.cpp" -wxDEFINE_FLAGS( wxNotebookStyle ) -wxBEGIN_FLAGS( wxNotebookStyle ) -// new style border flags, we put them first to -// use them for streaming out -wxFLAGS_MEMBER(wxBORDER_SIMPLE) -wxFLAGS_MEMBER(wxBORDER_SUNKEN) -wxFLAGS_MEMBER(wxBORDER_DOUBLE) -wxFLAGS_MEMBER(wxBORDER_RAISED) -wxFLAGS_MEMBER(wxBORDER_STATIC) -wxFLAGS_MEMBER(wxBORDER_NONE) - -// old style border flags -wxFLAGS_MEMBER(wxSIMPLE_BORDER) -wxFLAGS_MEMBER(wxSUNKEN_BORDER) -wxFLAGS_MEMBER(wxDOUBLE_BORDER) -wxFLAGS_MEMBER(wxRAISED_BORDER) -wxFLAGS_MEMBER(wxSTATIC_BORDER) -wxFLAGS_MEMBER(wxBORDER) - -// standard window styles -wxFLAGS_MEMBER(wxTAB_TRAVERSAL) -wxFLAGS_MEMBER(wxCLIP_CHILDREN) -wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) -wxFLAGS_MEMBER(wxWANTS_CHARS) -wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE) -wxFLAGS_MEMBER(wxALWAYS_SHOW_SB ) -wxFLAGS_MEMBER(wxVSCROLL) -wxFLAGS_MEMBER(wxHSCROLL) - -wxFLAGS_MEMBER(wxNB_FIXEDWIDTH) -wxFLAGS_MEMBER(wxBK_DEFAULT) -wxFLAGS_MEMBER(wxBK_TOP) -wxFLAGS_MEMBER(wxBK_LEFT) -wxFLAGS_MEMBER(wxBK_RIGHT) -wxFLAGS_MEMBER(wxBK_BOTTOM) -wxFLAGS_MEMBER(wxNB_NOPAGETHEME) -wxFLAGS_MEMBER(wxNB_FLAT) -wxEND_FLAGS( wxNotebookStyle ) - -#if wxUSE_EXTENDED_RTTI - -WX_DEFINE_LIST( wxNotebookPageInfoList ) - -wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxNotebookPageInfo, wxObject, "wx/notebook.h"); - -wxCOLLECTION_TYPE_INFO( wxNotebookPageInfo *, wxNotebookPageInfoList ); - -template<> void wxCollectionToVariantArray( wxNotebookPageInfoList const &theList, - wxAnyList &value) -{ - wxListCollectionToAnyList( theList, value ); -} - -wxBEGIN_PROPERTIES_TABLE(wxNotebookPageInfo) -wxREADONLY_PROPERTY( Page, wxNotebookPage*, GetPage, wxEMPTY_PARAMETER_VALUE, \ - 0 /*flags*/, wxT("Helpstring"), wxT("group")) -wxREADONLY_PROPERTY( Text, wxString, GetText, wxString(), 0 /*flags*/, \ - wxT("Helpstring"), wxT("group")) -wxREADONLY_PROPERTY( Selected, bool, GetSelected, false, 0 /*flags*/, \ - wxT("Helpstring"), wxT("group") ) -wxREADONLY_PROPERTY( ImageId, int, GetImageId, -1, 0 /*flags*/, \ - wxT("Helpstring"), wxT("group")) -wxEND_PROPERTIES_TABLE() - -wxEMPTY_HANDLERS_TABLE(wxNotebookPageInfo) - -wxCONSTRUCTOR_4( wxNotebookPageInfo, wxNotebookPage*, Page, \ - wxString, Text, bool, Selected, int, ImageId ) - -// WX_IMPLEMENT_ANY_VALUE_TYPE(wxAnyValueTypeImpl) -// XTI accessors: - -void wxNotebookBase::AddPageInfo( wxNotebookPageInfo* info ) -{ - AddPage( info->GetPage(), info->GetText(), info->GetSelected(), info->GetImageId() ); -} - -const wxNotebookPageInfoList& wxNotebookBase::GetPageInfos() const -{ - wxNotebookPageInfoList* list = const_cast< wxNotebookPageInfoList* >( &m_pageInfos ); - WX_CLEAR_LIST( wxNotebookPageInfoList, *list ); - for( size_t i = 0; i < GetPageCount(); ++i ) - { - wxNotebookPageInfo *info = new wxNotebookPageInfo(); - info->Create( const_cast(this)->GetPage(i), GetPageText(i), - GetSelection() == int(i), GetPageImage(i) ); - list->Append( info ); - } - return m_pageInfos; -} - -#endif - -wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxNotebook, wxBookCtrlBase, "wx/notebook.h"); -wxBEGIN_PROPERTIES_TABLE(wxNotebook) -wxEVENT_PROPERTY( PageChanging, wxEVT_NOTEBOOK_PAGE_CHANGING, wxNotebookEvent ) -wxEVENT_PROPERTY( PageChanged, wxEVT_NOTEBOOK_PAGE_CHANGED, wxNotebookEvent ) - -wxPROPERTY_COLLECTION( PageInfos, wxNotebookPageInfoList, wxNotebookPageInfo*, \ - AddPageInfo, GetPageInfos, 0 /*flags*/, wxT("Helpstring"), \ - wxT("group")) -wxPROPERTY_FLAGS( WindowStyle, wxNotebookStyle, long, SetWindowStyleFlag, \ - GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \ - wxT("Helpstring"), wxT("group")) // style -wxEND_PROPERTIES_TABLE() - -wxEMPTY_HANDLERS_TABLE(wxNotebook) - -wxCONSTRUCTOR_5( wxNotebook, wxWindow*, Parent, wxWindowID, Id, \ - wxPoint, Position, wxSize, Size, long, WindowStyle) - -// ---------------------------------------------------------------------------- -// geometry -// ---------------------------------------------------------------------------- - -wxSize wxNotebookBase::CalcSizeFromPage(const wxSize& sizePage) const -{ - // this is, of course, totally bogus -- but we must do something by - // default because not all ports implement this - wxSize sizeTotal = sizePage; - - if ( HasFlag(wxBK_LEFT) || HasFlag(wxBK_RIGHT) ) - { - sizeTotal.x += 90; - sizeTotal.y += 10; - } - else // tabs on top/bottom side - { - sizeTotal.x += 10; - sizeTotal.y += 40; - } - - return sizeTotal; -} - -// ---------------------------------------------------------------------------- -// events -// ---------------------------------------------------------------------------- - -bool wxNotebookBase::SendPageChangingEvent(int nPage) -{ - wxBookCtrlEvent event(wxEVT_NOTEBOOK_PAGE_CHANGING, GetId()); - event.SetSelection(nPage); - event.SetOldSelection(GetSelection()); - event.SetEventObject(this); - return !GetEventHandler()->ProcessEvent(event) || event.IsAllowed(); -} - -void wxNotebookBase::SendPageChangedEvent(int nPageOld, int nPageNew) -{ - wxBookCtrlEvent event(wxEVT_NOTEBOOK_PAGE_CHANGED, GetId()); - event.SetSelection(nPageNew == -1 ? GetSelection() : nPageNew); - event.SetOldSelection(nPageOld); - event.SetEventObject(this); - GetEventHandler()->ProcessEvent(event); -} - -#endif // wxUSE_NOTEBOOK diff --git a/Externals/wxWidgets3/src/common/notifmsgcmn.cpp b/Externals/wxWidgets3/src/common/notifmsgcmn.cpp deleted file mode 100644 index 326c66981a..0000000000 --- a/Externals/wxWidgets3/src/common/notifmsgcmn.cpp +++ /dev/null @@ -1,103 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/notifmsgcmn.cpp -// Purpose: wxNotificationMessageBase implementation -// Author: Tobias Taschner -// Created: 2015-08-04 -// Copyright: (c) 2015 wxWidgets development team -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ -#pragma hdrstop -#endif - -#if wxUSE_NOTIFICATION_MESSAGE - -#include "wx/notifmsg.h" - -#include "wx/private/notifmsg.h" - -#ifndef wxHAS_NATIVE_NOTIFICATION_MESSAGE -#include "wx/generic/private/notifmsg.h" -#endif - -wxDEFINE_EVENT( wxEVT_NOTIFICATION_MESSAGE_CLICK, wxCommandEvent ); -wxDEFINE_EVENT( wxEVT_NOTIFICATION_MESSAGE_DISMISSED, wxCommandEvent ); -wxDEFINE_EVENT( wxEVT_NOTIFICATION_MESSAGE_ACTION, wxCommandEvent ); - -// ---------------------------------------------------------------------------- -// wxNotificationMessageBase -// ---------------------------------------------------------------------------- - -wxNotificationMessageBase::~wxNotificationMessageBase() -{ - m_impl->Detach(); -} - -bool wxNotificationMessageBase::Show(int timeout) -{ - return m_impl->Show(timeout); -} - -bool wxNotificationMessageBase::Close() -{ - return m_impl->Close(); -} - -void wxNotificationMessageBase::SetTitle(const wxString& title) -{ - m_impl->SetTitle(title); -} - -void wxNotificationMessageBase::SetMessage(const wxString& message) -{ - m_impl->SetMessage(message); -} - -void wxNotificationMessageBase::SetParent(wxWindow *parent) -{ - m_impl->SetParent(parent); -} - -void wxNotificationMessageBase::SetFlags(int flags) -{ - wxASSERT_MSG(flags == wxICON_INFORMATION || - flags == wxICON_WARNING || flags == wxICON_ERROR || - flags == 0, - "Invalid icon flags specified"); - - m_impl->SetFlags(flags); -} - -void wxNotificationMessageBase::SetIcon(const wxIcon& icon) -{ - m_impl->SetIcon(icon); -} - -bool wxNotificationMessageBase::AddAction(wxWindowID actionid, const wxString &label) -{ - return m_impl->AddAction(actionid, label); -} - -// -// wxNotificationMessage -// - -#ifndef wxHAS_NATIVE_NOTIFICATION_MESSAGE - -void wxNotificationMessage::Init() -{ - m_impl = new wxGenericNotificationMessageImpl(this); -} - -#endif - -#endif // wxUSE_NOTIFICATION_MESSAGE diff --git a/Externals/wxWidgets3/src/common/numformatter.cpp b/Externals/wxWidgets3/src/common/numformatter.cpp deleted file mode 100644 index 2428ef34b5..0000000000 --- a/Externals/wxWidgets3/src/common/numformatter.cpp +++ /dev/null @@ -1,317 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/numformatter.cpp -// Purpose: wxNumberFormatter -// Author: Fulvio Senore, Vadim Zeitlin -// Created: 2010-11-06 -// Copyright: (c) 2010 wxWidgets team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include "wx/numformatter.h" -#include "wx/intl.h" - -#include // for setlocale and LC_ALL - -// ---------------------------------------------------------------------------- -// local helpers -// ---------------------------------------------------------------------------- - -namespace -{ - -// Contains information about the locale which was used to initialize our -// cached values of the decimal and thousands separators. Notice that it isn't -// enough to store just wxLocale because the user code may call setlocale() -// directly and storing just C locale string is not enough because we can use -// the OS API directly instead of the CRT ones on some platforms. So just store -// both. -class LocaleId -{ -public: - LocaleId() - { -#if wxUSE_INTL - m_wxloc = NULL; -#endif // wxUSE_INTL - m_cloc = NULL; - } - - ~LocaleId() - { - Free(); - } - -#if wxUSE_INTL - // Return true if this is the first time this function is called for this - // object or if the program locale has changed since the last time it was - // called. Otherwise just return false indicating that updating locale- - // dependent information is not necessary. - bool NotInitializedOrHasChanged() - { - wxLocale * const wxloc = wxGetLocale(); - const char * const cloc = setlocale(LC_ALL, NULL); - if ( m_wxloc || m_cloc ) - { - if ( m_wxloc == wxloc && strcmp(m_cloc, cloc) == 0 ) - return false; - - Free(); - } - //else: Not initialized yet. - - m_wxloc = wxloc; - m_cloc = wxCRT_StrdupA(cloc); - - return true; - } -#endif // wxUSE_INTL - -private: - void Free() - { -#if wxUSE_INTL - free(m_cloc); -#endif // wxUSE_INTL - } - -#if wxUSE_INTL - // Non-owned pointer to wxLocale which was used. - wxLocale *m_wxloc; -#endif // wxUSE_INTL - - // Owned pointer to the C locale string. - char *m_cloc; - - wxDECLARE_NO_COPY_CLASS(LocaleId); -}; - -} // anonymous namespace - -// ============================================================================ -// wxNumberFormatter implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// Locale information accessors -// ---------------------------------------------------------------------------- - -wxChar wxNumberFormatter::GetDecimalSeparator() -{ -#if wxUSE_INTL - // Notice that while using static variable here is not MT-safe, the worst - // that can happen is that we redo the initialization if we're called - // concurrently from more than one thread so it's not a real problem. - static wxChar s_decimalSeparator = 0; - - // Remember the locale which was current when we initialized, we must redo - // the initialization if the locale changed. - static LocaleId s_localeUsedForInit; - - if ( s_localeUsedForInit.NotInitializedOrHasChanged() ) - { - const wxString - s = wxLocale::GetInfo(wxLOCALE_DECIMAL_POINT, wxLOCALE_CAT_NUMBER); - if ( s.empty() ) - { - // We really must have something for decimal separator, so fall - // back to the C locale default. - s_decimalSeparator = '.'; - } - else - { - // To the best of my knowledge there are no locales like this. - wxASSERT_MSG( s.length() == 1, - "Multi-character decimal separator?" ); - - s_decimalSeparator = s[0]; - } - } - - return s_decimalSeparator; -#else // !wxUSE_INTL - return wxT('.'); -#endif // wxUSE_INTL/!wxUSE_INTL -} - -bool wxNumberFormatter::GetThousandsSeparatorIfUsed(wxChar *sep) -{ -#if wxUSE_INTL - static wxChar s_thousandsSeparator = 0; - static LocaleId s_localeUsedForInit; - - if ( s_localeUsedForInit.NotInitializedOrHasChanged() ) - { - const wxString - s = wxLocale::GetInfo(wxLOCALE_THOUSANDS_SEP, wxLOCALE_CAT_NUMBER); - if ( !s.empty() ) - { - wxASSERT_MSG( s.length() == 1, - "Multi-character thousands separator?" ); - - s_thousandsSeparator = s[0]; - } - //else: Unlike above it's perfectly fine for the thousands separator to - // be empty if grouping is not used, so just leave it as 0. - } - - if ( !s_thousandsSeparator ) - return false; - - if ( sep ) - *sep = s_thousandsSeparator; - - return true; -#else // !wxUSE_INTL - wxUnusedVar(sep); - return false; -#endif // wxUSE_INTL/!wxUSE_INTL -} - -// ---------------------------------------------------------------------------- -// Conversion to string and helpers -// ---------------------------------------------------------------------------- - -wxString wxNumberFormatter::PostProcessIntString(wxString s, int style) -{ - if ( style & Style_WithThousandsSep ) - AddThousandsSeparators(s); - - wxASSERT_MSG( !(style & Style_NoTrailingZeroes), - "Style_NoTrailingZeroes can't be used with integer values" ); - - return s; -} - -wxString wxNumberFormatter::ToString(long val, int style) -{ - return PostProcessIntString(wxString::Format("%ld", val), style); -} - -#ifdef wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG - -wxString wxNumberFormatter::ToString(wxLongLong_t val, int style) -{ - return PostProcessIntString(wxString::Format("%" wxLongLongFmtSpec "d", val), - style); -} - -#endif // wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG - -wxString wxNumberFormatter::ToString(double val, int precision, int style) -{ - wxString s = wxString::FromDouble(val,precision); - - if ( style & Style_WithThousandsSep ) - AddThousandsSeparators(s); - - if ( style & Style_NoTrailingZeroes ) - RemoveTrailingZeroes(s); - - return s; -} - -void wxNumberFormatter::AddThousandsSeparators(wxString& s) -{ - // Thousands separators for numbers in scientific format are not relevant. - if ( s.find_first_of("eE") != wxString::npos ) - return; - - wxChar thousandsSep; - if ( !GetThousandsSeparatorIfUsed(&thousandsSep) ) - return; - - size_t pos = s.find(GetDecimalSeparator()); - if ( pos == wxString::npos ) - { - // Start grouping at the end of an integer number. - pos = s.length(); - } - - // End grouping at the beginning of the digits -- there could be at a sign - // before their start. - const size_t start = s.find_first_of("0123456789"); - - // We currently group digits by 3 independently of the locale. This is not - // the right thing to do and we should use lconv::grouping (under POSIX) - // and GetLocaleInfo(LOCALE_SGROUPING) (under MSW) to get information about - // the correct grouping to use. This is something that needs to be done at - // wxLocale level first and then used here in the future (TODO). - const size_t GROUP_LEN = 3; - - while ( pos > start + GROUP_LEN ) - { - pos -= GROUP_LEN; - s.insert(pos, thousandsSep); - } -} - -void wxNumberFormatter::RemoveTrailingZeroes(wxString& s) -{ - // If number is in scientific format, trailing zeroes belong to the exponent and cannot be removed. - if ( s.find_first_of("eE") != wxString::npos ) - return; - - const size_t posDecSep = s.find(GetDecimalSeparator()); - // No decimal point => removing trailing zeroes irrelevant for integer number. - if ( posDecSep == wxString::npos ) - return; - wxCHECK_RET( posDecSep, "Can't start with decimal separator" ); - - // Find the last character to keep. - size_t posLastNonZero = s.find_last_not_of("0"); - - // If it's the decimal separator itself, don't keep it neither. - if ( posLastNonZero == posDecSep ) - posLastNonZero--; - - s.erase(posLastNonZero + 1); - // Remove sign from orphaned zero. - if ( s.compare("-0") == 0 ) - s = "0"; -} - -// ---------------------------------------------------------------------------- -// Conversion from strings -// ---------------------------------------------------------------------------- - -void wxNumberFormatter::RemoveThousandsSeparators(wxString& s) -{ - wxChar thousandsSep; - if ( !GetThousandsSeparatorIfUsed(&thousandsSep) ) - return; - - s.Replace(wxString(thousandsSep), wxString()); -} - -bool wxNumberFormatter::FromString(wxString s, long *val) -{ - RemoveThousandsSeparators(s); - return s.ToLong(val); -} - -#ifdef wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG - -bool wxNumberFormatter::FromString(wxString s, wxLongLong_t *val) -{ - RemoveThousandsSeparators(s); - return s.ToLongLong(val); -} - -#endif // wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG - -bool wxNumberFormatter::FromString(wxString s, double *val) -{ - RemoveThousandsSeparators(s); - return s.ToDouble(val); -} diff --git a/Externals/wxWidgets3/src/common/object.cpp b/Externals/wxWidgets3/src/common/object.cpp deleted file mode 100644 index 52ff0adb76..0000000000 --- a/Externals/wxWidgets3/src/common/object.cpp +++ /dev/null @@ -1,412 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/object.cpp -// Purpose: wxObject implementation -// Author: Julian Smart -// Modified by: Ron Lee -// Created: 04/01/98 -// Copyright: (c) 1998 Julian Smart -// (c) 2001 Ron Lee -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#ifndef WX_PRECOMP - #include "wx/object.h" - #include "wx/hash.h" - #include "wx/memory.h" - #include "wx/crt.h" -#endif - -#include - -// we must disable optimizations for VC.NET because otherwise its too eager -// linker discards wxClassInfo objects in release build thus breaking many, -// many things -#if defined __VISUALC__ - #pragma optimize("", off) -#endif - -#if wxUSE_EXTENDED_RTTI -const wxClassInfo* wxObject::ms_classParents[] = { NULL } ; -wxObject* wxVariantOfPtrToObjectConverterwxObject ( const wxAny &data ) -{ return data.As(); } - wxAny wxObjectToVariantConverterwxObject ( wxObject *data ) - { return wxAny( dynamic_cast (data) ) ; } - - wxClassInfo wxObject::ms_classInfo(ms_classParents , wxEmptyString , wxT("wxObject"), - (int) sizeof(wxObject), \ - (wxObjectConstructorFn) 0 , - NULL,NULL,0 , 0 , - 0 , wxVariantOfPtrToObjectConverterwxObject , 0 , wxObjectToVariantConverterwxObject); - - template<> void wxStringWriteValue(wxString & , wxObject* const & ){ wxFAIL_MSG("unreachable"); } - template<> void wxStringWriteValue(wxString & , wxObject const & ){ wxFAIL_MSG("unreachable"); } - - wxClassTypeInfo s_typeInfo(wxT_OBJECT_PTR , &wxObject::ms_classInfo , NULL , NULL , typeid(wxObject*).name() ) ; - wxClassTypeInfo s_typeInfowxObject(wxT_OBJECT , &wxObject::ms_classInfo , NULL , NULL , typeid(wxObject).name() ) ; -#else -wxClassInfo wxObject::ms_classInfo( wxT("wxObject"), 0, 0, - (int) sizeof(wxObject), - (wxObjectConstructorFn) 0 ); -#endif - -// restore optimizations -#if defined __VISUALC__ - #pragma optimize("", on) -#endif - -wxClassInfo* wxClassInfo::sm_first = NULL; -wxHashTable* wxClassInfo::sm_classTable = NULL; - -// when using XTI, this method is already implemented inline inside -// wxDECLARE_DYNAMIC_CLASS but otherwise we intentionally make this function -// non-inline because this allows us to have a non-inline virtual function in -// all wx classes and this solves linking problems for HP-UX native toolchain -// and possibly others (we could make dtor non-inline as well but it's more -// useful to keep it inline than this function) -#if !wxUSE_EXTENDED_RTTI - -wxClassInfo *wxObject::GetClassInfo() const -{ - return &wxObject::ms_classInfo; -} - -#endif // wxUSE_EXTENDED_RTTI - -// this variable exists only so that we can avoid 'always true/false' warnings -const bool wxFalse = false; - -// Is this object a kind of (a subclass of) 'info'? -// E.g. is wxWindow a kind of wxObject? -// Go from this class to superclass, taking into account -// two possible base classes. -bool wxObject::IsKindOf(const wxClassInfo *info) const -{ - const wxClassInfo *thisInfo = GetClassInfo(); - return (thisInfo) ? thisInfo->IsKindOf(info) : false ; -} - -#if wxUSE_MEMORY_TRACING && defined( new ) - #undef new -#endif - - -#ifdef _WX_WANT_NEW_SIZET_WXCHAR_INT -void *wxObject::operator new ( size_t size, const wxChar *fileName, int lineNum ) -{ - return wxDebugAlloc(size, (wxChar*) fileName, lineNum, true); -} -#endif - -#ifdef _WX_WANT_DELETE_VOID -void wxObject::operator delete ( void *buf ) -{ - wxDebugFree(buf); -} -#endif - -#ifdef _WX_WANT_DELETE_VOID_CONSTCHAR_SIZET -void wxObject::operator delete ( void *buf, const char *_fname, size_t _line ) -{ - wxDebugFree(buf); -} -#endif - -#ifdef _WX_WANT_DELETE_VOID_WXCHAR_INT -void wxObject::operator delete ( void *buf, const wxChar *WXUNUSED(fileName), int WXUNUSED(lineNum) ) -{ - wxDebugFree(buf); -} -#endif - -#ifdef _WX_WANT_ARRAY_NEW_SIZET_WXCHAR_INT -void *wxObject::operator new[] ( size_t size, const wxChar* fileName, int lineNum ) -{ - return wxDebugAlloc(size, (wxChar*) fileName, lineNum, true, true); -} -#endif - -#ifdef _WX_WANT_ARRAY_DELETE_VOID -void wxObject::operator delete[] ( void *buf ) -{ - wxDebugFree(buf, true); -} -#endif - -#ifdef _WX_WANT_ARRAY_DELETE_VOID_WXCHAR_INT -void wxObject::operator delete[] (void * buf, const wxChar* WXUNUSED(fileName), int WXUNUSED(lineNum) ) -{ - wxDebugFree(buf, true); -} -#endif - - -// ---------------------------------------------------------------------------- -// wxClassInfo -// ---------------------------------------------------------------------------- - -wxClassInfo::~wxClassInfo() -{ - // remove this object from the linked list of all class infos: if we don't - // do it, loading/unloading a DLL containing static wxClassInfo objects is - // not going to work - if ( this == sm_first ) - { - sm_first = m_next; - } - else - { - wxClassInfo *info = sm_first; - while (info) - { - if ( info->m_next == this ) - { - info->m_next = m_next; - break; - } - - info = info->m_next; - } - } - Unregister(); -} - -wxClassInfo *wxClassInfo::FindClass(const wxString& className) -{ - if ( sm_classTable ) - { - return (wxClassInfo *)wxClassInfo::sm_classTable->Get(className); - } - else - { - for ( wxClassInfo *info = sm_first; info ; info = info->m_next ) - { - if ( className == info->GetClassName() ) - return info; - } - - return NULL; - } -} - -// Reentrance can occur on some platforms (Solaris for one), as the use of hash -// and string objects can cause other modules to load and register classes -// before the original call returns. This is handled by keeping the hash table -// local when it is first created and only assigning it to the global variable -// when the function is ready to return. -// -// That does make the assumption that after the function has completed the -// first time the problem will no longer happen; all the modules it depends on -// will have been loaded. The assumption is checked using the 'entry' variable -// as a reentrance guard, it checks that once the hash table is global it is -// not accessed multiple times simulateously. - -void wxClassInfo::Register() -{ -#if wxDEBUG_LEVEL - // reentrance guard - see note above - static int entry = 0; -#endif // wxDEBUG_LEVEL - - wxHashTable *classTable; - - if ( !sm_classTable ) - { - // keep the hash local initially, reentrance is possible - classTable = new wxHashTable(wxKEY_STRING); - } - else - { - // guard againt reentrance once the global has been created - wxASSERT_MSG(++entry == 1, wxT("wxClassInfo::Register() reentrance")); - classTable = sm_classTable; - } - - // Using wxIMPLEMENT_DYNAMIC_CLASS() macro twice (which may happen if you - // link any object module twice mistakenly, or link twice against wx shared - // library) will break this function because it will enter an infinite loop - // and eventually die with "out of memory" - as this is quite hard to - // detect if you're unaware of this, try to do some checks here. - wxASSERT_MSG( classTable->Get(m_className) == NULL, - wxString::Format - ( - wxT("Class \"%s\" already in RTTI table - have you used wxIMPLEMENT_DYNAMIC_CLASS() multiple times or linked some object file twice)?"), - m_className - ) - ); - - classTable->Put(m_className, (wxObject *)this); - - // if we're using a local hash we need to try to make it global - if ( sm_classTable != classTable ) - { - if ( !sm_classTable ) - { - // make the hash global - sm_classTable = classTable; - } - else - { - // the gobal hash has already been created by a reentrant call, - // so delete the local hash and try again - delete classTable; - Register(); - } - } - -#if wxDEBUG_LEVEL - entry = 0; -#endif // wxDEBUG_LEVEL -} - -void wxClassInfo::Unregister() -{ - if ( sm_classTable ) - { - sm_classTable->Delete(m_className); - if ( sm_classTable->GetCount() == 0 ) - { - wxDELETE(sm_classTable); - } - } -} - -wxObject *wxCreateDynamicObject(const wxString& name) -{ - if ( wxClassInfo::sm_classTable ) - { - wxClassInfo *info = (wxClassInfo *)wxClassInfo::sm_classTable->Get(name); - return info ? info->CreateObject() : NULL; - } - else // no sm_classTable yet - { - for ( wxClassInfo *info = wxClassInfo::sm_first; - info; - info = info->m_next ) - { - if (info->m_className && wxStrcmp(info->m_className, name) == 0) - return info->CreateObject(); - } - - return NULL; - } -} - -// iterator interface -wxClassInfo::const_iterator::value_type -wxClassInfo::const_iterator::operator*() const -{ - return (wxClassInfo*)m_node->GetData(); -} - -wxClassInfo::const_iterator& wxClassInfo::const_iterator::operator++() -{ - m_node = m_table->Next(); - return *this; -} - -const wxClassInfo::const_iterator wxClassInfo::const_iterator::operator++(int) -{ - wxClassInfo::const_iterator tmp = *this; - m_node = m_table->Next(); - return tmp; -} - -wxClassInfo::const_iterator wxClassInfo::begin_classinfo() -{ - sm_classTable->BeginFind(); - - return const_iterator(sm_classTable->Next(), sm_classTable); -} - -wxClassInfo::const_iterator wxClassInfo::end_classinfo() -{ - return const_iterator(NULL, NULL); -} - -// ---------------------------------------------------------------------------- -// wxObjectRefData -// ---------------------------------------------------------------------------- - -void wxRefCounter::DecRef() -{ - wxASSERT_MSG( m_count > 0, "invalid ref data count" ); - - if ( --m_count == 0 ) - delete this; -} - - -// ---------------------------------------------------------------------------- -// wxObject -// ---------------------------------------------------------------------------- - -void wxObject::Ref(const wxObject& clone) -{ - // nothing to be done - if (m_refData == clone.m_refData) - return; - - // delete reference to old data - UnRef(); - - // reference new data - if ( clone.m_refData ) - { - m_refData = clone.m_refData; - m_refData->IncRef(); - } -} - -void wxObject::UnRef() -{ - if ( m_refData ) - { - m_refData->DecRef(); - m_refData = NULL; - } -} - -void wxObject::AllocExclusive() -{ - if ( !m_refData ) - { - m_refData = CreateRefData(); - } - else if ( m_refData->GetRefCount() > 1 ) - { - // note that ref is not going to be destroyed in this case - const wxObjectRefData* ref = m_refData; - UnRef(); - - // ... so we can still access it - m_refData = CloneRefData(ref); - } - //else: ref count is 1, we are exclusive owners of m_refData anyhow - - wxASSERT_MSG( m_refData && m_refData->GetRefCount() == 1, - wxT("wxObject::AllocExclusive() failed.") ); -} - -wxObjectRefData *wxObject::CreateRefData() const -{ - // if you use AllocExclusive() you must override this method - wxFAIL_MSG( wxT("CreateRefData() must be overridden if called!") ); - - return NULL; -} - -wxObjectRefData * -wxObject::CloneRefData(const wxObjectRefData * WXUNUSED(data)) const -{ - // if you use AllocExclusive() you must override this method - wxFAIL_MSG( wxT("CloneRefData() must be overridden if called!") ); - - return NULL; -} diff --git a/Externals/wxWidgets3/src/common/odcombocmn.cpp b/Externals/wxWidgets3/src/common/odcombocmn.cpp deleted file mode 100644 index 096c9c51ba..0000000000 --- a/Externals/wxWidgets3/src/common/odcombocmn.cpp +++ /dev/null @@ -1,54 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/odcombocmn.cpp -// Purpose: wxOwnerDrawnComboBox common code -// Author: Jaakko Salli -// Modified by: -// Created: Apr-30-2006 -// Copyright: (c) 2005 Jaakko Salli -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_ODCOMBOBOX - -#include "wx/odcombo.h" - -#ifndef WX_PRECOMP - #include "wx/log.h" - #include "wx/combobox.h" - #include "wx/dcclient.h" - #include "wx/settings.h" - #include "wx/dialog.h" -#endif - -#include "wx/combo.h" - -// ---------------------------------------------------------------------------- -// XTI -// ---------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS2_XTI(wxOwnerDrawnComboBox, wxComboCtrl, \ - wxControlWithItems, "wx/odcombo.h") - -wxBEGIN_PROPERTIES_TABLE(wxOwnerDrawnComboBox) -wxEND_PROPERTIES_TABLE() - -wxEMPTY_HANDLERS_TABLE(wxOwnerDrawnComboBox) - -wxCONSTRUCTOR_5( wxOwnerDrawnComboBox , wxWindow* , Parent , wxWindowID , \ - Id , wxString , Value , wxPoint , Position , wxSize , Size ) - -#endif // wxUSE_ODCOMBOBOX diff --git a/Externals/wxWidgets3/src/common/overlaycmn.cpp b/Externals/wxWidgets3/src/common/overlaycmn.cpp deleted file mode 100644 index 4ea0de9a7a..0000000000 --- a/Externals/wxWidgets3/src/common/overlaycmn.cpp +++ /dev/null @@ -1,185 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/overlaycmn.cpp -// Purpose: common wxOverlay code -// Author: Stefan Csomor -// Modified by: -// Created: 2006-10-20 -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include "wx/overlay.h" -#include "wx/private/overlay.h" -#include "wx/dcclient.h" -#include "wx/dcmemory.h" - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxOverlay -// ---------------------------------------------------------------------------- - -wxOverlay::wxOverlay() -{ - m_impl = new wxOverlayImpl(); - m_inDrawing = false; -} - -wxOverlay::~wxOverlay() -{ - delete m_impl; -} - -bool wxOverlay::IsOk() -{ - return m_impl->IsOk(); -} - -void wxOverlay::Init( wxDC* dc, int x , int y , int width , int height ) -{ - m_impl->Init(dc, x, y, width, height); -} - -void wxOverlay::BeginDrawing( wxDC* dc) -{ - m_impl->BeginDrawing(dc); - m_inDrawing = true ; -} - -void wxOverlay::EndDrawing( wxDC* dc) -{ - m_impl->EndDrawing(dc); - m_inDrawing = false ; -} - -void wxOverlay::Clear( wxDC* dc) -{ - m_impl->Clear(dc); -} - -void wxOverlay::Reset() -{ - wxASSERT_MSG(m_inDrawing==false,wxT("cannot reset overlay during drawing")); - m_impl->Reset(); -} - - -// ---------------------------------------------------------------------------- -// wxDCOverlay -// ---------------------------------------------------------------------------- - -wxDCOverlay::wxDCOverlay(wxOverlay &overlay, wxDC *dc, int x , int y , int width , int height) : - m_overlay(overlay) -{ - Init(dc, x, y, width, height); -} - -wxDCOverlay::wxDCOverlay(wxOverlay &overlay, wxDC *dc) : - m_overlay(overlay) -{ - const wxRect device(wxPoint(0, 0), dc->GetSize()); - - Init(dc, - dc->DeviceToLogicalX(device.GetLeft()), - dc->DeviceToLogicalY(device.GetTop()), - dc->DeviceToLogicalX(device.GetRight()), - dc->DeviceToLogicalY(device.GetBottom())); -} - -wxDCOverlay::~wxDCOverlay() -{ - m_overlay.EndDrawing(m_dc); -} - -void wxDCOverlay::Init(wxDC *dc, int x , int y , int width , int height ) -{ - m_dc = dc ; - if ( !m_overlay.IsOk() ) - { - m_overlay.Init(dc,x,y,width,height); - } - m_overlay.BeginDrawing(dc); -} - -void wxDCOverlay::Clear() -{ - m_overlay.Clear(m_dc); -} - -// ---------------------------------------------------------------------------- -// generic implementation of wxOverlayImpl -// ---------------------------------------------------------------------------- - -#ifndef wxHAS_NATIVE_OVERLAY - -wxOverlayImpl::wxOverlayImpl() -{ - m_window = NULL ; - m_x = m_y = m_width = m_height = 0 ; -} - -wxOverlayImpl::~wxOverlayImpl() -{ -} - -bool wxOverlayImpl::IsOk() -{ - return m_bmpSaved.IsOk() ; -} - -void wxOverlayImpl::Init( wxDC* dc, int x , int y , int width , int height ) -{ - m_window = dc->GetWindow(); - wxMemoryDC dcMem ; - m_bmpSaved.Create( width, height ); - dcMem.SelectObject( m_bmpSaved ); - m_x = x ; - m_y = y ; - m_width = width ; - m_height = height ; - dcMem.Blit(0, 0, m_width, m_height, - dc, x, y); - dcMem.SelectObject( wxNullBitmap ); -} - -void wxOverlayImpl::Clear(wxDC* dc) -{ - wxMemoryDC dcMem ; - dcMem.SelectObject( m_bmpSaved ); - dc->Blit( m_x, m_y, m_width, m_height , &dcMem , 0 , 0 ); - dcMem.SelectObject( wxNullBitmap ); -} - -void wxOverlayImpl::Reset() -{ - m_bmpSaved = wxBitmap(); -} - -void wxOverlayImpl::BeginDrawing(wxDC* WXUNUSED(dc)) -{ -} - -void wxOverlayImpl::EndDrawing(wxDC* WXUNUSED(dc)) -{ -} - -#endif // !wxHAS_NATIVE_OVERLAY - - diff --git a/Externals/wxWidgets3/src/common/ownerdrwcmn.cpp b/Externals/wxWidgets3/src/common/ownerdrwcmn.cpp deleted file mode 100644 index 967a5a285b..0000000000 --- a/Externals/wxWidgets3/src/common/ownerdrwcmn.cpp +++ /dev/null @@ -1,104 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/ownerdrwcmn.cpp -// Purpose: wxOwnerDrawn class methods common to all platforms -// Author: Marcin Malich -// Modified by: -// Created: 2009-09-22 -// Copyright: (c) 2009 Marcin Malich -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_OWNER_DRAWN - -#include "wx/ownerdrw.h" - -#ifndef WX_PRECOMP - #include "wx/window.h" - #include "wx/font.h" - #include "wx/colour.h" - #include "wx/dcmemory.h" - #include "wx/settings.h" - #include "wx/utils.h" -#endif - -// ============================================================================ -// implementation -// ============================================================================ - -bool wxOwnerDrawnBase::OnMeasureItem(size_t *width, size_t *height) -{ - if ( IsOwnerDrawn() ) - { - wxMemoryDC dc; - wxFont font; - GetFontToUse(font); - dc.SetFont(font); - - // item name/text without mnemonics - wxString name = wxStripMenuCodes(GetName(), wxStrip_Mnemonics); - - wxCoord w, h; - dc.GetTextExtent(name, &w, &h); - - *width = w + m_margin; - *height = h; - } - else - { - *width = 0; - *height = 0; - } - - return true; -} - -void wxOwnerDrawnBase::GetFontToUse(wxFont& font) const -{ - font = m_font.IsOk() ? m_font : *wxNORMAL_FONT; -} - -void wxOwnerDrawnBase::GetColourToUse(wxODStatus stat, wxColour& colText, wxColour& colBack) const -{ - if ( stat & wxODSelected ) - { - colText = wxSystemSettings::GetColour( - !(stat & wxODDisabled) ? wxSYS_COLOUR_HIGHLIGHTTEXT - : wxSYS_COLOUR_GRAYTEXT); - - colBack = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT); - } - else - { - // fall back to default colors if none explicitly specified - - if ( stat & wxODDisabled ) - { - colText = wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT); - } - else - { - colText = m_colText.IsOk() ? m_colText - : wxSystemSettings::GetColour(wxSYS_COLOUR_MENUTEXT); - } - - colBack = m_colBack.IsOk() ? m_colBack - : wxSystemSettings::GetColour(wxSYS_COLOUR_MENU); - } -} - -#endif // wxUSE_OWNER_DRAWN diff --git a/Externals/wxWidgets3/src/common/panelcmn.cpp b/Externals/wxWidgets3/src/common/panelcmn.cpp deleted file mode 100644 index 44205a696d..0000000000 --- a/Externals/wxWidgets3/src/common/panelcmn.cpp +++ /dev/null @@ -1,115 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/panelcmn.cpp -// Purpose: wxPanel common code -// Author: Julian Smart, Robert Roebling, Vadim Zeitlin -// Modified by: -// Created: 04/01/98 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#ifndef WX_PRECOMP - #include "wx/object.h" - #include "wx/font.h" - #include "wx/colour.h" - #include "wx/settings.h" - #include "wx/log.h" - #include "wx/panel.h" - #include "wx/containr.h" -#endif - -// ---------------------------------------------------------------------------- -// XTI -// ---------------------------------------------------------------------------- - -wxDEFINE_FLAGS( wxPanelStyle ) -wxBEGIN_FLAGS( wxPanelStyle ) - // new style border flags, we put them first to - // use them for streaming out - wxFLAGS_MEMBER(wxBORDER_SIMPLE) - wxFLAGS_MEMBER(wxBORDER_SUNKEN) - wxFLAGS_MEMBER(wxBORDER_DOUBLE) - wxFLAGS_MEMBER(wxBORDER_RAISED) - wxFLAGS_MEMBER(wxBORDER_STATIC) - wxFLAGS_MEMBER(wxBORDER_NONE) - - // old style border flags - wxFLAGS_MEMBER(wxSIMPLE_BORDER) - wxFLAGS_MEMBER(wxSUNKEN_BORDER) - wxFLAGS_MEMBER(wxDOUBLE_BORDER) - wxFLAGS_MEMBER(wxRAISED_BORDER) - wxFLAGS_MEMBER(wxSTATIC_BORDER) - wxFLAGS_MEMBER(wxBORDER) - - // standard window styles - wxFLAGS_MEMBER(wxTAB_TRAVERSAL) - wxFLAGS_MEMBER(wxCLIP_CHILDREN) - wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) - wxFLAGS_MEMBER(wxWANTS_CHARS) - wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE) - wxFLAGS_MEMBER(wxALWAYS_SHOW_SB) - wxFLAGS_MEMBER(wxVSCROLL) - wxFLAGS_MEMBER(wxHSCROLL) -wxEND_FLAGS( wxPanelStyle ) - -wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxPanel, wxWindow, "wx/panel.h"); - -wxBEGIN_PROPERTIES_TABLE(wxPanel) - wxPROPERTY_FLAGS( WindowStyle, wxPanelStyle, long, \ - SetWindowStyleFlag, GetWindowStyleFlag, \ - wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \ - wxT("Helpstring"), wxT("group")) // style - // style wxTAB_TRAVERSAL -wxEND_PROPERTIES_TABLE() - -wxEMPTY_HANDLERS_TABLE(wxPanel) - -wxCONSTRUCTOR_6( wxPanel, wxWindow*, Parent, wxWindowID, Id, \ - wxPoint, Position, wxSize, Size, long, WindowStyle, \ - wxString, Name) - - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxPanelBase creation -// ---------------------------------------------------------------------------- - -bool wxPanelBase::Create(wxWindow *parent, wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) -{ - if ( !wxWindow::Create(parent, id, pos, size, style, name) ) - return false; - - // so that non-solid background renders correctly under GTK+: - SetThemeEnabled(true); - - return true; -} - -void wxPanelBase::InitDialog() -{ - wxInitDialogEvent event(GetId()); - event.SetEventObject(this); - GetEventHandler()->ProcessEvent(event); -} diff --git a/Externals/wxWidgets3/src/common/paper.cpp b/Externals/wxWidgets3/src/common/paper.cpp deleted file mode 100644 index e1f8b20957..0000000000 --- a/Externals/wxWidgets3/src/common/paper.cpp +++ /dev/null @@ -1,379 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/paper.cpp -// Purpose: Paper size classes -// Author: Julian Smart -// Modified by: -// Created: 04/01/98 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_PRINTING_ARCHITECTURE - -#ifndef WX_PRECOMP - #if defined(__WXMSW__) - #include "wx/msw/wrapcdlg.h" - #endif // MSW - #include "wx/utils.h" - #include "wx/settings.h" - #include "wx/intl.h" - #include "wx/module.h" -#endif - -#include "wx/paper.h" - -#include -#include - -#ifdef __WXMSW__ - #ifndef __WIN32__ - #include - #endif -#endif - // End __WXMSW__ - -wxIMPLEMENT_DYNAMIC_CLASS(wxPrintPaperType, wxObject); -// wxIMPLEMENT_DYNAMIC_CLASS(wxPrintPaperDatabase, wxList); - -/* - * Paper size database for all platforms - */ - -wxPrintPaperType::wxPrintPaperType() -{ - m_paperId = wxPAPER_NONE; - m_platformId = 0; - m_paperName = wxEmptyString; - m_width = 0; - m_height = 0; -} - -wxPrintPaperType::wxPrintPaperType(wxPaperSize paperId, int platformId, const wxString& name, int w, int h) -{ - m_paperId = paperId; - m_platformId = platformId; - m_paperName = name; - m_width = w; - m_height = h; -} - -// Get width and height in points (1/72th of an inch) -wxSize wxPrintPaperType::GetSizeDeviceUnits() const -{ - return wxSize( (int) ((m_width / 10.0) / (25.4 / 72.0)), (int) ((m_height / 10.0) / (25.4 / 72.0)) ); -} - -/* - * Print paper database for PostScript - */ - -WX_DECLARE_LIST(wxPrintPaperType, wxPrintPaperTypeList); -#include "wx/listimpl.cpp" -WX_DEFINE_LIST(wxPrintPaperTypeList) - -wxPrintPaperDatabase* wxThePrintPaperDatabase = NULL; - -wxPrintPaperDatabase::wxPrintPaperDatabase() -{ - m_map = new wxStringToPrintPaperTypeHashMap; - m_list = new wxPrintPaperTypeList; -} - -wxPrintPaperDatabase::~wxPrintPaperDatabase() -{ - ClearDatabase(); -} - -void wxPrintPaperDatabase::CreateDatabase() -{ - WXADDPAPER(wxPAPER_LETTER, DMPAPER_LETTER, wxTRANSLATE("Letter, 8 1/2 x 11 in"), 2159, 2794); - WXADDPAPER(wxPAPER_LEGAL, DMPAPER_LEGAL, wxTRANSLATE("Legal, 8 1/2 x 14 in"), 2159, 3556); - WXADDPAPER(wxPAPER_A4, DMPAPER_A4, wxTRANSLATE("A4 sheet, 210 x 297 mm"), 2100, 2970); - WXADDPAPER(wxPAPER_CSHEET, DMPAPER_CSHEET, wxTRANSLATE("C sheet, 17 x 22 in"), 4318, 5588); - WXADDPAPER(wxPAPER_DSHEET, DMPAPER_DSHEET, wxTRANSLATE("D sheet, 22 x 34 in"), 5588, 8636); - WXADDPAPER(wxPAPER_ESHEET, DMPAPER_ESHEET, wxTRANSLATE("E sheet, 34 x 44 in"), 8636, 11176); - WXADDPAPER(wxPAPER_LETTERSMALL, DMPAPER_LETTERSMALL, wxTRANSLATE("Letter Small, 8 1/2 x 11 in"), 2159, 2794); - WXADDPAPER(wxPAPER_TABLOID, DMPAPER_TABLOID, wxTRANSLATE("Tabloid, 11 x 17 in"), 2794, 4318); - WXADDPAPER(wxPAPER_LEDGER, DMPAPER_LEDGER, wxTRANSLATE("Ledger, 17 x 11 in"), 4318, 2794); - WXADDPAPER(wxPAPER_STATEMENT, DMPAPER_STATEMENT, wxTRANSLATE("Statement, 5 1/2 x 8 1/2 in"), 1397, 2159); - WXADDPAPER(wxPAPER_EXECUTIVE, DMPAPER_EXECUTIVE, wxTRANSLATE("Executive, 7 1/4 x 10 1/2 in"), 1842, 2667); - WXADDPAPER(wxPAPER_A3, DMPAPER_A3, wxTRANSLATE("A3 sheet, 297 x 420 mm"), 2970, 4200); - WXADDPAPER(wxPAPER_A4SMALL, DMPAPER_A4SMALL, wxTRANSLATE("A4 small sheet, 210 x 297 mm"), 2100, 2970); - WXADDPAPER(wxPAPER_A5, DMPAPER_A5, wxTRANSLATE("A5 sheet, 148 x 210 mm"), 1480, 2100); - WXADDPAPER(wxPAPER_B4, DMPAPER_B4, wxTRANSLATE("B4 sheet, 250 x 354 mm"), 2500, 3540); - WXADDPAPER(wxPAPER_B5, DMPAPER_B5, wxTRANSLATE("B5 sheet, 182 x 257 millimeter"), 1820, 2570); - WXADDPAPER(wxPAPER_FOLIO, DMPAPER_FOLIO, wxTRANSLATE("Folio, 8 1/2 x 13 in"), 2159, 3302); - WXADDPAPER(wxPAPER_QUARTO, DMPAPER_QUARTO, wxTRANSLATE("Quarto, 215 x 275 mm"), 2150, 2750); - WXADDPAPER(wxPAPER_10X14, DMPAPER_10X14, wxTRANSLATE("10 x 14 in"), 2540, 3556); - WXADDPAPER(wxPAPER_11X17, DMPAPER_11X17, wxTRANSLATE("11 x 17 in"), 2794, 4318); - WXADDPAPER(wxPAPER_NOTE, DMPAPER_NOTE, wxTRANSLATE("Note, 8 1/2 x 11 in"), 2159, 2794); - WXADDPAPER(wxPAPER_ENV_9, DMPAPER_ENV_9, wxTRANSLATE("#9 Envelope, 3 7/8 x 8 7/8 in"), 984, 2254); - WXADDPAPER(wxPAPER_ENV_10, DMPAPER_ENV_10, wxTRANSLATE("#10 Envelope, 4 1/8 x 9 1/2 in"), 1048, 2413); - WXADDPAPER(wxPAPER_ENV_11, DMPAPER_ENV_11, wxTRANSLATE("#11 Envelope, 4 1/2 x 10 3/8 in"), 1143, 2635); - WXADDPAPER(wxPAPER_ENV_12, DMPAPER_ENV_12, wxTRANSLATE("#12 Envelope, 4 3/4 x 11 in"), 1206, 2794); - WXADDPAPER(wxPAPER_ENV_14, DMPAPER_ENV_14, wxTRANSLATE("#14 Envelope, 5 x 11 1/2 in"), 1270, 2921); - WXADDPAPER(wxPAPER_ENV_DL, DMPAPER_ENV_DL, wxTRANSLATE("DL Envelope, 110 x 220 mm"), 1100, 2200); - WXADDPAPER(wxPAPER_ENV_C5, DMPAPER_ENV_C5, wxTRANSLATE("C5 Envelope, 162 x 229 mm"), 1620, 2290); - WXADDPAPER(wxPAPER_ENV_C3, DMPAPER_ENV_C3, wxTRANSLATE("C3 Envelope, 324 x 458 mm"), 3240, 4580); - WXADDPAPER(wxPAPER_ENV_C4, DMPAPER_ENV_C4, wxTRANSLATE("C4 Envelope, 229 x 324 mm"), 2290, 3240); - WXADDPAPER(wxPAPER_ENV_C6, DMPAPER_ENV_C6, wxTRANSLATE("C6 Envelope, 114 x 162 mm"), 1140, 1620); - WXADDPAPER(wxPAPER_ENV_C65, DMPAPER_ENV_C65, wxTRANSLATE("C65 Envelope, 114 x 229 mm"), 1140, 2290); - WXADDPAPER(wxPAPER_ENV_B4, DMPAPER_ENV_B4, wxTRANSLATE("B4 Envelope, 250 x 353 mm"), 2500, 3530); - WXADDPAPER(wxPAPER_ENV_B5, DMPAPER_ENV_B5, wxTRANSLATE("B5 Envelope, 176 x 250 mm"), 1760, 2500); - WXADDPAPER(wxPAPER_ENV_B6, DMPAPER_ENV_B6, wxTRANSLATE("B6 Envelope, 176 x 125 mm"), 1760, 1250); - WXADDPAPER(wxPAPER_ENV_ITALY, DMPAPER_ENV_ITALY, wxTRANSLATE("Italy Envelope, 110 x 230 mm"), 1100, 2300); - WXADDPAPER(wxPAPER_ENV_MONARCH, DMPAPER_ENV_MONARCH, wxTRANSLATE("Monarch Envelope, 3 7/8 x 7 1/2 in"), 984, 1905); - WXADDPAPER(wxPAPER_ENV_PERSONAL, DMPAPER_ENV_PERSONAL, wxTRANSLATE("6 3/4 Envelope, 3 5/8 x 6 1/2 in"), 921, 1651); - WXADDPAPER(wxPAPER_FANFOLD_US, DMPAPER_FANFOLD_US, wxTRANSLATE("US Std Fanfold, 14 7/8 x 11 in"), 3778, 2794); - WXADDPAPER(wxPAPER_FANFOLD_STD_GERMAN, DMPAPER_FANFOLD_STD_GERMAN, wxTRANSLATE("German Std Fanfold, 8 1/2 x 12 in"), 2159, 3048); - WXADDPAPER(wxPAPER_FANFOLD_LGL_GERMAN, DMPAPER_FANFOLD_LGL_GERMAN, wxTRANSLATE("German Legal Fanfold, 8 1/2 x 13 in"), 2159, 3302); - - WXADDPAPER(wxPAPER_ISO_B4, DMPAPER_ISO_B4, wxTRANSLATE("B4 (ISO) 250 x 353 mm"), 2500, 3530); - WXADDPAPER(wxPAPER_JAPANESE_POSTCARD, DMPAPER_JAPANESE_POSTCARD, wxTRANSLATE("Japanese Postcard 100 x 148 mm"), 1000, 1480); - WXADDPAPER(wxPAPER_9X11, DMPAPER_9X11, wxTRANSLATE("9 x 11 in"), 2286, 2794); - WXADDPAPER(wxPAPER_10X11, DMPAPER_10X11, wxTRANSLATE("10 x 11 in"), 2540, 2794); - WXADDPAPER(wxPAPER_15X11, DMPAPER_15X11, wxTRANSLATE("15 x 11 in"), 3810, 2794); - WXADDPAPER(wxPAPER_ENV_INVITE, DMPAPER_ENV_INVITE, wxTRANSLATE("Envelope Invite 220 x 220 mm"), 2200, 2200); - WXADDPAPER(wxPAPER_LETTER_EXTRA, DMPAPER_LETTER_EXTRA, wxTRANSLATE("Letter Extra 9 1/2 x 12 in"), 2413, 3048); - WXADDPAPER(wxPAPER_LEGAL_EXTRA, DMPAPER_LEGAL_EXTRA, wxTRANSLATE("Legal Extra 9 1/2 x 15 in"), 2413, 3810); - WXADDPAPER(wxPAPER_TABLOID_EXTRA, DMPAPER_TABLOID_EXTRA, wxTRANSLATE("Tabloid Extra 11.69 x 18 in"), 2969, 4572); - WXADDPAPER(wxPAPER_A4_EXTRA, DMPAPER_A4_EXTRA, wxTRANSLATE("A4 Extra 9.27 x 12.69 in"), 2355, 3223); - WXADDPAPER(wxPAPER_LETTER_TRANSVERSE, DMPAPER_LETTER_TRANSVERSE, wxTRANSLATE("Letter Transverse 8 1/2 x 11 in"), 2159, 2794); - WXADDPAPER(wxPAPER_A4_TRANSVERSE, DMPAPER_A4_TRANSVERSE, wxTRANSLATE("A4 Transverse 210 x 297 mm"), 2100, 2970); - WXADDPAPER(wxPAPER_LETTER_EXTRA_TRANSVERSE, DMPAPER_LETTER_EXTRA_TRANSVERSE, wxTRANSLATE("Letter Extra Transverse 9.275 x 12 in"), 2355, 3048); - WXADDPAPER(wxPAPER_A_PLUS, DMPAPER_A_PLUS, wxTRANSLATE("SuperA/SuperA/A4 227 x 356 mm"), 2270, 3560); - WXADDPAPER(wxPAPER_B_PLUS, DMPAPER_B_PLUS, wxTRANSLATE("SuperB/SuperB/A3 305 x 487 mm"), 3050, 4870); - WXADDPAPER(wxPAPER_LETTER_PLUS, DMPAPER_LETTER_PLUS, wxTRANSLATE("Letter Plus 8 1/2 x 12.69 in"), 2159, 3223); - WXADDPAPER(wxPAPER_A4_PLUS, DMPAPER_A4_PLUS, wxTRANSLATE("A4 Plus 210 x 330 mm"), 2100, 3300); - WXADDPAPER(wxPAPER_A5_TRANSVERSE, DMPAPER_A5_TRANSVERSE, wxTRANSLATE("A5 Transverse 148 x 210 mm"), 1480, 2100); - WXADDPAPER(wxPAPER_B5_TRANSVERSE, DMPAPER_B5_TRANSVERSE, wxTRANSLATE("B5 (JIS) Transverse 182 x 257 mm"), 1820, 2570); - WXADDPAPER(wxPAPER_A3_EXTRA, DMPAPER_A3_EXTRA, wxTRANSLATE("A3 Extra 322 x 445 mm"), 3220, 4450); - WXADDPAPER(wxPAPER_A5_EXTRA, DMPAPER_A5_EXTRA, wxTRANSLATE("A5 Extra 174 x 235 mm"), 1740, 2350); - WXADDPAPER(wxPAPER_B5_EXTRA, DMPAPER_B5_EXTRA, wxTRANSLATE("B5 (ISO) Extra 201 x 276 mm"), 2010, 2760); - WXADDPAPER(wxPAPER_A2, DMPAPER_A2, wxTRANSLATE("A2 420 x 594 mm"), 4200, 5940); - WXADDPAPER(wxPAPER_A3_TRANSVERSE, DMPAPER_A3_TRANSVERSE, wxTRANSLATE("A3 Transverse 297 x 420 mm"), 2970, 4200); - WXADDPAPER(wxPAPER_A3_EXTRA_TRANSVERSE,DMPAPER_A3_EXTRA_TRANSVERSE,wxTRANSLATE("A3 Extra Transverse 322 x 445 mm"), 3220, 4450); - - WXADDPAPER(wxPAPER_DBL_JAPANESE_POSTCARD, 69, wxTRANSLATE("Japanese Double Postcard 200 x 148 mm"), 2000, 1480); - WXADDPAPER(wxPAPER_A6, 70, wxTRANSLATE("A6 105 x 148 mm"), 1050, 1480); - WXADDPAPER(wxPAPER_JENV_KAKU2, 71, wxTRANSLATE("Japanese Envelope Kaku #2"), 2400, 3320); - WXADDPAPER(wxPAPER_JENV_KAKU3, 72, wxTRANSLATE("Japanese Envelope Kaku #3"), 2160, 2770); - WXADDPAPER(wxPAPER_JENV_CHOU3, 73, wxTRANSLATE("Japanese Envelope Chou #3"), 1200, 2350); - WXADDPAPER(wxPAPER_JENV_CHOU4, 74, wxTRANSLATE("Japanese Envelope Chou #4"), 900, 2050); - WXADDPAPER(wxPAPER_LETTER_ROTATED, 75, wxTRANSLATE("Letter Rotated 11 x 8 1/2 in"), 2794, 2159); - WXADDPAPER(wxPAPER_A3_ROTATED, 76, wxTRANSLATE("A3 Rotated 420 x 297 mm"), 4200, 2970); - WXADDPAPER(wxPAPER_A4_ROTATED, 77, wxTRANSLATE("A4 Rotated 297 x 210 mm"), 2970, 2100); - WXADDPAPER(wxPAPER_A5_ROTATED, 78, wxTRANSLATE("A5 Rotated 210 x 148 mm"), 2100, 1480); - WXADDPAPER(wxPAPER_B4_JIS_ROTATED, 79, wxTRANSLATE("B4 (JIS) Rotated 364 x 257 mm"), 3640, 2570); - WXADDPAPER(wxPAPER_B5_JIS_ROTATED, 80, wxTRANSLATE("B5 (JIS) Rotated 257 x 182 mm"), 2570, 1820); - WXADDPAPER(wxPAPER_JAPANESE_POSTCARD_ROTATED, 81, wxTRANSLATE("Japanese Postcard Rotated 148 x 100 mm"), 1480, 1000); - WXADDPAPER(wxPAPER_DBL_JAPANESE_POSTCARD_ROTATED, 82, wxTRANSLATE("Double Japanese Postcard Rotated 148 x 200 mm"), 1480, 2000); - WXADDPAPER(wxPAPER_A6_ROTATED, 83, wxTRANSLATE("A6 Rotated 148 x 105 mm"), 1480, 1050); - WXADDPAPER(wxPAPER_JENV_KAKU2_ROTATED, 84, wxTRANSLATE("Japanese Envelope Kaku #2 Rotated"), 3320, 2400); - WXADDPAPER(wxPAPER_JENV_KAKU3_ROTATED, 85, wxTRANSLATE("Japanese Envelope Kaku #3 Rotated"), 2770, 2160); - WXADDPAPER(wxPAPER_JENV_CHOU3_ROTATED, 86, wxTRANSLATE("Japanese Envelope Chou #3 Rotated"), 2350, 1200); - WXADDPAPER(wxPAPER_JENV_CHOU4_ROTATED, 87, wxTRANSLATE("Japanese Envelope Chou #4 Rotated"), 2050, 900); - WXADDPAPER(wxPAPER_B6_JIS, 88, wxTRANSLATE("B6 (JIS) 128 x 182 mm"), 1280, 1820); - WXADDPAPER(wxPAPER_B6_JIS_ROTATED, 89, wxTRANSLATE("B6 (JIS) Rotated 182 x 128 mm"), 1920, 1280); - WXADDPAPER(wxPAPER_12X11, 90, wxTRANSLATE("12 x 11 in"), 3048, 2794); - WXADDPAPER(wxPAPER_JENV_YOU4, 91, wxTRANSLATE("Japanese Envelope You #4"), 2350, 1050); - WXADDPAPER(wxPAPER_JENV_YOU4_ROTATED, 92, wxTRANSLATE("Japanese Envelope You #4 Rotated"), 1050, 2350); - WXADDPAPER(wxPAPER_P16K, 93, wxTRANSLATE("PRC 16K 146 x 215 mm"), 1460, 2150); - WXADDPAPER(wxPAPER_P32K, 94, wxTRANSLATE("PRC 32K 97 x 151 mm"), 970, 1510); - WXADDPAPER(wxPAPER_P32KBIG, 95, wxTRANSLATE("PRC 32K(Big) 97 x 151 mm"), 970, 1510); - WXADDPAPER(wxPAPER_PENV_1, 96, wxTRANSLATE("PRC Envelope #1 102 x 165 mm"), 1020, 1650); - WXADDPAPER(wxPAPER_PENV_2, 97, wxTRANSLATE("PRC Envelope #2 102 x 176 mm"), 1020, 1760); - WXADDPAPER(wxPAPER_PENV_3, 98, wxTRANSLATE("PRC Envelope #3 125 x 176 mm"), 1250, 1760); - WXADDPAPER(wxPAPER_PENV_4, 99, wxTRANSLATE("PRC Envelope #4 110 x 208 mm"), 1100, 2080); - WXADDPAPER(wxPAPER_PENV_5, 100, wxTRANSLATE("PRC Envelope #5 110 x 220 mm"), 1100, 2200); - WXADDPAPER(wxPAPER_PENV_6, 101, wxTRANSLATE("PRC Envelope #6 120 x 230 mm"), 1200, 2300); - WXADDPAPER(wxPAPER_PENV_7, 102, wxTRANSLATE("PRC Envelope #7 160 x 230 mm"), 1600, 2300); - WXADDPAPER(wxPAPER_PENV_8, 103, wxTRANSLATE("PRC Envelope #8 120 x 309 mm"), 1200, 3090); - WXADDPAPER(wxPAPER_PENV_9, 104, wxTRANSLATE("PRC Envelope #9 229 x 324 mm"), 2290, 3240); - WXADDPAPER(wxPAPER_PENV_10, 105, wxTRANSLATE("PRC Envelope #10 324 x 458 mm"), 3240, 4580); - WXADDPAPER(wxPAPER_P16K_ROTATED, 106, wxTRANSLATE("PRC 16K Rotated"), 2150, 1460); - WXADDPAPER(wxPAPER_P32K_ROTATED, 107, wxTRANSLATE("PRC 32K Rotated"), 1510, 970); - WXADDPAPER(wxPAPER_P32KBIG_ROTATED, 108, wxTRANSLATE("PRC 32K(Big) Rotated"), 1510, 970); - WXADDPAPER(wxPAPER_PENV_1_ROTATED, 109, wxTRANSLATE("PRC Envelope #1 Rotated 165 x 102 mm"), 1650, 1020); - WXADDPAPER(wxPAPER_PENV_2_ROTATED, 110, wxTRANSLATE("PRC Envelope #2 Rotated 176 x 102 mm"), 1760, 1020); - WXADDPAPER(wxPAPER_PENV_3_ROTATED, 111, wxTRANSLATE("PRC Envelope #3 Rotated 176 x 125 mm"), 1760, 1250); - WXADDPAPER(wxPAPER_PENV_4_ROTATED, 112, wxTRANSLATE("PRC Envelope #4 Rotated 208 x 110 mm"), 2080, 1100); - WXADDPAPER(wxPAPER_PENV_5_ROTATED, 113, wxTRANSLATE("PRC Envelope #5 Rotated 220 x 110 mm"), 2200, 1100); - WXADDPAPER(wxPAPER_PENV_6_ROTATED, 114, wxTRANSLATE("PRC Envelope #6 Rotated 230 x 120 mm"), 2300, 1200); - WXADDPAPER(wxPAPER_PENV_7_ROTATED, 115, wxTRANSLATE("PRC Envelope #7 Rotated 230 x 160 mm"), 2300, 1600); - WXADDPAPER(wxPAPER_PENV_8_ROTATED, 116, wxTRANSLATE("PRC Envelope #8 Rotated 309 x 120 mm"), 3090, 1200); - WXADDPAPER(wxPAPER_PENV_9_ROTATED, 117, wxTRANSLATE("PRC Envelope #9 Rotated 324 x 229 mm"), 3240, 2290); - WXADDPAPER(wxPAPER_PENV_10_ROTATED, 118, wxTRANSLATE("PRC Envelope #10 Rotated 458 x 324 mm"), 4580, 3240); - - // notice that the values 135 and 136 for Windows paper size ids of A0 and - // A1 formats are not documented anywhere but seem to work for at least - // some printers so we use them until we find a better way (see #11083) - WXADDPAPER(wxPAPER_A0, 136, wxTRANSLATE("A0 sheet, 841 x 1189 mm"), 8410, 11888); - WXADDPAPER(wxPAPER_A1, 135, wxTRANSLATE("A1 sheet, 594 x 841 mm"), 5940, 8410); -} - -void wxPrintPaperDatabase::ClearDatabase() -{ - delete m_list; - WX_CLEAR_HASH_MAP(wxStringToPrintPaperTypeHashMap, *m_map); - delete m_map; -} - -void wxPrintPaperDatabase::AddPaperType(wxPaperSize paperId, const wxString& name, int w, int h) -{ - wxPrintPaperType* tmp = new wxPrintPaperType(paperId, 0, name, w, h); - (*m_map)[name] = tmp; - m_list->push_back(tmp); -} - -void wxPrintPaperDatabase::AddPaperType(wxPaperSize paperId, int platformId, const wxString& name, int w, int h) -{ - wxPrintPaperType* tmp = new wxPrintPaperType(paperId, platformId, name, w, h); - (*m_map)[name] = tmp; - m_list->push_back(tmp); -} - -wxPrintPaperType *wxPrintPaperDatabase::FindPaperType(const wxString& name) -{ - wxStringToPrintPaperTypeHashMap::iterator it = m_map->find(name); - if (it != m_map->end()) - return it->second; - else - return NULL; -} - -wxPrintPaperType *wxPrintPaperDatabase::FindPaperType(wxPaperSize id) -{ - typedef wxStringToPrintPaperTypeHashMap::iterator iterator; - - for (iterator it = m_map->begin(), en = m_map->end(); it != en; ++it) - { - wxPrintPaperType* paperType = it->second; - if (paperType->GetId() == id) - return paperType; - } - - return NULL; -} - -wxPrintPaperType *wxPrintPaperDatabase::FindPaperTypeByPlatformId(int id) -{ - typedef wxStringToPrintPaperTypeHashMap::iterator iterator; - - for (iterator it = m_map->begin(), en = m_map->end(); it != en; ++it) - { - wxPrintPaperType* paperType = it->second; - if (paperType->GetPlatformId() == id) - return paperType; - } - - return NULL; -} - -wxPrintPaperType *wxPrintPaperDatabase::FindPaperType(const wxSize& sz) -{ - // Take the item ordering into account so that the more common types - // are likely to be taken into account first. This fixes problems with, - // for example, Letter reverting to A4 in the page setup dialog because - // it was wrongly translated to Note. - for ( size_t i = 0; i < GetCount(); i++ ) - { - wxPrintPaperType* const paperType = Item(i); - const wxSize paperSize = paperType->GetSize() ; - if ( abs(paperSize.x - sz.x) < 10 && abs(paperSize.y - sz.y) < 10 ) - return paperType; - } - - return NULL; -} - -// Convert name to size id -wxPaperSize wxPrintPaperDatabase::ConvertNameToId(const wxString& name) -{ - wxPrintPaperType* type = FindPaperType(name); - if (type) - return type->GetId(); - else - return wxPAPER_NONE; -} - -// Convert size id to name -wxString wxPrintPaperDatabase::ConvertIdToName(wxPaperSize paperId) -{ - wxPrintPaperType* type = FindPaperType(paperId); - if (type) - return type->GetName(); - else - return wxEmptyString; -} - -// Get the paper size -wxSize wxPrintPaperDatabase::GetSize(wxPaperSize paperId) -{ - wxPrintPaperType* type = FindPaperType(paperId); - if (type) - return type->GetSize(); - else - return wxSize(0,0); -} - -// Get the paper size -wxPaperSize wxPrintPaperDatabase::GetSize(const wxSize& size) -{ - wxPrintPaperType* type = FindPaperType(size); - if (type) - return type->GetId(); - else - return wxPAPER_NONE; -} - -// QUICK and DIRTY -size_t wxPrintPaperDatabase::GetCount() const -{ - return m_list->GetCount(); -} - -wxPrintPaperType* wxPrintPaperDatabase::Item(size_t index) const -{ - return m_list->Item(index)->GetData(); -} - -// A module to allow initialization/cleanup of print paper -// things without calling these functions from app.cpp. - -class WXDLLEXPORT wxPrintPaperModule: public wxModule -{ - wxDECLARE_DYNAMIC_CLASS(wxPrintPaperModule); -public: - wxPrintPaperModule() {} - bool OnInit() wxOVERRIDE; - void OnExit() wxOVERRIDE; -}; - -wxIMPLEMENT_DYNAMIC_CLASS(wxPrintPaperModule, wxModule); - -/* - * Initialization/cleanup module - */ - -bool wxPrintPaperModule::OnInit() -{ - wxThePrintPaperDatabase = new wxPrintPaperDatabase; - wxThePrintPaperDatabase->CreateDatabase(); - - return true; -} - -void wxPrintPaperModule::OnExit() -{ - wxDELETE(wxThePrintPaperDatabase); -} - -#endif // wxUSE_PRINTING_ARCHITECTURE diff --git a/Externals/wxWidgets3/src/common/persist.cpp b/Externals/wxWidgets3/src/common/persist.cpp deleted file mode 100644 index f1e951957f..0000000000 --- a/Externals/wxWidgets3/src/common/persist.cpp +++ /dev/null @@ -1,174 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/persist.cpp -// Purpose: common persistence support classes -// Author: Vadim Zeitlin -// Created: 2009-01-20 -// Copyright: (c) 2009 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// for compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_CONFIG - -#ifndef WX_PRECOMP -#endif // WX_PRECOMP - -#include "wx/persist.h" - -namespace -{ - -wxPersistenceManager* gs_manager = NULL; - -} // anonymous namespace - -// ============================================================================ -// wxPersistenceManager implementation -// ============================================================================ - -/* static */ -void wxPersistenceManager::Set(wxPersistenceManager& manager) -{ - gs_manager = &manager; -} - -/* static */ -wxPersistenceManager& wxPersistenceManager::Get() -{ - if ( !gs_manager ) - { - static wxPersistenceManager s_manager; - - gs_manager = &s_manager; - } - - return *gs_manager; -} - -wxPersistenceManager::~wxPersistenceManager() -{ -} - -wxString -wxPersistenceManager::GetKey(const wxPersistentObject& who, - const wxString& name) const -{ - wxString key("Persistent_Options"); // TODO: make this configurable - key << wxCONFIG_PATH_SEPARATOR << who.GetKind() - << wxCONFIG_PATH_SEPARATOR << who.GetName() - << wxCONFIG_PATH_SEPARATOR << name; - - return key; -} - -wxPersistentObject *wxPersistenceManager::Find(void *obj) const -{ - const wxPersistentObjectsMap::const_iterator - it = m_persistentObjects.find(obj); - return it == m_persistentObjects.end() ? NULL : it->second; -} - -wxPersistentObject * -wxPersistenceManager::Register(void *obj, wxPersistentObject *po) -{ - if ( wxPersistentObject *old = Find(obj) ) - { - wxFAIL_MSG( "object is already registered" ); - - delete po; // still avoid the memory leaks - return old; - } - - m_persistentObjects[obj] = po; - - return po; -} - -void wxPersistenceManager::Unregister(void *obj) -{ - wxPersistentObjectsMap::iterator it = m_persistentObjects.find(obj); - wxCHECK_RET( it != m_persistentObjects.end(), "not registered" ); - - wxPersistentObject * const po = it->second; - m_persistentObjects.erase(it); - delete po; -} - -void wxPersistenceManager::Save(void *obj) -{ - if ( !m_doSave ) - return; - - wxPersistentObjectsMap::iterator it = m_persistentObjects.find(obj); - wxCHECK_RET( it != m_persistentObjects.end(), "not registered" ); - - it->second->Save(); -} - -bool wxPersistenceManager::Restore(void *obj) -{ - if ( !m_doRestore ) - return false; - - wxPersistentObjectsMap::iterator it = m_persistentObjects.find(obj); - wxCHECK_MSG( it != m_persistentObjects.end(), false, "not registered" ); - - return it->second->Restore(); -} - -namespace -{ - -template -inline bool -DoSaveValue(wxConfigBase *conf, const wxString& key, T value) -{ - return conf && conf->Write(key, value); -} - -template -bool -DoRestoreValue(wxConfigBase *conf, const wxString& key, T *value) -{ - return conf && conf->Read(key, value); -} - -} // anonymous namespace - -#define wxPERSIST_DEFINE_SAVE_RESTORE_FOR(Type) \ - bool wxPersistenceManager::SaveValue(const wxPersistentObject& who, \ - const wxString& name, \ - Type value) \ - { \ - return DoSaveValue(GetConfig(), GetKey(who, name), value); \ - } \ - \ - bool wxPersistenceManager::RestoreValue(const wxPersistentObject& who, \ - const wxString& name, \ - Type *value) \ - { \ - return DoRestoreValue(GetConfig(), GetKey(who, name), value); \ - } - -wxPERSIST_DEFINE_SAVE_RESTORE_FOR(bool) -wxPERSIST_DEFINE_SAVE_RESTORE_FOR(int) -wxPERSIST_DEFINE_SAVE_RESTORE_FOR(long) -wxPERSIST_DEFINE_SAVE_RESTORE_FOR(wxString) - -#undef wxPERSIST_DEFINE_SAVE_RESTORE_FOR - -#endif // wxUSE_CONFIG diff --git a/Externals/wxWidgets3/src/common/pickerbase.cpp b/Externals/wxWidgets3/src/common/pickerbase.cpp deleted file mode 100644 index a435a0598a..0000000000 --- a/Externals/wxWidgets3/src/common/pickerbase.cpp +++ /dev/null @@ -1,179 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/pickerbase.cpp -// Purpose: wxPickerBase class implementation -// Author: Francesco Montorsi -// Modified by: -// Created: 15/04/2006 -// Copyright: (c) Francesco Montorsi -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_COLOURPICKERCTRL || \ - wxUSE_DIRPICKERCTRL || \ - wxUSE_FILEPICKERCTRL || \ - wxUSE_FONTPICKERCTRL - -#include "wx/pickerbase.h" -#include "wx/tooltip.h" - -#ifndef WX_PRECOMP - #include "wx/textctrl.h" -#endif - - -// ============================================================================ -// implementation -// ============================================================================ - -wxIMPLEMENT_ABSTRACT_CLASS(wxPickerBase, wxControl); - -// ---------------------------------------------------------------------------- -// wxPickerBase -// ---------------------------------------------------------------------------- - -bool wxPickerBase::CreateBase(wxWindow *parent, - wxWindowID id, - const wxString &text, - const wxPoint& pos, - const wxSize& size, - long style, - const wxValidator& validator, - const wxString& name) -{ - // remove any border style from our style as wxPickerBase's window must be - // invisible (user styles must be set on the textctrl or the platform-dependent picker) - style &= ~wxBORDER_MASK; - - if (!wxControl::Create(parent, id, pos, size, style | wxNO_BORDER | wxTAB_TRAVERSAL, - validator, name)) - return false; - - SetMinSize( size ); - - m_sizer = new wxBoxSizer(wxHORIZONTAL); - - if (HasFlag(wxPB_USE_TEXTCTRL)) - { - // NOTE: the style of this class (wxPickerBase) and the style of the - // attached text control are different: GetTextCtrlStyle() extracts - // the styles related to the textctrl from the styles passed here - m_text = new wxTextCtrl(this, wxID_ANY, wxEmptyString, - wxDefaultPosition, wxDefaultSize, - GetTextCtrlStyle(style)); - if (!m_text) - { - wxFAIL_MSG( wxT("wxPickerBase's textctrl creation failed") ); - return false; - } - - // set the maximum length allowed for this textctrl. - // This is very important since any change to it will trigger an update in - // the m_picker; for very long strings, this real-time synchronization could - // become a CPU-blocker and thus should be avoided. - // 32 characters will be more than enough for all common uses. - m_text->SetMaxLength(32); - - // set the initial contents of the textctrl - m_text->SetValue(text); - - m_text->Connect(m_text->GetId(), wxEVT_TEXT, - wxCommandEventHandler(wxPickerBase::OnTextCtrlUpdate), - NULL, this); - m_text->Connect(m_text->GetId(), wxEVT_KILL_FOCUS, - wxFocusEventHandler(wxPickerBase::OnTextCtrlKillFocus), - NULL, this); - - m_text->Connect(m_text->GetId(), wxEVT_DESTROY, - wxWindowDestroyEventHandler(wxPickerBase::OnTextCtrlDelete), - NULL, this); - - // the text control's proportion values defaults to 2 - m_sizer->Add(m_text, 2, GetDefaultTextCtrlFlag(), 5); - } - - return true; -} - -void wxPickerBase::PostCreation() -{ - // the picker's proportion value defaults to 1 when there's no text control - // associated with it - in that case it defaults to 0 - m_sizer->Add(m_picker, HasTextCtrl() ? 0 : 1, GetDefaultPickerCtrlFlag(), 5); - - // For aesthetic reasons, make sure the picker is at least as high as the - // associated text control and is always at least square, unless we are - // explicitly using wxPB_SMALL style to force it to take as little space as - // possible. - if ( !HasFlag(wxPB_SMALL) ) - { - const wxSize pickerBestSize(m_picker->GetBestSize()); - const wxSize textBestSize( HasTextCtrl() ? m_text->GetBestSize() : wxSize()); - wxSize pickerMinSize; - pickerMinSize.y = wxMax(pickerBestSize.y, textBestSize.y); - pickerMinSize.x = wxMax(pickerBestSize.x, pickerMinSize.y); - if ( pickerMinSize != pickerBestSize ) - m_picker->SetMinSize(pickerMinSize); - } - - SetSizer(m_sizer); - - SetInitialSize( GetMinSize() ); -} - -#if wxUSE_TOOLTIPS - -void wxPickerBase::DoSetToolTip(wxToolTip *tip) -{ - // don't set the tooltip on us but rather on our two child windows - // as otherwise it would appear only when the cursor is placed on the - // small area around the child windows which belong to wxPickerBase - m_picker->SetToolTip(tip); - - // do a copy as wxWindow will own the pointer we pass - if ( m_text ) - m_text->SetToolTip(tip ? new wxToolTip(tip->GetTip()) : NULL); -} - -#endif // wxUSE_TOOLTIPS - -// ---------------------------------------------------------------------------- -// wxPickerBase - event handlers -// ---------------------------------------------------------------------------- - -void wxPickerBase::OnTextCtrlKillFocus(wxFocusEvent& event) -{ - event.Skip(); - - // don't leave the textctrl empty - if (m_text && m_text->GetValue().empty()) - UpdateTextCtrlFromPicker(); -} - -void wxPickerBase::OnTextCtrlDelete(wxWindowDestroyEvent &) -{ - // the textctrl has been deleted; our pointer is invalid! - m_text = NULL; -} - -void wxPickerBase::OnTextCtrlUpdate(wxCommandEvent &) -{ - // for each text-change, update the picker - UpdatePickerFromTextCtrl(); -} - -#endif // Any picker in use diff --git a/Externals/wxWidgets3/src/common/platinfo.cpp b/Externals/wxWidgets3/src/common/platinfo.cpp deleted file mode 100644 index f9d9b93aef..0000000000 --- a/Externals/wxWidgets3/src/common/platinfo.cpp +++ /dev/null @@ -1,376 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/platinfo.cpp -// Purpose: implements wxPlatformInfo class -// Author: Francesco Montorsi -// Modified by: -// Created: 07.07.2006 (based on wxToolkitInfo) -// Copyright: (c) 2006 Francesco Montorsi -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// for compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include "wx/platinfo.h" - -#ifndef WX_PRECOMP - #include "wx/app.h" - #include "wx/utils.h" -#endif //WX_PRECOMP - -#include "wx/apptrait.h" - -// global object -// VERY IMPORTANT: do not use the default constructor since it would -// try to init the wxPlatformInfo instance using -// gs_platInfo itself! -static wxPlatformInfo gs_platInfo(wxPORT_UNKNOWN); - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -static const wxChar* const wxOperatingSystemIdNames[] = -{ - wxT("Apple Mac OS"), - wxT("Apple Mac OS X"), - - wxT("Microsoft Windows 9X"), - wxT("Microsoft Windows NT"), - wxT("Microsoft Windows Micro"), - wxT("Microsoft Windows CE"), - - wxT("Linux"), - wxT("FreeBSD"), - wxT("OpenBSD"), - wxT("NetBSD"), - - wxT("SunOS"), - wxT("AIX"), - wxT("HPUX"), - - wxT("Other Unix"), - wxT("Other Unix"), - - wxT("DOS"), - wxT("OS/2"), - -}; - -static const wxChar* const wxPortIdNames[] = -{ - wxT("wxBase"), - wxT("wxMSW"), - wxT("wxMotif"), - wxT("wxGTK"), - wxT("wxDFB"), - wxT("wxX11"), - wxT("wxOS2"), - wxT("wxMac"), - wxT("wxCocoa"), - wxT("wxWinCE"), - wxT("wxQT") -}; - -static const wxChar* const wxArchitectureNames[] = -{ - wxT("32 bit"), - wxT("64 bit") -}; - -static const wxChar* const wxEndiannessNames[] = -{ - wxT("Big endian"), - wxT("Little endian"), - wxT("PDP endian") -}; - -// ---------------------------------------------------------------------------- -// local functions -// ---------------------------------------------------------------------------- - -// returns the logarithm in base 2 of 'value'; this maps the enum values to the -// corresponding indexes of the string arrays above -static unsigned wxGetIndexFromEnumValue(int value) -{ - wxCHECK_MSG( value, (unsigned)-1, wxT("invalid enum value") ); - - int n = 0; - while ( !(value & 1) ) - { - value >>= 1; - n++; - } - - wxASSERT_MSG( value == 1, wxT("more than one bit set in enum value") ); - - return n; -} - -// ---------------------------------------------------------------------------- -// wxPlatformInfo -// ---------------------------------------------------------------------------- - -wxPlatformInfo::wxPlatformInfo() -{ - // just copy platform info for currently running platform - *this = Get(); -} - -wxPlatformInfo::wxPlatformInfo(wxPortId pid, int tkMajor, int tkMinor, - wxOperatingSystemId id, int osMajor, int osMinor, - wxArchitecture arch, - wxEndianness endian, - bool usingUniversal) -{ - m_initializedForCurrentPlatform = false; - - m_tkVersionMajor = tkMajor; - m_tkVersionMinor = tkMinor; - m_tkVersionMicro = -1; - m_port = pid; - m_usingUniversal = usingUniversal; - - m_os = id; - m_osVersionMajor = osMajor; - m_osVersionMinor = osMinor; - m_osVersionMicro = -1; - - m_endian = endian; - m_arch = arch; -} - -bool wxPlatformInfo::operator==(const wxPlatformInfo &t) const -{ - return m_tkVersionMajor == t.m_tkVersionMajor && - m_tkVersionMinor == t.m_tkVersionMinor && - m_tkVersionMicro == t.m_tkVersionMicro && - m_osVersionMajor == t.m_osVersionMajor && - m_osVersionMinor == t.m_osVersionMinor && - m_osVersionMicro == t.m_osVersionMicro && - m_os == t.m_os && - m_osDesc == t.m_osDesc && - m_ldi == t.m_ldi && - m_desktopEnv == t.m_desktopEnv && - m_port == t.m_port && - m_usingUniversal == t.m_usingUniversal && - m_arch == t.m_arch && - m_endian == t.m_endian; -} - -void wxPlatformInfo::InitForCurrentPlatform() -{ - m_initializedForCurrentPlatform = true; - - // autodetect all informations - const wxAppTraits * const traits = wxTheApp ? wxTheApp->GetTraits() : NULL; - if ( !traits ) - { - wxFAIL_MSG( wxT("failed to initialize wxPlatformInfo") ); - - m_port = wxPORT_UNKNOWN; - m_usingUniversal = false; - m_tkVersionMajor = - m_tkVersionMinor = - m_tkVersionMicro = 0; - } - else - { - m_port = traits->GetToolkitVersion(&m_tkVersionMajor, &m_tkVersionMinor, - &m_tkVersionMicro); - m_usingUniversal = traits->IsUsingUniversalWidgets(); - m_desktopEnv = traits->GetDesktopEnvironment(); - } - - m_os = wxGetOsVersion(&m_osVersionMajor, &m_osVersionMinor, &m_osVersionMicro); - m_osDesc = wxGetOsDescription(); - m_endian = wxIsPlatformLittleEndian() ? wxENDIAN_LITTLE : wxENDIAN_BIG; - m_arch = wxIsPlatform64Bit() ? wxARCH_64 : wxARCH_32; - -#ifdef __LINUX__ - m_ldi = wxGetLinuxDistributionInfo(); -#endif - // else: leave m_ldi empty -} - -/* static */ -const wxPlatformInfo& wxPlatformInfo::Get() -{ - static bool initialized = false; - if ( !initialized ) - { - gs_platInfo.InitForCurrentPlatform(); - initialized = true; - } - - return gs_platInfo; -} - -/* static */ -wxString wxPlatformInfo::GetOperatingSystemDirectory() -{ - return wxGetOSDirectory(); -} - - - -// ---------------------------------------------------------------------------- -// wxPlatformInfo - enum -> string conversions -// ---------------------------------------------------------------------------- - -wxString wxPlatformInfo::GetOperatingSystemFamilyName(wxOperatingSystemId os) -{ - const wxChar* string = wxT("Unknown"); - if ( os & wxOS_MAC ) - string = wxT("Macintosh"); - else if ( os & wxOS_WINDOWS ) - string = wxT("Windows"); - else if ( os & wxOS_UNIX ) - string = wxT("Unix"); - else if ( os == wxOS_DOS ) - string = wxT("DOS"); - else if ( os == wxOS_OS2 ) - string = wxT("OS/2"); - - return string; -} - -wxString wxPlatformInfo::GetOperatingSystemIdName(wxOperatingSystemId os) -{ - const unsigned idx = wxGetIndexFromEnumValue(os); - - wxCHECK_MSG( idx < WXSIZEOF(wxOperatingSystemIdNames), wxEmptyString, - wxT("invalid OS id") ); - - return wxOperatingSystemIdNames[idx]; -} - -wxString wxPlatformInfo::GetPortIdName(wxPortId port, bool usingUniversal) -{ - const unsigned idx = wxGetIndexFromEnumValue(port); - - wxCHECK_MSG( idx < WXSIZEOF(wxPortIdNames), wxEmptyString, - wxT("invalid port id") ); - - wxString ret = wxPortIdNames[idx]; - - if ( usingUniversal ) - ret += wxT("/wxUniversal"); - - return ret; -} - -wxString wxPlatformInfo::GetPortIdShortName(wxPortId port, bool usingUniversal) -{ - const unsigned idx = wxGetIndexFromEnumValue(port); - - wxCHECK_MSG( idx < WXSIZEOF(wxPortIdNames), wxEmptyString, - wxT("invalid port id") ); - - wxString ret = wxPortIdNames[idx]; - ret = ret.Mid(2).Lower(); // remove 'wx' prefix - - if ( usingUniversal ) - ret += wxT("univ"); - - return ret; -} - -wxString wxPlatformInfo::GetArchName(wxArchitecture arch) -{ - wxCOMPILE_TIME_ASSERT( WXSIZEOF(wxArchitectureNames) == wxARCH_MAX, - wxArchitectureNamesMismatch ); - - return wxArchitectureNames[arch]; -} - -wxString wxPlatformInfo::GetEndiannessName(wxEndianness end) -{ - wxCOMPILE_TIME_ASSERT( WXSIZEOF(wxEndiannessNames) == wxENDIAN_MAX, - wxEndiannessNamesMismatch ); - - return wxEndiannessNames[end]; -} - -bool wxPlatformInfo::CheckOSVersion(int major, int minor, int micro) const -{ - // If this instance of wxPlatformInfo has been initialized by InitForCurrentPlatform() - // this check gets forwarded to the wxCheckOsVersion which might do more than a simple - // number check if supported by the platform - if (m_initializedForCurrentPlatform) - return wxCheckOsVersion(major, minor, micro); - else - return DoCheckVersion(GetOSMajorVersion(), - GetOSMinorVersion(), - GetOSMicroVersion(), - major, - minor, - micro); -} - -// ---------------------------------------------------------------------------- -// wxPlatformInfo - string -> enum conversions -// ---------------------------------------------------------------------------- - -wxOperatingSystemId wxPlatformInfo::GetOperatingSystemId(const wxString &str) -{ - for ( size_t i = 0; i < WXSIZEOF(wxOperatingSystemIdNames); i++ ) - { - if ( wxString(wxOperatingSystemIdNames[i]).CmpNoCase(str) == 0 ) - return (wxOperatingSystemId)(1 << i); - } - - return wxOS_UNKNOWN; -} - -wxPortId wxPlatformInfo::GetPortId(const wxString &str) -{ - // recognize both short and long port names - for ( size_t i = 0; i < WXSIZEOF(wxPortIdNames); i++ ) - { - wxPortId current = (wxPortId)(1 << i); - - if ( wxString(wxPortIdNames[i]).CmpNoCase(str) == 0 || - GetPortIdShortName(current, true).CmpNoCase(str) == 0 || - GetPortIdShortName(current, false).CmpNoCase(str) == 0 ) - return current; - } - - return wxPORT_UNKNOWN; -} - -wxArchitecture wxPlatformInfo::GetArch(const wxString &arch) -{ - if ( arch.Contains(wxT("32")) ) - return wxARCH_32; - - if ( arch.Contains(wxT("64")) ) - return wxARCH_64; - - return wxARCH_INVALID; -} - -wxEndianness wxPlatformInfo::GetEndianness(const wxString& end) -{ - const wxString endl(end.Lower()); - if ( endl.StartsWith(wxT("little")) ) - return wxENDIAN_LITTLE; - - if ( endl.StartsWith(wxT("big")) ) - return wxENDIAN_BIG; - - return wxENDIAN_INVALID; -} - diff --git a/Externals/wxWidgets3/src/common/popupcmn.cpp b/Externals/wxWidgets3/src/common/popupcmn.cpp deleted file mode 100644 index 395397c924..0000000000 --- a/Externals/wxWidgets3/src/common/popupcmn.cpp +++ /dev/null @@ -1,687 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/popupcmn.cpp -// Purpose: implementation of wxPopupTransientWindow -// Author: Vadim Zeitlin -// Modified by: -// Created: 06.01.01 -// Copyright: (c) 2001 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_POPUPWIN - -#include "wx/popupwin.h" - -#ifndef WX_PRECOMP - #include "wx/combobox.h" // wxComboCtrl - #include "wx/app.h" // wxPostEvent - #include "wx/log.h" -#endif //WX_PRECOMP - -#include "wx/display.h" -#include "wx/recguard.h" - -#ifdef __WXUNIVERSAL__ - #include "wx/univ/renderer.h" - #include "wx/scrolbar.h" -#endif // __WXUNIVERSAL__ - -#ifdef __WXGTK__ - #include - #if GTK_CHECK_VERSION(2,0,0) - #include "wx/gtk/private/gtk2-compat.h" - #else - #define gtk_widget_get_window(x) x->window - #endif -#elif defined(__WXMSW__) - #include "wx/msw/private.h" -#elif defined(__WXX11__) - #include "wx/x11/private.h" -#endif - -wxIMPLEMENT_DYNAMIC_CLASS(wxPopupWindow, wxWindow); -wxIMPLEMENT_DYNAMIC_CLASS(wxPopupTransientWindow, wxPopupWindow); - -#if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__) -wxIMPLEMENT_DYNAMIC_CLASS(wxPopupComboWindow, wxPopupTransientWindow); -#endif - -// ---------------------------------------------------------------------------- -// private classes -// ---------------------------------------------------------------------------- - -// event handlers which we use to intercept events which cause the popup to -// disappear -class wxPopupWindowHandler : public wxEvtHandler -{ -public: - wxPopupWindowHandler(wxPopupTransientWindow *popup) : m_popup(popup) {} - -protected: - // event handlers - void OnLeftDown(wxMouseEvent& event); - void OnCaptureLost(wxMouseCaptureLostEvent& event); - -private: - wxPopupTransientWindow *m_popup; - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_NO_COPY_CLASS(wxPopupWindowHandler); -}; - -class wxPopupFocusHandler : public wxEvtHandler -{ -public: - wxPopupFocusHandler(wxPopupTransientWindow *popup) : m_popup(popup) {} - -protected: - void OnKillFocus(wxFocusEvent& event); - void OnChar(wxKeyEvent& event); - -private: - wxPopupTransientWindow *m_popup; - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_NO_COPY_CLASS(wxPopupFocusHandler); -}; - -// ---------------------------------------------------------------------------- -// event tables -// ---------------------------------------------------------------------------- - -wxBEGIN_EVENT_TABLE(wxPopupWindowHandler, wxEvtHandler) - EVT_LEFT_DOWN(wxPopupWindowHandler::OnLeftDown) - EVT_MOUSE_CAPTURE_LOST(wxPopupWindowHandler::OnCaptureLost) -wxEND_EVENT_TABLE() - -wxBEGIN_EVENT_TABLE(wxPopupFocusHandler, wxEvtHandler) - EVT_KILL_FOCUS(wxPopupFocusHandler::OnKillFocus) - EVT_CHAR(wxPopupFocusHandler::OnChar) -wxEND_EVENT_TABLE() - -wxBEGIN_EVENT_TABLE(wxPopupTransientWindow, wxPopupWindow) -#if defined(__WXMSW__) || (defined(__WXMAC__) && wxOSX_USE_COCOA_OR_CARBON) - EVT_IDLE(wxPopupTransientWindow::OnIdle) -#endif -wxEND_EVENT_TABLE() - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxPopupWindowBase -// ---------------------------------------------------------------------------- - -wxPopupWindowBase::~wxPopupWindowBase() -{ - // this destructor is required for Darwin -} - -bool wxPopupWindowBase::Create(wxWindow* WXUNUSED(parent), int WXUNUSED(flags)) -{ - return true; -} - -void wxPopupWindowBase::Position(const wxPoint& ptOrigin, - const wxSize& size) -{ - // determine the position and size of the screen we clamp the popup to - wxPoint posScreen; - wxSize sizeScreen; - - const int displayNum = wxDisplay::GetFromPoint(ptOrigin); - if ( displayNum != wxNOT_FOUND ) - { - const wxRect rectScreen = wxDisplay(displayNum).GetGeometry(); - posScreen = rectScreen.GetPosition(); - sizeScreen = rectScreen.GetSize(); - } - else // outside of any display? - { - // just use the primary one then - posScreen = wxPoint(0, 0); - sizeScreen = wxGetDisplaySize(); - } - - - const wxSize sizeSelf = GetSize(); - - // is there enough space to put the popup below the window (where we put it - // by default)? - wxCoord y = ptOrigin.y + size.y; - if ( y + sizeSelf.y > posScreen.y + sizeScreen.y ) - { - // check if there is enough space above - if ( ptOrigin.y > sizeSelf.y ) - { - // do position the control above the window - y -= size.y + sizeSelf.y; - } - //else: not enough space below nor above, leave below - } - - // now check left/right too - wxCoord x = ptOrigin.x; - - if ( wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft ) - { - // shift the window to the left instead of the right. - x -= size.x; - x -= sizeSelf.x; // also shift it by window width. - } - else - x += size.x; - - - if ( x + sizeSelf.x > posScreen.x + sizeScreen.x ) - { - // check if there is enough space to the left - if ( ptOrigin.x > sizeSelf.x ) - { - // do position the control to the left - x -= size.x + sizeSelf.x; - } - //else: not enough space there neither, leave in default position - } - - Move(x, y, wxSIZE_NO_ADJUSTMENTS); -} - -// ---------------------------------------------------------------------------- -// wxPopupTransientWindow -// ---------------------------------------------------------------------------- - -void wxPopupTransientWindow::Init() -{ - m_child = - m_focus = NULL; - - m_handlerFocus = NULL; - m_handlerPopup = NULL; -} - -wxPopupTransientWindow::wxPopupTransientWindow(wxWindow *parent, int style) -{ - Init(); - - (void)Create(parent, style); -} - -wxPopupTransientWindow::~wxPopupTransientWindow() -{ - if (m_handlerPopup && m_handlerPopup->GetNextHandler()) - PopHandlers(); - - wxASSERT(!m_handlerFocus || !m_handlerFocus->GetNextHandler()); - wxASSERT(!m_handlerPopup || !m_handlerPopup->GetNextHandler()); - - delete m_handlerFocus; - delete m_handlerPopup; -} - -void wxPopupTransientWindow::PopHandlers() -{ - if ( m_child ) - { - if ( !m_child->RemoveEventHandler(m_handlerPopup) ) - { - // something is very wrong and someone else probably deleted our - // handler - so don't risk deleting it second time - m_handlerPopup = NULL; - } - if (m_child->HasCapture()) - { - m_child->ReleaseMouse(); - } - m_child = NULL; - } - - if ( m_focus ) - { - if ( !m_focus->RemoveEventHandler(m_handlerFocus) ) - { - // see above - m_handlerFocus = NULL; - } - } - m_focus = NULL; -} - -void wxPopupTransientWindow::Popup(wxWindow *winFocus) -{ - // If we have a single child, we suppose that it must cover the entire - // popup window and hence we give the mouse capture to it instead of - // keeping it for ourselves. - // - // Notice that this works best for combobox-like popups which have a single - // control inside them and not so well for popups containing a single - // wxPanel with multiple children inside it but OTOH it does no harm in - // this case neither and we can't reliably distinguish between them. - const wxWindowList& children = GetChildren(); - if ( children.GetCount() == 1 ) - { - m_child = children.GetFirst()->GetData(); - } - else - { - m_child = this; - } - - Show(); - - // There is a problem if these are still in use - wxASSERT(!m_handlerFocus || !m_handlerFocus->GetNextHandler()); - wxASSERT(!m_handlerPopup || !m_handlerPopup->GetNextHandler()); - - if (!m_handlerPopup) - m_handlerPopup = new wxPopupWindowHandler(this); - - m_child->PushEventHandler(m_handlerPopup); - -#if defined(__WXMSW__) - // Focusing on child of popup window does not work on MSW unless WS_POPUP - // style is set. We do not even want to try to set the focus, as it may - // provoke errors on some Windows versions (Vista and later). - if ( ::GetWindowLong(GetHwnd(), GWL_STYLE) & WS_POPUP ) -#endif - { - m_focus = winFocus ? winFocus : this; - m_focus->SetFocus(); - } - -#if defined( __WXMSW__ ) || (defined( __WXMAC__) && wxOSX_USE_COCOA_OR_CARBON) - // MSW doesn't allow to set focus to the popup window, but we need to - // subclass the window which has the focus, and not winFocus passed in or - // otherwise everything else breaks down - m_focus = FindFocus(); -#elif defined(__WXGTK__) - // GTK+ catches the activate events from the popup - // window, not the focus events from the child window - m_focus = this; -#endif - - if ( m_focus ) - { - if (!m_handlerFocus) - m_handlerFocus = new wxPopupFocusHandler(this); - - m_focus->PushEventHandler(m_handlerFocus); - } -} - -bool wxPopupTransientWindow::Show( bool show ) -{ -#ifdef __WXGTK__ - if (!show) - { -#ifdef __WXGTK3__ - GdkDisplay* display = gtk_widget_get_display(m_widget); - GdkDeviceManager* manager = gdk_display_get_device_manager(display); - GdkDevice* device = gdk_device_manager_get_client_pointer(manager); - gdk_device_ungrab(device, unsigned(GDK_CURRENT_TIME)); -#else - gdk_pointer_ungrab( (guint32)GDK_CURRENT_TIME ); -#endif - - gtk_grab_remove( m_widget ); - } -#endif - -#ifdef __WXX11__ - if (!show) - { - XUngrabPointer( wxGlobalDisplay(), CurrentTime ); - } -#endif - -#if defined( __WXMSW__ ) || defined( __WXMAC__) - if (!show && m_child && m_child->HasCapture()) - { - m_child->ReleaseMouse(); - } -#endif - - bool ret = wxPopupWindow::Show( show ); - -#ifdef __WXGTK__ - if (show) - { - gtk_grab_add( m_widget ); - - const GdkEventMask mask = GdkEventMask( - GDK_BUTTON_PRESS_MASK | - GDK_BUTTON_RELEASE_MASK | - GDK_POINTER_MOTION_HINT_MASK | - GDK_POINTER_MOTION_MASK); - GdkWindow* window = gtk_widget_get_window(m_widget); -#ifdef __WXGTK3__ - GdkDisplay* display = gdk_window_get_display(window); - GdkDeviceManager* manager = gdk_display_get_device_manager(display); - GdkDevice* device = gdk_device_manager_get_client_pointer(manager); - gdk_device_grab(device, window, - GDK_OWNERSHIP_NONE, true, mask, NULL, unsigned(GDK_CURRENT_TIME)); -#else - gdk_pointer_grab( window, true, - mask, - NULL, - NULL, - (guint32)GDK_CURRENT_TIME ); -#endif - } -#endif - -#ifdef __WXX11__ - if (show) - { - Window xwindow = (Window) m_clientWindow; - - /* int res =*/ XGrabPointer(wxGlobalDisplay(), xwindow, - True, - ButtonPressMask | ButtonReleaseMask | ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, - GrabModeAsync, - GrabModeAsync, - None, - None, - CurrentTime ); - } -#endif - -#if defined( __WXMSW__ ) || defined( __WXMAC__) - if (show && m_child) - { - // Assume that the mouse is outside the popup to begin with - m_child->CaptureMouse(); - } -#endif - - return ret; -} - -bool wxPopupTransientWindow::Destroy() -{ - // The popup window can be deleted at any moment, even while some events - // are still being processed for it, so delay its real destruction until - // the next idle time when we're sure that it's safe to really destroy it. - - wxCHECK_MSG( !wxPendingDelete.Member(this), false, - wxS("Shouldn't destroy the popup twice.") ); - - wxPendingDelete.Append(this); - - return true; -} - -void wxPopupTransientWindow::Dismiss() -{ - Hide(); - PopHandlers(); -} - -void wxPopupTransientWindow::DismissAndNotify() -{ - Dismiss(); - OnDismiss(); -} - -void wxPopupTransientWindow::OnDismiss() -{ - // nothing to do here - but it may be interesting for derived class -} - -bool wxPopupTransientWindow::ProcessLeftDown(wxMouseEvent& WXUNUSED(event)) -{ - // no special processing here - return false; -} - -#if defined(__WXMSW__) ||(defined(__WXMAC__) && wxOSX_USE_COCOA_OR_CARBON) -void wxPopupTransientWindow::OnIdle(wxIdleEvent& event) -{ - event.Skip(); - - if (IsShown() && m_child) - { - // Store the last mouse position to minimize the number of calls to - // wxFindWindowAtPoint() which are quite expensive. - static wxPoint s_posLast; - const wxPoint pos = wxGetMousePosition(); - if ( pos != s_posLast ) - { - s_posLast = pos; - - wxWindow* const winUnderMouse = wxFindWindowAtPoint(pos); - - // We release the mouse capture while the mouse is inside the popup - // itself to allow using it normally with the controls inside it. - if ( wxGetTopLevelParent(winUnderMouse) == this ) - { - if ( m_child->HasCapture() ) - { - m_child->ReleaseMouse(); - } - } - else // And we reacquire it as soon as the mouse goes outside. - { - if ( !m_child->HasCapture() ) - { - m_child->CaptureMouse(); - } - } - } - } -} -#endif // wxOSX/Carbon - - -#if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__) - -// ---------------------------------------------------------------------------- -// wxPopupComboWindow -// ---------------------------------------------------------------------------- - -wxBEGIN_EVENT_TABLE(wxPopupComboWindow, wxPopupTransientWindow) - EVT_KEY_DOWN(wxPopupComboWindow::OnKeyDown) -wxEND_EVENT_TABLE() - -wxPopupComboWindow::wxPopupComboWindow(wxComboCtrl *parent) - : wxPopupTransientWindow(parent) -{ - m_combo = parent; -} - -bool wxPopupComboWindow::Create(wxComboCtrl *parent) -{ - m_combo = parent; - - return wxPopupWindow::Create(parent); -} - -void wxPopupComboWindow::PositionNearCombo() -{ - // the origin point must be in screen coords - wxPoint ptOrigin = m_combo->ClientToScreen(wxPoint(0,0)); - -#if 0 //def __WXUNIVERSAL__ - // account for the fact that (0, 0) is not the top left corner of the - // window: there is also the border - wxRect rectBorders = m_combo->GetRenderer()-> - GetBorderDimensions(m_combo->GetBorder()); - ptOrigin.x -= rectBorders.x; - ptOrigin.y -= rectBorders.y; -#endif // __WXUNIVERSAL__ - - // position below or above the combobox: the width is 0 to put it exactly - // below us, not to the left or to the right - Position(ptOrigin, wxSize(0, m_combo->GetSize().y)); -} - -void wxPopupComboWindow::OnDismiss() -{ - m_combo->OnPopupDismiss(true); -} - -void wxPopupComboWindow::OnKeyDown(wxKeyEvent& event) -{ - m_combo->ProcessWindowEvent(event); -} - -#endif // wxUSE_COMBOBOX && defined(__WXUNIVERSAL__) - -// ---------------------------------------------------------------------------- -// wxPopupWindowHandler -// ---------------------------------------------------------------------------- - -void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event) -{ - // let the window have it first (we're the first event handler in the chain - // of handlers for this window) - if ( m_popup->ProcessLeftDown(event) ) - { - return; - } - - wxPoint pos = event.GetPosition(); - - // in non-Univ ports the system manages scrollbars for us -#if defined(__WXUNIVERSAL__) && wxUSE_SCROLLBAR - // scrollbar on which the click occurred - wxWindow *sbar = NULL; -#endif // __WXUNIVERSAL__ && wxUSE_SCROLLBAR - - wxWindow *win = (wxWindow *)event.GetEventObject(); - - switch ( win->HitTest(pos.x, pos.y) ) - { - case wxHT_WINDOW_OUTSIDE: - { - // do the coords translation now as after DismissAndNotify() - // m_popup may be destroyed - wxMouseEvent event2(event); - - m_popup->ClientToScreen(&event2.m_x, &event2.m_y); - - // clicking outside a popup dismisses it - m_popup->DismissAndNotify(); - - // dismissing a tooltip shouldn't waste a click, i.e. you - // should be able to dismiss it and press the button with the - // same click, so repost this event to the window beneath us - wxWindow *winUnder = wxFindWindowAtPoint(event2.GetPosition()); - if ( winUnder ) - { - // translate the event coords to the ones of the window - // which is going to get the event - winUnder->ScreenToClient(&event2.m_x, &event2.m_y); - - event2.SetEventObject(winUnder); - wxPostEvent(winUnder->GetEventHandler(), event2); - } - } - break; - -#if defined(__WXUNIVERSAL__) && wxUSE_SCROLLBAR - case wxHT_WINDOW_HORZ_SCROLLBAR: - sbar = win->GetScrollbar(wxHORIZONTAL); - break; - - case wxHT_WINDOW_VERT_SCROLLBAR: - sbar = win->GetScrollbar(wxVERTICAL); - break; -#endif // __WXUNIVERSAL__ && wxUSE_SCROLLBAR - - default: - // forgot to update the switch after adding a new hit test code? - wxFAIL_MSG( wxT("unexpected HitTest() return value") ); - wxFALLTHROUGH; - - case wxHT_WINDOW_CORNER: - // don't actually know if this one is good for anything, but let it - // pass just in case - - case wxHT_WINDOW_INSIDE: - // let the normal processing take place - event.Skip(); - break; - } - -#if defined(__WXUNIVERSAL__) && wxUSE_SCROLLBAR - if ( sbar ) - { - // translate the event coordinates to the scrollbar ones - pos = sbar->ScreenToClient(win->ClientToScreen(pos)); - - // and give the event to it - wxMouseEvent event2 = event; - event2.m_x = pos.x; - event2.m_y = pos.y; - - (void)sbar->GetEventHandler()->ProcessEvent(event2); - } -#endif // __WXUNIVERSAL__ && wxUSE_SCROLLBAR -} - -void -wxPopupWindowHandler::OnCaptureLost(wxMouseCaptureLostEvent& WXUNUSED(event)) -{ - m_popup->DismissAndNotify(); - - // There is no need to skip the event here, normally we've already dealt - // with the focus loss. -} - -// ---------------------------------------------------------------------------- -// wxPopupFocusHandler -// ---------------------------------------------------------------------------- - -void wxPopupFocusHandler::OnKillFocus(wxFocusEvent& event) -{ - // when we lose focus we always disappear - unless it goes to the popup (in - // which case we don't really lose it) - wxWindow *win = event.GetWindow(); - while ( win ) - { - if ( win == m_popup ) - return; - win = win->GetParent(); - } - - m_popup->DismissAndNotify(); -} - -void wxPopupFocusHandler::OnChar(wxKeyEvent& event) -{ - // we can be associated with the popup itself in which case we should avoid - // infinite recursion - static int s_inside; - wxRecursionGuard guard(s_inside); - if ( guard.IsInside() ) - { - event.Skip(); - return; - } - - // let the window have it first, it might process the keys - if ( !m_popup->GetEventHandler()->ProcessEvent(event) ) - { - // by default, dismiss the popup - m_popup->DismissAndNotify(); - } -} - -#endif // wxUSE_POPUPWIN diff --git a/Externals/wxWidgets3/src/common/powercmn.cpp b/Externals/wxWidgets3/src/common/powercmn.cpp deleted file mode 100644 index a546a4d00a..0000000000 --- a/Externals/wxWidgets3/src/common/powercmn.cpp +++ /dev/null @@ -1,74 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/powercmn.cpp -// Purpose: power event types and stubs for power functions -// Author: Vadim Zeitlin -// Modified by: -// Created: 2006-05-27 -// Copyright: (c) 2006 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// for compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#ifndef WX_PRECOMP -#endif //WX_PRECOMP - -#include "wx/power.h" - -// ============================================================================ -// implementation -// ============================================================================ - -#ifdef wxHAS_POWER_EVENTS - wxDEFINE_EVENT( wxEVT_POWER_SUSPENDING, wxPowerEvent ); - wxDEFINE_EVENT( wxEVT_POWER_SUSPENDED, wxPowerEvent ); - wxDEFINE_EVENT( wxEVT_POWER_SUSPEND_CANCEL, wxPowerEvent ); - wxDEFINE_EVENT( wxEVT_POWER_RESUME, wxPowerEvent ); - - wxIMPLEMENT_DYNAMIC_CLASS(wxPowerEvent, wxEvent); -#endif - -// Provide stubs for systems without power resource management functions -#if !defined(__WINDOWS__) && !defined(__APPLE__) - -bool -wxPowerResource::Acquire(wxPowerResourceKind WXUNUSED(kind), - const wxString& WXUNUSED(reason)) -{ - return false; -} - -void wxPowerResource::Release(wxPowerResourceKind WXUNUSED(kind)) -{ -} - -#endif // !(__WINDOWS__ || __APPLE__) - -// provide stubs for the systems not implementing these functions -#if !defined(__WINDOWS__) - -wxPowerType wxGetPowerType() -{ - return wxPOWER_UNKNOWN; -} - -wxBatteryState wxGetBatteryState() -{ - return wxBATTERY_UNKNOWN_STATE; -} - -#endif // systems without power management functions - diff --git a/Externals/wxWidgets3/src/common/preferencescmn.cpp b/Externals/wxWidgets3/src/common/preferencescmn.cpp deleted file mode 100644 index cf9c5153ee..0000000000 --- a/Externals/wxWidgets3/src/common/preferencescmn.cpp +++ /dev/null @@ -1,75 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/preferencescmn.cpp -// Purpose: wxPreferencesEditor implementation common to all platforms. -// Author: Vaclav Slavik -// Created: 2013-02-19 -// Copyright: (c) 2013 Vaclav Slavik -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// for compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_PREFERENCES_EDITOR - -#include "wx/private/preferences.h" -#include "wx/intl.h" - -// ============================================================================ -// implementation -// ============================================================================ - -wxString wxStockPreferencesPage::GetName() const -{ - wxString name; - switch ( m_kind ) - { - case Kind_General: - name = _("General"); - break; - case Kind_Advanced: - name = _("Advanced"); - break; - } - return name; -} - -wxPreferencesEditor::wxPreferencesEditor(const wxString& title) - : m_impl(wxPreferencesEditorImpl::Create(title)) -{ -} - -wxPreferencesEditor::~wxPreferencesEditor() -{ - delete m_impl; -} - -void wxPreferencesEditor::AddPage(wxPreferencesPage* page) -{ - wxCHECK_RET( page, "can't set NULL page" ); - m_impl->AddPage(page); -} - -void wxPreferencesEditor::Show(wxWindow* parent) -{ - m_impl->Show(parent); -} - -void wxPreferencesEditor::Dismiss() -{ - m_impl->Dismiss(); -} - -#endif // wxUSE_PREFERENCES_EDITOR diff --git a/Externals/wxWidgets3/src/common/prntbase.cpp b/Externals/wxWidgets3/src/common/prntbase.cpp deleted file mode 100644 index 2ca6b4726d..0000000000 --- a/Externals/wxWidgets3/src/common/prntbase.cpp +++ /dev/null @@ -1,2293 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/prntbase.cpp -// Purpose: Printing framework base class implementation -// Author: Julian Smart -// Modified by: -// Created: 04/01/98 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_PRINTING_ARCHITECTURE - -#include "wx/dcprint.h" - -#ifndef WX_PRECOMP - #if defined(__WXMSW__) - #include "wx/msw/wrapcdlg.h" - #endif // MSW - #include "wx/utils.h" - #include "wx/dc.h" - #include "wx/app.h" - #include "wx/math.h" - #include "wx/msgdlg.h" - #include "wx/layout.h" - #include "wx/choice.h" - #include "wx/button.h" - #include "wx/bmpbuttn.h" - #include "wx/settings.h" - #include "wx/dcmemory.h" - #include "wx/dcclient.h" - #include "wx/stattext.h" - #include "wx/intl.h" - #include "wx/textdlg.h" - #include "wx/sizer.h" - #include "wx/module.h" -#endif // !WX_PRECOMP - -#include "wx/prntbase.h" -#include "wx/printdlg.h" -#include "wx/print.h" -#include "wx/dcprint.h" -#include "wx/artprov.h" - -#include -#include - -#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) -#include "wx/msw/printdlg.h" -#include "wx/msw/dcprint.h" -#elif defined(__WXMAC__) -#include "wx/osx/printdlg.h" -#include "wx/osx/private/print.h" -#include "wx/osx/dcprint.h" -#elif defined(__WXQT__) -#include "wx/qt/dcprint.h" -#include "wx/qt/printdlg.h" -#else -#include "wx/generic/prntdlgg.h" -#include "wx/dcps.h" -#endif - -#ifdef __WXMSW__ - #ifndef __WIN32__ - #include - #endif -#endif // __WXMSW__ - -// The value traditionally used as the default max page number and meaning -// "infinitely many". It should probably be documented and exposed, but for now -// at least use it here instead of hardcoding the number. -static const int DEFAULT_MAX_PAGES = 32000; - -//---------------------------------------------------------------------------- -// wxPrintFactory -//---------------------------------------------------------------------------- - -wxPrintFactory *wxPrintFactory::m_factory = NULL; - -void wxPrintFactory::SetPrintFactory( wxPrintFactory *factory ) -{ - if (wxPrintFactory::m_factory) - delete wxPrintFactory::m_factory; - - wxPrintFactory::m_factory = factory; -} - -wxPrintFactory *wxPrintFactory::GetFactory() -{ - if (!wxPrintFactory::m_factory) - wxPrintFactory::m_factory = new wxNativePrintFactory; - - return wxPrintFactory::m_factory; -} - -//---------------------------------------------------------------------------- -// wxNativePrintFactory -//---------------------------------------------------------------------------- - -wxPrinterBase *wxNativePrintFactory::CreatePrinter( wxPrintDialogData *data ) -{ -#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) - return new wxWindowsPrinter( data ); -#elif defined(__WXMAC__) - return new wxMacPrinter( data ); -#elif defined(__WXQT__) - return new wxQtPrinter( data ); -#else - return new wxPostScriptPrinter( data ); -#endif -} - -wxPrintPreviewBase *wxNativePrintFactory::CreatePrintPreview( wxPrintout *preview, - wxPrintout *printout, wxPrintDialogData *data ) -{ -#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) - return new wxWindowsPrintPreview( preview, printout, data ); -#elif defined(__WXMAC__) - return new wxMacPrintPreview( preview, printout, data ); -#elif defined(__WXQT__) - return new wxQtPrintPreview( preview, printout, data ); -#else - return new wxPostScriptPrintPreview( preview, printout, data ); -#endif -} - -wxPrintPreviewBase *wxNativePrintFactory::CreatePrintPreview( wxPrintout *preview, - wxPrintout *printout, wxPrintData *data ) -{ -#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) - return new wxWindowsPrintPreview( preview, printout, data ); -#elif defined(__WXMAC__) - return new wxMacPrintPreview( preview, printout, data ); -#elif defined(__WXQT__) - return new wxQtPrintPreview( preview, printout, data ); -#else - return new wxPostScriptPrintPreview( preview, printout, data ); -#endif -} - -wxPrintDialogBase *wxNativePrintFactory::CreatePrintDialog( wxWindow *parent, - wxPrintDialogData *data ) -{ -#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) - return new wxWindowsPrintDialog( parent, data ); -#elif defined(__WXMAC__) - return new wxMacPrintDialog( parent, data ); -#elif defined(__WXQT__) - return new wxQtPrintDialog( parent, data ); -#else - return new wxGenericPrintDialog( parent, data ); -#endif -} - -wxPrintDialogBase *wxNativePrintFactory::CreatePrintDialog( wxWindow *parent, - wxPrintData *data ) -{ -#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) - return new wxWindowsPrintDialog( parent, data ); -#elif defined(__WXMAC__) - return new wxMacPrintDialog( parent, data ); -#elif defined(__WXQT__) - return new wxQtPrintDialog( parent, data ); -#else - return new wxGenericPrintDialog( parent, data ); -#endif -} - -wxPageSetupDialogBase *wxNativePrintFactory::CreatePageSetupDialog( wxWindow *parent, - wxPageSetupDialogData *data ) -{ -#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) - return new wxWindowsPageSetupDialog( parent, data ); -#elif defined(__WXMAC__) - return new wxMacPageSetupDialog( parent, data ); -#elif defined(__WXQT__) - return new wxQtPageSetupDialog( parent, data ); -#else - return new wxGenericPageSetupDialog( parent, data ); -#endif -} - -bool wxNativePrintFactory::HasPrintSetupDialog() -{ -#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) - return false; -#elif defined(__WXMAC__) - return false; -#else - // Only here do we need to provide the print setup - // dialog ourselves, the other platforms either have - // none, don't make it accessible or let you configure - // the printer from the wxPrintDialog anyway. - return true; -#endif - -} - -wxDialog *wxNativePrintFactory::CreatePrintSetupDialog( wxWindow *parent, - wxPrintData *data ) -{ -#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) - wxUnusedVar(parent); - wxUnusedVar(data); - return NULL; -#elif defined(__WXMAC__) - wxUnusedVar(parent); - wxUnusedVar(data); - return NULL; -#elif defined(__WXQT__) - wxUnusedVar(parent); - wxUnusedVar(data); - return NULL; -#else - // Only here do we need to provide the print setup - // dialog ourselves, the other platforms either have - // none, don't make it accessible or let you configure - // the printer from the wxPrintDialog anyway. - return new wxGenericPrintSetupDialog( parent, data ); -#endif -} - -wxDCImpl* wxNativePrintFactory::CreatePrinterDCImpl( wxPrinterDC *owner, const wxPrintData& data ) -{ -#if defined(__WXGTK__) || defined(__WXMOTIF__) || ( defined(__WXUNIVERSAL__) && !defined(__WXMAC__) ) - return new wxPostScriptDCImpl( owner, data ); -#else - return new wxPrinterDCImpl( owner, data ); -#endif -} - -bool wxNativePrintFactory::HasOwnPrintToFile() -{ - // Only relevant for PostScript and here the - // setup dialog provides no "print to file" - // option. In the GNOME setup dialog, the - // setup dialog has its own print to file. - return false; -} - -bool wxNativePrintFactory::HasPrinterLine() -{ - // Only relevant for PostScript for now - return true; -} - -wxString wxNativePrintFactory::CreatePrinterLine() -{ - // Only relevant for PostScript for now - - // We should query "lpstat -d" here - return _("Generic PostScript"); -} - -bool wxNativePrintFactory::HasStatusLine() -{ - // Only relevant for PostScript for now - return true; -} - -wxString wxNativePrintFactory::CreateStatusLine() -{ - // Only relevant for PostScript for now - - // We should query "lpstat -r" or "lpstat -p" here - return _("Ready"); -} - -wxPrintNativeDataBase *wxNativePrintFactory::CreatePrintNativeData() -{ -#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) - return new wxWindowsPrintNativeData; -#elif defined(__WXMAC__) - return wxOSXCreatePrintData(); -#elif defined(__WXQT__) - return new wxQtPrintNativeData; -#else - return new wxPostScriptPrintNativeData; -#endif -} - -//---------------------------------------------------------------------------- -// wxPrintNativeDataBase -//---------------------------------------------------------------------------- - -wxIMPLEMENT_ABSTRACT_CLASS(wxPrintNativeDataBase, wxObject); - -wxPrintNativeDataBase::wxPrintNativeDataBase() -{ - m_ref = 1; -} - -//---------------------------------------------------------------------------- -// wxPrintFactoryModule -//---------------------------------------------------------------------------- - -class wxPrintFactoryModule: public wxModule -{ -public: - wxPrintFactoryModule() {} - bool OnInit() wxOVERRIDE { return true; } - void OnExit() wxOVERRIDE { wxPrintFactory::SetPrintFactory( NULL ); } - -private: - wxDECLARE_DYNAMIC_CLASS(wxPrintFactoryModule); -}; - -wxIMPLEMENT_DYNAMIC_CLASS(wxPrintFactoryModule, wxModule); - -//---------------------------------------------------------------------------- -// wxPrinterBase -//---------------------------------------------------------------------------- - -wxIMPLEMENT_CLASS(wxPrinterBase, wxObject); - -wxPrinterBase::wxPrinterBase(wxPrintDialogData *data) -{ - m_currentPrintout = NULL; - sm_abortWindow = NULL; - sm_abortIt = false; - if (data) - m_printDialogData = (*data); - sm_lastError = wxPRINTER_NO_ERROR; -} - -wxWindow *wxPrinterBase::sm_abortWindow = NULL; -bool wxPrinterBase::sm_abortIt = false; -wxPrinterError wxPrinterBase::sm_lastError = wxPRINTER_NO_ERROR; - -wxPrinterBase::~wxPrinterBase() -{ -} - -wxPrintAbortDialog *wxPrinterBase::CreateAbortWindow(wxWindow *parent, wxPrintout * printout) -{ - return new wxPrintAbortDialog(parent, printout->GetTitle()); -} - -void wxPrinterBase::ReportError(wxWindow *parent, wxPrintout *WXUNUSED(printout), const wxString& message) -{ - wxMessageBox(message, _("Printing Error"), wxOK, parent); -} - -wxPrintDialogData& wxPrinterBase::GetPrintDialogData() const -{ - return (wxPrintDialogData&) m_printDialogData; -} - -//---------------------------------------------------------------------------- -// wxPrinter -//---------------------------------------------------------------------------- - -wxIMPLEMENT_CLASS(wxPrinter, wxPrinterBase); - -wxPrinter::wxPrinter(wxPrintDialogData *data) -{ - m_pimpl = wxPrintFactory::GetFactory()->CreatePrinter( data ); -} - -wxPrinter::~wxPrinter() -{ - delete m_pimpl; -} - -wxPrintAbortDialog *wxPrinter::CreateAbortWindow(wxWindow *parent, wxPrintout *printout) -{ - return m_pimpl->CreateAbortWindow( parent, printout ); -} - -void wxPrinter::ReportError(wxWindow *parent, wxPrintout *printout, const wxString& message) -{ - m_pimpl->ReportError( parent, printout, message ); -} - -bool wxPrinter::Setup(wxWindow *parent) -{ - return m_pimpl->Setup( parent ); -} - -bool wxPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt) -{ - if ( !prompt && m_printDialogData.GetToPage() == 0 ) - { - // If the dialog is not shown, set the pages range to print everything - // by default (as otherwise we wouldn't print anything at all which is - // certainly not a reasonable default behaviour). - int minPage, maxPage, selFrom, selTo; - printout->GetPageInfo(&minPage, &maxPage, &selFrom, &selTo); - - wxPrintDialogData& pdd = m_pimpl->GetPrintDialogData(); - pdd.SetFromPage(minPage); - pdd.SetToPage(maxPage); - } - - return m_pimpl->Print( parent, printout, prompt ); -} - -wxDC* wxPrinter::PrintDialog(wxWindow *parent) -{ - return m_pimpl->PrintDialog( parent ); -} - -wxPrintDialogData& wxPrinter::GetPrintDialogData() const -{ - return m_pimpl->GetPrintDialogData(); -} - -// --------------------------------------------------------------------------- -// wxPrintDialogBase: the dialog for printing. -// --------------------------------------------------------------------------- - -wxIMPLEMENT_ABSTRACT_CLASS(wxPrintDialogBase, wxDialog); - -wxPrintDialogBase::wxPrintDialogBase(wxWindow *parent, - wxWindowID id, - const wxString &title, - const wxPoint &pos, - const wxSize &size, - long style) - : wxDialog( parent, id, title.empty() ? wxString(_("Print")) : title, - pos, size, style ) -{ -} - -// --------------------------------------------------------------------------- -// wxPrintDialog: the dialog for printing -// --------------------------------------------------------------------------- - -wxIMPLEMENT_CLASS(wxPrintDialog, wxObject); - -wxPrintDialog::wxPrintDialog(wxWindow *parent, wxPrintDialogData* data) -{ - m_pimpl = wxPrintFactory::GetFactory()->CreatePrintDialog( parent, data ); -} - -wxPrintDialog::wxPrintDialog(wxWindow *parent, wxPrintData* data) -{ - m_pimpl = wxPrintFactory::GetFactory()->CreatePrintDialog( parent, data ); -} - -wxPrintDialog::~wxPrintDialog() -{ - delete m_pimpl; -} - -int wxPrintDialog::ShowModal() -{ - return m_pimpl->ShowModal(); -} - -wxPrintDialogData& wxPrintDialog::GetPrintDialogData() -{ - return m_pimpl->GetPrintDialogData(); -} - -wxPrintData& wxPrintDialog::GetPrintData() -{ - return m_pimpl->GetPrintData(); -} - -wxDC *wxPrintDialog::GetPrintDC() -{ - return m_pimpl->GetPrintDC(); -} - -// --------------------------------------------------------------------------- -// wxPageSetupDialogBase: the page setup dialog -// --------------------------------------------------------------------------- - -wxIMPLEMENT_ABSTRACT_CLASS(wxPageSetupDialogBase, wxDialog); - -wxPageSetupDialogBase::wxPageSetupDialogBase(wxWindow *parent, - wxWindowID id, - const wxString &title, - const wxPoint &pos, - const wxSize &size, - long style) - : wxDialog( parent, id, title.empty() ? wxString(_("Page setup")) : title, - pos, size, style ) -{ -} - -// --------------------------------------------------------------------------- -// wxPageSetupDialog: the page setup dialog -// --------------------------------------------------------------------------- - -wxIMPLEMENT_CLASS(wxPageSetupDialog, wxObject); - -wxPageSetupDialog::wxPageSetupDialog(wxWindow *parent, wxPageSetupDialogData *data ) -{ - m_pimpl = wxPrintFactory::GetFactory()->CreatePageSetupDialog( parent, data ); -} - -wxPageSetupDialog::~wxPageSetupDialog() -{ - delete m_pimpl; -} - -int wxPageSetupDialog::ShowModal() -{ - return m_pimpl->ShowModal(); -} - -wxPageSetupDialogData& wxPageSetupDialog::GetPageSetupDialogData() -{ - return m_pimpl->GetPageSetupDialogData(); -} - -// old name -wxPageSetupDialogData& wxPageSetupDialog::GetPageSetupData() -{ - return m_pimpl->GetPageSetupDialogData(); -} - -//---------------------------------------------------------------------------- -// wxPrintAbortDialog -//---------------------------------------------------------------------------- - -wxBEGIN_EVENT_TABLE(wxPrintAbortDialog, wxDialog) - EVT_BUTTON(wxID_CANCEL, wxPrintAbortDialog::OnCancel) -wxEND_EVENT_TABLE() - -wxPrintAbortDialog::wxPrintAbortDialog(wxWindow *parent, - const wxString& documentTitle, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) - : wxDialog(parent, wxID_ANY, _("Printing"), pos, size, style, name) -{ - wxBoxSizer *mainSizer = new wxBoxSizer(wxVERTICAL); - mainSizer->Add(new wxStaticText(this, wxID_ANY, _("Please wait while printing...")), - wxSizerFlags().Expand().DoubleBorder()); - - wxFlexGridSizer *gridSizer = new wxFlexGridSizer(2, wxSize(20, 0)); - gridSizer->Add(new wxStaticText(this, wxID_ANY, _("Document:"))); - gridSizer->AddGrowableCol(1); - gridSizer->Add(new wxStaticText(this, wxID_ANY, documentTitle)); - gridSizer->Add(new wxStaticText(this, wxID_ANY, _("Progress:"))); - m_progress = new wxStaticText(this, wxID_ANY, _("Preparing")); - m_progress->SetMinSize(wxSize(250, -1)); - gridSizer->Add(m_progress); - mainSizer->Add(gridSizer, wxSizerFlags().Expand().DoubleBorder(wxLEFT | wxRIGHT)); - - mainSizer->Add(CreateStdDialogButtonSizer(wxCANCEL), - wxSizerFlags().Expand().DoubleBorder()); - - SetSizerAndFit(mainSizer); -} - -void wxPrintAbortDialog::SetProgress(int currentPage, int totalPages, - int currentCopy, int totalCopies) -{ - wxString text; - if ( totalPages == DEFAULT_MAX_PAGES ) - { - // This means that the user has not supplied a total number of pages so it - // is better not to show this value. - text.Printf(_("Printing page %d"), currentPage); - } - else - { - // We have a valid total number of pages so we show it. - text.Printf(_("Printing page %d of %d"), currentPage, totalPages); - } - if ( totalCopies > 1 ) - text += wxString::Format(_(" (copy %d of %d)"), currentCopy, totalCopies); - m_progress->SetLabel(text); -} - -void wxPrintAbortDialog::OnCancel(wxCommandEvent& WXUNUSED(event)) -{ - wxCHECK_RET( wxPrinterBase::sm_abortWindow != NULL, "OnCancel called twice" ); - wxPrinterBase::sm_abortIt = true; - wxPrinterBase::sm_abortWindow->Destroy(); - wxPrinterBase::sm_abortWindow = NULL; -} - -//---------------------------------------------------------------------------- -// wxPrintout -//---------------------------------------------------------------------------- - -wxIMPLEMENT_ABSTRACT_CLASS(wxPrintout, wxObject); - -wxPrintout::wxPrintout(const wxString& title) -{ - m_printoutTitle = title ; - m_printoutDC = NULL; - m_pageWidthMM = 0; - m_pageHeightMM = 0; - m_pageWidthPixels = 0; - m_pageHeightPixels = 0; - m_PPIScreenX = 0; - m_PPIScreenY = 0; - m_PPIPrinterX = 0; - m_PPIPrinterY = 0; - m_preview = NULL; -} - -wxPrintout::~wxPrintout() -{ -} - -bool wxPrintout::OnBeginDocument(int WXUNUSED(startPage), int WXUNUSED(endPage)) -{ - return GetDC()->StartDoc(_("Printing ") + m_printoutTitle); -} - -void wxPrintout::OnEndDocument() -{ - GetDC()->EndDoc(); -} - -void wxPrintout::OnBeginPrinting() -{ -} - -void wxPrintout::OnEndPrinting() -{ -} - -bool wxPrintout::HasPage(int page) -{ - return (page == 1); -} - -void wxPrintout::GetPageInfo(int *minPage, int *maxPage, int *fromPage, int *toPage) -{ - *minPage = 1; - *maxPage = DEFAULT_MAX_PAGES; - *fromPage = 1; - *toPage = 1; -} - -void wxPrintout::FitThisSizeToPaper(const wxSize& imageSize) -{ - // Set the DC scale and origin so that the given image size fits within the - // entire page and the origin is at the top left corner of the page. Note - // that with most printers, portions of the page will be non-printable. Use - // this if you're managing your own page margins. - if (!m_printoutDC) return; - wxRect paperRect = GetPaperRectPixels(); - wxCoord pw, ph; - GetPageSizePixels(&pw, &ph); - wxCoord w, h; - m_printoutDC->GetSize(&w, &h); - float scaleX = ((float(paperRect.width) * w) / (float(pw) * imageSize.x)); - float scaleY = ((float(paperRect.height) * h) / (float(ph) * imageSize.y)); - float actualScale = wxMin(scaleX, scaleY); - m_printoutDC->SetUserScale(actualScale, actualScale); - m_printoutDC->SetDeviceOrigin(0, 0); - wxRect logicalPaperRect = GetLogicalPaperRect(); - SetLogicalOrigin(logicalPaperRect.x, logicalPaperRect.y); -} - -void wxPrintout::FitThisSizeToPage(const wxSize& imageSize) -{ - // Set the DC scale and origin so that the given image size fits within the - // printable area of the page and the origin is at the top left corner of - // the printable area. - if (!m_printoutDC) return; - int w, h; - m_printoutDC->GetSize(&w, &h); - float scaleX = float(w) / imageSize.x; - float scaleY = float(h) / imageSize.y; - float actualScale = wxMin(scaleX, scaleY); - m_printoutDC->SetUserScale(actualScale, actualScale); - m_printoutDC->SetDeviceOrigin(0, 0); -} - -void wxPrintout::FitThisSizeToPageMargins(const wxSize& imageSize, const wxPageSetupDialogData& pageSetupData) -{ - // Set the DC scale and origin so that the given image size fits within the - // page margins defined in the given wxPageSetupDialogData object and the - // origin is at the top left corner of the page margins. - if (!m_printoutDC) return; - wxRect paperRect = GetPaperRectPixels(); - wxCoord pw, ph; - GetPageSizePixels(&pw, &ph); - wxPoint topLeft = pageSetupData.GetMarginTopLeft(); - wxPoint bottomRight = pageSetupData.GetMarginBottomRight(); - wxCoord mw, mh; - GetPageSizeMM(&mw, &mh); - float mmToDeviceX = float(pw) / mw; - float mmToDeviceY = float(ph) / mh; - wxRect pageMarginsRect(paperRect.x + wxRound(mmToDeviceX * topLeft.x), - paperRect.y + wxRound(mmToDeviceY * topLeft.y), - paperRect.width - wxRound(mmToDeviceX * (topLeft.x + bottomRight.x)), - paperRect.height - wxRound(mmToDeviceY * (topLeft.y + bottomRight.y))); - wxCoord w, h; - m_printoutDC->GetSize(&w, &h); - float scaleX = (float(pageMarginsRect.width) * w) / (float(pw) * imageSize.x); - float scaleY = (float(pageMarginsRect.height) * h) / (float(ph) * imageSize.y); - float actualScale = wxMin(scaleX, scaleY); - m_printoutDC->SetUserScale(actualScale, actualScale); - m_printoutDC->SetDeviceOrigin(0, 0); - wxRect logicalPageMarginsRect = GetLogicalPageMarginsRect(pageSetupData); - SetLogicalOrigin(logicalPageMarginsRect.x, logicalPageMarginsRect.y); -} - -void wxPrintout::MapScreenSizeToPaper() -{ - // Set the DC scale so that an image on the screen is the same size on the - // paper and the origin is at the top left of the paper. Note that with most - // printers, portions of the page will be cut off. Use this if you're - // managing your own page margins. - if (!m_printoutDC) return; - MapScreenSizeToPage(); - wxRect logicalPaperRect = GetLogicalPaperRect(); - SetLogicalOrigin(logicalPaperRect.x, logicalPaperRect.y); -} - -void wxPrintout::MapScreenSizeToPage() -{ - // Set the DC scale and origin so that an image on the screen is the same - // size on the paper and the origin is at the top left of the printable area. - if (!m_printoutDC) return; - int ppiScreenX, ppiScreenY; - GetPPIScreen(&ppiScreenX, &ppiScreenY); - int ppiPrinterX, ppiPrinterY; - GetPPIPrinter(&ppiPrinterX, &ppiPrinterY); - int w, h; - m_printoutDC->GetSize(&w, &h); - int pageSizePixelsX, pageSizePixelsY; - GetPageSizePixels(&pageSizePixelsX, &pageSizePixelsY); - float userScaleX = (float(ppiPrinterX) * w) / (float(ppiScreenX) * pageSizePixelsX); - float userScaleY = (float(ppiPrinterY) * h) / (float(ppiScreenY) * pageSizePixelsY); - m_printoutDC->SetUserScale(userScaleX, userScaleY); - m_printoutDC->SetDeviceOrigin(0, 0); -} - -void wxPrintout::MapScreenSizeToPageMargins(const wxPageSetupDialogData& pageSetupData) -{ - // Set the DC scale so that an image on the screen is the same size on the - // paper and the origin is at the top left of the page margins defined by - // the given wxPageSetupDialogData object. - if (!m_printoutDC) return; - MapScreenSizeToPage(); - wxRect logicalPageMarginsRect = GetLogicalPageMarginsRect(pageSetupData); - SetLogicalOrigin(logicalPageMarginsRect.x, logicalPageMarginsRect.y); -} - -void wxPrintout::MapScreenSizeToDevice() -{ - // Set the DC scale so that a screen pixel is the same size as a device - // pixel and the origin is at the top left of the printable area. - if (!m_printoutDC) return; - int w, h; - m_printoutDC->GetSize(&w, &h); - int pageSizePixelsX, pageSizePixelsY; - GetPageSizePixels(&pageSizePixelsX, &pageSizePixelsY); - float userScaleX = float(w) / pageSizePixelsX; - float userScaleY = float(h) / pageSizePixelsY; - m_printoutDC->SetUserScale(userScaleX, userScaleY); - m_printoutDC->SetDeviceOrigin(0, 0); -} - -wxRect wxPrintout::GetLogicalPaperRect() const -{ - // Return the rectangle in logical units that corresponds to the paper - // rectangle. - wxRect paperRect = GetPaperRectPixels(); - wxCoord pw, ph; - GetPageSizePixels(&pw, &ph); - wxCoord w, h; - m_printoutDC->GetSize(&w, &h); - if (w == pw && h == ph) { - // this DC matches the printed page, so no scaling - return wxRect(m_printoutDC->DeviceToLogicalX(paperRect.x), - m_printoutDC->DeviceToLogicalY(paperRect.y), - m_printoutDC->DeviceToLogicalXRel(paperRect.width), - m_printoutDC->DeviceToLogicalYRel(paperRect.height)); - } - // This DC doesn't match the printed page, so we have to scale. - float scaleX = float(w) / pw; - float scaleY = float(h) / ph; - return wxRect(m_printoutDC->DeviceToLogicalX(wxRound(paperRect.x * scaleX)), - m_printoutDC->DeviceToLogicalY(wxRound(paperRect.y * scaleY)), - m_printoutDC->DeviceToLogicalXRel(wxRound(paperRect.width * scaleX)), - m_printoutDC->DeviceToLogicalYRel(wxRound(paperRect.height * scaleY))); -} - -wxRect wxPrintout::GetLogicalPageRect() const -{ - // Return the rectangle in logical units that corresponds to the printable - // area. - int w, h; - m_printoutDC->GetSize(&w, &h); - return wxRect(m_printoutDC->DeviceToLogicalX(0), - m_printoutDC->DeviceToLogicalY(0), - m_printoutDC->DeviceToLogicalXRel(w), - m_printoutDC->DeviceToLogicalYRel(h)); -} - -wxRect wxPrintout::GetLogicalPageMarginsRect(const wxPageSetupDialogData& pageSetupData) const -{ - // Return the rectangle in logical units that corresponds to the region - // within the page margins as specified by the given wxPageSetupDialogData - // object. - - // We get the paper size in device units and the margins in mm, - // so we need to calculate the conversion with this trick - wxCoord pw, ph; - GetPageSizePixels(&pw, &ph); - wxCoord mw, mh; - GetPageSizeMM(&mw, &mh); - float mmToDeviceX = float(pw) / mw; - float mmToDeviceY = float(ph) / mh; - - // paper size in device units - wxRect paperRect = GetPaperRectPixels(); - - // margins in mm - wxPoint topLeft = pageSetupData.GetMarginTopLeft(); - wxPoint bottomRight = pageSetupData.GetMarginBottomRight(); - - // calculate margins in device units - wxRect pageMarginsRect( - paperRect.x + wxRound(mmToDeviceX * topLeft.x), - paperRect.y + wxRound(mmToDeviceY * topLeft.y), - paperRect.width - wxRound(mmToDeviceX * (topLeft.x + bottomRight.x)), - paperRect.height - wxRound(mmToDeviceY * (topLeft.y + bottomRight.y))); - - wxCoord w, h; - m_printoutDC->GetSize(&w, &h); - if (w == pw && h == ph) - { - // this DC matches the printed page, so no scaling - return wxRect( - m_printoutDC->DeviceToLogicalX(pageMarginsRect.x), - m_printoutDC->DeviceToLogicalY(pageMarginsRect.y), - m_printoutDC->DeviceToLogicalXRel(pageMarginsRect.width), - m_printoutDC->DeviceToLogicalYRel(pageMarginsRect.height)); - } - - // This DC doesn't match the printed page, so we have to scale. - float scaleX = float(w) / pw; - float scaleY = float(h) / ph; - return wxRect(m_printoutDC->DeviceToLogicalX(wxRound(pageMarginsRect.x * scaleX)), - m_printoutDC->DeviceToLogicalY(wxRound(pageMarginsRect.y * scaleY)), - m_printoutDC->DeviceToLogicalXRel(wxRound(pageMarginsRect.width * scaleX)), - m_printoutDC->DeviceToLogicalYRel(wxRound(pageMarginsRect.height * scaleY))); -} - -void wxPrintout::SetLogicalOrigin(wxCoord x, wxCoord y) -{ - // Set the device origin by specifying a point in logical coordinates. - m_printoutDC->SetDeviceOrigin( - m_printoutDC->LogicalToDeviceX(x), - m_printoutDC->LogicalToDeviceY(y) ); -} - -void wxPrintout::OffsetLogicalOrigin(wxCoord xoff, wxCoord yoff) -{ - // Offset the device origin by a specified distance in device coordinates. - wxPoint dev_org = m_printoutDC->GetDeviceOrigin(); - m_printoutDC->SetDeviceOrigin( - dev_org.x + m_printoutDC->LogicalToDeviceXRel(xoff), - dev_org.y + m_printoutDC->LogicalToDeviceYRel(yoff) ); -} - - -//---------------------------------------------------------------------------- -// wxPreviewCanvas -//---------------------------------------------------------------------------- - -wxIMPLEMENT_CLASS(wxPreviewCanvas, wxWindow); - -wxBEGIN_EVENT_TABLE(wxPreviewCanvas, wxScrolledWindow) - EVT_PAINT(wxPreviewCanvas::OnPaint) - EVT_CHAR(wxPreviewCanvas::OnChar) - EVT_IDLE(wxPreviewCanvas::OnIdle) - EVT_SYS_COLOUR_CHANGED(wxPreviewCanvas::OnSysColourChanged) -#if wxUSE_MOUSEWHEEL - EVT_MOUSEWHEEL(wxPreviewCanvas::OnMouseWheel) -#endif -wxEND_EVENT_TABLE() - -// VZ: the current code doesn't refresh properly without -// wxFULL_REPAINT_ON_RESIZE, this must be fixed as otherwise we have -// really horrible flicker when resizing the preview frame, but without -// this style it simply doesn't work correctly at all... -wxPreviewCanvas::wxPreviewCanvas(wxPrintPreviewBase *preview, wxWindow *parent, - const wxPoint& pos, const wxSize& size, long style, const wxString& name): -wxScrolledWindow(parent, wxID_ANY, pos, size, style | wxFULL_REPAINT_ON_RESIZE, name) -{ - // As we rely on getting idle events, do this to ensure that we do receive - // them even when using wxIDLE_PROCESS_SPECIFIED global idle mode. - SetExtraStyle(wxWS_EX_PROCESS_IDLE); - - m_printPreview = preview; -#ifdef __WXMAC__ - // The app workspace colour is always white, but we should have - // a contrast with the page. - wxSystemColour colourIndex = wxSYS_COLOUR_3DDKSHADOW; -#elif defined(__WXGTK__) - wxSystemColour colourIndex = wxSYS_COLOUR_BTNFACE; -#else - wxSystemColour colourIndex = wxSYS_COLOUR_APPWORKSPACE; -#endif - SetBackgroundColour(wxSystemSettings::GetColour(colourIndex)); - - SetScrollbars(10, 10, 100, 100); -} - -wxPreviewCanvas::~wxPreviewCanvas() -{ -} - -void wxPreviewCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) -{ - wxPaintDC dc(this); - PrepareDC( dc ); - -/* -#ifdef __WXGTK__ - if (!GetUpdateRegion().IsEmpty()) - dc.SetClippingRegion( GetUpdateRegion() ); -#endif -*/ - - if (m_printPreview) - { - m_printPreview->PaintPage(this, dc); - } -} - -void wxPreviewCanvas::OnIdle(wxIdleEvent& event) -{ - event.Skip(); - - // prevent UpdatePageRendering() from being called recursively: - static bool s_inIdle = false; - if ( s_inIdle ) - return; - s_inIdle = true; - - if ( m_printPreview ) - { - if ( m_printPreview->UpdatePageRendering() ) - Refresh(); - } - - s_inIdle = false; -} - -// Responds to colour changes, and passes event on to children. -void wxPreviewCanvas::OnSysColourChanged(wxSysColourChangedEvent& event) -{ -#ifdef __WXMAC__ - // The app workspace colour is always white, but we should have - // a contrast with the page. - wxSystemColour colourIndex = wxSYS_COLOUR_3DDKSHADOW; -#elif defined(__WXGTK__) - wxSystemColour colourIndex = wxSYS_COLOUR_BTNFACE; -#else - wxSystemColour colourIndex = wxSYS_COLOUR_APPWORKSPACE; -#endif - SetBackgroundColour(wxSystemSettings::GetColour(colourIndex)); - Refresh(); - - // Propagate the event to the non-top-level children - wxWindow::OnSysColourChanged(event); -} - -void wxPreviewCanvas::OnChar(wxKeyEvent &event) -{ - wxPreviewControlBar* controlBar = ((wxPreviewFrame*) GetParent())->GetControlBar(); - switch (event.GetKeyCode()) - { - case WXK_RETURN: - controlBar->OnPrint(); - return; - case (int)'+': - case WXK_NUMPAD_ADD: - case WXK_ADD: - controlBar->DoZoomIn(); - return; - case (int)'-': - case WXK_NUMPAD_SUBTRACT: - case WXK_SUBTRACT: - controlBar->DoZoomOut(); - return; - } - - if (!event.ControlDown()) - { - event.Skip(); - return; - } - - switch(event.GetKeyCode()) - { - case WXK_PAGEDOWN: - controlBar->OnNext(); break; - case WXK_PAGEUP: - controlBar->OnPrevious(); break; - case WXK_HOME: - controlBar->OnFirst(); break; - case WXK_END: - controlBar->OnLast(); break; - default: - event.Skip(); - } -} - -#if wxUSE_MOUSEWHEEL - -void wxPreviewCanvas::OnMouseWheel(wxMouseEvent& event) -{ - wxPreviewControlBar * - controlBar = wxStaticCast(GetParent(), wxPreviewFrame)->GetControlBar(); - - if ( controlBar ) - { - if ( event.ControlDown() && event.GetWheelRotation() != 0 ) - { - int currentZoom = controlBar->GetZoomControl(); - - int delta; - if ( currentZoom < 100 ) - delta = 5; - else if ( currentZoom <= 120 ) - delta = 10; - else - delta = 50; - - if ( event.GetWheelRotation() > 0 ) - delta = -delta; - - int newZoom = currentZoom + delta; - if ( newZoom < 10 ) - newZoom = 10; - if ( newZoom > 200 ) - newZoom = 200; - if ( newZoom != currentZoom ) - { - controlBar->SetZoomControl(newZoom); - m_printPreview->SetZoom(newZoom); - Refresh(); - } - return; - } - } - - event.Skip(); -} - -#endif // wxUSE_MOUSEWHEEL - -namespace -{ - -// This is by the controls in the print preview as the maximal (and hence -// longest) page number we may have to display. -enum { MAX_PAGE_NUMBER = 99999 }; - -} // anonymous namespace - -// ---------------------------------------------------------------------------- -// wxPrintPageMaxCtrl -// ---------------------------------------------------------------------------- - -// A simple static control showing the maximal number of pages. -class wxPrintPageMaxCtrl : public wxStaticText -{ -public: - wxPrintPageMaxCtrl(wxWindow *parent) - : wxStaticText( - parent, - wxID_ANY, - wxString(), - wxDefaultPosition, - wxSize - ( - parent->GetTextExtent(MaxAsString(MAX_PAGE_NUMBER)).x, - wxDefaultCoord - ), - wxST_NO_AUTORESIZE | wxALIGN_CENTRE - ) - { - } - - // Set the maximal page to display once we really know what it is. - void SetMaxPage(int maxPage) - { - SetLabel(MaxAsString(maxPage)); - } - -private: - static wxString MaxAsString(int maxPage) - { - return wxString::Format("/ %d", maxPage); - } - - wxDECLARE_NO_COPY_CLASS(wxPrintPageMaxCtrl); -}; - -// ---------------------------------------------------------------------------- -// wxPrintPageTextCtrl -// ---------------------------------------------------------------------------- - -// This text control contains the page number in the specified interval. -// -// Invalid pages are not accepted and the control contents is validated when it -// loses focus. Conversely, if the user changes the page to another valid one -// or presses Enter, OnGotoPage() method of the preview object will be called. -class wxPrintPageTextCtrl : public wxTextCtrl -{ -public: - wxPrintPageTextCtrl(wxPreviewControlBar *preview) - : wxTextCtrl(preview, - wxID_PREVIEW_GOTO, - wxString(), - wxDefaultPosition, - // We use hardcoded maximal page number for the width - // instead of fitting it to the values we can show because - // the control looks uncomfortably narrow if the real page - // number is just one or two digits. - wxSize - ( - preview->GetTextExtent(PageAsString(MAX_PAGE_NUMBER)).x, - wxDefaultCoord - ), - wxTE_PROCESS_ENTER -#if wxUSE_VALIDATORS - , wxTextValidator(wxFILTER_DIGITS) -#endif // wxUSE_VALIDATORS - ), - m_preview(preview) - { - m_minPage = - m_maxPage = - m_page = 1; - - Connect(wxEVT_KILL_FOCUS, - wxFocusEventHandler(wxPrintPageTextCtrl::OnKillFocus)); - Connect(wxEVT_TEXT_ENTER, - wxCommandEventHandler(wxPrintPageTextCtrl::OnTextEnter)); - } - - // Update the pages range, must be called after OnPreparePrinting() as - // these values are not known before. - void SetPageInfo(int minPage, int maxPage) - { - m_minPage = minPage; - m_maxPage = maxPage; - - // Show the first page by default. - SetPageNumber(minPage); - } - - // Helpers to conveniently set or get the current page number. Return value - // is 0 if the current controls contents is invalid. - void SetPageNumber(int page) - { - wxASSERT( IsValidPage(page) ); - - SetValue(PageAsString(page)); - } - - int GetPageNumber() const - { - long value; - if ( !GetValue().ToLong(&value) || !IsValidPage(value) ) - return 0; - - // Cast is safe because the value is less than (int) m_maxPage. - return static_cast(value); - } - -private: - static wxString PageAsString(int page) - { - return wxString::Format("%d", page); - } - - bool IsValidPage(int page) const - { - return page >= m_minPage && page <= m_maxPage; - } - - bool DoChangePage() - { - const int page = GetPageNumber(); - - if ( !page ) - return false; - - if ( page != m_page ) - { - // We have a valid page, remember it. - m_page = page; - - // And notify the owner about the change. - m_preview->OnGotoPage(); - } - //else: Nothing really changed. - - return true; - } - - void OnKillFocus(wxFocusEvent& event) - { - if ( !DoChangePage() ) - { - // The current contents is invalid so reset it back to the last - // known good page index. - SetPageNumber(m_page); - } - - event.Skip(); - } - - void OnTextEnter(wxCommandEvent& WXUNUSED(event)) - { - DoChangePage(); - } - - - wxPreviewControlBar * const m_preview; - - int m_minPage, - m_maxPage; - - // This is the last valid page value that we had, we revert to it if an - // invalid page is entered. - int m_page; - - wxDECLARE_NO_COPY_CLASS(wxPrintPageTextCtrl); -}; - -//---------------------------------------------------------------------------- -// wxPreviewControlBar -//---------------------------------------------------------------------------- - -wxIMPLEMENT_CLASS(wxPreviewControlBar, wxWindow); - -wxBEGIN_EVENT_TABLE(wxPreviewControlBar, wxPanel) - EVT_BUTTON(wxID_PREVIEW_CLOSE, wxPreviewControlBar::OnWindowClose) - EVT_BUTTON(wxID_PREVIEW_PRINT, wxPreviewControlBar::OnPrintButton) - EVT_BUTTON(wxID_PREVIEW_PREVIOUS, wxPreviewControlBar::OnPreviousButton) - EVT_BUTTON(wxID_PREVIEW_NEXT, wxPreviewControlBar::OnNextButton) - EVT_BUTTON(wxID_PREVIEW_FIRST, wxPreviewControlBar::OnFirstButton) - EVT_BUTTON(wxID_PREVIEW_LAST, wxPreviewControlBar::OnLastButton) - EVT_BUTTON(wxID_PREVIEW_ZOOM_IN, wxPreviewControlBar::OnZoomInButton) - EVT_BUTTON(wxID_PREVIEW_ZOOM_OUT, wxPreviewControlBar::OnZoomOutButton) - - EVT_UPDATE_UI(wxID_PREVIEW_PREVIOUS, wxPreviewControlBar::OnUpdatePreviousButton) - EVT_UPDATE_UI(wxID_PREVIEW_NEXT, wxPreviewControlBar::OnUpdateNextButton) - EVT_UPDATE_UI(wxID_PREVIEW_FIRST, wxPreviewControlBar::OnUpdateFirstButton) - EVT_UPDATE_UI(wxID_PREVIEW_LAST, wxPreviewControlBar::OnUpdateLastButton) - EVT_UPDATE_UI(wxID_PREVIEW_ZOOM_IN, wxPreviewControlBar::OnUpdateZoomInButton) - EVT_UPDATE_UI(wxID_PREVIEW_ZOOM_OUT, wxPreviewControlBar::OnUpdateZoomOutButton) - - EVT_CHOICE(wxID_PREVIEW_ZOOM, wxPreviewControlBar::OnZoomChoice) - EVT_PAINT(wxPreviewControlBar::OnPaint) - -wxEND_EVENT_TABLE() - -wxPreviewControlBar::wxPreviewControlBar(wxPrintPreviewBase *preview, long buttons, - wxWindow *parent, const wxPoint& pos, const wxSize& size, - long style, const wxString& name): -wxPanel(parent, wxID_ANY, pos, size, style, name) -{ - m_printPreview = preview; - m_closeButton = NULL; - m_zoomControl = NULL; - m_currentPageText = NULL; - m_maxPageText = NULL; - m_buttonFlags = buttons; -} - -wxPreviewControlBar::~wxPreviewControlBar() -{ -} - -void wxPreviewControlBar::OnPaint(wxPaintEvent& WXUNUSED(event)) -{ - wxPaintDC dc(this); - - int w, h; - GetSize(&w, &h); - dc.SetPen(*wxBLACK_PEN); - dc.SetBrush(*wxTRANSPARENT_BRUSH); - dc.DrawLine( 0, h-1, w, h-1 ); -} - -void wxPreviewControlBar::OnWindowClose(wxCommandEvent& WXUNUSED(event)) -{ - wxPreviewFrame *frame = (wxPreviewFrame *)GetParent(); - frame->Close(true); -} - -void wxPreviewControlBar::OnPrint(void) -{ - wxPrintPreviewBase *preview = GetPrintPreview(); - preview->Print(true); -} - -void wxPreviewControlBar::OnNext() -{ - if ( IsNextEnabled() ) - DoGotoPage(GetPrintPreview()->GetCurrentPage() + 1); -} - -void wxPreviewControlBar::OnPrevious() -{ - if ( IsPreviousEnabled() ) - DoGotoPage(GetPrintPreview()->GetCurrentPage() - 1); -} - -void wxPreviewControlBar::OnFirst() -{ - if ( IsFirstEnabled() ) - DoGotoPage(GetPrintPreview()->GetMinPage()); -} - -void wxPreviewControlBar::OnLast() -{ - if ( IsLastEnabled() ) - DoGotoPage(GetPrintPreview()->GetMaxPage()); -} - -bool wxPreviewControlBar::IsNextEnabled() const -{ - wxPrintPreviewBase *preview = GetPrintPreview(); - if ( !preview ) - return false; - - const int currentPage = preview->GetCurrentPage(); - return currentPage < preview->GetMaxPage() && - preview->GetPrintout()->HasPage(currentPage + 1); -} - -bool wxPreviewControlBar::IsPreviousEnabled() const -{ - wxPrintPreviewBase *preview = GetPrintPreview(); - if ( !preview ) - return false; - - const int currentPage = preview->GetCurrentPage(); - return currentPage > preview->GetMinPage() && - preview->GetPrintout()->HasPage(currentPage - 1); -} - -bool wxPreviewControlBar::IsFirstEnabled() const -{ - wxPrintPreviewBase *preview = GetPrintPreview(); - if (!preview) - return false; - - return preview->GetPrintout()->HasPage(preview->GetMinPage()); -} - -bool wxPreviewControlBar::IsLastEnabled() const -{ - wxPrintPreviewBase *preview = GetPrintPreview(); - if (!preview) - return false; - - return preview->GetPrintout()->HasPage(preview->GetMaxPage()); -} - -void wxPreviewControlBar::DoGotoPage(int page) -{ - wxPrintPreviewBase *preview = GetPrintPreview(); - wxCHECK_RET( preview, "Shouldn't be called if there is no preview." ); - - preview->SetCurrentPage(page); - - if ( m_currentPageText ) - m_currentPageText->SetPageNumber(page); -} - -void wxPreviewControlBar::OnGotoPage() -{ - wxPrintPreviewBase *preview = GetPrintPreview(); - if (preview) - { - if (preview->GetMinPage() > 0) - { - long currentPage = m_currentPageText->GetPageNumber(); - if ( currentPage ) - { - if (preview->GetPrintout()->HasPage(currentPage)) - { - preview->SetCurrentPage(currentPage); - } - } - } - } -} - -void wxPreviewControlBar::DoZoom() -{ - int zoom = GetZoomControl(); - if (GetPrintPreview()) - GetPrintPreview()->SetZoom(zoom); -} - -bool wxPreviewControlBar::IsZoomInEnabled() const -{ - if ( !m_zoomControl ) - return false; - - const unsigned sel = m_zoomControl->GetSelection(); - return sel < m_zoomControl->GetCount() - 1; -} - -bool wxPreviewControlBar::IsZoomOutEnabled() const -{ - return m_zoomControl && m_zoomControl->GetSelection() > 0; -} - -void wxPreviewControlBar::DoZoomIn() -{ - if (IsZoomInEnabled()) - { - m_zoomControl->SetSelection(m_zoomControl->GetSelection() + 1); - DoZoom(); - } -} - -void wxPreviewControlBar::DoZoomOut() -{ - if (IsZoomOutEnabled()) - { - m_zoomControl->SetSelection(m_zoomControl->GetSelection() - 1); - DoZoom(); - } -} - -namespace -{ - -// Helper class used by wxPreviewControlBar::CreateButtons() to add buttons -// sequentially to it in the simplest way possible. -class SizerWithButtons -{ -public: - // Constructor creates the sizer that will hold the buttons and stores the - // parent that will be used for their creation. - SizerWithButtons(wxWindow *parent) - : m_sizer(new wxBoxSizer(wxHORIZONTAL)), - m_parent(parent) - { - m_hasContents = - m_needsSeparator = false; - } - - // Destructor associates the sizer with the parent window. - ~SizerWithButtons() - { - m_parent->SetSizer(m_sizer); - m_sizer->Fit(m_parent); - } - - - // Add an arbitrary window to the sizer. - void Add(wxWindow *win) - { - if ( m_needsSeparator ) - { - m_needsSeparator = false; - - m_sizer->AddSpacer(2*wxSizerFlags::GetDefaultBorder()); - } - - m_hasContents = true; - - m_sizer->Add(win, - wxSizerFlags().Border(wxLEFT | wxTOP | wxBOTTOM).Center()); - } - - // Add a button with the specified id, bitmap and tooltip. - void AddButton(wxWindowID btnId, - const wxArtID& artId, - const wxString& tooltip) - { - // We don't use (smaller) images inside a button with a text label but - // rather toolbar-like bitmap buttons hence use wxART_TOOLBAR and not - // wxART_BUTTON here. - wxBitmap bmp = wxArtProvider::GetBitmap(artId, wxART_TOOLBAR); - wxBitmapButton * const btn = new wxBitmapButton(m_parent, btnId, bmp); - btn->SetToolTip(tooltip); - - Add(btn); - } - - // Add a control at the right end of the window. This should be called last - // as everything else added after it will be added on the right side too. - void AddAtEnd(wxWindow *win) - { - m_sizer->AddStretchSpacer(); - m_sizer->Add(win, - wxSizerFlags().Border(wxTOP | wxBOTTOM | wxRIGHT).Center()); - } - - // Indicates the end of a group of buttons, a separator will be added after - // it. - void EndOfGroup() - { - if ( m_hasContents ) - { - m_needsSeparator = true; - m_hasContents = false; - } - } - -private: - wxSizer * const m_sizer; - wxWindow * const m_parent; - - // If true, we have some controls since the last group beginning. This is - // used to avoid inserting two consecutive separators if EndOfGroup() is - // called twice. - bool m_hasContents; - - // If true, a separator should be inserted before adding the next button. - bool m_needsSeparator; - - wxDECLARE_NO_COPY_CLASS(SizerWithButtons); -}; - -} // anonymous namespace - -void wxPreviewControlBar::CreateButtons() -{ - SizerWithButtons sizer(this); - - // Print button group (a single button). - if (m_buttonFlags & wxPREVIEW_PRINT) - { - sizer.AddButton(wxID_PREVIEW_PRINT, wxART_PRINT, _("Print")); - sizer.EndOfGroup(); - } - - // Page selection buttons group. - if (m_buttonFlags & wxPREVIEW_FIRST) - { - sizer.AddButton(wxID_PREVIEW_FIRST, wxART_GOTO_FIRST, _("First page")); - } - - if (m_buttonFlags & wxPREVIEW_PREVIOUS) - { - sizer.AddButton(wxID_PREVIEW_PREVIOUS, wxART_GO_BACK, _("Previous page")); - } - - if (m_buttonFlags & wxPREVIEW_GOTO) - { - m_currentPageText = new wxPrintPageTextCtrl(this); - sizer.Add(m_currentPageText); - - m_maxPageText = new wxPrintPageMaxCtrl(this); - sizer.Add(m_maxPageText); - } - - if (m_buttonFlags & wxPREVIEW_NEXT) - { - sizer.AddButton(wxID_PREVIEW_NEXT, wxART_GO_FORWARD, _("Next page")); - } - - if (m_buttonFlags & wxPREVIEW_LAST) - { - sizer.AddButton(wxID_PREVIEW_LAST, wxART_GOTO_LAST, _("Last page")); - } - - sizer.EndOfGroup(); - - // Zoom controls group. - if (m_buttonFlags & wxPREVIEW_ZOOM) - { - sizer.AddButton(wxID_PREVIEW_ZOOM_OUT, wxART_MINUS, _("Zoom Out")); - - wxString choices[] = - { - wxT("10%"), wxT("15%"), wxT("20%"), wxT("25%"), wxT("30%"), wxT("35%"), wxT("40%"), wxT("45%"), wxT("50%"), wxT("55%"), - wxT("60%"), wxT("65%"), wxT("70%"), wxT("75%"), wxT("80%"), wxT("85%"), wxT("90%"), wxT("95%"), wxT("100%"), wxT("110%"), - wxT("120%"), wxT("150%"), wxT("200%") - }; - int n = WXSIZEOF(choices); - - m_zoomControl = new wxChoice( this, wxID_PREVIEW_ZOOM, wxDefaultPosition, wxSize(70,wxDefaultCoord), n, choices, 0 ); - sizer.Add(m_zoomControl); - SetZoomControl(m_printPreview->GetZoom()); - - sizer.AddButton(wxID_PREVIEW_ZOOM_IN, wxART_PLUS, _("Zoom In")); - - sizer.EndOfGroup(); - } - - // Close button group (single button again). - m_closeButton = new wxButton(this, wxID_PREVIEW_CLOSE, _("&Close")); - sizer.AddAtEnd(m_closeButton); -} - -void wxPreviewControlBar::SetPageInfo(int minPage, int maxPage) -{ - if ( m_currentPageText ) - m_currentPageText->SetPageInfo(minPage, maxPage); - - if ( m_maxPageText ) - m_maxPageText->SetMaxPage(maxPage); -} - -void wxPreviewControlBar::SetZoomControl(int zoom) -{ - if (m_zoomControl) - { - int n, count = m_zoomControl->GetCount(); - long val; - for (n=0; nGetString(n).BeforeFirst(wxT('%')).ToLong(&val) && - (val >= long(zoom))) - { - m_zoomControl->SetSelection(n); - return; - } - } - - m_zoomControl->SetSelection(count-1); - } -} - -int wxPreviewControlBar::GetZoomControl() -{ - if (m_zoomControl && (m_zoomControl->GetStringSelection() != wxEmptyString)) - { - long val; - if (m_zoomControl->GetStringSelection().BeforeFirst(wxT('%')).ToLong(&val)) - return int(val); - } - - return 0; -} - - -/* -* Preview frame -*/ - -wxIMPLEMENT_CLASS(wxPreviewFrame, wxFrame); - -wxBEGIN_EVENT_TABLE(wxPreviewFrame, wxFrame) - EVT_CHAR_HOOK(wxPreviewFrame::OnChar) - EVT_CLOSE(wxPreviewFrame::OnCloseWindow) -wxEND_EVENT_TABLE() - -void wxPreviewFrame::OnChar(wxKeyEvent &event) -{ - if ( event.GetKeyCode() == WXK_ESCAPE ) - { - Close(true); - } - else - { - event.Skip(); - } -} - -wxPreviewFrame::wxPreviewFrame(wxPrintPreviewBase *preview, wxWindow *parent, const wxString& title, - const wxPoint& pos, const wxSize& size, long style, const wxString& name): -wxFrame(parent, wxID_ANY, title, pos, size, style, name) -{ - m_printPreview = preview; - m_controlBar = NULL; - m_previewCanvas = NULL; - m_windowDisabler = NULL; - m_modalityKind = wxPreviewFrame_NonModal; - - // Give the application icon -#ifdef __WXMSW__ - wxFrame* topFrame = wxDynamicCast(wxTheApp->GetTopWindow(), wxFrame); - if (topFrame) - SetIcons(topFrame->GetIcons()); -#endif -} - -wxPreviewFrame::~wxPreviewFrame() -{ - wxPrintout *printout = m_printPreview->GetPrintout(); - if (printout) - { - delete printout; - m_printPreview->SetPrintout(NULL); - m_printPreview->SetCanvas(NULL); - m_printPreview->SetFrame(NULL); - } - - m_previewCanvas->SetPreview(NULL); - delete m_printPreview; -} - -void wxPreviewFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event)) -{ - // Reenable any windows we disabled by undoing whatever we did in our - // Initialize(). - switch ( m_modalityKind ) - { - case wxPreviewFrame_AppModal: - delete m_windowDisabler; - m_windowDisabler = NULL; - break; - - case wxPreviewFrame_WindowModal: - if ( GetParent() ) - GetParent()->Enable(); - break; - - case wxPreviewFrame_NonModal: - break; - } - - Destroy(); -} - -void wxPreviewFrame::InitializeWithModality(wxPreviewFrameModalityKind kind) -{ -#if wxUSE_STATUSBAR - CreateStatusBar(); -#endif - CreateCanvas(); - CreateControlBar(); - - m_printPreview->SetCanvas(m_previewCanvas); - m_printPreview->SetFrame(this); - - wxBoxSizer* const sizer = new wxBoxSizer( wxVERTICAL ); - - sizer->Add( m_controlBar, wxSizerFlags().Expand().Border() ); - sizer->Add( m_previewCanvas, wxSizerFlags(1).Expand().Border() ); - - SetAutoLayout( true ); - SetSizer( sizer ); - - m_modalityKind = kind; - switch ( m_modalityKind ) - { - case wxPreviewFrame_AppModal: - // Disable everything. - m_windowDisabler = new wxWindowDisabler( this ); - break; - - case wxPreviewFrame_WindowModal: - // Disable our parent if we have one. - if ( GetParent() ) - GetParent()->Disable(); - break; - - case wxPreviewFrame_NonModal: - // Nothing to do, we don't need to disable any windows. - break; - } - - if ( m_modalityKind != wxPreviewFrame_NonModal ) - { - // Behave like modal dialogs, don't show in taskbar. This implies - // removing the minimize box, because minimizing windows without - // taskbar entry is confusing. - SetWindowStyle((GetWindowStyle() & ~wxMINIMIZE_BOX) | wxFRAME_NO_TASKBAR); - } - - Layout(); - - m_printPreview->AdjustScrollbars(m_previewCanvas); - m_previewCanvas->SetFocus(); - m_controlBar->SetFocus(); -} - -void wxPreviewFrame::CreateCanvas() -{ - m_previewCanvas = new wxPreviewCanvas(m_printPreview, this); -} - -void wxPreviewFrame::CreateControlBar() -{ - long buttons = wxPREVIEW_DEFAULT; - if (m_printPreview->GetPrintoutForPrinting()) - buttons |= wxPREVIEW_PRINT; - - m_controlBar = new wxPreviewControlBar(m_printPreview, buttons, this); - m_controlBar->CreateButtons(); -} - -/* -* Print preview -*/ - -wxIMPLEMENT_CLASS(wxPrintPreviewBase, wxObject); - -wxPrintPreviewBase::wxPrintPreviewBase(wxPrintout *printout, - wxPrintout *printoutForPrinting, - wxPrintData *data) -{ - if (data) - m_printDialogData = (*data); - - Init(printout, printoutForPrinting); -} - -wxPrintPreviewBase::wxPrintPreviewBase(wxPrintout *printout, - wxPrintout *printoutForPrinting, - wxPrintDialogData *data) -{ - if (data) - m_printDialogData = (*data); - - Init(printout, printoutForPrinting); -} - -void wxPrintPreviewBase::Init(wxPrintout *printout, - wxPrintout *printoutForPrinting) -{ - m_isOk = true; - m_previewPrintout = printout; - if (m_previewPrintout) - m_previewPrintout->SetPreview(static_cast(this)); - - m_printPrintout = printoutForPrinting; - - m_previewCanvas = NULL; - m_previewFrame = NULL; - m_previewBitmap = NULL; - m_previewFailed = false; - m_currentPage = 1; - m_currentZoom = 70; - m_topMargin = - m_leftMargin = 2*wxSizerFlags::GetDefaultBorder(); - m_pageWidth = 0; - m_pageHeight = 0; - m_printingPrepared = false; - m_minPage = 1; - m_maxPage = 1; -} - -wxPrintPreviewBase::~wxPrintPreviewBase() -{ - if (m_previewPrintout) - delete m_previewPrintout; - if (m_previewBitmap) - delete m_previewBitmap; - if (m_printPrintout) - delete m_printPrintout; -} - -bool wxPrintPreviewBase::SetCurrentPage(int pageNum) -{ - if (m_currentPage == pageNum) - return true; - - m_currentPage = pageNum; - - InvalidatePreviewBitmap(); - - if (m_previewCanvas) - { - AdjustScrollbars(m_previewCanvas); - - m_previewCanvas->Refresh(); - m_previewCanvas->SetFocus(); - } - return true; -} - -int wxPrintPreviewBase::GetCurrentPage() const - { return m_currentPage; } -void wxPrintPreviewBase::SetPrintout(wxPrintout *printout) - { m_previewPrintout = printout; } -wxPrintout *wxPrintPreviewBase::GetPrintout() const - { return m_previewPrintout; } -wxPrintout *wxPrintPreviewBase::GetPrintoutForPrinting() const - { return m_printPrintout; } -void wxPrintPreviewBase::SetFrame(wxFrame *frame) - { m_previewFrame = frame; } -void wxPrintPreviewBase::SetCanvas(wxPreviewCanvas *canvas) - { m_previewCanvas = canvas; } -wxFrame *wxPrintPreviewBase::GetFrame() const - { return m_previewFrame; } -wxPreviewCanvas *wxPrintPreviewBase::GetCanvas() const - { return m_previewCanvas; } - -void wxPrintPreviewBase::CalcRects(wxPreviewCanvas *canvas, wxRect& pageRect, wxRect& paperRect) -{ - // Calculate the rectangles for the printable area of the page and the - // entire paper as they appear on the canvas on-screen. - int canvasWidth, canvasHeight; - canvas->GetSize(&canvasWidth, &canvasHeight); - - float zoomScale = float(m_currentZoom) / 100; - float screenPrintableWidth = zoomScale * m_pageWidth * m_previewScaleX; - float screenPrintableHeight = zoomScale * m_pageHeight * m_previewScaleY; - - wxRect devicePaperRect = m_previewPrintout->GetPaperRectPixels(); - wxCoord devicePrintableWidth, devicePrintableHeight; - m_previewPrintout->GetPageSizePixels(&devicePrintableWidth, &devicePrintableHeight); - float scaleX = screenPrintableWidth / devicePrintableWidth; - float scaleY = screenPrintableHeight / devicePrintableHeight; - paperRect.width = wxCoord(scaleX * devicePaperRect.width); - paperRect.height = wxCoord(scaleY * devicePaperRect.height); - - paperRect.x = wxCoord((canvasWidth - paperRect.width)/ 2.0); - if (paperRect.x < m_leftMargin) - paperRect.x = m_leftMargin; - paperRect.y = wxCoord((canvasHeight - paperRect.height)/ 2.0); - if (paperRect.y < m_topMargin) - paperRect.y = m_topMargin; - - pageRect.x = paperRect.x - wxCoord(scaleX * devicePaperRect.x); - pageRect.y = paperRect.y - wxCoord(scaleY * devicePaperRect.y); - pageRect.width = wxCoord(screenPrintableWidth); - pageRect.height = wxCoord(screenPrintableHeight); -} - - -void wxPrintPreviewBase::InvalidatePreviewBitmap() -{ - wxDELETE(m_previewBitmap); - // if there was a problem with rendering the preview, try again now - // that it changed in some way (less memory may be needed, for example): - m_previewFailed = false; -} - -bool wxPrintPreviewBase::UpdatePageRendering() -{ - if ( m_previewBitmap ) - return false; - - if ( m_previewFailed ) - return false; - - if ( !RenderPage(m_currentPage) ) - { - m_previewFailed = true; // don't waste time failing again - return false; - } - - return true; -} - -bool wxPrintPreviewBase::PaintPage(wxPreviewCanvas *canvas, wxDC& dc) -{ - DrawBlankPage(canvas, dc); - - if (!m_previewBitmap) - return false; - if (!canvas) - return false; - - wxRect pageRect, paperRect; - CalcRects(canvas, pageRect, paperRect); - wxMemoryDC temp_dc; - temp_dc.SelectObject(*m_previewBitmap); - - dc.Blit(pageRect.x, pageRect.y, - m_previewBitmap->GetWidth(), m_previewBitmap->GetHeight(), &temp_dc, 0, 0); - - temp_dc.SelectObject(wxNullBitmap); - return true; -} - -// Adjusts the scrollbars for the current scale -void wxPrintPreviewBase::AdjustScrollbars(wxPreviewCanvas *canvas) -{ - if (!canvas) - return ; - - wxRect pageRect, paperRect; - CalcRects(canvas, pageRect, paperRect); - int totalWidth = paperRect.width + 2 * m_leftMargin; - int totalHeight = paperRect.height + 2 * m_topMargin; - int scrollUnitsX = totalWidth / 10; - int scrollUnitsY = totalHeight / 10; - wxSize virtualSize = canvas->GetVirtualSize(); - if (virtualSize.GetWidth() != totalWidth || virtualSize.GetHeight() != totalHeight) - canvas->SetScrollbars(10, 10, scrollUnitsX, scrollUnitsY, 0, 0, true); -} - -bool wxPrintPreviewBase::RenderPageIntoDC(wxDC& dc, int pageNum) -{ - m_previewPrintout->SetDC(&dc); - m_previewPrintout->SetPageSizePixels(m_pageWidth, m_pageHeight); - - // Need to delay OnPreparePrinting() until here, so we have enough - // information and a wxDC. - if (!m_printingPrepared) - { - m_printingPrepared = true; - - m_previewPrintout->OnPreparePrinting(); - int selFrom, selTo; - m_previewPrintout->GetPageInfo(&m_minPage, &m_maxPage, &selFrom, &selTo); - - // Update the wxPreviewControlBar page range display. - if ( m_previewFrame ) - { - wxPreviewControlBar * const - controlBar = ((wxPreviewFrame*)m_previewFrame)->GetControlBar(); - if ( controlBar ) - controlBar->SetPageInfo(m_minPage, m_maxPage); - } - } - - m_previewPrintout->OnBeginPrinting(); - - if (!m_previewPrintout->OnBeginDocument(m_printDialogData.GetFromPage(), m_printDialogData.GetToPage())) - { - wxMessageBox(_("Could not start document preview."), _("Print Preview Failure"), wxOK); - return false; - } - - m_previewPrintout->OnPrintPage(pageNum); - m_previewPrintout->OnEndDocument(); - m_previewPrintout->OnEndPrinting(); - - m_previewPrintout->SetDC(NULL); - - return true; -} - -bool wxPrintPreviewBase::RenderPageIntoBitmap(wxBitmap& bmp, int pageNum) -{ - wxMemoryDC memoryDC; - memoryDC.SelectObject(bmp); - memoryDC.Clear(); - - return RenderPageIntoDC(memoryDC, pageNum); -} - -bool wxPrintPreviewBase::RenderPage(int pageNum) -{ - wxBusyCursor busy; - - if (!m_previewCanvas) - { - wxFAIL_MSG(wxT("wxPrintPreviewBase::RenderPage: must use wxPrintPreviewBase::SetCanvas to let me know about the canvas!")); - return false; - } - - wxRect pageRect, paperRect; - CalcRects(m_previewCanvas, pageRect, paperRect); - - if (!m_previewBitmap) - { - m_previewBitmap = new wxBitmap(pageRect.width, pageRect.height); - - if (!m_previewBitmap || !m_previewBitmap->IsOk()) - { - InvalidatePreviewBitmap(); - wxMessageBox(_("Sorry, not enough memory to create a preview."), _("Print Preview Failure"), wxOK); - return false; - } - } - - if ( !RenderPageIntoBitmap(*m_previewBitmap, pageNum) ) - { - InvalidatePreviewBitmap(); - wxMessageBox(_("Sorry, not enough memory to create a preview."), _("Print Preview Failure"), wxOK); - return false; - } - -#if wxUSE_STATUSBAR - wxString status; - if (m_maxPage != 0) - status = wxString::Format(_("Page %d of %d"), pageNum, m_maxPage); - else - status = wxString::Format(_("Page %d"), pageNum); - - if (m_previewFrame) - m_previewFrame->SetStatusText(status); -#endif - - return true; -} - -bool wxPrintPreviewBase::DrawBlankPage(wxPreviewCanvas *canvas, wxDC& dc) -{ - wxRect pageRect, paperRect; - - CalcRects(canvas, pageRect, paperRect); - - // Draw shadow, allowing for 1-pixel border AROUND the actual paper - wxCoord shadowOffset = 4; - - dc.SetPen(*wxBLACK_PEN); - dc.SetBrush(*wxBLACK_BRUSH); - dc.DrawRectangle(paperRect.x + shadowOffset, paperRect.y + paperRect.height + 1, - paperRect.width, shadowOffset); - - dc.DrawRectangle(paperRect.x + paperRect.width, paperRect.y + shadowOffset, - shadowOffset, paperRect.height); - - // Draw blank page allowing for 1-pixel border AROUND the actual paper - dc.SetPen(*wxBLACK_PEN); - dc.SetBrush(*wxWHITE_BRUSH); - dc.DrawRectangle(paperRect.x - 2, paperRect.y - 1, - paperRect.width + 3, paperRect.height + 2); - - return true; -} - -void wxPrintPreviewBase::SetZoom(int percent) -{ - if (m_currentZoom == percent) - return; - - m_currentZoom = percent; - - InvalidatePreviewBitmap(); - - if (m_previewCanvas) - { - AdjustScrollbars(m_previewCanvas); - ((wxScrolledWindow *) m_previewCanvas)->Scroll(0, 0); - m_previewCanvas->ClearBackground(); - m_previewCanvas->Refresh(); - m_previewCanvas->SetFocus(); - } -} - -wxPrintDialogData& wxPrintPreviewBase::GetPrintDialogData() -{ - return m_printDialogData; -} - -int wxPrintPreviewBase::GetZoom() const -{ return m_currentZoom; } -int wxPrintPreviewBase::GetMaxPage() const -{ return m_maxPage; } -int wxPrintPreviewBase::GetMinPage() const -{ return m_minPage; } -bool wxPrintPreviewBase::IsOk() const -{ return m_isOk; } -void wxPrintPreviewBase::SetOk(bool ok) -{ m_isOk = ok; } - -//---------------------------------------------------------------------------- -// wxPrintPreview -//---------------------------------------------------------------------------- - -wxIMPLEMENT_CLASS(wxPrintPreview, wxPrintPreviewBase); - -wxPrintPreview::wxPrintPreview(wxPrintout *printout, - wxPrintout *printoutForPrinting, - wxPrintDialogData *data) : - wxPrintPreviewBase( printout, printoutForPrinting, data ) -{ - m_pimpl = wxPrintFactory::GetFactory()-> - CreatePrintPreview( printout, printoutForPrinting, data ); -} - -wxPrintPreview::wxPrintPreview(wxPrintout *printout, - wxPrintout *printoutForPrinting, - wxPrintData *data ) : - wxPrintPreviewBase( printout, printoutForPrinting, data ) -{ - m_pimpl = wxPrintFactory::GetFactory()-> - CreatePrintPreview( printout, printoutForPrinting, data ); -} - -wxPrintPreview::~wxPrintPreview() -{ - delete m_pimpl; - - // don't delete twice - m_printPrintout = NULL; - m_previewPrintout = NULL; - m_previewBitmap = NULL; -} - -bool wxPrintPreview::SetCurrentPage(int pageNum) -{ - return m_pimpl->SetCurrentPage( pageNum ); -} - -int wxPrintPreview::GetCurrentPage() const -{ - return m_pimpl->GetCurrentPage(); -} - -void wxPrintPreview::SetPrintout(wxPrintout *printout) -{ - m_pimpl->SetPrintout( printout ); -} - -wxPrintout *wxPrintPreview::GetPrintout() const -{ - return m_pimpl->GetPrintout(); -} - -wxPrintout *wxPrintPreview::GetPrintoutForPrinting() const -{ - return m_pimpl->GetPrintoutForPrinting(); -} - -void wxPrintPreview::SetFrame(wxFrame *frame) -{ - m_pimpl->SetFrame( frame ); -} - -void wxPrintPreview::SetCanvas(wxPreviewCanvas *canvas) -{ - m_pimpl->SetCanvas( canvas ); -} - -wxFrame *wxPrintPreview::GetFrame() const -{ - return m_pimpl->GetFrame(); -} - -wxPreviewCanvas *wxPrintPreview::GetCanvas() const -{ - return m_pimpl->GetCanvas(); -} - -bool wxPrintPreview::PaintPage(wxPreviewCanvas *canvas, wxDC& dc) -{ - return m_pimpl->PaintPage( canvas, dc ); -} - -bool wxPrintPreview::UpdatePageRendering() -{ - return m_pimpl->UpdatePageRendering(); -} - -bool wxPrintPreview::DrawBlankPage(wxPreviewCanvas *canvas, wxDC& dc) -{ - return m_pimpl->DrawBlankPage( canvas, dc ); -} - -void wxPrintPreview::AdjustScrollbars(wxPreviewCanvas *canvas) -{ - m_pimpl->AdjustScrollbars( canvas ); -} - -bool wxPrintPreview::RenderPage(int pageNum) -{ - return m_pimpl->RenderPage( pageNum ); -} - -void wxPrintPreview::SetZoom(int percent) -{ - m_pimpl->SetZoom( percent ); -} - -int wxPrintPreview::GetZoom() const -{ - return m_pimpl->GetZoom(); -} - -wxPrintDialogData& wxPrintPreview::GetPrintDialogData() -{ - return m_pimpl->GetPrintDialogData(); -} - -int wxPrintPreview::GetMaxPage() const -{ - return m_pimpl->GetMaxPage(); -} - -int wxPrintPreview::GetMinPage() const -{ - return m_pimpl->GetMinPage(); -} - -bool wxPrintPreview::IsOk() const -{ - return m_pimpl->IsOk(); -} - -void wxPrintPreview::SetOk(bool ok) -{ - m_pimpl->SetOk( ok ); -} - -bool wxPrintPreview::Print(bool interactive) -{ - return m_pimpl->Print( interactive ); -} - -void wxPrintPreview::DetermineScaling() -{ - m_pimpl->DetermineScaling(); -} - -#endif // wxUSE_PRINTING_ARCHITECTURE diff --git a/Externals/wxWidgets3/src/common/process.cpp b/Externals/wxWidgets3/src/common/process.cpp deleted file mode 100644 index dfe1ad3c02..0000000000 --- a/Externals/wxWidgets3/src/common/process.cpp +++ /dev/null @@ -1,197 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/process.cpp -// Purpose: Process termination classes -// Author: Guilhem Lavaux -// Modified by: Vadim Zeitlin to check error codes, added Detach() method -// Created: 24/06/98 -// Copyright: (c) Guilhem Lavaux -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include "wx/process.h" - -// ---------------------------------------------------------------------------- -// event tables and such -// ---------------------------------------------------------------------------- - -wxDEFINE_EVENT( wxEVT_END_PROCESS, wxProcessEvent ); - -wxIMPLEMENT_DYNAMIC_CLASS(wxProcess, wxEvtHandler); -wxIMPLEMENT_DYNAMIC_CLASS(wxProcessEvent, wxEvent); - -// ============================================================================ -// wxProcess implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxProcess creation -// ---------------------------------------------------------------------------- - -void wxProcess::Init(wxEvtHandler *parent, int id, int flags) -{ - if ( parent ) - SetNextHandler(parent); - - m_id = id; - m_pid = 0; - m_priority = wxPRIORITY_DEFAULT; - m_redirect = (flags & wxPROCESS_REDIRECT) != 0; - -#if wxUSE_STREAMS - m_inputStream = NULL; - m_errorStream = NULL; - m_outputStream = NULL; -#endif // wxUSE_STREAMS -} - -/* static */ -wxProcess *wxProcess::Open(const wxString& cmd, int flags) -{ - wxASSERT_MSG( !(flags & wxEXEC_SYNC), wxT("wxEXEC_SYNC should not be used." )); - wxProcess *process = new wxProcess(wxPROCESS_REDIRECT); - long pid = wxExecute(cmd, flags, process); - if( !pid ) - { - // couldn't launch the process - delete process; - return NULL; - } - - process->SetPid(pid); - - return process; -} - -// ---------------------------------------------------------------------------- -// wxProcess termination -// ---------------------------------------------------------------------------- - -wxProcess::~wxProcess() -{ -#if wxUSE_STREAMS - delete m_inputStream; - delete m_errorStream; - delete m_outputStream; -#endif // wxUSE_STREAMS -} - -void wxProcess::OnTerminate(int pid, int status) -{ - wxProcessEvent event(m_id, pid, status); - - if ( !ProcessEvent(event) ) - delete this; - //else: the object which processed the event is responsible for deleting - // us! -} - -void wxProcess::Detach() -{ - // we just detach from the next handler of the chain (i.e. our "parent" -- see ctor) - // not also from the previous handler like wxEvtHandler::Unlink() would do: - - if (m_nextHandler) - m_nextHandler->SetPreviousHandler(m_previousHandler); - - m_nextHandler = NULL; -} - -// ---------------------------------------------------------------------------- -// process IO redirection -// ---------------------------------------------------------------------------- - -#if wxUSE_STREAMS - -void wxProcess::SetPipeStreams(wxInputStream *inputSstream, - wxOutputStream *outputStream, - wxInputStream *errorStream) -{ - m_inputStream = inputSstream; - m_errorStream = errorStream; - m_outputStream = outputStream; -} - -bool wxProcess::IsInputOpened() const -{ - return m_inputStream && m_inputStream->GetLastError() != wxSTREAM_EOF; -} - -bool wxProcess::IsInputAvailable() const -{ - return m_inputStream && m_inputStream->CanRead(); -} - -bool wxProcess::IsErrorAvailable() const -{ - return m_errorStream && m_errorStream->CanRead(); -} - -#endif // wxUSE_STREAMS - -// ---------------------------------------------------------------------------- -// process killing -// ---------------------------------------------------------------------------- - -/* static */ -wxKillError wxProcess::Kill(int pid, wxSignal sig, int flags) -{ - wxKillError rc; - (void)wxKill(pid, sig, &rc, flags); - - return rc; -} - -/* static */ -bool wxProcess::Exists(int pid) -{ - switch ( Kill(pid, wxSIGNONE) ) - { - case wxKILL_OK: - case wxKILL_ACCESS_DENIED: - return true; - - default: - case wxKILL_ERROR: - case wxKILL_BAD_SIGNAL: - wxFAIL_MSG( wxT("unexpected wxProcess::Kill() return code") ); - wxFALLTHROUGH; - - case wxKILL_NO_PROCESS: - return false; - } -} - -bool wxProcess::Activate() const -{ -#ifdef __WINDOWS__ - // This function is defined in src/msw/utils.cpp. - extern bool wxMSWActivatePID(long pid); - - return wxMSWActivatePID(m_pid); -#else - return false; -#endif -} - -void wxProcess::SetPriority(unsigned priority) -{ - wxCHECK_RET( priority <= wxPRIORITY_MAX, - wxS("Invalid process priority value.") ); - - m_priority = priority; -} diff --git a/Externals/wxWidgets3/src/common/protocol.cpp b/Externals/wxWidgets3/src/common/protocol.cpp deleted file mode 100644 index f6250252c3..0000000000 --- a/Externals/wxWidgets3/src/common/protocol.cpp +++ /dev/null @@ -1,222 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/protocol.cpp -// Purpose: Implement protocol base class -// Author: Guilhem Lavaux -// Modified by: -// Created: 07/07/1997 -// Copyright: (c) 1997, 1998 Guilhem Lavaux -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_PROTOCOL - -#include "wx/protocol/protocol.h" -#include "wx/protocol/log.h" - -#ifndef WX_PRECOMP - #include "wx/app.h" - #include "wx/module.h" -#endif - -#include "wx/url.h" -#include "wx/log.h" - -#include - -// ---------------------------------------------------------------------------- -// wxProtoInfo -// ---------------------------------------------------------------------------- - -wxIMPLEMENT_CLASS(wxProtoInfo, wxObject); - -wxProtoInfo::wxProtoInfo(const wxChar *name, const wxChar *serv, - const bool need_host1, wxClassInfo *info) - : m_protoname(name), - m_servname(serv) -{ - m_cinfo = info; - m_needhost = need_host1; -#if wxUSE_URL - next = wxURL::ms_protocols; - wxURL::ms_protocols = this; -#else - next = NULL; -#endif -} - - -// ---------------------------------------------------------------------------- -// wxProtocol -// ---------------------------------------------------------------------------- - -#if wxUSE_SOCKETS -wxIMPLEMENT_ABSTRACT_CLASS(wxProtocol, wxSocketClient); -#else -wxIMPLEMENT_ABSTRACT_CLASS(wxProtocol, wxObject); -#endif - -wxProtocol::wxProtocol() -#if wxUSE_SOCKETS - // Only use non blocking sockets if we can dispatch events. - : wxSocketClient((wxIsMainThread() && wxApp::IsMainLoopRunning() - ? wxSOCKET_NONE - : wxSOCKET_BLOCK) | wxSOCKET_WAITALL) -#endif -{ - m_lastError = wxPROTO_NOERR; - m_log = NULL; - SetDefaultTimeout(60); // default timeout is 60 seconds -} - -void wxProtocol::SetDefaultTimeout(wxUint32 Value) -{ - m_uiDefaultTimeout = Value; -#if wxUSE_SOCKETS - wxSocketBase::SetTimeout(Value); // sets it for this socket -#endif -} - -wxProtocol::~wxProtocol() -{ - delete m_log; -} - -#if wxUSE_SOCKETS -bool wxProtocol::Reconnect() -{ - wxIPV4address addr; - - if (!GetPeer(addr)) - { - Close(); - return false; - } - - if (!Close()) - return false; - - if (!Connect(addr)) - return false; - - return true; -} - -// ---------------------------------------------------------------------------- -// Read a line from socket -// ---------------------------------------------------------------------------- - -/* static */ -wxProtocolError wxProtocol::ReadLine(wxSocketBase *sock, wxString& result) -{ - static const int LINE_BUF = 4095; - - result.clear(); - - wxCharBuffer buf(LINE_BUF); - char *pBuf = buf.data(); - while ( sock->WaitForRead() ) - { - // peek at the socket to see if there is a CRLF - sock->Peek(pBuf, LINE_BUF); - - size_t nRead = sock->LastCount(); - if ( !nRead && sock->Error() ) - return wxPROTO_NETERR; - - // look for "\r\n" paying attention to a special case: "\r\n" could - // have been split by buffer boundary, so check also for \r at the end - // of the last chunk and \n at the beginning of this one - pBuf[nRead] = '\0'; - const char *eol = strchr(pBuf, '\n'); - - // if we found '\n', is there a '\r' as well? - if ( eol ) - { - if ( eol == pBuf ) - { - // check for case of "\r\n" being split - if ( result.empty() || result.Last() != wxT('\r') ) - { - // ignore the stray '\n' - eol = NULL; - } - //else: ok, got real EOL - - // read just this '\n' and restart - nRead = 1; - } - else // '\n' in the middle of the buffer - { - // in any case, read everything up to and including '\n' - nRead = eol - pBuf + 1; - - if ( eol[-1] != '\r' ) - { - // as above, simply ignore stray '\n' - eol = NULL; - } - } - } - - sock->Read(pBuf, nRead); - if ( sock->LastCount() != nRead ) - return wxPROTO_NETERR; - - pBuf[nRead] = '\0'; - result += wxString::FromAscii(pBuf); - - if ( eol ) - { - // remove trailing "\r\n" - result.RemoveLast(2); - - return wxPROTO_NOERR; - } - } - - return wxPROTO_NETERR; -} - -wxProtocolError wxProtocol::ReadLine(wxString& result) -{ - return ReadLine(this, result); -} - -#endif // wxUSE_SOCKETS - -// ---------------------------------------------------------------------------- -// logging -// ---------------------------------------------------------------------------- - -void wxProtocol::SetLog(wxProtocolLog *log) -{ - delete m_log; - m_log = log; -} - -void wxProtocol::LogRequest(const wxString& str) -{ - if ( m_log ) - m_log->LogRequest(str); -} - -void wxProtocol::LogResponse(const wxString& str) -{ - if ( m_log ) - m_log->LogResponse(str); -} - -void wxProtocolLog::DoLogString(const wxString& str) -{ - wxUnusedVar(str); // unused if wxLogTrace() is disabled - wxLogTrace(m_traceMask, "%s", str); -} - -#endif // wxUSE_PROTOCOL diff --git a/Externals/wxWidgets3/src/common/quantize.cpp b/Externals/wxWidgets3/src/common/quantize.cpp deleted file mode 100644 index 4fa2988ca4..0000000000 --- a/Externals/wxWidgets3/src/common/quantize.cpp +++ /dev/null @@ -1,1605 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/quantize.cpp -// Purpose: wxQuantize implementation -// Author: Julian Smart -// Modified by: -// Created: 22/6/2000 -// Copyright: (c) Thomas G. Lane, Vaclav Slavik, Julian Smart -// Licence: wxWindows licence + JPEG library licence -///////////////////////////////////////////////////////////////////////////// - -/* - * jquant2.c - * - * Copyright (C) 1991-1996, Thomas G. Lane. - * This file is part of the Independent JPEG Group's software. - * For conditions of distribution and use, see the accompanying README file. - * - * This file contains 2-pass color quantization (color mapping) routines. - * These routines provide selection of a custom color map for an image, - * followed by mapping of the image to that color map, with optional - * Floyd-Steinberg dithering. - * It is also possible to use just the second pass to map to an arbitrary - * externally-given color map. - * - * Note: ordered dithering is not supported, since there isn't any fast - * way to compute intercolor distances; it's unclear that ordered dither's - * fundamental assumptions even hold with an irregularly spaced color map. - */ - -/* modified by Vaclav Slavik for use as jpeglib-independent module */ - -// For compilers that support precompilation, includes "wx/wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ -#pragma hdrstop -#endif - -#if wxUSE_IMAGE - -#include "wx/quantize.h" - -#ifndef WX_PRECOMP - #include "wx/palette.h" - #include "wx/image.h" -#endif - -#ifdef __WXMSW__ - #include "wx/msw/private.h" -#endif - -#include -#include - -#define RGB_RED 0 -#define RGB_GREEN 1 -#define RGB_BLUE 2 - -#define MAXJSAMPLE 255 -#define CENTERJSAMPLE 128 -#define BITS_IN_JSAMPLE 8 -#define GETJSAMPLE(value) ((int) (value)) - -#define RIGHT_SHIFT(x,shft) ((x) >> (shft)) - -typedef unsigned char JSAMPLE; -typedef JSAMPLE *JSAMPROW; -typedef JSAMPROW *JSAMPARRAY; -typedef unsigned int JDIMENSION; - -typedef struct { - void *cquantize; - JDIMENSION output_width; - JSAMPARRAY colormap; - int actual_number_of_colors; - int desired_number_of_colors; - JSAMPLE *sample_range_limit, *srl_orig; -} j_decompress; - -#if defined(__WINDOWS__) - #define JMETHOD(type,methodname,arglist) type (__cdecl methodname) arglist -#else - #define JMETHOD(type,methodname,arglist) type (methodname) arglist -#endif - -typedef j_decompress *j_decompress_ptr; -struct jpeg_color_quantizer { - JMETHOD(void, start_pass, (j_decompress_ptr cinfo, bool is_pre_scan)); - JMETHOD(void, color_quantize, (j_decompress_ptr cinfo, - JSAMPARRAY input_buf, JSAMPARRAY output_buf, - int num_rows)); - JMETHOD(void, finish_pass, (j_decompress_ptr cinfo)); - JMETHOD(void, new_color_map, (j_decompress_ptr cinfo)); -}; - - - - -/* - * This module implements the well-known Heckbert paradigm for color - * quantization. Most of the ideas used here can be traced back to - * Heckbert's seminal paper - * Heckbert, Paul. "Color Image Quantization for Frame Buffer Display", - * Proc. SIGGRAPH '82, Computer Graphics v.16 #3 (July 1982), pp 297-304. - * - * In the first pass over the image, we accumulate a histogram showing the - * usage count of each possible color. To keep the histogram to a reasonable - * size, we reduce the precision of the input; typical practice is to retain - * 5 or 6 bits per color, so that 8 or 4 different input values are counted - * in the same histogram cell. - * - * Next, the color-selection step begins with a box representing the whole - * color space, and repeatedly splits the "largest" remaining box until we - * have as many boxes as desired colors. Then the mean color in each - * remaining box becomes one of the possible output colors. - * - * The second pass over the image maps each input pixel to the closest output - * color (optionally after applying a Floyd-Steinberg dithering correction). - * This mapping is logically trivial, but making it go fast enough requires - * considerable care. - * - * Heckbert-style quantizers vary a good deal in their policies for choosing - * the "largest" box and deciding where to cut it. The particular policies - * used here have proved out well in experimental comparisons, but better ones - * may yet be found. - * - * In earlier versions of the IJG code, this module quantized in YCbCr color - * space, processing the raw upsampled data without a color conversion step. - * This allowed the color conversion math to be done only once per colormap - * entry, not once per pixel. However, that optimization precluded other - * useful optimizations (such as merging color conversion with upsampling) - * and it also interfered with desired capabilities such as quantizing to an - * externally-supplied colormap. We have therefore abandoned that approach. - * The present code works in the post-conversion color space, typically RGB. - * - * To improve the visual quality of the results, we actually work in scaled - * RGB space, giving G distances more weight than R, and R in turn more than - * B. To do everything in integer math, we must use integer scale factors. - * The 2/3/1 scale factors used here correspond loosely to the relative - * weights of the colors in the NTSC grayscale equation. - * If you want to use this code to quantize a non-RGB color space, you'll - * probably need to change these scale factors. - */ - -#define R_SCALE 2 /* scale R distances by this much */ -#define G_SCALE 3 /* scale G distances by this much */ -#define B_SCALE 1 /* and B by this much */ - -/* Relabel R/G/B as components 0/1/2, respecting the RGB ordering defined - * in jmorecfg.h. As the code stands, it will do the right thing for R,G,B - * and B,G,R orders. If you define some other weird order in jmorecfg.h, - * you'll get compile errors until you extend this logic. In that case - * you'll probably want to tweak the histogram sizes too. - */ - -#if RGB_RED == 0 -#define C0_SCALE R_SCALE -#endif -#if RGB_BLUE == 0 -#define C0_SCALE B_SCALE -#endif -#if RGB_GREEN == 1 -#define C1_SCALE G_SCALE -#endif -#if RGB_RED == 2 -#define C2_SCALE R_SCALE -#endif -#if RGB_BLUE == 2 -#define C2_SCALE B_SCALE -#endif - -/* - * First we have the histogram data structure and routines for creating it. - * - * The number of bits of precision can be adjusted by changing these symbols. - * We recommend keeping 6 bits for G and 5 each for R and B. - * If you have plenty of memory and cycles, 6 bits all around gives marginally - * better results; if you are short of memory, 5 bits all around will save - * some space but degrade the results. - * To maintain a fully accurate histogram, we'd need to allocate a "long" - * (preferably unsigned long) for each cell. In practice this is overkill; - * we can get by with 16 bits per cell. Few of the cell counts will overflow, - * and clamping those that do overflow to the maximum value will give close- - * enough results. This reduces the recommended histogram size from 256Kb - * to 128Kb, which is a useful savings on PC-class machines. - * (In the second pass the histogram space is re-used for pixel mapping data; - * in that capacity, each cell must be able to store zero to the number of - * desired colors. 16 bits/cell is plenty for that too.) - * Since the JPEG code is intended to run in small memory model on 80x86 - * machines, we can't just allocate the histogram in one chunk. Instead - * of a true 3-D array, we use a row of pointers to 2-D arrays. Each - * pointer corresponds to a C0 value (typically 2^5 = 32 pointers) and - * each 2-D array has 2^6*2^5 = 2048 or 2^6*2^6 = 4096 entries. Note that - * on 80x86 machines, the pointer row is in near memory but the actual - * arrays are in far memory (same arrangement as we use for image arrays). - */ - -#define MAXNUMCOLORS (MAXJSAMPLE+1) /* maximum size of colormap */ - -/* These will do the right thing for either R,G,B or B,G,R color order, - * but you may not like the results for other color orders. - */ -#define HIST_C0_BITS 5 /* bits of precision in R/B histogram */ -#define HIST_C1_BITS 6 /* bits of precision in G histogram */ -#define HIST_C2_BITS 5 /* bits of precision in B/R histogram */ - -/* Number of elements along histogram axes. */ -#define HIST_C0_ELEMS (1<cquantize; - JSAMPROW ptr; - histptr histp; - hist3d histogram = cquantize->histogram; - int row; - JDIMENSION col; - JDIMENSION width = cinfo->output_width; - - for (row = 0; row < num_rows; row++) { - ptr = input_buf[row]; - for (col = width; col > 0; col--) { - - { - - /* get pixel value and index into the histogram */ - histp = & histogram[GETJSAMPLE(ptr[0]) >> C0_SHIFT] - [GETJSAMPLE(ptr[1]) >> C1_SHIFT] - [GETJSAMPLE(ptr[2]) >> C2_SHIFT]; - /* increment, check for overflow and undo increment if so. */ - if (++(*histp) <= 0) - (*histp)--; - } - ptr += 3; - } - } -} - - -/* - * Next we have the really interesting routines: selection of a colormap - * given the completed histogram. - * These routines work with a list of "boxes", each representing a rectangular - * subset of the input color space (to histogram precision). - */ - -typedef struct { - /* The bounds of the box (inclusive); expressed as histogram indexes */ - int c0min, c0max; - int c1min, c1max; - int c2min, c2max; - /* The volume (actually 2-norm) of the box */ - wxInt32 volume; - /* The number of nonzero histogram cells within this box */ - long colorcount; -} box; - -typedef box * boxptr; - - -boxptr -find_biggest_color_pop (boxptr boxlist, int numboxes) -/* Find the splittable box with the largest color population */ -/* Returns NULL if no splittable boxes remain */ -{ - boxptr boxp; - int i; - long maxc = 0; - boxptr which = NULL; - - for (i = 0, boxp = boxlist; i < numboxes; i++, boxp++) { - if (boxp->colorcount > maxc && boxp->volume > 0) { - which = boxp; - maxc = boxp->colorcount; - } - } - return which; -} - - -boxptr -find_biggest_volume (boxptr boxlist, int numboxes) -/* Find the splittable box with the largest (scaled) volume */ -/* Returns NULL if no splittable boxes remain */ -{ - boxptr boxp; - int i; - wxInt32 maxv = 0; - boxptr which = NULL; - - for (i = 0, boxp = boxlist; i < numboxes; i++, boxp++) { - if (boxp->volume > maxv) { - which = boxp; - maxv = boxp->volume; - } - } - return which; -} - - -void -update_box (j_decompress_ptr cinfo, boxptr boxp) -/* Shrink the min/max bounds of a box to enclose only nonzero elements, */ -/* and recompute its volume and population */ -{ - my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize; - hist3d histogram = cquantize->histogram; - histptr histp; - int c0,c1,c2; - int c0min,c0max,c1min,c1max,c2min,c2max; - wxInt32 dist0,dist1,dist2; - long ccount; - - c0min = boxp->c0min; c0max = boxp->c0max; - c1min = boxp->c1min; c1max = boxp->c1max; - c2min = boxp->c2min; c2max = boxp->c2max; - - if (c0max > c0min) - for (c0 = c0min; c0 <= c0max; c0++) - for (c1 = c1min; c1 <= c1max; c1++) { - histp = & histogram[c0][c1][c2min]; - for (c2 = c2min; c2 <= c2max; c2++) - if (*histp++ != 0) { - boxp->c0min = c0min = c0; - goto have_c0min; - } - } - have_c0min: - if (c0max > c0min) - for (c0 = c0max; c0 >= c0min; c0--) - for (c1 = c1min; c1 <= c1max; c1++) { - histp = & histogram[c0][c1][c2min]; - for (c2 = c2min; c2 <= c2max; c2++) - if (*histp++ != 0) { - boxp->c0max = c0max = c0; - goto have_c0max; - } - } - have_c0max: - if (c1max > c1min) - for (c1 = c1min; c1 <= c1max; c1++) - for (c0 = c0min; c0 <= c0max; c0++) { - histp = & histogram[c0][c1][c2min]; - for (c2 = c2min; c2 <= c2max; c2++) - if (*histp++ != 0) { - boxp->c1min = c1min = c1; - goto have_c1min; - } - } - have_c1min: - if (c1max > c1min) - for (c1 = c1max; c1 >= c1min; c1--) - for (c0 = c0min; c0 <= c0max; c0++) { - histp = & histogram[c0][c1][c2min]; - for (c2 = c2min; c2 <= c2max; c2++) - if (*histp++ != 0) { - boxp->c1max = c1max = c1; - goto have_c1max; - } - } - have_c1max: - if (c2max > c2min) - for (c2 = c2min; c2 <= c2max; c2++) - for (c0 = c0min; c0 <= c0max; c0++) { - histp = & histogram[c0][c1min][c2]; - for (c1 = c1min; c1 <= c1max; c1++, histp += HIST_C2_ELEMS) - if (*histp != 0) { - boxp->c2min = c2min = c2; - goto have_c2min; - } - } - have_c2min: - if (c2max > c2min) - for (c2 = c2max; c2 >= c2min; c2--) - for (c0 = c0min; c0 <= c0max; c0++) { - histp = & histogram[c0][c1min][c2]; - for (c1 = c1min; c1 <= c1max; c1++, histp += HIST_C2_ELEMS) - if (*histp != 0) { - boxp->c2max = c2max = c2; - goto have_c2max; - } - } - have_c2max: - - /* Update box volume. - * We use 2-norm rather than real volume here; this biases the method - * against making long narrow boxes, and it has the side benefit that - * a box is splittable iff norm > 0. - * Since the differences are expressed in histogram-cell units, - * we have to shift back to JSAMPLE units to get consistent distances; - * after which, we scale according to the selected distance scale factors. - */ - dist0 = ((c0max - c0min) << C0_SHIFT) * C0_SCALE; - dist1 = ((c1max - c1min) << C1_SHIFT) * C1_SCALE; - dist2 = ((c2max - c2min) << C2_SHIFT) * C2_SCALE; - boxp->volume = dist0*dist0 + dist1*dist1 + dist2*dist2; - - /* Now scan remaining volume of box and compute population */ - ccount = 0; - for (c0 = c0min; c0 <= c0max; c0++) - for (c1 = c1min; c1 <= c1max; c1++) { - histp = & histogram[c0][c1][c2min]; - for (c2 = c2min; c2 <= c2max; c2++, histp++) - if (*histp != 0) { - ccount++; - } - } - boxp->colorcount = ccount; -} - - -int -median_cut (j_decompress_ptr cinfo, boxptr boxlist, int numboxes, - int desired_colors) -/* Repeatedly select and split the largest box until we have enough boxes */ -{ - int n,lb; - int c0,c1,c2,cmax; - boxptr b1,b2; - - while (numboxes < desired_colors) { - /* Select box to split. - * Current algorithm: by population for first half, then by volume. - */ - if ((numboxes*2) <= desired_colors) { - b1 = find_biggest_color_pop(boxlist, numboxes); - } else { - b1 = find_biggest_volume(boxlist, numboxes); - } - if (b1 == NULL) /* no splittable boxes left! */ - break; - b2 = &boxlist[numboxes]; /* where new box will go */ - /* Copy the color bounds to the new box. */ - b2->c0max = b1->c0max; b2->c1max = b1->c1max; b2->c2max = b1->c2max; - b2->c0min = b1->c0min; b2->c1min = b1->c1min; b2->c2min = b1->c2min; - /* Choose which axis to split the box on. - * Current algorithm: longest scaled axis. - * See notes in update_box about scaling distances. - */ - c0 = ((b1->c0max - b1->c0min) << C0_SHIFT) * C0_SCALE; - c1 = ((b1->c1max - b1->c1min) << C1_SHIFT) * C1_SCALE; - c2 = ((b1->c2max - b1->c2min) << C2_SHIFT) * C2_SCALE; - /* We want to break any ties in favor of green, then red, blue last. - * This code does the right thing for R,G,B or B,G,R color orders only. - */ -#if RGB_RED == 0 - cmax = c1; n = 1; - if (c0 > cmax) { cmax = c0; n = 0; } - if (c2 > cmax) { n = 2; } -#else - cmax = c1; n = 1; - if (c2 > cmax) { cmax = c2; n = 2; } - if (c0 > cmax) { n = 0; } -#endif - - /* Choose split point along selected axis, and update box bounds. - * Current algorithm: split at halfway point. - * (Since the box has been shrunk to minimum volume, - * any split will produce two nonempty subboxes.) - * Note that lb value is max for lower box, so must be < old max. - */ - switch (n) { - case 0: - lb = (b1->c0max + b1->c0min) / 2; - b1->c0max = lb; - b2->c0min = lb+1; - break; - case 1: - lb = (b1->c1max + b1->c1min) / 2; - b1->c1max = lb; - b2->c1min = lb+1; - break; - case 2: - lb = (b1->c2max + b1->c2min) / 2; - b1->c2max = lb; - b2->c2min = lb+1; - break; - } - /* Update stats for boxes */ - update_box(cinfo, b1); - update_box(cinfo, b2); - numboxes++; - } - return numboxes; -} - - -void -compute_color (j_decompress_ptr cinfo, boxptr boxp, int icolor) -/* Compute representative color for a box, put it in colormap[icolor] */ -{ - /* Current algorithm: mean weighted by pixels (not colors) */ - /* Note it is important to get the rounding correct! */ - my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize; - hist3d histogram = cquantize->histogram; - histptr histp; - int c0,c1,c2; - int c0min,c0max,c1min,c1max,c2min,c2max; - long count; - long total = 0; - long c0total = 0; - long c1total = 0; - long c2total = 0; - - c0min = boxp->c0min; c0max = boxp->c0max; - c1min = boxp->c1min; c1max = boxp->c1max; - c2min = boxp->c2min; c2max = boxp->c2max; - - for (c0 = c0min; c0 <= c0max; c0++) - for (c1 = c1min; c1 <= c1max; c1++) { - histp = & histogram[c0][c1][c2min]; - for (c2 = c2min; c2 <= c2max; c2++) { - if ((count = *histp++) != 0) { - total += count; - c0total += ((c0 << C0_SHIFT) + ((1<>1)) * count; - c1total += ((c1 << C1_SHIFT) + ((1<>1)) * count; - c2total += ((c2 << C2_SHIFT) + ((1<>1)) * count; - } - } - } - - cinfo->colormap[0][icolor] = (JSAMPLE) ((c0total + (total>>1)) / total); - cinfo->colormap[1][icolor] = (JSAMPLE) ((c1total + (total>>1)) / total); - cinfo->colormap[2][icolor] = (JSAMPLE) ((c2total + (total>>1)) / total); -} - - -static void -select_colors (j_decompress_ptr cinfo, int desired_colors) -/* Master routine for color selection */ -{ - boxptr boxlist; - int numboxes; - int i; - - /* Allocate workspace for box list */ - boxlist = (boxptr) malloc(desired_colors * sizeof(box)); - /* Initialize one box containing whole space */ - numboxes = 1; - boxlist[0].c0min = 0; - boxlist[0].c0max = MAXJSAMPLE >> C0_SHIFT; - boxlist[0].c1min = 0; - boxlist[0].c1max = MAXJSAMPLE >> C1_SHIFT; - boxlist[0].c2min = 0; - boxlist[0].c2max = MAXJSAMPLE >> C2_SHIFT; - /* Shrink it to actually-used volume and set its statistics */ - update_box(cinfo, & boxlist[0]); - /* Perform median-cut to produce final box list */ - numboxes = median_cut(cinfo, boxlist, numboxes, desired_colors); - /* Compute the representative color for each box, fill colormap */ - for (i = 0; i < numboxes; i++) - compute_color(cinfo, & boxlist[i], i); - cinfo->actual_number_of_colors = numboxes; - - free(boxlist); //FIXME?? I don't know if this is correct - VS -} - - -/* - * These routines are concerned with the time-critical task of mapping input - * colors to the nearest color in the selected colormap. - * - * We re-use the histogram space as an "inverse color map", essentially a - * cache for the results of nearest-color searches. All colors within a - * histogram cell will be mapped to the same colormap entry, namely the one - * closest to the cell's center. This may not be quite the closest entry to - * the actual input color, but it's almost as good. A zero in the cache - * indicates we haven't found the nearest color for that cell yet; the array - * is cleared to zeroes before starting the mapping pass. When we find the - * nearest color for a cell, its colormap index plus one is recorded in the - * cache for future use. The pass2 scanning routines call fill_inverse_cmap - * when they need to use an unfilled entry in the cache. - * - * Our method of efficiently finding nearest colors is based on the "locally - * sorted search" idea described by Heckbert and on the incremental distance - * calculation described by Spencer W. Thomas in chapter III.1 of Graphics - * Gems II (James Arvo, ed. Academic Press, 1991). Thomas points out that - * the distances from a given colormap entry to each cell of the histogram can - * be computed quickly using an incremental method: the differences between - * distances to adjacent cells themselves differ by a constant. This allows a - * fairly fast implementation of the "brute force" approach of computing the - * distance from every colormap entry to every histogram cell. Unfortunately, - * it needs a work array to hold the best-distance-so-far for each histogram - * cell (because the inner loop has to be over cells, not colormap entries). - * The work array elements have to be INT32s, so the work array would need - * 256Kb at our recommended precision. This is not feasible in DOS machines. - * - * To get around these problems, we apply Thomas' method to compute the - * nearest colors for only the cells within a small subbox of the histogram. - * The work array need be only as big as the subbox, so the memory usage - * problem is solved. Furthermore, we need not fill subboxes that are never - * referenced in pass2; many images use only part of the color gamut, so a - * fair amount of work is saved. An additional advantage of this - * approach is that we can apply Heckbert's locality criterion to quickly - * eliminate colormap entries that are far away from the subbox; typically - * three-fourths of the colormap entries are rejected by Heckbert's criterion, - * and we need not compute their distances to individual cells in the subbox. - * The speed of this approach is heavily influenced by the subbox size: too - * small means too much overhead, too big loses because Heckbert's criterion - * can't eliminate as many colormap entries. Empirically the best subbox - * size seems to be about 1/512th of the histogram (1/8th in each direction). - * - * Thomas' article also describes a refined method which is asymptotically - * faster than the brute-force method, but it is also far more complex and - * cannot efficiently be applied to small subboxes. It is therefore not - * useful for programs intended to be portable to DOS machines. On machines - * with plenty of memory, filling the whole histogram in one shot with Thomas' - * refined method might be faster than the present code --- but then again, - * it might not be any faster, and it's certainly more complicated. - */ - - -/* log2(histogram cells in update box) for each axis; this can be adjusted */ -#define BOX_C0_LOG (HIST_C0_BITS-3) -#define BOX_C1_LOG (HIST_C1_BITS-3) -#define BOX_C2_LOG (HIST_C2_BITS-3) - -#define BOX_C0_ELEMS (1<actual_number_of_colors; - int maxc0, maxc1, maxc2; - int centerc0, centerc1, centerc2; - int i, x, ncolors; - wxInt32 minmaxdist, min_dist, max_dist, tdist; - wxInt32 mindist[MAXNUMCOLORS]; /* min distance to colormap entry i */ - - /* Compute true coordinates of update box's upper corner and center. - * Actually we compute the coordinates of the center of the upper-corner - * histogram cell, which are the upper bounds of the volume we care about. - * Note that since ">>" rounds down, the "center" values may be closer to - * min than to max; hence comparisons to them must be "<=", not "<". - */ - maxc0 = minc0 + ((1 << BOX_C0_SHIFT) - (1 << C0_SHIFT)); - centerc0 = (minc0 + maxc0) >> 1; - maxc1 = minc1 + ((1 << BOX_C1_SHIFT) - (1 << C1_SHIFT)); - centerc1 = (minc1 + maxc1) >> 1; - maxc2 = minc2 + ((1 << BOX_C2_SHIFT) - (1 << C2_SHIFT)); - centerc2 = (minc2 + maxc2) >> 1; - - /* For each color in colormap, find: - * 1. its minimum squared-distance to any point in the update box - * (zero if color is within update box); - * 2. its maximum squared-distance to any point in the update box. - * Both of these can be found by considering only the corners of the box. - * We save the minimum distance for each color in mindist[]; - * only the smallest maximum distance is of interest. - */ - minmaxdist = 0x7FFFFFFFL; - - for (i = 0; i < numcolors; i++) { - /* We compute the squared-c0-distance term, then add in the other two. */ - x = GETJSAMPLE(cinfo->colormap[0][i]); - if (x < minc0) { - tdist = (x - minc0) * C0_SCALE; - min_dist = tdist*tdist; - tdist = (x - maxc0) * C0_SCALE; - max_dist = tdist*tdist; - } else if (x > maxc0) { - tdist = (x - maxc0) * C0_SCALE; - min_dist = tdist*tdist; - tdist = (x - minc0) * C0_SCALE; - max_dist = tdist*tdist; - } else { - /* within cell range so no contribution to min_dist */ - min_dist = 0; - if (x <= centerc0) { - tdist = (x - maxc0) * C0_SCALE; - max_dist = tdist*tdist; - } else { - tdist = (x - minc0) * C0_SCALE; - max_dist = tdist*tdist; - } - } - - x = GETJSAMPLE(cinfo->colormap[1][i]); - if (x < minc1) { - tdist = (x - minc1) * C1_SCALE; - min_dist += tdist*tdist; - tdist = (x - maxc1) * C1_SCALE; - max_dist += tdist*tdist; - } else if (x > maxc1) { - tdist = (x - maxc1) * C1_SCALE; - min_dist += tdist*tdist; - tdist = (x - minc1) * C1_SCALE; - max_dist += tdist*tdist; - } else { - /* within cell range so no contribution to min_dist */ - if (x <= centerc1) { - tdist = (x - maxc1) * C1_SCALE; - max_dist += tdist*tdist; - } else { - tdist = (x - minc1) * C1_SCALE; - max_dist += tdist*tdist; - } - } - - x = GETJSAMPLE(cinfo->colormap[2][i]); - if (x < minc2) { - tdist = (x - minc2) * C2_SCALE; - min_dist += tdist*tdist; - tdist = (x - maxc2) * C2_SCALE; - max_dist += tdist*tdist; - } else if (x > maxc2) { - tdist = (x - maxc2) * C2_SCALE; - min_dist += tdist*tdist; - tdist = (x - minc2) * C2_SCALE; - max_dist += tdist*tdist; - } else { - /* within cell range so no contribution to min_dist */ - if (x <= centerc2) { - tdist = (x - maxc2) * C2_SCALE; - max_dist += tdist*tdist; - } else { - tdist = (x - minc2) * C2_SCALE; - max_dist += tdist*tdist; - } - } - - mindist[i] = min_dist; /* save away the results */ - if (max_dist < minmaxdist) - minmaxdist = max_dist; - } - - /* Now we know that no cell in the update box is more than minmaxdist - * away from some colormap entry. Therefore, only colors that are - * within minmaxdist of some part of the box need be considered. - */ - ncolors = 0; - for (i = 0; i < numcolors; i++) { - if (mindist[i] <= minmaxdist) - colorlist[ncolors++] = (JSAMPLE) i; - } - return ncolors; -} - - -static void -find_best_colors (j_decompress_ptr cinfo, int minc0, int minc1, int minc2, - int numcolors, JSAMPLE colorlist[], JSAMPLE bestcolor[]) -/* Find the closest colormap entry for each cell in the update box, - * given the list of candidate colors prepared by find_nearby_colors. - * Return the indexes of the closest entries in the bestcolor[] array. - * This routine uses Thomas' incremental distance calculation method to - * find the distance from a colormap entry to successive cells in the box. - */ -{ - int ic0, ic1, ic2; - int i, icolor; - wxInt32 * bptr; /* pointer into bestdist[] array */ - JSAMPLE * cptr; /* pointer into bestcolor[] array */ - wxInt32 dist0, dist1; /* initial distance values */ - wxInt32 dist2; /* current distance in inner loop */ - wxInt32 xx0, xx1; /* distance increments */ - wxInt32 xx2; - wxInt32 inc0, inc1, inc2; /* initial values for increments */ - /* This array holds the distance to the nearest-so-far color for each cell */ - wxInt32 bestdist[BOX_C0_ELEMS * BOX_C1_ELEMS * BOX_C2_ELEMS]; - - /* Initialize best-distance for each cell of the update box */ - bptr = bestdist; - for (i = BOX_C0_ELEMS*BOX_C1_ELEMS*BOX_C2_ELEMS-1; i >= 0; i--) - *bptr++ = 0x7FFFFFFFL; - - /* For each color selected by find_nearby_colors, - * compute its distance to the center of each cell in the box. - * If that's less than best-so-far, update best distance and color number. - */ - - /* Nominal steps between cell centers ("x" in Thomas article) */ -#define STEP_C0 ((1 << C0_SHIFT) * C0_SCALE) -#define STEP_C1 ((1 << C1_SHIFT) * C1_SCALE) -#define STEP_C2 ((1 << C2_SHIFT) * C2_SCALE) - - for (i = 0; i < numcolors; i++) { - icolor = GETJSAMPLE(colorlist[i]); - /* Compute (square of) distance from minc0/c1/c2 to this color */ - inc0 = (minc0 - GETJSAMPLE(cinfo->colormap[0][icolor])) * C0_SCALE; - dist0 = inc0*inc0; - inc1 = (minc1 - GETJSAMPLE(cinfo->colormap[1][icolor])) * C1_SCALE; - dist0 += inc1*inc1; - inc2 = (minc2 - GETJSAMPLE(cinfo->colormap[2][icolor])) * C2_SCALE; - dist0 += inc2*inc2; - /* Form the initial difference increments */ - inc0 = inc0 * (2 * STEP_C0) + STEP_C0 * STEP_C0; - inc1 = inc1 * (2 * STEP_C1) + STEP_C1 * STEP_C1; - inc2 = inc2 * (2 * STEP_C2) + STEP_C2 * STEP_C2; - /* Now loop over all cells in box, updating distance per Thomas method */ - bptr = bestdist; - cptr = bestcolor; - xx0 = inc0; - for (ic0 = BOX_C0_ELEMS-1; ic0 >= 0; ic0--) { - dist1 = dist0; - xx1 = inc1; - for (ic1 = BOX_C1_ELEMS-1; ic1 >= 0; ic1--) { - dist2 = dist1; - xx2 = inc2; - for (ic2 = BOX_C2_ELEMS-1; ic2 >= 0; ic2--) { - if (dist2 < *bptr) { - *bptr = dist2; - *cptr = (JSAMPLE) icolor; - } - dist2 += xx2; - xx2 += 2 * STEP_C2 * STEP_C2; - bptr++; - cptr++; - } - dist1 += xx1; - xx1 += 2 * STEP_C1 * STEP_C1; - } - dist0 += xx0; - xx0 += 2 * STEP_C0 * STEP_C0; - } - } -} - - -static void -fill_inverse_cmap (j_decompress_ptr cinfo, int c0, int c1, int c2) -/* Fill the inverse-colormap entries in the update box that contains */ -/* histogram cell c0/c1/c2. (Only that one cell MUST be filled, but */ -/* we can fill as many others as we wish.) */ -{ - my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize; - hist3d histogram = cquantize->histogram; - int minc0, minc1, minc2; /* lower left corner of update box */ - int ic0, ic1, ic2; - JSAMPLE * cptr; /* pointer into bestcolor[] array */ - histptr cachep; /* pointer into main cache array */ - /* This array lists the candidate colormap indexes. */ - JSAMPLE colorlist[MAXNUMCOLORS]; - int numcolors; /* number of candidate colors */ - /* This array holds the actually closest colormap index for each cell. */ - JSAMPLE bestcolor[BOX_C0_ELEMS * BOX_C1_ELEMS * BOX_C2_ELEMS]; - - /* Convert cell coordinates to update box ID */ - c0 >>= BOX_C0_LOG; - c1 >>= BOX_C1_LOG; - c2 >>= BOX_C2_LOG; - - /* Compute true coordinates of update box's origin corner. - * Actually we compute the coordinates of the center of the corner - * histogram cell, which are the lower bounds of the volume we care about. - */ - minc0 = (c0 << BOX_C0_SHIFT) + ((1 << C0_SHIFT) >> 1); - minc1 = (c1 << BOX_C1_SHIFT) + ((1 << C1_SHIFT) >> 1); - minc2 = (c2 << BOX_C2_SHIFT) + ((1 << C2_SHIFT) >> 1); - - /* Determine which colormap entries are close enough to be candidates - * for the nearest entry to some cell in the update box. - */ - numcolors = find_nearby_colors(cinfo, minc0, minc1, minc2, colorlist); - - /* Determine the actually nearest colors. */ - find_best_colors(cinfo, minc0, minc1, minc2, numcolors, colorlist, - bestcolor); - - /* Save the best color numbers (plus 1) in the main cache array */ - c0 <<= BOX_C0_LOG; /* convert ID back to base cell indexes */ - c1 <<= BOX_C1_LOG; - c2 <<= BOX_C2_LOG; - cptr = bestcolor; - for (ic0 = 0; ic0 < BOX_C0_ELEMS; ic0++) { - for (ic1 = 0; ic1 < BOX_C1_ELEMS; ic1++) { - cachep = & histogram[c0+ic0][c1+ic1][c2]; - for (ic2 = 0; ic2 < BOX_C2_ELEMS; ic2++) { - *cachep++ = (histcell) (GETJSAMPLE(*cptr++) + 1); - } - } - } -} - - -/* - * Map some rows of pixels to the output colormapped representation. - */ - -void -pass2_no_dither (j_decompress_ptr cinfo, - JSAMPARRAY input_buf, JSAMPARRAY output_buf, int num_rows) -/* This version performs no dithering */ -{ - my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize; - hist3d histogram = cquantize->histogram; - JSAMPROW inptr, outptr; - histptr cachep; - int c0, c1, c2; - int row; - JDIMENSION col; - JDIMENSION width = cinfo->output_width; - - for (row = 0; row < num_rows; row++) { - inptr = input_buf[row]; - outptr = output_buf[row]; - for (col = width; col > 0; col--) { - /* get pixel value and index into the cache */ - c0 = GETJSAMPLE(*inptr++) >> C0_SHIFT; - c1 = GETJSAMPLE(*inptr++) >> C1_SHIFT; - c2 = GETJSAMPLE(*inptr++) >> C2_SHIFT; - cachep = & histogram[c0][c1][c2]; - /* If we have not seen this color before, find nearest colormap entry */ - /* and update the cache */ - if (*cachep == 0) - fill_inverse_cmap(cinfo, c0,c1,c2); - /* Now emit the colormap index for this cell */ - *outptr++ = (JSAMPLE) (*cachep - 1); - } - } -} - - -void -pass2_fs_dither (j_decompress_ptr cinfo, - JSAMPARRAY input_buf, JSAMPARRAY output_buf, int num_rows) -/* This version performs Floyd-Steinberg dithering */ -{ - my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize; - hist3d histogram = cquantize->histogram; - LOCFSERROR cur0, cur1, cur2; /* current error or pixel value */ - LOCFSERROR belowerr0, belowerr1, belowerr2; /* error for pixel below cur */ - LOCFSERROR bpreverr0, bpreverr1, bpreverr2; /* error for below/prev col */ - FSERRPTR errorptr; /* => fserrors[] at column before current */ - JSAMPROW inptr; /* => current input pixel */ - JSAMPROW outptr; /* => current output pixel */ - histptr cachep; - int dir; /* +1 or -1 depending on direction */ - int dir3; /* 3*dir, for advancing inptr & errorptr */ - int row; - JDIMENSION col; - JDIMENSION width = cinfo->output_width; - JSAMPLE *range_limit = cinfo->sample_range_limit; - int *error_limit = cquantize->error_limiter; - JSAMPROW colormap0 = cinfo->colormap[0]; - JSAMPROW colormap1 = cinfo->colormap[1]; - JSAMPROW colormap2 = cinfo->colormap[2]; - - - for (row = 0; row < num_rows; row++) { - inptr = input_buf[row]; - outptr = output_buf[row]; - if (cquantize->on_odd_row) { - /* work right to left in this row */ - inptr += (width-1) * 3; /* so point to rightmost pixel */ - outptr += width-1; - dir = -1; - dir3 = -3; - errorptr = cquantize->fserrors + (width+1)*3; /* => entry after last column */ - cquantize->on_odd_row = false; /* flip for next time */ - } else { - /* work left to right in this row */ - dir = 1; - dir3 = 3; - errorptr = cquantize->fserrors; /* => entry before first real column */ - cquantize->on_odd_row = true; /* flip for next time */ - } - /* Preset error values: no error propagated to first pixel from left */ - cur0 = cur1 = cur2 = 0; - /* and no error propagated to row below yet */ - belowerr0 = belowerr1 = belowerr2 = 0; - bpreverr0 = bpreverr1 = bpreverr2 = 0; - - for (col = width; col > 0; col--) { - /* curN holds the error propagated from the previous pixel on the - * current line. Add the error propagated from the previous line - * to form the complete error correction term for this pixel, and - * round the error term (which is expressed * 16) to an integer. - * RIGHT_SHIFT rounds towards minus infinity, so adding 8 is correct - * for either sign of the error value. - * Note: errorptr points to *previous* column's array entry. - */ - cur0 = RIGHT_SHIFT(cur0 + errorptr[dir3+0] + 8, 4); - cur1 = RIGHT_SHIFT(cur1 + errorptr[dir3+1] + 8, 4); - cur2 = RIGHT_SHIFT(cur2 + errorptr[dir3+2] + 8, 4); - /* Limit the error using transfer function set by init_error_limit. - * See comments with init_error_limit for rationale. - */ - cur0 = error_limit[cur0]; - cur1 = error_limit[cur1]; - cur2 = error_limit[cur2]; - /* Form pixel value + error, and range-limit to 0..MAXJSAMPLE. - * The maximum error is +- MAXJSAMPLE (or less with error limiting); - * this sets the required size of the range_limit array. - */ - cur0 += GETJSAMPLE(inptr[0]); - cur1 += GETJSAMPLE(inptr[1]); - cur2 += GETJSAMPLE(inptr[2]); - cur0 = GETJSAMPLE(range_limit[cur0]); - cur1 = GETJSAMPLE(range_limit[cur1]); - cur2 = GETJSAMPLE(range_limit[cur2]); - /* Index into the cache with adjusted pixel value */ - cachep = & histogram[cur0>>C0_SHIFT][cur1>>C1_SHIFT][cur2>>C2_SHIFT]; - /* If we have not seen this color before, find nearest colormap */ - /* entry and update the cache */ - if (*cachep == 0) - fill_inverse_cmap(cinfo, cur0>>C0_SHIFT,cur1>>C1_SHIFT,cur2>>C2_SHIFT); - /* Now emit the colormap index for this cell */ - { int pixcode = *cachep - 1; - *outptr = (JSAMPLE) pixcode; - /* Compute representation error for this pixel */ - cur0 -= GETJSAMPLE(colormap0[pixcode]); - cur1 -= GETJSAMPLE(colormap1[pixcode]); - cur2 -= GETJSAMPLE(colormap2[pixcode]); - } - /* Compute error fractions to be propagated to adjacent pixels. - * Add these into the running sums, and simultaneously shift the - * next-line error sums left by 1 column. - */ - { LOCFSERROR bnexterr, delta; - - bnexterr = cur0; /* Process component 0 */ - delta = cur0 * 2; - cur0 += delta; /* form error * 3 */ - errorptr[0] = (FSERROR) (bpreverr0 + cur0); - cur0 += delta; /* form error * 5 */ - bpreverr0 = belowerr0 + cur0; - belowerr0 = bnexterr; - cur0 += delta; /* form error * 7 */ - bnexterr = cur1; /* Process component 1 */ - delta = cur1 * 2; - cur1 += delta; /* form error * 3 */ - errorptr[1] = (FSERROR) (bpreverr1 + cur1); - cur1 += delta; /* form error * 5 */ - bpreverr1 = belowerr1 + cur1; - belowerr1 = bnexterr; - cur1 += delta; /* form error * 7 */ - bnexterr = cur2; /* Process component 2 */ - delta = cur2 * 2; - cur2 += delta; /* form error * 3 */ - errorptr[2] = (FSERROR) (bpreverr2 + cur2); - cur2 += delta; /* form error * 5 */ - bpreverr2 = belowerr2 + cur2; - belowerr2 = bnexterr; - cur2 += delta; /* form error * 7 */ - } - /* At this point curN contains the 7/16 error value to be propagated - * to the next pixel on the current line, and all the errors for the - * next line have been shifted over. We are therefore ready to move on. - */ - inptr += dir3; /* Advance pixel pointers to next column */ - outptr += dir; - errorptr += dir3; /* advance errorptr to current column */ - } - /* Post-loop cleanup: we must unload the final error values into the - * final fserrors[] entry. Note we need not unload belowerrN because - * it is for the dummy column before or after the actual array. - */ - errorptr[0] = (FSERROR) bpreverr0; /* unload prev errs into array */ - errorptr[1] = (FSERROR) bpreverr1; - errorptr[2] = (FSERROR) bpreverr2; - } -} - - -/* - * Initialize the error-limiting transfer function (lookup table). - * The raw F-S error computation can potentially compute error values of up to - * +- MAXJSAMPLE. But we want the maximum correction applied to a pixel to be - * much less, otherwise obviously wrong pixels will be created. (Typical - * effects include weird fringes at color-area boundaries, isolated bright - * pixels in a dark area, etc.) The standard advice for avoiding this problem - * is to ensure that the "corners" of the color cube are allocated as output - * colors; then repeated errors in the same direction cannot cause cascading - * error buildup. However, that only prevents the error from getting - * completely out of hand; Aaron Giles reports that error limiting improves - * the results even with corner colors allocated. - * A simple clamping of the error values to about +- MAXJSAMPLE/8 works pretty - * well, but the smoother transfer function used below is even better. Thanks - * to Aaron Giles for this idea. - */ - -static void -init_error_limit (j_decompress_ptr cinfo) -/* Allocate and fill in the error_limiter table */ -{ - my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize; - int * table; - int in, out; - - table = (int *) malloc((MAXJSAMPLE*2+1) * sizeof(int)); - table += MAXJSAMPLE; /* so can index -MAXJSAMPLE .. +MAXJSAMPLE */ - cquantize->error_limiter = table; - -#define STEPSIZE ((MAXJSAMPLE+1)/16) - /* Map errors 1:1 up to +- MAXJSAMPLE/16 */ - out = 0; - for (in = 0; in < STEPSIZE; in++, out++) { - table[in] = out; table[-in] = -out; - } - /* Map errors 1:2 up to +- 3*MAXJSAMPLE/16 */ - for (; in < STEPSIZE*3; in++, out += (in&1) ? 0 : 1) { - table[in] = out; table[-in] = -out; - } - /* Clamp the rest to final out value (which is (MAXJSAMPLE+1)/8) */ - for (; in <= MAXJSAMPLE; in++) { - table[in] = out; table[-in] = -out; - } -#undef STEPSIZE -} - - -/* - * Finish up at the end of each pass. - */ - -void -finish_pass1 (j_decompress_ptr cinfo) -{ - my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize; - - /* Select the representative colors and fill in cinfo->colormap */ - cinfo->colormap = cquantize->sv_colormap; - select_colors(cinfo, cquantize->desired); - /* Force next pass to zero the color index table */ - cquantize->needs_zeroed = true; -} - - -void -finish_pass2 (j_decompress_ptr WXUNUSED(cinfo)) -{ - /* no work */ -} - - -/* - * Initialize for each processing pass. - */ - -void -start_pass_2_quant (j_decompress_ptr cinfo, bool is_pre_scan) -{ - my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize; - hist3d histogram = cquantize->histogram; - - if (is_pre_scan) { - /* Set up method pointers */ - cquantize->pub.color_quantize = prescan_quantize; - cquantize->pub.finish_pass = finish_pass1; - cquantize->needs_zeroed = true; /* Always zero histogram */ - } else { - /* Set up method pointers */ - cquantize->pub.color_quantize = pass2_fs_dither; - cquantize->pub.finish_pass = finish_pass2; - - { - size_t arraysize = (size_t) ((cinfo->output_width + 2) * - (3 * sizeof(FSERROR))); - /* Allocate Floyd-Steinberg workspace if we didn't already. */ - if (cquantize->fserrors == NULL) - cquantize->fserrors = (wxInt16*) malloc(arraysize); - /* Initialize the propagated errors to zero. */ - memset((void *) cquantize->fserrors, 0, arraysize); - /* Make the error-limit table if we didn't already. */ - if (cquantize->error_limiter == NULL) - init_error_limit(cinfo); - cquantize->on_odd_row = false; - } - - } - /* Zero the histogram or inverse color map, if necessary */ - if (cquantize->needs_zeroed) { - for (int i = 0; i < HIST_C0_ELEMS; i++) { - memset((void *) histogram[i], 0, - HIST_C1_ELEMS*HIST_C2_ELEMS * sizeof(histcell)); - } - cquantize->needs_zeroed = false; - } -} - - -/* - * Switch to a new external colormap between output passes. - */ - -void -new_color_map_2_quant (j_decompress_ptr cinfo) -{ - my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize; - - /* Reset the inverse color map */ - cquantize->needs_zeroed = true; -} - - -/* - * Module initialization routine for 2-pass color quantization. - */ - -void -jinit_2pass_quantizer (j_decompress_ptr cinfo) -{ - my_cquantize_ptr cquantize; - int i; - - cquantize = (my_cquantize_ptr) malloc(sizeof(my_cquantizer)); - cinfo->cquantize = (jpeg_color_quantizer *) cquantize; - cquantize->pub.start_pass = start_pass_2_quant; - cquantize->pub.new_color_map = new_color_map_2_quant; - cquantize->fserrors = NULL; /* flag optional arrays not allocated */ - cquantize->error_limiter = NULL; - - - /* Allocate the histogram/inverse colormap storage */ - cquantize->histogram = (hist3d) malloc(HIST_C0_ELEMS * sizeof(hist2d)); - for (i = 0; i < HIST_C0_ELEMS; i++) { - cquantize->histogram[i] = (hist2d) malloc(HIST_C1_ELEMS*HIST_C2_ELEMS * sizeof(histcell)); - } - cquantize->needs_zeroed = true; /* histogram is garbage now */ - - /* Allocate storage for the completed colormap, if required. - * We do this now since it is storage and may affect - * the memory manager's space calculations. - */ - { - /* Make sure color count is acceptable */ - int desired = cinfo->desired_number_of_colors; - - cquantize->sv_colormap = (JSAMPARRAY) malloc(sizeof(JSAMPROW) * 3); - cquantize->sv_colormap[0] = (JSAMPROW) malloc(sizeof(JSAMPLE) * desired); - cquantize->sv_colormap[1] = (JSAMPROW) malloc(sizeof(JSAMPLE) * desired); - cquantize->sv_colormap[2] = (JSAMPROW) malloc(sizeof(JSAMPLE) * desired); - - cquantize->desired = desired; - } - - /* Allocate Floyd-Steinberg workspace if necessary. - * This isn't really needed until pass 2, but again it is storage. - * Although we will cope with a later change in dither_mode, - * we do not promise to honor max_memory_to_use if dither_mode changes. - */ - { - cquantize->fserrors = (FSERRPTR) malloc( - (size_t) ((cinfo->output_width + 2) * (3 * sizeof(FSERROR)))); - /* Might as well create the error-limiting table too. */ - init_error_limit(cinfo); - } -} - - - - - - - - - - -void -prepare_range_limit_table (j_decompress_ptr cinfo) -/* Allocate and fill in the sample_range_limit table */ -{ - JSAMPLE * table; - int i; - - table = (JSAMPLE *) malloc((5 * (MAXJSAMPLE+1) + CENTERJSAMPLE) * sizeof(JSAMPLE)); - cinfo->srl_orig = table; - table += (MAXJSAMPLE+1); /* allow negative subscripts of simple table */ - cinfo->sample_range_limit = table; - /* First segment of "simple" table: limit[x] = 0 for x < 0 */ - memset(table - (MAXJSAMPLE+1), 0, (MAXJSAMPLE+1) * sizeof(JSAMPLE)); - /* Main part of "simple" table: limit[x] = x */ - for (i = 0; i <= MAXJSAMPLE; i++) - table[i] = (JSAMPLE) i; - table += CENTERJSAMPLE; /* Point to where post-IDCT table starts */ - /* End of simple table, rest of first half of post-IDCT table */ - for (i = CENTERJSAMPLE; i < 2*(MAXJSAMPLE+1); i++) - table[i] = MAXJSAMPLE; - /* Second half of post-IDCT table */ - memset(table + (2 * (MAXJSAMPLE+1)), 0, - (2 * (MAXJSAMPLE+1) - CENTERJSAMPLE) * sizeof(JSAMPLE)); - memcpy(table + (4 * (MAXJSAMPLE+1) - CENTERJSAMPLE), - cinfo->sample_range_limit, CENTERJSAMPLE * sizeof(JSAMPLE)); -} - - - - -/* - * wxQuantize - */ - -wxIMPLEMENT_DYNAMIC_CLASS(wxQuantize, wxObject); - -void wxQuantize::DoQuantize(unsigned w, unsigned h, unsigned char **in_rows, unsigned char **out_rows, - unsigned char *palette, int desiredNoColours) -{ - j_decompress dec; - my_cquantize_ptr cquantize; - - dec.output_width = w; - dec.desired_number_of_colors = desiredNoColours; - prepare_range_limit_table(&dec); - jinit_2pass_quantizer(&dec); - cquantize = (my_cquantize_ptr) dec.cquantize; - - - cquantize->pub.start_pass(&dec, true); - cquantize->pub.color_quantize(&dec, in_rows, out_rows, h); - cquantize->pub.finish_pass(&dec); - - cquantize->pub.start_pass(&dec, false); - cquantize->pub.color_quantize(&dec, in_rows, out_rows, h); - cquantize->pub.finish_pass(&dec); - - - for (int i = 0; i < dec.desired_number_of_colors; i++) { - palette[3 * i + 0] = dec.colormap[0][i]; - palette[3 * i + 1] = dec.colormap[1][i]; - palette[3 * i + 2] = dec.colormap[2][i]; - } - - for (int ii = 0; ii < HIST_C0_ELEMS; ii++) free(cquantize->histogram[ii]); - free(cquantize->histogram); - free(dec.colormap[0]); - free(dec.colormap[1]); - free(dec.colormap[2]); - free(dec.colormap); - free(dec.srl_orig); - - //free(cquantize->error_limiter); - free((void*)(cquantize->error_limiter - MAXJSAMPLE)); // To reverse what was done to it - - free(cquantize->fserrors); - free(cquantize); -} - -// TODO: somehow make use of the Windows system colours, rather than ignoring them for the -// purposes of quantization. - -bool wxQuantize::Quantize(const wxImage& src, wxImage& dest, - wxPalette** pPalette, - int desiredNoColours, - unsigned char** eightBitData, - int flags) - -{ - int i; - - int windowsSystemColourCount = 20; - - int paletteShift = 0; - - // Shift the palette up by the number of Windows system colours, - // if necessary - if (flags & wxQUANTIZE_INCLUDE_WINDOWS_COLOURS) - paletteShift = windowsSystemColourCount; - - // Make room for the Windows system colours -#ifdef __WXMSW__ - if ((flags & wxQUANTIZE_INCLUDE_WINDOWS_COLOURS) && (desiredNoColours > (256 - windowsSystemColourCount))) - desiredNoColours = 256 - windowsSystemColourCount; -#endif - - // create rows info: - int h = src.GetHeight(); - int w = src.GetWidth(); - unsigned char **rows = new unsigned char *[h]; - unsigned char *imgdt = src.GetData(); - for (i = 0; i < h; i++) - rows[i] = imgdt + 3/*RGB*/ * w * i; - - unsigned char palette[3*256]; - - // This is the image as represented by palette indexes. - unsigned char *data8bit = new unsigned char[w * h]; - unsigned char **outrows = new unsigned char *[h]; - for (i = 0; i < h; i++) - outrows[i] = data8bit + w * i; - - //RGB->palette - DoQuantize(w, h, rows, outrows, palette, desiredNoColours); - - delete[] rows; - delete[] outrows; - - // palette->RGB(max.256) - - if (flags & wxQUANTIZE_FILL_DESTINATION_IMAGE) - { - if (!dest.IsOk()) - dest.Create(w, h); - - imgdt = dest.GetData(); - for (i = 0; i < w * h; i++) - { - unsigned char c = data8bit[i]; - imgdt[3 * i + 0/*R*/] = palette[3 * c + 0]; - imgdt[3 * i + 1/*G*/] = palette[3 * c + 1]; - imgdt[3 * i + 2/*B*/] = palette[3 * c + 2]; - } - } - - if (eightBitData && (flags & wxQUANTIZE_RETURN_8BIT_DATA)) - { -#ifdef __WXMSW__ - if (flags & wxQUANTIZE_INCLUDE_WINDOWS_COLOURS) - { - // We need to shift the palette entries up - // to make room for the Windows system colours. - for (i = 0; i < w * h; i++) - data8bit[i] = (unsigned char)(data8bit[i] + paletteShift); - } -#endif - *eightBitData = data8bit; - } - else - delete[] data8bit; - -#if wxUSE_PALETTE - // Make a wxWidgets palette - if (pPalette) - { - unsigned char* r = new unsigned char[256]; - unsigned char* g = new unsigned char[256]; - unsigned char* b = new unsigned char[256]; - -#ifdef __WXMSW__ - // Fill the first 20 entries with Windows system colours - if (flags & wxQUANTIZE_INCLUDE_WINDOWS_COLOURS) - { - HDC hDC = ::GetDC(NULL); - PALETTEENTRY* entries = new PALETTEENTRY[windowsSystemColourCount]; - ::GetSystemPaletteEntries(hDC, 0, windowsSystemColourCount, entries); - ::ReleaseDC(NULL, hDC); - - for (i = 0; i < windowsSystemColourCount; i++) - { - r[i] = entries[i].peRed; - g[i] = entries[i].peGreen; - b[i] = entries[i].peBlue; - } - delete[] entries; - } -#endif - - for (i = 0; i < desiredNoColours; i++) - { - r[i+paletteShift] = palette[i*3 + 0]; - g[i+paletteShift] = palette[i*3 + 1]; - b[i+paletteShift] = palette[i*3 + 2]; - } - - // Blank out any remaining palette entries - for (i = desiredNoColours+paletteShift; i < 256; i++) - { - r[i] = 0; - g[i] = 0; - b[i] = 0; - } - *pPalette = new wxPalette(256, r, g, b); - delete[] r; - delete[] g; - delete[] b; - } -#else // !wxUSE_PALETTE - wxUnusedVar(pPalette); -#endif // wxUSE_PALETTE/!wxUSE_PALETTE - - return true; -} - -// This version sets a palette in the destination image so you don't -// have to manage it yourself. - -bool wxQuantize::Quantize(const wxImage& src, - wxImage& dest, - int desiredNoColours, - unsigned char** eightBitData, - int flags) -{ - wxPalette* palette = NULL; - if ( !Quantize(src, dest, & palette, desiredNoColours, eightBitData, flags) ) - return false; - -#if wxUSE_PALETTE - if (palette) - { - dest.SetPalette(* palette); - delete palette; - } -#endif // wxUSE_PALETTE - - return true; -} - -#endif - // wxUSE_IMAGE diff --git a/Externals/wxWidgets3/src/common/radiobtncmn.cpp b/Externals/wxWidgets3/src/common/radiobtncmn.cpp deleted file mode 100644 index dc2bd09240..0000000000 --- a/Externals/wxWidgets3/src/common/radiobtncmn.cpp +++ /dev/null @@ -1,95 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/radiobtncmn.cpp -// Purpose: wxRadioButton common code -// Author: Julian Smart -// Modified by: -// Created: 04/01/98 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_RADIOBTN - -#include "wx/radiobut.h" - -#ifndef WX_PRECOMP - #include "wx/settings.h" - #include "wx/dcscreen.h" -#endif - -extern WXDLLEXPORT_DATA(const char) wxRadioButtonNameStr[] = "radioButton"; -extern WXDLLEXPORT_DATA(const char) wxBitmapRadioButtonNameStr[] = "radioButton"; - -// ---------------------------------------------------------------------------- -// XTI -// ---------------------------------------------------------------------------- - -wxDEFINE_FLAGS( wxRadioButtonStyle ) -wxBEGIN_FLAGS( wxRadioButtonStyle ) - // new style border flags, we put them first to - // use them for streaming out - wxFLAGS_MEMBER(wxBORDER_SIMPLE) - wxFLAGS_MEMBER(wxBORDER_SUNKEN) - wxFLAGS_MEMBER(wxBORDER_DOUBLE) - wxFLAGS_MEMBER(wxBORDER_RAISED) - wxFLAGS_MEMBER(wxBORDER_STATIC) - wxFLAGS_MEMBER(wxBORDER_NONE) - - // old style border flags - wxFLAGS_MEMBER(wxSIMPLE_BORDER) - wxFLAGS_MEMBER(wxSUNKEN_BORDER) - wxFLAGS_MEMBER(wxDOUBLE_BORDER) - wxFLAGS_MEMBER(wxRAISED_BORDER) - wxFLAGS_MEMBER(wxSTATIC_BORDER) - wxFLAGS_MEMBER(wxBORDER) - - // standard window styles - wxFLAGS_MEMBER(wxTAB_TRAVERSAL) - wxFLAGS_MEMBER(wxCLIP_CHILDREN) - wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) - wxFLAGS_MEMBER(wxWANTS_CHARS) - wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE) - wxFLAGS_MEMBER(wxALWAYS_SHOW_SB ) - wxFLAGS_MEMBER(wxVSCROLL) - wxFLAGS_MEMBER(wxHSCROLL) - - wxFLAGS_MEMBER(wxRB_GROUP) -wxEND_FLAGS( wxRadioButtonStyle ) - -wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxRadioButton, wxControl, "wx/radiobut.h"); - -wxBEGIN_PROPERTIES_TABLE(wxRadioButton) - wxEVENT_PROPERTY( Click, wxEVT_RADIOBUTTON, wxCommandEvent ) - wxPROPERTY( Font, wxFont, SetFont, GetFont , wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \ - wxT("Helpstring"), wxT("group")) - wxPROPERTY( Label,wxString, SetLabel, GetLabel, wxString(), 0 /*flags*/, \ - wxT("Helpstring"), wxT("group") ) - wxPROPERTY( Value,bool, SetValue, GetValue, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \ - wxT("Helpstring"), wxT("group") ) - wxPROPERTY_FLAGS( WindowStyle, wxRadioButtonStyle, long, SetWindowStyleFlag, \ - GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \ - wxT("Helpstring"), wxT("group")) // style -wxEND_PROPERTIES_TABLE() - -wxEMPTY_HANDLERS_TABLE(wxRadioButton) - -wxCONSTRUCTOR_6( wxRadioButton, wxWindow*, Parent, wxWindowID, Id, \ - wxString, Label, wxPoint, Position, wxSize, Size, long, WindowStyle ) - - -#endif // wxUSE_RADIOBTN diff --git a/Externals/wxWidgets3/src/common/radiocmn.cpp b/Externals/wxWidgets3/src/common/radiocmn.cpp deleted file mode 100644 index b25ac61036..0000000000 --- a/Externals/wxWidgets3/src/common/radiocmn.cpp +++ /dev/null @@ -1,372 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/radiocmn.cpp -// Purpose: wxRadioBox methods common to all ports -// Author: Vadim Zeitlin -// Modified by: -// Created: 03.06.01 -// Copyright: (c) 2001 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_RADIOBOX - -#ifndef WX_PRECOMP - #include "wx/radiobox.h" -#endif //WX_PRECOMP - -#if wxUSE_TOOLTIPS - #include "wx/tooltip.h" -#endif // wxUSE_TOOLTIPS - -#if wxUSE_HELP - #include "wx/cshelp.h" -#endif - -extern WXDLLEXPORT_DATA(const char) wxRadioBoxNameStr[] = "radioBox"; - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// XTI -// ---------------------------------------------------------------------------- - -// TODO: wxCONSTRUCTOR -#if 0 // wxUSE_EXTENDED_RTTI -wxDEFINE_FLAGS( wxRadioBoxStyle ) - -wxBEGIN_FLAGS( wxRadioBoxStyle ) -// new style border flags, we put them first to -// use them for streaming out -wxFLAGS_MEMBER(wxBORDER_SIMPLE) -wxFLAGS_MEMBER(wxBORDER_SUNKEN) -wxFLAGS_MEMBER(wxBORDER_DOUBLE) -wxFLAGS_MEMBER(wxBORDER_RAISED) -wxFLAGS_MEMBER(wxBORDER_STATIC) -wxFLAGS_MEMBER(wxBORDER_NONE) - -// old style border flags -wxFLAGS_MEMBER(wxSIMPLE_BORDER) -wxFLAGS_MEMBER(wxSUNKEN_BORDER) -wxFLAGS_MEMBER(wxDOUBLE_BORDER) -wxFLAGS_MEMBER(wxRAISED_BORDER) -wxFLAGS_MEMBER(wxSTATIC_BORDER) -wxFLAGS_MEMBER(wxBORDER) - -// standard window styles -wxFLAGS_MEMBER(wxTAB_TRAVERSAL) -wxFLAGS_MEMBER(wxCLIP_CHILDREN) -wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) -wxFLAGS_MEMBER(wxWANTS_CHARS) -wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE) -wxFLAGS_MEMBER(wxALWAYS_SHOW_SB ) -wxFLAGS_MEMBER(wxVSCROLL) -wxFLAGS_MEMBER(wxHSCROLL) - -wxFLAGS_MEMBER(wxRA_SPECIFY_COLS) -wxFLAGS_MEMBER(wxRA_HORIZONTAL) -wxFLAGS_MEMBER(wxRA_SPECIFY_ROWS) -wxFLAGS_MEMBER(wxRA_VERTICAL) - -wxEND_FLAGS( wxRadioBoxStyle ) - -wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxRadioBox, wxControl, "wx/radiobox.h"); - -wxBEGIN_PROPERTIES_TABLE(wxRadioBox) -wxEVENT_PROPERTY( Select , wxEVT_RADIOBOX , wxCommandEvent ) -wxPROPERTY_FLAGS( WindowStyle , wxRadioBoxStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style -wxEND_PROPERTIES_TABLE() - -/* - selection - content - label - dimension - item - */ - -#endif - - -// ---------------------------------------------------------------------------- -// wxRadioBoxBase -// ---------------------------------------------------------------------------- - -void wxRadioBoxBase::SetMajorDim(unsigned int majorDim, long style) -{ - wxCHECK_RET( majorDim != 0, wxT("major radiobox dimension can't be 0") ); - - m_majorDim = majorDim; - - int minorDim = (GetCount() + m_majorDim - 1) / m_majorDim; - - if ( style & wxRA_SPECIFY_COLS ) - { - m_numCols = majorDim; - m_numRows = minorDim; - } - else // wxRA_SPECIFY_ROWS - { - m_numCols = minorDim; - m_numRows = majorDim; - } -} - -int wxRadioBoxBase::GetNextItem(int item, wxDirection dir, long style) const -{ - const int itemStart = item; - - int count = GetCount(), - numCols = GetColumnCount(), - numRows = GetRowCount(); - - bool horz = (style & wxRA_SPECIFY_COLS) != 0; - - do - { - switch ( dir ) - { - case wxUP: - if ( horz ) - { - item -= numCols; - } - else // vertical layout - { - if ( !item-- ) - item = count - 1; - } - break; - - case wxLEFT: - if ( horz ) - { - if ( !item-- ) - item = count - 1; - } - else // vertical layout - { - item -= numRows; - } - break; - - case wxDOWN: - if ( horz ) - { - item += numCols; - } - else // vertical layout - { - if ( ++item == count ) - item = 0; - } - break; - - case wxRIGHT: - if ( horz ) - { - if ( ++item == count ) - item = 0; - } - else // vertical layout - { - item += numRows; - } - break; - - default: - wxFAIL_MSG( wxT("unexpected wxDirection value") ); - return wxNOT_FOUND; - } - - // ensure that the item is in range [0..count) - if ( item < 0 ) - { - // first map the item to the one in the same column but in the last - // row - item += count; - - // now there are 2 cases: either it is the first item of the last - // row in which case we need to wrap again and get to the last item - // or we can just go to the previous item - if ( item % (horz ? numCols : numRows) ) - item--; - else - item = count - 1; - } - else if ( item >= count ) - { - // same logic as above - item -= count; - - // ... except that we need to check if this is not the last item, - // not the first one - if ( (item + 1) % (horz ? numCols : numRows) ) - item++; - else - item = 0; - } - - wxASSERT_MSG( item < count && item >= 0, - wxT("logic error in wxRadioBox::GetNextItem()") ); - } - // we shouldn't select the non-active items, continue looking for a - // visible and shown one unless we came back to the item we started from in - // which case bail out to avoid infinite loop - while ( !(IsItemShown(item) && IsItemEnabled(item)) && item != itemStart ); - - return item; -} - -#if wxUSE_TOOLTIPS - -void wxRadioBoxBase::SetItemToolTip(unsigned int item, const wxString& text) -{ - wxASSERT_MSG( item < GetCount(), wxT("Invalid item index") ); - - // extend the array to have entries for all our items on first use - if ( !m_itemsTooltips ) - { - m_itemsTooltips = new wxToolTipArray; - m_itemsTooltips->resize(GetCount()); - } - - wxToolTip *tooltip = (*m_itemsTooltips)[item]; - - bool changed = true; - if ( text.empty() ) - { - if ( tooltip ) - { - // delete the tooltip - wxDELETE(tooltip); - } - else // nothing to do - { - changed = false; - } - } - else // non empty tooltip text - { - if ( tooltip ) - { - // just change the existing tooltip text, don't change the tooltip - tooltip->SetTip(text); - changed = false; - } - else // no tooltip yet - { - // create the new one - tooltip = new wxToolTip(text); - } - } - - if ( changed ) - { - (*m_itemsTooltips)[item] = tooltip; - DoSetItemToolTip(item, tooltip); - } -} - -void -wxRadioBoxBase::DoSetItemToolTip(unsigned int WXUNUSED(item), - wxToolTip * WXUNUSED(tooltip)) -{ - // per-item tooltips not implemented by default -} - -#endif // wxUSE_TOOLTIPS - -wxRadioBoxBase::~wxRadioBoxBase() -{ -#if wxUSE_TOOLTIPS - if ( m_itemsTooltips ) - { - const size_t n = m_itemsTooltips->size(); - for ( size_t i = 0; i < n; i++ ) - delete (*m_itemsTooltips)[i]; - - delete m_itemsTooltips; - } -#endif // wxUSE_TOOLTIPS -} - -#if wxUSE_HELP - -// set helptext for a particular item -void wxRadioBoxBase::SetItemHelpText(unsigned int n, const wxString& helpText) -{ - wxCHECK_RET( n < GetCount(), wxT("Invalid item index") ); - - if ( m_itemsHelpTexts.empty() ) - { - // once-only initialization of the array: reserve space for all items - m_itemsHelpTexts.Add(wxEmptyString, GetCount()); - } - - m_itemsHelpTexts[n] = helpText; -} - -// retrieve helptext for a particular item -wxString wxRadioBoxBase::GetItemHelpText( unsigned int n ) const -{ - wxCHECK_MSG( n < GetCount(), wxEmptyString, wxT("Invalid item index") ); - - return m_itemsHelpTexts.empty() ? wxString() : m_itemsHelpTexts[n]; -} - -// return help text for the item for which wxEVT_HELP was generated. -wxString wxRadioBoxBase::DoGetHelpTextAtPoint(const wxWindow *derived, - const wxPoint& pt, - wxHelpEvent::Origin origin) const -{ - int item; - switch ( origin ) - { - case wxHelpEvent::Origin_HelpButton: - item = GetItemFromPoint(pt); - break; - - case wxHelpEvent::Origin_Keyboard: - item = GetSelection(); - break; - - default: - wxFAIL_MSG( "unknown help even origin" ); - wxFALLTHROUGH; - - case wxHelpEvent::Origin_Unknown: - // this value is used when we're called from GetHelpText() for the - // radio box itself, so don't return item-specific text in this case - item = wxNOT_FOUND; - } - - if ( item != wxNOT_FOUND ) - { - wxString text = GetItemHelpText(static_cast(item)); - if( !text.empty() ) - return text; - } - - return derived->wxWindowBase::GetHelpTextAtPoint(pt, origin); -} - -#endif // wxUSE_HELP - -#endif // wxUSE_RADIOBOX diff --git a/Externals/wxWidgets3/src/common/rearrangectrl.cpp b/Externals/wxWidgets3/src/common/rearrangectrl.cpp deleted file mode 100644 index 98cddb55fc..0000000000 --- a/Externals/wxWidgets3/src/common/rearrangectrl.cpp +++ /dev/null @@ -1,351 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/rearrangectrl.cpp -// Purpose: implementation of classes in wx/rearrangectrl.h -// Author: Vadim Zeitlin -// Created: 2008-12-15 -// Copyright: (c) 2008 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// for compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_REARRANGECTRL - -#ifndef WX_PRECOMP - #include "wx/button.h" - #include "wx/stattext.h" - #include "wx/sizer.h" -#endif // WX_PRECOMP - -#include "wx/rearrangectrl.h" - -// ============================================================================ -// wxRearrangeList implementation -// ============================================================================ - -extern -WXDLLIMPEXP_DATA_CORE(const char) wxRearrangeListNameStr[] = "wxRearrangeList"; - -wxBEGIN_EVENT_TABLE(wxRearrangeList, wxCheckListBox) - EVT_CHECKLISTBOX(wxID_ANY, wxRearrangeList::OnCheck) -wxEND_EVENT_TABLE() - -bool wxRearrangeList::Create(wxWindow *parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - const wxArrayInt& order, - const wxArrayString& items, - long style, - const wxValidator& validator, - const wxString& name) -{ - // construct the array of items in the order in which they should appear in - // the control - const size_t count = items.size(); - wxCHECK_MSG( order.size() == count, false, "arrays not in sync" ); - - wxArrayString itemsInOrder; - itemsInOrder.reserve(count); - size_t n; - for ( n = 0; n < count; n++ ) - { - int idx = order[n]; - if ( idx < 0 ) - idx = -idx - 1; - itemsInOrder.push_back(items[idx]); - } - - // do create the real control - if ( !wxCheckListBox::Create(parent, id, pos, size, itemsInOrder, - style, validator, name) ) - return false; - - // and now check all the items which should be initially checked - for ( n = 0; n < count; n++ ) - { - if ( order[n] >= 0 ) - { - // Be careful to call the base class version here and not our own - // which would also update m_order itself. - wxCheckListBox::Check(n); - } - } - - m_order = order; - - return true; -} - -bool wxRearrangeList::CanMoveCurrentUp() const -{ - const int sel = GetSelection(); - return sel != wxNOT_FOUND && sel != 0; -} - -bool wxRearrangeList::CanMoveCurrentDown() const -{ - const int sel = GetSelection(); - return sel != wxNOT_FOUND && static_cast(sel) != GetCount() - 1; -} - -bool wxRearrangeList::MoveCurrentUp() -{ - const int sel = GetSelection(); - if ( sel == wxNOT_FOUND || sel == 0 ) - return false; - - Swap(sel, sel - 1); - SetSelection(sel - 1); - - return true; -} - -bool wxRearrangeList::MoveCurrentDown() -{ - const int sel = GetSelection(); - if ( sel == wxNOT_FOUND || static_cast(sel) == GetCount() - 1 ) - return false; - - Swap(sel, sel + 1); - SetSelection(sel + 1); - - return true; -} - -void wxRearrangeList::Swap(int pos1, int pos2) -{ - // update the internally stored order - wxSwap(m_order[pos1], m_order[pos2]); - - - // and now also swap all the attributes of the items - - // first the label - const wxString stringTmp = GetString(pos1); - SetString(pos1, GetString(pos2)); - SetString(pos2, stringTmp); - - // then the checked state - const bool checkedTmp = IsChecked(pos1); - wxCheckListBox::Check(pos1, IsChecked(pos2)); - wxCheckListBox::Check(pos2, checkedTmp); - - // and finally the client data, if necessary - switch ( GetClientDataType() ) - { - case wxClientData_None: - // nothing to do - break; - - case wxClientData_Object: - { - wxClientData * const dataTmp = DetachClientObject(pos1); - SetClientObject(pos1, DetachClientObject(pos2)); - SetClientObject(pos2, dataTmp); - } - break; - - case wxClientData_Void: - { - void * const dataTmp = GetClientData(pos1); - SetClientData(pos1, GetClientData(pos2)); - SetClientData(pos2, dataTmp); - } - break; - } -} - -void wxRearrangeList::Check(unsigned int item, bool check) -{ - if ( check == IsChecked(item) ) - return; - - wxCheckListBox::Check(item, check); - - m_order[item] = ~m_order[item]; -} - -void wxRearrangeList::OnCheck(wxCommandEvent& event) -{ - // update the internal state to match the new item state - const int n = event.GetInt(); - - if ( (m_order[n] >= 0) != IsChecked(n) ) - m_order[n] = ~m_order[n]; -} - -// ============================================================================ -// wxRearrangeCtrl implementation -// ============================================================================ - -wxBEGIN_EVENT_TABLE(wxRearrangeCtrl, wxPanel) - EVT_UPDATE_UI(wxID_UP, wxRearrangeCtrl::OnUpdateButtonUI) - EVT_UPDATE_UI(wxID_DOWN, wxRearrangeCtrl::OnUpdateButtonUI) - - EVT_BUTTON(wxID_UP, wxRearrangeCtrl::OnButton) - EVT_BUTTON(wxID_DOWN, wxRearrangeCtrl::OnButton) -wxEND_EVENT_TABLE() - -void wxRearrangeCtrl::Init() -{ - m_list = NULL; -} - -bool -wxRearrangeCtrl::Create(wxWindow *parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - const wxArrayInt& order, - const wxArrayString& items, - long style, - const wxValidator& validator, - const wxString& name) -{ - // create all the windows - if ( !wxPanel::Create(parent, id, pos, size, wxTAB_TRAVERSAL, name) ) - return false; - - m_list = new wxRearrangeList(this, wxID_ANY, - wxDefaultPosition, wxDefaultSize, - order, items, - style, validator); - wxButton * const btnUp = new wxButton(this, wxID_UP); - wxButton * const btnDown = new wxButton(this, wxID_DOWN); - - // arrange them in a sizer - wxSizer * const sizerBtns = new wxBoxSizer(wxVERTICAL); - sizerBtns->Add(btnUp, wxSizerFlags().Centre().Border(wxBOTTOM)); - sizerBtns->Add(btnDown, wxSizerFlags().Centre().Border(wxTOP)); - - wxSizer * const sizerTop = new wxBoxSizer(wxHORIZONTAL); - sizerTop->Add(m_list, wxSizerFlags(1).Expand().Border(wxRIGHT)); - sizerTop->Add(sizerBtns, wxSizerFlags(0).Centre().Border(wxLEFT)); - SetSizer(sizerTop); - - m_list->SetFocus(); - - return true; -} - -void wxRearrangeCtrl::OnUpdateButtonUI(wxUpdateUIEvent& event) -{ - event.Enable( event.GetId() == wxID_UP ? m_list->CanMoveCurrentUp() - : m_list->CanMoveCurrentDown() ); -} - -void wxRearrangeCtrl::OnButton(wxCommandEvent& event) -{ - if ( event.GetId() == wxID_UP ) - m_list->MoveCurrentUp(); - else - m_list->MoveCurrentDown(); -} - -// ============================================================================ -// wxRearrangeDialog implementation -// ============================================================================ - -extern -WXDLLIMPEXP_DATA_CORE(const char) wxRearrangeDialogNameStr[] = "wxRearrangeDlg"; - -namespace -{ - -enum wxRearrangeDialogSizerPositions -{ - Pos_Label, - Pos_Ctrl, - Pos_Buttons, - Pos_Max -}; - -} // anonymous namespace - -bool wxRearrangeDialog::Create(wxWindow *parent, - const wxString& message, - const wxString& title, - const wxArrayInt& order, - const wxArrayString& items, - const wxPoint& pos, - const wxString& name) -{ - if ( !wxDialog::Create(parent, wxID_ANY, title, - pos, wxDefaultSize, - wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER, - name) ) - return false; - - m_ctrl = new wxRearrangeCtrl(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, - order, items); - - // notice that the items in this sizer should be inserted accordingly to - // wxRearrangeDialogSizerPositions order - wxSizer * const sizerTop = new wxBoxSizer(wxVERTICAL); - - if ( !message.empty() ) - { - sizerTop->Add(new wxStaticText(this, wxID_ANY, message), - wxSizerFlags().Border()); - } - else - { - // for convenience of other wxRearrangeDialog code that depends on - // positions of sizer items, insert a dummy zero-sized item - sizerTop->AddSpacer(0); - } - - sizerTop->Add(m_ctrl, - wxSizerFlags(1).Expand().Border()); - sizerTop->Add(CreateSeparatedButtonSizer(wxOK | wxCANCEL), - wxSizerFlags().Expand().Border()); - SetSizerAndFit(sizerTop); - - return true; -} - -void wxRearrangeDialog::AddExtraControls(wxWindow *win) -{ - wxSizer * const sizer = GetSizer(); - wxCHECK_RET( sizer, "the dialog must be created first" ); - - wxASSERT_MSG( sizer->GetChildren().GetCount() == Pos_Max, - "calling AddExtraControls() twice?" ); - - sizer->Insert(Pos_Buttons, win, wxSizerFlags().Expand().Border()); - - win->MoveAfterInTabOrder(m_ctrl); - - // we need to update the initial/minimal window size - sizer->SetSizeHints(this); -} - -wxRearrangeList *wxRearrangeDialog::GetList() const -{ - wxCHECK_MSG( m_ctrl, NULL, "the dialog must be created first" ); - - return m_ctrl->GetList(); -} - -wxArrayInt wxRearrangeDialog::GetOrder() const -{ - wxCHECK_MSG( m_ctrl, wxArrayInt(), "the dialog must be created first" ); - - return m_ctrl->GetList()->GetCurrentOrder(); -} - -#endif // wxUSE_REARRANGECTRL diff --git a/Externals/wxWidgets3/src/common/regex.cpp b/Externals/wxWidgets3/src/common/regex.cpp deleted file mode 100644 index 17f7cfccc3..0000000000 --- a/Externals/wxWidgets3/src/common/regex.cpp +++ /dev/null @@ -1,693 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/regex.cpp -// Purpose: regular expression matching -// Author: Karsten Ballueder and Vadim Zeitlin -// Modified by: -// Created: 13.07.01 -// Copyright: (c) 2000 Karsten Ballueder -// 2001 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_REGEX - -#include "wx/regex.h" - -#ifndef WX_PRECOMP - #include "wx/object.h" - #include "wx/log.h" - #include "wx/intl.h" - #include "wx/crt.h" -#endif //WX_PRECOMP - -// At least FreeBSD requires this. -#if defined(__UNIX__) -# include -#endif - -#include - -// WXREGEX_USING_BUILTIN defined when using the built-in regex lib -// WXREGEX_USING_RE_SEARCH defined when using re_search in the GNU regex lib -// WXREGEX_IF_NEED_LEN() wrap the len parameter only used with the built-in -// or GNU regex -// WXREGEX_CONVERT_TO_MB defined when the regex lib is using chars and -// wxChar is wide, so conversion must be done -// WXREGEX_CHAR(x) Convert wxChar to wxRegChar -// -#ifdef __REG_NOFRONT -# define WXREGEX_USING_BUILTIN -# define WXREGEX_IF_NEED_LEN(x) ,x -# if wxUSE_UNICODE -# define WXREGEX_CHAR(x) (x).wc_str() -# else -# define WXREGEX_CHAR(x) (x).mb_str() -# endif -#else -# ifdef HAVE_RE_SEARCH -# define WXREGEX_IF_NEED_LEN(x) ,x -# define WXREGEX_USING_RE_SEARCH -# else -# define WXREGEX_IF_NEED_LEN(x) -# endif -# if wxUSE_UNICODE -# define WXREGEX_CONVERT_TO_MB -# endif -# define WXREGEX_CHAR(x) (x).mb_str() -# define wx_regfree regfree -# define wx_regerror regerror -#endif - -// ---------------------------------------------------------------------------- -// private classes -// ---------------------------------------------------------------------------- - -#ifndef WXREGEX_USING_RE_SEARCH - -// the array of offsets for the matches, the usual POSIX regmatch_t array. -class wxRegExMatches -{ -public: - typedef regmatch_t *match_type; - - wxRegExMatches(size_t n) { m_matches = new regmatch_t[n]; } - ~wxRegExMatches() { delete [] m_matches; } - - // we just use casts here because the fields of regmatch_t struct may be 64 - // bit but we're limited to size_t in our public API and are not going to - // change it because operating on strings longer than 4GB using it is - // absolutely impractical anyhow - size_t Start(size_t n) const - { - return wx_truncate_cast(size_t, m_matches[n].rm_so); - } - - size_t End(size_t n) const - { - return wx_truncate_cast(size_t, m_matches[n].rm_eo); - } - - regmatch_t *get() const { return m_matches; } - -private: - regmatch_t *m_matches; -}; - -#else // WXREGEX_USING_RE_SEARCH - -// the array of offsets for the matches, the struct used by the GNU lib -class wxRegExMatches -{ -public: - typedef re_registers *match_type; - - wxRegExMatches(size_t n) - { - m_matches.num_regs = n; - m_matches.start = new regoff_t[n]; - m_matches.end = new regoff_t[n]; - } - - ~wxRegExMatches() - { - delete [] m_matches.start; - delete [] m_matches.end; - } - - size_t Start(size_t n) const { return m_matches.start[n]; } - size_t End(size_t n) const { return m_matches.end[n]; } - - re_registers *get() { return &m_matches; } - -private: - re_registers m_matches; -}; - -#endif // WXREGEX_USING_RE_SEARCH - -// the character type used by the regular expression engine -#ifndef WXREGEX_CONVERT_TO_MB -typedef wxChar wxRegChar; -#else -typedef char wxRegChar; -#endif - -// the real implementation of wxRegEx -class wxRegExImpl -{ -public: - // ctor and dtor - wxRegExImpl(); - ~wxRegExImpl(); - - // return true if Compile() had been called successfully - bool IsValid() const { return m_isCompiled; } - - // RE operations - bool Compile(const wxString& expr, int flags = 0); - bool Matches(const wxRegChar *str, int flags - WXREGEX_IF_NEED_LEN(size_t len)) const; - bool GetMatch(size_t *start, size_t *len, size_t index = 0) const; - size_t GetMatchCount() const; - int Replace(wxString *pattern, const wxString& replacement, - size_t maxMatches = 0) const; - -private: - // return the string containing the error message for the given err code - wxString GetErrorMsg(int errorcode, bool badconv) const; - - // init the members - void Init() - { - m_isCompiled = false; - m_Matches = NULL; - m_nMatches = 0; - } - - // free the RE if compiled - void Free() - { - if ( IsValid() ) - { - wx_regfree(&m_RegEx); - } - - delete m_Matches; - } - - // free the RE if any and reinit the members - void Reinit() - { - Free(); - Init(); - } - - // compiled RE - regex_t m_RegEx; - - // the subexpressions data - wxRegExMatches *m_Matches; - size_t m_nMatches; - - // true if m_RegEx is valid - bool m_isCompiled; -}; - - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxRegExImpl -// ---------------------------------------------------------------------------- - -wxRegExImpl::wxRegExImpl() -{ - Init(); -} - -wxRegExImpl::~wxRegExImpl() -{ - Free(); -} - -wxString wxRegExImpl::GetErrorMsg(int errorcode, bool badconv) const -{ -#ifdef WXREGEX_CONVERT_TO_MB - // currently only needed when using system library in Unicode mode - if ( badconv ) - { - return _("conversion to 8-bit encoding failed"); - } -#else - // 'use' badconv to avoid a compiler warning - (void)badconv; -#endif - - wxString szError; - - // first get the string length needed - int len = wx_regerror(errorcode, &m_RegEx, NULL, 0); - if ( len > 0 ) - { - char* szcmbError = new char[++len]; - - (void)wx_regerror(errorcode, &m_RegEx, szcmbError, len); - - szError = wxConvLibc.cMB2WX(szcmbError); - delete [] szcmbError; - } - else // regerror() returned 0 - { - szError = _("unknown error"); - } - - return szError; -} - -bool wxRegExImpl::Compile(const wxString& expr, int flags) -{ - Reinit(); - -#ifdef WX_NO_REGEX_ADVANCED -# define FLAVORS wxRE_BASIC -#else -# define FLAVORS (wxRE_ADVANCED | wxRE_BASIC) - wxASSERT_MSG( (flags & FLAVORS) != FLAVORS, - wxT("incompatible flags in wxRegEx::Compile") ); -#endif - wxASSERT_MSG( !(flags & ~(FLAVORS | wxRE_ICASE | wxRE_NOSUB | wxRE_NEWLINE)), - wxT("unrecognized flags in wxRegEx::Compile") ); - - // translate our flags to regcomp() ones - int flagsRE = 0; - if ( !(flags & wxRE_BASIC) ) - { -#ifndef WX_NO_REGEX_ADVANCED - if (flags & wxRE_ADVANCED) - flagsRE |= REG_ADVANCED; - else -#endif - flagsRE |= REG_EXTENDED; - } - if ( flags & wxRE_ICASE ) - flagsRE |= REG_ICASE; - if ( flags & wxRE_NOSUB ) - flagsRE |= REG_NOSUB; - if ( flags & wxRE_NEWLINE ) - flagsRE |= REG_NEWLINE; - - // compile it -#ifdef WXREGEX_USING_BUILTIN - bool conv = true; - // FIXME-UTF8: use wc_str() after removing ANSI build - int errorcode = wx_re_comp(&m_RegEx, expr.c_str(), expr.length(), flagsRE); -#else - // FIXME-UTF8: this is potentially broken, we shouldn't even try it - // and should always use builtin regex library (or PCRE?) - const wxWX2MBbuf conv = expr.mbc_str(); - int errorcode = conv ? regcomp(&m_RegEx, conv, flagsRE) : REG_BADPAT; -#endif - - if ( errorcode ) - { - wxLogError(_("Invalid regular expression '%s': %s"), - expr.c_str(), GetErrorMsg(errorcode, !conv).c_str()); - - m_isCompiled = false; - } - else // ok - { - // don't allocate the matches array now, but do it later if necessary - if ( flags & wxRE_NOSUB ) - { - // we don't need it at all - m_nMatches = 0; - } - else - { - // we will alloc the array later (only if really needed) but count - // the number of sub-expressions in the regex right now - - // there is always one for the whole expression - m_nMatches = 1; - - // and some more for bracketed subexperessions - for ( const wxChar *cptr = expr.c_str(); *cptr; cptr++ ) - { - if ( *cptr == wxT('\\') ) - { - // in basic RE syntax groups are inside \(...\) - if ( *++cptr == wxT('(') && (flags & wxRE_BASIC) ) - { - m_nMatches++; - } - } - else if ( *cptr == wxT('(') && !(flags & wxRE_BASIC) ) - { - // we know that the previous character is not an unquoted - // backslash because it would have been eaten above, so we - // have a bare '(' and this indicates a group start for the - // extended syntax. '(?' is used for extensions by perl- - // like REs (e.g. advanced), and is not valid for POSIX - // extended, so ignore them always. - if ( cptr[1] != wxT('?') ) - m_nMatches++; - } - } - } - - m_isCompiled = true; - } - - return IsValid(); -} - -#ifdef WXREGEX_USING_RE_SEARCH - -// On GNU, regexec is implemented as a wrapper around re_search. re_search -// requires a length parameter which the POSIX regexec does not have, -// therefore regexec must do a strlen on the search text each time it is -// called. This can drastically affect performance when matching is done in -// a loop along a string, such as during a search and replace. Therefore if -// re_search is detected by configure, it is used directly. -// -static int ReSearch(const regex_t *preg, - const char *text, - size_t len, - re_registers *matches, - int eflags) -{ - regex_t *pattern = const_cast(preg); - - pattern->not_bol = (eflags & REG_NOTBOL) != 0; - pattern->not_eol = (eflags & REG_NOTEOL) != 0; - pattern->regs_allocated = REGS_FIXED; - - int ret = re_search(pattern, text, len, 0, len, matches); - return ret >= 0 ? 0 : REG_NOMATCH; -} - -#endif // WXREGEX_USING_RE_SEARCH - -bool wxRegExImpl::Matches(const wxRegChar *str, - int flags - WXREGEX_IF_NEED_LEN(size_t len)) const -{ - wxCHECK_MSG( IsValid(), false, wxT("must successfully Compile() first") ); - - // translate our flags to regexec() ones - wxASSERT_MSG( !(flags & ~(wxRE_NOTBOL | wxRE_NOTEOL)), - wxT("unrecognized flags in wxRegEx::Matches") ); - - int flagsRE = 0; - if ( flags & wxRE_NOTBOL ) - flagsRE |= REG_NOTBOL; - if ( flags & wxRE_NOTEOL ) - flagsRE |= REG_NOTEOL; - - // allocate matches array if needed - wxRegExImpl *self = wxConstCast(this, wxRegExImpl); - if ( !m_Matches && m_nMatches ) - { - self->m_Matches = new wxRegExMatches(m_nMatches); - } - - wxRegExMatches::match_type matches = m_Matches ? m_Matches->get() : NULL; - - // do match it -#if defined WXREGEX_USING_BUILTIN - int rc = wx_re_exec(&self->m_RegEx, str, len, NULL, m_nMatches, matches, flagsRE); -#elif defined WXREGEX_USING_RE_SEARCH - int rc = str ? ReSearch(&self->m_RegEx, str, len, matches, flagsRE) : REG_BADPAT; -#else - int rc = str ? regexec(&self->m_RegEx, str, m_nMatches, matches, flagsRE) : REG_BADPAT; -#endif - - switch ( rc ) - { - case 0: - // matched successfully - return true; - - default: - // an error occurred - wxLogError(_("Failed to find match for regular expression: %s"), - GetErrorMsg(rc, !str).c_str()); - wxFALLTHROUGH; - - case REG_NOMATCH: - // no match - return false; - } -} - -bool wxRegExImpl::GetMatch(size_t *start, size_t *len, size_t index) const -{ - wxCHECK_MSG( IsValid(), false, wxT("must successfully Compile() first") ); - wxCHECK_MSG( m_nMatches, false, wxT("can't use with wxRE_NOSUB") ); - wxCHECK_MSG( m_Matches, false, wxT("must call Matches() first") ); - wxCHECK_MSG( index < m_nMatches, false, wxT("invalid match index") ); - - if ( start ) - *start = m_Matches->Start(index); - if ( len ) - *len = m_Matches->End(index) - m_Matches->Start(index); - - return true; -} - -size_t wxRegExImpl::GetMatchCount() const -{ - wxCHECK_MSG( IsValid(), 0, wxT("must successfully Compile() first") ); - wxCHECK_MSG( m_nMatches, 0, wxT("can't use with wxRE_NOSUB") ); - - return m_nMatches; -} - -int wxRegExImpl::Replace(wxString *text, - const wxString& replacement, - size_t maxMatches) const -{ - wxCHECK_MSG( text, wxNOT_FOUND, wxT("NULL text in wxRegEx::Replace") ); - wxCHECK_MSG( IsValid(), wxNOT_FOUND, wxT("must successfully Compile() first") ); - - // the input string -#ifndef WXREGEX_CONVERT_TO_MB - const wxChar *textstr = text->c_str(); - size_t textlen = text->length(); -#else - const wxWX2MBbuf textstr = WXREGEX_CHAR(*text); - if (!textstr) - { - wxLogError(_("Failed to find match for regular expression: %s"), - GetErrorMsg(0, true).c_str()); - return 0; - } - size_t textlen = strlen(textstr); - text->clear(); -#endif - - // the replacement text - wxString textNew; - - // the result, allow 25% extra - wxString result; - result.reserve(5 * textlen / 4); - - // attempt at optimization: don't iterate over the string if it doesn't - // contain back references at all - bool mayHaveBackrefs = - replacement.find_first_of(wxT("\\&")) != wxString::npos; - - if ( !mayHaveBackrefs ) - { - textNew = replacement; - } - - // the position where we start looking for the match - size_t matchStart = 0; - - // number of replacement made: we won't make more than maxMatches of them - // (unless maxMatches is 0 which doesn't limit the number of replacements) - size_t countRepl = 0; - - // note that "^" shouldn't match after the first call to Matches() so we - // use wxRE_NOTBOL to prevent it from happening - while ( (!maxMatches || countRepl < maxMatches) && - Matches( -#ifndef WXREGEX_CONVERT_TO_MB - textstr + matchStart, -#else - textstr.data() + matchStart, -#endif - countRepl ? wxRE_NOTBOL : 0 - WXREGEX_IF_NEED_LEN(textlen - matchStart)) ) - { - // the string possibly contains back references: we need to calculate - // the replacement text anew after each match - if ( mayHaveBackrefs ) - { - mayHaveBackrefs = false; - textNew.clear(); - textNew.reserve(replacement.length()); - - for ( const wxChar *p = replacement.c_str(); *p; p++ ) - { - size_t index = (size_t)-1; - - if ( *p == wxT('\\') ) - { - if ( wxIsdigit(*++p) ) - { - // back reference - wxChar *end; - index = (size_t)wxStrtoul(p, &end, 10); - p = end - 1; // -1 to compensate for p++ in the loop - } - //else: backslash used as escape character - } - else if ( *p == wxT('&') ) - { - // treat this as "\0" for compatbility with ed and such - index = 0; - } - - // do we have a back reference? - if ( index != (size_t)-1 ) - { - // yes, get its text - size_t start, len; - if ( !GetMatch(&start, &len, index) ) - { - wxFAIL_MSG( wxT("invalid back reference") ); - - // just eat it... - } - else - { - textNew += wxString( -#ifndef WXREGEX_CONVERT_TO_MB - textstr -#else - textstr.data() -#endif - + matchStart + start, - *wxConvCurrent, len); - - mayHaveBackrefs = true; - } - } - else // ordinary character - { - textNew += *p; - } - } - } - - size_t start, len; - if ( !GetMatch(&start, &len) ) - { - // we did have match as Matches() returned true above! - wxFAIL_MSG( wxT("internal logic error in wxRegEx::Replace") ); - - return wxNOT_FOUND; - } - - // an insurance against implementations that don't grow exponentially - // to ensure building the result takes linear time - if (result.capacity() < result.length() + start + textNew.length()) - result.reserve(2 * result.length()); - -#ifndef WXREGEX_CONVERT_TO_MB - result.append(*text, matchStart, start); -#else - result.append(wxString(textstr.data() + matchStart, *wxConvCurrent, start)); -#endif - matchStart += start; - result.append(textNew); - - countRepl++; - - matchStart += len; - } - -#ifndef WXREGEX_CONVERT_TO_MB - result.append(*text, matchStart, wxString::npos); -#else - result.append(wxString(textstr.data() + matchStart, *wxConvCurrent)); -#endif - *text = result; - - return countRepl; -} - -// ---------------------------------------------------------------------------- -// wxRegEx: all methods are mostly forwarded to wxRegExImpl -// ---------------------------------------------------------------------------- - -void wxRegEx::Init() -{ - m_impl = NULL; -} - -wxRegEx::~wxRegEx() -{ - delete m_impl; -} - -bool wxRegEx::Compile(const wxString& expr, int flags) -{ - if ( !m_impl ) - { - m_impl = new wxRegExImpl; - } - - if ( !m_impl->Compile(expr, flags) ) - { - // error message already given in wxRegExImpl::Compile - wxDELETE(m_impl); - - return false; - } - - return true; -} - -bool wxRegEx::Matches(const wxString& str, int flags) const -{ - wxCHECK_MSG( IsValid(), false, wxT("must successfully Compile() first") ); - - return m_impl->Matches(WXREGEX_CHAR(str), flags - WXREGEX_IF_NEED_LEN(str.length())); -} - -bool wxRegEx::GetMatch(size_t *start, size_t *len, size_t index) const -{ - wxCHECK_MSG( IsValid(), false, wxT("must successfully Compile() first") ); - - return m_impl->GetMatch(start, len, index); -} - -wxString wxRegEx::GetMatch(const wxString& text, size_t index) const -{ - size_t start, len; - if ( !GetMatch(&start, &len, index) ) - return wxEmptyString; - - return text.Mid(start, len); -} - -size_t wxRegEx::GetMatchCount() const -{ - wxCHECK_MSG( IsValid(), 0, wxT("must successfully Compile() first") ); - - return m_impl->GetMatchCount(); -} - -int wxRegEx::Replace(wxString *pattern, - const wxString& replacement, - size_t maxMatches) const -{ - wxCHECK_MSG( IsValid(), wxNOT_FOUND, wxT("must successfully Compile() first") ); - - return m_impl->Replace(pattern, replacement, maxMatches); -} - -#endif // wxUSE_REGEX diff --git a/Externals/wxWidgets3/src/common/rendcmn.cpp b/Externals/wxWidgets3/src/common/rendcmn.cpp deleted file mode 100644 index 455d2d5ac8..0000000000 --- a/Externals/wxWidgets3/src/common/rendcmn.cpp +++ /dev/null @@ -1,206 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/rendcmn.cpp -// Purpose: wxRendererNative common functions -// Author: Vadim Zeitlin -// Modified by: -// Created: 28.07.03 -// Copyright: (c) 2003 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#ifndef WX_PRECOMP - #include "wx/app.h" - #include "wx/log.h" - #include "wx/intl.h" -#endif //WX_PRECOMP - -#include "wx/apptrait.h" -#include "wx/renderer.h" - -#include "wx/scopedptr.h" - -#if wxUSE_DYNLIB_CLASS - #include "wx/dynlib.h" -#endif // wxUSE_DYNLIB_CLASS - -// ---------------------------------------------------------------------------- -// wxRendererPtr: auto pointer holding the global renderer -// ---------------------------------------------------------------------------- - -typedef wxScopedPtr wxRendererPtrBase; - -class wxRendererPtr : public wxRendererPtrBase -{ -public: - // return true if we have a renderer, false otherwise - bool IsOk() - { - if ( !m_initialized ) - { - // only try to create the renderer once - m_initialized = true; - - DoInit(); - } - - return get() != NULL; - } - - // return the global and unique wxRendererPtr - static wxRendererPtr& Get(); - -private: - wxRendererPtr() : wxRendererPtrBase(NULL) { m_initialized = false; } - - void DoInit() - { - wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits() : NULL; - if ( traits ) - { - // ask the traits object to create a renderer for us - reset(traits->CreateRenderer()); - } - } - - bool m_initialized; - - // just to suppress a gcc warning - friend class wxRendererPtrDummyFriend; - - wxDECLARE_NO_COPY_CLASS(wxRendererPtr); -}; - -// return the global and unique wxRendererPtr -/*static*/ wxRendererPtr& wxRendererPtr::Get() -{ - static wxRendererPtr s_renderer; - - return s_renderer; -} - -#if wxUSE_DYNLIB_CLASS - -// ---------------------------------------------------------------------------- -// wxRendererFromDynLib: represents a renderer dynamically loaded from a DLL -// ---------------------------------------------------------------------------- - -class wxRendererFromDynLib : public wxDelegateRendererNative -{ -public: - // create the object wrapping the given renderer created from this DLL - // - // we take ownership of the pointer and will delete it (and also unload the - // DLL) when we're deleted - wxRendererFromDynLib(wxDynamicLibrary& dll, wxRendererNative *renderer) - : wxDelegateRendererNative(*renderer), - m_renderer(renderer), - m_dllHandle(dll.Detach()) - { - } - - virtual ~wxRendererFromDynLib() - { - delete m_renderer; - wxDynamicLibrary::Unload(m_dllHandle); - } - -private: - wxRendererNative *m_renderer; - wxDllType m_dllHandle; -}; - -#endif // wxUSE_DYNLIB_CLASS - -// ============================================================================ -// wxRendererNative implementation -// ============================================================================ - -wxRendererNative::~wxRendererNative() -{ - // empty but necessary -} - -// ---------------------------------------------------------------------------- -// Managing the global renderer -// ---------------------------------------------------------------------------- - -/* static */ -wxRendererNative& wxRendererNative::Get() -{ - wxRendererPtr& renderer = wxRendererPtr::Get(); - - return renderer.IsOk() ? *renderer.get() : GetDefault(); -} - -/* static */ -wxRendererNative *wxRendererNative::Set(wxRendererNative *rendererNew) -{ - wxRendererPtr& renderer = wxRendererPtr::Get(); - - wxRendererNative *rendererOld = renderer.release(); - - renderer.reset(rendererNew); - - return rendererOld; -} - - -// ---------------------------------------------------------------------------- -// Dynamic renderers loading -// ---------------------------------------------------------------------------- - -#if wxUSE_DYNLIB_CLASS - -/* static */ -wxRendererNative *wxRendererNative::Load(const wxString& name) -{ - wxString fullname = wxDynamicLibrary::CanonicalizePluginName(name); - - wxDynamicLibrary dll(fullname); - if ( !dll.IsLoaded() ) - return NULL; - - // each theme DLL must export a wxCreateRenderer() function with this - // signature - typedef wxRendererNative *(*wxCreateRenderer_t)(); - - wxDYNLIB_FUNCTION(wxCreateRenderer_t, wxCreateRenderer, dll); - if ( !pfnwxCreateRenderer ) - return NULL; - - // create a renderer object - wxRendererNative *renderer = (*pfnwxCreateRenderer)(); - if ( !renderer ) - return NULL; - - // check that its version is compatible with ours - wxRendererVersion ver = renderer->GetVersion(); - if ( !wxRendererVersion::IsCompatible(ver) ) - { - wxLogError(_("Renderer \"%s\" has incompatible version %d.%d and couldn't be loaded."), - name.c_str(), ver.version, ver.age); - delete renderer; - - return NULL; - } - - // finally wrap the renderer in an object which will delete it and unload - // the library when it is deleted and return it to the caller - return new wxRendererFromDynLib(dll, renderer); -} - -#endif // wxUSE_DYNLIB_CLASS diff --git a/Externals/wxWidgets3/src/common/rgncmn.cpp b/Externals/wxWidgets3/src/common/rgncmn.cpp deleted file mode 100644 index 9c756c35da..0000000000 --- a/Externals/wxWidgets3/src/common/rgncmn.cpp +++ /dev/null @@ -1,191 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/rgncmn.cpp -// Purpose: Methods of wxRegion that have a generic implementation -// Author: Robin Dunn -// Modified by: -// Created: 27-Mar-2003 -// Copyright: (c) Robin Dunn -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include "wx/region.h" - -#ifndef WX_PRECOMP - #include "wx/dcmemory.h" - #include "wx/bitmap.h" - #include "wx/image.h" -#endif //WX_PRECOMP - -// ============================================================================ -// wxRegionBase implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// region comparison -// ---------------------------------------------------------------------------- - -bool wxRegionBase::IsEqual(const wxRegion& region) const -{ - if ( m_refData == region.GetRefData() ) - { - // regions are identical, hence equal - return true; - } - - if ( !m_refData || !region.GetRefData() ) - { - // one, but not both, of the regions is invalid - return false; - } - - return DoIsEqual(region); -} - -// ---------------------------------------------------------------------------- -// region to/from bitmap conversions -// ---------------------------------------------------------------------------- - -wxBitmap wxRegionBase::ConvertToBitmap() const -{ - wxRect box = GetBox(); - wxBitmap bmp(box.GetRight() + 1, box.GetBottom() + 1); - wxMemoryDC dc; - dc.SelectObject(bmp); - dc.SetBackground(*wxBLACK_BRUSH); - dc.Clear(); - dc.SetDeviceClippingRegion(*static_cast(this)); - dc.SetBackground(*wxWHITE_BRUSH); - dc.Clear(); - dc.SelectObject(wxNullBitmap); - return bmp; -} - -#if wxUSE_IMAGE - -static bool DoRegionUnion(wxRegionBase& region, - const wxImage& image, - unsigned char loR, - unsigned char loG, - unsigned char loB, - int tolerance) -{ - unsigned char hiR, hiG, hiB; - - hiR = (unsigned char)wxMin(0xFF, loR + tolerance); - hiG = (unsigned char)wxMin(0xFF, loG + tolerance); - hiB = (unsigned char)wxMin(0xFF, loB + tolerance); - - // Loop through the image row by row, pixel by pixel, building up - // rectangles to add to the region. - int width = image.GetWidth(); - int height = image.GetHeight(); - for (int y=0; y < height; y++) - { - wxRect rect; - rect.y = y; - rect.height = 1; - - for (int x=0; x < width; x++) - { - // search for a continuous range of non-transparent pixels - int x0 = x; - while ( x < width) - { - unsigned char R = image.GetRed(x,y); - unsigned char G = image.GetGreen(x,y); - unsigned char B = image.GetBlue(x,y); - if (( R >= loR && R <= hiR) && - ( G >= loG && G <= hiG) && - ( B >= loB && B <= hiB)) // It's transparent - break; - x++; - } - - // Add the run of non-transparent pixels (if any) to the region - if (x > x0) { - rect.x = x0; - rect.width = x - x0; - region.Union(rect); - } - } - } - - return true; -} - - -bool wxRegionBase::Union(const wxBitmap& bmp) -{ - if (bmp.GetMask()) - { - wxImage image = bmp.ConvertToImage(); - wxASSERT_MSG( image.HasMask(), wxT("wxBitmap::ConvertToImage doesn't preserve mask?") ); - return DoRegionUnion(*this, image, - image.GetMaskRed(), - image.GetMaskGreen(), - image.GetMaskBlue(), - 0); - } - else - { - return Union(0, 0, bmp.GetWidth(), bmp.GetHeight()); - } -} - -bool wxRegionBase::Union(const wxBitmap& bmp, - const wxColour& transColour, - int tolerance) -{ - wxImage image = bmp.ConvertToImage(); - return DoRegionUnion(*this, image, - transColour.Red(), - transColour.Green(), - transColour.Blue(), - tolerance); -} - -#endif // wxUSE_IMAGE - -#ifdef wxHAS_REGION_COMBINE -// ============================================================================ -// wxRegionWithCombine -// ============================================================================ - -// implement some wxRegionBase pure virtuals in terms of Combine() -bool wxRegionWithCombine::DoUnionWithRect(const wxRect& rect) -{ - return Combine(rect, wxRGN_OR); -} - -bool wxRegionWithCombine::DoUnionWithRegion(const wxRegion& region) -{ - return DoCombine(region, wxRGN_OR); -} - -bool wxRegionWithCombine::DoIntersect(const wxRegion& region) -{ - return DoCombine(region, wxRGN_AND); -} - -bool wxRegionWithCombine::DoSubtract(const wxRegion& region) -{ - return DoCombine(region, wxRGN_DIFF); -} - -bool wxRegionWithCombine::DoXor(const wxRegion& region) -{ - return DoCombine(region, wxRGN_XOR); -} - -#endif // wxHAS_REGION_COMBINE diff --git a/Externals/wxWidgets3/src/common/richtooltipcmn.cpp b/Externals/wxWidgets3/src/common/richtooltipcmn.cpp deleted file mode 100644 index 6788488ff9..0000000000 --- a/Externals/wxWidgets3/src/common/richtooltipcmn.cpp +++ /dev/null @@ -1,87 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/richtooltipcmn.cpp -// Purpose: wxRichToolTip implementation common to all platforms. -// Author: Vadim Zeitlin -// Created: 2011-10-18 -// Copyright: (c) 2011 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// for compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_RICHTOOLTIP - -#ifndef WX_PRECOMP - #include "wx/icon.h" -#endif // WX_PRECOMP - -#include "wx/private/richtooltip.h" - -// ============================================================================ -// implementation -// ============================================================================ - -wxRichToolTip::wxRichToolTip(const wxString& title, - const wxString& message) : - m_impl(wxRichToolTipImpl::Create(title, message)) -{ -} - -void -wxRichToolTip::SetBackgroundColour(const wxColour& col, const wxColour& colEnd) -{ - m_impl->SetBackgroundColour(col, colEnd); -} - -void wxRichToolTip::SetIcon(int icon) -{ - m_impl->SetStandardIcon(icon); -} - -void wxRichToolTip::SetIcon(const wxIcon& icon) -{ - m_impl->SetCustomIcon(icon); -} - -void wxRichToolTip::SetTimeout(unsigned milliseconds, - unsigned millisecondsDelay) -{ - m_impl->SetTimeout(milliseconds, millisecondsDelay); -} - -void wxRichToolTip::SetTipKind(wxTipKind tipKind) -{ - m_impl->SetTipKind(tipKind); -} - -void wxRichToolTip::SetTitleFont(const wxFont& font) -{ - m_impl->SetTitleFont(font); -} - -void wxRichToolTip::ShowFor(wxWindow* win, const wxRect* rect) -{ - wxCHECK_RET( win, wxS("Must have a valid window") ); - - m_impl->ShowFor(win, rect); -} - -wxRichToolTip::~wxRichToolTip() -{ - delete m_impl; -} - -#endif // wxUSE_RICHTOOLTIP diff --git a/Externals/wxWidgets3/src/common/sckaddr.cpp b/Externals/wxWidgets3/src/common/sckaddr.cpp deleted file mode 100644 index 0388132fb8..0000000000 --- a/Externals/wxWidgets3/src/common/sckaddr.cpp +++ /dev/null @@ -1,1012 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/sckaddr.cpp -// Purpose: Network address manager -// Author: Guilhem Lavaux -// Created: 26/04/97 -// Modified by: Vadim Zeitlin to use wxSockAddressImpl on 2008-12-28 -// Copyright: (c) 1997, 1998 Guilhem Lavaux -// (c) 2008 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_SOCKETS - -#ifndef WX_PRECOMP - #include "wx/object.h" - #include "wx/log.h" - #include "wx/intl.h" - #include "wx/thread.h" - - #include - #include - #include - - #include -#endif // !WX_PRECOMP - -#include "wx/socket.h" -#include "wx/sckaddr.h" -#include "wx/private/socket.h" -#include "wx/private/sckaddr.h" - -#include - -#if defined(__UNIX__) && !defined(__WINDOWS__) - #include - #include -#endif // __UNIX__ - -#ifndef INADDR_NONE - #define INADDR_NONE INADDR_ANY -#endif - -// ---------------------------------------------------------------------------- -// wxRTTI macros -// ---------------------------------------------------------------------------- - -wxIMPLEMENT_ABSTRACT_CLASS(wxSockAddress, wxObject); -wxIMPLEMENT_ABSTRACT_CLASS(wxIPaddress, wxSockAddress); -wxIMPLEMENT_DYNAMIC_CLASS(wxIPV4address, wxIPaddress); -#if wxUSE_IPV6 -wxIMPLEMENT_DYNAMIC_CLASS(wxIPV6address, wxIPaddress); -#endif -#if defined(__UNIX__) && !defined(__WINDOWS__) && !defined(__WINE__) -wxIMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress); -#endif - -// ============================================================================ -// implementation of thread-safe/reentrant functions if they're missing -// ============================================================================ - -// TODO: use POSIX getaddrinfo() (also available in Winsock 2) for simplicity -// and to use the same code for IPv4 and IPv6 support - -#ifdef __WINDOWS__ - #define HAVE_INET_ADDR - - #ifndef HAVE_GETHOSTBYNAME - #define HAVE_GETHOSTBYNAME - #endif - #ifndef HAVE_GETSERVBYNAME - #define HAVE_GETSERVBYNAME - #endif - - // under MSW getxxxbyname() functions are MT-safe (but not reentrant) so - // we don't need to serialize calls to them - #define wxHAS_MT_SAFE_GETBY_FUNCS - - #if wxUSE_IPV6 - #ifdef __VISUALC__ - // this header does dynamic dispatching of getaddrinfo/freeaddrinfo() - // by implementing them in its own code if the system versions are - // not available (as is the case for anything < XP) - #pragma warning(push) - #pragma warning(disable:4706) - #include - #pragma warning(pop) - #else - // TODO: Use wxDynamicLibrary to bind to these functions - // dynamically on older Windows systems, currently a program - // built with wxUSE_IPV6==1 won't even start there, even if - // it doesn't actually use the socket stuff. - #include - #endif - #endif -#endif // __WINDOWS__ - -// we assume that we have gethostbyaddr_r() if and only if we have -// gethostbyname_r() and that it uses the similar conventions to it (see -// comment in configure) -#define HAVE_GETHOSTBYADDR HAVE_GETHOSTBYNAME - -#ifdef __ANDROID__ - #ifndef HAVE_GETHOSTBYNAME - #define HAVE_GETHOSTBYNAME - #endif -#else // these functions are missing on android (see netdb.h) -#ifdef HAVE_FUNC_GETHOSTBYNAME_R_3 - #define HAVE_FUNC_GETHOSTBYADDR_R_3 -#endif -#ifdef HAVE_FUNC_GETHOSTBYNAME_R_5 - #define HAVE_FUNC_GETHOSTBYADDR_R_5 -#endif -#ifdef HAVE_FUNC_GETHOSTBYNAME_R_6 - #define HAVE_FUNC_GETHOSTBYADDR_R_6 -#endif -#endif -// the _r functions need the extra buffer parameter but unfortunately its type -// differs between different systems and for the systems which use opaque -// structs for it (at least AIX and OpenBSD) it must be zero-filled before -// being passed to the system functions -#ifdef HAVE_FUNC_GETHOSTBYNAME_R_3 - struct wxGethostBuf : hostent_data - { - wxGethostBuf() - { - memset(this, 0, sizeof(hostent_data)); - } - }; -#else - typedef char wxGethostBuf[4096]; -#endif - -#ifdef HAVE_FUNC_GETSERVBYNAME_R_4 - struct wxGetservBuf : servent_data - { - wxGetservBuf() - { - memset(this, 0, sizeof(servent_data)); - } - }; -#else - typedef char wxGetservBuf[4096]; -#endif - -#if defined(wxHAS_MT_SAFE_GETBY_FUNCS) || !wxUSE_THREADS - #define wxLOCK_GETBY_MUTEX(name) -#else // may need mutexes to protect getxxxbyxxx() calls - #if defined(HAVE_GETHOSTBYNAME) || \ - defined(HAVE_GETHOSTBYADDR) || \ - defined(HAVE_GETSERVBYNAME) - #include "wx/thread.h" - - namespace - { - // these mutexes are used to serialize - wxMutex nameLock, // gethostbyname() - addrLock, // gethostbyaddr() - servLock; // getservbyname() - } - - #define wxLOCK_GETBY_MUTEX(name) wxMutexLocker locker(name ## Lock) - #endif // we don't have _r functions -#endif // wxUSE_THREADS - -namespace -{ - -#if defined(HAVE_GETHOSTBYNAME) -hostent *deepCopyHostent(hostent *h, - const hostent *he, - char *buffer, - int size, - int *err) -{ - /* copy old structure */ - memcpy(h, he, sizeof(hostent)); - - /* copy name */ - int len = strlen(h->h_name); - if (len > size) - { - *err = ENOMEM; - return NULL; - } - memcpy(buffer, h->h_name, len); - buffer[len] = '\0'; - h->h_name = buffer; - - /* track position in the buffer */ - int pos = len + 1; - - /* reuse len to store address length */ - len = h->h_length; - - /* ensure pointer alignment */ - unsigned int misalign = sizeof(char *) - pos%sizeof(char *); - if(misalign < sizeof(char *)) - pos += misalign; - - /* leave space for pointer list */ - char **p = h->h_addr_list, **q; - char **h_addr_list = (char **)(buffer + pos); - while(*(p++) != 0) - pos += sizeof(char *); - - /* copy addresses and fill new pointer list */ - for (p = h->h_addr_list, q = h_addr_list; *p != 0; p++, q++) - { - if (size < pos + len) - { - *err = ENOMEM; - return NULL; - } - memcpy(buffer + pos, *p, len); /* copy content */ - *q = buffer + pos; /* set copied pointer to copied content */ - pos += len; - } - *++q = 0; /* null terminate the pointer list */ - h->h_addr_list = h_addr_list; /* copy pointer to pointers */ - - /* ensure word alignment of pointers */ - misalign = sizeof(char *) - pos%sizeof(char *); - if(misalign < sizeof(char *)) - pos += misalign; - - /* leave space for pointer list */ - p = h->h_aliases; - char **h_aliases = (char **)(buffer + pos); - while(*(p++) != 0) - pos += sizeof(char *); - - /* copy aliases and fill new pointer list */ - for (p = h->h_aliases, q = h_aliases; *p != 0; p++, q++) - { - len = strlen(*p); - if (size <= pos + len) - { - *err = ENOMEM; - return NULL; - } - memcpy(buffer + pos, *p, len); /* copy content */ - buffer[pos + len] = '\0'; - *q = buffer + pos; /* set copied pointer to copied content */ - pos += len + 1; - } - *++q = 0; /* null terminate the pointer list */ - h->h_aliases = h_aliases; /* copy pointer to pointers */ - - return h; -} -#endif // HAVE_GETHOSTBYNAME - -hostent *wxGethostbyname_r(const char *hostname, - hostent *h, - wxGethostBuf buffer, - int size, - int *err) -{ - hostent *he; -#if defined(HAVE_FUNC_GETHOSTBYNAME_R_6) - gethostbyname_r(hostname, h, buffer, size, &he, err); -#elif defined(HAVE_FUNC_GETHOSTBYNAME_R_5) - he = gethostbyname_r(hostname, h, buffer, size, err); -#elif defined(HAVE_FUNC_GETHOSTBYNAME_R_3) - wxUnusedVar(var); - *err = gethostbyname_r(hostname, h, &buffer); - he = h; -#elif defined(HAVE_GETHOSTBYNAME) - wxLOCK_GETBY_MUTEX(name); - - he = gethostbyname(hostname); - *err = h_errno; - - if ( he ) - he = deepCopyHostent(h, he, buffer, size, err); -#else - #error "No gethostbyname[_r]()" -#endif - - return he; -} - -hostent *wxGethostbyaddr_r(const char *addr_buf, - int buf_size, - int proto, - hostent *h, - wxGethostBuf buffer, - int size, - int *err) -{ - hostent *he; -#if defined(HAVE_FUNC_GETHOSTBYADDR_R_6) - gethostbyaddr_r(addr_buf, buf_size, proto, h, buffer, size, &he, err); -#elif defined(HAVE_FUNC_GETHOSTBYADDR_R_5) - he = gethostbyaddr_r(addr_buf, buf_size, proto, h, buffer, size, err); -#elif defined(HAVE_FUNC_GETHOSTBYADDR_R_3) - wxUnusedVar(size); - *err = gethostbyaddr_r(addr_buf, buf_size, proto, h, &buffer); - he = h; -#elif defined(HAVE_GETHOSTBYADDR) - wxLOCK_GETBY_MUTEX(addr); - - he = gethostbyaddr(addr_buf, buf_size, proto); - *err = h_errno; - - if ( he ) - he = deepCopyHostent(h, he, buffer, size, err); -#else - #error "No gethostbyaddr[_r]()" -#endif - - return he; -} - -#if defined(HAVE_GETSERVBYNAME) -servent *deepCopyServent(servent *s, - servent *se, - char *buffer, - int size) -{ - /* copy plain old structure */ - memcpy(s, se, sizeof(servent)); - - /* copy name */ - int len = strlen(s->s_name); - if (len >= size) - { - return NULL; - } - memcpy(buffer, s->s_name, len); - buffer[len] = '\0'; - s->s_name = buffer; - - /* track position in the buffer */ - int pos = len + 1; - - /* copy protocol */ - len = strlen(s->s_proto); - if (pos + len >= size) - { - return NULL; - } - memcpy(buffer + pos, s->s_proto, len); - buffer[pos + len] = '\0'; - s->s_proto = buffer + pos; - - /* track position in the buffer */ - pos += len + 1; - - /* ensure pointer alignment */ - unsigned int misalign = sizeof(char *) - pos%sizeof(char *); - if(misalign < sizeof(char *)) - pos += misalign; - - /* leave space for pointer list */ - char **p = s->s_aliases, **q; - char **s_aliases = (char **)(buffer + pos); - while(*(p++) != 0) - pos += sizeof(char *); - - /* copy addresses and fill new pointer list */ - for (p = s->s_aliases, q = s_aliases; *p != 0; p++, q++){ - len = strlen(*p); - if (size <= pos + len) - { - return NULL; - } - memcpy(buffer + pos, *p, len); /* copy content */ - buffer[pos + len] = '\0'; - *q = buffer + pos; /* set copied pointer to copied content */ - pos += len + 1; - } - *++q = 0; /* null terminate the pointer list */ - s->s_aliases = s_aliases; /* copy pointer to pointers */ - return s; -} -#endif // HAVE_GETSERVBYNAME - -servent *wxGetservbyname_r(const char *port, - const char *protocol, - servent *serv, - wxGetservBuf& buffer, - int size) -{ - servent *se; -#if defined(HAVE_FUNC_GETSERVBYNAME_R_6) - getservbyname_r(port, protocol, serv, buffer, size, &se); -#elif defined(HAVE_FUNC_GETSERVBYNAME_R_5) - se = getservbyname_r(port, protocol, serv, buffer, size); -#elif defined(HAVE_FUNC_GETSERVBYNAME_R_4) - wxUnusedVar(size); - if ( getservbyname_r(port, protocol, serv, &buffer) != 0 ) - return NULL; -#elif defined(HAVE_GETSERVBYNAME) - wxLOCK_GETBY_MUTEX(serv); - - se = getservbyname(port, protocol); - if ( se ) - se = deepCopyServent(serv, se, buffer, size); -#else - #error "No getservbyname[_r]()" -#endif - return se; -} - -} // anonymous namespace - -// ============================================================================ -// wxSockAddressImpl implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// INET or INET6 address family -// ---------------------------------------------------------------------------- - -wxString wxSockAddressImpl::GetHostName() const -{ - const void *addrbuf; - int addrbuflen; - -#if wxUSE_IPV6 - if ( m_family == FAMILY_INET6 ) - { - sockaddr_in6 * const addr6 = Get(); - addrbuf = &addr6->sin6_addr; - addrbuflen = sizeof(addr6->sin6_addr); - } - else -#endif // wxUSE_IPV6 - { - sockaddr_in * const addr = Get(); - if ( !addr ) - return wxString(); - - addrbuf = &addr->sin_addr; - addrbuflen = sizeof(addr->sin_addr); - } - - hostent he; - wxGethostBuf buffer; - int err; - if ( !wxGethostbyaddr_r - ( - static_cast(addrbuf), - addrbuflen, - m_family, - &he, - buffer, - sizeof(buffer), - &err - ) ) - { - return wxString(); - } - - return wxString::FromUTF8(he.h_name); -} - -bool wxSockAddressImpl::SetPortName(const wxString& name, const char *protocol) -{ - // test whether it's a number first - unsigned long port; - if ( name.ToULong(&port) ) - { - if ( port > 65535 ) - return false; - } - else // it's a service name - { - wxGetservBuf buffer; - servent se; - if ( !wxGetservbyname_r(name.utf8_str(), protocol, &se, - buffer, sizeof(buffer)) ) - return false; - - // s_port is in network byte order and SetPort() uses the host byte - // order and we prefer to reuse it from here instead of assigning to - // sin_port directly - port = ntohs(se.s_port); - } - - return SetPort(port); -} - -// ---------------------------------------------------------------------------- -// INET address family -// ---------------------------------------------------------------------------- - -void wxSockAddressImpl::CreateINET() -{ - wxASSERT_MSG( Is(FAMILY_UNSPEC), "recreating address as different type?" ); - - m_family = FAMILY_INET; - sockaddr_in * const addr = Alloc(); - addr->sin_family = FAMILY_INET; -} - -bool wxSockAddressImpl::SetHostName4(const wxString& name) -{ - sockaddr_in * const addr = Get(); - if ( !addr ) - return false; - - const wxScopedCharBuffer namebuf(name.utf8_str()); - - // first check if this is an address in quad dotted notation -#if defined(HAVE_INET_ATON) - if ( inet_aton(namebuf, &addr->sin_addr) ) - return true; -#elif defined(HAVE_INET_ADDR) - addr->sin_addr.s_addr = inet_addr(namebuf); - if ( addr->sin_addr.s_addr != INADDR_NONE ) - return true; -#else - #error "Neither inet_aton() nor inet_addr() is available?" -#endif - - // it's a host name, resolve it - hostent he; - wxGethostBuf buffer; - int err; - if ( !wxGethostbyname_r(namebuf, &he, buffer, sizeof(buffer), &err) ) - return false; - - addr->sin_addr.s_addr = ((in_addr *)he.h_addr)->s_addr; - return true; -} - -bool wxSockAddressImpl::GetHostAddress(wxUint32 *address) const -{ - sockaddr_in * const addr = Get(); - if ( !addr ) - return false; - - *address = ntohl(addr->sin_addr.s_addr); - - return true; -} - -bool wxSockAddressImpl::SetHostAddress(wxUint32 address) -{ - sockaddr_in * const addr = Get(); - if ( !addr ) - return false; - - addr->sin_addr.s_addr = htonl(address); - - return true; -} - -wxUint16 wxSockAddressImpl::GetPort4() const -{ - sockaddr_in * const addr = Get(); - if ( !addr ) - return 0; - - return ntohs(addr->sin_port); -} - -bool wxSockAddressImpl::SetPort4(wxUint16 port) -{ - sockaddr_in * const addr = Get(); - if ( !addr ) - return false; - - addr->sin_port = htons(port); - - return true; -} - -#if wxUSE_IPV6 - -// ---------------------------------------------------------------------------- -// INET6 address family -// ---------------------------------------------------------------------------- - -void wxSockAddressImpl::CreateINET6() -{ - wxASSERT_MSG( Is(FAMILY_UNSPEC), "recreating address as different type?" ); - - m_family = FAMILY_INET6; - sockaddr_in6 * const addr = Alloc(); - addr->sin6_family = FAMILY_INET6; -} - -bool wxSockAddressImpl::SetHostName6(const wxString& hostname) -{ - sockaddr_in6 * const addr = Get(); - if ( !addr ) - return false; - - addrinfo hints; - memset(&hints, 0, sizeof(hints)); - hints.ai_family = AF_INET6; - - addrinfo *info = NULL; - int rc = getaddrinfo(hostname.utf8_str(), NULL, &hints, &info); - if ( rc ) - { - // use gai_strerror()? - return false; - } - - wxCHECK_MSG( info, false, "should have info on success" ); - - wxASSERT_MSG( int(info->ai_addrlen) == m_len, "unexpected address length" ); - - memcpy(addr, info->ai_addr, info->ai_addrlen); - freeaddrinfo(info); - - return true; -} - -bool wxSockAddressImpl::GetHostAddress(in6_addr *address) const -{ - sockaddr_in6 * const addr = Get(); - if ( !addr ) - return false; - - *address = addr->sin6_addr; - - return true; -} - -bool wxSockAddressImpl::SetHostAddress(const in6_addr& address) -{ - sockaddr_in6 * const addr = Get(); - if ( !addr ) - return false; - - addr->sin6_addr = address; - - return true; -} - -wxUint16 wxSockAddressImpl::GetPort6() const -{ - sockaddr_in6 * const addr = Get(); - if ( !addr ) - return 0; - - return ntohs(addr->sin6_port); -} - -bool wxSockAddressImpl::SetPort6(wxUint16 port) -{ - sockaddr_in6 * const addr = Get(); - if ( !addr ) - return false; - - addr->sin6_port = htons(port); - - return true; -} - -bool wxSockAddressImpl::SetToAnyAddress6() -{ - static const in6_addr any = IN6ADDR_ANY_INIT; - - return SetHostAddress(any); -} - -#endif // wxUSE_IPV6 - -#ifdef wxHAS_UNIX_DOMAIN_SOCKETS - -// ---------------------------------------------------------------------------- -// Unix address family -// ---------------------------------------------------------------------------- - -#ifndef UNIX_PATH_MAX - #define UNIX_PATH_MAX (WXSIZEOF(((sockaddr_un *)NULL)->sun_path)) -#endif - -void wxSockAddressImpl::CreateUnix() -{ - wxASSERT_MSG( Is(FAMILY_UNSPEC), "recreating address as different type?" ); - - m_family = FAMILY_UNIX; - sockaddr_un * const addr = Alloc(); - addr->sun_family = FAMILY_UNIX; - addr->sun_path[0] = '\0'; -} - -bool wxSockAddressImpl::SetPath(const wxString& path) -{ - sockaddr_un * const addr = Get(); - if ( !addr ) - return false; - - const wxScopedCharBuffer buf(path.utf8_str()); - if ( strlen(buf) >= UNIX_PATH_MAX ) - return false; - - wxStrlcpy(addr->sun_path, buf, UNIX_PATH_MAX); - - return true; -} - -wxString wxSockAddressImpl::GetPath() const -{ - sockaddr_un * const addr = Get(); - if ( !addr ) - return wxString(); - - return wxString::FromUTF8(addr->sun_path); -} - -#endif // wxHAS_UNIX_DOMAIN_SOCKETS - -// ---------------------------------------------------------------------------- -// wxSockAddress -// ---------------------------------------------------------------------------- - -const sockaddr *wxSockAddress::GetAddressData() const -{ - return GetAddress().GetAddr(); -} - -int wxSockAddress::GetAddressDataLen() const -{ - return GetAddress().GetLen(); -} - -void wxSockAddress::Init() -{ - if ( wxIsMainThread() && !wxSocketBase::IsInitialized() ) - { - // we must do it before using any socket functions - (void)wxSocketBase::Initialize(); - } -} - -wxSockAddress::wxSockAddress() -{ - Init(); - - m_impl = new wxSockAddressImpl(); -} - -wxSockAddress::wxSockAddress(const wxSockAddress& other) - : wxObject() -{ - Init(); - - m_impl = new wxSockAddressImpl(*other.m_impl); -} - -wxSockAddress::~wxSockAddress() -{ - delete m_impl; -} - -void wxSockAddress::SetAddress(const wxSockAddressImpl& address) -{ - if ( &address != m_impl ) - { - delete m_impl; - m_impl = new wxSockAddressImpl(address); - } -} - -wxSockAddress& wxSockAddress::operator=(const wxSockAddress& addr) -{ - SetAddress(addr.GetAddress()); - - return *this; -} - -void wxSockAddress::Clear() -{ - m_impl->Clear(); -} - -// ---------------------------------------------------------------------------- -// wxIPaddress -// ---------------------------------------------------------------------------- - -wxSockAddressImpl& wxIPaddress::GetImpl() -{ - if ( m_impl->GetFamily() == wxSockAddressImpl::FAMILY_UNSPEC ) - m_impl->CreateINET(); - - return *m_impl; -} - -bool wxIPaddress::Hostname(const wxString& name) -{ - wxCHECK_MSG( !name.empty(), false, "empty host name is invalid" ); - - m_origHostname = name; - - return GetImpl().SetHostName(name); -} - -bool wxIPaddress::Service(const wxString& name) -{ - return GetImpl().SetPortName(name, "tcp"); -} - -bool wxIPaddress::Service(unsigned short port) -{ - return GetImpl().SetPort(port); -} - -bool wxIPaddress::LocalHost() -{ - return Hostname("localhost"); -} - -wxString wxIPaddress::Hostname() const -{ - return GetImpl().GetHostName(); -} - -unsigned short wxIPaddress::Service() const -{ - return GetImpl().GetPort(); -} - -bool wxIPaddress::operator==(const wxIPaddress& addr) const -{ - return Hostname().Cmp(addr.Hostname()) == 0 && - Service() == addr.Service(); -} - -bool wxIPaddress::AnyAddress() -{ - return GetImpl().SetToAnyAddress(); -} - -// ---------------------------------------------------------------------------- -// wxIPV4address -// ---------------------------------------------------------------------------- - -void wxIPV4address::DoInitImpl() -{ - m_impl->CreateINET(); -} - -bool wxIPV4address::Hostname(unsigned long addr) -{ - if ( !GetImpl().SetHostAddress(addr) ) - { - m_origHostname.clear(); - return false; - } - - m_origHostname = Hostname(); - return true; -} - -bool wxIPV4address::IsLocalHost() const -{ - return Hostname() == "localhost" || IPAddress() == "127.0.0.1"; -} - -wxString wxIPV4address::IPAddress() const -{ - wxUint32 addr; - if ( !GetImpl().GetHostAddress(&addr) ) - return wxString(); - - return wxString::Format - ( - "%u.%u.%u.%u", - (addr >> 24) & 0xff, - (addr >> 16) & 0xff, - (addr >> 8) & 0xff, - addr & 0xff - ); -} - -bool wxIPV4address::BroadcastAddress() -{ - return GetImpl().SetToBroadcastAddress(); -} - -#if wxUSE_IPV6 - -// --------------------------------------------------------------------------- -// wxIPV6address -// --------------------------------------------------------------------------- - -void wxIPV6address::DoInitImpl() -{ - m_impl->CreateINET6(); -} - -bool wxIPV6address::Hostname(unsigned char addr[16]) -{ - unsigned short wk[8]; - for ( int i = 0; i < 8; ++i ) - { - wk[i] = addr[2*i]; - wk[i] <<= 8; - wk[i] |= addr[2*i+1]; - } - - return Hostname - ( - wxString::Format - ( - "%x:%x:%x:%x:%x:%x:%x:%x", - wk[0], wk[1], wk[2], wk[3], wk[4], wk[5], wk[6], wk[7] - ) - ); -} - -bool wxIPV6address::IsLocalHost() const -{ - if ( Hostname() == "localhost" ) - return true; - - wxString addr = IPAddress(); - return addr == wxT("::1") || - addr == wxT("0:0:0:0:0:0:0:1") || - addr == wxT("::ffff:127.0.0.1"); -} - -wxString wxIPV6address::IPAddress() const -{ - union - { - in6_addr addr6; - wxUint8 bytes[16]; - } u; - - if ( !GetImpl().GetHostAddress(&u.addr6) ) - return wxString(); - - const wxUint8 * const addr = u.bytes; - - wxUint16 words[8]; - int i, - prefix_zero_count = 0; - for ( i = 0; i < 8; ++i ) - { - words[i] = addr[i*2]; - words[i] <<= 8; - words[i] |= addr[i*2+1]; - if ( i == prefix_zero_count && words[i] == 0 ) - ++prefix_zero_count; - } - - wxString result; - if ( prefix_zero_count == 8 ) - { - result = wxT( "::" ); - } - else if ( prefix_zero_count == 6 && words[5] == 0xFFFF ) - { - // IPv4 mapped - result.Printf("::ffff:%d.%d.%d.%d", - addr[12], addr[13], addr[14], addr[15]); - } - else // general case - { - result = ":"; - for ( i = prefix_zero_count; i < 8; ++i ) - { - result += wxString::Format(":%x", words[i]); - } - } - - return result; -} - -#endif // wxUSE_IPV6 - -#ifdef wxHAS_UNIX_DOMAIN_SOCKETS - -// --------------------------------------------------------------------------- -// wxUNIXaddress -// --------------------------------------------------------------------------- - -wxSockAddressImpl& wxUNIXaddress::GetUNIX() -{ - if ( m_impl->GetFamily() == wxSockAddressImpl::FAMILY_UNSPEC ) - m_impl->CreateUnix(); - - return *m_impl; -} - -void wxUNIXaddress::Filename(const wxString& fname) -{ - GetUNIX().SetPath(fname); -} - -wxString wxUNIXaddress::Filename() const -{ - return GetUNIX().GetPath(); -} - -#endif // wxHAS_UNIX_DOMAIN_SOCKETS - -#endif // wxUSE_SOCKETS diff --git a/Externals/wxWidgets3/src/common/sckfile.cpp b/Externals/wxWidgets3/src/common/sckfile.cpp deleted file mode 100644 index 75971e4ba2..0000000000 --- a/Externals/wxWidgets3/src/common/sckfile.cpp +++ /dev/null @@ -1,59 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/sckfile.cpp -// Purpose: File protocol -// Author: Guilhem Lavaux -// Modified by: -// Created: 20/07/97 -// Copyright: (c) 1997, 1998 Guilhem Lavaux -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_STREAMS && wxUSE_PROTOCOL_FILE - -#ifndef WX_PRECOMP -#endif - -#include "wx/uri.h" -#include "wx/wfstream.h" -#include "wx/protocol/file.h" - - -// ---------------------------------------------------------------------------- -// wxFileProto -// ---------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxFileProto, wxProtocol); -IMPLEMENT_PROTOCOL(wxFileProto, wxT("file"), NULL, false) - -wxFileProto::wxFileProto() - : wxProtocol() -{ -} - -wxFileProto::~wxFileProto() -{ -} - -wxInputStream *wxFileProto::GetInputStream(const wxString& path) -{ - wxFileInputStream *retval = new wxFileInputStream(wxURI::Unescape(path)); - if ( retval->IsOk() ) - { - m_lastError = wxPROTO_NOERR; - return retval; - } - - m_lastError = wxPROTO_NOFILE; - delete retval; - - return NULL; -} - -#endif // wxUSE_STREAMS && wxUSE_PROTOCOL_FILE diff --git a/Externals/wxWidgets3/src/common/sckipc.cpp b/Externals/wxWidgets3/src/common/sckipc.cpp deleted file mode 100644 index 14da6e7439..0000000000 --- a/Externals/wxWidgets3/src/common/sckipc.cpp +++ /dev/null @@ -1,931 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/sckipc.cpp -// Purpose: Interprocess communication implementation (wxSocket version) -// Author: Julian Smart -// Modified by: Guilhem Lavaux (big rewrite) May 1997, 1998 -// Guillermo Rodriguez (updated for wxSocket v2) Jan 2000 -// (callbacks deprecated) Mar 2000 -// Vadim Zeitlin (added support for Unix sockets) Apr 2002 -// (use buffering, many fixes/cleanup) Oct 2008 -// Created: 1993 -// Copyright: (c) Julian Smart 1993 -// (c) Guilhem Lavaux 1997, 1998 -// (c) 2000 Guillermo Rodriguez -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ========================================================================== -// declarations -// ========================================================================== - -// -------------------------------------------------------------------------- -// headers -// -------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_SOCKETS && wxUSE_IPC && wxUSE_STREAMS - -#include "wx/sckipc.h" - -#ifndef WX_PRECOMP - #include "wx/log.h" - #include "wx/event.h" - #include "wx/module.h" -#endif - -#include -#include -#include - -#include "wx/socket.h" - -// -------------------------------------------------------------------------- -// macros and constants -// -------------------------------------------------------------------------- - -namespace -{ - -// Message codes (don't change them to avoid breaking the existing code using -// wxIPC protocol!) -enum IPCCode -{ - IPC_EXECUTE = 1, - IPC_REQUEST = 2, - IPC_POKE = 3, - IPC_ADVISE_START = 4, - IPC_ADVISE_REQUEST = 5, - IPC_ADVISE = 6, - IPC_ADVISE_STOP = 7, - IPC_REQUEST_REPLY = 8, - IPC_FAIL = 9, - IPC_CONNECT = 10, - IPC_DISCONNECT = 11, - IPC_MAX -}; - -} // anonymous namespace - -// headers needed for umask() -#ifdef __UNIX_LIKE__ - #include - #include -#endif // __UNIX_LIKE__ - -// ---------------------------------------------------------------------------- -// private functions -// ---------------------------------------------------------------------------- - -// get the address object for the given server name, the caller must delete it -static wxSockAddress * -GetAddressFromName(const wxString& serverName, - const wxString& host = wxEmptyString) -{ - // we always use INET sockets under non-Unix systems -#if defined(__UNIX__) && !defined(__WINDOWS__) && !defined(__WINE__) - // under Unix, if the server name looks like a path, create a AF_UNIX - // socket instead of AF_INET one - if ( serverName.Find(wxT('/')) != wxNOT_FOUND ) - { - wxUNIXaddress *addr = new wxUNIXaddress; - addr->Filename(serverName); - - return addr; - } -#endif // Unix/!Unix - { - wxIPV4address *addr = new wxIPV4address; - addr->Service(serverName); - if ( !host.empty() ) - { - addr->Hostname(host); - } - - return addr; - } -} - -// -------------------------------------------------------------------------- -// wxTCPEventHandler stuff (private class) -// -------------------------------------------------------------------------- - -class wxTCPEventHandler : public wxEvtHandler -{ -public: - wxTCPEventHandler() : wxEvtHandler() { } - - void Client_OnRequest(wxSocketEvent& event); - void Server_OnRequest(wxSocketEvent& event); - -private: - void HandleDisconnect(wxTCPConnection *connection); - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_NO_COPY_CLASS(wxTCPEventHandler); -}; - -enum -{ - _CLIENT_ONREQUEST_ID = 1000, - _SERVER_ONREQUEST_ID -}; - -// -------------------------------------------------------------------------- -// wxTCPEventHandlerModule (private class) -// -------------------------------------------------------------------------- - -class wxTCPEventHandlerModule : public wxModule -{ -public: - wxTCPEventHandlerModule() : wxModule() { } - - // get the global wxTCPEventHandler creating it if necessary - static wxTCPEventHandler& GetHandler() - { - if ( !ms_handler ) - ms_handler = new wxTCPEventHandler; - - return *ms_handler; - } - - // as ms_handler is initialized on demand, don't do anything in OnInit() - virtual bool OnInit() wxOVERRIDE { return true; } - virtual void OnExit() wxOVERRIDE { wxDELETE(ms_handler); } - -private: - static wxTCPEventHandler *ms_handler; - - wxDECLARE_DYNAMIC_CLASS(wxTCPEventHandlerModule); - wxDECLARE_NO_COPY_CLASS(wxTCPEventHandlerModule); -}; - -wxIMPLEMENT_DYNAMIC_CLASS(wxTCPEventHandlerModule, wxModule); - -wxTCPEventHandler *wxTCPEventHandlerModule::ms_handler = NULL; - -// -------------------------------------------------------------------------- -// wxIPCSocketStreams -// -------------------------------------------------------------------------- - -#define USE_BUFFER - -// this class contains the various (related) streams used by wxTCPConnection -// and also provides a way to read from the socket stream directly -// -// for writing to the stream use the IPCOutput class below -class wxIPCSocketStreams -{ -public: - // ctor initializes all the streams on top of the given socket - // - // note that we use a bigger than default buffer size which matches the - // typical Ethernet MTU (minus TCP header overhead) - wxIPCSocketStreams(wxSocketBase& sock) - : m_socketStream(sock), -#ifdef USE_BUFFER - m_bufferedOut(m_socketStream, 1448), -#else - m_bufferedOut(m_socketStream), -#endif - m_dataIn(m_socketStream), - m_dataOut(m_bufferedOut) - { - } - - // expose the IO methods needed by IPC code (notice that writing is only - // done via IPCOutput) - - // flush output - void Flush() - { -#ifdef USE_BUFFER - m_bufferedOut.Sync(); -#endif - } - - // simple wrappers around the functions with the same name in - // wxDataInputStream - wxUint8 Read8() - { - Flush(); - return m_dataIn.Read8(); - } - - wxUint32 Read32() - { - Flush(); - return m_dataIn.Read32(); - } - - wxString ReadString() - { - Flush(); - return m_dataIn.ReadString(); - } - - // read arbitrary (size-prepended) data - // - // connection parameter is needed to call its GetBufferAtLeast() method - void *ReadData(wxConnectionBase *conn, size_t *size) - { - Flush(); - - wxCHECK_MSG( conn, NULL, "NULL connection parameter" ); - wxCHECK_MSG( size, NULL, "NULL size parameter" ); - - *size = Read32(); - - void * const data = conn->GetBufferAtLeast(*size); - wxCHECK_MSG( data, NULL, "IPC buffer allocation failed" ); - - m_socketStream.Read(data, *size); - - return data; - } - - // same as above but for data preceded by the format - void * - ReadFormatData(wxConnectionBase *conn, wxIPCFormat *format, size_t *size) - { - wxCHECK_MSG( format, NULL, "NULL format parameter" ); - - *format = static_cast(Read8()); - - return ReadData(conn, size); - } - - - // these methods are only used by IPCOutput and not directly - wxDataOutputStream& GetDataOut() { return m_dataOut; } - wxOutputStream& GetUnformattedOut() { return m_bufferedOut; } - -private: - // this is the low-level underlying stream using the connection socket - wxSocketStream m_socketStream; - - // the buffered stream is used to avoid writing all pieces of an IPC - // request to the socket one by one but to instead do it all at once when - // we're done with it -#ifdef USE_BUFFER - wxBufferedOutputStream m_bufferedOut; -#else - wxOutputStream& m_bufferedOut; -#endif - - // finally the data streams are used to be able to write typed data into - // the above streams easily - wxDataInputStream m_dataIn; - wxDataOutputStream m_dataOut; - - wxDECLARE_NO_COPY_CLASS(wxIPCSocketStreams); -}; - -namespace -{ - -// an object of this class should be instantiated on the stack to write to the -// underlying socket stream -// -// this class is intentionally separated from wxIPCSocketStreams to ensure that -// Flush() is always called -class IPCOutput -{ -public: - // construct an object associated with the given streams (which must have - // life time greater than ours as we keep a reference to it) - IPCOutput(wxIPCSocketStreams *streams) - : m_streams(*streams) - { - wxASSERT_MSG( streams, "NULL streams pointer" ); - } - - // dtor calls Flush() really sending the IPC data to the network - ~IPCOutput() { m_streams.Flush(); } - - - // write a byte - void Write8(wxUint8 i) - { - m_streams.GetDataOut().Write8(i); - } - - // write the reply code and a string - void Write(IPCCode code, const wxString& str) - { - Write8(code); - m_streams.GetDataOut().WriteString(str); - } - - // write the reply code, a string and a format in this order - void Write(IPCCode code, const wxString& str, wxIPCFormat format) - { - Write(code, str); - Write8(format); - } - - // write arbitrary data - void WriteData(const void *data, size_t size) - { - m_streams.GetDataOut().Write32(size); - m_streams.GetUnformattedOut().Write(data, size); - } - - -private: - wxIPCSocketStreams& m_streams; - - wxDECLARE_NO_COPY_CLASS(IPCOutput); -}; - -} // anonymous namespace - -// ========================================================================== -// implementation -// ========================================================================== - -wxIMPLEMENT_DYNAMIC_CLASS(wxTCPServer, wxServerBase); -wxIMPLEMENT_DYNAMIC_CLASS(wxTCPClient, wxClientBase); -wxIMPLEMENT_CLASS(wxTCPConnection, wxConnectionBase); - -// -------------------------------------------------------------------------- -// wxTCPClient -// -------------------------------------------------------------------------- - -wxTCPClient::wxTCPClient() - : wxClientBase() -{ -} - -bool wxTCPClient::ValidHost(const wxString& host) -{ - wxIPV4address addr; - - return addr.Hostname(host); -} - -wxConnectionBase *wxTCPClient::MakeConnection(const wxString& host, - const wxString& serverName, - const wxString& topic) -{ - wxSockAddress *addr = GetAddressFromName(serverName, host); - if ( !addr ) - return NULL; - - wxSocketClient * const client = new wxSocketClient(wxSOCKET_WAITALL); - wxIPCSocketStreams * const streams = new wxIPCSocketStreams(*client); - - bool ok = client->Connect(*addr); - delete addr; - - if ( ok ) - { - // Send topic name, and enquire whether this has succeeded - IPCOutput(streams).Write(IPC_CONNECT, topic); - - unsigned char msg = streams->Read8(); - - // OK! Confirmation. - if (msg == IPC_CONNECT) - { - wxTCPConnection * - connection = (wxTCPConnection *)OnMakeConnection (); - - if (connection) - { - if (wxDynamicCast(connection, wxTCPConnection)) - { - connection->m_topic = topic; - connection->m_sock = client; - connection->m_streams = streams; - client->SetEventHandler(wxTCPEventHandlerModule::GetHandler(), - _CLIENT_ONREQUEST_ID); - client->SetClientData(connection); - client->SetNotify(wxSOCKET_INPUT_FLAG | wxSOCKET_LOST_FLAG); - client->Notify(true); - return connection; - } - else - { - delete connection; - // and fall through to delete everything else - } - } - } - } - - // Something went wrong, delete everything - delete streams; - client->Destroy(); - - return NULL; -} - -wxConnectionBase *wxTCPClient::OnMakeConnection() -{ - return new wxTCPConnection(); -} - -// -------------------------------------------------------------------------- -// wxTCPServer -// -------------------------------------------------------------------------- - -wxTCPServer::wxTCPServer() - : wxServerBase() -{ - m_server = NULL; -} - -bool wxTCPServer::Create(const wxString& serverName) -{ - // Destroy previous server, if any - if (m_server) - { - m_server->SetClientData(NULL); - m_server->Destroy(); - m_server = NULL; - } - - wxSockAddress *addr = GetAddressFromName(serverName); - if ( !addr ) - return false; - -#ifdef __UNIX_LIKE__ - mode_t umaskOld; - if ( addr->Type() == wxSockAddress::UNIX ) - { - // ensure that the file doesn't exist as otherwise calling socket() - // would fail - int rc = remove(serverName.fn_str()); - if ( rc < 0 && errno != ENOENT ) - { - delete addr; - - return false; - } - - // also set the umask to prevent the others from reading our file - umaskOld = umask(077); - } - else - { - // unused anyhow but shut down the compiler warnings - umaskOld = 0; - } -#endif // __UNIX_LIKE__ - - // Create a socket listening on the specified port (reusing it to allow - // restarting the server listening on the same port as was used by the - // previous instance of this server) - m_server = new wxSocketServer(*addr, wxSOCKET_WAITALL | wxSOCKET_REUSEADDR); - -#ifdef __UNIX_LIKE__ - if ( addr->Type() == wxSockAddress::UNIX ) - { - // restore the umask - umask(umaskOld); - - // save the file name to remove it later - m_filename = serverName; - } -#endif // __UNIX_LIKE__ - - delete addr; - - if (!m_server->IsOk()) - { - m_server->Destroy(); - m_server = NULL; - - return false; - } - - m_server->SetEventHandler(wxTCPEventHandlerModule::GetHandler(), - _SERVER_ONREQUEST_ID); - m_server->SetClientData(this); - m_server->SetNotify(wxSOCKET_CONNECTION_FLAG); - m_server->Notify(true); - - return true; -} - -wxTCPServer::~wxTCPServer() -{ - if ( m_server ) - { - m_server->SetClientData(NULL); - m_server->Destroy(); - } - -#ifdef __UNIX_LIKE__ - if ( !m_filename.empty() ) - { - if ( remove(m_filename.fn_str()) != 0 ) - { - wxLogDebug(wxT("Stale AF_UNIX file '%s' left."), m_filename.c_str()); - } - } -#endif // __UNIX_LIKE__ -} - -wxConnectionBase * -wxTCPServer::OnAcceptConnection(const wxString& WXUNUSED(topic)) -{ - return new wxTCPConnection(); -} - -// -------------------------------------------------------------------------- -// wxTCPConnection -// -------------------------------------------------------------------------- - -void wxTCPConnection::Init() -{ - m_sock = NULL; - m_streams = NULL; -} - -wxTCPConnection::~wxTCPConnection() -{ - Disconnect(); - - if ( m_sock ) - { - m_sock->SetClientData(NULL); - m_sock->Destroy(); - } - - delete m_streams; -} - -void wxTCPConnection::Compress(bool WXUNUSED(on)) -{ - // TODO -} - -// Calls that CLIENT can make. -bool wxTCPConnection::Disconnect() -{ - if ( !GetConnected() ) - return true; - - // Send the disconnect message to the peer. - IPCOutput(m_streams).Write8(IPC_DISCONNECT); - - if ( m_sock ) - { - m_sock->Notify(false); - m_sock->Close(); - } - - SetConnected(false); - - return true; -} - -bool wxTCPConnection::DoExecute(const void *data, - size_t size, - wxIPCFormat format) -{ - if ( !m_sock->IsConnected() ) - return false; - - // Prepare EXECUTE message - IPCOutput out(m_streams); - out.Write8(IPC_EXECUTE); - out.Write8(format); - - out.WriteData(data, size); - - return true; -} - -const void *wxTCPConnection::Request(const wxString& item, - size_t *size, - wxIPCFormat format) -{ - if ( !m_sock->IsConnected() ) - return NULL; - - IPCOutput(m_streams).Write(IPC_REQUEST, item, format); - - const int ret = m_streams->Read8(); - if ( ret != IPC_REQUEST_REPLY ) - return NULL; - - // ReadData() needs a non-NULL size pointer but the client code can call us - // with NULL pointer (this makes sense if it knows that it always works - // with NUL-terminated strings) - size_t sizeFallback; - return m_streams->ReadData(this, size ? size : &sizeFallback); -} - -bool wxTCPConnection::DoPoke(const wxString& item, - const void *data, - size_t size, - wxIPCFormat format) -{ - if ( !m_sock->IsConnected() ) - return false; - - IPCOutput out(m_streams); - out.Write(IPC_POKE, item, format); - out.WriteData(data, size); - - return true; -} - -bool wxTCPConnection::StartAdvise(const wxString& item) -{ - if ( !m_sock->IsConnected() ) - return false; - - IPCOutput(m_streams).Write(IPC_ADVISE_START, item); - - const int ret = m_streams->Read8(); - - return ret == IPC_ADVISE_START; -} - -bool wxTCPConnection::StopAdvise (const wxString& item) -{ - if ( !m_sock->IsConnected() ) - return false; - - IPCOutput(m_streams).Write(IPC_ADVISE_STOP, item); - - const int ret = m_streams->Read8(); - - return ret == IPC_ADVISE_STOP; -} - -// Calls that SERVER can make -bool wxTCPConnection::DoAdvise(const wxString& item, - const void *data, - size_t size, - wxIPCFormat format) -{ - if ( !m_sock->IsConnected() ) - return false; - - IPCOutput out(m_streams); - out.Write(IPC_ADVISE, item, format); - out.WriteData(data, size); - - return true; -} - -// -------------------------------------------------------------------------- -// wxTCPEventHandler (private class) -// -------------------------------------------------------------------------- - -wxBEGIN_EVENT_TABLE(wxTCPEventHandler, wxEvtHandler) - EVT_SOCKET(_CLIENT_ONREQUEST_ID, wxTCPEventHandler::Client_OnRequest) - EVT_SOCKET(_SERVER_ONREQUEST_ID, wxTCPEventHandler::Server_OnRequest) -wxEND_EVENT_TABLE() - -void wxTCPEventHandler::HandleDisconnect(wxTCPConnection *connection) -{ - // connection was closed (either gracefully or not): destroy everything - connection->m_sock->Notify(false); - connection->m_sock->Close(); - - // don't leave references to this soon-to-be-dangling connection in the - // socket as it won't be destroyed immediately as its destruction will be - // delayed in case there are more events pending for it - connection->m_sock->SetClientData(NULL); - - connection->SetConnected(false); - connection->OnDisconnect(); -} - -void wxTCPEventHandler::Client_OnRequest(wxSocketEvent &event) -{ - wxSocketBase *sock = event.GetSocket(); - if (!sock) - return; - - wxSocketNotify evt = event.GetSocketEvent(); - wxTCPConnection * const - connection = static_cast(sock->GetClientData()); - - // This socket is being deleted; skip this event - if (!connection) - return; - - if ( evt == wxSOCKET_LOST ) - { - HandleDisconnect(connection); - return; - } - - // Receive message number. - wxIPCSocketStreams * const streams = connection->m_streams; - - const wxString topic = connection->m_topic; - wxString item; - - bool error = false; - - const int msg = streams->Read8(); - switch ( msg ) - { - case IPC_EXECUTE: - { - wxIPCFormat format; - size_t size wxDUMMY_INITIALIZE(0); - void * const - data = streams->ReadFormatData(connection, &format, &size); - if ( data ) - connection->OnExecute(topic, data, size, format); - else - error = true; - } - break; - - case IPC_ADVISE: - { - item = streams->ReadString(); - - wxIPCFormat format; - size_t size wxDUMMY_INITIALIZE(0); - void * const - data = streams->ReadFormatData(connection, &format, &size); - - if ( data ) - connection->OnAdvise(topic, item, data, size, format); - else - error = true; - } - break; - - case IPC_ADVISE_START: - { - item = streams->ReadString(); - - IPCOutput(streams).Write8(connection->OnStartAdvise(topic, item) - ? IPC_ADVISE_START - : IPC_FAIL); - } - break; - - case IPC_ADVISE_STOP: - { - item = streams->ReadString(); - - IPCOutput(streams).Write8(connection->OnStopAdvise(topic, item) - ? IPC_ADVISE_STOP - : IPC_FAIL); - } - break; - - case IPC_POKE: - { - item = streams->ReadString(); - wxIPCFormat format = (wxIPCFormat)streams->Read8(); - - size_t size wxDUMMY_INITIALIZE(0); - void * const data = streams->ReadData(connection, &size); - - if ( data ) - connection->OnPoke(topic, item, data, size, format); - else - error = true; - } - break; - - case IPC_REQUEST: - { - item = streams->ReadString(); - - wxIPCFormat format = (wxIPCFormat)streams->Read8(); - - size_t user_size = wxNO_LEN; - const void *user_data = connection->OnRequest(topic, - item, - &user_size, - format); - - if ( !user_data ) - { - IPCOutput(streams).Write8(IPC_FAIL); - break; - } - - IPCOutput out(streams); - out.Write8(IPC_REQUEST_REPLY); - - if ( user_size == wxNO_LEN ) - { - switch ( format ) - { - case wxIPC_TEXT: - case wxIPC_UTF8TEXT: - user_size = strlen((const char *)user_data) + 1; // includes final NUL - break; - case wxIPC_UNICODETEXT: - user_size = (wcslen((const wchar_t *)user_data) + 1) * sizeof(wchar_t); // includes final NUL - break; - default: - user_size = 0; - } - } - - out.WriteData(user_data, user_size); - } - break; - - case IPC_DISCONNECT: - HandleDisconnect(connection); - break; - - case IPC_FAIL: - wxLogDebug("Unexpected IPC_FAIL received"); - error = true; - break; - - default: - wxLogDebug("Unknown message code %d received.", msg); - error = true; - break; - } - - if ( error ) - IPCOutput(streams).Write8(IPC_FAIL); -} - -void wxTCPEventHandler::Server_OnRequest(wxSocketEvent &event) -{ - wxSocketServer *server = (wxSocketServer *) event.GetSocket(); - if (!server) - return; - wxTCPServer *ipcserv = (wxTCPServer *) server->GetClientData(); - - // This socket is being deleted; skip this event - if (!ipcserv) - return; - - if (event.GetSocketEvent() != wxSOCKET_CONNECTION) - return; - - // Accept the connection, getting a new socket - wxSocketBase *sock = server->Accept(); - if (!sock) - return; - if (!sock->IsOk()) - { - sock->Destroy(); - return; - } - - wxIPCSocketStreams *streams = new wxIPCSocketStreams(*sock); - - { - IPCOutput out(streams); - - const int msg = streams->Read8(); - if ( msg == IPC_CONNECT ) - { - const wxString topic = streams->ReadString(); - - wxTCPConnection *new_connection = - (wxTCPConnection *)ipcserv->OnAcceptConnection (topic); - - if (new_connection) - { - if (wxDynamicCast(new_connection, wxTCPConnection)) - { - // Acknowledge success - out.Write8(IPC_CONNECT); - - new_connection->m_sock = sock; - new_connection->m_streams = streams; - new_connection->m_topic = topic; - sock->SetEventHandler(wxTCPEventHandlerModule::GetHandler(), - _CLIENT_ONREQUEST_ID); - sock->SetClientData(new_connection); - sock->SetNotify(wxSOCKET_INPUT_FLAG | wxSOCKET_LOST_FLAG); - sock->Notify(true); - return; - } - else - { - delete new_connection; - // and fall through to delete everything else - } - } - } - - // Something went wrong, send failure message and delete everything - out.Write8(IPC_FAIL); - } // IPCOutput object is destroyed here, before destroying stream - - delete streams; - sock->Destroy(); -} - -#endif // wxUSE_SOCKETS && wxUSE_IPC && wxUSE_STREAMS diff --git a/Externals/wxWidgets3/src/common/sckstrm.cpp b/Externals/wxWidgets3/src/common/sckstrm.cpp deleted file mode 100644 index 8f64727d78..0000000000 --- a/Externals/wxWidgets3/src/common/sckstrm.cpp +++ /dev/null @@ -1,87 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/sckstrm.cpp -// Purpose: wxSocket*Stream -// Author: Guilhem Lavaux -// Modified by: -// Created: 17/07/97 -// Copyright: (c) -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_SOCKETS && wxUSE_STREAMS - -#include "wx/sckstrm.h" - -#ifndef WX_PRECOMP - #include "wx/stream.h" -#endif - -#include "wx/socket.h" - -// --------------------------------------------------------------------------- -// wxSocketOutputStream -// --------------------------------------------------------------------------- - -wxSocketOutputStream::wxSocketOutputStream(wxSocketBase& s) - : m_o_socket(&s) -{ -} - -wxSocketOutputStream::~wxSocketOutputStream() -{ -} - -size_t wxSocketOutputStream::OnSysWrite(const void *buffer, size_t size) -{ - const size_t ret = m_o_socket->Write(buffer, size).LastCount(); - m_lasterror = m_o_socket->Error() - ? m_o_socket->IsClosed() ? wxSTREAM_EOF - : wxSTREAM_WRITE_ERROR - : wxSTREAM_NO_ERROR; - return ret; -} - -// --------------------------------------------------------------------------- -// wxSocketInputStream -// --------------------------------------------------------------------------- - -wxSocketInputStream::wxSocketInputStream(wxSocketBase& s) - : m_i_socket(&s) -{ -} - -wxSocketInputStream::~wxSocketInputStream() -{ -} - -size_t wxSocketInputStream::OnSysRead(void *buffer, size_t size) -{ - const size_t ret = m_i_socket->Read(buffer, size).LastCount(); - m_lasterror = m_i_socket->Error() - ? m_i_socket->IsClosed() ? wxSTREAM_EOF - : wxSTREAM_READ_ERROR - : wxSTREAM_NO_ERROR; - return ret; -} - -// --------------------------------------------------------------------------- -// wxSocketStream -// --------------------------------------------------------------------------- - -wxSocketStream::wxSocketStream(wxSocketBase& s) - : wxSocketInputStream(s), wxSocketOutputStream(s) -{ -} - -wxSocketStream::~wxSocketStream() -{ -} - -#endif // wxUSE_STREAMS && wxUSE_SOCKETS diff --git a/Externals/wxWidgets3/src/common/scrolbarcmn.cpp b/Externals/wxWidgets3/src/common/scrolbarcmn.cpp deleted file mode 100644 index 2646be8076..0000000000 --- a/Externals/wxWidgets3/src/common/scrolbarcmn.cpp +++ /dev/null @@ -1,91 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/scrolbarcmn.cpp -// Purpose: wxScrollBar common code -// Author: Julian Smart -// Modified by: -// Created: 04/01/98 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_SCROLLBAR - -#include "wx/scrolbar.h" - -#ifndef WX_PRECOMP - #include "wx/utils.h" - #include "wx/settings.h" -#endif - -extern WXDLLEXPORT_DATA(const char) wxScrollBarNameStr[] = "scrollBar"; - -// ---------------------------------------------------------------------------- -// XTI -// ---------------------------------------------------------------------------- - -wxDEFINE_FLAGS( wxScrollBarStyle ) -wxBEGIN_FLAGS( wxScrollBarStyle ) - // new style border flags, we put them first to - // use them for streaming out - wxFLAGS_MEMBER(wxBORDER_SIMPLE) - wxFLAGS_MEMBER(wxBORDER_SUNKEN) - wxFLAGS_MEMBER(wxBORDER_DOUBLE) - wxFLAGS_MEMBER(wxBORDER_RAISED) - wxFLAGS_MEMBER(wxBORDER_STATIC) - wxFLAGS_MEMBER(wxBORDER_NONE) - - // old style border flags - wxFLAGS_MEMBER(wxSIMPLE_BORDER) - wxFLAGS_MEMBER(wxSUNKEN_BORDER) - wxFLAGS_MEMBER(wxDOUBLE_BORDER) - wxFLAGS_MEMBER(wxRAISED_BORDER) - wxFLAGS_MEMBER(wxSTATIC_BORDER) - wxFLAGS_MEMBER(wxBORDER) - - // standard window styles - wxFLAGS_MEMBER(wxTAB_TRAVERSAL) - wxFLAGS_MEMBER(wxCLIP_CHILDREN) - wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) - wxFLAGS_MEMBER(wxWANTS_CHARS) - wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE) - wxFLAGS_MEMBER(wxALWAYS_SHOW_SB ) - wxFLAGS_MEMBER(wxVSCROLL) - wxFLAGS_MEMBER(wxHSCROLL) - - wxFLAGS_MEMBER(wxSB_HORIZONTAL) - wxFLAGS_MEMBER(wxSB_VERTICAL) -wxEND_FLAGS( wxScrollBarStyle ) - -wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxScrollBar, wxControl, "wx/scrolbar.h"); - -wxBEGIN_PROPERTIES_TABLE(wxScrollBar) - wxEVENT_RANGE_PROPERTY( Scroll, wxEVT_SCROLL_TOP, \ - wxEVT_SCROLL_CHANGED, wxScrollEvent ) - - wxPROPERTY( ThumbPosition, int, SetThumbPosition, GetThumbPosition, 0, \ - 0 /*flags*/, wxT("Helpstring"), wxT("group")) - wxPROPERTY( Range, int, SetRange, GetRange, 0, \ - 0 /*flags*/, wxT("Helpstring"), wxT("group")) - wxPROPERTY( ThumbSize, int, SetThumbSize, GetThumbSize, 0, \ - 0 /*flags*/, wxT("Helpstring"), wxT("group")) - wxPROPERTY( PageSize, int, SetPageSize, GetPageSize, 0, \ - 0 /*flags*/, wxT("Helpstring"), wxT("group")) - - wxPROPERTY_FLAGS( WindowStyle, wxScrollBarStyle, long, SetWindowStyleFlag, \ - GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \ - wxT("Helpstring"), wxT("group")) // style -wxEND_PROPERTIES_TABLE() - -wxEMPTY_HANDLERS_TABLE(wxScrollBar) - -wxCONSTRUCTOR_5( wxScrollBar, wxWindow*, Parent, wxWindowID, Id, \ - wxPoint, Position, wxSize, Size, long, WindowStyle ) - -#endif // wxUSE_SCROLLBAR diff --git a/Externals/wxWidgets3/src/common/selectdispatcher.cpp b/Externals/wxWidgets3/src/common/selectdispatcher.cpp deleted file mode 100644 index 13639392e3..0000000000 --- a/Externals/wxWidgets3/src/common/selectdispatcher.cpp +++ /dev/null @@ -1,270 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/selectdispatcher.cpp -// Purpose: implements dispatcher for select() call -// Author: Lukasz Michalski and Vadim Zeitlin -// Created: December 2006 -// Copyright: (c) 2006 Lukasz Michalski -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// for compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_SELECT_DISPATCHER - -#include "wx/private/selectdispatcher.h" -#include "wx/unix/private.h" - -#ifndef WX_PRECOMP - #include "wx/hash.h" - #include "wx/log.h" - #include "wx/intl.h" -#endif - -#include - -#define wxSelectDispatcher_Trace wxT("selectdispatcher") - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxSelectSets -// ---------------------------------------------------------------------------- - -int wxSelectSets::ms_flags[wxSelectSets::Max] = -{ - wxFDIO_INPUT, - wxFDIO_OUTPUT, - wxFDIO_EXCEPTION, -}; - -const char *wxSelectSets::ms_names[wxSelectSets::Max] = -{ - "input", - "output", - "exceptional", -}; - -wxSelectSets::Callback wxSelectSets::ms_handlers[wxSelectSets::Max] = -{ - &wxFDIOHandler::OnReadWaiting, - &wxFDIOHandler::OnWriteWaiting, - &wxFDIOHandler::OnExceptionWaiting, -}; - -wxSelectSets::wxSelectSets() -{ - for ( int n = 0; n < Max; n++ ) - { - wxFD_ZERO(&m_fds[n]); - } -} - -bool wxSelectSets::HasFD(int fd) const -{ - for ( int n = 0; n < Max; n++ ) - { - if ( wxFD_ISSET(fd, (fd_set*) &m_fds[n]) ) - return true; - } - - return false; -} - -bool wxSelectSets::SetFD(int fd, int flags) -{ - wxCHECK_MSG( fd >= 0, false, wxT("invalid descriptor") ); - - for ( int n = 0; n < Max; n++ ) - { - if ( flags & ms_flags[n] ) - { - wxFD_SET(fd, &m_fds[n]); - } - else if ( wxFD_ISSET(fd, (fd_set*) &m_fds[n]) ) - { - wxFD_CLR(fd, &m_fds[n]); - } - } - - return true; -} - -int wxSelectSets::Select(int nfds, struct timeval *tv) -{ - return select(nfds, &m_fds[Read], &m_fds[Write], &m_fds[Except], tv); -} - -bool wxSelectSets::Handle(int fd, wxFDIOHandler& handler) const -{ - for ( int n = 0; n < Max; n++ ) - { - if ( wxFD_ISSET(fd, (fd_set*) &m_fds[n]) ) - { - wxLogTrace(wxSelectDispatcher_Trace, - wxT("Got %s event on fd %d"), ms_names[n], fd); - (handler.*ms_handlers[n])(); - // callback can modify sets and destroy handler - // this forces that one event can be processed at one time - return true; - } - } - - return false; -} - -// ---------------------------------------------------------------------------- -// wxSelectDispatcher -// ---------------------------------------------------------------------------- - -bool wxSelectDispatcher::RegisterFD(int fd, wxFDIOHandler *handler, int flags) -{ - wxCRIT_SECT_LOCKER(lock, m_cs); - - if ( !wxMappedFDIODispatcher::RegisterFD(fd, handler, flags) ) - return false; - - if ( !m_sets.SetFD(fd, flags) ) - return false; - - if ( fd > m_maxFD ) - m_maxFD = fd; - - wxLogTrace(wxSelectDispatcher_Trace, - wxT("Registered fd %d: input:%d, output:%d, exceptional:%d"), fd, (flags & wxFDIO_INPUT) == wxFDIO_INPUT, (flags & wxFDIO_OUTPUT), (flags & wxFDIO_EXCEPTION) == wxFDIO_EXCEPTION); - return true; -} - -bool wxSelectDispatcher::ModifyFD(int fd, wxFDIOHandler *handler, int flags) -{ - wxCRIT_SECT_LOCKER(lock, m_cs); - - if ( !wxMappedFDIODispatcher::ModifyFD(fd, handler, flags) ) - return false; - - wxASSERT_MSG( fd <= m_maxFD, wxT("logic error: registered fd > m_maxFD?") ); - - wxLogTrace(wxSelectDispatcher_Trace, - wxT("Modified fd %d: input:%d, output:%d, exceptional:%d"), fd, (flags & wxFDIO_INPUT) == wxFDIO_INPUT, (flags & wxFDIO_OUTPUT) == wxFDIO_OUTPUT, (flags & wxFDIO_EXCEPTION) == wxFDIO_EXCEPTION); - return m_sets.SetFD(fd, flags); -} - -bool wxSelectDispatcher::UnregisterFD(int fd) -{ - wxCRIT_SECT_LOCKER(lock, m_cs); - - m_sets.ClearFD(fd); - - if ( !wxMappedFDIODispatcher::UnregisterFD(fd) ) - return false; - - // remove the handler if we don't need it any more - if ( !m_sets.HasFD(fd) ) - { - if ( fd == m_maxFD ) - { - // need to find new max fd - m_maxFD = -1; - for ( wxFDIOHandlerMap::const_iterator it = m_handlers.begin(); - it != m_handlers.end(); - ++it ) - { - if ( it->first > m_maxFD ) - { - m_maxFD = it->first; - } - } - } - } - - wxLogTrace(wxSelectDispatcher_Trace, - wxT("Removed fd %d, current max: %d"), fd, m_maxFD); - return true; -} - -int wxSelectDispatcher::ProcessSets(const wxSelectSets& sets) -{ - int numEvents = 0; - for ( int fd = 0; fd <= m_maxFD; fd++ ) - { - if ( !sets.HasFD(fd) ) - continue; - - wxFDIOHandler * const handler = FindHandler(fd); - if ( !handler ) - { - wxFAIL_MSG( wxT("NULL handler in wxSelectDispatcher?") ); - continue; - } - - if ( sets.Handle(fd, *handler) ) - numEvents++; - } - - return numEvents; -} - -int wxSelectDispatcher::DoSelect(wxSelectSets& sets, int timeout) const -{ - struct timeval tv, - *ptv; - if ( timeout != TIMEOUT_INFINITE ) - { - ptv = &tv; - tv.tv_sec = timeout / 1000; - tv.tv_usec = (timeout % 1000)*1000; - } - else // no timeout - { - ptv = NULL; - } - - int ret = sets.Select(m_maxFD + 1, ptv); - - // TODO: we need to restart select() in this case but for now just return - // as if timeout expired - if ( ret == -1 && errno == EINTR ) - ret = 0; - - return ret; -} - -bool wxSelectDispatcher::HasPending() const -{ - wxSelectSets sets(m_sets); - return DoSelect(sets, 0) > 0; -} - -int wxSelectDispatcher::Dispatch(int timeout) -{ - wxSelectSets sets(m_sets); - switch ( DoSelect(sets, timeout) ) - { - case -1: - wxLogSysError(_("Failed to monitor I/O channels")); - return -1; - - case 0: - // timeout expired without anything happening - return 0; - - default: - return ProcessSets(sets); - } -} - -#endif // wxUSE_SELECT_DISPATCHER diff --git a/Externals/wxWidgets3/src/common/settcmn.cpp b/Externals/wxWidgets3/src/common/settcmn.cpp deleted file mode 100644 index c9c011d5f7..0000000000 --- a/Externals/wxWidgets3/src/common/settcmn.cpp +++ /dev/null @@ -1,68 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/settcmn.cpp -// Purpose: common (to all ports) wxWindow functions -// Author: Robert Roebling -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include "wx/settings.h" - -#ifndef WX_PRECOMP - #include "wx/utils.h" -#endif //WX_PRECOMP - -// ---------------------------------------------------------------------------- -// static data -// ---------------------------------------------------------------------------- - -wxSystemScreenType wxSystemSettings::ms_screen = wxSYS_SCREEN_NONE; - -// ---------------------------------------------------------------------------- -// ---------------------------------------------------------------------------- - -wxSystemScreenType wxSystemSettings::GetScreenType() -{ - if (ms_screen == wxSYS_SCREEN_NONE) - { - // wxUniv will be used on small devices, too. - int x = GetMetric( wxSYS_SCREEN_X ); - - ms_screen = wxSYS_SCREEN_DESKTOP; - - if (x < 800) - ms_screen = wxSYS_SCREEN_SMALL; - - if (x < 640) - ms_screen = wxSYS_SCREEN_PDA; - - if (x < 200) - ms_screen = wxSYS_SCREEN_TINY; - - // This is probably a bug, but VNC seems to report 0 - if (x < 10) - ms_screen = wxSYS_SCREEN_DESKTOP; - } - - return ms_screen; -} - -void wxSystemSettings::SetScreenType( wxSystemScreenType screen ) -{ - ms_screen = screen; -} diff --git a/Externals/wxWidgets3/src/common/sizer.cpp b/Externals/wxWidgets3/src/common/sizer.cpp deleted file mode 100644 index 9ed3bd1c43..0000000000 --- a/Externals/wxWidgets3/src/common/sizer.cpp +++ /dev/null @@ -1,2890 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/sizer.cpp -// Purpose: provide new wxSizer class for layout -// Author: Robert Roebling and Robin Dunn, contributions by -// Dirk Holtwick, Ron Lee -// Modified by: Ron Lee -// Created: -// Copyright: (c) Robin Dunn, Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include "wx/sizer.h" -#include "wx/private/flagscheck.h" - -#ifndef WX_PRECOMP - #include "wx/string.h" - #include "wx/intl.h" - #include "wx/math.h" - #include "wx/utils.h" - #include "wx/settings.h" - #include "wx/button.h" - #include "wx/statbox.h" - #include "wx/toplevel.h" -#endif // WX_PRECOMP - -#include "wx/display.h" -#include "wx/vector.h" -#include "wx/listimpl.cpp" - - -//--------------------------------------------------------------------------- - -wxIMPLEMENT_CLASS(wxSizerItem, wxObject); -wxIMPLEMENT_CLASS(wxSizer, wxObject); -wxIMPLEMENT_CLASS(wxGridSizer, wxSizer); -wxIMPLEMENT_CLASS(wxFlexGridSizer, wxGridSizer); -wxIMPLEMENT_CLASS(wxBoxSizer, wxSizer); -#if wxUSE_STATBOX -wxIMPLEMENT_CLASS(wxStaticBoxSizer, wxBoxSizer); -#endif -#if wxUSE_BUTTON -wxIMPLEMENT_CLASS(wxStdDialogButtonSizer, wxBoxSizer); -#endif - -WX_DEFINE_EXPORTED_LIST( wxSizerItemList ) - -/* - TODO PROPERTIES - sizeritem - object - object_ref - minsize - option - flag - border - spacer - option - flag - borfder - boxsizer - orient - staticboxsizer - orient - label - gridsizer - rows - cols - vgap - hgap - flexgridsizer - rows - cols - vgap - hgap - growablerows - growablecols - minsize -*/ - -// ---------------------------------------------------------------------------- -// wxSizerFlags -// ---------------------------------------------------------------------------- - -#ifdef wxNEEDS_BORDER_IN_PX - -int wxSizerFlags::ms_defaultBorderInPx = 0; - -/* static */ -int wxSizerFlags::DoGetDefaultBorderInPx() -{ - // Hard code 5px as it's the minimal border size between two controls, see - // the table at the bottom of - // https://msdn.microsoft.com/en-us/library/windows/desktop/dn742486.aspx - // - // Of course, ideal would be to use the appropriate sizes for the borders - // between related and unrelated controls, as explained at the above URL, - // but we don't have a way to specify this in our API currently. - // - // We also have to use the DPI for the primary monitor here as we don't - // have any associated window, so this is wrong on systems using multiple - // monitors with different resolutions too -- but, again, without changes - // in the API, there is nothing we can do about this. - return wxWindow::FromDIP(5, NULL); -} - -#endif // wxNEEDS_BORDER_IN_PX - -// ---------------------------------------------------------------------------- -// wxSizerItem -// ---------------------------------------------------------------------------- - -// check for flags conflicts -#if wxDEBUG_LEVEL - -static const int SIZER_FLAGS_MASK = - wxADD_FLAG(wxCENTRE, - wxADD_FLAG(wxHORIZONTAL, - wxADD_FLAG(wxVERTICAL, - wxADD_FLAG(wxLEFT, - wxADD_FLAG(wxRIGHT, - wxADD_FLAG(wxUP, - wxADD_FLAG(wxDOWN, - wxADD_FLAG(wxALIGN_NOT, - wxADD_FLAG(wxALIGN_CENTER_HORIZONTAL, - wxADD_FLAG(wxALIGN_RIGHT, - wxADD_FLAG(wxALIGN_BOTTOM, - wxADD_FLAG(wxALIGN_CENTER_VERTICAL, - wxADD_FLAG(wxFIXED_MINSIZE, - wxADD_FLAG(wxRESERVE_SPACE_EVEN_IF_HIDDEN, - wxADD_FLAG(wxSTRETCH_NOT, - wxADD_FLAG(wxSHRINK, - wxADD_FLAG(wxGROW, - wxADD_FLAG(wxSHAPED, - 0)))))))))))))))))); - -#endif // wxDEBUG_LEVEL - -#define ASSERT_INCOMPATIBLE_NOT_USED_IMPL(f, f1, n1, f2, n2) \ - wxASSERT_MSG(((f) & (f1 | f2)) != (f1 | f2), \ - n1 " and " n2 " can't be used together") - -#define ASSERT_INCOMPATIBLE_NOT_USED(f, f1, f2) \ - ASSERT_INCOMPATIBLE_NOT_USED_IMPL(f, f1, #f1, f2, #f2) - -#define ASSERT_VALID_SIZER_FLAGS(f) \ - wxASSERT_VALID_FLAGS(f, SIZER_FLAGS_MASK); \ - ASSERT_INCOMPATIBLE_NOT_USED(f, wxALIGN_CENTRE_HORIZONTAL, wxALIGN_RIGHT); \ - ASSERT_INCOMPATIBLE_NOT_USED(f, wxALIGN_CENTRE_VERTICAL, wxALIGN_BOTTOM) - - -void wxSizerItem::Init(const wxSizerFlags& flags) -{ - Init(); - - m_proportion = flags.GetProportion(); - m_flag = flags.GetFlags(); - m_border = flags.GetBorderInPixels(); - - ASSERT_VALID_SIZER_FLAGS( m_flag ); -} - -wxSizerItem::wxSizerItem() -{ - Init(); - - m_proportion = 0; - m_border = 0; - m_flag = 0; - m_id = wxID_NONE; -} - -// window item -void wxSizerItem::DoSetWindow(wxWindow *window) -{ - wxCHECK_RET( window, wxT("NULL window in wxSizerItem::SetWindow()") ); - - m_kind = Item_Window; - m_window = window; - - // window doesn't become smaller than its initial size, whatever happens - m_minSize = window->GetSize(); - - if ( m_flag & wxFIXED_MINSIZE ) - window->SetMinSize(m_minSize); - - // aspect ratio calculated from initial size - SetRatio(m_minSize); -} - -wxSizerItem::wxSizerItem(wxWindow *window, - int proportion, - int flag, - int border, - wxObject* userData) - : m_kind(Item_None), - m_proportion(proportion), - m_border(border), - m_flag(flag), - m_id(wxID_NONE), - m_userData(userData) -{ - ASSERT_VALID_SIZER_FLAGS( m_flag ); - - DoSetWindow(window); -} - -// sizer item -void wxSizerItem::DoSetSizer(wxSizer *sizer) -{ - m_kind = Item_Sizer; - m_sizer = sizer; -} - -wxSizerItem::wxSizerItem(wxSizer *sizer, - int proportion, - int flag, - int border, - wxObject* userData) - : m_kind(Item_None), - m_sizer(NULL), - m_proportion(proportion), - m_border(border), - m_flag(flag), - m_id(wxID_NONE), - m_ratio(0.0), - m_userData(userData) -{ - ASSERT_VALID_SIZER_FLAGS( m_flag ); - - DoSetSizer(sizer); - - // m_minSize is set later -} - -// spacer item -void wxSizerItem::DoSetSpacer(const wxSize& size) -{ - m_kind = Item_Spacer; - m_spacer = new wxSizerSpacer(size); - m_minSize = size; - SetRatio(size); -} - -wxSize wxSizerItem::AddBorderToSize(const wxSize& size) const -{ - wxSize result = size; - - // Notice that we shouldn't modify the unspecified component(s) of the - // size, it's perfectly valid to have either min or max size specified in - // one direction only and it shouldn't be applied in the other one then. - - if ( result.x != wxDefaultCoord ) - { - if (m_flag & wxWEST) - result.x += m_border; - if (m_flag & wxEAST) - result.x += m_border; - } - - if ( result.y != wxDefaultCoord ) - { - if (m_flag & wxNORTH) - result.y += m_border; - if (m_flag & wxSOUTH) - result.y += m_border; - } - - return result; -} - -wxSizerItem::wxSizerItem(int width, - int height, - int proportion, - int flag, - int border, - wxObject* userData) - : m_kind(Item_None), - m_sizer(NULL), - m_minSize(width, height), // minimal size is the initial size - m_proportion(proportion), - m_border(border), - m_flag(flag), - m_id(wxID_NONE), - m_userData(userData) -{ - ASSERT_VALID_SIZER_FLAGS( m_flag ); - - DoSetSpacer(wxSize(width, height)); -} - -wxSizerItem::~wxSizerItem() -{ - delete m_userData; - Free(); -} - -void wxSizerItem::Free() -{ - switch ( m_kind ) - { - case Item_None: - break; - - case Item_Window: - m_window->SetContainingSizer(NULL); - break; - - case Item_Sizer: - delete m_sizer; - break; - - case Item_Spacer: - delete m_spacer; - break; - - case Item_Max: - default: - wxFAIL_MSG( wxT("unexpected wxSizerItem::m_kind") ); - } - - m_kind = Item_None; -} - -wxSize wxSizerItem::GetSpacer() const -{ - wxSize size; - if ( m_kind == Item_Spacer ) - size = m_spacer->GetSize(); - - return size; -} - - -wxSize wxSizerItem::GetSize() const -{ - wxSize ret; - switch ( m_kind ) - { - case Item_None: - break; - - case Item_Window: - ret = m_window->GetSize(); - break; - - case Item_Sizer: - ret = m_sizer->GetSize(); - break; - - case Item_Spacer: - ret = m_spacer->GetSize(); - break; - - case Item_Max: - default: - wxFAIL_MSG( wxT("unexpected wxSizerItem::m_kind") ); - } - - if (m_flag & wxWEST) - ret.x += m_border; - if (m_flag & wxEAST) - ret.x += m_border; - if (m_flag & wxNORTH) - ret.y += m_border; - if (m_flag & wxSOUTH) - ret.y += m_border; - - return ret; -} - -bool wxSizerItem::InformFirstDirection(int direction, int size, int availableOtherDir) -{ - // The size that come here will be including borders. Child items should get it - // without borders. - if( size>0 ) - { - if( direction==wxHORIZONTAL ) - { - if (m_flag & wxWEST) - size -= m_border; - if (m_flag & wxEAST) - size -= m_border; - } - else if( direction==wxVERTICAL ) - { - if (m_flag & wxNORTH) - size -= m_border; - if (m_flag & wxSOUTH) - size -= m_border; - } - } - - bool didUse = false; - // Pass the information along to the held object - if (IsSizer()) - { - didUse = GetSizer()->InformFirstDirection(direction,size,availableOtherDir); - if (didUse) - m_minSize = GetSizer()->CalcMin(); - } - else if (IsWindow()) - { - didUse = GetWindow()->InformFirstDirection(direction,size,availableOtherDir); - if (didUse) - m_minSize = m_window->GetEffectiveMinSize(); - - // This information is useful for items with wxSHAPED flag, since - // we can request an optimal min size for such an item. Even if - // we overwrite the m_minSize member here, we can read it back from - // the owned window (happens automatically). - if( (m_flag & wxSHAPED) && (m_flag & wxEXPAND) && direction ) - { - if( !wxIsNullDouble(m_ratio) ) - { - wxCHECK_MSG( m_proportion==0, false, wxT("Shaped item, non-zero proportion in wxSizerItem::InformFirstDirection()") ); - if( direction==wxHORIZONTAL && !wxIsNullDouble(m_ratio) ) - { - // Clip size so that we don't take too much - if( availableOtherDir>=0 && int(size/m_ratio)-m_minSize.y>availableOtherDir ) - size = int((availableOtherDir+m_minSize.y)*m_ratio); - m_minSize = wxSize(size,int(size/m_ratio)); - } - else if( direction==wxVERTICAL ) - { - // Clip size so that we don't take too much - if( availableOtherDir>=0 && int(size*m_ratio)-m_minSize.x>availableOtherDir ) - size = int((availableOtherDir+m_minSize.x)/m_ratio); - m_minSize = wxSize(int(size*m_ratio),size); - } - didUse = true; - } - } - } - - return didUse; -} - -wxSize wxSizerItem::CalcMin() -{ - if (IsSizer()) - { - m_minSize = m_sizer->GetMinSize(); - - // if we have to preserve aspect ratio _AND_ this is - // the first-time calculation, consider ret to be initial size - if ( (m_flag & wxSHAPED) && wxIsNullDouble(m_ratio) ) - SetRatio(m_minSize); - } - else if ( IsWindow() ) - { - // Since the size of the window may change during runtime, we - // should use the current minimal/best size. - m_minSize = m_window->GetEffectiveMinSize(); - } - - return GetMinSizeWithBorder(); -} - -wxSize wxSizerItem::GetMinSizeWithBorder() const -{ - return AddBorderToSize(m_minSize); -} - -wxSize wxSizerItem::GetMaxSizeWithBorder() const -{ - return AddBorderToSize(GetMaxSize()); -} - -void wxSizerItem::SetDimension( const wxPoint& pos_, const wxSize& size_ ) -{ - wxPoint pos = pos_; - wxSize size = size_; - if (m_flag & wxSHAPED) - { - // adjust aspect ratio - int rwidth = (int) (size.y * m_ratio); - if (rwidth > size.x) - { - // fit horizontally - int rheight = (int) (size.x / m_ratio); - // add vertical space - if (m_flag & wxALIGN_CENTER_VERTICAL) - pos.y += (size.y - rheight) / 2; - else if (m_flag & wxALIGN_BOTTOM) - pos.y += (size.y - rheight); - // use reduced dimensions - size.y =rheight; - } - else if (rwidth < size.x) - { - // add horizontal space - if (m_flag & wxALIGN_CENTER_HORIZONTAL) - pos.x += (size.x - rwidth) / 2; - else if (m_flag & wxALIGN_RIGHT) - pos.x += (size.x - rwidth); - size.x = rwidth; - } - } - - // This is what GetPosition() returns. Since we calculate - // borders afterwards, GetPosition() will be the left/top - // corner of the surrounding border. - m_pos = pos; - - if (m_flag & wxWEST) - { - pos.x += m_border; - size.x -= m_border; - } - if (m_flag & wxEAST) - { - size.x -= m_border; - } - if (m_flag & wxNORTH) - { - pos.y += m_border; - size.y -= m_border; - } - if (m_flag & wxSOUTH) - { - size.y -= m_border; - } - - if (size.x < 0) - size.x = 0; - if (size.y < 0) - size.y = 0; - - m_rect = wxRect(pos, size); - - switch ( m_kind ) - { - case Item_None: - wxFAIL_MSG( wxT("can't set size of uninitialized sizer item") ); - break; - - case Item_Window: - { - // Use wxSIZE_FORCE_EVENT here since a sizer item might - // have changed alignment or some other property which would - // not change the size of the window. In such a case, no - // wxSizeEvent would normally be generated and thus the - // control wouldn't get laid out correctly here. -#if 1 - m_window->SetSize(pos.x, pos.y, size.x, size.y, - wxSIZE_ALLOW_MINUS_ONE|wxSIZE_FORCE_EVENT ); -#else - m_window->SetSize(pos.x, pos.y, size.x, size.y, - wxSIZE_ALLOW_MINUS_ONE ); -#endif - break; - } - case Item_Sizer: - m_sizer->SetDimension(pos, size); - break; - - case Item_Spacer: - m_spacer->SetSize(size); - break; - - case Item_Max: - default: - wxFAIL_MSG( wxT("unexpected wxSizerItem::m_kind") ); - } -} - -void wxSizerItem::DeleteWindows() -{ - switch ( m_kind ) - { - case Item_None: - case Item_Spacer: - break; - - case Item_Window: - //We are deleting the window from this sizer - normally - //the window destroys the sizer associated with it, - //which might destroy this, which we don't want - m_window->SetContainingSizer(NULL); - m_window->Destroy(); - //Putting this after the switch will result in a spacer - //not being deleted properly on destruction - m_kind = Item_None; - break; - - case Item_Sizer: - m_sizer->DeleteWindows(); - break; - - case Item_Max: - default: - wxFAIL_MSG( wxT("unexpected wxSizerItem::m_kind") ); - } - -} - -void wxSizerItem::Show( bool show ) -{ - switch ( m_kind ) - { - case Item_None: - wxFAIL_MSG( wxT("can't show uninitialized sizer item") ); - break; - - case Item_Window: - m_window->Show(show); - break; - - case Item_Sizer: - m_sizer->Show(show); - break; - - case Item_Spacer: - m_spacer->Show(show); - break; - - case Item_Max: - default: - wxFAIL_MSG( wxT("unexpected wxSizerItem::m_kind") ); - } -} - -bool wxSizerItem::IsShown() const -{ - if ( m_flag & wxRESERVE_SPACE_EVEN_IF_HIDDEN ) - return true; - - switch ( m_kind ) - { - case Item_None: - // we may be called from CalcMin(), just return false so that we're - // not used - break; - - case Item_Window: - return m_window->IsShown(); - - case Item_Sizer: - // arbitrarily decide that if at least one of our elements is - // shown, so are we (this arbitrariness is the reason for - // deprecating this function) - return m_sizer->AreAnyItemsShown(); - - case Item_Spacer: - return m_spacer->IsShown(); - - case Item_Max: - default: - wxFAIL_MSG( wxT("unexpected wxSizerItem::m_kind") ); - } - - return false; -} - -//--------------------------------------------------------------------------- -// wxSizer -//--------------------------------------------------------------------------- - -wxSizer::~wxSizer() -{ - WX_CLEAR_LIST(wxSizerItemList, m_children); -} - -wxSizerItem* wxSizer::DoInsert( size_t index, wxSizerItem *item ) -{ - m_children.Insert( index, item ); - - if ( item->GetWindow() ) - item->GetWindow()->SetContainingSizer( this ); - - if ( item->GetSizer() ) - item->GetSizer()->SetContainingWindow( m_containingWindow ); - - return item; -} - -void wxSizer::SetContainingWindow(wxWindow *win) -{ - if ( win == m_containingWindow ) - return; - - m_containingWindow = win; - - // set the same window for all nested sizers as well, they also are in the - // same window - for ( wxSizerItemList::compatibility_iterator node = m_children.GetFirst(); - node; - node = node->GetNext() ) - { - wxSizerItem *const item = node->GetData(); - wxSizer *const sizer = item->GetSizer(); - - if ( sizer ) - { - sizer->SetContainingWindow(win); - } - } -} - -bool wxSizer::Remove( wxSizer *sizer ) -{ - wxASSERT_MSG( sizer, wxT("Removing NULL sizer") ); - - wxSizerItemList::compatibility_iterator node = m_children.GetFirst(); - while (node) - { - wxSizerItem *item = node->GetData(); - - if (item->GetSizer() == sizer) - { - delete item; - m_children.Erase( node ); - return true; - } - - node = node->GetNext(); - } - - return false; -} - -bool wxSizer::Remove( int index ) -{ - wxCHECK_MSG( index >= 0 && (size_t)index < m_children.GetCount(), - false, - wxT("Remove index is out of range") ); - - wxSizerItemList::compatibility_iterator node = m_children.Item( index ); - - wxCHECK_MSG( node, false, wxT("Failed to find child node") ); - - delete node->GetData(); - m_children.Erase( node ); - - return true; -} - -bool wxSizer::Detach( wxSizer *sizer ) -{ - wxASSERT_MSG( sizer, wxT("Detaching NULL sizer") ); - - wxSizerItemList::compatibility_iterator node = m_children.GetFirst(); - while (node) - { - wxSizerItem *item = node->GetData(); - - if (item->GetSizer() == sizer) - { - item->DetachSizer(); - delete item; - m_children.Erase( node ); - return true; - } - node = node->GetNext(); - } - - return false; -} - -bool wxSizer::Detach( wxWindow *window ) -{ - wxASSERT_MSG( window, wxT("Detaching NULL window") ); - - wxSizerItemList::compatibility_iterator node = m_children.GetFirst(); - while (node) - { - wxSizerItem *item = node->GetData(); - - if (item->GetWindow() == window) - { - delete item; - m_children.Erase( node ); - return true; - } - node = node->GetNext(); - } - - return false; -} - -bool wxSizer::Detach( int index ) -{ - wxCHECK_MSG( index >= 0 && (size_t)index < m_children.GetCount(), - false, - wxT("Detach index is out of range") ); - - wxSizerItemList::compatibility_iterator node = m_children.Item( index ); - - wxCHECK_MSG( node, false, wxT("Failed to find child node") ); - - wxSizerItem *item = node->GetData(); - - if ( item->IsSizer() ) - item->DetachSizer(); - - delete item; - m_children.Erase( node ); - return true; -} - -bool wxSizer::Replace( wxWindow *oldwin, wxWindow *newwin, bool recursive ) -{ - wxASSERT_MSG( oldwin, wxT("Replacing NULL window") ); - wxASSERT_MSG( newwin, wxT("Replacing with NULL window") ); - - wxSizerItemList::compatibility_iterator node = m_children.GetFirst(); - while (node) - { - wxSizerItem *item = node->GetData(); - - if (item->GetWindow() == oldwin) - { - item->AssignWindow(newwin); - newwin->SetContainingSizer( this ); - return true; - } - else if (recursive && item->IsSizer()) - { - if (item->GetSizer()->Replace( oldwin, newwin, true )) - return true; - } - - node = node->GetNext(); - } - - return false; -} - -bool wxSizer::Replace( wxSizer *oldsz, wxSizer *newsz, bool recursive ) -{ - wxASSERT_MSG( oldsz, wxT("Replacing NULL sizer") ); - wxASSERT_MSG( newsz, wxT("Replacing with NULL sizer") ); - - wxSizerItemList::compatibility_iterator node = m_children.GetFirst(); - while (node) - { - wxSizerItem *item = node->GetData(); - - if (item->GetSizer() == oldsz) - { - item->AssignSizer(newsz); - return true; - } - else if (recursive && item->IsSizer()) - { - if (item->GetSizer()->Replace( oldsz, newsz, true )) - return true; - } - - node = node->GetNext(); - } - - return false; -} - -bool wxSizer::Replace( size_t old, wxSizerItem *newitem ) -{ - wxCHECK_MSG( old < m_children.GetCount(), false, wxT("Replace index is out of range") ); - wxASSERT_MSG( newitem, wxT("Replacing with NULL item") ); - - wxSizerItemList::compatibility_iterator node = m_children.Item( old ); - - wxCHECK_MSG( node, false, wxT("Failed to find child node") ); - - wxSizerItem *item = node->GetData(); - node->SetData(newitem); - - if (item->IsWindow() && item->GetWindow()) - item->GetWindow()->SetContainingSizer(NULL); - - delete item; - - return true; -} - -void wxSizer::Clear( bool delete_windows ) -{ - // First clear the ContainingSizer pointers - wxSizerItemList::compatibility_iterator node = m_children.GetFirst(); - while (node) - { - wxSizerItem *item = node->GetData(); - - if (item->IsWindow()) - item->GetWindow()->SetContainingSizer( NULL ); - node = node->GetNext(); - } - - // Destroy the windows if needed - if (delete_windows) - DeleteWindows(); - - // Now empty the list - WX_CLEAR_LIST(wxSizerItemList, m_children); -} - -void wxSizer::DeleteWindows() -{ - wxSizerItemList::compatibility_iterator node = m_children.GetFirst(); - while (node) - { - wxSizerItem *item = node->GetData(); - - item->DeleteWindows(); - node = node->GetNext(); - } -} - -wxSize wxSizer::ComputeFittingClientSize(wxWindow *window) -{ - wxCHECK_MSG( window, wxDefaultSize, "window can't be NULL" ); - - // take the min size by default and limit it by max size - wxSize size = GetMinClientSize(window); - wxSize sizeMax; - - wxTopLevelWindow *tlw = wxDynamicCast(window, wxTopLevelWindow); - if ( tlw ) - { - // hack for small screen devices where TLWs are always full screen - if ( tlw->IsAlwaysMaximized() ) - { - return tlw->GetClientSize(); - } - - // limit the window to the size of the display it is on - int disp = wxDisplay::GetFromWindow(window); - if ( disp == wxNOT_FOUND ) - { - // or, if we don't know which one it is, of the main one - disp = 0; - } - - sizeMax = wxDisplay(disp).GetClientArea().GetSize(); - - // If determining the display size failed, skip the max size checks as - // we really don't want to create windows of (0, 0) size. - if ( !sizeMax.x || !sizeMax.y ) - return size; - - // space for decorations and toolbars etc. - sizeMax = tlw->WindowToClientSize(sizeMax); - } - else - { - sizeMax = GetMaxClientSize(window); - } - - if ( sizeMax.x != wxDefaultCoord && size.x > sizeMax.x ) - size.x = sizeMax.x; - if ( sizeMax.y != wxDefaultCoord && size.y > sizeMax.y ) - size.y = sizeMax.y; - - return size; -} - -wxSize wxSizer::ComputeFittingWindowSize(wxWindow *window) -{ - wxCHECK_MSG( window, wxDefaultSize, "window can't be NULL" ); - - return window->ClientToWindowSize(ComputeFittingClientSize(window)); -} - -wxSize wxSizer::Fit( wxWindow *window ) -{ - wxCHECK_MSG( window, wxDefaultSize, "window can't be NULL" ); - - // set client size - window->SetClientSize(ComputeFittingClientSize(window)); - - // return entire size - return window->GetSize(); -} - -void wxSizer::FitInside( wxWindow *window ) -{ - wxSize size; - if (window->IsTopLevel()) - size = VirtualFitSize( window ); - else - size = GetMinClientSize( window ); - - window->SetVirtualSize( size ); -} - -void wxSizer::Layout() -{ - // (re)calculates minimums needed for each item and other preparations - // for layout - CalcMin(); - - // Applies the layout and repositions/resizes the items - wxWindow::ChildrenRepositioningGuard repositionGuard(m_containingWindow); - - RecalcSizes(); -} - -void wxSizer::SetSizeHints( wxWindow *window ) -{ - // Preserve the window's max size hints, but set the - // lower bound according to the sizer calculations. - - // This is equivalent to calling Fit(), except that we need to set - // the size hints _in between_ the two steps performed by Fit - // (1. ComputeFittingClientSize, 2. SetClientSize). That's because - // otherwise SetClientSize() could have no effect if there already are - // size hints in effect that forbid requested client size. - - const wxSize clientSize = ComputeFittingClientSize(window); - - window->SetMinClientSize(clientSize); - window->SetClientSize(clientSize); -} - -#if WXWIN_COMPATIBILITY_2_8 -void wxSizer::SetVirtualSizeHints( wxWindow *window ) -{ - FitInside( window ); -} -#endif // WXWIN_COMPATIBILITY_2_8 - -// TODO on mac we need a function that determines how much free space this -// min size contains, in order to make sure that we have 20 pixels of free -// space around the controls -wxSize wxSizer::GetMaxClientSize( wxWindow *window ) const -{ - return window->WindowToClientSize(window->GetMaxSize()); -} - -wxSize wxSizer::GetMinClientSize( wxWindow *WXUNUSED(window) ) -{ - return GetMinSize(); // Already returns client size. -} - -wxSize wxSizer::VirtualFitSize( wxWindow *window ) -{ - wxSize size = GetMinClientSize( window ); - wxSize sizeMax = GetMaxClientSize( window ); - - // Limit the size if sizeMax != wxDefaultSize - - if ( size.x > sizeMax.x && sizeMax.x != wxDefaultCoord ) - size.x = sizeMax.x; - if ( size.y > sizeMax.y && sizeMax.y != wxDefaultCoord ) - size.y = sizeMax.y; - - return size; -} - -wxSize wxSizer::GetMinSize() -{ - wxSize ret( CalcMin() ); - if (ret.x < m_minSize.x) ret.x = m_minSize.x; - if (ret.y < m_minSize.y) ret.y = m_minSize.y; - return ret; -} - -void wxSizer::DoSetMinSize( int width, int height ) -{ - m_minSize.x = width; - m_minSize.y = height; -} - -bool wxSizer::DoSetItemMinSize( wxWindow *window, int width, int height ) -{ - wxASSERT_MSG( window, wxT("SetMinSize for NULL window") ); - - // Is it our immediate child? - - wxSizerItemList::compatibility_iterator node = m_children.GetFirst(); - while (node) - { - wxSizerItem *item = node->GetData(); - - if (item->GetWindow() == window) - { - item->SetMinSize( width, height ); - return true; - } - node = node->GetNext(); - } - - // No? Search any subsizers we own then - - node = m_children.GetFirst(); - while (node) - { - wxSizerItem *item = node->GetData(); - - if ( item->GetSizer() && - item->GetSizer()->DoSetItemMinSize( window, width, height ) ) - { - // A child sizer found the requested windw, exit. - return true; - } - node = node->GetNext(); - } - - return false; -} - -bool wxSizer::DoSetItemMinSize( wxSizer *sizer, int width, int height ) -{ - wxASSERT_MSG( sizer, wxT("SetMinSize for NULL sizer") ); - - // Is it our immediate child? - - wxSizerItemList::compatibility_iterator node = m_children.GetFirst(); - while (node) - { - wxSizerItem *item = node->GetData(); - - if (item->GetSizer() == sizer) - { - item->GetSizer()->DoSetMinSize( width, height ); - return true; - } - node = node->GetNext(); - } - - // No? Search any subsizers we own then - - node = m_children.GetFirst(); - while (node) - { - wxSizerItem *item = node->GetData(); - - if ( item->GetSizer() && - item->GetSizer()->DoSetItemMinSize( sizer, width, height ) ) - { - // A child found the requested sizer, exit. - return true; - } - node = node->GetNext(); - } - - return false; -} - -bool wxSizer::DoSetItemMinSize( size_t index, int width, int height ) -{ - wxSizerItemList::compatibility_iterator node = m_children.Item( index ); - - wxCHECK_MSG( node, false, wxT("Failed to find child node") ); - - wxSizerItem *item = node->GetData(); - - if (item->GetSizer()) - { - // Sizers contains the minimal size in them, if not calculated ... - item->GetSizer()->DoSetMinSize( width, height ); - } - else - { - // ... but the minimal size of spacers and windows is stored via the item - item->SetMinSize( width, height ); - } - - return true; -} - -wxSizerItem* wxSizer::GetItem( wxWindow *window, bool recursive ) -{ - wxASSERT_MSG( window, wxT("GetItem for NULL window") ); - - wxSizerItemList::compatibility_iterator node = m_children.GetFirst(); - while (node) - { - wxSizerItem *item = node->GetData(); - - if (item->GetWindow() == window) - { - return item; - } - else if (recursive && item->IsSizer()) - { - wxSizerItem *subitem = item->GetSizer()->GetItem( window, true ); - if (subitem) - return subitem; - } - - node = node->GetNext(); - } - - return NULL; -} - -wxSizerItem* wxSizer::GetItem( wxSizer *sizer, bool recursive ) -{ - wxASSERT_MSG( sizer, wxT("GetItem for NULL sizer") ); - - wxSizerItemList::compatibility_iterator node = m_children.GetFirst(); - while (node) - { - wxSizerItem *item = node->GetData(); - - if (item->GetSizer() == sizer) - { - return item; - } - else if (recursive && item->IsSizer()) - { - wxSizerItem *subitem = item->GetSizer()->GetItem( sizer, true ); - if (subitem) - return subitem; - } - - node = node->GetNext(); - } - - return NULL; -} - -wxSizerItem* wxSizer::GetItem( size_t index ) -{ - wxCHECK_MSG( index < m_children.GetCount(), - NULL, - wxT("GetItem index is out of range") ); - - return m_children.Item( index )->GetData(); -} - -wxSizerItem* wxSizer::GetItemById( int id, bool recursive ) -{ - // This gets a sizer item by the id of the sizer item - // and NOT the id of a window if the item is a window. - - wxSizerItemList::compatibility_iterator node = m_children.GetFirst(); - while (node) - { - wxSizerItem *item = node->GetData(); - - if (item->GetId() == id) - { - return item; - } - else if (recursive && item->IsSizer()) - { - wxSizerItem *subitem = item->GetSizer()->GetItemById( id, true ); - if (subitem) - return subitem; - } - - node = node->GetNext(); - } - - return NULL; -} - -bool wxSizer::Show( wxWindow *window, bool show, bool recursive ) -{ - wxSizerItem *item = GetItem( window, recursive ); - - if ( item ) - { - item->Show( show ); - return true; - } - - return false; -} - -bool wxSizer::Show( wxSizer *sizer, bool show, bool recursive ) -{ - wxSizerItem *item = GetItem( sizer, recursive ); - - if ( item ) - { - item->Show( show ); - return true; - } - - return false; -} - -bool wxSizer::Show( size_t index, bool show) -{ - wxSizerItem *item = GetItem( index ); - - if ( item ) - { - item->Show( show ); - return true; - } - - return false; -} - -void wxSizer::ShowItems( bool show ) -{ - wxSizerItemList::compatibility_iterator node = m_children.GetFirst(); - while (node) - { - node->GetData()->Show( show ); - node = node->GetNext(); - } -} - -bool wxSizer::AreAnyItemsShown() const -{ - wxSizerItemList::compatibility_iterator node = m_children.GetFirst(); - while (node) - { - if ( node->GetData()->IsShown() ) - return true; - node = node->GetNext(); - } - - return false; -} - -bool wxSizer::IsShown( wxWindow *window ) const -{ - wxSizerItemList::compatibility_iterator node = m_children.GetFirst(); - while (node) - { - wxSizerItem *item = node->GetData(); - - if (item->GetWindow() == window) - { - return item->IsShown(); - } - node = node->GetNext(); - } - - wxFAIL_MSG( wxT("IsShown failed to find sizer item") ); - - return false; -} - -bool wxSizer::IsShown( wxSizer *sizer ) const -{ - wxSizerItemList::compatibility_iterator node = m_children.GetFirst(); - while (node) - { - wxSizerItem *item = node->GetData(); - - if (item->GetSizer() == sizer) - { - return item->IsShown(); - } - node = node->GetNext(); - } - - wxFAIL_MSG( wxT("IsShown failed to find sizer item") ); - - return false; -} - -bool wxSizer::IsShown( size_t index ) const -{ - wxCHECK_MSG( index < m_children.GetCount(), - false, - wxT("IsShown index is out of range") ); - - return m_children.Item( index )->GetData()->IsShown(); -} - - -//--------------------------------------------------------------------------- -// wxGridSizer -//--------------------------------------------------------------------------- - -wxGridSizer::wxGridSizer( int cols, int vgap, int hgap ) - : m_rows( cols == 0 ? 1 : 0 ), - m_cols( cols ), - m_vgap( vgap ), - m_hgap( hgap ) -{ - wxASSERT(cols >= 0); -} - -wxGridSizer::wxGridSizer( int cols, const wxSize& gap ) - : m_rows( cols == 0 ? 1 : 0 ), - m_cols( cols ), - m_vgap( gap.GetHeight() ), - m_hgap( gap.GetWidth() ) -{ - wxASSERT(cols >= 0); -} - -wxGridSizer::wxGridSizer( int rows, int cols, int vgap, int hgap ) - : m_rows( rows || cols ? rows : 1 ), - m_cols( cols ), - m_vgap( vgap ), - m_hgap( hgap ) -{ - wxASSERT(rows >= 0 && cols >= 0); -} - -wxGridSizer::wxGridSizer( int rows, int cols, const wxSize& gap ) - : m_rows( rows || cols ? rows : 1 ), - m_cols( cols ), - m_vgap( gap.GetHeight() ), - m_hgap( gap.GetWidth() ) -{ - wxASSERT(rows >= 0 && cols >= 0); -} - -wxSizerItem *wxGridSizer::DoInsert(size_t index, wxSizerItem *item) -{ - // if only the number of columns or the number of rows is specified for a - // sizer, arbitrarily many items can be added to it but if both of them are - // fixed, then the sizer can't have more than that many items -- check for - // this here to ensure that we detect errors as soon as possible - if ( m_cols && m_rows ) - { - const int nitems = m_children.GetCount(); - if ( nitems == m_cols*m_rows ) - { - wxFAIL_MSG( - wxString::Format( - "too many items (%d > %d*%d) in grid sizer (maybe you " - "should omit the number of either rows or columns?)", - nitems + 1, m_cols, m_rows) - ); - - // additionally, continuing to use the specified number of columns - // and rows is not a good idea as callers of CalcRowsCols() expect - // that all sizer items can fit into m_cols-/m_rows-sized arrays - // which is not the case if there are too many items and results in - // crashes, so let it compute the number of rows automatically by - // forgetting the (wrong) number of rows specified (this also has a - // nice side effect of giving only one assert even if there are - // many more items than allowed in this sizer) - m_rows = 0; - } - } - - const int flags = item->GetFlag(); - if ( flags & wxEXPAND ) - { - // Check that expansion will happen in at least one of the directions. - wxASSERT_MSG - ( - !(flags & (wxALIGN_BOTTOM | wxALIGN_CENTRE_VERTICAL)) || - !(flags & (wxALIGN_RIGHT | wxALIGN_CENTRE_HORIZONTAL)), - wxS("wxEXPAND flag will be overridden by alignment flags") - ); - } - - return wxSizer::DoInsert(index, item); -} - -int wxGridSizer::CalcRowsCols(int& nrows, int& ncols) const -{ - const int nitems = m_children.GetCount(); - - ncols = GetEffectiveColsCount(); - nrows = GetEffectiveRowsCount(); - - // Since Insert() checks for overpopulation, the following - // should only assert if the grid was shrunk via SetRows() / SetCols() - wxASSERT_MSG( nitems <= ncols*nrows, "logic error in wxGridSizer" ); - - return nitems; -} - -void wxGridSizer::RecalcSizes() -{ - int nitems, nrows, ncols; - if ( (nitems = CalcRowsCols(nrows, ncols)) == 0 ) - return; - - wxSize sz( GetSize() ); - wxPoint pt( GetPosition() ); - - int w = (sz.x - (ncols - 1) * m_hgap) / ncols; - int h = (sz.y - (nrows - 1) * m_vgap) / nrows; - - int x = pt.x; - for (int c = 0; c < ncols; c++) - { - int y = pt.y; - for (int r = 0; r < nrows; r++) - { - int i = r * ncols + c; - if (i < nitems) - { - wxSizerItemList::compatibility_iterator node = m_children.Item( i ); - - wxASSERT_MSG( node, wxT("Failed to find SizerItemList node") ); - - SetItemBounds( node->GetData(), x, y, w, h); - } - y = y + h + m_vgap; - } - x = x + w + m_hgap; - } -} - -wxSize wxGridSizer::CalcMin() -{ - int nrows, ncols; - if ( CalcRowsCols(nrows, ncols) == 0 ) - return wxSize(); - - // Find the max width and height for any component - int w = 0; - int h = 0; - - wxSizerItemList::compatibility_iterator node = m_children.GetFirst(); - while (node) - { - wxSizerItem *item = node->GetData(); - wxSize sz( item->CalcMin() ); - - w = wxMax( w, sz.x ); - h = wxMax( h, sz.y ); - - node = node->GetNext(); - } - - // In case we have a nested sizer with a two step algo , give it - // a chance to adjust to that (we give it width component) - node = m_children.GetFirst(); - bool didChangeMinSize = false; - while (node) - { - wxSizerItem *item = node->GetData(); - didChangeMinSize |= item->InformFirstDirection( wxHORIZONTAL, w, -1 ); - - node = node->GetNext(); - } - - // And redo iteration in case min size changed - if( didChangeMinSize ) - { - node = m_children.GetFirst(); - w = h = 0; - while (node) - { - wxSizerItem *item = node->GetData(); - wxSize sz( item->GetMinSizeWithBorder() ); - - w = wxMax( w, sz.x ); - h = wxMax( h, sz.y ); - - node = node->GetNext(); - } - } - - return wxSize( ncols * w + (ncols-1) * m_hgap, - nrows * h + (nrows-1) * m_vgap ); -} - -void wxGridSizer::SetItemBounds( wxSizerItem *item, int x, int y, int w, int h ) -{ - wxPoint pt( x,y ); - wxSize sz( item->GetMinSizeWithBorder() ); - int flag = item->GetFlag(); - - // wxSHAPED maintains aspect ratio and so always applies to both - // directions. - if ( flag & wxSHAPED ) - { - sz = wxSize(w, h); - } - else // Otherwise we handle each direction individually. - { - if (flag & wxALIGN_CENTER_HORIZONTAL) - { - pt.x = x + (w - sz.x) / 2; - } - else if (flag & wxALIGN_RIGHT) - { - pt.x = x + (w - sz.x); - } - else if (flag & wxEXPAND) - { - sz.x = w; - } - - if (flag & wxALIGN_CENTER_VERTICAL) - { - pt.y = y + (h - sz.y) / 2; - } - else if (flag & wxALIGN_BOTTOM) - { - pt.y = y + (h - sz.y); - } - else if ( flag & wxEXPAND ) - { - sz.y = h; - } - } - - item->SetDimension(pt, sz); -} - -//--------------------------------------------------------------------------- -// wxFlexGridSizer -//--------------------------------------------------------------------------- - -wxFlexGridSizer::wxFlexGridSizer( int cols, int vgap, int hgap ) - : wxGridSizer( cols, vgap, hgap ), - m_flexDirection(wxBOTH), - m_growMode(wxFLEX_GROWMODE_SPECIFIED) -{ -} - -wxFlexGridSizer::wxFlexGridSizer( int cols, const wxSize& gap ) - : wxGridSizer( cols, gap ), - m_flexDirection(wxBOTH), - m_growMode(wxFLEX_GROWMODE_SPECIFIED) -{ -} - -wxFlexGridSizer::wxFlexGridSizer( int rows, int cols, int vgap, int hgap ) - : wxGridSizer( rows, cols, vgap, hgap ), - m_flexDirection(wxBOTH), - m_growMode(wxFLEX_GROWMODE_SPECIFIED) -{ -} - -wxFlexGridSizer::wxFlexGridSizer( int rows, int cols, const wxSize& gap ) - : wxGridSizer( rows, cols, gap ), - m_flexDirection(wxBOTH), - m_growMode(wxFLEX_GROWMODE_SPECIFIED) -{ -} - -wxFlexGridSizer::~wxFlexGridSizer() -{ -} - -void wxFlexGridSizer::RecalcSizes() -{ - int nrows, ncols; - if ( !CalcRowsCols(nrows, ncols) ) - return; - - const wxPoint pt(GetPosition()); - const wxSize sz(GetSize()); - - AdjustForGrowables(sz); - - wxSizerItemList::const_iterator i = m_children.begin(); - const wxSizerItemList::const_iterator end = m_children.end(); - - int y = 0; - for ( int r = 0; r < nrows; r++ ) - { - if ( m_rowHeights[r] == -1 ) - { - // this row is entirely hidden, skip it - for ( int c = 0; c < ncols; c++ ) - { - if ( i == end ) - return; - - ++i; - } - - continue; - } - - const int hrow = m_rowHeights[r]; - int h = sz.y - y; // max remaining height, don't overflow it - if ( hrow < h ) - h = hrow; - - int x = 0; - for ( int c = 0; c < ncols && i != end; c++, ++i ) - { - const int wcol = m_colWidths[c]; - - if ( wcol == -1 ) - continue; - - int w = sz.x - x; // max possible value, ensure we don't overflow - if ( wcol < w ) - w = wcol; - - SetItemBounds(*i, pt.x + x, pt.y + y, w, h); - - x += wcol + m_hgap; - } - - if ( i == end ) - return; - - y += hrow + m_vgap; - } -} - -// helper function used in CalcMin() to sum up the sizes of non-hidden items -static int SumArraySizes(const wxArrayInt& sizes, int gap) -{ - // Sum total minimum size, including gaps between rows/columns. - // -1 is used as a magic number meaning empty row/column. - int total = 0; - - const size_t count = sizes.size(); - for ( size_t n = 0; n < count; n++ ) - { - if ( sizes[n] != -1 ) - { - if ( total ) - total += gap; // separate from the previous column - - total += sizes[n]; - } - } - - return total; -} - -void wxFlexGridSizer::FindWidthsAndHeights(int nrows, int ncols) -{ - // We have to recalculate the sizes in case the item minimum size has - // changed since the previous layout, or the item has been hidden using - // wxSizer::Show(). If all the items in a row/column are hidden, the final - // dimension of the row/column will be -1, indicating that the column - // itself is hidden. - m_rowHeights.assign(nrows, -1); - m_colWidths.assign(ncols, -1); - - // n is the index of the item in left-to-right top-to-bottom order - size_t n = 0; - for ( wxSizerItemList::iterator i = m_children.begin(); - i != m_children.end(); - ++i, ++n ) - { - wxSizerItem * const item = *i; - if ( item->IsShown() ) - { - // NOTE: Not doing the calculation here, this is just - // for finding max values. - const wxSize sz(item->GetMinSizeWithBorder()); - - const int row = n / ncols; - const int col = n % ncols; - - if ( sz.y > m_rowHeights[row] ) - m_rowHeights[row] = sz.y; - if ( sz.x > m_colWidths[col] ) - m_colWidths[col] = sz.x; - } - } - - AdjustForFlexDirection(); - - m_calculatedMinSize = wxSize(SumArraySizes(m_colWidths, m_hgap), - SumArraySizes(m_rowHeights, m_vgap)); -} - -wxSize wxFlexGridSizer::CalcMin() -{ - int nrows, - ncols; - - // Number of rows/columns can change as items are added or removed. - if ( !CalcRowsCols(nrows, ncols) ) - return wxSize(); - - - // We have to recalculate the sizes in case the item minimum size has - // changed since the previous layout, or the item has been hidden using - // wxSizer::Show(). If all the items in a row/column are hidden, the final - // dimension of the row/column will be -1, indicating that the column - // itself is hidden. - m_rowHeights.assign(nrows, -1); - m_colWidths.assign(ncols, -1); - - for ( wxSizerItemList::iterator i = m_children.begin(); - i != m_children.end(); - ++i) - { - wxSizerItem * const item = *i; - if ( item->IsShown() ) - { - item->CalcMin(); - } - } - - // The stage of looking for max values in each row/column has been - // made a separate function, since it's reused in AdjustForGrowables. - FindWidthsAndHeights(nrows,ncols); - - return m_calculatedMinSize; -} - -void wxFlexGridSizer::AdjustForFlexDirection() -{ - // the logic in CalcMin works when we resize flexibly in both directions - // but maybe this is not the case - if ( m_flexDirection != wxBOTH ) - { - // select the array corresponding to the direction in which we do *not* - // resize flexibly - wxArrayInt& array = m_flexDirection == wxVERTICAL ? m_colWidths - : m_rowHeights; - - const size_t count = array.GetCount(); - - // find the largest value in this array - size_t n; - int largest = 0; - - for ( n = 0; n < count; ++n ) - { - if ( array[n] > largest ) - largest = array[n]; - } - - // and now fill it with the largest value - for ( n = 0; n < count; ++n ) - { - // don't touch hidden rows - if ( array[n] != -1 ) - array[n] = largest; - } - } -} - -// helper of AdjustForGrowables() which is called for rows/columns separately -// -// parameters: -// delta: the extra space, we do nothing unless it's positive -// growable: indices or growable rows/cols in sizes array -// sizes: the height/widths of rows/cols to adjust -// proportions: proportions of the growable rows/cols or NULL if they all -// should be assumed to have proportion of 1 -static void -DoAdjustForGrowables(int delta, - const wxArrayInt& growable, - wxArrayInt& sizes, - const wxArrayInt *proportions) -{ - if ( delta <= 0 ) - return; - - // total sum of proportions of all non-hidden rows - int sum_proportions = 0; - - // number of currently shown growable rows - int num = 0; - - const int max_idx = sizes.size(); - - const size_t count = growable.size(); - size_t idx; - for ( idx = 0; idx < count; idx++ ) - { - // Since the number of rows/columns can change as items are - // inserted/deleted, we need to verify at runtime that the - // requested growable rows/columns are still valid. - if ( growable[idx] >= max_idx ) - continue; - - // If all items in a row/column are hidden, that row/column will - // have a dimension of -1. This causes the row/column to be - // hidden completely. - if ( sizes[growable[idx]] == -1 ) - continue; - - if ( proportions ) - sum_proportions += (*proportions)[idx]; - - num++; - } - - if ( !num ) - return; - - // the remaining extra free space, adjusted during each iteration - for ( idx = 0; idx < count; idx++ ) - { - if ( growable[idx] >= max_idx ) - continue; - - if ( sizes[ growable[idx] ] == -1 ) - continue; - - int cur_delta; - if ( sum_proportions == 0 ) - { - // no growable rows -- divide extra space evenly among all - cur_delta = delta/num; - num--; - } - else // allocate extra space proportionally - { - const int cur_prop = (*proportions)[idx]; - cur_delta = (delta*cur_prop)/sum_proportions; - sum_proportions -= cur_prop; - } - - sizes[growable[idx]] += cur_delta; - delta -= cur_delta; - } -} - -void wxFlexGridSizer::AdjustForGrowables(const wxSize& sz) -{ -#if wxDEBUG_LEVEL - // by the time this function is called, the sizer should be already fully - // initialized and hence the number of its columns and rows is known and we - // can check that all indices in m_growableCols/Rows are valid (see also - // comments in AddGrowableCol/Row()) - if ( !m_rows || !m_cols ) - { - if ( !m_rows ) - { - int nrows = CalcRows(); - - for ( size_t n = 0; n < m_growableRows.size(); n++ ) - { - wxASSERT_MSG( m_growableRows[n] < nrows, - "invalid growable row index" ); - } - } - - if ( !m_cols ) - { - int ncols = CalcCols(); - - for ( size_t n = 0; n < m_growableCols.size(); n++ ) - { - wxASSERT_MSG( m_growableCols[n] < ncols, - "invalid growable column index" ); - } - } - } -#endif // wxDEBUG_LEVEL - - - if ( (m_flexDirection & wxHORIZONTAL) || (m_growMode != wxFLEX_GROWMODE_NONE) ) - { - DoAdjustForGrowables - ( - sz.x - m_calculatedMinSize.x, - m_growableCols, - m_colWidths, - m_growMode == wxFLEX_GROWMODE_SPECIFIED ? &m_growableColsProportions - : NULL - ); - - // This gives nested objects that benefit from knowing one size - // component in advance the chance to use that. - bool didAdjustMinSize = false; - - // Iterate over all items and inform about column width - const int ncols = GetEffectiveColsCount(); - int col = 0; - for ( wxSizerItemList::iterator i = m_children.begin(); - i != m_children.end(); - ++i ) - { - didAdjustMinSize |= (*i)->InformFirstDirection(wxHORIZONTAL, m_colWidths[col], sz.y - m_calculatedMinSize.y); - if ( ++col == ncols ) - col = 0; - } - - // Only redo if info was actually used - if( didAdjustMinSize ) - { - DoAdjustForGrowables - ( - sz.x - m_calculatedMinSize.x, - m_growableCols, - m_colWidths, - m_growMode == wxFLEX_GROWMODE_SPECIFIED ? &m_growableColsProportions - : NULL - ); - } - } - - if ( (m_flexDirection & wxVERTICAL) || (m_growMode != wxFLEX_GROWMODE_NONE) ) - { - // pass NULL instead of proportions if the grow mode is ALL as we - // should treat all rows as having proportion of 1 then - DoAdjustForGrowables - ( - sz.y - m_calculatedMinSize.y, - m_growableRows, - m_rowHeights, - m_growMode == wxFLEX_GROWMODE_SPECIFIED ? &m_growableRowsProportions - : NULL - ); - } -} - -bool wxFlexGridSizer::IsRowGrowable( size_t idx ) -{ - return m_growableRows.Index( idx ) != wxNOT_FOUND; -} - -bool wxFlexGridSizer::IsColGrowable( size_t idx ) -{ - return m_growableCols.Index( idx ) != wxNOT_FOUND; -} - -void wxFlexGridSizer::AddGrowableRow( size_t idx, int proportion ) -{ - wxASSERT_MSG( !IsRowGrowable( idx ), - "AddGrowableRow() called for growable row" ); - - // notice that we intentionally don't check the index validity here in (the - // common) case when the number of rows was not specified in the ctor -- in - // this case it will be computed only later, when all items are added to - // the sizer, and the check will be done in AdjustForGrowables() - wxCHECK_RET( !m_rows || idx < (size_t)m_rows, "invalid row index" ); - - m_growableRows.Add( idx ); - m_growableRowsProportions.Add( proportion ); -} - -void wxFlexGridSizer::AddGrowableCol( size_t idx, int proportion ) -{ - wxASSERT_MSG( !IsColGrowable( idx ), - "AddGrowableCol() called for growable column" ); - - // see comment in AddGrowableRow(): although it's less common to omit the - // specification of the number of columns, it still can also happen - wxCHECK_RET( !m_cols || idx < (size_t)m_cols, "invalid column index" ); - - m_growableCols.Add( idx ); - m_growableColsProportions.Add( proportion ); -} - -// helper function for RemoveGrowableCol/Row() -static void -DoRemoveFromArrays(size_t idx, wxArrayInt& items, wxArrayInt& proportions) -{ - const size_t count = items.size(); - for ( size_t n = 0; n < count; n++ ) - { - if ( (size_t)items[n] == idx ) - { - items.RemoveAt(n); - proportions.RemoveAt(n); - return; - } - } - - wxFAIL_MSG( wxT("column/row is already not growable") ); -} - -void wxFlexGridSizer::RemoveGrowableCol( size_t idx ) -{ - DoRemoveFromArrays(idx, m_growableCols, m_growableColsProportions); -} - -void wxFlexGridSizer::RemoveGrowableRow( size_t idx ) -{ - DoRemoveFromArrays(idx, m_growableRows, m_growableRowsProportions); -} - -//--------------------------------------------------------------------------- -// wxBoxSizer -//--------------------------------------------------------------------------- - -wxSizerItem *wxBoxSizer::DoInsert(size_t index, wxSizerItem *item) -{ - const int flags = item->GetFlag(); - if ( IsVertical() ) - { - wxASSERT_MSG - ( - !(flags & wxALIGN_BOTTOM), - wxS("Vertical alignment flags are ignored in vertical sizers") - ); - - // We need to accept wxALIGN_CENTRE_VERTICAL when it is combined with - // wxALIGN_CENTRE_HORIZONTAL because this is known as wxALIGN_CENTRE - // and we accept it historically in wxSizer API. - if ( !(flags & wxALIGN_CENTRE_HORIZONTAL) ) - { - wxASSERT_MSG - ( - !(flags & wxALIGN_CENTRE_VERTICAL), - wxS("Vertical alignment flags are ignored in vertical sizers") - ); - } - - if ( flags & wxEXPAND ) - { - wxASSERT_MSG - ( - !(flags & (wxALIGN_RIGHT | wxALIGN_CENTRE_HORIZONTAL)), - wxS("Horizontal alignment flags are ignored with wxEXPAND") - ); - } - } - else // horizontal - { - wxASSERT_MSG - ( - !(flags & wxALIGN_RIGHT), - wxS("Horizontal alignment flags are ignored in horizontal sizers") - ); - - if ( !(flags & wxALIGN_CENTRE_VERTICAL) ) - { - wxASSERT_MSG - ( - !(flags & wxALIGN_CENTRE_HORIZONTAL), - wxS("Horizontal alignment flags are ignored in horizontal sizers") - ); - } - - if ( flags & wxEXPAND ) - { - wxASSERT_MSG( - !(flags & (wxALIGN_BOTTOM | wxALIGN_CENTRE_VERTICAL)), - wxS("Vertical alignment flags are ignored with wxEXPAND") - ); - } - } - - return wxSizer::DoInsert(index, item); -} - -wxSizerItem *wxBoxSizer::AddSpacer(int size) -{ - return IsVertical() ? Add(0, size) : Add(size, 0); -} - -namespace -{ - -/* - Helper of RecalcSizes(): checks if there is enough remaining space for the - min size of the given item and returns its min size or the entire remaining - space depending on which one is greater. - - This function updates the remaining space parameter to account for the size - effectively allocated to the item. - */ -int -GetMinOrRemainingSize(int orient, const wxSizerItem *item, int *remainingSpace_) -{ - int& remainingSpace = *remainingSpace_; - - wxCoord size; - if ( remainingSpace > 0 ) - { - const wxSize sizeMin = item->GetMinSizeWithBorder(); - size = orient == wxHORIZONTAL ? sizeMin.x : sizeMin.y; - - if ( size >= remainingSpace ) - { - // truncate the item to fit in the remaining space, this is better - // than showing it only partially in general, even if both choices - // are bad -- but there is nothing else we can do - size = remainingSpace; - } - - remainingSpace -= size; - } - else // no remaining space - { - // no space at all left, no need to even query the item for its min - // size as we can't give it to it anyhow - size = 0; - } - - return size; -} - -} // anonymous namespace - -void wxBoxSizer::RecalcSizes() -{ - if ( m_children.empty() ) - return; - - const wxCoord totalMinorSize = GetSizeInMinorDir(m_size); - const wxCoord totalMajorSize = GetSizeInMajorDir(m_size); - - // the amount of free space which we should redistribute among the - // stretchable items (i.e. those with non zero proportion) - int delta = totalMajorSize - GetSizeInMajorDir(m_calculatedMinSize); - - // declare loop variables used below: - wxSizerItemList::const_iterator i; // iterator in m_children list - unsigned n = 0; // item index in majorSizes array - - - // First, inform item about the available size in minor direction as this - // can change their size in the major direction. Also compute the number of - // visible items and sum of their min sizes in major direction. - - int minMajorSize = 0; - for ( i = m_children.begin(); i != m_children.end(); ++i ) - { - wxSizerItem * const item = *i; - - if ( !item->IsShown() ) - continue; - - wxSize szMinPrev = item->GetMinSizeWithBorder(); - item->InformFirstDirection(m_orient^wxBOTH,totalMinorSize,delta); - wxSize szMin = item->GetMinSizeWithBorder(); - int deltaChange = GetSizeInMajorDir(szMin-szMinPrev); - if( deltaChange ) - { - // Since we passed available space along to the item, it should not - // take too much, so delta should not become negative. - delta -= deltaChange; - } - minMajorSize += GetSizeInMajorDir(item->GetMinSizeWithBorder()); - } - - - // space and sum of proportions for the remaining items, both may change - // below - wxCoord remaining = totalMajorSize; - int totalProportion = m_totalProportion; - - // size of the (visible) items in major direction, -1 means "not fixed yet" - wxVector majorSizes(GetItemCount(), wxDefaultCoord); - - - // Check for the degenerated case when we don't have enough space for even - // the min sizes of all the items: in this case we really can't do much - // more than to allocate the min size to as many of fixed size items as - // possible (on the assumption that variable size items such as text zones - // or list boxes may use scrollbars to show their content even if their - // size is less than min size but that fixed size items such as buttons - // will suffer even more if we don't give them their min size) - if ( totalMajorSize < minMajorSize ) - { - // Second degenerated case pass: allocate min size to all fixed size - // items. - for ( i = m_children.begin(), n = 0; i != m_children.end(); ++i, ++n ) - { - wxSizerItem * const item = *i; - - if ( !item->IsShown() ) - continue; - - // deal with fixed size items only during this pass - if ( item->GetProportion() ) - continue; - - majorSizes[n] = GetMinOrRemainingSize(m_orient, item, &remaining); - } - - - // Third degenerated case pass: allocate min size to all the remaining, - // i.e. non-fixed size, items. - for ( i = m_children.begin(), n = 0; i != m_children.end(); ++i, ++n ) - { - wxSizerItem * const item = *i; - - if ( !item->IsShown() ) - continue; - - // we've already dealt with fixed size items above - if ( !item->GetProportion() ) - continue; - - majorSizes[n] = GetMinOrRemainingSize(m_orient, item, &remaining); - } - } - else // we do have enough space to give at least min sizes to all items - { - // Second and maybe more passes in the non-degenerated case: deal with - // fixed size items and items whose min size is greater than what we - // would allocate to them taking their proportion into account. For - // both of them, we will just use their min size, but for the latter we - // also need to reexamine all the items as the items which fitted - // before we adjusted their size upwards might not fit any more. This - // does make for a quadratic algorithm but it's not obvious how to - // avoid it and hopefully it's not a huge problem in practice as the - // sizers don't have many items usually (and, of course, the algorithm - // still reduces into a linear one if there is enough space for all the - // min sizes). - bool nonFixedSpaceChanged = false; - for ( i = m_children.begin(), n = 0; ; ++i, ++n ) - { - if ( nonFixedSpaceChanged ) - { - i = m_children.begin(); - n = 0; - nonFixedSpaceChanged = false; - } - - // check for the end of the loop only after the check above as - // otherwise we wouldn't do another pass if the last child resulted - // in non fixed space reduction - if ( i == m_children.end() ) - break; - - wxSizerItem * const item = *i; - - if ( !item->IsShown() ) - continue; - - // don't check the item which we had already dealt with during a - // previous pass (this is more than an optimization, the code - // wouldn't work correctly if we kept adjusting for the same item - // over and over again) - if ( majorSizes[n] != wxDefaultCoord ) - continue; - - wxCoord minMajor = GetSizeInMajorDir(item->GetMinSizeWithBorder()); - - // it doesn't make sense for min size to be negative but right now - // it's possible to create e.g. a spacer with (-1, 10) as size and - // people do it in their code apparently (see #11842) so ensure - // that we don't use this -1 as real min size as it conflicts with - // the meaning we use for it here and negative min sizes just don't - // make sense anyhow (which is why it might be a better idea to - // deal with them at wxSizerItem level in the future but for now - // this is the minimal fix for the bug) - if ( minMajor < 0 ) - minMajor = 0; - - const int propItem = item->GetProportion(); - if ( propItem ) - { - // is the desired size of this item big enough? - if ( (remaining*propItem)/totalProportion >= minMajor ) - { - // yes, it is, we'll determine the real size of this - // item later, for now just leave it as wxDefaultCoord - continue; - } - - // the proportion of this item won't count, it has - // effectively become fixed - totalProportion -= propItem; - } - - // we can already allocate space for this item - majorSizes[n] = minMajor; - - // change the amount of the space remaining to the other items, - // as this can result in not being able to satisfy their - // proportions any more we will need to redo another loop - // iteration - remaining -= minMajor; - - nonFixedSpaceChanged = true; - } - - // Similar to the previous loop, but dealing with items whose max size - // is less than what we would allocate to them taking their proportion - // into account. - nonFixedSpaceChanged = false; - for ( i = m_children.begin(), n = 0; ; ++i, ++n ) - { - if ( nonFixedSpaceChanged ) - { - i = m_children.begin(); - n = 0; - nonFixedSpaceChanged = false; - } - - // check for the end of the loop only after the check above as - // otherwise we wouldn't do another pass if the last child resulted - // in non fixed space reduction - if ( i == m_children.end() ) - break; - - wxSizerItem * const item = *i; - - if ( !item->IsShown() ) - continue; - - // don't check the item which we had already dealt with during a - // previous pass (this is more than an optimization, the code - // wouldn't work correctly if we kept adjusting for the same item - // over and over again) - if ( majorSizes[n] != wxDefaultCoord ) - continue; - - wxCoord maxMajor = GetSizeInMajorDir(item->GetMaxSizeWithBorder()); - - // must be nonzero, fixed-size items were dealt with in previous loop - const int propItem = item->GetProportion(); - - // is the desired size of this item small enough? - if ( maxMajor < 0 || - (remaining*propItem)/totalProportion <= maxMajor ) - { - // yes, it is, we'll determine the real size of this - // item later, for now just leave it as wxDefaultCoord - continue; - } - - // the proportion of this item won't count, it has - // effectively become fixed - totalProportion -= propItem; - - // we can already allocate space for this item - majorSizes[n] = maxMajor; - - // change the amount of the space remaining to the other items, - // as this can result in not being able to satisfy their - // proportions any more we will need to redo another loop - // iteration - remaining -= maxMajor; - - nonFixedSpaceChanged = true; - } - - // Last by one pass: distribute the remaining space among the non-fixed - // items whose size weren't fixed yet according to their proportions. - for ( i = m_children.begin(), n = 0; i != m_children.end(); ++i, ++n ) - { - wxSizerItem * const item = *i; - - if ( !item->IsShown() ) - continue; - - if ( majorSizes[n] == wxDefaultCoord ) - { - const int propItem = item->GetProportion(); - majorSizes[n] = (remaining*propItem)/totalProportion; - - remaining -= majorSizes[n]; - totalProportion -= propItem; - } - } - } - - - // the position at which we put the next child - wxPoint pt(m_position); - - - // Final pass: finally do position the items correctly using their sizes as - // determined above. - for ( i = m_children.begin(), n = 0; i != m_children.end(); ++i, ++n ) - { - wxSizerItem * const item = *i; - - if ( !item->IsShown() ) - continue; - - const int majorSize = majorSizes[n]; - - const wxSize sizeThis(item->GetMinSizeWithBorder()); - - // apply the alignment in the minor direction - wxPoint posChild(pt); - - wxCoord minorSize = GetSizeInMinorDir(sizeThis); - const int flag = item->GetFlag(); - if ( (flag & (wxEXPAND | wxSHAPED)) || (minorSize > totalMinorSize) ) - { - // occupy all the available space if wxEXPAND was given and also if - // the item is too big to fit -- in this case we truncate it below - // its minimal size which is bad but better than not showing parts - // of the window at all - minorSize = totalMinorSize; - - // do not allow the size in the minor direction to grow beyond the max - // size of the item in the minor direction - const wxCoord maxMinorSize = GetSizeInMinorDir(item->GetMaxSizeWithBorder()); - if ( maxMinorSize >= 0 && minorSize > maxMinorSize ) - minorSize = maxMinorSize; - } - - if ( flag & (IsVertical() ? wxALIGN_RIGHT : wxALIGN_BOTTOM) ) - { - PosInMinorDir(posChild) += totalMinorSize - minorSize; - } - // NB: wxCENTRE is used here only for backwards compatibility, - // wxALIGN_CENTRE should be used in new code - else if ( flag & (wxCENTER | (IsVertical() ? wxALIGN_CENTRE_HORIZONTAL - : wxALIGN_CENTRE_VERTICAL)) ) - { - PosInMinorDir(posChild) += (totalMinorSize - minorSize) / 2; - } - - - // apply RTL adjustment for horizontal sizers: - if ( !IsVertical() && m_containingWindow ) - { - posChild.x = m_containingWindow->AdjustForLayoutDirection - ( - posChild.x, - majorSize, - m_size.x - ); - } - - // finally set size of this child and advance to the next one - item->SetDimension(posChild, SizeFromMajorMinor(majorSize, minorSize)); - - PosInMajorDir(pt) += majorSize; - } -} - -wxSize wxBoxSizer::CalcMin() -{ - m_totalProportion = 0; - m_calculatedMinSize = wxSize(0, 0); - - // The minimal size for the sizer should be big enough to allocate its - // element at least its minimal size but also, and this is the non trivial - // part, to respect the children proportion. To satisfy the latter - // condition we must find the greatest min-size-to-proportion ratio for all - // elements with non-zero proportion. - float maxMinSizeToProp = 0.; - for ( wxSizerItemList::const_iterator i = m_children.begin(); - i != m_children.end(); - ++i ) - { - wxSizerItem * const item = *i; - - if ( !item->IsShown() ) - continue; - - const wxSize sizeMinThis = item->CalcMin(); - if ( const int propThis = item->GetProportion() ) - { - float minSizeToProp = GetSizeInMajorDir(sizeMinThis); - minSizeToProp /= propThis; - - if ( minSizeToProp > maxMinSizeToProp ) - maxMinSizeToProp = minSizeToProp; - - m_totalProportion += item->GetProportion(); - } - else // fixed size item - { - // Just account for its size directly - SizeInMajorDir(m_calculatedMinSize) += GetSizeInMajorDir(sizeMinThis); - } - - // In the transversal direction we just need to find the maximum. - if ( GetSizeInMinorDir(sizeMinThis) > GetSizeInMinorDir(m_calculatedMinSize) ) - SizeInMinorDir(m_calculatedMinSize) = GetSizeInMinorDir(sizeMinThis); - } - - // Using the max ratio ensures that the min size is big enough for all - // items to have their min size and satisfy the proportions among them. - SizeInMajorDir(m_calculatedMinSize) += (int)(maxMinSizeToProp*m_totalProportion); - - return m_calculatedMinSize; -} - -//--------------------------------------------------------------------------- -// wxStaticBoxSizer -//--------------------------------------------------------------------------- - -#if wxUSE_STATBOX - -wxStaticBoxSizer::wxStaticBoxSizer( wxStaticBox *box, int orient ) - : wxBoxSizer( orient ), - m_staticBox( box ) -{ - wxASSERT_MSG( box, wxT("wxStaticBoxSizer needs a static box") ); - - // do this so that our Detach() is called if the static box is destroyed - // before we are - m_staticBox->SetContainingSizer(this); -} - -wxStaticBoxSizer::wxStaticBoxSizer(int orient, wxWindow *win, const wxString& s) - : wxBoxSizer(orient), - m_staticBox(new wxStaticBox(win, wxID_ANY, s)) -{ - // same as above - m_staticBox->SetContainingSizer(this); -} - -wxStaticBoxSizer::~wxStaticBoxSizer() -{ - // As an exception to the general rule that sizers own other sizers that - // they contain but not the windows managed by them, this sizer does own - // the static box associated with it (which is not very logical but - // convenient in practice and, most importantly, can't be changed any more - // because of compatibility). However we definitely should not destroy the - // children of this static box when we're being destroyed, as this would be - // unexpected and break the existing code which worked with the windows - // created as siblings of the static box instead of its children in the - // previous wxWidgets versions, so ensure they are left alive. - - if ( m_staticBox ) - { - // Notice that we must make a copy of the list as it will be changed by - // Reparent() calls in the loop. - const wxWindowList children = m_staticBox->GetChildren(); - wxWindow* const parent = m_staticBox->GetParent(); - for ( wxWindowList::const_iterator i = children.begin(); - i != children.end(); - ++i ) - { - (*i)->Reparent(parent); - } - - delete m_staticBox; - } -} - -void wxStaticBoxSizer::RecalcSizes() -{ - int top_border, other_border; - m_staticBox->GetBordersForSizer(&top_border, &other_border); - - m_staticBox->SetSize( m_position.x, m_position.y, m_size.x, m_size.y ); - - wxSize old_size( m_size ); - m_size.x -= 2*other_border; - m_size.y -= top_border + other_border; - - wxPoint old_pos( m_position ); - if (m_staticBox->GetChildren().GetCount() > 0) - { -#if defined( __WXGTK20__ ) - // if the wxStaticBox has created a wxPizza to contain its children - // (see wxStaticBox::AddChild) then we need to place the items it contains - // in the wxBoxSizer::RecalcSizes() call below using coordinates relative - // to the top-left corner of the staticbox: - m_position.x = m_position.y = 0; -#elif defined(__WXOSX__) && wxOSX_USE_COCOA - // the distance from the 'inner' content view to the embedded controls - // this is independent of the title, therefore top_border is not relevant - m_position.x = m_position.y = 10; -#else - // if the wxStaticBox has children, then these windows must be placed - // by the wxBoxSizer::RecalcSizes() call below using coordinates relative - // to the top-left corner of the staticbox (but unlike wxGTK, we need - // to keep in count the static borders here!): - m_position.x = other_border; - m_position.y = top_border; -#endif - } - else - { - // the windows contained in the staticbox have been created as siblings of the - // staticbox (this is the "old" way of staticbox contents creation); in this - // case we need to position them with coordinates relative to our common parent - m_position.x += other_border; - m_position.y += top_border; - } - - wxBoxSizer::RecalcSizes(); - - m_position = old_pos; - m_size = old_size; -} - -wxSize wxStaticBoxSizer::CalcMin() -{ - int top_border, other_border; - m_staticBox->GetBordersForSizer(&top_border, &other_border); - - wxSize ret( wxBoxSizer::CalcMin() ); - ret.x += 2*other_border; - - // ensure that we're wide enough to show the static box label (there is no - // need to check for the static box best size in vertical direction though) - const int boxWidth = m_staticBox->GetBestSize().x; - if ( ret.x < boxWidth ) - ret.x = boxWidth; - - ret.y += other_border + top_border; - - return ret; -} - -void wxStaticBoxSizer::ShowItems( bool show ) -{ - m_staticBox->Show( show ); - wxBoxSizer::ShowItems( show ); -} - -bool wxStaticBoxSizer::AreAnyItemsShown() const -{ - // We don't need to check the status of our child items: if the box is - // shown, this sizer should be considered shown even if all its elements - // are hidden (or, more prosaically, there are no elements at all). And, - // conversely, if the box is hidden then all our items, which are its - // children, are hidden too. - return m_staticBox->IsShown(); -} - -bool wxStaticBoxSizer::Detach( wxWindow *window ) -{ - // avoid deleting m_staticBox in our dtor if it's being detached from the - // sizer (which can happen because it's being already destroyed for - // example) - if ( window == m_staticBox ) - { - m_staticBox = NULL; - return true; - } - - return wxSizer::Detach( window ); -} - -#endif // wxUSE_STATBOX - -//--------------------------------------------------------------------------- -// wxStdDialogButtonSizer -//--------------------------------------------------------------------------- - -#if wxUSE_BUTTON - -wxStdDialogButtonSizer::wxStdDialogButtonSizer() - : wxBoxSizer(wxHORIZONTAL) -{ - bool is_pda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA); - // If we have a PDA screen, put yes/no button over - // all other buttons, otherwise on the left side. - if (is_pda) - m_orient = wxVERTICAL; - - m_buttonAffirmative = NULL; - m_buttonApply = NULL; - m_buttonNegative = NULL; - m_buttonCancel = NULL; - m_buttonHelp = NULL; -} - -void wxStdDialogButtonSizer::AddButton(wxButton *mybutton) -{ - switch (mybutton->GetId()) - { - case wxID_OK: - case wxID_YES: - case wxID_SAVE: - m_buttonAffirmative = mybutton; - break; - case wxID_APPLY: - m_buttonApply = mybutton; - break; - case wxID_NO: - m_buttonNegative = mybutton; - break; - case wxID_CANCEL: - case wxID_CLOSE: - m_buttonCancel = mybutton; - break; - case wxID_HELP: - case wxID_CONTEXT_HELP: - m_buttonHelp = mybutton; - break; - default: - break; - } -} - -void wxStdDialogButtonSizer::SetAffirmativeButton( wxButton *button ) -{ - m_buttonAffirmative = button; -} - -void wxStdDialogButtonSizer::SetNegativeButton( wxButton *button ) -{ - m_buttonNegative = button; -} - -void wxStdDialogButtonSizer::SetCancelButton( wxButton *button ) -{ - m_buttonCancel = button; -} - -void wxStdDialogButtonSizer::Realize() -{ -#ifdef __WXMAC__ - Add(0, 0, 0, wxLEFT, 6); - if (m_buttonHelp) - Add((wxWindow*)m_buttonHelp, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 6); - - if (m_buttonNegative){ - // HIG POLICE BULLETIN - destructive buttons need extra padding - // 24 pixels on either side - Add((wxWindow*)m_buttonNegative, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 12); - } - - // extra whitespace between help/negative and cancel/ok buttons - Add(0, 0, 1, wxEXPAND, 0); - - if (m_buttonCancel){ - Add((wxWindow*)m_buttonCancel, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 6); - // Cancel or help should be default - // m_buttonCancel->SetDefaultButton(); - } - - // Ugh, Mac doesn't really have apply dialogs, so I'll just - // figure the best place is between Cancel and OK - if (m_buttonApply) - Add((wxWindow*)m_buttonApply, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 6); - - if (m_buttonAffirmative){ - Add((wxWindow*)m_buttonAffirmative, 0, wxALIGN_CENTRE | wxLEFT, 6); - - if (m_buttonAffirmative->GetId() == wxID_SAVE){ - // these buttons have set labels under Mac so we should use them - m_buttonAffirmative->SetLabel(_("Save")); - if (m_buttonNegative) - m_buttonNegative->SetLabel(_("Don't Save")); - } - } - - // Extra space around and at the right - Add(12, 40); -#elif defined(__WXGTK20__) - // http://library.gnome.org/devel/hig-book/stable/windows-alert.html.en - // says that the correct button order is - // - // [Help] [Alternative] [Cancel] [Affirmative] - - // Flags ensuring that margins between the buttons are 6 pixels. - const wxSizerFlags - flagsBtn = wxSizerFlags().Centre().Border(wxLEFT | wxRIGHT, 3); - - // Margin around the entire sizer button should be 12. - AddSpacer(9); - - if (m_buttonHelp) - Add(m_buttonHelp, flagsBtn); - - // Align the rest of the buttons to the right. - AddStretchSpacer(); - - if (m_buttonNegative) - Add(m_buttonNegative, flagsBtn); - - if (m_buttonApply) - Add(m_buttonApply, flagsBtn); - - if (m_buttonCancel) - Add(m_buttonCancel, flagsBtn); - - if (m_buttonAffirmative) - Add(m_buttonAffirmative, flagsBtn); - - // Ensure that the right margin is 12 as well. - AddSpacer(9); -#elif defined(__WXMSW__) - // Windows - - // right-justify buttons - Add(0, 0, 1, wxEXPAND, 0); - - if (m_buttonAffirmative){ - Add((wxWindow*)m_buttonAffirmative, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonAffirmative->ConvertDialogToPixels(wxSize(2, 0)).x); - } - - if (m_buttonNegative){ - Add((wxWindow*)m_buttonNegative, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonNegative->ConvertDialogToPixels(wxSize(2, 0)).x); - } - - if (m_buttonCancel){ - Add((wxWindow*)m_buttonCancel, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonCancel->ConvertDialogToPixels(wxSize(2, 0)).x); - } - if (m_buttonApply) - Add((wxWindow*)m_buttonApply, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonApply->ConvertDialogToPixels(wxSize(2, 0)).x); - - if (m_buttonHelp) - Add((wxWindow*)m_buttonHelp, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonHelp->ConvertDialogToPixels(wxSize(2, 0)).x); -#else - // GTK+1 and any other platform - - // Add(0, 0, 0, wxLEFT, 5); // Not sure what this was for but it unbalances the dialog - if (m_buttonHelp) - Add((wxWindow*)m_buttonHelp, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonHelp->ConvertDialogToPixels(wxSize(4, 0)).x); - - // extra whitespace between help and cancel/ok buttons - Add(0, 0, 1, wxEXPAND, 0); - - if (m_buttonApply) - Add((wxWindow*)m_buttonApply, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonApply->ConvertDialogToPixels(wxSize(4, 0)).x); - - if (m_buttonAffirmative){ - Add((wxWindow*)m_buttonAffirmative, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonAffirmative->ConvertDialogToPixels(wxSize(4, 0)).x); - } - - if (m_buttonNegative){ - Add((wxWindow*)m_buttonNegative, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonNegative->ConvertDialogToPixels(wxSize(4, 0)).x); - } - - if (m_buttonCancel){ - Add((wxWindow*)m_buttonCancel, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonCancel->ConvertDialogToPixels(wxSize(4, 0)).x); - // Cancel or help should be default - // m_buttonCancel->SetDefaultButton(); - } - -#endif -} - -#endif // wxUSE_BUTTON diff --git a/Externals/wxWidgets3/src/common/slidercmn.cpp b/Externals/wxWidgets3/src/common/slidercmn.cpp deleted file mode 100644 index d5ce262db3..0000000000 --- a/Externals/wxWidgets3/src/common/slidercmn.cpp +++ /dev/null @@ -1,109 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/slidercmn.cpp -// Purpose: wxSlider common code -// Author: Julian Smart -// Modified by: -// Created: 04/01/98 -// Copyright: (c) Julian Smart 1998 -// Vadim Zeitlin 2004 -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_SLIDER - -#include "wx/slider.h" - -extern WXDLLEXPORT_DATA(const char) wxSliderNameStr[] = "slider"; - -// ---------------------------------------------------------------------------- -// XTI -// ---------------------------------------------------------------------------- - -wxDEFINE_FLAGS( wxSliderStyle ) -wxBEGIN_FLAGS( wxSliderStyle ) - // new style border flags, we put them first to - // use them for streaming out - wxFLAGS_MEMBER(wxBORDER_SIMPLE) - wxFLAGS_MEMBER(wxBORDER_SUNKEN) - wxFLAGS_MEMBER(wxBORDER_DOUBLE) - wxFLAGS_MEMBER(wxBORDER_RAISED) - wxFLAGS_MEMBER(wxBORDER_STATIC) - wxFLAGS_MEMBER(wxBORDER_NONE) - - // old style border flags - wxFLAGS_MEMBER(wxSIMPLE_BORDER) - wxFLAGS_MEMBER(wxSUNKEN_BORDER) - wxFLAGS_MEMBER(wxDOUBLE_BORDER) - wxFLAGS_MEMBER(wxRAISED_BORDER) - wxFLAGS_MEMBER(wxSTATIC_BORDER) - wxFLAGS_MEMBER(wxBORDER) - - // standard window styles - wxFLAGS_MEMBER(wxTAB_TRAVERSAL) - wxFLAGS_MEMBER(wxCLIP_CHILDREN) - wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) - wxFLAGS_MEMBER(wxWANTS_CHARS) - wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE) - wxFLAGS_MEMBER(wxALWAYS_SHOW_SB ) - wxFLAGS_MEMBER(wxVSCROLL) - wxFLAGS_MEMBER(wxHSCROLL) - - wxFLAGS_MEMBER(wxSL_HORIZONTAL) - wxFLAGS_MEMBER(wxSL_VERTICAL) - wxFLAGS_MEMBER(wxSL_AUTOTICKS) - wxFLAGS_MEMBER(wxSL_LABELS) - wxFLAGS_MEMBER(wxSL_LEFT) - wxFLAGS_MEMBER(wxSL_TOP) - wxFLAGS_MEMBER(wxSL_RIGHT) - wxFLAGS_MEMBER(wxSL_BOTTOM) - wxFLAGS_MEMBER(wxSL_BOTH) - wxFLAGS_MEMBER(wxSL_SELRANGE) - wxFLAGS_MEMBER(wxSL_INVERSE) -wxEND_FLAGS( wxSliderStyle ) - -wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxSlider, wxControl, "wx/slider.h"); - -wxBEGIN_PROPERTIES_TABLE(wxSlider) - wxEVENT_RANGE_PROPERTY( Scroll, wxEVT_SCROLL_TOP, wxEVT_SCROLL_CHANGED, wxScrollEvent ) - wxEVENT_PROPERTY( Updated, wxEVT_SLIDER, wxCommandEvent ) - - wxPROPERTY( Value, int, SetValue, GetValue, 0, 0 /*flags*/, \ - wxT("Helpstring"), wxT("group")) - wxPROPERTY( Minimum, int, SetMin, GetMin, 0, 0 /*flags*/, \ - wxT("Helpstring"), wxT("group")) - wxPROPERTY( Maximum, int, SetMax, GetMax, 0, 0 /*flags*/, \ - wxT("Helpstring"), wxT("group")) - wxPROPERTY( PageSize, int, SetPageSize, GetLineSize, 1, 0 /*flags*/, \ - wxT("Helpstring"), wxT("group")) - wxPROPERTY( LineSize, int, SetLineSize, GetLineSize, 1, 0 /*flags*/, \ - wxT("Helpstring"), wxT("group")) - wxPROPERTY( ThumbLength, int, SetThumbLength, GetThumbLength, 1, 0 /*flags*/, \ - wxT("Helpstring"), wxT("group")) - - wxPROPERTY_FLAGS( WindowStyle, wxSliderStyle, long, SetWindowStyleFlag, \ - GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \ - wxT("Helpstring"), wxT("group")) // style -wxEND_PROPERTIES_TABLE() - -wxEMPTY_HANDLERS_TABLE(wxSlider) - -wxCONSTRUCTOR_8( wxSlider, wxWindow*, Parent, wxWindowID, Id, int, Value, \ - int, Minimum, int, Maximum, wxPoint, Position, wxSize, Size, \ - long, WindowStyle ) - -#endif // wxUSE_SLIDER diff --git a/Externals/wxWidgets3/src/common/socket.cpp b/Externals/wxWidgets3/src/common/socket.cpp deleted file mode 100644 index 24214b1859..0000000000 --- a/Externals/wxWidgets3/src/common/socket.cpp +++ /dev/null @@ -1,2170 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/socket.cpp -// Purpose: Socket handler classes -// Authors: Guilhem Lavaux, Guillermo Rodriguez Garcia -// Created: April 1997 -// Copyright: (C) 1999-1997, Guilhem Lavaux -// (C) 1999-2000, Guillermo Rodriguez Garcia -// (C) 2008 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ========================================================================== -// Declarations -// ========================================================================== - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_SOCKETS - -#include "wx/socket.h" - -#ifndef WX_PRECOMP - #include "wx/object.h" - #include "wx/string.h" - #include "wx/intl.h" - #include "wx/log.h" - #include "wx/event.h" - #include "wx/app.h" - #include "wx/utils.h" - #include "wx/timer.h" - #include "wx/module.h" - #include "wx/filefn.h" -#endif - -#include "wx/apptrait.h" -#include "wx/sckaddr.h" -#include "wx/scopeguard.h" -#include "wx/stopwatch.h" -#include "wx/thread.h" -#include "wx/evtloop.h" -#include "wx/link.h" - -#include "wx/private/fd.h" -#include "wx/private/socket.h" - -#ifdef __UNIX__ - #include -#endif - -// we use MSG_NOSIGNAL to avoid getting SIGPIPE when sending data to a remote -// host which closed the connection if it is available, otherwise we rely on -// SO_NOSIGPIPE existency -// -// this should cover all the current Unix systems (Windows never sends any -// signals anyhow) but if we find one that has neither we should explicitly -// ignore SIGPIPE for it -// OpenVMS has neither MSG_NOSIGNAL nor SO_NOSIGPIPE. However the socket sample -// seems to work. Not sure if problems will show up on OpenVMS using sockets. -#ifdef MSG_NOSIGNAL - #define wxSOCKET_MSG_NOSIGNAL MSG_NOSIGNAL -#else // MSG_NOSIGNAL not available (BSD including OS X) - // next best possibility is to use SO_NOSIGPIPE socket option, this covers - // BSD systems (including OS X) -- but if we don't have it neither (AIX and - // old HP-UX do not), we have to fall back to the old way of simply - // disabling SIGPIPE temporarily, so define a class to do it in a safe way - #if defined(__UNIX__) && !defined(SO_NOSIGPIPE) - extern "C" { typedef void (*wxSigHandler_t)(int); } - namespace - { - class IgnoreSignal - { - public: - // ctor disables the given signal - IgnoreSignal(int sig) - : m_handler(signal(sig, SIG_IGN)), - m_sig(sig) - { - } - - // dtor restores the old handler - ~IgnoreSignal() - { - signal(m_sig, m_handler); - } - - private: - const wxSigHandler_t m_handler; - const int m_sig; - - wxDECLARE_NO_COPY_CLASS(IgnoreSignal); - }; - } // anonymous namespace - - #define wxNEEDS_IGNORE_SIGPIPE - #endif // Unix without SO_NOSIGPIPE - - #define wxSOCKET_MSG_NOSIGNAL 0 -#endif - -// DLL options compatibility check: -#include "wx/build.h" -WX_CHECK_BUILD_OPTIONS("wxNet") - -// -------------------------------------------------------------------------- -// macros and constants -// -------------------------------------------------------------------------- - -// event -wxDEFINE_EVENT(wxEVT_SOCKET, wxSocketEvent); - -// discard buffer -#define MAX_DISCARD_SIZE (10 * 1024) - -#define wxTRACE_Socket wxT("wxSocket") - -// -------------------------------------------------------------------------- -// wxWin macros -// -------------------------------------------------------------------------- - -wxIMPLEMENT_CLASS(wxSocketBase, wxObject); -wxIMPLEMENT_CLASS(wxSocketServer, wxSocketBase); -wxIMPLEMENT_CLASS(wxSocketClient, wxSocketBase); -wxIMPLEMENT_CLASS(wxDatagramSocket, wxSocketBase); -wxIMPLEMENT_DYNAMIC_CLASS(wxSocketEvent, wxEvent); - -// ---------------------------------------------------------------------------- -// private functions -// ---------------------------------------------------------------------------- - -namespace -{ - -void SetTimeValFromMS(timeval& tv, unsigned long ms) -{ - tv.tv_sec = (ms / 1000); - tv.tv_usec = (ms % 1000) * 1000; -} - -} // anonymous namespace - -// -------------------------------------------------------------------------- -// private classes -// -------------------------------------------------------------------------- - -class wxSocketState : public wxObject -{ -public: - wxSocketFlags m_flags; - wxSocketEventFlags m_eventmask; - bool m_notify; - void *m_clientData; - -public: - wxSocketState() : wxObject() {} - - wxDECLARE_NO_COPY_CLASS(wxSocketState); -}; - -// wxSocketWaitModeChanger: temporarily change the socket flags affecting its -// wait mode -class wxSocketWaitModeChanger -{ -public: - // temporarily set the flags to include the flag value which may be either - // wxSOCKET_NOWAIT or wxSOCKET_WAITALL - wxSocketWaitModeChanger(wxSocketBase *socket, int flag) - : m_socket(socket), - m_oldflags(socket->GetFlags()) - - { - // We can be passed only wxSOCKET_WAITALL{_READ,_WRITE} or - // wxSOCKET_NOWAIT{_READ,_WRITE} normally. - wxASSERT_MSG( !(flag & wxSOCKET_WAITALL) || !(flag & wxSOCKET_NOWAIT), - "not a wait flag" ); - - // preserve wxSOCKET_BLOCK value when switching to wxSOCKET_WAITALL - // mode but not when switching to wxSOCKET_NOWAIT as the latter is - // incompatible with wxSOCKET_BLOCK - if ( flag != wxSOCKET_NOWAIT ) - flag |= m_oldflags & wxSOCKET_BLOCK; - - socket->SetFlags(flag); - } - - ~wxSocketWaitModeChanger() - { - m_socket->SetFlags(m_oldflags); - } - -private: - wxSocketBase * const m_socket; - const int m_oldflags; - - wxDECLARE_NO_COPY_CLASS(wxSocketWaitModeChanger); -}; - -// wxSocketRead/WriteGuard are instantiated before starting reading -// from/writing to the socket -class wxSocketReadGuard -{ -public: - wxSocketReadGuard(wxSocketBase *socket) - : m_socket(socket) - { - wxASSERT_MSG( !m_socket->m_reading, "read reentrancy?" ); - - m_socket->m_reading = true; - } - - ~wxSocketReadGuard() - { - m_socket->m_reading = false; - - // connection could have been lost while reading, in this case calling - // ReenableEvents() would assert and is not necessary anyhow - wxSocketImpl * const impl = m_socket->m_impl; - if ( impl && impl->m_fd != INVALID_SOCKET ) - impl->ReenableEvents(wxSOCKET_INPUT_FLAG); - } - -private: - wxSocketBase * const m_socket; - - wxDECLARE_NO_COPY_CLASS(wxSocketReadGuard); -}; - -class wxSocketWriteGuard -{ -public: - wxSocketWriteGuard(wxSocketBase *socket) - : m_socket(socket) - { - wxASSERT_MSG( !m_socket->m_writing, "write reentrancy?" ); - - m_socket->m_writing = true; - } - - ~wxSocketWriteGuard() - { - m_socket->m_writing = false; - - wxSocketImpl * const impl = m_socket->m_impl; - if ( impl && impl->m_fd != INVALID_SOCKET ) - impl->ReenableEvents(wxSOCKET_OUTPUT_FLAG); - } - -private: - wxSocketBase * const m_socket; - - wxDECLARE_NO_COPY_CLASS(wxSocketWriteGuard); -}; - -// ============================================================================ -// wxSocketManager -// ============================================================================ - -wxSocketManager *wxSocketManager::ms_manager = NULL; - -/* static */ -void wxSocketManager::Set(wxSocketManager *manager) -{ - wxASSERT_MSG( !ms_manager, "too late to set manager now" ); - - ms_manager = manager; -} - -/* static */ -void wxSocketManager::Init() -{ - wxASSERT_MSG( !ms_manager, "shouldn't be initialized twice" ); - - /* - Details: Initialize() creates a hidden window as a sink for socket - events, such as 'read completed'. wxMSW has only one message loop - for the main thread. If Initialize is called in a secondary thread, - the socket window will be created for the secondary thread, but - since there is no message loop on this thread, it will never - receive events and all socket operations will time out. - BTW, the main thread must not be stopped using sleep or block - on a semaphore (a bad idea in any case) or socket operations - will time out. - - On the Mac side, Initialize() stores a pointer to the CFRunLoop for - the main thread. Because secondary threads do not have run loops, - adding event notifications to the "Current" loop would have no - effect at all, events would never fire. - */ - wxASSERT_MSG( wxIsMainThread(), - "sockets must be initialized from the main thread" ); - - wxAppConsole * const app = wxAppConsole::GetInstance(); - wxCHECK_RET( app, "sockets can't be initialized without wxApp" ); - - ms_manager = app->GetTraits()->GetSocketManager(); -} - -// ========================================================================== -// wxSocketImpl -// ========================================================================== - -wxSocketImpl::wxSocketImpl(wxSocketBase& wxsocket) - : m_wxsocket(&wxsocket) -{ - m_fd = INVALID_SOCKET; - m_error = wxSOCKET_NOERROR; - m_server = false; - m_stream = true; - - SetTimeout(wxsocket.GetTimeout() * 1000); - - m_establishing = false; - m_reusable = false; - m_broadcast = false; - m_dobind = true; - m_initialRecvBufferSize = -1; - m_initialSendBufferSize = -1; -} - -wxSocketImpl::~wxSocketImpl() -{ - if ( m_fd != INVALID_SOCKET ) - Shutdown(); -} - -bool wxSocketImpl::PreCreateCheck(const wxSockAddressImpl& addr) -{ - if ( m_fd != INVALID_SOCKET ) - { - m_error = wxSOCKET_INVSOCK; - return false; - } - - if ( !addr.IsOk() ) - { - m_error = wxSOCKET_INVADDR; - return false; - } - - return true; -} - -void wxSocketImpl::PostCreation() -{ - // FreeBSD variants can't use MSG_NOSIGNAL, and instead use a socket option -#ifdef SO_NOSIGPIPE - EnableSocketOption(SO_NOSIGPIPE); -#endif - - if ( m_reusable ) - EnableSocketOption(SO_REUSEADDR); - - if ( m_broadcast ) - { - wxASSERT_MSG( !m_stream, "broadcasting is for datagram sockets only" ); - - EnableSocketOption(SO_BROADCAST); - } - - if ( m_initialRecvBufferSize >= 0 ) - SetSocketOption(SO_RCVBUF, m_initialRecvBufferSize); - if ( m_initialSendBufferSize >= 0 ) - SetSocketOption(SO_SNDBUF, m_initialSendBufferSize); - - // we always put our sockets in unblocked mode and handle blocking - // ourselves in DoRead/Write() if wxSOCKET_WAITALL is specified - UnblockAndRegisterWithEventLoop(); -} - -wxSocketError wxSocketImpl::UpdateLocalAddress() -{ - if ( !m_local.IsOk() ) - { - // ensure that we have a valid object using the correct family: correct - // being the same one as our peer uses as we have no other way to - // determine it - m_local.Create(m_peer.GetFamily()); - } - - WX_SOCKLEN_T lenAddr = m_local.GetLen(); - if ( getsockname(m_fd, m_local.GetWritableAddr(), &lenAddr) != 0 ) - { - Close(); - m_error = wxSOCKET_IOERR; - return m_error; - } - - return wxSOCKET_NOERROR; -} - -wxSocketError wxSocketImpl::CreateServer() -{ - if ( !PreCreateCheck(m_local) ) - return m_error; - - m_server = true; - m_stream = true; - - // do create the socket - m_fd = socket(m_local.GetFamily(), SOCK_STREAM, 0); - - if ( m_fd == INVALID_SOCKET ) - { - m_error = wxSOCKET_IOERR; - return wxSOCKET_IOERR; - } - - PostCreation(); - - // and then bind to and listen on it - // - // FIXME: should we test for m_dobind here? - if ( bind(m_fd, m_local.GetAddr(), m_local.GetLen()) != 0 ) - m_error = wxSOCKET_IOERR; - - if ( IsOk() ) - { - if ( listen(m_fd, 5) != 0 ) - m_error = wxSOCKET_IOERR; - } - - if ( !IsOk() ) - { - Close(); - return m_error; - } - - // finally retrieve the address we effectively bound to - return UpdateLocalAddress(); -} - -wxSocketError wxSocketImpl::CreateClient(bool wait) -{ - if ( !PreCreateCheck(m_peer) ) - return m_error; - - m_fd = socket(m_peer.GetFamily(), SOCK_STREAM, 0); - - if ( m_fd == INVALID_SOCKET ) - { - m_error = wxSOCKET_IOERR; - return wxSOCKET_IOERR; - } - - PostCreation(); - - // If a local address has been set, then bind to it before calling connect - if ( m_local.IsOk() ) - { - if ( bind(m_fd, m_local.GetAddr(), m_local.GetLen()) != 0 ) - { - Close(); - m_error = wxSOCKET_IOERR; - return m_error; - } - } - - // Do connect now - int rc = connect(m_fd, m_peer.GetAddr(), m_peer.GetLen()); - if ( rc == SOCKET_ERROR ) - { - wxSocketError err = GetLastError(); - if ( err == wxSOCKET_WOULDBLOCK ) - { - m_establishing = true; - - // block waiting for connection if we should (otherwise just return - // wxSOCKET_WOULDBLOCK to the caller) - if ( wait ) - { - err = SelectWithTimeout(wxSOCKET_CONNECTION_FLAG) - ? wxSOCKET_NOERROR - : wxSOCKET_TIMEDOUT; - m_establishing = false; - } - } - - m_error = err; - } - else // connected - { - m_error = wxSOCKET_NOERROR; - } - - return m_error; -} - - -wxSocketError wxSocketImpl::CreateUDP() -{ - if ( !PreCreateCheck(m_local) ) - return m_error; - - m_stream = false; - m_server = false; - - m_fd = socket(m_local.GetFamily(), SOCK_DGRAM, 0); - - if ( m_fd == INVALID_SOCKET ) - { - m_error = wxSOCKET_IOERR; - return wxSOCKET_IOERR; - } - - PostCreation(); - - if ( m_dobind ) - { - if ( bind(m_fd, m_local.GetAddr(), m_local.GetLen()) != 0 ) - { - Close(); - m_error = wxSOCKET_IOERR; - return m_error; - } - - return UpdateLocalAddress(); - } - - return wxSOCKET_NOERROR; -} - -wxSocketImpl *wxSocketImpl::Accept(wxSocketBase& wxsocket) -{ - wxSockAddressStorage from; - WX_SOCKLEN_T fromlen = sizeof(from); - const wxSOCKET_T fd = accept(m_fd, &from.addr, &fromlen); - - wxScopeGuard closeSocket = wxMakeGuard(wxClose, fd); - - // accepting is similar to reading in the sense that it resets "ready for - // read" flag on the socket - ReenableEvents(wxSOCKET_INPUT_FLAG); - - if ( fd == INVALID_SOCKET ) - return NULL; - - wxSocketManager * const manager = wxSocketManager::Get(); - if ( !manager ) - return NULL; - - wxSocketImpl * const sock = manager->CreateSocket(wxsocket); - if ( !sock ) - return NULL; - - // Ownership of the socket now passes to wxSocketImpl object. - closeSocket.Dismiss(); - sock->m_fd = fd; - sock->m_peer = wxSockAddressImpl(from.addr, fromlen); - - sock->UnblockAndRegisterWithEventLoop(); - - return sock; -} - - -void wxSocketImpl::Close() -{ - if ( m_fd != INVALID_SOCKET ) - { - DoClose(); - m_fd = INVALID_SOCKET; - } -} - -void wxSocketImpl::Shutdown() -{ - if ( m_fd != INVALID_SOCKET ) - { - shutdown(m_fd, 1 /* SD_SEND */); - Close(); - } -} - -/* - * Sets the timeout for blocking calls. Time is expressed in - * milliseconds. - */ -void wxSocketImpl::SetTimeout(unsigned long millis) -{ - SetTimeValFromMS(m_timeout, millis); -} - -void wxSocketImpl::NotifyOnStateChange(wxSocketNotify event) -{ - m_wxsocket->OnRequest(event); -} - -/* Address handling */ -wxSocketError wxSocketImpl::SetLocal(const wxSockAddressImpl& local) -{ - /* the socket must be initialized, or it must be a server */ - if (m_fd != INVALID_SOCKET && !m_server) - { - m_error = wxSOCKET_INVSOCK; - return wxSOCKET_INVSOCK; - } - - if ( !local.IsOk() ) - { - m_error = wxSOCKET_INVADDR; - return wxSOCKET_INVADDR; - } - - m_local = local; - - return wxSOCKET_NOERROR; -} - -wxSocketError wxSocketImpl::SetPeer(const wxSockAddressImpl& peer) -{ - if ( !peer.IsOk() ) - { - m_error = wxSOCKET_INVADDR; - return wxSOCKET_INVADDR; - } - - m_peer = peer; - - return wxSOCKET_NOERROR; -} - -const wxSockAddressImpl& wxSocketImpl::GetLocal() -{ - if ( !m_local.IsOk() ) - UpdateLocalAddress(); - - return m_local; -} - -// ---------------------------------------------------------------------------- -// wxSocketImpl IO -// ---------------------------------------------------------------------------- - -// this macro wraps the given expression (normally a syscall) in a loop which -// ignores any interruptions, i.e. reevaluates it again if it failed and errno -// is EINTR -#ifdef __UNIX__ - #define DO_WHILE_EINTR( rc, syscall ) \ - do { \ - rc = (syscall); \ - } \ - while ( rc == -1 && errno == EINTR ) -#else - #define DO_WHILE_EINTR( rc, syscall ) rc = (syscall) -#endif - -int wxSocketImpl::RecvStream(void *buffer, int size) -{ - int ret; - DO_WHILE_EINTR( ret, recv(m_fd, static_cast(buffer), size, 0) ); - - if ( !ret ) - { - // receiving 0 bytes for a TCP socket indicates that the connection was - // closed by peer so shut down our end as well (for UDP sockets empty - // datagrams are also possible) - m_establishing = false; - NotifyOnStateChange(wxSOCKET_LOST); - - Shutdown(); - - // do not return an error in this case however - } - - return ret; -} - -int wxSocketImpl::SendStream(const void *buffer, int size) -{ -#ifdef wxNEEDS_IGNORE_SIGPIPE - IgnoreSignal ignore(SIGPIPE); -#endif - - int ret; - DO_WHILE_EINTR( ret, send(m_fd, static_cast(buffer), size, - wxSOCKET_MSG_NOSIGNAL) ); - - return ret; -} - -int wxSocketImpl::RecvDgram(void *buffer, int size) -{ - wxSockAddressStorage from; - WX_SOCKLEN_T fromlen = sizeof(from); - - int ret; - DO_WHILE_EINTR( ret, recvfrom(m_fd, static_cast(buffer), size, - 0, &from.addr, &fromlen) ); - - if ( ret == SOCKET_ERROR ) - return SOCKET_ERROR; - - m_peer = wxSockAddressImpl(from.addr, fromlen); - if ( !m_peer.IsOk() ) - return -1; - - return ret; -} - -int wxSocketImpl::SendDgram(const void *buffer, int size) -{ - if ( !m_peer.IsOk() ) - { - m_error = wxSOCKET_INVADDR; - return -1; - } - - int ret; - DO_WHILE_EINTR( ret, sendto(m_fd, static_cast(buffer), size, - 0, m_peer.GetAddr(), m_peer.GetLen()) ); - - return ret; -} - -int wxSocketImpl::Read(void *buffer, int size) -{ - // server sockets can't be used for IO, only to accept new connections - if ( m_fd == INVALID_SOCKET || m_server ) - { - m_error = wxSOCKET_INVSOCK; - return -1; - } - - int ret = m_stream ? RecvStream(buffer, size) - : RecvDgram(buffer, size); - - m_error = ret == SOCKET_ERROR ? GetLastError() : wxSOCKET_NOERROR; - - return ret; -} - -int wxSocketImpl::Write(const void *buffer, int size) -{ - if ( m_fd == INVALID_SOCKET || m_server ) - { - m_error = wxSOCKET_INVSOCK; - return -1; - } - - int ret = m_stream ? SendStream(buffer, size) - : SendDgram(buffer, size); - - m_error = ret == SOCKET_ERROR ? GetLastError() : wxSOCKET_NOERROR; - - return ret; -} - -// ========================================================================== -// wxSocketBase -// ========================================================================== - -// -------------------------------------------------------------------------- -// Initialization and shutdown -// -------------------------------------------------------------------------- - -namespace -{ - -// counts the number of calls to Initialize() minus the number of calls to -// Shutdown(): we don't really need it any more but it was documented that -// Shutdown() must be called the same number of times as Initialize() and using -// a counter helps us to check it -int gs_socketInitCount = 0; - -} // anonymous namespace - -bool wxSocketBase::IsInitialized() -{ - wxASSERT_MSG( wxIsMainThread(), "unsafe to call from other threads" ); - - return gs_socketInitCount != 0; -} - -bool wxSocketBase::Initialize() -{ - wxCHECK_MSG( wxIsMainThread(), false, - "must be called from the main thread" ); - - if ( !gs_socketInitCount ) - { - wxSocketManager * const manager = wxSocketManager::Get(); - if ( !manager || !manager->OnInit() ) - return false; - } - - gs_socketInitCount++; - - return true; -} - -void wxSocketBase::Shutdown() -{ - wxCHECK_RET( wxIsMainThread(), "must be called from the main thread" ); - - wxCHECK_RET( gs_socketInitCount > 0, "too many calls to Shutdown()" ); - - if ( !--gs_socketInitCount ) - { - wxSocketManager * const manager = wxSocketManager::Get(); - wxCHECK_RET( manager, "should have a socket manager" ); - - manager->OnExit(); - } -} - -// -------------------------------------------------------------------------- -// Ctor and dtor -// -------------------------------------------------------------------------- - -void wxSocketBase::Init() -{ - m_impl = NULL; - m_type = wxSOCKET_UNINIT; - - // state - m_flags = 0; - m_connected = - m_establishing = - m_reading = - m_writing = - m_closed = false; - m_lcount = 0; - m_lcount_read = 0; - m_lcount_write = 0; - m_timeout = 600; - m_beingDeleted = false; - - // pushback buffer - m_unread = NULL; - m_unrd_size = 0; - m_unrd_cur = 0; - - // events - m_id = wxID_ANY; - m_handler = NULL; - m_clientData = NULL; - m_notify = false; - m_eventmask = - m_eventsgot = 0; - - // when we create the first socket in the main thread we initialize the - // OS-dependent socket stuff: notice that this means that the user code - // needs to call wxSocket::Initialize() itself if the first socket it - // creates is not created in the main thread - if ( wxIsMainThread() ) - { - if ( !Initialize() ) - { - wxLogError(_("Cannot initialize sockets")); - } - } -} - -wxSocketBase::wxSocketBase() -{ - Init(); -} - -wxSocketBase::wxSocketBase(wxSocketFlags flags, wxSocketType type) -{ - Init(); - - SetFlags(flags); - - m_type = type; -} - -wxSocketBase::~wxSocketBase() -{ - // Shutdown and close the socket - if (!m_beingDeleted) - Close(); - - // Destroy the implementation object - delete m_impl; - - // Free the pushback buffer - free(m_unread); -} - -bool wxSocketBase::Destroy() -{ - // Delayed destruction: the socket will be deleted during the next idle - // loop iteration. This ensures that all pending events have been - // processed. - m_beingDeleted = true; - - // Shutdown and close the socket - Close(); - - // Suppress events from now on - Notify(false); - - // Schedule this object for deletion instead of destroying it right now if - // it can have other events pending for it and we have a way to do it. - // - // Notice that sockets used in other threads won't have any events for them - // and we shouldn't use delayed destruction mechanism for them as it's not - // MT-safe. - if ( wxIsMainThread() && wxTheApp ) - { - wxTheApp->ScheduleForDestruction(this); - } - else // no app - { - // in wxBase we might have no app object at all, don't leak memory - delete this; - } - - return true; -} - -// ---------------------------------------------------------------------------- -// simple accessors -// ---------------------------------------------------------------------------- - -void wxSocketBase::SetError(wxSocketError error) -{ - m_impl->m_error = error; -} - -wxSocketError wxSocketBase::LastError() const -{ - return m_impl->GetError(); -} - -// -------------------------------------------------------------------------- -// Basic IO calls -// -------------------------------------------------------------------------- - -// The following IO operations update m_lcount: -// {Read, Write, ReadMsg, WriteMsg, Peek, Unread, Discard} -bool wxSocketBase::Close() -{ - // Interrupt pending waits - InterruptWait(); - - ShutdownOutput(); - - m_connected = false; - m_establishing = false; - return true; -} - -void wxSocketBase::ShutdownOutput() -{ - if ( m_impl ) - m_impl->Shutdown(); -} - -wxSocketBase& wxSocketBase::Read(void* buffer, wxUint32 nbytes) -{ - wxSocketReadGuard read(this); - - m_lcount_read = DoRead(buffer, nbytes); - m_lcount = m_lcount_read; - - return *this; -} - -wxUint32 wxSocketBase::DoRead(void* buffer_, wxUint32 nbytes) -{ - wxCHECK_MSG( m_impl, 0, "socket must be valid" ); - - // We use pointer arithmetic here which doesn't work with void pointers. - char *buffer = static_cast(buffer_); - wxCHECK_MSG( buffer, 0, "NULL buffer" ); - - // Try the push back buffer first, even before checking whether the socket - // is valid to allow reading previously pushed back data from an already - // closed socket. - wxUint32 total = GetPushback(buffer, nbytes, false); - nbytes -= total; - buffer += total; - - while ( nbytes ) - { - // our socket is non-blocking so Read() will return immediately if - // there is nothing to read yet and it's more efficient to try it first - // before entering DoWait() which is going to start dispatching GUI - // events and, even more importantly, we must do this under Windows - // where we're not going to get notifications about socket being ready - // for reading before we read all the existing data from it - const int ret = !m_impl->m_stream || m_connected - ? m_impl->Read(buffer, nbytes) - : 0; - if ( ret == -1 ) - { - if ( m_impl->GetLastError() == wxSOCKET_WOULDBLOCK ) - { - // if we don't want to wait, just return immediately - if ( m_flags & wxSOCKET_NOWAIT_READ ) - { - // this shouldn't be counted as an error in this case - SetError(wxSOCKET_NOERROR); - break; - } - - // otherwise wait until the socket becomes ready for reading or - // an error occurs on it - if ( !DoWaitWithTimeout(wxSOCKET_INPUT_FLAG) ) - { - // and exit if the timeout elapsed before it did - SetError(wxSOCKET_TIMEDOUT); - break; - } - - // retry reading - continue; - } - else // "real" error - { - SetError(wxSOCKET_IOERR); - break; - } - } - else if ( ret == 0 ) - { - // for connection-oriented (e.g. TCP) sockets we can only read - // 0 bytes if the other end has been closed, and for connectionless - // ones (UDP) this flag doesn't make sense anyhow so we can set it - // to true too without doing any harm - m_closed = true; - - // we're not going to read anything else and so if we haven't read - // anything (or not everything in wxSOCKET_WAITALL case) already, - // signal an error - if ( (m_flags & wxSOCKET_WAITALL_READ) || !total ) - SetError(wxSOCKET_IOERR); - break; - } - - total += ret; - - // if we are happy to read something and not the entire nbytes bytes, - // then we're done - if ( !(m_flags & wxSOCKET_WAITALL_READ) ) - break; - - nbytes -= ret; - buffer += ret; - } - - return total; -} - -wxSocketBase& wxSocketBase::ReadMsg(void* buffer, wxUint32 nbytes) -{ - struct - { - unsigned char sig[4]; - unsigned char len[4]; - } msg; - - wxSocketReadGuard read(this); - - wxSocketWaitModeChanger changeFlags(this, wxSOCKET_WAITALL_READ); - - bool ok = false; - if ( DoRead(&msg, sizeof(msg)) == sizeof(msg) ) - { - wxUint32 sig = (wxUint32)msg.sig[0]; - sig |= (wxUint32)(msg.sig[1] << 8); - sig |= (wxUint32)(msg.sig[2] << 16); - sig |= (wxUint32)(msg.sig[3] << 24); - - if ( sig == 0xfeeddead ) - { - wxUint32 len = (wxUint32)msg.len[0]; - len |= (wxUint32)(msg.len[1] << 8); - len |= (wxUint32)(msg.len[2] << 16); - len |= (wxUint32)(msg.len[3] << 24); - - wxUint32 len2; - if (len > nbytes) - { - len2 = len - nbytes; - len = nbytes; - } - else - len2 = 0; - - // Don't attempt to read if the msg was zero bytes long. - m_lcount_read = len ? DoRead(buffer, len) : 0; - m_lcount = m_lcount_read; - - if ( len2 ) - { - char discard_buffer[MAX_DISCARD_SIZE]; - long discard_len; - - // NOTE: discarded bytes don't add to m_lcount. - do - { - discard_len = len2 > MAX_DISCARD_SIZE - ? MAX_DISCARD_SIZE - : len2; - discard_len = DoRead(discard_buffer, (wxUint32)discard_len); - len2 -= (wxUint32)discard_len; - } - while ((discard_len > 0) && len2); - } - - if ( !len2 && DoRead(&msg, sizeof(msg)) == sizeof(msg) ) - { - sig = (wxUint32)msg.sig[0]; - sig |= (wxUint32)(msg.sig[1] << 8); - sig |= (wxUint32)(msg.sig[2] << 16); - sig |= (wxUint32)(msg.sig[3] << 24); - - if ( sig == 0xdeadfeed ) - ok = true; - } - } - } - - if ( !ok ) - SetError(wxSOCKET_IOERR); - - return *this; -} - -wxSocketBase& wxSocketBase::Peek(void* buffer, wxUint32 nbytes) -{ - wxSocketReadGuard read(this); - - // Peek() should never block - wxSocketWaitModeChanger changeFlags(this, wxSOCKET_NOWAIT); - - m_lcount = DoRead(buffer, nbytes); - - Pushback(buffer, m_lcount); - - return *this; -} - -wxSocketBase& wxSocketBase::Write(const void *buffer, wxUint32 nbytes) -{ - wxSocketWriteGuard write(this); - - m_lcount_write = DoWrite(buffer, nbytes); - m_lcount = m_lcount_write; - - return *this; -} - -// This function is a mirror image of DoRead() except that it doesn't use the -// push back buffer and doesn't treat 0 return value specially (normally this -// shouldn't happen at all here), so please see comments there for explanations -wxUint32 wxSocketBase::DoWrite(const void *buffer_, wxUint32 nbytes) -{ - wxCHECK_MSG( m_impl, 0, "socket must be valid" ); - - const char *buffer = static_cast(buffer_); - wxCHECK_MSG( buffer, 0, "NULL buffer" ); - - wxUint32 total = 0; - while ( nbytes ) - { - if ( m_impl->m_stream && !m_connected ) - { - if ( (m_flags & wxSOCKET_WAITALL_WRITE) || !total ) - SetError(wxSOCKET_IOERR); - break; - } - - const int ret = m_impl->Write(buffer, nbytes); - if ( ret == -1 ) - { - if ( m_impl->GetLastError() == wxSOCKET_WOULDBLOCK ) - { - if ( m_flags & wxSOCKET_NOWAIT_WRITE ) - break; - - if ( !DoWaitWithTimeout(wxSOCKET_OUTPUT_FLAG) ) - { - SetError(wxSOCKET_TIMEDOUT); - break; - } - - continue; - } - else // "real" error - { - SetError(wxSOCKET_IOERR); - break; - } - } - - total += ret; - - if ( !(m_flags & wxSOCKET_WAITALL_WRITE) ) - break; - - nbytes -= ret; - buffer += ret; - } - - return total; -} - -wxSocketBase& wxSocketBase::WriteMsg(const void *buffer, wxUint32 nbytes) -{ - struct - { - unsigned char sig[4]; - unsigned char len[4]; - } msg; - - wxSocketWriteGuard write(this); - - wxSocketWaitModeChanger changeFlags(this, wxSOCKET_WAITALL_WRITE); - - msg.sig[0] = (unsigned char) 0xad; - msg.sig[1] = (unsigned char) 0xde; - msg.sig[2] = (unsigned char) 0xed; - msg.sig[3] = (unsigned char) 0xfe; - - msg.len[0] = (unsigned char) (nbytes & 0xff); - msg.len[1] = (unsigned char) ((nbytes >> 8) & 0xff); - msg.len[2] = (unsigned char) ((nbytes >> 16) & 0xff); - msg.len[3] = (unsigned char) ((nbytes >> 24) & 0xff); - - bool ok = false; - if ( DoWrite(&msg, sizeof(msg)) == sizeof(msg) ) - { - m_lcount_write = DoWrite(buffer, nbytes); - m_lcount = m_lcount_write; - if ( m_lcount_write == nbytes ) - { - msg.sig[0] = (unsigned char) 0xed; - msg.sig[1] = (unsigned char) 0xfe; - msg.sig[2] = (unsigned char) 0xad; - msg.sig[3] = (unsigned char) 0xde; - msg.len[0] = - msg.len[1] = - msg.len[2] = - msg.len[3] = (char) 0; - - if ( DoWrite(&msg, sizeof(msg)) == sizeof(msg)) - ok = true; - } - } - - if ( !ok ) - SetError(wxSOCKET_IOERR); - - return *this; -} - -wxSocketBase& wxSocketBase::Unread(const void *buffer, wxUint32 nbytes) -{ - if (nbytes != 0) - Pushback(buffer, nbytes); - - SetError(wxSOCKET_NOERROR); - m_lcount = nbytes; - - return *this; -} - -wxSocketBase& wxSocketBase::Discard() -{ - char *buffer = new char[MAX_DISCARD_SIZE]; - wxUint32 ret; - wxUint32 total = 0; - - wxSocketReadGuard read(this); - - wxSocketWaitModeChanger changeFlags(this, wxSOCKET_NOWAIT); - - do - { - ret = DoRead(buffer, MAX_DISCARD_SIZE); - total += ret; - } - while (ret == MAX_DISCARD_SIZE); - - delete[] buffer; - m_lcount = total; - SetError(wxSOCKET_NOERROR); - - return *this; -} - -// -------------------------------------------------------------------------- -// Wait functions -// -------------------------------------------------------------------------- - -/* - This function will check for the events specified in the flags parameter, - and it will return a mask indicating which operations can be performed. - */ -wxSocketEventFlags wxSocketImpl::Select(wxSocketEventFlags flags, - const timeval *timeout) -{ - if ( m_fd == INVALID_SOCKET ) - return (wxSOCKET_LOST_FLAG & flags); - - struct timeval tv; - if ( timeout ) - tv = *timeout; - else - tv.tv_sec = tv.tv_usec = 0; - - // prepare the FD sets, passing NULL for the one(s) we don't use - fd_set - readfds, *preadfds = NULL, - writefds, *pwritefds = NULL, - exceptfds; // always want to know about errors - - if ( flags & wxSOCKET_INPUT_FLAG ) - preadfds = &readfds; - - if ( flags & wxSOCKET_OUTPUT_FLAG ) - pwritefds = &writefds; - - // When using non-blocking connect() the client socket becomes connected - // (successfully or not) when it becomes writable but when using - // non-blocking accept() the server socket becomes connected when it - // becomes readable. - if ( flags & wxSOCKET_CONNECTION_FLAG ) - { - if ( m_server ) - preadfds = &readfds; - else - pwritefds = &writefds; - } - - if ( preadfds ) - { - wxFD_ZERO(preadfds); - wxFD_SET(m_fd, preadfds); - } - - if ( pwritefds ) - { - wxFD_ZERO(pwritefds); - wxFD_SET(m_fd, pwritefds); - } - - wxFD_ZERO(&exceptfds); - wxFD_SET(m_fd, &exceptfds); - - const int rc = select(m_fd + 1, preadfds, pwritefds, &exceptfds, &tv); - - // check for errors first - if ( rc == -1 || wxFD_ISSET(m_fd, &exceptfds) ) - { - m_establishing = false; - - return wxSOCKET_LOST_FLAG & flags; - } - - if ( rc == 0 ) - return 0; - - wxASSERT_MSG( rc == 1, "unexpected select() return value" ); - - wxSocketEventFlags detected = 0; - if ( preadfds && wxFD_ISSET(m_fd, preadfds) ) - { - // check for the case of a server socket waiting for connection - if ( m_server && (flags & wxSOCKET_CONNECTION_FLAG) ) - { - int error; - SOCKOPTLEN_T len = sizeof(error); - m_establishing = false; - getsockopt(m_fd, SOL_SOCKET, SO_ERROR, (char*)&error, &len); - - if ( error ) - detected = wxSOCKET_LOST_FLAG; - else - detected |= wxSOCKET_CONNECTION_FLAG; - } - else // not called to get non-blocking accept() status - { - detected |= wxSOCKET_INPUT_FLAG; - } - } - - if ( pwritefds && wxFD_ISSET(m_fd, pwritefds) ) - { - // check for the case of non-blocking connect() - if ( m_establishing && !m_server ) - { - int error; - SOCKOPTLEN_T len = sizeof(error); - m_establishing = false; - getsockopt(m_fd, SOL_SOCKET, SO_ERROR, (char*)&error, &len); - - if ( error ) - detected = wxSOCKET_LOST_FLAG; - else - detected |= wxSOCKET_CONNECTION_FLAG; - } - else // not called to get non-blocking connect() status - { - detected |= wxSOCKET_OUTPUT_FLAG; - } - } - - return detected & flags; -} - -int -wxSocketBase::DoWait(long seconds, long milliseconds, wxSocketEventFlags flags) -{ - // Use either the provided timeout or the default timeout value associated - // with this socket. - // - // TODO: allow waiting forever, see #9443 - const long timeout = seconds == -1 ? m_timeout * 1000 - : seconds * 1000 + milliseconds; - - return DoWait(timeout, flags); -} - -int -wxSocketBase::DoWait(long timeout, wxSocketEventFlags flags) -{ - wxCHECK_MSG( m_impl, -1, "can't wait on invalid socket" ); - - // we're never going to become ready in a TCP client if we're not connected - // any more (OTOH a server can call this to precisely wait for a connection - // so do wait for it in this case and UDP client is never "connected") - if ( !m_impl->IsServer() && - m_impl->m_stream && !m_connected && !m_establishing ) - return -1; - - // This can be set to true from Interrupt() to exit this function a.s.a.p. - m_interrupt = false; - - - const wxMilliClock_t timeEnd = wxGetLocalTimeMillis() + timeout; - - // Get the active event loop which we'll use for the message dispatching - // when running in the main thread unless this was explicitly disabled by - // setting wxSOCKET_BLOCK flag - wxEventLoopBase *eventLoop; - if ( !(m_flags & wxSOCKET_BLOCK) && wxIsMainThread() ) - { - eventLoop = wxEventLoop::GetActive(); - } - else // in worker thread - { - // We never dispatch messages from threads other than the main one. - eventLoop = NULL; - } - - // Make sure the events we're interested in are enabled before waiting for - // them: this is really necessary here as otherwise this could happen: - // 1. DoRead(wxSOCKET_WAITALL) is called - // 2. There is nothing to read so DoWait(wxSOCKET_INPUT_FLAG) is called - // 3. Some, but not all data appears, wxSocketImplUnix::OnReadWaiting() - // is called and wxSOCKET_INPUT_FLAG events are disabled in it - // 4. Because of wxSOCKET_WAITALL we call DoWait() again but the events - // are still disabled and we block forever - // - // More elegant solution would be nice but for now simply re-enabling the - // events here will do - m_impl->ReenableEvents(flags & (wxSOCKET_INPUT_FLAG | wxSOCKET_OUTPUT_FLAG)); - - - // Wait until we receive the event we're waiting for or the timeout expires - // (but note that we always execute the loop at least once, even if timeout - // is 0 as this is used for polling) - int rc = 0; - for ( bool firstTime = true; !m_interrupt; firstTime = false ) - { - long timeLeft = wxMilliClockToLong(timeEnd - wxGetLocalTimeMillis()); - if ( timeLeft < 0 ) - { - if ( !firstTime ) - break; // timed out - - timeLeft = 0; - } - - wxSocketEventFlags events; - if ( eventLoop ) - { - // reset them before starting to wait - m_eventsgot = 0; - - eventLoop->DispatchTimeout(timeLeft); - - events = m_eventsgot; - } - else // no event loop or waiting in another thread - { - // as explained below, we should always check for wxSOCKET_LOST_FLAG - timeval tv; - SetTimeValFromMS(tv, timeLeft); - events = m_impl->Select(flags | wxSOCKET_LOST_FLAG, &tv); - } - - // always check for wxSOCKET_LOST_FLAG, even if flags doesn't include - // it, as continuing to wait for anything else after getting it is - // pointless - if ( events & wxSOCKET_LOST_FLAG ) - { - m_connected = false; - m_establishing = false; - rc = -1; - break; - } - - // otherwise mask out the bits we're not interested in - events &= flags; - - // Incoming connection (server) or connection established (client)? - if ( events & wxSOCKET_CONNECTION_FLAG ) - { - m_connected = true; - m_establishing = false; - rc = true; - break; - } - - // Data available or output buffer ready? - if ( (events & wxSOCKET_INPUT_FLAG) || (events & wxSOCKET_OUTPUT_FLAG) ) - { - rc = true; - break; - } - } - - return rc; -} - -bool wxSocketBase::Wait(long seconds, long milliseconds) -{ - return DoWait(seconds, milliseconds, - wxSOCKET_INPUT_FLAG | - wxSOCKET_OUTPUT_FLAG | - wxSOCKET_CONNECTION_FLAG) != 0; -} - -bool wxSocketBase::WaitForRead(long seconds, long milliseconds) -{ - // Check pushback buffer before entering DoWait - if ( m_unread ) - return true; - - // Check if the socket is not already ready for input, if it is, there is - // no need to start waiting for it (worse, we'll actually never get a - // notification about the socket becoming ready if it is already under - // Windows) - if ( m_impl->Select(wxSOCKET_INPUT_FLAG) ) - return true; - - return DoWait(seconds, milliseconds, wxSOCKET_INPUT_FLAG) != 0; -} - - -bool wxSocketBase::WaitForWrite(long seconds, long milliseconds) -{ - if ( m_impl->Select(wxSOCKET_OUTPUT_FLAG) ) - return true; - - return DoWait(seconds, milliseconds, wxSOCKET_OUTPUT_FLAG) != 0; -} - -bool wxSocketBase::WaitForLost(long seconds, long milliseconds) -{ - return DoWait(seconds, milliseconds, wxSOCKET_LOST_FLAG) == -1; -} - -// -------------------------------------------------------------------------- -// Miscellaneous -// -------------------------------------------------------------------------- - -// -// Get local or peer address -// - -bool wxSocketBase::GetPeer(wxSockAddress& addr) const -{ - wxCHECK_MSG( m_impl, false, "invalid socket" ); - - const wxSockAddressImpl& peer = m_impl->GetPeer(); - if ( !peer.IsOk() ) - return false; - - addr.SetAddress(peer); - - return true; -} - -bool wxSocketBase::GetLocal(wxSockAddress& addr) const -{ - wxCHECK_MSG( m_impl, false, "invalid socket" ); - - const wxSockAddressImpl& local = m_impl->GetLocal(); - if ( !local.IsOk() ) - return false; - - addr.SetAddress(local); - - return true; -} - -// -// Save and restore socket state -// - -void wxSocketBase::SaveState() -{ - wxSocketState *state; - - state = new wxSocketState(); - - state->m_flags = m_flags; - state->m_notify = m_notify; - state->m_eventmask = m_eventmask; - state->m_clientData = m_clientData; - - m_states.Append(state); -} - -void wxSocketBase::RestoreState() -{ - wxList::compatibility_iterator node; - wxSocketState *state; - - node = m_states.GetLast(); - if (!node) - return; - - state = (wxSocketState *)node->GetData(); - - m_flags = state->m_flags; - m_notify = state->m_notify; - m_eventmask = state->m_eventmask; - m_clientData = state->m_clientData; - - m_states.Erase(node); - delete state; -} - -// -// Timeout and flags -// - -void wxSocketBase::SetTimeout(long seconds) -{ - m_timeout = seconds; - - if (m_impl) - m_impl->SetTimeout(m_timeout * 1000); -} - -void wxSocketBase::SetFlags(wxSocketFlags flags) -{ - // Do some sanity checking on the flags used: not all values can be used - // together. - wxASSERT_MSG( !(flags & wxSOCKET_NOWAIT) || - !(flags & (wxSOCKET_WAITALL | wxSOCKET_BLOCK)), - "Using wxSOCKET_WAITALL or wxSOCKET_BLOCK with " - "wxSOCKET_NOWAIT doesn't make sense" ); - - m_flags = flags; -} - - -// -------------------------------------------------------------------------- -// Event handling -// -------------------------------------------------------------------------- - -void wxSocketBase::OnRequest(wxSocketNotify notification) -{ - wxSocketEventFlags flag = 0; - switch ( notification ) - { - case wxSOCKET_INPUT: - flag = wxSOCKET_INPUT_FLAG; - break; - - case wxSOCKET_OUTPUT: - flag = wxSOCKET_OUTPUT_FLAG; - break; - - case wxSOCKET_CONNECTION: - flag = wxSOCKET_CONNECTION_FLAG; - - // we're now successfully connected - m_connected = true; - m_establishing = false; - - // error was previously set to wxSOCKET_WOULDBLOCK, but this is not - // the case any longer - SetError(wxSOCKET_NOERROR); - break; - - case wxSOCKET_LOST: - flag = wxSOCKET_LOST_FLAG; - - // if we lost the connection the socket is now closed and not - // connected any more - m_connected = false; - m_closed = true; - break; - - default: - wxFAIL_MSG( "unknown wxSocket notification" ); - } - - // remember the events which were generated for this socket, we're going to - // use this in DoWait() - m_eventsgot |= flag; - - // send the wx event if enabled and we're interested in it - if ( m_notify && (m_eventmask & flag) && m_handler ) - { - // don't generate the events when we're inside DoWait() called from our - // own code as we are going to consume the data that has just become - // available ourselves and the user code won't see it at all - if ( (notification == wxSOCKET_INPUT && m_reading) || - (notification == wxSOCKET_OUTPUT && m_writing) ) - { - return; - } - - wxSocketEvent event(m_id); - event.m_event = notification; - event.m_clientData = m_clientData; - event.SetEventObject(this); - - m_handler->AddPendingEvent(event); - } -} - -void wxSocketBase::Notify(bool notify) -{ - m_notify = notify; -} - -void wxSocketBase::SetNotify(wxSocketEventFlags flags) -{ - m_eventmask = flags; -} - -void wxSocketBase::SetEventHandler(wxEvtHandler& handler, int id) -{ - m_handler = &handler; - m_id = id; -} - -// -------------------------------------------------------------------------- -// Pushback buffer -// -------------------------------------------------------------------------- - -void wxSocketBase::Pushback(const void *buffer, wxUint32 size) -{ - if (!size) return; - - if (m_unread == NULL) - m_unread = malloc(size); - else - { - void *tmp; - - tmp = malloc(m_unrd_size + size); - memcpy((char *)tmp + size, m_unread, m_unrd_size); - free(m_unread); - - m_unread = tmp; - } - - m_unrd_size += size; - - memcpy(m_unread, buffer, size); -} - -wxUint32 wxSocketBase::GetPushback(void *buffer, wxUint32 size, bool peek) -{ - wxCHECK_MSG( buffer, 0, "NULL buffer" ); - - if (!m_unrd_size) - return 0; - - if (size > (m_unrd_size-m_unrd_cur)) - size = m_unrd_size-m_unrd_cur; - - memcpy(buffer, (char *)m_unread + m_unrd_cur, size); - - if (!peek) - { - m_unrd_cur += size; - if (m_unrd_size == m_unrd_cur) - { - free(m_unread); - m_unread = NULL; - m_unrd_size = 0; - m_unrd_cur = 0; - } - } - - return size; -} - - -// ========================================================================== -// wxSocketServer -// ========================================================================== - -// -------------------------------------------------------------------------- -// Ctor -// -------------------------------------------------------------------------- - -wxSocketServer::wxSocketServer(const wxSockAddress& addr, - wxSocketFlags flags) - : wxSocketBase(flags, wxSOCKET_SERVER) -{ - wxLogTrace( wxTRACE_Socket, wxT("Opening wxSocketServer") ); - - wxSocketManager * const manager = wxSocketManager::Get(); - m_impl = manager ? manager->CreateSocket(*this) : NULL; - - if (!m_impl) - { - wxLogTrace( wxTRACE_Socket, wxT("*** Failed to create m_impl") ); - return; - } - - // Setup the socket as server - m_impl->SetLocal(addr.GetAddress()); - - if (GetFlags() & wxSOCKET_REUSEADDR) { - m_impl->SetReusable(); - } - if (GetFlags() & wxSOCKET_BROADCAST) { - m_impl->SetBroadcast(); - } - if (GetFlags() & wxSOCKET_NOBIND) { - m_impl->DontDoBind(); - } - - if (m_impl->CreateServer() != wxSOCKET_NOERROR) - { - wxDELETE(m_impl); - - wxLogTrace( wxTRACE_Socket, wxT("*** CreateServer() failed") ); - return; - } - - // Notice that we need a cast as wxSOCKET_T is 64 bit under Win64 and that - // the cast is safe because a wxSOCKET_T is a handle and so limited to 32 - // (or, actually, even 24) bit values anyhow. - wxLogTrace( wxTRACE_Socket, wxT("wxSocketServer on fd %u"), - static_cast(m_impl->m_fd) ); -} - -// -------------------------------------------------------------------------- -// Accept -// -------------------------------------------------------------------------- - -bool wxSocketServer::AcceptWith(wxSocketBase& sock, bool wait) -{ - if ( !m_impl || (m_impl->m_fd == INVALID_SOCKET) || !m_impl->IsServer() ) - { - wxFAIL_MSG( "can only be called for a valid server socket" ); - - SetError(wxSOCKET_INVSOCK); - - return false; - } - - if ( wait ) - { - // wait until we get a connection - if ( !m_impl->SelectWithTimeout(wxSOCKET_INPUT_FLAG) ) - { - SetError(wxSOCKET_TIMEDOUT); - - return false; - } - } - - sock.m_impl = m_impl->Accept(sock); - - if ( !sock.m_impl ) - { - SetError(m_impl->GetLastError()); - - return false; - } - - sock.m_type = wxSOCKET_BASE; - sock.m_connected = true; - - return true; -} - -wxSocketBase *wxSocketServer::Accept(bool wait) -{ - wxSocketBase* sock = new wxSocketBase(); - - sock->SetFlags(m_flags); - - if (!AcceptWith(*sock, wait)) - { - sock->Destroy(); - sock = NULL; - } - - return sock; -} - -bool wxSocketServer::WaitForAccept(long seconds, long milliseconds) -{ - return DoWait(seconds, milliseconds, wxSOCKET_CONNECTION_FLAG) == 1; -} - -wxSOCKET_T wxSocketBase::GetSocket() const -{ - wxASSERT_MSG( m_impl, wxS("Socket not initialised") ); - - return m_impl->m_fd; -} - - -bool wxSocketBase::GetOption(int level, int optname, void *optval, int *optlen) -{ - wxASSERT_MSG( m_impl, wxT("Socket not initialised") ); - - SOCKOPTLEN_T lenreal = *optlen; - if ( getsockopt(m_impl->m_fd, level, optname, - static_cast(optval), &lenreal) != 0 ) - return false; - - *optlen = lenreal; - - return true; -} - -bool -wxSocketBase::SetOption(int level, int optname, const void *optval, int optlen) -{ - wxASSERT_MSG( m_impl, wxT("Socket not initialised") ); - - return setsockopt(m_impl->m_fd, level, optname, - static_cast(optval), optlen) == 0; -} - -bool wxSocketBase::SetLocal(const wxIPV4address& local) -{ - m_localAddress = local; - - return true; -} - -// ========================================================================== -// wxSocketClient -// ========================================================================== - -// -------------------------------------------------------------------------- -// Ctor and dtor -// -------------------------------------------------------------------------- - -wxSocketClient::wxSocketClient(wxSocketFlags flags) - : wxSocketBase(flags, wxSOCKET_CLIENT) -{ - m_initialRecvBufferSize = - m_initialSendBufferSize = -1; -} - -// -------------------------------------------------------------------------- -// Connect -// -------------------------------------------------------------------------- - -bool wxSocketClient::DoConnect(const wxSockAddress& remote, - const wxSockAddress* local, - bool wait) -{ - if ( m_impl ) - { - // Shutdown and destroy the old socket - Close(); - delete m_impl; - } - - m_connected = false; - m_establishing = false; - - // Create and set up the new one - wxSocketManager * const manager = wxSocketManager::Get(); - m_impl = manager ? manager->CreateSocket(*this) : NULL; - if ( !m_impl ) - return false; - - // Reuse makes sense for clients too, if we are trying to rebind to the same port - if (GetFlags() & wxSOCKET_REUSEADDR) - m_impl->SetReusable(); - if (GetFlags() & wxSOCKET_BROADCAST) - m_impl->SetBroadcast(); - if (GetFlags() & wxSOCKET_NOBIND) - m_impl->DontDoBind(); - - // Bind to the local IP address and port, when provided or if one had been - // set before - if ( !local && m_localAddress.GetAddress().IsOk() ) - local = &m_localAddress; - - if ( local ) - m_impl->SetLocal(local->GetAddress()); - - m_impl->SetInitialSocketBuffers(m_initialRecvBufferSize, m_initialSendBufferSize); - - m_impl->SetPeer(remote.GetAddress()); - - // Finally do create the socket and connect to the peer - const wxSocketError err = m_impl->CreateClient(wait); - - if ( err != wxSOCKET_NOERROR ) - { - if ( err == wxSOCKET_WOULDBLOCK ) - { - wxASSERT_MSG( !wait, "shouldn't get this for blocking connect" ); - - m_establishing = true; - } - - return false; - } - - m_connected = true; - return true; -} - -bool wxSocketClient::Connect(const wxSockAddress& remote, bool wait) -{ - return DoConnect(remote, NULL, wait); -} - -bool wxSocketClient::Connect(const wxSockAddress& remote, - const wxSockAddress& local, - bool wait) -{ - return DoConnect(remote, &local, wait); -} - -bool wxSocketClient::WaitOnConnect(long seconds, long milliseconds) -{ - if ( m_connected ) - { - // this happens if the initial attempt to connect succeeded without - // blocking - return true; - } - - wxCHECK_MSG( m_establishing && m_impl, false, - "No connection establishment attempt in progress" ); - - // notice that we return true even if DoWait() returned -1, i.e. if an - // error occurred and connection was lost: this is intentional as we should - // return false only if timeout expired without anything happening - return DoWait(seconds, milliseconds, wxSOCKET_CONNECTION_FLAG) != 0; -} - -// ========================================================================== -// wxDatagramSocket -// ========================================================================== - -wxDatagramSocket::wxDatagramSocket( const wxSockAddress& addr, - wxSocketFlags flags ) - : wxSocketBase( flags, wxSOCKET_DATAGRAM ) -{ - // Create the socket - wxSocketManager * const manager = wxSocketManager::Get(); - m_impl = manager ? manager->CreateSocket(*this) : NULL; - - if (!m_impl) - return; - - // Setup the socket as non connection oriented - m_impl->SetLocal(addr.GetAddress()); - if (flags & wxSOCKET_REUSEADDR) - { - m_impl->SetReusable(); - } - if (GetFlags() & wxSOCKET_BROADCAST) - { - m_impl->SetBroadcast(); - } - if (GetFlags() & wxSOCKET_NOBIND) - { - m_impl->DontDoBind(); - } - - if ( m_impl->CreateUDP() != wxSOCKET_NOERROR ) - { - wxDELETE(m_impl); - return; - } - - // Initialize all stuff - m_connected = false; - m_establishing = false; -} - -wxDatagramSocket& wxDatagramSocket::RecvFrom( wxSockAddress& addr, - void* buf, - wxUint32 nBytes ) -{ - Read(buf, nBytes); - GetPeer(addr); - return (*this); -} - -wxDatagramSocket& wxDatagramSocket::SendTo( const wxSockAddress& addr, - const void* buf, - wxUint32 nBytes ) -{ - wxASSERT_MSG( m_impl, wxT("Socket not initialised") ); - - m_impl->SetPeer(addr.GetAddress()); - Write(buf, nBytes); - return (*this); -} - -// ========================================================================== -// wxSocketModule -// ========================================================================== - -class wxSocketModule : public wxModule -{ -public: - virtual bool OnInit() wxOVERRIDE - { - // wxSocketBase will call Initialize() itself only if sockets are - // really used, don't do it from here - return true; - } - - virtual void OnExit() wxOVERRIDE - { - if ( wxSocketBase::IsInitialized() ) - wxSocketBase::Shutdown(); - } - -private: - wxDECLARE_DYNAMIC_CLASS(wxSocketModule); -}; - -wxIMPLEMENT_DYNAMIC_CLASS(wxSocketModule, wxModule); - -#if defined(wxUSE_SELECT_DISPATCHER) && wxUSE_SELECT_DISPATCHER -// NOTE: we need to force linking against socketiohandler.cpp otherwise in -// static builds of wxWidgets the ManagerSetter::ManagerSetter ctor -// contained there wouldn't be ever called -wxFORCE_LINK_MODULE( socketiohandler ) -#endif - -// same for ManagerSetter in the MSW file -#ifdef __WINDOWS__ - wxFORCE_LINK_MODULE( mswsocket ) -#endif - -// and for OSXManagerSetter in the OS X one -#ifdef __WXOSX__ - wxFORCE_LINK_MODULE( osxsocket ) -#endif - -#endif // wxUSE_SOCKETS diff --git a/Externals/wxWidgets3/src/common/socketiohandler.cpp b/Externals/wxWidgets3/src/common/socketiohandler.cpp deleted file mode 100644 index 92f9e7f5fc..0000000000 --- a/Externals/wxWidgets3/src/common/socketiohandler.cpp +++ /dev/null @@ -1,130 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/socketiohandler.cpp -// Purpose: implementation of wxFDIOHandler for wxSocket -// Author: Angel Vidal, Lukasz Michalski -// Created: 08.24.06 -// Copyright: (c) 2006 Angel vidal -// (c) 2007 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// for compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_SOCKETS - -#include "wx/app.h" -#include "wx/apptrait.h" -#include "wx/private/socket.h" -#include "wx/link.h" - -// ============================================================================ -// wxSocketFDBasedManager implementation -// ============================================================================ - -bool wxSocketFDBasedManager::OnInit() -{ - wxAppTraits * const traits = wxApp::GetTraitsIfExists(); - if ( !traits ) - return false; - - m_fdioManager = traits->GetFDIOManager(); - return m_fdioManager != NULL; -} - -void wxSocketFDBasedManager::Install_Callback(wxSocketImpl *socket_, - wxSocketNotify event) -{ - wxSocketImplUnix * const - socket = static_cast(socket_); - - wxCHECK_RET( socket->m_fd != -1, - "shouldn't be called on invalid socket" ); - - const wxFDIOManager::Direction d = GetDirForEvent(socket, event); - - int& fd = FD(socket, d); - if ( fd != -1 ) - m_fdioManager->RemoveInput(socket, fd, d); - - fd = m_fdioManager->AddInput(socket, socket->m_fd, d); -} - -void wxSocketFDBasedManager::Uninstall_Callback(wxSocketImpl *socket_, - wxSocketNotify event) -{ - wxSocketImplUnix * const - socket = static_cast(socket_); - - const wxFDIOManager::Direction d = GetDirForEvent(socket, event); - - int& fd = FD(socket, d); - if ( fd != -1 ) - { - m_fdioManager->RemoveInput(socket, fd, d); - fd = -1; - } -} - -wxFDIOManager::Direction -wxSocketFDBasedManager::GetDirForEvent(wxSocketImpl *socket, - wxSocketNotify event) -{ - switch ( event ) - { - default: - wxFAIL_MSG( "unknown socket event" ); - return wxFDIOManager::INPUT; // we must return something - - case wxSOCKET_LOST: - wxFAIL_MSG( "unexpected socket event" ); - return wxFDIOManager::INPUT; // as above - - case wxSOCKET_INPUT: - return wxFDIOManager::INPUT; - - case wxSOCKET_OUTPUT: - return wxFDIOManager::OUTPUT; - - case wxSOCKET_CONNECTION: - // for server sockets we're interested in events indicating - // that a new connection is pending, i.e. that accept() will - // succeed and this is indicated by socket becoming ready for - // reading, while for the other ones we're interested in the - // completion of non-blocking connect() which is indicated by - // the socket becoming ready for writing - return socket->IsServer() ? wxFDIOManager::INPUT - : wxFDIOManager::OUTPUT; - } -} - -// set the wxBase variable to point to our wxSocketManager implementation -// -// see comments in wx/apptrait.h for the explanation of why do we do it -// like this -static struct ManagerSetter -{ - ManagerSetter() - { - static wxSocketFDBasedManager s_manager; - wxAppTraits::SetDefaultSocketManager(&s_manager); - } -} gs_managerSetter; - - -// see the relative linker macro in socket.cpp -wxFORCE_LINK_THIS_MODULE( socketiohandler ); - -#endif // wxUSE_SOCKETS diff --git a/Externals/wxWidgets3/src/common/spinbtncmn.cpp b/Externals/wxWidgets3/src/common/spinbtncmn.cpp deleted file mode 100644 index 050b85db40..0000000000 --- a/Externals/wxWidgets3/src/common/spinbtncmn.cpp +++ /dev/null @@ -1,98 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/spinbtncmn.cpp -// Purpose: wxSpinButton common code -// Author: Julian Smart -// Modified by: -// Created: 04/01/98 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#ifndef WX_PRECOMP - #include "wx/app.h" -#endif - -#if wxUSE_SPINBTN - -#include "wx/spinbutt.h" - -// ---------------------------------------------------------------------------- -// XTI -// ---------------------------------------------------------------------------- - -wxDEFINE_FLAGS( wxSpinButtonStyle ) -wxBEGIN_FLAGS( wxSpinButtonStyle ) - // new style border flags, we put them first to - // use them for streaming out - wxFLAGS_MEMBER(wxBORDER_SIMPLE) - wxFLAGS_MEMBER(wxBORDER_SUNKEN) - wxFLAGS_MEMBER(wxBORDER_DOUBLE) - wxFLAGS_MEMBER(wxBORDER_RAISED) - wxFLAGS_MEMBER(wxBORDER_STATIC) - wxFLAGS_MEMBER(wxBORDER_NONE) - - // old style border flags - wxFLAGS_MEMBER(wxSIMPLE_BORDER) - wxFLAGS_MEMBER(wxSUNKEN_BORDER) - wxFLAGS_MEMBER(wxDOUBLE_BORDER) - wxFLAGS_MEMBER(wxRAISED_BORDER) - wxFLAGS_MEMBER(wxSTATIC_BORDER) - wxFLAGS_MEMBER(wxBORDER) - - // standard window styles - wxFLAGS_MEMBER(wxTAB_TRAVERSAL) - wxFLAGS_MEMBER(wxCLIP_CHILDREN) - wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) - wxFLAGS_MEMBER(wxWANTS_CHARS) - wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE) - wxFLAGS_MEMBER(wxALWAYS_SHOW_SB ) - wxFLAGS_MEMBER(wxVSCROLL) - wxFLAGS_MEMBER(wxHSCROLL) - - wxFLAGS_MEMBER(wxSP_HORIZONTAL) - wxFLAGS_MEMBER(wxSP_VERTICAL) - wxFLAGS_MEMBER(wxSP_ARROW_KEYS) - wxFLAGS_MEMBER(wxSP_WRAP) -wxEND_FLAGS( wxSpinButtonStyle ) - -wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxSpinButton, wxControl, "wx/spinbutt.h"); - -wxBEGIN_PROPERTIES_TABLE(wxSpinButton) - wxEVENT_RANGE_PROPERTY( Spin, wxEVT_SCROLL_TOP, wxEVT_SCROLL_CHANGED, wxSpinEvent ) - - wxPROPERTY( Value, int, SetValue, GetValue, 0, 0 /*flags*/, \ - wxT("Helpstring"), wxT("group")) - wxPROPERTY( Min, int, SetMin, GetMin, 0, 0 /*flags*/, \ - wxT("Helpstring"), wxT("group")) - wxPROPERTY( Max, int, SetMax, GetMax, 0, 0 /*flags*/, \ - wxT("Helpstring"), wxT("group")) - - wxPROPERTY_FLAGS( WindowStyle, wxSpinButtonStyle, long, SetWindowStyleFlag, \ - GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \ - wxT("Helpstring"), wxT("group")) // style -wxEND_PROPERTIES_TABLE() - -wxEMPTY_HANDLERS_TABLE(wxSpinButton) - -wxCONSTRUCTOR_5( wxSpinButton, wxWindow*, Parent, wxWindowID, Id, \ - wxPoint, Position, wxSize, Size, long, WindowStyle ) - -wxIMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent); - - -#endif // wxUSE_SPINBTN diff --git a/Externals/wxWidgets3/src/common/spinctrlcmn.cpp b/Externals/wxWidgets3/src/common/spinctrlcmn.cpp deleted file mode 100644 index 87b9f64776..0000000000 --- a/Externals/wxWidgets3/src/common/spinctrlcmn.cpp +++ /dev/null @@ -1,118 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/spinctrlcmn.cpp -// Purpose: define wxSpinCtrl event types -// Author: Peter Most -// Created: 01.11.08 -// Copyright: (c) 2008-2009 wxWidgets team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include "wx/spinbutt.h" -#include "wx/spinctrl.h" - -#if wxUSE_SPINCTRL - -wxDEFINE_EVENT(wxEVT_SPINCTRL, wxSpinEvent); -wxDEFINE_EVENT(wxEVT_SPINCTRLDOUBLE, wxSpinDoubleEvent); - -// ---------------------------------------------------------------------------- -// XTI -// ---------------------------------------------------------------------------- - -wxDEFINE_FLAGS( wxSpinCtrlStyle ) -wxBEGIN_FLAGS( wxSpinCtrlStyle ) -// new style border flags, we put them first to -// use them for streaming out -wxFLAGS_MEMBER(wxBORDER_SIMPLE) -wxFLAGS_MEMBER(wxBORDER_SUNKEN) -wxFLAGS_MEMBER(wxBORDER_DOUBLE) -wxFLAGS_MEMBER(wxBORDER_RAISED) -wxFLAGS_MEMBER(wxBORDER_STATIC) -wxFLAGS_MEMBER(wxBORDER_NONE) - -// old style border flags -wxFLAGS_MEMBER(wxSIMPLE_BORDER) -wxFLAGS_MEMBER(wxSUNKEN_BORDER) -wxFLAGS_MEMBER(wxDOUBLE_BORDER) -wxFLAGS_MEMBER(wxRAISED_BORDER) -wxFLAGS_MEMBER(wxSTATIC_BORDER) -wxFLAGS_MEMBER(wxBORDER) - -// standard window styles -wxFLAGS_MEMBER(wxTAB_TRAVERSAL) -wxFLAGS_MEMBER(wxCLIP_CHILDREN) -wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) -wxFLAGS_MEMBER(wxWANTS_CHARS) -wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE) -wxFLAGS_MEMBER(wxALWAYS_SHOW_SB ) -wxFLAGS_MEMBER(wxVSCROLL) -wxFLAGS_MEMBER(wxHSCROLL) - -wxFLAGS_MEMBER(wxSP_HORIZONTAL) -wxFLAGS_MEMBER(wxSP_VERTICAL) -wxFLAGS_MEMBER(wxSP_ARROW_KEYS) -wxFLAGS_MEMBER(wxSP_WRAP) -wxEND_FLAGS( wxSpinCtrlStyle ) - -wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxSpinCtrl, wxControl, "wx/spinctrl.h"); - -wxBEGIN_PROPERTIES_TABLE(wxSpinCtrl) -wxEVENT_RANGE_PROPERTY( Spin, wxEVT_SCROLL_TOP, wxEVT_SCROLL_CHANGED, wxSpinEvent ) - -wxEVENT_PROPERTY( Updated, wxEVT_SPINCTRL, wxCommandEvent ) -wxEVENT_PROPERTY( TextUpdated, wxEVT_TEXT, wxCommandEvent ) -wxEVENT_PROPERTY( TextEnter, wxEVT_TEXT_ENTER, wxCommandEvent ) - -wxPROPERTY( ValueString, wxString, SetValue, GetValue, \ - wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, wxT("Helpstring"), wxT("group")) ; -wxPROPERTY( Value, int, SetValue, GetValue, 0, 0 /*flags*/, \ - wxT("Helpstring"), wxT("group")) -#if 0 - wxPROPERTY( Min, int, SetMin, GetMin, 0, 0 /*flags*/, wxT("Helpstring"), wxT("group") ) - wxPROPERTY( Max, int, SetMax, GetMax, 0, 0 /*flags*/, wxT("Helpstring"), wxT("group")) -#endif -wxPROPERTY_FLAGS( WindowStyle, wxSpinCtrlStyle, long, SetWindowStyleFlag, \ - GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \ - wxT("Helpstring"), wxT("group")) // style -/* - TODO PROPERTIES - style wxSP_ARROW_KEYS - */ -wxEND_PROPERTIES_TABLE() - -wxEMPTY_HANDLERS_TABLE(wxSpinCtrl) - -wxCONSTRUCTOR_6( wxSpinCtrl, wxWindow*, Parent, wxWindowID, Id, \ - wxString, ValueString, wxPoint, Position, \ - wxSize, Size, long, WindowStyle ) - - -wxString wxPrivate::wxSpinCtrlFormatAsHex(long val, long maxVal) -{ - // We format the value like this is for compatibility with (native - // behaviour of) wxMSW - wxString text; - if ( maxVal < 0x10000 ) - text.Printf(wxS("0x%04lx"), val); - else - text.Printf(wxS("0x%08lx"), val); - - return text; -} - -#endif // wxUSE_SPINCTRL diff --git a/Externals/wxWidgets3/src/common/srchcmn.cpp b/Externals/wxWidgets3/src/common/srchcmn.cpp deleted file mode 100644 index 1e524b5394..0000000000 --- a/Externals/wxWidgets3/src/common/srchcmn.cpp +++ /dev/null @@ -1,41 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/srchcmn.cpp -// Purpose: common (to all ports) bits of wxSearchCtrl -// Author: Robin Dunn -// Modified by: -// Created: 19-Dec-2006 -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_SEARCHCTRL - -#include "wx/srchctrl.h" - -#ifndef WX_PRECOMP -#endif - -// ---------------------------------------------------------------------------- - -const char wxSearchCtrlNameStr[] = "searchCtrl"; - -wxDEFINE_EVENT(wxEVT_SEARCHCTRL_CANCEL_BTN, wxCommandEvent); -wxDEFINE_EVENT(wxEVT_SEARCHCTRL_SEARCH_BTN, wxCommandEvent); - - -#endif // wxUSE_SEARCHCTRL diff --git a/Externals/wxWidgets3/src/common/sstream.cpp b/Externals/wxWidgets3/src/common/sstream.cpp deleted file mode 100644 index 009e2c04b6..0000000000 --- a/Externals/wxWidgets3/src/common/sstream.cpp +++ /dev/null @@ -1,203 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/sstream.cpp -// Purpose: string-based streams implementation -// Author: Vadim Zeitlin -// Modified by: Ryan Norton (UTF8 UNICODE) -// Created: 2004-09-19 -// Copyright: (c) 2004 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_STREAMS - -#include "wx/sstream.h" - -// ============================================================================ -// wxStringInputStream implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// construction/destruction -// ---------------------------------------------------------------------------- - -// TODO: Do we want to include the null char in the stream? If so then -// just add +1 to m_len in the ctor -wxStringInputStream::wxStringInputStream(const wxString& s) -#if wxUSE_UNICODE - // FIXME-UTF8: use wxCharBufferWithLength if we have it - : m_str(s), m_buf(s.utf8_str()), m_len(strlen(m_buf)) -#else - : m_str(s), m_buf(s.mb_str()), m_len(s.length()) -#endif -{ -#if wxUSE_UNICODE - wxASSERT_MSG(m_buf.data() != NULL, wxT("Could not convert string to UTF8!")); -#endif - m_pos = 0; -} - -// ---------------------------------------------------------------------------- -// getlength -// ---------------------------------------------------------------------------- - -wxFileOffset wxStringInputStream::GetLength() const -{ - return m_len; -} - -// ---------------------------------------------------------------------------- -// seek/tell -// ---------------------------------------------------------------------------- - -wxFileOffset wxStringInputStream::OnSysSeek(wxFileOffset ofs, wxSeekMode mode) -{ - switch ( mode ) - { - case wxFromStart: - // nothing to do, ofs already ok - break; - - case wxFromEnd: - ofs += m_len; - break; - - case wxFromCurrent: - ofs += m_pos; - break; - - default: - wxFAIL_MSG( wxT("invalid seek mode") ); - return wxInvalidOffset; - } - - if ( ofs < 0 || ofs > static_cast(m_len) ) - return wxInvalidOffset; - - // FIXME: this can't be right - m_pos = wx_truncate_cast(size_t, ofs); - - return ofs; -} - -wxFileOffset wxStringInputStream::OnSysTell() const -{ - return static_cast(m_pos); -} - -// ---------------------------------------------------------------------------- -// actual IO -// ---------------------------------------------------------------------------- - -size_t wxStringInputStream::OnSysRead(void *buffer, size_t size) -{ - const size_t sizeMax = m_len - m_pos; - - if ( size >= sizeMax ) - { - if ( sizeMax == 0 ) - { - m_lasterror = wxSTREAM_EOF; - return 0; - } - - size = sizeMax; - } - - memcpy(buffer, m_buf.data() + m_pos, size); - m_pos += size; - - return size; -} - -// ============================================================================ -// wxStringOutputStream implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// seek/tell -// ---------------------------------------------------------------------------- - -wxFileOffset wxStringOutputStream::OnSysTell() const -{ - return static_cast(m_pos); -} - -// ---------------------------------------------------------------------------- -// actual IO -// ---------------------------------------------------------------------------- - -size_t wxStringOutputStream::OnSysWrite(const void *buffer, size_t size) -{ - const char *p = static_cast(buffer); - -#if wxUSE_UNICODE - // the part of the string we have here may be incomplete, i.e. it can stop - // in the middle of an UTF-8 character and so converting it would fail; if - // this is the case, accumulate the part which we failed to convert until - // we get the rest (and also take into account the part which we might have - // left unconverted before) - const char *src; - size_t srcLen; - if ( m_unconv.GetDataLen() ) - { - // append the new data to the data remaining since the last time - m_unconv.AppendData(p, size); - src = m_unconv; - srcLen = m_unconv.GetDataLen(); - } - else // no unconverted data left, avoid extra copy - { - src = p; - srcLen = size; - } - - size_t wlen; - wxWCharBuffer wbuf(m_conv.cMB2WC(src, srcLen, &wlen)); - if ( wbuf ) - { - // conversion succeeded, clear the unconverted buffer - m_unconv = wxMemoryBuffer(0); - - m_str->append(wbuf, wlen); - } - else // conversion failed - { - // remember unconverted data if there had been none before (otherwise - // we've already got it in the buffer) - if ( src == p ) - m_unconv.AppendData(src, srcLen); - - // pretend that we wrote the data anyhow, otherwise the caller would - // believe there was an error and this might not be the case, but do - // not update m_pos as m_str hasn't changed - return size; - } -#else // !wxUSE_UNICODE - // no recoding necessary - m_str->append(p, size); -#endif // wxUSE_UNICODE/!wxUSE_UNICODE - - // update position - m_pos += size; - - // return number of bytes actually written - return size; -} - -#endif // wxUSE_STREAMS - diff --git a/Externals/wxWidgets3/src/common/statbar.cpp b/Externals/wxWidgets3/src/common/statbar.cpp deleted file mode 100644 index 20ad5fe020..0000000000 --- a/Externals/wxWidgets3/src/common/statbar.cpp +++ /dev/null @@ -1,306 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/statbar.cpp -// Purpose: wxStatusBarBase implementation -// Author: Vadim Zeitlin -// Modified by: Francesco Montorsi -// Created: 14.10.01 -// Copyright: (c) 2001 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_STATUSBAR - -#include "wx/statusbr.h" - -#ifndef WX_PRECOMP - #include "wx/frame.h" -#endif //WX_PRECOMP - -const char wxStatusBarNameStr[] = "statusBar"; - -// ============================================================================ -// wxStatusBarPane implementation -// ============================================================================ - -bool wxStatusBarPane::SetText(const wxString& text) -{ - if ( text == m_text ) - return false; - - /* - If we have a message to restore on the stack, we update it to - correspond to the current one so that a sequence of calls such as - - 1. SetStatusText("foo") - 2. PushStatusText("bar") - 3. SetStatusText("new foo") - 4. PopStatusText() - - doesn't overwrite the "new foo" which should be shown at the end with - the old value "foo". This would be unexpected and hard to avoid, - especially when PushStatusText() is used internally by wxWidgets - without knowledge of the user program, as it is for showing the menu - and toolbar help strings. - - By updating the top of the stack we ensure that the next call to - PopStatusText() basically becomes a NOP without breaking the balance - between the calls to push and pop as we would have done if we really - called PopStatusText() here. - */ - if ( !m_arrStack.empty() ) - { - m_arrStack.back() = text; - } - - m_text = text; - - return true; -} - -bool wxStatusBarPane::PushText(const wxString& text) -{ - // save the currently shown text - m_arrStack.push_back(m_text); - - // and update the new one if necessary - if ( text == m_text ) - return false; - - m_text = text; - - return true; -} - -bool wxStatusBarPane::PopText() -{ - wxCHECK_MSG( !m_arrStack.empty(), false, "no status message to pop" ); - - const wxString text = m_arrStack.back(); - - m_arrStack.pop_back(); - - if ( text == m_text ) - return false; - - m_text = text; - - return true; -} - -// ============================================================================ -// wxStatusBarBase implementation -// ============================================================================ - -wxIMPLEMENT_DYNAMIC_CLASS(wxStatusBar, wxWindow); - -#include "wx/arrimpl.cpp" // This is a magic incantation which must be done! -WX_DEFINE_EXPORTED_OBJARRAY(wxStatusBarPaneArray) - - -// ---------------------------------------------------------------------------- -// ctor/dtor -// ---------------------------------------------------------------------------- - -wxStatusBarBase::wxStatusBarBase() -{ - m_bSameWidthForAllPanes = true; -} - -wxStatusBarBase::~wxStatusBarBase() -{ - // notify the frame that it doesn't have a status bar any longer to avoid - // dangling pointers - wxFrame *frame = wxDynamicCast(GetParent(), wxFrame); - if ( frame && frame->GetStatusBar() == this ) - frame->SetStatusBar(NULL); -} - -// ---------------------------------------------------------------------------- -// field widths -// ---------------------------------------------------------------------------- - -void wxStatusBarBase::SetFieldsCount(int number, const int *widths) -{ - wxCHECK_RET( number > 0, wxT("invalid field number in SetFieldsCount") ); - - if ( (size_t)number > m_panes.GetCount() ) - { - wxStatusBarPane newPane; - - // add more entries with the default style and zero width - // (this will be set later) - for (size_t i = m_panes.GetCount(); i < (size_t)number; ++i) - m_panes.Add(newPane); - } - else if ( (size_t)number < m_panes.GetCount() ) - { - // remove entries in excess - m_panes.RemoveAt(number, m_panes.GetCount()-number); - } - - // SetStatusWidths will automatically refresh - SetStatusWidths(number, widths); -} - -void wxStatusBarBase::SetStatusWidths(int WXUNUSED_UNLESS_DEBUG(n), - const int widths[]) -{ - wxASSERT_MSG( (size_t)n == m_panes.GetCount(), wxT("field number mismatch") ); - - if (widths == NULL) - { - // special value meaning: override explicit pane widths and make them all - // of the same size - m_bSameWidthForAllPanes = true; - } - else - { - for ( size_t i = 0; i < m_panes.GetCount(); i++ ) - m_panes[i].SetWidth(widths[i]); - - m_bSameWidthForAllPanes = false; - } - - // update the display after the widths changed - Refresh(); -} - -void wxStatusBarBase::SetStatusStyles(int WXUNUSED_UNLESS_DEBUG(n), - const int styles[]) -{ - wxCHECK_RET( styles, wxT("NULL pointer in SetStatusStyles") ); - - wxASSERT_MSG( (size_t)n == m_panes.GetCount(), wxT("field number mismatch") ); - - for ( size_t i = 0; i < m_panes.GetCount(); i++ ) - m_panes[i].SetStyle(styles[i]); - - // update the display after the widths changed - Refresh(); -} - -wxArrayInt wxStatusBarBase::CalculateAbsWidths(wxCoord widthTotal) const -{ - wxArrayInt widths; - - if ( m_bSameWidthForAllPanes ) - { - // Default: all fields have the same width. This is not always - // possible to do exactly (if widthTotal is not divisible by - // m_panes.GetCount()) - if that happens, we distribute the extra - // pixels among all fields: - int widthToUse = widthTotal; - - for ( size_t i = m_panes.GetCount(); i > 0; i-- ) - { - // divide the unassigned width evently between the - // not yet processed fields: - int w = widthToUse / i; - widths.Add(w); - widthToUse -= w; - } - } - else // do not override explicit pane widths - { - // calculate the total width of all the fixed width fields and the - // total number of var field widths counting with multiplicity - size_t nTotalWidth = 0, - nVarCount = 0, - i; - - for ( i = 0; i < m_panes.GetCount(); i++ ) - { - if ( m_panes[i].GetWidth() >= 0 ) - nTotalWidth += m_panes[i].GetWidth(); - else - nVarCount += -m_panes[i].GetWidth(); - } - - // the amount of extra width we have per each var width field - int widthExtra = widthTotal - nTotalWidth; - - // do fill the array - for ( i = 0; i < m_panes.GetCount(); i++ ) - { - if ( m_panes[i].GetWidth() >= 0 ) - widths.Add(m_panes[i].GetWidth()); - else - { - int nVarWidth = widthExtra > 0 ? (widthExtra * (-m_panes[i].GetWidth())) / nVarCount : 0; - nVarCount += m_panes[i].GetWidth(); - widthExtra -= nVarWidth; - widths.Add(nVarWidth); - } - } - } - - return widths; -} - -// ---------------------------------------------------------------------------- -// setting/getting status text -// ---------------------------------------------------------------------------- - -void wxStatusBarBase::SetStatusText(const wxString& text, int number) -{ - wxCHECK_RET( (unsigned)number < m_panes.size(), - "invalid status bar field index" ); - - if ( m_panes[number].SetText(text) ) - DoUpdateStatusText(number); -} - -wxString wxStatusBarBase::GetStatusText(int number) const -{ - wxCHECK_MSG( (unsigned)number < m_panes.size(), wxString(), - "invalid status bar field index" ); - - return m_panes[number].GetText(); -} - -void wxStatusBarBase::SetEllipsizedFlag(int number, bool isEllipsized) -{ - wxCHECK_RET( (unsigned)number < m_panes.size(), - "invalid status bar field index" ); - - m_panes[number].SetIsEllipsized(isEllipsized); -} - -// ---------------------------------------------------------------------------- -// pushing/popping status text -// ---------------------------------------------------------------------------- - -void wxStatusBarBase::PushStatusText(const wxString& text, int number) -{ - wxCHECK_RET( (unsigned)number < m_panes.size(), - "invalid status bar field index" ); - - if ( m_panes[number].PushText(text) ) - DoUpdateStatusText(number); -} - -void wxStatusBarBase::PopStatusText(int number) -{ - wxCHECK_RET( (unsigned)number < m_panes.size(), - "invalid status bar field index" ); - - if ( m_panes[number].PopText() ) - DoUpdateStatusText(number); -} - -#endif // wxUSE_STATUSBAR diff --git a/Externals/wxWidgets3/src/common/statbmpcmn.cpp b/Externals/wxWidgets3/src/common/statbmpcmn.cpp deleted file mode 100644 index 0b424c083a..0000000000 --- a/Externals/wxWidgets3/src/common/statbmpcmn.cpp +++ /dev/null @@ -1,86 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/statbmpcmn.cpp -// Purpose: wxStaticBitmap common code -// Author: Julian Smart -// Modified by: -// Created: 04/01/98 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// =========================================================================== -// declarations -// =========================================================================== - -// --------------------------------------------------------------------------- -// headers -// --------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_STATBMP - -#include "wx/statbmp.h" - -extern WXDLLEXPORT_DATA(const char) wxStaticBitmapNameStr[] = "staticBitmap"; - -// --------------------------------------------------------------------------- -// XTI -// --------------------------------------------------------------------------- - -wxDEFINE_FLAGS( wxStaticBitmapStyle ) -wxBEGIN_FLAGS( wxStaticBitmapStyle ) - // new style border flags, we put them first to - // use them for streaming out - wxFLAGS_MEMBER(wxBORDER_SIMPLE) - wxFLAGS_MEMBER(wxBORDER_SUNKEN) - wxFLAGS_MEMBER(wxBORDER_DOUBLE) - wxFLAGS_MEMBER(wxBORDER_RAISED) - wxFLAGS_MEMBER(wxBORDER_STATIC) - wxFLAGS_MEMBER(wxBORDER_NONE) - - // old style border flags - wxFLAGS_MEMBER(wxSIMPLE_BORDER) - wxFLAGS_MEMBER(wxSUNKEN_BORDER) - wxFLAGS_MEMBER(wxDOUBLE_BORDER) - wxFLAGS_MEMBER(wxRAISED_BORDER) - wxFLAGS_MEMBER(wxSTATIC_BORDER) - wxFLAGS_MEMBER(wxBORDER) - - // standard window styles - wxFLAGS_MEMBER(wxTAB_TRAVERSAL) - wxFLAGS_MEMBER(wxCLIP_CHILDREN) - wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) - wxFLAGS_MEMBER(wxWANTS_CHARS) - wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE) - wxFLAGS_MEMBER(wxALWAYS_SHOW_SB ) - wxFLAGS_MEMBER(wxVSCROLL) - wxFLAGS_MEMBER(wxHSCROLL) - -wxEND_FLAGS( wxStaticBitmapStyle ) - -wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxStaticBitmap, wxControl, "wx/statbmp.h"); - -wxBEGIN_PROPERTIES_TABLE(wxStaticBitmap) - wxPROPERTY_FLAGS( WindowStyle, wxStaticBitmapStyle, long, \ - SetWindowStyleFlag, GetWindowStyleFlag, \ - wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, wxT("Helpstring"), \ - wxT("group")) // style -wxEND_PROPERTIES_TABLE() - -wxEMPTY_HANDLERS_TABLE(wxStaticBitmap) - -wxCONSTRUCTOR_5( wxStaticBitmap, wxWindow*, Parent, wxWindowID, Id, \ - wxBitmap, Bitmap, wxPoint, Position, wxSize, Size ) - -/* - TODO PROPERTIES : - bitmap -*/ - -#endif // wxUSE_STATBMP diff --git a/Externals/wxWidgets3/src/common/statboxcmn.cpp b/Externals/wxWidgets3/src/common/statboxcmn.cpp deleted file mode 100644 index 3539c3c356..0000000000 --- a/Externals/wxWidgets3/src/common/statboxcmn.cpp +++ /dev/null @@ -1,89 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/statboxcmn.cpp -// Purpose: wxStaticBox common code -// Author: Julian Smart -// Modified by: -// Created: 04/01/98 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_STATBOX - -#include "wx/statbox.h" - -extern WXDLLEXPORT_DATA(const char) wxStaticBoxNameStr[] = "groupBox"; - -wxStaticBoxBase::wxStaticBoxBase() -{ -#ifndef __WXGTK__ - m_container.DisableSelfFocus(); -#endif -} - -// ---------------------------------------------------------------------------- -// XTI -// ---------------------------------------------------------------------------- - -wxDEFINE_FLAGS( wxStaticBoxStyle ) -wxBEGIN_FLAGS( wxStaticBoxStyle ) - // new style border flags, we put them first to - // use them for streaming out - wxFLAGS_MEMBER(wxBORDER_SIMPLE) - wxFLAGS_MEMBER(wxBORDER_SUNKEN) - wxFLAGS_MEMBER(wxBORDER_DOUBLE) - wxFLAGS_MEMBER(wxBORDER_RAISED) - wxFLAGS_MEMBER(wxBORDER_STATIC) - wxFLAGS_MEMBER(wxBORDER_NONE) - - // old style border flags - wxFLAGS_MEMBER(wxSIMPLE_BORDER) - wxFLAGS_MEMBER(wxSUNKEN_BORDER) - wxFLAGS_MEMBER(wxDOUBLE_BORDER) - wxFLAGS_MEMBER(wxRAISED_BORDER) - wxFLAGS_MEMBER(wxSTATIC_BORDER) - wxFLAGS_MEMBER(wxBORDER) - - // standard window styles - wxFLAGS_MEMBER(wxTAB_TRAVERSAL) - wxFLAGS_MEMBER(wxCLIP_CHILDREN) - wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) - wxFLAGS_MEMBER(wxWANTS_CHARS) - wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE) - wxFLAGS_MEMBER(wxALWAYS_SHOW_SB ) - wxFLAGS_MEMBER(wxVSCROLL) - wxFLAGS_MEMBER(wxHSCROLL) -wxEND_FLAGS( wxStaticBoxStyle ) - -wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxStaticBox, wxControl, "wx/statbox.h"); - -wxBEGIN_PROPERTIES_TABLE(wxStaticBox) - wxPROPERTY( Label, wxString, SetLabel, GetLabel, wxString(), 0 /*flags*/, \ - wxT("Helpstring"), wxT("group")) - wxPROPERTY_FLAGS( WindowStyle, wxStaticBoxStyle, long, SetWindowStyleFlag, \ - GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \ - wxT("Helpstring"), wxT("group")) // style -wxEND_PROPERTIES_TABLE() - -wxEMPTY_HANDLERS_TABLE(wxStaticBox) - -wxCONSTRUCTOR_6( wxStaticBox, wxWindow*, Parent, wxWindowID, Id, \ - wxString, Label, wxPoint, Position, wxSize, Size, \ - long, WindowStyle ) - -#endif // wxUSE_STATBOX diff --git a/Externals/wxWidgets3/src/common/statlinecmn.cpp b/Externals/wxWidgets3/src/common/statlinecmn.cpp deleted file mode 100644 index e4bda36055..0000000000 --- a/Externals/wxWidgets3/src/common/statlinecmn.cpp +++ /dev/null @@ -1,81 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/statlinecmn.cpp -// Purpose: wxStaticLine common code -// Author: Vadim Zeitlin -// Created: 28.06.99 -// Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include "wx/statline.h" - -#if wxUSE_STATLINE - -extern WXDLLEXPORT_DATA(const char) wxStaticLineNameStr[] = "staticLine"; - -// ---------------------------------------------------------------------------- -// XTI -// ---------------------------------------------------------------------------- - -wxDEFINE_FLAGS( wxStaticLineStyle ) -wxBEGIN_FLAGS( wxStaticLineStyle ) - // new style border flags, we put them first to - // use them for streaming out - wxFLAGS_MEMBER(wxBORDER_SIMPLE) - wxFLAGS_MEMBER(wxBORDER_SUNKEN) - wxFLAGS_MEMBER(wxBORDER_DOUBLE) - wxFLAGS_MEMBER(wxBORDER_RAISED) - wxFLAGS_MEMBER(wxBORDER_STATIC) - wxFLAGS_MEMBER(wxBORDER_NONE) - - // old style border flags - wxFLAGS_MEMBER(wxSIMPLE_BORDER) - wxFLAGS_MEMBER(wxSUNKEN_BORDER) - wxFLAGS_MEMBER(wxDOUBLE_BORDER) - wxFLAGS_MEMBER(wxRAISED_BORDER) - wxFLAGS_MEMBER(wxSTATIC_BORDER) - wxFLAGS_MEMBER(wxBORDER) - - // standard window styles - wxFLAGS_MEMBER(wxTAB_TRAVERSAL) - wxFLAGS_MEMBER(wxCLIP_CHILDREN) - wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) - wxFLAGS_MEMBER(wxWANTS_CHARS) - wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE) - wxFLAGS_MEMBER(wxALWAYS_SHOW_SB ) - wxFLAGS_MEMBER(wxVSCROLL) - wxFLAGS_MEMBER(wxHSCROLL) - - wxFLAGS_MEMBER(wxLI_HORIZONTAL) - wxFLAGS_MEMBER(wxLI_VERTICAL) -wxEND_FLAGS( wxStaticLineStyle ) - -wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxStaticLine, wxControl, "wx/statline.h"); - -wxBEGIN_PROPERTIES_TABLE(wxStaticLine) - wxPROPERTY_FLAGS( WindowStyle, wxStaticLineStyle, long, SetWindowStyleFlag, \ - GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \ - wxT("Helpstring"), wxT("group")) // style -wxEND_PROPERTIES_TABLE() - -wxEMPTY_HANDLERS_TABLE(wxStaticLine) - -wxCONSTRUCTOR_5( wxStaticLine, wxWindow*, Parent, wxWindowID, Id, \ - wxPoint, Position, wxSize, Size, long, WindowStyle) - -#endif // wxUSE_STATLINE diff --git a/Externals/wxWidgets3/src/common/stattextcmn.cpp b/Externals/wxWidgets3/src/common/stattextcmn.cpp deleted file mode 100644 index f2960c928b..0000000000 --- a/Externals/wxWidgets3/src/common/stattextcmn.cpp +++ /dev/null @@ -1,273 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/stattextcmn.cpp -// Purpose: common (to all ports) wxStaticText functions -// Author: Vadim Zeitlin, Francesco Montorsi -// Created: 2007-01-07 (extracted from dlgcmn.cpp) -// Copyright: (c) 1999-2006 Vadim Zeitlin -// (c) 2007 Francesco Montorsi -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_STATTEXT - -#ifndef WX_PRECOMP - #include "wx/stattext.h" - #include "wx/button.h" - #include "wx/dcclient.h" - #include "wx/intl.h" - #include "wx/log.h" - #include "wx/settings.h" - #include "wx/sizer.h" - #include "wx/containr.h" -#endif - -#include "wx/textwrapper.h" - -#include "wx/private/markupparser.h" - -extern WXDLLEXPORT_DATA(const char) wxStaticTextNameStr[] = "staticText"; - -// ---------------------------------------------------------------------------- -// XTI -// ---------------------------------------------------------------------------- - -wxDEFINE_FLAGS( wxStaticTextStyle ) -wxBEGIN_FLAGS( wxStaticTextStyle ) -// new style border flags, we put them first to -// use them for streaming out -wxFLAGS_MEMBER(wxBORDER_SIMPLE) -wxFLAGS_MEMBER(wxBORDER_SUNKEN) -wxFLAGS_MEMBER(wxBORDER_DOUBLE) -wxFLAGS_MEMBER(wxBORDER_RAISED) -wxFLAGS_MEMBER(wxBORDER_STATIC) -wxFLAGS_MEMBER(wxBORDER_NONE) - -// old style border flags -wxFLAGS_MEMBER(wxSIMPLE_BORDER) -wxFLAGS_MEMBER(wxSUNKEN_BORDER) -wxFLAGS_MEMBER(wxDOUBLE_BORDER) -wxFLAGS_MEMBER(wxRAISED_BORDER) -wxFLAGS_MEMBER(wxSTATIC_BORDER) -wxFLAGS_MEMBER(wxBORDER) - -// standard window styles -wxFLAGS_MEMBER(wxTAB_TRAVERSAL) -wxFLAGS_MEMBER(wxCLIP_CHILDREN) -wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) -wxFLAGS_MEMBER(wxWANTS_CHARS) -wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE) -wxFLAGS_MEMBER(wxALWAYS_SHOW_SB ) -wxFLAGS_MEMBER(wxVSCROLL) -wxFLAGS_MEMBER(wxHSCROLL) - -wxFLAGS_MEMBER(wxST_NO_AUTORESIZE) -wxFLAGS_MEMBER(wxALIGN_LEFT) -wxFLAGS_MEMBER(wxALIGN_RIGHT) -wxFLAGS_MEMBER(wxALIGN_CENTRE) -wxEND_FLAGS( wxStaticTextStyle ) - -wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxStaticText, wxControl, "wx/stattext.h"); - -wxBEGIN_PROPERTIES_TABLE(wxStaticText) -wxPROPERTY( Label,wxString, SetLabel, GetLabel, wxString(), 0 /*flags*/, \ - wxT("Helpstring"), wxT("group")) -wxPROPERTY_FLAGS( WindowStyle, wxStaticTextStyle, long, SetWindowStyleFlag, \ - GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \ - wxT("Helpstring"), wxT("group")) // style -wxEND_PROPERTIES_TABLE() - -wxEMPTY_HANDLERS_TABLE(wxStaticText) - -wxCONSTRUCTOR_6( wxStaticText, wxWindow*, Parent, wxWindowID, Id, \ - wxString, Label, wxPoint, Position, wxSize, Size, long, WindowStyle ) - - -// ---------------------------------------------------------------------------- -// wxTextWrapper -// ---------------------------------------------------------------------------- - -void wxTextWrapper::Wrap(wxWindow *win, const wxString& text, int widthMax) -{ - wxString line; - - wxString::const_iterator lastSpace = text.end(); - wxString::const_iterator lineStart = text.begin(); - for ( wxString::const_iterator p = lineStart; ; ++p ) - { - if ( IsStartOfNewLine() ) - { - OnNewLine(); - - lastSpace = text.end(); - line.clear(); - lineStart = p; - } - - if ( p == text.end() || *p == wxT('\n') ) - { - DoOutputLine(line); - - if ( p == text.end() ) - break; - } - else // not EOL - { - if ( *p == wxT(' ') ) - lastSpace = p; - - line += *p; - - if ( widthMax >= 0 && lastSpace != text.end() ) - { - int width; - win->GetTextExtent(line, &width, NULL); - - if ( width > widthMax ) - { - // remove the last word from this line - line.erase(lastSpace - lineStart, p + 1 - lineStart); - DoOutputLine(line); - - // go back to the last word of this line which we didn't - // output yet - p = lastSpace; - } - } - //else: no wrapping at all or impossible to wrap - } - } -} - - -// ---------------------------------------------------------------------------- -// wxLabelWrapper: helper class for wxStaticTextBase::Wrap() -// ---------------------------------------------------------------------------- - -class wxLabelWrapper : public wxTextWrapper -{ -public: - void WrapLabel(wxWindow *text, int widthMax) - { - m_text.clear(); - Wrap(text, text->GetLabel(), widthMax); - text->SetLabel(m_text); - } - -protected: - virtual void OnOutputLine(const wxString& line) wxOVERRIDE - { - m_text += line; - } - - virtual void OnNewLine() wxOVERRIDE - { - m_text += wxT('\n'); - } - -private: - wxString m_text; -}; - - -// ---------------------------------------------------------------------------- -// wxStaticTextBase -// ---------------------------------------------------------------------------- - -void wxStaticTextBase::Wrap(int width) -{ - wxLabelWrapper wrapper; - wrapper.WrapLabel(this, width); -} - -void wxStaticTextBase::AutoResizeIfNecessary() -{ - // adjust the size of the window to fit to the label unless autoresizing is - // disabled - if ( !HasFlag(wxST_NO_AUTORESIZE) ) - { - DoSetSize(wxDefaultCoord, wxDefaultCoord, wxDefaultCoord, wxDefaultCoord, - wxSIZE_AUTO_WIDTH | wxSIZE_AUTO_HEIGHT); - } -} - -// ---------------------------------------------------------------------------- -// wxStaticTextBase - generic implementation for wxST_ELLIPSIZE_* support -// ---------------------------------------------------------------------------- - -void wxStaticTextBase::UpdateLabel() -{ - if (!IsEllipsized()) - return; - - wxString newlabel = GetEllipsizedLabel(); - - // we need to touch the "real" label (i.e. the text set inside the control, - // using port-specific functions) instead of the string returned by GetLabel(). - // - // In fact, we must be careful not to touch the original label passed to - // SetLabel() otherwise GetLabel() will behave in a strange way to the user - // (e.g. returning a "Ver...ing" instead of "Very long string") ! - if (newlabel == DoGetLabel()) - return; - DoSetLabel(newlabel); -} - -wxString wxStaticTextBase::GetEllipsizedLabel() const -{ - // this function should be used only by ports which do not support - // ellipsis in static texts: we first remove markup (which cannot - // be handled safely by Ellipsize()) and then ellipsize the result. - - wxString ret(m_labelOrig); - - if (IsEllipsized()) - ret = Ellipsize(ret); - - return ret; -} - -wxString wxStaticTextBase::Ellipsize(const wxString& label) const -{ - wxSize sz(GetSize()); - if (sz.GetWidth() < 2 || sz.GetHeight() < 2) - { - // the size of this window is not valid (yet) - return label; - } - - wxClientDC dc(const_cast(this)); - dc.SetFont(GetFont()); - - wxEllipsizeMode mode; - if ( HasFlag(wxST_ELLIPSIZE_START) ) - mode = wxELLIPSIZE_START; - else if ( HasFlag(wxST_ELLIPSIZE_MIDDLE) ) - mode = wxELLIPSIZE_MIDDLE; - else if ( HasFlag(wxST_ELLIPSIZE_END) ) - mode = wxELLIPSIZE_END; - else - { - wxFAIL_MSG( "should only be called if have one of wxST_ELLIPSIZE_XXX" ); - - return label; - } - - return wxControl::Ellipsize(label, dc, mode, sz.GetWidth()); -} - -#endif // wxUSE_STATTEXT diff --git a/Externals/wxWidgets3/src/common/stdpbase.cpp b/Externals/wxWidgets3/src/common/stdpbase.cpp deleted file mode 100644 index 143c4f117c..0000000000 --- a/Externals/wxWidgets3/src/common/stdpbase.cpp +++ /dev/null @@ -1,176 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/stdpbase.cpp -// Purpose: wxStandardPathsBase methods common to all ports -// Author: Vadim Zeitlin -// Modified by: -// Created: 2004-10-19 -// Copyright: (c) 2004 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// for compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#ifndef WX_PRECOMP - #include "wx/app.h" -#endif //WX_PRECOMP -#include "wx/apptrait.h" - -#include "wx/filename.h" -#include "wx/stdpaths.h" - -// ---------------------------------------------------------------------------- -// module globals -// ---------------------------------------------------------------------------- - -namespace -{ - -// Derive a class just to be able to create it: wxStandardPaths ctor is -// protected to prevent its misuse, but it also means we can't create an object -// of this class directly. -class wxStandardPathsDefault : public wxStandardPaths -{ -public: - wxStandardPathsDefault() { } -}; - -static wxStandardPathsDefault gs_stdPaths; - -} // anonymous namespace - -// ============================================================================ -// implementation -// ============================================================================ - -/* static */ -wxStandardPaths& wxStandardPathsBase::Get() -{ - wxAppTraits * const traits = wxTheApp ? wxTheApp->GetTraits() : NULL; - wxCHECK_MSG( traits, gs_stdPaths, wxT("create wxApp before calling this") ); - - return traits->GetStandardPaths(); -} - -wxString wxStandardPathsBase::GetExecutablePath() const -{ - if ( !wxTheApp || !wxTheApp->argv ) - return wxEmptyString; - - wxString argv0 = wxTheApp->argv[0]; - if (wxIsAbsolutePath(argv0)) - return argv0; - - // Search PATH.environment variable... - wxPathList pathlist; - pathlist.AddEnvList(wxT("PATH")); - wxString path = pathlist.FindAbsoluteValidPath(argv0); - if ( path.empty() ) - return argv0; // better than nothing - - wxFileName filename(path); - filename.Normalize(); - return filename.GetFullPath(); -} - -wxStandardPaths& wxAppTraitsBase::GetStandardPaths() -{ - return gs_stdPaths; -} - -wxStandardPathsBase::wxStandardPathsBase() -{ - // Set the default information that is used when - // forming some paths (by AppendAppInfo). - // Derived classes can call this in their constructors - // to set the platform-specific settings - UseAppInfo(AppInfo_AppName); -} - -wxStandardPathsBase::~wxStandardPathsBase() -{ - // nothing to do here -} - -wxString wxStandardPathsBase::GetLocalDataDir() const -{ - return GetDataDir(); -} - -wxString wxStandardPathsBase::GetUserLocalDataDir() const -{ - return GetUserDataDir(); -} - -wxString wxStandardPathsBase::GetAppDocumentsDir() const -{ - const wxString docsDir = GetDocumentsDir(); - wxString appDocsDir = AppendAppInfo(docsDir); - - return wxDirExists(appDocsDir) ? appDocsDir : docsDir; -} - -// return the temporary directory for the current user -wxString wxStandardPathsBase::GetTempDir() const -{ - return wxFileName::GetTempDir(); -} - -wxString wxStandardPathsBase::GetUserDir(Dir WXUNUSED(userDir)) const -{ - return wxFileName::GetHomeDir(); -} - -/* static */ -wxString -wxStandardPathsBase::AppendPathComponent(const wxString& dir, - const wxString& component) -{ - wxString subdir(dir); - - // empty string indicates that an error has occurred, don't touch it then - if ( !subdir.empty() ) - { - if ( !component.empty() ) - { - const wxChar ch = *(subdir.end() - 1); - if ( !wxFileName::IsPathSeparator(ch) && ch != wxT('.') ) - subdir += wxFileName::GetPathSeparator(); - - subdir += component; - } - } - - return subdir; -} - - -wxString wxStandardPathsBase::AppendAppInfo(const wxString& dir) const -{ - wxString subdir(dir); - - if ( UsesAppInfo(AppInfo_VendorName) ) - { - subdir = AppendPathComponent(subdir, wxTheApp->GetVendorName()); - } - - if ( UsesAppInfo(AppInfo_AppName) ) - { - subdir = AppendPathComponent(subdir, wxTheApp->GetAppName()); - } - - return subdir; -} - diff --git a/Externals/wxWidgets3/src/common/stdstream.cpp b/Externals/wxWidgets3/src/common/stdstream.cpp deleted file mode 100644 index b0472dbe20..0000000000 --- a/Externals/wxWidgets3/src/common/stdstream.cpp +++ /dev/null @@ -1,267 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/stdstream.cpp -// Purpose: Implementation of std::istream and std::ostream derived -// wrappers for wxInputStream and wxOutputStream -// Author: Jonathan Liu -// Created: 2009-05-02 -// Copyright: (c) 2009 Jonathan Liu -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ========================================================================== -// Declarations -// ========================================================================== - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_STREAMS && wxUSE_STD_IOSTREAM - -#ifndef WX_PRECOMP -#endif - -#include "wx/stdstream.h" - -#include -#include -#include -#include - -// ========================================================================== -// Helpers -// ========================================================================== - -namespace -{ - -bool -IosSeekDirToWxSeekMode(std::ios_base::seekdir way, - wxSeekMode& seekMode) -{ - switch ( way ) - { - case std::ios_base::beg: - seekMode = wxFromStart; - break; - case std::ios_base::cur: - seekMode = wxFromCurrent; - break; - case std::ios_base::end: - seekMode = wxFromEnd; - break; - default: - return false; - } - - return true; -} - -} // anonymous namespace - -// ========================================================================== -// wxStdInputStreamBuffer -// ========================================================================== - -wxStdInputStreamBuffer::wxStdInputStreamBuffer(wxInputStream& stream) : - m_stream(stream), m_lastChar(EOF) -{ -} - -std::streambuf * -wxStdInputStreamBuffer::setbuf(char *WXUNUSED(s), - std::streamsize WXUNUSED(n)) -{ - return NULL; -} - -std::streampos -wxStdInputStreamBuffer::seekoff(std::streamoff off, - std::ios_base::seekdir way, - std::ios_base::openmode which) -{ - wxSeekMode seekMode; - - if ( !IosSeekDirToWxSeekMode(way, seekMode) ) - return -1; - if ( !(which & std::ios_base::in) ) - return -1; - - off_t newPos = m_stream.SeekI((off_t) off, seekMode); - - if ( newPos != wxInvalidOffset ) - return (std::streampos) newPos; - else - return -1; -} - -std::streampos -wxStdInputStreamBuffer::seekpos(std::streampos sp, - std::ios_base::openmode which) -{ - if ( !(which & std::ios_base::in) ) - return -1; - - off_t newPos = m_stream.SeekI((off_t) sp); - - if ( newPos != wxInvalidOffset ) - return (std::streampos) newPos; - else - return -1; -} - -std::streamsize -wxStdInputStreamBuffer::showmanyc() -{ - if ( m_stream.CanRead() && (off_t) m_stream.GetSize() > m_stream.TellI() ) - return m_stream.GetSize() - m_stream.TellI(); - else - return 0; -} - -std::streamsize -wxStdInputStreamBuffer::xsgetn(char *s, std::streamsize n) -{ - m_stream.Read((void *) s, (size_t) n); - - std::streamsize read = m_stream.LastRead(); - - if ( read > 0 ) - m_lastChar = (unsigned char) s[read - 1]; - - return read; -} - -int -wxStdInputStreamBuffer::underflow() -{ - int ch = m_stream.GetC(); - - if ( m_stream.LastRead() == 1 ) - { - m_stream.Ungetch((char) ch); - return ch; - } - else - { - return EOF; - } -} - -int -wxStdInputStreamBuffer::uflow() -{ - int ch = m_stream.GetC(); - - if ( m_stream.LastRead() == 1 ) - { - m_lastChar = ch; - return ch; - } - else - { - return EOF; - } -} - -int -wxStdInputStreamBuffer::pbackfail(int c) -{ - if ( c == EOF ) - { - if ( m_lastChar == EOF ) - return EOF; - - c = m_lastChar; - m_lastChar = EOF; - } - - return m_stream.Ungetch((char) c) ? c : EOF; -} - -// ========================================================================== -// wxStdOutputStreamBuffer -// ========================================================================== - -wxStdOutputStreamBuffer::wxStdOutputStreamBuffer(wxOutputStream& stream) : - m_stream(stream) -{ -} - -std::streambuf * -wxStdOutputStreamBuffer::setbuf(char *WXUNUSED(s), - std::streamsize WXUNUSED(n)) -{ - return NULL; -} - -std::streampos -wxStdOutputStreamBuffer::seekoff(std::streamoff off, - std::ios_base::seekdir way, - std::ios_base::openmode which) -{ - wxSeekMode seekMode; - - if ( !IosSeekDirToWxSeekMode(way, seekMode) ) - return -1; - if ( !(which & std::ios_base::out) ) - return -1; - - off_t newPos = m_stream.SeekO((off_t) off, seekMode); - - if ( newPos != wxInvalidOffset ) - return (std::streampos) newPos; - else - return -1; -} - -std::streampos -wxStdOutputStreamBuffer::seekpos(std::streampos sp, - std::ios_base::openmode which) -{ - if ( !(which & std::ios_base::out) ) - return -1; - - off_t newPos = m_stream.SeekO((off_t) sp); - - if ( newPos != wxInvalidOffset ) - return (std::streampos) newPos; - else - return -1; -} - -std::streamsize -wxStdOutputStreamBuffer::xsputn(const char *s, - std::streamsize n) -{ - m_stream.Write((const void *) s, (size_t) n); - return (std::streamsize) m_stream.LastWrite(); -} - -int -wxStdOutputStreamBuffer::overflow(int c) -{ - m_stream.PutC(c); - return m_stream.IsOk() ? c : EOF; -} - -// ========================================================================== -// wxStdInputStream and wxStdOutputStream -// ========================================================================== - -wxStdInputStream::wxStdInputStream(wxInputStream& stream) : - std::istream(NULL), m_streamBuffer(stream) -{ - std::ios::init(&m_streamBuffer); -} - -wxStdOutputStream::wxStdOutputStream(wxOutputStream& stream) : - std::ostream(NULL), m_streamBuffer(stream) -{ - std::ios::init(&m_streamBuffer); -} - -#endif // wxUSE_STREAMS && wxUSE_STD_IOSTREAM diff --git a/Externals/wxWidgets3/src/common/stockitem.cpp b/Externals/wxWidgets3/src/common/stockitem.cpp deleted file mode 100644 index fad05d7b8e..0000000000 --- a/Externals/wxWidgets3/src/common/stockitem.cpp +++ /dev/null @@ -1,339 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/stockitem.cpp -// Purpose: Stock buttons, menu and toolbar items labels -// Author: Vaclav Slavik -// Modified by: -// Created: 2004-08-15 -// Copyright: (c) Vaclav Slavik, 2004 -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include "wx/stockitem.h" - -#ifndef WX_PRECOMP - #include "wx/intl.h" - #include "wx/utils.h" // for wxStripMenuCodes() -#endif - -bool wxIsStockID(wxWindowID id) -{ - switch (id) - { - case wxID_ABOUT: - case wxID_ADD: - case wxID_APPLY: - case wxID_BACKWARD: - case wxID_BOLD: - case wxID_BOTTOM: - case wxID_CANCEL: - case wxID_CDROM: - case wxID_CLEAR: - case wxID_CLOSE: - case wxID_CONVERT: - case wxID_COPY: - case wxID_CUT: - case wxID_DELETE: - case wxID_DOWN: - case wxID_EDIT: - case wxID_EXECUTE: - case wxID_EXIT: - case wxID_FILE: - case wxID_FIND: - case wxID_FIRST: - case wxID_FLOPPY: - case wxID_FORWARD: - case wxID_HARDDISK: - case wxID_HELP: - case wxID_HOME: - case wxID_INDENT: - case wxID_INDEX: - case wxID_INFO: - case wxID_ITALIC: - case wxID_JUMP_TO: - case wxID_JUSTIFY_CENTER: - case wxID_JUSTIFY_FILL: - case wxID_JUSTIFY_LEFT: - case wxID_JUSTIFY_RIGHT: - case wxID_LAST: - case wxID_NETWORK: - case wxID_NEW: - case wxID_NO: - case wxID_OK: - case wxID_OPEN: - case wxID_PASTE: - case wxID_PREFERENCES: - case wxID_PREVIEW: - case wxID_PRINT: - case wxID_PROPERTIES: - case wxID_REDO: - case wxID_REFRESH: - case wxID_REMOVE: - case wxID_REPLACE: - case wxID_REVERT_TO_SAVED: - case wxID_SAVE: - case wxID_SAVEAS: - case wxID_SELECTALL: - case wxID_SELECT_COLOR: - case wxID_SELECT_FONT: - case wxID_SORT_ASCENDING: - case wxID_SORT_DESCENDING: - case wxID_SPELL_CHECK: - case wxID_STOP: - case wxID_STRIKETHROUGH: - case wxID_TOP: - case wxID_UNDELETE: - case wxID_UNDERLINE: - case wxID_UNDO: - case wxID_UNINDENT: - case wxID_UP: - case wxID_YES: - case wxID_ZOOM_100: - case wxID_ZOOM_FIT: - case wxID_ZOOM_IN: - case wxID_ZOOM_OUT: - return true; - - default: - return false; - } -} - -wxString wxGetStockLabel(wxWindowID id, long flags) -{ - wxString stockLabel; - -#ifdef __WXMSW__ - // special case: the "Cancel" button shouldn't have a mnemonic under MSW - // for consistency with the native dialogs (which don't use any mnemonic - // for it because it is already bound to Esc implicitly) - if ( id == wxID_CANCEL ) - flags &= ~wxSTOCK_WITH_MNEMONIC; -#endif // __WXMSW__ - - - #define STOCKITEM(stockid, labelWithMnemonic, labelPlain) \ - case stockid: \ - if(flags & wxSTOCK_WITH_MNEMONIC) \ - stockLabel = labelWithMnemonic; \ - else \ - stockLabel = labelPlain; \ - break - - switch (id) - { - STOCKITEM(wxID_ABOUT, _("&About"), _("About")); - STOCKITEM(wxID_ADD, _("Add"), _("Add")); - STOCKITEM(wxID_APPLY, _("&Apply"), _("Apply")); - STOCKITEM(wxID_BACKWARD, _("&Back"), _("Back")); - STOCKITEM(wxID_BOLD, _("&Bold"), _("Bold")); - STOCKITEM(wxID_BOTTOM, _("&Bottom"), _("Bottom")); - STOCKITEM(wxID_CANCEL, _("&Cancel"), _("Cancel")); - STOCKITEM(wxID_CDROM, _("&CD-Rom"), _("CD-Rom")); - STOCKITEM(wxID_CLEAR, _("&Clear"), _("Clear")); - STOCKITEM(wxID_CLOSE, _("&Close"), _("Close")); - STOCKITEM(wxID_CONVERT, _("&Convert"), _("Convert")); - STOCKITEM(wxID_COPY, _("&Copy"), _("Copy")); - STOCKITEM(wxID_CUT, _("Cu&t"), _("Cut")); - STOCKITEM(wxID_DELETE, _("&Delete"), _("Delete")); - STOCKITEM(wxID_DOWN, _("&Down"), _("Down")); - STOCKITEM(wxID_EDIT, _("&Edit"), _("Edit")); - STOCKITEM(wxID_EXECUTE, _("&Execute"), _("Execute")); - STOCKITEM(wxID_EXIT, _("&Quit"), _("Quit")); - STOCKITEM(wxID_FILE, _("&File"), _("File")); - STOCKITEM(wxID_FIND, _("&Find"), _("Find")); - STOCKITEM(wxID_FIRST, _("&First"), _("First")); - STOCKITEM(wxID_FLOPPY, _("&Floppy"), _("Floppy")); - STOCKITEM(wxID_FORWARD, _("&Forward"), _("Forward")); - STOCKITEM(wxID_HARDDISK, _("&Harddisk"), _("Harddisk")); - STOCKITEM(wxID_HELP, _("&Help"), _("Help")); - STOCKITEM(wxID_HOME, _("&Home"), _("Home")); - STOCKITEM(wxID_INDENT, _("Indent"), _("Indent")); - STOCKITEM(wxID_INDEX, _("&Index"), _("Index")); - STOCKITEM(wxID_INFO, _("&Info"), _("Info")); - STOCKITEM(wxID_ITALIC, _("&Italic"), _("Italic")); - STOCKITEM(wxID_JUMP_TO, _("&Jump to"), _("Jump to")); - STOCKITEM(wxID_JUSTIFY_CENTER, _("Centered"), _("Centered")); - STOCKITEM(wxID_JUSTIFY_FILL, _("Justified"), _("Justified")); - STOCKITEM(wxID_JUSTIFY_LEFT, _("Align Left"), _("Align Left")); - STOCKITEM(wxID_JUSTIFY_RIGHT, _("Align Right"), _("Align Right")); - STOCKITEM(wxID_LAST, _("&Last"), _("Last")); - STOCKITEM(wxID_NETWORK, _("&Network"), _("Network")); - STOCKITEM(wxID_NEW, _("&New"), _("New")); - STOCKITEM(wxID_NO, _("&No"), _("No")); - STOCKITEM(wxID_OK, _("&OK"), _("OK")); - STOCKITEM(wxID_OPEN, _("&Open..."), _("Open...")); - STOCKITEM(wxID_PASTE, _("&Paste"), _("Paste")); - STOCKITEM(wxID_PREFERENCES, _("&Preferences"), _("Preferences")); - STOCKITEM(wxID_PREVIEW, _("Print previe&w..."), _("Print preview...")); - STOCKITEM(wxID_PRINT, _("&Print..."), _("Print...")); - STOCKITEM(wxID_PROPERTIES, _("&Properties"), _("Properties")); - STOCKITEM(wxID_REDO, _("&Redo"), _("Redo")); - STOCKITEM(wxID_REFRESH, _("Refresh"), _("Refresh")); - STOCKITEM(wxID_REMOVE, _("Remove"), _("Remove")); - STOCKITEM(wxID_REPLACE, _("Rep&lace"), _("Replace")); - STOCKITEM(wxID_REVERT_TO_SAVED, _("Revert to Saved"), _("Revert to Saved")); - STOCKITEM(wxID_SAVE, _("&Save"), _("Save")); - STOCKITEM(wxID_SAVEAS, _("&Save as"), _("Save as")); - STOCKITEM(wxID_SELECTALL, _("Select &All"), _("Select All")); - STOCKITEM(wxID_SELECT_COLOR, _("&Color"), _("Color")); - STOCKITEM(wxID_SELECT_FONT, _("&Font"), _("Font")); - STOCKITEM(wxID_SORT_ASCENDING, _("&Ascending"), _("Ascending")); - STOCKITEM(wxID_SORT_DESCENDING, _("&Descending"), _("Descending")); - STOCKITEM(wxID_SPELL_CHECK, _("&Spell Check"), _("Spell Check")); - STOCKITEM(wxID_STOP, _("&Stop"), _("Stop")); - STOCKITEM(wxID_STRIKETHROUGH, _("&Strikethrough"), _("Strikethrough")); - STOCKITEM(wxID_TOP, _("&Top"), _("Top")); - STOCKITEM(wxID_UNDELETE, _("Undelete"), _("Undelete")); - STOCKITEM(wxID_UNDERLINE, _("&Underline"), _("Underline")); - STOCKITEM(wxID_UNDO, _("&Undo"), _("Undo")); - STOCKITEM(wxID_UNINDENT, _("&Unindent"), _("Unindent")); - STOCKITEM(wxID_UP, _("&Up"), _("Up")); - STOCKITEM(wxID_YES, _("&Yes"), _("Yes")); - STOCKITEM(wxID_ZOOM_100, _("&Actual Size"), _("Actual Size")); - STOCKITEM(wxID_ZOOM_FIT, _("Zoom to &Fit"), _("Zoom to Fit")); - STOCKITEM(wxID_ZOOM_IN, _("Zoom &In"), _("Zoom In")); - STOCKITEM(wxID_ZOOM_OUT, _("Zoom &Out"), _("Zoom Out")); - - default: - wxFAIL_MSG( wxT("invalid stock item ID") ); - break; - }; - - #undef STOCKITEM - - if ( flags & wxSTOCK_WITHOUT_ELLIPSIS ) - { - wxString baseLabel; - if ( stockLabel.EndsWith("...", &baseLabel) ) - stockLabel = baseLabel; - - // accelerators only make sense for the menu items which should have - // ellipsis too while wxSTOCK_WITHOUT_ELLIPSIS is mostly useful for - // buttons which shouldn't have accelerators in their labels - wxASSERT_MSG( !(flags & wxSTOCK_WITH_ACCELERATOR), - "labels without ellipsis shouldn't use accelerators" ); - } - -#if wxUSE_ACCEL - if ( !stockLabel.empty() && (flags & wxSTOCK_WITH_ACCELERATOR) ) - { - wxAcceleratorEntry accel = wxGetStockAccelerator(id); - if (accel.IsOk()) - stockLabel << wxT('\t') << accel.ToString(); - } -#endif // wxUSE_ACCEL - - return stockLabel; -} - -wxString wxGetStockHelpString(wxWindowID id, wxStockHelpStringClient client) -{ - wxString stockHelp; - - #define STOCKITEM(stockid, ctx, helpstr) \ - case stockid: \ - if (client==ctx) stockHelp = helpstr; \ - break; - - switch (id) - { - // NB: these help string should be not too specific as they could be used - // in completely different programs! - STOCKITEM(wxID_ABOUT, wxSTOCK_MENU, _("Show about dialog")) - STOCKITEM(wxID_COPY, wxSTOCK_MENU, _("Copy selection")) - STOCKITEM(wxID_CUT, wxSTOCK_MENU, _("Cut selection")) - STOCKITEM(wxID_DELETE, wxSTOCK_MENU, _("Delete selection")) - STOCKITEM(wxID_REPLACE, wxSTOCK_MENU, _("Replace selection")) - STOCKITEM(wxID_PASTE, wxSTOCK_MENU, _("Paste selection")) - STOCKITEM(wxID_EXIT, wxSTOCK_MENU, _("Quit this program")) - STOCKITEM(wxID_REDO, wxSTOCK_MENU, _("Redo last action")) - STOCKITEM(wxID_UNDO, wxSTOCK_MENU, _("Undo last action")) - STOCKITEM(wxID_CLOSE, wxSTOCK_MENU, _("Close current document")) - STOCKITEM(wxID_SAVE, wxSTOCK_MENU, _("Save current document")) - STOCKITEM(wxID_SAVEAS, wxSTOCK_MENU, _("Save current document with a different filename")) - - default: - // there's no stock help string for this ID / client - return wxEmptyString; - } - - #undef STOCKITEM - - return stockHelp; -} - -#if wxUSE_ACCEL - -wxAcceleratorEntry wxGetStockAccelerator(wxWindowID id) -{ - wxAcceleratorEntry ret; - - #define STOCKITEM(stockid, flags, keycode) \ - case stockid: \ - ret.Set(flags, keycode, stockid); \ - break; - - switch (id) - { - STOCKITEM(wxID_COPY, wxACCEL_CTRL,'C') - STOCKITEM(wxID_CUT, wxACCEL_CTRL,'X') - STOCKITEM(wxID_FIND, wxACCEL_CTRL,'F') - STOCKITEM(wxID_HELP, wxACCEL_CTRL,'H') - STOCKITEM(wxID_NEW, wxACCEL_CTRL,'N') - STOCKITEM(wxID_OPEN, wxACCEL_CTRL,'O') - STOCKITEM(wxID_PASTE, wxACCEL_CTRL,'V') - STOCKITEM(wxID_PRINT, wxACCEL_CTRL,'P') - STOCKITEM(wxID_REDO, wxACCEL_CTRL | wxACCEL_SHIFT,'Z') - STOCKITEM(wxID_REPLACE, wxACCEL_CTRL,'R') - STOCKITEM(wxID_SAVE, wxACCEL_CTRL,'S') - STOCKITEM(wxID_UNDO, wxACCEL_CTRL,'Z') -#ifdef __WXOSX__ - STOCKITEM(wxID_PREFERENCES, wxACCEL_CTRL,',') -#endif - - default: - // set the wxAcceleratorEntry to return into an invalid state: - // there's no stock accelerator for that. - ret.Set(0, 0, id); - break; - }; - - #undef STOCKITEM - - // always use wxAcceleratorEntry::IsOk on returned value ! - return ret; -} - -#endif // wxUSE_ACCEL - -bool wxIsStockLabel(wxWindowID id, const wxString& label) -{ - if (label.empty()) - return true; - - wxString stock = wxGetStockLabel(id); - - if (label == stock) - return true; - - stock.Replace(wxT("&"), wxEmptyString); - if (label == stock) - return true; - - return false; -} diff --git a/Externals/wxWidgets3/src/common/stopwatch.cpp b/Externals/wxWidgets3/src/common/stopwatch.cpp deleted file mode 100644 index 7c3c284058..0000000000 --- a/Externals/wxWidgets3/src/common/stopwatch.cpp +++ /dev/null @@ -1,179 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/stopwatch.cpp -// Purpose: wxStopWatch and other non-GUI stuff from wx/timer.h -// Author: -// Original version by Julian Smart -// Vadim Zeitlin got rid of all ifdefs (11.12.99) -// Sylvain Bougnoux added wxStopWatch class -// Guillermo Rodriguez rewrote from scratch (Dic/99) -// Modified by: -// Created: 20.06.2003 (extracted from common/timercmn.cpp) -// Copyright: (c) 1998-2003 wxWidgets Team -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// for compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include "wx/stopwatch.h" - -#if wxUSE_STOPWATCH - -#ifndef WX_PRECOMP - #ifdef __WINDOWS__ - #include "wx/msw/wrapwin.h" - #endif - #include "wx/log.h" - #include "wx/thread.h" -#endif //WX_PRECOMP - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxStopWatch -// ---------------------------------------------------------------------------- - -namespace -{ - -#ifdef __WINDOWS__ - -struct PerfCounter -{ - PerfCounter() - { - init = false; - } - - wxCRIT_SECT_DECLARE_MEMBER(cs); - LARGE_INTEGER freq; - bool init; -}; - -// Return the global perf counter state. -// -// This is wrapped in a function to avoid initialization order problems, -// otherwise simply creating a global wxStopWatch variable could crash because -// it would be using a (possibly) still uninitialized critical section. -PerfCounter& GetPerfCounterState() -{ - static PerfCounter s_perfCounter; - - return s_perfCounter; -} - -#endif // __WINDOWS__ - -const int MILLISECONDS_PER_SECOND = 1000; -const int MICROSECONDS_PER_SECOND = 1000*1000; - -} // anonymous namespace - -void wxStopWatch::DoStart() -{ -#ifdef __WINDOWS__ - PerfCounter& perfCounter = GetPerfCounterState(); - if ( !perfCounter.init ) - { - wxCRIT_SECT_LOCKER(lock, perfCounter.cs); - ::QueryPerformanceFrequency(&perfCounter.freq); - - perfCounter.init = true; - } -#endif // __WINDOWS__ - - m_t0 = GetCurrentClockValue(); -} - -wxLongLong wxStopWatch::GetClockFreq() const -{ -#ifdef __WINDOWS__ - // Under MSW we use the high resolution performance counter timer which has - // its own frequency (usually related to the CPU clock speed). - return GetPerfCounterState().freq.QuadPart; -#elif defined(HAVE_GETTIMEOFDAY) - // With gettimeofday() we can have nominally microsecond precision and - // while this is not the case in practice, it's still better than - // millisecond. - return MICROSECONDS_PER_SECOND; -#else // !HAVE_GETTIMEOFDAY - // Currently milliseconds are used everywhere else. - return MILLISECONDS_PER_SECOND; -#endif // __WINDOWS__/HAVE_GETTIMEOFDAY/else -} - -void wxStopWatch::Start(long t0) -{ - // Calling Start() makes the stop watch run however many times it was - // paused before. - m_pauseCount = 0; - - DoStart(); - - m_t0 -= (wxLongLong(t0)*GetClockFreq())/MILLISECONDS_PER_SECOND; -} - -wxLongLong wxStopWatch::GetCurrentClockValue() const -{ -#ifdef __WINDOWS__ - LARGE_INTEGER counter; - ::QueryPerformanceCounter(&counter); - return counter.QuadPart; -#elif defined(HAVE_GETTIMEOFDAY) - return wxGetUTCTimeUSec(); -#else // !HAVE_GETTIMEOFDAY - return wxGetUTCTimeMillis(); -#endif // __WINDOWS__/HAVE_GETTIMEOFDAY/else -} - -wxLongLong wxStopWatch::TimeInMicro() const -{ - const wxLongLong elapsed(m_pauseCount ? m_elapsedBeforePause - : GetCurrentClockValue() - m_t0); - - return (elapsed*MICROSECONDS_PER_SECOND)/GetClockFreq(); -} - -#endif // wxUSE_STOPWATCH - -// ---------------------------------------------------------------------------- -// old timer functions superceded by wxStopWatch -// ---------------------------------------------------------------------------- - -#if wxUSE_LONGLONG - -static wxLongLong wxStartTime = 0l; - -// starts the global timer -void wxStartTimer() -{ - wxStartTime = wxGetUTCTimeMillis(); -} - -// Returns elapsed time in milliseconds -long wxGetElapsedTime(bool resetTimer) -{ - wxLongLong oldTime = wxStartTime; - wxLongLong newTime = wxGetUTCTimeMillis(); - - if ( resetTimer ) - wxStartTime = newTime; - - return (newTime - oldTime).GetLo(); -} - -#endif // wxUSE_LONGLONG diff --git a/Externals/wxWidgets3/src/common/strconv.cpp b/Externals/wxWidgets3/src/common/strconv.cpp deleted file mode 100644 index 480d16251a..0000000000 --- a/Externals/wxWidgets3/src/common/strconv.cpp +++ /dev/null @@ -1,3373 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/strconv.cpp -// Purpose: Unicode conversion classes -// Author: Ove Kaaven, Robert Roebling, Vadim Zeitlin, Vaclav Slavik, -// Ryan Norton, Fredrik Roubert (UTF7) -// Modified by: -// Created: 29/01/98 -// Copyright: (c) 1999 Ove Kaaven, Robert Roebling, Vaclav Slavik -// (c) 2000-2003 Vadim Zeitlin -// (c) 2004 Ryan Norton, Fredrik Roubert -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif //__BORLANDC__ - -#ifndef WX_PRECOMP - #include "wx/intl.h" - #include "wx/log.h" - #include "wx/utils.h" - #include "wx/hashmap.h" -#endif - -#include "wx/strconv.h" - -#include - -#include -#include -#include - -#if defined(__WIN32__) - #include "wx/msw/private.h" - #include "wx/msw/missing.h" - #define wxHAVE_WIN32_MB2WC -#endif - -#ifdef HAVE_ICONV - #include - #include "wx/thread.h" -#endif - -#include "wx/encconv.h" -#include "wx/fontmap.h" - -#ifdef __DARWIN__ -#include "wx/osx/core/private/strconv_cf.h" -#endif //def __DARWIN__ - - -#define TRACE_STRCONV wxT("strconv") - -// WC_UTF16 is defined only if sizeof(wchar_t) == 2, otherwise it's supposed to -// be 4 bytes -#if SIZEOF_WCHAR_T == 2 - #define WC_UTF16 -#endif - - -// ============================================================================ -// implementation -// ============================================================================ - -// helper function of cMB2WC(): check if n bytes at this location are all NUL -static bool NotAllNULs(const char *p, size_t n) -{ - while ( n && *p++ == '\0' ) - n--; - - return n != 0; -} - -// ---------------------------------------------------------------------------- -// UTF-16 en/decoding to/from UCS-4 with surrogates handling -// ---------------------------------------------------------------------------- - -static size_t encode_utf16(wxUint32 input, wxUint16 *output) -{ - if (input <= 0xffff) - { - if (output) - *output = (wxUint16) input; - - return 1; - } - else if (input >= 0x110000) - { - return wxCONV_FAILED; - } - else - { - if (output) - { - *output++ = (wxUint16) ((input >> 10) + 0xd7c0); - *output = (wxUint16) ((input & 0x3ff) + 0xdc00); - } - - return 2; - } -} - -static size_t decode_utf16(const wxUint16* input, wxUint32& output) -{ - if ((*input < 0xd800) || (*input > 0xdfff)) - { - output = *input; - return 1; - } - else if ((input[1] < 0xdc00) || (input[1] > 0xdfff)) - { - output = *input; - return wxCONV_FAILED; - } - else - { - output = ((input[0] - 0xd7c0) << 10) + (input[1] - 0xdc00); - return 2; - } -} - -// returns the next UTF-32 character from the wchar_t buffer and advances the -// pointer to the character after this one -// -// if an invalid character is found, *pSrc is set to NULL, the caller must -// check for this -static wxUint32 wxDecodeSurrogate(const wxChar16 **pSrc) -{ - wxUint32 out; - const size_t - n = decode_utf16(reinterpret_cast(*pSrc), out); - if ( n == wxCONV_FAILED ) - *pSrc = NULL; - else - *pSrc += n; - - return out; -} - -// ---------------------------------------------------------------------------- -// wxMBConv -// ---------------------------------------------------------------------------- - -size_t -wxMBConv::ToWChar(wchar_t *dst, size_t dstLen, - const char *src, size_t srcLen) const -{ - // although new conversion classes are supposed to implement this function - // directly, the existing ones only implement the old MB2WC() and so, to - // avoid to have to rewrite all conversion classes at once, we provide a - // default (but not efficient) implementation of this one in terms of the - // old function by copying the input to ensure that it's NUL-terminated and - // then using MB2WC() to convert it - // - // moreover, some conversion classes simply can't implement ToWChar() - // directly, the primary example is wxConvLibc: mbstowcs() only handles - // NUL-terminated strings - - // the number of chars [which would be] written to dst [if it were not NULL] - size_t dstWritten = 0; - - // the number of NULs terminating this string - size_t nulLen = 0; // not really needed, but just to avoid warnings - - // if we were not given the input size we just have to assume that the - // string is properly terminated as we have no way of knowing how long it - // is anyhow, but if we do have the size check whether there are enough - // NULs at the end - wxCharBuffer bufTmp; - const char *srcEnd; - if ( srcLen != wxNO_LEN ) - { - // we need to know how to find the end of this string - nulLen = GetMBNulLen(); - if ( nulLen == wxCONV_FAILED ) - return wxCONV_FAILED; - - // if there are enough NULs we can avoid the copy - if ( srcLen < nulLen || NotAllNULs(src + srcLen - nulLen, nulLen) ) - { - // make a copy in order to properly NUL-terminate the string - bufTmp = wxCharBuffer(srcLen + nulLen - 1 /* 1 will be added */); - char * const p = bufTmp.data(); - memcpy(p, src, srcLen); - for ( char *s = p + srcLen; s < p + srcLen + nulLen; s++ ) - *s = '\0'; - - src = bufTmp; - } - - srcEnd = src + srcLen; - } - else // quit after the first loop iteration - { - srcEnd = NULL; - } - - // the idea of this code is straightforward: it converts a NUL-terminated - // chunk of the string during each iteration and updates the output buffer - // with the result - // - // all the complication come from the fact that this function, for - // historical reasons, must behave in 2 subtly different ways when it's - // called with a fixed number of characters and when it's called for the - // entire NUL-terminated string: in the former case (srcEnd != NULL) we - // must count all characters we convert, NUL or not; but in the latter we - // do not count the trailing NUL -- but still count all the NULs inside the - // string - // - // so for the (simple) former case we just always count the trailing NUL, - // but for the latter we need to wait until we see if there is going to be - // another loop iteration and only count it then - for ( ;; ) - { - // try to convert the current chunk - size_t lenChunk = MB2WC(NULL, src, 0); - if ( lenChunk == wxCONV_FAILED ) - return wxCONV_FAILED; - - dstWritten += lenChunk; - if ( !srcEnd ) - dstWritten++; - - if ( dst ) - { - if ( dstWritten > dstLen ) - return wxCONV_FAILED; - - // +1 is for trailing NUL - if ( MB2WC(dst, src, lenChunk + 1) == wxCONV_FAILED ) - return wxCONV_FAILED; - - dst += lenChunk; - if ( !srcEnd ) - dst++; - } - - if ( !srcEnd ) - { - // we convert just one chunk in this case as this is the entire - // string anyhow (and we don't count the trailing NUL in this case) - break; - } - - // advance the input pointer past the end of this chunk: notice that we - // will always stop before srcEnd because we know that the chunk is - // always properly NUL-terminated - while ( NotAllNULs(src, nulLen) ) - { - // notice that we must skip over multiple bytes here as we suppose - // that if NUL takes 2 or 4 bytes, then all the other characters do - // too and so if advanced by a single byte we might erroneously - // detect sequences of NUL bytes in the middle of the input - src += nulLen; - } - - // if the buffer ends before this NUL, we shouldn't count it in our - // output so skip the code below - if ( src == srcEnd ) - break; - - // do count this terminator as it's inside the buffer we convert - dstWritten++; - if ( dst ) - dst++; - - src += nulLen; // skip the terminator itself - - if ( src >= srcEnd ) - break; - } - - return dstWritten; -} - -size_t -wxMBConv::FromWChar(char *dst, size_t dstLen, - const wchar_t *src, size_t srcLen) const -{ - // the number of chars [which would be] written to dst [if it were not NULL] - size_t dstWritten = 0; - - // if we don't know its length we have no choice but to assume that it is - // NUL-terminated (notice that it can still be NUL-terminated even if - // explicit length is given but it doesn't change our return value) - const bool isNulTerminated = srcLen == wxNO_LEN; - - // make a copy of the input string unless it is already properly - // NUL-terminated - wxWCharBuffer bufTmp; - if ( isNulTerminated ) - { - srcLen = wxWcslen(src) + 1; - } - else if ( srcLen != 0 && src[srcLen - 1] != L'\0' ) - { - // make a copy in order to properly NUL-terminate the string - bufTmp = wxWCharBuffer(srcLen); - memcpy(bufTmp.data(), src, srcLen * sizeof(wchar_t)); - src = bufTmp; - } - - const size_t lenNul = GetMBNulLen(); - for ( const wchar_t * const srcEnd = src + srcLen; - src < srcEnd; - src++ /* skip L'\0' too */ ) - { - // try to convert the current chunk - size_t lenChunk = WC2MB(NULL, src, 0); - if ( lenChunk == wxCONV_FAILED ) - return wxCONV_FAILED; - - dstWritten += lenChunk; - - const wchar_t * const - chunkEnd = isNulTerminated ? srcEnd - 1 : src + wxWcslen(src); - - // our return value accounts for the trailing NUL(s), unlike that of - // WC2MB(), however don't do it for the last NUL we artificially added - // ourselves above - if ( chunkEnd < srcEnd ) - dstWritten += lenNul; - - if ( dst ) - { - if ( dstWritten > dstLen ) - return wxCONV_FAILED; - - // if we know that there is enough space in the destination buffer - // (because we accounted for lenNul in dstWritten above), we can - // convert directly in place -- but otherwise we need another - // temporary buffer to ensure that we don't overwrite the output - wxCharBuffer dstBuf; - char *dstTmp; - if ( chunkEnd == srcEnd ) - { - dstBuf = wxCharBuffer(lenChunk + lenNul - 1); - dstTmp = dstBuf.data(); - } - else - { - dstTmp = dst; - } - - if ( WC2MB(dstTmp, src, lenChunk + lenNul) == wxCONV_FAILED ) - return wxCONV_FAILED; - - if ( dstTmp != dst ) - { - // copy everything up to but excluding the terminating NUL(s) - // into the real output buffer - memcpy(dst, dstTmp, lenChunk); - - // micro-optimization: if dstTmp != dst it means that chunkEnd - // == srcEnd and so we're done, no need to update anything below - break; - } - - dst += lenChunk; - if ( chunkEnd < srcEnd ) - dst += lenNul; - } - - src = chunkEnd; - } - - return dstWritten; -} - -size_t wxMBConv::MB2WC(wchar_t *outBuff, const char *inBuff, size_t outLen) const -{ - size_t rc = ToWChar(outBuff, outLen, inBuff); - if ( rc != wxCONV_FAILED ) - { - // ToWChar() returns the buffer length, i.e. including the trailing - // NUL, while this method doesn't take it into account - rc--; - } - - return rc; -} - -size_t wxMBConv::WC2MB(char *outBuff, const wchar_t *inBuff, size_t outLen) const -{ - size_t rc = FromWChar(outBuff, outLen, inBuff); - if ( rc != wxCONV_FAILED ) - { - rc -= GetMBNulLen(); - } - - return rc; -} - -wxMBConv::~wxMBConv() -{ - // nothing to do here (necessary for Darwin linking probably) -} - -const wxWCharBuffer wxMBConv::cMB2WC(const char *psz) const -{ - if ( psz ) - { - // calculate the length of the buffer needed first - const size_t nLen = ToWChar(NULL, 0, psz); - if ( nLen != wxCONV_FAILED ) - { - // now do the actual conversion - wxWCharBuffer buf(nLen - 1 /* +1 added implicitly */); - - // +1 for the trailing NULL - if ( ToWChar(buf.data(), nLen, psz) != wxCONV_FAILED ) - return buf; - } - } - - return wxWCharBuffer(); -} - -const wxCharBuffer wxMBConv::cWC2MB(const wchar_t *pwz) const -{ - if ( pwz ) - { - const size_t nLen = FromWChar(NULL, 0, pwz); - if ( nLen != wxCONV_FAILED ) - { - wxCharBuffer buf(nLen - 1); - if ( FromWChar(buf.data(), nLen, pwz) != wxCONV_FAILED ) - return buf; - } - } - - return wxCharBuffer(); -} - -const wxWCharBuffer -wxMBConv::cMB2WC(const char *inBuff, size_t inLen, size_t *outLen) const -{ - const size_t dstLen = ToWChar(NULL, 0, inBuff, inLen); - if ( dstLen != wxCONV_FAILED ) - { - // notice that we allocate space for dstLen+1 wide characters here - // because we want the buffer to always be NUL-terminated, even if the - // input isn't (as otherwise the caller has no way to know its length) - wxWCharBuffer wbuf(dstLen); - if ( ToWChar(wbuf.data(), dstLen, inBuff, inLen) != wxCONV_FAILED ) - { - if ( outLen ) - { - *outLen = dstLen; - - // we also need to handle NUL-terminated input strings - // specially: for them the output is the length of the string - // excluding the trailing NUL, however if we're asked to - // convert a specific number of characters we return the length - // of the resulting output even if it's NUL-terminated - if ( inLen == wxNO_LEN ) - (*outLen)--; - } - - return wbuf; - } - } - - if ( outLen ) - *outLen = 0; - - return wxWCharBuffer(); -} - -const wxCharBuffer -wxMBConv::cWC2MB(const wchar_t *inBuff, size_t inLen, size_t *outLen) const -{ - size_t dstLen = FromWChar(NULL, 0, inBuff, inLen); - if ( dstLen != wxCONV_FAILED ) - { - const size_t nulLen = GetMBNulLen(); - - // as above, ensure that the buffer is always NUL-terminated, even if - // the input is not - wxCharBuffer buf(dstLen + nulLen - 1); - memset(buf.data() + dstLen, 0, nulLen); - - // Notice that return value of the call to FromWChar() here may be - // different from the one above as it could have overestimated the - // space needed, while what we get here is the exact length. - dstLen = FromWChar(buf.data(), dstLen, inBuff, inLen); - if ( dstLen != wxCONV_FAILED ) - { - if ( outLen ) - { - *outLen = dstLen; - - if ( inLen == wxNO_LEN ) - { - // in this case both input and output are NUL-terminated - // and we're not supposed to count NUL - *outLen -= nulLen; - } - } - - return buf; - } - } - - if ( outLen ) - *outLen = 0; - - return wxCharBuffer(); -} - -const wxWCharBuffer wxMBConv::cMB2WC(const wxScopedCharBuffer& buf) const -{ - const size_t srcLen = buf.length(); - if ( srcLen ) - { - const size_t dstLen = ToWChar(NULL, 0, buf, srcLen); - if ( dstLen != wxCONV_FAILED ) - { - wxWCharBuffer wbuf(dstLen); - wbuf.data()[dstLen] = L'\0'; - if ( ToWChar(wbuf.data(), dstLen, buf, srcLen) != wxCONV_FAILED ) - return wbuf; - } - } - - return wxScopedWCharBuffer::CreateNonOwned(L"", 0); -} - -const wxCharBuffer wxMBConv::cWC2MB(const wxScopedWCharBuffer& wbuf) const -{ - const size_t srcLen = wbuf.length(); - if ( srcLen ) - { - const size_t dstLen = FromWChar(NULL, 0, wbuf, srcLen); - if ( dstLen != wxCONV_FAILED ) - { - wxCharBuffer buf(dstLen); - buf.data()[dstLen] = '\0'; - if ( FromWChar(buf.data(), dstLen, wbuf, srcLen) != wxCONV_FAILED ) - return buf; - } - } - - return wxScopedCharBuffer::CreateNonOwned("", 0); -} - -// ---------------------------------------------------------------------------- -// wxMBConvLibc -// ---------------------------------------------------------------------------- - -size_t wxMBConvLibc::MB2WC(wchar_t *buf, const char *psz, size_t n) const -{ - return wxMB2WC(buf, psz, n); -} - -size_t wxMBConvLibc::WC2MB(char *buf, const wchar_t *psz, size_t n) const -{ - return wxWC2MB(buf, psz, n); -} - -// ---------------------------------------------------------------------------- -// wxConvBrokenFileNames -// ---------------------------------------------------------------------------- - -#ifdef __UNIX__ - -wxConvBrokenFileNames::wxConvBrokenFileNames(const wxString& charset) -{ - if ( wxStricmp(charset, wxT("UTF-8")) == 0 || - wxStricmp(charset, wxT("UTF8")) == 0 ) - m_conv = new wxMBConvUTF8(wxMBConvUTF8::MAP_INVALID_UTF8_TO_PUA); - else - m_conv = new wxCSConv(charset); -} - -#endif // __UNIX__ - -// ---------------------------------------------------------------------------- -// UTF-7 -// ---------------------------------------------------------------------------- - -// Implementation (C) 2004 Fredrik Roubert -// -// Changes to work in streaming mode (C) 2008 Vadim Zeitlin - -// -// BASE64 decoding table -// -static const unsigned char utf7unb64[] = -{ - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0x3e, 0xff, 0xff, 0xff, 0x3f, - 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b, - 0x3c, 0x3d, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, - 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, - 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, - 0x17, 0x18, 0x19, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20, - 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, - 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0x30, - 0x31, 0x32, 0x33, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff -}; - -size_t wxMBConvUTF7::ToWChar(wchar_t *dst, size_t dstLen, - const char *src, size_t srcLen) const -{ - DecoderState stateOrig, - *statePtr; - if ( srcLen == wxNO_LEN ) - { - // convert the entire string, up to and including the trailing NUL - srcLen = strlen(src) + 1; - - // when working on the entire strings we don't update nor use the shift - // state from the previous call - statePtr = &stateOrig; - } - else // when working with partial strings we do use the shift state - { - statePtr = const_cast(&m_stateDecoder); - - // also save the old state to be able to rollback to it on error - stateOrig = m_stateDecoder; - } - - // but to simplify the code below we use this variable in both cases - DecoderState& state = *statePtr; - - - // number of characters [which would have been] written to dst [if it were - // not NULL] - size_t len = 0; - - const char * const srcEnd = src + srcLen; - - while ( (src < srcEnd) && (!dst || (len < dstLen)) ) - { - const unsigned char cc = *src++; - - if ( state.IsShifted() ) - { - const unsigned char dc = utf7unb64[cc]; - if ( dc == 0xff ) - { - // end of encoded part, check that nothing was left: there can - // be up to 4 bits of 0 padding but nothing else (we also need - // to check isLSB as we count bits modulo 8 while a valid UTF-7 - // encoded sequence must contain an integral number of UTF-16 - // characters) - if ( state.isLSB || state.bit > 4 || - (state.accum & ((1 << state.bit) - 1)) ) - { - if ( !len ) - state = stateOrig; - - return wxCONV_FAILED; - } - - state.ToDirect(); - - // re-parse this character normally below unless it's '-' which - // is consumed by the decoder - if ( cc == '-' ) - continue; - } - else // valid encoded character - { - // mini base64 decoder: each character is 6 bits - state.bit += 6; - state.accum <<= 6; - state.accum += dc; - - if ( state.bit >= 8 ) - { - // got the full byte, consume it - state.bit -= 8; - unsigned char b = (state.accum >> state.bit) & 0x00ff; - - if ( state.isLSB ) - { - // we've got the full word, output it - if ( dst ) - *dst++ = (state.msb << 8) | b; - len++; - state.isLSB = false; - } - else // MSB - { - // just store it while we wait for LSB - state.msb = b; - state.isLSB = true; - } - } - } - } - - if ( state.IsDirect() ) - { - // start of an encoded segment? - if ( cc == '+' ) - { - if ( *src == '-' ) - { - // just the encoded plus sign, don't switch to shifted mode - if ( dst ) - *dst++ = '+'; - len++; - src++; - } - else if ( utf7unb64[(unsigned)*src] == 0xff ) - { - // empty encoded chunks are not allowed - if ( !len ) - state = stateOrig; - - return wxCONV_FAILED; - } - else // base-64 encoded chunk follows - { - state.ToShifted(); - } - } - else // not '+' - { - // only printable 7 bit ASCII characters (with the exception of - // NUL, TAB, CR and LF) can be used directly - if ( cc >= 0x7f || (cc < ' ' && - !(cc == '\0' || cc == '\t' || cc == '\r' || cc == '\n')) ) - return wxCONV_FAILED; - - if ( dst ) - *dst++ = cc; - len++; - } - } - } - - if ( !len ) - { - // as we didn't read any characters we should be called with the same - // data (followed by some more new data) again later so don't save our - // state - state = stateOrig; - - return wxCONV_FAILED; - } - - return len; -} - -// -// BASE64 encoding table -// -static const unsigned char utf7enb64[] = -{ - 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', - 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', - 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', - 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', - 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', - 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', - 'w', 'x', 'y', 'z', '0', '1', '2', '3', - '4', '5', '6', '7', '8', '9', '+', '/' -}; - -// -// UTF-7 encoding table -// -// 0 - Set D (directly encoded characters) -// 1 - Set O (optional direct characters) -// 2 - whitespace characters (optional) -// 3 - special characters -// -static const unsigned char utf7encode[128] = -{ - 0, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 3, 3, 2, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 2, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 3, 0, 0, 0, 3, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, - 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 1, 1, 1, - 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 3, 3 -}; - -static inline bool wxIsUTF7Direct(wchar_t wc) -{ - return wc < 0x80 && utf7encode[wc] < 1; -} - -size_t wxMBConvUTF7::FromWChar(char *dst, size_t dstLen, - const wchar_t *src, size_t srcLen) const -{ - EncoderState stateOrig, - *statePtr; - if ( srcLen == wxNO_LEN ) - { - // we don't apply the stored state when operating on entire strings at - // once - statePtr = &stateOrig; - - srcLen = wxWcslen(src) + 1; - } - else // do use the mode we left the output in previously - { - stateOrig = m_stateEncoder; - statePtr = const_cast(&m_stateEncoder); - } - - EncoderState& state = *statePtr; - - - size_t len = 0; - - const wchar_t * const srcEnd = src + srcLen; - while ( src < srcEnd && (!dst || len < dstLen) ) - { - wchar_t cc = *src++; - if ( wxIsUTF7Direct(cc) ) - { - if ( state.IsShifted() ) - { - // pad with zeros the last encoded block if necessary - if ( state.bit ) - { - if ( dst ) - *dst++ = utf7enb64[((state.accum % 16) << (6 - state.bit)) % 64]; - len++; - } - - state.ToDirect(); - - if ( dst ) - *dst++ = '-'; - len++; - } - - if ( dst ) - *dst++ = (char)cc; - len++; - } - else if ( cc == '+' && state.IsDirect() ) - { - if ( dst ) - { - *dst++ = '+'; - *dst++ = '-'; - } - - len += 2; - } -#ifndef WC_UTF16 - else if (((wxUint32)cc) > 0xffff) - { - // no surrogate pair generation (yet?) - return wxCONV_FAILED; - } -#endif - else - { - if ( state.IsDirect() ) - { - state.ToShifted(); - - if ( dst ) - *dst++ = '+'; - len++; - } - - // BASE64 encode string - for ( ;; ) - { - for ( unsigned lsb = 0; lsb < 2; lsb++ ) - { - state.accum <<= 8; - state.accum += lsb ? cc & 0xff : (cc & 0xff00) >> 8; - - for (state.bit += 8; state.bit >= 6; ) - { - state.bit -= 6; - if ( dst ) - *dst++ = utf7enb64[(state.accum >> state.bit) % 64]; - len++; - } - } - - if ( src == srcEnd || wxIsUTF7Direct(cc = *src) ) - break; - - src++; - } - } - } - - // we need to restore the original encoder state if we were called just to - // calculate the amount of space needed as we will presumably be called - // again to really convert the data now - if ( !dst ) - state = stateOrig; - - return len; -} - -// ---------------------------------------------------------------------------- -// UTF-8 -// ---------------------------------------------------------------------------- - -static const wxUint32 utf8_max[]= - { 0x7f, 0x7ff, 0xffff, 0x1fffff, 0x3ffffff, 0x7fffffff, 0xffffffff }; - -// boundaries of the private use area we use to (temporarily) remap invalid -// characters invalid in a UTF-8 encoded string -const wxUint32 wxUnicodePUA = 0x100000; -const wxUint32 wxUnicodePUAEnd = wxUnicodePUA + 256; - -// this table gives the length of the UTF-8 encoding from its first character: -const unsigned char tableUtf8Lengths[256] = { - // single-byte sequences (ASCII): - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 00..0F - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 10..1F - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 20..2F - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 30..3F - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 40..4F - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 50..5F - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 60..6F - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 70..7F - - // these are invalid: - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 80..8F - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 90..9F - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // A0..AF - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // B0..BF - 0, 0, // C0,C1 - - // two-byte sequences: - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, // C2..CF - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, // D0..DF - - // three-byte sequences: - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // E0..EF - - // four-byte sequences: - 4, 4, 4, 4, 4, // F0..F4 - - // these are invalid again (5- or 6-byte - // sequences and sequences for code points - // above U+10FFFF, as restricted by RFC 3629): - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 // F5..FF -}; - -size_t -wxMBConvStrictUTF8::ToWChar(wchar_t *dst, size_t dstLen, - const char *src, size_t srcLen) const -{ - wchar_t *out = dstLen ? dst : NULL; - size_t written = 0; - - if ( srcLen == wxNO_LEN ) - srcLen = strlen(src) + 1; - - for ( const char *p = src; ; p++ ) - { - if ( (srcLen == wxNO_LEN ? !*p : !srcLen) ) - { - // all done successfully, just add the trailing NULL if we are not - // using explicit length - if ( srcLen == wxNO_LEN ) - { - if ( out ) - { - if ( !dstLen ) - break; - - *out = L'\0'; - } - - written++; - } - - return written; - } - - if ( out && !dstLen-- ) - break; - - wxUint32 code; - unsigned char c = *p; - - if ( c < 0x80 ) - { - if ( srcLen == 0 ) // the test works for wxNO_LEN too - break; - - if ( srcLen != wxNO_LEN ) - srcLen--; - - code = c; - } - else - { - unsigned len = tableUtf8Lengths[c]; - if ( !len ) - break; - - if ( srcLen < len ) // the test works for wxNO_LEN too - break; - - if ( srcLen != wxNO_LEN ) - srcLen -= len; - - // Char. number range | UTF-8 octet sequence - // (hexadecimal) | (binary) - // ----------------------+---------------------------------------- - // 0000 0000 - 0000 007F | 0xxxxxxx - // 0000 0080 - 0000 07FF | 110xxxxx 10xxxxxx - // 0000 0800 - 0000 FFFF | 1110xxxx 10xxxxxx 10xxxxxx - // 0001 0000 - 0010 FFFF | 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx - // - // Code point value is stored in bits marked with 'x', - // lowest-order bit of the value on the right side in the diagram - // above. (from RFC 3629) - - // mask to extract lead byte's value ('x' bits above), by sequence - // length: - static const unsigned char leadValueMask[] = { 0x7F, 0x1F, 0x0F, 0x07 }; - - len--; // it's more convenient to work with 0-based length here - - code = c & leadValueMask[len]; - - // all remaining bytes, if any, are handled in the same way - // regardless of sequence's length: - for ( ; len; --len ) - { - c = *++p; - if ( (c & 0xC0) != 0x80 ) - return wxCONV_FAILED; - - code <<= 6; - code |= c & 0x3F; - } - } - -#ifdef WC_UTF16 - // cast is ok because wchar_t == wxUint16 if WC_UTF16 - if ( encode_utf16(code, (wxUint16 *)out) == 2 ) - { - if ( out ) - out++; - written++; - } -#else // !WC_UTF16 - if ( out ) - *out = code; -#endif // WC_UTF16/!WC_UTF16 - - if ( out ) - out++; - - written++; - } - - return wxCONV_FAILED; -} - -size_t -wxMBConvStrictUTF8::FromWChar(char *dst, size_t dstLen, - const wchar_t *src, size_t srcLen) const -{ - char *out = dstLen ? dst : NULL; - size_t written = 0; - - for ( const wchar_t *wp = src; ; wp++ ) - { - if ( (srcLen == wxNO_LEN ? !*wp : !srcLen) ) - { - // all done successfully, just add the trailing NULL if we are not - // using explicit length - if ( srcLen == wxNO_LEN ) - { - if ( out ) - { - if ( !dstLen ) - break; - - *out = '\0'; - } - - written++; - } - - return written; - } - - if ( srcLen != wxNO_LEN ) - srcLen--; - - wxUint32 code; -#ifdef WC_UTF16 - // Be careful here: decode_utf16() may need to read the next wchar_t - // but we might not have any left, so pass it a temporary buffer which - // always has 2 wide characters and take care to set its second element - // to 0, which is invalid as a second half of a surrogate, to ensure - // that we return an error when trying to convert a buffer ending with - // half of a surrogate. - wxUint16 tmp[2]; - tmp[0] = wp[0]; - tmp[1] = srcLen != 0 ? wp[1] : 0; - switch ( decode_utf16(tmp, code) ) - { - case 1: - // Nothing special to do, just a character from BMP. - break; - - case 2: - // skip the next char too as we decoded a surrogate - wp++; - if ( srcLen != wxNO_LEN ) - srcLen--; - break; - - case wxCONV_FAILED: - return wxCONV_FAILED; - } -#else // wchar_t is UTF-32 - code = *wp & 0x7fffffff; -#endif - - unsigned len; - if ( code <= 0x7F ) - { - len = 1; - if ( out ) - { - if ( dstLen < len ) - break; - - out[0] = (char)code; - } - } - else if ( code <= 0x07FF ) - { - len = 2; - if ( out ) - { - if ( dstLen < len ) - break; - - // NB: this line takes 6 least significant bits, encodes them as - // 10xxxxxx and discards them so that the next byte can be encoded: - out[1] = 0x80 | (code & 0x3F); code >>= 6; - out[0] = 0xC0 | code; - } - } - else if ( code < 0xFFFF ) - { - len = 3; - if ( out ) - { - if ( dstLen < len ) - break; - - out[2] = 0x80 | (code & 0x3F); code >>= 6; - out[1] = 0x80 | (code & 0x3F); code >>= 6; - out[0] = 0xE0 | code; - } - } - else if ( code <= 0x10FFFF ) - { - len = 4; - if ( out ) - { - if ( dstLen < len ) - break; - - out[3] = 0x80 | (code & 0x3F); code >>= 6; - out[2] = 0x80 | (code & 0x3F); code >>= 6; - out[1] = 0x80 | (code & 0x3F); code >>= 6; - out[0] = 0xF0 | code; - } - } - else - { - wxFAIL_MSG( wxT("trying to encode undefined Unicode character") ); - break; - } - - if ( out ) - { - out += len; - dstLen -= len; - } - - written += len; - } - - // we only get here if an error occurs during decoding - return wxCONV_FAILED; -} - -size_t wxMBConvUTF8::ToWChar(wchar_t *buf, size_t n, - const char *psz, size_t srcLen) const -{ - if ( m_options == MAP_INVALID_UTF8_NOT ) - return wxMBConvStrictUTF8::ToWChar(buf, n, psz, srcLen); - - size_t len = 0; - - // The length can be either given explicitly or computed implicitly for the - // NUL-terminated strings. - const bool isNulTerminated = srcLen == wxNO_LEN; - while ((isNulTerminated ? *psz : srcLen--) && ((!buf) || (len < n))) - { - const char *opsz = psz; - bool invalid = false; - unsigned char cc = *psz++, fc = cc; - unsigned cnt; - for (cnt = 0; fc & 0x80; cnt++) - fc <<= 1; - - if (!cnt) - { - // plain ASCII char - if (buf) - *buf++ = cc; - len++; - - // escape the escape character for octal escapes - if ((m_options & MAP_INVALID_UTF8_TO_OCTAL) - && cc == '\\' && (!buf || len < n)) - { - if (buf) - *buf++ = cc; - len++; - } - } - else - { - cnt--; - if (!cnt) - { - // invalid UTF-8 sequence - invalid = true; - } - else - { - unsigned ocnt = cnt - 1; - wxUint32 res = cc & (0x3f >> cnt); - while (cnt--) - { - if (!isNulTerminated && !srcLen) - { - // invalid UTF-8 sequence ending before the end of code - // point. - invalid = true; - break; - } - - cc = *psz; - if ((cc & 0xC0) != 0x80) - { - // invalid UTF-8 sequence - invalid = true; - break; - } - - psz++; - if (!isNulTerminated) - srcLen--; - res = (res << 6) | (cc & 0x3f); - } - - if (invalid || res <= utf8_max[ocnt]) - { - // illegal UTF-8 encoding - invalid = true; - } - else if ((m_options & MAP_INVALID_UTF8_TO_PUA) && - res >= wxUnicodePUA && res < wxUnicodePUAEnd) - { - // if one of our PUA characters turns up externally - // it must also be treated as an illegal sequence - // (a bit like you have to escape an escape character) - invalid = true; - } - else - { -#ifdef WC_UTF16 - // cast is ok because wchar_t == wxUint16 if WC_UTF16 - size_t pa = encode_utf16(res, (wxUint16 *)buf); - if (pa == wxCONV_FAILED) - { - invalid = true; - } - else - { - if (buf) - buf += pa; - len += pa; - } -#else // !WC_UTF16 - if (buf) - *buf++ = (wchar_t)res; - len++; -#endif // WC_UTF16/!WC_UTF16 - } - } - - if (invalid) - { - if (m_options & MAP_INVALID_UTF8_TO_PUA) - { - while (opsz < psz && (!buf || len < n)) - { -#ifdef WC_UTF16 - // cast is ok because wchar_t == wxUuint16 if WC_UTF16 - size_t pa = encode_utf16((unsigned char)*opsz + wxUnicodePUA, (wxUint16 *)buf); - wxASSERT(pa != wxCONV_FAILED); - if (buf) - buf += pa; - opsz++; - len += pa; -#else - if (buf) - *buf++ = (wchar_t)(wxUnicodePUA + (unsigned char)*opsz); - opsz++; - len++; -#endif - } - } - else if (m_options & MAP_INVALID_UTF8_TO_OCTAL) - { - while (opsz < psz && (!buf || len < n)) - { - if ( buf && len + 3 < n ) - { - unsigned char on = *opsz; - *buf++ = L'\\'; - *buf++ = (wchar_t)( L'0' + on / 0100 ); - *buf++ = (wchar_t)( L'0' + (on % 0100) / 010 ); - *buf++ = (wchar_t)( L'0' + on % 010 ); - } - - opsz++; - len += 4; - } - } - else // MAP_INVALID_UTF8_NOT - { - return wxCONV_FAILED; - } - } - } - } - - if ( isNulTerminated ) - { - // Add the trailing NUL in this case if we have a large enough buffer. - if ( buf && (len < n) ) - *buf = 0; - - // And count it in any case. - len++; - } - - return len; -} - -static inline bool isoctal(wchar_t wch) -{ - return L'0' <= wch && wch <= L'7'; -} - -size_t wxMBConvUTF8::FromWChar(char *buf, size_t n, - const wchar_t *psz, size_t srcLen) const -{ - if ( m_options == MAP_INVALID_UTF8_NOT ) - return wxMBConvStrictUTF8::FromWChar(buf, n, psz, srcLen); - - size_t len = 0; - - // The length can be either given explicitly or computed implicitly for the - // NUL-terminated strings. - const bool isNulTerminated = srcLen == wxNO_LEN; - while ((isNulTerminated ? *psz : srcLen--) && ((!buf) || (len < n))) - { - wxUint32 cc; - -#ifdef WC_UTF16 - // cast is ok for WC_UTF16 - size_t pa = decode_utf16((const wxUint16 *)psz, cc); - - // we could have consumed two input code units if we decoded a - // surrogate, so adjust the input pointer and, if necessary, the length - psz += (pa == wxCONV_FAILED) ? 1 : pa; - if ( pa == 2 && !isNulTerminated ) - srcLen--; -#else - cc = (*psz++) & 0x7fffffff; -#endif - - if ( (m_options & MAP_INVALID_UTF8_TO_PUA) - && cc >= wxUnicodePUA && cc < wxUnicodePUAEnd ) - { - if (buf) - *buf++ = (char)(cc - wxUnicodePUA); - len++; - } - else if ( (m_options & MAP_INVALID_UTF8_TO_OCTAL) - && cc == L'\\' && psz[0] == L'\\' ) - { - if (buf) - *buf++ = (char)cc; - psz++; - len++; - } - else if ( (m_options & MAP_INVALID_UTF8_TO_OCTAL) && - cc == L'\\' && - isoctal(psz[0]) && isoctal(psz[1]) && isoctal(psz[2]) ) - { - if (buf) - { - *buf++ = (char) ((psz[0] - L'0') * 0100 + - (psz[1] - L'0') * 010 + - (psz[2] - L'0')); - } - - psz += 3; - len++; - } - else - { - unsigned cnt; - for (cnt = 0; cc > utf8_max[cnt]; cnt++) - { - } - - if (!cnt) - { - // plain ASCII char - if (buf) - *buf++ = (char) cc; - len++; - } - else - { - len += cnt + 1; - if (buf) - { - *buf++ = (char) ((-128 >> cnt) | ((cc >> (cnt * 6)) & (0x3f >> cnt))); - while (cnt--) - *buf++ = (char) (0x80 | ((cc >> (cnt * 6)) & 0x3f)); - } - } - } - } - - if ( isNulTerminated ) - { - // Add the trailing NUL in this case if we have a large enough buffer. - if ( buf && (len < n) ) - *buf = 0; - - // And count it in any case. - len++; - } - - return len; -} - -// ============================================================================ -// UTF-16 -// ============================================================================ - -#ifdef WORDS_BIGENDIAN - #define wxMBConvUTF16straight wxMBConvUTF16BE - #define wxMBConvUTF16swap wxMBConvUTF16LE -#else - #define wxMBConvUTF16swap wxMBConvUTF16BE - #define wxMBConvUTF16straight wxMBConvUTF16LE -#endif - -/* static */ -size_t wxMBConvUTF16Base::GetLength(const char *src, size_t srcLen) -{ - if ( srcLen == wxNO_LEN ) - { - // count the number of bytes in input, including the trailing NULs - const wxUint16 *inBuff = reinterpret_cast(src); - for ( srcLen = 1; *inBuff++; srcLen++ ) - ; - - srcLen *= BYTES_PER_CHAR; - } - else // we already have the length - { - // we can only convert an entire number of UTF-16 characters - if ( srcLen % BYTES_PER_CHAR ) - return wxCONV_FAILED; - } - - return srcLen; -} - -// case when in-memory representation is UTF-16 too -#ifdef WC_UTF16 - -// ---------------------------------------------------------------------------- -// conversions without endianness change -// ---------------------------------------------------------------------------- - -size_t -wxMBConvUTF16straight::ToWChar(wchar_t *dst, size_t dstLen, - const char *src, size_t srcLen) const -{ - // set up the scene for using memcpy() (which is presumably more efficient - // than copying the bytes one by one) - srcLen = GetLength(src, srcLen); - if ( srcLen == wxNO_LEN ) - return wxCONV_FAILED; - - const size_t inLen = srcLen / BYTES_PER_CHAR; - if ( dst ) - { - if ( dstLen < inLen ) - return wxCONV_FAILED; - - memcpy(dst, src, srcLen); - } - - return inLen; -} - -size_t -wxMBConvUTF16straight::FromWChar(char *dst, size_t dstLen, - const wchar_t *src, size_t srcLen) const -{ - if ( srcLen == wxNO_LEN ) - srcLen = wxWcslen(src) + 1; - - srcLen *= BYTES_PER_CHAR; - - if ( dst ) - { - if ( dstLen < srcLen ) - return wxCONV_FAILED; - - memcpy(dst, src, srcLen); - } - - return srcLen; -} - -// ---------------------------------------------------------------------------- -// endian-reversing conversions -// ---------------------------------------------------------------------------- - -size_t -wxMBConvUTF16swap::ToWChar(wchar_t *dst, size_t dstLen, - const char *src, size_t srcLen) const -{ - srcLen = GetLength(src, srcLen); - if ( srcLen == wxNO_LEN ) - return wxCONV_FAILED; - - srcLen /= BYTES_PER_CHAR; - - if ( dst ) - { - if ( dstLen < srcLen ) - return wxCONV_FAILED; - - const wxUint16 *inBuff = reinterpret_cast(src); - for ( size_t n = 0; n < srcLen; n++, inBuff++ ) - { - *dst++ = wxUINT16_SWAP_ALWAYS(*inBuff); - } - } - - return srcLen; -} - -size_t -wxMBConvUTF16swap::FromWChar(char *dst, size_t dstLen, - const wchar_t *src, size_t srcLen) const -{ - if ( srcLen == wxNO_LEN ) - srcLen = wxWcslen(src) + 1; - - srcLen *= BYTES_PER_CHAR; - - if ( dst ) - { - if ( dstLen < srcLen ) - return wxCONV_FAILED; - - wxUint16 *outBuff = reinterpret_cast(dst); - for ( size_t n = 0; n < srcLen; n += BYTES_PER_CHAR, src++ ) - { - *outBuff++ = wxUINT16_SWAP_ALWAYS(*src); - } - } - - return srcLen; -} - -#else // !WC_UTF16: wchar_t is UTF-32 - -// ---------------------------------------------------------------------------- -// conversions without endianness change -// ---------------------------------------------------------------------------- - -size_t -wxMBConvUTF16straight::ToWChar(wchar_t *dst, size_t dstLen, - const char *src, size_t srcLen) const -{ - srcLen = GetLength(src, srcLen); - if ( srcLen == wxNO_LEN ) - return wxCONV_FAILED; - - const size_t inLen = srcLen / BYTES_PER_CHAR; - size_t outLen = 0; - const wxUint16 *inBuff = reinterpret_cast(src); - for ( const wxUint16 * const inEnd = inBuff + inLen; inBuff < inEnd; ) - { - const wxUint32 ch = wxDecodeSurrogate(&inBuff); - if ( !inBuff ) - return wxCONV_FAILED; - - outLen++; - - if ( dst ) - { - if ( outLen > dstLen ) - return wxCONV_FAILED; - - *dst++ = ch; - } - } - - - return outLen; -} - -size_t -wxMBConvUTF16straight::FromWChar(char *dst, size_t dstLen, - const wchar_t *src, size_t srcLen) const -{ - if ( srcLen == wxNO_LEN ) - srcLen = wxWcslen(src) + 1; - - size_t outLen = 0; - wxUint16 *outBuff = reinterpret_cast(dst); - for ( size_t n = 0; n < srcLen; n++ ) - { - wxUint16 cc[2] = { 0 }; - const size_t numChars = encode_utf16(*src++, cc); - if ( numChars == wxCONV_FAILED ) - return wxCONV_FAILED; - - outLen += numChars * BYTES_PER_CHAR; - if ( outBuff ) - { - if ( outLen > dstLen ) - return wxCONV_FAILED; - - *outBuff++ = cc[0]; - if ( numChars == 2 ) - { - // second character of a surrogate - *outBuff++ = cc[1]; - } - } - } - - return outLen; -} - -// ---------------------------------------------------------------------------- -// endian-reversing conversions -// ---------------------------------------------------------------------------- - -size_t -wxMBConvUTF16swap::ToWChar(wchar_t *dst, size_t dstLen, - const char *src, size_t srcLen) const -{ - srcLen = GetLength(src, srcLen); - if ( srcLen == wxNO_LEN ) - return wxCONV_FAILED; - - const size_t inLen = srcLen / BYTES_PER_CHAR; - size_t outLen = 0; - const wxUint16 *inBuff = reinterpret_cast(src); - for ( const wxUint16 * const inEnd = inBuff + inLen; inBuff < inEnd; ) - { - wxUint32 ch; - wxUint16 tmp[2]; - - tmp[0] = wxUINT16_SWAP_ALWAYS(*inBuff); - if ( ++inBuff < inEnd ) - { - // Normal case, we have a next character to decode. - tmp[1] = wxUINT16_SWAP_ALWAYS(*inBuff); - } - else // End of input. - { - // Setting the second character to 0 ensures we correctly return - // wxCONV_FAILED if the first one is the first half of a surrogate - // as the second half can't be 0 in this case. - tmp[1] = 0; - } - - const size_t numChars = decode_utf16(tmp, ch); - if ( numChars == wxCONV_FAILED ) - return wxCONV_FAILED; - - if ( numChars == 2 ) - inBuff++; - - outLen++; - - if ( dst ) - { - if ( outLen > dstLen ) - return wxCONV_FAILED; - - *dst++ = ch; - } - } - - - return outLen; -} - -size_t -wxMBConvUTF16swap::FromWChar(char *dst, size_t dstLen, - const wchar_t *src, size_t srcLen) const -{ - if ( srcLen == wxNO_LEN ) - srcLen = wxWcslen(src) + 1; - - size_t outLen = 0; - wxUint16 *outBuff = reinterpret_cast(dst); - for ( const wchar_t *srcEnd = src + srcLen; src < srcEnd; src++ ) - { - wxUint16 cc[2] = { 0 }; - const size_t numChars = encode_utf16(*src, cc); - if ( numChars == wxCONV_FAILED ) - return wxCONV_FAILED; - - outLen += numChars * BYTES_PER_CHAR; - if ( outBuff ) - { - if ( outLen > dstLen ) - return wxCONV_FAILED; - - *outBuff++ = wxUINT16_SWAP_ALWAYS(cc[0]); - if ( numChars == 2 ) - { - // second character of a surrogate - *outBuff++ = wxUINT16_SWAP_ALWAYS(cc[1]); - } - } - } - - return outLen; -} - -#endif // WC_UTF16/!WC_UTF16 - - -// ============================================================================ -// UTF-32 -// ============================================================================ - -#ifdef WORDS_BIGENDIAN - #define wxMBConvUTF32straight wxMBConvUTF32BE - #define wxMBConvUTF32swap wxMBConvUTF32LE -#else - #define wxMBConvUTF32swap wxMBConvUTF32BE - #define wxMBConvUTF32straight wxMBConvUTF32LE -#endif - - -WXDLLIMPEXP_DATA_BASE(wxMBConvUTF32LE) wxConvUTF32LE; -WXDLLIMPEXP_DATA_BASE(wxMBConvUTF32BE) wxConvUTF32BE; - -/* static */ -size_t wxMBConvUTF32Base::GetLength(const char *src, size_t srcLen) -{ - if ( srcLen == wxNO_LEN ) - { - // count the number of bytes in input, including the trailing NULs - const wxUint32 *inBuff = reinterpret_cast(src); - for ( srcLen = 1; *inBuff++; srcLen++ ) - ; - - srcLen *= BYTES_PER_CHAR; - } - else // we already have the length - { - // we can only convert an entire number of UTF-32 characters - if ( srcLen % BYTES_PER_CHAR ) - return wxCONV_FAILED; - } - - return srcLen; -} - -// case when in-memory representation is UTF-16 -#ifdef WC_UTF16 - -// ---------------------------------------------------------------------------- -// conversions without endianness change -// ---------------------------------------------------------------------------- - -size_t -wxMBConvUTF32straight::ToWChar(wchar_t *dst, size_t dstLen, - const char *src, size_t srcLen) const -{ - srcLen = GetLength(src, srcLen); - if ( srcLen == wxNO_LEN ) - return wxCONV_FAILED; - - const wxUint32 *inBuff = reinterpret_cast(src); - const size_t inLen = srcLen / BYTES_PER_CHAR; - size_t outLen = 0; - for ( size_t n = 0; n < inLen; n++ ) - { - wxUint16 cc[2] = { 0 }; - const size_t numChars = encode_utf16(*inBuff++, cc); - if ( numChars == wxCONV_FAILED ) - return wxCONV_FAILED; - - outLen += numChars; - if ( dst ) - { - if ( outLen > dstLen ) - return wxCONV_FAILED; - - *dst++ = cc[0]; - if ( numChars == 2 ) - { - // second character of a surrogate - *dst++ = cc[1]; - } - } - } - - return outLen; -} - -size_t -wxMBConvUTF32straight::FromWChar(char *dst, size_t dstLen, - const wchar_t *src, size_t srcLen) const -{ - if ( srcLen == wxNO_LEN ) - srcLen = wxWcslen(src) + 1; - - wxUint32 *outBuff = reinterpret_cast(dst); - size_t outLen = 0; - for ( const wchar_t * const srcEnd = src + srcLen; src < srcEnd; ) - { - const wxUint32 ch = wxDecodeSurrogate(&src); - if ( !src ) - return wxCONV_FAILED; - - outLen += BYTES_PER_CHAR; - - if ( outBuff ) - { - if ( outLen > dstLen ) - return wxCONV_FAILED; - - *outBuff++ = ch; - } - } - - return outLen; -} - -// ---------------------------------------------------------------------------- -// endian-reversing conversions -// ---------------------------------------------------------------------------- - -size_t -wxMBConvUTF32swap::ToWChar(wchar_t *dst, size_t dstLen, - const char *src, size_t srcLen) const -{ - srcLen = GetLength(src, srcLen); - if ( srcLen == wxNO_LEN ) - return wxCONV_FAILED; - - const wxUint32 *inBuff = reinterpret_cast(src); - const size_t inLen = srcLen / BYTES_PER_CHAR; - size_t outLen = 0; - for ( size_t n = 0; n < inLen; n++, inBuff++ ) - { - wxUint16 cc[2] = { 0 }; - const size_t numChars = encode_utf16(wxUINT32_SWAP_ALWAYS(*inBuff), cc); - if ( numChars == wxCONV_FAILED ) - return wxCONV_FAILED; - - outLen += numChars; - if ( dst ) - { - if ( outLen > dstLen ) - return wxCONV_FAILED; - - *dst++ = cc[0]; - if ( numChars == 2 ) - { - // second character of a surrogate - *dst++ = cc[1]; - } - } - } - - return outLen; -} - -size_t -wxMBConvUTF32swap::FromWChar(char *dst, size_t dstLen, - const wchar_t *src, size_t srcLen) const -{ - if ( srcLen == wxNO_LEN ) - srcLen = wxWcslen(src) + 1; - - wxUint32 *outBuff = reinterpret_cast(dst); - size_t outLen = 0; - for ( const wchar_t * const srcEnd = src + srcLen; src < srcEnd; ) - { - const wxUint32 ch = wxDecodeSurrogate(&src); - if ( !src ) - return wxCONV_FAILED; - - outLen += BYTES_PER_CHAR; - - if ( outBuff ) - { - if ( outLen > dstLen ) - return wxCONV_FAILED; - - *outBuff++ = wxUINT32_SWAP_ALWAYS(ch); - } - } - - return outLen; -} - -#else // !WC_UTF16: wchar_t is UTF-32 - -// ---------------------------------------------------------------------------- -// conversions without endianness change -// ---------------------------------------------------------------------------- - -size_t -wxMBConvUTF32straight::ToWChar(wchar_t *dst, size_t dstLen, - const char *src, size_t srcLen) const -{ - // use memcpy() as it should be much faster than hand-written loop - srcLen = GetLength(src, srcLen); - if ( srcLen == wxNO_LEN ) - return wxCONV_FAILED; - - const size_t inLen = srcLen/BYTES_PER_CHAR; - if ( dst ) - { - if ( dstLen < inLen ) - return wxCONV_FAILED; - - memcpy(dst, src, srcLen); - } - - return inLen; -} - -size_t -wxMBConvUTF32straight::FromWChar(char *dst, size_t dstLen, - const wchar_t *src, size_t srcLen) const -{ - if ( srcLen == wxNO_LEN ) - srcLen = wxWcslen(src) + 1; - - srcLen *= BYTES_PER_CHAR; - - if ( dst ) - { - if ( dstLen < srcLen ) - return wxCONV_FAILED; - - memcpy(dst, src, srcLen); - } - - return srcLen; -} - -// ---------------------------------------------------------------------------- -// endian-reversing conversions -// ---------------------------------------------------------------------------- - -size_t -wxMBConvUTF32swap::ToWChar(wchar_t *dst, size_t dstLen, - const char *src, size_t srcLen) const -{ - srcLen = GetLength(src, srcLen); - if ( srcLen == wxNO_LEN ) - return wxCONV_FAILED; - - srcLen /= BYTES_PER_CHAR; - - if ( dst ) - { - if ( dstLen < srcLen ) - return wxCONV_FAILED; - - const wxUint32 *inBuff = reinterpret_cast(src); - for ( size_t n = 0; n < srcLen; n++, inBuff++ ) - { - *dst++ = wxUINT32_SWAP_ALWAYS(*inBuff); - } - } - - return srcLen; -} - -size_t -wxMBConvUTF32swap::FromWChar(char *dst, size_t dstLen, - const wchar_t *src, size_t srcLen) const -{ - if ( srcLen == wxNO_LEN ) - srcLen = wxWcslen(src) + 1; - - srcLen *= BYTES_PER_CHAR; - - if ( dst ) - { - if ( dstLen < srcLen ) - return wxCONV_FAILED; - - wxUint32 *outBuff = reinterpret_cast(dst); - for ( size_t n = 0; n < srcLen; n += BYTES_PER_CHAR, src++ ) - { - *outBuff++ = wxUINT32_SWAP_ALWAYS(*src); - } - } - - return srcLen; -} - -#endif // WC_UTF16/!WC_UTF16 - - -// ============================================================================ -// The classes doing conversion using the iconv_xxx() functions -// ============================================================================ - -#ifdef HAVE_ICONV - -// VS: glibc 2.1.3 is broken in that iconv() conversion to/from UCS4 fails with -// E2BIG if output buffer is _exactly_ as big as needed. Such case is -// (unless there's yet another bug in glibc) the only case when iconv() -// returns with (size_t)-1 (which means error) and says there are 0 bytes -// left in the input buffer -- when _real_ error occurs, -// bytes-left-in-input buffer is non-zero. Hence, this alternative test for -// iconv() failure. -// [This bug does not appear in glibc 2.2.] -#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ <= 1 -#define ICONV_FAILED(cres, bufLeft) ((cres == (size_t)-1) && \ - (errno != E2BIG || bufLeft != 0)) -#else -#define ICONV_FAILED(cres, bufLeft) (cres == (size_t)-1) -#endif - -#define ICONV_CHAR_CAST(x) ((ICONV_CONST char **)(x)) - -#define ICONV_T_INVALID ((iconv_t)-1) - -#if SIZEOF_WCHAR_T == 4 - #define WC_BSWAP wxUINT32_SWAP_ALWAYS - #define WC_ENC wxFONTENCODING_UTF32 -#elif SIZEOF_WCHAR_T == 2 - #define WC_BSWAP wxUINT16_SWAP_ALWAYS - #define WC_ENC wxFONTENCODING_UTF16 -#else // sizeof(wchar_t) != 2 nor 4 - // does this ever happen? - #error "Unknown sizeof(wchar_t): please report this to wx-dev@lists.wxwindows.org" -#endif - -// ---------------------------------------------------------------------------- -// wxMBConv_iconv: encapsulates an iconv character set -// ---------------------------------------------------------------------------- - -class wxMBConv_iconv : public wxMBConv -{ -public: - wxMBConv_iconv(const char *name); - virtual ~wxMBConv_iconv(); - - // implement base class virtual methods - virtual size_t ToWChar(wchar_t *dst, size_t dstLen, - const char *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE; - virtual size_t FromWChar(char *dst, size_t dstLen, - const wchar_t *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE; - virtual size_t GetMBNulLen() const wxOVERRIDE; - -#if wxUSE_UNICODE_UTF8 - virtual bool IsUTF8() const wxOVERRIDE; -#endif - - virtual wxMBConv *Clone() const wxOVERRIDE - { - wxMBConv_iconv *p = new wxMBConv_iconv(m_name); - p->m_minMBCharWidth = m_minMBCharWidth; - return p; - } - - bool IsOk() const - { return (m2w != ICONV_T_INVALID) && (w2m != ICONV_T_INVALID); } - -protected: - // the iconv handlers used to translate from multibyte - // to wide char and in the other direction - iconv_t m2w, - w2m; - -#if wxUSE_THREADS - // guards access to m2w and w2m objects - wxMutex m_iconvMutex; -#endif - -private: - // the name (for iconv_open()) of a wide char charset -- if none is - // available on this machine, it will remain NULL - static wxString ms_wcCharsetName; - - // true if the wide char encoding we use (i.e. ms_wcCharsetName) has - // different endian-ness than the native one - static bool ms_wcNeedsSwap; - - - // name of the encoding handled by this conversion - const char *m_name; - - // cached result of GetMBNulLen(); set to 0 meaning "unknown" - // initially - size_t m_minMBCharWidth; -}; - -// make the constructor available for unit testing -WXDLLIMPEXP_BASE wxMBConv* new_wxMBConv_iconv( const char* name ) -{ - wxMBConv_iconv* result = new wxMBConv_iconv( name ); - if ( !result->IsOk() ) - { - delete result; - return 0; - } - - return result; -} - -wxString wxMBConv_iconv::ms_wcCharsetName; -bool wxMBConv_iconv::ms_wcNeedsSwap = false; - -wxMBConv_iconv::wxMBConv_iconv(const char *name) - : m_name(wxStrdup(name)) -{ - m_minMBCharWidth = 0; - - // check for charset that represents wchar_t: - if ( ms_wcCharsetName.empty() ) - { - wxLogTrace(TRACE_STRCONV, wxT("Looking for wide char codeset:")); - -#if wxUSE_FONTMAP - const wxChar *const *names = wxFontMapperBase::GetAllEncodingNames(WC_ENC); -#else // !wxUSE_FONTMAP - static const wxChar *const names_static[] = - { -#if SIZEOF_WCHAR_T == 4 - wxT("UCS-4"), -#elif SIZEOF_WCHAR_T == 2 - wxT("UCS-2"), -#endif - NULL - }; - const wxChar *const *names = names_static; -#endif // wxUSE_FONTMAP/!wxUSE_FONTMAP - - for ( ; *names && ms_wcCharsetName.empty(); ++names ) - { - const wxString nameCS(*names); - - // first try charset with explicit bytesex info (e.g. "UCS-4LE"): - wxString nameXE(nameCS); - -#ifdef WORDS_BIGENDIAN - nameXE += wxT("BE"); -#else // little endian - nameXE += wxT("LE"); -#endif - - wxLogTrace(TRACE_STRCONV, wxT(" trying charset \"%s\""), - nameXE.c_str()); - - m2w = iconv_open(nameXE.ToAscii(), name); - if ( m2w == ICONV_T_INVALID ) - { - // try charset w/o bytesex info (e.g. "UCS4") - wxLogTrace(TRACE_STRCONV, wxT(" trying charset \"%s\""), - nameCS.c_str()); - m2w = iconv_open(nameCS.ToAscii(), name); - - // and check for bytesex ourselves: - if ( m2w != ICONV_T_INVALID ) - { - char buf[2], *bufPtr; - wchar_t wbuf[2]; - size_t insz, outsz; - size_t res; - - buf[0] = 'A'; - buf[1] = 0; - wbuf[0] = 0; - insz = 2; - outsz = SIZEOF_WCHAR_T * 2; - char* wbufPtr = (char*)wbuf; - bufPtr = buf; - - res = iconv( - m2w, ICONV_CHAR_CAST(&bufPtr), &insz, - &wbufPtr, &outsz); - - if (ICONV_FAILED(res, insz)) - { - wxLogLastError(wxT("iconv")); - wxLogError(_("Conversion to charset '%s' doesn't work."), - nameCS.c_str()); - } - else // ok, can convert to this encoding, remember it - { - ms_wcCharsetName = nameCS; - ms_wcNeedsSwap = wbuf[0] != (wchar_t)buf[0]; - } - } - } - else // use charset not requiring byte swapping - { - ms_wcCharsetName = nameXE; - } - } - - wxLogTrace(TRACE_STRCONV, - wxT("iconv wchar_t charset is \"%s\"%s"), - ms_wcCharsetName.empty() ? wxString("") - : ms_wcCharsetName, - ms_wcNeedsSwap ? wxT(" (needs swap)") - : wxT("")); - } - else // we already have ms_wcCharsetName - { - m2w = iconv_open(ms_wcCharsetName.ToAscii(), name); - } - - if ( ms_wcCharsetName.empty() ) - { - w2m = ICONV_T_INVALID; - } - else - { - w2m = iconv_open(name, ms_wcCharsetName.ToAscii()); - if ( w2m == ICONV_T_INVALID ) - { - wxLogTrace(TRACE_STRCONV, - wxT("\"%s\" -> \"%s\" works but not the converse!?"), - ms_wcCharsetName.c_str(), name); - } - } -} - -wxMBConv_iconv::~wxMBConv_iconv() -{ - free(const_cast(m_name)); - - if ( m2w != ICONV_T_INVALID ) - iconv_close(m2w); - if ( w2m != ICONV_T_INVALID ) - iconv_close(w2m); -} - -size_t -wxMBConv_iconv::ToWChar(wchar_t *dst, size_t dstLen, - const char *src, size_t srcLen) const -{ - if ( srcLen == wxNO_LEN ) - { - // find the string length: notice that must be done differently for - // NUL-terminated strings and UTF-16/32 which are terminated with 2/4 - // consecutive NULs - const size_t nulLen = GetMBNulLen(); - switch ( nulLen ) - { - default: - return wxCONV_FAILED; - - case 1: - srcLen = strlen(src); // arguably more optimized than our version - break; - - case 2: - case 4: - // for UTF-16/32 not only we need to have 2/4 consecutive NULs - // but they also have to start at character boundary and not - // span two adjacent characters - const char *p; - for ( p = src; NotAllNULs(p, nulLen); p += nulLen ) - ; - srcLen = p - src; - break; - } - - // when we're determining the length of the string ourselves we count - // the terminating NUL(s) as part of it and always NUL-terminate the - // output - srcLen += nulLen; - } - - // we express length in the number of (wide) characters but iconv always - // counts buffer sizes it in bytes - dstLen *= SIZEOF_WCHAR_T; - -#if wxUSE_THREADS - // NB: iconv() is MT-safe, but each thread must use its own iconv_t handle. - // Unfortunately there are a couple of global wxCSConv objects such as - // wxConvLocal that are used all over wx code, so we have to make sure - // the handle is used by at most one thread at the time. Otherwise - // only a few wx classes would be safe to use from non-main threads - // as MB<->WC conversion would fail "randomly". - wxMutexLocker lock(wxConstCast(this, wxMBConv_iconv)->m_iconvMutex); -#endif // wxUSE_THREADS - - size_t res, cres; - const char *pszPtr = src; - - if ( dst ) - { - char* bufPtr = (char*)dst; - - // have destination buffer, convert there - size_t dstLenOrig = dstLen; - cres = iconv(m2w, - ICONV_CHAR_CAST(&pszPtr), &srcLen, - &bufPtr, &dstLen); - - // convert the number of bytes converted as returned by iconv to the - // number of (wide) characters converted that we need - res = (dstLenOrig - dstLen) / SIZEOF_WCHAR_T; - - if (ms_wcNeedsSwap) - { - // convert to native endianness - for ( unsigned i = 0; i < res; i++ ) - dst[i] = WC_BSWAP(dst[i]); - } - } - else // no destination buffer - { - // convert using temp buffer to calculate the size of the buffer needed - wchar_t tbuf[256]; - res = 0; - - do - { - char* bufPtr = (char*)tbuf; - dstLen = 8 * SIZEOF_WCHAR_T; - - cres = iconv(m2w, - ICONV_CHAR_CAST(&pszPtr), &srcLen, - &bufPtr, &dstLen ); - - res += 8 - (dstLen / SIZEOF_WCHAR_T); - } - while ((cres == (size_t)-1) && (errno == E2BIG)); - } - - if (ICONV_FAILED(cres, srcLen)) - { - //VS: it is ok if iconv fails, hence trace only - wxLogTrace(TRACE_STRCONV, wxT("iconv failed: %s"), wxSysErrorMsg(wxSysErrorCode())); - return wxCONV_FAILED; - } - - return res; -} - -size_t wxMBConv_iconv::FromWChar(char *dst, size_t dstLen, - const wchar_t *src, size_t srcLen) const -{ -#if wxUSE_THREADS - // NB: explained in MB2WC - wxMutexLocker lock(wxConstCast(this, wxMBConv_iconv)->m_iconvMutex); -#endif - - if ( srcLen == wxNO_LEN ) - srcLen = wxWcslen(src) + 1; - - size_t inbuflen = srcLen * SIZEOF_WCHAR_T; - size_t outbuflen = dstLen; - size_t res, cres; - - wchar_t *tmpbuf = 0; - - if (ms_wcNeedsSwap) - { - // need to copy to temp buffer to switch endianness - // (doing WC_BSWAP twice on the original buffer won't work, as it - // could be in read-only memory, or be accessed in some other thread) - tmpbuf = (wchar_t *)malloc(inbuflen); - for ( size_t i = 0; i < srcLen; i++ ) - tmpbuf[i] = WC_BSWAP(src[i]); - - src = tmpbuf; - } - - char* inbuf = (char*)src; - if ( dst ) - { - // have destination buffer, convert there - cres = iconv(w2m, ICONV_CHAR_CAST(&inbuf), &inbuflen, &dst, &outbuflen); - - res = dstLen - outbuflen; - } - else // no destination buffer - { - // convert using temp buffer to calculate the size of the buffer needed - char tbuf[256]; - res = 0; - do - { - dst = tbuf; - outbuflen = WXSIZEOF(tbuf); - - cres = iconv(w2m, ICONV_CHAR_CAST(&inbuf), &inbuflen, &dst, &outbuflen); - - res += WXSIZEOF(tbuf) - outbuflen; - } - while ((cres == (size_t)-1) && (errno == E2BIG)); - } - - if (ms_wcNeedsSwap) - { - free(tmpbuf); - } - - if (ICONV_FAILED(cres, inbuflen)) - { - wxLogTrace(TRACE_STRCONV, wxT("iconv failed: %s"), wxSysErrorMsg(wxSysErrorCode())); - return wxCONV_FAILED; - } - - return res; -} - -size_t wxMBConv_iconv::GetMBNulLen() const -{ - if ( m_minMBCharWidth == 0 ) - { - wxMBConv_iconv * const self = wxConstCast(this, wxMBConv_iconv); - -#if wxUSE_THREADS - // NB: explained in MB2WC - wxMutexLocker lock(self->m_iconvMutex); -#endif - - const wchar_t *wnul = L""; - char buf[8]; // should be enough for NUL in any encoding - size_t inLen = sizeof(wchar_t), - outLen = WXSIZEOF(buf); - char *inBuff = (char *)wnul; - char *outBuff = buf; - if ( iconv(w2m, ICONV_CHAR_CAST(&inBuff), &inLen, &outBuff, &outLen) == (size_t)-1 ) - { - self->m_minMBCharWidth = (size_t)-1; - } - else // ok - { - self->m_minMBCharWidth = outBuff - buf; - } - } - - return m_minMBCharWidth; -} - -#if wxUSE_UNICODE_UTF8 -bool wxMBConv_iconv::IsUTF8() const -{ - return wxStricmp(m_name, "UTF-8") == 0 || - wxStricmp(m_name, "UTF8") == 0; -} -#endif - -#endif // HAVE_ICONV - - -// ============================================================================ -// Win32 conversion classes -// ============================================================================ - -#ifdef wxHAVE_WIN32_MB2WC - -// from utils.cpp -#if wxUSE_FONTMAP -extern WXDLLIMPEXP_BASE long wxCharsetToCodepage(const char *charset); -extern WXDLLIMPEXP_BASE long wxEncodingToCodepage(wxFontEncoding encoding); -#endif - -class wxMBConv_win32 : public wxMBConv -{ -public: - wxMBConv_win32() - { - m_CodePage = CP_ACP; - m_minMBCharWidth = 0; - } - - wxMBConv_win32(const wxMBConv_win32& conv) - : wxMBConv() - { - m_CodePage = conv.m_CodePage; - m_minMBCharWidth = conv.m_minMBCharWidth; - } - -#if wxUSE_FONTMAP - wxMBConv_win32(const char* name) - { - m_CodePage = wxCharsetToCodepage(name); - m_minMBCharWidth = 0; - } - - wxMBConv_win32(wxFontEncoding encoding) - { - m_CodePage = wxEncodingToCodepage(encoding); - m_minMBCharWidth = 0; - } -#endif // wxUSE_FONTMAP - - virtual size_t MB2WC(wchar_t *buf, const char *psz, size_t n) const - { - // note that we have to use MB_ERR_INVALID_CHARS flag as it without it - // the behaviour is not compatible with the Unix version (using iconv) - // and break the library itself, e.g. wxTextInputStream::NextChar() - // wouldn't work if reading an incomplete MB char didn't result in an - // error - // - // Moreover, MB_ERR_INVALID_CHARS is not supported for UTF-8 under XP - // and for UTF-7 under any Windows version, so we always use our own - // conversions in this case. - if ( m_CodePage == CP_UTF8 ) - { - return wxMBConvUTF8().MB2WC(buf, psz, n); - } - - if ( m_CodePage == CP_UTF7 ) - { - return wxMBConvUTF7().MB2WC(buf, psz, n); - } - - const size_t len = ::MultiByteToWideChar - ( - m_CodePage, // code page - MB_ERR_INVALID_CHARS, // flags: fall on error - psz, // input string - -1, // its length (NUL-terminated) - buf, // output string - buf ? n : 0 // size of output buffer - ); - if ( !len ) - return wxCONV_FAILED; - - // note that it returns count of written chars for buf != NULL and size - // of the needed buffer for buf == NULL so in either case the length of - // the string (which never includes the terminating NUL) is one less - return len - 1; - } - - virtual size_t WC2MB(char *buf, const wchar_t *pwz, size_t n) const - { - /* - We need to WC_NO_BEST_FIT_CHARS to prevent WideCharToMultiByte() - from replacing characters unrepresentable in the target code page - with bad quality approximations such as turning "1/2" symbol - (U+00BD) into "1" for the code pages which don't have the fraction - symbol. - - Unfortunately this flag can't be used with CJK encodings nor - UTF-7/8 and so if the code page is one of those, we need to resort - to a round trip to verify that no replacements have been done. - */ - BOOL usedDef wxDUMMY_INITIALIZE(false); - BOOL *pUsedDef; - int flags; - if ( m_CodePage < 50000 ) - { - // it's our lucky day - flags = WC_NO_BEST_FIT_CHARS; - pUsedDef = &usedDef; - } - else // old system or unsupported encoding - { - flags = 0; - pUsedDef = NULL; - } - - const size_t len = ::WideCharToMultiByte - ( - m_CodePage, // code page - flags, // either none or no best fit - pwz, // input string - -1, // it is (wide) NUL-terminated - buf, // output buffer - buf ? n : 0, // and its size - NULL, // default "replacement" char - pUsedDef // [out] was it used? - ); - - if ( !len ) - { - // function totally failed - return wxCONV_FAILED; - } - - // we did something, check if we really succeeded - if ( flags ) - { - // check if the conversion failed, i.e. if any replacements - // were done - if ( usedDef ) - return wxCONV_FAILED; - } - else // we must resort to double tripping... - { - // first we need to ensure that we really have the MB data: this is - // not the case if we're called with NULL buffer, in which case we - // need to do the conversion yet again - wxCharBuffer bufDef; - if ( !buf ) - { - bufDef = wxCharBuffer(len); - buf = bufDef.data(); - if ( !::WideCharToMultiByte(m_CodePage, flags, pwz, -1, - buf, len, NULL, NULL) ) - return wxCONV_FAILED; - } - - if ( !n ) - n = wcslen(pwz); - wxWCharBuffer wcBuf(n); - if ( MB2WC(wcBuf.data(), buf, n + 1) == wxCONV_FAILED || - wcscmp(wcBuf, pwz) != 0 ) - { - // we didn't obtain the same thing we started from, hence - // the conversion was lossy and we consider that it failed - return wxCONV_FAILED; - } - } - - // see the comment above for the reason of "len - 1" - return len - 1; - } - - virtual size_t GetMBNulLen() const - { - if ( m_minMBCharWidth == 0 ) - { - int len = ::WideCharToMultiByte - ( - m_CodePage, // code page - 0, // no flags - L"", // input string - 1, // translate just the NUL - NULL, // output buffer - 0, // and its size - NULL, // no replacement char - NULL // [out] don't care if it was used - ); - - wxMBConv_win32 * const self = wxConstCast(this, wxMBConv_win32); - switch ( len ) - { - default: - wxLogDebug(wxT("Unexpected NUL length %d"), len); - self->m_minMBCharWidth = (size_t)-1; - break; - - case 0: - self->m_minMBCharWidth = (size_t)-1; - break; - - case 1: - case 2: - case 4: - self->m_minMBCharWidth = len; - break; - } - } - - return m_minMBCharWidth; - } - - virtual wxMBConv *Clone() const { return new wxMBConv_win32(*this); } - - bool IsOk() const { return m_CodePage != -1; } - -private: - // the code page we're working with - long m_CodePage; - - // cached result of GetMBNulLen(), set to 0 initially meaning - // "unknown" - size_t m_minMBCharWidth; -}; - -#endif // wxHAVE_WIN32_MB2WC - - -// ============================================================================ -// wxEncodingConverter based conversion classes -// ============================================================================ - -#if wxUSE_FONTMAP - -class wxMBConv_wxwin : public wxMBConv -{ -private: - void Init() - { - // Refuse to use broken wxEncodingConverter code for Mac-specific encodings. - // The wxMBConv_cf class does a better job. - m_ok = (m_enc < wxFONTENCODING_MACMIN || m_enc > wxFONTENCODING_MACMAX) && - m2w.Init(m_enc, wxFONTENCODING_UNICODE) && - w2m.Init(wxFONTENCODING_UNICODE, m_enc); - } - -public: - // temporarily just use wxEncodingConverter stuff, - // so that it works while a better implementation is built - wxMBConv_wxwin(const char* name) - { - if (name) - m_enc = wxFontMapperBase::Get()->CharsetToEncoding(name, false); - else - m_enc = wxFONTENCODING_SYSTEM; - - Init(); - } - - wxMBConv_wxwin(wxFontEncoding enc) - { - m_enc = enc; - - Init(); - } - - size_t MB2WC(wchar_t *buf, const char *psz, size_t WXUNUSED(n)) const wxOVERRIDE - { - size_t inbuf = strlen(psz); - if (buf) - { - if (!m2w.Convert(psz, buf)) - return wxCONV_FAILED; - } - return inbuf; - } - - size_t WC2MB(char *buf, const wchar_t *psz, size_t WXUNUSED(n)) const wxOVERRIDE - { - const size_t inbuf = wxWcslen(psz); - if (buf) - { - if (!w2m.Convert(psz, buf)) - return wxCONV_FAILED; - } - - return inbuf; - } - - virtual size_t GetMBNulLen() const wxOVERRIDE - { - switch ( m_enc ) - { - case wxFONTENCODING_UTF16BE: - case wxFONTENCODING_UTF16LE: - return 2; - - case wxFONTENCODING_UTF32BE: - case wxFONTENCODING_UTF32LE: - return 4; - - default: - return 1; - } - } - - virtual wxMBConv *Clone() const wxOVERRIDE { return new wxMBConv_wxwin(m_enc); } - - bool IsOk() const { return m_ok; } - -public: - wxFontEncoding m_enc; - wxEncodingConverter m2w, w2m; - -private: - // were we initialized successfully? - bool m_ok; - - wxDECLARE_NO_COPY_CLASS(wxMBConv_wxwin); -}; - -// make the constructors available for unit testing -WXDLLIMPEXP_BASE wxMBConv* new_wxMBConv_wxwin( const char* name ) -{ - wxMBConv_wxwin* result = new wxMBConv_wxwin( name ); - if ( !result->IsOk() ) - { - delete result; - return 0; - } - - return result; -} - -#endif // wxUSE_FONTMAP - -// ============================================================================ -// wxCSConv implementation -// ============================================================================ - -void wxCSConv::Init() -{ - m_name = NULL; - m_convReal = NULL; -} - -void wxCSConv::SetEncoding(wxFontEncoding encoding) -{ - switch ( encoding ) - { - case wxFONTENCODING_MAX: - case wxFONTENCODING_SYSTEM: - if ( m_name ) - { - // It's ok to not have encoding value if we have a name for it. - m_encoding = wxFONTENCODING_SYSTEM; - } - else // No name neither. - { - // Fall back to the system default encoding in this case (not - // sure how much sense does this make but this is how the old - // code used to behave). -#if wxUSE_INTL - m_encoding = wxLocale::GetSystemEncoding(); - if ( m_encoding == wxFONTENCODING_SYSTEM ) -#endif // wxUSE_INTL - m_encoding = wxFONTENCODING_ISO8859_1; - } - break; - - case wxFONTENCODING_DEFAULT: - // wxFONTENCODING_DEFAULT is same as US-ASCII in this context - m_encoding = wxFONTENCODING_ISO8859_1; - break; - - default: - // Just use the provided encoding. - m_encoding = encoding; - } -} - -wxCSConv::wxCSConv(const wxString& charset) -{ - Init(); - - if ( !charset.empty() ) - { - SetName(charset.ToAscii()); - } - -#if wxUSE_FONTMAP - SetEncoding(wxFontMapperBase::GetEncodingFromName(charset)); -#else - SetEncoding(wxFONTENCODING_SYSTEM); -#endif - - m_convReal = DoCreate(); -} - -wxCSConv::wxCSConv(wxFontEncoding encoding) -{ - if ( encoding == wxFONTENCODING_MAX || encoding == wxFONTENCODING_DEFAULT ) - { - wxFAIL_MSG( wxT("invalid encoding value in wxCSConv ctor") ); - - encoding = wxFONTENCODING_SYSTEM; - } - - Init(); - - SetEncoding(encoding); - - m_convReal = DoCreate(); -} - -wxCSConv::~wxCSConv() -{ - Clear(); -} - -wxCSConv::wxCSConv(const wxCSConv& conv) - : wxMBConv() -{ - Init(); - - SetName(conv.m_name); - SetEncoding(conv.m_encoding); - - m_convReal = DoCreate(); -} - -wxCSConv& wxCSConv::operator=(const wxCSConv& conv) -{ - Clear(); - - SetName(conv.m_name); - SetEncoding(conv.m_encoding); - - m_convReal = DoCreate(); - - return *this; -} - -void wxCSConv::Clear() -{ - free(m_name); - m_name = NULL; - - wxDELETE(m_convReal); -} - -void wxCSConv::SetName(const char *charset) -{ - if ( charset ) - m_name = wxStrdup(charset); -} - -#if wxUSE_FONTMAP - -WX_DECLARE_HASH_MAP( wxFontEncoding, wxString, wxIntegerHash, wxIntegerEqual, - wxEncodingNameCache ); - -static wxEncodingNameCache gs_nameCache; -#endif - -wxMBConv *wxCSConv::DoCreate() const -{ -#if wxUSE_FONTMAP - wxLogTrace(TRACE_STRCONV, - wxT("creating conversion for %s"), - (m_name ? m_name - : (const char*)wxFontMapperBase::GetEncodingName(m_encoding).mb_str())); -#endif // wxUSE_FONTMAP - - // check for the special case of ASCII or ISO8859-1 charset: as we have - // special knowledge of it anyhow, we don't need to create a special - // conversion object - if ( m_encoding == wxFONTENCODING_ISO8859_1 ) - { - // don't convert at all - return NULL; - } - - // we trust OS to do conversion better than we can so try external - // conversion methods first - // - // the full order is: - // 1. OS conversion (iconv() under Unix or Win32 API) - // 2. hard coded conversions for UTF - // 3. wxEncodingConverter as fall back - - // step (1) -#ifdef HAVE_ICONV -#if !wxUSE_FONTMAP - if ( m_name ) -#endif // !wxUSE_FONTMAP - { -#if wxUSE_FONTMAP - wxFontEncoding encoding(m_encoding); -#endif - - if ( m_name ) - { - wxMBConv_iconv *conv = new wxMBConv_iconv(m_name); - if ( conv->IsOk() ) - return conv; - - delete conv; - -#if wxUSE_FONTMAP - encoding = - wxFontMapperBase::Get()->CharsetToEncoding(m_name, false); -#endif // wxUSE_FONTMAP - } -#if wxUSE_FONTMAP - { - const wxEncodingNameCache::iterator it = gs_nameCache.find(encoding); - if ( it != gs_nameCache.end() ) - { - if ( it->second.empty() ) - return NULL; - - wxMBConv_iconv *conv = new wxMBConv_iconv(it->second.ToAscii()); - if ( conv->IsOk() ) - return conv; - - delete conv; - } - - const wxChar* const* names = wxFontMapperBase::GetAllEncodingNames(encoding); - // CS : in case this does not return valid names (eg for MacRoman) - // encoding got a 'failure' entry in the cache all the same, - // although it just has to be created using a different method, so - // only store failed iconv creation attempts (or perhaps we - // shoulnd't do this at all ?) - if ( names[0] != NULL ) - { - for ( ; *names; ++names ) - { - // FIXME-UTF8: wxFontMapperBase::GetAllEncodingNames() - // will need changes that will obsolete this - wxString name(*names); - wxMBConv_iconv *conv = new wxMBConv_iconv(name.ToAscii()); - if ( conv->IsOk() ) - { - gs_nameCache[encoding] = *names; - return conv; - } - - delete conv; - } - - gs_nameCache[encoding] = wxT(""); // cache the failure - } - } -#endif // wxUSE_FONTMAP - } -#endif // HAVE_ICONV - -#ifdef wxHAVE_WIN32_MB2WC - { -#if wxUSE_FONTMAP - wxMBConv_win32 *conv = m_name ? new wxMBConv_win32(m_name) - : new wxMBConv_win32(m_encoding); - if ( conv->IsOk() ) - return conv; - - delete conv; -#else - return NULL; -#endif - } -#endif // wxHAVE_WIN32_MB2WC - -#ifdef __DARWIN__ - { - // leave UTF16 and UTF32 to the built-ins of wx - if ( m_name || ( m_encoding < wxFONTENCODING_UTF16BE || - ( m_encoding >= wxFONTENCODING_MACMIN && m_encoding <= wxFONTENCODING_MACMAX ) ) ) - { -#if wxUSE_FONTMAP - wxMBConv_cf *conv = m_name ? new wxMBConv_cf(m_name) - : new wxMBConv_cf(m_encoding); -#else - wxMBConv_cf *conv = new wxMBConv_cf(m_encoding); -#endif - - if ( conv->IsOk() ) - return conv; - - delete conv; - } - } -#endif // __DARWIN__ - - // step (2) - wxFontEncoding enc = m_encoding; -#if wxUSE_FONTMAP - if ( enc == wxFONTENCODING_SYSTEM && m_name ) - { - // use "false" to suppress interactive dialogs -- we can be called from - // anywhere and popping up a dialog from here is the last thing we want to - // do - enc = wxFontMapperBase::Get()->CharsetToEncoding(m_name, false); - } -#endif // wxUSE_FONTMAP - - switch ( enc ) - { - case wxFONTENCODING_UTF7: - return new wxMBConvUTF7; - - case wxFONTENCODING_UTF8: - return new wxMBConvUTF8; - - case wxFONTENCODING_UTF16BE: - return new wxMBConvUTF16BE; - - case wxFONTENCODING_UTF16LE: - return new wxMBConvUTF16LE; - - case wxFONTENCODING_UTF32BE: - return new wxMBConvUTF32BE; - - case wxFONTENCODING_UTF32LE: - return new wxMBConvUTF32LE; - - default: - // nothing to do but put here to suppress gcc warnings - break; - } - - // step (3) -#if wxUSE_FONTMAP - { - wxMBConv_wxwin *conv = m_name ? new wxMBConv_wxwin(m_name) - : new wxMBConv_wxwin(m_encoding); - if ( conv->IsOk() ) - return conv; - - delete conv; - } - - wxLogTrace(TRACE_STRCONV, - wxT("encoding \"%s\" is not supported by this system"), - (m_name ? wxString(m_name) - : wxFontMapperBase::GetEncodingName(m_encoding))); -#endif // wxUSE_FONTMAP - - return NULL; -} - -bool wxCSConv::IsOk() const -{ - // special case: no convReal created for wxFONTENCODING_ISO8859_1 - if ( m_encoding == wxFONTENCODING_ISO8859_1 ) - return true; // always ok as we do it ourselves - - // m_convReal->IsOk() is called at its own creation, so we know it must - // be ok if m_convReal is non-NULL - return m_convReal != NULL; -} - -size_t wxCSConv::ToWChar(wchar_t *dst, size_t dstLen, - const char *src, size_t srcLen) const -{ - if (m_convReal) - return m_convReal->ToWChar(dst, dstLen, src, srcLen); - - // latin-1 (direct) - if ( srcLen == wxNO_LEN ) - srcLen = strlen(src) + 1; // take trailing NUL too - - if ( dst ) - { - if ( dstLen < srcLen ) - return wxCONV_FAILED; - - for ( size_t n = 0; n < srcLen; n++ ) - dst[n] = (unsigned char)(src[n]); - } - - return srcLen; -} - -size_t wxCSConv::FromWChar(char *dst, size_t dstLen, - const wchar_t *src, size_t srcLen) const -{ - if (m_convReal) - return m_convReal->FromWChar(dst, dstLen, src, srcLen); - - // latin-1 (direct) - if ( srcLen == wxNO_LEN ) - srcLen = wxWcslen(src) + 1; - - if ( dst ) - { - if ( dstLen < srcLen ) - return wxCONV_FAILED; - - for ( size_t n = 0; n < srcLen; n++ ) - { - if ( src[n] > 0xFF ) - return wxCONV_FAILED; - - dst[n] = (char)src[n]; - } - - } - else // still need to check the input validity - { - for ( size_t n = 0; n < srcLen; n++ ) - { - if ( src[n] > 0xFF ) - return wxCONV_FAILED; - } - } - - return srcLen; -} - -size_t wxCSConv::GetMBNulLen() const -{ - if ( m_convReal ) - return m_convReal->GetMBNulLen(); - - // otherwise, we are ISO-8859-1 - return 1; -} - -#if wxUSE_UNICODE_UTF8 -bool wxCSConv::IsUTF8() const -{ - if ( m_convReal ) - return m_convReal->IsUTF8(); - - // otherwise, we are ISO-8859-1 - return false; -} -#endif - - -// ============================================================================ -// wxWhateverWorksConv -// ============================================================================ - -size_t -wxWhateverWorksConv::ToWChar(wchar_t *dst, size_t dstLen, - const char *src, size_t srcLen) const -{ - size_t rc = wxConvUTF8.ToWChar(dst, dstLen, src, srcLen); - if ( rc != wxCONV_FAILED ) - return rc; - - rc = wxConvLibc.ToWChar(dst, dstLen, src, srcLen); - if ( rc != wxCONV_FAILED ) - return rc; - - rc = wxConvISO8859_1.ToWChar(dst, dstLen, src, srcLen); - - return rc; -} - -size_t -wxWhateverWorksConv::FromWChar(char *dst, size_t dstLen, - const wchar_t *src, size_t srcLen) const -{ - size_t rc = wxConvLibc.FromWChar(dst, dstLen, src, srcLen); - if ( rc != wxCONV_FAILED ) - return rc; - - rc = wxConvUTF8.FromWChar(dst, dstLen, src, srcLen); - - return rc; -} - -// ---------------------------------------------------------------------------- -// globals -// ---------------------------------------------------------------------------- - -// NB: The reason why we create converted objects in this convoluted way, -// using a factory function instead of global variable, is that they -// may be used at static initialization time (some of them are used by -// wxString ctors and there may be a global wxString object). In other -// words, possibly _before_ the converter global object would be -// initialized. - -#undef wxConvLibc -#undef wxConvUTF8 -#undef wxConvUTF7 -#undef wxConvWhateverWorks -#undef wxConvLocal -#undef wxConvISO8859_1 - -#define WX_DEFINE_GLOBAL_CONV2(klass, impl_klass, name, ctor_args) \ - WXDLLIMPEXP_DATA_BASE(klass*) name##Ptr = NULL; \ - WXDLLIMPEXP_BASE klass* wxGet_##name##Ptr() \ - { \ - static impl_klass name##Obj ctor_args; \ - return &name##Obj; \ - } \ - /* this ensures that all global converter objects are created */ \ - /* by the time static initialization is done, i.e. before any */ \ - /* thread is launched: */ \ - static klass* gs_##name##instance = wxGet_##name##Ptr() - -#define WX_DEFINE_GLOBAL_CONV(klass, name, ctor_args) \ - WX_DEFINE_GLOBAL_CONV2(klass, klass, name, ctor_args) - -#ifdef __INTELC__ - // disable warning "variable 'xxx' was declared but never referenced" - #pragma warning(disable: 177) -#endif // Intel C++ - -#ifdef __WINDOWS__ - WX_DEFINE_GLOBAL_CONV2(wxMBConv, wxMBConv_win32, wxConvLibc, wxEMPTY_PARAMETER_VALUE); -#elif 0 // defined(__WXOSX__) - WX_DEFINE_GLOBAL_CONV2(wxMBConv, wxMBConv_cf, wxConvLibc, (wxFONTENCODING_UTF8)); -#else - WX_DEFINE_GLOBAL_CONV2(wxMBConv, wxMBConvLibc, wxConvLibc, wxEMPTY_PARAMETER_VALUE); -#endif - -// NB: we can't use wxEMPTY_PARAMETER_VALUE as final argument here because it's -// passed to WX_DEFINE_GLOBAL_CONV2 after a macro expansion and so still -// provokes an error message about "not enough macro parameters"; and we -// can't use "()" here as the name##Obj declaration would be parsed as a -// function declaration then, so use a semicolon and live with an extra -// empty statement (and hope that no compilers warns about this) -WX_DEFINE_GLOBAL_CONV(wxMBConvStrictUTF8, wxConvUTF8, ;); -WX_DEFINE_GLOBAL_CONV(wxMBConvUTF7, wxConvUTF7, ;); -WX_DEFINE_GLOBAL_CONV(wxWhateverWorksConv, wxConvWhateverWorks, ;); - -WX_DEFINE_GLOBAL_CONV(wxCSConv, wxConvLocal, (wxFONTENCODING_SYSTEM)); -WX_DEFINE_GLOBAL_CONV(wxCSConv, wxConvISO8859_1, (wxFONTENCODING_ISO8859_1)); - -WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvCurrent = wxGet_wxConvLibcPtr(); -WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvUI = wxGet_wxConvLocalPtr(); - -#ifdef __DARWIN__ -// It is important to use this conversion object under Darwin as it ensures -// that Unicode strings are (re)composed correctly even though xnu kernel uses -// decomposed form internally (at least for the file names). -static wxMBConv_cf wxConvMacUTF8DObj(wxFONTENCODING_UTF8); -#endif - -WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvFileName = -#ifdef __DARWIN__ - &wxConvMacUTF8DObj; -#else // !__DARWIN__ - wxGet_wxConvWhateverWorksPtr(); -#endif // __DARWIN__/!__DARWIN__ diff --git a/Externals/wxWidgets3/src/common/stream.cpp b/Externals/wxWidgets3/src/common/stream.cpp deleted file mode 100644 index 97ba7588e7..0000000000 --- a/Externals/wxWidgets3/src/common/stream.cpp +++ /dev/null @@ -1,1624 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/stream.cpp -// Purpose: wxStream base classes -// Author: Guilhem Lavaux -// Modified by: VZ (23.11.00) to fix realloc()ing new[]ed memory, -// general code review -// Created: 11/07/98 -// Copyright: (c) Guilhem Lavaux -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_STREAMS - -#include "wx/stream.h" - -#ifndef WX_PRECOMP - #include "wx/log.h" -#endif - -#include -#include "wx/datstrm.h" -#include "wx/textfile.h" -#include "wx/scopeguard.h" - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -// the temporary buffer size used when copying from stream to stream -#define BUF_TEMP_SIZE 4096 - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxStreamBuffer -// ---------------------------------------------------------------------------- - -void wxStreamBuffer::SetError(wxStreamError err) -{ - if ( m_stream && m_stream->m_lasterror == wxSTREAM_NO_ERROR ) - m_stream->m_lasterror = err; -} - -void wxStreamBuffer::InitBuffer() -{ - m_buffer_start = - m_buffer_end = - m_buffer_pos = NULL; - - // if we are going to allocate the buffer, we should free it later as well - m_destroybuf = true; -} - -void wxStreamBuffer::Init() -{ - InitBuffer(); - - m_fixed = true; -} - -void wxStreamBuffer::InitWithStream(wxStreamBase& stream, BufMode mode) -{ - Init(); - - m_stream = &stream; - m_mode = mode; - - m_flushable = true; -} - -wxStreamBuffer::wxStreamBuffer(BufMode mode) -{ - Init(); - - m_stream = NULL; - m_mode = mode; - - m_flushable = false; -} - -wxStreamBuffer::wxStreamBuffer(const wxStreamBuffer& buffer) -{ - // doing this has big chances to lead to a crash when the source buffer is - // destroyed (otherwise assume the caller knows what he does) - wxASSERT_MSG( !buffer.m_destroybuf, - wxT("it's a bad idea to copy this buffer") ); - - m_buffer_start = buffer.m_buffer_start; - m_buffer_end = buffer.m_buffer_end; - m_buffer_pos = buffer.m_buffer_pos; - m_fixed = buffer.m_fixed; - m_flushable = buffer.m_flushable; - m_stream = buffer.m_stream; - m_mode = buffer.m_mode; - m_destroybuf = false; -} - -void wxStreamBuffer::FreeBuffer() -{ - if ( m_destroybuf ) - { - free(m_buffer_start); - m_buffer_start = NULL; - } -} - -wxStreamBuffer::~wxStreamBuffer() -{ - FreeBuffer(); -} - -wxInputStream *wxStreamBuffer::GetInputStream() const -{ - return m_mode == write ? NULL : (wxInputStream *)m_stream; -} - -wxOutputStream *wxStreamBuffer::GetOutputStream() const -{ - return m_mode == read ? NULL : (wxOutputStream *)m_stream; -} - -void wxStreamBuffer::SetBufferIO(void *buffer_start, - void *buffer_end, - bool takeOwnership) -{ - SetBufferIO(buffer_start, (char *)buffer_end - (char *)buffer_start, - takeOwnership); -} - -void wxStreamBuffer::SetBufferIO(void *start, - size_t len, - bool takeOwnership) -{ - // start by freeing the old buffer - FreeBuffer(); - - m_buffer_start = (char *)start; - m_buffer_end = m_buffer_start + len; - - // if we own it, we free it - m_destroybuf = takeOwnership; - - ResetBuffer(); -} - -void wxStreamBuffer::SetBufferIO(size_t bufsize) -{ - if ( bufsize ) - { - // this will free the old buffer and allocate the new one - SetBufferIO(malloc(bufsize), bufsize, true /* take ownership */); - } - else // no buffer size => no buffer - { - // still free the old one - FreeBuffer(); - InitBuffer(); - } -} - -void wxStreamBuffer::ResetBuffer() -{ - if ( m_stream ) - { - m_stream->Reset(); - m_stream->m_lastcount = 0; - } - - m_buffer_pos = m_mode == read && m_flushable - ? m_buffer_end - : m_buffer_start; -} - -void wxStreamBuffer::Truncate() -{ - size_t new_size = m_buffer_pos - m_buffer_start; - if ( m_buffer_pos == m_buffer_end ) - return; - - if ( !new_size ) - { - FreeBuffer(); - InitBuffer(); - return; - } - - char *new_start = (char *)realloc(m_buffer_start, new_size); - wxCHECK_RET( new_size, wxT("shrinking buffer shouldn't fail") ); - - m_buffer_start = new_start; - m_buffer_end = m_buffer_start + new_size; - m_buffer_pos = m_buffer_end; -} - -// fill the buffer with as much data as possible (only for read buffers) -bool wxStreamBuffer::FillBuffer() -{ - wxInputStream *inStream = GetInputStream(); - - // It's legal to have no stream, so we don't complain about it just return false - if ( !inStream ) - return false; - - size_t count = inStream->OnSysRead(GetBufferStart(), GetBufferSize()); - if ( !count ) - return false; - - m_buffer_end = m_buffer_start + count; - m_buffer_pos = m_buffer_start; - - return true; -} - -// write the buffer contents to the stream (only for write buffers) -bool wxStreamBuffer::FlushBuffer() -{ - wxCHECK_MSG( m_flushable, false, wxT("can't flush this buffer") ); - - // FIXME: what is this check for? (VZ) - if ( m_buffer_pos == m_buffer_start ) - return false; - - wxOutputStream *outStream = GetOutputStream(); - - wxCHECK_MSG( outStream, false, wxT("should have a stream in wxStreamBuffer") ); - - size_t current = m_buffer_pos - m_buffer_start; - size_t count = outStream->OnSysWrite(m_buffer_start, current); - if ( count != current ) - return false; - - m_buffer_pos = m_buffer_start; - - return true; -} - -size_t wxStreamBuffer::GetDataLeft() -{ - /* Why is this done? RR. */ - if ( m_buffer_pos == m_buffer_end && m_flushable) - FillBuffer(); - - return GetBytesLeft(); -} - -// copy up to size bytes from our buffer into the provided one -void wxStreamBuffer::GetFromBuffer(void *buffer, size_t size) -{ - // don't get more bytes than left in the buffer - size_t left = GetBytesLeft(); - - if ( size > left ) - size = left; - - memcpy(buffer, m_buffer_pos, size); - m_buffer_pos += size; -} - -// copy the contents of the provided buffer into this one -void wxStreamBuffer::PutToBuffer(const void *buffer, size_t size) -{ - size_t left = GetBytesLeft(); - - if ( size > left ) - { - if ( m_fixed ) - { - // we can't realloc the buffer, so just copy what we can - size = left; - } - else // !m_fixed - { - // realloc the buffer to have enough space for the data - if ( m_buffer_pos + size > m_buffer_end ) - { - size_t delta = m_buffer_pos - m_buffer_start; - size_t new_size = delta + size; - - char *startOld = m_buffer_start; - m_buffer_start = (char *)realloc(m_buffer_start, new_size); - if ( !m_buffer_start ) - { - // don't leak memory if realloc() failed - m_buffer_start = startOld; - - // what else can we do? - return; - } - - // adjust the pointers invalidated by realloc() - m_buffer_pos = m_buffer_start + delta; - m_buffer_end = m_buffer_start + new_size; - } // else: the buffer is big enough - } - } - - memcpy(m_buffer_pos, buffer, size); - m_buffer_pos += size; -} - -void wxStreamBuffer::PutChar(char c) -{ - wxOutputStream *outStream = GetOutputStream(); - - wxCHECK_RET( outStream, wxT("should have a stream in wxStreamBuffer") ); - - // if we don't have buffer at all, just forward this call to the stream, - if ( !HasBuffer() ) - { - outStream->OnSysWrite(&c, sizeof(c)); - } - else - { - // otherwise check we have enough space left - if ( !GetDataLeft() && !FlushBuffer() ) - { - // we don't - SetError(wxSTREAM_WRITE_ERROR); - } - else - { - PutToBuffer(&c, sizeof(c)); - m_stream->m_lastcount = 1; - } - } -} - -char wxStreamBuffer::Peek() -{ - wxCHECK_MSG( m_stream && HasBuffer(), 0, - wxT("should have the stream and the buffer in wxStreamBuffer") ); - - if ( !GetDataLeft() ) - { - SetError(wxSTREAM_READ_ERROR); - return 0; - } - - char c; - GetFromBuffer(&c, sizeof(c)); - m_buffer_pos--; - - return c; -} - -char wxStreamBuffer::GetChar() -{ - wxInputStream *inStream = GetInputStream(); - - wxCHECK_MSG( inStream, 0, wxT("should have a stream in wxStreamBuffer") ); - - char c; - if ( !HasBuffer() ) - { - inStream->OnSysRead(&c, sizeof(c)); - } - else - { - if ( !GetDataLeft() ) - { - SetError(wxSTREAM_READ_ERROR); - c = 0; - } - else - { - GetFromBuffer(&c, sizeof(c)); - m_stream->m_lastcount = 1; - } - } - - return c; -} - -size_t wxStreamBuffer::Read(void *buffer, size_t size) -{ - wxCHECK_MSG( buffer, 0, wxT("NULL data pointer") ); - - /* Clear buffer first */ - memset(buffer, 0x00, size); - - // lasterror is reset before all new IO calls - if ( m_stream ) - m_stream->Reset(); - - size_t readBytes; - if ( !HasBuffer() ) - { - wxInputStream *inStream = GetInputStream(); - - wxCHECK_MSG( inStream, 0, wxT("should have a stream in wxStreamBuffer") ); - - readBytes = inStream->OnSysRead(buffer, size); - } - else // we have a buffer, use it - { - size_t orig_size = size; - - while ( size > 0 ) - { - size_t left = GetDataLeft(); - - // if the requested number of bytes if greater than the buffer - // size, read data in chunks - if ( size > left ) - { - GetFromBuffer(buffer, left); - size -= left; - buffer = (char *)buffer + left; - - if ( !FillBuffer() ) - { - SetError(wxSTREAM_EOF); - break; - } - } - else // otherwise just do it in one gulp - { - GetFromBuffer(buffer, size); - size = 0; - } - } - - readBytes = orig_size - size; - } - - if ( m_stream ) - m_stream->m_lastcount = readBytes; - - return readBytes; -} - -// this should really be called "Copy()" -size_t wxStreamBuffer::Read(wxStreamBuffer *dbuf) -{ - wxCHECK_MSG( m_mode != write, 0, wxT("can't read from this buffer") ); - - char buf[BUF_TEMP_SIZE]; - size_t nRead, - total = 0; - - do - { - nRead = Read(buf, WXSIZEOF(buf)); - if ( nRead ) - { - nRead = dbuf->Write(buf, nRead); - total += nRead; - } - } - while ( nRead ); - - return total; -} - -size_t wxStreamBuffer::Write(const void *buffer, size_t size) -{ - wxCHECK_MSG( buffer, 0, wxT("NULL data pointer") ); - - if (m_stream) - { - // lasterror is reset before all new IO calls - m_stream->Reset(); - } - - size_t ret; - - if ( !HasBuffer() && m_fixed ) - { - wxOutputStream *outStream = GetOutputStream(); - - wxCHECK_MSG( outStream, 0, wxT("should have a stream in wxStreamBuffer") ); - - // no buffer, just forward the call to the stream - ret = outStream->OnSysWrite(buffer, size); - } - else // we [may] have a buffer, use it - { - size_t orig_size = size; - - while ( size > 0 ) - { - size_t left = GetBytesLeft(); - - // if the buffer is too large to fit in the stream buffer, split - // it in smaller parts - // - // NB: If stream buffer isn't fixed (as for wxMemoryOutputStream), - // we always go to the second case. - // - // FIXME: fine, but if it fails we should (re)try writing it by - // chunks as this will (hopefully) always work (VZ) - - if ( size > left && m_fixed ) - { - PutToBuffer(buffer, left); - size -= left; - buffer = (char *)buffer + left; - - if ( !FlushBuffer() ) - { - SetError(wxSTREAM_WRITE_ERROR); - - break; - } - - m_buffer_pos = m_buffer_start; - } - else // we can do it in one gulp - { - PutToBuffer(buffer, size); - size = 0; - } - } - - ret = orig_size - size; - } - - if (m_stream) - { - // i am not entirely sure what we do this for - m_stream->m_lastcount = ret; - } - - return ret; -} - -size_t wxStreamBuffer::Write(wxStreamBuffer *sbuf) -{ - wxCHECK_MSG( m_mode != read, 0, wxT("can't write to this buffer") ); - wxCHECK_MSG( sbuf->m_mode != write, 0, wxT("can't read from that buffer") ); - - char buf[BUF_TEMP_SIZE]; - size_t nWrite, - total = 0; - - do - { - size_t nRead = sbuf->Read(buf, WXSIZEOF(buf)); - if ( nRead ) - { - nWrite = Write(buf, nRead); - if ( nWrite < nRead ) - { - // put back data we couldn't copy - wxInputStream *in_stream = (wxInputStream *)sbuf->GetStream(); - - in_stream->Ungetch(buf + nWrite, nRead - nWrite); - } - - total += nWrite; - } - else - { - nWrite = 0; - } - } - while ( nWrite == WXSIZEOF(buf) ); - - return total; -} - -wxFileOffset wxStreamBuffer::Seek(wxFileOffset pos, wxSeekMode mode) -{ - wxFileOffset ret_off, diff; - - wxFileOffset last_access = GetLastAccess(); - - if ( !m_flushable ) - { - switch (mode) - { - case wxFromStart: - diff = pos; - break; - - case wxFromCurrent: - diff = pos + GetIntPosition(); - break; - - case wxFromEnd: - diff = pos + last_access; - break; - - default: - wxFAIL_MSG( wxT("invalid seek mode") ); - - return wxInvalidOffset; - } - if (diff < 0 || diff > last_access) - return wxInvalidOffset; - size_t int_diff = wx_truncate_cast(size_t, diff); - wxCHECK_MSG( (wxFileOffset)int_diff == diff, wxInvalidOffset, wxT("huge file not supported") ); - SetIntPosition(int_diff); - return diff; - } - - switch ( mode ) - { - case wxFromStart: - // We'll try to compute an internal position later ... - ret_off = m_stream->OnSysSeek(pos, wxFromStart); - ResetBuffer(); - return ret_off; - - case wxFromCurrent: - diff = pos + GetIntPosition(); - - if ( (diff > last_access) || (diff < 0) ) - { - // We must take into account the fact that we have read - // something previously. - ret_off = m_stream->OnSysSeek(diff-last_access, wxFromCurrent); - ResetBuffer(); - return ret_off; - } - else - { - size_t int_diff = wx_truncate_cast(size_t, diff); - wxCHECK_MSG( (wxFileOffset)int_diff == diff, wxInvalidOffset, wxT("huge file not supported") ); - SetIntPosition(int_diff); - return diff; - } - - case wxFromEnd: - // Hard to compute: always seek to the requested position. - ret_off = m_stream->OnSysSeek(pos, wxFromEnd); - ResetBuffer(); - return ret_off; - } - - return wxInvalidOffset; -} - -wxFileOffset wxStreamBuffer::Tell() const -{ - wxFileOffset pos; - - // ask the stream for position if we have a real one - if ( m_stream ) - { - pos = m_stream->OnSysTell(); - if ( pos == wxInvalidOffset ) - return wxInvalidOffset; - } - else // no associated stream - { - pos = 0; - } - - pos += GetIntPosition(); - - if ( m_mode == read && m_flushable ) - pos -= GetLastAccess(); - - return pos; -} - -// ---------------------------------------------------------------------------- -// wxStreamBase -// ---------------------------------------------------------------------------- - -wxIMPLEMENT_ABSTRACT_CLASS(wxStreamBase, wxObject); - -wxStreamBase::wxStreamBase() -{ - m_lasterror = wxSTREAM_NO_ERROR; - m_lastcount = 0; -} - -wxStreamBase::~wxStreamBase() -{ -} - -size_t wxStreamBase::GetSize() const -{ - wxFileOffset length = GetLength(); - if ( length == (wxFileOffset)wxInvalidOffset ) - return 0; - - const size_t len = wx_truncate_cast(size_t, length); - wxASSERT_MSG( len == length + size_t(0), wxT("large files not supported") ); - - return len; -} - -wxFileOffset wxStreamBase::OnSysSeek(wxFileOffset WXUNUSED(seek), wxSeekMode WXUNUSED(mode)) -{ - return wxInvalidOffset; -} - -wxFileOffset wxStreamBase::OnSysTell() const -{ - return wxInvalidOffset; -} - -// ---------------------------------------------------------------------------- -// wxInputStream -// ---------------------------------------------------------------------------- - -wxIMPLEMENT_ABSTRACT_CLASS(wxInputStream, wxStreamBase); - -wxInputStream::wxInputStream() -{ - m_wback = NULL; - m_wbacksize = - m_wbackcur = 0; -} - -wxInputStream::~wxInputStream() -{ - free(m_wback); -} - -bool wxInputStream::CanRead() const -{ - // we don't know if there is anything to read or not and by default we - // prefer to be optimistic and try to read data unless we know for sure - // there is no more of it - return m_lasterror != wxSTREAM_EOF; -} - -bool wxInputStream::Eof() const -{ - // the only way the base class can know we're at EOF is when we'd already - // tried to read beyond it in which case last error is set accordingly - return GetLastError() == wxSTREAM_EOF; -} - -char *wxInputStream::AllocSpaceWBack(size_t needed_size) -{ - // get number of bytes left from previous wback buffer - size_t toget = m_wbacksize - m_wbackcur; - - // allocate a buffer large enough to hold prev + new data - char *temp_b = (char *)malloc(needed_size + toget); - - if (!temp_b) - return NULL; - - // copy previous data (and free old buffer) if needed - if (m_wback) - { - memmove(temp_b + needed_size, m_wback + m_wbackcur, toget); - free(m_wback); - } - - // done - m_wback = temp_b; - m_wbackcur = 0; - m_wbacksize = needed_size + toget; - - return m_wback; -} - -size_t wxInputStream::GetWBack(void *buf, size_t size) -{ - wxCHECK_MSG( buf, 0, wxT("NULL data pointer") ); - - /* Clear buffer first */ - memset(buf, 0x00, size); - - if (!m_wback) - return 0; - - // how many bytes do we have in the buffer? - size_t toget = m_wbacksize - m_wbackcur; - - if ( size < toget ) - { - // we won't read everything - toget = size; - } - - // copy the data from the cache - memcpy(buf, m_wback + m_wbackcur, toget); - - m_wbackcur += toget; - if ( m_wbackcur == m_wbacksize ) - { - // TODO: should we really free it here all the time? maybe keep it? - free(m_wback); - m_wback = NULL; - m_wbacksize = 0; - m_wbackcur = 0; - } - - // return the number of bytes copied - return toget; -} - -size_t wxInputStream::Ungetch(const void *buf, size_t bufsize) -{ - wxCHECK_MSG( buf, 0, wxT("NULL data pointer") ); - - if ( m_lasterror != wxSTREAM_NO_ERROR && m_lasterror != wxSTREAM_EOF ) - { - // can't operate on this stream until the error is cleared - return 0; - } - - char *ptrback = AllocSpaceWBack(bufsize); - if (!ptrback) - return 0; - - // Eof() shouldn't return true any longer - if ( m_lasterror == wxSTREAM_EOF ) - m_lasterror = wxSTREAM_NO_ERROR; - - memcpy(ptrback, buf, bufsize); - return bufsize; -} - -bool wxInputStream::Ungetch(char c) -{ - return Ungetch(&c, sizeof(c)) != 0; -} - -int wxInputStream::GetC() -{ - unsigned char c; - Read(&c, sizeof(c)); - return LastRead() ? c : wxEOF; -} - -wxInputStream& wxInputStream::Read(void *buf, size_t size) -{ - wxCHECK_MSG( buf, *this, wxT("NULL data pointer") ); - - char *p = (char *)buf; - m_lastcount = 0; - - size_t read = GetWBack(buf, size); - for ( ;; ) - { - size -= read; - m_lastcount += read; - p += read; - - if ( !size ) - { - // we read the requested amount of data - break; - } - - if ( p != buf && !CanRead() ) - { - // we have already read something and we would block in OnSysRead() - // now: don't do it but return immediately - break; - } - - read = OnSysRead(p, size); - if ( !read ) - { - // no more data available - break; - } - } - - return *this; -} - -char wxInputStream::Peek() -{ - char c; - Read(&c, sizeof(c)); - if (m_lasterror == wxSTREAM_NO_ERROR) - { - Ungetch(c); - return c; - } - - return 0; -} - -wxInputStream& wxInputStream::Read(wxOutputStream& stream_out) -{ - size_t lastcount = 0; - char buf[BUF_TEMP_SIZE]; - - for ( ;; ) - { - size_t bytes_read = Read(buf, WXSIZEOF(buf)).LastRead(); - if ( !bytes_read ) - break; - - if ( stream_out.Write(buf, bytes_read).LastWrite() != bytes_read ) - break; - - lastcount += bytes_read; - } - - m_lastcount = lastcount; - - return *this; -} - -bool wxInputStream::ReadAll(void *buffer_, size_t size) -{ - char* buffer = static_cast(buffer_); - - size_t totalCount = 0; - - for ( ;; ) - { - const size_t lastCount = Read(buffer, size).LastRead(); - - // There is no point in continuing looping if we can't read anything at - // all. - if ( !lastCount ) - break; - - totalCount += lastCount; - - // ... Or if an error occurred on the stream. - if ( !IsOk() ) - break; - - // Return successfully if we read exactly the requested number of - // bytes (normally the ">" case should never occur and so we could use - // "==" test, but be safe and avoid overflowing size even in case of - // bugs in LastRead()). - if ( lastCount >= size ) - { - size = 0; - break; - } - - // Advance the buffer before trying to read the rest of data. - size -= lastCount; - buffer += lastCount; - } - - m_lastcount = totalCount; - - return size == 0; -} - -wxFileOffset wxInputStream::SeekI(wxFileOffset pos, wxSeekMode mode) -{ - // RR: This code is duplicated in wxBufferedInputStream. This is - // not really a good design, but buffered stream are different - // from all others in that they handle two stream-related objects: - // the stream buffer and parent stream. - - // I don't know whether it should be put as well in wxFileInputStream::OnSysSeek - if (m_lasterror==wxSTREAM_EOF) - m_lasterror=wxSTREAM_NO_ERROR; - - // avoid unnecessary seek operations (optimization) - wxFileOffset currentPos = TellI(), size = GetLength(); - if ((mode == wxFromStart && currentPos == pos) || - (mode == wxFromCurrent && pos == 0) || - (mode == wxFromEnd && size != wxInvalidOffset && currentPos == size-pos)) - return currentPos; - - if (!IsSeekable() && mode == wxFromCurrent && pos > 0) - { - // rather than seeking, we can just read data and discard it; - // this allows to forward-seek also non-seekable streams! - char buf[BUF_TEMP_SIZE]; - size_t bytes_read; - - // read chunks of BUF_TEMP_SIZE bytes until we reach the new position - for ( ; pos >= BUF_TEMP_SIZE; pos -= bytes_read) - { - bytes_read = Read(buf, WXSIZEOF(buf)).LastRead(); - if ( m_lasterror != wxSTREAM_NO_ERROR ) - return wxInvalidOffset; - - wxASSERT(bytes_read == WXSIZEOF(buf)); - } - - // read the last 'pos' bytes - bytes_read = Read(buf, (size_t)pos).LastRead(); - if ( m_lasterror != wxSTREAM_NO_ERROR ) - return wxInvalidOffset; - - wxASSERT(bytes_read == (size_t)pos); - - // we should now have sought to the right position... - return TellI(); - } - - /* RR: A call to SeekI() will automatically invalidate any previous - call to Ungetch(), otherwise it would be possible to SeekI() to - one position, unread some bytes there, SeekI() to another position - and the data would be corrupted. - - GRG: Could add code here to try to navigate within the wback - buffer if possible, but is it really needed? It would only work - when seeking in wxFromCurrent mode, else it would invalidate - anyway... */ - - if (m_wback) - { - wxLogDebug( wxT("Seeking in stream which has data written back to it.") ); - - free(m_wback); - m_wback = NULL; - m_wbacksize = 0; - m_wbackcur = 0; - } - - return OnSysSeek(pos, mode); -} - -wxFileOffset wxInputStream::TellI() const -{ - wxFileOffset pos = OnSysTell(); - - if (pos != wxInvalidOffset) - pos -= (m_wbacksize - m_wbackcur); - - return pos; -} - - -// ---------------------------------------------------------------------------- -// wxOutputStream -// ---------------------------------------------------------------------------- - -wxIMPLEMENT_ABSTRACT_CLASS(wxOutputStream, wxStreamBase); - -wxOutputStream::wxOutputStream() -{ -} - -wxOutputStream::~wxOutputStream() -{ -} - -size_t wxOutputStream::OnSysWrite(const void * WXUNUSED(buffer), - size_t WXUNUSED(bufsize)) -{ - return 0; -} - -void wxOutputStream::PutC(char c) -{ - Write(&c, sizeof(c)); -} - -wxOutputStream& wxOutputStream::Write(const void *buffer, size_t size) -{ - m_lastcount = OnSysWrite(buffer, size); - return *this; -} - -wxOutputStream& wxOutputStream::Write(wxInputStream& stream_in) -{ - stream_in.Read(*this); - return *this; -} - -bool wxOutputStream::WriteAll(const void *buffer_, size_t size) -{ - // This exactly mirrors ReadAll(), see there for more comments. - const char* buffer = static_cast(buffer_); - - size_t totalCount = 0; - - for ( ;; ) - { - const size_t lastCount = Write(buffer, size).LastWrite(); - if ( !lastCount ) - break; - - totalCount += lastCount; - - if ( !IsOk() ) - break; - - if ( lastCount >= size ) - { - size = 0; - break; - } - - size -= lastCount; - buffer += lastCount; - } - - m_lastcount = totalCount; - return size == 0; -} - -wxFileOffset wxOutputStream::TellO() const -{ - return OnSysTell(); -} - -wxFileOffset wxOutputStream::SeekO(wxFileOffset pos, wxSeekMode mode) -{ - return OnSysSeek(pos, mode); -} - -void wxOutputStream::Sync() -{ -} - - -// ---------------------------------------------------------------------------- -// wxCountingOutputStream -// ---------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxCountingOutputStream, wxOutputStream); - -wxCountingOutputStream::wxCountingOutputStream () -{ - m_currentPos = - m_lastPos = 0; -} - -wxFileOffset wxCountingOutputStream::GetLength() const -{ - return m_lastPos; -} - -size_t wxCountingOutputStream::OnSysWrite(const void *WXUNUSED(buffer), - size_t size) -{ - m_currentPos += size; - if ( m_currentPos > m_lastPos ) - m_lastPos = m_currentPos; - - return size; -} - -wxFileOffset wxCountingOutputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode) -{ - ssize_t new_pos = wx_truncate_cast(ssize_t, pos); - - switch ( mode ) - { - case wxFromStart: - wxCHECK_MSG( (wxFileOffset)new_pos == pos, wxInvalidOffset, wxT("huge position not supported") ); - break; - - case wxFromEnd: - new_pos += m_lastPos; - wxCHECK_MSG( (wxFileOffset)new_pos == (wxFileOffset)(m_lastPos + pos), wxInvalidOffset, wxT("huge position not supported") ); - break; - - case wxFromCurrent: - new_pos += m_currentPos; - wxCHECK_MSG( (wxFileOffset)new_pos == (wxFileOffset)(m_currentPos + pos), wxInvalidOffset, wxT("huge position not supported") ); - break; - - default: - wxFAIL_MSG( wxT("invalid seek mode") ); - return wxInvalidOffset; - } - - m_currentPos = new_pos; - - if ( m_currentPos > m_lastPos ) - m_lastPos = m_currentPos; - - return m_currentPos; -} - -wxFileOffset wxCountingOutputStream::OnSysTell() const -{ - return m_currentPos; -} - -// ---------------------------------------------------------------------------- -// wxFilterInputStream -// ---------------------------------------------------------------------------- - -wxIMPLEMENT_ABSTRACT_CLASS(wxFilterInputStream, wxInputStream); - -wxFilterInputStream::wxFilterInputStream() - : m_parent_i_stream(NULL), - m_owns(false) -{ -} - -wxFilterInputStream::wxFilterInputStream(wxInputStream& stream) - : m_parent_i_stream(&stream), - m_owns(false) -{ -} - -wxFilterInputStream::wxFilterInputStream(wxInputStream *stream) - : m_parent_i_stream(stream), - m_owns(true) -{ -} - -wxFilterInputStream::~wxFilterInputStream() -{ - if (m_owns) - delete m_parent_i_stream; -} - -// ---------------------------------------------------------------------------- -// wxFilterOutputStream -// ---------------------------------------------------------------------------- - -wxIMPLEMENT_ABSTRACT_CLASS(wxFilterOutputStream, wxOutputStream); - -wxFilterOutputStream::wxFilterOutputStream() - : m_parent_o_stream(NULL), - m_owns(false) -{ -} - -wxFilterOutputStream::wxFilterOutputStream(wxOutputStream& stream) - : m_parent_o_stream(&stream), - m_owns(false) -{ -} - -wxFilterOutputStream::wxFilterOutputStream(wxOutputStream *stream) - : m_parent_o_stream(stream), - m_owns(true) -{ -} - -bool wxFilterOutputStream::Close() -{ - if (m_parent_o_stream && m_owns) - return m_parent_o_stream->Close(); - else - return true; -} - -wxFilterOutputStream::~wxFilterOutputStream() -{ - if (m_owns) - delete m_parent_o_stream; -} - -// ---------------------------------------------------------------------------- -// wxFilterClassFactoryBase -// ---------------------------------------------------------------------------- - -wxIMPLEMENT_ABSTRACT_CLASS(wxFilterClassFactoryBase, wxObject); - -wxString wxFilterClassFactoryBase::PopExtension(const wxString& location) const -{ - return location.substr(0, FindExtension(location)); -} - -wxString::size_type wxFilterClassFactoryBase::FindExtension( - const wxString& location) const -{ - for (const wxChar *const *p = GetProtocols(wxSTREAM_FILEEXT); *p; p++) - { - if ( location.EndsWith(*p) ) - return location.length() - wxStrlen(*p); - } - - return wxString::npos; -} - -bool wxFilterClassFactoryBase::CanHandle(const wxString& protocol, - wxStreamProtocolType type) const -{ - if (type == wxSTREAM_FILEEXT) - return FindExtension(protocol) != wxString::npos; - else - for (const wxChar *const *p = GetProtocols(type); *p; p++) - if (protocol == *p) - return true; - - return false; -} - -// ---------------------------------------------------------------------------- -// wxFilterClassFactory -// ---------------------------------------------------------------------------- - -wxIMPLEMENT_ABSTRACT_CLASS(wxFilterClassFactory, wxFilterClassFactoryBase); - -wxFilterClassFactory *wxFilterClassFactory::sm_first = NULL; - -void wxFilterClassFactory::Remove() -{ - if (m_next != this) - { - wxFilterClassFactory **pp = &sm_first; - - while (*pp != this) - pp = &(*pp)->m_next; - - *pp = m_next; - - m_next = this; - } -} - -// ---------------------------------------------------------------------------- -// wxBufferedInputStream -// ---------------------------------------------------------------------------- - -namespace -{ - -// helper function used for initializing the buffer used by -// wxBufferedInput/OutputStream: it simply returns the provided buffer if it's -// not NULL or creates a buffer of the given size otherwise -template -wxStreamBuffer * -CreateBufferIfNeeded(T& stream, wxStreamBuffer *buffer, size_t bufsize = 1024) -{ - return buffer ? buffer : new wxStreamBuffer(bufsize, stream); -} - -} // anonymous namespace - -wxBufferedInputStream::wxBufferedInputStream(wxInputStream& stream, - wxStreamBuffer *buffer) - : wxFilterInputStream(stream) -{ - m_i_streambuf = CreateBufferIfNeeded(*this, buffer); -} - -wxBufferedInputStream::wxBufferedInputStream(wxInputStream& stream, - size_t bufsize) - : wxFilterInputStream(stream) -{ - m_i_streambuf = CreateBufferIfNeeded(*this, NULL, bufsize); -} - -wxBufferedInputStream::~wxBufferedInputStream() -{ - m_parent_i_stream->SeekI(-(wxFileOffset)m_i_streambuf->GetBytesLeft(), - wxFromCurrent); - - delete m_i_streambuf; -} - -char wxBufferedInputStream::Peek() -{ - return m_i_streambuf->Peek(); -} - -wxInputStream& wxBufferedInputStream::Read(void *buf, size_t size) -{ - // reset the error flag - Reset(); - - // first read from the already cached data - m_lastcount = GetWBack(buf, size); - - // do we have to read anything more? - if ( m_lastcount < size ) - { - size -= m_lastcount; - buf = (char *)buf + m_lastcount; - - // the call to wxStreamBuffer::Read() below may reset our m_lastcount - // (but it also may not do it if the buffer is associated to another - // existing stream and wasn't created by us), so save it - size_t countOld = m_lastcount; - - // the new count of the bytes read is the count of bytes read this time - m_lastcount = m_i_streambuf->Read(buf, size); - - // plus those we had read before - m_lastcount += countOld; - } - - return *this; -} - -wxFileOffset wxBufferedInputStream::SeekI(wxFileOffset pos, wxSeekMode mode) -{ - // RR: Look at wxInputStream for comments. - - if (m_lasterror==wxSTREAM_EOF) - Reset(); - - if (m_wback) - { - wxLogDebug( wxT("Seeking in stream which has data written back to it.") ); - - free(m_wback); - m_wback = NULL; - m_wbacksize = 0; - m_wbackcur = 0; - } - - return m_i_streambuf->Seek(pos, mode); -} - -wxFileOffset wxBufferedInputStream::TellI() const -{ - wxFileOffset pos = m_i_streambuf->Tell(); - - if (pos != wxInvalidOffset) - pos -= (m_wbacksize - m_wbackcur); - - return pos; -} - -size_t wxBufferedInputStream::OnSysRead(void *buffer, size_t bufsize) -{ - return m_parent_i_stream->Read(buffer, bufsize).LastRead(); -} - -wxFileOffset wxBufferedInputStream::OnSysSeek(wxFileOffset seek, wxSeekMode mode) -{ - return m_parent_i_stream->SeekI(seek, mode); -} - -wxFileOffset wxBufferedInputStream::OnSysTell() const -{ - return m_parent_i_stream->TellI(); -} - -void wxBufferedInputStream::SetInputStreamBuffer(wxStreamBuffer *buffer) -{ - wxCHECK_RET( buffer, wxT("wxBufferedInputStream needs buffer") ); - - delete m_i_streambuf; - m_i_streambuf = buffer; -} - -// ---------------------------------------------------------------------------- -// wxBufferedOutputStream -// ---------------------------------------------------------------------------- - -wxBufferedOutputStream::wxBufferedOutputStream(wxOutputStream& stream, - wxStreamBuffer *buffer) - : wxFilterOutputStream(stream) -{ - m_o_streambuf = CreateBufferIfNeeded(*this, buffer); -} - -wxBufferedOutputStream::wxBufferedOutputStream(wxOutputStream& stream, - size_t bufsize) - : wxFilterOutputStream(stream) -{ - m_o_streambuf = CreateBufferIfNeeded(*this, NULL, bufsize); -} - -wxBufferedOutputStream::~wxBufferedOutputStream() -{ - Sync(); - delete m_o_streambuf; -} - -bool wxBufferedOutputStream::Close() -{ - Sync(); - return IsOk(); -} - - -wxOutputStream& wxBufferedOutputStream::Write(const void *buffer, size_t size) -{ - m_lastcount = 0; - m_o_streambuf->Write(buffer, size); - return *this; -} - -wxFileOffset wxBufferedOutputStream::SeekO(wxFileOffset pos, wxSeekMode mode) -{ - Sync(); - return m_o_streambuf->Seek(pos, mode); -} - -wxFileOffset wxBufferedOutputStream::TellO() const -{ - return m_o_streambuf->Tell(); -} - -void wxBufferedOutputStream::Sync() -{ - if (m_o_streambuf) - { - m_o_streambuf->FlushBuffer(); - m_parent_o_stream->Sync(); - } -} - -size_t wxBufferedOutputStream::OnSysWrite(const void *buffer, size_t bufsize) -{ - return m_parent_o_stream->Write(buffer, bufsize).LastWrite(); -} - -wxFileOffset wxBufferedOutputStream::OnSysSeek(wxFileOffset seek, wxSeekMode mode) -{ - return m_parent_o_stream->SeekO(seek, mode); -} - -wxFileOffset wxBufferedOutputStream::OnSysTell() const -{ - return m_parent_o_stream->TellO(); -} - -wxFileOffset wxBufferedOutputStream::GetLength() const -{ - return m_parent_o_stream->GetLength() + m_o_streambuf->GetIntPosition(); -} - -void wxBufferedOutputStream::SetOutputStreamBuffer(wxStreamBuffer *buffer) -{ - wxCHECK_RET( buffer, wxT("wxBufferedOutputStream needs buffer") ); - - delete m_o_streambuf; - m_o_streambuf = buffer; -} - -// --------------------------------------------------------------------------- -// wxWrapperInputStream implementation -// --------------------------------------------------------------------------- - -wxWrapperInputStream::wxWrapperInputStream() -{ - m_lasterror = wxSTREAM_READ_ERROR; -} - -wxWrapperInputStream::wxWrapperInputStream(wxInputStream& stream) - : wxFilterInputStream(stream) -{ - SynchronizeLastError(); -} - -wxWrapperInputStream::wxWrapperInputStream(wxInputStream *stream) - : wxFilterInputStream(stream) -{ - if ( m_parent_i_stream ) - SynchronizeLastError(); - else - m_lasterror = wxSTREAM_READ_ERROR; -} - -void wxWrapperInputStream::InitParentStream(wxInputStream& stream) -{ - wxCHECK_RET( !m_parent_i_stream, "Can't init parent stream twice" ); - - m_parent_i_stream = &stream; - - SynchronizeLastError(); -} - -void wxWrapperInputStream::InitParentStream(wxInputStream* stream) -{ - wxCHECK_RET( !m_parent_i_stream, "Can't init parent stream twice" ); - - m_parent_i_stream = stream; - - if ( m_parent_i_stream ) - { - m_owns = true; - - SynchronizeLastError(); - } -} - -wxFileOffset wxWrapperInputStream::GetLength() const -{ - wxCHECK_MSG(m_parent_i_stream, wxInvalidOffset, "Stream not valid"); - - wxON_BLOCK_EXIT_THIS0(wxWrapperInputStream::SynchronizeLastError); - return m_parent_i_stream->GetLength(); -} - -bool wxWrapperInputStream::IsSeekable() const -{ - wxCHECK_MSG(m_parent_i_stream, false, "Stream not valid"); - return m_parent_i_stream->IsSeekable(); -} - -size_t wxWrapperInputStream::OnSysRead(void *buffer, size_t size) -{ - wxCHECK_MSG(m_parent_i_stream, false, "Stream not valid"); - - wxON_BLOCK_EXIT_THIS0(wxWrapperInputStream::SynchronizeLastError); - - m_parent_i_stream->Read(buffer, size); - return m_parent_i_stream->LastRead(); -} - -wxFileOffset wxWrapperInputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode) -{ - wxCHECK_MSG(IsSeekable(), false, "Stream not seekable"); - - wxON_BLOCK_EXIT_THIS0(wxWrapperInputStream::SynchronizeLastError); - return m_parent_i_stream->SeekI (pos, mode); -} - -wxFileOffset wxWrapperInputStream::OnSysTell() const -{ - wxCHECK_MSG(m_parent_i_stream, false, "Stream not valid"); - - wxON_BLOCK_EXIT_THIS0(wxWrapperInputStream::SynchronizeLastError); - return m_parent_i_stream->TellI(); -} - -// ---------------------------------------------------------------------------- -// Some IOManip function -// ---------------------------------------------------------------------------- - -wxOutputStream& wxEndL(wxOutputStream& stream) -{ - static const wxChar *eol = wxTextFile::GetEOL(); - - return stream.Write(eol, wxStrlen(eol)); -} - -#endif // wxUSE_STREAMS diff --git a/Externals/wxWidgets3/src/common/string.cpp b/Externals/wxWidgets3/src/common/string.cpp deleted file mode 100644 index feb6d8e501..0000000000 --- a/Externals/wxWidgets3/src/common/string.cpp +++ /dev/null @@ -1,2305 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/string.cpp -// Purpose: wxString class -// Author: Vadim Zeitlin, Ryan Norton -// Modified by: -// Created: 29/01/98 -// Copyright: (c) 1998 Vadim Zeitlin -// (c) 2004 Ryan Norton -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// =========================================================================== -// headers, declarations, constants -// =========================================================================== - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#ifndef WX_PRECOMP - #include "wx/string.h" - #include "wx/wxcrtvararg.h" - #include "wx/intl.h" - #include "wx/log.h" -#endif - -#include - -#include - -#include -#include - -#include "wx/hashmap.h" -#include "wx/vector.h" -#include "wx/xlocale.h" - -#ifdef __WINDOWS__ - #include "wx/msw/wrapwin.h" -#endif // __WINDOWS__ - -#if wxUSE_STD_IOSTREAM - #include -#endif - -#ifndef HAVE_STD_STRING_COMPARE -// string handling functions used by wxString: -#if wxUSE_UNICODE_UTF8 - #define wxStringMemcmp memcmp - #define wxStringStrlen strlen -#else - #define wxStringMemcmp wxTmemcmp - #define wxStringStrlen wxStrlen -#endif -#endif - -// define a function declared in wx/buffer.h here as we don't have buffer.cpp -// and don't want to add it just because of this simple function -namespace wxPrivate -{ - -// wxXXXBuffer classes can be (implicitly) used during global statics -// initialization so wrap the status UntypedBufferData variable in a function -// to make it safe to access it even before all global statics are initialized -UntypedBufferData *GetUntypedNullData() -{ - static UntypedBufferData s_untypedNullData(NULL, 0); - - return &s_untypedNullData; -} - -} // namespace wxPrivate - -// --------------------------------------------------------------------------- -// static class variables definition -// --------------------------------------------------------------------------- - -//According to STL _must_ be a -1 size_t -const size_t wxString::npos = (size_t) -1; - -#if wxUSE_STRING_POS_CACHE - -#ifdef wxHAS_COMPILER_TLS - -wxTLS_TYPE(wxString::Cache) wxString::ms_cache; - -#else // !wxHAS_COMPILER_TLS - -struct wxStrCacheInitializer -{ - wxStrCacheInitializer() - { - // calling this function triggers s_cache initialization in it, and - // from now on it becomes safe to call from multiple threads - wxString::GetCache(); - } -}; - -/* -wxString::Cache& wxString::GetCache() -{ - static wxTLS_TYPE(Cache) s_cache; - - return wxTLS_VALUE(s_cache); -} -*/ - -static wxStrCacheInitializer gs_stringCacheInit; - -#endif // wxHAS_COMPILER_TLS/!wxHAS_COMPILER_TLS - -// gdb seems to be unable to display thread-local variables correctly, at least -// not my 6.4.98 version under amd64, so provide this debugging helper to do it -#if wxDEBUG_LEVEL >= 2 - -struct wxStrCacheDumper -{ - static void ShowAll() - { - puts("*** wxString cache dump:"); - for ( unsigned n = 0; n < wxString::Cache::SIZE; n++ ) - { - const wxString::Cache::Element& - c = wxString::GetCacheBegin()[n]; - - printf("\t%u%s\t%p: pos=(%lu, %lu), len=%ld\n", - n, - n == wxString::LastUsedCacheElement() ? " [*]" : "", - c.str, - (unsigned long)c.pos, - (unsigned long)c.impl, - (long)c.len); - } - } -}; - -void wxDumpStrCache() { wxStrCacheDumper::ShowAll(); } - -#endif // wxDEBUG_LEVEL >= 2 - -#ifdef wxPROFILE_STRING_CACHE - -wxString::CacheStats wxString::ms_cacheStats; - -struct wxStrCacheStatsDumper -{ - ~wxStrCacheStatsDumper() - { - const wxString::CacheStats& stats = wxString::ms_cacheStats; - - if ( stats.postot ) - { - puts("*** wxString cache statistics:"); - printf("\tTotal non-trivial calls to PosToImpl(): %u\n", - stats.postot); - printf("\tHits %u (of which %u not used) or %.2f%%\n", - stats.poshits, - stats.mishits, - 100.*float(stats.poshits - stats.mishits)/stats.postot); - printf("\tAverage position requested: %.2f\n", - float(stats.sumpos) / stats.postot); - printf("\tAverage offset after cached hint: %.2f\n", - float(stats.sumofs) / stats.postot); - } - - if ( stats.lentot ) - { - printf("\tNumber of calls to length(): %u, hits=%.2f%%\n", - stats.lentot, 100.*float(stats.lenhits)/stats.lentot); - } - } -}; - -static wxStrCacheStatsDumper s_showCacheStats; - -#endif // wxPROFILE_STRING_CACHE - -#endif // wxUSE_STRING_POS_CACHE - -// ---------------------------------------------------------------------------- -// global functions -// ---------------------------------------------------------------------------- - -#if wxUSE_STD_IOSTREAM - -#include - -wxSTD ostream& operator<<(wxSTD ostream& os, const wxCStrData& str) -{ -#if wxUSE_UNICODE && !wxUSE_UNICODE_UTF8 - return os << wxConvWhateverWorks.cWX2MB(str); -#else - return os << str.AsInternal(); -#endif -} - -wxSTD ostream& operator<<(wxSTD ostream& os, const wxString& str) -{ - return os << str.c_str(); -} - -wxSTD ostream& operator<<(wxSTD ostream& os, const wxScopedCharBuffer& str) -{ - return os << str.data(); -} - -#ifndef __BORLANDC__ -wxSTD ostream& operator<<(wxSTD ostream& os, const wxScopedWCharBuffer& str) -{ - return os << str.data(); -} -#endif - -#if wxUSE_UNICODE && defined(HAVE_WOSTREAM) - -wxSTD wostream& operator<<(wxSTD wostream& wos, const wxString& str) -{ - return wos << str.wc_str(); -} - -wxSTD wostream& operator<<(wxSTD wostream& wos, const wxCStrData& str) -{ - return wos << str.AsWChar(); -} - -wxSTD wostream& operator<<(wxSTD wostream& wos, const wxScopedWCharBuffer& str) -{ - return wos << str.data(); -} - -#endif // wxUSE_UNICODE && defined(HAVE_WOSTREAM) - -#endif // wxUSE_STD_IOSTREAM - -// =========================================================================== -// wxString class core -// =========================================================================== - -#if wxUSE_UNICODE_UTF8 - -void wxString::PosLenToImpl(size_t pos, size_t len, - size_t *implPos, size_t *implLen) const -{ - if ( pos == npos ) - { - *implPos = npos; - } - else // have valid start position - { - const const_iterator b = GetIterForNthChar(pos); - *implPos = wxStringImpl::const_iterator(b.impl()) - m_impl.begin(); - if ( len == npos ) - { - *implLen = npos; - } - else // have valid length too - { - // we need to handle the case of length specifying a substring - // going beyond the end of the string, just as std::string does - const const_iterator e(end()); - const_iterator i(b); - while ( len && i <= e ) - { - ++i; - --len; - } - - *implLen = i.impl() - b.impl(); - } - } -} - -#endif // wxUSE_UNICODE_UTF8 - -// ---------------------------------------------------------------------------- -// wxCStrData converted strings caching -// ---------------------------------------------------------------------------- - -// FIXME-UTF8: temporarily disabled because it doesn't work with global -// string objects; re-enable after fixing this bug and benchmarking -// performance to see if using a hash is a good idea at all -#if 0 - -// For backward compatibility reasons, it must be possible to assign the value -// returned by wxString::c_str() to a char* or wchar_t* variable and work with -// it. Returning wxCharBuffer from (const char*)c_str() wouldn't do the trick, -// because the memory would be freed immediately, but it has to be valid as long -// as the string is not modified, so that code like this still works: -// -// const wxChar *s = str.c_str(); -// while ( s ) { ... } - -// FIXME-UTF8: not thread safe! -// FIXME-UTF8: we currently clear the cached conversion only when the string is -// destroyed, but we should do it when the string is modified, to -// keep memory usage down -// FIXME-UTF8: we do the conversion every time As[W]Char() is called, but if we -// invalidated the cache on every change, we could keep the previous -// conversion -// FIXME-UTF8: add tracing of usage of these two methods - new code is supposed -// to use mb_str() or wc_str() instead of (const [w]char*)c_str() - -template -static inline void DeleteStringFromConversionCache(T& hash, const wxString *s) -{ - typename T::iterator i = hash.find(wxConstCast(s, wxString)); - if ( i != hash.end() ) - { - free(i->second); - hash.erase(i); - } -} - -#if wxUSE_UNICODE -// NB: non-STL implementation doesn't compile with "const wxString*" key type, -// so we have to use wxString* here and const-cast when used -WX_DECLARE_HASH_MAP(wxString*, char*, wxPointerHash, wxPointerEqual, - wxStringCharConversionCache); -static wxStringCharConversionCache gs_stringsCharCache; - -const char* wxCStrData::AsChar() const -{ - // remove previously cache value, if any (see FIXMEs above): - DeleteStringFromConversionCache(gs_stringsCharCache, m_str); - - // convert the string and keep it: - const char *s = gs_stringsCharCache[wxConstCast(m_str, wxString)] = - m_str->mb_str().release(); - - return s + m_offset; -} -#endif // wxUSE_UNICODE - -#if !wxUSE_UNICODE_WCHAR -WX_DECLARE_HASH_MAP(wxString*, wchar_t*, wxPointerHash, wxPointerEqual, - wxStringWCharConversionCache); -static wxStringWCharConversionCache gs_stringsWCharCache; - -const wchar_t* wxCStrData::AsWChar() const -{ - // remove previously cache value, if any (see FIXMEs above): - DeleteStringFromConversionCache(gs_stringsWCharCache, m_str); - - // convert the string and keep it: - const wchar_t *s = gs_stringsWCharCache[wxConstCast(m_str, wxString)] = - m_str->wc_str().release(); - - return s + m_offset; -} -#endif // !wxUSE_UNICODE_WCHAR - -wxString::~wxString() -{ -#if wxUSE_UNICODE - // FIXME-UTF8: do this only if locale is not UTF8 if wxUSE_UNICODE_UTF8 - DeleteStringFromConversionCache(gs_stringsCharCache, this); -#endif -#if !wxUSE_UNICODE_WCHAR - DeleteStringFromConversionCache(gs_stringsWCharCache, this); -#endif -} -#endif - -// =========================================================================== -// wxString class core -// =========================================================================== - -// --------------------------------------------------------------------------- -// construction and conversion -// --------------------------------------------------------------------------- - -#if wxUSE_UNICODE_WCHAR -/* static */ -wxString::SubstrBufFromMB wxString::ConvertStr(const char *psz, size_t nLength, - const wxMBConv& conv) -{ - // anything to do? - if ( !psz || nLength == 0 ) - return SubstrBufFromMB(wxWCharBuffer(L""), 0); - - if ( nLength == npos ) - nLength = wxNO_LEN; - - size_t wcLen; - wxScopedWCharBuffer wcBuf(conv.cMB2WC(psz, nLength, &wcLen)); - if ( !wcLen ) - return SubstrBufFromMB(wxWCharBuffer(L""), 0); - else - return SubstrBufFromMB(wcBuf, wcLen); -} -#endif // wxUSE_UNICODE_WCHAR - -#if wxUSE_UNICODE_UTF8 -/* static */ -wxString::SubstrBufFromMB wxString::ConvertStr(const char *psz, size_t nLength, - const wxMBConv& conv) -{ - // anything to do? - if ( !psz || nLength == 0 ) - return SubstrBufFromMB(wxCharBuffer(""), 0); - - // if psz is already in UTF-8, we don't have to do the roundtrip to - // wchar_t* and back: - if ( conv.IsUTF8() ) - { - // we need to validate the input because UTF8 iterators assume valid - // UTF-8 sequence and psz may be invalid: - if ( wxStringOperations::IsValidUtf8String(psz, nLength) ) - { - // we must pass the real string length to SubstrBufFromMB ctor - if ( nLength == npos ) - nLength = psz ? strlen(psz) : 0; - return SubstrBufFromMB(wxScopedCharBuffer::CreateNonOwned(psz, nLength), - nLength); - } - // else: do the roundtrip through wchar_t* - } - - if ( nLength == npos ) - nLength = wxNO_LEN; - - // first convert to wide string: - size_t wcLen; - wxScopedWCharBuffer wcBuf(conv.cMB2WC(psz, nLength, &wcLen)); - if ( !wcLen ) - return SubstrBufFromMB(wxCharBuffer(""), 0); - - // and then to UTF-8: - SubstrBufFromMB buf(ConvertStr(wcBuf, wcLen, wxMBConvStrictUTF8())); - // widechar -> UTF-8 conversion isn't supposed to ever fail: - wxASSERT_MSG( buf.data, wxT("conversion to UTF-8 failed") ); - - return buf; -} -#endif // wxUSE_UNICODE_UTF8 - -#if wxUSE_UNICODE_UTF8 || !wxUSE_UNICODE -/* static */ -wxString::SubstrBufFromWC wxString::ConvertStr(const wchar_t *pwz, size_t nLength, - const wxMBConv& conv) -{ - // anything to do? - if ( !pwz || nLength == 0 ) - return SubstrBufFromWC(wxCharBuffer(""), 0); - - if ( nLength == npos ) - nLength = wxNO_LEN; - - size_t mbLen; - wxScopedCharBuffer mbBuf(conv.cWC2MB(pwz, nLength, &mbLen)); - if ( !mbLen ) - return SubstrBufFromWC(wxCharBuffer(""), 0); - else - return SubstrBufFromWC(mbBuf, mbLen); -} -#endif // wxUSE_UNICODE_UTF8 || !wxUSE_UNICODE - -// This std::string::c_str()-like method returns a wide char pointer to string -// contents. In wxUSE_UNICODE_WCHAR case it is trivial as it can simply return -// a pointer to the internal representation. Otherwise a conversion is required -// and it returns a temporary buffer. -// -// However for compatibility with c_str() and to avoid breaking existing code -// doing -// -// for ( const wchar_t *p = s.wc_str(); *p; p++ ) -// ... use *p... -// -// we actually need to ensure that the returned buffer is _not_ temporary and -// so we use wxString::m_convertedToWChar to store the returned data -#if !wxUSE_UNICODE_WCHAR - -const wchar_t *wxString::AsWChar(const wxMBConv& conv) const -{ - const char * const strMB = m_impl.c_str(); - const size_t lenMB = m_impl.length(); - - // find out the size of the buffer needed - const size_t lenWC = conv.ToWChar(NULL, 0, strMB, lenMB); - if ( lenWC == wxCONV_FAILED ) - return NULL; - - // keep the same buffer if the string size didn't change: this is not only - // an optimization but also ensure that code which modifies string - // character by character (without changing its length) can continue to use - // the pointer returned by a previous wc_str() call even after changing the - // string - - // TODO-UTF8: we could check for ">" instead of "!=" here as this would - // allow to save on buffer reallocations but at the cost of - // consuming (even) more memory, we should benchmark this to - // determine if it's worth doing - if ( !m_convertedToWChar.m_str || lenWC != m_convertedToWChar.m_len ) - { - if ( !const_cast(this)->m_convertedToWChar.Extend(lenWC) ) - return NULL; - } - - // finally do convert - m_convertedToWChar.m_str[lenWC] = L'\0'; - if ( conv.ToWChar(m_convertedToWChar.m_str, lenWC, - strMB, lenMB) == wxCONV_FAILED ) - return NULL; - - return m_convertedToWChar.m_str; -} - -#endif // !wxUSE_UNICODE_WCHAR - - -// Same thing for mb_str() which returns a normal char pointer to string -// contents: this always requires converting it to the specified encoding in -// non-ANSI build except if we need to convert to UTF-8 and this is what we -// already use internally. -#if wxUSE_UNICODE - -const char *wxString::AsChar(const wxMBConv& conv) const -{ -#if wxUSE_UNICODE_UTF8 - if ( conv.IsUTF8() ) - return m_impl.c_str(); - - const wchar_t * const strWC = AsWChar(wxMBConvStrictUTF8()); - const size_t lenWC = m_convertedToWChar.m_len; -#else // wxUSE_UNICODE_WCHAR - const wchar_t * const strWC = m_impl.c_str(); - const size_t lenWC = m_impl.length(); -#endif // wxUSE_UNICODE_UTF8/wxUSE_UNICODE_WCHAR - - const size_t lenMB = conv.FromWChar(NULL, 0, strWC, lenWC); - if ( lenMB == wxCONV_FAILED ) - return NULL; - - if ( !m_convertedToChar.m_str || lenMB != m_convertedToChar.m_len ) - { - if ( !const_cast(this)->m_convertedToChar.Extend(lenMB) ) - return NULL; - } - - m_convertedToChar.m_str[lenMB] = '\0'; - if ( conv.FromWChar(m_convertedToChar.m_str, lenMB, - strWC, lenWC) == wxCONV_FAILED ) - return NULL; - - return m_convertedToChar.m_str; -} - -#endif // wxUSE_UNICODE - -// shrink to minimal size (releasing extra memory) -bool wxString::Shrink() -{ - wxString tmp(begin(), end()); - swap(tmp); - return tmp.length() == length(); -} - -// deprecated compatibility code: -#if WXWIN_COMPATIBILITY_2_8 && !wxUSE_STL_BASED_WXSTRING && !wxUSE_UNICODE_UTF8 -wxStringCharType *wxString::GetWriteBuf(size_t nLen) -{ - return DoGetWriteBuf(nLen); -} - -void wxString::UngetWriteBuf() -{ - DoUngetWriteBuf(); -} - -void wxString::UngetWriteBuf(size_t nLen) -{ - DoUngetWriteBuf(nLen); -} -#endif // WXWIN_COMPATIBILITY_2_8 && !wxUSE_STL_BASED_WXSTRING && !wxUSE_UNICODE_UTF8 - - -// --------------------------------------------------------------------------- -// data access -// --------------------------------------------------------------------------- - -// all functions are inline in string.h - -// --------------------------------------------------------------------------- -// concatenation operators -// --------------------------------------------------------------------------- - -/* - * concatenation functions come in 5 flavours: - * string + string - * char + string and string + char - * C str + string and string + C str - */ - -wxString operator+(const wxString& str1, const wxString& str2) -{ -#if !wxUSE_STL_BASED_WXSTRING - wxASSERT( str1.IsValid() ); - wxASSERT( str2.IsValid() ); -#endif - - wxString s = str1; - s += str2; - - return s; -} - -wxString operator+(const wxString& str, wxUniChar ch) -{ -#if !wxUSE_STL_BASED_WXSTRING - wxASSERT( str.IsValid() ); -#endif - - wxString s = str; - s += ch; - - return s; -} - -wxString operator+(wxUniChar ch, const wxString& str) -{ -#if !wxUSE_STL_BASED_WXSTRING - wxASSERT( str.IsValid() ); -#endif - - wxString s = ch; - s += str; - - return s; -} - -wxString operator+(const wxString& str, const char *psz) -{ -#if !wxUSE_STL_BASED_WXSTRING - wxASSERT( str.IsValid() ); -#endif - - wxString s; - if ( !s.Alloc(strlen(psz) + str.length()) ) { - wxFAIL_MSG( wxT("out of memory in wxString::operator+") ); - } - s += str; - s += psz; - - return s; -} - -wxString operator+(const wxString& str, const wchar_t *pwz) -{ -#if !wxUSE_STL_BASED_WXSTRING - wxASSERT( str.IsValid() ); -#endif - - wxString s; - if ( !s.Alloc(wxWcslen(pwz) + str.length()) ) { - wxFAIL_MSG( wxT("out of memory in wxString::operator+") ); - } - s += str; - s += pwz; - - return s; -} - -wxString operator+(const char *psz, const wxString& str) -{ -#if !wxUSE_STL_BASED_WXSTRING - wxASSERT( str.IsValid() ); -#endif - - wxString s; - if ( !s.Alloc(strlen(psz) + str.length()) ) { - wxFAIL_MSG( wxT("out of memory in wxString::operator+") ); - } - s = psz; - s += str; - - return s; -} - -wxString operator+(const wchar_t *pwz, const wxString& str) -{ -#if !wxUSE_STL_BASED_WXSTRING - wxASSERT( str.IsValid() ); -#endif - - wxString s; - if ( !s.Alloc(wxWcslen(pwz) + str.length()) ) { - wxFAIL_MSG( wxT("out of memory in wxString::operator+") ); - } - s = pwz; - s += str; - - return s; -} - -// --------------------------------------------------------------------------- -// string comparison -// --------------------------------------------------------------------------- - -bool wxString::IsSameAs(wxUniChar c, bool compareWithCase) const -{ - return (length() == 1) && (compareWithCase ? GetChar(0u) == c - : wxToupper(GetChar(0u)) == wxToupper(c)); -} - -#ifdef HAVE_STD_STRING_COMPARE - -// NB: Comparison code (both if HAVE_STD_STRING_COMPARE and if not) works with -// UTF-8 encoded strings too, thanks to UTF-8's design which allows us to -// sort strings in characters code point order by sorting the byte sequence -// in byte values order (i.e. what strcmp() and memcmp() do). - -int wxString::compare(const wxString& str) const -{ - return m_impl.compare(str.m_impl); -} - -int wxString::compare(size_t nStart, size_t nLen, - const wxString& str) const -{ - size_t pos, len; - PosLenToImpl(nStart, nLen, &pos, &len); - return m_impl.compare(pos, len, str.m_impl); -} - -int wxString::compare(size_t nStart, size_t nLen, - const wxString& str, - size_t nStart2, size_t nLen2) const -{ - size_t pos, len; - PosLenToImpl(nStart, nLen, &pos, &len); - - size_t pos2, len2; - str.PosLenToImpl(nStart2, nLen2, &pos2, &len2); - - return m_impl.compare(pos, len, str.m_impl, pos2, len2); -} - -int wxString::compare(const char* sz) const -{ - return m_impl.compare(ImplStr(sz)); -} - -int wxString::compare(const wchar_t* sz) const -{ - return m_impl.compare(ImplStr(sz)); -} - -int wxString::compare(size_t nStart, size_t nLen, - const char* sz, size_t nCount) const -{ - size_t pos, len; - PosLenToImpl(nStart, nLen, &pos, &len); - - SubstrBufFromMB str(ImplStr(sz, nCount)); - - return m_impl.compare(pos, len, str.data, str.len); -} - -int wxString::compare(size_t nStart, size_t nLen, - const wchar_t* sz, size_t nCount) const -{ - size_t pos, len; - PosLenToImpl(nStart, nLen, &pos, &len); - - SubstrBufFromWC str(ImplStr(sz, nCount)); - - return m_impl.compare(pos, len, str.data, str.len); -} - -#else // !HAVE_STD_STRING_COMPARE - -static inline int wxDoCmp(const wxStringCharType* s1, size_t l1, - const wxStringCharType* s2, size_t l2) -{ - if( l1 == l2 ) - return wxStringMemcmp(s1, s2, l1); - else if( l1 < l2 ) - { - int ret = wxStringMemcmp(s1, s2, l1); - return ret == 0 ? -1 : ret; - } - else - { - int ret = wxStringMemcmp(s1, s2, l2); - return ret == 0 ? +1 : ret; - } -} - -int wxString::compare(const wxString& str) const -{ - return ::wxDoCmp(m_impl.data(), m_impl.length(), - str.m_impl.data(), str.m_impl.length()); -} - -int wxString::compare(size_t nStart, size_t nLen, - const wxString& str) const -{ - wxASSERT(nStart <= length()); - size_type strLen = length() - nStart; - nLen = strLen < nLen ? strLen : nLen; - - size_t pos, len; - PosLenToImpl(nStart, nLen, &pos, &len); - - return ::wxDoCmp(m_impl.data() + pos, len, - str.m_impl.data(), str.m_impl.length()); -} - -int wxString::compare(size_t nStart, size_t nLen, - const wxString& str, - size_t nStart2, size_t nLen2) const -{ - wxASSERT(nStart <= length()); - wxASSERT(nStart2 <= str.length()); - size_type strLen = length() - nStart, - strLen2 = str.length() - nStart2; - nLen = strLen < nLen ? strLen : nLen; - nLen2 = strLen2 < nLen2 ? strLen2 : nLen2; - - size_t pos, len; - PosLenToImpl(nStart, nLen, &pos, &len); - size_t pos2, len2; - str.PosLenToImpl(nStart2, nLen2, &pos2, &len2); - - return ::wxDoCmp(m_impl.data() + pos, len, - str.m_impl.data() + pos2, len2); -} - -int wxString::compare(const char* sz) const -{ - SubstrBufFromMB str(ImplStr(sz, npos)); - if ( str.len == npos ) - str.len = wxStringStrlen(str.data); - return ::wxDoCmp(m_impl.data(), m_impl.length(), str.data, str.len); -} - -int wxString::compare(const wchar_t* sz) const -{ - SubstrBufFromWC str(ImplStr(sz, npos)); - if ( str.len == npos ) - str.len = wxStringStrlen(str.data); - return ::wxDoCmp(m_impl.data(), m_impl.length(), str.data, str.len); -} - -int wxString::compare(size_t nStart, size_t nLen, - const char* sz, size_t nCount) const -{ - wxASSERT(nStart <= length()); - size_type strLen = length() - nStart; - nLen = strLen < nLen ? strLen : nLen; - - size_t pos, len; - PosLenToImpl(nStart, nLen, &pos, &len); - - SubstrBufFromMB str(ImplStr(sz, nCount)); - if ( str.len == npos ) - str.len = wxStringStrlen(str.data); - - return ::wxDoCmp(m_impl.data() + pos, len, str.data, str.len); -} - -int wxString::compare(size_t nStart, size_t nLen, - const wchar_t* sz, size_t nCount) const -{ - wxASSERT(nStart <= length()); - size_type strLen = length() - nStart; - nLen = strLen < nLen ? strLen : nLen; - - size_t pos, len; - PosLenToImpl(nStart, nLen, &pos, &len); - - SubstrBufFromWC str(ImplStr(sz, nCount)); - if ( str.len == npos ) - str.len = wxStringStrlen(str.data); - - return ::wxDoCmp(m_impl.data() + pos, len, str.data, str.len); -} - -#endif // HAVE_STD_STRING_COMPARE/!HAVE_STD_STRING_COMPARE - - -// --------------------------------------------------------------------------- -// find_{first,last}_[not]_of functions -// --------------------------------------------------------------------------- - -#if !wxUSE_STL_BASED_WXSTRING || wxUSE_UNICODE_UTF8 - -// NB: All these functions are implemented with the argument being wxChar*, -// i.e. widechar string in any Unicode build, even though native string -// representation is char* in the UTF-8 build. This is because we couldn't -// use memchr() to determine if a character is in a set encoded as UTF-8. - -size_t wxString::find_first_of(const wxChar* sz, size_t nStart) const -{ - return find_first_of(sz, nStart, wxStrlen(sz)); -} - -size_t wxString::find_first_not_of(const wxChar* sz, size_t nStart) const -{ - return find_first_not_of(sz, nStart, wxStrlen(sz)); -} - -size_t wxString::find_first_of(const wxChar* sz, size_t nStart, size_t n) const -{ - wxASSERT_MSG( nStart <= length(), wxT("invalid index") ); - - size_t idx = nStart; - for ( const_iterator i = begin() + nStart; i != end(); ++idx, ++i ) - { - if ( wxTmemchr(sz, *i, n) ) - return idx; - } - - return npos; -} - -size_t wxString::find_first_not_of(const wxChar* sz, size_t nStart, size_t n) const -{ - wxASSERT_MSG( nStart <= length(), wxT("invalid index") ); - - size_t idx = nStart; - for ( const_iterator i = begin() + nStart; i != end(); ++idx, ++i ) - { - if ( !wxTmemchr(sz, *i, n) ) - return idx; - } - - return npos; -} - - -size_t wxString::find_last_of(const wxChar* sz, size_t nStart) const -{ - return find_last_of(sz, nStart, wxStrlen(sz)); -} - -size_t wxString::find_last_not_of(const wxChar* sz, size_t nStart) const -{ - return find_last_not_of(sz, nStart, wxStrlen(sz)); -} - -size_t wxString::find_last_of(const wxChar* sz, size_t nStart, size_t n) const -{ - size_t len = length(); - - if ( nStart == npos ) - { - nStart = len - 1; - } - else - { - wxASSERT_MSG( nStart <= len, wxT("invalid index") ); - } - - size_t idx = nStart; - for ( const_reverse_iterator i = rbegin() + (len - nStart - 1); - i != rend(); --idx, ++i ) - { - if ( wxTmemchr(sz, *i, n) ) - return idx; - } - - return npos; -} - -size_t wxString::find_last_not_of(const wxChar* sz, size_t nStart, size_t n) const -{ - size_t len = length(); - - if ( nStart == npos ) - { - nStart = len - 1; - } - else - { - wxASSERT_MSG( nStart <= len, wxT("invalid index") ); - } - - size_t idx = nStart; - for ( const_reverse_iterator i = rbegin() + (len - nStart - 1); - i != rend(); --idx, ++i ) - { - if ( !wxTmemchr(sz, *i, n) ) - return idx; - } - - return npos; -} - -size_t wxString::find_first_not_of(wxUniChar ch, size_t nStart) const -{ - wxASSERT_MSG( nStart <= length(), wxT("invalid index") ); - - size_t idx = nStart; - for ( const_iterator i = begin() + nStart; i != end(); ++idx, ++i ) - { - if ( *i != ch ) - return idx; - } - - return npos; -} - -size_t wxString::find_last_not_of(wxUniChar ch, size_t nStart) const -{ - size_t len = length(); - - if ( nStart == npos ) - { - nStart = len - 1; - } - else - { - wxASSERT_MSG( nStart <= len, wxT("invalid index") ); - } - - size_t idx = nStart; - for ( const_reverse_iterator i = rbegin() + (len - nStart - 1); - i != rend(); --idx, ++i ) - { - if ( *i != ch ) - return idx; - } - - return npos; -} - -// the functions above were implemented for wchar_t* arguments in Unicode -// build and char* in ANSI build; below are implementations for the other -// version: -#if wxUSE_UNICODE - #define wxOtherCharType char - #define STRCONV (const wxChar*)wxConvLibc.cMB2WC -#else - #define wxOtherCharType wchar_t - #define STRCONV (const wxChar*)wxConvLibc.cWC2MB -#endif - -size_t wxString::find_first_of(const wxOtherCharType* sz, size_t nStart) const - { return find_first_of(STRCONV(sz), nStart); } - -size_t wxString::find_first_of(const wxOtherCharType* sz, size_t nStart, - size_t n) const - { return find_first_of(STRCONV(sz, n, NULL), nStart, n); } -size_t wxString::find_last_of(const wxOtherCharType* sz, size_t nStart) const - { return find_last_of(STRCONV(sz), nStart); } -size_t wxString::find_last_of(const wxOtherCharType* sz, size_t nStart, - size_t n) const - { return find_last_of(STRCONV(sz, n, NULL), nStart, n); } -size_t wxString::find_first_not_of(const wxOtherCharType* sz, size_t nStart) const - { return find_first_not_of(STRCONV(sz), nStart); } -size_t wxString::find_first_not_of(const wxOtherCharType* sz, size_t nStart, - size_t n) const - { return find_first_not_of(STRCONV(sz, n, NULL), nStart, n); } -size_t wxString::find_last_not_of(const wxOtherCharType* sz, size_t nStart) const - { return find_last_not_of(STRCONV(sz), nStart); } -size_t wxString::find_last_not_of(const wxOtherCharType* sz, size_t nStart, - size_t n) const - { return find_last_not_of(STRCONV(sz, n, NULL), nStart, n); } - -#undef wxOtherCharType -#undef STRCONV - -#endif // !wxUSE_STL_BASED_WXSTRING || wxUSE_UNICODE_UTF8 - -// =========================================================================== -// other common string functions -// =========================================================================== - -int wxString::CmpNoCase(const wxString& s) const -{ -#if !wxUSE_UNICODE_UTF8 - // We compare NUL-delimited chunks of the strings inside the loop. We will - // do as many iterations as there are embedded NULs in the string, i.e. - // usually we will run it just once. - - typedef const wxStringImpl::value_type *pchar_type; - const pchar_type thisBegin = m_impl.c_str(); - const pchar_type thatBegin = s.m_impl.c_str(); - - const pchar_type thisEnd = thisBegin + m_impl.length(); - const pchar_type thatEnd = thatBegin + s.m_impl.length(); - - pchar_type thisCur = thisBegin; - pchar_type thatCur = thatBegin; - - int rc; - for ( ;; ) - { - // Compare until the next NUL, if the strings differ this is the final - // result. - rc = wxStricmp(thisCur, thatCur); - if ( rc ) - break; - - const size_t lenChunk = wxStrlen(thisCur); - thisCur += lenChunk; - thatCur += lenChunk; - - // Skip all the NULs as wxStricmp() doesn't handle them. - for ( ; !*thisCur; thisCur++, thatCur++ ) - { - // Check if we exhausted either of the strings. - if ( thisCur == thisEnd ) - { - // This one is exhausted, is the other one too? - return thatCur == thatEnd ? 0 : -1; - } - - if ( thatCur == thatEnd ) - { - // Because of the test above we know that this one is not - // exhausted yet so it's greater than the other one that is. - return 1; - } - - if ( *thatCur ) - { - // Anything non-NUL is greater than NUL. - return -1; - } - } - } - - return rc; -#else // wxUSE_UNICODE_UTF8 - // CRT functions can't be used for case-insensitive comparison of UTF-8 - // strings so do it in the naive, simple and inefficient way. - - // FIXME-UTF8: use wxUniChar::ToLower/ToUpper once added - const_iterator i1 = begin(); - const_iterator end1 = end(); - const_iterator i2 = s.begin(); - const_iterator end2 = s.end(); - - for ( ; i1 != end1 && i2 != end2; ++i1, ++i2 ) - { - wxUniChar lower1 = (wxChar)wxTolower(*i1); - wxUniChar lower2 = (wxChar)wxTolower(*i2); - if ( lower1 != lower2 ) - return lower1 < lower2 ? -1 : 1; - } - - size_t len1 = length(); - size_t len2 = s.length(); - - if ( len1 < len2 ) - return -1; - else if ( len1 > len2 ) - return 1; - return 0; -#endif // !wxUSE_UNICODE_UTF8/wxUSE_UNICODE_UTF8 -} - - -#if wxUSE_UNICODE - -wxString wxString::FromAscii(const char *ascii, size_t len) -{ - if (!ascii || len == 0) - return wxEmptyString; - - wxString res; - - { - wxStringInternalBuffer buf(res, len); - wxStringCharType *dest = buf; - - for ( ; len > 0; --len ) - { - unsigned char c = (unsigned char)*ascii++; - wxASSERT_MSG( c < 0x80, - wxT("Non-ASCII value passed to FromAscii().") ); - - *dest++ = static_cast(c); - } - } - - return res; -} - -wxString wxString::FromAscii(const char *ascii) -{ - return FromAscii(ascii, wxStrlen(ascii)); -} - -wxString wxString::FromAscii(char ascii) -{ - // What do we do with '\0' ? - - unsigned char c = (unsigned char)ascii; - - wxASSERT_MSG( c < 0x80, wxT("Non-ASCII value passed to FromAscii().") ); - - // NB: the cast to wchar_t causes interpretation of 'ascii' as Latin1 value - return wxString(wxUniChar((wchar_t)c)); -} - -const wxScopedCharBuffer wxString::ToAscii(char replaceWith) const -{ - // this will allocate enough space for the terminating NUL too - wxCharBuffer buffer(length()); - char *dest = buffer.data(); - - for ( const_iterator i = begin(); i != end(); ++i ) - { - wxUniChar c(*i); - // FIXME-UTF8: unify substituted char ('_') with wxUniChar ('?') - *dest++ = c.IsAscii() ? (char)c : replaceWith; - - // the output string can't have embedded NULs anyhow, so we can safely - // stop at first of them even if we do have any - if ( !c ) - break; - } - - return buffer; -} - -#endif // wxUSE_UNICODE - -// extract string of length nCount starting at nFirst -wxString wxString::Mid(size_t nFirst, size_t nCount) const -{ - size_t nLen = length(); - - // default value of nCount is npos and means "till the end" - if ( nCount == npos ) - { - nCount = nLen - nFirst; - } - - // out-of-bounds requests return sensible things - if ( nFirst > nLen ) - { - // AllocCopy() will return empty string - return wxEmptyString; - } - - if ( nCount > nLen - nFirst ) - { - nCount = nLen - nFirst; - } - - wxString dest(*this, nFirst, nCount); - if ( dest.length() != nCount ) - { - wxFAIL_MSG( wxT("out of memory in wxString::Mid") ); - } - - return dest; -} - -// check that the string starts with prefix and return the rest of the string -// in the provided pointer if it is not NULL, otherwise return false -bool wxString::StartsWith(const wxString& prefix, wxString *rest) const -{ - if ( compare(0, prefix.length(), prefix) != 0 ) - return false; - - if ( rest ) - { - // put the rest of the string into provided pointer - rest->assign(*this, prefix.length(), npos); - } - - return true; -} - - -// check that the string ends with suffix and return the rest of it in the -// provided pointer if it is not NULL, otherwise return false -bool wxString::EndsWith(const wxString& suffix, wxString *rest) const -{ - int start = length() - suffix.length(); - - if ( start < 0 || compare(start, npos, suffix) != 0 ) - return false; - - if ( rest ) - { - // put the rest of the string into provided pointer - rest->assign(*this, 0, start); - } - - return true; -} - - -// extract nCount last (rightmost) characters -wxString wxString::Right(size_t nCount) const -{ - if ( nCount > length() ) - nCount = length(); - - wxString dest(*this, length() - nCount, nCount); - if ( dest.length() != nCount ) { - wxFAIL_MSG( wxT("out of memory in wxString::Right") ); - } - return dest; -} - -// get all characters after the last occurrence of ch -// (returns the whole string if ch not found) -wxString wxString::AfterLast(wxUniChar ch) const -{ - wxString str; - int iPos = Find(ch, true); - if ( iPos == wxNOT_FOUND ) - str = *this; - else - str.assign(*this, iPos + 1, npos); - - return str; -} - -// extract nCount first (leftmost) characters -wxString wxString::Left(size_t nCount) const -{ - if ( nCount > length() ) - nCount = length(); - - wxString dest(*this, 0, nCount); - if ( dest.length() != nCount ) { - wxFAIL_MSG( wxT("out of memory in wxString::Left") ); - } - return dest; -} - -// get all characters before the first occurrence of ch -// (returns the whole string if ch not found) -wxString wxString::BeforeFirst(wxUniChar ch, wxString *rest) const -{ - int iPos = Find(ch); - if ( iPos == wxNOT_FOUND ) - { - iPos = length(); - if ( rest ) - rest->clear(); - } - else - { - if ( rest ) - rest->assign(*this, iPos + 1, npos); - } - - return wxString(*this, 0, iPos); -} - -/// get all characters before the last occurrence of ch -/// (returns empty string if ch not found) -wxString wxString::BeforeLast(wxUniChar ch, wxString *rest) const -{ - wxString str; - int iPos = Find(ch, true); - if ( iPos != wxNOT_FOUND ) - { - if ( iPos != 0 ) - str.assign(*this, 0, iPos); - - if ( rest ) - rest->assign(*this, iPos + 1, npos); - } - else - { - if ( rest ) - *rest = *this; - } - - return str; -} - -/// get all characters after the first occurrence of ch -/// (returns empty string if ch not found) -wxString wxString::AfterFirst(wxUniChar ch) const -{ - wxString str; - int iPos = Find(ch); - if ( iPos != wxNOT_FOUND ) - str.assign(*this, iPos + 1, npos); - - return str; -} - -// replace first (or all) occurrences of some substring with another one -size_t wxString::Replace(const wxString& strOld, - const wxString& strNew, bool bReplaceAll) -{ - // if we tried to replace an empty string we'd enter an infinite loop below - wxCHECK_MSG( !strOld.empty(), 0, - wxT("wxString::Replace(): invalid parameter") ); - - wxSTRING_INVALIDATE_CACHE(); - - size_t uiCount = 0; // count of replacements made - - // optimize the special common case: replacement of one character by - // another one (in UTF-8 case we can only do this for ASCII characters) - // - // benchmarks show that this special version is around 3 times faster - // (depending on the proportion of matching characters and UTF-8/wchar_t - // build) - if ( strOld.m_impl.length() == 1 && strNew.m_impl.length() == 1 ) - { - const wxStringCharType chOld = strOld.m_impl[0], - chNew = strNew.m_impl[0]; - - // this loop is the simplified version of the one below - for ( size_t pos = 0; ; ) - { - pos = m_impl.find(chOld, pos); - if ( pos == npos ) - break; - - m_impl[pos++] = chNew; - - uiCount++; - - if ( !bReplaceAll ) - break; - } - } - else if ( !bReplaceAll) - { - size_t pos = m_impl.find(strOld.m_impl, 0); - if ( pos != npos ) - { - m_impl.replace(pos, strOld.m_impl.length(), strNew.m_impl); - uiCount = 1; - } - } - else // replace all occurrences - { - const size_t uiOldLen = strOld.m_impl.length(); - const size_t uiNewLen = strNew.m_impl.length(); - - // first scan the string to find all positions at which the replacement - // should be made - wxVector replacePositions; - - size_t pos; - for ( pos = m_impl.find(strOld.m_impl, 0); - pos != npos; - pos = m_impl.find(strOld.m_impl, pos + uiOldLen)) - { - replacePositions.push_back(pos); - ++uiCount; - } - - if ( !uiCount ) - return 0; - - // allocate enough memory for the whole new string - wxString tmp; - tmp.m_impl.reserve(m_impl.length() + uiCount*(uiNewLen - uiOldLen)); - - // copy this string to tmp doing replacements on the fly - size_t replNum = 0; - for ( pos = 0; replNum < uiCount; replNum++ ) - { - const size_t nextReplPos = replacePositions[replNum]; - - if ( pos != nextReplPos ) - { - tmp.m_impl.append(m_impl, pos, nextReplPos - pos); - } - - tmp.m_impl.append(strNew.m_impl); - pos = nextReplPos + uiOldLen; - } - - if ( pos != m_impl.length() ) - { - // append the rest of the string unchanged - tmp.m_impl.append(m_impl, pos, m_impl.length() - pos); - } - - swap(tmp); - } - - return uiCount; -} - -bool wxString::IsAscii() const -{ - for ( const_iterator i = begin(); i != end(); ++i ) - { - if ( !(*i).IsAscii() ) - return false; - } - - return true; -} - -bool wxString::IsWord() const -{ - for ( const_iterator i = begin(); i != end(); ++i ) - { - if ( !wxIsalpha(*i) ) - return false; - } - - return true; -} - -bool wxString::IsNumber() const -{ - if ( empty() ) - return true; - - const_iterator i = begin(); - - if ( *i == wxT('-') || *i == wxT('+') ) - ++i; - - for ( ; i != end(); ++i ) - { - if ( !wxIsdigit(*i) ) - return false; - } - - return true; -} - -wxString wxString::Strip(stripType w) const -{ - wxString s = *this; - if ( w & leading ) s.Trim(false); - if ( w & trailing ) s.Trim(true); - return s; -} - -// --------------------------------------------------------------------------- -// case conversion -// --------------------------------------------------------------------------- - -wxString& wxString::MakeUpper() -{ - for ( iterator it = begin(), en = end(); it != en; ++it ) - *it = (wxChar)wxToupper(*it); - - return *this; -} - -wxString& wxString::MakeLower() -{ - for ( iterator it = begin(), en = end(); it != en; ++it ) - *it = (wxChar)wxTolower(*it); - - return *this; -} - -wxString& wxString::MakeCapitalized() -{ - const iterator en = end(); - iterator it = begin(); - if ( it != en ) - { - *it = (wxChar)wxToupper(*it); - for ( ++it; it != en; ++it ) - *it = (wxChar)wxTolower(*it); - } - - return *this; -} - -// --------------------------------------------------------------------------- -// trimming and padding -// --------------------------------------------------------------------------- - -// some compilers (VC++ 6.0 not to name them) return true for a call to -// isspace('\xEA') in the C locale which seems to be broken to me, but we have -// to live with this by checking that the character is a 7 bit one - even if -// this may fail to detect some spaces (I don't know if Unicode doesn't have -// space-like symbols somewhere except in the first 128 chars), it is arguably -// still better than trimming away accented letters -inline int wxSafeIsspace(wxChar ch) { return (ch < 127) && wxIsspace(ch); } - -// trims spaces (in the sense of isspace) from left or right side -wxString& wxString::Trim(bool bFromRight) -{ - // first check if we're going to modify the string at all - if ( !empty() && - ( - (bFromRight && wxSafeIsspace(GetChar(length() - 1))) || - (!bFromRight && wxSafeIsspace(GetChar(0u))) - ) - ) - { - if ( bFromRight ) - { - // find last non-space character - reverse_iterator psz = rbegin(); - while ( (psz != rend()) && wxSafeIsspace(*psz) ) - ++psz; - - // truncate at trailing space start - erase(psz.base(), end()); - } - else - { - // find first non-space character - iterator psz = begin(); - while ( (psz != end()) && wxSafeIsspace(*psz) ) - ++psz; - - // fix up data and length - erase(begin(), psz); - } - } - - return *this; -} - -// adds nCount characters chPad to the string from either side -wxString& wxString::Pad(size_t nCount, wxUniChar chPad, bool bFromRight) -{ - wxString s(chPad, nCount); - - if ( bFromRight ) - *this += s; - else - { - s += *this; - swap(s); - } - - return *this; -} - -// truncate the string -wxString& wxString::Truncate(size_t uiLen) -{ - if ( uiLen < length() ) - { - erase(begin() + uiLen, end()); - } - //else: nothing to do, string is already short enough - - return *this; -} - -// --------------------------------------------------------------------------- -// finding (return wxNOT_FOUND if not found and index otherwise) -// --------------------------------------------------------------------------- - -// find a character -int wxString::Find(wxUniChar ch, bool bFromEnd) const -{ - size_type idx = bFromEnd ? find_last_of(ch) : find_first_of(ch); - - return (idx == npos) ? wxNOT_FOUND : (int)idx; -} - -// ---------------------------------------------------------------------------- -// conversion to numbers -// ---------------------------------------------------------------------------- - -// The implementation of all the functions below is exactly the same so factor -// it out. Note that number extraction works correctly on UTF-8 strings, so -// we can use wxStringCharType and wx_str() for maximum efficiency. - -#define WX_STRING_TO_X_TYPE_START \ - wxCHECK_MSG( pVal, false, wxT("NULL output pointer") ); \ - errno = 0; \ - const wxStringCharType *start = wx_str(); \ - wxStringCharType *end; - -// notice that we return false without modifying the output parameter at all if -// nothing could be parsed but we do modify it and return false then if we did -// parse something successfully but not the entire string -#define WX_STRING_TO_X_TYPE_END \ - if ( end == start || errno == ERANGE ) \ - return false; \ - *pVal = val; \ - return !*end; - -bool wxString::ToLong(long *pVal, int base) const -{ - wxASSERT_MSG( !base || (base > 1 && base <= 36), wxT("invalid base") ); - - WX_STRING_TO_X_TYPE_START - long val = wxStrtol(start, &end, base); - WX_STRING_TO_X_TYPE_END -} - -bool wxString::ToULong(unsigned long *pVal, int base) const -{ - wxASSERT_MSG( !base || (base > 1 && base <= 36), wxT("invalid base") ); - - WX_STRING_TO_X_TYPE_START - unsigned long val = wxStrtoul(start, &end, base); - WX_STRING_TO_X_TYPE_END -} - -bool wxString::ToLongLong(wxLongLong_t *pVal, int base) const -{ - wxASSERT_MSG( !base || (base > 1 && base <= 36), wxT("invalid base") ); - - WX_STRING_TO_X_TYPE_START - wxLongLong_t val = wxStrtoll(start, &end, base); - WX_STRING_TO_X_TYPE_END -} - -bool wxString::ToULongLong(wxULongLong_t *pVal, int base) const -{ - wxASSERT_MSG( !base || (base > 1 && base <= 36), wxT("invalid base") ); - - WX_STRING_TO_X_TYPE_START - wxULongLong_t val = wxStrtoull(start, &end, base); - WX_STRING_TO_X_TYPE_END -} - -bool wxString::ToDouble(double *pVal) const -{ - WX_STRING_TO_X_TYPE_START - double val = wxStrtod(start, &end); - WX_STRING_TO_X_TYPE_END -} - -#if wxUSE_XLOCALE - -bool wxString::ToCLong(long *pVal, int base) const -{ - wxASSERT_MSG( !base || (base > 1 && base <= 36), wxT("invalid base") ); - - WX_STRING_TO_X_TYPE_START -#if (wxUSE_UNICODE_UTF8 || !wxUSE_UNICODE) && defined(wxHAS_XLOCALE_SUPPORT) - long val = wxStrtol_lA(start, &end, base, wxCLocale); -#else - long val = wxStrtol_l(start, &end, base, wxCLocale); -#endif - WX_STRING_TO_X_TYPE_END -} - -bool wxString::ToCULong(unsigned long *pVal, int base) const -{ - wxASSERT_MSG( !base || (base > 1 && base <= 36), wxT("invalid base") ); - - WX_STRING_TO_X_TYPE_START -#if (wxUSE_UNICODE_UTF8 || !wxUSE_UNICODE) && defined(wxHAS_XLOCALE_SUPPORT) - unsigned long val = wxStrtoul_lA(start, &end, base, wxCLocale); -#else - unsigned long val = wxStrtoul_l(start, &end, base, wxCLocale); -#endif - WX_STRING_TO_X_TYPE_END -} - -bool wxString::ToCDouble(double *pVal) const -{ - WX_STRING_TO_X_TYPE_START -#if (wxUSE_UNICODE_UTF8 || !wxUSE_UNICODE) && defined(wxHAS_XLOCALE_SUPPORT) - double val = wxStrtod_lA(start, &end, wxCLocale); -#else - double val = wxStrtod_l(start, &end, wxCLocale); -#endif - WX_STRING_TO_X_TYPE_END -} - -#else // wxUSE_XLOCALE - -// Provide implementation of these functions even when wxUSE_XLOCALE is -// disabled, we still need them in wxWidgets internal code. - -// For integers we just assume the current locale uses the same number -// representation as the C one as there is nothing else we can do. -bool wxString::ToCLong(long *pVal, int base) const -{ - return ToLong(pVal, base); -} - -bool wxString::ToCULong(unsigned long *pVal, int base) const -{ - return ToULong(pVal, base); -} - -// For floating point numbers we have to handle the problem of the decimal -// point which is different in different locales. -bool wxString::ToCDouble(double *pVal) const -{ - // See the explanations in FromCDouble() below for the reasons for all this. - - // Create a copy of this string using the decimal point instead of whatever - // separator the current locale uses. -#if wxUSE_INTL - wxString sep = wxLocale::GetInfo(wxLOCALE_DECIMAL_POINT, - wxLOCALE_CAT_NUMBER); - if ( sep == "." ) - { - // We can avoid an unnecessary string copy in this case. - return ToDouble(pVal); - } -#else // !wxUSE_INTL - // We don't know what the current separator is so it might even be a point - // already, try to parse the string as a double: - if ( ToDouble(pVal) ) - { - // It must have been the point, nothing else to do. - return true; - } - - // Try to guess the separator, using the most common alternative value. - wxString sep(","); -#endif // wxUSE_INTL/!wxUSE_INTL - wxString cstr(*this); - cstr.Replace(".", sep); - - return cstr.ToDouble(pVal); -} - -#endif // wxUSE_XLOCALE/!wxUSE_XLOCALE - -// ---------------------------------------------------------------------------- -// number to string conversion -// ---------------------------------------------------------------------------- - -/* static */ -wxString wxString::FromDouble(double val, int precision) -{ - wxCHECK_MSG( precision >= -1, wxString(), "Invalid negative precision" ); - - wxString format; - if ( precision == -1 ) - { - format = "%g"; - } - else // Use fixed precision. - { - format.Printf("%%.%df", precision); - } - - return wxString::Format(format, val); -} - -/* static */ -wxString wxString::FromCDouble(double val, int precision) -{ - wxCHECK_MSG( precision >= -1, wxString(), "Invalid negative precision" ); - - // Unfortunately there is no good way to get the number directly in the C - // locale. Some platforms provide special functions to do this (e.g. - // _sprintf_l() in MSVS or sprintf_l() in BSD systems), but some systems we - // still support don't have them and it doesn't seem worth it to have two - // different ways to do the same thing. Also, in principle, using the - // standard C++ streams should allow us to do it, but some implementations - // of them are horribly broken and actually change the global C locale, - // thus randomly affecting the results produced in other threads, when - // imbue() stream method is called (for the record, the latest libstdc++ - // version included in OS X does it and so seem to do the versions - // currently included in Android NDK and both FreeBSD and OpenBSD), so we - // can't do this neither and are reduced to this hack. - - wxString s = FromDouble(val, precision); -#if wxUSE_INTL - wxString sep = wxLocale::GetInfo(wxLOCALE_DECIMAL_POINT, - wxLOCALE_CAT_NUMBER); -#else // !wxUSE_INTL - // As above, this is the most common alternative value. Notice that here it - // doesn't matter if we guess wrongly and the current separator is already - // ".": we'll just waste a call to Replace() in this case. - wxString sep(","); -#endif // wxUSE_INTL/!wxUSE_INTL - - s.Replace(sep, "."); - return s; -} - -// --------------------------------------------------------------------------- -// formatted output -// --------------------------------------------------------------------------- - -#if !wxUSE_UTF8_LOCALE_ONLY -/* static */ -#ifdef wxNEEDS_WXSTRING_PRINTF_MIXIN -wxString wxStringPrintfMixinBase::DoFormatWchar(const wxChar *format, ...) -#else -wxString wxString::DoFormatWchar(const wxChar *format, ...) -#endif -{ - va_list argptr; - va_start(argptr, format); - - wxString s; - s.PrintfV(format, argptr); - - va_end(argptr); - - return s; -} -#endif // !wxUSE_UTF8_LOCALE_ONLY - -#if wxUSE_UNICODE_UTF8 -/* static */ -wxString wxString::DoFormatUtf8(const char *format, ...) -{ - va_list argptr; - va_start(argptr, format); - - wxString s; - s.PrintfV(format, argptr); - - va_end(argptr); - - return s; -} -#endif // wxUSE_UNICODE_UTF8 - -/* static */ -wxString wxString::FormatV(const wxString& format, va_list argptr) -{ - wxString s; - s.PrintfV(format, argptr); - return s; -} - -#if !wxUSE_UTF8_LOCALE_ONLY -#ifdef wxNEEDS_WXSTRING_PRINTF_MIXIN -int wxStringPrintfMixinBase::DoPrintfWchar(const wxChar *format, ...) -#else -int wxString::DoPrintfWchar(const wxChar *format, ...) -#endif -{ - va_list argptr; - va_start(argptr, format); - -#ifdef wxNEEDS_WXSTRING_PRINTF_MIXIN - // get a pointer to the wxString instance; we have to use dynamic_cast<> - // because it's the only cast that works safely for downcasting when - // multiple inheritance is used: - wxString *str = static_cast(this); -#else - wxString *str = this; -#endif - - int iLen = str->PrintfV(format, argptr); - - va_end(argptr); - - return iLen; -} -#endif // !wxUSE_UTF8_LOCALE_ONLY - -#if wxUSE_UNICODE_UTF8 -int wxString::DoPrintfUtf8(const char *format, ...) -{ - va_list argptr; - va_start(argptr, format); - - int iLen = PrintfV(format, argptr); - - va_end(argptr); - - return iLen; -} -#endif // wxUSE_UNICODE_UTF8 - -/* - Uses wxVsnprintf and places the result into the this string. - - In ANSI build, wxVsnprintf is effectively vsnprintf but in Unicode build - it is vswprintf. Due to a discrepancy between vsnprintf and vswprintf in - the ISO C99 (and thus SUSv3) standard the return value for the case of - an undersized buffer is inconsistent. For conforming vsnprintf - implementations the function must return the number of characters that - would have been printed had the buffer been large enough. For conforming - vswprintf implementations the function must return a negative number - and set errno. - - What vswprintf sets errno to is undefined but Darwin seems to set it to - EOVERFLOW. The only expected errno are EILSEQ and EINVAL. Both of - those are defined in the standard and backed up by several conformance - statements. Note that ENOMEM mentioned in the manual page does not - apply to swprintf, only wprintf and fwprintf. - - Official manual page: - http://www.opengroup.org/onlinepubs/009695399/functions/swprintf.html - - Some conformance statements (AIX, Solaris): - http://www.opengroup.org/csq/view.mhtml?RID=ibm%2FSD1%2F3 - http://www.theopengroup.org/csq/view.mhtml?norationale=1&noreferences=1&RID=Fujitsu%2FSE2%2F10 - - Since EILSEQ and EINVAL are rather common but EOVERFLOW is not and since - EILSEQ and EINVAL are specifically defined to mean the error is other than - an undersized buffer and no other errno are defined we treat those two - as meaning hard errors and everything else gets the old behaviour which - is to keep looping and increasing buffer size until the function succeeds. - - In practice it's impossible to determine before compilation which behaviour - may be used. The vswprintf function may have vsnprintf-like behaviour or - vice-versa. Behaviour detected on one release can theoretically change - with an updated release. Not to mention that configure testing for it - would require the test to be run on the host system, not the build system - which makes cross compilation difficult. Therefore, we make no assumptions - about behaviour and try our best to handle every known case, including the - case where wxVsnprintf returns a negative number and fails to set errno. - - There is yet one more non-standard implementation and that is our own. - Fortunately, that can be detected at compile-time. - - On top of all that, ISO C99 explicitly defines snprintf to write a null - character to the last position of the specified buffer. That would be at - at the given buffer size minus 1. It is supposed to do this even if it - turns out that the buffer is sized too small. - - Darwin (tested on 10.5) follows the C99 behaviour exactly. - - Glibc 2.6 almost follows the C99 behaviour except vswprintf never sets - errno even when it fails. However, it only seems to ever fail due - to an undersized buffer. -*/ -#if wxUSE_UNICODE_UTF8 -template -#else -// we only need one version in non-UTF8 builds and at least two Windows -// compilers have problems with this function template, so use just one -// normal function here -#endif -static int DoStringPrintfV(wxString& str, - const wxString& format, va_list argptr) -{ - int size = 1024; - - for ( ;; ) - { -#if wxUSE_UNICODE_UTF8 - BufferType tmp(str, size + 1); - typename BufferType::CharType *buf = tmp; -#else - wxStringBuffer tmp(str, size + 1); - wxChar *buf = tmp; -#endif - - if ( !buf ) - { - // out of memory - return -1; - } - - // wxVsnprintf() may modify the original arg pointer, so pass it - // only a copy - va_list argptrcopy; - wxVaCopy(argptrcopy, argptr); - - // Set errno to 0 to make it determinate if wxVsnprintf fails to set it. - errno = 0; - int len = wxVsnprintf(buf, size, format, argptrcopy); - va_end(argptrcopy); - - // some implementations of vsnprintf() don't NUL terminate - // the string if there is not enough space for it so - // always do it manually - // FIXME: This really seems to be the wrong and would be an off-by-one - // bug except the code above allocates an extra character. - buf[size] = wxT('\0'); - - // vsnprintf() may return either -1 (traditional Unix behaviour) or the - // total number of characters which would have been written if the - // buffer were large enough (newer standards such as Unix98) - if ( len < 0 ) - { - // NB: wxVsnprintf() may call either wxCRT_VsnprintfW or - // wxCRT_VsnprintfA in UTF-8 build; wxUSE_WXVSNPRINTF - // is true if *both* of them use our own implementation, - // otherwise we can't be sure -#if wxUSE_WXVSNPRINTF - // we know that our own implementation of wxVsnprintf() returns -1 - // only for a format error - thus there's something wrong with - // the user's format string - buf[0] = '\0'; - return -1; -#else // possibly using system version - // assume it only returns error if there is not enough space, but - // as we don't know how much we need, double the current size of - // the buffer - if( (errno == EILSEQ) || (errno == EINVAL) ) - // If errno was set to one of the two well-known hard errors - // then fail immediately to avoid an infinite loop. - return -1; - else - // still not enough, as we don't know how much we need, double the - // current size of the buffer - size *= 2; -#endif // wxUSE_WXVSNPRINTF/!wxUSE_WXVSNPRINTF - } - else if ( len >= size ) - { -#if wxUSE_WXVSNPRINTF - // we know that our own implementation of wxVsnprintf() returns - // size+1 when there's not enough space but that's not the size - // of the required buffer! - size *= 2; // so we just double the current size of the buffer -#else - // some vsnprintf() implementations NUL-terminate the buffer and - // some don't in len == size case, to be safe always add 1 - // FIXME: I don't quite understand this comment. The vsnprintf - // function is specifically defined to return the number of - // characters printed not including the null terminator. - // So OF COURSE you need to add 1 to get the right buffer size. - // The following line is definitely correct, no question. - size = len + 1; -#endif - } - else // ok, there was enough space - { - break; - } - } - - // we could have overshot - str.Shrink(); - - return str.length(); -} - -int wxString::PrintfV(const wxString& format, va_list argptr) -{ -#if wxUSE_UNICODE_UTF8 - #if wxUSE_STL_BASED_WXSTRING - typedef wxStringTypeBuffer Utf8Buffer; - #else - typedef wxStringInternalBuffer Utf8Buffer; - #endif -#endif - -#if wxUSE_UTF8_LOCALE_ONLY - return DoStringPrintfV(*this, format, argptr); -#else - #if wxUSE_UNICODE_UTF8 - if ( wxLocaleIsUtf8 ) - return DoStringPrintfV(*this, format, argptr); - else - // wxChar* version - return DoStringPrintfV(*this, format, argptr); - #else - return DoStringPrintfV(*this, format, argptr); - #endif // UTF8/WCHAR -#endif -} - -// ---------------------------------------------------------------------------- -// misc other operations -// ---------------------------------------------------------------------------- - -// returns true if the string matches the pattern which may contain '*' and -// '?' metacharacters (as usual, '?' matches any character and '*' any number -// of them) -bool wxString::Matches(const wxString& mask) const -{ - // I disable this code as it doesn't seem to be faster (in fact, it seems - // to be much slower) than the old, hand-written code below and using it - // here requires always linking with libregex even if the user code doesn't - // use it -#if 0 // wxUSE_REGEX - // first translate the shell-like mask into a regex - wxString pattern; - pattern.reserve(wxStrlen(pszMask)); - - pattern += wxT('^'); - while ( *pszMask ) - { - switch ( *pszMask ) - { - case wxT('?'): - pattern += wxT('.'); - break; - - case wxT('*'): - pattern += wxT(".*"); - break; - - case wxT('^'): - case wxT('.'): - case wxT('$'): - case wxT('('): - case wxT(')'): - case wxT('|'): - case wxT('+'): - case wxT('\\'): - // these characters are special in a RE, quote them - // (however note that we don't quote '[' and ']' to allow - // using them for Unix shell like matching) - pattern += wxT('\\'); - wxFALLTHROUGH; - - default: - pattern += *pszMask; - } - - pszMask++; - } - pattern += wxT('$'); - - // and now use it - return wxRegEx(pattern, wxRE_NOSUB | wxRE_EXTENDED).Matches(c_str()); -#else // !wxUSE_REGEX - // TODO: this is, of course, awfully inefficient... - - // FIXME-UTF8: implement using iterators, remove #if -#if wxUSE_UNICODE_UTF8 - const wxScopedWCharBuffer maskBuf = mask.wc_str(); - const wxScopedWCharBuffer txtBuf = wc_str(); - const wxChar *pszMask = maskBuf.data(); - const wxChar *pszTxt = txtBuf.data(); -#else - const wxChar *pszMask = mask.wx_str(); - // the char currently being checked - const wxChar *pszTxt = wx_str(); -#endif - - // the last location where '*' matched - const wxChar *pszLastStarInText = NULL; - const wxChar *pszLastStarInMask = NULL; - -match: - for ( ; *pszMask != wxT('\0'); pszMask++, pszTxt++ ) { - switch ( *pszMask ) { - case wxT('?'): - if ( *pszTxt == wxT('\0') ) - return false; - - // pszTxt and pszMask will be incremented in the loop statement - - break; - - case wxT('*'): - { - // remember where we started to be able to backtrack later - pszLastStarInText = pszTxt; - pszLastStarInMask = pszMask; - - // ignore special chars immediately following this one - // (should this be an error?) - while ( *pszMask == wxT('*') || *pszMask == wxT('?') ) - pszMask++; - - // if there is nothing more, match - if ( *pszMask == wxT('\0') ) - return true; - - // are there any other metacharacters in the mask? - size_t uiLenMask; - const wxChar *pEndMask = wxStrpbrk(pszMask, wxT("*?")); - - if ( pEndMask != NULL ) { - // we have to match the string between two metachars - uiLenMask = pEndMask - pszMask; - } - else { - // we have to match the remainder of the string - uiLenMask = wxStrlen(pszMask); - } - - wxString strToMatch(pszMask, uiLenMask); - const wxChar* pMatch = wxStrstr(pszTxt, strToMatch); - if ( pMatch == NULL ) - return false; - - // -1 to compensate "++" in the loop - pszTxt = pMatch + uiLenMask - 1; - pszMask += uiLenMask - 1; - } - break; - - default: - if ( *pszMask != *pszTxt ) - return false; - break; - } - } - - // match only if nothing left - if ( *pszTxt == wxT('\0') ) - return true; - - // if we failed to match, backtrack if we can - if ( pszLastStarInText ) { - pszTxt = pszLastStarInText + 1; - pszMask = pszLastStarInMask; - - pszLastStarInText = NULL; - - // don't bother resetting pszLastStarInMask, it's unnecessary - - goto match; - } - - return false; -#endif // wxUSE_REGEX/!wxUSE_REGEX -} - -// Count the number of chars -int wxString::Freq(wxUniChar ch) const -{ - int count = 0; - for ( const_iterator i = begin(); i != end(); ++i ) - { - if ( *i == ch ) - count ++; - } - return count; -} - diff --git a/Externals/wxWidgets3/src/common/stringimpl.cpp b/Externals/wxWidgets3/src/common/stringimpl.cpp deleted file mode 100644 index 22ad32324e..0000000000 --- a/Externals/wxWidgets3/src/common/stringimpl.cpp +++ /dev/null @@ -1,794 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/stringimpl.cpp -// Purpose: wxString class -// Author: Vadim Zeitlin, Ryan Norton -// Modified by: -// Created: 29/01/98 -// Copyright: (c) 1998 Vadim Zeitlin -// (c) 2004 Ryan Norton -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -/* - * About ref counting: - * 1) all empty strings use g_strEmpty, nRefs = -1 (set in Init()) - * 2) AllocBuffer() sets nRefs to 1, Lock() increments it by one - * 3) Unlock() decrements nRefs and frees memory if it goes to 0 - */ - -// =========================================================================== -// headers, declarations, constants -// =========================================================================== - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#ifndef WX_PRECOMP - #include "wx/stringimpl.h" - #include "wx/wxcrt.h" -#endif - -#include - -#include - -#include -#include - -// --------------------------------------------------------------------------- -// static class variables definition -// --------------------------------------------------------------------------- - -#if !wxUSE_STL_BASED_WXSTRING -//According to STL _must_ be a -1 size_t -const size_t wxStringImpl::npos = (size_t) -1; -#endif - -// ---------------------------------------------------------------------------- -// static data -// ---------------------------------------------------------------------------- - -#if wxUSE_STL_BASED_WXSTRING - -// FIXME-UTF8: get rid of this, have only one wxEmptyString -#if wxUSE_UNICODE_UTF8 -const wxStringCharType WXDLLIMPEXP_BASE *wxEmptyStringImpl = ""; -#endif -const wxChar WXDLLIMPEXP_BASE *wxEmptyString = wxT(""); - -#else - -// allocating extra space for each string consumes more memory but speeds up -// the concatenation operations (nLen is the current string's length) -// NB: EXTRA_ALLOC must be >= 0! -#define EXTRA_ALLOC (19 - nLen % 16) - -// string handling functions used by wxString: -#if wxUSE_UNICODE_UTF8 - #define wxStringMemcpy memcpy - #define wxStringMemcmp memcmp - #define wxStringMemchr memchr -#else - #define wxStringMemcpy wxTmemcpy - #define wxStringMemcmp wxTmemcmp - #define wxStringMemchr wxTmemchr -#endif - -// for an empty string, GetStringData() will return this address: this -// structure has the same layout as wxStringData and it's data() method will -// return the empty string (dummy pointer) -static const struct -{ - wxStringData data; - wxStringCharType dummy; -} g_strEmpty = { {-1, 0, 0}, wxT('\0') }; - -// empty C style string: points to 'string data' byte of g_strEmpty -#if wxUSE_UNICODE_UTF8 -// FIXME-UTF8: get rid of this, have only one wxEmptyString -const wxStringCharType WXDLLIMPEXP_BASE *wxEmptyStringImpl = &g_strEmpty.dummy; -const wxChar WXDLLIMPEXP_BASE *wxEmptyString = wxT(""); -#else -const wxStringCharType WXDLLIMPEXP_BASE *wxEmptyString = &g_strEmpty.dummy; -#endif - -#endif - - -#if !wxUSE_STL_BASED_WXSTRING - -// ---------------------------------------------------------------------------- -// private classes -// ---------------------------------------------------------------------------- - -// this small class is used to gather statistics for performance tuning - -// uncomment this to enable gathering of some statistics about wxString -// efficiency -//#define WXSTRING_STATISTICS - -#ifdef WXSTRING_STATISTICS - class Averager - { - public: - Averager(const wxStringCharType *sz) { m_sz = sz; m_nTotal = m_nCount = 0; } - ~Averager() - { - wxPrintf("wxString %s: total = %lu, average = %f\n", - m_sz, m_nTotal, ((float)m_nTotal)/m_nCount); - } - - void Add(size_t n) { m_nTotal += n; m_nCount++; } - - private: - unsigned long m_nCount, m_nTotal; - const wxStringCharType *m_sz; - } g_averageLength("allocation size"), - g_averageSummandLength("summand length"), - g_averageConcatHit("hit probability in concat"), - g_averageInitialLength("initial string length"); - - #define STATISTICS_ADD(av, val) g_average##av.Add(val) -#else - #define STATISTICS_ADD(av, val) -#endif // WXSTRING_STATISTICS - -// =========================================================================== -// wxStringData class deallocation -// =========================================================================== - -#if defined(__VISUALC__) && defined(_MT) && !defined(_DLL) -# pragma message (__FILE__ ": building with Multithreaded non DLL runtime has a performance impact on wxString!") -void wxStringData::Free() -{ - free(this); -} -#endif - -// =========================================================================== -// wxStringImpl -// =========================================================================== - -// takes nLength elements of psz starting at nPos -void wxStringImpl::InitWith(const wxStringCharType *psz, - size_t nPos, size_t nLength) -{ - Init(); - - // if the length is not given, assume the string to be NUL terminated - if ( nLength == npos ) { - wxASSERT_MSG( nPos <= wxStrlen(psz), wxT("index out of bounds") ); - - nLength = wxStrlen(psz + nPos); - } - - STATISTICS_ADD(InitialLength, nLength); - - if ( nLength > 0 ) { - // trailing '\0' is written in AllocBuffer() - if ( !AllocBuffer(nLength) ) { - wxFAIL_MSG( wxT("out of memory in wxStringImpl::InitWith") ); - return; - } - wxStringMemcpy(m_pchData, psz + nPos, nLength); - } -} - -wxStringImpl::wxStringImpl(const_iterator first, const_iterator last) -{ - if ( last >= first ) - { - InitWith(first.GetPtr(), 0, last - first); - } - else - { - wxFAIL_MSG( wxT("first must be before last") ); - Init(); - } -} - -wxStringImpl::wxStringImpl(size_type n, wxStringCharType ch) -{ - Init(); - append(n, ch); -} - -// --------------------------------------------------------------------------- -// memory allocation -// --------------------------------------------------------------------------- - -// allocates memory needed to store a C string of length nLen -bool wxStringImpl::AllocBuffer(size_t nLen) -{ - // allocating 0 sized buffer doesn't make sense, all empty strings should - // reuse g_strEmpty - wxASSERT( nLen > 0 ); - - // make sure that we don't overflow - wxCHECK( nLen < (INT_MAX / sizeof(wxStringCharType)) - - (sizeof(wxStringData) + EXTRA_ALLOC + 1), false ); - - STATISTICS_ADD(Length, nLen); - - // allocate memory: - // 1) one extra character for '\0' termination - // 2) sizeof(wxStringData) for housekeeping info - wxStringData* pData = (wxStringData*) - malloc(sizeof(wxStringData) + (nLen + EXTRA_ALLOC + 1)*sizeof(wxStringCharType)); - - if ( pData == NULL ) { - // allocation failures are handled by the caller - return false; - } - - pData->nRefs = 1; - pData->nDataLength = nLen; - pData->nAllocLength = nLen + EXTRA_ALLOC; - m_pchData = pData->data(); // data starts after wxStringData - m_pchData[nLen] = wxT('\0'); - return true; -} - -// must be called before changing this string -bool wxStringImpl::CopyBeforeWrite() -{ - wxStringData* pData = GetStringData(); - - if ( pData->IsShared() ) { - pData->Unlock(); // memory not freed because shared - size_t nLen = pData->nDataLength; - if ( !AllocBuffer(nLen) ) { - // allocation failures are handled by the caller - return false; - } - wxStringMemcpy(m_pchData, pData->data(), nLen); - } - - wxASSERT( !GetStringData()->IsShared() ); // we must be the only owner - - return true; -} - -// must be called before replacing contents of this string -bool wxStringImpl::AllocBeforeWrite(size_t nLen) -{ - wxASSERT( nLen != 0 ); // doesn't make any sense - - // must not share string and must have enough space - wxStringData* pData = GetStringData(); - if ( pData->IsShared() || pData->IsEmpty() ) { - // can't work with old buffer, get new one - pData->Unlock(); - if ( !AllocBuffer(nLen) ) { - // allocation failures are handled by the caller - return false; - } - } - else { - if ( nLen > pData->nAllocLength ) { - // realloc the buffer instead of calling malloc() again, this is more - // efficient - STATISTICS_ADD(Length, nLen); - - nLen += EXTRA_ALLOC; - - pData = (wxStringData*) - realloc(pData, - sizeof(wxStringData) + (nLen + 1)*sizeof(wxStringCharType)); - - if ( pData == NULL ) { - // allocation failures are handled by the caller - // keep previous data since reallocation failed - return false; - } - - pData->nAllocLength = nLen; - m_pchData = pData->data(); - } - } - - wxASSERT( !GetStringData()->IsShared() ); // we must be the only owner - - // it doesn't really matter what the string length is as it's going to be - // overwritten later but, for extra safety, set it to 0 for now as we may - // have some junk in m_pchData - GetStringData()->nDataLength = 0; - - return true; -} - -wxStringImpl& wxStringImpl::append(size_t n, wxStringCharType ch) -{ - size_type len = length(); - - if ( !Alloc(len + n) || !CopyBeforeWrite() ) { - wxFAIL_MSG( wxT("out of memory in wxStringImpl::append") ); - return *this; - } - GetStringData()->nDataLength = len + n; - m_pchData[len + n] = '\0'; - for ( size_t i = 0; i < n; ++i ) - m_pchData[len + i] = ch; - return *this; -} - -void wxStringImpl::resize(size_t nSize, wxStringCharType ch) -{ - size_t len = length(); - - if ( nSize < len ) - { - erase(begin() + nSize, end()); - } - else if ( nSize > len ) - { - append(nSize - len, ch); - } - //else: we have exactly the specified length, nothing to do -} - -// allocate enough memory for nLen characters -bool wxStringImpl::Alloc(size_t nLen) -{ - wxStringData *pData = GetStringData(); - if ( pData->nAllocLength <= nLen ) { - if ( pData->IsEmpty() ) { - STATISTICS_ADD(Length, nLen); - - nLen += EXTRA_ALLOC; - - pData = (wxStringData *) - malloc(sizeof(wxStringData) + (nLen + 1)*sizeof(wxStringCharType)); - - if ( pData == NULL ) { - // allocation failure handled by caller - return false; - } - - pData->nRefs = 1; - pData->nDataLength = 0; - pData->nAllocLength = nLen; - m_pchData = pData->data(); // data starts after wxStringData - m_pchData[0u] = wxT('\0'); - } - else if ( pData->IsShared() ) { - pData->Unlock(); // memory not freed because shared - size_t nOldLen = pData->nDataLength; - if ( !AllocBuffer(nLen) ) { - // allocation failure handled by caller - return false; - } - // +1 to copy the terminator, too - memcpy(m_pchData, pData->data(), (nOldLen+1)*sizeof(wxStringCharType)); - GetStringData()->nDataLength = nOldLen; - } - else { - nLen += EXTRA_ALLOC; - - pData = (wxStringData *) - realloc(pData, sizeof(wxStringData) + (nLen + 1)*sizeof(wxStringCharType)); - - if ( pData == NULL ) { - // allocation failure handled by caller - // keep previous data since reallocation failed - return false; - } - - // it's not important if the pointer changed or not (the check for this - // is not faster than assigning to m_pchData in all cases) - pData->nAllocLength = nLen; - m_pchData = pData->data(); - } - } - //else: we've already got enough - return true; -} - -wxStringImpl::iterator wxStringImpl::begin() -{ - if ( !empty() ) - CopyBeforeWrite(); - return m_pchData; -} - -wxStringImpl::iterator wxStringImpl::end() -{ - if ( !empty() ) - CopyBeforeWrite(); - return m_pchData + length(); -} - -wxStringImpl::iterator wxStringImpl::erase(iterator it) -{ - size_type idx = it - begin(); - erase(idx, 1); - return begin() + idx; -} - -wxStringImpl& wxStringImpl::erase(size_t nStart, size_t nLen) -{ - wxASSERT(nStart <= length()); - size_t strLen = length() - nStart; - // delete nLen or up to the end of the string characters - nLen = strLen < nLen ? strLen : nLen; - wxStringImpl strTmp(c_str(), nStart); - strTmp.append(c_str() + nStart + nLen, length() - nStart - nLen); - - swap(strTmp); - return *this; -} - -wxStringImpl& wxStringImpl::insert(size_t nPos, - const wxStringCharType *sz, size_t n) -{ - wxASSERT( nPos <= length() ); - - if ( n == npos ) n = wxStrlen(sz); - if ( n == 0 ) return *this; - - if ( !Alloc(length() + n) || !CopyBeforeWrite() ) { - wxFAIL_MSG( wxT("out of memory in wxStringImpl::insert") ); - return *this; - } - - memmove(m_pchData + nPos + n, m_pchData + nPos, - (length() - nPos) * sizeof(wxStringCharType)); - memcpy(m_pchData + nPos, sz, n * sizeof(wxStringCharType)); - GetStringData()->nDataLength = length() + n; - m_pchData[length()] = '\0'; - - return *this; -} - -void wxStringImpl::swap(wxStringImpl& str) -{ - wxStringCharType* tmp = str.m_pchData; - str.m_pchData = m_pchData; - m_pchData = tmp; -} - -size_t wxStringImpl::find(const wxStringImpl& str, size_t nStart) const -{ - // deal with the special case of empty string first - const size_t nLen = length(); - const size_t nLenOther = str.length(); - - if ( !nLenOther ) - { - // empty string is a substring of anything - return 0; - } - - if ( !nLen ) - { - // the other string is non empty so can't be our substring - return npos; - } - - wxASSERT( str.GetStringData()->IsValid() ); - wxASSERT( nStart <= nLen ); - - const wxStringCharType * const other = str.c_str(); - - // anchor - const wxStringCharType* p = - (const wxStringCharType*)wxStringMemchr(c_str() + nStart, - *other, - nLen - nStart); - - if ( !p ) - return npos; - - while ( p - c_str() + nLenOther <= nLen && - wxStringMemcmp(p, other, nLenOther) ) - { - p++; - - // anchor again - p = (const wxStringCharType*) - wxStringMemchr(p, *other, nLen - (p - c_str())); - - if ( !p ) - return npos; - } - - return p - c_str() + nLenOther <= nLen ? p - c_str() : npos; -} - -size_t wxStringImpl::find(const wxStringCharType* sz, - size_t nStart, size_t n) const -{ - return find(wxStringImpl(sz, n), nStart); -} - -size_t wxStringImpl::find(wxStringCharType ch, size_t nStart) const -{ - wxASSERT( nStart <= length() ); - - const wxStringCharType *p = (const wxStringCharType*) - wxStringMemchr(c_str() + nStart, ch, length() - nStart); - - return p == NULL ? npos : p - c_str(); -} - -size_t wxStringImpl::rfind(const wxStringImpl& str, size_t nStart) const -{ - wxASSERT( str.GetStringData()->IsValid() ); - wxASSERT( nStart == npos || nStart <= length() ); - - if ( length() >= str.length() ) - { - // avoids a corner case later - if ( empty() && str.empty() ) - return 0; - - // "top" is the point where search starts from - size_t top = length() - str.length(); - - if ( nStart == npos ) - nStart = length() - 1; - if ( nStart < top ) - top = nStart; - - const wxStringCharType *cursor = c_str() + top; - do - { - if ( wxStringMemcmp(cursor, str.c_str(), str.length()) == 0 ) - { - return cursor - c_str(); - } - } while ( cursor-- > c_str() ); - } - - return npos; -} - -size_t wxStringImpl::rfind(const wxStringCharType* sz, - size_t nStart, size_t n) const -{ - return rfind(wxStringImpl(sz, n), nStart); -} - -size_t wxStringImpl::rfind(wxStringCharType ch, size_t nStart) const -{ - if ( nStart == npos ) - { - nStart = length(); - } - else - { - wxASSERT( nStart <= length() ); - } - - const wxStringCharType *actual; - for ( actual = c_str() + ( nStart == npos ? length() : nStart + 1 ); - actual > c_str(); --actual ) - { - if ( *(actual - 1) == ch ) - return (actual - 1) - c_str(); - } - - return npos; -} - -wxStringImpl& wxStringImpl::replace(size_t nStart, size_t nLen, - const wxStringCharType *sz, size_t nCount) -{ - // check and adjust parameters - const size_t lenOld = length(); - - wxASSERT_MSG( nStart <= lenOld, - wxT("index out of bounds in wxStringImpl::replace") ); - size_t nEnd = nStart + nLen; - if ( nLen > lenOld - nStart ) - { - // nLen may be out of range, as it can be npos, just clump it down - nLen = lenOld - nStart; - nEnd = lenOld; - } - - if ( nCount == npos ) - nCount = wxStrlen(sz); - - // build the new string from 3 pieces: part of this string before nStart, - // the new substring and the part of this string after nStart+nLen - wxStringImpl tmp; - const size_t lenNew = lenOld + nCount - nLen; - if ( lenNew ) - { - tmp.AllocBuffer(lenOld + nCount - nLen); - - wxStringCharType *dst = tmp.m_pchData; - memcpy(dst, m_pchData, nStart*sizeof(wxStringCharType)); - dst += nStart; - - memcpy(dst, sz, nCount*sizeof(wxStringCharType)); - dst += nCount; - - memcpy(dst, m_pchData + nEnd, (lenOld - nEnd)*sizeof(wxStringCharType)); - } - - // and replace this string contents with the new one - swap(tmp); - return *this; -} - -wxStringImpl wxStringImpl::substr(size_t nStart, size_t nLen) const -{ - if ( nLen == npos ) - nLen = length() - nStart; - return wxStringImpl(*this, nStart, nLen); -} - -// assigns one string to another -wxStringImpl& wxStringImpl::operator=(const wxStringImpl& stringSrc) -{ - wxASSERT( stringSrc.GetStringData()->IsValid() ); - - // don't copy string over itself - if ( m_pchData != stringSrc.m_pchData ) { - if ( stringSrc.GetStringData()->IsEmpty() ) { - Reinit(); - } - else { - // adjust references - GetStringData()->Unlock(); - m_pchData = stringSrc.m_pchData; - GetStringData()->Lock(); - } - } - - return *this; -} - -// assigns a single character -wxStringImpl& wxStringImpl::operator=(wxStringCharType ch) -{ - wxStringCharType c(ch); - if ( !AssignCopy(1, &c) ) { - wxFAIL_MSG( wxT("out of memory in wxStringImpl::operator=(wxStringCharType)") ); - } - return *this; -} - -// assigns C string -wxStringImpl& wxStringImpl::operator=(const wxStringCharType *psz) -{ - if ( !AssignCopy(wxStrlen(psz), psz) ) { - wxFAIL_MSG( wxT("out of memory in wxStringImpl::operator=(const wxStringCharType *)") ); - } - return *this; -} - -// helper function: does real copy -bool wxStringImpl::AssignCopy(size_t nSrcLen, - const wxStringCharType *pszSrcData) -{ - if ( nSrcLen == 0 ) { - Reinit(); - } - else { - if ( !AllocBeforeWrite(nSrcLen) ) { - // allocation failure handled by caller - return false; - } - - // use memmove() and not memcpy() here as we might be copying from our own - // buffer in case of assignment such as "s = s.c_str()" (see #11294) - memmove(m_pchData, pszSrcData, nSrcLen*sizeof(wxStringCharType)); - - GetStringData()->nDataLength = nSrcLen; - m_pchData[nSrcLen] = wxT('\0'); - } - return true; -} - -// --------------------------------------------------------------------------- -// string concatenation -// --------------------------------------------------------------------------- - -// add something to this string -bool wxStringImpl::ConcatSelf(size_t nSrcLen, - const wxStringCharType *pszSrcData, - size_t nMaxLen) -{ - STATISTICS_ADD(SummandLength, nSrcLen); - - nSrcLen = nSrcLen < nMaxLen ? nSrcLen : nMaxLen; - - // concatenating an empty string is a NOP - if ( nSrcLen > 0 ) { - wxStringData *pData = GetStringData(); - size_t nLen = pData->nDataLength; - - // take special care when appending part of this string to itself: the code - // below reallocates our buffer and this invalidates pszSrcData pointer so - // we have to copy it in another temporary string in this case (but avoid - // doing this unnecessarily) - if ( pszSrcData >= m_pchData && pszSrcData < m_pchData + nLen ) - { - wxStringImpl tmp(pszSrcData, nSrcLen); - return ConcatSelf(nSrcLen, tmp.m_pchData, nSrcLen); - } - - size_t nNewLen = nLen + nSrcLen; - - // alloc new buffer if current is too small - if ( pData->IsShared() ) { - STATISTICS_ADD(ConcatHit, 0); - - // we have to allocate another buffer - wxStringData* pOldData = GetStringData(); - if ( !AllocBuffer(nNewLen) ) { - // allocation failure handled by caller - return false; - } - memcpy(m_pchData, pOldData->data(), nLen*sizeof(wxStringCharType)); - pOldData->Unlock(); - } - else if ( nNewLen > pData->nAllocLength ) { - STATISTICS_ADD(ConcatHit, 0); - - reserve(nNewLen); - // we have to grow the buffer - if ( capacity() < nNewLen ) { - // allocation failure handled by caller - return false; - } - } - else { - STATISTICS_ADD(ConcatHit, 1); - - // the buffer is already big enough - } - - // should be enough space - wxASSERT( nNewLen <= GetStringData()->nAllocLength ); - - // fast concatenation - all is done in our buffer - memcpy(m_pchData + nLen, pszSrcData, nSrcLen*sizeof(wxStringCharType)); - - m_pchData[nNewLen] = wxT('\0'); // put terminating '\0' - GetStringData()->nDataLength = nNewLen; // and fix the length - } - //else: the string to append was empty - return true; -} - -// get the pointer to writable buffer of (at least) nLen bytes -wxStringCharType *wxStringImpl::DoGetWriteBuf(size_t nLen) -{ - if ( !AllocBeforeWrite(nLen) ) { - // allocation failure handled by caller - return NULL; - } - - wxASSERT( GetStringData()->nRefs == 1 ); - GetStringData()->Validate(false); - - return m_pchData; -} - -// put string back in a reasonable state after GetWriteBuf -void wxStringImpl::DoUngetWriteBuf() -{ - DoUngetWriteBuf(wxStrlen(m_pchData)); -} - -void wxStringImpl::DoUngetWriteBuf(size_t nLen) -{ - wxStringData * const pData = GetStringData(); - - wxASSERT_MSG( nLen < pData->nAllocLength, wxT("buffer overrun") ); - - // the strings we store are always NUL-terminated - pData->data()[nLen] = wxT('\0'); - pData->nDataLength = nLen; - pData->Validate(true); -} - -#endif // !wxUSE_STL_BASED_WXSTRING diff --git a/Externals/wxWidgets3/src/common/stringops.cpp b/Externals/wxWidgets3/src/common/stringops.cpp deleted file mode 100644 index 36ff4045a4..0000000000 --- a/Externals/wxWidgets3/src/common/stringops.cpp +++ /dev/null @@ -1,315 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/stringops.cpp -// Purpose: implementation of wxString primitive operations -// Author: Vaclav Slavik -// Modified by: -// Created: 2007-04-16 -// Copyright: (c) 2007 REA Elektronik GmbH -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// =========================================================================== -// headers -// =========================================================================== - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#ifndef WX_PRECOMP - #include "wx/stringops.h" -#endif - -// =========================================================================== -// implementation -// =========================================================================== - -#if wxUSE_UNICODE_UTF8 - -// --------------------------------------------------------------------------- -// UTF-8 sequences lengths -// --------------------------------------------------------------------------- - -const unsigned char wxStringOperationsUtf8::ms_utf8IterTable[256] = { - // single-byte sequences (ASCII): - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 00..0F - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 10..1F - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 20..2F - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 30..3F - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 40..4F - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 50..5F - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 60..6F - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 70..7F - - // these are invalid, we use step 1 to skip - // over them (should never happen): - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 80..8F - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 90..9F - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // A0..AF - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // B0..BF - 1, 1, // C0,C1 - - // two-byte sequences: - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, // C2..CF - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, // D0..DF - - // three-byte sequences: - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // E0..EF - - // four-byte sequences: - 4, 4, 4, 4, 4, // F0..F4 - - // these are invalid again (5- or 6-byte - // sequences and sequences for code points - // above U+10FFFF, as restricted by RFC 3629): - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 // F5..FF -}; - -// --------------------------------------------------------------------------- -// UTF-8 operations -// --------------------------------------------------------------------------- - -// -// Table 3.1B from Unicode spec: Legal UTF-8 Byte Sequences -// -// Code Points | 1st Byte | 2nd Byte | 3rd Byte | 4th Byte | -// -------------------+----------+----------+----------+----------+ -// U+0000..U+007F | 00..7F | | | | -// U+0080..U+07FF | C2..DF | 80..BF | | | -// U+0800..U+0FFF | E0 | A0..BF | 80..BF | | -// U+1000..U+FFFF | E1..EF | 80..BF | 80..BF | | -// U+10000..U+3FFFF | F0 | 90..BF | 80..BF | 80..BF | -// U+40000..U+FFFFF | F1..F3 | 80..BF | 80..BF | 80..BF | -// U+100000..U+10FFFF | F4 | 80..8F | 80..BF | 80..BF | -// -------------------+----------+----------+----------+----------+ - -bool wxStringOperationsUtf8::IsValidUtf8String(const char *str, size_t len) -{ - if ( !str ) - return true; // empty string is UTF8 string - - const unsigned char *c = (const unsigned char*)str; - const unsigned char * const end = (len == wxStringImpl::npos) ? NULL : c + len; - - for ( ; end != NULL ? c != end : *c; ++c ) - { - unsigned char b = *c; - - if ( end != NULL ) - { - // if the string is not NULL-terminated, verify we have enough - // bytes in it left for current character's encoding: - if ( c + ms_utf8IterTable[*c] > end ) - return false; - } - - if ( b <= 0x7F ) // 00..7F - continue; - - else if ( b < 0xC2 ) // invalid lead bytes: 80..C1 - return false; - - // two-byte sequences: - else if ( b <= 0xDF ) // C2..DF - { - b = *(++c); - if ( !(b >= 0x80 && b <= 0xBF ) ) - return false; - } - - // three-byte sequences: - else if ( b == 0xE0 ) - { - b = *(++c); - if ( !(b >= 0xA0 && b <= 0xBF ) ) - return false; - b = *(++c); - if ( !(b >= 0x80 && b <= 0xBF ) ) - return false; - } - else if ( b == 0xED ) - { - b = *(++c); - if ( !(b >= 0x80 && b <= 0x9F ) ) - return false; - b = *(++c); - if ( !(b >= 0x80 && b <= 0xBF ) ) - return false; - } - else if ( b <= 0xEF ) // E1..EC EE..EF - { - for ( int i = 0; i < 2; ++i ) - { - b = *(++c); - if ( !(b >= 0x80 && b <= 0xBF ) ) - return false; - } - } - - // four-byte sequences: - else if ( b == 0xF0 ) - { - b = *(++c); - if ( !(b >= 0x90 && b <= 0xBF ) ) - return false; - for ( int i = 0; i < 2; ++i ) - { - b = *(++c); - if ( !(b >= 0x80 && b <= 0xBF ) ) - return false; - } - } - else if ( b <= 0xF3 ) // F1..F3 - { - for ( int i = 0; i < 3; ++i ) - { - b = *(++c); - if ( !(b >= 0x80 && b <= 0xBF ) ) - return false; - } - } - else if ( b == 0xF4 ) - { - b = *(++c); - if ( !(b >= 0x80 && b <= 0x8F ) ) - return false; - for ( int i = 0; i < 2; ++i ) - { - b = *(++c); - if ( !(b >= 0x80 && b <= 0xBF ) ) - return false; - } - } - else // otherwise, it's invalid lead byte - return false; - } - - return true; -} - -// NB: this is in this file and not unichar.cpp to keep all UTF-8 encoding -// code in single place -wxUniChar::Utf8CharBuffer wxUniChar::AsUTF8() const -{ - Utf8CharBuffer buf = { "" }; // init to avoid g++ 4.1 warning with -O2 - char *out = buf.data; - - value_type code = GetValue(); - - // Char. number range | UTF-8 octet sequence - // (hexadecimal) | (binary) - // ----------------------+--------------------------------------------- - // 0000 0000 - 0000 007F | 0xxxxxxx - // 0000 0080 - 0000 07FF | 110xxxxx 10xxxxxx - // 0000 0800 - 0000 FFFF | 1110xxxx 10xxxxxx 10xxxxxx - // 0001 0000 - 0010 FFFF | 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx - // - // Code point value is stored in bits marked with 'x', lowest-order bit - // of the value on the right side in the diagram above. - // (from RFC 3629) - - if ( code <= 0x7F ) - { - out[1] = 0; - out[0] = (char)code; - } - else if ( code <= 0x07FF ) - { - out[2] = 0; - // NB: this line takes 6 least significant bits, encodes them as - // 10xxxxxx and discards them so that the next byte can be encoded: - out[1] = 0x80 | (code & 0x3F); code >>= 6; - out[0] = 0xC0 | code; - } - else if ( code < 0xFFFF ) - { - out[3] = 0; - out[2] = 0x80 | (code & 0x3F); code >>= 6; - out[1] = 0x80 | (code & 0x3F); code >>= 6; - out[0] = 0xE0 | code; - } - else if ( code <= 0x10FFFF ) - { - out[4] = 0; - out[3] = 0x80 | (code & 0x3F); code >>= 6; - out[2] = 0x80 | (code & 0x3F); code >>= 6; - out[1] = 0x80 | (code & 0x3F); code >>= 6; - out[0] = 0xF0 | code; - } - else - { - wxFAIL_MSG( wxT("trying to encode undefined Unicode character") ); - out[0] = 0; - } - - return buf; -} - -wxUniChar -wxStringOperationsUtf8::DecodeNonAsciiChar(wxStringImpl::const_iterator i) -{ - wxASSERT( IsValidUtf8LeadByte(*i) ); - - size_t len = GetUtf8CharLength(*i); - wxASSERT_MSG( len <= 4, wxT("invalid UTF-8 sequence length") ); - - // Char. number range | UTF-8 octet sequence - // (hexadecimal) | (binary) - // ----------------------+--------------------------------------------- - // 0000 0000 - 0000 007F | 0xxxxxxx - // 0000 0080 - 0000 07FF | 110xxxxx 10xxxxxx - // 0000 0800 - 0000 FFFF | 1110xxxx 10xxxxxx 10xxxxxx - // 0001 0000 - 0010 FFFF | 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx - // - // Code point value is stored in bits marked with 'x', lowest-order bit - // of the value on the right side in the diagram above. - // (from RFC 3629) - - // mask to extract lead byte's value ('x' bits above), by sequence's length: - static const unsigned char s_leadValueMask[4] = { 0x7F, 0x1F, 0x0F, 0x07 }; -#if wxDEBUG_LEVEL - // mask and value of lead byte's most significant bits, by length: - static const unsigned char s_leadMarkerMask[4] = { 0x80, 0xE0, 0xF0, 0xF8 }; - static const unsigned char s_leadMarkerVal[4] = { 0x00, 0xC0, 0xE0, 0xF0 }; -#endif - - // extract the lead byte's value bits: - wxASSERT_MSG( ((unsigned char)*i & s_leadMarkerMask[len-1]) == - s_leadMarkerVal[len-1], - wxT("invalid UTF-8 lead byte") ); - wxUniChar::value_type code = (unsigned char)*i & s_leadValueMask[len-1]; - - // all remaining bytes, if any, are handled in the same way regardless of - // sequence's length: - for ( ++i ; len > 1; --len, ++i ) - { - wxASSERT_MSG( ((unsigned char)*i & 0xC0) == 0x80, - wxT("invalid UTF-8 byte") ); - - code <<= 6; - code |= (unsigned char)*i & 0x3F; - } - - return wxUniChar(code); -} - -wxCharBuffer wxStringOperationsUtf8::EncodeNChars(size_t n, const wxUniChar& ch) -{ - Utf8CharBuffer once(EncodeChar(ch)); - // the IncIter() table can be used to determine the length of ch's encoding: - size_t len = ms_utf8IterTable[(unsigned char)once.data[0]]; - - wxCharBuffer buf(n * len); - char *ptr = buf.data(); - for ( size_t i = 0; i < n; i++, ptr += len ) - { - memcpy(ptr, once.data, len); - } - - return buf; -} - -#endif // wxUSE_UNICODE_UTF8 diff --git a/Externals/wxWidgets3/src/common/strvararg.cpp b/Externals/wxWidgets3/src/common/strvararg.cpp deleted file mode 100644 index d4550dbfd1..0000000000 --- a/Externals/wxWidgets3/src/common/strvararg.cpp +++ /dev/null @@ -1,766 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/strvararg.cpp -// Purpose: macros for implementing type-safe vararg passing of strings -// Author: Vaclav Slavik -// Created: 2007-02-19 -// Copyright: (c) 2007 REA Elektronik GmbH -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// for compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include "wx/strvararg.h" -#include "wx/string.h" -#include "wx/crt.h" -#include "wx/private/wxprintf.h" - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxArgNormalizer<> -// ---------------------------------------------------------------------------- - -const wxStringCharType *wxArgNormalizerNative::get() const -{ - return m_value.wx_str(); -} - -const wxStringCharType *wxArgNormalizerNative::get() const -{ - return m_value.AsInternal(); -} - -#if wxUSE_UNICODE_UTF8 && !wxUSE_UTF8_LOCALE_ONLY -wxArgNormalizerWchar::wxArgNormalizerWchar( - const wxString& s, - const wxFormatString *fmt, unsigned index) - : wxArgNormalizerWithBuffer(s.wc_str(), fmt, index) -{ -} - -wxArgNormalizerWchar::wxArgNormalizerWchar( - const wxCStrData& s, - const wxFormatString *fmt, unsigned index) - : wxArgNormalizerWithBuffer(s.AsWCharBuf(), fmt, index) -{ -} -#endif // wxUSE_UNICODE_UTF8 && !wxUSE_UTF8_LOCALE_ONLY - -// ---------------------------------------------------------------------------- -// wxArgNormalizedString -// ---------------------------------------------------------------------------- - -wxString wxArgNormalizedString::GetString() const -{ - if ( !IsValid() ) - return wxEmptyString; - -#if wxUSE_UTF8_LOCALE_ONLY - return wxString(reinterpret_cast(m_ptr)); -#else - #if wxUSE_UNICODE_UTF8 - if ( wxLocaleIsUtf8 ) - return wxString(reinterpret_cast(m_ptr)); - else - #endif - return wxString(reinterpret_cast(m_ptr)); -#endif // !wxUSE_UTF8_LOCALE_ONLY -} - -wxArgNormalizedString::operator wxString() const -{ - return GetString(); -} - -// ---------------------------------------------------------------------------- -// wxFormatConverter: class doing the "%s" and "%c" normalization -// ---------------------------------------------------------------------------- - -/* - There are four problems with wxPrintf() etc. format strings: - - 1) The printf vararg macros convert all forms of strings into - wxStringCharType* representation. This may make the format string - incorrect: for example, if %ls was used together with a wchar_t* - variadic argument, this would no longer work, because the templates - would change wchar_t* argument to wxStringCharType* and %ls would now - be incorrect in e.g. UTF-8 build. We need make sure only one specifier - form is used. - - 2) To complicate matters further, the meaning of %s and %c is different - under Windows and on Unix. The Windows/MS convention is as follows: - - In ANSI mode: - - format specifier results in - ----------------------------------- - %s, %hs, %hS char* - %ls, %S, %lS wchar_t* - - In Unicode mode: - - format specifier results in - ----------------------------------- - %hs, %S, %hS char* - %s, %ls, %lS wchar_t* - - (While on POSIX systems we have %C identical to %lc and %c always means - char (in any mode) while %lc always means wchar_t.) - - In other words, we should _only_ use %s on Windows and %ls on Unix for - wxUSE_UNICODE_WCHAR build. - - 3) To make things even worse, we need two forms in UTF-8 build: one for - passing strings to ANSI functions under UTF-8 locales (this one should - use %s) and one for widechar functions used under non-UTF-8 locales - (this one should use %ls). - - And, of course, the same should be done for %c as well. - - - wxScanf() family of functions is simpler, because we don't normalize their - variadic arguments and we only have to handle 2) above and only for widechar - versions. -*/ - -template -class wxFormatConverterBase -{ -public: - typedef T CharType; - - wxFormatConverterBase() - { - m_fmtOrig = NULL; - m_fmtLast = NULL; - m_nCopied = 0; - } - - wxScopedCharTypeBuffer Convert(const CharType *format) - { - // this is reset to NULL if we modify the format string - m_fmtOrig = format; - - while ( *format ) - { - if ( CopyFmtChar(*format++) == wxT('%') ) - { -#if wxUSE_PRINTF_POS_PARAMS - if ( *format >= '0' && *format <= '9' ) - { - SkipDigits(&format); - if ( *format == '$' ) - { - // It was a positional argument specification. - CopyFmtChar(*format++); - } - //else: it was a width specification, nothing else to do. - } -#endif // wxUSE_PRINTF_POS_PARAMS - - // skip any flags - while ( IsFlagChar(*format) ) - CopyFmtChar(*format++); - - // and possible width - if ( *format == wxT('*') ) - CopyFmtChar(*format++); - else - SkipDigits(&format); - - // precision? - if ( *format == wxT('.') ) - { - CopyFmtChar(*format++); - if ( *format == wxT('*') ) - CopyFmtChar(*format++); - else - SkipDigits(&format); - } - - // next we can have a size modifier - SizeModifier size; - - switch ( *format ) - { -#ifdef __VISUALC__ - case 'z': - // Used for size_t printing (e.g. %zu) and is in C99, - // but is not portable, MSVC uses 'I' with the same - // meaning. - ChangeFmtChar('I'); - format++; - size = Size_Default; - break; -#endif // __VISUALC__ - - case 'h': - size = Size_Short; - format++; - break; - - case 'l': - // "ll" has a different meaning! - if ( format[1] != 'l' ) - { - size = Size_Long; - format++; - break; - } - wxFALLTHROUGH; - - default: - size = Size_Default; - } - - CharType outConv = *format; - SizeModifier outSize = size; - - // and finally we should have the type - switch ( *format ) - { - case wxT('S'): - case wxT('s'): - // all strings were converted into the same form by - // wxArgNormalizer, this form depends on the context - // in which the value is used (scanf/printf/wprintf): - HandleString(*format, size, outConv, outSize); - break; - - case wxT('C'): - case wxT('c'): - HandleChar(*format, size, outConv, outSize); - break; - - default: - // nothing special to do - break; - } - - if ( outConv == *format && outSize == size ) // no change - { - if ( size != Size_Default ) - CopyFmtChar(*(format - 1)); - CopyFmtChar(*format); - } - else // something changed - { - switch ( outSize ) - { - case Size_Long: - InsertFmtChar(wxT('l')); - break; - - case Size_Short: - InsertFmtChar(wxT('h')); - break; - - case Size_Default: - // nothing to do - break; - } - InsertFmtChar(outConv); - } - - format++; - } - } - - // notice that we only translated the string if m_fmtOrig == NULL (as - // set by CopyAllBefore()), otherwise we should simply use the original - // format - if ( m_fmtOrig ) - { - return wxScopedCharTypeBuffer::CreateNonOwned(m_fmtOrig); - } - else - { - // shrink converted format string to actual size (instead of - // over-sized allocation from CopyAllBefore()) and NUL-terminate - // it: - m_fmt.shrink(m_fmtLast - m_fmt.data()); - return m_fmt; - } - } - - virtual ~wxFormatConverterBase() {} - -protected: - enum SizeModifier - { - Size_Default, - Size_Short, - Size_Long - }; - - // called to handle %S or %s; 'conv' is conversion specifier ('S' or 's' - // respectively), 'size' is the preceding size modifier; the new values of - // conversion and size specifiers must be written to outConv and outSize - virtual void HandleString(CharType conv, SizeModifier size, - CharType& outConv, SizeModifier& outSize) = 0; - - // ditto for %C or %c - virtual void HandleChar(CharType conv, SizeModifier size, - CharType& outConv, SizeModifier& outSize) = 0; - -private: - // copy another character to the translated format: this function does the - // copy if we are translating but doesn't do anything at all if we don't, - // so we don't create the translated format string at all unless we really - // need to (i.e. InsertFmtChar() is called) - CharType CopyFmtChar(CharType ch) - { - if ( !m_fmtOrig ) - { - // we're translating, do copy - *(m_fmtLast++) = ch; - } - else - { - // simply increase the count which should be copied by - // CopyAllBefore() later if needed - m_nCopied++; - } - - return ch; - } - - // insert an extra character - void InsertFmtChar(CharType ch) - { - if ( m_fmtOrig ) - { - // so far we haven't translated anything yet - CopyAllBefore(); - } - - *(m_fmtLast++) = ch; - } - - // change a character - void ChangeFmtChar(CharType ch) - { - if ( m_fmtOrig ) - { - // so far we haven't translated anything yet - CopyAllBefore(); - } - - *m_fmtLast = ch; - } - - void CopyAllBefore() - { - wxASSERT_MSG( m_fmtOrig && m_fmt.data() == NULL, "logic error" ); - - // the modified format string is guaranteed to be no longer than - // 3/2 of the original (worst case: the entire format string consists - // of "%s" repeated and is expanded to "%ls" on Unix), so we can - // allocate the buffer now and not worry about running out of space if - // we over-allocate a bit: - size_t fmtLen = wxStrlen(m_fmtOrig); - // worst case is of even length, so there's no rounding error in *3/2: - m_fmt.extend(fmtLen * 3 / 2); - - if ( m_nCopied > 0 ) - wxStrncpy(m_fmt.data(), m_fmtOrig, m_nCopied); - m_fmtLast = m_fmt.data() + m_nCopied; - - // we won't need it any longer and resetting it also indicates that we - // modified the format - m_fmtOrig = NULL; - } - - static bool IsFlagChar(CharType ch) - { - return ch == wxT('-') || ch == wxT('+') || - ch == wxT('0') || ch == wxT(' ') || ch == wxT('#'); - } - - void SkipDigits(const CharType **ptpc) - { - while ( **ptpc >= wxT('0') && **ptpc <= wxT('9') ) - CopyFmtChar(*(*ptpc)++); - } - - // the translated format - wxCharTypeBuffer m_fmt; - CharType *m_fmtLast; - - // the original format - const CharType *m_fmtOrig; - - // the number of characters already copied (i.e. already parsed, but left - // unmodified) - size_t m_nCopied; -}; - -// Distinguish between the traditional Windows (and MSVC) behaviour and Cygwin -// (which is always Unix-like) and MinGW which can use either depending on the -// "ANSI stdio" option value (which is normally set to either 0 or 1, but test -// for it in a way which works even if it's not defined at all, just in case). -#if defined(__WINDOWS__) && \ - !defined(__CYGWIN__) && \ - (!defined(__MINGW32__) || (__USE_MINGW_ANSI_STDIO +0 == 0)) - -// on Windows, we should use %s and %c regardless of the build: -class wxPrintfFormatConverterWchar : public wxFormatConverterBase -{ - virtual void HandleString(CharType WXUNUSED(conv), - SizeModifier WXUNUSED(size), - CharType& outConv, SizeModifier& outSize) - { - outConv = 's'; - outSize = Size_Default; - } - - virtual void HandleChar(CharType WXUNUSED(conv), - SizeModifier WXUNUSED(size), - CharType& outConv, SizeModifier& outSize) - { - outConv = 'c'; - outSize = Size_Default; - } -}; - -#else // !__WINDOWS__ - -// on Unix, it's %s for ANSI functions and %ls for widechar: - -#if !wxUSE_UTF8_LOCALE_ONLY -class wxPrintfFormatConverterWchar : public wxFormatConverterBase -{ - virtual void HandleString(CharType WXUNUSED(conv), - SizeModifier WXUNUSED(size), - CharType& outConv, SizeModifier& outSize) wxOVERRIDE - { - outConv = 's'; - outSize = Size_Long; - } - - virtual void HandleChar(CharType WXUNUSED(conv), - SizeModifier WXUNUSED(size), - CharType& outConv, SizeModifier& outSize) wxOVERRIDE - { - outConv = 'c'; - outSize = Size_Long; - } -}; -#endif // !wxUSE_UTF8_LOCALE_ONLY - -#endif // __WINDOWS__/!__WINDOWS__ - -#if wxUSE_UNICODE_UTF8 -class wxPrintfFormatConverterUtf8 : public wxFormatConverterBase -{ - virtual void HandleString(CharType WXUNUSED(conv), - SizeModifier WXUNUSED(size), - CharType& outConv, SizeModifier& outSize) wxOVERRIDE - { - outConv = 's'; - outSize = Size_Default; - } - - virtual void HandleChar(CharType WXUNUSED(conv), - SizeModifier WXUNUSED(size), - CharType& outConv, SizeModifier& outSize) wxOVERRIDE - { - // chars are represented using wchar_t in both builds, so this is - // the same as above - outConv = 'c'; - outSize = Size_Long; - } -}; -#endif // wxUSE_UNICODE_UTF8 - -#if !wxUSE_UNICODE // FIXME-UTF8: remove -class wxPrintfFormatConverterANSI : public wxFormatConverterBase -{ - virtual void HandleString(CharType WXUNUSED(conv), - SizeModifier WXUNUSED(size), - CharType& outConv, SizeModifier& outSize) - { - outConv = 's'; - outSize = Size_Default; - } - - virtual void HandleChar(CharType WXUNUSED(conv), - SizeModifier WXUNUSED(size), - CharType& outConv, SizeModifier& outSize) - { - outConv = 'c'; - outSize = Size_Default; - } -}; -#endif // ANSI - -#ifndef __WINDOWS__ -/* - - wxScanf() format translation is different, we need to translate %s to %ls - and %c to %lc on Unix (but not Windows and for widechar functions only!). - - So to use native functions in order to get our semantics we must do the - following translations in Unicode mode: - - wxWidgets specifier POSIX specifier - ---------------------------------------- - - %hc, %C, %hC %c - %c %lc - - */ -class wxScanfFormatConverterWchar : public wxFormatConverterBase -{ - virtual void HandleString(CharType conv, SizeModifier size, - CharType& outConv, SizeModifier& outSize) wxOVERRIDE - { - outConv = 's'; - outSize = GetOutSize(conv == 'S', size); - } - - virtual void HandleChar(CharType conv, SizeModifier size, - CharType& outConv, SizeModifier& outSize) wxOVERRIDE - { - outConv = 'c'; - outSize = GetOutSize(conv == 'C', size); - } - - SizeModifier GetOutSize(bool convIsUpper, SizeModifier size) - { - // %S and %hS -> %s and %lS -> %ls - if ( convIsUpper ) - { - if ( size == Size_Long ) - return Size_Long; - else - return Size_Default; - } - else // %s or %c - { - if ( size == Size_Default ) - return Size_Long; - else - return size; - } - } -}; - -const wxScopedWCharBuffer wxScanfConvertFormatW(const wchar_t *format) -{ - return wxScanfFormatConverterWchar().Convert(format); -} -#endif // !__WINDOWS__ - - -// ---------------------------------------------------------------------------- -// wxFormatString -// ---------------------------------------------------------------------------- - -#if !wxUSE_UNICODE_WCHAR -const char* wxFormatString::InputAsChar() -{ - if ( m_char ) - return m_char.data(); - - // in ANSI build, wx_str() returns char*, in UTF-8 build, this function - // is only called under UTF-8 locales, so we should return UTF-8 string, - // which is, again, what wx_str() returns: - if ( m_str ) - return m_str->wx_str(); - - // ditto wxCStrData: - if ( m_cstr ) - return m_cstr->AsInternal(); - - // the last case is that wide string was passed in: in that case, we need - // to convert it: - wxASSERT( m_wchar ); - - m_char = wxConvLibc.cWC2MB(m_wchar.data()); - - return m_char.data(); -} - -const char* wxFormatString::AsChar() -{ - if ( !m_convertedChar ) -#if !wxUSE_UNICODE // FIXME-UTF8: remove this - m_convertedChar = wxPrintfFormatConverterANSI().Convert(InputAsChar()); -#else - m_convertedChar = wxPrintfFormatConverterUtf8().Convert(InputAsChar()); -#endif - - return m_convertedChar.data(); -} -#endif // !wxUSE_UNICODE_WCHAR - -#if wxUSE_UNICODE && !wxUSE_UTF8_LOCALE_ONLY -const wchar_t* wxFormatString::InputAsWChar() -{ - if ( m_wchar ) - return m_wchar.data(); - -#if wxUSE_UNICODE_WCHAR - if ( m_str ) - return m_str->wc_str(); - if ( m_cstr ) - return m_cstr->AsInternal(); -#else // wxUSE_UNICODE_UTF8 - if ( m_str ) - { - m_wchar = m_str->wc_str(); - return m_wchar.data(); - } - if ( m_cstr ) - { - m_wchar = m_cstr->AsWCharBuf(); - return m_wchar.data(); - } -#endif // wxUSE_UNICODE_WCHAR/UTF8 - - // the last case is that narrow string was passed in: in that case, we need - // to convert it: - wxASSERT( m_char ); - - m_wchar = wxConvLibc.cMB2WC(m_char.data()); - - return m_wchar.data(); -} - -const wchar_t* wxFormatString::AsWChar() -{ - if ( !m_convertedWChar ) - m_convertedWChar = wxPrintfFormatConverterWchar().Convert(InputAsWChar()); - - return m_convertedWChar.data(); -} -#endif // wxUSE_UNICODE && !wxUSE_UTF8_LOCALE_ONLY - -wxString wxFormatString::InputAsString() const -{ - if ( m_str ) - return *m_str; - if ( m_cstr ) - return m_cstr->AsString(); - if ( m_wchar ) - return wxString(m_wchar); - if ( m_char ) - return wxString(m_char); - - wxFAIL_MSG( "invalid wxFormatString - not initialized?" ); - return wxString(); -} - -// ---------------------------------------------------------------------------- -// wxFormatString::GetArgumentType() -// ---------------------------------------------------------------------------- - -namespace -{ - -template -wxFormatString::ArgumentType DoGetArgumentType(const CharType *format, - unsigned n) -{ - wxCHECK_MSG( format, wxFormatString::Arg_Unknown, - "empty format string not allowed here" ); - - wxPrintfConvSpecParser parser(format); - - if ( n > parser.nargs ) - { - // The n-th argument doesn't appear in the format string and is unused. - // This can happen e.g. if a translation of the format string is used - // and the translation language tends to avoid numbers in singular forms. - // The translator would then typically replace "%d" with "One" (e.g. in - // Hebrew). Passing too many vararg arguments does not harm, so its - // better to be more permissive here and allow legitimate uses in favour - // of catching harmless errors. - return wxFormatString::Arg_Unused; - } - - wxCHECK_MSG( parser.pspec[n-1] != NULL, wxFormatString::Arg_Unknown, - "requested argument not found - invalid format string?" ); - - switch ( parser.pspec[n-1]->m_type ) - { - case wxPAT_CHAR: - case wxPAT_WCHAR: - return wxFormatString::Arg_Char; - - case wxPAT_PCHAR: - case wxPAT_PWCHAR: - return wxFormatString::Arg_String; - - case wxPAT_INT: - return wxFormatString::Arg_Int; - case wxPAT_LONGINT: - return wxFormatString::Arg_LongInt; -#ifdef wxLongLong_t - case wxPAT_LONGLONGINT: - return wxFormatString::Arg_LongLongInt; -#endif - case wxPAT_SIZET: - return wxFormatString::Arg_Size_t; - - case wxPAT_DOUBLE: - return wxFormatString::Arg_Double; - case wxPAT_LONGDOUBLE: - return wxFormatString::Arg_LongDouble; - - case wxPAT_POINTER: - return wxFormatString::Arg_Pointer; - - case wxPAT_NINT: - return wxFormatString::Arg_IntPtr; - case wxPAT_NSHORTINT: - return wxFormatString::Arg_ShortIntPtr; - case wxPAT_NLONGINT: - return wxFormatString::Arg_LongIntPtr; - - case wxPAT_STAR: - // "*" requires argument of type int - return wxFormatString::Arg_Int; - - case wxPAT_INVALID: - // (handled after the switch statement) - break; - } - - // silence warning - wxFAIL_MSG( "unexpected argument type" ); - return wxFormatString::Arg_Unknown; -} - -} // anonymous namespace - -wxFormatString::ArgumentType wxFormatString::GetArgumentType(unsigned n) const -{ - if ( m_char ) - return DoGetArgumentType(m_char.data(), n); - else if ( m_wchar ) - return DoGetArgumentType(m_wchar.data(), n); - else if ( m_str ) - return DoGetArgumentType(m_str->wx_str(), n); - else if ( m_cstr ) - return DoGetArgumentType(m_cstr->AsInternal(), n); - - wxFAIL_MSG( "unreachable code" ); - return Arg_Unknown; -} diff --git a/Externals/wxWidgets3/src/common/sysopt.cpp b/Externals/wxWidgets3/src/common/sysopt.cpp deleted file mode 100644 index ede2e7a547..0000000000 --- a/Externals/wxWidgets3/src/common/sysopt.cpp +++ /dev/null @@ -1,111 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/sysopt.cpp -// Purpose: wxSystemOptions -// Author: Julian Smart -// Modified by: -// Created: 2001-07-10 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// --------------------------------------------------------------------------- -// headers -// --------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if defined(__BORLANDC__) - #pragma hdrstop -#endif - -#if wxUSE_SYSTEM_OPTIONS - -#include "wx/sysopt.h" - -#ifndef WX_PRECOMP - #include "wx/app.h" - #include "wx/list.h" - #include "wx/string.h" - #include "wx/arrstr.h" -#endif - -// ---------------------------------------------------------------------------- -// private globals -// ---------------------------------------------------------------------------- - -static wxArrayString gs_optionNames, - gs_optionValues; - -// ============================================================================ -// wxSystemOptions implementation -// ============================================================================ - -// Option functions (arbitrary name/value mapping) -void wxSystemOptions::SetOption(const wxString& name, const wxString& value) -{ - int idx = gs_optionNames.Index(name, false); - if (idx == wxNOT_FOUND) - { - gs_optionNames.Add(name); - gs_optionValues.Add(value); - } - else - { - gs_optionNames[idx] = name; - gs_optionValues[idx] = value; - } -} - -void wxSystemOptions::SetOption(const wxString& name, int value) -{ - SetOption(name, wxString::Format(wxT("%d"), value)); -} - -wxString wxSystemOptions::GetOption(const wxString& name) -{ - wxString val; - - int idx = gs_optionNames.Index(name, false); - if ( idx != wxNOT_FOUND ) - { - val = gs_optionValues[idx]; - } - else // not set explicitly - { - // look in the environment: first for a variable named "wx_appname_name" - // which can be set to affect the behaviour or just this application - // and then for "wx_name" which can be set to change the option globally - wxString var(name); - var.Replace(wxT("."), wxT("_")); // '.'s not allowed in env var names - var.Replace(wxT("-"), wxT("_")); // and neither are '-'s - - wxString appname; - if ( wxTheApp ) - appname = wxTheApp->GetAppName(); - - if ( !appname.empty() ) - val = wxGetenv(wxT("wx_") + appname + wxT('_') + var); - - if ( val.empty() ) - val = wxGetenv(wxT("wx_") + var); - } - - return val; -} - -int wxSystemOptions::GetOptionInt(const wxString& name) -{ - return wxAtoi (GetOption(name)); -} - -bool wxSystemOptions::HasOption(const wxString& name) -{ - return !GetOption(name).empty(); -} - -#endif // wxUSE_SYSTEM_OPTIONS diff --git a/Externals/wxWidgets3/src/common/tarstrm.cpp b/Externals/wxWidgets3/src/common/tarstrm.cpp deleted file mode 100644 index 944835e927..0000000000 --- a/Externals/wxWidgets3/src/common/tarstrm.cpp +++ /dev/null @@ -1,1546 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/tarstrm.cpp -// Purpose: Streams for Tar files -// Author: Mike Wetherell -// Copyright: (c) 2004 Mike Wetherell -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_TARSTREAM - -#include "wx/tarstrm.h" - -#ifndef WX_PRECOMP - #include "wx/intl.h" - #include "wx/log.h" - #include "wx/utils.h" -#endif - -#include "wx/buffer.h" -#include "wx/datetime.h" -#include "wx/scopedptr.h" -#include "wx/filename.h" -#include "wx/thread.h" - -#include - -#ifdef __UNIX__ -#include -#include -#endif - - -///////////////////////////////////////////////////////////////////////////// -// constants - -enum { - TAR_NAME, - TAR_MODE, - TAR_UID, - TAR_GID, - TAR_SIZE, - TAR_MTIME, - TAR_CHKSUM, - TAR_TYPEFLAG, - TAR_LINKNAME, - TAR_MAGIC, - TAR_VERSION, - TAR_UNAME, - TAR_GNAME, - TAR_DEVMAJOR, - TAR_DEVMINOR, - TAR_PREFIX, - TAR_UNUSED, - TAR_NUMFIELDS -}; - -enum { - TAR_BLOCKSIZE = 512 -}; - -// checksum type -enum { - SUM_UNKNOWN, - SUM_UNSIGNED, - SUM_SIGNED -}; - -// type of input tar -enum { - TYPE_OLDTAR, // fields after TAR_LINKNAME are invalid - TYPE_GNUTAR, // all fields except TAR_PREFIX are valid - TYPE_USTAR // all fields are valid -}; - -// signatures -static const char *USTAR_MAGIC = "ustar"; -static const char *USTAR_VERSION = "00"; -static const char *GNU_MAGIC = "ustar "; -static const char *GNU_VERION = " "; - -wxIMPLEMENT_DYNAMIC_CLASS(wxTarEntry, wxArchiveEntry); -wxIMPLEMENT_DYNAMIC_CLASS(wxTarClassFactory, wxArchiveClassFactory); - - -///////////////////////////////////////////////////////////////////////////// -// Class factory - -static wxTarClassFactory g_wxTarClassFactory; - -wxTarClassFactory::wxTarClassFactory() -{ - if (this == &g_wxTarClassFactory) - PushFront(); -} - -const wxChar * const * -wxTarClassFactory::GetProtocols(wxStreamProtocolType type) const -{ - static const wxChar *protocols[] = { wxT("tar"), NULL }; - static const wxChar *mimetypes[] = { wxT("application/x-tar"), NULL }; - static const wxChar *fileexts[] = { wxT(".tar"), NULL }; - static const wxChar *empty[] = { NULL }; - - switch (type) { - case wxSTREAM_PROTOCOL: return protocols; - case wxSTREAM_MIMETYPE: return mimetypes; - case wxSTREAM_FILEEXT: return fileexts; - default: return empty; - } -} - - -///////////////////////////////////////////////////////////////////////////// -// tar header block - -typedef wxFileOffset wxTarNumber; - -struct wxTarField { const wxChar *name; int pos; }; - -class wxTarHeaderBlock -{ -public: - wxTarHeaderBlock() - { memset(data, 0, sizeof(data)); } - wxTarHeaderBlock(const wxTarHeaderBlock& hb) - { memcpy(data, hb.data, sizeof(data)); } - - bool Read(wxInputStream& in); - bool Write(wxOutputStream& out); - inline bool WriteField(wxOutputStream& out, int id); - - bool IsAllZeros() const; - wxUint32 Sum(bool SignedSum = false); - wxUint32 SumField(int id); - - char *Get(int id) { return data + fields[id].pos + id; } - static size_t Len(int id) { return fields[id + 1].pos - fields[id].pos; } - static const wxChar *Name(int id) { return fields[id].name; } - static size_t Offset(int id) { return fields[id].pos; } - - bool SetOctal(int id, wxTarNumber n); - wxTarNumber GetOctal(int id); - bool SetPath(const wxString& name, wxMBConv& conv); - -private: - char data[TAR_BLOCKSIZE + TAR_NUMFIELDS]; - static const wxTarField fields[]; - static void check(); -}; - -wxDEFINE_SCOPED_PTR_TYPE(wxTarHeaderBlock) - -// A table giving the field names and offsets in a tar header block -const wxTarField wxTarHeaderBlock::fields[] = -{ - { wxT("name"), 0 }, // 100 - { wxT("mode"), 100 }, // 8 - { wxT("uid"), 108 }, // 8 - { wxT("gid"), 116 }, // 8 - { wxT("size"), 124 }, // 12 - { wxT("mtime"), 136 }, // 12 - { wxT("chksum"), 148 }, // 8 - { wxT("typeflag"), 156 }, // 1 - { wxT("linkname"), 157 }, // 100 - { wxT("magic"), 257 }, // 6 - { wxT("version"), 263 }, // 2 - { wxT("uname"), 265 }, // 32 - { wxT("gname"), 297 }, // 32 - { wxT("devmajor"), 329 }, // 8 - { wxT("devminor"), 337 }, // 8 - { wxT("prefix"), 345 }, // 155 - { wxT("unused"), 500 }, // 12 - { NULL, TAR_BLOCKSIZE } -}; - -void wxTarHeaderBlock::check() -{ -#if 0 - wxCOMPILE_TIME_ASSERT( - WXSIZEOF(fields) == TAR_NUMFIELDS + 1, - Wrong_number_of_elements_in_fields_table - ); -#endif -} - -bool wxTarHeaderBlock::IsAllZeros() const -{ - const char *p = data; - for (size_t i = 0; i < sizeof(data); i++) - if (p[i]) - return false; - return true; -} - -wxUint32 wxTarHeaderBlock::Sum(bool SignedSum /*=false*/) -{ - // the chksum field itself should be blanks during the calculation - memset(Get(TAR_CHKSUM), ' ', Len(TAR_CHKSUM)); - const char *p = data; - wxUint32 n = 0; - - if (SignedSum) - for (size_t i = 0; i < sizeof(data); i++) - n += (signed char)p[i]; - else - for (size_t i = 0; i < sizeof(data); i++) - n += (unsigned char)p[i]; - - return n; -} - -wxUint32 wxTarHeaderBlock::SumField(int id) -{ - unsigned char *p = (unsigned char*)Get(id); - unsigned char *q = p + Len(id); - wxUint32 n = 0; - - while (p < q) - n += *p++; - - return n; -} - -bool wxTarHeaderBlock::Read(wxInputStream& in) -{ - bool ok = true; - - for (int id = 0; id < TAR_NUMFIELDS && ok; id++) - ok = in.Read(Get(id), Len(id)).LastRead() == Len(id); - - return ok; -} - -bool wxTarHeaderBlock::Write(wxOutputStream& out) -{ - bool ok = true; - - for (int id = 0; id < TAR_NUMFIELDS && ok; id++) - ok = WriteField(out, id); - - return ok; -} - -inline bool wxTarHeaderBlock::WriteField(wxOutputStream& out, int id) -{ - return out.Write(Get(id), Len(id)).LastWrite() == Len(id); -} - -wxTarNumber wxTarHeaderBlock::GetOctal(int id) -{ - wxTarNumber n = 0; - const char *p = Get(id); - while (*p == ' ') - p++; - while (*p >= '0' && *p < '8') - n = (n << 3) | (*p++ - '0'); - return n; -} - -bool wxTarHeaderBlock::SetOctal(int id, wxTarNumber n) -{ - // set an octal field, return true if the number fits - char *field = Get(id); - char *p = field + Len(id); - *--p = 0; - while (p > field) { - *--p = char('0' + (n & 7)); - n >>= 3; - } - return n == 0; -} - -bool wxTarHeaderBlock::SetPath(const wxString& name, wxMBConv& conv) -{ - bool badconv = false; - -#if wxUSE_UNICODE - wxCharBuffer nameBuf = name.mb_str(conv); - - // if the conversion fails make an approximation - if (!nameBuf) { - badconv = true; - size_t len = name.length(); - wxCharBuffer approx(len); - for (size_t i = 0; i < len; i++) - { - wxChar c = name[i]; - approx.data()[i] = c & ~0x7F ? '_' : c; - } - nameBuf = approx; - } - - const char *mbName = nameBuf; -#else - const char *mbName = name.c_str(); - (void)conv; -#endif - - bool fits; - bool notGoingToFit = false; - size_t len = strlen(mbName); - size_t maxname = Len(TAR_NAME); - size_t maxprefix = Len(TAR_PREFIX); - size_t i = 0; - size_t nexti = 0; - - for (;;) { - fits = i < maxprefix && len - i <= maxname; - - if (!fits) { - const char *p = strchr(mbName + i, '/'); - if (p) - nexti = p - mbName + 1; - if (!p || nexti - 1 > maxprefix) - notGoingToFit = true; - } - - if (fits || notGoingToFit) { - strncpy(Get(TAR_NAME), mbName + i, maxname); - if (i > 0) - strncpy(Get(TAR_PREFIX), mbName, i - 1); - break; - } - - i = nexti; - } - - return fits && !badconv; -} - - -///////////////////////////////////////////////////////////////////////////// -// Some helpers - -static wxFileOffset RoundUpSize(wxFileOffset size, int factor = 1) -{ - wxFileOffset chunk = TAR_BLOCKSIZE * factor; - return ((size + chunk - 1) / chunk) * chunk; -} - -#ifdef __UNIX__ - -static wxString wxTarUserName(int uid) -{ - struct passwd *ppw; - -#ifdef HAVE_GETPWUID_R -#if defined HAVE_SYSCONF && defined _SC_GETPW_R_SIZE_MAX - long pwsize = sysconf(_SC_GETPW_R_SIZE_MAX); - size_t bufsize(wxMin(wxMax(1024l, pwsize), 32768l)); -#else - size_t bufsize = 1024; -#endif - wxCharBuffer buf(bufsize); - struct passwd pw; - - memset(&pw, 0, sizeof(pw)); - if (getpwuid_r(uid, &pw, buf.data(), bufsize, &ppw) == 0 && pw.pw_name) - return wxString(pw.pw_name, wxConvLibc); -#else - if ((ppw = getpwuid(uid)) != NULL) - return wxString(ppw->pw_name, wxConvLibc); -#endif - return _("unknown"); -} - -static wxString wxTarGroupName(int gid) -{ - struct group *pgr; -#ifdef HAVE_GETGRGID_R -#if defined HAVE_SYSCONF && defined _SC_GETGR_R_SIZE_MAX - long grsize = sysconf(_SC_GETGR_R_SIZE_MAX); - size_t bufsize(wxMin(wxMax(1024l, grsize), 32768l)); -#else - size_t bufsize = 1024; -#endif - wxCharBuffer buf(bufsize); - struct group gr; - - memset(&gr, 0, sizeof(gr)); - if (getgrgid_r(gid, &gr, buf.data(), bufsize, &pgr) == 0 && gr.gr_name) - return wxString(gr.gr_name, wxConvLibc); -#else - if ((pgr = getgrgid(gid)) != NULL) - return wxString(pgr->gr_name, wxConvLibc); -#endif - return _("unknown"); -} - -#endif // __UNIX__ - -// Cache the user and group names since getting them can be expensive, -// get both names and ids at the same time. -// -struct wxTarUser -{ - wxTarUser(); - ~wxTarUser() { delete [] uname; delete [] gname; } - - int uid; - int gid; - - wxChar *uname; - wxChar *gname; -}; - -wxTarUser::wxTarUser() -{ -#ifdef __UNIX__ - uid = getuid(); - gid = getgid(); - wxString usr = wxTarUserName(uid); - wxString grp = wxTarGroupName(gid); -#else - uid = 0; - gid = 0; - wxString usr = wxGetUserId(); - wxString grp = _("unknown"); -#endif - - uname = new wxChar[usr.length() + 1]; - wxStrcpy(uname, usr.c_str()); - - gname = new wxChar[grp.length() + 1]; - wxStrcpy(gname, grp.c_str()); -} - -static const wxTarUser& wxGetTarUser() -{ -#if wxUSE_THREADS - static wxCriticalSection cs; - wxCriticalSectionLocker lock(cs); -#endif - static wxTarUser tu; - return tu; -} - -// ignore the size field for entry types 3, 4, 5 and 6 -// -static inline wxFileOffset GetDataSize(const wxTarEntry& entry) -{ - switch (entry.GetTypeFlag()) { - case wxTAR_CHRTYPE: - case wxTAR_BLKTYPE: - case wxTAR_DIRTYPE: - case wxTAR_FIFOTYPE: - return 0; - default: - return entry.GetSize(); - } -} - - -///////////////////////////////////////////////////////////////////////////// -// Tar Entry -// Holds all the meta-data for a file in the tar - -wxTarEntry::wxTarEntry(const wxString& name /*=wxEmptyString*/, - const wxDateTime& dt /*=wxDateTime::Now()*/, - wxFileOffset size /*=0*/) - : m_Mode(0644), - m_IsModeSet(false), - m_UserId(wxGetTarUser().uid), - m_GroupId(wxGetTarUser().gid), - m_Size(size), - m_Offset(wxInvalidOffset), - m_ModifyTime(dt), - m_TypeFlag(wxTAR_REGTYPE), - m_UserName(wxGetTarUser().uname), - m_GroupName(wxGetTarUser().gname), - m_DevMajor(~0), - m_DevMinor(~0) -{ - if (!name.empty()) - SetName(name); -} - -wxTarEntry::~wxTarEntry() -{ -} - -wxTarEntry::wxTarEntry(const wxTarEntry& e) - : wxArchiveEntry(), - m_Name(e.m_Name), - m_Mode(e.m_Mode), - m_IsModeSet(e.m_IsModeSet), - m_UserId(e.m_UserId), - m_GroupId(e.m_GroupId), - m_Size(e.m_Size), - m_Offset(e.m_Offset), - m_ModifyTime(e.m_ModifyTime), - m_AccessTime(e.m_AccessTime), - m_CreateTime(e.m_CreateTime), - m_TypeFlag(e.m_TypeFlag), - m_LinkName(e.m_LinkName), - m_UserName(e.m_UserName), - m_GroupName(e.m_GroupName), - m_DevMajor(e.m_DevMajor), - m_DevMinor(e.m_DevMinor) -{ -} - -wxTarEntry& wxTarEntry::operator=(const wxTarEntry& e) -{ - if (&e != this) { - m_Name = e.m_Name; - m_Mode = e.m_Mode; - m_IsModeSet = e.m_IsModeSet; - m_UserId = e.m_UserId; - m_GroupId = e.m_GroupId; - m_Size = e.m_Size; - m_Offset = e.m_Offset; - m_ModifyTime = e.m_ModifyTime; - m_AccessTime = e.m_AccessTime; - m_CreateTime = e.m_CreateTime; - m_TypeFlag = e.m_TypeFlag; - m_LinkName = e.m_LinkName; - m_UserName = e.m_UserName; - m_GroupName = e.m_GroupName; - m_DevMajor = e.m_DevMajor; - m_DevMinor = e.m_DevMinor; - } - return *this; -} - -wxString wxTarEntry::GetName(wxPathFormat format /*=wxPATH_NATIVE*/) const -{ - bool isDir = IsDir() && !m_Name.empty(); - - // optimisations for common (and easy) cases - switch (wxFileName::GetFormat(format)) { - case wxPATH_DOS: - { - wxString name(isDir ? m_Name + wxT("\\") : m_Name); - for (size_t i = 0; i < name.length(); i++) - if (name[i] == wxT('/')) - name[i] = wxT('\\'); - return name; - } - - case wxPATH_UNIX: - return isDir ? m_Name + wxT("/") : m_Name; - - default: - ; - } - - wxFileName fn; - - if (isDir) - fn.AssignDir(m_Name, wxPATH_UNIX); - else - fn.Assign(m_Name, wxPATH_UNIX); - - return fn.GetFullPath(format); -} - -void wxTarEntry::SetName(const wxString& name, wxPathFormat format) -{ - bool isDir; - m_Name = GetInternalName(name, format, &isDir); - SetIsDir(isDir); -} - -// Static - Internally tars and zips use forward slashes for the path -// separator, absolute paths aren't allowed, and directory names have a -// trailing slash. This function converts a path into this internal format, -// but without a trailing slash for a directory. -// -wxString wxTarEntry::GetInternalName(const wxString& name, - wxPathFormat format /*=wxPATH_NATIVE*/, - bool *pIsDir /*=NULL*/) -{ - wxString internal; - - if (wxFileName::GetFormat(format) != wxPATH_UNIX) - internal = wxFileName(name, format).GetFullPath(wxPATH_UNIX); - else - internal = name; - - bool isDir = !internal.empty() && internal.Last() == '/'; - if (pIsDir) - *pIsDir = isDir; - if (isDir) - internal.erase(internal.length() - 1); - - while (!internal.empty() && *internal.begin() == '/') - internal.erase(0, 1); - while (!internal.empty() && internal.compare(0, 2, wxT("./")) == 0) - internal.erase(0, 2); - if (internal == wxT(".") || internal == wxT("..")) - internal = wxEmptyString; - - return internal; -} - -bool wxTarEntry::IsDir() const -{ - return m_TypeFlag == wxTAR_DIRTYPE; -} - -void wxTarEntry::SetIsDir(bool isDir) -{ - if (isDir) - m_TypeFlag = wxTAR_DIRTYPE; - else if (m_TypeFlag == wxTAR_DIRTYPE) - m_TypeFlag = wxTAR_REGTYPE; -} - -void wxTarEntry::SetIsReadOnly(bool isReadOnly) -{ - if (isReadOnly) - m_Mode &= ~0222; - else - m_Mode |= 0200; -} - -int wxTarEntry::GetMode() const -{ - if (m_IsModeSet || !IsDir()) - return m_Mode; - else - return m_Mode | 0111; - -} - -void wxTarEntry::SetMode(int mode) -{ - m_Mode = mode & 07777; - m_IsModeSet = true; -} - - -///////////////////////////////////////////////////////////////////////////// -// Input stream - -wxDECLARE_SCOPED_PTR(wxTarEntry, wxTarEntryPtr_) -wxDEFINE_SCOPED_PTR (wxTarEntry, wxTarEntryPtr_) - -wxTarInputStream::wxTarInputStream(wxInputStream& stream, - wxMBConv& conv /*=wxConvLocal*/) - : wxArchiveInputStream(stream, conv) -{ - Init(); -} - -wxTarInputStream::wxTarInputStream(wxInputStream *stream, - wxMBConv& conv /*=wxConvLocal*/) - : wxArchiveInputStream(stream, conv) -{ - Init(); -} - -void wxTarInputStream::Init() -{ - m_pos = wxInvalidOffset; - m_offset = 0; - m_size = wxInvalidOffset; - m_sumType = SUM_UNKNOWN; - m_tarType = TYPE_USTAR; - m_hdr = new wxTarHeaderBlock; - m_HeaderRecs = NULL; - m_GlobalHeaderRecs = NULL; - m_lasterror = m_parent_i_stream->GetLastError(); -} - -wxTarInputStream::~wxTarInputStream() -{ - delete m_hdr; - delete m_HeaderRecs; - delete m_GlobalHeaderRecs; -} - -wxTarEntry *wxTarInputStream::GetNextEntry() -{ - m_lasterror = ReadHeaders(); - - if (!IsOk()) - return NULL; - - wxTarEntryPtr_ entry(new wxTarEntry); - - entry->SetMode(GetHeaderNumber(TAR_MODE)); - entry->SetUserId(GetHeaderNumber(TAR_UID)); - entry->SetGroupId(GetHeaderNumber(TAR_UID)); - entry->SetSize(GetHeaderNumber(TAR_SIZE)); - - entry->SetOffset(m_offset); - - entry->SetDateTime(GetHeaderDate(wxT("mtime"))); - entry->SetAccessTime(GetHeaderDate(wxT("atime"))); - entry->SetCreateTime(GetHeaderDate(wxT("ctime"))); - - entry->SetTypeFlag(*m_hdr->Get(TAR_TYPEFLAG)); - bool isDir = entry->IsDir(); - - entry->SetLinkName(GetHeaderString(TAR_LINKNAME)); - - if (m_tarType != TYPE_OLDTAR) { - entry->SetUserName(GetHeaderString(TAR_UNAME)); - entry->SetGroupName(GetHeaderString(TAR_GNAME)); - - entry->SetDevMajor(GetHeaderNumber(TAR_DEVMAJOR)); - entry->SetDevMinor(GetHeaderNumber(TAR_DEVMINOR)); - } - - entry->SetName(GetHeaderPath(), wxPATH_UNIX); - if (isDir) - entry->SetIsDir(); - - if (m_HeaderRecs) - m_HeaderRecs->clear(); - - m_size = GetDataSize(*entry); - m_pos = 0; - - return entry.release(); -} - -bool wxTarInputStream::OpenEntry(wxTarEntry& entry) -{ - wxFileOffset offset = entry.GetOffset(); - - if (GetLastError() != wxSTREAM_READ_ERROR - && m_parent_i_stream->IsSeekable() - && m_parent_i_stream->SeekI(offset) == offset) - { - m_offset = offset; - m_size = GetDataSize(entry); - m_pos = 0; - m_lasterror = wxSTREAM_NO_ERROR; - return true; - } else { - m_lasterror = wxSTREAM_READ_ERROR; - return false; - } -} - -bool wxTarInputStream::OpenEntry(wxArchiveEntry& entry) -{ - wxTarEntry *tarEntry = wxStaticCast(&entry, wxTarEntry); - return tarEntry ? OpenEntry(*tarEntry) : false; -} - -bool wxTarInputStream::CloseEntry() -{ - if (m_lasterror == wxSTREAM_READ_ERROR) - return false; - if (!IsOpened()) - return true; - - wxFileOffset size = RoundUpSize(m_size); - wxFileOffset remainder = size - m_pos; - - if (remainder && m_parent_i_stream->IsSeekable()) { - wxLogNull nolog; - if (m_parent_i_stream->SeekI(remainder, wxFromCurrent) - != wxInvalidOffset) - remainder = 0; - } - - if (remainder) { - const int BUFSIZE = 8192; - wxCharBuffer buf(BUFSIZE); - - while (remainder > 0 && m_parent_i_stream->IsOk()) - remainder -= m_parent_i_stream->Read( - buf.data(), wxMin(BUFSIZE, remainder)).LastRead(); - } - - m_pos = wxInvalidOffset; - m_offset += size; - m_lasterror = m_parent_i_stream->GetLastError(); - - return IsOk(); -} - -wxStreamError wxTarInputStream::ReadHeaders() -{ - if (!CloseEntry()) - return wxSTREAM_READ_ERROR; - - bool done = false; - - while (!done) { - m_hdr->Read(*m_parent_i_stream); - if (m_parent_i_stream->Eof()) - { - wxLogError(_("incomplete header block in tar")); - } - if (!*m_parent_i_stream) - return wxSTREAM_READ_ERROR; - m_offset += TAR_BLOCKSIZE; - - // an all-zero header marks the end of the tar - if (m_hdr->IsAllZeros()) - return wxSTREAM_EOF; - - // the checksum is supposed to be the unsigned sum of the header bytes, - // but there have been versions of tar that used the signed sum, so - // accept that too, but only if used throughout. - wxUint32 chksum = m_hdr->GetOctal(TAR_CHKSUM); - bool ok = false; - - if (m_sumType != SUM_SIGNED) { - ok = chksum == m_hdr->Sum(); - if (m_sumType == SUM_UNKNOWN) - m_sumType = ok ? SUM_UNSIGNED : SUM_SIGNED; - } - if (m_sumType == SUM_SIGNED) - ok = chksum == m_hdr->Sum(true); - if (!ok) { - wxLogError(_("checksum failure reading tar header block")); - return wxSTREAM_READ_ERROR; - } - - if (strcmp(m_hdr->Get(TAR_MAGIC), USTAR_MAGIC) == 0) - m_tarType = TYPE_USTAR; - else if (strcmp(m_hdr->Get(TAR_MAGIC), GNU_MAGIC) == 0 && - strcmp(m_hdr->Get(TAR_VERSION), GNU_VERION) == 0) - m_tarType = TYPE_GNUTAR; - else - m_tarType = TYPE_OLDTAR; - - if (m_tarType != TYPE_USTAR) - break; - - switch (*m_hdr->Get(TAR_TYPEFLAG)) { - case 'g': ReadExtendedHeader(m_GlobalHeaderRecs); break; - case 'x': ReadExtendedHeader(m_HeaderRecs); break; - default: done = true; - } - } - - return wxSTREAM_NO_ERROR; -} - -wxString wxTarInputStream::GetExtendedHeader(const wxString& key) const -{ - wxTarHeaderRecords::iterator it; - - // look at normal extended header records first - if (m_HeaderRecs) { - it = m_HeaderRecs->find(key); - if (it != m_HeaderRecs->end()) - return wxString(it->second.wc_str(wxConvUTF8), GetConv()); - } - - // if not found, look at the global header records - if (m_GlobalHeaderRecs) { - it = m_GlobalHeaderRecs->find(key); - if (it != m_GlobalHeaderRecs->end()) - return wxString(it->second.wc_str(wxConvUTF8), GetConv()); - } - - return wxEmptyString; -} - -wxString wxTarInputStream::GetHeaderPath() const -{ - wxString path; - - if ((path = GetExtendedHeader(wxT("path"))) != wxEmptyString) - return path; - - path = wxString(m_hdr->Get(TAR_NAME), GetConv()); - if (m_tarType != TYPE_USTAR) - return path; - - const char *prefix = m_hdr->Get(TAR_PREFIX); - return *prefix ? wxString(prefix, GetConv()) + wxT("/") + path : path; -} - -wxDateTime wxTarInputStream::GetHeaderDate(const wxString& key) const -{ - wxString value; - - // try extended header, stored as decimal seconds since the epoch - if ((value = GetExtendedHeader(key)) != wxEmptyString) { - wxLongLong ll; - ll.Assign(wxAtof(value) * 1000.0); - return ll; - } - - if (key == wxT("mtime")) - return wxLongLong(m_hdr->GetOctal(TAR_MTIME)) * 1000L; - - return wxDateTime(); -} - -wxTarNumber wxTarInputStream::GetHeaderNumber(int id) const -{ - wxString value; - - if ((value = GetExtendedHeader(m_hdr->Name(id))) != wxEmptyString) { - wxTarNumber n = 0; - wxString::const_iterator p = value.begin(); - while (p != value.end() && *p == ' ') - p++; - while (isdigit(*p)) - n = n * 10 + (*p++ - '0'); - return n; - } else { - return m_hdr->GetOctal(id); - } -} - -wxString wxTarInputStream::GetHeaderString(int id) const -{ - wxString value; - - if ((value = GetExtendedHeader(m_hdr->Name(id))) != wxEmptyString) - return value; - - return wxString(m_hdr->Get(id), GetConv()); -} - -// An extended header consists of one or more records, each constructed: -// "%d %s=%s\n", , , -// is the byte length, and are UTF-8 - -bool wxTarInputStream::ReadExtendedHeader(wxTarHeaderRecords*& recs) -{ - if (!recs) - recs = new wxTarHeaderRecords; - - // round length up to a whole number of blocks - size_t len = m_hdr->GetOctal(TAR_SIZE); - size_t size = RoundUpSize(len); - - // read in the whole header since it should be small - wxCharBuffer buf(size); - size_t lastread = m_parent_i_stream->Read(buf.data(), size).LastRead(); - if (lastread < len) - len = lastread; - buf.data()[len] = 0; - m_offset += lastread; - - size_t recPos, recSize; - bool ok = true; - - for (recPos = 0; recPos < len && ok; recPos += recSize) { - char *pRec = buf.data() + recPos; - char *p = pRec; - - // read the record size (byte count in ascii decimal) - recSize = 0; - while (isdigit((unsigned char) *p)) - recSize = recSize * 10 + *p++ - '0'; - - // validity checks - if (recPos + recSize > len) - break; - if (recSize < p - pRec + (size_t)3 || *p != ' ' - || pRec[recSize - 1] != '\012') { - ok = false; - continue; - } - - // replace the final '\n' with a nul, to terminate value - pRec[recSize - 1] = 0; - // the key is here, following the space - char *pKey = ++p; - - // look forward for the '=', the value follows - while (*p && *p != '=') - p++; - if (!*p) { - ok = false; - continue; - } - // replace the '=' with a nul, to terminate the key - *p++ = 0; - - wxString key(wxConvUTF8.cMB2WC(pKey), GetConv()); - wxString value(wxConvUTF8.cMB2WC(p), GetConv()); - - // an empty value unsets a previously given value - if (value.empty()) - recs->erase(key); - else - (*recs)[key] = value; - } - - if (!ok || recPos < len || size != lastread) { - wxLogWarning(_("invalid data in extended tar header")); - return false; - } - - return true; -} - -wxFileOffset wxTarInputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode) -{ - if (!IsOpened()) { - wxLogError(_("tar entry not open")); - m_lasterror = wxSTREAM_READ_ERROR; - } - if (!IsOk()) - return wxInvalidOffset; - - switch (mode) { - case wxFromStart: break; - case wxFromCurrent: pos += m_pos; break; - case wxFromEnd: pos += m_size; break; - } - - if (pos < 0 || m_parent_i_stream->SeekI(m_offset + pos) == wxInvalidOffset) - return wxInvalidOffset; - - m_pos = pos; - return m_pos; -} - -size_t wxTarInputStream::OnSysRead(void *buffer, size_t size) -{ - if (!IsOpened()) { - wxLogError(_("tar entry not open")); - m_lasterror = wxSTREAM_READ_ERROR; - } - if (!IsOk() || !size) - return 0; - - if (m_pos >= m_size) - size = 0; - else if (m_pos + size > m_size + (size_t)0) - size = m_size - m_pos; - - size_t lastread = m_parent_i_stream->Read(buffer, size).LastRead(); - m_pos += lastread; - - if (m_pos >= m_size) { - m_lasterror = wxSTREAM_EOF; - } else if (!m_parent_i_stream->IsOk()) { - // any other error will have been reported by the underlying stream - if (m_parent_i_stream->Eof()) - { - wxLogError(_("unexpected end of file")); - } - m_lasterror = wxSTREAM_READ_ERROR; - } - - return lastread; -} - - -///////////////////////////////////////////////////////////////////////////// -// Output stream - -wxTarOutputStream::wxTarOutputStream(wxOutputStream& stream, - wxTarFormat format /*=wxTAR_PAX*/, - wxMBConv& conv /*=wxConvLocal*/) - : wxArchiveOutputStream(stream, conv) -{ - Init(format); -} - -wxTarOutputStream::wxTarOutputStream(wxOutputStream *stream, - wxTarFormat format /*=wxTAR_PAX*/, - wxMBConv& conv /*=wxConvLocal*/) - : wxArchiveOutputStream(stream, conv) -{ - Init(format); -} - -void wxTarOutputStream::Init(wxTarFormat format) -{ - m_pos = wxInvalidOffset; - m_maxpos = wxInvalidOffset; - m_size = wxInvalidOffset; - m_headpos = wxInvalidOffset; - m_datapos = wxInvalidOffset; - m_tarstart = wxInvalidOffset; - m_tarsize = 0; - m_pax = format == wxTAR_PAX; - m_BlockingFactor = m_pax ? 10 : 20; - m_chksum = 0; - m_large = false; - m_hdr = new wxTarHeaderBlock; - m_hdr2 = NULL; - m_extendedHdr = NULL; - m_extendedSize = 0; - m_lasterror = m_parent_o_stream->GetLastError(); - m_endrecWritten = false; -} - -wxTarOutputStream::~wxTarOutputStream() -{ - Close(); - delete m_hdr; - delete m_hdr2; - delete [] m_extendedHdr; -} - -bool wxTarOutputStream::PutNextEntry(wxTarEntry *entry) -{ - wxTarEntryPtr_ e(entry); - - if (!CloseEntry()) - return false; - - if (!m_tarsize) { - wxLogNull nolog; - m_tarstart = m_parent_o_stream->TellO(); - } - - if (m_tarstart != wxInvalidOffset) - m_headpos = m_tarstart + m_tarsize; - - if (WriteHeaders(*e)) { - m_pos = 0; - m_maxpos = 0; - m_size = GetDataSize(*e); - if (m_tarstart != wxInvalidOffset) - m_datapos = m_tarstart + m_tarsize; - - // types that are not allowed any data - const char nodata[] = { - wxTAR_LNKTYPE, wxTAR_SYMTYPE, wxTAR_CHRTYPE, wxTAR_BLKTYPE, - wxTAR_DIRTYPE, wxTAR_FIFOTYPE, 0 - }; - int typeflag = e->GetTypeFlag(); - - // pax does now allow data for wxTAR_LNKTYPE - if (!m_pax || typeflag != wxTAR_LNKTYPE) - if (strchr(nodata, typeflag) != NULL) - CloseEntry(); - } - - return IsOk(); -} - -bool wxTarOutputStream::PutNextEntry(const wxString& name, - const wxDateTime& dt, - wxFileOffset size) -{ - return PutNextEntry(new wxTarEntry(name, dt, size)); -} - -bool wxTarOutputStream::PutNextDirEntry(const wxString& name, - const wxDateTime& dt) -{ - wxTarEntry *entry = new wxTarEntry(name, dt); - entry->SetIsDir(); - return PutNextEntry(entry); -} - -bool wxTarOutputStream::PutNextEntry(wxArchiveEntry *entry) -{ - wxTarEntry *tarEntry = wxStaticCast(entry, wxTarEntry); - if (!tarEntry) - delete entry; - return PutNextEntry(tarEntry); -} - -bool wxTarOutputStream::CopyEntry(wxTarEntry *entry, - wxTarInputStream& inputStream) -{ - if (PutNextEntry(entry)) - Write(inputStream); - return IsOk() && inputStream.Eof(); -} - -bool wxTarOutputStream::CopyEntry(wxArchiveEntry *entry, - wxArchiveInputStream& inputStream) -{ - if (PutNextEntry(entry)) - Write(inputStream); - return IsOk() && inputStream.Eof(); -} - -bool wxTarOutputStream::CloseEntry() -{ - if (!IsOpened()) - return true; - - if (m_pos < m_maxpos) { - wxASSERT(m_parent_o_stream->IsSeekable()); - m_parent_o_stream->SeekO(m_datapos + m_maxpos); - m_lasterror = m_parent_o_stream->GetLastError(); - m_pos = m_maxpos; - } - - if (IsOk()) { - wxFileOffset size = RoundUpSize(m_pos); - if (size > m_pos) { - memset(m_hdr, 0, size - m_pos); - m_parent_o_stream->Write(m_hdr, size - m_pos); - m_lasterror = m_parent_o_stream->GetLastError(); - } - m_tarsize += size; - } - - if (IsOk() && m_pos != m_size) - ModifyHeader(); - - m_pos = wxInvalidOffset; - m_maxpos = wxInvalidOffset; - m_size = wxInvalidOffset; - m_headpos = wxInvalidOffset; - m_datapos = wxInvalidOffset; - - return IsOk(); -} - -bool wxTarOutputStream::Close() -{ - if (!CloseEntry() || (m_tarsize == 0 && m_endrecWritten)) - return false; - - memset(m_hdr, 0, sizeof(*m_hdr)); - int count = (RoundUpSize(m_tarsize + 2 * TAR_BLOCKSIZE, m_BlockingFactor) - - m_tarsize) / TAR_BLOCKSIZE; - while (count--) - m_parent_o_stream->Write(m_hdr, TAR_BLOCKSIZE); - - m_tarsize = 0; - m_tarstart = wxInvalidOffset; - m_lasterror = m_parent_o_stream->GetLastError(); - m_endrecWritten = true; - return IsOk(); -} - -bool wxTarOutputStream::WriteHeaders(wxTarEntry& entry) -{ - memset(m_hdr, 0, sizeof(*m_hdr)); - - SetHeaderPath(entry.GetName(wxPATH_UNIX)); - - SetHeaderNumber(TAR_MODE, entry.GetMode()); - SetHeaderNumber(TAR_UID, entry.GetUserId()); - SetHeaderNumber(TAR_GID, entry.GetGroupId()); - - if (entry.GetSize() == wxInvalidOffset) - entry.SetSize(0); - m_large = !SetHeaderNumber(TAR_SIZE, entry.GetSize()); - - SetHeaderDate(wxT("mtime"), entry.GetDateTime()); - if (entry.GetAccessTime().IsValid()) - SetHeaderDate(wxT("atime"), entry.GetAccessTime()); - if (entry.GetCreateTime().IsValid()) - SetHeaderDate(wxT("ctime"), entry.GetCreateTime()); - - *m_hdr->Get(TAR_TYPEFLAG) = char(entry.GetTypeFlag()); - - strcpy(m_hdr->Get(TAR_MAGIC), USTAR_MAGIC); - strcpy(m_hdr->Get(TAR_VERSION), USTAR_VERSION); - - SetHeaderString(TAR_LINKNAME, entry.GetLinkName()); - SetHeaderString(TAR_UNAME, entry.GetUserName()); - SetHeaderString(TAR_GNAME, entry.GetGroupName()); - - if (~entry.GetDevMajor()) - SetHeaderNumber(TAR_DEVMAJOR, entry.GetDevMajor()); - if (~entry.GetDevMinor()) - SetHeaderNumber(TAR_DEVMINOR, entry.GetDevMinor()); - - m_chksum = m_hdr->Sum(); - m_hdr->SetOctal(TAR_CHKSUM, m_chksum); - if (!m_large) - m_chksum -= m_hdr->SumField(TAR_SIZE); - - // The main header is now fully prepared so we know what extended headers - // (if any) will be needed. Output any extended headers before writing - // the main header. - if (m_extendedHdr && *m_extendedHdr) { - wxASSERT(m_pax); - // the extended headers are written to the tar as a file entry, - // so prepare a regular header block for the pseudo-file. - if (!m_hdr2) - m_hdr2 = new wxTarHeaderBlock; - memset(m_hdr2, 0, sizeof(*m_hdr2)); - - // an old tar that doesn't understand extended headers will - // extract it as a file, so give these fields reasonable values - // so that the user will have access to read and remove it. - m_hdr2->SetPath(PaxHeaderPath(wxT("%d/PaxHeaders.%p/%f"), - entry.GetName(wxPATH_UNIX)), GetConv()); - m_hdr2->SetOctal(TAR_MODE, 0600); - strcpy(m_hdr2->Get(TAR_UID), m_hdr->Get(TAR_UID)); - strcpy(m_hdr2->Get(TAR_GID), m_hdr->Get(TAR_GID)); - size_t length = strlen(m_extendedHdr); - m_hdr2->SetOctal(TAR_SIZE, length); - strcpy(m_hdr2->Get(TAR_MTIME), m_hdr->Get(TAR_MTIME)); - *m_hdr2->Get(TAR_TYPEFLAG) = 'x'; - strcpy(m_hdr2->Get(TAR_MAGIC), USTAR_MAGIC); - strcpy(m_hdr2->Get(TAR_VERSION), USTAR_VERSION); - strcpy(m_hdr2->Get(TAR_UNAME), m_hdr->Get(TAR_UNAME)); - strcpy(m_hdr2->Get(TAR_GNAME), m_hdr->Get(TAR_GNAME)); - - m_hdr2->SetOctal(TAR_CHKSUM, m_hdr2->Sum()); - - m_hdr2->Write(*m_parent_o_stream); - m_tarsize += TAR_BLOCKSIZE; - - size_t rounded = RoundUpSize(length); - memset(m_extendedHdr + length, 0, rounded - length); - m_parent_o_stream->Write(m_extendedHdr, rounded); - m_tarsize += rounded; - - *m_extendedHdr = 0; - - // update m_headpos which is used to seek back to fix up the file - // length if it is not known in advance - if (m_tarstart != wxInvalidOffset) - m_headpos = m_tarstart + m_tarsize; - } - - // if don't have extended headers just report error - if (!m_badfit.empty()) { - wxASSERT(!m_pax); - wxLogWarning(_("%s did not fit the tar header for entry '%s'"), - m_badfit.c_str(), entry.GetName().c_str()); - m_badfit.clear(); - } - - m_hdr->Write(*m_parent_o_stream); - m_tarsize += TAR_BLOCKSIZE; - m_lasterror = m_parent_o_stream->GetLastError(); - - return IsOk(); -} - -wxString wxTarOutputStream::PaxHeaderPath(const wxString& format, - const wxString& path) -{ - wxString d = path.BeforeLast(wxT('/')); - wxString f = path.AfterLast(wxT('/')); - wxString ret; - - if (d.empty()) - d = wxT("."); - - ret.reserve(format.length() + path.length() + 16); - - size_t begin = 0; - size_t end; - - for (;;) { - end = format.find('%', begin); - if (end == wxString::npos || end + 1 >= format.length()) - break; - ret << format.substr(begin, end - begin); - switch ( format[end + 1].GetValue() ) { - case 'd': ret << d; break; - case 'f': ret << f; break; - case 'p': ret << wxGetProcessId(); break; - case '%': ret << wxT("%"); break; - } - begin = end + 2; - } - - ret << format.substr(begin); - - return ret; -} - -bool wxTarOutputStream::ModifyHeader() -{ - wxFileOffset originalPos = wxInvalidOffset; - wxFileOffset sizePos = wxInvalidOffset; - - if (!m_large && m_headpos != wxInvalidOffset - && m_parent_o_stream->IsSeekable()) - { - wxLogNull nolog; - originalPos = m_parent_o_stream->TellO(); - if (originalPos != wxInvalidOffset) - sizePos = - m_parent_o_stream->SeekO(m_headpos + m_hdr->Offset(TAR_SIZE)); - } - - if (sizePos == wxInvalidOffset || !m_hdr->SetOctal(TAR_SIZE, m_pos)) { - wxLogError(_("incorrect size given for tar entry")); - m_lasterror = wxSTREAM_WRITE_ERROR; - return false; - } - - m_chksum += m_hdr->SumField(TAR_SIZE); - m_hdr->SetOctal(TAR_CHKSUM, m_chksum); - wxFileOffset sumPos = m_headpos + m_hdr->Offset(TAR_CHKSUM); - - return - m_hdr->WriteField(*m_parent_o_stream, TAR_SIZE) && - m_parent_o_stream->SeekO(sumPos) == sumPos && - m_hdr->WriteField(*m_parent_o_stream, TAR_CHKSUM) && - m_parent_o_stream->SeekO(originalPos) == originalPos; -} - -void wxTarOutputStream::SetHeaderPath(const wxString& name) -{ - if (!m_hdr->SetPath(name, GetConv()) || (m_pax && !name.IsAscii())) - SetExtendedHeader(wxT("path"), name); -} - -bool wxTarOutputStream::SetHeaderNumber(int id, wxTarNumber n) -{ - if (m_hdr->SetOctal(id, n)) { - return true; - } else { - SetExtendedHeader(m_hdr->Name(id), wxLongLong(n).ToString()); - return false; - } -} - -void wxTarOutputStream::SetHeaderString(int id, const wxString& str) -{ - strncpy(m_hdr->Get(id), str.mb_str(GetConv()), m_hdr->Len(id)); - if (str.length() > m_hdr->Len(id)) - SetExtendedHeader(m_hdr->Name(id), str); -} - -void wxTarOutputStream::SetHeaderDate(const wxString& key, - const wxDateTime& datetime) -{ - wxLongLong ll = datetime.IsValid() ? datetime.GetValue() : wxLongLong(0); - wxLongLong secs = ll / 1000L; - - if (key != wxT("mtime") - || !m_hdr->SetOctal(TAR_MTIME, wxTarNumber(secs.GetValue())) - || secs <= 0 || secs >= 0x7fffffff) - { - wxString str; - if (ll >= LONG_MIN && ll <= LONG_MAX) { - str.Printf(wxT("%g"), ll.ToLong() / 1000.0); - } else { - str = ll.ToString(); - str.insert(str.end() - 3, '.'); - } - SetExtendedHeader(key, str); - } -} - -void wxTarOutputStream::SetExtendedHeader(const wxString& key, - const wxString& value) -{ - if (m_pax) { -#if wxUSE_UNICODE - const wxCharBuffer utf_key = key.utf8_str(); - const wxCharBuffer utf_value = value.utf8_str(); -#else - const wxWX2WCbuf wide_key = key.wc_str(GetConv()); - const wxCharBuffer utf_key = wxConvUTF8.cWC2MB(wide_key); - - const wxWX2WCbuf wide_value = value.wc_str(GetConv()); - const wxCharBuffer utf_value = wxConvUTF8.cWC2MB(wide_value); -#endif // wxUSE_UNICODE/!wxUSE_UNICODE - - // a small buffer to format the length field in - char buf[32]; - // length of "99=\n" - unsigned long length = strlen(utf_value) + strlen(utf_key) + 5; - sprintf(buf, "%lu", length); - // the length includes itself - size_t lenlen = strlen(buf); - if (lenlen != 2) { - length += lenlen - 2; - sprintf(buf, "%lu", length); - if (strlen(buf) > lenlen) - sprintf(buf, "%lu", ++length); - } - - // reallocate m_extendedHdr if it's not big enough - if (m_extendedSize < length) { - size_t rounded = RoundUpSize(length); - m_extendedSize <<= 1; - if (rounded > m_extendedSize) - m_extendedSize = rounded; - char *oldHdr = m_extendedHdr; - m_extendedHdr = new char[m_extendedSize]; - if (oldHdr) { - strcpy(m_extendedHdr, oldHdr); - delete oldHdr; - } else { - *m_extendedHdr = 0; - } - } - - // append the new record - char *append = strchr(m_extendedHdr, 0); - sprintf(append, "%s %s=%s\012", buf, - (const char*)utf_key, (const char*)utf_value); - } - else { - // if not pax then make a list of fields to report as errors - if (!m_badfit.empty()) - m_badfit += wxT(", "); - m_badfit += key; - } -} - -void wxTarOutputStream::Sync() -{ - m_parent_o_stream->Sync(); -} - -wxFileOffset wxTarOutputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode) -{ - if (!IsOpened()) { - wxLogError(_("tar entry not open")); - m_lasterror = wxSTREAM_WRITE_ERROR; - } - if (!IsOk() || m_datapos == wxInvalidOffset) - return wxInvalidOffset; - - switch (mode) { - case wxFromStart: break; - case wxFromCurrent: pos += m_pos; break; - case wxFromEnd: pos += m_maxpos; break; - } - - if (pos < 0 || m_parent_o_stream->SeekO(m_datapos + pos) == wxInvalidOffset) - return wxInvalidOffset; - - m_pos = pos; - return m_pos; -} - -size_t wxTarOutputStream::OnSysWrite(const void *buffer, size_t size) -{ - if (!IsOpened()) { - wxLogError(_("tar entry not open")); - m_lasterror = wxSTREAM_WRITE_ERROR; - } - if (!IsOk() || !size) - return 0; - - size_t lastwrite = m_parent_o_stream->Write(buffer, size).LastWrite(); - m_pos += lastwrite; - if (m_pos > m_maxpos) - m_maxpos = m_pos; - - if (lastwrite != size) - m_lasterror = wxSTREAM_WRITE_ERROR; - - return lastwrite; -} - -#endif // wxUSE_TARSTREAM diff --git a/Externals/wxWidgets3/src/common/taskbarcmn.cpp b/Externals/wxWidgets3/src/common/taskbarcmn.cpp deleted file mode 100644 index 5a8a7728d4..0000000000 --- a/Externals/wxWidgets3/src/common/taskbarcmn.cpp +++ /dev/null @@ -1,63 +0,0 @@ -///////////////////////////////////////////////////////////////////////// -// File: src/common/taskbarcmn.cpp -// Purpose: Common parts of wxTaskBarIcon class -// Author: Julian Smart -// Modified by: -// Created: 04/04/2003 -// Copyright: (c) Julian Smart, 2003 -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_TASKBARICON - -#include "wx/taskbar.h" - -#ifndef WX_PRECOMP - #include "wx/app.h" - #include "wx/list.h" - #include "wx/menu.h" -#endif - -extern WXDLLIMPEXP_DATA_CORE(wxList) wxPendingDelete; - -// DLL options compatibility check: -WX_CHECK_BUILD_OPTIONS("wxAdvanced") - -wxDEFINE_EVENT( wxEVT_TASKBAR_MOVE, wxTaskBarIconEvent ); -wxDEFINE_EVENT( wxEVT_TASKBAR_LEFT_DOWN, wxTaskBarIconEvent ); -wxDEFINE_EVENT( wxEVT_TASKBAR_LEFT_UP, wxTaskBarIconEvent ); -wxDEFINE_EVENT( wxEVT_TASKBAR_RIGHT_DOWN, wxTaskBarIconEvent ); -wxDEFINE_EVENT( wxEVT_TASKBAR_RIGHT_UP, wxTaskBarIconEvent ); -wxDEFINE_EVENT( wxEVT_TASKBAR_LEFT_DCLICK, wxTaskBarIconEvent ); -wxDEFINE_EVENT( wxEVT_TASKBAR_RIGHT_DCLICK, wxTaskBarIconEvent ); -wxDEFINE_EVENT( wxEVT_TASKBAR_BALLOON_TIMEOUT, wxTaskBarIconEvent ); -wxDEFINE_EVENT( wxEVT_TASKBAR_BALLOON_CLICK, wxTaskBarIconEvent ); - - -wxBEGIN_EVENT_TABLE(wxTaskBarIconBase, wxEvtHandler) - EVT_TASKBAR_CLICK(wxTaskBarIconBase::OnRightButtonDown) -wxEND_EVENT_TABLE() - -void wxTaskBarIconBase::OnRightButtonDown(wxTaskBarIconEvent& WXUNUSED(event)) -{ - wxMenu *menu = CreatePopupMenu(); - if (menu) - { - PopupMenu(menu); - delete menu; - } -} - -void wxTaskBarIconBase::Destroy() -{ - wxPendingDelete.Append(this); -} - -#endif // wxUSE_TASKBARICON diff --git a/Externals/wxWidgets3/src/common/tbarbase.cpp b/Externals/wxWidgets3/src/common/tbarbase.cpp deleted file mode 100644 index a5b9192dac..0000000000 --- a/Externals/wxWidgets3/src/common/tbarbase.cpp +++ /dev/null @@ -1,767 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/tbarbase.cpp -// Purpose: wxToolBarBase implementation -// Author: Julian Smart -// Modified by: VZ at 11.12.99 (wxScrollableToolBar split off) -// Created: 04/01/98 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_TOOLBAR - -#include "wx/toolbar.h" - -#ifndef WX_PRECOMP - #include "wx/control.h" - #include "wx/frame.h" - #include "wx/settings.h" - #if WXWIN_COMPATIBILITY_2_8 - #include "wx/image.h" - #endif // WXWIN_COMPATIBILITY_2_8 - #include "wx/menu.h" -#endif - -extern WXDLLEXPORT_DATA(const char) wxToolBarNameStr[] = "toolbar"; - -// ---------------------------------------------------------------------------- -// wxWidgets macros -// ---------------------------------------------------------------------------- - -wxBEGIN_EVENT_TABLE(wxToolBarBase, wxControl) -wxEND_EVENT_TABLE() - -#include "wx/listimpl.cpp" - -WX_DEFINE_LIST(wxToolBarToolsList) - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxToolBarToolBase -// ---------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxToolBarToolBase, wxObject); - -wxToolBarToolBase::~wxToolBarToolBase() -{ -#if wxUSE_MENUS - delete m_dropdownMenu; -#endif - - if ( IsControl() ) - GetControl()->Destroy(); -} - - -bool wxToolBarToolBase::Enable(bool enable) -{ - if ( m_enabled == enable ) - return false; - - m_enabled = enable; - - return true; -} - -bool wxToolBarToolBase::Toggle(bool toggle) -{ - wxASSERT_MSG( CanBeToggled(), wxT("can't toggle this tool") ); - - if ( m_toggled == toggle ) - return false; - - m_toggled = toggle; - - return true; -} - -bool wxToolBarToolBase::SetToggle(bool toggle) -{ - wxItemKind kind = toggle ? wxITEM_CHECK : wxITEM_NORMAL; - if ( m_kind == kind ) - return false; - - m_kind = kind; - - return true; -} - -bool wxToolBarToolBase::SetShortHelp(const wxString& help) -{ - if ( m_shortHelpString == help ) - return false; - - m_shortHelpString = help; - - return true; -} - -bool wxToolBarToolBase::SetLongHelp(const wxString& help) -{ - if ( m_longHelpString == help ) - return false; - - m_longHelpString = help; - - return true; -} - - -#if wxUSE_MENUS -void wxToolBarToolBase::SetDropdownMenu(wxMenu* menu) -{ - delete m_dropdownMenu; - m_dropdownMenu = menu; -} -#endif - - -// ---------------------------------------------------------------------------- -// wxToolBarBase adding/deleting items -// ---------------------------------------------------------------------------- - -wxToolBarBase::wxToolBarBase() -{ - // the list owns the pointers - m_xMargin = m_yMargin = 0; - m_maxRows = m_maxCols = 0; - m_toolPacking = m_toolSeparation = 0; - m_defaultWidth = 16; - m_defaultHeight = 15; -} - -void wxToolBarBase::FixupStyle() -{ - if ( !HasFlag(wxTB_TOP | wxTB_LEFT | wxTB_RIGHT | wxTB_BOTTOM) ) - { - // this is the default - m_windowStyle |= wxTB_TOP; - } -} - -wxToolBarToolBase *wxToolBarBase::DoAddTool(int toolid, - const wxString& label, - const wxBitmap& bitmap, - const wxBitmap& bmpDisabled, - wxItemKind kind, - const wxString& shortHelp, - const wxString& longHelp, - wxObject *clientData, - wxCoord WXUNUSED(xPos), - wxCoord WXUNUSED(yPos)) -{ - InvalidateBestSize(); - return InsertTool(GetToolsCount(), toolid, label, bitmap, bmpDisabled, - kind, shortHelp, longHelp, clientData); -} - -wxToolBarToolBase *wxToolBarBase::InsertTool(size_t pos, - int toolid, - const wxString& label, - const wxBitmap& bitmap, - const wxBitmap& bmpDisabled, - wxItemKind kind, - const wxString& shortHelp, - const wxString& longHelp, - wxObject *clientData) -{ - wxCHECK_MSG( pos <= GetToolsCount(), NULL, - wxT("invalid position in wxToolBar::InsertTool()") ); - - return DoInsertNewTool(pos, CreateTool(toolid, label, bitmap, bmpDisabled, kind, - clientData, shortHelp, longHelp)); -} - -wxToolBarToolBase *wxToolBarBase::AddTool(wxToolBarToolBase *tool) -{ - return InsertTool(GetToolsCount(), tool); -} - -wxToolBarToolBase * -wxToolBarBase::InsertTool(size_t pos, wxToolBarToolBase *tool) -{ - wxCHECK_MSG( pos <= GetToolsCount(), NULL, - wxT("invalid position in wxToolBar::InsertTool()") ); - - if ( !tool || !DoInsertTool(pos, tool) ) - { - return NULL; - } - - m_tools.Insert(pos, tool); - tool->Attach(this); - - return tool; -} - -wxToolBarToolBase * -wxToolBarBase::AddControl(wxControl *control, const wxString& label) -{ - return InsertControl(GetToolsCount(), control, label); -} - -wxToolBarToolBase * -wxToolBarBase::InsertControl(size_t pos, - wxControl *control, - const wxString& label) -{ - wxCHECK_MSG( control, NULL, - wxT("toolbar: can't insert NULL control") ); - - wxCHECK_MSG( control->GetParent() == this, NULL, - wxT("control must have toolbar as parent") ); - - return DoInsertNewTool(pos, CreateTool(control, label)); -} - -wxControl *wxToolBarBase::FindControl( int toolid ) -{ - for ( wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst(); - node; - node = node->GetNext() ) - { - const wxToolBarToolBase * const tool = node->GetData(); - if ( tool->IsControl() ) - { - wxControl * const control = tool->GetControl(); - - if ( !control ) - { - wxFAIL_MSG( wxT("NULL control in toolbar?") ); - } - else if ( control->GetId() == toolid ) - { - // found - return control; - } - } - } - - return NULL; -} - -wxToolBarToolBase *wxToolBarBase::AddSeparator() -{ - return InsertSeparator(GetToolsCount()); -} - -wxToolBarToolBase *wxToolBarBase::InsertSeparator(size_t pos) -{ - return DoInsertNewTool(pos, CreateSeparator()); -} - -wxToolBarToolBase *wxToolBarBase::AddStretchableSpace() -{ - return InsertStretchableSpace(GetToolsCount()); -} - -wxToolBarToolBase *wxToolBarBase::InsertStretchableSpace(size_t pos) -{ - wxToolBarToolBase * const tool = CreateSeparator(); - if ( tool ) - { - // this is a hack but we know that all the current implementations - // don't really use the tool when it's created, they will do it - // InsertTool() at earliest and maybe even in Realize() much later - // - // so we can create the tool as a plain separator and mark it as being - // a stretchable space later - tool->MakeStretchable(); - } - - return DoInsertNewTool(pos, tool); -} - -wxToolBarToolBase *wxToolBarBase::RemoveTool(int toolid) -{ - size_t pos = 0; - wxToolBarToolsList::compatibility_iterator node; - for ( node = m_tools.GetFirst(); node; node = node->GetNext() ) - { - if ( node->GetData()->GetId() == toolid ) - break; - - pos++; - } - - if ( !node ) - { - // don't give any error messages - sometimes we might call RemoveTool() - // without knowing whether the tool is or not in the toolbar - return NULL; - } - - wxToolBarToolBase *tool = node->GetData(); - wxCHECK_MSG( tool, NULL, "NULL tool in the tools list?" ); - - if ( !DoDeleteTool(pos, tool) ) - return NULL; - - m_tools.Erase(node); - - tool->Detach(); - - return tool; -} - -bool wxToolBarBase::DeleteToolByPos(size_t pos) -{ - wxCHECK_MSG( pos < GetToolsCount(), false, - wxT("invalid position in wxToolBar::DeleteToolByPos()") ); - - wxToolBarToolsList::compatibility_iterator node = m_tools.Item(pos); - - if ( !DoDeleteTool(pos, node->GetData()) ) - { - return false; - } - - delete node->GetData(); - m_tools.Erase(node); - - return true; -} - -bool wxToolBarBase::DeleteTool(int toolid) -{ - size_t pos = 0; - wxToolBarToolsList::compatibility_iterator node; - for ( node = m_tools.GetFirst(); node; node = node->GetNext() ) - { - if ( node->GetData()->GetId() == toolid ) - break; - - pos++; - } - - if ( !node || !DoDeleteTool(pos, node->GetData()) ) - { - return false; - } - - delete node->GetData(); - m_tools.Erase(node); - - return true; -} - -wxToolBarToolBase *wxToolBarBase::FindById(int toolid) const -{ - wxToolBarToolBase *tool = NULL; - - for ( wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst(); - node; - node = node->GetNext() ) - { - tool = node->GetData(); - if ( tool->GetId() == toolid ) - { - // found - break; - } - - tool = NULL; - } - - return tool; -} - -void wxToolBarBase::UnToggleRadioGroup(wxToolBarToolBase *tool) -{ - wxCHECK_RET( tool, wxT("NULL tool in wxToolBarTool::UnToggleRadioGroup") ); - - if ( !tool->IsButton() || tool->GetKind() != wxITEM_RADIO ) - return; - - wxToolBarToolsList::compatibility_iterator node = m_tools.Find(tool); - wxCHECK_RET( node, wxT("invalid tool in wxToolBarTool::UnToggleRadioGroup") ); - - wxToolBarToolsList::compatibility_iterator nodeNext = node->GetNext(); - while ( nodeNext ) - { - wxToolBarToolBase *toolNext = nodeNext->GetData(); - - if ( !toolNext->IsButton() || toolNext->GetKind() != wxITEM_RADIO ) - break; - - if ( toolNext->Toggle(false) ) - { - DoToggleTool(toolNext, false); - } - - nodeNext = nodeNext->GetNext(); - } - - wxToolBarToolsList::compatibility_iterator nodePrev = node->GetPrevious(); - while ( nodePrev ) - { - wxToolBarToolBase *toolNext = nodePrev->GetData(); - - if ( !toolNext->IsButton() || toolNext->GetKind() != wxITEM_RADIO ) - break; - - if ( toolNext->Toggle(false) ) - { - DoToggleTool(toolNext, false); - } - - nodePrev = nodePrev->GetPrevious(); - } -} - -void wxToolBarBase::ClearTools() -{ - while ( GetToolsCount() ) - { - DeleteToolByPos(0); - } -} - -void wxToolBarBase::AdjustToolBitmapSize() -{ - if ( HasFlag(wxTB_NOICONS) ) - { - SetToolBitmapSize(wxSize(0, 0)); - return; - } - - const wxSize sizeOrig(m_defaultWidth, m_defaultHeight); - - wxSize sizeActual(sizeOrig); - - for ( wxToolBarToolsList::const_iterator i = m_tools.begin(); - i != m_tools.end(); - ++i ) - { - const wxBitmap& bmp = (*i)->GetNormalBitmap(); - if ( bmp.IsOk() ) - sizeActual.IncTo(bmp.GetScaledSize()); - } - - if ( sizeActual != sizeOrig ) - SetToolBitmapSize(sizeActual); -} - -bool wxToolBarBase::Realize() -{ - // check if we have anything to do - if ( m_tools.empty() ) - return false; - - // make sure tool size is large enough for all bitmaps to fit in - AdjustToolBitmapSize(); - - return true; -} - -wxToolBarBase::~wxToolBarBase() -{ - WX_CLEAR_LIST(wxToolBarToolsList, m_tools); - - // notify the frame that it doesn't have a tool bar any longer to avoid - // dangling pointers - wxFrame *frame = wxDynamicCast(GetParent(), wxFrame); - if ( frame && frame->GetToolBar() == this ) - { - frame->SetToolBar(NULL); - } -} - -// ---------------------------------------------------------------------------- -// wxToolBarBase tools state -// ---------------------------------------------------------------------------- - -void wxToolBarBase::EnableTool(int toolid, bool enable) -{ - wxToolBarToolBase *tool = FindById(toolid); - if ( tool ) - { - if ( tool->Enable(enable) ) - { - DoEnableTool(tool, enable); - } - } -} - -void wxToolBarBase::ToggleTool(int toolid, bool toggle) -{ - wxToolBarToolBase *tool = FindById(toolid); - if ( tool && tool->CanBeToggled() ) - { - if ( tool->Toggle(toggle) ) - { - UnToggleRadioGroup(tool); - DoToggleTool(tool, toggle); - } - } -} - -void wxToolBarBase::SetToggle(int toolid, bool toggle) -{ - wxToolBarToolBase *tool = FindById(toolid); - if ( tool ) - { - if ( tool->SetToggle(toggle) ) - { - DoSetToggle(tool, toggle); - } - } -} - -void wxToolBarBase::SetToolShortHelp(int toolid, const wxString& help) -{ - wxToolBarToolBase *tool = FindById(toolid); - if ( tool ) - { - (void)tool->SetShortHelp(help); - } -} - -void wxToolBarBase::SetToolLongHelp(int toolid, const wxString& help) -{ - wxToolBarToolBase *tool = FindById(toolid); - if ( tool ) - { - (void)tool->SetLongHelp(help); - } -} - -wxObject *wxToolBarBase::GetToolClientData(int toolid) const -{ - wxToolBarToolBase *tool = FindById(toolid); - - return tool ? tool->GetClientData() : NULL; -} - -void wxToolBarBase::SetToolClientData(int toolid, wxObject *clientData) -{ - wxToolBarToolBase *tool = FindById(toolid); - - wxCHECK_RET( tool, wxT("no such tool in wxToolBar::SetToolClientData") ); - - tool->SetClientData(clientData); -} - -int wxToolBarBase::GetToolPos(int toolid) const -{ - size_t pos = 0; - wxToolBarToolsList::compatibility_iterator node; - - for ( node = m_tools.GetFirst(); node; node = node->GetNext() ) - { - if ( node->GetData()->GetId() == toolid ) - return pos; - - pos++; - } - - return wxNOT_FOUND; -} - -bool wxToolBarBase::GetToolState(int toolid) const -{ - wxToolBarToolBase *tool = FindById(toolid); - wxCHECK_MSG( tool, false, wxT("no such tool") ); - - return tool->IsToggled(); -} - -bool wxToolBarBase::GetToolEnabled(int toolid) const -{ - wxToolBarToolBase *tool = FindById(toolid); - wxCHECK_MSG( tool, false, wxT("no such tool") ); - - return tool->IsEnabled(); -} - -wxString wxToolBarBase::GetToolShortHelp(int toolid) const -{ - wxToolBarToolBase *tool = FindById(toolid); - wxCHECK_MSG( tool, wxEmptyString, wxT("no such tool") ); - - return tool->GetShortHelp(); -} - -wxString wxToolBarBase::GetToolLongHelp(int toolid) const -{ - wxToolBarToolBase *tool = FindById(toolid); - wxCHECK_MSG( tool, wxEmptyString, wxT("no such tool") ); - - return tool->GetLongHelp(); -} - -// ---------------------------------------------------------------------------- -// wxToolBarBase geometry -// ---------------------------------------------------------------------------- - -void wxToolBarBase::SetMargins(int x, int y) -{ - m_xMargin = x; - m_yMargin = y; -} - -void wxToolBarBase::SetRows(int WXUNUSED(nRows)) -{ - // nothing -} - -bool wxToolBarBase::IsVertical() const -{ - return HasFlag(wxTB_LEFT | wxTB_RIGHT); -} - - -// ---------------------------------------------------------------------------- -// event processing -// ---------------------------------------------------------------------------- - -// Only allow toggle if returns true -bool wxToolBarBase::OnLeftClick(int toolid, bool toggleDown) -{ - wxCommandEvent event(wxEVT_TOOL, toolid); - event.SetEventObject(this); - - // we use SetInt() to make wxCommandEvent::IsChecked() return toggleDown - event.SetInt((int)toggleDown); - - // and SetExtraLong() for backwards compatibility - event.SetExtraLong((long)toggleDown); - - // Send events to this toolbar instead (and thence up the window hierarchy) - HandleWindowEvent(event); - - return true; -} - -// Call when right button down. -void wxToolBarBase::OnRightClick(int toolid, - long WXUNUSED(x), - long WXUNUSED(y)) -{ - wxCommandEvent event(wxEVT_TOOL_RCLICKED, toolid); - event.SetEventObject(this); - event.SetInt(toolid); - - GetEventHandler()->ProcessEvent(event); -} - -// Called when the mouse cursor enters a tool bitmap (no button pressed). -// Argument is wxID_ANY if mouse is exiting the toolbar. -// Note that for this event, the toolid of the window is used, -// and the integer parameter of wxCommandEvent is used to retrieve -// the tool toolid. -void wxToolBarBase::OnMouseEnter(int toolid) -{ - wxCommandEvent event(wxEVT_TOOL_ENTER, GetId()); - event.SetEventObject(this); - event.SetInt(toolid); - - wxFrame *frame = wxDynamicCast(GetParent(), wxFrame); - if ( frame ) - { - wxString help; - if ( toolid != wxID_ANY ) - { - const wxToolBarToolBase * const tool = FindById(toolid); - if ( tool ) - help = tool->GetLongHelp(); - } - - // call DoGiveHelp() even if help string is empty to avoid showing the - // help for the previously selected tool when another one is selected - frame->DoGiveHelp(help, toolid != wxID_ANY); - } - - (void)GetEventHandler()->ProcessEvent(event); -} - -// ---------------------------------------------------------------------------- -// UI updates -// ---------------------------------------------------------------------------- - -// Do the toolbar button updates (check for EVT_UPDATE_UI handlers) -void wxToolBarBase::UpdateWindowUI(long flags) -{ - wxWindowBase::UpdateWindowUI(flags); - - // don't waste time updating state of tools in a hidden toolbar - if ( !IsShown() ) - return; - - wxEvtHandler* evtHandler = GetEventHandler() ; - - for ( wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst(); - node; - node = node->GetNext() ) - { - wxToolBarToolBase * const tool = node->GetData(); - if ( tool->IsSeparator() ) - continue; - - int toolid = tool->GetId(); - - wxUpdateUIEvent event(toolid); - event.SetEventObject(this); - - if ( evtHandler->ProcessEvent(event) ) - { - if ( event.GetSetEnabled() ) - EnableTool(toolid, event.GetEnabled()); - if ( event.GetSetChecked() ) - ToggleTool(toolid, event.GetChecked()); -#if 0 - if ( event.GetSetText() ) - // Set tooltip? -#endif // 0 - } - } -} - -#if wxUSE_MENUS -bool wxToolBarBase::SetDropdownMenu(int toolid, wxMenu* menu) -{ - wxToolBarToolBase * const tool = FindById(toolid); - wxCHECK_MSG( tool, false, wxT("invalid tool toolid") ); - - wxCHECK_MSG( tool->GetKind() == wxITEM_DROPDOWN, false, - wxT("menu can be only associated with drop down tools") ); - - tool->SetDropdownMenu(menu); - - return true; -} -#endif - -#if WXWIN_COMPATIBILITY_2_8 - -bool wxCreateGreyedImage(const wxImage& in, wxImage& out) -{ -#if wxUSE_IMAGE - out = in.ConvertToGreyscale(); - if ( out.IsOk() ) - return true; -#endif // wxUSE_IMAGE - return false; -} - -#endif // WXWIN_COMPATIBILITY_2_8 - -#endif // wxUSE_TOOLBAR diff --git a/Externals/wxWidgets3/src/common/textbuf.cpp b/Externals/wxWidgets3/src/common/textbuf.cpp deleted file mode 100644 index 2ce760d737..0000000000 --- a/Externals/wxWidgets3/src/common/textbuf.cpp +++ /dev/null @@ -1,274 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/textbuf.cpp -// Purpose: implementation of wxTextBuffer class -// Created: 14.11.01 -// Author: Morten Hanssen, Vadim Zeitlin -// Copyright: (c) 1998-2001 wxWidgets team -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// headers -// ============================================================================ - -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif //__BORLANDC__ - -#ifndef WX_PRECOMP - #include "wx/string.h" - #include "wx/intl.h" - #include "wx/log.h" -#endif - -#include "wx/textbuf.h" - -// ============================================================================ -// wxTextBuffer class implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// static methods (always compiled in) -// ---------------------------------------------------------------------------- - -// default type is the native one - -const wxTextFileType wxTextBuffer::typeDefault = -#if defined(__WINDOWS__) - wxTextFileType_Dos; -#elif defined(__UNIX__) - wxTextFileType_Unix; -#else - wxTextFileType_None; - #error "wxTextBuffer: unsupported platform." -#endif - -const wxChar *wxTextBuffer::GetEOL(wxTextFileType type) -{ - switch ( type ) { - default: - wxFAIL_MSG(wxT("bad buffer type in wxTextBuffer::GetEOL.")); - wxFALLTHROUGH; // fall through nevertheless - we must return something... - - case wxTextFileType_None: return wxEmptyString; - case wxTextFileType_Unix: return wxT("\n"); - case wxTextFileType_Dos: return wxT("\r\n"); - case wxTextFileType_Mac: return wxT("\r"); - } -} - -wxString wxTextBuffer::Translate(const wxString& text, wxTextFileType type) -{ - // don't do anything if there is nothing to do - if ( type == wxTextFileType_None ) - return text; - - // nor if it is empty - if ( text.empty() ) - return text; - - wxString eol = GetEOL(type), result; - - // optimization: we know that the length of the new string will be about - // the same as the length of the old one, so prealloc memory to avoid - // unnecessary relocations - result.Alloc(text.Len()); - - wxChar chLast = 0; - for ( wxString::const_iterator i = text.begin(); i != text.end(); ++i ) - { - wxChar ch = *i; - switch ( ch ) { - case wxT('\n'): - // Dos/Unix line termination - result += eol; - chLast = 0; - break; - - case wxT('\r'): - if ( chLast == wxT('\r') ) { - // Mac empty line - result += eol; - } - else { - // just remember it: we don't know whether it is just "\r" - // or "\r\n" yet - chLast = wxT('\r'); - } - break; - - default: - if ( chLast == wxT('\r') ) { - // Mac line termination - result += eol; - - // reset chLast to avoid inserting another eol before the - // next character - chLast = 0; - } - - // add to the current line - result += ch; - } - } - - if ( chLast ) { - // trailing '\r' - result += eol; - } - - return result; -} - -#if wxUSE_TEXTBUFFER - -wxString wxTextBuffer::ms_eof; - -// ---------------------------------------------------------------------------- -// ctors & dtor -// ---------------------------------------------------------------------------- - -wxTextBuffer::wxTextBuffer(const wxString& strBufferName) - : m_strBufferName(strBufferName) -{ - m_nCurLine = 0; - m_isOpened = false; -} - -wxTextBuffer::~wxTextBuffer() -{ - // required here for Darwin -} - -// ---------------------------------------------------------------------------- -// buffer operations -// ---------------------------------------------------------------------------- - -bool wxTextBuffer::Exists() const -{ - return OnExists(); -} - -bool wxTextBuffer::Create(const wxString& strBufferName) -{ - m_strBufferName = strBufferName; - - return Create(); -} - -bool wxTextBuffer::Create() -{ - // buffer name must be either given in ctor or in Create(const wxString&) - wxASSERT( !m_strBufferName.empty() ); - - // if the buffer already exists do nothing - if ( Exists() ) return false; - - if ( !OnOpen(m_strBufferName, WriteAccess) ) - return false; - - OnClose(); - return true; -} - -bool wxTextBuffer::Open(const wxString& strBufferName, const wxMBConv& conv) -{ - m_strBufferName = strBufferName; - - return Open(conv); -} - -bool wxTextBuffer::Open(const wxMBConv& conv) -{ - // buffer name must be either given in ctor or in Open(const wxString&) - wxASSERT( !m_strBufferName.empty() ); - - // open buffer in read-only mode - if ( !OnOpen(m_strBufferName, ReadAccess) ) - return false; - - // read buffer into memory - m_isOpened = OnRead(conv); - - OnClose(); - - return m_isOpened; -} - -// analyse some lines of the buffer trying to guess it's type. -// if it fails, it assumes the native type for our platform. -wxTextFileType wxTextBuffer::GuessType() const -{ - wxASSERT( IsOpened() ); - - // scan the buffer lines - size_t nUnix = 0, // number of '\n's alone - nDos = 0, // number of '\r\n' - nMac = 0; // number of '\r's - - // we take MAX_LINES_SCAN in the beginning, middle and the end of buffer - #define MAX_LINES_SCAN (10) - size_t nCount = m_aLines.GetCount() / 3, - nScan = nCount > 3*MAX_LINES_SCAN ? MAX_LINES_SCAN : nCount / 3; - - #define AnalyseLine(n) \ - switch ( m_aTypes[n] ) { \ - case wxTextFileType_Unix: nUnix++; break; \ - case wxTextFileType_Dos: nDos++; break; \ - case wxTextFileType_Mac: nMac++; break; \ - default: wxFAIL_MSG(wxT("unknown line terminator")); \ - } - - size_t n; - for ( n = 0; n < nScan; n++ ) // the beginning - AnalyseLine(n); - for ( n = (nCount - nScan)/2; n < (nCount + nScan)/2; n++ ) - AnalyseLine(n); - for ( n = nCount - nScan; n < nCount; n++ ) - AnalyseLine(n); - - #undef AnalyseLine - - // interpret the results (FIXME far from being even 50% fool proof) - if ( nScan > 0 && nDos + nUnix + nMac == 0 ) { - // no newlines at all - wxLogWarning(_("'%s' is probably a binary buffer."), m_strBufferName.c_str()); - } - else { - #define GREATER_OF(t1, t2) n##t1 == n##t2 ? typeDefault \ - : n##t1 > n##t2 \ - ? wxTextFileType_##t1 \ - : wxTextFileType_##t2 - - if ( nDos > nUnix ) - return GREATER_OF(Dos, Mac); - else if ( nDos < nUnix ) - return GREATER_OF(Unix, Mac); - else { - // nDos == nUnix - return nMac > nDos ? wxTextFileType_Mac : typeDefault; - } - - #undef GREATER_OF - } - - return typeDefault; -} - - -bool wxTextBuffer::Close() -{ - Clear(); - m_isOpened = false; - - return true; -} - -bool wxTextBuffer::Write(wxTextFileType typeNew, const wxMBConv& conv) -{ - return OnWrite(typeNew, conv); -} - -#endif // wxUSE_TEXTBUFFER diff --git a/Externals/wxWidgets3/src/common/textcmn.cpp b/Externals/wxWidgets3/src/common/textcmn.cpp deleted file mode 100644 index 2774635bbe..0000000000 --- a/Externals/wxWidgets3/src/common/textcmn.cpp +++ /dev/null @@ -1,1260 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/textcmn.cpp -// Purpose: implementation of platform-independent functions of wxTextCtrl -// Author: Julian Smart -// Modified by: -// Created: 13.07.99 -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// for compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#ifndef WX_PRECOMP - #include "wx/event.h" -#endif // WX_PRECOMP - -#if wxUSE_TEXTCTRL - -#include "wx/textctrl.h" - -#ifndef WX_PRECOMP - #include "wx/intl.h" - #include "wx/log.h" -#endif // WX_PRECOMP - -#include "wx/ffile.h" - -extern WXDLLEXPORT_DATA(const char) wxTextCtrlNameStr[] = "text"; - -// ---------------------------------------------------------------------------- -// macros -// ---------------------------------------------------------------------------- - -// we don't have any objects of type wxTextCtrlBase in the program, only -// wxTextCtrl, so this cast is safe -#define TEXTCTRL(ptr) ((wxTextCtrl *)(ptr)) - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// XTI -// ---------------------------------------------------------------------------- - -wxDEFINE_FLAGS( wxTextCtrlStyle ) -wxBEGIN_FLAGS( wxTextCtrlStyle ) -// new style border flags, we put them first to -// use them for streaming out -wxFLAGS_MEMBER(wxBORDER_SIMPLE) -wxFLAGS_MEMBER(wxBORDER_SUNKEN) -wxFLAGS_MEMBER(wxBORDER_DOUBLE) -wxFLAGS_MEMBER(wxBORDER_RAISED) -wxFLAGS_MEMBER(wxBORDER_STATIC) -wxFLAGS_MEMBER(wxBORDER_NONE) - -// old style border flags -wxFLAGS_MEMBER(wxSIMPLE_BORDER) -wxFLAGS_MEMBER(wxSUNKEN_BORDER) -wxFLAGS_MEMBER(wxDOUBLE_BORDER) -wxFLAGS_MEMBER(wxRAISED_BORDER) -wxFLAGS_MEMBER(wxSTATIC_BORDER) -wxFLAGS_MEMBER(wxBORDER) - -// standard window styles -wxFLAGS_MEMBER(wxTAB_TRAVERSAL) -wxFLAGS_MEMBER(wxCLIP_CHILDREN) -wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) -wxFLAGS_MEMBER(wxWANTS_CHARS) -wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE) -wxFLAGS_MEMBER(wxALWAYS_SHOW_SB ) -wxFLAGS_MEMBER(wxVSCROLL) -wxFLAGS_MEMBER(wxHSCROLL) - -wxFLAGS_MEMBER(wxTE_PROCESS_ENTER) -wxFLAGS_MEMBER(wxTE_PROCESS_TAB) -wxFLAGS_MEMBER(wxTE_MULTILINE) -wxFLAGS_MEMBER(wxTE_PASSWORD) -wxFLAGS_MEMBER(wxTE_READONLY) -wxFLAGS_MEMBER(wxHSCROLL) -wxFLAGS_MEMBER(wxTE_RICH) -wxFLAGS_MEMBER(wxTE_RICH2) -wxFLAGS_MEMBER(wxTE_AUTO_URL) -wxFLAGS_MEMBER(wxTE_NOHIDESEL) -wxFLAGS_MEMBER(wxTE_LEFT) -wxFLAGS_MEMBER(wxTE_CENTRE) -wxFLAGS_MEMBER(wxTE_RIGHT) -wxFLAGS_MEMBER(wxTE_DONTWRAP) -wxFLAGS_MEMBER(wxTE_CHARWRAP) -wxFLAGS_MEMBER(wxTE_WORDWRAP) -wxEND_FLAGS( wxTextCtrlStyle ) - -wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxTextCtrl, wxControl, "wx/textctrl.h"); - -wxBEGIN_PROPERTIES_TABLE(wxTextCtrl) -wxEVENT_PROPERTY( TextUpdated, wxEVT_TEXT, wxCommandEvent ) -wxEVENT_PROPERTY( TextEnter, wxEVT_TEXT_ENTER, wxCommandEvent ) - -wxPROPERTY( Font, wxFont, SetFont, GetFont , wxEMPTY_PARAMETER_VALUE, \ - 0 /*flags*/, wxT("Helpstring"), wxT("group") ) -wxPROPERTY( Value, wxString, SetValue, GetValue, wxString(), \ - 0 /*flags*/, wxT("Helpstring"), wxT("group")) - -wxPROPERTY_FLAGS( WindowStyle, wxTextCtrlStyle, long, SetWindowStyleFlag, \ - GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \ - wxT("Helpstring"), wxT("group")) // style -wxEND_PROPERTIES_TABLE() - -wxEMPTY_HANDLERS_TABLE(wxTextCtrl) - -wxCONSTRUCTOR_6( wxTextCtrl, wxWindow*, Parent, wxWindowID, Id, \ - wxString, Value, wxPoint, Position, wxSize, Size, \ - long, WindowStyle) - - -wxIMPLEMENT_DYNAMIC_CLASS(wxTextUrlEvent, wxCommandEvent); - -wxDEFINE_EVENT( wxEVT_TEXT, wxCommandEvent ); -wxDEFINE_EVENT( wxEVT_TEXT_ENTER, wxCommandEvent ); -wxDEFINE_EVENT( wxEVT_TEXT_URL, wxTextUrlEvent ); -wxDEFINE_EVENT( wxEVT_TEXT_MAXLEN, wxCommandEvent ); - -wxIMPLEMENT_ABSTRACT_CLASS(wxTextCtrlBase, wxControl); - -// ============================================================================ -// wxTextAttr implementation -// ============================================================================ - -wxTextAttr::wxTextAttr(const wxColour& colText, - const wxColour& colBack, - const wxFont& font, - wxTextAttrAlignment alignment): m_textAlignment(alignment), m_colText(colText), m_colBack(colBack) -{ - Init(); - - if (m_colText.IsOk()) m_flags |= wxTEXT_ATTR_TEXT_COLOUR; - if (m_colBack.IsOk()) m_flags |= wxTEXT_ATTR_BACKGROUND_COLOUR; - if (alignment != wxTEXT_ALIGNMENT_DEFAULT) - m_flags |= wxTEXT_ATTR_ALIGNMENT; - - GetFontAttributes(font); -} - -// Initialisation -void wxTextAttr::Init() -{ - m_textAlignment = wxTEXT_ALIGNMENT_DEFAULT; - m_flags = 0; - m_leftIndent = 0; - m_leftSubIndent = 0; - m_rightIndent = 0; - - m_fontSize = 12; - m_fontStyle = wxFONTSTYLE_NORMAL; - m_fontWeight = wxFONTWEIGHT_NORMAL; - m_fontUnderlined = false; - m_fontStrikethrough = false; - m_fontEncoding = wxFONTENCODING_DEFAULT; - m_fontFamily = wxFONTFAMILY_DEFAULT; - - m_paragraphSpacingAfter = 0; - m_paragraphSpacingBefore = 0; - m_lineSpacing = 0; - m_bulletStyle = wxTEXT_ATTR_BULLET_STYLE_NONE; - m_textEffects = wxTEXT_ATTR_EFFECT_NONE; - m_textEffectFlags = wxTEXT_ATTR_EFFECT_NONE; - m_outlineLevel = 0; - m_bulletNumber = 0; -} - -// Copy -void wxTextAttr::Copy(const wxTextAttr& attr) -{ - m_colText = attr.m_colText; - m_colBack = attr.m_colBack; - m_textAlignment = attr.m_textAlignment; - m_leftIndent = attr.m_leftIndent; - m_leftSubIndent = attr.m_leftSubIndent; - m_rightIndent = attr.m_rightIndent; - m_tabs = attr.m_tabs; - m_flags = attr.m_flags; - - m_fontSize = attr.m_fontSize; - m_fontStyle = attr.m_fontStyle; - m_fontWeight = attr.m_fontWeight; - m_fontUnderlined = attr.m_fontUnderlined; - m_fontStrikethrough = attr.m_fontStrikethrough; - m_fontFaceName = attr.m_fontFaceName; - m_fontEncoding = attr.m_fontEncoding; - m_fontFamily = attr.m_fontFamily; - m_textEffects = attr.m_textEffects; - m_textEffectFlags = attr.m_textEffectFlags; - - m_paragraphSpacingAfter = attr.m_paragraphSpacingAfter; - m_paragraphSpacingBefore = attr.m_paragraphSpacingBefore; - m_lineSpacing = attr.m_lineSpacing; - m_characterStyleName = attr.m_characterStyleName; - m_paragraphStyleName = attr.m_paragraphStyleName; - m_listStyleName = attr.m_listStyleName; - m_bulletStyle = attr.m_bulletStyle; - m_bulletNumber = attr.m_bulletNumber; - m_bulletText = attr.m_bulletText; - m_bulletFont = attr.m_bulletFont; - m_bulletName = attr.m_bulletName; - m_outlineLevel = attr.m_outlineLevel; - - m_urlTarget = attr.m_urlTarget; -} - -// operators -void wxTextAttr::operator= (const wxTextAttr& attr) -{ - Copy(attr); -} - -// Equality test -bool wxTextAttr::operator== (const wxTextAttr& attr) const -{ - return GetFlags() == attr.GetFlags() && - - (!HasTextColour() || (GetTextColour() == attr.GetTextColour())) && - (!HasBackgroundColour() || (GetBackgroundColour() == attr.GetBackgroundColour())) && - - (!HasAlignment() || (GetAlignment() == attr.GetAlignment())) && - (!HasLeftIndent() || (GetLeftIndent() == attr.GetLeftIndent() && - GetLeftSubIndent() == attr.GetLeftSubIndent())) && - (!HasRightIndent() || (GetRightIndent() == attr.GetRightIndent())) && - (!HasTabs() || (TabsEq(GetTabs(), attr.GetTabs()))) && - - (!HasParagraphSpacingAfter() || (GetParagraphSpacingAfter() == attr.GetParagraphSpacingAfter())) && - (!HasParagraphSpacingBefore() || (GetParagraphSpacingBefore() == attr.GetParagraphSpacingBefore())) && - (!HasLineSpacing() || (GetLineSpacing() == attr.GetLineSpacing())) && - (!HasCharacterStyleName() || (GetCharacterStyleName() == attr.GetCharacterStyleName())) && - (!HasParagraphStyleName() || (GetParagraphStyleName() == attr.GetParagraphStyleName())) && - (!HasListStyleName() || (GetListStyleName() == attr.GetListStyleName())) && - - (!HasBulletStyle() || (GetBulletStyle() == attr.GetBulletStyle())) && - (!HasBulletText() || (GetBulletText() == attr.GetBulletText())) && - (!HasBulletNumber() || (GetBulletNumber() == attr.GetBulletNumber())) && - (GetBulletFont() == attr.GetBulletFont()) && - (!HasBulletName() || (GetBulletName() == attr.GetBulletName())) && - - (!HasTextEffects() || (GetTextEffects() == attr.GetTextEffects() && - GetTextEffectFlags() == attr.GetTextEffectFlags())) && - - (!HasOutlineLevel() || (GetOutlineLevel() == attr.GetOutlineLevel())) && - - (!HasFontSize() || (GetFontSize() == attr.GetFontSize())) && - (!HasFontItalic() || (GetFontStyle() == attr.GetFontStyle())) && - (!HasFontWeight() || (GetFontWeight() == attr.GetFontWeight())) && - (!HasFontUnderlined() || (GetFontUnderlined() == attr.GetFontUnderlined())) && - (!HasFontStrikethrough() || (GetFontStrikethrough() == attr.GetFontStrikethrough())) && - (!HasFontFaceName() || (GetFontFaceName() == attr.GetFontFaceName())) && - (!HasFontEncoding() || (GetFontEncoding() == attr.GetFontEncoding())) && - (!HasFontFamily() || (GetFontFamily() == attr.GetFontFamily())) && - - (!HasURL() || (GetURL() == attr.GetURL())); -} - -// Partial equality test. Only returns false if an attribute doesn't match. -bool wxTextAttr::EqPartial(const wxTextAttr& attr, bool weakTest) const -{ - int flags = attr.GetFlags(); - - if (!weakTest && - ((!HasTextColour() && attr.HasTextColour()) || - (!HasBackgroundColour() && attr.HasBackgroundColour()) || - (!HasFontFaceName() && attr.HasFontFaceName()) || - (!HasFontSize() && attr.HasFontSize()) || - (!HasFontWeight() && attr.HasFontWeight()) || - (!HasFontItalic() && attr.HasFontItalic()) || - (!HasFontUnderlined() && attr.HasFontUnderlined()) || - (!HasFontStrikethrough() && attr.HasFontStrikethrough()) || - (!HasFontEncoding() && attr.HasFontEncoding()) || - (!HasFontFamily() && attr.HasFontFamily()) || - (!HasURL() && attr.HasURL()) || - (!HasAlignment() && attr.HasAlignment()) || - (!HasLeftIndent() && attr.HasLeftIndent()) || - (!HasParagraphSpacingAfter() && attr.HasParagraphSpacingAfter()) || - (!HasParagraphSpacingBefore() && attr.HasParagraphSpacingBefore()) || - (!HasLineSpacing() && attr.HasLineSpacing()) || - (!HasCharacterStyleName() && attr.HasCharacterStyleName()) || - (!HasParagraphStyleName() && attr.HasParagraphStyleName()) || - (!HasListStyleName() && attr.HasListStyleName()) || - (!HasBulletStyle() && attr.HasBulletStyle()) || - (!HasBulletNumber() && attr.HasBulletNumber()) || - (!HasBulletText() && attr.HasBulletText()) || - (!HasBulletName() && attr.HasBulletName()) || - (!HasTabs() && attr.HasTabs()) || - (!HasTextEffects() && attr.HasTextEffects()) || - (!HasOutlineLevel() && attr.HasOutlineLevel()))) - { - return false; - } - - if (HasTextColour() && attr.HasTextColour() && GetTextColour() != attr.GetTextColour()) - return false; - - if (HasBackgroundColour() && attr.HasBackgroundColour() && GetBackgroundColour() != attr.GetBackgroundColour()) - return false; - - if (HasFontFaceName() && attr.HasFontFaceName() && GetFontFaceName() != attr.GetFontFaceName()) - return false; - - // This checks whether the two objects have the same font size dimension (px versus pt) - if (HasFontSize() && attr.HasFontSize() && (flags & wxTEXT_ATTR_FONT) != (GetFlags() & wxTEXT_ATTR_FONT)) - return false; - - if (HasFontPointSize() && attr.HasFontPointSize() && GetFontSize() != attr.GetFontSize()) - return false; - - if (HasFontPixelSize() && attr.HasFontPixelSize() && GetFontSize() != attr.GetFontSize()) - return false; - - if (HasFontWeight() && attr.HasFontWeight() && GetFontWeight() != attr.GetFontWeight()) - return false; - - if (HasFontItalic() && attr.HasFontItalic() && GetFontStyle() != attr.GetFontStyle()) - return false; - - if (HasFontUnderlined() && attr.HasFontUnderlined() && GetFontUnderlined() != attr.GetFontUnderlined()) - return false; - - if (HasFontStrikethrough() && attr.HasFontStrikethrough() && GetFontStrikethrough() != attr.GetFontStrikethrough()) - return false; - - if (HasFontEncoding() && attr.HasFontEncoding() && GetFontEncoding() != attr.GetFontEncoding()) - return false; - - if (HasFontFamily() && attr.HasFontFamily() && GetFontFamily() != attr.GetFontFamily()) - return false; - - if (HasURL() && attr.HasURL() && GetURL() != attr.GetURL()) - return false; - - if (HasAlignment() && attr.HasAlignment() && GetAlignment() != attr.GetAlignment()) - return false; - - if (HasLeftIndent() && attr.HasLeftIndent() && - ((GetLeftIndent() != attr.GetLeftIndent()) || (GetLeftSubIndent() != attr.GetLeftSubIndent()))) - return false; - - if (HasRightIndent() && attr.HasRightIndent() && (GetRightIndent() != attr.GetRightIndent())) - return false; - - if (HasParagraphSpacingAfter() && attr.HasParagraphSpacingAfter() && - (GetParagraphSpacingAfter() != attr.GetParagraphSpacingAfter())) - return false; - - if (HasParagraphSpacingBefore() && attr.HasParagraphSpacingBefore() && - (GetParagraphSpacingBefore() != attr.GetParagraphSpacingBefore())) - return false; - - if (HasLineSpacing() && attr.HasLineSpacing() && (GetLineSpacing() != attr.GetLineSpacing())) - return false; - - if (HasCharacterStyleName() && attr.HasCharacterStyleName() && (GetCharacterStyleName() != attr.GetCharacterStyleName())) - return false; - - if (HasParagraphStyleName() && attr.HasParagraphStyleName() && (GetParagraphStyleName() != attr.GetParagraphStyleName())) - return false; - - if (HasListStyleName() && attr.HasListStyleName() && (GetListStyleName() != attr.GetListStyleName())) - return false; - - if (HasBulletStyle() && attr.HasBulletStyle() && (GetBulletStyle() != attr.GetBulletStyle())) - return false; - - if (HasBulletNumber() && attr.HasBulletNumber() && (GetBulletNumber() != attr.GetBulletNumber())) - return false; - - if (HasBulletText() && attr.HasBulletText() && - (GetBulletText() != attr.GetBulletText()) && - (GetBulletFont() != attr.GetBulletFont())) - return false; - - if (HasBulletName() && attr.HasBulletName() && (GetBulletName() != attr.GetBulletName())) - return false; - - if (HasTabs() && attr.HasTabs() && !TabsEq(GetTabs(), attr.GetTabs())) - return false; - - if ((HasPageBreak() != attr.HasPageBreak())) - return false; - - if ((GetFlags() & wxTEXT_ATTR_AVOID_PAGE_BREAK_BEFORE) != (attr.GetFlags() & wxTEXT_ATTR_AVOID_PAGE_BREAK_BEFORE)) - return false; - - if ((GetFlags() & wxTEXT_ATTR_AVOID_PAGE_BREAK_AFTER) != (attr.GetFlags() & wxTEXT_ATTR_AVOID_PAGE_BREAK_AFTER)) - return false; - - if (HasTextEffects() && attr.HasTextEffects()) - { - if (!BitlistsEqPartial(GetTextEffects(), attr.GetTextEffects(), GetTextEffectFlags())) - return false; - } - - if (HasOutlineLevel() && attr.HasOutlineLevel() && (GetOutlineLevel() != attr.GetOutlineLevel())) - return false; - - return true; -} - -// Create font from font attributes. -wxFont wxTextAttr::GetFont() const -{ - if ( !HasFont() ) - return wxNullFont; - - int fontSize = 10; - if (HasFontSize()) - fontSize = GetFontSize(); - - wxFontStyle fontStyle = wxFONTSTYLE_NORMAL; - if (HasFontItalic()) - fontStyle = GetFontStyle(); - - wxFontWeight fontWeight = wxFONTWEIGHT_NORMAL; - if (HasFontWeight()) - fontWeight = GetFontWeight(); - - bool underlined = false; - if (HasFontUnderlined()) - underlined = GetFontUnderlined(); - - bool strikethrough = false; - if (HasFontStrikethrough()) - strikethrough = GetFontStrikethrough(); - - wxString fontFaceName; - if (HasFontFaceName()) - fontFaceName = GetFontFaceName(); - - wxFontEncoding encoding = wxFONTENCODING_DEFAULT; - if (HasFontEncoding()) - encoding = GetFontEncoding(); - - wxFontFamily fontFamily = wxFONTFAMILY_DEFAULT; - if (HasFontFamily()) - fontFamily = GetFontFamily(); - - if (HasFontPixelSize()) - { - wxFont font(wxSize(0, fontSize), fontFamily, fontStyle, fontWeight, underlined, fontFaceName, encoding); - if (strikethrough) - font.SetStrikethrough(true); - return font; - } - else - { - wxFont font(fontSize, fontFamily, fontStyle, fontWeight, underlined, fontFaceName, encoding); - if (strikethrough) - font.SetStrikethrough(true); - return font; - } -} - -// Get attributes from font. -bool wxTextAttr::GetFontAttributes(const wxFont& font, int flags) -{ - if (!font.IsOk()) - return false; - - // If we pass both pixel and point size attributes, this is an indication - // to choose the most appropriate units. - if ((flags & wxTEXT_ATTR_FONT) == wxTEXT_ATTR_FONT) - { - if (font.IsUsingSizeInPixels()) - { - m_fontSize = font.GetPixelSize().y; - flags &= ~wxTEXT_ATTR_FONT_POINT_SIZE; - } - else - { - m_fontSize = font.GetPointSize(); - flags &= ~wxTEXT_ATTR_FONT_PIXEL_SIZE; - } - } - else if (flags & wxTEXT_ATTR_FONT_POINT_SIZE) - { - m_fontSize = font.GetPointSize(); - flags &= ~wxTEXT_ATTR_FONT_PIXEL_SIZE; - } - else if (flags & wxTEXT_ATTR_FONT_PIXEL_SIZE) - { - m_fontSize = font.GetPixelSize().y; - } - - if (flags & wxTEXT_ATTR_FONT_ITALIC) - m_fontStyle = font.GetStyle(); - - if (flags & wxTEXT_ATTR_FONT_WEIGHT) - m_fontWeight = font.GetWeight(); - - if (flags & wxTEXT_ATTR_FONT_UNDERLINE) - m_fontUnderlined = font.GetUnderlined(); - - if (flags & wxTEXT_ATTR_FONT_STRIKETHROUGH) - m_fontStrikethrough = font.GetStrikethrough(); - - if (flags & wxTEXT_ATTR_FONT_FACE) - m_fontFaceName = font.GetFaceName(); - - if (flags & wxTEXT_ATTR_FONT_ENCODING) - m_fontEncoding = font.GetEncoding(); - - if (flags & wxTEXT_ATTR_FONT_FAMILY) - { - // wxFont might not know its family, avoid setting m_fontFamily to an - // invalid value and rather pretend that we don't have any font family - // information at all in this case - const wxFontFamily fontFamily = font.GetFamily(); - if ( fontFamily == wxFONTFAMILY_UNKNOWN ) - flags &= ~wxTEXT_ATTR_FONT_FAMILY; - else - m_fontFamily = fontFamily; - } - - m_flags |= flags; - - return true; -} - -// Resets bits in destination so new attributes aren't merged with mutually exclusive ones -static bool wxResetIncompatibleBits(const int mask, const int srcFlags, int& destFlags, int& destBits) -{ - if ((srcFlags & mask) && (destFlags & mask)) - { - destBits &= ~mask; - destFlags &= ~mask; - } - - return true; -} - -bool wxTextAttr::Apply(const wxTextAttr& style, const wxTextAttr* compareWith) -{ - wxTextAttr& destStyle = (*this); - - if (style.HasFontWeight()) - { - if (!(compareWith && compareWith->HasFontWeight() && compareWith->GetFontWeight() == style.GetFontWeight())) - destStyle.SetFontWeight(style.GetFontWeight()); - } - - if (style.HasFontPointSize()) - { - if (!(compareWith && compareWith->HasFontPointSize() && compareWith->GetFontSize() == style.GetFontSize())) - destStyle.SetFontPointSize(style.GetFontSize()); - } - else if (style.HasFontPixelSize()) - { - if (!(compareWith && compareWith->HasFontPixelSize() && compareWith->GetFontSize() == style.GetFontSize())) - destStyle.SetFontPixelSize(style.GetFontSize()); - } - - if (style.HasFontItalic()) - { - if (!(compareWith && compareWith->HasFontItalic() && compareWith->GetFontStyle() == style.GetFontStyle())) - destStyle.SetFontStyle(style.GetFontStyle()); - } - - if (style.HasFontUnderlined()) - { - if (!(compareWith && compareWith->HasFontUnderlined() && compareWith->GetFontUnderlined() == style.GetFontUnderlined())) - destStyle.SetFontUnderlined(style.GetFontUnderlined()); - } - - if (style.HasFontStrikethrough()) - { - if (!(compareWith && compareWith->HasFontStrikethrough() && compareWith->GetFontStrikethrough() == style.GetFontStrikethrough())) - destStyle.SetFontStrikethrough(style.GetFontStrikethrough()); - } - - if (style.HasFontFaceName()) - { - if (!(compareWith && compareWith->HasFontFaceName() && compareWith->GetFontFaceName() == style.GetFontFaceName())) - destStyle.SetFontFaceName(style.GetFontFaceName()); - } - - if (style.HasFontEncoding()) - { - if (!(compareWith && compareWith->HasFontEncoding() && compareWith->GetFontEncoding() == style.GetFontEncoding())) - destStyle.SetFontEncoding(style.GetFontEncoding()); - } - - if (style.HasFontFamily()) - { - if (!(compareWith && compareWith->HasFontFamily() && compareWith->GetFontFamily() == style.GetFontFamily())) - destStyle.SetFontFamily(style.GetFontFamily()); - } - - if (style.GetTextColour().IsOk() && style.HasTextColour()) - { - if (!(compareWith && compareWith->HasTextColour() && compareWith->GetTextColour() == style.GetTextColour())) - destStyle.SetTextColour(style.GetTextColour()); - } - - if (style.GetBackgroundColour().IsOk() && style.HasBackgroundColour()) - { - if (!(compareWith && compareWith->HasBackgroundColour() && compareWith->GetBackgroundColour() == style.GetBackgroundColour())) - destStyle.SetBackgroundColour(style.GetBackgroundColour()); - } - - if (style.HasAlignment()) - { - if (!(compareWith && compareWith->HasAlignment() && compareWith->GetAlignment() == style.GetAlignment())) - destStyle.SetAlignment(style.GetAlignment()); - } - - if (style.HasTabs()) - { - if (!(compareWith && compareWith->HasTabs() && TabsEq(compareWith->GetTabs(), style.GetTabs()))) - destStyle.SetTabs(style.GetTabs()); - } - - if (style.HasLeftIndent()) - { - if (!(compareWith && compareWith->HasLeftIndent() && compareWith->GetLeftIndent() == style.GetLeftIndent() - && compareWith->GetLeftSubIndent() == style.GetLeftSubIndent())) - destStyle.SetLeftIndent(style.GetLeftIndent(), style.GetLeftSubIndent()); - } - - if (style.HasRightIndent()) - { - if (!(compareWith && compareWith->HasRightIndent() && compareWith->GetRightIndent() == style.GetRightIndent())) - destStyle.SetRightIndent(style.GetRightIndent()); - } - - if (style.HasParagraphSpacingAfter()) - { - if (!(compareWith && compareWith->HasParagraphSpacingAfter() && compareWith->GetParagraphSpacingAfter() == style.GetParagraphSpacingAfter())) - destStyle.SetParagraphSpacingAfter(style.GetParagraphSpacingAfter()); - } - - if (style.HasParagraphSpacingBefore()) - { - if (!(compareWith && compareWith->HasParagraphSpacingBefore() && compareWith->GetParagraphSpacingBefore() == style.GetParagraphSpacingBefore())) - destStyle.SetParagraphSpacingBefore(style.GetParagraphSpacingBefore()); - } - - if (style.HasLineSpacing()) - { - if (!(compareWith && compareWith->HasLineSpacing() && compareWith->GetLineSpacing() == style.GetLineSpacing())) - destStyle.SetLineSpacing(style.GetLineSpacing()); - } - - if (style.HasCharacterStyleName()) - { - if (!(compareWith && compareWith->HasCharacterStyleName() && compareWith->GetCharacterStyleName() == style.GetCharacterStyleName())) - destStyle.SetCharacterStyleName(style.GetCharacterStyleName()); - } - - if (style.HasParagraphStyleName()) - { - if (!(compareWith && compareWith->HasParagraphStyleName() && compareWith->GetParagraphStyleName() == style.GetParagraphStyleName())) - destStyle.SetParagraphStyleName(style.GetParagraphStyleName()); - } - - if (style.HasListStyleName()) - { - if (!(compareWith && compareWith->HasListStyleName() && compareWith->GetListStyleName() == style.GetListStyleName())) - destStyle.SetListStyleName(style.GetListStyleName()); - } - - if (style.HasBulletStyle()) - { - if (!(compareWith && compareWith->HasBulletStyle() && compareWith->GetBulletStyle() == style.GetBulletStyle())) - destStyle.SetBulletStyle(style.GetBulletStyle()); - } - - if (style.HasBulletText()) - { - if (!(compareWith && compareWith->HasBulletText() && compareWith->GetBulletText() == style.GetBulletText())) - { - destStyle.SetBulletText(style.GetBulletText()); - destStyle.SetBulletFont(style.GetBulletFont()); - } - } - - if (style.HasBulletNumber()) - { - if (!(compareWith && compareWith->HasBulletNumber() && compareWith->GetBulletNumber() == style.GetBulletNumber())) - destStyle.SetBulletNumber(style.GetBulletNumber()); - } - - if (style.HasBulletName()) - { - if (!(compareWith && compareWith->HasBulletName() && compareWith->GetBulletName() == style.GetBulletName())) - destStyle.SetBulletName(style.GetBulletName()); - } - - if (style.HasURL()) - { - if (!(compareWith && compareWith->HasURL() && compareWith->GetURL() == style.GetURL())) - destStyle.SetURL(style.GetURL()); - } - - if (style.HasPageBreak()) - { - if (!(compareWith && compareWith->HasPageBreak())) - destStyle.SetPageBreak(); - } - - if (style.GetFlags() & wxTEXT_ATTR_AVOID_PAGE_BREAK_BEFORE) - { - if (!(compareWith && (compareWith->GetFlags() & wxTEXT_ATTR_AVOID_PAGE_BREAK_BEFORE))) - destStyle.SetFlags(destStyle.GetFlags()|wxTEXT_ATTR_AVOID_PAGE_BREAK_BEFORE); - } - - if (style.GetFlags() & wxTEXT_ATTR_AVOID_PAGE_BREAK_AFTER) - { - if (!(compareWith && (compareWith->GetFlags() & wxTEXT_ATTR_AVOID_PAGE_BREAK_AFTER))) - destStyle.SetFlags(destStyle.GetFlags()|wxTEXT_ATTR_AVOID_PAGE_BREAK_AFTER); - } - - if (style.HasTextEffects()) - { - if (!(compareWith && compareWith->HasTextEffects() && compareWith->GetTextEffects() == style.GetTextEffects())) - { - int destBits = destStyle.GetTextEffects(); - int destFlags = destStyle.GetTextEffectFlags(); - - int srcBits = style.GetTextEffects(); - int srcFlags = style.GetTextEffectFlags(); - - // Reset incompatible bits in the destination - wxResetIncompatibleBits((wxTEXT_ATTR_EFFECT_SUPERSCRIPT|wxTEXT_ATTR_EFFECT_SUBSCRIPT), srcFlags, destFlags, destBits); - wxResetIncompatibleBits((wxTEXT_ATTR_EFFECT_CAPITALS|wxTEXT_ATTR_EFFECT_SMALL_CAPITALS), srcFlags, destFlags, destBits); - wxResetIncompatibleBits((wxTEXT_ATTR_EFFECT_STRIKETHROUGH|wxTEXT_ATTR_EFFECT_DOUBLE_STRIKETHROUGH), srcFlags, destFlags, destBits); - - CombineBitlists(destBits, srcBits, destFlags, srcFlags); - - destStyle.SetTextEffects(destBits); - destStyle.SetTextEffectFlags(destFlags); - } - } - - if (style.HasOutlineLevel()) - { - if (!(compareWith && compareWith->HasOutlineLevel() && compareWith->GetOutlineLevel() == style.GetOutlineLevel())) - destStyle.SetOutlineLevel(style.GetOutlineLevel()); - } - - return true; -} - -/* static */ -wxTextAttr wxTextAttr::Combine(const wxTextAttr& attr, - const wxTextAttr& attrDef, - const wxTextCtrlBase *text) -{ - wxFont font; - if (attr.HasFont()) - font = attr.GetFont(); - - if ( !font.IsOk() ) - { - if (attrDef.HasFont()) - font = attrDef.GetFont(); - - if ( text && !font.IsOk() ) - font = text->GetFont(); - } - - wxColour colFg = attr.GetTextColour(); - if ( !colFg.IsOk() ) - { - colFg = attrDef.GetTextColour(); - - if ( text && !colFg.IsOk() ) - colFg = text->GetForegroundColour(); - } - - wxColour colBg = attr.GetBackgroundColour(); - if ( !colBg.IsOk() ) - { - colBg = attrDef.GetBackgroundColour(); - - if ( text && !colBg.IsOk() ) - colBg = text->GetBackgroundColour(); - } - - wxTextAttr newAttr(colFg, colBg, font); - - if (attr.HasAlignment()) - newAttr.SetAlignment(attr.GetAlignment()); - else if (attrDef.HasAlignment()) - newAttr.SetAlignment(attrDef.GetAlignment()); - - if (attr.HasTabs()) - newAttr.SetTabs(attr.GetTabs()); - else if (attrDef.HasTabs()) - newAttr.SetTabs(attrDef.GetTabs()); - - if (attr.HasLeftIndent()) - newAttr.SetLeftIndent(attr.GetLeftIndent(), attr.GetLeftSubIndent()); - else if (attrDef.HasLeftIndent()) - newAttr.SetLeftIndent(attrDef.GetLeftIndent(), attr.GetLeftSubIndent()); - - if (attr.HasRightIndent()) - newAttr.SetRightIndent(attr.GetRightIndent()); - else if (attrDef.HasRightIndent()) - newAttr.SetRightIndent(attrDef.GetRightIndent()); - - return newAttr; -} - -/// Compare tabs -bool wxTextAttr::TabsEq(const wxArrayInt& tabs1, const wxArrayInt& tabs2) -{ - if (tabs1.GetCount() != tabs2.GetCount()) - return false; - - size_t i; - for (i = 0; i < tabs1.GetCount(); i++) - { - if (tabs1[i] != tabs2[i]) - return false; - } - return true; -} - -// Remove attributes -bool wxTextAttr::RemoveStyle(wxTextAttr& destStyle, const wxTextAttr& style) -{ - int flags = style.GetFlags(); - int destFlags = destStyle.GetFlags(); - - // We must treat text effects specially, since we must remove only some. - if (style.HasTextEffects() && (style.GetTextEffectFlags() != 0)) - { - int newTextEffectFlags = destStyle.GetTextEffectFlags() & ~style.GetTextEffectFlags(); - int newTextEffects = destStyle.GetTextEffects() & ~style.GetTextEffectFlags(); - destStyle.SetTextEffects(newTextEffects); - destStyle.SetTextEffectFlags(newTextEffectFlags); - - // Don't remove wxTEXT_ATTR_EFFECTS unless the resulting flags are zero - if (newTextEffectFlags != 0) - flags &= ~wxTEXT_ATTR_EFFECTS; - } - - destStyle.SetFlags(destFlags & ~flags); - - return true; -} - -/// Combine two bitlists, specifying the bits of interest with separate flags. -bool wxTextAttr::CombineBitlists(int& valueA, int valueB, int& flagsA, int flagsB) -{ - // We want to apply B's bits to A, taking into account each's flags which indicate which bits - // are to be taken into account. A zero in B's bits should reset that bit in A but only if B's flags - // indicate it. - - // First, reset the 0 bits from B. We make a mask so we're only dealing with B's zero - // bits at this point, ignoring any 1 bits in B or 0 bits in B that are not relevant. - int valueA2 = ~(~valueB & flagsB) & valueA; - - // Now combine the 1 bits. - int valueA3 = (valueB & flagsB) | valueA2; - - valueA = valueA3; - flagsA = (flagsA | flagsB); - - return true; -} - -/// Compare two bitlists -bool wxTextAttr::BitlistsEqPartial(int valueA, int valueB, int flags) -{ - int relevantBitsA = valueA & flags; - int relevantBitsB = valueB & flags; - return relevantBitsA == relevantBitsB; -} - -/// Split into paragraph and character styles -bool wxTextAttr::SplitParaCharStyles(const wxTextAttr& style, wxTextAttr& parStyle, wxTextAttr& charStyle) -{ - wxTextAttr defaultCharStyle1(style); - wxTextAttr defaultParaStyle1(style); - defaultCharStyle1.SetFlags(defaultCharStyle1.GetFlags()&wxTEXT_ATTR_CHARACTER); - defaultParaStyle1.SetFlags(defaultParaStyle1.GetFlags()&wxTEXT_ATTR_PARAGRAPH); - - charStyle.Apply(defaultCharStyle1); - parStyle.Apply(defaultParaStyle1); - - return true; -} - -// apply styling to text range -bool wxTextCtrlBase::SetStyle(long WXUNUSED(start), long WXUNUSED(end), - const wxTextAttr& WXUNUSED(style)) -{ - // to be implemented in derived classes - return false; -} - -// get the styling at the given position -bool wxTextCtrlBase::GetStyle(long WXUNUSED(position), wxTextAttr& WXUNUSED(style)) -{ - // to be implemented in derived classes - return false; -} - -// change default text attributes -bool wxTextCtrlBase::SetDefaultStyle(const wxTextAttr& style) -{ - // keep the old attributes if the new style doesn't specify them unless the - // new style is empty - then reset m_defaultStyle (as there is no other way - // to do it) - if ( style.IsDefault() ) - m_defaultStyle = style; - else - m_defaultStyle = wxTextAttr::Combine(style, m_defaultStyle, this); - - return true; -} - -// ---------------------------------------------------------------------------- -// file IO functions -// ---------------------------------------------------------------------------- - -bool wxTextAreaBase::DoLoadFile(const wxString& filename, int WXUNUSED(fileType)) -{ -#if wxUSE_FFILE - wxFFile file(filename); - if ( file.IsOpened() ) - { - wxString text; - if ( file.ReadAll(&text) ) - { - SetValue(text); - - DiscardEdits(); - m_filename = filename; - - return true; - } - } -#else - (void)filename; // avoid compiler warning about unreferenced parameter -#endif // wxUSE_FFILE - - wxLogError(_("File couldn't be loaded.")); - - return false; -} - -bool wxTextAreaBase::DoSaveFile(const wxString& filename, int WXUNUSED(fileType)) -{ -#if wxUSE_FFILE - wxFFile file(filename, wxT("w")); - if ( file.IsOpened() && file.Write(GetValue()) ) - { - // if it worked, save for future calls - m_filename = filename; - - // it's not modified any longer - DiscardEdits(); - - return true; - } -#else - (void)filename; // avoid compiler warning about unreferenced parameter -#endif // wxUSE_FFILE - - return false; -} - -bool wxTextAreaBase::SaveFile(const wxString& filename, int fileType) -{ - wxString filenameToUse = filename.empty() ? m_filename : filename; - if ( filenameToUse.empty() ) - { - // what kind of message to give? is it an error or a program bug? - wxLogDebug(wxT("Can't save textctrl to file without filename.")); - - return false; - } - - return DoSaveFile(filenameToUse, fileType); -} - -// ---------------------------------------------------------------------------- -// stream-like insertion operator -// ---------------------------------------------------------------------------- - -wxTextCtrl& wxTextCtrlBase::operator<<(const wxString& s) -{ - AppendText(s); - return *TEXTCTRL(this); -} - -wxTextCtrl& wxTextCtrlBase::operator<<(double d) -{ - return *this << wxString::Format("%.2f", d); -} - -wxTextCtrl& wxTextCtrlBase::operator<<(int i) -{ - return *this << wxString::Format("%d", i); -} - -wxTextCtrl& wxTextCtrlBase::operator<<(long l) -{ - return *this << wxString::Format("%ld", l); -} - -// ---------------------------------------------------------------------------- -// streambuf methods implementation -// ---------------------------------------------------------------------------- - -#if wxHAS_TEXT_WINDOW_STREAM - -int wxTextCtrlBase::overflow(int c) -{ - AppendText((wxChar)c); - - // return something different from EOF - return 0; -} - -#endif // wxHAS_TEXT_WINDOW_STREAM - -// ---------------------------------------------------------------------------- -// emulating key presses -// ---------------------------------------------------------------------------- - -bool wxTextCtrlBase::EmulateKeyPress(const wxKeyEvent& event) -{ - bool handled = false; - // we have a native implementation for Win32 and so don't need this one -#ifndef __WIN32__ - wxChar ch = 0; - int keycode = event.GetKeyCode(); - - long from, to; - GetSelection(&from,&to); - long insert = GetInsertionPoint(); - long last = GetLastPosition(); - - // catch arrow left and right - - switch ( keycode ) - { - case WXK_LEFT: - if ( event.ShiftDown() ) - SetSelection( (from > 0 ? from - 1 : 0) , to ); - else - { - if ( from != to ) - insert = from; - else if ( insert > 0 ) - insert -= 1; - SetInsertionPoint( insert ); - } - handled = true; - break; - case WXK_RIGHT: - if ( event.ShiftDown() ) - SetSelection( from, (to < last ? to + 1 : last) ); - else - { - if ( from != to ) - insert = to; - else if ( insert < last ) - insert += 1; - SetInsertionPoint( insert ); - } - handled = true; - break; - case WXK_NUMPAD0: - case WXK_NUMPAD1: - case WXK_NUMPAD2: - case WXK_NUMPAD3: - case WXK_NUMPAD4: - case WXK_NUMPAD5: - case WXK_NUMPAD6: - case WXK_NUMPAD7: - case WXK_NUMPAD8: - case WXK_NUMPAD9: - ch = (wxChar)(wxT('0') + keycode - WXK_NUMPAD0); - break; - - case WXK_MULTIPLY: - case WXK_NUMPAD_MULTIPLY: - ch = wxT('*'); - break; - - case WXK_ADD: - case WXK_NUMPAD_ADD: - ch = wxT('+'); - break; - - case WXK_SUBTRACT: - case WXK_NUMPAD_SUBTRACT: - ch = wxT('-'); - break; - - case WXK_DECIMAL: - case WXK_NUMPAD_DECIMAL: - ch = wxT('.'); - break; - - case WXK_DIVIDE: - case WXK_NUMPAD_DIVIDE: - ch = wxT('/'); - break; - - case WXK_DELETE: - case WXK_NUMPAD_DELETE: - // delete the character at cursor - { - const long pos = GetInsertionPoint(); - if ( pos < GetLastPosition() ) - Remove(pos, pos + 1); - handled = true; - } - break; - - case WXK_BACK: - // delete the character before the cursor - { - const long pos = GetInsertionPoint(); - if ( pos > 0 ) - Remove(pos - 1, pos); - handled = true; - } - break; - - default: -#if wxUSE_UNICODE - if ( event.GetUnicodeKey() ) - { - ch = event.GetUnicodeKey(); - } - else -#endif - if ( keycode < 256 && keycode >= 0 && wxIsprint(keycode) ) - { - // FIXME this is not going to work for non letters... - if ( !event.ShiftDown() ) - { - keycode = wxTolower(keycode); - } - - ch = (wxChar)keycode; - } - else - { - ch = wxT('\0'); - } - } - - if ( ch ) - { - WriteText(ch); - - handled = true; - } -#else // __WIN32__ - wxUnusedVar(event); -#endif // !__WIN32__/__WIN32__ - - return handled; -} - -// ---------------------------------------------------------------------------- -// Other miscellaneous stuff -// ---------------------------------------------------------------------------- - -// do the window-specific processing after processing the update event -void wxTextCtrlBase::DoUpdateWindowUI(wxUpdateUIEvent& event) -{ - // call inherited, but skip the wxControl's version, and call directly the - // wxWindow's one instead, because the only reason why we are overriding this - // function is that we want to use SetValue() instead of wxControl::SetLabel() - wxWindowBase::DoUpdateWindowUI(event); - - // update text - if ( event.GetSetText() ) - { - if ( event.GetText() != GetValue() ) - SetValue(event.GetText()); - } -} - -bool wxTextCtrlBase::OnDynamicBind(wxDynamicEventTableEntry& entry) -{ - if ( entry.m_eventType == wxEVT_TEXT_ENTER ) - { - wxCHECK_MSG - ( - HasFlag(wxTE_PROCESS_ENTER), - false, - wxS("Must have wxTE_PROCESS_ENTER for wxEVT_TEXT_ENTER to work") - ); - } - - return wxControl::OnDynamicBind(entry); -} - -// ---------------------------------------------------------------------------- -// hit testing -// ---------------------------------------------------------------------------- - -wxTextCtrlHitTestResult -wxTextAreaBase::HitTest(const wxPoint& pt, wxTextCoord *x, wxTextCoord *y) const -{ - // implement in terms of the other overload as the native ports typically - // can get the position and not (x, y) pair directly (although wxUniv - // directly gets x and y -- and so overrides this method as well) - long pos; - wxTextCtrlHitTestResult rc = HitTest(pt, &pos); - - if ( rc != wxTE_HT_UNKNOWN ) - { - PositionToXY(pos, x, y); - } - - return rc; -} - -wxTextCtrlHitTestResult -wxTextAreaBase::HitTest(const wxPoint& WXUNUSED(pt), long * WXUNUSED(pos)) const -{ - // not implemented - return wxTE_HT_UNKNOWN; -} - -wxPoint wxTextAreaBase::PositionToCoords(long pos) const -{ - wxCHECK_MSG( IsValidPosition(pos), wxDefaultPosition, - wxS("Position argument out of range.") ); - - return DoPositionToCoords(pos); -} - -wxPoint wxTextAreaBase::DoPositionToCoords(long WXUNUSED(pos)) const -{ - return wxDefaultPosition; -} - -#else // !wxUSE_TEXTCTRL - -// define this one even if !wxUSE_TEXTCTRL because it is also used by other -// controls (wxComboBox and wxSpinCtrl) - -wxDEFINE_EVENT( wxEVT_TEXT, wxCommandEvent ); - -#endif // wxUSE_TEXTCTRL/!wxUSE_TEXTCTRL diff --git a/Externals/wxWidgets3/src/common/textentrycmn.cpp b/Externals/wxWidgets3/src/common/textentrycmn.cpp deleted file mode 100644 index 298eb408a4..0000000000 --- a/Externals/wxWidgets3/src/common/textentrycmn.cpp +++ /dev/null @@ -1,472 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/textentrycmn.cpp -// Purpose: wxTextEntryBase implementation -// Author: Vadim Zeitlin -// Created: 2007-09-26 -// Copyright: (c) 2007 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// for compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_TEXTCTRL || wxUSE_COMBOBOX - -#ifndef WX_PRECOMP - #include "wx/window.h" - #include "wx/dataobj.h" -#endif //WX_PRECOMP - -#include "wx/textentry.h" -#include "wx/textcompleter.h" -#include "wx/clipbrd.h" - -// ---------------------------------------------------------------------------- -// wxTextEntryHintData -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxTextEntryHintData -{ -public: - wxTextEntryHintData(wxTextEntryBase *entry, wxWindow *win) - : m_entry(entry), - m_win(win), - m_text(m_entry->GetValue()) - { - win->Bind(wxEVT_SET_FOCUS, &wxTextEntryHintData::OnSetFocus, this); - win->Bind(wxEVT_KILL_FOCUS, &wxTextEntryHintData::OnKillFocus, this); - win->Bind(wxEVT_TEXT, &wxTextEntryHintData::OnTextChanged, this); - } - - // default dtor is ok - - // Get the real text of the control such as it was before we replaced it - // with the hint. - const wxString& GetText() const { return m_text; } - - // Set the hint to show, shouldn't be empty normally. - // - // This should be called after creating a new wxTextEntryHintData object - // and may be called more times in the future. - void SetHintString(const wxString& hint) - { - m_hint = hint; - - if ( !m_win->HasFocus() ) - ShowHintIfAppropriate(); - //else: The new hint will be shown later when we lose focus. - } - - const wxString& GetHintString() const { return m_hint; } - - // This is called whenever the text control contents changes. - // - // We call it ourselves when this change generates an event but it's also - // necessary to call it explicitly from wxTextEntry::ChangeValue() as it, - // by design, does not generate any events. - void HandleTextUpdate(const wxString& text) - { - m_text = text; - - // If we're called because of a call to Set or ChangeValue(), the - // control may still have the hint text colour, reset it in this case. - RestoreTextColourIfNecessary(); - } - -private: - // Show the hint in the window if we should do it, i.e. if the window - // doesn't have any text of its own. - void ShowHintIfAppropriate() - { - // Never overwrite existing window text. - if ( !m_text.empty() ) - return; - - // Save the old text colour and set a more inconspicuous one for the - // hint. - m_colFg = m_win->GetForegroundColour(); - m_win->SetForegroundColour(*wxLIGHT_GREY); - - m_entry->DoSetValue(m_hint, wxTextEntryBase::SetValue_NoEvent); - } - - // Restore the original text colour if we had changed it to show the hint - // and not restored it yet. - void RestoreTextColourIfNecessary() - { - if ( m_colFg.IsOk() ) - { - m_win->SetForegroundColour(m_colFg); - m_colFg = wxColour(); - } - } - - void OnSetFocus(wxFocusEvent& event) - { - // If we had been showing the hint before, remove it now and restore - // the normal colour. - if ( m_text.empty() ) - { - RestoreTextColourIfNecessary(); - - m_entry->DoSetValue(wxString(), wxTextEntryBase::SetValue_NoEvent); - } - - event.Skip(); - } - - void OnKillFocus(wxFocusEvent& event) - { - // Restore the hint if the user didn't enter anything. - ShowHintIfAppropriate(); - - event.Skip(); - } - - void OnTextChanged(wxCommandEvent& event) - { - // Update the stored window text. - // - // Notice that we can't use GetValue() nor wxCommandEvent::GetString() - // which uses it internally because this would just forward back to us - // so go directly to the private method which returns the real control - // contents. - HandleTextUpdate(m_entry->DoGetValue()); - - event.Skip(); - } - - - // the text control we're associated with (as its interface and its window) - wxTextEntryBase * const m_entry; - wxWindow * const m_win; - - // the original foreground colour of m_win before we changed it - wxColour m_colFg; - - // The hint passed to wxTextEntry::SetHint(), never empty. - wxString m_hint; - - // The real text of the window. - wxString m_text; - - - wxDECLARE_NO_COPY_CLASS(wxTextEntryHintData); -}; - -// ============================================================================ -// wxTextEntryBase implementation -// ============================================================================ - -wxTextEntryBase::~wxTextEntryBase() -{ - delete m_hintData; -} - -// ---------------------------------------------------------------------------- -// text accessors -// ---------------------------------------------------------------------------- - -wxString wxTextEntryBase::GetValue() const -{ - return m_hintData ? m_hintData->GetText() : DoGetValue(); -} - -wxString wxTextEntryBase::GetRange(long from, long to) const -{ - wxString sel; - wxString value = GetValue(); - - if ( from < to && (long)value.length() >= to ) - { - sel = value.substr(from, to - from); - } - - return sel; -} - -// ---------------------------------------------------------------------------- -// text operations -// ---------------------------------------------------------------------------- - -void wxTextEntryBase::ChangeValue(const wxString& value) -{ - DoSetValue(value, SetValue_NoEvent); - - // As we didn't generate any events for wxTextEntryHintData to catch, - // notify it explicitly about our changed contents. - if ( m_hintData ) - m_hintData->HandleTextUpdate(value); -} - -void wxTextEntryBase::AppendText(const wxString& text) -{ - SetInsertionPointEnd(); - WriteText(text); -} - -void wxTextEntryBase::DoSetValue(const wxString& value, int flags) -{ - if ( value != DoGetValue() ) - { - EventsSuppressor noeventsIf(this, !(flags & SetValue_SendEvent)); - - SelectAll(); - WriteText(value); - - SetInsertionPoint(0); - } - else // Same value, no need to do anything. - { - // Except that we still need to generate the event for consistency with - // the normal case when the text does change. - if ( flags & SetValue_SendEvent ) - SendTextUpdatedEvent(GetEditableWindow()); - } -} - -void wxTextEntryBase::Replace(long from, long to, const wxString& value) -{ - { - EventsSuppressor noevents(this); - Remove(from, to); - } - - SetInsertionPoint(from); - WriteText(value); -} - -// ---------------------------------------------------------------------------- -// selection -// ---------------------------------------------------------------------------- - -bool wxTextEntryBase::HasSelection() const -{ - long from, to; - GetSelection(&from, &to); - - return from < to; -} - -void wxTextEntryBase::RemoveSelection() -{ - long from, to; - GetSelection(& from, & to); - if (from != -1 && to != -1) - Remove(from, to); -} - -wxString wxTextEntryBase::GetStringSelection() const -{ - long from, to; - GetSelection(&from, &to); - - return GetRange(from, to); -} - -// ---------------------------------------------------------------------------- -// clipboard -// ---------------------------------------------------------------------------- - -bool wxTextEntryBase::CanCopy() const -{ - return HasSelection(); -} - -bool wxTextEntryBase::CanCut() const -{ - return CanCopy() && IsEditable(); -} - -bool wxTextEntryBase::CanPaste() const -{ - if ( IsEditable() ) - { -#if wxUSE_CLIPBOARD - // check if there is any text on the clipboard - if ( wxTheClipboard->IsSupported(wxDF_TEXT) -#if wxUSE_UNICODE - || wxTheClipboard->IsSupported(wxDF_UNICODETEXT) -#endif // wxUSE_UNICODE - ) - { - return true; - } -#endif // wxUSE_CLIPBOARD - } - - return false; -} - -// ---------------------------------------------------------------------------- -// input restrictions -// ---------------------------------------------------------------------------- - -#ifndef wxHAS_NATIVE_TEXT_FORCEUPPER - -namespace -{ - -// Poor man's lambda: helper for binding ConvertToUpperCase() to the event -struct ForceUpperFunctor -{ - explicit ForceUpperFunctor(wxTextEntryBase* entry) - : m_entry(entry) - { - } - - void operator()(wxCommandEvent& event) - { - event.Skip(); - m_entry->ConvertToUpperCase(); - } - - wxTextEntryBase* const m_entry; -}; - -} // anonymous namespace - -#endif // !wxHAS_NATIVE_TEXT_FORCEUPPER - -void wxTextEntryBase::ConvertToUpperCase() -{ - const wxString& valueOld = GetValue(); - const wxString& valueNew = valueOld.Upper(); - - if ( valueNew != valueOld ) - { - long from, to; - GetSelection(&from, &to); - ChangeValue(valueNew); - SetSelection(from, to); - } -} - -void wxTextEntryBase::ForceUpper() -{ - // Do nothing if this method is never called because a native override is - // provided: this is just a tiny size-saving optimization, nothing else. -#ifndef wxHAS_NATIVE_TEXT_FORCEUPPER - wxWindow* const win = GetEditableWindow(); - wxCHECK_RET( win, wxS("can't be called before creating the window") ); - - // Convert the current control contents to upper case - ConvertToUpperCase(); - - // And ensure that any text entered in the future is converted too - win->Bind(wxEVT_TEXT, ForceUpperFunctor(this)); -#endif // !wxHAS_NATIVE_TEXT_FORCEUPPER -} - -// ---------------------------------------------------------------------------- -// hints support -// ---------------------------------------------------------------------------- - -bool wxTextEntryBase::SetHint(const wxString& hint) -{ - if ( !hint.empty() ) - { - if ( !m_hintData ) - m_hintData = new wxTextEntryHintData(this, GetEditableWindow()); - - m_hintData->SetHintString(hint); - } - else if ( m_hintData ) - { - // Setting empty hint removes any currently set one. - delete m_hintData; - m_hintData = NULL; - } - //else: Setting empty hint when we don't have any doesn't do anything. - - return true; -} - -wxString wxTextEntryBase::GetHint() const -{ - return m_hintData ? m_hintData->GetHintString() : wxString(); -} - -// ---------------------------------------------------------------------------- -// margins support -// ---------------------------------------------------------------------------- - -bool wxTextEntryBase::DoSetMargins(const wxPoint& WXUNUSED(pt)) -{ - return false; -} - -wxPoint wxTextEntryBase::DoGetMargins() const -{ - return wxPoint(-1, -1); -} - -// ---------------------------------------------------------------------------- -// events -// ---------------------------------------------------------------------------- - -/* static */ -bool wxTextEntryBase::SendTextUpdatedEvent(wxWindow *win) -{ - wxCHECK_MSG( win, false, "can't send an event without a window" ); - - wxCommandEvent event(wxEVT_TEXT, win->GetId()); - - // do not do this as it could be very inefficient if the text control - // contains a lot of text and we're not using ref-counted wxString - // implementation -- instead, event.GetString() will query the control for - // its current text if needed - //event.SetString(win->GetValue()); - - event.SetEventObject(win); - return win->HandleWindowEvent(event); -} - -// ---------------------------------------------------------------------------- -// auto-completion stubs -// ---------------------------------------------------------------------------- - -wxTextCompleter::~wxTextCompleter() -{ -} - -bool wxTextCompleterSimple::Start(const wxString& prefix) -{ - m_index = 0; - m_completions.clear(); - GetCompletions(prefix, m_completions); - - return !m_completions.empty(); -} - -wxString wxTextCompleterSimple::GetNext() -{ - if ( m_index == m_completions.size() ) - return wxString(); - - return m_completions[m_index++]; -} - -bool wxTextEntryBase::DoAutoCompleteCustom(wxTextCompleter *completer) -{ - // We don't do anything here but we still need to delete the completer for - // consistency with the ports that do implement this method and take - // ownership of the pointer. - delete completer; - - return false; -} - -#endif // wxUSE_TEXTCTRL || wxUSE_COMBOBOX diff --git a/Externals/wxWidgets3/src/common/textfile.cpp b/Externals/wxWidgets3/src/common/textfile.cpp deleted file mode 100644 index 0b15083a7f..0000000000 --- a/Externals/wxWidgets3/src/common/textfile.cpp +++ /dev/null @@ -1,289 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/textfile.cpp -// Purpose: implementation of wxTextFile class -// Author: Vadim Zeitlin -// Modified by: -// Created: 03.04.98 -// Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// headers -// ============================================================================ - -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif //__BORLANDC__ - -#if !wxUSE_FILE || !wxUSE_TEXTBUFFER - #undef wxUSE_TEXTFILE - #define wxUSE_TEXTFILE 0 -#endif // wxUSE_FILE - -#if wxUSE_TEXTFILE - -#ifndef WX_PRECOMP - #include "wx/string.h" - #include "wx/intl.h" - #include "wx/file.h" - #include "wx/log.h" -#endif - -#include "wx/textfile.h" -#include "wx/filename.h" -#include "wx/buffer.h" - -// ============================================================================ -// wxTextFile class implementation -// ============================================================================ - -wxTextFile::wxTextFile(const wxString& strFileName) - : wxTextBuffer(strFileName) -{ -} - - -// ---------------------------------------------------------------------------- -// file operations -// ---------------------------------------------------------------------------- - -bool wxTextFile::OnExists() const -{ - return wxFile::Exists(m_strBufferName); -} - - -bool wxTextFile::OnOpen(const wxString &strBufferName, wxTextBufferOpenMode openMode) -{ - wxFile::OpenMode fileOpenMode = wxFile::read_write; - - switch ( openMode ) - { - case ReadAccess: - fileOpenMode = wxFile::read; - break; - - case WriteAccess: - fileOpenMode = wxFile::write; - break; - } - - if ( fileOpenMode == wxFile::read_write ) - { - // This must mean it hasn't been initialized in the switch above. - wxFAIL_MSG( wxT("unknown open mode in wxTextFile::Open") ); - return false; - } - - return m_file.Open(strBufferName, fileOpenMode); -} - - -bool wxTextFile::OnClose() -{ - return m_file.Close(); -} - - -bool wxTextFile::OnRead(const wxMBConv& conv) -{ - // file should be opened - wxASSERT_MSG( m_file.IsOpened(), wxT("can't read closed file") ); - - // read the entire file in memory: this is not the most efficient thing to - // do it but there is no good way to avoid it in Unicode build because if - // we read the file block by block we can't convert each block to Unicode - // separately (the last multibyte char in the block might be only partially - // read and so the conversion would fail) and, as the file contents is kept - // in memory by wxTextFile anyhow, it shouldn't be a big problem to read - // the file entirely - size_t bufSize = 0; - - // number of bytes to (try to) read from disk at once - static const size_t BLOCK_SIZE = 4096; - - wxCharBuffer buf; - - // first determine if the file is seekable or not and so whether we can - // determine its length in advance - wxFileOffset fileLength; - { - wxLogNull logNull; - fileLength = m_file.Length(); - } - - // some non-seekable files under /proc under Linux pretend that they're - // seekable but always return 0; others do return an error - const bool seekable = fileLength != wxInvalidOffset && fileLength != 0; - if ( seekable ) - { - // we know the required length, so set the buffer size in advance - bufSize = fileLength; - if ( !buf.extend(bufSize) ) - return false; - - // if the file is seekable, also check that we're at its beginning - wxASSERT_MSG( m_file.Tell() == 0, wxT("should be at start of file") ); - - char *dst = buf.data(); - for ( size_t nRemaining = bufSize; nRemaining > 0; ) - { - size_t nToRead = BLOCK_SIZE; - - // the file size could have changed, avoid overflowing the buffer - // even if it did - if ( nToRead > nRemaining ) - nToRead = nRemaining; - - ssize_t nRead = m_file.Read(dst, nToRead); - - if ( nRead == wxInvalidOffset ) - { - // read error (error message already given in wxFile::Read) - return false; - } - - if ( nRead == 0 ) - { - // this file can't be empty because we checked for this above - // so this must be the end of file - break; - } - - dst += nRead; - nRemaining -= nRead; - } - - wxASSERT_MSG( dst - buf.data() == (wxFileOffset)bufSize, - wxT("logic error") ); - } - else // file is not seekable - { - char block[BLOCK_SIZE]; - for ( ;; ) - { - ssize_t nRead = m_file.Read(block, WXSIZEOF(block)); - - if ( nRead == wxInvalidOffset ) - { - // read error (error message already given in wxFile::Read) - return false; - } - - if ( nRead == 0 ) - { - // if no bytes have been read, presumably this is a - // valid-but-empty file - if ( bufSize == 0 ) - return true; - - // otherwise we've finished reading the file - break; - } - - // extend the buffer for new data - if ( !buf.extend(bufSize + nRead) ) - return false; - - // and append it to the buffer - memcpy(buf.data() + bufSize, block, nRead); - bufSize += nRead; - } - } - - const wxString str(buf, conv, bufSize); - - // there's no risk of this happening in ANSI build -#if wxUSE_UNICODE - if ( bufSize > 4 && str.empty() ) - { - wxLogError(_("Failed to convert file \"%s\" to Unicode."), GetName()); - return false; - } -#endif // wxUSE_UNICODE - - // we don't need this memory any more - buf.reset(); - - - // now break the buffer in lines - - // the beginning of the current line, changes inside the loop - wxString::const_iterator lineStart = str.begin(); - const wxString::const_iterator end = str.end(); - for ( wxString::const_iterator p = lineStart; p != end; p++ ) - { - const wxChar ch = *p; - if ( ch == '\r' || ch == '\n' ) - { - // Determine the kind of line ending this is. - wxTextFileType lineType = wxTextFileType_None; - if ( ch == '\r' ) - { - wxString::const_iterator next = p + 1; - if ( next != end && *next == '\n' ) - lineType = wxTextFileType_Dos; - else - lineType = wxTextFileType_Mac; - } - else // ch == '\n' - { - lineType = wxTextFileType_Unix; - } - - AddLine(wxString(lineStart, p), lineType); - - // DOS EOL is the only one consisting of two chars, not one. - if ( lineType == wxTextFileType_Dos ) - p++; - - lineStart = p + 1; - } - } - - // anything in the last line? - if ( lineStart != end ) - { - // Add the last line; notice that it is certainly not terminated with a - // newline, otherwise it would be handled above. - wxString lastLine(lineStart, end); - AddLine(lastLine, wxTextFileType_None); - } - - return true; -} - - -bool wxTextFile::OnWrite(wxTextFileType typeNew, const wxMBConv& conv) -{ - wxFileName fn = m_strBufferName; - - // We do NOT want wxPATH_NORM_CASE here, or the case will not - // be preserved. - if ( !fn.IsAbsolute() ) - fn.Normalize(wxPATH_NORM_ENV_VARS | wxPATH_NORM_DOTS | wxPATH_NORM_TILDE | - wxPATH_NORM_ABSOLUTE | wxPATH_NORM_LONG); - - wxTempFile fileTmp(fn.GetFullPath()); - - if ( !fileTmp.IsOpened() ) { - wxLogError(_("can't write buffer '%s' to disk."), m_strBufferName); - return false; - } - - size_t nCount = GetLineCount(); - for ( size_t n = 0; n < nCount; n++ ) { - fileTmp.Write(GetLine(n) + - GetEOL(typeNew == wxTextFileType_None ? GetLineType(n) - : typeNew), - conv); - } - - // replace the old file with this one - return fileTmp.Commit(); -} - -#endif // wxUSE_TEXTFILE diff --git a/Externals/wxWidgets3/src/common/textmeasurecmn.cpp b/Externals/wxWidgets3/src/common/textmeasurecmn.cpp deleted file mode 100644 index 8d828d4b71..0000000000 --- a/Externals/wxWidgets3/src/common/textmeasurecmn.cpp +++ /dev/null @@ -1,280 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/textmeasurecmn.cpp -// Purpose: wxTextMeasureBase implementation -// Author: Manuel Martin -// Created: 2012-10-05 -// Copyright: (c) 1997-2012 wxWidgets team -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// for compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifndef WX_PRECOMP - #include "wx/dc.h" - #include "wx/window.h" -#endif //WX_PRECOMP - -#include "wx/private/textmeasure.h" - -// ============================================================================ -// wxTextMeasureBase implementation -// ============================================================================ - -wxTextMeasureBase::wxTextMeasureBase(const wxDC *dc, const wxFont *theFont) - : m_dc(dc), - m_win(NULL), - m_font(theFont) -{ - wxASSERT_MSG( dc, wxS("wxTextMeasure needs a valid wxDC") ); - - // By default, use wxDC version, we'll explicitly reset this to false in - // the derived classes if the DC is of native variety. - m_useDCImpl = true; -} - -wxTextMeasureBase::wxTextMeasureBase(const wxWindow *win, const wxFont *theFont) - : m_dc(NULL), - m_win(win), - m_font(theFont) -{ - wxASSERT_MSG( win, wxS("wxTextMeasure needs a valid wxWindow") ); - - // We don't have any wxDC so we can't forward to it. - m_useDCImpl = false; -} - -wxFont wxTextMeasureBase::GetFont() const -{ - return m_font ? *m_font - : m_win ? m_win->GetFont() - : m_dc->GetFont(); -} - -void wxTextMeasureBase::CallGetTextExtent(const wxString& string, - wxCoord *width, - wxCoord *height, - wxCoord *descent, - wxCoord *externalLeading) -{ - if ( m_useDCImpl ) - m_dc->GetTextExtent(string, width, height, descent, externalLeading); - else - DoGetTextExtent(string, width, height, descent, externalLeading); -} - -void wxTextMeasureBase::GetTextExtent(const wxString& string, - wxCoord *width, - wxCoord *height, - wxCoord *descent, - wxCoord *externalLeading) -{ - // To make the code simpler, make sure that the width and height pointers - // are always valid, even if they point to dummy variables. - int unusedWidth, unusedHeight; - if ( !width ) - width = &unusedWidth; - if ( !height ) - height = &unusedHeight; - - // Avoid even setting up the DC for measuring if we don't actually need to - // measure anything. - if ( string.empty() && !descent && !externalLeading ) - { - *width = - *height = 0; - - return; - } - - MeasuringGuard guard(*this); - - CallGetTextExtent(string, width, height, descent, externalLeading); -} - -void wxTextMeasureBase::GetMultiLineTextExtent(const wxString& text, - wxCoord *width, - wxCoord *height, - wxCoord *heightOneLine) -{ - MeasuringGuard guard(*this); - - wxCoord widthTextMax = 0, widthLine, - heightTextTotal = 0, heightLineDefault = 0, heightLine = 0; - - wxString curLine; - for ( wxString::const_iterator pc = text.begin(); ; ++pc ) - { - if ( pc == text.end() || *pc == wxS('\n') ) - { - if ( curLine.empty() ) - { - // we can't use GetTextExtent - it will return 0 for both width - // and height and an empty line should count in height - // calculation - - // assume that this line has the same height as the previous - // one - if ( !heightLineDefault ) - heightLineDefault = heightLine; - - if ( !heightLineDefault ) - { - // but we don't know it yet - choose something reasonable - int dummy; - CallGetTextExtent(wxS("W"), &dummy, &heightLineDefault); - } - - heightTextTotal += heightLineDefault; - } - else - { - CallGetTextExtent(curLine, &widthLine, &heightLine); - if ( widthLine > widthTextMax ) - widthTextMax = widthLine; - heightTextTotal += heightLine; - } - - if ( pc == text.end() ) - { - break; - } - else // '\n' - { - curLine.clear(); - } - } - else - { - curLine += *pc; - } - } - - if ( width ) - *width = widthTextMax; - if ( height ) - *height = heightTextTotal; - if ( heightOneLine ) - *heightOneLine = heightLine; -} - -wxSize wxTextMeasureBase::GetLargestStringExtent(size_t n, - const wxString* strings) -{ - MeasuringGuard guard(*this); - - wxCoord w, h, widthMax = 0, heightMax = 0; - for ( size_t i = 0; i < n; ++i ) - { - CallGetTextExtent(strings[i], &w, &h); - - if ( w > widthMax ) - widthMax = w; - if ( h > heightMax ) - heightMax = h; - } - - return wxSize(widthMax, heightMax); -} - -bool wxTextMeasureBase::GetPartialTextExtents(const wxString& text, - wxArrayInt& widths, - double scaleX) -{ - widths.Empty(); - if ( text.empty() ) - return true; - - MeasuringGuard guard(*this); - - widths.Add(0, text.length()); - - return DoGetPartialTextExtents(text, widths, scaleX); -} - -// ---------------------------------------------------------------------------- -// Generic and inefficient DoGetPartialTextExtents() implementation. -// ---------------------------------------------------------------------------- - -// Each element of the widths array will be the width of the string up to and -// including the corresponding character in text. This is the generic -// implementation, the port-specific classes should do this with native APIs -// if available and if faster. Note: pango_layout_index_to_pos is much slower -// than calling GetTextExtent!! - -#define FWC_SIZE 256 - -class FontWidthCache -{ -public: - FontWidthCache() : m_scaleX(1), m_widths(NULL) { } - ~FontWidthCache() { delete []m_widths; } - - void Reset() - { - if ( !m_widths ) - m_widths = new int[FWC_SIZE]; - - memset(m_widths, 0, sizeof(int)*FWC_SIZE); - } - - wxFont m_font; - double m_scaleX; - int *m_widths; -}; - -static FontWidthCache s_fontWidthCache; - -bool wxTextMeasureBase::DoGetPartialTextExtents(const wxString& text, - wxArrayInt& widths, - double scaleX) -{ - int totalWidth = 0; - - // reset the cache if font or horizontal scale have changed - if ( !s_fontWidthCache.m_widths || - !wxIsSameDouble(s_fontWidthCache.m_scaleX, scaleX) || - (s_fontWidthCache.m_font != *m_font) ) - { - s_fontWidthCache.Reset(); - s_fontWidthCache.m_font = *m_font; - s_fontWidthCache.m_scaleX = scaleX; - } - - // Calculate the position of each character based on the widths of - // the previous characters. This is inexact for not fixed fonts. - int n = 0; - for ( wxString::const_iterator it = text.begin(); - it != text.end(); - ++it ) - { - const wxChar c = *it; - unsigned int c_int = (unsigned int)c; - - int w; - if ((c_int < FWC_SIZE) && (s_fontWidthCache.m_widths[c_int] != 0)) - { - w = s_fontWidthCache.m_widths[c_int]; - } - else - { - DoGetTextExtent(c, &w, NULL); - if (c_int < FWC_SIZE) - s_fontWidthCache.m_widths[c_int] = w; - } - - totalWidth += w; - widths[n++] = totalWidth; - } - - return true; -} - diff --git a/Externals/wxWidgets3/src/common/threadinfo.cpp b/Externals/wxWidgets3/src/common/threadinfo.cpp deleted file mode 100644 index e77682db17..0000000000 --- a/Externals/wxWidgets3/src/common/threadinfo.cpp +++ /dev/null @@ -1,103 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/threadinfo.cpp -// Purpose: declaration of wxThreadSpecificInfo: thread-specific information -// Author: Vaclav Slavik -// Created: 2013-09-14 -// Copyright: (c) 2013 Vaclav Slavik -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if defined(__BORLANDC__) - #pragma hdrstop -#endif - -#include "wx/private/threadinfo.h" - -#if wxUSE_THREADS - -#include "wx/tls.h" -#include "wx/thread.h" -#include "wx/sharedptr.h" -#include "wx/vector.h" - -namespace -{ - -// All thread info objects are stored in a global list so that they are -// freed when global objects are destroyed and no memory leaks are reported. - -// Notice that we must be using accessor functions instead of simple global -// variables here as this code could be executed during global initialization -// time, i.e. before any globals in this module were initialzied. -inline wxCriticalSection& GetAllThreadInfosCS() -{ - static wxCriticalSection s_csAllThreadInfos; - - return s_csAllThreadInfos; -} - -typedef wxVector< wxSharedPtr > wxAllThreadInfos; -inline wxAllThreadInfos& GetAllThreadInfos() -{ - static wxAllThreadInfos s_allThreadInfos; - - return s_allThreadInfos; -} - -// Pointer to the current thread's instance -inline wxTLS_TYPE_REF(wxThreadSpecificInfo*) GetThisThreadInfo() -{ - static wxTLS_TYPE(wxThreadSpecificInfo*) s_thisThreadInfo; - - return s_thisThreadInfo; -} - -#define wxTHIS_THREAD_INFO wxTLS_VALUE(GetThisThreadInfo()) - -} // anonymous namespace - - -wxThreadSpecificInfo& wxThreadSpecificInfo::Get() -{ - if ( !wxTHIS_THREAD_INFO ) - { - wxTHIS_THREAD_INFO = new wxThreadSpecificInfo; - wxCriticalSectionLocker lock(GetAllThreadInfosCS()); - GetAllThreadInfos().push_back( - wxSharedPtr(wxTHIS_THREAD_INFO)); - } - return *wxTHIS_THREAD_INFO; -} - -void wxThreadSpecificInfo::ThreadCleanUp() -{ - if ( !wxTHIS_THREAD_INFO ) - return; // nothing to do, not used by this thread at all - - // find this thread's instance in GetAllThreadInfos() and destroy it - wxCriticalSectionLocker lock(GetAllThreadInfosCS()); - for ( wxAllThreadInfos::iterator i = GetAllThreadInfos().begin(); - i != GetAllThreadInfos().end(); - ++i ) - { - if ( i->get() == wxTHIS_THREAD_INFO ) - { - GetAllThreadInfos().erase(i); - wxTHIS_THREAD_INFO = NULL; - break; - } - } -} - -#else // !wxUSE_THREADS - -wxThreadSpecificInfo& wxThreadSpecificInfo::Get() -{ - static wxThreadSpecificInfo s_instance; - return s_instance; -} - -#endif // wxUSE_THREADS/wxUSE_THREADS diff --git a/Externals/wxWidgets3/src/common/time.cpp b/Externals/wxWidgets3/src/common/time.cpp deleted file mode 100644 index b9ccf39b43..0000000000 --- a/Externals/wxWidgets3/src/common/time.cpp +++ /dev/null @@ -1,347 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/time.cpp -// Purpose: Implementation of time-related functions. -// Author: Vadim Zeitlin -// Created: 2011-11-26 -// Copyright: (c) 2011 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// for compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -// This is a horrible hack which only works because we don't currently include -// from wx/wxprec.h. It is needed because we need timezone-related -// stuff from MinGW time.h, but it is not compiled in strict ANSI mode and it -// is too complicated to be dealt with using wxDECL_FOR_STRICT_MINGW32(). So we -// just include the header after undefining __STRICT_ANSI__ to get all the -// declarations we need -- and then define it back to avoid inconsistencies in -// all our other headers. -// -// Note that the same hack is used for "environ" in utilscmn.cpp, so if the -// code here is modified because this hack becomes unnecessary or a better -// solution is found, the code there should be updated as well. -#ifdef wxNEEDS_STRICT_ANSI_WORKAROUNDS - #undef __STRICT_ANSI__ - #include - #define __STRICT_ANSI__ -#endif - -#include "wx/time.h" - -#ifndef WX_PRECOMP - #ifdef __WINDOWS__ - #include "wx/msw/wrapwin.h" - #endif - #include "wx/intl.h" - #include "wx/log.h" -#endif - -#ifndef WX_GMTOFF_IN_TM - // Define it for some systems which don't (always) use configure but are - // known to have tm_gmtoff field. - #if defined(__DARWIN__) - #define WX_GMTOFF_IN_TM - #endif -#endif - -#include - - -#if !defined(__WXMAC__) - #include // for time_t -#endif - -#if defined(HAVE_GETTIMEOFDAY) - #include - #include -#elif defined(HAVE_FTIME) - #include -#endif - -#if defined(__WINE__) - #include - #include -#endif - -namespace -{ - -const int MILLISECONDS_PER_SECOND = 1000; -const int MICROSECONDS_PER_MILLISECOND = 1000; -const int MICROSECONDS_PER_SECOND = 1000*1000; - -} // anonymous namespace - -// ============================================================================ -// implementation -// ============================================================================ - -#if (!defined(HAVE_LOCALTIME_R) || !defined(HAVE_GMTIME_R)) && wxUSE_THREADS && !defined(__WINDOWS__) -static wxMutex timeLock; -#endif - -#ifndef HAVE_LOCALTIME_R -struct tm *wxLocaltime_r(const time_t* ticks, struct tm* temp) -{ -#if wxUSE_THREADS && !defined(__WINDOWS__) - // No need to waste time with a mutex on windows since it's using - // thread local storage for localtime anyway. - wxMutexLocker locker(timeLock); -#endif - - // Borland CRT crashes when passed 0 ticks for some reason, see SF bug 1704438 -#ifdef __BORLANDC__ - if ( !*ticks ) - return NULL; -#endif - - const tm * const t = localtime(ticks); - if ( !t ) - return NULL; - - memcpy(temp, t, sizeof(struct tm)); - return temp; -} -#endif // !HAVE_LOCALTIME_R - -#ifndef HAVE_GMTIME_R -struct tm *wxGmtime_r(const time_t* ticks, struct tm* temp) -{ -#if wxUSE_THREADS && !defined(__WINDOWS__) - // No need to waste time with a mutex on windows since it's - // using thread local storage for gmtime anyway. - wxMutexLocker locker(timeLock); -#endif - -#ifdef __BORLANDC__ - if ( !*ticks ) - return NULL; -#endif - - const tm * const t = gmtime(ticks); - if ( !t ) - return NULL; - - memcpy(temp, gmtime(ticks), sizeof(struct tm)); - return temp; -} -#endif // !HAVE_GMTIME_R - -// returns the time zone in the C sense, i.e. the difference UTC - local -// (in seconds) -int wxGetTimeZone() -{ -#ifdef WX_GMTOFF_IN_TM - // set to true when the timezone is set - static bool s_timezoneSet = false; - static long gmtoffset = LONG_MAX; // invalid timezone - - // ensure that the timezone variable is set by calling wxLocaltime_r - if ( !s_timezoneSet ) - { - // just call wxLocaltime_r() instead of figuring out whether this - // system supports tzset(), _tzset() or something else - time_t t = time(NULL); - struct tm tm; - - wxLocaltime_r(&t, &tm); - s_timezoneSet = true; - - // note that GMT offset is the opposite of time zone and so to return - // consistent results in both WX_GMTOFF_IN_TM and !WX_GMTOFF_IN_TM - // cases we have to negate it - gmtoffset = -tm.tm_gmtoff; - - // this function is supposed to return the same value whether DST is - // enabled or not, so we need to use an additional offset if DST is on - // as tm_gmtoff already does include it - if ( tm.tm_isdst ) - gmtoffset += 3600; - } - return (int)gmtoffset; -#elif defined(__WINE__) - struct timeb tb; - ftime(&tb); - return tb.timezone*60; -#elif defined(__VISUALC__) - // We must initialize the time zone information before using it (this will - // be done only once internally). - _tzset(); - - // Starting with VC++ 8 timezone variable is deprecated and is not even - // available in some standard library version so use the new function for - // accessing it instead. - #if wxCHECK_VISUALC_VERSION(8) - long t; - _get_timezone(&t); - return t; - #else // VC++ < 8 - return timezone; - #endif -#else // Use some kind of time zone variable. - // In any case we must initialize the time zone before using it. - tzset(); - - #if defined(WX_TIMEZONE) // If WX_TIMEZONE was defined by configure, use it. - return WX_TIMEZONE; - #elif defined(__BORLANDC__) || defined(__MINGW32__) - return _timezone; - #else // unknown platform -- assume it has timezone - return timezone; - #endif // different time zone variables -#endif // different ways to determine time zone -} - -// Get local time as seconds since 00:00:00, Jan 1st 1970 -long wxGetLocalTime() -{ - struct tm tm; - time_t t0, t1; - - // This cannot be made static because mktime can overwrite it. - // - memset(&tm, 0, sizeof(tm)); - tm.tm_year = 70; - tm.tm_mon = 0; - tm.tm_mday = 5; // not Jan 1st 1970 due to mktime 'feature' - tm.tm_hour = 0; - tm.tm_min = 0; - tm.tm_sec = 0; - tm.tm_isdst = -1; // let mktime guess - - // Note that mktime assumes that the struct tm contains local time. - // - t1 = time(&t1); // now - t0 = mktime(&tm); // origin - - // Return the difference in seconds. - // - if (( t0 != (time_t)-1 ) && ( t1 != (time_t)-1 )) - return (long)difftime(t1, t0) + (60 * 60 * 24 * 4); - - wxLogSysError(_("Failed to get the local system time")); - return -1; -} - -// Get UTC time as seconds since 00:00:00, Jan 1st 1970 -long wxGetUTCTime() -{ - return (long)time(NULL); -} - -#if wxUSE_LONGLONG - -wxLongLong wxGetUTCTimeUSec() -{ -#if defined(__WINDOWS__) - FILETIME ft; - ::GetSystemTimeAsFileTime(&ft); - - // FILETIME is in 100ns or 0.1us since 1601-01-01, transform to us since - // 1970-01-01. - wxLongLong t(ft.dwHighDateTime, ft.dwLowDateTime); - t /= 10; - t -= wxLL(11644473600000000); // Unix - Windows epochs difference in us. - return t; -#else // non-MSW - -#ifdef HAVE_GETTIMEOFDAY - timeval tv; - if ( wxGetTimeOfDay(&tv) != -1 ) - { - wxLongLong val(tv.tv_sec); - val *= MICROSECONDS_PER_SECOND; - val += tv.tv_usec; - return val; - } -#endif // HAVE_GETTIMEOFDAY - - // Fall back to lesser precision function. - return wxGetUTCTimeMillis()*MICROSECONDS_PER_MILLISECOND; -#endif // MSW/!MSW -} - -// Get local time as milliseconds since 00:00:00, Jan 1st 1970 -wxLongLong wxGetUTCTimeMillis() -{ - // If possible, use a function which avoids conversions from - // broken-up time structures to milliseconds -#if defined(__WINDOWS__) - FILETIME ft; - ::GetSystemTimeAsFileTime(&ft); - - // FILETIME is expressed in 100ns (or 0.1us) units since 1601-01-01, - // transform them to ms since 1970-01-01. - wxLongLong t(ft.dwHighDateTime, ft.dwLowDateTime); - t /= 10000; - t -= wxLL(11644473600000); // Unix - Windows epochs difference in ms. - return t; -#else // !__WINDOWS__ - wxLongLong val = MILLISECONDS_PER_SECOND; - -#if defined(HAVE_GETTIMEOFDAY) - struct timeval tp; - if ( wxGetTimeOfDay(&tp) != -1 ) - { - val *= tp.tv_sec; - return (val + (tp.tv_usec / MICROSECONDS_PER_MILLISECOND)); - } - else - { - wxLogError(_("wxGetTimeOfDay failed.")); - return 0; - } -#elif defined(HAVE_FTIME) - struct timeb tp; - - // ftime() is void and not int in some mingw32 headers, so don't - // test the return code (well, it shouldn't fail anyhow...) - (void)::ftime(&tp); - val *= tp.time; - return (val + tp.millitm); -#else // no gettimeofday() nor ftime() - // If your platform/compiler does not support ms resolution please - // do NOT just shut off these warnings, drop me a line instead at - // - - #if defined(__VISUALC__) - #pragma message("wxStopWatch will be up to second resolution!") - #elif defined(__BORLANDC__) - #pragma message "wxStopWatch will be up to second resolution!" - #else - #warning "wxStopWatch will be up to second resolution!" - #endif // compiler - - val *= wxGetUTCTime(); - return val; -#endif // time functions - -#endif // __WINDOWS__/!__WINDOWS__ -} - -wxLongLong wxGetLocalTimeMillis() -{ - return wxGetUTCTimeMillis() - wxGetTimeZone()*MILLISECONDS_PER_SECOND; -} - -#else // !wxUSE_LONGLONG - -double wxGetLocalTimeMillis(void) -{ - return (double(clock()) / double(CLOCKS_PER_SEC)) * 1000.0; -} - -#endif // wxUSE_LONGLONG/!wxUSE_LONGLONG diff --git a/Externals/wxWidgets3/src/common/timercmn.cpp b/Externals/wxWidgets3/src/common/timercmn.cpp deleted file mode 100644 index 79104c1acb..0000000000 --- a/Externals/wxWidgets3/src/common/timercmn.cpp +++ /dev/null @@ -1,138 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/timercmn.cpp -// Purpose: wxTimerBase implementation -// Author: Julian Smart, Guillermo Rodriguez, Vadim Zeitlin -// Modified by: VZ: extracted all non-wxTimer stuff in stopwatch.cpp (20.06.03) -// Created: 04/01/98 -// Copyright: (c) Julian Smart -// (c) 1999 Guillermo Rodriguez -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxWin headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_TIMER - -#ifndef WX_PRECOMP - #include "wx/app.h" -#endif - -#include "wx/timer.h" -#include "wx/apptrait.h" -#include "wx/private/timer.h" - -// ---------------------------------------------------------------------------- -// wxWin macros -// ---------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxTimerEvent, wxEvent); - -wxDEFINE_EVENT(wxEVT_TIMER, wxTimerEvent); - -// ============================================================================ -// wxTimerBase implementation -// ============================================================================ - -wxTimer::~wxTimer() -{ - Stop(); - - delete m_impl; -} - -void wxTimer::Init() -{ - wxAppTraits * const traits = wxTheApp ? wxTheApp->GetTraits() : NULL; - m_impl = traits ? traits->CreateTimerImpl(this) : NULL; - if ( !m_impl ) - { - wxFAIL_MSG( wxT("No timer implementation for this platform") ); - - } -} - -// ============================================================================ -// rest of wxTimer implementation forwarded to wxTimerImpl -// ============================================================================ - -void wxTimer::SetOwner(wxEvtHandler *owner, int timerid) -{ - wxCHECK_RET( m_impl, wxT("uninitialized timer") ); - - m_impl->SetOwner(owner, timerid); -} - -wxEvtHandler *wxTimer::GetOwner() const -{ - wxCHECK_MSG( m_impl, NULL, wxT("uninitialized timer") ); - - return m_impl->GetOwner(); -} - -bool wxTimer::Start(int milliseconds, bool oneShot) -{ - wxCHECK_MSG( m_impl, false, wxT("uninitialized timer") ); - - return m_impl->Start(milliseconds, oneShot); -} - -void wxTimer::Stop() -{ - wxCHECK_RET( m_impl, wxT("uninitialized timer") ); - - if ( m_impl->IsRunning() ) - m_impl->Stop(); -} - -void wxTimer::Notify() -{ - // the base class version generates an event if it has owner - which it - // should because otherwise nobody can process timer events - wxCHECK_RET( GetOwner(), wxT("wxTimer::Notify() should be overridden.") ); - - m_impl->SendEvent(); -} - -bool wxTimer::IsRunning() const -{ - wxCHECK_MSG( m_impl, false, wxT("uninitialized timer") ); - - return m_impl->IsRunning(); -} - -int wxTimer::GetId() const -{ - wxCHECK_MSG( m_impl, wxID_ANY, wxT("uninitialized timer") ); - - return m_impl->GetId(); -} - -int wxTimer::GetInterval() const -{ - wxCHECK_MSG( m_impl, -1, wxT("uninitialized timer") ); - - return m_impl->GetInterval(); -} - -bool wxTimer::IsOneShot() const -{ - wxCHECK_MSG( m_impl, false, wxT("uninitialized timer") ); - - return m_impl->IsOneShot(); -} - -#endif // wxUSE_TIMER - diff --git a/Externals/wxWidgets3/src/common/timerimpl.cpp b/Externals/wxWidgets3/src/common/timerimpl.cpp deleted file mode 100644 index d4d800d472..0000000000 --- a/Externals/wxWidgets3/src/common/timerimpl.cpp +++ /dev/null @@ -1,83 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/timerimpl.cpp -// Purpose: wxTimerBase implementation -// Author: Julian Smart, Guillermo Rodriguez, Vadim Zeitlin -// Modified by: VZ: extracted all non-wxTimer stuff in stopwatch.cpp (20.06.03) -// Created: 04/01/98 -// Copyright: (c) Julian Smart -// (c) 1999 Guillermo Rodriguez -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxWin headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_TIMER - -#include "wx/private/timer.h" -#include "wx/utils.h" // for wxNewId() -#include "wx/thread.h" - -wxTimerImpl::wxTimerImpl(wxTimer *timer) -{ - m_timer = timer; - m_owner = NULL; - m_idTimer = wxID_ANY; - m_milli = 0; - m_oneShot = false; -} - -void wxTimerImpl::SetOwner(wxEvtHandler *owner, int timerid) -{ - m_owner = owner; - m_idTimer = timerid == wxID_ANY ? wxNewId() : timerid; -} - -void wxTimerImpl::SendEvent() -{ - wxTimerEvent event(*m_timer); - (void)m_owner->SafelyProcessEvent(event); -} - -bool wxTimerImpl::Start(int milliseconds, bool oneShot) -{ - // under MSW timers only work when they're started from the main thread so - // let the caller know about it -#if wxUSE_THREADS - wxASSERT_MSG( wxThread::IsMain(), - wxT("timer can only be started from the main thread") ); -#endif // wxUSE_THREADS - - if ( IsRunning() ) - { - // not stopping the already running timer might work for some - // platforms (no problems under MSW) but leads to mysterious crashes - // on the others (GTK), so to be on the safe side do it here - Stop(); - } - - if ( milliseconds != -1 ) - { - m_milli = milliseconds; - } - - m_oneShot = oneShot; - - return true; -} - - -#endif // wxUSE_TIMER - diff --git a/Externals/wxWidgets3/src/common/tokenzr.cpp b/Externals/wxWidgets3/src/common/tokenzr.cpp deleted file mode 100644 index d3333994cd..0000000000 --- a/Externals/wxWidgets3/src/common/tokenzr.cpp +++ /dev/null @@ -1,323 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/tokenzr.cpp -// Purpose: String tokenizer -// Author: Guilhem Lavaux -// Modified by: Vadim Zeitlin (almost full rewrite) -// Created: 04/22/98 -// Copyright: (c) Guilhem Lavaux -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include "wx/tokenzr.h" - -#ifndef WX_PRECOMP - #include "wx/arrstr.h" - #include "wx/crt.h" -#endif - -// Required for wxIs... functions -#include - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// helpers -// ---------------------------------------------------------------------------- - -static wxString::const_iterator -find_first_of(const wxChar *delims, size_t len, - const wxString::const_iterator& from, - const wxString::const_iterator& end) -{ - wxASSERT_MSG( from <= end, wxT("invalid index") ); - - for ( wxString::const_iterator i = from; i != end; ++i ) - { - if ( wxTmemchr(delims, *i, len) ) - return i; - } - - return end; -} - -static wxString::const_iterator -find_first_not_of(const wxChar *delims, size_t len, - const wxString::const_iterator& from, - const wxString::const_iterator& end) -{ - wxASSERT_MSG( from <= end, wxT("invalid index") ); - - for ( wxString::const_iterator i = from; i != end; ++i ) - { - if ( !wxTmemchr(delims, *i, len) ) - return i; - } - - return end; -} - -// ---------------------------------------------------------------------------- -// wxStringTokenizer construction -// ---------------------------------------------------------------------------- - -wxStringTokenizer::wxStringTokenizer(const wxString& str, - const wxString& delims, - wxStringTokenizerMode mode) -{ - SetString(str, delims, mode); -} - -wxStringTokenizer::wxStringTokenizer(const wxStringTokenizer& src) - : wxObject() -{ - DoCopyFrom(src); -} - -wxStringTokenizer& wxStringTokenizer::operator=(const wxStringTokenizer& src) -{ - if (this != &src) - { - DoCopyFrom(src); - } - - return *this; -} - -void wxStringTokenizer::SetString(const wxString& str, - const wxString& delims, - wxStringTokenizerMode mode) -{ - if ( mode == wxTOKEN_DEFAULT ) - { - // by default, we behave like strtok() if the delimiters are only - // whitespace characters and as wxTOKEN_RET_EMPTY otherwise (for - // whitespace delimiters, strtok() behaviour is better because we want - // to count consecutive spaces as one delimiter) - wxString::const_iterator p; - for ( p = delims.begin(); p != delims.end(); ++p ) - { - if ( !wxIsspace(*p) ) - break; - } - - if ( p != delims.end() ) - { - // not whitespace char in delims - mode = wxTOKEN_RET_EMPTY; - } - else - { - // only whitespaces - mode = wxTOKEN_STRTOK; - } - } - -#if wxUSE_UNICODE // FIXME-UTF8: only wc_str() - m_delims = delims.wc_str(); -#else - m_delims = delims.mb_str(); -#endif - m_delimsLen = delims.length(); - - m_mode = mode; - - Reinit(str); -} - -void wxStringTokenizer::Reinit(const wxString& str) -{ - wxASSERT_MSG( IsOk(), wxT("you should call SetString() first") ); - - m_string = str; - m_stringEnd = m_string.end(); - m_pos = m_string.begin(); - m_lastDelim = wxT('\0'); - m_hasMoreTokens = MoreTokens_Unknown; -} - -void wxStringTokenizer::DoCopyFrom(const wxStringTokenizer& src) -{ - m_string = src.m_string; - m_stringEnd = m_string.end(); - m_pos = m_string.begin() + (src.m_pos - src.m_string.begin()); - m_delims = src.m_delims; - m_delimsLen = src.m_delimsLen; - m_mode = src.m_mode; - m_lastDelim = src.m_lastDelim; - m_hasMoreTokens = src.m_hasMoreTokens; -} - -// ---------------------------------------------------------------------------- -// access to the tokens -// ---------------------------------------------------------------------------- - -// do we have more of them? -bool wxStringTokenizer::HasMoreTokens() const -{ - // GetNextToken() calls HasMoreTokens() and so HasMoreTokens() is called - // twice in every interation in the following common usage patten: - // while ( HasMoreTokens() ) - // GetNextToken(); - // We optimize this case by caching HasMoreTokens() return value here: - if ( m_hasMoreTokens == MoreTokens_Unknown ) - { - bool r = DoHasMoreTokens(); - wxConstCast(this, wxStringTokenizer)->m_hasMoreTokens = - r ? MoreTokens_Yes : MoreTokens_No; - return r; - } - else - return m_hasMoreTokens == MoreTokens_Yes; -} - -bool wxStringTokenizer::DoHasMoreTokens() const -{ - wxCHECK_MSG( IsOk(), false, wxT("you should call SetString() first") ); - - if ( find_first_not_of(m_delims, m_delimsLen, m_pos, m_stringEnd) - != m_stringEnd ) - { - // there are non delimiter characters left, so we do have more tokens - return true; - } - - switch ( m_mode ) - { - case wxTOKEN_RET_EMPTY: - case wxTOKEN_RET_DELIMS: - // special hack for wxTOKEN_RET_EMPTY: we should return the initial - // empty token even if there are only delimiters after it - return !m_string.empty() && m_pos == m_string.begin(); - - case wxTOKEN_RET_EMPTY_ALL: - // special hack for wxTOKEN_RET_EMPTY_ALL: we can know if we had - // already returned the trailing empty token after the last - // delimiter by examining m_lastDelim: it is set to NUL if we run - // up to the end of the string in GetNextToken(), but if it is not - // NUL yet we still have this last token to return even if m_pos is - // already at m_string.length() - return m_pos < m_stringEnd || m_lastDelim != wxT('\0'); - - case wxTOKEN_INVALID: - case wxTOKEN_DEFAULT: - wxFAIL_MSG( wxT("unexpected tokenizer mode") ); - wxFALLTHROUGH; - - case wxTOKEN_STRTOK: - // never return empty delimiters - break; - } - - return false; -} - -// count the number of (remaining) tokens in the string -size_t wxStringTokenizer::CountTokens() const -{ - wxCHECK_MSG( IsOk(), 0, wxT("you should call SetString() first") ); - - // VZ: this function is IMHO not very useful, so it's probably not very - // important if its implementation here is not as efficient as it - // could be -- but OTOH like this we're sure to get the correct answer - // in all modes - wxStringTokenizer tkz(wxString(m_pos, m_stringEnd), m_delims, m_mode); - - size_t count = 0; - while ( tkz.HasMoreTokens() ) - { - count++; - - (void)tkz.GetNextToken(); - } - - return count; -} - -// ---------------------------------------------------------------------------- -// token extraction -// ---------------------------------------------------------------------------- - -wxString wxStringTokenizer::GetNextToken() -{ - wxString token; - do - { - if ( !HasMoreTokens() ) - { - break; - } - - m_hasMoreTokens = MoreTokens_Unknown; - - // find the end of this token - wxString::const_iterator pos = - find_first_of(m_delims, m_delimsLen, m_pos, m_stringEnd); - - // and the start of the next one - if ( pos == m_stringEnd ) - { - // no more delimiters, the token is everything till the end of - // string - token.assign(m_pos, m_stringEnd); - - // skip the token - m_pos = m_stringEnd; - - // it wasn't terminated - m_lastDelim = wxT('\0'); - } - else // we found a delimiter at pos - { - // in wxTOKEN_RET_DELIMS mode we return the delimiter character - // with token, otherwise leave it out - wxString::const_iterator tokenEnd(pos); - if ( m_mode == wxTOKEN_RET_DELIMS ) - ++tokenEnd; - - token.assign(m_pos, tokenEnd); - - // skip the token and the trailing delimiter - m_pos = pos + 1; - - m_lastDelim = (pos == m_stringEnd) ? wxT('\0') : (wxChar)*pos; - } - } - while ( !AllowEmpty() && token.empty() ); - - return token; -} - -// ---------------------------------------------------------------------------- -// public functions -// ---------------------------------------------------------------------------- - -wxArrayString wxStringTokenize(const wxString& str, - const wxString& delims, - wxStringTokenizerMode mode) -{ - wxArrayString tokens; - wxStringTokenizer tk(str, delims, mode); - while ( tk.HasMoreTokens() ) - { - tokens.Add(tk.GetNextToken()); - } - - return tokens; -} diff --git a/Externals/wxWidgets3/src/common/toplvcmn.cpp b/Externals/wxWidgets3/src/common/toplvcmn.cpp deleted file mode 100644 index 58581f6d8a..0000000000 --- a/Externals/wxWidgets3/src/common/toplvcmn.cpp +++ /dev/null @@ -1,476 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/toplvcmn.cpp -// Purpose: common (for all platforms) wxTopLevelWindow functions -// Author: Julian Smart, Vadim Zeitlin -// Created: 01/02/97 -// Copyright: (c) 1998 Robert Roebling and Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include "wx/toplevel.h" - -#ifndef WX_PRECOMP - #include "wx/dcclient.h" - #include "wx/app.h" -#endif // WX_PRECOMP - -#include "wx/display.h" - -// ---------------------------------------------------------------------------- -// event table -// ---------------------------------------------------------------------------- - -wxBEGIN_EVENT_TABLE(wxTopLevelWindowBase, wxWindow) - EVT_CLOSE(wxTopLevelWindowBase::OnCloseWindow) - EVT_SIZE(wxTopLevelWindowBase::OnSize) -wxEND_EVENT_TABLE() - -// ============================================================================ -// implementation -// ============================================================================ - -wxIMPLEMENT_ABSTRACT_CLASS(wxTopLevelWindow, wxWindow); - -// ---------------------------------------------------------------------------- -// construction/destruction -// ---------------------------------------------------------------------------- - -wxTopLevelWindowBase::wxTopLevelWindowBase() -{ - // Unlike windows, top level windows are created hidden by default. - m_isShown = false; -} - -wxTopLevelWindowBase::~wxTopLevelWindowBase() -{ - // don't let wxTheApp keep any stale pointers to us - if ( wxTheApp && wxTheApp->GetTopWindow() == this ) - wxTheApp->SetTopWindow(NULL); - - wxTopLevelWindows.DeleteObject(this); - - // delete any our top level children which are still pending for deletion - // immediately: this could happen if a child (e.g. a temporary dialog - // created with this window as parent) was Destroy()'d) while this window - // was deleted directly (with delete, or maybe just because it was created - // on the stack) immediately afterwards and before the child TLW was really - // destroyed -- not destroying it now would leave it alive with a dangling - // parent pointer and result in a crash later - for ( wxObjectList::iterator i = wxPendingDelete.begin(); - i != wxPendingDelete.end(); - ) - { - wxWindow * const win = wxDynamicCast(*i, wxWindow); - if ( win && wxGetTopLevelParent(win->GetParent()) == this ) - { - wxPendingDelete.erase(i); - - delete win; - - // deleting it invalidated the list (and not only one node because - // it could have resulted in deletion of other objects to) - i = wxPendingDelete.begin(); - } - else - { - ++i; - } - } - - if ( IsLastBeforeExit() ) - { - // no other (important) windows left, quit the app - wxTheApp->ExitMainLoop(); - } -} - -bool wxTopLevelWindowBase::Destroy() -{ - // We can't delay the destruction if our parent is being already destroyed - // as we will be deleted anyhow during its destruction and the pointer - // stored in wxPendingDelete would become invalid, so just delete ourselves - // immediately in this case. - if ( wxWindow* parent = GetParent() ) - { - if ( parent->IsBeingDeleted() ) - return wxNonOwnedWindow::Destroy(); - } - - // delayed destruction: the frame will be deleted during the next idle - // loop iteration - if ( !wxPendingDelete.Member(this) ) - wxPendingDelete.Append(this); - - // normally we want to hide the window immediately so that it doesn't get - // stuck on the screen while it's being destroyed, however we shouldn't - // hide the last visible window as then we might not get any idle events - // any more as no events will be sent to the hidden window and without idle - // events we won't prune wxPendingDelete list and the application won't - // terminate - for ( wxWindowList::const_iterator i = wxTopLevelWindows.begin(), - end = wxTopLevelWindows.end(); - i != end; - ++i ) - { - wxTopLevelWindow * const win = static_cast(*i); - if ( win != this && win->IsShown() ) - { - // there remains at least one other visible TLW, we can hide this - // one - Hide(); - - break; - } - } - - return true; -} - -bool wxTopLevelWindowBase::IsLastBeforeExit() const -{ - // first of all, automatically exiting the app on last window close can be - // completely disabled at wxTheApp level - if ( !wxTheApp || !wxTheApp->GetExitOnFrameDelete() ) - return false; - - // second, never terminate the application after closing a child TLW - // because this would close its parent unexpectedly -- notice that this - // check is not redundant with the loop below, as the parent might return - // false from its ShouldPreventAppExit() -- except if the child is being - // deleted as part of the parent destruction - if ( GetParent() && !GetParent()->IsBeingDeleted() ) - return false; - - wxWindowList::const_iterator i; - const wxWindowList::const_iterator end = wxTopLevelWindows.end(); - - // then decide whether we should exit at all - for ( i = wxTopLevelWindows.begin(); i != end; ++i ) - { - wxTopLevelWindow * const win = static_cast(*i); - if ( win->ShouldPreventAppExit() ) - { - // there remains at least one important TLW, don't exit - return false; - } - } - - // if yes, close all the other windows: this could still fail - for ( i = wxTopLevelWindows.begin(); i != end; ++i ) - { - // don't close twice the windows which are already marked for deletion - wxTopLevelWindow * const win = static_cast(*i); - if ( !wxPendingDelete.Member(win) && !win->Close() ) - { - // one of the windows refused to close, don't exit - // - // NB: of course, by now some other windows could have been already - // closed but there is really nothing we can do about it as we - // have no way just to ask the window if it can close without - // forcing it to do it - return false; - } - } - - return true; -} - -// ---------------------------------------------------------------------------- -// wxTopLevelWindow geometry -// ---------------------------------------------------------------------------- - -void wxTopLevelWindowBase::SetMinSize(const wxSize& minSize) -{ - SetSizeHints(minSize, GetMaxSize()); -} - -void wxTopLevelWindowBase::SetMaxSize(const wxSize& maxSize) -{ - SetSizeHints(GetMinSize(), maxSize); -} - -void wxTopLevelWindowBase::GetRectForTopLevelChildren(int *x, int *y, int *w, int *h) -{ - GetPosition(x,y); - GetSize(w,h); -} - -/* static */ -wxSize wxTopLevelWindowBase::GetDefaultSize() -{ - wxSize size = wxGetClientDisplayRect().GetSize(); -#ifndef __WXOSX_IPHONE__ - // create proportionally bigger windows on small screens - if ( size.x >= 1024 ) - size.x = 400; - else if ( size.x >= 800 ) - size.x = 300; - else if ( size.x >= 320 ) - size.x = 240; - - if ( size.y >= 768 ) - size.y = 250; - else if ( size.y > 200 ) - { - size.y *= 2; - size.y /= 3; - } -#endif - return size; -} - -void wxTopLevelWindowBase::DoCentre(int dir) -{ - // on some platforms centering top level windows is impossible - // because they are always maximized by guidelines or limitations - // - // and centering a maximized window doesn't make sense as its position - // can't change - if ( IsAlwaysMaximized() || IsMaximized() ) - return; - - // we need the display rect anyhow so store it first: notice that we should - // be centered on the same display as our parent window, the display of - // this window itself is not really defined yet - int nDisplay = wxDisplay::GetFromWindow(GetParent() ? GetParent() : this); - wxDisplay dpy(nDisplay == wxNOT_FOUND ? 0 : nDisplay); - const wxRect rectDisplay(dpy.GetClientArea()); - - // what should we centre this window on? - wxRect rectParent; - if ( !(dir & wxCENTRE_ON_SCREEN) && GetParent() ) - { - // centre on parent window: notice that we need screen coordinates for - // positioning this TLW - rectParent = GetParent()->GetScreenRect(); - - // if the parent is entirely off screen (happens at least with MDI - // parent frame under Mac but could happen elsewhere too if the frame - // was hidden/moved away for some reason), don't use it as otherwise - // this window wouldn't be visible at all - if ( !rectParent.Intersects(rectDisplay) ) - { - // just centre on screen then - rectParent = rectDisplay; - } - } - else - { - // we were explicitly asked to centre this window on the entire screen - // or if we have no parent anyhow and so can't centre on it - rectParent = rectDisplay; - } - - if ( !(dir & wxBOTH) ) - dir |= wxBOTH; // if neither is specified, center in both directions - - // the new window rect candidate - wxRect rect = GetRect().CentreIn(rectParent, dir & ~wxCENTRE_ON_SCREEN); - - // we don't want to place the window off screen if Centre() is called as - // this is (almost?) never wanted and it would be very difficult to prevent - // it from happening from the user code if we didn't check for it here - if ( !rectDisplay.Contains(rect.GetTopLeft()) ) - { - // move the window just enough to make the corner visible - int dx = rectDisplay.GetLeft() - rect.GetLeft(); - int dy = rectDisplay.GetTop() - rect.GetTop(); - rect.Offset(dx > 0 ? dx : 0, dy > 0 ? dy : 0); - } - - if ( !rectDisplay.Contains(rect.GetBottomRight()) ) - { - // do the same for this corner too - int dx = rectDisplay.GetRight() - rect.GetRight(); - int dy = rectDisplay.GetBottom() - rect.GetBottom(); - rect.Offset(dx < 0 ? dx : 0, dy < 0 ? dy : 0); - } - - // the window top left and bottom right corner are both visible now and - // although the window might still be not entirely on screen (with 2 - // staggered displays for example) we wouldn't be able to improve the - // layout much in such case, so we stop here - - // -1 could be valid coordinate here if there are several displays - SetSize(rect, wxSIZE_ALLOW_MINUS_ONE); -} - -// ---------------------------------------------------------------------------- -// wxTopLevelWindow size management: we exclude the areas taken by -// menu/status/toolbars from the client area, so the client area is what's -// really available for the frame contents -// ---------------------------------------------------------------------------- - -void wxTopLevelWindowBase::DoScreenToClient(int *x, int *y) const -{ - wxWindow::DoScreenToClient(x, y); - - // translate the wxWindow client coords to our client coords - wxPoint pt(GetClientAreaOrigin()); - if ( x ) - *x -= pt.x; - if ( y ) - *y -= pt.y; -} - -void wxTopLevelWindowBase::DoClientToScreen(int *x, int *y) const -{ - // our client area origin (0, 0) may be really something like (0, 30) for - // wxWindow if we have a toolbar, account for it before translating - wxPoint pt(GetClientAreaOrigin()); - if ( x ) - *x += pt.x; - if ( y ) - *y += pt.y; - - wxWindow::DoClientToScreen(x, y); -} - -bool wxTopLevelWindowBase::IsAlwaysMaximized() const -{ - return false; -} - -// ---------------------------------------------------------------------------- -// icons -// ---------------------------------------------------------------------------- - -wxIcon wxTopLevelWindowBase::GetIcon() const -{ - return m_icons.IsEmpty() ? wxIcon() : m_icons.GetIcon( -1 ); -} - -void wxTopLevelWindowBase::SetIcon(const wxIcon& icon) -{ - // passing wxNullIcon to SetIcon() is possible (it means that we shouldn't - // have any icon), but adding an invalid icon to wxIconBundle is not - wxIconBundle icons; - if ( icon.IsOk() ) - icons.AddIcon(icon); - - SetIcons(icons); -} - -// ---------------------------------------------------------------------------- -// event handlers -// ---------------------------------------------------------------------------- - -bool wxTopLevelWindowBase::IsTopNavigationDomain(NavigationKind kind) const -{ - // This switch only exists to generate a compiler warning and force us to - // revisit this code if any new kinds of navigation are added in the - // future, but for now we block of them by default (some derived classes - // relax this however). - switch ( kind ) - { - case Navigation_Tab: - case Navigation_Accel: - break; - } - - return true; -} - -// default resizing behaviour - if only ONE subwindow, resize to fill the -// whole client area -void wxTopLevelWindowBase::DoLayout() -{ - // We are called during the window destruction several times, e.g. as - // wxFrame tries to adjust to its tool/status bars disappearing. But - // actually doing the layout is pretty useless in this case as the window - // will disappear anyhow -- so just don't bother. - if ( IsBeingDeleted() ) - return; - - - // if we're using constraints or sizers - do use them - if ( GetAutoLayout() ) - { - Layout(); - } - else - { - // do we have _exactly_ one child? - wxWindow *child = NULL; - for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); - node; - node = node->GetNext() ) - { - wxWindow *win = node->GetData(); - - // exclude top level and managed windows (status bar isn't - // currently in the children list except under wxMac anyhow, but - // it makes no harm to test for it) - if ( !win->IsTopLevel() && !IsOneOfBars(win) ) - { - if ( child ) - { - return; // it's our second subwindow - nothing to do - } - - child = win; - } - } - - // do we have any children at all? - if ( child && child->IsShown() ) - { - // exactly one child - set it's size to fill the whole frame - int clientW, clientH; - DoGetClientSize(&clientW, &clientH); - - child->SetSize(0, 0, clientW, clientH); - } - } -} - -// The default implementation for the close window event. -void wxTopLevelWindowBase::OnCloseWindow(wxCloseEvent& WXUNUSED(event)) -{ - Destroy(); -} - -bool wxTopLevelWindowBase::SendIconizeEvent(bool iconized) -{ - wxIconizeEvent event(GetId(), iconized); - event.SetEventObject(this); - - return GetEventHandler()->ProcessEvent(event); -} - -// do the window-specific processing after processing the update event -void wxTopLevelWindowBase::DoUpdateWindowUI(wxUpdateUIEvent& event) -{ - // call inherited, but skip the wxControl's version, and call directly the - // wxWindow's one instead, because the only reason why we are overriding this - // function is that we want to use SetTitle() instead of wxControl::SetLabel() - wxWindowBase::DoUpdateWindowUI(event); - - // update title - if ( event.GetSetText() ) - { - if ( event.GetText() != GetTitle() ) - SetTitle(event.GetText()); - } -} - -void wxTopLevelWindowBase::RequestUserAttention(int WXUNUSED(flags)) -{ - // it's probably better than do nothing, isn't it? - Raise(); -} diff --git a/Externals/wxWidgets3/src/common/translation.cpp b/Externals/wxWidgets3/src/common/translation.cpp deleted file mode 100644 index bc0717fa73..0000000000 --- a/Externals/wxWidgets3/src/common/translation.cpp +++ /dev/null @@ -1,2060 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/translation.cpp -// Purpose: Internationalization and localisation for wxWidgets -// Author: Vadim Zeitlin, Vaclav Slavik, -// Michael N. Filippov -// (2003/09/30 - PluralForms support) -// Created: 2010-04-23 -// Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declaration -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_INTL - -#ifndef WX_PRECOMP - #include "wx/dynarray.h" - #include "wx/string.h" - #include "wx/intl.h" - #include "wx/log.h" - #include "wx/utils.h" - #include "wx/hashmap.h" - #include "wx/module.h" -#endif // WX_PRECOMP - -// standard headers -#include -#include - -#include "wx/arrstr.h" -#include "wx/dir.h" -#include "wx/file.h" -#include "wx/filename.h" -#include "wx/tokenzr.h" -#include "wx/fontmap.h" -#include "wx/scopedptr.h" -#include "wx/stdpaths.h" -#include "wx/private/threadinfo.h" - -#ifdef __WINDOWS__ - #include "wx/dynlib.h" - #include "wx/scopedarray.h" - #include "wx/msw/wrapwin.h" - #include "wx/msw/missing.h" -#endif -#ifdef __WXOSX__ - #include "wx/osx/core/cfstring.h" - #include - #include -#endif - -// ---------------------------------------------------------------------------- -// simple types -// ---------------------------------------------------------------------------- - -typedef wxUint32 size_t32; - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -// magic number identifying the .mo format file -const size_t32 MSGCATALOG_MAGIC = 0x950412de; -const size_t32 MSGCATALOG_MAGIC_SW = 0xde120495; - -#define TRACE_I18N wxS("i18n") - -// ============================================================================ -// implementation -// ============================================================================ - -namespace -{ - -#if !wxUSE_UNICODE -// We need to keep track of (char*) msgids in non-Unicode legacy builds. Instead -// of making the public wxMsgCatalog and wxTranslationsLoader APIs ugly, we -// store them in this global map. -wxStringToStringHashMap gs_msgIdCharset; -#endif - -// ---------------------------------------------------------------------------- -// Platform specific helpers -// ---------------------------------------------------------------------------- - -#if wxUSE_LOG_TRACE - -void LogTraceArray(const char *prefix, const wxArrayString& arr) -{ - wxLogTrace(TRACE_I18N, "%s: [%s]", prefix, wxJoin(arr, ',')); -} - -void LogTraceLargeArray(const wxString& prefix, const wxArrayString& arr) -{ - wxLogTrace(TRACE_I18N, "%s:", prefix); - for ( wxArrayString::const_iterator i = arr.begin(); i != arr.end(); ++i ) - wxLogTrace(TRACE_I18N, " %s", *i); -} - -#else // !wxUSE_LOG_TRACE - -#define LogTraceArray(prefix, arr) -#define LogTraceLargeArray(prefix, arr) - -#endif // wxUSE_LOG_TRACE/!wxUSE_LOG_TRACE - -// Use locale-based detection as a fallback -wxString GetPreferredUILanguageFallback(const wxArrayString& WXUNUSED(available)) -{ - const wxString lang = wxLocale::GetLanguageCanonicalName(wxLocale::GetSystemLanguage()); - wxLogTrace(TRACE_I18N, " - obtained best language from locale: %s", lang); - return lang; -} - -#ifdef __WINDOWS__ - -wxString GetPreferredUILanguage(const wxArrayString& available) -{ - typedef BOOL (WINAPI *GetUserPreferredUILanguages_t)(DWORD, PULONG, PWSTR, PULONG); - static GetUserPreferredUILanguages_t s_pfnGetUserPreferredUILanguages = NULL; - static bool s_initDone = false; - if ( !s_initDone ) - { - wxLoadedDLL dllKernel32("kernel32.dll"); - wxDL_INIT_FUNC(s_pfn, GetUserPreferredUILanguages, dllKernel32); - s_initDone = true; - } - - if ( s_pfnGetUserPreferredUILanguages ) - { - ULONG numLangs; - ULONG bufferSize = 0; - if ( (*s_pfnGetUserPreferredUILanguages)(MUI_LANGUAGE_NAME, - &numLangs, - NULL, - &bufferSize) ) - { - wxScopedArray langs(bufferSize); - if ( (*s_pfnGetUserPreferredUILanguages)(MUI_LANGUAGE_NAME, - &numLangs, - langs.get(), - &bufferSize) ) - { - wxArrayString preferred; - - WCHAR *buf = langs.get(); - for ( unsigned i = 0; i < numLangs; i++ ) - { - const wxString lang(buf); - preferred.push_back(lang); - buf += lang.length() + 1; - } - LogTraceArray(" - system preferred languages", preferred); - - for ( wxArrayString::const_iterator j = preferred.begin(); - j != preferred.end(); - ++j ) - { - wxString lang(*j); - lang.Replace("-", "_"); - if ( available.Index(lang, /*bCase=*/false) != wxNOT_FOUND ) - return lang; - size_t pos = lang.find('_'); - if ( pos != wxString::npos ) - { - lang = lang.substr(0, pos); - if ( available.Index(lang, /*bCase=*/false) != wxNOT_FOUND ) - return lang; - } - } - } - } - } - - return GetPreferredUILanguageFallback(available); -} - -#elif defined(__WXOSX__) - -#if wxUSE_LOG_TRACE - -void LogTraceArray(const char *prefix, CFArrayRef arr) -{ - wxString s; - const unsigned count = CFArrayGetCount(arr); - if ( count ) - { - s += wxCFStringRef::AsString((CFStringRef)CFArrayGetValueAtIndex(arr, 0)); - for ( unsigned i = 1 ; i < count; i++ ) - s += "," + wxCFStringRef::AsString((CFStringRef)CFArrayGetValueAtIndex(arr, i)); - } - wxLogTrace(TRACE_I18N, "%s: [%s]", prefix, s); -} - -#endif // wxUSE_LOG_TRACE - -wxString GetPreferredUILanguage(const wxArrayString& available) -{ - wxStringToStringHashMap availableNormalized; - wxCFRef availableArr( - CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks)); - - for ( wxArrayString::const_iterator i = available.begin(); - i != available.end(); - ++i ) - { - wxString lang(*i); - wxCFStringRef code_wx(*i); - wxCFStringRef code_norm( - CFLocaleCreateCanonicalLanguageIdentifierFromString(kCFAllocatorDefault, code_wx)); - CFArrayAppendValue(availableArr, code_norm); - availableNormalized[code_norm.AsString()] = *i; - } - LogTraceArray(" - normalized available list", availableArr); - - wxCFRef prefArr( - CFBundleCopyLocalizationsForPreferences(availableArr, NULL)); - LogTraceArray(" - system preferred languages", prefArr); - - unsigned prefArrLength = CFArrayGetCount(prefArr); - if ( prefArrLength > 0 ) - { - // Lookup the name in 'available' by index -- we need to get the - // original value corresponding to the normalized one chosen. - wxString lang(wxCFStringRef::AsString((CFStringRef)CFArrayGetValueAtIndex(prefArr, 0))); - wxStringToStringHashMap::const_iterator i = availableNormalized.find(lang); - if ( i == availableNormalized.end() ) - return lang; - else - return i->second; - } - - return GetPreferredUILanguageFallback(available); -} - -#else - -// On Unix, there's just one language=locale setting, so we should always -// use that. -#define GetPreferredUILanguage GetPreferredUILanguageFallback - -#endif - -} // anonymous namespace - -// ---------------------------------------------------------------------------- -// Plural forms parser -// ---------------------------------------------------------------------------- - -/* - Simplified Grammar - -Expression: - LogicalOrExpression '?' Expression ':' Expression - LogicalOrExpression - -LogicalOrExpression: - LogicalAndExpression "||" LogicalOrExpression // to (a || b) || c - LogicalAndExpression - -LogicalAndExpression: - EqualityExpression "&&" LogicalAndExpression // to (a && b) && c - EqualityExpression - -EqualityExpression: - RelationalExpression "==" RelationalExperession - RelationalExpression "!=" RelationalExperession - RelationalExpression - -RelationalExpression: - MultiplicativeExpression '>' MultiplicativeExpression - MultiplicativeExpression '<' MultiplicativeExpression - MultiplicativeExpression ">=" MultiplicativeExpression - MultiplicativeExpression "<=" MultiplicativeExpression - MultiplicativeExpression - -MultiplicativeExpression: - PmExpression '%' PmExpression - PmExpression - -PmExpression: - N - Number - '(' Expression ')' -*/ - -class wxPluralFormsToken -{ -public: - enum Type - { - T_ERROR, T_EOF, T_NUMBER, T_N, T_PLURAL, T_NPLURALS, T_EQUAL, T_ASSIGN, - T_GREATER, T_GREATER_OR_EQUAL, T_LESS, T_LESS_OR_EQUAL, - T_REMINDER, T_NOT_EQUAL, - T_LOGICAL_AND, T_LOGICAL_OR, T_QUESTION, T_COLON, T_SEMICOLON, - T_LEFT_BRACKET, T_RIGHT_BRACKET - }; - Type type() const { return m_type; } - void setType(Type t) { m_type = t; } - // for T_NUMBER only - typedef int Number; - Number number() const { return m_number; } - void setNumber(Number num) { m_number = num; } -private: - Type m_type; - Number m_number; -}; - - -class wxPluralFormsScanner -{ -public: - wxPluralFormsScanner(const char* s); - const wxPluralFormsToken& token() const { return m_token; } - bool nextToken(); // returns false if error -private: - const char* m_s; - wxPluralFormsToken m_token; -}; - -wxPluralFormsScanner::wxPluralFormsScanner(const char* s) : m_s(s) -{ - nextToken(); -} - -bool wxPluralFormsScanner::nextToken() -{ - wxPluralFormsToken::Type type = wxPluralFormsToken::T_ERROR; - while (isspace((unsigned char) *m_s)) - { - ++m_s; - } - if (*m_s == 0) - { - type = wxPluralFormsToken::T_EOF; - } - else if (isdigit((unsigned char) *m_s)) - { - wxPluralFormsToken::Number number = *m_s++ - '0'; - while (isdigit((unsigned char) *m_s)) - { - number = number * 10 + (*m_s++ - '0'); - } - m_token.setNumber(number); - type = wxPluralFormsToken::T_NUMBER; - } - else if (isalpha((unsigned char) *m_s)) - { - const char* begin = m_s++; - while (isalnum((unsigned char) *m_s)) - { - ++m_s; - } - size_t size = m_s - begin; - if (size == 1 && memcmp(begin, "n", size) == 0) - { - type = wxPluralFormsToken::T_N; - } - else if (size == 6 && memcmp(begin, "plural", size) == 0) - { - type = wxPluralFormsToken::T_PLURAL; - } - else if (size == 8 && memcmp(begin, "nplurals", size) == 0) - { - type = wxPluralFormsToken::T_NPLURALS; - } - } - else if (*m_s == '=') - { - ++m_s; - if (*m_s == '=') - { - ++m_s; - type = wxPluralFormsToken::T_EQUAL; - } - else - { - type = wxPluralFormsToken::T_ASSIGN; - } - } - else if (*m_s == '>') - { - ++m_s; - if (*m_s == '=') - { - ++m_s; - type = wxPluralFormsToken::T_GREATER_OR_EQUAL; - } - else - { - type = wxPluralFormsToken::T_GREATER; - } - } - else if (*m_s == '<') - { - ++m_s; - if (*m_s == '=') - { - ++m_s; - type = wxPluralFormsToken::T_LESS_OR_EQUAL; - } - else - { - type = wxPluralFormsToken::T_LESS; - } - } - else if (*m_s == '%') - { - ++m_s; - type = wxPluralFormsToken::T_REMINDER; - } - else if (*m_s == '!' && m_s[1] == '=') - { - m_s += 2; - type = wxPluralFormsToken::T_NOT_EQUAL; - } - else if (*m_s == '&' && m_s[1] == '&') - { - m_s += 2; - type = wxPluralFormsToken::T_LOGICAL_AND; - } - else if (*m_s == '|' && m_s[1] == '|') - { - m_s += 2; - type = wxPluralFormsToken::T_LOGICAL_OR; - } - else if (*m_s == '?') - { - ++m_s; - type = wxPluralFormsToken::T_QUESTION; - } - else if (*m_s == ':') - { - ++m_s; - type = wxPluralFormsToken::T_COLON; - } else if (*m_s == ';') { - ++m_s; - type = wxPluralFormsToken::T_SEMICOLON; - } - else if (*m_s == '(') - { - ++m_s; - type = wxPluralFormsToken::T_LEFT_BRACKET; - } - else if (*m_s == ')') - { - ++m_s; - type = wxPluralFormsToken::T_RIGHT_BRACKET; - } - m_token.setType(type); - return type != wxPluralFormsToken::T_ERROR; -} - -class wxPluralFormsNode; - -// NB: Can't use wxDEFINE_SCOPED_PTR_TYPE because wxPluralFormsNode is not -// fully defined yet: -class wxPluralFormsNodePtr -{ -public: - wxPluralFormsNodePtr(wxPluralFormsNode *p = NULL) : m_p(p) {} - ~wxPluralFormsNodePtr(); - wxPluralFormsNode& operator*() const { return *m_p; } - wxPluralFormsNode* operator->() const { return m_p; } - wxPluralFormsNode* get() const { return m_p; } - wxPluralFormsNode* release(); - void reset(wxPluralFormsNode *p); - -private: - wxPluralFormsNode *m_p; -}; - -class wxPluralFormsNode -{ -public: - wxPluralFormsNode(const wxPluralFormsToken& t) : m_token(t) {} - const wxPluralFormsToken& token() const { return m_token; } - const wxPluralFormsNode* node(unsigned i) const - { return m_nodes[i].get(); } - void setNode(unsigned i, wxPluralFormsNode* n); - wxPluralFormsNode* releaseNode(unsigned i); - wxPluralFormsToken::Number evaluate(wxPluralFormsToken::Number n) const; - -private: - wxPluralFormsToken m_token; - wxPluralFormsNodePtr m_nodes[3]; -}; - -wxPluralFormsNodePtr::~wxPluralFormsNodePtr() -{ - delete m_p; -} -wxPluralFormsNode* wxPluralFormsNodePtr::release() -{ - wxPluralFormsNode *p = m_p; - m_p = NULL; - return p; -} -void wxPluralFormsNodePtr::reset(wxPluralFormsNode *p) -{ - if (p != m_p) - { - delete m_p; - m_p = p; - } -} - - -void wxPluralFormsNode::setNode(unsigned i, wxPluralFormsNode* n) -{ - m_nodes[i].reset(n); -} - -wxPluralFormsNode* wxPluralFormsNode::releaseNode(unsigned i) -{ - return m_nodes[i].release(); -} - -wxPluralFormsToken::Number -wxPluralFormsNode::evaluate(wxPluralFormsToken::Number n) const -{ - switch (token().type()) - { - // leaf - case wxPluralFormsToken::T_NUMBER: - return token().number(); - case wxPluralFormsToken::T_N: - return n; - // 2 args - case wxPluralFormsToken::T_EQUAL: - return node(0)->evaluate(n) == node(1)->evaluate(n); - case wxPluralFormsToken::T_NOT_EQUAL: - return node(0)->evaluate(n) != node(1)->evaluate(n); - case wxPluralFormsToken::T_GREATER: - return node(0)->evaluate(n) > node(1)->evaluate(n); - case wxPluralFormsToken::T_GREATER_OR_EQUAL: - return node(0)->evaluate(n) >= node(1)->evaluate(n); - case wxPluralFormsToken::T_LESS: - return node(0)->evaluate(n) < node(1)->evaluate(n); - case wxPluralFormsToken::T_LESS_OR_EQUAL: - return node(0)->evaluate(n) <= node(1)->evaluate(n); - case wxPluralFormsToken::T_REMINDER: - { - wxPluralFormsToken::Number number = node(1)->evaluate(n); - if (number != 0) - { - return node(0)->evaluate(n) % number; - } - else - { - return 0; - } - } - case wxPluralFormsToken::T_LOGICAL_AND: - return node(0)->evaluate(n) && node(1)->evaluate(n); - case wxPluralFormsToken::T_LOGICAL_OR: - return node(0)->evaluate(n) || node(1)->evaluate(n); - // 3 args - case wxPluralFormsToken::T_QUESTION: - return node(0)->evaluate(n) - ? node(1)->evaluate(n) - : node(2)->evaluate(n); - default: - return 0; - } -} - - -class wxPluralFormsCalculator -{ -public: - wxPluralFormsCalculator() : m_nplurals(0), m_plural(0) {} - - // input: number, returns msgstr index - int evaluate(int n) const; - - // input: text after "Plural-Forms:" (e.g. "nplurals=2; plural=(n != 1);"), - // if s == 0, creates default handler - // returns 0 if error - static wxPluralFormsCalculator* make(const char* s = 0); - - ~wxPluralFormsCalculator() {} - - void init(wxPluralFormsToken::Number nplurals, wxPluralFormsNode* plural); - -private: - wxPluralFormsToken::Number m_nplurals; - wxPluralFormsNodePtr m_plural; -}; - -wxDEFINE_SCOPED_PTR(wxPluralFormsCalculator, wxPluralFormsCalculatorPtr) - -void wxPluralFormsCalculator::init(wxPluralFormsToken::Number nplurals, - wxPluralFormsNode* plural) -{ - m_nplurals = nplurals; - m_plural.reset(plural); -} - -int wxPluralFormsCalculator::evaluate(int n) const -{ - if (m_plural.get() == 0) - { - return 0; - } - wxPluralFormsToken::Number number = m_plural->evaluate(n); - if (number < 0 || number > m_nplurals) - { - return 0; - } - return number; -} - - -class wxPluralFormsParser -{ -public: - wxPluralFormsParser(wxPluralFormsScanner& scanner) : m_scanner(scanner) {} - bool parse(wxPluralFormsCalculator& rCalculator); - -private: - wxPluralFormsNode* parsePlural(); - // stops at T_SEMICOLON, returns 0 if error - wxPluralFormsScanner& m_scanner; - const wxPluralFormsToken& token() const; - bool nextToken(); - - wxPluralFormsNode* expression(); - wxPluralFormsNode* logicalOrExpression(); - wxPluralFormsNode* logicalAndExpression(); - wxPluralFormsNode* equalityExpression(); - wxPluralFormsNode* multiplicativeExpression(); - wxPluralFormsNode* relationalExpression(); - wxPluralFormsNode* pmExpression(); -}; - -bool wxPluralFormsParser::parse(wxPluralFormsCalculator& rCalculator) -{ - if (token().type() != wxPluralFormsToken::T_NPLURALS) - return false; - if (!nextToken()) - return false; - if (token().type() != wxPluralFormsToken::T_ASSIGN) - return false; - if (!nextToken()) - return false; - if (token().type() != wxPluralFormsToken::T_NUMBER) - return false; - wxPluralFormsToken::Number nplurals = token().number(); - if (!nextToken()) - return false; - if (token().type() != wxPluralFormsToken::T_SEMICOLON) - return false; - if (!nextToken()) - return false; - if (token().type() != wxPluralFormsToken::T_PLURAL) - return false; - if (!nextToken()) - return false; - if (token().type() != wxPluralFormsToken::T_ASSIGN) - return false; - if (!nextToken()) - return false; - wxPluralFormsNode* plural = parsePlural(); - if (plural == 0) - return false; - if (token().type() != wxPluralFormsToken::T_SEMICOLON) - return false; - if (!nextToken()) - return false; - if (token().type() != wxPluralFormsToken::T_EOF) - return false; - rCalculator.init(nplurals, plural); - return true; -} - -wxPluralFormsNode* wxPluralFormsParser::parsePlural() -{ - wxPluralFormsNode* p = expression(); - if (p == NULL) - { - return NULL; - } - wxPluralFormsNodePtr n(p); - if (token().type() != wxPluralFormsToken::T_SEMICOLON) - { - return NULL; - } - return n.release(); -} - -const wxPluralFormsToken& wxPluralFormsParser::token() const -{ - return m_scanner.token(); -} - -bool wxPluralFormsParser::nextToken() -{ - if (!m_scanner.nextToken()) - return false; - return true; -} - -wxPluralFormsNode* wxPluralFormsParser::expression() -{ - wxPluralFormsNode* p = logicalOrExpression(); - if (p == NULL) - return NULL; - wxPluralFormsNodePtr n(p); - if (token().type() == wxPluralFormsToken::T_QUESTION) - { - wxPluralFormsNodePtr qn(new wxPluralFormsNode(token())); - if (!nextToken()) - { - return 0; - } - p = expression(); - if (p == 0) - { - return 0; - } - qn->setNode(1, p); - if (token().type() != wxPluralFormsToken::T_COLON) - { - return 0; - } - if (!nextToken()) - { - return 0; - } - p = expression(); - if (p == 0) - { - return 0; - } - qn->setNode(2, p); - qn->setNode(0, n.release()); - return qn.release(); - } - return n.release(); -} - -wxPluralFormsNode*wxPluralFormsParser::logicalOrExpression() -{ - wxPluralFormsNode* p = logicalAndExpression(); - if (p == NULL) - return NULL; - wxPluralFormsNodePtr ln(p); - if (token().type() == wxPluralFormsToken::T_LOGICAL_OR) - { - wxPluralFormsNodePtr un(new wxPluralFormsNode(token())); - if (!nextToken()) - { - return 0; - } - p = logicalOrExpression(); - if (p == 0) - { - return 0; - } - wxPluralFormsNodePtr rn(p); // right - if (rn->token().type() == wxPluralFormsToken::T_LOGICAL_OR) - { - // see logicalAndExpression comment - un->setNode(0, ln.release()); - un->setNode(1, rn->releaseNode(0)); - rn->setNode(0, un.release()); - return rn.release(); - } - - - un->setNode(0, ln.release()); - un->setNode(1, rn.release()); - return un.release(); - } - return ln.release(); -} - -wxPluralFormsNode* wxPluralFormsParser::logicalAndExpression() -{ - wxPluralFormsNode* p = equalityExpression(); - if (p == NULL) - return NULL; - wxPluralFormsNodePtr ln(p); // left - if (token().type() == wxPluralFormsToken::T_LOGICAL_AND) - { - wxPluralFormsNodePtr un(new wxPluralFormsNode(token())); // up - if (!nextToken()) - { - return NULL; - } - p = logicalAndExpression(); - if (p == 0) - { - return NULL; - } - wxPluralFormsNodePtr rn(p); // right - if (rn->token().type() == wxPluralFormsToken::T_LOGICAL_AND) - { -// transform 1 && (2 && 3) -> (1 && 2) && 3 -// u r -// l r -> u 3 -// 2 3 l 2 - un->setNode(0, ln.release()); - un->setNode(1, rn->releaseNode(0)); - rn->setNode(0, un.release()); - return rn.release(); - } - - un->setNode(0, ln.release()); - un->setNode(1, rn.release()); - return un.release(); - } - return ln.release(); -} - -wxPluralFormsNode* wxPluralFormsParser::equalityExpression() -{ - wxPluralFormsNode* p = relationalExpression(); - if (p == NULL) - return NULL; - wxPluralFormsNodePtr n(p); - if (token().type() == wxPluralFormsToken::T_EQUAL - || token().type() == wxPluralFormsToken::T_NOT_EQUAL) - { - wxPluralFormsNodePtr qn(new wxPluralFormsNode(token())); - if (!nextToken()) - { - return NULL; - } - p = relationalExpression(); - if (p == NULL) - { - return NULL; - } - qn->setNode(1, p); - qn->setNode(0, n.release()); - return qn.release(); - } - return n.release(); -} - -wxPluralFormsNode* wxPluralFormsParser::relationalExpression() -{ - wxPluralFormsNode* p = multiplicativeExpression(); - if (p == NULL) - return NULL; - wxPluralFormsNodePtr n(p); - if (token().type() == wxPluralFormsToken::T_GREATER - || token().type() == wxPluralFormsToken::T_LESS - || token().type() == wxPluralFormsToken::T_GREATER_OR_EQUAL - || token().type() == wxPluralFormsToken::T_LESS_OR_EQUAL) - { - wxPluralFormsNodePtr qn(new wxPluralFormsNode(token())); - if (!nextToken()) - { - return NULL; - } - p = multiplicativeExpression(); - if (p == NULL) - { - return NULL; - } - qn->setNode(1, p); - qn->setNode(0, n.release()); - return qn.release(); - } - return n.release(); -} - -wxPluralFormsNode* wxPluralFormsParser::multiplicativeExpression() -{ - wxPluralFormsNode* p = pmExpression(); - if (p == NULL) - return NULL; - wxPluralFormsNodePtr n(p); - if (token().type() == wxPluralFormsToken::T_REMINDER) - { - wxPluralFormsNodePtr qn(new wxPluralFormsNode(token())); - if (!nextToken()) - { - return NULL; - } - p = pmExpression(); - if (p == NULL) - { - return NULL; - } - qn->setNode(1, p); - qn->setNode(0, n.release()); - return qn.release(); - } - return n.release(); -} - -wxPluralFormsNode* wxPluralFormsParser::pmExpression() -{ - wxPluralFormsNodePtr n; - if (token().type() == wxPluralFormsToken::T_N - || token().type() == wxPluralFormsToken::T_NUMBER) - { - n.reset(new wxPluralFormsNode(token())); - if (!nextToken()) - { - return NULL; - } - } - else if (token().type() == wxPluralFormsToken::T_LEFT_BRACKET) { - if (!nextToken()) - { - return NULL; - } - wxPluralFormsNode* p = expression(); - if (p == NULL) - { - return NULL; - } - n.reset(p); - if (token().type() != wxPluralFormsToken::T_RIGHT_BRACKET) - { - return NULL; - } - if (!nextToken()) - { - return NULL; - } - } - else - { - return NULL; - } - return n.release(); -} - -wxPluralFormsCalculator* wxPluralFormsCalculator::make(const char* s) -{ - wxPluralFormsCalculatorPtr calculator(new wxPluralFormsCalculator); - if (s != NULL) - { - wxPluralFormsScanner scanner(s); - wxPluralFormsParser p(scanner); - if (!p.parse(*calculator)) - { - return NULL; - } - } - return calculator.release(); -} - - - - -// ---------------------------------------------------------------------------- -// wxMsgCatalogFile corresponds to one disk-file message catalog. -// -// This is a "low-level" class and is used only by wxMsgCatalog -// NOTE: for the documentation of the binary catalog (.MO) files refer to -// the GNU gettext manual: -// http://www.gnu.org/software/autoconf/manual/gettext/MO-Files.html -// ---------------------------------------------------------------------------- - -class wxMsgCatalogFile -{ -public: - typedef wxScopedCharBuffer DataBuffer; - - // ctor & dtor - wxMsgCatalogFile(); - ~wxMsgCatalogFile(); - - // load the catalog from disk - bool LoadFile(const wxString& filename, - wxPluralFormsCalculatorPtr& rPluralFormsCalculator); - bool LoadData(const DataBuffer& data, - wxPluralFormsCalculatorPtr& rPluralFormsCalculator); - - // fills the hash with string-translation pairs - bool FillHash(wxStringToStringHashMap& hash, const wxString& domain) const; - - // return the charset of the strings in this catalog or empty string if - // none/unknown - wxString GetCharset() const { return m_charset; } - -private: - // this implementation is binary compatible with GNU gettext() version 0.10 - - // an entry in the string table - struct wxMsgTableEntry - { - size_t32 nLen; // length of the string - size_t32 ofsString; // pointer to the string - }; - - // header of a .mo file - struct wxMsgCatalogHeader - { - size_t32 magic, // offset +00: magic id - revision, // +04: revision - numStrings; // +08: number of strings in the file - size_t32 ofsOrigTable, // +0C: start of original string table - ofsTransTable; // +10: start of translated string table - size_t32 nHashSize, // +14: hash table size - ofsHashTable; // +18: offset of hash table start - }; - - // all data is stored here - DataBuffer m_data; - - // data description - size_t32 m_numStrings; // number of strings in this domain - wxMsgTableEntry *m_pOrigTable, // pointer to original strings - *m_pTransTable; // translated - - wxString m_charset; // from the message catalog header - - - // swap the 2 halves of 32 bit integer if needed - size_t32 Swap(size_t32 ui) const - { - return m_bSwapped ? (ui << 24) | ((ui & 0xff00) << 8) | - ((ui >> 8) & 0xff00) | (ui >> 24) - : ui; - } - - const char *StringAtOfs(wxMsgTableEntry *pTable, size_t32 n) const - { - const wxMsgTableEntry * const ent = pTable + n; - - // this check could fail for a corrupt message catalog - size_t32 ofsString = Swap(ent->ofsString); - if ( ofsString + Swap(ent->nLen) > m_data.length()) - { - return NULL; - } - - return m_data.data() + ofsString; - } - - bool m_bSwapped; // wrong endianness? - - wxDECLARE_NO_COPY_CLASS(wxMsgCatalogFile); -}; - -// ---------------------------------------------------------------------------- -// wxMsgCatalogFile class -// ---------------------------------------------------------------------------- - -wxMsgCatalogFile::wxMsgCatalogFile() -{ -} - -wxMsgCatalogFile::~wxMsgCatalogFile() -{ -} - -// open disk file and read in it's contents -bool wxMsgCatalogFile::LoadFile(const wxString& filename, - wxPluralFormsCalculatorPtr& rPluralFormsCalculator) -{ - wxFile fileMsg(filename); - if ( !fileMsg.IsOpened() ) - return false; - - // get the file size (assume it is less than 4GB...) - wxFileOffset lenFile = fileMsg.Length(); - if ( lenFile == wxInvalidOffset ) - return false; - - size_t nSize = wx_truncate_cast(size_t, lenFile); - wxASSERT_MSG( nSize == lenFile + size_t(0), wxS("message catalog bigger than 4GB?") ); - - wxMemoryBuffer filedata; - - // read the whole file in memory - if ( fileMsg.Read(filedata.GetWriteBuf(nSize), nSize) != lenFile ) - return false; - - filedata.UngetWriteBuf(nSize); - - bool ok = LoadData - ( - DataBuffer::CreateOwned((char*)filedata.release(), nSize), - rPluralFormsCalculator - ); - if ( !ok ) - { - wxLogWarning(_("'%s' is not a valid message catalog."), filename.c_str()); - return false; - } - - return true; -} - - -bool wxMsgCatalogFile::LoadData(const DataBuffer& data, - wxPluralFormsCalculatorPtr& rPluralFormsCalculator) -{ - // examine header - bool bValid = data.length() > sizeof(wxMsgCatalogHeader); - - const wxMsgCatalogHeader *pHeader = (wxMsgCatalogHeader *)data.data(); - if ( bValid ) { - // we'll have to swap all the integers if it's true - m_bSwapped = pHeader->magic == MSGCATALOG_MAGIC_SW; - - // check the magic number - bValid = m_bSwapped || pHeader->magic == MSGCATALOG_MAGIC; - } - - if ( !bValid ) { - // it's either too short or has incorrect magic number - wxLogWarning(_("Invalid message catalog.")); - return false; - } - - m_data = data; - - // initialize - m_numStrings = Swap(pHeader->numStrings); - m_pOrigTable = (wxMsgTableEntry *)(data.data() + - Swap(pHeader->ofsOrigTable)); - m_pTransTable = (wxMsgTableEntry *)(data.data() + - Swap(pHeader->ofsTransTable)); - - // now parse catalog's header and try to extract catalog charset and - // plural forms formula from it: - - const char* headerData = StringAtOfs(m_pOrigTable, 0); - if ( headerData && headerData[0] == '\0' ) - { - // Extract the charset: - const char * const header = StringAtOfs(m_pTransTable, 0); - const char * - cset = strstr(header, "Content-Type: text/plain; charset="); - if ( cset ) - { - cset += 34; // strlen("Content-Type: text/plain; charset=") - - const char * const csetEnd = strchr(cset, '\n'); - if ( csetEnd ) - { - m_charset = wxString(cset, csetEnd - cset); - if ( m_charset == wxS("CHARSET") ) - { - // "CHARSET" is not valid charset, but lazy translator - m_charset.clear(); - } - } - } - // else: incorrectly filled Content-Type header - - // Extract plural forms: - const char * plurals = strstr(header, "Plural-Forms:"); - if ( plurals ) - { - plurals += 13; // strlen("Plural-Forms:") - const char * const pluralsEnd = strchr(plurals, '\n'); - if ( pluralsEnd ) - { - const size_t pluralsLen = pluralsEnd - plurals; - wxCharBuffer buf(pluralsLen); - strncpy(buf.data(), plurals, pluralsLen); - wxPluralFormsCalculator * const - pCalculator = wxPluralFormsCalculator::make(buf); - if ( pCalculator ) - { - rPluralFormsCalculator.reset(pCalculator); - } - else - { - wxLogVerbose(_("Failed to parse Plural-Forms: '%s'"), - buf.data()); - } - } - } - - if ( !rPluralFormsCalculator.get() ) - rPluralFormsCalculator.reset(wxPluralFormsCalculator::make()); - } - - // everything is fine - return true; -} - -bool wxMsgCatalogFile::FillHash(wxStringToStringHashMap& hash, - const wxString& domain) const -{ - wxUnusedVar(domain); // silence warning in Unicode build - - // conversion to use to convert catalog strings to the GUI encoding - wxMBConv *inputConv = NULL; - - wxScopedPtr inputConvPtr; // just to delete inputConv if needed - - if ( !m_charset.empty() ) - { -#if !wxUSE_UNICODE && wxUSE_FONTMAP - // determine if we need any conversion at all - wxFontEncoding encCat = wxFontMapperBase::GetEncodingFromName(m_charset); - if ( encCat != wxLocale::GetSystemEncoding() ) -#endif - { - inputConv = new wxCSConv(m_charset); - - // As we allocated it ourselves, we need to delete it, so ensure - // this happens. - inputConvPtr.reset(inputConv); - } - } - else // no need or not possible to convert the encoding - { -#if wxUSE_UNICODE - // we must somehow convert the narrow strings in the message catalog to - // wide strings, so use the default conversion if we have no charset - inputConv = wxConvCurrent; -#endif - } - -#if !wxUSE_UNICODE - wxString msgIdCharset = gs_msgIdCharset[domain]; - - // conversion to apply to msgid strings before looking them up: we only - // need it if the msgids are neither in 7 bit ASCII nor in the same - // encoding as the catalog - wxScopedPtr sourceConv; - if ( !msgIdCharset.empty() && (msgIdCharset != m_charset) ) - sourceConv.reset(new wxCSConv(msgIdCharset)); -#endif // !wxUSE_UNICODE - - for (size_t32 i = 0; i < m_numStrings; i++) - { - const char *data = StringAtOfs(m_pOrigTable, i); - if (!data) - return false; // may happen for invalid MO files - - wxString msgid; -#if wxUSE_UNICODE - msgid = wxString(data, *inputConv); -#else // ASCII - if ( inputConv && sourceConv ) - msgid = wxString(inputConv->cMB2WC(data), *sourceConv); - else - msgid = data; -#endif // wxUSE_UNICODE - - data = StringAtOfs(m_pTransTable, i); - if (!data) - return false; // may happen for invalid MO files - - size_t length = Swap(m_pTransTable[i].nLen); - size_t offset = 0; - size_t index = 0; - while (offset < length) - { - const char * const str = data + offset; - - wxString msgstr; -#if wxUSE_UNICODE - msgstr = wxString(str, *inputConv); -#else - if ( inputConv ) - msgstr = wxString(inputConv->cMB2WC(str), *wxConvUI); - else - msgstr = str; -#endif // wxUSE_UNICODE/!wxUSE_UNICODE - - if ( !msgstr.empty() ) - { - hash[index == 0 ? msgid : msgid + wxChar(index)] = msgstr; - } - - // skip this string - // IMPORTANT: accesses to the 'data' pointer are valid only for - // the first 'length+1' bytes (GNU specs says that the - // final NUL is not counted in length); using wxStrnlen() - // we make sure we don't access memory beyond the valid range - // (which otherwise may happen for invalid MO files): - offset += wxStrnlen(str, length - offset) + 1; - ++index; - } - } - - return true; -} - - -// ---------------------------------------------------------------------------- -// wxMsgCatalog class -// ---------------------------------------------------------------------------- - -#if !wxUSE_UNICODE -wxMsgCatalog::~wxMsgCatalog() -{ - if ( m_conv ) - { - if ( wxConvUI == m_conv ) - { - // we only change wxConvUI if it points to wxConvLocal so we reset - // it back to it too - wxConvUI = &wxConvLocal; - } - - delete m_conv; - } -} -#endif // !wxUSE_UNICODE - -/* static */ -wxMsgCatalog *wxMsgCatalog::CreateFromFile(const wxString& filename, - const wxString& domain) -{ - wxScopedPtr cat(new wxMsgCatalog(domain)); - - wxMsgCatalogFile file; - - if ( !file.LoadFile(filename, cat->m_pluralFormsCalculator) ) - return NULL; - - if ( !file.FillHash(cat->m_messages, domain) ) - return NULL; - - return cat.release(); -} - -/* static */ -wxMsgCatalog *wxMsgCatalog::CreateFromData(const wxScopedCharBuffer& data, - const wxString& domain) -{ - wxScopedPtr cat(new wxMsgCatalog(domain)); - - wxMsgCatalogFile file; - - if ( !file.LoadData(data, cat->m_pluralFormsCalculator) ) - return NULL; - - if ( !file.FillHash(cat->m_messages, domain) ) - return NULL; - - return cat.release(); -} - -const wxString *wxMsgCatalog::GetString(const wxString& str, unsigned n) const -{ - int index = 0; - if (n != UINT_MAX) - { - index = m_pluralFormsCalculator->evaluate(n); - } - wxStringToStringHashMap::const_iterator i; - if (index != 0) - { - i = m_messages.find(wxString(str) + wxChar(index)); // plural - } - else - { - i = m_messages.find(str); - } - - if ( i != m_messages.end() ) - { - return &i->second; - } - else - return NULL; -} - - -// ---------------------------------------------------------------------------- -// wxTranslations -// ---------------------------------------------------------------------------- - -namespace -{ - -wxTranslations *gs_translations = NULL; -bool gs_translationsOwned = false; - -} // anonymous namespace - - -/*static*/ -wxTranslations *wxTranslations::Get() -{ - return gs_translations; -} - -/*static*/ -void wxTranslations::Set(wxTranslations *t) -{ - if ( gs_translationsOwned ) - delete gs_translations; - gs_translations = t; - gs_translationsOwned = true; -} - -/*static*/ -void wxTranslations::SetNonOwned(wxTranslations *t) -{ - if ( gs_translationsOwned ) - delete gs_translations; - gs_translations = t; - gs_translationsOwned = false; -} - - -wxTranslations::wxTranslations() -{ - m_pMsgCat = NULL; - m_loader = new wxFileTranslationsLoader; -} - - -wxTranslations::~wxTranslations() -{ - delete m_loader; - - // free catalogs memory - wxMsgCatalog *pTmpCat; - while ( m_pMsgCat != NULL ) - { - pTmpCat = m_pMsgCat; - m_pMsgCat = m_pMsgCat->m_pNext; - delete pTmpCat; - } -} - - -void wxTranslations::SetLoader(wxTranslationsLoader *loader) -{ - wxCHECK_RET( loader, "loader can't be NULL" ); - - delete m_loader; - m_loader = loader; -} - - -void wxTranslations::SetLanguage(wxLanguage lang) -{ - if ( lang == wxLANGUAGE_DEFAULT ) - SetLanguage(""); - else - SetLanguage(wxLocale::GetLanguageCanonicalName(lang)); -} - -void wxTranslations::SetLanguage(const wxString& lang) -{ - m_lang = lang; -} - - -wxArrayString wxTranslations::GetAvailableTranslations(const wxString& domain) const -{ - wxCHECK_MSG( m_loader, wxArrayString(), "loader can't be NULL" ); - - return m_loader->GetAvailableTranslations(domain); -} - - -bool wxTranslations::AddStdCatalog() -{ - if ( !AddCatalog(wxS("wxstd")) ) - return false; - - // there may be a catalog with toolkit specific overrides, it is not - // an error if this does not exist - wxString port(wxPlatformInfo::Get().GetPortIdName()); - if ( !port.empty() ) - { - AddCatalog(port.BeforeFirst(wxS('/')).MakeLower()); - } - - return true; -} - - -bool wxTranslations::AddCatalog(const wxString& domain) -{ - return AddCatalog(domain, wxLANGUAGE_ENGLISH_US); -} - -#if !wxUSE_UNICODE -bool wxTranslations::AddCatalog(const wxString& domain, - wxLanguage msgIdLanguage, - const wxString& msgIdCharset) -{ - gs_msgIdCharset[domain] = msgIdCharset; - return AddCatalog(domain, msgIdLanguage); -} -#endif // !wxUSE_UNICODE - -bool wxTranslations::AddCatalog(const wxString& domain, - wxLanguage msgIdLanguage) -{ - const wxString msgIdLang = wxLocale::GetLanguageCanonicalName(msgIdLanguage); - const wxString domain_lang = GetBestTranslation(domain, msgIdLang); - - if ( domain_lang.empty() ) - { - wxLogTrace(TRACE_I18N, - wxS("no suitable translation for domain '%s' found"), - domain); - return false; - } - - wxLogTrace(TRACE_I18N, - wxS("adding '%s' translation for domain '%s' (msgid language '%s')"), - domain_lang, domain, msgIdLang); - - return LoadCatalog(domain, domain_lang, msgIdLang); -} - - -bool wxTranslations::LoadCatalog(const wxString& domain, const wxString& lang, const wxString& msgIdLang) -{ - wxCHECK_MSG( m_loader, false, "loader can't be NULL" ); - - wxMsgCatalog *cat = NULL; - -#if wxUSE_FONTMAP - // first look for the catalog for this language and the current locale: - // notice that we don't use the system name for the locale as this would - // force us to install catalogs in different locations depending on the - // system but always use the canonical name - wxFontEncoding encSys = wxLocale::GetSystemEncoding(); - if ( encSys != wxFONTENCODING_SYSTEM ) - { - wxString fullname(lang); - fullname << wxS('.') << wxFontMapperBase::GetEncodingName(encSys); - - cat = m_loader->LoadCatalog(domain, fullname); - } -#endif // wxUSE_FONTMAP - - if ( !cat ) - { - // Next try: use the provided name language name: - cat = m_loader->LoadCatalog(domain, lang); - } - - if ( !cat ) - { - // Also try just base locale name: for things like "fr_BE" (Belgium - // French) we should use fall back on plain "fr" if no Belgium-specific - // message catalogs exist - wxString baselang = lang.BeforeFirst('_'); - if ( lang != baselang ) - cat = m_loader->LoadCatalog(domain, baselang); - } - - if ( !cat ) - { - // It is OK to not load catalog if the msgid language and m_language match, - // in which case we can directly display the texts embedded in program's - // source code: - if ( msgIdLang == lang ) - return true; - } - - if ( cat ) - { - // add it to the head of the list so that in GetString it will - // be searched before the catalogs added earlier - - cat->m_pNext = m_pMsgCat; - m_pMsgCat = cat; - m_catalogMap[domain] = cat; - - return true; - } - else - { - // Nothing worked, the catalog just isn't there - wxLogTrace(TRACE_I18N, - "Catalog \"%s.mo\" not found for language \"%s\".", - domain, lang); - return false; - } -} - -// check if the given catalog is loaded -bool wxTranslations::IsLoaded(const wxString& domain) const -{ - return FindCatalog(domain) != NULL; -} - -wxString wxTranslations::GetBestTranslation(const wxString& domain, - wxLanguage msgIdLanguage) -{ - const wxString lang = wxLocale::GetLanguageCanonicalName(msgIdLanguage); - return GetBestTranslation(domain, lang); -} - -wxString wxTranslations::GetBestTranslation(const wxString& domain, - const wxString& msgIdLanguage) -{ - // explicitly set language should always be respected - if ( !m_lang.empty() ) - return m_lang; - - wxArrayString available(GetAvailableTranslations(domain)); - // it's OK to have duplicates, so just add msgid language - available.push_back(msgIdLanguage); - available.push_back(msgIdLanguage.BeforeFirst('_')); - - wxLogTrace(TRACE_I18N, "choosing best language for domain '%s'", domain); - LogTraceArray(" - available translations", available); - const wxString lang = GetPreferredUILanguage(available); - wxLogTrace(TRACE_I18N, " => using language '%s'", lang); - return lang; -} - - -/* static */ -const wxString& wxTranslations::GetUntranslatedString(const wxString& str) -{ - wxLocaleUntranslatedStrings& strings = wxThreadInfo.untranslatedStrings; - - wxLocaleUntranslatedStrings::iterator i = strings.find(str); - if ( i == strings.end() ) - return *strings.insert(str).first; - - return *i; -} - - -const wxString *wxTranslations::GetTranslatedString(const wxString& origString, - const wxString& domain) const -{ - return GetTranslatedString(origString, UINT_MAX, domain); -} - -const wxString *wxTranslations::GetTranslatedString(const wxString& origString, - unsigned n, - const wxString& domain) const -{ - if ( origString.empty() ) - return NULL; - - const wxString *trans = NULL; - wxMsgCatalog *pMsgCat; - - if ( !domain.empty() ) - { - pMsgCat = FindCatalog(domain); - - // does the catalog exist? - if ( pMsgCat != NULL ) - trans = pMsgCat->GetString(origString, n); - } - else - { - // search in all domains - for ( pMsgCat = m_pMsgCat; pMsgCat != NULL; pMsgCat = pMsgCat->m_pNext ) - { - trans = pMsgCat->GetString(origString, n); - if ( trans != NULL ) // take the first found - break; - } - } - - if ( trans == NULL ) - { - wxLogTrace - ( - TRACE_I18N, - "string \"%s\"%s not found in %slocale '%s'.", - origString, - (n != UINT_MAX ? wxString::Format("[%ld]", (long)n) : wxString()), - (!domain.empty() ? wxString::Format("domain '%s' ", domain) : wxString()), - m_lang - ); - } - - return trans; -} - - -wxString wxTranslations::GetHeaderValue(const wxString& header, - const wxString& domain) const -{ - if ( header.empty() ) - return wxEmptyString; - - const wxString *trans = NULL; - wxMsgCatalog *pMsgCat; - - if ( !domain.empty() ) - { - pMsgCat = FindCatalog(domain); - - // does the catalog exist? - if ( pMsgCat == NULL ) - return wxEmptyString; - - trans = pMsgCat->GetString(wxEmptyString, UINT_MAX); - } - else - { - // search in all domains - for ( pMsgCat = m_pMsgCat; pMsgCat != NULL; pMsgCat = pMsgCat->m_pNext ) - { - trans = pMsgCat->GetString(wxEmptyString, UINT_MAX); - if ( trans != NULL ) // take the first found - break; - } - } - - if ( !trans || trans->empty() ) - return wxEmptyString; - - size_t found = trans->find(header); - if ( found == wxString::npos ) - return wxEmptyString; - - found += header.length() + 2 /* ': ' */; - - // Every header is separated by \n - - size_t endLine = trans->find(wxS('\n'), found); - size_t len = (endLine == wxString::npos) ? - wxString::npos : (endLine - found); - - return trans->substr(found, len); -} - - -// find catalog by name -wxMsgCatalog *wxTranslations::FindCatalog(const wxString& domain) const -{ - const wxMsgCatalogMap::const_iterator found = m_catalogMap.find(domain); - - return found == m_catalogMap.end() ? NULL : found->second; -} - -// ---------------------------------------------------------------------------- -// wxFileTranslationsLoader -// ---------------------------------------------------------------------------- - -namespace -{ - -// the list of the directories to search for message catalog files -wxArrayString gs_searchPrefixes; - -// return the directories to search for message catalogs under the given -// prefix, separated by wxPATH_SEP -wxString GetMsgCatalogSubdirs(const wxString& prefix, const wxString& lang) -{ - // Search first in Unix-standard prefix/lang/LC_MESSAGES, then in - // prefix/lang. - // - // Note that we use LC_MESSAGES on all platforms and not just Unix, because - // it doesn't cost much to look into one more directory and doing it this - // way has two important benefits: - // a) we don't break compatibility with wx-2.6 and older by stopping to - // look in a directory where the catalogs used to be and thus silently - // breaking apps after they are recompiled against the latest wx - // b) it makes it possible to package app's support files in the same - // way on all target platforms - const wxString prefixAndLang = wxFileName(prefix, lang).GetFullPath(); - - wxString searchPath; - searchPath.reserve(4*prefixAndLang.length()); - - searchPath -#ifdef __WXOSX__ - << prefixAndLang << ".lproj/LC_MESSAGES" << wxPATH_SEP - << prefixAndLang << ".lproj" << wxPATH_SEP -#endif - << prefixAndLang << wxFILE_SEP_PATH << "LC_MESSAGES" << wxPATH_SEP - << prefixAndLang << wxPATH_SEP - ; - - return searchPath; -} - -bool HasMsgCatalogInDir(const wxString& dir, const wxString& domain) -{ - return wxFileName(dir, domain, "mo").FileExists() || - wxFileName(dir + wxFILE_SEP_PATH + "LC_MESSAGES", domain, "mo").FileExists(); -} - -// get prefixes to locale directories; if lang is empty, don't point to -// OSX's .lproj bundles -wxArrayString GetSearchPrefixes() -{ - wxArrayString paths; - - // first take the entries explicitly added by the program - paths = gs_searchPrefixes; - -#if wxUSE_STDPATHS - // then look in the standard location - wxString stdp; - stdp = wxStandardPaths::Get().GetResourcesDir(); - if ( paths.Index(stdp) == wxNOT_FOUND ) - paths.Add(stdp); -#endif // wxUSE_STDPATHS - - // last look in default locations -#ifdef __UNIX__ - // LC_PATH is a standard env var containing the search path for the .mo - // files - const char *pszLcPath = wxGetenv("LC_PATH"); - if ( pszLcPath ) - { - const wxString lcp = pszLcPath; - if ( paths.Index(lcp) == wxNOT_FOUND ) - paths.Add(lcp); - } - - // also add the one from where wxWin was installed: - wxString wxp = wxGetInstallPrefix(); - if ( !wxp.empty() ) - { - wxp += wxS("/share/locale"); - if ( paths.Index(wxp) == wxNOT_FOUND ) - paths.Add(wxp); - } -#endif // __UNIX__ - - return paths; -} - -// construct the search path for the given language -wxString GetFullSearchPath(const wxString& lang) -{ - wxString searchPath; - searchPath.reserve(500); - - const wxArrayString prefixes = GetSearchPrefixes(); - - for ( wxArrayString::const_iterator i = prefixes.begin(); - i != prefixes.end(); - ++i ) - { - const wxString p = GetMsgCatalogSubdirs(*i, lang); - - if ( !searchPath.empty() ) - searchPath += wxPATH_SEP; - searchPath += p; - } - - return searchPath; -} - -} // anonymous namespace - - -void wxFileTranslationsLoader::AddCatalogLookupPathPrefix(const wxString& prefix) -{ - if ( gs_searchPrefixes.Index(prefix) == wxNOT_FOUND ) - { - gs_searchPrefixes.Add(prefix); - } - //else: already have it -} - - -wxMsgCatalog *wxFileTranslationsLoader::LoadCatalog(const wxString& domain, - const wxString& lang) -{ - wxString searchPath = GetFullSearchPath(lang); - - LogTraceLargeArray - ( - wxString::Format("looking for \"%s.mo\" in search path", domain), - wxSplit(searchPath, wxPATH_SEP[0]) - ); - - wxFileName fn(domain); - fn.SetExt(wxS("mo")); - - wxString strFullName; - if ( !wxFindFileInPath(&strFullName, searchPath, fn.GetFullPath()) ) - return NULL; - - // open file and read its data - wxLogVerbose(_("using catalog '%s' from '%s'."), domain, strFullName.c_str()); - wxLogTrace(TRACE_I18N, wxS("Using catalog \"%s\"."), strFullName.c_str()); - - return wxMsgCatalog::CreateFromFile(strFullName, domain); -} - - -wxArrayString wxFileTranslationsLoader::GetAvailableTranslations(const wxString& domain) const -{ - wxArrayString langs; - const wxArrayString prefixes = GetSearchPrefixes(); - - LogTraceLargeArray - ( - wxString::Format("looking for available translations of \"%s\" in search path", domain), - prefixes - ); - - for ( wxArrayString::const_iterator i = prefixes.begin(); - i != prefixes.end(); - ++i ) - { - if ( i->empty() ) - continue; - wxDir dir; - if ( !dir.Open(*i) ) - continue; - - wxString lang; - for ( bool ok = dir.GetFirst(&lang, "", wxDIR_DIRS); - ok; - ok = dir.GetNext(&lang) ) - { - const wxString langdir = *i + wxFILE_SEP_PATH + lang; - if ( HasMsgCatalogInDir(langdir, domain) ) - { -#ifdef __WXOSX__ - wxString rest; - if ( lang.EndsWith(".lproj", &rest) ) - lang = rest; -#endif // __WXOSX__ - - wxLogTrace(TRACE_I18N, - "found %s translation of \"%s\" in %s", - lang, domain, langdir); - langs.push_back(lang); - } - } - } - - return langs; -} - - -// ---------------------------------------------------------------------------- -// wxResourceTranslationsLoader -// ---------------------------------------------------------------------------- - -#ifdef __WINDOWS__ - -wxMsgCatalog *wxResourceTranslationsLoader::LoadCatalog(const wxString& domain, - const wxString& lang) -{ - const void *mo_data = NULL; - size_t mo_size = 0; - - const wxString resname = wxString::Format("%s_%s", domain, lang); - - if ( !wxLoadUserResource(&mo_data, &mo_size, - resname, - GetResourceType().t_str(), - GetModule()) ) - return NULL; - - wxLogTrace(TRACE_I18N, - "Using catalog from Windows resource \"%s\".", resname); - - wxMsgCatalog *cat = wxMsgCatalog::CreateFromData( - wxCharBuffer::CreateNonOwned(static_cast(mo_data), mo_size), - domain); - - if ( !cat ) - { - wxLogWarning(_("Resource '%s' is not a valid message catalog."), resname); - } - - return cat; -} - -namespace -{ - -struct EnumCallbackData -{ - wxString prefix; - wxArrayString langs; -}; - -BOOL CALLBACK EnumTranslations(HMODULE WXUNUSED(hModule), - LPCTSTR WXUNUSED(lpszType), - LPTSTR lpszName, - LONG_PTR lParam) -{ - wxString name(lpszName); - name.MakeLower(); // resource names are case insensitive - - EnumCallbackData *data = reinterpret_cast(lParam); - - wxString lang; - if ( name.StartsWith(data->prefix, &lang) && !lang.empty() ) - data->langs.push_back(lang); - - return TRUE; // continue enumeration -} - -} // anonymous namespace - - -wxArrayString wxResourceTranslationsLoader::GetAvailableTranslations(const wxString& domain) const -{ - EnumCallbackData data; - data.prefix = domain + "_"; - data.prefix.MakeLower(); // resource names are case insensitive - - if ( !EnumResourceNames(GetModule(), - GetResourceType().t_str(), - EnumTranslations, - reinterpret_cast(&data)) ) - { - const DWORD err = GetLastError(); - if ( err != NO_ERROR && err != ERROR_RESOURCE_TYPE_NOT_FOUND ) - { - wxLogSysError(_("Couldn't enumerate translations")); - } - } - - return data.langs; -} - -#endif // __WINDOWS__ - - -// ---------------------------------------------------------------------------- -// wxTranslationsModule module (for destruction of gs_translations) -// ---------------------------------------------------------------------------- - -class wxTranslationsModule: public wxModule -{ - wxDECLARE_DYNAMIC_CLASS(wxTranslationsModule); -public: - wxTranslationsModule() {} - - bool OnInit() wxOVERRIDE - { - return true; - } - - void OnExit() wxOVERRIDE - { - if ( gs_translationsOwned ) - delete gs_translations; - gs_translations = NULL; - gs_translationsOwned = true; - } -}; - -wxIMPLEMENT_DYNAMIC_CLASS(wxTranslationsModule, wxModule); - -#endif // wxUSE_INTL diff --git a/Externals/wxWidgets3/src/common/treebase.cpp b/Externals/wxWidgets3/src/common/treebase.cpp deleted file mode 100644 index b2cfd7960a..0000000000 --- a/Externals/wxWidgets3/src/common/treebase.cpp +++ /dev/null @@ -1,375 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/treebase.cpp -// Purpose: Base wxTreeCtrl classes -// Author: Julian Smart -// Created: 01/02/97 -// Modified: -// Copyright: (c) 1998 Robert Roebling, Julian Smart et al -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================= -// declarations -// ============================================================================= - -// ----------------------------------------------------------------------------- -// headers -// ----------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_TREECTRL - -#include "wx/treectrl.h" -#include "wx/imaglist.h" - -extern WXDLLEXPORT_DATA(const char) wxTreeCtrlNameStr[] = "treeCtrl"; - -// ---------------------------------------------------------------------------- -// events -// ---------------------------------------------------------------------------- - -wxDEFINE_EVENT( wxEVT_TREE_BEGIN_DRAG, wxTreeEvent ); -wxDEFINE_EVENT( wxEVT_TREE_BEGIN_RDRAG, wxTreeEvent ); -wxDEFINE_EVENT( wxEVT_TREE_BEGIN_LABEL_EDIT, wxTreeEvent ); -wxDEFINE_EVENT( wxEVT_TREE_END_LABEL_EDIT, wxTreeEvent ); -wxDEFINE_EVENT( wxEVT_TREE_DELETE_ITEM, wxTreeEvent ); -wxDEFINE_EVENT( wxEVT_TREE_GET_INFO, wxTreeEvent ); -wxDEFINE_EVENT( wxEVT_TREE_SET_INFO, wxTreeEvent ); -wxDEFINE_EVENT( wxEVT_TREE_ITEM_EXPANDED, wxTreeEvent ); -wxDEFINE_EVENT( wxEVT_TREE_ITEM_EXPANDING, wxTreeEvent ); -wxDEFINE_EVENT( wxEVT_TREE_ITEM_COLLAPSED, wxTreeEvent ); -wxDEFINE_EVENT( wxEVT_TREE_ITEM_COLLAPSING, wxTreeEvent ); -wxDEFINE_EVENT( wxEVT_TREE_SEL_CHANGED, wxTreeEvent ); -wxDEFINE_EVENT( wxEVT_TREE_SEL_CHANGING, wxTreeEvent ); -wxDEFINE_EVENT( wxEVT_TREE_KEY_DOWN, wxTreeEvent ); -wxDEFINE_EVENT( wxEVT_TREE_ITEM_ACTIVATED, wxTreeEvent ); -wxDEFINE_EVENT( wxEVT_TREE_ITEM_RIGHT_CLICK, wxTreeEvent ); -wxDEFINE_EVENT( wxEVT_TREE_ITEM_MIDDLE_CLICK, wxTreeEvent ); -wxDEFINE_EVENT( wxEVT_TREE_END_DRAG, wxTreeEvent ); -wxDEFINE_EVENT( wxEVT_TREE_STATE_IMAGE_CLICK, wxTreeEvent ); -wxDEFINE_EVENT( wxEVT_TREE_ITEM_GETTOOLTIP, wxTreeEvent ); -wxDEFINE_EVENT( wxEVT_TREE_ITEM_MENU, wxTreeEvent ); - -// ---------------------------------------------------------------------------- -// XTI -// ---------------------------------------------------------------------------- - -wxDEFINE_FLAGS( wxTreeCtrlStyle ) -wxBEGIN_FLAGS( wxTreeCtrlStyle ) -// new style border flags, we put them first to -// use them for streaming out -wxFLAGS_MEMBER(wxBORDER_SIMPLE) -wxFLAGS_MEMBER(wxBORDER_SUNKEN) -wxFLAGS_MEMBER(wxBORDER_DOUBLE) -wxFLAGS_MEMBER(wxBORDER_RAISED) -wxFLAGS_MEMBER(wxBORDER_STATIC) -wxFLAGS_MEMBER(wxBORDER_NONE) - -// old style border flags -wxFLAGS_MEMBER(wxSIMPLE_BORDER) -wxFLAGS_MEMBER(wxSUNKEN_BORDER) -wxFLAGS_MEMBER(wxDOUBLE_BORDER) -wxFLAGS_MEMBER(wxRAISED_BORDER) -wxFLAGS_MEMBER(wxSTATIC_BORDER) -wxFLAGS_MEMBER(wxBORDER) - -// standard window styles -wxFLAGS_MEMBER(wxTAB_TRAVERSAL) -wxFLAGS_MEMBER(wxCLIP_CHILDREN) -wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) -wxFLAGS_MEMBER(wxWANTS_CHARS) -wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE) -wxFLAGS_MEMBER(wxALWAYS_SHOW_SB ) -wxFLAGS_MEMBER(wxVSCROLL) -wxFLAGS_MEMBER(wxHSCROLL) - -wxFLAGS_MEMBER(wxTR_EDIT_LABELS) -wxFLAGS_MEMBER(wxTR_NO_BUTTONS) -wxFLAGS_MEMBER(wxTR_HAS_BUTTONS) -wxFLAGS_MEMBER(wxTR_TWIST_BUTTONS) -wxFLAGS_MEMBER(wxTR_NO_LINES) -wxFLAGS_MEMBER(wxTR_FULL_ROW_HIGHLIGHT) -wxFLAGS_MEMBER(wxTR_LINES_AT_ROOT) -wxFLAGS_MEMBER(wxTR_HIDE_ROOT) -wxFLAGS_MEMBER(wxTR_ROW_LINES) -wxFLAGS_MEMBER(wxTR_HAS_VARIABLE_ROW_HEIGHT) -wxFLAGS_MEMBER(wxTR_SINGLE) -wxFLAGS_MEMBER(wxTR_MULTIPLE) -#if WXWIN_COMPATIBILITY_2_8 -wxFLAGS_MEMBER(wxTR_EXTENDED) -#endif -wxFLAGS_MEMBER(wxTR_DEFAULT_STYLE) -wxEND_FLAGS( wxTreeCtrlStyle ) - -wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxTreeCtrl, wxControl, "wx/treectrl.h"); - -wxBEGIN_PROPERTIES_TABLE(wxTreeCtrl) -wxEVENT_PROPERTY( TextUpdated, wxEVT_TEXT, wxCommandEvent ) -wxEVENT_RANGE_PROPERTY( TreeEvent, wxEVT_TREE_BEGIN_DRAG, \ - wxEVT_TREE_STATE_IMAGE_CLICK, wxTreeEvent ) - -wxPROPERTY_FLAGS( WindowStyle, wxTreeCtrlStyle, long, SetWindowStyleFlag, \ - GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \ - wxT("Helpstring"), wxT("group")) // style -wxEND_PROPERTIES_TABLE() - -wxEMPTY_HANDLERS_TABLE(wxTreeCtrl) - -wxCONSTRUCTOR_5( wxTreeCtrl, wxWindow*, Parent, wxWindowID, Id, \ - wxPoint, Position, wxSize, Size, long, WindowStyle ) - -// ---------------------------------------------------------------------------- -// Tree event -// ---------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxTreeEvent, wxNotifyEvent); - -wxTreeEvent::wxTreeEvent(wxEventType commandType, - wxTreeCtrlBase *tree, - const wxTreeItemId& item) - : wxNotifyEvent(commandType, tree->GetId()), - m_item(item) -{ - m_editCancelled = false; - - SetEventObject(tree); - - if ( item.IsOk() ) - SetClientObject(tree->GetItemData(item)); -} - -wxTreeEvent::wxTreeEvent(wxEventType commandType, int id) - : wxNotifyEvent(commandType, id) -{ - m_itemOld = 0l; - m_editCancelled = false; -} - -wxTreeEvent::wxTreeEvent(const wxTreeEvent & event) - : wxNotifyEvent(event) -{ - m_evtKey = event.m_evtKey; - m_item = event.m_item; - m_itemOld = event.m_itemOld; - m_pointDrag = event.m_pointDrag; - m_label = event.m_label; - m_editCancelled = event.m_editCancelled; -} - -// ---------------------------------------------------------------------------- -// wxTreeCtrlBase -// ---------------------------------------------------------------------------- - -wxTreeCtrlBase::wxTreeCtrlBase() -{ - m_imageListNormal = - m_imageListState = NULL; - m_ownsImageListNormal = - m_ownsImageListState = false; - - // arbitrary default - m_spacing = 18; - - // quick DoGetBestSize calculation - m_quickBestSize = true; - - Connect(wxEVT_CHAR_HOOK, wxKeyEventHandler(wxTreeCtrlBase::OnCharHook)); -} - -wxTreeCtrlBase::~wxTreeCtrlBase() -{ - if (m_ownsImageListNormal) - delete m_imageListNormal; - if (m_ownsImageListState) - delete m_imageListState; -} - -void wxTreeCtrlBase::SetItemState(const wxTreeItemId& item, int state) -{ - if ( state == wxTREE_ITEMSTATE_NEXT ) - { - int current = GetItemState(item); - if ( current == wxTREE_ITEMSTATE_NONE ) - return; - state = current + 1; - if ( m_imageListState && state >= m_imageListState->GetImageCount() ) - state = 0; - } - else if ( state == wxTREE_ITEMSTATE_PREV ) - { - int current = GetItemState(item); - if ( current == wxTREE_ITEMSTATE_NONE ) - return; - state = current - 1; - if ( state == -1 ) - state = m_imageListState ? m_imageListState->GetImageCount() - 1 : 0; - } - // else: wxTREE_ITEMSTATE_NONE depending on platform - - DoSetItemState(item, state); -} - -static void -wxGetBestTreeSize(const wxTreeCtrlBase* treeCtrl, wxTreeItemId id, wxSize& size) -{ - wxRect rect; - - if ( treeCtrl->GetBoundingRect(id, rect, true /* just the item */) ) - { - // Translate to logical position so we get the full extent -#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) - rect.x += treeCtrl->GetScrollPos(wxHORIZONTAL); - rect.y += treeCtrl->GetScrollPos(wxVERTICAL); -#endif - - size.IncTo(wxSize(rect.GetRight(), rect.GetBottom())); - } - - wxTreeItemIdValue cookie; - for ( wxTreeItemId item = treeCtrl->GetFirstChild(id, cookie); - item.IsOk(); - item = treeCtrl->GetNextChild(id, cookie) ) - { - wxGetBestTreeSize(treeCtrl, item, size); - } -} - -wxSize wxTreeCtrlBase::DoGetBestSize() const -{ - wxSize size; - - // this doesn't really compute the total bounding rectangle of all items - // but a not too bad guess of it which has the advantage of not having to - // examine all (potentially hundreds or thousands) items in the control - - if (GetQuickBestSize()) - { - for ( wxTreeItemId item = GetRootItem(); - item.IsOk(); - item = GetLastChild(item) ) - { - wxRect rect; - - // last parameter is "true" to get only the dimensions of the text - // label, we don't want to get the entire item width as it's determined - // by the current size - if ( GetBoundingRect(item, rect, true) ) - { - if ( size.x < rect.x + rect.width ) - size.x = rect.x + rect.width; - if ( size.y < rect.y + rect.height ) - size.y = rect.y + rect.height; - } - } - } - else // use precise, if potentially slow, size computation method - { - // iterate over all items recursively - wxTreeItemId idRoot = GetRootItem(); - if ( idRoot.IsOk() ) - wxGetBestTreeSize(this, idRoot, size); - } - - // need some minimal size even for empty tree - if ( !size.x || !size.y ) - size = wxControl::DoGetBestSize(); - else - { - // Add border size - size += GetWindowBorderSize(); - - CacheBestSize(size); - } - - return size; -} - -void wxTreeCtrlBase::ExpandAll() -{ - if ( IsEmpty() ) - return; - - ExpandAllChildren(GetRootItem()); -} - -void wxTreeCtrlBase::ExpandAllChildren(const wxTreeItemId& item) -{ - Freeze(); - // expand this item first, this might result in its children being added on - // the fly - if ( item != GetRootItem() || !HasFlag(wxTR_HIDE_ROOT) ) - Expand(item); - //else: expanding hidden root item is unsupported and unnecessary - - // then (recursively) expand all the children - wxTreeItemIdValue cookie; - for ( wxTreeItemId idCurr = GetFirstChild(item, cookie); - idCurr.IsOk(); - idCurr = GetNextChild(item, cookie) ) - { - ExpandAllChildren(idCurr); - } - Thaw(); -} - -void wxTreeCtrlBase::CollapseAll() -{ - if ( IsEmpty() ) - return; - - CollapseAllChildren(GetRootItem()); -} - -void wxTreeCtrlBase::CollapseAllChildren(const wxTreeItemId& item) -{ - Freeze(); - // first (recursively) collapse all the children - wxTreeItemIdValue cookie; - for ( wxTreeItemId idCurr = GetFirstChild(item, cookie); - idCurr.IsOk(); - idCurr = GetNextChild(item, cookie) ) - { - CollapseAllChildren(idCurr); - } - - // then collapse this element too unless it's the hidden root which can't - // be collapsed - if ( item != GetRootItem() || !HasFlag(wxTR_HIDE_ROOT) ) - Collapse(item); - Thaw(); -} - -bool wxTreeCtrlBase::IsEmpty() const -{ - return !GetRootItem().IsOk(); -} - -void wxTreeCtrlBase::OnCharHook(wxKeyEvent& event) -{ - if ( GetEditControl() ) - { - bool discardChanges = false; - switch ( event.GetKeyCode() ) - { - case WXK_ESCAPE: - discardChanges = true; - wxFALLTHROUGH; - - case WXK_RETURN: - EndEditLabel(GetFocusedItem(), discardChanges); - - // Do not call Skip() below. - return; - } - } - - event.Skip(); -} - -#endif // wxUSE_TREECTRL diff --git a/Externals/wxWidgets3/src/common/txtstrm.cpp b/Externals/wxWidgets3/src/common/txtstrm.cpp deleted file mode 100644 index 8c48cd6c77..0000000000 --- a/Externals/wxWidgets3/src/common/txtstrm.cpp +++ /dev/null @@ -1,678 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/txtstrm.cpp -// Purpose: Text stream classes -// Author: Guilhem Lavaux -// Modified by: -// Created: 28/06/98 -// Copyright: (c) Guilhem Lavaux -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_STREAMS - -#include "wx/txtstrm.h" - -#ifndef WX_PRECOMP - #include "wx/crt.h" -#endif - -#include - -// ---------------------------------------------------------------------------- -// wxTextInputStream -// ---------------------------------------------------------------------------- - -#if wxUSE_UNICODE -wxTextInputStream::wxTextInputStream(wxInputStream &s, - const wxString &sep, - const wxMBConv& conv) - : m_input(s), m_separators(sep), m_conv(conv.Clone()) -{ - memset((void*)m_lastBytes, 0, 10); - -#if SIZEOF_WCHAR_T == 2 - m_lastWChar = 0; -#endif // SIZEOF_WCHAR_T == 2 -} -#else -wxTextInputStream::wxTextInputStream(wxInputStream &s, const wxString &sep) - : m_input(s), m_separators(sep) -{ - memset((void*)m_lastBytes, 0, 10); -} -#endif - -wxTextInputStream::~wxTextInputStream() -{ -#if wxUSE_UNICODE - delete m_conv; -#endif // wxUSE_UNICODE -} - -void wxTextInputStream::UngetLast() -{ - size_t byteCount = 0; - while(m_lastBytes[byteCount]) // pseudo ANSI strlen (even for Unicode!) - byteCount++; - m_input.Ungetch(m_lastBytes, byteCount); - memset((void*)m_lastBytes, 0, 10); -} - -wxChar wxTextInputStream::NextChar() -{ -#if wxUSE_UNICODE -#if SIZEOF_WCHAR_T == 2 - // Return the already raed character remaining from the last call to this - // function, if any. - if ( m_lastWChar ) - { - const wxChar wc = m_lastWChar; - m_lastWChar = 0; - return wc; - } -#endif // !SWIG_ONLY_SCRIPT_API - - wxChar wbuf[2]; - memset((void*)m_lastBytes, 0, 10); - for(size_t inlen = 0; inlen < 9; inlen++) - { - // actually read the next character - m_lastBytes[inlen] = m_input.GetC(); - - if(m_input.LastRead() <= 0) - return wxEOT; - - switch ( m_conv->ToWChar(wbuf, WXSIZEOF(wbuf), m_lastBytes, inlen + 1) ) - { - case 0: - // this is a bug in converter object as it should either fail - // or decode non-empty string to something non-empty - wxFAIL_MSG("ToWChar() can't return 0 for non-empty input"); - break; - - case wxCONV_FAILED: - // the buffer probably doesn't contain enough bytes to decode - // as a complete character, try with more bytes - break; - - default: - // if we couldn't decode a single character during the last - // loop iteration we shouldn't be able to decode 2 or more of - // them with an extra single byte, something fishy is going on - // (except if we use UTF-16, see below) - wxFAIL_MSG("unexpected decoding result"); - return wxEOT; - -#if SIZEOF_WCHAR_T == 2 - case 2: - // When wchar_t uses UTF-16, we could have decoded a single - // Unicode code point as 2 wchar_t characters and there is - // nothing else to do here but to return the first one now and - // remember the second one for the next call, as there is no - // way to fit both of them into a single wxChar in this case. - m_lastWChar = wbuf[1]; -#endif // !SWIG_ONLY_SCRIPT_API - wxFALLTHROUGH; - - case 1: - - // we finally decoded a character - return wbuf[0]; - } - } - - // there should be no encoding which requires more than nine bytes for one - // character so something must be wrong with our conversion but we have no - // way to signal it from here - return wxEOT; -#else - m_lastBytes[0] = m_input.GetC(); - - if(m_input.LastRead() <= 0) - return wxEOT; - - return m_lastBytes[0]; -#endif - -} - -wxChar wxTextInputStream::NextNonSeparators() -{ - for (;;) - { - wxChar c = NextChar(); - if (c == wxEOT) return (wxChar) 0; - - if (c != wxT('\n') && - c != wxT('\r') && - m_separators.Find(c) < 0) - return c; - } - -} - -bool wxTextInputStream::EatEOL(const wxChar &c) -{ - if (c == wxT('\n')) return true; // eat on UNIX - - if (c == wxT('\r')) // eat on both Mac and DOS - { - wxChar c2 = NextChar(); - if(c2 == wxEOT) return true; // end of stream reached, had enough :-) - - if (c2 != wxT('\n')) UngetLast(); // Don't eat on Mac - return true; - } - - return false; -} - -wxUint64 wxTextInputStream::Read64(int base) -{ - wxASSERT_MSG( !base || (base > 1 && base <= 36), wxT("invalid base") ); - if(!m_input) return 0; - - wxString word = ReadWord(); - if(word.empty()) - return 0; - - wxUint64 res; - if(!word.ToULongLong(&res, base)) - return 0; - return res; -} - -wxUint32 wxTextInputStream::Read32(int base) -{ - wxASSERT_MSG( !base || (base > 1 && base <= 36), wxT("invalid base") ); - if(!m_input) return 0; - - wxString word = ReadWord(); - if(word.empty()) - return 0; - return wxStrtoul(word.c_str(), 0, base); -} - -wxUint16 wxTextInputStream::Read16(int base) -{ - return (wxUint16)Read32(base); -} - -wxUint8 wxTextInputStream::Read8(int base) -{ - return (wxUint8)Read32(base); -} - -wxInt64 wxTextInputStream::Read64S(int base) -{ - wxASSERT_MSG( !base || (base > 1 && base <= 36), wxT("invalid base") ); - if(!m_input) return 0; - - wxString word = ReadWord(); - if(word.empty()) - return 0; - - wxInt64 res; - if(!word.ToLongLong(&res, base)) - return 0; - return res; -} - -wxInt32 wxTextInputStream::Read32S(int base) -{ - wxASSERT_MSG( !base || (base > 1 && base <= 36), wxT("invalid base") ); - if(!m_input) return 0; - - wxString word = ReadWord(); - if(word.empty()) - return 0; - return wxStrtol(word.c_str(), 0, base); -} - -wxInt16 wxTextInputStream::Read16S(int base) -{ - return (wxInt16)Read32S(base); -} - -wxInt8 wxTextInputStream::Read8S(int base) -{ - return (wxInt8)Read32S(base); -} - -double wxTextInputStream::ReadDouble() -{ - if(!m_input) return 0; - wxString word = ReadWord(); - if(word.empty()) - return 0; - return wxStrtod(word.c_str(), 0); -} - -wxString wxTextInputStream::ReadLine() -{ - wxString line; - - while ( !m_input.Eof() ) - { - wxChar c = NextChar(); - if(c == wxEOT) - break; - - if (EatEOL(c)) - break; - - line += c; - } - - return line; -} - -wxString wxTextInputStream::ReadWord() -{ - wxString word; - - if ( !m_input ) - return word; - - wxChar c = NextNonSeparators(); - if ( !c ) - return word; - - word += c; - - while ( !m_input.Eof() ) - { - c = NextChar(); - if(c == wxEOT) - break; - - if (m_separators.Find(c) >= 0) - break; - - if (EatEOL(c)) - break; - - word += c; - } - - return word; -} - -wxTextInputStream& wxTextInputStream::operator>>(wxString& word) -{ - word = ReadWord(); - return *this; -} - -wxTextInputStream& wxTextInputStream::operator>>(char& c) -{ - c = m_input.GetC(); - if(m_input.LastRead() <= 0) c = 0; - - if (EatEOL(c)) - c = '\n'; - - return *this; -} - -#if wxUSE_UNICODE && wxWCHAR_T_IS_REAL_TYPE - -wxTextInputStream& wxTextInputStream::operator>>(wchar_t& wc) -{ - wc = GetChar(); - - return *this; -} - -#endif // wxUSE_UNICODE - -wxTextInputStream& wxTextInputStream::operator>>(wxInt16& i) -{ - i = Read16S(); - return *this; -} - -wxTextInputStream& wxTextInputStream::operator>>(wxInt32& i) -{ - i = Read32S(); - return *this; -} - -wxTextInputStream& wxTextInputStream::operator>>(wxInt64& i) -{ - i = Read64S(); - return *this; -} - -wxTextInputStream& wxTextInputStream::operator>>(wxUint16& i) -{ - i = Read16(); - return *this; -} - -wxTextInputStream& wxTextInputStream::operator>>(wxUint32& i) -{ - i = Read32(); - return *this; -} - -wxTextInputStream& wxTextInputStream::operator>>(wxUint64& i) -{ - i = Read64(); - return *this; -} - -wxTextInputStream& wxTextInputStream::operator>>(double& i) -{ - i = ReadDouble(); - return *this; -} - -wxTextInputStream& wxTextInputStream::operator>>(float& f) -{ - f = (float)ReadDouble(); - return *this; -} - - - -#if wxUSE_UNICODE -wxTextOutputStream::wxTextOutputStream(wxOutputStream& s, - wxEOL mode, - const wxMBConv& conv) - : m_output(s), m_conv(conv.Clone()) -#else -wxTextOutputStream::wxTextOutputStream(wxOutputStream& s, wxEOL mode) - : m_output(s) -#endif -{ - m_mode = mode; - if (m_mode == wxEOL_NATIVE) - { -#if defined(__WINDOWS__) - m_mode = wxEOL_DOS; -#else - m_mode = wxEOL_UNIX; -#endif - } - -#if wxUSE_UNICODE && SIZEOF_WCHAR_T == 2 - m_lastWChar = 0; -#endif // SIZEOF_WCHAR_T == 2 -} - -wxTextOutputStream::~wxTextOutputStream() -{ -#if wxUSE_UNICODE - delete m_conv; -#endif // wxUSE_UNICODE -} - -void wxTextOutputStream::SetMode(wxEOL mode) -{ - m_mode = mode; - if (m_mode == wxEOL_NATIVE) - { -#if defined(__WINDOWS__) - m_mode = wxEOL_DOS; -#else - m_mode = wxEOL_UNIX; -#endif - } -} - -void wxTextOutputStream::Write64(wxUint64 i) -{ - WriteString(wxString::Format("%" wxLongLongFmtSpec "u", i)); -} - -void wxTextOutputStream::Write32(wxUint32 i) -{ - wxString str; - str.Printf(wxT("%u"), i); - - WriteString(str); -} - -void wxTextOutputStream::Write16(wxUint16 i) -{ - wxString str; - str.Printf(wxT("%u"), (unsigned)i); - - WriteString(str); -} - -void wxTextOutputStream::Write8(wxUint8 i) -{ - wxString str; - str.Printf(wxT("%u"), (unsigned)i); - - WriteString(str); -} - -void wxTextOutputStream::WriteDouble(double d) -{ - wxString str; - - str.Printf(wxT("%f"), d); - WriteString(str); -} - -void wxTextOutputStream::WriteString(const wxString& string) -{ - size_t len = string.length(); - - wxString out; - out.reserve(len); - - for ( size_t i = 0; i < len; i++ ) - { - const wxChar c = string[i]; - if ( c == wxT('\n') ) - { - switch ( m_mode ) - { - case wxEOL_DOS: - out << wxT("\r\n"); - continue; - - case wxEOL_MAC: - out << wxT('\r'); - continue; - - default: - wxFAIL_MSG( wxT("unknown EOL mode in wxTextOutputStream") ); - wxFALLTHROUGH; - - case wxEOL_UNIX: - // don't treat '\n' specially - ; - } - } - - out << c; - } - -#if wxUSE_UNICODE - // FIXME-UTF8: use wxCharBufferWithLength if/when we have it - wxCharBuffer buffer = m_conv->cWC2MB(out.wc_str(), out.length(), &len); - m_output.Write(buffer, len); -#else - m_output.Write(out.c_str(), out.length() ); -#endif -} - -wxTextOutputStream& wxTextOutputStream::PutChar(wxChar c) -{ -#if wxUSE_UNICODE -#if SIZEOF_WCHAR_T == 2 - wxCharBuffer buffer; - size_t len; - if ( m_lastWChar ) - { - wxChar buf[2]; - buf[0] = m_lastWChar; - buf[1] = c; - buffer = m_conv->cWC2MB(buf, WXSIZEOF(buf), &len); - m_lastWChar = 0; - } - else - { - buffer = m_conv->cWC2MB(&c, 1, &len); - } - - if ( !len ) - { - // Conversion failed, possibly because we have the first half of a - // surrogate character, so just store it and write it out when the - // second half is written to the stream too later. - // - // Notice that if we already had had a valid m_lastWChar, it is simply - // discarded here which is very bad, but there is no way to signal an - // error from here and this is not worse than the old code behaviour. - m_lastWChar = c; - } - else - { - for ( size_t n = 0; n < len; n++ ) - { - const char c2 = buffer[n]; - if ( c2 == '\n' ) - { - switch ( m_mode ) - { - case wxEOL_DOS: - m_output.Write("\r\n", 2); - continue; - - case wxEOL_MAC: - m_output.Write("\r", 1); - continue; - - default: - wxFAIL_MSG( wxT("unknown EOL mode in wxTextOutputStream") ); - wxFALLTHROUGH; - - case wxEOL_UNIX: - // don't treat '\n' specially - ; - } - } - - m_output.Write(&c2, 1); - } - } -#else // SIZEOF_WCHAR_T == 4 - WriteString( wxString(&c, *m_conv, 1) ); -#endif // SIZEOF_WCHAR_T == 2 or 4 -#else - WriteString( wxString(&c, wxConvLocal, 1) ); -#endif - return *this; -} - -void wxTextOutputStream::Flush() -{ -#if wxUSE_UNICODE - const size_t len = m_conv->FromWChar(NULL, 0, L"", 1); - if ( len > m_conv->GetMBNulLen() ) - { - wxCharBuffer buf(len); - m_conv->FromWChar(buf.data(), len, L"", 1); - m_output.Write(buf, len - m_conv->GetMBNulLen()); - } -#endif // wxUSE_UNICODE -} - -wxTextOutputStream& wxTextOutputStream::operator<<(const wxString& string) -{ - WriteString( string ); - return *this; -} - -wxTextOutputStream& wxTextOutputStream::operator<<(char c) -{ - WriteString( wxString::FromAscii(c) ); - - return *this; -} - -#if wxUSE_UNICODE && wxWCHAR_T_IS_REAL_TYPE - -wxTextOutputStream& wxTextOutputStream::operator<<(wchar_t wc) -{ - PutChar(wc); - - return *this; -} - -#endif // wxUSE_UNICODE - -wxTextOutputStream& wxTextOutputStream::operator<<(wxInt16 c) -{ - Write(c); - - return *this; -} - -wxTextOutputStream& wxTextOutputStream::operator<<(wxInt32 c) -{ - Write(c); - - return *this; -} - -wxTextOutputStream& wxTextOutputStream::operator<<(wxInt64 c) -{ - Write(c); - - return *this; -} - -wxTextOutputStream& wxTextOutputStream::operator<<(wxUint16 c) -{ - Write(c); - - return *this; -} - -wxTextOutputStream& wxTextOutputStream::operator<<(wxUint32 c) -{ - Write(c); - - return *this; -} - -wxTextOutputStream& wxTextOutputStream::operator<<(wxUint64 c) -{ - Write(c); - - return *this; -} - -wxTextOutputStream &wxTextOutputStream::operator<<(double f) -{ - Write(f); - return *this; -} - -wxTextOutputStream& wxTextOutputStream::operator<<(float f) -{ - Write(f); - return *this; -} - -wxTextOutputStream &endl( wxTextOutputStream &stream ) -{ - return stream.PutChar(wxT('\n')); -} - -#endif - // wxUSE_STREAMS diff --git a/Externals/wxWidgets3/src/common/uiactioncmn.cpp b/Externals/wxWidgets3/src/common/uiactioncmn.cpp deleted file mode 100644 index a74a0d10ec..0000000000 --- a/Externals/wxWidgets3/src/common/uiactioncmn.cpp +++ /dev/null @@ -1,210 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/uiactioncmn.cpp -// Purpose: wxUIActionSimulator common implementation -// Author: Kevin Ollivier, Steven Lamerton, Vadim Zeitlin -// Modified by: -// Created: 2010-03-06 -// Copyright: (c) Kevin Ollivier -// (c) 2010 Steven Lamerton -// (c) 2010 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#include "wx/wxprec.h" - -#if wxUSE_UIACTIONSIMULATOR - -#include "wx/uiaction.h" - -#include "wx/ctrlsub.h" - -#ifdef wxNO_RTTI - #include "wx/choice.h" - #include "wx/combobox.h" - #include "wx/listbox.h" -#endif // wxNO_RTTI - - -bool wxUIActionSimulator::MouseClick(int button) -{ - MouseDown(button); - MouseUp(button); - - return true; -} - -#ifndef __WXOSX__ - -bool wxUIActionSimulator::MouseDblClick(int button) -{ - MouseDown(button); - MouseUp(button); - MouseDown(button); - MouseUp(button); - - return true; -} - -bool wxUIActionSimulator::MouseDragDrop(long x1, long y1, long x2, long y2, - int button) -{ - MouseMove(x1, y1); - MouseDown(button); - MouseMove(x2, y2); - MouseUp(button); - - return true; -} - -#endif - -bool -wxUIActionSimulator::Key(int keycode, int modifiers, bool isDown) -{ - wxASSERT_MSG( !(modifiers & wxMOD_META ), - "wxMOD_META is not implemented" ); - wxASSERT_MSG( !(modifiers & wxMOD_WIN ), - "wxMOD_WIN is not implemented" ); - - if ( isDown ) - SimulateModifiers(modifiers, true); - - bool rc = DoKey(keycode, modifiers, isDown); - - if ( !isDown ) - SimulateModifiers(modifiers, false); - - return rc; -} - -void wxUIActionSimulator::SimulateModifiers(int modifiers, bool isDown) -{ - if ( modifiers & wxMOD_SHIFT ) - DoKey(WXK_SHIFT, modifiers, isDown); - if ( modifiers & wxMOD_ALT ) - DoKey(WXK_ALT, modifiers, isDown); - if ( modifiers & wxMOD_CONTROL ) - DoKey(WXK_CONTROL, modifiers, isDown); -} - -bool wxUIActionSimulator::Char(int keycode, int modifiers) -{ - Key(keycode, modifiers, true); - Key(keycode, modifiers, false); - - return true; -} - -// Helper function checking if a key must be entered with Shift pressed. If it -// must, returns true and modifies the key to contain the unshifted version. -// -// This currently works only for the standard US keyboard layout which is -// definitely not ideal, but better than nothing... -static bool MapUnshifted(char& ch) -{ - const char* const unshifted = - "`1234567890-=\\" - "[]" - ";'" - ",./" - ; - - const char* const shifted = - "~!@#$%^&*()_+|" - "{}" - ":\"" - "<>?" - ; - - wxCOMPILE_TIME_ASSERT( sizeof(unshifted) == sizeof(shifted), - ShiftedUnshiftedKeysMismatch ); - - const char* const p = strchr(shifted, ch); - if ( !p ) - return false; - - ch = *(unshifted + (p - shifted)); - - return true; -} - -bool wxUIActionSimulator::Text(const char *s) -{ - while ( *s != '\0' ) - { - char ch = *s++; - - // Map the keys that must be entered with Shift modifier to their - // unshifted counterparts. - int modifiers = 0; - if ( isupper(ch) || MapUnshifted(ch) ) - modifiers |= wxMOD_SHIFT; - - if ( !Char(ch, modifiers) ) - return false; - } - - return true; -} - -bool wxUIActionSimulator::Select(const wxString& text) -{ - wxWindow* const focus = wxWindow::FindFocus(); - if ( !focus ) - return false; - - // We can only select something in controls inheriting from - // wxItemContainer, so check that we have it. -#ifdef wxNO_RTTI - wxItemContainer* container = NULL; - - if ( wxComboBox* combo = wxDynamicCast(focus, wxComboBox) ) - container = combo; - else if ( wxChoice* choice = wxDynamicCast(focus, wxChoice) ) - container = choice; - else if ( wxListBox* listbox = wxDynamicCast(focus, wxListBox) ) - container = listbox; -#else // !wxNO_RTTI - wxItemContainer* const container = dynamic_cast(focus); -#endif // wxNO_RTTI/!wxNO_RTTI - - if ( !container ) - return false; - - // We prefer to exactly emulate what a (keyboard) user would do, so prefer - // to emulate selecting the first item of the control if possible (this - // works with wxChoice, wxListBox and wxComboBox with wxCB_READONLY style - // under MSW). - if ( container->GetSelection() != 0 ) - { - Char(WXK_HOME); - wxYield(); - - // But if this didn't work, set the selection programmatically. - if ( container->GetSelection() != 0 ) - container->SetSelection(0); - } - - // And then go down in the control until we reach the item we want. - for ( ;; ) - { - if ( container->GetStringSelection() == text ) - return true; - - // We could test if the selection becomes equal to its maximal value - // (i.e. GetCount() - 1), but if, for some reason, pressing WXK_DOWN - // doesn't move it, this would still result in an infinite loop, so - // check that the selection changed for additional safety. - const int current = container->GetSelection(); - - Char(WXK_DOWN); - wxYield(); - - if ( container->GetSelection() == current ) - break; - } - - return false; -} - -#endif // wxUSE_UIACTIONSIMULATOR diff --git a/Externals/wxWidgets3/src/common/unichar.cpp b/Externals/wxWidgets3/src/common/unichar.cpp deleted file mode 100644 index de95fcd001..0000000000 --- a/Externals/wxWidgets3/src/common/unichar.cpp +++ /dev/null @@ -1,183 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/unichar.cpp -// Purpose: wxUniChar and wxUniCharRef classes -// Author: Vaclav Slavik -// Created: 2007-03-19 -// Copyright: (c) 2007 REA Elektronik GmbH -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// =========================================================================== -// headers -// =========================================================================== - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#ifndef WX_PRECOMP - #include "wx/strconv.h" // wxConvLibc - #include "wx/log.h" -#endif - -#include "wx/unichar.h" -#include "wx/string.h" - -// =========================================================================== -// implementation -// =========================================================================== - -// --------------------------------------------------------------------------- -// wxUniChar -// --------------------------------------------------------------------------- - -/* static */ -wxUniChar::value_type wxUniChar::FromHi8bit(char c) -{ -#if wxUSE_UTF8_LOCALE_ONLY - wxFAIL_MSG( "invalid UTF-8 character" ); - wxUnusedVar(c); - - return wxT('?'); // FIXME-UTF8: what to use as failure character? -#else - char cbuf[2]; - cbuf[0] = c; - cbuf[1] = '\0'; - wchar_t wbuf[2]; - if ( wxConvLibc.ToWChar(wbuf, 2, cbuf, 2) != 2 ) - { - wxFAIL_MSG( "invalid multibyte character" ); - return wxT('?'); // FIXME-UTF8: what to use as failure character? - } - return wbuf[0]; -#endif -} - -/* static */ -char wxUniChar::ToHi8bit(wxUniChar::value_type v) -{ - char c; - if ( !GetAsHi8bit(v, &c) ) - { - wxFAIL_MSG( "character cannot be converted to single byte" ); - c = '?'; // FIXME-UTF8: what to use as failure character? - } - - return c; -} - -/* static */ -bool wxUniChar::GetAsHi8bit(value_type v, char *c) -{ - wchar_t wbuf[2]; - wbuf[0] = v; - wbuf[1] = L'\0'; - char cbuf[2]; - if ( wxConvLibc.FromWChar(cbuf, 2, wbuf, 2) != 2 ) - return false; - - *c = cbuf[0]; - return true; -} - -// --------------------------------------------------------------------------- -// wxUniCharRef -// --------------------------------------------------------------------------- - -#if wxUSE_UNICODE_UTF8 -wxUniChar wxUniCharRef::UniChar() const -{ - return wxStringOperations::DecodeChar(m_pos); -} - -wxUniCharRef& wxUniCharRef::operator=(const wxUniChar& c) -{ - wxStringOperations::Utf8CharBuffer utf(wxStringOperations::EncodeChar(c)); - size_t lenOld = wxStringOperations::GetUtf8CharLength(*m_pos); - size_t lenNew = wxStringOperations::GetUtf8CharLength(utf[0]); - - if ( lenNew == lenOld ) - { - // this is the simpler case: if the new value's UTF-8 code has the - // same length, we can just replace it: - - iterator pos(m_pos); - for ( size_t i = 0; i < lenNew; ++i, ++pos ) - *pos = utf[i]; - } - else // length of character encoding in UTF-8 changed - { - // the worse case is when the new value has either longer or shorter - // code -- in that case, we have to use wxStringImpl::replace() and - // this invalidates all iterators, so we have to update them too: - - wxStringImpl& strimpl = m_str.m_impl; - - int iterDiff = lenNew - lenOld; - size_t posIdx = m_pos - strimpl.begin(); - - // compute positions of outstanding iterators for this string after the - // replacement is done (there is only a small number of iterators at - // any time, so we use an array on the stack to avoid unneeded - // allocation): - static const size_t STATIC_SIZE = 32; - size_t indexes_a[STATIC_SIZE]; - size_t *indexes = indexes_a; - size_t iterNum = 0; - wxStringIteratorNode *it; - for ( it = m_str.m_iterators.ptr; it; it = it->m_next, ++iterNum ) - { - wxASSERT( it->m_iter || it->m_citer ); - - if ( iterNum == STATIC_SIZE ) - { - wxLogTrace( wxT("utf8"), wxT("unexpectedly many iterators") ); - - size_t total = iterNum + 1; - for ( wxStringIteratorNode *it2 = it; it2; it2 = it2->m_next ) - total++; - indexes = new size_t[total]; - memcpy(indexes, indexes_a, sizeof(size_t) * STATIC_SIZE); - } - - size_t idx = it->m_iter - ? (*it->m_iter - strimpl.begin()) - : (*it->m_citer - strimpl.begin()); - - if ( idx > posIdx ) - idx += iterDiff; - - indexes[iterNum] = idx; - } - - // update the string: - strimpl.replace(m_pos, m_pos + lenOld, utf, lenNew); - -#if wxUSE_STRING_POS_CACHE - m_str.InvalidateCache(); -#endif // wxUSE_STRING_POS_CACHE - - // finally, set the iterators to valid values again (note that this - // updates m_pos as well): - size_t i; - for ( i = 0, it = m_str.m_iterators.ptr; it; it = it->m_next, ++i ) - { - wxASSERT( i < iterNum ); - wxASSERT( it->m_iter || it->m_citer ); - - if ( it->m_iter ) - *it->m_iter = strimpl.begin() + indexes[i]; - else // it->m_citer - *it->m_citer = strimpl.begin() + indexes[i]; - } - - if ( indexes != indexes_a ) - delete[] indexes; - } - - return *this; -} -#endif // wxUSE_UNICODE_UTF8 diff --git a/Externals/wxWidgets3/src/common/unictabl.inc b/Externals/wxWidgets3/src/common/unictabl.inc deleted file mode 100644 index 2993424abc..0000000000 --- a/Externals/wxWidgets3/src/common/unictabl.inc +++ /dev/null @@ -1,897 +0,0 @@ - - -/* - * This file is #included by encconv.cpp - * - * - * *** *** CAUTION! *** *** - * Do not modify this file by hand! It is generated by shell - * script $(WXWIN)/misc/unictabl/regenerate - * - * Parts of this file are based on tables published by Unicode, Inc. - * Original tables are freely available at - * ftp://ftp.unicode.org/Public/MAPPINGS - * - * Original copyright info as present in mapping tables follows: - * - * - * Copyright (c) 1991-1999 Unicode, Inc. All Rights reserved. - * - * This file is provided as-is by Unicode, Inc. (The Unicode Consortium). - * No claims are made as to fitness for any particular purpose. No - * warranties of any kind are expressed or implied. The recipient - * agrees to determine applicability of information provided. If this - * file has been provided on optical media by Unicode, Inc., the sole - * remedy for any claim will be exchange of defective media within 90 - * days of receipt. - * - * Unicode, Inc. hereby grants the right to freely use the information - * supplied in this file in the creation of products supporting the - * Unicode Standard, and to make copies of this file in any form for - * internal or external distribution as long as this notice remains - * attached. - */ - - - - -/* - * ISO8859_1 to Unicode recoding table - * based on file mappings/8859-1.TXT by Unicode Consortium - */ - -static const wxUint16 encoding_table__ISO8859_1[128] = { - 0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, - 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F, - 0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, - 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F, - 0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7, - 0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF, - 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7, - 0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF, - 0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7, - 0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF, - 0x00D0, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7, - 0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x00DD, 0x00DE, 0x00DF, - 0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7, - 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF, - 0x00F0, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7, - 0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x00FF - }; - - -/* - * ISO8859_10 to Unicode recoding table - * based on file mappings/8859-10.TXT by Unicode Consortium - */ - -static const wxUint16 encoding_table__ISO8859_10[128] = { - 0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, - 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F, - 0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, - 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F, - 0x00A0, 0x0104, 0x0112, 0x0122, 0x012A, 0x0128, 0x0136, 0x00A7, - 0x013B, 0x0110, 0x0160, 0x0166, 0x017D, 0x00AD, 0x016A, 0x014A, - 0x00B0, 0x0105, 0x0113, 0x0123, 0x012B, 0x0129, 0x0137, 0x00B7, - 0x013C, 0x0111, 0x0161, 0x0167, 0x017E, 0x2015, 0x016B, 0x014B, - 0x0100, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x012E, - 0x010C, 0x00C9, 0x0118, 0x00CB, 0x0116, 0x00CD, 0x00CE, 0x00CF, - 0x00D0, 0x0145, 0x014C, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x0168, - 0x00D8, 0x0172, 0x00DA, 0x00DB, 0x00DC, 0x00DD, 0x00DE, 0x00DF, - 0x0101, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x012F, - 0x010D, 0x00E9, 0x0119, 0x00EB, 0x0117, 0x00ED, 0x00EE, 0x00EF, - 0x00F0, 0x0146, 0x014D, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x0169, - 0x00F8, 0x0173, 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x0138 - }; - - -/* - * ISO8859_13 to Unicode recoding table - * based on file mappings/8859-13.TXT by Unicode Consortium - */ - -static const wxUint16 encoding_table__ISO8859_13[128] = { - 0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, - 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F, - 0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, - 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F, - 0x00A0, 0x201D, 0x00A2, 0x00A3, 0x00A4, 0x201E, 0x00A6, 0x00A7, - 0x00D8, 0x00A9, 0x0156, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00C6, - 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x201C, 0x00B5, 0x00B6, 0x00B7, - 0x00F8, 0x00B9, 0x0157, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00E6, - 0x0104, 0x012E, 0x0100, 0x0106, 0x00C4, 0x00C5, 0x0118, 0x0112, - 0x010C, 0x00C9, 0x0179, 0x0116, 0x0122, 0x0136, 0x012A, 0x013B, - 0x0160, 0x0143, 0x0145, 0x00D3, 0x014C, 0x00D5, 0x00D6, 0x00D7, - 0x0172, 0x0141, 0x015A, 0x016A, 0x00DC, 0x017B, 0x017D, 0x00DF, - 0x0105, 0x012F, 0x0101, 0x0107, 0x00E4, 0x00E5, 0x0119, 0x0113, - 0x010D, 0x00E9, 0x017A, 0x0117, 0x0123, 0x0137, 0x012B, 0x013C, - 0x0161, 0x0144, 0x0146, 0x00F3, 0x014D, 0x00F5, 0x00F6, 0x00F7, - 0x0173, 0x0142, 0x015B, 0x016B, 0x00FC, 0x017C, 0x017E, 0x2019 - }; - - -/* - * ISO8859_14 to Unicode recoding table - * based on file mappings/8859-14.TXT by Unicode Consortium - */ - -static const wxUint16 encoding_table__ISO8859_14[128] = { - 0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, - 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F, - 0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, - 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F, - 0x00A0, 0x1E02, 0x1E03, 0x00A3, 0x010A, 0x010B, 0x1E0A, 0x00A7, - 0x1E80, 0x00A9, 0x1E82, 0x1E0B, 0x1EF2, 0x00AD, 0x00AE, 0x0178, - 0x1E1E, 0x1E1F, 0x0120, 0x0121, 0x1E40, 0x1E41, 0x00B6, 0x1E56, - 0x1E81, 0x1E57, 0x1E83, 0x1E60, 0x1EF3, 0x1E84, 0x1E85, 0x1E61, - 0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7, - 0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF, - 0x0174, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x1E6A, - 0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x00DD, 0x0176, 0x00DF, - 0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7, - 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF, - 0x0175, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x1E6B, - 0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x0177, 0x00FF - }; - - -/* - * ISO8859_15 to Unicode recoding table - * based on file mappings/8859-15.TXT by Unicode Consortium - */ - -static const wxUint16 encoding_table__ISO8859_15[128] = { - 0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, - 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F, - 0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, - 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F, - 0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x20AC, 0x00A5, 0x0160, 0x00A7, - 0x0161, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF, - 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x017D, 0x00B5, 0x00B6, 0x00B7, - 0x017E, 0x00B9, 0x00BA, 0x00BB, 0x0152, 0x0153, 0x0178, 0x00BF, - 0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7, - 0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF, - 0x00D0, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7, - 0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x00DD, 0x00DE, 0x00DF, - 0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7, - 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF, - 0x00F0, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7, - 0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x00FF - }; - - -/* - * ISO8859_2 to Unicode recoding table - * based on file mappings/8859-2.TXT by Unicode Consortium - */ - -static const wxUint16 encoding_table__ISO8859_2[128] = { - 0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, - 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F, - 0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, - 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F, - 0x00A0, 0x0104, 0x02D8, 0x0141, 0x00A4, 0x013D, 0x015A, 0x00A7, - 0x00A8, 0x0160, 0x015E, 0x0164, 0x0179, 0x00AD, 0x017D, 0x017B, - 0x00B0, 0x0105, 0x02DB, 0x0142, 0x00B4, 0x013E, 0x015B, 0x02C7, - 0x00B8, 0x0161, 0x015F, 0x0165, 0x017A, 0x02DD, 0x017E, 0x017C, - 0x0154, 0x00C1, 0x00C2, 0x0102, 0x00C4, 0x0139, 0x0106, 0x00C7, - 0x010C, 0x00C9, 0x0118, 0x00CB, 0x011A, 0x00CD, 0x00CE, 0x010E, - 0x0110, 0x0143, 0x0147, 0x00D3, 0x00D4, 0x0150, 0x00D6, 0x00D7, - 0x0158, 0x016E, 0x00DA, 0x0170, 0x00DC, 0x00DD, 0x0162, 0x00DF, - 0x0155, 0x00E1, 0x00E2, 0x0103, 0x00E4, 0x013A, 0x0107, 0x00E7, - 0x010D, 0x00E9, 0x0119, 0x00EB, 0x011B, 0x00ED, 0x00EE, 0x010F, - 0x0111, 0x0144, 0x0148, 0x00F3, 0x00F4, 0x0151, 0x00F6, 0x00F7, - 0x0159, 0x016F, 0x00FA, 0x0171, 0x00FC, 0x00FD, 0x0163, 0x02D9 - }; - - -/* - * ISO8859_3 to Unicode recoding table - * based on file mappings/8859-3.TXT by Unicode Consortium - */ - -static const wxUint16 encoding_table__ISO8859_3[128] = { - 0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, - 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F, - 0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, - 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F, - 0x00A0, 0x0126, 0x02D8, 0x00A3, 0x00A4, 0x0000, 0x0124, 0x00A7, - 0x00A8, 0x0130, 0x015E, 0x011E, 0x0134, 0x00AD, 0x0000, 0x017B, - 0x00B0, 0x0127, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x0125, 0x00B7, - 0x00B8, 0x0131, 0x015F, 0x011F, 0x0135, 0x00BD, 0x0000, 0x017C, - 0x00C0, 0x00C1, 0x00C2, 0x0000, 0x00C4, 0x010A, 0x0108, 0x00C7, - 0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF, - 0x0000, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x0120, 0x00D6, 0x00D7, - 0x011C, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x016C, 0x015C, 0x00DF, - 0x00E0, 0x00E1, 0x00E2, 0x0000, 0x00E4, 0x010B, 0x0109, 0x00E7, - 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF, - 0x0000, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x0121, 0x00F6, 0x00F7, - 0x011D, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x016D, 0x015D, 0x02D9 - }; - - -/* - * ISO8859_4 to Unicode recoding table - * based on file mappings/8859-4.TXT by Unicode Consortium - */ - -static const wxUint16 encoding_table__ISO8859_4[128] = { - 0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, - 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F, - 0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, - 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F, - 0x00A0, 0x0104, 0x0138, 0x0156, 0x00A4, 0x0128, 0x013B, 0x00A7, - 0x00A8, 0x0160, 0x0112, 0x0122, 0x0166, 0x00AD, 0x017D, 0x00AF, - 0x00B0, 0x0105, 0x02DB, 0x0157, 0x00B4, 0x0129, 0x013C, 0x02C7, - 0x00B8, 0x0161, 0x0113, 0x0123, 0x0167, 0x014A, 0x017E, 0x014B, - 0x0100, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x012E, - 0x010C, 0x00C9, 0x0118, 0x00CB, 0x0116, 0x00CD, 0x00CE, 0x012A, - 0x0110, 0x0145, 0x014C, 0x0136, 0x00D4, 0x00D5, 0x00D6, 0x00D7, - 0x00D8, 0x0172, 0x00DA, 0x00DB, 0x00DC, 0x0168, 0x016A, 0x00DF, - 0x0101, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x012F, - 0x010D, 0x00E9, 0x0119, 0x00EB, 0x0117, 0x00ED, 0x00EE, 0x012B, - 0x0111, 0x0146, 0x014D, 0x0137, 0x00F4, 0x00F5, 0x00F6, 0x00F7, - 0x00F8, 0x0173, 0x00FA, 0x00FB, 0x00FC, 0x0169, 0x016B, 0x02D9 - }; - - -/* - * ISO8859_5 to Unicode recoding table - * based on file mappings/8859-5.TXT by Unicode Consortium - */ - -static const wxUint16 encoding_table__ISO8859_5[128] = { - 0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, - 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F, - 0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, - 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F, - 0x00A0, 0x0401, 0x0402, 0x0403, 0x0404, 0x0405, 0x0406, 0x0407, - 0x0408, 0x0409, 0x040A, 0x040B, 0x040C, 0x00AD, 0x040E, 0x040F, - 0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417, - 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F, - 0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427, - 0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E, 0x042F, - 0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437, - 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F, - 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447, - 0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x044F, - 0x2116, 0x0451, 0x0452, 0x0453, 0x0454, 0x0455, 0x0456, 0x0457, - 0x0458, 0x0459, 0x045A, 0x045B, 0x045C, 0x00A7, 0x045E, 0x045F - }; - - -/* - * ISO8859_6 to Unicode recoding table - * based on file mappings/8859-6.TXT by Unicode Consortium - */ - -static const wxUint16 encoding_table__ISO8859_6[128] = { - 0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, - 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F, - 0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, - 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F, - 0x00A0, 0x0000, 0x0000, 0x0000, 0x00A4, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x060C, 0x00AD, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x061B, 0x0000, 0x0000, 0x0000, 0x061F, - 0x0000, 0x0621, 0x0622, 0x0623, 0x0624, 0x0625, 0x0626, 0x0627, - 0x0628, 0x0629, 0x062A, 0x062B, 0x062C, 0x062D, 0x062E, 0x062F, - 0x0630, 0x0631, 0x0632, 0x0633, 0x0634, 0x0635, 0x0636, 0x0637, - 0x0638, 0x0639, 0x063A, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0640, 0x0641, 0x0642, 0x0643, 0x0644, 0x0645, 0x0646, 0x0647, - 0x0648, 0x0649, 0x064A, 0x064B, 0x064C, 0x064D, 0x064E, 0x064F, - 0x0650, 0x0651, 0x0652, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 - }; - - -/* - * ISO8859_7 to Unicode recoding table - * based on file mappings/8859-7.TXT by Unicode Consortium - */ - -static const wxUint16 encoding_table__ISO8859_7[128] = { - 0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, - 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F, - 0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, - 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F, - 0x00A0, 0x2018, 0x2019, 0x00A3, 0x0000, 0x0000, 0x00A6, 0x00A7, - 0x00A8, 0x00A9, 0x0000, 0x00AB, 0x00AC, 0x00AD, 0x0000, 0x2015, - 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x0384, 0x0385, 0x0386, 0x00B7, - 0x0388, 0x0389, 0x038A, 0x00BB, 0x038C, 0x00BD, 0x038E, 0x038F, - 0x0390, 0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397, - 0x0398, 0x0399, 0x039A, 0x039B, 0x039C, 0x039D, 0x039E, 0x039F, - 0x03A0, 0x03A1, 0x0000, 0x03A3, 0x03A4, 0x03A5, 0x03A6, 0x03A7, - 0x03A8, 0x03A9, 0x03AA, 0x03AB, 0x03AC, 0x03AD, 0x03AE, 0x03AF, - 0x03B0, 0x03B1, 0x03B2, 0x03B3, 0x03B4, 0x03B5, 0x03B6, 0x03B7, - 0x03B8, 0x03B9, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BE, 0x03BF, - 0x03C0, 0x03C1, 0x03C2, 0x03C3, 0x03C4, 0x03C5, 0x03C6, 0x03C7, - 0x03C8, 0x03C9, 0x03CA, 0x03CB, 0x03CC, 0x03CD, 0x03CE, 0x0000 - }; - - -/* - * ISO8859_8 to Unicode recoding table - * based on file mappings/8859-8.TXT by Unicode Consortium - */ - -static const wxUint16 encoding_table__ISO8859_8[128] = { - 0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, - 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F, - 0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, - 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F, - 0x00A0, 0x0000, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7, - 0x00A8, 0x00A9, 0x00D7, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x203E, - 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7, - 0x00B8, 0x00B9, 0x00F7, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x2017, - 0x05D0, 0x05D1, 0x05D2, 0x05D3, 0x05D4, 0x05D5, 0x05D6, 0x05D7, - 0x05D8, 0x05D9, 0x05DA, 0x05DB, 0x05DC, 0x05DD, 0x05DE, 0x05DF, - 0x05E0, 0x05E1, 0x05E2, 0x05E3, 0x05E4, 0x05E5, 0x05E6, 0x05E7, - 0x05E8, 0x05E9, 0x05EA, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 - }; - - -/* - * ISO8859_9 to Unicode recoding table - * based on file mappings/8859-9.TXT by Unicode Consortium - */ - -static const wxUint16 encoding_table__ISO8859_9[128] = { - 0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, - 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F, - 0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, - 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F, - 0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7, - 0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF, - 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7, - 0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF, - 0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7, - 0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF, - 0x011E, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7, - 0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x0130, 0x015E, 0x00DF, - 0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7, - 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF, - 0x011F, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7, - 0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x0131, 0x015F, 0x00FF - }; - - -/* - * CP1250 to Unicode recoding table - * based on file mappings/CP1250.TXT by Unicode Consortium - */ - -static const wxUint16 encoding_table__CP1250[128] = { - 0x20AC, 0x0000, 0x201A, 0x0000, 0x201E, 0x2026, 0x2020, 0x2021, - 0x0000, 0x2030, 0x0160, 0x2039, 0x015A, 0x0164, 0x017D, 0x0179, - 0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, - 0x0000, 0x2122, 0x0161, 0x203A, 0x015B, 0x0165, 0x017E, 0x017A, - 0x00A0, 0x02C7, 0x02D8, 0x0141, 0x00A4, 0x0104, 0x00A6, 0x00A7, - 0x00A8, 0x00A9, 0x015E, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x017B, - 0x00B0, 0x00B1, 0x02DB, 0x0142, 0x00B4, 0x00B5, 0x00B6, 0x00B7, - 0x00B8, 0x0105, 0x015F, 0x00BB, 0x013D, 0x02DD, 0x013E, 0x017C, - 0x0154, 0x00C1, 0x00C2, 0x0102, 0x00C4, 0x0139, 0x0106, 0x00C7, - 0x010C, 0x00C9, 0x0118, 0x00CB, 0x011A, 0x00CD, 0x00CE, 0x010E, - 0x0110, 0x0143, 0x0147, 0x00D3, 0x00D4, 0x0150, 0x00D6, 0x00D7, - 0x0158, 0x016E, 0x00DA, 0x0170, 0x00DC, 0x00DD, 0x0162, 0x00DF, - 0x0155, 0x00E1, 0x00E2, 0x0103, 0x00E4, 0x013A, 0x0107, 0x00E7, - 0x010D, 0x00E9, 0x0119, 0x00EB, 0x011B, 0x00ED, 0x00EE, 0x010F, - 0x0111, 0x0144, 0x0148, 0x00F3, 0x00F4, 0x0151, 0x00F6, 0x00F7, - 0x0159, 0x016F, 0x00FA, 0x0171, 0x00FC, 0x00FD, 0x0163, 0x02D9 - }; - - -/* - * CP1251 to Unicode recoding table - * based on file mappings/CP1251.TXT by Unicode Consortium - */ - -static const wxUint16 encoding_table__CP1251[128] = { - 0x0402, 0x0403, 0x201A, 0x0453, 0x201E, 0x2026, 0x2020, 0x2021, - 0x20AC, 0x2030, 0x0409, 0x2039, 0x040A, 0x040C, 0x040B, 0x040F, - 0x0452, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, - 0x0000, 0x2122, 0x0459, 0x203A, 0x045A, 0x045C, 0x045B, 0x045F, - 0x00A0, 0x040E, 0x045E, 0x0408, 0x00A4, 0x0490, 0x00A6, 0x00A7, - 0x0401, 0x00A9, 0x0404, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x0407, - 0x00B0, 0x00B1, 0x0406, 0x0456, 0x0491, 0x00B5, 0x00B6, 0x00B7, - 0x0451, 0x2116, 0x0454, 0x00BB, 0x0458, 0x0405, 0x0455, 0x0457, - 0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417, - 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F, - 0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427, - 0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E, 0x042F, - 0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437, - 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F, - 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447, - 0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x044F - }; - - -/* - * CP1252 to Unicode recoding table - * based on file mappings/CP1252.TXT by Unicode Consortium - */ - -static const wxUint16 encoding_table__CP1252[128] = { - 0x20AC, 0x0000, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021, - 0x02C6, 0x2030, 0x0160, 0x2039, 0x0152, 0x0000, 0x017D, 0x0000, - 0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, - 0x02DC, 0x2122, 0x0161, 0x203A, 0x0153, 0x0000, 0x017E, 0x0178, - 0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7, - 0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF, - 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7, - 0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF, - 0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7, - 0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF, - 0x00D0, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7, - 0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x00DD, 0x00DE, 0x00DF, - 0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7, - 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF, - 0x00F0, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7, - 0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x00FF - }; - - -/* - * CP1253 to Unicode recoding table - * based on file mappings/CP1253.TXT by Unicode Consortium - */ - -static const wxUint16 encoding_table__CP1253[128] = { - 0x20AC, 0x0000, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021, - 0x0000, 0x2030, 0x0000, 0x2039, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, - 0x0000, 0x2122, 0x0000, 0x203A, 0x0000, 0x0000, 0x0000, 0x0000, - 0x00A0, 0x0385, 0x0386, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7, - 0x00A8, 0x00A9, 0x0000, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x2015, - 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x0384, 0x00B5, 0x00B6, 0x00B7, - 0x0388, 0x0389, 0x038A, 0x00BB, 0x038C, 0x00BD, 0x038E, 0x038F, - 0x0390, 0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397, - 0x0398, 0x0399, 0x039A, 0x039B, 0x039C, 0x039D, 0x039E, 0x039F, - 0x03A0, 0x03A1, 0x0000, 0x03A3, 0x03A4, 0x03A5, 0x03A6, 0x03A7, - 0x03A8, 0x03A9, 0x03AA, 0x03AB, 0x03AC, 0x03AD, 0x03AE, 0x03AF, - 0x03B0, 0x03B1, 0x03B2, 0x03B3, 0x03B4, 0x03B5, 0x03B6, 0x03B7, - 0x03B8, 0x03B9, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BE, 0x03BF, - 0x03C0, 0x03C1, 0x03C2, 0x03C3, 0x03C4, 0x03C5, 0x03C6, 0x03C7, - 0x03C8, 0x03C9, 0x03CA, 0x03CB, 0x03CC, 0x03CD, 0x03CE, 0x0000 - }; - - -/* - * CP1254 to Unicode recoding table - * based on file mappings/CP1254.TXT by Unicode Consortium - */ - -static const wxUint16 encoding_table__CP1254[128] = { - 0x20AC, 0x0000, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021, - 0x02C6, 0x2030, 0x0160, 0x2039, 0x0152, 0x0000, 0x0000, 0x0000, - 0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, - 0x02DC, 0x2122, 0x0161, 0x203A, 0x0153, 0x0000, 0x0000, 0x0178, - 0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7, - 0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF, - 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7, - 0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF, - 0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7, - 0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF, - 0x011E, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7, - 0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x0130, 0x015E, 0x00DF, - 0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7, - 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF, - 0x011F, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7, - 0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x0131, 0x015F, 0x00FF - }; - - -/* - * CP1255 to Unicode recoding table - * based on file mappings/CP1255.TXT by Unicode Consortium - */ - -static const wxUint16 encoding_table__CP1255[128] = { - 0x20AC, 0x0000, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021, - 0x02C6, 0x2030, 0x0000, 0x2039, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, - 0x02DC, 0x2122, 0x0000, 0x203A, 0x0000, 0x0000, 0x0000, 0x0000, - 0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x20AA, 0x00A5, 0x00A6, 0x00A7, - 0x00A8, 0x00A9, 0x00D7, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF, - 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7, - 0x00B8, 0x00B9, 0x00F7, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF, - 0x05B0, 0x05B1, 0x05B2, 0x05B3, 0x05B4, 0x05B5, 0x05B6, 0x05B7, - 0x05B8, 0x05B9, 0x0000, 0x05BB, 0x05BC, 0x05BD, 0x05BE, 0x05BF, - 0x05C0, 0x05C1, 0x05C2, 0x05C3, 0x05F0, 0x05F1, 0x05F2, 0x05F3, - 0x05F4, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x05D0, 0x05D1, 0x05D2, 0x05D3, 0x05D4, 0x05D5, 0x05D6, 0x05D7, - 0x05D8, 0x05D9, 0x05DA, 0x05DB, 0x05DC, 0x05DD, 0x05DE, 0x05DF, - 0x05E0, 0x05E1, 0x05E2, 0x05E3, 0x05E4, 0x05E5, 0x05E6, 0x05E7, - 0x05E8, 0x05E9, 0x05EA, 0x0000, 0x0000, 0x200E, 0x200F, 0x0000 - }; - - -/* - * CP1256 to Unicode recoding table - * based on file mappings/CP1256.TXT by Unicode Consortium - */ - -static const wxUint16 encoding_table__CP1256[128] = { - 0x20AC, 0x067E, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021, - 0x02C6, 0x2030, 0x0679, 0x2039, 0x0152, 0x0686, 0x0698, 0x0688, - 0x06AF, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, - 0x06A9, 0x2122, 0x0691, 0x203A, 0x0153, 0x200C, 0x200D, 0x06BA, - 0x00A0, 0x060C, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7, - 0x00A8, 0x00A9, 0x06BE, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF, - 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7, - 0x00B8, 0x00B9, 0x061B, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x061F, - 0x06C1, 0x0621, 0x0622, 0x0623, 0x0624, 0x0625, 0x0626, 0x0627, - 0x0628, 0x0629, 0x062A, 0x062B, 0x062C, 0x062D, 0x062E, 0x062F, - 0x0630, 0x0631, 0x0632, 0x0633, 0x0634, 0x0635, 0x0636, 0x00D7, - 0x0637, 0x0638, 0x0639, 0x063A, 0x0640, 0x0641, 0x0642, 0x0643, - 0x00E0, 0x0644, 0x00E2, 0x0645, 0x0646, 0x0647, 0x0648, 0x00E7, - 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x0649, 0x064A, 0x00EE, 0x00EF, - 0x064B, 0x064C, 0x064D, 0x064E, 0x00F4, 0x064F, 0x0650, 0x00F7, - 0x0651, 0x00F9, 0x0652, 0x00FB, 0x00FC, 0x200E, 0x200F, 0x06D2 - }; - - -/* - * CP1257 to Unicode recoding table - * based on file mappings/CP1257.TXT by Unicode Consortium - */ - -static const wxUint16 encoding_table__CP1257[128] = { - 0x20AC, 0x0000, 0x201A, 0x0000, 0x201E, 0x2026, 0x2020, 0x2021, - 0x0000, 0x2030, 0x0000, 0x2039, 0x0000, 0x00A8, 0x02C7, 0x00B8, - 0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, - 0x0000, 0x2122, 0x0000, 0x203A, 0x0000, 0x00AF, 0x02DB, 0x0000, - 0x00A0, 0x0000, 0x00A2, 0x00A3, 0x00A4, 0x0000, 0x00A6, 0x00A7, - 0x00D8, 0x00A9, 0x0156, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00C6, - 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7, - 0x00F8, 0x00B9, 0x0157, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00E6, - 0x0104, 0x012E, 0x0100, 0x0106, 0x00C4, 0x00C5, 0x0118, 0x0112, - 0x010C, 0x00C9, 0x0179, 0x0116, 0x0122, 0x0136, 0x012A, 0x013B, - 0x0160, 0x0143, 0x0145, 0x00D3, 0x014C, 0x00D5, 0x00D6, 0x00D7, - 0x0172, 0x0141, 0x015A, 0x016A, 0x00DC, 0x017B, 0x017D, 0x00DF, - 0x0105, 0x012F, 0x0101, 0x0107, 0x00E4, 0x00E5, 0x0119, 0x0113, - 0x010D, 0x00E9, 0x017A, 0x0117, 0x0123, 0x0137, 0x012B, 0x013C, - 0x0161, 0x0144, 0x0146, 0x00F3, 0x014D, 0x00F5, 0x00F6, 0x00F7, - 0x0173, 0x0142, 0x015B, 0x016B, 0x00FC, 0x017C, 0x017E, 0x02D9 - }; - - -/* - * CP866 to Unicode recoding table - * based on file mappings/CP866.TXT by Unicode Consortium - */ - -static const wxUint16 encoding_table__CP866[128] = { - 0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417, - 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F, - 0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427, - 0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E, 0x042F, - 0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437, - 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F, - 0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556, - 0x2555, 0x2563, 0x2551, 0x2557, 0x255D, 0x255C, 0x255B, 0x2510, - 0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x255E, 0x255F, - 0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x2567, - 0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256B, - 0x256A, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580, - 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447, - 0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x044F, - 0x0401, 0x0451, 0x0404, 0x0454, 0x0407, 0x0457, 0x040E, 0x045E, - 0x00B0, 0x2219, 0x00B7, 0x221A, 0x2116, 0x00A4, 0x25A0, 0x00A0 - }; - - -/* - * KOI8 to Unicode recoding table - * based on file mappings/KOI8-R.TXT by Unicode Consortium - */ - -static const wxUint16 encoding_table__KOI8[128] = { - 0x2500, 0x2502, 0x250C, 0x2510, 0x2514, 0x2518, 0x251C, 0x2524, - 0x252C, 0x2534, 0x253C, 0x2580, 0x2584, 0x2588, 0x258C, 0x2590, - 0x2591, 0x2592, 0x2593, 0x2320, 0x25A0, 0x2219, 0x221A, 0x2248, - 0x2264, 0x2265, 0x00A0, 0x2321, 0x00B0, 0x00B2, 0x00B7, 0x00F7, - 0x2550, 0x2551, 0x2552, 0x0451, 0x2553, 0x2554, 0x2555, 0x2556, - 0x2557, 0x2558, 0x2559, 0x255A, 0x255B, 0x255C, 0x255D, 0x255E, - 0x255F, 0x2560, 0x2561, 0x0401, 0x2562, 0x2563, 0x2564, 0x2565, - 0x2566, 0x2567, 0x2568, 0x2569, 0x256A, 0x256B, 0x256C, 0x00A9, - 0x044E, 0x0430, 0x0431, 0x0446, 0x0434, 0x0435, 0x0444, 0x0433, - 0x0445, 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, - 0x043F, 0x044F, 0x0440, 0x0441, 0x0442, 0x0443, 0x0436, 0x0432, - 0x044C, 0x044B, 0x0437, 0x0448, 0x044D, 0x0449, 0x0447, 0x044A, - 0x042E, 0x0410, 0x0411, 0x0426, 0x0414, 0x0415, 0x0424, 0x0413, - 0x0425, 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, - 0x041F, 0x042F, 0x0420, 0x0421, 0x0422, 0x0423, 0x0416, 0x0412, - 0x042C, 0x042B, 0x0417, 0x0428, 0x042D, 0x0429, 0x0427, 0x042A - }; - - -/* - * KOI8_U to Unicode recoding table - * based on file mappings/KOI8-U.TXT by Unicode Consortium - */ - -static const wxUint16 encoding_table__KOI8_U[128] = { - 0x2500, 0x2502, 0x250C, 0x2510, 0x2514, 0x2518, 0x251C, 0x2524, - 0x252C, 0x2534, 0x253C, 0x2580, 0x2584, 0x2588, 0x258C, 0x2590, - 0x2591, 0x2592, 0x2593, 0x2320, 0x25A0, 0x2219, 0x221A, 0x2248, - 0x2264, 0x2265, 0x00A0, 0x2321, 0x00B0, 0x00B2, 0x00B7, 0x00F7, - 0x2550, 0x2551, 0x2552, 0x0451, 0x0454, 0x2554, 0x0456, 0x0457, - 0x2557, 0x2558, 0x2559, 0x255A, 0x255B, 0x0491, 0x255D, 0x255E, - 0x255F, 0x2560, 0x2561, 0x0401, 0x0403, 0x2563, 0x0406, 0x0407, - 0x2566, 0x2567, 0x2568, 0x2569, 0x256A, 0x0490, 0x256C, 0x00A9, - 0x044E, 0x0430, 0x0431, 0x0446, 0x0434, 0x0435, 0x0444, 0x0433, - 0x0445, 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, - 0x043F, 0x044F, 0x0440, 0x0441, 0x0442, 0x0443, 0x0436, 0x0432, - 0x044C, 0x044B, 0x0437, 0x0448, 0x044D, 0x0449, 0x0447, 0x044A, - 0x042E, 0x0410, 0x0411, 0x0426, 0x0414, 0x0415, 0x0424, 0x0413, - 0x0425, 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, - 0x041F, 0x042F, 0x0420, 0x0421, 0x0422, 0x0423, 0x0416, 0x0412, - 0x042C, 0x042B, 0x0417, 0x0428, 0x042D, 0x0429, 0x0427, 0x042A - }; - - - - - -/* - * - * Unicode to 7bit ASCII fallback - * (for use with wxRECODE_SUBSTITUTE recoding mode) - * - */ - -static const struct { - wxUint16 c /*code*/; - wxUint8 s /*inaccurate substitution*/; -} encoding_unicode_fallback[] = { - - {0x00AB, 0x22}, - {0x00BB, 0x22}, - {0x00C0, 0x41}, - {0x00C1, 0x41}, - {0x00C2, 0x41}, - {0x00C3, 0x41}, - {0x00C4, 0x41}, - {0x00C5, 0x41}, - {0x00C7, 0x43}, - {0x00C8, 0x45}, - {0x00C9, 0x45}, - {0x00CA, 0x45}, - {0x00CB, 0x45}, - {0x00CC, 0x49}, - {0x00CD, 0x49}, - {0x00CE, 0x49}, - {0x00CF, 0x49}, - {0x00D1, 0x4E}, - {0x00D2, 0x4F}, - {0x00D3, 0x4F}, - {0x00D4, 0x4F}, - {0x00D5, 0x4F}, - {0x00D6, 0x4F}, - {0x00D8, 0x4F}, - {0x00D9, 0x55}, - {0x00DA, 0x55}, - {0x00DB, 0x55}, - {0x00DC, 0x55}, - {0x00DD, 0x59}, - {0x00E0, 0x61}, - {0x00E1, 0x61}, - {0x00E2, 0x61}, - {0x00E3, 0x61}, - {0x00E4, 0x61}, - {0x00E5, 0x61}, - {0x00E7, 0x63}, - {0x00E8, 0x65}, - {0x00E9, 0x65}, - {0x00EA, 0x65}, - {0x00EB, 0x65}, - {0x00EC, 0x69}, - {0x00ED, 0x69}, - {0x00EE, 0x69}, - {0x00EF, 0x69}, - {0x00F1, 0x6E}, - {0x00F2, 0x6F}, - {0x00F3, 0x6F}, - {0x00F4, 0x6F}, - {0x00F5, 0x6F}, - {0x00F6, 0x6F}, - {0x00F8, 0x6F}, - {0x00F9, 0x75}, - {0x00FA, 0x75}, - {0x00FB, 0x75}, - {0x00FC, 0x75}, - {0x00FD, 0x79}, - {0x00FF, 0x79}, - {0x0100, 0x41}, - {0x0101, 0x61}, - {0x0102, 0x41}, - {0x0103, 0x61}, - {0x0104, 0x41}, - {0x0105, 0x61}, - {0x0106, 0x43}, - {0x0107, 0x63}, - {0x0108, 0x43}, - {0x0109, 0x63}, - {0x010A, 0x43}, - {0x010B, 0x63}, - {0x010C, 0x43}, - {0x010D, 0x63}, - {0x010E, 0x44}, - {0x010F, 0x64}, - {0x0110, 0x44}, - {0x0111, 0x64}, - {0x0112, 0x45}, - {0x0113, 0x65}, - {0x0116, 0x45}, - {0x0117, 0x65}, - {0x0118, 0x45}, - {0x0119, 0x65}, - {0x011A, 0x45}, - {0x011B, 0x65}, - {0x011C, 0x47}, - {0x011D, 0x67}, - {0x011E, 0x47}, - {0x011F, 0x67}, - {0x0120, 0x47}, - {0x0121, 0x67}, - {0x0122, 0x47}, - {0x0123, 0x67}, - {0x0124, 0x48}, - {0x0125, 0x68}, - {0x0126, 0x48}, - {0x0127, 0x68}, - {0x0128, 0x49}, - {0x0129, 0x69}, - {0x012A, 0x49}, - {0x012B, 0x69}, - {0x012E, 0x49}, - {0x012F, 0x69}, - {0x0130, 0x49}, - {0x0134, 0x4A}, - {0x0135, 0x6A}, - {0x0136, 0x4B}, - {0x0137, 0x6B}, - {0x0139, 0x4C}, - {0x013A, 0x6C}, - {0x013B, 0x4C}, - {0x013C, 0x6C}, - {0x013D, 0x4C}, - {0x013E, 0x6C}, - {0x0141, 0x4C}, - {0x0142, 0x6C}, - {0x0143, 0x4E}, - {0x0144, 0x6E}, - {0x0145, 0x4E}, - {0x0146, 0x6E}, - {0x0147, 0x4E}, - {0x0148, 0x6E}, - {0x014C, 0x4F}, - {0x014D, 0x6F}, - {0x0150, 0x4F}, - {0x0151, 0x6F}, - {0x0154, 0x52}, - {0x0155, 0x72}, - {0x0156, 0x52}, - {0x0157, 0x72}, - {0x0158, 0x52}, - {0x0159, 0x72}, - {0x015A, 0x53}, - {0x015B, 0x73}, - {0x015C, 0x53}, - {0x015D, 0x73}, - {0x015E, 0x53}, - {0x015F, 0x73}, - {0x0160, 0x53}, - {0x0161, 0x73}, - {0x0162, 0x54}, - {0x0163, 0x74}, - {0x0164, 0x54}, - {0x0165, 0x74}, - {0x0166, 0x54}, - {0x0167, 0x74}, - {0x0168, 0x55}, - {0x0169, 0x75}, - {0x016A, 0x55}, - {0x016B, 0x75}, - {0x016C, 0x55}, - {0x016D, 0x75}, - {0x016E, 0x55}, - {0x016F, 0x75}, - {0x0170, 0x55}, - {0x0171, 0x75}, - {0x0172, 0x55}, - {0x0173, 0x75}, - {0x0174, 0x57}, - {0x0175, 0x77}, - {0x0176, 0x59}, - {0x0177, 0x79}, - {0x0178, 0x59}, - {0x0179, 0x5A}, - {0x017A, 0x7A}, - {0x017B, 0x5A}, - {0x017C, 0x7A}, - {0x017D, 0x5A}, - {0x017E, 0x7A}, - {0x0192, 0x66}, - {0x1E02, 0x42}, - {0x1E03, 0x62}, - {0x1E0A, 0x44}, - {0x1E0B, 0x64}, - {0x1E1E, 0x46}, - {0x1E1F, 0x66}, - {0x1E40, 0x4D}, - {0x1E41, 0x6D}, - {0x1E56, 0x50}, - {0x1E57, 0x70}, - {0x1E60, 0x53}, - {0x1E61, 0x73}, - {0x1E6A, 0x54}, - {0x1E6B, 0x74}, - {0x1E80, 0x57}, - {0x1E81, 0x77}, - {0x1E82, 0x57}, - {0x1E83, 0x77}, - {0x1E84, 0x57}, - {0x1E85, 0x77}, - {0x1EF2, 0x59}, - {0x1EF3, 0x79}, - {0x2013, 0x2D}, - {0x2014, 0x2D}, - {0x2018, 0x27}, - {0x2019, 0x27}, - {0x201A, 0x27}, - {0x201C, 0x22}, - {0x201D, 0x22}, - {0x201E, 0x22}, - {0x2039, 0x27}, - {0x203A, 0x27}, - {0, 0} - }; - -static const unsigned encoding_unicode_fallback_count = 200; - - - - -/* - * - * Table of all supported encodings: - * - */ - -static const struct { - wxFontEncoding encoding; // encoding identifier - const wxUint16 *table; // 8bit to unicode table -} encodings_list[] = { - - { wxFONTENCODING_ISO8859_1, encoding_table__ISO8859_1}, - { wxFONTENCODING_ISO8859_10, encoding_table__ISO8859_10}, - { wxFONTENCODING_ISO8859_13, encoding_table__ISO8859_13}, - { wxFONTENCODING_ISO8859_14, encoding_table__ISO8859_14}, - { wxFONTENCODING_ISO8859_15, encoding_table__ISO8859_15}, - { wxFONTENCODING_ISO8859_2, encoding_table__ISO8859_2}, - { wxFONTENCODING_ISO8859_3, encoding_table__ISO8859_3}, - { wxFONTENCODING_ISO8859_4, encoding_table__ISO8859_4}, - { wxFONTENCODING_ISO8859_5, encoding_table__ISO8859_5}, - { wxFONTENCODING_ISO8859_6, encoding_table__ISO8859_6}, - { wxFONTENCODING_ISO8859_7, encoding_table__ISO8859_7}, - { wxFONTENCODING_ISO8859_8, encoding_table__ISO8859_8}, - { wxFONTENCODING_ISO8859_9, encoding_table__ISO8859_9}, - { wxFONTENCODING_CP1250, encoding_table__CP1250}, - { wxFONTENCODING_CP1251, encoding_table__CP1251}, - { wxFONTENCODING_CP1252, encoding_table__CP1252}, - { wxFONTENCODING_CP1253, encoding_table__CP1253}, - { wxFONTENCODING_CP1254, encoding_table__CP1254}, - { wxFONTENCODING_CP1255, encoding_table__CP1255}, - { wxFONTENCODING_CP1256, encoding_table__CP1256}, - { wxFONTENCODING_CP1257, encoding_table__CP1257}, - { wxFONTENCODING_KOI8, encoding_table__KOI8}, - { wxFONTENCODING_KOI8_U, encoding_table__KOI8_U}, - { wxFONTENCODING_CP866, encoding_table__CP866}, - {wxFONTENCODING_MAX /*anything*/, NULL} - }; diff --git a/Externals/wxWidgets3/src/common/uri.cpp b/Externals/wxWidgets3/src/common/uri.cpp deleted file mode 100644 index ff01b850f5..0000000000 --- a/Externals/wxWidgets3/src/common/uri.cpp +++ /dev/null @@ -1,1082 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/uri.cpp -// Purpose: Implementation of a URI parser -// Author: Ryan Norton, -// Vadim Zeitlin (UTF-8 URI support, many other changes) -// Created: 10/26/04 -// Copyright: (c) 2004 Ryan Norton, -// 2008 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// =========================================================================== -// declarations -// =========================================================================== - -// --------------------------------------------------------------------------- -// headers -// --------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#ifndef WX_PRECOMP - #include "wx/crt.h" -#endif - -#include "wx/uri.h" - -// --------------------------------------------------------------------------- -// definitions -// --------------------------------------------------------------------------- - -wxIMPLEMENT_CLASS(wxURI, wxObject); - -// =========================================================================== -// wxURI implementation -// =========================================================================== - -// --------------------------------------------------------------------------- -// Constructors and cleanup -// --------------------------------------------------------------------------- - -wxURI::wxURI() - : m_hostType(wxURI_REGNAME), - m_fields(0) -{ -} - -wxURI::wxURI(const wxString& uri) - : m_hostType(wxURI_REGNAME), - m_fields(0) -{ - Create(uri); -} - -bool wxURI::Create(const wxString& uri) -{ - if (m_fields) - Clear(); - - return Parse(uri.utf8_str()); -} - -void wxURI::Clear() -{ - m_scheme = - m_userinfo = - m_server = - m_port = - m_path = - m_query = - m_fragment = wxEmptyString; - - m_hostType = wxURI_REGNAME; - - m_fields = 0; -} - -// --------------------------------------------------------------------------- -// Escaped characters handling -// --------------------------------------------------------------------------- - -// Converts a character into a numeric hexadecimal value, or -1 if the passed -// in character is not a valid hex character - -/* static */ -int wxURI::CharToHex(char c) -{ - if ((c >= 'A') && (c <= 'F')) - return c - 'A' + 10; - if ((c >= 'a') && (c <= 'f')) - return c - 'a' + 10; - if ((c >= '0') && (c <= '9')) - return c - '0'; - - return -1; -} - -/* static */ -wxString wxURI::Unescape(const wxString& uri) -{ - // URIs can contain escaped 8-bit characters that have to be decoded using - // UTF-8 (see RFC 3986), however in our (probably broken...) case we can - // also end up with not escaped Unicode characters in the URI string which - // can't be decoded as UTF-8. So what we do here is to encode all Unicode - // characters as UTF-8 only to decode them back below. This is obviously - // inefficient but there doesn't seem to be anything else to do, other than - // not allowing to mix Unicode characters with escapes in the first place, - // but this seems to be done in a lot of places, unfortunately. - const wxScopedCharBuffer& uriU8(uri.utf8_str()); - const size_t len = uriU8.length(); - - // the unescaped version can't be longer than the original one - wxCharBuffer buf(uriU8.length()); - char *p = buf.data(); - - const char* const end = uriU8.data() + len; - for ( const char* s = uriU8.data(); s != end; ++s, ++p ) - { - char c = *s; - if ( c == '%' && s < end - 2 && IsHex(s[1]) && IsHex(s[2]) ) - { - c = (CharToHex(s[1]) << 4) | CharToHex(s[2]); - s += 2; - } - - *p = c; - } - - *p = '\0'; - - return wxString::FromUTF8(buf); -} - -void wxURI::AppendNextEscaped(wxString& s, const char *& p) -{ - // check for an already encoded character: - // - // pct-encoded = "%" HEXDIG HEXDIG - if ( p[0] == '%' && IsHex(p[1]) && IsHex(p[2]) ) - { - s += *p++; - s += *p++; - s += *p++; - } - else // really needs escaping - { - static const char* hexDigits = "0123456789abcdef"; - - const char c = *p++; - - s += '%'; - s += hexDigits[(c >> 4) & 15]; - s += hexDigits[c & 15]; - } -} - -// --------------------------------------------------------------------------- -// GetUser -// GetPassword -// -// Gets the username and password via the old URL method. -// --------------------------------------------------------------------------- -wxString wxURI::GetUser() const -{ - // if there is no colon at all, find() returns npos and this method returns - // the entire string which is correct as it means that password was omitted - return m_userinfo(0, m_userinfo.find(':')); -} - -wxString wxURI::GetPassword() const -{ - size_t posColon = m_userinfo.find(':'); - - if ( posColon == wxString::npos ) - return ""; - - return m_userinfo(posColon + 1, wxString::npos); -} - -// combine all URI fields in a single string, applying funcDecode to each -// component which it may make sense to decode (i.e. "unescape") -wxString wxURI::DoBuildURI(wxString (*funcDecode)(const wxString&)) const -{ - wxString ret; - - if (HasScheme()) - ret += m_scheme + ":"; - - if (HasServer()) - { - ret += "//"; - - if (HasUserInfo()) - ret += funcDecode(m_userinfo) + "@"; - - if (m_hostType == wxURI_REGNAME) - ret += funcDecode(m_server); - else - ret += m_server; - - if (HasPort()) - ret += ":" + m_port; - } - - ret += funcDecode(m_path); - - if (HasQuery()) - ret += "?" + funcDecode(m_query); - - if (HasFragment()) - ret += "#" + funcDecode(m_fragment); - - return ret; -} - -// --------------------------------------------------------------------------- -// Comparison -// --------------------------------------------------------------------------- - -bool wxURI::operator==(const wxURI& uri) const -{ - if (HasScheme()) - { - if(m_scheme != uri.m_scheme) - return false; - } - else if (uri.HasScheme()) - return false; - - - if (HasServer()) - { - if (HasUserInfo()) - { - if (m_userinfo != uri.m_userinfo) - return false; - } - else if (uri.HasUserInfo()) - return false; - - if (m_server != uri.m_server || - m_hostType != uri.m_hostType) - return false; - - if (HasPort()) - { - if(m_port != uri.m_port) - return false; - } - else if (uri.HasPort()) - return false; - } - else if (uri.HasServer()) - return false; - - - if (HasPath()) - { - if(m_path != uri.m_path) - return false; - } - else if (uri.HasPath()) - return false; - - if (HasQuery()) - { - if (m_query != uri.m_query) - return false; - } - else if (uri.HasQuery()) - return false; - - if (HasFragment()) - { - if (m_fragment != uri.m_fragment) - return false; - } - else if (uri.HasFragment()) - return false; - - return true; -} - -// --------------------------------------------------------------------------- -// IsReference -// -// if there is no authority or scheme, it is a reference -// --------------------------------------------------------------------------- - -bool wxURI::IsReference() const -{ - return !HasScheme() || !HasServer(); -} - -// --------------------------------------------------------------------------- -// IsRelative -// -// FIXME: may need refinement -// --------------------------------------------------------------------------- - -bool wxURI::IsRelative() const -{ - return !HasScheme() && !HasServer(); -} - -// --------------------------------------------------------------------------- -// Parse -// -// Master URI parsing method. Just calls the individual parsing methods -// -// URI = scheme ":" hier-part [ "?" query ] [ "#" fragment ] -// URI-reference = URI / relative -// --------------------------------------------------------------------------- - -bool wxURI::Parse(const char *uri) -{ - uri = ParseScheme(uri); - if ( uri ) - uri = ParseAuthority(uri); - if ( uri ) - uri = ParsePath(uri); - if ( uri ) - uri = ParseQuery(uri); - if ( uri ) - uri = ParseFragment(uri); - - // we only succeed if we parsed the entire string - return uri && *uri == '\0'; -} - -const char* wxURI::ParseScheme(const char *uri) -{ - const char * const start = uri; - - // assume that we have a scheme if we have the valid start of it - if ( IsAlpha(*uri) ) - { - m_scheme += *uri++; - - //scheme = ALPHA *( ALPHA / DIGIT / "+" / "-" / "." ) - while (IsAlpha(*uri) || IsDigit(*uri) || - *uri == '+' || - *uri == '-' || - *uri == '.') - { - m_scheme += *uri++; - } - - //valid scheme? - if (*uri == ':') - { - //mark the scheme as valid - m_fields |= wxURI_SCHEME; - - //move reference point up to input buffer - ++uri; - } - else // no valid scheme finally - { - uri = start; // rewind - m_scheme.clear(); - } - } - //else: can't have schema, possible a relative URI - - return uri; -} - -const char* wxURI::ParseAuthority(const char* uri) -{ - // authority = [ userinfo "@" ] host [ ":" port ] - if ( uri[0] == '/' && uri[1] == '/' ) - { - //skip past the two slashes - uri += 2; - - // ############# DEVIATION FROM RFC ######################### - // Don't parse the server component for file URIs - if(m_scheme != "file") - { - //normal way - uri = ParseUserInfo(uri); - uri = ParseServer(uri); - return ParsePort(uri); - } - } - - return uri; -} - -const char* wxURI::ParseUserInfo(const char* uri) -{ - const char * const start = uri; - - // userinfo = *( unreserved / pct-encoded / sub-delims / ":" ) - while ( *uri && *uri != '@' && *uri != '/' && *uri != '#' && *uri != '?' ) - { - if ( IsUnreserved(*uri) || IsSubDelim(*uri) || *uri == ':' ) - m_userinfo += *uri++; - else - AppendNextEscaped(m_userinfo, uri); - } - - if ( *uri++ == '@' ) - { - // valid userinfo - m_fields |= wxURI_USERINFO; - } - else - { - uri = start; // rewind - m_userinfo.clear(); - } - - return uri; -} - -const char* wxURI::ParseServer(const char* uri) -{ - const char * const start = uri; - - // host = IP-literal / IPv4address / reg-name - // IP-literal = "[" ( IPv6address / IPvFuture ) "]" - if (*uri == '[') - { - ++uri; - if (ParseIPv6address(uri) && *uri == ']') - { - m_hostType = wxURI_IPV6ADDRESS; - - m_server.assign(start + 1, uri - start - 1); - ++uri; - } - else - { - uri = start + 1; // skip the leading '[' again - - if (ParseIPvFuture(uri) && *uri == ']') - { - m_hostType = wxURI_IPVFUTURE; - - m_server.assign(start + 1, uri - start - 1); - ++uri; - } - else // unrecognized IP literal - { - uri = start; - } - } - } - else // IPv4 or a reg-name - { - if (ParseIPv4address(uri)) - { - m_hostType = wxURI_IPV4ADDRESS; - - m_server.assign(start, uri - start); - } - else - { - uri = start; - } - } - - if ( m_hostType == wxURI_REGNAME ) - { - uri = start; - // reg-name = *( unreserved / pct-encoded / sub-delims ) - while ( *uri && *uri != '/' && *uri != ':' && *uri != '#' && *uri != '?' ) - { - if ( IsUnreserved(*uri) || IsSubDelim(*uri) ) - m_server += *uri++; - else - AppendNextEscaped(m_server, uri); - } - } - - m_fields |= wxURI_SERVER; - - return uri; -} - - -const char* wxURI::ParsePort(const char* uri) -{ - // port = *DIGIT - if( *uri == ':' ) - { - ++uri; - while ( IsDigit(*uri) ) - { - m_port += *uri++; - } - - m_fields |= wxURI_PORT; - } - - return uri; -} - -const char* wxURI::ParsePath(const char* uri) -{ - /// hier-part = "//" authority path-abempty - /// / path-absolute - /// / path-rootless - /// / path-empty - /// - /// relative-part = "//" authority path-abempty - /// / path-absolute - /// / path-noscheme - /// / path-empty - /// - /// path-abempty = *( "/" segment ) - /// path-absolute = "/" [ segment-nz *( "/" segment ) ] - /// path-noscheme = segment-nz-nc *( "/" segment ) - /// path-rootless = segment-nz *( "/" segment ) - /// path-empty = 0 - /// - /// segment = *pchar - /// segment-nz = 1*pchar - /// segment-nz-nc = 1*( unreserved / pct-encoded / sub-delims / "@" ) - /// ; non-zero-length segment without any colon ":" - /// - /// pchar = unreserved / pct-encoded / sub-delims / ":" / "@" - - if ( IsEndPath(*uri) ) - return uri; - - const bool isAbs = *uri == '/'; - if ( isAbs ) - m_path += *uri++; - - wxArrayString segments; - wxString segment; - for ( ;; ) - { - const bool endPath = IsEndPath(*uri); - if ( endPath || *uri == '/' ) - { - // end of a segment, look at what we got - if ( segment == ".." ) - { - if ( !segments.empty() && *segments.rbegin() != ".." ) - segments.pop_back(); - else if ( !isAbs ) - segments.push_back(".."); - } - else if ( segment == "." ) - { - // normally we ignore "." but the last one should be taken into - // account as "path/." is the same as "path/" and not just "path" - if ( endPath ) - segments.push_back(""); - } - else // normal segment - { - segments.push_back(segment); - } - - if ( endPath ) - break; - - segment.clear(); - ++uri; - continue; - } - - if ( IsUnreserved(*uri) || IsSubDelim(*uri) || *uri == ':' || *uri == '@' ) - segment += *uri++; - else - AppendNextEscaped(segment, uri); - } - - m_path += wxJoin(segments, '/', '\0'); - m_fields |= wxURI_PATH; - - return uri; -} - - -const char* wxURI::ParseQuery(const char* uri) -{ - // query = *( pchar / "/" / "?" ) - if ( *uri == '?' ) - { - ++uri; - while ( *uri && *uri != '#' ) - { - if ( IsUnreserved(*uri) || IsSubDelim(*uri) || - *uri == ':' || *uri == '@' || *uri == '/' || *uri == '?' ) - m_query += *uri++; - else - AppendNextEscaped(m_query, uri); - } - - m_fields |= wxURI_QUERY; - } - - return uri; -} - - -const char* wxURI::ParseFragment(const char* uri) -{ - // fragment = *( pchar / "/" / "?" ) - if ( *uri == '#' ) - { - ++uri; - while ( *uri ) - { - if ( IsUnreserved(*uri) || IsSubDelim(*uri) || - *uri == ':' || *uri == '@' || *uri == '/' || *uri == '?') - m_fragment += *uri++; - else - AppendNextEscaped(m_fragment, uri); - } - - m_fields |= wxURI_FRAGMENT; - } - - return uri; -} - -// --------------------------------------------------------------------------- -// Resolve -// -// Builds missing components of this uri from a base uri -// -// A version of the algorithm outlined in the RFC is used here -// (it is shown in comments) -// -// Note that an empty URI inherits all components -// --------------------------------------------------------------------------- - -/* static */ -wxArrayString wxURI::SplitInSegments(const wxString& path) -{ - return wxSplit(path, '/', '\0' /* no escape character */); -} - -void wxURI::Resolve(const wxURI& base, int flags) -{ - wxASSERT_MSG(!base.IsReference(), - "wxURI to inherit from must not be a reference!"); - - // If we aren't being strict, enable the older (pre-RFC2396) loophole that - // allows this uri to inherit other properties from the base uri - even if - // the scheme is defined - if ( !(flags & wxURI_STRICT) && - HasScheme() && base.HasScheme() && - m_scheme == base.m_scheme ) - { - m_fields -= wxURI_SCHEME; - } - - - // Do nothing if this is an absolute wxURI - // if defined(R.scheme) then - // T.scheme = R.scheme; - // T.authority = R.authority; - // T.path = remove_dot_segments(R.path); - // T.query = R.query; - if (HasScheme()) - return; - - //No scheme - inherit - m_scheme = base.m_scheme; - m_fields |= wxURI_SCHEME; - - // All we need to do for relative URIs with an - // authority component is just inherit the scheme - // if defined(R.authority) then - // T.authority = R.authority; - // T.path = remove_dot_segments(R.path); - // T.query = R.query; - if (HasServer()) - return; - - //No authority - inherit - if (base.HasUserInfo()) - { - m_userinfo = base.m_userinfo; - m_fields |= wxURI_USERINFO; - } - - m_server = base.m_server; - m_hostType = base.m_hostType; - m_fields |= wxURI_SERVER; - - if (base.HasPort()) - { - m_port = base.m_port; - m_fields |= wxURI_PORT; - } - - - // Simple path inheritance from base - if (!HasPath()) - { - // T.path = Base.path; - m_path = base.m_path; - m_fields |= wxURI_PATH; - - - // if defined(R.query) then - // T.query = R.query; - // else - // T.query = Base.query; - // endif; - if (!HasQuery()) - { - m_query = base.m_query; - m_fields |= wxURI_QUERY; - } - } - else if ( m_path.empty() || m_path[0u] != '/' ) - { - // if (R.path starts-with "/") then - // T.path = remove_dot_segments(R.path); - // else - // T.path = merge(Base.path, R.path); - // T.path = remove_dot_segments(T.path); - // endif; - // T.query = R.query; - // - // So we don't do anything for absolute paths and implement merge for - // the relative ones - - wxArrayString our(SplitInSegments(m_path)), - result(SplitInSegments(base.m_path)); - - if ( !result.empty() ) - result.pop_back(); - - if ( our.empty() ) - { - // if we have an empty path it means we were constructed from a "." - // string or something similar (e.g. "././././"), it should count - // as (empty) segment - our.push_back(""); - } - - const wxArrayString::const_iterator end = our.end(); - for ( wxArrayString::const_iterator i = our.begin(); i != end; ++i ) - { - if ( i->empty() || *i == "." ) - { - // as in ParsePath(), while normally we ignore the empty - // segments, we need to take account of them at the end - if ( i == end - 1 ) - result.push_back(""); - continue; - } - - if ( *i == ".." ) - { - if ( !result.empty() ) - { - result.pop_back(); - - if ( i == end - 1 ) - result.push_back(""); - } - //else: just ignore, extra ".." don't accumulate - } - else - { - if ( result.empty() ) - { - // ensure that the resulting path will always be absolute - result.push_back(""); - } - - result.push_back(*i); - } - } - - m_path = wxJoin(result, '/', '\0'); - } - - //T.fragment = R.fragment; -} - -// --------------------------------------------------------------------------- -// ParseH16 -// -// Parses 1 to 4 hex values. Returns true if the first character of the input -// string is a valid hex character. It is the caller's responsibility to move -// the input string back to its original position on failure. -// --------------------------------------------------------------------------- - -bool wxURI::ParseH16(const char*& uri) -{ - // h16 = 1*4HEXDIG - if(!IsHex(*++uri)) - return false; - - if(IsHex(*++uri) && IsHex(*++uri) && IsHex(*++uri)) - ++uri; - - return true; -} - -// --------------------------------------------------------------------------- -// ParseIPXXX -// -// Parses a certain version of an IP address and moves the input string past -// it. Returns true if the input string contains the proper version of an ip -// address. It is the caller's responsibility to move the input string back -// to its original position on failure. -// --------------------------------------------------------------------------- - -bool wxURI::ParseIPv4address(const char*& uri) -{ - //IPv4address = dec-octet "." dec-octet "." dec-octet "." dec-octet - // - //dec-octet = DIGIT ; 0-9 - // / %x31-39 DIGIT ; 10-99 - // / "1" 2DIGIT ; 100-199 - // / "2" %x30-34 DIGIT ; 200-249 - // / "25" %x30-35 ; 250-255 - size_t iIPv4 = 0; - if (IsDigit(*uri)) - { - ++iIPv4; - - - //each ip part must be between 0-255 (dupe of version in for loop) - if( IsDigit(*++uri) && IsDigit(*++uri) && - //100 or less (note !) - !( (*(uri-2) < '2') || - //240 or less - (*(uri-2) == '2' && - (*(uri-1) < '5' || (*(uri-1) == '5' && *uri <= '5')) - ) - ) - ) - { - return false; - } - - if(IsDigit(*uri))++uri; - - //compilers should unroll this loop - for(; iIPv4 < 4; ++iIPv4) - { - if (*uri != '.' || !IsDigit(*++uri)) - break; - - //each ip part must be between 0-255 - if( IsDigit(*++uri) && IsDigit(*++uri) && - //100 or less (note !) - !( (*(uri-2) < '2') || - //240 or less - (*(uri-2) == '2' && - (*(uri-1) < '5' || (*(uri-1) == '5' && *uri <= '5')) - ) - ) - ) - { - return false; - } - if(IsDigit(*uri))++uri; - } - } - return iIPv4 == 4; -} - -bool wxURI::ParseIPv6address(const char*& uri) -{ - // IPv6address = 6( h16 ":" ) ls32 - // / "::" 5( h16 ":" ) ls32 - // / [ h16 ] "::" 4( h16 ":" ) ls32 - // / [ *1( h16 ":" ) h16 ] "::" 3( h16 ":" ) ls32 - // / [ *2( h16 ":" ) h16 ] "::" 2( h16 ":" ) ls32 - // / [ *3( h16 ":" ) h16 ] "::" h16 ":" ls32 - // / [ *4( h16 ":" ) h16 ] "::" ls32 - // / [ *5( h16 ":" ) h16 ] "::" h16 - // / [ *6( h16 ":" ) h16 ] "::" - - size_t numPrefix = 0, - maxPostfix; - - bool bEndHex = false; - - for( ; numPrefix < 6; ++numPrefix) - { - if(!ParseH16(uri)) - { - --uri; - bEndHex = true; - break; - } - - if(*uri != ':') - { - break; - } - } - - if(!bEndHex && !ParseH16(uri)) - { - --uri; - - if (numPrefix) - return false; - - if (*uri == ':') - { - if (*++uri != ':') - return false; - - maxPostfix = 5; - } - else - maxPostfix = 6; - } - else - { - if (*uri != ':' || *(uri+1) != ':') - { - if (numPrefix != 6) - return false; - - while (*--uri != ':') {} - ++uri; - - const char * const start = uri; - //parse ls32 - // ls32 = ( h16 ":" h16 ) / IPv4address - if (ParseH16(uri) && *uri == ':' && ParseH16(uri)) - return true; - - uri = start; - - if (ParseIPv4address(uri)) - return true; - else - return false; - } - else - { - uri += 2; - - if (numPrefix > 3) - maxPostfix = 0; - else - maxPostfix = 4 - numPrefix; - } - } - - bool bAllowAltEnding = maxPostfix == 0; - - for(; maxPostfix != 0; --maxPostfix) - { - if(!ParseH16(uri) || *uri != ':') - return false; - } - - if(numPrefix <= 4) - { - const char * const start = uri; - //parse ls32 - // ls32 = ( h16 ":" h16 ) / IPv4address - if (ParseH16(uri) && *uri == ':' && ParseH16(uri)) - return true; - - uri = start; - - if (ParseIPv4address(uri)) - return true; - - uri = start; - - if (!bAllowAltEnding) - return false; - } - - if(numPrefix <= 5 && ParseH16(uri)) - return true; - - return true; -} - -bool wxURI::ParseIPvFuture(const char*& uri) -{ - // IPvFuture = "v" 1*HEXDIG "." 1*( unreserved / sub-delims / ":" ) - if (*++uri != 'v' || !IsHex(*++uri)) - return false; - - while (IsHex(*++uri)) - ; - - if (*uri != '.' || !(IsUnreserved(*++uri) || IsSubDelim(*uri) || *uri == ':')) - return false; - - while(IsUnreserved(*++uri) || IsSubDelim(*uri) || *uri == ':') {} - - return true; -} - - -// --------------------------------------------------------------------------- -// IsXXX -// -// Returns true if the passed in character meets the criteria of the method -// --------------------------------------------------------------------------- - -// unreserved = ALPHA / DIGIT / "-" / "." / "_" / "~" -bool wxURI::IsUnreserved(char c) -{ - return IsAlpha(c) || - IsDigit(c) || - c == '-' || - c == '.' || - c == '_' || - c == '~' - ; -} - -bool wxURI::IsReserved(char c) -{ - return IsGenDelim(c) || IsSubDelim(c); -} - -// gen-delims = ":" / "/" / "?" / "#" / "[" / "]" / "@" -bool wxURI::IsGenDelim(char c) -{ - return c == ':' || - c == '/' || - c == '?' || - c == '#' || - c == '[' || - c == ']' || - c == '@'; -} - -// sub-delims = "!" / "$" / "&" / "'" / "(" / ")" -// / "*" / "+" / "," / ";" / "=" -bool wxURI::IsSubDelim(char c) -{ - return c == '!' || - c == '$' || - c == '&' || - c == '\'' || - c == '(' || - c == ')' || - c == '*' || - c == '+' || - c == ',' || - c == ';' || - c == '=' - ; -} - -bool wxURI::IsHex(char c) -{ - return IsDigit(c) || - (c >= 'a' && c <= 'f') || - (c >= 'A' && c <= 'F'); -} - -bool wxURI::IsAlpha(char c) -{ - return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z'); -} - -bool wxURI::IsDigit(char c) -{ - return c >= '0' && c <= '9'; -} - -bool wxURI::IsEndPath(char c) -{ - return c == '\0' || c == '#' || c == '?'; -} - diff --git a/Externals/wxWidgets3/src/common/url.cpp b/Externals/wxWidgets3/src/common/url.cpp deleted file mode 100644 index 9bea231c5b..0000000000 --- a/Externals/wxWidgets3/src/common/url.cpp +++ /dev/null @@ -1,495 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/url.cpp -// Purpose: URL parser -// Author: Guilhem Lavaux -// Modified by: -// Created: 20/07/1997 -// Copyright: (c) 1997, 1998 Guilhem Lavaux -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_URL - -#include "wx/url.h" - -#ifndef WX_PRECOMP - #include "wx/list.h" - #include "wx/string.h" - #include "wx/utils.h" - #include "wx/module.h" -#endif - -#include -#include - -wxIMPLEMENT_CLASS(wxURL, wxURI); - -// Protocols list -wxProtoInfo *wxURL::ms_protocols = NULL; - -// Enforce linking of protocol classes: -USE_PROTOCOL(wxFileProto) - -#if wxUSE_PROTOCOL_HTTP -USE_PROTOCOL(wxHTTP) - - wxHTTP *wxURL::ms_proxyDefault = NULL; - bool wxURL::ms_useDefaultProxy = false; -#endif - -#if wxUSE_PROTOCOL_FTP -USE_PROTOCOL(wxFTP) -#endif - -// -------------------------------------------------------------- -// -// wxURL -// -// -------------------------------------------------------------- - -// -------------------------------------------------------------- -// Construction -// -------------------------------------------------------------- - -wxURL::wxURL(const wxString& url) : wxURI(url) -{ - Init(url); - ParseURL(); -} - -wxURL::wxURL(const wxURI& uri) : wxURI(uri) -{ - Init(uri.BuildURI()); - ParseURL(); -} - -wxURL::wxURL(const wxURL& url) : wxURI(url) -{ - Init(url.GetURL()); - ParseURL(); -} - -void wxURL::Init(const wxString& url) -{ - m_protocol = NULL; - m_error = wxURL_NOERR; - m_url = url; -#if wxUSE_URL_NATIVE - m_nativeImp = CreateNativeImpObject(); -#endif - -#if wxUSE_PROTOCOL_HTTP - if ( ms_useDefaultProxy && !ms_proxyDefault ) - { - SetDefaultProxy( wxGetenv(wxT("HTTP_PROXY")) ); - - if ( !ms_proxyDefault ) - { - // don't try again - ms_useDefaultProxy = false; - } - } - - m_useProxy = ms_proxyDefault != NULL; - m_proxy = ms_proxyDefault; -#endif // wxUSE_PROTOCOL_HTTP - -} - -// -------------------------------------------------------------- -// Assignment -// -------------------------------------------------------------- - -wxURL& wxURL::operator = (const wxString& url) -{ - wxURI::operator = (url); - Free(); - Init(url); - ParseURL(); - - return *this; -} - -wxURL& wxURL::operator = (const wxURI& uri) -{ - if (&uri != this) - { - wxURI::operator = (uri); - Free(); - Init(uri.BuildURI()); - ParseURL(); - } - - return *this; -} - -wxURL& wxURL::operator = (const wxURL& url) -{ - if (&url != this) - { - wxURI::operator = (url); - Free(); - Init(url.GetURL()); - ParseURL(); - } - - return *this; -} - -// -------------------------------------------------------------- -// ParseURL -// -// Builds the URL and takes care of the old protocol stuff -// -------------------------------------------------------------- - -bool wxURL::ParseURL() -{ - // If the URL was already parsed (m_protocol != NULL), pass this section. - if (!m_protocol) - { - // Clean up - CleanData(); - - // Make sure we have a protocol/scheme - if (!HasScheme()) - { - m_error = wxURL_SNTXERR; - return false; - } - - // Find and create the protocol object - if (!FetchProtocol()) - { - m_error = wxURL_NOPROTO; - return false; - } - - // Do we need a host name ? - if (m_protoinfo->m_needhost) - { - // Make sure we have one, then - if (!HasServer()) - { - m_error = wxURL_SNTXERR; - return false; - } - } - } - -#if wxUSE_PROTOCOL_HTTP - if (m_useProxy) - { - // Third, we rebuild the URL. - m_url = m_scheme + wxT(":"); - if (m_protoinfo->m_needhost) - m_url = m_url + wxT("//") + m_server; - - // We initialize specific variables. - if (m_protocol) - m_protocol->Destroy(); - m_protocol = m_proxy; // FIXME: we should clone the protocol - } -#endif // wxUSE_PROTOCOL_HTTP - - m_error = wxURL_NOERR; - return true; -} - -// -------------------------------------------------------------- -// Destruction/Cleanup -// -------------------------------------------------------------- - -void wxURL::CleanData() -{ -#if wxUSE_PROTOCOL_HTTP - if (!m_useProxy) -#endif // wxUSE_PROTOCOL_HTTP - { - if (m_protocol) - { - // Need to safely delete the socket (pending events) - m_protocol->Destroy(); - m_protocol = NULL; - } - } -} - -void wxURL::Free() -{ - CleanData(); -#if wxUSE_PROTOCOL_HTTP - if (m_proxy && m_proxy != ms_proxyDefault) - delete m_proxy; -#endif // wxUSE_PROTOCOL_HTTP -#if wxUSE_URL_NATIVE - delete m_nativeImp; -#endif -} - -wxURL::~wxURL() -{ - Free(); -} - -// -------------------------------------------------------------- -// FetchProtocol -// -------------------------------------------------------------- - -bool wxURL::FetchProtocol() -{ - wxProtoInfo *info = ms_protocols; - - while (info) - { - if (m_scheme == info->m_protoname) - { - if ( m_port.empty() ) - m_port = info->m_servname; - m_protoinfo = info; - m_protocol = (wxProtocol *)m_protoinfo->m_cinfo->CreateObject(); - return true; - } - info = info->next; - } - return false; -} - -// -------------------------------------------------------------- -// GetInputStream -// -------------------------------------------------------------- - -wxInputStream *wxURL::GetInputStream() -{ - if (!m_protocol) - { - m_error = wxURL_NOPROTO; - return NULL; - } - - m_error = wxURL_NOERR; - if (HasUserInfo()) - { - size_t dwPasswordPos = m_userinfo.find(':'); - - if (dwPasswordPos == wxString::npos) - m_protocol->SetUser(Unescape(m_userinfo)); - else - { - m_protocol->SetUser(Unescape(m_userinfo(0, dwPasswordPos))); - m_protocol->SetPassword(Unescape(m_userinfo(dwPasswordPos+1, m_userinfo.length() + 1))); - } - } - -#if wxUSE_URL_NATIVE - // give the native implementation to return a better stream - // such as the native WinINet functionality under MS-Windows - if (m_nativeImp) - { - wxInputStream *rc; - rc = m_nativeImp->GetInputStream(this); - if (rc != 0) - return rc; - } - // else use the standard behaviour -#endif // wxUSE_URL_NATIVE - -#if wxUSE_SOCKETS - wxIPV4address addr; - - // m_protoinfo is NULL when we use a proxy - if ( -#if wxUSE_PROTOCOL_HTTP - !m_useProxy && -#endif // wxUSE_PROTOCOL_HTTP - m_protoinfo->m_needhost ) - { - if (!addr.Hostname(m_server)) - { - m_error = wxURL_NOHOST; - return NULL; - } - - addr.Service(m_port); - - if (!m_protocol->Connect(addr)) - { - m_error = wxURL_CONNERR; - return NULL; - } - } -#endif // wxUSE_SOCKETS - - wxString fullPath; - -#if wxUSE_PROTOCOL_HTTP - // When we use a proxy, we have to pass the whole URL to it. - if (m_useProxy) - fullPath += m_url; -#endif // wxUSE_PROTOCOL_HTTP - - if(m_path.empty()) - fullPath += wxT("/"); - else - fullPath += m_path; - - if (HasQuery()) - fullPath += wxT("?") + m_query; - - if (HasFragment()) - fullPath += wxT("#") + m_fragment; - - wxInputStream *the_i_stream = m_protocol->GetInputStream(fullPath); - - if (!the_i_stream) - { - m_error = wxURL_PROTOERR; - return NULL; - } - - return the_i_stream; -} - -#if wxUSE_PROTOCOL_HTTP -void wxURL::SetDefaultProxy(const wxString& url_proxy) -{ - if ( !url_proxy ) - { - if ( ms_proxyDefault ) - { - ms_proxyDefault->Close(); - wxDELETE(ms_proxyDefault); - } - } - else - { - wxString tmp_str = url_proxy; - int pos = tmp_str.Find(wxT(':')); - if (pos == wxNOT_FOUND) - return; - - wxString hostname = tmp_str(0, pos), - port = tmp_str(pos+1, tmp_str.length()-pos); - wxIPV4address addr; - - if (!addr.Hostname(hostname)) - return; - if (!addr.Service(port)) - return; - - if (ms_proxyDefault) - // Finally, when all is right, we connect the new proxy. - ms_proxyDefault->Close(); - else - ms_proxyDefault = new wxHTTP(); - ms_proxyDefault->Connect(addr); - } -} - -void wxURL::SetProxy(const wxString& url_proxy) -{ - if ( !url_proxy ) - { - if ( m_proxy && m_proxy != ms_proxyDefault ) - { - m_proxy->Close(); - delete m_proxy; - } - - m_useProxy = false; - } - else - { - wxString tmp_str; - wxString hostname, port; - int pos; - wxIPV4address addr; - - tmp_str = url_proxy; - pos = tmp_str.Find(wxT(':')); - // This is an invalid proxy name. - if (pos == wxNOT_FOUND) - return; - - hostname = tmp_str(0, pos); - port = tmp_str(pos+1, tmp_str.length()-pos); - - addr.Hostname(hostname); - addr.Service(port); - - // Finally, create the whole stuff. - if (m_proxy && m_proxy != ms_proxyDefault) - delete m_proxy; - m_proxy = new wxHTTP(); - m_proxy->Connect(addr); - - CleanData(); - // Reparse url. - m_useProxy = true; - ParseURL(); - } -} -#endif // wxUSE_PROTOCOL_HTTP - -// ---------------------------------------------------------------------- -// wxURLModule -// -// A module which deletes the default proxy if we created it -// ---------------------------------------------------------------------- - -#if wxUSE_SOCKETS - -class wxURLModule : public wxModule -{ -public: - wxURLModule(); - - virtual bool OnInit() wxOVERRIDE; - virtual void OnExit() wxOVERRIDE; - -private: - wxDECLARE_DYNAMIC_CLASS(wxURLModule); -}; - -wxIMPLEMENT_DYNAMIC_CLASS(wxURLModule, wxModule); - -wxURLModule::wxURLModule() -{ - // we must be cleaned up before wxSocketModule as otherwise deleting - // ms_proxyDefault from our OnExit() won't work (and can actually crash) - AddDependency(wxClassInfo::FindClass(wxT("wxSocketModule"))); -} - -bool wxURLModule::OnInit() -{ -#if wxUSE_PROTOCOL_HTTP - // env var HTTP_PROXY contains the address of the default proxy to use if - // set, but don't try to create this proxy right now because it will slow - // down the program startup (especially if there is no DNS server - // available, in which case it may take up to 1 minute) - - if ( wxGetenv(wxT("HTTP_PROXY")) ) - { - wxURL::ms_useDefaultProxy = true; - } -#endif // wxUSE_PROTOCOL_HTTP - return true; -} - -void wxURLModule::OnExit() -{ -#if wxUSE_PROTOCOL_HTTP - wxDELETE(wxURL::ms_proxyDefault); -#endif // wxUSE_PROTOCOL_HTTP -} - -#endif // wxUSE_SOCKETS - - -#endif // wxUSE_URL diff --git a/Externals/wxWidgets3/src/common/ustring.cpp b/Externals/wxWidgets3/src/common/ustring.cpp deleted file mode 100644 index ab70ce5ae2..0000000000 --- a/Externals/wxWidgets3/src/common/ustring.cpp +++ /dev/null @@ -1,537 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/ustring.cpp -// Purpose: wxUString class -// Author: Robert Roebling -// Created: 2008-07-25 -// Copyright: (c) 2008 Robert Roebling -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include "wx/ustring.h" - -#ifndef WX_PRECOMP - #include "wx/crt.h" - #include "wx/log.h" -#endif - -wxUString &wxUString::assignFromAscii( const char *str ) -{ - size_type len = wxStrlen( str ); - - wxU32CharBuffer buffer( len ); - wxChar32 *ptr = buffer.data(); - - size_type i; - for (i = 0; i < len; i++) - { - *ptr = *str; - ptr++; - str++; - } - - return assign( buffer ); -} - -wxUString &wxUString::assignFromAscii( const char *str, size_type n ) -{ - size_type len = 0; - const char *s = str; - while (len < n && *s) - { - len++; - s++; - } - - wxU32CharBuffer buffer( len ); - wxChar32 *ptr = buffer.data(); - - size_type i; - for (i = 0; i < len; i++) - { - *ptr = *str; - ptr++; - str++; - } - - return *this; -} - -// ---------------------------------------------------------------------------- -// UTF-8 -// ---------------------------------------------------------------------------- - -// this table gives the length of the UTF-8 encoding from its first character: -const unsigned char tableUtf8Lengths[256] = { - // single-byte sequences (ASCII): - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 00..0F - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 10..1F - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 20..2F - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 30..3F - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 40..4F - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 50..5F - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 60..6F - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 70..7F - - // these are invalid: - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 80..8F - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 90..9F - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // A0..AF - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // B0..BF - 0, 0, // C0,C1 - - // two-byte sequences: - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, // C2..CF - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, // D0..DF - - // three-byte sequences: - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // E0..EF - - // four-byte sequences: - 4, 4, 4, 4, 4, // F0..F4 - - // these are invalid again (5- or 6-byte - // sequences and sequences for code points - // above U+10FFFF, as restricted by RFC 3629): - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 // F5..FF -}; - -wxUString &wxUString::assignFromUTF8( const char *str ) -{ - if (!str) - return assign( wxUString() ); - - size_type ucs4_len = 0; - const char *p = str; - while (*p) - { - unsigned char c = *p; - size_type len = tableUtf8Lengths[c]; - if (!len) - return assign( wxUString() ); // don't try to convert invalid UTF-8 - ucs4_len++; - p += len; - } - - wxU32CharBuffer buffer( ucs4_len ); - wxChar32 *out = buffer.data(); - - p = str; - while (*p) - { - unsigned char c = *p; - if (c < 0x80) - { - *out = c; - p++; - } - else - { - size_type len = tableUtf8Lengths[c]; // len == 0 is caught above - - // Char. number range | UTF-8 octet sequence - // (hexadecimal) | (binary) - // ----------------------+---------------------------------------- - // 0000 0000 - 0000 007F | 0xxxxxxx - // 0000 0080 - 0000 07FF | 110xxxxx 10xxxxxx - // 0000 0800 - 0000 FFFF | 1110xxxx 10xxxxxx 10xxxxxx - // 0001 0000 - 0010 FFFF | 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx - // - // Code point value is stored in bits marked with 'x', - // lowest-order bit of the value on the right side in the diagram - // above. (from RFC 3629) - - // mask to extract lead byte's value ('x' bits above), by sequence - // length: - static const unsigned char leadValueMask[] = { 0x7F, 0x1F, 0x0F, 0x07 }; - - // mask and value of lead byte's most significant bits, by length: - static const unsigned char leadMarkerMask[] = { 0x80, 0xE0, 0xF0, 0xF8 }; - static const unsigned char leadMarkerVal[] = { 0x00, 0xC0, 0xE0, 0xF0 }; - - len--; // it's more convenient to work with 0-based length here - - // extract the lead byte's value bits: - if ( (c & leadMarkerMask[len]) != leadMarkerVal[len] ) - break; - - wxChar32 code = c & leadValueMask[len]; - - // all remaining bytes, if any, are handled in the same way - // regardless of sequence's length: - for ( ; len; --len ) - { - c = *++p; - if ( (c & 0xC0) != 0x80 ) - return assign( wxUString() ); // don't try to convert invalid UTF-8 - - code <<= 6; - code |= c & 0x3F; - } - - *out = code; - p++; - } - out++; - } - - return assign( buffer.data() ); -} - -wxUString &wxUString::assignFromUTF8( const char *str, size_type n ) -{ - if (!str) - return assign( wxUString() ); - - size_type ucs4_len = 0; - size_type utf8_pos = 0; - const char *p = str; - while (*p) - { - unsigned char c = *p; - size_type len = tableUtf8Lengths[c]; - if (!len) - return assign( wxUString() ); // don't try to convert invalid UTF-8 - if (utf8_pos + len > n) - break; - utf8_pos += len; - ucs4_len ++; - p += len; - } - - wxU32CharBuffer buffer( ucs4_len ); - wxChar32 *out = buffer.data(); - - utf8_pos = 0; - p = str; - while (*p) - { - unsigned char c = *p; - if (c < 0x80) - { - if (utf8_pos + 1 > n) - break; - utf8_pos++; - - *out = c; - p++; - } - else - { - size_type len = tableUtf8Lengths[c]; // len == 0 is caught above - if (utf8_pos + len > n) - break; - utf8_pos += len; - - // Char. number range | UTF-8 octet sequence - // (hexadecimal) | (binary) - // ----------------------+---------------------------------------- - // 0000 0000 - 0000 007F | 0xxxxxxx - // 0000 0080 - 0000 07FF | 110xxxxx 10xxxxxx - // 0000 0800 - 0000 FFFF | 1110xxxx 10xxxxxx 10xxxxxx - // 0001 0000 - 0010 FFFF | 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx - // - // Code point value is stored in bits marked with 'x', - // lowest-order bit of the value on the right side in the diagram - // above. (from RFC 3629) - - // mask to extract lead byte's value ('x' bits above), by sequence - // length: - static const unsigned char leadValueMask[] = { 0x7F, 0x1F, 0x0F, 0x07 }; - - // mask and value of lead byte's most significant bits, by length: - static const unsigned char leadMarkerMask[] = { 0x80, 0xE0, 0xF0, 0xF8 }; - static const unsigned char leadMarkerVal[] = { 0x00, 0xC0, 0xE0, 0xF0 }; - - len--; // it's more convenient to work with 0-based length here - - // extract the lead byte's value bits: - if ( (c & leadMarkerMask[len]) != leadMarkerVal[len] ) - break; - - wxChar32 code = c & leadValueMask[len]; - - // all remaining bytes, if any, are handled in the same way - // regardless of sequence's length: - for ( ; len; --len ) - { - c = *++p; - if ( (c & 0xC0) != 0x80 ) - return assign( wxUString() ); // don't try to convert invalid UTF-8 - - code <<= 6; - code |= c & 0x3F; - } - - *out = code; - p++; - } - out++; - } - - *out = 0; - - return assign( buffer.data() ); -} - -wxUString &wxUString::assignFromUTF16( const wxChar16* str, size_type n ) -{ - if (!str) - return assign( wxUString() ); - - size_type ucs4_len = 0; - size_type utf16_pos = 0; - const wxChar16 *p = str; - while (*p) - { - size_type len; - if ((*p < 0xd800) || (*p > 0xdfff)) - { - len = 1; - } - else if ((p[1] < 0xdc00) || (p[1] > 0xdfff)) - { - return assign( wxUString() ); // don't try to convert invalid UTF-16 - } - else - { - len = 2; - } - - if (utf16_pos + len > n) - break; - - ucs4_len++; - p += len; - utf16_pos += len; - } - - wxU32CharBuffer buffer( ucs4_len ); - wxChar32 *out = buffer.data(); - - utf16_pos = 0; - - p = str; - while (*p) - { - if ((*p < 0xd800) || (*p > 0xdfff)) - { - if (utf16_pos + 1 > n) - break; - - *out = *p; - p++; - utf16_pos++; - } - else - { - if (utf16_pos + 2 > n) - break; - - *out = ((p[0] - 0xd7c0) << 10) + (p[1] - 0xdc00); - p += 2; - utf16_pos += 2; - } - out++; - } - - return assign( buffer.data() ); -} - -wxUString &wxUString::assignFromUTF16( const wxChar16* str ) -{ - if (!str) - return assign( wxUString() ); - - size_type ucs4_len = 0; - const wxChar16 *p = str; - while (*p) - { - size_type len; - if ((*p < 0xd800) || (*p > 0xdfff)) - { - len = 1; - } - else if ((p[1] < 0xdc00) || (p[1] > 0xdfff)) - { - return assign( wxUString() ); // don't try to convert invalid UTF-16 - } - else - { - len = 2; - } - - ucs4_len++; - p += len; - } - - wxU32CharBuffer buffer( ucs4_len ); - wxChar32 *out = buffer.data(); - - p = str; - while (*p) - { - if ((*p < 0xd800) || (*p > 0xdfff)) - { - *out = *p; - p++; - } - else - { - *out = ((p[0] - 0xd7c0) << 10) + (p[1] - 0xdc00); - p += 2; - } - out++; - } - - return assign( buffer.data() ); -} - -wxUString &wxUString::assignFromCString( const char* str ) -{ - if (!str) - return assign( wxUString() ); - - wxScopedWCharBuffer buffer = wxConvLibc.cMB2WC( str ); - - return assign( buffer ); -} - -wxUString &wxUString::assignFromCString( const char* str, const wxMBConv &conv ) -{ - if (!str) - return assign( wxUString() ); - - wxScopedWCharBuffer buffer = conv.cMB2WC( str ); - - return assign( buffer ); -} - -wxScopedCharBuffer wxUString::utf8_str() const -{ - size_type utf8_length = 0; - const wxChar32 *ptr = data(); - - while (*ptr) - { - wxChar32 code = *ptr; - ptr++; - - if ( code <= 0x7F ) - { - utf8_length++; - } - else if ( code <= 0x07FF ) - { - utf8_length += 2; - } - else if ( code < 0xFFFF ) - { - utf8_length += 3; - } - else if ( code <= 0x10FFFF ) - { - utf8_length += 4; - } - else - { - // invalid range, skip - } - } - - wxCharBuffer result( utf8_length ); - - char *out = result.data(); - - ptr = data(); - while (*ptr) - { - wxChar32 code = *ptr; - ptr++; - - if ( code <= 0x7F ) - { - out[0] = (char)code; - out++; - } - else if ( code <= 0x07FF ) - { - out[1] = 0x80 | (code & 0x3F); code >>= 6; - out[0] = 0xC0 | code; - out += 2; - } - else if ( code < 0xFFFF ) - { - out[2] = 0x80 | (code & 0x3F); code >>= 6; - out[1] = 0x80 | (code & 0x3F); code >>= 6; - out[0] = 0xE0 | code; - out += 3; - } - else if ( code <= 0x10FFFF ) - { - out[3] = 0x80 | (code & 0x3F); code >>= 6; - out[2] = 0x80 | (code & 0x3F); code >>= 6; - out[1] = 0x80 | (code & 0x3F); code >>= 6; - out[0] = 0xF0 | code; - out += 4; - } - else - { - // invalid range, skip - } - } - - return result; -} - -wxScopedU16CharBuffer wxUString::utf16_str() const -{ - size_type utf16_length = 0; - const wxChar32 *ptr = data(); - - while (*ptr) - { - wxChar32 code = *ptr; - ptr++; - - // TODO: error range checks - - if (code < 0x10000) - utf16_length++; - else - utf16_length += 2; - } - - wxU16CharBuffer result( utf16_length ); - wxChar16 *out = result.data(); - - ptr = data(); - - while (*ptr) - { - wxChar32 code = *ptr; - ptr++; - - // TODO: error range checks - - if (code < 0x10000) - { - out[0] = code; - out++; - } - else - { - out[0] = (code - 0x10000) / 0x400 + 0xd800; - out[1] = (code - 0x10000) % 0x400 + 0xdc00; - out += 2; - } - } - - return result; -} diff --git a/Externals/wxWidgets3/src/common/utilscmn.cpp b/Externals/wxWidgets3/src/common/utilscmn.cpp deleted file mode 100644 index fbf933fa94..0000000000 --- a/Externals/wxWidgets3/src/common/utilscmn.cpp +++ /dev/null @@ -1,1553 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/utilscmn.cpp -// Purpose: Miscellaneous utility functions and classes -// Author: Julian Smart -// Modified by: -// Created: 29/01/98 -// Copyright: (c) 1998 Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -// See comment about this hack in time.cpp: here we do it for environ external -// variable which can't be easily declared when using MinGW in strict ANSI mode. -#ifdef wxNEEDS_STRICT_ANSI_WORKAROUNDS - #undef __STRICT_ANSI__ - #include - #define __STRICT_ANSI__ -#endif - -#ifndef WX_PRECOMP - #include "wx/app.h" - #include "wx/string.h" - #include "wx/utils.h" - #include "wx/intl.h" - #include "wx/log.h" - - #if wxUSE_GUI - #include "wx/window.h" - #include "wx/frame.h" - #include "wx/menu.h" - #include "wx/msgdlg.h" - #include "wx/textdlg.h" - #include "wx/textctrl.h" // for wxTE_PASSWORD - #if wxUSE_ACCEL - #include "wx/menuitem.h" - #include "wx/accel.h" - #endif // wxUSE_ACCEL - #endif // wxUSE_GUI -#endif // WX_PRECOMP - -#include "wx/apptrait.h" - -#include "wx/process.h" -#include "wx/txtstrm.h" -#include "wx/uri.h" -#include "wx/mimetype.h" -#include "wx/config.h" -#include "wx/versioninfo.h" -#include "wx/math.h" - -#include -#include -#include -#include -#include - -#if wxUSE_GUI - #include "wx/filesys.h" - #include "wx/notebook.h" - #include "wx/statusbr.h" - #include "wx/private/launchbrowser.h" -#endif // wxUSE_GUI - -#include - -#ifdef __WXMAC__ - #include "wx/osx/private.h" -#endif - -#include -#include - -#if defined(__WINDOWS__) - #include "wx/msw/private.h" -#endif - -#if wxUSE_GUI && defined(__WXGTK__) - #include // for GTK_XXX_VERSION constants -#endif - -#if wxUSE_GUI && defined(__WXQT__) - #include // for QT_VERSION_STR constants -#endif -#if wxUSE_BASE - -// ============================================================================ -// implementation -// ============================================================================ - -// Array used in DecToHex conversion routine. -static const wxChar hexArray[] = wxT("0123456789ABCDEF"); - -// Convert 2-digit hex number to decimal -int wxHexToDec(const wxString& str) -{ - char buf[2]; - buf[0] = str.GetChar(0); - buf[1] = str.GetChar(1); - return wxHexToDec((const char*) buf); -} - -// Convert decimal integer to 2-character hex string -void wxDecToHex(int dec, wxChar *buf) -{ - int firstDigit = (int)(dec/16.0); - int secondDigit = (int)(dec - (firstDigit*16.0)); - buf[0] = hexArray[firstDigit]; - buf[1] = hexArray[secondDigit]; - buf[2] = 0; -} - -// Convert decimal integer to 2 characters -void wxDecToHex(int dec, char* ch1, char* ch2) -{ - int firstDigit = (int)(dec/16.0); - int secondDigit = (int)(dec - (firstDigit*16.0)); - (*ch1) = (char) hexArray[firstDigit]; - (*ch2) = (char) hexArray[secondDigit]; -} - -// Convert decimal integer to 2-character hex string -wxString wxDecToHex(int dec) -{ - wxChar buf[3]; - wxDecToHex(dec, buf); - return wxString(buf); -} - -// ---------------------------------------------------------------------------- -// misc functions -// ---------------------------------------------------------------------------- - -// Return the current date/time -wxString wxNow() -{ - time_t now = time(NULL); - char *date = ctime(&now); - date[24] = '\0'; - return wxString::FromAscii(date); -} - -#if WXWIN_COMPATIBILITY_2_8 -void wxUsleep(unsigned long milliseconds) -{ - wxMilliSleep(milliseconds); -} -#endif - -const wxChar *wxGetInstallPrefix() -{ - wxString prefix; - - if ( wxGetEnv(wxT("WXPREFIX"), &prefix) ) - return prefix.c_str(); - -#ifdef wxINSTALL_PREFIX - return wxT(wxINSTALL_PREFIX); -#else - return wxEmptyString; -#endif -} - -wxString wxGetDataDir() -{ - wxString dir = wxGetInstallPrefix(); - dir << wxFILE_SEP_PATH << wxT("share") << wxFILE_SEP_PATH << wxT("wx"); - return dir; -} - -bool wxIsPlatformLittleEndian() -{ - // Are we little or big endian? This method is from Harbison & Steele. - union - { - long l; - char c[sizeof(long)]; - } u; - u.l = 1; - - return u.c[0] == 1; -} - - -// ---------------------------------------------------------------------------- -// wxPlatform -// ---------------------------------------------------------------------------- - -/* - * Class to make it easier to specify platform-dependent values - */ - -wxArrayInt* wxPlatform::sm_customPlatforms = NULL; - -void wxPlatform::Copy(const wxPlatform& platform) -{ - m_longValue = platform.m_longValue; - m_doubleValue = platform.m_doubleValue; - m_stringValue = platform.m_stringValue; -} - -wxPlatform wxPlatform::If(int platform, long value) -{ - if (Is(platform)) - return wxPlatform(value); - else - return wxPlatform(); -} - -wxPlatform wxPlatform::IfNot(int platform, long value) -{ - if (!Is(platform)) - return wxPlatform(value); - else - return wxPlatform(); -} - -wxPlatform& wxPlatform::ElseIf(int platform, long value) -{ - if (Is(platform)) - m_longValue = value; - return *this; -} - -wxPlatform& wxPlatform::ElseIfNot(int platform, long value) -{ - if (!Is(platform)) - m_longValue = value; - return *this; -} - -wxPlatform wxPlatform::If(int platform, double value) -{ - if (Is(platform)) - return wxPlatform(value); - else - return wxPlatform(); -} - -wxPlatform wxPlatform::IfNot(int platform, double value) -{ - if (!Is(platform)) - return wxPlatform(value); - else - return wxPlatform(); -} - -wxPlatform& wxPlatform::ElseIf(int platform, double value) -{ - if (Is(platform)) - m_doubleValue = value; - return *this; -} - -wxPlatform& wxPlatform::ElseIfNot(int platform, double value) -{ - if (!Is(platform)) - m_doubleValue = value; - return *this; -} - -wxPlatform wxPlatform::If(int platform, const wxString& value) -{ - if (Is(platform)) - return wxPlatform(value); - else - return wxPlatform(); -} - -wxPlatform wxPlatform::IfNot(int platform, const wxString& value) -{ - if (!Is(platform)) - return wxPlatform(value); - else - return wxPlatform(); -} - -wxPlatform& wxPlatform::ElseIf(int platform, const wxString& value) -{ - if (Is(platform)) - m_stringValue = value; - return *this; -} - -wxPlatform& wxPlatform::ElseIfNot(int platform, const wxString& value) -{ - if (!Is(platform)) - m_stringValue = value; - return *this; -} - -wxPlatform& wxPlatform::Else(long value) -{ - m_longValue = value; - return *this; -} - -wxPlatform& wxPlatform::Else(double value) -{ - m_doubleValue = value; - return *this; -} - -wxPlatform& wxPlatform::Else(const wxString& value) -{ - m_stringValue = value; - return *this; -} - -void wxPlatform::AddPlatform(int platform) -{ - if (!sm_customPlatforms) - sm_customPlatforms = new wxArrayInt; - sm_customPlatforms->Add(platform); -} - -void wxPlatform::ClearPlatforms() -{ - wxDELETE(sm_customPlatforms); -} - -/// Function for testing current platform - -bool wxPlatform::Is(int platform) -{ -#ifdef __WINDOWS__ - if (platform == wxOS_WINDOWS) - return true; -#endif - -#ifdef __WXGTK__ - if (platform == wxPORT_GTK) - return true; -#endif -#ifdef __WXMAC__ - if (platform == wxPORT_MAC) - return true; -#endif -#ifdef __WXX11__ - if (platform == wxPORT_X11) - return true; -#endif -#ifdef __UNIX__ - if (platform == wxOS_UNIX) - return true; -#endif -#ifdef __WXQT__ - if (platform == wxPORT_QT) - return true; -#endif - - if (sm_customPlatforms && sm_customPlatforms->Index(platform) != wxNOT_FOUND) - return true; - - return false; -} - -// ---------------------------------------------------------------------------- -// network and user id functions -// ---------------------------------------------------------------------------- - -// Get Full RFC822 style email address -bool wxGetEmailAddress(wxChar *address, int maxSize) -{ - wxString email = wxGetEmailAddress(); - if ( !email ) - return false; - - wxStrlcpy(address, email.t_str(), maxSize); - - return true; -} - -wxString wxGetEmailAddress() -{ - wxString email; - - wxString host = wxGetFullHostName(); - if ( !host.empty() ) - { - wxString user = wxGetUserId(); - if ( !user.empty() ) - { - email << user << wxT('@') << host; - } - } - - return email; -} - -wxString wxGetUserId() -{ - static const int maxLoginLen = 256; // FIXME arbitrary number - - wxString buf; - bool ok = wxGetUserId(wxStringBuffer(buf, maxLoginLen), maxLoginLen); - - if ( !ok ) - buf.Empty(); - - return buf; -} - -wxString wxGetUserName() -{ - static const int maxUserNameLen = 1024; // FIXME arbitrary number - - wxString buf; - bool ok = wxGetUserName(wxStringBuffer(buf, maxUserNameLen), maxUserNameLen); - - if ( !ok ) - buf.Empty(); - - return buf; -} - -wxString wxGetHostName() -{ - static const size_t hostnameSize = 257; - - wxString buf; - bool ok = wxGetHostName(wxStringBuffer(buf, hostnameSize), hostnameSize); - - if ( !ok ) - buf.Empty(); - - return buf; -} - -wxString wxGetFullHostName() -{ - static const size_t hostnameSize = 257; - - wxString buf; - bool ok = wxGetFullHostName(wxStringBuffer(buf, hostnameSize), hostnameSize); - - if ( !ok ) - buf.Empty(); - - return buf; -} - -wxString wxGetHomeDir() -{ - wxString home; - wxGetHomeDir(&home); - - return home; -} - -#if 0 - -wxString wxGetCurrentDir() -{ - wxString dir; - size_t len = 1024; - bool ok; - do - { - ok = getcwd(dir.GetWriteBuf(len + 1), len) != NULL; - dir.UngetWriteBuf(); - - if ( !ok ) - { - if ( errno != ERANGE ) - { - wxLogSysError(wxT("Failed to get current directory")); - - return wxEmptyString; - } - else - { - // buffer was too small, retry with a larger one - len *= 2; - } - } - //else: ok - } while ( !ok ); - - return dir; -} - -#endif // 0 - -// ---------------------------------------------------------------------------- -// Environment -// ---------------------------------------------------------------------------- - -#ifdef __WXOSX__ -#if wxOSX_USE_COCOA_OR_CARBON - #include -#endif -#endif - -bool wxGetEnvMap(wxEnvVariableHashMap *map) -{ - wxCHECK_MSG( map, false, wxS("output pointer can't be NULL") ); - -#if defined(__VISUALC__) - // This variable only exists to force the CRT to fill the wide char array, - // it might only have it in narrow char version until now as we use main() - // (and not _wmain()) as our entry point. - static wxChar* s_dummyEnvVar = _tgetenv(wxT("TEMP")); - - wxChar **env = _tenviron; -#elif defined(__VMS) - // Now this routine wil give false for OpenVMS - // TODO : should we do something with logicals? - char **env=NULL; -#elif defined(__DARWIN__) -#if wxOSX_USE_COCOA_OR_CARBON - // Under Mac shared libraries don't have access to the global environ - // variable so use this Mac-specific function instead as advised by - // environ(7) under Darwin - char ***penv = _NSGetEnviron(); - if ( !penv ) - return false; - char **env = *penv; -#else - char **env=NULL; - // todo translate NSProcessInfo environment into map -#endif -#else // non-MSVC non-Mac - // Not sure if other compilers have _tenviron so use the (more standard) - // ANSI version only for them. - - // Both POSIX and Single UNIX Specification say that this variable must - // exist but not that it must be declared anywhere and, indeed, it's not - // declared in several common systems (some BSDs, Solaris with native CC) - // so we (re)declare it ourselves to deal with these cases. However we do - // not do this under MSW where there can be DLL-related complications, i.e. - // the variable might be DLL-imported or not. Luckily we don't have to - // worry about this as all MSW compilers do seem to define it in their - // standard headers anyhow so we can just rely on already having the - // correct declaration. And if this turns out to be wrong, we can always - // add a configure test checking whether it is declared later. -#ifndef __WINDOWS__ - extern char **environ; -#endif // !__WINDOWS__ - - char **env = environ; -#endif - - if ( env ) - { - wxString name, - value; - while ( *env ) - { - const wxString var(*env); - - name = var.BeforeFirst(wxS('='), &value); - - (*map)[name] = value; - - env++; - } - - return true; - } - - return false; -} - -// ---------------------------------------------------------------------------- -// wxExecute -// ---------------------------------------------------------------------------- - -// wxDoExecuteWithCapture() helper: reads an entire stream into one array if -// the stream is non-NULL (it doesn't do anything if it's NULL). -// -// returns true if ok, false if error -#if wxUSE_STREAMS -static bool ReadAll(wxInputStream *is, wxArrayString& output) -{ - if ( !is ) - return true; - - // the stream could be already at EOF or in wxSTREAM_BROKEN_PIPE state - is->Reset(); - - // Notice that wxTextInputStream doesn't work correctly with wxConvAuto - // currently, see #14720, so use the current locale conversion explicitly - // under assumption that any external program should be using it too. - wxTextInputStream tis(*is, " \t" -#if wxUSE_UNICODE - , wxConvLibc -#endif - ); - - for ( ;; ) - { - wxString line = tis.ReadLine(); - - // check for EOF before other errors as it's not really an error - if ( is->Eof() ) - { - // add the last, possibly incomplete, line - if ( !line.empty() ) - output.Add(line); - break; - } - - // any other error is fatal - if ( !*is ) - return false; - - output.Add(line); - } - - return true; -} -#endif // wxUSE_STREAMS - -// this is a private function because it hasn't a clean interface: the first -// array is passed by reference, the second by pointer - instead we have 2 -// public versions of wxExecute() below -static long wxDoExecuteWithCapture(const wxString& command, - wxArrayString& output, - wxArrayString* error, - int flags, - const wxExecuteEnv *env) -{ - // create a wxProcess which will capture the output - wxProcess *process = new wxProcess; - process->Redirect(); - - long rc = wxExecute(command, wxEXEC_SYNC | flags, process, env); - -#if wxUSE_STREAMS - // Notice that while -1 indicates an error exit code for us, a program - // exiting with this code could still have written something to its stdout - // and, especially, stderr, so we still need to read from them. - if ( !ReadAll(process->GetInputStream(), output) ) - rc = -1; - - if ( error ) - { - if ( !ReadAll(process->GetErrorStream(), *error) ) - rc = -1; - } -#else - wxUnusedVar(output); - wxUnusedVar(error); -#endif // wxUSE_STREAMS/!wxUSE_STREAMS - - delete process; - - return rc; -} - -long wxExecute(const wxString& command, wxArrayString& output, int flags, - const wxExecuteEnv *env) -{ - return wxDoExecuteWithCapture(command, output, NULL, flags, env); -} - -long wxExecute(const wxString& command, - wxArrayString& output, - wxArrayString& error, - int flags, - const wxExecuteEnv *env) -{ - return wxDoExecuteWithCapture(command, output, &error, flags, env); -} - -// ---------------------------------------------------------------------------- -// Id functions -// ---------------------------------------------------------------------------- - -// Id generation -static int wxCurrentId = 100; - -int wxNewId() -{ - // skip the part of IDs space that contains hard-coded values: - if (wxCurrentId == wxID_LOWEST) - wxCurrentId = wxID_HIGHEST + 1; - - return wxCurrentId++; -} - -int -wxGetCurrentId(void) { return wxCurrentId; } - -void -wxRegisterId (int id) -{ - if (id >= wxCurrentId) - wxCurrentId = id + 1; -} - -// ---------------------------------------------------------------------------- -// wxQsort, adapted by RR to allow user_data -// ---------------------------------------------------------------------------- - -/* This file is part of the GNU C Library. - Written by Douglas C. Schmidt (schmidt@ics.uci.edu). - - Douglas Schmidt kindly gave permission to relicence the - code under the wxWindows licence: - -From: "Douglas C. Schmidt" -To: Robert Roebling -Subject: Re: qsort licence -Date: Mon, 23 Jul 2007 03:44:25 -0500 -Sender: schmidt@dre.vanderbilt.edu -Message-Id: <20070723084426.64F511000A8@tango.dre.vanderbilt.edu> - -Hi Robert, - -> [...] I'm asking if you'd be willing to relicence your code -> under the wxWindows licence. [...] - -That's fine with me [...] - -Thanks, - - Doug */ - - -/* Byte-wise swap two items of size SIZE. */ -#define SWAP(a, b, size) \ - do \ - { \ - size_t __size = (size); \ - char *__a = (a), *__b = (b); \ - do \ - { \ - char __tmp = *__a; \ - *__a++ = *__b; \ - *__b++ = __tmp; \ - } while (--__size > 0); \ - } while (0) - -/* Discontinue quicksort algorithm when partition gets below this size. - This particular magic number was chosen to work best on a Sun 4/260. */ -#define MAX_THRESH 4 - -/* Stack node declarations used to store unfulfilled partition obligations. */ -typedef struct - { - char *lo; - char *hi; - } stack_node; - -/* The next 4 #defines implement a very fast in-line stack abstraction. */ -#define STACK_SIZE (8 * sizeof(unsigned long int)) -#define PUSH(low, high) ((void) ((top->lo = (low)), (top->hi = (high)), ++top)) -#define POP(low, high) ((void) (--top, (low = top->lo), (high = top->hi))) -#define STACK_NOT_EMPTY (stack < top) - - -/* Order size using quicksort. This implementation incorporates - four optimizations discussed in Sedgewick: - - 1. Non-recursive, using an explicit stack of pointer that store the - next array partition to sort. To save time, this maximum amount - of space required to store an array of MAX_INT is allocated on the - stack. Assuming a 32-bit integer, this needs only 32 * - sizeof(stack_node) == 136 bits. Pretty cheap, actually. - - 2. Chose the pivot element using a median-of-three decision tree. - This reduces the probability of selecting a bad pivot value and - eliminates certain extraneous comparisons. - - 3. Only quicksorts TOTAL_ELEMS / MAX_THRESH partitions, leaving - insertion sort to order the MAX_THRESH items within each partition. - This is a big win, since insertion sort is faster for small, mostly - sorted array segments. - - 4. The larger of the two sub-partitions is always pushed onto the - stack first, with the algorithm then concentrating on the - smaller partition. This *guarantees* no more than log (n) - stack size is needed (actually O(1) in this case)! */ - -void wxQsort(void* pbase, size_t total_elems, - size_t size, wxSortCallback cmp, const void* user_data) -{ - char *base_ptr = (char *) pbase; - const size_t max_thresh = MAX_THRESH * size; - - if (total_elems == 0) - /* Avoid lossage with unsigned arithmetic below. */ - return; - - if (total_elems > MAX_THRESH) - { - char *lo = base_ptr; - char *hi = &lo[size * (total_elems - 1)]; - stack_node stack[STACK_SIZE]; - stack_node *top = stack; - - PUSH (NULL, NULL); - - while (STACK_NOT_EMPTY) - { - char *left_ptr; - char *right_ptr; - - /* Select median value from among LO, MID, and HI. Rearrange - LO and HI so the three values are sorted. This lowers the - probability of picking a pathological pivot value and - skips a comparison for both the LEFT_PTR and RIGHT_PTR. */ - - char *mid = lo + size * ((hi - lo) / size >> 1); - - if ((*cmp) ((void *) mid, (void *) lo, user_data) < 0) - SWAP (mid, lo, size); - if ((*cmp) ((void *) hi, (void *) mid, user_data) < 0) - SWAP (mid, hi, size); - else - goto jump_over; - if ((*cmp) ((void *) mid, (void *) lo, user_data) < 0) - SWAP (mid, lo, size); - jump_over:; - left_ptr = lo + size; - right_ptr = hi - size; - - /* Here's the famous ``collapse the walls'' section of quicksort. - Gotta like those tight inner loops! They are the main reason - that this algorithm runs much faster than others. */ - do - { - while ((*cmp) ((void *) left_ptr, (void *) mid, user_data) < 0) - left_ptr += size; - - while ((*cmp) ((void *) mid, (void *) right_ptr, user_data) < 0) - right_ptr -= size; - - if (left_ptr < right_ptr) - { - SWAP (left_ptr, right_ptr, size); - if (mid == left_ptr) - mid = right_ptr; - else if (mid == right_ptr) - mid = left_ptr; - left_ptr += size; - right_ptr -= size; - } - else if (left_ptr == right_ptr) - { - left_ptr += size; - right_ptr -= size; - break; - } - } - while (left_ptr <= right_ptr); - - /* Set up pointers for next iteration. First determine whether - left and right partitions are below the threshold size. If so, - ignore one or both. Otherwise, push the larger partition's - bounds on the stack and continue sorting the smaller one. */ - - if ((size_t) (right_ptr - lo) <= max_thresh) - { - if ((size_t) (hi - left_ptr) <= max_thresh) - /* Ignore both small partitions. */ - POP (lo, hi); - else - /* Ignore small left partition. */ - lo = left_ptr; - } - else if ((size_t) (hi - left_ptr) <= max_thresh) - /* Ignore small right partition. */ - hi = right_ptr; - else if ((right_ptr - lo) > (hi - left_ptr)) - { - /* Push larger left partition indices. */ - PUSH (lo, right_ptr); - lo = left_ptr; - } - else - { - /* Push larger right partition indices. */ - PUSH (left_ptr, hi); - hi = right_ptr; - } - } - } - - /* Once the BASE_PTR array is partially sorted by quicksort the rest - is completely sorted using insertion sort, since this is efficient - for partitions below MAX_THRESH size. BASE_PTR points to the beginning - of the array to sort, and END_PTR points at the very last element in - the array (*not* one beyond it!). */ - - { - char *const end_ptr = &base_ptr[size * (total_elems - 1)]; - char *tmp_ptr = base_ptr; - char *thresh = base_ptr + max_thresh; - if ( thresh > end_ptr ) - thresh = end_ptr; - char *run_ptr; - - /* Find smallest element in first threshold and place it at the - array's beginning. This is the smallest array element, - and the operation speeds up insertion sort's inner loop. */ - - for (run_ptr = tmp_ptr + size; run_ptr <= thresh; run_ptr += size) - if ((*cmp) ((void *) run_ptr, (void *) tmp_ptr, user_data) < 0) - tmp_ptr = run_ptr; - - if (tmp_ptr != base_ptr) - SWAP (tmp_ptr, base_ptr, size); - - /* Insertion sort, running from left-hand-side up to right-hand-side. */ - - run_ptr = base_ptr + size; - while ((run_ptr += size) <= end_ptr) - { - tmp_ptr = run_ptr - size; - while ((*cmp) ((void *) run_ptr, (void *) tmp_ptr, user_data) < 0) - tmp_ptr -= size; - - tmp_ptr += size; - if (tmp_ptr != run_ptr) - { - char *trav; - - trav = run_ptr + size; - while (--trav >= run_ptr) - { - char c = *trav; - char *hi, *lo; - - for (hi = lo = trav; (lo -= size) >= tmp_ptr; hi = lo) - *hi = *lo; - *hi = c; - } - } - } - } -} - -// ---------------------------------------------------------------------------- -// wxGCD -// Compute the greatest common divisor of two positive integers -// using binary GCD algorithm. -// See: -// http://en.wikipedia.org/wiki/Binary_GCD_algorithm#Iterative_version_in_C -// ---------------------------------------------------------------------------- - -unsigned int wxGCD(unsigned int u, unsigned int v) -{ - // GCD(0,v) == v; GCD(u,0) == u, GCD(0,0) == 0 - if (u == 0) - return v; - if (v == 0) - return u; - - int shift; - - // Let shift := lg K, where K is the greatest power of 2 - // dividing both u and v. - for (shift = 0; ((u | v) & 1) == 0; ++shift) - { - u >>= 1; - v >>= 1; - } - - while ((u & 1) == 0) - u >>= 1; - - // From here on, u is always odd. - do - { - // remove all factors of 2 in v -- they are not common - // note: v is not zero, so while will terminate - while ((v & 1) == 0) - v >>= 1; - - // Now u and v are both odd. Swap if necessary so u <= v, - // then set v = v - u (which is even) - if (u > v) - { - wxSwap(u, v); - } - v -= u; // Here v >= u - } while (v != 0); - - // restore common factors of 2 - return u << shift; -} - -#endif // wxUSE_BASE - -// ============================================================================ -// GUI-only functions from now on -// ============================================================================ - -#if wxUSE_GUI - -// this function is only really implemented for X11-based ports, including GTK1 -// (GTK2 sets detectable auto-repeat automatically anyhow) -#if !(defined(__WXX11__) || defined(__WXMOTIF__) || \ - (defined(__WXGTK__) && !defined(__WXGTK20__))) -bool wxSetDetectableAutoRepeat( bool WXUNUSED(flag) ) -{ - return true; -} -#endif // !X11-based port - -// ---------------------------------------------------------------------------- -// Launch default browser -// ---------------------------------------------------------------------------- - -#if defined(__WINDOWS__) || \ - defined(__WXX11__) || defined(__WXGTK__) || defined(__WXMOTIF__) || \ - defined(__WXOSX__) - -// implemented in a port-specific utils source file: -bool wxDoLaunchDefaultBrowser(const wxLaunchBrowserParams& params); - -#else - -// a "generic" implementation: -bool wxDoLaunchDefaultBrowser(const wxLaunchBrowserParams& params) -{ - // on other platforms try to use mime types or wxExecute... - - bool ok = false; - wxString cmd; - -#if wxUSE_MIMETYPE - wxFileType *ft = wxTheMimeTypesManager->GetFileTypeFromExtension(wxT("html")); - if ( ft ) - { - wxString mt; - ft->GetMimeType(&mt); - - ok = ft->GetOpenCommand(&cmd, wxFileType::MessageParameters(params.url)); - delete ft; - } -#endif // wxUSE_MIMETYPE - - if ( !ok || cmd.empty() ) - { - // fallback to checking for the BROWSER environment variable - if ( !wxGetEnv(wxT("BROWSER"), &cmd) || cmd.empty() ) - cmd << wxT(' ') << params.url; - } - - ok = ( !cmd.empty() && wxExecute(cmd) ); - if (ok) - return ok; - - // no file type for HTML extension - wxLogError(_("No default application configured for HTML files.")); - - return false; -} -#endif - -static bool DoLaunchDefaultBrowserHelper(const wxString& url, int flags) -{ - wxLaunchBrowserParams params(flags); - - const wxURI uri(url); - - // this check is useful to avoid that wxURI recognizes as scheme parts of - // the filename, in case url is a local filename - // (e.g. "C:\\test.txt" when parsed by wxURI reports a scheme == "C") - bool hasValidScheme = uri.HasScheme() && uri.GetScheme().length() > 1; - - if ( !hasValidScheme ) - { - if (wxFileExists(url) || wxDirExists(url)) - { - params.scheme = "file"; - params.path = url; - } - else - { - params.scheme = "http"; - } - - params.url << params.scheme << wxS("://") << url; - } - else if ( hasValidScheme ) - { - params.url = url; - params.scheme = uri.GetScheme(); - - if ( params.scheme == "file" ) - { - // TODO: extract URLToFileName() to some always compiled in - // function -#if wxUSE_FILESYSTEM - // for same reason as above, remove the scheme from the URL - params.path = wxFileSystem::URLToFileName(url).GetFullPath(); -#endif // wxUSE_FILESYSTEM - } - } - - if ( !wxDoLaunchDefaultBrowser(params) ) - { - wxLogSysError(_("Failed to open URL \"%s\" in default browser."), url); - return false; - } - - return true; -} - -bool wxLaunchDefaultBrowser(const wxString& url, int flags) -{ - // NOTE: as documented, "url" may be both a real well-formed URL - // and a local file name - - if ( flags & wxBROWSER_NOBUSYCURSOR ) - return DoLaunchDefaultBrowserHelper(url, flags); - - wxBusyCursor bc; - return DoLaunchDefaultBrowserHelper(url, flags); -} - -// ---------------------------------------------------------------------------- -// Menu accelerators related functions -// ---------------------------------------------------------------------------- - -wxString wxStripMenuCodes(const wxString& in, int flags) -{ - wxASSERT_MSG( flags, wxT("this is useless to call without any flags") ); - - wxString out; - - size_t len = in.length(); - out.reserve(len); - - for ( wxString::const_iterator it = in.begin(); it != in.end(); ++it ) - { - wxChar ch = *it; - if ( (flags & wxStrip_Mnemonics) && ch == wxT('&') ) - { - // skip it, it is used to introduce the accel char (or to quote - // itself in which case it should still be skipped): note that it - // can't be the last character of the string - if ( ++it == in.end() ) - { - wxLogDebug(wxT("Invalid menu string '%s'"), in.c_str()); - break; - } - else - { - // use the next char instead - ch = *it; - } - } - else if ( (flags & wxStrip_Accel) && ch == wxT('\t') ) - { - // everything after TAB is accel string, exit the loop - break; - } - - out += ch; - } - - return out; -} - -// ---------------------------------------------------------------------------- -// Window search functions -// ---------------------------------------------------------------------------- - -/* - * If parent is non-NULL, look through children for a label or title - * matching the specified string. If NULL, look through all top-level windows. - * - */ - -wxWindow * -wxFindWindowByLabel (const wxString& title, wxWindow * parent) -{ - return wxWindow::FindWindowByLabel( title, parent ); -} - - -/* - * If parent is non-NULL, look through children for a name - * matching the specified string. If NULL, look through all top-level windows. - * - */ - -wxWindow * -wxFindWindowByName (const wxString& name, wxWindow * parent) -{ - return wxWindow::FindWindowByName( name, parent ); -} - -// Returns menu item id or wxNOT_FOUND if none. -int -wxFindMenuItemId(wxFrame *frame, - const wxString& menuString, - const wxString& itemString) -{ -#if wxUSE_MENUS - wxMenuBar *menuBar = frame->GetMenuBar (); - if ( menuBar ) - return menuBar->FindMenuItem (menuString, itemString); -#else // !wxUSE_MENUS - wxUnusedVar(frame); - wxUnusedVar(menuString); - wxUnusedVar(itemString); -#endif // wxUSE_MENUS/!wxUSE_MENUS - - return wxNOT_FOUND; -} - -// Try to find the deepest child that contains 'pt'. -// We go backwards, to try to allow for controls that are spacially -// within other controls, but are still siblings (e.g. buttons within -// static boxes). Static boxes are likely to be created _before_ controls -// that sit inside them. -wxWindow* wxFindWindowAtPoint(wxWindow* win, const wxPoint& pt) -{ - if (!win->IsShown()) - return NULL; - - // Hack for wxNotebook case: at least in wxGTK, all pages - // claim to be shown, so we must only deal with the selected one. -#if wxUSE_NOTEBOOK - if (wxDynamicCast(win, wxNotebook)) - { - wxNotebook* nb = (wxNotebook*) win; - int sel = nb->GetSelection(); - if (sel >= 0) - { - wxWindow* child = nb->GetPage(sel); - wxWindow* foundWin = wxFindWindowAtPoint(child, pt); - if (foundWin) - return foundWin; - } - } -#endif - - wxWindowList::compatibility_iterator node = win->GetChildren().GetLast(); - while (node) - { - wxWindow* child = node->GetData(); - wxWindow* foundWin = wxFindWindowAtPoint(child, pt); - if (foundWin) - return foundWin; - node = node->GetPrevious(); - } - - wxPoint pos = win->GetPosition(); - wxSize sz = win->GetSize(); - if ( !win->IsTopLevel() && win->GetParent() ) - { - pos = win->GetParent()->ClientToScreen(pos); - } - - wxRect rect(pos, sz); - if (rect.Contains(pt)) - return win; - - return NULL; -} - -wxWindow* wxGenericFindWindowAtPoint(const wxPoint& pt) -{ - // Go backwards through the list since windows - // on top are likely to have been appended most - // recently. - wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetLast(); - while (node) - { - wxWindow* win = node->GetData(); - wxWindow* found = wxFindWindowAtPoint(win, pt); - if (found) - return found; - node = node->GetPrevious(); - } - return NULL; -} - -// ---------------------------------------------------------------------------- -// GUI helpers -// ---------------------------------------------------------------------------- - -/* - * N.B. these convenience functions must be separate from msgdlgg.cpp, textdlgg.cpp - * since otherwise the generic code may be pulled in unnecessarily. - */ - -#if wxUSE_MSGDLG - -int wxMessageBox(const wxString& message, const wxString& caption, long style, - wxWindow *parent, int WXUNUSED(x), int WXUNUSED(y) ) -{ - // add the appropriate icon unless this was explicitly disabled by use of - // wxICON_NONE - if ( !(style & wxICON_NONE) && !(style & wxICON_MASK) ) - { - style |= style & wxYES ? wxICON_QUESTION : wxICON_INFORMATION; - } - - wxMessageDialog dialog(parent, message, caption, style); - - int ans = dialog.ShowModal(); - switch ( ans ) - { - case wxID_OK: - return wxOK; - case wxID_YES: - return wxYES; - case wxID_NO: - return wxNO; - case wxID_CANCEL: - return wxCANCEL; - case wxID_HELP: - return wxHELP; - } - - wxFAIL_MSG( wxT("unexpected return code from wxMessageDialog") ); - - return wxCANCEL; -} - -wxVersionInfo wxGetLibraryVersionInfo() -{ - // don't translate these strings, they're for diagnostics purposes only - wxString msg; - msg.Printf(wxS("wxWidgets Library (%s port)\n") - wxS("Version %d.%d.%d (Unicode: %s, debug level: %d),\n") - wxS("compiled at %s %s\n\n") - wxS("Runtime version of toolkit used is %d.%d.\n"), - wxPlatformInfo::Get().GetPortIdName(), - wxMAJOR_VERSION, - wxMINOR_VERSION, - wxRELEASE_NUMBER, -#if wxUSE_UNICODE_UTF8 - "UTF-8", -#elif wxUSE_UNICODE - "wchar_t", -#else - "none", -#endif - wxDEBUG_LEVEL, - __TDATE__, - __TTIME__, - wxPlatformInfo::Get().GetToolkitMajorVersion(), - wxPlatformInfo::Get().GetToolkitMinorVersion() - ); - -#ifdef __WXGTK__ - msg += wxString::Format("Compile-time GTK+ version is %d.%d.%d.\n", - GTK_MAJOR_VERSION, - GTK_MINOR_VERSION, - GTK_MICRO_VERSION); -#endif // __WXGTK__ - -#ifdef __WXQT__ - msg += wxString::Format("Compile-time QT version is %s.\n", - QT_VERSION_STR); -#endif // __WXQT__ - - return wxVersionInfo(wxS("wxWidgets"), - wxMAJOR_VERSION, - wxMINOR_VERSION, - wxRELEASE_NUMBER, - msg, - wxS("Copyright (c) 1995-2016 wxWidgets team")); -} - -void wxInfoMessageBox(wxWindow* parent) -{ - wxVersionInfo info = wxGetLibraryVersionInfo(); - wxString msg = info.ToString(); - - msg << wxS("\n") << info.GetCopyright(); - - wxMessageBox(msg, wxT("wxWidgets information"), - wxICON_INFORMATION | wxOK, - parent); -} - -#endif // wxUSE_MSGDLG - -#if wxUSE_TEXTDLG - -wxString wxGetTextFromUser(const wxString& message, const wxString& caption, - const wxString& defaultValue, wxWindow *parent, - wxCoord x, wxCoord y, bool centre ) -{ - wxString str; - long style = wxTextEntryDialogStyle; - - if (centre) - style |= wxCENTRE; - else - style &= ~wxCENTRE; - - wxTextEntryDialog dialog(parent, message, caption, defaultValue, style, wxPoint(x, y)); - - if (dialog.ShowModal() == wxID_OK) - { - str = dialog.GetValue(); - } - - return str; -} - -wxString wxGetPasswordFromUser(const wxString& message, - const wxString& caption, - const wxString& defaultValue, - wxWindow *parent, - wxCoord x, wxCoord y, bool centre ) -{ - wxString str; - long style = wxTextEntryDialogStyle; - - if (centre) - style |= wxCENTRE; - else - style &= ~wxCENTRE; - - wxPasswordEntryDialog dialog(parent, message, caption, defaultValue, - style, wxPoint(x, y)); - if ( dialog.ShowModal() == wxID_OK ) - { - str = dialog.GetValue(); - } - - return str; -} - -#endif // wxUSE_TEXTDLG - -// ---------------------------------------------------------------------------- -// wxSafeYield and supporting functions -// ---------------------------------------------------------------------------- - -void wxEnableTopLevelWindows(bool enable) -{ - wxWindowList::compatibility_iterator node; - for ( node = wxTopLevelWindows.GetFirst(); node; node = node->GetNext() ) - node->GetData()->Enable(enable); -} - -#if defined(__WXOSX__) && wxOSX_USE_COCOA - -// defined in evtloop.mm - -#else - -wxWindowDisabler::wxWindowDisabler(bool disable) -{ - m_disabled = disable; - if ( disable ) - DoDisable(); -} - -wxWindowDisabler::wxWindowDisabler(wxWindow *winToSkip) -{ - m_disabled = true; - DoDisable(winToSkip); -} - -void wxWindowDisabler::DoDisable(wxWindow *winToSkip) -{ - // remember the top level windows which were already disabled, so that we - // don't reenable them later - m_winDisabled = NULL; - - wxWindowList::compatibility_iterator node; - for ( node = wxTopLevelWindows.GetFirst(); node; node = node->GetNext() ) - { - wxWindow *winTop = node->GetData(); - if ( winTop == winToSkip ) - continue; - - // we don't need to disable the hidden or already disabled windows - if ( winTop->IsEnabled() && winTop->IsShown() ) - { - winTop->Disable(); - } - else - { - if ( !m_winDisabled ) - { - m_winDisabled = new wxWindowList; - } - - m_winDisabled->Append(winTop); - } - } -} - -wxWindowDisabler::~wxWindowDisabler() -{ - if ( !m_disabled ) - return; - - wxWindowList::compatibility_iterator node; - for ( node = wxTopLevelWindows.GetFirst(); node; node = node->GetNext() ) - { - wxWindow *winTop = node->GetData(); - if ( !m_winDisabled || !m_winDisabled->Find(winTop) ) - { - winTop->Enable(); - } - //else: had been already disabled, don't reenable - } - - delete m_winDisabled; -} - -#endif - -// Yield to other apps/messages and disable user input to all windows except -// the given one -bool wxSafeYield(wxWindow *win, bool onlyIfNeeded) -{ - wxWindowDisabler wd(win); - - bool rc; - if (onlyIfNeeded) - rc = wxYieldIfNeeded(); - else - rc = wxYield(); - - return rc; -} - -// ---------------------------------------------------------------------------- -// wxApp::Yield() wrappers for backwards compatibility -// ---------------------------------------------------------------------------- - -bool wxYield() -{ - return wxTheApp && wxTheApp->Yield(); -} - -bool wxYieldIfNeeded() -{ - return wxTheApp && wxTheApp->Yield(true); -} - -#endif // wxUSE_GUI diff --git a/Externals/wxWidgets3/src/common/valgen.cpp b/Externals/wxWidgets3/src/common/valgen.cpp deleted file mode 100644 index 3f09530cd8..0000000000 --- a/Externals/wxWidgets3/src/common/valgen.cpp +++ /dev/null @@ -1,711 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/valgen.cpp -// Purpose: wxGenericValidator class -// Author: Kevin Smith -// Modified by: -// Created: Jan 22 1999 -// Copyright: (c) 1999 Kevin Smith -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_VALIDATORS - -#ifndef WX_PRECOMP - #include "wx/dynarray.h" - #include "wx/utils.h" - #include "wx/intl.h" - #include "wx/choice.h" - #include "wx/combobox.h" - #include "wx/radiobox.h" - #include "wx/radiobut.h" - #include "wx/checkbox.h" - #include "wx/scrolbar.h" - #include "wx/gauge.h" - #include "wx/stattext.h" - #include "wx/textctrl.h" - #include "wx/button.h" - #include "wx/listbox.h" - #include "wx/slider.h" - #include "wx/checklst.h" -#endif - -#include "wx/spinctrl.h" -// #include "wx/datectrl.h" -- can't use it in this (core) file for now - -#if wxUSE_SPINBTN - #include "wx/spinbutt.h" -#endif -#if wxUSE_TOGGLEBTN - #include "wx/tglbtn.h" -#endif -#include "wx/filename.h" - -#include "wx/valgen.h" - -wxIMPLEMENT_CLASS(wxGenericValidator, wxValidator); - -wxGenericValidator::wxGenericValidator(bool *val) -{ - Initialize(); - m_pBool = val; -} - -wxGenericValidator::wxGenericValidator(int *val) -{ - Initialize(); - m_pInt = val; -} - -wxGenericValidator::wxGenericValidator(wxString *val) -{ - Initialize(); - m_pString = val; -} - -wxGenericValidator::wxGenericValidator(wxArrayInt *val) -{ - Initialize(); - m_pArrayInt = val; -} - -#if wxUSE_DATETIME - -wxGenericValidator::wxGenericValidator(wxDateTime *val) -{ - Initialize(); - m_pDateTime = val; -} - -#endif // wxUSE_DATETIME - -wxGenericValidator::wxGenericValidator(wxFileName *val) -{ - Initialize(); - m_pFileName = val; -} - -wxGenericValidator::wxGenericValidator(float *val) -{ - Initialize(); - m_pFloat = val; -} - -wxGenericValidator::wxGenericValidator(double *val) -{ - Initialize(); - m_pDouble = val; -} - -wxGenericValidator::wxGenericValidator(const wxGenericValidator& val) - : wxValidator() -{ - Copy(val); -} - -bool wxGenericValidator::Copy(const wxGenericValidator& val) -{ - wxValidator::Copy(val); - - m_pBool = val.m_pBool; - m_pInt = val.m_pInt; - m_pString = val.m_pString; - m_pArrayInt = val.m_pArrayInt; -#if wxUSE_DATETIME - m_pDateTime = val.m_pDateTime; -#endif // wxUSE_DATETIME - m_pFileName = val.m_pFileName; - m_pFloat = val.m_pFloat; - m_pDouble = val.m_pDouble; - - return true; -} - -// Called to transfer data to the window -bool wxGenericValidator::TransferToWindow(void) -{ - if ( !m_validatorWindow ) - return false; - - // bool controls -#if wxUSE_CHECKBOX - if (wxDynamicCast(m_validatorWindow, wxCheckBox)) - { - wxCheckBox* pControl = (wxCheckBox*) m_validatorWindow; - if (m_pBool) - { - pControl->SetValue(*m_pBool); - return true; - } - } else -#endif -#if wxUSE_RADIOBTN - if (wxDynamicCast(m_validatorWindow, wxRadioButton)) - { - wxRadioButton* pControl = (wxRadioButton*) m_validatorWindow; - if (m_pBool) - { - pControl->SetValue(*m_pBool) ; - return true; - } - } else -#endif - -#if wxUSE_TOGGLEBTN - if (wxDynamicCast(m_validatorWindow, wxToggleButton)) - { - wxToggleButton * pControl = (wxToggleButton *) m_validatorWindow; - if (m_pBool) - { - pControl->SetValue(*m_pBool); - return true; - } - } else -#if (defined(__WXMAC__) || defined(__WXMSW__) || defined(__WXGTK20__)) && !defined(__WXUNIVERSAL__) - if (wxDynamicCast(m_validatorWindow, wxBitmapToggleButton)) - { - wxBitmapToggleButton * pControl = (wxBitmapToggleButton *) m_validatorWindow; - if (m_pBool) - { - pControl->SetValue(*m_pBool); - return true; - } - } else -#endif -#endif - - // int controls -#if wxUSE_GAUGE - if (wxDynamicCast(m_validatorWindow, wxGauge)) - { - wxGauge* pControl = (wxGauge*) m_validatorWindow; - if (m_pInt) - { - pControl->SetValue(*m_pInt); - return true; - } - } else -#endif -#if wxUSE_RADIOBOX - if (wxDynamicCast(m_validatorWindow, wxRadioBox)) - { - wxRadioBox* pControl = (wxRadioBox*) m_validatorWindow; - if (m_pInt) - { - pControl->SetSelection(*m_pInt) ; - return true; - } - } else -#endif -#if wxUSE_SCROLLBAR - if (wxDynamicCast(m_validatorWindow, wxScrollBar)) - { - wxScrollBar* pControl = (wxScrollBar*) m_validatorWindow; - if (m_pInt) - { - pControl->SetThumbPosition(*m_pInt) ; - return true; - } - } else -#endif -#if wxUSE_SPINCTRL && !defined(__WXMOTIF__) - if (wxDynamicCast(m_validatorWindow, wxSpinCtrl)) - { - wxSpinCtrl* pControl = (wxSpinCtrl*) m_validatorWindow; - if (m_pInt) - { - pControl->SetValue(*m_pInt); - return true; - } - } else -#endif -#if wxUSE_SPINBTN - if (wxDynamicCast(m_validatorWindow, wxSpinButton)) - { - wxSpinButton* pControl = (wxSpinButton*) m_validatorWindow; - if (m_pInt) - { - pControl->SetValue(*m_pInt) ; - return true; - } - } else -#endif -#if wxUSE_SLIDER - if (wxDynamicCast(m_validatorWindow, wxSlider)) - { - wxSlider* pControl = (wxSlider*) m_validatorWindow; - if (m_pInt) - { - pControl->SetValue(*m_pInt) ; - return true; - } - } else -#endif - - // date time controls -#if 0 // wxUSE_DATEPICKCTRL -- temporary fix for shared build linking - if (wxDynamicCast(m_validatorWindow, wxDatePickerCtrl)) - { - wxDatePickerCtrl* pControl = (wxDatePickerCtrl*) m_validatorWindow; - if (m_pDateTime) - { - pControl->SetValue(*m_pDateTime) ; - return true; - } - } else -#endif - - // string controls -#if wxUSE_BUTTON - if (wxDynamicCast(m_validatorWindow, wxButton)) - { - wxButton* pControl = (wxButton*) m_validatorWindow; - if (m_pString) - { - pControl->SetLabel(*m_pString) ; - return true; - } - } else -#endif -#if wxUSE_COMBOBOX - if (wxDynamicCast(m_validatorWindow, wxComboBox)) - { - wxComboBox* pControl = (wxComboBox*) m_validatorWindow; - if (m_pInt) - { - pControl->SetSelection(*m_pInt) ; - return true; - } - else if (m_pString) - { - if (pControl->FindString(* m_pString) != wxNOT_FOUND) - { - pControl->SetStringSelection(* m_pString); - } - if ((m_validatorWindow->GetWindowStyle() & wxCB_READONLY) == 0) - { - pControl->SetValue(* m_pString); - } - return true; - } - } else -#endif -#if wxUSE_CHOICE - if (wxDynamicCast(m_validatorWindow, wxChoice)) - { - wxChoice* pControl = (wxChoice*) m_validatorWindow; - if (m_pInt) - { - pControl->SetSelection(*m_pInt) ; - return true; - } - else if (m_pString) - { - if (pControl->FindString(* m_pString) != wxNOT_FOUND) - { - pControl->SetStringSelection(* m_pString); - } - return true; - } - } else -#endif -#if wxUSE_STATTEXT - if (wxDynamicCast(m_validatorWindow, wxStaticText)) - { - wxStaticText* pControl = (wxStaticText*) m_validatorWindow; - if (m_pString) - { - pControl->SetLabel(*m_pString) ; - return true; - } - } else -#endif -#if wxUSE_TEXTCTRL - if (wxDynamicCast(m_validatorWindow, wxTextCtrl)) - { - wxTextCtrl* pControl = (wxTextCtrl*) m_validatorWindow; - if (m_pString) - { - pControl->SetValue(*m_pString) ; - return true; - } - else if (m_pInt) - { - wxString str; - str.Printf(wxT("%d"), *m_pInt); - pControl->SetValue(str); - return true; - } - else if (m_pFileName) - { - pControl->SetValue(m_pFileName->GetFullPath()); - return true; - } - else if (m_pFloat) - { - pControl->SetValue(wxString::Format(wxT("%g"), *m_pFloat)); - return true; - } - else if (m_pDouble) - { - pControl->SetValue(wxString::Format(wxT("%g"), *m_pDouble)); - return true; - } - } else -#endif - - // array controls -#if wxUSE_CHECKLISTBOX - // NOTE: wxCheckListBox is a wxListBox, so wxCheckListBox MUST come first: - if (wxDynamicCast(m_validatorWindow, wxCheckListBox)) - { - wxCheckListBox* pControl = (wxCheckListBox*) m_validatorWindow; - if (m_pArrayInt) - { - // clear all selections - size_t i, - count = pControl->GetCount(); - for ( i = 0 ; i < count; i++ ) - pControl->Check(i, false); - - // select each item in our array - count = m_pArrayInt->GetCount(); - for ( i = 0 ; i < count; i++ ) - pControl->Check(m_pArrayInt->Item(i)); - - return true; - } - else - return false; - } else -#endif -#if wxUSE_LISTBOX - if (wxDynamicCast(m_validatorWindow, wxListBox)) - { - wxListBox* pControl = (wxListBox*) m_validatorWindow; - if (m_pArrayInt) - { - // clear all selections - size_t i, - count = pControl->GetCount(); - for ( i = 0 ; i < count; i++ ) - pControl->Deselect(i); - - // select each item in our array - count = m_pArrayInt->GetCount(); - for ( i = 0 ; i < count; i++ ) - pControl->SetSelection(m_pArrayInt->Item(i)); - - return true; - } - } else -#endif - { // to match the last 'else' above - } - - // unrecognized control, or bad pointer - return false; -} - -// Called to transfer data from the window -bool wxGenericValidator::TransferFromWindow(void) -{ - if ( !m_validatorWindow ) - return false; - - // BOOL CONTROLS ************************************** -#if wxUSE_CHECKBOX - if (wxDynamicCast(m_validatorWindow, wxCheckBox)) - { - wxCheckBox* pControl = (wxCheckBox*) m_validatorWindow; - if (m_pBool) - { - *m_pBool = pControl->GetValue() ; - return true; - } - } else -#endif -#if wxUSE_RADIOBTN - if (wxDynamicCast(m_validatorWindow, wxRadioButton)) - { - wxRadioButton* pControl = (wxRadioButton*) m_validatorWindow; - if (m_pBool) - { - *m_pBool = pControl->GetValue() ; - return true; - } - } else -#endif -#if wxUSE_TOGGLEBTN - if (wxDynamicCast(m_validatorWindow, wxToggleButton)) - { - wxToggleButton *pControl = (wxToggleButton *) m_validatorWindow; - if (m_pBool) - { - *m_pBool = pControl->GetValue() ; - return true; - } - } else -#if (defined(__WXMAC__) || defined(__WXMSW__) || defined(__WXGTK20__)) && !defined(__WXUNIVERSAL__) - if (wxDynamicCast(m_validatorWindow, wxBitmapToggleButton)) - { - wxBitmapToggleButton *pControl = (wxBitmapToggleButton *) m_validatorWindow; - if (m_pBool) - { - *m_pBool = pControl->GetValue() ; - return true; - } - } else -#endif -#endif - - // INT CONTROLS *************************************** -#if wxUSE_GAUGE - if (wxDynamicCast(m_validatorWindow, wxGauge)) - { - wxGauge* pControl = (wxGauge*) m_validatorWindow; - if (m_pInt) - { - *m_pInt = pControl->GetValue() ; - return true; - } - } else -#endif -#if wxUSE_RADIOBOX - if (wxDynamicCast(m_validatorWindow, wxRadioBox)) - { - wxRadioBox* pControl = (wxRadioBox*) m_validatorWindow; - if (m_pInt) - { - *m_pInt = pControl->GetSelection() ; - return true; - } - } else -#endif -#if wxUSE_SCROLLBAR - if (wxDynamicCast(m_validatorWindow, wxScrollBar)) - { - wxScrollBar* pControl = (wxScrollBar*) m_validatorWindow; - if (m_pInt) - { - *m_pInt = pControl->GetThumbPosition() ; - return true; - } - } else -#endif -#if wxUSE_SPINCTRL && !defined(__WXMOTIF__) - if (wxDynamicCast(m_validatorWindow, wxSpinCtrl)) - { - wxSpinCtrl* pControl = (wxSpinCtrl*) m_validatorWindow; - if (m_pInt) - { - *m_pInt=pControl->GetValue(); - return true; - } - } else -#endif -#if wxUSE_SPINBTN - if (wxDynamicCast(m_validatorWindow, wxSpinButton)) - { - wxSpinButton* pControl = (wxSpinButton*) m_validatorWindow; - if (m_pInt) - { - *m_pInt = pControl->GetValue() ; - return true; - } - } else -#endif -#if wxUSE_SLIDER - if (wxDynamicCast(m_validatorWindow, wxSlider)) - { - wxSlider* pControl = (wxSlider*) m_validatorWindow; - if (m_pInt) - { - *m_pInt = pControl->GetValue() ; - return true; - } - } else -#endif - - // DATE TIME CONTROLS ************************************ -#if 0 // wxUSE_DATEPICKCTRL -- temporary fix for shared build linking - if (wxDynamicCast(m_validatorWindow, wxDatePickerCtrl)) - { - wxDatePickerCtrl* pControl = (wxDatePickerCtrl*) m_validatorWindow; - if (m_pDateTime) - { - *m_pDateTime = pControl->GetValue() ; - return true; - } - } else -#endif - - // STRING CONTROLS ************************************ -#if wxUSE_BUTTON - if (wxDynamicCast(m_validatorWindow, wxButton)) - { - wxButton* pControl = (wxButton*) m_validatorWindow; - if (m_pString) - { - *m_pString = pControl->GetLabel() ; - return true; - } - } else -#endif -#if wxUSE_COMBOBOX - if (wxDynamicCast(m_validatorWindow, wxComboBox)) - { - wxComboBox* pControl = (wxComboBox*) m_validatorWindow; - if (m_pInt) - { - *m_pInt = pControl->GetSelection() ; - return true; - } - else if (m_pString) - { - if (m_validatorWindow->GetWindowStyle() & wxCB_READONLY) - *m_pString = pControl->GetStringSelection(); - else - *m_pString = pControl->GetValue(); - return true; - } - } else -#endif -#if wxUSE_CHOICE - if (wxDynamicCast(m_validatorWindow, wxChoice)) - { - wxChoice* pControl = (wxChoice*) m_validatorWindow; - if (m_pInt) - { - *m_pInt = pControl->GetSelection() ; - return true; - } - else if (m_pString) - { - *m_pString = pControl->GetStringSelection(); - return true; - } - } else -#endif -#if wxUSE_STATTEXT - if (wxDynamicCast(m_validatorWindow, wxStaticText)) - { - wxStaticText* pControl = (wxStaticText*) m_validatorWindow; - if (m_pString) - { - *m_pString = pControl->GetLabel() ; - return true; - } - } else -#endif -#if wxUSE_TEXTCTRL - if (wxDynamicCast(m_validatorWindow, wxTextCtrl)) - { - wxTextCtrl* pControl = (wxTextCtrl*) m_validatorWindow; - if (m_pString) - { - *m_pString = pControl->GetValue() ; - return true; - } - else if (m_pInt) - { - *m_pInt = wxAtoi(pControl->GetValue()); - return true; - } - else if (m_pFileName) - { - m_pFileName->Assign(pControl->GetValue()); - return true; - } - else if (m_pFloat) - { - *m_pFloat = (float)wxAtof(pControl->GetValue()); - return true; - } - else if (m_pDouble) - { - *m_pDouble = wxAtof(pControl->GetValue()); - return true; - } - } else -#endif - - // ARRAY CONTROLS ************************************* -#if wxUSE_CHECKLISTBOX - // NOTE: wxCheckListBox isa wxListBox, so wxCheckListBox MUST come first: - if (wxDynamicCast(m_validatorWindow, wxCheckListBox)) - { - wxCheckListBox* pControl = (wxCheckListBox*) m_validatorWindow; - if (m_pArrayInt) - { - // clear our array - m_pArrayInt->Clear(); - - // add each selected item to our array - size_t i, - count = pControl->GetCount(); - for ( i = 0; i < count; i++ ) - { - if (pControl->IsChecked(i)) - m_pArrayInt->Add(i); - } - - return true; - } - else - return false; - } else -#endif -#if wxUSE_LISTBOX - if (wxDynamicCast(m_validatorWindow, wxListBox)) - { - wxListBox* pControl = (wxListBox*) m_validatorWindow; - if (m_pArrayInt) - { - // clear our array - m_pArrayInt->Clear(); - - // add each selected item to our array - size_t i, - count = pControl->GetCount(); - for ( i = 0; i < count; i++ ) - { - if (pControl->IsSelected(i)) - m_pArrayInt->Add(i); - } - - return true; - } - } else -#endif - - // unrecognized control, or bad pointer - return false; - - return false; -} - -/* - Called by constructors to initialize ALL data members -*/ -void wxGenericValidator::Initialize() -{ - m_pBool = NULL; - m_pInt = NULL; - m_pString = NULL; - m_pArrayInt = NULL; -#if wxUSE_DATETIME - m_pDateTime = NULL; -#endif // wxUSE_DATETIME - m_pFileName = NULL; - m_pFloat = NULL; - m_pDouble = NULL; -} - -#endif // wxUSE_VALIDATORS diff --git a/Externals/wxWidgets3/src/common/validate.cpp b/Externals/wxWidgets3/src/common/validate.cpp deleted file mode 100644 index bfe7f66287..0000000000 --- a/Externals/wxWidgets3/src/common/validate.cpp +++ /dev/null @@ -1,44 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/validate.cpp -// Purpose: wxValidator -// Author: Julian Smart -// Modified by: -// Created: 04/01/98 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_VALIDATORS - -#include "wx/validate.h" - -#ifndef WX_PRECOMP - #include "wx/window.h" -#endif - -const wxValidator wxDefaultValidator; - -wxIMPLEMENT_DYNAMIC_CLASS(wxValidator, wxEvtHandler); - -// VZ: personally, I think true would be more appropriate - these bells are -// _annoying_ -bool wxValidator::ms_isSilent = false; - -wxValidator::wxValidator() -{ - m_validatorWindow = NULL; -} - -wxValidator::~wxValidator() -{ -} - -#endif - // wxUSE_VALIDATORS diff --git a/Externals/wxWidgets3/src/common/valnum.cpp b/Externals/wxWidgets3/src/common/valnum.cpp deleted file mode 100644 index bb483502a6..0000000000 --- a/Externals/wxWidgets3/src/common/valnum.cpp +++ /dev/null @@ -1,299 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/valnum.cpp -// Purpose: Numeric validator classes implementation -// Author: Vadim Zeitlin based on the submission of Fulvio Senore -// Created: 2010-11-06 -// Copyright: (c) 2010 wxWidgets team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// Declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_VALIDATORS && wxUSE_TEXTCTRL - -#ifndef WX_PRECOMP - #include "wx/textctrl.h" - #include "wx/combobox.h" -#endif - -#include "wx/valnum.h" -#include "wx/numformatter.h" - -// ============================================================================ -// wxNumValidatorBase implementation -// ============================================================================ - -wxBEGIN_EVENT_TABLE(wxNumValidatorBase, wxValidator) - EVT_CHAR(wxNumValidatorBase::OnChar) - EVT_KILL_FOCUS(wxNumValidatorBase::OnKillFocus) -wxEND_EVENT_TABLE() - -int wxNumValidatorBase::GetFormatFlags() const -{ - int flags = wxNumberFormatter::Style_None; - if ( m_style & wxNUM_VAL_THOUSANDS_SEPARATOR ) - flags |= wxNumberFormatter::Style_WithThousandsSep; - if ( m_style & wxNUM_VAL_NO_TRAILING_ZEROES ) - flags |= wxNumberFormatter::Style_NoTrailingZeroes; - - return flags; -} - -wxTextEntry *wxNumValidatorBase::GetTextEntry() const -{ -#if wxUSE_TEXTCTRL - if ( wxTextCtrl *text = wxDynamicCast(m_validatorWindow, wxTextCtrl) ) - return text; -#endif // wxUSE_TEXTCTRL - -#if wxUSE_COMBOBOX - if ( wxComboBox *combo = wxDynamicCast(m_validatorWindow, wxComboBox) ) - return combo; -#endif // wxUSE_COMBOBOX - - wxFAIL_MSG("Can only be used with wxTextCtrl or wxComboBox"); - - return NULL; -} - -void -wxNumValidatorBase::GetCurrentValueAndInsertionPoint(wxString& val, - int& pos) const -{ - wxTextEntry * const control = GetTextEntry(); - if ( !control ) - return; - - val = control->GetValue(); - pos = control->GetInsertionPoint(); - - long selFrom, selTo; - control->GetSelection(&selFrom, &selTo); - - const long selLen = selTo - selFrom; - if ( selLen ) - { - // Remove selected text because pressing a key would make it disappear. - val.erase(selFrom, selLen); - - // And adjust the insertion point to have correct position in the new - // string. - if ( pos > selFrom ) - { - if ( pos >= selTo ) - pos -= selLen; - else - pos = selFrom; - } - } -} - -bool wxNumValidatorBase::IsMinusOk(const wxString& val, int pos) const -{ - // Minus is only ever accepted in the beginning of the string. - if ( pos != 0 ) - return false; - - // And then only if there is no existing minus sign there. - if ( !val.empty() && val[0] == '-' ) - return false; - - return true; -} - -void wxNumValidatorBase::OnChar(wxKeyEvent& event) -{ - // By default we just validate this key so don't prevent the normal - // handling from taking place. - event.Skip(); - - if ( !m_validatorWindow ) - return; - -#if wxUSE_UNICODE - const int ch = event.GetUnicodeKey(); - if ( ch == WXK_NONE ) - { - // It's a character without any Unicode equivalent at all, e.g. cursor - // arrow or function key, we never filter those. - return; - } -#else // !wxUSE_UNICODE - const int ch = event.GetKeyCode(); - if ( ch > WXK_DELETE ) - { - // Not a character neither. - return; - } -#endif // wxUSE_UNICODE/!wxUSE_UNICODE - - if ( ch < WXK_SPACE || ch == WXK_DELETE ) - { - // Allow ASCII control characters and Delete. - return; - } - - // Check if this character is allowed in the current state. - wxString val; - int pos; - GetCurrentValueAndInsertionPoint(val, pos); - - if ( !IsCharOk(val, pos, ch) ) - { - if ( !wxValidator::IsSilent() ) - wxBell(); - - // Do not skip the event in this case, stop handling it here. - event.Skip(false); - } -} - -void wxNumValidatorBase::OnKillFocus(wxFocusEvent& event) -{ - wxTextEntry * const control = GetTextEntry(); - if ( !control ) - return; - - // When we change the control value below, its "modified" status is reset - // so we need to explicitly keep it marked as modified if it was so in the - // first place. - // - // Notice that only wxTextCtrl (and not wxTextEntry) has - // IsModified()/MarkDirty() methods hence the need for dynamic cast. - wxTextCtrl * const text = wxDynamicCast(m_validatorWindow, wxTextCtrl); - const bool wasModified = text ? text->IsModified() : false; - - control->ChangeValue(NormalizeString(control->GetValue())); - - if ( wasModified ) - text->MarkDirty(); - - event.Skip(); -} - -// ============================================================================ -// wxIntegerValidatorBase implementation -// ============================================================================ - -wxString wxIntegerValidatorBase::ToString(LongestValueType value) const -{ - return wxNumberFormatter::ToString(value, GetFormatFlags()); -} - -bool -wxIntegerValidatorBase::FromString(const wxString& s, LongestValueType *value) -{ - return wxNumberFormatter::FromString(s, value); -} - -bool -wxIntegerValidatorBase::IsCharOk(const wxString& val, int pos, wxChar ch) const -{ - // We may accept minus sign if we can represent negative numbers at all. - if ( ch == '-' ) - { - // Notice that entering '-' can make our value invalid, for example if - // we're limited to -5..15 range and the current value is 12, then the - // new value would be (invalid) -12. We consider it better to let the - // user do this because perhaps he is going to press Delete key next to - // make it -2 and forcing him to delete 1 first would be unnatural. - // - // TODO: It would be nice to indicate that the current control contents - // is invalid (if it's indeed going to be the case) once - // wxValidator supports doing this non-intrusively. - return m_min < 0 && IsMinusOk(val, pos); - } - - // We only accept digits here (remember that '-' is taken care of by the - // base class already). - if ( ch < '0' || ch > '9' ) - return false; - - // And the value after insertion needs to be in the defined range. - LongestValueType value; - if ( !FromString(GetValueAfterInsertingChar(val, pos, ch), &value) ) - return false; - - return IsInRange(value); -} - -// ============================================================================ -// wxFloatingPointValidatorBase implementation -// ============================================================================ - -wxString wxFloatingPointValidatorBase::ToString(LongestValueType value) const -{ - return wxNumberFormatter::ToString(value, m_precision, GetFormatFlags()); -} - -bool -wxFloatingPointValidatorBase::FromString(const wxString& s, - LongestValueType *value) -{ - return wxNumberFormatter::FromString(s, value); -} - -bool -wxFloatingPointValidatorBase::IsCharOk(const wxString& val, - int pos, - wxChar ch) const -{ - // We may accept minus sign if we can represent negative numbers at all. - if ( ch == '-' ) - return m_min < 0 && IsMinusOk(val, pos); - - const wxChar separator = wxNumberFormatter::GetDecimalSeparator(); - if ( ch == separator ) - { - if ( val.find(separator) != wxString::npos ) - { - // There is already a decimal separator, can't insert another one. - return false; - } - - // Prepending a separator before the minus sign isn't allowed. - if ( pos == 0 && !val.empty() && val[0] == '-' ) - return false; - - // Otherwise always accept it, adding a decimal separator doesn't - // change the number value and, in particular, can't make it invalid. - // OTOH the checks below might not pass because strings like "." or - // "-." are not valid numbers so parsing them would fail, hence we need - // to treat it specially here. - return true; - } - - // Must be a digit then. - if ( ch < '0' || ch > '9' ) - return false; - - // Check whether the value we'd obtain if we accepted this key is correct. - const wxString newval(GetValueAfterInsertingChar(val, pos, ch)); - - LongestValueType value; - if ( !FromString(newval, &value) ) - return false; - - // Also check that it doesn't have too many decimal digits. - const size_t posSep = newval.find(separator); - if ( posSep != wxString::npos && newval.length() - posSep - 1 > m_precision ) - return false; - - // Finally check whether it is in the range. - return IsInRange(value); -} - -#endif // wxUSE_VALIDATORS && wxUSE_TEXTCTRL diff --git a/Externals/wxWidgets3/src/common/valtext.cpp b/Externals/wxWidgets3/src/common/valtext.cpp deleted file mode 100644 index 04f85840e2..0000000000 --- a/Externals/wxWidgets3/src/common/valtext.cpp +++ /dev/null @@ -1,337 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/valtext.cpp -// Purpose: wxTextValidator -// Author: Julian Smart -// Modified by: Francesco Montorsi -// Created: 04/01/98 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_VALIDATORS && (wxUSE_TEXTCTRL || wxUSE_COMBOBOX) - -#include "wx/valtext.h" - -#ifndef WX_PRECOMP - #include - #include "wx/textctrl.h" - #include "wx/combobox.h" - #include "wx/utils.h" - #include "wx/msgdlg.h" - #include "wx/intl.h" -#endif - -#include -#include -#include - -#include "wx/combo.h" - -// ---------------------------------------------------------------------------- -// global helpers -// ---------------------------------------------------------------------------- - -static bool wxIsNumeric(const wxString& val) -{ - for ( wxString::const_iterator i = val.begin(); i != val.end(); ++i ) - { - // Allow for "," (French) as well as "." -- in future we should - // use wxSystemSettings or other to do better localisation - if ((!wxIsdigit(*i)) && - (*i != wxS('.')) && (*i != wxS(',')) && (*i != wxS('e')) && - (*i != wxS('E')) && (*i != wxS('+')) && (*i != wxS('-'))) - return false; - } - return true; -} - -// ---------------------------------------------------------------------------- -// wxTextValidator -// ---------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxTextValidator, wxValidator); -wxBEGIN_EVENT_TABLE(wxTextValidator, wxValidator) - EVT_CHAR(wxTextValidator::OnChar) -wxEND_EVENT_TABLE() - -wxTextValidator::wxTextValidator(long style, wxString *val) -{ - m_stringValue = val; - SetStyle(style); -} - -wxTextValidator::wxTextValidator(const wxTextValidator& val) - : wxValidator() -{ - Copy(val); -} - -void wxTextValidator::SetStyle(long style) -{ - m_validatorStyle = style; - -#if wxDEBUG_LEVEL - int check; - check = (int)HasFlag(wxFILTER_ALPHA) + (int)HasFlag(wxFILTER_ALPHANUMERIC) + - (int)HasFlag(wxFILTER_DIGITS) + (int)HasFlag(wxFILTER_NUMERIC); - wxASSERT_MSG(check <= 1, - "It makes sense to use only one of the wxFILTER_ALPHA/wxFILTER_ALPHANUMERIC/" - "wxFILTER_SIMPLE_NUMBER/wxFILTER_NUMERIC styles"); - - wxASSERT_MSG(((int)HasFlag(wxFILTER_INCLUDE_LIST) + (int)HasFlag(wxFILTER_INCLUDE_CHAR_LIST) <= 1) && - ((int)HasFlag(wxFILTER_EXCLUDE_LIST) + (int)HasFlag(wxFILTER_EXCLUDE_CHAR_LIST) <= 1), - "Using both wxFILTER_[IN|EX]CLUDE_LIST _and_ wxFILTER_[IN|EX]CLUDE_CHAR_LIST " - "doesn't work since wxTextValidator internally uses the same array for both"); - - check = (int)HasFlag(wxFILTER_INCLUDE_LIST) + (int)HasFlag(wxFILTER_INCLUDE_CHAR_LIST) + - (int)HasFlag(wxFILTER_EXCLUDE_LIST) + (int)HasFlag(wxFILTER_EXCLUDE_CHAR_LIST); - wxASSERT_MSG(check <= 1, - "Using both an include/exclude list may lead to unexpected results"); -#endif // wxDEBUG_LEVEL -} - -bool wxTextValidator::Copy(const wxTextValidator& val) -{ - wxValidator::Copy(val); - - m_validatorStyle = val.m_validatorStyle; - m_stringValue = val.m_stringValue; - - m_includes = val.m_includes; - m_excludes = val.m_excludes; - - return true; -} - -wxTextEntry *wxTextValidator::GetTextEntry() -{ -#if wxUSE_TEXTCTRL - if (wxDynamicCast(m_validatorWindow, wxTextCtrl)) - { - return (wxTextCtrl*)m_validatorWindow; - } -#endif - -#if wxUSE_COMBOBOX - if (wxDynamicCast(m_validatorWindow, wxComboBox)) - { - return (wxComboBox*)m_validatorWindow; - } -#endif - -#if wxUSE_COMBOCTRL - if (wxDynamicCast(m_validatorWindow, wxComboCtrl)) - { - return (wxComboCtrl*)m_validatorWindow; - } -#endif - - wxFAIL_MSG( - "wxTextValidator can only be used with wxTextCtrl, wxComboBox, " - "or wxComboCtrl" - ); - - return NULL; -} - -// Called when the value in the window must be validated. -// This function can pop up an error message. -bool wxTextValidator::Validate(wxWindow *parent) -{ - // If window is disabled, simply return - if ( !m_validatorWindow->IsEnabled() ) - return true; - - wxTextEntry * const text = GetTextEntry(); - if ( !text ) - return false; - - wxString val(text->GetValue()); - - wxString errormsg; - - // We can only do some kinds of validation once the input is complete, so - // check for them here: - if ( HasFlag(wxFILTER_EMPTY) && val.empty() ) - errormsg = _("Required information entry is empty."); - else if ( HasFlag(wxFILTER_INCLUDE_LIST) && m_includes.Index(val) == wxNOT_FOUND ) - errormsg = wxString::Format(_("'%s' is not one of the valid strings"), val); - else if ( HasFlag(wxFILTER_EXCLUDE_LIST) && m_excludes.Index(val) != wxNOT_FOUND ) - errormsg = wxString::Format(_("'%s' is one of the invalid strings"), val); - else if ( !(errormsg = IsValid(val)).empty() ) - { - // NB: this format string should always contain exactly one '%s' - wxString buf; - buf.Printf(errormsg, val.c_str()); - errormsg = buf; - } - - if ( !errormsg.empty() ) - { - m_validatorWindow->SetFocus(); - wxMessageBox(errormsg, _("Validation conflict"), - wxOK | wxICON_EXCLAMATION, parent); - - return false; - } - - return true; -} - -// Called to transfer data to the window -bool wxTextValidator::TransferToWindow() -{ - if ( m_stringValue ) - { - wxTextEntry * const text = GetTextEntry(); - if ( !text ) - return false; - - text->SetValue(*m_stringValue); - } - - return true; -} - -// Called to transfer data to the window -bool wxTextValidator::TransferFromWindow() -{ - if ( m_stringValue ) - { - wxTextEntry * const text = GetTextEntry(); - if ( !text ) - return false; - - *m_stringValue = text->GetValue(); - } - - return true; -} - -// IRIX mipsPro refuses to compile wxStringCheck() if func is inline so -// let's work around this by using this non-template function instead of -// wxStringCheck(). And while this might be fractionally less efficient because -// the function call won't be inlined like this, we don't care enough about -// this to add extra #ifs for non-IRIX case. -namespace -{ - -bool CheckString(bool (*func)(const wxUniChar&), const wxString& str) -{ - for ( wxString::const_iterator i = str.begin(); i != str.end(); ++i ) - { - if ( !func(*i) ) - return false; - } - - return true; -} - -} // anonymous namespace - -wxString wxTextValidator::IsValid(const wxString& val) const -{ - // wxFILTER_EMPTY is checked for in wxTextValidator::Validate - - if ( HasFlag(wxFILTER_ASCII) && !val.IsAscii() ) - return _("'%s' should only contain ASCII characters."); - if ( HasFlag(wxFILTER_ALPHA) && !CheckString(wxIsalpha, val) ) - return _("'%s' should only contain alphabetic characters."); - if ( HasFlag(wxFILTER_ALPHANUMERIC) && !CheckString(wxIsalnum, val) ) - return _("'%s' should only contain alphabetic or numeric characters."); - if ( HasFlag(wxFILTER_DIGITS) && !CheckString(wxIsdigit, val) ) - return _("'%s' should only contain digits."); - if ( HasFlag(wxFILTER_NUMERIC) && !wxIsNumeric(val) ) - return _("'%s' should be numeric."); - if ( HasFlag(wxFILTER_INCLUDE_CHAR_LIST) && !ContainsOnlyIncludedCharacters(val) ) - return _("'%s' doesn't consist only of valid characters"); - if ( HasFlag(wxFILTER_EXCLUDE_CHAR_LIST) && ContainsExcludedCharacters(val) ) - return _("'%s' contains illegal characters"); - - return wxEmptyString; -} - -bool wxTextValidator::ContainsOnlyIncludedCharacters(const wxString& val) const -{ - for ( wxString::const_iterator i = val.begin(); i != val.end(); ++i ) - if (m_includes.Index((wxString) *i) == wxNOT_FOUND) - // one character of 'val' is NOT present in m_includes... - return false; - - // all characters of 'val' are present in m_includes - return true; -} - -bool wxTextValidator::ContainsExcludedCharacters(const wxString& val) const -{ - for ( wxString::const_iterator i = val.begin(); i != val.end(); ++i ) - if (m_excludes.Index((wxString) *i) != wxNOT_FOUND) - // one character of 'val' is present in m_excludes... - return true; - - // all characters of 'val' are NOT present in m_excludes - return false; -} - -void wxTextValidator::SetCharIncludes(const wxString& chars) -{ - wxArrayString arr; - - for ( wxString::const_iterator i = chars.begin(); i != chars.end(); ++i ) - arr.Add(*i); - - SetIncludes(arr); -} - -void wxTextValidator::SetCharExcludes(const wxString& chars) -{ - wxArrayString arr; - - for ( wxString::const_iterator i = chars.begin(); i != chars.end(); ++i ) - arr.Add(*i); - - SetExcludes(arr); -} - -void wxTextValidator::OnChar(wxKeyEvent& event) -{ - // Let the event propagate by default. - event.Skip(); - - if (!m_validatorWindow) - return; - -#if wxUSE_UNICODE - // We only filter normal, printable characters. - int keyCode = event.GetUnicodeKey(); -#else // !wxUSE_UNICODE - int keyCode = event.GetKeyCode(); - if (keyCode > WXK_START) - return; -#endif // wxUSE_UNICODE/!wxUSE_UNICODE - - // we don't filter special keys and delete - if (keyCode < WXK_SPACE || keyCode == WXK_DELETE) - return; - - wxString str((wxUniChar)keyCode, 1); - if (IsValid(str).empty()) - return; - - if ( !wxValidator::IsSilent() ) - wxBell(); - - // eat message - event.Skip(false); -} - - -#endif - // wxUSE_VALIDATORS && (wxUSE_TEXTCTRL || wxUSE_COMBOBOX) diff --git a/Externals/wxWidgets3/src/common/variant.cpp b/Externals/wxWidgets3/src/common/variant.cpp deleted file mode 100644 index a8693207dd..0000000000 --- a/Externals/wxWidgets3/src/common/variant.cpp +++ /dev/null @@ -1,2510 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/variant.cpp -// Purpose: wxVariant class, container for any type -// Author: Julian Smart -// Modified by: -// Created: 10/09/98 -// Copyright: (c) -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx/wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include "wx/variant.h" - -#if wxUSE_VARIANT - -#ifndef WX_PRECOMP - #include "wx/string.h" - #include "wx/math.h" - #include "wx/crt.h" - #if wxUSE_STREAMS - #include "wx/stream.h" - #endif -#endif - -#if wxUSE_STD_IOSTREAM - #if wxUSE_IOSTREAMH - #include - #else - #include - #endif -#endif - -#if wxUSE_STREAMS - #include "wx/txtstrm.h" -#endif - -#include "wx/string.h" -#include "wx/tokenzr.h" - -wxVariant WXDLLIMPEXP_BASE wxNullVariant; - - -#include "wx/listimpl.cpp" -WX_DEFINE_LIST(wxVariantList) - -/* - * wxVariant - */ - -wxIMPLEMENT_DYNAMIC_CLASS(wxVariant, wxObject); - -wxVariant::wxVariant() - : wxObject() -{ -} - -bool wxVariant::IsNull() const -{ - return (m_refData == NULL); -} - -void wxVariant::MakeNull() -{ - UnRef(); -} - -void wxVariant::Clear() -{ - m_name = wxEmptyString; -} - -wxVariant::wxVariant(const wxVariant& variant) - : wxObject() -{ - if (!variant.IsNull()) - Ref(variant); - - m_name = variant.m_name; -} - -wxVariant::wxVariant(wxVariantData* data, const wxString& name) // User-defined data - : wxObject() -{ - m_refData = data; - m_name = name; -} - -wxVariant::~wxVariant() -{ -} - -wxObjectRefData *wxVariant::CreateRefData() const -{ - // We cannot create any particular wxVariantData. - wxFAIL_MSG("wxVariant::CreateRefData() cannot be implemented"); - return NULL; -} - -wxObjectRefData *wxVariant::CloneRefData(const wxObjectRefData *data) const -{ - return ((wxVariantData*) data)->Clone(); -} - -// Assignment -void wxVariant::operator= (const wxVariant& variant) -{ - Ref(variant); - m_name = variant.m_name; -} - -// myVariant = new wxStringVariantData("hello") -void wxVariant::operator= (wxVariantData* variantData) -{ - UnRef(); - m_refData = variantData; -} - -bool wxVariant::operator== (const wxVariant& variant) const -{ - if (IsNull() || variant.IsNull()) - return (IsNull() == variant.IsNull()); - - if (GetType() != variant.GetType()) - return false; - - return (GetData()->Eq(* variant.GetData())); -} - -bool wxVariant::operator!= (const wxVariant& variant) const -{ - return (!(*this == variant)); -} - -wxString wxVariant::MakeString() const -{ - if (!IsNull()) - { - wxString str; - if (GetData()->Write(str)) - return str; - } - return wxEmptyString; -} - -void wxVariant::SetData(wxVariantData* data) -{ - UnRef(); - m_refData = data; -} - -bool wxVariant::Unshare() -{ - if ( !m_refData || m_refData->GetRefCount() == 1 ) - return true; - - wxObject::UnShare(); - - return (m_refData && m_refData->GetRefCount() == 1); -} - - -// Returns a string representing the type of the variant, -// e.g. "string", "bool", "list", "double", "long" -wxString wxVariant::GetType() const -{ - if (IsNull()) - return wxString(wxT("null")); - else - return GetData()->GetType(); -} - - -bool wxVariant::IsType(const wxString& type) const -{ - return (GetType() == type); -} - -bool wxVariant::IsValueKindOf(const wxClassInfo* type) const -{ - wxClassInfo* info=GetData()->GetValueClassInfo(); - return info ? info->IsKindOf(type) : false ; -} - -// ----------------------------------------------------------------- -// wxVariant <-> wxAny conversion code -// ----------------------------------------------------------------- - -#if wxUSE_ANY - -wxAnyToVariantRegistration:: - wxAnyToVariantRegistration(wxVariantDataFactory factory) - : m_factory(factory) -{ - wxPreRegisterAnyToVariant(this); -} - -wxAnyToVariantRegistration::~wxAnyToVariantRegistration() -{ -} - -wxVariant::wxVariant(const wxAny& any) - : wxObject() -{ - wxVariant variant; - if ( !any.GetAs(&variant) ) - { - wxFAIL_MSG("wxAny of this type cannot be converted to wxVariant"); - return; - } - - *this = variant; -} - -wxAny wxVariant::GetAny() const -{ - if ( IsNull() ) - return wxAny(); - - wxAny any; - wxVariantData* data = GetData(); - - if ( data->GetAsAny(&any) ) - return any; - - // If everything else fails, wrap the whole wxVariantData - return wxAny(data); -} - -#endif // wxUSE_ANY - -// ----------------------------------------------------------------- -// wxVariantDataLong -// ----------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxVariantDataLong: public wxVariantData -{ -public: - wxVariantDataLong() { m_value = 0; } - wxVariantDataLong(long value) { m_value = value; } - - inline long GetValue() const { return m_value; } - inline void SetValue(long value) { m_value = value; } - - virtual bool Eq(wxVariantData& data) const wxOVERRIDE; - - virtual bool Read(wxString& str) wxOVERRIDE; - virtual bool Write(wxString& str) const wxOVERRIDE; -#if wxUSE_STD_IOSTREAM - virtual bool Read(wxSTD istream& str) wxOVERRIDE; - virtual bool Write(wxSTD ostream& str) const wxOVERRIDE; -#endif -#if wxUSE_STREAMS - virtual bool Read(wxInputStream& str); - virtual bool Write(wxOutputStream &str) const; -#endif // wxUSE_STREAMS - - wxVariantData* Clone() const wxOVERRIDE { return new wxVariantDataLong(m_value); } - - virtual wxString GetType() const wxOVERRIDE { return wxT("long"); } - -#if wxUSE_ANY - // Since wxAny does not have separate type for integers shorter than - // longlong, we do not usually implement wxVariant->wxAny conversion - // here (but in wxVariantDataLongLong instead). - #ifndef wxLongLong_t - DECLARE_WXANY_CONVERSION() - #else - bool GetAsAny(wxAny* any) const wxOVERRIDE - { - *any = m_value; - return true; - } - #endif -#endif // wxUSE_ANY - -protected: - long m_value; -}; - -#ifndef wxLongLong_t -IMPLEMENT_TRIVIAL_WXANY_CONVERSION(long, wxVariantDataLong) -#endif - -bool wxVariantDataLong::Eq(wxVariantData& data) const -{ - wxASSERT_MSG( (data.GetType() == wxT("long")), wxT("wxVariantDataLong::Eq: argument mismatch") ); - - wxVariantDataLong& otherData = (wxVariantDataLong&) data; - - return (otherData.m_value == m_value); -} - -#if wxUSE_STD_IOSTREAM -bool wxVariantDataLong::Write(wxSTD ostream& str) const -{ - wxString s; - Write(s); - str << (const char*) s.mb_str(); - return true; -} -#endif - -bool wxVariantDataLong::Write(wxString& str) const -{ - str.Printf(wxT("%ld"), m_value); - return true; -} - -#if wxUSE_STD_IOSTREAM -bool wxVariantDataLong::Read(wxSTD istream& str) -{ - str >> m_value; - return true; -} -#endif - -#if wxUSE_STREAMS -bool wxVariantDataLong::Write(wxOutputStream& str) const -{ - wxTextOutputStream s(str); - - s.Write32((size_t)m_value); - return true; -} - -bool wxVariantDataLong::Read(wxInputStream& str) -{ - wxTextInputStream s(str); - m_value = s.Read32(); - return true; -} -#endif // wxUSE_STREAMS - -bool wxVariantDataLong::Read(wxString& str) -{ - m_value = wxAtol(str); - return true; -} - -// wxVariant - -wxVariant::wxVariant(long val, const wxString& name) -{ - m_refData = new wxVariantDataLong(val); - m_name = name; -} - -wxVariant::wxVariant(int val, const wxString& name) -{ - m_refData = new wxVariantDataLong((long)val); - m_name = name; -} - -wxVariant::wxVariant(short val, const wxString& name) -{ - m_refData = new wxVariantDataLong((long)val); - m_name = name; -} - -bool wxVariant::operator== (long value) const -{ - long thisValue; - if (!Convert(&thisValue)) - return false; - else - return (value == thisValue); -} - -bool wxVariant::operator!= (long value) const -{ - return (!((*this) == value)); -} - -void wxVariant::operator= (long value) -{ - if (GetType() == wxT("long") && - m_refData->GetRefCount() == 1) - { - ((wxVariantDataLong*)GetData())->SetValue(value); - } - else - { - UnRef(); - m_refData = new wxVariantDataLong(value); - } -} - -long wxVariant::GetLong() const -{ - long value; - if (Convert(& value)) - return value; - else - { - wxFAIL_MSG(wxT("Could not convert to a long")); - return 0; - } -} - -// ----------------------------------------------------------------- -// wxVariantDoubleData -// ----------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxVariantDoubleData: public wxVariantData -{ -public: - wxVariantDoubleData() { m_value = 0.0; } - wxVariantDoubleData(double value) { m_value = value; } - - inline double GetValue() const { return m_value; } - inline void SetValue(double value) { m_value = value; } - - virtual bool Eq(wxVariantData& data) const wxOVERRIDE; - virtual bool Read(wxString& str) wxOVERRIDE; -#if wxUSE_STD_IOSTREAM - virtual bool Write(wxSTD ostream& str) const wxOVERRIDE; -#endif - virtual bool Write(wxString& str) const wxOVERRIDE; -#if wxUSE_STD_IOSTREAM - virtual bool Read(wxSTD istream& str) wxOVERRIDE; -#endif -#if wxUSE_STREAMS - virtual bool Read(wxInputStream& str); - virtual bool Write(wxOutputStream &str) const; -#endif // wxUSE_STREAMS - virtual wxString GetType() const wxOVERRIDE { return wxT("double"); } - - wxVariantData* Clone() const wxOVERRIDE { return new wxVariantDoubleData(m_value); } - - DECLARE_WXANY_CONVERSION() -protected: - double m_value; -}; - -IMPLEMENT_TRIVIAL_WXANY_CONVERSION(double, wxVariantDoubleData) - -bool wxVariantDoubleData::Eq(wxVariantData& data) const -{ - wxASSERT_MSG( (data.GetType() == wxT("double")), wxT("wxVariantDoubleData::Eq: argument mismatch") ); - - wxVariantDoubleData& otherData = (wxVariantDoubleData&) data; - - return wxIsSameDouble(otherData.m_value, m_value); -} - -#if wxUSE_STD_IOSTREAM -bool wxVariantDoubleData::Write(wxSTD ostream& str) const -{ - wxString s; - Write(s); - str << (const char*) s.mb_str(); - return true; -} -#endif - -bool wxVariantDoubleData::Write(wxString& str) const -{ - str.Printf(wxT("%.14g"), m_value); - return true; -} - -#if wxUSE_STD_IOSTREAM -bool wxVariantDoubleData::Read(wxSTD istream& str) -{ - str >> m_value; - return true; -} -#endif - -#if wxUSE_STREAMS -bool wxVariantDoubleData::Write(wxOutputStream& str) const -{ - wxTextOutputStream s(str); - s.WriteDouble((double)m_value); - return true; -} - -bool wxVariantDoubleData::Read(wxInputStream& str) -{ - wxTextInputStream s(str); - m_value = (float)s.ReadDouble(); - return true; -} -#endif // wxUSE_STREAMS - -bool wxVariantDoubleData::Read(wxString& str) -{ - m_value = wxAtof(str); - return true; -} - -// wxVariant double code - -wxVariant::wxVariant(double val, const wxString& name) -{ - m_refData = new wxVariantDoubleData(val); - m_name = name; -} - -bool wxVariant::operator== (double value) const -{ - double thisValue; - if (!Convert(&thisValue)) - return false; - - return wxIsSameDouble(value, thisValue); -} - -bool wxVariant::operator!= (double value) const -{ - return (!((*this) == value)); -} - -void wxVariant::operator= (double value) -{ - if (GetType() == wxT("double") && - m_refData->GetRefCount() == 1) - { - ((wxVariantDoubleData*)GetData())->SetValue(value); - } - else - { - UnRef(); - m_refData = new wxVariantDoubleData(value); - } -} - -double wxVariant::GetDouble() const -{ - double value; - if (Convert(& value)) - return value; - else - { - wxFAIL_MSG(wxT("Could not convert to a double number")); - return 0.0; - } -} - -// ----------------------------------------------------------------- -// wxVariantBoolData -// ----------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxVariantDataBool: public wxVariantData -{ -public: - wxVariantDataBool() { m_value = 0; } - wxVariantDataBool(bool value) { m_value = value; } - - inline bool GetValue() const { return m_value; } - inline void SetValue(bool value) { m_value = value; } - - virtual bool Eq(wxVariantData& data) const wxOVERRIDE; -#if wxUSE_STD_IOSTREAM - virtual bool Write(wxSTD ostream& str) const wxOVERRIDE; -#endif - virtual bool Write(wxString& str) const wxOVERRIDE; - virtual bool Read(wxString& str) wxOVERRIDE; -#if wxUSE_STD_IOSTREAM - virtual bool Read(wxSTD istream& str) wxOVERRIDE; -#endif -#if wxUSE_STREAMS - virtual bool Read(wxInputStream& str); - virtual bool Write(wxOutputStream& str) const; -#endif // wxUSE_STREAMS - virtual wxString GetType() const wxOVERRIDE { return wxT("bool"); } - - wxVariantData* Clone() const wxOVERRIDE { return new wxVariantDataBool(m_value); } - - DECLARE_WXANY_CONVERSION() -protected: - bool m_value; -}; - -IMPLEMENT_TRIVIAL_WXANY_CONVERSION(bool, wxVariantDataBool) - -bool wxVariantDataBool::Eq(wxVariantData& data) const -{ - wxASSERT_MSG( (data.GetType() == wxT("bool")), wxT("wxVariantDataBool::Eq: argument mismatch") ); - - wxVariantDataBool& otherData = (wxVariantDataBool&) data; - - return (otherData.m_value == m_value); -} - -#if wxUSE_STD_IOSTREAM -bool wxVariantDataBool::Write(wxSTD ostream& str) const -{ - wxString s; - Write(s); - str << (const char*) s.mb_str(); - return true; -} -#endif - -bool wxVariantDataBool::Write(wxString& str) const -{ - str.Printf(wxT("%d"), (int) m_value); - return true; -} - -#if wxUSE_STD_IOSTREAM -bool wxVariantDataBool::Read(wxSTD istream& WXUNUSED(str)) -{ - wxFAIL_MSG(wxT("Unimplemented")); -// str >> (long) m_value; - return false; -} -#endif - -#if wxUSE_STREAMS -bool wxVariantDataBool::Write(wxOutputStream& str) const -{ - wxTextOutputStream s(str); - - s.Write8(m_value); - return true; -} - -bool wxVariantDataBool::Read(wxInputStream& str) -{ - wxTextInputStream s(str); - - m_value = s.Read8() != 0; - return true; -} -#endif // wxUSE_STREAMS - -bool wxVariantDataBool::Read(wxString& str) -{ - m_value = (wxAtol(str) != 0); - return true; -} - -// wxVariant **** - -wxVariant::wxVariant(bool val, const wxString& name) -{ - m_refData = new wxVariantDataBool(val); - m_name = name; -} - -bool wxVariant::operator== (bool value) const -{ - bool thisValue; - if (!Convert(&thisValue)) - return false; - else - return (value == thisValue); -} - -bool wxVariant::operator!= (bool value) const -{ - return (!((*this) == value)); -} - -void wxVariant::operator= (bool value) -{ - if (GetType() == wxT("bool") && - m_refData->GetRefCount() == 1) - { - ((wxVariantDataBool*)GetData())->SetValue(value); - } - else - { - UnRef(); - m_refData = new wxVariantDataBool(value); - } -} - -bool wxVariant::GetBool() const -{ - bool value; - if (Convert(& value)) - return value; - else - { - wxFAIL_MSG(wxT("Could not convert to a bool")); - return 0; - } -} - -// ----------------------------------------------------------------- -// wxVariantDataChar -// ----------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxVariantDataChar: public wxVariantData -{ -public: - wxVariantDataChar() { m_value = 0; } - wxVariantDataChar(const wxUniChar& value) { m_value = value; } - - inline wxUniChar GetValue() const { return m_value; } - inline void SetValue(const wxUniChar& value) { m_value = value; } - - virtual bool Eq(wxVariantData& data) const wxOVERRIDE; -#if wxUSE_STD_IOSTREAM - virtual bool Read(wxSTD istream& str) wxOVERRIDE; - virtual bool Write(wxSTD ostream& str) const wxOVERRIDE; -#endif - virtual bool Read(wxString& str) wxOVERRIDE; - virtual bool Write(wxString& str) const wxOVERRIDE; -#if wxUSE_STREAMS - virtual bool Read(wxInputStream& str); - virtual bool Write(wxOutputStream& str) const; -#endif // wxUSE_STREAMS - virtual wxString GetType() const wxOVERRIDE { return wxT("char"); } - wxVariantData* Clone() const wxOVERRIDE { return new wxVariantDataChar(m_value); } - - DECLARE_WXANY_CONVERSION() -protected: - wxUniChar m_value; -}; - -IMPLEMENT_TRIVIAL_WXANY_CONVERSION(wxUniChar, wxVariantDataChar) - -bool wxVariantDataChar::Eq(wxVariantData& data) const -{ - wxASSERT_MSG( (data.GetType() == wxT("char")), wxT("wxVariantDataChar::Eq: argument mismatch") ); - - wxVariantDataChar& otherData = (wxVariantDataChar&) data; - - return (otherData.m_value == m_value); -} - -#if wxUSE_STD_IOSTREAM -bool wxVariantDataChar::Write(wxSTD ostream& str) const -{ - str << wxString(m_value); - return true; -} -#endif - -bool wxVariantDataChar::Write(wxString& str) const -{ - str = m_value; - return true; -} - -#if wxUSE_STD_IOSTREAM -bool wxVariantDataChar::Read(wxSTD istream& WXUNUSED(str)) -{ - wxFAIL_MSG(wxT("Unimplemented")); - - return false; -} -#endif - -#if wxUSE_STREAMS -bool wxVariantDataChar::Write(wxOutputStream& str) const -{ - wxTextOutputStream s(str); - - // FIXME-UTF8: this should be just "s << m_value;" after removal of - // ANSI build and addition of wxUniChar to wxTextOutputStream: - s << (wxChar)m_value; - - return true; -} - -bool wxVariantDataChar::Read(wxInputStream& str) -{ - wxTextInputStream s(str); - - // FIXME-UTF8: this should be just "s >> m_value;" after removal of - // ANSI build and addition of wxUniChar to wxTextInputStream: - wxChar ch; - s >> ch; - m_value = ch; - - return true; -} -#endif // wxUSE_STREAMS - -bool wxVariantDataChar::Read(wxString& str) -{ - m_value = str[0u]; - return true; -} - -wxVariant::wxVariant(const wxUniChar& val, const wxString& name) -{ - m_refData = new wxVariantDataChar(val); - m_name = name; -} - -wxVariant::wxVariant(char val, const wxString& name) -{ - m_refData = new wxVariantDataChar(val); - m_name = name; -} - -wxVariant::wxVariant(wchar_t val, const wxString& name) -{ - m_refData = new wxVariantDataChar(val); - m_name = name; -} - -bool wxVariant::operator==(const wxUniChar& value) const -{ - wxUniChar thisValue; - if (!Convert(&thisValue)) - return false; - else - return (value == thisValue); -} - -wxVariant& wxVariant::operator=(const wxUniChar& value) -{ - if (GetType() == wxT("char") && - m_refData->GetRefCount() == 1) - { - ((wxVariantDataChar*)GetData())->SetValue(value); - } - else - { - UnRef(); - m_refData = new wxVariantDataChar(value); - } - - return *this; -} - -wxUniChar wxVariant::GetChar() const -{ - wxUniChar value; - if (Convert(& value)) - return value; - else - { - wxFAIL_MSG(wxT("Could not convert to a char")); - return wxUniChar(0); - } -} - -// ---------------------------------------------------------------------------- -// wxVariantDataString -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxVariantDataString: public wxVariantData -{ -public: - wxVariantDataString() { } - wxVariantDataString(const wxString& value) { m_value = value; } - - inline wxString GetValue() const { return m_value; } - inline void SetValue(const wxString& value) { m_value = value; } - - virtual bool Eq(wxVariantData& data) const wxOVERRIDE; -#if wxUSE_STD_IOSTREAM - virtual bool Write(wxSTD ostream& str) const wxOVERRIDE; -#endif - virtual bool Read(wxString& str) wxOVERRIDE; - virtual bool Write(wxString& str) const wxOVERRIDE; -#if wxUSE_STD_IOSTREAM - virtual bool Read(wxSTD istream& WXUNUSED(str)) wxOVERRIDE { return false; } -#endif -#if wxUSE_STREAMS - virtual bool Read(wxInputStream& str); - virtual bool Write(wxOutputStream& str) const; -#endif // wxUSE_STREAMS - virtual wxString GetType() const wxOVERRIDE { return wxT("string"); } - wxVariantData* Clone() const wxOVERRIDE { return new wxVariantDataString(m_value); } - - DECLARE_WXANY_CONVERSION() -protected: - wxString m_value; -}; - -IMPLEMENT_TRIVIAL_WXANY_CONVERSION(wxString, wxVariantDataString) - -#if wxUSE_ANY -// This allows converting string literal wxAnys to string variants -wxVariantData* wxVariantDataFromConstCharPAny(const wxAny& any) -{ - return new wxVariantDataString(any.As()); -} - -wxVariantData* wxVariantDataFromConstWchar_tPAny(const wxAny& any) -{ - return new wxVariantDataString(any.As()); -} - -_REGISTER_WXANY_CONVERSION(const char*, - ConstCharP, - wxVariantDataFromConstCharPAny) -_REGISTER_WXANY_CONVERSION(const wchar_t*, - ConstWchar_tP, - wxVariantDataFromConstWchar_tPAny) -#endif - -bool wxVariantDataString::Eq(wxVariantData& data) const -{ - wxASSERT_MSG( (data.GetType() == wxT("string")), wxT("wxVariantDataString::Eq: argument mismatch") ); - - wxVariantDataString& otherData = (wxVariantDataString&) data; - - return (otherData.m_value == m_value); -} - -#if wxUSE_STD_IOSTREAM -bool wxVariantDataString::Write(wxSTD ostream& str) const -{ - str << (const char*) m_value.mb_str(); - return true; -} -#endif - -bool wxVariantDataString::Write(wxString& str) const -{ - str = m_value; - return true; -} - -#if wxUSE_STREAMS -bool wxVariantDataString::Write(wxOutputStream& str) const -{ - // why doesn't wxOutputStream::operator<< take "const wxString&" - wxTextOutputStream s(str); - s.WriteString(m_value); - return true; -} - -bool wxVariantDataString::Read(wxInputStream& str) -{ - wxTextInputStream s(str); - - m_value = s.ReadLine(); - return true; -} -#endif // wxUSE_STREAMS - -bool wxVariantDataString::Read(wxString& str) -{ - m_value = str; - return true; -} - -// wxVariant **** - -wxVariant::wxVariant(const wxString& val, const wxString& name) -{ - m_refData = new wxVariantDataString(val); - m_name = name; -} - -wxVariant::wxVariant(const char* val, const wxString& name) -{ - m_refData = new wxVariantDataString(wxString(val)); - m_name = name; -} - -wxVariant::wxVariant(const wchar_t* val, const wxString& name) -{ - m_refData = new wxVariantDataString(wxString(val)); - m_name = name; -} - -wxVariant::wxVariant(const wxCStrData& val, const wxString& name) -{ - m_refData = new wxVariantDataString(val.AsString()); - m_name = name; -} - -wxVariant::wxVariant(const wxScopedCharBuffer& val, const wxString& name) -{ - m_refData = new wxVariantDataString(wxString(val)); - m_name = name; -} - -wxVariant::wxVariant(const wxScopedWCharBuffer& val, const wxString& name) -{ - m_refData = new wxVariantDataString(wxString(val)); - m_name = name; -} - -#if wxUSE_STD_STRING -wxVariant::wxVariant(const std::string& val, const wxString& name) -{ - m_refData = new wxVariantDataString(wxString(val)); - m_name = name; -} - -wxVariant::wxVariant(const wxStdWideString& val, const wxString& name) -{ - m_refData = new wxVariantDataString(wxString(val)); - m_name = name; -} -#endif // wxUSE_STD_STRING - -bool wxVariant::operator== (const wxString& value) const -{ - wxString thisValue; - if (!Convert(&thisValue)) - return false; - - return value == thisValue; -} - -bool wxVariant::operator!= (const wxString& value) const -{ - return (!((*this) == value)); -} - -wxVariant& wxVariant::operator= (const wxString& value) -{ - if (GetType() == wxT("string") && - m_refData->GetRefCount() == 1) - { - ((wxVariantDataString*)GetData())->SetValue(value); - } - else - { - UnRef(); - m_refData = new wxVariantDataString(value); - } - return *this; -} - -wxString wxVariant::GetString() const -{ - wxString value; - if (!Convert(& value)) - { - wxFAIL_MSG(wxT("Could not convert to a string")); - } - - return value; -} - -// ---------------------------------------------------------------------------- -// wxVariantDataWxObjectPtr -// ---------------------------------------------------------------------------- - -class wxVariantDataWxObjectPtr: public wxVariantData -{ -public: - wxVariantDataWxObjectPtr() { } - wxVariantDataWxObjectPtr(wxObject* value) { m_value = value; } - - inline wxObject* GetValue() const { return m_value; } - inline void SetValue(wxObject* value) { m_value = value; } - - virtual bool Eq(wxVariantData& data) const wxOVERRIDE; -#if wxUSE_STD_IOSTREAM - virtual bool Write(wxSTD ostream& str) const wxOVERRIDE; -#endif - virtual bool Write(wxString& str) const wxOVERRIDE; -#if wxUSE_STD_IOSTREAM - virtual bool Read(wxSTD istream& str) wxOVERRIDE; -#endif - virtual bool Read(wxString& str) wxOVERRIDE; - virtual wxString GetType() const wxOVERRIDE ; - virtual wxVariantData* Clone() const wxOVERRIDE { return new wxVariantDataWxObjectPtr(m_value); } - - virtual wxClassInfo* GetValueClassInfo() wxOVERRIDE; - - DECLARE_WXANY_CONVERSION() -protected: - wxObject* m_value; -}; - -IMPLEMENT_TRIVIAL_WXANY_CONVERSION(wxObject*, wxVariantDataWxObjectPtr) - -bool wxVariantDataWxObjectPtr::Eq(wxVariantData& data) const -{ - wxASSERT_MSG( data.GetType() == GetType(), wxT("wxVariantDataWxObjectPtr::Eq: argument mismatch") ); - - wxVariantDataWxObjectPtr& otherData = (wxVariantDataWxObjectPtr&) data; - - return (otherData.m_value == m_value); -} - -wxString wxVariantDataWxObjectPtr::GetType() const -{ - wxString returnVal(wxT("wxObject*")); - - if (m_value) - { - returnVal = m_value->GetClassInfo()->GetClassName(); - returnVal += wxT("*"); - } - - return returnVal; -} - -wxClassInfo* wxVariantDataWxObjectPtr::GetValueClassInfo() -{ - wxClassInfo* returnVal=NULL; - - if (m_value) returnVal = m_value->GetClassInfo(); - - return returnVal; -} - -#if wxUSE_STD_IOSTREAM -bool wxVariantDataWxObjectPtr::Write(wxSTD ostream& str) const -{ - wxString s; - Write(s); - str << (const char*) s.mb_str(); - return true; -} -#endif - -bool wxVariantDataWxObjectPtr::Write(wxString& str) const -{ - str.Printf(wxT("%s(%p)"), GetType().c_str(), static_cast(m_value)); - return true; -} - -#if wxUSE_STD_IOSTREAM -bool wxVariantDataWxObjectPtr::Read(wxSTD istream& WXUNUSED(str)) -{ - // Not implemented - return false; -} -#endif - -bool wxVariantDataWxObjectPtr::Read(wxString& WXUNUSED(str)) -{ - // Not implemented - return false; -} - -// wxVariant - -wxVariant::wxVariant( wxObject* val, const wxString& name) -{ - m_refData = new wxVariantDataWxObjectPtr(val); - m_name = name; -} - -bool wxVariant::operator== (wxObject* value) const -{ - return (value == ((wxVariantDataWxObjectPtr*)GetData())->GetValue()); -} - -bool wxVariant::operator!= (wxObject* value) const -{ - return (!((*this) == (wxObject*) value)); -} - -void wxVariant::operator= (wxObject* value) -{ - UnRef(); - m_refData = new wxVariantDataWxObjectPtr(value); -} - -wxObject* wxVariant::GetWxObjectPtr() const -{ - return (wxObject*) ((wxVariantDataWxObjectPtr*) m_refData)->GetValue(); -} - -// ---------------------------------------------------------------------------- -// wxVariantDataVoidPtr -// ---------------------------------------------------------------------------- - -class wxVariantDataVoidPtr: public wxVariantData -{ -public: - wxVariantDataVoidPtr() { } - wxVariantDataVoidPtr(void* value) { m_value = value; } - - inline void* GetValue() const { return m_value; } - inline void SetValue(void* value) { m_value = value; } - - virtual bool Eq(wxVariantData& data) const wxOVERRIDE; -#if wxUSE_STD_IOSTREAM - virtual bool Write(wxSTD ostream& str) const wxOVERRIDE; -#endif - virtual bool Write(wxString& str) const wxOVERRIDE; -#if wxUSE_STD_IOSTREAM - virtual bool Read(wxSTD istream& str) wxOVERRIDE; -#endif - virtual bool Read(wxString& str) wxOVERRIDE; - virtual wxString GetType() const wxOVERRIDE { return wxT("void*"); } - virtual wxVariantData* Clone() const wxOVERRIDE { return new wxVariantDataVoidPtr(m_value); } - - DECLARE_WXANY_CONVERSION() -protected: - void* m_value; -}; - -IMPLEMENT_TRIVIAL_WXANY_CONVERSION(void*, wxVariantDataVoidPtr) - -bool wxVariantDataVoidPtr::Eq(wxVariantData& data) const -{ - wxASSERT_MSG( data.GetType() == wxT("void*"), wxT("wxVariantDataVoidPtr::Eq: argument mismatch") ); - - wxVariantDataVoidPtr& otherData = (wxVariantDataVoidPtr&) data; - - return (otherData.m_value == m_value); -} - -#if wxUSE_STD_IOSTREAM -bool wxVariantDataVoidPtr::Write(wxSTD ostream& str) const -{ - wxString s; - Write(s); - str << (const char*) s.mb_str(); - return true; -} -#endif - -bool wxVariantDataVoidPtr::Write(wxString& str) const -{ - str.Printf(wxT("%p"), m_value); - return true; -} - -#if wxUSE_STD_IOSTREAM -bool wxVariantDataVoidPtr::Read(wxSTD istream& WXUNUSED(str)) -{ - // Not implemented - return false; -} -#endif - -bool wxVariantDataVoidPtr::Read(wxString& WXUNUSED(str)) -{ - // Not implemented - return false; -} - -// wxVariant - -wxVariant::wxVariant( void* val, const wxString& name) -{ - m_refData = new wxVariantDataVoidPtr(val); - m_name = name; -} - -bool wxVariant::operator== (void* value) const -{ - return (value == ((wxVariantDataVoidPtr*)GetData())->GetValue()); -} - -bool wxVariant::operator!= (void* value) const -{ - return (!((*this) == (void*) value)); -} - -void wxVariant::operator= (void* value) -{ - if (GetType() == wxT("void*") && (m_refData->GetRefCount() == 1)) - { - ((wxVariantDataVoidPtr*)GetData())->SetValue(value); - } - else - { - UnRef(); - m_refData = new wxVariantDataVoidPtr(value); - } -} - -void* wxVariant::GetVoidPtr() const -{ - // handling this specially is convenient when working with COM, see #9873 - if ( IsNull() ) - return NULL; - - wxASSERT( GetType() == wxT("void*") ); - - return (void*) ((wxVariantDataVoidPtr*) m_refData)->GetValue(); -} - -// ---------------------------------------------------------------------------- -// wxVariantDataDateTime -// ---------------------------------------------------------------------------- - -#if wxUSE_DATETIME - -class wxVariantDataDateTime: public wxVariantData -{ -public: - wxVariantDataDateTime() { } - wxVariantDataDateTime(const wxDateTime& value) { m_value = value; } - - inline wxDateTime GetValue() const { return m_value; } - inline void SetValue(const wxDateTime& value) { m_value = value; } - - virtual bool Eq(wxVariantData& data) const wxOVERRIDE; -#if wxUSE_STD_IOSTREAM - virtual bool Write(wxSTD ostream& str) const wxOVERRIDE; -#endif - virtual bool Write(wxString& str) const wxOVERRIDE; -#if wxUSE_STD_IOSTREAM - virtual bool Read(wxSTD istream& str) wxOVERRIDE; -#endif - virtual bool Read(wxString& str) wxOVERRIDE; - virtual wxString GetType() const wxOVERRIDE { return wxT("datetime"); } - virtual wxVariantData* Clone() const wxOVERRIDE { return new wxVariantDataDateTime(m_value); } - - DECLARE_WXANY_CONVERSION() -protected: - wxDateTime m_value; -}; - -IMPLEMENT_TRIVIAL_WXANY_CONVERSION(wxDateTime, wxVariantDataDateTime) - -bool wxVariantDataDateTime::Eq(wxVariantData& data) const -{ - wxASSERT_MSG( (data.GetType() == wxT("datetime")), wxT("wxVariantDataDateTime::Eq: argument mismatch") ); - - wxVariantDataDateTime& otherData = (wxVariantDataDateTime&) data; - - return (otherData.m_value == m_value); -} - - -#if wxUSE_STD_IOSTREAM -bool wxVariantDataDateTime::Write(wxSTD ostream& str) const -{ - wxString value; - Write( value ); - str << value.c_str(); - return true; -} -#endif - - -bool wxVariantDataDateTime::Write(wxString& str) const -{ - if ( m_value.IsValid() ) - str = m_value.Format(); - else - str = wxS("Invalid"); - return true; -} - - -#if wxUSE_STD_IOSTREAM -bool wxVariantDataDateTime::Read(wxSTD istream& WXUNUSED(str)) -{ - // Not implemented - return false; -} -#endif - - -bool wxVariantDataDateTime::Read(wxString& str) -{ - if ( str == wxS("Invalid") ) - { - m_value = wxInvalidDateTime; - return true; - } - - wxString::const_iterator end; - return m_value.ParseDateTime(str, &end) && end == str.end(); -} - -// wxVariant - -wxVariant::wxVariant(const wxDateTime& val, const wxString& name) // Date -{ - m_refData = new wxVariantDataDateTime(val); - m_name = name; -} - -bool wxVariant::operator== (const wxDateTime& value) const -{ - wxDateTime thisValue; - if (!Convert(&thisValue)) - return false; - - return value.IsEqualTo(thisValue); -} - -bool wxVariant::operator!= (const wxDateTime& value) const -{ - return (!((*this) == value)); -} - -void wxVariant::operator= (const wxDateTime& value) -{ - if (GetType() == wxT("datetime") && - m_refData->GetRefCount() == 1) - { - ((wxVariantDataDateTime*)GetData())->SetValue(value); - } - else - { - UnRef(); - m_refData = new wxVariantDataDateTime(value); - } -} - -wxDateTime wxVariant::GetDateTime() const -{ - wxDateTime value; - if (!Convert(& value)) - { - wxFAIL_MSG(wxT("Could not convert to a datetime")); - } - - return value; -} - -#endif // wxUSE_DATETIME - -// ---------------------------------------------------------------------------- -// wxVariantDataArrayString -// ---------------------------------------------------------------------------- - -class wxVariantDataArrayString: public wxVariantData -{ -public: - wxVariantDataArrayString() { } - wxVariantDataArrayString(const wxArrayString& value) { m_value = value; } - - wxArrayString GetValue() const { return m_value; } - void SetValue(const wxArrayString& value) { m_value = value; } - - virtual bool Eq(wxVariantData& data) const wxOVERRIDE; -#if wxUSE_STD_IOSTREAM - virtual bool Write(wxSTD ostream& str) const wxOVERRIDE; -#endif - virtual bool Write(wxString& str) const wxOVERRIDE; -#if wxUSE_STD_IOSTREAM - virtual bool Read(wxSTD istream& str) wxOVERRIDE; -#endif - virtual bool Read(wxString& str) wxOVERRIDE; - virtual wxString GetType() const wxOVERRIDE { return wxT("arrstring"); } - virtual wxVariantData* Clone() const wxOVERRIDE { return new wxVariantDataArrayString(m_value); } - - DECLARE_WXANY_CONVERSION() -protected: - wxArrayString m_value; -}; - -IMPLEMENT_TRIVIAL_WXANY_CONVERSION(wxArrayString, wxVariantDataArrayString) - -bool wxVariantDataArrayString::Eq(wxVariantData& data) const -{ - wxASSERT_MSG( data.GetType() == GetType(), wxT("wxVariantDataArrayString::Eq: argument mismatch") ); - - wxVariantDataArrayString& otherData = (wxVariantDataArrayString&) data; - - return otherData.m_value == m_value; -} - -#if wxUSE_STD_IOSTREAM -bool wxVariantDataArrayString::Write(wxSTD ostream& WXUNUSED(str)) const -{ - // Not implemented - return false; -} -#endif - -bool wxVariantDataArrayString::Write(wxString& str) const -{ - size_t count = m_value.GetCount(); - for ( size_t n = 0; n < count; n++ ) - { - if ( n ) - str += wxT(';'); - - str += m_value[n]; - } - - return true; -} - - -#if wxUSE_STD_IOSTREAM -bool wxVariantDataArrayString::Read(wxSTD istream& WXUNUSED(str)) -{ - // Not implemented - return false; -} -#endif - - -bool wxVariantDataArrayString::Read(wxString& str) -{ - wxStringTokenizer tk(str, wxT(";")); - while ( tk.HasMoreTokens() ) - { - m_value.Add(tk.GetNextToken()); - } - - return true; -} - -// wxVariant - -wxVariant::wxVariant(const wxArrayString& val, const wxString& name) // Strings -{ - m_refData = new wxVariantDataArrayString(val); - m_name = name; -} - -bool wxVariant::operator==(const wxArrayString& WXUNUSED(value)) const -{ - wxFAIL_MSG( wxT("TODO") ); - - return false; -} - -bool wxVariant::operator!=(const wxArrayString& value) const -{ - return !(*this == value); -} - -void wxVariant::operator=(const wxArrayString& value) -{ - if (GetType() == wxT("arrstring") && - m_refData->GetRefCount() == 1) - { - ((wxVariantDataArrayString *)GetData())->SetValue(value); - } - else - { - UnRef(); - m_refData = new wxVariantDataArrayString(value); - } -} - -wxArrayString wxVariant::GetArrayString() const -{ - if ( GetType() == wxT("arrstring") ) - return ((wxVariantDataArrayString *)GetData())->GetValue(); - - return wxArrayString(); -} - -// ---------------------------------------------------------------------------- -// wxVariantDataLongLong -// ---------------------------------------------------------------------------- - -#if wxUSE_LONGLONG - -class WXDLLIMPEXP_BASE wxVariantDataLongLong : public wxVariantData -{ -public: - wxVariantDataLongLong() { m_value = 0; } - wxVariantDataLongLong(wxLongLong value) { m_value = value; } - - wxLongLong GetValue() const { return m_value; } - void SetValue(wxLongLong value) { m_value = value; } - - virtual bool Eq(wxVariantData& data) const wxOVERRIDE; - - virtual bool Read(wxString& str) wxOVERRIDE; - virtual bool Write(wxString& str) const wxOVERRIDE; -#if wxUSE_STD_IOSTREAM - virtual bool Read(wxSTD istream& str) wxOVERRIDE; - virtual bool Write(wxSTD ostream& str) const wxOVERRIDE; -#endif -#if wxUSE_STREAMS - virtual bool Read(wxInputStream& str); - virtual bool Write(wxOutputStream &str) const; -#endif // wxUSE_STREAMS - - wxVariantData* Clone() const wxOVERRIDE - { - return new wxVariantDataLongLong(m_value); - } - - virtual wxString GetType() const wxOVERRIDE { return wxS("longlong"); } - - DECLARE_WXANY_CONVERSION() -protected: - wxLongLong m_value; -}; - -// -// wxLongLong type requires customized wxAny conversion code -// -#if wxUSE_ANY -#ifdef wxLongLong_t - -bool wxVariantDataLongLong::GetAsAny(wxAny* any) const -{ - *any = m_value.GetValue(); - return true; -} - -wxVariantData* wxVariantDataLongLong::VariantDataFactory(const wxAny& any) -{ - return new wxVariantDataLongLong(any.As()); -} - -REGISTER_WXANY_CONVERSION(wxLongLong_t, wxVariantDataLongLong) - -#else // if !defined(wxLongLong_t) - -bool wxVariantDataLongLong::GetAsAny(wxAny* any) const -{ - *any = m_value; - return true; -} - -wxVariantData* wxVariantDataLongLong::VariantDataFactory(const wxAny& any) -{ - return new wxVariantDataLongLong(any.As()); -} - -REGISTER_WXANY_CONVERSION(wxLongLong, wxVariantDataLongLong) - -#endif // defined(wxLongLong_t)/!defined(wxLongLong_t) -#endif // wxUSE_ANY - -bool wxVariantDataLongLong::Eq(wxVariantData& data) const -{ - wxASSERT_MSG( (data.GetType() == wxS("longlong")), - "wxVariantDataLongLong::Eq: argument mismatch" ); - - wxVariantDataLongLong& otherData = (wxVariantDataLongLong&) data; - - return (otherData.m_value == m_value); -} - -#if wxUSE_STD_IOSTREAM -bool wxVariantDataLongLong::Write(wxSTD ostream& str) const -{ - wxString s; - Write(s); - str << (const char*) s.mb_str(); - return true; -} -#endif - -bool wxVariantDataLongLong::Write(wxString& str) const -{ -#ifdef wxLongLong_t - str.Printf(wxS("%lld"), m_value.GetValue()); - return true; -#else - return false; -#endif -} - -#if wxUSE_STD_IOSTREAM -bool wxVariantDataLongLong::Read(wxSTD istream& WXUNUSED(str)) -{ - wxFAIL_MSG(wxS("Unimplemented")); - return false; -} -#endif - -#if wxUSE_STREAMS -bool wxVariantDataLongLong::Write(wxOutputStream& str) const -{ - wxTextOutputStream s(str); - s.Write32(m_value.GetLo()); - s.Write32(m_value.GetHi()); - return true; -} - -bool wxVariantDataLongLong::Read(wxInputStream& str) -{ - wxTextInputStream s(str); - unsigned long lo = s.Read32(); - long hi = s.Read32(); - m_value = wxLongLong(hi, lo); - return true; -} -#endif // wxUSE_STREAMS - -bool wxVariantDataLongLong::Read(wxString& str) -{ -#ifdef wxLongLong_t - wxLongLong_t value_t; - if ( !str.ToLongLong(&value_t) ) - return false; - m_value = value_t; - return true; -#else - return false; -#endif -} - -// wxVariant - -wxVariant::wxVariant(wxLongLong val, const wxString& name) -{ - m_refData = new wxVariantDataLongLong(val); - m_name = name; -} - -bool wxVariant::operator==(wxLongLong value) const -{ - wxLongLong thisValue; - if ( !Convert(&thisValue) ) - return false; - else - return (value == thisValue); -} - -bool wxVariant::operator!=(wxLongLong value) const -{ - return (!((*this) == value)); -} - -void wxVariant::operator=(wxLongLong value) -{ - if ( GetType() == wxS("longlong") && - m_refData->GetRefCount() == 1 ) - { - ((wxVariantDataLongLong*)GetData())->SetValue(value); - } - else - { - UnRef(); - m_refData = new wxVariantDataLongLong(value); - } -} - -wxLongLong wxVariant::GetLongLong() const -{ - wxLongLong value; - if ( Convert(&value) ) - { - return value; - } - else - { - wxFAIL_MSG(wxT("Could not convert to a long long")); - return 0; - } -} - -#endif // wxUSE_LONGLONG - -// ---------------------------------------------------------------------------- -// wxVariantDataULongLong -// ---------------------------------------------------------------------------- - -#if wxUSE_LONGLONG - -class WXDLLIMPEXP_BASE wxVariantDataULongLong : public wxVariantData -{ -public: - wxVariantDataULongLong() { m_value = 0; } - wxVariantDataULongLong(wxULongLong value) { m_value = value; } - - wxULongLong GetValue() const { return m_value; } - void SetValue(wxULongLong value) { m_value = value; } - - virtual bool Eq(wxVariantData& data) const wxOVERRIDE; - - virtual bool Read(wxString& str) wxOVERRIDE; - virtual bool Write(wxString& str) const wxOVERRIDE; -#if wxUSE_STD_IOSTREAM - virtual bool Read(wxSTD istream& str) wxOVERRIDE; - virtual bool Write(wxSTD ostream& str) const wxOVERRIDE; -#endif -#if wxUSE_STREAMS - virtual bool Read(wxInputStream& str); - virtual bool Write(wxOutputStream &str) const; -#endif // wxUSE_STREAMS - - wxVariantData* Clone() const wxOVERRIDE - { - return new wxVariantDataULongLong(m_value); - } - - virtual wxString GetType() const wxOVERRIDE { return wxS("ulonglong"); } - - DECLARE_WXANY_CONVERSION() -protected: - wxULongLong m_value; -}; - -// -// wxULongLong type requires customized wxAny conversion code -// -#if wxUSE_ANY -#ifdef wxLongLong_t - -bool wxVariantDataULongLong::GetAsAny(wxAny* any) const -{ - *any = m_value.GetValue(); - return true; -} - -wxVariantData* wxVariantDataULongLong::VariantDataFactory(const wxAny& any) -{ - return new wxVariantDataULongLong(any.As()); -} - -REGISTER_WXANY_CONVERSION(wxULongLong_t, wxVariantDataULongLong) - -#else // if !defined(wxLongLong_t) - -bool wxVariantDataULongLong::GetAsAny(wxAny* any) const -{ - *any = m_value; - return true; -} - -wxVariantData* wxVariantDataULongLong::VariantDataFactory(const wxAny& any) -{ - return new wxVariantDataULongLong(any.As()); -} - -REGISTER_WXANY_CONVERSION(wxULongLong, wxVariantDataULongLong) - -#endif // defined(wxLongLong_t)/!defined(wxLongLong_t) -#endif // wxUSE_ANY - - -bool wxVariantDataULongLong::Eq(wxVariantData& data) const -{ - wxASSERT_MSG( (data.GetType() == wxS("ulonglong")), - "wxVariantDataULongLong::Eq: argument mismatch" ); - - wxVariantDataULongLong& otherData = (wxVariantDataULongLong&) data; - - return (otherData.m_value == m_value); -} - -#if wxUSE_STD_IOSTREAM -bool wxVariantDataULongLong::Write(wxSTD ostream& str) const -{ - wxString s; - Write(s); - str << (const char*) s.mb_str(); - return true; -} -#endif - -bool wxVariantDataULongLong::Write(wxString& str) const -{ -#ifdef wxLongLong_t - str.Printf(wxS("%llu"), m_value.GetValue()); - return true; -#else - return false; -#endif -} - -#if wxUSE_STD_IOSTREAM -bool wxVariantDataULongLong::Read(wxSTD istream& WXUNUSED(str)) -{ - wxFAIL_MSG(wxS("Unimplemented")); - return false; -} -#endif - -#if wxUSE_STREAMS -bool wxVariantDataULongLong::Write(wxOutputStream& str) const -{ - wxTextOutputStream s(str); - s.Write32(m_value.GetLo()); - s.Write32(m_value.GetHi()); - return true; -} - -bool wxVariantDataULongLong::Read(wxInputStream& str) -{ - wxTextInputStream s(str); - unsigned long lo = s.Read32(); - long hi = s.Read32(); - m_value = wxULongLong(hi, lo); - return true; -} -#endif // wxUSE_STREAMS - -bool wxVariantDataULongLong::Read(wxString& str) -{ -#ifdef wxLongLong_t - wxULongLong_t value_t; - if ( !str.ToULongLong(&value_t) ) - return false; - m_value = value_t; - return true; -#else - return false; -#endif -} - -// wxVariant - -wxVariant::wxVariant(wxULongLong val, const wxString& name) -{ - m_refData = new wxVariantDataULongLong(val); - m_name = name; -} - -bool wxVariant::operator==(wxULongLong value) const -{ - wxULongLong thisValue; - if ( !Convert(&thisValue) ) - return false; - else - return (value == thisValue); -} - -bool wxVariant::operator!=(wxULongLong value) const -{ - return (!((*this) == value)); -} - -void wxVariant::operator=(wxULongLong value) -{ - if ( GetType() == wxS("ulonglong") && - m_refData->GetRefCount() == 1 ) - { - ((wxVariantDataULongLong*)GetData())->SetValue(value); - } - else - { - UnRef(); - m_refData = new wxVariantDataULongLong(value); - } -} - -wxULongLong wxVariant::GetULongLong() const -{ - wxULongLong value; - if ( Convert(&value) ) - { - return value; - } - else - { - wxFAIL_MSG(wxT("Could not convert to a long long")); - return 0; - } -} - -#endif // wxUSE_LONGLONG - -// ---------------------------------------------------------------------------- -// wxVariantDataList -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxVariantDataList: public wxVariantData -{ -public: - wxVariantDataList() {} - wxVariantDataList(const wxVariantList& list); - virtual ~wxVariantDataList(); - - wxVariantList& GetValue() { return m_value; } - void SetValue(const wxVariantList& value) ; - - virtual bool Eq(wxVariantData& data) const wxOVERRIDE; -#if wxUSE_STD_IOSTREAM - virtual bool Write(wxSTD ostream& str) const wxOVERRIDE; -#endif - virtual bool Write(wxString& str) const wxOVERRIDE; -#if wxUSE_STD_IOSTREAM - virtual bool Read(wxSTD istream& str) wxOVERRIDE; -#endif - virtual bool Read(wxString& str) wxOVERRIDE; - virtual wxString GetType() const wxOVERRIDE { return wxT("list"); } - - void Clear(); - - wxVariantData* Clone() const wxOVERRIDE { return new wxVariantDataList(m_value); } - - DECLARE_WXANY_CONVERSION() -protected: - wxVariantList m_value; -}; - -#if wxUSE_ANY - -// -// Convert to/from list of wxAnys -// - -bool wxVariantDataList::GetAsAny(wxAny* any) const -{ - wxAnyList dst; - wxVariantList::compatibility_iterator node = m_value.GetFirst(); - while (node) - { - wxVariant* pVar = node->GetData(); - dst.push_back(new wxAny(((const wxVariant&)*pVar))); - node = node->GetNext(); - } - - *any = dst; - return true; -} - -wxVariantData* wxVariantDataList::VariantDataFactory(const wxAny& any) -{ - wxAnyList src = any.As(); - wxVariantList dst; - wxAnyList::compatibility_iterator node = src.GetFirst(); - while (node) - { - wxAny* pAny = node->GetData(); - dst.push_back(new wxVariant(*pAny)); - node = node->GetNext(); - } - - return new wxVariantDataList(dst); -} - -REGISTER_WXANY_CONVERSION(wxAnyList, wxVariantDataList) - -#endif // wxUSE_ANY - -wxVariantDataList::wxVariantDataList(const wxVariantList& list) -{ - SetValue(list); -} - -wxVariantDataList::~wxVariantDataList() -{ - Clear(); -} - -void wxVariantDataList::SetValue(const wxVariantList& value) -{ - Clear(); - wxVariantList::compatibility_iterator node = value.GetFirst(); - while (node) - { - wxVariant* var = node->GetData(); - m_value.Append(new wxVariant(*var)); - node = node->GetNext(); - } -} - -void wxVariantDataList::Clear() -{ - wxVariantList::compatibility_iterator node = m_value.GetFirst(); - while (node) - { - wxVariant* var = node->GetData(); - delete var; - node = node->GetNext(); - } - m_value.Clear(); -} - -bool wxVariantDataList::Eq(wxVariantData& data) const -{ - wxASSERT_MSG( (data.GetType() == wxT("list")), wxT("wxVariantDataList::Eq: argument mismatch") ); - - wxVariantDataList& listData = (wxVariantDataList&) data; - wxVariantList::compatibility_iterator node1 = m_value.GetFirst(); - wxVariantList::compatibility_iterator node2 = listData.GetValue().GetFirst(); - while (node1 && node2) - { - wxVariant* var1 = node1->GetData(); - wxVariant* var2 = node2->GetData(); - if ((*var1) != (*var2)) - return false; - node1 = node1->GetNext(); - node2 = node2->GetNext(); - } - if (node1 || node2) return false; - return true; -} - -#if wxUSE_STD_IOSTREAM -bool wxVariantDataList::Write(wxSTD ostream& str) const -{ - wxString s; - Write(s); - str << (const char*) s.mb_str(); - return true; -} -#endif - -bool wxVariantDataList::Write(wxString& str) const -{ - str = wxEmptyString; - wxVariantList::compatibility_iterator node = m_value.GetFirst(); - while (node) - { - wxVariant* var = node->GetData(); - if (node != m_value.GetFirst()) - str += wxT(" "); - wxString str1; - str += var->MakeString(); - node = node->GetNext(); - } - - return true; -} - -#if wxUSE_STD_IOSTREAM -bool wxVariantDataList::Read(wxSTD istream& WXUNUSED(str)) -{ - wxFAIL_MSG(wxT("Unimplemented")); - // TODO - return false; -} -#endif - -bool wxVariantDataList::Read(wxString& WXUNUSED(str)) -{ - wxFAIL_MSG(wxT("Unimplemented")); - // TODO - return false; -} - -// wxVariant - -wxVariant::wxVariant(const wxVariantList& val, const wxString& name) // List of variants -{ - m_refData = new wxVariantDataList(val); - m_name = name; -} - -bool wxVariant::operator== (const wxVariantList& value) const -{ - wxASSERT_MSG( (GetType() == wxT("list")), wxT("Invalid type for == operator") ); - - wxVariantDataList other(value); - return (GetData()->Eq(other)); -} - -bool wxVariant::operator!= (const wxVariantList& value) const -{ - return (!((*this) == value)); -} - -void wxVariant::operator= (const wxVariantList& value) -{ - if (GetType() == wxT("list") && - m_refData->GetRefCount() == 1) - { - ((wxVariantDataList*)GetData())->SetValue(value); - } - else - { - UnRef(); - m_refData = new wxVariantDataList(value); - } -} - -wxVariantList& wxVariant::GetList() const -{ - wxASSERT( (GetType() == wxT("list")) ); - - return (wxVariantList&) ((wxVariantDataList*) m_refData)->GetValue(); -} - -// Make empty list -void wxVariant::NullList() -{ - SetData(new wxVariantDataList()); -} - -// Append to list -void wxVariant::Append(const wxVariant& value) -{ - wxVariantList& list = GetList(); - - list.Append(new wxVariant(value)); -} - -// Insert at front of list -void wxVariant::Insert(const wxVariant& value) -{ - wxVariantList& list = GetList(); - - list.Insert(new wxVariant(value)); -} - -// Returns true if the variant is a member of the list -bool wxVariant::Member(const wxVariant& value) const -{ - wxVariantList& list = GetList(); - - wxVariantList::compatibility_iterator node = list.GetFirst(); - while (node) - { - wxVariant* other = node->GetData(); - if (value == *other) - return true; - node = node->GetNext(); - } - return false; -} - -// Deletes the nth element of the list -bool wxVariant::Delete(size_t item) -{ - wxVariantList& list = GetList(); - - wxASSERT_MSG( (item < list.GetCount()), wxT("Invalid index to Delete") ); - wxVariantList::compatibility_iterator node = list.Item(item); - wxVariant* variant = node->GetData(); - delete variant; - list.Erase(node); - return true; -} - -// Clear list -void wxVariant::ClearList() -{ - if (!IsNull() && (GetType() == wxT("list"))) - { - ((wxVariantDataList*) m_refData)->Clear(); - } - else - { - if (!GetType().IsSameAs(wxT("list"))) - UnRef(); - - m_refData = new wxVariantDataList; - } -} - -// Treat a list variant as an array -wxVariant wxVariant::operator[] (size_t idx) const -{ - wxASSERT_MSG( GetType() == wxT("list"), wxT("Invalid type for array operator") ); - - if (GetType() == wxT("list")) - { - wxVariantDataList* data = (wxVariantDataList*) m_refData; - wxASSERT_MSG( (idx < data->GetValue().GetCount()), wxT("Invalid index for array") ); - return *(data->GetValue().Item(idx)->GetData()); - } - return wxNullVariant; -} - -wxVariant& wxVariant::operator[] (size_t idx) -{ - // We can't return a reference to a variant for a string list, since the string - // is actually stored as a char*, not a variant. - - wxASSERT_MSG( (GetType() == wxT("list")), wxT("Invalid type for array operator") ); - - wxVariantDataList* data = (wxVariantDataList*) m_refData; - wxASSERT_MSG( (idx < data->GetValue().GetCount()), wxT("Invalid index for array") ); - - return * (data->GetValue().Item(idx)->GetData()); -} - -// Return the number of elements in a list -size_t wxVariant::GetCount() const -{ - wxASSERT_MSG( GetType() == wxT("list"), wxT("Invalid type for GetCount()") ); - - if (GetType() == wxT("list")) - { - wxVariantDataList* data = (wxVariantDataList*) m_refData; - return data->GetValue().GetCount(); - } - return 0; -} - -// ---------------------------------------------------------------------------- -// Type conversion -// ---------------------------------------------------------------------------- - -bool wxVariant::Convert(long* value) const -{ - wxString type(GetType()); - if (type == wxS("double")) - *value = (long) (((wxVariantDoubleData*)GetData())->GetValue()); - else if (type == wxS("long")) - *value = ((wxVariantDataLong*)GetData())->GetValue(); - else if (type == wxS("bool")) - *value = (long) (((wxVariantDataBool*)GetData())->GetValue()); - else if (type == wxS("string")) - *value = wxAtol(((wxVariantDataString*)GetData())->GetValue()); -#if wxUSE_LONGLONG - else if (type == wxS("longlong")) - { - wxLongLong v = ((wxVariantDataLongLong*)GetData())->GetValue(); - // Don't convert if return value would be vague - if ( v < LONG_MIN || v > LONG_MAX ) - return false; - *value = v.ToLong(); - } - else if (type == wxS("ulonglong")) - { - wxULongLong v = ((wxVariantDataULongLong*)GetData())->GetValue(); - // Don't convert if return value would be vague - if ( v.GetHi() ) - return false; - *value = (long) v.ToULong(); - } -#endif - else - return false; - - return true; -} - -bool wxVariant::Convert(bool* value) const -{ - wxString type(GetType()); - if (type == wxT("double")) - *value = ((int) (((wxVariantDoubleData*)GetData())->GetValue()) != 0); - else if (type == wxT("long")) - *value = (((wxVariantDataLong*)GetData())->GetValue() != 0); - else if (type == wxT("bool")) - *value = ((wxVariantDataBool*)GetData())->GetValue(); - else if (type == wxT("string")) - { - wxString val(((wxVariantDataString*)GetData())->GetValue()); - val.MakeLower(); - if (val == wxT("true") || val == wxT("yes") || val == wxT('1') ) - *value = true; - else if (val == wxT("false") || val == wxT("no") || val == wxT('0') ) - *value = false; - else - return false; - } - else - return false; - - return true; -} - -bool wxVariant::Convert(double* value) const -{ - wxString type(GetType()); - if (type == wxT("double")) - *value = ((wxVariantDoubleData*)GetData())->GetValue(); - else if (type == wxT("long")) - *value = (double) (((wxVariantDataLong*)GetData())->GetValue()); - else if (type == wxT("bool")) - *value = (double) (((wxVariantDataBool*)GetData())->GetValue()); - else if (type == wxT("string")) - *value = (double) wxAtof(((wxVariantDataString*)GetData())->GetValue()); -#if wxUSE_LONGLONG - else if (type == wxS("longlong")) - { - *value = ((wxVariantDataLongLong*)GetData())->GetValue().ToDouble(); - } - else if (type == wxS("ulonglong")) - { - *value = ((wxVariantDataULongLong*)GetData())->GetValue().ToDouble(); - } -#endif - else - return false; - - return true; -} - -bool wxVariant::Convert(wxUniChar* value) const -{ - wxString type(GetType()); - if (type == wxT("char")) - *value = ((wxVariantDataChar*)GetData())->GetValue(); - else if (type == wxT("long")) - *value = (char) (((wxVariantDataLong*)GetData())->GetValue()); - else if (type == wxT("bool")) - *value = (char) (((wxVariantDataBool*)GetData())->GetValue()); - else if (type == wxS("string")) - { - // Also accept strings of length 1 - const wxString& str = (((wxVariantDataString*)GetData())->GetValue()); - if ( str.length() == 1 ) - *value = str[0]; - else - return false; - } - else - return false; - - return true; -} - -bool wxVariant::Convert(char* value) const -{ - wxUniChar ch; - if ( !Convert(&ch) ) - return false; - *value = ch; - return true; -} - -bool wxVariant::Convert(wchar_t* value) const -{ - wxUniChar ch; - if ( !Convert(&ch) ) - return false; - *value = ch; - return true; -} - -bool wxVariant::Convert(wxString* value) const -{ - *value = MakeString(); - return true; -} - -#if wxUSE_LONGLONG -bool wxVariant::Convert(wxLongLong* value) const -{ - wxString type(GetType()); - if (type == wxS("longlong")) - *value = ((wxVariantDataLongLong*)GetData())->GetValue(); - else if (type == wxS("long")) - *value = ((wxVariantDataLong*)GetData())->GetValue(); - else if (type == wxS("string")) - { - wxString s = ((wxVariantDataString*)GetData())->GetValue(); -#ifdef wxLongLong_t - wxLongLong_t value_t; - if ( !s.ToLongLong(&value_t) ) - return false; - *value = value_t; -#else - long l_value; - if ( !s.ToLong(&l_value) ) - return false; - *value = l_value; -#endif - } - else if (type == wxS("bool")) - *value = (long) (((wxVariantDataBool*)GetData())->GetValue()); - else if (type == wxS("double")) - { - value->Assign(((wxVariantDoubleData*)GetData())->GetValue()); - } - else if (type == wxS("ulonglong")) - *value = ((wxVariantDataULongLong*)GetData())->GetValue(); - else - return false; - - return true; -} - -bool wxVariant::Convert(wxULongLong* value) const -{ - wxString type(GetType()); - if (type == wxS("ulonglong")) - *value = ((wxVariantDataULongLong*)GetData())->GetValue(); - else if (type == wxS("long")) - *value = ((wxVariantDataLong*)GetData())->GetValue(); - else if (type == wxS("string")) - { - wxString s = ((wxVariantDataString*)GetData())->GetValue(); -#ifdef wxLongLong_t - wxULongLong_t value_t; - if ( !s.ToULongLong(&value_t) ) - return false; - *value = value_t; -#else - unsigned long l_value; - if ( !s.ToULong(&l_value) ) - return false; - *value = l_value; -#endif - } - else if (type == wxS("bool")) - *value = (long) (((wxVariantDataBool*)GetData())->GetValue()); - else if (type == wxS("double")) - { - double value_d = ((wxVariantDoubleData*)GetData())->GetValue(); - - if ( value_d < 0.0 ) - return false; - -#ifdef wxLongLong_t - *value = (wxULongLong_t) value_d; -#else - wxLongLong temp; - temp.Assign(value_d); - *value = temp; -#endif - } - else if (type == wxS("longlong")) - *value = ((wxVariantDataLongLong*)GetData())->GetValue(); - else - return false; - - return true; -} -#endif // wxUSE_LONGLONG - -#if wxUSE_DATETIME -bool wxVariant::Convert(wxDateTime* value) const -{ - wxString type(GetType()); - if (type == wxT("datetime")) - { - *value = ((wxVariantDataDateTime*)GetData())->GetValue(); - return true; - } - - // Fallback to string conversion - wxString val; - if ( !Convert(&val) ) - return false; - - // Try to parse this as either date and time, only date or only time - // checking that the entire string was parsed - wxString::const_iterator end; - if ( value->ParseDateTime(val, &end) && end == val.end() ) - return true; - - if ( value->ParseDate(val, &end) && end == val.end() ) - return true; - - if ( value->ParseTime(val, &end) && end == val.end() ) - return true; - - return false; -} -#endif // wxUSE_DATETIME - -#endif // wxUSE_VARIANT diff --git a/Externals/wxWidgets3/src/common/webview.cpp b/Externals/wxWidgets3/src/common/webview.cpp deleted file mode 100644 index 4ef397022a..0000000000 --- a/Externals/wxWidgets3/src/common/webview.cpp +++ /dev/null @@ -1,111 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: webview.cpp -// Purpose: Common interface and events for web view component -// Author: Marianne Gagnon -// Copyright: (c) 2010 Marianne Gagnon, 2011 Steven Lamerton -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if wxUSE_WEBVIEW - -#if defined(__BORLANDC__) - #pragma hdrstop -#endif - -#include "wx/webview.h" - -#if defined(__WXOSX__) -#include "wx/osx/webview_webkit.h" -#elif defined(__WXGTK__) -#include "wx/gtk/webview_webkit.h" -#elif defined(__WXMSW__) -#include "wx/msw/webview_ie.h" -#endif - -// DLL options compatibility check: -#include "wx/app.h" -WX_CHECK_BUILD_OPTIONS("wxWEBVIEW") - -extern WXDLLIMPEXP_DATA_WEBVIEW(const char) wxWebViewNameStr[] = "wxWebView"; -extern WXDLLIMPEXP_DATA_WEBVIEW(const char) wxWebViewDefaultURLStr[] = "about:blank"; -extern WXDLLIMPEXP_DATA_WEBVIEW(const char) wxWebViewBackendIE[] = "wxWebViewIE"; -extern WXDLLIMPEXP_DATA_WEBVIEW(const char) wxWebViewBackendWebKit[] = "wxWebViewWebKit"; - -#ifdef __WXMSW__ -extern WXDLLIMPEXP_DATA_WEBVIEW(const char) wxWebViewBackendDefault[] = "wxWebViewIE"; -#else -extern WXDLLIMPEXP_DATA_WEBVIEW(const char) wxWebViewBackendDefault[] = "wxWebViewWebKit"; -#endif - -wxIMPLEMENT_ABSTRACT_CLASS(wxWebView, wxControl); -wxIMPLEMENT_DYNAMIC_CLASS(wxWebViewEvent, wxCommandEvent); - -wxDEFINE_EVENT( wxEVT_WEBVIEW_NAVIGATING, wxWebViewEvent ); -wxDEFINE_EVENT( wxEVT_WEBVIEW_NAVIGATED, wxWebViewEvent ); -wxDEFINE_EVENT( wxEVT_WEBVIEW_LOADED, wxWebViewEvent ); -wxDEFINE_EVENT( wxEVT_WEBVIEW_ERROR, wxWebViewEvent ); -wxDEFINE_EVENT( wxEVT_WEBVIEW_NEWWINDOW, wxWebViewEvent ); -wxDEFINE_EVENT( wxEVT_WEBVIEW_TITLE_CHANGED, wxWebViewEvent ); - -wxStringWebViewFactoryMap wxWebView::m_factoryMap; - -// static -wxWebView* wxWebView::New(const wxString& backend) -{ - wxStringWebViewFactoryMap::iterator iter = FindFactory(backend); - - if(iter == m_factoryMap.end()) - return NULL; - else - return (*iter).second->Create(); -} - -// static -wxWebView* wxWebView::New(wxWindow* parent, wxWindowID id, const wxString& url, - const wxPoint& pos, const wxSize& size, - const wxString& backend, long style, - const wxString& name) -{ - wxStringWebViewFactoryMap::iterator iter = FindFactory(backend); - - if(iter == m_factoryMap.end()) - return NULL; - else - return (*iter).second->Create(parent, id, url, pos, size, style, name); - -} - -// static -void wxWebView::RegisterFactory(const wxString& backend, - wxSharedPtr factory) -{ - m_factoryMap[backend] = factory; -} - -// static -wxStringWebViewFactoryMap::iterator wxWebView::FindFactory(const wxString &backend) -{ - // Initialise the map, it checks internally for existing factories - InitFactoryMap(); - - return m_factoryMap.find(backend); -} - -// static -void wxWebView::InitFactoryMap() -{ -#ifdef __WXMSW__ - if(m_factoryMap.find(wxWebViewBackendIE) == m_factoryMap.end()) - RegisterFactory(wxWebViewBackendIE, wxSharedPtr - (new wxWebViewFactoryIE)); -#else - if(m_factoryMap.find(wxWebViewBackendWebKit) == m_factoryMap.end()) - RegisterFactory(wxWebViewBackendWebKit, wxSharedPtr - (new wxWebViewFactoryWebKit)); -#endif -} - -#endif // wxUSE_WEBVIEW diff --git a/Externals/wxWidgets3/src/common/webviewarchivehandler.cpp b/Externals/wxWidgets3/src/common/webviewarchivehandler.cpp deleted file mode 100644 index cb8f608a29..0000000000 --- a/Externals/wxWidgets3/src/common/webviewarchivehandler.cpp +++ /dev/null @@ -1,117 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: webviewfilehandler.cpp -// Purpose: Custom webview handler to allow archive browsing -// Author: Steven Lamerton -// Copyright: (c) 2011 Steven Lamerton -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if wxUSE_WEBVIEW - -#if defined(__BORLANDC__) - #pragma hdrstop -#endif - -#include "wx/webviewarchivehandler.h" -#include "wx/filesys.h" - -//Taken from wx/filesys.cpp -static wxString EscapeFileNameCharsInURL(const char *in) -{ - wxString s; - - for ( const unsigned char *p = (const unsigned char*)in; *p; ++p ) - { - const unsigned char c = *p; - - if ( c == '/' || c == '-' || c == '.' || c == '_' || c == '~' || - (c >= '0' && c <= '9') || - (c >= 'a' && c <= 'z') || - (c >= 'A' && c <= 'Z') ) - { - s << c; - } - else - { - s << wxString::Format("%%%02x", c); - } - } - - return s; -} - -wxWebViewArchiveHandler::wxWebViewArchiveHandler(const wxString& scheme) : - wxWebViewHandler(scheme) -{ - m_fileSystem = new wxFileSystem(); -} - -wxWebViewArchiveHandler::~wxWebViewArchiveHandler() -{ - wxDELETE(m_fileSystem); -} - -wxFSFile* wxWebViewArchiveHandler::GetFile(const wxString &uri) -{ - //If there is a fragment at the end of the path then we need to strip it - //off as not all backends do this for us - wxString path = uri; - size_t hashloc = uri.find('#'); - if(hashloc != wxString::npos) - { - path = uri.substr(0, hashloc); - } - - //We iterate through the string to see if there is a protocol description - size_t start = wxString::npos; - for(size_t i = 0; i < path.length(); i++) - { - if(path[i] == ';' && path.substr(i, 10) == ";protocol=") - { - start = i; - break; - } - } - - //We do not have a protocol string so we just pass the path withouth the - if(start == wxString::npos) - { - size_t doubleslash = path.find("//"); - //The path is incorrectly formed without // after the scheme - if(doubleslash == wxString::npos) - return NULL; - - wxString fspath = "file:" + - EscapeFileNameCharsInURL(path.substr(doubleslash + 2).c_str()); - return m_fileSystem->OpenFile(fspath); - } - //Otherwise we need to extract the protocol - else - { - size_t end = path.find('/', start); - //For the path to be valid there must to a path after the protocol - if(end == wxString::npos) - { - return NULL; - } - wxString mainpath = path.substr(0, start); - wxString archivepath = path.substr(end); - wxString protstring = path.substr(start, end - start); - wxString protocol = protstring.substr(10); - //We can now construct the correct path - size_t doubleslash = path.find("//"); - //The path is incorrectly formed without // after the first protocol - if(doubleslash == wxString::npos) - return NULL; - - wxString fspath = "file:" + - EscapeFileNameCharsInURL(mainpath.substr(doubleslash + 2).c_str()) - + "#" + protocol +":" + archivepath; - return m_fileSystem->OpenFile(fspath); - } -} - -#endif // wxUSE_WEBVIEW diff --git a/Externals/wxWidgets3/src/common/webviewfshandler.cpp b/Externals/wxWidgets3/src/common/webviewfshandler.cpp deleted file mode 100644 index 3b62dcfe42..0000000000 --- a/Externals/wxWidgets3/src/common/webviewfshandler.cpp +++ /dev/null @@ -1,37 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: webviewfshandler.cpp -// Purpose: Custom webview handler for virtual file system -// Author: Nick Matthews -// Copyright: (c) 2012 Steven Lamerton -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if wxUSE_WEBVIEW - -#if defined(__BORLANDC__) - #pragma hdrstop -#endif - -#include "wx/webviewfshandler.h" -#include "wx/filesys.h" - -wxWebViewFSHandler::wxWebViewFSHandler(const wxString& scheme) : - wxWebViewHandler(scheme) -{ - m_fileSystem = new wxFileSystem(); -} - -wxWebViewFSHandler::~wxWebViewFSHandler() -{ - wxDELETE(m_fileSystem); -} - -wxFSFile* wxWebViewFSHandler::GetFile(const wxString &uri) -{ - return m_fileSystem->OpenFile(uri); -} - -#endif // wxUSE_WEBVIEW diff --git a/Externals/wxWidgets3/src/common/wfstream.cpp b/Externals/wxWidgets3/src/common/wfstream.cpp deleted file mode 100644 index 362b1861d6..0000000000 --- a/Externals/wxWidgets3/src/common/wfstream.cpp +++ /dev/null @@ -1,430 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/wfstream.cpp -// Purpose: "File stream" classes -// Author: Julian Smart -// Modified by: -// Created: 11/07/98 -// Copyright: (c) Guilhem Lavaux -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_STREAMS - -#include "wx/wfstream.h" - -#ifndef WX_PRECOMP - #include "wx/stream.h" -#endif - -#include - -#if wxUSE_FILE - -// ---------------------------------------------------------------------------- -// wxFileInputStream -// ---------------------------------------------------------------------------- - -wxFileInputStream::wxFileInputStream(const wxString& fileName) - : wxInputStream() -{ - m_file = new wxFile(fileName, wxFile::read); - m_file_destroy = true; - if ( !m_file->IsOpened() ) - m_lasterror = wxSTREAM_READ_ERROR; -} - -wxFileInputStream::wxFileInputStream() - : wxInputStream() -{ - m_file_destroy = false; - m_file = NULL; -} - -wxFileInputStream::wxFileInputStream(wxFile& file) -{ - m_file = &file; - m_file_destroy = false; -} - -wxFileInputStream::wxFileInputStream(int fd) -{ - m_file = new wxFile(fd); - m_file_destroy = true; -} - -wxFileInputStream::~wxFileInputStream() -{ - if (m_file_destroy) - delete m_file; -} - -wxFileOffset wxFileInputStream::GetLength() const -{ - return m_file->Length(); -} - -size_t wxFileInputStream::OnSysRead(void *buffer, size_t size) -{ - ssize_t ret = m_file->Read(buffer, size); - - // NB: we can't use a switch here because HP-UX CC doesn't allow - // switching over long long (which size_t is in 64bit mode) - - if ( !ret ) - { - // nothing read, so nothing more to read - m_lasterror = wxSTREAM_EOF; - } - else if ( ret == wxInvalidOffset ) - { - m_lasterror = wxSTREAM_READ_ERROR; - ret = 0; - } - else - { - // normal case - m_lasterror = wxSTREAM_NO_ERROR; - } - - return ret; -} - -wxFileOffset wxFileInputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode) -{ - return m_file->Seek(pos, mode); -} - -wxFileOffset wxFileInputStream::OnSysTell() const -{ - return m_file->Tell(); -} - -bool wxFileInputStream::IsOk() const -{ - return wxInputStream::IsOk() && m_file->IsOpened(); -} - -// ---------------------------------------------------------------------------- -// wxFileOutputStream -// ---------------------------------------------------------------------------- - -wxFileOutputStream::wxFileOutputStream(const wxString& fileName) -{ - m_file = new wxFile(fileName, wxFile::write); - m_file_destroy = true; - - if (!m_file->IsOpened()) - m_lasterror = wxSTREAM_WRITE_ERROR; -} - -wxFileOutputStream::wxFileOutputStream(wxFile& file) -{ - m_file = &file; - m_file_destroy = false; -} - -wxFileOutputStream::wxFileOutputStream() - : wxOutputStream() -{ - m_file_destroy = false; - m_file = NULL; -} - -wxFileOutputStream::wxFileOutputStream(int fd) -{ - m_file = new wxFile(fd); - m_file_destroy = true; -} - -wxFileOutputStream::~wxFileOutputStream() -{ - if (m_file_destroy) - { - Sync(); - delete m_file; - } -} - -size_t wxFileOutputStream::OnSysWrite(const void *buffer, size_t size) -{ - size_t ret = m_file->Write(buffer, size); - - m_lasterror = m_file->Error() ? wxSTREAM_WRITE_ERROR : wxSTREAM_NO_ERROR; - - return ret; -} - -wxFileOffset wxFileOutputStream::OnSysTell() const -{ - return m_file->Tell(); -} - -wxFileOffset wxFileOutputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode) -{ - return m_file->Seek(pos, mode); -} - -void wxFileOutputStream::Sync() -{ - wxOutputStream::Sync(); - m_file->Flush(); -} - -wxFileOffset wxFileOutputStream::GetLength() const -{ - return m_file->Length(); -} - -bool wxFileOutputStream::IsOk() const -{ - return wxOutputStream::IsOk() && m_file->IsOpened(); -} - -// ---------------------------------------------------------------------------- -// wxTempFileOutputStream -// ---------------------------------------------------------------------------- - -wxTempFileOutputStream::wxTempFileOutputStream(const wxString& fileName) -{ - m_file = new wxTempFile(fileName); - - if (!m_file->IsOpened()) - m_lasterror = wxSTREAM_WRITE_ERROR; -} - -wxTempFileOutputStream::~wxTempFileOutputStream() -{ - if (m_file->IsOpened()) - Discard(); - delete m_file; -} - -size_t wxTempFileOutputStream::OnSysWrite(const void *buffer, size_t size) -{ - if (IsOk() && m_file->Write(buffer, size)) - return size; - m_lasterror = wxSTREAM_WRITE_ERROR; - return 0; -} - -// ---------------------------------------------------------------------------- -// wxFileStream -// ---------------------------------------------------------------------------- - -wxFileStream::wxFileStream(const wxString& fileName) - : wxFileInputStream(), - wxFileOutputStream() -{ - wxFileOutputStream::m_file = - wxFileInputStream::m_file = new wxFile(fileName, wxFile::read_write); - - // this is a bit ugly as streams are symmetric but we still have to delete - // the file we created above exactly once so we decide to (arbitrarily) do - // it in wxFileInputStream - wxFileInputStream::m_file_destroy = true; -} - -bool wxFileStream::IsOk() const -{ - return wxFileOutputStream::IsOk() && wxFileInputStream::IsOk(); -} - -#endif // wxUSE_FILE - -#if wxUSE_FFILE - -// ---------------------------------------------------------------------------- -// wxFFileInputStream -// ---------------------------------------------------------------------------- - -wxFFileInputStream::wxFFileInputStream(const wxString& fileName, - const wxString& mode) - : wxInputStream() -{ - m_file = new wxFFile(fileName, mode); - m_file_destroy = true; - - if (!m_file->IsOpened()) - m_lasterror = wxSTREAM_WRITE_ERROR; -} - -wxFFileInputStream::wxFFileInputStream() - : wxInputStream() -{ - m_file = NULL; - m_file_destroy = false; -} - -wxFFileInputStream::wxFFileInputStream(wxFFile& file) -{ - m_file = &file; - m_file_destroy = false; -} - -wxFFileInputStream::wxFFileInputStream(FILE *file) -{ - m_file = new wxFFile(file); - m_file_destroy = true; -} - -wxFFileInputStream::~wxFFileInputStream() -{ - if (m_file_destroy) - delete m_file; -} - -wxFileOffset wxFFileInputStream::GetLength() const -{ - return m_file->Length(); -} - -size_t wxFFileInputStream::OnSysRead(void *buffer, size_t size) -{ - ssize_t ret = m_file->Read(buffer, size); - - // It is not safe to call Eof() if the file is not opened. - if (!m_file->IsOpened() || m_file->Eof()) - m_lasterror = wxSTREAM_EOF; - if (ret == wxInvalidOffset) - { - m_lasterror = wxSTREAM_READ_ERROR; - ret = 0; - } - - return ret; -} - -wxFileOffset wxFFileInputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode) -{ - return m_file->Seek(pos, mode) ? m_file->Tell() : wxInvalidOffset; -} - -wxFileOffset wxFFileInputStream::OnSysTell() const -{ - return m_file->Tell(); -} - -bool wxFFileInputStream::IsOk() const -{ - return wxStreamBase::IsOk() && m_file->IsOpened(); -} - -// ---------------------------------------------------------------------------- -// wxFFileOutputStream -// ---------------------------------------------------------------------------- - -wxFFileOutputStream::wxFFileOutputStream(const wxString& fileName, - const wxString& mode) -{ - m_file = new wxFFile(fileName, mode); - m_file_destroy = true; - - if (!m_file->IsOpened()) - { - m_lasterror = wxSTREAM_WRITE_ERROR; - } - else - { - if (m_file->Error()) - m_lasterror = wxSTREAM_WRITE_ERROR; - } -} - -wxFFileOutputStream::wxFFileOutputStream(wxFFile& file) -{ - m_file = &file; - m_file_destroy = false; -} - -wxFFileOutputStream::wxFFileOutputStream() - : wxOutputStream() -{ - m_file = NULL; - m_file_destroy = false; -} - -wxFFileOutputStream::wxFFileOutputStream(FILE *file) -{ - m_file = new wxFFile(file); - m_file_destroy = true; -} - -wxFFileOutputStream::~wxFFileOutputStream() -{ - if (m_file_destroy) - { - Sync(); - delete m_file; - } -} - -size_t wxFFileOutputStream::OnSysWrite(const void *buffer, size_t size) -{ - size_t ret = m_file->Write(buffer, size); - // It is not safe to call Error() if the file is not opened. - if (!m_file->IsOpened() || m_file->Error()) - m_lasterror = wxSTREAM_WRITE_ERROR; - else - m_lasterror = wxSTREAM_NO_ERROR; - return ret; -} - -wxFileOffset wxFFileOutputStream::OnSysTell() const -{ - return m_file->Tell(); -} - -wxFileOffset wxFFileOutputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode) -{ - return m_file->Seek(pos, mode) ? m_file->Tell() : wxInvalidOffset; -} - -void wxFFileOutputStream::Sync() -{ - wxOutputStream::Sync(); - m_file->Flush(); -} - -wxFileOffset wxFFileOutputStream::GetLength() const -{ - return m_file->Length(); -} - -bool wxFFileOutputStream::IsOk() const -{ - return wxStreamBase::IsOk() && m_file->IsOpened(); -} - -// ---------------------------------------------------------------------------- -// wxFFileStream -// ---------------------------------------------------------------------------- - -wxFFileStream::wxFFileStream(const wxString& fileName, const wxString& mode) - : wxFFileInputStream(), - wxFFileOutputStream() -{ - wxASSERT_MSG( mode.find_first_of('+') != wxString::npos, - "must be opened in read-write mode for this class to work" ); - - wxFFileOutputStream::m_file = - wxFFileInputStream::m_file = new wxFFile(fileName, mode); - - // see comment in wxFileStream ctor - wxFFileInputStream::m_file_destroy = true; -} - -bool wxFFileStream::IsOk() const -{ - return wxFFileOutputStream::IsOk() && wxFFileInputStream::IsOk(); -} - -#endif //wxUSE_FFILE - -#endif // wxUSE_STREAMS diff --git a/Externals/wxWidgets3/src/common/wincmn.cpp b/Externals/wxWidgets3/src/common/wincmn.cpp deleted file mode 100644 index d9f52733c7..0000000000 --- a/Externals/wxWidgets3/src/common/wincmn.cpp +++ /dev/null @@ -1,4087 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/wincmn.cpp -// Purpose: common (to all ports) wxWindow functions -// Author: Julian Smart, Vadim Zeitlin -// Modified by: -// Created: 13/07/98 -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#ifndef WX_PRECOMP - #include "wx/string.h" - #include "wx/log.h" - #include "wx/intl.h" - #include "wx/math.h" - #include "wx/frame.h" - #include "wx/window.h" - #include "wx/control.h" - #include "wx/checkbox.h" - #include "wx/radiobut.h" - #include "wx/statbox.h" - #include "wx/textctrl.h" - #include "wx/settings.h" - #include "wx/dialog.h" - #include "wx/msgdlg.h" - #include "wx/msgout.h" - #include "wx/statusbr.h" - #include "wx/toolbar.h" - #include "wx/dcclient.h" - #include "wx/dcscreen.h" - #include "wx/scrolbar.h" - #include "wx/layout.h" - #include "wx/sizer.h" - #include "wx/menu.h" -#endif //WX_PRECOMP - -#if wxUSE_DRAG_AND_DROP - #include "wx/dnd.h" -#endif // wxUSE_DRAG_AND_DROP - -#if wxUSE_ACCESSIBILITY - #include "wx/access.h" -#endif - -#if wxUSE_HELP - #include "wx/cshelp.h" -#endif // wxUSE_HELP - -#if wxUSE_TOOLTIPS - #include "wx/tooltip.h" -#endif // wxUSE_TOOLTIPS - -#if wxUSE_CARET - #include "wx/caret.h" -#endif // wxUSE_CARET - -#if wxUSE_SYSTEM_OPTIONS - #include "wx/sysopt.h" -#endif - -#include "wx/platinfo.h" -#include "wx/recguard.h" -#include "wx/private/window.h" - -#ifdef __WINDOWS__ - #include "wx/msw/wrapwin.h" -#endif - -// Windows List -WXDLLIMPEXP_DATA_CORE(wxWindowList) wxTopLevelWindows; - -// globals -#if wxUSE_MENUS -wxMenu *wxCurrentPopupMenu = NULL; -#endif // wxUSE_MENUS - -extern WXDLLEXPORT_DATA(const char) wxPanelNameStr[] = "panel"; - -namespace wxMouseCapture -{ - -// Check if the given window is in the capture stack. -bool IsInCaptureStack(wxWindowBase* win); - -} // wxMouseCapture - -// We consider 96 DPI to be the standard value, this is correct at least for -// MSW, but could conceivably need adjustment for the other platforms. -static const int BASELINE_DPI = 96; - -// ---------------------------------------------------------------------------- -// static data -// ---------------------------------------------------------------------------- - - -wxIMPLEMENT_ABSTRACT_CLASS(wxWindowBase, wxEvtHandler); - -// ---------------------------------------------------------------------------- -// event table -// ---------------------------------------------------------------------------- - -wxBEGIN_EVENT_TABLE(wxWindowBase, wxEvtHandler) - EVT_SYS_COLOUR_CHANGED(wxWindowBase::OnSysColourChanged) - EVT_INIT_DIALOG(wxWindowBase::OnInitDialog) - EVT_MIDDLE_DOWN(wxWindowBase::OnMiddleClick) - -#if wxUSE_HELP - EVT_HELP(wxID_ANY, wxWindowBase::OnHelp) -#endif // wxUSE_HELP - - EVT_SIZE(wxWindowBase::InternalOnSize) -wxEND_EVENT_TABLE() - -// ============================================================================ -// implementation of the common functionality of the wxWindow class -// ============================================================================ - -// ---------------------------------------------------------------------------- -// XTI -// ---------------------------------------------------------------------------- - -#if wxUSE_EXTENDED_RTTI - -// windows that are created from a parent window during its Create method, -// eg. spin controls in a calendar controls must never been streamed out -// separately otherwise chaos occurs. Right now easiest is to test for negative ids, -// as windows with negative ids never can be recreated anyway - - -bool wxWindowStreamingCallback( const wxObject *object, wxObjectWriter *, - wxObjectWriterCallback *, const wxStringToAnyHashMap & ) -{ - const wxWindow * win = wx_dynamic_cast(const wxWindow*, object); - if ( win && win->GetId() < 0 ) - return false; - return true; -} - -wxIMPLEMENT_DYNAMIC_CLASS_XTI_CALLBACK(wxWindow, wxWindowBase, "wx/window.h", \ - wxWindowStreamingCallback) - -// make wxWindowList known before the property is used - -wxCOLLECTION_TYPE_INFO( wxWindow*, wxWindowList ); - -template<> void wxCollectionToVariantArray( wxWindowList const &theList, - wxAnyList &value) -{ - wxListCollectionToAnyList( theList, value ); -} - -wxDEFINE_FLAGS( wxWindowStyle ) - -wxBEGIN_FLAGS( wxWindowStyle ) -// new style border flags, we put them first to -// use them for streaming out - -wxFLAGS_MEMBER(wxBORDER_SIMPLE) -wxFLAGS_MEMBER(wxBORDER_SUNKEN) -wxFLAGS_MEMBER(wxBORDER_DOUBLE) -wxFLAGS_MEMBER(wxBORDER_RAISED) -wxFLAGS_MEMBER(wxBORDER_STATIC) -wxFLAGS_MEMBER(wxBORDER_NONE) - -// old style border flags -wxFLAGS_MEMBER(wxSIMPLE_BORDER) -wxFLAGS_MEMBER(wxSUNKEN_BORDER) -wxFLAGS_MEMBER(wxDOUBLE_BORDER) -wxFLAGS_MEMBER(wxRAISED_BORDER) -wxFLAGS_MEMBER(wxSTATIC_BORDER) -wxFLAGS_MEMBER(wxBORDER) - -// standard window styles -wxFLAGS_MEMBER(wxTAB_TRAVERSAL) -wxFLAGS_MEMBER(wxCLIP_CHILDREN) -wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) -wxFLAGS_MEMBER(wxWANTS_CHARS) -wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE) -wxFLAGS_MEMBER(wxALWAYS_SHOW_SB ) -wxFLAGS_MEMBER(wxVSCROLL) -wxFLAGS_MEMBER(wxHSCROLL) - -wxEND_FLAGS( wxWindowStyle ) - -wxBEGIN_PROPERTIES_TABLE(wxWindow) -wxEVENT_PROPERTY( Close, wxEVT_CLOSE_WINDOW, wxCloseEvent) -wxEVENT_PROPERTY( Create, wxEVT_CREATE, wxWindowCreateEvent ) -wxEVENT_PROPERTY( Destroy, wxEVT_DESTROY, wxWindowDestroyEvent ) -// Always constructor Properties first - -wxREADONLY_PROPERTY( Parent,wxWindow*, GetParent, wxEMPTY_PARAMETER_VALUE, \ - 0 /*flags*/, wxT("Helpstring"), wxT("group")) -wxPROPERTY( Id,wxWindowID, SetId, GetId, -1 /*wxID_ANY*/, 0 /*flags*/, \ - wxT("Helpstring"), wxT("group") ) -wxPROPERTY( Position,wxPoint, SetPosition, GetPosition, wxDefaultPosition, \ - 0 /*flags*/, wxT("Helpstring"), wxT("group")) // pos -wxPROPERTY( Size,wxSize, SetSize, GetSize, wxDefaultSize, 0 /*flags*/, \ - wxT("Helpstring"), wxT("group")) // size -wxPROPERTY( WindowStyle, long, SetWindowStyleFlag, GetWindowStyleFlag, \ - wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, wxT("Helpstring"), wxT("group")) // style -wxPROPERTY( Name,wxString, SetName, GetName, wxEmptyString, 0 /*flags*/, \ - wxT("Helpstring"), wxT("group") ) - -// Then all relations of the object graph - -wxREADONLY_PROPERTY_COLLECTION( Children, wxWindowList, wxWindowBase*, \ - GetWindowChildren, wxPROP_OBJECT_GRAPH /*flags*/, \ - wxT("Helpstring"), wxT("group")) - -// and finally all other properties - -wxPROPERTY( ExtraStyle, long, SetExtraStyle, GetExtraStyle, wxEMPTY_PARAMETER_VALUE, \ - 0 /*flags*/, wxT("Helpstring"), wxT("group")) // extstyle -wxPROPERTY( BackgroundColour, wxColour, SetBackgroundColour, GetBackgroundColour, \ - wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, wxT("Helpstring"), wxT("group")) // bg -wxPROPERTY( ForegroundColour, wxColour, SetForegroundColour, GetForegroundColour, \ - wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, wxT("Helpstring"), wxT("group")) // fg -wxPROPERTY( Enabled, bool, Enable, IsEnabled, wxAny((bool)true), 0 /*flags*/, \ - wxT("Helpstring"), wxT("group")) -wxPROPERTY( Shown, bool, Show, IsShown, wxAny((bool)true), 0 /*flags*/, \ - wxT("Helpstring"), wxT("group")) - -#if 0 -// possible property candidates (not in xrc) or not valid in all subclasses -wxPROPERTY( Title,wxString, SetTitle, GetTitle, wxEmptyString ) -wxPROPERTY( Font, wxFont, SetFont, GetWindowFont , ) -wxPROPERTY( Label,wxString, SetLabel, GetLabel, wxEmptyString ) -// MaxHeight, Width, MinHeight, Width -// TODO switch label to control and title to toplevels - -wxPROPERTY( ThemeEnabled, bool, SetThemeEnabled, GetThemeEnabled, ) -//wxPROPERTY( Cursor, wxCursor, SetCursor, GetCursor, ) -// wxPROPERTY( ToolTip, wxString, SetToolTip, GetToolTipText, ) -wxPROPERTY( AutoLayout, bool, SetAutoLayout, GetAutoLayout, ) -#endif -wxEND_PROPERTIES_TABLE() - -wxEMPTY_HANDLERS_TABLE(wxWindow) - -wxCONSTRUCTOR_DUMMY(wxWindow) - -#else - -#ifndef __WXUNIVERSAL__ -wxIMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase); -#endif - -#endif - -// ---------------------------------------------------------------------------- -// initialization -// ---------------------------------------------------------------------------- - -// the default initialization -wxWindowBase::wxWindowBase() -{ - // no window yet, no parent nor children - m_parent = NULL; - m_windowId = wxID_ANY; - - // no constraints on the minimal window size - m_minWidth = - m_maxWidth = wxDefaultCoord; - m_minHeight = - m_maxHeight = wxDefaultCoord; - - // invalidiated cache value - m_bestSizeCache = wxDefaultSize; - - // window are created enabled and visible by default - m_isShown = - m_isEnabled = true; - - // the default event handler is just this window - m_eventHandler = this; - -#if wxUSE_VALIDATORS - // no validator - m_windowValidator = NULL; -#endif // wxUSE_VALIDATORS - - // the colours/fonts are default for now, so leave m_font, - // m_backgroundColour and m_foregroundColour uninitialized and set those - m_hasBgCol = - m_hasFgCol = - m_hasFont = false; - m_inheritBgCol = - m_inheritFgCol = - m_inheritFont = false; - - // no style bits - m_exStyle = - m_windowStyle = 0; - - m_backgroundStyle = wxBG_STYLE_ERASE; - -#if wxUSE_CONSTRAINTS - // no constraints whatsoever - m_constraints = NULL; - m_constraintsInvolvedIn = NULL; -#endif // wxUSE_CONSTRAINTS - - m_windowSizer = NULL; - m_containingSizer = NULL; - m_autoLayout = false; - -#if wxUSE_DRAG_AND_DROP - m_dropTarget = NULL; -#endif // wxUSE_DRAG_AND_DROP - -#if wxUSE_TOOLTIPS - m_tooltip = NULL; -#endif // wxUSE_TOOLTIPS - -#if wxUSE_CARET - m_caret = NULL; -#endif // wxUSE_CARET - -#if wxUSE_PALETTE - m_hasCustomPalette = false; -#endif // wxUSE_PALETTE - -#if wxUSE_ACCESSIBILITY - m_accessible = NULL; -#endif - - m_virtualSize = wxDefaultSize; - - m_scrollHelper = NULL; - - m_windowVariant = wxWINDOW_VARIANT_NORMAL; -#if wxUSE_SYSTEM_OPTIONS - if ( wxSystemOptions::HasOption(wxWINDOW_DEFAULT_VARIANT) ) - { - m_windowVariant = (wxWindowVariant) wxSystemOptions::GetOptionInt( wxWINDOW_DEFAULT_VARIANT ) ; - } -#endif - - // Whether we're using the current theme for this window (wxGTK only for now) - m_themeEnabled = false; - - // This is set to true by SendDestroyEvent() which should be called by the - // most derived class to ensure that the destruction event is sent as soon - // as possible to allow its handlers to still see the undestroyed window - m_isBeingDeleted = false; - - m_freezeCount = 0; -} - -// common part of window creation process -bool wxWindowBase::CreateBase(wxWindowBase *parent, - wxWindowID id, - const wxPoint& WXUNUSED(pos), - const wxSize& size, - long style, - const wxString& name) -{ - // ids are limited to 16 bits under MSW so if you care about portability, - // it's not a good idea to use ids out of this range (and negative ids are - // reserved for wxWidgets own usage) - wxASSERT_MSG( id == wxID_ANY || (id >= 0 && id < 32767) || - (id >= wxID_AUTO_LOWEST && id <= wxID_AUTO_HIGHEST), - wxT("invalid id value") ); - - // generate a new id if the user doesn't care about it - if ( id == wxID_ANY ) - { - m_windowId = NewControlId(); - } - else // valid id specified - { - m_windowId = id; - } - - // don't use SetWindowStyleFlag() here, this function should only be called - // to change the flag after creation as it tries to reflect the changes in - // flags by updating the window dynamically and we don't need this here - m_windowStyle = style; - - // assume the user doesn't want this window to shrink beneath its initial - // size, this worked like this in wxWidgets 2.8 and before and generally - // often makes sense for child windows (for top level ones it definitely - // does not as the user should be able to resize the window) - // - // note that we can't use IsTopLevel() from ctor - if ( size != wxDefaultSize && !wxTopLevelWindows.Find((wxWindow *)this) ) - SetMinSize(size); - - SetName(name); - SetParent(parent); - - return true; -} - -bool wxWindowBase::CreateBase(wxWindowBase *parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style, - const wxValidator& wxVALIDATOR_PARAM(validator), - const wxString& name) -{ - if ( !CreateBase(parent, id, pos, size, style, name) ) - return false; - -#if wxUSE_VALIDATORS - SetValidator(validator); -#endif // wxUSE_VALIDATORS - - return true; -} - -bool wxWindowBase::ToggleWindowStyle(int flag) -{ - wxASSERT_MSG( flag, wxT("flags with 0 value can't be toggled") ); - - bool rc; - long style = GetWindowStyleFlag(); - if ( style & flag ) - { - style &= ~flag; - rc = false; - } - else // currently off - { - style |= flag; - rc = true; - } - - SetWindowStyleFlag(style); - - return rc; -} - -// ---------------------------------------------------------------------------- -// destruction -// ---------------------------------------------------------------------------- - -// common clean up -wxWindowBase::~wxWindowBase() -{ - wxASSERT_MSG( !wxMouseCapture::IsInCaptureStack(this), - "Destroying window before releasing mouse capture: this " - "will result in a crash later." ); - - // FIXME if these 2 cases result from programming errors in the user code - // we should probably assert here instead of silently fixing them - - // Just in case the window has been Closed, but we're then deleting - // immediately: don't leave dangling pointers. - wxPendingDelete.DeleteObject(this); - - // Just in case we've loaded a top-level window via LoadNativeDialog but - // we weren't a dialog class - wxTopLevelWindows.DeleteObject((wxWindow*)this); - - // Any additional event handlers should be popped before the window is - // deleted as otherwise the last handler will be left with a dangling - // pointer to this window result in a difficult to diagnose crash later on. - wxASSERT_MSG( GetEventHandler() == this, - wxT("any pushed event handlers must have been removed") ); - -#if wxUSE_MENUS - // The associated popup menu can still be alive, disassociate from it in - // this case - if ( wxCurrentPopupMenu && wxCurrentPopupMenu->GetInvokingWindow() == this ) - wxCurrentPopupMenu->SetInvokingWindow(NULL); -#endif // wxUSE_MENUS - - wxASSERT_MSG( GetChildren().GetCount() == 0, wxT("children not destroyed") ); - - // notify the parent about this window destruction - if ( m_parent ) - m_parent->RemoveChild(this); - -#if wxUSE_CARET - delete m_caret; -#endif // wxUSE_CARET - -#if wxUSE_VALIDATORS - delete m_windowValidator; -#endif // wxUSE_VALIDATORS - -#if wxUSE_CONSTRAINTS - // Have to delete constraints/sizer FIRST otherwise sizers may try to look - // at deleted windows as they delete themselves. - DeleteRelatedConstraints(); - - if ( m_constraints ) - { - // This removes any dangling pointers to this window in other windows' - // constraintsInvolvedIn lists. - UnsetConstraints(m_constraints); - wxDELETE(m_constraints); - } -#endif // wxUSE_CONSTRAINTS - - if ( m_containingSizer ) - m_containingSizer->Detach( (wxWindow*)this ); - - delete m_windowSizer; - -#if wxUSE_DRAG_AND_DROP - delete m_dropTarget; -#endif // wxUSE_DRAG_AND_DROP - -#if wxUSE_TOOLTIPS - delete m_tooltip; -#endif // wxUSE_TOOLTIPS - -#if wxUSE_ACCESSIBILITY - delete m_accessible; -#endif - -#if wxUSE_HELP - // NB: this has to be called unconditionally, because we don't know - // whether this window has associated help text or not - wxHelpProvider *helpProvider = wxHelpProvider::Get(); - if ( helpProvider ) - helpProvider->RemoveHelp(this); -#endif -} - -bool wxWindowBase::IsBeingDeleted() const -{ - return m_isBeingDeleted || - (!IsTopLevel() && m_parent && m_parent->IsBeingDeleted()); -} - -void wxWindowBase::SendDestroyEvent() -{ - if ( m_isBeingDeleted ) - { - // we could have been already called from a more derived class dtor, - // e.g. ~wxTLW calls us and so does ~wxWindow and the latter call - // should be simply ignored - return; - } - - m_isBeingDeleted = true; - - wxWindowDestroyEvent event; - event.SetEventObject(this); - event.SetId(GetId()); - GetEventHandler()->ProcessEvent(event); -} - -bool wxWindowBase::Destroy() -{ - // If our handle is invalid, it means that this window has never been - // created, either because creating it failed or, more typically, because - // this wxWindow object was default-constructed and its Create() method had - // never been called. As we didn't send wxWindowCreateEvent in this case - // (which is sent after successful creation), don't send the matching - // wxWindowDestroyEvent neither. - if ( GetHandle() ) - SendDestroyEvent(); - - delete this; - - return true; -} - -bool wxWindowBase::Close(bool force) -{ - wxCloseEvent event(wxEVT_CLOSE_WINDOW, m_windowId); - event.SetEventObject(this); - event.SetCanVeto(!force); - - // return false if window wasn't closed because the application vetoed the - // close event - return HandleWindowEvent(event) && !event.GetVeto(); -} - -bool wxWindowBase::DestroyChildren() -{ - wxWindowList::compatibility_iterator node; - for ( ;; ) - { - // we iterate until the list becomes empty - node = GetChildren().GetFirst(); - if ( !node ) - break; - - wxWindow *child = node->GetData(); - - // note that we really want to delete it immediately so don't call the - // possible overridden Destroy() version which might not delete the - // child immediately resulting in problems with our (top level) child - // outliving its parent - child->wxWindowBase::Destroy(); - - wxASSERT_MSG( !GetChildren().Find(child), - wxT("child didn't remove itself using RemoveChild()") ); - } - - return true; -} - -// ---------------------------------------------------------------------------- -// size/position related methods -// ---------------------------------------------------------------------------- - -// centre the window with respect to its parent in either (or both) directions -void wxWindowBase::DoCentre(int dir) -{ - wxCHECK_RET( !(dir & wxCENTRE_ON_SCREEN) && GetParent(), - wxT("this method only implements centering child windows") ); - - SetSize(GetRect().CentreIn(GetParent()->GetClientSize(), dir)); -} - -// fits the window around the children -void wxWindowBase::Fit() -{ - SetSize(GetBestSize()); -} - -// fits virtual size (ie. scrolled area etc.) around children -void wxWindowBase::FitInside() -{ - SetVirtualSize( GetBestVirtualSize() ); -} - -// On Mac, scrollbars are explicitly children. -#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__) -static bool wxHasRealChildren(const wxWindowBase* win) -{ - int realChildCount = 0; - - for ( wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst(); - node; - node = node->GetNext() ) - { - wxWindow *win = node->GetData(); - if ( !win->IsTopLevel() && win->IsShown() -#if wxUSE_SCROLLBAR - && !wxDynamicCast(win, wxScrollBar) -#endif - ) - realChildCount ++; - } - return (realChildCount > 0); -} -#endif - -void wxWindowBase::InvalidateBestSize() -{ - m_bestSizeCache = wxDefaultSize; - - // parent's best size calculation may depend on its children's - // as long as child window we are in is not top level window itself - // (because the TLW size is never resized automatically) - // so let's invalidate it as well to be safe: - if (m_parent && !IsTopLevel()) - m_parent->InvalidateBestSize(); -} - -// return the size best suited for the current window -wxSize wxWindowBase::DoGetBestSize() const -{ - wxSize best; - - if ( m_windowSizer ) - { - best = m_windowSizer->GetMinSize(); - } -#if wxUSE_CONSTRAINTS - else if ( m_constraints ) - { - wxConstCast(this, wxWindowBase)->SatisfyConstraints(); - - // our minimal acceptable size is such that all our windows fit inside - int maxX = 0, - maxY = 0; - - for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); - node; - node = node->GetNext() ) - { - wxLayoutConstraints *c = node->GetData()->GetConstraints(); - if ( !c ) - { - // it's not normal that we have an unconstrained child, but - // what can we do about it? - continue; - } - - int x = c->right.GetValue(), - y = c->bottom.GetValue(); - - if ( x > maxX ) - maxX = x; - - if ( y > maxY ) - maxY = y; - - // TODO: we must calculate the overlaps somehow, otherwise we - // will never return a size bigger than the current one :-( - } - - best = wxSize(maxX, maxY); - } -#endif // wxUSE_CONSTRAINTS - else if ( !GetChildren().empty() -#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__) - && wxHasRealChildren(this) -#endif - ) - { - // our minimal acceptable size is such that all our visible child - // windows fit inside - int maxX = 0, - maxY = 0; - - for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); - node; - node = node->GetNext() ) - { - wxWindow *win = node->GetData(); - if ( win->IsTopLevel() - || !win->IsShown() -#if wxUSE_STATUSBAR - || wxDynamicCast(win, wxStatusBar) -#endif // wxUSE_STATUSBAR - ) - { - // dialogs and frames lie in different top level windows - - // don't deal with them here; as for the status bars, they - // don't lie in the client area at all - continue; - } - - int wx, wy, ww, wh; - win->GetPosition(&wx, &wy); - - // if the window hadn't been positioned yet, assume that it is in - // the origin - if ( wx == wxDefaultCoord ) - wx = 0; - if ( wy == wxDefaultCoord ) - wy = 0; - - win->GetSize(&ww, &wh); - if ( wx + ww > maxX ) - maxX = wx + ww; - if ( wy + wh > maxY ) - maxY = wy + wh; - } - - best = wxSize(maxX, maxY); - } - else // ! has children - { - wxSize size = GetMinSize(); - if ( !size.IsFullySpecified() ) - { - // if the window doesn't define its best size we assume that it can - // be arbitrarily small -- usually this is not the case, of course, - // but we have no way to know what the limit is, it should really - // override DoGetBestClientSize() itself to tell us - size.SetDefaults(wxSize(1, 1)); - } - - // return as-is, unadjusted by the client size difference. - return size; - } - - // Add any difference between size and client size - wxSize diff = GetSize() - GetClientSize(); - best.x += wxMax(0, diff.x); - best.y += wxMax(0, diff.y); - - return best; -} - -double wxWindowBase::GetContentScaleFactor() const -{ - // Currently we don't support per-monitor DPI, so it's useless to construct - // a DC associated with this window, just use the global value. - // - // We also use just the vertical component of the DPI because it's the one - // that counts most and, in practice, it's equal to the horizontal one - // anyhow. - return double(wxScreenDC().GetPPI().y) / BASELINE_DPI; -} - -// helper of GetWindowBorderSize(): as many ports don't implement support for -// wxSYS_BORDER/EDGE_X/Y metrics in their wxSystemSettings, use hard coded -// fallbacks in this case -static int wxGetMetricOrDefault(wxSystemMetric what, const wxWindowBase* win) -{ - int rc = wxSystemSettings::GetMetric( - what, static_cast(const_cast(win))); - if ( rc == -1 ) - { - switch ( what ) - { - case wxSYS_BORDER_X: - case wxSYS_BORDER_Y: - // 2D border is by default 1 pixel wide - rc = 1; - break; - - case wxSYS_EDGE_X: - case wxSYS_EDGE_Y: - // 3D borders are by default 2 pixels - rc = 2; - break; - - default: - wxFAIL_MSG( wxT("unexpected wxGetMetricOrDefault() argument") ); - rc = 0; - } - } - - return rc; -} - -wxSize wxWindowBase::GetWindowBorderSize() const -{ - wxSize size; - - switch ( GetBorder() ) - { - case wxBORDER_NONE: - // nothing to do, size is already (0, 0) - break; - - case wxBORDER_SIMPLE: - case wxBORDER_STATIC: - size.x = wxGetMetricOrDefault(wxSYS_BORDER_X, this); - size.y = wxGetMetricOrDefault(wxSYS_BORDER_Y, this); - break; - - case wxBORDER_SUNKEN: - case wxBORDER_RAISED: - size.x = wxMax(wxGetMetricOrDefault(wxSYS_EDGE_X, this), - wxGetMetricOrDefault(wxSYS_BORDER_X, this)); - size.y = wxMax(wxGetMetricOrDefault(wxSYS_EDGE_Y, this), - wxGetMetricOrDefault(wxSYS_BORDER_Y, this)); - break; - - case wxBORDER_DOUBLE: - size.x = wxGetMetricOrDefault(wxSYS_EDGE_X, this) + - wxGetMetricOrDefault(wxSYS_BORDER_X, this); - size.y = wxGetMetricOrDefault(wxSYS_EDGE_Y, this) + - wxGetMetricOrDefault(wxSYS_BORDER_Y, this); - break; - - default: - wxFAIL_MSG(wxT("Unknown border style.")); - break; - } - - // we have borders on both sides - return size*2; -} - -bool -wxWindowBase::InformFirstDirection(int direction, - int size, - int availableOtherDir) -{ - return GetSizer() && GetSizer()->InformFirstDirection(direction, - size, - availableOtherDir); -} - -wxSize wxWindowBase::GetEffectiveMinSize() const -{ - // merge the best size with the min size, giving priority to the min size - wxSize min = GetMinSize(); - - if (min.x == wxDefaultCoord || min.y == wxDefaultCoord) - { - wxSize best = GetBestSize(); - if (min.x == wxDefaultCoord) min.x = best.x; - if (min.y == wxDefaultCoord) min.y = best.y; - } - - return min; -} - -wxSize wxWindowBase::DoGetBorderSize() const -{ - // there is one case in which we can implement it for all ports easily - if ( GetBorder() == wxBORDER_NONE ) - return wxSize(0, 0); - - // otherwise use the difference between the real size and the client size - // as a fallback: notice that this is incorrect in general as client size - // also doesn't take the scrollbars into account - return GetSize() - GetClientSize(); -} - -wxSize wxWindowBase::GetBestSize() const -{ - if ( !m_windowSizer && m_bestSizeCache.IsFullySpecified() ) - return m_bestSizeCache; - - // call DoGetBestClientSize() first, if a derived class overrides it wants - // it to be used - wxSize size = DoGetBestClientSize(); - if ( size != wxDefaultSize ) - size += DoGetBorderSize(); - else - size = DoGetBestSize(); - - // Ensure that the best size is at least as large as min size. - size.IncTo(GetMinSize()); - - // And not larger than max size. - size.DecToIfSpecified(GetMaxSize()); - - // Finally cache result and return. - CacheBestSize(size); - return size; -} - -int wxWindowBase::GetBestHeight(int width) const -{ - const int height = DoGetBestClientHeight(width); - - return height == wxDefaultCoord - ? GetBestSize().y - : height + DoGetBorderSize().y; -} - -int wxWindowBase::GetBestWidth(int height) const -{ - const int width = DoGetBestClientWidth(height); - - return width == wxDefaultCoord - ? GetBestSize().x - : width + DoGetBorderSize().x; -} - -void wxWindowBase::SetMinSize(const wxSize& minSize) -{ - m_minWidth = minSize.x; - m_minHeight = minSize.y; - - InvalidateBestSize(); -} - -void wxWindowBase::SetMaxSize(const wxSize& maxSize) -{ - m_maxWidth = maxSize.x; - m_maxHeight = maxSize.y; - - InvalidateBestSize(); -} - -void wxWindowBase::SetInitialSize(const wxSize& size) -{ - // Set the min size to the size passed in. This will usually either be - // wxDefaultSize or the size passed to this window's ctor/Create function. - SetMinSize(size); - - // Merge the size with the best size if needed - wxSize best = GetEffectiveMinSize(); - - // If the current size doesn't match then change it - if (GetSize() != best) - SetSize(best); -} - - -// by default the origin is not shifted -wxPoint wxWindowBase::GetClientAreaOrigin() const -{ - return wxPoint(0,0); -} - -wxSize wxWindowBase::ClientToWindowSize(const wxSize& size) const -{ - const wxSize diff(GetSize() - GetClientSize()); - - return wxSize(size.x == -1 ? -1 : size.x + diff.x, - size.y == -1 ? -1 : size.y + diff.y); -} - -wxSize wxWindowBase::WindowToClientSize(const wxSize& size) const -{ - const wxSize diff(GetSize() - GetClientSize()); - - return wxSize(size.x == -1 ? -1 : size.x - diff.x, - size.y == -1 ? -1 : size.y - diff.y); -} - -void wxWindowBase::SetWindowVariant( wxWindowVariant variant ) -{ - if ( m_windowVariant != variant ) - { - m_windowVariant = variant; - - DoSetWindowVariant(variant); - } -} - -void wxWindowBase::DoSetWindowVariant( wxWindowVariant variant ) -{ - // adjust the font height to correspond to our new variant (notice that - // we're only called if something really changed) - wxFont font = GetFont(); - int size = font.GetPointSize(); - switch ( variant ) - { - case wxWINDOW_VARIANT_NORMAL: - break; - - case wxWINDOW_VARIANT_SMALL: - size = wxRound(size / 1.2); - break; - - case wxWINDOW_VARIANT_MINI: - size = wxRound(size / (1.2 * 1.2)); - break; - - case wxWINDOW_VARIANT_LARGE: - size = wxRound(size * 1.2); - break; - - default: - wxFAIL_MSG(wxT("unexpected window variant")); - break; - } - - font.SetPointSize(size); - SetFont(font); -} - -void wxWindowBase::DoSetSizeHints( int minW, int minH, - int maxW, int maxH, - int WXUNUSED(incW), int WXUNUSED(incH) ) -{ - wxCHECK_RET( (minW == wxDefaultCoord || maxW == wxDefaultCoord || minW <= maxW) && - (minH == wxDefaultCoord || maxH == wxDefaultCoord || minH <= maxH), - wxT("min width/height must be less than max width/height!") ); - - m_minWidth = minW; - m_maxWidth = maxW; - m_minHeight = minH; - m_maxHeight = maxH; -} - - -#if WXWIN_COMPATIBILITY_2_8 -void wxWindowBase::SetVirtualSizeHints(int WXUNUSED(minW), int WXUNUSED(minH), - int WXUNUSED(maxW), int WXUNUSED(maxH)) -{ -} - -void wxWindowBase::SetVirtualSizeHints(const wxSize& WXUNUSED(minsize), - const wxSize& WXUNUSED(maxsize)) -{ -} -#endif // WXWIN_COMPATIBILITY_2_8 - -void wxWindowBase::DoSetVirtualSize( int x, int y ) -{ - m_virtualSize = wxSize(x, y); -} - -wxSize wxWindowBase::DoGetVirtualSize() const -{ - // we should use the entire client area so if it is greater than our - // virtual size, expand it to fit (otherwise if the window is big enough we - // wouldn't be using parts of it) - wxSize size = GetClientSize(); - if ( m_virtualSize.x > size.x ) - size.x = m_virtualSize.x; - - if ( m_virtualSize.y >= size.y ) - size.y = m_virtualSize.y; - - return size; -} - -void wxWindowBase::DoGetScreenPosition(int *x, int *y) const -{ - // screen position is the same as (0, 0) in client coords for non TLWs (and - // TLWs override this method) - if ( x ) - *x = 0; - if ( y ) - *y = 0; - - ClientToScreen(x, y); -} - -void wxWindowBase::SendSizeEvent(int flags) -{ - wxSizeEvent event(GetSize(), GetId()); - event.SetEventObject(this); - if ( flags & wxSEND_EVENT_POST ) - wxPostEvent(GetEventHandler(), event); - else - HandleWindowEvent(event); -} - -void wxWindowBase::SendSizeEventToParent(int flags) -{ - wxWindow * const parent = GetParent(); - if ( parent && !parent->IsBeingDeleted() ) - parent->SendSizeEvent(flags); -} - -bool wxWindowBase::CanScroll(int orient) const -{ - return (m_windowStyle & - (orient == wxHORIZONTAL ? wxHSCROLL : wxVSCROLL)) != 0; -} - -bool wxWindowBase::HasScrollbar(int orient) const -{ - // if scrolling in the given direction is disabled, we can't have the - // corresponding scrollbar no matter what - if ( !CanScroll(orient) ) - return false; - - const wxSize sizeVirt = GetVirtualSize(); - const wxSize sizeClient = GetClientSize(); - - return orient == wxHORIZONTAL ? sizeVirt.x > sizeClient.x - : sizeVirt.y > sizeClient.y; -} - -// ---------------------------------------------------------------------------- -// show/hide/enable/disable the window -// ---------------------------------------------------------------------------- - -bool wxWindowBase::Show(bool show) -{ - if ( show != m_isShown ) - { - m_isShown = show; - - return true; - } - else - { - return false; - } -} - -bool wxWindowBase::IsEnabled() const -{ - return IsThisEnabled() && (IsTopLevel() || !GetParent() || GetParent()->IsEnabled()); -} - -void wxWindowBase::NotifyWindowOnEnableChange(bool enabled) -{ - // Under some platforms there is no need to update the window state - // explicitly, it will become disabled when its parent is. On other ones we - // do need to disable all windows recursively though. -#ifndef wxHAS_NATIVE_ENABLED_MANAGEMENT - DoEnable(enabled); -#endif // !defined(wxHAS_NATIVE_ENABLED_MANAGEMENT) - - // Disabling a top level window is typically done when showing a modal - // dialog and we don't need to disable its children in this case, they will - // be logically disabled anyhow (i.e. their IsEnabled() will return false) - // and the TLW won't accept any input for them. Moreover, explicitly - // disabling them would look ugly as the entire TLW would be greyed out - // whenever a modal dialog is shown and no native applications under any - // platform behave like this. - if ( IsTopLevel() && !enabled ) - return; - - // When disabling (or enabling back) a non-TLW window we need to - // recursively propagate the change of the state to its children, otherwise - // they would still show as enabled even though they wouldn't actually - // accept any input (at least under MSW where children don't accept input - // if any of the windows in their parent chain is enabled). -#ifndef wxHAS_NATIVE_ENABLED_MANAGEMENT - for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); - node; - node = node->GetNext() ) - { - wxWindowBase * const child = node->GetData(); - if ( !child->IsTopLevel() && child->IsThisEnabled() ) - child->NotifyWindowOnEnableChange(enabled); - } -#endif // !defined(wxHAS_NATIVE_ENABLED_MANAGEMENT) -} - -bool wxWindowBase::Enable(bool enable) -{ - if ( enable == IsThisEnabled() ) - return false; - - m_isEnabled = enable; - - // If we call DoEnable() from NotifyWindowOnEnableChange(), we don't need - // to do it from here. -#ifdef wxHAS_NATIVE_ENABLED_MANAGEMENT - DoEnable(enable); -#endif // !defined(wxHAS_NATIVE_ENABLED_MANAGEMENT) - - NotifyWindowOnEnableChange(enable); - - return true; -} - -bool wxWindowBase::IsShownOnScreen() const -{ - // A window is shown on screen if it itself is shown and so are all its - // parents. But if a window is toplevel one, then its always visible on - // screen if IsShown() returns true, even if it has a hidden parent. - return IsShown() && - (IsTopLevel() || GetParent() == NULL || GetParent()->IsShownOnScreen()); -} - -// ---------------------------------------------------------------------------- -// RTTI -// ---------------------------------------------------------------------------- - -bool wxWindowBase::IsTopLevel() const -{ - return false; -} - -// ---------------------------------------------------------------------------- -// Freeze/Thaw -// ---------------------------------------------------------------------------- - -void wxWindowBase::Freeze() -{ - if ( !m_freezeCount++ ) - { - // physically freeze this window: - DoFreeze(); - - // and recursively freeze all children: - for ( wxWindowList::iterator i = GetChildren().begin(); - i != GetChildren().end(); ++i ) - { - wxWindow *child = *i; - if ( child->IsTopLevel() ) - continue; - - child->Freeze(); - } - } -} - -void wxWindowBase::Thaw() -{ - wxASSERT_MSG( m_freezeCount, "Thaw() without matching Freeze()" ); - - if ( !--m_freezeCount ) - { - // recursively thaw all children: - for ( wxWindowList::iterator i = GetChildren().begin(); - i != GetChildren().end(); ++i ) - { - wxWindow *child = *i; - if ( child->IsTopLevel() ) - continue; - - child->Thaw(); - } - - // physically thaw this window: - DoThaw(); - } -} - -// ---------------------------------------------------------------------------- -// Dealing with parents and children. -// ---------------------------------------------------------------------------- - -bool wxWindowBase::IsDescendant(wxWindowBase* win) const -{ - // Iterate until we find this window in the parent chain or exhaust it. - while ( win ) - { - if ( win == this ) - return true; - - // Stop iterating on reaching the top level window boundary. - if ( win->IsTopLevel() ) - break; - - win = win->GetParent(); - } - - return false; -} - -void wxWindowBase::AddChild(wxWindowBase *child) -{ - wxCHECK_RET( child, wxT("can't add a NULL child") ); - - // this should never happen and it will lead to a crash later if it does - // because RemoveChild() will remove only one node from the children list - // and the other(s) one(s) will be left with dangling pointers in them - wxASSERT_MSG( !GetChildren().Find((wxWindow*)child), wxT("AddChild() called twice") ); - - GetChildren().Append((wxWindow*)child); - child->SetParent(this); - - // adding a child while frozen will assert when thawed, so freeze it as if - // it had been already present when we were frozen - if ( IsFrozen() && !child->IsTopLevel() ) - child->Freeze(); -} - -void wxWindowBase::RemoveChild(wxWindowBase *child) -{ - wxCHECK_RET( child, wxT("can't remove a NULL child") ); - - // removing a child while frozen may result in permanently frozen window - // if used e.g. from Reparent(), so thaw it - // - // NB: IsTopLevel() doesn't return true any more when a TLW child is being - // removed from its ~wxWindowBase, so check for IsBeingDeleted() too - if ( IsFrozen() && !child->IsBeingDeleted() && !child->IsTopLevel() ) - child->Thaw(); - - GetChildren().DeleteObject((wxWindow *)child); - child->SetParent(NULL); -} - -void wxWindowBase::SetParent(wxWindowBase *parent) -{ - // This assert catches typos which may result in using "this" instead of - // "parent" when creating the window. This doesn't happen often but when it - // does the results are unpleasant because the program typically just - // crashes when due to a stack overflow or something similar and this - // assert doesn't cost much (OTOH doing a more general check that the - // parent is not one of our children would be more expensive and probably - // not worth it). - wxASSERT_MSG( parent != this, wxS("Can't use window as its own parent") ); - - m_parent = (wxWindow *)parent; -} - -bool wxWindowBase::Reparent(wxWindowBase *newParent) -{ - wxWindow *oldParent = GetParent(); - if ( newParent == oldParent ) - { - // nothing done - return false; - } - - const bool oldEnabledState = IsEnabled(); - - // unlink this window from the existing parent. - if ( oldParent ) - { - oldParent->RemoveChild(this); - } - else - { - wxTopLevelWindows.DeleteObject((wxWindow *)this); - } - - // add it to the new one - if ( newParent ) - { - newParent->AddChild(this); - } - else - { - wxTopLevelWindows.Append((wxWindow *)this); - } - - // We need to notify window (and its subwindows) if by changing the parent - // we also change our enabled/disabled status. - const bool newEnabledState = IsEnabled(); - if ( newEnabledState != oldEnabledState ) - { - NotifyWindowOnEnableChange(newEnabledState); - } - - return true; -} - -// ---------------------------------------------------------------------------- -// event handler stuff -// ---------------------------------------------------------------------------- - -void wxWindowBase::SetEventHandler(wxEvtHandler *handler) -{ - wxCHECK_RET(handler != NULL, "SetEventHandler(NULL) called"); - - m_eventHandler = handler; -} - -void wxWindowBase::SetNextHandler(wxEvtHandler *WXUNUSED(handler)) -{ - // disable wxEvtHandler chain mechanism for wxWindows: - // wxWindow uses its own stack mechanism which doesn't mix well with wxEvtHandler's one - - wxFAIL_MSG("wxWindow cannot be part of a wxEvtHandler chain"); -} -void wxWindowBase::SetPreviousHandler(wxEvtHandler *WXUNUSED(handler)) -{ - // we can't simply wxFAIL here as in SetNextHandler: in fact the last - // handler of our stack when is destroyed will be Unlink()ed and thus - // will call this function to update the pointer of this window... - - //wxFAIL_MSG("wxWindow cannot be part of a wxEvtHandler chain"); -} - -void wxWindowBase::PushEventHandler(wxEvtHandler *handlerToPush) -{ - wxCHECK_RET( handlerToPush != NULL, "PushEventHandler(NULL) called" ); - - // the new handler is going to be part of the wxWindow stack of event handlers: - // it can't be part also of an event handler double-linked chain: - wxASSERT_MSG(handlerToPush->IsUnlinked(), - "The handler being pushed in the wxWindow stack shouldn't be part of " - "a wxEvtHandler chain; call Unlink() on it first"); - - wxEvtHandler *handlerOld = GetEventHandler(); - wxCHECK_RET( handlerOld, "an old event handler is NULL?" ); - - // now use wxEvtHandler double-linked list to implement a stack: - handlerToPush->SetNextHandler(handlerOld); - - if (handlerOld != this) - handlerOld->SetPreviousHandler(handlerToPush); - - SetEventHandler(handlerToPush); - -#if wxDEBUG_LEVEL - // final checks of the operations done above: - wxASSERT_MSG( handlerToPush->GetPreviousHandler() == NULL, - "the first handler of the wxWindow stack should " - "have no previous handlers set" ); - wxASSERT_MSG( handlerToPush->GetNextHandler() != NULL, - "the first handler of the wxWindow stack should " - "have non-NULL next handler" ); - - wxEvtHandler* pLast = handlerToPush; - while ( pLast && pLast != this ) - pLast = pLast->GetNextHandler(); - wxASSERT_MSG( pLast->GetNextHandler() == NULL, - "the last handler of the wxWindow stack should " - "have this window as next handler" ); -#endif // wxDEBUG_LEVEL -} - -wxEvtHandler *wxWindowBase::PopEventHandler(bool deleteHandler) -{ - // we need to pop the wxWindow stack, i.e. we need to remove the first handler - - wxEvtHandler *firstHandler = GetEventHandler(); - wxCHECK_MSG( firstHandler != NULL, NULL, "wxWindow cannot have a NULL event handler" ); - wxCHECK_MSG( firstHandler != this, NULL, "cannot pop the wxWindow itself" ); - wxCHECK_MSG( firstHandler->GetPreviousHandler() == NULL, NULL, - "the first handler of the wxWindow stack should have no previous handlers set" ); - - wxEvtHandler *secondHandler = firstHandler->GetNextHandler(); - wxCHECK_MSG( secondHandler != NULL, NULL, - "the first handler of the wxWindow stack should have non-NULL next handler" ); - - firstHandler->SetNextHandler(NULL); - - // It is harmless but useless to unset the previous handler of the window - // itself as it's always NULL anyhow, so don't do this. - if ( secondHandler != this ) - secondHandler->SetPreviousHandler(NULL); - - // now firstHandler is completely unlinked; set secondHandler as the new window event handler - SetEventHandler(secondHandler); - - if ( deleteHandler ) - { - wxDELETE(firstHandler); - } - - return firstHandler; -} - -bool wxWindowBase::RemoveEventHandler(wxEvtHandler *handlerToRemove) -{ - wxCHECK_MSG( handlerToRemove != NULL, false, "RemoveEventHandler(NULL) called" ); - wxCHECK_MSG( handlerToRemove != this, false, "Cannot remove the window itself" ); - - if (handlerToRemove == GetEventHandler()) - { - // removing the first event handler is equivalent to "popping" the stack - PopEventHandler(false); - return true; - } - - // NOTE: the wxWindow event handler list is always terminated with "this" handler - wxEvtHandler *handlerCur = GetEventHandler()->GetNextHandler(); - while ( handlerCur != this && handlerCur ) - { - wxEvtHandler *handlerNext = handlerCur->GetNextHandler(); - - if ( handlerCur == handlerToRemove ) - { - handlerCur->Unlink(); - - wxASSERT_MSG( handlerCur != GetEventHandler(), - "the case Remove == Pop should was already handled" ); - return true; - } - - handlerCur = handlerNext; - } - - wxFAIL_MSG( wxT("where has the event handler gone?") ); - - return false; -} - -bool wxWindowBase::HandleWindowEvent(wxEvent& event) const -{ - // SafelyProcessEvent() will handle exceptions nicely - return GetEventHandler()->SafelyProcessEvent(event); -} - -// ---------------------------------------------------------------------------- -// colours, fonts &c -// ---------------------------------------------------------------------------- - -void wxWindowBase::InheritAttributes() -{ - const wxWindowBase * const parent = GetParent(); - if ( !parent ) - return; - - // we only inherit attributes which had been explicitly set for the parent - // which ensures that this only happens if the user really wants it and - // not by default which wouldn't make any sense in modern GUIs where the - // controls don't all use the same fonts (nor colours) - if ( parent->m_inheritFont && !m_hasFont ) - SetFont(parent->GetFont()); - - // in addition, there is a possibility to explicitly forbid inheriting - // colours at each class level by overriding ShouldInheritColours() - if ( ShouldInheritColours() ) - { - if ( parent->m_inheritFgCol && !m_hasFgCol ) - SetForegroundColour(parent->GetForegroundColour()); - - // inheriting (solid) background colour is wrong as it totally breaks - // any kind of themed backgrounds - // - // instead, the controls should use the same background as their parent - // (ideally by not drawing it at all) -#if 0 - if ( parent->m_inheritBgCol && !m_hasBgCol ) - SetBackgroundColour(parent->GetBackgroundColour()); -#endif // 0 - } -} - -/* static */ wxVisualAttributes -wxWindowBase::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) -{ - // it is important to return valid values for all attributes from here, - // GetXXX() below rely on this - wxVisualAttributes attrs; - attrs.font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); - attrs.colFg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT); - attrs.colBg = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE); - return attrs; -} - -wxColour wxWindowBase::GetBackgroundColour() const -{ - if ( !m_backgroundColour.IsOk() ) - { - wxASSERT_MSG( !m_hasBgCol, wxT("we have invalid explicit bg colour?") ); - - // get our default background colour - wxColour colBg = GetDefaultAttributes().colBg; - - // we must return some valid colour to avoid redoing this every time - // and also to avoid surprising the applications written for older - // wxWidgets versions where GetBackgroundColour() always returned - // something -- so give them something even if it doesn't make sense - // for this window (e.g. it has a themed background) - if ( !colBg.IsOk() ) - colBg = GetClassDefaultAttributes().colBg; - - return colBg; - } - else - return m_backgroundColour; -} - -wxColour wxWindowBase::GetForegroundColour() const -{ - // logic is the same as above - if ( !m_hasFgCol && !m_foregroundColour.IsOk() ) - { - wxColour colFg = GetDefaultAttributes().colFg; - - if ( !colFg.IsOk() ) - colFg = GetClassDefaultAttributes().colFg; - - return colFg; - } - else - return m_foregroundColour; -} - -bool wxWindowBase::SetBackgroundStyle(wxBackgroundStyle style) -{ - // The checks below shouldn't be triggered if we're not really changing the - // style. - if ( style == m_backgroundStyle ) - return true; - - // Transparent background style can be only set before creation because of - // wxGTK limitation. - wxCHECK_MSG( (style != wxBG_STYLE_TRANSPARENT) || !GetHandle(), - false, - "wxBG_STYLE_TRANSPARENT style can only be set before " - "Create()-ing the window." ); - - // And once it is set, wxBG_STYLE_TRANSPARENT can't be unset. - wxCHECK_MSG( (m_backgroundStyle != wxBG_STYLE_TRANSPARENT) || - (style == wxBG_STYLE_TRANSPARENT), - false, - "wxBG_STYLE_TRANSPARENT can't be unset once it was set." ); - - m_backgroundStyle = style; - - return true; -} - -bool wxWindowBase::IsTransparentBackgroundSupported(wxString *reason) const -{ - if ( reason ) - *reason = _("This platform does not support background transparency."); - - return false; -} - -bool wxWindowBase::SetBackgroundColour( const wxColour &colour ) -{ - if ( colour == m_backgroundColour ) - return false; - - m_hasBgCol = colour.IsOk(); - - m_inheritBgCol = m_hasBgCol; - m_backgroundColour = colour; - SetThemeEnabled( !m_hasBgCol && !m_foregroundColour.IsOk() ); - return true; -} - -bool wxWindowBase::SetForegroundColour( const wxColour &colour ) -{ - if (colour == m_foregroundColour ) - return false; - - m_hasFgCol = colour.IsOk(); - m_inheritFgCol = m_hasFgCol; - m_foregroundColour = colour; - SetThemeEnabled( !m_hasFgCol && !m_backgroundColour.IsOk() ); - return true; -} - -bool wxWindowBase::SetCursor(const wxCursor& cursor) -{ - // setting an invalid cursor is ok, it means that we don't have any special - // cursor - if ( m_cursor.IsSameAs(cursor) ) - { - // no change - return false; - } - - m_cursor = cursor; - - return true; -} - -wxFont wxWindowBase::GetFont() const -{ - // logic is the same as in GetBackgroundColour() - if ( !m_font.IsOk() ) - { - wxASSERT_MSG( !m_hasFont, wxT("we have invalid explicit font?") ); - - wxFont font = GetDefaultAttributes().font; - if ( !font.IsOk() ) - font = GetClassDefaultAttributes().font; - - return font; - } - else - return m_font; -} - -bool wxWindowBase::SetFont(const wxFont& font) -{ - if ( font == m_font ) - { - // no change - return false; - } - - m_font = font; - m_hasFont = font.IsOk(); - m_inheritFont = m_hasFont; - - InvalidateBestSize(); - - return true; -} - -#if wxUSE_PALETTE - -void wxWindowBase::SetPalette(const wxPalette& pal) -{ - m_hasCustomPalette = true; - m_palette = pal; - - // VZ: can anyone explain me what do we do here? - wxWindowDC d((wxWindow *) this); - d.SetPalette(pal); -} - -wxWindow *wxWindowBase::GetAncestorWithCustomPalette() const -{ - wxWindow *win = (wxWindow *)this; - while ( win && !win->HasCustomPalette() ) - { - win = win->GetParent(); - } - - return win; -} - -#endif // wxUSE_PALETTE - -#if wxUSE_CARET -void wxWindowBase::SetCaret(wxCaret *caret) -{ - if ( m_caret ) - { - delete m_caret; - } - - m_caret = caret; - - if ( m_caret ) - { - wxASSERT_MSG( m_caret->GetWindow() == this, - wxT("caret should be created associated to this window") ); - } -} -#endif // wxUSE_CARET - -#if wxUSE_VALIDATORS -// ---------------------------------------------------------------------------- -// validators -// ---------------------------------------------------------------------------- - -void wxWindowBase::SetValidator(const wxValidator& validator) -{ - if ( m_windowValidator ) - delete m_windowValidator; - - m_windowValidator = (wxValidator *)validator.Clone(); - - if ( m_windowValidator ) - m_windowValidator->SetWindow(this); -} -#endif // wxUSE_VALIDATORS - -// ---------------------------------------------------------------------------- -// update region stuff -// ---------------------------------------------------------------------------- - -wxRect wxWindowBase::GetUpdateClientRect() const -{ - wxRegion rgnUpdate = GetUpdateRegion(); - rgnUpdate.Intersect(GetClientRect()); - wxRect rectUpdate = rgnUpdate.GetBox(); - wxPoint ptOrigin = GetClientAreaOrigin(); - rectUpdate.x -= ptOrigin.x; - rectUpdate.y -= ptOrigin.y; - - return rectUpdate; -} - -bool wxWindowBase::DoIsExposed(int x, int y) const -{ - return m_updateRegion.Contains(x, y) != wxOutRegion; -} - -bool wxWindowBase::DoIsExposed(int x, int y, int w, int h) const -{ - return m_updateRegion.Contains(x, y, w, h) != wxOutRegion; -} - -void wxWindowBase::ClearBackground() -{ - // wxGTK uses its own version, no need to add never used code -#ifndef __WXGTK__ - wxClientDC dc((wxWindow *)this); - wxBrush brush(GetBackgroundColour(), wxBRUSHSTYLE_SOLID); - dc.SetBackground(brush); - dc.Clear(); -#endif // __WXGTK__ -} - -// ---------------------------------------------------------------------------- -// find child window by id or name -// ---------------------------------------------------------------------------- - -wxWindow *wxWindowBase::FindWindow(long id) const -{ - if ( id == m_windowId ) - return (wxWindow *)this; - - wxWindowBase *res = NULL; - wxWindowList::compatibility_iterator node; - for ( node = m_children.GetFirst(); node && !res; node = node->GetNext() ) - { - wxWindowBase *child = node->GetData(); - - // As usual, don't recurse into child dialogs, finding a button in a - // child dialog when looking in this window would be unexpected. - if ( child->IsTopLevel() ) - continue; - - res = child->FindWindow( id ); - } - - return (wxWindow *)res; -} - -wxWindow *wxWindowBase::FindWindow(const wxString& name) const -{ - if ( name == m_windowName ) - return (wxWindow *)this; - - wxWindowBase *res = NULL; - wxWindowList::compatibility_iterator node; - for ( node = m_children.GetFirst(); node && !res; node = node->GetNext() ) - { - wxWindow *child = node->GetData(); - - // As in FindWindow() overload above, never recurse into child dialogs. - if ( child->IsTopLevel() ) - continue; - - res = child->FindWindow(name); - } - - return (wxWindow *)res; -} - - -// find any window by id or name or label: If parent is non-NULL, look through -// children for a label or title matching the specified string. If NULL, look -// through all top-level windows. -// -// to avoid duplicating code we reuse the same helper function but with -// different comparators - -typedef bool (*wxFindWindowCmp)(const wxWindow *win, - const wxString& label, long id); - -static -bool wxFindWindowCmpLabels(const wxWindow *win, const wxString& label, - long WXUNUSED(id)) -{ - return win->GetLabel() == label; -} - -static -bool wxFindWindowCmpNames(const wxWindow *win, const wxString& label, - long WXUNUSED(id)) -{ - return win->GetName() == label; -} - -static -bool wxFindWindowCmpIds(const wxWindow *win, const wxString& WXUNUSED(label), - long id) -{ - return win->GetId() == id; -} - -// recursive helper for the FindWindowByXXX() functions -static -wxWindow *wxFindWindowRecursively(const wxWindow *parent, - const wxString& label, - long id, - wxFindWindowCmp cmp) -{ - // see if this is the one we're looking for - if ( (*cmp)(parent, label, id) ) - return (wxWindow *)parent; - - // It wasn't, so check all its children - for ( wxWindowList::compatibility_iterator node = parent->GetChildren().GetFirst(); - node; - node = node->GetNext() ) - { - // recursively check each child - wxWindow *win = (wxWindow *)node->GetData(); - wxWindow *retwin = wxFindWindowRecursively(win, label, id, cmp); - if (retwin) - return retwin; - } - - // Not found - return NULL; -} - -// helper for FindWindowByXXX() -static -wxWindow *wxFindWindowHelper(const wxWindow *parent, - const wxString& label, - long id, - wxFindWindowCmp cmp) -{ - if ( parent ) - { - // just check parent and all its children - return wxFindWindowRecursively(parent, label, id, cmp); - } - - // start at very top of wx's windows - for ( wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst(); - node; - node = node->GetNext() ) - { - // recursively check each window & its children - wxWindow *win = node->GetData(); - wxWindow *retwin = wxFindWindowRecursively(win, label, id, cmp); - if (retwin) - return retwin; - } - - return NULL; -} - -/* static */ -wxWindow * -wxWindowBase::FindWindowByLabel(const wxString& title, const wxWindow *parent) -{ - return wxFindWindowHelper(parent, title, 0, wxFindWindowCmpLabels); -} - -/* static */ -wxWindow * -wxWindowBase::FindWindowByName(const wxString& title, const wxWindow *parent) -{ - wxWindow *win = wxFindWindowHelper(parent, title, 0, wxFindWindowCmpNames); - - if ( !win ) - { - // fall back to the label - win = FindWindowByLabel(title, parent); - } - - return win; -} - -/* static */ -wxWindow * -wxWindowBase::FindWindowById( long id, const wxWindow* parent ) -{ - return wxFindWindowHelper(parent, wxEmptyString, id, wxFindWindowCmpIds); -} - -// ---------------------------------------------------------------------------- -// dialog oriented functions -// ---------------------------------------------------------------------------- - -#if WXWIN_COMPATIBILITY_2_8 -void wxWindowBase::MakeModal(bool modal) -{ - // Disable all other windows - if ( IsTopLevel() ) - { - wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst(); - while (node) - { - wxWindow *win = node->GetData(); - if (win != this) - win->Enable(!modal); - - node = node->GetNext(); - } - } -} -#endif // WXWIN_COMPATIBILITY_2_8 - -#if wxUSE_VALIDATORS - -namespace -{ - -// This class encapsulates possibly recursive iteration on window children done -// by Validate() and TransferData{To,From}Window() and allows to avoid code -// duplication in all three functions. -class ValidationTraverserBase -{ -public: - wxEXPLICIT ValidationTraverserBase(wxWindowBase* win) - : m_win(static_cast(win)) - { - } - - // Traverse all the direct children calling OnDo() on them and also all - // grandchildren, calling OnRecurse() for them. - bool DoForAllChildren() - { - wxWindowList& children = m_win->GetChildren(); - for ( wxWindowList::iterator i = children.begin(); - i != children.end(); - ++i ) - { - wxWindow* const child = static_cast(*i); - wxValidator* const validator = child->GetValidator(); - if ( validator && !OnDo(validator) ) - { - return false; - } - - // Notice that validation should never recurse into top level - // children, e.g. some other dialog which might happen to be - // currently shown. - if ( !child->IsTopLevel() && !OnRecurse(child) ) - { - return false; - } - } - - return true; - } - - // Give it a virtual dtor just to suppress gcc warnings about a class with - // virtual methods but non-virtual dtor -- even if this is completely safe - // here as we never use the objects of this class polymorphically. - virtual ~ValidationTraverserBase() { } - -protected: - // Called for each child, validator is guaranteed to be non-NULL. - virtual bool OnDo(wxValidator* validator) = 0; - - // Called for each child if we need to recurse into its children. - virtual bool OnRecurse(wxWindow* child) = 0; - - - // The window whose children we're traversing. - wxWindow* const m_win; - - wxDECLARE_NO_COPY_CLASS(ValidationTraverserBase); -}; - -} // anonymous namespace - -#endif // wxUSE_VALIDATORS - -bool wxWindowBase::Validate() -{ -#if wxUSE_VALIDATORS - class ValidateTraverser : public ValidationTraverserBase - { - public: - wxEXPLICIT ValidateTraverser(wxWindowBase* win) - : ValidationTraverserBase(win) - { - } - - virtual bool OnDo(wxValidator* validator) wxOVERRIDE - { - return validator->Validate(m_win); - } - - virtual bool OnRecurse(wxWindow* child) wxOVERRIDE - { - return child->Validate(); - } - }; - - return ValidateTraverser(this).DoForAllChildren(); -#else // !wxUSE_VALIDATORS - return true; -#endif // wxUSE_VALIDATORS/!wxUSE_VALIDATORS -} - -bool wxWindowBase::TransferDataToWindow() -{ -#if wxUSE_VALIDATORS - class DataToWindowTraverser : public ValidationTraverserBase - { - public: - wxEXPLICIT DataToWindowTraverser(wxWindowBase* win) - : ValidationTraverserBase(win) - { - } - - virtual bool OnDo(wxValidator* validator) wxOVERRIDE - { - if ( !validator->TransferToWindow() ) - { - wxLogWarning(_("Could not transfer data to window")); -#if wxUSE_LOG - wxLog::FlushActive(); -#endif // wxUSE_LOG - - return false; - } - - return true; - } - - virtual bool OnRecurse(wxWindow* child) wxOVERRIDE - { - return child->TransferDataToWindow(); - } - }; - - return DataToWindowTraverser(this).DoForAllChildren(); -#else // !wxUSE_VALIDATORS - return true; -#endif // wxUSE_VALIDATORS/!wxUSE_VALIDATORS -} - -bool wxWindowBase::TransferDataFromWindow() -{ -#if wxUSE_VALIDATORS - class DataFromWindowTraverser : public ValidationTraverserBase - { - public: - DataFromWindowTraverser(wxWindowBase* win) - : ValidationTraverserBase(win) - { - } - - virtual bool OnDo(wxValidator* validator) wxOVERRIDE - { - return validator->TransferFromWindow(); - } - - virtual bool OnRecurse(wxWindow* child) wxOVERRIDE - { - return child->TransferDataFromWindow(); - } - }; - - return DataFromWindowTraverser(this).DoForAllChildren(); -#else // !wxUSE_VALIDATORS - return true; -#endif // wxUSE_VALIDATORS/!wxUSE_VALIDATORS -} - -void wxWindowBase::InitDialog() -{ - wxInitDialogEvent event(GetId()); - event.SetEventObject( this ); - GetEventHandler()->ProcessEvent(event); -} - -// ---------------------------------------------------------------------------- -// context-sensitive help support -// ---------------------------------------------------------------------------- - -#if wxUSE_HELP - -// associate this help text with this window -void wxWindowBase::SetHelpText(const wxString& text) -{ - wxHelpProvider *helpProvider = wxHelpProvider::Get(); - if ( helpProvider ) - { - helpProvider->AddHelp(this, text); - } -} - -#if WXWIN_COMPATIBILITY_2_8 -// associate this help text with all windows with the same id as this -// one -void wxWindowBase::SetHelpTextForId(const wxString& text) -{ - wxHelpProvider *helpProvider = wxHelpProvider::Get(); - if ( helpProvider ) - { - helpProvider->AddHelp(GetId(), text); - } -} -#endif // WXWIN_COMPATIBILITY_2_8 - -// get the help string associated with this window (may be empty) -// default implementation forwards calls to the help provider -wxString -wxWindowBase::GetHelpTextAtPoint(const wxPoint & WXUNUSED(pt), - wxHelpEvent::Origin WXUNUSED(origin)) const -{ - wxString text; - wxHelpProvider *helpProvider = wxHelpProvider::Get(); - if ( helpProvider ) - { - text = helpProvider->GetHelp(this); - } - - return text; -} - -// show help for this window -void wxWindowBase::OnHelp(wxHelpEvent& event) -{ - wxHelpProvider *helpProvider = wxHelpProvider::Get(); - if ( helpProvider ) - { - wxPoint pos = event.GetPosition(); - const wxHelpEvent::Origin origin = event.GetOrigin(); - if ( origin == wxHelpEvent::Origin_Keyboard ) - { - // if the help event was generated from keyboard it shouldn't - // appear at the mouse position (which is still the only position - // associated with help event) if the mouse is far away, although - // we still do use the mouse position if it's over the window - // because we suppose the user looks approximately at the mouse - // already and so it would be more convenient than showing tooltip - // at some arbitrary position which can be quite far from it - const wxRect rectClient = GetClientRect(); - if ( !rectClient.Contains(ScreenToClient(pos)) ) - { - // position help slightly under and to the right of this window - pos = ClientToScreen(wxPoint( - 2*GetCharWidth(), - rectClient.height + GetCharHeight() - )); - } - } - - if ( helpProvider->ShowHelpAtPoint(this, pos, origin) ) - { - // skip the event.Skip() below - return; - } - } - - event.Skip(); -} - -#endif // wxUSE_HELP - -// ---------------------------------------------------------------------------- -// tooltips -// ---------------------------------------------------------------------------- - -#if wxUSE_TOOLTIPS - -wxString wxWindowBase::GetToolTipText() const -{ - return m_tooltip ? m_tooltip->GetTip() : wxString(); -} - -void wxWindowBase::DoSetToolTipText( const wxString &tip ) -{ - // don't create the new tooltip if we already have one - if ( m_tooltip ) - { - m_tooltip->SetTip( tip ); - } - else - { - SetToolTip( new wxToolTip( tip ) ); - } - - // setting empty tooltip text does not remove the tooltip any more - use - // SetToolTip(NULL) for this -} - -void wxWindowBase::DoSetToolTip(wxToolTip *tooltip) -{ - if ( m_tooltip != tooltip ) - { - if ( m_tooltip ) - delete m_tooltip; - - m_tooltip = tooltip; - } -} - -bool wxWindowBase::CopyToolTip(wxToolTip *tip) -{ - SetToolTip(tip ? new wxToolTip(tip->GetTip()) : NULL); - - return tip != NULL; -} - -#endif // wxUSE_TOOLTIPS - -// ---------------------------------------------------------------------------- -// constraints and sizers -// ---------------------------------------------------------------------------- - -#if wxUSE_CONSTRAINTS - -void wxWindowBase::SetConstraints( wxLayoutConstraints *constraints ) -{ - if ( m_constraints ) - { - UnsetConstraints(m_constraints); - delete m_constraints; - } - m_constraints = constraints; - if ( m_constraints ) - { - // Make sure other windows know they're part of a 'meaningful relationship' - if ( m_constraints->left.GetOtherWindow() && (m_constraints->left.GetOtherWindow() != this) ) - m_constraints->left.GetOtherWindow()->AddConstraintReference(this); - if ( m_constraints->top.GetOtherWindow() && (m_constraints->top.GetOtherWindow() != this) ) - m_constraints->top.GetOtherWindow()->AddConstraintReference(this); - if ( m_constraints->right.GetOtherWindow() && (m_constraints->right.GetOtherWindow() != this) ) - m_constraints->right.GetOtherWindow()->AddConstraintReference(this); - if ( m_constraints->bottom.GetOtherWindow() && (m_constraints->bottom.GetOtherWindow() != this) ) - m_constraints->bottom.GetOtherWindow()->AddConstraintReference(this); - if ( m_constraints->width.GetOtherWindow() && (m_constraints->width.GetOtherWindow() != this) ) - m_constraints->width.GetOtherWindow()->AddConstraintReference(this); - if ( m_constraints->height.GetOtherWindow() && (m_constraints->height.GetOtherWindow() != this) ) - m_constraints->height.GetOtherWindow()->AddConstraintReference(this); - if ( m_constraints->centreX.GetOtherWindow() && (m_constraints->centreX.GetOtherWindow() != this) ) - m_constraints->centreX.GetOtherWindow()->AddConstraintReference(this); - if ( m_constraints->centreY.GetOtherWindow() && (m_constraints->centreY.GetOtherWindow() != this) ) - m_constraints->centreY.GetOtherWindow()->AddConstraintReference(this); - } -} - -// This removes any dangling pointers to this window in other windows' -// constraintsInvolvedIn lists. -void wxWindowBase::UnsetConstraints(wxLayoutConstraints *c) -{ - if ( c ) - { - if ( c->left.GetOtherWindow() && (c->left.GetOtherWindow() != this) ) - c->left.GetOtherWindow()->RemoveConstraintReference(this); - if ( c->top.GetOtherWindow() && (c->top.GetOtherWindow() != this) ) - c->top.GetOtherWindow()->RemoveConstraintReference(this); - if ( c->right.GetOtherWindow() && (c->right.GetOtherWindow() != this) ) - c->right.GetOtherWindow()->RemoveConstraintReference(this); - if ( c->bottom.GetOtherWindow() && (c->bottom.GetOtherWindow() != this) ) - c->bottom.GetOtherWindow()->RemoveConstraintReference(this); - if ( c->width.GetOtherWindow() && (c->width.GetOtherWindow() != this) ) - c->width.GetOtherWindow()->RemoveConstraintReference(this); - if ( c->height.GetOtherWindow() && (c->height.GetOtherWindow() != this) ) - c->height.GetOtherWindow()->RemoveConstraintReference(this); - if ( c->centreX.GetOtherWindow() && (c->centreX.GetOtherWindow() != this) ) - c->centreX.GetOtherWindow()->RemoveConstraintReference(this); - if ( c->centreY.GetOtherWindow() && (c->centreY.GetOtherWindow() != this) ) - c->centreY.GetOtherWindow()->RemoveConstraintReference(this); - } -} - -// Back-pointer to other windows we're involved with, so if we delete this -// window, we must delete any constraints we're involved with. -void wxWindowBase::AddConstraintReference(wxWindowBase *otherWin) -{ - if ( !m_constraintsInvolvedIn ) - m_constraintsInvolvedIn = new wxWindowList; - if ( !m_constraintsInvolvedIn->Find((wxWindow *)otherWin) ) - m_constraintsInvolvedIn->Append((wxWindow *)otherWin); -} - -// REMOVE back-pointer to other windows we're involved with. -void wxWindowBase::RemoveConstraintReference(wxWindowBase *otherWin) -{ - if ( m_constraintsInvolvedIn ) - m_constraintsInvolvedIn->DeleteObject((wxWindow *)otherWin); -} - -// Reset any constraints that mention this window -void wxWindowBase::DeleteRelatedConstraints() -{ - if ( m_constraintsInvolvedIn ) - { - wxWindowList::compatibility_iterator node = m_constraintsInvolvedIn->GetFirst(); - while (node) - { - wxWindow *win = node->GetData(); - wxLayoutConstraints *constr = win->GetConstraints(); - - // Reset any constraints involving this window - if ( constr ) - { - constr->left.ResetIfWin(this); - constr->top.ResetIfWin(this); - constr->right.ResetIfWin(this); - constr->bottom.ResetIfWin(this); - constr->width.ResetIfWin(this); - constr->height.ResetIfWin(this); - constr->centreX.ResetIfWin(this); - constr->centreY.ResetIfWin(this); - } - - wxWindowList::compatibility_iterator next = node->GetNext(); - m_constraintsInvolvedIn->Erase(node); - node = next; - } - - wxDELETE(m_constraintsInvolvedIn); - } -} - -#endif // wxUSE_CONSTRAINTS - -void wxWindowBase::SetSizer(wxSizer *sizer, bool deleteOld) -{ - if ( sizer == m_windowSizer) - return; - - if ( m_windowSizer ) - { - m_windowSizer->SetContainingWindow(NULL); - - if ( deleteOld ) - delete m_windowSizer; - } - - m_windowSizer = sizer; - if ( m_windowSizer ) - { - m_windowSizer->SetContainingWindow((wxWindow *)this); - } - - SetAutoLayout(m_windowSizer != NULL); -} - -void wxWindowBase::SetSizerAndFit(wxSizer *sizer, bool deleteOld) -{ - SetSizer( sizer, deleteOld ); - sizer->SetSizeHints( (wxWindow*) this ); -} - - -void wxWindowBase::SetContainingSizer(wxSizer* sizer) -{ - // Adding a window to another sizer if it's already managed by one would - // result in crashes later because one of the two sizers won't be notified - // about the window destruction and so will use a dangling pointer when it - // is destroyed itself. As such problems are hard to debug, don't allow - // them to happen in the first place. - if ( sizer ) - { - // This would be caught by the check below too, but give a more clear - // error message in this case. - wxASSERT_MSG( m_containingSizer != sizer, - wxS("Adding a window to the same sizer twice?") ); - - wxCHECK_RET( !m_containingSizer, - wxS("Adding a window already in a sizer, detach it first!") ); - } - - m_containingSizer = sizer; -} - -#if wxUSE_CONSTRAINTS - -void wxWindowBase::SatisfyConstraints() -{ - wxLayoutConstraints *constr = GetConstraints(); - bool wasOk = constr && constr->AreSatisfied(); - - ResetConstraints(); // Mark all constraints as unevaluated - - int noChanges = 1; - - // if we're a top level panel (i.e. our parent is frame/dialog), our - // own constraints will never be satisfied any more unless we do it - // here - if ( wasOk ) - { - while ( noChanges > 0 ) - { - LayoutPhase1(&noChanges); - } - } - - LayoutPhase2(&noChanges); -} - -#endif // wxUSE_CONSTRAINTS - -bool wxWindowBase::Layout() -{ - // If there is a sizer, use it instead of the constraints - if ( GetSizer() ) - { - int w = 0, h = 0; - GetVirtualSize(&w, &h); - GetSizer()->SetDimension( 0, 0, w, h ); - } -#if wxUSE_CONSTRAINTS - else - { - SatisfyConstraints(); // Find the right constraints values - SetConstraintSizes(); // Recursively set the real window sizes - } -#endif - - return true; -} - -void wxWindowBase::InternalOnSize(wxSizeEvent& event) -{ - if ( GetAutoLayout() ) - Layout(); - - event.Skip(); -} - -#if wxUSE_CONSTRAINTS - -// first phase of the constraints evaluation: set our own constraints -bool wxWindowBase::LayoutPhase1(int *noChanges) -{ - wxLayoutConstraints *constr = GetConstraints(); - - return !constr || constr->SatisfyConstraints(this, noChanges); -} - -// second phase: set the constraints for our children -bool wxWindowBase::LayoutPhase2(int *noChanges) -{ - *noChanges = 0; - - // Layout children - DoPhase(1); - - // Layout grand children - DoPhase(2); - - return true; -} - -// Do a phase of evaluating child constraints -bool wxWindowBase::DoPhase(int phase) -{ - // the list containing the children for which the constraints are already - // set correctly - wxWindowList succeeded; - - // the max number of iterations we loop before concluding that we can't set - // the constraints - static const int maxIterations = 500; - - for ( int noIterations = 0; noIterations < maxIterations; noIterations++ ) - { - int noChanges = 0; - - // loop over all children setting their constraints - for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); - node; - node = node->GetNext() ) - { - wxWindow *child = node->GetData(); - if ( child->IsTopLevel() ) - { - // top level children are not inside our client area - continue; - } - - if ( !child->GetConstraints() || succeeded.Find(child) ) - { - // this one is either already ok or nothing we can do about it - continue; - } - - int tempNoChanges = 0; - bool success = phase == 1 ? child->LayoutPhase1(&tempNoChanges) - : child->LayoutPhase2(&tempNoChanges); - noChanges += tempNoChanges; - - if ( success ) - { - succeeded.Append(child); - } - } - - if ( !noChanges ) - { - // constraints are set - break; - } - } - - return true; -} - -void wxWindowBase::ResetConstraints() -{ - wxLayoutConstraints *constr = GetConstraints(); - if ( constr ) - { - constr->left.SetDone(false); - constr->top.SetDone(false); - constr->right.SetDone(false); - constr->bottom.SetDone(false); - constr->width.SetDone(false); - constr->height.SetDone(false); - constr->centreX.SetDone(false); - constr->centreY.SetDone(false); - } - - wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); - while (node) - { - wxWindow *win = node->GetData(); - if ( !win->IsTopLevel() ) - win->ResetConstraints(); - node = node->GetNext(); - } -} - -// Need to distinguish between setting the 'fake' size for windows and sizers, -// and setting the real values. -void wxWindowBase::SetConstraintSizes(bool recurse) -{ - wxLayoutConstraints *constr = GetConstraints(); - if ( constr && constr->AreSatisfied() ) - { - ChildrenRepositioningGuard repositionGuard(this); - - int x = constr->left.GetValue(); - int y = constr->top.GetValue(); - int w = constr->width.GetValue(); - int h = constr->height.GetValue(); - - if ( (constr->width.GetRelationship() != wxAsIs ) || - (constr->height.GetRelationship() != wxAsIs) ) - { - // We really shouldn't set negative sizes for the windows so make - // them at least of 1*1 size - SetSize(x, y, w > 0 ? w : 1, h > 0 ? h : 1); - } - else - { - // If we don't want to resize this window, just move it... - Move(x, y); - } - } - else if ( constr ) - { - wxLogDebug(wxT("Constraints not satisfied for %s named '%s'."), - GetClassInfo()->GetClassName(), - GetName().c_str()); - } - - if ( recurse ) - { - wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); - while (node) - { - wxWindow *win = node->GetData(); - if ( !win->IsTopLevel() && win->GetConstraints() ) - win->SetConstraintSizes(); - node = node->GetNext(); - } - } -} - -// Only set the size/position of the constraint (if any) -void wxWindowBase::SetSizeConstraint(int x, int y, int w, int h) -{ - wxLayoutConstraints *constr = GetConstraints(); - if ( constr ) - { - if ( x != wxDefaultCoord ) - { - constr->left.SetValue(x); - constr->left.SetDone(true); - } - if ( y != wxDefaultCoord ) - { - constr->top.SetValue(y); - constr->top.SetDone(true); - } - if ( w != wxDefaultCoord ) - { - constr->width.SetValue(w); - constr->width.SetDone(true); - } - if ( h != wxDefaultCoord ) - { - constr->height.SetValue(h); - constr->height.SetDone(true); - } - } -} - -void wxWindowBase::MoveConstraint(int x, int y) -{ - wxLayoutConstraints *constr = GetConstraints(); - if ( constr ) - { - if ( x != wxDefaultCoord ) - { - constr->left.SetValue(x); - constr->left.SetDone(true); - } - if ( y != wxDefaultCoord ) - { - constr->top.SetValue(y); - constr->top.SetDone(true); - } - } -} - -void wxWindowBase::GetSizeConstraint(int *w, int *h) const -{ - wxLayoutConstraints *constr = GetConstraints(); - if ( constr ) - { - *w = constr->width.GetValue(); - *h = constr->height.GetValue(); - } - else - GetSize(w, h); -} - -void wxWindowBase::GetClientSizeConstraint(int *w, int *h) const -{ - wxLayoutConstraints *constr = GetConstraints(); - if ( constr ) - { - *w = constr->width.GetValue(); - *h = constr->height.GetValue(); - } - else - GetClientSize(w, h); -} - -void wxWindowBase::GetPositionConstraint(int *x, int *y) const -{ - wxLayoutConstraints *constr = GetConstraints(); - if ( constr ) - { - *x = constr->left.GetValue(); - *y = constr->top.GetValue(); - } - else - GetPosition(x, y); -} - -#endif // wxUSE_CONSTRAINTS - -void wxWindowBase::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags) const -{ - wxWindow *parent = GetParent(); - if ( !(sizeFlags & wxSIZE_NO_ADJUSTMENTS) && parent ) - { - wxPoint pt(parent->GetClientAreaOrigin()); - x += pt.x; - y += pt.y; - } -} - -// ---------------------------------------------------------------------------- -// Update UI processing -// ---------------------------------------------------------------------------- - -void wxWindowBase::UpdateWindowUI(long flags) -{ - wxUpdateUIEvent event(GetId()); - event.SetEventObject(this); - - if ( GetEventHandler()->ProcessEvent(event) ) - { - DoUpdateWindowUI(event); - } - - if (flags & wxUPDATE_UI_RECURSE) - { - wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); - while (node) - { - wxWindow* child = (wxWindow*) node->GetData(); - child->UpdateWindowUI(flags); - node = node->GetNext(); - } - } -} - -// do the window-specific processing after processing the update event -void wxWindowBase::DoUpdateWindowUI(wxUpdateUIEvent& event) -{ - if ( event.GetSetEnabled() ) - Enable(event.GetEnabled()); - - if ( event.GetSetShown() ) - Show(event.GetShown()); -} - -// ---------------------------------------------------------------------------- -// Idle processing -// ---------------------------------------------------------------------------- - -// Send idle event to window and all subwindows -bool wxWindowBase::SendIdleEvents(wxIdleEvent& event) -{ - bool needMore = false; - - OnInternalIdle(); - - // should we send idle event to this window? - if (wxIdleEvent::GetMode() == wxIDLE_PROCESS_ALL || - HasExtraStyle(wxWS_EX_PROCESS_IDLE)) - { - event.SetEventObject(this); - HandleWindowEvent(event); - - if (event.MoreRequested()) - needMore = true; - } - wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); - for (; node; node = node->GetNext()) - { - wxWindow* child = node->GetData(); - if (child->SendIdleEvents(event)) - needMore = true; - } - - return needMore; -} - -void wxWindowBase::OnInternalIdle() -{ - if ( wxUpdateUIEvent::CanUpdate(this) ) - UpdateWindowUI(wxUPDATE_UI_FROMIDLE); -} - -// ---------------------------------------------------------------------------- -// DPI-independent pixels and dialog units translations -// ---------------------------------------------------------------------------- - -#ifndef wxHAVE_DPI_INDEPENDENT_PIXELS - -/* static */ -wxSize -wxWindowBase::FromDIP(const wxSize& sz, const wxWindowBase* WXUNUSED(w)) -{ - const wxSize dpi = wxScreenDC().GetPPI(); - - // Take care to not scale -1 because it has a special meaning of - // "unspecified" which should be preserved. - return wxSize(sz.x == -1 ? -1 : wxMulDivInt32(sz.x, dpi.x, BASELINE_DPI), - sz.y == -1 ? -1 : wxMulDivInt32(sz.y, dpi.y, BASELINE_DPI)); -} - -/* static */ -wxSize -wxWindowBase::ToDIP(const wxSize& sz, const wxWindowBase* WXUNUSED(w)) -{ - const wxSize dpi = wxScreenDC().GetPPI(); - - // Take care to not scale -1 because it has a special meaning of - // "unspecified" which should be preserved. - return wxSize(sz.x == -1 ? -1 : wxMulDivInt32(sz.x, BASELINE_DPI, dpi.x), - sz.y == -1 ? -1 : wxMulDivInt32(sz.y, BASELINE_DPI, dpi.y)); -} - -#endif // !wxHAVE_DPI_INDEPENDENT_PIXELS - -// Windows' computes dialog units using average character width over upper- -// and lower-case ASCII alphabet and not using the average character width -// metadata stored in the font; see -// http://support.microsoft.com/default.aspx/kb/145994 for detailed discussion. -// It's important that we perform the conversion in identical way, because -// dialog units natively exist only on Windows and Windows HIG is expressed -// using them. -wxSize wxWindowBase::GetDlgUnitBase() const -{ - const wxWindowBase * const parent = wxGetTopLevelParent((wxWindow*)this); - - wxCHECK_MSG( parent, wxDefaultSize, wxS("Must have TLW parent") ); - - if ( !parent->m_font.IsOk() ) - { - // Default GUI font is used. This is the most common case, so - // cache the results. - static wxSize s_defFontSize; - if ( s_defFontSize.x == 0 ) - s_defFontSize = wxPrivate::GetAverageASCIILetterSize(*parent); - return s_defFontSize; - } - else - { - // Custom font, we always need to compute the result - return wxPrivate::GetAverageASCIILetterSize(*parent); - } -} - -wxPoint wxWindowBase::ConvertPixelsToDialog(const wxPoint& pt) const -{ - const wxSize base = GetDlgUnitBase(); - - // NB: wxMulDivInt32() is used, because it correctly rounds the result - - wxPoint pt2 = wxDefaultPosition; - if (pt.x != wxDefaultCoord) - pt2.x = wxMulDivInt32(pt.x, 4, base.x); - if (pt.y != wxDefaultCoord) - pt2.y = wxMulDivInt32(pt.y, 8, base.y); - - return pt2; -} - -wxPoint wxWindowBase::ConvertDialogToPixels(const wxPoint& pt) const -{ - const wxSize base = GetDlgUnitBase(); - - wxPoint pt2 = wxDefaultPosition; - if (pt.x != wxDefaultCoord) - pt2.x = wxMulDivInt32(pt.x, base.x, 4); - if (pt.y != wxDefaultCoord) - pt2.y = wxMulDivInt32(pt.y, base.y, 8); - - return pt2; -} - -// ---------------------------------------------------------------------------- -// event handlers -// ---------------------------------------------------------------------------- - -// propagate the colour change event to the subwindows -void wxWindowBase::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event)) -{ - wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); - while ( node ) - { - // Only propagate to non-top-level windows - wxWindow *win = node->GetData(); - if ( !win->IsTopLevel() ) - { - wxSysColourChangedEvent event2; - event2.SetEventObject(win); - win->GetEventHandler()->ProcessEvent(event2); - } - - node = node->GetNext(); - } - - Refresh(); -} - -// the default action is to populate dialog with data when it's created, -// and nudge the UI into displaying itself correctly in case -// we've turned the wxUpdateUIEvents frequency down low. -void wxWindowBase::OnInitDialog( wxInitDialogEvent &WXUNUSED(event) ) -{ - TransferDataToWindow(); - - // Update the UI at this point - UpdateWindowUI(wxUPDATE_UI_RECURSE); -} - -// ---------------------------------------------------------------------------- -// menu-related functions -// ---------------------------------------------------------------------------- - -#if wxUSE_MENUS - -bool wxWindowBase::PopupMenu(wxMenu *menu, int x, int y) -{ - wxCHECK_MSG( menu, false, "can't popup NULL menu" ); - - wxMenuInvokingWindowSetter - setInvokingWin(*menu, static_cast(this)); - - wxCurrentPopupMenu = menu; - const bool rc = DoPopupMenu(menu, x, y); - wxCurrentPopupMenu = NULL; - - return rc; -} - -// this is used to pass the id of the selected item from the menu event handler -// to the main function itself -// -// it's ok to use a global here as there can be at most one popup menu shown at -// any time -static int gs_popupMenuSelection = wxID_NONE; - -void wxWindowBase::InternalOnPopupMenu(wxCommandEvent& event) -{ - // store the id in a global variable where we'll retrieve it from later - gs_popupMenuSelection = event.GetId(); -} - -void wxWindowBase::InternalOnPopupMenuUpdate(wxUpdateUIEvent& WXUNUSED(event)) -{ - // nothing to do but do not skip it -} - -int -wxWindowBase::DoGetPopupMenuSelectionFromUser(wxMenu& menu, int x, int y) -{ - gs_popupMenuSelection = wxID_NONE; - - Connect(wxEVT_MENU, - wxCommandEventHandler(wxWindowBase::InternalOnPopupMenu), - NULL, - this); - - // it is common to construct the menu passed to this function dynamically - // using some fixed range of ids which could clash with the ids used - // elsewhere in the program, which could result in some menu items being - // unintentionally disabled or otherwise modified by update UI handlers - // elsewhere in the program code and this is difficult to avoid in the - // program itself, so instead we just temporarily suspend UI updating while - // this menu is shown - Connect(wxEVT_UPDATE_UI, - wxUpdateUIEventHandler(wxWindowBase::InternalOnPopupMenuUpdate), - NULL, - this); - - PopupMenu(&menu, x, y); - - Disconnect(wxEVT_UPDATE_UI, - wxUpdateUIEventHandler(wxWindowBase::InternalOnPopupMenuUpdate), - NULL, - this); - Disconnect(wxEVT_MENU, - wxCommandEventHandler(wxWindowBase::InternalOnPopupMenu), - NULL, - this); - - return gs_popupMenuSelection; -} - -#endif // wxUSE_MENUS - -// methods for drawing the sizers in a visible way: this is currently only -// enabled for "full debug" builds with wxDEBUG_LEVEL==2 as it doesn't work -// that well and also because we don't want to leave it enabled in default -// builds used for production -#if wxDEBUG_LEVEL > 1 - -static void DrawSizers(wxWindowBase *win); - -static void DrawBorder(wxWindowBase *win, const wxRect& rect, bool fill, const wxPen* pen) -{ - wxClientDC dc((wxWindow *)win); - dc.SetPen(*pen); - dc.SetBrush(fill ? wxBrush(pen->GetColour(), wxBRUSHSTYLE_CROSSDIAG_HATCH) : - *wxTRANSPARENT_BRUSH); - dc.DrawRectangle(rect.Deflate(1, 1)); -} - -static void DrawSizer(wxWindowBase *win, wxSizer *sizer) -{ - const wxSizerItemList& items = sizer->GetChildren(); - for ( wxSizerItemList::const_iterator i = items.begin(), - end = items.end(); - i != end; - ++i ) - { - wxSizerItem *item = *i; - if ( item->IsSizer() ) - { - DrawBorder(win, item->GetRect().Deflate(2), false, wxRED_PEN); - DrawSizer(win, item->GetSizer()); - } - else if ( item->IsSpacer() ) - { - DrawBorder(win, item->GetRect().Deflate(2), true, wxBLUE_PEN); - } - else if ( item->IsWindow() ) - { - DrawSizers(item->GetWindow()); - } - else - wxFAIL_MSG("inconsistent wxSizerItem status!"); - } -} - -static void DrawSizers(wxWindowBase *win) -{ - DrawBorder(win, win->GetClientSize(), false, wxGREEN_PEN); - - wxSizer *sizer = win->GetSizer(); - if ( sizer ) - { - DrawSizer(win, sizer); - } - else // no sizer, still recurse into the children - { - const wxWindowList& children = win->GetChildren(); - for ( wxWindowList::const_iterator i = children.begin(), - end = children.end(); - i != end; - ++i ) - { - DrawSizers(*i); - } - - // show all kind of sizes of this window; see the "window sizing" topic - // overview for more info about the various differences: - wxSize fullSz = win->GetSize(); - wxSize clientSz = win->GetClientSize(); - wxSize bestSz = win->GetBestSize(); - wxSize minSz = win->GetMinSize(); - wxSize maxSz = win->GetMaxSize(); - wxSize virtualSz = win->GetVirtualSize(); - - wxMessageOutputDebug dbgout; - dbgout.Printf( - "%-10s => fullsz=%4d;%-4d clientsz=%4d;%-4d bestsz=%4d;%-4d minsz=%4d;%-4d maxsz=%4d;%-4d virtualsz=%4d;%-4d\n", - win->GetName(), - fullSz.x, fullSz.y, - clientSz.x, clientSz.y, - bestSz.x, bestSz.y, - minSz.x, minSz.y, - maxSz.x, maxSz.y, - virtualSz.x, virtualSz.y); - } -} - -#endif // wxDEBUG_LEVEL - -// process special middle clicks -void wxWindowBase::OnMiddleClick( wxMouseEvent& event ) -{ - if ( event.ControlDown() && event.AltDown() ) - { -#if wxDEBUG_LEVEL > 1 - // Ctrl-Alt-Shift-mclick makes the sizers visible in debug builds - if ( event.ShiftDown() ) - { - DrawSizers(this); - } - else -#endif // __WXDEBUG__ - { -#if wxUSE_MSGDLG - // just Ctrl-Alt-middle click shows information about wx version - ::wxInfoMessageBox((wxWindow*)this); -#endif // wxUSE_MSGDLG - } - } - else - { - event.Skip(); - } -} - -// ---------------------------------------------------------------------------- -// accessibility -// ---------------------------------------------------------------------------- - -#if wxUSE_ACCESSIBILITY -void wxWindowBase::SetAccessible(wxAccessible* accessible) -{ - if (m_accessible && (accessible != m_accessible)) - delete m_accessible; - m_accessible = accessible; - if (m_accessible) - m_accessible->SetWindow((wxWindow*) this); -} - -// Returns the accessible object, creating if necessary. -wxAccessible* wxWindowBase::GetOrCreateAccessible() -{ - if (!m_accessible) - m_accessible = CreateAccessible(); - return m_accessible; -} - -// Override to create a specific accessible object. -wxAccessible* wxWindowBase::CreateAccessible() -{ - return new wxWindowAccessible((wxWindow*) this); -} - -#endif - -// ---------------------------------------------------------------------------- -// list classes implementation -// ---------------------------------------------------------------------------- - -#if wxUSE_STD_CONTAINERS - -#include "wx/listimpl.cpp" -WX_DEFINE_LIST(wxWindowList) - -#else // !wxUSE_STD_CONTAINERS - -void wxWindowListNode::DeleteData() -{ - delete (wxWindow *)GetData(); -} - -#endif // wxUSE_STD_CONTAINERS/!wxUSE_STD_CONTAINERS - -// ---------------------------------------------------------------------------- -// borders -// ---------------------------------------------------------------------------- - -wxBorder wxWindowBase::GetBorder(long flags) const -{ - wxBorder border = (wxBorder)(flags & wxBORDER_MASK); - if ( border == wxBORDER_DEFAULT ) - { - border = GetDefaultBorder(); - } - else if ( border == wxBORDER_THEME ) - { - border = GetDefaultBorderForControl(); - } - - return border; -} - -wxBorder wxWindowBase::GetDefaultBorder() const -{ - return wxBORDER_NONE; -} - -// ---------------------------------------------------------------------------- -// hit testing -// ---------------------------------------------------------------------------- - -wxHitTest wxWindowBase::DoHitTest(wxCoord x, wxCoord y) const -{ - // here we just check if the point is inside the window or not - - // check the top and left border first - bool outside = x < 0 || y < 0; - if ( !outside ) - { - // check the right and bottom borders too - wxSize size = GetSize(); - outside = x >= size.x || y >= size.y; - } - - return outside ? wxHT_WINDOW_OUTSIDE : wxHT_WINDOW_INSIDE; -} - -// ---------------------------------------------------------------------------- -// mouse capture -// ---------------------------------------------------------------------------- - -// Private data used for mouse capture tracking. -namespace wxMouseCapture -{ - -// Stack of the windows which previously had the capture, the top most element -// is the window that has the mouse capture now. -// -// NB: We use wxVector and not wxStack to be able to examine all of the stack -// elements for debug checks, but only the stack operations should be -// performed with this vector. -wxVector stack; - -// Flag preventing reentrancy in {Capture,Release}Mouse(). -wxRecursionGuardFlag changing; - -bool IsInCaptureStack(wxWindowBase* win) -{ - for ( wxVector::const_iterator it = stack.begin(); - it != stack.end(); - ++it ) - { - if ( *it == win ) - return true; - } - - return false; -} - -} // wxMouseCapture - -void wxWindowBase::CaptureMouse() -{ - wxLogTrace(wxT("mousecapture"), wxT("CaptureMouse(%p)"), static_cast(this)); - - wxRecursionGuard guard(wxMouseCapture::changing); - wxASSERT_MSG( !guard.IsInside(), wxT("recursive CaptureMouse call?") ); - - wxASSERT_MSG( !wxMouseCapture::IsInCaptureStack(this), - "Recapturing the mouse in the same window?" ); - - wxWindow *winOld = GetCapture(); - if ( winOld ) - ((wxWindowBase*) winOld)->DoReleaseMouse(); - - DoCaptureMouse(); - - wxMouseCapture::stack.push_back(static_cast(this)); -} - -void wxWindowBase::ReleaseMouse() -{ - wxLogTrace(wxT("mousecapture"), wxT("ReleaseMouse(%p)"), static_cast(this)); - - wxRecursionGuard guard(wxMouseCapture::changing); - wxASSERT_MSG( !guard.IsInside(), wxT("recursive ReleaseMouse call?") ); - -#if wxDEBUG_LEVEL - wxWindow* const winCapture = GetCapture(); - if ( !winCapture ) - { - wxFAIL_MSG - ( - wxString::Format - ( - "Releasing mouse in %p(%s) but it is not captured", - this, GetClassInfo()->GetClassName() - ) - ); - } - else if ( winCapture != this ) - { - wxFAIL_MSG - ( - wxString::Format - ( - "Releasing mouse in %p(%s) but it is captured by %p(%s)", - this, GetClassInfo()->GetClassName(), - winCapture, winCapture->GetClassInfo()->GetClassName() - ) - ); - } -#endif // wxDEBUG_LEVEL - - DoReleaseMouse(); - - wxCHECK_RET( !wxMouseCapture::stack.empty(), - "Releasing mouse capture but capture stack empty?" ); - wxCHECK_RET( wxMouseCapture::stack.back() == this, - "Window releasing mouse capture not top of capture stack?" ); - - wxMouseCapture::stack.pop_back(); - - // Restore the capture to the previous window, if any. - if ( !wxMouseCapture::stack.empty() ) - { - ((wxWindowBase*)wxMouseCapture::stack.back())->DoCaptureMouse(); - } - - wxLogTrace(wxT("mousecapture"), - wxT("After ReleaseMouse() mouse is captured by %p"), - static_cast(GetCapture())); -} - -static void DoNotifyWindowAboutCaptureLost(wxWindow *win) -{ - wxMouseCaptureLostEvent event(win->GetId()); - event.SetEventObject(win); - if ( !win->GetEventHandler()->ProcessEvent(event) ) - { - // windows must handle this event, otherwise the app wouldn't behave - // correctly if it loses capture unexpectedly; see the discussion here: - // http://sourceforge.net/tracker/index.php?func=detail&aid=1153662&group_id=9863&atid=109863 - // http://article.gmane.org/gmane.comp.lib.wxwidgets.devel/82376 - wxFAIL_MSG( wxT("window that captured the mouse didn't process wxEVT_MOUSE_CAPTURE_LOST") ); - } -} - -/* static */ -void wxWindowBase::NotifyCaptureLost() -{ - // don't do anything if capture lost was expected, i.e. resulted from - // a wx call to ReleaseMouse or CaptureMouse: - wxRecursionGuard guard(wxMouseCapture::changing); - if ( guard.IsInside() ) - return; - - // if the capture was lost unexpectedly, notify every window that has - // capture (on stack or current) about it and clear the stack: - while ( !wxMouseCapture::stack.empty() ) - { - DoNotifyWindowAboutCaptureLost(wxMouseCapture::stack.back()); - - wxMouseCapture::stack.pop_back(); - } -} - -#if wxUSE_HOTKEY - -bool -wxWindowBase::RegisterHotKey(int WXUNUSED(hotkeyId), - int WXUNUSED(modifiers), - int WXUNUSED(keycode)) -{ - // not implemented - return false; -} - -bool wxWindowBase::UnregisterHotKey(int WXUNUSED(hotkeyId)) -{ - // not implemented - return false; -} - -#endif // wxUSE_HOTKEY - -// ---------------------------------------------------------------------------- -// event processing -// ---------------------------------------------------------------------------- - -bool wxWindowBase::TryBefore(wxEvent& event) -{ -#if wxUSE_VALIDATORS - // Can only use the validator of the window which - // is receiving the event - if ( event.GetEventObject() == this ) - { - wxValidator * const validator = GetValidator(); - if ( validator && validator->ProcessEventLocally(event) ) - { - return true; - } - } -#endif // wxUSE_VALIDATORS - - return wxEvtHandler::TryBefore(event); -} - -bool wxWindowBase::TryAfter(wxEvent& event) -{ - // carry on up the parent-child hierarchy if the propagation count hasn't - // reached zero yet - if ( event.ShouldPropagate() ) - { - // honour the requests to stop propagation at this window: this is - // used by the dialogs, for example, to prevent processing the events - // from the dialog controls in the parent frame which rarely, if ever, - // makes sense - if ( !(GetExtraStyle() & wxWS_EX_BLOCK_EVENTS) ) - { - wxWindow *parent = GetParent(); - if ( parent && !parent->IsBeingDeleted() ) - { - wxPropagateOnce propagateOnce(event, this); - - return parent->GetEventHandler()->ProcessEvent(event); - } - } - } - - return wxEvtHandler::TryAfter(event); -} - -// ---------------------------------------------------------------------------- -// window relationships -// ---------------------------------------------------------------------------- - -wxWindow *wxWindowBase::DoGetSibling(WindowOrder order) const -{ - wxCHECK_MSG( GetParent(), NULL, - wxT("GetPrev/NextSibling() don't work for TLWs!") ); - - wxWindowList& siblings = GetParent()->GetChildren(); - wxWindowList::compatibility_iterator i = siblings.Find((wxWindow *)this); - wxCHECK_MSG( i, NULL, wxT("window not a child of its parent?") ); - - if ( order == OrderBefore ) - i = i->GetPrevious(); - else // OrderAfter - i = i->GetNext(); - - return i ? i->GetData() : NULL; -} - -// ---------------------------------------------------------------------------- -// keyboard navigation -// ---------------------------------------------------------------------------- - -// Navigates in the specified direction inside this window -bool wxWindowBase::DoNavigateIn(int flags) -{ -#ifdef wxHAS_NATIVE_TAB_TRAVERSAL - // native code doesn't process our wxNavigationKeyEvents anyhow - wxUnusedVar(flags); - return false; -#else // !wxHAS_NATIVE_TAB_TRAVERSAL - wxNavigationKeyEvent eventNav; - wxWindow *focused = FindFocus(); - eventNav.SetCurrentFocus(focused); - eventNav.SetEventObject(focused); - eventNav.SetFlags(flags); - return GetEventHandler()->ProcessEvent(eventNav); -#endif // wxHAS_NATIVE_TAB_TRAVERSAL/!wxHAS_NATIVE_TAB_TRAVERSAL -} - -bool wxWindowBase::HandleAsNavigationKey(const wxKeyEvent& event) -{ - if ( event.GetKeyCode() != WXK_TAB ) - return false; - - int flags = wxNavigationKeyEvent::FromTab; - - if ( event.ShiftDown() ) - flags |= wxNavigationKeyEvent::IsBackward; - else - flags |= wxNavigationKeyEvent::IsForward; - - if ( event.ControlDown() ) - flags |= wxNavigationKeyEvent::WinChange; - - Navigate(flags); - return true; -} - -void wxWindowBase::DoMoveInTabOrder(wxWindow *win, WindowOrder move) -{ - // check that we're not a top level window - wxCHECK_RET( GetParent(), - wxT("MoveBefore/AfterInTabOrder() don't work for TLWs!") ); - - // detect the special case when we have nothing to do anyhow and when the - // code below wouldn't work - if ( win == this ) - return; - - // find the target window in the siblings list - wxWindowList& siblings = GetParent()->GetChildren(); - wxWindowList::compatibility_iterator i = siblings.Find(win); - wxCHECK_RET( i, wxT("MoveBefore/AfterInTabOrder(): win is not a sibling") ); - - // unfortunately, when wxUSE_STD_CONTAINERS == 1 DetachNode() is not - // implemented so we can't just move the node around - wxWindow *self = (wxWindow *)this; - siblings.DeleteObject(self); - if ( move == OrderAfter ) - { - i = i->GetNext(); - } - - if ( i ) - { - siblings.Insert(i, self); - } - else // OrderAfter and win was the last sibling - { - siblings.Append(self); - } -} - -// ---------------------------------------------------------------------------- -// focus handling -// ---------------------------------------------------------------------------- - -/*static*/ wxWindow* wxWindowBase::FindFocus() -{ - wxWindowBase *win = DoFindFocus(); - return win ? win->GetMainWindowOfCompositeControl() : NULL; -} - -bool wxWindowBase::HasFocus() const -{ - wxWindowBase* const win = DoFindFocus(); - return win && - (this == win || this == win->GetMainWindowOfCompositeControl()); -} - -// ---------------------------------------------------------------------------- -// drag and drop -// ---------------------------------------------------------------------------- - -#if wxUSE_DRAG_AND_DROP && !defined(__WXMSW__) - -namespace -{ - -class DragAcceptFilesTarget : public wxFileDropTarget -{ -public: - DragAcceptFilesTarget(wxWindowBase *win) : m_win(win) {} - - virtual bool OnDropFiles(wxCoord x, wxCoord y, - const wxArrayString& filenames) wxOVERRIDE - { - wxDropFilesEvent event(wxEVT_DROP_FILES, - filenames.size(), - wxCArrayString(filenames).Release()); - event.SetEventObject(m_win); - event.m_pos.x = x; - event.m_pos.y = y; - - return m_win->HandleWindowEvent(event); - } - -private: - wxWindowBase * const m_win; - - wxDECLARE_NO_COPY_CLASS(DragAcceptFilesTarget); -}; - - -} // anonymous namespace - -// Generic version of DragAcceptFiles(). It works by installing a simple -// wxFileDropTarget-to-EVT_DROP_FILES adaptor and therefore cannot be used -// together with explicit SetDropTarget() calls. -void wxWindowBase::DragAcceptFiles(bool accept) -{ - if ( accept ) - { - wxASSERT_MSG( !GetDropTarget(), - "cannot use DragAcceptFiles() and SetDropTarget() together" ); - SetDropTarget(new DragAcceptFilesTarget(this)); - } - else - { - SetDropTarget(NULL); - } -} - -#endif // wxUSE_DRAG_AND_DROP && !defined(__WXMSW__) - -// ---------------------------------------------------------------------------- -// global functions -// ---------------------------------------------------------------------------- - -wxWindow* wxGetTopLevelParent(wxWindow *win) -{ - while ( win && !win->IsTopLevel() ) - win = win->GetParent(); - - return win; -} - -#if wxUSE_ACCESSIBILITY -// ---------------------------------------------------------------------------- -// accessible object for windows -// ---------------------------------------------------------------------------- - -// Can return either a child object, or an integer -// representing the child element, starting from 1. -wxAccStatus wxWindowAccessible::HitTest(const wxPoint& WXUNUSED(pt), int* WXUNUSED(childId), wxAccessible** WXUNUSED(childObject)) -{ - wxASSERT( GetWindow() != NULL ); - if (!GetWindow()) - return wxACC_FAIL; - - return wxACC_NOT_IMPLEMENTED; -} - -// Returns the rectangle for this object (id = 0) or a child element (id > 0). -wxAccStatus wxWindowAccessible::GetLocation(wxRect& rect, int elementId) -{ - wxASSERT( GetWindow() != NULL ); - if (!GetWindow()) - return wxACC_FAIL; - - wxWindow* win = NULL; - if (elementId == 0) - { - win = GetWindow(); - } - else - { - if (elementId <= (int) GetWindow()->GetChildren().GetCount()) - { - win = GetWindow()->GetChildren().Item(elementId-1)->GetData(); - } - else - return wxACC_FAIL; - } - if (win) - { - rect = win->GetRect(); - if (win->GetParent() && !wxDynamicCast(win, wxTopLevelWindow)) - rect.SetPosition(win->GetParent()->ClientToScreen(rect.GetPosition())); - return wxACC_OK; - } - - return wxACC_NOT_IMPLEMENTED; -} - -// Navigates from fromId to toId/toObject. -wxAccStatus wxWindowAccessible::Navigate(wxNavDir navDir, int fromId, - int* WXUNUSED(toId), wxAccessible** toObject) -{ - wxASSERT( GetWindow() != NULL ); - if (!GetWindow()) - return wxACC_FAIL; - - switch (navDir) - { - case wxNAVDIR_FIRSTCHILD: - { - if (GetWindow()->GetChildren().GetCount() == 0) - return wxACC_FALSE; - wxWindow* childWindow = (wxWindow*) GetWindow()->GetChildren().GetFirst()->GetData(); - *toObject = childWindow->GetOrCreateAccessible(); - - return wxACC_OK; - } - case wxNAVDIR_LASTCHILD: - { - if (GetWindow()->GetChildren().GetCount() == 0) - return wxACC_FALSE; - wxWindow* childWindow = (wxWindow*) GetWindow()->GetChildren().GetLast()->GetData(); - *toObject = childWindow->GetOrCreateAccessible(); - - return wxACC_OK; - } - case wxNAVDIR_RIGHT: - case wxNAVDIR_DOWN: - case wxNAVDIR_NEXT: - { - wxWindowList::compatibility_iterator node = - wxWindowList::compatibility_iterator(); - if (fromId == 0) - { - // Can't navigate to sibling of this window - // if we're a top-level window. - if (!GetWindow()->GetParent()) - return wxACC_NOT_IMPLEMENTED; - - node = GetWindow()->GetParent()->GetChildren().Find(GetWindow()); - } - else - { - if (fromId <= (int) GetWindow()->GetChildren().GetCount()) - node = GetWindow()->GetChildren().Item(fromId-1); - } - - if (node && node->GetNext()) - { - wxWindow* nextWindow = node->GetNext()->GetData(); - *toObject = nextWindow->GetOrCreateAccessible(); - return wxACC_OK; - } - else - return wxACC_FALSE; - } - case wxNAVDIR_LEFT: - case wxNAVDIR_UP: - case wxNAVDIR_PREVIOUS: - { - wxWindowList::compatibility_iterator node = - wxWindowList::compatibility_iterator(); - if (fromId == 0) - { - // Can't navigate to sibling of this window - // if we're a top-level window. - if (!GetWindow()->GetParent()) - return wxACC_NOT_IMPLEMENTED; - - node = GetWindow()->GetParent()->GetChildren().Find(GetWindow()); - } - else - { - if (fromId <= (int) GetWindow()->GetChildren().GetCount()) - node = GetWindow()->GetChildren().Item(fromId-1); - } - - if (node && node->GetPrevious()) - { - wxWindow* previousWindow = node->GetPrevious()->GetData(); - *toObject = previousWindow->GetOrCreateAccessible(); - return wxACC_OK; - } - else - return wxACC_FALSE; - } - } - - return wxACC_NOT_IMPLEMENTED; -} - -// Gets the name of the specified object. -wxAccStatus wxWindowAccessible::GetName(int childId, wxString* name) -{ - wxASSERT( GetWindow() != NULL ); - if (!GetWindow()) - return wxACC_FAIL; - - wxString title; - - // If a child, leave wxWidgets to call the function on the actual - // child object. - if (childId > 0) - return wxACC_NOT_IMPLEMENTED; - - // This will eventually be replaced by specialised - // accessible classes, one for each kind of wxWidgets - // control or window. -#if wxUSE_BUTTON - if (wxDynamicCast(GetWindow(), wxButton)) - title = ((wxButton*) GetWindow())->GetLabel(); - else -#endif - title = GetWindow()->GetName(); - - if (!title.empty()) - { - *name = title; - return wxACC_OK; - } - else - return wxACC_NOT_IMPLEMENTED; -} - -// Gets the number of children. -wxAccStatus wxWindowAccessible::GetChildCount(int* childId) -{ - wxASSERT( GetWindow() != NULL ); - if (!GetWindow()) - return wxACC_FAIL; - - *childId = (int) GetWindow()->GetChildren().GetCount(); - return wxACC_OK; -} - -// Gets the specified child (starting from 1). -// If *child is NULL and return value is wxACC_OK, -// this means that the child is a simple element and -// not an accessible object. -wxAccStatus wxWindowAccessible::GetChild(int childId, wxAccessible** child) -{ - wxASSERT( GetWindow() != NULL ); - if (!GetWindow()) - return wxACC_FAIL; - - if (childId == 0) - { - *child = this; - return wxACC_OK; - } - - if (childId > (int) GetWindow()->GetChildren().GetCount()) - return wxACC_FAIL; - - wxWindow* childWindow = GetWindow()->GetChildren().Item(childId-1)->GetData(); - *child = childWindow->GetOrCreateAccessible(); - if (*child) - return wxACC_OK; - else - return wxACC_FAIL; -} - -// Gets the parent, or NULL. -wxAccStatus wxWindowAccessible::GetParent(wxAccessible** parent) -{ - wxASSERT( GetWindow() != NULL ); - if (!GetWindow()) - return wxACC_FAIL; - - wxWindow* parentWindow = GetWindow()->GetParent(); - if (!parentWindow) - { - *parent = NULL; - return wxACC_OK; - } - else - { - *parent = parentWindow->GetOrCreateAccessible(); - if (*parent) - return wxACC_OK; - else - return wxACC_FAIL; - } -} - -// Performs the default action. childId is 0 (the action for this object) -// or > 0 (the action for a child). -// Return wxACC_NOT_SUPPORTED if there is no default action for this -// window (e.g. an edit control). -wxAccStatus wxWindowAccessible::DoDefaultAction(int WXUNUSED(childId)) -{ - wxASSERT( GetWindow() != NULL ); - if (!GetWindow()) - return wxACC_FAIL; - - return wxACC_NOT_IMPLEMENTED; -} - -// Gets the default action for this object (0) or > 0 (the action for a child). -// Return wxACC_OK even if there is no action. actionName is the action, or the empty -// string if there is no action. -// The retrieved string describes the action that is performed on an object, -// not what the object does as a result. For example, a toolbar button that prints -// a document has a default action of "Press" rather than "Prints the current document." -wxAccStatus wxWindowAccessible::GetDefaultAction(int WXUNUSED(childId), wxString* WXUNUSED(actionName)) -{ - wxASSERT( GetWindow() != NULL ); - if (!GetWindow()) - return wxACC_FAIL; - - return wxACC_NOT_IMPLEMENTED; -} - -// Returns the description for this object or a child. -wxAccStatus wxWindowAccessible::GetDescription(int WXUNUSED(childId), wxString* description) -{ - wxASSERT( GetWindow() != NULL ); - if (!GetWindow()) - return wxACC_FAIL; - - wxString ht(GetWindow()->GetHelpTextAtPoint(wxDefaultPosition, wxHelpEvent::Origin_Keyboard)); - if (!ht.empty()) - { - *description = ht; - return wxACC_OK; - } - return wxACC_NOT_IMPLEMENTED; -} - -// Returns help text for this object or a child, similar to tooltip text. -wxAccStatus wxWindowAccessible::GetHelpText(int WXUNUSED(childId), wxString* helpText) -{ - wxASSERT( GetWindow() != NULL ); - if (!GetWindow()) - return wxACC_FAIL; - - wxString ht(GetWindow()->GetHelpTextAtPoint(wxDefaultPosition, wxHelpEvent::Origin_Keyboard)); - if (!ht.empty()) - { - *helpText = ht; - return wxACC_OK; - } - return wxACC_NOT_IMPLEMENTED; -} - -// Returns the keyboard shortcut for this object or child. -// Return e.g. ALT+K -wxAccStatus wxWindowAccessible::GetKeyboardShortcut(int WXUNUSED(childId), wxString* WXUNUSED(shortcut)) -{ - wxASSERT( GetWindow() != NULL ); - if (!GetWindow()) - return wxACC_FAIL; - - return wxACC_NOT_IMPLEMENTED; -} - -// Returns a role constant. -wxAccStatus wxWindowAccessible::GetRole(int childId, wxAccRole* role) -{ - wxASSERT( GetWindow() != NULL ); - if (!GetWindow()) - return wxACC_FAIL; - - // If a child, leave wxWidgets to call the function on the actual - // child object. - if (childId > 0) - return wxACC_NOT_IMPLEMENTED; - - if (wxDynamicCast(GetWindow(), wxControl)) - return wxACC_NOT_IMPLEMENTED; -#if wxUSE_STATUSBAR - if (wxDynamicCast(GetWindow(), wxStatusBar)) - return wxACC_NOT_IMPLEMENTED; -#endif -#if wxUSE_TOOLBAR - if (wxDynamicCast(GetWindow(), wxToolBar)) - return wxACC_NOT_IMPLEMENTED; -#endif - - //*role = wxROLE_SYSTEM_CLIENT; - *role = wxROLE_SYSTEM_CLIENT; - return wxACC_OK; - - #if 0 - return wxACC_NOT_IMPLEMENTED; - #endif -} - -// Returns a state constant. -wxAccStatus wxWindowAccessible::GetState(int childId, long* state) -{ - wxASSERT( GetWindow() != NULL ); - if (!GetWindow()) - return wxACC_FAIL; - - // If a child, leave wxWidgets to call the function on the actual - // child object. - if (childId > 0) - return wxACC_NOT_IMPLEMENTED; - - if (wxDynamicCast(GetWindow(), wxControl)) - return wxACC_NOT_IMPLEMENTED; - -#if wxUSE_STATUSBAR - if (wxDynamicCast(GetWindow(), wxStatusBar)) - return wxACC_NOT_IMPLEMENTED; -#endif -#if wxUSE_TOOLBAR - if (wxDynamicCast(GetWindow(), wxToolBar)) - return wxACC_NOT_IMPLEMENTED; -#endif - - *state = 0; - return wxACC_OK; - - #if 0 - return wxACC_NOT_IMPLEMENTED; - #endif -} - -// Returns a localized string representing the value for the object -// or child. -wxAccStatus wxWindowAccessible::GetValue(int WXUNUSED(childId), wxString* WXUNUSED(strValue)) -{ - wxASSERT( GetWindow() != NULL ); - if (!GetWindow()) - return wxACC_FAIL; - - return wxACC_NOT_IMPLEMENTED; -} - -// Selects the object or child. -wxAccStatus wxWindowAccessible::Select(int WXUNUSED(childId), wxAccSelectionFlags WXUNUSED(selectFlags)) -{ - wxASSERT( GetWindow() != NULL ); - if (!GetWindow()) - return wxACC_FAIL; - - return wxACC_NOT_IMPLEMENTED; -} - -// Gets the window with the keyboard focus. -// If childId is 0 and child is NULL, no object in -// this subhierarchy has the focus. -// If this object has the focus, child should be 'this'. -wxAccStatus wxWindowAccessible::GetFocus(int* WXUNUSED(childId), wxAccessible** WXUNUSED(child)) -{ - wxASSERT( GetWindow() != NULL ); - if (!GetWindow()) - return wxACC_FAIL; - - return wxACC_NOT_IMPLEMENTED; -} - -#if wxUSE_VARIANT -// Gets a variant representing the selected children -// of this object. -// Acceptable values: -// - a null variant (IsNull() returns true) -// - a list variant (GetType() == wxT("list") -// - an integer representing the selected child element, -// or 0 if this object is selected (GetType() == wxT("long") -// - a "void*" pointer to a wxAccessible child object -wxAccStatus wxWindowAccessible::GetSelections(wxVariant* WXUNUSED(selections)) -{ - wxASSERT( GetWindow() != NULL ); - if (!GetWindow()) - return wxACC_FAIL; - - return wxACC_NOT_IMPLEMENTED; -} -#endif // wxUSE_VARIANT - -#endif // wxUSE_ACCESSIBILITY - -// ---------------------------------------------------------------------------- -// RTL support -// ---------------------------------------------------------------------------- - -wxCoord -wxWindowBase::AdjustForLayoutDirection(wxCoord x, - wxCoord width, - wxCoord widthTotal) const -{ - if ( GetLayoutDirection() == wxLayout_RightToLeft ) - { - x = widthTotal - x - width; - } - - return x; -} - - diff --git a/Externals/wxWidgets3/src/common/windowid.cpp b/Externals/wxWidgets3/src/common/windowid.cpp deleted file mode 100644 index 20a0efbe20..0000000000 --- a/Externals/wxWidgets3/src/common/windowid.cpp +++ /dev/null @@ -1,283 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/common/windowid.cpp -// Purpose: wxWindowID class - a class for managing window ids -// Author: Brian Vanderburg II -// Created: 2007-09-21 -// Copyright: (c) 2007 Brian Vanderburg II -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ---------------------------------------------------------------------------- -// Needed headers -// ---------------------------------------------------------------------------- -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#ifndef WX_PRECOMP - #include "wx/log.h" - #include "wx/intl.h" -#endif //WX_PRECOMP - -#include "wx/hashmap.h" - -// Not needed, included in defs.h -// #include "wx/windowid.h" - -namespace -{ - -#if wxUSE_AUTOID_MANAGEMENT - - -// initially no ids are in use and we allocate them consecutively, but after we -// exhaust the entire range, we wrap around and reuse the ids freed in the -// meanwhile -static const wxUint8 ID_FREE = 0; -static const wxUint8 ID_STARTCOUNT = 1; -static const wxUint8 ID_COUNTTOOLARGE = 254; -static const wxUint8 ID_RESERVED = 255; - -// we use a two level count, most IDs will be used less than ID_COUNTTOOLARGE-1 -// thus we store their count directly in this array, however when the same ID -// is reused a great number of times (more than or equal to ID_COUNTTOOLARGE), -// the hash map stores the actual count -wxUint8 gs_autoIdsRefCount[wxID_AUTO_HIGHEST - wxID_AUTO_LOWEST + 1] = { 0 }; - -// NB: this variable is allocated (again) only when an ID gets at least -// ID_COUNTTOOLARGE refs, and is freed when the latest entry in the map gets -// freed. The cell storing the count for an ID is freed only when its count -// gets to zero (not when it goes below ID_COUNTTOOLARGE, so as to avoid -// degenerate cases) -wxLongToLongHashMap *gs_autoIdsLargeRefCount = NULL; - -// this is an optimization used until we wrap around wxID_AUTO_HIGHEST: if this -// value is < wxID_AUTO_HIGHEST we know that we haven't wrapped yet and so can -// allocate the ids simply by incrementing it -wxWindowID gs_nextAutoId = wxID_AUTO_LOWEST; - -// Reserve an ID -void ReserveIdRefCount(wxWindowID winid) -{ - wxCHECK_RET(winid >= wxID_AUTO_LOWEST && winid <= wxID_AUTO_HIGHEST, - wxT("invalid id range")); - - winid -= wxID_AUTO_LOWEST; - - wxCHECK_RET(gs_autoIdsRefCount[winid] == ID_FREE, - wxT("id already in use or already reserved")); - gs_autoIdsRefCount[winid] = ID_RESERVED; -} - -// Unreserve and id -void UnreserveIdRefCount(wxWindowID winid) -{ - wxCHECK_RET(winid >= wxID_AUTO_LOWEST && winid <= wxID_AUTO_HIGHEST, - wxT("invalid id range")); - - winid -= wxID_AUTO_LOWEST; - - wxCHECK_RET(gs_autoIdsRefCount[winid] == ID_RESERVED, - wxT("id already in use or not reserved")); - gs_autoIdsRefCount[winid] = ID_FREE; -} - -// Get the usage count of an id -int GetIdRefCount(wxWindowID winid) -{ - winid -= wxID_AUTO_LOWEST; - int refCount = gs_autoIdsRefCount[winid]; - if (refCount == ID_COUNTTOOLARGE) - refCount = (*gs_autoIdsLargeRefCount)[winid]; - return refCount; -} - -// Increase the count for an id -void IncIdRefCount(wxWindowID winid) -{ - winid -= wxID_AUTO_LOWEST; - - wxCHECK_RET(gs_autoIdsRefCount[winid] != ID_FREE, wxT("id should first be reserved")); - - if(gs_autoIdsRefCount[winid] == ID_RESERVED) - { - gs_autoIdsRefCount[winid] = ID_STARTCOUNT; - } - else if (gs_autoIdsRefCount[winid] >= ID_COUNTTOOLARGE-1) - { - if (gs_autoIdsRefCount[winid] == ID_COUNTTOOLARGE-1) - { - // we need to allocate a cell, and maybe the hash map itself - if (!gs_autoIdsLargeRefCount) - gs_autoIdsLargeRefCount = new wxLongToLongHashMap; - (*gs_autoIdsLargeRefCount)[winid] = ID_COUNTTOOLARGE-1; - - gs_autoIdsRefCount[winid] = ID_COUNTTOOLARGE; - } - ++(*gs_autoIdsLargeRefCount)[winid]; - } - else - { - gs_autoIdsRefCount[winid]++; - } -} - -// Decrease the count for an id -void DecIdRefCount(wxWindowID winid) -{ - winid -= wxID_AUTO_LOWEST; - - wxCHECK_RET(gs_autoIdsRefCount[winid] != ID_FREE, wxT("id count already 0")); - - // DecIdRefCount is only called on an ID that has been IncIdRefCount'ed' - // so it should never be reserved, but test anyway - if(gs_autoIdsRefCount[winid] == ID_RESERVED) - { - wxFAIL_MSG(wxT("reserve id being decreased")); - gs_autoIdsRefCount[winid] = ID_FREE; - } - else if(gs_autoIdsRefCount[winid] == ID_COUNTTOOLARGE) - { - long &largeCount = (*gs_autoIdsLargeRefCount)[winid]; - --largeCount; - if (largeCount == 0) - { - gs_autoIdsLargeRefCount->erase (winid); - gs_autoIdsRefCount[winid] = ID_FREE; - - if (gs_autoIdsLargeRefCount->empty()) - wxDELETE (gs_autoIdsLargeRefCount); - } - } - else - gs_autoIdsRefCount[winid]--; -} - -#else // wxUSE_AUTOID_MANAGEMENT - -static wxWindowID gs_nextAutoId = wxID_AUTO_HIGHEST; - -#endif - -} // anonymous namespace - - -#if wxUSE_AUTOID_MANAGEMENT - -void wxWindowIDRef::Assign(wxWindowID winid) -{ - if ( winid != m_id ) - { - // decrease count if it is in the managed range - if ( m_id >= wxID_AUTO_LOWEST && m_id <= wxID_AUTO_HIGHEST ) - DecIdRefCount(m_id); - - m_id = winid; - - // increase count if it is in the managed range - if ( m_id >= wxID_AUTO_LOWEST && m_id <= wxID_AUTO_HIGHEST ) - IncIdRefCount(m_id); - } -} - -#endif // wxUSE_AUTOID_MANAGEMENT - - - -wxWindowID wxIdManager::ReserveId(int count) -{ - wxASSERT_MSG(count > 0, wxT("can't allocate less than 1 id")); - - -#if wxUSE_AUTOID_MANAGEMENT - if ( gs_nextAutoId + count - 1 <= wxID_AUTO_HIGHEST ) - { - wxWindowID winid = gs_nextAutoId; - - while(count--) - { - ReserveIdRefCount(gs_nextAutoId++); - } - - return winid; - } - else - { - int found = 0; - - for(wxWindowID winid = wxID_AUTO_LOWEST; winid <= wxID_AUTO_HIGHEST; winid++) - { - if(GetIdRefCount(winid) == 0) - { - found++; - if(found == count) - { - // Imagine this: 100 free IDs left. Then NewId(50) takes 50 - // so 50 left. Then, the 25 before that last 50 are freed, but - // gs_nextAutoId does not decrement and stays where it is at - // with 50 free. Then NewId(75) gets called, and since there - // are only 50 left according to gs_nextAutoId, it does a - // search and finds the 75 at the end. Then NewId(10) gets - // called, and accorind to gs_nextAutoId, their are still - // 50 at the end so it returns them without testing the ref - // To fix this, the next ID is also updated here as needed - if(winid >= gs_nextAutoId) - gs_nextAutoId = winid + 1; - - while(count--) - ReserveIdRefCount(winid--); - - return winid + 1; - } - } - else - { - found = 0; - } - } - } - - wxLogError(_("Out of window IDs. Recommend shutting down application.")); - return wxID_NONE; -#else // !wxUSE_AUTOID_MANAGEMENT - // Make sure enough in the range - wxWindowID winid; - - winid = gs_nextAutoId - count + 1; - - if ( winid >= wxID_AUTO_LOWEST && winid <= wxID_AUTO_HIGHEST ) - { - // There is enough, but it may be time to wrap - if(winid == wxID_AUTO_LOWEST) - gs_nextAutoId = wxID_AUTO_HIGHEST; - else - gs_nextAutoId = winid - 1; - - return winid; - } - else - { - // There is not enough at the low end of the range or - // count was big enough to wrap around to the positive - // Surely 'count' is not so big to take up much of the range - gs_nextAutoId = wxID_AUTO_HIGHEST - count; - return gs_nextAutoId + 1; - } -#endif // wxUSE_AUTOID_MANAGEMENT/!wxUSE_AUTOID_MANAGEMENT -} - -void wxIdManager::UnreserveId(wxWindowID winid, int count) -{ - wxASSERT_MSG(count > 0, wxT("can't unreserve less than 1 id")); - -#if wxUSE_AUTOID_MANAGEMENT - while (count--) - UnreserveIdRefCount(winid++); -#else - wxUnusedVar(winid); - wxUnusedVar(count); -#endif -} - diff --git a/Externals/wxWidgets3/src/common/wrapsizer.cpp b/Externals/wxWidgets3/src/common/wrapsizer.cpp deleted file mode 100644 index 90118e3c74..0000000000 --- a/Externals/wxWidgets3/src/common/wrapsizer.cpp +++ /dev/null @@ -1,599 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/wrapsizer.cpp -// Purpose: provides wxWrapSizer class for layout -// Author: Arne Steinarson -// Created: 2008-05-08 -// Copyright: (c) Arne Steinarson -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include "wx/wrapsizer.h" -#include "wx/vector.h" - -namespace -{ - -// ---------------------------------------------------------------------------- -// helper local classes -// ---------------------------------------------------------------------------- - -// This object changes the item proportion to INT_MAX in its ctor and restores -// it back in the dtor. -class wxPropChanger : public wxObject -{ -public: - wxPropChanger(wxSizer& sizer, wxSizerItem& item) - : m_sizer(sizer), - m_item(item), - m_propOld(item.GetProportion()) - { - // ensure that this item expands more than all the other ones - item.SetProportion(INT_MAX); - } - - ~wxPropChanger() - { - // check if the sizer still has this item, it could have been removed - if ( m_sizer.GetChildren().Find(&m_item) ) - m_item.SetProportion(m_propOld); - } - -private: - wxSizer& m_sizer; - wxSizerItem& m_item; - const int m_propOld; - - wxDECLARE_NO_COPY_CLASS(wxPropChanger); -}; - -} // anonymous namespace - -// ============================================================================ -// wxWrapSizer implementation -// ============================================================================ - -wxIMPLEMENT_DYNAMIC_CLASS(wxWrapSizer, wxBoxSizer); - -wxWrapSizer::wxWrapSizer(int orient, int flags) - : wxBoxSizer(orient), - m_flags(flags), - m_dirInform(0), - m_availSize(-1), - m_availableOtherDir(0), - m_lastUsed(true), - m_minSizeMinor(0), - m_maxSizeMajor(0), - m_minItemMajor(INT_MAX), - m_rows(orient ^ wxBOTH) -{ -} - -wxWrapSizer::~wxWrapSizer() -{ - ClearRows(); -} - -void wxWrapSizer::ClearRows() -{ - // all elements of the row sizers are also elements of this one (we - // directly add pointers to elements of our own m_children list to the row - // sizers in RecalcSizes()), so we need to detach them from the row sizer - // to avoid double deletion - wxSizerItemList& rows = m_rows.GetChildren(); - for ( wxSizerItemList::iterator i = rows.begin(), - end = rows.end(); - i != end; - ++i ) - { - wxSizerItem * const item = *i; - wxSizer * const row = item->GetSizer(); - if ( !row ) - { - wxFAIL_MSG( "all elements of m_rows must be sizers" ); - continue; - } - - row->GetChildren().clear(); - - wxPropChanger * const - propChanger = static_cast(item->GetUserData()); - if ( propChanger ) - { - // this deletes propChanger and so restores the old proportion - item->SetUserData(NULL); - } - } -} - -wxSizer *wxWrapSizer::GetRowSizer(size_t n) -{ - const wxSizerItemList& rows = m_rows.GetChildren(); - if ( n < rows.size() ) - return rows[n]->GetSizer(); - - wxSizer * const sizer = new wxBoxSizer(GetOrientation()); - m_rows.Add(sizer, wxSizerFlags().Expand()); - return sizer; -} - -bool wxWrapSizer::InformFirstDirection(int direction, - int size, - int availableOtherDir) -{ - if ( !direction ) - return false; - - // Store the values for later use - m_availSize = size; - m_availableOtherDir = availableOtherDir + - (direction == wxHORIZONTAL ? m_calculatedMinSize.y - : m_calculatedMinSize.x); - m_dirInform = direction; - m_lastUsed = false; - return true; -} - - -void wxWrapSizer::AdjustLastRowItemProp(size_t n, wxSizerItem *itemLast) -{ - if ( !itemLast || !(m_flags & wxEXTEND_LAST_ON_EACH_LINE) ) - { - // nothing to do - return; - } - - wxSizerItem * const item = m_rows.GetItem(n); - wxCHECK_RET( item, "invalid sizer item" ); - - // store the item we modified and its original proportion - item->SetUserData(new wxPropChanger(*this, *itemLast)); -} - -wxSize wxWrapSizer::CalcMin() -{ - if ( m_children.empty() ) - return wxSize(); - - // We come here to calculate min size in two different situations: - // 1 - Immediately after InformFirstDirection, then we find a min size that - // uses one dimension maximally and the other direction minimally. - // 2 - Ordinary case, get a sensible min size value using the current line - // layout, trying to maintain the possibility to re-arrange lines by - // sizing - - if ( !m_lastUsed ) - { - // Case 1 above: InformFirstDirection() has just been called - m_lastUsed = true; - - // There are two different algorithms for finding a useful min size for - // a wrap sizer, depending on whether the first reported size component - // is the opposite as our own orientation (the simpler case) or the same - // one (more complicated). - if ( m_dirInform == m_orient ) - CalcMinFromMajor(m_availSize); - else - CalcMinFromMinor(m_availSize); - } - else // Case 2 above: not immediately after InformFirstDirection() - { - if ( m_availSize > 0 ) - { - wxSize szAvail; // Keep track of boundary so we don't overflow - if ( m_dirInform == m_orient ) - szAvail = SizeFromMajorMinor(m_availSize, m_availableOtherDir); - else - szAvail = SizeFromMajorMinor(m_availableOtherDir, m_availSize); - - CalcMinFittingSize(szAvail); - } - else // Initial calculation, before we have size available to us - { - CalcMaxSingleItemSize(); - } - } - - return m_calculatedMinSize; -} - -void wxWrapSizer::CalcMinFittingSize(const wxSize& szBoundary) -{ - // Min size based on current line layout. It is important to - // provide a smaller size when possible to allow for resizing with - // the help of re-arranging the lines. - wxSize sizeMin = SizeFromMajorMinor(m_maxSizeMajor, m_minSizeMinor); - if ( m_minSizeMinor < SizeInMinorDir(m_size) && - m_maxSizeMajor < SizeInMajorDir(m_size) ) - { - m_calculatedMinSize = sizeMin; - } - else - { - // Try making it a bit more narrow - bool done = false; - if ( m_minItemMajor != INT_MAX && m_maxSizeMajor > 0 ) - { - // We try to present a lower min value by removing an item in - // the major direction (and preserving current minor min size). - CalcMinFromMajor(m_maxSizeMajor - m_minItemMajor); - if ( m_calculatedMinSize.x <= szBoundary.x && m_calculatedMinSize.y <= szBoundary.y ) - { - SizeInMinorDir(m_calculatedMinSize) = SizeInMinorDir(sizeMin); - done = true; - } - } - - if ( !done ) - { - // If failed finding little smaller area, go back to what we had - m_calculatedMinSize = sizeMin; - } - } -} - -void wxWrapSizer::CalcMaxSingleItemSize() -{ - // Find max item size in each direction - int maxMajor = 0; // Widest item - int maxMinor = 0; // Line height - for ( wxSizerItemList::const_iterator i = m_children.begin(); - i != m_children.end(); - ++i ) - { - wxSizerItem * const item = *i; - if ( item->IsShown() ) - { - wxSize sz = item->CalcMin(); - if ( SizeInMajorDir(sz) > maxMajor ) - maxMajor = SizeInMajorDir(sz); - if ( SizeInMinorDir(sz) > maxMinor ) - maxMinor = SizeInMinorDir(sz); - } - } - - // This is, of course, not our real minimal size but if we return more - // than this it would be impossible to shrink us to one row/column so - // we have to pretend that this is all we need for now. - m_calculatedMinSize = SizeFromMajorMinor(maxMajor, maxMinor); -} - -void wxWrapSizer::CalcMinFromMajor(int totMajor) -{ - // Algorithm for calculating min size: (assuming horizontal orientation) - // This is the simpler case (known major size) - // X: Given, totMajor - // Y: Based on X, calculate how many lines needed - - int maxTotalMajor = 0; // max of rowTotalMajor over all rows - int minorSum = 0; // sum of sizes of all rows in minor direction - int maxRowMinor = 0; // max of item minor sizes in this row - int rowTotalMajor = 0; // sum of major sizes of items in this row - - // pack the items in each row until we reach totMajor, then start a new row - for ( wxSizerItemList::const_iterator i = m_children.begin(); - i != m_children.end(); - ++i ) - { - wxSizerItem * const item = *i; - if ( !item->IsShown() ) - continue; - - wxSize minItemSize = item->CalcMin(); - const int itemMajor = SizeInMajorDir(minItemSize); - const int itemMinor = SizeInMinorDir(minItemSize); - - // check if this is the first item in a new row: if so, we have to put - // it in it, whether it fits or not, as it would never fit better - // anyhow - // - // otherwise check if we have enough space left for this item here - if ( !rowTotalMajor || rowTotalMajor + itemMajor <= totMajor ) - { - // continue this row - rowTotalMajor += itemMajor; - if ( itemMinor > maxRowMinor ) - maxRowMinor = itemMinor; - } - else // start a new row - { - // minor size of the row is the max of minor sizes of its items - minorSum += maxRowMinor; - if ( rowTotalMajor > maxTotalMajor ) - maxTotalMajor = rowTotalMajor; - maxRowMinor = itemMinor; - rowTotalMajor = itemMajor; - } - } - - // account for the last (unfinished) row too - minorSum += maxRowMinor; - if ( rowTotalMajor > maxTotalMajor ) - maxTotalMajor = rowTotalMajor; - - m_calculatedMinSize = SizeFromMajorMinor(maxTotalMajor, minorSum); -} - -// Helper struct for CalcMinFromMinor -struct wxWrapLine -{ - wxWrapLine() : m_first(NULL), m_width(0) { } - wxSizerItem *m_first; - int m_width; // Width of line -}; - -void wxWrapSizer::CalcMinFromMinor(int totMinor) -{ - // Algorithm for calculating min size: - // This is the more complex case (known minor size) - - // First step, find total sum of all items in primary direction - // and max item size in secondary direction, that gives initial - // estimate of the minimum number of lines. - - int totMajor = 0; // Sum of widths - int maxMinor = 0; // Line height - int maxMajor = 0; // Widest item - int itemCount = 0; - wxSizerItemList::compatibility_iterator node = m_children.GetFirst(); - wxSize sz; - while (node) - { - wxSizerItem *item = node->GetData(); - if ( item->IsShown() ) - { - sz = item->CalcMin(); - totMajor += SizeInMajorDir(sz); - if ( SizeInMinorDir(sz)>maxMinor ) - maxMinor = SizeInMinorDir(sz); - if ( SizeInMajorDir(sz)>maxMinor ) - maxMajor = SizeInMajorDir(sz); - itemCount++; - } - node = node->GetNext(); - } - - // The trivial case - if ( !itemCount || totMajor==0 || maxMinor==0 ) - { - m_calculatedMinSize = wxSize(0,0); - return; - } - - // First attempt, use lines of average size: - int nrLines = totMinor / maxMinor; // Rounding down is right here - if ( nrLines<=1 ) - { - // Another simple case, everything fits on one line - m_calculatedMinSize = SizeFromMajorMinor(totMajor,maxMinor); - return; - } - - int lineSize = totMajor / nrLines; - if ( lineSize lines; - - int sumMinor; // Sum of all minor sizes (height of all lines) - - // While we still have items 'spilling over' extend the tested line width - for ( ;; ) - { - wxWrapLine *line = new wxWrapLine; - lines.push_back( line ); - - int tailSize = 0; // Width of what exceeds nrLines - maxMinor = 0; - sumMinor = 0; - for ( node=m_children.GetFirst(); node; node=node->GetNext() ) - { - wxSizerItem *item = node->GetData(); - if ( item->IsShown() ) - { - sz = item->GetMinSizeWithBorder(); - if ( line->m_width+SizeInMajorDir(sz)>lineSize ) - { - line = new wxWrapLine; - lines.push_back(line); - sumMinor += maxMinor; - maxMinor = 0; - } - line->m_width += SizeInMajorDir(sz); - if ( line->m_width && !line->m_first ) - line->m_first = item; - if ( SizeInMinorDir(sz)>maxMinor ) - maxMinor = SizeInMinorDir(sz); - if ( sumMinor+maxMinor>totMinor ) - { - // Keep track of widest tail item - if ( SizeInMajorDir(sz)>tailSize ) - tailSize = SizeInMajorDir(sz); - } - } - } - - if ( tailSize ) - { - // Now look how much we need to extend our size - // We know we must have at least one more line than nrLines - // (otherwise no tail size). - int bestExtSize = 0; // Minimum extension width for current tailSize - for ( int ix=0; ixm_width; // Left over at end of this line - int extSize = GetSizeInMajorDir(lines[ix+1]->m_first->GetMinSizeWithBorder()) - size; - if ( (extSize>=tailSize && (extSizebestExtSize && bestExtSize::iterator it=lines.begin(); it m_maxSizeMajor ) - m_maxSizeMajor = rowMajor; - - // And adjust proportion of its last item if necessary. - AdjustLastRowItemProp(n, itemLast); -} - -void wxWrapSizer::RecalcSizes() -{ - // First restore any proportions we may have changed and remove the old rows - ClearRows(); - - if ( m_children.empty() ) - return; - - // Put all our items into as many row box sizers as needed. - const int majorSize = SizeInMajorDir(m_size); // max size of each row - int rowTotalMajor = 0; // running row major size - int maxRowMinor = 0; - - m_minSizeMinor = 0; - m_minItemMajor = INT_MAX; - m_maxSizeMajor = 0; - - // We need at least one row - size_t nRow = 0; - wxSizer *sizer = GetRowSizer(nRow); - - wxSizerItem *itemLast = NULL, // last item processed in this row - *itemSpace = NULL; // spacer which we delayed adding - - // Now put our child items into child sizers instead - for ( wxSizerItemList::iterator i = m_children.begin(); - i != m_children.end(); - ++i ) - { - wxSizerItem * const item = *i; - if ( !item->IsShown() ) - continue; - - wxSize minItemSize = item->GetMinSizeWithBorder(); - const int itemMajor = SizeInMajorDir(minItemSize); - const int itemMinor = SizeInMinorDir(minItemSize); - if ( itemMajor > 0 && itemMajor < m_minItemMajor ) - m_minItemMajor = itemMajor; - - // Is there more space on this line? Notice that if this is the first - // item we add it unconditionally as it wouldn't fit in the next line - // any better than in this one. - if ( !rowTotalMajor || rowTotalMajor + itemMajor <= majorSize ) - { - // There is enough space here - rowTotalMajor += itemMajor; - if ( itemMinor > maxRowMinor ) - maxRowMinor = itemMinor; - } - else // Start a new row - { - FinishRow(nRow, rowTotalMajor, maxRowMinor, itemLast); - - rowTotalMajor = itemMajor; - maxRowMinor = itemMinor; - - // Get a new empty sizer to insert into - sizer = GetRowSizer(++nRow); - - itemLast = - itemSpace = NULL; - } - - // Only remove first/last spaces if that flag is set - if ( (m_flags & wxREMOVE_LEADING_SPACES) && IsSpaceItem(item) ) - { - // Remember space only if we have a first item - if ( itemLast ) - itemSpace = item; - } - else // not a space - { - if ( itemLast && itemSpace ) - { - // We had a spacer after a real item and now that we add - // another real item to the same row we need to add the spacer - // between them two. - sizer->Add(itemSpace); - } - - // We must pretend that any window item is not part of this sizer, - // otherwise adding it to another one would trigger an assert due - // to a conflict with the current containing sizer. - wxWindow * const win = item->GetWindow(); - if ( win ) - win->SetContainingSizer(NULL); - - // Notice that we reuse a pointer to our own sizer item here, so we - // must remember to remove it by calling ClearRows() to avoid - // double deletion later - sizer->Add(item); - - // If item is a window, it now has a pointer to the child sizer, - // which is wrong. Set it to point to us. - if ( win ) - { - win->SetContainingSizer(NULL); - win->SetContainingSizer(this); - } - - itemLast = item; - itemSpace = NULL; - } - } - - FinishRow(nRow, rowTotalMajor, maxRowMinor, itemLast); - - // Now do layout on row sizer - m_rows.SetDimension(m_position, m_size); -} - - diff --git a/Externals/wxWidgets3/src/common/wxcrt.cpp b/Externals/wxWidgets3/src/common/wxcrt.cpp deleted file mode 100644 index 3071e58edc..0000000000 --- a/Externals/wxWidgets3/src/common/wxcrt.cpp +++ /dev/null @@ -1,1340 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/wxcrt.cpp -// Purpose: wxChar CRT wrappers implementation -// Author: Ove Kaven -// Modified by: Ron Lee, Francesco Montorsi -// Created: 09/04/99 -// Copyright: (c) wxWidgets copyright -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// =========================================================================== -// headers, declarations, constants -// =========================================================================== - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include "wx/crt.h" -#include "wx/strconv.h" // wxMBConv::cWC2MB() - -#define _ISOC9X_SOURCE 1 // to get vsscanf() -#define _BSD_SOURCE 1 // to still get strdup() - -#include -#include -#include -#include - -#ifdef __SGI__ - // wide character functions are declared in std namespace under IRIX - using namespace std; - - // and this one is only declared if __c99 is defined which is not the case - // for C++ builds, so declare it ourselves - extern "C" int vswscanf(const wchar_t *, const wchar_t *, va_list); -#endif - -#include -#include - -#ifndef WX_PRECOMP - #include "wx/string.h" - #include "wx/hash.h" - #include "wx/utils.h" // for wxMin and wxMax - #include "wx/log.h" -#endif - -#ifdef HAVE_LANGINFO_H - #include -#endif - -#include - -#if defined(__DARWIN__) - #include "wx/osx/core/cfref.h" - #include - #include "wx/osx/core/cfstring.h" - #include -#endif - -wxDECL_FOR_STRICT_MINGW32(int, vswprintf, (wchar_t*, const wchar_t*, __VALIST)) -wxDECL_FOR_STRICT_MINGW32(int, _putws, (const wchar_t*)) -wxDECL_FOR_STRICT_MINGW32(void, _wperror, (const wchar_t*)) - -WXDLLIMPEXP_BASE size_t wxMB2WC(wchar_t *buf, const char *psz, size_t n) -{ - // assume that we have mbsrtowcs() too if we have wcsrtombs() -#ifdef HAVE_WCSRTOMBS - mbstate_t mbstate; - memset(&mbstate, 0, sizeof(mbstate_t)); -#endif - - if (buf) { - if (!n || !*psz) { - if (n) *buf = wxT('\0'); - return 0; - } -#ifdef HAVE_WCSRTOMBS - return mbsrtowcs(buf, &psz, n, &mbstate); -#else - return wxMbstowcs(buf, psz, n); -#endif - } - - // Note that we rely on common (and required by Unix98 but unfortunately not - // C99) extension which allows to call mbs(r)towcs() with NULL output pointer - // to just get the size of the needed buffer -- this is needed as otherwise - // we have no idea about how much space we need. Currently all supported - // compilers do provide it and if they don't, HAVE_WCSRTOMBS shouldn't be - // defined at all. -#ifdef HAVE_WCSRTOMBS - return mbsrtowcs(NULL, &psz, 0, &mbstate); -#else - return wxMbstowcs(NULL, psz, 0); -#endif -} - -WXDLLIMPEXP_BASE size_t wxWC2MB(char *buf, const wchar_t *pwz, size_t n) -{ -#ifdef HAVE_WCSRTOMBS - mbstate_t mbstate; - memset(&mbstate, 0, sizeof(mbstate_t)); -#endif - - if (buf) { - if (!n || !*pwz) { - // glibc2.1 chokes on null input - if (n) *buf = '\0'; - return 0; - } -#ifdef HAVE_WCSRTOMBS - return wcsrtombs(buf, &pwz, n, &mbstate); -#else - return wxWcstombs(buf, pwz, n); -#endif - } - -#ifdef HAVE_WCSRTOMBS - return wcsrtombs(NULL, &pwz, 0, &mbstate); -#else - return wxWcstombs(NULL, pwz, 0); -#endif -} - -char* wxSetlocale(int category, const char *locale) -{ -#ifdef __WXMAC__ - char *rv = NULL ; - if ( locale != NULL && locale[0] == 0 ) - { - // the attempt to use newlocale(LC_ALL_MASK, "", NULL); - // here in order to deduce the language along the environment vars rules - // lead to strange crashes later... - - // we have to emulate the behaviour under OS X - wxCFRef userLocaleRef(CFLocaleCopyCurrent()); - wxCFStringRef str(wxCFRetain((CFStringRef)CFLocaleGetValue(userLocaleRef, kCFLocaleLanguageCode))); - wxString langFull = str.AsString()+"_"; - str.reset(wxCFRetain((CFStringRef)CFLocaleGetValue(userLocaleRef, kCFLocaleCountryCode))); - langFull += str.AsString(); - rv = setlocale(category, langFull.c_str()); - } - else - rv = setlocale(category, locale); -#else - char *rv = setlocale(category, locale); -#endif - if ( locale != NULL /* setting locale, not querying */ && - rv /* call was successful */ ) - { - wxUpdateLocaleIsUtf8(); - } - return rv; -} - -// ============================================================================ -// printf() functions business -// ============================================================================ - -// special test mode: define all functions below even if we don't really need -// them to be able to test them -#ifdef wxTEST_PRINTF - #undef wxFprintf - #undef wxPrintf - #undef wxSprintf - #undef wxVfprintf - #undef wxVsprintf - #undef wxVprintf - #undef wxVsnprintf_ - - #define wxNEED_WPRINTF - - int wxCRT_VfprintfW( FILE *stream, const wchar_t *format, va_list argptr ); -#endif - -// ---------------------------------------------------------------------------- -// implement the standard IO functions for wide char if libc doesn't have them -// ---------------------------------------------------------------------------- - -#ifndef wxCRT_FputsW -int wxCRT_FputsW(const wchar_t *ws, FILE *stream) -{ - wxCharBuffer buf(wxConvLibc.cWC2MB(ws)); - if ( !buf ) - return -1; - - // counting the number of wide characters written isn't worth the trouble, - // simply distinguish between ok and error - return wxCRT_FputsA(buf, stream) == -1 ? -1 : 0; -} -#endif // !wxCRT_FputsW - -#ifndef wxCRT_PutsW -int wxCRT_PutsW(const wchar_t *ws) -{ - int rc = wxCRT_FputsW(ws, stdout); - if ( rc != -1 ) - { - if ( wxCRT_FputsW(L"\n", stdout) == -1 ) - return -1; - - rc++; - } - - return rc; -} -#endif // !wxCRT_PutsW - -#ifndef wxCRT_FputcW -int /* not wint_t */ wxCRT_FputcW(wchar_t wc, FILE *stream) -{ - wchar_t ws[2] = { wc, L'\0' }; - - return wxCRT_FputsW(ws, stream); -} -#endif // !wxCRT_FputcW - -// NB: we only implement va_list functions here, the ones taking ... are -// defined below for wxNEED_PRINTF_CONVERSION case anyhow and we reuse -// the definitions there to avoid duplicating them here -#ifdef wxNEED_WPRINTF - -// TODO: implement the scanf() functions -static int vwscanf(const wchar_t *format, va_list argptr) -{ - wxFAIL_MSG( wxT("TODO") ); - - return -1; -} - -static int vfwscanf(FILE *stream, const wchar_t *format, va_list argptr) -{ - wxFAIL_MSG( wxT("TODO") ); - - return -1; -} - -#define vswprintf wxCRT_VsnprintfW - -static int vfwprintf(FILE *stream, const wchar_t *format, va_list argptr) -{ - wxString s; - int rc = s.PrintfV(format, argptr); - - if ( rc != -1 ) - { - // we can't do much better without Unicode support in libc... - if ( fprintf(stream, "%s", (const char*)s.mb_str() ) == -1 ) - return -1; - } - - return rc; -} - -static int vwprintf(const wchar_t *format, va_list argptr) -{ - return wxCRT_VfprintfW(stdout, format, argptr); -} - -#endif // wxNEED_WPRINTF - -#ifdef wxNEED_VSWSCANF -static int vswscanf(const wchar_t *ws, const wchar_t *format, va_list argptr) -{ - // The best we can do without proper Unicode support in glibc is to - // convert the strings into MB representation and run ANSI version - // of the function. This doesn't work with %c and %s because of difference - // in size of char and wchar_t, though. - - wxCHECK_MSG( wxStrstr(format, L"%s") == NULL, -1, - wxT("incomplete vswscanf implementation doesn't allow %s") ); - wxCHECK_MSG( wxStrstr(format, L"%c") == NULL, -1, - wxT("incomplete vswscanf implementation doesn't allow %c") ); - - return wxCRT_VsscanfA(static_cast(wxConvLibc.cWC2MB(ws)), - wxConvLibc.cWC2MB(format), argptr); -} -#endif - -// ---------------------------------------------------------------------------- -// wxPrintf(), wxScanf() and relatives -// ---------------------------------------------------------------------------- - -// FIXME-UTF8: do format conversion using (modified) wxFormatConverter in -// template wrappers, not here; note that it will needed to -// translate all forms of string specifiers to %(l)s for wxPrintf(), -// but it only should do what it did in 2.8 for wxScanf()! - -#ifndef wxCRT_PrintfW -int wxCRT_PrintfW( const wchar_t *format, ... ) -{ - va_list argptr; - va_start(argptr, format); - - int ret = vwprintf( format, argptr ); - - va_end(argptr); - - return ret; -} -#endif - -#ifndef wxCRT_FprintfW -int wxCRT_FprintfW( FILE *stream, const wchar_t *format, ... ) -{ - va_list argptr; - va_start( argptr, format ); - - int ret = vfwprintf( stream, format, argptr ); - - va_end(argptr); - - return ret; -} -#endif - -#ifndef wxCRT_VfprintfW -int wxCRT_VfprintfW( FILE *stream, const wchar_t *format, va_list argptr ) -{ - return vfwprintf( stream, format, argptr ); -} -#endif - -#ifndef wxCRT_VprintfW -int wxCRT_VprintfW( const wchar_t *format, va_list argptr ) -{ - return vwprintf( format, argptr ); -} -#endif - -#ifndef wxCRT_VsprintfW -int wxCRT_VsprintfW( wchar_t *str, const wchar_t *format, va_list argptr ) -{ - // same as for wxSprintf() - return vswprintf(str, INT_MAX / 4, format, argptr); -} -#endif - -#ifndef wxCRT_ScanfW -int wxCRT_ScanfW(const wchar_t *format, ...) -{ - va_list argptr; - va_start(argptr, format); - -#ifdef __VMS -#if (__DECCXX_VER >= 70100000) && !defined(__STD_CFRONT) && !defined( __NONAMESPACE_STD ) - int ret = std::vwscanf(format, argptr); -#else - int ret = vwscanf(format, argptr); -#endif -#else - int ret = vwscanf(format, argptr); -#endif - - va_end(argptr); - - return ret; -} -#endif - -#ifndef wxCRT_SscanfW -int wxCRT_SscanfW(const wchar_t *str, const wchar_t *format, ...) -{ - va_list argptr; - va_start(argptr, format); - -#ifdef __VMS -#if (__DECCXX_VER >= 70100000) && !defined(__STD_CFRONT) && !defined( __NONAMESPACE_STD ) - int ret = std::vswscanf(str, format, argptr); -#else - int ret = vswscanf(str, format, argptr); -#endif -#else - int ret = vswscanf(str, format, argptr); -#endif - - va_end(argptr); - - return ret; -} -#endif - -#ifndef wxCRT_FscanfW -int wxCRT_FscanfW(FILE *stream, const wchar_t *format, ...) -{ - va_list argptr; - va_start(argptr, format); -#ifdef __VMS -#if (__DECCXX_VER >= 70100000) && !defined(__STD_CFRONT) && !defined( __NONAMESPACE_STD ) - int ret = std::vfwscanf(stream, format, argptr); -#else - int ret = vfwscanf(stream, format, argptr); -#endif -#else - int ret = vfwscanf(stream, format, argptr); -#endif - - va_end(argptr); - - return ret; -} -#endif - -#ifndef wxCRT_VsscanfW -int wxCRT_VsscanfW(const wchar_t *str, const wchar_t *format, va_list argptr) -{ -#ifdef __VMS -#if (__DECCXX_VER >= 70100000) && !defined(__STD_CFRONT) && !defined( __NONAMESPACE_STD ) - return std::vswscanf(str, format, argptr); -#else - return vswscanf(str, format, argptr); -#endif -#else - return vswscanf(str, format, argptr); -#endif -} -#endif - - -// ---------------------------------------------------------------------------- -// wrappers to printf and scanf function families -// ---------------------------------------------------------------------------- - -#if !wxUSE_UTF8_LOCALE_ONLY -int wxDoSprintfWchar(char *str, const wxChar *format, ...) -{ - va_list argptr; - va_start(argptr, format); - - int rv = wxVsprintf(str, format, argptr); - - va_end(argptr); - return rv; -} -#endif // !wxUSE_UTF8_LOCALE_ONLY - -#if wxUSE_UNICODE_UTF8 -int wxDoSprintfUtf8(char *str, const char *format, ...) -{ - va_list argptr; - va_start(argptr, format); - - int rv = wxVsprintf(str, format, argptr); - - va_end(argptr); - return rv; -} -#endif // wxUSE_UNICODE_UTF8 - -#if wxUSE_UNICODE - -#if !wxUSE_UTF8_LOCALE_ONLY -int wxDoSprintfWchar(wchar_t *str, const wxChar *format, ...) -{ - va_list argptr; - va_start(argptr, format); - - int rv = wxVsprintf(str, format, argptr); - - va_end(argptr); - return rv; -} -#endif // !wxUSE_UTF8_LOCALE_ONLY - -#if wxUSE_UNICODE_UTF8 -int wxDoSprintfUtf8(wchar_t *str, const char *format, ...) -{ - va_list argptr; - va_start(argptr, format); - - int rv = wxVsprintf(str, format, argptr); - - va_end(argptr); - return rv; -} -#endif // wxUSE_UNICODE_UTF8 - -#endif // wxUSE_UNICODE - -#if !wxUSE_UTF8_LOCALE_ONLY -int wxDoSnprintfWchar(char *str, size_t size, const wxChar *format, ...) -{ - va_list argptr; - va_start(argptr, format); - - int rv = wxVsnprintf(str, size, format, argptr); - - va_end(argptr); - return rv; -} -#endif // !wxUSE_UTF8_LOCALE_ONLY - -#if wxUSE_UNICODE_UTF8 -int wxDoSnprintfUtf8(char *str, size_t size, const char *format, ...) -{ - va_list argptr; - va_start(argptr, format); - - int rv = wxVsnprintf(str, size, format, argptr); - - va_end(argptr); - return rv; -} -#endif // wxUSE_UNICODE_UTF8 - -#if wxUSE_UNICODE - -#if !wxUSE_UTF8_LOCALE_ONLY -int wxDoSnprintfWchar(wchar_t *str, size_t size, const wxChar *format, ...) -{ - va_list argptr; - va_start(argptr, format); - - int rv = wxVsnprintf(str, size, format, argptr); - - va_end(argptr); - return rv; -} -#endif // !wxUSE_UTF8_LOCALE_ONLY - -#if wxUSE_UNICODE_UTF8 -int wxDoSnprintfUtf8(wchar_t *str, size_t size, const char *format, ...) -{ - va_list argptr; - va_start(argptr, format); - - int rv = wxVsnprintf(str, size, format, argptr); - - va_end(argptr); - return rv; -} -#endif // wxUSE_UNICODE_UTF8 - -#endif // wxUSE_UNICODE - - -#ifdef HAVE_BROKEN_VSNPRINTF_DECL - #define vsnprintf wx_fixed_vsnprintf -#endif - -#if wxUSE_UNICODE - -namespace -{ - -#if !wxUSE_UTF8_LOCALE_ONLY -int ConvertStringToBuf(const wxString& s, char *out, size_t outsize) -{ - const wxCharBuffer buf(s.mb_str()); - - const size_t len = buf.length(); - if ( outsize > len ) - { - memcpy(out, buf, len+1); - } - else // not enough space - { - memcpy(out, buf, outsize-1); - out[outsize-1] = '\0'; - } - - return len; -} -#endif // !wxUSE_UTF8_LOCALE_ONLY - -#if wxUSE_UNICODE_UTF8 -int ConvertStringToBuf(const wxString& s, wchar_t *out, size_t outsize) -{ - const wxWX2WCbuf buf(s.wc_str()); - size_t len = s.length(); // same as buf length for wchar_t* - if ( outsize > len ) - { - memcpy(out, buf, (len+1) * sizeof(wchar_t)); - } - else // not enough space - { - memcpy(out, buf, (outsize-1) * sizeof(wchar_t)); - out[outsize-1] = 0; - } - return len; -} -#endif // wxUSE_UNICODE_UTF8 - -} // anonymous namespace - -template -static size_t PrintfViaString(T *out, size_t outsize, - const wxString& format, va_list argptr) -{ - wxString s; - s.PrintfV(format, argptr); - - return ConvertStringToBuf(s, out, outsize); -} -#endif // wxUSE_UNICODE - -int wxVsprintf(char *str, const wxString& format, va_list argptr) -{ -#if wxUSE_UTF8_LOCALE_ONLY - return wxCRT_VsprintfA(str, format.wx_str(), argptr); -#else - #if wxUSE_UNICODE_UTF8 - if ( wxLocaleIsUtf8 ) - return wxCRT_VsprintfA(str, format.wx_str(), argptr); - else - #endif - #if wxUSE_UNICODE - return PrintfViaString(str, wxNO_LEN, format, argptr); - #else - return wxCRT_VsprintfA(str, format.mb_str(), argptr); - #endif -#endif -} - -#if wxUSE_UNICODE -int wxVsprintf(wchar_t *str, const wxString& format, va_list argptr) -{ -#if wxUSE_UNICODE_WCHAR - return wxCRT_VsprintfW(str, format.wc_str(), argptr); -#else // wxUSE_UNICODE_UTF8 - #if !wxUSE_UTF8_LOCALE_ONLY - if ( !wxLocaleIsUtf8 ) - return wxCRT_VsprintfW(str, format.wc_str(), argptr); - else - #endif - return PrintfViaString(str, wxNO_LEN, format, argptr); -#endif // wxUSE_UNICODE_UTF8 -} -#endif // wxUSE_UNICODE - -int wxVsnprintf(char *str, size_t size, const wxString& format, va_list argptr) -{ - int rv; -#if wxUSE_UTF8_LOCALE_ONLY - rv = wxCRT_VsnprintfA(str, size, format.wx_str(), argptr); -#else - #if wxUSE_UNICODE_UTF8 - if ( wxLocaleIsUtf8 ) - rv = wxCRT_VsnprintfA(str, size, format.wx_str(), argptr); - else - #endif - #if wxUSE_UNICODE - { - // NB: if this code is called, then wxString::PrintV() would use the - // wchar_t* version of wxVsnprintf(), so it's safe to use PrintV() - // from here - rv = PrintfViaString(str, size, format, argptr); - } - #else - rv = wxCRT_VsnprintfA(str, size, format.mb_str(), argptr); - #endif -#endif - - // VsnprintfTestCase reveals that glibc's implementation of vswprintf - // doesn't nul terminate on truncation. - str[size - 1] = 0; - - return rv; -} - -#if wxUSE_UNICODE -int wxVsnprintf(wchar_t *str, size_t size, const wxString& format, va_list argptr) -{ - int rv; - -#if wxUSE_UNICODE_WCHAR - rv = wxCRT_VsnprintfW(str, size, format.wc_str(), argptr); -#else // wxUSE_UNICODE_UTF8 - #if !wxUSE_UTF8_LOCALE_ONLY - if ( !wxLocaleIsUtf8 ) - rv = wxCRT_VsnprintfW(str, size, format.wc_str(), argptr); - else - #endif - { - // NB: if this code is called, then wxString::PrintV() would use the - // char* version of wxVsnprintf(), so it's safe to use PrintV() - // from here - rv = PrintfViaString(str, size, format, argptr); - } -#endif // wxUSE_UNICODE_UTF8 - - // VsnprintfTestCase reveals that glibc's implementation of vswprintf - // doesn't nul terminate on truncation. - str[size - 1] = 0; - - return rv; -} -#endif // wxUSE_UNICODE - - -// ---------------------------------------------------------------------------- -// ctype.h stuff (currently unused) -// ---------------------------------------------------------------------------- - -#ifndef wxCRT_StrdupA -WXDLLIMPEXP_BASE char *wxCRT_StrdupA(const char *s) -{ - return strcpy((char *)malloc(strlen(s) + 1), s); -} -#endif // wxCRT_StrdupA - -#ifndef wxCRT_StrdupW -WXDLLIMPEXP_BASE wchar_t * wxCRT_StrdupW(const wchar_t *pwz) -{ - size_t size = (wxWcslen(pwz) + 1) * sizeof(wchar_t); - wchar_t *ret = (wchar_t *) malloc(size); - memcpy(ret, pwz, size); - return ret; -} -#endif // wxCRT_StrdupW - -#ifndef wxWCHAR_T_IS_WXCHAR16 -size_t wxStrlen(const wxChar16 *s ) -{ - if (!s) return 0; - size_t i=0; - while (*s!=0) { ++i; ++s; }; - return i; -} - -wxChar16* wxStrdup(const wxChar16* s) -{ - size_t size = (wxStrlen(s) + 1) * sizeof(wxChar16); - wxChar16 *ret = (wxChar16*) malloc(size); - memcpy(ret, s, size); - return ret; -} -#endif - -#ifndef wxWCHAR_T_IS_WXCHAR32 -size_t wxStrlen(const wxChar32 *s ) -{ - if (!s) return 0; - size_t i=0; - while (*s!=0) { ++i; ++s; }; - return i; -} - -wxChar32* wxStrdup(const wxChar32* s) -{ - size_t size = (wxStrlen(s) + 1) * sizeof(wxChar32); - wxChar32 *ret = (wxChar32*) malloc(size); - if ( ret ) - memcpy(ret, s, size); - return ret; -} -#endif - -#ifndef wxCRT_StricmpA -WXDLLIMPEXP_BASE int wxCRT_StricmpA(const char *psz1, const char *psz2) -{ - char c1, c2; - do { - c1 = wxTolower(*psz1++); - c2 = wxTolower(*psz2++); - } while ( c1 && (c1 == c2) ); - return c1 - c2; -} -#endif // !defined(wxCRT_StricmpA) - -#ifndef wxCRT_StricmpW -WXDLLIMPEXP_BASE int wxCRT_StricmpW(const wchar_t *psz1, const wchar_t *psz2) -{ - wchar_t c1, c2; - do { - c1 = wxTolower(*psz1++); - c2 = wxTolower(*psz2++); - } while ( c1 && (c1 == c2) ); - return c1 - c2; -} -#endif // !defined(wxCRT_StricmpW) - -#ifndef wxCRT_StrnicmpA -WXDLLIMPEXP_BASE int wxCRT_StrnicmpA(const char *s1, const char *s2, size_t n) -{ - // initialize the variables just to suppress stupid gcc warning - char c1 = 0, c2 = 0; - while (n && ((c1 = wxTolower(*s1)) == (c2 = wxTolower(*s2)) ) && c1) n--, s1++, s2++; - if (n) { - if (c1 < c2) return -1; - if (c1 > c2) return 1; - } - return 0; -} -#endif // !defined(wxCRT_StrnicmpA) - -#ifndef wxCRT_StrnicmpW -WXDLLIMPEXP_BASE int wxCRT_StrnicmpW(const wchar_t *s1, const wchar_t *s2, size_t n) -{ - // initialize the variables just to suppress stupid gcc warning - wchar_t c1 = 0, c2 = 0; - while (n && ((c1 = wxTolower(*s1)) == (c2 = wxTolower(*s2)) ) && c1) n--, s1++, s2++; - if (n) { - if (c1 < c2) return -1; - if (c1 > c2) return 1; - } - return 0; -} -#endif // !defined(wxCRT_StrnicmpW) - -// ---------------------------------------------------------------------------- -// string.h functions -// ---------------------------------------------------------------------------- - -// this (and wxCRT_StrncmpW below) are extern "C" because they are needed -// by regex code, the rest isn't needed, so it's not declared as extern "C" -#ifndef wxCRT_StrlenW -extern "C" WXDLLIMPEXP_BASE size_t wxCRT_StrlenW(const wchar_t *s) -{ - size_t n = 0; - while ( *s++ ) - n++; - - return n; -} -#endif - -// ---------------------------------------------------------------------------- -// stdlib.h functions -// ---------------------------------------------------------------------------- - -#ifndef wxCRT_GetenvW -WXDLLIMPEXP_BASE wchar_t* wxCRT_GetenvW(const wchar_t *name) -{ - // NB: buffer returned by getenv() is allowed to be overwritten next - // time getenv() is called, so it is OK to use static string - // buffer to hold the data. - static wxWCharBuffer value; - value = wxConvLibc.cMB2WC(getenv(wxConvLibc.cWC2MB(name))); - return value.data(); -} -#endif // !wxCRT_GetenvW - -#ifndef wxCRT_StrftimeW -WXDLLIMPEXP_BASE size_t -wxCRT_StrftimeW(wchar_t *s, size_t maxsize, const wchar_t *fmt, const struct tm *tm) -{ - if ( !maxsize ) - return 0; - - wxCharBuffer buf(maxsize); - - wxCharBuffer bufFmt(wxConvLibc.cWX2MB(fmt)); - if ( !bufFmt ) - return 0; - - size_t ret = strftime(buf.data(), maxsize, bufFmt, tm); - if ( !ret ) - return 0; - - wxWCharBuffer wbuf = wxConvLibc.cMB2WX(buf); - if ( !wbuf ) - return 0; - - wxCRT_StrncpyW(s, wbuf, maxsize); - return wxCRT_StrlenW(s); -} -#endif // !wxCRT_StrftimeW - -#ifdef wxLongLong_t -template -static wxULongLong_t -wxCRT_StrtoullBase(const T* nptr, T** endptr, int base, T* sign) -{ - wxULongLong_t sum = 0; - wxString wxstr(nptr); - wxString::const_iterator i = wxstr.begin(); - wxString::const_iterator end = wxstr.end(); - - // Skip spaces - while ( i != end && wxIsspace(*i) ) ++i; - - // Starts with sign? - *sign = wxT(' '); - if ( i != end ) - { - T c = *i; - if ( c == wxT('+') || c == wxT('-') ) - { - *sign = c; - ++i; - } - } - - // Starts with octal or hexadecimal prefix? - if ( i != end && *i == wxT('0') ) - { - ++i; - if ( i != end ) - { - if ( (*i == wxT('x')) || (*i == wxT('X')) ) - { - // Hexadecimal prefix: use base 16 if auto-detecting. - if ( base == 0 ) - base = 16; - - // If we do use base 16, just skip "x" as well. - if ( base == 16 ) - { - ++i; - } - else // Not using base 16 - { - // Then it's an error. - if ( endptr ) - *endptr = (T*) nptr; - errno = EINVAL; - return sum; - } - } - else if ( base == 0 ) - { - base = 8; - } - } - else - --i; - } - - if ( base == 0 ) - base = 10; - - for ( ; i != end; ++i ) - { - unsigned int n; - - T c = *i; - if ( c >= '0' ) - { - if ( c <= '9' ) - n = c - wxT('0'); - else - n = wxTolower(c) - wxT('a') + 10; - } - else - break; - - if ( n >= (unsigned int)base ) - // Invalid character (for this base) - break; - - wxULongLong_t prevsum = sum; - sum = (sum * base) + n; - - if ( sum < prevsum ) - { - errno = ERANGE; - break; - } - } - - if ( endptr ) - { - *endptr = (T*)(nptr + (i - wxstr.begin())); - } - - return sum; -} - -template -static wxULongLong_t wxCRT_DoStrtoull(const T* nptr, T** endptr, int base) -{ - T sign; - wxULongLong_t uval = ::wxCRT_StrtoullBase(nptr, endptr, base, &sign); - - if ( sign == wxT('-') ) - { - errno = ERANGE; - uval = 0; - } - - return uval; -} - -template -static wxLongLong_t wxCRT_DoStrtoll(const T* nptr, T** endptr, int base) -{ - T sign; - wxULongLong_t uval = ::wxCRT_StrtoullBase(nptr, endptr, base, &sign); - wxLongLong_t val = 0; - - if ( sign == wxT('-') ) - { - if (uval <= (wxULongLong_t)wxINT64_MAX + 1) - { - val = -(wxLongLong_t)uval; - } - else - { - errno = ERANGE; - } - } - else if ( uval <= wxINT64_MAX ) - { - val = uval; - } - else - { - errno = ERANGE; - } - - return val; -} - -#ifndef wxCRT_StrtollA -wxLongLong_t wxCRT_StrtollA(const char* nptr, char** endptr, int base) - { return wxCRT_DoStrtoll(nptr, endptr, base); } -#endif -#ifndef wxCRT_StrtollW -wxLongLong_t wxCRT_StrtollW(const wchar_t* nptr, wchar_t** endptr, int base) - { return wxCRT_DoStrtoll(nptr, endptr, base); } -#endif - -#ifndef wxCRT_StrtoullA -wxULongLong_t wxCRT_StrtoullA(const char* nptr, char** endptr, int base) - { return wxCRT_DoStrtoull(nptr, endptr, base); } -#endif -#ifndef wxCRT_StrtoullW -wxULongLong_t wxCRT_StrtoullW(const wchar_t* nptr, wchar_t** endptr, int base) - { return wxCRT_DoStrtoull(nptr, endptr, base); } -#endif - -#endif // wxLongLong_t - -// ---------------------------------------------------------------------------- -// strtok() functions -// ---------------------------------------------------------------------------- - -template -static T *wxCRT_DoStrtok(T *psz, const T *delim, T **save_ptr) -{ - if (!psz) - { - psz = *save_ptr; - if ( !psz ) - return NULL; - } - - psz += wxStrspn(psz, delim); - if (!*psz) - { - *save_ptr = NULL; - return NULL; - } - - T *ret = psz; - psz = wxStrpbrk(psz, delim); - if (!psz) - { - *save_ptr = NULL; - } - else - { - *psz = wxT('\0'); - *save_ptr = psz + 1; - } - - return ret; -} - -#ifndef wxCRT_StrtokA -char *wxCRT_StrtokA(char *psz, const char *delim, char **save_ptr) - { return wxCRT_DoStrtok(psz, delim, save_ptr); } -#endif -#ifndef wxCRT_StrtokW -wchar_t *wxCRT_StrtokW(wchar_t *psz, const wchar_t *delim, wchar_t **save_ptr) - { return wxCRT_DoStrtok(psz, delim, save_ptr); } -#endif - -// ---------------------------------------------------------------------------- -// missing C RTL functions -// ---------------------------------------------------------------------------- - -#ifdef wxNEED_STRDUP - -char *strdup(const char *s) -{ - char *dest = (char*) malloc( strlen( s ) + 1 ) ; - if ( dest ) - strcpy( dest , s ) ; - return dest ; -} -#endif // wxNEED_STRDUP - -// ============================================================================ -// wxLocaleIsUtf8 -// ============================================================================ - -#if wxUSE_UNICODE_UTF8 - -#if !wxUSE_UTF8_LOCALE_ONLY -bool wxLocaleIsUtf8 = false; // the safer setting if not known -#endif - -static bool wxIsLocaleUtf8() -{ - // NB: we intentionally don't use wxLocale::GetSystemEncodingName(), - // because a) it may be unavailable in some builds and b) has slightly - // different semantics (default locale instead of current) - -#if defined(HAVE_LANGINFO_H) && defined(CODESET) - // GNU libc provides current character set this way (this conforms to - // Unix98) - const char *charset = nl_langinfo(CODESET); - if ( charset ) - { - // "UTF-8" is used by modern glibc versions, but test other variants - // as well, just in case: - if ( strcmp(charset, "UTF-8") == 0 || - strcmp(charset, "utf-8") == 0 || - strcmp(charset, "UTF8") == 0 || - strcmp(charset, "utf8") == 0 ) - { - return true; - } - } -#endif // HAVE_LANGINFO_H - - // check if we're running under the "C" locale: it is 7bit subset - // of UTF-8, so it can be safely used with the UTF-8 build: - const char *lc_ctype = setlocale(LC_CTYPE, NULL); - if ( lc_ctype && - (strcmp(lc_ctype, "C") == 0 || strcmp(lc_ctype, "POSIX") == 0) ) - { - return true; - } - - // we don't know what charset libc is using, so assume the worst - // to be safe: - return false; -} - -void wxUpdateLocaleIsUtf8() -{ -#if wxUSE_UTF8_LOCALE_ONLY - if ( !wxIsLocaleUtf8() ) - { - wxLogFatalError(wxT("This program requires UTF-8 locale to run.")); - } -#else // !wxUSE_UTF8_LOCALE_ONLY - wxLocaleIsUtf8 = wxIsLocaleUtf8(); -#endif -} - -#endif // wxUSE_UNICODE_UTF8 - -// ============================================================================ -// wx wrappers for CRT functions -// ============================================================================ - -#if wxUSE_UNICODE_WCHAR - #define CALL_ANSI_OR_UNICODE(return_kw, callA, callW) return_kw callW -#elif wxUSE_UNICODE_UTF8 && !wxUSE_UTF8_LOCALE_ONLY - #define CALL_ANSI_OR_UNICODE(return_kw, callA, callW) \ - return_kw wxLocaleIsUtf8 ? callA : callW -#else // ANSI or UTF8 only - #define CALL_ANSI_OR_UNICODE(return_kw, callA, callW) return_kw callA -#endif - -int wxPuts(const wxString& s) -{ - // under IRIX putws() takes a non-const argument so use wchar_str() instead - // of wc_str() - CALL_ANSI_OR_UNICODE(return, - wxCRT_PutsA(s.mb_str()), - wxCRT_PutsW(s.wchar_str())); -} - -int wxFputs(const wxString& s, FILE *stream) -{ - CALL_ANSI_OR_UNICODE(return, - wxCRT_FputsA(s.mb_str(), stream), - wxCRT_FputsW(s.wc_str(), stream)); -} - -int wxFputc(const wxUniChar& c, FILE *stream) -{ -#if !wxUSE_UNICODE // FIXME-UTF8: temporary, remove this with ANSI build - return wxCRT_FputcA((char)c, stream); -#else - CALL_ANSI_OR_UNICODE(return, - wxCRT_FputsA(c.AsUTF8(), stream), - wxCRT_FputcW((wchar_t)c, stream)); -#endif -} - -#ifdef wxCRT_PerrorA - -void wxPerror(const wxString& s) -{ -#ifdef wxCRT_PerrorW - CALL_ANSI_OR_UNICODE(wxEMPTY_PARAMETER_VALUE, - wxCRT_PerrorA(s.mb_str()), - wxCRT_PerrorW(s.wc_str())); -#else - wxCRT_PerrorA(s.mb_str()); -#endif -} - -#endif // wxCRT_PerrorA - -wchar_t *wxFgets(wchar_t *s, int size, FILE *stream) -{ - wxCHECK_MSG( s, NULL, "empty buffer passed to wxFgets()" ); - - wxCharBuffer buf(size - 1); - // FIXME: this reads too little data if wxConvLibc uses UTF-8 ('size' wide - // characters may be encoded by up to 'size'*4 bytes), but what - // else can we do? - if ( wxFgets(buf.data(), size, stream) == NULL ) - return NULL; - - if ( wxConvLibc.ToWChar(s, size, buf, wxNO_LEN) == wxCONV_FAILED ) - return NULL; - - return s; -} - -// ---------------------------------------------------------------------------- -// wxScanf() and friends -// ---------------------------------------------------------------------------- - -#ifdef HAVE_VSSCANF // __VISUALC__, see wx/crt.h -int wxVsscanf(const char *str, const char *format, va_list ap) - { return wxCRT_VsscanfA(str, format, ap); } -int wxVsscanf(const wchar_t *str, const wchar_t *format, va_list ap) - { return wxCRT_VsscanfW(str, format, ap); } -int wxVsscanf(const wxCharBuffer& str, const char *format, va_list ap) - { return wxCRT_VsscanfA(static_cast(str), format, ap); } -int wxVsscanf(const wxWCharBuffer& str, const wchar_t *format, va_list ap) - { return wxCRT_VsscanfW(str, format, ap); } -int wxVsscanf(const wxString& str, const char *format, va_list ap) - { return wxCRT_VsscanfA(static_cast(str.mb_str()), format, ap); } -int wxVsscanf(const wxString& str, const wchar_t *format, va_list ap) - { return wxCRT_VsscanfW(str.wc_str(), format, ap); } -int wxVsscanf(const wxCStrData& str, const char *format, va_list ap) - { return wxCRT_VsscanfA(static_cast(str.AsCharBuf()), format, ap); } -int wxVsscanf(const wxCStrData& str, const wchar_t *format, va_list ap) - { return wxCRT_VsscanfW(str.AsWCharBuf(), format, ap); } -#endif // HAVE_NO_VSSCANF - -// ============================================================================ -// ANDROID specific private implementations (due stubs/missing support in NDK) -// ============================================================================ - -// On android, most wchar_t functions are broken, so instead we must -// convert a byte at a time - -#ifdef __ANDROID__ - -#define ANDROID_WCSTO_START \ - int len = wcslen(nptr) + 1; \ - char dst[len]; \ - for(int i=0; i -static int wxCopyStrWithPercents( - size_t maxOut, - CharType *dest, - size_t maxIn, - const CharType *source) -{ - size_t written = 0; - - if (maxIn == 0) - return 0; - - size_t i; - for ( i = 0; i < maxIn-1 && written < maxOut; source++, i++) - { - dest[written++] = *source; - if (*(source+1) == wxT('%')) - { - // skip this additional '%' character - source++; - i++; - } - } - - if (i < maxIn && written < maxOut) - // copy last character inconditionally - dest[written++] = *source; - - return written; -} - -template -static int wxDoVsnprintf(CharType *buf, size_t lenMax, - const CharType *format, va_list argptr) -{ - // useful for debugging, to understand if we are really using this function - // rather than the system implementation -#if 0 - wprintf(L"Using wxCRT_VsnprintfW\n"); -#endif - - wxPrintfConvSpecParser parser(format); - - wxPrintfArg argdata[wxMAX_SVNPRINTF_ARGUMENTS]; - - size_t i; - - // number of characters in the buffer so far, must be less than lenMax - size_t lenCur = 0; - - if (parser.posarg_present && parser.nonposarg_present) - { - buf[0] = 0; - return -1; // format strings with both positional and - } // non-positional conversion specifier are unsupported !! - - // on platforms where va_list is an array type, it is necessary to make a - // copy to be able to pass it to LoadArg as a reference. - bool ok = true; - va_list ap; - wxVaCopy(ap, argptr); - - // now load arguments from stack - for (i=0; i < parser.nargs && ok; i++) - { - // !pspec[i] means that the user forgot a positional parameter (e.g. %$1s %$3s); - // LoadArg == false means that wxPrintfConvSpec::Parse failed to set the - // conversion specifier 'type' to a valid value... - ok = parser.pspec[i] && parser.pspec[i]->LoadArg(&argdata[i], ap); - } - - va_end(ap); - - // something failed while loading arguments from the variable list... - // (e.g. the user repeated twice the same positional argument) - if (!ok) - { - buf[0] = 0; - return -1; - } - - // finally, process each conversion specifier with its own argument - const CharType *toparse = format; - for (i=0; i < parser.nargs; i++) - { - wxPrintfConvSpec& spec = parser.specs[i]; - - // skip any asterisks, they're processed as part of the conversion they - // apply to - if ( spec.m_type == wxPAT_STAR ) - continue; - - // copy in the output buffer the portion of the format string between - // last specifier and the current one - size_t tocopy = ( spec.m_pArgPos - toparse ); - - lenCur += wxCopyStrWithPercents(lenMax - lenCur, buf + lenCur, - tocopy, toparse); - if (lenCur == lenMax) - { - buf[lenMax - 1] = 0; - return lenMax+1; // not enough space in the output buffer ! - } - - // process this specifier directly in the output buffer - int n = spec.Process(buf+lenCur, lenMax - lenCur, - &argdata[spec.m_pos], lenCur); - if (n == -1) - { - buf[lenMax-1] = wxT('\0'); // be sure to always NUL-terminate the string - return lenMax+1; // not enough space in the output buffer ! - } - lenCur += n; - - // the +1 is because wxPrintfConvSpec::m_pArgEnd points to the last character - // of the format specifier, but we are not interested to it... - toparse = spec.m_pArgEnd + 1; - } - - // copy portion of the format string after last specifier - // NOTE: toparse is pointing to the character just after the last processed - // conversion specifier - // NOTE2: the +1 is because we want to copy also the '\0' - size_t tocopy = wxStrlen(format) + 1 - ( toparse - format ) ; - - lenCur += wxCopyStrWithPercents(lenMax - lenCur, buf + lenCur, - tocopy, toparse) - 1; - if (buf[lenCur]) - { - buf[lenCur] = 0; - return lenMax+1; // not enough space in the output buffer ! - } - - // Don't do: - // wxASSERT(lenCur == wxStrlen(buf)); - // in fact if we embedded NULLs in the output buffer (using %c with a '\0') - // such check would fail - - return lenCur; -} - -#endif // !defined(wxCRT_VsnprintfW) || !defined(wxCRT_VsnprintfA) - -// ---------------------------------------------------------------------------- -// wxCRT_VsnprintfW -// ---------------------------------------------------------------------------- - -#if !defined(wxCRT_VsnprintfW) - -#if !wxUSE_WXVSNPRINTFW - #error "wxUSE_WXVSNPRINTFW must be 1 if our wxCRT_VsnprintfW is used" -#endif - -int wxCRT_VsnprintfW(wchar_t *buf, size_t len, - const wchar_t *format, va_list argptr) -{ - return wxDoVsnprintf(buf, len, format, argptr); -} - -#else // wxCRT_VsnprintfW is defined - -#if wxUSE_WXVSNPRINTFW - #error "wxUSE_WXVSNPRINTFW must be 0 if our wxCRT_VsnprintfW is not used" -#endif - -#endif // !wxCRT_VsnprintfW - -// ---------------------------------------------------------------------------- -// wxCRT_VsnprintfA -// ---------------------------------------------------------------------------- - -#ifndef wxCRT_VsnprintfA - -#if !wxUSE_WXVSNPRINTFA - #error "wxUSE_WXVSNPRINTFA must be 1 if our wxCRT_VsnprintfA is used" -#endif - -int wxCRT_VsnprintfA(char *buf, size_t len, - const char *format, va_list argptr) -{ - return wxDoVsnprintf(buf, len, format, argptr); -} - -#else // wxCRT_VsnprintfA is defined - -#if wxUSE_WXVSNPRINTFA - #error "wxUSE_WXVSNPRINTFA must be 0 if our wxCRT_VsnprintfA is not used" -#endif - -#endif // !wxCRT_VsnprintfA diff --git a/Externals/wxWidgets3/src/common/xlocale.cpp b/Externals/wxWidgets3/src/common/xlocale.cpp deleted file mode 100644 index 02c9d2ca2d..0000000000 --- a/Externals/wxWidgets3/src/common/xlocale.cpp +++ /dev/null @@ -1,372 +0,0 @@ -////////////////////////////////////////////////////////////////////////////// -// Name: src/common/xlocale.cpp -// Purpose: xlocale wrappers/impl to provide some xlocale wrappers -// Author: Brian Vanderburg II, Vadim Zeitlin -// Created: 2008-01-07 -// Copyright: (c) 2008 Brian Vanderburg II -// 2008 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_XLOCALE - -#ifndef WX_PRECOMP - #include "wx/module.h" -#endif - -#include "wx/xlocale.h" - -#include -#include - -// ---------------------------------------------------------------------------- -// module globals -// ---------------------------------------------------------------------------- - -// This is the C locale object, it is created on demand -static wxXLocale *gs_cLocale = NULL; - -wxXLocale wxNullXLocale; - - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// Module for gs_cLocale cleanup -// ---------------------------------------------------------------------------- - -class wxXLocaleModule : public wxModule -{ -public: - virtual bool OnInit() wxOVERRIDE { return true; } - virtual void OnExit() wxOVERRIDE { wxDELETE(gs_cLocale); } - - wxDECLARE_DYNAMIC_CLASS(wxXLocaleModule); -}; - -wxIMPLEMENT_DYNAMIC_CLASS(wxXLocaleModule, wxModule); - - -// ============================================================================ -// wxXLocale implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// common parts -// ---------------------------------------------------------------------------- - -// Get the C locale -wxXLocale& wxXLocale::GetCLocale() -{ - if ( !gs_cLocale ) - { - // Notice that we need a separate variable because clang 3.1 refuses to - // cast nullptr (which is how NULL is defined in it) to anything. - static wxXLocaleCTag* const tag = NULL; - gs_cLocale = new wxXLocale(tag); - } - - return *gs_cLocale; -} - -#ifdef wxHAS_XLOCALE_SUPPORT - -#if wxUSE_INTL -wxXLocale::wxXLocale(wxLanguage lang) -{ - const wxLanguageInfo * const info = wxLocale::GetLanguageInfo(lang); - if ( !info ) - { - m_locale = NULL; - } - else - { - Init(info->GetLocaleName().c_str()); - } -} -#endif // wxUSE_INTL - -#if wxCHECK_VISUALC_VERSION(8) - -// ---------------------------------------------------------------------------- -// implementation using MSVC locale API -// ---------------------------------------------------------------------------- - -void wxXLocale::Init(const char *loc) -{ - if (!loc || *loc == '\0') - return; - - m_locale = _create_locale(LC_ALL, loc); -} - -void wxXLocale::Free() -{ - if ( m_locale ) - _free_locale(m_locale); -} - -#elif defined(HAVE_LOCALE_T) - -// ---------------------------------------------------------------------------- -// implementation using xlocale API -// ---------------------------------------------------------------------------- - -void wxXLocale::Init(const char *loc) -{ - if (!loc || *loc == '\0') - return; - - m_locale = newlocale(LC_ALL_MASK, loc, NULL); - if (!m_locale) - { - // NOTE: here we do something similar to what wxSetLocaleTryUTF8() does - // in wxLocale code (but with newlocale() calls instead of wxSetlocale()) - wxString buf(loc); - wxString buf2; - buf2 = buf + wxS(".UTF-8"); - m_locale = newlocale(LC_ALL_MASK, buf2.c_str(), NULL); - if ( !m_locale ) - { - buf2 = buf + wxS(".utf-8"); - m_locale = newlocale(LC_ALL_MASK, buf2.c_str(), NULL); - } - if ( !m_locale ) - { - buf2 = buf + wxS(".UTF8"); - m_locale = newlocale(LC_ALL_MASK, buf2.c_str(), NULL); - } - if ( !m_locale ) - { - buf2 = buf + wxS(".utf8"); - m_locale = newlocale(LC_ALL_MASK, buf2.c_str(), NULL); - } - } - - // TODO: wxLocale performs many more manipulations of the given locale - // string in the attempt to set a valid locale; reusing that code - // (changing it to take a generic wxTryLocale callback) would be nice -} - -void wxXLocale::Free() -{ - if ( m_locale ) - freelocale(m_locale); -} - -#else - #error "Unknown xlocale support." -#endif - -#endif // wxHAS_XLOCALE_SUPPORT - -#ifndef wxHAS_XLOCALE_SUPPORT - -// ============================================================================ -// Implementation of wxFoo_l() functions for "C" locale without xlocale support -// ============================================================================ - -// ---------------------------------------------------------------------------- -// character classification and transformation functions -// ---------------------------------------------------------------------------- - -// lookup table and macros for character type functions -#define CTYPE_ALNUM 0x0001 -#define CTYPE_ALPHA 0x0002 -#define CTYPE_CNTRL 0x0004 -#define CTYPE_DIGIT 0x0008 -#define CTYPE_GRAPH 0x0010 -#define CTYPE_LOWER 0x0020 -#define CTYPE_PRINT 0x0040 -#define CTYPE_PUNCT 0x0080 -#define CTYPE_SPACE 0x0100 -#define CTYPE_UPPER 0x0200 -#define CTYPE_XDIGIT 0x0400 - -static const unsigned int gs_lookup[] = -{ - 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, - 0x0004, 0x0104, 0x0104, 0x0104, 0x0104, 0x0104, 0x0004, 0x0004, - 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, - 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, - 0x0140, 0x00D0, 0x00D0, 0x00D0, 0x00D0, 0x00D0, 0x00D0, 0x00D0, - 0x00D0, 0x00D0, 0x00D0, 0x00D0, 0x00D0, 0x00D0, 0x00D0, 0x00D0, - 0x0459, 0x0459, 0x0459, 0x0459, 0x0459, 0x0459, 0x0459, 0x0459, - 0x0459, 0x0459, 0x00D0, 0x00D0, 0x00D0, 0x00D0, 0x00D0, 0x00D0, - 0x00D0, 0x0653, 0x0653, 0x0653, 0x0653, 0x0653, 0x0653, 0x0253, - 0x0253, 0x0253, 0x0253, 0x0253, 0x0253, 0x0253, 0x0253, 0x0253, - 0x0253, 0x0253, 0x0253, 0x0253, 0x0253, 0x0253, 0x0253, 0x0253, - 0x0253, 0x0253, 0x0253, 0x00D0, 0x00D0, 0x00D0, 0x00D0, 0x00D0, - 0x00D0, 0x0473, 0x0473, 0x0473, 0x0473, 0x0473, 0x0473, 0x0073, - 0x0073, 0x0073, 0x0073, 0x0073, 0x0073, 0x0073, 0x0073, 0x0073, - 0x0073, 0x0073, 0x0073, 0x0073, 0x0073, 0x0073, 0x0073, 0x0073, - 0x0073, 0x0073, 0x0073, 0x00D0, 0x00D0, 0x00D0, 0x00D0, 0x0004 -}; - - -#define CTYPE_TEST(c, t) ( (c) <= 127 && (gs_lookup[(c)] & (t)) ) - - -// ctype functions -#define GEN_ISFUNC(name, test) \ -int name(const wxUniChar& c, const wxXLocale& loc) \ -{ \ - wxCHECK(loc.IsOk(), false); \ - return CTYPE_TEST(c.GetValue(), test); \ -} - -GEN_ISFUNC(wxIsalnum_l, CTYPE_ALNUM) -GEN_ISFUNC(wxIsalpha_l, CTYPE_ALPHA) -GEN_ISFUNC(wxIscntrl_l, CTYPE_CNTRL) -GEN_ISFUNC(wxIsdigit_l, CTYPE_DIGIT) -GEN_ISFUNC(wxIsgraph_l, CTYPE_GRAPH) -GEN_ISFUNC(wxIslower_l, CTYPE_LOWER) -GEN_ISFUNC(wxIsprint_l, CTYPE_PRINT) -GEN_ISFUNC(wxIspunct_l, CTYPE_PUNCT) -GEN_ISFUNC(wxIsspace_l, CTYPE_SPACE) -GEN_ISFUNC(wxIsupper_l, CTYPE_UPPER) -GEN_ISFUNC(wxIsxdigit_l, CTYPE_XDIGIT) - -int wxTolower_l(const wxUniChar& c, const wxXLocale& loc) -{ - wxCHECK(loc.IsOk(), false); - - if(CTYPE_TEST(c.GetValue(), CTYPE_UPPER)) - { - return c - 'A' + 'a'; - } - - return c; -} - -int wxToupper_l(const wxUniChar& c, const wxXLocale& loc) -{ - wxCHECK(loc.IsOk(), false); - - if(CTYPE_TEST(c.GetValue(), CTYPE_LOWER)) - { - return c - 'a' + 'A'; - } - - return c; -} - - -// ---------------------------------------------------------------------------- -// string --> number conversion functions -// ---------------------------------------------------------------------------- - -/* - WARNING: the implementation of the wxStrtoX_l() functions below is unsafe - in a multi-threaded environment as we temporary change the locale - and if in the meanwhile an other thread performs some locale-dependent - operation, it may get unexpected results... - However this is the best we can do without reinventing the wheel in the - case !wxHAS_XLOCALE_SUPPORT... -*/ - -namespace -{ - -// Helper class that changes LC_NUMERIC facet of the global locale in its ctor -// to "C" locale and restores it in its dtor later. -class CNumericLocaleSetter -{ -public: - CNumericLocaleSetter() - : m_oldLocale(wxStrdupA(setlocale(LC_NUMERIC, NULL))) - { - if ( !wxSetlocale(LC_NUMERIC, "C") ) - { - // Setting locale to "C" should really always work. - wxFAIL_MSG( wxS("Couldn't set LC_NUMERIC to \"C\"") ); - } - } - - ~CNumericLocaleSetter() - { - wxSetlocale(LC_NUMERIC, m_oldLocale); - free(m_oldLocale); - } - -private: - char * const m_oldLocale; - - wxDECLARE_NO_COPY_CLASS(CNumericLocaleSetter); -}; - -} // anonymous namespace - -double wxStrtod_l(const wchar_t* str, wchar_t **endptr, const wxXLocale& loc) -{ - wxCHECK( loc.IsOk(), 0. ); - - CNumericLocaleSetter locSetter; - - return wxStrtod(str, endptr); -} - -double wxStrtod_l(const char* str, char **endptr, const wxXLocale& loc) -{ - wxCHECK( loc.IsOk(), 0. ); - - CNumericLocaleSetter locSetter; - - return wxStrtod(str, endptr); -} - -long wxStrtol_l(const wchar_t* str, wchar_t **endptr, int base, const wxXLocale& loc) -{ - wxCHECK( loc.IsOk(), 0 ); - - CNumericLocaleSetter locSetter; - - return wxStrtol(str, endptr, base); -} - -long wxStrtol_l(const char* str, char **endptr, int base, const wxXLocale& loc) -{ - wxCHECK( loc.IsOk(), 0 ); - - CNumericLocaleSetter locSetter; - - return wxStrtol(str, endptr, base); -} - -unsigned long wxStrtoul_l(const wchar_t* str, wchar_t **endptr, int base, const wxXLocale& loc) -{ - wxCHECK( loc.IsOk(), 0 ); - - CNumericLocaleSetter locSetter; - - return wxStrtoul(str, endptr, base); -} - -unsigned long wxStrtoul_l(const char* str, char **endptr, int base, const wxXLocale& loc) -{ - wxCHECK( loc.IsOk(), 0 ); - - CNumericLocaleSetter locSetter; - - return wxStrtoul(str, endptr, base); -} - -#endif // !defined(wxHAS_XLOCALE_SUPPORT) - -#endif // wxUSE_XLOCALE diff --git a/Externals/wxWidgets3/src/common/xpmdecod.cpp b/Externals/wxWidgets3/src/common/xpmdecod.cpp deleted file mode 100644 index f76418958c..0000000000 --- a/Externals/wxWidgets3/src/common/xpmdecod.cpp +++ /dev/null @@ -1,830 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/xpmdecod.cpp -// Purpose: wxXPMDecoder -// Author: John Cristy, Vaclav Slavik -// Copyright: (c) John Cristy, Vaclav Slavik -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -/* - -This file is partially based on source code of ImageMagick by John Cristy. Its -license is as follows: - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% % -% % -% % -% X X PPPP M M % -% X X P P MM MM % -% X PPPP M M M % -% X X P M M % -% X X P M M % -% % -% % -% Read/Write ImageMagick Image Format. % -% % -% % -% Software Design % -% John Cristy % -% July 1992 % -% % -% % -% Copyright (C) 2001 ImageMagick Studio, a non-profit organization dedicated % -% to making software imaging solutions freely available. % -% % -% Permission is hereby granted, free of charge, to any person obtaining a % -% copy of this software and associated documentation files ("ImageMagick"), % -% to deal in ImageMagick without restriction, including without limitation % -% the rights to use, copy, modify, merge, publish, distribute, sublicense, % -% and/or sell copies of ImageMagick, and to permit persons to whom the % -% ImageMagick is furnished to do so, subject to the following conditions: % -% % -% The above copyright notice and this permission notice shall be included in % -% all copies or substantial portions of ImageMagick. % -% % -% The software is provided "as is", without warranty of any kind, express or % -% implied, including but not limited to the warranties of merchantability, % -% fitness for a particular purpose and noninfringement. In no event shall % -% ImageMagick Studio be liable for any claim, damages or other liability, % -% whether in an action of contract, tort or otherwise, arising from, out of % -% or in connection with ImageMagick or the use or other dealings in % -% ImageMagick. % -% % -% Except as contained in this notice, the name of the ImageMagick Studio % -% shall not be used in advertising or otherwise to promote the sale, use or % -% other dealings in ImageMagick without prior written authorization from the % -% ImageMagick Studio. % -% % -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% -% -*/ - -/* - * Also contains some pieces from libxpm and its modification for win32 by - * HeDu : - * - * Copyright (C) 1989-95 GROUPE BULL - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to - * deal in the Software without restriction, including without limitation the - * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * GROUPE BULL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN - * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the name of GROUPE BULL shall not be - * used in advertising or otherwise to promote the sale, use or other dealings - * in this Software without prior written authorization from GROUPE BULL. - */ - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_IMAGE && wxUSE_XPM - -#include "wx/xpmdecod.h" - -#ifndef WX_PRECOMP - #include "wx/intl.h" - #include "wx/log.h" - #include "wx/utils.h" - #include "wx/hashmap.h" - #include "wx/stream.h" - #include "wx/image.h" - #include "wx/palette.h" -#endif - -#include -#include - -#if wxUSE_STREAMS -bool wxXPMDecoder::CanRead(wxInputStream& stream) -{ - unsigned char buf[9]; - - if ( !stream.Read(buf, WXSIZEOF(buf)) ) - return false; - - return memcmp(buf, "/* XPM */", WXSIZEOF(buf)) == 0; -} - -wxImage wxXPMDecoder::ReadFile(wxInputStream& stream) -{ - size_t length = stream.GetSize(); - wxCHECK_MSG( length != 0, wxNullImage, - wxT("Cannot read XPM from stream of unknown size") ); - - // use a smart buffer to be sure to free memory even when we return on - // error - wxCharBuffer buffer(length); - - char *xpm_buffer = (char *)buffer.data(); - if ( stream.Read(xpm_buffer, length).GetLastError() == wxSTREAM_READ_ERROR ) - return wxNullImage; - xpm_buffer[length] = '\0'; - - /* - * Remove comments from the file: - */ - char *p, *q; - for (p = xpm_buffer; *p != '\0'; p++) - { - if ( (*p == '"') || (*p == '\'') ) - { - if (*p == '"') - { - for (p++; *p != '\0'; p++) - if ( (*p == '"') && (*(p - 1) != '\\') ) - break; - } - else // *p == '\'' - { - for (p++; *p != '\0'; p++) - if ( (*p == '\'') && (*(p - 1) != '\\') ) - break; - } - if (*p == '\0') - break; - continue; - } - if ( (*p != '/') || (*(p + 1) != '*') ) - continue; - for (q = p + 2; *q != '\0'; q++) - { - if ( (*q == '*') && (*(q + 1) == '/') ) - break; - } - - // memmove allows overlaps (unlike strcpy): - size_t cpylen = strlen(q + 2) + 1; - memmove(p, q + 2, cpylen); - } - - /* - * Remove unquoted characters: - */ - size_t i = 0; - for (p = xpm_buffer; *p != '\0'; p++) - { - if ( *p != '"' ) - continue; - for (q = p + 1; *q != '\0'; q++) - if (*q == '"') - break; - strncpy(xpm_buffer + i, p + 1, q - p - 1); - i += q - p - 1; - xpm_buffer[i++] = '\n'; - p = q + 1; - } - xpm_buffer[i] = '\0'; - - /* - * Create array of lines and convert \n's to \0's: - */ - const char **xpm_lines; - size_t lines_cnt = 0; - size_t line; - - for (p = xpm_buffer; *p != '\0'; p++) - { - if ( *p == '\n' ) - lines_cnt++; - } - - if ( !lines_cnt ) - { - // this doesn't really look an XPM image - return wxNullImage; - } - - xpm_lines = new const char*[lines_cnt + 1]; - xpm_lines[0] = xpm_buffer; - line = 1; - for (p = xpm_buffer; (*p != '\0') && (line < lines_cnt); p++) - { - if ( *p == '\n' ) - { - xpm_lines[line] = p + 1; - *p = '\0'; - line++; - } - } - - xpm_lines[lines_cnt] = NULL; - - /* - * Read the image: - */ - wxImage img = ReadData(xpm_lines); - - delete[] xpm_lines; - - return img; -} -#endif // wxUSE_STREAMS - - -/*****************************************************************************\ -* rgbtab.h * -* * -* A hard coded rgb.txt. To keep it short I removed all colornames with * -* trailing numbers, Blue3 etc, except the GrayXX. Sorry Grey-lovers I prefer * -* Gray ;-). But Grey is recognized on lookups, only on save Gray will be * -* used, maybe you want to do some substitue there too. * -* * -* To save memory the RGBs are coded in one long value, as done by the RGB * -* macro. * -* * -* Developed by HeDu 3/94 (hedu@cul-ipn.uni-kiel.de) * -\*****************************************************************************/ - - -typedef struct -{ - const char *name; - wxUint32 rgb; -} rgbRecord; - -#define myRGB(r,g,b) ((wxUint32)r<<16|(wxUint32)g<<8|(wxUint32)b) - -static const rgbRecord theRGBRecords[] = -{ - {"aliceblue", myRGB(240, 248, 255)}, - {"antiquewhite", myRGB(250, 235, 215)}, - {"aquamarine", myRGB(50, 191, 193)}, - {"azure", myRGB(240, 255, 255)}, - {"beige", myRGB(245, 245, 220)}, - {"bisque", myRGB(255, 228, 196)}, - {"black", myRGB(0, 0, 0)}, - {"blanchedalmond", myRGB(255, 235, 205)}, - {"blue", myRGB(0, 0, 255)}, - {"blueviolet", myRGB(138, 43, 226)}, - {"brown", myRGB(165, 42, 42)}, - {"burlywood", myRGB(222, 184, 135)}, - {"cadetblue", myRGB(95, 146, 158)}, - {"chartreuse", myRGB(127, 255, 0)}, - {"chocolate", myRGB(210, 105, 30)}, - {"coral", myRGB(255, 114, 86)}, - {"cornflowerblue", myRGB(34, 34, 152)}, - {"cornsilk", myRGB(255, 248, 220)}, - {"cyan", myRGB(0, 255, 255)}, - {"darkgoldenrod", myRGB(184, 134, 11)}, - {"darkgreen", myRGB(0, 86, 45)}, - {"darkkhaki", myRGB(189, 183, 107)}, - {"darkolivegreen", myRGB(85, 86, 47)}, - {"darkorange", myRGB(255, 140, 0)}, - {"darkorchid", myRGB(139, 32, 139)}, - {"darksalmon", myRGB(233, 150, 122)}, - {"darkseagreen", myRGB(143, 188, 143)}, - {"darkslateblue", myRGB(56, 75, 102)}, - {"darkslategray", myRGB(47, 79, 79)}, - {"darkturquoise", myRGB(0, 166, 166)}, - {"darkviolet", myRGB(148, 0, 211)}, - {"deeppink", myRGB(255, 20, 147)}, - {"deepskyblue", myRGB(0, 191, 255)}, - {"dimgray", myRGB(84, 84, 84)}, - {"dodgerblue", myRGB(30, 144, 255)}, - {"firebrick", myRGB(142, 35, 35)}, - {"floralwhite", myRGB(255, 250, 240)}, - {"forestgreen", myRGB(80, 159, 105)}, - {"gainsboro", myRGB(220, 220, 220)}, - {"ghostwhite", myRGB(248, 248, 255)}, - {"gold", myRGB(218, 170, 0)}, - {"goldenrod", myRGB(239, 223, 132)}, - {"gray", myRGB(126, 126, 126)}, - {"gray0", myRGB(0, 0, 0)}, - {"gray1", myRGB(3, 3, 3)}, - {"gray10", myRGB(26, 26, 26)}, - {"gray100", myRGB(255, 255, 255)}, - {"gray11", myRGB(28, 28, 28)}, - {"gray12", myRGB(31, 31, 31)}, - {"gray13", myRGB(33, 33, 33)}, - {"gray14", myRGB(36, 36, 36)}, - {"gray15", myRGB(38, 38, 38)}, - {"gray16", myRGB(41, 41, 41)}, - {"gray17", myRGB(43, 43, 43)}, - {"gray18", myRGB(46, 46, 46)}, - {"gray19", myRGB(48, 48, 48)}, - {"gray2", myRGB(5, 5, 5)}, - {"gray20", myRGB(51, 51, 51)}, - {"gray21", myRGB(54, 54, 54)}, - {"gray22", myRGB(56, 56, 56)}, - {"gray23", myRGB(59, 59, 59)}, - {"gray24", myRGB(61, 61, 61)}, - {"gray25", myRGB(64, 64, 64)}, - {"gray26", myRGB(66, 66, 66)}, - {"gray27", myRGB(69, 69, 69)}, - {"gray28", myRGB(71, 71, 71)}, - {"gray29", myRGB(74, 74, 74)}, - {"gray3", myRGB(8, 8, 8)}, - {"gray30", myRGB(77, 77, 77)}, - {"gray31", myRGB(79, 79, 79)}, - {"gray32", myRGB(82, 82, 82)}, - {"gray33", myRGB(84, 84, 84)}, - {"gray34", myRGB(87, 87, 87)}, - {"gray35", myRGB(89, 89, 89)}, - {"gray36", myRGB(92, 92, 92)}, - {"gray37", myRGB(94, 94, 94)}, - {"gray38", myRGB(97, 97, 97)}, - {"gray39", myRGB(99, 99, 99)}, - {"gray4", myRGB(10, 10, 10)}, - {"gray40", myRGB(102, 102, 102)}, - {"gray41", myRGB(105, 105, 105)}, - {"gray42", myRGB(107, 107, 107)}, - {"gray43", myRGB(110, 110, 110)}, - {"gray44", myRGB(112, 112, 112)}, - {"gray45", myRGB(115, 115, 115)}, - {"gray46", myRGB(117, 117, 117)}, - {"gray47", myRGB(120, 120, 120)}, - {"gray48", myRGB(122, 122, 122)}, - {"gray49", myRGB(125, 125, 125)}, - {"gray5", myRGB(13, 13, 13)}, - {"gray50", myRGB(127, 127, 127)}, - {"gray51", myRGB(130, 130, 130)}, - {"gray52", myRGB(133, 133, 133)}, - {"gray53", myRGB(135, 135, 135)}, - {"gray54", myRGB(138, 138, 138)}, - {"gray55", myRGB(140, 140, 140)}, - {"gray56", myRGB(143, 143, 143)}, - {"gray57", myRGB(145, 145, 145)}, - {"gray58", myRGB(148, 148, 148)}, - {"gray59", myRGB(150, 150, 150)}, - {"gray6", myRGB(15, 15, 15)}, - {"gray60", myRGB(153, 153, 153)}, - {"gray61", myRGB(156, 156, 156)}, - {"gray62", myRGB(158, 158, 158)}, - {"gray63", myRGB(161, 161, 161)}, - {"gray64", myRGB(163, 163, 163)}, - {"gray65", myRGB(166, 166, 166)}, - {"gray66", myRGB(168, 168, 168)}, - {"gray67", myRGB(171, 171, 171)}, - {"gray68", myRGB(173, 173, 173)}, - {"gray69", myRGB(176, 176, 176)}, - {"gray7", myRGB(18, 18, 18)}, - {"gray70", myRGB(179, 179, 179)}, - {"gray71", myRGB(181, 181, 181)}, - {"gray72", myRGB(184, 184, 184)}, - {"gray73", myRGB(186, 186, 186)}, - {"gray74", myRGB(189, 189, 189)}, - {"gray75", myRGB(191, 191, 191)}, - {"gray76", myRGB(194, 194, 194)}, - {"gray77", myRGB(196, 196, 196)}, - {"gray78", myRGB(199, 199, 199)}, - {"gray79", myRGB(201, 201, 201)}, - {"gray8", myRGB(20, 20, 20)}, - {"gray80", myRGB(204, 204, 204)}, - {"gray81", myRGB(207, 207, 207)}, - {"gray82", myRGB(209, 209, 209)}, - {"gray83", myRGB(212, 212, 212)}, - {"gray84", myRGB(214, 214, 214)}, - {"gray85", myRGB(217, 217, 217)}, - {"gray86", myRGB(219, 219, 219)}, - {"gray87", myRGB(222, 222, 222)}, - {"gray88", myRGB(224, 224, 224)}, - {"gray89", myRGB(227, 227, 227)}, - {"gray9", myRGB(23, 23, 23)}, - {"gray90", myRGB(229, 229, 229)}, - {"gray91", myRGB(232, 232, 232)}, - {"gray92", myRGB(235, 235, 235)}, - {"gray93", myRGB(237, 237, 237)}, - {"gray94", myRGB(240, 240, 240)}, - {"gray95", myRGB(242, 242, 242)}, - {"gray96", myRGB(245, 245, 245)}, - {"gray97", myRGB(247, 247, 247)}, - {"gray98", myRGB(250, 250, 250)}, - {"gray99", myRGB(252, 252, 252)}, - {"green", myRGB(0, 255, 0)}, - {"greenyellow", myRGB(173, 255, 47)}, - {"honeydew", myRGB(240, 255, 240)}, - {"hotpink", myRGB(255, 105, 180)}, - {"indianred", myRGB(107, 57, 57)}, - {"ivory", myRGB(255, 255, 240)}, - {"khaki", myRGB(179, 179, 126)}, - {"lavender", myRGB(230, 230, 250)}, - {"lavenderblush", myRGB(255, 240, 245)}, - {"lawngreen", myRGB(124, 252, 0)}, - {"lemonchiffon", myRGB(255, 250, 205)}, - {"lightblue", myRGB(176, 226, 255)}, - {"lightcoral", myRGB(240, 128, 128)}, - {"lightcyan", myRGB(224, 255, 255)}, - {"lightgoldenrod", myRGB(238, 221, 130)}, - {"lightgoldenrodyellow", myRGB(250, 250, 210)}, - {"lightgray", myRGB(168, 168, 168)}, - {"lightpink", myRGB(255, 182, 193)}, - {"lightsalmon", myRGB(255, 160, 122)}, - {"lightseagreen", myRGB(32, 178, 170)}, - {"lightskyblue", myRGB(135, 206, 250)}, - {"lightslateblue", myRGB(132, 112, 255)}, - {"lightslategray", myRGB(119, 136, 153)}, - {"lightsteelblue", myRGB(124, 152, 211)}, - {"lightyellow", myRGB(255, 255, 224)}, - {"limegreen", myRGB(0, 175, 20)}, - {"linen", myRGB(250, 240, 230)}, - {"magenta", myRGB(255, 0, 255)}, - {"maroon", myRGB(143, 0, 82)}, - {"mediumaquamarine", myRGB(0, 147, 143)}, - {"mediumblue", myRGB(50, 50, 204)}, - {"mediumforestgreen", myRGB(50, 129, 75)}, - {"mediumgoldenrod", myRGB(209, 193, 102)}, - {"mediumorchid", myRGB(189, 82, 189)}, - {"mediumpurple", myRGB(147, 112, 219)}, - {"mediumseagreen", myRGB(52, 119, 102)}, - {"mediumslateblue", myRGB(106, 106, 141)}, - {"mediumspringgreen", myRGB(35, 142, 35)}, - {"mediumturquoise", myRGB(0, 210, 210)}, - {"mediumvioletred", myRGB(213, 32, 121)}, - {"midnightblue", myRGB(47, 47, 100)}, - {"mintcream", myRGB(245, 255, 250)}, - {"mistyrose", myRGB(255, 228, 225)}, - {"moccasin", myRGB(255, 228, 181)}, - {"navajowhite", myRGB(255, 222, 173)}, - {"navy", myRGB(35, 35, 117)}, - {"navyblue", myRGB(35, 35, 117)}, - {"oldlace", myRGB(253, 245, 230)}, - {"olivedrab", myRGB(107, 142, 35)}, - {"orange", myRGB(255, 135, 0)}, - {"orangered", myRGB(255, 69, 0)}, - {"orchid", myRGB(239, 132, 239)}, - {"palegoldenrod", myRGB(238, 232, 170)}, - {"palegreen", myRGB(115, 222, 120)}, - {"paleturquoise", myRGB(175, 238, 238)}, - {"palevioletred", myRGB(219, 112, 147)}, - {"papayawhip", myRGB(255, 239, 213)}, - {"peachpuff", myRGB(255, 218, 185)}, - {"peru", myRGB(205, 133, 63)}, - {"pink", myRGB(255, 181, 197)}, - {"plum", myRGB(197, 72, 155)}, - {"powderblue", myRGB(176, 224, 230)}, - {"purple", myRGB(160, 32, 240)}, - {"red", myRGB(255, 0, 0)}, - {"rosybrown", myRGB(188, 143, 143)}, - {"royalblue", myRGB(65, 105, 225)}, - {"saddlebrown", myRGB(139, 69, 19)}, - {"salmon", myRGB(233, 150, 122)}, - {"sandybrown", myRGB(244, 164, 96)}, - {"seagreen", myRGB(82, 149, 132)}, - {"seashell", myRGB(255, 245, 238)}, - {"sienna", myRGB(150, 82, 45)}, - {"silver", myRGB(192, 192, 192)}, - {"skyblue", myRGB(114, 159, 255)}, - {"slateblue", myRGB(126, 136, 171)}, - {"slategray", myRGB(112, 128, 144)}, - {"snow", myRGB(255, 250, 250)}, - {"springgreen", myRGB(65, 172, 65)}, - {"steelblue", myRGB(84, 112, 170)}, - {"tan", myRGB(222, 184, 135)}, - {"thistle", myRGB(216, 191, 216)}, - {"tomato", myRGB(255, 99, 71)}, - {"transparent", myRGB(0, 0, 1)}, - {"turquoise", myRGB(25, 204, 223)}, - {"violet", myRGB(156, 62, 206)}, - {"violetred", myRGB(243, 62, 150)}, - {"wheat", myRGB(245, 222, 179)}, - {"white", myRGB(255, 255, 255)}, - {"whitesmoke", myRGB(245, 245, 245)}, - {"yellow", myRGB(255, 255, 0)}, - {"yellowgreen", myRGB(50, 216, 56)}, - {NULL, myRGB(0, 0, 0)} -}; -static const int numTheRGBRecords = 235; - -static unsigned char ParseHexadecimal(char digit1, char digit2) -{ - unsigned char i1, i2; - - if (digit1 >= 'a') - i1 = (unsigned char)(digit1 - 'a' + 0x0A); - else if (digit1 >= 'A') - i1 = (unsigned char)(digit1 - 'A' + 0x0A); - else - i1 = (unsigned char)(digit1 - '0'); - if (digit2 >= 'a') - i2 = (unsigned char)(digit2 - 'a' + 0x0A); - else if (digit2 >= 'A') - i2 = (unsigned char)(digit2 - 'A' + 0x0A); - else - i2 = (unsigned char)(digit2 - '0'); - return (unsigned char)(0x10 * i1 + i2); -} - -static bool GetRGBFromName(const char *inname, bool *isNone, - unsigned char *r, unsigned char*g, unsigned char *b) -{ - int left, right, middle; - int cmp; - wxUint32 rgbVal; - char *name; - char *grey, *p; - - // Neither #rrggbb nor #rrrrggggbbbb are in database, we parse them directly - size_t inname_len = strlen(inname); - if ( *inname == '#' && (inname_len == 7 || inname_len == 13)) - { - size_t ofs = (inname_len == 7) ? 2 : 4; - *r = ParseHexadecimal(inname[1], inname[2]); - *g = ParseHexadecimal(inname[1*ofs+1], inname[1*ofs+2]); - *b = ParseHexadecimal(inname[2*ofs+1], inname[2*ofs+2]); - *isNone = false; - return true; - } - - name = wxStrdupA(inname); - - // theRGBRecords[] has no names with spaces, and no grey, but a - // lot of gray... - - // so first extract ' ' - while ((p = strchr(name, ' ')) != NULL) - { - while (*(p)) // till eof of string - { - *p = *(p + 1); // copy to the left - p++; - } - } - // fold to lower case - p = name; - while (*p) - { - *p = (char)tolower(*p); - p++; - } - - // substitute Grey with Gray, else rgbtab.h would have more than 100 - // 'duplicate' entries - if ( (grey = strstr(name, "grey")) != NULL ) - grey[2] = 'a'; - - // check for special 'none' colour: - bool found; - if ( strcmp(name, "none") == 0 ) - { - *isNone = true; - found = true; - } - else // not "None" - { - found = false; - - // binary search: - left = 0; - right = numTheRGBRecords - 1; - do - { - middle = (left + right) / 2; - cmp = strcmp(name, theRGBRecords[middle].name); - if ( cmp == 0 ) - { - rgbVal = theRGBRecords[middle].rgb; - *r = (unsigned char)((rgbVal >> 16) & 0xFF); - *g = (unsigned char)((rgbVal >> 8) & 0xFF); - *b = (unsigned char)((rgbVal) & 0xFF); - *isNone = false; - found = true; - break; - } - else if ( cmp < 0 ) - { - right = middle - 1; - } - else // cmp > 0 - { - left = middle + 1; - } - } while (left <= right); - } - - free(name); - - return found; -} - -static const char *ParseColor(const char *data) -{ - static const char *const targets[] = - {"c ", "g ", "g4 ", "m ", "b ", "s ", NULL}; - - const char *p, *r; - const char *q; - int i; - - for (i = 0; targets[i] != NULL; i++) - { - r = data; - for (q = targets[i]; *r != '\0'; r++) - { - if ( *r != *q ) - continue; - if ( !isspace((int) (*(r - 1))) ) - continue; - p = r; - for (;;) - { - if ( *q == '\0' ) - return p; - if ( *p++ != *q++ ) - break; - } - q = targets[i]; - } - } - return NULL; -} - -struct wxXPMColourMapData -{ - wxXPMColourMapData() { R = G = B = 0; } - unsigned char R,G,B; -}; -WX_DECLARE_STRING_HASH_MAP(wxXPMColourMapData, wxXPMColourMap); - -wxImage wxXPMDecoder::ReadData(const char* const* xpm_data) -{ - wxCHECK_MSG(xpm_data, wxNullImage, wxT("NULL XPM data") ); - - wxImage img; - int count; - unsigned width, height, colors_cnt, chars_per_pixel; - size_t i, j, i_key; - char key[64]; - const char *clr_def; - wxXPMColourMap clr_tbl; - wxXPMColourMap::iterator it; - wxString maskKey; - wxString keyString; - - /* - * Read hints and initialize structures: - */ - - count = sscanf(xpm_data[0], "%u %u %u %u", - &width, &height, &colors_cnt, &chars_per_pixel); - if ( count != 4 || width * height * colors_cnt == 0 ) - { - wxLogError(_("XPM: incorrect header format!")); - return wxNullImage; - } - - // VS: XPM color map this large would be insane, since XPMs are encoded with - // 92 possible values on each position, 92^64 is *way* larger space than - // 8bit RGB... - wxCHECK_MSG(chars_per_pixel < 64, wxNullImage, wxT("XPM colormaps this large not supported.")); - - if (!img.Create(width, height, false)) - return wxNullImage; - - key[chars_per_pixel] = '\0'; - - /* - * Create colour map: - */ - wxXPMColourMapData clr_data; - for (i = 0; i < colors_cnt; i++) - { - const char *xmpColLine = xpm_data[1 + i]; - - // we must have at least " x y" after the colour index, hence +5 - if ( !xmpColLine || strlen(xmpColLine) < chars_per_pixel + 5 ) - { - wxLogError(_("XPM: incorrect colour description in line %d"), - (int)(1 + i)); - return wxNullImage; - } - - for (i_key = 0; i_key < chars_per_pixel; i_key++) - key[i_key] = xmpColLine[i_key]; - clr_def = ParseColor(xmpColLine + chars_per_pixel); - - if ( clr_def == NULL ) - { - wxLogError(_("XPM: malformed colour definition '%s' at line %d!"), - xmpColLine, (int)(1 + i)); - return wxNullImage; - } - - bool isNone = false; - if ( !GetRGBFromName(clr_def, &isNone, - &clr_data.R, &clr_data.G, &clr_data.B) ) - { - wxLogError(_("XPM: malformed colour definition '%s' at line %d!"), - xmpColLine, (int)(1 + i)); - return wxNullImage; - } - - keyString = key; - if ( isNone ) - maskKey = keyString; - - clr_tbl[keyString] = clr_data; - } - - // deal with the mask: we must replace pseudo-colour "None" with the mask - // colour (which can be any colour not otherwise used in the image) - if (!maskKey.empty()) - { - wxLongToLongHashMap rgb_table; - long rgb; - const size_t n = clr_tbl.size(); - wxXPMColourMap::const_iterator iter = clr_tbl.begin(); - for (i = 0; i < n; ++i, ++iter) - { - const wxXPMColourMapData& data = iter->second; - rgb = (data.R << 16) + (data.G << 8) + data.B; - rgb_table[rgb]; - } - for (rgb = 0; rgb <= 0xffffff && rgb_table.count(rgb); ++rgb) - ; - if (rgb > 0xffffff) - { - wxLogError(_("XPM: no colors left to use for mask!")); - return wxNullImage; - } - - wxXPMColourMapData& maskData = clr_tbl[maskKey]; - maskData.R = wxByte(rgb >> 16); - maskData.G = wxByte(rgb >> 8); - maskData.B = wxByte(rgb); - - img.SetMaskColour(maskData.R, maskData.G, maskData.B); - } - - /* - * Parse image data: - */ - - unsigned char *img_data = img.GetData(); - wxXPMColourMap::iterator entry; - wxXPMColourMap::iterator end = clr_tbl.end(); - - for (j = 0; j < height; j++) - { - for (i = 0; i < width; i++, img_data += 3) - { - const char *xpmImgLine = xpm_data[1 + colors_cnt + j]; - if ( !xpmImgLine || strlen(xpmImgLine) < width*chars_per_pixel ) - { - wxLogError(_("XPM: truncated image data at line %d!"), - (int)(1 + colors_cnt + j)); - return wxNullImage; - } - - for (i_key = 0; i_key < chars_per_pixel; i_key++) - { - key[i_key] = xpmImgLine[chars_per_pixel * i + i_key]; - } - - keyString = key; - entry = clr_tbl.find(keyString); - if ( entry == end ) - { - wxLogError(_("XPM: Malformed pixel data!")); - - // better return right now as otherwise we risk to flood the - // user with error messages as something seems to be seriously - // wrong with the file and so we could give this message for - // each remaining pixel if we don't bail out - return wxNullImage; - } - - img_data[0] = entry->second.R; - img_data[1] = entry->second.G; - img_data[2] = entry->second.B; - } - } -#if wxUSE_PALETTE - unsigned char* r = new unsigned char[colors_cnt]; - unsigned char* g = new unsigned char[colors_cnt]; - unsigned char* b = new unsigned char[colors_cnt]; - - for (it = clr_tbl.begin(), i = 0; it != clr_tbl.end(); it++, i++) - { - r[i] = it->second.R; - g[i] = it->second.G; - b[i] = it->second.B; - } - wxASSERT(i == colors_cnt); - img.SetPalette(wxPalette(colors_cnt, r, g, b)); - delete[] r; - delete[] g; - delete[] b; -#endif // wxUSE_PALETTE - return img; -} - -#endif // wxUSE_IMAGE && wxUSE_XPM diff --git a/Externals/wxWidgets3/src/common/xti.cpp b/Externals/wxWidgets3/src/common/xti.cpp deleted file mode 100644 index e7dc6d1ee0..0000000000 --- a/Externals/wxWidgets3/src/common/xti.cpp +++ /dev/null @@ -1,971 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/xti.cpp -// Purpose: runtime metadata information (extended class info) -// Author: Stefan Csomor -// Modified by: -// Created: 27/07/03 -// Copyright: (c) 1997 Julian Smart -// (c) 2003 Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_EXTENDED_RTTI - -#ifndef WX_PRECOMP - #include "wx/object.h" - #include "wx/list.h" - #include "wx/hash.h" -#endif - -#include "wx/xti.h" -#include "wx/xml/xml.h" -#include "wx/tokenzr.h" -#include "wx/range.h" - -#include - -#include "wx/beforestd.h" -#include -#include -#include -#include "wx/afterstd.h" - -using namespace std; - -// ---------------------------------------------------------------------------- -// wxEnumData -// ---------------------------------------------------------------------------- - -wxEnumData::wxEnumData( wxEnumMemberData* data ) -{ - m_members = data; - for ( m_count = 0; m_members[m_count].m_name; m_count++) - {}; -} - -bool wxEnumData::HasEnumMemberValue(const wxChar *name, int *value) const -{ - int i; - for (i = 0; m_members[i].m_name; i++ ) - { - if (!wxStrcmp(name, m_members[i].m_name)) - { - if ( value ) - *value = m_members[i].m_value; - return true; - } - } - return false; -} - -int wxEnumData::GetEnumMemberValue(const wxChar *name) const -{ - int i; - for (i = 0; m_members[i].m_name; i++ ) - { - if (!wxStrcmp(name, m_members[i].m_name)) - { - return m_members[i].m_value; - } - } - return 0; -} - -const wxChar *wxEnumData::GetEnumMemberName(int value) const -{ - int i; - for (i = 0; m_members[i].m_name; i++) - if (value == m_members[i].m_value) - return m_members[i].m_name; - - return wxEmptyString; -} - -int wxEnumData::GetEnumMemberValueByIndex( int idx ) const -{ - // we should cache the count in order to avoid out-of-bounds errors - return m_members[idx].m_value; -} - -const wxChar * wxEnumData::GetEnumMemberNameByIndex( int idx ) const -{ - // we should cache the count in order to avoid out-of-bounds errors - return m_members[idx].m_name; -} - -// ---------------------------------------------------------------------------- -// Type Information -// ---------------------------------------------------------------------------- - -// ---------------------------------------------------------------------------- -// value streaming -// ---------------------------------------------------------------------------- - -// streamer specializations -// for all built-in types - -// bool - -template<> void wxStringReadValue(const wxString &s, bool &data ) -{ - int intdata; - wxSscanf(s, wxT("%d"), &intdata ); - data = (bool)(intdata != 0); -} - -template<> void wxStringWriteValue(wxString &s, const bool &data ) -{ - s = wxString::Format(wxT("%d"), data ); -} - -// char - -template<> void wxStringReadValue(const wxString &s, char &data ) -{ - int intdata; - wxSscanf(s, wxT("%d"), &intdata ); - data = char(intdata); -} - -template<> void wxStringWriteValue(wxString &s, const char &data ) -{ - s = wxString::Format(wxT("%d"), data ); -} - -// unsigned char - -template<> void wxStringReadValue(const wxString &s, unsigned char &data ) -{ - int intdata; - wxSscanf(s, wxT("%d"), &intdata ); - data = (unsigned char)(intdata); -} - -template<> void wxStringWriteValue(wxString &s, const unsigned char &data ) -{ - s = wxString::Format(wxT("%d"), data ); -} - -// int - -template<> void wxStringReadValue(const wxString &s, int &data ) -{ - wxSscanf(s, wxT("%d"), &data ); -} - -template<> void wxStringWriteValue(wxString &s, const int &data ) -{ - s = wxString::Format(wxT("%d"), data ); -} - -// unsigned int - -template<> void wxStringReadValue(const wxString &s, unsigned int &data ) -{ - wxSscanf(s, wxT("%d"), &data ); -} - -template<> void wxStringWriteValue(wxString &s, const unsigned int &data ) -{ - s = wxString::Format(wxT("%d"), data ); -} - -// long - -template<> void wxStringReadValue(const wxString &s, long &data ) -{ - wxSscanf(s, wxT("%ld"), &data ); -} - -template<> void wxStringWriteValue(wxString &s, const long &data ) -{ - s = wxString::Format(wxT("%ld"), data ); -} - -// unsigned long - -template<> void wxStringReadValue(const wxString &s, unsigned long &data ) -{ - wxSscanf(s, wxT("%ld"), &data ); -} - -template<> void wxStringWriteValue(wxString &s, const unsigned long &data ) -{ - s = wxString::Format(wxT("%ld"), data ); -} - -#ifdef wxLongLong_t -template<> void wxStringReadValue(const wxString &s, wxLongLong_t &data ) -{ - wxSscanf(s, wxT("%lld"), &data ); -} - -template<> void wxStringWriteValue(wxString &s, const wxLongLong_t &data ) -{ - s = wxString::Format(wxT("%lld"), data ); -} - -template<> void wxStringReadValue(const wxString &s, wxULongLong_t &data ) -{ - wxSscanf(s, wxT("%lld"), &data ); -} - -template<> void wxStringWriteValue(wxString &s, const wxULongLong_t &data ) -{ - s = wxString::Format(wxT("%lld"), data ); -} -#endif -// float - -template<> void wxStringReadValue(const wxString &s, float &data ) -{ - wxSscanf(s, wxT("%f"), &data ); -} - -template<> void wxStringWriteValue(wxString &s, const float &data ) -{ - s = wxString::Format(wxT("%f"), data ); -} - -// double - -template<> void wxStringReadValue(const wxString &s, double &data ) -{ - wxSscanf(s, wxT("%lf"), &data ); -} - -template<> void wxStringWriteValue(wxString &s, const double &data ) -{ - s = wxString::Format(wxT("%lf"), data ); -} - -// wxString - -template<> void wxStringReadValue(const wxString &s, wxString &data ) -{ - data = s; -} - -template<> void wxStringWriteValue(wxString &s, const wxString &data ) -{ - s = data; -} - - -// built-ins -// - -#if wxUSE_FUNC_TEMPLATE_POINTER - #define wxBUILTIN_TYPE_INFO( element, type ) \ - wxBuiltInTypeInfo \ - s_typeInfo##type(element, &wxToStringConverter, \ - &wxFromStringConverter, typeid(type).name()); -#else - #define wxBUILTIN_TYPE_INFO( element, type ) \ - void _toString##element( const wxAny& data, wxString &result ) \ - { wxToStringConverter void wxStringReadValue(const wxString &s , wxRange &data) -{ - int minValue, maxValue; - wxSscanf(s, wxT("%d,%d"), &minValue , &maxValue); - data = wxRange(minValue, maxValue); -} - -template<> void wxStringWriteValue(wxString &s , const wxRange &data) -{ - s = wxString::Format(wxT("%d,%d"), data.GetMin() , data.GetMax()); -} - -wxCUSTOM_TYPE_INFO(wxRange, wxToStringConverter , wxFromStringConverter) - -// other types - -wxCOLLECTION_TYPE_INFO( wxString, wxArrayString ); - -template<> void wxCollectionToVariantArray( wxArrayString const &theArray, - wxAnyList &value) -{ - wxArrayCollectionToVariantArray( theArray, value ); -} - -wxTypeInfoMap *wxTypeInfo::ms_typeTable = NULL; - -wxTypeInfo *wxTypeInfo::FindType(const wxString& typeName) -{ - wxTypeInfoMap::iterator iter = ms_typeTable->find(typeName); - - if (iter == ms_typeTable->end()) - return NULL; - - return (wxTypeInfo *)iter->second; -} - -wxClassTypeInfo::wxClassTypeInfo( wxTypeKind kind, wxClassInfo* classInfo, - wxVariant2StringFnc to, - wxString2VariantFnc from, - const wxString &name) : - wxTypeInfo( kind, to, from, name) -{ - wxASSERT_MSG( kind == wxT_OBJECT_PTR || kind == wxT_OBJECT, - wxT("Illegal Kind for Enum Type")); m_classInfo = classInfo; -} - -wxEventSourceTypeInfo::wxEventSourceTypeInfo( int eventType, wxClassInfo* eventClass, - wxVariant2StringFnc to, - wxString2VariantFnc from ) : - wxTypeInfo ( wxT_DELEGATE, to, from, wxEmptyString ) -{ - m_eventClass = eventClass; - m_eventType = eventType; - m_lastEventType = -1; -} - -wxEventSourceTypeInfo::wxEventSourceTypeInfo( int eventType, int lastEventType, - wxClassInfo* eventClass, - wxVariant2StringFnc to, - wxString2VariantFnc from ) : - wxTypeInfo ( wxT_DELEGATE, to, from, wxEmptyString ) -{ - m_eventClass = eventClass; - m_eventType = eventType; - m_lastEventType = lastEventType; -} - -void wxTypeInfo::Register() -{ - if ( ms_typeTable == NULL ) - ms_typeTable = new wxTypeInfoMap(); - - if( !m_name.empty() ) - (*ms_typeTable)[m_name] = this; -} - -void wxTypeInfo::Unregister() -{ - if( !m_name.empty() ) - ms_typeTable->erase(m_name); -} - -// removing header dependency on string tokenizer - -void wxSetStringToArray( const wxString &s, wxArrayString &array ) -{ - wxStringTokenizer tokenizer(s, wxT("| \t\n"), wxTOKEN_STRTOK); - wxString flag; - array.Clear(); - while (tokenizer.HasMoreTokens()) - { - array.Add(tokenizer.GetNextToken()); - } -} - -// ---------------------------------------------------------------------------- -// wxPropertyInfo -// ---------------------------------------------------------------------------- - -void wxPropertyInfo::Insert(wxPropertyInfo* &iter) -{ - m_next = NULL; - if ( iter == NULL ) - iter = this; - else - { - wxPropertyInfo* i = iter; - while( i->m_next ) - i = i->m_next; - - i->m_next = this; - } -} - -void wxPropertyInfo::Remove() -{ - if ( this == m_itsClass->m_firstProperty ) - { - m_itsClass->m_firstProperty = m_next; - } - else - { - wxPropertyInfo *info = m_itsClass->m_firstProperty; - while (info) - { - if ( info->m_next == this ) - { - info->m_next = m_next; - break; - } - - info = info->m_next; - } - } - -} - -// ---------------------------------------------------------------------------- -// wxHandlerInfo -// ---------------------------------------------------------------------------- - -void wxHandlerInfo::Insert(wxHandlerInfo* &iter) -{ - m_next = NULL; - if ( iter == NULL ) - iter = this; - else - { - wxHandlerInfo* i = iter; - while( i->m_next ) - i = i->m_next; - - i->m_next = this; - } -} - -void wxHandlerInfo::Remove() -{ - if ( this == m_itsClass->m_firstHandler ) - { - m_itsClass->m_firstHandler = m_next; - } - else - { - wxHandlerInfo *info = m_itsClass->m_firstHandler; - while (info) - { - if ( info->m_next == this ) - { - info->m_next = m_next; - break; - } - - info = info->m_next; - } - } -} - - -// ---------------------------------------------------------------------------- -// wxClassInfo -// ---------------------------------------------------------------------------- - -bool wxClassInfo::Create(wxObject *object, int ParamCount, wxAny *Params) const -{ - if ( ParamCount != m_constructorPropertiesCount ) - { - // FIXME: shouldn't we just return false and let the caller handle it? - wxLogError( _("Illegal Parameter Count for Create Method") ); - return false; - } - - return m_constructor->Create( object, Params ); -} - -wxObject *wxClassInfo::ConstructObject(int ParamCount, wxAny *Params) const -{ - if ( ParamCount != m_constructorPropertiesCount ) - { - // FIXME: shouldn't we just return NULL and let the caller handle this case? - wxLogError( _("Illegal Parameter Count for ConstructObject Method") ); - return NULL; - } - - wxObject *object = NULL; - if (!m_constructor->Create( object, Params )) - return NULL; - return object; -} - -bool wxClassInfo::IsKindOf(const wxClassInfo *info) const -{ - if ( info != 0 ) - { - if ( info == this ) - return true; - - for ( int i = 0; m_parents[i]; ++ i ) - { - if ( m_parents[i]->IsKindOf( info ) ) - return true; - } - } - return false; -} - -const wxPropertyAccessor *wxClassInfo::FindAccessor(const wxChar *PropertyName) const -{ - const wxPropertyInfo* info = FindPropertyInfo( PropertyName ); - - if ( info ) - return info->GetAccessor(); - - return NULL; -} - -wxPropertyInfo *wxClassInfo::FindPropertyInfoInThisClass (const wxChar *PropertyName) const -{ - wxPropertyInfo* info = GetFirstProperty(); - - while( info ) - { - if ( wxStrcmp( info->GetName(), PropertyName ) == 0 ) - return info; - info = info->GetNext(); - } - - return 0; -} - -const wxPropertyInfo *wxClassInfo::FindPropertyInfo (const wxChar *PropertyName) const -{ - const wxPropertyInfo* info = FindPropertyInfoInThisClass( PropertyName ); - if ( info ) - return info; - - const wxClassInfo** parents = GetParents(); - for ( int i = 0; parents[i]; ++ i ) - { - if ( ( info = parents[i]->FindPropertyInfo( PropertyName ) ) != NULL ) - return info; - } - - return 0; -} - -wxHandlerInfo *wxClassInfo::FindHandlerInfoInThisClass (const wxChar *PropertyName) const -{ - wxHandlerInfo* info = GetFirstHandler(); - - while( info ) - { - if ( wxStrcmp( info->GetName(), PropertyName ) == 0 ) - return info; - info = info->GetNext(); - } - - return 0; -} - -const wxHandlerInfo *wxClassInfo::FindHandlerInfo (const wxChar *PropertyName) const -{ - const wxHandlerInfo* info = FindHandlerInfoInThisClass( PropertyName ); - - if ( info ) - return info; - - const wxClassInfo** parents = GetParents(); - for ( int i = 0; parents[i]; ++ i ) - { - if ( ( info = parents[i]->FindHandlerInfo( PropertyName ) ) != NULL ) - return info; - } - - return 0; -} - -wxObjectStreamingCallback wxClassInfo::GetStreamingCallback() const -{ - if ( m_streamingCallback ) - return m_streamingCallback; - - wxObjectStreamingCallback retval = NULL; - const wxClassInfo** parents = GetParents(); - for ( int i = 0; parents[i] && retval == NULL; ++ i ) - { - retval = parents[i]->GetStreamingCallback(); - } - return retval; -} - -bool wxClassInfo::BeforeWriteObject( const wxObject *obj, wxObjectWriter *streamer, - wxObjectWriterCallback *writercallback, const wxStringToAnyHashMap &metadata) const -{ - wxObjectStreamingCallback sb = GetStreamingCallback(); - if ( sb ) - return (*sb)(obj, streamer, writercallback, metadata ); - - return true; -} - -void wxClassInfo::SetProperty(wxObject *object, const wxChar *propertyName, - const wxAny &value) const -{ - const wxPropertyAccessor *accessor; - - accessor = FindAccessor(propertyName); - wxASSERT(accessor->HasSetter()); - accessor->SetProperty( object, value ); -} - -wxAny wxClassInfo::GetProperty(wxObject *object, const wxChar *propertyName) const -{ - const wxPropertyAccessor *accessor; - - accessor = FindAccessor(propertyName); - wxASSERT(accessor->HasGetter()); - wxAny result; - accessor->GetProperty(object,result); - return result; -} - -wxAnyList wxClassInfo::GetPropertyCollection(wxObject *object, - const wxChar *propertyName) const -{ - const wxPropertyAccessor *accessor; - - accessor = FindAccessor(propertyName); - wxASSERT(accessor->HasGetter()); - wxAnyList result; - accessor->GetPropertyCollection(object,result); - return result; -} - -void wxClassInfo::AddToPropertyCollection(wxObject *object, const wxChar *propertyName, - const wxAny& value) const -{ - const wxPropertyAccessor *accessor; - - accessor = FindAccessor(propertyName); - wxASSERT(accessor->HasAdder()); - accessor->AddToPropertyCollection( object, value ); -} - -// void wxClassInfo::GetProperties( wxPropertyInfoMap &map ) const -// The map parameter (the name map that is) seems something special -// to MSVC and so we use a other name. -void wxClassInfo::GetProperties( wxPropertyInfoMap &infomap ) const -{ - const wxPropertyInfo *pi = GetFirstProperty(); - while( pi ) - { - if ( infomap.find( pi->GetName() ) == infomap.end() ) - infomap[pi->GetName()] = (wxPropertyInfo*) pi; - - pi = pi->GetNext(); - } - - const wxClassInfo** parents = GetParents(); - for ( int i = 0; parents[i]; ++ i ) - { - parents[i]->GetProperties( infomap ); - } -} - -wxObject* wxClassInfo::AnyToObjectPtr( const wxAny &data) const -{ - return m_variantOfPtrToObjectConverter(data); -} - -void wxClassInfo::CallOnAny( const wxAny &data, wxObjectFunctor* functor ) const -{ - if ( data.GetTypeInfo()->GetKind() == wxT_OBJECT ) - return m_variantToObjectConverter(data, functor); - else - return (*functor)(m_variantOfPtrToObjectConverter(data)); -} - -wxAny wxClassInfo::ObjectPtrToAny( wxObject* obj) const -{ - return m_objectToVariantConverter(obj); -} - -bool wxClassInfo::NeedsDirectConstruction() const -{ - return wx_dynamic_cast(wxObjectAllocator*, m_constructor) != NULL; -} - -// ---------------------------------------------------------------------------- -// wxDynamicObject support -// ---------------------------------------------------------------------------- - -// Dynamic Objects are objects that have a real superclass instance and carry their -// own attributes in a hash map. Like this it is possible to create the objects and -// stream them, as if their class information was already available from compiled data - -struct wxDynamicObject::wxDynamicObjectInternal -{ - wxDynamicObjectInternal() {} - - wxStringToAnyHashMap m_properties; -}; - -typedef list< wxDynamicObject* > wxDynamicObjectList; - -struct wxDynamicClassInfo::wxDynamicClassInfoInternal -{ - wxDynamicObjectList m_dynamicObjects; -}; - -// instantiates this object with an instance of its superclass -wxDynamicObject::wxDynamicObject(wxObject* superClassInstance, const wxDynamicClassInfo *info) -{ - m_superClassInstance = superClassInstance; - m_classInfo = info; - m_data = new wxDynamicObjectInternal; -} - -wxDynamicObject::~wxDynamicObject() -{ - wx_dynamic_cast(const wxDynamicClassInfo*, m_classInfo)-> - m_data->m_dynamicObjects.remove( this ); - delete m_data; - delete m_superClassInstance; -} - -void wxDynamicObject::SetProperty (const wxChar *propertyName, const wxAny &value) -{ - wxASSERT_MSG(m_classInfo->FindPropertyInfoInThisClass(propertyName), - wxT("Accessing Unknown Property in a Dynamic Object") ); - m_data->m_properties[propertyName] = value; -} - -wxAny wxDynamicObject::GetProperty (const wxChar *propertyName) const -{ - wxASSERT_MSG(m_classInfo->FindPropertyInfoInThisClass(propertyName), - wxT("Accessing Unknown Property in a Dynamic Object") ); - return m_data->m_properties[propertyName]; -} - -void wxDynamicObject::RemoveProperty( const wxChar *propertyName ) -{ - wxASSERT_MSG(m_classInfo->FindPropertyInfoInThisClass(propertyName), - wxT("Removing Unknown Property in a Dynamic Object") ); - m_data->m_properties.erase( propertyName ); -} - -void wxDynamicObject::RenameProperty( const wxChar *oldPropertyName, - const wxChar *newPropertyName ) -{ - wxASSERT_MSG(m_classInfo->FindPropertyInfoInThisClass(oldPropertyName), - wxT("Renaming Unknown Property in a Dynamic Object") ); - - wxAny value = m_data->m_properties[oldPropertyName]; - m_data->m_properties.erase( oldPropertyName ); - m_data->m_properties[newPropertyName] = value; -} - - -// ---------------------------------------------------------------------------- -// wxDynamicClassInfo -// ---------------------------------------------------------------------------- - -wxDynamicClassInfo::wxDynamicClassInfo( const wxChar *unitName, - const wxChar *className, - const wxClassInfo* superClass ) : - wxClassInfo( unitName, className, new const wxClassInfo*[2]) -{ - GetParents()[0] = superClass; - GetParents()[1] = NULL; - m_data = new wxDynamicClassInfoInternal; -} - -wxDynamicClassInfo::~wxDynamicClassInfo() -{ - delete[] GetParents(); - delete m_data; -} - -wxObject *wxDynamicClassInfo::AllocateObject() const -{ - wxObject* parent = GetParents()[0]->AllocateObject(); - wxDynamicObject *obj = new wxDynamicObject( parent, this ); - m_data->m_dynamicObjects.push_back( obj ); - return obj; -} - -bool wxDynamicClassInfo::Create (wxObject *object, int paramCount, wxAny *params) const -{ - wxDynamicObject *dynobj = wx_dynamic_cast( wxDynamicObject *, object ); - wxASSERT_MSG( dynobj, - wxT("cannot call wxDynamicClassInfo::Create on ") - wxT("an object other than wxDynamicObject") ); - - return GetParents()[0]->Create( dynobj->GetSuperClassInstance(), paramCount, params ); -} - -// get number of parameters for constructor -int wxDynamicClassInfo::GetCreateParamCount() const -{ - return GetParents()[0]->GetCreateParamCount(); -} - -// get i-th constructor parameter -const wxChar* wxDynamicClassInfo::GetCreateParamName(int i) const -{ - return GetParents()[0]->GetCreateParamName( i ); -} - -void wxDynamicClassInfo::SetProperty(wxObject *object, const wxChar *propertyName, const wxAny &value) const -{ - wxDynamicObject* dynobj = wx_dynamic_cast(wxDynamicObject*, object); - wxASSERT_MSG( dynobj, wxT("cannot call wxDynamicClassInfo::SetProperty on an object other than wxDynamicObject") ); - if ( FindPropertyInfoInThisClass(propertyName) ) - dynobj->SetProperty( propertyName, value ); - else - GetParents()[0]->SetProperty( dynobj->GetSuperClassInstance(), propertyName, value ); -} - -wxAny wxDynamicClassInfo::GetProperty(wxObject *object, const wxChar *propertyName) const -{ - wxDynamicObject* dynobj = wx_dynamic_cast(wxDynamicObject*, object); - wxASSERT_MSG( dynobj, wxT("cannot call wxDynamicClassInfo::SetProperty on an object other than wxDynamicObject") ); - if ( FindPropertyInfoInThisClass(propertyName) ) - return dynobj->GetProperty( propertyName ); - else - return GetParents()[0]->GetProperty( dynobj->GetSuperClassInstance(), propertyName ); -} - -void wxDynamicClassInfo::AddProperty( const wxChar *propertyName, const wxTypeInfo* typeInfo ) -{ - EnsureInfosInited(); - new wxPropertyInfo( m_firstProperty, this, propertyName, typeInfo->GetTypeName(), new wxGenericPropertyAccessor( propertyName ), wxAny() ); -} - -void wxDynamicClassInfo::AddHandler( const wxChar *handlerName, wxObjectEventFunction address, const wxClassInfo* eventClassInfo ) -{ - EnsureInfosInited(); - new wxHandlerInfo( m_firstHandler, this, handlerName, address, eventClassInfo ); -} - -// removes an existing runtime-property -void wxDynamicClassInfo::RemoveProperty( const wxChar *propertyName ) -{ - for ( wxDynamicObjectList::iterator iter = m_data->m_dynamicObjects.begin(); iter != m_data->m_dynamicObjects.end(); ++iter ) - (*iter)->RemoveProperty( propertyName ); - delete FindPropertyInfoInThisClass(propertyName); -} - -// removes an existing runtime-handler -void wxDynamicClassInfo::RemoveHandler( const wxChar *handlerName ) -{ - delete FindHandlerInfoInThisClass(handlerName); -} - -// renames an existing runtime-property -void wxDynamicClassInfo::RenameProperty( const wxChar *oldPropertyName, const wxChar *newPropertyName ) -{ - wxPropertyInfo* pi = FindPropertyInfoInThisClass(oldPropertyName); - wxASSERT_MSG( pi,wxT("not existing property") ); - pi->m_name = newPropertyName; - wx_dynamic_cast(wxGenericPropertyAccessor*, pi->GetAccessor())->RenameProperty( oldPropertyName, newPropertyName ); - for ( wxDynamicObjectList::iterator iter = m_data->m_dynamicObjects.begin(); iter != m_data->m_dynamicObjects.end(); ++iter ) - (*iter)->RenameProperty( oldPropertyName, newPropertyName ); -} - -// renames an existing runtime-handler -void wxDynamicClassInfo::RenameHandler( const wxChar *oldHandlerName, const wxChar *newHandlerName ) -{ - wxASSERT_MSG(FindHandlerInfoInThisClass(oldHandlerName),wxT("not existing handler") ); - FindHandlerInfoInThisClass(oldHandlerName)->m_name = newHandlerName; -} - -// ---------------------------------------------------------------------------- -// wxGenericPropertyAccessor -// ---------------------------------------------------------------------------- - -struct wxGenericPropertyAccessor::wxGenericPropertyAccessorInternal -{ - char filler; -}; - -wxGenericPropertyAccessor::wxGenericPropertyAccessor( const wxString& propertyName ) -: wxPropertyAccessor( NULL, NULL, NULL, NULL ) -{ - m_data = new wxGenericPropertyAccessorInternal; - m_propertyName = propertyName; - m_getterName = wxT("Get")+propertyName; - m_setterName = wxT("Set")+propertyName; -} - -wxGenericPropertyAccessor::~wxGenericPropertyAccessor() -{ - delete m_data; -} - -void wxGenericPropertyAccessor::SetProperty(wxObject *object, const wxAny &value) const -{ - wxDynamicObject* dynobj = wx_dynamic_cast(wxDynamicObject*, object); - wxASSERT_MSG( dynobj, wxT("cannot call wxDynamicClassInfo::SetProperty on an object other than wxDynamicObject") ); - dynobj->SetProperty(m_propertyName.c_str(), value ); -} - -void wxGenericPropertyAccessor::GetProperty(const wxObject *object, wxAny& value) const -{ - const wxDynamicObject* dynobj = wx_dynamic_cast( const wxDynamicObject * , object ); - wxASSERT_MSG( dynobj, wxT("cannot call wxDynamicClassInfo::SetProperty on an object other than wxDynamicObject") ); - value = dynobj->GetProperty( m_propertyName.c_str() ); -} - -// ---------------------------------------------------------------------------- -// wxGenericPropertyAccessor -// ---------------------------------------------------------------------------- - -wxString wxAnyGetAsString( const wxAny& data) -{ - if ( data.IsNull() || data.GetTypeInfo()==NULL ) - return wxEmptyString; - - wxString s; - data.GetTypeInfo()->ConvertToString(data,s); - return s; -} - -const wxObject* wxAnyGetAsObjectPtr( const wxAny& data) -{ - if ( !data.IsNull() ) - { - const wxClassTypeInfo* ti = wx_dynamic_cast(const wxClassTypeInfo*, data.GetTypeInfo()); - if( ti ) - return ti->GetClassInfo()->AnyToObjectPtr(data); - } - return NULL; -} - -wxObjectFunctor::~wxObjectFunctor() -{}; - -#endif // wxUSE_EXTENDED_RTTI diff --git a/Externals/wxWidgets3/src/common/xtistrm.cpp b/Externals/wxWidgets3/src/common/xtistrm.cpp deleted file mode 100644 index b4ec20d411..0000000000 --- a/Externals/wxWidgets3/src/common/xtistrm.cpp +++ /dev/null @@ -1,676 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/xtistrm.cpp -// Purpose: streaming runtime metadata information -// Author: Stefan Csomor -// Modified by: -// Created: 27/07/03 -// Copyright: (c) 2003 Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_EXTENDED_RTTI - -#include "wx/xtistrm.h" - -#ifndef WX_PRECOMP - #include "wx/object.h" - #include "wx/hash.h" - #include "wx/event.h" -#endif - -#include "wx/tokenzr.h" -#include "wx/txtstrm.h" - -// STL headers: - -#include "wx/beforestd.h" -#include -#include -#include -#include "wx/afterstd.h" -using namespace std; - - -// ---------------------------------------------------------------------------- -// wxObjectWriter -// ---------------------------------------------------------------------------- - -struct wxObjectWriter::wxObjectWriterInternal -{ - map< const wxObject*, int > m_writtenObjects; - int m_nextId; -}; - -wxObjectWriter::wxObjectWriter() -{ - m_data = new wxObjectWriterInternal; - m_data->m_nextId = 0; -} - -wxObjectWriter::~wxObjectWriter() -{ - delete m_data; -} - -struct wxObjectWriter::wxObjectWriterInternalPropertiesData -{ - char nothing; -}; - -void wxObjectWriter::ClearObjectContext() -{ - delete m_data; - m_data = new wxObjectWriterInternal(); - m_data->m_nextId = 0; -} - -void wxObjectWriter::WriteObject(const wxObject *object, const wxClassInfo *classInfo, - wxObjectWriterCallback *writercallback, const wxString &name, - const wxStringToAnyHashMap &metadata ) -{ - DoBeginWriteTopLevelEntry( name ); - WriteObject( object, classInfo, writercallback, false, metadata); - DoEndWriteTopLevelEntry( name ); -} - -void wxObjectWriter::WriteObject(const wxObject *object, const wxClassInfo *classInfo, - wxObjectWriterCallback *writercallback, bool isEmbedded, - const wxStringToAnyHashMap &metadata ) -{ - if ( !classInfo->BeforeWriteObject( object, this, writercallback, metadata) ) - return; - - if ( writercallback->BeforeWriteObject( this, object, classInfo, metadata) ) - { - if ( object == NULL ) - DoWriteNullObject(); - else if ( IsObjectKnown( object ) ) - DoWriteRepeatedObject( GetObjectID(object) ); - else - { - int oid = m_data->m_nextId++; - if ( !isEmbedded ) - m_data->m_writtenObjects[object] = oid; - - // in case this object is a wxDynamicObject we also have to insert is superclass - // instance with the same id, so that object relations are streamed out correctly - const wxDynamicObject* dynobj = wx_dynamic_cast(const wxDynamicObject*, object); - if ( !isEmbedded && dynobj ) - m_data->m_writtenObjects[dynobj->GetSuperClassInstance()] = oid; - - DoBeginWriteObject( object, classInfo, oid, metadata ); - wxObjectWriterInternalPropertiesData data; - WriteAllProperties( object, classInfo, writercallback, &data ); - DoEndWriteObject( object, classInfo, oid ); - } - writercallback->AfterWriteObject( this,object, classInfo ); - } -} - -void wxObjectWriter::FindConnectEntry(const wxEvtHandler * evSource, - const wxEventSourceTypeInfo* dti, - const wxObject* &sink, - const wxHandlerInfo *&handler) -{ - size_t cookie; - for ( wxDynamicEventTableEntry* entry = evSource->GetFirstDynamicEntry(cookie); - entry; - entry = evSource->GetNextDynamicEntry(cookie) ) - { - // find the match - if ( entry->m_fn && - (dti->GetEventType() == entry->m_eventType) && - (entry->m_id == -1 ) && - (entry->m_fn->GetEvtHandler() != NULL ) ) - { - sink = entry->m_fn->GetEvtHandler(); - const wxClassInfo* sinkClassInfo = sink->GetClassInfo(); - const wxHandlerInfo* sinkHandler = sinkClassInfo->GetFirstHandler(); - while ( sinkHandler ) - { - if ( sinkHandler->GetEventFunction() == entry->m_fn->GetEvtMethod() ) - { - handler = sinkHandler; - break; - } - sinkHandler = sinkHandler->GetNext(); - } - break; - } - } -} -void wxObjectWriter::WriteAllProperties( const wxObject * obj, const wxClassInfo* ci, - wxObjectWriterCallback *writercallback, - wxObjectWriterInternalPropertiesData * data ) -{ - wxPropertyInfoMap map; - ci->GetProperties( map ); - for ( int i = 0; i < ci->GetCreateParamCount(); ++i ) - { - wxString name = ci->GetCreateParamName(i); - wxPropertyInfoMap::const_iterator iter = map.find(name); - const wxPropertyInfo* prop = iter == map.end() ? NULL : iter->second; - if ( prop ) - { - WriteOneProperty( obj, prop->GetDeclaringClass(), prop, writercallback, data ); - } - else - { - wxLogError( _("Create Parameter %s not found in declared RTTI Parameters"), name.c_str() ); - } - map.erase( name ); - } - { // Extra block for broken compilers - for( wxPropertyInfoMap::iterator iter = map.begin(); iter != map.end(); ++iter ) - { - const wxPropertyInfo* prop = iter->second; - if ( prop->GetFlags() & wxPROP_OBJECT_GRAPH ) - { - WriteOneProperty( obj, prop->GetDeclaringClass(), prop, writercallback, data ); - } - } - } - { // Extra block for broken compilers - for( wxPropertyInfoMap::iterator iter = map.begin(); iter != map.end(); ++iter ) - { - const wxPropertyInfo* prop = iter->second; - if ( !(prop->GetFlags() & wxPROP_OBJECT_GRAPH) ) - { - WriteOneProperty( obj, prop->GetDeclaringClass(), prop, writercallback, data ); - } - } - } -} - -class WXDLLIMPEXP_BASE wxObjectPropertyWriter: public wxObjectWriterFunctor -{ -public: - wxObjectPropertyWriter(const wxClassTypeInfo* cti, - wxObjectWriterCallback *writercallback, - wxObjectWriter* writer, - wxStringToAnyHashMap &props) : - m_cti(cti),m_persister(writercallback),m_writer(writer),m_props(props) - {} - - virtual void operator()(const wxObject *vobj) - { - m_writer->WriteObject( vobj, (vobj ? vobj->GetClassInfo() : m_cti->GetClassInfo() ), - m_persister, m_cti->GetKind()== wxT_OBJECT, m_props ); - } -private: - const wxClassTypeInfo* m_cti; - wxObjectWriterCallback *m_persister; - wxObjectWriter* m_writer; - wxStringToAnyHashMap& m_props; -}; - -void wxObjectWriter::WriteOneProperty( const wxObject *obj, const wxClassInfo* ci, - const wxPropertyInfo* pi, wxObjectWriterCallback *writercallback, - wxObjectWriterInternalPropertiesData *WXUNUSED(data) ) -{ - if ( pi->GetFlags() & wxPROP_DONT_STREAM ) - return; - - // make sure that we are picking the correct object for accessing the property - const wxDynamicObject* dynobj = wx_dynamic_cast(const wxDynamicObject*, obj ); - if ( dynobj && (wx_dynamic_cast(const wxDynamicClassInfo*, ci) == NULL) ) - obj = dynobj->GetSuperClassInstance(); - - if ( pi->GetTypeInfo()->GetKind() == wxT_COLLECTION ) - { - wxAnyList data; - pi->GetAccessor()->GetPropertyCollection(obj, data); - const wxTypeInfo * elementType = - wx_dynamic_cast( const wxCollectionTypeInfo*, pi->GetTypeInfo() )->GetElementType(); - if ( !data.empty() ) - { - DoBeginWriteProperty( pi ); - for ( wxAnyList::const_iterator iter = data.begin(); iter != data.end(); ++iter ) - { - DoBeginWriteElement(); - const wxAny* valptr = *iter; - if ( writercallback->BeforeWriteProperty( this, obj, pi, *valptr ) ) - { - const wxClassTypeInfo* cti = - wx_dynamic_cast( const wxClassTypeInfo*, elementType ); - if ( cti ) - { - wxStringToAnyHashMap md; - wxObjectPropertyWriter pw(cti,writercallback,this, md); - - const wxClassInfo* pci = cti->GetClassInfo(); - pci->CallOnAny( *valptr, &pw); - } - else - { - DoWriteSimpleType( *valptr ); - } - } - DoEndWriteElement(); - } - DoEndWriteProperty( pi ); - } - } - else - { - const wxEventSourceTypeInfo* dti = - wx_dynamic_cast( const wxEventSourceTypeInfo* , pi->GetTypeInfo() ); - if ( dti ) - { - const wxObject* sink = NULL; - const wxHandlerInfo *handler = NULL; - - const wxEvtHandler * evSource = wx_dynamic_cast(const wxEvtHandler *, obj); - if ( evSource ) - { - FindConnectEntry( evSource, dti, sink, handler ); - if ( writercallback->BeforeWriteDelegate( this, obj, ci, pi, sink, handler ) ) - { - if ( sink != NULL && handler != NULL ) - { - DoBeginWriteProperty( pi ); - if ( IsObjectKnown( sink ) ) - { - DoWriteDelegate( obj, ci, pi, sink, GetObjectID( sink ), - sink->GetClassInfo(), handler ); - DoEndWriteProperty( pi ); - } - else - { - wxLogError( wxT("Streaming delegates for not already ") - wxT("streamed objects not yet supported") ); - } - } - } - } - else - { - wxLogError(_("Illegal Object Class (Non-wxEvtHandler) as Event Source") ); - } - } - else - { - wxAny value; - pi->GetAccessor()->GetProperty(obj, value); - - // avoid streaming out void objects - // TODO Verify - if( value.IsNull() ) - return; - - if ( pi->GetFlags() & wxPROP_ENUM_STORE_LONG ) - { - const wxEnumTypeInfo *eti = - wx_dynamic_cast(const wxEnumTypeInfo*, pi->GetTypeInfo() ); - if ( eti ) - { - eti->ConvertFromLong( value.As(), value ); - } - else - { - wxLogError( _("Type must have enum - long conversion") ); - } - } - - // avoid streaming out default values - if ( pi->GetTypeInfo()->HasStringConverters() && - !pi->GetDefaultValue().IsNull() ) // TODO Verify - { - if ( wxAnyGetAsString(value) == wxAnyGetAsString(pi->GetDefaultValue()) ) - return; - } - - // avoid streaming out null objects - const wxClassTypeInfo* cti = - wx_dynamic_cast( const wxClassTypeInfo* , pi->GetTypeInfo() ); - - if ( cti && cti->GetKind() == wxT_OBJECT_PTR && wxAnyGetAsObjectPtr(value) == NULL ) - return; - - if ( writercallback->BeforeWriteProperty( this, obj, pi, value ) ) - { - DoBeginWriteProperty( pi ); - if ( cti ) - { - if ( cti->HasStringConverters() ) - { - wxString stringValue; - cti->ConvertToString( value, stringValue ); - wxAny convertedValue(stringValue); - DoWriteSimpleType( convertedValue ); - } - else - { - wxStringToAnyHashMap md; - wxObjectPropertyWriter pw(cti,writercallback,this, md); - - const wxClassInfo* pci = cti->GetClassInfo(); - pci->CallOnAny(value, &pw); - } - } - else - { - DoWriteSimpleType( value ); - } - DoEndWriteProperty( pi ); - } - } - } -} - -int wxObjectWriter::GetObjectID(const wxObject *obj) -{ - if ( !IsObjectKnown( obj ) ) - return wxInvalidObjectID; - - return m_data->m_writtenObjects[obj]; -} - -bool wxObjectWriter::IsObjectKnown( const wxObject *obj ) -{ - return m_data->m_writtenObjects.find( obj ) != m_data->m_writtenObjects.end(); -} - - -// ---------------------------------------------------------------------------- -// wxObjectReader -// ---------------------------------------------------------------------------- - -struct wxObjectReader::wxObjectReaderInternal -{ - map m_classInfos; -}; - -wxObjectReader::wxObjectReader() -{ - m_data = new wxObjectReaderInternal; -} - -wxObjectReader::~wxObjectReader() -{ - delete m_data; -} - -wxClassInfo* wxObjectReader::GetObjectClassInfo(int objectID) -{ - if ( objectID == wxNullObjectID || objectID == wxInvalidObjectID ) - { - wxLogError( _("Invalid or Null Object ID passed to GetObjectClassInfo" ) ); - return NULL; - } - if ( m_data->m_classInfos.find(objectID) == m_data->m_classInfos.end() ) - { - wxLogError( _("Unknown Object passed to GetObjectClassInfo" ) ); - return NULL; - } - return m_data->m_classInfos[objectID]; -} - -void wxObjectReader::SetObjectClassInfo(int objectID, wxClassInfo *classInfo ) -{ - if ( objectID == wxNullObjectID || objectID == wxInvalidObjectID ) - { - wxLogError( _("Invalid or Null Object ID passed to GetObjectClassInfo" ) ); - return; - } - if ( m_data->m_classInfos.find(objectID) != m_data->m_classInfos.end() ) - { - wxLogError( _("Already Registered Object passed to SetObjectClassInfo" ) ); - return; - } - m_data->m_classInfos[objectID] = classInfo; -} - -bool wxObjectReader::HasObjectClassInfo( int objectID ) -{ - if ( objectID == wxNullObjectID || objectID == wxInvalidObjectID ) - { - wxLogError( _("Invalid or Null Object ID passed to HasObjectClassInfo" ) ); - return false; - } - return m_data->m_classInfos.find(objectID) != m_data->m_classInfos.end(); -} - - -// ---------------------------------------------------------------------------- -// reading xml in -// ---------------------------------------------------------------------------- - -/* -Reading components has not to be extended for components -as properties are always sought by typeinfo over all levels -and create params are always toplevel class only -*/ - - -// ---------------------------------------------------------------------------- -// wxObjectRuntimeReaderCallback - depersisting to memory -// ---------------------------------------------------------------------------- - -struct wxObjectRuntimeReaderCallback::wxObjectRuntimeReaderCallbackInternal -{ - map m_objects; - - void SetObject(int objectID, wxObject *obj ) - { - if ( m_objects.find(objectID) != m_objects.end() ) - { - wxLogError( _("Passing a already registered object to SetObject") ); - return ; - } - m_objects[objectID] = obj; - } - wxObject* GetObject( int objectID ) - { - if ( objectID == wxNullObjectID ) - return NULL; - if ( m_objects.find(objectID) == m_objects.end() ) - { - wxLogError( _("Passing an unknown object to GetObject") ); - return NULL; - } - - return m_objects[objectID]; - } -}; - -wxObjectRuntimeReaderCallback::wxObjectRuntimeReaderCallback() -{ - m_data = new wxObjectRuntimeReaderCallbackInternal(); -} - -wxObjectRuntimeReaderCallback::~wxObjectRuntimeReaderCallback() -{ - delete m_data; -} - -void wxObjectRuntimeReaderCallback::AllocateObject(int objectID, wxClassInfo *classInfo, - wxStringToAnyHashMap &WXUNUSED(metadata)) -{ - wxObject *O; - O = classInfo->CreateObject(); - m_data->SetObject(objectID, O); -} - -void wxObjectRuntimeReaderCallback::CreateObject(int objectID, - const wxClassInfo *classInfo, - int paramCount, - wxAny *params, - int *objectIdValues, - const wxClassInfo **objectClassInfos, - wxStringToAnyHashMap &WXUNUSED(metadata)) -{ - wxObject *o; - o = m_data->GetObject(objectID); - for ( int i = 0; i < paramCount; ++i ) - { - if ( objectIdValues[i] != wxInvalidObjectID ) - { - wxObject *o; - o = m_data->GetObject(objectIdValues[i]); - // if this is a dynamic object and we are asked for another class - // than wxDynamicObject we cast it down manually. - wxDynamicObject *dyno = wx_dynamic_cast( wxDynamicObject *, o); - if ( dyno!=NULL && (objectClassInfos[i] != dyno->GetClassInfo()) ) - { - o = dyno->GetSuperClassInstance(); - } - params[i] = objectClassInfos[i]->ObjectPtrToAny(o); - } - } - classInfo->Create(o, paramCount, params); -} - -void wxObjectRuntimeReaderCallback::ConstructObject(int objectID, - const wxClassInfo *classInfo, - int paramCount, - wxAny *params, - int *objectIdValues, - const wxClassInfo **objectClassInfos, - wxStringToAnyHashMap &WXUNUSED(metadata)) -{ - wxObject *o; - for ( int i = 0; i < paramCount; ++i ) - { - if ( objectIdValues[i] != wxInvalidObjectID ) - { - wxObject *o; - o = m_data->GetObject(objectIdValues[i]); - // if this is a dynamic object and we are asked for another class - // than wxDynamicObject we cast it down manually. - wxDynamicObject *dyno = wx_dynamic_cast( wxDynamicObject *, o); - if ( dyno!=NULL && (objectClassInfos[i] != dyno->GetClassInfo()) ) - { - o = dyno->GetSuperClassInstance(); - } - params[i] = objectClassInfos[i]->ObjectPtrToAny(o); - } - } - o = classInfo->ConstructObject(paramCount, params); - m_data->SetObject(objectID, o); -} - - -void wxObjectRuntimeReaderCallback::DestroyObject(int objectID, wxClassInfo *WXUNUSED(classInfo)) -{ - wxObject *o; - o = m_data->GetObject(objectID); - delete o; -} - -void wxObjectRuntimeReaderCallback::SetProperty(int objectID, - const wxClassInfo *classInfo, - const wxPropertyInfo* propertyInfo, - const wxAny &value) -{ - wxObject *o; - o = m_data->GetObject(objectID); - classInfo->SetProperty( o, propertyInfo->GetName().c_str(), value ); -} - -void wxObjectRuntimeReaderCallback::SetPropertyAsObject(int objectID, - const wxClassInfo *classInfo, - const wxPropertyInfo* propertyInfo, - int valueObjectId) -{ - wxObject *o, *valo; - o = m_data->GetObject(objectID); - valo = m_data->GetObject(valueObjectId); - const wxClassInfo* valClassInfo = - (wx_dynamic_cast(const wxClassTypeInfo*,propertyInfo->GetTypeInfo()))->GetClassInfo(); - - // if this is a dynamic object and we are asked for another class - // than wxDynamicObject we cast it down manually. - wxDynamicObject *dynvalo = wx_dynamic_cast( wxDynamicObject *, valo); - if ( dynvalo!=NULL && (valClassInfo != dynvalo->GetClassInfo()) ) - { - valo = dynvalo->GetSuperClassInstance(); - } - - classInfo->SetProperty( o, propertyInfo->GetName().c_str(), - valClassInfo->ObjectPtrToAny(valo) ); -} - -void wxObjectRuntimeReaderCallback::SetConnect(int eventSourceObjectID, - const wxClassInfo *WXUNUSED(eventSourceClassInfo), - const wxPropertyInfo *delegateInfo, - const wxClassInfo *WXUNUSED(eventSinkClassInfo), - const wxHandlerInfo* handlerInfo, - int eventSinkObjectID ) -{ - wxEvtHandler *ehsource = - wx_dynamic_cast( wxEvtHandler* , m_data->GetObject( eventSourceObjectID ) ); - wxEvtHandler *ehsink = - wx_dynamic_cast( wxEvtHandler *,m_data->GetObject(eventSinkObjectID) ); - - if ( ehsource && ehsink ) - { - const wxEventSourceTypeInfo *delegateTypeInfo = - wx_dynamic_cast(const wxEventSourceTypeInfo*,delegateInfo->GetTypeInfo()); - if( delegateTypeInfo && delegateTypeInfo->GetLastEventType() == -1 ) - { - ehsource->Connect( -1, delegateTypeInfo->GetEventType(), - handlerInfo->GetEventFunction(), NULL /*user data*/, - ehsink ); - } - else - { - for ( wxEventType iter = delegateTypeInfo->GetEventType(); - iter <= delegateTypeInfo->GetLastEventType(); ++iter ) - { - ehsource->Connect( -1, iter, - handlerInfo->GetEventFunction(), NULL /*user data*/, - ehsink ); - } - } - } -} - -wxObject *wxObjectRuntimeReaderCallback::GetObject(int objectID) -{ - return m_data->GetObject( objectID ); -} - -void wxObjectRuntimeReaderCallback::AddToPropertyCollection( int objectID, - const wxClassInfo *classInfo, - const wxPropertyInfo* propertyInfo, - const wxAny &value) -{ - wxObject *o; - o = m_data->GetObject(objectID); - classInfo->AddToPropertyCollection( o, propertyInfo->GetName().c_str(), value ); -} - -void wxObjectRuntimeReaderCallback::AddToPropertyCollectionAsObject(int objectID, - const wxClassInfo *classInfo, - const wxPropertyInfo* propertyInfo, - int valueObjectId) -{ - wxObject *o, *valo; - o = m_data->GetObject(objectID); - valo = m_data->GetObject(valueObjectId); - const wxCollectionTypeInfo * collectionTypeInfo = - wx_dynamic_cast( const wxCollectionTypeInfo *, propertyInfo->GetTypeInfo() ); - const wxClassInfo* valClassInfo = - (wx_dynamic_cast(const wxClassTypeInfo*,collectionTypeInfo->GetElementType()))->GetClassInfo(); - - // if this is a dynamic object and we are asked for another class - // than wxDynamicObject we cast it down manually. - wxDynamicObject *dynvalo = wx_dynamic_cast( wxDynamicObject *, valo); - if ( dynvalo!=NULL && (valClassInfo != dynvalo->GetClassInfo()) ) - { - valo = dynvalo->GetSuperClassInstance(); - } - - classInfo->AddToPropertyCollection( o, propertyInfo->GetName().c_str(), - valClassInfo->ObjectPtrToAny(valo) ); -} - -#endif // wxUSE_EXTENDED_RTTI diff --git a/Externals/wxWidgets3/src/common/xtixml.cpp b/Externals/wxWidgets3/src/common/xtixml.cpp deleted file mode 100644 index 4a37afe6b6..0000000000 --- a/Externals/wxWidgets3/src/common/xtixml.cpp +++ /dev/null @@ -1,552 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/xtixml.cpp -// Purpose: streaming runtime metadata information -// Author: Stefan Csomor -// Modified by: -// Created: 27/07/03 -// Copyright: (c) 2003 Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ -#pragma hdrstop -#endif - -#if wxUSE_EXTENDED_RTTI - -#include "wx/xtistrm.h" - -#ifndef WX_PRECOMP - #include "wx/object.h" - #include "wx/hash.h" - #include "wx/event.h" -#endif - -#include "wx/xml/xml.h" -#include "wx/tokenzr.h" -#include "wx/txtstrm.h" -#include "wx/xtistrm.h" -#include "wx/xtixml.h" - -// STL headers - -#include "wx/beforestd.h" -#include -#include -#include -#include "wx/afterstd.h" - -using namespace std; - - - - -// ---------------------------------------------------------------------------- -// wxObjectXmlWriter -// ---------------------------------------------------------------------------- - -// convenience functions - -void wxXmlAddContentToNode( wxXmlNode* node, const wxString& data ) -{ - node->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxT("value"), data ) ); -} - -wxString wxXmlGetContentFromNode( wxXmlNode *node ) -{ - if ( node->GetChildren() ) - return node->GetChildren()->GetContent(); - else - return wxEmptyString; -} - -struct wxObjectXmlWriter::wxObjectXmlWriterInternal -{ - wxXmlNode *m_root; - wxXmlNode *m_current; - vector< wxXmlNode * > m_objectStack; - - void Push( wxXmlNode *newCurrent ) - { - m_objectStack.push_back( m_current ); - m_current = newCurrent; - } - - void Pop() - { - m_current = m_objectStack.back(); - m_objectStack.pop_back(); - } -}; - -wxObjectXmlWriter::wxObjectXmlWriter( wxXmlNode * rootnode ) -{ - m_data = new wxObjectXmlWriterInternal(); - m_data->m_root = rootnode; - m_data->m_current = rootnode; -} - -wxObjectXmlWriter::~wxObjectXmlWriter() -{ - delete m_data; -} - -void wxObjectXmlWriter::DoBeginWriteTopLevelEntry( const wxString &name ) -{ - wxXmlNode *pnode; - pnode = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("entry")); - pnode->AddProperty(wxString(wxT("name")), name); - m_data->m_current->AddChild(pnode); - m_data->Push( pnode ); -} - -void wxObjectXmlWriter::DoEndWriteTopLevelEntry( const wxString &WXUNUSED(name) ) -{ - m_data->Pop(); -} - -void wxObjectXmlWriter::DoBeginWriteObject(const wxObject *WXUNUSED(object), - const wxClassInfo *classInfo, - int objectID, const wxStringToAnyHashMap &metadata ) -{ - wxXmlNode *pnode; - pnode = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("object")); - pnode->AddProperty(wxT("class"), wxString(classInfo->GetClassName())); - pnode->AddProperty(wxT("id"), wxString::Format( wxT("%d"), objectID ) ); - - wxStringToAnyHashMap::const_iterator it, en; - for( it = metadata.begin(), en = metadata.end(); it != en; ++it ) - { - pnode->AddProperty( it->first, wxAnyGetAsString(it->second) ); - } - - m_data->m_current->AddChild(pnode); - m_data->Push( pnode ); -} - -void wxObjectXmlWriter::DoEndWriteObject(const wxObject *WXUNUSED(object), - const wxClassInfo *WXUNUSED(classInfo), - int WXUNUSED(objectID) ) -{ - m_data->Pop(); -} - -void wxObjectXmlWriter::DoWriteSimpleType( const wxAny &value ) -{ - wxXmlAddContentToNode( m_data->m_current,wxAnyGetAsString(value) ); -} - -void wxObjectXmlWriter::DoBeginWriteElement() -{ - wxXmlNode *pnode; - pnode = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("element") ); - m_data->m_current->AddChild(pnode); - m_data->Push( pnode ); -} - -void wxObjectXmlWriter::DoEndWriteElement() -{ - m_data->Pop(); -} - -void wxObjectXmlWriter::DoBeginWriteProperty(const wxPropertyInfo *pi ) -{ - wxXmlNode *pnode; - pnode = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("prop") ); - pnode->AddProperty(wxT("name"), pi->GetName() ); - m_data->m_current->AddChild(pnode); - m_data->Push( pnode ); -} - -void wxObjectXmlWriter::DoEndWriteProperty(const wxPropertyInfo *WXUNUSED(propInfo) ) -{ - m_data->Pop(); -} - -void wxObjectXmlWriter::DoWriteRepeatedObject( int objectID ) -{ - wxXmlNode *pnode; - pnode = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("object")); - pnode->AddProperty(wxString(wxT("href")), wxString::Format( wxT("%d"), objectID ) ); - m_data->m_current->AddChild(pnode); -} - -void wxObjectXmlWriter::DoWriteNullObject() -{ - wxXmlNode *pnode; - pnode = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("object")); - m_data->m_current->AddChild(pnode); -} - -void wxObjectXmlWriter::DoWriteDelegate( const wxObject *WXUNUSED(object), - const wxClassInfo* WXUNUSED(classInfo), - const wxPropertyInfo *WXUNUSED(pi), - const wxObject *eventSink, int sinkObjectID, - const wxClassInfo* WXUNUSED(eventSinkClassInfo), - const wxHandlerInfo* handlerInfo ) -{ - if ( eventSink != NULL && handlerInfo != NULL ) - { - wxXmlAddContentToNode( m_data->m_current, - wxString::Format(wxT("%d.%s"), sinkObjectID, handlerInfo->GetName().c_str()) ); - } -} - - -// ---------------------------------------------------------------------------- -// wxObjectXmlReader -// ---------------------------------------------------------------------------- - -/* -Reading components has not to be extended for components -as properties are always sought by typeinfo over all levels -and create params are always toplevel class only -*/ - -int wxObjectXmlReader::ReadComponent(wxXmlNode *node, wxObjectReaderCallback *callbacks) -{ - wxASSERT_MSG( callbacks, wxT("Does not support reading without a Depersistor") ); - wxString className; - wxClassInfo *classInfo; - - wxAny *createParams; - int *createParamOids; - const wxClassInfo** createClassInfos; - wxXmlNode *children; - int objectID; - wxString ObjectIdString; - - children = node->GetChildren(); - if (!children) - { - // check for a null object or href - if (node->GetAttribute(wxT("href"), &ObjectIdString ) ) - { - objectID = atoi( ObjectIdString.ToAscii() ); - if ( HasObjectClassInfo( objectID ) ) - { - return objectID; - } - else - { - wxLogError( _("Forward hrefs are not supported") ); - return wxInvalidObjectID; - } - } - if ( !node->GetAttribute(wxT("id"), &ObjectIdString ) ) - { - return wxNullObjectID; - } - } - if (!node->GetAttribute(wxT("class"), &className)) - { - // No class name. Eek. FIXME: error handling - return wxInvalidObjectID; - } - - classInfo = wxClassInfo::FindClass(className); - if ( classInfo == NULL ) - { - wxLogError( wxString::Format(_("unknown class %s"),className ) ); - return wxInvalidObjectID; - } - - if ( children != NULL && children->GetType() == wxXML_TEXT_NODE ) - { - wxLogError(_("objects cannot have XML Text Nodes") ); - return wxInvalidObjectID; - } - if (!node->GetAttribute(wxT("id"), &ObjectIdString)) - { - wxLogError(_("Objects must have an id attribute") ); - // No object id. Eek. FIXME: error handling - return wxInvalidObjectID; - } - objectID = atoi( ObjectIdString.ToAscii() ); - - // is this object already has been streamed in, return it here - if ( HasObjectClassInfo( objectID ) ) - { - wxLogError ( wxString::Format(_("Doubly used id : %d"), objectID ) ); - return wxInvalidObjectID; - } - - // new object, start with allocation - // first make the object know to our internal registry - SetObjectClassInfo( objectID, classInfo ); - - wxStringToAnyHashMap metadata; - wxXmlProperty *xp = node->GetAttributes(); - while ( xp ) - { - if ( xp->GetName() != wxString(wxT("class")) && - xp->GetName() != wxString(wxT("id")) ) - { - metadata[xp->GetName()] = wxAny( xp->GetValue() ); - } - xp = xp->GetNext(); - } - if ( !classInfo->NeedsDirectConstruction() ) - callbacks->AllocateObject(objectID, classInfo, metadata); - - // - // stream back the Create parameters first - createParams = new wxAny[ classInfo->GetCreateParamCount() ]; - createParamOids = new int[classInfo->GetCreateParamCount() ]; - createClassInfos = new const wxClassInfo*[classInfo->GetCreateParamCount() ]; - -#if wxUSE_UNICODE - typedef map PropertyNodes; - typedef vector PropertyNames; -#else - typedef map PropertyNodes; - typedef vector PropertyNames; -#endif - PropertyNodes propertyNodes; - PropertyNames propertyNames; - - while( children ) - { - wxString name; - children->GetAttribute( wxT("name"), &name ); - propertyNames.push_back( (const wxChar*)name.c_str() ); - propertyNodes[(const wxChar*)name.c_str()] = children->GetChildren(); - children = children->GetNext(); - } - - for ( int i = 0; i GetCreateParamCount(); ++i ) - { - const wxChar* paramName = classInfo->GetCreateParamName(i); - PropertyNodes::iterator propiter = propertyNodes.find( paramName ); - const wxPropertyInfo* pi = classInfo->FindPropertyInfo( paramName ); - if ( pi == 0 ) - { - wxLogError( wxString::Format(_("Unknown Property %s"),paramName) ); - } - // if we don't have the value of a create param set in the xml - // we use the default value - if ( propiter != propertyNodes.end() ) - { - wxXmlNode* prop = propiter->second; - if ( pi->GetTypeInfo()->IsObjectType() ) - { - createParamOids[i] = ReadComponent( prop, callbacks ); - createClassInfos[i] = - wx_dynamic_cast(const wxClassTypeInfo*, pi->GetTypeInfo())->GetClassInfo(); - } - else - { - createParamOids[i] = wxInvalidObjectID; - createParams[i] = ReadValue( prop, pi->GetTypeInfo() ); - if( pi->GetFlags() & wxPROP_ENUM_STORE_LONG ) - { - const wxEnumTypeInfo *eti = - wx_dynamic_cast(const wxEnumTypeInfo*, pi->GetTypeInfo() ); - if ( eti ) - { - long realval; - eti->ConvertToLong( createParams[i], realval ); - createParams[i] = wxAny( realval ); - } - else - { - wxLogError( _("Type must have enum - long conversion") ); - } - } - createClassInfos[i] = NULL; - } - - for ( size_t j = 0; j < propertyNames.size(); ++j ) - { - if ( propertyNames[j] == paramName ) - { - propertyNames[j] = wxEmptyString; - break; - } - } - } - else - { - if ( pi->GetTypeInfo()->IsObjectType() ) - { - createParamOids[i] = wxNullObjectID; - createClassInfos[i] = - wx_dynamic_cast(const wxClassTypeInfo*, pi->GetTypeInfo())->GetClassInfo(); - } - else - { - createParams[i] = pi->GetDefaultValue(); - createParamOids[i] = wxInvalidObjectID; - } - } - } - - // got the parameters. Call the Create method - if ( classInfo->NeedsDirectConstruction() ) - callbacks->ConstructObject(objectID, classInfo, - classInfo->GetCreateParamCount(), - createParams, createParamOids, createClassInfos, metadata ); - else - callbacks->CreateObject(objectID, classInfo, - classInfo->GetCreateParamCount(), - createParams, createParamOids, createClassInfos, metadata ); - - // now stream in the rest of the properties, in the sequence their - // properties were written in the xml - for ( size_t j = 0; j < propertyNames.size(); ++j ) - { - if ( !propertyNames[j].empty() ) - { - PropertyNodes::iterator propiter = propertyNodes.find( propertyNames[j] ); - if ( propiter != propertyNodes.end() ) - { - wxXmlNode* prop = propiter->second; - const wxPropertyInfo* pi = - classInfo->FindPropertyInfo( propertyNames[j].c_str() ); - if ( pi->GetTypeInfo()->GetKind() == wxT_COLLECTION ) - { - const wxCollectionTypeInfo* collType = - wx_dynamic_cast( const wxCollectionTypeInfo*, pi->GetTypeInfo() ); - const wxTypeInfo * elementType = collType->GetElementType(); - while( prop ) - { - if ( prop->GetName() != wxT("element") ) - { - wxLogError( _("A non empty collection must consist of 'element' nodes" ) ); - break; - } - - wxXmlNode* elementContent = prop->GetChildren(); - if ( elementContent ) - { - // we skip empty elements - if ( elementType->IsObjectType() ) - { - int valueId = ReadComponent( elementContent, callbacks ); - if ( valueId != wxInvalidObjectID ) - { - if ( pi->GetAccessor()->HasAdder() ) - callbacks->AddToPropertyCollectionAsObject( objectID, classInfo, pi, valueId ); - // TODO for collections we must have a notation on taking over ownership or not - if ( elementType->GetKind() == wxT_OBJECT && valueId != wxNullObjectID ) - callbacks->DestroyObject( valueId, GetObjectClassInfo( valueId ) ); - } - } - else - { - wxAny elementValue = ReadValue( elementContent, elementType ); - if ( pi->GetAccessor()->HasAdder() ) - callbacks->AddToPropertyCollection( objectID, classInfo,pi, elementValue ); - } - } - prop = prop->GetNext(); - } - } - else if ( pi->GetTypeInfo()->IsObjectType() ) - { - // and object can either be streamed out a string or as an object - // in case we have no node, then the object's streaming out has been vetoed - if ( prop ) - { - if ( prop->GetName() == wxT("object") ) - { - int valueId = ReadComponent( prop, callbacks ); - if ( valueId != wxInvalidObjectID ) - { - callbacks->SetPropertyAsObject( objectID, classInfo, pi, valueId ); - if ( pi->GetTypeInfo()->GetKind() == wxT_OBJECT && valueId != wxNullObjectID ) - callbacks->DestroyObject( valueId, GetObjectClassInfo( valueId ) ); - } - } - else - { - wxASSERT( pi->GetTypeInfo()->HasStringConverters() ); - wxAny nodeval = ReadValue( prop, pi->GetTypeInfo() ); - callbacks->SetProperty( objectID, classInfo,pi, nodeval ); - } - } - } - else if ( pi->GetTypeInfo()->IsDelegateType() ) - { - if ( prop ) - { - wxString resstring = prop->GetContent(); - wxInt32 pos = resstring.Find('.'); - if ( pos != wxNOT_FOUND ) - { - int sinkOid = atol(resstring.Left(pos).ToAscii()); - wxString handlerName = resstring.Mid(pos+1); - wxClassInfo* sinkClassInfo = GetObjectClassInfo( sinkOid ); - - callbacks->SetConnect( objectID, classInfo, pi, sinkClassInfo, - sinkClassInfo->FindHandlerInfo(handlerName.c_str()), sinkOid ); - } - else - { - wxLogError( _("incorrect event handler string, missing dot") ); - } - } - - } - else - { - wxAny nodeval = ReadValue( prop, pi->GetTypeInfo() ); - if( pi->GetFlags() & wxPROP_ENUM_STORE_LONG ) - { - const wxEnumTypeInfo *eti = - wx_dynamic_cast(const wxEnumTypeInfo*, pi->GetTypeInfo() ); - if ( eti ) - { - long realval; - eti->ConvertToLong( nodeval, realval ); - nodeval = wxAny( realval ); - } - else - { - wxLogError( _("Type must have enum - long conversion") ); - } - } - callbacks->SetProperty( objectID, classInfo,pi, nodeval ); - } - } - } - } - - delete[] createParams; - delete[] createParamOids; - delete[] createClassInfos; - - return objectID; -} - -wxAny wxObjectXmlReader::ReadValue(wxXmlNode *node, - const wxTypeInfo *type ) -{ - wxString content; - if ( node ) - content = node->GetContent(); - wxAny result; - type->ConvertFromString( content, result ); - return result; -} - -int wxObjectXmlReader::ReadObject( const wxString &name, wxObjectReaderCallback *callbacks) -{ - wxXmlNode *iter = m_parent->GetChildren(); - while ( iter ) - { - wxString entryName; - if ( iter->GetAttribute(wxT("name"), &entryName) ) - { - if ( entryName == name ) - return ReadComponent( iter->GetChildren(), callbacks ); - } - iter = iter->GetNext(); - } - return wxInvalidObjectID; -} - -#endif // wxUSE_EXTENDED_RTTI diff --git a/Externals/wxWidgets3/src/common/zipstrm.cpp b/Externals/wxWidgets3/src/common/zipstrm.cpp deleted file mode 100644 index aa68db4bb4..0000000000 --- a/Externals/wxWidgets3/src/common/zipstrm.cpp +++ /dev/null @@ -1,2573 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/common/zipstrm.cpp -// Purpose: Streams for Zip files -// Author: Mike Wetherell -// Copyright: (c) Mike Wetherell -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_ZIPSTREAM - -#include "wx/zipstrm.h" - -#ifndef WX_PRECOMP - #include "wx/hashmap.h" - #include "wx/intl.h" - #include "wx/log.h" - #include "wx/utils.h" -#endif - -#include "wx/datstrm.h" -#include "wx/zstream.h" -#include "wx/mstream.h" -#include "wx/scopedptr.h" -#include "wx/wfstream.h" -#include "zlib.h" - -// value for the 'version needed to extract' field (20 means 2.0) -enum { - VERSION_NEEDED_TO_EXTRACT = 20, - Z64_VERSION_NEEDED_TO_EXTRACT = 45 // File uses ZIP64 format extensions -}; - -// signatures for the various records (PKxx) -enum { - CENTRAL_MAGIC = 0x02014b50, // central directory record - LOCAL_MAGIC = 0x04034b50, // local header - END_MAGIC = 0x06054b50, // end of central directory record - SUMS_MAGIC = 0x08074b50, // data descriptor (info-zip) - Z64_LOC_MAGIC = 0x07064b50, // zip64 end of central directory locator - Z64_END_MAGIC = 0x06064b50 // zip64 end of central directory record -}; - -// unix file attributes. zip stores them in the high 16 bits of the -// 'external attributes' field, hence the extra zeros. -enum { - wxZIP_S_IFMT = 0xF0000000, - wxZIP_S_IFDIR = 0x40000000, - wxZIP_S_IFREG = 0x80000000 -}; - -// minimum sizes for the various records -enum { - CENTRAL_SIZE = 46, - LOCAL_SIZE = 30, - END_SIZE = 22, - SUMS_SIZE = 12, - Z64_LOC_SIZE = 20, - Z64_END_SIZE = 56 -}; - -// The number of bytes that must be written to an wxZipOutputStream before -// a zip entry is created. The purpose of this latency is so that -// OpenCompressor() can see a little data before deciding which compressor -// it should use. -enum { - OUTPUT_LATENCY = 4096 -}; - -// Some offsets into the local header -enum { - SUMS_OFFSET = 14 -}; - -wxIMPLEMENT_DYNAMIC_CLASS(wxZipEntry, wxArchiveEntry); -wxIMPLEMENT_DYNAMIC_CLASS(wxZipClassFactory, wxArchiveClassFactory); - - -///////////////////////////////////////////////////////////////////////////// -// Helpers - -// read a string of a given length -// -static wxString ReadString(wxInputStream& stream, wxUint16 len, wxMBConv& conv) -{ - if (len == 0) - return wxEmptyString; - -#if wxUSE_UNICODE - wxCharBuffer buf(len); - stream.Read(buf.data(), len); - wxString str(buf, conv); -#else - wxString str; - (void)conv; - { - wxStringBuffer buf(str, len); - stream.Read(buf, len); - } -#endif - - return str; -} - -static inline wxUint16 LimitUint16(wxUint64 value) -{ - if (value > 0xffff) - return 0xffff; - else - return wx_truncate_cast(wxUint16, value); -} - -static inline wxUint32 LimitUint32(wxUint64 value) -{ - if (value > 0xffffffff) - return 0xffffffff; - else - return wx_truncate_cast(wxUint32,value); -} - -// Decode a little endian wxUint64 number from a character array -// -static inline wxUint64 CrackUint64(const char *m) -{ - const unsigned char *n = (const unsigned char*)m; - return (static_cast(n[7]) << 56) | - (static_cast(n[6]) << 48) | - (static_cast(n[5]) << 40) | - (static_cast(n[4]) << 32) | - (n[3] << 24) | (n[2] << 16) | (n[1] << 8) | n[0]; -} - -// Decode a little endian wxUint32 number from a character array -// -static inline wxUint32 CrackUint32(const char *m) -{ - const unsigned char *n = (const unsigned char*)m; - return (n[3] << 24) | (n[2] << 16) | (n[1] << 8) | n[0]; -} - -// Decode a little endian wxUint16 number from a character array -// -static inline wxUint16 CrackUint16(const char *m) -{ - const unsigned char *n = (const unsigned char*)m; - return (n[1] << 8) | n[0]; -} - -// Temporarily lower the logging level in debug mode to avoid a warning -// from SeekI about seeking on a stream with data written back to it. -// -static wxFileOffset QuietSeek(wxInputStream& stream, wxFileOffset pos) -{ -#if wxUSE_LOG - wxLogLevel level = wxLog::GetLogLevel(); - wxLog::SetLogLevel(wxLOG_Debug - 1); - wxFileOffset result = stream.SeekI(pos); - wxLog::SetLogLevel(level); - return result; -#else - return stream.SeekI(pos); -#endif -} - - -///////////////////////////////////////////////////////////////////////////// -// Class factory - -static wxZipClassFactory g_wxZipClassFactory; - -wxZipClassFactory::wxZipClassFactory() -{ - if (this == &g_wxZipClassFactory) - PushFront(); -} - -const wxChar * const * -wxZipClassFactory::GetProtocols(wxStreamProtocolType type) const -{ - static const wxChar *protocols[] = { wxT("zip"), NULL }; - static const wxChar *mimetypes[] = { wxT("application/zip"), NULL }; - static const wxChar *fileexts[] = { wxT(".zip"), wxT(".htb"), NULL }; - static const wxChar *empty[] = { NULL }; - - switch (type) { - case wxSTREAM_PROTOCOL: return protocols; - case wxSTREAM_MIMETYPE: return mimetypes; - case wxSTREAM_FILEEXT: return fileexts; - default: return empty; - } -} - - -///////////////////////////////////////////////////////////////////////////// -// Read a zip header - -class wxZipHeader -{ -public: - wxZipHeader(wxInputStream& stream, size_t size); - wxZipHeader(const char* data, size_t size); - - inline wxUint8 Read8(); - inline wxUint16 Read16(); - inline wxUint32 Read32(); - inline wxUint64 Read64(); - - const char *GetData() const { return m_data; } - size_t GetSize() const { return m_size; } - operator bool() const { return m_ok; } - - size_t Seek(size_t pos) { m_pos = pos; return m_pos; } - size_t Skip(size_t size) { m_pos += size; return m_pos; } - - wxZipHeader& operator>>(wxUint8& n) { n = Read8(); return *this; } - wxZipHeader& operator>>(wxUint16& n) { n = Read16(); return *this; } - wxZipHeader& operator>>(wxUint32& n) { n = Read32(); return *this; } - wxZipHeader& operator>>(wxUint64& n) { n = Read64(); return *this; } - -private: - char m_data[64]; - size_t m_size; - size_t m_pos; - bool m_ok; -}; - -wxZipHeader::wxZipHeader(wxInputStream& stream, size_t size) - : m_size(0), - m_pos(0), - m_ok(false) -{ - wxCHECK_RET(size <= sizeof(m_data), wxT("buffer too small")); - m_size = stream.Read(m_data, size).LastRead(); - m_ok = m_size == size; -} - -wxZipHeader::wxZipHeader(const char* data, size_t size) - : m_size(size), - m_pos(0), - m_ok(true) -{ - wxCHECK_RET(size <= sizeof(m_data), wxT("buffer too small")); - memcpy(m_data, data, size); -} - -inline wxUint8 wxZipHeader::Read8() -{ - wxASSERT(m_pos < m_size); - return m_data[m_pos++]; -} - -inline wxUint16 wxZipHeader::Read16() -{ - wxASSERT(m_pos + 2 <= m_size); - wxUint16 n = CrackUint16(m_data + m_pos); - m_pos += 2; - return n; -} - -inline wxUint32 wxZipHeader::Read32() -{ - wxASSERT(m_pos + 4 <= m_size); - wxUint32 n = CrackUint32(m_data + m_pos); - m_pos += 4; - return n; -} - -inline wxUint64 wxZipHeader::Read64() -{ - wxASSERT(m_pos + 8 <= m_size); - wxUint64 n = CrackUint64(m_data + m_pos); - m_pos += 8; - return n; -} - -///////////////////////////////////////////////////////////////////////////// -// Stored input stream -// Trival decompressor for files which are 'stored' in the zip file. - -class wxStoredInputStream : public wxFilterInputStream -{ -public: - wxStoredInputStream(wxInputStream& stream); - - void Open(wxFileOffset len) { Close(); m_len = len; } - void Close() { m_pos = 0; m_lasterror = wxSTREAM_NO_ERROR; } - - virtual char Peek() wxOVERRIDE { return wxInputStream::Peek(); } - virtual wxFileOffset GetLength() const wxOVERRIDE { return m_len; } - -protected: - virtual size_t OnSysRead(void *buffer, size_t size) wxOVERRIDE; - virtual wxFileOffset OnSysTell() const wxOVERRIDE { return m_pos; } - -private: - wxFileOffset m_pos; - wxFileOffset m_len; - - wxDECLARE_NO_COPY_CLASS(wxStoredInputStream); -}; - -wxStoredInputStream::wxStoredInputStream(wxInputStream& stream) - : wxFilterInputStream(stream), - m_pos(0), - m_len(0) -{ -} - -size_t wxStoredInputStream::OnSysRead(void *buffer, size_t size) -{ - size_t count = wx_truncate_cast(size_t, - wxMin(size + wxFileOffset(0), m_len - m_pos + size_t(0))); - count = m_parent_i_stream->Read(buffer, count).LastRead(); - m_pos += count; - - if (count < size) - m_lasterror = m_pos == m_len ? wxSTREAM_EOF : wxSTREAM_READ_ERROR; - - return count; -} - - -///////////////////////////////////////////////////////////////////////////// -// Stored output stream -// Trival compressor for files which are 'stored' in the zip file. - -class wxStoredOutputStream : public wxFilterOutputStream -{ -public: - wxStoredOutputStream(wxOutputStream& stream) : - wxFilterOutputStream(stream), m_pos(0) { } - - bool Close() wxOVERRIDE { - m_pos = 0; - m_lasterror = wxSTREAM_NO_ERROR; - return true; - } - -protected: - virtual size_t OnSysWrite(const void *buffer, size_t size) wxOVERRIDE; - virtual wxFileOffset OnSysTell() const wxOVERRIDE { return m_pos; } - -private: - wxFileOffset m_pos; - wxDECLARE_NO_COPY_CLASS(wxStoredOutputStream); -}; - -size_t wxStoredOutputStream::OnSysWrite(const void *buffer, size_t size) -{ - if (!IsOk() || !size) - return 0; - size_t count = m_parent_o_stream->Write(buffer, size).LastWrite(); - if (count != size) - m_lasterror = wxSTREAM_WRITE_ERROR; - m_pos += count; - return count; -} - - -///////////////////////////////////////////////////////////////////////////// -// wxRawInputStream -// -// Used to handle the unusal case of raw copying an entry of unknown -// length. This can only happen when the zip being copied from is being -// read from a non-seekable stream, and also was original written to a -// non-seekable stream. -// -// In this case there's no option but to decompress the stream to find -// its length, but we can still write the raw compressed data to avoid the -// compression overhead (which is the greater one). -// -// Usage is like this: -// m_rawin = new wxRawInputStream(*m_parent_i_stream); -// m_decomp = m_rawin->Open(OpenDecompressor(m_rawin->GetTee())); -// -// The wxRawInputStream owns a wxTeeInputStream object, the role of which -// is something like the unix 'tee' command; it is a transparent filter, but -// allows the data read to be read a second time via an extra method 'GetData'. -// -// The wxRawInputStream then draws data through the tee using a decompressor -// then instead of returning the decompressed data, retuns the raw data -// from wxTeeInputStream::GetData(). - -class wxTeeInputStream : public wxFilterInputStream -{ -public: - wxTeeInputStream(wxInputStream& stream); - - size_t GetCount() const { return m_end - m_start; } - size_t GetData(char *buffer, size_t size); - - void Open(); - bool Final(); - - wxInputStream& Read(void *buffer, size_t size) wxOVERRIDE; - -protected: - virtual size_t OnSysRead(void *buffer, size_t size) wxOVERRIDE; - virtual wxFileOffset OnSysTell() const wxOVERRIDE { return m_pos; } - -private: - wxFileOffset m_pos; - wxMemoryBuffer m_buf; - size_t m_start; - size_t m_end; - - wxDECLARE_NO_COPY_CLASS(wxTeeInputStream); -}; - -wxTeeInputStream::wxTeeInputStream(wxInputStream& stream) - : wxFilterInputStream(stream), - m_pos(0), m_buf(8192), m_start(0), m_end(0) -{ -} - -void wxTeeInputStream::Open() -{ - m_pos = m_start = m_end = 0; - m_lasterror = wxSTREAM_NO_ERROR; -} - -bool wxTeeInputStream::Final() -{ - bool final = m_end == m_buf.GetDataLen(); - m_end = m_buf.GetDataLen(); - return final; -} - -wxInputStream& wxTeeInputStream::Read(void *buffer, size_t size) -{ - size_t count = wxInputStream::Read(buffer, size).LastRead(); - m_end = m_buf.GetDataLen(); - m_buf.AppendData(buffer, count); - return *this; -} - -size_t wxTeeInputStream::OnSysRead(void *buffer, size_t size) -{ - size_t count = m_parent_i_stream->Read(buffer, size).LastRead(); - if (count < size) - m_lasterror = m_parent_i_stream->GetLastError(); - return count; -} - -size_t wxTeeInputStream::GetData(char *buffer, size_t size) -{ - if (m_wbacksize) { - size_t len = m_buf.GetDataLen(); - len = len > m_wbacksize ? len - m_wbacksize : 0; - m_buf.SetDataLen(len); - if (m_end > len) { - wxFAIL; // we've already returned data that's now being ungot - m_end = len; - } - m_parent_i_stream->Reset(); - m_parent_i_stream->Ungetch(m_wback, m_wbacksize); - free(m_wback); - m_wback = NULL; - m_wbacksize = 0; - m_wbackcur = 0; - } - - if (size > GetCount()) - size = GetCount(); - if (size) { - memcpy(buffer, m_buf + m_start, size); - m_start += size; - wxASSERT(m_start <= m_end); - } - - if (m_start == m_end && m_start > 0 && m_buf.GetDataLen() > 0) { - size_t len = m_buf.GetDataLen(); - char *buf = (char*)m_buf.GetWriteBuf(len); - len -= m_end; - memmove(buf, buf + m_end, len); - m_buf.UngetWriteBuf(len); - m_start = m_end = 0; - } - - return size; -} - -class wxRawInputStream : public wxFilterInputStream -{ -public: - wxRawInputStream(wxInputStream& stream); - virtual ~wxRawInputStream() { delete m_tee; } - - wxInputStream* Open(wxInputStream *decomp); - wxInputStream& GetTee() const { return *m_tee; } - -protected: - virtual size_t OnSysRead(void *buffer, size_t size) wxOVERRIDE; - virtual wxFileOffset OnSysTell() const wxOVERRIDE { return m_pos; } - -private: - wxFileOffset m_pos; - wxTeeInputStream *m_tee; - - enum { BUFSIZE = 8192 }; - wxCharBuffer m_dummy; - - wxDECLARE_NO_COPY_CLASS(wxRawInputStream); -}; - -wxRawInputStream::wxRawInputStream(wxInputStream& stream) - : wxFilterInputStream(stream), - m_pos(0), - m_tee(new wxTeeInputStream(stream)), - m_dummy(BUFSIZE) -{ -} - -wxInputStream *wxRawInputStream::Open(wxInputStream *decomp) -{ - if (decomp) { - m_parent_i_stream = decomp; - m_pos = 0; - m_lasterror = wxSTREAM_NO_ERROR; - m_tee->Open(); - return this; - } else { - return NULL; - } -} - -size_t wxRawInputStream::OnSysRead(void *buffer, size_t size) -{ - char *buf = (char*)buffer; - size_t count = 0; - - while (count < size && IsOk()) - { - while (m_parent_i_stream->IsOk() && m_tee->GetCount() == 0) - m_parent_i_stream->Read(m_dummy.data(), BUFSIZE); - - size_t n = m_tee->GetData(buf + count, size - count); - count += n; - - if (n == 0 && m_tee->Final()) - m_lasterror = m_parent_i_stream->GetLastError(); - } - - m_pos += count; - return count; -} - - -///////////////////////////////////////////////////////////////////////////// -// Zlib streams than can be reused without recreating. - -class wxZlibOutputStream2 : public wxZlibOutputStream -{ -public: - wxZlibOutputStream2(wxOutputStream& stream, int level) : - wxZlibOutputStream(stream, level, wxZLIB_NO_HEADER) { } - - bool Open(wxOutputStream& stream); - bool Close() wxOVERRIDE { DoFlush(true); m_pos = wxInvalidOffset; return IsOk(); } -}; - -bool wxZlibOutputStream2::Open(wxOutputStream& stream) -{ - wxCHECK(m_pos == wxInvalidOffset, false); - - m_deflate->next_out = m_z_buffer; - m_deflate->avail_out = m_z_size; - m_pos = 0; - m_lasterror = wxSTREAM_NO_ERROR; - m_parent_o_stream = &stream; - - if (deflateReset(m_deflate) != Z_OK) { - wxLogError(_("can't re-initialize zlib deflate stream")); - m_lasterror = wxSTREAM_WRITE_ERROR; - return false; - } - - return true; -} - -class wxZlibInputStream2 : public wxZlibInputStream -{ -public: - wxZlibInputStream2(wxInputStream& stream) : - wxZlibInputStream(stream, wxZLIB_NO_HEADER) { } - - bool Open(wxInputStream& stream); -}; - -bool wxZlibInputStream2::Open(wxInputStream& stream) -{ - m_inflate->avail_in = 0; - m_pos = 0; - m_lasterror = wxSTREAM_NO_ERROR; - m_parent_i_stream = &stream; - - if (inflateReset(m_inflate) != Z_OK) { - wxLogError(_("can't re-initialize zlib inflate stream")); - m_lasterror = wxSTREAM_READ_ERROR; - return false; - } - - return true; -} - - -///////////////////////////////////////////////////////////////////////////// -// Class to hold wxZipEntry's Extra and LocalExtra fields - -class wxZipMemory -{ -public: - wxZipMemory() : m_data(NULL), m_size(0), m_capacity(0), m_ref(1) { } - - wxZipMemory *AddRef() { m_ref++; return this; } - void Release() { if (--m_ref == 0) delete this; } - - char *GetData() const { return m_data; } - size_t GetSize() const { return m_size; } - size_t GetCapacity() const { return m_capacity; } - - wxZipMemory *Unique(size_t size); - -private: - ~wxZipMemory() { delete [] m_data; } - - char *m_data; - size_t m_size; - size_t m_capacity; - int m_ref; - - wxSUPPRESS_GCC_PRIVATE_DTOR_WARNING(wxZipMemory) -}; - -wxZipMemory *wxZipMemory::Unique(size_t size) -{ - wxZipMemory *zm; - - if (m_ref > 1) { - --m_ref; - zm = new wxZipMemory; - } else { - zm = this; - } - - if (zm->m_capacity < size) { - delete [] zm->m_data; - zm->m_data = new char[size]; - zm->m_capacity = size; - } - - zm->m_size = size; - return zm; -} - -static inline wxZipMemory *AddRef(wxZipMemory *zm) -{ - if (zm) - zm->AddRef(); - return zm; -} - -static inline void Release(wxZipMemory *zm) -{ - if (zm) - zm->Release(); -} - -static void Copy(wxZipMemory*& dest, wxZipMemory *src) -{ - Release(dest); - dest = AddRef(src); -} - -static void Unique(wxZipMemory*& zm, size_t size) -{ - if (!zm && size) - zm = new wxZipMemory; - if (zm) - zm = zm->Unique(size); -} - - -///////////////////////////////////////////////////////////////////////////// -// Collection of weak references to entries - -WX_DECLARE_HASH_MAP(long, wxZipEntry*, wxIntegerHash, - wxIntegerEqual, wxOffsetZipEntryMap_); - -class wxZipWeakLinks -{ -public: - wxZipWeakLinks() : m_ref(1) { } - - void Release(const wxZipInputStream* WXUNUSED(x)) - { if (--m_ref == 0) delete this; } - void Release(wxFileOffset key) - { RemoveEntry(key); if (--m_ref == 0) delete this; } - - wxZipWeakLinks *AddEntry(wxZipEntry *entry, wxFileOffset key); - void RemoveEntry(wxFileOffset key) - { m_entries.erase(wx_truncate_cast(key_type, key)); } - wxZipEntry *GetEntry(wxFileOffset key) const; - bool IsEmpty() const { return m_entries.empty(); } - -private: - ~wxZipWeakLinks() { wxASSERT(IsEmpty()); } - - typedef wxOffsetZipEntryMap_::key_type key_type; - - int m_ref; - wxOffsetZipEntryMap_ m_entries; - - wxSUPPRESS_GCC_PRIVATE_DTOR_WARNING(wxZipWeakLinks) -}; - -wxZipWeakLinks *wxZipWeakLinks::AddEntry(wxZipEntry *entry, wxFileOffset key) -{ - m_entries[wx_truncate_cast(key_type, key)] = entry; - m_ref++; - return this; -} - -wxZipEntry *wxZipWeakLinks::GetEntry(wxFileOffset key) const -{ - wxOffsetZipEntryMap_::const_iterator it = - m_entries.find(wx_truncate_cast(key_type, key)); - return it != m_entries.end() ? it->second : NULL; -} - - -///////////////////////////////////////////////////////////////////////////// -// ZipEntry - -wxZipEntry::wxZipEntry( - const wxString& name /*=wxEmptyString*/, - const wxDateTime& dt /*=wxDateTime::Now()*/, - wxFileOffset size /*=wxInvalidOffset*/) - : - m_SystemMadeBy(wxZIP_SYSTEM_MSDOS), - m_VersionMadeBy(wxMAJOR_VERSION * 10 + wxMINOR_VERSION), - m_VersionNeeded(VERSION_NEEDED_TO_EXTRACT), - m_Flags(0), - m_Method(wxZIP_METHOD_DEFAULT), - m_DateTime(dt), - m_Crc(0), - m_CompressedSize(wxInvalidOffset), - m_Size(size), - m_Key(wxInvalidOffset), - m_Offset(wxInvalidOffset), - m_DiskStart(0), - m_InternalAttributes(0), - m_ExternalAttributes(0), - m_Extra(NULL), - m_LocalExtra(NULL), - m_zipnotifier(NULL), - m_backlink(NULL) -{ - if (!name.empty()) - SetName(name); -} - -wxZipEntry::~wxZipEntry() -{ - if (m_backlink) - m_backlink->Release(m_Key); - Release(m_Extra); - Release(m_LocalExtra); -} - -wxZipEntry::wxZipEntry(const wxZipEntry& e) - : wxArchiveEntry(e), - m_SystemMadeBy(e.m_SystemMadeBy), - m_VersionMadeBy(e.m_VersionMadeBy), - m_VersionNeeded(e.m_VersionNeeded), - m_Flags(e.m_Flags), - m_Method(e.m_Method), - m_DateTime(e.m_DateTime), - m_Crc(e.m_Crc), - m_CompressedSize(e.m_CompressedSize), - m_Size(e.m_Size), - m_Name(e.m_Name), - m_Key(e.m_Key), - m_Offset(e.m_Offset), - m_Comment(e.m_Comment), - m_DiskStart(e.m_DiskStart), - m_InternalAttributes(e.m_InternalAttributes), - m_ExternalAttributes(e.m_ExternalAttributes), - m_Extra(AddRef(e.m_Extra)), - m_LocalExtra(AddRef(e.m_LocalExtra)), - m_zipnotifier(NULL), - m_backlink(NULL) -{ -} - -wxZipEntry& wxZipEntry::operator=(const wxZipEntry& e) -{ - if (&e != this) { - m_SystemMadeBy = e.m_SystemMadeBy; - m_VersionMadeBy = e.m_VersionMadeBy; - m_VersionNeeded = e.m_VersionNeeded; - m_Flags = e.m_Flags; - m_Method = e.m_Method; - m_DateTime = e.m_DateTime; - m_Crc = e.m_Crc; - m_CompressedSize = e.m_CompressedSize; - m_Size = e.m_Size; - m_Name = e.m_Name; - m_Key = e.m_Key; - m_Offset = e.m_Offset; - m_Comment = e.m_Comment; - m_DiskStart = e.m_DiskStart; - m_InternalAttributes = e.m_InternalAttributes; - m_ExternalAttributes = e.m_ExternalAttributes; - Copy(m_Extra, e.m_Extra); - Copy(m_LocalExtra, e.m_LocalExtra); - m_zipnotifier = NULL; - if (m_backlink) { - m_backlink->Release(m_Key); - m_backlink = NULL; - } - } - return *this; -} - -wxString wxZipEntry::GetName(wxPathFormat format /*=wxPATH_NATIVE*/) const -{ - bool isDir = IsDir() && !m_Name.empty(); - - // optimisations for common (and easy) cases - switch (wxFileName::GetFormat(format)) { - case wxPATH_DOS: - { - wxString name(m_Name); - name.Replace(wxFILE_SEP_PATH_UNIX, wxFILE_SEP_PATH_DOS); - if (isDir) - name += wxFILE_SEP_PATH_DOS; - return name; - } - - case wxPATH_UNIX: - return isDir ? m_Name + wxFILE_SEP_PATH_UNIX : m_Name; - - default: - ; - } - - wxFileName fn; - - if (isDir) - fn.AssignDir(m_Name, wxPATH_UNIX); - else - fn.Assign(m_Name, wxPATH_UNIX); - - return fn.GetFullPath(format); -} - -namespace -{ - -// Accept both slashes and backslashes for compatibility as a lot of broken -// programs create such archives even though the ZIP specification explicitly -// says to use slashes (see 4.4.17.1). -inline bool IsDOSPathSep(wxUniChar ch) -{ - return ch == wxFILE_SEP_PATH_DOS || ch == wxFILE_SEP_PATH_UNIX; -} -} // anonymous namespace - -// Static - Internally tars and zips use forward slashes for the path -// separator, absolute paths aren't allowed, and directory names have a -// trailing slash. This function converts a path into this internal format, -// but without a trailing slash for a directory. -// -wxString wxZipEntry::GetInternalName(const wxString& name, - wxPathFormat format /*=wxPATH_NATIVE*/, - bool *pIsDir /*=NULL*/) -{ - wxString internal; - - if (wxFileName::GetFormat(format) != wxPATH_UNIX) - internal = wxFileName(name, format).GetFullPath(wxPATH_UNIX); - else - internal = name; - - bool isDir = !internal.empty() && IsDOSPathSep(internal.Last()); - if (pIsDir) - *pIsDir = isDir; - if (isDir) - internal.erase(internal.length() - 1); - - while (!internal.empty() && IsDOSPathSep(*internal.begin())) - internal.erase(0, 1); - while (!internal.empty() && - (internal[0] == wxS('.') && IsDOSPathSep(internal[1]))) - internal.erase(0, 2); - if (internal == wxT(".") || internal == wxT("..")) - internal = wxEmptyString; - - return internal; -} - -void wxZipEntry::SetSystemMadeBy(int system) -{ - int mode = GetMode(); - bool wasUnix = IsMadeByUnix(); - - m_SystemMadeBy = (wxUint8)system; - - if (!wasUnix && IsMadeByUnix()) { - SetIsDir(IsDir()); - SetMode(mode); - } else if (wasUnix && !IsMadeByUnix()) { - m_ExternalAttributes &= 0xffff; - } -} - -void wxZipEntry::SetIsDir(bool isDir /*=true*/) -{ - if (isDir) - m_ExternalAttributes |= wxZIP_A_SUBDIR; - else - m_ExternalAttributes &= ~wxZIP_A_SUBDIR; - - if (IsMadeByUnix()) { - m_ExternalAttributes &= ~wxZIP_S_IFMT; - if (isDir) - m_ExternalAttributes |= wxZIP_S_IFDIR; - else - m_ExternalAttributes |= wxZIP_S_IFREG; - } -} - -// Return unix style permission bits -// -int wxZipEntry::GetMode() const -{ - // return unix permissions if present - if (IsMadeByUnix()) - return (m_ExternalAttributes >> 16) & 0777; - - // otherwise synthesize from the dos attribs - int mode = 0644; - if (m_ExternalAttributes & wxZIP_A_RDONLY) - mode &= ~0200; - if (m_ExternalAttributes & wxZIP_A_SUBDIR) - mode |= 0111; - - return mode; -} - -// Set unix permissions -// -void wxZipEntry::SetMode(int mode) -{ - // Set dos attrib bits to be compatible - if (mode & 0222) - m_ExternalAttributes &= ~wxZIP_A_RDONLY; - else - m_ExternalAttributes |= wxZIP_A_RDONLY; - - // set the actual unix permission bits if the system type allows - if (IsMadeByUnix()) { - m_ExternalAttributes &= ~(0777L << 16); - m_ExternalAttributes |= (mode & 0777L) << 16; - } -} - -const char *wxZipEntry::GetExtra() const -{ - return m_Extra ? m_Extra->GetData() : NULL; -} - -size_t wxZipEntry::GetExtraLen() const -{ - return m_Extra ? m_Extra->GetSize() : 0; -} - -void wxZipEntry::SetExtra(const char *extra, size_t len) -{ - Unique(m_Extra, len); - if (len) - memcpy(m_Extra->GetData(), extra, len); -} - -const char *wxZipEntry::GetLocalExtra() const -{ - return m_LocalExtra ? m_LocalExtra->GetData() : NULL; -} - -size_t wxZipEntry::GetLocalExtraLen() const -{ - return m_LocalExtra ? m_LocalExtra->GetSize() : 0; -} - -void wxZipEntry::SetLocalExtra(const char *extra, size_t len) -{ - Unique(m_LocalExtra, len); - if (len) - memcpy(m_LocalExtra->GetData(), extra, len); -} - -void wxZipEntry::SetNotifier(wxZipNotifier& notifier) -{ - wxArchiveEntry::UnsetNotifier(); - m_zipnotifier = ¬ifier; - m_zipnotifier->OnEntryUpdated(*this); -} - -void wxZipEntry::Notify() -{ - if (m_zipnotifier) - m_zipnotifier->OnEntryUpdated(*this); - else if (GetNotifier()) - GetNotifier()->OnEntryUpdated(*this); -} - -void wxZipEntry::UnsetNotifier() -{ - wxArchiveEntry::UnsetNotifier(); - m_zipnotifier = NULL; -} - -bool wxZipEntry::LoadExtraInfo(const char* extraData, wxUint16 extraLen, bool localInfo) -{ - // We need to iterate over all headers - // seeking for the field with Header ID = 1. - // (There is not stated in the documentation - // that it should be the first one in the collection.) - while ( extraLen >= 4 ) - { - // Parse extra header - wxZipHeader hds(extraData, 4); - wxUint16 fieldID = hds.Read16(); - wxUint16 fieldLen = hds.Read16(); - if ( fieldID == 1 ) - { - // Data block for extra field with Header ID = 1 (ZIP64) - // can have length up to 28 bytes. - wxZipHeader ds(extraData+4, wxMin(fieldLen, 28)); - // A file may contain larger size, compressed size or offset - // in a zip64 extra data block. Use the 64 bit values if available - if ( m_Size == 0xffffffff ) - m_Size = ds.Read64(); - if ( m_CompressedSize == 0xffffffff ) - m_CompressedSize = ds.Read64(); - if ( !localInfo && m_Offset == 0xffffffff ) - m_Offset = ds.Read64(); - // extraInfo was used and parsed - return true; - } - - fieldLen += 4; - extraData += fieldLen; - extraLen -= fieldLen; - } - - // extraInfo had unknown format - return false; -} - -size_t wxZipEntry::ReadLocal(wxInputStream& stream, wxMBConv& conv) -{ - wxUint16 nameLen, extraLen; - wxUint32 compressedSize, size, crc; - - wxZipHeader ds(stream, LOCAL_SIZE - 4); - if (!ds) - return 0; - - ds >> m_VersionNeeded >> m_Flags >> m_Method; - SetDateTime(wxDateTime().SetFromDOS(ds.Read32())); - ds >> crc >> compressedSize >> size >> nameLen >> extraLen; - - bool sumsValid = (m_Flags & wxZIP_SUMS_FOLLOW) == 0; - - if (sumsValid || crc) - m_Crc = crc; - if ((sumsValid || compressedSize) || m_Method == wxZIP_METHOD_STORE) - m_CompressedSize = compressedSize; - if ((sumsValid || size) || m_Method == wxZIP_METHOD_STORE) - m_Size = size; - - // Explicit cast to the base class is needed to work around apparent - // compiler bug in MSVS 2005 (FIXME-VC8). - wxMBConv& strConv = m_Flags & wxZIP_LANG_ENC_UTF8 - ? static_cast(wxConvUTF8) - : conv; - SetName(ReadString(stream, nameLen, strConv), wxPATH_UNIX); - if (stream.LastRead() != nameLen + 0u) - return 0; - - if (extraLen || GetLocalExtraLen()) { - Unique(m_LocalExtra, extraLen); - if (extraLen) { - stream.Read(m_LocalExtra->GetData(), extraLen); - if (stream.LastRead() != extraLen + 0u) - return 0; - - if (LoadExtraInfo(m_LocalExtra->GetData(), extraLen, true)) - { - Release(m_LocalExtra); - m_LocalExtra = NULL; - } - } - } - - return LOCAL_SIZE + nameLen + extraLen; -} - -size_t wxZipEntry::WriteLocal(wxOutputStream& stream, wxMBConv& conv) const -{ - wxString unixName = GetName(wxPATH_UNIX); - const wxWX2MBbuf name_buf = unixName.mb_str(conv); - const char *name = name_buf; - if (!name) name = ""; - wxUint16 nameLen = wx_truncate_cast(wxUint16, strlen(name)); - - bool z64Required = m_CompressedSize > 0xffffffff || m_Size > 0xffffffff; - wxUint16 versionNeeded = - z64Required ? Z64_VERSION_NEEDED_TO_EXTRACT : int(m_VersionNeeded); - - wxDataOutputStream ds(stream); - - ds << versionNeeded << m_Flags << m_Method; - ds.Write32(GetDateTime().GetAsDOS()); - - ds.Write32(m_Crc); - ds.Write32(m_CompressedSize != wxInvalidOffset ? - LimitUint32(m_CompressedSize) : 0); - ds.Write32(m_Size != wxInvalidOffset ? - LimitUint32(m_Size) : 0); - - ds << nameLen; - wxUint16 extraLen = wx_truncate_cast(wxUint16, GetLocalExtraLen()); - if (z64Required) - extraLen += 20; // tag and 2x64bit file sizes - ds.Write16(extraLen); - - stream.Write(name, nameLen); - if (z64Required) - { - ds.Write16(1); // id - ds.Write16(16); // record size - ds.Write64(static_cast(m_CompressedSize)); - ds.Write64(static_cast(m_Size)); - } - if (GetLocalExtraLen()) - stream.Write(m_LocalExtra->GetData(), GetLocalExtraLen()); - - return LOCAL_SIZE + nameLen + extraLen; -} - -size_t wxZipEntry::ReadCentral(wxInputStream& stream, wxMBConv& conv) -{ - wxUint16 nameLen, extraLen, commentLen; - - wxZipHeader ds(stream, CENTRAL_SIZE - 4); - if (!ds) - return 0; - - ds >> m_VersionMadeBy >> m_SystemMadeBy; - - SetVersionNeeded(ds.Read16()); - SetFlags(ds.Read16()); - SetMethod(ds.Read16()); - SetDateTime(wxDateTime().SetFromDOS(ds.Read32())); - SetCrc(ds.Read32()); - SetCompressedSize(ds.Read32()); - SetSize(ds.Read32()); - - ds >> nameLen >> extraLen >> commentLen - >> m_DiskStart >> m_InternalAttributes >> m_ExternalAttributes; - SetOffset(ds.Read32()); - - // Another MSVS 2005 workaround, see above (FIXME-VC8). - wxMBConv& strConv = m_Flags & wxZIP_LANG_ENC_UTF8 - ? static_cast(wxConvUTF8) - : conv; - SetName(ReadString(stream, nameLen, strConv), wxPATH_UNIX); - if (stream.LastRead() != nameLen + 0u) - return 0; - - if (extraLen || GetExtraLen()) { - Unique(m_Extra, extraLen); - if (extraLen) { - stream.Read(m_Extra->GetData(), extraLen); - if (stream.LastRead() != extraLen + 0u) - return 0; - - if (LoadExtraInfo(m_Extra->GetData(), extraLen, false)) - { - Release(m_Extra); - m_Extra = NULL; - } - } - } - - if (commentLen) { - m_Comment = ReadString(stream, commentLen, strConv); - if (stream.LastRead() != commentLen + 0u) - return 0; - } else { - m_Comment.clear(); - } - - return CENTRAL_SIZE + nameLen + extraLen + commentLen; -} - -size_t wxZipEntry::WriteCentral(wxOutputStream& stream, wxMBConv& conv) const -{ - wxString unixName = GetName(wxPATH_UNIX); - const wxWX2MBbuf name_buf = unixName.mb_str(conv); - const char *name = name_buf; - if (!name) name = ""; - wxUint16 nameLen = wx_truncate_cast(wxUint16, strlen(name)); - - const wxWX2MBbuf comment_buf = m_Comment.mb_str(conv); - const char *comment = comment_buf; - if (!comment) comment = ""; - wxUint16 commentLen = wx_truncate_cast(wxUint16, strlen(comment)); - - wxUint16 extraLen = wx_truncate_cast(wxUint16, GetExtraLen()); - wxUint16 z64InfoLen = 0; - - bool z64Required = false; - if ( m_CompressedSize > 0xffffffff ) - { - z64Required = true; - z64InfoLen += 8; - } - if ( m_Size > 0xffffffff ) - { - z64Required = true; - z64InfoLen += 8; - } - if ( m_Offset > 0xffffffff ) - { - z64Required = true; - z64InfoLen += 8; - } - if (z64Required) - { - extraLen += 4 + z64InfoLen; - } - - wxUint16 versionNeeded = - (z64Required) ? Z64_VERSION_NEEDED_TO_EXTRACT : GetVersionNeeded(); - - wxDataOutputStream ds(stream); - - ds << CENTRAL_MAGIC << m_VersionMadeBy << m_SystemMadeBy; - - ds.Write16(versionNeeded); - ds.Write16(wx_truncate_cast(wxUint16, GetFlags())); - ds.Write16(wx_truncate_cast(wxUint16, GetMethod())); - ds.Write32(GetDateTime().GetAsDOS()); - ds.Write32(GetCrc()); - ds.Write32(LimitUint32(GetCompressedSize())); - ds.Write32(LimitUint32(GetSize())); - ds.Write16(nameLen); - ds.Write16(extraLen); - - ds << commentLen << m_DiskStart << m_InternalAttributes - << m_ExternalAttributes << LimitUint32(GetOffset()); - - stream.Write(name, nameLen); - if (z64Required) - { - ds.Write16(1); // tag - ds.Write16(z64InfoLen); // record size - if (m_CompressedSize > 0xffffffff) - ds.Write64(static_cast(m_CompressedSize)); - if (m_Size > 0xffffffff) - ds.Write64(static_cast(m_Size)); - if (m_Offset > 0xffffffff) - ds.Write64(static_cast(m_Offset)); - } - if (GetExtraLen()) - stream.Write(GetExtra(), GetExtraLen()); - stream.Write(comment, commentLen); - - return CENTRAL_SIZE + nameLen + extraLen + commentLen; -} - -// Info-zip prefixes this record with a signature, but pkzip doesn't. So if -// the 1st value is the signature then it is probably an info-zip record, -// though there is a small chance that it is in fact a pkzip record which -// happens to have the signature as its CRC. -// -size_t wxZipEntry::ReadDescriptor(wxInputStream& stream) -{ - wxZipHeader ds(stream, SUMS_SIZE); - if (!ds) - return 0; - - m_Crc = ds.Read32(); - m_CompressedSize = ds.Read32(); - m_Size = ds.Read32(); - - // if 1st value is the signature then this is probably an info-zip record - if (m_Crc == SUMS_MAGIC) - { - wxZipHeader buf(stream, 8); - wxUint32 u1 = buf.GetSize() >= 4 ? buf.Read32() : (wxUint32)LOCAL_MAGIC; - wxUint32 u2 = buf.GetSize() == 8 ? buf.Read32() : 0; - - // look for the signature of the following record to decide which - if ((u1 == LOCAL_MAGIC || u1 == CENTRAL_MAGIC) && - (u2 != LOCAL_MAGIC && u2 != CENTRAL_MAGIC)) - { - // it's a pkzip style record after all! - if (buf.GetSize() > 0) - stream.Ungetch(buf.GetData(), buf.GetSize()); - } - else - { - // it's an info-zip record as expected - if (buf.GetSize() > 4) - stream.Ungetch(buf.GetData() + 4, buf.GetSize() - 4); - m_Crc = wx_truncate_cast(wxUint32, m_CompressedSize); - m_CompressedSize = m_Size; - m_Size = u1; - return SUMS_SIZE + 4; - } - } - - return SUMS_SIZE; -} - -size_t wxZipEntry::WriteDescriptor(wxOutputStream& stream, wxUint32 crc, - wxFileOffset compressedSize, wxFileOffset size) -{ - m_Crc = crc; - m_CompressedSize = compressedSize; - m_Size = size; - - wxDataOutputStream ds(stream); - - ds.Write32(crc); - ds.Write32(wx_truncate_cast(wxUint32, compressedSize)); - ds.Write32(wx_truncate_cast(wxUint32, size)); - - return SUMS_SIZE; -} - - -///////////////////////////////////////////////////////////////////////////// -// wxZipEndRec - holds the end of central directory record - -class wxZipEndRec -{ -public: - wxZipEndRec(); - - int GetDiskNumber() const { return m_DiskNumber; } - int GetStartDisk() const { return m_StartDisk; } - int GetEntriesHere() const { return m_EntriesHere; } - int GetTotalEntries() const { return m_TotalEntries; } - wxFileOffset GetSize() const { return m_Size; } - wxFileOffset GetOffset() const { return m_Offset; } - wxString GetComment() const { return m_Comment; } - - void SetDiskNumber(int num) - { m_DiskNumber = wx_truncate_cast(wxUint32, num); } - void SetStartDisk(int num) - { m_StartDisk = wx_truncate_cast(wxUint32, num); } - void SetEntriesHere(int num) - { m_EntriesHere = wx_truncate_cast(wxUint32, num); } - void SetTotalEntries(int num) - { m_TotalEntries = wx_truncate_cast(wxUint32, num); } - void SetSize(wxFileOffset size) - { m_Size = wx_truncate_cast(wxUint64, size); } - void SetOffset(wxFileOffset offset) - { m_Offset = wx_truncate_cast(wxUint64, offset); } - void SetComment(const wxString& comment) - { m_Comment = comment; } - - bool Read(wxInputStream& stream, wxMBConv& conv); - bool Write(wxOutputStream& stream, wxMBConv& conv) const; - -private: - wxUint32 m_DiskNumber; - wxUint32 m_StartDisk; - wxUint64 m_EntriesHere; - wxUint64 m_TotalEntries; - wxUint64 m_Size; - wxUint64 m_Offset; - wxString m_Comment; -}; - -wxZipEndRec::wxZipEndRec() - : m_DiskNumber(0), - m_StartDisk(0), - m_EntriesHere(0), - m_TotalEntries(0), - m_Size(0), - m_Offset(0) -{ -} - -bool wxZipEndRec::Write(wxOutputStream& stream, wxMBConv& conv) const -{ - const wxWX2MBbuf comment_buf = m_Comment.mb_str(conv); - const char *comment = comment_buf; - if (!comment) comment = ""; - wxUint16 commentLen = (wxUint16)strlen(comment); - - wxDataOutputStream ds(stream); - - // Check if zip64 is required - if (m_DiskNumber > 0xffff || m_StartDisk > 0xffff || - m_EntriesHere > 0xffff || m_TotalEntries > 0xffff || - m_Size > 0xffffffff || m_Offset > 0xffffffff) - { - // Write zip64 end of central directory record - wxFileOffset z64endOffset = stream.TellO(); - ds.Write32(Z64_END_MAGIC); - ds.Write64(static_cast(Z64_END_SIZE - 12)); // size of zip64 end record - ds.Write16(Z64_VERSION_NEEDED_TO_EXTRACT); - ds.Write16(Z64_VERSION_NEEDED_TO_EXTRACT); - ds.Write32(m_DiskNumber); - ds.Write32(m_StartDisk); - ds.Write64(m_EntriesHere); - ds.Write64(m_TotalEntries); - ds.Write64(m_Size); - ds.Write64(m_Offset); - - // Write zip64 end of central directory locator - ds.Write32(Z64_LOC_MAGIC); - ds.Write32(m_StartDisk); - ds.Write64(static_cast(z64endOffset)); - ds.Write32(1); // total number of disks - } - - ds << END_MAGIC; - - ds.Write16(LimitUint16(m_DiskNumber)); - ds.Write16(LimitUint16(m_StartDisk)); - ds.Write16(LimitUint16(m_EntriesHere)); - ds.Write16(LimitUint16(m_TotalEntries)); - ds.Write32(LimitUint32(m_Size)); - ds.Write32(LimitUint32(m_Offset)); - - ds << commentLen; - - stream.Write(comment, commentLen); - - return stream.IsOk(); -} - -bool wxZipEndRec::Read(wxInputStream& stream, wxMBConv& conv) -{ - wxZipHeader ds(stream, END_SIZE - 4); - if (!ds) - return false; - - wxUint16 commentLen; - - m_DiskNumber = ds.Read16(); - m_StartDisk = ds.Read16(); - m_EntriesHere = ds.Read16(); - m_TotalEntries = ds.Read16(); - m_Size = ds.Read32(); - m_Offset = ds.Read32(); - ds >> commentLen; - - if (commentLen) { - m_Comment = ReadString(stream, commentLen, conv); - if (stream.LastRead() != commentLen + 0u) - return false; - } - - if (m_DiskNumber != 0 || m_StartDisk != 0 || - m_EntriesHere != m_TotalEntries) - { - wxLogWarning(_("assuming this is a multi-part zip concatenated")); - } - - // Look for zip64 end record - stream.SeekI(-(END_SIZE+Z64_LOC_SIZE), wxFromCurrent); - wxZipHeader dsLoc(stream, Z64_LOC_SIZE); - if ( dsLoc && dsLoc.Read32() == Z64_LOC_MAGIC ) - { - // Found zip64 locator, read z64 directory - dsLoc.Read32(); // skip: disk with the start of the zip64 - wxUint64 z64EndOffset = dsLoc.Read64(); - - // Read zip64 end of central directory record - if (stream.SeekI(z64EndOffset) == wxInvalidOffset) - return false; - wxZipHeader dsEnd(stream, Z64_END_SIZE); - if ( dsEnd.Read32() != Z64_END_MAGIC || - dsEnd.Read64() < Z64_END_SIZE - 12 ) // Check record size - return false; - - dsEnd.Read16(); // skip: version made by - dsEnd.Read16(); // skip: version needed to extract - - m_DiskNumber = dsEnd.Read32(); - m_StartDisk = dsEnd.Read32(); - m_EntriesHere = dsEnd.Read64(); - m_TotalEntries = dsEnd.Read64(); - m_Size = dsEnd.Read64(); - m_Offset = dsEnd.Read64(); - } - - return true; -} - - -///////////////////////////////////////////////////////////////////////////// -// A weak link from an input stream to an output stream - -class wxZipStreamLink -{ -public: - wxZipStreamLink(wxZipOutputStream *stream) : m_ref(1), m_stream(stream) { } - - wxZipStreamLink *AddRef() { m_ref++; return this; } - wxZipOutputStream *GetOutputStream() const { return m_stream; } - - void Release(class wxZipInputStream *WXUNUSED(s)) - { if (--m_ref == 0) delete this; } - void Release(class wxZipOutputStream *WXUNUSED(s)) - { m_stream = NULL; if (--m_ref == 0) delete this; } - -private: - ~wxZipStreamLink() { } - - int m_ref; - wxZipOutputStream *m_stream; - - wxSUPPRESS_GCC_PRIVATE_DTOR_WARNING(wxZipStreamLink) -}; - - -///////////////////////////////////////////////////////////////////////////// -// Input stream - -// leave the default wxZipEntryPtr free for users -wxDECLARE_SCOPED_PTR(wxZipEntry, wxZipEntryPtr_) -wxDEFINE_SCOPED_PTR (wxZipEntry, wxZipEntryPtr_) - -// constructor -// -wxZipInputStream::wxZipInputStream(wxInputStream& stream, - wxMBConv& conv /*=wxConvLocal*/) - : wxArchiveInputStream(stream, conv) -{ - Init(); -} - -wxZipInputStream::wxZipInputStream(wxInputStream *stream, - wxMBConv& conv /*=wxConvLocal*/) - : wxArchiveInputStream(stream, conv) -{ - Init(); -} - -void wxZipInputStream::Init() -{ - m_store = new wxStoredInputStream(*m_parent_i_stream); - m_inflate = NULL; - m_rawin = NULL; - m_raw = false; - m_headerSize = 0; - m_decomp = NULL; - m_parentSeekable = false; - m_weaklinks = new wxZipWeakLinks; - m_streamlink = NULL; - m_offsetAdjustment = 0; - m_position = wxInvalidOffset; - m_signature = 0; - m_TotalEntries = 0; - m_lasterror = m_parent_i_stream->GetLastError(); -} - -wxZipInputStream::~wxZipInputStream() -{ - CloseDecompressor(m_decomp); - - delete m_store; - delete m_inflate; - delete m_rawin; - - m_weaklinks->Release(this); - - if (m_streamlink) - m_streamlink->Release(this); -} - -wxString wxZipInputStream::GetComment() -{ - if (m_position == wxInvalidOffset) - if (!LoadEndRecord()) - return wxEmptyString; - - if (!m_parentSeekable && Eof() && m_signature) { - m_lasterror = wxSTREAM_NO_ERROR; - m_lasterror = ReadLocal(true); - } - - return m_Comment; -} - -int wxZipInputStream::GetTotalEntries() -{ - if (m_position == wxInvalidOffset) - LoadEndRecord(); - return m_TotalEntries; -} - -wxZipStreamLink *wxZipInputStream::MakeLink(wxZipOutputStream *out) -{ - wxZipStreamLink *link = NULL; - - if (!m_parentSeekable && (IsOpened() || !Eof())) { - link = new wxZipStreamLink(out); - if (m_streamlink) - m_streamlink->Release(this); - m_streamlink = link->AddRef(); - } - - return link; -} - -bool wxZipInputStream::LoadEndRecord() -{ - wxCHECK(m_position == wxInvalidOffset, false); - if (!IsOk()) - return false; - - m_position = 0; - - // First find the end-of-central-directory record. - if (!FindEndRecord()) { - // failed, so either this is a non-seekable stream (ok), or not a zip - if (m_parentSeekable) { - m_lasterror = wxSTREAM_READ_ERROR; - wxLogError(_("invalid zip file")); - return false; - } - else { - wxLogNull nolog; - wxFileOffset pos = m_parent_i_stream->TellI(); - if (pos != wxInvalidOffset) - m_offsetAdjustment = m_position = pos; - return true; - } - } - - wxZipEndRec endrec; - - // Read in the end record - wxFileOffset endPos = m_parent_i_stream->TellI() - 4; - if (!endrec.Read(*m_parent_i_stream, GetConv())) - return false; - - m_TotalEntries = endrec.GetTotalEntries(); - m_Comment = endrec.GetComment(); - - wxUint32 magic = m_TotalEntries ? CENTRAL_MAGIC : END_MAGIC; - - // Now find the central-directory. we have the file offset of - // the CD, so look there first. - if (m_parent_i_stream->SeekI(endrec.GetOffset()) != wxInvalidOffset && - ReadSignature() == magic) { - m_signature = magic; - m_position = endrec.GetOffset(); - m_offsetAdjustment = 0; - return true; - } - - // If it's not there, then it could be that the zip has been appended - // to a self extractor, so take the CD size (also in endrec), subtract - // it from the file offset of the end-central-directory and look there. - if (m_parent_i_stream->SeekI(endPos - endrec.GetSize()) - != wxInvalidOffset && ReadSignature() == magic) { - m_signature = magic; - m_position = endPos - endrec.GetSize(); - m_offsetAdjustment = m_position - endrec.GetOffset(); - return true; - } - - wxLogError(_("can't find central directory in zip")); - m_lasterror = wxSTREAM_READ_ERROR; - return false; -} - -// Find the end-of-central-directory record. -// If found the stream will be positioned just past the 4 signature bytes. -// -bool wxZipInputStream::FindEndRecord() -{ - if (!m_parent_i_stream->IsSeekable()) - return false; - - // usually it's 22 bytes in size and the last thing in the file - { - wxLogNull nolog; - if (m_parent_i_stream->SeekI(-END_SIZE, wxFromEnd) == wxInvalidOffset) - return false; - } - - m_parentSeekable = true; - m_signature = 0; - char magic[4]; - if (m_parent_i_stream->Read(magic, 4).LastRead() != 4) - return false; - if ((m_signature = CrackUint32(magic)) == END_MAGIC) - return true; - - // unfortunately, the record has a comment field that can be up to 65535 - // bytes in length, so if the signature not found then search backwards. - wxFileOffset pos = m_parent_i_stream->TellI(); - const int BUFSIZE = 1024; - wxCharBuffer buf(BUFSIZE); - - memcpy(buf.data(), magic, 3); - wxFileOffset minpos = wxMax(pos - 65535L, 0); - - while (pos > minpos) { - size_t len = wx_truncate_cast(size_t, - pos - wxMax(pos - (BUFSIZE - 3), minpos)); - memcpy(buf.data() + len, buf, 3); - pos -= len; - - if (m_parent_i_stream->SeekI(pos, wxFromStart) == wxInvalidOffset || - m_parent_i_stream->Read(buf.data(), len).LastRead() != len) - return false; - - char *p = buf.data() + len; - - while (p-- > buf.data()) { - if ((m_signature = CrackUint32(p)) == END_MAGIC) { - size_t remainder = buf.data() + len - p; - if (remainder > 4) - m_parent_i_stream->Ungetch(p + 4, remainder - 4); - return true; - } - } - } - - return false; -} - -wxZipEntry *wxZipInputStream::GetNextEntry() -{ - if (m_position == wxInvalidOffset) - if (!LoadEndRecord()) - return NULL; - - m_lasterror = m_parentSeekable ? ReadCentral() : ReadLocal(); - if (!IsOk()) - return NULL; - - wxZipEntryPtr_ entry(new wxZipEntry(m_entry)); - entry->m_backlink = m_weaklinks->AddEntry(entry.get(), entry->GetKey()); - return entry.release(); -} - -wxStreamError wxZipInputStream::ReadCentral() -{ - if (!AtHeader()) - CloseEntry(); - - if (m_signature == END_MAGIC || m_signature == Z64_END_MAGIC) - return wxSTREAM_EOF; - - if (m_signature != CENTRAL_MAGIC) { - wxLogError(_("error reading zip central directory")); - return wxSTREAM_READ_ERROR; - } - - if (QuietSeek(*m_parent_i_stream, m_position + 4) == wxInvalidOffset) - return wxSTREAM_READ_ERROR; - - size_t size = m_entry.ReadCentral(*m_parent_i_stream, GetConv()); - if (!size) { - m_signature = 0; - return wxSTREAM_READ_ERROR; - } - - m_position += size; - m_signature = ReadSignature(); - - if (m_offsetAdjustment) - m_entry.SetOffset(m_entry.GetOffset() + m_offsetAdjustment); - m_entry.SetKey(m_entry.GetOffset()); - - return wxSTREAM_NO_ERROR; -} - -wxStreamError wxZipInputStream::ReadLocal(bool readEndRec /*=false*/) -{ - if (!AtHeader()) - CloseEntry(); - - if (!m_signature) - m_signature = ReadSignature(); - - if (m_signature == CENTRAL_MAGIC || m_signature == END_MAGIC || - m_signature == Z64_END_MAGIC) { - if (m_streamlink && !m_streamlink->GetOutputStream()) { - m_streamlink->Release(this); - m_streamlink = NULL; - } - } - - while (m_signature == CENTRAL_MAGIC) { - if (m_weaklinks->IsEmpty() && m_streamlink == NULL) - return wxSTREAM_EOF; - - size_t size = m_entry.ReadCentral(*m_parent_i_stream, GetConv()); - m_position += size; - m_signature = 0; - if (!size) - return wxSTREAM_READ_ERROR; - - wxZipEntry *entry = m_weaklinks->GetEntry(m_entry.GetOffset()); - if (entry) { - entry->SetSystemMadeBy(m_entry.GetSystemMadeBy()); - entry->SetVersionMadeBy(m_entry.GetVersionMadeBy()); - entry->SetComment(m_entry.GetComment()); - entry->SetDiskStart(m_entry.GetDiskStart()); - entry->SetInternalAttributes(m_entry.GetInternalAttributes()); - entry->SetExternalAttributes(m_entry.GetExternalAttributes()); - Copy(entry->m_Extra, m_entry.m_Extra); - entry->Notify(); - m_weaklinks->RemoveEntry(entry->GetOffset()); - } - - m_signature = ReadSignature(); - } - - if (m_signature == END_MAGIC || m_signature == Z64_END_MAGIC) { - if (readEndRec || m_streamlink) { - wxZipEndRec endrec; - endrec.Read(*m_parent_i_stream, GetConv()); - m_Comment = endrec.GetComment(); - m_signature = 0; - if (m_streamlink) { - m_streamlink->GetOutputStream()->SetComment(endrec.GetComment()); - m_streamlink->Release(this); - m_streamlink = NULL; - } - } - return wxSTREAM_EOF; - } - - if (m_signature == LOCAL_MAGIC) { - m_headerSize = m_entry.ReadLocal(*m_parent_i_stream, GetConv()); - m_signature = 0; - m_entry.SetOffset(m_position); - m_entry.SetKey(m_position); - - if (m_headerSize) { - m_TotalEntries++; - return wxSTREAM_NO_ERROR; - } - } - - wxLogError(_("error reading zip local header")); - return wxSTREAM_READ_ERROR; -} - -wxUint32 wxZipInputStream::ReadSignature() -{ - char magic[4]; - m_parent_i_stream->Read(magic, 4); - return m_parent_i_stream->LastRead() == 4 ? CrackUint32(magic) : 0; -} - -bool wxZipInputStream::OpenEntry(wxArchiveEntry& entry) -{ - wxZipEntry *zipEntry = wxStaticCast(&entry, wxZipEntry); - return zipEntry ? OpenEntry(*zipEntry) : false; -} - -// Open an entry -// -bool wxZipInputStream::DoOpen(wxZipEntry *entry, bool raw) -{ - if (m_position == wxInvalidOffset) - if (!LoadEndRecord()) - return false; - if (m_lasterror == wxSTREAM_READ_ERROR) - return false; - if (IsOpened()) - CloseEntry(); - - m_raw = raw; - - if (entry) { - if (AfterHeader() && entry->GetKey() == m_entry.GetOffset()) - return true; - // can only open the current entry on a non-seekable stream - wxCHECK(m_parentSeekable, false); - } - - m_lasterror = wxSTREAM_READ_ERROR; - - if (entry) - m_entry = *entry; - - if (m_parentSeekable) { - if (QuietSeek(*m_parent_i_stream, m_entry.GetOffset()) - == wxInvalidOffset) - return false; - if (ReadSignature() != LOCAL_MAGIC) { - wxLogError(_("bad zipfile offset to entry")); - return false; - } - } - - if (m_parentSeekable || AtHeader()) { - m_headerSize = m_entry.ReadLocal(*m_parent_i_stream, GetConv()); - if (m_headerSize && m_parentSeekable) { - wxZipEntry *ref = m_weaklinks->GetEntry(m_entry.GetKey()); - if (ref) { - Copy(ref->m_LocalExtra, m_entry.m_LocalExtra); - ref->Notify(); - m_weaklinks->RemoveEntry(ref->GetKey()); - } - if (entry && entry != ref) { - Copy(entry->m_LocalExtra, m_entry.m_LocalExtra); - entry->Notify(); - } - } - } - - if (m_headerSize) - m_lasterror = wxSTREAM_NO_ERROR; - return IsOk(); -} - -bool wxZipInputStream::OpenDecompressor(bool raw /*=false*/) -{ - wxASSERT(AfterHeader()); - - wxFileOffset compressedSize = m_entry.GetCompressedSize(); - - if (raw) - m_raw = true; - - if (m_raw) { - if (compressedSize != wxInvalidOffset) { - m_store->Open(compressedSize); - m_decomp = m_store; - } else { - if (!m_rawin) - m_rawin = new wxRawInputStream(*m_parent_i_stream); - m_decomp = m_rawin->Open(OpenDecompressor(m_rawin->GetTee())); - } - } else { - if (compressedSize != wxInvalidOffset && - (m_entry.GetMethod() != wxZIP_METHOD_DEFLATE || - wxZlibInputStream::CanHandleGZip())) { - m_store->Open(compressedSize); - m_decomp = OpenDecompressor(*m_store); - } else { - m_decomp = OpenDecompressor(*m_parent_i_stream); - } - } - - m_crcAccumulator = crc32(0, Z_NULL, 0); - m_lasterror = m_decomp ? m_decomp->GetLastError() : wxSTREAM_READ_ERROR; - return IsOk(); -} - -// Can be overridden to add support for additional decompression methods -// -wxInputStream *wxZipInputStream::OpenDecompressor(wxInputStream& stream) -{ - switch (m_entry.GetMethod()) { - case wxZIP_METHOD_STORE: - if (m_entry.GetSize() == wxInvalidOffset) { - wxLogError(_("stored file length not in Zip header")); - break; - } - m_store->Open(m_entry.GetSize()); - return m_store; - - case wxZIP_METHOD_DEFLATE: - if (!m_inflate) - m_inflate = new wxZlibInputStream2(stream); - else - m_inflate->Open(stream); - return m_inflate; - - default: - wxLogError(_("unsupported Zip compression method")); - } - - return NULL; -} - -bool wxZipInputStream::CloseDecompressor(wxInputStream *decomp) -{ - if (decomp && decomp == m_rawin) - return CloseDecompressor(m_rawin->GetFilterInputStream()); - if (decomp != m_store && decomp != m_inflate) - delete decomp; - return true; -} - -// Closes the current entry and positions the underlying stream at the start -// of the next entry -// -bool wxZipInputStream::CloseEntry() -{ - if (AtHeader()) - return true; - if (m_lasterror == wxSTREAM_READ_ERROR) - return false; - - if (!m_parentSeekable) { - if (!IsOpened() && !OpenDecompressor(true)) - return false; - - const int BUFSIZE = 8192; - wxCharBuffer buf(BUFSIZE); - while (IsOk()) - Read(buf.data(), BUFSIZE); - - m_position += m_headerSize + m_entry.GetCompressedSize(); - } - - if (m_lasterror == wxSTREAM_EOF) - m_lasterror = wxSTREAM_NO_ERROR; - - CloseDecompressor(m_decomp); - m_decomp = NULL; - m_entry = wxZipEntry(); - m_headerSize = 0; - m_raw = false; - - return IsOk(); -} - -size_t wxZipInputStream::OnSysRead(void *buffer, size_t size) -{ - if (!IsOpened()) - if ((AtHeader() && !DoOpen()) || !OpenDecompressor()) - m_lasterror = wxSTREAM_READ_ERROR; - if (!IsOk() || !size) - return 0; - - size_t count = m_decomp->Read(buffer, size).LastRead(); - if (!m_raw) - m_crcAccumulator = crc32(m_crcAccumulator, (Byte*)buffer, count); - if (count < size) - m_lasterror = m_decomp->GetLastError(); - - if (Eof()) { - if ((m_entry.GetFlags() & wxZIP_SUMS_FOLLOW) != 0) { - m_headerSize += m_entry.ReadDescriptor(*m_parent_i_stream); - wxZipEntry *entry = m_weaklinks->GetEntry(m_entry.GetKey()); - - if (entry) { - entry->SetCrc(m_entry.GetCrc()); - entry->SetCompressedSize(m_entry.GetCompressedSize()); - entry->SetSize(m_entry.GetSize()); - entry->Notify(); - } - } - - if (!m_raw) { - m_lasterror = wxSTREAM_READ_ERROR; - - if (m_entry.GetSize() != TellI()) - { - wxLogError(_("reading zip stream (entry %s): bad length"), - m_entry.GetName().c_str()); - } - else if (m_crcAccumulator != m_entry.GetCrc()) - { - wxLogError(_("reading zip stream (entry %s): bad crc"), - m_entry.GetName().c_str()); - } - else - { - m_lasterror = wxSTREAM_EOF; - } - } - } - - return count; -} - -///////////////////////////////////////////////////////////////////////////// -// Output stream - -#include "wx/listimpl.cpp" -WX_DEFINE_LIST(wxZipEntryList_) - -wxZipOutputStream::wxZipOutputStream(wxOutputStream& stream, - int level /*=-1*/, - wxMBConv& conv /*=wxConvLocal*/) - : wxArchiveOutputStream(stream, conv) -{ - Init(level); -} - -wxZipOutputStream::wxZipOutputStream(wxOutputStream *stream, - int level /*=-1*/, - wxMBConv& conv /*=wxConvLocal*/) - : wxArchiveOutputStream(stream, conv) -{ - Init(level); -} - -void wxZipOutputStream::Init(int level) -{ - m_store = new wxStoredOutputStream(*m_parent_o_stream); - m_deflate = NULL; - m_backlink = NULL; - m_initialData = new char[OUTPUT_LATENCY]; - m_initialSize = 0; - m_pending = NULL; - m_raw = false; - m_headerOffset = 0; - m_headerSize = 0; - m_entrySize = 0; - m_comp = NULL; - m_level = level; - m_offsetAdjustment = wxInvalidOffset; - m_endrecWritten = false; -} - -wxZipOutputStream::~wxZipOutputStream() -{ - Close(); - WX_CLEAR_LIST(wxZipEntryList_, m_entries); - delete m_store; - delete m_deflate; - delete m_pending; - delete [] m_initialData; - if (m_backlink) - m_backlink->Release(this); -} - -bool wxZipOutputStream::PutNextEntry( - const wxString& name, - const wxDateTime& dt /*=wxDateTime::Now()*/, - wxFileOffset size /*=wxInvalidOffset*/) -{ - return PutNextEntry(new wxZipEntry(name, dt, size)); -} - -bool wxZipOutputStream::PutNextDirEntry( - const wxString& name, - const wxDateTime& dt /*=wxDateTime::Now()*/) -{ - wxZipEntry *entry = new wxZipEntry(name, dt); - entry->SetIsDir(); - return PutNextEntry(entry); -} - -bool wxZipOutputStream::CopyEntry(wxZipEntry *entry, - wxZipInputStream& inputStream) -{ - wxZipEntryPtr_ e(entry); - - return - inputStream.DoOpen(e.get(), true) && - DoCreate(e.release(), true) && - Write(inputStream).IsOk() && inputStream.Eof(); -} - -bool wxZipOutputStream::PutNextEntry(wxArchiveEntry *entry) -{ - wxZipEntry *zipEntry = wxStaticCast(entry, wxZipEntry); - if (!zipEntry) - delete entry; - return PutNextEntry(zipEntry); -} - -bool wxZipOutputStream::CopyEntry(wxArchiveEntry *entry, - wxArchiveInputStream& stream) -{ - wxZipEntry *zipEntry = wxStaticCast(entry, wxZipEntry); - - if (!zipEntry || !stream.OpenEntry(*zipEntry)) { - delete entry; - return false; - } - - return CopyEntry(zipEntry, static_cast(stream)); -} - -bool wxZipOutputStream::CopyArchiveMetaData(wxZipInputStream& inputStream) -{ - m_Comment = inputStream.GetComment(); - if (m_backlink) - m_backlink->Release(this); - m_backlink = inputStream.MakeLink(this); - return true; -} - -bool wxZipOutputStream::CopyArchiveMetaData(wxArchiveInputStream& stream) -{ - return CopyArchiveMetaData(static_cast(stream)); -} - -void wxZipOutputStream::SetLevel(int level) -{ - if (level != m_level) { - if (m_comp != m_deflate) - delete m_deflate; - m_deflate = NULL; - m_level = level; - } -} - -bool wxZipOutputStream::DoCreate(wxZipEntry *entry, bool raw /*=false*/) -{ - CloseEntry(); - - m_pending = entry; - if (!m_pending) - return false; - - // write the signature bytes right away - wxDataOutputStream ds(*m_parent_o_stream); - ds << LOCAL_MAGIC; - - // and if this is the first entry test for seekability - if (m_headerOffset == 0 && m_parent_o_stream->IsSeekable()) { -#if wxUSE_LOG - bool logging = wxLog::IsEnabled(); - wxLogNull nolog; -#endif // wxUSE_LOG - wxFileOffset here = m_parent_o_stream->TellO(); - - if (here != wxInvalidOffset && here >= 4) { - if (m_parent_o_stream->SeekO(here - 4) == here - 4) { - m_offsetAdjustment = here - 4; -#if wxUSE_LOG - wxLog::EnableLogging(logging); -#endif // wxUSE_LOG - m_parent_o_stream->SeekO(here); - } - } - } - - m_pending->SetOffset(m_headerOffset); - - m_crcAccumulator = crc32(0, Z_NULL, 0); - - if (raw) - m_raw = true; - - m_lasterror = wxSTREAM_NO_ERROR; - return true; -} - -// Can be overridden to add support for additional compression methods -// -wxOutputStream *wxZipOutputStream::OpenCompressor( - wxOutputStream& stream, - wxZipEntry& entry, - const Buffer bufs[]) -{ - if (entry.GetMethod() == wxZIP_METHOD_DEFAULT) { - if (GetLevel() == 0 - && (IsParentSeekable() - || entry.GetCompressedSize() != wxInvalidOffset - || entry.GetSize() != wxInvalidOffset)) { - entry.SetMethod(wxZIP_METHOD_STORE); - } else { - int size = 0; - for (int i = 0; bufs[i].m_data; ++i) - size += bufs[i].m_size; - entry.SetMethod(size <= 6 ? - wxZIP_METHOD_STORE : wxZIP_METHOD_DEFLATE); - } - } - - switch (entry.GetMethod()) { - case wxZIP_METHOD_STORE: - if (entry.GetCompressedSize() == wxInvalidOffset) - entry.SetCompressedSize(entry.GetSize()); - return m_store; - - case wxZIP_METHOD_DEFLATE: - { - int defbits = wxZIP_DEFLATE_NORMAL; - switch (GetLevel()) { - case 0: case 1: - defbits = wxZIP_DEFLATE_SUPERFAST; - break; - case 2: case 3: case 4: - defbits = wxZIP_DEFLATE_FAST; - break; - case 8: case 9: - defbits = wxZIP_DEFLATE_EXTRA; - break; - } - entry.SetFlags((entry.GetFlags() & ~wxZIP_DEFLATE_MASK) | - defbits | wxZIP_SUMS_FOLLOW); - - if (!m_deflate) - m_deflate = new wxZlibOutputStream2(stream, GetLevel()); - else - m_deflate->Open(stream); - - return m_deflate; - } - - default: - wxLogError(_("unsupported Zip compression method")); - } - - return NULL; -} - -bool wxZipOutputStream::CloseCompressor(wxOutputStream *comp) -{ - if (comp == m_deflate) - m_deflate->Close(); - else if (comp != m_store) - delete comp; - return true; -} - -// This is called when OUPUT_LATENCY bytes has been written to the -// wxZipOutputStream to actually create the zip entry. -// -void wxZipOutputStream::CreatePendingEntry(const void *buffer, size_t size) -{ - wxASSERT(IsOk() && m_pending && !m_comp); - wxZipEntryPtr_ spPending(m_pending); - m_pending = NULL; - - Buffer bufs[] = { - { m_initialData, m_initialSize }, - { (const char*)buffer, size }, - { NULL, 0 } - }; - - if (m_raw) - m_comp = m_store; - else - m_comp = OpenCompressor(*m_store, *spPending, - m_initialSize ? bufs : bufs + 1); - - if (IsParentSeekable() - || (spPending->m_Crc - && spPending->m_CompressedSize != wxInvalidOffset - && spPending->m_Size != wxInvalidOffset)) - spPending->m_Flags &= ~wxZIP_SUMS_FOLLOW; - else - if (spPending->m_CompressedSize != wxInvalidOffset) - spPending->m_Flags |= wxZIP_SUMS_FOLLOW; - - m_headerSize = spPending->WriteLocal(*m_parent_o_stream, GetConv()); - m_lasterror = m_parent_o_stream->GetLastError(); - - if (IsOk()) { - m_entries.push_back(spPending.release()); - OnSysWrite(m_initialData, m_initialSize); - } - - m_initialSize = 0; -} - -// This is called to write out the zip entry when Close has been called -// before OUTPUT_LATENCY bytes has been written to the wxZipOutputStream. -// -void wxZipOutputStream::CreatePendingEntry() -{ - wxASSERT(IsOk() && m_pending && !m_comp); - wxZipEntryPtr_ spPending(m_pending); - m_pending = NULL; - m_lasterror = wxSTREAM_WRITE_ERROR; - - if (!m_raw) { - // Initially compresses the data to memory, then fall back to 'store' - // if the compressor makes the data larger rather than smaller. - wxMemoryOutputStream mem; - Buffer bufs[] = { { m_initialData, m_initialSize }, { NULL, 0 } }; - wxOutputStream *comp = OpenCompressor(mem, *spPending, bufs); - - if (!comp) - return; - if (comp != m_store) { - bool ok = comp->Write(m_initialData, m_initialSize).IsOk(); - CloseCompressor(comp); - if (!ok) - return; - } - - m_entrySize = m_initialSize; - m_crcAccumulator = crc32(0, (Byte*)m_initialData, m_initialSize); - - if (mem.GetSize() > 0 && mem.GetSize() < m_initialSize) { - m_initialSize = mem.GetSize(); - mem.CopyTo(m_initialData, m_initialSize); - } else { - spPending->SetMethod(wxZIP_METHOD_STORE); - } - - spPending->SetSize(m_entrySize); - spPending->SetCrc(m_crcAccumulator); - spPending->SetCompressedSize(m_initialSize); - } - - spPending->m_Flags &= ~wxZIP_SUMS_FOLLOW; - m_headerSize = spPending->WriteLocal(*m_parent_o_stream, GetConv()); - - if (m_parent_o_stream->IsOk()) { - m_entries.push_back(spPending.release()); - m_comp = m_store; - m_store->Write(m_initialData, m_initialSize); - } - - m_initialSize = 0; - m_lasterror = m_parent_o_stream->GetLastError(); -} - -// Write the 'central directory' and the 'end-central-directory' records. -// -bool wxZipOutputStream::Close() -{ - CloseEntry(); - - if (m_lasterror == wxSTREAM_WRITE_ERROR - || (m_entries.size() == 0 && m_endrecWritten)) - { - wxFilterOutputStream::Close(); - return false; - } - - wxZipEndRec endrec; - - endrec.SetEntriesHere(m_entries.size()); - endrec.SetTotalEntries(m_entries.size()); - endrec.SetOffset(m_headerOffset); - endrec.SetComment(m_Comment); - - wxZipEntryList_::iterator it; - wxFileOffset size = 0; - - for (it = m_entries.begin(); it != m_entries.end(); ++it) { - size += (*it)->WriteCentral(*m_parent_o_stream, GetConv()); - delete *it; - } - m_entries.clear(); - - endrec.SetSize(size); - endrec.Write(*m_parent_o_stream, GetConv()); - - m_lasterror = m_parent_o_stream->GetLastError(); - m_endrecWritten = true; - - if (!wxFilterOutputStream::Close() || !IsOk()) - return false; - m_lasterror = wxSTREAM_EOF; - return true; -} - -// Finish writing the current entry -// -bool wxZipOutputStream::CloseEntry() -{ - if (IsOk() && m_pending) - CreatePendingEntry(); - if (!IsOk()) - return false; - if (!m_comp) - return true; - - CloseCompressor(m_comp); - m_comp = NULL; - - wxFileOffset compressedSize = m_store->TellO(); - - wxZipEntry& entry = *m_entries.back(); - - // When writing raw the crc and size can't be checked - if (m_raw) { - m_crcAccumulator = entry.GetCrc(); - m_entrySize = entry.GetSize(); - } - - // Write the sums in the trailing 'data descriptor' if necessary - if (entry.m_Flags & wxZIP_SUMS_FOLLOW) { - wxASSERT(!IsParentSeekable()); - m_headerOffset += - entry.WriteDescriptor(*m_parent_o_stream, m_crcAccumulator, - compressedSize, m_entrySize); - m_lasterror = m_parent_o_stream->GetLastError(); - } - - // If the local header didn't have the correct crc and size written to - // it then seek back and fix it - else if (m_crcAccumulator != entry.GetCrc() - || m_entrySize != entry.GetSize() - || compressedSize != entry.GetCompressedSize()) - { - if (IsParentSeekable()) { - wxFileOffset here = m_parent_o_stream->TellO(); - wxFileOffset headerOffset = m_headerOffset + m_offsetAdjustment; - m_parent_o_stream->SeekO(headerOffset + SUMS_OFFSET); - entry.WriteDescriptor(*m_parent_o_stream, m_crcAccumulator, - compressedSize, m_entrySize); - m_parent_o_stream->SeekO(here); - m_lasterror = m_parent_o_stream->GetLastError(); - } else { - m_lasterror = wxSTREAM_WRITE_ERROR; - } - } - - m_headerOffset += m_headerSize + compressedSize; - m_headerSize = 0; - m_entrySize = 0; - m_store->Close(); - m_raw = false; - - if (IsOk()) - m_lasterror = m_parent_o_stream->GetLastError(); - else - wxLogError(_("error writing zip entry '%s': bad crc or length"), - entry.GetName().c_str()); - return IsOk(); -} - -void wxZipOutputStream::Sync() -{ - if (IsOk() && m_pending) - CreatePendingEntry(NULL, 0); - if (!m_comp) - m_lasterror = wxSTREAM_WRITE_ERROR; - if (IsOk()) { - m_comp->Sync(); - m_lasterror = m_comp->GetLastError(); - } -} - -size_t wxZipOutputStream::OnSysWrite(const void *buffer, size_t size) -{ - if (IsOk() && m_pending) { - if (m_initialSize + size < OUTPUT_LATENCY) { - memcpy(m_initialData + m_initialSize, buffer, size); - m_initialSize += size; - return size; - } else { - CreatePendingEntry(buffer, size); - } - } - - if (!m_comp) - m_lasterror = wxSTREAM_WRITE_ERROR; - if (!IsOk() || !size) - return 0; - - if (m_comp->Write(buffer, size).LastWrite() != size) - m_lasterror = wxSTREAM_WRITE_ERROR; - m_crcAccumulator = crc32(m_crcAccumulator, (Byte*)buffer, size); - m_entrySize += m_comp->LastWrite(); - - return m_comp->LastWrite(); -} - -#endif // wxUSE_ZIPSTREAM diff --git a/Externals/wxWidgets3/src/common/zstream.cpp b/Externals/wxWidgets3/src/common/zstream.cpp deleted file mode 100644 index 8ae6c1c466..0000000000 --- a/Externals/wxWidgets3/src/common/zstream.cpp +++ /dev/null @@ -1,451 +0,0 @@ -////////////////////////////////////////////////////////////////////////////// -// Name: src/common/zstream.cpp -// Purpose: Compressed stream classes -// Author: Guilhem Lavaux -// Modified by: Mike Wetherell -// Created: 11/07/98 -// Copyright: (c) Guilhem Lavaux -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_ZLIB && wxUSE_STREAMS - -#include "wx/zstream.h" -#include "wx/versioninfo.h" - -#ifndef WX_PRECOMP - #include "wx/intl.h" - #include "wx/log.h" - #include "wx/utils.h" -#endif - - -// normally, the compiler options should contain -I../zlib, but it is -// apparently not the case for all MSW makefiles and so, unless we use -// configure (which defines __WX_SETUP_H__) or it is explicitly overridden by -// the user (who can define wxUSE_ZLIB_H_IN_PATH), we hardcode the path here -#if defined(__WINDOWS__) && !defined(__WX_SETUP_H__) && !defined(wxUSE_ZLIB_H_IN_PATH) - #include "../zlib/zlib.h" -#else - #include "zlib.h" -#endif - -enum { - ZSTREAM_BUFFER_SIZE = 16384, - ZSTREAM_GZIP = 0x10, // gzip header - ZSTREAM_AUTO = 0x20 // auto detect between gzip and zlib -}; - - -wxVersionInfo wxGetZlibVersionInfo() -{ - int major, - minor, - build; - - if ( sscanf(zlibVersion(), "%d.%d.%d", &major, &minor, &build) != 3 ) - { - major = - minor = - build = 0; - } - - return wxVersionInfo("zlib", major, minor, build); -} - -///////////////////////////////////////////////////////////////////////////// -// Zlib Class factory - -wxIMPLEMENT_DYNAMIC_CLASS(wxZlibClassFactory, wxFilterClassFactory); - -static wxZlibClassFactory g_wxZlibClassFactory; - -wxZlibClassFactory::wxZlibClassFactory() -{ - if (this == &g_wxZlibClassFactory) - PushFront(); -} - -const wxChar * const * -wxZlibClassFactory::GetProtocols(wxStreamProtocolType type) const -{ - static const wxChar *mimes[] = { wxT("application/x-deflate"), NULL }; - static const wxChar *encs[] = { wxT("deflate"), NULL }; - static const wxChar *empty[] = { NULL }; - - switch (type) { - case wxSTREAM_MIMETYPE: return mimes; - case wxSTREAM_ENCODING: return encs; - default: return empty; - } -} - - -///////////////////////////////////////////////////////////////////////////// -// Gzip Class factory - -wxIMPLEMENT_DYNAMIC_CLASS(wxGzipClassFactory, wxFilterClassFactory); - -static wxGzipClassFactory g_wxGzipClassFactory; - -wxGzipClassFactory::wxGzipClassFactory() -{ - if (this == &g_wxGzipClassFactory && wxZlibInputStream::CanHandleGZip()) - PushFront(); -} - -const wxChar * const * -wxGzipClassFactory::GetProtocols(wxStreamProtocolType type) const -{ - static const wxChar *protos[] = - { wxT("gzip"), NULL }; - static const wxChar *mimes[] = - { wxT("application/gzip"), wxT("application/x-gzip"), NULL }; - static const wxChar *encs[] = - { wxT("gzip"), NULL }; - static const wxChar *exts[] = - { wxT(".gz"), wxT(".gzip"), NULL }; - static const wxChar *empty[] = - { NULL }; - - switch (type) { - case wxSTREAM_PROTOCOL: return protos; - case wxSTREAM_MIMETYPE: return mimes; - case wxSTREAM_ENCODING: return encs; - case wxSTREAM_FILEEXT: return exts; - default: return empty; - } -} - - -////////////////////// -// wxZlibInputStream -////////////////////// - -wxZlibInputStream::wxZlibInputStream(wxInputStream& stream, int flags) - : wxFilterInputStream(stream) -{ - Init(flags); -} - -wxZlibInputStream::wxZlibInputStream(wxInputStream *stream, int flags) - : wxFilterInputStream(stream) -{ - Init(flags); -} - -void wxZlibInputStream::Init(int flags) -{ - m_inflate = NULL; - m_z_buffer = new unsigned char[ZSTREAM_BUFFER_SIZE]; - m_z_size = ZSTREAM_BUFFER_SIZE; - m_pos = 0; - - // if gzip is asked for but not supported... - if ((flags == wxZLIB_GZIP || flags == wxZLIB_AUTO) && !CanHandleGZip()) { - if (flags == wxZLIB_AUTO) { - // an error will come later if the input turns out not to be a zlib - flags = wxZLIB_ZLIB; - } - else { - wxLogError(_("Gzip not supported by this version of zlib")); - m_lasterror = wxSTREAM_READ_ERROR; - return; - } - } - - if (m_z_buffer) { - m_inflate = new z_stream_s; - - if (m_inflate) { - memset(m_inflate, 0, sizeof(z_stream_s)); - - // see zlib.h for documentation on windowBits - int windowBits = MAX_WBITS; - switch (flags) { - case wxZLIB_NO_HEADER: windowBits = -MAX_WBITS; break; - case wxZLIB_ZLIB: windowBits = MAX_WBITS; break; - case wxZLIB_GZIP: windowBits = MAX_WBITS | ZSTREAM_GZIP; break; - case wxZLIB_AUTO: windowBits = MAX_WBITS | ZSTREAM_AUTO; break; - default: wxFAIL_MSG(wxT("Invalid zlib flag")); - } - - if (inflateInit2(m_inflate, windowBits) == Z_OK) - return; - } - } - - wxLogError(_("Can't initialize zlib inflate stream.")); - m_lasterror = wxSTREAM_READ_ERROR; -} - -wxZlibInputStream::~wxZlibInputStream() -{ - inflateEnd(m_inflate); - delete m_inflate; - - delete [] m_z_buffer; -} - -size_t wxZlibInputStream::OnSysRead(void *buffer, size_t size) -{ - wxASSERT_MSG(m_inflate && m_z_buffer, wxT("Inflate stream not open")); - - if (!m_inflate || !m_z_buffer) - m_lasterror = wxSTREAM_READ_ERROR; - if (!IsOk() || !size) - return 0; - - int err = Z_OK; - m_inflate->next_out = (unsigned char *)buffer; - m_inflate->avail_out = size; - - while (err == Z_OK && m_inflate->avail_out > 0) { - if (m_inflate->avail_in == 0 && m_parent_i_stream->IsOk()) { - m_parent_i_stream->Read(m_z_buffer, m_z_size); - m_inflate->next_in = m_z_buffer; - m_inflate->avail_in = m_parent_i_stream->LastRead(); - } - err = inflate(m_inflate, Z_SYNC_FLUSH); - } - - switch (err) { - case Z_OK: - break; - - case Z_STREAM_END: - if (m_inflate->avail_out) { - // Unread any data taken from past the end of the deflate stream, so that - // any additional data can be read from the underlying stream (the crc - // in a gzip for example) - if (m_inflate->avail_in) { - m_parent_i_stream->Reset(); - m_parent_i_stream->Ungetch(m_inflate->next_in, m_inflate->avail_in); - m_inflate->avail_in = 0; - } - m_lasterror = wxSTREAM_EOF; - } - break; - - case Z_BUF_ERROR: - // Indicates that zlib was expecting more data, but the parent stream - // has none. Other than Eof the error will have been already reported - // by the parent strean, - m_lasterror = wxSTREAM_READ_ERROR; - if (m_parent_i_stream->Eof()) - { - wxLogError(_("Can't read inflate stream: unexpected EOF in underlying stream.")); - } - break; - - default: - wxString msg(m_inflate->msg, *wxConvCurrent); - if (!msg) - msg = wxString::Format(_("zlib error %d"), err); - wxLogError(_("Can't read from inflate stream: %s"), msg.c_str()); - m_lasterror = wxSTREAM_READ_ERROR; - } - - size -= m_inflate->avail_out; - m_pos += size; - return size; -} - -/* static */ bool wxZlibInputStream::CanHandleGZip() -{ - const char *dot = strchr(zlibVersion(), '.'); - int major = atoi(zlibVersion()); - int minor = dot ? atoi(dot + 1) : 0; - return major > 1 || (major == 1 && minor >= 2); -} - -bool wxZlibInputStream::SetDictionary(const char *data, size_t datalen) -{ - return (inflateSetDictionary(m_inflate, (Bytef*)data, datalen) == Z_OK); -} - -bool wxZlibInputStream::SetDictionary(const wxMemoryBuffer &buf) -{ - return SetDictionary((char*)buf.GetData(), buf.GetDataLen()); -} - - -////////////////////// -// wxZlibOutputStream -////////////////////// - -wxZlibOutputStream::wxZlibOutputStream(wxOutputStream& stream, - int level, - int flags) - : wxFilterOutputStream(stream) -{ - Init(level, flags); -} - -wxZlibOutputStream::wxZlibOutputStream(wxOutputStream *stream, - int level, - int flags) - : wxFilterOutputStream(stream) -{ - Init(level, flags); -} - -void wxZlibOutputStream::Init(int level, int flags) -{ - m_deflate = NULL; - m_z_buffer = new unsigned char[ZSTREAM_BUFFER_SIZE]; - m_z_size = ZSTREAM_BUFFER_SIZE; - m_pos = 0; - - if ( level == -1 ) - { - level = Z_DEFAULT_COMPRESSION; - } - else - { - wxASSERT_MSG(level >= 0 && level <= 9, wxT("wxZlibOutputStream compression level must be between 0 and 9!")); - } - - // if gzip is asked for but not supported... - if (flags == wxZLIB_GZIP && !CanHandleGZip()) { - wxLogError(_("Gzip not supported by this version of zlib")); - m_lasterror = wxSTREAM_WRITE_ERROR; - return; - } - - if (m_z_buffer) { - m_deflate = new z_stream_s; - - if (m_deflate) { - memset(m_deflate, 0, sizeof(z_stream_s)); - m_deflate->next_out = m_z_buffer; - m_deflate->avail_out = m_z_size; - - // see zlib.h for documentation on windowBits - int windowBits = MAX_WBITS; - switch (flags) { - case wxZLIB_NO_HEADER: windowBits = -MAX_WBITS; break; - case wxZLIB_ZLIB: windowBits = MAX_WBITS; break; - case wxZLIB_GZIP: windowBits = MAX_WBITS | ZSTREAM_GZIP; break; - default: wxFAIL_MSG(wxT("Invalid zlib flag")); - } - - if (deflateInit2(m_deflate, level, Z_DEFLATED, windowBits, - 8, Z_DEFAULT_STRATEGY) == Z_OK) - return; - } - } - - wxLogError(_("Can't initialize zlib deflate stream.")); - m_lasterror = wxSTREAM_WRITE_ERROR; -} - -bool wxZlibOutputStream::Close() - { - DoFlush(true); - deflateEnd(m_deflate); - wxDELETE(m_deflate); - wxDELETEA(m_z_buffer); - - return wxFilterOutputStream::Close() && IsOk(); - } - -void wxZlibOutputStream::DoFlush(bool final) -{ - if (!m_deflate || !m_z_buffer) - m_lasterror = wxSTREAM_WRITE_ERROR; - if (!IsOk()) - return; - - int err = Z_OK; - bool done = false; - - while (err == Z_OK || err == Z_STREAM_END) { - size_t len = m_z_size - m_deflate->avail_out; - if (len) { - if (m_parent_o_stream->Write(m_z_buffer, len).LastWrite() != len) { - m_lasterror = wxSTREAM_WRITE_ERROR; - wxLogDebug(wxT("wxZlibOutputStream: Error writing to underlying stream")); - break; - } - m_deflate->next_out = m_z_buffer; - m_deflate->avail_out = m_z_size; - } - - if (done) - break; - err = deflate(m_deflate, final ? Z_FINISH : Z_FULL_FLUSH); - done = m_deflate->avail_out != 0 || err == Z_STREAM_END; - } -} - -size_t wxZlibOutputStream::OnSysWrite(const void *buffer, size_t size) -{ - wxASSERT_MSG(m_deflate && m_z_buffer, wxT("Deflate stream not open")); - - if (!m_deflate || !m_z_buffer) - { - // notice that this will make IsOk() test just below return false - m_lasterror = wxSTREAM_WRITE_ERROR; - } - - if (!IsOk() || !size) - return 0; - - int err = Z_OK; - m_deflate->next_in = (unsigned char *)buffer; - m_deflate->avail_in = size; - - while (err == Z_OK && m_deflate->avail_in > 0) { - if (m_deflate->avail_out == 0) { - m_parent_o_stream->Write(m_z_buffer, m_z_size); - if (m_parent_o_stream->LastWrite() != m_z_size) { - m_lasterror = wxSTREAM_WRITE_ERROR; - wxLogDebug(wxT("wxZlibOutputStream: Error writing to underlying stream")); - break; - } - - m_deflate->next_out = m_z_buffer; - m_deflate->avail_out = m_z_size; - } - - err = deflate(m_deflate, Z_NO_FLUSH); - } - - if (err != Z_OK) { - m_lasterror = wxSTREAM_WRITE_ERROR; - wxString msg(m_deflate->msg, *wxConvCurrent); - if (!msg) - msg = wxString::Format(_("zlib error %d"), err); - wxLogError(_("Can't write to deflate stream: %s"), msg.c_str()); - } - - size -= m_deflate->avail_in; - m_pos += size; - return size; -} - -/* static */ bool wxZlibOutputStream::CanHandleGZip() -{ - return wxZlibInputStream::CanHandleGZip(); -} - -bool wxZlibOutputStream::SetDictionary(const char *data, size_t datalen) -{ - return (deflateSetDictionary(m_deflate, (Bytef*)data, datalen) == Z_OK); -} - -bool wxZlibOutputStream::SetDictionary(const wxMemoryBuffer &buf) -{ - return SetDictionary((char*)buf.GetData(), buf.GetDataLen()); -} - -#endif - // wxUSE_ZLIB && wxUSE_STREAMS diff --git a/Externals/wxWidgets3/src/cwcopysetup.bat b/Externals/wxWidgets3/src/cwcopysetup.bat deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/Externals/wxWidgets3/src/cwdcopysetup.bat b/Externals/wxWidgets3/src/cwdcopysetup.bat deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/Externals/wxWidgets3/src/generic/aboutdlgg.cpp b/Externals/wxWidgets3/src/generic/aboutdlgg.cpp deleted file mode 100644 index 9cb175334d..0000000000 --- a/Externals/wxWidgets3/src/generic/aboutdlgg.cpp +++ /dev/null @@ -1,330 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/generic/aboutdlgg.cpp -// Purpose: implements wxGenericAboutBox() function -// Author: Vadim Zeitlin -// Created: 2006-10-08 -// Copyright: (c) 2006 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// for compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_ABOUTDLG - -#ifndef WX_PRECOMP - #include "wx/sizer.h" - #include "wx/statbmp.h" - #include "wx/stattext.h" - #include "wx/button.h" -#endif //WX_PRECOMP - -#include "wx/aboutdlg.h" -#include "wx/generic/aboutdlgg.h" - -#include "wx/hyperlink.h" -#include "wx/collpane.h" - -// ============================================================================ -// implementation -// ============================================================================ - -// helper function: returns all array elements in a single comma-separated and -// newline-terminated string -static wxString AllAsString(const wxArrayString& a) -{ - wxString s; - const size_t count = a.size(); - s.reserve(20*count); - for ( size_t n = 0; n < count; n++ ) - { - s << a[n] << (n == count - 1 ? wxT("\n") : wxT(", ")); - } - - return s; -} - -// ---------------------------------------------------------------------------- -// wxAboutDialogInfo -// ---------------------------------------------------------------------------- - -wxString wxAboutDialogInfo::GetDescriptionAndCredits() const -{ - wxString s = GetDescription(); - if ( !s.empty() ) - s << wxT('\n'); - - if ( HasDevelopers() ) - s << wxT('\n') << _("Developed by ") << AllAsString(GetDevelopers()); - - if ( HasDocWriters() ) - s << wxT('\n') << _("Documentation by ") << AllAsString(GetDocWriters()); - - if ( HasArtists() ) - s << wxT('\n') << _("Graphics art by ") << AllAsString(GetArtists()); - - if ( HasTranslators() ) - s << wxT('\n') << _("Translations by ") << AllAsString(GetTranslators()); - - return s; -} - -wxIcon wxAboutDialogInfo::GetIcon() const -{ - wxIcon icon = m_icon; - if ( !icon.IsOk() && wxTheApp ) - { - const wxTopLevelWindow * const - tlw = wxDynamicCast(wxTheApp->GetTopWindow(), wxTopLevelWindow); - if ( tlw ) - icon = tlw->GetIcon(); - } - - return icon; -} - -wxString wxAboutDialogInfo::GetCopyrightToDisplay() const -{ - wxString ret = m_copyright; - -#if wxUSE_UNICODE - const wxString copyrightSign = wxString::FromUTF8("\xc2\xa9"); - ret.Replace("(c)", copyrightSign); - ret.Replace("(C)", copyrightSign); -#endif // wxUSE_UNICODE - - return ret; -} - -void wxAboutDialogInfo::SetVersion(const wxString& version, - const wxString& longVersion) -{ - if ( version.empty() ) - { - m_version.clear(); - - wxASSERT_MSG( longVersion.empty(), - "long version should be empty if version is"); - - m_longVersion.clear(); - } - else // setting valid version - { - m_version = version; - - if ( longVersion.empty() ) - m_longVersion = _("Version ") + m_version; - else - m_longVersion = longVersion; - } -} - -// ---------------------------------------------------------------------------- -// wxGenericAboutDialog -// ---------------------------------------------------------------------------- - -bool wxGenericAboutDialog::Create(const wxAboutDialogInfo& info, wxWindow* parent) -{ - if ( !wxDialog::Create(parent, wxID_ANY, wxString::Format(_("About %s"), info.GetName()), - wxDefaultPosition, wxDefaultSize, wxRESIZE_BORDER|wxDEFAULT_DIALOG_STYLE) ) - return false; - - m_sizerText = new wxBoxSizer(wxVERTICAL); - wxString nameAndVersion = info.GetName(); - if ( info.HasVersion() ) - nameAndVersion << wxT(' ') << info.GetVersion(); - wxStaticText *label = new wxStaticText(this, wxID_ANY, nameAndVersion); - wxFont fontBig(*wxNORMAL_FONT); - fontBig.SetPointSize(fontBig.GetPointSize() + 2); - fontBig.SetWeight(wxFONTWEIGHT_BOLD); - label->SetFont(fontBig); - - m_sizerText->Add(label, wxSizerFlags().Centre().Border()); - m_sizerText->AddSpacer(5); - - AddText(info.GetCopyrightToDisplay()); - AddText(info.GetDescription()); - - if ( info.HasWebSite() ) - { -#if wxUSE_HYPERLINKCTRL - AddControl(new wxHyperlinkCtrl(this, wxID_ANY, - info.GetWebSiteDescription(), - info.GetWebSiteURL())); -#else - AddText(info.GetWebSiteURL()); -#endif // wxUSE_HYPERLINKCTRL/!wxUSE_HYPERLINKCTRL - } - -#if wxUSE_COLLPANE - if ( info.HasLicence() ) - AddCollapsiblePane(_("License"), info.GetLicence()); - - if ( info.HasDevelopers() ) - AddCollapsiblePane(_("Developers"), - AllAsString(info.GetDevelopers())); - - if ( info.HasDocWriters() ) - AddCollapsiblePane(_("Documentation writers"), - AllAsString(info.GetDocWriters())); - - if ( info.HasArtists() ) - AddCollapsiblePane(_("Artists"), - AllAsString(info.GetArtists())); - - if ( info.HasTranslators() ) - AddCollapsiblePane(_("Translators"), - AllAsString(info.GetTranslators())); -#endif // wxUSE_COLLPANE - - DoAddCustomControls(); - - - wxSizer *sizerIconAndText = new wxBoxSizer(wxHORIZONTAL); -#if wxUSE_STATBMP - wxIcon icon = info.GetIcon(); - if ( icon.IsOk() ) - { - sizerIconAndText->Add(new wxStaticBitmap(this, wxID_ANY, icon), - wxSizerFlags().Border(wxRIGHT)); - } -#endif // wxUSE_STATBMP - sizerIconAndText->Add(m_sizerText, wxSizerFlags(1).Expand()); - - wxSizer *sizerTop = new wxBoxSizer(wxVERTICAL); - sizerTop->Add(sizerIconAndText, wxSizerFlags(1).Expand().Border()); - -// Mac typically doesn't use OK buttons just for dismissing dialogs. -#if !defined(__WXMAC__) - wxSizer *sizerBtns = CreateButtonSizer(wxOK); - if ( sizerBtns ) - { - sizerTop->Add(sizerBtns, wxSizerFlags().Expand().Border()); - } -#endif - - SetSizerAndFit(sizerTop); - - CentreOnParent(); - -#if !wxUSE_MODAL_ABOUT_DIALOG - Connect(wxEVT_CLOSE_WINDOW, - wxCloseEventHandler(wxGenericAboutDialog::OnCloseWindow)); - Connect(wxID_OK, wxEVT_BUTTON, - wxCommandEventHandler(wxGenericAboutDialog::OnOK)); -#endif // !wxUSE_MODAL_ABOUT_DIALOG - - return true; -} - -void wxGenericAboutDialog::AddControl(wxWindow *win, const wxSizerFlags& flags) -{ - wxCHECK_RET( m_sizerText, wxT("can only be called after Create()") ); - wxASSERT_MSG( win, wxT("can't add NULL window to about dialog") ); - - m_sizerText->Add(win, flags); -} - -void wxGenericAboutDialog::AddControl(wxWindow *win) -{ - AddControl(win, wxSizerFlags().Border(wxDOWN).Centre()); -} - -void wxGenericAboutDialog::AddText(const wxString& text) -{ - if ( !text.empty() ) - AddControl(new wxStaticText(this, wxID_ANY, text)); -} - -#if wxUSE_COLLPANE -void wxGenericAboutDialog::AddCollapsiblePane(const wxString& title, - const wxString& text) -{ - wxCollapsiblePane *pane = new wxCollapsiblePane(this, wxID_ANY, title); - wxWindow * const paneContents = pane->GetPane(); - wxStaticText *txt = new wxStaticText(paneContents, wxID_ANY, text, - wxDefaultPosition, wxDefaultSize, - wxALIGN_CENTRE); - - // don't make the text unreasonably wide - static const int maxWidth = wxGetDisplaySize().x/3; - txt->Wrap(maxWidth); - - - // we need a sizer to make this text expand to fill the entire pane area - wxSizer * const sizerPane = new wxBoxSizer(wxHORIZONTAL); - sizerPane->Add(txt, wxSizerFlags(1).Expand()); - paneContents->SetSizer(sizerPane); - - // NB: all the wxCollapsiblePanes must be added with a null proportion value - m_sizerText->Add(pane, wxSizerFlags(0).Expand().Border(wxBOTTOM)); -} -#endif - -#if !wxUSE_MODAL_ABOUT_DIALOG - -void wxGenericAboutDialog::OnCloseWindow(wxCloseEvent& event) -{ - // safeguards in case the window is still shown using ShowModal - if ( !IsModal() ) - Destroy(); - - event.Skip(); -} - -void wxGenericAboutDialog::OnOK(wxCommandEvent& event) -{ - // safeguards in case the window is still shown using ShowModal - if ( !IsModal() ) - { - // By default a modeless dialog would be just hidden, destroy this one - // instead. - Destroy(); - } - else - event.Skip(); -} - -#endif // !wxUSE_MODAL_ABOUT_DIALOG - -// ---------------------------------------------------------------------------- -// public functions -// ---------------------------------------------------------------------------- - -void wxGenericAboutBox(const wxAboutDialogInfo& info, wxWindow* parent) -{ -#if wxUSE_MODAL_ABOUT_DIALOG - wxGenericAboutDialog dlg(info, parent); - dlg.ShowModal(); -#else - wxGenericAboutDialog* dlg = new wxGenericAboutDialog(info, parent); - dlg->Show(); -#endif -} - -// currently wxAboutBox is implemented natively only under these platforms, for -// the others we provide a generic fallback here -#if !defined(__WXMSW__) && !defined(__WXMAC__) && \ - (!defined(__WXGTK20__) || defined(__WXUNIVERSAL__)) - -void wxAboutBox(const wxAboutDialogInfo& info, wxWindow* parent) -{ - wxGenericAboutBox(info, parent); -} - -#endif // platforms without native about dialog - - -#endif // wxUSE_ABOUTDLG diff --git a/Externals/wxWidgets3/src/generic/accel.cpp b/Externals/wxWidgets3/src/generic/accel.cpp deleted file mode 100644 index 10288b59cf..0000000000 --- a/Externals/wxWidgets3/src/generic/accel.cpp +++ /dev/null @@ -1,219 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/generic/accel.cpp -// Purpose: generic implementation of wxAcceleratorTable class -// Author: Robert Roebling -// Modified: VZ pn 31.05.01: use typed lists, Unicode cleanup, Add/Remove -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_ACCEL - -#ifndef WX_PRECOMP - #include "wx/list.h" - #include "wx/event.h" -#endif // WX_PRECOMP - -#include "wx/accel.h" - -#include - -// ---------------------------------------------------------------------------- -// wxAccelList: a list of wxAcceleratorEntries -// ---------------------------------------------------------------------------- - -WX_DECLARE_LIST(wxAcceleratorEntry, wxAccelList); -#include "wx/listimpl.cpp" -WX_DEFINE_LIST(wxAccelList) - -// ---------------------------------------------------------------------------- -// wxAccelRefData: the data used by wxAcceleratorTable -// ---------------------------------------------------------------------------- - -class wxAccelRefData : public wxObjectRefData -{ -public: - wxAccelRefData() - { - } - - wxAccelRefData(const wxAccelRefData& data) - : wxObjectRefData() - { - m_accels = data.m_accels; - } - - virtual ~wxAccelRefData() - { - WX_CLEAR_LIST(wxAccelList, m_accels); - } - - wxAccelList m_accels; -}; - -// macro which can be used to access wxAccelRefData from wxAcceleratorTable -#define M_ACCELDATA ((wxAccelRefData *)m_refData) - - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxAcceleratorTable ctors -// ---------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject); - -wxAcceleratorTable::wxAcceleratorTable() -{ -} - -wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]) -{ - m_refData = new wxAccelRefData; - - for ( int i = 0; i < n; i++ ) - { - const wxAcceleratorEntry& entry = entries[i]; - - int keycode = entry.GetKeyCode(); - if ( wxIsascii(keycode) ) - keycode = wxToupper(keycode); - - M_ACCELDATA->m_accels.Append(new wxAcceleratorEntry(entry.GetFlags(), - keycode, - entry.GetCommand())); - } -} - -wxAcceleratorTable::~wxAcceleratorTable() -{ -} - -bool wxAcceleratorTable::IsOk() const -{ - return m_refData != NULL; -} - -// ---------------------------------------------------------------------------- -// wxAcceleratorTable updating -// ---------------------------------------------------------------------------- - -void wxAcceleratorTable::Add(const wxAcceleratorEntry& entry) -{ - AllocExclusive(); - - if ( !m_refData ) - { - m_refData = new wxAccelRefData; - } - - M_ACCELDATA->m_accels.Append(new wxAcceleratorEntry(entry)); -} - -void wxAcceleratorTable::Remove(const wxAcceleratorEntry& entry) -{ - AllocExclusive(); - - wxAccelList::compatibility_iterator node = M_ACCELDATA->m_accels.GetFirst(); - while ( node ) - { - const wxAcceleratorEntry *entryCur = node->GetData(); - - // given entry contains only the information of the accelerator key - // because it was set that way during creation so do not use the - // comparison operator which also checks the command field - if ((entryCur->GetKeyCode() == entry.GetKeyCode()) && - (entryCur->GetFlags() == entry.GetFlags())) - { - delete node->GetData(); - M_ACCELDATA->m_accels.Erase(node); - - return; - } - - node = node->GetNext(); - } - - wxFAIL_MSG(wxT("deleting inexistent accel from wxAcceleratorTable")); -} - -// ---------------------------------------------------------------------------- -// wxAcceleratorTable: find a command for the given key press -// ---------------------------------------------------------------------------- - -const wxAcceleratorEntry * -wxAcceleratorTable::GetEntry(const wxKeyEvent& event) const -{ - if ( !IsOk() ) - { - // not an error, the accel table is just empty - return NULL; - } - - wxAccelList::compatibility_iterator node = M_ACCELDATA->m_accels.GetFirst(); - while ( node ) - { - const wxAcceleratorEntry *entry = node->GetData(); - - // is the key the same? - if ( event.m_keyCode == entry->GetKeyCode() ) - { - int flags = entry->GetFlags(); - - // now check flags - if ( (((flags & wxACCEL_CTRL) != 0) == event.ControlDown()) && - (((flags & wxACCEL_SHIFT) != 0) == event.ShiftDown()) && - (((flags & wxACCEL_ALT) != 0) == event.AltDown()) ) - { - return entry; - } - } - - node = node->GetNext(); - } - - return NULL; -} - -wxMenuItem *wxAcceleratorTable::GetMenuItem(const wxKeyEvent& event) const -{ - const wxAcceleratorEntry *entry = GetEntry(event); - - return entry ? entry->GetMenuItem() : NULL; -} - -int wxAcceleratorTable::GetCommand(const wxKeyEvent& event) const -{ - const wxAcceleratorEntry *entry = GetEntry(event); - - return entry ? entry->GetCommand() : -1; -} - -wxObjectRefData *wxAcceleratorTable::CreateRefData() const -{ - return new wxAccelRefData; -} - -wxObjectRefData *wxAcceleratorTable::CloneRefData(const wxObjectRefData *data) const -{ - return new wxAccelRefData(*(wxAccelRefData *)data); -} - -#endif // wxUSE_ACCEL diff --git a/Externals/wxWidgets3/src/generic/activityindicator.cpp b/Externals/wxWidgets3/src/generic/activityindicator.cpp deleted file mode 100644 index 53c65e14bf..0000000000 --- a/Externals/wxWidgets3/src/generic/activityindicator.cpp +++ /dev/null @@ -1,261 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/generic/activityindicator.cpp -// Purpose: Generic wxActivityIndicator implementation. -// Author: Vadim Zeitlin -// Created: 2015-03-06 -// Copyright: (c) 2015 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// for compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_ACTIVITYINDICATOR && !defined(__WXGTK3__) - -#include "wx/activityindicator.h" - -#ifndef WX_PRECOMP - #include "wx/dcclient.h" - #include "wx/timer.h" -#endif // WX_PRECOMP - -#include "wx/graphics.h" -#include "wx/scopedptr.h" - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -// For now the appearance is fixed, we could make these constants customizable -// later if really needed. -namespace -{ - -// Total number of "running" dots. -static const int NUM_DOTS = 8; - -// Delay between the consecutive updates in milliseconds. -static const int FRAME_DELAY = 150; - -} // anonymous namespace - -// ---------------------------------------------------------------------------- -// wxActivityIndicatorImpl: class containing the real implementation. -// ---------------------------------------------------------------------------- - -class wxActivityIndicatorImpl -{ -public: - explicit wxActivityIndicatorImpl(wxWindow* win) - : m_timer(this), - m_win(win) - { - m_frame = 0; - - win->Bind(wxEVT_PAINT, &wxActivityIndicatorImpl::OnPaint, this); - } - - void Start() - { - // Avoid restarting the timer if it's already running, this could - // result in jumps in appearance of the next frame while calling - // Start() is not supposed to have any effect at all in this case. - if ( m_timer.IsRunning() ) - return; - - m_timer.Start(FRAME_DELAY); - } - - void Stop() - { - // Unlike above, it's not a problem to call Stop() even if we're not - // running. - m_timer.Stop(); - } - - bool IsRunning() const - { - return m_timer.IsRunning(); - } - - // This one is only called by AdvanceTimer. - void Advance() - { - if ( ++m_frame == NUM_DOTS ) - m_frame = 0; - - m_win->Refresh(); - } - -private: - class AdvanceTimer : public wxTimer - { - public: - explicit AdvanceTimer(wxActivityIndicatorImpl* owner) - : m_owner(owner) - { - } - - virtual void Notify() wxOVERRIDE - { - m_owner->Advance(); - } - - private: - wxActivityIndicatorImpl* const m_owner; - - wxDECLARE_NO_COPY_CLASS(AdvanceTimer); - }; - - void OnPaint(wxPaintEvent& WXUNUSED(event)) - { - wxPaintDC pdc(m_win); - - wxScopedPtr const - gc(wxGraphicsRenderer::GetDefaultRenderer()->CreateContext(pdc)); - - const wxSize size = m_win->GetClientSize(); - - // Centre everything. - gc->Translate(size.x/2., size.y/2.); - - // Radius of 1/10th allows to have reasonably sized dots with a bit of - // separation between them and so subjectively looks a bit nicer than - // perhaps more natural 1/8th. - static const double RADIUS_FACTOR = 10; - - const double r = wxMin(size.x, size.y) / RADIUS_FACTOR; - - // The initial dot touches the top border. - wxGraphicsPath path = gc->CreatePath(); - path.AddCircle(0, -(RADIUS_FACTOR / 2. - 1.)*r, r); - - // Subsequent dots are rotated by this angle with respect to the - // previous one. - const double angle = wxDegToRad(360. / NUM_DOTS); - - // And the animation effect is achieved just by starting to draw from - // the next position every time. - gc->Rotate(m_frame*angle); - - const bool isEnabled = m_win->IsThisEnabled(); - for ( int n = 0; n < NUM_DOTS; n++ ) - { - // Draw all dots uniformly grey when the window is disabled, - // otherwise each subsequent dot is slightly more opaque. - const int opacityIndex = isEnabled ? n + 1 : 2; - - // wxALPHA_OPAQUE+1 is used just because it is divisible by the - // default NUM_DOTS value, and we need -1 because of this to keep - // it in 0..wxALPHA_OPAQUE range. - const int opacity = opacityIndex*(wxALPHA_OPAQUE + 1)/NUM_DOTS - 1; - - gc->SetBrush(wxBrush(wxColour(0, 0, 0, opacity))); - - gc->FillPath(path); - gc->Rotate(angle); - } - } - - AdvanceTimer m_timer; - wxWindow* const m_win; - - int m_frame; - - wxDECLARE_NO_COPY_CLASS(wxActivityIndicatorImpl); -}; - -// ============================================================================ -// implementation -// ============================================================================ - -#ifndef wxHAS_NATIVE_ACTIVITYINDICATOR - wxIMPLEMENT_DYNAMIC_CLASS(wxActivityIndicator, wxControl); -#endif - -bool -wxActivityIndicatorGeneric::Create(wxWindow* parent, - wxWindowID winid, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) -{ - // Notice that we skip wxControl version, we don't need the validator - // support that it adds. - if ( !wxWindow::Create(parent, winid, pos, size, style, name) ) - return false; - - m_impl = new wxActivityIndicatorImpl(this); - - return true; -} - -wxActivityIndicatorGeneric::~wxActivityIndicatorGeneric() -{ - delete m_impl; -} - -void wxActivityIndicatorGeneric::Start() -{ - wxCHECK_RET( m_impl, wxS("Must be created first") ); - - m_impl->Start(); -} - -void wxActivityIndicatorGeneric::Stop() -{ - wxCHECK_RET( m_impl, wxS("Must be created first") ); - - m_impl->Stop(); -} - -bool wxActivityIndicatorGeneric::IsRunning() const -{ - return m_impl && m_impl->IsRunning(); -} - -wxSize wxActivityIndicatorGeneric::DoGetBestClientSize() const -{ - int size = 0; - switch ( GetWindowVariant() ) - { - case wxWINDOW_VARIANT_MAX: - wxFAIL_MSG(wxS("Invalid window variant")); - wxFALLTHROUGH; - - case wxWINDOW_VARIANT_NORMAL: - size = 24; - break; - - case wxWINDOW_VARIANT_SMALL: - size = 16; - break; - - case wxWINDOW_VARIANT_MINI: - size = 12; - break; - - case wxWINDOW_VARIANT_LARGE: - size = 32; - break; - } - - wxASSERT_MSG( size, wxS("Unknown window variant") ); - - return FromDIP(wxSize(size, size)); -} - -#endif // wxUSE_ACTIVITYINDICATOR && !__WXGTK3__ diff --git a/Externals/wxWidgets3/src/generic/animateg.cpp b/Externals/wxWidgets3/src/generic/animateg.cpp deleted file mode 100644 index 1d95134114..0000000000 --- a/Externals/wxWidgets3/src/generic/animateg.cpp +++ /dev/null @@ -1,696 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/generic/animateg.cpp -// Purpose: wxAnimation and wxAnimationCtrl -// Author: Julian Smart and Guillermo Rodriguez Garcia -// Modified by: Francesco Montorsi -// Created: 13/8/99 -// Copyright: (c) Julian Smart and Guillermo Rodriguez Garcia -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif //__BORLANDC__ - -#if wxUSE_ANIMATIONCTRL - -#include "wx/animate.h" - -#ifndef WX_PRECOMP - #include "wx/log.h" - #include "wx/image.h" - #include "wx/dcmemory.h" - #include "wx/dcclient.h" - #include "wx/module.h" -#endif - -#include "wx/wfstream.h" -#include "wx/gifdecod.h" -#include "wx/anidecod.h" - -#include "wx/listimpl.cpp" -WX_DEFINE_LIST(wxAnimationDecoderList) - -wxAnimationDecoderList wxAnimation::sm_handlers; - - -// ---------------------------------------------------------------------------- -// wxAnimation -// ---------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxAnimation, wxAnimationBase); -#define M_ANIMDATA static_cast(m_refData) - -wxSize wxAnimation::GetSize() const -{ - wxCHECK_MSG( IsOk(), wxDefaultSize, wxT("invalid animation") ); - - return M_ANIMDATA->GetAnimationSize(); -} - -unsigned int wxAnimation::GetFrameCount() const -{ - wxCHECK_MSG( IsOk(), 0, wxT("invalid animation") ); - - return M_ANIMDATA->GetFrameCount(); -} - -wxImage wxAnimation::GetFrame(unsigned int i) const -{ - wxCHECK_MSG( IsOk(), wxNullImage, wxT("invalid animation") ); - - wxImage ret; - if (!M_ANIMDATA->ConvertToImage(i, &ret)) - return wxNullImage; - return ret; -} - -int wxAnimation::GetDelay(unsigned int i) const -{ - wxCHECK_MSG( IsOk(), 0, wxT("invalid animation") ); - - return M_ANIMDATA->GetDelay(i); -} - -wxPoint wxAnimation::GetFramePosition(unsigned int frame) const -{ - wxCHECK_MSG( IsOk(), wxDefaultPosition, wxT("invalid animation") ); - - return M_ANIMDATA->GetFramePosition(frame); -} - -wxSize wxAnimation::GetFrameSize(unsigned int frame) const -{ - wxCHECK_MSG( IsOk(), wxDefaultSize, wxT("invalid animation") ); - - return M_ANIMDATA->GetFrameSize(frame); -} - -wxAnimationDisposal wxAnimation::GetDisposalMethod(unsigned int frame) const -{ - wxCHECK_MSG( IsOk(), wxANIM_UNSPECIFIED, wxT("invalid animation") ); - - return M_ANIMDATA->GetDisposalMethod(frame); -} - -wxColour wxAnimation::GetTransparentColour(unsigned int frame) const -{ - wxCHECK_MSG( IsOk(), wxNullColour, wxT("invalid animation") ); - - return M_ANIMDATA->GetTransparentColour(frame); -} - -wxColour wxAnimation::GetBackgroundColour() const -{ - wxCHECK_MSG( IsOk(), wxNullColour, wxT("invalid animation") ); - - return M_ANIMDATA->GetBackgroundColour(); -} - -bool wxAnimation::LoadFile(const wxString& filename, wxAnimationType type) -{ - wxFileInputStream stream(filename); - if ( !stream.IsOk() ) - return false; - - return Load(stream, type); -} - -bool wxAnimation::Load(wxInputStream &stream, wxAnimationType type) -{ - UnRef(); - - const wxAnimationDecoder *handler; - if ( type == wxANIMATION_TYPE_ANY ) - { - for ( wxAnimationDecoderList::compatibility_iterator node = sm_handlers.GetFirst(); - node; node = node->GetNext() ) - { - handler=(const wxAnimationDecoder*)node->GetData(); - - if ( handler->CanRead(stream) ) - { - // do a copy of the handler from the static list which we will own - // as our reference data - m_refData = handler->Clone(); - return M_ANIMDATA->Load(stream); - } - } - - wxLogWarning( _("No handler found for animation type.") ); - return false; - } - - handler = FindHandler(type); - - if (handler == NULL) - { - wxLogWarning( _("No animation handler for type %ld defined."), type ); - - return false; - } - - - // do a copy of the handler from the static list which we will own - // as our reference data - m_refData = handler->Clone(); - - if (stream.IsSeekable() && !M_ANIMDATA->CanRead(stream)) - { - wxLogError(_("Animation file is not of type %ld."), type); - return false; - } - else - return M_ANIMDATA->Load(stream); -} - - -// ---------------------------------------------------------------------------- -// animation decoders -// ---------------------------------------------------------------------------- - -void wxAnimation::AddHandler( wxAnimationDecoder *handler ) -{ - // Check for an existing handler of the type being added. - if (FindHandler( handler->GetType() ) == 0) - { - sm_handlers.Append( handler ); - } - else - { - // This is not documented behaviour, merely the simplest 'fix' - // for preventing duplicate additions. If someone ever has - // a good reason to add and remove duplicate handlers (and they - // may) we should probably refcount the duplicates. - - wxLogDebug( wxT("Adding duplicate animation handler for '%d' type"), - handler->GetType() ); - delete handler; - } -} - -void wxAnimation::InsertHandler( wxAnimationDecoder *handler ) -{ - // Check for an existing handler of the type being added. - if (FindHandler( handler->GetType() ) == 0) - { - sm_handlers.Insert( handler ); - } - else - { - // see AddHandler for additional comments. - wxLogDebug( wxT("Inserting duplicate animation handler for '%d' type"), - handler->GetType() ); - delete handler; - } -} - -const wxAnimationDecoder *wxAnimation::FindHandler( wxAnimationType animType ) -{ - wxAnimationDecoderList::compatibility_iterator node = sm_handlers.GetFirst(); - while (node) - { - const wxAnimationDecoder *handler = (const wxAnimationDecoder *)node->GetData(); - if (handler->GetType() == animType) return handler; - node = node->GetNext(); - } - return 0; -} - -void wxAnimation::InitStandardHandlers() -{ -#if wxUSE_GIF - AddHandler(new wxGIFDecoder); -#endif // wxUSE_GIF -#if wxUSE_ICO_CUR - AddHandler(new wxANIDecoder); -#endif // wxUSE_ICO_CUR -} - -void wxAnimation::CleanUpHandlers() -{ - wxAnimationDecoderList::compatibility_iterator node = sm_handlers.GetFirst(); - while (node) - { - wxAnimationDecoder *handler = (wxAnimationDecoder *)node->GetData(); - wxAnimationDecoderList::compatibility_iterator next = node->GetNext(); - delete handler; - node = next; - } - - sm_handlers.Clear(); -} - - -// A module to allow wxAnimation initialization/cleanup -// without calling these functions from app.cpp or from -// the user's application. - -class wxAnimationModule: public wxModule -{ - wxDECLARE_DYNAMIC_CLASS(wxAnimationModule); -public: - wxAnimationModule() {} - bool OnInit() wxOVERRIDE { wxAnimation::InitStandardHandlers(); return true; } - void OnExit() wxOVERRIDE { wxAnimation::CleanUpHandlers(); } -}; - -wxIMPLEMENT_DYNAMIC_CLASS(wxAnimationModule, wxModule); - - -// ---------------------------------------------------------------------------- -// wxAnimationCtrl -// ---------------------------------------------------------------------------- - -wxIMPLEMENT_CLASS(wxAnimationCtrl, wxAnimationCtrlBase); -wxBEGIN_EVENT_TABLE(wxAnimationCtrl, wxAnimationCtrlBase) - EVT_PAINT(wxAnimationCtrl::OnPaint) - EVT_SIZE(wxAnimationCtrl::OnSize) - EVT_TIMER(wxID_ANY, wxAnimationCtrl::OnTimer) -wxEND_EVENT_TABLE() - -void wxAnimationCtrl::Init() -{ - m_currentFrame = 0; - m_looped = false; - m_isPlaying = false; - - // use the window background colour by default to be consistent - // with the GTK+ native version - m_useWinBackgroundColour = true; -} - -bool wxAnimationCtrl::Create(wxWindow *parent, wxWindowID id, - const wxAnimation& animation, const wxPoint& pos, - const wxSize& size, long style, const wxString& name) -{ - m_timer.SetOwner(this); - - if (!base_type::Create(parent, id, pos, size, style, wxDefaultValidator, name)) - return false; - - // by default we get the same background colour of our parent - SetBackgroundColour(parent->GetBackgroundColour()); - - SetAnimation(animation); - - return true; -} - -wxAnimationCtrl::~wxAnimationCtrl() -{ - Stop(); -} - -bool wxAnimationCtrl::LoadFile(const wxString& filename, wxAnimationType type) -{ - wxFileInputStream fis(filename); - if (!fis.IsOk()) - return false; - return Load(fis, type); -} - -bool wxAnimationCtrl::Load(wxInputStream& stream, wxAnimationType type) -{ - wxAnimation anim; - if ( !anim.Load(stream, type) || !anim.IsOk() ) - return false; - - SetAnimation(anim); - return true; -} - -wxSize wxAnimationCtrl::DoGetBestSize() const -{ - if (m_animation.IsOk() && !this->HasFlag(wxAC_NO_AUTORESIZE)) - return m_animation.GetSize(); - - return wxSize(100, 100); -} - -void wxAnimationCtrl::SetAnimation(const wxAnimation& animation) -{ - if (IsPlaying()) - Stop(); - - // set new animation even if it's wxNullAnimation - m_animation = animation; - if (!m_animation.IsOk()) - { - DisplayStaticImage(); - return; - } - - if (m_animation.GetBackgroundColour() == wxNullColour) - SetUseWindowBackgroundColour(); - if (!this->HasFlag(wxAC_NO_AUTORESIZE)) - FitToAnimation(); - - DisplayStaticImage(); -} - -void wxAnimationCtrl::SetInactiveBitmap(const wxBitmap &bmp) -{ - // if the bitmap has an associated mask, we need to set our background to - // the colour of our parent otherwise when calling DrawCurrentFrame() - // (which uses the bitmap's mask), our background colour would be used for - // transparent areas - and that's not what we want (at least for - // consistency with the GTK version) - if ( bmp.IsOk() && bmp.GetMask() != NULL && GetParent() != NULL ) - SetBackgroundColour(GetParent()->GetBackgroundColour()); - - wxAnimationCtrlBase::SetInactiveBitmap(bmp); -} - -void wxAnimationCtrl::FitToAnimation() -{ - SetSize(m_animation.GetSize()); -} - -bool wxAnimationCtrl::SetBackgroundColour(const wxColour& colour) -{ - if ( !wxWindow::SetBackgroundColour(colour) ) - return false; - - // if not playing, then this change must be seen immediately (unless - // there's an inactive bitmap set which has higher priority than bg colour) - if ( !IsPlaying() ) - DisplayStaticImage(); - - return true; -} - - -// ---------------------------------------------------------------------------- -// wxAnimationCtrl - stop/play methods -// ---------------------------------------------------------------------------- - -void wxAnimationCtrl::Stop() -{ - m_timer.Stop(); - m_isPlaying = false; - - // reset frame counter - m_currentFrame = 0; - - DisplayStaticImage(); -} - -bool wxAnimationCtrl::Play(bool looped) -{ - if (!m_animation.IsOk()) - return false; - - m_looped = looped; - m_currentFrame = 0; - - if (!RebuildBackingStoreUpToFrame(0)) - return false; - - m_isPlaying = true; - - // do a ClearBackground() to avoid that e.g. the custom static bitmap which - // was eventually shown previously remains partially drawn - ClearBackground(); - - // DrawCurrentFrame() will use our updated backing store - wxClientDC clientDC(this); - DrawCurrentFrame(clientDC); - - // start the timer - int delay = m_animation.GetDelay(0); - if (delay == 0) - delay = 1; // 0 is invalid timeout for wxTimer. - m_timer.Start(delay, true); - - return true; -} - - - -// ---------------------------------------------------------------------------- -// wxAnimationCtrl - rendering methods -// ---------------------------------------------------------------------------- - -bool wxAnimationCtrl::RebuildBackingStoreUpToFrame(unsigned int frame) -{ - // if we've not created the backing store yet or it's too - // small, then recreate it - wxSize sz = m_animation.GetSize(), - winsz = GetClientSize(); - int w = wxMin(sz.GetWidth(), winsz.GetWidth()); - int h = wxMin(sz.GetHeight(), winsz.GetHeight()); - - if ( !m_backingStore.IsOk() || - m_backingStore.GetWidth() < w || m_backingStore.GetHeight() < h ) - { - if (!m_backingStore.Create(w, h)) - return false; - } - - wxMemoryDC dc; - dc.SelectObject(m_backingStore); - - // Draw the background - DisposeToBackground(dc); - - // Draw all intermediate frames that haven't been removed from the animation - for (unsigned int i = 0; i < frame; i++) - { - if (m_animation.GetDisposalMethod(i) == wxANIM_DONOTREMOVE || - m_animation.GetDisposalMethod(i) == wxANIM_UNSPECIFIED) - { - DrawFrame(dc, i); - } - else if (m_animation.GetDisposalMethod(i) == wxANIM_TOBACKGROUND) - DisposeToBackground(dc, m_animation.GetFramePosition(i), - m_animation.GetFrameSize(i)); - } - - // finally draw this frame - DrawFrame(dc, frame); - dc.SelectObject(wxNullBitmap); - - return true; -} - -void wxAnimationCtrl::IncrementalUpdateBackingStore() -{ - wxMemoryDC dc; - dc.SelectObject(m_backingStore); - - // OPTIMIZATION: - // since wxAnimationCtrl can only play animations forward, without skipping - // frames, we can be sure that m_backingStore contains the m_currentFrame-1 - // frame and thus we just need to dispose the m_currentFrame-1 frame and - // render the m_currentFrame-th one. - - if (m_currentFrame == 0) - { - // before drawing the first frame always dispose to bg colour - DisposeToBackground(dc); - } - else - { - switch (m_animation.GetDisposalMethod(m_currentFrame-1)) - { - case wxANIM_TOBACKGROUND: - DisposeToBackground(dc, m_animation.GetFramePosition(m_currentFrame-1), - m_animation.GetFrameSize(m_currentFrame-1)); - break; - - case wxANIM_TOPREVIOUS: - // this disposal should never be used too often. - // E.g. GIF specification explicitly say to keep the usage of this - // disposal limited to the minimum. - // In fact it may require a lot of time to restore - if (m_currentFrame == 1) - { - // if 0-th frame disposal is to restore to previous frame, - // the best we can do is to restore to background - DisposeToBackground(dc); - } - else - if (!RebuildBackingStoreUpToFrame(m_currentFrame-2)) - Stop(); - break; - - case wxANIM_DONOTREMOVE: - case wxANIM_UNSPECIFIED: - break; - } - } - - // now just draw the current frame on the top of the backing store - DrawFrame(dc, m_currentFrame); - dc.SelectObject(wxNullBitmap); -} - -void wxAnimationCtrl::DisplayStaticImage() -{ - wxASSERT(!IsPlaying()); - - // m_bmpStaticReal will be updated only if necessary... - UpdateStaticImage(); - - if (m_bmpStaticReal.IsOk()) - { - // copy the inactive bitmap in the backing store - // eventually using the mask if the static bitmap has one - if ( m_bmpStaticReal.GetMask() ) - { - wxMemoryDC temp; - temp.SelectObject(m_backingStore); - DisposeToBackground(temp); - temp.DrawBitmap(m_bmpStaticReal, 0, 0, true /* use mask */); - } - else - m_backingStore = m_bmpStaticReal; - } - else - { - // put in the backing store the first frame of the animation - if (!m_animation.IsOk() || - !RebuildBackingStoreUpToFrame(0)) - { - m_animation = wxNullAnimation; - DisposeToBackground(); - } - } - - Refresh(); -} - -void wxAnimationCtrl::DrawFrame(wxDC &dc, unsigned int frame) -{ - // PERFORMANCE NOTE: - // this draw stuff is not as fast as possible: the wxAnimationDecoder - // needs first to convert from its internal format to wxImage RGB24; - // the wxImage is then converted as a wxBitmap and finally blitted. - // If wxAnimationDecoder had a function to convert directly from its - // internal format to a port-specific wxBitmap, it would be somewhat faster. - wxBitmap bmp(m_animation.GetFrame(frame)); - dc.DrawBitmap(bmp, m_animation.GetFramePosition(frame), - true /* use mask */); -} - -void wxAnimationCtrl::DrawCurrentFrame(wxDC& dc) -{ - wxASSERT( m_backingStore.IsOk() ); - - // m_backingStore always contains the current frame - dc.DrawBitmap(m_backingStore, 0, 0, true /* use mask in case it's present */); -} - -void wxAnimationCtrl::DisposeToBackground() -{ - // clear the backing store - wxMemoryDC dc; - dc.SelectObject(m_backingStore); - if ( dc.IsOk() ) - DisposeToBackground(dc); -} - -void wxAnimationCtrl::DisposeToBackground(wxDC& dc) -{ - wxColour col = IsUsingWindowBackgroundColour() - ? GetBackgroundColour() - : m_animation.GetBackgroundColour(); - - wxBrush brush(col); - dc.SetBackground(brush); - dc.Clear(); -} - -void wxAnimationCtrl::DisposeToBackground(wxDC& dc, const wxPoint &pos, const wxSize &sz) -{ - wxColour col = IsUsingWindowBackgroundColour() - ? GetBackgroundColour() - : m_animation.GetBackgroundColour(); - wxBrush brush(col); - dc.SetBrush(brush); // SetBrush and not SetBackground !! - dc.SetPen(*wxTRANSPARENT_PEN); - dc.DrawRectangle(pos, sz); -} - -// ---------------------------------------------------------------------------- -// wxAnimationCtrl - event handlers -// ---------------------------------------------------------------------------- - -void wxAnimationCtrl::OnPaint(wxPaintEvent& WXUNUSED(event)) -{ - // VERY IMPORTANT: the wxPaintDC *must* be created in any case - wxPaintDC dc(this); - - if ( m_backingStore.IsOk() ) - { - // NOTE: we draw the bitmap explicitly ignoring the mask (if any); - // i.e. we don't want to combine the backing store with the - // possibly wrong preexisting contents of the window! - dc.DrawBitmap(m_backingStore, 0, 0, false /* no mask */); - } - else - { - // m_animation is not valid and thus we don't have a valid backing store... - // clear then our area to the background colour - DisposeToBackground(dc); - } -} - -void wxAnimationCtrl::OnTimer(wxTimerEvent &WXUNUSED(event)) -{ - m_currentFrame++; - if (m_currentFrame == m_animation.GetFrameCount()) - { - // Should a non-looped animation display the last frame? - if (!m_looped) - { - Stop(); - return; - } - else - m_currentFrame = 0; // let's restart - } - - IncrementalUpdateBackingStore(); - - wxClientDC dc(this); - DrawCurrentFrame(dc); - -#ifdef __WXMAC__ - // without this, the animation currently doesn't redraw under Mac - Refresh(); -#endif // __WXMAC__ - - // Set the timer for the next frame - int delay = m_animation.GetDelay(m_currentFrame); - if (delay == 0) - delay = 1; // 0 is invalid timeout for wxTimer. - m_timer.Start(delay, true); -} - -void wxAnimationCtrl::OnSize(wxSizeEvent &WXUNUSED(event)) -{ - // NB: resizing an animation control may take a lot of time - // for big animations as the backing store must be - // extended and rebuilt. Try to avoid it e.g. using - // a null proportion value for your wxAnimationCtrls - // when using them inside sizers. - if (m_animation.IsOk()) - { - // be careful to change the backing store *only* if we are - // playing the animation as otherwise we may be displaying - // the inactive bitmap and overwriting the backing store - // with the last played frame is wrong in this case - if (IsPlaying()) - { - if (!RebuildBackingStoreUpToFrame(m_currentFrame)) - Stop(); // in case we are playing - } - } -} - -#endif // wxUSE_ANIMATIONCTRL - diff --git a/Externals/wxWidgets3/src/generic/bannerwindow.cpp b/Externals/wxWidgets3/src/generic/bannerwindow.cpp deleted file mode 100644 index 15c2719b67..0000000000 --- a/Externals/wxWidgets3/src/generic/bannerwindow.cpp +++ /dev/null @@ -1,343 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/bannerwindow.h -// Purpose: wxBannerWindow class implementation -// Author: Vadim Zeitlin -// Created: 2011-08-16 -// Copyright: (c) 2011 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_BANNERWINDOW - -#include "wx/bannerwindow.h" - -#ifndef WX_PRECOMP - #include "wx/bitmap.h" - #include "wx/colour.h" -#endif - -#include "wx/dcbuffer.h" - -namespace -{ - -// Some constants for banner layout, currently they're hard coded but we could -// easily make them configurable if needed later. -const int MARGIN_X = 5; -const int MARGIN_Y = 5; - -} // anonymous namespace - -const char wxBannerWindowNameStr[] = "bannerwindow"; - -wxBEGIN_EVENT_TABLE(wxBannerWindow, wxWindow) - EVT_SIZE(wxBannerWindow::OnSize) - EVT_PAINT(wxBannerWindow::OnPaint) -wxEND_EVENT_TABLE() - -void wxBannerWindow::Init() -{ - m_direction = wxLEFT; - - m_colStart = *wxWHITE; - m_colEnd = *wxBLUE; -} - -bool -wxBannerWindow::Create(wxWindow* parent, - wxWindowID winid, - wxDirection dir, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) -{ - if ( !wxWindow::Create(parent, winid, pos, size, style, name) ) - return false; - - wxASSERT_MSG - ( - dir == wxLEFT || dir == wxRIGHT || dir == wxTOP || dir == wxBOTTOM, - wxS("Invalid banner direction") - ); - - m_direction = dir; - - SetBackgroundStyle(wxBG_STYLE_PAINT); - - return true; -} - -void wxBannerWindow::SetBitmap(const wxBitmap& bmp) -{ - m_bitmap = bmp; - - m_colBitmapBg = wxColour(); - - InvalidateBestSize(); - - Refresh(); -} - -void wxBannerWindow::SetText(const wxString& title, const wxString& message) -{ - m_title = title; - m_message = message; - - InvalidateBestSize(); - - Refresh(); -} - -void wxBannerWindow::SetGradient(const wxColour& start, const wxColour& end) -{ - m_colStart = start; - m_colEnd = end; - - Refresh(); -} - -wxFont wxBannerWindow::GetTitleFont() const -{ - wxFont font = GetFont(); - font.MakeBold().MakeLarger(); - return font; -} - -wxSize wxBannerWindow::DoGetBestClientSize() const -{ - if ( m_bitmap.IsOk() ) - { - return m_bitmap.GetSize(); - } - else - { - wxClientDC dc(const_cast(this)); - const wxSize sizeText = dc.GetMultiLineTextExtent(m_message); - - dc.SetFont(GetTitleFont()); - - const wxSize sizeTitle = dc.GetTextExtent(m_title); - - wxSize sizeWin(wxMax(sizeTitle.x, sizeText.x), sizeTitle.y + sizeText.y); - - // If we draw the text vertically width and height are swapped. - if ( m_direction == wxLEFT || m_direction == wxRIGHT ) - wxSwap(sizeWin.x, sizeWin.y); - - sizeWin += 2*wxSize(MARGIN_X, MARGIN_Y); - - return sizeWin; - } -} - -void wxBannerWindow::OnSize(wxSizeEvent& event) -{ - Refresh(); - - event.Skip(); -} - -void wxBannerWindow::OnPaint(wxPaintEvent& WXUNUSED(event)) -{ - if ( m_bitmap.IsOk() && m_title.empty() && m_message.empty() ) - { - // No need for buffering in this case. - wxPaintDC dc(this); - - DrawBitmapBackground(dc); - } - else // We need to compose our contents ourselves. - { - wxAutoBufferedPaintDC dc(this); - - // Deal with the background first. - if ( m_bitmap.IsOk() ) - { - DrawBitmapBackground(dc); - } - else // Draw gradient background. - { - wxDirection gradientDir; - if ( m_direction == wxLEFT ) - { - gradientDir = wxTOP; - } - else if ( m_direction == wxRIGHT ) - { - gradientDir = wxBOTTOM; - } - else // For both wxTOP and wxBOTTOM. - { - gradientDir = wxRIGHT; - } - - dc.GradientFillLinear(GetClientRect(), m_colStart, m_colEnd, - gradientDir); - } - - // Now draw the text on top of it. - dc.SetFont(GetTitleFont()); - - wxPoint pos(MARGIN_X, MARGIN_Y); - DrawBannerTextLine(dc, m_title, pos); - pos.y += dc.GetTextExtent(m_title).y; - - dc.SetFont(GetFont()); - - wxArrayString lines = wxSplit(m_message, '\n', '\0'); - const unsigned numLines = lines.size(); - for ( unsigned n = 0; n < numLines; n++ ) - { - const wxString& line = lines[n]; - - DrawBannerTextLine(dc, line, pos); - pos.y += dc.GetTextExtent(line).y; - } - } -} - -wxColour wxBannerWindow::GetBitmapBg() -{ - if ( m_colBitmapBg.IsOk() ) - return m_colBitmapBg; - - // Determine the colour to use to extend the bitmap. It's the colour of the - // bitmap pixels at the edge closest to the area where it can be extended. - wxImage image(m_bitmap.ConvertToImage()); - - // The point we get the colour from. The choice is arbitrary and in general - // the bitmap should have the same colour on the entire edge of this point - // for extending it to look good. - wxPoint p; - - wxSize size = image.GetSize(); - size.x--; - size.y--; - - switch ( m_direction ) - { - case wxTOP: - case wxBOTTOM: - // The bitmap will be extended to the right. - p.x = size.x; - p.y = 0; - break; - - case wxLEFT: - // The bitmap will be extended from the top. - p.x = 0; - p.y = 0; - break; - - case wxRIGHT: - // The bitmap will be extended to the bottom. - p.x = 0; - p.y = size.y; - break; - - // This case is there only to prevent g++ warnings about not handling - // some enum elements in the switch, it can't really happen. - case wxALL: - wxFAIL_MSG( wxS("Unreachable") ); - } - - m_colBitmapBg.Set(image.GetRed(p.x, p.y), - image.GetGreen(p.x, p.y), - image.GetBlue(p.x, p.y)); - - return m_colBitmapBg; -} - -void wxBannerWindow::DrawBitmapBackground(wxDC& dc) -{ - // We may need to fill the part of the background not covered by the bitmap - // with the solid colour extending the bitmap, this rectangle will hold the - // area to be filled (which could be empty if the bitmap is big enough). - wxRect rectSolid; - - const wxSize size = GetClientSize(); - - switch ( m_direction ) - { - case wxTOP: - case wxBOTTOM: - // Draw the bitmap at the origin, its rightmost could be truncated, - // as it's meant to be. - dc.DrawBitmap(m_bitmap, 0, 0); - - rectSolid.x = m_bitmap.GetWidth(); - rectSolid.width = size.x - rectSolid.x; - rectSolid.height = size.y; - break; - - case wxLEFT: - // The top most part of the bitmap may be truncated but its bottom - // must be always visible so intentionally draw it possibly partly - // outside of the window. - rectSolid.width = size.x; - rectSolid.height = size.y - m_bitmap.GetHeight(); - dc.DrawBitmap(m_bitmap, 0, rectSolid.height); - break; - - case wxRIGHT: - // Draw the bitmap at the origin, possibly truncating its - // bottommost part. - dc.DrawBitmap(m_bitmap, 0, 0); - - rectSolid.y = m_bitmap.GetHeight(); - rectSolid.height = size.y - rectSolid.y; - rectSolid.width = size.x; - break; - - // This case is there only to prevent g++ warnings about not handling - // some enum elements in the switch, it can't really happen. - case wxALL: - wxFAIL_MSG( wxS("Unreachable") ); - } - - if ( rectSolid.width > 0 && rectSolid.height > 0 ) - { - dc.SetPen(*wxTRANSPARENT_PEN); - dc.SetBrush(GetBitmapBg()); - dc.DrawRectangle(rectSolid); - } -} - -void -wxBannerWindow::DrawBannerTextLine(wxDC& dc, - const wxString& str, - const wxPoint& pos) -{ - switch ( m_direction ) - { - case wxTOP: - case wxBOTTOM: - // The simple case: we just draw the text normally. - dc.DrawText(str, pos); - break; - - case wxLEFT: - // We draw the text vertically and start from the lower left - // corner and not the upper left one as usual. - dc.DrawRotatedText(str, pos.y, GetClientSize().y - pos.x, 90); - break; - - case wxRIGHT: - // We also draw the text vertically but now we start from the upper - // right corner and draw it from top to bottom. - dc.DrawRotatedText(str, GetClientSize().x - pos.y, pos.x, -90); - break; - - case wxALL: - wxFAIL_MSG( wxS("Unreachable") ); - } -} - -#endif // wxUSE_BANNERWINDOW diff --git a/Externals/wxWidgets3/src/generic/bmpcboxg.cpp b/Externals/wxWidgets3/src/generic/bmpcboxg.cpp deleted file mode 100644 index 332e6ca4d3..0000000000 --- a/Externals/wxWidgets3/src/generic/bmpcboxg.cpp +++ /dev/null @@ -1,363 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/generic/bmpcboxg.cpp -// Purpose: wxBitmapComboBox -// Author: Jaakko Salli -// Modified by: -// Created: Aug-31-2006 -// Copyright: (c) 2005 Jaakko Salli -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_BITMAPCOMBOBOX - -#include "wx/bmpcbox.h" - -#if defined(wxGENERIC_BITMAPCOMBOBOX) - -#ifndef WX_PRECOMP - #include "wx/log.h" -#endif - -#include "wx/odcombo.h" -#include "wx/settings.h" -#include "wx/dc.h" - -#if wxUSE_IMAGE - #include "wx/image.h" -#endif - - -// Spacing used in control size calculation -#ifdef __WXOSX__ - #define IMAGE_SPACING_CTRL_VERTICAL 12 -#else - #define IMAGE_SPACING_CTRL_VERTICAL 7 -#endif - - -// ============================================================================ -// implementation -// ============================================================================ - - -wxBEGIN_EVENT_TABLE(wxBitmapComboBox, wxOwnerDrawnComboBox) - EVT_SIZE(wxBitmapComboBox::OnSize) -wxEND_EVENT_TABLE() - - -wxIMPLEMENT_DYNAMIC_CLASS(wxBitmapComboBox, wxOwnerDrawnComboBox); - -void wxBitmapComboBox::Init() -{ - m_inResize = false; -} - -wxBitmapComboBox::wxBitmapComboBox(wxWindow *parent, - wxWindowID id, - const wxString& value, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style, - const wxValidator& validator, - const wxString& name) - : wxOwnerDrawnComboBox(), - wxBitmapComboBoxBase() -{ - Init(); - - Create(parent,id,value,pos,size,choices,style,validator,name); -} - -bool wxBitmapComboBox::Create(wxWindow *parent, - wxWindowID id, - const wxString& value, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style, - const wxValidator& validator, - const wxString& name) -{ - if ( !wxOwnerDrawnComboBox::Create(parent, id, value, - pos, size, - choices, style, - validator, name) ) - { - return false; - } - - UpdateInternals(); - - return true; -} - -bool wxBitmapComboBox::Create(wxWindow *parent, - wxWindowID id, - const wxString& value, - const wxPoint& pos, - const wxSize& size, - int n, - const wxString choices[], - long style, - const wxValidator& validator, - const wxString& name) -{ - if ( !wxOwnerDrawnComboBox::Create(parent, id, value, - pos, size, n, - choices, style, - validator, name) ) - { - return false; - } - - UpdateInternals(); - - return true; -} - -wxBitmapComboBox::~wxBitmapComboBox() -{ - DoClear(); -} - -// ---------------------------------------------------------------------------- -// Item manipulation -// ---------------------------------------------------------------------------- - -void wxBitmapComboBox::SetItemBitmap(unsigned int n, const wxBitmap& bitmap) -{ - OnAddBitmap(bitmap); - DoSetItemBitmap(n, bitmap); - - if ( (int)n == GetSelection() ) - Refresh(); -} - -int wxBitmapComboBox::DoInsertItems(const wxArrayStringsAdapter & items, - unsigned int pos, - void **clientData, wxClientDataType type) -{ - const unsigned int numItems = items.GetCount(); - const unsigned int countNew = GetCount() + numItems; - - wxASSERT( numItems == 1 || !HasFlag(wxCB_SORT) ); // Sanity check - - m_bitmaps.Alloc(countNew); - - for ( unsigned int i = 0; i < numItems; i++ ) - { - m_bitmaps.Insert(new wxBitmap(wxNullBitmap), pos + i); - } - - const int index = wxOwnerDrawnComboBox::DoInsertItems(items, pos, - clientData, type); - - if ( index == wxNOT_FOUND ) - { - for ( int i = numItems-1; i >= 0; i-- ) - BCBDoDeleteOneItem(pos + i); - } - else if ( ((unsigned int)index) != pos ) - { - // Move pre-inserted empty bitmap into correct position - // (usually happens when combo box has wxCB_SORT style) - wxBitmap* bmp = static_cast(m_bitmaps[pos]); - m_bitmaps.RemoveAt(pos); - m_bitmaps.Insert(bmp, index); - } - - return index; -} - -int wxBitmapComboBox::Append(const wxString& item, const wxBitmap& bitmap) -{ - const int n = wxOwnerDrawnComboBox::Append(item); - if(n != wxNOT_FOUND) - SetItemBitmap(n, bitmap); - return n; -} - -int wxBitmapComboBox::Append(const wxString& item, const wxBitmap& bitmap, - void *clientData) -{ - const int n = wxOwnerDrawnComboBox::Append(item, clientData); - if(n != wxNOT_FOUND) - SetItemBitmap(n, bitmap); - return n; -} - -int wxBitmapComboBox::Append(const wxString& item, const wxBitmap& bitmap, - wxClientData *clientData) -{ - const int n = wxOwnerDrawnComboBox::Append(item, clientData); - if(n != wxNOT_FOUND) - SetItemBitmap(n, bitmap); - return n; -} - -int wxBitmapComboBox::Insert(const wxString& item, - const wxBitmap& bitmap, - unsigned int pos) -{ - const int n = wxOwnerDrawnComboBox::Insert(item, pos); - if(n != wxNOT_FOUND) - SetItemBitmap(n, bitmap); - return n; -} - -int wxBitmapComboBox::Insert(const wxString& item, const wxBitmap& bitmap, - unsigned int pos, void *clientData) -{ - const int n = wxOwnerDrawnComboBox::Insert(item, pos, clientData); - if(n != wxNOT_FOUND) - SetItemBitmap(n, bitmap); - return n; -} - -int wxBitmapComboBox::Insert(const wxString& item, const wxBitmap& bitmap, - unsigned int pos, wxClientData *clientData) -{ - const int n = wxOwnerDrawnComboBox::Insert(item, pos, clientData); - if(n != wxNOT_FOUND) - SetItemBitmap(n, bitmap); - return n; -} - -void wxBitmapComboBox::DoClear() -{ - wxOwnerDrawnComboBox::DoClear(); - wxBitmapComboBoxBase::BCBDoClear(); -} - -void wxBitmapComboBox::DoDeleteOneItem(unsigned int n) -{ - wxOwnerDrawnComboBox::DoDeleteOneItem(n); - wxBitmapComboBoxBase::BCBDoDeleteOneItem(n); -} - -// ---------------------------------------------------------------------------- -// wxBitmapComboBox event handlers and such -// ---------------------------------------------------------------------------- - -void wxBitmapComboBox::OnSize(wxSizeEvent& event) -{ - // Prevent infinite looping - if ( !m_inResize ) - { - m_inResize = true; - DetermineIndent(); - m_inResize = false; - } - - event.Skip(); -} - -wxSize wxBitmapComboBox::DoGetBestSize() const -{ - wxSize sz = wxOwnerDrawnComboBox::DoGetBestSize(); - - if ( HasFlag(wxCB_READONLY) ) - { - // Scale control to match height of highest image. - int h2 = m_usedImgSize.y + IMAGE_SPACING_CTRL_VERTICAL; - - if ( h2 > sz.y ) - sz.y = h2; - - CacheBestSize(sz); - } - - return sz; -} - -// ---------------------------------------------------------------------------- -// wxBitmapComboBox miscellaneous -// ---------------------------------------------------------------------------- - -bool wxBitmapComboBox::SetFont(const wxFont& font) -{ - bool res = wxOwnerDrawnComboBox::SetFont(font); - UpdateInternals(); - return res; -} - -// ---------------------------------------------------------------------------- -// wxBitmapComboBox item drawing and measuring -// ---------------------------------------------------------------------------- - -void wxBitmapComboBox::OnDrawBackground(wxDC& dc, - const wxRect& rect, - int item, - int flags) const -{ - if ( GetCustomPaintWidth() == 0 || - !(flags & wxODCB_PAINTING_SELECTED) || - item < 0 || - ( (flags & wxODCB_PAINTING_CONTROL) && (GetInternalFlags() & wxCC_FULL_BUTTON)) ) - { - wxOwnerDrawnComboBox::OnDrawBackground(dc, rect, item, flags); - return; - } - - wxBitmapComboBoxBase::DrawBackground(dc, rect, item, flags); -} - -void wxBitmapComboBox::OnDrawItem(wxDC& dc, - const wxRect& rect, - int item, - int flags) const -{ - wxString text; - int imgAreaWidth = m_imgAreaWidth; - - if ( imgAreaWidth == 0 ) - { - wxOwnerDrawnComboBox::OnDrawItem(dc, rect, item, flags); - return; - } - - if ( flags & wxODCB_PAINTING_CONTROL ) - { - text = GetValue(); - if ( !HasFlag(wxCB_READONLY) ) - text.clear(); - } - else - { - text = GetString(item); - } - - wxBitmapComboBoxBase::DrawItem(dc, rect, item, text, flags); -} - -wxCoord wxBitmapComboBox::OnMeasureItem(size_t item) const -{ - return wxBitmapComboBoxBase::MeasureItem(item); -} - -wxCoord wxBitmapComboBox::OnMeasureItemWidth(size_t item) const -{ - wxCoord x, y; - GetTextExtent(GetString(item), &x, &y, 0, 0); - x += m_imgAreaWidth; - return x; -} - -#endif // defined(wxGENERIC_BITMAPCOMBOBOX) - -#endif // wxUSE_BITMAPCOMBOBOX diff --git a/Externals/wxWidgets3/src/generic/busyinfo.cpp b/Externals/wxWidgets3/src/generic/busyinfo.cpp deleted file mode 100644 index 458b21cc5d..0000000000 --- a/Externals/wxWidgets3/src/generic/busyinfo.cpp +++ /dev/null @@ -1,140 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/generic/busyinfo.cpp -// Purpose: Information window when app is busy -// Author: Vaclav Slavik -// Copyright: (c) 1999 Vaclav Slavik -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ -#pragma hdrstop -#endif - -#if wxUSE_BUSYINFO - -// for all others, include the necessary headers -#ifndef WX_PRECOMP - #include "wx/busyinfo.h" - #include "wx/stattext.h" - #include "wx/panel.h" - #include "wx/frame.h" - #include "wx/sizer.h" - #include "wx/statbmp.h" - #include "wx/utils.h" -#endif - -#include "wx/busyinfo.h" - -// wxStaticText currently supports markup only in wxGTK and wxOSX/Cocoa, so use -// the generic version for markup support in the other ports. -#if wxUSE_MARKUP && !(defined(__WXGTK__) || defined(__WXOSX_COCOA__)) - #include "wx/generic/stattextg.h" - - #define wxStaticTextWithMarkupSupport wxGenericStaticText -#else - #define wxStaticTextWithMarkupSupport wxStaticText -#endif - -void wxBusyInfo::Init(const wxBusyInfoFlags& flags) -{ - m_InfoFrame = new wxFrame(flags.m_parent, wxID_ANY, wxString(), - wxDefaultPosition, wxDefaultSize, - wxSIMPLE_BORDER | - wxFRAME_TOOL_WINDOW | - wxSTAY_ON_TOP); - - wxPanel* const panel = new wxPanel(m_InfoFrame); - - wxBoxSizer* const sizer = new wxBoxSizer(wxVERTICAL); - - if ( flags.m_icon.IsOk() ) - { - sizer->Add(new wxStaticBitmap(panel, wxID_ANY, flags.m_icon), - wxSizerFlags().DoubleBorder().Centre()); - } - - wxControl* title; - if ( !flags.m_title.empty() ) - { - title = new wxStaticTextWithMarkupSupport(panel, wxID_ANY, wxString(), - wxDefaultPosition, - wxDefaultSize, - wxALIGN_CENTRE); - title->SetFont(title->GetFont().Scaled(2)); -#if wxUSE_MARKUP - title->SetLabelMarkup(flags.m_title); -#else - title->SetLabelText(flags.m_title); -#endif - - sizer->Add(title, wxSizerFlags().DoubleBorder().Expand()); - } - else - { - title = NULL; - } - - // Vertically center the text in the window. - sizer->AddStretchSpacer(); - - wxControl* text; -#if wxUSE_MARKUP - if ( !flags.m_text.empty() ) - { - text = new wxStaticTextWithMarkupSupport(panel, wxID_ANY, wxString(), - wxDefaultPosition, - wxDefaultSize, - wxALIGN_CENTRE); - text->SetLabelMarkup(flags.m_text); - } - else -#endif // wxUSE_MARKUP - { - text = new wxStaticText(panel, wxID_ANY, wxString()); - text->SetLabelText(flags.m_label); - } - - sizer->Add(text, wxSizerFlags().DoubleBorder().Centre()); - - sizer->AddStretchSpacer(); - - panel->SetSizer(sizer); - - if ( flags.m_foreground.IsOk() ) - { - if ( title ) - title->SetForegroundColour(flags.m_foreground); - text->SetForegroundColour(flags.m_foreground); - } - - if ( flags.m_background.IsOk() ) - panel->SetBackgroundColour(flags.m_background); - - if ( flags.m_alpha != wxALPHA_OPAQUE ) - m_InfoFrame->SetTransparent(flags.m_alpha); - - m_InfoFrame->SetCursor(*wxHOURGLASS_CURSOR); - - // We need to accommodate our contents, but also impose some minimal size - // to make the busy info frame more noticeable. - wxSize size = panel->GetBestSize(); - size.IncTo(wxSize(400, 80)); - - m_InfoFrame->SetClientSize(size); - m_InfoFrame->Layout(); - - m_InfoFrame->Centre(wxBOTH); - m_InfoFrame->Show(true); - m_InfoFrame->Refresh(); - m_InfoFrame->Update(); -} - -wxBusyInfo::~wxBusyInfo() -{ - m_InfoFrame->Show(false); - m_InfoFrame->Close(); -} - -#endif // wxUSE_BUSYINFO diff --git a/Externals/wxWidgets3/src/generic/buttonbar.cpp b/Externals/wxWidgets3/src/generic/buttonbar.cpp deleted file mode 100644 index c67ddd4d16..0000000000 --- a/Externals/wxWidgets3/src/generic/buttonbar.cpp +++ /dev/null @@ -1,560 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/generic/buttonbar.cpp -// Purpose: wxButtonToolBar implementation -// Author: Julian Smart, after Robert Roebling, Vadim Zeitlin, SciTech -// Modified by: -// Created: 2006-04-13 -// Copyright: (c) Julian Smart, Robert Roebling, Vadim Zeitlin, -// SciTech Software, Inc. -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -// Currently, only for Mac as a toolbar replacement. -#if defined(__WXMAC__) && wxUSE_TOOLBAR && wxUSE_BMPBUTTON - -#include "wx/generic/buttonbar.h" - -#ifndef WX_PRECOMP - #include "wx/utils.h" - #include "wx/app.h" - #include "wx/log.h" - #include "wx/frame.h" - #include "wx/dcclient.h" - #include "wx/settings.h" - #include "wx/image.h" -#endif - -// ---------------------------------------------------------------------------- -// wxButtonToolBarTool: our implementation of wxToolBarToolBase -// ---------------------------------------------------------------------------- - -class WXDLLEXPORT wxButtonToolBarTool : public wxToolBarToolBase -{ -public: - wxButtonToolBarTool(wxButtonToolBar *tbar, - int id, - const wxString& label, - const wxBitmap& bmpNormal, - const wxBitmap& bmpDisabled, - wxItemKind kind, - wxObject *clientData, - const wxString& shortHelp, - const wxString& longHelp) - : wxToolBarToolBase(tbar, id, label, bmpNormal, bmpDisabled, kind, - clientData, shortHelp, longHelp) - { - m_x = m_y = wxDefaultCoord; - m_width = - m_height = 0; - - m_button = NULL; - } - - wxButtonToolBarTool(wxButtonToolBar *tbar, - wxControl *control, - const wxString& label) - : wxToolBarToolBase(tbar, control, label) - { - m_x = m_y = wxDefaultCoord; - m_width = - m_height = 0; - m_button = NULL; - } - - wxBitmapButton* GetButton() const { return m_button; } - void SetButton(wxBitmapButton* button) { m_button = button; } - -public: - // the tool position (for controls) - wxCoord m_x; - wxCoord m_y; - wxCoord m_width; - wxCoord m_height; - -private: - // the control representing the button - wxBitmapButton* m_button; -}; - -// ============================================================================ -// wxButtonToolBar implementation -// ============================================================================ - -wxIMPLEMENT_DYNAMIC_CLASS(wxButtonToolBar, wxControl); - -wxBEGIN_EVENT_TABLE(wxButtonToolBar, wxControl) - EVT_BUTTON(wxID_ANY, wxButtonToolBar::OnCommand) - EVT_PAINT(wxButtonToolBar::OnPaint) - EVT_LEFT_UP(wxButtonToolBar::OnLeftUp) -wxEND_EVENT_TABLE() - -// ---------------------------------------------------------------------------- -// wxButtonToolBar creation -// ---------------------------------------------------------------------------- - -void wxButtonToolBar::Init() -{ - // no tools yet - m_needsLayout = false; - - // unknown widths for the tools and separators - m_widthSeparator = wxDefaultCoord; - - m_maxWidth = m_maxHeight = 0; - - m_labelMargin = 2; - m_labelHeight = 0; - - SetMargins(8, 2); - SetToolPacking(8); -} - -bool wxButtonToolBar::Create(wxWindow *parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) -{ - if ( !wxToolBarBase::Create(parent, id, pos, size, style, - wxDefaultValidator, name) ) - { - return false; - } - - // wxColour lightBackground(244, 244, 244); - - wxFont font(wxSMALL_FONT->GetPointSize(), - wxNORMAL_FONT->GetFamily(), - wxNORMAL_FONT->GetStyle(), - wxFONTWEIGHT_NORMAL); - SetFont(font); - - // Calculate the label height if necessary - if (GetWindowStyle() & wxTB_TEXT) - { - wxClientDC dc(this); - dc.SetFont(font); - int w, h; - dc.GetTextExtent(wxT("X"), & w, & h); - m_labelHeight = h; - } - return true; -} - -wxButtonToolBar::~wxButtonToolBar() -{ -} - -// ---------------------------------------------------------------------------- -// wxButtonToolBar tool-related methods -// ---------------------------------------------------------------------------- - -wxToolBarToolBase *wxButtonToolBar::FindToolForPosition(wxCoord x, wxCoord y) const -{ - // check the "other" direction first: it must be inside the toolbar or we - // don't risk finding anything - if ( IsVertical() ) - { - if ( x < 0 || x > m_maxWidth ) - return NULL; - - // we always use x, even for a vertical toolbar, this makes the code - // below simpler - x = y; - } - else // horizontal - { - if ( y < 0 || y > m_maxHeight ) - return NULL; - } - - for ( wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst(); - node; - node = node->GetNext() ) - { - wxButtonToolBarTool *tool = (wxButtonToolBarTool*) node->GetData(); - wxRect rectTool = GetToolRect(tool); - - wxCoord startTool, endTool; - GetRectLimits(rectTool, &startTool, &endTool); - - if ( x >= startTool && x <= endTool ) - { - // don't return the separators from here, they don't accept any - // input anyhow - return tool->IsSeparator() ? NULL : tool; - } - } - - return NULL; -} - -void wxButtonToolBar::GetRectLimits(const wxRect& rect, - wxCoord *start, - wxCoord *end) const -{ - wxCHECK_RET( start && end, wxT("NULL pointer in GetRectLimits") ); - - if ( IsVertical() ) - { - *start = rect.GetTop(); - *end = rect.GetBottom(); - } - else // horizontal - { - *start = rect.GetLeft(); - *end = rect.GetRight(); - } -} - - -void wxButtonToolBar::SetToolShortHelp(int id, const wxString& help) -{ - wxToolBarToolBase *tool = FindById(id); - - wxCHECK_RET( tool, wxT("SetToolShortHelp: no such tool") ); - - // TODO: set tooltip/short help - tool->SetShortHelp(help); -} - -bool wxButtonToolBar::DoInsertTool(size_t WXUNUSED(pos), - wxToolBarToolBase * WXUNUSED(tool)) -{ - return true; -} - -bool wxButtonToolBar::DoDeleteTool(size_t WXUNUSED(pos), - wxToolBarToolBase * WXUNUSED(tool)) -{ - // TODO - return true; -} - -void wxButtonToolBar::DoEnableTool(wxToolBarToolBase *WXUNUSED(tool), bool WXUNUSED(enable)) -{ - // TODO -} - -void wxButtonToolBar::DoToggleTool(wxToolBarToolBase *WXUNUSED(tool), bool WXUNUSED(toggle)) -{ - // TODO -} - -void wxButtonToolBar::DoSetToggle(wxToolBarToolBase *WXUNUSED(tool), bool WXUNUSED(toggle)) -{ - // TODO -} - -wxToolBarToolBase *wxButtonToolBar::CreateTool(int id, - const wxString& label, - const wxBitmap& bmpNormal, - const wxBitmap& bmpDisabled, - wxItemKind kind, - wxObject *clientData, - const wxString& shortHelp, - const wxString& longHelp) -{ - return new wxButtonToolBarTool(this, id, label, bmpNormal, bmpDisabled, kind, - clientData, shortHelp, longHelp); -} - -wxToolBarToolBase *wxButtonToolBar::CreateTool(wxControl *control, - const wxString& label) -{ - return new wxButtonToolBarTool(this, control, label); -} - -// ---------------------------------------------------------------------------- -// wxButtonToolBar geometry -// ---------------------------------------------------------------------------- - -wxRect wxButtonToolBar::GetToolRect(wxToolBarToolBase *toolBase) const -{ - const wxButtonToolBarTool *tool = (wxButtonToolBarTool *)toolBase; - - wxRect rect; - - wxCHECK_MSG( tool, rect, wxT("GetToolRect: NULL tool") ); - - // ensure that we always have the valid tool position - if ( m_needsLayout ) - { - wxConstCast(this, wxButtonToolBar)->DoLayout(); - } - - rect.x = tool->m_x - (m_toolPacking/2); - rect.y = tool->m_y; - - if ( IsVertical() ) - { - if (tool->IsButton()) - { - rect.width = m_defaultWidth; - rect.height = m_defaultHeight; - if (tool->GetButton()) - rect.SetSize(wxSize(tool->m_width, tool->m_height)); - } - else if (tool->IsSeparator()) - { - rect.width = m_defaultWidth; - rect.height = m_widthSeparator; - } - else // control - { - rect.width = tool->m_width; - rect.height = tool->m_height; - } - } - else // horizontal - { - if (tool->IsButton()) - { - rect.width = m_defaultWidth; - rect.height = m_defaultHeight; - if (tool->GetButton()) - rect.SetSize(wxSize(tool->m_width, tool->m_height)); - } - else if (tool->IsSeparator()) - { - rect.width = m_widthSeparator; - rect.height = m_defaultHeight; - } - else // control - { - rect.width = tool->m_width; - rect.height = tool->m_height; - } - } - - rect.width += m_toolPacking; - - return rect; -} - -bool wxButtonToolBar::Realize() -{ - if ( !wxToolBarBase::Realize() ) - return false; - - m_needsLayout = true; - DoLayout(); - - SetInitialSize(wxSize(m_maxWidth, m_maxHeight)); - - return true; -} - -void wxButtonToolBar::DoLayout() -{ - m_needsLayout = false; - - wxCoord x = m_xMargin, - y = m_yMargin; - - int maxHeight = 0; - - const wxCoord widthTool = IsVertical() ? m_defaultHeight : m_defaultWidth; - wxCoord margin = IsVertical() ? m_xMargin : m_yMargin; - wxCoord *pCur = IsVertical() ? &y : &x; - - // calculate the positions of all elements - for ( wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst(); - node; - node = node->GetNext() ) - { - wxButtonToolBarTool *tool = (wxButtonToolBarTool *) node->GetData(); - - tool->m_x = x; - tool->m_y = y; - - if (tool->IsButton()) - { - if (!tool->GetButton()) - { - wxBitmapButton* bmpButton = new wxBitmapButton(this, tool->GetId(), tool->GetNormalBitmap(), wxPoint(tool->m_x, tool->m_y), wxDefaultSize, - wxBU_AUTODRAW|wxBORDER_NONE); - if (!tool->GetShortHelp().empty()) - bmpButton->SetLabel(tool->GetShortHelp()); - - tool->SetButton(bmpButton); - } - else - { - tool->GetButton()->Move(wxPoint(tool->m_x, tool->m_y)); - } - - int w = widthTool; - if (tool->GetButton()) - { - wxSize sz = tool->GetButton()->GetSize(); - w = sz.x; - - if (m_labelHeight > 0) - { - sz.y += (m_labelHeight + m_labelMargin); - - if (!tool->GetShortHelp().empty()) - { - wxClientDC dc(this); - dc.SetFont(GetFont()); - int tw, th; - dc.GetTextExtent(tool->GetShortHelp(), & tw, & th); - - // If the label is bigger than the icon, the label width - // becomes the new tool width, and we need to centre the - // the bitmap in this box. - if (tw > sz.x) - { - int newX = int(tool->m_x + (tw - sz.x)/2.0); - tool->GetButton()->Move(newX, tool->m_y); - sz.x = tw; - } - } - } - - maxHeight = wxMax(maxHeight, sz.y); - - tool->m_width = sz.x; - tool->m_height = sz.y; - w = sz.x; - } - - *pCur += (w + GetToolPacking()); - } - else if (tool->IsSeparator()) - { - *pCur += m_widthSeparator; - } - else if (!IsVertical()) // horizontal control - { - wxControl *control = tool->GetControl(); - wxSize size = control->GetSize(); - tool->m_y += (m_defaultHeight - size.y)/2; - tool->m_width = size.x; - tool->m_height = size.y; - - *pCur += tool->m_width; - - maxHeight = wxMax(maxHeight, size.y); - } - *pCur += margin; - } - - // calculate the total toolbar size - m_maxWidth = x + 2*m_xMargin; - m_maxHeight = maxHeight + 2*m_yMargin; - - if ((GetWindowStyle() & wxTB_NODIVIDER) == 0) - m_maxHeight += 2; - -} - -wxSize wxButtonToolBar::DoGetBestClientSize() const -{ - return wxSize(m_maxWidth, m_maxHeight); -} - -// receives button commands -void wxButtonToolBar::OnCommand(wxCommandEvent& event) -{ - wxButtonToolBarTool* tool = (wxButtonToolBarTool*) FindById(event.GetId()); - if (!tool) - { - event.Skip(); - return; - } - - if (tool->CanBeToggled()) - tool->Toggle(tool->IsToggled()); - - // TODO: handle toggle items - OnLeftClick(event.GetId(), false); - - if (tool->GetKind() == wxITEM_RADIO) - UnToggleRadioGroup(tool); - - if (tool->CanBeToggled()) - Refresh(); -} - -// paints a border -void wxButtonToolBar::OnPaint(wxPaintEvent& WXUNUSED(event)) -{ - wxPaintDC dc(this); - - dc.SetFont(GetFont()); - dc.SetBackgroundMode(wxTRANSPARENT); - - for ( wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst(); - node; - node = node->GetNext() ) - { - wxButtonToolBarTool *tool = (wxButtonToolBarTool*) node->GetData(); - wxRect rectTool = GetToolRect(tool); - if (tool->IsToggled()) - { - wxRect backgroundRect = rectTool; - backgroundRect.y = -1; backgroundRect.height = GetClientSize().y + 1; - wxBrush brush(wxColour(219, 219, 219)); - wxPen pen(wxColour(159, 159, 159)); - dc.SetBrush(brush); - dc.SetPen(pen); - dc.DrawRectangle(backgroundRect); - } - - if (m_labelHeight > 0 && !tool->GetShortHelp().empty()) - { - int tw, th; - dc.GetTextExtent(tool->GetShortHelp(), & tw, & th); - - int x = tool->m_x; - dc.DrawText(tool->GetShortHelp(), x, tool->m_y + tool->GetButton()->GetSize().y + m_labelMargin); - } - } - - if ((GetWindowStyle() & wxTB_NODIVIDER) == 0) - { - wxPen pen(wxColour(159, 159, 159)); - dc.SetPen(pen); - int x1 = 0; - int y1 = GetClientSize().y-1; - int x2 = GetClientSize().x; - int y2 = y1; - dc.DrawLine(x1, y1, x2, y2); - } -} - -// detects mouse clicks outside buttons -void wxButtonToolBar::OnLeftUp(wxMouseEvent& event) -{ - if (m_labelHeight > 0) - { - wxButtonToolBarTool* tool = (wxButtonToolBarTool*) FindToolForPosition(event.GetX(), event.GetY()); - if (tool && tool->GetButton() && (event.GetY() > (tool->m_y + tool->GetButton()->GetSize().y))) - { - wxCommandEvent event(wxEVT_BUTTON, tool->GetId()); - event.SetEventObject(tool->GetButton()); - if (!GetEventHandler()->ProcessEvent(event)) - event.Skip(); - } - } -} - -#endif // wxUSE_TOOLBAR && wxUSE_BMPBUTTON diff --git a/Externals/wxWidgets3/src/generic/calctrlg.cpp b/Externals/wxWidgets3/src/generic/calctrlg.cpp deleted file mode 100644 index a03cfbd4da..0000000000 --- a/Externals/wxWidgets3/src/generic/calctrlg.cpp +++ /dev/null @@ -1,1763 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/generic/calctrlg.cpp -// Purpose: implementation of the wxGenericCalendarCtrl -// Author: Vadim Zeitlin -// Modified by: -// Created: 29.12.99 -// Copyright: (c) 1999 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#ifndef WX_PRECOMP - #include "wx/dcclient.h" - #include "wx/settings.h" - #include "wx/brush.h" - #include "wx/combobox.h" - #include "wx/listbox.h" - #include "wx/stattext.h" - #include "wx/textctrl.h" -#endif //WX_PRECOMP - - -#if wxUSE_CALENDARCTRL - -#include "wx/spinctrl.h" -#include "wx/calctrl.h" -#include "wx/generic/calctrlg.h" - -#define DEBUG_PAINT 0 - -// ---------------------------------------------------------------------------- -// wxWin macros -// ---------------------------------------------------------------------------- - -#ifdef wxHAS_NATIVE_CALENDARCTRL - -wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxGenericCalendarCtrl, wxControl, "wx/calctrl.h"); - -#endif - -wxBEGIN_EVENT_TABLE(wxGenericCalendarCtrl, wxControl) - EVT_PAINT(wxGenericCalendarCtrl::OnPaint) - - EVT_CHAR(wxGenericCalendarCtrl::OnChar) - - EVT_LEFT_DOWN(wxGenericCalendarCtrl::OnClick) - EVT_LEFT_DCLICK(wxGenericCalendarCtrl::OnDClick) - EVT_MOUSEWHEEL(wxGenericCalendarCtrl::OnWheel) - - EVT_SYS_COLOUR_CHANGED(wxGenericCalendarCtrl::OnSysColourChanged) -wxEND_EVENT_TABLE() - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// helper functions -// ---------------------------------------------------------------------------- - -namespace -{ - -// add attributes that are set in attr -void AddAttr(wxCalendarDateAttr *self, const wxCalendarDateAttr& attr) -{ - if (attr.HasTextColour()) - self->SetTextColour(attr.GetTextColour()); - if (attr.HasBackgroundColour()) - self->SetBackgroundColour(attr.GetBackgroundColour()); - if (attr.HasBorderColour()) - self->SetBorderColour(attr.GetBorderColour()); - if (attr.HasFont()) - self->SetFont(attr.GetFont()); - if (attr.HasBorder()) - self->SetBorder(attr.GetBorder()); - if (attr.IsHoliday()) - self->SetHoliday(true); -} - -// remove attributes that are set in attr -void DelAttr(wxCalendarDateAttr *self, const wxCalendarDateAttr &attr) -{ - if (attr.HasTextColour()) - self->SetTextColour(wxNullColour); - if (attr.HasBackgroundColour()) - self->SetBackgroundColour(wxNullColour); - if (attr.HasBorderColour()) - self->SetBorderColour(wxNullColour); - if (attr.HasFont()) - self->SetFont(wxNullFont); - if (attr.HasBorder()) - self->SetBorder(wxCAL_BORDER_NONE); - if (attr.IsHoliday()) - self->SetHoliday(false); -} - -} // anonymous namespace - -// ---------------------------------------------------------------------------- -// wxGenericCalendarCtrl -// ---------------------------------------------------------------------------- - -wxGenericCalendarCtrl::wxGenericCalendarCtrl(wxWindow *parent, - wxWindowID id, - const wxDateTime& date, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) -{ - Init(); - - (void)Create(parent, id, date, pos, size, style, name); -} - -void wxGenericCalendarCtrl::Init() -{ - m_comboMonth = NULL; - m_spinYear = NULL; - m_staticYear = NULL; - m_staticMonth = NULL; - - m_userChangedYear = false; - - m_widthCol = - m_heightRow = - m_calendarWeekWidth = 0; - - wxDateTime::WeekDay wd; - for ( wd = wxDateTime::Sun; wd < wxDateTime::Inv_WeekDay; wxNextWDay(wd) ) - { - m_weekdays[wd] = wxDateTime::GetWeekDayName(wd, wxDateTime::Name_Abbr); - } - - for ( size_t n = 0; n < WXSIZEOF(m_attrs); n++ ) - { - m_attrs[n] = NULL; - } - - InitColours(); -} - -void wxGenericCalendarCtrl::InitColours() -{ - m_colHighlightFg = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT); - m_colHighlightBg = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT); - m_colBackground = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW); - m_colSurrounding = wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT); - - m_colHolidayFg = *wxRED; - // don't set m_colHolidayBg - by default, same as our bg colour - - m_colHeaderFg = *wxBLUE; - m_colHeaderBg = *wxLIGHT_GREY; -} - -bool wxGenericCalendarCtrl::Create(wxWindow *parent, - wxWindowID id, - const wxDateTime& date, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) -{ - if ( !wxControl::Create(parent, id, pos, size, - style | wxCLIP_CHILDREN | wxWANTS_CHARS | wxFULL_REPAINT_ON_RESIZE, - wxDefaultValidator, name) ) - { - return false; - } - - // needed to get the arrow keys normally used for the dialog navigation - SetWindowStyle(style | wxWANTS_CHARS); - - m_date = date.IsValid() ? date : wxDateTime::Today(); - - m_lowdate = wxDefaultDateTime; - m_highdate = wxDefaultDateTime; - - if ( !HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) ) - { - CreateYearSpinCtrl(); - m_staticYear = new wxStaticText(GetParent(), wxID_ANY, m_date.Format(wxT("%Y")), - wxDefaultPosition, wxDefaultSize, - wxALIGN_CENTRE); - CreateMonthComboBox(); - m_staticMonth = new wxStaticText(GetParent(), wxID_ANY, m_date.Format(wxT("%B")), - wxDefaultPosition, wxDefaultSize, - wxALIGN_CENTRE); - } - - ShowCurrentControls(); - - // we need to set the position as well because the main control position - // is not the same as the one specified in pos if we have the controls - // above it - SetInitialSize(size); - SetPosition(pos); - - // Since we don't paint the whole background make sure that the platform - // will use the right one. - SetBackgroundColour(m_colBackground); - - SetHolidayAttrs(); - - return true; -} - -wxGenericCalendarCtrl::~wxGenericCalendarCtrl() -{ - for ( size_t n = 0; n < WXSIZEOF(m_attrs); n++ ) - { - delete m_attrs[n]; - } - - if ( !HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) ) - { - delete m_comboMonth; - delete m_staticMonth; - delete m_spinYear; - delete m_staticYear; - } -} - -void wxGenericCalendarCtrl::SetWindowStyleFlag(long style) -{ - // changing this style doesn't work because the controls are not - // created/shown/hidden accordingly - wxASSERT_MSG( (style & wxCAL_SEQUENTIAL_MONTH_SELECTION) == - (m_windowStyle & wxCAL_SEQUENTIAL_MONTH_SELECTION), - wxT("wxCAL_SEQUENTIAL_MONTH_SELECTION can't be changed after creation") ); - - wxControl::SetWindowStyleFlag(style); -} - -// ---------------------------------------------------------------------------- -// Create the wxComboBox and wxSpinCtrl -// ---------------------------------------------------------------------------- - -void wxGenericCalendarCtrl::CreateMonthComboBox() -{ - m_comboMonth = new wxComboBox(GetParent(), wxID_ANY, - wxEmptyString, - wxDefaultPosition, - wxDefaultSize, - 0, NULL, - wxCB_READONLY | wxCLIP_SIBLINGS); - - wxDateTime::Month m; - for ( m = wxDateTime::Jan; m < wxDateTime::Inv_Month; wxNextMonth(m) ) - { - m_comboMonth->Append(wxDateTime::GetMonthName(m)); - } - - m_comboMonth->SetSelection(GetDate().GetMonth()); - m_comboMonth->SetSize(wxDefaultCoord, - wxDefaultCoord, - wxDefaultCoord, - wxDefaultCoord, - wxSIZE_AUTO_WIDTH|wxSIZE_AUTO_HEIGHT); - - m_comboMonth->Connect(m_comboMonth->GetId(), wxEVT_COMBOBOX, - wxCommandEventHandler(wxGenericCalendarCtrl::OnMonthChange), - NULL, this); -} - -void wxGenericCalendarCtrl::CreateYearSpinCtrl() -{ - m_spinYear = new wxSpinCtrl(GetParent(), wxID_ANY, - GetDate().Format(wxT("%Y")), - wxDefaultPosition, - wxDefaultSize, - wxSP_ARROW_KEYS | wxCLIP_SIBLINGS, - -4300, 10000, GetDate().GetYear()); - - m_spinYear->Connect(m_spinYear->GetId(), wxEVT_TEXT, - wxCommandEventHandler(wxGenericCalendarCtrl::OnYearTextChange), - NULL, this); - - m_spinYear->Connect(m_spinYear->GetId(), wxEVT_SPINCTRL, - wxSpinEventHandler(wxGenericCalendarCtrl::OnYearChange), - NULL, this); -} - -// ---------------------------------------------------------------------------- -// forward wxWin functions to subcontrols -// ---------------------------------------------------------------------------- - -bool wxGenericCalendarCtrl::Destroy() -{ - if ( m_staticYear ) - m_staticYear->Destroy(); - if ( m_spinYear ) - m_spinYear->Destroy(); - if ( m_comboMonth ) - m_comboMonth->Destroy(); - if ( m_staticMonth ) - m_staticMonth->Destroy(); - - m_staticYear = NULL; - m_spinYear = NULL; - m_comboMonth = NULL; - m_staticMonth = NULL; - - return wxControl::Destroy(); -} - -bool wxGenericCalendarCtrl::Show(bool show) -{ - if ( !wxControl::Show(show) ) - { - return false; - } - - if ( !(GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) ) - { - if ( GetMonthControl() ) - { - GetMonthControl()->Show(show); - GetYearControl()->Show(show); - } - } - - return true; -} - -bool wxGenericCalendarCtrl::Enable(bool enable) -{ - if ( !wxControl::Enable(enable) ) - { - return false; - } - - if ( !(GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) ) - { - GetMonthControl()->Enable(enable); - GetYearControl()->Enable(enable); - } - - return true; -} - -// ---------------------------------------------------------------------------- -// enable/disable month/year controls -// ---------------------------------------------------------------------------- - -void wxGenericCalendarCtrl::ShowCurrentControls() -{ - if ( !HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) ) - { - if ( AllowMonthChange() ) - { - m_comboMonth->Show(); - m_staticMonth->Hide(); - - if ( AllowYearChange() ) - { - m_spinYear->Show(); - m_staticYear->Hide(); - - // skip the rest - return; - } - } - else - { - m_comboMonth->Hide(); - m_staticMonth->Show(); - } - - // year change not allowed here - m_spinYear->Hide(); - m_staticYear->Show(); - } - //else: these controls are not even created, don't show/hide them -} - -wxControl *wxGenericCalendarCtrl::GetMonthControl() const -{ - return AllowMonthChange() ? (wxControl *)m_comboMonth : (wxControl *)m_staticMonth; -} - -wxControl *wxGenericCalendarCtrl::GetYearControl() const -{ - return AllowYearChange() ? (wxControl *)m_spinYear : (wxControl *)m_staticYear; -} - -void wxGenericCalendarCtrl::EnableYearChange(bool enable) -{ - if ( enable != AllowYearChange() ) - { - long style = GetWindowStyle(); - if ( enable ) - style &= ~wxCAL_NO_YEAR_CHANGE; - else - style |= wxCAL_NO_YEAR_CHANGE; - SetWindowStyle(style); - - ShowCurrentControls(); - if ( GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION ) - { - Refresh(); - } - } -} - -bool wxGenericCalendarCtrl::EnableMonthChange(bool enable) -{ - if ( !wxCalendarCtrlBase::EnableMonthChange(enable) ) - return false; - - ShowCurrentControls(); - if ( GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION ) - Refresh(); - - return true; -} - -// ---------------------------------------------------------------------------- -// changing date -// ---------------------------------------------------------------------------- - -bool wxGenericCalendarCtrl::SetDate(const wxDateTime& date) -{ - bool retval = true; - - bool sameMonth = m_date.GetMonth() == date.GetMonth(), - sameYear = m_date.GetYear() == date.GetYear(); - - if ( IsDateInRange(date) ) - { - if ( sameMonth && sameYear ) - { - // just change the day - ChangeDay(date); - } - else - { - if ( AllowMonthChange() && (AllowYearChange() || sameYear) ) - { - // change everything - m_date = date; - - if ( !(GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) ) - { - // update the controls - m_comboMonth->SetSelection(m_date.GetMonth()); - - if ( AllowYearChange() ) - { - if ( !m_userChangedYear ) - m_spinYear->SetValue(m_date.Format(wxT("%Y"))); - } - } - - // as the month changed, holidays did too - SetHolidayAttrs(); - - // update the calendar - Refresh(); - } - else - { - // forbidden - retval = false; - } - } - } - - m_userChangedYear = false; - - return retval; -} - -void wxGenericCalendarCtrl::ChangeDay(const wxDateTime& date) -{ - if ( m_date != date ) - { - // we need to refresh the row containing the old date and the one - // containing the new one - wxDateTime dateOld = m_date; - m_date = date; - - RefreshDate(dateOld); - - // if the date is in the same row, it was already drawn correctly - if ( GetWeek(m_date) != GetWeek(dateOld) ) - { - RefreshDate(m_date); - } - } -} - -void wxGenericCalendarCtrl::SetDateAndNotify(const wxDateTime& date) -{ - const wxDateTime dateOld = GetDate(); - if ( date != dateOld && SetDate(date) ) - { - GenerateAllChangeEvents(dateOld); - } -} - -// ---------------------------------------------------------------------------- -// date range -// ---------------------------------------------------------------------------- - -bool wxGenericCalendarCtrl::SetLowerDateLimit(const wxDateTime& date /* = wxDefaultDateTime */) -{ - bool retval = true; - - if ( !(date.IsValid()) || ( ( m_highdate.IsValid() ) ? ( date <= m_highdate ) : true ) ) - { - m_lowdate = date; - } - else - { - retval = false; - } - - return retval; -} - -bool wxGenericCalendarCtrl::SetUpperDateLimit(const wxDateTime& date /* = wxDefaultDateTime */) -{ - bool retval = true; - - if ( !(date.IsValid()) || ( ( m_lowdate.IsValid() ) ? ( date >= m_lowdate ) : true ) ) - { - m_highdate = date; - } - else - { - retval = false; - } - - return retval; -} - -bool wxGenericCalendarCtrl::SetDateRange(const wxDateTime& lowerdate /* = wxDefaultDateTime */, const wxDateTime& upperdate /* = wxDefaultDateTime */) -{ - bool retval = true; - - if ( - ( !( lowerdate.IsValid() ) || ( ( upperdate.IsValid() ) ? ( lowerdate <= upperdate ) : true ) ) && - ( !( upperdate.IsValid() ) || ( ( lowerdate.IsValid() ) ? ( upperdate >= lowerdate ) : true ) ) ) - { - m_lowdate = lowerdate; - m_highdate = upperdate; - } - else - { - retval = false; - } - - return retval; -} - -bool wxGenericCalendarCtrl::GetDateRange(wxDateTime *lowerdate, - wxDateTime *upperdate) const -{ - if ( lowerdate ) - *lowerdate = m_lowdate; - if ( upperdate ) - *upperdate = m_highdate; - - return m_lowdate.IsValid() || m_highdate.IsValid(); -} - -// ---------------------------------------------------------------------------- -// date helpers -// ---------------------------------------------------------------------------- - -wxDateTime wxGenericCalendarCtrl::GetStartDate() const -{ - wxDateTime::Tm tm = m_date.GetTm(); - - wxDateTime date = wxDateTime(1, tm.mon, tm.year); - - // rewind back - date.SetToPrevWeekDay(GetWeekStart()); - - if ( GetWindowStyle() & wxCAL_SHOW_SURROUNDING_WEEKS ) - { - // We want to offset the calendar if we start on the first.. - if ( date.GetDay() == 1 ) - { - date -= wxDateSpan::Week(); - } - } - - return date; -} - -bool wxGenericCalendarCtrl::IsDateShown(const wxDateTime& date) const -{ - if ( !(GetWindowStyle() & wxCAL_SHOW_SURROUNDING_WEEKS) ) - { - return date.GetMonth() == m_date.GetMonth(); - } - else - { - return true; - } -} - -bool wxGenericCalendarCtrl::IsDateInRange(const wxDateTime& date) const -{ - // Check if the given date is in the range specified - return ( ( ( m_lowdate.IsValid() ) ? ( date >= m_lowdate ) : true ) - && ( ( m_highdate.IsValid() ) ? ( date <= m_highdate ) : true ) ); -} - -bool wxGenericCalendarCtrl::AdjustDateToRange(wxDateTime *date) const -{ - if ( m_lowdate.IsValid() && *date < m_lowdate ) - { - *date = m_lowdate; - return true; - } - - if ( m_highdate.IsValid() && *date > m_highdate ) - { - *date = m_highdate; - return true; - } - - return false; -} - -size_t wxGenericCalendarCtrl::GetWeek(const wxDateTime& date) const -{ - size_t retval = date.GetWeekOfMonth(HasFlag(wxCAL_MONDAY_FIRST) - ? wxDateTime::Monday_First - : wxDateTime::Sunday_First); - - if ( (GetWindowStyle() & wxCAL_SHOW_SURROUNDING_WEEKS) ) - { - // we need to offset an extra week if we "start" on the 1st of the month - wxDateTime::Tm tm = date.GetTm(); - - wxDateTime datetest = wxDateTime(1, tm.mon, tm.year); - - // rewind back - datetest.SetToPrevWeekDay(GetWeekStart()); - - if ( datetest.GetDay() == 1 ) - { - retval += 1; - } - } - - return retval; -} - -// ---------------------------------------------------------------------------- -// size management -// ---------------------------------------------------------------------------- - -// this is a composite control and it must arrange its parts each time its -// size or position changes: the combobox and spinctrl are along the top of -// the available area and the calendar takes up the rest of the space - -// the static controls are supposed to be always smaller than combo/spin so we -// always use the latter for size calculations and position the static to take -// the same space - -// the constants used for the layout -#define VERT_MARGIN 5 // distance between combo and calendar -#define HORZ_MARGIN 5 // spin - -wxSize wxGenericCalendarCtrl::DoGetBestSize() const -{ - // calc the size of the calendar - const_cast(this)->RecalcGeometry(); - - wxCoord width = 7*m_widthCol + m_calendarWeekWidth, - height = 7*m_heightRow + m_rowOffset + VERT_MARGIN; - - if ( !HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) ) - { - const wxSize bestSizeCombo = m_comboMonth->GetBestSize(); - - height += wxMax(bestSizeCombo.y, m_spinYear->GetBestSize().y) - + VERT_MARGIN; - - wxCoord w2 = bestSizeCombo.x + HORZ_MARGIN + GetCharWidth()*8; - if ( width < w2 ) - width = w2; - } - - wxSize best(width, height); - if ( !HasFlag(wxBORDER_NONE) ) - { - best += GetWindowBorderSize(); - } - - CacheBestSize(best); - - return best; -} - -void wxGenericCalendarCtrl::DoMoveWindow(int x, int y, int width, int height) -{ - int yDiff; - - if ( !HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) && m_staticMonth ) - { - wxSize sizeCombo = m_comboMonth->GetEffectiveMinSize(); - wxSize sizeStatic = m_staticMonth->GetSize(); - wxSize sizeSpin = m_spinYear->GetSize(); - - int maxHeight = wxMax(sizeSpin.y, sizeCombo.y); - int dy = (maxHeight - sizeStatic.y) / 2; - m_comboMonth->Move(x, y + (maxHeight - sizeCombo.y)/2); - m_staticMonth->SetSize(x, y + dy, sizeCombo.x, -1); - - int xDiff = sizeCombo.x + HORZ_MARGIN; - - m_spinYear->SetSize(x + xDiff, y + (maxHeight - sizeSpin.y)/2, width - xDiff, maxHeight); - m_staticYear->SetSize(x + xDiff, y + dy, width - xDiff, sizeStatic.y); - - yDiff = maxHeight + VERT_MARGIN; - } - else // no controls on the top - { - yDiff = 0; - } - - wxControl::DoMoveWindow(x, y + yDiff, width, height - yDiff); -} - -void wxGenericCalendarCtrl::DoGetSize(int *width, int *height) const -{ - wxControl::DoGetSize( width, height ); -} - -void wxGenericCalendarCtrl::RecalcGeometry() -{ - wxClientDC dc(this); - - dc.SetFont(GetFont()); - - // determine the column width (weekday names are not necessarily wider - // than the numbers (in some languages), so let's not assume that they are) - m_widthCol = 0; - for ( int day = 10; day <= 31; day++) - { - wxCoord width; - dc.GetTextExtent(wxString::Format(wxT("%d"), day), &width, &m_heightRow); - if ( width > m_widthCol ) - { - // 1.5 times the width gives nice margins even if the weekday - // names are short - m_widthCol = width+width/2; - } - } - wxDateTime::WeekDay wd; - for ( wd = wxDateTime::Sun; wd < wxDateTime::Inv_WeekDay; wxNextWDay(wd) ) - { - wxCoord width; - dc.GetTextExtent(m_weekdays[wd], &width, &m_heightRow); - if ( width > m_widthCol ) - { - m_widthCol = width; - } - } - - m_calendarWeekWidth = HasFlag( wxCAL_SHOW_WEEK_NUMBERS ) - ? dc.GetTextExtent( wxString::Format( wxT( "%d" ), 42 )).GetWidth() + 4 : 0; - - // leave some margins - m_widthCol += 2; - m_heightRow += 2; - - m_rowOffset = HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) ? m_heightRow : 0; // conditional in relation to style -} - -// ---------------------------------------------------------------------------- -// drawing -// ---------------------------------------------------------------------------- - -void wxGenericCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event)) -{ - wxPaintDC dc(this); - - dc.SetFont(GetFont()); - - RecalcGeometry(); - -#if DEBUG_PAINT - wxLogDebug("--- starting to paint, selection: %s, week %u\n", - m_date.Format("%a %d-%m-%Y %H:%M:%S").c_str(), - GetWeek(m_date)); -#endif - - wxCoord y = 0; - wxCoord x0 = m_calendarWeekWidth; - - if ( HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) ) - { - // draw the sequential month-selector - - dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT); - dc.SetTextForeground(*wxBLACK); - dc.SetBrush(wxBrush(m_colHeaderBg, wxBRUSHSTYLE_SOLID)); - dc.SetPen(wxPen(m_colHeaderBg, 1, wxPENSTYLE_SOLID)); - dc.DrawRectangle(0, y, GetClientSize().x, m_heightRow); - - // Get extent of month-name + year - wxCoord monthw, monthh; - wxString headertext = m_date.Format(wxT("%B %Y")); - dc.GetTextExtent(headertext, &monthw, &monthh); - - // draw month-name centered above weekdays - wxCoord monthx = ((m_widthCol * 7) - monthw) / 2 + x0; - wxCoord monthy = ((m_heightRow - monthh) / 2) + y; - dc.DrawText(headertext, monthx, monthy); - - // calculate the "month-arrows" - wxPoint leftarrow[3]; - wxPoint rightarrow[3]; - - int arrowheight = monthh / 2; - - leftarrow[0] = wxPoint(0, arrowheight / 2); - leftarrow[1] = wxPoint(arrowheight / 2, 0); - leftarrow[2] = wxPoint(arrowheight / 2, arrowheight - 1); - - rightarrow[0] = wxPoint(0,0); - rightarrow[1] = wxPoint(arrowheight / 2, arrowheight / 2); - rightarrow[2] = wxPoint(0, arrowheight - 1); - - // draw the "month-arrows" - - wxCoord arrowy = (m_heightRow - arrowheight) / 2; - wxCoord larrowx = (m_widthCol - (arrowheight / 2)) / 2 + x0; - wxCoord rarrowx = ((m_widthCol - (arrowheight / 2)) / 2) + m_widthCol*6 + x0; - m_leftArrowRect = m_rightArrowRect = wxRect(0,0,0,0); - - if ( AllowMonthChange() ) - { - wxDateTime ldpm = wxDateTime(1,m_date.GetMonth(), m_date.GetYear()) - wxDateSpan::Day(); // last day prev month - // Check if range permits change - if ( IsDateInRange(ldpm) && ( ( ldpm.GetYear() == m_date.GetYear() ) ? true : AllowYearChange() ) ) - { - m_leftArrowRect = wxRect(larrowx - 3, arrowy - 3, (arrowheight / 2) + 8, (arrowheight + 6)); - dc.SetBrush(*wxBLACK_BRUSH); - dc.SetPen(*wxBLACK_PEN); - dc.DrawPolygon(3, leftarrow, larrowx , arrowy, wxWINDING_RULE); - dc.SetBrush(*wxTRANSPARENT_BRUSH); - dc.DrawRectangle(m_leftArrowRect); - } - wxDateTime fdnm = wxDateTime(1,m_date.GetMonth(), m_date.GetYear()) + wxDateSpan::Month(); // first day next month - if ( IsDateInRange(fdnm) && ( ( fdnm.GetYear() == m_date.GetYear() ) ? true : AllowYearChange() ) ) - { - m_rightArrowRect = wxRect(rarrowx - 4, arrowy - 3, (arrowheight / 2) + 8, (arrowheight + 6)); - dc.SetBrush(*wxBLACK_BRUSH); - dc.SetPen(*wxBLACK_PEN); - dc.DrawPolygon(3, rightarrow, rarrowx , arrowy, wxWINDING_RULE); - dc.SetBrush(*wxTRANSPARENT_BRUSH); - dc.DrawRectangle(m_rightArrowRect); - } - } - - y += m_heightRow; - } - - // first draw the week days - if ( IsExposed(x0, y, x0 + 7*m_widthCol, m_heightRow) ) - { -#if DEBUG_PAINT - wxLogDebug("painting the header"); -#endif - - dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT); - dc.SetTextForeground(m_colHeaderFg); - dc.SetBrush(wxBrush(m_colHeaderBg, wxBRUSHSTYLE_SOLID)); - dc.SetPen(wxPen(m_colHeaderBg, 1, wxPENSTYLE_SOLID)); - dc.DrawRectangle(0, y, GetClientSize().x, m_heightRow); - - bool startOnMonday = HasFlag(wxCAL_MONDAY_FIRST); - for ( int wd = 0; wd < 7; wd++ ) - { - size_t n; - if ( startOnMonday ) - n = wd == 6 ? 0 : wd + 1; - else - n = wd; - wxCoord dayw, dayh; - dc.GetTextExtent(m_weekdays[n], &dayw, &dayh); - dc.DrawText(m_weekdays[n], x0 + (wd*m_widthCol) + ((m_widthCol- dayw) / 2), y); // center the day-name - } - } - - // then the calendar itself - dc.SetTextForeground(*wxBLACK); - //dc.SetFont(*wxNORMAL_FONT); - - y += m_heightRow; - - // draw column with calendar week nr - if ( HasFlag( wxCAL_SHOW_WEEK_NUMBERS ) && IsExposed( 0, y, m_calendarWeekWidth, m_heightRow * 6 )) - { - dc.SetBackgroundMode(wxTRANSPARENT); - dc.SetBrush(wxBrush(m_colHeaderBg, wxBRUSHSTYLE_SOLID)); - dc.SetPen(wxPen(m_colHeaderBg, 1, wxPENSTYLE_SOLID)); - dc.DrawRectangle( 0, y, m_calendarWeekWidth, m_heightRow * 6 ); - wxDateTime date = GetStartDate(); - for ( size_t i = 0; i < 6; ++i ) - { - const int weekNr = date.GetWeekOfYear(); - wxString text = wxString::Format( wxT( "%d" ), weekNr ); - dc.DrawText( text, m_calendarWeekWidth - dc.GetTextExtent( text ).GetWidth() - 2, y + m_heightRow * i ); - date += wxDateSpan::Week(); - } - } - - wxDateTime date = GetStartDate(); - -#if DEBUG_PAINT - wxLogDebug("starting calendar from %s\n", - date.Format("%a %d-%m-%Y %H:%M:%S").c_str()); -#endif - - dc.SetBackgroundMode(wxBRUSHSTYLE_SOLID); - for ( size_t nWeek = 1; nWeek <= 6; nWeek++, y += m_heightRow ) - { - // if the update region doesn't intersect this row, don't paint it - if ( !IsExposed(x0, y, x0 + 7*m_widthCol, m_heightRow - 1) ) - { - date += wxDateSpan::Week(); - - continue; - } - -#if DEBUG_PAINT - wxLogDebug("painting week %d at y = %d\n", nWeek, y); -#endif - - for ( int wd = 0; wd < 7; wd++ ) - { - dc.SetTextBackground(m_colBackground); - if ( IsDateShown(date) ) - { - // don't use wxDate::Format() which prepends 0s - unsigned int day = date.GetDay(); - wxString dayStr = wxString::Format(wxT("%u"), day); - wxCoord width; - dc.GetTextExtent(dayStr, &width, NULL); - - bool changedColours = false, - changedFont = false; - - bool isSel = false; - wxCalendarDateAttr *attr = NULL; - - if ( date.GetMonth() != m_date.GetMonth() || !IsDateInRange(date) ) - { - // draw the days of adjacent months in different colour - dc.SetTextForeground(m_colSurrounding); - changedColours = true; - } - else - { - isSel = date.IsSameDate(m_date); - attr = m_attrs[day - 1]; - - if ( isSel ) - { - dc.SetTextForeground(m_colHighlightFg); - dc.SetTextBackground(m_colHighlightBg); - - changedColours = true; - } - else if ( attr ) - { - wxColour colFg, colBg; - - if ( attr->IsHoliday() ) - { - colFg = m_colHolidayFg; - colBg = m_colHolidayBg; - } - else - { - colFg = attr->GetTextColour(); - colBg = attr->GetBackgroundColour(); - } - - if ( colFg.IsOk() ) - { - dc.SetTextForeground(colFg); - changedColours = true; - } - - if ( colBg.IsOk() ) - { - dc.SetTextBackground(colBg); - changedColours = true; - } - - if ( attr->HasFont() ) - { - dc.SetFont(attr->GetFont()); - changedFont = true; - } - } - } - - wxCoord x = wd*m_widthCol + (m_widthCol - width) / 2 + x0; - dc.DrawText(dayStr, x, y + 1); - - if ( !isSel && attr && attr->HasBorder() ) - { - wxColour colBorder; - if ( attr->HasBorderColour() ) - { - colBorder = attr->GetBorderColour(); - } - else - { - colBorder = GetForegroundColour(); - } - - wxPen pen(colBorder, 1, wxPENSTYLE_SOLID); - dc.SetPen(pen); - dc.SetBrush(*wxTRANSPARENT_BRUSH); - - switch ( attr->GetBorder() ) - { - case wxCAL_BORDER_SQUARE: - dc.DrawRectangle(x - 2, y, - width + 4, m_heightRow); - break; - - case wxCAL_BORDER_ROUND: - dc.DrawEllipse(x - 2, y, - width + 4, m_heightRow); - break; - - default: - wxFAIL_MSG(wxT("unknown border type")); - } - } - - if ( changedColours ) - { - dc.SetTextForeground(GetForegroundColour()); - dc.SetTextBackground(GetBackgroundColour()); - } - - if ( changedFont ) - { - dc.SetFont(GetFont()); - } - } - //else: just don't draw it - - date += wxDateSpan::Day(); - } - } - - // Greying out out-of-range background - bool showSurrounding = (GetWindowStyle() & wxCAL_SHOW_SURROUNDING_WEEKS) != 0; - - date = ( showSurrounding ) ? GetStartDate() : wxDateTime(1, m_date.GetMonth(), m_date.GetYear()); - if ( !IsDateInRange(date) ) - { - wxDateTime firstOOR = GetLowerDateLimit() - wxDateSpan::Day(); // first out-of-range - - wxBrush oorbrush = *wxLIGHT_GREY_BRUSH; - oorbrush.SetStyle(wxBRUSHSTYLE_FDIAGONAL_HATCH); - - HighlightRange(&dc, date, firstOOR, wxTRANSPARENT_PEN, &oorbrush); - } - - date = ( showSurrounding ) ? GetStartDate() + wxDateSpan::Weeks(6) - wxDateSpan::Day() : wxDateTime().SetToLastMonthDay(m_date.GetMonth(), m_date.GetYear()); - if ( !IsDateInRange(date) ) - { - wxDateTime firstOOR = GetUpperDateLimit() + wxDateSpan::Day(); // first out-of-range - - wxBrush oorbrush = *wxLIGHT_GREY_BRUSH; - oorbrush.SetStyle(wxBRUSHSTYLE_FDIAGONAL_HATCH); - - HighlightRange(&dc, firstOOR, date, wxTRANSPARENT_PEN, &oorbrush); - } - -#if DEBUG_PAINT - wxLogDebug("+++ finished painting"); -#endif -} - -void wxGenericCalendarCtrl::RefreshDate(const wxDateTime& date) -{ - RecalcGeometry(); - - wxRect rect; - - // always refresh the whole row at once because our OnPaint() will draw - // the whole row anyhow - and this allows the small optimization in - // OnClick() below to work - rect.x = m_calendarWeekWidth; - - rect.y = (m_heightRow * GetWeek(date)) + m_rowOffset; - - rect.width = 7*m_widthCol; - rect.height = m_heightRow; - -#ifdef __WXMSW__ - // VZ: for some reason, the selected date seems to occupy more space under - // MSW - this is probably some bug in the font size calculations, but I - // don't know where exactly. This fix is ugly and leads to more - // refreshes than really needed, but without it the selected days - // leaves even more ugly underscores on screen. - rect.Inflate(0, 1); -#endif // MSW - -#if DEBUG_PAINT - wxLogDebug("*** refreshing week %d at (%d, %d)-(%d, %d)\n", - GetWeek(date), - rect.x, rect.y, - rect.x + rect.width, rect.y + rect.height); -#endif - - Refresh(true, &rect); -} - -void wxGenericCalendarCtrl::HighlightRange(wxPaintDC* pDC, const wxDateTime& fromdate, const wxDateTime& todate, const wxPen* pPen, const wxBrush* pBrush) -{ - // Highlights the given range using pen and brush - // Does nothing if todate < fromdate - - -#if DEBUG_PAINT - wxLogDebug("+++ HighlightRange: (%s) - (%s) +++", fromdate.Format("%d %m %Y"), todate.Format("%d %m %Y")); -#endif - - if ( todate >= fromdate ) - { - // do stuff - // date-coordinates - int fd, fw; - int td, tw; - - // implicit: both dates must be currently shown - checked by GetDateCoord - if ( GetDateCoord(fromdate, &fd, &fw) && GetDateCoord(todate, &td, &tw) ) - { -#if DEBUG_PAINT - wxLogDebug("Highlight range: (%i, %i) - (%i, %i)", fd, fw, td, tw); -#endif - if ( ( (tw - fw) == 1 ) && ( td < fd ) ) - { - // special case: interval 7 days or less not in same week - // split in two separate intervals - wxDateTime tfd = fromdate + wxDateSpan::Days(7-fd); - wxDateTime ftd = tfd + wxDateSpan::Day(); -#if DEBUG_PAINT - wxLogDebug("Highlight: Separate segments"); -#endif - // draw separately - HighlightRange(pDC, fromdate, tfd, pPen, pBrush); - HighlightRange(pDC, ftd, todate, pPen, pBrush); - } - else - { - int numpoints; - wxPoint corners[8]; // potentially 8 corners in polygon - wxCoord x0 = m_calendarWeekWidth; - - if ( fw == tw ) - { - // simple case: same week - numpoints = 4; - corners[0] = wxPoint(x0 + (fd - 1) * m_widthCol, (fw * m_heightRow) + m_rowOffset); - corners[1] = wxPoint(x0 + (fd - 1) * m_widthCol, ((fw + 1 ) * m_heightRow) + m_rowOffset); - corners[2] = wxPoint(x0 + td * m_widthCol, ((tw + 1) * m_heightRow) + m_rowOffset); - corners[3] = wxPoint(x0 + td * m_widthCol, (tw * m_heightRow) + m_rowOffset); - } - else - { - int cidx = 0; - // "complex" polygon - corners[cidx] = wxPoint(x0 + (fd - 1) * m_widthCol, (fw * m_heightRow) + m_rowOffset); cidx++; - - if ( fd > 1 ) - { - corners[cidx] = wxPoint(x0 + (fd - 1) * m_widthCol, ((fw + 1) * m_heightRow) + m_rowOffset); cidx++; - corners[cidx] = wxPoint(x0, ((fw + 1) * m_heightRow) + m_rowOffset); cidx++; - } - - corners[cidx] = wxPoint(x0, ((tw + 1) * m_heightRow) + m_rowOffset); cidx++; - corners[cidx] = wxPoint(x0 + td * m_widthCol, ((tw + 1) * m_heightRow) + m_rowOffset); cidx++; - - if ( td < 7 ) - { - corners[cidx] = wxPoint(x0 + td * m_widthCol, (tw * m_heightRow) + m_rowOffset); cidx++; - corners[cidx] = wxPoint(x0 + 7 * m_widthCol, (tw * m_heightRow) + m_rowOffset); cidx++; - } - - corners[cidx] = wxPoint(x0 + 7 * m_widthCol, (fw * m_heightRow) + m_rowOffset); cidx++; - - numpoints = cidx; - } - - // draw the polygon - pDC->SetBrush(*pBrush); - pDC->SetPen(*pPen); - pDC->DrawPolygon(numpoints, corners); - } - } - } - // else do nothing -#if DEBUG_PAINT - wxLogDebug("--- HighlightRange ---"); -#endif -} - -bool wxGenericCalendarCtrl::GetDateCoord(const wxDateTime& date, int *day, int *week) const -{ - bool retval = true; - -#if DEBUG_PAINT - wxLogDebug("+++ GetDateCoord: (%s) +++", date.Format("%d %m %Y")); -#endif - - if ( IsDateShown(date) ) - { - bool startOnMonday = HasFlag(wxCAL_MONDAY_FIRST); - - // Find day - *day = date.GetWeekDay(); - - if ( *day == 0 ) // sunday - { - *day = ( startOnMonday ) ? 7 : 1; - } - else - { - *day += ( startOnMonday ) ? 0 : 1; - } - - int targetmonth = date.GetMonth() + (12 * date.GetYear()); - int thismonth = m_date.GetMonth() + (12 * m_date.GetYear()); - - // Find week - if ( targetmonth == thismonth ) - { - *week = GetWeek(date); - } - else - { - if ( targetmonth < thismonth ) - { - *week = 1; // trivial - } - else // targetmonth > thismonth - { - wxDateTime ldcm; - int lastweek; - int lastday; - - // get the datecoord of the last day in the month currently shown -#if DEBUG_PAINT - wxLogDebug(" +++ LDOM +++"); -#endif - GetDateCoord(ldcm.SetToLastMonthDay(m_date.GetMonth(), m_date.GetYear()), &lastday, &lastweek); -#if DEBUG_PAINT - wxLogDebug(" --- LDOM ---"); -#endif - - wxTimeSpan span = date - ldcm; - - int daysfromlast = span.GetDays(); -#if DEBUG_PAINT - wxLogDebug("daysfromlast: %i", daysfromlast); -#endif - if ( daysfromlast + lastday > 7 ) // past week boundary - { - int wholeweeks = (daysfromlast / 7); - *week = wholeweeks + lastweek; - if ( (daysfromlast - (7 * wholeweeks) + lastday) > 7 ) - { - *week += 1; - } - } - else - { - *week = lastweek; - } - } - } - } - else - { - *day = -1; - *week = -1; - retval = false; - } - -#if DEBUG_PAINT - wxLogDebug("--- GetDateCoord: (%s) = (%i, %i) ---", date.Format("%d %m %Y"), *day, *week); -#endif - - return retval; -} - -// ---------------------------------------------------------------------------- -// mouse handling -// ---------------------------------------------------------------------------- - -void wxGenericCalendarCtrl::OnDClick(wxMouseEvent& event) -{ - wxDateTime date; - switch ( HitTest(event.GetPosition(), &date) ) - { - case wxCAL_HITTEST_DAY: - GenerateEvent(wxEVT_CALENDAR_DOUBLECLICKED); - break; - - case wxCAL_HITTEST_DECMONTH: - case wxCAL_HITTEST_INCMONTH: - // Consecutive simple clicks result in a series of simple and - // double click events, so handle them in the same way. - SetDateAndNotify(date); - break; - - case wxCAL_HITTEST_WEEK: - case wxCAL_HITTEST_HEADER: - case wxCAL_HITTEST_SURROUNDING_WEEK: - case wxCAL_HITTEST_NOWHERE: - event.Skip(); - break; - } -} - -void wxGenericCalendarCtrl::OnClick(wxMouseEvent& event) -{ - wxDateTime date; - wxDateTime::WeekDay wday; - switch ( HitTest(event.GetPosition(), &date, &wday) ) - { - case wxCAL_HITTEST_DAY: - if ( IsDateInRange(date) ) - { - ChangeDay(date); - - GenerateEvent(wxEVT_CALENDAR_SEL_CHANGED); - - // we know that the month/year never change when the user - // clicks on the control so there is no need to call - // GenerateAllChangeEvents() here, we know which event to send - GenerateEvent(wxEVT_CALENDAR_DAY_CHANGED); - } - break; - - case wxCAL_HITTEST_WEEK: - { - wxCalendarEvent send( this, date, wxEVT_CALENDAR_WEEK_CLICKED ); - HandleWindowEvent( send ); - } - break; - - case wxCAL_HITTEST_HEADER: - { - wxCalendarEvent eventWd(this, GetDate(), - wxEVT_CALENDAR_WEEKDAY_CLICKED); - eventWd.SetWeekDay(wday); - (void)GetEventHandler()->ProcessEvent(eventWd); - } - break; - - case wxCAL_HITTEST_DECMONTH: - case wxCAL_HITTEST_INCMONTH: - case wxCAL_HITTEST_SURROUNDING_WEEK: - SetDateAndNotify(date); // we probably only want to refresh the control. No notification.. (maybe as an option?) - break; - - default: - wxFAIL_MSG(wxT("unknown hittest code")); - wxFALLTHROUGH; - - case wxCAL_HITTEST_NOWHERE: - event.Skip(); - break; - } - - // as we don't (always) skip the message, we're not going to receive the - // focus on click by default if we don't do it ourselves - SetFocus(); -} - -wxCalendarHitTestResult wxGenericCalendarCtrl::HitTest(const wxPoint& pos, - wxDateTime *date, - wxDateTime::WeekDay *wd) -{ - RecalcGeometry(); - - // the position where the calendar really begins - wxCoord x0 = m_calendarWeekWidth; - - if ( HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) ) - { - // Header: month - - // we need to find out if the hit is on left arrow, on month or on right arrow - // left arrow? - if ( m_leftArrowRect.Contains(pos) ) - { - if ( date ) - { - if ( IsDateInRange(m_date - wxDateSpan::Month()) ) - { - *date = m_date - wxDateSpan::Month(); - } - else - { - *date = GetLowerDateLimit(); - } - } - - return wxCAL_HITTEST_DECMONTH; - } - - if ( m_rightArrowRect.Contains(pos) ) - { - if ( date ) - { - if ( IsDateInRange(m_date + wxDateSpan::Month()) ) - { - *date = m_date + wxDateSpan::Month(); - } - else - { - *date = GetUpperDateLimit(); - } - } - - return wxCAL_HITTEST_INCMONTH; - } - } - - if ( pos.x - x0 < 0 ) - { - if ( pos.x >= 0 && pos.y > m_rowOffset + m_heightRow && pos.y <= m_rowOffset + m_heightRow * 7 ) - { - if ( date ) - { - *date = GetStartDate(); - *date += wxDateSpan::Week() * (( pos.y - m_rowOffset ) / m_heightRow - 1 ); - } - if ( wd ) - *wd = GetWeekStart(); - return wxCAL_HITTEST_WEEK; - } - else // early exit -> the rest of the function checks for clicks on days - return wxCAL_HITTEST_NOWHERE; - } - - // header: week days - int wday = (pos.x - x0) / m_widthCol; - if ( wday > 6 ) - return wxCAL_HITTEST_NOWHERE; - if ( pos.y < (m_heightRow + m_rowOffset)) - { - if ( pos.y > m_rowOffset ) - { - if ( wd ) - { - if ( HasFlag(wxCAL_MONDAY_FIRST) ) - { - wday = wday == 6 ? 0 : wday + 1; - } - - *wd = (wxDateTime::WeekDay)wday; - } - - return wxCAL_HITTEST_HEADER; - } - else - { - return wxCAL_HITTEST_NOWHERE; - } - } - - int week = (pos.y - (m_heightRow + m_rowOffset)) / m_heightRow; - if ( week >= 6 || wday >= 7 ) - { - return wxCAL_HITTEST_NOWHERE; - } - - wxDateTime dt = GetStartDate() + wxDateSpan::Days(7*week + wday); - - if ( IsDateShown(dt) ) - { - if ( date ) - *date = dt; - - if ( dt.GetMonth() == m_date.GetMonth() ) - { - - return wxCAL_HITTEST_DAY; - } - else - { - return wxCAL_HITTEST_SURROUNDING_WEEK; - } - } - else - { - return wxCAL_HITTEST_NOWHERE; - } -} - -void wxGenericCalendarCtrl::OnWheel(wxMouseEvent& event) -{ - wxDateSpan span; - switch ( event.GetWheelAxis() ) - { - case wxMOUSE_WHEEL_VERTICAL: - // For consistency with the native controls, scrolling upwards - // should go to the past, even if the rotation is positive and - // could be normally expected to increase the date. - span = -wxDateSpan::Month(); - break; - - case wxMOUSE_WHEEL_HORIZONTAL: - span = wxDateSpan::Year(); - break; - } - - // Currently we only take into account the rotation direction, not its - // magnitude. - if ( event.GetWheelRotation() < 0 ) - span = -span; - - SetDateAndNotify(m_date + span); -} - -// ---------------------------------------------------------------------------- -// subcontrols events handling -// ---------------------------------------------------------------------------- - -void wxGenericCalendarCtrl::OnMonthChange(wxCommandEvent& event) -{ - wxDateTime::Tm tm = m_date.GetTm(); - - wxDateTime::Month mon = (wxDateTime::Month)event.GetInt(); - if ( tm.mday > wxDateTime::GetNumberOfDays(mon, tm.year) ) - { - tm.mday = wxDateTime::GetNumberOfDays(mon, tm.year); - } - - wxDateTime dt(tm.mday, mon, tm.year); - if ( AdjustDateToRange(&dt) ) - { - // The date must have been changed to ensure it's in valid range, - // reflect this in the month choice control. - m_comboMonth->SetSelection(dt.GetMonth()); - } - - SetDateAndNotify(dt); -} - -void wxGenericCalendarCtrl::HandleYearChange(wxCommandEvent& event) -{ - int year = (int)event.GetInt(); - if ( year == INT_MIN ) - { - // invalid year in the spin control, ignore it - return; - } - - wxDateTime::Tm tm = m_date.GetTm(); - - if ( tm.mday > wxDateTime::GetNumberOfDays(tm.mon, year) ) - { - tm.mday = wxDateTime::GetNumberOfDays(tm.mon, year); - } - - wxDateTime dt(tm.mday, tm.mon, year); - if ( AdjustDateToRange(&dt) ) - { - // As above, if the date was changed to keep it in valid range, its - // possibly changed year must be shown in the GUI. - m_spinYear->SetValue(dt.GetYear()); - } - - SetDateAndNotify(dt); -} - -void wxGenericCalendarCtrl::OnYearChange(wxSpinEvent& event) -{ - HandleYearChange( event ); -} - -void wxGenericCalendarCtrl::OnYearTextChange(wxCommandEvent& event) -{ - SetUserChangedYear(); - HandleYearChange(event); -} - -// Responds to colour changes, and passes event on to children. -void wxGenericCalendarCtrl::OnSysColourChanged(wxSysColourChangedEvent& event) -{ - // reinit colours - InitColours(); - - // Propagate the event to the children - wxControl::OnSysColourChanged(event); - - // Redraw control area - SetBackgroundColour(m_colBackground); - Refresh(); -} - -// ---------------------------------------------------------------------------- -// keyboard interface -// ---------------------------------------------------------------------------- - -void wxGenericCalendarCtrl::OnChar(wxKeyEvent& event) -{ - switch ( event.GetKeyCode() ) - { - case wxT('+'): - case WXK_ADD: - SetDateAndNotify(m_date + wxDateSpan::Year()); - break; - - case wxT('-'): - case WXK_SUBTRACT: - SetDateAndNotify(m_date - wxDateSpan::Year()); - break; - - case WXK_PAGEUP: - SetDateAndNotify(m_date - wxDateSpan::Month()); - break; - - case WXK_PAGEDOWN: - SetDateAndNotify(m_date + wxDateSpan::Month()); - break; - - case WXK_RIGHT: - if ( event.ControlDown() ) - { - wxDateTime target = m_date.SetToNextWeekDay(GetWeekEnd()); - AdjustDateToRange(&target); - SetDateAndNotify(target); - } - else - SetDateAndNotify(m_date + wxDateSpan::Day()); - break; - - case WXK_LEFT: - if ( event.ControlDown() ) - { - wxDateTime target = m_date.SetToPrevWeekDay(GetWeekStart()); - AdjustDateToRange(&target); - SetDateAndNotify(target); - } - else - SetDateAndNotify(m_date - wxDateSpan::Day()); - break; - - case WXK_UP: - SetDateAndNotify(m_date - wxDateSpan::Week()); - break; - - case WXK_DOWN: - SetDateAndNotify(m_date + wxDateSpan::Week()); - break; - - case WXK_HOME: - if ( event.ControlDown() ) - SetDateAndNotify(wxDateTime::Today()); - else - SetDateAndNotify(wxDateTime(1, m_date.GetMonth(), m_date.GetYear())); - break; - - case WXK_END: - SetDateAndNotify(wxDateTime(m_date).SetToLastMonthDay()); - break; - - case WXK_RETURN: - GenerateEvent(wxEVT_CALENDAR_DOUBLECLICKED); - break; - - default: - event.Skip(); - } -} - -// ---------------------------------------------------------------------------- -// holidays handling -// ---------------------------------------------------------------------------- - -void wxGenericCalendarCtrl::SetHoliday(size_t day) -{ - wxCHECK_RET( day > 0 && day < 32, wxT("invalid day in SetHoliday") ); - - wxCalendarDateAttr *attr = GetAttr(day); - if ( !attr ) - { - attr = new wxCalendarDateAttr; - } - - attr->SetHoliday(true); - - // can't use SetAttr() because it would delete this pointer - m_attrs[day - 1] = attr; -} - -void wxGenericCalendarCtrl::ResetHolidayAttrs() -{ - for ( size_t day = 0; day < 31; day++ ) - { - if ( m_attrs[day] ) - { - m_attrs[day]->SetHoliday(false); - } - } -} - -void wxGenericCalendarCtrl::Mark(size_t day, bool mark) -{ - wxCHECK_RET( day > 0 && day < 32, wxT("invalid day in Mark") ); - - const wxCalendarDateAttr& m = wxCalendarDateAttr::GetMark(); - if (mark) { - if ( m_attrs[day - 1] ) - AddAttr(m_attrs[day - 1], m); - else - SetAttr(day, new wxCalendarDateAttr(m)); - } - else { - if ( m_attrs[day - 1] ) - DelAttr(m_attrs[day - 1], m); - } -} - -//static -wxVisualAttributes -wxGenericCalendarCtrl::GetClassDefaultAttributes(wxWindowVariant variant) -{ - // Use the same color scheme as wxListBox - return wxListBox::GetClassDefaultAttributes(variant); -} - -#endif // wxUSE_CALENDARCTRL diff --git a/Externals/wxWidgets3/src/generic/caret.cpp b/Externals/wxWidgets3/src/generic/caret.cpp deleted file mode 100644 index 0f5aa7ac51..0000000000 --- a/Externals/wxWidgets3/src/generic/caret.cpp +++ /dev/null @@ -1,298 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/generic/caret.cpp -// Purpose: generic wxCaret class implementation -// Author: Vadim Zeitlin (original code by Robert Roebling) -// Modified by: -// Created: 25.05.99 -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_CARET - -#ifndef WX_PRECOMP - #include "wx/window.h" - #include "wx/dcclient.h" - #include "wx/dcmemory.h" -#endif //WX_PRECOMP - -#include "wx/caret.h" - -// ---------------------------------------------------------------------------- -// global variables for this module -// ---------------------------------------------------------------------------- - -// the blink time (common to all carets for MSW compatibility) -static int gs_blinkTime = 500; // in milliseconds - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// timer stuff -// ---------------------------------------------------------------------------- - -wxCaretTimer::wxCaretTimer(wxCaret *caret) -{ - m_caret = caret; -} - -void wxCaretTimer::Notify() -{ - m_caret->OnTimer(); -} - -void wxCaret::OnTimer() -{ - // don't blink the caret when we don't have the focus - if ( m_hasFocus ) - Blink(); -} - -// ---------------------------------------------------------------------------- -// wxCaret static functions and data -// ---------------------------------------------------------------------------- - -int wxCaretBase::GetBlinkTime() -{ - return gs_blinkTime; -} - -void wxCaretBase::SetBlinkTime(int milliseconds) -{ - gs_blinkTime = milliseconds; - -#ifdef _WXGTK__ - GtkSettings *settings = gtk_settings_get_default(); - if (millseconds == 0) - { - gtk_settings_set_long_property(settings, "gtk-cursor-blink", gtk_false, NULL); - } - else - { - gtk_settings_set_long_property(settings, "gtk-cursor-blink", gtk_true, NULL); - gtk_settings_set_long_property(settings, "gtk-cursor-time", milliseconds, NULL); - } -#endif -} - -// ---------------------------------------------------------------------------- -// initialization and destruction -// ---------------------------------------------------------------------------- - -void wxCaret::InitGeneric() -{ - m_hasFocus = true; - m_blinkedOut = true; -#ifndef wxHAS_CARET_USING_OVERLAYS - m_xOld = - m_yOld = -1; - m_bmpUnderCaret.Create(m_width, m_height); -#endif -} - -wxCaret::~wxCaret() -{ - if ( IsVisible() ) - { - // stop blinking - if ( m_timer.IsRunning() ) - m_timer.Stop(); - } -} - -// ---------------------------------------------------------------------------- -// showing/hiding/moving the caret (base class interface) -// ---------------------------------------------------------------------------- - -void wxCaret::DoShow() -{ - int blinkTime = GetBlinkTime(); - if ( blinkTime ) - m_timer.Start(blinkTime); - - if ( m_blinkedOut ) - Blink(); -} - -void wxCaret::DoHide() -{ - m_timer.Stop(); - - if ( !m_blinkedOut ) - { - Blink(); - } -} - -void wxCaret::DoMove() -{ -#ifdef wxHAS_CARET_USING_OVERLAYS - m_overlay.Reset(); -#endif - if ( IsVisible() ) - { - if ( !m_blinkedOut ) - { - // hide it right now and it will be shown the next time it blinks - Blink(); - - // but if the caret is not blinking, we should blink it back into - // visibility manually - if ( !m_timer.IsRunning() ) - Blink(); - } - } - //else: will be shown at the correct location when it is shown -} - -void wxCaret::DoSize() -{ - int countVisible = m_countVisible; - if (countVisible > 0) - { - m_countVisible = 0; - DoHide(); - } -#ifdef wxHAS_CARET_USING_OVERLAYS - m_overlay.Reset(); -#else - // Change bitmap size - m_bmpUnderCaret = wxBitmap(m_width, m_height); -#endif - if (countVisible > 0) - { - m_countVisible = countVisible; - DoShow(); - } -} - -// ---------------------------------------------------------------------------- -// handling the focus -// ---------------------------------------------------------------------------- - -void wxCaret::OnSetFocus() -{ - m_hasFocus = true; - - if ( IsVisible() ) - Refresh(); -} - -void wxCaret::OnKillFocus() -{ - m_hasFocus = false; - - if ( IsVisible() ) - { - // the caret must be shown - otherwise, if it is hidden now, it will - // stay so until the focus doesn't return because it won't blink any - // more - - // hide it first if it isn't hidden ... - if ( !m_blinkedOut ) - Blink(); - - // .. and show it in the new style - Blink(); - } -} - -// ---------------------------------------------------------------------------- -// drawing the caret -// ---------------------------------------------------------------------------- - -void wxCaret::Blink() -{ - m_blinkedOut = !m_blinkedOut; - - Refresh(); -} - -void wxCaret::Refresh() -{ - wxClientDC dcWin(GetWindow()); -// this is the new code, switch to 0 if this gives problems -#ifdef wxHAS_CARET_USING_OVERLAYS - wxDCOverlay dcOverlay( m_overlay, &dcWin, m_x, m_y, m_width , m_height ); - if ( m_blinkedOut ) - { - dcOverlay.Clear(); - } - else - { - DoDraw( &dcWin, GetWindow() ); - } -#else - wxMemoryDC dcMem; - dcMem.SelectObject(m_bmpUnderCaret); - if ( m_blinkedOut ) - { - // restore the old image - dcWin.Blit(m_xOld, m_yOld, m_width, m_height, - &dcMem, 0, 0); - m_xOld = - m_yOld = -1; - } - else - { - if ( m_xOld == -1 && m_yOld == -1 ) - { - // save the part we're going to overdraw - dcMem.Blit(0, 0, m_width, m_height, - &dcWin, m_x, m_y); - - m_xOld = m_x; - m_yOld = m_y; - } - //else: we already saved the image below the caret, don't do it any - // more - - // and draw the caret there - DoDraw(&dcWin, GetWindow()); - } -#endif -} - -void wxCaret::DoDraw(wxDC *dc, wxWindow* win) -{ - wxPen pen(*wxBLACK_PEN); - wxBrush brush(*wxBLACK_BRUSH); - if (win) - { - wxColour backgroundColour(win->GetBackgroundColour()); - if (backgroundColour.Red() < 100 && - backgroundColour.Green() < 100 && - backgroundColour.Blue() < 100) - { - pen = *wxWHITE_PEN; - brush = *wxWHITE_BRUSH; - } - } - dc->SetPen( pen ); - dc->SetBrush(m_hasFocus ? brush : *wxTRANSPARENT_BRUSH); - - // VZ: unfortunately, the rectangle comes out a pixel smaller when this is - // done under wxGTK - no idea why - //dc->SetLogicalFunction(wxINVERT); - - dc->DrawRectangle(m_x, m_y, m_width, m_height); -} - -#endif // wxUSE_CARET diff --git a/Externals/wxWidgets3/src/generic/choicbkg.cpp b/Externals/wxWidgets3/src/generic/choicbkg.cpp deleted file mode 100644 index 06dfcd5140..0000000000 --- a/Externals/wxWidgets3/src/generic/choicbkg.cpp +++ /dev/null @@ -1,251 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/generic/choicbkg.cpp -// Purpose: generic implementation of wxChoicebook -// Author: Vadim Zeitlin -// Modified by: Wlodzimierz ABX Skiba from generic/listbkg.cpp -// Created: 15.09.04 -// Copyright: (c) Vadim Zeitlin, Wlodzimierz Skiba -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_CHOICEBOOK - -#include "wx/choicebk.h" - -#ifndef WX_PRECOMP - #include "wx/settings.h" - #include "wx/choice.h" - #include "wx/sizer.h" -#endif - -#include "wx/imaglist.h" - -// ---------------------------------------------------------------------------- -// event table -// ---------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxChoicebook, wxBookCtrlBase); - -wxDEFINE_EVENT( wxEVT_CHOICEBOOK_PAGE_CHANGING, wxBookCtrlEvent ); -wxDEFINE_EVENT( wxEVT_CHOICEBOOK_PAGE_CHANGED, wxBookCtrlEvent ); - -wxBEGIN_EVENT_TABLE(wxChoicebook, wxBookCtrlBase) - EVT_CHOICE(wxID_ANY, wxChoicebook::OnChoiceSelected) -wxEND_EVENT_TABLE() - -// ============================================================================ -// wxChoicebook implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxChoicebook creation -// ---------------------------------------------------------------------------- - -bool -wxChoicebook::Create(wxWindow *parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) -{ - if ( (style & wxBK_ALIGN_MASK) == wxBK_DEFAULT ) - { - style |= wxBK_TOP; - } - - // no border for this control, it doesn't look nice together with - // wxChoice border - style &= ~wxBORDER_MASK; - style |= wxBORDER_NONE; - - if ( !wxControl::Create(parent, id, pos, size, style, - wxDefaultValidator, name) ) - return false; - - m_bookctrl = new wxChoice - ( - this, - wxID_ANY, - wxDefaultPosition, - wxDefaultSize - ); - - wxSizer* mainSizer = new wxBoxSizer(IsVertical() ? wxVERTICAL : wxHORIZONTAL); - - if (style & wxBK_RIGHT || style & wxBK_BOTTOM) - mainSizer->Add(0, 0, 1, wxEXPAND, 0); - - m_controlSizer = new wxBoxSizer(IsVertical() ? wxHORIZONTAL : wxVERTICAL); - m_controlSizer->Add(m_bookctrl, wxSizerFlags(1).Expand()); - wxSizerFlags flags; - if ( IsVertical() ) - flags.Expand(); - else - flags.CentreVertical(); - mainSizer->Add(m_controlSizer, flags.Border(wxALL, m_controlMargin)); - SetSizer(mainSizer); - return true; -} - -// ---------------------------------------------------------------------------- -// accessing the pages -// ---------------------------------------------------------------------------- - -bool wxChoicebook::SetPageText(size_t n, const wxString& strText) -{ - GetChoiceCtrl()->SetString(n, strText); - - return true; -} - -wxString wxChoicebook::GetPageText(size_t n) const -{ - return GetChoiceCtrl()->GetString(n); -} - -int wxChoicebook::GetPageImage(size_t WXUNUSED(n)) const -{ - return wxNOT_FOUND; -} - -bool wxChoicebook::SetPageImage(size_t WXUNUSED(n), int WXUNUSED(imageId)) -{ - // fail silently, the code may be written to use one of several book - // classes and call SetPageImage() unconditionally, it's better to just - // ignore it (which is the best we can do short of rewriting this class to - // use wxBitmapComboBox anyhow) than complain loudly about a rather - // harmless problem - - return false; -} - -// ---------------------------------------------------------------------------- -// miscellaneous other stuff -// ---------------------------------------------------------------------------- - -void wxChoicebook::DoSetWindowVariant(wxWindowVariant variant) -{ - wxBookCtrlBase::DoSetWindowVariant(variant); - if (m_bookctrl) - m_bookctrl->SetWindowVariant(variant); -} - -void wxChoicebook::SetImageList(wxImageList *imageList) -{ - // TODO: can be implemented in form of static bitmap near choice control - - wxBookCtrlBase::SetImageList(imageList); -} - -// ---------------------------------------------------------------------------- -// selection -// ---------------------------------------------------------------------------- - -wxBookCtrlEvent* wxChoicebook::CreatePageChangingEvent() const -{ - return new wxBookCtrlEvent(wxEVT_CHOICEBOOK_PAGE_CHANGING, m_windowId); -} - -void wxChoicebook::MakeChangedEvent(wxBookCtrlEvent &event) -{ - event.SetEventType(wxEVT_CHOICEBOOK_PAGE_CHANGED); -} - -// ---------------------------------------------------------------------------- -// adding/removing the pages -// ---------------------------------------------------------------------------- - -bool -wxChoicebook::InsertPage(size_t n, - wxWindow *page, - const wxString& text, - bool bSelect, - int imageId) -{ - if ( !wxBookCtrlBase::InsertPage(n, page, text, bSelect, imageId) ) - return false; - - GetChoiceCtrl()->Insert(text, n); - - // if the inserted page is before the selected one, we must update the - // index of the selected page - if ( int(n) <= m_selection ) - { - // one extra page added - m_selection++; - GetChoiceCtrl()->Select(m_selection); - } - - if ( !DoSetSelectionAfterInsertion(n, bSelect) ) - page->Hide(); - - return true; -} - -wxWindow *wxChoicebook::DoRemovePage(size_t page) -{ - wxWindow *win = wxBookCtrlBase::DoRemovePage(page); - - if ( win ) - { - GetChoiceCtrl()->Delete(page); - - DoSetSelectionAfterRemoval(page); - } - - return win; -} - - -bool wxChoicebook::DeleteAllPages() -{ - GetChoiceCtrl()->Clear(); - return wxBookCtrlBase::DeleteAllPages(); -} - -// ---------------------------------------------------------------------------- -// wxChoicebook events -// ---------------------------------------------------------------------------- - -void wxChoicebook::OnChoiceSelected(wxCommandEvent& eventChoice) -{ - if ( eventChoice.GetEventObject() != m_bookctrl ) - { - eventChoice.Skip(); - return; - } - - const int selNew = eventChoice.GetSelection(); - - if ( selNew == m_selection ) - { - // this event can only come from our own Select(m_selection) below - // which we call when the page change is vetoed, so we should simply - // ignore it - return; - } - - SetSelection(selNew); - - // change wasn't allowed, return to previous state - if (m_selection != selNew) - GetChoiceCtrl()->Select(m_selection); -} - -#endif // wxUSE_CHOICEBOOK diff --git a/Externals/wxWidgets3/src/generic/choicdgg.cpp b/Externals/wxWidgets3/src/generic/choicdgg.cpp deleted file mode 100644 index 9075821e5f..0000000000 --- a/Externals/wxWidgets3/src/generic/choicdgg.cpp +++ /dev/null @@ -1,613 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/generic/choicdgg.cpp -// Purpose: Choice dialogs -// Author: Julian Smart -// Modified by: 03.11.00: VZ to add wxArrayString and multiple sel functions -// Created: 04/01/98 -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_CHOICEDLG - -#ifndef WX_PRECOMP - #include - #include "wx/utils.h" - #include "wx/dialog.h" - #include "wx/button.h" - #include "wx/listbox.h" - #include "wx/checklst.h" - #include "wx/stattext.h" - #include "wx/intl.h" - #include "wx/sizer.h" - #include "wx/arrstr.h" -#endif - -#include "wx/statline.h" -#include "wx/settings.h" -#include "wx/generic/choicdgg.h" - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -#define wxID_LISTBOX 3000 - -// ---------------------------------------------------------------------------- -// private functions -// ---------------------------------------------------------------------------- - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wrapper functions -// ---------------------------------------------------------------------------- - -wxString wxGetSingleChoice( const wxString& message, - const wxString& caption, - int n, const wxString *choices, - wxWindow *parent, - int WXUNUSED(x), int WXUNUSED(y), - bool WXUNUSED(centre), - int WXUNUSED(width), int WXUNUSED(height), - int initialSelection) -{ - wxSingleChoiceDialog dialog(parent, message, caption, n, choices); - - dialog.SetSelection(initialSelection); - return dialog.ShowModal() == wxID_OK ? dialog.GetStringSelection() : wxString(); -} - -wxString wxGetSingleChoice( const wxString& message, - const wxString& caption, - const wxArrayString& choices, - wxWindow *parent, - int WXUNUSED(x), int WXUNUSED(y), - bool WXUNUSED(centre), - int WXUNUSED(width), int WXUNUSED(height), - int initialSelection) -{ - wxSingleChoiceDialog dialog(parent, message, caption, choices); - - dialog.SetSelection(initialSelection); - return dialog.ShowModal() == wxID_OK ? dialog.GetStringSelection() : wxString(); -} - -wxString wxGetSingleChoice( const wxString& message, - const wxString& caption, - const wxArrayString& choices, - int initialSelection, - wxWindow *parent) -{ - return wxGetSingleChoice(message, caption, choices, parent, - wxDefaultCoord, wxDefaultCoord, - true, wxCHOICE_WIDTH, wxCHOICE_HEIGHT, - initialSelection); -} - -wxString wxGetSingleChoice( const wxString& message, - const wxString& caption, - int n, const wxString *choices, - int initialSelection, - wxWindow *parent) -{ - return wxGetSingleChoice(message, caption, n, choices, parent, - wxDefaultCoord, wxDefaultCoord, - true, wxCHOICE_WIDTH, wxCHOICE_HEIGHT, - initialSelection); -} - -int wxGetSingleChoiceIndex( const wxString& message, - const wxString& caption, - int n, const wxString *choices, - wxWindow *parent, - int WXUNUSED(x), int WXUNUSED(y), - bool WXUNUSED(centre), - int WXUNUSED(width), int WXUNUSED(height), - int initialSelection) -{ - wxSingleChoiceDialog dialog(parent, message, caption, n, choices); - - dialog.SetSelection(initialSelection); - return dialog.ShowModal() == wxID_OK ? dialog.GetSelection() : -1; -} - -int wxGetSingleChoiceIndex( const wxString& message, - const wxString& caption, - const wxArrayString& choices, - wxWindow *parent, - int WXUNUSED(x), int WXUNUSED(y), - bool WXUNUSED(centre), - int WXUNUSED(width), int WXUNUSED(height), - int initialSelection) -{ - wxSingleChoiceDialog dialog(parent, message, caption, choices); - - dialog.SetSelection(initialSelection); - return dialog.ShowModal() == wxID_OK ? dialog.GetSelection() : -1; -} - -int wxGetSingleChoiceIndex( const wxString& message, - const wxString& caption, - const wxArrayString& choices, - int initialSelection, - wxWindow *parent) -{ - return wxGetSingleChoiceIndex(message, caption, choices, parent, - wxDefaultCoord, wxDefaultCoord, - true, wxCHOICE_WIDTH, wxCHOICE_HEIGHT, - initialSelection); -} - - -int wxGetSingleChoiceIndex( const wxString& message, - const wxString& caption, - int n, const wxString *choices, - int initialSelection, - wxWindow *parent) -{ - return wxGetSingleChoiceIndex(message, caption, n, choices, parent, - wxDefaultCoord, wxDefaultCoord, - true, wxCHOICE_WIDTH, wxCHOICE_HEIGHT, - initialSelection); -} - - -void *wxGetSingleChoiceData( const wxString& message, - const wxString& caption, - int n, const wxString *choices, - void **client_data, - wxWindow *parent, - int WXUNUSED(x), int WXUNUSED(y), - bool WXUNUSED(centre), - int WXUNUSED(width), int WXUNUSED(height), - int initialSelection) -{ - wxSingleChoiceDialog dialog(parent, message, caption, n, choices, - client_data); - - dialog.SetSelection(initialSelection); - return dialog.ShowModal() == wxID_OK ? dialog.GetSelectionData() : NULL; -} - -void *wxGetSingleChoiceData( const wxString& message, - const wxString& caption, - const wxArrayString& choices, - void **client_data, - wxWindow *parent, - int WXUNUSED(x), int WXUNUSED(y), - bool WXUNUSED(centre), - int WXUNUSED(width), int WXUNUSED(height), - int initialSelection) -{ - wxSingleChoiceDialog dialog(parent, message, caption, choices, client_data); - - dialog.SetSelection(initialSelection); - return dialog.ShowModal() == wxID_OK ? dialog.GetSelectionData() : NULL; -} - -void* wxGetSingleChoiceData( const wxString& message, - const wxString& caption, - const wxArrayString& choices, - void **client_data, - int initialSelection, - wxWindow *parent) -{ - return wxGetSingleChoiceData(message, caption, choices, - client_data, parent, - wxDefaultCoord, wxDefaultCoord, - true, wxCHOICE_WIDTH, wxCHOICE_HEIGHT, - initialSelection); -} - -void* wxGetSingleChoiceData( const wxString& message, - const wxString& caption, - int n, const wxString *choices, - void **client_data, - int initialSelection, - wxWindow *parent) -{ - return wxGetSingleChoiceData(message, caption, n, choices, - client_data, parent, - wxDefaultCoord, wxDefaultCoord, - true, wxCHOICE_WIDTH, wxCHOICE_HEIGHT, - initialSelection); -} - - -int wxGetSelectedChoices(wxArrayInt& selections, - const wxString& message, - const wxString& caption, - int n, const wxString *choices, - wxWindow *parent, - int WXUNUSED(x), int WXUNUSED(y), - bool WXUNUSED(centre), - int WXUNUSED(width), int WXUNUSED(height)) -{ - wxMultiChoiceDialog dialog(parent, message, caption, n, choices); - - // call this even if selections array is empty and this then (correctly) - // deselects the first item which is selected by default - dialog.SetSelections(selections); - - if ( dialog.ShowModal() != wxID_OK ) - { - // NB: intentionally do not clear the selections array here, the caller - // might want to preserve its original contents if the dialog was - // cancelled - return -1; - } - - selections = dialog.GetSelections(); - return static_cast(selections.GetCount()); -} - -int wxGetSelectedChoices(wxArrayInt& selections, - const wxString& message, - const wxString& caption, - const wxArrayString& choices, - wxWindow *parent, - int WXUNUSED(x), int WXUNUSED(y), - bool WXUNUSED(centre), - int WXUNUSED(width), int WXUNUSED(height)) -{ - wxMultiChoiceDialog dialog(parent, message, caption, choices); - - // call this even if selections array is empty and this then (correctly) - // deselects the first item which is selected by default - dialog.SetSelections(selections); - - if ( dialog.ShowModal() != wxID_OK ) - { - // NB: intentionally do not clear the selections array here, the caller - // might want to preserve its original contents if the dialog was - // cancelled - return -1; - } - - selections = dialog.GetSelections(); - return static_cast(selections.GetCount()); -} - -#if WXWIN_COMPATIBILITY_2_8 -size_t wxGetMultipleChoices(wxArrayInt& selections, - const wxString& message, - const wxString& caption, - int n, const wxString *choices, - wxWindow *parent, - int x, int y, - bool centre, - int width, int height) -{ - int rc = wxGetSelectedChoices(selections, message, caption, - n, choices, - parent, x, y, centre, width, height); - if ( rc == -1 ) - { - selections.clear(); - return 0; - } - - return rc; -} - -size_t wxGetMultipleChoices(wxArrayInt& selections, - const wxString& message, - const wxString& caption, - const wxArrayString& aChoices, - wxWindow *parent, - int x, int y, - bool centre, - int width, int height) -{ - int rc = wxGetSelectedChoices(selections, message, caption, - aChoices, - parent, x, y, centre, width, height); - if ( rc == -1 ) - { - selections.clear(); - return 0; - } - - return rc; -} -#endif // WXWIN_COMPATIBILITY_2_8 - -// ---------------------------------------------------------------------------- -// wxAnyChoiceDialog -// ---------------------------------------------------------------------------- - -bool wxAnyChoiceDialog::Create(wxWindow *parent, - const wxString& message, - const wxString& caption, - int n, const wxString *choices, - long styleDlg, - const wxPoint& pos, - long styleLbox) -{ - // extract the buttons styles from the dialog one and remove them from it - const long styleBtns = styleDlg & (wxOK | wxCANCEL); - styleDlg &= ~styleBtns; - - if ( !wxDialog::Create(GetParentForModalDialog(parent, styleDlg), wxID_ANY, caption, pos, wxDefaultSize, styleDlg) ) - return false; - - wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL ); - - // 1) text message - topsizer-> - Add(CreateTextSizer(message), wxSizerFlags().Expand().TripleBorder()); - - // 2) list box - m_listbox = CreateList(n, choices, styleLbox); - - if ( n > 0 ) - m_listbox->SetSelection(0); - - topsizer-> - Add(m_listbox, wxSizerFlags().Expand().Proportion(1).TripleBorder(wxLEFT | wxRIGHT)); - - // 3) buttons if any - wxSizer * - buttonSizer = CreateSeparatedButtonSizer(styleBtns); - if ( buttonSizer ) - { - topsizer->Add(buttonSizer, wxSizerFlags().Expand().DoubleBorder()); - } - - SetSizer( topsizer ); - - topsizer->SetSizeHints( this ); - topsizer->Fit( this ); - - if ( styleDlg & wxCENTRE ) - Centre(wxBOTH); - - m_listbox->SetFocus(); - - return true; -} - -bool wxAnyChoiceDialog::Create(wxWindow *parent, - const wxString& message, - const wxString& caption, - const wxArrayString& choices, - long styleDlg, - const wxPoint& pos, - long styleLbox) -{ - wxCArrayString chs(choices); - return Create(parent, message, caption, chs.GetCount(), chs.GetStrings(), - styleDlg, pos, styleLbox); -} - -wxListBoxBase *wxAnyChoiceDialog::CreateList(int n, const wxString *choices, long styleLbox) -{ - return new wxListBox( this, wxID_LISTBOX, - wxDefaultPosition, wxDefaultSize, - n, choices, - styleLbox ); -} - -// ---------------------------------------------------------------------------- -// wxSingleChoiceDialog -// ---------------------------------------------------------------------------- - -wxBEGIN_EVENT_TABLE(wxSingleChoiceDialog, wxDialog) - EVT_BUTTON(wxID_OK, wxSingleChoiceDialog::OnOK) - EVT_LISTBOX_DCLICK(wxID_LISTBOX, wxSingleChoiceDialog::OnListBoxDClick) -wxEND_EVENT_TABLE() - -wxIMPLEMENT_DYNAMIC_CLASS(wxSingleChoiceDialog, wxDialog); - -bool wxSingleChoiceDialog::Create( wxWindow *parent, - const wxString& message, - const wxString& caption, - int n, - const wxString *choices, - void **clientData, - long style, - const wxPoint& pos ) -{ - if ( !wxAnyChoiceDialog::Create(parent, message, caption, - n, choices, - style, pos) ) - return false; - - m_selection = n > 0 ? 0 : -1; - - if (clientData) - { - for (int i = 0; i < n; i++) - m_listbox->SetClientData(i, clientData[i]); - } - - return true; -} - -bool wxSingleChoiceDialog::Create( wxWindow *parent, - const wxString& message, - const wxString& caption, - const wxArrayString& choices, - void **clientData, - long style, - const wxPoint& pos ) -{ - wxCArrayString chs(choices); - return Create( parent, message, caption, chs.GetCount(), chs.GetStrings(), - clientData, style, pos ); -} - -// Set the selection -void wxSingleChoiceDialog::SetSelection(int sel) -{ - wxCHECK_RET( sel >= 0 && (unsigned)sel < m_listbox->GetCount(), - "Invalid initial selection" ); - - m_listbox->SetSelection(sel); - m_selection = sel; -} - -void wxSingleChoiceDialog::OnOK(wxCommandEvent& WXUNUSED(event)) -{ - DoChoice(); -} - -void wxSingleChoiceDialog::OnListBoxDClick(wxCommandEvent& WXUNUSED(event)) -{ - DoChoice(); -} - -void wxSingleChoiceDialog::DoChoice() -{ - m_selection = m_listbox->GetSelection(); - m_stringSelection = m_listbox->GetStringSelection(); - - if ( m_listbox->HasClientUntypedData() ) - SetClientData(m_listbox->GetClientData(m_selection)); - - EndModal(wxID_OK); -} - -// ---------------------------------------------------------------------------- -// wxMultiChoiceDialog -// ---------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxMultiChoiceDialog, wxDialog); - -bool wxMultiChoiceDialog::Create( wxWindow *parent, - const wxString& message, - const wxString& caption, - int n, - const wxString *choices, - long style, - const wxPoint& pos ) -{ - long styleLbox; -#if wxUSE_CHECKLISTBOX - styleLbox = wxLB_ALWAYS_SB; -#else - styleLbox = wxLB_ALWAYS_SB | wxLB_EXTENDED; -#endif - - if ( !wxAnyChoiceDialog::Create(parent, message, caption, - n, choices, - style, pos, - styleLbox) ) - return false; - - return true; -} - -bool wxMultiChoiceDialog::Create( wxWindow *parent, - const wxString& message, - const wxString& caption, - const wxArrayString& choices, - long style, - const wxPoint& pos ) -{ - wxCArrayString chs(choices); - return Create( parent, message, caption, chs.GetCount(), - chs.GetStrings(), style, pos ); -} - -void wxMultiChoiceDialog::SetSelections(const wxArrayInt& selections) -{ -#if wxUSE_CHECKLISTBOX - wxCheckListBox* checkListBox = wxDynamicCast(m_listbox, wxCheckListBox); - if (checkListBox) - { - // first clear all currently selected items - size_t n, - count = checkListBox->GetCount(); - for ( n = 0; n < count; ++n ) - { - if (checkListBox->IsChecked(n)) - checkListBox->Check(n, false); - } - - // now select the ones which should be selected - count = selections.GetCount(); - for ( n = 0; n < count; n++ ) - { - checkListBox->Check(selections[n]); - } - - return; - } -#endif - - // first clear all currently selected items - size_t n, - count = m_listbox->GetCount(); - for ( n = 0; n < count; ++n ) - { - m_listbox->Deselect(n); - } - - // now select the ones which should be selected - count = selections.GetCount(); - for ( n = 0; n < count; n++ ) - { - m_listbox->Select(selections[n]); - } -} - -bool wxMultiChoiceDialog::TransferDataFromWindow() -{ - m_selections.Empty(); - -#if wxUSE_CHECKLISTBOX - wxCheckListBox* checkListBox = wxDynamicCast(m_listbox, wxCheckListBox); - if (checkListBox) - { - size_t count = checkListBox->GetCount(); - for ( size_t n = 0; n < count; n++ ) - { - if ( checkListBox->IsChecked(n) ) - m_selections.Add(n); - } - return true; - } -#endif - - size_t count = m_listbox->GetCount(); - for ( size_t n = 0; n < count; n++ ) - { - if ( m_listbox->IsSelected(n) ) - m_selections.Add(n); - } - - return true; -} - -#if wxUSE_CHECKLISTBOX - -wxListBoxBase *wxMultiChoiceDialog::CreateList(int n, const wxString *choices, long styleLbox) -{ - return new wxCheckListBox( this, wxID_LISTBOX, - wxDefaultPosition, wxDefaultSize, - n, choices, - styleLbox ); -} - -#endif // wxUSE_CHECKLISTBOX - -#endif // wxUSE_CHOICEDLG diff --git a/Externals/wxWidgets3/src/generic/clrpickerg.cpp b/Externals/wxWidgets3/src/generic/clrpickerg.cpp deleted file mode 100644 index e7df508057..0000000000 --- a/Externals/wxWidgets3/src/generic/clrpickerg.cpp +++ /dev/null @@ -1,138 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/generic/clrpickerg.cpp -// Purpose: wxGenericColourButton class implementation -// Author: Francesco Montorsi (readapted code written by Vadim Zeitlin) -// Modified by: -// Created: 15/04/2006 -// Copyright: (c) Vadim Zeitlin, Francesco Montorsi -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_COLOURPICKERCTRL - -#include "wx/clrpicker.h" -#include "wx/colordlg.h" -#include "wx/dcmemory.h" - - -// ============================================================================ -// implementation -// ============================================================================ - -wxColourData wxGenericColourButton::ms_data; -wxIMPLEMENT_DYNAMIC_CLASS(wxGenericColourButton, wxBitmapButton); - -// ---------------------------------------------------------------------------- -// wxGenericColourButton -// ---------------------------------------------------------------------------- - -bool wxGenericColourButton::Create( wxWindow *parent, wxWindowID id, - const wxColour &col, const wxPoint &pos, - const wxSize &size, long style, - const wxValidator& validator, const wxString &name) -{ - m_bitmap = wxBitmap( 60, 13 ); - - // create this button - if (!wxBitmapButton::Create( parent, id, m_bitmap, pos, - size, style | wxBU_AUTODRAW, validator, name )) - { - wxFAIL_MSG( wxT("wxGenericColourButton creation failed") ); - return false; - } - - // and handle user clicks on it - Connect(GetId(), wxEVT_BUTTON, - wxCommandEventHandler(wxGenericColourButton::OnButtonClick), - NULL, this); - - m_colour = col; - UpdateColour(); - InitColourData(); - - return true; -} - -void wxGenericColourButton::InitColourData() -{ - ms_data.SetChooseFull(true); - unsigned char grey = 0; - for (int i = 0; i < 16; i++, grey += 16) - { - // fill with grey tones the custom colors palette - wxColour colour(grey, grey, grey); - ms_data.SetCustomColour(i, colour); - } -} - -void wxGenericColourButton::OnButtonClick(wxCommandEvent& WXUNUSED(ev)) -{ - // update the wxColouData to be shown in the dialog - ms_data.SetColour(m_colour); - - // create the colour dialog and display it - wxColourDialog dlg(this, &ms_data); - if (dlg.ShowModal() == wxID_OK) - { - ms_data = dlg.GetColourData(); - SetColour(ms_data.GetColour()); - - // fire an event - wxColourPickerEvent event(this, GetId(), m_colour); - GetEventHandler()->ProcessEvent(event); - } -} - -void wxGenericColourButton::UpdateColour() -{ - wxMemoryDC dc(m_bitmap); - dc.SetPen( *wxTRANSPARENT_PEN ); - dc.SetBrush( wxBrush(m_colour) ); - dc.DrawRectangle( 0,0,m_bitmap.GetWidth(),m_bitmap.GetHeight() ); - - if ( HasFlag(wxCLRP_SHOW_LABEL) ) - { - wxColour col( ~m_colour.Red(), ~m_colour.Green(), ~m_colour.Blue() ); - dc.SetTextForeground( col ); - dc.SetFont( GetFont() ); - dc.DrawText( m_colour.GetAsString(wxC2S_HTML_SYNTAX), 0, 0 ); - } - - dc.SelectObject( wxNullBitmap ); - SetBitmapLabel( m_bitmap ); -} - -wxSize wxGenericColourButton::DoGetBestSize() const -{ - wxSize sz(wxBitmapButton::DoGetBestSize()); -#ifdef __WXMAC__ - sz.y += 6; -#else - sz.y += 2; -#endif - sz.x += 30; - if ( HasFlag(wxCLRP_SHOW_LABEL) ) - return sz; - - // if we have no label, then make this button a square - // (like e.g. native GTK version of this control) ??? - // sz.SetWidth(sz.GetHeight()); - return sz; -} - -#endif // wxUSE_COLOURPICKERCTRL diff --git a/Externals/wxWidgets3/src/generic/collheaderctrlg.cpp b/Externals/wxWidgets3/src/generic/collheaderctrlg.cpp deleted file mode 100644 index ac5527a312..0000000000 --- a/Externals/wxWidgets3/src/generic/collheaderctrlg.cpp +++ /dev/null @@ -1,197 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/generic/collheaderctrlg.cpp -// Purpose: Generic wxCollapsibleHeaderCtrl implementation -// Author: Tobias Taschner -// Created: 2015-09-19 -// Copyright: (c) 2015 wxWidgets development team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ -#pragma hdrstop -#endif - -#include "wx/defs.h" - -#if wxUSE_COLLPANE - -#include "wx/collheaderctrl.h" - -#ifndef WX_PRECOMP - #include "wx/dcclient.h" - #include "wx/sizer.h" -#endif // !WX_PRECOMP - -#include "wx/renderer.h" - -// if we have another implementation of this class we should extract -// the lines below to a common file - -const char wxCollapsibleHeaderCtrlNameStr[] = "collapsibleHeader"; - -wxDEFINE_EVENT(wxEVT_COLLAPSIBLEHEADER_CHANGED, wxCommandEvent); - -// ============================================================================ -// implementation -// ============================================================================ - -void wxGenericCollapsibleHeaderCtrl::Init() -{ - m_collapsed = true; - m_inWindow = false; - m_mouseDown = false; -} - -bool wxGenericCollapsibleHeaderCtrl::Create(wxWindow *parent, - wxWindowID id, - const wxString& label, - const wxPoint& pos, - const wxSize& size, - long style, - const wxValidator& validator, - const wxString& name) -{ - if ( !wxCollapsibleHeaderCtrlBase::Create(parent, id, label, pos, size, - style, validator, name) ) - { - return false; - } - - Bind(wxEVT_PAINT, &wxGenericCollapsibleHeaderCtrl::OnPaint, this); - Bind(wxEVT_LEFT_DOWN, &wxGenericCollapsibleHeaderCtrl::OnLeftDown, this); - Bind(wxEVT_LEFT_UP, &wxGenericCollapsibleHeaderCtrl::OnLeftUp, this); - Bind(wxEVT_ENTER_WINDOW, &wxGenericCollapsibleHeaderCtrl::OnEnterWindow, this); - Bind(wxEVT_LEAVE_WINDOW, &wxGenericCollapsibleHeaderCtrl::OnLeaveWindow, this); - Bind(wxEVT_CHAR, &wxGenericCollapsibleHeaderCtrl::OnChar, this); - Bind(wxEVT_SET_FOCUS, &wxGenericCollapsibleHeaderCtrl::OnFocus, this); - Bind(wxEVT_KILL_FOCUS, &wxGenericCollapsibleHeaderCtrl::OnFocus, this); - - return true; -} - -wxSize wxGenericCollapsibleHeaderCtrl::DoGetBestClientSize() const -{ - wxClientDC dc(const_cast(this)); - wxSize btnSize = wxRendererNative::Get().GetCollapseButtonSize(const_cast(this), dc); - wxString text; - wxControl::FindAccelIndex(GetLabel(), &text); - wxSize textSize = dc.GetTextExtent(text); - // Add some padding if the label is not empty - if ( textSize.x > 0 ) - textSize.x += FromDIP(4); - - return wxSize(btnSize.x + textSize.x, - wxMax(textSize.y, btnSize.y)); -} - -void wxGenericCollapsibleHeaderCtrl::SetCollapsed(bool collapsed) -{ - m_collapsed = collapsed; - Refresh(); -} - -void wxGenericCollapsibleHeaderCtrl::DoSetCollapsed(bool collapsed) -{ - SetCollapsed(collapsed); - - wxCommandEvent evt(wxEVT_COLLAPSIBLEHEADER_CHANGED, GetId()); - evt.SetEventObject(this); - ProcessEvent(evt); -} - -void wxGenericCollapsibleHeaderCtrl::OnFocus(wxFocusEvent& event) -{ - Refresh(); - event.Skip(); -} - -void wxGenericCollapsibleHeaderCtrl::OnChar(wxKeyEvent& event) -{ - switch (event.GetKeyCode()) - { - case WXK_SPACE: - case WXK_RETURN: - DoSetCollapsed(!m_collapsed); - break; - default: - event.Skip(); - break; - } -} - -void wxGenericCollapsibleHeaderCtrl::OnEnterWindow(wxMouseEvent& event) -{ - m_inWindow = true; - Refresh(); - event.Skip(); -} - -void wxGenericCollapsibleHeaderCtrl::OnLeaveWindow(wxMouseEvent& event) -{ - m_inWindow = false; - Refresh(); - event.Skip(); -} - -void wxGenericCollapsibleHeaderCtrl::OnLeftUp(wxMouseEvent& event) -{ - m_mouseDown = false; - DoSetCollapsed(!m_collapsed); - event.Skip(); -} - -void wxGenericCollapsibleHeaderCtrl::OnLeftDown(wxMouseEvent& event) -{ - m_mouseDown = true; - Refresh(); - event.Skip(); -} - -void wxGenericCollapsibleHeaderCtrl::OnPaint(wxPaintEvent& WXUNUSED(event)) -{ - wxPaintDC dc(this); - - wxRect rect(wxPoint(0, 0), GetClientSize()); - - wxSize btnSize = wxRendererNative::Get().GetCollapseButtonSize(this, dc); - - wxRect btnRect(wxPoint(0, 0), btnSize); - btnRect = btnRect.CenterIn(rect, wxVERTICAL); - - int flags = 0; - - if ( m_inWindow ) - flags |= wxCONTROL_CURRENT; - - if ( m_mouseDown ) - flags |= wxCONTROL_PRESSED; - - if ( !m_collapsed ) - flags |= wxCONTROL_EXPANDED; - - wxRendererNative::Get().DrawCollapseButton(this, dc, btnRect, flags); - - wxString text; - int indexAccel = wxControl::FindAccelIndex(GetLabel(), &text); - - wxSize textSize = dc.GetTextExtent(text); - - wxRect textRect(wxPoint(btnSize.x + FromDIP(2), 0), textSize); - textRect = textRect.CenterIn(rect, wxVERTICAL); - - dc.DrawLabel(text, textRect, wxALIGN_CENTRE_VERTICAL, indexAccel); - -#ifdef __WXMSW__ - if ( HasFocus() ) - wxRendererNative::Get().DrawFocusRect(this, dc, textRect.Inflate(1), flags); -#endif -} - - -#endif // wxUSE_COLLPANE diff --git a/Externals/wxWidgets3/src/generic/collpaneg.cpp b/Externals/wxWidgets3/src/generic/collpaneg.cpp deleted file mode 100644 index 886b4ab9cf..0000000000 --- a/Externals/wxWidgets3/src/generic/collpaneg.cpp +++ /dev/null @@ -1,282 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/generic/collpaneg.cpp -// Purpose: wxGenericCollapsiblePane -// Author: Francesco Montorsi -// Modified By: -// Created: 8/10/2006 -// Copyright: (c) Francesco Montorsi -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include "wx/defs.h" - -#if wxUSE_COLLPANE && wxUSE_BUTTON && wxUSE_STATLINE - -#include "wx/collpane.h" - -#ifndef WX_PRECOMP - #include "wx/toplevel.h" - #include "wx/sizer.h" - #include "wx/panel.h" -#endif // !WX_PRECOMP - -#include "wx/statline.h" -#include "wx/collheaderctrl.h" - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -// ============================================================================ -// implementation -// ============================================================================ - -const char wxCollapsiblePaneNameStr[] = "collapsiblePane"; - -//----------------------------------------------------------------------------- -// wxGenericCollapsiblePane -//----------------------------------------------------------------------------- - -wxDEFINE_EVENT( wxEVT_COLLAPSIBLEPANE_CHANGED, wxCollapsiblePaneEvent ); -wxIMPLEMENT_DYNAMIC_CLASS(wxGenericCollapsiblePane, wxControl); -wxIMPLEMENT_DYNAMIC_CLASS(wxCollapsiblePaneEvent, wxCommandEvent); - -wxBEGIN_EVENT_TABLE(wxGenericCollapsiblePane, wxControl) - EVT_COLLAPSIBLEHEADER_CHANGED(wxID_ANY, wxGenericCollapsiblePane::OnButton) - EVT_SIZE(wxGenericCollapsiblePane::OnSize) -wxEND_EVENT_TABLE() - -void wxGenericCollapsiblePane::Init() -{ - m_pButton = NULL; - m_pPane = NULL; - m_pStaticLine = NULL; - m_sz = NULL; -} - -bool wxGenericCollapsiblePane::Create(wxWindow *parent, - wxWindowID id, - const wxString& label, - const wxPoint& pos, - const wxSize& size, - long style, - const wxValidator& val, - const wxString& name) -{ - if ( !wxControl::Create(parent, id, pos, size, style, val, name) ) - return false; - - // sizer containing the expand button and possibly a static line - m_sz = new wxBoxSizer(wxVERTICAL); - - // create children and lay them out using a wxBoxSizer - // (so that we automatically get RTL features) - m_pButton = new wxCollapsibleHeaderCtrl(this, wxID_ANY, label, wxPoint(0, 0), - wxDefaultSize); - - // on other platforms we put the static line and the button horizontally - m_sz->Add(m_pButton, 0, wxLEFT|wxTOP|wxBOTTOM, GetBorder()); - -#if !defined( __WXMAC__ ) || defined(__WXUNIVERSAL__) - m_pStaticLine = new wxStaticLine(this, wxID_ANY); - m_sz->Add(m_pStaticLine, 0, wxEXPAND, GetBorder()); - m_pStaticLine->Hide(); -#endif - - // FIXME: at least under wxGTK1 the background is black if we don't do - // this, no idea why... -#if defined(__WXGTK__) - SetBackgroundColour(parent->GetBackgroundColour()); -#endif - - // do not set sz as our sizers since we handle the pane window without using sizers - m_pPane = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, - wxTAB_TRAVERSAL|wxNO_BORDER, wxT("wxCollapsiblePanePane") ); - - // start as collapsed: - m_pPane->Hide(); - - return true; -} - -wxGenericCollapsiblePane::~wxGenericCollapsiblePane() -{ - if (m_pButton) - m_pButton->SetContainingSizer(NULL); - - if (m_pStaticLine) - m_pStaticLine->SetContainingSizer(NULL); - - // our sizer is not deleted automatically since we didn't use SetSizer()! - wxDELETE(m_sz); -} - -wxSize wxGenericCollapsiblePane::DoGetBestSize() const -{ - // NB: do not use GetSize() but rather GetMinSize() - wxSize sz = m_sz->GetMinSize(); - - // when expanded, we need more vertical space - if ( IsExpanded() ) - { - sz.SetWidth(wxMax( sz.GetWidth(), m_pPane->GetBestSize().x )); - sz.SetHeight(sz.y + GetBorder() + m_pPane->GetBestSize().y); - } - - return sz; -} - -void wxGenericCollapsiblePane::OnStateChange(const wxSize& sz) -{ - // minimal size has priority over the best size so set here our min size -// SetMinSize(sz); - SetSize(sz); - - if (this->HasFlag(wxCP_NO_TLW_RESIZE)) - { - // the user asked to explicitly handle the resizing itself... - return; - } - - - wxTopLevelWindow *top = - wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow); - if ( !top ) - return; - - wxSizer *sizer = top->GetSizer(); - if ( !sizer ) - return; - - const wxSize newBestSize = sizer->ComputeFittingClientSize(top); - top->SetMinClientSize(newBestSize); - - // we shouldn't attempt to resize a maximized window, whatever happens - if ( !top->IsMaximized() ) - top->SetClientSize(newBestSize); -} - -void wxGenericCollapsiblePane::Collapse(bool collapse) -{ - // optimization - if ( IsCollapsed() == collapse ) - return; - - InvalidateBestSize(); - - // update our state - m_pPane->Show(!collapse); - - // update button - // NB: this must be done after updating our "state" - m_pButton->SetCollapsed(collapse); - if ( m_pStaticLine ) - m_pStaticLine->Show(!collapse); - - - OnStateChange(GetBestSize()); -} - -void wxGenericCollapsiblePane::SetLabel(const wxString &label) -{ - m_pButton->SetLabel(label); - m_pButton->SetInitialSize(); - - Layout(); -} - -wxString wxGenericCollapsiblePane::GetLabel() const -{ - return m_pButton->GetLabel(); -} - -bool wxGenericCollapsiblePane::Layout() -{ -#ifdef __WXMAC__ - if (!m_pButton || !m_pPane || !m_sz) - return false; // we need to complete the creation first! -#else - if (!m_pButton || !m_pStaticLine || !m_pPane || !m_sz) - return false; // we need to complete the creation first! -#endif - - wxSize oursz(GetSize()); - - // move & resize the button and the static line - m_sz->SetDimension(0, 0, oursz.GetWidth(), m_sz->GetMinSize().GetHeight()); - m_sz->Layout(); - - if ( IsExpanded() ) - { - // move & resize the container window - int yoffset = m_sz->GetSize().GetHeight() + GetBorder(); - m_pPane->SetSize(0, yoffset, - oursz.x, oursz.y - yoffset); - - // this is very important to make the pane window layout show correctly - m_pPane->Layout(); - } - - return true; -} - -int wxGenericCollapsiblePane::GetBorder() const -{ -#if defined( __WXMAC__ ) - return 6; -#elif defined(__WXMSW__) - wxASSERT(m_pButton); - return m_pButton->ConvertDialogToPixels(wxSize(2, 0)).x; -#else - return 5; -#endif -} - - - -//----------------------------------------------------------------------------- -// wxGenericCollapsiblePane - event handlers -//----------------------------------------------------------------------------- - -void wxGenericCollapsiblePane::OnButton(wxCommandEvent& event) -{ - if ( event.GetEventObject() != m_pButton ) - { - event.Skip(); - return; - } - - Collapse(!IsCollapsed()); - - // this change was generated by the user - send the event - wxCollapsiblePaneEvent ev(this, GetId(), IsCollapsed()); - GetEventHandler()->ProcessEvent(ev); -} - -void wxGenericCollapsiblePane::OnSize(wxSizeEvent& WXUNUSED(event)) -{ -#if 0 // for debug only - wxClientDC dc(this); - dc.SetPen(*wxBLACK_PEN); - dc.SetBrush(*wxTRANSPARENT_BRUSH); - dc.DrawRectangle(wxPoint(0,0), GetSize()); - dc.SetPen(*wxRED_PEN); - dc.DrawRectangle(wxPoint(0,0), GetBestSize()); -#endif - - Layout(); -} - -#endif // wxUSE_COLLPANE && wxUSE_BUTTON && wxUSE_STATLINE diff --git a/Externals/wxWidgets3/src/generic/colour.cpp b/Externals/wxWidgets3/src/generic/colour.cpp deleted file mode 100644 index f16c134514..0000000000 --- a/Externals/wxWidgets3/src/generic/colour.cpp +++ /dev/null @@ -1,56 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/generic/colour.cpp -// Purpose: wxColour class -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include "wx/colour.h" - -#ifndef WX_PRECOMP - #include "wx/gdicmn.h" -#endif - -// Colour - -void wxColour::Init() -{ - m_red = - m_blue = - m_green = 0; - m_alpha = wxALPHA_OPAQUE; - m_isInit = false; -} - -void wxColour::InitRGBA(unsigned char r, - unsigned char g, - unsigned char b, - unsigned char a) -{ - m_red = r; - m_green = g; - m_blue = b; - m_alpha = a; - m_isInit = true; -} - -wxColour& wxColour::operator=(const wxColour& col) -{ - m_red = col.m_red; - m_green = col.m_green; - m_blue = col.m_blue; - m_alpha = col.m_alpha; - m_isInit = col.m_isInit; - return *this; -} - diff --git a/Externals/wxWidgets3/src/generic/colrdlgg.cpp b/Externals/wxWidgets3/src/generic/colrdlgg.cpp deleted file mode 100644 index 1ba9c1b5ce..0000000000 --- a/Externals/wxWidgets3/src/generic/colrdlgg.cpp +++ /dev/null @@ -1,751 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/generic/colrdlgg.cpp -// Purpose: Choice dialogs -// Author: Julian Smart -// Modified by: -// Created: 04/01/98 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_COLOURDLG - -#ifndef WX_PRECOMP - #include "wx/settings.h" - #include "wx/utils.h" - #include "wx/intl.h" - #include "wx/dialog.h" - #include "wx/listbox.h" - #include "wx/button.h" - #include "wx/stattext.h" - #include "wx/layout.h" - #include "wx/dcclient.h" - #include "wx/sizer.h" - #include "wx/slider.h" -#endif - -#if wxUSE_STATLINE - #include "wx/statline.h" -#endif - -#include "wx/colourdata.h" -#include "wx/generic/colrdlgg.h" - -#if wxCLRDLGG_USE_PREVIEW_WITH_ALPHA -#include "wx/statbmp.h" -#include "wx/dcmemory.h" -#include "wx/dcgraph.h" -#endif // wxCLRDLGG_USE_PREVIEW_WITH_ALPHA - -#define wxID_ADD_CUSTOM 3000 -#if wxUSE_SLIDER - #define wxID_RED_SLIDER 3001 - #define wxID_GREEN_SLIDER 3002 - #define wxID_BLUE_SLIDER 3003 -#endif // wxUSE_SLIDER - -wxIMPLEMENT_DYNAMIC_CLASS(wxGenericColourDialog, wxDialog); - -wxBEGIN_EVENT_TABLE(wxGenericColourDialog, wxDialog) - EVT_BUTTON(wxID_ADD_CUSTOM, wxGenericColourDialog::OnAddCustom) -#if wxUSE_SLIDER - EVT_SLIDER(wxID_RED_SLIDER, wxGenericColourDialog::OnRedSlider) - EVT_SLIDER(wxID_GREEN_SLIDER, wxGenericColourDialog::OnGreenSlider) - EVT_SLIDER(wxID_BLUE_SLIDER, wxGenericColourDialog::OnBlueSlider) -#endif - EVT_PAINT(wxGenericColourDialog::OnPaint) - EVT_MOUSE_EVENTS(wxGenericColourDialog::OnMouseEvent) - EVT_CLOSE(wxGenericColourDialog::OnCloseWindow) -wxEND_EVENT_TABLE() - - -/* - * Generic wxColourDialog - */ - -// don't change the number of elements (48) in this array, the code below is -// hardcoded to use it -static const wxChar *const wxColourDialogNames[] = -{ - wxT("ORANGE"), - wxT("GOLDENROD"), - wxT("WHEAT"), - wxT("SPRING GREEN"), - wxT("SKY BLUE"), - wxT("SLATE BLUE"), - wxT("MEDIUM VIOLET RED"), - wxT("PURPLE"), - - wxT("RED"), - wxT("YELLOW"), - wxT("MEDIUM SPRING GREEN"), - wxT("PALE GREEN"), - wxT("CYAN"), - wxT("LIGHT STEEL BLUE"), - wxT("ORCHID"), - wxT("LIGHT MAGENTA"), - - wxT("BROWN"), - wxT("YELLOW"), - wxT("GREEN"), - wxT("CADET BLUE"), - wxT("MEDIUM BLUE"), - wxT("MAGENTA"), - wxT("MAROON"), - wxT("ORANGE RED"), - - wxT("FIREBRICK"), - wxT("CORAL"), - wxT("FOREST GREEN"), - wxT("AQUAMARINE"), - wxT("BLUE"), - wxT("NAVY"), - wxT("THISTLE"), - wxT("MEDIUM VIOLET RED"), - - wxT("INDIAN RED"), - wxT("GOLD"), - wxT("MEDIUM SEA GREEN"), - wxT("MEDIUM BLUE"), - wxT("MIDNIGHT BLUE"), - wxT("GREY"), - wxT("PURPLE"), - wxT("KHAKI"), - - wxT("BLACK"), - wxT("MEDIUM FOREST GREEN"), - wxT("KHAKI"), - wxT("DARK GREY"), - wxT("SEA GREEN"), - wxT("LIGHT GREY"), - wxT("MEDIUM SLATE BLUE"), - wxT("WHITE") -}; - -wxGenericColourDialog::wxGenericColourDialog() -{ - m_whichKind = 1; - m_colourSelection = -1; -} - -wxGenericColourDialog::wxGenericColourDialog(wxWindow *parent, - wxColourData *data) -{ - m_whichKind = 1; - m_colourSelection = -1; - Create(parent, data); -} - -wxGenericColourDialog::~wxGenericColourDialog() -{ -} - -void wxGenericColourDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event)) -{ - EndModal(wxID_CANCEL); -} - -bool wxGenericColourDialog::Create(wxWindow *parent, wxColourData *data) -{ - if ( !wxDialog::Create(GetParentForModalDialog(parent, 0), wxID_ANY, - _("Choose colour"), - wxPoint(0, 0), wxSize(900, 900)) ) - return false; - - if (data) - m_colourData = *data; - - InitializeColours(); - CalculateMeasurements(); - CreateWidgets(); - - return true; -} - -int wxGenericColourDialog::ShowModal() -{ - return wxDialog::ShowModal(); -} - - -// Internal functions -void wxGenericColourDialog::OnMouseEvent(wxMouseEvent& event) -{ - if (event.ButtonDown(wxMOUSE_BTN_LEFT)) - { - int x = (int)event.GetX(); - int y = (int)event.GetY(); - - if ((x >= m_standardColoursRect.x && x <= (m_standardColoursRect.x + m_standardColoursRect.width)) && - (y >= m_standardColoursRect.y && y <= (m_standardColoursRect.y + m_standardColoursRect.height))) - { - int selX = (int)(x - m_standardColoursRect.x)/(m_smallRectangleSize.x + m_gridSpacing); - int selY = (int)(y - m_standardColoursRect.y)/(m_smallRectangleSize.y + m_gridSpacing); - int ptr = (int)(selX + selY*8); - OnBasicColourClick(ptr); - } - // wxStaticBitmap (used to ARGB preview) events are handled in the dedicated handler. -#if !wxCLRDLGG_USE_PREVIEW_WITH_ALPHA - else if ((x >= m_customColoursRect.x && x <= (m_customColoursRect.x + m_customColoursRect.width)) && - (y >= m_customColoursRect.y && y <= (m_customColoursRect.y + m_customColoursRect.height))) - { - int selX = (int)(x - m_customColoursRect.x)/(m_smallRectangleSize.x + m_gridSpacing); - int selY = (int)(y - m_customColoursRect.y)/(m_smallRectangleSize.y + m_gridSpacing); - int ptr = (int)(selX + selY*8); - OnCustomColourClick(ptr); - } -#endif - else - event.Skip(); - } - else - event.Skip(); -} - -#if wxCLRDLGG_USE_PREVIEW_WITH_ALPHA -void wxGenericColourDialog::OnCustomColourMouseClick(wxMouseEvent& event) -{ - // Find index of custom colour - // and call the handler. - for (unsigned i = 0; i < WXSIZEOF(m_customColoursBmp); i++) - { - if ( m_customColoursBmp[i]->GetId() == event.GetId() ) - { - OnCustomColourClick(i); - return; - } - } - - event.Skip(); -} -#endif // wxCLRDLGG_USE_PREVIEW_WITH_ALPHA - -void wxGenericColourDialog::OnPaint(wxPaintEvent& WXUNUSED(event)) -{ - wxPaintDC dc(this); - - PaintBasicColours(dc); - // wxStaticBitmap controls are updated on their own. -#if !wxCLRDLGG_USE_PREVIEW_WITH_ALPHA - PaintCustomColours(dc, -1); - PaintCustomColour(dc); -#endif // !wxCLRDLGG_USE_PREVIEW_WITH_ALPHA - PaintHighlight(dc, true); -} - -void wxGenericColourDialog::CalculateMeasurements() -{ - // For single customizable colour - const wxSize customRectangleSize(40, 40); - - m_smallRectangleSize.Set(18, 14); - - m_gridSpacing = 6; - m_sectionSpacing = 15; - - m_standardColoursRect.x = 10; - m_standardColoursRect.y = 15; - m_standardColoursRect.width = (8*m_smallRectangleSize.x) + (7*m_gridSpacing); - m_standardColoursRect.height = (6*m_smallRectangleSize.y) + (5*m_gridSpacing); - - m_customColoursRect.x = m_standardColoursRect.x; - m_customColoursRect.y = m_standardColoursRect.y + m_standardColoursRect.height + 20; - m_customColoursRect.width = (8*m_smallRectangleSize.x) + (7*m_gridSpacing); - m_customColoursRect.height = (2*m_smallRectangleSize.y) + (1*m_gridSpacing); - - m_singleCustomColourRect.x = m_customColoursRect.width + m_customColoursRect.x + m_sectionSpacing; - m_singleCustomColourRect.y = 80; - m_singleCustomColourRect.SetSize(customRectangleSize); - - m_okButtonX = 10; - m_customButtonX = m_singleCustomColourRect.x ; - m_buttonY = m_customColoursRect.y + m_customColoursRect.height + 10; -} - -void wxGenericColourDialog::CreateWidgets() -{ - wxBeginBusyCursor(); - -#if wxCLRDLGG_USE_PREVIEW_WITH_ALPHA - // Bitmap to preview selected colour (with alpha channel) - wxBitmap customColourBmp(m_singleCustomColourRect.GetSize(), 32); - customColourBmp.UseAlpha(); - DoPreviewBitmap(customColourBmp, m_colourData.GetColour()); - m_customColourBmp = new wxStaticBitmap(this, wxID_ANY, customColourBmp, - m_singleCustomColourRect.GetLeftTop(), - m_singleCustomColourRect.GetSize(), - wxBORDER_SUNKEN); - - // 16 bitmaps to preview custom colours (with alpha channel) - for (unsigned i = 0; i < WXSIZEOF(m_customColoursBmp); i++) - { - int x = ((i % 8)*(m_smallRectangleSize.x+m_gridSpacing)) + m_customColoursRect.x; - int y = ((i / 8)*(m_smallRectangleSize.y+m_gridSpacing)) + m_customColoursRect.y; - - wxBitmap bmp(m_smallRectangleSize, 32); - bmp.UseAlpha(); - DoPreviewBitmap(bmp, m_customColours[i]); - m_customColoursBmp[i] = new wxStaticBitmap(this, wxID_ANY, bmp, - wxPoint(x, y), m_smallRectangleSize); - m_customColoursBmp[i]->Bind(wxEVT_LEFT_DOWN, - &wxGenericColourDialog::OnCustomColourMouseClick, this); - - } -#endif // wxCLRDLGG_USE_PREVIEW_WITH_ALPHA - - wxBoxSizer *topSizer = new wxBoxSizer( wxVERTICAL ); - - const int sliderHeight = 160; - - // first sliders -#if wxUSE_SLIDER - const int sliderX = m_singleCustomColourRect.x + m_singleCustomColourRect.width + m_sectionSpacing; - - wxColour c = m_colourData.GetColour(); - m_redSlider = new wxSlider(this, wxID_RED_SLIDER, c.Red(), 0, 255, - wxDefaultPosition, wxSize(wxDefaultCoord, sliderHeight), wxSL_VERTICAL|wxSL_LABELS|wxSL_INVERSE); - m_greenSlider = new wxSlider(this, wxID_GREEN_SLIDER, c.Green(), 0, 255, - wxDefaultPosition, wxSize(wxDefaultCoord, sliderHeight), wxSL_VERTICAL|wxSL_LABELS|wxSL_INVERSE); - m_blueSlider = new wxSlider(this, wxID_BLUE_SLIDER, c.Blue(), 0, 255, - wxDefaultPosition, wxSize(wxDefaultCoord, sliderHeight), wxSL_VERTICAL|wxSL_LABELS|wxSL_INVERSE); - if ( m_colourData.GetChooseAlpha() ) - { - m_alphaSlider = new wxSlider(this, wxID_ANY, c.Alpha(), 0, 255, - wxDefaultPosition, wxSize(wxDefaultCoord, sliderHeight), wxSL_VERTICAL|wxSL_LABELS|wxSL_INVERSE); - m_alphaSlider->Bind(wxEVT_SLIDER, &wxGenericColourDialog::OnAlphaSlider, this); - } - else - { - m_alphaSlider = NULL; - } - - wxBoxSizer *sliderSizer = new wxBoxSizer( wxHORIZONTAL ); - - sliderSizer->Add(sliderX, sliderHeight ); - - const wxSizerFlags sliderLabelFlags = wxSizerFlags().Right().Border(); - const wxSizerFlags onesliderFlags = wxSizerFlags().CenterHorizontal(); - const wxSizerFlags sliderFlags - = wxSizerFlags().CentreVertical().DoubleBorder(); - - wxBoxSizer *redSliderSizer = new wxBoxSizer(wxVERTICAL); - redSliderSizer->Add(new wxStaticText(this, wxID_ANY, _("Red:")), sliderLabelFlags); - redSliderSizer->Add(m_redSlider, onesliderFlags); - wxBoxSizer *greenSliderSizer = new wxBoxSizer(wxVERTICAL); - greenSliderSizer->Add(new wxStaticText(this, wxID_ANY, _("Green:")), sliderLabelFlags); - greenSliderSizer->Add(m_greenSlider, onesliderFlags); - wxBoxSizer *blueSliderSizer = new wxBoxSizer(wxVERTICAL); - blueSliderSizer->Add(new wxStaticText(this, wxID_ANY, _("Blue:")), sliderLabelFlags); - blueSliderSizer->Add(m_blueSlider, onesliderFlags); - - sliderSizer->Add(redSliderSizer, sliderFlags); - sliderSizer->Add(greenSliderSizer, sliderFlags); - sliderSizer->Add(blueSliderSizer, sliderFlags); - if ( m_colourData.GetChooseAlpha() ) - { - wxBoxSizer *alphaSliderSizer = new wxBoxSizer(wxVERTICAL); - alphaSliderSizer->Add(new wxStaticText(this, wxID_ANY, _("Opacity:")), sliderLabelFlags); - alphaSliderSizer->Add(m_alphaSlider, onesliderFlags); - sliderSizer->Add(alphaSliderSizer, sliderFlags); - } - - topSizer->Add(sliderSizer, wxSizerFlags().Centre().DoubleBorder()); -#else - topSizer->Add(1, sliderHeight, wxSizerFlags(1).Centre().TripleBorder()); -#endif // wxUSE_SLIDER - - // then the custom button - topSizer->Add(new wxButton(this, wxID_ADD_CUSTOM, - _("Add to custom colours") ), - wxSizerFlags().DoubleHorzBorder()); - - // then the standard buttons - wxSizer *buttonsizer = CreateSeparatedButtonSizer(wxOK | wxCANCEL); - if ( buttonsizer ) - { - topSizer->Add(buttonsizer, wxSizerFlags().Expand().DoubleBorder()); - } - - SetAutoLayout( true ); - SetSizer( topSizer ); - - topSizer->SetSizeHints( this ); - topSizer->Fit( this ); - - Centre( wxBOTH ); - - wxEndBusyCursor(); -} - -void wxGenericColourDialog::InitializeColours(void) -{ - size_t i; - - for (i = 0; i < WXSIZEOF(wxColourDialogNames); i++) - { - wxColour col = wxTheColourDatabase->Find(wxColourDialogNames[i]); - if (col.IsOk()) - m_standardColours[i].Set(col.Red(), col.Green(), col.Blue()); - else - m_standardColours[i].Set(0, 0, 0); - } - - for (i = 0; i < WXSIZEOF(m_customColours); i++) - { - wxColour c = m_colourData.GetCustomColour(i); - if (c.IsOk()) - m_customColours[i] = m_colourData.GetCustomColour(i); - else - m_customColours[i] = wxColour(255, 255, 255); - } - - wxColour curr = m_colourData.GetColour(); - if ( curr.IsOk() ) - { - bool m_initColourFound = false; - - for (i = 0; i < WXSIZEOF(wxColourDialogNames); i++) - { - if ( m_standardColours[i] == curr && !m_initColourFound ) - { - m_whichKind = 1; - m_colourSelection = i; - m_initColourFound = true; - break; - } - } - if ( !m_initColourFound ) - { - for ( i = 0; i < WXSIZEOF(m_customColours); i++ ) - { - if ( m_customColours[i] == curr ) - { - m_whichKind = 2; - m_colourSelection = i; - break; - } - } - } - m_colourData.SetColour(curr); - } - else - { - m_whichKind = 1; - m_colourSelection = 0; - m_colourData.SetColour(wxColour(0, 0, 0)); - } -} - -void wxGenericColourDialog::PaintBasicColours(wxDC& dc) -{ - int i; - for (i = 0; i < 6; i++) - { - int j; - for (j = 0; j < 8; j++) - { - int ptr = i*8 + j; - - int x = (j*(m_smallRectangleSize.x+m_gridSpacing) + m_standardColoursRect.x); - int y = (i*(m_smallRectangleSize.y+m_gridSpacing) + m_standardColoursRect.y); - - dc.SetPen(*wxBLACK_PEN); - wxBrush brush(m_standardColours[ptr]); - dc.SetBrush(brush); - - dc.DrawRectangle( x, y, m_smallRectangleSize.x, m_smallRectangleSize.y); - } - } -} - -#if !wxCLRDLGG_USE_PREVIEW_WITH_ALPHA -void wxGenericColourDialog::PaintCustomColours(wxDC& dc, int clrIndex) -{ - int idxStart; - int idxEnd; - // For clrIndex == -1 redraw all custom colours - if ( clrIndex < 0 || static_cast(clrIndex) >= WXSIZEOF(m_customColours) ) - { - idxStart = 0; - idxEnd = WXSIZEOF(m_customColours) - 1; - } - else - { - idxStart = clrIndex; - idxEnd = clrIndex; - } - - for (int i = idxStart; i <= idxEnd; i++) - { - int x = ((i % 8)*(m_smallRectangleSize.x+m_gridSpacing)) + m_customColoursRect.x; - int y = ((i / 8)*(m_smallRectangleSize.y+m_gridSpacing)) + m_customColoursRect.y; - - dc.SetPen(*wxBLACK_PEN); - - wxBrush brush(m_customColours[i]); - dc.SetBrush(brush); - - dc.DrawRectangle(x, y, m_smallRectangleSize.x, m_smallRectangleSize.y); - } -} -#endif // !wxCLRDLGG_USE_PREVIEW_WITH_ALPHA - -void wxGenericColourDialog::PaintHighlight(wxDC& dc, bool draw) -{ - if ( m_colourSelection < 0 ) - return; - - wxRect r(m_smallRectangleSize); - if (m_whichKind == 1) - { - // Standard colours - r.Offset(m_standardColoursRect.GetLeftTop()); - } - else - { - // User-defined colours - r.Offset(m_customColoursRect.GetLeftTop()); - } - - const int x = (m_colourSelection % 8) * (m_smallRectangleSize.x + m_gridSpacing); - const int y = (m_colourSelection / 8) * (m_smallRectangleSize.y + m_gridSpacing); - r.Offset(x, y); - // Highlight is drawn with rectangle bigger than the item rectangle. - r.Inflate(2, 2); - - // Highlighting frame is drawn with black colour. - // Highlighting frame is removed by drawing using dialog background colour. - wxPen pen(draw ? *wxBLACK_PEN : wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE))); - - dc.SetPen(pen); - dc.SetBrush(*wxTRANSPARENT_BRUSH); - dc.DrawRectangle(r); -} - -void wxGenericColourDialog::PaintCustomColour(wxDC& dc) -{ -#if wxCLRDLGG_USE_PREVIEW_WITH_ALPHA - wxUnusedVar(dc); - - wxBitmap bmp(m_singleCustomColourRect.GetSize(), 32); - bmp.UseAlpha(); - DoPreviewBitmap(bmp, m_colourData.GetColour()); - m_customColourBmp->SetBitmap(bmp); -#else - dc.SetPen(*wxBLACK_PEN); - - wxBrush *brush = new wxBrush(m_colourData.GetColour()); - dc.SetBrush(*brush); - - dc.DrawRectangle(m_singleCustomColourRect); - - dc.SetBrush(wxNullBrush); - delete brush; -#endif // wxCLRDLGG_USE_PREVIEW_WITH_ALPHA/!wxCLRDLGG_USE_PREVIEW_WITH_ALPHA -} - -void wxGenericColourDialog::OnBasicColourClick(int which) -{ - wxClientDC dc(this); - - PaintHighlight(dc, false); - m_whichKind = 1; - m_colourSelection = which; - -#if wxUSE_SLIDER - m_redSlider->SetValue( m_standardColours[m_colourSelection].Red() ); - m_greenSlider->SetValue( m_standardColours[m_colourSelection].Green() ); - m_blueSlider->SetValue( m_standardColours[m_colourSelection].Blue() ); - if ( m_colourData.GetChooseAlpha() ) - { - m_alphaSlider->SetValue( m_standardColours[m_colourSelection].Alpha() ); - } -#endif // wxUSE_SLIDER - - m_colourData.SetColour(m_standardColours[m_colourSelection]); - - PaintCustomColour(dc); - PaintHighlight(dc, true); -} - -void wxGenericColourDialog::OnCustomColourClick(int which) -{ - wxClientDC dc(this); - PaintHighlight(dc, false); - m_whichKind = 2; - m_colourSelection = which; - -#if wxUSE_SLIDER - m_redSlider->SetValue( m_customColours[m_colourSelection].Red() ); - m_greenSlider->SetValue( m_customColours[m_colourSelection].Green() ); - m_blueSlider->SetValue( m_customColours[m_colourSelection].Blue() ); - if ( m_colourData.GetChooseAlpha() ) - { - m_alphaSlider->SetValue( m_customColours[m_colourSelection].Alpha() ); - } -#endif // wxUSE_SLIDER - - m_colourData.SetColour(m_customColours[m_colourSelection]); - - PaintCustomColour(dc); - PaintHighlight(dc, true); -} - -/* -void wxGenericColourDialog::OnOk(void) -{ - Show(false); -} - -void wxGenericColourDialog::OnCancel(void) -{ - colourDialogCancelled = true; - Show(false); -} -*/ - -void wxGenericColourDialog::OnAddCustom(wxCommandEvent& WXUNUSED(event)) -{ - wxClientDC dc(this); - if (m_whichKind != 2) - { - PaintHighlight(dc, false); - m_whichKind = 2; - m_colourSelection = 0; - PaintHighlight(dc, true); - } - - m_customColours[m_colourSelection] = m_colourData.GetColour(); - - m_colourData.SetCustomColour(m_colourSelection, m_customColours[m_colourSelection]); - -#if wxCLRDLGG_USE_PREVIEW_WITH_ALPHA - wxBitmap bmp(m_smallRectangleSize, 32); - bmp.UseAlpha(); - DoPreviewBitmap(bmp, m_customColours[m_colourSelection]); - m_customColoursBmp[m_colourSelection]->SetBitmap(bmp); -#else - PaintCustomColours(dc, m_colourSelection); -#endif // wxCLRDLGG_USE_PREVIEW_WITH_ALPHA/!wxCLRDLGG_USE_PREVIEW_WITH_ALPHA -} - -#if wxUSE_SLIDER - -void wxGenericColourDialog::OnRedSlider(wxCommandEvent& WXUNUSED(event)) -{ - if (!m_redSlider) - return; - - wxClientDC dc(this); - wxColour c = m_colourData.GetColour(); - m_colourData.SetColour(wxColour((unsigned char)m_redSlider->GetValue(), c.Green(), c.Blue(), c.Alpha())); - PaintCustomColour(dc); -} - -void wxGenericColourDialog::OnGreenSlider(wxCommandEvent& WXUNUSED(event)) -{ - if (!m_greenSlider) - return; - - wxClientDC dc(this); - wxColour c = m_colourData.GetColour(); - m_colourData.SetColour(wxColour(c.Red(), (unsigned char)m_greenSlider->GetValue(), c.Blue(), c.Alpha())); - PaintCustomColour(dc); -} - -void wxGenericColourDialog::OnBlueSlider(wxCommandEvent& WXUNUSED(event)) -{ - if (!m_blueSlider) - return; - - wxClientDC dc(this); - wxColour c = m_colourData.GetColour(); - m_colourData.SetColour(wxColour(c.Red(), c.Green(), (unsigned char)m_blueSlider->GetValue(), c.Alpha())); - PaintCustomColour(dc); -} - -void wxGenericColourDialog::OnAlphaSlider(wxCommandEvent& WXUNUSED(event)) -{ - wxColour c = m_colourData.GetColour(); - m_colourData.SetColour(wxColour(c.Red(), c.Green(), c.Blue(), (unsigned char)m_alphaSlider->GetValue())); - - wxClientDC dc(this); - PaintCustomColour(dc); -} - -#endif // wxUSE_SLIDER - -#if wxCLRDLGG_USE_PREVIEW_WITH_ALPHA -void wxGenericColourDialog::DoPreviewBitmap(wxBitmap& bmp, const wxColour& colour) -{ - if ( bmp.HasAlpha() && colour.Alpha() != wxALPHA_OPAQUE ) - { - // For real ARGB draw a chessboard grid - // with actual ARGB fields and reference RGB fields. - const int w = bmp.GetWidth(); - const int h = bmp.GetHeight(); - - // Calculate field size: 4 fields per row/column, - // with size in range [2..10] - int dx = wxMax(wxMin(w / 4, 10), 2); - int dy = wxMax(wxMin(h / 4, 10), 2); - // We want a square field - dx = wxMax(dx, dy); - dy = dx; - - // Prepare opaque colour - wxColour colourRGB(colour.Red(), colour.Green(), colour.Blue(), wxALPHA_OPAQUE); - - { - wxBrush brushARGB(colour); - wxBrush brushRGB(colourRGB); - - wxMemoryDC mdc(bmp); - { - wxGCDC gdc(mdc); - - gdc.SetPen(*wxTRANSPARENT_PEN); - - for (int x = 0, ix = 0; x < w; x += dx, ix++) - { - for (int y = 0, iy = 0; y < h; y += dy, iy++) - { - if ( (ix+iy) % 2 == 0 ) - { - gdc.SetBrush(brushARGB); - } - else - { - gdc.SetBrush(brushRGB); - } - gdc.DrawRectangle(x, y, dx, dy); - } - } - - // Draw a frame - gdc.SetPen(*wxBLACK_PEN); - gdc.SetBrush(*wxTRANSPARENT_BRUSH); - gdc.DrawRectangle(0, 0, w, h); - } - } - } - else - { - wxMemoryDC mdc(bmp); - // Fill with custom colour - wxBrush brush(colour); - mdc.SetPen(*wxBLACK_PEN); - mdc.SetBrush(brush); - mdc.DrawRectangle(wxPoint(0, 0), bmp.GetSize()); - } -} -#endif // wxCLRDLGG_USE_PREVIEW_WITH_ALPHA - -#endif // wxUSE_COLOURDLG diff --git a/Externals/wxWidgets3/src/generic/combog.cpp b/Externals/wxWidgets3/src/generic/combog.cpp deleted file mode 100644 index 0e79b2cdf7..0000000000 --- a/Externals/wxWidgets3/src/generic/combog.cpp +++ /dev/null @@ -1,499 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/generic/combog.cpp -// Purpose: Generic wxComboCtrl -// Author: Jaakko Salli -// Modified by: -// Created: Apr-30-2006 -// Copyright: (c) 2005 Jaakko Salli -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_COMBOCTRL - -#include "wx/combo.h" - -#ifndef WX_PRECOMP - #include "wx/log.h" - #include "wx/combobox.h" - #include "wx/dcclient.h" - #include "wx/settings.h" - #include "wx/textctrl.h" -#endif - -#include "wx/dcbuffer.h" - -// ---------------------------------------------------------------------------- -// Some constant adjustments to make the generic more bearable - -#if defined(__WXUNIVERSAL__) - -// position adjustment for wxTextCtrl, to achieve zero left margin -// meaningless if LEFT_MARGIN_CAN_BE_SET set to 1 in combocmn.cpp -#define TEXTCTRLXADJUST 0 - -#define DEFAULT_DROPBUTTON_WIDTH 19 - -#elif defined(__WXMSW__) - -// position adjustment for wxTextCtrl, to achieve zero left margin -// meaningless if LEFT_MARGIN_CAN_BE_SET set to 1 in combocmn.cpp -#define TEXTCTRLXADJUST 2 - -#define DEFAULT_DROPBUTTON_WIDTH 17 - -#elif defined(__WXGTK__) - -// position adjustment for wxTextCtrl, to achieve zero left margin -// meaningless if LEFT_MARGIN_CAN_BE_SET set to 1 in combocmn.cpp -#define TEXTCTRLXADJUST -1 - -#define DEFAULT_DROPBUTTON_WIDTH 23 - -#elif defined(__WXMAC__) - -// position adjustment for wxTextCtrl, to achieve zero left margin -// meaningless if LEFT_MARGIN_CAN_BE_SET set to 1 in combocmn.cpp -#define TEXTCTRLXADJUST 0 - -#define DEFAULT_DROPBUTTON_WIDTH 22 - -#else - -// position adjustment for wxTextCtrl, to achieve zero left margin -// meaningless if LEFT_MARGIN_CAN_BE_SET set to 1 in combocmn.cpp -#define TEXTCTRLXADJUST 0 - -#define DEFAULT_DROPBUTTON_WIDTH 19 - -#endif - - -// ============================================================================ -// implementation -// ============================================================================ - -// Only implement if no native or it wasn't fully featured -#ifndef wxCOMBOCONTROL_FULLY_FEATURED - - -// ---------------------------------------------------------------------------- -// wxGenericComboCtrl -// ---------------------------------------------------------------------------- - -wxBEGIN_EVENT_TABLE(wxGenericComboCtrl, wxComboCtrlBase) - EVT_PAINT(wxGenericComboCtrl::OnPaintEvent) - EVT_MOUSE_EVENTS(wxGenericComboCtrl::OnMouseEvent) -wxEND_EVENT_TABLE() - - -wxIMPLEMENT_DYNAMIC_CLASS(wxGenericComboCtrl, wxComboCtrlBase); - -void wxGenericComboCtrl::Init() -{ -} - -bool wxGenericComboCtrl::Create(wxWindow *parent, - wxWindowID id, - const wxString& value, - const wxPoint& pos, - const wxSize& size, - long style, - const wxValidator& validator, - const wxString& name) -{ - // - // Note that technically we only support 'default' border and wxNO_BORDER. - long border = style & wxBORDER_MASK; - int tcBorder = wxNO_BORDER; - -#if defined(__WXUNIVERSAL__) - if ( !border ) - border = wxBORDER_SIMPLE; -#elif defined(__WXMSW__) - if ( !border ) - // For XP, have 1-width custom border, for older version use sunken - /*if ( wxUxThemeEngine::GetIfActive() ) - { - border = wxBORDER_NONE; - m_widthCustomBorder = 1; - } - else*/ - border = wxBORDER_SUNKEN; -#else - - // - // Generic version is optimized for wxGTK - // - - #define UNRELIABLE_TEXTCTRL_BORDER - - if ( !border ) - { - if ( style & wxCB_READONLY ) - { - m_widthCustomBorder = 1; - } - else - { - m_widthCustomBorder = 0; - tcBorder = 0; - } - } - else - { - // Have textctrl instead use the border given. - tcBorder = border; - } - - // Because we are going to have button outside the border, - // let's use wxBORDER_NONE for the whole control. - border = wxBORDER_NONE; - - Customize( wxCC_BUTTON_OUTSIDE_BORDER | - wxCC_NO_TEXT_AUTO_SELECT | - wxCC_BUTTON_STAYS_DOWN ); - -#endif - - style = (style & ~(wxBORDER_MASK)) | border; - if ( style & wxCC_STD_BUTTON ) - m_iFlags |= wxCC_POPUP_ON_MOUSE_UP; - - // create main window - if ( !wxComboCtrlBase::Create(parent, - id, - value, - pos, - size, - style | wxFULL_REPAINT_ON_RESIZE, - validator, - name) ) - return false; - - // Create textctrl, if necessary - CreateTextCtrl( tcBorder ); - - // Add keyboard input handlers for main control and textctrl - InstallInputHandlers(); - - // Set background style for double-buffering, when needed - // (cannot use when system draws background automatically) - if ( !HasTransparentBackground() ) - SetBackgroundStyle( wxBG_STYLE_PAINT ); - - // SetInitialSize should be called last - SetInitialSize(size); - - return true; -} - -wxGenericComboCtrl::~wxGenericComboCtrl() -{ -} - -void wxGenericComboCtrl::OnResize() -{ - - // Recalculates button and textctrl areas - CalculateAreas(DEFAULT_DROPBUTTON_WIDTH); - -#if 0 - // Move separate button control, if any, to correct position - if ( m_btn ) - { - wxSize sz = GetClientSize(); - m_btn->SetSize( m_btnArea.x + m_btnSpacingX, - (sz.y-m_btnSize.y)/2, - m_btnSize.x, - m_btnSize.y ); - } -#endif - - // Move textctrl, if any, accordingly - PositionTextCtrl( TEXTCTRLXADJUST ); -} - -void wxGenericComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) ) -{ - // Determine wxDC to use based on need to double-buffer or - // use system-generated transparent background portions - wxDC* dcPtr; - if ( HasTransparentBackground() ) - dcPtr = new wxPaintDC(this); - else - dcPtr = new wxAutoBufferedPaintDC(this); - wxDC& dc = *dcPtr; - - wxSize sz = GetClientSize(); - const wxRect& butRect = m_btnArea; - wxRect tcRect = m_tcArea; - wxRect fullRect(0, 0, sz.x, sz.y); - - // artificial simple border - if ( m_widthCustomBorder ) - { - int customBorder = m_widthCustomBorder; - - // Set border colour -#ifdef __WXMAC__ - wxPen pen1( wxColour(133,133,133), - customBorder, - wxPENSTYLE_SOLID ); -#else - wxPen pen1( wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT), - customBorder, - wxPENSTYLE_SOLID); -#endif - dc.SetPen( pen1 ); - - // area around both controls - wxRect rect2(fullRect); - if ( m_iFlags & wxCC_IFLAG_BUTTON_OUTSIDE ) - { - rect2 = tcRect; - if ( customBorder == 1 ) - { - rect2.Inflate(1); - } - else - { - #ifdef __WXGTK__ - rect2.x -= 1; - rect2.y -= 1; - #else - rect2.x -= customBorder; - rect2.y -= customBorder; - #endif - rect2.width += 1 + customBorder; - rect2.height += 1 + customBorder; - } - } - - dc.SetBrush( *wxTRANSPARENT_BRUSH ); - dc.DrawRectangle(rect2); - } - - // Clear the main background if the system doesn't do it by itself - if ( !HasTransparentBackground() && - (tcRect.x > 0 || tcRect.y > 0) ) - { - wxColour winCol = GetParent()->GetBackgroundColour(); - dc.SetBrush(winCol); - dc.SetPen(winCol); - - dc.DrawRectangle(fullRect); - } - - if ( !m_btn ) - { - // Standard button rendering - DrawButton(dc, butRect); - } - - // paint required portion on the control - if ( !m_text || m_widthCustomPaint ) - { - wxASSERT( m_widthCustomPaint >= 0 ); - - // Clear the text-control area background - wxColour tcCol = GetBackgroundColour(); - dc.SetBrush(tcCol); - dc.SetPen(tcCol); - dc.DrawRectangle(tcRect); - - // this is intentionally here to allow drawed rectangle's - // right edge to be hidden - if ( m_text ) - tcRect.width = m_widthCustomPaint; - - dc.SetFont( GetFont() ); - - dc.SetClippingRegion(tcRect); - if ( m_popupInterface ) - m_popupInterface->PaintComboControl(dc, tcRect); - else - wxComboPopup::DefaultPaintComboControl(this, dc, tcRect); - } - - delete dcPtr; -} - -void wxGenericComboCtrl::OnMouseEvent( wxMouseEvent& event ) -{ - int mx = event.m_x; - bool isOnButtonArea = m_btnArea.Contains(mx,event.m_y); - int handlerFlags = isOnButtonArea ? wxCC_MF_ON_BUTTON : 0; - - if ( PreprocessMouseEvent(event,handlerFlags) ) - return; - - const bool ctrlIsButton = wxPlatformIs(wxOS_WINDOWS); - - if ( ctrlIsButton && - (m_windowStyle & (wxCC_SPECIAL_DCLICK|wxCB_READONLY)) == wxCB_READONLY ) - { - // if no textctrl and no special double-click, then the entire control acts - // as a button - handlerFlags |= wxCC_MF_ON_BUTTON; - if ( HandleButtonMouseEvent(event,handlerFlags) ) - return; - } - else - { - if ( isOnButtonArea || HasCapture() || - (m_widthCustomPaint && mx < (m_tcArea.x+m_widthCustomPaint)) ) - { - handlerFlags |= wxCC_MF_ON_CLICK_AREA; - - if ( HandleButtonMouseEvent(event,handlerFlags) ) - return; - } - else if ( m_btnState ) - { - // otherwise need to clear the hover status - m_btnState = 0; - RefreshRect(m_btnArea); - } - } - - // - // This will handle left_down and left_dclick events outside button in a Windows/GTK-like manner. - // See header file for further information on this method. - HandleNormalMouseEvent(event); - -} - -void wxGenericComboCtrl::SetCustomPaintWidth( int width ) -{ -#ifdef UNRELIABLE_TEXTCTRL_BORDER - // - // If starting/stopping to show an image in front - // of a writable text-field, then re-create textctrl - // with different kind of border (because we can't - // assume that textctrl fully supports wxNO_BORDER). - // - wxTextCtrl* tc = GetTextCtrl(); - - if ( tc && (m_iFlags & wxCC_BUTTON_OUTSIDE_BORDER) ) - { - int borderType = tc->GetWindowStyle() & wxBORDER_MASK; - int tcCreateStyle = -1; - - if ( width > 0 ) - { - // Re-create textctrl with no border - if ( borderType != wxNO_BORDER ) - { - m_widthCustomBorder = 1; - tcCreateStyle = wxNO_BORDER; - } - } - else if ( width == 0 ) - { - // Re-create textctrl with normal border - if ( borderType == wxNO_BORDER ) - { - m_widthCustomBorder = 0; - tcCreateStyle = 0; - } - } - - // Common textctrl re-creation code - if ( tcCreateStyle != -1 ) - { - tc->RemoveEventHandler(m_textEvtHandler); - delete m_textEvtHandler; - - CreateTextCtrl( tcCreateStyle ); - - InstallInputHandlers(); - } - } -#endif // UNRELIABLE_TEXTCTRL_BORDER - - wxComboCtrlBase::SetCustomPaintWidth( width ); -} - -bool wxGenericComboCtrl::IsKeyPopupToggle(const wxKeyEvent& event) const -{ - int keycode = event.GetKeyCode(); - bool isPopupShown = IsPopupShown(); - - // This code is AFAIK appropriate for wxGTK. - - if ( isPopupShown ) - { - if ( keycode == WXK_ESCAPE || - ( keycode == WXK_UP && event.AltDown() ) ) - return true; - } - else - { - if ( (keycode == WXK_DOWN && event.AltDown()) || - (keycode == WXK_F4) ) - return true; - } - - return false; -} - -#ifdef __WXUNIVERSAL__ - -bool wxGenericComboCtrl::PerformAction(const wxControlAction& action, - long numArg, - const wxString& strArg) -{ - bool processed = false; - if ( action == wxACTION_COMBOBOX_POPUP ) - { - if ( !IsPopupShown() ) - { - ShowPopup(); - - processed = true; - } - } - else if ( action == wxACTION_COMBOBOX_DISMISS ) - { - if ( IsPopupShown() ) - { - HidePopup(); - - processed = true; - } - } - - if ( !processed ) - { - // pass along - return wxControl::PerformAction(action, numArg, strArg); - } - - return true; -} - -#endif // __WXUNIVERSAL__ - -// If native wxComboCtrl was not defined, then prepare a simple -// front-end so that wxRTTI works as expected. -#ifndef _WX_COMBOCONTROL_H_ -wxIMPLEMENT_DYNAMIC_CLASS(wxComboCtrl, wxGenericComboCtrl); -#endif - -#endif // !wxCOMBOCONTROL_FULLY_FEATURED - -#endif // wxUSE_COMBOCTRL diff --git a/Externals/wxWidgets3/src/generic/commandlinkbuttong.cpp b/Externals/wxWidgets3/src/generic/commandlinkbuttong.cpp deleted file mode 100644 index 1a995349cd..0000000000 --- a/Externals/wxWidgets3/src/generic/commandlinkbuttong.cpp +++ /dev/null @@ -1,116 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/generic/commandlinkbuttong.cpp -// Purpose: wxGenericCommandLinkButton -// Author: Rickard Westerlund -// Created: 2010-06-23 -// Copyright: (c) 2010 wxWidgets team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_COMMANDLINKBUTTON - -#include "wx/commandlinkbutton.h" -#include "wx/artprov.h" - -wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxCommandLinkButton, wxButton, "wx/commandlinkbutton.h"); - -wxDEFINE_FLAGS( wxCommandLinkButtonStyle ) -wxBEGIN_FLAGS( wxCommandLinkButtonStyle ) -// new style border flags, we put them first to -// use them for streaming out -wxFLAGS_MEMBER(wxBORDER_SIMPLE) -wxFLAGS_MEMBER(wxBORDER_SUNKEN) -wxFLAGS_MEMBER(wxBORDER_DOUBLE) -wxFLAGS_MEMBER(wxBORDER_RAISED) -wxFLAGS_MEMBER(wxBORDER_STATIC) -wxFLAGS_MEMBER(wxBORDER_NONE) - -// old style border flags -wxFLAGS_MEMBER(wxSIMPLE_BORDER) -wxFLAGS_MEMBER(wxSUNKEN_BORDER) -wxFLAGS_MEMBER(wxDOUBLE_BORDER) -wxFLAGS_MEMBER(wxRAISED_BORDER) -wxFLAGS_MEMBER(wxSTATIC_BORDER) -wxFLAGS_MEMBER(wxBORDER) - -// standard window styles -wxFLAGS_MEMBER(wxTAB_TRAVERSAL) -wxFLAGS_MEMBER(wxCLIP_CHILDREN) -wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) -wxFLAGS_MEMBER(wxWANTS_CHARS) -wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE) -wxFLAGS_MEMBER(wxALWAYS_SHOW_SB ) -wxFLAGS_MEMBER(wxVSCROLL) -wxFLAGS_MEMBER(wxHSCROLL) - -wxFLAGS_MEMBER(wxBU_AUTODRAW) -wxFLAGS_MEMBER(wxBU_LEFT) -wxFLAGS_MEMBER(wxBU_RIGHT) -wxFLAGS_MEMBER(wxBU_TOP) -wxFLAGS_MEMBER(wxBU_BOTTOM) -wxEND_FLAGS( wxCommandLinkButtonStyle ) - -wxBEGIN_PROPERTIES_TABLE(wxCommandLinkButton) -wxPROPERTY( MainLabel, wxString, SetMainLabel, GetMainLabel, wxString(), \ - 0 /*flags*/, wxT("The main label"), wxT("group") ) - -wxPROPERTY( Note, wxString, SetNote, GetNote, wxString(), \ - 0 /*flags*/, wxT("The link URL"), wxT("group") ) -wxPROPERTY_FLAGS( WindowStyle, wxCommandLinkButtonStyle, long, SetWindowStyleFlag, \ - GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \ - wxT("The link style"), wxT("group")) // style -wxEND_PROPERTIES_TABLE() - -wxEMPTY_HANDLERS_TABLE(wxCommandLinkButton) - -wxCONSTRUCTOR_7( wxCommandLinkButton, wxWindow*, Parent, wxWindowID, Id, wxString, \ - MainLabel, wxString, Note, wxPoint, Position, wxSize, Size, long, WindowStyle ) - -// ---------------------------------------------------------------------------- -// Generic command link button -// ---------------------------------------------------------------------------- - -bool wxGenericCommandLinkButton::Create(wxWindow *parent, - wxWindowID id, - const wxString& mainLabel, - const wxString& note, - const wxPoint& pos, - const wxSize& size, - long style, - const wxValidator& validator, - const wxString& name) -{ - if ( !wxButton::Create(parent, - id, - mainLabel + '\n' + note, - pos, - size, - style, - validator, - name) ) - return false; - - if ( !HasNativeBitmap() ) - SetDefaultBitmap(); - - return true; - -} - -void wxGenericCommandLinkButton::SetDefaultBitmap() -{ - SetBitmap(wxArtProvider::GetBitmap(wxART_GO_FORWARD, wxART_BUTTON)); -} - -#endif // wxUSE_COMMANDLINKBUTTON diff --git a/Externals/wxWidgets3/src/generic/datavgen.cpp b/Externals/wxWidgets3/src/generic/datavgen.cpp deleted file mode 100644 index 715b103433..0000000000 --- a/Externals/wxWidgets3/src/generic/datavgen.cpp +++ /dev/null @@ -1,5444 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/generic/datavgen.cpp -// Purpose: wxDataViewCtrl generic implementation -// Author: Robert Roebling -// Modified by: Francesco Montorsi, Guru Kathiresan, Bo Yang -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_DATAVIEWCTRL - -#include "wx/dataview.h" - -#ifdef wxUSE_GENERICDATAVIEWCTRL - -#ifndef WX_PRECOMP - #ifdef __WXMSW__ - #include "wx/msw/private.h" - #include "wx/msw/wrapwin.h" - #include "wx/msw/wrapcctl.h" // include "properly" - #endif - #include "wx/sizer.h" - #include "wx/log.h" - #include "wx/dcclient.h" - #include "wx/timer.h" - #include "wx/settings.h" - #include "wx/msgdlg.h" - #include "wx/dcscreen.h" - #include "wx/frame.h" -#endif - -#include "wx/stockitem.h" -#include "wx/popupwin.h" -#include "wx/renderer.h" -#include "wx/dcbuffer.h" -#include "wx/icon.h" -#include "wx/list.h" -#include "wx/listimpl.cpp" -#include "wx/imaglist.h" -#include "wx/headerctrl.h" -#include "wx/dnd.h" -#include "wx/selstore.h" -#include "wx/stopwatch.h" -#include "wx/weakref.h" -#include "wx/generic/private/widthcalc.h" - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class wxDataViewColumn; -class wxDataViewHeaderWindow; -class wxDataViewCtrl; - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -static const int SCROLL_UNIT_X = 15; - -// the cell padding on the left/right -static const int PADDING_RIGHTLEFT = 3; - -// the expander space margin -static const int EXPANDER_MARGIN = 4; - -#ifdef __WXMSW__ -static const int EXPANDER_OFFSET = 4; -#else -static const int EXPANDER_OFFSET = 1; -#endif - -// Below is the compare stuff. -// For the generic implementation, both the leaf nodes and the nodes are sorted for -// fast search when needed - -// The column is either the index of the column to be used for sorting or one -// of the special values in this enum: -enum -{ - // Sort when we're thawed later. - SortColumn_OnThaw = -3, - - // Don't sort at all. - SortColumn_None = -2, - - // Sort using the model default sort order. - SortColumn_Default = -1 -}; - -// ---------------------------------------------------------------------------- -// helper functions -// ---------------------------------------------------------------------------- - -namespace -{ - -// Return the expander column or, if it is not set, the first column and also -// set it as the expander one for the future. -wxDataViewColumn* GetExpanderColumnOrFirstOne(wxDataViewCtrl* dataview) -{ - wxDataViewColumn* expander = dataview->GetExpanderColumn(); - if (!expander) - { - // TODO-RTL: last column for RTL support - expander = dataview->GetColumnAt( 0 ); - dataview->SetExpanderColumn(expander); - } - - return expander; -} - -wxTextCtrl *CreateEditorTextCtrl(wxWindow *parent, const wxRect& labelRect, const wxString& value) -{ - wxTextCtrl* ctrl = new wxTextCtrl(parent, wxID_ANY, value, - labelRect.GetPosition(), - labelRect.GetSize(), - wxTE_PROCESS_ENTER); - - // Adjust size of wxTextCtrl editor to fit text, even if it means being - // wider than the corresponding column (this is how Explorer behaves). - const int fitting = ctrl->GetSizeFromTextSize(ctrl->GetTextExtent(ctrl->GetValue())).x; - const int current = ctrl->GetSize().x; - const int maxwidth = ctrl->GetParent()->GetSize().x - ctrl->GetPosition().x; - - // Adjust size so that it fits all content. Don't change anything if the - // allocated space is already larger than needed and don't extend wxDVC's - // boundaries. - int width = wxMin(wxMax(current, fitting), maxwidth); - - if ( width != current ) - ctrl->SetSize(wxSize(width, -1)); - - // select the text in the control an place the cursor at the end - ctrl->SetInsertionPointEnd(); - ctrl->SelectAll(); - - return ctrl; -} - -} // anonymous namespace - -//----------------------------------------------------------------------------- -// wxDataViewColumn -//----------------------------------------------------------------------------- - -void wxDataViewColumn::Init(int width, wxAlignment align, int flags) -{ - m_width = width; - m_minWidth = 0; - m_align = align; - m_flags = flags; - m_sort = false; - m_sortAscending = true; -} - -int wxDataViewColumn::GetWidth() const -{ - switch ( m_width ) - { - case wxCOL_WIDTH_DEFAULT: - return wxDVC_DEFAULT_WIDTH; - - case wxCOL_WIDTH_AUTOSIZE: - wxCHECK_MSG( m_owner, wxDVC_DEFAULT_WIDTH, "no owner control" ); - return m_owner->GetBestColumnWidth(m_owner->GetColumnIndex(this)); - - default: - return m_width; - } -} - -void wxDataViewColumn::UpdateDisplay() -{ - if (m_owner) - { - int idx = m_owner->GetColumnIndex( this ); - m_owner->OnColumnChange( idx ); - } -} - -void wxDataViewColumn::UnsetAsSortKey() -{ - m_sort = false; - - if ( m_owner ) - m_owner->DontUseColumnForSorting(m_owner->GetColumnIndex(this)); - - UpdateDisplay(); -} - -void wxDataViewColumn::SetSortOrder(bool ascending) -{ - if ( !m_owner ) - return; - - const int idx = m_owner->GetColumnIndex(this); - - // If this column isn't sorted already, mark it as sorted - if ( !m_sort ) - { - wxASSERT(!m_owner->IsColumnSorted(idx)); - - // Now set this one as the new sort column. - m_owner->UseColumnForSorting(idx); - m_sort = true; - } - - m_sortAscending = ascending; - - // Call this directly instead of using UpdateDisplay() as we already have - // the column index, no need to look it up again. - m_owner->OnColumnChange(idx); -} - -//----------------------------------------------------------------------------- -// wxDataViewHeaderWindow -//----------------------------------------------------------------------------- - -class wxDataViewHeaderWindow : public wxHeaderCtrl -{ -public: - wxDataViewHeaderWindow(wxDataViewCtrl *parent) - : wxHeaderCtrl(parent) - { - } - - wxDataViewCtrl *GetOwner() const - { return static_cast(GetParent()); } - - // Add/Remove additional column to sorting columns - void ToggleSortByColumn(int column) - { - wxDataViewCtrl * const owner = GetOwner(); - - if ( !owner->IsMultiColumnSortAllowed() ) - return; - - wxDataViewColumn * const col = owner->GetColumn(column); - if ( !col->IsSortable() ) - return; - - if ( owner->IsColumnSorted(column) ) - { - col->UnsetAsSortKey(); - SendEvent(wxEVT_DATAVIEW_COLUMN_SORTED, column); - } - else // Do start sortign by it. - { - col->SetSortOrder(true); - SendEvent(wxEVT_DATAVIEW_COLUMN_SORTED, column); - } - } - -protected: - // implement/override wxHeaderCtrl functions by forwarding them to the main - // control - virtual const wxHeaderColumn& GetColumn(unsigned int idx) const - { - return *(GetOwner()->GetColumn(idx)); - } - - virtual bool UpdateColumnWidthToFit(unsigned int idx, int widthTitle) - { - wxDataViewCtrl * const owner = GetOwner(); - - int widthContents = owner->GetBestColumnWidth(idx); - owner->GetColumn(idx)->SetWidth(wxMax(widthTitle, widthContents)); - owner->OnColumnChange(idx); - - return true; - } - -private: - void FinishEditing(); - - bool SendEvent(wxEventType type, unsigned int n) - { - wxDataViewCtrl * const owner = GetOwner(); - wxDataViewEvent event(type, owner->GetId()); - - event.SetEventObject(owner); - event.SetColumn(n); - event.SetDataViewColumn(owner->GetColumn(n)); - event.SetModel(owner->GetModel()); - - // for events created by wxDataViewHeaderWindow the - // row / value fields are not valid - return owner->ProcessWindowEvent(event); - } - - void OnClick(wxHeaderCtrlEvent& event) - { - FinishEditing(); - - const unsigned idx = event.GetColumn(); - - if ( SendEvent(wxEVT_DATAVIEW_COLUMN_HEADER_CLICK, idx) ) - return; - - // default handling for the column click is to sort by this column or - // toggle its sort order - wxDataViewCtrl * const owner = GetOwner(); - wxDataViewColumn * const col = owner->GetColumn(idx); - if ( !col->IsSortable() ) - { - // no default handling for non-sortable columns - event.Skip(); - return; - } - - if ( col->IsSortKey() ) - { - // already using this column for sorting, just change the order - col->ToggleSortOrder(); - } - else // not using this column for sorting yet - { - // We will sort by this column only now, so reset all the - // previously used ones. - owner->ResetAllSortColumns(); - - // Sort the column - col->SetSortOrder(true); - } - - wxDataViewModel * const model = owner->GetModel(); - if ( model ) - model->Resort(); - - owner->OnColumnChange(idx); - - SendEvent(wxEVT_DATAVIEW_COLUMN_SORTED, idx); - } - - void OnRClick(wxHeaderCtrlEvent& event) - { - // Event wasn't processed somewhere, use default behaviour - if ( !SendEvent(wxEVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK, - event.GetColumn()) ) - { - event.Skip(); - ToggleSortByColumn(event.GetColumn()); - } - } - - void OnResize(wxHeaderCtrlEvent& event) - { - FinishEditing(); - - wxDataViewCtrl * const owner = GetOwner(); - - const unsigned col = event.GetColumn(); - owner->GetColumn(col)->SetWidth(event.GetWidth()); - GetOwner()->OnColumnChange(col); - } - - void OnEndReorder(wxHeaderCtrlEvent& event) - { - FinishEditing(); - - wxDataViewCtrl * const owner = GetOwner(); - owner->ColumnMoved(owner->GetColumn(event.GetColumn()), - event.GetNewOrder()); - } - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_NO_COPY_CLASS(wxDataViewHeaderWindow); -}; - -wxBEGIN_EVENT_TABLE(wxDataViewHeaderWindow, wxHeaderCtrl) - EVT_HEADER_CLICK(wxID_ANY, wxDataViewHeaderWindow::OnClick) - EVT_HEADER_RIGHT_CLICK(wxID_ANY, wxDataViewHeaderWindow::OnRClick) - - EVT_HEADER_RESIZING(wxID_ANY, wxDataViewHeaderWindow::OnResize) - EVT_HEADER_END_RESIZE(wxID_ANY, wxDataViewHeaderWindow::OnResize) - - EVT_HEADER_END_REORDER(wxID_ANY, wxDataViewHeaderWindow::OnEndReorder) -wxEND_EVENT_TABLE() - -//----------------------------------------------------------------------------- -// wxDataViewRenameTimer -//----------------------------------------------------------------------------- - -class wxDataViewRenameTimer: public wxTimer -{ -private: - wxDataViewMainWindow *m_owner; - -public: - wxDataViewRenameTimer( wxDataViewMainWindow *owner ); - void Notify(); -}; - -//----------------------------------------------------------------------------- -// wxDataViewTreeNode -//----------------------------------------------------------------------------- - -class wxDataViewMainWindow; -class wxDataViewTreeNode; -WX_DEFINE_ARRAY( wxDataViewTreeNode *, wxDataViewTreeNodes ); - -class wxDataViewTreeNode -{ -public: - wxDataViewTreeNode(wxDataViewMainWindow *window, - wxDataViewTreeNode *parent, - const wxDataViewItem& item) - : m_window(window), - m_parent(parent), - m_item(item), - m_branchData(NULL) - { - } - - ~wxDataViewTreeNode() - { - if ( m_branchData ) - { - wxDataViewTreeNodes& nodes = m_branchData->children; - for ( wxDataViewTreeNodes::iterator i = nodes.begin(); - i != nodes.end(); - ++i ) - { - delete *i; - } - - delete m_branchData; - } - } - - static wxDataViewTreeNode* CreateRootNode(wxDataViewMainWindow *w) - { - wxDataViewTreeNode *n = new wxDataViewTreeNode(w, NULL, wxDataViewItem()); - n->m_branchData = new BranchNodeData; - n->m_branchData->open = true; - return n; - } - - wxDataViewTreeNode * GetParent() const { return m_parent; } - - const wxDataViewTreeNodes& GetChildNodes() const - { - wxASSERT( m_branchData != NULL ); - return m_branchData->children; - } - - void InsertChild(wxDataViewTreeNode *node, unsigned index); - - void RemoveChild(wxDataViewTreeNode *node) - { - wxCHECK_RET( m_branchData != NULL, "leaf node doesn't have children" ); - m_branchData->children.Remove(node); - } - - // returns position of child node for given item in children list or wxNOT_FOUND - int FindChildByItem(const wxDataViewItem& item) const - { - if ( !m_branchData ) - return wxNOT_FOUND; - - const wxDataViewTreeNodes& nodes = m_branchData->children; - const int len = nodes.size(); - for ( int i = 0; i < len; i++ ) - { - if ( nodes[i]->m_item == item ) - return i; - } - return wxNOT_FOUND; - } - - const wxDataViewItem & GetItem() const { return m_item; } - void SetItem( const wxDataViewItem & item ) { m_item = item; } - - int GetIndentLevel() const - { - int ret = 0; - const wxDataViewTreeNode * node = this; - while( node->GetParent()->GetParent() != NULL ) - { - node = node->GetParent(); - ret ++; - } - return ret; - } - - bool IsOpen() const - { - return m_branchData && m_branchData->open; - } - - void ToggleOpen() - { - // We do not allow the (invisible) root node to be collapsed because - // there is no way to expand it again. - if ( !m_parent ) - return; - - wxCHECK_RET( m_branchData != NULL, "can't open leaf node" ); - - int sum = 0; - - const wxDataViewTreeNodes& nodes = m_branchData->children; - const int len = nodes.GetCount(); - for ( int i = 0;i < len; i ++) - sum += 1 + nodes[i]->GetSubTreeCount(); - - if (m_branchData->open) - { - ChangeSubTreeCount(-sum); - m_branchData->open = !m_branchData->open; - } - else - { - m_branchData->open = !m_branchData->open; - ChangeSubTreeCount(+sum); - } - } - - // "HasChildren" property corresponds to model's IsContainer(). Note that it may be true - // even if GetChildNodes() is empty; see below. - bool HasChildren() const - { - return m_branchData != NULL; - } - - void SetHasChildren(bool has) - { - // The invisible root item always has children, so ignore any attempts - // to change this. - if ( !m_parent ) - return; - - if ( !has ) - { - wxDELETE(m_branchData); - } - else if ( m_branchData == NULL ) - { - m_branchData = new BranchNodeData; - } - } - - int GetSubTreeCount() const - { - return m_branchData ? m_branchData->subTreeCount : 0; - } - - void ChangeSubTreeCount( int num ) - { - wxASSERT( m_branchData != NULL ); - - if( !m_branchData->open ) - return; - - m_branchData->subTreeCount += num; - wxASSERT( m_branchData->subTreeCount >= 0 ); - - if( m_parent ) - m_parent->ChangeSubTreeCount(num); - } - - void Resort(); - -private: - wxDataViewMainWindow * const m_window; - wxDataViewTreeNode *m_parent; - - // Corresponding model item. - wxDataViewItem m_item; - - // Data specific to non-leaf (branch, inner) nodes. They are kept in a - // separate struct in order to conserve memory. - struct BranchNodeData - { - BranchNodeData() - : open(false), - subTreeCount(0) - { - } - - // Child nodes. Note that this may be empty even if m_hasChildren in - // case this branch of the tree wasn't expanded and realized yet. - wxDataViewTreeNodes children; - - // Is the branch node currently open (expanded)? - bool open; - - // Total count of expanded (i.e. visible with the help of some - // scrolling) items in the subtree, but excluding this node. I.e. it is - // 0 for leaves and is the number of rows the subtree occupies for - // branch nodes. - int subTreeCount; - }; - - BranchNodeData *m_branchData; -}; - - - -//----------------------------------------------------------------------------- -// wxDataViewMainWindow -//----------------------------------------------------------------------------- - -WX_DEFINE_SORTED_ARRAY_SIZE_T(unsigned int, wxDataViewSelection); - -class wxDataViewMainWindow: public wxWindow -{ -public: - wxDataViewMainWindow( wxDataViewCtrl *parent, - wxWindowID id, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - const wxString &name = wxT("wxdataviewctrlmainwindow") ); - virtual ~wxDataViewMainWindow(); - - bool IsList() const { return GetModel()->IsListModel(); } - bool IsVirtualList() const { return m_root == NULL; } - - // notifications from wxDataViewModel - bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item ); - bool ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item ); - bool ItemChanged( const wxDataViewItem &item ); - bool ValueChanged( const wxDataViewItem &item, unsigned int model_column ); - bool Cleared(); - void Resort() - { - if (!IsVirtualList()) - { - SortPrepare(); - m_root->Resort(); - } - UpdateDisplay(); - } - - // Override the base class method to resort if needed, i.e. if - // SortPrepare() was called -- and ignored -- while we were frozen. - virtual void DoThaw() - { - if ( m_sortColumn == SortColumn_OnThaw ) - { - Resort(); - m_sortColumn = SortColumn_None; - } - - wxWindow::DoThaw(); - } - - void SortPrepare() - { - wxDataViewModel* model = GetModel(); - - wxDataViewColumn* col = GetOwner()->GetSortingColumn(); - if( !col ) - { - if (model->HasDefaultCompare()) - { - // See below for the explanation of IsFrozen() test. - if ( IsFrozen() ) - m_sortColumn = SortColumn_OnThaw; - else - m_sortColumn = SortColumn_Default; - } - else - m_sortColumn = SortColumn_None; - - m_sortAscending = true; - return; - } - - // Avoid sorting while the window is frozen, this allows to quickly add - // many items without resorting after each addition and only resort - // them all at once when the window is finally thawed, see above. - if ( IsFrozen() ) - { - m_sortColumn = SortColumn_OnThaw; - return; - } - - m_sortColumn = col->GetModelColumn(); - m_sortAscending = col->IsSortOrderAscending(); - } - - void SetOwner( wxDataViewCtrl* owner ) { m_owner = owner; } - wxDataViewCtrl *GetOwner() { return m_owner; } - const wxDataViewCtrl *GetOwner() const { return m_owner; } - - wxDataViewModel* GetModel() { return GetOwner()->GetModel(); } - const wxDataViewModel* GetModel() const { return GetOwner()->GetModel(); } - -#if wxUSE_DRAG_AND_DROP - wxBitmap CreateItemBitmap( unsigned int row, int &indent ); -#endif // wxUSE_DRAG_AND_DROP - void OnPaint( wxPaintEvent &event ); - void OnCharHook( wxKeyEvent &event ); - void OnChar( wxKeyEvent &event ); - void OnVerticalNavigation(const wxKeyEvent& event, int delta); - void OnLeftKey(wxKeyEvent& event); - void OnRightKey(wxKeyEvent& event); - void OnMouse( wxMouseEvent &event ); - void OnSetFocus( wxFocusEvent &event ); - void OnKillFocus( wxFocusEvent &event ); - - void UpdateDisplay(); - void RecalculateDisplay(); - void OnInternalIdle(); - - void OnRenameTimer(); - - void ScrollWindow( int dx, int dy, const wxRect *rect = NULL ); - void ScrollTo( int rows, int column ); - - unsigned GetCurrentRow() const { return m_currentRow; } - bool HasCurrentRow() { return m_currentRow != (unsigned int)-1; } - void ChangeCurrentRow( unsigned int row ); - bool TryAdvanceCurrentColumn(wxDataViewTreeNode *node, wxKeyEvent& event, bool forward); - - wxDataViewColumn *GetCurrentColumn() const { return m_currentCol; } - void ClearCurrentColumn() { m_currentCol = NULL; } - - bool IsSingleSel() const { return !GetParent()->HasFlag(wxDV_MULTIPLE); } - bool IsEmpty() { return GetRowCount() == 0; } - - int GetCountPerPage() const; - int GetEndOfLastCol() const; - unsigned int GetFirstVisibleRow() const; - - // I change this method to un const because in the tree view, - // the displaying number of the tree are changing along with the - // expanding/collapsing of the tree nodes - unsigned int GetLastVisibleRow(); - unsigned int GetRowCount() const; - - const wxSelectionStore& GetSelections() const { return m_selection; } - void ClearSelection() { m_selection.SelectRange(0, GetRowCount() - 1, false); } - void Select( const wxArrayInt& aSelections ); - - void SelectAllRows() - { - m_selection.SelectRange(0, GetRowCount() - 1); - Refresh(); - } - - // If a valid row is specified and it was previously selected, it is left - // selected and the function returns false. Otherwise, i.e. if there is - // really no selection left in the control, it returns true. - bool UnselectAllRows(unsigned int except = (unsigned int)-1); - - void SelectRow( unsigned int row, bool on ); - void SelectRows( unsigned int from, unsigned int to ); - void ReverseRowSelection( unsigned int row ); - bool IsRowSelected( unsigned int row ); - void SendSelectionChangedEvent( const wxDataViewItem& item); - - void RefreshRow( unsigned int row ); - void RefreshRows( unsigned int from, unsigned int to ); - void RefreshRowsAfter( unsigned int firstRow ); - - // returns the colour to be used for drawing the rules - wxColour GetRuleColour() const - { - return wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT); - } - - wxRect GetLineRect( unsigned int row ) const; - - int GetLineStart( unsigned int row ) const; // row * m_lineHeight in fixed mode - int GetLineHeight( unsigned int row ) const; // m_lineHeight in fixed mode - int GetLineAt( unsigned int y ) const; // y / m_lineHeight in fixed mode - - void SetRowHeight( int lineHeight ) { m_lineHeight = lineHeight; } - int GetRowHeight() const { return m_lineHeight; } - int GetDefaultRowHeight() const; - - // Some useful functions for row and item mapping - wxDataViewItem GetItemByRow( unsigned int row ) const; - int GetRowByItem( const wxDataViewItem & item ) const; - - wxDataViewTreeNode * GetTreeNodeByRow( unsigned int row ) const; - // We did not need this temporarily - // wxDataViewTreeNode * GetTreeNodeByItem( const wxDataViewItem & item ); - - // Methods for building the mapping tree - void BuildTree( wxDataViewModel * model ); - void DestroyTree(); - void HitTest( const wxPoint & point, wxDataViewItem & item, wxDataViewColumn* &column ); - wxRect GetItemRect( const wxDataViewItem & item, const wxDataViewColumn* column ); - - void Expand( unsigned int row ); - void Collapse( unsigned int row ); - bool IsExpanded( unsigned int row ) const; - bool HasChildren( unsigned int row ) const; - -#if wxUSE_DRAG_AND_DROP - bool EnableDragSource( const wxDataFormat &format ); - bool EnableDropTarget( const wxDataFormat &format ); - - void RemoveDropHint(); - wxDragResult OnDragOver( wxDataFormat format, wxCoord x, wxCoord y, wxDragResult def ); - bool OnDrop( wxDataFormat format, wxCoord x, wxCoord y ); - wxDragResult OnData( wxDataFormat format, wxCoord x, wxCoord y, wxDragResult def ); - void OnLeave(); -#endif // wxUSE_DRAG_AND_DROP - - void OnColumnsCountChanged(); - - // Adjust last column to window size - void UpdateColumnSizes(); - - // Called by wxDataViewCtrl and our own OnRenameTimer() to start edit the - // specified item in the given column. - void StartEditing(const wxDataViewItem& item, const wxDataViewColumn* col); - void FinishEditing(); - - int GetSortColumn() const { return m_sortColumn; } - bool IsAscendingSort() const { return m_sortAscending; } - -private: - void InvalidateCount() { m_count = -1; } - void UpdateCount(int count) - { - m_count = count; - m_selection.SetItemCount(count); - } - - int RecalculateCount() const; - - // Return false only if the event was vetoed by its handler. - bool SendExpanderEvent(wxEventType type, const wxDataViewItem& item); - - wxDataViewTreeNode * FindNode( const wxDataViewItem & item ); - - wxDataViewColumn *FindColumnForEditing(const wxDataViewItem& item, wxDataViewCellMode mode); - - bool IsCellEditableInMode(const wxDataViewItem& item, const wxDataViewColumn *col, wxDataViewCellMode mode) const; - - void DrawCellBackground( wxDataViewRenderer* cell, wxDC& dc, const wxRect& rect ); - -private: - wxDataViewCtrl *m_owner; - int m_lineHeight; - bool m_dirty; - - wxDataViewColumn *m_currentCol; - unsigned int m_currentRow; - wxSelectionStore m_selection; - - wxDataViewRenameTimer *m_renameTimer; - bool m_lastOnSame; - - bool m_hasFocus; - bool m_useCellFocus; - bool m_currentColSetByKeyboard; - -#if wxUSE_DRAG_AND_DROP - int m_dragCount; - wxPoint m_dragStart; - - bool m_dragEnabled; - wxDataFormat m_dragFormat; - - bool m_dropEnabled; - wxDataFormat m_dropFormat; - bool m_dropHint; - unsigned int m_dropHintLine; -#endif // wxUSE_DRAG_AND_DROP - - // for double click logic - unsigned int m_lineLastClicked, - m_lineBeforeLastClicked, - m_lineSelectSingleOnUp; - - // the pen used to draw horiz/vertical rules - wxPen m_penRule; - - // the pen used to draw the expander and the lines - wxPen m_penExpander; - - // This is the tree structure of the model - wxDataViewTreeNode * m_root; - int m_count; - - // This is the tree node under the cursor - wxDataViewTreeNode * m_underMouse; - - // sorted column + extra flags - int m_sortColumn; - bool m_sortAscending; - - // The control used for editing or NULL. - wxWeakRef m_editorCtrl; - - // Id m_editorCtrl is non-NULL, pointer to the associated renderer. - wxDataViewRenderer* m_editorRenderer; - -private: - wxDECLARE_DYNAMIC_CLASS(wxDataViewMainWindow); - wxDECLARE_EVENT_TABLE(); -}; - -// --------------------------------------------------------- -// wxGenericDataViewModelNotifier -// --------------------------------------------------------- - -class wxGenericDataViewModelNotifier: public wxDataViewModelNotifier -{ -public: - wxGenericDataViewModelNotifier( wxDataViewMainWindow *mainWindow ) - { m_mainWindow = mainWindow; } - - virtual bool ItemAdded( const wxDataViewItem & parent, const wxDataViewItem & item ) - { return m_mainWindow->ItemAdded( parent , item ); } - virtual bool ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item ) - { return m_mainWindow->ItemDeleted( parent, item ); } - virtual bool ItemChanged( const wxDataViewItem & item ) - { return m_mainWindow->ItemChanged(item); } - virtual bool ValueChanged( const wxDataViewItem & item , unsigned int col ) - { return m_mainWindow->ValueChanged( item, col ); } - virtual bool Cleared() - { return m_mainWindow->Cleared(); } - virtual void Resort() - { m_mainWindow->Resort(); } - - wxDataViewMainWindow *m_mainWindow; -}; - -// --------------------------------------------------------- -// wxDataViewRenderer -// --------------------------------------------------------- - -wxIMPLEMENT_ABSTRACT_CLASS(wxDataViewRenderer, wxDataViewRendererBase); - -wxDataViewRenderer::wxDataViewRenderer( const wxString &varianttype, - wxDataViewCellMode mode, - int align) : - wxDataViewCustomRendererBase( varianttype, mode, align ) -{ - m_align = align; - m_mode = mode; - m_ellipsizeMode = wxELLIPSIZE_MIDDLE; - m_dc = NULL; -} - -wxDataViewRenderer::~wxDataViewRenderer() -{ - delete m_dc; -} - -wxDC *wxDataViewRenderer::GetDC() -{ - if (m_dc == NULL) - { - if (GetOwner() == NULL) - return NULL; - if (GetOwner()->GetOwner() == NULL) - return NULL; - m_dc = new wxClientDC( GetOwner()->GetOwner() ); - } - - return m_dc; -} - -void wxDataViewRenderer::SetAlignment( int align ) -{ - m_align=align; -} - -int wxDataViewRenderer::GetAlignment() const -{ - return m_align; -} - -// --------------------------------------------------------- -// wxDataViewCustomRenderer -// --------------------------------------------------------- - -wxIMPLEMENT_ABSTRACT_CLASS(wxDataViewCustomRenderer, wxDataViewRenderer); - -wxDataViewCustomRenderer::wxDataViewCustomRenderer( const wxString &varianttype, - wxDataViewCellMode mode, int align ) : - wxDataViewRenderer( varianttype, mode, align ) -{ -} - -// --------------------------------------------------------- -// wxDataViewTextRenderer -// --------------------------------------------------------- - -wxIMPLEMENT_CLASS(wxDataViewTextRenderer, wxDataViewRenderer); - -wxDataViewTextRenderer::wxDataViewTextRenderer( const wxString &varianttype, - wxDataViewCellMode mode, int align ) : - wxDataViewRenderer( varianttype, mode, align ) -{ -} - -bool wxDataViewTextRenderer::SetValue( const wxVariant &value ) -{ - m_text = value.GetString(); - - return true; -} - -bool wxDataViewTextRenderer::GetValue( wxVariant& WXUNUSED(value) ) const -{ - return false; -} - -bool wxDataViewTextRenderer::HasEditorCtrl() const -{ - return true; -} - -wxWindow* wxDataViewTextRenderer::CreateEditorCtrl( wxWindow *parent, - wxRect labelRect, const wxVariant &value ) -{ - return CreateEditorTextCtrl(parent, labelRect, value); -} - -bool wxDataViewTextRenderer::GetValueFromEditorCtrl( wxWindow *editor, wxVariant &value ) -{ - wxTextCtrl *text = (wxTextCtrl*) editor; - value = text->GetValue(); - return true; -} - -bool wxDataViewTextRenderer::Render(wxRect rect, wxDC *dc, int state) -{ - RenderText(m_text, 0, rect, dc, state); - return true; -} - -wxSize wxDataViewTextRenderer::GetSize() const -{ - if (!m_text.empty()) - return GetTextExtent(m_text); - else - return wxSize(wxDVC_DEFAULT_RENDERER_SIZE,wxDVC_DEFAULT_RENDERER_SIZE); -} - -// --------------------------------------------------------- -// wxDataViewBitmapRenderer -// --------------------------------------------------------- - -wxIMPLEMENT_CLASS(wxDataViewBitmapRenderer, wxDataViewRenderer); - -wxDataViewBitmapRenderer::wxDataViewBitmapRenderer( const wxString &varianttype, - wxDataViewCellMode mode, int align ) : - wxDataViewRenderer( varianttype, mode, align ) -{ -} - -bool wxDataViewBitmapRenderer::SetValue( const wxVariant &value ) -{ - if (value.GetType() == wxT("wxBitmap")) - m_bitmap << value; - if (value.GetType() == wxT("wxIcon")) - m_icon << value; - - return true; -} - -bool wxDataViewBitmapRenderer::GetValue( wxVariant& WXUNUSED(value) ) const -{ - return false; -} - -bool wxDataViewBitmapRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) ) -{ - if (m_bitmap.IsOk()) - dc->DrawBitmap( m_bitmap, cell.x, cell.y, true /* use mask */ ); - else if (m_icon.IsOk()) - dc->DrawIcon( m_icon, cell.x, cell.y ); - - return true; -} - -wxSize wxDataViewBitmapRenderer::GetSize() const -{ - if (m_bitmap.IsOk()) - return wxSize( m_bitmap.GetWidth(), m_bitmap.GetHeight() ); - else if (m_icon.IsOk()) - return wxSize( m_icon.GetWidth(), m_icon.GetHeight() ); - - return wxSize(wxDVC_DEFAULT_RENDERER_SIZE,wxDVC_DEFAULT_RENDERER_SIZE); -} - -// --------------------------------------------------------- -// wxDataViewToggleRenderer -// --------------------------------------------------------- - -wxIMPLEMENT_ABSTRACT_CLASS(wxDataViewToggleRenderer, wxDataViewRenderer); - -wxDataViewToggleRenderer::wxDataViewToggleRenderer( const wxString &varianttype, - wxDataViewCellMode mode, int align ) : - wxDataViewRenderer( varianttype, mode, align ) -{ - m_toggle = false; -} - -bool wxDataViewToggleRenderer::SetValue( const wxVariant &value ) -{ - m_toggle = value.GetBool(); - - return true; -} - -bool wxDataViewToggleRenderer::GetValue( wxVariant &WXUNUSED(value) ) const -{ - return false; -} - -bool wxDataViewToggleRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) ) -{ - int flags = 0; - if (m_toggle) - flags |= wxCONTROL_CHECKED; - if (GetMode() != wxDATAVIEW_CELL_ACTIVATABLE || - GetEnabled() == false) - flags |= wxCONTROL_DISABLED; - - // Ensure that the check boxes always have at least the minimal required - // size, otherwise DrawCheckBox() doesn't really work well. If this size is - // greater than the cell size, the checkbox will be truncated but this is a - // lesser evil. - wxSize size = cell.GetSize(); - size.IncTo(GetSize()); - cell.SetSize(size); - - wxRendererNative::Get().DrawCheckBox( - GetOwner()->GetOwner(), - *dc, - cell, - flags ); - - return true; -} - -bool wxDataViewToggleRenderer::WXActivateCell(const wxRect& WXUNUSED(cellRect), - wxDataViewModel *model, - const wxDataViewItem& item, - unsigned int col, - const wxMouseEvent *mouseEvent) -{ - if ( mouseEvent ) - { - // Only react to clicks directly on the checkbox, not elsewhere in the - // same cell. - if ( !wxRect(GetSize()).Contains(mouseEvent->GetPosition()) ) - return false; - } - - model->ChangeValue(!m_toggle, item, col); - return true; -} - -wxSize wxDataViewToggleRenderer::GetSize() const -{ - return wxRendererNative::Get().GetCheckBoxSize(GetView()); -} - -// --------------------------------------------------------- -// wxDataViewProgressRenderer -// --------------------------------------------------------- - -wxIMPLEMENT_ABSTRACT_CLASS(wxDataViewProgressRenderer, wxDataViewRenderer); - -wxDataViewProgressRenderer::wxDataViewProgressRenderer( const wxString &label, - const wxString &varianttype, wxDataViewCellMode mode, int align ) : - wxDataViewRenderer( varianttype, mode, align ) -{ - m_label = label; - m_value = 0; -} - -bool wxDataViewProgressRenderer::SetValue( const wxVariant &value ) -{ - m_value = (long) value; - - if (m_value < 0) m_value = 0; - if (m_value > 100) m_value = 100; - - return true; -} - -bool wxDataViewProgressRenderer::GetValue( wxVariant &value ) const -{ - value = (long) m_value; - return true; -} - -bool -wxDataViewProgressRenderer::Render(wxRect rect, wxDC *dc, int WXUNUSED(state)) -{ - wxRendererNative::Get().DrawGauge( - GetOwner()->GetOwner(), - *dc, - rect, - m_value, - 100); - - return true; -} - -wxSize wxDataViewProgressRenderer::GetSize() const -{ - // Return -1 width because a progress bar fits any width; unlike most - // renderers, it doesn't have a "good" width for the content. This makes it - // grow to the whole column, which is pretty much always the desired - // behaviour. Keep the height fixed so that the progress bar isn't too fat. - return wxSize(-1, 12); -} - -// --------------------------------------------------------- -// wxDataViewIconTextRenderer -// --------------------------------------------------------- - -wxIMPLEMENT_CLASS(wxDataViewIconTextRenderer, wxDataViewRenderer); - -wxDataViewIconTextRenderer::wxDataViewIconTextRenderer( -const wxString &varianttype, wxDataViewCellMode mode, int align ) : - wxDataViewRenderer( varianttype, mode, align ) -{ - SetMode(mode); - SetAlignment(align); -} - -bool wxDataViewIconTextRenderer::SetValue( const wxVariant &value ) -{ - m_value << value; - return true; -} - -bool wxDataViewIconTextRenderer::GetValue( wxVariant& WXUNUSED(value) ) const -{ - return false; -} - -bool wxDataViewIconTextRenderer::Render(wxRect rect, wxDC *dc, int state) -{ - int xoffset = 0; - - const wxIcon& icon = m_value.GetIcon(); - if ( icon.IsOk() ) - { - dc->DrawIcon(icon, rect.x, rect.y + (rect.height - icon.GetHeight())/2); - xoffset = icon.GetWidth()+4; - } - - RenderText(m_value.GetText(), xoffset, rect, dc, state); - - return true; -} - -wxSize wxDataViewIconTextRenderer::GetSize() const -{ - if (!m_value.GetText().empty()) - { - wxSize size = GetTextExtent(m_value.GetText()); - - if (m_value.GetIcon().IsOk()) - size.x += m_value.GetIcon().GetWidth() + 4; - return size; - } - return wxSize(80,20); -} - -wxWindow* wxDataViewIconTextRenderer::CreateEditorCtrl(wxWindow *parent, wxRect labelRect, const wxVariant& value) -{ - wxDataViewIconText iconText; - iconText << value; - - wxString text = iconText.GetText(); - - // adjust the label rect to take the width of the icon into account - if (iconText.GetIcon().IsOk()) - { - int w = iconText.GetIcon().GetWidth() + 4; - labelRect.x += w; - labelRect.width -= w; - } - - return CreateEditorTextCtrl(parent, labelRect, text); -} - -bool wxDataViewIconTextRenderer::GetValueFromEditorCtrl( wxWindow *editor, wxVariant& value ) -{ - wxTextCtrl *text = (wxTextCtrl*) editor; - - // The icon can't be edited so get its old value and reuse it. - wxVariant valueOld; - wxDataViewColumn* const col = GetOwner(); - GetView()->GetModel()->GetValue(valueOld, m_item, col->GetModelColumn()); - - wxDataViewIconText iconText; - iconText << valueOld; - - // But replace the text with the value entered by user. - iconText.SetText(text->GetValue()); - - value << iconText; - return true; -} - -//----------------------------------------------------------------------------- -// wxDataViewDropTarget -//----------------------------------------------------------------------------- - -#if wxUSE_DRAG_AND_DROP - -class wxBitmapCanvas: public wxWindow -{ -public: - wxBitmapCanvas( wxWindow *parent, const wxBitmap &bitmap, const wxSize &size ) : - wxWindow( parent, wxID_ANY, wxPoint(0,0), size ) - { - m_bitmap = bitmap; - Connect( wxEVT_PAINT, wxPaintEventHandler(wxBitmapCanvas::OnPaint) ); - } - - void OnPaint( wxPaintEvent &WXUNUSED(event) ) - { - wxPaintDC dc(this); - dc.DrawBitmap( m_bitmap, 0, 0); - } - - wxBitmap m_bitmap; -}; - -class wxDataViewDropSource: public wxDropSource -{ -public: - wxDataViewDropSource( wxDataViewMainWindow *win, unsigned int row ) : - wxDropSource( win ) - { - m_win = win; - m_row = row; - m_hint = NULL; - } - - ~wxDataViewDropSource() - { - delete m_hint; - } - - virtual bool GiveFeedback( wxDragResult WXUNUSED(effect) ) - { - wxPoint pos = wxGetMousePosition(); - - if (!m_hint) - { - int liney = m_win->GetLineStart( m_row ); - int linex = 0; - m_win->GetOwner()->CalcUnscrolledPosition( 0, liney, NULL, &liney ); - m_win->ClientToScreen( &linex, &liney ); - m_dist_x = pos.x - linex; - m_dist_y = pos.y - liney; - - int indent = 0; - wxBitmap ib = m_win->CreateItemBitmap( m_row, indent ); - m_dist_x -= indent; - m_hint = new wxFrame( m_win->GetParent(), wxID_ANY, wxEmptyString, - wxPoint(pos.x - m_dist_x, pos.y + 5 ), - ib.GetSize(), - wxFRAME_TOOL_WINDOW | - wxFRAME_FLOAT_ON_PARENT | - wxFRAME_NO_TASKBAR | - wxNO_BORDER ); - new wxBitmapCanvas( m_hint, ib, ib.GetSize() ); - m_hint->Show(); - } - else - { - m_hint->Move( pos.x - m_dist_x, pos.y + 5 ); - m_hint->SetTransparent( 128 ); - } - - return false; - } - - wxDataViewMainWindow *m_win; - unsigned int m_row; - wxFrame *m_hint; - int m_dist_x,m_dist_y; -}; - - -class wxDataViewDropTarget: public wxDropTarget -{ -public: - wxDataViewDropTarget( wxDataObject *obj, wxDataViewMainWindow *win ) : - wxDropTarget( obj ) - { - m_win = win; - } - - virtual wxDragResult OnDragOver( wxCoord x, wxCoord y, wxDragResult def ) - { - wxDataFormat format = GetMatchingPair(); - if (format == wxDF_INVALID) - return wxDragNone; - return m_win->OnDragOver( format, x, y, def); - } - - virtual bool OnDrop( wxCoord x, wxCoord y ) - { - wxDataFormat format = GetMatchingPair(); - if (format == wxDF_INVALID) - return false; - return m_win->OnDrop( format, x, y ); - } - - virtual wxDragResult OnData( wxCoord x, wxCoord y, wxDragResult def ) - { - wxDataFormat format = GetMatchingPair(); - if (format == wxDF_INVALID) - return wxDragNone; - if (!GetData()) - return wxDragNone; - return m_win->OnData( format, x, y, def ); - } - - virtual void OnLeave() - { m_win->OnLeave(); } - - wxDataViewMainWindow *m_win; -}; - -#endif // wxUSE_DRAG_AND_DROP - -//----------------------------------------------------------------------------- -// wxDataViewRenameTimer -//----------------------------------------------------------------------------- - -wxDataViewRenameTimer::wxDataViewRenameTimer( wxDataViewMainWindow *owner ) -{ - m_owner = owner; -} - -void wxDataViewRenameTimer::Notify() -{ - m_owner->OnRenameTimer(); -} - - - -// ---------------------------------------------------------------------------- -// wxDataViewTreeNode -// ---------------------------------------------------------------------------- - -// Used by wxGenericTreeModelNodeCmp sort callback only. -// -// This is not thread safe but it should be fine if all events are handled in -// one thread. -static wxDataViewModel* g_model; -static int g_column; -static bool g_asending; - -int LINKAGEMODE wxGenericTreeModelNodeCmp(wxDataViewTreeNode ** node1, - wxDataViewTreeNode ** node2) -{ - return g_model->Compare((*node1)->GetItem(), (*node2)->GetItem(), g_column, g_asending); -} - - -void wxDataViewTreeNode::InsertChild(wxDataViewTreeNode *node, unsigned index) -{ - if (!m_branchData) - m_branchData = new BranchNodeData; - - m_branchData->children.Insert(node, index); - - // TODO: insert into sorted array directly in O(log n) instead of resorting in O(n log n) - if ((g_column = m_window->GetSortColumn()) >= -1) - { - g_model = m_window->GetModel(); - g_asending = m_window->IsAscendingSort(); - - m_branchData->children.Sort(&wxGenericTreeModelNodeCmp); - } -} - -void wxDataViewTreeNode::Resort() -{ - if (!m_branchData) - return; - - if ((g_column = m_window->GetSortColumn()) >= -1) - { - wxDataViewTreeNodes& nodes = m_branchData->children; - - g_model = m_window->GetModel(); - g_asending = m_window->IsAscendingSort(); - nodes.Sort(&wxGenericTreeModelNodeCmp); - int len = nodes.GetCount(); - for (int i = 0; i < len; i++) - { - if (nodes[i]->HasChildren()) - nodes[i]->Resort(); - } - } -} - -//----------------------------------------------------------------------------- -// wxDataViewMainWindow -//----------------------------------------------------------------------------- - -// The tree building helper, declared firstly -static void BuildTreeHelper(wxDataViewMainWindow *window, - const wxDataViewModel *model, - const wxDataViewItem & item, - wxDataViewTreeNode * node); - -wxIMPLEMENT_ABSTRACT_CLASS(wxDataViewMainWindow, wxWindow); - -wxBEGIN_EVENT_TABLE(wxDataViewMainWindow,wxWindow) - EVT_PAINT (wxDataViewMainWindow::OnPaint) - EVT_MOUSE_EVENTS (wxDataViewMainWindow::OnMouse) - EVT_SET_FOCUS (wxDataViewMainWindow::OnSetFocus) - EVT_KILL_FOCUS (wxDataViewMainWindow::OnKillFocus) - EVT_CHAR_HOOK (wxDataViewMainWindow::OnCharHook) - EVT_CHAR (wxDataViewMainWindow::OnChar) -wxEND_EVENT_TABLE() - -wxDataViewMainWindow::wxDataViewMainWindow( wxDataViewCtrl *parent, wxWindowID id, - const wxPoint &pos, const wxSize &size, const wxString &name ) : - wxWindow( parent, id, pos, size, wxWANTS_CHARS|wxBORDER_NONE, name ) -{ - SetOwner( parent ); - - m_editorRenderer = NULL; - - m_lastOnSame = false; - m_renameTimer = new wxDataViewRenameTimer( this ); - - // TODO: user better initial values/nothing selected - m_currentCol = NULL; - m_currentColSetByKeyboard = false; - m_useCellFocus = false; - m_currentRow = (unsigned)-1; - m_lineHeight = GetDefaultRowHeight(); - -#if wxUSE_DRAG_AND_DROP - m_dragCount = 0; - m_dragStart = wxPoint(0,0); - - m_dragEnabled = false; - m_dropEnabled = false; - m_dropHint = false; - m_dropHintLine = (unsigned int) -1; -#endif // wxUSE_DRAG_AND_DROP - - m_lineLastClicked = (unsigned int) -1; - m_lineBeforeLastClicked = (unsigned int) -1; - m_lineSelectSingleOnUp = (unsigned int) -1; - - m_hasFocus = false; - - SetBackgroundColour( *wxWHITE ); - - SetBackgroundStyle(wxBG_STYLE_CUSTOM); - - m_penRule = wxPen(GetRuleColour()); - - // compose a pen whichcan draw black lines - // TODO: maybe there is something system colour to use - m_penExpander = wxPen(wxColour(0,0,0)); - - m_root = wxDataViewTreeNode::CreateRootNode(this); - - // Make m_count = -1 will cause the class recaculate the real displaying number of rows. - m_count = -1; - m_underMouse = NULL; - - m_sortColumn = SortColumn_None; - m_sortAscending = true; - - UpdateDisplay(); -} - -wxDataViewMainWindow::~wxDataViewMainWindow() -{ - DestroyTree(); - delete m_renameTimer; -} - - -int wxDataViewMainWindow::GetDefaultRowHeight() const -{ -#ifdef __WXMSW__ - // We would like to use the same line height that Explorer uses. This is - // different from standard ListView control since Vista. - if ( wxGetWinVersion() >= wxWinVersion_Vista ) - return wxMax(16, GetCharHeight()) + 6; // 16 = mini icon height - else -#endif // __WXMSW__ - return wxMax(16, GetCharHeight()) + 1; // 16 = mini icon height -} - - - -#if wxUSE_DRAG_AND_DROP -bool wxDataViewMainWindow::EnableDragSource( const wxDataFormat &format ) -{ - m_dragFormat = format; - m_dragEnabled = format != wxDF_INVALID; - - return true; -} - -bool wxDataViewMainWindow::EnableDropTarget( const wxDataFormat &format ) -{ - m_dropFormat = format; - m_dropEnabled = format != wxDF_INVALID; - - if (m_dropEnabled) - SetDropTarget( new wxDataViewDropTarget( new wxCustomDataObject( format ), this ) ); - - return true; -} - -void wxDataViewMainWindow::RemoveDropHint() -{ - if (m_dropHint) - { - m_dropHint = false; - RefreshRow( m_dropHintLine ); - m_dropHintLine = (unsigned int) -1; - } -} - -wxDragResult wxDataViewMainWindow::OnDragOver( wxDataFormat format, wxCoord x, - wxCoord y, wxDragResult def ) -{ - int xx = x; - int yy = y; - m_owner->CalcUnscrolledPosition( xx, yy, &xx, &yy ); - unsigned int row = GetLineAt( yy ); - - wxDataViewItem item; - - if ( row < GetRowCount() && xx <= GetEndOfLastCol() ) - item = GetItemByRow( row ); - - wxDataViewModel *model = GetModel(); - - wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_DROP_POSSIBLE, m_owner->GetId() ); - event.SetEventObject( m_owner ); - event.SetItem( item ); - event.SetModel( model ); - event.SetDataFormat( format ); - event.SetDropEffect( def ); - if ( !m_owner->HandleWindowEvent( event ) || !event.IsAllowed() ) - { - RemoveDropHint(); - return wxDragNone; - } - - if ( item.IsOk() ) - { - if (m_dropHint && (row != m_dropHintLine)) - RefreshRow( m_dropHintLine ); - m_dropHint = true; - m_dropHintLine = row; - RefreshRow( row ); - } - else - { - RemoveDropHint(); - } - - return def; -} - -bool wxDataViewMainWindow::OnDrop( wxDataFormat format, wxCoord x, wxCoord y ) -{ - RemoveDropHint(); - - int xx = x; - int yy = y; - m_owner->CalcUnscrolledPosition( xx, yy, &xx, &yy ); - unsigned int row = GetLineAt( yy ); - - wxDataViewItem item; - - if ( row < GetRowCount() && xx <= GetEndOfLastCol()) - item = GetItemByRow( row ); - - wxDataViewModel *model = GetModel(); - - wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_DROP_POSSIBLE, m_owner->GetId() ); - event.SetEventObject( m_owner ); - event.SetItem( item ); - event.SetModel( model ); - event.SetDataFormat( format ); - if (!m_owner->HandleWindowEvent( event ) || !event.IsAllowed()) - return false; - - return true; -} - -wxDragResult wxDataViewMainWindow::OnData( wxDataFormat format, wxCoord x, wxCoord y, - wxDragResult def ) -{ - int xx = x; - int yy = y; - m_owner->CalcUnscrolledPosition( xx, yy, &xx, &yy ); - unsigned int row = GetLineAt( yy ); - - wxDataViewItem item; - - if ( row < GetRowCount() && xx <= GetEndOfLastCol() ) - item = GetItemByRow( row ); - - wxDataViewModel *model = GetModel(); - - wxCustomDataObject *obj = (wxCustomDataObject *) GetDropTarget()->GetDataObject(); - - wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_DROP, m_owner->GetId() ); - event.SetEventObject( m_owner ); - event.SetItem( item ); - event.SetModel( model ); - event.SetDataFormat( format ); - event.SetDataSize( obj->GetSize() ); - event.SetDataBuffer( obj->GetData() ); - event.SetDropEffect( def ); - if ( !m_owner->HandleWindowEvent( event ) || !event.IsAllowed() ) - return wxDragNone; - - return def; -} - -void wxDataViewMainWindow::OnLeave() -{ - RemoveDropHint(); -} - -wxBitmap wxDataViewMainWindow::CreateItemBitmap( unsigned int row, int &indent ) -{ - int height = GetLineHeight( row ); - int width = 0; - unsigned int cols = GetOwner()->GetColumnCount(); - unsigned int col; - for (col = 0; col < cols; col++) - { - wxDataViewColumn *column = GetOwner()->GetColumnAt(col); - if (column->IsHidden()) - continue; // skip it! - width += column->GetWidth(); - } - - indent = 0; - if (!IsList()) - { - wxDataViewTreeNode *node = GetTreeNodeByRow(row); - indent = GetOwner()->GetIndent() * node->GetIndentLevel(); - indent = indent + m_lineHeight; - // try to use the m_lineHeight as the expander space - } - width -= indent; - - wxBitmap bitmap( width, height ); - wxMemoryDC dc( bitmap ); - dc.SetFont( GetFont() ); - dc.SetPen( *wxBLACK_PEN ); - dc.SetBrush( *wxWHITE_BRUSH ); - dc.DrawRectangle( 0,0,width,height ); - - wxDataViewModel *model = m_owner->GetModel(); - - wxDataViewColumn * const - expander = GetExpanderColumnOrFirstOne(GetOwner()); - - int x = 0; - for (col = 0; col < cols; col++) - { - wxDataViewColumn *column = GetOwner()->GetColumnAt( col ); - wxDataViewRenderer *cell = column->GetRenderer(); - - if (column->IsHidden()) - continue; // skip it! - - width = column->GetWidth(); - - if (column == expander) - width -= indent; - - wxDataViewItem item = GetItemByRow( row ); - cell->PrepareForItem(model, item, column->GetModelColumn()); - - wxRect item_rect(x, 0, width, height); - item_rect.Deflate(PADDING_RIGHTLEFT, 0); - - // dc.SetClippingRegion( item_rect ); - cell->WXCallRender(item_rect, &dc, 0); - // dc.DestroyClippingRegion(); - - x += width; - } - - return bitmap; -} - -#endif // wxUSE_DRAG_AND_DROP - -void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) -{ - wxDataViewModel *model = GetModel(); - wxAutoBufferedPaintDC dc( this ); - - const wxSize size = GetClientSize(); - - dc.SetBrush(GetOwner()->GetBackgroundColour()); - dc.SetPen( *wxTRANSPARENT_PEN ); - dc.DrawRectangle(size); - - if ( IsEmpty() ) - { - // No items to draw. - return; - } - - // prepare the DC - GetOwner()->PrepareDC( dc ); - dc.SetFont( GetFont() ); - - wxRect update = GetUpdateRegion().GetBox(); - m_owner->CalcUnscrolledPosition( update.x, update.y, &update.x, &update.y ); - - // compute which items needs to be redrawn - unsigned int item_start = GetLineAt( wxMax(0,update.y) ); - unsigned int item_count = - wxMin( (int)( GetLineAt( wxMax(0,update.y+update.height) ) - item_start + 1), - (int)(GetRowCount( ) - item_start)); - unsigned int item_last = item_start + item_count; - - // Send the event to wxDataViewCtrl itself. - wxWindow * const parent = GetParent(); - wxDataViewEvent cache_event(wxEVT_DATAVIEW_CACHE_HINT, parent->GetId()); - cache_event.SetEventObject(parent); - cache_event.SetCache(item_start, item_last - 1); - parent->ProcessWindowEvent(cache_event); - - // compute which columns needs to be redrawn - unsigned int cols = GetOwner()->GetColumnCount(); - if ( !cols ) - { - // we assume that we have at least one column below and painting an - // empty control is unnecessary anyhow - return; - } - - unsigned int col_start = 0; - unsigned int x_start; - for (x_start = 0; col_start < cols; col_start++) - { - wxDataViewColumn *col = GetOwner()->GetColumnAt(col_start); - if (col->IsHidden()) - continue; // skip it! - - unsigned int w = col->GetWidth(); - if (x_start+w >= (unsigned int)update.x) - break; - - x_start += w; - } - - unsigned int col_last = col_start; - unsigned int x_last = x_start; - for (; col_last < cols; col_last++) - { - wxDataViewColumn *col = GetOwner()->GetColumnAt(col_last); - if (col->IsHidden()) - continue; // skip it! - - if (x_last > (unsigned int)update.GetRight()) - break; - - x_last += col->GetWidth(); - } - - // Draw background of alternate rows specially if required - if ( m_owner->HasFlag(wxDV_ROW_LINES) ) - { - wxColour altRowColour = m_owner->m_alternateRowColour; - if ( !altRowColour.IsOk() ) - { - // Determine the alternate rows colour automatically from the - // background colour. - const wxColour bgColour = m_owner->GetBackgroundColour(); - - // Depending on the background, alternate row color - // will be 3% more dark or 50% brighter. - int alpha = bgColour.GetRGB() > 0x808080 ? 97 : 150; - altRowColour = bgColour.ChangeLightness(alpha); - } - - dc.SetPen(*wxTRANSPARENT_PEN); - dc.SetBrush(wxBrush(altRowColour)); - - // We only need to draw the visible part, so limit the rectangle to it. - const int xRect = m_owner->CalcUnscrolledPosition(wxPoint(0, 0)).x; - const int widthRect = size.x; - for (unsigned int item = item_start; item < item_last; item++) - { - if ( item % 2 ) - { - dc.DrawRectangle(xRect, - GetLineStart(item), - widthRect, - GetLineHeight(item)); - } - } - } - - // Draw horizontal rules if required - if ( m_owner->HasFlag(wxDV_HORIZ_RULES) ) - { - dc.SetPen(m_penRule); - dc.SetBrush(*wxTRANSPARENT_BRUSH); - - for (unsigned int i = item_start; i <= item_last; i++) - { - int y = GetLineStart( i ); - dc.DrawLine(x_start, y, x_last, y); - } - } - - // Draw vertical rules if required - if ( m_owner->HasFlag(wxDV_VERT_RULES) ) - { - dc.SetPen(m_penRule); - dc.SetBrush(*wxTRANSPARENT_BRUSH); - - // NB: Vertical rules are drawn in the last pixel of a column so that - // they align perfectly with native MSW wxHeaderCtrl as well as for - // consistency with MSW native list control. There's no vertical - // rule at the most-left side of the control. - - int x = x_start - 1; - for (unsigned int i = col_start; i < col_last; i++) - { - wxDataViewColumn *col = GetOwner()->GetColumnAt(i); - if (col->IsHidden()) - continue; // skip it - - x += col->GetWidth(); - - dc.DrawLine(x, GetLineStart( item_start ), - x, GetLineStart( item_last ) ); - } - } - - // redraw the background for the items which are selected/current - for (unsigned int item = item_start; item < item_last; item++) - { - bool selected = m_selection.IsSelected(item); - - if (selected || item == m_currentRow) - { - wxRect rowRect( x_start, GetLineStart( item ), - x_last - x_start, GetLineHeight( item ) ); - - bool renderColumnFocus = false; - - int flags = wxCONTROL_SELECTED; - if ( m_hasFocus ) - flags |= wxCONTROL_FOCUSED; - - // draw keyboard focus rect if applicable - if ( item == m_currentRow && m_hasFocus ) - { - - if ( m_useCellFocus && m_currentCol && m_currentColSetByKeyboard ) - { - renderColumnFocus = true; - - // If this is container node without columns, render full-row focus: - if ( !IsList() ) - { - wxDataViewTreeNode *node = GetTreeNodeByRow(item); - if ( node->HasChildren() && !model->HasContainerColumns(node->GetItem()) ) - renderColumnFocus = false; - } - } - - if ( renderColumnFocus ) - { - wxRect colRect(rowRect); - - for ( unsigned int i = col_start; i < col_last; i++ ) - { - wxDataViewColumn *col = GetOwner()->GetColumnAt(i); - if ( col->IsHidden() ) - continue; - - colRect.width = col->GetWidth(); - - if ( col == m_currentCol ) - { - // Draw selection rect left of column - { - wxRect clipRect(rowRect); - clipRect.width = colRect.x; - - wxDCClipper clip(dc, clipRect); - wxRendererNative::Get().DrawItemSelectionRect - ( - this, - dc, - rowRect, - flags - ); - } - - // Draw selection rect right of column - { - wxRect clipRect(rowRect); - clipRect.x = colRect.x + colRect.width; - clipRect.width = rowRect.width - clipRect.x; - - wxDCClipper clip(dc, clipRect); - wxRendererNative::Get().DrawItemSelectionRect - ( - this, - dc, - rowRect, - flags - ); - } - - // Draw column selection rect - wxRendererNative::Get().DrawItemSelectionRect - ( - this, - dc, - colRect, - flags | wxCONTROL_CURRENT | wxCONTROL_CELL - ); - - break; - } - - colRect.x += colRect.width; - } - } - } - - // draw selection and whole-item focus: - if ( selected && !renderColumnFocus ) - { - wxRendererNative::Get().DrawItemSelectionRect - ( - this, - dc, - rowRect, - flags | wxCONTROL_CURRENT - ); - } - } - } - -#if wxUSE_DRAG_AND_DROP - if (m_dropHint) - { - wxRect rect( x_start, GetLineStart( m_dropHintLine ), - x_last - x_start, GetLineHeight( m_dropHintLine ) ); - dc.SetPen( *wxBLACK_PEN ); - dc.SetBrush( *wxTRANSPARENT_BRUSH ); - dc.DrawRectangle( rect ); - } -#endif // wxUSE_DRAG_AND_DROP - - wxDataViewColumn * const - expander = GetExpanderColumnOrFirstOne(GetOwner()); - - // redraw all cells for all rows which must be repainted and all columns - wxRect cell_rect; - cell_rect.x = x_start; - for (unsigned int i = col_start; i < col_last; i++) - { - wxDataViewColumn *col = GetOwner()->GetColumnAt( i ); - wxDataViewRenderer *cell = col->GetRenderer(); - cell_rect.width = col->GetWidth(); - - if ( col->IsHidden() || cell_rect.width <= 0 ) - continue; // skip it! - - for (unsigned int item = item_start; item < item_last; item++) - { - // get the cell value and set it into the renderer - wxDataViewTreeNode *node = NULL; - wxDataViewItem dataitem; - - if (!IsVirtualList()) - { - node = GetTreeNodeByRow(item); - if( node == NULL ) - continue; - - dataitem = node->GetItem(); - - // Skip all columns of "container" rows except the expander - // column itself unless HasContainerColumns() overrides this. - if ( col != expander && - model->IsContainer(dataitem) && - !model->HasContainerColumns(dataitem) ) - continue; - } - else - { - dataitem = wxDataViewItem( wxUIntToPtr(item+1) ); - } - - // update cell_rect - cell_rect.y = GetLineStart( item ); - cell_rect.height = GetLineHeight( item ); - - cell->PrepareForItem(model, dataitem, col->GetModelColumn()); - - // draw the background - bool selected = m_selection.IsSelected(item); - if ( !selected ) - DrawCellBackground( cell, dc, cell_rect ); - - // deal with the expander - int indent = 0; - if ((!IsList()) && (col == expander)) - { - // Calculate the indent first - indent = GetOwner()->GetIndent() * node->GetIndentLevel(); - - // we reserve m_lineHeight of horizontal space for the expander - // but leave EXPANDER_MARGIN around the expander itself - int exp_x = cell_rect.x + indent + EXPANDER_MARGIN; - - indent += m_lineHeight; - - // draw expander if needed and visible - if ( node->HasChildren() && exp_x < cell_rect.GetRight() ) - { - dc.SetPen( m_penExpander ); - dc.SetBrush( wxNullBrush ); - - int exp_size = m_lineHeight - 2*EXPANDER_MARGIN; - int exp_y = cell_rect.y + (cell_rect.height - exp_size)/2 - + EXPANDER_MARGIN - EXPANDER_OFFSET; - - const wxRect rect(exp_x, exp_y, exp_size, exp_size); - - int flag = 0; - if ( m_underMouse == node ) - flag |= wxCONTROL_CURRENT; - if ( node->IsOpen() ) - flag |= wxCONTROL_EXPANDED; - - // ensure that we don't overflow the cell (which might - // happen if the column is very narrow) - wxDCClipper clip(dc, cell_rect); - - wxRendererNative::Get().DrawTreeItemButton( this, dc, rect, flag); - } - - // force the expander column to left-center align - cell->SetAlignment( wxALIGN_CENTER_VERTICAL ); - } - - wxRect item_rect = cell_rect; - item_rect.Deflate(PADDING_RIGHTLEFT, 0); - - // account for the tree indent (harmless if we're not indented) - item_rect.x += indent; - item_rect.width -= indent; - - if ( item_rect.width <= 0 ) - continue; - - int state = 0; - if (m_hasFocus && selected) - state |= wxDATAVIEW_CELL_SELECTED; - - // TODO: it would be much more efficient to create a clipping - // region for the entire column being rendered (in the OnPaint - // of wxDataViewMainWindow) instead of a single clip region for - // each cell. However it would mean that each renderer should - // respect the given wxRect's top & bottom coords, eventually - // violating only the left & right coords - however the user can - // make its own renderer and thus we cannot be sure of that. - wxDCClipper clip(dc, item_rect); - - cell->WXCallRender(item_rect, &dc, state); - } - - cell_rect.x += cell_rect.width; - } -} - - -void wxDataViewMainWindow::DrawCellBackground( wxDataViewRenderer* cell, wxDC& dc, const wxRect& rect ) -{ - wxRect rectBg( rect ); - - // don't overlap the horizontal rules - if ( m_owner->HasFlag(wxDV_HORIZ_RULES) ) - { - rectBg.x++; - rectBg.width--; - } - - // don't overlap the vertical rules - if ( m_owner->HasFlag(wxDV_VERT_RULES) ) - { - rectBg.y++; - rectBg.height--; - } - - cell->RenderBackground(&dc, rectBg); -} - -void wxDataViewMainWindow::OnRenameTimer() -{ - // We have to call this here because changes may just have - // been made and no screen update taken place. - if ( m_dirty ) - { - // TODO: use wxTheApp->SafeYieldFor(NULL, wxEVT_CATEGORY_UI) instead - // (needs to be tested!) - wxSafeYield(); - } - - wxDataViewItem item = GetItemByRow( m_currentRow ); - - StartEditing( item, m_currentCol ); -} - -void -wxDataViewMainWindow::StartEditing(const wxDataViewItem& item, - const wxDataViewColumn* col) -{ - wxDataViewRenderer* renderer = col->GetRenderer(); - if ( !IsCellEditableInMode(item, col, wxDATAVIEW_CELL_EDITABLE) ) - return; - - const wxRect itemRect = GetItemRect(item, col); - if ( renderer->StartEditing(item, itemRect) ) - { - renderer->NotifyEditingStarted(item); - - // Save the renderer to be able to finish/cancel editing it later and - // save the control to be able to detect if we're still editing it. - m_editorRenderer = renderer; - m_editorCtrl = renderer->GetEditorCtrl(); - } -} - -void wxDataViewMainWindow::FinishEditing() -{ - if ( m_editorCtrl ) - { - m_editorRenderer->FinishEditing(); - } -} - -void wxDataViewHeaderWindow::FinishEditing() -{ - wxDataViewMainWindow *win = static_cast(GetOwner()->GetMainWindow()); - win->FinishEditing(); -} - -//----------------------------------------------------------------------------- -// Helper class for do operation on the tree node -//----------------------------------------------------------------------------- -class DoJob -{ -public: - DoJob() { } - virtual ~DoJob() { } - - // The return value control how the tree-walker tranverse the tree - enum - { - DONE, // Job done, stop traversing and return - SKIP_SUBTREE, // Ignore the current node's subtree and continue - CONTINUE // Job not done, continue - }; - - virtual int operator() ( wxDataViewTreeNode * node ) = 0; -}; - -bool Walker( wxDataViewTreeNode * node, DoJob & func ) -{ - wxCHECK_MSG( node, false, "can't walk NULL node" ); - - switch( func( node ) ) - { - case DoJob::DONE: - return true; - case DoJob::SKIP_SUBTREE: - return false; - case DoJob::CONTINUE: - break; - } - - if ( node->HasChildren() ) - { - const wxDataViewTreeNodes& nodes = node->GetChildNodes(); - - for ( wxDataViewTreeNodes::const_iterator i = nodes.begin(); - i != nodes.end(); - ++i ) - { - if ( Walker(*i, func) ) - return true; - } - } - - return false; -} - -bool wxDataViewMainWindow::ItemAdded(const wxDataViewItem & parent, const wxDataViewItem & item) -{ - if (IsVirtualList()) - { - wxDataViewVirtualListModel *list_model = - (wxDataViewVirtualListModel*) GetModel(); - m_count = list_model->GetCount(); - - m_selection.OnItemsInserted(GetRowByItem(item), 1); - } - else - { - SortPrepare(); - - wxDataViewTreeNode *parentNode = FindNode(parent); - - if ( !parentNode ) - return false; - - wxDataViewItemArray modelSiblings; - GetModel()->GetChildren(parent, modelSiblings); - const int modelSiblingsSize = modelSiblings.size(); - - int posInModel = modelSiblings.Index(item, /*fromEnd=*/true); - wxCHECK_MSG( posInModel != wxNOT_FOUND, false, "adding non-existent item?" ); - - wxDataViewTreeNode *itemNode = new wxDataViewTreeNode(this, parentNode, item); - itemNode->SetHasChildren(GetModel()->IsContainer(item)); - - parentNode->SetHasChildren(true); - - const wxDataViewTreeNodes& nodeSiblings = parentNode->GetChildNodes(); - const int nodeSiblingsSize = nodeSiblings.size(); - - int nodePos = 0; - - if ( posInModel == modelSiblingsSize - 1 ) - { - nodePos = nodeSiblingsSize; - } - else if ( modelSiblingsSize == nodeSiblingsSize + 1 ) - { - // This is the simple case when our node tree already matches the - // model and only this one item is missing. - nodePos = posInModel; - } - else - { - // It's possible that a larger discrepancy between the model and - // our realization exists. This can happen e.g. when adding a bunch - // of items to the model and then calling ItemsAdded() just once - // afterwards. In this case, we must find the right position by - // looking at sibling items. - - // append to the end if we won't find a better position: - nodePos = nodeSiblingsSize; - - for ( int nextItemPos = posInModel + 1; - nextItemPos < modelSiblingsSize; - nextItemPos++ ) - { - int nextNodePos = parentNode->FindChildByItem(modelSiblings[nextItemPos]); - if ( nextNodePos != wxNOT_FOUND ) - { - nodePos = nextNodePos; - break; - } - } - } - - parentNode->ChangeSubTreeCount(+1); - parentNode->InsertChild(itemNode, nodePos); - - InvalidateCount(); - } - - GetOwner()->InvalidateColBestWidths(); - UpdateDisplay(); - - return true; -} - -bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent, - const wxDataViewItem& item) -{ - if (IsVirtualList()) - { - wxDataViewVirtualListModel *list_model = - (wxDataViewVirtualListModel*) GetModel(); - m_count = list_model->GetCount(); - - m_selection.OnItemDelete(GetRowByItem(item)); - } - else // general case - { - wxDataViewTreeNode *parentNode = FindNode(parent); - - // Notice that it is possible that the item being deleted is not in the - // tree at all, for example we could be deleting a never shown (because - // collapsed) item in a tree model. So it's not an error if we don't know - // about this item, just return without doing anything then. - if ( !parentNode ) - return true; - - wxCHECK_MSG( parentNode->HasChildren(), false, "parent node doesn't have children?" ); - const wxDataViewTreeNodes& parentsChildren = parentNode->GetChildNodes(); - - // We can't use FindNode() to find 'item', because it was already - // removed from the model by the time ItemDeleted() is called, so we - // have to do it manually. We keep track of its position as well for - // later use. - int itemPosInNode = 0; - wxDataViewTreeNode *itemNode = NULL; - for ( wxDataViewTreeNodes::const_iterator i = parentsChildren.begin(); - i != parentsChildren.end(); - ++i, ++itemPosInNode ) - { - if( (*i)->GetItem() == item ) - { - itemNode = *i; - break; - } - } - - // If the parent wasn't expanded, it's possible that we didn't have a - // node corresponding to 'item' and so there's nothing left to do. - if ( !itemNode ) - { - // If this was the last child to be removed, it's possible the parent - // node became a leaf. Let's ask the model about it. - if ( parentNode->GetChildNodes().empty() ) - parentNode->SetHasChildren(GetModel()->IsContainer(parent)); - - return true; - } - - // Delete the item from wxDataViewTreeNode representation: - const int itemsDeleted = 1 + itemNode->GetSubTreeCount(); - - parentNode->RemoveChild(itemNode); - delete itemNode; - parentNode->ChangeSubTreeCount(-itemsDeleted); - - // Make the row number invalid and get a new valid one when user call GetRowCount - InvalidateCount(); - - // If this was the last child to be removed, it's possible the parent - // node became a leaf. Let's ask the model about it. - if ( parentNode->GetChildNodes().empty() ) - { - bool isContainer = GetModel()->IsContainer(parent); - parentNode->SetHasChildren(isContainer); - if ( isContainer ) - { - // If it's still a container, make sure we show "+" icon for it - // and not "-" one as there is nothing to collapse any more. - if ( parentNode->IsOpen() ) - parentNode->ToggleOpen(); - } - } - - // Update selection by removing 'item' and its entire children tree from the selection. - if ( !m_selection.IsEmpty() ) - { - // we can't call GetRowByItem() on 'item', as it's already deleted, so compute it from - // the parent ('parentNode') and position in its list of children - int itemRow; - if ( itemPosInNode == 0 ) - { - // 1st child, row number is that of the parent parentNode + 1 - itemRow = GetRowByItem(parentNode->GetItem()) + 1; - } - else - { - // row number is that of the sibling above 'item' + its subtree if any + 1 - const wxDataViewTreeNode *siblingNode = parentNode->GetChildNodes()[itemPosInNode - 1]; - - itemRow = GetRowByItem(siblingNode->GetItem()) + - siblingNode->GetSubTreeCount() + - 1; - } - - m_selection.OnItemsDeleted(itemRow, itemsDeleted); - } - } - - // Change the current row to the last row if the current exceed the max row number - if ( m_currentRow >= GetRowCount() ) - ChangeCurrentRow(m_count - 1); - - GetOwner()->InvalidateColBestWidths(); - UpdateDisplay(); - - return true; -} - -bool wxDataViewMainWindow::ItemChanged(const wxDataViewItem & item) -{ - SortPrepare(); - GetModel()->Resort(); - - GetOwner()->InvalidateColBestWidths(); - - // Send event - wxWindow *parent = GetParent(); - wxDataViewEvent le(wxEVT_DATAVIEW_ITEM_VALUE_CHANGED, parent->GetId()); - le.SetEventObject(parent); - le.SetModel(GetModel()); - le.SetItem(item); - parent->ProcessWindowEvent(le); - - return true; -} - -bool wxDataViewMainWindow::ValueChanged( const wxDataViewItem & item, unsigned int model_column ) -{ - int view_column = m_owner->GetModelColumnIndex(model_column); - if ( view_column == wxNOT_FOUND ) - return false; - - // NOTE: to be valid, we cannot use e.g. INT_MAX - 1 -/*#define MAX_VIRTUAL_WIDTH 100000 - - wxRect rect( 0, row*m_lineHeight, MAX_VIRTUAL_WIDTH, m_lineHeight ); - m_owner->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); - Refresh( true, &rect ); - - return true; -*/ - SortPrepare(); - GetModel()->Resort(); - - GetOwner()->InvalidateColBestWidth(view_column); - - // Send event - wxWindow *parent = GetParent(); - wxDataViewEvent le(wxEVT_DATAVIEW_ITEM_VALUE_CHANGED, parent->GetId()); - le.SetEventObject(parent); - le.SetModel(GetModel()); - le.SetItem(item); - le.SetColumn(view_column); - le.SetDataViewColumn(GetOwner()->GetColumn(view_column)); - parent->ProcessWindowEvent(le); - - return true; -} - -bool wxDataViewMainWindow::Cleared() -{ - DestroyTree(); - m_selection.Clear(); - m_currentRow = (unsigned)-1; - - if (GetModel()) - { - SortPrepare(); - BuildTree( GetModel() ); - } - else - { - m_count = 0; - } - - GetOwner()->InvalidateColBestWidths(); - UpdateDisplay(); - - return true; -} - -void wxDataViewMainWindow::UpdateDisplay() -{ - m_dirty = true; - m_underMouse = NULL; -} - -void wxDataViewMainWindow::OnInternalIdle() -{ - wxWindow::OnInternalIdle(); - - if (m_dirty) - { - UpdateColumnSizes(); - RecalculateDisplay(); - m_dirty = false; - } -} - -void wxDataViewMainWindow::RecalculateDisplay() -{ - wxDataViewModel *model = GetModel(); - if (!model) - { - Refresh(); - return; - } - - int width = GetEndOfLastCol(); - int height = GetLineStart( GetRowCount() ); - - SetVirtualSize( width, height ); - GetOwner()->SetScrollRate( 10, m_lineHeight ); - - Refresh(); -} - -void wxDataViewMainWindow::ScrollWindow( int dx, int dy, const wxRect *rect ) -{ - m_underMouse = NULL; - - wxWindow::ScrollWindow( dx, dy, rect ); - - if (GetOwner()->m_headerArea) - GetOwner()->m_headerArea->ScrollWindow( dx, 0 ); -} - -void wxDataViewMainWindow::ScrollTo( int rows, int column ) -{ - m_underMouse = NULL; - - int x, y; - m_owner->GetScrollPixelsPerUnit( &x, &y ); - int sy = GetLineStart( rows )/y; - int sx = -1; - if( column != -1 ) - { - wxRect rect = GetClientRect(); - int colnum = 0; - int x_start, w = 0; - int xx, yy, xe; - m_owner->CalcUnscrolledPosition( rect.x, rect.y, &xx, &yy ); - for (x_start = 0; colnum < column; colnum++) - { - wxDataViewColumn *col = GetOwner()->GetColumnAt(colnum); - if (col->IsHidden()) - continue; // skip it! - - w = col->GetWidth(); - x_start += w; - } - - int x_end = x_start + w; - xe = xx + rect.width; - if( x_end > xe ) - { - sx = ( xx + x_end - xe )/x; - } - if( x_start < xx ) - { - sx = x_start/x; - } - } - m_owner->Scroll( sx, sy ); -} - -int wxDataViewMainWindow::GetCountPerPage() const -{ - wxSize size = GetClientSize(); - return size.y / m_lineHeight; -} - -int wxDataViewMainWindow::GetEndOfLastCol() const -{ - int width = 0; - unsigned int i; - for (i = 0; i < GetOwner()->GetColumnCount(); i++) - { - const wxDataViewColumn *c = - const_cast(GetOwner())->GetColumnAt( i ); - - if (!c->IsHidden()) - width += c->GetWidth(); - } - return width; -} - -unsigned int wxDataViewMainWindow::GetFirstVisibleRow() const -{ - int x = 0; - int y = 0; - m_owner->CalcUnscrolledPosition( x, y, &x, &y ); - - return GetLineAt( y ); -} - -unsigned int wxDataViewMainWindow::GetLastVisibleRow() -{ - wxSize client_size = GetClientSize(); - m_owner->CalcUnscrolledPosition( client_size.x, client_size.y, - &client_size.x, &client_size.y ); - - // we should deal with the pixel here - unsigned int row = GetLineAt(client_size.y) - 1; - - return wxMin( GetRowCount()-1, row ); -} - -unsigned int wxDataViewMainWindow::GetRowCount() const -{ - if ( m_count == -1 ) - { - wxDataViewMainWindow* const - self = const_cast(this); - self->UpdateCount(RecalculateCount()); - self->UpdateDisplay(); - } - return m_count; -} - -void wxDataViewMainWindow::ChangeCurrentRow( unsigned int row ) -{ - m_currentRow = row; - - // send event -} - -bool wxDataViewMainWindow::UnselectAllRows(unsigned int except) -{ - if (!m_selection.IsEmpty()) - { - for (unsigned i = GetFirstVisibleRow(); i <= GetLastVisibleRow(); i++) - { - if (m_selection.IsSelected(i) && i != except) - RefreshRow(i); - } - - if (except != (unsigned int)-1) - { - const bool wasSelected = m_selection.IsSelected(except); - ClearSelection(); - if (wasSelected) - { - m_selection.SelectItem(except); - - // The special item is still selected. - return false; - } - } - else - { - ClearSelection(); - } - } - - // There are no selected items left. - return true; -} - -void wxDataViewMainWindow::SelectRow( unsigned int row, bool on ) -{ - if ( m_selection.SelectItem(row, on) ) - RefreshRow(row); -} - -void wxDataViewMainWindow::SelectRows( unsigned int from, unsigned int to ) -{ - wxArrayInt changed; - if ( m_selection.SelectRange(from, to, true, &changed) ) - { - for (unsigned i = 0; i < changed.size(); i++) - RefreshRow(changed[i]); - } - else // Selection of too many rows has changed. - { - RefreshRows( from, to ); - } -} - -void wxDataViewMainWindow::Select( const wxArrayInt& aSelections ) -{ - for (size_t i=0; i < aSelections.GetCount(); i++) - { - int n = aSelections[i]; - - if ( m_selection.SelectItem(n) ) - RefreshRow( n ); - } -} - -void wxDataViewMainWindow::ReverseRowSelection( unsigned int row ) -{ - m_selection.SelectItem(row, !m_selection.IsSelected(row)); - RefreshRow( row ); -} - -bool wxDataViewMainWindow::IsRowSelected( unsigned int row ) -{ - return m_selection.IsSelected(row); -} - -void wxDataViewMainWindow::SendSelectionChangedEvent( const wxDataViewItem& item) -{ - wxWindow *parent = GetParent(); - wxDataViewEvent le(wxEVT_DATAVIEW_SELECTION_CHANGED, parent->GetId()); - - le.SetEventObject(parent); - le.SetModel(GetModel()); - le.SetItem( item ); - - parent->ProcessWindowEvent(le); -} - -void wxDataViewMainWindow::RefreshRow( unsigned int row ) -{ - wxRect rect( 0, GetLineStart( row ), GetEndOfLastCol(), GetLineHeight( row ) ); - m_owner->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); - - wxSize client_size = GetClientSize(); - wxRect client_rect( 0, 0, client_size.x, client_size.y ); - wxRect intersect_rect = client_rect.Intersect( rect ); - if (intersect_rect.width > 0) - Refresh( true, &intersect_rect ); -} - -void wxDataViewMainWindow::RefreshRows( unsigned int from, unsigned int to ) -{ - if (from > to) - { - unsigned int tmp = to; - to = from; - from = tmp; - } - - wxRect rect( 0, GetLineStart( from ), GetEndOfLastCol(), GetLineStart( (to-from+1) ) ); - m_owner->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); - - wxSize client_size = GetClientSize(); - wxRect client_rect( 0, 0, client_size.x, client_size.y ); - wxRect intersect_rect = client_rect.Intersect( rect ); - if (intersect_rect.width > 0) - Refresh( true, &intersect_rect ); -} - -void wxDataViewMainWindow::RefreshRowsAfter( unsigned int firstRow ) -{ - wxSize client_size = GetClientSize(); - int start = GetLineStart( firstRow ); - m_owner->CalcScrolledPosition( start, 0, &start, NULL ); - if (start > client_size.y) return; - - wxRect rect( 0, start, client_size.x, client_size.y - start ); - - Refresh( true, &rect ); -} - -wxRect wxDataViewMainWindow::GetLineRect( unsigned int row ) const -{ - wxRect rect; - rect.x = 0; - rect.y = GetLineStart( row ); - rect.width = GetEndOfLastCol(); - rect.height = GetLineHeight( row ); - - return rect; -} - -int wxDataViewMainWindow::GetLineStart( unsigned int row ) const -{ - const wxDataViewModel *model = GetModel(); - - if (GetOwner()->GetWindowStyle() & wxDV_VARIABLE_LINE_HEIGHT) - { - // TODO make more efficient - - int start = 0; - - unsigned int r; - for (r = 0; r < row; r++) - { - const wxDataViewTreeNode* node = GetTreeNodeByRow(r); - if (!node) return start; - - wxDataViewItem item = node->GetItem(); - - unsigned int cols = GetOwner()->GetColumnCount(); - unsigned int col; - int height = m_lineHeight; - for (col = 0; col < cols; col++) - { - const wxDataViewColumn *column = GetOwner()->GetColumn(col); - if (column->IsHidden()) - continue; // skip it! - - if ((col != 0) && - model->IsContainer(item) && - !model->HasContainerColumns(item)) - continue; // skip it! - - wxDataViewRenderer *renderer = - const_cast(column->GetRenderer()); - renderer->PrepareForItem(model, item, column->GetModelColumn()); - - height = wxMax( height, renderer->GetSize().y ); - } - - start += height; - } - - return start; - } - else - { - return row * m_lineHeight; - } -} - -int wxDataViewMainWindow::GetLineAt( unsigned int y ) const -{ - const wxDataViewModel *model = GetModel(); - - // check for the easy case first - if ( !GetOwner()->HasFlag(wxDV_VARIABLE_LINE_HEIGHT) ) - return y / m_lineHeight; - - // TODO make more efficient - unsigned int row = 0; - unsigned int yy = 0; - for (;;) - { - const wxDataViewTreeNode* node = GetTreeNodeByRow(row); - if (!node) - { - // not really correct... - return row + ((y-yy) / m_lineHeight); - } - - wxDataViewItem item = node->GetItem(); - - unsigned int cols = GetOwner()->GetColumnCount(); - unsigned int col; - int height = m_lineHeight; - for (col = 0; col < cols; col++) - { - const wxDataViewColumn *column = GetOwner()->GetColumn(col); - if (column->IsHidden()) - continue; // skip it! - - if ((col != 0) && - model->IsContainer(item) && - !model->HasContainerColumns(item)) - continue; // skip it! - - wxDataViewRenderer *renderer = - const_cast(column->GetRenderer()); - renderer->PrepareForItem(model, item, column->GetModelColumn()); - - height = wxMax( height, renderer->GetSize().y ); - } - - yy += height; - if (y < yy) - return row; - - row++; - } -} - -int wxDataViewMainWindow::GetLineHeight( unsigned int row ) const -{ - const wxDataViewModel *model = GetModel(); - - if (GetOwner()->GetWindowStyle() & wxDV_VARIABLE_LINE_HEIGHT) - { - wxASSERT( !IsVirtualList() ); - - const wxDataViewTreeNode* node = GetTreeNodeByRow(row); - // wxASSERT( node ); - if (!node) return m_lineHeight; - - wxDataViewItem item = node->GetItem(); - - int height = m_lineHeight; - - unsigned int cols = GetOwner()->GetColumnCount(); - unsigned int col; - for (col = 0; col < cols; col++) - { - const wxDataViewColumn *column = GetOwner()->GetColumn(col); - if (column->IsHidden()) - continue; // skip it! - - if ((col != 0) && - model->IsContainer(item) && - !model->HasContainerColumns(item)) - continue; // skip it! - - wxDataViewRenderer *renderer = - const_cast(column->GetRenderer()); - renderer->PrepareForItem(model, item, column->GetModelColumn()); - - height = wxMax( height, renderer->GetSize().y ); - } - - return height; - } - else - { - return m_lineHeight; - } -} - - -class RowToTreeNodeJob: public DoJob -{ -public: - RowToTreeNodeJob( unsigned int row_ , int current_, wxDataViewTreeNode * node ) - { - this->row = row_; - this->current = current_; - ret = NULL; - parent = node; - } - - virtual int operator() ( wxDataViewTreeNode * node ) - { - current ++; - if( current == static_cast(row)) - { - ret = node; - return DoJob::DONE; - } - - if( node->GetSubTreeCount() + current < static_cast(row) ) - { - current += node->GetSubTreeCount(); - return DoJob::SKIP_SUBTREE; - } - else - { - parent = node; - - // If the current node has only leaf children, we can find the - // desired node directly. This can speed up finding the node - // in some cases, and will have a very good effect for list views. - if ( node->HasChildren() && - (int)node->GetChildNodes().size() == node->GetSubTreeCount() ) - { - const int index = static_cast(row) - current - 1; - ret = node->GetChildNodes()[index]; - return DoJob::DONE; - } - - return DoJob::CONTINUE; - } - } - - wxDataViewTreeNode * GetResult() const - { return ret; } - -private: - unsigned int row; - int current; - wxDataViewTreeNode * ret; - wxDataViewTreeNode * parent; -}; - -wxDataViewTreeNode * wxDataViewMainWindow::GetTreeNodeByRow(unsigned int row) const -{ - wxASSERT( !IsVirtualList() ); - - if ( row == (unsigned)-1 ) - return NULL; - - RowToTreeNodeJob job( row , -2, m_root ); - Walker( m_root , job ); - return job.GetResult(); -} - -wxDataViewItem wxDataViewMainWindow::GetItemByRow(unsigned int row) const -{ - wxDataViewItem item; - if (IsVirtualList()) - { - if ( row < GetRowCount() ) - item = wxDataViewItem(wxUIntToPtr(row+1)); - } - else - { - wxDataViewTreeNode *node = GetTreeNodeByRow(row); - if ( node ) - item = node->GetItem(); - } - - return item; -} - -bool -wxDataViewMainWindow::SendExpanderEvent(wxEventType type, - const wxDataViewItem& item) -{ - wxWindow *parent = GetParent(); - wxDataViewEvent le(type, parent->GetId()); - - le.SetEventObject(parent); - le.SetModel(GetModel()); - le.SetItem( item ); - - return !parent->ProcessWindowEvent(le) || le.IsAllowed(); -} - -bool wxDataViewMainWindow::IsExpanded( unsigned int row ) const -{ - if (IsList()) - return false; - - wxDataViewTreeNode * node = GetTreeNodeByRow(row); - if (!node) - return false; - - if (!node->HasChildren()) - return false; - - return node->IsOpen(); -} - -bool wxDataViewMainWindow::HasChildren( unsigned int row ) const -{ - if (IsList()) - return false; - - wxDataViewTreeNode * node = GetTreeNodeByRow(row); - if (!node) - return false; - - if (!node->HasChildren()) - return false; - - return true; -} - -void wxDataViewMainWindow::Expand( unsigned int row ) -{ - if (IsList()) - return; - - wxDataViewTreeNode * node = GetTreeNodeByRow(row); - if (!node) - return; - - if (!node->HasChildren()) - return; - - if (!node->IsOpen()) - { - if ( !SendExpanderEvent(wxEVT_DATAVIEW_ITEM_EXPANDING, node->GetItem()) ) - { - // Vetoed by the event handler. - return; - } - - node->ToggleOpen(); - - // build the children of current node - if( node->GetChildNodes().empty() ) - { - SortPrepare(); - ::BuildTreeHelper(this, GetModel(), node->GetItem(), node); - } - - const unsigned countNewRows = node->GetSubTreeCount(); - - // Shift all stored indices after this row by the number of newly added - // rows. - m_selection.OnItemsInserted(row + 1, countNewRows); - if ( m_currentRow > row ) - ChangeCurrentRow(m_currentRow + countNewRows); - - if ( m_count != -1 ) - m_count += countNewRows; - - // Expanding this item means the previously cached column widths could - // have become invalid as new items are now visible. - GetOwner()->InvalidateColBestWidths(); - - UpdateDisplay(); - // Send the expanded event - SendExpanderEvent(wxEVT_DATAVIEW_ITEM_EXPANDED,node->GetItem()); - } -} - -void wxDataViewMainWindow::Collapse(unsigned int row) -{ - if (IsList()) - return; - - wxDataViewTreeNode *node = GetTreeNodeByRow(row); - if (!node) - return; - - if (!node->HasChildren()) - return; - - if (node->IsOpen()) - { - if ( !SendExpanderEvent(wxEVT_DATAVIEW_ITEM_COLLAPSING,node->GetItem()) ) - { - // Vetoed by the event handler. - return; - } - - const unsigned countDeletedRows = node->GetSubTreeCount(); - - if ( m_selection.OnItemsDeleted(row + 1, countDeletedRows) ) - { - SendSelectionChangedEvent(GetItemByRow(row)); - } - - node->ToggleOpen(); - - // Adjust the current row if necessary. - if ( m_currentRow > row ) - { - // If the current row was among the collapsed items, make the - // parent itself current. - if ( m_currentRow <= row + countDeletedRows ) - ChangeCurrentRow(row); - else // Otherwise just update the index. - ChangeCurrentRow(m_currentRow - countDeletedRows); - } - - if ( m_count != -1 ) - m_count -= countDeletedRows; - - GetOwner()->InvalidateColBestWidths(); - - UpdateDisplay(); - SendExpanderEvent(wxEVT_DATAVIEW_ITEM_COLLAPSED,node->GetItem()); - } -} - -wxDataViewTreeNode * wxDataViewMainWindow::FindNode( const wxDataViewItem & item ) -{ - const wxDataViewModel * model = GetModel(); - if( model == NULL ) - return NULL; - - if (!item.IsOk()) - return m_root; - - // Compose the parent-chain for the item we are looking for - wxVector parentChain; - wxDataViewItem it( item ); - while( it.IsOk() ) - { - parentChain.push_back(it); - it = model->GetParent(it); - } - - // Find the item along the parent-chain. - // This algorithm is designed to speed up the node-finding method - wxDataViewTreeNode* node = m_root; - for( unsigned iter = parentChain.size()-1; ; --iter ) - { - if( node->HasChildren() ) - { - if( node->GetChildNodes().empty() ) - { - // Even though the item is a container, it doesn't have any - // child nodes in the control's representation yet. We have - // to realize its subtree now. - SortPrepare(); - ::BuildTreeHelper(this, model, node->GetItem(), node); - } - - const wxDataViewTreeNodes& nodes = node->GetChildNodes(); - bool found = false; - - for (unsigned i = 0; i < nodes.GetCount(); ++i) - { - wxDataViewTreeNode* currentNode = nodes[i]; - if (currentNode->GetItem() == parentChain[iter]) - { - if (currentNode->GetItem() == item) - return currentNode; - - node = currentNode; - found = true; - break; - } - } - if (!found) - return NULL; - } - else - return NULL; - - if ( !iter ) - break; - } - return NULL; -} - -void wxDataViewMainWindow::HitTest( const wxPoint & point, wxDataViewItem & item, - wxDataViewColumn* &column ) -{ - wxDataViewColumn *col = NULL; - unsigned int cols = GetOwner()->GetColumnCount(); - unsigned int colnum = 0; - int x, y; - m_owner->CalcUnscrolledPosition( point.x, point.y, &x, &y ); - for (unsigned x_start = 0; colnum < cols; colnum++) - { - col = GetOwner()->GetColumnAt(colnum); - if (col->IsHidden()) - continue; // skip it! - - unsigned int w = col->GetWidth(); - if (x_start+w >= (unsigned int)x) - break; - - x_start += w; - } - - column = col; - item = GetItemByRow( GetLineAt( y ) ); -} - -wxRect wxDataViewMainWindow::GetItemRect( const wxDataViewItem & item, - const wxDataViewColumn* column ) -{ - int xpos = 0; - int width = 0; - - unsigned int cols = GetOwner()->GetColumnCount(); - // If column is null the loop will compute the combined width of all columns. - // Otherwise, it will compute the x position of the column we are looking for. - for (unsigned int i = 0; i < cols; i++) - { - wxDataViewColumn* col = GetOwner()->GetColumnAt( i ); - - if (col == column) - break; - - if (col->IsHidden()) - continue; // skip it! - - xpos += col->GetWidth(); - width += col->GetWidth(); - } - - if(column != 0) - { - // If we have a column, we need can get its width directly. - if(column->IsHidden()) - width = 0; - else - width = column->GetWidth(); - - } - else - { - // If we have no column, we reset the x position back to zero. - xpos = 0; - } - - // we have to take an expander column into account and compute its indentation - // to get the correct x position where the actual text is - int indent = 0; - int row = GetRowByItem(item); - if (!IsList() && - (column == 0 || GetExpanderColumnOrFirstOne(GetOwner()) == column) ) - { - wxDataViewTreeNode* node = GetTreeNodeByRow(row); - indent = GetOwner()->GetIndent() * node->GetIndentLevel(); - indent = indent + m_lineHeight; // use m_lineHeight as the width of the expander - } - - wxRect itemRect( xpos + indent, - GetLineStart( row ), - width - indent, - GetLineHeight( row ) ); - - GetOwner()->CalcScrolledPosition( itemRect.x, itemRect.y, - &itemRect.x, &itemRect.y ); - - return itemRect; -} - -int wxDataViewMainWindow::RecalculateCount() const -{ - if (IsVirtualList()) - { - wxDataViewVirtualListModel *list_model = - (wxDataViewVirtualListModel*) GetModel(); - - return list_model->GetCount(); - } - else - { - return m_root->GetSubTreeCount(); - } -} - -class ItemToRowJob : public DoJob -{ -public: - ItemToRowJob(const wxDataViewItem& item_, wxVector::reverse_iterator iter) - : m_iter(iter), - item(item_) - { - ret = -1; - } - - // Maybe binary search will help to speed up this process - virtual int operator() ( wxDataViewTreeNode * node) - { - ret ++; - if( node->GetItem() == item ) - { - return DoJob::DONE; - } - - if( node->GetItem() == *m_iter ) - { - m_iter++; - return DoJob::CONTINUE; - } - else - { - ret += node->GetSubTreeCount(); - return DoJob::SKIP_SUBTREE; - } - - } - - // the row number is begin from zero - int GetResult() const - { return ret -1; } - -private: - wxVector::reverse_iterator m_iter; - wxDataViewItem item; - int ret; - -}; - -int wxDataViewMainWindow::GetRowByItem(const wxDataViewItem & item) const -{ - const wxDataViewModel * model = GetModel(); - if( model == NULL ) - return -1; - - if (IsVirtualList()) - { - return wxPtrToUInt( item.GetID() ) -1; - } - else - { - if( !item.IsOk() ) - return -1; - - // Compose the parent-chain of the item we are looking for - wxVector parentChain; - wxDataViewItem it( item ); - while( it.IsOk() ) - { - parentChain.push_back(it); - it = model->GetParent(it); - } - - // add an 'invalid' item to represent our 'invisible' root node - parentChain.push_back(wxDataViewItem()); - - // the parent chain was created by adding the deepest parent first. - // so if we want to start at the root node, we have to iterate backwards through the vector - ItemToRowJob job( item, parentChain.rbegin() ); - Walker( m_root, job ); - return job.GetResult(); - } -} - -static void BuildTreeHelper( wxDataViewMainWindow *window, const wxDataViewModel * model, - const wxDataViewItem & item, wxDataViewTreeNode * node) -{ - if( !model->IsContainer( item ) ) - return; - - wxDataViewItemArray children; - unsigned int num = model->GetChildren( item, children); - - for ( unsigned int index = 0; index < num; index++ ) - { - wxDataViewTreeNode *n = new wxDataViewTreeNode(window, node, children[index]); - - if( model->IsContainer(children[index]) ) - n->SetHasChildren( true ); - - node->InsertChild(n, index); - } - - wxASSERT( node->IsOpen() ); - node->ChangeSubTreeCount(+num); -} - -void wxDataViewMainWindow::BuildTree(wxDataViewModel * model) -{ - DestroyTree(); - - if (GetModel()->IsVirtualListModel()) - { - InvalidateCount(); - return; - } - - m_root = wxDataViewTreeNode::CreateRootNode(this); - - // First we define a invalid item to fetch the top-level elements - wxDataViewItem item; - SortPrepare(); - BuildTreeHelper(this, model, item, m_root); - InvalidateCount(); -} - -void wxDataViewMainWindow::DestroyTree() -{ - if (!IsVirtualList()) - { - wxDELETE(m_root); - m_count = 0; - } -} - -wxDataViewColumn* -wxDataViewMainWindow::FindColumnForEditing(const wxDataViewItem& item, wxDataViewCellMode mode) -{ - // Edit the current column editable in 'mode'. If no column is focused - // (typically because the user has full row selected), try to find the - // first editable column (this would typically be a checkbox for - // wxDATAVIEW_CELL_ACTIVATABLE and we don't want to force the user to set - // focus on the checkbox column; or on the only editable text column). - - wxDataViewColumn *candidate = m_currentCol; - - if ( candidate && - !IsCellEditableInMode(item, candidate, mode) && - !m_currentColSetByKeyboard ) - { - // If current column was set by mouse to something not editable (in - // 'mode') and the user pressed Space/F2 to edit it, treat the - // situation as if there was whole-row focus, because that's what is - // visually indicated and the mouse click could very well be targeted - // on the row rather than on an individual cell. - // - // But if it was done by keyboard, respect that even if the column - // isn't editable, because focus is visually on that column and editing - // something else would be surprising. - candidate = NULL; - } - - if ( !candidate ) - { - const unsigned cols = GetOwner()->GetColumnCount(); - for ( unsigned i = 0; i < cols; i++ ) - { - wxDataViewColumn *c = GetOwner()->GetColumnAt(i); - if ( c->IsHidden() ) - continue; - - if ( IsCellEditableInMode(item, c, mode) ) - { - candidate = c; - break; - } - } - } - - // If on container item without columns, only the expander column - // may be directly editable: - if ( candidate && - GetOwner()->GetExpanderColumn() != candidate && - GetModel()->IsContainer(item) && - !GetModel()->HasContainerColumns(item) ) - { - candidate = GetOwner()->GetExpanderColumn(); - } - - if ( !candidate ) - return NULL; - - if ( !IsCellEditableInMode(item, candidate, mode) ) - return NULL; - - return candidate; -} - -bool wxDataViewMainWindow::IsCellEditableInMode(const wxDataViewItem& item, - const wxDataViewColumn *col, - wxDataViewCellMode mode) const -{ - if ( col->GetRenderer()->GetMode() != mode ) - return false; - - if ( !GetModel()->IsEnabled(item, col->GetModelColumn()) ) - return false; - - return true; -} - -void wxDataViewMainWindow::OnCharHook(wxKeyEvent& event) -{ - if ( m_editorCtrl ) - { - // Handle any keys special for the in-place editor and return without - // calling Skip() below. - switch ( event.GetKeyCode() ) - { - case WXK_ESCAPE: - m_editorRenderer->CancelEditing(); - return; - - case WXK_RETURN: - // Shift-Enter is not special neither. - if ( event.ShiftDown() ) - break; - wxFALLTHROUGH; - - case WXK_TAB: - // Ctrl/Alt-Tab or Enter could be used for something else, so - // don't handle them here. - if ( event.HasModifiers() ) - break; - - m_editorRenderer->FinishEditing(); - return; - } - } - else if ( m_useCellFocus ) - { - if ( event.GetKeyCode() == WXK_TAB && !event.HasModifiers() ) - { - if ( event.ShiftDown() ) - OnLeftKey(event); - else - OnRightKey(event); - return; - } - } - - event.Skip(); -} - -void wxDataViewMainWindow::OnChar( wxKeyEvent &event ) -{ - wxWindow * const parent = GetParent(); - - // propagate the char event upwards - wxKeyEvent eventForParent(event); - eventForParent.SetEventObject(parent); - if ( parent->ProcessWindowEvent(eventForParent) ) - return; - - if ( parent->HandleAsNavigationKey(event) ) - return; - - // no item -> nothing to do - if (!HasCurrentRow()) - { - event.Skip(); - return; - } - - switch ( event.GetKeyCode() ) - { - case WXK_RETURN: - if ( event.HasModifiers() ) - { - event.Skip(); - break; - } - else - { - // Enter activates the item, i.e. sends wxEVT_DATAVIEW_ITEM_ACTIVATED to - // it. Only if that event is not handled do we activate column renderer (which - // is normally done by Space) or even inline editing. - - const wxDataViewItem item = GetItemByRow(m_currentRow); - - wxDataViewEvent le(wxEVT_DATAVIEW_ITEM_ACTIVATED, - parent->GetId()); - le.SetItem(item); - le.SetEventObject(parent); - le.SetModel(GetModel()); - - if ( parent->ProcessWindowEvent(le) ) - break; - // else: fall through to WXK_SPACE handling - } - - case WXK_SPACE: - if ( event.HasModifiers() ) - { - event.Skip(); - break; - } - else - { - // Space toggles activatable items or -- if not activatable -- - // starts inline editing (this is normally done using F2 on - // Windows, but Space is common everywhere else, so use it too - // for greater cross-platform compatibility). - - const wxDataViewItem item = GetItemByRow(m_currentRow); - - // Activate the current activatable column. If not column is focused (typically - // because the user has full row selected), try to find the first activatable - // column (this would typically be a checkbox and we don't want to force the user - // to set focus on the checkbox column). - wxDataViewColumn *activatableCol = FindColumnForEditing(item, wxDATAVIEW_CELL_ACTIVATABLE); - - if ( activatableCol ) - { - const unsigned colIdx = activatableCol->GetModelColumn(); - const wxRect cell_rect = GetOwner()->GetItemRect(item, activatableCol); - - wxDataViewRenderer *cell = activatableCol->GetRenderer(); - cell->PrepareForItem(GetModel(), item, colIdx); - cell->WXActivateCell(cell_rect, GetModel(), item, colIdx, NULL); - - break; - } - // else: fall through to WXK_F2 handling - } - - case WXK_F2: - if ( event.HasModifiers() ) - { - event.Skip(); - break; - } - else - { - if ( !m_selection.IsEmpty() ) - { - // Mimic Windows 7 behavior: edit the item that has focus - // if it is selected and the first selected item if focus - // is out of selection. - unsigned sel; - if ( m_selection.IsSelected(m_currentRow) ) - { - sel = m_currentRow; - } - else // Focused item is not selected. - { - wxSelectionStore::IterationState cookie; - sel = m_selection.GetFirstSelectedItem(cookie); - } - - - const wxDataViewItem item = GetItemByRow(sel); - - // Edit the current column. If no column is focused - // (typically because the user has full row selected), try - // to find the first editable column. - wxDataViewColumn *editableCol = FindColumnForEditing(item, wxDATAVIEW_CELL_EDITABLE); - - if ( editableCol ) - GetOwner()->EditItem(item, editableCol); - } - } - break; - - case WXK_UP: - OnVerticalNavigation(event, -1); - break; - - case WXK_DOWN: - OnVerticalNavigation(event, +1); - break; - // Add the process for tree expanding/collapsing - case WXK_LEFT: - OnLeftKey(event); - break; - - case WXK_RIGHT: - OnRightKey(event); - break; - - case WXK_END: - OnVerticalNavigation(event, +(int)GetRowCount()); - break; - - case WXK_HOME: - OnVerticalNavigation(event, -(int)GetRowCount()); - break; - - case WXK_PAGEUP: - OnVerticalNavigation(event, -(GetCountPerPage() - 1)); - break; - - case WXK_PAGEDOWN: - OnVerticalNavigation(event, +(GetCountPerPage() - 1)); - break; - - default: - event.Skip(); - } -} - -void wxDataViewMainWindow::OnVerticalNavigation(const wxKeyEvent& event, int delta) -{ - // if there is no selection, we cannot move it anywhere - if (!HasCurrentRow() || IsEmpty()) - return; - - int newRow = (int)m_currentRow + delta; - - // let's keep the new row inside the allowed range - if ( newRow < 0 ) - newRow = 0; - - const int rowCount = (int)GetRowCount(); - if ( newRow >= rowCount ) - newRow = rowCount - 1; - - unsigned int oldCurrent = m_currentRow; - unsigned int newCurrent = (unsigned int)newRow; - - if ( newCurrent == oldCurrent ) - return; - - // in single selection we just ignore Shift as we can't select several - // items anyhow - if ( event.ShiftDown() && !IsSingleSel() ) - { - RefreshRow( oldCurrent ); - - ChangeCurrentRow( newCurrent ); - - // select all the items between the old and the new one - if ( oldCurrent > newCurrent ) - { - newCurrent = oldCurrent; - oldCurrent = m_currentRow; - } - - SelectRows(oldCurrent, newCurrent); - - wxSelectionStore::IterationState cookie; - const unsigned firstSel = m_selection.GetFirstSelectedItem(cookie); - if ( firstSel != wxSelectionStore::NO_SELECTION ) - SendSelectionChangedEvent(GetItemByRow(firstSel)); - } - else // !shift - { - RefreshRow( oldCurrent ); - - // all previously selected items are unselected unless ctrl is held - if ( !event.ControlDown() ) - UnselectAllRows(); - - ChangeCurrentRow( newCurrent ); - - if ( !event.ControlDown() ) - { - SelectRow( m_currentRow, true ); - SendSelectionChangedEvent(GetItemByRow(m_currentRow)); - } - else - RefreshRow( m_currentRow ); - } - - GetOwner()->EnsureVisible( m_currentRow, -1 ); -} - -void wxDataViewMainWindow::OnLeftKey(wxKeyEvent& event) -{ - if ( IsList() ) - { - TryAdvanceCurrentColumn(NULL, event, /*forward=*/false); - } - else - { - wxDataViewTreeNode* node = GetTreeNodeByRow(m_currentRow); - if ( !node ) - return; - - if ( TryAdvanceCurrentColumn(node, event, /*forward=*/false) ) - return; - - const bool dontCollapseNodes = event.GetKeyCode() == WXK_TAB; - if ( dontCollapseNodes ) - { - m_currentCol = NULL; - // allow focus change - event.Skip(); - return; - } - - // Because TryAdvanceCurrentColumn() return false, we are at the first - // column or using whole-row selection. In this situation, we can use - // the standard TreeView handling of the left key. - if (node->HasChildren() && node->IsOpen()) - { - Collapse(m_currentRow); - } - else - { - // if the node is already closed, we move the selection to its parent - wxDataViewTreeNode *parent_node = node->GetParent(); - - if (parent_node) - { - int parent = GetRowByItem( parent_node->GetItem() ); - if ( parent >= 0 ) - { - unsigned int row = m_currentRow; - SelectRow( row, false); - SelectRow( parent, true ); - ChangeCurrentRow( parent ); - GetOwner()->EnsureVisible( parent, -1 ); - SendSelectionChangedEvent( parent_node->GetItem() ); - } - } - } - } -} - -void wxDataViewMainWindow::OnRightKey(wxKeyEvent& event) -{ - if ( IsList() ) - { - TryAdvanceCurrentColumn(NULL, event, /*forward=*/true); - } - else - { - wxDataViewTreeNode* node = GetTreeNodeByRow(m_currentRow); - if ( !node ) - return; - - if ( node->HasChildren() ) - { - if ( !node->IsOpen() ) - { - Expand( m_currentRow ); - } - else - { - // if the node is already open, we move the selection to the first child - unsigned int row = m_currentRow; - SelectRow( row, false ); - SelectRow( row + 1, true ); - ChangeCurrentRow( row + 1 ); - GetOwner()->EnsureVisible( row + 1, -1 ); - SendSelectionChangedEvent( GetItemByRow(row+1) ); - } - } - else - { - TryAdvanceCurrentColumn(node, event, /*forward=*/true); - } - } -} - -bool wxDataViewMainWindow::TryAdvanceCurrentColumn(wxDataViewTreeNode *node, wxKeyEvent& event, bool forward) -{ - if ( GetOwner()->GetColumnCount() == 0 ) - return false; - - if ( !m_useCellFocus ) - return false; - - const bool wrapAround = event.GetKeyCode() == WXK_TAB; - - if ( node ) - { - // navigation shouldn't work in branch nodes without other columns: - if ( node->HasChildren() && !GetModel()->HasContainerColumns(node->GetItem()) ) - return false; - } - - if ( m_currentCol == NULL || !m_currentColSetByKeyboard ) - { - if ( forward ) - { - m_currentCol = GetOwner()->GetColumnAt(1); - m_currentColSetByKeyboard = true; - RefreshRow(m_currentRow); - return true; - } - else - { - if ( !wrapAround ) - return false; - } - } - - int idx = GetOwner()->GetColumnIndex(m_currentCol) + (forward ? +1 : -1); - - if ( idx >= (int)GetOwner()->GetColumnCount() ) - { - if ( !wrapAround ) - return false; - - if ( GetCurrentRow() < GetRowCount() - 1 ) - { - // go to the first column of the next row: - idx = 0; - OnVerticalNavigation(wxKeyEvent()/*dummy*/, +1); - } - else - { - // allow focus change - event.Skip(); - return false; - } - } - - if ( idx < 0 && wrapAround ) - { - if ( GetCurrentRow() > 0 ) - { - // go to the last column of the previous row: - idx = (int)GetOwner()->GetColumnCount() - 1; - OnVerticalNavigation(wxKeyEvent()/*dummy*/, -1); - } - else - { - // allow focus change - event.Skip(); - return false; - } - } - - GetOwner()->EnsureVisible(m_currentRow, idx); - - if ( idx < 1 ) - { - // We are going to the left of the second column. Reset to whole-row - // focus (which means first column would be edited). - m_currentCol = NULL; - RefreshRow(m_currentRow); - return true; - } - - m_currentCol = GetOwner()->GetColumnAt(idx); - m_currentColSetByKeyboard = true; - RefreshRow(m_currentRow); - return true; -} - -void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) -{ - if (event.GetEventType() == wxEVT_MOUSEWHEEL) - { - // let the base handle mouse wheel events. - event.Skip(); - return; - } - - if(event.ButtonDown()) - { - // Not skipping button down events would prevent the system from - // setting focus to this window as most (all?) of them do by default, - // so skip it to enable default handling. - event.Skip(); - } - - int x = event.GetX(); - int y = event.GetY(); - m_owner->CalcUnscrolledPosition( x, y, &x, &y ); - wxDataViewColumn *col = NULL; - - int xpos = 0; - unsigned int cols = GetOwner()->GetColumnCount(); - unsigned int i; - for (i = 0; i < cols; i++) - { - wxDataViewColumn *c = GetOwner()->GetColumnAt( i ); - if (c->IsHidden()) - continue; // skip it! - - if (x < xpos + c->GetWidth()) - { - col = c; - break; - } - xpos += c->GetWidth(); - } - - wxDataViewModel* const model = GetModel(); - - const unsigned int current = GetLineAt( y ); - const wxDataViewItem item = GetItemByRow(current); - - // Handle right clicking here, before everything else as context menu - // events should be sent even when we click outside of any item, unlike all - // the other ones. - if (event.RightUp()) - { - wxWindow *parent = GetParent(); - wxDataViewEvent le(wxEVT_DATAVIEW_ITEM_CONTEXT_MENU, parent->GetId()); - le.SetEventObject(parent); - le.SetModel(model); - - if ( item.IsOk() && col ) - { - le.SetItem( item ); - le.SetColumn( col->GetModelColumn() ); - le.SetDataViewColumn( col ); - } - - parent->ProcessWindowEvent(le); - return; - } - -#if wxUSE_DRAG_AND_DROP - if (event.Dragging() || ((m_dragCount > 0) && event.Leaving())) - { - if (m_dragCount == 0) - { - // we have to report the raw, physical coords as we want to be - // able to call HitTest(event.m_pointDrag) from the user code to - // get the item being dragged - m_dragStart = event.GetPosition(); - } - - m_dragCount++; - if ((m_dragCount < 3) && (event.Leaving())) - m_dragCount = 3; - else if (m_dragCount != 3) - return; - - if (event.LeftIsDown()) - { - m_owner->CalcUnscrolledPosition( m_dragStart.x, m_dragStart.y, - &m_dragStart.x, &m_dragStart.y ); - unsigned int drag_item_row = GetLineAt( m_dragStart.y ); - wxDataViewItem itemDragged = GetItemByRow( drag_item_row ); - - // Notify cell about drag - wxDataViewEvent evt( wxEVT_DATAVIEW_ITEM_BEGIN_DRAG, m_owner->GetId() ); - evt.SetEventObject( m_owner ); - evt.SetItem( itemDragged ); - evt.SetModel( model ); - if (!m_owner->HandleWindowEvent( evt )) - return; - - if (!evt.IsAllowed()) - return; - - wxDataObject *obj = evt.GetDataObject(); - if (!obj) - return; - - wxDataViewDropSource drag( this, drag_item_row ); - drag.SetData( *obj ); - /* wxDragResult res = */ drag.DoDragDrop(evt.GetDragFlags()); - delete obj; - } - return; - } - else - { - m_dragCount = 0; - } -#endif // wxUSE_DRAG_AND_DROP - - // Check if we clicked outside the item area. - if ((current >= GetRowCount()) || !col) - { - // Follow Windows convention here: clicking either left or right (but - // not middle) button clears the existing selection. - if (m_owner && (event.LeftDown() || event.RightDown())) - { - if (!m_selection.IsEmpty()) - { - m_owner->UnselectAll(); - SendSelectionChangedEvent(wxDataViewItem()); - } - } - event.Skip(); - return; - } - - wxDataViewRenderer *cell = col->GetRenderer(); - wxDataViewColumn* const - expander = GetExpanderColumnOrFirstOne(GetOwner()); - - // Test whether the mouse is hovering over the expander (a.k.a tree "+" - // button) and also determine the offset of the real cell start, skipping - // the indentation and the expander itself. - bool hoverOverExpander = false; - int itemOffset = 0; - if ((!IsList()) && (expander == col)) - { - wxDataViewTreeNode * node = GetTreeNodeByRow(current); - - int indent = node->GetIndentLevel(); - itemOffset = GetOwner()->GetIndent()*indent; - - if ( node->HasChildren() ) - { - // we make the rectangle we are looking in a bit bigger than the actual - // visual expander so the user can hit that little thing reliably - wxRect rect(xpos + itemOffset, - GetLineStart( current ) + (GetLineHeight(current) - m_lineHeight)/2, - m_lineHeight, m_lineHeight); - - if( rect.Contains(x, y) ) - { - // So the mouse is over the expander - hoverOverExpander = true; - if (m_underMouse && m_underMouse != node) - { - // wxLogMessage("Undo the row: %d", GetRowByItem(m_underMouse->GetItem())); - RefreshRow(GetRowByItem(m_underMouse->GetItem())); - } - if (m_underMouse != node) - { - // wxLogMessage("Do the row: %d", current); - RefreshRow(current); - } - m_underMouse = node; - } - } - - // Account for the expander as well, even if this item doesn't have it, - // its parent does so it still counts for the offset. - itemOffset += m_lineHeight; - } - if (!hoverOverExpander) - { - if (m_underMouse != NULL) - { - // wxLogMessage("Undo the row: %d", GetRowByItem(m_underMouse->GetItem())); - RefreshRow(GetRowByItem(m_underMouse->GetItem())); - m_underMouse = NULL; - } - } - - bool simulateClick = false; - - if (event.ButtonDClick()) - { - m_renameTimer->Stop(); - m_lastOnSame = false; - } - - bool ignore_other_columns = - ((expander != col) && - (model->IsContainer(item)) && - (!model->HasContainerColumns(item))); - - if (event.LeftDClick()) - { - if ( !hoverOverExpander && (current == m_lineLastClicked) ) - { - wxWindow *parent = GetParent(); - wxDataViewEvent le(wxEVT_DATAVIEW_ITEM_ACTIVATED, parent->GetId()); - le.SetItem( item ); - le.SetColumn( col->GetModelColumn() ); - le.SetDataViewColumn( col ); - le.SetEventObject(parent); - le.SetModel(GetModel()); - - if ( parent->ProcessWindowEvent(le) ) - { - // Item activation was handled from the user code. - return; - } - } - - // Either it was a double click over the expander, or the second click - // happened on another item than the first one or it was a bona fide - // double click which was unhandled. In all these cases we continue - // processing this event as a simple click, e.g. to select the item or - // activate the renderer. - simulateClick = true; - } - - if (event.LeftUp() && !hoverOverExpander) - { - if (m_lineSelectSingleOnUp != (unsigned int)-1) - { - // select single line - if ( UnselectAllRows(m_lineSelectSingleOnUp) ) - { - SelectRow( m_lineSelectSingleOnUp, true ); - SendSelectionChangedEvent( GetItemByRow(m_lineSelectSingleOnUp) ); - } - //else: it was already selected, nothing to do - } - - // If the user click the expander, we do not do editing even if the column - // with expander are editable - if (m_lastOnSame && !ignore_other_columns) - { - if ((col == m_currentCol) && (current == m_currentRow) && - IsCellEditableInMode(item, col, wxDATAVIEW_CELL_EDITABLE) ) - { - m_renameTimer->Start( 100, true ); - } - } - - m_lastOnSame = false; - m_lineSelectSingleOnUp = (unsigned int)-1; - } - else if(!event.LeftUp()) - { - // This is necessary, because after a DnD operation in - // from and to ourself, the up event is swallowed by the - // DnD code. So on next non-up event (which means here and - // now) m_lineSelectSingleOnUp should be reset. - m_lineSelectSingleOnUp = (unsigned int)-1; - } - - if (event.RightDown()) - { - m_lineBeforeLastClicked = m_lineLastClicked; - m_lineLastClicked = current; - - // If the item is already selected, do not update the selection. - // Multi-selections should not be cleared if a selected item is clicked. - if (!IsRowSelected(current)) - { - UnselectAllRows(); - - const unsigned oldCurrent = m_currentRow; - ChangeCurrentRow(current); - SelectRow(m_currentRow,true); - RefreshRow(oldCurrent); - SendSelectionChangedEvent(GetItemByRow( m_currentRow ) ); - } - } - else if (event.MiddleDown()) - { - } - - if((event.LeftDown() || simulateClick) && hoverOverExpander) - { - wxDataViewTreeNode* node = GetTreeNodeByRow(current); - - // hoverOverExpander being true tells us that our node must be - // valid and have children. - // So we don't need any extra checks. - if( node->IsOpen() ) - Collapse(current); - else - Expand(current); - } - else if ((event.LeftDown() || simulateClick) && !hoverOverExpander) - { - m_lineBeforeLastClicked = m_lineLastClicked; - m_lineLastClicked = current; - - unsigned int oldCurrentRow = m_currentRow; - bool oldWasSelected = IsRowSelected(m_currentRow); - - bool cmdModifierDown = event.CmdDown(); - if ( IsSingleSel() || !(cmdModifierDown || event.ShiftDown()) ) - { - if ( IsSingleSel() || !IsRowSelected(current) ) - { - ChangeCurrentRow(current); - if ( UnselectAllRows(current) ) - { - SelectRow(m_currentRow,true); - SendSelectionChangedEvent(GetItemByRow( m_currentRow ) ); - } - } - else // multi sel & current is highlighted & no mod keys - { - m_lineSelectSingleOnUp = current; - ChangeCurrentRow(current); // change focus - } - } - else // multi sel & either ctrl or shift is down - { - if (cmdModifierDown) - { - ChangeCurrentRow(current); - ReverseRowSelection(m_currentRow); - SendSelectionChangedEvent(GetItemByRow(m_currentRow)); - } - else if (event.ShiftDown()) - { - ChangeCurrentRow(current); - - unsigned int lineFrom = oldCurrentRow, - lineTo = current; - - if ( lineFrom == static_cast(-1) ) - { - // If we hadn't had any current row before, treat this as a - // simple click and select the new row only. - lineFrom = current; - } - - if ( lineTo < lineFrom ) - { - lineTo = lineFrom; - lineFrom = m_currentRow; - } - - SelectRows(lineFrom, lineTo); - - wxSelectionStore::IterationState cookie; - const unsigned firstSel = m_selection.GetFirstSelectedItem(cookie); - if ( firstSel != wxSelectionStore::NO_SELECTION ) - SendSelectionChangedEvent(GetItemByRow(firstSel) ); - } - else // !ctrl, !shift - { - // test in the enclosing if should make it impossible - wxFAIL_MSG( wxT("how did we get here?") ); - } - } - - if (m_currentRow != oldCurrentRow) - RefreshRow( oldCurrentRow ); - - wxDataViewColumn *oldCurrentCol = m_currentCol; - - // Update selection here... - m_currentCol = col; - m_currentColSetByKeyboard = false; - - // This flag is used to decide whether we should start editing the item - // label. We do it if the user clicks twice (but not double clicks, - // i.e. simulateClick is false) on the same item but not if the click - // was used for something else already, e.g. selecting the item (so it - // must have been already selected) or giving the focus to the control - // (so it must have had focus already). - m_lastOnSame = !simulateClick && ((col == oldCurrentCol) && - (current == oldCurrentRow)) && oldWasSelected && - HasFocus(); - - // Call ActivateCell() after everything else as under GTK+ - if ( IsCellEditableInMode(item, col, wxDATAVIEW_CELL_ACTIVATABLE) ) - { - // notify cell about click - - wxRect cell_rect( xpos + itemOffset, - GetLineStart( current ), - col->GetWidth() - itemOffset, - GetLineHeight( current ) ); - - // Note that PrepareForItem() should be called after GetLineStart() - // call in cell_rect initialization above as GetLineStart() calls - // PrepareForItem() for other items from inside it. - cell->PrepareForItem(model, item, col->GetModelColumn()); - - // Report position relative to the cell's custom area, i.e. - // not the entire space as given by the control but the one - // used by the renderer after calculation of alignment etc. - // - // Notice that this results in negative coordinates when clicking - // in the upper left corner of a centre-aligned cell which doesn't - // fill its column entirely so this is somewhat surprising, but we - // do it like this for compatibility with the native GTK+ version, - // see #12270. - - // adjust the rectangle ourselves to account for the alignment - const int align = cell->GetEffectiveAlignment(); - - wxRect rectItem = cell_rect; - const wxSize size = cell->GetSize(); - if ( size.x >= 0 && size.x < cell_rect.width ) - { - if ( align & wxALIGN_CENTER_HORIZONTAL ) - rectItem.x += (cell_rect.width - size.x)/2; - else if ( align & wxALIGN_RIGHT ) - rectItem.x += cell_rect.width - size.x; - // else: wxALIGN_LEFT is the default - } - - if ( size.y >= 0 && size.y < cell_rect.height ) - { - if ( align & wxALIGN_CENTER_VERTICAL ) - rectItem.y += (cell_rect.height - size.y)/2; - else if ( align & wxALIGN_BOTTOM ) - rectItem.y += cell_rect.height - size.y; - // else: wxALIGN_TOP is the default - } - - wxMouseEvent event2(event); - event2.m_x -= rectItem.x; - event2.m_y -= rectItem.y; - m_owner->CalcUnscrolledPosition(event2.m_x, event2.m_y, &event2.m_x, &event2.m_y); - - /* ignore ret */ cell->WXActivateCell - ( - cell_rect, - model, - item, - col->GetModelColumn(), - &event2 - ); - } - } -} - -void wxDataViewMainWindow::OnSetFocus( wxFocusEvent &event ) -{ - m_hasFocus = true; - - // Make the control usable from keyboard once it gets focus by ensuring - // that it has a current row, if at all possible. - if ( !HasCurrentRow() && !IsEmpty() ) - { - ChangeCurrentRow(0); - } - - if (HasCurrentRow()) - Refresh(); - - event.Skip(); -} - -void wxDataViewMainWindow::OnKillFocus( wxFocusEvent &event ) -{ - m_hasFocus = false; - - if (HasCurrentRow()) - Refresh(); - - event.Skip(); -} - -void wxDataViewMainWindow::OnColumnsCountChanged() -{ - int editableCount = 0; - - const unsigned cols = GetOwner()->GetColumnCount(); - for ( unsigned i = 0; i < cols; i++ ) - { - wxDataViewColumn *c = GetOwner()->GetColumnAt(i); - if ( c->IsHidden() ) - continue; - if ( c->GetRenderer()->GetMode() != wxDATAVIEW_CELL_INERT ) - editableCount++; - } - - m_useCellFocus = (editableCount > 0); - - UpdateDisplay(); -} - -void wxDataViewMainWindow::UpdateColumnSizes() -{ - int colsCount = GetOwner()->GetColumnCount(); - if ( !colsCount ) - return; - - wxDataViewCtrl *owner = GetOwner(); - - int fullWinWidth = GetSize().x; - - wxDataViewColumn *lastCol = owner->GetColumn(colsCount - 1); - int colswidth = GetEndOfLastCol(); - int lastColX = colswidth - lastCol->GetWidth(); - if ( lastColX < fullWinWidth ) - { - int desiredWidth = wxMax(fullWinWidth - lastColX, lastCol->GetMinWidth()); - lastCol->SetWidth(desiredWidth); - - // All columns fit on screen, so we don't need horizontal scrolling. - // To prevent flickering scrollbar when resizing the window to be - // narrower, force-set the virtual width to 0 here. It will eventually - // be corrected at idle time. - SetVirtualSize(0, m_virtualSize.y); - - RefreshRect(wxRect(lastColX, 0, fullWinWidth - lastColX, GetSize().y)); - } - else - { - // else: don't bother, the columns won't fit anyway - SetVirtualSize(colswidth, m_virtualSize.y); - } -} - -//----------------------------------------------------------------------------- -// wxDataViewCtrl -//----------------------------------------------------------------------------- - -WX_DEFINE_LIST(wxDataViewColumnList) - -wxIMPLEMENT_DYNAMIC_CLASS(wxDataViewCtrl, wxDataViewCtrlBase); -wxBEGIN_EVENT_TABLE(wxDataViewCtrl, wxDataViewCtrlBase) - EVT_SIZE(wxDataViewCtrl::OnSize) -wxEND_EVENT_TABLE() - -wxDataViewCtrl::~wxDataViewCtrl() -{ - if (m_notifier) - GetModel()->RemoveNotifier( m_notifier ); - - m_cols.Clear(); - m_colsBestWidths.clear(); -} - -void wxDataViewCtrl::Init() -{ - m_cols.DeleteContents(true); - m_notifier = NULL; - - m_headerArea = NULL; - m_clientArea = NULL; - - m_colsDirty = false; - - m_allowMultiColumnSort = false; -} - -bool wxDataViewCtrl::Create(wxWindow *parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style, - const wxValidator& validator, - const wxString& name) -{ -// if ( (style & wxBORDER_MASK) == 0) -// style |= wxBORDER_SUNKEN; - - Init(); - - if (!wxControl::Create( parent, id, pos, size, - style | wxScrolledWindowStyle, validator, name)) - return false; - - SetInitialSize(size); - -#ifdef __WXMAC__ - MacSetClipChildren( true ); -#endif - - m_clientArea = new wxDataViewMainWindow( this, wxID_ANY ); - - // We use the cursor keys for moving the selection, not scrolling, so call - // this method to ensure wxScrollHelperEvtHandler doesn't catch all - // keyboard events forwarded to us from wxListMainWindow. - DisableKeyboardScrolling(); - - if (HasFlag(wxDV_NO_HEADER)) - m_headerArea = NULL; - else - m_headerArea = new wxDataViewHeaderWindow(this); - - SetTargetWindow( m_clientArea ); - - wxBoxSizer *sizer = new wxBoxSizer( wxVERTICAL ); - if (m_headerArea) - sizer->Add( m_headerArea, 0, wxGROW ); - sizer->Add( m_clientArea, 1, wxGROW ); - SetSizer( sizer ); - - EnableSystemTheme(); - - return true; -} - -wxBorder wxDataViewCtrl::GetDefaultBorder() const -{ - return wxBORDER_THEME; -} - -#ifdef __WXMSW__ -WXLRESULT wxDataViewCtrl::MSWWindowProc(WXUINT nMsg, - WXWPARAM wParam, - WXLPARAM lParam) -{ - WXLRESULT rc = wxDataViewCtrlBase::MSWWindowProc(nMsg, wParam, lParam); - - // we need to process arrows ourselves for scrolling - if ( nMsg == WM_GETDLGCODE ) - { - rc |= DLGC_WANTARROWS; - } - - return rc; -} -#endif - -wxSize wxDataViewCtrl::GetSizeAvailableForScrollTarget(const wxSize& size) -{ - wxSize newsize = size; - if (!HasFlag(wxDV_NO_HEADER) && (m_headerArea)) - newsize.y -= m_headerArea->GetSize().y; - - return newsize; -} - -void wxDataViewCtrl::OnSize( wxSizeEvent &WXUNUSED(event) ) -{ - if ( m_clientArea && GetColumnCount() ) - m_clientArea->UpdateColumnSizes(); - - // We need to override OnSize so that our scrolled - // window a) does call Layout() to use sizers for - // positioning the controls but b) does not query - // the sizer for their size and use that for setting - // the scrollable area as set that ourselves by - // calling SetScrollbar() further down. - - Layout(); - - AdjustScrollbars(); - - // We must redraw the headers if their height changed. Normally this - // shouldn't happen as the control shouldn't let itself be resized beneath - // its minimal height but avoid the display artefacts that appear if it - // does happen, e.g. because there is really not enough vertical space. - if ( !HasFlag(wxDV_NO_HEADER) && m_headerArea && - m_headerArea->GetSize().y <= m_headerArea->GetBestSize(). y ) - { - m_headerArea->Refresh(); - } -} - -void wxDataViewCtrl::SetFocus() -{ - if (m_clientArea) - m_clientArea->SetFocus(); -} - -bool wxDataViewCtrl::SetFont(const wxFont & font) -{ - if (!wxControl::SetFont(font)) - return false; - - if (m_headerArea) - m_headerArea->SetFont(font); - - if (m_clientArea) - { - m_clientArea->SetFont(font); - m_clientArea->SetRowHeight(m_clientArea->GetDefaultRowHeight()); - } - - if (m_headerArea || m_clientArea) - { - InvalidateColBestWidths(); - Layout(); - } - - return true; -} - - - -bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model ) -{ - if (!wxDataViewCtrlBase::AssociateModel( model )) - return false; - - if (model) - { - m_notifier = new wxGenericDataViewModelNotifier( m_clientArea ); - model->AddNotifier( m_notifier ); - } - else - { - // Our previous notifier has either been already deleted when the - // previous model was DecRef()'d in the base class AssociateModel() or - // is not associated with us any more because if the model is still - // alive, it's not used by this control. - m_notifier = NULL; - } - - m_clientArea->DestroyTree(); - - if (model) - { - m_clientArea->BuildTree(model); - } - - m_clientArea->UpdateDisplay(); - - return true; -} - -#if wxUSE_DRAG_AND_DROP - -bool wxDataViewCtrl::EnableDragSource( const wxDataFormat &format ) -{ - return m_clientArea->EnableDragSource( format ); -} - -bool wxDataViewCtrl::EnableDropTarget( const wxDataFormat &format ) -{ - return m_clientArea->EnableDropTarget( format ); -} - -#endif // wxUSE_DRAG_AND_DROP - -bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col ) -{ - if (!wxDataViewCtrlBase::AppendColumn(col)) - return false; - - m_cols.Append( col ); - m_colsBestWidths.push_back(CachedColWidthInfo()); - OnColumnsCountChanged(); - return true; -} - -bool wxDataViewCtrl::PrependColumn( wxDataViewColumn *col ) -{ - if (!wxDataViewCtrlBase::PrependColumn(col)) - return false; - - m_cols.Insert( col ); - m_colsBestWidths.insert(m_colsBestWidths.begin(), CachedColWidthInfo()); - OnColumnsCountChanged(); - return true; -} - -bool wxDataViewCtrl::InsertColumn( unsigned int pos, wxDataViewColumn *col ) -{ - if (!wxDataViewCtrlBase::InsertColumn(pos,col)) - return false; - - m_cols.Insert( pos, col ); - m_colsBestWidths.insert(m_colsBestWidths.begin() + pos, CachedColWidthInfo()); - OnColumnsCountChanged(); - return true; -} - -void wxDataViewCtrl::OnColumnChange(unsigned int idx) -{ - if ( m_headerArea ) - m_headerArea->UpdateColumn(idx); - - m_clientArea->UpdateDisplay(); -} - -void wxDataViewCtrl::OnColumnsCountChanged() -{ - if (m_headerArea) - m_headerArea->SetColumnCount(GetColumnCount()); - - m_clientArea->OnColumnsCountChanged(); -} - -void wxDataViewCtrl::DoSetExpanderColumn() -{ - wxDataViewColumn* column = GetExpanderColumn(); - if ( column ) - { - int index = GetColumnIndex(column); - if ( index != wxNOT_FOUND ) - InvalidateColBestWidth(index); - } - - m_clientArea->UpdateDisplay(); -} - -void wxDataViewCtrl::DoSetIndent() -{ - m_clientArea->UpdateDisplay(); -} - -unsigned int wxDataViewCtrl::GetColumnCount() const -{ - return m_cols.GetCount(); -} - -bool wxDataViewCtrl::SetRowHeight( int lineHeight ) -{ - if ( !m_clientArea ) - return false; - - m_clientArea->SetRowHeight(lineHeight); - - return true; -} - -wxDataViewColumn* wxDataViewCtrl::GetColumn( unsigned int idx ) const -{ - return m_cols[idx]; -} - -wxDataViewColumn *wxDataViewCtrl::GetColumnAt(unsigned int pos) const -{ - // columns can't be reordered if there is no header window which allows - // to do this - const unsigned idx = m_headerArea ? m_headerArea->GetColumnsOrder()[pos] - : pos; - - return GetColumn(idx); -} - -int wxDataViewCtrl::GetColumnIndex(const wxDataViewColumn *column) const -{ - const unsigned count = m_cols.size(); - for ( unsigned n = 0; n < count; n++ ) - { - if ( m_cols[n] == column ) - return n; - } - - return wxNOT_FOUND; -} - -int wxDataViewCtrl::GetModelColumnIndex( unsigned int model_column ) const -{ - const int count = GetColumnCount(); - for ( int index = 0; index < count; index++ ) - { - wxDataViewColumn* column = GetColumn(index); - if ( column->GetModelColumn() == model_column ) - return index; - } - return wxNOT_FOUND; -} - -class wxDataViewMaxWidthCalculator : public wxMaxWidthCalculatorBase -{ -public: - wxDataViewMaxWidthCalculator(const wxDataViewCtrl *dvc, - wxDataViewMainWindow *clientArea, - wxDataViewRenderer *renderer, - const wxDataViewModel *model, - size_t model_column, - int expanderSize) - : wxMaxWidthCalculatorBase(model_column), - m_dvc(dvc), - m_clientArea(clientArea), - m_renderer(renderer), - m_model(model), - m_expanderSize(expanderSize) - { - int index = dvc->GetModelColumnIndex( model_column ); - wxDataViewColumn* column = index == wxNOT_FOUND ? NULL : dvc->GetColumn(index); - m_isExpanderCol = - !clientArea->IsList() && - (column == 0 || - GetExpanderColumnOrFirstOne(const_cast(dvc)) == column ); - } - - virtual void UpdateWithRow(int row) wxOVERRIDE - { - int indent = 0; - wxDataViewItem item; - - if ( m_isExpanderCol ) - { - wxDataViewTreeNode *node = m_clientArea->GetTreeNodeByRow(row); - item = node->GetItem(); - indent = m_dvc->GetIndent() * node->GetIndentLevel() + m_expanderSize; - } - else - { - item = m_clientArea->GetItemByRow(row); - } - - m_renderer->PrepareForItem(m_model, item, GetColumn()); - UpdateWithWidth(m_renderer->GetSize().x + indent); - } - -private: - const wxDataViewCtrl *m_dvc; - wxDataViewMainWindow *m_clientArea; - wxDataViewRenderer *m_renderer; - const wxDataViewModel *m_model; - bool m_isExpanderCol; - int m_expanderSize; -}; - - -unsigned int wxDataViewCtrl::GetBestColumnWidth(int idx) const -{ - if ( m_colsBestWidths[idx].width != 0 ) - return m_colsBestWidths[idx].width; - - const int count = m_clientArea->GetRowCount(); - wxDataViewColumn *column = GetColumn(idx); - wxDataViewRenderer *renderer = - const_cast(column->GetRenderer()); - - wxDataViewMaxWidthCalculator calculator(this, m_clientArea, renderer, - GetModel(), column->GetModelColumn(), - m_clientArea->GetRowHeight()); - - calculator.UpdateWithWidth(column->GetMinWidth()); - - if ( m_headerArea ) - calculator.UpdateWithWidth(m_headerArea->GetColumnTitleWidth(*column)); - - const wxPoint origin = CalcUnscrolledPosition(wxPoint(0, 0)); - calculator.ComputeBestColumnWidth(count, - m_clientArea->GetLineAt(origin.y), - m_clientArea->GetLineAt(origin.y + GetClientSize().y)); - - int max_width = calculator.GetMaxWidth(); - if ( max_width > 0 ) - max_width += 2 * PADDING_RIGHTLEFT; - - const_cast(this)->m_colsBestWidths[idx].width = max_width; - return max_width; -} - -void wxDataViewCtrl::ColumnMoved(wxDataViewColumn * WXUNUSED(col), - unsigned int WXUNUSED(new_pos)) -{ - // do _not_ reorder m_cols elements here, they should always be in the - // order in which columns were added, we only display the columns in - // different order - m_clientArea->UpdateDisplay(); -} - -bool wxDataViewCtrl::DeleteColumn( wxDataViewColumn *column ) -{ - wxDataViewColumnList::compatibility_iterator ret = m_cols.Find( column ); - if (!ret) - return false; - - m_colsBestWidths.erase(m_colsBestWidths.begin() + GetColumnIndex(column)); - m_cols.Erase(ret); - - if ( m_clientArea->GetCurrentColumn() == column ) - m_clientArea->ClearCurrentColumn(); - - OnColumnsCountChanged(); - - return true; -} - -bool wxDataViewCtrl::ClearColumns() -{ - SetExpanderColumn(NULL); - m_cols.Clear(); - m_sortingColumnIdxs.clear(); - m_colsBestWidths.clear(); - - m_clientArea->ClearCurrentColumn(); - - OnColumnsCountChanged(); - - return true; -} - -void wxDataViewCtrl::InvalidateColBestWidth(int idx) -{ - m_colsBestWidths[idx].width = 0; - m_colsBestWidths[idx].dirty = true; - m_colsDirty = true; -} - -void wxDataViewCtrl::InvalidateColBestWidths() -{ - // mark all columns as dirty: - m_colsBestWidths.clear(); - m_colsBestWidths.resize(m_cols.size()); - m_colsDirty = true; -} - -void wxDataViewCtrl::UpdateColWidths() -{ - m_colsDirty = false; - - if ( !m_headerArea ) - return; - - const unsigned len = m_colsBestWidths.size(); - for ( unsigned i = 0; i < len; i++ ) - { - // Note that we have to have an explicit 'dirty' flag here instead of - // checking if the width==0, as is done in GetBestColumnWidth(). - // - // Testing width==0 wouldn't work correctly if some code called - // GetWidth() after col. width invalidation but before - // wxDataViewCtrl::UpdateColWidths() was called at idle time. This - // would result in the header's column width getting out of sync with - // the control itself. - if ( m_colsBestWidths[i].dirty ) - { - m_headerArea->UpdateColumn(i); - m_colsBestWidths[i].dirty = false; - } - } -} - -void wxDataViewCtrl::OnInternalIdle() -{ - wxDataViewCtrlBase::OnInternalIdle(); - - if ( m_colsDirty ) - UpdateColWidths(); -} - -int wxDataViewCtrl::GetColumnPosition( const wxDataViewColumn *column ) const -{ - unsigned int len = GetColumnCount(); - for ( unsigned int i = 0; i < len; i++ ) - { - wxDataViewColumn * col = GetColumnAt(i); - if (column==col) - return i; - } - - return wxNOT_FOUND; -} - -wxDataViewColumn *wxDataViewCtrl::GetSortingColumn() const -{ - if ( m_sortingColumnIdxs.empty() ) - return NULL; - - return GetColumn(m_sortingColumnIdxs.front()); -} - -wxVector wxDataViewCtrl::GetSortingColumns() const -{ - wxVector out; - - for ( wxVector::const_iterator it = m_sortingColumnIdxs.begin(), - end = m_sortingColumnIdxs.end(); - it != end; - ++it ) - { - out.push_back(GetColumn(*it)); - } - - return out; -} - -wxDataViewItem wxDataViewCtrl::DoGetCurrentItem() const -{ - return GetItemByRow(m_clientArea->GetCurrentRow()); -} - -void wxDataViewCtrl::DoSetCurrentItem(const wxDataViewItem& item) -{ - const int row = m_clientArea->GetRowByItem(item); - - const unsigned oldCurrent = m_clientArea->GetCurrentRow(); - if ( static_cast(row) != oldCurrent ) - { - m_clientArea->ChangeCurrentRow(row); - m_clientArea->RefreshRow(oldCurrent); - m_clientArea->RefreshRow(row); - } -} - -wxDataViewColumn *wxDataViewCtrl::GetCurrentColumn() const -{ - return m_clientArea->GetCurrentColumn(); -} - -int wxDataViewCtrl::GetSelectedItemsCount() const -{ - return m_clientArea->GetSelections().GetSelectedCount(); -} - -int wxDataViewCtrl::GetSelections( wxDataViewItemArray & sel ) const -{ - sel.Empty(); - const wxSelectionStore& selections = m_clientArea->GetSelections(); - - wxSelectionStore::IterationState cookie; - for ( unsigned row = selections.GetFirstSelectedItem(cookie); - row != wxSelectionStore::NO_SELECTION; - row = selections.GetNextSelectedItem(cookie) ) - { - wxDataViewItem item = m_clientArea->GetItemByRow(row); - if ( item.IsOk() ) - { - sel.Add(item); - } - else - { - wxFAIL_MSG( "invalid item in selection - bad internal state" ); - } - } - - return sel.size(); -} - -void wxDataViewCtrl::SetSelections( const wxDataViewItemArray & sel ) -{ - m_clientArea->ClearSelection(); - - wxDataViewItem last_parent; - - for ( size_t i = 0; i < sel.size(); i++ ) - { - wxDataViewItem item = sel[i]; - wxDataViewItem parent = GetModel()->GetParent( item ); - if (parent) - { - if (parent != last_parent) - ExpandAncestors(item); - } - - last_parent = parent; - int row = m_clientArea->GetRowByItem( item ); - if( row >= 0 ) - m_clientArea->SelectRow(static_cast(row), true); - } -} - -void wxDataViewCtrl::Select( const wxDataViewItem & item ) -{ - ExpandAncestors( item ); - - int row = m_clientArea->GetRowByItem( item ); - if( row >= 0 ) - { - // Unselect all rows before select another in the single select mode - if (m_clientArea->IsSingleSel()) - m_clientArea->UnselectAllRows(); - - m_clientArea->SelectRow(row, true); - - // Also set focus to the selected item - m_clientArea->ChangeCurrentRow( row ); - } -} - -void wxDataViewCtrl::Unselect( const wxDataViewItem & item ) -{ - int row = m_clientArea->GetRowByItem( item ); - if( row >= 0 ) - m_clientArea->SelectRow(row, false); -} - -bool wxDataViewCtrl::IsSelected( const wxDataViewItem & item ) const -{ - int row = m_clientArea->GetRowByItem( item ); - if( row >= 0 ) - { - return m_clientArea->IsRowSelected(row); - } - return false; -} - -void wxDataViewCtrl::SetAlternateRowColour(const wxColour& colour) -{ - m_alternateRowColour = colour; -} - -void wxDataViewCtrl::SelectAll() -{ - m_clientArea->SelectAllRows(); -} - -void wxDataViewCtrl::UnselectAll() -{ - m_clientArea->UnselectAllRows(); -} - -void wxDataViewCtrl::EnsureVisible( int row, int column ) -{ - if( row < 0 ) - row = 0; - if( row > (int) m_clientArea->GetRowCount() ) - row = m_clientArea->GetRowCount(); - - int first = m_clientArea->GetFirstVisibleRow(); - int last = m_clientArea->GetLastVisibleRow(); - if( row < first ) - m_clientArea->ScrollTo( row, column ); - else if( row > last ) - m_clientArea->ScrollTo( row - last + first, column ); - else - m_clientArea->ScrollTo( first, column ); -} - -void wxDataViewCtrl::EnsureVisible( const wxDataViewItem & item, const wxDataViewColumn * column ) -{ - ExpandAncestors( item ); - - m_clientArea->RecalculateDisplay(); - - int row = m_clientArea->GetRowByItem(item); - if( row >= 0 ) - { - if( column == NULL ) - EnsureVisible(row, -1); - else - EnsureVisible( row, GetColumnIndex(column) ); - } - -} - -void wxDataViewCtrl::HitTest( const wxPoint & point, wxDataViewItem & item, - wxDataViewColumn* &column ) const -{ - m_clientArea->HitTest(point, item, column); -} - -wxRect wxDataViewCtrl::GetItemRect( const wxDataViewItem & item, - const wxDataViewColumn* column ) const -{ - return m_clientArea->GetItemRect(item, column); -} - -wxDataViewItem wxDataViewCtrl::GetItemByRow( unsigned int row ) const -{ - return m_clientArea->GetItemByRow( row ); -} - -int wxDataViewCtrl::GetRowByItem( const wxDataViewItem & item ) const -{ - return m_clientArea->GetRowByItem( item ); -} - -void wxDataViewCtrl::Expand( const wxDataViewItem & item ) -{ - ExpandAncestors( item ); - - int row = m_clientArea->GetRowByItem( item ); - if (row != -1) - m_clientArea->Expand(row); -} - -void wxDataViewCtrl::Collapse( const wxDataViewItem & item ) -{ - int row = m_clientArea->GetRowByItem( item ); - if (row != -1) - m_clientArea->Collapse(row); -} - -bool wxDataViewCtrl::IsExpanded( const wxDataViewItem & item ) const -{ - int row = m_clientArea->GetRowByItem( item ); - if (row != -1) - return m_clientArea->IsExpanded(row); - return false; -} - -void wxDataViewCtrl::EditItem(const wxDataViewItem& item, const wxDataViewColumn *column) -{ - wxCHECK_RET( item.IsOk(), "invalid item" ); - wxCHECK_RET( column, "no column provided" ); - - m_clientArea->StartEditing(item, column); -} - -void wxDataViewCtrl::ResetAllSortColumns() -{ - // Must make copy, because unsorting will remove it from original vector - wxVector const copy(m_sortingColumnIdxs); - for ( wxVector::const_iterator it = copy.begin(), - end = copy.end(); - it != end; - ++it ) - { - GetColumn(*it)->UnsetAsSortKey(); - } - - wxASSERT( m_sortingColumnIdxs.empty() ); -} - -bool wxDataViewCtrl::AllowMultiColumnSort(bool allow) -{ - if ( m_allowMultiColumnSort == allow ) - return true; - - m_allowMultiColumnSort = allow; - - // If disabling, must disable any multiple sort that are active - if ( !allow ) - { - ResetAllSortColumns(); - - if ( wxDataViewModel *model = GetModel() ) - model->Resort(); - } - - return true; -} - - -bool wxDataViewCtrl::IsColumnSorted(int idx) const -{ - for ( wxVector::const_iterator it = m_sortingColumnIdxs.begin(), - end = m_sortingColumnIdxs.end(); - it != end; - ++it ) - { - if ( *it == idx ) - return true; - } - - return false; -} - -void wxDataViewCtrl::UseColumnForSorting(int idx ) -{ - m_sortingColumnIdxs.push_back(idx); -} - -void wxDataViewCtrl::DontUseColumnForSorting(int idx) -{ - for ( wxVector::iterator it = m_sortingColumnIdxs.begin(), - end = m_sortingColumnIdxs.end(); - it != end; - ++it ) - { - if ( *it == idx ) - { - m_sortingColumnIdxs.erase(it); - return; - } - } - - wxFAIL_MSG( "Column is not used for sorting" ); -} - -void wxDataViewCtrl::ToggleSortByColumn(int column) -{ - m_headerArea->ToggleSortByColumn(column); -} - -void wxDataViewCtrl::DoEnableSystemTheme(bool enable, wxWindow* window) -{ - typedef wxSystemThemedControl Base; - Base::DoEnableSystemTheme(enable, window); - Base::DoEnableSystemTheme(enable, m_clientArea); - if ( m_headerArea ) - Base::DoEnableSystemTheme(enable, m_headerArea); -} - -#endif // !wxUSE_GENERICDATAVIEWCTRL - -#endif // wxUSE_DATAVIEWCTRL diff --git a/Externals/wxWidgets3/src/generic/datectlg.cpp b/Externals/wxWidgets3/src/generic/datectlg.cpp deleted file mode 100644 index 4a89d31d57..0000000000 --- a/Externals/wxWidgets3/src/generic/datectlg.cpp +++ /dev/null @@ -1,498 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/generic/datectlg.cpp -// Purpose: generic wxDatePickerCtrlGeneric implementation -// Author: Andreas Pflug -// Modified by: -// Created: 2005-01-19 -// Copyright: (c) 2005 Andreas Pflug -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_DATEPICKCTRL - -#ifndef WX_PRECOMP - #include "wx/dialog.h" - #include "wx/dcmemory.h" - #include "wx/intl.h" - #include "wx/panel.h" - #include "wx/textctrl.h" - #include "wx/valtext.h" -#endif - -#include "wx/calctrl.h" -#include "wx/combo.h" - -#include "wx/datectrl.h" -#include "wx/generic/datectrl.h" - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - - -// ---------------------------------------------------------------------------- -// global variables -// ---------------------------------------------------------------------------- - - -// ---------------------------------------------------------------------------- -// local classes -// ---------------------------------------------------------------------------- - -class wxCalendarComboPopup : public wxCalendarCtrl, - public wxComboPopup -{ -public: - - wxCalendarComboPopup() : wxCalendarCtrl(), - wxComboPopup() - { - } - - virtual void Init() wxOVERRIDE - { - } - - // NB: Don't create lazily since it didn't work that way before - // wxComboCtrl was used, and changing behaviour would almost - // certainly introduce new bugs. - virtual bool Create(wxWindow* parent) wxOVERRIDE - { - if ( !wxCalendarCtrl::Create(parent, wxID_ANY, wxDefaultDateTime, - wxPoint(0, 0), wxDefaultSize, - wxCAL_SEQUENTIAL_MONTH_SELECTION - | wxCAL_SHOW_HOLIDAYS | wxBORDER_SUNKEN) ) - return false; - - SetFormat(GetLocaleDateFormat()); - - m_useSize = wxCalendarCtrl::GetBestSize(); - - wxWindow* tx = m_combo->GetTextCtrl(); - if ( !tx ) - tx = m_combo; - - tx->Connect(wxEVT_KILL_FOCUS, - wxFocusEventHandler(wxCalendarComboPopup::OnKillTextFocus), - NULL, this); - - return true; - } - - virtual wxSize GetAdjustedSize(int WXUNUSED(minWidth), - int WXUNUSED(prefHeight), - int WXUNUSED(maxHeight)) wxOVERRIDE - { - return m_useSize; - } - - virtual wxWindow *GetControl() wxOVERRIDE { return this; } - - void SetDateValue(const wxDateTime& date) - { - if ( date.IsValid() ) - { - m_combo->SetText(date.Format(m_format)); - SetDate(date); - } - else // invalid date - { - wxASSERT_MSG( HasDPFlag(wxDP_ALLOWNONE), - wxT("this control must have a valid date") ); - - m_combo->SetText(wxEmptyString); - } - } - - bool IsTextEmpty() const - { - return m_combo->GetTextCtrl()->IsEmpty(); - } - - bool ParseDateTime(const wxString& s, wxDateTime* pDt) - { - wxASSERT(pDt); - - if ( !s.empty() ) - { - pDt->ParseFormat(s, m_format); - if ( !pDt->IsValid() ) - return false; - } - - return true; - } - - void SendDateEvent(const wxDateTime& dt) - { - // Sends both wxCalendarEvent and wxDateEvent - wxWindow* datePicker = m_combo->GetParent(); - - wxCalendarEvent cev(datePicker, dt, wxEVT_CALENDAR_SEL_CHANGED); - datePicker->GetEventHandler()->ProcessEvent(cev); - - wxDateEvent event(datePicker, dt, wxEVT_DATE_CHANGED); - datePicker->GetEventHandler()->ProcessEvent(event); - } - -private: - - void OnCalKey(wxKeyEvent & ev) - { - if (ev.GetKeyCode() == WXK_ESCAPE && !ev.HasModifiers()) - Dismiss(); - else - ev.Skip(); - } - - void OnSelChange(wxCalendarEvent &ev) - { - m_combo->SetText(GetDate().Format(m_format)); - - if ( ev.GetEventType() == wxEVT_CALENDAR_DOUBLECLICKED ) - { - Dismiss(); - } - - SendDateEvent(GetDate()); - } - - void OnKillTextFocus(wxFocusEvent &ev) - { - ev.Skip(); - - const wxDateTime& dtOld = GetDate(); - - wxDateTime dt; - wxString value = m_combo->GetValue(); - if ( !ParseDateTime(value, &dt) ) - { - if ( !HasDPFlag(wxDP_ALLOWNONE) ) - dt = dtOld; - } - - m_combo->SetText(GetStringValueFor(dt)); - - if ( !dt.IsValid() && HasDPFlag(wxDP_ALLOWNONE) ) - return; - - // notify that we had to change the date after validation - if ( (dt.IsValid() && (!dtOld.IsValid() || dt != dtOld)) || - (!dt.IsValid() && dtOld.IsValid()) ) - { - SetDate(dt); - SendDateEvent(dt); - } - } - - bool HasDPFlag(int flag) const - { - return m_combo->GetParent()->HasFlag(flag); - } - - // Return the format to be used for the dates shown by the control. This - // functions honours wxDP_SHOWCENTURY flag. - wxString GetLocaleDateFormat() const - { -#if wxUSE_INTL - wxString fmt = wxLocale::GetInfo(wxLOCALE_SHORT_DATE_FMT); - if ( HasDPFlag(wxDP_SHOWCENTURY) ) - fmt.Replace("%y", "%Y"); - - return fmt; -#else // !wxUSE_INTL - return wxT("x"); -#endif // wxUSE_INTL/!wxUSE_INTL - } - - bool SetFormat(const wxString& fmt) - { - m_format = fmt; - - if ( m_combo ) - { - wxArrayString allowedChars; - for ( wxChar c = wxT('0'); c <= wxT('9'); c++ ) - allowedChars.Add(wxString(c, 1)); - - const wxChar *p2 = m_format.c_str(); - while ( *p2 ) - { - if ( *p2 == '%') - p2 += 2; - else - allowedChars.Add(wxString(*p2++, 1)); - } - - #if wxUSE_VALIDATORS - wxTextValidator tv(wxFILTER_INCLUDE_CHAR_LIST); - tv.SetIncludes(allowedChars); - m_combo->SetValidator(tv); - #endif - - if ( GetDate().IsValid() ) - m_combo->SetText(GetDate().Format(m_format)); - } - - return true; - } - - virtual void SetStringValue(const wxString& s) wxOVERRIDE - { - wxDateTime dt; - if ( !s.empty() && ParseDateTime(s, &dt) ) - SetDate(dt); - //else: keep the old value - } - - virtual wxString GetStringValue() const wxOVERRIDE - { - return GetStringValueFor(GetDate()); - } - -private: - // returns either the given date representation using the current format or - // an empty string if it's invalid - wxString GetStringValueFor(const wxDateTime& dt) const - { - wxString val; - if ( dt.IsValid() ) - val = dt.Format(m_format); - - return val; - } - - wxSize m_useSize; - wxString m_format; - - wxDECLARE_EVENT_TABLE(); -}; - - -wxBEGIN_EVENT_TABLE(wxCalendarComboPopup, wxCalendarCtrl) - EVT_KEY_DOWN(wxCalendarComboPopup::OnCalKey) - EVT_CALENDAR_SEL_CHANGED(wxID_ANY, wxCalendarComboPopup::OnSelChange) - EVT_CALENDAR_PAGE_CHANGED(wxID_ANY, wxCalendarComboPopup::OnSelChange) - EVT_CALENDAR(wxID_ANY, wxCalendarComboPopup::OnSelChange) -wxEND_EVENT_TABLE() - - -// ============================================================================ -// wxDatePickerCtrlGeneric implementation -// ============================================================================ - -wxBEGIN_EVENT_TABLE(wxDatePickerCtrlGeneric, wxDatePickerCtrlBase) - EVT_TEXT(wxID_ANY, wxDatePickerCtrlGeneric::OnText) - EVT_SIZE(wxDatePickerCtrlGeneric::OnSize) - EVT_SET_FOCUS(wxDatePickerCtrlGeneric::OnFocus) -wxEND_EVENT_TABLE() - -#ifndef wxHAS_NATIVE_DATEPICKCTRL - wxIMPLEMENT_DYNAMIC_CLASS(wxDatePickerCtrl, wxControl); -#endif - -// ---------------------------------------------------------------------------- -// creation -// ---------------------------------------------------------------------------- - -bool wxDatePickerCtrlGeneric::Create(wxWindow *parent, - wxWindowID id, - const wxDateTime& date, - const wxPoint& pos, - const wxSize& size, - long style, - const wxValidator& validator, - const wxString& name) -{ - wxASSERT_MSG( !(style & wxDP_SPIN), - wxT("wxDP_SPIN style not supported, use wxDP_DEFAULT") ); - - if ( !wxControl::Create(parent, id, pos, size, - style | wxCLIP_CHILDREN | wxWANTS_CHARS | wxBORDER_NONE, - validator, name) ) - { - return false; - } - - InheritAttributes(); - - m_combo = new wxComboCtrl(this, -1, wxEmptyString, - wxDefaultPosition, wxDefaultSize); - - m_combo->SetCtrlMainWnd(this); - - m_popup = new wxCalendarComboPopup(); - -#if defined(__WXMSW__) - // without this keyboard navigation in month control doesn't work - m_combo->UseAltPopupWindow(); -#endif - m_combo->SetPopupControl(m_popup); - - m_popup->SetDateValue(date.IsValid() ? date : wxDateTime::Today()); - - SetInitialSize(size); - - return true; -} - - -void wxDatePickerCtrlGeneric::Init() -{ - m_combo = NULL; - m_popup = NULL; -} - -wxDatePickerCtrlGeneric::~wxDatePickerCtrlGeneric() -{ -} - -bool wxDatePickerCtrlGeneric::Destroy() -{ - if ( m_combo ) - m_combo->Destroy(); - - m_combo = NULL; - m_popup = NULL; - - return wxControl::Destroy(); -} - -// ---------------------------------------------------------------------------- -// overridden base class methods -// ---------------------------------------------------------------------------- - -wxSize wxDatePickerCtrlGeneric::DoGetBestSize() const -{ - // A better solution would be to use a custom text control that would have - // the best size determined by the current date format and let m_combo take - // care of the best size computation, but this isn't easily possible with - // wxComboCtrl currently, so we compute our own best size here instead even - // if this means adding some extra margins to account for text control - // borders, space between it and the button and so on. - wxSize size = m_combo->GetButtonSize(); - - wxTextCtrl* const text = m_combo->GetTextCtrl(); - size.x += text->GetTextExtent(text->GetValue()).x; - size.x += 2*text->GetCharWidth(); // This is the margin mentioned above. - - return size; -} - -wxWindowList wxDatePickerCtrlGeneric::GetCompositeWindowParts() const -{ - wxWindowList parts; - parts.push_back(m_combo); - parts.push_back(m_popup); - return parts; -} - -// ---------------------------------------------------------------------------- -// wxDatePickerCtrlGeneric API -// ---------------------------------------------------------------------------- - -bool -wxDatePickerCtrlGeneric::SetDateRange(const wxDateTime& lowerdate, - const wxDateTime& upperdate) -{ - if ( !m_popup->SetDateRange(lowerdate, upperdate) ) - return false; - - // If the limits were, check that our current value lies between them and - // adjust it if it doesn't. - const wxDateTime old = GetValue(); - if ( old.IsValid() ) - { - if ( lowerdate.IsValid() && old < lowerdate ) - SetValue(lowerdate); - else if ( upperdate.IsValid() && old > upperdate ) - SetValue(upperdate); - } - - return true; -} - - -wxDateTime wxDatePickerCtrlGeneric::GetValue() const -{ - if ( HasFlag(wxDP_ALLOWNONE) && m_popup->IsTextEmpty() ) - return wxInvalidDateTime; - return m_popup->GetDate(); -} - - -void wxDatePickerCtrlGeneric::SetValue(const wxDateTime& date) -{ - m_popup->SetDateValue(date); -} - - -bool wxDatePickerCtrlGeneric::GetRange(wxDateTime *dt1, wxDateTime *dt2) const -{ - return m_popup->GetDateRange(dt1, dt2); -} - - -void -wxDatePickerCtrlGeneric::SetRange(const wxDateTime &dt1, const wxDateTime &dt2) -{ - SetDateRange(dt1, dt2); -} - -wxCalendarCtrl *wxDatePickerCtrlGeneric::GetCalendar() const -{ - return m_popup; -} - -// ---------------------------------------------------------------------------- -// event handlers -// ---------------------------------------------------------------------------- - - -void wxDatePickerCtrlGeneric::OnSize(wxSizeEvent& event) -{ - if ( m_combo ) - m_combo->SetSize(GetClientSize()); - - event.Skip(); -} - - -void wxDatePickerCtrlGeneric::OnText(wxCommandEvent &ev) -{ - ev.SetEventObject(this); - ev.SetId(GetId()); - GetParent()->GetEventHandler()->ProcessEvent(ev); - - // We'll create an additional event if the date is valid. - // If the date isn't valid, the user's probably in the middle of typing - wxDateTime dt; - if ( !m_popup || !m_popup->ParseDateTime(m_combo->GetValue(), &dt) ) - return; - - m_popup->SendDateEvent(dt); -} - - -void wxDatePickerCtrlGeneric::OnFocus(wxFocusEvent& WXUNUSED(event)) -{ - m_combo->SetFocus(); -} - - -#endif // wxUSE_DATEPICKCTRL - diff --git a/Externals/wxWidgets3/src/generic/dbgrptg.cpp b/Externals/wxWidgets3/src/generic/dbgrptg.cpp deleted file mode 100644 index a39280a1e8..0000000000 --- a/Externals/wxWidgets3/src/generic/dbgrptg.cpp +++ /dev/null @@ -1,537 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/generic/dbgrptg.cpp -// Purpose: implementation of wxDebugReportPreviewStd -// Author: Vadim Zeitlin, Andrej Putrin -// Modified by: -// Created: 2005-01-21 -// Copyright: (c) 2005 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_DEBUGREPORT && wxUSE_XML - -#include "wx/debugrpt.h" - -#ifndef WX_PRECOMP - #include "wx/sizer.h" - #include "wx/checklst.h" - #include "wx/textctrl.h" - #include "wx/intl.h" - #include "wx/stattext.h" - #include "wx/filedlg.h" - #include "wx/valtext.h" - #include "wx/button.h" -#endif // WX_PRECOMP - -#include "wx/filename.h" -#ifdef wxUSE_FFILE - #include "wx/ffile.h" -#else - #include "wx/file.h" -#endif -#include "wx/mimetype.h" - -#include "wx/statline.h" - -#ifdef __WXMSW__ - #include "wx/evtloop.h" // for SetCriticalWindow() - #include "wx/scopeguard.h" -#endif // __WXMSW__ - -// ---------------------------------------------------------------------------- -// wxDumpPreviewDlg: simple class for showing ASCII preview of dump files -// ---------------------------------------------------------------------------- - -class wxDumpPreviewDlg : public wxDialog -{ -public: - wxDumpPreviewDlg(wxWindow *parent, - const wxString& title, - const wxString& text); - -private: - // the text we show - wxTextCtrl *m_text; - - wxDECLARE_NO_COPY_CLASS(wxDumpPreviewDlg); -}; - -wxDumpPreviewDlg::wxDumpPreviewDlg(wxWindow *parent, - const wxString& title, - const wxString& text) - : wxDialog(parent, wxID_ANY, title, - wxDefaultPosition, wxDefaultSize, - wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) -{ - // create controls - // --------------- - - // use wxTE_RICH2 style to avoid 64kB limit under MSW and display big files - // faster than with wxTE_RICH - m_text = new wxTextCtrl(this, wxID_ANY, wxEmptyString, - wxPoint(0, 0), wxDefaultSize, - wxTE_MULTILINE | - wxTE_READONLY | - wxTE_NOHIDESEL | - wxTE_RICH2); - m_text->SetValue(text); - - // use fixed-width font - m_text->SetFont(wxFont(12, wxFONTFAMILY_TELETYPE, - wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL)); - - wxButton *btnClose = new wxButton(this, wxID_CANCEL, _("Close")); - - - // layout them - // ----------- - - wxSizer *sizerTop = new wxBoxSizer(wxVERTICAL), - *sizerBtns = new wxBoxSizer(wxHORIZONTAL); - - sizerBtns->Add(btnClose, 0, 0, 1); - - sizerTop->Add(m_text, 1, wxEXPAND); - sizerTop->Add(sizerBtns, 0, wxALIGN_RIGHT | wxTOP | wxBOTTOM | wxRIGHT, 1); - - // set the sizer &c - // ---------------- - - // make the text window bigger to show more contents of the file - sizerTop->SetItemMinSize(m_text, 600, 300); - SetSizer(sizerTop); - - Layout(); - Fit(); - - m_text->SetFocus(); -} - -// ---------------------------------------------------------------------------- -// wxDumpOpenExternalDlg: choose a command for opening the given file -// ---------------------------------------------------------------------------- - -class wxDumpOpenExternalDlg : public wxDialog -{ -public: - wxDumpOpenExternalDlg(wxWindow *parent, const wxFileName& filename); - - // return the command chosed by user to open this file - const wxString& GetCommand() const { return m_command; } - - wxString m_command; - -private: - -#if wxUSE_FILEDLG - void OnBrowse(wxCommandEvent& event); -#endif // wxUSE_FILEDLG - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_NO_COPY_CLASS(wxDumpOpenExternalDlg); -}; - -wxBEGIN_EVENT_TABLE(wxDumpOpenExternalDlg, wxDialog) - -#if wxUSE_FILEDLG - EVT_BUTTON(wxID_MORE, wxDumpOpenExternalDlg::OnBrowse) -#endif - -wxEND_EVENT_TABLE() - - -wxDumpOpenExternalDlg::wxDumpOpenExternalDlg(wxWindow *parent, - const wxFileName& filename) - : wxDialog(parent, - wxID_ANY, - wxString::Format - ( - _("Open file \"%s\""), - filename.GetFullPath().c_str() - )) -{ - // create controls - // --------------- - - wxSizer *sizerTop = new wxBoxSizer(wxVERTICAL); - sizerTop->Add(new wxStaticText(this, wxID_ANY, - wxString::Format - ( - _("Enter command to open file \"%s\":"), - filename.GetFullName().c_str() - )), - wxSizerFlags().Border()); - - wxSizer *sizerH = new wxBoxSizer(wxHORIZONTAL); - - wxTextCtrl *command = new wxTextCtrl - ( - this, - wxID_ANY, - wxEmptyString, - wxDefaultPosition, - wxSize(250, wxDefaultCoord), - 0 -#if wxUSE_VALIDATORS - ,wxTextValidator(wxFILTER_NONE, &m_command) -#endif - ); - sizerH->Add(command, - wxSizerFlags(1).Align(wxALIGN_CENTER_VERTICAL)); - -#if wxUSE_FILEDLG - - wxButton *browse = new wxButton(this, wxID_MORE, wxT(">>"), - wxDefaultPosition, wxDefaultSize, - wxBU_EXACTFIT); - sizerH->Add(browse, - wxSizerFlags(0).Align(wxALIGN_CENTER_VERTICAL). Border(wxLEFT)); - -#endif // wxUSE_FILEDLG - - sizerTop->Add(sizerH, wxSizerFlags(0).Expand().Border()); - - sizerTop->Add(new wxStaticLine(this), wxSizerFlags().Expand().Border()); - - sizerTop->Add(CreateStdDialogButtonSizer(wxOK | wxCANCEL), - wxSizerFlags().Align(wxALIGN_RIGHT).Border()); - - // set the sizer &c - // ---------------- - - SetSizer(sizerTop); - - Layout(); - Fit(); - - command->SetFocus(); -} - -#if wxUSE_FILEDLG - -void wxDumpOpenExternalDlg::OnBrowse(wxCommandEvent& ) -{ - wxFileName fname(m_command); - wxFileDialog dlg(this, - wxFileSelectorPromptStr, - fname.GetPathWithSep(), - fname.GetFullName() -#ifdef __WXMSW__ - , wxString(_("Executable files (*.exe)|*.exe|")) + wxALL_FILES -#endif // __WXMSW__ - ); - if ( dlg.ShowModal() == wxID_OK ) - { - m_command = dlg.GetPath(); - TransferDataToWindow(); - } -} - -#endif // wxUSE_FILEDLG - -// ---------------------------------------------------------------------------- -// wxDebugReportDialog: class showing debug report to the user -// ---------------------------------------------------------------------------- - -class wxDebugReportDialog : public wxDialog -{ -public: - wxDebugReportDialog(wxDebugReport& dbgrpt); - - virtual bool TransferDataToWindow() wxOVERRIDE; - virtual bool TransferDataFromWindow() wxOVERRIDE; - -private: - void OnView(wxCommandEvent& ); - void OnViewUpdate(wxUpdateUIEvent& ); - void OnOpen(wxCommandEvent& ); - - - // small helper: add wxEXPAND and wxALL flags - static wxSizerFlags SizerFlags(int proportion) - { - return wxSizerFlags(proportion).Expand().Border(); - } - - - wxDebugReport& m_dbgrpt; - - wxCheckListBox *m_checklst; - wxTextCtrl *m_notes; - - wxArrayString m_files; - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_NO_COPY_CLASS(wxDebugReportDialog); -}; - -// ============================================================================ -// wxDebugReportDialog implementation -// ============================================================================ - -wxBEGIN_EVENT_TABLE(wxDebugReportDialog, wxDialog) - EVT_BUTTON(wxID_VIEW_DETAILS, wxDebugReportDialog::OnView) - EVT_UPDATE_UI(wxID_VIEW_DETAILS, wxDebugReportDialog::OnViewUpdate) - EVT_BUTTON(wxID_OPEN, wxDebugReportDialog::OnOpen) - EVT_UPDATE_UI(wxID_OPEN, wxDebugReportDialog::OnViewUpdate) -wxEND_EVENT_TABLE() - - -// ---------------------------------------------------------------------------- -// construction -// ---------------------------------------------------------------------------- - -wxDebugReportDialog::wxDebugReportDialog(wxDebugReport& dbgrpt) - : wxDialog(NULL, wxID_ANY, - wxString::Format(_("Debug report \"%s\""), - dbgrpt.GetReportName().c_str()), - wxDefaultPosition, - wxDefaultSize, - wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER), - m_dbgrpt(dbgrpt) -{ - // upper part of the dialog: explanatory message - wxString msg; - wxString debugDir = dbgrpt.GetDirectory(); - - // The temporary directory can be the short form on Windows; - // normalize it for the benefit of users. -#ifdef __WXMSW__ - wxFileName debugDirFilename(debugDir, wxEmptyString); - debugDirFilename.Normalize(wxPATH_NORM_LONG); - debugDir = debugDirFilename.GetPath(); -#endif - msg << _("A debug report has been generated in the directory\n") - << wxT('\n') - << wxT(" \"") << debugDir << wxT("\"\n") - << wxT('\n') - << _("The report contains the files listed below. If any of these files contain private information,\nplease uncheck them and they will be removed from the report.\n") - << wxT('\n') - << _("If you wish to suppress this debug report completely, please choose the \"Cancel\" button,\nbut be warned that it may hinder improving the program, so if\nat all possible please do continue with the report generation.\n") - << wxT('\n') - << _(" Thank you and we're sorry for the inconvenience!\n") - << wxT("\n\n"); // just some white space to separate from other stuff - - const wxSizerFlags flagsFixed(SizerFlags(0)); - const wxSizerFlags flagsExpand(SizerFlags(1)); - const wxSizerFlags flagsExpand2(SizerFlags(2)); - - wxSizer *sizerPreview = - new wxStaticBoxSizer(wxVERTICAL, this, _("&Debug report preview:")); - sizerPreview->Add(CreateTextSizer(msg), wxSizerFlags().Centre().Border()); - - // ... and the list of files in this debug report with buttons to view them - wxSizer *sizerFileBtns = new wxBoxSizer(wxVERTICAL); - sizerFileBtns->AddStretchSpacer(1); - sizerFileBtns->Add(new wxButton(this, wxID_VIEW_DETAILS, _("&View...")), - wxSizerFlags().Border(wxBOTTOM)); - sizerFileBtns->Add(new wxButton(this, wxID_OPEN, _("&Open...")), - wxSizerFlags().Border(wxTOP)); - sizerFileBtns->AddStretchSpacer(1); - - m_checklst = new wxCheckListBox(this, wxID_ANY); - - wxSizer *sizerFiles = new wxBoxSizer(wxHORIZONTAL); - sizerFiles->Add(m_checklst, flagsExpand); - sizerFiles->Add(sizerFileBtns, flagsFixed); - - sizerPreview->Add(sizerFiles, flagsExpand2); - - - // lower part of the dialog: notes field - wxSizer *sizerNotes = new wxStaticBoxSizer(wxVERTICAL, this, _("&Notes:")); - - msg = _("If you have any additional information pertaining to this bug\nreport, please enter it here and it will be joined to it:"); - - m_notes = new wxTextCtrl(this, wxID_ANY, wxEmptyString, - wxDefaultPosition, wxDefaultSize, - wxTE_MULTILINE); - - sizerNotes->Add(CreateTextSizer(msg), flagsFixed); - sizerNotes->Add(m_notes, flagsExpand); - - - wxSizer *sizerTop = new wxBoxSizer(wxVERTICAL); - sizerTop->Add(sizerPreview, flagsExpand2); - sizerTop->AddSpacer(5); - sizerTop->Add(sizerNotes, flagsExpand); - sizerTop->Add(CreateStdDialogButtonSizer(wxOK | wxCANCEL), flagsFixed); - - SetSizerAndFit(sizerTop); - Layout(); - CentreOnScreen(); -} - -// ---------------------------------------------------------------------------- -// data exchange -// ---------------------------------------------------------------------------- - -bool wxDebugReportDialog::TransferDataToWindow() -{ - // all files are included in the report by default - const size_t count = m_dbgrpt.GetFilesCount(); - for ( size_t n = 0; n < count; n++ ) - { - wxString name, - desc; - if ( m_dbgrpt.GetFile(n, &name, &desc) ) - { - m_checklst->Append(name + wxT(" (") + desc + wxT(')')); - m_checklst->Check(n); - - m_files.Add(name); - } - } - - return true; -} - -bool wxDebugReportDialog::TransferDataFromWindow() -{ - // any unchecked files should be removed from the report - const size_t count = m_checklst->GetCount(); - for ( size_t n = 0; n < count; n++ ) - { - if ( !m_checklst->IsChecked(n) ) - { - m_dbgrpt.RemoveFile(m_files[n]); - } - } - - // if the user entered any notes, add them to the report - const wxString notes = m_notes->GetValue(); - if ( !notes.empty() ) - { - // for now filename fixed, could make it configurable in the future... - m_dbgrpt.AddText(wxT("notes.txt"), notes, wxT("user notes")); - } - - return true; -} - -// ---------------------------------------------------------------------------- -// event handlers -// ---------------------------------------------------------------------------- - -void wxDebugReportDialog::OnView(wxCommandEvent& ) -{ - const int sel = m_checklst->GetSelection(); - wxCHECK_RET( sel != wxNOT_FOUND, wxT("invalid selection in OnView()") ); - - wxFileName fn(m_dbgrpt.GetDirectory(), m_files[sel]); - wxString str; - - const wxString& fullPath = fn.GetFullPath(); -#if wxUSE_FFILE - wxFFile file(fullPath); -#elif wxUSE_FILE - wxFile file(fullPath); -#endif - if ( file.IsOpened() && file.ReadAll(&str) ) - { - wxDumpPreviewDlg dlg(this, m_files[sel], str); - dlg.ShowModal(); - } -} - -void wxDebugReportDialog::OnOpen(wxCommandEvent& ) -{ - const int sel = m_checklst->GetSelection(); - wxCHECK_RET( sel != wxNOT_FOUND, wxT("invalid selection in OnOpen()") ); - - wxFileName fn(m_dbgrpt.GetDirectory(), m_files[sel]); - - // try to get the command to open this kind of files ourselves - wxString command; -#if wxUSE_MIMETYPE - wxFileType * - ft = wxTheMimeTypesManager->GetFileTypeFromExtension(fn.GetExt()); - if ( ft ) - { - command = ft->GetOpenCommand(fn.GetFullPath()); - delete ft; - } -#endif // wxUSE_MIMETYPE - - // if we couldn't, ask the user - if ( command.empty() ) - { - wxDumpOpenExternalDlg dlg(this, fn); - if ( dlg.ShowModal() == wxID_OK ) - { - // get the command chosen by the user and append file name to it - - // if we don't have place marker for file name in the command... - wxString cmd = dlg.GetCommand(); - if ( !cmd.empty() ) - { -#if wxUSE_MIMETYPE - if ( cmd.find(wxT('%')) != wxString::npos ) - { - command = wxFileType::ExpandCommand(cmd, fn.GetFullPath()); - } - else // no %s nor %1 -#endif // wxUSE_MIMETYPE - { - // append the file name to the end - command << cmd << wxT(" \"") << fn.GetFullPath() << wxT('"'); - } - } - } - } - - if ( !command.empty() ) - ::wxExecute(command); -} - -void wxDebugReportDialog::OnViewUpdate(wxUpdateUIEvent& event) -{ - int sel = m_checklst->GetSelection(); - if (sel >= 0) - { - wxFileName fn(m_dbgrpt.GetDirectory(), m_files[sel]); - event.Enable(fn.FileExists()); - } - else - event.Enable(false); -} - - -// ============================================================================ -// wxDebugReportPreviewStd implementation -// ============================================================================ - -bool wxDebugReportPreviewStd::Show(wxDebugReport& dbgrpt) const -{ - if ( !dbgrpt.GetFilesCount() ) - return false; - - wxDebugReportDialog dlg(dbgrpt); - -#ifdef __WXMSW__ - // before entering the event loop (from ShowModal()), block the event - // handling for all other windows as this could result in more crashes - wxEventLoop::SetCriticalWindow(&dlg); - - wxON_BLOCK_EXIT1( wxEventLoop::SetCriticalWindow, - static_cast(NULL) ); -#endif // __WXMSW__ - - return dlg.ShowModal() == wxID_OK && dbgrpt.GetFilesCount() != 0; -} - -#endif // wxUSE_DEBUGREPORT && wxUSE_XML diff --git a/Externals/wxWidgets3/src/generic/dcpsg.cpp b/Externals/wxWidgets3/src/generic/dcpsg.cpp deleted file mode 100644 index 1754ac83a9..0000000000 --- a/Externals/wxWidgets3/src/generic/dcpsg.cpp +++ /dev/null @@ -1,2405 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/generic/dcpsg.cpp -// Purpose: Generic wxPostScriptDC implementation -// Author: Julian Smart, Robert Roebling, Markus Holzhem -// Modified by: -// Created: 04/01/98 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_PRINTING_ARCHITECTURE && wxUSE_POSTSCRIPT - -#include "wx/generic/dcpsg.h" - -#ifndef WX_PRECOMP - #include "wx/intl.h" - #include "wx/log.h" - #include "wx/utils.h" - #include "wx/dcmemory.h" - #include "wx/math.h" - #include "wx/image.h" - #include "wx/icon.h" -#endif // WX_PRECOMP - -#include "wx/prntbase.h" -#include "wx/generic/prntdlgg.h" -#include "wx/paper.h" -#include "wx/filename.h" -#include "wx/stdpaths.h" - -#ifdef __WXMSW__ - -#ifdef DrawText -#undef DrawText -#endif - -#ifdef StartDoc -#undef StartDoc -#endif - -#ifdef GetCharWidth -#undef GetCharWidth -#endif - -#ifdef FindWindow -#undef FindWindow -#endif - -#endif - -//----------------------------------------------------------------------------- -// start and end of document/page -//----------------------------------------------------------------------------- - -static const char *wxPostScriptHeaderConicTo = "\ -/conicto {\n\ - /to_y exch def\n\ - /to_x exch def\n\ - /conic_cntrl_y exch def\n\ - /conic_cntrl_x exch def\n\ - currentpoint\n\ - /p0_y exch def\n\ - /p0_x exch def\n\ - /p1_x p0_x conic_cntrl_x p0_x sub 2 3 div mul add def\n\ - /p1_y p0_y conic_cntrl_y p0_y sub 2 3 div mul add def\n\ - /p2_x p1_x to_x p0_x sub 1 3 div mul add def\n\ - /p2_y p1_y to_y p0_y sub 1 3 div mul add def\n\ - p1_x p1_y p2_x p2_y to_x to_y curveto\n\ -} bind def\n\ -"; - -static const char *wxPostScriptHeaderEllipse = "\ -/ellipsedict 8 dict def\n\ -ellipsedict /mtrx matrix put\n\ -/ellipse {\n\ - ellipsedict begin\n\ - /endangle exch def\n\ - /startangle exch def\n\ - /yrad exch def\n\ - /xrad exch def\n\ - /y exch def\n\ - /x exch def\n\ - /savematrix mtrx currentmatrix def\n\ - x y translate\n\ - xrad yrad scale\n\ - 0 0 1 startangle endangle arc\n\ - savematrix setmatrix\n\ - end\n\ - } def\n\ -"; - -static const char *wxPostScriptHeaderEllipticArc= "\ -/ellipticarcdict 8 dict def\n\ -ellipticarcdict /mtrx matrix put\n\ -/ellipticarc\n\ -{ ellipticarcdict begin\n\ - /do_fill exch def\n\ - /endangle exch def\n\ - /startangle exch def\n\ - /yrad exch def\n\ - /xrad exch def \n\ - /y exch def\n\ - /x exch def\n\ - /savematrix mtrx currentmatrix def\n\ - x y translate\n\ - xrad yrad scale\n\ - do_fill { 0 0 moveto } if\n\ - 0 0 1 startangle endangle arc\n\ - savematrix setmatrix\n\ - do_fill { fill }{ stroke } ifelse\n\ - end\n\ -} def\n"; - -static const char *wxPostScriptHeaderSpline = "\ -/DrawSplineSection {\n\ - /y3 exch def\n\ - /x3 exch def\n\ - /y2 exch def\n\ - /x2 exch def\n\ - /y1 exch def\n\ - /x1 exch def\n\ - /xa x1 x2 x1 sub 0.666667 mul add def\n\ - /ya y1 y2 y1 sub 0.666667 mul add def\n\ - /xb x3 x2 x3 sub 0.666667 mul add def\n\ - /yb y3 y2 y3 sub 0.666667 mul add def\n\ - x1 y1 lineto\n\ - xa ya xb yb x3 y3 curveto\n\ - } def\n\ -"; - -static const char *wxPostScriptHeaderColourImage = "\ -% define 'colorimage' if it isn't defined\n\ -% ('colortogray' and 'mergeprocs' come from xwd2ps\n\ -% via xgrab)\n\ -/colorimage where % do we know about 'colorimage'?\n\ - { pop } % yes: pop off the 'dict' returned\n\ - { % no: define one\n\ - /colortogray { % define an RGB->I function\n\ - /rgbdata exch store % call input 'rgbdata'\n\ - rgbdata length 3 idiv\n\ - /npixls exch store\n\ - /rgbindx 0 store\n\ - 0 1 npixls 1 sub {\n\ - grays exch\n\ - rgbdata rgbindx get 20 mul % Red\n\ - rgbdata rgbindx 1 add get 32 mul % Green\n\ - rgbdata rgbindx 2 add get 12 mul % Blue\n\ - add add 64 idiv % I = .5G + .31R + .18B\n\ - put\n\ - /rgbindx rgbindx 3 add store\n\ - } for\n\ - grays 0 npixls getinterval\n\ - } bind def\n\ -\n\ - % Utility procedure for colorimage operator.\n\ - % This procedure takes two procedures off the\n\ - % stack and merges them into a single procedure.\n\ -\n\ - /mergeprocs { % def\n\ - dup length\n\ - 3 -1 roll\n\ - dup\n\ - length\n\ - dup\n\ - 5 1 roll\n\ - 3 -1 roll\n\ - add\n\ - array cvx\n\ - dup\n\ - 3 -1 roll\n\ - 0 exch\n\ - putinterval\n\ - dup\n\ - 4 2 roll\n\ - putinterval\n\ - } bind def\n\ -\n\ - /colorimage { % def\n\ - pop pop % remove 'false 3' operands\n\ - {colortogray} mergeprocs\n\ - image\n\ - } bind def\n\ - } ifelse % end of 'false' case\n\ -"; - -static const char wxPostScriptHeaderReencodeISO1[] = - "\n/reencodeISO {\n" -"dup dup findfont dup length dict begin\n" -"{ 1 index /FID ne { def }{ pop pop } ifelse } forall\n" -"/Encoding ISOLatin1Encoding def\n" -"currentdict end definefont\n" -"} def\n" -"/ISOLatin1Encoding [\n" -"/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef\n" -"/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef\n" -"/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef\n" -"/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef\n" -"/space/exclam/quotedbl/numbersign/dollar/percent/ampersand/quoteright\n" -"/parenleft/parenright/asterisk/plus/comma/minus/period/slash\n" -"/zero/one/two/three/four/five/six/seven/eight/nine/colon/semicolon\n" -"/less/equal/greater/question/at/A/B/C/D/E/F/G/H/I/J/K/L/M/N\n" -"/O/P/Q/R/S/T/U/V/W/X/Y/Z/bracketleft/backslash/bracketright\n" -"/asciicircum/underscore/quoteleft/a/b/c/d/e/f/g/h/i/j/k/l/m\n" -"/n/o/p/q/r/s/t/u/v/w/x/y/z/braceleft/bar/braceright/asciitilde\n" -"/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef\n" -"/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef\n" -"/.notdef/dotlessi/grave/acute/circumflex/tilde/macron/breve\n" -"/dotaccent/dieresis/.notdef/ring/cedilla/.notdef/hungarumlaut\n"; - -static const char wxPostScriptHeaderReencodeISO2[] = -"/ogonek/caron/space/exclamdown/cent/sterling/currency/yen/brokenbar\n" -"/section/dieresis/copyright/ordfeminine/guillemotleft/logicalnot\n" -"/hyphen/registered/macron/degree/plusminus/twosuperior/threesuperior\n" -"/acute/mu/paragraph/periodcentered/cedilla/onesuperior/ordmasculine\n" -"/guillemotright/onequarter/onehalf/threequarters/questiondown\n" -"/Agrave/Aacute/Acircumflex/Atilde/Adieresis/Aring/AE/Ccedilla\n" -"/Egrave/Eacute/Ecircumflex/Edieresis/Igrave/Iacute/Icircumflex\n" -"/Idieresis/Eth/Ntilde/Ograve/Oacute/Ocircumflex/Otilde/Odieresis\n" -"/multiply/Oslash/Ugrave/Uacute/Ucircumflex/Udieresis/Yacute\n" -"/Thorn/germandbls/agrave/aacute/acircumflex/atilde/adieresis\n" -"/aring/ae/ccedilla/egrave/eacute/ecircumflex/edieresis/igrave\n" -"/iacute/icircumflex/idieresis/eth/ntilde/ograve/oacute/ocircumflex\n" -"/otilde/odieresis/divide/oslash/ugrave/uacute/ucircumflex/udieresis\n" -"/yacute/thorn/ydieresis\n" - "] def\n\n"; - -//------------------------------------------------------------------------------- -// wxPostScriptDC -//------------------------------------------------------------------------------- - - -wxIMPLEMENT_DYNAMIC_CLASS(wxPostScriptDC, wxDC); - -wxPostScriptDC::wxPostScriptDC() - : wxDC(new wxPostScriptDCImpl(this)) -{ -} - -wxPostScriptDC::wxPostScriptDC(const wxPrintData& printData) - : wxDC(new wxPostScriptDCImpl(this, printData)) -{ -} - -// we don't want to use only 72 dpi from PS print -static const int DPI = 600; -static const double PS2DEV = 600.0 / 72.0; -static const double DEV2PS = 72.0 / 600.0; - -#define XLOG2DEV(x) ((double)(LogicalToDeviceX(x)) * DEV2PS) -#define XLOG2DEVREL(x) ((double)(LogicalToDeviceXRel(x)) * DEV2PS) -#define YLOG2DEV(x) ((m_pageHeight - (double)LogicalToDeviceY(x)) * DEV2PS) -#define YLOG2DEVREL(x) ((double)(LogicalToDeviceYRel(x)) * DEV2PS) - - -wxIMPLEMENT_ABSTRACT_CLASS(wxPostScriptDCImpl, wxDCImpl); - -//------------------------------------------------------------------------------- - -wxPostScriptDCImpl::wxPostScriptDCImpl( wxPostScriptDC *owner ) : - wxDCImpl( owner ) -{ - Init(); - - m_pageHeight = 842 * PS2DEV; - - m_ok = true; -} - -wxPostScriptDCImpl::wxPostScriptDCImpl( wxPostScriptDC *owner, const wxPrintData& data ) : - wxDCImpl( owner ) -{ - Init(); - - // this calculates m_pageHeight required for - // taking the inverted Y axis into account - SetPrintData( data ); - - m_ok = true; -} - - -wxPostScriptDCImpl::wxPostScriptDCImpl( wxPrinterDC *owner ) : - wxDCImpl( owner ) -{ - Init(); - - m_pageHeight = 842 * PS2DEV; - - m_ok = true; -} - -wxPostScriptDCImpl::wxPostScriptDCImpl( wxPrinterDC *owner, const wxPrintData& data ) : - wxDCImpl( owner ) -{ - Init(); - - // this calculates m_pageHeight required for - // taking the inverted Y axis into account - SetPrintData( data ); - - m_ok = true; -} - -void wxPostScriptDCImpl::Init() -{ - m_pstream = NULL; - - m_currentRed = 0; - m_currentGreen = 0; - m_currentBlue = 0; - - m_pageNumber = 0; - - m_clipping = false; - - m_underlinePosition = 0.0; - m_underlineThickness = 0.0; - -} - -wxPostScriptDCImpl::~wxPostScriptDCImpl () -{ - if (m_pstream) - { - fclose( m_pstream ); - m_pstream = NULL; - } -} - -bool wxPostScriptDCImpl::IsOk() const -{ - return m_ok; -} - -wxRect wxPostScriptDCImpl::GetPaperRect() const -{ - int w = 0; - int h = 0; - DoGetSize( &w, &h ); - return wxRect(0,0,w,h); -} - -int wxPostScriptDCImpl::GetResolution() const -{ - return DPI; -} - -void wxPostScriptDCImpl::DoSetClippingRegion (wxCoord x, wxCoord y, wxCoord w, wxCoord h) -{ - wxCHECK_RET( m_ok , wxT("invalid postscript dc") ); - - if (m_clipping) - DestroyClippingRegion(); - - m_clipX1 = x; - m_clipY1 = y; - m_clipX2 = x + w; - m_clipY2 = y + h; - - m_clipping = true; - - wxString buffer; - buffer.Printf( "gsave\n" - "newpath\n" - "%f %f moveto\n" - "%f %f lineto\n" - "%f %f lineto\n" - "%f %f lineto\n" - "closepath clip newpath\n", - XLOG2DEV(x), YLOG2DEV(y), - XLOG2DEV(x+w), YLOG2DEV(y), - XLOG2DEV(x+w), YLOG2DEV(y+h), - XLOG2DEV(x), YLOG2DEV(y+h) ); - buffer.Replace( ",", "." ); - PsPrint( buffer ); -} - - -void wxPostScriptDCImpl::DestroyClippingRegion() -{ - wxCHECK_RET( m_ok , wxT("invalid postscript dc") ); - - if (m_clipping) - { - m_clipping = false; - PsPrint( "grestore\n" ); - } - - wxDCImpl::DestroyClippingRegion(); -} - -void wxPostScriptDCImpl::Clear() -{ - // This should fail silently to avoid unnecessary - // asserts - // wxFAIL_MSG( wxT("wxPostScriptDCImpl::Clear not implemented.") ); -} - -bool wxPostScriptDCImpl::DoFloodFill (wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), const wxColour &WXUNUSED(col), wxFloodFillStyle WXUNUSED(style)) -{ - wxFAIL_MSG( wxT("wxPostScriptDCImpl::FloodFill not implemented.") ); - return false; -} - -bool wxPostScriptDCImpl::DoGetPixel (wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), wxColour * WXUNUSED(col)) const -{ - wxFAIL_MSG( wxT("wxPostScriptDCImpl::GetPixel not implemented.") ); - return false; -} - -void wxPostScriptDCImpl::DoCrossHair (wxCoord WXUNUSED(x), wxCoord WXUNUSED(y)) -{ - wxFAIL_MSG( wxT("wxPostScriptDCImpl::CrossHair not implemented.") ); -} - -void wxPostScriptDCImpl::DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) -{ - wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); - - if ( m_pen.IsTransparent() ) - return; - - SetPen( m_pen ); - - wxString buffer; - buffer.Printf( "newpath\n" - "%f %f moveto\n" - "%f %f lineto\n" - "stroke\n", - XLOG2DEV(x1), YLOG2DEV(y1), - XLOG2DEV(x2), YLOG2DEV(y2) ); - buffer.Replace( ",", "." ); - PsPrint( buffer ); - - CalcBoundingBox( x1, y1 ); - CalcBoundingBox( x2, y2 ); -} - -void wxPostScriptDCImpl::DoDrawArc (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCoord xc, wxCoord yc) -{ - wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); - - wxCoord dx = x1 - xc; - wxCoord dy = y1 - yc; - double radius = sqrt( (double)(dx*dx+dy*dy) ); - double alpha1, alpha2; - - if (x1 == x2 && y1 == y2) - { - alpha1 = 0.0; - alpha2 = 360.0; - } - else if ( wxIsNullDouble(radius) ) - { - alpha1 = - alpha2 = 0.0; - } - else - { - alpha1 = (x1 - xc == 0) ? - (y1 - yc < 0) ? 90.0 : -90.0 : - wxRadToDeg(-atan2(double(y1-yc), double(x1-xc))); - alpha2 = (x2 - xc == 0) ? - (y2 - yc < 0) ? 90.0 : -90.0 : - wxRadToDeg(-atan2(double(y2-yc), double(x2-xc))); - } - while (alpha1 <= 0) alpha1 += 360; - while (alpha2 <= 0) alpha2 += 360; // adjust angles to be between - while (alpha1 > 360) alpha1 -= 360; // 0 and 360 degree - while (alpha2 > 360) alpha2 -= 360; - - int i_radius = wxRound( radius ); - - if ( m_brush.IsNonTransparent() ) - { - SetBrush( m_brush ); - - wxString buffer; - buffer.Printf( "newpath\n" - "%f %f %f %f %f %f ellipse\n" - "%f %f lineto\n" - "closepath\n" - "fill\n", - XLOG2DEV(xc), YLOG2DEV(yc), - XLOG2DEVREL(i_radius), YLOG2DEVREL(i_radius), - alpha1, alpha2, - XLOG2DEV(xc), YLOG2DEV(yc) ); - buffer.Replace( ",", "." ); - PsPrint( buffer ); - - CalcBoundingBox( xc-i_radius, yc-i_radius ); - CalcBoundingBox( xc+i_radius, yc+i_radius ); - } - - if ( m_pen.IsNonTransparent() ) - { - SetPen( m_pen ); - - wxString buffer; - buffer.Printf( "newpath\n" - "%f %f %f %f %f %f ellipse\n" - "stroke\n", - XLOG2DEV(xc), YLOG2DEV(yc), - XLOG2DEVREL(i_radius), YLOG2DEVREL(i_radius), - alpha1, alpha2 ); - buffer.Replace( ",", "." ); - PsPrint( buffer ); - - CalcBoundingBox( xc-i_radius, yc-i_radius ); - CalcBoundingBox( xc+i_radius, yc+i_radius ); - } -} - -void wxPostScriptDCImpl::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea) -{ - wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); - - if ( sa >= 360 || sa <= -360 ) - sa -= int(sa/360)*360; - if ( ea >= 360 || ea <=- 360 ) - ea -= int(ea/360)*360; - if ( sa < 0 ) - sa += 360; - if ( ea < 0 ) - ea += 360; - - if ( wxIsSameDouble(sa, ea) ) - { - DoDrawEllipse(x,y,w,h); - return; - } - - if ( m_brush.IsNonTransparent() ) - { - SetBrush( m_brush ); - - wxString buffer; - buffer.Printf( "newpath\n" - "%f %f %f %f %f %f true ellipticarc\n", - XLOG2DEV(x+w/2), YLOG2DEV(y+h/2), - XLOG2DEVREL(w/2), YLOG2DEVREL(h/2), - sa, ea ); - buffer.Replace( ",", "." ); - PsPrint( buffer ); - - CalcBoundingBox( x ,y ); - CalcBoundingBox( x+w, y+h ); - } - - if ( m_pen.IsNonTransparent() ) - { - SetPen( m_pen ); - - wxString buffer; - buffer.Printf( "newpath\n" - "%f %f %f %f %f %f false ellipticarc\n", - XLOG2DEV(x+w/2), YLOG2DEV(y+h/2), - XLOG2DEVREL(w/2), YLOG2DEVREL(h/2), - sa, ea ); - buffer.Replace( ",", "." ); - PsPrint( buffer ); - - CalcBoundingBox( x ,y ); - CalcBoundingBox( x+w, y+h ); - } -} - -void wxPostScriptDCImpl::DoDrawPoint (wxCoord x, wxCoord y) -{ - wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); - - if ( m_pen.IsTransparent() ) - return; - - SetPen (m_pen); - - wxString buffer; - buffer.Printf( "newpath\n" - "%f %f moveto\n" - "%f %f lineto\n" - "stroke\n", - XLOG2DEV(x), YLOG2DEV(y), - XLOG2DEV(x+1), YLOG2DEV(y) ); - buffer.Replace( ",", "." ); - PsPrint( buffer ); - - CalcBoundingBox( x, y ); -} - -void wxPostScriptDCImpl::DoDrawPolygon (int n, const wxPoint points[], wxCoord xoffset, wxCoord yoffset, wxPolygonFillMode fillStyle) -{ - wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); - - if (n <= 0) return; - - if ( m_brush.IsNonTransparent() ) - { - SetBrush( m_brush ); - - PsPrint( "newpath\n" ); - - double xx = XLOG2DEV(points[0].x + xoffset); - double yy = YLOG2DEV(points[0].y + yoffset); - - wxString buffer; - buffer.Printf( "%f %f moveto\n", xx, yy ); - buffer.Replace( ",", "." ); - PsPrint( buffer ); - - CalcBoundingBox( points[0].x + xoffset, points[0].y + yoffset ); - - for (int i = 1; i < n; i++) - { - xx = XLOG2DEV(points[i].x + xoffset); - yy = YLOG2DEV(points[i].y + yoffset); - - buffer.Printf( "%f %f lineto\n", xx, yy ); - buffer.Replace( ",", "." ); - PsPrint( buffer ); - - CalcBoundingBox( points[i].x + xoffset, points[i].y + yoffset); - } - - PsPrint( (fillStyle == wxODDEVEN_RULE ? "eofill\n" : "fill\n") ); - } - - if ( m_pen.IsNonTransparent() ) - { - SetPen( m_pen ); - - PsPrint( "newpath\n" ); - - double xx = XLOG2DEV(points[0].x + xoffset); - double yy = YLOG2DEV(points[0].y + yoffset); - - wxString buffer; - buffer.Printf( "%f %f moveto\n", xx, yy ); - buffer.Replace( ",", "." ); - PsPrint( buffer ); - - CalcBoundingBox( points[0].x + xoffset, points[0].y + yoffset ); - - for (int i = 1; i < n; i++) - { - xx = XLOG2DEV(points[i].x + xoffset); - yy = YLOG2DEV(points[i].y + yoffset); - - buffer.Printf( "%f %f lineto\n", xx, yy ); - buffer.Replace( ",", "." ); - PsPrint( buffer ); - - CalcBoundingBox( points[i].x + xoffset, points[i].y + yoffset); - } - - PsPrint( "closepath\n" ); - PsPrint( "stroke\n" ); - } -} - -void wxPostScriptDCImpl::DoDrawPolyPolygon (int n, const int count[], const wxPoint points[], wxCoord xoffset, wxCoord yoffset, wxPolygonFillMode fillStyle) -{ - wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); - - if (n <= 0) return; - - if ( m_brush.IsNonTransparent() ) - { - SetBrush( m_brush ); - - PsPrint( "newpath\n" ); - - int ofs = 0; - for (int i = 0; i < n; ofs += count[i++]) - { - double xx = XLOG2DEV(points[ofs].x + xoffset); - double yy = YLOG2DEV(points[ofs].y + yoffset); - - wxString buffer; - buffer.Printf( "%f %f moveto\n", xx, yy ); - buffer.Replace( ",", "." ); - PsPrint( buffer ); - - CalcBoundingBox( points[ofs].x + xoffset, points[ofs].y + yoffset ); - - for (int j = 1; j < count[i]; j++) - { - xx = XLOG2DEV(points[ofs+j].x + xoffset); - yy = YLOG2DEV(points[ofs+j].y + yoffset); - - buffer.Printf( "%f %f lineto\n", xx, yy ); - buffer.Replace( ",", "." ); - PsPrint( buffer ); - - CalcBoundingBox( points[ofs+j].x + xoffset, points[ofs+j].y + yoffset); - } - } - PsPrint( (fillStyle == wxODDEVEN_RULE ? "eofill\n" : "fill\n") ); - } - - if ( m_pen.IsNonTransparent() ) - { - SetPen( m_pen ); - - PsPrint( "newpath\n" ); - - int ofs = 0; - for (int i = 0; i < n; ofs += count[i++]) - { - double xx = XLOG2DEV(points[ofs].x + xoffset); - double yy = YLOG2DEV(points[ofs].y + yoffset); - - wxString buffer; - buffer.Printf( "%f %f moveto\n", xx, yy ); - buffer.Replace( ",", "." ); - PsPrint( buffer ); - - CalcBoundingBox( points[ofs].x + xoffset, points[ofs].y + yoffset ); - - for (int j = 1; j < count[i]; j++) - { - xx = XLOG2DEV(points[ofs+j].x + xoffset); - yy = YLOG2DEV(points[ofs+j].y + yoffset); - - buffer.Printf( "%f %f lineto\n", xx, yy ); - buffer.Replace( ",", "." ); - PsPrint( buffer ); - - CalcBoundingBox( points[ofs+j].x + xoffset, points[ofs+j].y + yoffset); - } - } - PsPrint( "closepath\n" ); - PsPrint( "stroke\n" ); - } -} - -void wxPostScriptDCImpl::DoDrawLines (int n, const wxPoint points[], wxCoord xoffset, wxCoord yoffset) -{ - wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); - - if ( m_pen.IsTransparent() ) - return; - - if (n <= 0) return; - - SetPen (m_pen); - - int i; - for ( i =0; iGetTextExtent(text, &text_w, &text_h, &text_descent); - - int size = m_font.GetPointSize(); - -// wxCoord by = y + (wxCoord)floor( double(size) * 2.0 / 3.0 ); // approximate baseline -// commented by V. Slavik and replaced by accurate version -// - note that there is still rounding error in text_descent! - wxCoord by = y + size - text_descent; // baseline - - wxString buffer; - buffer.Printf( "%f %f moveto\n", XLOG2DEV(x), YLOG2DEV(by) ); - buffer.Replace( ",", "." ); - PsPrint( buffer ); - PsPrint( "(" ); - - for ( const char *p = textbuf; *p != '\0'; p++ ) - { - int c = (unsigned char)*p; - if (c == ')' || c == '(' || c == '\\') - { - /* Cope with special characters */ - PsPrint( "\\" ); - PsPrint( (char) c ); - } - else if ( c >= 128 ) - { - /* Cope with character codes > 127 */ - buffer.Printf( "\\%o", c ); - PsPrint( buffer ); - } - else - { - PsPrint( (char) c ); - } - } - - PsPrint( ") show\n" ); - - if (m_font.GetUnderlined()) - { - wxCoord uy = (wxCoord)(y + size - m_underlinePosition); - - buffer.Printf( "gsave\n" - "%f %f moveto\n" - "%f setlinewidth\n" - "%f %f lineto\n" - "stroke\n" - "grestore\n", - XLOG2DEV(x), YLOG2DEV(uy), - m_underlineThickness, - XLOG2DEV(x + text_w), YLOG2DEV(uy) ); - buffer.Replace( ",", "." ); - PsPrint( buffer ); - } - - CalcBoundingBox( x, y ); - CalcBoundingBox( x + size * text.length() * 2/3 , y ); -} - -void wxPostScriptDCImpl::DoDrawRotatedText( const wxString& text, wxCoord x, wxCoord y, double angle ) -{ - if ( wxIsNullDouble(angle) ) - { - DoDrawText(text, x, y); - return; - } - - wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); - - SetFont( m_font ); - - if (m_textForegroundColour.IsOk()) - { - unsigned char red = m_textForegroundColour.Red(); - unsigned char blue = m_textForegroundColour.Blue(); - unsigned char green = m_textForegroundColour.Green(); - - if (!m_colour) - { - // Anything not white is black - if (! (red == (unsigned char) 255 && - blue == (unsigned char) 255 && - green == (unsigned char) 255)) - { - red = (unsigned char) 0; - green = (unsigned char) 0; - blue = (unsigned char) 0; - } - } - - // maybe setgray here ? - if (!(red == m_currentRed && green == m_currentGreen && blue == m_currentBlue)) - { - double redPS = (double)(red) / 255.0; - double bluePS = (double)(blue) / 255.0; - double greenPS = (double)(green) / 255.0; - - wxString buffer; - buffer.Printf( "%f %f %f setrgbcolor\n", redPS, greenPS, bluePS ); - buffer.Replace( ",", "." ); - PsPrint( buffer ); - - m_currentRed = red; - m_currentBlue = blue; - m_currentGreen = green; - } - } - - int size = m_font.GetPointSize(); - - wxString buffer; - buffer.Printf( "%f %f moveto\n", XLOG2DEV(x), YLOG2DEV(y)); - buffer.Replace( ",", "." ); - PsPrint( buffer ); - - buffer.Printf( "%f rotate\n", angle ); - buffer.Replace( ",", "." ); - PsPrint( buffer ); - - PsPrint( "(" ); - const wxWX2MBbuf textbuf = text.mb_str(); - if ( textbuf ) - { - for ( const char *p = textbuf; *p != '\0'; p++ ) - { - int c = (unsigned char)*p; - if (c == ')' || c == '(' || c == '\\') - { - /* Cope with special characters */ - PsPrint( "\\" ); - PsPrint( (char) c ); - } - else if ( c >= 128 ) - { - /* Cope with character codes > 127 */ - buffer.Printf( "\\%o", c); - PsPrint( buffer ); - } - else - { - PsPrint( (char) c ); - } - } - } - - PsPrint( ") show\n" ); - - buffer.Printf( "%f rotate\n", -angle ); - buffer.Replace( ",", "." ); - PsPrint( buffer ); - - if (m_font.GetUnderlined()) - { - wxCoord uy = (wxCoord)(y + size - m_underlinePosition); - wxCoord w, h; - GetOwner()->GetTextExtent(text, &w, &h); - - buffer.Printf( - "gsave\n" - "%f %f moveto\n" - "%f setlinewidth\n" - "%f %f lineto\n" - "stroke\n" - "grestore\n", - XLOG2DEV(x), YLOG2DEV(uy), - m_underlineThickness, - XLOG2DEV(x + w), YLOG2DEV(uy) ); - buffer.Replace( ",", "." ); - PsPrint( buffer ); - } - - CalcBoundingBox( x, y ); - CalcBoundingBox( x + size * text.length() * 2/3 , y ); -} - -void wxPostScriptDCImpl::SetBackground (const wxBrush& brush) -{ - m_backgroundBrush = brush; -} - -void wxPostScriptDCImpl::SetLogicalFunction(wxRasterOperationMode WXUNUSED(function)) -{ - wxFAIL_MSG( wxT("wxPostScriptDCImpl::SetLogicalFunction not implemented.") ); -} - -#if wxUSE_SPLINES -void wxPostScriptDCImpl::DoDrawSpline( const wxPointList *points ) -{ - wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); - - SetPen( m_pen ); - - // a and b are not used - //double a, b; - double c, d, x1, y1, x2, y2, x3, y3; - wxPoint *p, *q; - - wxPointList::compatibility_iterator node = points->GetFirst(); - p = node->GetData(); - x1 = p->x; - y1 = p->y; - - node = node->GetNext(); - p = node->GetData(); - c = p->x; - d = p->y; - x3 = - #if 0 - a = - #endif - (double)(x1 + c) / 2; - y3 = - #if 0 - b = - #endif - (double)(y1 + d) / 2; - - wxString buffer; - buffer.Printf( "newpath\n" - "%f %f moveto\n" - "%f %f lineto\n", - XLOG2DEV(wxRound(x1)), YLOG2DEV(wxRound(y1)), - XLOG2DEV(wxRound(x3)), YLOG2DEV(wxRound(y3)) ); - buffer.Replace( ",", "." ); - PsPrint( buffer ); - - CalcBoundingBox( (wxCoord)x1, (wxCoord)y1 ); - CalcBoundingBox( (wxCoord)x3, (wxCoord)y3 ); - - node = node->GetNext(); - while (node) - { - q = node->GetData(); - - x1 = x3; - y1 = y3; - x2 = c; - y2 = d; - c = q->x; - d = q->y; - x3 = (double)(x2 + c) / 2; - y3 = (double)(y2 + d) / 2; - - buffer.Printf( "%f %f %f %f %f %f DrawSplineSection\n", - XLOG2DEV(wxRound(x1)), YLOG2DEV(wxRound(y1)), - XLOG2DEV(wxRound(x2)), YLOG2DEV(wxRound(y2)), - XLOG2DEV(wxRound(x3)), YLOG2DEV(wxRound(y3)) ); - buffer.Replace( ",", "." ); - PsPrint( buffer ); - - CalcBoundingBox( (wxCoord)x1, (wxCoord)y1 ); - CalcBoundingBox( (wxCoord)x3, (wxCoord)y3 ); - - node = node->GetNext(); - } - - /* - At this point, (x2,y2) and (c,d) are the position of the - next-to-last and last point respectively, in the point list - */ - - buffer.Printf( "%f %f lineto\nstroke\n", XLOG2DEV(wxRound(c)), YLOG2DEV(wxRound(d)) ); - buffer.Replace( ",", "." ); - PsPrint( buffer ); -} -#endif // wxUSE_SPLINES - -wxCoord wxPostScriptDCImpl::GetCharWidth() const -{ - // Chris Breeze: reasonable approximation using wxMODERN/Courier - return (wxCoord) (GetCharHeight() * 72.0 / 120.0); -} - -void wxPostScriptDCImpl::SetPrintData(const wxPrintData& data) -{ - m_printData = data; - - wxPaperSize id = m_printData.GetPaperId(); - wxPrintPaperType *paper = wxThePrintPaperDatabase->FindPaperType(id); - if (!paper) paper = wxThePrintPaperDatabase->FindPaperType(wxPAPER_A4); - int w = 595; - int h = 842; - if (paper) - { - w = paper->GetSizeDeviceUnits().x; - h = paper->GetSizeDeviceUnits().y; - } - - if (m_printData.GetOrientation() == wxLANDSCAPE) - m_pageHeight = w * PS2DEV; - else - m_pageHeight = h * PS2DEV; -} - -void wxPostScriptDCImpl::ComputeScaleAndOrigin() -{ - const wxRealPoint origScale(m_scaleX, m_scaleY); - - wxDCImpl::ComputeScaleAndOrigin(); - - // If scale has changed call SetPen to recalculate the line width - // and SetFont to recalculate font size - if ( wxRealPoint(m_scaleX, m_scaleY) != origScale && m_pen.IsOk() ) - { - SetPen( m_pen ); - SetFont( m_font ); - } -} - -void wxPostScriptDCImpl::DoGetSize(int* width, int* height) const -{ - wxPaperSize id = m_printData.GetPaperId(); - - wxPrintPaperType *paper = wxThePrintPaperDatabase->FindPaperType(id); - - if (!paper) paper = wxThePrintPaperDatabase->FindPaperType(wxPAPER_A4); - - int w = 595; - int h = 842; - if (paper) - { - w = paper->GetSizeDeviceUnits().x; - h = paper->GetSizeDeviceUnits().y; - } - - if (m_printData.GetOrientation() == wxLANDSCAPE) - { - int tmp = w; - w = h; - h = tmp; - } - - if (width) - *width = wxRound( w * PS2DEV ); - - if (height) - *height = wxRound( h * PS2DEV ); -} - -void wxPostScriptDCImpl::DoGetSizeMM(int *width, int *height) const -{ - wxPaperSize id = m_printData.GetPaperId(); - - wxPrintPaperType *paper = wxThePrintPaperDatabase->FindPaperType(id); - - if (!paper) paper = wxThePrintPaperDatabase->FindPaperType(wxPAPER_A4); - - int w = 210; - int h = 297; - if (paper) - { - w = paper->GetWidth() / 10; - h = paper->GetHeight() / 10; - } - - if (m_printData.GetOrientation() == wxLANDSCAPE) - { - int tmp = w; - w = h; - h = tmp; - } - - if (width) *width = w; - if (height) *height = h; -} - -// Resolution in pixels per logical inch -wxSize wxPostScriptDCImpl::GetPPI(void) const -{ - return wxSize( DPI, DPI ); -} - - -bool wxPostScriptDCImpl::StartDoc( const wxString& WXUNUSED(message) ) -{ - wxCHECK_MSG( m_ok, false, wxT("invalid postscript dc") ); - - if (m_printData.GetPrintMode() != wxPRINT_MODE_STREAM ) - { - if (m_printData.GetFilename() == wxEmptyString) - { - wxString filename = wxFileName::CreateTempFileName( wxT("ps") ); - m_printData.SetFilename(filename); - } - - m_pstream = wxFopen( m_printData.GetFilename(), wxT("w+") ); - - if (!m_pstream) - { - wxLogError( _("Cannot open file for PostScript printing!")); - m_ok = false; - return false; - } - } - - m_ok = true; - - wxString buffer; - - PsPrint( "%!PS-Adobe-2.0\n" ); - - PsPrint( "%%Creator: wxWidgets PostScript renderer\n" ); - - buffer.Printf( "%%%%CreationDate: %s\n", wxNow() ); - PsPrint( buffer ); - - if (m_printData.GetOrientation() == wxLANDSCAPE) - PsPrint( "%%Orientation: Landscape\n" ); - else - PsPrint( "%%Orientation: Portrait\n" ); - - const wxChar *paper; - switch (m_printData.GetPaperId()) - { - case wxPAPER_LETTER: paper = wxT("Letter"); break; // Letter: paper ""; 8 1/2 by 11 inches - case wxPAPER_LEGAL: paper = wxT("Legal"); break; // Legal, 8 1/2 by 14 inches - case wxPAPER_A4: paper = wxT("A4"); break; // A4 Sheet, 210 by 297 millimeters - case wxPAPER_TABLOID: paper = wxT("Tabloid"); break; // Tabloid, 11 by 17 inches - case wxPAPER_LEDGER: paper = wxT("Ledger"); break; // Ledger, 17 by 11 inches - case wxPAPER_STATEMENT: paper = wxT("Statement"); break; // Statement, 5 1/2 by 8 1/2 inches - case wxPAPER_EXECUTIVE: paper = wxT("Executive"); break; // Executive, 7 1/4 by 10 1/2 inches - case wxPAPER_A3: paper = wxT("A3"); break; // A3 sheet, 297 by 420 millimeters - case wxPAPER_A5: paper = wxT("A5"); break; // A5 sheet, 148 by 210 millimeters - case wxPAPER_B4: paper = wxT("B4"); break; // B4 sheet, 250 by 354 millimeters - case wxPAPER_B5: paper = wxT("B5"); break; // B5 sheet, 182-by-257-millimeter paper - case wxPAPER_FOLIO: paper = wxT("Folio"); break; // Folio, 8-1/2-by-13-inch paper - case wxPAPER_QUARTO: paper = wxT("Quaro"); break; // Quarto, 215-by-275-millimeter paper - case wxPAPER_10X14: paper = wxT("10x14"); break; // 10-by-14-inch sheet - default: paper = wxT("A4"); - } - - buffer.Printf( "%%%%DocumentPaperSizes: %s\n", paper ); - PsPrint( buffer ); - - PsPrint( "%%EndComments\n\n" ); - - PsPrint( "%%BeginProlog\n" ); - PsPrint( wxPostScriptHeaderConicTo ); - PsPrint( wxPostScriptHeaderEllipse ); - PsPrint( wxPostScriptHeaderEllipticArc ); - PsPrint( wxPostScriptHeaderColourImage ); - PsPrint( wxPostScriptHeaderReencodeISO1 ); - PsPrint( wxPostScriptHeaderReencodeISO2 ); - if (wxPostScriptHeaderSpline) - PsPrint( wxPostScriptHeaderSpline ); - PsPrint( "%%EndProlog\n" ); - - SetBrush( *wxBLACK_BRUSH ); - SetPen( *wxBLACK_PEN ); - SetBackground( *wxWHITE_BRUSH ); - SetTextForeground( *wxBLACK ); - - // set origin according to paper size - SetDeviceOrigin( 0,0 ); - - m_pageNumber = 1; - return true; -} - -void wxPostScriptDCImpl::EndDoc () -{ - wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); - - if (m_clipping) - { - m_clipping = false; - PsPrint( "grestore\n" ); - } - - if ( m_pstream ) { - fclose( m_pstream ); - m_pstream = NULL; - } - -#if 0 - // THE FOLLOWING HAS BEEN CONTRIBUTED BY Andy Fyfe - wxCoord wx_printer_translate_x, wx_printer_translate_y; - double wx_printer_scale_x, wx_printer_scale_y; - - wx_printer_translate_x = (wxCoord)m_printData.GetPrinterTranslateX(); - wx_printer_translate_y = (wxCoord)m_printData.GetPrinterTranslateY(); - - wx_printer_scale_x = m_printData.GetPrinterScaleX(); - wx_printer_scale_y = m_printData.GetPrinterScaleY(); - - // Compute the bounding box. Note that it is in the default user - // coordinate system, thus we have to convert the values. - wxCoord minX = (wxCoord) XLOG2DEV(m_minX); - wxCoord minY = (wxCoord) YLOG2DEV(m_minY); - wxCoord maxX = (wxCoord) XLOG2DEV(m_maxX); - wxCoord maxY = (wxCoord) YLOG2DEV(m_maxY); - - // LOG2DEV may have changed the minimum to maximum vice versa - if ( minX > maxX ) { wxCoord tmp = minX; minX = maxX; maxX = tmp; } - if ( minY > maxY ) { wxCoord tmp = minY; minY = maxY; maxY = tmp; } - - // account for used scaling (boundingbox is before scaling in ps-file) - double scale_x = m_printData.GetPrinterScaleX() / ms_PSScaleFactor; - double scale_y = m_printData.GetPrinterScaleY() / ms_PSScaleFactor; - - wxCoord llx, lly, urx, ury; - llx = (wxCoord) ((minX+wx_printer_translate_x)*scale_x); - lly = (wxCoord) ((minY+wx_printer_translate_y)*scale_y); - urx = (wxCoord) ((maxX+wx_printer_translate_x)*scale_x); - ury = (wxCoord) ((maxY+wx_printer_translate_y)*scale_y); - // (end of bounding box computation) - - - // If we're landscape, our sense of "x" and "y" is reversed. - if (m_printData.GetOrientation() == wxLANDSCAPE) - { - wxCoord tmp; - tmp = llx; llx = lly; lly = tmp; - tmp = urx; urx = ury; ury = tmp; - - // We need either the two lines that follow, or we need to subtract - // min_x from real_translate_y, which is commented out below. - llx = llx - (wxCoord)(m_minX*wx_printer_scale_y); - urx = urx - (wxCoord)(m_minX*wx_printer_scale_y); - } - - // The Adobe specifications call for integers; we round as to make - // the bounding larger. - PsPrintf( wxT("%%%%BoundingBox: %d %d %d %d\n"), - (wxCoord)floor((double)llx), (wxCoord)floor((double)lly), - (wxCoord)ceil((double)urx), (wxCoord)ceil((double)ury) ); - - // To check the correctness of the bounding box, postscript commands - // to draw a box corresponding to the bounding box are generated below. - // But since we typically don't want to print such a box, the postscript - // commands are generated within comments. These lines appear before any - // adjustment of scale, rotation, or translation, and hence are in the - // default user coordinates. - PsPrint( "% newpath\n" ); - PsPrintf( wxT("%% %d %d moveto\n"), llx, lly ); - PsPrintf( wxT("%% %d %d lineto\n"), urx, lly ); - PsPrintf( wxT("%% %d %d lineto\n"), urx, ury ); - PsPrintf( wxT("%% %d %d lineto closepath stroke\n"), llx, ury ); -#endif - -#ifndef __WXMSW__ - wxPostScriptPrintNativeData *data = - (wxPostScriptPrintNativeData *) m_printData.GetNativeData(); - - if (m_ok && (m_printData.GetPrintMode() == wxPRINT_MODE_PRINTER)) - { - wxString command; - command += data->GetPrinterCommand(); - command += wxT(" "); - command += data->GetPrinterOptions(); - command += wxT(" "); - command += m_printData.GetFilename(); - - wxExecute( command, true ); - wxRemoveFile( m_printData.GetFilename() ); - } -#endif -} - -void wxPostScriptDCImpl::StartPage() -{ - wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); - - wxString buffer; - buffer.Printf( wxT("%%%%Page: %d\n"), m_pageNumber++ ); - PsPrint( buffer ); - -#if 0 - wxPostScriptPrintNativeData *data = - (wxPostScriptPrintNativeData *) m_printData.GetNativeData(); - - wxCoord translate_x = (wxCoord)data->GetPrinterTranslateX(); - wxCoord translate_y = (wxCoord)data->GetPrinterTranslateY(); - - buffer.Printf( "%d %d translate\n", translate_x, translate_y ); - PsPrint( buffer ); - - double scale_x = data->GetPrinterScaleX(); - double scale_y = data->GetPrinterScaleY(); - - buffer.Printf( "%f %f scale\n", scale_x, scale_y ); - buffer.Replace( ",", "." ); - PsPrint( buffer ); - -#endif - - // Each page starts with an "initgraphics" which resets the - // transformation and so we need to rotate the page for - // landscape printing) - - // I copied this one from a PostScript tutorial, but to no avail. RR. - // PsPrint( "90 rotate llx neg ury nef translate\n" ); - - if (m_printData.GetOrientation() == wxLANDSCAPE) - PsPrint( "90 rotate\n" ); -} - -void wxPostScriptDCImpl::EndPage () -{ - wxCHECK_RET( m_ok , wxT("invalid postscript dc") ); - - PsPrint( "showpage\n" ); -} - -bool wxPostScriptDCImpl::DoBlit( wxCoord xdest, wxCoord ydest, - wxCoord fwidth, wxCoord fheight, - wxDC *source, - wxCoord xsrc, wxCoord ysrc, - wxRasterOperationMode rop, - bool WXUNUSED(useMask), wxCoord WXUNUSED(xsrcMask), wxCoord WXUNUSED(ysrcMask) ) -{ - wxCHECK_MSG( m_ok, false, wxT("invalid postscript dc") ); - - wxCHECK_MSG( source, false, wxT("invalid source dc") ); - - // blit into a bitmap - wxBitmap bitmap( (int)fwidth, (int)fheight ); - wxMemoryDC memDC; - memDC.SelectObject(bitmap); - memDC.Blit(0, 0, fwidth, fheight, source, xsrc, ysrc, rop); /* TODO: Blit transparently? */ - memDC.SelectObject(wxNullBitmap); - - //draw bitmap. scaling and positioning is done there - GetOwner()->DrawBitmap( bitmap, xdest, ydest ); - - return true; -} - -wxCoord wxPostScriptDCImpl::GetCharHeight() const -{ - if (m_font.IsOk()) - return m_font.GetPointSize(); - else - return 12; -} - -void wxPostScriptDCImpl::PsPrint( const wxString& str ) -{ - const wxCharBuffer psdata(str.utf8_str()); - - wxPostScriptPrintNativeData *data = - (wxPostScriptPrintNativeData *) m_printData.GetNativeData(); - - switch (m_printData.GetPrintMode()) - { -#if wxUSE_STREAMS - // append to output stream - case wxPRINT_MODE_STREAM: - { - wxOutputStream* outputstream = data->GetOutputStream(); - wxCHECK_RET( outputstream, wxT("invalid outputstream") ); - outputstream->Write( psdata, strlen( psdata ) ); - } - break; -#endif // wxUSE_STREAMS - - // save data into file - default: - wxCHECK_RET( m_pstream, wxT("invalid postscript dc") ); - fwrite( psdata, 1, strlen( psdata ), m_pstream ); - } -} - -void wxPostScriptDCImpl::DoGetTextExtent(const wxString& string, - wxCoord *x, wxCoord *y, - wxCoord *descent, wxCoord *externalLeading, - const wxFont *theFont ) const -{ - const wxFont *fontToUse = theFont; - - if (!fontToUse) fontToUse = &m_font; - - const float fontSize = - fontToUse->GetPointSize() * GetFontPointSizeAdjustment(72.0); - - if (string.empty()) - { - if (x) (*x) = 0; - if (y) (*y) = 0; - if (descent) (*descent) = 0; - if (externalLeading) (*externalLeading) = 0; - return; - } - - // GTK 2.0 - - const wxWX2MBbuf strbuf = string.mb_str(); - - // conversion failed (non e.g. ISO characters) - if ( !strbuf ) - return; - -#if !wxUSE_AFM_FOR_POSTSCRIPT - /* Provide a VERY rough estimate (avoid using it). - * Produces accurate results for mono-spaced font - * such as Courier (aka wxMODERN) */ - - if ( x ) - *x = strlen (strbuf) * fontSize * 72.0 / 120.0; - if ( y ) - *y = (wxCoord) (fontSize * 1.32); /* allow for descender */ - if (descent) *descent = 0; - if (externalLeading) *externalLeading = 0; -#else - - /* method for calculating string widths in postscript: - / read in the AFM (adobe font metrics) file for the - / actual font, parse it and extract the character widths - / and also the descender. this may be improved, but for now - / it works well. the AFM file is only read in if the - / font is changed. this may be chached in the future. - / calls to GetTextExtent with the font unchanged are rather - / efficient!!! - / - / for each font and style used there is an AFM file necessary. - / currently i have only files for the roman font family. - / I try to get files for the other ones! - / - / CAVE: the size of the string is currently always calculated - / in 'points' (1/72 of an inch). this should later on be - / changed to depend on the mapping mode. - / CAVE: the path to the AFM files must be set before calling this - / fun3B3Bction. this is usually done by a call like the following: - / wxSetAFMPath("d:\\wxw161\\afm\\"); - / - / example: - / - / wxPostScriptDC dc(NULL, true); - / if (dc.IsOk()){ - / wxSetAFMPath("d:\\wxw161\\afm\\"); - / dc.StartDoc("Test"); - / dc.StartPage(); - / wxCoord w,h; - / dc.SetFont(new wxFontInfo(10).Family(wxFONTFAMILY_ROMAN)); - / dc.GetTextExtent("Hallo",&w,&h); - / dc.EndPage(); - / dc.EndDoc(); - / } - / - / by steve (stefan.hammes@urz.uni-heidelberg.de) - / created: 10.09.94 - / updated: 14.05.95 */ - - /* these static vars are for storing the state between calls */ - static int lastFamily= INT_MIN; - static int lastSize= INT_MIN; - static int lastStyle= INT_MIN; - static int lastWeight= INT_MIN; - static int lastDescender = INT_MIN; - static int lastWidths[256]; /* widths of the characters */ - - double UnderlinePosition = 0.0; - double UnderlineThickness = 0.0; - - // Get actual parameters - int Family = fontToUse->GetFamily(); - int Size = fontToUse->GetPointSize(); - int Style = fontToUse->GetStyle(); - int Weight = fontToUse->GetWeight(); - - // If we have another font, read the font-metrics - if (Family!=lastFamily || Size!=lastSize || Style!=lastStyle || Weight!=lastWeight) - { - // Store actual values - lastFamily = Family; - lastSize = Size; - lastStyle = Style; - lastWeight = Weight; - - const wxChar *name; - - switch (Family) - { - case wxMODERN: - case wxTELETYPE: - { - if ((Style == wxFONTSTYLE_ITALIC) && (Weight == wxFONTWEIGHT_BOLD)) name = wxT("CourBoO.afm"); - else if ((Style != wxFONTSTYLE_ITALIC) && (Weight == wxFONTWEIGHT_BOLD)) name = wxT("CourBo.afm"); - else if ((Style == wxFONTSTYLE_ITALIC) && (Weight != wxFONTWEIGHT_BOLD)) name = wxT("CourO.afm"); - else name = wxT("Cour.afm"); - break; - } - case wxROMAN: - { - if ((Style == wxFONTSTYLE_ITALIC) && (Weight == wxFONTWEIGHT_BOLD)) name = wxT("TimesBoO.afm"); - else if ((Style != wxFONTSTYLE_ITALIC) && (Weight == wxFONTWEIGHT_BOLD)) name = wxT("TimesBo.afm"); - else if ((Style == wxFONTSTYLE_ITALIC) && (Weight != wxFONTWEIGHT_BOLD)) name = wxT("TimesO.afm"); - else name = wxT("TimesRo.afm"); - break; - } - case wxSCRIPT: - { - name = wxT("Zapf.afm"); - break; - } - case wxSWISS: - default: - { - if ((Style == wxFONTSTYLE_ITALIC) && (Weight == wxFONTWEIGHT_BOLD)) name = wxT("HelvBoO.afm"); - else if ((Style != wxFONTSTYLE_ITALIC) && (Weight == wxFONTWEIGHT_BOLD)) name = wxT("HelvBo.afm"); - else if ((Style == wxFONTSTYLE_ITALIC) && (Weight != wxFONTWEIGHT_BOLD)) name = wxT("HelvO.afm"); - else name = wxT("Helv.afm"); - break; - } - } - - FILE *afmFile = NULL; - - // Get the directory of the AFM files - wxString afmName; - - // VZ: I don't know if the cast always works under Unix but it clearly - // never does under Windows where the pointer is - // wxWindowsPrintNativeData and so calling GetFontMetricPath() on - // it just crashes -#ifndef __WIN32__ - wxPostScriptPrintNativeData *data = - wxDynamicCast(m_printData.GetNativeData(), wxPostScriptPrintNativeData); - - if (data && !data->GetFontMetricPath().empty()) - { - afmName = data->GetFontMetricPath(); - afmName << wxFILE_SEP_PATH << name; - } -#endif // __WIN32__ - - if ( !afmName.empty() ) - afmFile = wxFopen(afmName, wxT("r")); - - if ( !afmFile ) - { -#if defined(__UNIX__) && !defined(__VMS__) - afmName = wxGetDataDir(); -#else // !__UNIX__ - afmName = wxStandardPaths::Get().GetDataDir(); -#endif // __UNIX__/!__UNIX__ - - afmName << wxFILE_SEP_PATH -#if defined(__LINUX__) || defined(__FREEBSD__) - << wxT("gs_afm") << wxFILE_SEP_PATH -#else - << wxT("afm") << wxFILE_SEP_PATH -#endif - << name; - afmFile = wxFopen(afmName,wxT("r")); - } - - /* 2. open and process the file - / a short explanation of the AFM format: - / we have for each character a line, which gives its size - / e.g.: - / - / C 63 ; WX 444 ; N question ; B 49 -14 395 676 ; - / - / that means, we have a character with ascii code 63, and width - / (444/1000 * fontSize) points. - / the other data is ignored for now! - / - / when the font has changed, we read in the right AFM file and store the - / character widths in an array, which is processed below (see point 3.). */ - if (afmFile==NULL) - { - wxLogDebug( wxT("GetTextExtent: can't open AFM file '%s'"), afmName.c_str() ); - wxLogDebug( wxT(" using approximate values")); - for (int i=0; i<256; i++) lastWidths[i] = 500; /* an approximate value */ - lastDescender = -150; /* dito. */ - } - else - { - /* init the widths array */ - for(int i=0; i<256; i++) lastWidths[i] = INT_MIN; - /* some variables for holding parts of a line */ - char cString[10], semiString[10], WXString[10]; - char descString[20]; - char upString[30], utString[30]; - char encString[50]; - char line[256]; - int ascii,cWidth; - /* read in the file and parse it */ - while(fgets(line,sizeof(line),afmFile)!=NULL) - { - /* A.) check for descender definition */ - if (strncmp(line,"Descender",9)==0) - { - if ((sscanf(line,"%s%d",descString,&lastDescender)!=2) || - (strcmp(descString,"Descender")!=0)) - { - wxLogDebug( wxT("AFM-file '%s': line '%s' has error (bad descender)"), afmName.c_str(),line ); - } - } - /* JC 1.) check for UnderlinePosition */ - else if(strncmp(line,"UnderlinePosition",17)==0) - { - if ((sscanf(line,"%s%lf",upString,&UnderlinePosition)!=2) || - (strcmp(upString,"UnderlinePosition")!=0)) - { - wxLogDebug( wxT("AFM-file '%s': line '%s' has error (bad UnderlinePosition)"), afmName.c_str(), line ); - } - } - /* JC 2.) check for UnderlineThickness */ - else if(strncmp(line,"UnderlineThickness",18)==0) - { - if ((sscanf(line,"%s%lf",utString,&UnderlineThickness)!=2) || - (strcmp(utString,"UnderlineThickness")!=0)) - { - wxLogDebug( wxT("AFM-file '%s': line '%s' has error (bad UnderlineThickness)"), afmName.c_str(), line ); - } - } - /* JC 3.) check for EncodingScheme */ - else if(strncmp(line,"EncodingScheme",14)==0) - { - if ((sscanf(line,"%s%s",utString,encString)!=2) || - (strcmp(utString,"EncodingScheme")!=0)) - { - wxLogDebug( wxT("AFM-file '%s': line '%s' has error (bad EncodingScheme)"), afmName.c_str(), line ); - } - else if (strncmp(encString, "AdobeStandardEncoding", 21)) - { - wxLogDebug( wxT("AFM-file '%s': line '%s' has error (unsupported EncodingScheme %s)"), - afmName.c_str(),line, encString); - } - } - /* B.) check for char-width */ - else if(strncmp(line,"C ",2)==0) - { - if (sscanf(line,"%s%d%s%s%d",cString,&ascii,semiString,WXString,&cWidth)!=5) - { - wxLogDebug(wxT("AFM-file '%s': line '%s' has an error (bad character width)"),afmName.c_str(),line); - } - if(strcmp(cString,"C")!=0 || strcmp(semiString,";")!=0 || strcmp(WXString,"WX")!=0) - { - wxLogDebug(wxT("AFM-file '%s': line '%s' has a format error"),afmName.c_str(),line); - } - /* printf(" char '%c'=%d has width '%d'\n",ascii,ascii,cWidth); */ - if (ascii>=0 && ascii<256) - { - lastWidths[ascii] = cWidth; /* store width */ - } - else - { - /* MATTHEW: this happens a lot; don't print an error */ - /* wxLogDebug("AFM-file '%s': ASCII value %d out of range",afmName.c_str(),ascii); */ - } - } - /* C.) ignore other entries. */ - } - fclose(afmFile); - } - /* hack to compute correct values for german 'Umlaute' - / the correct way would be to map the character names - / like 'adieresis' to corresp. positions of ISOEnc and read - / these values from AFM files, too. Maybe later ... */ - - // NB: casts to int are needed to suppress gcc 3.3 warnings - lastWidths[196] = lastWidths[(int)'A']; // U+00C4 A Umlaute - lastWidths[228] = lastWidths[(int)'a']; // U+00E4 a Umlaute - lastWidths[214] = lastWidths[(int)'O']; // U+00D6 O Umlaute - lastWidths[246] = lastWidths[(int)'o']; // U+00F6 o Umlaute - lastWidths[220] = lastWidths[(int)'U']; // U+00DC U Umlaute - lastWidths[252] = lastWidths[(int)'u']; // U+00FC u Umlaute - lastWidths[223] = lastWidths[(int)251]; // U+00DF eszett (scharfes s) - - /* JC: calculate UnderlineThickness/UnderlinePosition */ - - // VS: dirty, but is there any better solution? - double *pt; - pt = (double*) &m_underlinePosition; - *pt = YLOG2DEVREL((wxCoord)(UnderlinePosition * fontSize)) / 1000.0f; - pt = (double*) &m_underlineThickness; - *pt = YLOG2DEVREL((wxCoord)(UnderlineThickness * fontSize)) / 1000.0f; - - } - - - /* 3. now the font metrics are read in, calc size this - / is done by adding the widths of the characters in the - / string. they are given in 1/1000 of the size! */ - - long sum=0; - float height=fontSize; /* by default */ - const unsigned char *p=reinterpret_cast(static_cast(strbuf)); - if(!p) - { - // String couldn't be converted which used to SEGV as reported here: - // http://bugs.debian.org/702378 - // http://trac.wxwidgets.org/ticket/15300 - // Upstream suggests "just return if the conversion failed". - if (x) (*x) = 0; - if (y) (*y) = 0; - if (descent) (*descent) = 0; - if (externalLeading) (*externalLeading) = 0; - return; - } - for(; *p; p++) - { - if(lastWidths[*p]== INT_MIN) - { - wxLogDebug(wxT("GetTextExtent: undefined width for character '%c' (%d)"), *p,*p); - sum += lastWidths[(unsigned char)' ']; /* assume space */ - } - else - { - sum += lastWidths[*p]; - } - } - - double widthSum = sum; - widthSum *= fontSize; - widthSum /= 1000.0F; - - /* add descender to height (it is usually a negative value) */ - //if (lastDescender != INT_MIN) - //{ - // height += (wxCoord)(((-lastDescender)/1000.0F) * Size); /* MATTHEW: forgot scale */ - //} - // - commented by V. Slavik - height already contains descender in it - // (judging from few experiments) - - /* return size values */ - if ( x ) - *x = (wxCoord)widthSum; - if ( y ) - *y = (wxCoord)height; - - /* return other parameters */ - if (descent) - { - if(lastDescender!=INT_MIN) - { - *descent = (wxCoord)(((-lastDescender)/1000.0F) * fontSize); /* MATTHEW: forgot scale */ - } - else - { - *descent = 0; - } - } - - /* currently no idea how to calculate this! */ - if (externalLeading) *externalLeading = 0; -#endif - // Use AFM -} - - -#endif // wxUSE_PRINTING_ARCHITECTURE && wxUSE_POSTSCRIPT - -// vi:sts=4:sw=4:et diff --git a/Externals/wxWidgets3/src/generic/descrip.mms b/Externals/wxWidgets3/src/generic/descrip.mms deleted file mode 100644 index 05355a33c1..0000000000 --- a/Externals/wxWidgets3/src/generic/descrip.mms +++ /dev/null @@ -1,314 +0,0 @@ -#***************************************************************************** -# * -# Make file for VMS * -# Author : J.Jansen (joukj@hrem.nano.tudelft.nl) * -# Date : 22 September 2015 * -# * -#***************************************************************************** -.first - define wx [--.include.wx] - -.ifdef __WXMOTIF__ -CXX_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)\ - /assume=(nostdnew,noglobal_array_new) -CC_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short) -.else -.ifdef __WXGTK__ -CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm\ - /assume=(nostdnew,noglobal_array_new) -CC_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm -.else -.ifdef __WXX11__ -CXX_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\ - /name=(as_is,short)/assume=(nostdnew,noglobal_array_new) -CC_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\ - /name=(as_is,short) -.else -.ifdef __WXGTK2__ -CXX_DEFINE = /define=(__WXGTK__=1,VMS_GTK2==1)/float=ieee\ - /name=(as_is,short)/assume=(nostdnew,noglobal_array_new) -CC_DEFINE = /define=(__WX_GTK__=1,VMS_GTK2==1)/float=ieee\ - /name=(as_is,short) -.else -CXX_DEFINE = -CC_DEFINE = -.endif -.endif -.endif -.endif - -.suffixes : .cpp - -.cpp.obj : - cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp -.c.obj : - cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c - -OBJECTS = \ - aboutdlgg.obj,\ - busyinfo.obj,\ - calctrlg.obj,\ - caret.obj,\ - choicbkg.obj,\ - choicdgg.obj,\ - datectlg.obj,\ - dcpsg.obj,\ - dirctrlg.obj,\ - dirdlgg.obj,\ - fdrepdlg.obj,\ - fontdlgg.obj,\ - grid.obj,\ - gridctrl.obj,\ - gridsel.obj,\ - helpext.obj,\ - htmllbox.obj,\ - imaglist.obj,\ - laywin.obj,\ - listbkg.obj,\ - listctrl.obj,\ - logg.obj,\ - msgdlgg.obj,\ - numdlgg.obj,\ - odcombo.obj,\ - printps.obj,\ - prntdlgg.obj,\ - propdlg.obj,\ - progdlgg.obj,\ - renderg.obj,\ - sashwin.obj,\ - scrlwing.obj,\ - selstore.obj,\ - splitter.obj,\ - tabg.obj,\ - textdlgg.obj,\ - tipdlg.obj,\ - tipwin.obj,\ - toolbkg.obj,\ - treebkg.obj,\ - treectlg.obj,\ - wizard.obj,\ - hyperlinkg.obj,\ - filepickerg.obj,\ - bmpcboxg.obj,\ - filectrlg.obj,srchctlg.obj,notifmsgg.obj,headerctrlg.obj,\ - grideditors.obj,vlbox.obj,vscroll.obj,stattextg.obj,\ - editlbox.obj,datavgen.obj,dbgrptg.obj,dragimgg.obj,\ - richmsgdlgg.obj,commandlinkbuttong.obj,spinctlg.obj,\ - markuptext.obj,bannerwindow.obj,timectrlg.obj,richtooltipg.obj\ - ,statbmpg.obj,splash.obj,collheaderctrlg.obj - -SOURCES = \ - aboutdlgg.cpp,\ - accel.cpp,\ - animateg.cpp,\ - busyinfo.cpp,\ - calctrlg.cpp,\ - caret.cpp,\ - choicbkg.cpp,\ - choicdgg.cpp,\ - collpaneg.cpp,\ - colrdlgg.cpp,\ - clrpickerg.cpp,\ - datectlg.cpp,\ - dcpsg.cpp,\ - dirctrlg.cpp,\ - dirdlgg.cpp,\ - filedlgg.cpp,\ - fdrepdlg.cpp,\ - fontdlgg.cpp,\ - fontpickerg.cpp,\ - grid.cpp,\ - gridctrl.cpp,\ - gridsel.cpp,\ - helpext.cpp,\ - htmllbox.cpp,\ - imaglist.cpp,\ - laywin.cpp,\ - listbkg.cpp,\ - listctrl.cpp,\ - logg.cpp,\ - msgdlgg.cpp,\ - notebook.cpp,\ - numdlgg.cpp,\ - odcombo.cpp,\ - paletteg.cpp,\ - printps.cpp,\ - prntdlgg.cpp,\ - propdlg.cpp,\ - progdlgg.cpp,\ - renderg.cpp,\ - sashwin.cpp,\ - selstore.cpp,\ - splitter.cpp,\ - statline.cpp,\ - statusbr.cpp,\ - tabg.cpp,\ - textdlgg.cpp,\ - tipdlg.cpp,\ - tipwin.cpp,\ - toolbkg.cpp,\ - treebkg.cpp,\ - treectlg.cpp,\ - wizard.cpp,\ - dragimgg.cpp,\ - fdrepdlg.cpp,\ - htmllbox.cpp,\ - listbkg.cpp,\ - mdig.cpp,\ - scrlwing.cpp,\ - spinctlg.cpp,\ - splash.cpp,\ - timer.cpp,\ - vlbox.cpp,\ - hyperlinkg.cpp,\ - filepickerg.cpp,\ - vscroll.cpp,\ - icon.cpp,bmpcboxg.cpp,filectrlg.cpp,srchctlg.cpp,notifmsgg.cpp\ - ,headerctrlg.cpp,grideditors.cpp,stattextg.cpp,editlbox.cpp,\ - datavgen.cpp,dbgrptg.cpp,dragimgg.cpp,richmsgdlgg.cpp,\ - commandlinkbuttong.cpp,spinctlg.cpp markuptext.cpp \ - bannerwindow.cpp timectrlg.cpp richtooltipg.cpp statbmpg.cpp \ - textmeasure.cpp collheaderctrlg.cpp - -.ifdef __WXMOTIF__ -OBJECTS0=statusbr.obj,statline.obj,notebook.obj,spinctlg.obj,collpaneg.obj,\ - combog.obj,animateg.obj,colrdlgg.obj,clrpickerg.obj,fontpickerg.obj,\ - mdig.obj,infobar.obj,textmeasure.obj -.else -.ifdef __WXX11__ -OBJECTS0=accel.obj,filedlgg.obj,dragimgg.obj,fdrepdlg.obj,htmllbox.obj,\ - listbkg.obj,mdig.obj,spinctlg.obj,timer.obj,\ - combog.obj,icon.obj,collpaneg.obj,animateg.obj,\ - colrdlgg.obj,clrpickerg.obj,fontpickerg.obj,infobar.obj,textmeasure.obj -.else -.ifdef __WXGTK__ -OBJECTS0=accel.obj,statusbr.obj,filedlgg.obj,paletteg.obj,\ - combog.obj,icon.obj,collpaneg.obj,animateg.obj,\ - colrdlgg.obj,clrpickerg.obj,fontpickerg.obj,infobar.obj,textmeasure.obj -.else -OBJECTS0=accel.obj,statusbr.obj,filedlgg.obj,paletteg.obj,\ - combog.obj,icon.obj -.endif -.endif -.endif - -all : $(SOURCES) - $(MMS)$(MMSQUALIFIERS) $(OBJECTS) - $(MMS)$(MMSQUALIFIERS) $(OBJECTS0) -.ifdef __WXMOTIF__ - library/crea [--.lib]libwx_motif.olb $(OBJECTS) - library [--.lib]libwx_motif.olb $(OBJECTS0) -.else -.ifdef __WXGTK__ - library/crea [--.lib]libwx_gtk.olb $(OBJECTS) - library [--.lib]libwx_gtk.olb $(OBJECTS0) -.else -.ifdef __WXGTK2__ - library/crea [--.lib]libwx_gtk2.olb $(OBJECTS) - library [--.lib]libwx_gtk2.olb $(OBJECTS0) -.else -.ifdef __WXX11__ - library/crea [--.lib]libwx_x11_univ.olb $(OBJECTS) - library [--.lib]libwx_x11_univ.olb $(OBJECTS0) -.endif -.endif -.endif -.endif - -$(OBJECTS) : [--.include.wx]setup.h -$(OBJECTS0) : [--.include.wx]setup.h - -aboutdlgg.obj : aboutdlgg.cpp -accel.obj : accel.cpp -animateg.obj : animateg.cpp -busyinfo.obj : busyinfo.cpp -calctrlg.obj : calctrlg.cpp -caret.obj : caret.cpp -choicdgg.obj : choicdgg.cpp -clrpickerg.obj : clrpickerg.cpp -collpaneg.obj : collpaneg.cpp -colrdlgg.obj : colrdlgg.cpp -datectlg.obj : datectlg.cpp -dcpsg.obj : dcpsg.cpp -dirctrlg.obj : dirctrlg.cpp -dirdlgg.obj : dirdlgg.cpp -filedlgg.obj : filedlgg.cpp -fontdlgg.obj : fontdlgg.cpp -fdrepdlg.obj : fdrepdlg.cpp -grid.obj : grid.cpp -gridctrl.obj : gridctrl.cpp -gridsel.obj : gridsel.cpp -helpext.obj : helpext.cpp -htmllbox.obj : htmllbox.cpp -icon.obj : icon.cpp -imaglist.obj : imaglist.cpp -laywin.obj : laywin.cpp -listctrl.obj : listctrl.cpp - cxx $(CXXFLAGS)$(CXX_DEFINE)/warn=disable=(INTTRUNCATED) listctrl.cpp -logg.obj : logg.cpp -msgdlgg.obj : msgdlgg.cpp -notebook.obj : notebook.cpp -numdlgg.obj : numdlgg.cpp -odcombo.obj : odcombo.cpp -paletteg.obj : paletteg.cpp -printps.obj : printps.cpp -prntdlgg.obj : prntdlgg.cpp -progdlgg.obj : progdlgg.cpp -propdlg.obj : propdlg.cpp -scrlwing.obj : scrlwing.cpp -spinctlg.obj : spinctlg.cpp -renderg.obj : renderg.cpp -sashwin.obj : sashwin.cpp -selstore.obj : selstore.cpp -splitter.obj : splitter.cpp -statline.obj : statline.cpp -statusbr.obj : statusbr.cpp -tabg.obj : tabg.cpp -textdlgg.obj : textdlgg.cpp -tipdlg.obj : tipdlg.cpp -tipwin.obj : tipwin.cpp -treectlg.obj : treectlg.cpp -wizard.obj : wizard.cpp -dragimgg.obj : dragimgg.cpp -fdrepdlg.obj : fdrepdlg.cpp -htmllbox.obj : htmllbox.cpp -listbkg.obj : listbkg.cpp -mdig.obj : mdig.cpp -scrlwing.obj : scrlwing.cpp -spinctlg.obj : spinctlg.cpp -splash.obj : splash.cpp -timer.obj : timer.cpp -vlbox.obj : vlbox.cpp -vscroll.obj : vscroll.cpp - cxx $(CXXFLAGS)$(CXX_DEFINE)/nowarn vscroll.cpp -listbkg.obj : listbkg.cpp -choicbkg.obj : choicbkg.cpp -toolbkg.obj : toolbkg.cpp -treebkg.obj : treebkg.cpp -combog.obj : combog.cpp -fontpickerg.obj : fontpickerg.cpp -hyperlinkg.obj : hyperlinkg.cpp -filepickerg.obj : filepickerg.cpp -bmpcboxg.obj : bmpcboxg.cpp -filectrlg.obj : filectrlg.cpp -srchctlg.obj : srchctlg.cpp -notifmsgg.obj : notifmsgg.cpp -stattextg.obj : stattextg.cpp -headerctrlg.obj : headerctrlg.cpp -grideditors.obj : grideditors.cpp -infobar.obj : infobar.cpp -datavgen.obj : datavgen.cpp - cxx $(CXXFLAGS)$(CXX_DEFINE)/warn=disable=(UNSCOMZER) datavgen.cpp -dbgrptg.obj : dbgrptg.cpp -dragimgg.obj : dragimgg.cpp -richmsgdlgg.obj : richmsgdlgg.cpp -commandlinkbuttong.obj : commandlinkbuttong.cpp -spinctlg.obj : spinctlg.cpp -markuptext.obj : markuptext.cpp -bannerwindow.obj : bannerwindow.cpp -timectrlg.obj : timectrlg.cpp -richtooltipg.obj : richtooltipg.cpp -statbmpg.obj : statbmpg.cpp -textmeasure.obj : textmeasure.cpp -editlbox.obj : editlbox.cpp -collheaderctrlg.obj : collheaderctrlg.cpp diff --git a/Externals/wxWidgets3/src/generic/dirctrlg.cpp b/Externals/wxWidgets3/src/generic/dirctrlg.cpp deleted file mode 100644 index d89c705816..0000000000 --- a/Externals/wxWidgets3/src/generic/dirctrlg.cpp +++ /dev/null @@ -1,1725 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/generic/dirctrlg.cpp -// Purpose: wxGenericDirCtrl -// Author: Harm van der Heijden, Robert Roebling, Julian Smart -// Modified by: -// Created: 12/12/98 -// Copyright: (c) Harm van der Heijden, Robert Roebling and Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_DIRDLG || wxUSE_FILEDLG - -#include "wx/generic/dirctrlg.h" - -#ifndef WX_PRECOMP - #include "wx/hash.h" - #include "wx/intl.h" - #include "wx/log.h" - #include "wx/utils.h" - #include "wx/button.h" - #include "wx/icon.h" - #include "wx/settings.h" - #include "wx/msgdlg.h" - #include "wx/choice.h" - #include "wx/textctrl.h" - #include "wx/layout.h" - #include "wx/sizer.h" - #include "wx/textdlg.h" - #include "wx/gdicmn.h" - #include "wx/image.h" - #include "wx/module.h" -#endif - -#include "wx/filename.h" -#include "wx/filefn.h" -#include "wx/imaglist.h" -#include "wx/tokenzr.h" -#include "wx/dir.h" -#include "wx/artprov.h" -#include "wx/mimetype.h" - -#if wxUSE_STATLINE - #include "wx/statline.h" -#endif - -#if defined(__WXMAC__) - #include "wx/osx/private.h" // includes mac headers -#endif - -#ifdef __WINDOWS__ -#include -#include "wx/msw/winundef.h" -#include "wx/volume.h" - -// MinGW has _getdrive() and _chdrive(), Cygwin doesn't. -#if defined(__GNUWIN32__) && !defined(__CYGWIN__) - #define wxHAS_DRIVE_FUNCTIONS -#endif - -#ifdef wxHAS_DRIVE_FUNCTIONS - #include -#endif - -#endif // __WINDOWS__ - -#if defined(__WXMAC__) -// #include "MoreFilesX.h" -#endif - -#ifdef __BORLANDC__ - #include "dos.h" -#endif - -extern WXDLLEXPORT_DATA(const char) wxFileSelectorDefaultWildcardStr[]; - -// If compiled under Windows, this macro can cause problems -#ifdef GetFirstChild -#undef GetFirstChild -#endif - -bool wxIsDriveAvailable(const wxString& dirName); - -// ---------------------------------------------------------------------------- -// events -// ---------------------------------------------------------------------------- - -wxDEFINE_EVENT( wxEVT_DIRCTRL_SELECTIONCHANGED, wxTreeEvent ); -wxDEFINE_EVENT( wxEVT_DIRCTRL_FILEACTIVATED, wxTreeEvent ); - -// ---------------------------------------------------------------------------- -// wxGetAvailableDrives, for WINDOWS, DOS, MAC, UNIX (returns "/") -// ---------------------------------------------------------------------------- - -size_t wxGetAvailableDrives(wxArrayString &paths, wxArrayString &names, wxArrayInt &icon_ids) -{ -#ifdef wxHAS_FILESYSTEM_VOLUMES - -#if defined(__WIN32__) && wxUSE_FSVOLUME - // TODO: this code (using wxFSVolumeBase) should be used for all platforms - // but unfortunately wxFSVolumeBase is not implemented everywhere - const wxArrayString as = wxFSVolumeBase::GetVolumes(); - - for (size_t i = 0; i < as.GetCount(); i++) - { - wxString path = as[i]; - wxFSVolume vol(path); - int imageId; - switch (vol.GetKind()) - { - case wxFS_VOL_FLOPPY: - if ( (path == wxT("a:\\")) || (path == wxT("b:\\")) ) - imageId = wxFileIconsTable::floppy; - else - imageId = wxFileIconsTable::removeable; - break; - case wxFS_VOL_DVDROM: - case wxFS_VOL_CDROM: - imageId = wxFileIconsTable::cdrom; - break; - case wxFS_VOL_NETWORK: - if (path[0] == wxT('\\')) - continue; // skip "\\computer\folder" - imageId = wxFileIconsTable::drive; - break; - case wxFS_VOL_DISK: - case wxFS_VOL_OTHER: - default: - imageId = wxFileIconsTable::drive; - break; - } - paths.Add(path); - names.Add(vol.GetDisplayName()); - icon_ids.Add(imageId); - } -#else // !__WIN32__ - /* If we can switch to the drive, it exists. */ - for ( char drive = 'A'; drive <= 'Z'; drive++ ) - { - const wxString - path = wxFileName::GetVolumeString(drive, wxPATH_GET_SEPARATOR); - - if (wxIsDriveAvailable(path)) - { - paths.Add(path); - names.Add(wxFileName::GetVolumeString(drive, wxPATH_NO_SEPARATOR)); - icon_ids.Add(drive <= 2 ? wxFileIconsTable::floppy - : wxFileIconsTable::drive); - } - } -#endif // __WIN32__/!__WIN32__ - -#elif defined(__WXMAC__) && wxOSX_USE_COCOA_OR_CARBON - - ItemCount volumeIndex = 1; - OSErr err = noErr ; - - while( noErr == err ) - { - HFSUniStr255 volumeName ; - FSRef fsRef ; - FSVolumeInfo volumeInfo ; - err = FSGetVolumeInfo(0, volumeIndex, NULL, kFSVolInfoFlags , &volumeInfo , &volumeName, &fsRef); - if( noErr == err ) - { - wxString path = wxMacFSRefToPath( &fsRef ) ; - wxString name = wxMacHFSUniStrToString( &volumeName ) ; - - if ( (volumeInfo.flags & kFSVolFlagSoftwareLockedMask) || (volumeInfo.flags & kFSVolFlagHardwareLockedMask) ) - { - icon_ids.Add(wxFileIconsTable::cdrom); - } - else - { - icon_ids.Add(wxFileIconsTable::drive); - } - // todo other removable - - paths.Add(path); - names.Add(name); - volumeIndex++ ; - } - } - -#elif defined(__UNIX__) - paths.Add(wxT("/")); - names.Add(wxT("/")); - icon_ids.Add(wxFileIconsTable::computer); -#else - #error "Unsupported platform in wxGenericDirCtrl!" -#endif - wxASSERT_MSG( (paths.GetCount() == names.GetCount()), wxT("The number of paths and their human readable names should be equal in number.")); - wxASSERT_MSG( (paths.GetCount() == icon_ids.GetCount()), wxT("Wrong number of icons for available drives.")); - return paths.GetCount(); -} - -// ---------------------------------------------------------------------------- -// wxIsDriveAvailable -// ---------------------------------------------------------------------------- - -#if defined(__WINDOWS__) - -int setdrive(int drive) -{ -#if defined(wxHAS_DRIVE_FUNCTIONS) - return _chdrive(drive); -#else - wxChar newdrive[4]; - - if (drive < 1 || drive > 31) - return -1; - newdrive[0] = (wxChar)(wxT('A') + drive - 1); - newdrive[1] = wxT(':'); - newdrive[2] = wxT('\0'); -#if defined(__WINDOWS__) - if (::SetCurrentDirectory(newdrive)) -#else - // VA doesn't know what LPSTR is and has its own set - if (!DosSetCurrentDir((PSZ)newdrive)) -#endif - return 0; - else - return -1; -#endif // !GNUWIN32 -} - -bool wxIsDriveAvailable(const wxString& dirName) -{ -#ifdef __WIN32__ - UINT errorMode = SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX); -#endif - bool success = true; - - // Check if this is a root directory and if so, - // whether the drive is available. - if (dirName.length() == 3 && dirName[(size_t)1] == wxT(':')) - { - wxString dirNameLower(dirName.Lower()); -#ifndef wxHAS_DRIVE_FUNCTIONS - success = wxDirExists(dirNameLower); -#else - int currentDrive = _getdrive(); - int thisDrive = (int) (dirNameLower[(size_t)0] - 'a' + 1) ; - int err = setdrive( thisDrive ) ; - setdrive( currentDrive ); - - if (err == -1) - { - success = false; - } -#endif - } -#ifdef __WIN32__ - (void) SetErrorMode(errorMode); -#endif - - return success; -} -#endif // __WINDOWS__ - -#endif // wxUSE_DIRDLG || wxUSE_FILEDLG - - - -#if wxUSE_DIRDLG - -// Function which is called by quick sort. We want to override the default wxArrayString behaviour, -// and sort regardless of case. -static int wxCMPFUNC_CONV wxDirCtrlStringCompareFunction(const wxString& strFirst, const wxString& strSecond) -{ - return strFirst.CmpNoCase(strSecond); -} - -//----------------------------------------------------------------------------- -// wxDirItemData -//----------------------------------------------------------------------------- - -wxDirItemData::wxDirItemData(const wxString& path, const wxString& name, - bool isDir) -{ - m_path = path; - m_name = name; - /* Insert logic to detect hidden files here - * In UnixLand we just check whether the first char is a dot - * For FileNameFromPath read LastDirNameInThisPath ;-) */ - // m_isHidden = (bool)(wxFileNameFromPath(*m_path)[0] == '.'); - m_isHidden = false; - m_isExpanded = false; - m_isDir = isDir; -} - -void wxDirItemData::SetNewDirName(const wxString& path) -{ - m_path = path; - m_name = wxFileNameFromPath(path); -} - -bool wxDirItemData::HasSubDirs() const -{ - if (m_path.empty()) - return false; - - wxDir dir; - { - wxLogNull nolog; - if ( !dir.Open(m_path) ) - return false; - } - - return dir.HasSubDirs(); -} - -bool wxDirItemData::HasFiles(const wxString& WXUNUSED(spec)) const -{ - if (m_path.empty()) - return false; - - wxDir dir; - { - wxLogNull nolog; - if ( !dir.Open(m_path) ) - return false; - } - - return dir.HasFiles(); -} - -//----------------------------------------------------------------------------- -// wxGenericDirCtrl -//----------------------------------------------------------------------------- - -wxBEGIN_EVENT_TABLE(wxGenericDirCtrl, wxControl) - EVT_TREE_ITEM_EXPANDING (wxID_TREECTRL, wxGenericDirCtrl::OnExpandItem) - EVT_TREE_ITEM_COLLAPSED (wxID_TREECTRL, wxGenericDirCtrl::OnCollapseItem) - EVT_TREE_BEGIN_LABEL_EDIT (wxID_TREECTRL, wxGenericDirCtrl::OnBeginEditItem) - EVT_TREE_END_LABEL_EDIT (wxID_TREECTRL, wxGenericDirCtrl::OnEndEditItem) - EVT_TREE_SEL_CHANGED (wxID_TREECTRL, wxGenericDirCtrl::OnTreeSelChange) - EVT_TREE_ITEM_ACTIVATED (wxID_TREECTRL, wxGenericDirCtrl::OnItemActivated) - EVT_SIZE (wxGenericDirCtrl::OnSize) -wxEND_EVENT_TABLE() - -wxGenericDirCtrl::wxGenericDirCtrl(void) -{ - Init(); -} - -void wxGenericDirCtrl::ExpandRoot() -{ - ExpandDir(m_rootId); // automatically expand first level - - // Expand and select the default path - if (!m_defaultPath.empty()) - { - ExpandPath(m_defaultPath); - } -#ifdef __UNIX__ - else - { - // On Unix, there's only one node under the (hidden) root node. It - // represents the / path, so the user would always have to expand it; - // let's do it ourselves - ExpandPath( wxT("/") ); - } -#endif -} - -bool wxGenericDirCtrl::Create(wxWindow *parent, - wxWindowID treeid, - const wxString& dir, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& filter, - int defaultFilter, - const wxString& name) -{ - if (!wxControl::Create(parent, treeid, pos, size, style, wxDefaultValidator, name)) - return false; - - SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)); - SetForegroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT)); - - long treeStyle = wxTR_HAS_BUTTONS; - - treeStyle |= wxTR_HIDE_ROOT; - -#ifdef __WXGTK20__ - treeStyle |= wxTR_NO_LINES; -#endif - - if (style & wxDIRCTRL_EDIT_LABELS) - treeStyle |= wxTR_EDIT_LABELS; - - if (style & wxDIRCTRL_MULTIPLE) - treeStyle |= wxTR_MULTIPLE; - - if ((style & wxDIRCTRL_3D_INTERNAL) == 0) - treeStyle |= wxNO_BORDER; - - m_treeCtrl = CreateTreeCtrl(this, wxID_TREECTRL, - wxPoint(0,0), GetClientSize(), treeStyle); - - if (!filter.empty() && (style & wxDIRCTRL_SHOW_FILTERS)) - m_filterListCtrl = new wxDirFilterListCtrl(this, wxID_FILTERLISTCTRL); - - m_defaultPath = dir; - m_filter = filter; - - if (m_filter.empty()) - m_filter = wxFileSelectorDefaultWildcardStr; - - SetFilterIndex(defaultFilter); - - if (m_filterListCtrl) - m_filterListCtrl->FillFilterList(filter, defaultFilter); - - // TODO: set the icon size according to current scaling for this window. - // Currently, there's insufficient API in wxWidgets to determine what icons - // are available and whether to take the nearest size according to a tolerance - // instead of scaling. - // if (!wxTheFileIconsTable->IsOk()) - // wxTheFileIconsTable->SetSize(scaledSize); - - // Meanwhile, in your application initialisation, where you have better knowledge of what - // icons are available and whether to scale, you can do this: - // - // wxTheFileIconsTable->SetSize(calculatedIconSizeForDPI); - // - // Obviously this can't take into account monitors with different DPI. - m_treeCtrl->SetImageList(wxTheFileIconsTable->GetSmallImageList()); - - m_showHidden = false; - wxDirItemData* rootData = new wxDirItemData(wxEmptyString, wxEmptyString, true); - - wxString rootName; - -#if defined(__WINDOWS__) - rootName = _("Computer"); -#else - rootName = _("Sections"); -#endif - - m_rootId = m_treeCtrl->AddRoot( rootName, 3, -1, rootData); - m_treeCtrl->SetItemHasChildren(m_rootId); - - ExpandRoot(); - - SetInitialSize(size); - DoResize(); - - return true; -} - -wxGenericDirCtrl::~wxGenericDirCtrl() -{ -} - -void wxGenericDirCtrl::Init() -{ - m_showHidden = false; - m_currentFilter = 0; - m_currentFilterStr = wxEmptyString; // Default: any file - m_treeCtrl = NULL; - m_filterListCtrl = NULL; -} - -wxTreeCtrl* wxGenericDirCtrl::CreateTreeCtrl(wxWindow *parent, wxWindowID treeid, const wxPoint& pos, const wxSize& size, long treeStyle) -{ - return new wxTreeCtrl(parent, treeid, pos, size, treeStyle); -} - -void wxGenericDirCtrl::ShowHidden( bool show ) -{ - if ( m_showHidden == show ) - return; - - m_showHidden = show; - - if ( HasFlag(wxDIRCTRL_MULTIPLE) ) - { - wxArrayString paths; - GetPaths(paths); - ReCreateTree(); - for ( unsigned n = 0; n < paths.size(); n++ ) - { - ExpandPath(paths[n]); - } - } - else - { - wxString path = GetPath(); - ReCreateTree(); - SetPath(path); - } -} - -const wxTreeItemId -wxGenericDirCtrl::AddSection(const wxString& path, const wxString& name, int imageId) -{ - wxDirItemData *dir_item = new wxDirItemData(path,name,true); - - wxTreeItemId treeid = AppendItem( m_rootId, name, imageId, -1, dir_item); - - m_treeCtrl->SetItemHasChildren(treeid); - - return treeid; -} - -void wxGenericDirCtrl::SetupSections() -{ - wxArrayString paths, names; - wxArrayInt icons; - - size_t n, count = wxGetAvailableDrives(paths, names, icons); - -#ifdef __WXGTK20__ - wxString home = wxGetHomeDir(); - AddSection( home, _("Home directory"), 1); - home += wxT("/Desktop"); - AddSection( home, _("Desktop"), 1); -#endif - - for (n = 0; n < count; n++) - AddSection(paths[n], names[n], icons[n]); -} - -void wxGenericDirCtrl::SetFocus() -{ - // we don't need focus ourselves, give it to the tree so that the user - // could navigate it - if (m_treeCtrl) - m_treeCtrl->SetFocus(); -} - -void wxGenericDirCtrl::OnBeginEditItem(wxTreeEvent &event) -{ - // don't rename the main entry "Sections" - if (event.GetItem() == m_rootId) - { - event.Veto(); - return; - } - - // don't rename the individual sections - if (m_treeCtrl->GetItemParent( event.GetItem() ) == m_rootId) - { - event.Veto(); - return; - } -} - -void wxGenericDirCtrl::OnEndEditItem(wxTreeEvent &event) -{ - if (event.IsEditCancelled()) - return; - - if ((event.GetLabel().empty()) || - (event.GetLabel() == wxT(".")) || - (event.GetLabel() == wxT("..")) || - (event.GetLabel().Find(wxT('/')) != wxNOT_FOUND) || - (event.GetLabel().Find(wxT('\\')) != wxNOT_FOUND) || - (event.GetLabel().Find(wxT('|')) != wxNOT_FOUND)) - { - wxMessageDialog dialog(this, _("Illegal directory name."), _("Error"), wxOK | wxICON_ERROR ); - dialog.ShowModal(); - event.Veto(); - return; - } - - wxTreeItemId treeid = event.GetItem(); - wxDirItemData *data = GetItemData( treeid ); - wxASSERT( data ); - - wxString new_name( wxPathOnly( data->m_path ) ); - new_name += wxString(wxFILE_SEP_PATH); - new_name += event.GetLabel(); - - wxLogNull log; - - if (wxFileExists(new_name)) - { - wxMessageDialog dialog(this, _("File name exists already."), _("Error"), wxOK | wxICON_ERROR ); - dialog.ShowModal(); - event.Veto(); - } - - if (wxRenameFile(data->m_path,new_name)) - { - data->SetNewDirName( new_name ); - } - else - { - wxMessageDialog dialog(this, _("Operation not permitted."), _("Error"), wxOK | wxICON_ERROR ); - dialog.ShowModal(); - event.Veto(); - } -} - -void wxGenericDirCtrl::OnTreeSelChange(wxTreeEvent &event) -{ - wxTreeEvent changedEvent(wxEVT_DIRCTRL_SELECTIONCHANGED, GetId()); - - changedEvent.SetEventObject(this); - changedEvent.SetItem(event.GetItem()); - changedEvent.SetClientObject(m_treeCtrl->GetItemData(event.GetItem())); - - if (GetEventHandler()->SafelyProcessEvent(changedEvent) && !changedEvent.IsAllowed()) - event.Veto(); - else - event.Skip(); -} - -void wxGenericDirCtrl::OnItemActivated(wxTreeEvent &event) -{ - wxTreeItemId treeid = event.GetItem(); - const wxDirItemData *data = GetItemData(treeid); - - if (data->m_isDir) - { - // is dir - event.Skip(); - } - else - { - // is file - wxTreeEvent changedEvent(wxEVT_DIRCTRL_FILEACTIVATED, GetId()); - - changedEvent.SetEventObject(this); - changedEvent.SetItem(treeid); - changedEvent.SetClientObject(m_treeCtrl->GetItemData(treeid)); - - if (GetEventHandler()->SafelyProcessEvent(changedEvent) && !changedEvent.IsAllowed()) - event.Veto(); - else - event.Skip(); - } -} - -void wxGenericDirCtrl::OnExpandItem(wxTreeEvent &event) -{ - wxTreeItemId parentId = event.GetItem(); - - // VS: this is needed because the event handler is called from wxTreeCtrl - // ctor when wxTR_HIDE_ROOT was specified - - if (!m_rootId.IsOk()) - m_rootId = m_treeCtrl->GetRootItem(); - - ExpandDir(parentId); -} - -void wxGenericDirCtrl::OnCollapseItem(wxTreeEvent &event ) -{ - CollapseDir(event.GetItem()); -} - -void wxGenericDirCtrl::CollapseDir(wxTreeItemId parentId) -{ - wxTreeItemId child; - - wxDirItemData *data = GetItemData(parentId); - if (!data->m_isExpanded) - return; - - data->m_isExpanded = false; - - m_treeCtrl->Freeze(); - if (parentId != m_treeCtrl->GetRootItem()) - m_treeCtrl->CollapseAndReset(parentId); - m_treeCtrl->DeleteChildren(parentId); - m_treeCtrl->Thaw(); -} - -void wxGenericDirCtrl::PopulateNode(wxTreeItemId parentId) -{ - wxDirItemData *data = GetItemData(parentId); - - if (data->m_isExpanded) - return; - - data->m_isExpanded = true; - - if (parentId == m_treeCtrl->GetRootItem()) - { - SetupSections(); - return; - } - - wxASSERT(data); - - wxString search,path,filename; - - wxString dirName(data->m_path); - -#if defined(__WINDOWS__) - // Check if this is a root directory and if so, - // whether the drive is available. - if (!wxIsDriveAvailable(dirName)) - { - data->m_isExpanded = false; - //wxMessageBox(wxT("Sorry, this drive is not available.")); - return; - } -#endif - - // This may take a longish time. Go to busy cursor - wxBusyCursor busy; - -#if defined(__WINDOWS__) - if (dirName.Last() == ':') - dirName += wxString(wxFILE_SEP_PATH); -#endif - - wxArrayString dirs; - wxArrayString filenames; - - wxDir d; - wxString eachFilename; - - wxLogNull log; - d.Open(dirName); - - if (d.IsOpened()) - { - int style = wxDIR_DIRS; - if (m_showHidden) style |= wxDIR_HIDDEN; - if (d.GetFirst(& eachFilename, wxEmptyString, style)) - { - do - { - if ((eachFilename != wxT(".")) && (eachFilename != wxT(".."))) - { - dirs.Add(eachFilename); - } - } - while (d.GetNext(&eachFilename)); - } - } - dirs.Sort(wxDirCtrlStringCompareFunction); - - // Now do the filenames -- but only if we're allowed to - if (!HasFlag(wxDIRCTRL_DIR_ONLY)) - { - d.Open(dirName); - - if (d.IsOpened()) - { - int style = wxDIR_FILES; - if (m_showHidden) style |= wxDIR_HIDDEN; - // Process each filter (ex: "JPEG Files (*.jpg;*.jpeg)|*.jpg;*.jpeg") - wxStringTokenizer strTok; - wxString curFilter; - strTok.SetString(m_currentFilterStr,wxT(";")); - while(strTok.HasMoreTokens()) - { - curFilter = strTok.GetNextToken(); - if (d.GetFirst(& eachFilename, curFilter, style)) - { - do - { - if ((eachFilename != wxT(".")) && (eachFilename != wxT(".."))) - { - filenames.Add(eachFilename); - } - } - while (d.GetNext(& eachFilename)); - } - } - } - filenames.Sort(wxDirCtrlStringCompareFunction); - } - - // Now we really know whether we have any children so tell the tree control - // about it. - m_treeCtrl->SetItemHasChildren(parentId, !dirs.empty() || !filenames.empty()); - - // Add the sorted dirs - size_t i; - for (i = 0; i < dirs.GetCount(); i++) - { - eachFilename = dirs[i]; - path = dirName; - if (!wxEndsWithPathSeparator(path)) - path += wxString(wxFILE_SEP_PATH); - path += eachFilename; - - wxDirItemData *dir_item = new wxDirItemData(path,eachFilename,true); - wxTreeItemId treeid = AppendItem( parentId, eachFilename, - wxFileIconsTable::folder, -1, dir_item); - m_treeCtrl->SetItemImage( treeid, wxFileIconsTable::folder_open, - wxTreeItemIcon_Expanded ); - - // assume that it does have children by default as it can take a long - // time to really check for this (think remote drives...) - // - // and if we're wrong, we'll correct the icon later if - // the user really tries to open this item - m_treeCtrl->SetItemHasChildren(treeid); - } - - // Add the sorted filenames - if (!HasFlag(wxDIRCTRL_DIR_ONLY)) - { - for (i = 0; i < filenames.GetCount(); i++) - { - eachFilename = filenames[i]; - path = dirName; - if (!wxEndsWithPathSeparator(path)) - path += wxString(wxFILE_SEP_PATH); - path += eachFilename; - //path = dirName + wxString(wxT("/")) + eachFilename; - wxDirItemData *dir_item = new wxDirItemData(path,eachFilename,false); - int image_id = wxFileIconsTable::file; - if (eachFilename.Find(wxT('.')) != wxNOT_FOUND) - image_id = wxTheFileIconsTable->GetIconID(eachFilename.AfterLast(wxT('.'))); - (void) AppendItem( parentId, eachFilename, image_id, -1, dir_item); - } - } -} - -void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId) -{ - // ExpandDir() will not actually expand the tree node, just populate it - PopulateNode(parentId); -} - -void wxGenericDirCtrl::ReCreateTree() -{ - CollapseDir(m_treeCtrl->GetRootItem()); - ExpandRoot(); -} - -void wxGenericDirCtrl::CollapseTree() -{ - wxTreeItemIdValue cookie; - wxTreeItemId child = m_treeCtrl->GetFirstChild(m_rootId, cookie); - while (child.IsOk()) - { - CollapseDir(child); - child = m_treeCtrl->GetNextChild(m_rootId, cookie); - } -} - -// Find the child that matches the first part of 'path'. -// E.g. if a child path is "/usr" and 'path' is "/usr/include" -// then the child for /usr is returned. -wxTreeItemId wxGenericDirCtrl::FindChild(wxTreeItemId parentId, const wxString& path, bool& done) -{ - wxString path2(path); - - // Make sure all separators are as per the current platform - path2.Replace(wxT("\\"), wxString(wxFILE_SEP_PATH)); - path2.Replace(wxT("/"), wxString(wxFILE_SEP_PATH)); - - // Append a separator to foil bogus substring matching - path2 += wxString(wxFILE_SEP_PATH); - - // In MSW case is not significant -#if defined(__WINDOWS__) - path2.MakeLower(); -#endif - - wxTreeItemIdValue cookie; - wxTreeItemId childId = m_treeCtrl->GetFirstChild(parentId, cookie); - while (childId.IsOk()) - { - wxDirItemData* data = GetItemData(childId); - - if (data && !data->m_path.empty()) - { - wxString childPath(data->m_path); - if (!wxEndsWithPathSeparator(childPath)) - childPath += wxString(wxFILE_SEP_PATH); - - // In MSW case is not significant -#if defined(__WINDOWS__) - childPath.MakeLower(); -#endif - - if (childPath.length() <= path2.length()) - { - wxString path3 = path2.Mid(0, childPath.length()); - if (childPath == path3) - { - if (path3.length() == path2.length()) - done = true; - else - done = false; - return childId; - } - } - } - - childId = m_treeCtrl->GetNextChild(parentId, cookie); - } - wxTreeItemId invalid; - return invalid; -} - -// Try to expand as much of the given path as possible, -// and select the given tree item. -bool wxGenericDirCtrl::ExpandPath(const wxString& path) -{ - bool done = false; - wxTreeItemId treeid = FindChild(m_rootId, path, done); - wxTreeItemId lastId = treeid; // The last non-zero treeid - while (treeid.IsOk() && !done) - { - ExpandDir(treeid); - - treeid = FindChild(treeid, path, done); - if (treeid.IsOk()) - lastId = treeid; - } - if (!lastId.IsOk()) - return false; - - wxDirItemData *data = GetItemData(lastId); - if (data->m_isDir) - { - m_treeCtrl->Expand(lastId); - } - if (HasFlag(wxDIRCTRL_SELECT_FIRST) && data->m_isDir) - { - // Find the first file in this directory - wxTreeItemIdValue cookie; - wxTreeItemId childId = m_treeCtrl->GetFirstChild(lastId, cookie); - bool selectedChild = false; - while (childId.IsOk()) - { - data = GetItemData(childId); - - if (data && data->m_path != wxEmptyString && !data->m_isDir) - { - m_treeCtrl->SelectItem(childId); - m_treeCtrl->EnsureVisible(childId); - selectedChild = true; - break; - } - childId = m_treeCtrl->GetNextChild(lastId, cookie); - } - if (!selectedChild) - { - m_treeCtrl->SelectItem(lastId); - m_treeCtrl->EnsureVisible(lastId); - } - } - else - { - m_treeCtrl->SelectItem(lastId); - m_treeCtrl->EnsureVisible(lastId); - } - - return true; -} - - -bool wxGenericDirCtrl::CollapsePath(const wxString& path) -{ - bool done = false; - wxTreeItemId treeid = FindChild(m_rootId, path, done); - wxTreeItemId lastId = treeid; // The last non-zero treeid - - while ( treeid.IsOk() && !done ) - { - CollapseDir(treeid); - - treeid = FindChild(treeid, path, done); - - if ( treeid.IsOk() ) - lastId = treeid; - } - - if ( !lastId.IsOk() ) - return false; - - m_treeCtrl->SelectItem(lastId); - m_treeCtrl->EnsureVisible(lastId); - - return true; -} - -wxDirItemData* wxGenericDirCtrl::GetItemData(wxTreeItemId itemId) -{ - return static_cast(m_treeCtrl->GetItemData(itemId)); -} - -wxString wxGenericDirCtrl::GetPath(wxTreeItemId itemId) const -{ - const wxDirItemData* - data = static_cast(m_treeCtrl->GetItemData(itemId)); - - return data->m_path; -} - -wxString wxGenericDirCtrl::GetPath() const -{ - // Allow calling GetPath() in multiple selection from OnSelFilter - if (m_treeCtrl->HasFlag(wxTR_MULTIPLE)) - { - wxArrayTreeItemIds items; - m_treeCtrl->GetSelections(items); - if (items.size() > 0) - { - // return first string only - wxTreeItemId treeid = items[0]; - return GetPath(treeid); - } - - return wxEmptyString; - } - - wxTreeItemId treeid = m_treeCtrl->GetSelection(); - if (treeid) - { - return GetPath(treeid); - } - else - return wxEmptyString; -} - -void wxGenericDirCtrl::GetPaths(wxArrayString& paths) const -{ - paths.clear(); - - wxArrayTreeItemIds items; - m_treeCtrl->GetSelections(items); - for ( unsigned n = 0; n < items.size(); n++ ) - { - wxTreeItemId treeid = items[n]; - paths.push_back(GetPath(treeid)); - } -} - -wxString wxGenericDirCtrl::GetFilePath() const -{ - wxTreeItemId treeid = m_treeCtrl->GetSelection(); - if (treeid) - { - wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(treeid); - if (data->m_isDir) - return wxEmptyString; - else - return data->m_path; - } - else - return wxEmptyString; -} - -void wxGenericDirCtrl::GetFilePaths(wxArrayString& paths) const -{ - paths.clear(); - - wxArrayTreeItemIds items; - m_treeCtrl->GetSelections(items); - for ( unsigned n = 0; n < items.size(); n++ ) - { - wxTreeItemId treeid = items[n]; - wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(treeid); - if ( !data->m_isDir ) - paths.Add(data->m_path); - } -} - -void wxGenericDirCtrl::SetPath(const wxString& path) -{ - m_defaultPath = path; - if (m_rootId) - ExpandPath(path); -} - -void wxGenericDirCtrl::SelectPath(const wxString& path, bool select) -{ - bool done = false; - wxTreeItemId treeid = FindChild(m_rootId, path, done); - wxTreeItemId lastId = treeid; // The last non-zero treeid - while ( treeid.IsOk() && !done ) - { - treeid = FindChild(treeid, path, done); - if ( treeid.IsOk() ) - lastId = treeid; - } - if ( !lastId.IsOk() ) - return; - - if ( done ) - { - m_treeCtrl->SelectItem(treeid, select); - } -} - -void wxGenericDirCtrl::SelectPaths(const wxArrayString& paths) -{ - if ( HasFlag(wxDIRCTRL_MULTIPLE) ) - { - UnselectAll(); - for ( unsigned n = 0; n < paths.size(); n++ ) - { - SelectPath(paths[n]); - } - } -} - -void wxGenericDirCtrl::UnselectAll() -{ - m_treeCtrl->UnselectAll(); -} - -// Not used -#if 0 -void wxGenericDirCtrl::FindChildFiles(wxTreeItemId treeid, int dirFlags, wxArrayString& filenames) -{ - wxDirItemData *data = (wxDirItemData *) m_treeCtrl->GetItemData(treeid); - - // This may take a longish time. Go to busy cursor - wxBusyCursor busy; - - wxASSERT(data); - - wxString search,path,filename; - - wxString dirName(data->m_path); - -#if defined(__WINDOWS__) - if (dirName.Last() == ':') - dirName += wxString(wxFILE_SEP_PATH); -#endif - - wxDir d; - wxString eachFilename; - - wxLogNull log; - d.Open(dirName); - - if (d.IsOpened()) - { - if (d.GetFirst(& eachFilename, m_currentFilterStr, dirFlags)) - { - do - { - if ((eachFilename != wxT(".")) && (eachFilename != wxT(".."))) - { - filenames.Add(eachFilename); - } - } - while (d.GetNext(& eachFilename)) ; - } - } -} -#endif - -void wxGenericDirCtrl::SetFilterIndex(int n) -{ - m_currentFilter = n; - - wxString f, d; - if (ExtractWildcard(m_filter, n, f, d)) - m_currentFilterStr = f; - else -#ifdef __UNIX__ - m_currentFilterStr = wxT("*"); -#else - m_currentFilterStr = wxT("*.*"); -#endif -} - -void wxGenericDirCtrl::SetFilter(const wxString& filter) -{ - m_filter = filter; - - if (!filter.empty() && !m_filterListCtrl && HasFlag(wxDIRCTRL_SHOW_FILTERS)) - m_filterListCtrl = new wxDirFilterListCtrl(this, wxID_FILTERLISTCTRL); - else if (filter.empty() && m_filterListCtrl) - { - m_filterListCtrl->Destroy(); - m_filterListCtrl = NULL; - } - - wxString f, d; - if (ExtractWildcard(m_filter, m_currentFilter, f, d)) - m_currentFilterStr = f; - else -#ifdef __UNIX__ - m_currentFilterStr = wxT("*"); -#else - m_currentFilterStr = wxT("*.*"); -#endif - // current filter index is meaningless after filter change, set it to zero - SetFilterIndex(0); - if (m_filterListCtrl) - m_filterListCtrl->FillFilterList(m_filter, 0); -} - -// Extract description and actual filter from overall filter string -bool wxGenericDirCtrl::ExtractWildcard(const wxString& filterStr, int n, wxString& filter, wxString& description) -{ - wxArrayString filters, descriptions; - int count = wxParseCommonDialogsFilter(filterStr, descriptions, filters); - if (count > 0 && n < count) - { - filter = filters[n]; - description = descriptions[n]; - return true; - } - - return false; -} - - -void wxGenericDirCtrl::DoResize() -{ - wxSize sz = GetClientSize(); - int verticalSpacing = 3; - if (m_treeCtrl) - { - wxSize filterSz ; - if (m_filterListCtrl) - { - filterSz = m_filterListCtrl->GetSize(); - sz.y -= (filterSz.y + verticalSpacing); - } - m_treeCtrl->SetSize(0, 0, sz.x, sz.y); - if (m_filterListCtrl) - { - m_filterListCtrl->SetSize(0, sz.y + verticalSpacing, sz.x, filterSz.y); - // Don't know why, but this needs refreshing after a resize (wxMSW) - m_filterListCtrl->Refresh(); - } - } -} - - -void wxGenericDirCtrl::OnSize(wxSizeEvent& WXUNUSED(event)) -{ - DoResize(); -} - -wxTreeItemId wxGenericDirCtrl::AppendItem (const wxTreeItemId & parent, - const wxString & text, - int image, int selectedImage, - wxTreeItemData * data) -{ - wxTreeCtrl *treeCtrl = GetTreeCtrl (); - - wxASSERT (treeCtrl); - - if (treeCtrl) - { - return treeCtrl->AppendItem (parent, text, image, selectedImage, data); - } - else - { - return wxTreeItemId(); - } -} - - -//----------------------------------------------------------------------------- -// wxDirFilterListCtrl -//----------------------------------------------------------------------------- - -wxIMPLEMENT_CLASS(wxDirFilterListCtrl, wxChoice); - -wxBEGIN_EVENT_TABLE(wxDirFilterListCtrl, wxChoice) - EVT_CHOICE(wxID_ANY, wxDirFilterListCtrl::OnSelFilter) -wxEND_EVENT_TABLE() - -bool wxDirFilterListCtrl::Create(wxGenericDirCtrl* parent, - wxWindowID treeid, - const wxPoint& pos, - const wxSize& size, - long style) -{ - m_dirCtrl = parent; - - // by default our border style is determined by the style of our parent - if ( !(style & wxBORDER_MASK) ) - { - style |= parent->HasFlag(wxDIRCTRL_3D_INTERNAL) ? wxBORDER_SUNKEN - : wxBORDER_NONE; - } - - return wxChoice::Create(parent, treeid, pos, size, 0, NULL, style); -} - -void wxDirFilterListCtrl::Init() -{ - m_dirCtrl = NULL; -} - -void wxDirFilterListCtrl::OnSelFilter(wxCommandEvent& WXUNUSED(event)) -{ - int sel = GetSelection(); - - if (m_dirCtrl->HasFlag(wxDIRCTRL_MULTIPLE)) - { - wxArrayString paths; - m_dirCtrl->GetPaths(paths); - - m_dirCtrl->SetFilterIndex(sel); - - // If the filter has changed, the view is out of date, so - // collapse the tree. - m_dirCtrl->ReCreateTree(); - - // Expand and select the previously selected paths - for (unsigned int i = 0; i < paths.GetCount(); i++) - { - m_dirCtrl->ExpandPath(paths.Item(i)); - } - } - else - { - wxString currentPath = m_dirCtrl->GetPath(); - - m_dirCtrl->SetFilterIndex(sel); - m_dirCtrl->ReCreateTree(); - - // Try to restore the selection, or at least the directory - m_dirCtrl->ExpandPath(currentPath); - } -} - -void wxDirFilterListCtrl::FillFilterList(const wxString& filter, int defaultFilter) -{ - Clear(); - wxArrayString descriptions, filters; - size_t n = (size_t) wxParseCommonDialogsFilter(filter, descriptions, filters); - - if (n > 0 && defaultFilter < (int) n) - { - for (size_t i = 0; i < n; i++) - Append(descriptions[i]); - SetSelection(defaultFilter); - } -} -#endif // wxUSE_DIRDLG - -#if wxUSE_DIRDLG || wxUSE_FILEDLG - -// ---------------------------------------------------------------------------- -// wxFileIconsTable icons -// ---------------------------------------------------------------------------- - -#if 0 -#ifndef __WXGTK20__ -/* Computer (c) Julian Smart */ -static const char* const file_icons_tbl_computer_xpm[] = { -/* columns rows colors chars-per-pixel */ -"16 16 42 1", -"r c #4E7FD0", -"$ c #7198D9", -"; c #DCE6F6", -"q c #FFFFFF", -"u c #4A7CCE", -"# c #779DDB", -"w c #95B2E3", -"y c #7FA2DD", -"f c #3263B4", -"= c #EAF0FA", -"< c #B1C7EB", -"% c #6992D7", -"9 c #D9E4F5", -"o c #9BB7E5", -"6 c #F7F9FD", -", c #BED0EE", -"3 c #F0F5FC", -"1 c #A8C0E8", -" c None", -"0 c #FDFEFF", -"4 c #C4D5F0", -"@ c #81A4DD", -"e c #4377CD", -"- c #E2EAF8", -"i c #9FB9E5", -"> c #CCDAF2", -"+ c #89A9DF", -"s c #5584D1", -"t c #5D89D3", -": c #D2DFF4", -"5 c #FAFCFE", -"2 c #F5F8FD", -"8 c #DFE8F7", -"& c #5E8AD4", -"X c #638ED5", -"a c #CEDCF2", -"p c #90AFE2", -"d c #2F5DA9", -"* c #5282D0", -"7 c #E5EDF9", -". c #A2BCE6", -"O c #8CACE0", -/* pixels */ -" ", -" .XXXXXXXXXXX ", -" oXO++@#$%&*X ", -" oX=-;:>,<1%X ", -" oX23=-;:4,$X ", -" oX5633789:@X ", -" oX05623=78+X ", -" oXqq05623=OX ", -" oX,,,,,<<<$X ", -" wXXXXXXXXXXe ", -" XrtX%$$y@+O,, ", -" uyiiiiiiiii@< ", -" ouiiiiiiiiiipAdd(wxArtProvider::GetBitmap(wxART_FOLDER, - wxART_CMN_DIALOG, - sz)); - // folder_open - m_smallImageList->Add(wxArtProvider::GetBitmap(wxART_FOLDER_OPEN, - wxART_CMN_DIALOG, - sz)); - // computer -#ifdef __WXGTK20__ - // GTK24 uses this icon in the file open dialog - m_smallImageList->Add(wxArtProvider::GetBitmap(wxART_HARDDISK, - wxART_CMN_DIALOG, - sz)); -#else - m_smallImageList->Add(wxArtProvider::GetBitmap(wxART_HARDDISK, - wxART_CMN_DIALOG, - sz)); - // TODO: add computer icon if really necessary - //m_smallImageList->Add(wxIcon(file_icons_tbl_computer_xpm)); -#endif - // drive - m_smallImageList->Add(wxArtProvider::GetBitmap(wxART_HARDDISK, - wxART_CMN_DIALOG, - sz)); - // cdrom - m_smallImageList->Add(wxArtProvider::GetBitmap(wxART_CDROM, - wxART_CMN_DIALOG, - sz)); - // floppy - m_smallImageList->Add(wxArtProvider::GetBitmap(wxART_FLOPPY, - wxART_CMN_DIALOG, - sz)); - // removeable - m_smallImageList->Add(wxArtProvider::GetBitmap(wxART_REMOVABLE, - wxART_CMN_DIALOG, - sz)); - // file - m_smallImageList->Add(wxArtProvider::GetBitmap(wxART_NORMAL_FILE, - wxART_CMN_DIALOG, - sz)); - // executable - if (GetIconID(wxEmptyString, wxT("application/x-executable")) == file) - { - m_smallImageList->Add(wxArtProvider::GetBitmap(wxART_EXECUTABLE_FILE, - wxART_CMN_DIALOG, - sz)); - delete m_HashTable->Get(wxT("exe")); - m_HashTable->Delete(wxT("exe")); - m_HashTable->Put(wxT("exe"), new wxFileIconEntry(executable)); - } - /* else put into list by GetIconID - (KDE defines application/x-executable for *.exe and has nice icon) - */ -} - -wxImageList *wxFileIconsTable::GetSmallImageList() -{ - if (!m_smallImageList) - Create(m_size); - - return m_smallImageList; -} - -#if wxUSE_MIMETYPE && wxUSE_IMAGE && (!defined(__WINDOWS__) || wxUSE_WXDIB) -// VS: we don't need this function w/o wxMimeTypesManager because we'll only have -// one icon and we won't resize it - -static wxBitmap CreateAntialiasedBitmap(const wxImage& img, const wxSize& sz) -{ - const unsigned int size = sz.x; - - wxImage smallimg (size, size); - unsigned char *p1, *p2, *ps; - unsigned char mr = img.GetMaskRed(), - mg = img.GetMaskGreen(), - mb = img.GetMaskBlue(); - - unsigned x, y; - unsigned sr, sg, sb, smask; - - p1 = img.GetData(), p2 = img.GetData() + 3 * size*2, ps = smallimg.GetData(); - smallimg.SetMaskColour(mr, mr, mr); - - for (y = 0; y < size; y++) - { - for (x = 0; x < size; x++) - { - sr = sg = sb = smask = 0; - if (p1[0] != mr || p1[1] != mg || p1[2] != mb) - sr += p1[0], sg += p1[1], sb += p1[2]; - else smask++; - p1 += 3; - if (p1[0] != mr || p1[1] != mg || p1[2] != mb) - sr += p1[0], sg += p1[1], sb += p1[2]; - else smask++; - p1 += 3; - if (p2[0] != mr || p2[1] != mg || p2[2] != mb) - sr += p2[0], sg += p2[1], sb += p2[2]; - else smask++; - p2 += 3; - if (p2[0] != mr || p2[1] != mg || p2[2] != mb) - sr += p2[0], sg += p2[1], sb += p2[2]; - else smask++; - p2 += 3; - - if (smask > 2) - ps[0] = ps[1] = ps[2] = mr; - else - { - ps[0] = (unsigned char)(sr >> 2); - ps[1] = (unsigned char)(sg >> 2); - ps[2] = (unsigned char)(sb >> 2); - } - ps += 3; - } - p1 += size*2 * 3, p2 += size*2 * 3; - } - - return wxBitmap(smallimg); -} - -// This function is currently not unused anymore -#if 0 -// finds empty borders and return non-empty area of image: -static wxImage CutEmptyBorders(const wxImage& img) -{ - unsigned char mr = img.GetMaskRed(), - mg = img.GetMaskGreen(), - mb = img.GetMaskBlue(); - unsigned char *dt = img.GetData(), *dttmp; - unsigned w = img.GetWidth(), h = img.GetHeight(); - - unsigned top, bottom, left, right, i; - bool empt; - -#define MK_DTTMP(x,y) dttmp = dt + ((x + y * w) * 3) -#define NOEMPTY_PIX(empt) if (dttmp[0] != mr || dttmp[1] != mg || dttmp[2] != mb) {empt = false; break;} - - for (empt = true, top = 0; empt && top < h; top++) - { - MK_DTTMP(0, top); - for (i = 0; i < w; i++, dttmp+=3) - NOEMPTY_PIX(empt) - } - for (empt = true, bottom = h-1; empt && bottom > top; bottom--) - { - MK_DTTMP(0, bottom); - for (i = 0; i < w; i++, dttmp+=3) - NOEMPTY_PIX(empt) - } - for (empt = true, left = 0; empt && left < w; left++) - { - MK_DTTMP(left, 0); - for (i = 0; i < h; i++, dttmp+=3*w) - NOEMPTY_PIX(empt) - } - for (empt = true, right = w-1; empt && right > left; right--) - { - MK_DTTMP(right, 0); - for (i = 0; i < h; i++, dttmp+=3*w) - NOEMPTY_PIX(empt) - } - top--, left--, bottom++, right++; - - return img.GetSubImage(wxRect(left, top, right - left + 1, bottom - top + 1)); -} -#endif // #if 0 - -#endif // wxUSE_MIMETYPE - -int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime) -{ - if (!m_smallImageList) - Create(m_size); - -#if wxUSE_MIMETYPE - if (!extension.empty()) - { - wxFileIconEntry *entry = (wxFileIconEntry*) m_HashTable->Get(extension); - if (entry) return (entry -> iconid); - } - - wxFileType *ft = (mime.empty()) ? - wxTheMimeTypesManager -> GetFileTypeFromExtension(extension) : - wxTheMimeTypesManager -> GetFileTypeFromMimeType(mime); - - wxIconLocation iconLoc; - wxIcon ic; - - { - wxLogNull logNull; - if ( ft && ft->GetIcon(&iconLoc) ) - { - ic = wxIcon( iconLoc ); - } - } - - delete ft; - - if ( !ic.IsOk() ) - { - int newid = file; - m_HashTable->Put(extension, new wxFileIconEntry(newid)); - return newid; - } - - wxBitmap bmp; - bmp.CopyFromIcon(ic); - - if ( !bmp.IsOk() ) - { - int newid = file; - m_HashTable->Put(extension, new wxFileIconEntry(newid)); - return newid; - } - - int size = m_size.x; - - int treeid = m_smallImageList->GetImageCount(); - if ((bmp.GetWidth() == (int) size) && (bmp.GetHeight() == (int) size)) - { - m_smallImageList->Add(bmp); - } -#if wxUSE_IMAGE && (!defined(__WINDOWS__) || wxUSE_WXDIB) - else - { - wxImage img = bmp.ConvertToImage(); - - if ((img.GetWidth() != size*2) || (img.GetHeight() != size*2)) -// m_smallImageList->Add(CreateAntialiasedBitmap(CutEmptyBorders(img).Rescale(size*2, size*2))); - m_smallImageList->Add(CreateAntialiasedBitmap(img.Rescale(size*2, size*2), m_size)); - else - m_smallImageList->Add(CreateAntialiasedBitmap(img, m_size)); - } -#endif // wxUSE_IMAGE - - m_HashTable->Put(extension, new wxFileIconEntry(treeid)); - return treeid; - -#else // !wxUSE_MIMETYPE - - wxUnusedVar(mime); - if (extension == wxT("exe")) - return executable; - else - return file; -#endif // wxUSE_MIMETYPE/!wxUSE_MIMETYPE -} - -#endif // wxUSE_DIRDLG || wxUSE_FILEDLG diff --git a/Externals/wxWidgets3/src/generic/dirdlgg.cpp b/Externals/wxWidgets3/src/generic/dirdlgg.cpp deleted file mode 100644 index d1c58900b0..0000000000 --- a/Externals/wxWidgets3/src/generic/dirdlgg.cpp +++ /dev/null @@ -1,342 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/generic/dirdlgg.cpp -// Purpose: wxDirDialog -// Author: Harm van der Heijden, Robert Roebling & Julian Smart -// Modified by: -// Created: 12/12/98 -// Copyright: (c) Harm van der Heijden, Robert Roebling, Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_DIRDLG - -#ifndef WX_PRECOMP - #include "wx/textctrl.h" - #include "wx/button.h" - #include "wx/checkbox.h" - #include "wx/sizer.h" - #include "wx/intl.h" - #include "wx/log.h" - #include "wx/msgdlg.h" - #include "wx/bmpbuttn.h" -#endif - -#include "wx/statline.h" -#include "wx/dirctrl.h" -#include "wx/generic/dirdlgg.h" -#include "wx/artprov.h" -#include "wx/menu.h" - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -static const int ID_DIRCTRL = 1000; -static const int ID_TEXTCTRL = 1001; -static const int ID_NEW = 1004; -static const int ID_SHOW_HIDDEN = 1005; -static const int ID_GO_HOME = 1006; - -//----------------------------------------------------------------------------- -// wxGenericDirDialog -//----------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxGenericDirDialog, wxDialog); - -wxBEGIN_EVENT_TABLE(wxGenericDirDialog, wxDialog) - EVT_CLOSE (wxGenericDirDialog::OnCloseWindow) - EVT_BUTTON (wxID_OK, wxGenericDirDialog::OnOK) - EVT_BUTTON (ID_NEW, wxGenericDirDialog::OnNew) - EVT_BUTTON (ID_GO_HOME, wxGenericDirDialog::OnGoHome) - EVT_TREE_KEY_DOWN (wxID_ANY, wxGenericDirDialog::OnTreeKeyDown) - EVT_TREE_SEL_CHANGED (wxID_ANY, wxGenericDirDialog::OnTreeSelected) - EVT_TEXT_ENTER (ID_TEXTCTRL, wxGenericDirDialog::OnOK) - EVT_CHECKBOX (ID_SHOW_HIDDEN, wxGenericDirDialog::OnShowHidden) -wxEND_EVENT_TABLE() - -wxGenericDirDialog::wxGenericDirDialog(wxWindow* parent, const wxString& title, - const wxString& defaultPath, long style, - const wxPoint& pos, const wxSize& sz, - const wxString& name) -{ - Create(parent, title, defaultPath, style, pos, sz, name); -} - -bool wxGenericDirDialog::Create(wxWindow* parent, - const wxString& title, - const wxString& defaultPath, long style, - const wxPoint& pos, - const wxSize& sz, - const wxString& name) -{ - wxBusyCursor cursor; - - parent = GetParentForModalDialog(parent, style); - - if (!wxDirDialogBase::Create(parent, title, defaultPath, style, pos, sz, name)) - return false; - - m_path = defaultPath; - if (m_path == wxT("~")) - wxGetHomeDir(&m_path); - if (m_path == wxT(".")) - m_path = wxGetCwd(); - - wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL ); - - // 0) 'New' and 'Home' Buttons - wxSizer* buttonsizer = new wxBoxSizer( wxHORIZONTAL ); - - wxBitmapButton* homeButton = - new wxBitmapButton(this, ID_GO_HOME, - wxArtProvider::GetBitmap(wxART_GO_HOME, wxART_BUTTON)); - buttonsizer->Add( homeButton, 0, wxLEFT|wxRIGHT, 10 ); - - // I'm not convinced we need a New button, and we tend to get annoying - // accidental-editing with label editing enabled. - if (!HasFlag(wxDD_DIR_MUST_EXIST)) - { - wxBitmapButton* newButton = - new wxBitmapButton(this, ID_NEW, - wxArtProvider::GetBitmap(wxART_NEW_DIR, wxART_BUTTON)); - buttonsizer->Add( newButton, 0, wxRIGHT, 10 ); -#if wxUSE_TOOLTIPS - newButton->SetToolTip(_("Create new directory")); -#endif - } - -#if wxUSE_TOOLTIPS - homeButton->SetToolTip(_("Go to home directory")); -#endif - - topsizer->Add( buttonsizer, 0, wxTOP | wxALIGN_RIGHT, 10 ); - - // 1) dir ctrl - m_dirCtrl = NULL; // this is necessary, event handler called from - // wxGenericDirCtrl would crash otherwise! - long dirStyle = wxDIRCTRL_DIR_ONLY | wxDEFAULT_CONTROL_BORDER; - -#ifdef __WXMSW__ - if (!HasFlag(wxDD_DIR_MUST_EXIST)) - { - // Only under Windows do we need the wxTR_EDIT_LABEL tree control style - // before we can call EditLabel (required for "New directory") - dirStyle |= wxDIRCTRL_EDIT_LABELS; - } -#endif - - m_dirCtrl = new wxGenericDirCtrl(this, ID_DIRCTRL, - m_path, wxDefaultPosition, - wxSize(300, 200), - dirStyle); - - wxSizerFlags flagsBorder2; - flagsBorder2.DoubleBorder(wxTOP | wxLEFT | wxRIGHT); - - topsizer->Add(m_dirCtrl, wxSizerFlags(flagsBorder2).Proportion(1).Expand()); - - // TODO: Make this an option depending on a flag? - wxCheckBox * - check = new wxCheckBox(this, ID_SHOW_HIDDEN, _("Show &hidden directories")); - topsizer->Add(check, wxSizerFlags(flagsBorder2).Right()); - - // 2) text ctrl - m_input = new wxTextCtrl( this, ID_TEXTCTRL, m_path, wxDefaultPosition ); - topsizer->Add(m_input, wxSizerFlags(flagsBorder2).Expand()); - - // 3) buttons if any - wxSizer *buttonSizer = CreateSeparatedButtonSizer(wxOK | wxCANCEL); - if ( buttonSizer ) - { - topsizer->Add(buttonSizer, wxSizerFlags().Expand().DoubleBorder()); - } - - m_input->SetFocus(); - - SetAutoLayout( true ); - SetSizer( topsizer ); - - topsizer->SetSizeHints( this ); - topsizer->Fit( this ); - - Centre( wxBOTH ); - - return true; -} - -void wxGenericDirDialog::EndModal(int retCode) -{ - // before proceeding, change the current working directory if user asked so - if (retCode == wxID_OK && HasFlag(wxDD_CHANGE_DIR)) - wxSetWorkingDirectory(m_path); - - wxDialog::EndModal(retCode); -} - -void wxGenericDirDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event)) -{ - EndModal(wxID_CANCEL); -} - -void wxGenericDirDialog::OnOK(wxCommandEvent& WXUNUSED(event)) -{ - m_path = m_input->GetValue(); - - // Does the path exist? (User may have typed anything in m_input) - if (wxDirExists(m_path)) - { - // OK, path exists, we're done. - EndModal(wxID_OK); - return; - } - - // Interact with user, find out if the dir is a typo or to be created - wxString msg; - msg.Printf(_("The directory '%s' does not exist\nCreate it now?"), - m_path.c_str()); - wxMessageDialog dialog(this, msg, _("Directory does not exist"), - wxYES_NO | wxICON_WARNING); - - if ( dialog.ShowModal() == wxID_YES ) - { - // Okay, let's make it - wxLogNull log; - if (wxMkdir(m_path)) - { - // The new dir was created okay. - EndModal(wxID_OK); - return; - } - else - { - // Trouble... - msg.Printf(_("Failed to create directory '%s'\n(Do you have the required permissions?)"), - m_path.c_str()); - wxMessageDialog errmsg(this, msg, _("Error creating directory"), wxOK | wxICON_ERROR); - errmsg.ShowModal(); - // We still don't have a valid dir. Back to the main dialog. - } - } - // User has answered NO to create dir. -} - -void wxGenericDirDialog::SetPath(const wxString& path) -{ - m_dirCtrl->SetPath(path); - m_path = path; -} - -wxString wxGenericDirDialog::GetPath(void) const -{ - return m_path; -} - -int wxGenericDirDialog::ShowModal() -{ - m_input->SetValue( m_path ); - return wxDialog::ShowModal(); -} - -void wxGenericDirDialog::OnTreeSelected( wxTreeEvent &event ) -{ - if (!m_dirCtrl) - return; - - wxTreeItemId item = event.GetItem(); - - wxDirItemData *data = NULL; - - if(item.IsOk()) - data = (wxDirItemData*)m_dirCtrl->GetTreeCtrl()->GetItemData(item); - - if (data) - m_input->SetValue( data->m_path ); -} - -void wxGenericDirDialog::OnTreeKeyDown( wxTreeEvent &WXUNUSED(event) ) -{ - if (!m_dirCtrl) - return; - - wxDirItemData *data = (wxDirItemData*)m_dirCtrl->GetTreeCtrl()->GetItemData(m_dirCtrl->GetTreeCtrl()->GetSelection()); - if (data) - m_input->SetValue( data->m_path ); -} - -void wxGenericDirDialog::OnShowHidden( wxCommandEvent& event ) -{ - if (!m_dirCtrl) - return; - - m_dirCtrl->ShowHidden( event.GetInt() != 0 ); -} - -void wxGenericDirDialog::OnNew( wxCommandEvent& WXUNUSED(event) ) -{ - wxTreeItemId id = m_dirCtrl->GetTreeCtrl()->GetSelection(); - if ((id == m_dirCtrl->GetTreeCtrl()->GetRootItem()) || - (m_dirCtrl->GetTreeCtrl()->GetItemParent(id) == m_dirCtrl->GetTreeCtrl()->GetRootItem())) - { - wxMessageDialog msg(this, _("You cannot add a new directory to this section."), - _("Create directory"), wxOK | wxICON_INFORMATION ); - msg.ShowModal(); - return; - } - - wxTreeItemId parent = id ; // m_dirCtrl->GetTreeCtrl()->GetItemParent( id ); - wxDirItemData *data = (wxDirItemData*)m_dirCtrl->GetTreeCtrl()->GetItemData( parent ); - wxASSERT( data ); - - wxString new_name( _("NewName") ); - wxString path( data->m_path ); - if (!wxEndsWithPathSeparator(path)) - path += wxFILE_SEP_PATH; - path += new_name; - if (wxDirExists(path)) - { - // try NewName0, NewName1 etc. - int i = 0; - do { - new_name = _("NewName"); - wxString num; - num.Printf( wxT("%d"), i ); - new_name += num; - - path = data->m_path; - if (!wxEndsWithPathSeparator(path)) - path += wxFILE_SEP_PATH; - path += new_name; - i++; - } while (wxDirExists(path)); - } - - wxLogNull log; - if (!wxMkdir(path)) - { - wxMessageDialog dialog(this, _("Operation not permitted."), _("Error"), wxOK | wxICON_ERROR ); - dialog.ShowModal(); - return; - } - - wxDirItemData *new_data = new wxDirItemData( path, new_name, true ); - - // TODO: THIS CODE DOESN'T WORK YET. We need to avoid duplication of the first child - // of the parent. - wxTreeItemId new_id = m_dirCtrl->GetTreeCtrl()->AppendItem( parent, new_name, 0, 0, new_data ); - m_dirCtrl->GetTreeCtrl()->EnsureVisible( new_id ); - m_dirCtrl->GetTreeCtrl()->EditLabel( new_id ); -} - -void wxGenericDirDialog::OnGoHome(wxCommandEvent& WXUNUSED(event)) -{ - SetPath(wxGetUserHome()); -} - -#endif // wxUSE_DIRDLG diff --git a/Externals/wxWidgets3/src/generic/dragimgg.cpp b/Externals/wxWidgets3/src/generic/dragimgg.cpp deleted file mode 100644 index 270717a63b..0000000000 --- a/Externals/wxWidgets3/src/generic/dragimgg.cpp +++ /dev/null @@ -1,523 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/generic/dragimgg.cpp -// Purpose: Generic wxDragImage implementation -// Author: Julian Smart -// Modified by: -// Created: 29/2/2000 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_DRAGIMAGE - -#ifndef WX_PRECOMP - #include - #include "wx/window.h" - #include "wx/frame.h" - #include "wx/dcclient.h" - #include "wx/dcscreen.h" - #include "wx/dcmemory.h" - #include "wx/settings.h" - #include "wx/intl.h" - #include "wx/log.h" - #include "wx/image.h" -#endif - -#define wxUSE_IMAGE_IN_DRAGIMAGE 1 - -#include "wx/generic/dragimgg.h" - -// ---------------------------------------------------------------------------- -// macros -// ---------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxGenericDragImage, wxObject); - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxGenericDragImage ctors/dtor -// ---------------------------------------------------------------------------- - -wxGenericDragImage::~wxGenericDragImage() -{ - if (m_windowDC) - { - delete m_windowDC; - } -} - -void wxGenericDragImage::Init() -{ - m_isDirty = false; - m_isShown = false; - m_windowDC = NULL; - m_window = NULL; - m_fullScreen = false; -#ifdef wxHAS_NATIVE_OVERLAY - m_dcOverlay = NULL; -#else - m_pBackingBitmap = NULL; -#endif -} - -// Attributes -//////////////////////////////////////////////////////////////////////////// - - -// Operations -//////////////////////////////////////////////////////////////////////////// - -// Create a drag image with a virtual image (need to override DoDrawImage, GetImageRect) -bool wxGenericDragImage::Create(const wxCursor& cursor) -{ - m_cursor = cursor; - - return true; -} - -// Create a drag image from a bitmap and optional cursor -bool wxGenericDragImage::Create(const wxBitmap& image, const wxCursor& cursor) -{ - // We don't have to combine the cursor explicitly since we simply show the cursor - // as we drag. This currently will only work within one window. - - m_cursor = cursor; - m_bitmap = image; - - return true ; -} - -// Create a drag image from an icon and optional cursor -bool wxGenericDragImage::Create(const wxIcon& image, const wxCursor& cursor) -{ - // We don't have to combine the cursor explicitly since we simply show the cursor - // as we drag. This currently will only work within one window. - - m_cursor = cursor; - m_icon = image; - - return true ; -} - -// Create a drag image from a string and optional cursor -bool wxGenericDragImage::Create(const wxString& str, const wxCursor& cursor) -{ - wxFont font(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); - - wxCoord w = 0, h = 0; - wxScreenDC dc; - dc.SetFont(font); - dc.GetTextExtent(str, & w, & h); - dc.SetFont(wxNullFont); - - wxMemoryDC dc2; - - // Sometimes GetTextExtent isn't accurate enough, so make it longer - wxBitmap bitmap((int) ((w+2) * 1.5), (int) h+2); - dc2.SelectObject(bitmap); - - dc2.SetFont(font); - dc2.SetBackground(* wxWHITE_BRUSH); - dc2.Clear(); - dc2.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT); - dc2.SetTextForeground(* wxLIGHT_GREY); - dc2.DrawText(str, 0, 0); - dc2.DrawText(str, 1, 0); - dc2.DrawText(str, 2, 0); - dc2.DrawText(str, 1, 1); - dc2.DrawText(str, 2, 1); - dc2.DrawText(str, 1, 2); - dc2.DrawText(str, 2, 2); - - dc2.SetTextForeground(* wxBLACK); - dc2.DrawText(str, 1, 1); - - dc2.SelectObject(wxNullBitmap); - -#if wxUSE_IMAGE_IN_DRAGIMAGE && (!defined(__WXMSW__) || wxUSE_WXDIB) - // Make the bitmap masked - wxImage image = bitmap.ConvertToImage(); - image.SetMaskColour(255, 255, 255); - bitmap = wxBitmap(image); -#endif - - return Create(bitmap, cursor); -} - -#if wxUSE_TREECTRL -// Create a drag image for the given tree control item -bool wxGenericDragImage::Create(const wxTreeCtrl& treeCtrl, wxTreeItemId& id) -{ - wxString str = treeCtrl.GetItemText(id); - return Create(str); -} -#endif - -#if wxUSE_LISTCTRL -// Create a drag image for the given list control item -bool wxGenericDragImage::Create(const wxListCtrl& listCtrl, long id) -{ - wxString str = listCtrl.GetItemText(id); - return Create(str); -} -#endif - -// Begin drag -bool wxGenericDragImage::BeginDrag(const wxPoint& hotspot, - wxWindow* window, - bool fullScreen, - wxRect* rect) -{ - wxCHECK_MSG( window, false, wxT("Window must not be null in BeginDrag.")); - - // The image should be offset by this amount - m_offset = hotspot; - m_window = window; - m_fullScreen = fullScreen; - - if (rect) - m_boundingRect = * rect; - - m_isDirty = false; - m_isShown = false; - - if (m_cursor.IsOk()) - { - m_oldCursor = window->GetCursor(); - window->SetCursor(m_cursor); - } - - window->CaptureMouse(); - - // Make a copy of the window so we can repair damage done as the image is - // dragged. - - wxSize clientSize; - wxPoint pt; - if (!m_fullScreen) - { - clientSize = window->GetClientSize(); - m_boundingRect.x = 0; m_boundingRect.y = 0; - m_boundingRect.width = clientSize.x; m_boundingRect.height = clientSize.y; - } - else - { - int w, h; - wxDisplaySize(& w, & h); - clientSize.x = w; clientSize.y = h; - if (rect) - { - pt.x = m_boundingRect.x; pt.y = m_boundingRect.y; - clientSize.x = m_boundingRect.width; clientSize.y = m_boundingRect.height; - } - else - { - m_boundingRect.x = 0; m_boundingRect.y = 0; - m_boundingRect.width = w; m_boundingRect.height = h; - } - } - -#ifndef wxHAS_NATIVE_OVERLAY - wxBitmap* backing = (m_pBackingBitmap ? m_pBackingBitmap : (wxBitmap*) & m_backingBitmap); - - if (!backing->IsOk() || (backing->GetWidth() < clientSize.x || backing->GetHeight() < clientSize.y)) - (*backing) = wxBitmap(clientSize.x, clientSize.y); -#endif // !wxHAS_NATIVE_OVERLAY - - if (!m_fullScreen) - { - m_windowDC = new wxClientDC(window); - } - else - { - m_windowDC = new wxScreenDC; - -#if 0 - // Use m_boundingRect to limit the area considered. - ((wxScreenDC*) m_windowDC)->StartDrawingOnTop(rect); -#endif - - m_windowDC->SetClippingRegion(m_boundingRect.x, m_boundingRect.y, - m_boundingRect.width, m_boundingRect.height); - } - - return true; -} - -// Begin drag. hotspot is the location of the drag position relative to the upper-left -// corner of the image. This is full screen only. fullScreenRect gives the -// position of the window on the screen, to restrict the drag to. -bool wxGenericDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, wxWindow* fullScreenRect) -{ - wxRect rect; - - int x = fullScreenRect->GetPosition().x; - int y = fullScreenRect->GetPosition().y; - - wxSize sz = fullScreenRect->GetSize(); - - if (fullScreenRect->GetParent() && !wxDynamicCast(fullScreenRect, wxFrame)) - fullScreenRect->GetParent()->ClientToScreen(& x, & y); - - rect.x = x; rect.y = y; - rect.width = sz.x; rect.height = sz.y; - - return BeginDrag(hotspot, window, true, & rect); -} - -// End drag -bool wxGenericDragImage::EndDrag() -{ - if (m_window) - { -#ifdef __WXMSW__ - // Under Windows we can be pretty sure this test will give - // the correct results - if (wxWindow::GetCapture() == m_window) -#endif - m_window->ReleaseMouse(); - - if (m_cursor.IsOk() && m_oldCursor.IsOk()) - { - m_window->SetCursor(m_oldCursor); - } - } - - if (m_windowDC) - { -#ifdef wxHAS_NATIVE_OVERLAY - m_overlay.Reset(); -#else - m_windowDC->DestroyClippingRegion(); -#endif - wxDELETE(m_windowDC); - } - -#ifndef wxHAS_NATIVE_OVERLAY - m_repairBitmap = wxNullBitmap; -#endif - - return true; -} - -// Move the image: call from OnMouseMove. Pt is in window client coordinates if window -// is non-NULL, or in screen coordinates if NULL. -bool wxGenericDragImage::Move(const wxPoint& pt) -{ - wxASSERT_MSG( (m_windowDC != NULL), wxT("No window DC in wxGenericDragImage::Move()") ); - - wxPoint pt2(pt); - if (m_fullScreen) - pt2 = m_window->ClientToScreen(pt); - - // Erase at old position, then show at the current position - wxPoint oldPos = m_position; - - bool eraseOldImage = (m_isDirty && m_isShown); - - if (m_isShown) - RedrawImage(oldPos - m_offset, pt2 - m_offset, eraseOldImage, true); - - m_position = pt2; - - if (m_isShown) - m_isDirty = true; - - return true; -} - -bool wxGenericDragImage::Show() -{ - wxASSERT_MSG( (m_windowDC != NULL), wxT("No window DC in wxGenericDragImage::Show()") ); - - // Show at the current position - - if (!m_isShown) - { - // This is where we restore the backing bitmap, in case - // something has changed on the window. - -#ifndef wxHAS_NATIVE_OVERLAY - wxBitmap* backing = (m_pBackingBitmap ? m_pBackingBitmap : (wxBitmap*) & m_backingBitmap); - wxMemoryDC memDC; - memDC.SelectObject(* backing); - - UpdateBackingFromWindow(* m_windowDC, memDC, m_boundingRect, wxRect(0, 0, m_boundingRect.width, m_boundingRect.height)); - - //memDC.Blit(0, 0, m_boundingRect.width, m_boundingRect.height, m_windowDC, m_boundingRect.x, m_boundingRect.y); - memDC.SelectObject(wxNullBitmap); -#endif // !wxHAS_NATIVE_OVERLAY - - RedrawImage(m_position - m_offset, m_position - m_offset, false, true); - } - - m_isShown = true; - m_isDirty = true; - - return true; -} - -bool wxGenericDragImage::UpdateBackingFromWindow(wxDC& windowDC, wxMemoryDC& destDC, - const wxRect& sourceRect, const wxRect& destRect) const -{ - return destDC.Blit(destRect.x, destRect.y, destRect.width, destRect.height, & windowDC, - sourceRect.x, sourceRect.y); -} - -bool wxGenericDragImage::Hide() -{ - wxASSERT_MSG( (m_windowDC != NULL), wxT("No window DC in wxGenericDragImage::Hide()") ); - - // Repair the old position - - if (m_isShown && m_isDirty) - { - RedrawImage(m_position - m_offset, m_position - m_offset, true, false); - } - - m_isShown = false; - m_isDirty = false; - - return true; -} - -// More efficient: erase and redraw simultaneously if possible -bool wxGenericDragImage::RedrawImage(const wxPoint& oldPos, - const wxPoint& newPos, - bool eraseOld, bool drawNew) -{ - if (!m_windowDC) - return false; - -#ifdef wxHAS_NATIVE_OVERLAY - wxUnusedVar(oldPos); - - wxDCOverlay dcoverlay( m_overlay, (wxWindowDC*) m_windowDC ) ; - if ( eraseOld ) - dcoverlay.Clear() ; - if (drawNew) - DoDrawImage(*m_windowDC, newPos); -#else // !wxHAS_NATIVE_OVERLAY - wxBitmap* backing = (m_pBackingBitmap ? m_pBackingBitmap : (wxBitmap*) & m_backingBitmap); - if (!backing->IsOk()) - return false; - - wxRect oldRect(GetImageRect(oldPos)); - wxRect newRect(GetImageRect(newPos)); - - wxRect fullRect; - - // Full rect: the combination of both rects - if (eraseOld && drawNew) - { - int oldRight = oldRect.GetRight(); - int oldBottom = oldRect.GetBottom(); - int newRight = newRect.GetRight(); - int newBottom = newRect.GetBottom(); - - wxPoint topLeft = wxPoint(wxMin(oldPos.x, newPos.x), wxMin(oldPos.y, newPos.y)); - wxPoint bottomRight = wxPoint(wxMax(oldRight, newRight), wxMax(oldBottom, newBottom)); - - fullRect.x = topLeft.x; fullRect.y = topLeft.y; - fullRect.SetRight(bottomRight.x); - fullRect.SetBottom(bottomRight.y); - } - else if (eraseOld) - fullRect = oldRect; - else if (drawNew) - fullRect = newRect; - - // Make the bitmap bigger than it need be, so we don't - // keep reallocating all the time. - int excess = 50; - - if (!m_repairBitmap.IsOk() || (m_repairBitmap.GetWidth() < fullRect.GetWidth() || m_repairBitmap.GetHeight() < fullRect.GetHeight())) - { - m_repairBitmap = wxBitmap(fullRect.GetWidth() + excess, fullRect.GetHeight() + excess); - } - - wxMemoryDC memDC; - memDC.SelectObject(* backing); - - wxMemoryDC memDCTemp; - memDCTemp.SelectObject(m_repairBitmap); - - // Draw the backing bitmap onto the repair bitmap. - // If full-screen, we may have specified the rect on the - // screen that we're using for our backing bitmap. - // So subtract this when we're blitting from the backing bitmap - // (translate from screen to backing-bitmap coords). - - memDCTemp.Blit(0, 0, fullRect.GetWidth(), fullRect.GetHeight(), & memDC, fullRect.x - m_boundingRect.x, fullRect.y - m_boundingRect.y); - - // If drawing, draw the image onto the mem DC - if (drawNew) - { - wxPoint pos(newPos.x - fullRect.x, newPos.y - fullRect.y) ; - DoDrawImage(memDCTemp, pos); - } - - // Now blit to the window - // Finally, blit the temp mem DC to the window. - m_windowDC->Blit(fullRect.x, fullRect.y, fullRect.width, fullRect.height, & memDCTemp, 0, 0); - - memDCTemp.SelectObject(wxNullBitmap); - memDC.SelectObject(wxNullBitmap); -#endif // wxHAS_NATIVE_OVERLAY/!wxHAS_NATIVE_OVERLAY - - return true; -} - -// Override this if you are using a virtual image (drawing your own image) -bool wxGenericDragImage::DoDrawImage(wxDC& dc, const wxPoint& pos) const -{ - if (m_bitmap.IsOk()) - { - dc.DrawBitmap(m_bitmap, pos.x, pos.y, (m_bitmap.GetMask() != 0)); - return true; - } - else if (m_icon.IsOk()) - { - dc.DrawIcon(m_icon, pos.x, pos.y); - return true; - } - else - return false; -} - -// Override this if you are using a virtual image (drawing your own image) -wxRect wxGenericDragImage::GetImageRect(const wxPoint& pos) const -{ - if (m_bitmap.IsOk()) - { - return wxRect(pos.x, pos.y, m_bitmap.GetWidth(), m_bitmap.GetHeight()); - } - else if (m_icon.IsOk()) - { - return wxRect(pos.x, pos.y, m_icon.GetWidth(), m_icon.GetHeight()); - } - else - { - return wxRect(pos.x, pos.y, 0, 0); - } -} - -#endif // wxUSE_DRAGIMAGE diff --git a/Externals/wxWidgets3/src/generic/editlbox.cpp b/Externals/wxWidgets3/src/generic/editlbox.cpp deleted file mode 100644 index 074fa5fac2..0000000000 --- a/Externals/wxWidgets3/src/generic/editlbox.cpp +++ /dev/null @@ -1,298 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/generic/editlbox.cpp -// Purpose: ListBox with editable items -// Author: Vaclav Slavik -// Copyright: (c) Vaclav Slavik -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx/wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_EDITABLELISTBOX - -// for all others, include the necessary headers (this file is usually all you -// need because it includes almost all "standard" wxWidgets headers) -#ifndef WX_PRECOMP - #include "wx/wx.h" -#endif - -#include "wx/editlbox.h" -#include "wx/sizer.h" -#include "wx/listctrl.h" -#include "wx/artprov.h" - -// ============================================================================ -// implementation -// ============================================================================ - -const char wxEditableListBoxNameStr[] = "editableListBox"; - -// list control with auto-resizable column: -class CleverListCtrl : public wxListCtrl -{ -public: - CleverListCtrl(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - long style = wxLC_ICON, - const wxValidator& validator = wxDefaultValidator, - const wxString &name = wxListCtrlNameStr) - : wxListCtrl(parent, id, pos, size, style, validator, name) - { - CreateColumns(); - } - - void CreateColumns() - { - InsertColumn(0, wxT("item")); - SizeColumns(); - } - - void SizeColumns() - { - int w = GetSize().x; -#ifdef __WXMSW__ - w -= wxSystemSettings::GetMetric(wxSYS_VSCROLL_X) + 6; -#else - w -= 2*wxSystemSettings::GetMetric(wxSYS_VSCROLL_X); -#endif - if (w < 0) w = 0; - SetColumnWidth(0, w); - } - -private: - wxDECLARE_EVENT_TABLE(); - void OnSize(wxSizeEvent& event) - { - SizeColumns(); - event.Skip(); - } -}; - -wxBEGIN_EVENT_TABLE(CleverListCtrl, wxListCtrl) - EVT_SIZE(CleverListCtrl::OnSize) -wxEND_EVENT_TABLE() - - -// ---------------------------------------------------------------------------- -// wxEditableListBox -// ---------------------------------------------------------------------------- - -wxIMPLEMENT_CLASS(wxEditableListBox, wxPanel); - -// NB: generate the IDs at runtime to avoid conflict with XRCID values, -// they could cause XRCCTRL() failures in XRC-based dialogs -const wxWindowIDRef wxID_ELB_DELETE = wxWindow::NewControlId(); -const wxWindowIDRef wxID_ELB_EDIT = wxWindow::NewControlId(); -const wxWindowIDRef wxID_ELB_NEW = wxWindow::NewControlId(); -const wxWindowIDRef wxID_ELB_UP = wxWindow::NewControlId(); -const wxWindowIDRef wxID_ELB_DOWN = wxWindow::NewControlId(); -const wxWindowIDRef wxID_ELB_LISTCTRL = wxWindow::NewControlId(); - -wxBEGIN_EVENT_TABLE(wxEditableListBox, wxPanel) - EVT_LIST_ITEM_SELECTED(wxID_ELB_LISTCTRL, wxEditableListBox::OnItemSelected) - EVT_LIST_END_LABEL_EDIT(wxID_ELB_LISTCTRL, wxEditableListBox::OnEndLabelEdit) - EVT_BUTTON(wxID_ELB_NEW, wxEditableListBox::OnNewItem) - EVT_BUTTON(wxID_ELB_UP, wxEditableListBox::OnUpItem) - EVT_BUTTON(wxID_ELB_DOWN, wxEditableListBox::OnDownItem) - EVT_BUTTON(wxID_ELB_EDIT, wxEditableListBox::OnEditItem) - EVT_BUTTON(wxID_ELB_DELETE, wxEditableListBox::OnDelItem) -wxEND_EVENT_TABLE() - -bool wxEditableListBox::Create(wxWindow *parent, wxWindowID id, - const wxString& label, - const wxPoint& pos, const wxSize& size, - long style, - const wxString& name) -{ - if (!wxPanel::Create(parent, id, pos, size, wxTAB_TRAVERSAL, name)) - return false; - - m_style = style; - - wxSizer *sizer = new wxBoxSizer(wxVERTICAL); - - wxPanel *subp = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, - wxSUNKEN_BORDER | wxTAB_TRAVERSAL); - wxSizer *subsizer = new wxBoxSizer(wxHORIZONTAL); - subsizer->Add(new wxStaticText(subp, wxID_ANY, label), 1, wxALIGN_CENTRE_VERTICAL | wxLEFT, 4); - -#ifdef __WXMSW__ - #define BTN_BORDER 4 - // FIXME - why is this needed? There's some reason why sunken border is - // ignored by sizers in wxMSW but not in wxGTK that I can't - // figure out... -#else - #define BTN_BORDER 0 -#endif - - if ( m_style & wxEL_ALLOW_EDIT ) - { - m_bEdit = new wxBitmapButton(subp, wxID_ELB_EDIT, - wxArtProvider::GetBitmap(wxART_EDIT, wxART_BUTTON)); - subsizer->Add(m_bEdit, 0, wxALIGN_CENTRE_VERTICAL | wxTOP | wxBOTTOM, BTN_BORDER); - } - - if ( m_style & wxEL_ALLOW_NEW ) - { - m_bNew = new wxBitmapButton(subp, wxID_ELB_NEW, - wxArtProvider::GetBitmap(wxART_NEW, wxART_BUTTON)); - subsizer->Add(m_bNew, 0, wxALIGN_CENTRE_VERTICAL | wxTOP | wxBOTTOM, BTN_BORDER); - } - - if ( m_style & wxEL_ALLOW_DELETE ) - { - m_bDel = new wxBitmapButton(subp, wxID_ELB_DELETE, - wxArtProvider::GetBitmap(wxART_DELETE, wxART_BUTTON)); - subsizer->Add(m_bDel, 0, wxALIGN_CENTRE_VERTICAL | wxTOP | wxBOTTOM, BTN_BORDER); - } - - if (!(m_style & wxEL_NO_REORDER)) - { - m_bUp = new wxBitmapButton(subp, wxID_ELB_UP, - wxArtProvider::GetBitmap(wxART_GO_UP, wxART_BUTTON)); - subsizer->Add(m_bUp, 0, wxALIGN_CENTRE_VERTICAL | wxTOP | wxBOTTOM, BTN_BORDER); - - m_bDown = new wxBitmapButton(subp, wxID_ELB_DOWN, - wxArtProvider::GetBitmap(wxART_GO_DOWN, wxART_BUTTON)); - subsizer->Add(m_bDown, 0, wxALIGN_CENTRE_VERTICAL | wxTOP | wxBOTTOM, BTN_BORDER); - } - -#if wxUSE_TOOLTIPS - if ( m_bEdit ) m_bEdit->SetToolTip(_("Edit item")); - if ( m_bNew ) m_bNew->SetToolTip(_("New item")); - if ( m_bDel ) m_bDel->SetToolTip(_("Delete item")); - if ( m_bUp ) m_bUp->SetToolTip(_("Move up")); - if ( m_bDown ) m_bDown->SetToolTip(_("Move down")); -#endif - - subp->SetSizer(subsizer); - subsizer->Fit(subp); - - sizer->Add(subp, 0, wxEXPAND); - - long st = wxLC_REPORT | wxLC_NO_HEADER | wxLC_SINGLE_SEL | wxSUNKEN_BORDER; - if ( style & wxEL_ALLOW_EDIT ) - st |= wxLC_EDIT_LABELS; - m_listCtrl = new CleverListCtrl(this, wxID_ELB_LISTCTRL, - wxDefaultPosition, wxDefaultSize, st); - wxArrayString empty_ar; - SetStrings(empty_ar); - - sizer->Add(m_listCtrl, 1, wxEXPAND); - - SetSizer(sizer); - Layout(); - - return true; -} - -void wxEditableListBox::SetStrings(const wxArrayString& strings) -{ - m_listCtrl->DeleteAllItems(); - size_t i; - - for (i = 0; i < strings.GetCount(); i++) - m_listCtrl->InsertItem(i, strings[i]); - - m_listCtrl->InsertItem(strings.GetCount(), wxEmptyString); - m_listCtrl->SetItemState(0, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); -} - -void wxEditableListBox::GetStrings(wxArrayString& strings) const -{ - strings.Clear(); - - for (int i = 0; i < m_listCtrl->GetItemCount()-1; i++) - strings.Add(m_listCtrl->GetItemText(i)); -} - -void wxEditableListBox::OnItemSelected(wxListEvent& event) -{ - m_selection = event.GetIndex(); - if (!(m_style & wxEL_NO_REORDER)) - { - m_bUp->Enable(m_selection != 0 && m_selection < m_listCtrl->GetItemCount()-1); - m_bDown->Enable(m_selection < m_listCtrl->GetItemCount()-2); - } - - if (m_style & wxEL_ALLOW_EDIT) - m_bEdit->Enable(m_selection < m_listCtrl->GetItemCount()-1); - if (m_style & wxEL_ALLOW_DELETE) - m_bDel->Enable(m_selection < m_listCtrl->GetItemCount()-1); -} - -void wxEditableListBox::OnNewItem(wxCommandEvent& WXUNUSED(event)) -{ - m_listCtrl->SetItemState(m_listCtrl->GetItemCount()-1, - wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); - m_listCtrl->EditLabel(m_selection); -} - -void wxEditableListBox::OnEndLabelEdit(wxListEvent& event) -{ - if ( event.GetIndex() == m_listCtrl->GetItemCount()-1 && - !event.GetText().empty() ) - { - // The user edited last (empty) line, i.e. added new entry. We have to - // add new empty line here so that adding one more line is still - // possible: - m_listCtrl->InsertItem(m_listCtrl->GetItemCount(), wxEmptyString); - - // Simulate a wxEVT_LIST_ITEM_SELECTED event for the new item, - // so that the buttons are enabled/disabled properly - wxListEvent selectionEvent(wxEVT_LIST_ITEM_SELECTED, m_listCtrl->GetId()); - selectionEvent.m_itemIndex = event.GetIndex(); - m_listCtrl->GetEventHandler()->ProcessEvent(selectionEvent); - } -} - -void wxEditableListBox::OnDelItem(wxCommandEvent& WXUNUSED(event)) -{ - m_listCtrl->DeleteItem(m_selection); - m_listCtrl->SetItemState(m_selection, - wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); -} - -void wxEditableListBox::OnEditItem(wxCommandEvent& WXUNUSED(event)) -{ - m_listCtrl->EditLabel(m_selection); -} - -void wxEditableListBox::SwapItems(long i1, long i2) -{ - // swap the text - wxString t1 = m_listCtrl->GetItemText(i1); - wxString t2 = m_listCtrl->GetItemText(i2); - m_listCtrl->SetItemText(i1, t2); - m_listCtrl->SetItemText(i2, t1); - - // swap the item data - wxUIntPtr d1 = m_listCtrl->GetItemData(i1); - wxUIntPtr d2 = m_listCtrl->GetItemData(i2); - m_listCtrl->SetItemPtrData(i1, d2); - m_listCtrl->SetItemPtrData(i2, d1); -} - - -void wxEditableListBox::OnUpItem(wxCommandEvent& WXUNUSED(event)) -{ - SwapItems(m_selection - 1, m_selection); - m_listCtrl->SetItemState(m_selection - 1, - wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); -} - -void wxEditableListBox::OnDownItem(wxCommandEvent& WXUNUSED(event)) -{ - SwapItems(m_selection + 1, m_selection); - m_listCtrl->SetItemState(m_selection + 1, - wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); -} - -#endif // wxUSE_EDITABLELISTBOX diff --git a/Externals/wxWidgets3/src/generic/fdrepdlg.cpp b/Externals/wxWidgets3/src/generic/fdrepdlg.cpp deleted file mode 100644 index c1eed43257..0000000000 --- a/Externals/wxWidgets3/src/generic/fdrepdlg.cpp +++ /dev/null @@ -1,292 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/generic/fdrepdlg.cpp -// Purpose: Find/Replace dialogs -// Author: Markus Greither and Vadim Zeitlin -// Modified by: -// Created: 05/25/01 -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_FINDREPLDLG - -#ifndef WX_PRECOMP - #include "wx/intl.h" - #include "wx/log.h" - - #include "wx/sizer.h" - - #include "wx/button.h" - #include "wx/checkbox.h" - #include "wx/radiobox.h" - #include "wx/stattext.h" - #include "wx/textctrl.h" - #include "wx/settings.h" -#endif - -#include "wx/fdrepdlg.h" - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -// ============================================================================ -// implementation -// ============================================================================ - -wxIMPLEMENT_DYNAMIC_CLASS(wxGenericFindReplaceDialog, wxDialog); - -wxBEGIN_EVENT_TABLE(wxGenericFindReplaceDialog, wxDialog) - EVT_BUTTON(wxID_FIND, wxGenericFindReplaceDialog::OnFind) - EVT_BUTTON(wxID_REPLACE, wxGenericFindReplaceDialog::OnReplace) - EVT_BUTTON(wxID_REPLACE_ALL, wxGenericFindReplaceDialog::OnReplaceAll) - EVT_BUTTON(wxID_CANCEL, wxGenericFindReplaceDialog::OnCancel) - - EVT_UPDATE_UI(wxID_FIND, wxGenericFindReplaceDialog::OnUpdateFindUI) - EVT_UPDATE_UI(wxID_REPLACE, wxGenericFindReplaceDialog::OnUpdateFindUI) - EVT_UPDATE_UI(wxID_REPLACE_ALL, wxGenericFindReplaceDialog::OnUpdateFindUI) - - EVT_CLOSE(wxGenericFindReplaceDialog::OnCloseWindow) -wxEND_EVENT_TABLE() - -// ---------------------------------------------------------------------------- -// wxGenericFindReplaceDialog -// ---------------------------------------------------------------------------- - -void wxGenericFindReplaceDialog::Init() -{ - m_FindReplaceData = NULL; - - m_chkWord = - m_chkCase = NULL; - - m_radioDir = NULL; - - m_textFind = - m_textRepl = NULL; -} - -bool wxGenericFindReplaceDialog::Create(wxWindow *parent, - wxFindReplaceData *data, - const wxString& title, - int style) -{ - parent = GetParentForModalDialog(parent, style); - - if ( !wxDialog::Create(parent, wxID_ANY, title, - wxDefaultPosition, wxDefaultSize, - wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER - | style) ) - { - return false; - } - - SetData(data); - - wxCHECK_MSG( m_FindReplaceData, false, - wxT("can't create dialog without data") ); - - bool isPda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA); - - wxBoxSizer *leftsizer = new wxBoxSizer( wxVERTICAL ); - - // 3 columns because there is a spacer in the middle - wxFlexGridSizer *sizer2Col = new wxFlexGridSizer(3); - sizer2Col->AddGrowableCol(2); - - sizer2Col->Add(new wxStaticText(this, wxID_ANY, _("Search for:"), - wxDefaultPosition, wxSize(80, wxDefaultCoord)), - 0, - wxALIGN_CENTRE_VERTICAL | wxALIGN_RIGHT); - - sizer2Col->Add(10, 0); - - m_textFind = new wxTextCtrl(this, wxID_ANY, m_FindReplaceData->GetFindString()); - sizer2Col->Add(m_textFind, 1, wxALIGN_CENTRE_VERTICAL | wxEXPAND); - - if ( style & wxFR_REPLACEDIALOG ) - { - sizer2Col->Add(new wxStaticText(this, wxID_ANY, _("Replace with:"), - wxDefaultPosition, wxSize(80, wxDefaultCoord)), - 0, - wxALIGN_CENTRE_VERTICAL | - wxALIGN_RIGHT | wxTOP, 5); - - sizer2Col->Add(isPda ? 2 : 10, 0); - - m_textRepl = new wxTextCtrl(this, wxID_ANY, - m_FindReplaceData->GetReplaceString()); - sizer2Col->Add(m_textRepl, 1, - wxALIGN_CENTRE_VERTICAL | wxEXPAND | wxTOP, 5); - } - - leftsizer->Add(sizer2Col, 0, wxEXPAND | wxALL, 5); - - wxBoxSizer *optsizer = new wxBoxSizer( isPda ? wxVERTICAL : wxHORIZONTAL ); - - wxBoxSizer *chksizer = new wxBoxSizer( wxVERTICAL); - - m_chkWord = new wxCheckBox(this, wxID_ANY, _("Whole word")); - chksizer->Add(m_chkWord, 0, wxALL, 3); - - m_chkCase = new wxCheckBox(this, wxID_ANY, _("Match case")); - chksizer->Add(m_chkCase, 0, wxALL, 3); - - optsizer->Add(chksizer, 0, wxALL, 10); - - static const wxString searchDirections[] = {_("Up"), _("Down")}; - int majorDimension = 0; - int rbStyle ; - if (isPda) - rbStyle = wxRA_SPECIFY_ROWS; - else - rbStyle = wxRA_SPECIFY_COLS; - - m_radioDir = new wxRadioBox(this, wxID_ANY, _("Search direction"), - wxDefaultPosition, wxDefaultSize, - WXSIZEOF(searchDirections), searchDirections, - majorDimension, rbStyle); - - optsizer->Add(m_radioDir, 0, wxALL, isPda ? 5 : 10); - - leftsizer->Add(optsizer); - - wxBoxSizer *bttnsizer = new wxBoxSizer(wxVERTICAL); - - wxButton* btn = new wxButton(this, wxID_FIND); - btn->SetDefault(); - bttnsizer->Add(btn, 0, wxALL, 3); - - bttnsizer->Add(new wxButton(this, wxID_CANCEL), 0, wxALL, 3); - - if ( style & wxFR_REPLACEDIALOG ) - { - bttnsizer->Add(new wxButton(this, wxID_REPLACE, _("&Replace")), - 0, wxALL, 3); - - bttnsizer->Add(new wxButton(this, wxID_REPLACE_ALL, _("Replace &all")), - 0, wxALL, 3); - } - - wxBoxSizer *topsizer = new wxBoxSizer( wxHORIZONTAL ); - - topsizer->Add(leftsizer, 1, wxALL, isPda ? 0 : 5); - topsizer->Add(bttnsizer, 0, wxALL, isPda ? 0 : 5); - - int flags = m_FindReplaceData->GetFlags(); - - if ( flags & wxFR_MATCHCASE ) - m_chkCase->SetValue(true); - - if ( flags & wxFR_WHOLEWORD ) - m_chkWord->SetValue(true); - - m_radioDir->SetSelection( flags & wxFR_DOWN ); - - if ( style & wxFR_NOMATCHCASE ) - m_chkCase->Enable(false); - - if ( style & wxFR_NOWHOLEWORD ) - m_chkWord->Enable(false); - - if ( style & wxFR_NOUPDOWN) - m_radioDir->Enable(false); - - SetAutoLayout( true ); - SetSizer( topsizer ); - - topsizer->SetSizeHints( this ); - topsizer->Fit( this ); - - Centre( wxBOTH ); - - m_textFind->SetFocus(); - - return true; -} - -// ---------------------------------------------------------------------------- -// send the notification event -// ---------------------------------------------------------------------------- - -void wxGenericFindReplaceDialog::SendEvent(const wxEventType& evtType) -{ - wxFindDialogEvent event(evtType, GetId()); - event.SetEventObject(this); - event.SetFindString(m_textFind->GetValue()); - if ( HasFlag(wxFR_REPLACEDIALOG) ) - { - event.SetReplaceString(m_textRepl->GetValue()); - } - - int flags = 0; - - if ( m_chkCase->GetValue() ) - flags |= wxFR_MATCHCASE; - - if ( m_chkWord->GetValue() ) - flags |= wxFR_WHOLEWORD; - - if ( !m_radioDir || m_radioDir->GetSelection() == 1 ) - { - flags |= wxFR_DOWN; - } - - event.SetFlags(flags); - - wxFindReplaceDialogBase::Send(event); -} - -// ---------------------------------------------------------------------------- -// event handlers -// ---------------------------------------------------------------------------- - -void wxGenericFindReplaceDialog::OnFind(wxCommandEvent& WXUNUSED(event)) -{ - SendEvent(wxEVT_FIND_NEXT); -} - -void wxGenericFindReplaceDialog::OnReplace(wxCommandEvent& WXUNUSED(event)) -{ - SendEvent(wxEVT_FIND_REPLACE); -} - -void wxGenericFindReplaceDialog::OnReplaceAll(wxCommandEvent& WXUNUSED(event)) -{ - SendEvent(wxEVT_FIND_REPLACE_ALL); -} - -void wxGenericFindReplaceDialog::OnCancel(wxCommandEvent& WXUNUSED(event)) -{ - SendEvent(wxEVT_FIND_CLOSE); - - Show(false); -} - -void wxGenericFindReplaceDialog::OnUpdateFindUI(wxUpdateUIEvent &event) -{ - // we can't search for empty strings - event.Enable( !m_textFind->GetValue().empty() ); -} - -void wxGenericFindReplaceDialog::OnCloseWindow(wxCloseEvent &) -{ - SendEvent(wxEVT_FIND_CLOSE); -} - -#endif // wxUSE_FINDREPLDLG diff --git a/Externals/wxWidgets3/src/generic/filectrlg.cpp b/Externals/wxWidgets3/src/generic/filectrlg.cpp deleted file mode 100644 index 4c030d2b14..0000000000 --- a/Externals/wxWidgets3/src/generic/filectrlg.cpp +++ /dev/null @@ -1,1449 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/generic/filectrlg.cpp -// Purpose: wxGenericFileCtrl Implementation -// Author: Diaa M. Sami -// Created: 2007-07-07 -// Copyright: (c) Diaa M. Sami -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ -#pragma hdrstop -#endif - -#if wxUSE_FILECTRL - -#include "wx/generic/filectrlg.h" - -#ifndef WX_PRECOMP - #include "wx/settings.h" - #include "wx/sizer.h" - #include "wx/stattext.h" - #include "wx/checkbox.h" - #include "wx/msgdlg.h" - #include "wx/log.h" - #include "wx/filedlg.h" -#endif - -#include "wx/clntdata.h" -#include "wx/file.h" // for wxS_IXXX constants only -#include "wx/generic/dirctrlg.h" // for wxFileIconsTable -#include "wx/dir.h" -#include "wx/tokenzr.h" -#include "wx/imaglist.h" - -#ifdef __WINDOWS__ - #include "wx/msw/wrapwin.h" -#endif - -#if defined(__WINDOWS__) -#define IsTopMostDir(dir) (dir.empty()) -#else -#define IsTopMostDir(dir) (dir == wxT("/")) -#endif - - -// ---------------------------------------------------------------------------- -// private functions -// ---------------------------------------------------------------------------- - -static -int wxCALLBACK wxFileDataNameCompare( wxIntPtr data1, wxIntPtr data2, wxIntPtr sortOrder) -{ - wxFileData *fd1 = (wxFileData *)wxUIntToPtr(data1); - wxFileData *fd2 = (wxFileData *)wxUIntToPtr(data2); - - if (fd1->GetFileName() == wxT("..")) - return -sortOrder; - if (fd2->GetFileName() == wxT("..")) - return sortOrder; - if (fd1->IsDir() && !fd2->IsDir()) - return -sortOrder; - if (fd2->IsDir() && !fd1->IsDir()) - return sortOrder; - - return sortOrder*wxStrcmp( fd1->GetFileName(), fd2->GetFileName() ); -} - -static -int wxCALLBACK wxFileDataSizeCompare(wxIntPtr data1, wxIntPtr data2, wxIntPtr sortOrder) -{ - wxFileData *fd1 = (wxFileData *)wxUIntToPtr(data1); - wxFileData *fd2 = (wxFileData *)wxUIntToPtr(data2); - - if (fd1->GetFileName() == wxT("..")) - return -sortOrder; - if (fd2->GetFileName() == wxT("..")) - return sortOrder; - if (fd1->IsDir() && !fd2->IsDir()) - return -sortOrder; - if (fd2->IsDir() && !fd1->IsDir()) - return sortOrder; - if (fd1->IsLink() && !fd2->IsLink()) - return -sortOrder; - if (fd2->IsLink() && !fd1->IsLink()) - return sortOrder; - - return fd1->GetSize() > fd2->GetSize() ? sortOrder : -sortOrder; -} - -static -int wxCALLBACK wxFileDataTypeCompare(wxIntPtr data1, wxIntPtr data2, wxIntPtr sortOrder) -{ - wxFileData *fd1 = (wxFileData *)wxUIntToPtr(data1); - wxFileData *fd2 = (wxFileData *)wxUIntToPtr(data2); - - if (fd1->GetFileName() == wxT("..")) - return -sortOrder; - if (fd2->GetFileName() == wxT("..")) - return sortOrder; - if (fd1->IsDir() && !fd2->IsDir()) - return -sortOrder; - if (fd2->IsDir() && !fd1->IsDir()) - return sortOrder; - if (fd1->IsLink() && !fd2->IsLink()) - return -sortOrder; - if (fd2->IsLink() && !fd1->IsLink()) - return sortOrder; - - return sortOrder*wxStrcmp( fd1->GetFileType(), fd2->GetFileType() ); -} - -static -int wxCALLBACK wxFileDataTimeCompare(wxIntPtr data1, wxIntPtr data2, wxIntPtr sortOrder) -{ - wxFileData *fd1 = (wxFileData *)wxUIntToPtr(data1); - wxFileData *fd2 = (wxFileData *)wxUIntToPtr(data2); - - if (fd1->GetFileName() == wxT("..")) - return -sortOrder; - if (fd2->GetFileName() == wxT("..")) - return sortOrder; - if (fd1->IsDir() && !fd2->IsDir()) - return -sortOrder; - if (fd2->IsDir() && !fd1->IsDir()) - return sortOrder; - - return fd1->GetDateTime().IsLaterThan(fd2->GetDateTime()) ? sortOrder : -sortOrder; -} - -// defined in src/generic/dirctrlg.cpp -extern size_t wxGetAvailableDrives(wxArrayString &paths, wxArrayString &names, wxArrayInt &icon_ids); - -//----------------------------------------------------------------------------- -// wxFileData -//----------------------------------------------------------------------------- - -wxFileData::wxFileData( const wxString &filePath, const wxString &fileName, fileType type, int image_id ) -{ - Init(); - m_fileName = fileName; - m_filePath = filePath; - m_type = type; - m_image = image_id; - - ReadData(); -} - -void wxFileData::Init() -{ - m_size = 0; - m_type = wxFileData::is_file; - m_image = wxFileIconsTable::file; -} - -void wxFileData::Copy( const wxFileData& fileData ) -{ - m_fileName = fileData.GetFileName(); - m_filePath = fileData.GetFilePath(); - m_size = fileData.GetSize(); - m_dateTime = fileData.GetDateTime(); - m_permissions = fileData.GetPermissions(); - m_type = fileData.GetType(); - m_image = fileData.GetImageId(); -} - -void wxFileData::ReadData() -{ - if (IsDrive()) - { - m_size = 0; - return; - } - -#if defined(__WINDOWS__) - // c:\.. is a drive don't stat it - if ((m_fileName == wxT("..")) && (m_filePath.length() <= 5)) - { - m_type = is_drive; - m_size = 0; - return; - } -#endif // __WINDOWS__ - - // OTHER PLATFORMS - - wxStructStat buff; - -#if defined(__UNIX__) && !defined(__VMS) - const bool hasStat = lstat( m_filePath.fn_str(), &buff ) == 0; - if ( hasStat ) - m_type |= S_ISLNK(buff.st_mode) ? is_link : 0; -#else // no lstat() - const bool hasStat = wxStat( m_filePath, &buff ) == 0; -#endif - - if ( hasStat ) - { - m_type |= (buff.st_mode & S_IFDIR) != 0 ? is_dir : 0; - m_type |= (buff.st_mode & wxS_IXUSR) != 0 ? is_exe : 0; - - m_size = buff.st_size; - - m_dateTime = buff.st_mtime; - } - -#if defined(__UNIX__) - if ( hasStat ) - { - m_permissions.Printf(wxT("%c%c%c%c%c%c%c%c%c"), - buff.st_mode & wxS_IRUSR ? wxT('r') : wxT('-'), - buff.st_mode & wxS_IWUSR ? wxT('w') : wxT('-'), - buff.st_mode & wxS_IXUSR ? wxT('x') : wxT('-'), - buff.st_mode & wxS_IRGRP ? wxT('r') : wxT('-'), - buff.st_mode & wxS_IWGRP ? wxT('w') : wxT('-'), - buff.st_mode & wxS_IXGRP ? wxT('x') : wxT('-'), - buff.st_mode & wxS_IROTH ? wxT('r') : wxT('-'), - buff.st_mode & wxS_IWOTH ? wxT('w') : wxT('-'), - buff.st_mode & wxS_IXOTH ? wxT('x') : wxT('-')); - } -#elif defined(__WIN32__) - DWORD attribs = ::GetFileAttributes(m_filePath.c_str()); - if (attribs != (DWORD)-1) - { - m_permissions.Printf(wxT("%c%c%c%c"), - attribs & FILE_ATTRIBUTE_ARCHIVE ? wxT('A') : wxT(' '), - attribs & FILE_ATTRIBUTE_READONLY ? wxT('R') : wxT(' '), - attribs & FILE_ATTRIBUTE_HIDDEN ? wxT('H') : wxT(' '), - attribs & FILE_ATTRIBUTE_SYSTEM ? wxT('S') : wxT(' ')); - } -#endif - - // try to get a better icon - if (m_image == wxFileIconsTable::file) - { - if (m_fileName.Find(wxT('.'), true) != wxNOT_FOUND) - { - m_image = wxTheFileIconsTable->GetIconID( m_fileName.AfterLast(wxT('.'))); - } else if (IsExe()) - { - m_image = wxFileIconsTable::executable; - } - } -} - -wxString wxFileData::GetFileType() const -{ - if (IsDir()) - return _(""); - else if (IsLink()) - return _(""); - else if (IsDrive()) - return _(""); - else if (m_fileName.Find(wxT('.'), true) != wxNOT_FOUND) - return m_fileName.AfterLast(wxT('.')); - - return wxEmptyString; -} - -wxString wxFileData::GetModificationTime() const -{ - // want time as 01:02 so they line up nicely, no %r in WIN32 - return m_dateTime.FormatDate() + wxT(" ") + m_dateTime.Format(wxT("%I:%M:%S %p")); -} - -wxString wxFileData::GetHint() const -{ - wxString s = m_filePath; - s += wxT(" "); - - if (IsDir()) - s += _(""); - else if (IsLink()) - s += _(""); - else if (IsDrive()) - s += _(""); - else // plain file - s += wxString::Format(wxPLURAL("%ld byte", "%ld bytes", m_size), - wxLongLong(m_size).ToString().c_str()); - - s += wxT(' '); - - if ( !IsDrive() ) - { - s << GetModificationTime() - << wxT(" ") - << m_permissions; - } - - return s; -} - -wxString wxFileData::GetEntry( fileListFieldType num ) const -{ - wxString s; - switch ( num ) - { - case FileList_Name: - s = m_fileName; - break; - - case FileList_Size: - if (!IsDir() && !IsLink() && !IsDrive()) - s = wxLongLong(m_size).ToString(); - break; - - case FileList_Type: - s = GetFileType(); - break; - - case FileList_Time: - if (!IsDrive()) - s = GetModificationTime(); - break; - -#if defined(__UNIX__) || defined(__WIN32__) - case FileList_Perm: - s = m_permissions; - break; -#endif // defined(__UNIX__) || defined(__WIN32__) - - default: - wxFAIL_MSG( wxT("unexpected field in wxFileData::GetEntry()") ); - } - - return s; -} - -void wxFileData::SetNewName( const wxString &filePath, const wxString &fileName ) -{ - m_fileName = fileName; - m_filePath = filePath; -} - -void wxFileData::MakeItem( wxListItem &item ) -{ - item.m_text = m_fileName; - item.ClearAttributes(); - if (IsExe()) - item.SetTextColour(*wxRED); - if (IsDir()) - item.SetTextColour(*wxBLUE); - - item.m_image = m_image; - - if (IsLink()) - { - wxColour dg = wxTheColourDatabase->Find( wxT("MEDIUM GREY") ); - if ( dg.IsOk() ) - item.SetTextColour(dg); - } - item.m_data = wxPtrToUInt(this); -} - -//----------------------------------------------------------------------------- -// wxFileListCtrl -//----------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxFileListCtrl,wxListCtrl); - -wxBEGIN_EVENT_TABLE(wxFileListCtrl,wxListCtrl) - EVT_LIST_DELETE_ITEM(wxID_ANY, wxFileListCtrl::OnListDeleteItem) - EVT_LIST_DELETE_ALL_ITEMS(wxID_ANY, wxFileListCtrl::OnListDeleteAllItems) - EVT_LIST_END_LABEL_EDIT(wxID_ANY, wxFileListCtrl::OnListEndLabelEdit) - EVT_LIST_COL_CLICK(wxID_ANY, wxFileListCtrl::OnListColClick) -wxEND_EVENT_TABLE() - - -wxFileListCtrl::wxFileListCtrl() -{ - m_showHidden = false; - m_sort_forward = true; - m_sort_field = wxFileData::FileList_Name; -} - -wxFileListCtrl::wxFileListCtrl(wxWindow *win, - wxWindowID id, - const wxString& wild, - bool showHidden, - const wxPoint& pos, - const wxSize& size, - long style, - const wxValidator &validator, - const wxString &name) - : wxListCtrl(win, id, pos, size, style, validator, name), - m_wild(wild) -{ - wxImageList *imageList = wxTheFileIconsTable->GetSmallImageList(); - - SetImageList( imageList, wxIMAGE_LIST_SMALL ); - - m_showHidden = showHidden; - - m_sort_forward = true; - m_sort_field = wxFileData::FileList_Name; - - m_dirName = wxT("*"); - - if (style & wxLC_REPORT) - ChangeToReportMode(); -} - -void wxFileListCtrl::ChangeToListMode() -{ - ClearAll(); - SetSingleStyle( wxLC_LIST ); - UpdateFiles(); -} - -void wxFileListCtrl::ChangeToReportMode() -{ - ClearAll(); - SetSingleStyle( wxLC_REPORT ); - - // do this since WIN32 does mm/dd/yy UNIX does mm/dd/yyyy - // don't hardcode since mm/dd is dd/mm elsewhere - int w, h; - wxDateTime dt(22, wxDateTime::Dec, 2002, 22, 22, 22); - wxString txt = dt.FormatDate() + wxT("22") + dt.Format(wxT("%I:%M:%S %p")); - GetTextExtent(txt, &w, &h); - - InsertColumn( 0, _("Name"), wxLIST_FORMAT_LEFT, w ); - InsertColumn( 1, _("Size"), wxLIST_FORMAT_RIGHT, w/2 ); - InsertColumn( 2, _("Type"), wxLIST_FORMAT_LEFT, w/2 ); - InsertColumn( 3, _("Modified"), wxLIST_FORMAT_LEFT, w ); -#if defined(__UNIX__) - GetTextExtent(wxT("Permissions 2"), &w, &h); - InsertColumn( 4, _("Permissions"), wxLIST_FORMAT_LEFT, w ); -#elif defined(__WIN32__) - GetTextExtent(wxT("Attributes 2"), &w, &h); - InsertColumn( 4, _("Attributes"), wxLIST_FORMAT_LEFT, w ); -#endif - - UpdateFiles(); -} - -void wxFileListCtrl::ChangeToSmallIconMode() -{ - ClearAll(); - SetSingleStyle( wxLC_SMALL_ICON ); - UpdateFiles(); -} - -void wxFileListCtrl::ShowHidden( bool show ) -{ - m_showHidden = show; - UpdateFiles(); -} - -long wxFileListCtrl::Add( wxFileData *fd, wxListItem &item ) -{ - long ret = -1; - item.m_mask = wxLIST_MASK_TEXT + wxLIST_MASK_DATA + wxLIST_MASK_IMAGE; - fd->MakeItem( item ); - long my_style = GetWindowStyleFlag(); - if (my_style & wxLC_REPORT) - { - ret = InsertItem( item ); - for (int i = 1; i < wxFileData::FileList_Max; i++) - SetItem( item.m_itemId, i, fd->GetEntry((wxFileData::fileListFieldType)i) ); - } - else if ((my_style & wxLC_LIST) || (my_style & wxLC_SMALL_ICON)) - { - ret = InsertItem( item ); - } - return ret; -} - -void wxFileListCtrl::UpdateItem(const wxListItem &item) -{ - wxFileData *fd = (wxFileData*)GetItemData(item); - wxCHECK_RET(fd, wxT("invalid filedata")); - - fd->ReadData(); - - SetItemText(item, fd->GetFileName()); - SetItemImage(item, fd->GetImageId()); - - if (GetWindowStyleFlag() & wxLC_REPORT) - { - for (int i = 1; i < wxFileData::FileList_Max; i++) - SetItem( item.m_itemId, i, fd->GetEntry((wxFileData::fileListFieldType)i) ); - } -} - -void wxFileListCtrl::UpdateFiles() -{ - // don't do anything before ShowModal() call which sets m_dirName - if ( m_dirName == wxT("*") ) - return; - - wxBusyCursor bcur; // this may take a while... - - DeleteAllItems(); - - wxListItem item; - item.m_itemId = 0; - item.m_col = 0; - -#if defined(__WINDOWS__) || defined(__WXMAC__) - if ( IsTopMostDir(m_dirName) ) - { - wxArrayString names, paths; - wxArrayInt icons; - const size_t count = wxGetAvailableDrives(paths, names, icons); - - for ( size_t n = 0; n < count; n++ ) - { - // use paths[n] as the drive name too as our HandleAction() can't - // deal with the drive names (of the form "System (C:)") currently - // as it mistakenly treats them as file names - // - // it would be preferable to show names, and not paths, in the - // dialog just as the native dialog does but for this we must: - // a) store the item type as item data and modify HandleAction() - // to use it instead of wxDirExists() to check whether the item - // is a directory - // b) store the drives by their drive letters and not their - // descriptions as otherwise it's pretty confusing to the user - wxFileData *fd = new wxFileData(paths[n], paths[n], - wxFileData::is_drive, icons[n]); - if (Add(fd, item) != -1) - item.m_itemId++; - else - delete fd; - } - } - else -#endif // defined(__WINDOWS__) || defined(__WXMAC__) - { - // Real directory... - if ( !IsTopMostDir(m_dirName) && !m_dirName.empty() ) - { - wxString p(wxPathOnly(m_dirName)); -#if defined(__UNIX__) - if (p.empty()) p = wxT("/"); -#endif // __UNIX__ - wxFileData *fd = new wxFileData(p, wxT(".."), wxFileData::is_dir, wxFileIconsTable::folder); - if (Add(fd, item) != -1) - item.m_itemId++; - else - delete fd; - } - - wxString dirname(m_dirName); -#if defined(__WINDOWS__) - if (dirname.length() == 2 && dirname[1u] == wxT(':')) - dirname << wxT('\\'); -#endif // defined(__WINDOWS__) - - if (dirname.empty()) - dirname = wxFILE_SEP_PATH; - - wxLogNull logNull; - wxDir dir(dirname); - - if ( dir.IsOpened() ) - { - wxString dirPrefix(dirname); - if (dirPrefix.Last() != wxFILE_SEP_PATH) - dirPrefix += wxFILE_SEP_PATH; - - int hiddenFlag = m_showHidden ? wxDIR_HIDDEN : 0; - - bool cont; - wxString f; - - // Get the directories first (not matched against wildcards): - cont = dir.GetFirst(&f, wxEmptyString, wxDIR_DIRS | hiddenFlag); - while (cont) - { - wxFileData *fd = new wxFileData(dirPrefix + f, f, wxFileData::is_dir, wxFileIconsTable::folder); - if (Add(fd, item) != -1) - item.m_itemId++; - else - delete fd; - - cont = dir.GetNext(&f); - } - - // Tokenize the wildcard string, so we can handle more than 1 - // search pattern in a wildcard. - wxStringTokenizer tokenWild(m_wild, wxT(";")); - while ( tokenWild.HasMoreTokens() ) - { - cont = dir.GetFirst(&f, tokenWild.GetNextToken(), - wxDIR_FILES | hiddenFlag); - while (cont) - { - wxFileData *fd = new wxFileData(dirPrefix + f, f, wxFileData::is_file, wxFileIconsTable::file); - if (Add(fd, item) != -1) - item.m_itemId++; - else - delete fd; - - cont = dir.GetNext(&f); - } - } - } - } - - SortItems(m_sort_field, m_sort_forward); -} - -void wxFileListCtrl::SetWild( const wxString &wild ) -{ - if (wild.Find(wxT('|')) != wxNOT_FOUND) - return; - - m_wild = wild; - UpdateFiles(); -} - -void wxFileListCtrl::MakeDir() -{ - wxString new_name( _("NewName") ); - wxString path( m_dirName ); - path += wxFILE_SEP_PATH; - path += new_name; - if (wxFileExists(path)) - { - // try NewName0, NewName1 etc. - int i = 0; - do { - new_name = _("NewName"); - wxString num; - num.Printf( wxT("%d"), i ); - new_name += num; - - path = m_dirName; - path += wxFILE_SEP_PATH; - path += new_name; - i++; - } while (wxFileExists(path)); - } - - wxLogNull log; - if (!wxMkdir(path)) - { - wxMessageDialog dialog(this, _("Operation not permitted."), _("Error"), wxOK | wxICON_ERROR ); - dialog.ShowModal(); - return; - } - - wxFileData *fd = new wxFileData( path, new_name, wxFileData::is_dir, wxFileIconsTable::folder ); - wxListItem item; - item.m_itemId = 0; - item.m_col = 0; - long itemid = Add( fd, item ); - - if (itemid != -1) - { - SortItems(m_sort_field, m_sort_forward); - itemid = FindItem( 0, wxPtrToUInt(fd) ); - EnsureVisible( itemid ); - EditLabel( itemid ); - } - else - delete fd; -} - -void wxFileListCtrl::GoToParentDir() -{ - if (!IsTopMostDir(m_dirName)) - { - size_t len = m_dirName.length(); - if (wxEndsWithPathSeparator(m_dirName)) - m_dirName.Remove( len-1, 1 ); - wxString fname( wxFileNameFromPath(m_dirName) ); - m_dirName = wxPathOnly( m_dirName ); -#if defined(__WINDOWS__) - if (!m_dirName.empty()) - { - if (m_dirName.Last() == wxT('.')) - m_dirName = wxEmptyString; - } -#elif defined(__UNIX__) - if (m_dirName.empty()) - m_dirName = wxT("/"); -#endif - UpdateFiles(); - long id = FindItem( 0, fname ); - if (id != wxNOT_FOUND) - { - SetItemState( id, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED ); - EnsureVisible( id ); - } - } -} - -void wxFileListCtrl::GoToHomeDir() -{ - wxString s = wxGetUserHome( wxString() ); - GoToDir(s); -} - -void wxFileListCtrl::GoToDir( const wxString &dir ) -{ - if (!wxDirExists(dir)) return; - - m_dirName = dir; - UpdateFiles(); - - SetItemState( 0, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED ); - - EnsureVisible( 0 ); -} - -void wxFileListCtrl::FreeItemData(wxListItem& item) -{ - if ( item.m_data ) - { - wxFileData *fd = (wxFileData*)item.m_data; - delete fd; - - item.m_data = 0; - } -} - -void wxFileListCtrl::OnListDeleteItem( wxListEvent &event ) -{ - FreeItemData(event.m_item); -} - -void wxFileListCtrl::OnListDeleteAllItems( wxListEvent & WXUNUSED(event) ) -{ - FreeAllItemsData(); -} - -void wxFileListCtrl::FreeAllItemsData() -{ - wxListItem item; - item.m_mask = wxLIST_MASK_DATA; - - item.m_itemId = GetNextItem( -1, wxLIST_NEXT_ALL ); - while ( item.m_itemId != -1 ) - { - GetItem( item ); - FreeItemData(item); - item.m_itemId = GetNextItem( item.m_itemId, wxLIST_NEXT_ALL ); - } -} - -void wxFileListCtrl::OnListEndLabelEdit( wxListEvent &event ) -{ - wxFileData *fd = (wxFileData*)event.m_item.m_data; - wxASSERT( fd ); - - if ((event.GetLabel().empty()) || - (event.GetLabel() == wxT(".")) || - (event.GetLabel() == wxT("..")) || - (event.GetLabel().First( wxFILE_SEP_PATH ) != wxNOT_FOUND)) - { - wxMessageDialog dialog(this, _("Illegal directory name."), _("Error"), wxOK | wxICON_ERROR ); - dialog.ShowModal(); - event.Veto(); - return; - } - - wxString new_name( wxPathOnly( fd->GetFilePath() ) ); - new_name += wxFILE_SEP_PATH; - new_name += event.GetLabel(); - - wxLogNull log; - - if (wxFileExists(new_name)) - { - wxMessageDialog dialog(this, _("File name exists already."), _("Error"), wxOK | wxICON_ERROR ); - dialog.ShowModal(); - event.Veto(); - } - - if (wxRenameFile(fd->GetFilePath(),new_name)) - { - fd->SetNewName( new_name, event.GetLabel() ); - - SetItemState( event.GetItem(), wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED ); - - UpdateItem( event.GetItem() ); - EnsureVisible( event.GetItem() ); - } - else - { - wxMessageDialog dialog(this, _("Operation not permitted."), _("Error"), wxOK | wxICON_ERROR ); - dialog.ShowModal(); - event.Veto(); - } -} - -void wxFileListCtrl::OnListColClick( wxListEvent &event ) -{ - int col = event.GetColumn(); - - switch (col) - { - case wxFileData::FileList_Name : - case wxFileData::FileList_Size : - case wxFileData::FileList_Type : - case wxFileData::FileList_Time : break; - default : return; - } - - if ((wxFileData::fileListFieldType)col == m_sort_field) - m_sort_forward = !m_sort_forward; - else - m_sort_field = (wxFileData::fileListFieldType)col; - - SortItems(m_sort_field, m_sort_forward); -} - -void wxFileListCtrl::SortItems(wxFileData::fileListFieldType field, bool forward) -{ - m_sort_field = field; - m_sort_forward = forward; - const long sort_dir = forward ? 1 : -1; - - switch (m_sort_field) - { - case wxFileData::FileList_Size : - wxListCtrl::SortItems(wxFileDataSizeCompare, sort_dir); - break; - - case wxFileData::FileList_Type : - wxListCtrl::SortItems(wxFileDataTypeCompare, sort_dir); - break; - - case wxFileData::FileList_Time : - wxListCtrl::SortItems(wxFileDataTimeCompare, sort_dir); - break; - - case wxFileData::FileList_Name : - default : - wxListCtrl::SortItems(wxFileDataNameCompare, sort_dir); - break; - } -} - -wxFileListCtrl::~wxFileListCtrl() -{ - // Normally the data are freed via an EVT_LIST_DELETE_ALL_ITEMS event and - // wxFileListCtrl::OnListDeleteAllItems. But if the event is generated after - // the destruction of the wxFileListCtrl we need to free any data here: - FreeAllItemsData(); -} - -#define ID_CHOICE (wxID_FILECTRL + 1) -#define ID_TEXT (wxID_FILECTRL + 2) -#define ID_FILELIST_CTRL (wxID_FILECTRL + 3) -#define ID_CHECK (wxID_FILECTRL + 4) - -/////////////////////////////////////////////////////////////////////////////// -// wxGenericFileCtrl implementation -/////////////////////////////////////////////////////////////////////////////// - -wxIMPLEMENT_DYNAMIC_CLASS( wxGenericFileCtrl, wxNavigationEnabled ); - -wxBEGIN_EVENT_TABLE( wxGenericFileCtrl, wxNavigationEnabled ) - EVT_LIST_ITEM_SELECTED( ID_FILELIST_CTRL, wxGenericFileCtrl::OnSelected ) - EVT_LIST_ITEM_ACTIVATED( ID_FILELIST_CTRL, wxGenericFileCtrl::OnActivated ) - EVT_CHOICE( ID_CHOICE, wxGenericFileCtrl::OnChoiceFilter ) - EVT_TEXT_ENTER( ID_TEXT, wxGenericFileCtrl::OnTextEnter ) - EVT_TEXT( ID_TEXT, wxGenericFileCtrl::OnTextChange ) - EVT_CHECKBOX( ID_CHECK, wxGenericFileCtrl::OnCheck ) -wxEND_EVENT_TABLE() - -bool wxGenericFileCtrl::Create( wxWindow *parent, - wxWindowID id, - const wxString& defaultDirectory, - const wxString& defaultFileName, - const wxString& wildCard, - long style, - const wxPoint& pos, - const wxSize& size, - const wxString& name ) -{ - this->m_style = style; - m_inSelected = false; - m_noSelChgEvent = false; - m_check = NULL; - - // check that the styles are not contradictory - wxASSERT_MSG( !( ( m_style & wxFC_SAVE ) && ( m_style & wxFC_OPEN ) ), - wxT( "can't specify both wxFC_SAVE and wxFC_OPEN at once" ) ); - - wxASSERT_MSG( !( ( m_style & wxFC_SAVE ) && ( m_style & wxFC_MULTIPLE ) ), - wxT( "wxFC_MULTIPLE can't be used with wxFC_SAVE" ) ); - - wxNavigationEnabled::Create( parent, id, - pos, size, - wxTAB_TRAVERSAL, - wxDefaultValidator, - name ); - - m_dir = defaultDirectory; - - m_ignoreChanges = true; - - if ( ( m_dir.empty() ) || ( m_dir == wxT( "." ) ) ) - { - m_dir = wxGetCwd(); - if ( m_dir.empty() ) - m_dir = wxFILE_SEP_PATH; - } - - const size_t len = m_dir.length(); - if ( ( len > 1 ) && ( wxEndsWithPathSeparator( m_dir ) ) ) - m_dir.Remove( len - 1, 1 ); - - m_filterExtension = wxEmptyString; - - // layout - - const bool is_pda = ( wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA ); - - wxBoxSizer *mainsizer = new wxBoxSizer( wxVERTICAL ); - - wxBoxSizer *staticsizer = new wxBoxSizer( wxHORIZONTAL ); - if ( is_pda ) - staticsizer->Add( new wxStaticText( this, wxID_ANY, _( "Current directory:" ) ), - wxSizerFlags().DoubleBorder(wxRIGHT) ); - m_static = new wxStaticText( this, wxID_ANY, m_dir ); - staticsizer->Add( m_static, 1 ); - mainsizer->Add( staticsizer, wxSizerFlags().Expand().Border()); - - long style2 = wxLC_LIST; - if ( !( m_style & wxFC_MULTIPLE ) ) - style2 |= wxLC_SINGLE_SEL; - - style2 |= wxSUNKEN_BORDER; - - m_list = new wxFileListCtrl( this, ID_FILELIST_CTRL, - wxEmptyString, false, - wxDefaultPosition, wxSize( 400, 140 ), - style2 ); - - m_text = new wxTextCtrl( this, ID_TEXT, wxEmptyString, - wxDefaultPosition, wxDefaultSize, - wxTE_PROCESS_ENTER ); - m_choice = new wxChoice( this, ID_CHOICE ); - - if ( is_pda ) - { - // PDAs have a different screen layout - mainsizer->Add( m_list, wxSizerFlags( 1 ).Expand().HorzBorder() ); - - wxBoxSizer *textsizer = new wxBoxSizer( wxHORIZONTAL ); - textsizer->Add( m_text, wxSizerFlags( 1 ).Centre().Border() ); - textsizer->Add( m_choice, wxSizerFlags( 1 ).Centre().Border() ); - mainsizer->Add( textsizer, wxSizerFlags().Expand() ); - - } - else // !is_pda - { - mainsizer->Add( m_list, wxSizerFlags( 1 ).Expand().Border() ); - mainsizer->Add( m_text, wxSizerFlags().Expand().Border() ); - - wxBoxSizer *choicesizer = new wxBoxSizer( wxHORIZONTAL ); - choicesizer->Add( m_choice, wxSizerFlags( 1 ).Centre() ); - - if ( !( m_style & wxFC_NOSHOWHIDDEN ) ) - { - m_check = new wxCheckBox( this, ID_CHECK, _( "Show &hidden files" ) ); - choicesizer->Add( m_check, wxSizerFlags().Centre().DoubleBorder(wxLEFT) ); - } - - mainsizer->Add( choicesizer, wxSizerFlags().Expand().Border() ); - } - - SetWildcard( wildCard ); - - SetAutoLayout( true ); - SetSizer( mainsizer ); - - if ( !is_pda ) - { - mainsizer->Fit( this ); - } - - m_list->GoToDir( m_dir ); - UpdateControls(); - m_text->SetValue( m_fileName ); - - m_ignoreChanges = false; - - // must be after m_ignoreChanges = false - SetFilename( defaultFileName ); - - return true; -} - -// NB: there is an unfortunate mismatch between wxFileName and wxFileDialog -// method names but our GetDirectory() does correspond to wxFileName:: -// GetPath() while our GetPath() is wxFileName::GetFullPath() -wxString wxGenericFileCtrl::GetPath() const -{ - wxASSERT_MSG ( !(m_style & wxFC_MULTIPLE), "use GetPaths() instead" ); - - return DoGetFileName().GetFullPath(); -} - -wxString wxGenericFileCtrl::GetFilename() const -{ - wxASSERT_MSG ( !(m_style & wxFC_MULTIPLE), "use GetFilenames() instead" ); - - return DoGetFileName().GetFullName(); -} - -wxString wxGenericFileCtrl::GetDirectory() const -{ - // don't check for wxFC_MULTIPLE here, this one is probably safe to call in - // any case as it can be always taken to mean "current directory" - return DoGetFileName().GetPath(); -} - -wxFileName wxGenericFileCtrl::DoGetFileName() const -{ - wxFileName fn; - - wxString value = m_text->GetValue(); - if ( value.empty() ) - { - // nothing in the text control, get the selected file from the list - wxListItem item; - item.m_itemId = m_list->GetNextItem(-1, wxLIST_NEXT_ALL, - wxLIST_STATE_SELECTED); - - // ... if anything is selected in the list - if ( item.m_itemId != wxNOT_FOUND ) - { - m_list->GetItem(item); - - fn.Assign(m_list->GetDir(), item.m_text); - } - } - else // user entered the value - { - // the path can be either absolute or relative - fn.Assign(value); - if ( fn.IsRelative() ) - fn.MakeAbsolute(m_list->GetDir()); - } - - return fn; -} - -// helper used in DoGetFilenames() and needed because Borland can't compile -// operator?: inline -static inline wxString GetFileNameOrPath(const wxFileName& fn, bool fullPath) -{ - return fullPath ? fn.GetFullPath() : fn.GetFullName(); -} - -void -wxGenericFileCtrl::DoGetFilenames(wxArrayString& filenames, bool fullPath) const -{ - filenames.clear(); - - const wxString dir = m_list->GetDir(); - - const wxString value = m_text->GetValue(); - if ( !value.empty() ) - { - wxFileName fn(value); - if ( fn.IsRelative() ) - fn.MakeAbsolute(dir); - - filenames.push_back(GetFileNameOrPath(fn, fullPath)); - return; - } - - const int numSel = m_list->GetSelectedItemCount(); - if ( !numSel ) - return; - - filenames.reserve(numSel); - - wxListItem item; - item.m_mask = wxLIST_MASK_TEXT; - item.m_itemId = -1; - for ( ;; ) - { - item.m_itemId = m_list->GetNextItem(item.m_itemId, wxLIST_NEXT_ALL, - wxLIST_STATE_SELECTED); - - if ( item.m_itemId == -1 ) - break; - - m_list->GetItem(item); - - const wxFileName fn(dir, item.m_text); - filenames.push_back(GetFileNameOrPath(fn, fullPath)); - } -} - -bool wxGenericFileCtrl::SetDirectory( const wxString& dir ) -{ - m_ignoreChanges = true; - m_list->GoToDir( dir ); - UpdateControls(); - m_ignoreChanges = false; - - return wxFileName( dir ).SameAs( m_list->GetDir() ); -} - -bool wxGenericFileCtrl::SetFilename( const wxString& name ) -{ - wxString dir, fn, ext; - wxFileName::SplitPath(name, &dir, &fn, &ext); - wxCHECK_MSG( dir.empty(), false, - wxS( "can't specify directory component to SetFilename" ) ); - - m_noSelChgEvent = true; - - m_text->ChangeValue( name ); - - // Deselect previously selected items - { - const int numSelectedItems = m_list->GetSelectedItemCount(); - - if ( numSelectedItems > 0 ) - { - long itemIndex = -1; - - for ( ;; ) - { - itemIndex = m_list->GetNextItem( itemIndex, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED ); - if ( itemIndex == wxNOT_FOUND ) - break; - - m_list->SetItemState( itemIndex, 0, wxLIST_STATE_SELECTED ); - } - } - } - - // Select new filename if it's in the list - long item = m_list->FindItem(wxNOT_FOUND, name); - - if ( item != wxNOT_FOUND ) - { - m_list->SetItemState( item, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED ); - m_list->EnsureVisible( item ); - } - - m_noSelChgEvent = false; - - return true; -} - -void wxGenericFileCtrl::DoSetFilterIndex( int filterindex ) -{ - wxClientData *pcd = m_choice->GetClientObject( filterindex ); - if ( !pcd ) - return; - - const wxString& str = ((static_cast(pcd))->GetData()); - m_list->SetWild( str ); - m_filterIndex = filterindex; - if ( str.Left( 2 ) == wxT( "*." ) ) - { - m_filterExtension = str.Mid( 1 ); - if ( m_filterExtension == wxT( ".*" ) ) - m_filterExtension.clear(); - } - else - { - m_filterExtension.clear(); - } - - GenerateFilterChangedEvent( this, this ); -} - -void wxGenericFileCtrl::SetWildcard( const wxString& wildCard ) -{ - if ( wildCard.empty() || wildCard == wxFileSelectorDefaultWildcardStr ) - { - m_wildCard = wxString::Format( _( "All files (%s)|%s" ), - wxFileSelectorDefaultWildcardStr, - wxFileSelectorDefaultWildcardStr ); - } - else - m_wildCard = wildCard; - - wxArrayString wildDescriptions, wildFilters; - const size_t count = wxParseCommonDialogsFilter( m_wildCard, - wildDescriptions, - wildFilters ); - wxCHECK_RET( count, wxT( "wxFileDialog: bad wildcard string" ) ); - - m_choice->Clear(); - - for ( size_t n = 0; n < count; n++ ) - { - m_choice->Append(wildDescriptions[n], new wxStringClientData(wildFilters[n])); - } - - SetFilterIndex( 0 ); -} - -void wxGenericFileCtrl::SetFilterIndex( int filterindex ) -{ - m_choice->SetSelection( filterindex ); - - DoSetFilterIndex( filterindex ); -} - -void wxGenericFileCtrl::OnChoiceFilter( wxCommandEvent &event ) -{ - DoSetFilterIndex( ( int )event.GetInt() ); -} - -void wxGenericFileCtrl::OnCheck( wxCommandEvent &event ) -{ - m_list->ShowHidden( event.GetInt() != 0 ); -} - -void wxGenericFileCtrl::OnActivated( wxListEvent &event ) -{ - HandleAction( event.m_item.m_text ); -} - -void wxGenericFileCtrl::OnTextEnter( wxCommandEvent &WXUNUSED( event ) ) -{ - HandleAction( m_text->GetValue() ); -} - -void wxGenericFileCtrl::OnTextChange( wxCommandEvent &WXUNUSED( event ) ) -{ - if ( !m_ignoreChanges ) - { - // Clear selections. Otherwise when the user types in a value they may - // not get the file whose name they typed. - if ( m_list->GetSelectedItemCount() > 0 ) - { - long item = m_list->GetNextItem( -1, wxLIST_NEXT_ALL, - wxLIST_STATE_SELECTED ); - while ( item != -1 ) - { - m_list->SetItemState( item, 0, wxLIST_STATE_SELECTED ); - item = m_list->GetNextItem( item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED ); - } - } - } -} - -void wxGenericFileCtrl::OnSelected( wxListEvent &event ) -{ - if ( m_ignoreChanges ) - return; - - if ( m_inSelected ) - return; - - m_inSelected = true; - const wxString filename( event.m_item.m_text ); - - if ( filename == wxT( ".." ) ) - { - m_inSelected = false; - return; - } - - wxString dir = m_list->GetDir(); - if ( !IsTopMostDir( dir ) ) - dir += wxFILE_SEP_PATH; - dir += filename; - if ( wxDirExists( dir ) ) - { - m_inSelected = false; - - return; - } - - - m_ignoreChanges = true; - m_text->SetValue( filename ); - - if ( m_list->GetSelectedItemCount() > 1 ) - { - m_text->Clear(); - } - - if ( !m_noSelChgEvent ) - GenerateSelectionChangedEvent( this, this ); - - m_ignoreChanges = false; - m_inSelected = false; -} - -void wxGenericFileCtrl::HandleAction( const wxString &fn ) -{ - if ( m_ignoreChanges ) - return; - - wxString filename( fn ); - if ( filename.empty() ) - { - return; - } - if ( filename == wxT( "." ) ) return; - - wxString dir = m_list->GetDir(); - - // "some/place/" means they want to chdir not try to load "place" - const bool want_dir = filename.Last() == wxFILE_SEP_PATH; - if ( want_dir ) - filename = filename.RemoveLast(); - - if ( filename == wxT( ".." ) ) - { - m_ignoreChanges = true; - m_list->GoToParentDir(); - - GenerateFolderChangedEvent( this, this ); - - UpdateControls(); - m_ignoreChanges = false; - return; - } - -#ifdef __UNIX__ - if ( filename == wxT( "~" ) ) - { - m_ignoreChanges = true; - m_list->GoToHomeDir(); - - GenerateFolderChangedEvent( this, this ); - - UpdateControls(); - m_ignoreChanges = false; - return; - } - - if ( filename.BeforeFirst( wxT( '/' ) ) == wxT( "~" ) ) - { - filename = wxString( wxGetUserHome() ) + filename.Remove( 0, 1 ); - } -#endif // __UNIX__ - - if ( !( m_style & wxFC_SAVE ) ) - { - if ( ( filename.Find( wxT( '*' ) ) != wxNOT_FOUND ) || - ( filename.Find( wxT( '?' ) ) != wxNOT_FOUND ) ) - { - if ( filename.Find( wxFILE_SEP_PATH ) != wxNOT_FOUND ) - { - wxMessageBox( _( "Illegal file specification." ), - _( "Error" ), wxOK | wxICON_ERROR, this ); - return; - } - m_list->SetWild( filename ); - return; - } - } - - if ( !IsTopMostDir( dir ) ) - dir += wxFILE_SEP_PATH; - if ( !wxIsAbsolutePath( filename ) ) - { - dir += filename; - filename = dir; - } - - if ( wxDirExists( filename ) ) - { - m_ignoreChanges = true; - m_list->GoToDir( filename ); - UpdateControls(); - - GenerateFolderChangedEvent( this, this ); - - m_ignoreChanges = false; - return; - } - - // they really wanted a dir, but it doesn't exist - if ( want_dir ) - { - wxMessageBox( _( "Directory doesn't exist." ), _( "Error" ), - wxOK | wxICON_ERROR, this ); - return; - } - - // append the default extension to the filename if it doesn't have any - // - // VZ: the logic of testing for !wxFileExists() only for the open file - // dialog is not entirely clear to me, why don't we allow saving to a - // file without extension as well? - if ( !( m_style & wxFC_OPEN ) || !wxFileExists( filename ) ) - { - filename = wxFileDialogBase::AppendExtension( filename, m_filterExtension ); - GenerateFileActivatedEvent( this, this, wxFileName( filename ).GetFullName() ); - return; - } - - GenerateFileActivatedEvent( this, this ); -} - -bool wxGenericFileCtrl::SetPath( const wxString& path ) -{ - wxString dir, fn, ext; - wxFileName::SplitPath(path, &dir, &fn, &ext); - - if ( !dir.empty() && !wxFileName::DirExists(dir) ) - return false; - - m_dir = dir; - m_fileName = fn; - if ( !ext.empty() || path.Last() == '.' ) - { - m_fileName += wxT( "." ); - m_fileName += ext; - } - - SetDirectory( m_dir ); - SetFilename( m_fileName ); - - return true; -} - -void wxGenericFileCtrl::GetPaths( wxArrayString& paths ) const -{ - DoGetFilenames( paths, true ); -} - -void wxGenericFileCtrl::GetFilenames( wxArrayString& files ) const -{ - DoGetFilenames( files, false ); -} - -void wxGenericFileCtrl::UpdateControls() -{ - const wxString dir = m_list->GetDir(); - m_static->SetLabel( dir ); -} - -void wxGenericFileCtrl::GoToParentDir() -{ - m_list->GoToParentDir(); - UpdateControls(); -} - -void wxGenericFileCtrl::GoToHomeDir() -{ - m_list->GoToHomeDir(); - UpdateControls(); -} - -#endif // wxUSE_FILECTRL diff --git a/Externals/wxWidgets3/src/generic/filedlgg.cpp b/Externals/wxWidgets3/src/generic/filedlgg.cpp deleted file mode 100644 index bacc3a2dbb..0000000000 --- a/Externals/wxWidgets3/src/generic/filedlgg.cpp +++ /dev/null @@ -1,416 +0,0 @@ -////////////////////////////////////////////////////////////////////////////// -// Name: src/generic/filedlgg.cpp -// Purpose: wxGenericFileDialog -// Author: Robert Roebling -// Modified by: -// Created: 12/12/98 -// Copyright: (c) Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_FILEDLG - -// NOTE : it probably also supports MAC, untested -#if !defined(__UNIX__) && !defined(__WIN32__) -#error wxGenericFileDialog currently only supports Unix, win32 and DOS -#endif - -#ifndef WX_PRECOMP - #ifdef __WXMSW__ - #include "wx/msw/wrapwin.h" - #endif - #include "wx/hash.h" - #include "wx/intl.h" - #include "wx/settings.h" - #include "wx/log.h" - #include "wx/msgdlg.h" - #include "wx/bmpbuttn.h" - #include "wx/checkbox.h" - #include "wx/choice.h" - #include "wx/stattext.h" - #include "wx/textctrl.h" - #include "wx/sizer.h" - #include "wx/filedlg.h" // wxFD_OPEN, wxFD_SAVE... -#endif - -#include "wx/longlong.h" -#include "wx/config.h" -#include "wx/imaglist.h" -#include "wx/artprov.h" -#include "wx/filefn.h" -#include "wx/filectrl.h" -#include "wx/generic/filedlgg.h" -#include "wx/debug.h" -#include "wx/modalhook.h" - -#if wxUSE_TOOLTIPS - #include "wx/tooltip.h" -#endif -#if wxUSE_CONFIG - #include "wx/config.h" -#endif - -#include -#include - -#ifdef __UNIX__ - #include - #include - #ifndef __VMS - # include - #endif -#endif - -#include - -#if defined(__UNIX__) -#include -#endif - -#if defined(__WINDOWS__) -#define IsTopMostDir(dir) (dir.empty()) -#else -#define IsTopMostDir(dir) (dir == wxT("/")) -#endif - -//----------------------------------------------------------------------------- -// wxGenericFileDialog -//----------------------------------------------------------------------------- - -#define ID_LIST_MODE (wxID_FILEDLGG ) -#define ID_REPORT_MODE (wxID_FILEDLGG + 1) -#define ID_UP_DIR (wxID_FILEDLGG + 2) -#define ID_HOME_DIR (wxID_FILEDLGG + 3) -#define ID_NEW_DIR (wxID_FILEDLGG + 4) -#define ID_FILE_CTRL (wxID_FILEDLGG + 5) - -wxIMPLEMENT_DYNAMIC_CLASS(wxGenericFileDialog, wxFileDialogBase); - -wxBEGIN_EVENT_TABLE(wxGenericFileDialog,wxDialog) - EVT_BUTTON(ID_LIST_MODE, wxGenericFileDialog::OnList) - EVT_BUTTON(ID_REPORT_MODE, wxGenericFileDialog::OnReport) - EVT_BUTTON(ID_UP_DIR, wxGenericFileDialog::OnUp) - EVT_BUTTON(ID_HOME_DIR, wxGenericFileDialog::OnHome) - EVT_BUTTON(ID_NEW_DIR, wxGenericFileDialog::OnNew) - EVT_BUTTON(wxID_OK, wxGenericFileDialog::OnOk) - EVT_FILECTRL_FILEACTIVATED(ID_FILE_CTRL, wxGenericFileDialog::OnFileActivated) - - EVT_UPDATE_UI(ID_UP_DIR, wxGenericFileDialog::OnUpdateButtonsUI) -#if defined(__WINDOWS__) - EVT_UPDATE_UI(ID_NEW_DIR, wxGenericFileDialog::OnUpdateButtonsUI) -#endif // defined(__WINDOWS__) -wxEND_EVENT_TABLE() - -long wxGenericFileDialog::ms_lastViewStyle = wxLC_LIST; -bool wxGenericFileDialog::ms_lastShowHidden = false; - -void wxGenericFileDialog::Init() -{ - m_bypassGenericImpl = false; - - m_filectrl = NULL; - m_upDirButton = NULL; - m_newDirButton = NULL; -} - -wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent, - const wxString& message, - const wxString& defaultDir, - const wxString& defaultFile, - const wxString& wildCard, - long style, - const wxPoint& pos, - const wxSize& sz, - const wxString& name, - bool bypassGenericImpl ) : wxFileDialogBase() -{ - Init(); - Create( parent, message, defaultDir, defaultFile, wildCard, style, pos, sz, name, bypassGenericImpl ); -} - -bool wxGenericFileDialog::Create( wxWindow *parent, - const wxString& message, - const wxString& defaultDir, - const wxString& defaultFile, - const wxString& wildCard, - long style, - const wxPoint& pos, - const wxSize& sz, - const wxString& name, - bool bypassGenericImpl ) -{ - m_bypassGenericImpl = bypassGenericImpl; - - parent = GetParentForModalDialog(parent, style); - - if (!wxFileDialogBase::Create(parent, message, defaultDir, defaultFile, - wildCard, style, pos, sz, name)) - { - return false; - } - - if (m_bypassGenericImpl) - return true; - - if (!wxDialog::Create( parent, wxID_ANY, message, pos, sz, - wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | style, name - )) - { - return false; - } - -#if wxUSE_CONFIG - if (wxConfig::Get(false)) - { - wxConfig::Get()->Read(wxT("/wxWindows/wxFileDialog/ViewStyle"), - &ms_lastViewStyle); - wxConfig::Get()->Read(wxT("/wxWindows/wxFileDialog/ShowHidden"), - &ms_lastShowHidden); - } -#endif - - if ((m_dir.empty()) || (m_dir == wxT("."))) - { - m_dir = wxGetCwd(); - if (m_dir.empty()) - m_dir = wxFILE_SEP_PATH; - } - - const size_t len = m_dir.length(); - if ((len > 1) && (wxEndsWithPathSeparator(m_dir))) - m_dir.Remove( len-1, 1 ); - - m_filterExtension = wxEmptyString; - - // layout - - const bool is_pda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA); - - wxBoxSizer *mainsizer = new wxBoxSizer( wxVERTICAL ); - - wxBoxSizer *buttonsizer = new wxBoxSizer( wxHORIZONTAL ); - AddBitmapButton( ID_LIST_MODE, wxART_LIST_VIEW, - _("View files as a list view"), buttonsizer ); - AddBitmapButton( ID_REPORT_MODE, wxART_REPORT_VIEW, - _("View files as a detailed view"), buttonsizer ); - buttonsizer->Add( 30, 5, 1 ); - m_upDirButton = AddBitmapButton( ID_UP_DIR, wxART_GO_DIR_UP, - _("Go to parent directory"), buttonsizer ); - - AddBitmapButton( ID_HOME_DIR, wxART_GO_HOME, - _("Go to home directory"), buttonsizer ); - buttonsizer->Add( 20, 20 ); - - m_newDirButton = AddBitmapButton( ID_NEW_DIR, wxART_NEW_DIR, - _("Create new directory"), buttonsizer ); - - if (is_pda) - mainsizer->Add( buttonsizer, wxSizerFlags().Expand() ); - else - mainsizer->Add( buttonsizer, wxSizerFlags().Expand() - .Border( wxLEFT | wxRIGHT | wxTOP ) ); - - long style2 = 0; - if ( HasFdFlag(wxFD_MULTIPLE) ) - style2 |= wxFC_MULTIPLE; - - m_filectrl = new wxGenericFileCtrl( this, ID_FILE_CTRL, - m_dir, defaultFile, - wildCard, - style2, - wxDefaultPosition, wxSize(540,200) - ); - - m_filectrl->ShowHidden( ms_lastShowHidden ); - - if (ms_lastViewStyle == wxLC_LIST) - { - m_filectrl->ChangeToListMode(); - } - else if (ms_lastViewStyle == wxLC_REPORT) - { - m_filectrl->ChangeToReportMode(); - } - - mainsizer->Add(m_filectrl, wxSizerFlags(1).Expand().HorzBorder()); - - wxSizer *bsizer = CreateButtonSizer(wxOK | wxCANCEL); - if ( bsizer ) - { - if (is_pda) - mainsizer->Add(bsizer, wxSizerFlags().Expand().Border()); - else - mainsizer->Add(bsizer, wxSizerFlags().Expand().DoubleBorder()); - } - - SetSizer( mainsizer ); - - if (!is_pda) - { - mainsizer->SetSizeHints( this ); - - Centre( wxBOTH ); - } - - return true; -} - -wxGenericFileDialog::~wxGenericFileDialog() -{ - if (!m_bypassGenericImpl) - { -#if wxUSE_CONFIG - if (wxConfig::Get(false)) - { - wxConfig::Get()->Write(wxT("/wxWindows/wxFileDialog/ViewStyle"), - ms_lastViewStyle); - wxConfig::Get()->Write(wxT("/wxWindows/wxFileDialog/ShowHidden"), - ms_lastShowHidden); - } -#endif - } -} - -wxBitmapButton* wxGenericFileDialog::AddBitmapButton( wxWindowID winId, - const wxArtID& artId, - const wxString& tip, - wxSizer *sizer) -{ - wxBitmapButton *but = new wxBitmapButton(this, winId, - wxArtProvider::GetBitmap(artId, wxART_BUTTON)); - but->SetToolTip(tip); - sizer->Add(but, wxSizerFlags().Border()); - return but; -} - -int wxGenericFileDialog::ShowModal() -{ - WX_HOOK_MODAL_DIALOG(); - - if (CreateExtraControl()) - { - wxSizer *sizer = GetSizer(); - sizer->Insert(2 /* after m_filectrl */, m_extraControl, - wxSizerFlags().Expand().HorzBorder()); - sizer->Fit(this); - } - - m_filectrl->SetDirectory(m_dir); - - return wxDialog::ShowModal(); -} - -bool wxGenericFileDialog::Show( bool show ) -{ - // Called by ShowModal, so don't repeate the update -#ifndef __WIN32__ - if (show) - { - m_filectrl->SetDirectory(m_dir); - } -#endif - - return wxDialog::Show( show ); -} - -void wxGenericFileDialog::OnOk( wxCommandEvent &WXUNUSED(event) ) -{ - wxArrayString selectedFiles; - m_filectrl->GetPaths(selectedFiles); - - if (selectedFiles.Count() == 0) - return; - - const wxString& path = selectedFiles[0]; - - if (selectedFiles.Count() == 1) - { - SetPath(path); - } - - // check that the file [doesn't] exist if necessary - if ( HasFdFlag(wxFD_SAVE) && HasFdFlag(wxFD_OVERWRITE_PROMPT) && - wxFileExists(path) ) - { - if ( wxMessageBox - ( - wxString::Format - ( - _("File '%s' already exists, do you really want to overwrite it?"), - path - ), - _("Confirm"), - wxYES_NO - ) != wxYES) - return; - } - else if ( HasFdFlag(wxFD_OPEN) && HasFdFlag(wxFD_FILE_MUST_EXIST) && - !wxFileExists(path) ) - { - wxMessageBox(_("Please choose an existing file."), _("Error"), - wxOK | wxICON_ERROR ); - return; - } - - EndModal(wxID_OK); -} - -void wxGenericFileDialog::OnList( wxCommandEvent &WXUNUSED(event) ) -{ - m_filectrl->ChangeToListMode(); - ms_lastViewStyle = wxLC_LIST; - m_filectrl->GetFileList()->SetFocus(); -} - -void wxGenericFileDialog::OnReport( wxCommandEvent &WXUNUSED(event) ) -{ - m_filectrl->ChangeToReportMode(); - ms_lastViewStyle = wxLC_REPORT; - m_filectrl->GetFileList()->SetFocus(); -} - -void wxGenericFileDialog::OnUp( wxCommandEvent &WXUNUSED(event) ) -{ - m_filectrl->GoToParentDir(); - m_filectrl->GetFileList()->SetFocus(); -} - -void wxGenericFileDialog::OnHome( wxCommandEvent &WXUNUSED(event) ) -{ - m_filectrl->GoToHomeDir(); - m_filectrl->SetFocus(); -} - -void wxGenericFileDialog::OnNew( wxCommandEvent &WXUNUSED(event) ) -{ - m_filectrl->GetFileList()->MakeDir(); -} - -void wxGenericFileDialog::OnFileActivated( wxFileCtrlEvent &WXUNUSED(event) ) -{ - wxCommandEvent dummy; - OnOk( dummy ); -} - -void wxGenericFileDialog::OnUpdateButtonsUI(wxUpdateUIEvent& event) -{ - // surprisingly, we can be called before m_filectrl is set in Create() as - // wxFileCtrl ctor itself can generate idle events, so we need this test - if ( m_filectrl ) - event.Enable( !IsTopMostDir(m_filectrl->GetShownDirectory()) ); -} - -#ifdef wxHAS_GENERIC_FILEDIALOG - -wxIMPLEMENT_DYNAMIC_CLASS(wxFileDialog, wxGenericFileDialog); - -#endif // wxHAS_GENERIC_FILEDIALOG - -#endif // wxUSE_FILEDLG diff --git a/Externals/wxWidgets3/src/generic/filepickerg.cpp b/Externals/wxWidgets3/src/generic/filepickerg.cpp deleted file mode 100644 index 20f6f77e82..0000000000 --- a/Externals/wxWidgets3/src/generic/filepickerg.cpp +++ /dev/null @@ -1,155 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/generic/filepickerg.cpp -// Purpose: wxGenericFileDirButton class implementation -// Author: Francesco Montorsi -// Modified by: -// Created: 15/04/2006 -// Copyright: (c) Francesco Montorsi -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL - -#include "wx/filename.h" -#include "wx/filepicker.h" - -#include "wx/scopedptr.h" - - -// ============================================================================ -// implementation -// ============================================================================ - -wxIMPLEMENT_DYNAMIC_CLASS(wxGenericFileButton, wxButton); -wxIMPLEMENT_DYNAMIC_CLASS(wxGenericDirButton, wxButton); - -// ---------------------------------------------------------------------------- -// wxGenericFileButton -// ---------------------------------------------------------------------------- - -bool wxGenericFileDirButton::Create(wxWindow *parent, - wxWindowID id, - const wxString& label, - const wxString& path, - const wxString& message, - const wxString& wildcard, - const wxPoint& pos, - const wxSize& size, - long style, - const wxValidator& validator, - const wxString& name) -{ - m_pickerStyle = style; - - // If the special wxPB_SMALL flag is used, ignore the provided label and - // use the shortest possible label and the smallest possible button fitting - // it. - long styleButton = 0; - wxString labelButton; - if ( m_pickerStyle & wxPB_SMALL ) - { - labelButton = _("..."); - styleButton = wxBU_EXACTFIT; - } - else - { - labelButton = label; - } - - // create this button - if ( !wxButton::Create(parent, id, labelButton, - pos, size, styleButton, validator, name) ) - { - wxFAIL_MSG( wxT("wxGenericFileButton creation failed") ); - return false; - } - - // and handle user clicks on it - Connect(GetId(), wxEVT_BUTTON, - wxCommandEventHandler(wxGenericFileDirButton::OnButtonClick), - NULL, this); - - // create the dialog associated with this button - m_path = path; - m_message = message; - m_wildcard = wildcard; - - return true; -} - -void wxGenericFileDirButton::OnButtonClick(wxCommandEvent& WXUNUSED(ev)) -{ - wxScopedPtr p(CreateDialog()); - if (p->ShowModal() == wxID_OK) - { - // save updated path in m_path - UpdatePathFromDialog(p.get()); - - // fire an event - wxFileDirPickerEvent event(GetEventType(), this, GetId(), m_path); - GetEventHandler()->ProcessEvent(event); - } -} - -void wxGenericFileDirButton::SetInitialDirectory(const wxString& dir) -{ - m_initialDir = dir; -} - -// ---------------------------------------------------------------------------- -// wxGenericFileButton -// ---------------------------------------------------------------------------- - -wxDialog *wxGenericFileButton::CreateDialog() -{ - // Determine the initial directory for the dialog: it comes either from the - // default path, if it has it, or from the separately specified initial - // directory that can be set even if the path is e.g. empty. - wxFileName fn(m_path); - wxString initialDir = fn.GetPath(); - if ( initialDir.empty() ) - initialDir = m_initialDir; - - return new wxFileDialog - ( - GetDialogParent(), - m_message, - initialDir, - fn.GetFullName(), - m_wildcard, - GetDialogStyle() - ); -} - -// ---------------------------------------------------------------------------- -// wxGenericDirButton -// ---------------------------------------------------------------------------- - -wxDialog *wxGenericDirButton::CreateDialog() -{ - wxDirDialog* const dialog = new wxDirDialog - ( - GetDialogParent(), - m_message, - m_path.empty() ? m_initialDir : m_path, - GetDialogStyle() - ); - return dialog; -} - -#endif // wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL diff --git a/Externals/wxWidgets3/src/generic/fontdlgg.cpp b/Externals/wxWidgets3/src/generic/fontdlgg.cpp deleted file mode 100644 index 4908035680..0000000000 --- a/Externals/wxWidgets3/src/generic/fontdlgg.cpp +++ /dev/null @@ -1,626 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/generic/fontdlgg.cpp -// Purpose: Generic font dialog -// Author: Julian Smart -// Modified by: -// Created: 04/01/98 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ -#pragma hdrstop -#endif - -#if wxUSE_FONTDLG && (!defined(__WXGTK__) || defined(__WXGPE__) || defined(__WXUNIVERSAL__)) - -#ifndef WX_PRECOMP - #include - #include "wx/crt.h" - #include "wx/utils.h" - #include "wx/dialog.h" - #include "wx/listbox.h" - #include "wx/button.h" - #include "wx/stattext.h" - #include "wx/layout.h" - #include "wx/dcclient.h" - #include "wx/choice.h" - #include "wx/checkbox.h" - #include "wx/intl.h" - #include "wx/settings.h" - #include "wx/sizer.h" -#endif - -#include -#include - -#include "wx/fontdlg.h" -#include "wx/generic/fontdlgg.h" - -#if USE_SPINCTRL_FOR_POINT_SIZE -#include "wx/spinctrl.h" -#endif - -//----------------------------------------------------------------------------- -// helper class - wxFontPreviewer -//----------------------------------------------------------------------------- - -class WXDLLEXPORT wxFontPreviewer : public wxWindow -{ -public: - wxFontPreviewer(wxWindow *parent, const wxSize& sz = wxDefaultSize) : wxWindow(parent, wxID_ANY, wxDefaultPosition, sz) - { - } - -private: - void OnPaint(wxPaintEvent& event); - wxDECLARE_EVENT_TABLE(); -}; - -wxBEGIN_EVENT_TABLE(wxFontPreviewer, wxWindow) - EVT_PAINT(wxFontPreviewer::OnPaint) -wxEND_EVENT_TABLE() - -void wxFontPreviewer::OnPaint(wxPaintEvent& WXUNUSED(event)) -{ - wxPaintDC dc(this); - - wxSize size = GetSize(); - wxFont font = GetFont(); - - dc.SetPen(*wxBLACK_PEN); - dc.SetBrush(*wxWHITE_BRUSH); - dc.DrawRectangle(0, 0, size.x, size.y); - - if ( font.IsOk() ) - { - dc.SetFont(font); - dc.SetTextForeground(GetForegroundColour()); - dc.SetClippingRegion(2, 2, size.x-4, size.y-4); - dc.DrawText(_("ABCDEFGabcdefg12345"), - 10, (size.y - dc.GetTextExtent(wxT("X")).y)/2); - dc.DestroyClippingRegion(); - } -} - -//----------------------------------------------------------------------------- -// helper functions -//----------------------------------------------------------------------------- - -static const wxChar *wxFontWeightIntToString(int weight) -{ - switch (weight) - { - case wxFONTWEIGHT_LIGHT: - return wxT("Light"); - case wxFONTWEIGHT_BOLD: - return wxT("Bold"); - case wxFONTWEIGHT_NORMAL: - default: - return wxT("Normal"); - } -} - -static const wxChar *wxFontStyleIntToString(int style) -{ - switch (style) - { - case wxFONTSTYLE_ITALIC: - return wxT("Italic"); - case wxFONTSTYLE_SLANT: - return wxT("Slant"); - case wxFONTSTYLE_NORMAL: - default: - return wxT("Normal"); - } -} - -static const wxChar *wxFontFamilyIntToString(int family) -{ - switch (family) - { - case wxFONTFAMILY_ROMAN: - return wxT("Roman"); - case wxFONTFAMILY_DECORATIVE: - return wxT("Decorative"); - case wxFONTFAMILY_MODERN: - return wxT("Modern"); - case wxFONTFAMILY_SCRIPT: - return wxT("Script"); - case wxFONTFAMILY_TELETYPE: - return wxT("Teletype"); - case wxFONTFAMILY_SWISS: - default: - return wxT("Swiss"); - } -} - -static wxFontFamily wxFontFamilyStringToInt(const wxString& family) -{ - if (family.empty()) - return wxFONTFAMILY_SWISS; - - if (wxStrcmp(family, wxT("Roman")) == 0) - return wxFONTFAMILY_ROMAN; - else if (wxStrcmp(family, wxT("Decorative")) == 0) - return wxFONTFAMILY_DECORATIVE; - else if (wxStrcmp(family, wxT("Modern")) == 0) - return wxFONTFAMILY_MODERN; - else if (wxStrcmp(family, wxT("Script")) == 0) - return wxFONTFAMILY_SCRIPT; - else if (wxStrcmp(family, wxT("Teletype")) == 0) - return wxFONTFAMILY_TELETYPE; - else return wxFONTFAMILY_SWISS; -} - -static wxFontStyle wxFontStyleStringToInt(const wxString& style) -{ - if (style.empty()) - return wxFONTSTYLE_NORMAL; - if (wxStrcmp(style, wxT("Italic")) == 0) - return wxFONTSTYLE_ITALIC; - else if (wxStrcmp(style, wxT("Slant")) == 0) - return wxFONTSTYLE_SLANT; - else - return wxFONTSTYLE_NORMAL; -} - -static wxFontWeight wxFontWeightStringToInt(const wxString& weight) -{ - if (weight.empty()) - return wxFONTWEIGHT_NORMAL; - if (wxStrcmp(weight, wxT("Bold")) == 0) - return wxFONTWEIGHT_BOLD; - else if (wxStrcmp(weight, wxT("Light")) == 0) - return wxFONTWEIGHT_LIGHT; - else - return wxFONTWEIGHT_NORMAL; -} - -//----------------------------------------------------------------------------- -// wxGenericFontDialog -//----------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxGenericFontDialog, wxDialog); - -wxBEGIN_EVENT_TABLE(wxGenericFontDialog, wxDialog) - EVT_CHECKBOX(wxID_FONT_UNDERLINE, wxGenericFontDialog::OnChangeFont) - EVT_CHOICE(wxID_FONT_STYLE, wxGenericFontDialog::OnChangeFont) - EVT_CHOICE(wxID_FONT_WEIGHT, wxGenericFontDialog::OnChangeFont) - EVT_CHOICE(wxID_FONT_FAMILY, wxGenericFontDialog::OnChangeFont) - EVT_CHOICE(wxID_FONT_COLOUR, wxGenericFontDialog::OnChangeFont) -#if USE_SPINCTRL_FOR_POINT_SIZE - EVT_SPINCTRL(wxID_FONT_SIZE, wxGenericFontDialog::OnChangeSize) - EVT_TEXT(wxID_FONT_SIZE, wxGenericFontDialog::OnChangeFont) -#else - EVT_CHOICE(wxID_FONT_SIZE, wxGenericFontDialog::OnChangeFont) -#endif - EVT_CLOSE(wxGenericFontDialog::OnCloseWindow) -wxEND_EVENT_TABLE() - - -#define NUM_COLS 48 -static wxString wxColourDialogNames[NUM_COLS]={wxT("ORANGE"), - wxT("GOLDENROD"), - wxT("WHEAT"), - wxT("SPRING GREEN"), - wxT("SKY BLUE"), - wxT("SLATE BLUE"), - wxT("MEDIUM VIOLET RED"), - wxT("PURPLE"), - - wxT("RED"), - wxT("YELLOW"), - wxT("MEDIUM SPRING GREEN"), - wxT("PALE GREEN"), - wxT("CYAN"), - wxT("LIGHT STEEL BLUE"), - wxT("ORCHID"), - wxT("LIGHT MAGENTA"), - - wxT("BROWN"), - wxT("YELLOW"), - wxT("GREEN"), - wxT("CADET BLUE"), - wxT("MEDIUM BLUE"), - wxT("MAGENTA"), - wxT("MAROON"), - wxT("ORANGE RED"), - - wxT("FIREBRICK"), - wxT("CORAL"), - wxT("FOREST GREEN"), - wxT("AQUARAMINE"), - wxT("BLUE"), - wxT("NAVY"), - wxT("THISTLE"), - wxT("MEDIUM VIOLET RED"), - - wxT("INDIAN RED"), - wxT("GOLD"), - wxT("MEDIUM SEA GREEN"), - wxT("MEDIUM BLUE"), - wxT("MIDNIGHT BLUE"), - wxT("GREY"), - wxT("PURPLE"), - wxT("KHAKI"), - - wxT("BLACK"), - wxT("MEDIUM FOREST GREEN"), - wxT("KHAKI"), - wxT("DARK GREY"), - wxT("SEA GREEN"), - wxT("LIGHT GREY"), - wxT("MEDIUM SLATE BLUE"), - wxT("WHITE") - }; - -/* - * Generic wxFontDialog - */ - -void wxGenericFontDialog::Init() -{ - m_useEvents = false; - m_previewer = NULL; - Create( m_parent ) ; -} - -wxGenericFontDialog::~wxGenericFontDialog() -{ -} - -void wxGenericFontDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event)) -{ - EndModal(wxID_CANCEL); -} - -bool wxGenericFontDialog::DoCreate(wxWindow *parent) -{ - parent = GetParentForModalDialog(parent, 0); - - if ( !wxDialog::Create( parent , wxID_ANY , wxT("Choose Font") , - wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE, - wxT("fontdialog") ) ) - { - wxFAIL_MSG( wxT("wxFontDialog creation failed") ); - return false; - } - - InitializeFont(); - CreateWidgets(); - - // sets initial font in preview area - DoChangeFont(); - - return true; -} - -int wxGenericFontDialog::ShowModal() -{ - int ret = wxDialog::ShowModal(); - - if (ret != wxID_CANCEL) - { - m_fontData.m_chosenFont = m_dialogFont; - } - - return ret; -} - -// This should be application-settable -static bool ShowToolTips() { return false; } - -void wxGenericFontDialog::CreateWidgets() -{ - wxString *families = new wxString[6], - *styles = new wxString[3], - *weights = new wxString[3]; - families[0] = _("Roman"); - families[1] = _("Decorative"); - families[2] = _("Modern"); - families[3] = _("Script"); - families[4] = _("Swiss" ); - families[5] = _("Teletype" ); - styles[0] = _("Normal"); - styles[1] = _("Italic"); - styles[2] = _("Slant"); - weights[0] = _("Normal"); - weights[1] = _("Light"); - weights[2] = _("Bold"); - -#if !USE_SPINCTRL_FOR_POINT_SIZE - wxString *pointSizes = new wxString[40]; - int i; - for ( i = 0; i < 40; i++) - { - wxChar buf[5]; - wxSprintf(buf, wxT("%d"), i + 1); - pointSizes[i] = buf; - } -#endif - - // layout - - bool is_pda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA); - int noCols, noRows; - if (is_pda) - { - noCols = 2; noRows = 3; - } - else - { - noCols = 3; noRows = 2; - } - - wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL); - this->SetSizer(itemBoxSizer2); - this->SetAutoLayout(true); - - wxBoxSizer* itemBoxSizer3 = new wxBoxSizer(wxVERTICAL); - itemBoxSizer2->Add(itemBoxSizer3, 1, wxGROW|wxALL, 5); - - wxFlexGridSizer* itemGridSizer4 = new wxFlexGridSizer(noRows, noCols, 0, 0); - itemBoxSizer3->Add(itemGridSizer4, 0, wxGROW, 5); - - wxBoxSizer* itemBoxSizer5 = new wxBoxSizer(wxVERTICAL); - itemGridSizer4->Add(itemBoxSizer5, 0, wxALIGN_CENTER_HORIZONTAL|wxGROW, 5); - wxStaticText* itemStaticText6 = new wxStaticText( this, wxID_STATIC, _("&Font family:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer5->Add(itemStaticText6, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5); - - wxChoice* itemChoice7 = new wxChoice( this, wxID_FONT_FAMILY, wxDefaultPosition, wxDefaultSize, 5, families, 0 ); - itemChoice7->SetHelpText(_("The font family.")); - if (ShowToolTips()) - itemChoice7->SetToolTip(_("The font family.")); - itemBoxSizer5->Add(itemChoice7, 0, wxALIGN_LEFT|wxALL, 5); - - wxBoxSizer* itemBoxSizer8 = new wxBoxSizer(wxVERTICAL); - itemGridSizer4->Add(itemBoxSizer8, 0, wxALIGN_CENTER_HORIZONTAL|wxGROW, 5); - wxStaticText* itemStaticText9 = new wxStaticText( this, wxID_STATIC, _("&Style:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer8->Add(itemStaticText9, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5); - - wxChoice* itemChoice10 = new wxChoice( this, wxID_FONT_STYLE, wxDefaultPosition, wxDefaultSize, 3, styles, 0 ); - itemChoice10->SetHelpText(_("The font style.")); - if (ShowToolTips()) - itemChoice10->SetToolTip(_("The font style.")); - itemBoxSizer8->Add(itemChoice10, 0, wxALIGN_LEFT|wxALL, 5); - - wxBoxSizer* itemBoxSizer11 = new wxBoxSizer(wxVERTICAL); - itemGridSizer4->Add(itemBoxSizer11, 0, wxALIGN_CENTER_HORIZONTAL|wxGROW, 5); - wxStaticText* itemStaticText12 = new wxStaticText( this, wxID_STATIC, _("&Weight:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer11->Add(itemStaticText12, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5); - - wxChoice* itemChoice13 = new wxChoice( this, wxID_FONT_WEIGHT, wxDefaultPosition, wxDefaultSize, 3, weights, 0 ); - itemChoice13->SetHelpText(_("The font weight.")); - if (ShowToolTips()) - itemChoice13->SetToolTip(_("The font weight.")); - itemBoxSizer11->Add(itemChoice13, 0, wxALIGN_LEFT|wxALL, 5); - - wxBoxSizer* itemBoxSizer14 = new wxBoxSizer(wxVERTICAL); - itemGridSizer4->Add(itemBoxSizer14, 0, wxALIGN_CENTER_HORIZONTAL|wxGROW, 5); - if (m_fontData.GetEnableEffects()) - { - wxStaticText* itemStaticText15 = new wxStaticText( this, wxID_STATIC, _("C&olour:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer14->Add(itemStaticText15, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5); - - wxSize colourSize = wxDefaultSize; - if (is_pda) - colourSize.x = 100; - - wxChoice* itemChoice16 = new wxChoice( this, wxID_FONT_COLOUR, wxDefaultPosition, colourSize, NUM_COLS, wxColourDialogNames, 0 ); - itemChoice16->SetHelpText(_("The font colour.")); - if (ShowToolTips()) - itemChoice16->SetToolTip(_("The font colour.")); - itemBoxSizer14->Add(itemChoice16, 0, wxALIGN_LEFT|wxALL, 5); - } - - wxBoxSizer* itemBoxSizer17 = new wxBoxSizer(wxVERTICAL); - itemGridSizer4->Add(itemBoxSizer17, 0, wxALIGN_CENTER_HORIZONTAL|wxGROW, 5); - wxStaticText* itemStaticText18 = new wxStaticText( this, wxID_STATIC, _("&Point size:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer17->Add(itemStaticText18, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5); - -#if USE_SPINCTRL_FOR_POINT_SIZE - wxSpinCtrl* spinCtrl = new wxSpinCtrl(this, wxID_FONT_SIZE, wxT("12"), wxDefaultPosition, wxSize(80, wxDefaultCoord), wxSP_ARROW_KEYS, 1, 500, 12); - spinCtrl->SetHelpText(_("The font point size.")); - if (ShowToolTips()) - spinCtrl->SetToolTip(_("The font point size.")); - - itemBoxSizer17->Add(spinCtrl, 0, wxALIGN_LEFT|wxALL, 5); -#else - wxChoice* itemChoice19 = new wxChoice( this, wxID_FONT_SIZE, wxDefaultPosition, wxDefaultSize, 40, pointSizes, 0 ); - itemChoice19->SetHelpText(_("The font point size.")); - if (ShowToolTips()) - itemChoice19->SetToolTip(_("The font point size.")); - itemBoxSizer17->Add(itemChoice19, 0, wxALIGN_LEFT|wxALL, 5); -#endif - - if (m_fontData.GetEnableEffects()) - { - wxBoxSizer* itemBoxSizer20 = new wxBoxSizer(wxVERTICAL); - itemGridSizer4->Add(itemBoxSizer20, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5); - wxCheckBox* itemCheckBox21 = new wxCheckBox( this, wxID_FONT_UNDERLINE, _("&Underline"), wxDefaultPosition, wxDefaultSize, 0 ); - itemCheckBox21->SetValue(false); - itemCheckBox21->SetHelpText(_("Whether the font is underlined.")); - if (ShowToolTips()) - itemCheckBox21->SetToolTip(_("Whether the font is underlined.")); - itemBoxSizer20->Add(itemCheckBox21, 0, wxALIGN_LEFT|wxALL, 5); - } - - if (!is_pda) - itemBoxSizer3->Add(5, 5, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); - - wxStaticText* itemStaticText23 = new wxStaticText( this, wxID_STATIC, _("Preview:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer3->Add(itemStaticText23, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5); - - wxFontPreviewer* itemWindow24 = new wxFontPreviewer( this ); - m_previewer = itemWindow24; - itemWindow24->SetHelpText(_("Shows the font preview.")); - if (ShowToolTips()) - itemWindow24->SetToolTip(_("Shows the font preview.")); - itemBoxSizer3->Add(itemWindow24, 1, wxGROW|wxALL, 5); - - wxBoxSizer* itemBoxSizer25 = new wxBoxSizer(wxHORIZONTAL); - itemBoxSizer3->Add(itemBoxSizer25, 0, wxGROW, 5); - itemBoxSizer25->Add(5, 5, 1, wxGROW|wxALL, 5); - -#ifdef __WXMAC__ - wxButton* itemButton28 = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); - if (ShowToolTips()) - itemButton28->SetToolTip(_("Click to cancel the font selection.")); - itemBoxSizer25->Add(itemButton28, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - - wxButton* itemButton27 = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 ); - itemButton27->SetDefault(); - itemButton27->SetHelpText(_("Click to confirm the font selection.")); - if (ShowToolTips()) - itemButton27->SetToolTip(_("Click to confirm the font selection.")); - itemBoxSizer25->Add(itemButton27, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); -#else - wxButton* itemButton27 = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 ); - itemButton27->SetDefault(); - itemButton27->SetHelpText(_("Click to confirm the font selection.")); - if (ShowToolTips()) - itemButton27->SetToolTip(_("Click to confirm the font selection.")); - itemBoxSizer25->Add(itemButton27, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - - wxButton* itemButton28 = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); - if (ShowToolTips()) - itemButton28->SetToolTip(_("Click to cancel the font selection.")); - itemBoxSizer25->Add(itemButton28, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); -#endif - - m_familyChoice = (wxChoice*) FindWindow(wxID_FONT_FAMILY); - m_styleChoice = (wxChoice*) FindWindow(wxID_FONT_STYLE); - m_weightChoice = (wxChoice*) FindWindow(wxID_FONT_WEIGHT); - m_colourChoice = (wxChoice*) FindWindow(wxID_FONT_COLOUR); - m_underLineCheckBox = (wxCheckBox*) FindWindow(wxID_FONT_UNDERLINE); - - m_familyChoice->SetStringSelection( wxFontFamilyIntToString(m_dialogFont.GetFamily()) ); - m_styleChoice->SetStringSelection(wxFontStyleIntToString(m_dialogFont.GetStyle())); - m_weightChoice->SetStringSelection(wxFontWeightIntToString(m_dialogFont.GetWeight())); - - if (m_colourChoice) - { - wxString name(wxTheColourDatabase->FindName(m_fontData.GetColour())); - if ( name.empty() ) - m_colourChoice->SetStringSelection(wxT("BLACK")); - else - m_colourChoice->SetStringSelection(name); - } - - if (m_underLineCheckBox) - { - m_underLineCheckBox->SetValue(m_dialogFont.GetUnderlined()); - } - -#if USE_SPINCTRL_FOR_POINT_SIZE - spinCtrl->SetValue(m_dialogFont.GetPointSize()); -#else - m_pointSizeChoice = (wxChoice*) FindWindow(wxID_FONT_SIZE); - m_pointSizeChoice->SetSelection(m_dialogFont.GetPointSize()-1); -#endif - - GetSizer()->SetItemMinSize(m_previewer, is_pda ? 100 : 430, is_pda ? 40 : 100); - GetSizer()->SetSizeHints(this); - GetSizer()->Fit(this); - - Centre(wxBOTH); - - delete[] families; - delete[] styles; - delete[] weights; -#if !USE_SPINCTRL_FOR_POINT_SIZE - delete[] pointSizes; -#endif - - // Don't block events any more - m_useEvents = true; - -} - -void wxGenericFontDialog::InitializeFont() -{ - wxFontFamily fontFamily = wxFONTFAMILY_SWISS; - wxFontWeight fontWeight = wxFONTWEIGHT_NORMAL; - wxFontStyle fontStyle = wxFONTSTYLE_NORMAL; - int fontSize = 12; - bool fontUnderline = false; - - if (m_fontData.m_initialFont.IsOk()) - { - fontFamily = m_fontData.m_initialFont.GetFamily(); - fontWeight = m_fontData.m_initialFont.GetWeight(); - fontStyle = m_fontData.m_initialFont.GetStyle(); - fontSize = m_fontData.m_initialFont.GetPointSize(); - fontUnderline = m_fontData.m_initialFont.GetUnderlined(); - } - - m_dialogFont = wxFont(fontSize, fontFamily, fontStyle, - fontWeight, fontUnderline); - - if (m_previewer) - m_previewer->SetFont(m_dialogFont); -} - -void wxGenericFontDialog::OnChangeFont(wxCommandEvent& WXUNUSED(event)) -{ - DoChangeFont(); -} - -void wxGenericFontDialog::DoChangeFont() -{ - if (!m_useEvents) return; - - wxFontFamily fontFamily = wxFontFamilyStringToInt(m_familyChoice->GetStringSelection()); - wxFontWeight fontWeight = wxFontWeightStringToInt(m_weightChoice->GetStringSelection()); - wxFontStyle fontStyle = wxFontStyleStringToInt(m_styleChoice->GetStringSelection()); -#if USE_SPINCTRL_FOR_POINT_SIZE - wxSpinCtrl* fontSizeCtrl = wxDynamicCast(FindWindow(wxID_FONT_SIZE), wxSpinCtrl); - int fontSize = fontSizeCtrl->GetValue(); -#else - int fontSize = wxAtoi(m_pointSizeChoice->GetStringSelection()); -#endif - - // Start with previous underline setting, we want to retain it even if we can't edit it - // m_dialogFont is always initialized because of the call to InitializeFont - int fontUnderline = m_dialogFont.GetUnderlined(); - - if (m_underLineCheckBox) - { - fontUnderline = m_underLineCheckBox->GetValue(); - } - - m_dialogFont = wxFont(fontSize, fontFamily, fontStyle, fontWeight, (fontUnderline != 0)); - m_previewer->SetFont(m_dialogFont); - - if ( m_colourChoice ) - { - if ( !m_colourChoice->GetStringSelection().empty() ) - { - wxColour col = wxTheColourDatabase->Find(m_colourChoice->GetStringSelection()); - if (col.IsOk()) - { - m_fontData.m_fontColour = col; - } - } - } - // Update color here so that we can also use the color originally passed in - // (EnableEffects may be false) - if (m_fontData.m_fontColour.IsOk()) - m_previewer->SetForegroundColour(m_fontData.m_fontColour); - - m_previewer->Refresh(); -} - -#if USE_SPINCTRL_FOR_POINT_SIZE -void wxGenericFontDialog::OnChangeSize(wxSpinEvent& WXUNUSED(event)) -{ - DoChangeFont(); -} -#endif - -#endif - // wxUSE_FONTDLG diff --git a/Externals/wxWidgets3/src/generic/fontpickerg.cpp b/Externals/wxWidgets3/src/generic/fontpickerg.cpp deleted file mode 100644 index 6c74756fd8..0000000000 --- a/Externals/wxWidgets3/src/generic/fontpickerg.cpp +++ /dev/null @@ -1,119 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/generic/fontpickerg.cpp -// Purpose: wxGenericFontButton class implementation -// Author: Francesco Montorsi -// Modified by: -// Created: 15/04/2006 -// Copyright: (c) Francesco Montorsi -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_FONTPICKERCTRL - -#include "wx/fontpicker.h" - -#include "wx/fontdlg.h" - - -// ============================================================================ -// implementation -// ============================================================================ - -wxIMPLEMENT_DYNAMIC_CLASS(wxGenericFontButton, wxButton); - -// ---------------------------------------------------------------------------- -// wxGenericFontButton -// ---------------------------------------------------------------------------- - -bool wxGenericFontButton::Create( wxWindow *parent, wxWindowID id, - const wxFont &initial, const wxPoint &pos, - const wxSize &size, long style, - const wxValidator& validator, const wxString &name) -{ - wxString label = (style & wxFNTP_FONTDESC_AS_LABEL) ? - wxString() : // label will be updated by UpdateFont - _("Choose font"); - - // create this button - if (!wxButton::Create( parent, id, label, pos, - size, style, validator, name )) - { - wxFAIL_MSG( wxT("wxGenericFontButton creation failed") ); - return false; - } - - // and handle user clicks on it - Connect(GetId(), wxEVT_BUTTON, - wxCommandEventHandler(wxGenericFontButton::OnButtonClick), - NULL, this); - - InitFontData(); - - m_selectedFont = initial.IsOk() ? initial : *wxNORMAL_FONT; - UpdateFont(); - - return true; -} - -void wxGenericFontButton::InitFontData() -{ - m_data.SetAllowSymbols(true); - m_data.SetColour(*wxBLACK); - m_data.EnableEffects(true); -} - -void wxGenericFontButton::OnButtonClick(wxCommandEvent& WXUNUSED(ev)) -{ - // update the wxFontData to be shown in the dialog - m_data.SetInitialFont(m_selectedFont); - - // create the font dialog and display it - wxFontDialog dlg(this, m_data); - if (dlg.ShowModal() == wxID_OK) - { - m_data = dlg.GetFontData(); - SetSelectedFont(m_data.GetChosenFont()); - - // fire an event - wxFontPickerEvent event(this, GetId(), m_selectedFont); - GetEventHandler()->ProcessEvent(event); - } -} - -void wxGenericFontButton::UpdateFont() -{ - if ( !m_selectedFont.IsOk() ) - return; - - SetForegroundColour(m_data.GetColour()); - - if (HasFlag(wxFNTP_USEFONT_FOR_LABEL)) - { - // use currently selected font for the label... - wxButton::SetFont(m_selectedFont); - } - - if (HasFlag(wxFNTP_FONTDESC_AS_LABEL)) - { - SetLabel(wxString::Format(wxT("%s, %d"), - m_selectedFont.GetFaceName().c_str(), - m_selectedFont.GetPointSize())); - } -} - -#endif // wxUSE_FONTPICKERCTRL diff --git a/Externals/wxWidgets3/src/generic/fswatcherg.cpp b/Externals/wxWidgets3/src/generic/fswatcherg.cpp deleted file mode 100644 index a188a3095f..0000000000 --- a/Externals/wxWidgets3/src/generic/fswatcherg.cpp +++ /dev/null @@ -1,21 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/generic/fswatcherg.cpp -// Purpose: wxPollingFileSystemWatcher -// Author: Bartosz Bekier -// Created: 2009-05-26 -// Copyright: (c) 2009 Bartosz Bekier -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_FSWATCHER - -#include "wx/fswatcher.h" - -#endif // wxUSE_FSWATCHER diff --git a/Externals/wxWidgets3/src/generic/graphicc.cpp b/Externals/wxWidgets3/src/generic/graphicc.cpp deleted file mode 100644 index 891d734887..0000000000 --- a/Externals/wxWidgets3/src/generic/graphicc.cpp +++ /dev/null @@ -1,2779 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/generic/graphicc.cpp -// Purpose: cairo device context class -// Author: Stefan Csomor -// Modified by: -// Created: 2006-10-03 -// Copyright: (c) 2006 Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_GRAPHICS_CONTEXT - -#include "wx/graphics.h" - -#if wxUSE_CAIRO - -// keep cairo.h from defining dllimport as we're defining the symbols inside -// the wx dll in order to load them dynamically. -#define cairo_public - -#include - -bool wxCairoInit(); - -#ifndef WX_PRECOMP - #include "wx/bitmap.h" - #include "wx/icon.h" - #include "wx/dcclient.h" - #include "wx/dcmemory.h" - #include "wx/dcprint.h" - #include "wx/window.h" -#endif - -#include "wx/private/graphics.h" -#include "wx/rawbmp.h" -#include "wx/vector.h" - -using namespace std; - -//----------------------------------------------------------------------------- -// device context implementation -// -// more and more of the dc functionality should be implemented by calling -// the appropricate wxCairoContext, but we will have to do that step by step -// also coordinate conversions should be moved to native matrix ops -//----------------------------------------------------------------------------- - -// we always stock two context states, one at entry, to be able to preserve the -// state we were called with, the other one after changing to HI Graphics orientation -// (this one is used for getting back clippings etc) - -//----------------------------------------------------------------------------- -// wxGraphicsPath implementation -//----------------------------------------------------------------------------- - -#include -#ifdef __WXMSW__ -// TODO remove this dependency (gdiplus needs the macros) - -#ifndef max -#define max(a,b) (((a) > (b)) ? (a) : (b)) -#endif - -#ifndef min -#define min(a,b) (((a) < (b)) ? (a) : (b)) -#endif - -#include -// Notice that the order is important: cairo-win32.h includes windows.h which -// pollutes the global name space with macros so include our own header which -// #undefines them after it. -#include "wx/msw/private.h" -#endif - -#ifdef __WXGTK__ -#include -#include "wx/fontutil.h" -#ifndef __WXGTK3__ -#include "wx/gtk/dc.h" -#endif -#endif - -#ifdef __WXQT__ -#include -#include "wx/qt/dc.h" -#endif - -#ifdef __WXMAC__ -#include "wx/osx/private.h" -#include -#include -#endif - -class WXDLLIMPEXP_CORE wxCairoPathData : public wxGraphicsPathData -{ -public : - wxCairoPathData(wxGraphicsRenderer* renderer, cairo_t* path = NULL); - ~wxCairoPathData(); - - virtual wxGraphicsObjectRefData *Clone() const wxOVERRIDE; - - // - // These are the path primitives from which everything else can be constructed - // - - // begins a new subpath at (x,y) - virtual void MoveToPoint( wxDouble x, wxDouble y ) wxOVERRIDE; - - // adds a straight line from the current point to (x,y) - virtual void AddLineToPoint( wxDouble x, wxDouble y ) wxOVERRIDE; - - // adds a cubic Bezier curve from the current point, using two control points and an end point - virtual void AddCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble cx2, wxDouble cy2, wxDouble x, wxDouble y ) wxOVERRIDE; - - - // adds an arc of a circle centering at (x,y) with radius (r) from startAngle to endAngle - virtual void AddArc( wxDouble x, wxDouble y, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise ) wxOVERRIDE ; - - // gets the last point of the current path, (0,0) if not yet set - virtual void GetCurrentPoint( wxDouble* x, wxDouble* y) const wxOVERRIDE; - - // adds another path - virtual void AddPath( const wxGraphicsPathData* path ) wxOVERRIDE; - - // closes the current sub-path - virtual void CloseSubpath() wxOVERRIDE; - - // - // These are convenience functions which - if not available natively will be assembled - // using the primitives from above - // - - /* - - // appends a rectangle as a new closed subpath - virtual void AddRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h ) ; - // appends an ellipsis as a new closed subpath fitting the passed rectangle - virtual void AddEllipsis( wxDouble x, wxDouble y, wxDouble w , wxDouble h ) ; - - // draws a an arc to two tangents connecting (current) to (x1,y1) and (x1,y1) to (x2,y2), also a straight line from (current) to (x1,y1) - virtual void AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r ) ; - */ - - // returns the native path - virtual void * GetNativePath() const wxOVERRIDE ; - - // give the native path returned by GetNativePath() back (there might be some deallocations necessary) - virtual void UnGetNativePath(void *p) const wxOVERRIDE; - - // transforms each point of this path by the matrix - virtual void Transform( const wxGraphicsMatrixData* matrix ) wxOVERRIDE ; - - // gets the bounding box enclosing all points (possibly including control points) - virtual void GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) const wxOVERRIDE; - - virtual bool Contains( wxDouble x, wxDouble y, wxPolygonFillMode fillStyle = wxWINDING_RULE) const wxOVERRIDE; - -private : - cairo_t* m_pathContext; -}; - -class WXDLLIMPEXP_CORE wxCairoMatrixData : public wxGraphicsMatrixData -{ -public : - wxCairoMatrixData(wxGraphicsRenderer* renderer, const cairo_matrix_t* matrix = NULL ) ; - virtual ~wxCairoMatrixData() ; - - virtual wxGraphicsObjectRefData *Clone() const wxOVERRIDE ; - - // concatenates the matrix - virtual void Concat( const wxGraphicsMatrixData *t ) wxOVERRIDE; - - // sets the matrix to the respective values - virtual void Set(wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0, - wxDouble tx=0.0, wxDouble ty=0.0) wxOVERRIDE; - - // gets the component valuess of the matrix - virtual void Get(wxDouble* a=NULL, wxDouble* b=NULL, wxDouble* c=NULL, - wxDouble* d=NULL, wxDouble* tx=NULL, wxDouble* ty=NULL) const wxOVERRIDE; - - // makes this the inverse matrix - virtual void Invert() wxOVERRIDE; - - // returns true if the elements of the transformation matrix are equal ? - virtual bool IsEqual( const wxGraphicsMatrixData* t) const wxOVERRIDE ; - - // return true if this is the identity matrix - virtual bool IsIdentity() const wxOVERRIDE; - - // - // transformation - // - - // add the translation to this matrix - virtual void Translate( wxDouble dx , wxDouble dy ) wxOVERRIDE; - - // add the scale to this matrix - virtual void Scale( wxDouble xScale , wxDouble yScale ) wxOVERRIDE; - - // add the rotation to this matrix (radians) - virtual void Rotate( wxDouble angle ) wxOVERRIDE; - - // - // apply the transforms - // - - // applies that matrix to the point - virtual void TransformPoint( wxDouble *x, wxDouble *y ) const wxOVERRIDE; - - // applies the matrix except for translations - virtual void TransformDistance( wxDouble *dx, wxDouble *dy ) const wxOVERRIDE; - - // returns the native representation - virtual void * GetNativeMatrix() const wxOVERRIDE; -private: - cairo_matrix_t m_matrix ; -} ; - -// Common base class for pens and brushes. -class wxCairoPenBrushBaseData : public wxGraphicsObjectRefData -{ -public: - wxCairoPenBrushBaseData(wxGraphicsRenderer* renderer, - const wxColour& col, - bool isTransparent); - virtual ~wxCairoPenBrushBaseData(); - - virtual void Apply( wxGraphicsContext* context ); - -protected: - // Call this to use the given bitmap as stipple. Bitmap must be non-null - // and valid. - void InitStipple(wxBitmap* bmp); - - // Call this to use the given hatch style. Hatch style must be valid. - void InitHatch(wxHatchStyle hatchStyle); - - - double m_red; - double m_green; - double m_blue; - double m_alpha; - - cairo_pattern_t* m_pattern; - class wxCairoBitmapData* m_bmpdata; - -private: - // Called once to allocate m_pattern if needed. - void InitHatchPattern(cairo_t* ctext); - - wxHatchStyle m_hatchStyle; - - wxDECLARE_NO_COPY_CLASS(wxCairoPenBrushBaseData); -}; - -class WXDLLIMPEXP_CORE wxCairoPenData : public wxCairoPenBrushBaseData -{ -public: - wxCairoPenData( wxGraphicsRenderer* renderer, const wxPen &pen ); - ~wxCairoPenData(); - - void Init(); - - virtual void Apply( wxGraphicsContext* context ) wxOVERRIDE; - virtual wxDouble GetWidth() { return m_width; } - -private : - double m_width; - - cairo_line_cap_t m_cap; - cairo_line_join_t m_join; - - int m_count; - const double *m_lengths; - double *m_userLengths; - - wxDECLARE_NO_COPY_CLASS(wxCairoPenData); -}; - -class WXDLLIMPEXP_CORE wxCairoBrushData : public wxCairoPenBrushBaseData -{ -public: - wxCairoBrushData( wxGraphicsRenderer* renderer ); - wxCairoBrushData( wxGraphicsRenderer* renderer, const wxBrush &brush ); - - void CreateLinearGradientBrush(wxDouble x1, wxDouble y1, - wxDouble x2, wxDouble y2, - const wxGraphicsGradientStops& stops); - void CreateRadialGradientBrush(wxDouble xo, wxDouble yo, - wxDouble xc, wxDouble yc, wxDouble radius, - const wxGraphicsGradientStops& stops); - -protected: - virtual void Init(); - - // common part of Create{Linear,Radial}GradientBrush() - void AddGradientStops(const wxGraphicsGradientStops& stops); -}; - -class wxCairoFontData : public wxGraphicsObjectRefData -{ -public: - wxCairoFontData( wxGraphicsRenderer* renderer, const wxFont &font, const wxColour& col ); - wxCairoFontData(wxGraphicsRenderer* renderer, - double sizeInPixels, - const wxString& facename, - int flags, - const wxColour& col); - ~wxCairoFontData(); - - virtual bool Apply( wxGraphicsContext* context ); -#ifdef __WXGTK__ - const wxFont& GetFont() const { return m_wxfont; } -#endif -private : - void InitColour(const wxColour& col); - void InitFontComponents(const wxString& facename, - cairo_font_slant_t slant, - cairo_font_weight_t weight); - - double m_size; - double m_red; - double m_green; - double m_blue; - double m_alpha; -#ifdef __WXMAC__ - cairo_font_face_t *m_font; -#elif defined(__WXGTK__) - wxFont m_wxfont; -#endif - - // These members are used when the font is created from its face name and - // flags (and not from wxFont) and also even when creating it from wxFont - // on the platforms not covered above. - // - // Notice that we can't use cairo_font_face_t instead of storing those, - // even though it would be simpler and need less #ifdefs, because - // cairo_toy_font_face_create() that we'd need to create it is only - // available in Cairo 1.8 and we require just 1.2 currently. If we do drop - // support for < 1.8 versions in the future it would be definitely better - // to use cairo_toy_font_face_create() instead. - wxCharBuffer m_fontName; - cairo_font_slant_t m_slant; - cairo_font_weight_t m_weight; -}; - -class wxCairoBitmapData : public wxGraphicsBitmapData -{ -public: - wxCairoBitmapData( wxGraphicsRenderer* renderer, const wxBitmap& bmp ); -#if wxUSE_IMAGE - wxCairoBitmapData(wxGraphicsRenderer* renderer, const wxImage& image); -#endif // wxUSE_IMAGE - wxCairoBitmapData( wxGraphicsRenderer* renderer, cairo_surface_t* bitmap ); - ~wxCairoBitmapData(); - - virtual cairo_surface_t* GetCairoSurface() { return m_surface; } - virtual cairo_pattern_t* GetCairoPattern() { return m_pattern; } - virtual void* GetNativeBitmap() const wxOVERRIDE { return m_surface; } - virtual wxSize GetSize() { return wxSize(m_width, m_height); } - -#if wxUSE_IMAGE - wxImage ConvertToImage() const; -#endif // wxUSE_IMAGE - -private : - // Allocate m_buffer for the bitmap of the given size in the given format. - // - // Returns the stride used for the buffer. - int InitBuffer(int width, int height, cairo_format_t format); - - // Really create the surface using the buffer (which was supposed to be - // filled since InitBuffer() call). - void InitSurface(cairo_format_t format, int stride); - - - cairo_surface_t* m_surface; - cairo_pattern_t* m_pattern; - int m_width; - int m_height; - unsigned char* m_buffer; -}; - -class WXDLLIMPEXP_CORE wxCairoContext : public wxGraphicsContext -{ -public: - wxCairoContext( wxGraphicsRenderer* renderer, const wxWindowDC& dc ); - wxCairoContext( wxGraphicsRenderer* renderer, const wxMemoryDC& dc ); -#if wxUSE_PRINTING_ARCHITECTURE - wxCairoContext( wxGraphicsRenderer* renderer, const wxPrinterDC& dc ); -#endif -#ifdef __WXGTK__ - wxCairoContext( wxGraphicsRenderer* renderer, GdkWindow *window ); -#endif -#ifdef __WXMSW__ - wxCairoContext( wxGraphicsRenderer* renderer, HDC context ); -#endif - wxCairoContext( wxGraphicsRenderer* renderer, cairo_t *context ); - wxCairoContext( wxGraphicsRenderer* renderer, wxWindow *window); - - // If this ctor is used, Init() must be called by the derived class later. - wxCairoContext( wxGraphicsRenderer* renderer ); - - virtual ~wxCairoContext(); - - virtual bool ShouldOffset() const wxOVERRIDE - { - if ( !m_enableOffset ) - return false; - - int penwidth = 0 ; - if ( !m_pen.IsNull() ) - { - penwidth = (int)((wxCairoPenData*)m_pen.GetRefData())->GetWidth(); - if ( penwidth == 0 ) - penwidth = 1; - } - return ( penwidth % 2 ) == 1; - } - - virtual void Clip( const wxRegion ®ion ) wxOVERRIDE; -#ifdef __WXMSW__ - cairo_surface_t* m_mswSurface; - WindowHDC m_mswWindowHDC; -#endif - - // clips drawings to the rect - virtual void Clip( wxDouble x, wxDouble y, wxDouble w, wxDouble h ) wxOVERRIDE; - - // resets the clipping to original extent - virtual void ResetClip() wxOVERRIDE; - - virtual void * GetNativeContext() wxOVERRIDE; - - virtual bool SetAntialiasMode(wxAntialiasMode antialias) wxOVERRIDE; - - virtual bool SetInterpolationQuality(wxInterpolationQuality interpolation) wxOVERRIDE; - - virtual bool SetCompositionMode(wxCompositionMode op) wxOVERRIDE; - - virtual void BeginLayer(wxDouble opacity) wxOVERRIDE; - - virtual void EndLayer() wxOVERRIDE; - - virtual void StrokePath( const wxGraphicsPath& p ) wxOVERRIDE; - virtual void FillPath( const wxGraphicsPath& p , wxPolygonFillMode fillStyle = wxWINDING_RULE ) wxOVERRIDE; - - virtual void Translate( wxDouble dx , wxDouble dy ) wxOVERRIDE; - virtual void Scale( wxDouble xScale , wxDouble yScale ) wxOVERRIDE; - virtual void Rotate( wxDouble angle ) wxOVERRIDE; - - // concatenates this transform with the current transform of this context - virtual void ConcatTransform( const wxGraphicsMatrix& matrix ) wxOVERRIDE; - - // sets the transform of this context - virtual void SetTransform( const wxGraphicsMatrix& matrix ) wxOVERRIDE; - - // gets the matrix of this context - virtual wxGraphicsMatrix GetTransform() const wxOVERRIDE; - - virtual void DrawBitmap( const wxGraphicsBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) wxOVERRIDE; - virtual void DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) wxOVERRIDE; - virtual void DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) wxOVERRIDE; - virtual void PushState() wxOVERRIDE; - virtual void PopState() wxOVERRIDE; - - virtual void GetTextExtent( const wxString &str, wxDouble *width, wxDouble *height, - wxDouble *descent, wxDouble *externalLeading ) const wxOVERRIDE; - virtual void GetPartialTextExtents(const wxString& text, wxArrayDouble& widths) const wxOVERRIDE; - -protected: - virtual void DoDrawText( const wxString &str, wxDouble x, wxDouble y ) wxOVERRIDE; - - void Init(cairo_t *context); - -#ifdef __WXQT__ - QPainter* m_qtPainter; - QImage* m_qtImage; - cairo_surface_t* m_qtSurface; -#endif - -private: - cairo_t* m_context; - - wxVector m_layerOpacities; - - wxDECLARE_NO_COPY_CLASS(wxCairoContext); -}; - -#if wxUSE_IMAGE -// ---------------------------------------------------------------------------- -// wxCairoImageContext: context associated with a wxImage. -// ---------------------------------------------------------------------------- - -class wxCairoImageContext : public wxCairoContext -{ -public: - wxCairoImageContext(wxGraphicsRenderer* renderer, wxImage& image) : - wxCairoContext(renderer), - m_image(image), - m_data(renderer, image) - { - Init(cairo_create(m_data.GetCairoSurface())); - } - - virtual ~wxCairoImageContext() - { - Flush(); - } - - virtual void Flush() wxOVERRIDE - { - m_image = m_data.ConvertToImage(); - } - -private: - wxImage& m_image; - wxCairoBitmapData m_data; - - wxDECLARE_NO_COPY_CLASS(wxCairoImageContext); -}; -#endif // wxUSE_IMAGE - -// ---------------------------------------------------------------------------- -// wxCairoPenBrushBaseData implementation -//----------------------------------------------------------------------------- - -wxCairoPenBrushBaseData::wxCairoPenBrushBaseData(wxGraphicsRenderer* renderer, - const wxColour& col, - bool isTransparent) - : wxGraphicsObjectRefData(renderer) -{ - m_hatchStyle = wxHATCHSTYLE_INVALID; - m_pattern = NULL; - m_bmpdata = NULL; - - if ( isTransparent ) - { - m_red = - m_green = - m_blue = - m_alpha = 0; - } - else // non-transparent - { - m_red = col.Red()/255.0; - m_green = col.Green()/255.0; - m_blue = col.Blue()/255.0; - m_alpha = col.Alpha()/255.0; - } -} - -wxCairoPenBrushBaseData::~wxCairoPenBrushBaseData() -{ - if (m_bmpdata) - { - // Deleting the bitmap data also deletes the pattern referenced by - // m_pattern, so set it to NULL to avoid deleting it twice. - delete m_bmpdata; - m_pattern = NULL; - } - if (m_pattern) - cairo_pattern_destroy(m_pattern); -} - -void wxCairoPenBrushBaseData::InitHatchPattern(cairo_t* ctext) -{ - cairo_surface_t* const - surface = cairo_surface_create_similar( - cairo_get_target(ctext), CAIRO_CONTENT_COLOR_ALPHA, 10, 10 - ); - - cairo_t* const cr = cairo_create(surface); - cairo_set_line_cap(cr, CAIRO_LINE_CAP_SQUARE); - cairo_set_line_width(cr, 1); - cairo_set_line_join(cr,CAIRO_LINE_JOIN_MITER); - - switch ( m_hatchStyle ) - { - case wxHATCHSTYLE_CROSS: - cairo_move_to(cr, 5, 0); - cairo_line_to(cr, 5, 10); - cairo_move_to(cr, 0, 5); - cairo_line_to(cr, 10, 5); - break; - - case wxHATCHSTYLE_BDIAGONAL: - cairo_move_to(cr, 0, 10); - cairo_line_to(cr, 10, 0); - break; - - case wxHATCHSTYLE_FDIAGONAL: - cairo_move_to(cr, 0, 0); - cairo_line_to(cr, 10, 10); - break; - - case wxHATCHSTYLE_CROSSDIAG: - cairo_move_to(cr, 0, 0); - cairo_line_to(cr, 10, 10); - cairo_move_to(cr, 10, 0); - cairo_line_to(cr, 0, 10); - break; - - case wxHATCHSTYLE_HORIZONTAL: - cairo_move_to(cr, 0, 5); - cairo_line_to(cr, 10, 5); - break; - - case wxHATCHSTYLE_VERTICAL: - cairo_move_to(cr, 5, 0); - cairo_line_to(cr, 5, 10); - break; - - default: - wxFAIL_MSG(wxS("Invalid hatch pattern style.")); - } - - cairo_set_source_rgba(cr, m_red, m_green, m_blue, m_alpha); - cairo_stroke(cr); - - cairo_destroy(cr); - - m_pattern = cairo_pattern_create_for_surface(surface); - cairo_surface_destroy(surface); - cairo_pattern_set_extend(m_pattern, CAIRO_EXTEND_REPEAT); -} - -void wxCairoPenBrushBaseData::InitStipple(wxBitmap* bmp) -{ - wxCHECK_RET( bmp && bmp->IsOk(), wxS("Invalid stippled bitmap") ); - - m_bmpdata = new wxCairoBitmapData(GetRenderer(), *bmp); - m_pattern = m_bmpdata->GetCairoPattern(); - cairo_pattern_set_extend(m_pattern, CAIRO_EXTEND_REPEAT); -} - -void wxCairoPenBrushBaseData::InitHatch(wxHatchStyle hatchStyle) -{ - // We can't create m_pattern right now as we don't have the Cairo context - // needed for it, so just remember that we need to do it. - m_hatchStyle = hatchStyle; -} - -void wxCairoPenBrushBaseData::Apply( wxGraphicsContext* context ) -{ - cairo_t* const ctext = (cairo_t*) context->GetNativeContext(); - - if ( m_hatchStyle != wxHATCHSTYLE_INVALID && !m_pattern ) - InitHatchPattern(ctext); - - if ( m_pattern ) - cairo_set_source(ctext, m_pattern); - else - cairo_set_source_rgba(ctext, m_red, m_green, m_blue, m_alpha); -} - -//----------------------------------------------------------------------------- -// wxCairoPenData implementation -//----------------------------------------------------------------------------- - -wxCairoPenData::~wxCairoPenData() -{ - delete[] m_userLengths; -} - -void wxCairoPenData::Init() -{ - m_lengths = NULL; - m_userLengths = NULL; - m_width = 0; - m_count = 0; -} - -wxCairoPenData::wxCairoPenData( wxGraphicsRenderer* renderer, const wxPen &pen ) - : wxCairoPenBrushBaseData(renderer, pen.GetColour(), pen.IsTransparent()) -{ - Init(); - m_width = pen.GetWidth(); - if (m_width <= 0.0) - m_width = 0.1; - - switch ( pen.GetCap() ) - { - case wxCAP_ROUND : - m_cap = CAIRO_LINE_CAP_ROUND; - break; - - case wxCAP_PROJECTING : - m_cap = CAIRO_LINE_CAP_SQUARE; - break; - - case wxCAP_BUTT : - m_cap = CAIRO_LINE_CAP_BUTT; - break; - - default : - m_cap = CAIRO_LINE_CAP_BUTT; - break; - } - - switch ( pen.GetJoin() ) - { - case wxJOIN_BEVEL : - m_join = CAIRO_LINE_JOIN_BEVEL; - break; - - case wxJOIN_MITER : - m_join = CAIRO_LINE_JOIN_MITER; - break; - - case wxJOIN_ROUND : - m_join = CAIRO_LINE_JOIN_ROUND; - break; - - default : - m_join = CAIRO_LINE_JOIN_MITER; - break; - } - - const double dashUnit = m_width < 1.0 ? 1.0 : m_width; - const double dotted[] = - { - dashUnit , dashUnit + 2.0 - }; - static const double short_dashed[] = - { - 9.0 , 6.0 - }; - static const double dashed[] = - { - 19.0 , 9.0 - }; - static const double dotted_dashed[] = - { - 9.0 , 6.0 , 3.0 , 3.0 - }; - - switch ( pen.GetStyle() ) - { - case wxPENSTYLE_SOLID : - break; - - case wxPENSTYLE_DOT : - m_count = WXSIZEOF(dotted); - m_userLengths = new double[ m_count ] ; - memcpy( m_userLengths, dotted, sizeof(dotted) ); - m_lengths = m_userLengths; - break; - - case wxPENSTYLE_LONG_DASH : - m_lengths = dashed ; - m_count = WXSIZEOF(dashed); - break; - - case wxPENSTYLE_SHORT_DASH : - m_lengths = short_dashed ; - m_count = WXSIZEOF(short_dashed); - break; - - case wxPENSTYLE_DOT_DASH : - m_lengths = dotted_dashed ; - m_count = WXSIZEOF(dotted_dashed); - break; - - case wxPENSTYLE_USER_DASH : - { - wxDash *wxdashes ; - m_count = pen.GetDashes( &wxdashes ) ; - if ((wxdashes != NULL) && (m_count > 0)) - { - m_userLengths = new double[m_count] ; - for ( int i = 0 ; i < m_count ; ++i ) - { - m_userLengths[i] = wxdashes[i] * dashUnit ; - - if ( i % 2 == 1 && m_userLengths[i] < dashUnit + 2.0 ) - m_userLengths[i] = dashUnit + 2.0 ; - else if ( i % 2 == 0 && m_userLengths[i] < dashUnit ) - m_userLengths[i] = dashUnit ; - } - } - m_lengths = m_userLengths ; - } - break; - - case wxPENSTYLE_STIPPLE : - case wxPENSTYLE_STIPPLE_MASK : - case wxPENSTYLE_STIPPLE_MASK_OPAQUE : - InitStipple(pen.GetStipple()); - break; - - default : - if ( pen.GetStyle() >= wxPENSTYLE_FIRST_HATCH - && pen.GetStyle() <= wxPENSTYLE_LAST_HATCH ) - { - InitHatch(static_cast(pen.GetStyle())); - } - break; - } -} - -void wxCairoPenData::Apply( wxGraphicsContext* context ) -{ - wxCairoPenBrushBaseData::Apply(context); - - cairo_t * ctext = (cairo_t*) context->GetNativeContext(); - cairo_set_line_width(ctext,m_width); - cairo_set_line_cap(ctext,m_cap); - cairo_set_line_join(ctext,m_join); - cairo_set_dash(ctext,(double*)m_lengths,m_count,0.0); -} - -//----------------------------------------------------------------------------- -// wxCairoBrushData implementation -//----------------------------------------------------------------------------- - -wxCairoBrushData::wxCairoBrushData( wxGraphicsRenderer* renderer ) - : wxCairoPenBrushBaseData(renderer, wxColour(), true /* transparent */) -{ - Init(); -} - -wxCairoBrushData::wxCairoBrushData( wxGraphicsRenderer* renderer, - const wxBrush &brush ) - : wxCairoPenBrushBaseData(renderer, brush.GetColour(), brush.IsTransparent()) -{ - Init(); - - switch ( brush.GetStyle() ) - { - case wxBRUSHSTYLE_STIPPLE: - case wxBRUSHSTYLE_STIPPLE_MASK: - case wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE: - InitStipple(brush.GetStipple()); - break; - - default: - if ( brush.IsHatch() ) - InitHatch(static_cast(brush.GetStyle())); - break; - } -} - -void wxCairoBrushData::AddGradientStops(const wxGraphicsGradientStops& stops) -{ - // loop over all the stops, they include the beginning and ending ones - const unsigned numStops = stops.GetCount(); - for ( unsigned n = 0; n < numStops; n++ ) - { - const wxGraphicsGradientStop stop = stops.Item(n); - - const wxColour col = stop.GetColour(); - - cairo_pattern_add_color_stop_rgba - ( - m_pattern, - stop.GetPosition(), - col.Red()/255.0, - col.Green()/255.0, - col.Blue()/255.0, - col.Alpha()/255.0 - ); - } - - wxASSERT_MSG(cairo_pattern_status(m_pattern) == CAIRO_STATUS_SUCCESS, - wxT("Couldn't create cairo pattern")); -} - -void -wxCairoBrushData::CreateLinearGradientBrush(wxDouble x1, wxDouble y1, - wxDouble x2, wxDouble y2, - const wxGraphicsGradientStops& stops) -{ - m_pattern = cairo_pattern_create_linear(x1,y1,x2,y2); - - AddGradientStops(stops); -} - -void -wxCairoBrushData::CreateRadialGradientBrush(wxDouble xo, wxDouble yo, - wxDouble xc, wxDouble yc, - wxDouble radius, - const wxGraphicsGradientStops& stops) -{ - m_pattern = cairo_pattern_create_radial(xo,yo,0.0,xc,yc,radius); - - AddGradientStops(stops); -} - -void wxCairoBrushData::Init() -{ - m_pattern = NULL; - m_bmpdata = NULL; -} - -//----------------------------------------------------------------------------- -// wxCairoFontData implementation -//----------------------------------------------------------------------------- - -void wxCairoFontData::InitColour(const wxColour& col) -{ - m_red = col.Red()/255.0; - m_green = col.Green()/255.0; - m_blue = col.Blue()/255.0; - m_alpha = col.Alpha()/255.0; -} - -void -wxCairoFontData::InitFontComponents(const wxString& facename, - cairo_font_slant_t slant, - cairo_font_weight_t weight) -{ - m_fontName = facename.mb_str(wxConvUTF8); - m_slant = slant; - m_weight = weight; -} - -wxCairoFontData::wxCairoFontData( wxGraphicsRenderer* renderer, const wxFont &font, - const wxColour& col ) - : wxGraphicsObjectRefData(renderer) -#ifdef __WXGTK__ - , m_wxfont(font) -#endif -{ - InitColour(col); - - m_size = font.GetPointSize(); - -#ifdef __WXMAC__ - m_font = cairo_quartz_font_face_create_for_cgfont( font.OSXGetCGFont() ); -#elif defined(__WXGTK__) -#else - InitFontComponents - ( - font.GetFaceName(), - font.GetStyle() == wxFONTSTYLE_ITALIC ? CAIRO_FONT_SLANT_ITALIC - : CAIRO_FONT_SLANT_NORMAL, - font.GetWeight() == wxFONTWEIGHT_BOLD ? CAIRO_FONT_WEIGHT_BOLD - : CAIRO_FONT_WEIGHT_NORMAL - ); -#endif -} - -wxCairoFontData::wxCairoFontData(wxGraphicsRenderer* renderer, - double sizeInPixels, - const wxString& facename, - int flags, - const wxColour& col) : - wxGraphicsObjectRefData(renderer) -{ - InitColour(col); - - // Resolution for Cairo image surfaces is 72 DPI meaning that the sizes in - // points and pixels are identical, so we can just pass the size in pixels - // directly to cairo_set_font_size(). - m_size = sizeInPixels; - -#if defined(__WXMAC__) - m_font = NULL; -#endif - - // There is no need to set m_underlined under wxGTK in this case, it can - // only be used if m_font != NULL. - - InitFontComponents - ( - facename, - flags & wxFONTFLAG_ITALIC ? CAIRO_FONT_SLANT_ITALIC - : CAIRO_FONT_SLANT_NORMAL, - flags & wxFONTFLAG_BOLD ? CAIRO_FONT_WEIGHT_BOLD - : CAIRO_FONT_WEIGHT_NORMAL - ); -} - -wxCairoFontData::~wxCairoFontData() -{ -#ifdef __WXMAC__ - if ( m_font ) - cairo_font_face_destroy( m_font ); -#endif -} - -bool wxCairoFontData::Apply( wxGraphicsContext* context ) -{ - cairo_t * ctext = (cairo_t*) context->GetNativeContext(); - cairo_set_source_rgba(ctext,m_red,m_green, m_blue,m_alpha); -#ifdef __WXGTK__ - if (m_wxfont.IsOk()) - { - // Nothing to do, the caller uses Pango layout functions to do - // everything. - return true; - } -#elif defined(__WXMAC__) - if ( m_font ) - { - cairo_set_font_face(ctext, m_font); - cairo_set_font_size(ctext, m_size ); - return true; - } -#endif - - // If we get here, we must be on a platform without native font support or - // we're using toy Cairo API even under wxGTK/wxMac. - cairo_select_font_face(ctext, m_fontName, m_slant, m_weight ); - cairo_set_font_size(ctext, m_size ); - - // Indicate that we don't use native fonts for the platforms which care - // about this (currently only wxGTK). - return false; -} - -//----------------------------------------------------------------------------- -// wxCairoPathData implementation -//----------------------------------------------------------------------------- - -wxCairoPathData::wxCairoPathData( wxGraphicsRenderer* renderer, cairo_t* pathcontext) - : wxGraphicsPathData(renderer) -{ - if (pathcontext) - { - m_pathContext = pathcontext; - } - else - { - cairo_surface_t* surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32,1,1); - m_pathContext = cairo_create(surface); - cairo_surface_destroy (surface); - } -} - -wxCairoPathData::~wxCairoPathData() -{ - cairo_destroy(m_pathContext); -} - -wxGraphicsObjectRefData *wxCairoPathData::Clone() const -{ - cairo_surface_t* surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32,1,1); - cairo_t* pathcontext = cairo_create(surface); - cairo_surface_destroy (surface); - - cairo_path_t* path = cairo_copy_path(m_pathContext); - cairo_append_path(pathcontext, path); - cairo_path_destroy(path); - return new wxCairoPathData( GetRenderer() ,pathcontext); -} - - -void* wxCairoPathData::GetNativePath() const -{ - return cairo_copy_path(m_pathContext) ; -} - -void wxCairoPathData::UnGetNativePath(void *p) const -{ - cairo_path_destroy((cairo_path_t*)p); -} - -// -// The Primitives -// - -void wxCairoPathData::MoveToPoint( wxDouble x , wxDouble y ) -{ - cairo_move_to(m_pathContext,x,y); -} - -void wxCairoPathData::AddLineToPoint( wxDouble x , wxDouble y ) -{ - cairo_line_to(m_pathContext,x,y); -} - -void wxCairoPathData::AddPath( const wxGraphicsPathData* path ) -{ - cairo_path_t* p = (cairo_path_t*)path->GetNativePath(); - cairo_append_path(m_pathContext, p); - UnGetNativePath(p); -} - -void wxCairoPathData::CloseSubpath() -{ - cairo_close_path(m_pathContext); -} - -void wxCairoPathData::AddCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble cx2, wxDouble cy2, wxDouble x, wxDouble y ) -{ - cairo_curve_to(m_pathContext,cx1,cy1,cx2,cy2,x,y); -} - -// gets the last point of the current path, (0,0) if not yet set -void wxCairoPathData::GetCurrentPoint( wxDouble* x, wxDouble* y) const -{ - double dx,dy; - cairo_get_current_point(m_pathContext,&dx,&dy); - if (x) - *x = dx; - if (y) - *y = dy; -} - -void wxCairoPathData::AddArc( wxDouble x, wxDouble y, wxDouble r, double startAngle, double endAngle, bool clockwise ) -{ - // as clockwise means positive in our system (y pointing downwards) - // TODO make this interpretation dependent of the - // real device trans - if ( clockwise||(endAngle-startAngle)>=2*M_PI) - cairo_arc(m_pathContext,x,y,r,startAngle,endAngle); - else - cairo_arc_negative(m_pathContext,x,y,r,startAngle,endAngle); -} - -// transforms each point of this path by the matrix -void wxCairoPathData::Transform( const wxGraphicsMatrixData* matrix ) -{ - // as we don't have a true path object, we have to apply the inverse - // matrix to the context - cairo_matrix_t m = *((cairo_matrix_t*) matrix->GetNativeMatrix()); - cairo_matrix_invert( &m ); - cairo_transform(m_pathContext,&m); -} - -// gets the bounding box enclosing all points (possibly including control points) -void wxCairoPathData::GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) const -{ - double x1,y1,x2,y2; - - cairo_stroke_extents( m_pathContext, &x1, &y1, &x2, &y2 ); - if ( x2 < x1 ) - { - *x = x2; - *w = x1-x2; - } - else - { - *x = x1; - *w = x2-x1; - } - - if( y2 < y1 ) - { - *y = y2; - *h = y1-y2; - } - else - { - *y = y1; - *h = y2-y1; - } -} - -bool wxCairoPathData::Contains( wxDouble x, wxDouble y, wxPolygonFillMode fillStyle ) const -{ - cairo_set_fill_rule(m_pathContext,fillStyle==wxODDEVEN_RULE ? CAIRO_FILL_RULE_EVEN_ODD : CAIRO_FILL_RULE_WINDING); - return cairo_in_fill( m_pathContext, x, y) != 0; -} - -//----------------------------------------------------------------------------- -// wxCairoMatrixData implementation -//----------------------------------------------------------------------------- - -wxCairoMatrixData::wxCairoMatrixData(wxGraphicsRenderer* renderer, const cairo_matrix_t* matrix ) - : wxGraphicsMatrixData(renderer) -{ - if ( matrix ) - m_matrix = *matrix; -} - -wxCairoMatrixData::~wxCairoMatrixData() -{ - // nothing to do -} - -wxGraphicsObjectRefData *wxCairoMatrixData::Clone() const -{ - return new wxCairoMatrixData(GetRenderer(),&m_matrix); -} - -// concatenates the matrix -void wxCairoMatrixData::Concat( const wxGraphicsMatrixData *t ) -{ - cairo_matrix_multiply( &m_matrix, &m_matrix, (cairo_matrix_t*) t->GetNativeMatrix()); -} - -// sets the matrix to the respective values -void wxCairoMatrixData::Set(wxDouble a, wxDouble b, wxDouble c, wxDouble d, - wxDouble tx, wxDouble ty) -{ - cairo_matrix_init( &m_matrix, a, b, c, d, tx, ty); -} - -// gets the component valuess of the matrix -void wxCairoMatrixData::Get(wxDouble* a, wxDouble* b, wxDouble* c, - wxDouble* d, wxDouble* tx, wxDouble* ty) const -{ - if (a) *a = m_matrix.xx; - if (b) *b = m_matrix.yx; - if (c) *c = m_matrix.xy; - if (d) *d = m_matrix.yy; - if (tx) *tx= m_matrix.x0; - if (ty) *ty= m_matrix.y0; -} - -// makes this the inverse matrix -void wxCairoMatrixData::Invert() -{ - cairo_matrix_invert( &m_matrix ); -} - -// returns true if the elements of the transformation matrix are equal ? -bool wxCairoMatrixData::IsEqual( const wxGraphicsMatrixData* t) const -{ - const cairo_matrix_t* tm = (cairo_matrix_t*) t->GetNativeMatrix(); - return ( - m_matrix.xx == tm->xx && - m_matrix.yx == tm->yx && - m_matrix.xy == tm->xy && - m_matrix.yy == tm->yy && - m_matrix.x0 == tm->x0 && - m_matrix.y0 == tm->y0 ) ; -} - -// return true if this is the identity matrix -bool wxCairoMatrixData::IsIdentity() const -{ - return ( m_matrix.xx == 1 && m_matrix.yy == 1 && - m_matrix.yx == 0 && m_matrix.xy == 0 && m_matrix.x0 == 0 && m_matrix.y0 == 0); -} - -// -// transformation -// - -// add the translation to this matrix -void wxCairoMatrixData::Translate( wxDouble dx , wxDouble dy ) -{ - cairo_matrix_translate( &m_matrix, dx, dy) ; -} - -// add the scale to this matrix -void wxCairoMatrixData::Scale( wxDouble xScale , wxDouble yScale ) -{ - cairo_matrix_scale( &m_matrix, xScale, yScale) ; -} - -// add the rotation to this matrix (radians) -void wxCairoMatrixData::Rotate( wxDouble angle ) -{ - cairo_matrix_rotate( &m_matrix, angle) ; -} - -// -// apply the transforms -// - -// applies that matrix to the point -void wxCairoMatrixData::TransformPoint( wxDouble *x, wxDouble *y ) const -{ - double lx = *x, ly = *y ; - cairo_matrix_transform_point( &m_matrix, &lx, &ly); - *x = lx; - *y = ly; -} - -// applies the matrix except for translations -void wxCairoMatrixData::TransformDistance( wxDouble *dx, wxDouble *dy ) const -{ - double lx = *dx, ly = *dy ; - cairo_matrix_transform_distance( &m_matrix, &lx, &ly); - *dx = lx; - *dy = ly; -} - -// returns the native representation -void * wxCairoMatrixData::GetNativeMatrix() const -{ - return (void*) &m_matrix; -} - -// ---------------------------------------------------------------------------- -// wxCairoBitmap implementation -// ---------------------------------------------------------------------------- - -int wxCairoBitmapData::InitBuffer(int width, int height, cairo_format_t format) -{ - wxUnusedVar(format); // Only really unused with Cairo < 1.6. - - // Determine the stride: use cairo_format_stride_for_width() if available - // but fall back to 4*width for the earlier versions as this is what that - // function always returns, even in latest Cairo, anyhow. - int stride; -#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 6, 0) - if ( cairo_version() >= CAIRO_VERSION_ENCODE(1, 6, 0) ) - { - stride = cairo_format_stride_for_width(format, width); - - // All our code would totally break if stride were not a multiple of 4 - // so ensure this is the case. - if ( stride % 4 ) - { - wxFAIL_MSG("Unexpected Cairo image surface stride."); - - stride += 4 - stride % 4; - } - } - else -#endif - stride = 4*width; - - m_width = width; - m_height = height; - m_buffer = new unsigned char[height*stride]; - - return stride; -} - -void wxCairoBitmapData::InitSurface(cairo_format_t format, int stride) -{ - m_surface = cairo_image_surface_create_for_data( - m_buffer, format, m_width, m_height, stride); - m_pattern = cairo_pattern_create_for_surface(m_surface); -} - -wxCairoBitmapData::wxCairoBitmapData( wxGraphicsRenderer* renderer, cairo_surface_t* bitmap ) : - wxGraphicsBitmapData(renderer) -{ - m_surface = bitmap; - m_pattern = cairo_pattern_create_for_surface(m_surface); - - m_width = cairo_image_surface_get_width(m_surface); - m_height = cairo_image_surface_get_height(m_surface); - m_buffer = NULL; -} - -wxCairoBitmapData::wxCairoBitmapData( wxGraphicsRenderer* renderer, const wxBitmap& bmp ) - : wxGraphicsBitmapData(renderer) -{ - m_surface = NULL; - m_pattern = NULL; - m_buffer = NULL; - wxCHECK_RET( bmp.IsOk(), wxT("Invalid bitmap in wxCairoContext::DrawBitmap")); - -#ifdef wxHAS_RAW_BITMAP - // Create a surface object and copy the bitmap pixel data to it. if the - // image has alpha (or a mask represented as alpha) then we'll use a - // different format and iterator than if it doesn't... - cairo_format_t bufferFormat = bmp.GetDepth() == 32 -#if defined(__WXGTK__) && !defined(__WXGTK3__) - || bmp.GetMask() -#endif - ? CAIRO_FORMAT_ARGB32 - : CAIRO_FORMAT_RGB24; - - int stride = InitBuffer(bmp.GetWidth(), bmp.GetHeight(), bufferFormat); - - wxBitmap bmpSource = bmp; // we need a non-const instance - wxUint32* data = (wxUint32*)m_buffer; - - if ( bufferFormat == CAIRO_FORMAT_ARGB32 ) - { - // use the bitmap's alpha - wxAlphaPixelData - pixData(bmpSource, wxPoint(0, 0), wxSize(m_width, m_height)); - wxCHECK_RET( pixData, wxT("Failed to gain raw access to bitmap data.")); - - wxAlphaPixelData::Iterator p(pixData); - for (int y=0; yGetBitmap(); - bufferFormat = CAIRO_FORMAT_ARGB32; - data = (wxUint32*)m_buffer; - wxNativePixelData - pixData(bmpMask, wxPoint(0, 0), wxSize(m_width, m_height)); - wxCHECK_RET( pixData, wxT("Failed to gain raw access to mask data.")); - - wxNativePixelData::Iterator p(pixData); - for (int y=0; y(m_buffer); - const unsigned char* src = image.GetData(); - - if ( bufferFormat == CAIRO_FORMAT_ARGB32 ) - { - const unsigned char* alpha = image.GetAlpha(); - - for ( int y = 0; y < m_height; y++ ) - { - wxUint32* const rowStartDst = dst; - - for ( int x = 0; x < m_width; x++ ) - { - const unsigned char a = *alpha++; - - *dst++ = a << 24 | - Premultiply(a, src[0]) << 16 | - Premultiply(a, src[1]) << 8 | - Premultiply(a, src[2]); - src += 3; - } - - dst = rowStartDst + stride / 4; - } - } - else // RGB - { - for ( int y = 0; y < m_height; y++ ) - { - wxUint32* const rowStartDst = dst; - - for ( int x = 0; x < m_width; x++ ) - { - *dst++ = src[0] << 16 | - src[1] << 8 | - src[2]; - src += 3; - } - - dst = rowStartDst + stride / 4; - } - } - - InitSurface(bufferFormat, stride); -} - -wxImage wxCairoBitmapData::ConvertToImage() const -{ - wxImage image(m_width, m_height, false /* don't clear */); - - // Get the surface type and format. - wxCHECK_MSG( cairo_surface_get_type(m_surface) == CAIRO_SURFACE_TYPE_IMAGE, - wxNullImage, - wxS("Can't convert non-image surface to image.") ); - - switch ( cairo_image_surface_get_format(m_surface) ) - { - case CAIRO_FORMAT_ARGB32: - image.SetAlpha(); - break; - - case CAIRO_FORMAT_RGB24: - // Nothing to do, we don't use alpha by default. - break; - - case CAIRO_FORMAT_A8: - case CAIRO_FORMAT_A1: - wxFAIL_MSG(wxS("Unsupported Cairo image surface type.")); - return wxNullImage; - - default: - wxFAIL_MSG(wxS("Unknown Cairo image surface type.")); - return wxNullImage; - } - - // Prepare for copying data. - cairo_surface_flush(m_surface); - const wxUint32* src = (wxUint32*)cairo_image_surface_get_data(m_surface); - wxCHECK_MSG( src, wxNullImage, wxS("Failed to get Cairo surface data.") ); - - int stride = cairo_image_surface_get_stride(m_surface); - wxCHECK_MSG( stride > 0, wxNullImage, - wxS("Failed to get Cairo surface stride.") ); - - // As we work with wxUint32 pointers and not char ones, we need to adjust - // the stride accordingly. This should be lossless as the stride must be a - // multiple of pixel size. - wxASSERT_MSG( !(stride % sizeof(wxUint32)), wxS("Unexpected stride.") ); - stride /= sizeof(wxUint32); - - unsigned char* dst = image.GetData(); - unsigned char *alpha = image.GetAlpha(); - if ( alpha ) - { - // We need to also copy alpha and undo the pre-multiplication as Cairo - // stores pre-multiplied values in this format while wxImage does not. - for ( int y = 0; y < m_height; y++ ) - { - const wxUint32* const rowStart = src; - for ( int x = 0; x < m_width; x++ ) - { - const wxUint32 argb = *src++; - - const unsigned char a = argb >> 24; - *alpha++ = a; - - // Copy the RGB data undoing the pre-multiplication. - *dst++ = Unpremultiply(a, argb >> 16); - *dst++ = Unpremultiply(a, argb >> 8); - *dst++ = Unpremultiply(a, argb); - } - - src = rowStart + stride; - } - } - else // RGB - { - // Things are pretty simple in this case, just copy RGB bytes. - for ( int y = 0; y < m_height; y++ ) - { - const wxUint32* const rowStart = src; - for ( int x = 0; x < m_width; x++ ) - { - const wxUint32 argb = *src++; - - *dst++ = (argb & 0x00ff0000) >> 16; - *dst++ = (argb & 0x0000ff00) >> 8; - *dst++ = (argb & 0x000000ff); - } - - src = rowStart + stride; - } - } - - return image; -} - -#endif // wxUSE_IMAGE - -wxCairoBitmapData::~wxCairoBitmapData() -{ - if (m_pattern) - cairo_pattern_destroy(m_pattern); - - if (m_surface) - cairo_surface_destroy(m_surface); - - delete [] m_buffer; -} - -//----------------------------------------------------------------------------- -// wxCairoContext implementation -//----------------------------------------------------------------------------- - -class wxCairoOffsetHelper -{ -public : - wxCairoOffsetHelper( cairo_t* ctx , bool offset ) - { - m_ctx = ctx; - m_offset = offset; - if ( m_offset ) - cairo_translate( m_ctx, 0.5, 0.5 ); - } - ~wxCairoOffsetHelper( ) - { - if ( m_offset ) - cairo_translate( m_ctx, -0.5, -0.5 ); - } -public : - cairo_t* m_ctx; - bool m_offset; -} ; - -#if wxUSE_PRINTING_ARCHITECTURE -wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxPrinterDC& dc ) -: wxGraphicsContext(renderer) -{ -#ifdef __WXMSW__ - // wxMSW contexts always use MM_ANISOTROPIC, which messes up - // text rendering when printing using Cairo. Switch it to MM_TEXT - // map mode to avoid this problem. - HDC hdc = (HDC)dc.GetHDC(); - ::SetMapMode(hdc, MM_TEXT); - m_mswSurface = cairo_win32_printing_surface_create(hdc); - Init( cairo_create(m_mswSurface) ); -#endif - -#ifdef __WXGTK20__ - const wxDCImpl *impl = dc.GetImpl(); - cairo_t* cr = static_cast(impl->GetCairoContext()); - if (cr) - Init(cairo_reference(cr)); - else - m_context = NULL; -#endif - wxSize sz = dc.GetSize(); - m_width = sz.x; - m_height = sz.y; - - wxPoint org = dc.GetDeviceOrigin(); - cairo_translate( m_context, org.x, org.y ); - - double sx,sy; - dc.GetUserScale( &sx, &sy ); - -// TODO: Determine if these fixes are needed on other platforms too. -// On MSW, without this the printer context will not respect wxDC SetMapMode calls. -// For example, using dc.SetMapMode(wxMM_POINTS) can let us share printer and screen -// drawing code -#ifdef __WXMSW__ - double lsx,lsy; - dc.GetLogicalScale( &lsx, &lsy ); - sx *= lsx; - sy *= lsy; -#endif - cairo_scale( m_context, sx, sy ); - - org = dc.GetLogicalOrigin(); - cairo_translate( m_context, -org.x, -org.y ); -} -#endif - -wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxWindowDC& dc ) -: wxGraphicsContext(renderer) -{ - int width, height; - dc.GetSize( &width, &height ); - m_width = width; - m_height = height; - - m_enableOffset = dc.GetContentScaleFactor() <= 1; - -#ifdef __WXMSW__ - m_mswSurface = cairo_win32_surface_create((HDC)dc.GetHDC()); - Init( cairo_create(m_mswSurface) ); -#endif - -#ifdef __WXGTK3__ - cairo_t* cr = static_cast(dc.GetImpl()->GetCairoContext()); - if (cr) - Init(cairo_reference(cr)); -#elif defined __WXGTK20__ - wxGTKDCImpl *impldc = (wxGTKDCImpl*) dc.GetImpl(); - Init( gdk_cairo_create( impldc->GetGDKWindow() ) ); - -#if 0 - wxGraphicsMatrix matrix = CreateMatrix(); - - wxPoint org = dc.GetDeviceOrigin(); - matrix.Translate( org.x, org.y ); - - org = dc.GetLogicalOrigin(); - matrix.Translate( -org.x, -org.y ); - - double sx,sy; - dc.GetUserScale( &sx, &sy ); - matrix.Scale( sx, sy ); - - ConcatTransform( matrix ); -#endif -#endif - -#ifdef __WXX11__ - cairo_t* cr = static_cast(dc.GetImpl()->GetCairoContext()); - if ( cr ) - Init(cairo_reference(cr)); -#elif defined(__WXMAC__) - CGContextRef cgcontext = (CGContextRef)dc.GetWindow()->MacGetCGContextRef(); - cairo_surface_t* surface = cairo_quartz_surface_create_for_cg_context(cgcontext, width, height); - Init( cairo_create( surface ) ); - cairo_surface_destroy( surface ); -#endif - -#ifdef __WXQT__ - m_qtPainter = (QPainter*) dc.GetHandle(); - // create a internal buffer (fallback if cairo_qt_surface is missing) - m_qtImage = new QImage(width, height, QImage::Format_ARGB32_Premultiplied); - // clear the buffer to be painted over the current contents - m_qtImage->fill(Qt::transparent); - m_qtSurface = cairo_image_surface_create_for_data(m_qtImage->bits(), - CAIRO_FORMAT_ARGB32, - width, height, - m_qtImage->bytesPerLine()); - Init( cairo_create( m_qtSurface ) ); -#endif -} - -wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxMemoryDC& dc ) -: wxGraphicsContext(renderer) -{ - int width, height; - dc.GetSize( &width, &height ); - m_width = width; - m_height = height; - - m_enableOffset = dc.GetContentScaleFactor() <= 1; - -#ifdef __WXMSW__ - - HDC hdc = (HDC)dc.GetHDC(); - - HBITMAP bitmap = (HBITMAP)GetCurrentObject(hdc, OBJ_BITMAP); - - BITMAP info; - bool hasBitmap = false; - - // cairo_win32_surface_create creates a 24-bit bitmap, - // so if we have alpha, we need to create a 32-bit surface instead. - if (!GetObject(bitmap, sizeof(info), &info) || info.bmBitsPixel < 32) - m_mswSurface = cairo_win32_surface_create(hdc); - else { - hasBitmap = true; - m_mswSurface = cairo_image_surface_create_for_data((unsigned char*)info.bmBits, - CAIRO_FORMAT_ARGB32, - info.bmWidth, - info.bmHeight, - info.bmWidthBytes); - } - - Init( cairo_create(m_mswSurface) ); - // If we've created a image surface, we need to flip the Y axis so that - // all drawing will appear right side up. - if (hasBitmap) { - cairo_matrix_t matrix; - cairo_matrix_init(&matrix, 1.0, 0.0, 0.0, -1.0, 0.0, height); - cairo_set_matrix(m_context, &matrix); - } -#endif - -#ifdef __WXGTK3__ - cairo_t* cr = static_cast(dc.GetImpl()->GetCairoContext()); - if (cr) - Init(cairo_reference(cr)); -#elif defined __WXGTK20__ - wxGTKDCImpl *impldc = (wxGTKDCImpl*) dc.GetImpl(); - Init( gdk_cairo_create( impldc->GetGDKWindow() ) ); - -#if 0 - wxGraphicsMatrix matrix = CreateMatrix(); - - wxPoint org = dc.GetDeviceOrigin(); - matrix.Translate( org.x, org.y ); - - org = dc.GetLogicalOrigin(); - matrix.Translate( -org.x, -org.y ); - - double sx,sy; - dc.GetUserScale( &sx, &sy ); - matrix.Scale( sx, sy ); - - ConcatTransform( matrix ); -#endif -#endif - -#ifdef __WXX11__ - cairo_t* cr = static_cast(dc.GetImpl()->GetCairoContext()); - if ( cr ) - Init(cairo_reference(cr)); -#endif - -#ifdef __WXMAC__ - CGContextRef cgcontext = (CGContextRef)dc.GetWindow()->MacGetCGContextRef(); - cairo_surface_t* surface = cairo_quartz_surface_create_for_cg_context(cgcontext, width, height); - Init( cairo_create( surface ) ); - cairo_surface_destroy( surface ); -#endif - -#ifdef __WXQT__ - m_qtPainter = NULL; - // create a internal buffer (fallback if cairo_qt_surface is missing) - m_qtImage = new QImage(width, height, QImage::Format_ARGB32_Premultiplied); - // clear the buffer to be painted over the current contents - m_qtImage->fill(Qt::transparent); - m_qtSurface = cairo_image_surface_create_for_data(m_qtImage->bits(), - CAIRO_FORMAT_ARGB32, - width, height, - m_qtImage->bytesPerLine()); - Init( cairo_create( m_qtSurface ) ); -#endif -} - -#ifdef __WXGTK20__ -wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, GdkWindow *window ) -: wxGraphicsContext(renderer) -{ - Init( gdk_cairo_create( window ) ); - -#ifdef __WXGTK3__ - m_width = gdk_window_get_width(window); - m_height = gdk_window_get_height(window); -#else - int width, height; - gdk_drawable_get_size(window, &width, &height); - m_width = width; - m_height = height; -#endif -} -#endif - -#ifdef __WXMSW__ -wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, HDC handle ) -: wxGraphicsContext(renderer) -{ - m_mswSurface = cairo_win32_surface_create(handle); - Init( cairo_create(m_mswSurface) ); - m_width = - m_height = 0; -} -#endif - - -wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, cairo_t *context ) -: wxGraphicsContext(renderer) -{ - Init( context ); - m_width = - m_height = 0; -} - -wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, wxWindow *window) - : wxGraphicsContext(renderer) -#ifdef __WXMSW__ - , m_mswWindowHDC(GetHwndOf(window)) -#endif -{ - m_enableOffset = window->GetContentScaleFactor() <= 1; -#ifdef __WXGTK__ - // something along these lines (copied from dcclient) - - // Some controls don't have m_wxwindow - like wxStaticBox, but the user - // code should still be able to create wxClientDCs for them, so we will - // use the parent window here then. - if (window->m_wxwindow == NULL) - { - window = window->GetParent(); - } - - wxASSERT_MSG( window->m_wxwindow, wxT("wxCairoContext needs a widget") ); - - Init(gdk_cairo_create(window->GTKGetDrawingWindow())); - - wxSize sz = window->GetSize(); - m_width = sz.x; - m_height = sz.y; -#endif - -#ifdef __WXMSW__ - m_mswSurface = cairo_win32_surface_create((HDC)m_mswWindowHDC); - Init(cairo_create(m_mswSurface)); -#endif - -#ifdef __WXQT__ - // direct m_qtSurface is not being used yet (this needs cairo qt surface) -#endif -} - -wxCairoContext::wxCairoContext(wxGraphicsRenderer* renderer) : - wxGraphicsContext(renderer) -{ - m_context = NULL; -} - -wxCairoContext::~wxCairoContext() -{ - if ( m_context ) - { - PopState(); - PopState(); - cairo_destroy(m_context); - } -#ifdef __WXMSW__ - if ( m_mswSurface ) - cairo_surface_destroy(m_mswSurface); -#endif -#ifdef __WXQT__ - if ( m_qtPainter != NULL ) - { - // draw the internal buffered image to the widget - cairo_surface_flush(m_qtSurface); - m_qtPainter->drawImage( 0,0, *m_qtImage ); - delete m_qtImage; - cairo_surface_destroy( m_qtSurface ); - } -#endif - -} - -void wxCairoContext::Init(cairo_t *context) -{ - m_context = context ; - PushState(); - PushState(); -} - - -void wxCairoContext::Clip( const wxRegion& region ) -{ - // Create a path with all the rectangles in the region - wxGraphicsPath path = GetRenderer()->CreatePath(); - wxRegionIterator ri(region); - while (ri) - { - path.AddRectangle(ri.GetX(), ri.GetY(), ri.GetW(), ri.GetH()); - ++ri; - } - - // Put it in the context - cairo_path_t* cp = (cairo_path_t*) path.GetNativePath() ; - cairo_append_path(m_context, cp); - - // clip to that path - cairo_clip(m_context); - path.UnGetNativePath(cp); -} - -void wxCairoContext::Clip( wxDouble x, wxDouble y, wxDouble w, wxDouble h ) -{ - // Create a path with this rectangle - wxGraphicsPath path = GetRenderer()->CreatePath(); - path.AddRectangle(x,y,w,h); - - // Put it in the context - cairo_path_t* cp = (cairo_path_t*) path.GetNativePath() ; - cairo_append_path(m_context, cp); - - // clip to that path - cairo_clip(m_context); - path.UnGetNativePath(cp); -} - -void wxCairoContext::ResetClip() -{ - cairo_reset_clip(m_context); -} - - -void wxCairoContext::StrokePath( const wxGraphicsPath& path ) -{ - if ( !m_pen.IsNull() ) - { - wxCairoOffsetHelper helper( m_context, ShouldOffset() ) ; - cairo_path_t* cp = (cairo_path_t*) path.GetNativePath() ; - cairo_append_path(m_context,cp); - ((wxCairoPenData*)m_pen.GetRefData())->Apply(this); - cairo_stroke(m_context); - path.UnGetNativePath(cp); - } -} - -void wxCairoContext::FillPath( const wxGraphicsPath& path , wxPolygonFillMode fillStyle ) -{ - if ( !m_brush.IsNull() ) - { - wxCairoOffsetHelper helper( m_context, ShouldOffset() ) ; - cairo_path_t* cp = (cairo_path_t*) path.GetNativePath() ; - cairo_append_path(m_context,cp); - ((wxCairoBrushData*)m_brush.GetRefData())->Apply(this); - cairo_set_fill_rule(m_context,fillStyle==wxODDEVEN_RULE ? CAIRO_FILL_RULE_EVEN_ODD : CAIRO_FILL_RULE_WINDING); - cairo_fill(m_context); - path.UnGetNativePath(cp); - } -} - -void wxCairoContext::Rotate( wxDouble angle ) -{ - cairo_rotate(m_context,angle); -} - -void wxCairoContext::Translate( wxDouble dx , wxDouble dy ) -{ - cairo_translate(m_context,dx,dy); -} - -void wxCairoContext::Scale( wxDouble xScale , wxDouble yScale ) -{ - cairo_scale(m_context,xScale,yScale); -} - -// concatenates this transform with the current transform of this context -void wxCairoContext::ConcatTransform( const wxGraphicsMatrix& matrix ) -{ - cairo_transform(m_context,(const cairo_matrix_t *) matrix.GetNativeMatrix()); -} - -// sets the transform of this context -void wxCairoContext::SetTransform( const wxGraphicsMatrix& matrix ) -{ - cairo_set_matrix(m_context,(const cairo_matrix_t*) matrix.GetNativeMatrix()); -} - -// gets the matrix of this context -wxGraphicsMatrix wxCairoContext::GetTransform() const -{ - wxGraphicsMatrix matrix = CreateMatrix(); - cairo_get_matrix(m_context,(cairo_matrix_t*) matrix.GetNativeMatrix()); - return matrix; -} - - - -void wxCairoContext::PushState() -{ - cairo_save(m_context); -} - -void wxCairoContext::PopState() -{ - cairo_restore(m_context); -} - -void wxCairoContext::DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) -{ - wxGraphicsBitmap bitmap = GetRenderer()->CreateBitmap(bmp); - DrawBitmap(bitmap, x, y, w, h); - -} - -void wxCairoContext::DrawBitmap(const wxGraphicsBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) -{ - PushState(); - - // In case we're scaling the image by using a width and height different - // than the bitmap's size create a pattern transformation on the surface and - // draw the transformed pattern. - wxCairoBitmapData* data = static_cast(bmp.GetRefData()); - cairo_pattern_t* pattern = data->GetCairoPattern(); - wxSize size = data->GetSize(); - - wxDouble scaleX = w / size.GetWidth(); - wxDouble scaleY = h / size.GetHeight(); - - // prepare to draw the image - cairo_translate(m_context, x, y); - cairo_scale(m_context, scaleX, scaleY); - cairo_set_source(m_context, pattern); - // use the original size here since the context is scaled already... - cairo_rectangle(m_context, 0, 0, size.GetWidth(), size.GetHeight()); - // fill the rectangle using the pattern - cairo_fill(m_context); - - PopState(); -} - -void wxCairoContext::DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) -{ - // An icon is a bitmap on wxGTK, so do this the easy way. When we want to - // start using the Cairo backend on other platforms then we may need to - // fiddle with this... - DrawBitmap(icon, x, y, w, h); -} - - -void wxCairoContext::DoDrawText(const wxString& str, wxDouble x, wxDouble y) -{ - wxCHECK_RET( !m_font.IsNull(), - wxT("wxCairoContext::DrawText - no valid font set") ); - - if ( str.empty()) - return; - - const wxCharBuffer data = str.utf8_str(); - if ( !data ) - return; - - if ( ((wxCairoFontData*)m_font.GetRefData())->Apply(this) ) - { -#ifdef __WXGTK__ - PangoLayout *layout = pango_cairo_create_layout (m_context); - const wxFont& font = static_cast(m_font.GetRefData())->GetFont(); - pango_layout_set_font_description(layout, font.GetNativeFontInfo()->description); - pango_layout_set_text(layout, data, data.length()); - font.GTKSetPangoAttrs(layout); - - cairo_move_to(m_context, x, y); - pango_cairo_show_layout (m_context, layout); - - g_object_unref (layout); - - // Don't use Cairo text API, we already did everything. - return; -#endif - } - - // Cairo's x,y for drawing text is at the baseline, so we need to adjust - // the position we move to by the ascent. - cairo_font_extents_t fe; - cairo_font_extents(m_context, &fe); - cairo_move_to(m_context, x, y+fe.ascent); - - cairo_show_text(m_context, data); -} - -void wxCairoContext::GetTextExtent( const wxString &str, wxDouble *width, wxDouble *height, - wxDouble *descent, wxDouble *externalLeading ) const -{ - wxCHECK_RET( !m_font.IsNull(), wxT("wxCairoContext::GetTextExtent - no valid font set") ); - - if ( width ) - *width = 0; - if ( height ) - *height = 0; - if ( descent ) - *descent = 0; - if ( externalLeading ) - *externalLeading = 0; - - if ( str.empty()) - return; - - if ( ((wxCairoFontData*)m_font.GetRefData())->Apply((wxCairoContext*)this) ) - { -#ifdef __WXGTK__ - int w, h; - - PangoLayout *layout = pango_cairo_create_layout (m_context); - const wxFont& font = static_cast(m_font.GetRefData())->GetFont(); - pango_layout_set_font_description(layout, font.GetNativeFontInfo()->description); - const wxCharBuffer data = str.utf8_str(); - if ( !data ) - { - return; - } - pango_layout_set_text(layout, data, data.length()); - pango_layout_get_pixel_size (layout, &w, &h); - if ( width ) - *width = w; - if ( height ) - *height = h; - if (descent) - { - PangoLayoutIter *iter = pango_layout_get_iter(layout); - int baseline = pango_layout_iter_get_baseline(iter); - pango_layout_iter_free(iter); - *descent = h - PANGO_PIXELS(baseline); - } - g_object_unref (layout); - return; -#endif - } - - if (width) - { - const wxWX2MBbuf buf(str.mb_str(wxConvUTF8)); - cairo_text_extents_t te; - cairo_text_extents(m_context, buf, &te); - *width = te.width; - } - - if (height || descent || externalLeading) - { - cairo_font_extents_t fe; - cairo_font_extents(m_context, &fe); - - // some backends have negative descents - - if ( fe.descent < 0 ) - fe.descent = -fe.descent; - - if ( fe.height < (fe.ascent + fe.descent ) ) - { - // some backends are broken re height ... (eg currently ATSUI) - fe.height = fe.ascent + fe.descent; - } - - if (height) - *height = fe.height; - if ( descent ) - *descent = fe.descent; - if ( externalLeading ) - *externalLeading = wxMax(0, fe.height - (fe.ascent + fe.descent)); - } -} - -void wxCairoContext::GetPartialTextExtents(const wxString& text, wxArrayDouble& widths) const -{ - widths.Empty(); - wxCHECK_RET( !m_font.IsNull(), wxT("wxCairoContext::GetPartialTextExtents - no valid font set") ); -#ifdef __WXGTK__ - const wxCharBuffer data = text.utf8_str(); - int w = 0; - if (data.length()) - { - PangoLayout* layout = pango_cairo_create_layout(m_context); - const wxFont& font = static_cast(m_font.GetRefData())->GetFont(); - pango_layout_set_font_description(layout, font.GetNativeFontInfo()->description); - pango_layout_set_text(layout, data, data.length()); - PangoLayoutIter* iter = pango_layout_get_iter(layout); - PangoRectangle rect; - do { - pango_layout_iter_get_cluster_extents(iter, NULL, &rect); - w += rect.width; - widths.Add(PANGO_PIXELS(w)); - } while (pango_layout_iter_next_cluster(iter)); - pango_layout_iter_free(iter); - g_object_unref(layout); - } - size_t i = widths.GetCount(); - const size_t len = text.length(); - while (i++ < len) - widths.Add(PANGO_PIXELS(w)); -#else - // TODO -#endif -} - -void * wxCairoContext::GetNativeContext() -{ - return m_context; -} - -bool wxCairoContext::SetAntialiasMode(wxAntialiasMode antialias) -{ - if (m_antialias == antialias) - return true; - - m_antialias = antialias; - - cairo_antialias_t antialiasMode; - switch (antialias) - { - case wxANTIALIAS_DEFAULT: - antialiasMode = CAIRO_ANTIALIAS_DEFAULT; - break; - case wxANTIALIAS_NONE: - antialiasMode = CAIRO_ANTIALIAS_NONE; - break; - default: - return false; - } - cairo_set_antialias(m_context, antialiasMode); - return true; -} - -bool wxCairoContext::SetInterpolationQuality(wxInterpolationQuality WXUNUSED(interpolation)) -{ - // placeholder - return false; -} - -bool wxCairoContext::SetCompositionMode(wxCompositionMode op) -{ - if ( m_composition == op ) - return true; - - m_composition = op; - cairo_operator_t cop; - switch (op) - { - case wxCOMPOSITION_CLEAR: - cop = CAIRO_OPERATOR_CLEAR; - break; - case wxCOMPOSITION_SOURCE: - cop = CAIRO_OPERATOR_SOURCE; - break; - case wxCOMPOSITION_OVER: - cop = CAIRO_OPERATOR_OVER; - break; - case wxCOMPOSITION_IN: - cop = CAIRO_OPERATOR_IN; - break; - case wxCOMPOSITION_OUT: - cop = CAIRO_OPERATOR_OUT; - break; - case wxCOMPOSITION_ATOP: - cop = CAIRO_OPERATOR_ATOP; - break; - case wxCOMPOSITION_DEST: - cop = CAIRO_OPERATOR_DEST; - break; - case wxCOMPOSITION_DEST_OVER: - cop = CAIRO_OPERATOR_DEST_OVER; - break; - case wxCOMPOSITION_DEST_IN: - cop = CAIRO_OPERATOR_DEST_IN; - break; - case wxCOMPOSITION_DEST_OUT: - cop = CAIRO_OPERATOR_DEST_OUT; - break; - case wxCOMPOSITION_DEST_ATOP: - cop = CAIRO_OPERATOR_DEST_ATOP; - break; - case wxCOMPOSITION_XOR: - cop = CAIRO_OPERATOR_XOR; - break; - case wxCOMPOSITION_ADD: - cop = CAIRO_OPERATOR_ADD; - break; - default: - return false; - } - cairo_set_operator(m_context, cop); - return true; -} - -void wxCairoContext::BeginLayer(wxDouble opacity) -{ - m_layerOpacities.push_back(opacity); - cairo_push_group(m_context); -} - -void wxCairoContext::EndLayer() -{ - float opacity = m_layerOpacities.back(); - m_layerOpacities.pop_back(); - cairo_pop_group_to_source(m_context); - cairo_paint_with_alpha(m_context,opacity); -} - -//----------------------------------------------------------------------------- -// wxCairoRenderer declaration -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxCairoRenderer : public wxGraphicsRenderer -{ -public : - wxCairoRenderer() {} - - virtual ~wxCairoRenderer() {} - - // Context - - virtual wxGraphicsContext * CreateContext( const wxWindowDC& dc) wxOVERRIDE; - virtual wxGraphicsContext * CreateContext( const wxMemoryDC& dc) wxOVERRIDE; -#if wxUSE_PRINTING_ARCHITECTURE - virtual wxGraphicsContext * CreateContext( const wxPrinterDC& dc) wxOVERRIDE; -#endif - - virtual wxGraphicsContext * CreateContextFromNativeContext( void * context ) wxOVERRIDE; - - virtual wxGraphicsContext * CreateContextFromNativeWindow( void * window ) wxOVERRIDE; -#if wxUSE_IMAGE - virtual wxGraphicsContext * CreateContextFromImage(wxImage& image) wxOVERRIDE; -#endif // wxUSE_IMAGE - - virtual wxGraphicsContext * CreateContext( wxWindow* window ) wxOVERRIDE; - - virtual wxGraphicsContext * CreateMeasuringContext() wxOVERRIDE; -#ifdef __WXMSW__ -#if wxUSE_ENH_METAFILE - virtual wxGraphicsContext * CreateContext( const wxEnhMetaFileDC& dc); -#endif -#endif - // Path - - virtual wxGraphicsPath CreatePath() wxOVERRIDE; - - // Matrix - - virtual wxGraphicsMatrix CreateMatrix( wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0, - wxDouble tx=0.0, wxDouble ty=0.0) wxOVERRIDE; - - - virtual wxGraphicsPen CreatePen(const wxPen& pen) wxOVERRIDE ; - - virtual wxGraphicsBrush CreateBrush(const wxBrush& brush ) wxOVERRIDE ; - - virtual wxGraphicsBrush - CreateLinearGradientBrush(wxDouble x1, wxDouble y1, - wxDouble x2, wxDouble y2, - const wxGraphicsGradientStops& stops) wxOVERRIDE; - - virtual wxGraphicsBrush - CreateRadialGradientBrush(wxDouble xo, wxDouble yo, - wxDouble xc, wxDouble yc, - wxDouble radius, - const wxGraphicsGradientStops& stops) wxOVERRIDE; - - // sets the font - virtual wxGraphicsFont CreateFont( const wxFont &font , const wxColour &col = *wxBLACK ) wxOVERRIDE ; - virtual wxGraphicsFont CreateFont(double sizeInPixels, - const wxString& facename, - int flags = wxFONTFLAG_DEFAULT, - const wxColour& col = *wxBLACK) wxOVERRIDE; - - // create a native bitmap representation - virtual wxGraphicsBitmap CreateBitmap( const wxBitmap &bitmap ) wxOVERRIDE; -#if wxUSE_IMAGE - virtual wxGraphicsBitmap CreateBitmapFromImage(const wxImage& image) wxOVERRIDE; - virtual wxImage CreateImageFromBitmap(const wxGraphicsBitmap& bmp) wxOVERRIDE; -#endif // wxUSE_IMAGE - - // create a graphics bitmap from a native bitmap - virtual wxGraphicsBitmap CreateBitmapFromNativeBitmap( void* bitmap ) wxOVERRIDE; - - // create a subimage from a native image representation - virtual wxGraphicsBitmap CreateSubBitmap( const wxGraphicsBitmap &bitmap, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) wxOVERRIDE; - - virtual wxString GetName() const wxOVERRIDE; - virtual void GetVersion(int *major, int *minor, int *micro) const wxOVERRIDE; - - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxCairoRenderer); -} ; - -//----------------------------------------------------------------------------- -// wxCairoRenderer implementation -//----------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxCairoRenderer,wxGraphicsRenderer); - -static wxCairoRenderer gs_cairoGraphicsRenderer; - -#ifdef __WXGTK__ - #define ENSURE_LOADED_OR_RETURN(returnOnFail) -#else - #define ENSURE_LOADED_OR_RETURN(returnOnFail) \ - if (!wxCairoInit()) \ - return returnOnFail -#endif - -wxGraphicsContext * wxCairoRenderer::CreateContext( const wxWindowDC& dc) -{ - ENSURE_LOADED_OR_RETURN(NULL); - return new wxCairoContext(this,dc); -} - -wxGraphicsContext * wxCairoRenderer::CreateContext( const wxMemoryDC& dc) -{ - ENSURE_LOADED_OR_RETURN(NULL); - return new wxCairoContext(this,dc); -} - -#if wxUSE_PRINTING_ARCHITECTURE -wxGraphicsContext * wxCairoRenderer::CreateContext( const wxPrinterDC& dc) -{ - ENSURE_LOADED_OR_RETURN(NULL); - return new wxCairoContext(this, dc); -} -#endif - -#ifdef __WXMSW__ -#if wxUSE_ENH_METAFILE -wxGraphicsContext * wxCairoRenderer::CreateContext( const wxEnhMetaFileDC& WXUNUSED(dc) ) -{ - return NULL; -} -#endif -#endif - -wxGraphicsContext * wxCairoRenderer::CreateContextFromNativeContext( void * context ) -{ - ENSURE_LOADED_OR_RETURN(NULL); -#ifdef __WXMSW__ - return new wxCairoContext(this,(HDC)context); -#else - return new wxCairoContext(this,(cairo_t*)context); -#endif -} - - -wxGraphicsContext * wxCairoRenderer::CreateContextFromNativeWindow( void * window ) -{ -#ifdef __WXGTK__ - return new wxCairoContext(this, static_cast(window)); -#else - wxUnusedVar(window); - return NULL; -#endif -} - -#if wxUSE_IMAGE -wxGraphicsContext * wxCairoRenderer::CreateContextFromImage(wxImage& image) -{ - ENSURE_LOADED_OR_RETURN(NULL); - return new wxCairoImageContext(this, image); -} -#endif // wxUSE_IMAGE - -wxGraphicsContext * wxCairoRenderer::CreateMeasuringContext() -{ -#ifdef __WXGTK__ - return CreateContextFromNativeWindow(gdk_get_default_root_window()); -#else - return NULL; - // TODO -#endif -} - -wxGraphicsContext * wxCairoRenderer::CreateContext( wxWindow* window ) -{ - ENSURE_LOADED_OR_RETURN(NULL); - return new wxCairoContext(this, window ); -} - -// Path - -wxGraphicsPath wxCairoRenderer::CreatePath() -{ - wxGraphicsPath path; - ENSURE_LOADED_OR_RETURN(path); - path.SetRefData( new wxCairoPathData(this) ); - return path; -} - - -// Matrix - -wxGraphicsMatrix wxCairoRenderer::CreateMatrix( wxDouble a, wxDouble b, wxDouble c, wxDouble d, - wxDouble tx, wxDouble ty) - -{ - wxGraphicsMatrix m; - ENSURE_LOADED_OR_RETURN(m); - wxCairoMatrixData* data = new wxCairoMatrixData( this ); - data->Set( a,b,c,d,tx,ty ) ; - m.SetRefData(data); - return m; -} - -wxGraphicsPen wxCairoRenderer::CreatePen(const wxPen& pen) -{ - wxGraphicsPen p; - ENSURE_LOADED_OR_RETURN(p); - if (pen.IsOk() && pen.GetStyle() != wxPENSTYLE_TRANSPARENT) - { - p.SetRefData(new wxCairoPenData( this, pen )); - } - return p; -} - -wxGraphicsBrush wxCairoRenderer::CreateBrush(const wxBrush& brush ) -{ - wxGraphicsBrush p; - ENSURE_LOADED_OR_RETURN(p); - if (brush.IsOk() && brush.GetStyle() != wxBRUSHSTYLE_TRANSPARENT) - { - p.SetRefData(new wxCairoBrushData( this, brush )); - } - return p; -} - -wxGraphicsBrush -wxCairoRenderer::CreateLinearGradientBrush(wxDouble x1, wxDouble y1, - wxDouble x2, wxDouble y2, - const wxGraphicsGradientStops& stops) -{ - wxGraphicsBrush p; - ENSURE_LOADED_OR_RETURN(p); - wxCairoBrushData* d = new wxCairoBrushData( this ); - d->CreateLinearGradientBrush(x1, y1, x2, y2, stops); - p.SetRefData(d); - return p; -} - -wxGraphicsBrush -wxCairoRenderer::CreateRadialGradientBrush(wxDouble xo, wxDouble yo, - wxDouble xc, wxDouble yc, wxDouble r, - const wxGraphicsGradientStops& stops) -{ - wxGraphicsBrush p; - ENSURE_LOADED_OR_RETURN(p); - wxCairoBrushData* d = new wxCairoBrushData( this ); - d->CreateRadialGradientBrush(xo, yo, xc, yc, r, stops); - p.SetRefData(d); - return p; -} - -wxGraphicsFont wxCairoRenderer::CreateFont( const wxFont &font , const wxColour &col ) -{ - wxGraphicsFont p; - ENSURE_LOADED_OR_RETURN(p); - if ( font.IsOk() ) - { - p.SetRefData(new wxCairoFontData( this , font, col )); - } - return p; -} - -wxGraphicsFont -wxCairoRenderer::CreateFont(double sizeInPixels, - const wxString& facename, - int flags, - const wxColour& col) -{ - wxGraphicsFont font; - ENSURE_LOADED_OR_RETURN(font); - font.SetRefData(new wxCairoFontData(this, sizeInPixels, facename, flags, col)); - return font; -} - -wxGraphicsBitmap wxCairoRenderer::CreateBitmap( const wxBitmap& bmp ) -{ - wxGraphicsBitmap p; - ENSURE_LOADED_OR_RETURN(p); - if ( bmp.IsOk() ) - { - p.SetRefData(new wxCairoBitmapData( this , bmp )); - } - return p; -} - -#if wxUSE_IMAGE - -wxGraphicsBitmap wxCairoRenderer::CreateBitmapFromImage(const wxImage& image) -{ - wxGraphicsBitmap bmp; - - ENSURE_LOADED_OR_RETURN(bmp); - - if ( image.IsOk() ) - { - bmp.SetRefData(new wxCairoBitmapData(this, image)); - } - - return bmp; -} - -wxImage wxCairoRenderer::CreateImageFromBitmap(const wxGraphicsBitmap& bmp) -{ - wxImage image; - ENSURE_LOADED_OR_RETURN(image); - - const wxCairoBitmapData* const - data = static_cast(bmp.GetGraphicsData()); - if (data) - image = data->ConvertToImage(); - - return image; -} - -#endif // wxUSE_IMAGE - - -wxGraphicsBitmap wxCairoRenderer::CreateBitmapFromNativeBitmap( void* bitmap ) -{ - wxGraphicsBitmap p; - ENSURE_LOADED_OR_RETURN(p); - if ( bitmap != NULL ) - { - p.SetRefData(new wxCairoBitmapData( this , (cairo_surface_t*) bitmap )); - } - return p; -} - -wxGraphicsBitmap -wxCairoRenderer::CreateSubBitmap(const wxGraphicsBitmap& WXUNUSED(bitmap), - wxDouble WXUNUSED(x), - wxDouble WXUNUSED(y), - wxDouble WXUNUSED(w), - wxDouble WXUNUSED(h)) -{ - wxGraphicsBitmap p; - wxFAIL_MSG("wxCairoRenderer::CreateSubBitmap is not implemented."); - return p; -} - -wxString wxCairoRenderer::GetName() const -{ - return "cairo"; -} - -void wxCairoRenderer::GetVersion(int *major, int *minor, int *micro) const -{ - int dummy; - sscanf(cairo_version_string(), "%d.%d.%d", - major ? major : &dummy, - minor ? minor : &dummy, - micro ? micro : &dummy); -} - -wxGraphicsRenderer* wxGraphicsRenderer::GetCairoRenderer() -{ - return &gs_cairoGraphicsRenderer; -} - -#else // !wxUSE_CAIRO - -wxGraphicsRenderer* wxGraphicsRenderer::GetCairoRenderer() -{ - return NULL; -} - -#endif // wxUSE_CAIRO/!wxUSE_CAIRO - -// MSW and OS X have their own native default renderers, but the other ports -// use Cairo by default -#if !(defined(__WXMSW__) || defined(__WXOSX__)) -wxGraphicsRenderer* wxGraphicsRenderer::GetDefaultRenderer() -{ - return GetCairoRenderer(); -} -#endif // !(__WXMSW__ || __WXOSX__) - -#endif // wxUSE_GRAPHICS_CONTEXT diff --git a/Externals/wxWidgets3/src/generic/grid.cpp b/Externals/wxWidgets3/src/generic/grid.cpp deleted file mode 100644 index 921780caf3..0000000000 --- a/Externals/wxWidgets3/src/generic/grid.cpp +++ /dev/null @@ -1,9287 +0,0 @@ -/////////////////////////////////////////////////////////////////////////// -// Name: src/generic/grid.cpp -// Purpose: wxGrid and related classes -// Author: Michael Bedward (based on code by Julian Smart, Robin Dunn) -// Modified by: Robin Dunn, Vadim Zeitlin, Santiago Palacios -// Created: 1/08/1999 -// Copyright: (c) Michael Bedward (mbedward@ozemail.com.au) -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -/* - TODO: - - - Replace use of wxINVERT with wxOverlay - - Make Begin/EndBatch() the same as the generic Freeze/Thaw() - - Review the column reordering code, it's a mess. - - Implement row reordering after dealing with the columns. - */ - -// For compilers that support precompilation, includes "wx/wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_GRID - -#include "wx/grid.h" - -#ifndef WX_PRECOMP - #include "wx/utils.h" - #include "wx/dcclient.h" - #include "wx/settings.h" - #include "wx/log.h" - #include "wx/textctrl.h" - #include "wx/checkbox.h" - #include "wx/combobox.h" - #include "wx/valtext.h" - #include "wx/intl.h" - #include "wx/math.h" - #include "wx/listbox.h" -#endif - -#include "wx/textfile.h" -#include "wx/spinctrl.h" -#include "wx/tokenzr.h" -#include "wx/renderer.h" -#include "wx/headerctrl.h" -#include "wx/hashset.h" - -#include "wx/generic/gridsel.h" -#include "wx/generic/gridctrl.h" -#include "wx/generic/grideditors.h" -#include "wx/generic/private/grid.h" - -const char wxGridNameStr[] = "grid"; - -// Required for wxIs... functions -#include - -WX_DECLARE_HASH_SET_WITH_DECL_PTR(int, wxIntegerHash, wxIntegerEqual, - wxGridFixedIndicesSet, class WXDLLIMPEXP_ADV); - - -// ---------------------------------------------------------------------------- -// globals -// ---------------------------------------------------------------------------- - -namespace -{ - -//#define DEBUG_ATTR_CACHE -#ifdef DEBUG_ATTR_CACHE - static size_t gs_nAttrCacheHits = 0; - static size_t gs_nAttrCacheMisses = 0; -#endif - -// this struct simply combines together the default header renderers -// -// as the renderers ctors are trivial, there is no problem with making them -// globals -struct DefaultHeaderRenderers -{ - wxGridColumnHeaderRendererDefault colRenderer; - wxGridRowHeaderRendererDefault rowRenderer; - wxGridCornerHeaderRendererDefault cornerRenderer; -} gs_defaultHeaderRenderers; - -} // anonymous namespace - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -wxGridCellCoords wxGridNoCellCoords( -1, -1 ); -wxRect wxGridNoCellRect( -1, -1, -1, -1 ); - -namespace -{ - -// scroll line size -const size_t GRID_SCROLL_LINE_X = 15; -const size_t GRID_SCROLL_LINE_Y = GRID_SCROLL_LINE_X; - -// the size of hash tables used a bit everywhere (the max number of elements -// in these hash tables is the number of rows/columns) -const int GRID_HASH_SIZE = 100; - -// the minimal distance in pixels the mouse needs to move to start a drag -// operation -const int DRAG_SENSITIVITY = 3; - -} // anonymous namespace - -#include "wx/arrimpl.cpp" - -WX_DEFINE_OBJARRAY(wxGridCellCoordsArray) -WX_DEFINE_OBJARRAY(wxGridCellWithAttrArray) - -// ---------------------------------------------------------------------------- -// events -// ---------------------------------------------------------------------------- - -wxDEFINE_EVENT( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEvent ); -wxDEFINE_EVENT( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEvent ); -wxDEFINE_EVENT( wxEVT_GRID_CELL_LEFT_DCLICK, wxGridEvent ); -wxDEFINE_EVENT( wxEVT_GRID_CELL_RIGHT_DCLICK, wxGridEvent ); -wxDEFINE_EVENT( wxEVT_GRID_CELL_BEGIN_DRAG, wxGridEvent ); -wxDEFINE_EVENT( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEvent ); -wxDEFINE_EVENT( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEvent ); -wxDEFINE_EVENT( wxEVT_GRID_LABEL_LEFT_DCLICK, wxGridEvent ); -wxDEFINE_EVENT( wxEVT_GRID_LABEL_RIGHT_DCLICK, wxGridEvent ); -wxDEFINE_EVENT( wxEVT_GRID_ROW_SIZE, wxGridSizeEvent ); -wxDEFINE_EVENT( wxEVT_GRID_COL_SIZE, wxGridSizeEvent ); -wxDEFINE_EVENT( wxEVT_GRID_COL_AUTO_SIZE, wxGridSizeEvent ); -wxDEFINE_EVENT( wxEVT_GRID_COL_MOVE, wxGridEvent ); -wxDEFINE_EVENT( wxEVT_GRID_COL_SORT, wxGridEvent ); -wxDEFINE_EVENT( wxEVT_GRID_RANGE_SELECT, wxGridRangeSelectEvent ); -wxDEFINE_EVENT( wxEVT_GRID_CELL_CHANGING, wxGridEvent ); -wxDEFINE_EVENT( wxEVT_GRID_CELL_CHANGED, wxGridEvent ); -wxDEFINE_EVENT( wxEVT_GRID_SELECT_CELL, wxGridEvent ); -wxDEFINE_EVENT( wxEVT_GRID_EDITOR_SHOWN, wxGridEvent ); -wxDEFINE_EVENT( wxEVT_GRID_EDITOR_HIDDEN, wxGridEvent ); -wxDEFINE_EVENT( wxEVT_GRID_EDITOR_CREATED, wxGridEditorCreatedEvent ); -wxDEFINE_EVENT( wxEVT_GRID_TABBING, wxGridEvent ); - -// ---------------------------------------------------------------------------- -// private helpers -// ---------------------------------------------------------------------------- - -namespace -{ - - // ensure that first is less or equal to second, swapping the values if - // necessary - void EnsureFirstLessThanSecond(int& first, int& second) - { - if ( first > second ) - wxSwap(first, second); - } - -} // anonymous namespace - -// ============================================================================ -// implementation -// ============================================================================ - -wxIMPLEMENT_ABSTRACT_CLASS(wxGridCellEditorEvtHandler, wxEvtHandler); - -wxBEGIN_EVENT_TABLE( wxGridCellEditorEvtHandler, wxEvtHandler ) - EVT_KILL_FOCUS( wxGridCellEditorEvtHandler::OnKillFocus ) - EVT_KEY_DOWN( wxGridCellEditorEvtHandler::OnKeyDown ) - EVT_CHAR( wxGridCellEditorEvtHandler::OnChar ) -wxEND_EVENT_TABLE() - -wxBEGIN_EVENT_TABLE(wxGridHeaderCtrl, wxHeaderCtrl) - EVT_HEADER_CLICK(wxID_ANY, wxGridHeaderCtrl::OnClick) - EVT_HEADER_DCLICK(wxID_ANY, wxGridHeaderCtrl::OnDoubleClick) - EVT_HEADER_RIGHT_CLICK(wxID_ANY, wxGridHeaderCtrl::OnRightClick) - - EVT_HEADER_BEGIN_RESIZE(wxID_ANY, wxGridHeaderCtrl::OnBeginResize) - EVT_HEADER_RESIZING(wxID_ANY, wxGridHeaderCtrl::OnResizing) - EVT_HEADER_END_RESIZE(wxID_ANY, wxGridHeaderCtrl::OnEndResize) - - EVT_HEADER_BEGIN_REORDER(wxID_ANY, wxGridHeaderCtrl::OnBeginReorder) - EVT_HEADER_END_REORDER(wxID_ANY, wxGridHeaderCtrl::OnEndReorder) -wxEND_EVENT_TABLE() - -wxGridOperations& wxGridRowOperations::Dual() const -{ - static wxGridColumnOperations s_colOper; - - return s_colOper; -} - -wxGridOperations& wxGridColumnOperations::Dual() const -{ - static wxGridRowOperations s_rowOper; - - return s_rowOper; -} - -// ---------------------------------------------------------------------------- -// wxGridCellWorker is an (almost) empty common base class for -// wxGridCellRenderer and wxGridCellEditor managing ref counting -// ---------------------------------------------------------------------------- - -void wxGridCellWorker::SetParameters(const wxString& WXUNUSED(params)) -{ - // nothing to do -} - -wxGridCellWorker::~wxGridCellWorker() -{ -} - -// ---------------------------------------------------------------------------- -// wxGridHeaderLabelsRenderer and related classes -// ---------------------------------------------------------------------------- - -void wxGridHeaderLabelsRenderer::DrawLabel(const wxGrid& grid, - wxDC& dc, - const wxString& value, - const wxRect& rect, - int horizAlign, - int vertAlign, - int textOrientation) const -{ - dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT); - dc.SetTextForeground(grid.GetLabelTextColour()); - dc.SetFont(grid.GetLabelFont()); - grid.DrawTextRectangle(dc, value, rect, horizAlign, vertAlign, textOrientation); -} - - -void wxGridRowHeaderRendererDefault::DrawBorder(const wxGrid& WXUNUSED(grid), - wxDC& dc, - wxRect& rect) const -{ - dc.SetPen(wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW))); - dc.DrawLine(rect.GetRight(), rect.GetTop(), - rect.GetRight(), rect.GetBottom()); - dc.DrawLine(rect.GetLeft(), rect.GetTop(), - rect.GetLeft(), rect.GetBottom()); - dc.DrawLine(rect.GetLeft(), rect.GetBottom(), - rect.GetRight() + 1, rect.GetBottom()); - - dc.SetPen(*wxWHITE_PEN); - dc.DrawLine(rect.GetLeft() + 1, rect.GetTop(), - rect.GetLeft() + 1, rect.GetBottom()); - dc.DrawLine(rect.GetLeft() + 1, rect.GetTop(), - rect.GetRight(), rect.GetTop()); - - rect.Deflate(2); -} - -void wxGridColumnHeaderRendererDefault::DrawBorder(const wxGrid& WXUNUSED(grid), - wxDC& dc, - wxRect& rect) const -{ - dc.SetPen(wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW))); - dc.DrawLine(rect.GetRight(), rect.GetTop(), - rect.GetRight(), rect.GetBottom()); - dc.DrawLine(rect.GetLeft(), rect.GetTop(), - rect.GetRight(), rect.GetTop()); - dc.DrawLine(rect.GetLeft(), rect.GetBottom(), - rect.GetRight() + 1, rect.GetBottom()); - - dc.SetPen(*wxWHITE_PEN); - dc.DrawLine(rect.GetLeft(), rect.GetTop() + 1, - rect.GetLeft(), rect.GetBottom()); - dc.DrawLine(rect.GetLeft(), rect.GetTop() + 1, - rect.GetRight(), rect.GetTop() + 1); - - rect.Deflate(2); -} - -void wxGridCornerHeaderRendererDefault::DrawBorder(const wxGrid& WXUNUSED(grid), - wxDC& dc, - wxRect& rect) const -{ - dc.SetPen(wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW))); - dc.DrawLine(rect.GetRight() - 1, rect.GetBottom() - 1, - rect.GetRight() - 1, rect.GetTop()); - dc.DrawLine(rect.GetRight() - 1, rect.GetBottom() - 1, - rect.GetLeft(), rect.GetBottom() - 1); - dc.DrawLine(rect.GetLeft(), rect.GetTop(), - rect.GetRight(), rect.GetTop()); - dc.DrawLine(rect.GetLeft(), rect.GetTop(), - rect.GetLeft(), rect.GetBottom()); - - dc.SetPen(*wxWHITE_PEN); - dc.DrawLine(rect.GetLeft() + 1, rect.GetTop() + 1, - rect.GetRight() - 1, rect.GetTop() + 1); - dc.DrawLine(rect.GetLeft() + 1, rect.GetTop() + 1, - rect.GetLeft() + 1, rect.GetBottom() - 1); - - rect.Deflate(2); -} - -// ---------------------------------------------------------------------------- -// wxGridCellAttr -// ---------------------------------------------------------------------------- - -void wxGridCellAttr::Init(wxGridCellAttr *attrDefault) -{ - m_isReadOnly = Unset; - - m_renderer = NULL; - m_editor = NULL; - - m_attrkind = wxGridCellAttr::Cell; - - m_sizeRows = m_sizeCols = 1; - m_overflow = UnsetOverflow; - - SetDefAttr(attrDefault); -} - -wxGridCellAttr *wxGridCellAttr::Clone() const -{ - wxGridCellAttr *attr = new wxGridCellAttr(m_defGridAttr); - - if ( HasTextColour() ) - attr->SetTextColour(GetTextColour()); - if ( HasBackgroundColour() ) - attr->SetBackgroundColour(GetBackgroundColour()); - if ( HasFont() ) - attr->SetFont(GetFont()); - if ( HasAlignment() ) - attr->SetAlignment(m_hAlign, m_vAlign); - - attr->SetSize( m_sizeRows, m_sizeCols ); - - if ( m_renderer ) - { - attr->SetRenderer(m_renderer); - m_renderer->IncRef(); - } - if ( m_editor ) - { - attr->SetEditor(m_editor); - m_editor->IncRef(); - } - - if ( IsReadOnly() ) - attr->SetReadOnly(); - - attr->SetOverflow( m_overflow == Overflow ); - attr->SetKind( m_attrkind ); - - return attr; -} - -void wxGridCellAttr::MergeWith(wxGridCellAttr *mergefrom) -{ - if ( !HasTextColour() && mergefrom->HasTextColour() ) - SetTextColour(mergefrom->GetTextColour()); - if ( !HasBackgroundColour() && mergefrom->HasBackgroundColour() ) - SetBackgroundColour(mergefrom->GetBackgroundColour()); - if ( !HasFont() && mergefrom->HasFont() ) - SetFont(mergefrom->GetFont()); - if ( !HasAlignment() && mergefrom->HasAlignment() ) - { - int hAlign, vAlign; - mergefrom->GetAlignment( &hAlign, &vAlign); - SetAlignment(hAlign, vAlign); - } - if ( !HasSize() && mergefrom->HasSize() ) - mergefrom->GetSize( &m_sizeRows, &m_sizeCols ); - - // Directly access member functions as GetRender/Editor don't just return - // m_renderer/m_editor - // - // Maybe add support for merge of Render and Editor? - if (!HasRenderer() && mergefrom->HasRenderer() ) - { - m_renderer = mergefrom->m_renderer; - m_renderer->IncRef(); - } - if ( !HasEditor() && mergefrom->HasEditor() ) - { - m_editor = mergefrom->m_editor; - m_editor->IncRef(); - } - if ( !HasReadWriteMode() && mergefrom->HasReadWriteMode() ) - SetReadOnly(mergefrom->IsReadOnly()); - - if (!HasOverflowMode() && mergefrom->HasOverflowMode() ) - SetOverflow(mergefrom->GetOverflow()); - - SetDefAttr(mergefrom->m_defGridAttr); -} - -void wxGridCellAttr::SetSize(int num_rows, int num_cols) -{ - // The size of a cell is normally 1,1 - - // If this cell is larger (2,2) then this is the top left cell - // the other cells that will be covered (lower right cells) must be - // set to negative or zero values such that - // row + num_rows of the covered cell points to the larger cell (this cell) - // same goes for the col + num_cols. - - // Size of 0,0 is NOT valid, neither is <=0 and any positive value - - wxASSERT_MSG( (!((num_rows > 0) && (num_cols <= 0)) || - !((num_rows <= 0) && (num_cols > 0)) || - !((num_rows == 0) && (num_cols == 0))), - wxT("wxGridCellAttr::SetSize only takes two positive values or negative/zero values")); - - m_sizeRows = num_rows; - m_sizeCols = num_cols; -} - -const wxColour& wxGridCellAttr::GetTextColour() const -{ - if (HasTextColour()) - { - return m_colText; - } - else if (m_defGridAttr && m_defGridAttr != this) - { - return m_defGridAttr->GetTextColour(); - } - else - { - wxFAIL_MSG(wxT("Missing default cell attribute")); - return wxNullColour; - } -} - -const wxColour& wxGridCellAttr::GetBackgroundColour() const -{ - if (HasBackgroundColour()) - { - return m_colBack; - } - else if (m_defGridAttr && m_defGridAttr != this) - { - return m_defGridAttr->GetBackgroundColour(); - } - else - { - wxFAIL_MSG(wxT("Missing default cell attribute")); - return wxNullColour; - } -} - -const wxFont& wxGridCellAttr::GetFont() const -{ - if (HasFont()) - { - return m_font; - } - else if (m_defGridAttr && m_defGridAttr != this) - { - return m_defGridAttr->GetFont(); - } - else - { - wxFAIL_MSG(wxT("Missing default cell attribute")); - return wxNullFont; - } -} - -void wxGridCellAttr::GetAlignment(int *hAlign, int *vAlign) const -{ - if (HasAlignment()) - { - if ( hAlign ) - *hAlign = m_hAlign; - if ( vAlign ) - *vAlign = m_vAlign; - } - else if (m_defGridAttr && m_defGridAttr != this) - { - m_defGridAttr->GetAlignment(hAlign, vAlign); - } - else - { - wxFAIL_MSG(wxT("Missing default cell attribute")); - } -} - -void wxGridCellAttr::GetNonDefaultAlignment(int *hAlign, int *vAlign) const -{ - if ( hAlign && m_hAlign != wxALIGN_INVALID ) - *hAlign = m_hAlign; - - if ( vAlign && m_vAlign != wxALIGN_INVALID ) - *vAlign = m_vAlign; -} - -void wxGridCellAttr::GetSize( int *num_rows, int *num_cols ) const -{ - if ( num_rows ) - *num_rows = m_sizeRows; - if ( num_cols ) - *num_cols = m_sizeCols; -} - -// GetRenderer and GetEditor use a slightly different decision path about -// which attribute to use. If a non-default attr object has one then it is -// used, otherwise the default editor or renderer is fetched from the grid and -// used. It should be the default for the data type of the cell. If it is -// NULL (because the table has a type that the grid does not have in its -// registry), then the grid's default editor or renderer is used. - -wxGridCellRenderer* wxGridCellAttr::GetRenderer(const wxGrid* grid, int row, int col) const -{ - wxGridCellRenderer *renderer = NULL; - - if ( m_renderer && this != m_defGridAttr ) - { - // use the cells renderer if it has one - renderer = m_renderer; - renderer->IncRef(); - } - else // no non-default cell renderer - { - // get default renderer for the data type - if ( grid ) - { - // GetDefaultRendererForCell() will do IncRef() for us - renderer = grid->GetDefaultRendererForCell(row, col); - } - - if ( renderer == NULL ) - { - if ( (m_defGridAttr != NULL) && (m_defGridAttr != this) ) - { - // if we still don't have one then use the grid default - // (no need for IncRef() here neither) - renderer = m_defGridAttr->GetRenderer(NULL, 0, 0); - } - else // default grid attr - { - // use m_renderer which we had decided not to use initially - renderer = m_renderer; - if ( renderer ) - renderer->IncRef(); - } - } - } - - // we're supposed to always find something - wxASSERT_MSG(renderer, wxT("Missing default cell renderer")); - - return renderer; -} - -// same as above, except for s/renderer/editor/g -wxGridCellEditor* wxGridCellAttr::GetEditor(const wxGrid* grid, int row, int col) const -{ - wxGridCellEditor *editor = NULL; - - if ( m_editor && this != m_defGridAttr ) - { - // use the cells editor if it has one - editor = m_editor; - editor->IncRef(); - } - else // no non default cell editor - { - // get default editor for the data type - if ( grid ) - { - // GetDefaultEditorForCell() will do IncRef() for us - editor = grid->GetDefaultEditorForCell(row, col); - } - - if ( editor == NULL ) - { - if ( (m_defGridAttr != NULL) && (m_defGridAttr != this) ) - { - // if we still don't have one then use the grid default - // (no need for IncRef() here neither) - editor = m_defGridAttr->GetEditor(NULL, 0, 0); - } - else // default grid attr - { - // use m_editor which we had decided not to use initially - editor = m_editor; - if ( editor ) - editor->IncRef(); - } - } - } - - // we're supposed to always find something - wxASSERT_MSG(editor, wxT("Missing default cell editor")); - - return editor; -} - -// ---------------------------------------------------------------------------- -// wxGridCellAttrData -// ---------------------------------------------------------------------------- - -void wxGridCellAttrData::SetAttr(wxGridCellAttr *attr, int row, int col) -{ - // Note: contrary to wxGridRowOrColAttrData::SetAttr, we must not - // touch attribute's reference counting explicitly, since this - // is managed by class wxGridCellWithAttr - int n = FindIndex(row, col); - if ( n == wxNOT_FOUND ) - { - if ( attr ) - { - // add the attribute - m_attrs.Add(new wxGridCellWithAttr(row, col, attr)); - } - //else: nothing to do - } - else // we already have an attribute for this cell - { - if ( attr ) - { - // change the attribute - m_attrs[(size_t)n].ChangeAttr(attr); - } - else - { - // remove this attribute - m_attrs.RemoveAt((size_t)n); - } - } -} - -wxGridCellAttr *wxGridCellAttrData::GetAttr(int row, int col) const -{ - wxGridCellAttr *attr = NULL; - - int n = FindIndex(row, col); - if ( n != wxNOT_FOUND ) - { - attr = m_attrs[(size_t)n].attr; - attr->IncRef(); - } - - return attr; -} - -void wxGridCellAttrData::UpdateAttrRows( size_t pos, int numRows ) -{ - size_t count = m_attrs.GetCount(); - for ( size_t n = 0; n < count; n++ ) - { - wxGridCellCoords& coords = m_attrs[n].coords; - wxCoord row = coords.GetRow(); - if ((size_t)row >= pos) - { - if (numRows > 0) - { - // If rows inserted, increment row counter where necessary - coords.SetRow(row + numRows); - } - else if (numRows < 0) - { - // If rows deleted ... - if ((size_t)row >= pos - numRows) - { - // ...either decrement row counter (if row still exists)... - coords.SetRow(row + numRows); - } - else - { - // ...or remove the attribute - m_attrs.RemoveAt(n); - n--; - count--; - } - } - } - } -} - -void wxGridCellAttrData::UpdateAttrCols( size_t pos, int numCols ) -{ - size_t count = m_attrs.GetCount(); - for ( size_t n = 0; n < count; n++ ) - { - wxGridCellCoords& coords = m_attrs[n].coords; - wxCoord col = coords.GetCol(); - if ( (size_t)col >= pos ) - { - if ( numCols > 0 ) - { - // If cols inserted, increment col counter where necessary - coords.SetCol(col + numCols); - } - else if (numCols < 0) - { - // If cols deleted ... - if ((size_t)col >= pos - numCols) - { - // ...either decrement col counter (if col still exists)... - coords.SetCol(col + numCols); - } - else - { - // ...or remove the attribute - m_attrs.RemoveAt(n); - n--; - count--; - } - } - } - } -} - -int wxGridCellAttrData::FindIndex(int row, int col) const -{ - size_t count = m_attrs.GetCount(); - for ( size_t n = 0; n < count; n++ ) - { - const wxGridCellCoords& coords = m_attrs[n].coords; - if ( (coords.GetRow() == row) && (coords.GetCol() == col) ) - { - return n; - } - } - - return wxNOT_FOUND; -} - -// ---------------------------------------------------------------------------- -// wxGridRowOrColAttrData -// ---------------------------------------------------------------------------- - -wxGridRowOrColAttrData::~wxGridRowOrColAttrData() -{ - size_t count = m_attrs.GetCount(); - for ( size_t n = 0; n < count; n++ ) - { - m_attrs[n]->DecRef(); - } -} - -wxGridCellAttr *wxGridRowOrColAttrData::GetAttr(int rowOrCol) const -{ - wxGridCellAttr *attr = NULL; - - int n = m_rowsOrCols.Index(rowOrCol); - if ( n != wxNOT_FOUND ) - { - attr = m_attrs[(size_t)n]; - attr->IncRef(); - } - - return attr; -} - -void wxGridRowOrColAttrData::SetAttr(wxGridCellAttr *attr, int rowOrCol) -{ - int i = m_rowsOrCols.Index(rowOrCol); - if ( i == wxNOT_FOUND ) - { - if ( attr ) - { - // store the new attribute, taking its ownership - m_rowsOrCols.Add(rowOrCol); - m_attrs.Add(attr); - } - // nothing to remove - } - else // we have an attribute for this row or column - { - size_t n = (size_t)i; - - // notice that this code works correctly even when the old attribute is - // the same as the new one: as we own of it, we must call DecRef() on - // it in any case and this won't result in destruction of the new - // attribute if it's the same as old one because it must have ref count - // of at least 2 to be passed to us while we keep a reference to it too - m_attrs[n]->DecRef(); - - if ( attr ) - { - // replace the attribute with the new one - m_attrs[n] = attr; - } - else // remove the attribute - { - m_rowsOrCols.RemoveAt(n); - m_attrs.RemoveAt(n); - } - } -} - -void wxGridRowOrColAttrData::UpdateAttrRowsOrCols( size_t pos, int numRowsOrCols ) -{ - size_t count = m_attrs.GetCount(); - for ( size_t n = 0; n < count; n++ ) - { - int & rowOrCol = m_rowsOrCols[n]; - if ( (size_t)rowOrCol >= pos ) - { - if ( numRowsOrCols > 0 ) - { - // If rows or cols inserted, increment row/col counter where necessary - rowOrCol += numRowsOrCols; - } - else if ( numRowsOrCols < 0) - { - // If rows/cols deleted, either decrement row/col counter (if row/col still exists) - if ((size_t)rowOrCol >= pos - numRowsOrCols) - rowOrCol += numRowsOrCols; - else - { - m_rowsOrCols.RemoveAt(n); - m_attrs[n]->DecRef(); - m_attrs.RemoveAt(n); - n--; - count--; - } - } - } - } -} - -// ---------------------------------------------------------------------------- -// wxGridCellAttrProvider -// ---------------------------------------------------------------------------- - -wxGridCellAttrProvider::wxGridCellAttrProvider() -{ - m_data = NULL; -} - -wxGridCellAttrProvider::~wxGridCellAttrProvider() -{ - delete m_data; -} - -void wxGridCellAttrProvider::InitData() -{ - m_data = new wxGridCellAttrProviderData; -} - -wxGridCellAttr *wxGridCellAttrProvider::GetAttr(int row, int col, - wxGridCellAttr::wxAttrKind kind ) const -{ - wxGridCellAttr *attr = NULL; - if ( m_data ) - { - switch (kind) - { - case (wxGridCellAttr::Any): - // Get cached merge attributes. - // Currently not used as no cache implemented as not mutable - // attr = m_data->m_mergeAttr.GetAttr(row, col); - if (!attr) - { - // Basically implement old version. - // Also check merge cache, so we don't have to re-merge every time.. - wxGridCellAttr *attrcell = m_data->m_cellAttrs.GetAttr(row, col); - wxGridCellAttr *attrrow = m_data->m_rowAttrs.GetAttr(row); - wxGridCellAttr *attrcol = m_data->m_colAttrs.GetAttr(col); - - if ((attrcell != attrrow) && (attrrow != attrcol) && (attrcell != attrcol)) - { - // Two or more are non NULL - attr = new wxGridCellAttr; - attr->SetKind(wxGridCellAttr::Merged); - - // Order is important.. - if (attrcell) - { - attr->MergeWith(attrcell); - attrcell->DecRef(); - } - if (attrcol) - { - attr->MergeWith(attrcol); - attrcol->DecRef(); - } - if (attrrow) - { - attr->MergeWith(attrrow); - attrrow->DecRef(); - } - - // store merge attr if cache implemented - //attr->IncRef(); - //m_data->m_mergeAttr.SetAttr(attr, row, col); - } - else - { - // one or none is non null return it or null. - if (attrrow) - attr = attrrow; - if (attrcol) - { - if (attr) - attr->DecRef(); - attr = attrcol; - } - if (attrcell) - { - if (attr) - attr->DecRef(); - attr = attrcell; - } - } - } - break; - - case (wxGridCellAttr::Cell): - attr = m_data->m_cellAttrs.GetAttr(row, col); - break; - - case (wxGridCellAttr::Col): - attr = m_data->m_colAttrs.GetAttr(col); - break; - - case (wxGridCellAttr::Row): - attr = m_data->m_rowAttrs.GetAttr(row); - break; - - default: - // unused as yet... - // (wxGridCellAttr::Default): - // (wxGridCellAttr::Merged): - break; - } - } - - return attr; -} - -void wxGridCellAttrProvider::SetAttr(wxGridCellAttr *attr, - int row, int col) -{ - if ( !m_data ) - InitData(); - - m_data->m_cellAttrs.SetAttr(attr, row, col); -} - -void wxGridCellAttrProvider::SetRowAttr(wxGridCellAttr *attr, int row) -{ - if ( !m_data ) - InitData(); - - m_data->m_rowAttrs.SetAttr(attr, row); -} - -void wxGridCellAttrProvider::SetColAttr(wxGridCellAttr *attr, int col) -{ - if ( !m_data ) - InitData(); - - m_data->m_colAttrs.SetAttr(attr, col); -} - -void wxGridCellAttrProvider::UpdateAttrRows( size_t pos, int numRows ) -{ - if ( m_data ) - { - m_data->m_cellAttrs.UpdateAttrRows( pos, numRows ); - - m_data->m_rowAttrs.UpdateAttrRowsOrCols( pos, numRows ); - } -} - -void wxGridCellAttrProvider::UpdateAttrCols( size_t pos, int numCols ) -{ - if ( m_data ) - { - m_data->m_cellAttrs.UpdateAttrCols( pos, numCols ); - - m_data->m_colAttrs.UpdateAttrRowsOrCols( pos, numCols ); - } -} - -const wxGridColumnHeaderRenderer& -wxGridCellAttrProvider::GetColumnHeaderRenderer(int WXUNUSED(col)) -{ - return gs_defaultHeaderRenderers.colRenderer; -} - -const wxGridRowHeaderRenderer& -wxGridCellAttrProvider::GetRowHeaderRenderer(int WXUNUSED(row)) -{ - return gs_defaultHeaderRenderers.rowRenderer; -} - -const wxGridCornerHeaderRenderer& wxGridCellAttrProvider::GetCornerRenderer() -{ - return gs_defaultHeaderRenderers.cornerRenderer; -} - -// ---------------------------------------------------------------------------- -// wxGridTableBase -// ---------------------------------------------------------------------------- - -wxIMPLEMENT_ABSTRACT_CLASS(wxGridTableBase, wxObject); - -wxGridTableBase::wxGridTableBase() -{ - m_view = NULL; - m_attrProvider = NULL; -} - -wxGridTableBase::~wxGridTableBase() -{ - delete m_attrProvider; -} - -void wxGridTableBase::SetAttrProvider(wxGridCellAttrProvider *attrProvider) -{ - delete m_attrProvider; - m_attrProvider = attrProvider; -} - -bool wxGridTableBase::CanHaveAttributes() -{ - if ( ! GetAttrProvider() ) - { - // use the default attr provider by default - SetAttrProvider(new wxGridCellAttrProvider); - } - - return true; -} - -wxGridCellAttr *wxGridTableBase::GetAttr(int row, int col, wxGridCellAttr::wxAttrKind kind) -{ - if ( m_attrProvider ) - return m_attrProvider->GetAttr(row, col, kind); - else - return NULL; -} - -void wxGridTableBase::SetAttr(wxGridCellAttr* attr, int row, int col) -{ - if ( m_attrProvider ) - { - if ( attr ) - attr->SetKind(wxGridCellAttr::Cell); - m_attrProvider->SetAttr(attr, row, col); - } - else - { - // as we take ownership of the pointer and don't store it, we must - // free it now - wxSafeDecRef(attr); - } -} - -void wxGridTableBase::SetRowAttr(wxGridCellAttr *attr, int row) -{ - if ( m_attrProvider ) - { - if ( attr ) - attr->SetKind(wxGridCellAttr::Row); - m_attrProvider->SetRowAttr(attr, row); - } - else - { - // as we take ownership of the pointer and don't store it, we must - // free it now - wxSafeDecRef(attr); - } -} - -void wxGridTableBase::SetColAttr(wxGridCellAttr *attr, int col) -{ - if ( m_attrProvider ) - { - if ( attr ) - attr->SetKind(wxGridCellAttr::Col); - m_attrProvider->SetColAttr(attr, col); - } - else - { - // as we take ownership of the pointer and don't store it, we must - // free it now - wxSafeDecRef(attr); - } -} - -bool wxGridTableBase::InsertRows( size_t WXUNUSED(pos), - size_t WXUNUSED(numRows) ) -{ - wxFAIL_MSG( wxT("Called grid table class function InsertRows\nbut your derived table class does not override this function") ); - - return false; -} - -bool wxGridTableBase::AppendRows( size_t WXUNUSED(numRows) ) -{ - wxFAIL_MSG( wxT("Called grid table class function AppendRows\nbut your derived table class does not override this function")); - - return false; -} - -bool wxGridTableBase::DeleteRows( size_t WXUNUSED(pos), - size_t WXUNUSED(numRows) ) -{ - wxFAIL_MSG( wxT("Called grid table class function DeleteRows\nbut your derived table class does not override this function")); - - return false; -} - -bool wxGridTableBase::InsertCols( size_t WXUNUSED(pos), - size_t WXUNUSED(numCols) ) -{ - wxFAIL_MSG( wxT("Called grid table class function InsertCols\nbut your derived table class does not override this function")); - - return false; -} - -bool wxGridTableBase::AppendCols( size_t WXUNUSED(numCols) ) -{ - wxFAIL_MSG(wxT("Called grid table class function AppendCols\nbut your derived table class does not override this function")); - - return false; -} - -bool wxGridTableBase::DeleteCols( size_t WXUNUSED(pos), - size_t WXUNUSED(numCols) ) -{ - wxFAIL_MSG( wxT("Called grid table class function DeleteCols\nbut your derived table class does not override this function")); - - return false; -} - -wxString wxGridTableBase::GetRowLabelValue( int row ) -{ - wxString s; - - // RD: Starting the rows at zero confuses users, - // no matter how much it makes sense to us geeks. - s << row + 1; - - return s; -} - -wxString wxGridTableBase::GetColLabelValue( int col ) -{ - // default col labels are: - // cols 0 to 25 : A-Z - // cols 26 to 675 : AA-ZZ - // etc. - - wxString s; - unsigned int i, n; - for ( n = 1; ; n++ ) - { - s += (wxChar) (wxT('A') + (wxChar)(col % 26)); - col = col / 26 - 1; - if ( col < 0 ) - break; - } - - // reverse the string... - wxString s2; - for ( i = 0; i < n; i++ ) - { - s2 += s[n - i - 1]; - } - - return s2; -} - -wxString wxGridTableBase::GetTypeName( int WXUNUSED(row), int WXUNUSED(col) ) -{ - return wxGRID_VALUE_STRING; -} - -bool wxGridTableBase::CanGetValueAs( int WXUNUSED(row), int WXUNUSED(col), - const wxString& typeName ) -{ - return typeName == wxGRID_VALUE_STRING; -} - -bool wxGridTableBase::CanSetValueAs( int row, int col, const wxString& typeName ) -{ - return CanGetValueAs(row, col, typeName); -} - -long wxGridTableBase::GetValueAsLong( int WXUNUSED(row), int WXUNUSED(col) ) -{ - return 0; -} - -double wxGridTableBase::GetValueAsDouble( int WXUNUSED(row), int WXUNUSED(col) ) -{ - return 0.0; -} - -bool wxGridTableBase::GetValueAsBool( int WXUNUSED(row), int WXUNUSED(col) ) -{ - return false; -} - -void wxGridTableBase::SetValueAsLong( int WXUNUSED(row), int WXUNUSED(col), - long WXUNUSED(value) ) -{ -} - -void wxGridTableBase::SetValueAsDouble( int WXUNUSED(row), int WXUNUSED(col), - double WXUNUSED(value) ) -{ -} - -void wxGridTableBase::SetValueAsBool( int WXUNUSED(row), int WXUNUSED(col), - bool WXUNUSED(value) ) -{ -} - -void* wxGridTableBase::GetValueAsCustom( int WXUNUSED(row), int WXUNUSED(col), - const wxString& WXUNUSED(typeName) ) -{ - return NULL; -} - -void wxGridTableBase::SetValueAsCustom( int WXUNUSED(row), int WXUNUSED(col), - const wxString& WXUNUSED(typeName), - void* WXUNUSED(value) ) -{ -} - -////////////////////////////////////////////////////////////////////// -// -// Message class for the grid table to send requests and notifications -// to the grid view -// - -wxGridTableMessage::wxGridTableMessage() -{ - m_table = NULL; - m_id = -1; - m_comInt1 = -1; - m_comInt2 = -1; -} - -wxGridTableMessage::wxGridTableMessage( wxGridTableBase *table, int id, - int commandInt1, int commandInt2 ) -{ - m_table = table; - m_id = id; - m_comInt1 = commandInt1; - m_comInt2 = commandInt2; -} - -////////////////////////////////////////////////////////////////////// -// -// A basic grid table for string data. An object of this class will -// created by wxGrid if you don't specify an alternative table class. -// - -WX_DEFINE_OBJARRAY(wxGridStringArray) - -wxIMPLEMENT_DYNAMIC_CLASS(wxGridStringTable, wxGridTableBase); - -wxGridStringTable::wxGridStringTable() - : wxGridTableBase() -{ - m_numCols = 0; -} - -wxGridStringTable::wxGridStringTable( int numRows, int numCols ) - : wxGridTableBase() -{ - m_numCols = numCols; - - m_data.Alloc( numRows ); - - wxArrayString sa; - sa.Alloc( numCols ); - sa.Add( wxEmptyString, numCols ); - - m_data.Add( sa, numRows ); -} - -wxString wxGridStringTable::GetValue( int row, int col ) -{ - wxCHECK_MSG( (row >= 0 && row < GetNumberRows()) && - (col >= 0 && col < GetNumberCols()), - wxEmptyString, - wxT("invalid row or column index in wxGridStringTable") ); - - return m_data[row][col]; -} - -void wxGridStringTable::SetValue( int row, int col, const wxString& value ) -{ - wxCHECK_RET( (row >= 0 && row < GetNumberRows()) && - (col >= 0 && col < GetNumberCols()), - wxT("invalid row or column index in wxGridStringTable") ); - - m_data[row][col] = value; -} - -void wxGridStringTable::Clear() -{ - int row, col; - int numRows, numCols; - - numRows = m_data.GetCount(); - if ( numRows > 0 ) - { - numCols = m_data[0].GetCount(); - - for ( row = 0; row < numRows; row++ ) - { - for ( col = 0; col < numCols; col++ ) - { - m_data[row][col] = wxEmptyString; - } - } - } -} - -bool wxGridStringTable::InsertRows( size_t pos, size_t numRows ) -{ - if ( pos >= m_data.size() ) - { - return AppendRows( numRows ); - } - - wxArrayString sa; - sa.Alloc( m_numCols ); - sa.Add( wxEmptyString, m_numCols ); - m_data.Insert( sa, pos, numRows ); - - if ( GetView() ) - { - wxGridTableMessage msg( this, - wxGRIDTABLE_NOTIFY_ROWS_INSERTED, - pos, - numRows ); - - GetView()->ProcessTableMessage( msg ); - } - - return true; -} - -bool wxGridStringTable::AppendRows( size_t numRows ) -{ - wxArrayString sa; - if ( m_numCols > 0 ) - { - sa.Alloc( m_numCols ); - sa.Add( wxEmptyString, m_numCols ); - } - - m_data.Add( sa, numRows ); - - if ( GetView() ) - { - wxGridTableMessage msg( this, - wxGRIDTABLE_NOTIFY_ROWS_APPENDED, - numRows ); - - GetView()->ProcessTableMessage( msg ); - } - - return true; -} - -bool wxGridStringTable::DeleteRows( size_t pos, size_t numRows ) -{ - size_t curNumRows = m_data.GetCount(); - - if ( pos >= curNumRows ) - { - wxFAIL_MSG( wxString::Format - ( - wxT("Called wxGridStringTable::DeleteRows(pos=%lu, N=%lu)\nPos value is invalid for present table with %lu rows"), - (unsigned long)pos, - (unsigned long)numRows, - (unsigned long)curNumRows - ) ); - - return false; - } - - if ( numRows > curNumRows - pos ) - { - numRows = curNumRows - pos; - } - - if ( numRows >= curNumRows ) - { - m_data.Clear(); - } - else - { - m_data.RemoveAt( pos, numRows ); - } - - if ( GetView() ) - { - wxGridTableMessage msg( this, - wxGRIDTABLE_NOTIFY_ROWS_DELETED, - pos, - numRows ); - - GetView()->ProcessTableMessage( msg ); - } - - return true; -} - -bool wxGridStringTable::InsertCols( size_t pos, size_t numCols ) -{ - if ( pos >= static_cast(m_numCols) ) - { - return AppendCols( numCols ); - } - - if ( !m_colLabels.IsEmpty() ) - { - m_colLabels.Insert( wxEmptyString, pos, numCols ); - - for ( size_t i = pos; i < pos + numCols; i++ ) - m_colLabels[i] = wxGridTableBase::GetColLabelValue( i ); - } - - for ( size_t row = 0; row < m_data.size(); row++ ) - { - for ( size_t col = pos; col < pos + numCols; col++ ) - { - m_data[row].Insert( wxEmptyString, col ); - } - } - - m_numCols += numCols; - - if ( GetView() ) - { - wxGridTableMessage msg( this, - wxGRIDTABLE_NOTIFY_COLS_INSERTED, - pos, - numCols ); - - GetView()->ProcessTableMessage( msg ); - } - - return true; -} - -bool wxGridStringTable::AppendCols( size_t numCols ) -{ - for ( size_t row = 0; row < m_data.size(); row++ ) - { - m_data[row].Add( wxEmptyString, numCols ); - } - - m_numCols += numCols; - - if ( GetView() ) - { - wxGridTableMessage msg( this, - wxGRIDTABLE_NOTIFY_COLS_APPENDED, - numCols ); - - GetView()->ProcessTableMessage( msg ); - } - - return true; -} - -bool wxGridStringTable::DeleteCols( size_t pos, size_t numCols ) -{ - size_t row; - - size_t curNumRows = m_data.GetCount(); - size_t curNumCols = m_numCols; - - if ( pos >= curNumCols ) - { - wxFAIL_MSG( wxString::Format - ( - wxT("Called wxGridStringTable::DeleteCols(pos=%lu, N=%lu)\nPos value is invalid for present table with %lu cols"), - (unsigned long)pos, - (unsigned long)numCols, - (unsigned long)curNumCols - ) ); - return false; - } - - int colID; - if ( GetView() ) - colID = GetView()->GetColAt( pos ); - else - colID = pos; - - if ( numCols > curNumCols - colID ) - { - numCols = curNumCols - colID; - } - - if ( !m_colLabels.IsEmpty() ) - { - // m_colLabels stores just as many elements as it needs, e.g. if only - // the label of the first column had been set it would have only one - // element and not numCols, so account for it - int numRemaining = m_colLabels.size() - colID; - if (numRemaining > 0) - m_colLabels.RemoveAt( colID, wxMin(numCols, numRemaining) ); - } - - if ( numCols >= curNumCols ) - { - for ( row = 0; row < curNumRows; row++ ) - { - m_data[row].Clear(); - } - - m_numCols = 0; - } - else // something will be left - { - for ( row = 0; row < curNumRows; row++ ) - { - m_data[row].RemoveAt( colID, numCols ); - } - - m_numCols -= numCols; - } - - if ( GetView() ) - { - wxGridTableMessage msg( this, - wxGRIDTABLE_NOTIFY_COLS_DELETED, - pos, - numCols ); - - GetView()->ProcessTableMessage( msg ); - } - - return true; -} - -wxString wxGridStringTable::GetRowLabelValue( int row ) -{ - if ( row > (int)(m_rowLabels.GetCount()) - 1 ) - { - // using default label - // - return wxGridTableBase::GetRowLabelValue( row ); - } - else - { - return m_rowLabels[row]; - } -} - -wxString wxGridStringTable::GetColLabelValue( int col ) -{ - if ( col > (int)(m_colLabels.GetCount()) - 1 ) - { - // using default label - // - return wxGridTableBase::GetColLabelValue( col ); - } - else - { - return m_colLabels[col]; - } -} - -void wxGridStringTable::SetRowLabelValue( int row, const wxString& value ) -{ - if ( row > (int)(m_rowLabels.GetCount()) - 1 ) - { - int n = m_rowLabels.GetCount(); - int i; - - for ( i = n; i <= row; i++ ) - { - m_rowLabels.Add( wxGridTableBase::GetRowLabelValue(i) ); - } - } - - m_rowLabels[row] = value; -} - -void wxGridStringTable::SetColLabelValue( int col, const wxString& value ) -{ - if ( col > (int)(m_colLabels.GetCount()) - 1 ) - { - int n = m_colLabels.GetCount(); - int i; - - for ( i = n; i <= col; i++ ) - { - m_colLabels.Add( wxGridTableBase::GetColLabelValue(i) ); - } - } - - m_colLabels[col] = value; -} - - -////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////// - -wxBEGIN_EVENT_TABLE(wxGridSubwindow, wxWindow) - EVT_MOUSE_CAPTURE_LOST(wxGridSubwindow::OnMouseCaptureLost) -wxEND_EVENT_TABLE() - -void wxGridSubwindow::OnMouseCaptureLost(wxMouseCaptureLostEvent& WXUNUSED(event)) -{ - m_owner->CancelMouseCapture(); -} - -wxBEGIN_EVENT_TABLE( wxGridRowLabelWindow, wxGridSubwindow ) - EVT_PAINT( wxGridRowLabelWindow::OnPaint ) - EVT_MOUSEWHEEL( wxGridRowLabelWindow::OnMouseWheel ) - EVT_MOUSE_EVENTS( wxGridRowLabelWindow::OnMouseEvent ) -wxEND_EVENT_TABLE() - -void wxGridRowLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) ) -{ - wxPaintDC dc(this); - - // NO - don't do this because it will set both the x and y origin - // coords to match the parent scrolled window and we just want to - // set the y coord - MB - // - // m_owner->PrepareDC( dc ); - - int x, y; - m_owner->CalcUnscrolledPosition( 0, 0, &x, &y ); - wxPoint pt = dc.GetDeviceOrigin(); - dc.SetDeviceOrigin( pt.x, pt.y-y ); - - wxArrayInt rows = m_owner->CalcRowLabelsExposed( GetUpdateRegion() ); - m_owner->DrawRowLabels( dc, rows ); -} - -void wxGridRowLabelWindow::OnMouseEvent( wxMouseEvent& event ) -{ - m_owner->ProcessRowLabelMouseEvent( event ); -} - -void wxGridRowLabelWindow::OnMouseWheel( wxMouseEvent& event ) -{ - if (!m_owner->GetEventHandler()->ProcessEvent( event )) - event.Skip(); -} - -////////////////////////////////////////////////////////////////////// - -wxBEGIN_EVENT_TABLE( wxGridColLabelWindow, wxGridSubwindow ) - EVT_PAINT( wxGridColLabelWindow::OnPaint ) - EVT_MOUSEWHEEL( wxGridColLabelWindow::OnMouseWheel ) - EVT_MOUSE_EVENTS( wxGridColLabelWindow::OnMouseEvent ) -wxEND_EVENT_TABLE() - -void wxGridColLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) ) -{ - wxPaintDC dc(this); - - // NO - don't do this because it will set both the x and y origin - // coords to match the parent scrolled window and we just want to - // set the x coord - MB - // - // m_owner->PrepareDC( dc ); - - int x, y; - m_owner->CalcUnscrolledPosition( 0, 0, &x, &y ); - wxPoint pt = dc.GetDeviceOrigin(); - dc.SetDeviceOrigin( pt.x-x, pt.y ); - - wxArrayInt cols = m_owner->CalcColLabelsExposed( GetUpdateRegion() ); - m_owner->DrawColLabels( dc, cols ); -} - -void wxGridColLabelWindow::OnMouseEvent( wxMouseEvent& event ) -{ - m_owner->ProcessColLabelMouseEvent( event ); -} - -void wxGridColLabelWindow::OnMouseWheel( wxMouseEvent& event ) -{ - if (!m_owner->GetEventHandler()->ProcessEvent( event )) - event.Skip(); -} - -////////////////////////////////////////////////////////////////////// - -wxBEGIN_EVENT_TABLE( wxGridCornerLabelWindow, wxGridSubwindow ) - EVT_MOUSEWHEEL( wxGridCornerLabelWindow::OnMouseWheel ) - EVT_MOUSE_EVENTS( wxGridCornerLabelWindow::OnMouseEvent ) - EVT_PAINT( wxGridCornerLabelWindow::OnPaint ) -wxEND_EVENT_TABLE() - -void wxGridCornerLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) ) -{ - wxPaintDC dc(this); - - m_owner->DrawCornerLabel(dc); -} - -void wxGridCornerLabelWindow::OnMouseEvent( wxMouseEvent& event ) -{ - m_owner->ProcessCornerLabelMouseEvent( event ); -} - -void wxGridCornerLabelWindow::OnMouseWheel( wxMouseEvent& event ) -{ - if (!m_owner->GetEventHandler()->ProcessEvent(event)) - event.Skip(); -} - -////////////////////////////////////////////////////////////////////// - -wxBEGIN_EVENT_TABLE( wxGridWindow, wxGridSubwindow ) - EVT_PAINT( wxGridWindow::OnPaint ) - EVT_MOUSEWHEEL( wxGridWindow::OnMouseWheel ) - EVT_MOUSE_EVENTS( wxGridWindow::OnMouseEvent ) - EVT_KEY_DOWN( wxGridWindow::OnKeyDown ) - EVT_KEY_UP( wxGridWindow::OnKeyUp ) - EVT_CHAR( wxGridWindow::OnChar ) - EVT_SET_FOCUS( wxGridWindow::OnFocus ) - EVT_KILL_FOCUS( wxGridWindow::OnFocus ) - EVT_ERASE_BACKGROUND( wxGridWindow::OnEraseBackground ) -wxEND_EVENT_TABLE() - -void wxGridWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) -{ - wxPaintDC dc( this ); - m_owner->PrepareDC( dc ); - wxRegion reg = GetUpdateRegion(); - wxGridCellCoordsArray dirtyCells = m_owner->CalcCellsExposed( reg ); - m_owner->DrawGridCellArea( dc, dirtyCells ); - - m_owner->DrawGridSpace( dc ); - - m_owner->DrawAllGridLines( dc, reg ); - - m_owner->DrawHighlight( dc, dirtyCells ); -} - -void wxGrid::Render( wxDC& dc, - const wxPoint& position, - const wxSize& size, - const wxGridCellCoords& topLeft, - const wxGridCellCoords& bottomRight, - int style ) -{ - wxCHECK_RET( bottomRight.GetCol() < GetNumberCols(), - "Invalid right column" ); - wxCHECK_RET( bottomRight.GetRow() < GetNumberRows(), - "Invalid bottom row" ); - - // store user settings and reset later - - // remove grid selection, don't paint selection colour - // unless we have wxGRID_DRAW_SELECTION - // block selections are the only ones catered for here - wxGridCellCoordsArray selectedCells; - bool hasSelection = IsSelection(); - if ( hasSelection && !( style & wxGRID_DRAW_SELECTION ) ) - { - selectedCells = GetSelectionBlockTopLeft(); - // non block selections may not have a bottom right - if ( GetSelectionBlockBottomRight().size() ) - selectedCells.Add( GetSelectionBlockBottomRight()[ 0 ] ); - - ClearSelection(); - } - - // store user device origin - wxCoord userOriginX, userOriginY; - dc.GetDeviceOrigin( &userOriginX, &userOriginY ); - - // store user scale - double scaleUserX, scaleUserY; - dc.GetUserScale( &scaleUserX, &scaleUserY ); - - // set defaults if necessary - wxGridCellCoords leftTop( topLeft ), rightBottom( bottomRight ); - if ( leftTop.GetCol() < 0 ) - leftTop.SetCol(0); - if ( leftTop.GetRow() < 0 ) - leftTop.SetRow(0); - if ( rightBottom.GetCol() < 0 ) - rightBottom.SetCol(GetNumberCols() - 1); - if ( rightBottom.GetRow() < 0 ) - rightBottom.SetRow(GetNumberRows() - 1); - - // get grid offset, size and cell parameters - wxPoint pointOffSet; - wxSize sizeGrid; - wxGridCellCoordsArray renderCells; - wxArrayInt arrayCols; - wxArrayInt arrayRows; - - GetRenderSizes( leftTop, rightBottom, - pointOffSet, sizeGrid, - renderCells, - arrayCols, arrayRows ); - - // add headers/labels to dimensions - if ( style & wxGRID_DRAW_ROWS_HEADER ) - sizeGrid.x += GetRowLabelSize(); - if ( style & wxGRID_DRAW_COLS_HEADER ) - sizeGrid.y += GetColLabelSize(); - - // get render start position in logical units - wxPoint positionRender = GetRenderPosition( dc, position ); - - wxCoord originX = dc.LogicalToDeviceX( positionRender.x ); - wxCoord originY = dc.LogicalToDeviceY( positionRender.y ); - - dc.SetDeviceOrigin( originX, originY ); - - SetRenderScale( dc, positionRender, size, sizeGrid ); - - // draw row headers at specified origin - if ( GetRowLabelSize() > 0 && ( style & wxGRID_DRAW_ROWS_HEADER ) ) - { - if ( style & wxGRID_DRAW_COLS_HEADER ) - { - DrawCornerLabel( dc ); // do only if both col and row labels drawn - originY += dc.LogicalToDeviceYRel( GetColLabelSize() ); - } - - originY -= dc.LogicalToDeviceYRel( pointOffSet.y ); - dc.SetDeviceOrigin( originX, originY ); - - DrawRowLabels( dc, arrayRows ); - - // reset for columns - if ( style & wxGRID_DRAW_COLS_HEADER ) - originY -= dc.LogicalToDeviceYRel( GetColLabelSize() ); - - originY += dc.LogicalToDeviceYRel( pointOffSet.y ); - // X offset so we don't overwrite row labels - originX += dc.LogicalToDeviceXRel( GetRowLabelSize() ); - } - - // subtract col offset where startcol > 0 - originX -= dc.LogicalToDeviceXRel( pointOffSet.x ); - // no y offset for col labels, they are at the Y origin - - // draw column labels - if ( style & wxGRID_DRAW_COLS_HEADER ) - { - dc.SetDeviceOrigin( originX, originY ); - DrawColLabels( dc, arrayCols ); - // don't overwrite the labels, increment originY - originY += dc.LogicalToDeviceYRel( GetColLabelSize() ); - } - - // set device origin to draw grid cells and lines - originY -= dc.LogicalToDeviceYRel( pointOffSet.y ); - dc.SetDeviceOrigin( originX, originY ); - - // draw cell area background - dc.SetBrush( GetDefaultCellBackgroundColour() ); - dc.SetPen( *wxTRANSPARENT_PEN ); - // subtract headers from grid area dimensions - wxSize sizeCells( sizeGrid ); - if ( style & wxGRID_DRAW_ROWS_HEADER ) - sizeCells.x -= GetRowLabelSize(); - if ( style & wxGRID_DRAW_COLS_HEADER ) - sizeCells.y -= GetColLabelSize(); - - dc.DrawRectangle( pointOffSet, sizeCells ); - - // draw cells - DrawGridCellArea( dc, renderCells ); - - // draw grid lines - if ( style & wxGRID_DRAW_CELL_LINES ) - { - wxRegion regionClip( pointOffSet.x, pointOffSet.y, - sizeCells.x, sizeCells.y ); - - DrawRangeGridLines(dc, regionClip, renderCells[0], renderCells.Last()); - } - - // draw render rectangle bounding lines - DoRenderBox( dc, style, - pointOffSet, sizeCells, - leftTop, rightBottom ); - - // restore user setings - dc.SetDeviceOrigin( userOriginX, userOriginY ); - dc.SetUserScale( scaleUserX, scaleUserY ); - - if ( selectedCells.size() && !( style & wxGRID_DRAW_SELECTION ) ) - { - SelectBlock( selectedCells[ 0 ].GetRow(), - selectedCells[ 0 ].GetCol(), - selectedCells[ selectedCells.size() -1 ].GetRow(), - selectedCells[ selectedCells.size() -1 ].GetCol() ); - } -} - -void -wxGrid::SetRenderScale(wxDC& dc, - const wxPoint& pos, const wxSize& size, - const wxSize& sizeGrid ) -{ - double scaleX, scaleY; - wxSize sizeTemp; - - if ( size.GetWidth() != wxDefaultSize.GetWidth() ) // size.x was specified - sizeTemp.SetWidth( size.GetWidth() ); - else - sizeTemp.SetWidth( dc.DeviceToLogicalXRel( dc.GetSize().GetWidth() ) - - pos.x ); - - if ( size.GetHeight() != wxDefaultSize.GetHeight() ) // size.y was specified - sizeTemp.SetHeight( size.GetHeight() ); - else - sizeTemp.SetHeight( dc.DeviceToLogicalYRel( dc.GetSize().GetHeight() ) - - pos.y ); - - scaleX = (double)( (double) sizeTemp.GetWidth() / (double) sizeGrid.GetWidth() ); - scaleY = (double)( (double) sizeTemp.GetHeight() / (double) sizeGrid.GetHeight() ); - - dc.SetUserScale( wxMin( scaleX, scaleY), wxMin( scaleX, scaleY ) ); -} - -// get grid rendered size, origin offset and fill cell arrays -void wxGrid::GetRenderSizes( const wxGridCellCoords& topLeft, - const wxGridCellCoords& bottomRight, - wxPoint& pointOffSet, wxSize& sizeGrid, - wxGridCellCoordsArray& renderCells, - wxArrayInt& arrayCols, wxArrayInt& arrayRows ) -{ - pointOffSet.x = 0; - pointOffSet.y = 0; - sizeGrid.SetWidth( 0 ); - sizeGrid.SetHeight( 0 ); - - int col, row; - - wxGridSizesInfo sizeinfo = GetColSizes(); - for ( col = 0; col <= bottomRight.GetCol(); col++ ) - { - if ( col < topLeft.GetCol() ) - { - pointOffSet.x += sizeinfo.GetSize( col ); - } - else - { - for ( row = topLeft.GetRow(); row <= bottomRight.GetRow(); row++ ) - { - renderCells.Add( wxGridCellCoords( row, col )); - arrayRows.Add( row ); // column labels rendered in DrawColLabels - } - arrayCols.Add( col ); // row labels rendered in DrawRowLabels - sizeGrid.x += sizeinfo.GetSize( col ); - } - } - - sizeinfo = GetRowSizes(); - for ( row = 0; row <= bottomRight.GetRow(); row++ ) - { - if ( row < topLeft.GetRow() ) - pointOffSet.y += sizeinfo.GetSize( row ); - else - sizeGrid.y += sizeinfo.GetSize( row ); - } -} - -// get render start position -// if position not specified use dc draw extents MaxX and MaxY -wxPoint wxGrid::GetRenderPosition( wxDC& dc, const wxPoint& position ) -{ - wxPoint positionRender( position ); - - if ( !positionRender.IsFullySpecified() ) - { - if ( positionRender.x == wxDefaultPosition.x ) - positionRender.x = dc.MaxX(); - - if ( positionRender.y == wxDefaultPosition.y ) - positionRender.y = dc.MaxY(); - } - - return positionRender; -} - -// draw render rectangle bounding lines -// useful where there is multi cell row or col clipping and no cell border -void wxGrid::DoRenderBox( wxDC& dc, const int& style, - const wxPoint& pointOffSet, - const wxSize& sizeCells, - const wxGridCellCoords& topLeft, - const wxGridCellCoords& bottomRight ) -{ - if ( !( style & wxGRID_DRAW_BOX_RECT ) ) - return; - - int bottom = pointOffSet.y + sizeCells.GetY(), - right = pointOffSet.x + sizeCells.GetX() - 1; - - // horiz top line if we are not drawing column header/labels - if ( !( style & wxGRID_DRAW_COLS_HEADER ) ) - { - int left = pointOffSet.x; - left += ( style & wxGRID_DRAW_COLS_HEADER ) - ? - GetRowLabelSize() : 0; - dc.SetPen( GetRowGridLinePen( topLeft.GetRow() ) ); - dc.DrawLine( left, - pointOffSet.y, - right, - pointOffSet.y ); - } - - // horiz bottom line - dc.SetPen( GetRowGridLinePen( bottomRight.GetRow() ) ); - dc.DrawLine( pointOffSet.x, bottom - 1, right, bottom - 1 ); - - // left vertical line if we are not drawing row header/labels - if ( !( style & wxGRID_DRAW_ROWS_HEADER ) ) - { - int top = pointOffSet.y; - top += ( style & wxGRID_DRAW_COLS_HEADER ) - ? - GetColLabelSize() : 0; - dc.SetPen( GetColGridLinePen( topLeft.GetCol() ) ); - dc.DrawLine( pointOffSet.x -1, - top, - pointOffSet.x - 1, - bottom - 1 ); - } - - // right vertical line - dc.SetPen( GetColGridLinePen( bottomRight.GetCol() ) ); - dc.DrawLine( right, pointOffSet.y, right, bottom - 1 ); -} - -void wxGridWindow::ScrollWindow( int dx, int dy, const wxRect *rect ) -{ - wxWindow::ScrollWindow( dx, dy, rect ); - m_owner->GetGridRowLabelWindow()->ScrollWindow( 0, dy, rect ); - m_owner->GetGridColLabelWindow()->ScrollWindow( dx, 0, rect ); -} - -void wxGridWindow::OnMouseEvent( wxMouseEvent& event ) -{ - if (event.ButtonDown(wxMOUSE_BTN_LEFT) && FindFocus() != this) - SetFocus(); - - m_owner->ProcessGridCellMouseEvent( event ); -} - -void wxGridWindow::OnMouseWheel( wxMouseEvent& event ) -{ - if (!m_owner->GetEventHandler()->ProcessEvent( event )) - event.Skip(); -} - -// This seems to be required for wxMotif/wxGTK otherwise the mouse -// cursor must be in the cell edit control to get key events -// -void wxGridWindow::OnKeyDown( wxKeyEvent& event ) -{ - if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) - event.Skip(); -} - -void wxGridWindow::OnKeyUp( wxKeyEvent& event ) -{ - if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) - event.Skip(); -} - -void wxGridWindow::OnChar( wxKeyEvent& event ) -{ - if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) - event.Skip(); -} - -void wxGridWindow::OnEraseBackground( wxEraseEvent& WXUNUSED(event) ) -{ -} - -void wxGridWindow::OnFocus(wxFocusEvent& event) -{ - // and if we have any selection, it has to be repainted, because it - // uses different colour when the grid is not focused: - if ( m_owner->IsSelection() ) - { - Refresh(); - } - else - { - // NB: Note that this code is in "else" branch only because the other - // branch refreshes everything and so there's no point in calling - // Refresh() again, *not* because it should only be done if - // !IsSelection(). If the above code is ever optimized to refresh - // only selected area, this needs to be moved out of the "else" - // branch so that it's always executed. - - // current cell cursor {dis,re}appears on focus change: - const wxGridCellCoords cursorCoords(m_owner->GetGridCursorRow(), - m_owner->GetGridCursorCol()); - const wxRect cursor = - m_owner->BlockToDeviceRect(cursorCoords, cursorCoords); - if (cursor != wxGridNoCellRect) - Refresh(true, &cursor); - } - - if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) - event.Skip(); -} - -#define internalXToCol(x) XToCol(x, true) -#define internalYToRow(y) YToRow(y, true) - -///////////////////////////////////////////////////////////////////// - -wxBEGIN_EVENT_TABLE( wxGrid, wxScrolledWindow ) - EVT_PAINT( wxGrid::OnPaint ) - EVT_SIZE( wxGrid::OnSize ) - EVT_KEY_DOWN( wxGrid::OnKeyDown ) - EVT_KEY_UP( wxGrid::OnKeyUp ) - EVT_CHAR ( wxGrid::OnChar ) - EVT_ERASE_BACKGROUND( wxGrid::OnEraseBackground ) - EVT_COMMAND(wxID_ANY, wxEVT_GRID_HIDE_EDITOR, wxGrid::OnHideEditor ) -wxEND_EVENT_TABLE() - -bool wxGrid::Create(wxWindow *parent, wxWindowID id, - const wxPoint& pos, const wxSize& size, - long style, const wxString& name) -{ - if (!wxScrolledWindow::Create(parent, id, pos, size, - style | wxWANTS_CHARS, name)) - return false; - - m_colMinWidths = wxLongToLongHashMap(GRID_HASH_SIZE); - m_rowMinHeights = wxLongToLongHashMap(GRID_HASH_SIZE); - - Create(); - SetInitialSize(size); - CalcDimensions(); - - return true; -} - -wxGrid::~wxGrid() -{ - if ( m_winCapture ) - m_winCapture->ReleaseMouse(); - - // Ensure that the editor control is destroyed before the grid is, - // otherwise we crash later when the editor tries to do something with the - // half destroyed grid - HideCellEditControl(); - - // Must do this or ~wxScrollHelper will pop the wrong event handler - SetTargetWindow(this); - ClearAttrCache(); - wxSafeDecRef(m_defaultCellAttr); - -#ifdef DEBUG_ATTR_CACHE - size_t total = gs_nAttrCacheHits + gs_nAttrCacheMisses; - wxPrintf(wxT("wxGrid attribute cache statistics: " - "total: %u, hits: %u (%u%%)\n"), - total, gs_nAttrCacheHits, - total ? (gs_nAttrCacheHits*100) / total : 0); -#endif - - // if we own the table, just delete it, otherwise at least don't leave it - // with dangling view pointer - if ( m_ownTable ) - delete m_table; - else if ( m_table && m_table->GetView() == this ) - m_table->SetView(NULL); - - delete m_typeRegistry; - delete m_selection; - - delete m_setFixedRows; - delete m_setFixedCols; -} - -// -// ----- internal init and update functions -// - -// NOTE: If using the default visual attributes works everywhere then this can -// be removed as well as the #else cases below. -#define _USE_VISATTR 0 - -void wxGrid::Create() -{ - // create the type registry - m_typeRegistry = new wxGridTypeRegistry; - - m_cellEditCtrlEnabled = false; - - m_defaultCellAttr = new wxGridCellAttr(); - - // Set default cell attributes - m_defaultCellAttr->SetDefAttr(m_defaultCellAttr); - m_defaultCellAttr->SetKind(wxGridCellAttr::Default); - m_defaultCellAttr->SetFont(GetFont()); - m_defaultCellAttr->SetAlignment(wxALIGN_LEFT, wxALIGN_TOP); - m_defaultCellAttr->SetRenderer(new wxGridCellStringRenderer); - m_defaultCellAttr->SetEditor(new wxGridCellTextEditor); - -#if _USE_VISATTR - wxVisualAttributes gva = wxListBox::GetClassDefaultAttributes(); - wxVisualAttributes lva = wxPanel::GetClassDefaultAttributes(); - - m_defaultCellAttr->SetTextColour(gva.colFg); - m_defaultCellAttr->SetBackgroundColour(gva.colBg); - -#else - m_defaultCellAttr->SetTextColour( - wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT)); - m_defaultCellAttr->SetBackgroundColour( - wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)); -#endif - - m_numRows = 0; - m_numCols = 0; - m_currentCellCoords = wxGridNoCellCoords; - - // subwindow components that make up the wxGrid - m_rowLabelWin = new wxGridRowLabelWindow(this); - CreateColumnWindow(); - m_cornerLabelWin = new wxGridCornerLabelWindow(this); - m_gridWin = new wxGridWindow( this ); - - SetTargetWindow( m_gridWin ); - -#if _USE_VISATTR - wxColour gfg = gva.colFg; - wxColour gbg = gva.colBg; - wxColour lfg = lva.colFg; - wxColour lbg = lva.colBg; -#else - wxColour gfg = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT ); - wxColour gbg = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ); - wxColour lfg = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT ); - wxColour lbg = wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ); -#endif - - m_cornerLabelWin->SetOwnForegroundColour(lfg); - m_cornerLabelWin->SetOwnBackgroundColour(lbg); - m_rowLabelWin->SetOwnForegroundColour(lfg); - m_rowLabelWin->SetOwnBackgroundColour(lbg); - m_colWindow->SetOwnForegroundColour(lfg); - m_colWindow->SetOwnBackgroundColour(lbg); - - m_gridWin->SetOwnForegroundColour(gfg); - m_gridWin->SetOwnBackgroundColour(gbg); - - m_labelBackgroundColour = m_rowLabelWin->GetBackgroundColour(); - m_labelTextColour = m_rowLabelWin->GetForegroundColour(); - - // now that we have the grid window, use its font to compute the default - // row height - m_defaultRowHeight = m_gridWin->GetCharHeight(); -#if defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXQT__) // see also text ctrl sizing in ShowCellEditControl() - m_defaultRowHeight += 8; -#else - m_defaultRowHeight += 4; -#endif - -} - -void wxGrid::CreateColumnWindow() -{ - if ( m_useNativeHeader ) - { - m_colWindow = new wxGridHeaderCtrl(this); - m_colLabelHeight = m_colWindow->GetBestSize().y; - } - else // draw labels ourselves - { - m_colWindow = new wxGridColLabelWindow(this); - m_colLabelHeight = WXGRID_DEFAULT_COL_LABEL_HEIGHT; - } -} - -bool wxGrid::CreateGrid( int numRows, int numCols, - wxGridSelectionModes selmode ) -{ - wxCHECK_MSG( !m_created, - false, - wxT("wxGrid::CreateGrid or wxGrid::SetTable called more than once") ); - - return SetTable(new wxGridStringTable(numRows, numCols), true, selmode); -} - -void wxGrid::SetSelectionMode(wxGridSelectionModes selmode) -{ - wxCHECK_RET( m_created, - wxT("Called wxGrid::SetSelectionMode() before calling CreateGrid()") ); - - m_selection->SetSelectionMode( selmode ); -} - -wxGrid::wxGridSelectionModes wxGrid::GetSelectionMode() const -{ - wxCHECK_MSG( m_created, wxGridSelectCells, - wxT("Called wxGrid::GetSelectionMode() before calling CreateGrid()") ); - - return m_selection->GetSelectionMode(); -} - -bool -wxGrid::SetTable(wxGridTableBase *table, - bool takeOwnership, - wxGrid::wxGridSelectionModes selmode ) -{ - bool checkSelection = false; - if ( m_created ) - { - // stop all processing - m_created = false; - - if (m_table) - { - m_table->SetView(0); - if( m_ownTable ) - delete m_table; - m_table = NULL; - } - - wxDELETE(m_selection); - - m_ownTable = false; - m_numRows = 0; - m_numCols = 0; - checkSelection = true; - - // kill row and column size arrays - m_colWidths.Empty(); - m_colRights.Empty(); - m_rowHeights.Empty(); - m_rowBottoms.Empty(); - } - - if (table) - { - m_numRows = table->GetNumberRows(); - m_numCols = table->GetNumberCols(); - - m_table = table; - m_table->SetView( this ); - m_ownTable = takeOwnership; - - // Notice that this must be called after setting m_table as it uses it - // indirectly, via wxGrid::GetColLabelValue(). - if ( m_useNativeHeader ) - GetGridColHeader()->SetColumnCount(m_numCols); - - m_selection = new wxGridSelection( this, selmode ); - if (checkSelection) - { - // If the newly set table is smaller than the - // original one current cell and selection regions - // might be invalid, - m_selectedBlockCorner = wxGridNoCellCoords; - m_currentCellCoords = - wxGridCellCoords(wxMin(m_numRows, m_currentCellCoords.GetRow()), - wxMin(m_numCols, m_currentCellCoords.GetCol())); - if (m_selectedBlockTopLeft.GetRow() >= m_numRows || - m_selectedBlockTopLeft.GetCol() >= m_numCols) - { - m_selectedBlockTopLeft = wxGridNoCellCoords; - m_selectedBlockBottomRight = wxGridNoCellCoords; - } - else - m_selectedBlockBottomRight = - wxGridCellCoords(wxMin(m_numRows, - m_selectedBlockBottomRight.GetRow()), - wxMin(m_numCols, - m_selectedBlockBottomRight.GetCol())); - } - CalcDimensions(); - - m_created = true; - } - - InvalidateBestSize(); - - return m_created; -} - -void wxGrid::Init() -{ - m_created = false; - - m_cornerLabelWin = NULL; - m_rowLabelWin = NULL; - m_colWindow = NULL; - m_gridWin = NULL; - - m_table = NULL; - m_ownTable = false; - - m_selection = NULL; - m_defaultCellAttr = NULL; - m_typeRegistry = NULL; - m_winCapture = NULL; - - m_rowLabelWidth = WXGRID_DEFAULT_ROW_LABEL_WIDTH; - m_colLabelHeight = WXGRID_DEFAULT_COL_LABEL_HEIGHT; - - m_setFixedRows = - m_setFixedCols = NULL; - - // init attr cache - m_attrCache.row = -1; - m_attrCache.col = -1; - m_attrCache.attr = NULL; - - m_labelFont = GetFont(); - m_labelFont.SetWeight( wxFONTWEIGHT_BOLD ); - - m_rowLabelHorizAlign = wxALIGN_CENTRE; - m_rowLabelVertAlign = wxALIGN_CENTRE; - - m_colLabelHorizAlign = wxALIGN_CENTRE; - m_colLabelVertAlign = wxALIGN_CENTRE; - m_colLabelTextOrientation = wxHORIZONTAL; - - m_defaultColWidth = WXGRID_DEFAULT_COL_WIDTH; - m_defaultRowHeight = 0; // this will be initialized after creation - - m_minAcceptableColWidth = WXGRID_MIN_COL_WIDTH; - m_minAcceptableRowHeight = WXGRID_MIN_ROW_HEIGHT; - - m_gridLineColour = wxColour( 192,192,192 ); - m_gridLinesEnabled = true; - m_gridLinesClipHorz = - m_gridLinesClipVert = true; - m_cellHighlightColour = *wxBLACK; - m_cellHighlightPenWidth = 2; - m_cellHighlightROPenWidth = 1; - - m_canDragColMove = false; - - m_cursorMode = WXGRID_CURSOR_SELECT_CELL; - m_winCapture = NULL; - m_canDragRowSize = true; - m_canDragColSize = true; - m_canDragGridSize = true; - m_canDragCell = false; - m_dragLastPos = -1; - m_dragRowOrCol = -1; - m_isDragging = false; - m_startDragPos = wxDefaultPosition; - - m_sortCol = wxNOT_FOUND; - m_sortIsAscending = true; - - m_useNativeHeader = - m_nativeColumnLabels = false; - - m_waitForSlowClick = false; - - m_rowResizeCursor = wxCursor( wxCURSOR_SIZENS ); - m_colResizeCursor = wxCursor( wxCURSOR_SIZEWE ); - - m_currentCellCoords = wxGridNoCellCoords; - - m_selectedBlockTopLeft = - m_selectedBlockBottomRight = - m_selectedBlockCorner = wxGridNoCellCoords; - - m_selectionBackground = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT); - m_selectionForeground = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT); - - m_editable = true; // default for whole grid - - m_inOnKeyDown = false; - m_batchCount = 0; - - m_extraWidth = - m_extraHeight = 0; - - // we can't call SetScrollRate() as the window isn't created yet but OTOH - // we don't need to call it neither as the scroll position is (0, 0) right - // now anyhow, so just set the parameters directly - m_xScrollPixelsPerLine = GRID_SCROLL_LINE_X; - m_yScrollPixelsPerLine = GRID_SCROLL_LINE_Y; - - m_tabBehaviour = Tab_Stop; -} - -// ---------------------------------------------------------------------------- -// the idea is to call these functions only when necessary because they create -// quite big arrays which eat memory mostly unnecessary - in particular, if -// default widths/heights are used for all rows/columns, we may not use these -// arrays at all -// -// with some extra code, it should be possible to only store the widths/heights -// different from default ones (resulting in space savings for huge grids) but -// this is not done currently -// ---------------------------------------------------------------------------- - -void wxGrid::InitRowHeights() -{ - m_rowHeights.Empty(); - m_rowBottoms.Empty(); - - m_rowHeights.Alloc( m_numRows ); - m_rowBottoms.Alloc( m_numRows ); - - m_rowHeights.Add( m_defaultRowHeight, m_numRows ); - - int rowBottom = 0; - for ( int i = 0; i < m_numRows; i++ ) - { - rowBottom += m_defaultRowHeight; - m_rowBottoms.Add( rowBottom ); - } -} - -void wxGrid::InitColWidths() -{ - m_colWidths.Empty(); - m_colRights.Empty(); - - m_colWidths.Alloc( m_numCols ); - m_colRights.Alloc( m_numCols ); - - m_colWidths.Add( m_defaultColWidth, m_numCols ); - - for ( int i = 0; i < m_numCols; i++ ) - { - int colRight = ( GetColPos( i ) + 1 ) * m_defaultColWidth; - m_colRights.Add( colRight ); - } -} - -int wxGrid::GetColWidth(int col) const -{ - if ( m_colWidths.IsEmpty() ) - return m_defaultColWidth; - - // a negative width indicates a hidden column - return m_colWidths[col] > 0 ? m_colWidths[col] : 0; -} - -int wxGrid::GetColLeft(int col) const -{ - if ( m_colRights.IsEmpty() ) - return GetColPos( col ) * m_defaultColWidth; - - return m_colRights[col] - GetColWidth(col); -} - -int wxGrid::GetColRight(int col) const -{ - return m_colRights.IsEmpty() ? (GetColPos( col ) + 1) * m_defaultColWidth - : m_colRights[col]; -} - -int wxGrid::GetRowHeight(int row) const -{ - // no custom heights / hidden rows - if ( m_rowHeights.IsEmpty() ) - return m_defaultRowHeight; - - // a negative height indicates a hidden row - return m_rowHeights[row] > 0 ? m_rowHeights[row] : 0; -} - -int wxGrid::GetRowTop(int row) const -{ - if ( m_rowBottoms.IsEmpty() ) - return row * m_defaultRowHeight; - - return m_rowBottoms[row] - GetRowHeight(row); -} - -int wxGrid::GetRowBottom(int row) const -{ - return m_rowBottoms.IsEmpty() ? (row + 1) * m_defaultRowHeight - : m_rowBottoms[row]; -} - -void wxGrid::CalcDimensions() -{ - // compute the size of the scrollable area - int w = m_numCols > 0 ? GetColRight(GetColAt(m_numCols - 1)) : 0; - int h = m_numRows > 0 ? GetRowBottom(m_numRows - 1) : 0; - - w += m_extraWidth; - h += m_extraHeight; - - // take into account editor if shown - if ( IsCellEditControlShown() ) - { - int w2, h2; - int r = m_currentCellCoords.GetRow(); - int c = m_currentCellCoords.GetCol(); - int x = GetColLeft(c); - int y = GetRowTop(r); - - // how big is the editor - wxGridCellAttr* attr = GetCellAttr(r, c); - wxGridCellEditor* editor = attr->GetEditor(this, r, c); - editor->GetControl()->GetSize(&w2, &h2); - w2 += x; - h2 += y; - if ( w2 > w ) - w = w2; - if ( h2 > h ) - h = h2; - editor->DecRef(); - attr->DecRef(); - } - - // preserve (more or less) the previous position - int x, y; - GetViewStart( &x, &y ); - - // ensure the position is valid for the new scroll ranges - if ( x >= w ) - x = wxMax( w - 1, 0 ); - if ( y >= h ) - y = wxMax( h - 1, 0 ); - - // update the virtual size and refresh the scrollbars to reflect it - m_gridWin->SetVirtualSize(w, h); - Scroll(x, y); - AdjustScrollbars(); - - // if our OnSize() hadn't been called (it would if we have scrollbars), we - // still must reposition the children - CalcWindowSizes(); -} - -wxSize wxGrid::GetSizeAvailableForScrollTarget(const wxSize& size) -{ - wxSize sizeGridWin(size); - sizeGridWin.x -= m_rowLabelWidth; - sizeGridWin.y -= m_colLabelHeight; - - return sizeGridWin; -} - -void wxGrid::CalcWindowSizes() -{ - // escape if the window is has not been fully created yet - - if ( m_cornerLabelWin == NULL ) - return; - - int cw, ch; - GetClientSize( &cw, &ch ); - - // the grid may be too small to have enough space for the labels yet, don't - // size the windows to negative sizes in this case - int gw = cw - m_rowLabelWidth; - int gh = ch - m_colLabelHeight; - if (gw < 0) - gw = 0; - if (gh < 0) - gh = 0; - - if ( m_cornerLabelWin && m_cornerLabelWin->IsShown() ) - m_cornerLabelWin->SetSize( 0, 0, m_rowLabelWidth, m_colLabelHeight ); - - if ( m_colWindow && m_colWindow->IsShown() ) - m_colWindow->SetSize( m_rowLabelWidth, 0, gw, m_colLabelHeight ); - - if ( m_rowLabelWin && m_rowLabelWin->IsShown() ) - m_rowLabelWin->SetSize( 0, m_colLabelHeight, m_rowLabelWidth, gh ); - - if ( m_gridWin && m_gridWin->IsShown() ) - m_gridWin->SetSize( m_rowLabelWidth, m_colLabelHeight, gw, gh ); -} - -// this is called when the grid table sends a message -// to indicate that it has been redimensioned -// -bool wxGrid::Redimension( wxGridTableMessage& msg ) -{ - int i; - bool result = false; - - // Clear the attribute cache as the attribute might refer to a different - // cell than stored in the cache after adding/removing rows/columns. - ClearAttrCache(); - - // By the same reasoning, the editor should be dismissed if columns are - // added or removed. And for consistency, it should IMHO always be - // removed, not only if the cell "underneath" it actually changes. - // For now, I intentionally do not save the editor's content as the - // cell it might want to save that stuff to might no longer exist. - HideCellEditControl(); - - switch ( msg.GetId() ) - { - case wxGRIDTABLE_NOTIFY_ROWS_INSERTED: - { - size_t pos = msg.GetCommandInt(); - int numRows = msg.GetCommandInt2(); - - m_numRows += numRows; - - if ( !m_rowHeights.IsEmpty() ) - { - m_rowHeights.Insert( m_defaultRowHeight, pos, numRows ); - m_rowBottoms.Insert( 0, pos, numRows ); - - int bottom = 0; - if ( pos > 0 ) - bottom = m_rowBottoms[pos - 1]; - - for ( i = pos; i < m_numRows; i++ ) - { - bottom += GetRowHeight(i); - m_rowBottoms[i] = bottom; - } - } - - if ( m_currentCellCoords == wxGridNoCellCoords ) - { - // if we have just inserted cols into an empty grid the current - // cell will be undefined... - // - SetCurrentCell( 0, 0 ); - } - - if ( m_selection ) - m_selection->UpdateRows( pos, numRows ); - wxGridCellAttrProvider * attrProvider = m_table->GetAttrProvider(); - if (attrProvider) - attrProvider->UpdateAttrRows( pos, numRows ); - - if ( !GetBatchCount() ) - { - CalcDimensions(); - m_rowLabelWin->Refresh(); - } - } - result = true; - break; - - case wxGRIDTABLE_NOTIFY_ROWS_APPENDED: - { - int numRows = msg.GetCommandInt(); - int oldNumRows = m_numRows; - m_numRows += numRows; - - if ( !m_rowHeights.IsEmpty() ) - { - m_rowHeights.Add( m_defaultRowHeight, numRows ); - m_rowBottoms.Add( 0, numRows ); - - int bottom = 0; - if ( oldNumRows > 0 ) - bottom = m_rowBottoms[oldNumRows - 1]; - - for ( i = oldNumRows; i < m_numRows; i++ ) - { - bottom += GetRowHeight(i); - m_rowBottoms[i] = bottom; - } - } - - if ( m_currentCellCoords == wxGridNoCellCoords ) - { - // if we have just inserted cols into an empty grid the current - // cell will be undefined... - // - SetCurrentCell( 0, 0 ); - } - - if ( !GetBatchCount() ) - { - CalcDimensions(); - m_rowLabelWin->Refresh(); - } - } - result = true; - break; - - case wxGRIDTABLE_NOTIFY_ROWS_DELETED: - { - size_t pos = msg.GetCommandInt(); - int numRows = msg.GetCommandInt2(); - m_numRows -= numRows; - - if ( !m_rowHeights.IsEmpty() ) - { - m_rowHeights.RemoveAt( pos, numRows ); - m_rowBottoms.RemoveAt( pos, numRows ); - - int h = 0; - for ( i = 0; i < m_numRows; i++ ) - { - h += GetRowHeight(i); - m_rowBottoms[i] = h; - } - } - - if ( !m_numRows ) - { - m_currentCellCoords = wxGridNoCellCoords; - } - else - { - if ( m_currentCellCoords.GetRow() >= m_numRows ) - m_currentCellCoords.Set( 0, 0 ); - } - - if ( m_selection ) - m_selection->UpdateRows( pos, -((int)numRows) ); - wxGridCellAttrProvider * attrProvider = m_table->GetAttrProvider(); - if (attrProvider) - { - attrProvider->UpdateAttrRows( pos, -((int)numRows) ); - -// ifdef'd out following patch from Paul Gammans -#if 0 - // No need to touch column attributes, unless we - // removed _all_ rows, in this case, we remove - // all column attributes. - // I hate to do this here, but the - // needed data is not available inside UpdateAttrRows. - if ( !GetNumberRows() ) - attrProvider->UpdateAttrCols( 0, -GetNumberCols() ); -#endif - } - - if ( !GetBatchCount() ) - { - CalcDimensions(); - m_rowLabelWin->Refresh(); - } - } - result = true; - break; - - case wxGRIDTABLE_NOTIFY_COLS_INSERTED: - { - size_t pos = msg.GetCommandInt(); - int numCols = msg.GetCommandInt2(); - m_numCols += numCols; - - if ( m_useNativeHeader ) - GetGridColHeader()->SetColumnCount(m_numCols); - - if ( !m_colAt.IsEmpty() ) - { - //Shift the column IDs - for ( i = 0; i < m_numCols - numCols; i++ ) - { - if ( m_colAt[i] >= (int)pos ) - m_colAt[i] += numCols; - } - - m_colAt.Insert( pos, pos, numCols ); - - //Set the new columns' positions - for ( i = pos + 1; i < (int)pos + numCols; i++ ) - { - m_colAt[i] = i; - } - } - - if ( !m_colWidths.IsEmpty() ) - { - m_colWidths.Insert( m_defaultColWidth, pos, numCols ); - m_colRights.Insert( 0, pos, numCols ); - - int right = 0; - if ( pos > 0 ) - right = m_colRights[GetColAt( pos - 1 )]; - - int colPos; - for ( colPos = pos; colPos < m_numCols; colPos++ ) - { - i = GetColAt( colPos ); - - right += GetColWidth(i); - m_colRights[i] = right; - } - } - - if ( m_currentCellCoords == wxGridNoCellCoords ) - { - // if we have just inserted cols into an empty grid the current - // cell will be undefined... - // - SetCurrentCell( 0, 0 ); - } - - if ( m_selection ) - m_selection->UpdateCols( pos, numCols ); - wxGridCellAttrProvider * attrProvider = m_table->GetAttrProvider(); - if (attrProvider) - attrProvider->UpdateAttrCols( pos, numCols ); - if ( !GetBatchCount() ) - { - CalcDimensions(); - m_colWindow->Refresh(); - } - } - result = true; - break; - - case wxGRIDTABLE_NOTIFY_COLS_APPENDED: - { - int numCols = msg.GetCommandInt(); - int oldNumCols = m_numCols; - m_numCols += numCols; - - if ( !m_colAt.IsEmpty() ) - { - m_colAt.Add( 0, numCols ); - - //Set the new columns' positions - for ( i = oldNumCols; i < m_numCols; i++ ) - { - m_colAt[i] = i; - } - } - - if ( !m_colWidths.IsEmpty() ) - { - m_colWidths.Add( m_defaultColWidth, numCols ); - m_colRights.Add( 0, numCols ); - - int right = 0; - if ( oldNumCols > 0 ) - right = m_colRights[GetColAt( oldNumCols - 1 )]; - - int colPos; - for ( colPos = oldNumCols; colPos < m_numCols; colPos++ ) - { - i = GetColAt( colPos ); - - right += GetColWidth(i); - m_colRights[i] = right; - } - } - - // Notice that this must be called after updating m_colWidths above - // as the native grid control will check whether the new columns - // are shown which results in accessing m_colWidths array. - if ( m_useNativeHeader ) - GetGridColHeader()->SetColumnCount(m_numCols); - - if ( m_currentCellCoords == wxGridNoCellCoords ) - { - // if we have just inserted cols into an empty grid the current - // cell will be undefined... - // - SetCurrentCell( 0, 0 ); - } - if ( !GetBatchCount() ) - { - CalcDimensions(); - m_colWindow->Refresh(); - } - } - result = true; - break; - - case wxGRIDTABLE_NOTIFY_COLS_DELETED: - { - size_t pos = msg.GetCommandInt(); - int numCols = msg.GetCommandInt2(); - m_numCols -= numCols; - if ( m_useNativeHeader ) - GetGridColHeader()->SetColumnCount(m_numCols); - - if ( !m_colAt.IsEmpty() ) - { - int colID = GetColAt( pos ); - - m_colAt.RemoveAt( pos, numCols ); - - //Shift the column IDs - int colPos; - for ( colPos = 0; colPos < m_numCols; colPos++ ) - { - if ( m_colAt[colPos] > colID ) - m_colAt[colPos] -= numCols; - } - } - - if ( !m_colWidths.IsEmpty() ) - { - m_colWidths.RemoveAt( pos, numCols ); - m_colRights.RemoveAt( pos, numCols ); - - int w = 0; - int colPos; - for ( colPos = 0; colPos < m_numCols; colPos++ ) - { - i = GetColAt( colPos ); - - w += GetColWidth(i); - m_colRights[i] = w; - } - } - - if ( !m_numCols ) - { - m_currentCellCoords = wxGridNoCellCoords; - } - else - { - if ( m_currentCellCoords.GetCol() >= m_numCols ) - m_currentCellCoords.Set( 0, 0 ); - } - - if ( m_selection ) - m_selection->UpdateCols( pos, -((int)numCols) ); - wxGridCellAttrProvider * attrProvider = m_table->GetAttrProvider(); - if (attrProvider) - { - attrProvider->UpdateAttrCols( pos, -((int)numCols) ); - -// ifdef'd out following patch from Paul Gammans -#if 0 - // No need to touch row attributes, unless we - // removed _all_ columns, in this case, we remove - // all row attributes. - // I hate to do this here, but the - // needed data is not available inside UpdateAttrCols. - if ( !GetNumberCols() ) - attrProvider->UpdateAttrRows( 0, -GetNumberRows() ); -#endif - } - - if ( !GetBatchCount() ) - { - CalcDimensions(); - m_colWindow->Refresh(); - } - } - result = true; - break; - } - - InvalidateBestSize(); - - if (result && !GetBatchCount() ) - m_gridWin->Refresh(); - - return result; -} - -wxArrayInt wxGrid::CalcRowLabelsExposed( const wxRegion& reg ) const -{ - wxRegionIterator iter( reg ); - wxRect r; - - wxArrayInt rowlabels; - - int top, bottom; - while ( iter ) - { - r = iter.GetRect(); - - // TODO: remove this when we can... - // There is a bug in wxMotif that gives garbage update - // rectangles if you jump-scroll a long way by clicking the - // scrollbar with middle button. This is a work-around - // -#if defined(__WXMOTIF__) - int cw, ch; - m_gridWin->GetClientSize( &cw, &ch ); - if ( r.GetTop() > ch ) - r.SetTop( 0 ); - r.SetBottom( wxMin( r.GetBottom(), ch ) ); -#endif - - // logical bounds of update region - // - int dummy; - CalcUnscrolledPosition( 0, r.GetTop(), &dummy, &top ); - CalcUnscrolledPosition( 0, r.GetBottom(), &dummy, &bottom ); - - // find the row labels within these bounds - // - int row; - for ( row = internalYToRow(top); row < m_numRows; row++ ) - { - if ( GetRowBottom(row) < top ) - continue; - - if ( GetRowTop(row) > bottom ) - break; - - rowlabels.Add( row ); - } - - ++iter; - } - - return rowlabels; -} - -wxArrayInt wxGrid::CalcColLabelsExposed( const wxRegion& reg ) const -{ - wxRegionIterator iter( reg ); - wxRect r; - - wxArrayInt colLabels; - - int left, right; - while ( iter ) - { - r = iter.GetRect(); - - // TODO: remove this when we can... - // There is a bug in wxMotif that gives garbage update - // rectangles if you jump-scroll a long way by clicking the - // scrollbar with middle button. This is a work-around - // -#if defined(__WXMOTIF__) - int cw, ch; - m_gridWin->GetClientSize( &cw, &ch ); - if ( r.GetLeft() > cw ) - r.SetLeft( 0 ); - r.SetRight( wxMin( r.GetRight(), cw ) ); -#endif - - // logical bounds of update region - // - int dummy; - CalcUnscrolledPosition( r.GetLeft(), 0, &left, &dummy ); - CalcUnscrolledPosition( r.GetRight(), 0, &right, &dummy ); - - // find the cells within these bounds - // - int col; - int colPos; - for ( colPos = GetColPos( internalXToCol(left) ); colPos < m_numCols; colPos++ ) - { - col = GetColAt( colPos ); - - if ( GetColRight(col) < left ) - continue; - - if ( GetColLeft(col) > right ) - break; - - colLabels.Add( col ); - } - - ++iter; - } - - return colLabels; -} - -wxGridCellCoordsArray wxGrid::CalcCellsExposed( const wxRegion& reg ) const -{ - wxRect r; - - wxGridCellCoordsArray cellsExposed; - - int left, top, right, bottom; - for ( wxRegionIterator iter(reg); iter; ++iter ) - { - r = iter.GetRect(); - - // Skip 0-height cells, they're invisible anyhow, don't waste time - // getting their rectangles and so on. - if ( !r.GetHeight() ) - continue; - - // TODO: remove this when we can... - // There is a bug in wxMotif that gives garbage update - // rectangles if you jump-scroll a long way by clicking the - // scrollbar with middle button. This is a work-around - // -#if defined(__WXMOTIF__) - int cw, ch; - m_gridWin->GetClientSize( &cw, &ch ); - if ( r.GetTop() > ch ) r.SetTop( 0 ); - if ( r.GetLeft() > cw ) r.SetLeft( 0 ); - r.SetRight( wxMin( r.GetRight(), cw ) ); - r.SetBottom( wxMin( r.GetBottom(), ch ) ); -#endif - - // logical bounds of update region - // - CalcUnscrolledPosition( r.GetLeft(), r.GetTop(), &left, &top ); - CalcUnscrolledPosition( r.GetRight(), r.GetBottom(), &right, &bottom ); - - // find the cells within these bounds - wxArrayInt cols; - for ( int row = internalYToRow(top); row < m_numRows; row++ ) - { - if ( GetRowBottom(row) <= top ) - continue; - - if ( GetRowTop(row) > bottom ) - break; - - // add all dirty cells in this row: notice that the columns which - // are dirty don't depend on the row so we compute them only once - // for the first dirty row and then reuse for all the next ones - if ( cols.empty() ) - { - // do determine the dirty columns - for ( int pos = XToPos(left); pos <= XToPos(right); pos++ ) - cols.push_back(GetColAt(pos)); - - // if there are no dirty columns at all, nothing to do - if ( cols.empty() ) - break; - } - - const size_t count = cols.size(); - for ( size_t n = 0; n < count; n++ ) - cellsExposed.Add(wxGridCellCoords(row, cols[n])); - } - } - - return cellsExposed; -} - - -void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) -{ - int x, y, row; - wxPoint pos( event.GetPosition() ); - CalcUnscrolledPosition( pos.x, pos.y, &x, &y ); - - if ( event.Dragging() ) - { - if (!m_isDragging) - m_isDragging = true; - - if ( event.LeftIsDown() ) - { - switch ( m_cursorMode ) - { - case WXGRID_CURSOR_RESIZE_ROW: - { - int cw, ch, left, dummy; - m_gridWin->GetClientSize( &cw, &ch ); - CalcUnscrolledPosition( 0, 0, &left, &dummy ); - - wxClientDC dc( m_gridWin ); - PrepareDC( dc ); - y = wxMax( y, - GetRowTop(m_dragRowOrCol) + - GetRowMinimalHeight(m_dragRowOrCol) ); - dc.SetLogicalFunction(wxINVERT); - if ( m_dragLastPos >= 0 ) - { - dc.DrawLine( left, m_dragLastPos, left+cw, m_dragLastPos ); - } - dc.DrawLine( left, y, left+cw, y ); - m_dragLastPos = y; - } - break; - - case WXGRID_CURSOR_SELECT_ROW: - { - if ( (row = YToRow( y )) >= 0 ) - { - if ( m_selection ) - m_selection->SelectRow(row, event); - } - } - break; - - // default label to suppress warnings about "enumeration value - // 'xxx' not handled in switch - default: - break; - } - } - return; - } - - if ( m_isDragging && (event.Entering() || event.Leaving()) ) - return; - - if (m_isDragging) - m_isDragging = false; - - // ------------ Entering or leaving the window - // - if ( event.Entering() || event.Leaving() ) - { - ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_rowLabelWin); - } - - // ------------ Left button pressed - // - else if ( event.LeftDown() ) - { - row = YToEdgeOfRow(y); - if ( row != wxNOT_FOUND && CanDragRowSize(row) ) - { - ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW, m_rowLabelWin); - } - else // not a request to start resizing - { - row = YToRow(y); - if ( row >= 0 && - !SendEvent( wxEVT_GRID_LABEL_LEFT_CLICK, row, -1, event ) ) - { - if ( !event.ShiftDown() && !event.CmdDown() ) - ClearSelection(); - if ( m_selection ) - { - if ( event.ShiftDown() ) - { - m_selection->SelectBlock - ( - m_currentCellCoords.GetRow(), 0, - row, GetNumberCols() - 1, - event - ); - } - else - { - m_selection->SelectRow(row, event); - } - } - - ChangeCursorMode(WXGRID_CURSOR_SELECT_ROW, m_rowLabelWin); - } - } - } - - // ------------ Left double click - // - else if (event.LeftDClick() ) - { - row = YToEdgeOfRow(y); - if ( row != wxNOT_FOUND && CanDragRowSize(row) ) - { - // adjust row height depending on label text - // - // TODO: generate RESIZING event, see #10754 - AutoSizeRowLabelSize( row ); - - SendGridSizeEvent(wxEVT_GRID_ROW_SIZE, row, -1, event); - - ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, GetColLabelWindow()); - m_dragLastPos = -1; - } - else // not on row separator or it's not resizable - { - row = YToRow(y); - if ( row >=0 && - !SendEvent( wxEVT_GRID_LABEL_LEFT_DCLICK, row, -1, event ) ) - { - // no default action at the moment - } - } - } - - // ------------ Left button released - // - else if ( event.LeftUp() ) - { - if ( m_cursorMode == WXGRID_CURSOR_RESIZE_ROW ) - DoEndDragResizeRow(event); - - ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_rowLabelWin); - m_dragLastPos = -1; - } - - // ------------ Right button down - // - else if ( event.RightDown() ) - { - row = YToRow(y); - if ( row >=0 && - !SendEvent( wxEVT_GRID_LABEL_RIGHT_CLICK, row, -1, event ) ) - { - // no default action at the moment - } - } - - // ------------ Right double click - // - else if ( event.RightDClick() ) - { - row = YToRow(y); - if ( row >= 0 && - !SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, row, -1, event ) ) - { - // no default action at the moment - } - } - - // ------------ No buttons down and mouse moving - // - else if ( event.Moving() ) - { - m_dragRowOrCol = YToEdgeOfRow( y ); - if ( m_dragRowOrCol != wxNOT_FOUND ) - { - if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL ) - { - if ( CanDragRowSize(m_dragRowOrCol) ) - ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW, m_rowLabelWin, false); - } - } - else if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL ) - { - ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_rowLabelWin, false); - } - } -} - -void wxGrid::UpdateColumnSortingIndicator(int col) -{ - wxCHECK_RET( col != wxNOT_FOUND, "invalid column index" ); - - if ( m_useNativeHeader ) - GetGridColHeader()->UpdateColumn(col); - else if ( m_nativeColumnLabels ) - m_colWindow->Refresh(); - //else: sorting indicator display not yet implemented in grid version -} - -void wxGrid::SetSortingColumn(int col, bool ascending) -{ - if ( col == m_sortCol ) - { - // we are already using this column for sorting (or not sorting at all) - // but we might still change the sorting order, check for it - if ( m_sortCol != wxNOT_FOUND && ascending != m_sortIsAscending ) - { - m_sortIsAscending = ascending; - - UpdateColumnSortingIndicator(m_sortCol); - } - } - else // we're changing the column used for sorting - { - const int sortColOld = m_sortCol; - - // change it before updating the column as we want GetSortingColumn() - // to return the correct new value - m_sortCol = col; - - if ( sortColOld != wxNOT_FOUND ) - UpdateColumnSortingIndicator(sortColOld); - - if ( m_sortCol != wxNOT_FOUND ) - { - m_sortIsAscending = ascending; - UpdateColumnSortingIndicator(m_sortCol); - } - } -} - -void wxGrid::DoColHeaderClick(int col) -{ - // we consider that the grid was resorted if this event is processed and - // not vetoed - if ( SendEvent(wxEVT_GRID_COL_SORT, -1, col) == 1 ) - { - SetSortingColumn(col, IsSortingBy(col) ? !m_sortIsAscending : true); - Refresh(); - } -} - -void wxGrid::DoStartResizeCol(int col) -{ - m_dragRowOrCol = col; - m_dragLastPos = -1; - DoUpdateResizeColWidth(GetColWidth(m_dragRowOrCol)); -} - -void wxGrid::DoUpdateResizeCol(int x) -{ - int cw, ch, dummy, top; - m_gridWin->GetClientSize( &cw, &ch ); - CalcUnscrolledPosition( 0, 0, &dummy, &top ); - - wxClientDC dc( m_gridWin ); - PrepareDC( dc ); - - x = wxMax( x, GetColLeft(m_dragRowOrCol) + GetColMinimalWidth(m_dragRowOrCol)); - dc.SetLogicalFunction(wxINVERT); - if ( m_dragLastPos >= 0 ) - { - dc.DrawLine( m_dragLastPos, top, m_dragLastPos, top + ch ); - } - dc.DrawLine( x, top, x, top + ch ); - m_dragLastPos = x; -} - -void wxGrid::DoUpdateResizeColWidth(int w) -{ - DoUpdateResizeCol(GetColLeft(m_dragRowOrCol) + w); -} - -void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) -{ - int x; - CalcUnscrolledPosition( event.GetPosition().x, 0, &x, NULL ); - - int col = XToCol(x); - if ( event.Dragging() ) - { - if (!m_isDragging) - { - m_isDragging = true; - - if ( m_cursorMode == WXGRID_CURSOR_MOVE_COL && col != -1 ) - DoStartMoveCol(col); - } - - if ( event.LeftIsDown() ) - { - switch ( m_cursorMode ) - { - case WXGRID_CURSOR_RESIZE_COL: - DoUpdateResizeCol(x); - break; - - case WXGRID_CURSOR_SELECT_COL: - { - if ( col != -1 ) - { - if ( m_selection ) - m_selection->SelectCol(col, event); - } - } - break; - - case WXGRID_CURSOR_MOVE_COL: - { - int posNew = XToPos(x); - int colNew = GetColAt(posNew); - - // determine the position of the drop marker - int markerX; - if ( x >= GetColLeft(colNew) + (GetColWidth(colNew) / 2) ) - markerX = GetColRight(colNew); - else - markerX = GetColLeft(colNew); - - if ( markerX != m_dragLastPos ) - { - wxClientDC dc( GetColLabelWindow() ); - DoPrepareDC(dc); - - int cw, ch; - GetColLabelWindow()->GetClientSize( &cw, &ch ); - - markerX++; - - //Clean up the last indicator - if ( m_dragLastPos >= 0 ) - { - wxPen pen( GetColLabelWindow()->GetBackgroundColour(), 2 ); - dc.SetPen(pen); - dc.DrawLine( m_dragLastPos + 1, 0, m_dragLastPos + 1, ch ); - dc.SetPen(wxNullPen); - - if ( XToCol( m_dragLastPos ) != -1 ) - DrawColLabel( dc, XToCol( m_dragLastPos ) ); - } - - const wxColour *color; - //Moving to the same place? Don't draw a marker - if ( colNew == m_dragRowOrCol ) - color = wxLIGHT_GREY; - else - color = wxBLUE; - - //Draw the marker - wxPen pen( *color, 2 ); - dc.SetPen(pen); - - dc.DrawLine( markerX, 0, markerX, ch ); - - dc.SetPen(wxNullPen); - - m_dragLastPos = markerX - 1; - } - } - break; - - // default label to suppress warnings about "enumeration value - // 'xxx' not handled in switch - default: - break; - } - } - return; - } - - if ( m_isDragging && (event.Entering() || event.Leaving()) ) - return; - - if (m_isDragging) - m_isDragging = false; - - // ------------ Entering or leaving the window - // - if ( event.Entering() || event.Leaving() ) - { - ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, GetColLabelWindow()); - } - - // ------------ Left button pressed - // - else if ( event.LeftDown() ) - { - int colEdge = XToEdgeOfCol(x); - if ( colEdge != wxNOT_FOUND && CanDragColSize(colEdge) ) - { - ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL, GetColLabelWindow()); - } - else // not a request to start resizing - { - if ( col >= 0 && - !SendEvent( wxEVT_GRID_LABEL_LEFT_CLICK, -1, col, event ) ) - { - if ( m_canDragColMove ) - { - //Show button as pressed - wxClientDC dc( GetColLabelWindow() ); - int colLeft = GetColLeft( col ); - int colRight = GetColRight( col ) - 1; - dc.SetPen( wxPen( GetColLabelWindow()->GetBackgroundColour(), 1 ) ); - dc.DrawLine( colLeft, 1, colLeft, m_colLabelHeight-1 ); - dc.DrawLine( colLeft, 1, colRight, 1 ); - - ChangeCursorMode(WXGRID_CURSOR_MOVE_COL, GetColLabelWindow()); - } - else - { - if ( !event.ShiftDown() && !event.CmdDown() ) - ClearSelection(); - if ( m_selection ) - { - if ( event.ShiftDown() ) - { - m_selection->SelectBlock - ( - 0, m_currentCellCoords.GetCol(), - GetNumberRows() - 1, col, - event - ); - } - else - { - m_selection->SelectCol(col, event); - } - } - - ChangeCursorMode(WXGRID_CURSOR_SELECT_COL, GetColLabelWindow()); - } - } - } - } - - // ------------ Left double click - // - if ( event.LeftDClick() ) - { - const int colEdge = XToEdgeOfCol(x); - if ( colEdge == -1 ) - { - if ( col >= 0 && - ! SendEvent( wxEVT_GRID_LABEL_LEFT_DCLICK, -1, col, event ) ) - { - // no default action at the moment - } - } - else - { - // adjust column width depending on label text - // - // TODO: generate RESIZING event, see #10754 - if ( !SendGridSizeEvent(wxEVT_GRID_COL_AUTO_SIZE, -1, colEdge, event) ) - AutoSizeColLabelSize( colEdge ); - - SendGridSizeEvent(wxEVT_GRID_COL_SIZE, -1, colEdge, event); - - ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, GetColLabelWindow()); - m_dragLastPos = -1; - } - } - - // ------------ Left button released - // - else if ( event.LeftUp() ) - { - switch ( m_cursorMode ) - { - case WXGRID_CURSOR_RESIZE_COL: - DoEndDragResizeCol(event); - break; - - case WXGRID_CURSOR_MOVE_COL: - if ( m_dragLastPos == -1 || col == m_dragRowOrCol ) - { - // the column didn't actually move anywhere - if ( col != -1 ) - DoColHeaderClick(col); - m_colWindow->Refresh(); // "unpress" the column - } - else - { - // get the position of the column we're over - int pos = XToPos(x); - - // insert the column being dragged either before or after - // it, depending on where exactly it was dropped, so - // find the index of the column we're over: notice - // that the existing "col" variable may be invalid but - // we need a valid one here - const int colValid = GetColAt(pos); - - // and check if we're on the "near" (usually left but right - // in RTL case) part of the column - const int middle = GetColLeft(colValid) + - GetColWidth(colValid)/2; - const bool onNearPart = (x <= middle); - - // adjust for the column being dragged itself - if ( pos < GetColPos(m_dragRowOrCol) ) - pos++; - - // and if it's on the near part of the target column, - // insert it before it, not after - if ( onNearPart ) - pos--; - - DoEndMoveCol(pos); - } - break; - - case WXGRID_CURSOR_SELECT_COL: - case WXGRID_CURSOR_SELECT_CELL: - case WXGRID_CURSOR_RESIZE_ROW: - case WXGRID_CURSOR_SELECT_ROW: - if ( col != -1 ) - DoColHeaderClick(col); - break; - } - - ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, GetColLabelWindow()); - m_dragLastPos = -1; - } - - // ------------ Right button down - // - else if ( event.RightDown() ) - { - if ( col >= 0 && - !SendEvent( wxEVT_GRID_LABEL_RIGHT_CLICK, -1, col, event ) ) - { - // no default action at the moment - } - } - - // ------------ Right double click - // - else if ( event.RightDClick() ) - { - if ( col >= 0 && - !SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, -1, col, event ) ) - { - // no default action at the moment - } - } - - // ------------ No buttons down and mouse moving - // - else if ( event.Moving() ) - { - m_dragRowOrCol = XToEdgeOfCol( x ); - if ( m_dragRowOrCol >= 0 ) - { - if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL ) - { - if ( CanDragColSize(m_dragRowOrCol) ) - ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL, GetColLabelWindow(), false); - } - } - else if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL ) - { - ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, GetColLabelWindow(), false); - } - } -} - -void wxGrid::ProcessCornerLabelMouseEvent( wxMouseEvent& event ) -{ - if ( event.LeftDown() ) - { - // indicate corner label by having both row and - // col args == -1 - // - if ( !SendEvent( wxEVT_GRID_LABEL_LEFT_CLICK, -1, -1, event ) ) - { - SelectAll(); - } - } - else if ( event.LeftDClick() ) - { - SendEvent( wxEVT_GRID_LABEL_LEFT_DCLICK, -1, -1, event ); - } - else if ( event.RightDown() ) - { - if ( !SendEvent( wxEVT_GRID_LABEL_RIGHT_CLICK, -1, -1, event ) ) - { - // no default action at the moment - } - } - else if ( event.RightDClick() ) - { - if ( !SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, -1, -1, event ) ) - { - // no default action at the moment - } - } -} - -void wxGrid::CancelMouseCapture() -{ - // cancel operation currently in progress, whatever it is - if ( m_winCapture ) - { - m_isDragging = false; - m_startDragPos = wxDefaultPosition; - - m_cursorMode = WXGRID_CURSOR_SELECT_CELL; - m_winCapture->SetCursor( *wxSTANDARD_CURSOR ); - m_winCapture = NULL; - - // remove traces of whatever we drew on screen - Refresh(); - } -} - -void wxGrid::ChangeCursorMode(CursorMode mode, - wxWindow *win, - bool captureMouse) -{ -#if wxUSE_LOG_TRACE - static const wxChar *const cursorModes[] = - { - wxT("SELECT_CELL"), - wxT("RESIZE_ROW"), - wxT("RESIZE_COL"), - wxT("SELECT_ROW"), - wxT("SELECT_COL"), - wxT("MOVE_COL"), - }; - - wxLogTrace(wxT("grid"), - wxT("wxGrid cursor mode (mouse capture for %s): %s -> %s"), - win == m_colWindow ? wxT("colLabelWin") - : win ? wxT("rowLabelWin") - : wxT("gridWin"), - cursorModes[m_cursorMode], cursorModes[mode]); -#endif // wxUSE_LOG_TRACE - - if ( mode == m_cursorMode && - win == m_winCapture && - captureMouse == (m_winCapture != NULL)) - return; - - if ( !win ) - { - // by default use the grid itself - win = m_gridWin; - } - - if ( m_winCapture ) - { - m_winCapture->ReleaseMouse(); - m_winCapture = NULL; - } - - m_cursorMode = mode; - - switch ( m_cursorMode ) - { - case WXGRID_CURSOR_RESIZE_ROW: - win->SetCursor( m_rowResizeCursor ); - break; - - case WXGRID_CURSOR_RESIZE_COL: - win->SetCursor( m_colResizeCursor ); - break; - - case WXGRID_CURSOR_MOVE_COL: - win->SetCursor( wxCursor(wxCURSOR_HAND) ); - break; - - default: - win->SetCursor( *wxSTANDARD_CURSOR ); - break; - } - - // we need to capture mouse when resizing - bool resize = m_cursorMode == WXGRID_CURSOR_RESIZE_ROW || - m_cursorMode == WXGRID_CURSOR_RESIZE_COL; - - if ( captureMouse && resize ) - { - win->CaptureMouse(); - m_winCapture = win; - } -} - -// ---------------------------------------------------------------------------- -// grid mouse event processing -// ---------------------------------------------------------------------------- - -bool -wxGrid::DoGridCellDrag(wxMouseEvent& event, - const wxGridCellCoords& coords, - bool isFirstDrag) -{ - bool performDefault = true ; - - if ( coords == wxGridNoCellCoords ) - return performDefault; // we're outside any valid cell - - // Hide the edit control, so it won't interfere with drag-shrinking. - if ( IsCellEditControlShown() ) - { - HideCellEditControl(); - SaveEditControlValue(); - } - - switch ( event.GetModifiers() ) - { - case wxMOD_CONTROL: - if ( m_selectedBlockCorner == wxGridNoCellCoords) - m_selectedBlockCorner = coords; - if ( isFirstDrag ) - SetGridCursor(coords); - UpdateBlockBeingSelected(m_currentCellCoords, coords); - break; - - case wxMOD_NONE: - if ( CanDragCell() ) - { - if ( isFirstDrag ) - { - if ( m_selectedBlockCorner == wxGridNoCellCoords) - m_selectedBlockCorner = coords; - - // if event is handled by user code, no further processing - if ( SendEvent(wxEVT_GRID_CELL_BEGIN_DRAG, coords, event) != 0 ) - performDefault = false; - - return performDefault; - } - } - - UpdateBlockBeingSelected(m_currentCellCoords, coords); - break; - - default: - // we don't handle the other key modifiers - event.Skip(); - } - - return performDefault; -} - -void wxGrid::DoGridLineDrag(wxMouseEvent& event, const wxGridOperations& oper) -{ - wxClientDC dc(m_gridWin); - PrepareDC(dc); - dc.SetLogicalFunction(wxINVERT); - - const wxRect rectWin(CalcUnscrolledPosition(wxPoint(0, 0)), - m_gridWin->GetClientSize()); - - // erase the previously drawn line, if any - if ( m_dragLastPos >= 0 ) - oper.DrawParallelLineInRect(dc, rectWin, m_dragLastPos); - - // we need the vertical position for rows and horizontal for columns here - m_dragLastPos = oper.Dual().Select(CalcUnscrolledPosition(event.GetPosition())); - - // don't allow resizing beneath the minimal size - const int posMin = oper.GetLineStartPos(this, m_dragRowOrCol) + - oper.GetMinimalLineSize(this, m_dragRowOrCol); - if ( m_dragLastPos < posMin ) - m_dragLastPos = posMin; - - // and draw it at the new position - oper.DrawParallelLineInRect(dc, rectWin, m_dragLastPos); -} - -void wxGrid::DoGridDragEvent(wxMouseEvent& event, const wxGridCellCoords& coords) -{ - if ( !m_isDragging ) - { - // Don't start doing anything until the mouse has been dragged far - // enough - const wxPoint& pt = event.GetPosition(); - if ( m_startDragPos == wxDefaultPosition ) - { - m_startDragPos = pt; - return; - } - - if ( abs(m_startDragPos.x - pt.x) <= DRAG_SENSITIVITY && - abs(m_startDragPos.y - pt.y) <= DRAG_SENSITIVITY ) - return; - } - - const bool isFirstDrag = !m_isDragging; - m_isDragging = true; - - switch ( m_cursorMode ) - { - case WXGRID_CURSOR_SELECT_CELL: - // no further handling if handled by user - if ( DoGridCellDrag(event, coords, isFirstDrag) == false ) - return; - break; - - case WXGRID_CURSOR_RESIZE_ROW: - DoGridLineDrag(event, wxGridRowOperations()); - break; - - case WXGRID_CURSOR_RESIZE_COL: - DoGridLineDrag(event, wxGridColumnOperations()); - break; - - default: - event.Skip(); - } - - if ( isFirstDrag ) - { - wxASSERT_MSG( !m_winCapture, "shouldn't capture the mouse twice" ); - - m_winCapture = m_gridWin; - m_winCapture->CaptureMouse(); - } -} - -void -wxGrid::DoGridCellLeftDown(wxMouseEvent& event, - const wxGridCellCoords& coords, - const wxPoint& pos) -{ - if ( SendEvent(wxEVT_GRID_CELL_LEFT_CLICK, coords, event) ) - { - // event handled by user code, no need to do anything here - return; - } - - if ( !event.CmdDown() ) - ClearSelection(); - - if ( event.ShiftDown() ) - { - if ( m_selection ) - { - m_selection->SelectBlock(m_currentCellCoords, coords, event); - m_selectedBlockCorner = coords; - } - } - else if ( XToEdgeOfCol(pos.x) < 0 && YToEdgeOfRow(pos.y) < 0 ) - { - DisableCellEditControl(); - MakeCellVisible( coords ); - - if ( event.CmdDown() ) - { - if ( m_selection ) - { - m_selection->ToggleCellSelection(coords, event); - } - - m_selectedBlockTopLeft = wxGridNoCellCoords; - m_selectedBlockBottomRight = wxGridNoCellCoords; - m_selectedBlockCorner = coords; - } - else - { - if ( m_selection ) - { - // In row or column selection mode just clicking on the cell - // should select the row or column containing it: this is more - // convenient for the kinds of controls that use such selection - // mode and is compatible with 2.8 behaviour (see #12062). - switch ( m_selection->GetSelectionMode() ) - { - case wxGridSelectCells: - case wxGridSelectRowsOrColumns: - // nothing to do in these cases - break; - - case wxGridSelectRows: - m_selection->SelectRow(coords.GetRow()); - break; - - case wxGridSelectColumns: - m_selection->SelectCol(coords.GetCol()); - break; - } - } - - m_waitForSlowClick = m_currentCellCoords == coords && - coords != wxGridNoCellCoords; - SetCurrentCell( coords ); - } - } -} - -void -wxGrid::DoGridCellLeftDClick(wxMouseEvent& event, - const wxGridCellCoords& coords, - const wxPoint& pos) -{ - if ( XToEdgeOfCol(pos.x) < 0 && YToEdgeOfRow(pos.y) < 0 ) - { - if ( !SendEvent(wxEVT_GRID_CELL_LEFT_DCLICK, coords, event) ) - { - // we want double click to select a cell and start editing - // (i.e. to behave in same way as sequence of two slow clicks): - m_waitForSlowClick = true; - } - } -} - -void -wxGrid::DoGridCellLeftUp(wxMouseEvent& event, const wxGridCellCoords& coords) -{ - if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL ) - { - if (m_winCapture) - { - m_winCapture->ReleaseMouse(); - m_winCapture = NULL; - } - - if ( coords == m_currentCellCoords && m_waitForSlowClick && CanEnableCellControl() ) - { - ClearSelection(); - EnableCellEditControl(); - - wxGridCellAttr *attr = GetCellAttr(coords); - wxGridCellEditor *editor = attr->GetEditor(this, coords.GetRow(), coords.GetCol()); - editor->StartingClick(); - editor->DecRef(); - attr->DecRef(); - - m_waitForSlowClick = false; - } - else if ( m_selectedBlockTopLeft != wxGridNoCellCoords && - m_selectedBlockBottomRight != wxGridNoCellCoords ) - { - if ( m_selection ) - { - m_selection->SelectBlock( m_selectedBlockTopLeft, - m_selectedBlockBottomRight, - event ); - } - - m_selectedBlockTopLeft = wxGridNoCellCoords; - m_selectedBlockBottomRight = wxGridNoCellCoords; - - // Show the edit control, if it has been hidden for - // drag-shrinking. - ShowCellEditControl(); - } - } - else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_ROW ) - { - ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL); - DoEndDragResizeRow(event); - } - else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_COL ) - { - ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL); - DoEndDragResizeCol(event); - } - - m_dragLastPos = -1; -} - -void -wxGrid::DoGridMouseMoveEvent(wxMouseEvent& WXUNUSED(event), - const wxGridCellCoords& coords, - const wxPoint& pos) -{ - if ( coords.GetRow() < 0 || coords.GetCol() < 0 ) - { - // out of grid cell area - ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL); - return; - } - - int dragRow = YToEdgeOfRow( pos.y ); - int dragCol = XToEdgeOfCol( pos.x ); - - // Dragging on the corner of a cell to resize in both - // directions is not implemented yet... - // - if ( dragRow >= 0 && dragCol >= 0 ) - { - ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL); - return; - } - - if ( dragRow >= 0 && CanDragGridSize() && CanDragRowSize(dragRow) ) - { - if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL ) - { - m_dragRowOrCol = dragRow; - ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW, NULL, false); - } - } - // When using the native header window we can only resize the columns by - // dragging the dividers in it because we can't make it enter into the - // column resizing mode programmatically - else if ( dragCol >= 0 && !m_useNativeHeader && - CanDragGridSize() && CanDragColSize(dragCol) ) - { - if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL ) - { - m_dragRowOrCol = dragCol; - ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL, NULL, false); - } - } - else // Neither on a row or col edge - { - if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL ) - { - ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL); - } - } -} - -void wxGrid::ProcessGridCellMouseEvent(wxMouseEvent& event) -{ - if ( event.Entering() || event.Leaving() ) - { - // we don't care about these events but we must not reset m_isDragging - // if they happen so return before anything else is done - event.Skip(); - return; - } - - const wxPoint pos = CalcUnscrolledPosition(event.GetPosition()); - - // coordinates of the cell under mouse - wxGridCellCoords coords = XYToCell(pos); - - int cell_rows, cell_cols; - GetCellSize( coords.GetRow(), coords.GetCol(), &cell_rows, &cell_cols ); - if ( (cell_rows < 0) || (cell_cols < 0) ) - { - coords.SetRow(coords.GetRow() + cell_rows); - coords.SetCol(coords.GetCol() + cell_cols); - } - - if ( event.Dragging() ) - { - if ( event.LeftIsDown() ) - DoGridDragEvent(event, coords); - else - event.Skip(); - return; - } - - m_isDragging = false; - m_startDragPos = wxDefaultPosition; - - // deal with various button presses - if ( event.IsButton() ) - { - if ( coords != wxGridNoCellCoords ) - { - DisableCellEditControl(); - - if ( event.LeftDown() ) - DoGridCellLeftDown(event, coords, pos); - else if ( event.LeftDClick() ) - DoGridCellLeftDClick(event, coords, pos); - else if ( event.RightDown() ) - SendEvent(wxEVT_GRID_CELL_RIGHT_CLICK, coords, event); - else if ( event.RightDClick() ) - SendEvent(wxEVT_GRID_CELL_RIGHT_DCLICK, coords, event); - } - - // this one should be called even if we're not over any cell - if ( event.LeftUp() ) - { - DoGridCellLeftUp(event, coords); - } - } - else if ( event.Moving() ) - { - DoGridMouseMoveEvent(event, coords, pos); - } - else // unknown mouse event? - { - event.Skip(); - } -} - -// this function returns true only if the size really changed -bool wxGrid::DoEndDragResizeLine(const wxGridOperations& oper) -{ - if ( m_dragLastPos == -1 ) - return false; - - const wxGridOperations& doper = oper.Dual(); - - const wxSize size = m_gridWin->GetClientSize(); - - const wxPoint ptOrigin = CalcUnscrolledPosition(wxPoint(0, 0)); - - // erase the last line we drew - wxClientDC dc(m_gridWin); - PrepareDC(dc); - dc.SetLogicalFunction(wxINVERT); - - const int posLineStart = oper.Select(ptOrigin); - const int posLineEnd = oper.Select(ptOrigin) + oper.Select(size); - - oper.DrawParallelLine(dc, posLineStart, posLineEnd, m_dragLastPos); - - // temporarily hide the edit control before resizing - HideCellEditControl(); - SaveEditControlValue(); - - // do resize the line - const int lineStart = oper.GetLineStartPos(this, m_dragRowOrCol); - const int lineSizeOld = oper.GetLineSize(this, m_dragRowOrCol); - oper.SetLineSize(this, m_dragRowOrCol, - wxMax(m_dragLastPos - lineStart, - oper.GetMinimalLineSize(this, m_dragRowOrCol))); - const bool - sizeChanged = oper.GetLineSize(this, m_dragRowOrCol) != lineSizeOld; - - m_dragLastPos = -1; - - // refresh now if we're not frozen - if ( !GetBatchCount() ) - { - // we need to refresh everything beyond the resized line in the header - // window - - // get the position from which to refresh in the other direction - wxRect rect(CellToRect(oper.MakeCoords(m_dragRowOrCol, 0))); - rect.SetPosition(CalcScrolledPosition(rect.GetPosition())); - - // we only need the ordinate (for rows) or abscissa (for columns) here, - // and need to cover the entire window in the other direction - oper.Select(rect) = 0; - - wxRect rectHeader(rect.GetPosition(), - oper.MakeSize - ( - oper.GetHeaderWindowSize(this), - doper.Select(size) - doper.Select(rect) - )); - - oper.GetHeaderWindow(this)->Refresh(true, &rectHeader); - - - // also refresh the grid window: extend the rectangle - if ( m_table ) - { - oper.SelectSize(rect) = oper.Select(size); - - int subtractLines = 0; - int line = doper.PosToLine(this, posLineStart); - if ( line >= 0 ) - { - // ensure that if we have a multi-cell block we redraw all of - // it by increasing the refresh area to cover it entirely if a - // part of it is affected - const int lineEnd = doper.PosToLine(this, posLineEnd, true); - for ( ; line < lineEnd; line++ ) - { - int cellLines = oper.Select( - GetCellSize(oper.MakeCoords(m_dragRowOrCol, line))); - if ( cellLines < subtractLines ) - subtractLines = cellLines; - } - } - - int startPos = - oper.GetLineStartPos(this, m_dragRowOrCol + subtractLines); - startPos = doper.CalcScrolledPosition(this, startPos); - - doper.Select(rect) = startPos; - doper.SelectSize(rect) = doper.Select(size) - startPos; - - m_gridWin->Refresh(false, &rect); - } - } - - // show the edit control back again - ShowCellEditControl(); - - return sizeChanged; -} - -void wxGrid::DoEndDragResizeRow(const wxMouseEvent& event) -{ - // TODO: generate RESIZING event, see #10754 - - if ( DoEndDragResizeLine(wxGridRowOperations()) ) - SendGridSizeEvent(wxEVT_GRID_ROW_SIZE, m_dragRowOrCol, -1, event); -} - -void wxGrid::DoEndDragResizeCol(const wxMouseEvent& event) -{ - // TODO: generate RESIZING event, see #10754 - - if ( DoEndDragResizeLine(wxGridColumnOperations()) ) - SendGridSizeEvent(wxEVT_GRID_COL_SIZE, -1, m_dragRowOrCol, event); -} - -void wxGrid::DoStartMoveCol(int col) -{ - m_dragRowOrCol = col; -} - -void wxGrid::DoEndMoveCol(int pos) -{ - wxASSERT_MSG( m_dragRowOrCol != -1, "no matching DoStartMoveCol?" ); - - if ( SendEvent(wxEVT_GRID_COL_MOVE, -1, m_dragRowOrCol) != -1 ) - SetColPos(m_dragRowOrCol, pos); - //else: vetoed by user - - m_dragRowOrCol = -1; -} - -void wxGrid::RefreshAfterColPosChange() -{ - // recalculate the column rights as the column positions have changed, - // unless we calculate them dynamically because all columns widths are the - // same and it's easy to do - if ( !m_colWidths.empty() ) - { - int colRight = 0; - for ( int colPos = 0; colPos < m_numCols; colPos++ ) - { - int colID = GetColAt( colPos ); - - // Ignore the currently hidden columns. - const int width = m_colWidths[colID]; - if ( width > 0 ) - colRight += width; - - m_colRights[colID] = colRight; - } - } - - // and make the changes visible - if ( m_useNativeHeader ) - { - if ( m_colAt.empty() ) - GetGridColHeader()->ResetColumnsOrder(); - else - GetGridColHeader()->SetColumnsOrder(m_colAt); - } - else - { - m_colWindow->Refresh(); - } - m_gridWin->Refresh(); -} - -void wxGrid::SetColumnsOrder(const wxArrayInt& order) -{ - m_colAt = order; - - RefreshAfterColPosChange(); -} - -void wxGrid::SetColPos(int idx, int pos) -{ - // we're going to need m_colAt now, initialize it if needed - if ( m_colAt.empty() ) - { - m_colAt.reserve(m_numCols); - for ( int i = 0; i < m_numCols; i++ ) - m_colAt.push_back(i); - } - - wxHeaderCtrl::MoveColumnInOrderArray(m_colAt, idx, pos); - - RefreshAfterColPosChange(); -} - -void wxGrid::ResetColPos() -{ - m_colAt.clear(); - - RefreshAfterColPosChange(); -} - -void wxGrid::EnableDragColMove( bool enable ) -{ - if ( m_canDragColMove == enable ) - return; - - if ( m_useNativeHeader ) - { - // update all columns to make them [not] reorderable - GetGridColHeader()->SetColumnCount(m_numCols); - } - - m_canDragColMove = enable; - - // we use to call ResetColPos() from here if !enable but this doesn't seem - // right as it would mean there would be no way to "freeze" the current - // columns order by disabling moving them after putting them in the desired - // order, whereas now you can always call ResetColPos() manually if needed -} - - -// -// ------ interaction with data model -// -bool wxGrid::ProcessTableMessage( wxGridTableMessage& msg ) -{ - switch ( msg.GetId() ) - { - case wxGRIDTABLE_NOTIFY_ROWS_INSERTED: - case wxGRIDTABLE_NOTIFY_ROWS_APPENDED: - case wxGRIDTABLE_NOTIFY_ROWS_DELETED: - case wxGRIDTABLE_NOTIFY_COLS_INSERTED: - case wxGRIDTABLE_NOTIFY_COLS_APPENDED: - case wxGRIDTABLE_NOTIFY_COLS_DELETED: - return Redimension( msg ); - - default: - return false; - } -} - -// The behaviour of this function depends on the grid table class -// Clear() function. For the default wxGridStringTable class the -// behaviour is to replace all cell contents with wxEmptyString but -// not to change the number of rows or cols. -// -void wxGrid::ClearGrid() -{ - if ( m_table ) - { - if (IsCellEditControlEnabled()) - DisableCellEditControl(); - - m_table->Clear(); - if (!GetBatchCount()) - m_gridWin->Refresh(); - } -} - -bool -wxGrid::DoModifyLines(bool (wxGridTableBase::*funcModify)(size_t, size_t), - int pos, int num, bool WXUNUSED(updateLabels) ) -{ - wxCHECK_MSG( m_created, false, "must finish creating the grid first" ); - - if ( !m_table ) - return false; - - if ( IsCellEditControlEnabled() ) - DisableCellEditControl(); - - return (m_table->*funcModify)(pos, num); - - // the table will have sent the results of the insert row - // operation to this view object as a grid table message -} - -bool -wxGrid::DoAppendLines(bool (wxGridTableBase::*funcAppend)(size_t), - int num, bool WXUNUSED(updateLabels)) -{ - wxCHECK_MSG( m_created, false, "must finish creating the grid first" ); - - if ( !m_table ) - return false; - - return (m_table->*funcAppend)(num); -} - -// ---------------------------------------------------------------------------- -// event generation helpers -// ---------------------------------------------------------------------------- - -bool -wxGrid::SendGridSizeEvent(wxEventType type, - int row, int col, - const wxMouseEvent& mouseEv) -{ - int rowOrCol = row == -1 ? col : row; - - wxGridSizeEvent gridEvt( GetId(), - type, - this, - rowOrCol, - mouseEv.GetX() + GetRowLabelSize(), - mouseEv.GetY() + GetColLabelSize(), - mouseEv); - - return GetEventHandler()->ProcessEvent(gridEvt); -} - -// Generate a grid event based on a mouse event and return: -// -1 if the event was vetoed -// +1 if the event was processed (but not vetoed) -// 0 if the event wasn't handled -int -wxGrid::SendEvent(wxEventType type, - int row, int col, - const wxMouseEvent& mouseEv) -{ - bool claimed, vetoed; - - if ( type == wxEVT_GRID_RANGE_SELECT ) - { - // Right now, it should _never_ end up here! - wxGridRangeSelectEvent gridEvt( GetId(), - type, - this, - m_selectedBlockTopLeft, - m_selectedBlockBottomRight, - true, - mouseEv); - - claimed = GetEventHandler()->ProcessEvent(gridEvt); - vetoed = !gridEvt.IsAllowed(); - } - else if ( type == wxEVT_GRID_LABEL_LEFT_CLICK || - type == wxEVT_GRID_LABEL_LEFT_DCLICK || - type == wxEVT_GRID_LABEL_RIGHT_CLICK || - type == wxEVT_GRID_LABEL_RIGHT_DCLICK ) - { - wxPoint pos = mouseEv.GetPosition(); - - if ( mouseEv.GetEventObject() == GetGridRowLabelWindow() ) - pos.y += GetColLabelSize(); - if ( mouseEv.GetEventObject() == GetGridColLabelWindow() ) - pos.x += GetRowLabelSize(); - - wxGridEvent gridEvt( GetId(), - type, - this, - row, col, - pos.x, - pos.y, - false, - mouseEv); - claimed = GetEventHandler()->ProcessEvent(gridEvt); - vetoed = !gridEvt.IsAllowed(); - } - else - { - wxGridEvent gridEvt( GetId(), - type, - this, - row, col, - mouseEv.GetX() + GetRowLabelSize(), - mouseEv.GetY() + GetColLabelSize(), - false, - mouseEv); - - if ( type == wxEVT_GRID_CELL_BEGIN_DRAG ) - { - // by default the dragging is not supported, the user code must - // explicitly allow the event for it to take place - gridEvt.Veto(); - } - - claimed = GetEventHandler()->ProcessEvent(gridEvt); - vetoed = !gridEvt.IsAllowed(); - } - - // A Veto'd event may not be `claimed' so test this first - if (vetoed) - return -1; - - return claimed ? 1 : 0; -} - -// Generate a grid event of specified type, return value same as above -// -int -wxGrid::SendEvent(wxEventType type, int row, int col, const wxString& s) -{ - wxGridEvent gridEvt( GetId(), type, this, row, col ); - gridEvt.SetString(s); - - const bool claimed = GetEventHandler()->ProcessEvent(gridEvt); - - // A Veto'd event may not be `claimed' so test this first - if ( !gridEvt.IsAllowed() ) - return -1; - - return claimed ? 1 : 0; -} - -void wxGrid::OnPaint( wxPaintEvent& WXUNUSED(event) ) -{ - // needed to prevent zillions of paint events on MSW - wxPaintDC dc(this); -} - -void wxGrid::Refresh(bool eraseb, const wxRect* rect) -{ - // Don't do anything if between Begin/EndBatch... - // EndBatch() will do all this on the last nested one anyway. - if ( m_created && !GetBatchCount() ) - { - // Refresh to get correct scrolled position: - wxScrolledWindow::Refresh(eraseb, rect); - - if (rect) - { - int rect_x, rect_y, rectWidth, rectHeight; - int width_label, width_cell, height_label, height_cell; - int x, y; - - // Copy rectangle can get scroll offsets.. - rect_x = rect->GetX(); - rect_y = rect->GetY(); - rectWidth = rect->GetWidth(); - rectHeight = rect->GetHeight(); - - width_label = m_rowLabelWidth - rect_x; - if (width_label > rectWidth) - width_label = rectWidth; - - height_label = m_colLabelHeight - rect_y; - if (height_label > rectHeight) - height_label = rectHeight; - - if (rect_x > m_rowLabelWidth) - { - x = rect_x - m_rowLabelWidth; - width_cell = rectWidth; - } - else - { - x = 0; - width_cell = rectWidth - (m_rowLabelWidth - rect_x); - } - - if (rect_y > m_colLabelHeight) - { - y = rect_y - m_colLabelHeight; - height_cell = rectHeight; - } - else - { - y = 0; - height_cell = rectHeight - (m_colLabelHeight - rect_y); - } - - // Paint corner label part intersecting rect. - if ( width_label > 0 && height_label > 0 ) - { - wxRect anotherrect(rect_x, rect_y, width_label, height_label); - m_cornerLabelWin->Refresh(eraseb, &anotherrect); - } - - // Paint col labels part intersecting rect. - if ( width_cell > 0 && height_label > 0 ) - { - wxRect anotherrect(x, rect_y, width_cell, height_label); - m_colWindow->Refresh(eraseb, &anotherrect); - } - - // Paint row labels part intersecting rect. - if ( width_label > 0 && height_cell > 0 ) - { - wxRect anotherrect(rect_x, y, width_label, height_cell); - m_rowLabelWin->Refresh(eraseb, &anotherrect); - } - - // Paint cell area part intersecting rect. - if ( width_cell > 0 && height_cell > 0 ) - { - wxRect anotherrect(x, y, width_cell, height_cell); - m_gridWin->Refresh(eraseb, &anotherrect); - } - } - else - { - m_cornerLabelWin->Refresh(eraseb, NULL); - m_colWindow->Refresh(eraseb, NULL); - m_rowLabelWin->Refresh(eraseb, NULL); - m_gridWin->Refresh(eraseb, NULL); - } - } -} - -void wxGrid::OnSize(wxSizeEvent& WXUNUSED(event)) -{ - if (m_targetWindow != this) // check whether initialisation has been done - { - // reposition our children windows - CalcWindowSizes(); - } -} - -void wxGrid::OnKeyDown( wxKeyEvent& event ) -{ - if ( m_inOnKeyDown ) - { - // shouldn't be here - we are going round in circles... - // - wxFAIL_MSG( wxT("wxGrid::OnKeyDown called while already active") ); - } - - m_inOnKeyDown = true; - - // propagate the event up and see if it gets processed - wxWindow *parent = GetParent(); - wxKeyEvent keyEvt( event ); - keyEvt.SetEventObject( parent ); - - if ( !parent->GetEventHandler()->ProcessEvent( keyEvt ) ) - { - if (GetLayoutDirection() == wxLayout_RightToLeft) - { - if (event.GetKeyCode() == WXK_RIGHT) - event.m_keyCode = WXK_LEFT; - else if (event.GetKeyCode() == WXK_LEFT) - event.m_keyCode = WXK_RIGHT; - } - - // try local handlers - switch ( event.GetKeyCode() ) - { - case WXK_UP: - if ( event.ControlDown() ) - MoveCursorUpBlock( event.ShiftDown() ); - else - MoveCursorUp( event.ShiftDown() ); - break; - - case WXK_DOWN: - if ( event.ControlDown() ) - MoveCursorDownBlock( event.ShiftDown() ); - else - MoveCursorDown( event.ShiftDown() ); - break; - - case WXK_LEFT: - if ( event.ControlDown() ) - MoveCursorLeftBlock( event.ShiftDown() ); - else - MoveCursorLeft( event.ShiftDown() ); - break; - - case WXK_RIGHT: - if ( event.ControlDown() ) - MoveCursorRightBlock( event.ShiftDown() ); - else - MoveCursorRight( event.ShiftDown() ); - break; - - case WXK_RETURN: - case WXK_NUMPAD_ENTER: - if ( event.ControlDown() ) - { - event.Skip(); // to let the edit control have the return - } - else - { - if ( GetGridCursorRow() < GetNumberRows()-1 ) - { - MoveCursorDown( event.ShiftDown() ); - } - else - { - // at the bottom of a column - DisableCellEditControl(); - } - } - break; - - case WXK_ESCAPE: - ClearSelection(); - break; - - case WXK_TAB: - { - // send an event to the grid's parents for custom handling - wxGridEvent gridEvt(GetId(), wxEVT_GRID_TABBING, this, - GetGridCursorRow(), GetGridCursorCol(), - -1, -1, false, event); - if ( ProcessWindowEvent(gridEvt) ) - { - // the event has been handled so no need for more processing - break; - } - } - DoGridProcessTab( event ); - break; - - case WXK_HOME: - GoToCell(event.ControlDown() ? 0 - : m_currentCellCoords.GetRow(), - 0); - break; - - case WXK_END: - GoToCell(event.ControlDown() ? m_numRows - 1 - : m_currentCellCoords.GetRow(), - m_numCols - 1); - break; - - case WXK_PAGEUP: - MovePageUp(); - break; - - case WXK_PAGEDOWN: - MovePageDown(); - break; - - case WXK_SPACE: - // Ctrl-Space selects the current column, Shift-Space -- the - // current row and Ctrl-Shift-Space -- everything - switch ( m_selection ? event.GetModifiers() : wxMOD_NONE ) - { - case wxMOD_CONTROL: - m_selection->SelectCol(m_currentCellCoords.GetCol()); - break; - - case wxMOD_SHIFT: - m_selection->SelectRow(m_currentCellCoords.GetRow()); - break; - - case wxMOD_CONTROL | wxMOD_SHIFT: - m_selection->SelectBlock(0, 0, - m_numRows - 1, m_numCols - 1); - break; - - case wxMOD_NONE: - if ( !IsEditable() ) - { - MoveCursorRight(false); - break; - } - wxFALLTHROUGH; - - default: - event.Skip(); - } - break; - - default: - event.Skip(); - break; - } - } - - m_inOnKeyDown = false; -} - -void wxGrid::OnKeyUp( wxKeyEvent& event ) -{ - // try local handlers - // - if ( event.GetKeyCode() == WXK_SHIFT ) - { - if ( m_selectedBlockTopLeft != wxGridNoCellCoords && - m_selectedBlockBottomRight != wxGridNoCellCoords ) - { - if ( m_selection ) - { - m_selection->SelectBlock( - m_selectedBlockTopLeft, - m_selectedBlockBottomRight, - event); - } - } - - m_selectedBlockTopLeft = wxGridNoCellCoords; - m_selectedBlockBottomRight = wxGridNoCellCoords; - m_selectedBlockCorner = wxGridNoCellCoords; - } -} - -void wxGrid::OnChar( wxKeyEvent& event ) -{ - // is it possible to edit the current cell at all? - if ( !IsCellEditControlEnabled() && CanEnableCellControl() ) - { - // yes, now check whether the cells editor accepts the key - int row = m_currentCellCoords.GetRow(); - int col = m_currentCellCoords.GetCol(); - wxGridCellAttr *attr = GetCellAttr(row, col); - wxGridCellEditor *editor = attr->GetEditor(this, row, col); - - // is special and will always start editing, for - // other keys - ask the editor itself - if ( (event.GetKeyCode() == WXK_F2 && !event.HasModifiers()) - || editor->IsAcceptedKey(event) ) - { - // ensure cell is visble - MakeCellVisible(row, col); - EnableCellEditControl(); - - // a problem can arise if the cell is not completely - // visible (even after calling MakeCellVisible the - // control is not created and calling StartingKey will - // crash the app - if ( event.GetKeyCode() != WXK_F2 && editor->IsCreated() && m_cellEditCtrlEnabled ) - editor->StartingKey(event); - } - else - { - event.Skip(); - } - - editor->DecRef(); - attr->DecRef(); - } - else - { - event.Skip(); - } -} - -void wxGrid::OnEraseBackground(wxEraseEvent&) -{ -} - -void wxGrid::DoGridProcessTab(wxKeyboardState& kbdState) -{ - const bool isForwardTab = !kbdState.ShiftDown(); - - // TAB processing only changes when we are at the borders of the grid, so - // let's first handle the common behaviour when we are not at the border. - if ( isForwardTab ) - { - if ( GetGridCursorCol() < GetNumberCols() - 1 ) - { - MoveCursorRight( false ); - return; - } - } - else // going back - { - if ( GetGridCursorCol() ) - { - MoveCursorLeft( false ); - return; - } - } - - - // We only get here if the cursor is at the border of the grid, apply the - // configured behaviour. - switch ( m_tabBehaviour ) - { - case Tab_Stop: - // Nothing special to do, we remain at the current cell. - break; - - case Tab_Wrap: - // Go to the beginning of the next or the end of the previous row. - if ( isForwardTab ) - { - if ( GetGridCursorRow() < GetNumberRows() - 1 ) - { - GoToCell( GetGridCursorRow() + 1, 0 ); - return; - } - } - else - { - if ( GetGridCursorRow() > 0 ) - { - GoToCell( GetGridCursorRow() - 1, GetNumberCols() - 1 ); - return; - } - } - break; - - case Tab_Leave: - if ( Navigate( isForwardTab ? wxNavigationKeyEvent::IsForward - : wxNavigationKeyEvent::IsBackward ) ) - return; - break; - } - - // If we remain in this cell, stop editing it if we were doing so. - DisableCellEditControl(); -} - -bool wxGrid::SetCurrentCell( const wxGridCellCoords& coords ) -{ - if ( SendEvent(wxEVT_GRID_SELECT_CELL, coords) == -1 ) - { - // the event has been vetoed - do nothing - return false; - } - -#if !defined(__WXMAC__) - wxClientDC dc( m_gridWin ); - PrepareDC( dc ); -#endif - - if ( m_currentCellCoords != wxGridNoCellCoords ) - { - DisableCellEditControl(); - - if ( IsVisible( m_currentCellCoords, false ) ) - { - wxRect r; - r = BlockToDeviceRect( m_currentCellCoords, m_currentCellCoords ); - if ( !m_gridLinesEnabled ) - { - r.x--; - r.y--; - r.width++; - r.height++; - } - - wxGridCellCoordsArray cells = CalcCellsExposed( r ); - - // Otherwise refresh redraws the highlight! - m_currentCellCoords = coords; - -#if defined(__WXMAC__) - m_gridWin->Refresh(true /*, & r */); -#else - DrawGridCellArea( dc, cells ); - DrawAllGridLines( dc, r ); -#endif - } - } - - m_currentCellCoords = coords; - - wxGridCellAttr *attr = GetCellAttr( coords ); -#if !defined(__WXMAC__) - DrawCellHighlight( dc, attr ); -#endif - attr->DecRef(); - - return true; -} - -void -wxGrid::UpdateBlockBeingSelected(int topRow, int leftCol, - int bottomRow, int rightCol) -{ - MakeCellVisible(m_selectedBlockCorner); - m_selectedBlockCorner = wxGridCellCoords(bottomRow, rightCol); - - if ( m_selection ) - { - switch ( m_selection->GetSelectionMode() ) - { - default: - wxFAIL_MSG( "unknown selection mode" ); - wxFALLTHROUGH; - - case wxGridSelectCells: - // arbitrary blocks selection allowed so just use the cell - // coordinates as is - break; - - case wxGridSelectRows: - // only full rows selection allowed, ensure that we do select - // full rows - leftCol = 0; - rightCol = GetNumberCols() - 1; - break; - - case wxGridSelectColumns: - // same as above but for columns - topRow = 0; - bottomRow = GetNumberRows() - 1; - break; - - case wxGridSelectRowsOrColumns: - // in this mode we can select only full rows or full columns so - // it doesn't make sense to select blocks at all (and we can't - // extend the block because there is no preferred direction, we - // could only extend it to cover the entire grid but this is - // not useful) - return; - } - } - - EnsureFirstLessThanSecond(topRow, bottomRow); - EnsureFirstLessThanSecond(leftCol, rightCol); - - wxGridCellCoords updateTopLeft = wxGridCellCoords(topRow, leftCol), - updateBottomRight = wxGridCellCoords(bottomRow, rightCol); - - // First the case that we selected a completely new area - if ( m_selectedBlockTopLeft == wxGridNoCellCoords || - m_selectedBlockBottomRight == wxGridNoCellCoords ) - { - wxRect rect; - rect = BlockToDeviceRect( wxGridCellCoords ( topRow, leftCol ), - wxGridCellCoords ( bottomRow, rightCol ) ); - m_gridWin->Refresh( false, &rect ); - } - - // Now handle changing an existing selection area. - else if ( m_selectedBlockTopLeft != updateTopLeft || - m_selectedBlockBottomRight != updateBottomRight ) - { - // Compute two optimal update rectangles: - // Either one rectangle is a real subset of the - // other, or they are (almost) disjoint! - wxRect rect[4]; - bool need_refresh[4]; - need_refresh[0] = - need_refresh[1] = - need_refresh[2] = - need_refresh[3] = false; - int i; - - // Store intermediate values - wxCoord oldLeft = m_selectedBlockTopLeft.GetCol(); - wxCoord oldTop = m_selectedBlockTopLeft.GetRow(); - wxCoord oldRight = m_selectedBlockBottomRight.GetCol(); - wxCoord oldBottom = m_selectedBlockBottomRight.GetRow(); - - // Determine the outer/inner coordinates. - EnsureFirstLessThanSecond(oldLeft, leftCol); - EnsureFirstLessThanSecond(oldTop, topRow); - EnsureFirstLessThanSecond(rightCol, oldRight); - EnsureFirstLessThanSecond(bottomRow, oldBottom); - - // Now, either the stuff marked old is the outer - // rectangle or we don't have a situation where one - // is contained in the other. - - if ( oldLeft < leftCol ) - { - // Refresh the newly selected or deselected - // area to the left of the old or new selection. - need_refresh[0] = true; - rect[0] = BlockToDeviceRect( - wxGridCellCoords( oldTop, oldLeft ), - wxGridCellCoords( oldBottom, leftCol - 1 ) ); - } - - if ( oldTop < topRow ) - { - // Refresh the newly selected or deselected - // area above the old or new selection. - need_refresh[1] = true; - rect[1] = BlockToDeviceRect( - wxGridCellCoords( oldTop, leftCol ), - wxGridCellCoords( topRow - 1, rightCol ) ); - } - - if ( oldRight > rightCol ) - { - // Refresh the newly selected or deselected - // area to the right of the old or new selection. - need_refresh[2] = true; - rect[2] = BlockToDeviceRect( - wxGridCellCoords( oldTop, rightCol + 1 ), - wxGridCellCoords( oldBottom, oldRight ) ); - } - - if ( oldBottom > bottomRow ) - { - // Refresh the newly selected or deselected - // area below the old or new selection. - need_refresh[3] = true; - rect[3] = BlockToDeviceRect( - wxGridCellCoords( bottomRow + 1, leftCol ), - wxGridCellCoords( oldBottom, rightCol ) ); - } - - // various Refresh() calls - for (i = 0; i < 4; i++ ) - if ( need_refresh[i] && rect[i] != wxGridNoCellRect ) - m_gridWin->Refresh( false, &(rect[i]) ); - } - - // change selection - m_selectedBlockTopLeft = updateTopLeft; - m_selectedBlockBottomRight = updateBottomRight; -} - -// Note - this function only draws cells that are in the list of -// exposed cells (usually set from the update region by -// CalcExposedCells) -// -void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells ) -{ - if ( !m_numRows || !m_numCols ) - return; - - int i, numCells = cells.GetCount(); - int row, col, cell_rows, cell_cols; - wxGridCellCoordsArray redrawCells; - - for ( i = numCells - 1; i >= 0; i-- ) - { - row = cells[i].GetRow(); - col = cells[i].GetCol(); - GetCellSize( row, col, &cell_rows, &cell_cols ); - - // If this cell is part of a multicell block, find owner for repaint - if ( cell_rows <= 0 || cell_cols <= 0 ) - { - wxGridCellCoords cell( row + cell_rows, col + cell_cols ); - bool marked = false; - for ( int j = 0; j < numCells; j++ ) - { - if ( cell == cells[j] ) - { - marked = true; - break; - } - } - - if (!marked) - { - int count = redrawCells.GetCount(); - for (int j = 0; j < count; j++) - { - if ( cell == redrawCells[j] ) - { - marked = true; - break; - } - } - - if (!marked) - redrawCells.Add( cell ); - } - - // don't bother drawing this cell - continue; - } - - // If this cell is empty, find cell to left that might want to overflow - if (m_table && m_table->IsEmptyCell(row, col)) - { - for ( int l = 0; l < cell_rows; l++ ) - { - // find a cell in this row to leave already marked for repaint - int left = col; - for (int k = 0; k < int(redrawCells.GetCount()); k++) - if ((redrawCells[k].GetCol() < left) && - (redrawCells[k].GetRow() == row)) - { - left = redrawCells[k].GetCol(); - } - - if (left == col) - left = 0; // oh well - - for (int j = col - 1; j >= left; j--) - { - if (!m_table->IsEmptyCell(row + l, j)) - { - if (GetCellOverflow(row + l, j)) - { - wxGridCellCoords cell(row + l, j); - bool marked = false; - - for (int k = 0; k < numCells; k++) - { - if ( cell == cells[k] ) - { - marked = true; - break; - } - } - - if (!marked) - { - int count = redrawCells.GetCount(); - for (int k = 0; k < count; k++) - { - if ( cell == redrawCells[k] ) - { - marked = true; - break; - } - } - if (!marked) - redrawCells.Add( cell ); - } - } - break; - } - } - } - } - - DrawCell( dc, cells[i] ); - } - - numCells = redrawCells.GetCount(); - - for ( i = numCells - 1; i >= 0; i-- ) - { - DrawCell( dc, redrawCells[i] ); - } -} - -void wxGrid::DrawGridSpace( wxDC& dc ) -{ - int cw, ch; - m_gridWin->GetClientSize( &cw, &ch ); - - int right, bottom; - CalcUnscrolledPosition( cw, ch, &right, &bottom ); - - int rightCol = m_numCols > 0 ? GetColRight(GetColAt( m_numCols - 1 )) : 0; - int bottomRow = m_numRows > 0 ? GetRowBottom(m_numRows - 1) : 0; - - if ( right > rightCol || bottom > bottomRow ) - { - int left, top; - CalcUnscrolledPosition( 0, 0, &left, &top ); - - dc.SetBrush(GetDefaultCellBackgroundColour()); - dc.SetPen( *wxTRANSPARENT_PEN ); - - if ( right > rightCol ) - { - dc.DrawRectangle( rightCol, top, right - rightCol, ch ); - } - - if ( bottom > bottomRow ) - { - dc.DrawRectangle( left, bottomRow, cw, bottom - bottomRow ); - } - } -} - -void wxGrid::DrawCell( wxDC& dc, const wxGridCellCoords& coords ) -{ - int row = coords.GetRow(); - int col = coords.GetCol(); - - if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 ) - return; - - // we draw the cell border ourselves - wxGridCellAttr* attr = GetCellAttr(row, col); - - bool isCurrent = coords == m_currentCellCoords; - - wxRect rect = CellToRect( row, col ); - - // if the editor is shown, we should use it and not the renderer - // Note: However, only if it is really _shown_, i.e. not hidden! - if ( isCurrent && IsCellEditControlShown() ) - { - // NB: this "#if..." is temporary and fixes a problem where the - // edit control is erased by this code after being rendered. - // On wxMac (QD build only), the cell editor is a wxTextCntl and is rendered - // implicitly, causing this out-of order render. -#if !defined(__WXMAC__) - wxGridCellEditor *editor = attr->GetEditor(this, row, col); - editor->PaintBackground(dc, rect, *attr); - editor->DecRef(); -#endif - } - else - { - // but all the rest is drawn by the cell renderer and hence may be customized - wxGridCellRenderer *renderer = attr->GetRenderer(this, row, col); - renderer->Draw(*this, *attr, dc, rect, row, col, IsInSelection(coords)); - renderer->DecRef(); - } - - attr->DecRef(); -} - -void wxGrid::DrawCellHighlight( wxDC& dc, const wxGridCellAttr *attr ) -{ - // don't show highlight when the grid doesn't have focus - if ( !HasFocus() ) - return; - - int row = m_currentCellCoords.GetRow(); - int col = m_currentCellCoords.GetCol(); - - if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 ) - return; - - wxRect rect = CellToRect(row, col); - - // hmmm... what could we do here to show that the cell is disabled? - // for now, I just draw a thinner border than for the other ones, but - // it doesn't look really good - - int penWidth = attr->IsReadOnly() ? m_cellHighlightROPenWidth : m_cellHighlightPenWidth; - - if (penWidth > 0) - { - // The center of the drawn line is where the position/width/height of - // the rectangle is actually at (on wxMSW at least), so the - // size of the rectangle is reduced to compensate for the thickness of - // the line. If this is too strange on non-wxMSW platforms then - // please #ifdef this appropriately. -#ifndef __WXQT__ - rect.x += penWidth / 2; - rect.y += penWidth / 2; - rect.width -= penWidth - 1; - rect.height -= penWidth - 1; -#endif - // Now draw the rectangle - // use the cellHighlightColour if the cell is inside a selection, this - // will ensure the cell is always visible. - dc.SetPen(wxPen(IsInSelection(row,col) ? m_selectionForeground - : m_cellHighlightColour, - penWidth)); - dc.SetBrush(*wxTRANSPARENT_BRUSH); - dc.DrawRectangle(rect); - } -} - -wxPen wxGrid::GetDefaultGridLinePen() -{ - return wxPen(GetGridLineColour()); -} - -wxPen wxGrid::GetRowGridLinePen(int WXUNUSED(row)) -{ - return GetDefaultGridLinePen(); -} - -wxPen wxGrid::GetColGridLinePen(int WXUNUSED(col)) -{ - return GetDefaultGridLinePen(); -} - -void wxGrid::DrawCellBorder( wxDC& dc, const wxGridCellCoords& coords ) -{ - int row = coords.GetRow(); - int col = coords.GetCol(); - if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 ) - return; - - - wxRect rect = CellToRect( row, col ); - - // right hand border - dc.SetPen( GetColGridLinePen(col) ); - dc.DrawLine( rect.x + rect.width, rect.y, - rect.x + rect.width, rect.y + rect.height + 1 ); - - // bottom border - dc.SetPen( GetRowGridLinePen(row) ); - dc.DrawLine( rect.x, rect.y + rect.height, - rect.x + rect.width, rect.y + rect.height); -} - -void wxGrid::DrawHighlight(wxDC& dc, const wxGridCellCoordsArray& cells) -{ - // This if block was previously in wxGrid::OnPaint but that doesn't - // seem to get called under wxGTK - MB - // - if ( m_currentCellCoords == wxGridNoCellCoords && - m_numRows && m_numCols ) - { - m_currentCellCoords.Set(0, 0); - } - - if ( IsCellEditControlShown() ) - { - // don't show highlight when the edit control is shown - return; - } - - // if the active cell was repainted, repaint its highlight too because it - // might have been damaged by the grid lines - size_t count = cells.GetCount(); - for ( size_t n = 0; n < count; n++ ) - { - wxGridCellCoords cell = cells[n]; - - // If we are using attributes, then we may have just exposed another - // cell in a partially-visible merged cluster of cells. If the "anchor" - // (upper left) cell of this merged cluster is the cell indicated by - // m_currentCellCoords, then we need to refresh the cell highlight even - // though the "anchor" itself is not part of our update segment. - if ( CanHaveAttributes() ) - { - int rows = 0, - cols = 0; - GetCellSize(cell.GetRow(), cell.GetCol(), &rows, &cols); - - if ( rows < 0 ) - cell.SetRow(cell.GetRow() + rows); - - if ( cols < 0 ) - cell.SetCol(cell.GetCol() + cols); - } - - if ( cell == m_currentCellCoords ) - { - wxGridCellAttr* attr = GetCellAttr(m_currentCellCoords); - DrawCellHighlight(dc, attr); - attr->DecRef(); - - break; - } - } -} - -// Used by wxGrid::Render() to draw the grid lines only for the cells in the -// specified range. -void -wxGrid::DrawRangeGridLines(wxDC& dc, - const wxRegion& reg, - const wxGridCellCoords& topLeft, - const wxGridCellCoords& bottomRight) -{ - if ( !m_gridLinesEnabled ) - return; - - int top, left, width, height; - reg.GetBox( left, top, width, height ); - - // create a clipping region - wxRegion clippedcells( dc.LogicalToDeviceX( left ), - dc.LogicalToDeviceY( top ), - dc.LogicalToDeviceXRel( width ), - dc.LogicalToDeviceYRel( height ) ); - - // subtract multi cell span area from clipping region for lines - wxRect rect; - for ( int row = topLeft.GetRow(); row <= bottomRight.GetRow(); row++ ) - { - for ( int col = topLeft.GetCol(); col <= bottomRight.GetCol(); col++ ) - { - int cell_rows, cell_cols; - GetCellSize( row, col, &cell_rows, &cell_cols ); - if ( cell_rows > 1 || cell_cols > 1 ) // multi cell - { - rect = CellToRect( row, col ); - // cater for scaling - // device origin already set in ::Render() for x, y - rect.x = dc.LogicalToDeviceX( rect.x ); - rect.y = dc.LogicalToDeviceY( rect.y ); - rect.width = dc.LogicalToDeviceXRel( rect.width ); - rect.height = dc.LogicalToDeviceYRel( rect.height ) - 1; - clippedcells.Subtract( rect ); - } - else if ( cell_rows < 0 || cell_cols < 0 ) // part of multicell - { - rect = CellToRect( row + cell_rows, col + cell_cols ); - rect.x = dc.LogicalToDeviceX( rect.x ); - rect.y = dc.LogicalToDeviceY( rect.y ); - rect.width = dc.LogicalToDeviceXRel( rect.width ); - rect.height = dc.LogicalToDeviceYRel( rect.height ) - 1; - clippedcells.Subtract( rect ); - } - } - } - - dc.SetDeviceClippingRegion( clippedcells ); - - DoDrawGridLines(dc, - top, left, top + height, left + width, - topLeft.GetRow(), topLeft.GetCol(), - bottomRight.GetRow(), bottomRight.GetCol()); - - dc.DestroyClippingRegion(); -} - -// This is used to redraw all grid lines e.g. when the grid line colour -// has been changed -// -void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) ) -{ - if ( !m_gridLinesEnabled ) - return; - - int top, bottom, left, right; - - int cw, ch; - m_gridWin->GetClientSize(&cw, &ch); - CalcUnscrolledPosition( 0, 0, &left, &top ); - CalcUnscrolledPosition( cw, ch, &right, &bottom ); - - // avoid drawing grid lines past the last row and col - if ( m_gridLinesClipHorz ) - { - if ( !m_numCols ) - return; - - const int lastColRight = GetColRight(GetColAt(m_numCols - 1)); - if ( right > lastColRight ) - right = lastColRight; - } - - if ( m_gridLinesClipVert ) - { - if ( !m_numRows ) - return; - - const int lastRowBottom = GetRowBottom(m_numRows - 1); - if ( bottom > lastRowBottom ) - bottom = lastRowBottom; - } - - // no gridlines inside multicells, clip them out - int leftCol = GetColPos( internalXToCol(left) ); - int topRow = internalYToRow(top); - int rightCol = GetColPos( internalXToCol(right) ); - int bottomRow = internalYToRow(bottom); - - wxRegion clippedcells(0, 0, cw, ch); - - int cell_rows, cell_cols; - wxRect rect; - - for ( int j = topRow; j <= bottomRow; j++ ) - { - for ( int colPos = leftCol; colPos <= rightCol; colPos++ ) - { - int i = GetColAt( colPos ); - - GetCellSize( j, i, &cell_rows, &cell_cols ); - if ((cell_rows > 1) || (cell_cols > 1)) - { - rect = CellToRect(j,i); - CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); - clippedcells.Subtract(rect); - } - else if ((cell_rows < 0) || (cell_cols < 0)) - { - rect = CellToRect(j + cell_rows, i + cell_cols); - CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); - clippedcells.Subtract(rect); - } - } - } - - dc.SetDeviceClippingRegion( clippedcells ); - - DoDrawGridLines(dc, - top, left, bottom, right, - topRow, leftCol, m_numRows, m_numCols); - - dc.DestroyClippingRegion(); -} - -void -wxGrid::DoDrawGridLines(wxDC& dc, - int top, int left, - int bottom, int right, - int topRow, int leftCol, - int bottomRow, int rightCol) -{ - // horizontal grid lines - for ( int i = topRow; i < bottomRow; i++ ) - { - int bot = GetRowBottom(i) - 1; - - if ( bot > bottom ) - break; - - if ( bot >= top ) - { - dc.SetPen( GetRowGridLinePen(i) ); - dc.DrawLine( left, bot, right, bot ); - } - } - - // vertical grid lines - for ( int colPos = leftCol; colPos < rightCol; colPos++ ) - { - int i = GetColAt( colPos ); - - int colRight = GetColRight(i); -#if defined(__WXGTK__) || defined(__WXQT__) - if (GetLayoutDirection() != wxLayout_RightToLeft) -#endif - colRight--; - - if ( colRight > right ) - break; - - if ( colRight >= left ) - { - dc.SetPen( GetColGridLinePen(i) ); - dc.DrawLine( colRight, top, colRight, bottom ); - } - } -} - -void wxGrid::DrawRowLabels( wxDC& dc, const wxArrayInt& rows) -{ - if ( !m_numRows ) - return; - - const size_t numLabels = rows.GetCount(); - for ( size_t i = 0; i < numLabels; i++ ) - { - DrawRowLabel( dc, rows[i] ); - } -} - -void wxGrid::DrawRowLabel( wxDC& dc, int row ) -{ - if ( GetRowHeight(row) <= 0 || m_rowLabelWidth <= 0 ) - return; - - wxGridCellAttrProvider * const - attrProvider = m_table ? m_table->GetAttrProvider() : NULL; - - // notice that an explicit static_cast is needed to avoid a compilation - // error with VC7.1 which, for some reason, tries to instantiate (abstract) - // wxGridRowHeaderRenderer class without it - const wxGridRowHeaderRenderer& - rend = attrProvider ? attrProvider->GetRowHeaderRenderer(row) - : static_cast - (gs_defaultHeaderRenderers.rowRenderer); - - wxRect rect(0, GetRowTop(row), m_rowLabelWidth, GetRowHeight(row)); - rend.DrawBorder(*this, dc, rect); - - int hAlign, vAlign; - GetRowLabelAlignment(&hAlign, &vAlign); - - rend.DrawLabel(*this, dc, GetRowLabelValue(row), - rect, hAlign, vAlign, wxHORIZONTAL); -} - -void wxGrid::UseNativeColHeader(bool native) -{ - if ( native == m_useNativeHeader ) - return; - - delete m_colWindow; - m_useNativeHeader = native; - - CreateColumnWindow(); - - if ( m_useNativeHeader ) - GetGridColHeader()->SetColumnCount(m_numCols); - CalcWindowSizes(); -} - -void wxGrid::SetUseNativeColLabels( bool native ) -{ - wxASSERT_MSG( !m_useNativeHeader, - "doesn't make sense when using native header" ); - - m_nativeColumnLabels = native; - if (native) - { - int height = wxRendererNative::Get().GetHeaderButtonHeight( this ); - SetColLabelSize( height ); - } - - GetColLabelWindow()->Refresh(); - m_cornerLabelWin->Refresh(); -} - -void wxGrid::DrawColLabels( wxDC& dc,const wxArrayInt& cols ) -{ - if ( !m_numCols ) - return; - - const size_t numLabels = cols.GetCount(); - for ( size_t i = 0; i < numLabels; i++ ) - { - DrawColLabel( dc, cols[i] ); - } -} - -void wxGrid::DrawCornerLabel(wxDC& dc) -{ - wxRect rect(wxSize(m_rowLabelWidth, m_colLabelHeight)); - - if ( m_nativeColumnLabels ) - { - rect.Deflate(1); - - wxRendererNative::Get().DrawHeaderButton(m_cornerLabelWin, dc, rect, 0); - } - else - { - rect.width++; - rect.height++; - - wxGridCellAttrProvider * const - attrProvider = m_table ? m_table->GetAttrProvider() : NULL; - const wxGridCornerHeaderRenderer& - rend = attrProvider ? attrProvider->GetCornerRenderer() - : static_cast - (gs_defaultHeaderRenderers.cornerRenderer); - - rend.DrawBorder(*this, dc, rect); - } -} - -void wxGrid::DrawColLabel(wxDC& dc, int col) -{ - if ( GetColWidth(col) <= 0 || m_colLabelHeight <= 0 ) - return; - - int colLeft = GetColLeft(col); - - wxRect rect(colLeft, 0, GetColWidth(col), m_colLabelHeight); - wxGridCellAttrProvider * const - attrProvider = m_table ? m_table->GetAttrProvider() : NULL; - const wxGridColumnHeaderRenderer& - rend = attrProvider ? attrProvider->GetColumnHeaderRenderer(col) - : static_cast - (gs_defaultHeaderRenderers.colRenderer); - - if ( m_nativeColumnLabels ) - { - wxRendererNative::Get().DrawHeaderButton - ( - GetColLabelWindow(), - dc, - rect, - 0, - IsSortingBy(col) - ? IsSortOrderAscending() - ? wxHDR_SORT_ICON_UP - : wxHDR_SORT_ICON_DOWN - : wxHDR_SORT_ICON_NONE - ); - rect.Deflate(2); - } - else - { - // It is reported that we need to erase the background to avoid display - // artefacts, see #12055. - wxDCBrushChanger setBrush(dc, m_colWindow->GetBackgroundColour()); - dc.DrawRectangle(rect); - - rend.DrawBorder(*this, dc, rect); - } - - int hAlign, vAlign; - GetColLabelAlignment(&hAlign, &vAlign); - const int orient = GetColLabelTextOrientation(); - - rend.DrawLabel(*this, dc, GetColLabelValue(col), rect, hAlign, vAlign, orient); -} - -// TODO: these 2 functions should be replaced with wxDC::DrawLabel() to which -// we just have to add textOrientation support -void wxGrid::DrawTextRectangle( wxDC& dc, - const wxString& value, - const wxRect& rect, - int horizAlign, - int vertAlign, - int textOrientation ) const -{ - wxArrayString lines; - - StringToLines( value, lines ); - - DrawTextRectangle(dc, lines, rect, horizAlign, vertAlign, textOrientation); -} - -void wxGrid::DrawTextRectangle(wxDC& dc, - const wxArrayString& lines, - const wxRect& rect, - int horizAlign, - int vertAlign, - int textOrientation) const -{ - if ( lines.empty() ) - return; - - wxDCClipper clip(dc, rect); - - long textWidth, - textHeight; - - if ( textOrientation == wxHORIZONTAL ) - GetTextBoxSize( dc, lines, &textWidth, &textHeight ); - else - GetTextBoxSize( dc, lines, &textHeight, &textWidth ); - - int x = 0, - y = 0; - switch ( vertAlign ) - { - case wxALIGN_BOTTOM: - if ( textOrientation == wxHORIZONTAL ) - y = rect.y + (rect.height - textHeight - 1); - else - x = rect.x + rect.width - textWidth; - break; - - case wxALIGN_CENTRE: - if ( textOrientation == wxHORIZONTAL ) - y = rect.y + ((rect.height - textHeight) / 2); - else - x = rect.x + ((rect.width - textWidth) / 2); - break; - - case wxALIGN_TOP: - default: - if ( textOrientation == wxHORIZONTAL ) - y = rect.y + 1; - else - x = rect.x + 1; - break; - } - - // Align each line of a multi-line label - size_t nLines = lines.GetCount(); - for ( size_t l = 0; l < nLines; l++ ) - { - const wxString& line = lines[l]; - - if ( line.empty() ) - { - *(textOrientation == wxHORIZONTAL ? &y : &x) += dc.GetCharHeight(); - continue; - } - - wxCoord lineWidth = 0, - lineHeight = 0; - dc.GetTextExtent(line, &lineWidth, &lineHeight); - - switch ( horizAlign ) - { - case wxALIGN_RIGHT: - if ( textOrientation == wxHORIZONTAL ) - x = rect.x + (rect.width - lineWidth - 1); - else - y = rect.y + lineWidth + 1; - break; - - case wxALIGN_CENTRE: - if ( textOrientation == wxHORIZONTAL ) - x = rect.x + ((rect.width - lineWidth) / 2); - else - y = rect.y + rect.height - ((rect.height - lineWidth) / 2); - break; - - case wxALIGN_LEFT: - default: - if ( textOrientation == wxHORIZONTAL ) - x = rect.x + 1; - else - y = rect.y + rect.height - 1; - break; - } - - if ( textOrientation == wxHORIZONTAL ) - { - dc.DrawText( line, x, y ); - y += lineHeight; - } - else - { - dc.DrawRotatedText( line, x, y, 90.0 ); - x += lineHeight; - } - } -} - -// Split multi-line text up into an array of strings. -// Any existing contents of the string array are preserved. -// -// TODO: refactor wxTextFile::Read() and reuse the same code from here -void wxGrid::StringToLines( const wxString& value, wxArrayString& lines ) const -{ - int startPos = 0; - int pos; - wxString eol = wxTextFile::GetEOL( wxTextFileType_Unix ); - wxString tVal = wxTextFile::Translate( value, wxTextFileType_Unix ); - - while ( startPos < (int)tVal.length() ) - { - pos = tVal.Mid(startPos).Find( eol ); - if ( pos < 0 ) - { - break; - } - else if ( pos == 0 ) - { - lines.Add( wxEmptyString ); - } - else - { - lines.Add( tVal.Mid(startPos, pos) ); - } - - startPos += pos + 1; - } - - if ( startPos < (int)tVal.length() ) - { - lines.Add( tVal.Mid( startPos ) ); - } -} - -void wxGrid::GetTextBoxSize( const wxDC& dc, - const wxArrayString& lines, - long *width, long *height ) const -{ - wxCoord w = 0; - wxCoord h = 0; - wxCoord lineW = 0, lineH = 0; - - size_t i; - for ( i = 0; i < lines.GetCount(); i++ ) - { - dc.GetTextExtent( lines[i], &lineW, &lineH ); - w = wxMax( w, lineW ); - h += lineH; - } - - *width = w; - *height = h; -} - -// -// ------ Batch processing. -// -void wxGrid::EndBatch() -{ - if ( m_batchCount > 0 ) - { - m_batchCount--; - if ( !m_batchCount ) - { - CalcDimensions(); - m_rowLabelWin->Refresh(); - m_colWindow->Refresh(); - m_cornerLabelWin->Refresh(); - m_gridWin->Refresh(); - } - } -} - -// Use this, rather than wxWindow::Refresh(), to force an immediate -// repainting of the grid. Has no effect if you are already inside a -// BeginBatch / EndBatch block. -// -void wxGrid::ForceRefresh() -{ - BeginBatch(); - EndBatch(); -} - -bool wxGrid::Enable(bool enable) -{ - if ( !wxScrolledWindow::Enable(enable) ) - return false; - - // redraw in the new state - m_gridWin->Refresh(); - - return true; -} - -// -// ------ Edit control functions -// - -void wxGrid::EnableEditing( bool edit ) -{ - if ( edit != m_editable ) - { - if (!edit) - EnableCellEditControl(edit); - m_editable = edit; - } -} - -void wxGrid::EnableCellEditControl( bool enable ) -{ - if (! m_editable) - return; - - if ( enable != m_cellEditCtrlEnabled ) - { - if ( enable ) - { - if ( SendEvent(wxEVT_GRID_EDITOR_SHOWN) == -1 ) - return; - - // this should be checked by the caller! - wxASSERT_MSG( CanEnableCellControl(), wxT("can't enable editing for this cell!") ); - - // do it before ShowCellEditControl() - m_cellEditCtrlEnabled = enable; - - ShowCellEditControl(); - } - else - { - SendEvent(wxEVT_GRID_EDITOR_HIDDEN); - - HideCellEditControl(); - SaveEditControlValue(); - - // do it after HideCellEditControl() - m_cellEditCtrlEnabled = enable; - } - } -} - -bool wxGrid::IsCurrentCellReadOnly() const -{ - wxGridCellAttr* - attr = const_cast(this)->GetCellAttr(m_currentCellCoords); - bool readonly = attr->IsReadOnly(); - attr->DecRef(); - - return readonly; -} - -bool wxGrid::CanEnableCellControl() const -{ - return m_editable && (m_currentCellCoords != wxGridNoCellCoords) && - !IsCurrentCellReadOnly(); -} - -bool wxGrid::IsCellEditControlEnabled() const -{ - // the cell edit control might be disable for all cells or just for the - // current one if it's read only - return m_cellEditCtrlEnabled ? !IsCurrentCellReadOnly() : false; -} - -bool wxGrid::IsCellEditControlShown() const -{ - bool isShown = false; - - if ( m_cellEditCtrlEnabled ) - { - int row = m_currentCellCoords.GetRow(); - int col = m_currentCellCoords.GetCol(); - wxGridCellAttr* attr = GetCellAttr(row, col); - wxGridCellEditor* editor = attr->GetEditor((wxGrid*) this, row, col); - attr->DecRef(); - - if ( editor ) - { - if ( editor->IsCreated() ) - { - isShown = editor->GetControl()->IsShown(); - } - - editor->DecRef(); - } - } - - return isShown; -} - -void wxGrid::ShowCellEditControl() -{ - if ( IsCellEditControlEnabled() ) - { - if ( !IsVisible( m_currentCellCoords, false ) ) - { - m_cellEditCtrlEnabled = false; - return; - } - else - { - wxRect rect = CellToRect( m_currentCellCoords ); - int row = m_currentCellCoords.GetRow(); - int col = m_currentCellCoords.GetCol(); - - // if this is part of a multicell, find owner (topleft) - int cell_rows, cell_cols; - GetCellSize( row, col, &cell_rows, &cell_cols ); - if ( cell_rows <= 0 || cell_cols <= 0 ) - { - row += cell_rows; - col += cell_cols; - m_currentCellCoords.SetRow( row ); - m_currentCellCoords.SetCol( col ); - } - - // erase the highlight and the cell contents because the editor - // might not cover the entire cell - wxClientDC dc( m_gridWin ); - PrepareDC( dc ); - wxGridCellAttr* attr = GetCellAttr(row, col); - dc.SetBrush(wxBrush(attr->GetBackgroundColour())); - dc.SetPen(*wxTRANSPARENT_PEN); - dc.DrawRectangle(rect); - - // convert to scrolled coords - CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); - - int nXMove = 0; - if (rect.x < 0) - nXMove = rect.x; - -#ifndef __WXQT__ - // cell is shifted by one pixel - // However, don't allow x or y to become negative - // since the SetSize() method interprets that as - // "don't change." - if (rect.x > 0) - rect.x--; - if (rect.y > 0) - rect.y--; -#else - // Substract 1 pixel in every dimension to fit in the cell area. - // If not, Qt will draw the control outside the cell. - rect.Deflate(1, 1); -#endif - - wxGridCellEditor* editor = attr->GetEditor(this, row, col); - if ( !editor->IsCreated() ) - { - editor->Create(m_gridWin, wxID_ANY, - new wxGridCellEditorEvtHandler(this, editor)); - - wxGridEditorCreatedEvent evt(GetId(), - wxEVT_GRID_EDITOR_CREATED, - this, - row, - col, - editor->GetControl()); - GetEventHandler()->ProcessEvent(evt); - } - - // resize editor to overflow into righthand cells if allowed - int maxWidth = rect.width; - wxString value = GetCellValue(row, col); - if ( (value != wxEmptyString) && (attr->GetOverflow()) ) - { - int y; - GetTextExtent(value, &maxWidth, &y, NULL, NULL, &attr->GetFont()); - if (maxWidth < rect.width) - maxWidth = rect.width; - } - - int client_right = m_gridWin->GetClientSize().GetWidth(); - if (rect.x + maxWidth > client_right) - maxWidth = client_right - rect.x; - - if ((maxWidth > rect.width) && (col < m_numCols) && m_table) - { - GetCellSize( row, col, &cell_rows, &cell_cols ); - // may have changed earlier - for (int i = col + cell_cols; i < m_numCols; i++) - { - int c_rows, c_cols; - GetCellSize( row, i, &c_rows, &c_cols ); - - // looks weird going over a multicell - if (m_table->IsEmptyCell( row, i ) && - (rect.width < maxWidth) && (c_rows == 1)) - { - rect.width += GetColWidth( i ); - } - else - break; - } - - if (rect.GetRight() > client_right) - rect.SetRight( client_right - 1 ); - } - - editor->SetCellAttr( attr ); - editor->SetSize( rect ); - if (nXMove != 0) - editor->GetControl()->Move( - editor->GetControl()->GetPosition().x + nXMove, - editor->GetControl()->GetPosition().y ); - editor->Show( true, attr ); - - // recalc dimensions in case we need to - // expand the scrolled window to account for editor - CalcDimensions(); - - editor->BeginEdit(row, col, this); - editor->SetCellAttr(NULL); - - editor->DecRef(); - attr->DecRef(); - } - } -} - -void wxGrid::HideCellEditControl() -{ - if ( IsCellEditControlEnabled() ) - { - int row = m_currentCellCoords.GetRow(); - int col = m_currentCellCoords.GetCol(); - - wxGridCellAttr *attr = GetCellAttr(row, col); - wxGridCellEditor *editor = attr->GetEditor(this, row, col); - const bool editorHadFocus = editor->GetControl()->HasFocus(); - editor->Show( false ); - editor->DecRef(); - attr->DecRef(); - - // return the focus to the grid itself if the editor had it - // - // note that we must not do this unconditionally to avoid stealing - // focus from the window which just received it if we are hiding the - // editor precisely because we lost focus - if ( editorHadFocus ) - m_gridWin->SetFocus(); - - // refresh whole row to the right - wxRect rect( CellToRect(row, col) ); - CalcScrolledPosition(rect.x, rect.y, &rect.x, &rect.y ); - rect.width = m_gridWin->GetClientSize().GetWidth() - rect.x; - -#ifdef __WXMAC__ - // ensure that the pixels under the focus ring get refreshed as well - rect.Inflate(10, 10); -#endif - - m_gridWin->Refresh( false, &rect ); - } -} - -void wxGrid::SaveEditControlValue() -{ - if ( IsCellEditControlEnabled() ) - { - int row = m_currentCellCoords.GetRow(); - int col = m_currentCellCoords.GetCol(); - - wxString oldval = GetCellValue(row, col); - - wxGridCellAttr* attr = GetCellAttr(row, col); - wxGridCellEditor* editor = attr->GetEditor(this, row, col); - - wxString newval; - bool changed = editor->EndEdit(row, col, this, oldval, &newval); - - if ( changed && SendEvent(wxEVT_GRID_CELL_CHANGING, newval) != -1 ) - { - editor->ApplyEdit(row, col, this); - - // for compatibility reasons dating back to wx 2.8 when this event - // was called wxEVT_GRID_CELL_CHANGE and wxEVT_GRID_CELL_CHANGING - // didn't exist we allow vetoing this one too - if ( SendEvent(wxEVT_GRID_CELL_CHANGED, oldval) == -1 ) - { - // Event has been vetoed, set the data back. - SetCellValue(row, col, oldval); - } - } - - editor->DecRef(); - attr->DecRef(); - } -} - -void wxGrid::OnHideEditor(wxCommandEvent& WXUNUSED(event)) -{ - DisableCellEditControl(); -} - -// -// ------ Grid location functions -// Note that all of these functions work with the logical coordinates of -// grid cells and labels so you will need to convert from device -// coordinates for mouse events etc. -// - -wxGridCellCoords wxGrid::XYToCell(int x, int y) const -{ - int row = YToRow(y); - int col = XToCol(x); - - return row == -1 || col == -1 ? wxGridNoCellCoords - : wxGridCellCoords(row, col); -} - -// compute row or column from some (unscrolled) coordinate value, using either -// m_defaultRowHeight/m_defaultColWidth or binary search on array of -// m_rowBottoms/m_colRights to do it quickly in O(log n) time. -// NOTE: This may not work correctly for reordered columns. -int wxGrid::PosToLinePos(int coord, - bool clipToMinMax, - const wxGridOperations& oper) const -{ - const int numLines = oper.GetNumberOfLines(this); - - if ( coord < 0 ) - return clipToMinMax && numLines > 0 ? 0 : wxNOT_FOUND; - - const int defaultLineSize = oper.GetDefaultLineSize(this); - wxCHECK_MSG( defaultLineSize, -1, "can't have 0 default line size" ); - - int maxPos = coord / defaultLineSize, - minPos = 0; - - // check for the simplest case: if we have no explicit line sizes - // configured, then we already know the line this position falls in - const wxArrayInt& lineEnds = oper.GetLineEnds(this); - if ( lineEnds.empty() ) - { - if ( maxPos < numLines ) - return maxPos; - - return clipToMinMax ? numLines - 1 : -1; - } - - - // binary search is quite efficient and we can't really make any assumptions - // on where to start here since row and columns could be of size 0 if they are - // hidden. While this could be made more efficient, some profiling will be - // necessary to determine if it really is a performance bottleneck - maxPos = numLines - 1; - - // check if the position is beyond the last column - const int lineAtMaxPos = oper.GetLineAt(this, maxPos); - if ( coord >= lineEnds[lineAtMaxPos] ) - return clipToMinMax ? maxPos : -1; - - // or before the first one - const int lineAt0 = oper.GetLineAt(this, 0); - if ( coord < lineEnds[lineAt0] ) - return 0; - - - // finally do perform the binary search - while ( minPos < maxPos ) - { - wxCHECK_MSG( lineEnds[oper.GetLineAt(this, minPos)] <= coord && - coord < lineEnds[oper.GetLineAt(this, maxPos)], - -1, - "wxGrid: internal error in PosToLinePos()" ); - - if ( coord >= lineEnds[oper.GetLineAt(this, maxPos - 1)] ) - return maxPos; - else - maxPos--; - - const int median = minPos + (maxPos - minPos + 1) / 2; - if ( coord < lineEnds[oper.GetLineAt(this, median)] ) - maxPos = median; - else - minPos = median; - } - - return maxPos; -} - -int -wxGrid::PosToLine(int coord, - bool clipToMinMax, - const wxGridOperations& oper) const -{ - int pos = PosToLinePos(coord, clipToMinMax, oper); - - return pos == wxNOT_FOUND ? wxNOT_FOUND : oper.GetLineAt(this, pos); -} - -int wxGrid::YToRow(int y, bool clipToMinMax) const -{ - return PosToLine(y, clipToMinMax, wxGridRowOperations()); -} - -int wxGrid::XToCol(int x, bool clipToMinMax) const -{ - return PosToLine(x, clipToMinMax, wxGridColumnOperations()); -} - -int wxGrid::XToPos(int x) const -{ - return PosToLinePos(x, true /* clip */, wxGridColumnOperations()); -} - -// return the row/col number such that the pos is near the edge of, or -1 if -// not near an edge. -// -// notice that position can only possibly be near an edge if the row/column is -// large enough to still allow for an "inner" area that is _not_ near the edge -// (i.e., if the height/width is smaller than WXGRID_LABEL_EDGE_ZONE, pos will -// _never_ be considered to be near the edge). -int wxGrid::PosToEdgeOfLine(int pos, const wxGridOperations& oper) const -{ - // Get the bottom or rightmost line that could match. - int line = oper.PosToLine(this, pos, true); - - if ( oper.GetLineSize(this, line) > WXGRID_LABEL_EDGE_ZONE ) - { - // We know that we are in this line, test whether we are close enough - // to start or end border, respectively. - if ( abs(oper.GetLineEndPos(this, line) - pos) < WXGRID_LABEL_EDGE_ZONE ) - return line; - else if ( line > 0 && - pos - oper.GetLineStartPos(this, - line) < WXGRID_LABEL_EDGE_ZONE ) - { - // We need to find the previous visible line, so skip all the - // hidden (of size 0) ones. - do - { - line = oper.GetLineBefore(this, line); - } - while ( line >= 0 && oper.GetLineSize(this, line) == 0 ); - - // It can possibly be -1 here. - return line; - } - } - - return -1; -} - -int wxGrid::YToEdgeOfRow(int y) const -{ - return PosToEdgeOfLine(y, wxGridRowOperations()); -} - -int wxGrid::XToEdgeOfCol(int x) const -{ - return PosToEdgeOfLine(x, wxGridColumnOperations()); -} - -wxRect wxGrid::CellToRect( int row, int col ) const -{ - wxRect rect( -1, -1, -1, -1 ); - - if ( row >= 0 && row < m_numRows && - col >= 0 && col < m_numCols ) - { - int i, cell_rows, cell_cols; - rect.width = rect.height = 0; - GetCellSize( row, col, &cell_rows, &cell_cols ); - // if negative then find multicell owner - if (cell_rows < 0) - row += cell_rows; - if (cell_cols < 0) - col += cell_cols; - GetCellSize( row, col, &cell_rows, &cell_cols ); - - rect.x = GetColLeft(col); - rect.y = GetRowTop(row); - for (i=col; i < col + cell_cols; i++) - rect.width += GetColWidth(i); - for (i=row; i < row + cell_rows; i++) - rect.height += GetRowHeight(i); - -#ifndef __WXQT__ - // if grid lines are enabled, then the area of the cell is a bit smaller - if (m_gridLinesEnabled) - { - rect.width -= 1; - rect.height -= 1; - } -#endif - } - - return rect; -} - -bool wxGrid::IsVisible( int row, int col, bool wholeCellVisible ) const -{ - // get the cell rectangle in logical coords - // - wxRect r( CellToRect( row, col ) ); - - // convert to device coords - // - int left, top, right, bottom; - CalcScrolledPosition( r.GetLeft(), r.GetTop(), &left, &top ); - CalcScrolledPosition( r.GetRight(), r.GetBottom(), &right, &bottom ); - - // check against the client area of the grid window - int cw, ch; - m_gridWin->GetClientSize( &cw, &ch ); - - if ( wholeCellVisible ) - { - // is the cell wholly visible ? - return ( left >= 0 && right <= cw && - top >= 0 && bottom <= ch ); - } - else - { - // is the cell partly visible ? - // - return ( ((left >= 0 && left < cw) || (right > 0 && right <= cw)) && - ((top >= 0 && top < ch) || (bottom > 0 && bottom <= ch)) ); - } -} - -// make the specified cell location visible by doing a minimal amount -// of scrolling -// -void wxGrid::MakeCellVisible( int row, int col ) -{ - int i; - int xpos = -1, ypos = -1; - - if ( row >= 0 && row < m_numRows && - col >= 0 && col < m_numCols ) - { - // get the cell rectangle in logical coords - wxRect r( CellToRect( row, col ) ); - - // convert to device coords - int left, top, right, bottom; - CalcScrolledPosition( r.GetLeft(), r.GetTop(), &left, &top ); - CalcScrolledPosition( r.GetRight(), r.GetBottom(), &right, &bottom ); - - int cw, ch; - m_gridWin->GetClientSize( &cw, &ch ); - - if ( top < 0 ) - { - ypos = r.GetTop(); - } - else if ( bottom > ch ) - { - int h = r.GetHeight(); - ypos = r.GetTop(); - for ( i = row - 1; i >= 0; i-- ) - { - int rowHeight = GetRowHeight(i); - if ( h + rowHeight > ch ) - break; - - h += rowHeight; - ypos -= rowHeight; - } - - // we divide it later by GRID_SCROLL_LINE, make sure that we don't - // have rounding errors (this is important, because if we do, - // we might not scroll at all and some cells won't be redrawn) - // - // Sometimes GRID_SCROLL_LINE / 2 is not enough, - // so just add a full scroll unit... - ypos += m_yScrollPixelsPerLine; - } - - // special handling for wide cells - show always left part of the cell! - // Otherwise, e.g. when stepping from row to row, it would jump between - // left and right part of the cell on every step! -// if ( left < 0 ) - if ( left < 0 || (right - left) >= cw ) - { - xpos = r.GetLeft(); - } - else if ( right > cw ) - { - // position the view so that the cell is on the right - int x0, y0; - CalcUnscrolledPosition(0, 0, &x0, &y0); - xpos = x0 + (right - cw); - - // see comment for ypos above - xpos += m_xScrollPixelsPerLine; - } - - if ( xpos != -1 || ypos != -1 ) - { - if ( xpos != -1 ) - xpos /= m_xScrollPixelsPerLine; - if ( ypos != -1 ) - ypos /= m_yScrollPixelsPerLine; - Scroll( xpos, ypos ); - AdjustScrollbars(); - } - } -} - -// -// ------ Grid cursor movement functions -// - -bool -wxGrid::DoMoveCursor(bool expandSelection, - const wxGridDirectionOperations& diroper) -{ - if ( m_currentCellCoords == wxGridNoCellCoords ) - return false; - - if ( expandSelection ) - { - wxGridCellCoords coords = m_selectedBlockCorner; - if ( coords == wxGridNoCellCoords ) - coords = m_currentCellCoords; - - if ( diroper.IsAtBoundary(coords) ) - return false; - - diroper.Advance(coords); - - UpdateBlockBeingSelected(m_currentCellCoords, coords); - } - else // don't expand selection - { - ClearSelection(); - - if ( diroper.IsAtBoundary(m_currentCellCoords) ) - return false; - - wxGridCellCoords coords = m_currentCellCoords; - diroper.Advance(coords); - - GoToCell(coords); - } - - return true; -} - -bool wxGrid::MoveCursorUp(bool expandSelection) -{ - return DoMoveCursor(expandSelection, - wxGridBackwardOperations(this, wxGridRowOperations())); -} - -bool wxGrid::MoveCursorDown(bool expandSelection) -{ - return DoMoveCursor(expandSelection, - wxGridForwardOperations(this, wxGridRowOperations())); -} - -bool wxGrid::MoveCursorLeft(bool expandSelection) -{ - return DoMoveCursor(expandSelection, - wxGridBackwardOperations(this, wxGridColumnOperations())); -} - -bool wxGrid::MoveCursorRight(bool expandSelection) -{ - return DoMoveCursor(expandSelection, - wxGridForwardOperations(this, wxGridColumnOperations())); -} - -bool wxGrid::DoMoveCursorByPage(const wxGridDirectionOperations& diroper) -{ - if ( m_currentCellCoords == wxGridNoCellCoords ) - return false; - - if ( diroper.IsAtBoundary(m_currentCellCoords) ) - return false; - - const int oldRow = m_currentCellCoords.GetRow(); - int newRow = diroper.MoveByPixelDistance(oldRow, m_gridWin->GetClientSize().y); - if ( newRow == oldRow ) - { - wxGridCellCoords coords(m_currentCellCoords); - diroper.Advance(coords); - newRow = coords.GetRow(); - } - - GoToCell(newRow, m_currentCellCoords.GetCol()); - - return true; -} - -bool wxGrid::MovePageUp() -{ - return DoMoveCursorByPage( - wxGridBackwardOperations(this, wxGridRowOperations())); -} - -bool wxGrid::MovePageDown() -{ - return DoMoveCursorByPage( - wxGridForwardOperations(this, wxGridRowOperations())); -} - -// helper of DoMoveCursorByBlock(): advance the cell coordinates using diroper -// until we find a non-empty cell or reach the grid end -void -wxGrid::AdvanceToNextNonEmpty(wxGridCellCoords& coords, - const wxGridDirectionOperations& diroper) -{ - while ( !diroper.IsAtBoundary(coords) ) - { - diroper.Advance(coords); - if ( !m_table->IsEmpty(coords) ) - break; - } -} - -bool -wxGrid::DoMoveCursorByBlock(bool expandSelection, - const wxGridDirectionOperations& diroper) -{ - if ( !m_table || m_currentCellCoords == wxGridNoCellCoords ) - return false; - - if ( diroper.IsAtBoundary(m_currentCellCoords) ) - return false; - - wxGridCellCoords coords(m_currentCellCoords); - if ( m_table->IsEmpty(coords) ) - { - // we are in an empty cell: find the next block of non-empty cells - AdvanceToNextNonEmpty(coords, diroper); - } - else // current cell is not empty - { - diroper.Advance(coords); - if ( m_table->IsEmpty(coords) ) - { - // we started at the end of a block, find the next one - AdvanceToNextNonEmpty(coords, diroper); - } - else // we're in a middle of a block - { - // go to the end of it, i.e. find the last cell before the next - // empty one - while ( !diroper.IsAtBoundary(coords) ) - { - wxGridCellCoords coordsNext(coords); - diroper.Advance(coordsNext); - if ( m_table->IsEmpty(coordsNext) ) - break; - - coords = coordsNext; - } - } - } - - if ( expandSelection ) - { - UpdateBlockBeingSelected(m_currentCellCoords, coords); - } - else - { - ClearSelection(); - GoToCell(coords); - } - - return true; -} - -bool wxGrid::MoveCursorUpBlock(bool expandSelection) -{ - return DoMoveCursorByBlock( - expandSelection, - wxGridBackwardOperations(this, wxGridRowOperations()) - ); -} - -bool wxGrid::MoveCursorDownBlock( bool expandSelection ) -{ - return DoMoveCursorByBlock( - expandSelection, - wxGridForwardOperations(this, wxGridRowOperations()) - ); -} - -bool wxGrid::MoveCursorLeftBlock( bool expandSelection ) -{ - return DoMoveCursorByBlock( - expandSelection, - wxGridBackwardOperations(this, wxGridColumnOperations()) - ); -} - -bool wxGrid::MoveCursorRightBlock( bool expandSelection ) -{ - return DoMoveCursorByBlock( - expandSelection, - wxGridForwardOperations(this, wxGridColumnOperations()) - ); -} - -// -// ------ Label values and formatting -// - -void wxGrid::GetRowLabelAlignment( int *horiz, int *vert ) const -{ - if ( horiz ) - *horiz = m_rowLabelHorizAlign; - if ( vert ) - *vert = m_rowLabelVertAlign; -} - -void wxGrid::GetColLabelAlignment( int *horiz, int *vert ) const -{ - if ( horiz ) - *horiz = m_colLabelHorizAlign; - if ( vert ) - *vert = m_colLabelVertAlign; -} - -int wxGrid::GetColLabelTextOrientation() const -{ - return m_colLabelTextOrientation; -} - -wxString wxGrid::GetRowLabelValue( int row ) const -{ - if ( m_table ) - { - return m_table->GetRowLabelValue( row ); - } - else - { - wxString s; - s << row; - return s; - } -} - -wxString wxGrid::GetColLabelValue( int col ) const -{ - if ( m_table ) - { - return m_table->GetColLabelValue( col ); - } - else - { - wxString s; - s << col; - return s; - } -} - -void wxGrid::SetRowLabelSize( int width ) -{ - wxASSERT( width >= 0 || width == wxGRID_AUTOSIZE ); - - if ( width == wxGRID_AUTOSIZE ) - { - width = CalcColOrRowLabelAreaMinSize(wxGRID_ROW); - } - - if ( width != m_rowLabelWidth ) - { - if ( width == 0 ) - { - m_rowLabelWin->Show( false ); - m_cornerLabelWin->Show( false ); - } - else if ( m_rowLabelWidth == 0 ) - { - m_rowLabelWin->Show( true ); - if ( m_colLabelHeight > 0 ) - m_cornerLabelWin->Show( true ); - } - - m_rowLabelWidth = width; - InvalidateBestSize(); - CalcWindowSizes(); - wxScrolledWindow::Refresh( true ); - } -} - -void wxGrid::SetColLabelSize( int height ) -{ - wxASSERT( height >=0 || height == wxGRID_AUTOSIZE ); - - if ( height == wxGRID_AUTOSIZE ) - { - height = CalcColOrRowLabelAreaMinSize(wxGRID_COLUMN); - } - - if ( height != m_colLabelHeight ) - { - if ( height == 0 ) - { - m_colWindow->Show( false ); - m_cornerLabelWin->Show( false ); - } - else if ( m_colLabelHeight == 0 ) - { - m_colWindow->Show( true ); - if ( m_rowLabelWidth > 0 ) - m_cornerLabelWin->Show( true ); - } - - m_colLabelHeight = height; - InvalidateBestSize(); - CalcWindowSizes(); - wxScrolledWindow::Refresh( true ); - } -} - -void wxGrid::SetLabelBackgroundColour( const wxColour& colour ) -{ - if ( m_labelBackgroundColour != colour ) - { - m_labelBackgroundColour = colour; - m_rowLabelWin->SetBackgroundColour( colour ); - m_colWindow->SetBackgroundColour( colour ); - m_cornerLabelWin->SetBackgroundColour( colour ); - - if ( !GetBatchCount() ) - { - m_rowLabelWin->Refresh(); - m_colWindow->Refresh(); - m_cornerLabelWin->Refresh(); - } - } -} - -void wxGrid::SetLabelTextColour( const wxColour& colour ) -{ - if ( m_labelTextColour != colour ) - { - m_labelTextColour = colour; - if ( !GetBatchCount() ) - { - m_rowLabelWin->Refresh(); - m_colWindow->Refresh(); - } - } -} - -void wxGrid::SetLabelFont( const wxFont& font ) -{ - m_labelFont = font; - if ( !GetBatchCount() ) - { - m_rowLabelWin->Refresh(); - m_colWindow->Refresh(); - } -} - -void wxGrid::SetRowLabelAlignment( int horiz, int vert ) -{ - // allow old (incorrect) defs to be used - switch ( horiz ) - { - case wxLEFT: horiz = wxALIGN_LEFT; break; - case wxRIGHT: horiz = wxALIGN_RIGHT; break; - case wxCENTRE: horiz = wxALIGN_CENTRE; break; - } - - switch ( vert ) - { - case wxTOP: vert = wxALIGN_TOP; break; - case wxBOTTOM: vert = wxALIGN_BOTTOM; break; - case wxCENTRE: vert = wxALIGN_CENTRE; break; - } - - if ( horiz == wxALIGN_LEFT || horiz == wxALIGN_CENTRE || horiz == wxALIGN_RIGHT ) - { - m_rowLabelHorizAlign = horiz; - } - - if ( vert == wxALIGN_TOP || vert == wxALIGN_CENTRE || vert == wxALIGN_BOTTOM ) - { - m_rowLabelVertAlign = vert; - } - - if ( !GetBatchCount() ) - { - m_rowLabelWin->Refresh(); - } -} - -void wxGrid::SetColLabelAlignment( int horiz, int vert ) -{ - // allow old (incorrect) defs to be used - switch ( horiz ) - { - case wxLEFT: horiz = wxALIGN_LEFT; break; - case wxRIGHT: horiz = wxALIGN_RIGHT; break; - case wxCENTRE: horiz = wxALIGN_CENTRE; break; - } - - switch ( vert ) - { - case wxTOP: vert = wxALIGN_TOP; break; - case wxBOTTOM: vert = wxALIGN_BOTTOM; break; - case wxCENTRE: vert = wxALIGN_CENTRE; break; - } - - if ( horiz == wxALIGN_LEFT || horiz == wxALIGN_CENTRE || horiz == wxALIGN_RIGHT ) - { - m_colLabelHorizAlign = horiz; - } - - if ( vert == wxALIGN_TOP || vert == wxALIGN_CENTRE || vert == wxALIGN_BOTTOM ) - { - m_colLabelVertAlign = vert; - } - - if ( !GetBatchCount() ) - { - m_colWindow->Refresh(); - } -} - -// Note: under MSW, the default column label font must be changed because it -// does not support vertical printing -// -// Example: -// pGrid->SetLabelFont(wxFontInfo(9).Family(wxFONTFAMILY_SWISS)); -// pGrid->SetColLabelTextOrientation(wxVERTICAL); -// -void wxGrid::SetColLabelTextOrientation( int textOrientation ) -{ - if ( textOrientation == wxHORIZONTAL || textOrientation == wxVERTICAL ) - m_colLabelTextOrientation = textOrientation; - - if ( !GetBatchCount() ) - m_colWindow->Refresh(); -} - -void wxGrid::SetRowLabelValue( int row, const wxString& s ) -{ - if ( m_table ) - { - m_table->SetRowLabelValue( row, s ); - if ( !GetBatchCount() ) - { - wxRect rect = CellToRect( row, 0 ); - if ( rect.height > 0 ) - { - CalcScrolledPosition(0, rect.y, &rect.x, &rect.y); - rect.x = 0; - rect.width = m_rowLabelWidth; - m_rowLabelWin->Refresh( true, &rect ); - } - } - } -} - -void wxGrid::SetColLabelValue( int col, const wxString& s ) -{ - if ( m_table ) - { - m_table->SetColLabelValue( col, s ); - if ( !GetBatchCount() ) - { - if ( m_useNativeHeader ) - { - GetGridColHeader()->UpdateColumn(col); - } - else - { - wxRect rect = CellToRect( 0, col ); - if ( rect.width > 0 ) - { - CalcScrolledPosition(rect.x, 0, &rect.x, &rect.y); - rect.y = 0; - rect.height = m_colLabelHeight; - GetColLabelWindow()->Refresh( true, &rect ); - } - } - } - } -} - -void wxGrid::SetGridLineColour( const wxColour& colour ) -{ - if ( m_gridLineColour != colour ) - { - m_gridLineColour = colour; - - if ( GridLinesEnabled() ) - RedrawGridLines(); - } -} - -void wxGrid::SetCellHighlightColour( const wxColour& colour ) -{ - if ( m_cellHighlightColour != colour ) - { - m_cellHighlightColour = colour; - - wxClientDC dc( m_gridWin ); - PrepareDC( dc ); - wxGridCellAttr* attr = GetCellAttr(m_currentCellCoords); - DrawCellHighlight(dc, attr); - attr->DecRef(); - } -} - -void wxGrid::SetCellHighlightPenWidth(int width) -{ - if (m_cellHighlightPenWidth != width) - { - m_cellHighlightPenWidth = width; - - // Just redrawing the cell highlight is not enough since that won't - // make any visible change if the thickness is getting smaller. - int row = m_currentCellCoords.GetRow(); - int col = m_currentCellCoords.GetCol(); - if ( row == -1 || col == -1 || GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 ) - return; - - wxRect rect = CellToRect(row, col); - m_gridWin->Refresh(true, &rect); - } -} - -void wxGrid::SetCellHighlightROPenWidth(int width) -{ - if (m_cellHighlightROPenWidth != width) - { - m_cellHighlightROPenWidth = width; - - // Just redrawing the cell highlight is not enough since that won't - // make any visible change if the thickness is getting smaller. - int row = m_currentCellCoords.GetRow(); - int col = m_currentCellCoords.GetCol(); - if ( row == -1 || col == -1 || - GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 ) - return; - - wxRect rect = CellToRect(row, col); - m_gridWin->Refresh(true, &rect); - } -} - -void wxGrid::RedrawGridLines() -{ - // the lines will be redrawn when the window is thawn - if ( GetBatchCount() ) - return; - - if ( GridLinesEnabled() ) - { - wxClientDC dc( m_gridWin ); - PrepareDC( dc ); - DrawAllGridLines( dc, wxRegion() ); - } - else // remove the grid lines - { - m_gridWin->Refresh(); - } -} - -void wxGrid::EnableGridLines( bool enable ) -{ - if ( enable != m_gridLinesEnabled ) - { - m_gridLinesEnabled = enable; - - RedrawGridLines(); - } -} - -void wxGrid::DoClipGridLines(bool& var, bool clip) -{ - if ( clip != var ) - { - var = clip; - - if ( GridLinesEnabled() ) - RedrawGridLines(); - } -} - -int wxGrid::GetDefaultRowSize() const -{ - return m_defaultRowHeight; -} - -int wxGrid::GetRowSize( int row ) const -{ - wxCHECK_MSG( row >= 0 && row < m_numRows, 0, wxT("invalid row index") ); - - return GetRowHeight(row); -} - -int wxGrid::GetDefaultColSize() const -{ - return m_defaultColWidth; -} - -int wxGrid::GetColSize( int col ) const -{ - wxCHECK_MSG( col >= 0 && col < m_numCols, 0, wxT("invalid column index") ); - - return GetColWidth(col); -} - -// ============================================================================ -// access to the grid attributes: each of them has a default value in the grid -// itself and may be overidden on a per-cell basis -// ============================================================================ - -// ---------------------------------------------------------------------------- -// setting default attributes -// ---------------------------------------------------------------------------- - -void wxGrid::SetDefaultCellBackgroundColour( const wxColour& col ) -{ - m_defaultCellAttr->SetBackgroundColour(col); -#if defined(__WXGTK__) || defined(__WXQT__) - m_gridWin->SetBackgroundColour(col); -#endif -} - -void wxGrid::SetDefaultCellTextColour( const wxColour& col ) -{ - m_defaultCellAttr->SetTextColour(col); -} - -void wxGrid::SetDefaultCellAlignment( int horiz, int vert ) -{ - m_defaultCellAttr->SetAlignment(horiz, vert); -} - -void wxGrid::SetDefaultCellOverflow( bool allow ) -{ - m_defaultCellAttr->SetOverflow(allow); -} - -void wxGrid::SetDefaultCellFont( const wxFont& font ) -{ - m_defaultCellAttr->SetFont(font); -} - -// For editors and renderers the type registry takes precedence over the -// default attr, so we need to register the new editor/renderer for the string -// data type in order to make setting a default editor/renderer appear to -// work correctly. - -void wxGrid::SetDefaultRenderer(wxGridCellRenderer *renderer) -{ - RegisterDataType(wxGRID_VALUE_STRING, - renderer, - GetDefaultEditorForType(wxGRID_VALUE_STRING)); -} - -void wxGrid::SetDefaultEditor(wxGridCellEditor *editor) -{ - RegisterDataType(wxGRID_VALUE_STRING, - GetDefaultRendererForType(wxGRID_VALUE_STRING), - editor); -} - -// ---------------------------------------------------------------------------- -// access to the default attributes -// ---------------------------------------------------------------------------- - -wxColour wxGrid::GetDefaultCellBackgroundColour() const -{ - return m_defaultCellAttr->GetBackgroundColour(); -} - -wxColour wxGrid::GetDefaultCellTextColour() const -{ - return m_defaultCellAttr->GetTextColour(); -} - -wxFont wxGrid::GetDefaultCellFont() const -{ - return m_defaultCellAttr->GetFont(); -} - -void wxGrid::GetDefaultCellAlignment( int *horiz, int *vert ) const -{ - m_defaultCellAttr->GetAlignment(horiz, vert); -} - -bool wxGrid::GetDefaultCellOverflow() const -{ - return m_defaultCellAttr->GetOverflow(); -} - -wxGridCellRenderer *wxGrid::GetDefaultRenderer() const -{ - return m_defaultCellAttr->GetRenderer(NULL, 0, 0); -} - -wxGridCellEditor *wxGrid::GetDefaultEditor() const -{ - return m_defaultCellAttr->GetEditor(NULL, 0, 0); -} - -// ---------------------------------------------------------------------------- -// access to cell attributes -// ---------------------------------------------------------------------------- - -wxColour wxGrid::GetCellBackgroundColour(int row, int col) const -{ - wxGridCellAttr *attr = GetCellAttr(row, col); - wxColour colour = attr->GetBackgroundColour(); - attr->DecRef(); - - return colour; -} - -wxColour wxGrid::GetCellTextColour( int row, int col ) const -{ - wxGridCellAttr *attr = GetCellAttr(row, col); - wxColour colour = attr->GetTextColour(); - attr->DecRef(); - - return colour; -} - -wxFont wxGrid::GetCellFont( int row, int col ) const -{ - wxGridCellAttr *attr = GetCellAttr(row, col); - wxFont font = attr->GetFont(); - attr->DecRef(); - - return font; -} - -void wxGrid::GetCellAlignment( int row, int col, int *horiz, int *vert ) const -{ - wxGridCellAttr *attr = GetCellAttr(row, col); - attr->GetAlignment(horiz, vert); - attr->DecRef(); -} - -bool wxGrid::GetCellOverflow( int row, int col ) const -{ - wxGridCellAttr *attr = GetCellAttr(row, col); - bool allow = attr->GetOverflow(); - attr->DecRef(); - - return allow; -} - -wxGrid::CellSpan -wxGrid::GetCellSize( int row, int col, int *num_rows, int *num_cols ) const -{ - wxGridCellAttr *attr = GetCellAttr(row, col); - attr->GetSize( num_rows, num_cols ); - attr->DecRef(); - - if ( *num_rows == 1 && *num_cols == 1 ) - return CellSpan_None; // just a normal cell - - if ( *num_rows < 0 || *num_cols < 0 ) - return CellSpan_Inside; // covered by a multi-span cell - - // this cell spans multiple cells to its right/bottom - return CellSpan_Main; -} - -wxGridCellRenderer* wxGrid::GetCellRenderer(int row, int col) const -{ - wxGridCellAttr* attr = GetCellAttr(row, col); - wxGridCellRenderer* renderer = attr->GetRenderer(this, row, col); - attr->DecRef(); - - return renderer; -} - -wxGridCellEditor* wxGrid::GetCellEditor(int row, int col) const -{ - wxGridCellAttr* attr = GetCellAttr(row, col); - wxGridCellEditor* editor = attr->GetEditor(this, row, col); - attr->DecRef(); - - return editor; -} - -bool wxGrid::IsReadOnly(int row, int col) const -{ - wxGridCellAttr* attr = GetCellAttr(row, col); - bool isReadOnly = attr->IsReadOnly(); - attr->DecRef(); - - return isReadOnly; -} - -// ---------------------------------------------------------------------------- -// attribute support: cache, automatic provider creation, ... -// ---------------------------------------------------------------------------- - -bool wxGrid::CanHaveAttributes() const -{ - if ( !m_table ) - { - return false; - } - - return m_table->CanHaveAttributes(); -} - -void wxGrid::ClearAttrCache() -{ - if ( m_attrCache.row != -1 ) - { - wxGridCellAttr *oldAttr = m_attrCache.attr; - m_attrCache.attr = NULL; - m_attrCache.row = -1; - // wxSafeDecRec(...) might cause event processing that accesses - // the cached attribute, if one exists (e.g. by deleting the - // editor stored within the attribute). Therefore it is important - // to invalidate the cache before calling wxSafeDecRef! - wxSafeDecRef(oldAttr); - } -} - -void wxGrid::RefreshAttr(int row, int col) -{ - if ( m_attrCache.row == row && m_attrCache.col == col ) - ClearAttrCache(); -} - - -void wxGrid::CacheAttr(int row, int col, wxGridCellAttr *attr) const -{ - if ( attr != NULL ) - { - wxGrid * const self = const_cast(this); - - self->ClearAttrCache(); - self->m_attrCache.row = row; - self->m_attrCache.col = col; - self->m_attrCache.attr = attr; - wxSafeIncRef(attr); - } -} - -bool wxGrid::LookupAttr(int row, int col, wxGridCellAttr **attr) const -{ - if ( row == m_attrCache.row && col == m_attrCache.col ) - { - *attr = m_attrCache.attr; - wxSafeIncRef(m_attrCache.attr); - -#ifdef DEBUG_ATTR_CACHE - gs_nAttrCacheHits++; -#endif - - return true; - } - else - { -#ifdef DEBUG_ATTR_CACHE - gs_nAttrCacheMisses++; -#endif - - return false; - } -} - -wxGridCellAttr *wxGrid::GetCellAttr(int row, int col) const -{ - wxGridCellAttr *attr = NULL; - // Additional test to avoid looking at the cache e.g. for - // wxNoCellCoords, as this will confuse memory management. - if ( row >= 0 ) - { - if ( !LookupAttr(row, col, &attr) ) - { - attr = m_table ? m_table->GetAttr(row, col, wxGridCellAttr::Any) - : NULL; - CacheAttr(row, col, attr); - } - } - - if (attr) - { - attr->SetDefAttr(m_defaultCellAttr); - } - else - { - attr = m_defaultCellAttr; - attr->IncRef(); - } - - return attr; -} - -wxGridCellAttr *wxGrid::GetOrCreateCellAttr(int row, int col) const -{ - wxGridCellAttr *attr = NULL; - bool canHave = ((wxGrid*)this)->CanHaveAttributes(); - - wxCHECK_MSG( canHave, attr, wxT("Cell attributes not allowed")); - wxCHECK_MSG( m_table, attr, wxT("must have a table") ); - - attr = m_table->GetAttr(row, col, wxGridCellAttr::Cell); - if ( !attr ) - { - attr = new wxGridCellAttr(m_defaultCellAttr); - - // artificially inc the ref count to match DecRef() in caller - attr->IncRef(); - m_table->SetAttr(attr, row, col); - } - - return attr; -} - -// ---------------------------------------------------------------------------- -// setting column attributes (wrappers around SetColAttr) -// ---------------------------------------------------------------------------- - -void wxGrid::SetColFormatBool(int col) -{ - SetColFormatCustom(col, wxGRID_VALUE_BOOL); -} - -void wxGrid::SetColFormatNumber(int col) -{ - SetColFormatCustom(col, wxGRID_VALUE_NUMBER); -} - -void wxGrid::SetColFormatFloat(int col, int width, int precision) -{ - wxString typeName = wxGRID_VALUE_FLOAT; - if ( (width != -1) || (precision != -1) ) - { - typeName << wxT(':') << width << wxT(',') << precision; - } - - SetColFormatCustom(col, typeName); -} - -void wxGrid::SetColFormatCustom(int col, const wxString& typeName) -{ - wxGridCellAttr *attr = m_table->GetAttr(-1, col, wxGridCellAttr::Col ); - if (!attr) - attr = new wxGridCellAttr; - wxGridCellRenderer *renderer = GetDefaultRendererForType(typeName); - attr->SetRenderer(renderer); - wxGridCellEditor *editor = GetDefaultEditorForType(typeName); - attr->SetEditor(editor); - - SetColAttr(col, attr); - -} - -// ---------------------------------------------------------------------------- -// setting cell attributes: this is forwarded to the table -// ---------------------------------------------------------------------------- - -void wxGrid::SetAttr(int row, int col, wxGridCellAttr *attr) -{ - if ( CanHaveAttributes() ) - { - m_table->SetAttr(attr, row, col); - ClearAttrCache(); - } - else - { - wxSafeDecRef(attr); - } -} - -void wxGrid::SetRowAttr(int row, wxGridCellAttr *attr) -{ - if ( CanHaveAttributes() ) - { - m_table->SetRowAttr(attr, row); - ClearAttrCache(); - } - else - { - wxSafeDecRef(attr); - } -} - -void wxGrid::SetColAttr(int col, wxGridCellAttr *attr) -{ - if ( CanHaveAttributes() ) - { - m_table->SetColAttr(attr, col); - ClearAttrCache(); - } - else - { - wxSafeDecRef(attr); - } -} - -void wxGrid::SetCellBackgroundColour( int row, int col, const wxColour& colour ) -{ - if ( CanHaveAttributes() ) - { - wxGridCellAttr *attr = GetOrCreateCellAttr(row, col); - attr->SetBackgroundColour(colour); - attr->DecRef(); - } -} - -void wxGrid::SetCellTextColour( int row, int col, const wxColour& colour ) -{ - if ( CanHaveAttributes() ) - { - wxGridCellAttr *attr = GetOrCreateCellAttr(row, col); - attr->SetTextColour(colour); - attr->DecRef(); - } -} - -void wxGrid::SetCellFont( int row, int col, const wxFont& font ) -{ - if ( CanHaveAttributes() ) - { - wxGridCellAttr *attr = GetOrCreateCellAttr(row, col); - attr->SetFont(font); - attr->DecRef(); - } -} - -void wxGrid::SetCellAlignment( int row, int col, int horiz, int vert ) -{ - if ( CanHaveAttributes() ) - { - wxGridCellAttr *attr = GetOrCreateCellAttr(row, col); - attr->SetAlignment(horiz, vert); - attr->DecRef(); - } -} - -void wxGrid::SetCellOverflow( int row, int col, bool allow ) -{ - if ( CanHaveAttributes() ) - { - wxGridCellAttr *attr = GetOrCreateCellAttr(row, col); - attr->SetOverflow(allow); - attr->DecRef(); - } -} - -void wxGrid::SetCellSize( int row, int col, int num_rows, int num_cols ) -{ - if ( CanHaveAttributes() ) - { - int cell_rows, cell_cols; - - wxGridCellAttr *attr = GetOrCreateCellAttr(row, col); - attr->GetSize(&cell_rows, &cell_cols); - attr->SetSize(num_rows, num_cols); - attr->DecRef(); - - // Cannot set the size of a cell to 0 or negative values - // While it is perfectly legal to do that, this function cannot - // handle all the possibilies, do it by hand by getting the CellAttr. - // You can only set the size of a cell to 1,1 or greater with this fn - wxASSERT_MSG( !((cell_rows < 1) || (cell_cols < 1)), - wxT("wxGrid::SetCellSize setting cell size that is already part of another cell")); - wxASSERT_MSG( !((num_rows < 1) || (num_cols < 1)), - wxT("wxGrid::SetCellSize setting cell size to < 1")); - - // if this was already a multicell then "turn off" the other cells first - if ((cell_rows > 1) || (cell_cols > 1)) - { - int i, j; - for (j=row; j < row + cell_rows; j++) - { - for (i=col; i < col + cell_cols; i++) - { - if ((i != col) || (j != row)) - { - wxGridCellAttr *attr_stub = GetOrCreateCellAttr(j, i); - attr_stub->SetSize( 1, 1 ); - attr_stub->DecRef(); - } - } - } - } - - // mark the cells that will be covered by this cell to - // negative or zero values to point back at this cell - if (((num_rows > 1) || (num_cols > 1)) && (num_rows >= 1) && (num_cols >= 1)) - { - int i, j; - for (j=row; j < row + num_rows; j++) - { - for (i=col; i < col + num_cols; i++) - { - if ((i != col) || (j != row)) - { - wxGridCellAttr *attr_stub = GetOrCreateCellAttr(j, i); - attr_stub->SetSize( row - j, col - i ); - attr_stub->DecRef(); - } - } - } - } - } -} - -void wxGrid::SetCellRenderer(int row, int col, wxGridCellRenderer *renderer) -{ - if ( CanHaveAttributes() ) - { - wxGridCellAttr *attr = GetOrCreateCellAttr(row, col); - attr->SetRenderer(renderer); - attr->DecRef(); - } -} - -void wxGrid::SetCellEditor(int row, int col, wxGridCellEditor* editor) -{ - if ( CanHaveAttributes() ) - { - wxGridCellAttr *attr = GetOrCreateCellAttr(row, col); - attr->SetEditor(editor); - attr->DecRef(); - } -} - -void wxGrid::SetReadOnly(int row, int col, bool isReadOnly) -{ - if ( CanHaveAttributes() ) - { - wxGridCellAttr *attr = GetOrCreateCellAttr(row, col); - attr->SetReadOnly(isReadOnly); - attr->DecRef(); - } -} - -// ---------------------------------------------------------------------------- -// Data type registration -// ---------------------------------------------------------------------------- - -void wxGrid::RegisterDataType(const wxString& typeName, - wxGridCellRenderer* renderer, - wxGridCellEditor* editor) -{ - m_typeRegistry->RegisterDataType(typeName, renderer, editor); -} - - -wxGridCellEditor * wxGrid::GetDefaultEditorForCell(int row, int col) const -{ - wxString typeName = m_table->GetTypeName(row, col); - return GetDefaultEditorForType(typeName); -} - -wxGridCellRenderer * wxGrid::GetDefaultRendererForCell(int row, int col) const -{ - wxString typeName = m_table->GetTypeName(row, col); - return GetDefaultRendererForType(typeName); -} - -wxGridCellEditor * wxGrid::GetDefaultEditorForType(const wxString& typeName) const -{ - int index = m_typeRegistry->FindOrCloneDataType(typeName); - if ( index == wxNOT_FOUND ) - { - wxFAIL_MSG(wxString::Format(wxT("Unknown data type name [%s]"), typeName.c_str())); - - return NULL; - } - - return m_typeRegistry->GetEditor(index); -} - -wxGridCellRenderer * wxGrid::GetDefaultRendererForType(const wxString& typeName) const -{ - int index = m_typeRegistry->FindOrCloneDataType(typeName); - if ( index == wxNOT_FOUND ) - { - wxFAIL_MSG(wxString::Format(wxT("Unknown data type name [%s]"), typeName.c_str())); - - return NULL; - } - - return m_typeRegistry->GetRenderer(index); -} - -// ---------------------------------------------------------------------------- -// row/col size -// ---------------------------------------------------------------------------- - -void wxGrid::DoDisableLineResize(int line, wxGridFixedIndicesSet *& setFixed) -{ - if ( !setFixed ) - { - setFixed = new wxGridFixedIndicesSet; - } - - setFixed->insert(line); -} - -bool -wxGrid::DoCanResizeLine(int line, const wxGridFixedIndicesSet *setFixed) const -{ - return !setFixed || !setFixed->count(line); -} - -void wxGrid::EnableDragRowSize( bool enable ) -{ - m_canDragRowSize = enable; -} - -void wxGrid::EnableDragColSize( bool enable ) -{ - m_canDragColSize = enable; -} - -void wxGrid::EnableDragGridSize( bool enable ) -{ - m_canDragGridSize = enable; -} - -void wxGrid::EnableDragCell( bool enable ) -{ - m_canDragCell = enable; -} - -void wxGrid::SetDefaultRowSize( int height, bool resizeExistingRows ) -{ - m_defaultRowHeight = wxMax( height, m_minAcceptableRowHeight ); - - if ( resizeExistingRows ) - { - // since we are resizing all rows to the default row size, - // we can simply clear the row heights and row bottoms - // arrays (which also allows us to take advantage of - // some speed optimisations) - m_rowHeights.Empty(); - m_rowBottoms.Empty(); - if ( !GetBatchCount() ) - CalcDimensions(); - } -} - -namespace -{ - -// This is a common part of SetRowSize() and SetColSize() which takes care of -// updating the height/width of a row/column depending on its current value and -// the new one. -// -// Returns the difference between the new and the old size. -int UpdateRowOrColSize(int& sizeCurrent, int sizeNew) -{ - // On input here sizeCurrent can be negative if it's currently hidden (the - // real size is its absolute value then). And sizeNew can be 0 to indicate - // that the row/column should be hidden or -1 to indicate that it should be - // shown again. - - if ( sizeNew < 0 ) - { - // We're showing back a previously hidden row/column. - wxASSERT_MSG( sizeNew == -1, wxS("New size must be positive or -1.") ); - - // If it's already visible, simply do nothing. - if ( sizeCurrent >= 0 ) - return 0; - - // Otherwise show it by restoring its old size. - sizeCurrent = -sizeCurrent; - - // This is positive which is correct. - return sizeCurrent; - } - else if ( sizeNew == 0 ) - { - // We're hiding a row/column. - - // If it's already hidden, simply do nothing. - if ( sizeCurrent <= 0 ) - return 0; - - // Otherwise hide it and also remember the shown size to be able to - // restore it later. - sizeCurrent = -sizeCurrent; - - // This is negative which is correct. - return sizeCurrent; - } - else // We're just changing the row/column size. - { - // Here it could have been hidden or not previously. - const int sizeOld = sizeCurrent < 0 ? 0 : sizeCurrent; - - sizeCurrent = sizeNew; - - return sizeCurrent - sizeOld; - } -} - -} // anonymous namespace - -void wxGrid::SetRowSize( int row, int height ) -{ - // See comment in SetColSize - if ( height > 0 && height < GetRowMinimalAcceptableHeight()) - return; - - // The value of -1 is special and means to fit the height to the row label. - // As with the columns, ignore attempts to auto-size the hidden rows. - if ( height == -1 && GetRowHeight(row) != 0 ) - { - long w, h; - wxArrayString lines; - wxClientDC dc(m_rowLabelWin); - dc.SetFont(GetLabelFont()); - StringToLines(GetRowLabelValue( row ), lines); - GetTextBoxSize( dc, lines, &w, &h ); - - // As with the columns, don't make the row smaller than minimal height. - height = wxMax(h, GetRowMinimalHeight(row)); - } - - DoSetRowSize(row, height); -} - -void wxGrid::DoSetRowSize( int row, int height ) -{ - wxCHECK_RET( row >= 0 && row < m_numRows, wxT("invalid row index") ); - - if ( m_rowHeights.IsEmpty() ) - { - // need to really create the array - InitRowHeights(); - } - - const int diff = UpdateRowOrColSize(m_rowHeights[row], height); - if ( !diff ) - return; - - for ( int i = row; i < m_numRows; i++ ) - { - m_rowBottoms[i] += diff; - } - - InvalidateBestSize(); - - if ( !GetBatchCount() ) - { - CalcDimensions(); - Refresh(); - } -} - -void wxGrid::SetDefaultColSize( int width, bool resizeExistingCols ) -{ - // we dont allow zero default column width - m_defaultColWidth = wxMax( wxMax( width, m_minAcceptableColWidth ), 1 ); - - if ( resizeExistingCols ) - { - // since we are resizing all columns to the default column size, - // we can simply clear the col widths and col rights - // arrays (which also allows us to take advantage of - // some speed optimisations) - m_colWidths.Empty(); - m_colRights.Empty(); - if ( !GetBatchCount() ) - CalcDimensions(); - } -} - -void wxGrid::SetColSize( int col, int width ) -{ - // we intentionally don't test whether the width is less than - // GetColMinimalWidth() here but we do compare it with - // GetColMinimalAcceptableWidth() as otherwise things currently break (see - // #651) -- and we also always allow the width of 0 as it has the special - // sense of hiding the column - if ( width > 0 && width < GetColMinimalAcceptableWidth() ) - return; - - // The value of -1 is special and means to fit the width to the column label. - // - // Notice that we currently don't support auto-sizing hidden columns (we - // could, but it's not clear whether this is really needed and it would - // make the code more complex), and for them passing -1 simply means to - // show the column back using its old size. - if ( width == -1 && GetColWidth(col) != 0 ) - { - long w, h; - wxArrayString lines; - wxClientDC dc(m_colWindow); - dc.SetFont(GetLabelFont()); - StringToLines(GetColLabelValue(col), lines); - if ( GetColLabelTextOrientation() == wxHORIZONTAL ) - GetTextBoxSize( dc, lines, &w, &h ); - else - GetTextBoxSize( dc, lines, &h, &w ); - width = w + 6; - - // Check that it is not less than the minimal width and do use the - // possibly greater than minimal-acceptable-width minimal-width itself - // here as we shouldn't become too small when auto-sizing, otherwise - // the column could be resized to be too small by double clicking its - // divider line (which ends up in a call to this function) even though - // it couldn't be resized to this size by dragging it. - width = wxMax(width, GetColMinimalWidth(col)); - } - - DoSetColSize(col, width); -} - -void wxGrid::DoSetColSize( int col, int width ) -{ - wxCHECK_RET( col >= 0 && col < m_numCols, wxT("invalid column index") ); - - if ( m_colWidths.IsEmpty() ) - { - // need to really create the array - InitColWidths(); - } - - const int diff = UpdateRowOrColSize(m_colWidths[col], width); - if ( !diff ) - return; - - if ( m_useNativeHeader ) - GetGridColHeader()->UpdateColumn(col); - //else: will be refreshed when the header is redrawn - - for ( int colPos = GetColPos(col); colPos < m_numCols; colPos++ ) - { - m_colRights[GetColAt(colPos)] += diff; - } - - InvalidateBestSize(); - - if ( !GetBatchCount() ) - { - CalcDimensions(); - Refresh(); - } -} - -void wxGrid::SetColMinimalWidth( int col, int width ) -{ - if (width > GetColMinimalAcceptableWidth()) - { - wxLongToLongHashMap::key_type key = (wxLongToLongHashMap::key_type)col; - m_colMinWidths[key] = width; - } -} - -void wxGrid::SetRowMinimalHeight( int row, int width ) -{ - if (width > GetRowMinimalAcceptableHeight()) - { - wxLongToLongHashMap::key_type key = (wxLongToLongHashMap::key_type)row; - m_rowMinHeights[key] = width; - } -} - -int wxGrid::GetColMinimalWidth(int col) const -{ - wxLongToLongHashMap::key_type key = (wxLongToLongHashMap::key_type)col; - wxLongToLongHashMap::const_iterator it = m_colMinWidths.find(key); - - return it != m_colMinWidths.end() ? (int)it->second : m_minAcceptableColWidth; -} - -int wxGrid::GetRowMinimalHeight(int row) const -{ - wxLongToLongHashMap::key_type key = (wxLongToLongHashMap::key_type)row; - wxLongToLongHashMap::const_iterator it = m_rowMinHeights.find(key); - - return it != m_rowMinHeights.end() ? (int)it->second : m_minAcceptableRowHeight; -} - -void wxGrid::SetColMinimalAcceptableWidth( int width ) -{ - // We do allow a width of 0 since this gives us - // an easy way to temporarily hiding columns. - if ( width >= 0 ) - m_minAcceptableColWidth = width; -} - -void wxGrid::SetRowMinimalAcceptableHeight( int height ) -{ - // We do allow a height of 0 since this gives us - // an easy way to temporarily hiding rows. - if ( height >= 0 ) - m_minAcceptableRowHeight = height; -} - -int wxGrid::GetColMinimalAcceptableWidth() const -{ - return m_minAcceptableColWidth; -} - -int wxGrid::GetRowMinimalAcceptableHeight() const -{ - return m_minAcceptableRowHeight; -} - -// ---------------------------------------------------------------------------- -// auto sizing -// ---------------------------------------------------------------------------- - -void -wxGrid::AutoSizeColOrRow(int colOrRow, bool setAsMin, wxGridDirection direction) -{ - const bool column = direction == wxGRID_COLUMN; - - // We don't support auto-sizing hidden rows or columns, this doesn't seem - // to make much sense. - if ( column ) - { - if ( GetColWidth(colOrRow) == 0 ) - return; - } - else - { - if ( GetRowHeight(colOrRow) == 0 ) - return; - } - - wxClientDC dc(m_gridWin); - - // cancel editing of cell - HideCellEditControl(); - SaveEditControlValue(); - - // initialize both of them just to avoid compiler warnings even if only - // really needs to be initialized here - int row, - col; - if ( column ) - { - row = -1; - col = colOrRow; - } - else - { - row = colOrRow; - col = -1; - } - - wxCoord extent, extentMax = 0; - int max = column ? m_numRows : m_numCols; - for ( int rowOrCol = 0; rowOrCol < max; rowOrCol++ ) - { - if ( column ) - { - if ( !IsRowShown(rowOrCol) ) - continue; - - row = rowOrCol; - col = colOrRow; - } - else - { - if ( !IsColShown(rowOrCol) ) - continue; - - row = colOrRow; - col = rowOrCol; - } - - // we need to account for the cells spanning multiple columns/rows: - // while they may need a lot of space, they don't need all of it in - // this column/row - int numRows, numCols; - const CellSpan span = GetCellSize(row, col, &numRows, &numCols); - if ( span == CellSpan_Inside ) - { - // we need to get the size of the main cell, not of a cell hidden - // by it - row += numRows; - col += numCols; - - // get the size of the main cell too - GetCellSize(row, col, &numRows, &numCols); - } - - // get cell ( main cell if CellSpan_Inside ) renderer best size - wxGridCellAttr *attr = GetCellAttr(row, col); - wxGridCellRenderer *renderer = attr->GetRenderer(this, row, col); - if ( renderer ) - { - extent = column - ? renderer->GetBestWidth(*this, *attr, dc, row, col, - GetRowHeight(row)) - : renderer->GetBestHeight(*this, *attr, dc, row, col, - GetColWidth(col)); - - if ( span != CellSpan_None ) - { - // we spread the size of a spanning cell over all the cells it - // covers evenly -- this is probably not ideal but we can't - // really do much better here - // - // notice that numCols and numRows are never 0 as they - // correspond to the size of the main cell of the span and not - // of the cell inside it - extent /= column ? numCols : numRows; - } - - if ( extent > extentMax ) - extentMax = extent; - - renderer->DecRef(); - } - - attr->DecRef(); - } - - // now also compare with the column label extent - wxCoord w, h; - dc.SetFont( GetLabelFont() ); - - if ( column ) - { - dc.GetMultiLineTextExtent( GetColLabelValue(colOrRow), &w, &h ); - if ( GetColLabelTextOrientation() == wxVERTICAL ) - w = h; - } - else - dc.GetMultiLineTextExtent( GetRowLabelValue(colOrRow), &w, &h ); - - extent = column ? w : h; - if ( extent > extentMax ) - extentMax = extent; - - if ( !extentMax ) - { - // empty column - give default extent (notice that if extentMax is less - // than default extent but != 0, it's OK) - extentMax = column ? m_defaultColWidth : m_defaultRowHeight; - } - else - { - if ( column ) - // leave some space around text - extentMax += 10; - else - extentMax += 6; - } - - if ( column ) - { - // Ensure automatic width is not less than minimal width. See the - // comment in SetColSize() for explanation of why this isn't done - // in SetColSize(). - if ( !setAsMin ) - extentMax = wxMax(extentMax, GetColMinimalWidth(colOrRow)); - - SetColSize( colOrRow, extentMax ); - if ( !GetBatchCount() ) - { - if ( m_useNativeHeader ) - { - GetGridColHeader()->UpdateColumn(colOrRow); - } - else - { - int cw, ch, dummy; - m_gridWin->GetClientSize( &cw, &ch ); - wxRect rect ( CellToRect( 0, colOrRow ) ); - rect.y = 0; - CalcScrolledPosition(rect.x, 0, &rect.x, &dummy); - rect.width = cw - rect.x; - rect.height = m_colLabelHeight; - GetColLabelWindow()->Refresh( true, &rect ); - } - } - } - else - { - // Ensure automatic width is not less than minimal height. See the - // comment in SetColSize() for explanation of why this isn't done - // in SetRowSize(). - if ( !setAsMin ) - extentMax = wxMax(extentMax, GetRowMinimalHeight(colOrRow)); - - SetRowSize(colOrRow, extentMax); - if ( !GetBatchCount() ) - { - int cw, ch, dummy; - m_gridWin->GetClientSize( &cw, &ch ); - wxRect rect( CellToRect( colOrRow, 0 ) ); - rect.x = 0; - CalcScrolledPosition(0, rect.y, &dummy, &rect.y); - rect.width = m_rowLabelWidth; - rect.height = ch - rect.y; - m_rowLabelWin->Refresh( true, &rect ); - } - } - - if ( setAsMin ) - { - if ( column ) - SetColMinimalWidth(colOrRow, extentMax); - else - SetRowMinimalHeight(colOrRow, extentMax); - } -} - -wxCoord wxGrid::CalcColOrRowLabelAreaMinSize(wxGridDirection direction) -{ - // calculate size for the rows or columns? - const bool calcRows = direction == wxGRID_ROW; - - wxClientDC dc(calcRows ? GetGridRowLabelWindow() - : GetGridColLabelWindow()); - dc.SetFont(GetLabelFont()); - - // which dimension should we take into account for calculations? - // - // for columns, the text can be only horizontal so it's easy but for rows - // we also have to take into account the text orientation - const bool - useWidth = calcRows || (GetColLabelTextOrientation() == wxVERTICAL); - - wxArrayString lines; - wxCoord extentMax = 0; - - const int numRowsOrCols = calcRows ? m_numRows : m_numCols; - for ( int rowOrCol = 0; rowOrCol < numRowsOrCols; rowOrCol++ ) - { - lines.Clear(); - - wxString label = calcRows ? GetRowLabelValue(rowOrCol) - : GetColLabelValue(rowOrCol); - StringToLines(label, lines); - - long w, h; - GetTextBoxSize(dc, lines, &w, &h); - - const wxCoord extent = useWidth ? w : h; - if ( extent > extentMax ) - extentMax = extent; - } - - if ( !extentMax ) - { - // empty column - give default extent (notice that if extentMax is less - // than default extent but != 0, it's OK) - extentMax = calcRows ? GetDefaultRowLabelSize() - : GetDefaultColLabelSize(); - } - - // leave some space around text (taken from AutoSizeColOrRow) - if ( calcRows ) - extentMax += 10; - else - extentMax += 6; - - return extentMax; -} - -int wxGrid::SetOrCalcColumnSizes(bool calcOnly, bool setAsMin) -{ - int width = m_rowLabelWidth; - - wxGridUpdateLocker locker; - if(!calcOnly) - locker.Create(this); - - for ( int col = 0; col < m_numCols; col++ ) - { - if ( !calcOnly ) - AutoSizeColumn(col, setAsMin); - - width += GetColWidth(col); - } - - return width; -} - -int wxGrid::SetOrCalcRowSizes(bool calcOnly, bool setAsMin) -{ - int height = m_colLabelHeight; - - wxGridUpdateLocker locker; - if(!calcOnly) - locker.Create(this); - - for ( int row = 0; row < m_numRows; row++ ) - { - if ( !calcOnly ) - AutoSizeRow(row, setAsMin); - - height += GetRowHeight(row); - } - - return height; -} - -void wxGrid::AutoSize() -{ - wxGridUpdateLocker locker(this); - - wxSize size(SetOrCalcColumnSizes(false) - m_rowLabelWidth + m_extraWidth, - SetOrCalcRowSizes(false) - m_colLabelHeight + m_extraHeight); - - // we know that we're not going to have scrollbars so disable them now to - // avoid trouble in SetClientSize() which can otherwise set the correct - // client size but also leave space for (not needed any more) scrollbars - SetScrollbars(m_xScrollPixelsPerLine, m_yScrollPixelsPerLine, - 0, 0, 0, 0, true); - - SetClientSize(size.x + m_rowLabelWidth, size.y + m_colLabelHeight); -} - -void wxGrid::AutoSizeRowLabelSize( int row ) -{ - // Hide the edit control, so it - // won't interfere with drag-shrinking. - if ( IsCellEditControlShown() ) - { - HideCellEditControl(); - SaveEditControlValue(); - } - - // autosize row height depending on label text - SetRowSize(row, -1); - - ForceRefresh(); -} - -void wxGrid::AutoSizeColLabelSize( int col ) -{ - // Hide the edit control, so it - // won't interfere with drag-shrinking. - if ( IsCellEditControlShown() ) - { - HideCellEditControl(); - SaveEditControlValue(); - } - - // autosize column width depending on label text - SetColSize(col, -1); - - ForceRefresh(); -} - -wxSize wxGrid::DoGetBestSize() const -{ - wxGrid * const self = const_cast(this); - - // we do the same as in AutoSize() here with the exception that we don't - // change the column/row sizes, only calculate them - wxSize size(self->SetOrCalcColumnSizes(true) - m_rowLabelWidth + m_extraWidth, - self->SetOrCalcRowSizes(true) - m_colLabelHeight + m_extraHeight); - - return wxSize(size.x + m_rowLabelWidth, size.y + m_colLabelHeight) - + GetWindowBorderSize(); -} - -void wxGrid::Fit() -{ - AutoSize(); -} - -#if WXWIN_COMPATIBILITY_2_8 -wxPen& wxGrid::GetDividerPen() const -{ - return wxNullPen; -} -#endif // WXWIN_COMPATIBILITY_2_8 - -// ---------------------------------------------------------------------------- -// cell value accessor functions -// ---------------------------------------------------------------------------- - -void wxGrid::SetCellValue( int row, int col, const wxString& s ) -{ - if ( m_table ) - { - m_table->SetValue( row, col, s ); - if ( !GetBatchCount() ) - { - int dummy; - wxRect rect( CellToRect( row, col ) ); - rect.x = 0; - rect.width = m_gridWin->GetClientSize().GetWidth(); - CalcScrolledPosition(0, rect.y, &dummy, &rect.y); - m_gridWin->Refresh( false, &rect ); - } - - if ( m_currentCellCoords.GetRow() == row && - m_currentCellCoords.GetCol() == col && - IsCellEditControlShown()) - // Note: If we are using IsCellEditControlEnabled, - // this interacts badly with calling SetCellValue from - // an EVT_GRID_CELL_CHANGE handler. - { - HideCellEditControl(); - ShowCellEditControl(); // will reread data from table - } - } -} - -// ---------------------------------------------------------------------------- -// block, row and column selection -// ---------------------------------------------------------------------------- - -void wxGrid::SelectRow( int row, bool addToSelected ) -{ - if ( !m_selection ) - return; - - if ( !addToSelected ) - ClearSelection(); - - m_selection->SelectRow(row); -} - -void wxGrid::SelectCol( int col, bool addToSelected ) -{ - if ( !m_selection ) - return; - - if ( !addToSelected ) - ClearSelection(); - - m_selection->SelectCol(col); -} - -void wxGrid::SelectBlock(int topRow, int leftCol, int bottomRow, int rightCol, - bool addToSelected) -{ - if ( !m_selection ) - return; - - if ( !addToSelected ) - ClearSelection(); - - m_selection->SelectBlock(topRow, leftCol, bottomRow, rightCol); -} - -void wxGrid::SelectAll() -{ - if ( m_numRows > 0 && m_numCols > 0 ) - { - if ( m_selection ) - m_selection->SelectBlock( 0, 0, m_numRows - 1, m_numCols - 1 ); - } -} - -// ---------------------------------------------------------------------------- -// cell, row and col deselection -// ---------------------------------------------------------------------------- - -void wxGrid::DeselectLine(int line, const wxGridOperations& oper) -{ - if ( !m_selection ) - return; - - const wxGridSelectionModes mode = m_selection->GetSelectionMode(); - if ( mode == oper.GetSelectionMode() || - mode == wxGrid::wxGridSelectRowsOrColumns ) - { - const wxGridCellCoords c(oper.MakeCoords(line, 0)); - if ( m_selection->IsInSelection(c) ) - m_selection->ToggleCellSelection(c); - } - else if ( mode != oper.Dual().GetSelectionMode() ) - { - const int nOther = oper.Dual().GetNumberOfLines(this); - for ( int i = 0; i < nOther; i++ ) - { - const wxGridCellCoords c(oper.MakeCoords(line, i)); - if ( m_selection->IsInSelection(c) ) - m_selection->ToggleCellSelection(c); - } - } - //else: can only select orthogonal lines so no lines in this direction - // could have been selected anyhow -} - -void wxGrid::DeselectRow(int row) -{ - DeselectLine(row, wxGridRowOperations()); -} - -void wxGrid::DeselectCol(int col) -{ - DeselectLine(col, wxGridColumnOperations()); -} - -void wxGrid::DeselectCell( int row, int col ) -{ - if ( m_selection && m_selection->IsInSelection(row, col) ) - m_selection->ToggleCellSelection(row, col); -} - -bool wxGrid::IsSelection() const -{ - return ( m_selection && (m_selection->IsSelection() || - ( m_selectedBlockTopLeft != wxGridNoCellCoords && - m_selectedBlockBottomRight != wxGridNoCellCoords) ) ); -} - -bool wxGrid::IsInSelection( int row, int col ) const -{ - return ( m_selection && (m_selection->IsInSelection( row, col ) || - ( row >= m_selectedBlockTopLeft.GetRow() && - col >= m_selectedBlockTopLeft.GetCol() && - row <= m_selectedBlockBottomRight.GetRow() && - col <= m_selectedBlockBottomRight.GetCol() )) ); -} - -wxGridCellCoordsArray wxGrid::GetSelectedCells() const -{ - if (!m_selection) - { - wxGridCellCoordsArray a; - return a; - } - - return m_selection->m_cellSelection; -} - -wxGridCellCoordsArray wxGrid::GetSelectionBlockTopLeft() const -{ - if (!m_selection) - { - wxGridCellCoordsArray a; - return a; - } - - return m_selection->m_blockSelectionTopLeft; -} - -wxGridCellCoordsArray wxGrid::GetSelectionBlockBottomRight() const -{ - if (!m_selection) - { - wxGridCellCoordsArray a; - return a; - } - - return m_selection->m_blockSelectionBottomRight; -} - -wxArrayInt wxGrid::GetSelectedRows() const -{ - if (!m_selection) - { - wxArrayInt a; - return a; - } - - return m_selection->m_rowSelection; -} - -wxArrayInt wxGrid::GetSelectedCols() const -{ - if (!m_selection) - { - wxArrayInt a; - return a; - } - - return m_selection->m_colSelection; -} - -void wxGrid::ClearSelection() -{ - wxRect r1 = BlockToDeviceRect(m_selectedBlockTopLeft, - m_selectedBlockBottomRight); - wxRect r2 = BlockToDeviceRect(m_currentCellCoords, - m_selectedBlockCorner); - - m_selectedBlockTopLeft = - m_selectedBlockBottomRight = - m_selectedBlockCorner = wxGridNoCellCoords; - - if ( !r1.IsEmpty() ) - RefreshRect(r1, false); - if ( !r2.IsEmpty() ) - RefreshRect(r2, false); - - if ( m_selection ) - m_selection->ClearSelection(); -} - -// This function returns the rectangle that encloses the given block -// in device coords clipped to the client size of the grid window. -// -wxRect wxGrid::BlockToDeviceRect( const wxGridCellCoords& topLeft, - const wxGridCellCoords& bottomRight ) const -{ - wxRect resultRect; - wxRect tempCellRect = CellToRect(topLeft); - if ( tempCellRect != wxGridNoCellRect ) - { - resultRect = tempCellRect; - } - else - { - resultRect = wxRect(0, 0, 0, 0); - } - - tempCellRect = CellToRect(bottomRight); - if ( tempCellRect != wxGridNoCellRect ) - { - resultRect += tempCellRect; - } - else - { - // If both inputs were "wxGridNoCellRect," then there's nothing to do. - return wxGridNoCellRect; - } - - // Ensure that left/right and top/bottom pairs are in order. - int left = resultRect.GetLeft(); - int top = resultRect.GetTop(); - int right = resultRect.GetRight(); - int bottom = resultRect.GetBottom(); - - int leftCol = topLeft.GetCol(); - int topRow = topLeft.GetRow(); - int rightCol = bottomRight.GetCol(); - int bottomRow = bottomRight.GetRow(); - - if (left > right) - { - int tmp = left; - left = right; - right = tmp; - - tmp = leftCol; - leftCol = rightCol; - rightCol = tmp; - } - - if (top > bottom) - { - int tmp = top; - top = bottom; - bottom = tmp; - - tmp = topRow; - topRow = bottomRow; - bottomRow = tmp; - } - - // The following loop is ONLY necessary to detect and handle merged cells. - int cw, ch; - m_gridWin->GetClientSize( &cw, &ch ); - - // Get the origin coordinates: notice that they will be negative if the - // grid is scrolled downwards/to the right. - int gridOriginX = 0; - int gridOriginY = 0; - CalcScrolledPosition(gridOriginX, gridOriginY, &gridOriginX, &gridOriginY); - - int onScreenLeftmostCol = internalXToCol(-gridOriginX); - int onScreenUppermostRow = internalYToRow(-gridOriginY); - - int onScreenRightmostCol = internalXToCol(-gridOriginX + cw); - int onScreenBottommostRow = internalYToRow(-gridOriginY + ch); - - // Bound our loop so that we only examine the portion of the selected block - // that is shown on screen. Therefore, we compare the Top-Left block values - // to the Top-Left screen values, and the Bottom-Right block values to the - // Bottom-Right screen values, choosing appropriately. - const int visibleTopRow = wxMax(topRow, onScreenUppermostRow); - const int visibleBottomRow = wxMin(bottomRow, onScreenBottommostRow); - const int visibleLeftCol = wxMax(leftCol, onScreenLeftmostCol); - const int visibleRightCol = wxMin(rightCol, onScreenRightmostCol); - - for ( int j = visibleTopRow; j <= visibleBottomRow; j++ ) - { - for ( int i = visibleLeftCol; i <= visibleRightCol; i++ ) - { - if ( (j == visibleTopRow) || (j == visibleBottomRow) || - (i == visibleLeftCol) || (i == visibleRightCol) ) - { - tempCellRect = CellToRect( j, i ); - - if (tempCellRect.x < left) - left = tempCellRect.x; - if (tempCellRect.y < top) - top = tempCellRect.y; - if (tempCellRect.x + tempCellRect.width > right) - right = tempCellRect.x + tempCellRect.width; - if (tempCellRect.y + tempCellRect.height > bottom) - bottom = tempCellRect.y + tempCellRect.height; - } - else - { - i = visibleRightCol; // jump over inner cells. - } - } - } - - // Convert to scrolled coords - CalcScrolledPosition( left, top, &left, &top ); - CalcScrolledPosition( right, bottom, &right, &bottom ); - - if (right < 0 || bottom < 0 || left > cw || top > ch) - return wxRect(0,0,0,0); - - resultRect.SetLeft( wxMax(0, left) ); - resultRect.SetTop( wxMax(0, top) ); - resultRect.SetRight( wxMin(cw, right) ); - resultRect.SetBottom( wxMin(ch, bottom) ); - - return resultRect; -} - -void wxGrid::DoSetSizes(const wxGridSizesInfo& sizeInfo, - const wxGridOperations& oper) -{ - BeginBatch(); - oper.SetDefaultLineSize(this, sizeInfo.m_sizeDefault, true); - const int numLines = oper.GetNumberOfLines(this); - for ( int i = 0; i < numLines; i++ ) - { - int size = sizeInfo.GetSize(i); - if ( size != sizeInfo.m_sizeDefault) - oper.SetLineSize(this, i, size); - } - EndBatch(); -} - -void wxGrid::SetColSizes(const wxGridSizesInfo& sizeInfo) -{ - DoSetSizes(sizeInfo, wxGridColumnOperations()); -} - -void wxGrid::SetRowSizes(const wxGridSizesInfo& sizeInfo) -{ - DoSetSizes(sizeInfo, wxGridRowOperations()); -} - -wxGridSizesInfo::wxGridSizesInfo(int defSize, const wxArrayInt& allSizes) -{ - m_sizeDefault = defSize; - for ( size_t i = 0; i < allSizes.size(); i++ ) - { - if ( allSizes[i] != defSize ) - m_customSizes[i] = allSizes[i]; - } -} - -int wxGridSizesInfo::GetSize(unsigned pos) const -{ - wxUnsignedToIntHashMap::const_iterator it = m_customSizes.find(pos); - - // if it's not found return the default - if ( it == m_customSizes.end() ) - return m_sizeDefault; - - // otherwise return 0 if it's hidden, currently there is no way to get - // its size before it had been hidden - if ( it->second < 0 ) - return 0; - - return it->second; -} - -// ---------------------------------------------------------------------------- -// drop target -// ---------------------------------------------------------------------------- - -#if wxUSE_DRAG_AND_DROP - -// this allow setting drop target directly on wxGrid -void wxGrid::SetDropTarget(wxDropTarget *dropTarget) -{ - GetGridWindow()->SetDropTarget(dropTarget); -} - -#endif // wxUSE_DRAG_AND_DROP - -// ---------------------------------------------------------------------------- -// grid event classes -// ---------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxGridEvent, wxNotifyEvent); - -wxGridEvent::wxGridEvent( int id, wxEventType type, wxObject* obj, - int row, int col, int x, int y, bool sel, - bool control, bool shift, bool alt, bool meta ) - : wxNotifyEvent( type, id ), - wxKeyboardState(control, shift, alt, meta) -{ - Init(row, col, x, y, sel); - - SetEventObject(obj); -} - -wxIMPLEMENT_DYNAMIC_CLASS(wxGridSizeEvent, wxNotifyEvent); - -wxGridSizeEvent::wxGridSizeEvent( int id, wxEventType type, wxObject* obj, - int rowOrCol, int x, int y, - bool control, bool shift, bool alt, bool meta ) - : wxNotifyEvent( type, id ), - wxKeyboardState(control, shift, alt, meta) -{ - Init(rowOrCol, x, y); - - SetEventObject(obj); -} - - -wxIMPLEMENT_DYNAMIC_CLASS(wxGridRangeSelectEvent, wxNotifyEvent); - -wxGridRangeSelectEvent::wxGridRangeSelectEvent(int id, wxEventType type, wxObject* obj, - const wxGridCellCoords& topLeft, - const wxGridCellCoords& bottomRight, - bool sel, bool control, - bool shift, bool alt, bool meta ) - : wxNotifyEvent( type, id ), - wxKeyboardState(control, shift, alt, meta) -{ - Init(topLeft, bottomRight, sel); - - SetEventObject(obj); -} - - -wxIMPLEMENT_DYNAMIC_CLASS(wxGridEditorCreatedEvent, wxCommandEvent); - -wxGridEditorCreatedEvent::wxGridEditorCreatedEvent(int id, wxEventType type, - wxObject* obj, int row, - int col, wxControl* ctrl) - : wxCommandEvent(type, id) -{ - SetEventObject(obj); - m_row = row; - m_col = col; - m_ctrl = ctrl; -} - - -// ---------------------------------------------------------------------------- -// wxGridTypeRegistry -// ---------------------------------------------------------------------------- - -wxGridTypeRegistry::~wxGridTypeRegistry() -{ - size_t count = m_typeinfo.GetCount(); - for ( size_t i = 0; i < count; i++ ) - delete m_typeinfo[i]; -} - -void wxGridTypeRegistry::RegisterDataType(const wxString& typeName, - wxGridCellRenderer* renderer, - wxGridCellEditor* editor) -{ - wxGridDataTypeInfo* info = new wxGridDataTypeInfo(typeName, renderer, editor); - - // is it already registered? - int loc = FindRegisteredDataType(typeName); - if ( loc != wxNOT_FOUND ) - { - delete m_typeinfo[loc]; - m_typeinfo[loc] = info; - } - else - { - m_typeinfo.Add(info); - } -} - -int wxGridTypeRegistry::FindRegisteredDataType(const wxString& typeName) -{ - size_t count = m_typeinfo.GetCount(); - for ( size_t i = 0; i < count; i++ ) - { - if ( typeName == m_typeinfo[i]->m_typeName ) - { - return i; - } - } - - return wxNOT_FOUND; -} - -int wxGridTypeRegistry::FindDataType(const wxString& typeName) -{ - int index = FindRegisteredDataType(typeName); - if ( index == wxNOT_FOUND ) - { - // check whether this is one of the standard ones, in which case - // register it "on the fly" -#if wxUSE_TEXTCTRL - if ( typeName == wxGRID_VALUE_STRING ) - { - RegisterDataType(wxGRID_VALUE_STRING, - new wxGridCellStringRenderer, - new wxGridCellTextEditor); - } - else -#endif // wxUSE_TEXTCTRL -#if wxUSE_CHECKBOX - if ( typeName == wxGRID_VALUE_BOOL ) - { - RegisterDataType(wxGRID_VALUE_BOOL, - new wxGridCellBoolRenderer, - new wxGridCellBoolEditor); - } - else -#endif // wxUSE_CHECKBOX -#if wxUSE_TEXTCTRL - if ( typeName == wxGRID_VALUE_NUMBER ) - { - RegisterDataType(wxGRID_VALUE_NUMBER, - new wxGridCellNumberRenderer, - new wxGridCellNumberEditor); - } - else if ( typeName == wxGRID_VALUE_FLOAT ) - { - RegisterDataType(wxGRID_VALUE_FLOAT, - new wxGridCellFloatRenderer, - new wxGridCellFloatEditor); - } - else -#endif // wxUSE_TEXTCTRL -#if wxUSE_COMBOBOX - if ( typeName == wxGRID_VALUE_CHOICE ) - { - RegisterDataType(wxGRID_VALUE_CHOICE, - new wxGridCellStringRenderer, - new wxGridCellChoiceEditor); - } - else -#endif // wxUSE_COMBOBOX - { - return wxNOT_FOUND; - } - - // we get here only if just added the entry for this type, so return - // the last index - index = m_typeinfo.GetCount() - 1; - } - - return index; -} - -int wxGridTypeRegistry::FindOrCloneDataType(const wxString& typeName) -{ - int index = FindDataType(typeName); - if ( index == wxNOT_FOUND ) - { - // the first part of the typename is the "real" type, anything after ':' - // are the parameters for the renderer - index = FindDataType(typeName.BeforeFirst(wxT(':'))); - if ( index == wxNOT_FOUND ) - { - return wxNOT_FOUND; - } - - wxGridCellRenderer *renderer = GetRenderer(index); - wxGridCellRenderer *rendererOld = renderer; - renderer = renderer->Clone(); - rendererOld->DecRef(); - - wxGridCellEditor *editor = GetEditor(index); - wxGridCellEditor *editorOld = editor; - editor = editor->Clone(); - editorOld->DecRef(); - - // do it even if there are no parameters to reset them to defaults - wxString params = typeName.AfterFirst(wxT(':')); - renderer->SetParameters(params); - editor->SetParameters(params); - - // register the new typename - RegisterDataType(typeName, renderer, editor); - - // we just registered it, it's the last one - index = m_typeinfo.GetCount() - 1; - } - - return index; -} - -wxGridCellRenderer* wxGridTypeRegistry::GetRenderer(int index) -{ - wxGridCellRenderer* renderer = m_typeinfo[index]->m_renderer; - if (renderer) - renderer->IncRef(); - - return renderer; -} - -wxGridCellEditor* wxGridTypeRegistry::GetEditor(int index) -{ - wxGridCellEditor* editor = m_typeinfo[index]->m_editor; - if (editor) - editor->IncRef(); - - return editor; -} - -#endif // wxUSE_GRID diff --git a/Externals/wxWidgets3/src/generic/gridctrl.cpp b/Externals/wxWidgets3/src/generic/gridctrl.cpp deleted file mode 100644 index 36ff071777..0000000000 --- a/Externals/wxWidgets3/src/generic/gridctrl.cpp +++ /dev/null @@ -1,989 +0,0 @@ -/////////////////////////////////////////////////////////////////////////// -// Name: src/generic/gridctrl.cpp -// Purpose: wxGrid controls -// Author: Paul Gammans, Roger Gammans -// Modified by: -// Created: 11/04/2001 -// Copyright: (c) The Computer Surgery (paul@compsurg.co.uk) -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_GRID - -#include "wx/generic/gridctrl.h" -#include "wx/generic/grideditors.h" - -#ifndef WX_PRECOMP - #include "wx/textctrl.h" - #include "wx/dc.h" - #include "wx/combobox.h" - #include "wx/settings.h" - #include "wx/log.h" - #include "wx/checkbox.h" -#endif // WX_PRECOMP - -#include "wx/tokenzr.h" -#include "wx/renderer.h" - - -// ---------------------------------------------------------------------------- -// wxGridCellRenderer -// ---------------------------------------------------------------------------- - -void wxGridCellRenderer::Draw(wxGrid& grid, - wxGridCellAttr& attr, - wxDC& dc, - const wxRect& rect, - int WXUNUSED(row), int WXUNUSED(col), - bool isSelected) -{ - dc.SetBackgroundMode( wxBRUSHSTYLE_SOLID ); - - wxColour clr; - if ( grid.IsThisEnabled() ) - { - if ( isSelected ) - { - if ( grid.HasFocus() ) - clr = grid.GetSelectionBackground(); - else - clr = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNSHADOW); - } - else - { - clr = attr.GetBackgroundColour(); - } - } - else // grey out fields if the grid is disabled - { - clr = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE); - } - - dc.SetBrush(clr); - dc.SetPen( *wxTRANSPARENT_PEN ); - dc.DrawRectangle(rect); -} - - -// ---------------------------------------------------------------------------- -// wxGridCellDateTimeRenderer -// ---------------------------------------------------------------------------- - -#if wxUSE_DATETIME - -// Enables a grid cell to display a formatted date and or time - -wxGridCellDateTimeRenderer::wxGridCellDateTimeRenderer(const wxString& outformat, const wxString& informat) -{ - m_iformat = informat; - m_oformat = outformat; - m_tz = wxDateTime::Local; - m_dateDef = wxDefaultDateTime; -} - -wxGridCellRenderer *wxGridCellDateTimeRenderer::Clone() const -{ - wxGridCellDateTimeRenderer *renderer = new wxGridCellDateTimeRenderer; - renderer->m_iformat = m_iformat; - renderer->m_oformat = m_oformat; - renderer->m_dateDef = m_dateDef; - renderer->m_tz = m_tz; - - return renderer; -} - -wxString wxGridCellDateTimeRenderer::GetString(const wxGrid& grid, int row, int col) -{ - wxGridTableBase *table = grid.GetTable(); - - bool hasDatetime = false; - wxDateTime val; - wxString text; - if ( table->CanGetValueAs(row, col, wxGRID_VALUE_DATETIME) ) - { - void * tempval = table->GetValueAsCustom(row, col,wxGRID_VALUE_DATETIME); - - if (tempval) - { - val = *((wxDateTime *)tempval); - hasDatetime = true; - delete (wxDateTime *)tempval; - } - - } - - if (!hasDatetime ) - { - text = table->GetValue(row, col); - const char * const end = val.ParseFormat(text, m_iformat, m_dateDef); - hasDatetime = end && !*end; - } - - if ( hasDatetime ) - text = val.Format(m_oformat, m_tz ); - - // If we failed to parse string just show what we where given? - return text; -} - -void wxGridCellDateTimeRenderer::Draw(wxGrid& grid, - wxGridCellAttr& attr, - wxDC& dc, - const wxRect& rectCell, - int row, int col, - bool isSelected) -{ - wxGridCellRenderer::Draw(grid, attr, dc, rectCell, row, col, isSelected); - - SetTextColoursAndFont(grid, attr, dc, isSelected); - - // draw the text right aligned by default - int hAlign = wxALIGN_RIGHT, - vAlign = wxALIGN_INVALID; - attr.GetNonDefaultAlignment(&hAlign, &vAlign); - - wxRect rect = rectCell; - rect.Inflate(-1); - - grid.DrawTextRectangle(dc, GetString(grid, row, col), rect, hAlign, vAlign); -} - -wxSize wxGridCellDateTimeRenderer::GetBestSize(wxGrid& grid, - wxGridCellAttr& attr, - wxDC& dc, - int row, int col) -{ - return DoGetBestSize(attr, dc, GetString(grid, row, col)); -} - -void wxGridCellDateTimeRenderer::SetParameters(const wxString& params) -{ - if (!params.empty()) - m_oformat=params; -} - -#endif // wxUSE_DATETIME - -// ---------------------------------------------------------------------------- -// wxGridCellEnumRenderer -// ---------------------------------------------------------------------------- -// Renders a number as a textual equivalent. -// eg data in cell is 0,1,2 ... n the cell could be rendered as "John","Fred"..."Bob" - - -wxGridCellEnumRenderer::wxGridCellEnumRenderer(const wxString& choices) -{ - if (!choices.empty()) - SetParameters(choices); -} - -wxGridCellRenderer *wxGridCellEnumRenderer::Clone() const -{ - wxGridCellEnumRenderer *renderer = new wxGridCellEnumRenderer; - renderer->m_choices = m_choices; - return renderer; -} - -wxString wxGridCellEnumRenderer::GetString(const wxGrid& grid, int row, int col) -{ - wxGridTableBase *table = grid.GetTable(); - wxString text; - if ( table->CanGetValueAs(row, col, wxGRID_VALUE_NUMBER) ) - { - int choiceno = table->GetValueAsLong(row, col); - text.Printf(wxT("%s"), m_choices[ choiceno ].c_str() ); - } - else - { - text = table->GetValue(row, col); - } - - - //If we faild to parse string just show what we where given? - return text; -} - -void wxGridCellEnumRenderer::Draw(wxGrid& grid, - wxGridCellAttr& attr, - wxDC& dc, - const wxRect& rectCell, - int row, int col, - bool isSelected) -{ - wxGridCellRenderer::Draw(grid, attr, dc, rectCell, row, col, isSelected); - - SetTextColoursAndFont(grid, attr, dc, isSelected); - - // draw the text right aligned by default - int hAlign = wxALIGN_RIGHT, - vAlign = wxALIGN_INVALID; - attr.GetNonDefaultAlignment(&hAlign, &vAlign); - - wxRect rect = rectCell; - rect.Inflate(-1); - - grid.DrawTextRectangle(dc, GetString(grid, row, col), rect, hAlign, vAlign); -} - -wxSize wxGridCellEnumRenderer::GetBestSize(wxGrid& grid, - wxGridCellAttr& attr, - wxDC& dc, - int row, int col) -{ - return DoGetBestSize(attr, dc, GetString(grid, row, col)); -} - -void wxGridCellEnumRenderer::SetParameters(const wxString& params) -{ - if ( !params ) - { - // what can we do? - return; - } - - m_choices.Empty(); - - wxStringTokenizer tk(params, wxT(',')); - while ( tk.HasMoreTokens() ) - { - m_choices.Add(tk.GetNextToken()); - } -} - - -// ---------------------------------------------------------------------------- -// wxGridCellAutoWrapStringRenderer -// ---------------------------------------------------------------------------- - - -void -wxGridCellAutoWrapStringRenderer::Draw(wxGrid& grid, - wxGridCellAttr& attr, - wxDC& dc, - const wxRect& rectCell, - int row, int col, - bool isSelected) { - - - wxGridCellRenderer::Draw(grid, attr, dc, rectCell, row, col, isSelected); - - // now we only have to draw the text - SetTextColoursAndFont(grid, attr, dc, isSelected); - - int horizAlign, vertAlign; - attr.GetAlignment(&horizAlign, &vertAlign); - - wxRect rect = rectCell; - rect.Inflate(-1); - - grid.DrawTextRectangle(dc, GetTextLines(grid,dc,attr,rect,row,col), - rect, horizAlign, vertAlign); -} - - -wxArrayString -wxGridCellAutoWrapStringRenderer::GetTextLines(wxGrid& grid, - wxDC& dc, - const wxGridCellAttr& attr, - const wxRect& rect, - int row, int col) -{ - dc.SetFont(attr.GetFont()); - const wxCoord maxWidth = rect.GetWidth(); - - // Transform logical lines into physical ones, wrapping the longer ones. - const wxArrayString - logicalLines = wxSplit(grid.GetCellValue(row, col), '\n', '\0'); - - // Trying to do anything if the column is hidden anyhow doesn't make sense - // and we run into problems in BreakLine() in this case. - if ( maxWidth <= 0 ) - return logicalLines; - - wxArrayString physicalLines; - for ( wxArrayString::const_iterator it = logicalLines.begin(); - it != logicalLines.end(); - ++it ) - { - const wxString& line = *it; - - if ( dc.GetTextExtent(line).x > maxWidth ) - { - // Line does not fit, break it up. - BreakLine(dc, line, maxWidth, physicalLines); - } - else // The entire line fits as is - { - physicalLines.push_back(line); - } - } - - return physicalLines; -} - -void -wxGridCellAutoWrapStringRenderer::BreakLine(wxDC& dc, - const wxString& logicalLine, - wxCoord maxWidth, - wxArrayString& lines) -{ - wxCoord lineWidth = 0; - wxString line; - - // For each word - wxStringTokenizer wordTokenizer(logicalLine, wxS(" \t"), wxTOKEN_RET_DELIMS); - while ( wordTokenizer.HasMoreTokens() ) - { - const wxString word = wordTokenizer.GetNextToken(); - const wxCoord wordWidth = dc.GetTextExtent(word).x; - if ( lineWidth + wordWidth < maxWidth ) - { - // Word fits, just add it to this line. - line += word; - lineWidth += wordWidth; - } - else - { - // Word does not fit, check whether the word is itself wider that - // available width - if ( wordWidth < maxWidth ) - { - // Word can fit in a new line, put it at the beginning - // of the new line. - lines.push_back(line); - line = word; - lineWidth = wordWidth; - } - else // Word cannot fit in available width at all. - { - if ( !line.empty() ) - { - lines.push_back(line); - line.clear(); - lineWidth = 0; - } - - // Break it up in several lines. - lineWidth = BreakWord(dc, word, maxWidth, lines, line); - } - } - } - - if ( !line.empty() ) - lines.push_back(line); -} - - -wxCoord -wxGridCellAutoWrapStringRenderer::BreakWord(wxDC& dc, - const wxString& word, - wxCoord maxWidth, - wxArrayString& lines, - wxString& line) -{ - wxArrayInt widths; - dc.GetPartialTextExtents(word, widths); - - // TODO: Use binary search to find the first element > maxWidth. - const unsigned count = widths.size(); - unsigned n; - for ( n = 0; n < count; n++ ) - { - if ( widths[n] > maxWidth ) - break; - } - - if ( n == 0 ) - { - // This is a degenerate case: the first character of the word is - // already wider than the available space, so we just can't show it - // completely and have to put the first character in this line. - n = 1; - } - - lines.push_back(word.substr(0, n)); - - // Check if the remainder of the string fits in one line. - // - // Unfortunately we can't use the existing partial text extents as the - // extent of the remainder may be different when it's rendered in a - // separate line instead of as part of the same one, so we have to - // recompute it. - const wxString rest = word.substr(n); - const wxCoord restWidth = dc.GetTextExtent(rest).x; - if ( restWidth <= maxWidth ) - { - line = rest; - return restWidth; - } - - // Break the rest of the word into lines. - // - // TODO: Perhaps avoid recursion? The code is simpler like this but using a - // loop in this function would probably be more efficient. - return BreakWord(dc, rest, maxWidth, lines, line); -} - -wxSize -wxGridCellAutoWrapStringRenderer::GetBestSize(wxGrid& grid, - wxGridCellAttr& attr, - wxDC& dc, - int row, int col) -{ - // We have to make a choice here and fix either width or height because we - // don't have any naturally best size. This choice is mostly arbitrary, but - // we need to be consistent about it, otherwise wxGrid auto-sizing code - // would get confused. For now we decide to use a single line of text and - // compute the width needed to fully display everything. - const int height = dc.GetCharHeight(); - - return wxSize(GetBestWidth(grid, attr, dc, row, col, height), height); -} - -static const int AUTOWRAP_Y_MARGIN = 4; - -int -wxGridCellAutoWrapStringRenderer::GetBestHeight(wxGrid& grid, - wxGridCellAttr& attr, - wxDC& dc, - int row, int col, - int width) -{ - const int lineHeight = dc.GetCharHeight(); - - // Use as many lines as we need for this width and add a small border to - // improve the appearance. - return GetTextLines(grid, dc, attr, wxSize(width, lineHeight), - row, col).size() * lineHeight + AUTOWRAP_Y_MARGIN; -} - -int -wxGridCellAutoWrapStringRenderer::GetBestWidth(wxGrid& grid, - wxGridCellAttr& attr, - wxDC& dc, - int row, int col, - int height) -{ - const int lineHeight = dc.GetCharHeight(); - - // Maximal number of lines that fully fit but at least 1. - const size_t maxLines = height - AUTOWRAP_Y_MARGIN < lineHeight - ? 1 - : (height - AUTOWRAP_Y_MARGIN)/lineHeight; - - // Increase width until all the text fits. - // - // TODO: this is not the most efficient to do it for the long strings. - const int charWidth = dc.GetCharWidth(); - int width = 2*charWidth; - while ( GetTextLines(grid, dc, attr, wxSize(width, height), - row, col).size() > maxLines ) - width += charWidth; - - return width; -} - -// ---------------------------------------------------------------------------- -// wxGridCellStringRenderer -// ---------------------------------------------------------------------------- - -void wxGridCellStringRenderer::SetTextColoursAndFont(const wxGrid& grid, - const wxGridCellAttr& attr, - wxDC& dc, - bool isSelected) -{ - dc.SetBackgroundMode( wxBRUSHSTYLE_TRANSPARENT ); - - // TODO some special colours for attr.IsReadOnly() case? - - // different coloured text when the grid is disabled - if ( grid.IsThisEnabled() ) - { - if ( isSelected ) - { - wxColour clr; - if ( grid.HasFocus() ) - clr = grid.GetSelectionBackground(); - else - clr = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNSHADOW); - dc.SetTextBackground( clr ); - dc.SetTextForeground( grid.GetSelectionForeground() ); - } - else - { - dc.SetTextBackground( attr.GetBackgroundColour() ); - dc.SetTextForeground( attr.GetTextColour() ); - } - } - else - { - dc.SetTextBackground(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE)); - dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT)); - } - - dc.SetFont( attr.GetFont() ); -} - -wxSize wxGridCellStringRenderer::DoGetBestSize(const wxGridCellAttr& attr, - wxDC& dc, - const wxString& text) -{ - wxCoord x = 0, y = 0, max_x = 0; - dc.SetFont(attr.GetFont()); - wxStringTokenizer tk(text, wxT('\n')); - while ( tk.HasMoreTokens() ) - { - dc.GetTextExtent(tk.GetNextToken(), &x, &y); - max_x = wxMax(max_x, x); - } - - y *= 1 + text.Freq(wxT('\n')); // multiply by the number of lines. - - return wxSize(max_x, y); -} - -wxSize wxGridCellStringRenderer::GetBestSize(wxGrid& grid, - wxGridCellAttr& attr, - wxDC& dc, - int row, int col) -{ - return DoGetBestSize(attr, dc, grid.GetCellValue(row, col)); -} - -void wxGridCellStringRenderer::Draw(wxGrid& grid, - wxGridCellAttr& attr, - wxDC& dc, - const wxRect& rectCell, - int row, int col, - bool isSelected) -{ - wxRect rect = rectCell; - rect.Inflate(-1); - - // erase only this cells background, overflow cells should have been erased - wxGridCellRenderer::Draw(grid, attr, dc, rectCell, row, col, isSelected); - - int hAlign, vAlign; - attr.GetAlignment(&hAlign, &vAlign); - - int overflowCols = 0; - - if (attr.GetOverflow()) - { - int cols = grid.GetNumberCols(); - int best_width = GetBestSize(grid,attr,dc,row,col).GetWidth(); - int cell_rows, cell_cols; - attr.GetSize( &cell_rows, &cell_cols ); // shouldn't get here if <= 0 - if ((best_width > rectCell.width) && (col < cols) && grid.GetTable()) - { - int i, c_cols, c_rows; - for (i = col+cell_cols; i < cols; i++) - { - bool is_empty = true; - for (int j=row; j < row + cell_rows; j++) - { - // check w/ anchor cell for multicell block - grid.GetCellSize(j, i, &c_rows, &c_cols); - if (c_rows > 0) - c_rows = 0; - if (!grid.GetTable()->IsEmptyCell(j + c_rows, i)) - { - is_empty = false; - break; - } - } - - if (is_empty) - { - rect.width += grid.GetColSize(i); - } - else - { - i--; - break; - } - - if (rect.width >= best_width) - break; - } - - overflowCols = i - col - cell_cols + 1; - if (overflowCols >= cols) - overflowCols = cols - 1; - } - - if (overflowCols > 0) // redraw overflow cells w/ proper hilight - { - hAlign = wxALIGN_LEFT; // if oveflowed then it's left aligned - wxRect clip = rect; - clip.x += rectCell.width; - // draw each overflow cell individually - int col_end = col + cell_cols + overflowCols; - if (col_end >= grid.GetNumberCols()) - col_end = grid.GetNumberCols() - 1; - for (int i = col + cell_cols; i <= col_end; i++) - { - clip.width = grid.GetColSize(i) - 1; - dc.DestroyClippingRegion(); - dc.SetClippingRegion(clip); - - SetTextColoursAndFont(grid, attr, dc, - grid.IsInSelection(row,i)); - - grid.DrawTextRectangle(dc, grid.GetCellValue(row, col), - rect, hAlign, vAlign); - clip.x += grid.GetColSize(i) - 1; - } - - rect = rectCell; - rect.Inflate(-1); - rect.width++; - dc.DestroyClippingRegion(); - } - } - - // now we only have to draw the text - SetTextColoursAndFont(grid, attr, dc, isSelected); - - grid.DrawTextRectangle(dc, grid.GetCellValue(row, col), - rect, hAlign, vAlign); -} - -// ---------------------------------------------------------------------------- -// wxGridCellNumberRenderer -// ---------------------------------------------------------------------------- - -wxString wxGridCellNumberRenderer::GetString(const wxGrid& grid, int row, int col) -{ - wxGridTableBase *table = grid.GetTable(); - wxString text; - if ( table->CanGetValueAs(row, col, wxGRID_VALUE_NUMBER) ) - { - text.Printf(wxT("%ld"), table->GetValueAsLong(row, col)); - } - else - { - text = table->GetValue(row, col); - } - - return text; -} - -void wxGridCellNumberRenderer::Draw(wxGrid& grid, - wxGridCellAttr& attr, - wxDC& dc, - const wxRect& rectCell, - int row, int col, - bool isSelected) -{ - wxGridCellRenderer::Draw(grid, attr, dc, rectCell, row, col, isSelected); - - SetTextColoursAndFont(grid, attr, dc, isSelected); - - // draw the text right aligned by default - int hAlign = wxALIGN_RIGHT, - vAlign = wxALIGN_INVALID; - attr.GetNonDefaultAlignment(&hAlign, &vAlign); - - wxRect rect = rectCell; - rect.Inflate(-1); - - grid.DrawTextRectangle(dc, GetString(grid, row, col), rect, hAlign, vAlign); -} - -wxSize wxGridCellNumberRenderer::GetBestSize(wxGrid& grid, - wxGridCellAttr& attr, - wxDC& dc, - int row, int col) -{ - return DoGetBestSize(attr, dc, GetString(grid, row, col)); -} - -// ---------------------------------------------------------------------------- -// wxGridCellFloatRenderer -// ---------------------------------------------------------------------------- - -wxGridCellFloatRenderer::wxGridCellFloatRenderer(int width, - int precision, - int format) -{ - SetWidth(width); - SetPrecision(precision); - SetFormat(format); -} - -wxGridCellRenderer *wxGridCellFloatRenderer::Clone() const -{ - wxGridCellFloatRenderer *renderer = new wxGridCellFloatRenderer; - renderer->m_width = m_width; - renderer->m_precision = m_precision; - renderer->m_style = m_style; - renderer->m_format = m_format; - - return renderer; -} - -wxString wxGridCellFloatRenderer::GetString(const wxGrid& grid, int row, int col) -{ - wxGridTableBase *table = grid.GetTable(); - - bool hasDouble; - double val; - wxString text; - if ( table->CanGetValueAs(row, col, wxGRID_VALUE_FLOAT) ) - { - val = table->GetValueAsDouble(row, col); - hasDouble = true; - } - else - { - text = table->GetValue(row, col); - hasDouble = text.ToDouble(&val); - } - - if ( hasDouble ) - { - if ( !m_format ) - { - if ( m_width == -1 ) - { - if ( m_precision == -1 ) - { - // default width/precision - m_format = wxT("%"); - } - else - { - m_format.Printf(wxT("%%.%d"), m_precision); - } - } - else if ( m_precision == -1 ) - { - // default precision - m_format.Printf(wxT("%%%d."), m_width); - } - else - { - m_format.Printf(wxT("%%%d.%d"), m_width, m_precision); - } - - bool isUpper = ( ( m_style & wxGRID_FLOAT_FORMAT_UPPER ) == wxGRID_FLOAT_FORMAT_UPPER); - if ( ( m_style & wxGRID_FLOAT_FORMAT_SCIENTIFIC ) == wxGRID_FLOAT_FORMAT_SCIENTIFIC) - m_format += isUpper ? wxT('E') : wxT('e'); - else if ( ( m_style & wxGRID_FLOAT_FORMAT_COMPACT ) == wxGRID_FLOAT_FORMAT_COMPACT) - m_format += isUpper ? wxT('G') : wxT('g'); - else - m_format += wxT('f'); - } - - text.Printf(m_format, val); - - } - //else: text already contains the string - - return text; -} - -void wxGridCellFloatRenderer::Draw(wxGrid& grid, - wxGridCellAttr& attr, - wxDC& dc, - const wxRect& rectCell, - int row, int col, - bool isSelected) -{ - wxGridCellRenderer::Draw(grid, attr, dc, rectCell, row, col, isSelected); - - SetTextColoursAndFont(grid, attr, dc, isSelected); - - // draw the text right aligned by default - int hAlign = wxALIGN_RIGHT, - vAlign = wxALIGN_INVALID; - attr.GetNonDefaultAlignment(&hAlign, &vAlign); - - wxRect rect = rectCell; - rect.Inflate(-1); - - grid.DrawTextRectangle(dc, GetString(grid, row, col), rect, hAlign, vAlign); -} - -wxSize wxGridCellFloatRenderer::GetBestSize(wxGrid& grid, - wxGridCellAttr& attr, - wxDC& dc, - int row, int col) -{ - return DoGetBestSize(attr, dc, GetString(grid, row, col)); -} - -void wxGridCellFloatRenderer::SetParameters(const wxString& params) -{ - if ( !params ) - { - // reset to defaults - SetWidth(-1); - SetPrecision(-1); - SetFormat(wxGRID_FLOAT_FORMAT_DEFAULT); - } - else - { - wxString rest; - wxString tmp = params.BeforeFirst(wxT(','), &rest); - if ( !tmp.empty() ) - { - long width; - if ( tmp.ToLong(&width) ) - { - SetWidth((int)width); - } - else - { - wxLogDebug(wxT("Invalid wxGridCellFloatRenderer width parameter string '%s ignored"), params.c_str()); - } - } - - tmp = rest.BeforeFirst(wxT(',')); - if ( !tmp.empty() ) - { - long precision; - if ( tmp.ToLong(&precision) ) - { - SetPrecision((int)precision); - } - else - { - wxLogDebug(wxT("Invalid wxGridCellFloatRenderer precision parameter string '%s ignored"), params.c_str()); - } - } - - tmp = rest.AfterFirst(wxT(',')); - if ( !tmp.empty() ) - { - if ( tmp[0] == wxT('f') ) - { - SetFormat(wxGRID_FLOAT_FORMAT_FIXED); - } - else if ( tmp[0] == wxT('e') ) - { - SetFormat(wxGRID_FLOAT_FORMAT_SCIENTIFIC); - } - else if ( tmp[0] == wxT('g') ) - { - SetFormat(wxGRID_FLOAT_FORMAT_COMPACT); - } - else if ( tmp[0] == wxT('E') ) - { - SetFormat(wxGRID_FLOAT_FORMAT_SCIENTIFIC | - wxGRID_FLOAT_FORMAT_UPPER); - } - else if ( tmp[0] == wxT('F') ) - { - SetFormat(wxGRID_FLOAT_FORMAT_FIXED | - wxGRID_FLOAT_FORMAT_UPPER); - } - else if ( tmp[0] == wxT('G') ) - { - SetFormat(wxGRID_FLOAT_FORMAT_COMPACT | - wxGRID_FLOAT_FORMAT_UPPER); - } - else - { - wxLogDebug("Invalid wxGridCellFloatRenderer format " - "parameter string '%s ignored", params); - } - } - } -} - -// ---------------------------------------------------------------------------- -// wxGridCellBoolRenderer -// ---------------------------------------------------------------------------- - -wxSize wxGridCellBoolRenderer::ms_sizeCheckMark; - -wxSize wxGridCellBoolRenderer::GetBestSize(wxGrid& grid, - wxGridCellAttr& WXUNUSED(attr), - wxDC& WXUNUSED(dc), - int WXUNUSED(row), - int WXUNUSED(col)) -{ - // compute it only once (no locks for MT safeness in GUI thread...) - if ( !ms_sizeCheckMark.x ) - { - ms_sizeCheckMark = wxRendererNative::Get().GetCheckBoxSize(&grid); - } - - return ms_sizeCheckMark; -} - -void wxGridCellBoolRenderer::Draw(wxGrid& grid, - wxGridCellAttr& attr, - wxDC& dc, - const wxRect& rect, - int row, int col, - bool isSelected) -{ - wxGridCellRenderer::Draw(grid, attr, dc, rect, row, col, isSelected); - - // draw a check mark in the centre (ignoring alignment - TODO) - wxSize size = GetBestSize(grid, attr, dc, row, col); - - // don't draw outside the cell - wxCoord minSize = wxMin(rect.width, rect.height); - if ( size.x >= minSize || size.y >= minSize ) - { - // and even leave (at least) 1 pixel margin - size.x = size.y = minSize; - } - - // draw a border around checkmark - int vAlign, hAlign; - attr.GetAlignment(&hAlign, &vAlign); - - wxRect rectBorder; - if (hAlign == wxALIGN_CENTRE) - { - rectBorder.x = rect.x + rect.width / 2 - size.x / 2; - rectBorder.y = rect.y + rect.height / 2 - size.y / 2; - rectBorder.width = size.x; - rectBorder.height = size.y; - } - else if (hAlign == wxALIGN_LEFT) - { - rectBorder.x = rect.x + 2; - rectBorder.y = rect.y + rect.height / 2 - size.y / 2; - rectBorder.width = size.x; - rectBorder.height = size.y; - } - else if (hAlign == wxALIGN_RIGHT) - { - rectBorder.x = rect.x + rect.width - size.x - 2; - rectBorder.y = rect.y + rect.height / 2 - size.y / 2; - rectBorder.width = size.x; - rectBorder.height = size.y; - } - - bool value; - if ( grid.GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL) ) - { - value = grid.GetTable()->GetValueAsBool(row, col); - } - else - { - wxString cellval( grid.GetTable()->GetValue(row, col) ); - value = wxGridCellBoolEditor::IsTrueValue(cellval); - } - - int flags = 0; - if (value) - flags |= wxCONTROL_CHECKED; - - wxRendererNative::Get().DrawCheckBox( &grid, dc, rectBorder, flags ); -} - -#endif // wxUSE_GRID - diff --git a/Externals/wxWidgets3/src/generic/grideditors.cpp b/Externals/wxWidgets3/src/generic/grideditors.cpp deleted file mode 100644 index 4cc103ca73..0000000000 --- a/Externals/wxWidgets3/src/generic/grideditors.cpp +++ /dev/null @@ -1,1714 +0,0 @@ -/////////////////////////////////////////////////////////////////////////// -// Name: src/generic/grideditors.cpp -// Purpose: wxGridCellEditorEvtHandler and wxGrid editors -// Author: Michael Bedward (based on code by Julian Smart, Robin Dunn) -// Modified by: Robin Dunn, Vadim Zeitlin, Santiago Palacios -// Created: 1/08/1999 -// Copyright: (c) Michael Bedward (mbedward@ozemail.com.au) -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx/wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_GRID - -#include "wx/grid.h" - -#ifndef WX_PRECOMP - #include "wx/utils.h" - #include "wx/dcclient.h" - #include "wx/settings.h" - #include "wx/log.h" - #include "wx/textctrl.h" - #include "wx/checkbox.h" - #include "wx/combobox.h" - #include "wx/intl.h" - #include "wx/math.h" - #include "wx/listbox.h" -#endif - -#include "wx/valnum.h" -#include "wx/textfile.h" -#include "wx/spinctrl.h" -#include "wx/tokenzr.h" -#include "wx/renderer.h" -#include "wx/headerctrl.h" - -#include "wx/generic/gridsel.h" -#include "wx/generic/grideditors.h" -#include "wx/generic/private/grid.h" - -#if defined(__WXMOTIF__) - #define WXUNUSED_MOTIF(identifier) WXUNUSED(identifier) -#else - #define WXUNUSED_MOTIF(identifier) identifier -#endif - -#if defined(__WXGTK__) - #define WXUNUSED_GTK(identifier) WXUNUSED(identifier) -#else - #define WXUNUSED_GTK(identifier) identifier -#endif - -#ifdef __WXOSX__ -#include "wx/osx/private.h" -#endif - -// Required for wxIs... functions -#include - -// ============================================================================ -// implementation -// ============================================================================ - -wxDEFINE_EVENT( wxEVT_GRID_HIDE_EDITOR, wxCommandEvent ); - -// ---------------------------------------------------------------------------- -// wxGridCellEditorEvtHandler -// ---------------------------------------------------------------------------- - -void wxGridCellEditorEvtHandler::OnKillFocus(wxFocusEvent& event) -{ - // We must let the native control have this event so in any case don't mark - // it as handled, otherwise various weird problems can happen (see #11681). - event.Skip(); - - // Don't disable the cell if we're just starting to edit it - if (m_inSetFocus) - return; - - // Tell the grid to dismiss the control but don't do it immediately as it - // could result in the editor being destroyed right now and a crash in the - // code searching for the next event handler, so post an event asking the - // grid to do it slightly later instead. - - // FIXME-VC6: Once we drop support for VC6, we should use a simpler - // m_grid->CallAfter(&wxGrid::DisableCellEditControl) and get - // rid of wxEVT_GRID_HIDE_EDITOR entirely. - m_grid->GetEventHandler()-> - AddPendingEvent(wxCommandEvent(wxEVT_GRID_HIDE_EDITOR)); -} - -void wxGridCellEditorEvtHandler::OnKeyDown(wxKeyEvent& event) -{ - switch ( event.GetKeyCode() ) - { - case WXK_ESCAPE: - m_editor->Reset(); - m_grid->DisableCellEditControl(); - break; - - case WXK_TAB: - m_grid->GetEventHandler()->ProcessEvent( event ); - break; - - case WXK_RETURN: - case WXK_NUMPAD_ENTER: - if (!m_grid->GetEventHandler()->ProcessEvent(event)) - m_editor->HandleReturn(event); - break; - - default: - event.Skip(); - break; - } -} - -void wxGridCellEditorEvtHandler::OnChar(wxKeyEvent& event) -{ - int row = m_grid->GetGridCursorRow(); - int col = m_grid->GetGridCursorCol(); - wxRect rect = m_grid->CellToRect( row, col ); - int cw, ch; - m_grid->GetGridWindow()->GetClientSize( &cw, &ch ); - - // if cell width is smaller than grid client area, cell is wholly visible - bool wholeCellVisible = (rect.GetWidth() < cw); - - switch ( event.GetKeyCode() ) - { - case WXK_ESCAPE: - case WXK_TAB: - case WXK_RETURN: - case WXK_NUMPAD_ENTER: - break; - - case WXK_HOME: - { - if ( wholeCellVisible ) - { - // no special processing needed... - event.Skip(); - break; - } - - // do special processing for partly visible cell... - - // get the widths of all cells previous to this one - int colXPos = 0; - for ( int i = 0; i < col; i++ ) - { - colXPos += m_grid->GetColSize(i); - } - - int xUnit = 1, yUnit = 1; - m_grid->GetScrollPixelsPerUnit(&xUnit, &yUnit); - if (col != 0) - { - m_grid->Scroll(colXPos / xUnit - 1, m_grid->GetScrollPos(wxVERTICAL)); - } - else - { - m_grid->Scroll(colXPos / xUnit, m_grid->GetScrollPos(wxVERTICAL)); - } - event.Skip(); - break; - } - - case WXK_END: - { - if ( wholeCellVisible ) - { - // no special processing needed... - event.Skip(); - break; - } - - // do special processing for partly visible cell... - - int textWidth = 0; - wxString value = m_grid->GetCellValue(row, col); - if ( wxEmptyString != value ) - { - // get width of cell CONTENTS (text) - int y; - wxFont font = m_grid->GetCellFont(row, col); - m_grid->GetTextExtent(value, &textWidth, &y, NULL, NULL, &font); - - // try to RIGHT align the text by scrolling - int client_right = m_grid->GetGridWindow()->GetClientSize().GetWidth(); - - // (m_grid->GetScrollLineX()*2) is a factor for not scrolling to far, - // otherwise the last part of the cell content might be hidden below the scroll bar - // FIXME: maybe there is a more suitable correction? - textWidth -= (client_right - (m_grid->GetScrollLineX() * 2)); - if ( textWidth < 0 ) - { - textWidth = 0; - } - } - - // get the widths of all cells previous to this one - int colXPos = 0; - for ( int i = 0; i < col; i++ ) - { - colXPos += m_grid->GetColSize(i); - } - - // and add the (modified) text width of the cell contents - // as we'd like to see the last part of the cell contents - colXPos += textWidth; - - int xUnit = 1, yUnit = 1; - m_grid->GetScrollPixelsPerUnit(&xUnit, &yUnit); - m_grid->Scroll(colXPos / xUnit - 1, m_grid->GetScrollPos(wxVERTICAL)); - event.Skip(); - break; - } - - default: - event.Skip(); - break; - } -} - -// ---------------------------------------------------------------------------- -// wxGridCellEditor -// ---------------------------------------------------------------------------- - -wxGridCellEditor::wxGridCellEditor() -{ - m_control = NULL; - m_attr = NULL; -} - -wxGridCellEditor::~wxGridCellEditor() -{ - Destroy(); -} - -void wxGridCellEditor::Create(wxWindow* WXUNUSED(parent), - wxWindowID WXUNUSED(id), - wxEvtHandler* evtHandler) -{ - if ( evtHandler ) - m_control->PushEventHandler(evtHandler); -} - -void wxGridCellEditor::PaintBackground(wxDC& dc, - const wxRect& rectCell, - const wxGridCellAttr& attr) -{ - // erase the background because we might not fill the cell - dc.SetPen(*wxTRANSPARENT_PEN); - dc.SetBrush(wxBrush(attr.GetBackgroundColour())); - dc.DrawRectangle(rectCell); -} - -void wxGridCellEditor::Destroy() -{ - if (m_control) - { - m_control->PopEventHandler( true /* delete it*/ ); - - m_control->Destroy(); - m_control = NULL; - } -} - -void wxGridCellEditor::Show(bool show, wxGridCellAttr *attr) -{ - wxASSERT_MSG(m_control, wxT("The wxGridCellEditor must be created first!")); - - m_control->Show(show); - - if ( show ) - { - // set the colours/fonts if we have any - if ( attr ) - { - m_colFgOld = m_control->GetForegroundColour(); - m_control->SetForegroundColour(attr->GetTextColour()); - - m_colBgOld = m_control->GetBackgroundColour(); - m_control->SetBackgroundColour(attr->GetBackgroundColour()); - -// Workaround for GTK+1 font setting problem on some platforms -#if !defined(__WXGTK__) || defined(__WXGTK20__) - m_fontOld = m_control->GetFont(); - m_control->SetFont(attr->GetFont()); -#endif - - // can't do anything more in the base class version, the other - // attributes may only be used by the derived classes - } - } - else - { - // restore the standard colours fonts - if ( m_colFgOld.IsOk() ) - { - m_control->SetForegroundColour(m_colFgOld); - m_colFgOld = wxNullColour; - } - - if ( m_colBgOld.IsOk() ) - { - m_control->SetBackgroundColour(m_colBgOld); - m_colBgOld = wxNullColour; - } - -// Workaround for GTK+1 font setting problem on some platforms -#if !defined(__WXGTK__) || defined(__WXGTK20__) - if ( m_fontOld.IsOk() ) - { - m_control->SetFont(m_fontOld); - m_fontOld = wxNullFont; - } -#endif - } -} - -void wxGridCellEditor::SetSize(const wxRect& rect) -{ - wxASSERT_MSG(m_control, wxT("The wxGridCellEditor must be created first!")); - - m_control->SetSize(rect, wxSIZE_ALLOW_MINUS_ONE); -} - -void wxGridCellEditor::HandleReturn(wxKeyEvent& event) -{ - event.Skip(); -} - -bool wxGridCellEditor::IsAcceptedKey(wxKeyEvent& event) -{ - bool ctrl = event.ControlDown(); - bool alt; - -#ifdef __WXMAC__ - // On the Mac the Alt key is more like shift and is used for entry of - // valid characters, so check for Ctrl and Meta instead. - alt = event.MetaDown(); -#else // !__WXMAC__ - alt = event.AltDown(); -#endif // __WXMAC__/!__WXMAC__ - - // Assume it's not a valid char if ctrl or alt is down, but if both are - // down then it may be because of an AltGr key combination, so let them - // through in that case. - if ((ctrl || alt) && !(ctrl && alt)) - return false; - -#if wxUSE_UNICODE - if ( static_cast(event.GetUnicodeKey()) == WXK_NONE ) - return false; -#else - if ( event.GetKeyCode() > WXK_START ) - return false; -#endif - - return true; -} - -void wxGridCellEditor::StartingKey(wxKeyEvent& event) -{ - event.Skip(); -} - -void wxGridCellEditor::StartingClick() -{ -} - -#if wxUSE_TEXTCTRL - -// ---------------------------------------------------------------------------- -// wxGridCellTextEditor -// ---------------------------------------------------------------------------- - -wxGridCellTextEditor::wxGridCellTextEditor(size_t maxChars) -{ - m_maxChars = maxChars; -} - -void wxGridCellTextEditor::Create(wxWindow* parent, - wxWindowID id, - wxEvtHandler* evtHandler) -{ - DoCreate(parent, id, evtHandler); -} - -void wxGridCellTextEditor::DoCreate(wxWindow* parent, - wxWindowID id, - wxEvtHandler* evtHandler, - long style) -{ - style |= wxTE_PROCESS_ENTER | wxTE_PROCESS_TAB | wxNO_BORDER; - - wxTextCtrl* const text = new wxTextCtrl(parent, id, wxEmptyString, - wxDefaultPosition, wxDefaultSize, - style); - text->SetMargins(0, 0); - m_control = text; - -#ifdef __WXOSX__ - wxWidgetImpl* impl = m_control->GetPeer(); - impl->SetNeedsFocusRect(false); -#endif - // set max length allowed in the textctrl, if the parameter was set - if ( m_maxChars != 0 ) - { - Text()->SetMaxLength(m_maxChars); - } -#if wxUSE_VALIDATORS - // validate text in textctrl, if validator is set - if ( m_validator ) - { - Text()->SetValidator(*m_validator); - } -#endif - - wxGridCellEditor::Create(parent, id, evtHandler); -} - -void wxGridCellTextEditor::PaintBackground(wxDC& WXUNUSED(dc), - const wxRect& WXUNUSED(rectCell), - const wxGridCellAttr& WXUNUSED(attr)) -{ - // as we fill the entire client area, - // don't do anything here to minimize flicker -} - -void wxGridCellTextEditor::SetSize(const wxRect& rectOrig) -{ - wxRect rect(rectOrig); - - // Make the edit control large enough to allow for internal margins - // - // TODO: remove this if the text ctrl sizing is improved esp. for unix - // -#if defined(__WXGTK__) - if (rect.x != 0) - { - rect.x += 1; - rect.y += 1; - rect.width -= 1; - rect.height -= 1; - } -#elif defined(__WXMSW__) - if ( rect.x == 0 ) - rect.x += 2; - else - rect.x += 3; - - if ( rect.y == 0 ) - rect.y += 2; - else - rect.y += 3; - - rect.width -= 2; - rect.height -= 2; -#elif defined(__WXOSX__) - rect.x += 1; - rect.y += 1; - - rect.width -= 1; - rect.height -= 1; -#else - int extra_x = ( rect.x > 2 ) ? 2 : 1; - int extra_y = ( rect.y > 2 ) ? 2 : 1; - - #if defined(__WXMOTIF__) - extra_x *= 2; - extra_y *= 2; - #endif - - rect.SetLeft( wxMax(0, rect.x - extra_x) ); - rect.SetTop( wxMax(0, rect.y - extra_y) ); - rect.SetRight( rect.GetRight() + 2 * extra_x ); - rect.SetBottom( rect.GetBottom() + 2 * extra_y ); -#endif - - wxGridCellEditor::SetSize(rect); -} - -void wxGridCellTextEditor::BeginEdit(int row, int col, wxGrid* grid) -{ - wxASSERT_MSG(m_control, wxT("The wxGridCellEditor must be created first!")); - - m_value = grid->GetTable()->GetValue(row, col); - - DoBeginEdit(m_value); -} - -void wxGridCellTextEditor::DoBeginEdit(const wxString& startValue) -{ - Text()->SetValue(startValue); - Text()->SetInsertionPointEnd(); - Text()->SelectAll(); - Text()->SetFocus(); -} - -bool wxGridCellTextEditor::EndEdit(int WXUNUSED(row), - int WXUNUSED(col), - const wxGrid* WXUNUSED(grid), - const wxString& WXUNUSED(oldval), - wxString *newval) -{ - wxCHECK_MSG( m_control, false, - "wxGridCellTextEditor must be created first!" ); - - const wxString value = Text()->GetValue(); - if ( value == m_value ) - return false; - - m_value = value; - - if ( newval ) - *newval = m_value; - - return true; -} - -void wxGridCellTextEditor::ApplyEdit(int row, int col, wxGrid* grid) -{ - grid->GetTable()->SetValue(row, col, m_value); - m_value.clear(); -} - -void wxGridCellTextEditor::Reset() -{ - wxASSERT_MSG( m_control, "wxGridCellTextEditor must be created first!" ); - - DoReset(m_value); -} - -void wxGridCellTextEditor::DoReset(const wxString& startValue) -{ - Text()->SetValue(startValue); - Text()->SetInsertionPointEnd(); -} - -bool wxGridCellTextEditor::IsAcceptedKey(wxKeyEvent& event) -{ - switch ( event.GetKeyCode() ) - { - case WXK_DELETE: - case WXK_BACK: - return true; - - default: - return wxGridCellEditor::IsAcceptedKey(event); - } -} - -void wxGridCellTextEditor::StartingKey(wxKeyEvent& event) -{ - // Since this is now happening in the EVT_CHAR event EmulateKeyPress is no - // longer an appropriate way to get the character into the text control. - // Do it ourselves instead. We know that if we get this far that we have - // a valid character, so not a whole lot of testing needs to be done. - - wxTextCtrl* tc = Text(); - int ch; - - bool isPrintable; - -#if wxUSE_UNICODE - ch = event.GetUnicodeKey(); - if ( ch != WXK_NONE ) - isPrintable = true; - else -#endif // wxUSE_UNICODE - { - ch = event.GetKeyCode(); - isPrintable = ch >= WXK_SPACE && ch < WXK_START; - } - - switch (ch) - { - case WXK_DELETE: - // Delete the initial character when starting to edit with DELETE. - tc->Remove(0, 1); - break; - - case WXK_BACK: - // Delete the last character when starting to edit with BACKSPACE. - { - const long pos = tc->GetLastPosition(); - tc->Remove(pos - 1, pos); - } - break; - - default: - if ( isPrintable ) - tc->WriteText(static_cast(ch)); - break; - } -} - -void wxGridCellTextEditor::HandleReturn( wxKeyEvent& - WXUNUSED_GTK(WXUNUSED_MOTIF(event)) ) -{ -#if defined(__WXMOTIF__) || defined(__WXGTK__) - // wxMotif needs a little extra help... - size_t pos = (size_t)( Text()->GetInsertionPoint() ); - wxString s( Text()->GetValue() ); - s = s.Left(pos) + wxT("\n") + s.Mid(pos); - Text()->SetValue(s); - Text()->SetInsertionPoint( pos ); -#else - // the other ports can handle a Return key press - // - event.Skip(); -#endif -} - -void wxGridCellTextEditor::SetParameters(const wxString& params) -{ - if ( !params ) - { - // reset to default - m_maxChars = 0; - } - else - { - long tmp; - if ( params.ToLong(&tmp) ) - { - m_maxChars = (size_t)tmp; - } - else - { - wxLogDebug( wxT("Invalid wxGridCellTextEditor parameter string '%s' ignored"), params.c_str() ); - } - } -} - -#if wxUSE_VALIDATORS -void wxGridCellTextEditor::SetValidator(const wxValidator& validator) -{ - m_validator.reset(static_cast(validator.Clone())); -} -#endif - -wxGridCellEditor *wxGridCellTextEditor::Clone() const -{ - wxGridCellTextEditor* editor = new wxGridCellTextEditor(m_maxChars); -#if wxUSE_VALIDATORS - if ( m_validator ) - { - editor->SetValidator(*m_validator); - } -#endif - return editor; -} - -// return the value in the text control -wxString wxGridCellTextEditor::GetValue() const -{ - return Text()->GetValue(); -} - -// ---------------------------------------------------------------------------- -// wxGridCellNumberEditor -// ---------------------------------------------------------------------------- - -wxGridCellNumberEditor::wxGridCellNumberEditor(int min, int max) -{ - m_min = min; - m_max = max; -} - -void wxGridCellNumberEditor::Create(wxWindow* parent, - wxWindowID id, - wxEvtHandler* evtHandler) -{ -#if wxUSE_SPINCTRL - if ( HasRange() ) - { - // create a spin ctrl - m_control = new wxSpinCtrl(parent, wxID_ANY, wxEmptyString, - wxDefaultPosition, wxDefaultSize, - wxSP_ARROW_KEYS, - m_min, m_max); - - wxGridCellEditor::Create(parent, id, evtHandler); - } - else -#endif - { - // just a text control - wxGridCellTextEditor::Create(parent, id, evtHandler); - -#if wxUSE_VALIDATORS - Text()->SetValidator(wxIntegerValidator()); -#endif - } -} - -void wxGridCellNumberEditor::BeginEdit(int row, int col, wxGrid* grid) -{ - // first get the value - wxGridTableBase *table = grid->GetTable(); - if ( table->CanGetValueAs(row, col, wxGRID_VALUE_NUMBER) ) - { - m_value = table->GetValueAsLong(row, col); - } - else - { - m_value = 0; - wxString sValue = table->GetValue(row, col); - if (! sValue.ToLong(&m_value) && ! sValue.empty()) - { - wxFAIL_MSG( wxT("this cell doesn't have numeric value") ); - return; - } - } - -#if wxUSE_SPINCTRL - if ( HasRange() ) - { - Spin()->SetValue((int)m_value); - Spin()->SetFocus(); - } - else -#endif - { - DoBeginEdit(GetString()); - } -} - -bool wxGridCellNumberEditor::EndEdit(int WXUNUSED(row), - int WXUNUSED(col), - const wxGrid* WXUNUSED(grid), - const wxString& oldval, wxString *newval) -{ - long value = 0; - wxString text; - -#if wxUSE_SPINCTRL - if ( HasRange() ) - { - value = Spin()->GetValue(); - if ( value == m_value ) - return false; - - text.Printf(wxT("%ld"), value); - } - else // using unconstrained input -#endif // wxUSE_SPINCTRL - { - text = Text()->GetValue(); - if ( text.empty() ) - { - if ( oldval.empty() ) - return false; - } - else // non-empty text now (maybe 0) - { - if ( !text.ToLong(&value) ) - return false; - - // if value == m_value == 0 but old text was "" and new one is - // "0" something still did change - if ( value == m_value && (value || !oldval.empty()) ) - return false; - } - } - - m_value = value; - - if ( newval ) - *newval = text; - - return true; -} - -void wxGridCellNumberEditor::ApplyEdit(int row, int col, wxGrid* grid) -{ - wxGridTableBase * const table = grid->GetTable(); - if ( table->CanSetValueAs(row, col, wxGRID_VALUE_NUMBER) ) - table->SetValueAsLong(row, col, m_value); - else - table->SetValue(row, col, wxString::Format("%ld", m_value)); -} - -void wxGridCellNumberEditor::Reset() -{ -#if wxUSE_SPINCTRL - if ( HasRange() ) - { - Spin()->SetValue((int)m_value); - } - else -#endif - { - DoReset(GetString()); - } -} - -bool wxGridCellNumberEditor::IsAcceptedKey(wxKeyEvent& event) -{ - if ( wxGridCellEditor::IsAcceptedKey(event) ) - { - int keycode = event.GetKeyCode(); - if ( (keycode < 128) && - (wxIsdigit(keycode) || keycode == '+' || keycode == '-')) - { - return true; - } - } - - return false; -} - -void wxGridCellNumberEditor::StartingKey(wxKeyEvent& event) -{ - int keycode = event.GetKeyCode(); - if ( !HasRange() ) - { - if ( wxIsdigit(keycode) || keycode == '+' || keycode == '-') - { - wxGridCellTextEditor::StartingKey(event); - - // skip Skip() below - return; - } - } -#if wxUSE_SPINCTRL - else - { - if ( wxIsdigit(keycode) ) - { - wxSpinCtrl* spin = (wxSpinCtrl*)m_control; - spin->SetValue(keycode - '0'); - spin->SetSelection(1,1); - return; - } - } -#endif - - event.Skip(); -} - -void wxGridCellNumberEditor::SetParameters(const wxString& params) -{ - if ( !params ) - { - // reset to default - m_min = - m_max = -1; - } - else - { - long tmp; - if ( params.BeforeFirst(wxT(',')).ToLong(&tmp) ) - { - m_min = (int)tmp; - - if ( params.AfterFirst(wxT(',')).ToLong(&tmp) ) - { - m_max = (int)tmp; - - // skip the error message below - return; - } - } - - wxLogDebug(wxT("Invalid wxGridCellNumberEditor parameter string '%s' ignored"), params.c_str()); - } -} - -// return the value in the spin control if it is there (the text control otherwise) -wxString wxGridCellNumberEditor::GetValue() const -{ - wxString s; - -#if wxUSE_SPINCTRL - if ( HasRange() ) - { - long value = Spin()->GetValue(); - s.Printf(wxT("%ld"), value); - } - else -#endif - { - s = Text()->GetValue(); - } - - return s; -} - -// ---------------------------------------------------------------------------- -// wxGridCellFloatEditor -// ---------------------------------------------------------------------------- - -wxGridCellFloatEditor::wxGridCellFloatEditor(int width, - int precision, - int format) -{ - m_width = width; - m_precision = precision; - m_style = format; -} - -void wxGridCellFloatEditor::Create(wxWindow* parent, - wxWindowID id, - wxEvtHandler* evtHandler) -{ - wxGridCellTextEditor::Create(parent, id, evtHandler); - -#if wxUSE_VALIDATORS - Text()->SetValidator(wxFloatingPointValidator(m_precision)); -#endif -} - -void wxGridCellFloatEditor::BeginEdit(int row, int col, wxGrid* grid) -{ - // first get the value - wxGridTableBase * const table = grid->GetTable(); - if ( table->CanGetValueAs(row, col, wxGRID_VALUE_FLOAT) ) - { - m_value = table->GetValueAsDouble(row, col); - } - else - { - m_value = 0.0; - - const wxString value = table->GetValue(row, col); - if ( !value.empty() ) - { - if ( !value.ToDouble(&m_value) ) - { - wxFAIL_MSG( wxT("this cell doesn't have float value") ); - return; - } - } - } - - DoBeginEdit(GetString()); -} - -bool wxGridCellFloatEditor::EndEdit(int WXUNUSED(row), - int WXUNUSED(col), - const wxGrid* WXUNUSED(grid), - const wxString& oldval, wxString *newval) -{ - const wxString text(Text()->GetValue()); - - double value; - if ( !text.empty() ) - { - if ( !text.ToDouble(&value) ) - return false; - } - else // new value is empty string - { - if ( oldval.empty() ) - return false; // nothing changed - - value = 0.; - } - - // the test for empty strings ensures that we don't skip the value setting - // when "" is replaced by "0" or vice versa as "" numeric value is also 0. - if ( wxIsSameDouble(value, m_value) && !text.empty() && !oldval.empty() ) - return false; // nothing changed - - m_value = value; - - if ( newval ) - *newval = text; - - return true; -} - -void wxGridCellFloatEditor::ApplyEdit(int row, int col, wxGrid* grid) -{ - wxGridTableBase * const table = grid->GetTable(); - - if ( table->CanSetValueAs(row, col, wxGRID_VALUE_FLOAT) ) - table->SetValueAsDouble(row, col, m_value); - else - table->SetValue(row, col, Text()->GetValue()); -} - -void wxGridCellFloatEditor::Reset() -{ - DoReset(GetString()); -} - -void wxGridCellFloatEditor::StartingKey(wxKeyEvent& event) -{ - int keycode = event.GetKeyCode(); - char tmpbuf[2]; - tmpbuf[0] = (char) keycode; - tmpbuf[1] = '\0'; - wxString strbuf(tmpbuf, *wxConvCurrent); - -#if wxUSE_INTL - bool is_decimal_point = ( strbuf == - wxLocale::GetInfo(wxLOCALE_DECIMAL_POINT, wxLOCALE_CAT_NUMBER) ); -#else - bool is_decimal_point = ( strbuf == wxT(".") ); -#endif - - if ( wxIsdigit(keycode) || keycode == '+' || keycode == '-' - || is_decimal_point ) - { - wxGridCellTextEditor::StartingKey(event); - - // skip Skip() below - return; - } - - event.Skip(); -} - -void wxGridCellFloatEditor::SetParameters(const wxString& params) -{ - if ( !params ) - { - // reset to default - m_width = - m_precision = -1; - m_style = wxGRID_FLOAT_FORMAT_DEFAULT; - m_format.clear(); - } - else - { - wxString rest; - wxString tmp = params.BeforeFirst(wxT(','), &rest); - if ( !tmp.empty() ) - { - long width; - if ( tmp.ToLong(&width) ) - { - m_width = (int)width; - } - else - { - wxLogDebug(wxT("Invalid wxGridCellFloatRenderer width parameter string '%s ignored"), params.c_str()); - } - } - - tmp = rest.BeforeFirst(wxT(',')); - if ( !tmp.empty() ) - { - long precision; - if ( tmp.ToLong(&precision) ) - { - m_precision = (int)precision; - } - else - { - wxLogDebug(wxT("Invalid wxGridCellFloatRenderer precision parameter string '%s ignored"), params.c_str()); - } - } - - tmp = rest.AfterFirst(wxT(',')); - if ( !tmp.empty() ) - { - if ( tmp[0] == wxT('f') ) - { - m_style = wxGRID_FLOAT_FORMAT_FIXED; - } - else if ( tmp[0] == wxT('e') ) - { - m_style = wxGRID_FLOAT_FORMAT_SCIENTIFIC; - } - else if ( tmp[0] == wxT('g') ) - { - m_style = wxGRID_FLOAT_FORMAT_COMPACT; - } - else if ( tmp[0] == wxT('E') ) - { - m_style = wxGRID_FLOAT_FORMAT_SCIENTIFIC | - wxGRID_FLOAT_FORMAT_UPPER; - } - else if ( tmp[0] == wxT('F') ) - { - m_style = wxGRID_FLOAT_FORMAT_FIXED | - wxGRID_FLOAT_FORMAT_UPPER; - } - else if ( tmp[0] == wxT('G') ) - { - m_style = wxGRID_FLOAT_FORMAT_COMPACT | - wxGRID_FLOAT_FORMAT_UPPER; - } - else - { - wxLogDebug("Invalid wxGridCellFloatRenderer format " - "parameter string '%s ignored", params); - } - } - } -} - -wxString wxGridCellFloatEditor::GetString() -{ - if ( !m_format ) - { - if ( m_precision == -1 && m_width != -1) - { - // default precision - m_format.Printf(wxT("%%%d."), m_width); - } - else if ( m_precision != -1 && m_width == -1) - { - // default width - m_format.Printf(wxT("%%.%d"), m_precision); - } - else if ( m_precision != -1 && m_width != -1 ) - { - m_format.Printf(wxT("%%%d.%d"), m_width, m_precision); - } - else - { - // default width/precision - m_format = wxT("%"); - } - - bool isUpper = (m_style & wxGRID_FLOAT_FORMAT_UPPER) != 0; - if ( m_style & wxGRID_FLOAT_FORMAT_SCIENTIFIC ) - m_format += isUpper ? wxT('E') : wxT('e'); - else if ( m_style & wxGRID_FLOAT_FORMAT_COMPACT ) - m_format += isUpper ? wxT('G') : wxT('g'); - else - m_format += wxT('f'); - } - - return wxString::Format(m_format, m_value); -} - -bool wxGridCellFloatEditor::IsAcceptedKey(wxKeyEvent& event) -{ - if ( wxGridCellEditor::IsAcceptedKey(event) ) - { - const int keycode = event.GetKeyCode(); - if ( wxIsascii(keycode) ) - { -#if wxUSE_INTL - const wxString decimalPoint = - wxLocale::GetInfo(wxLOCALE_DECIMAL_POINT, wxLOCALE_CAT_NUMBER); -#else - const wxString decimalPoint(wxT('.')); -#endif - - // accept digits, 'e' as in '1e+6', also '-', '+', and '.' - if ( wxIsdigit(keycode) || - tolower(keycode) == 'e' || - keycode == decimalPoint || - keycode == '+' || - keycode == '-' ) - { - return true; - } - } - } - - return false; -} - -#endif // wxUSE_TEXTCTRL - -#if wxUSE_CHECKBOX - -// ---------------------------------------------------------------------------- -// wxGridCellBoolEditor -// ---------------------------------------------------------------------------- - -// the default values for GetValue() -wxString wxGridCellBoolEditor::ms_stringValues[2] = { wxT(""), wxT("1") }; - -void wxGridCellBoolEditor::Create(wxWindow* parent, - wxWindowID id, - wxEvtHandler* evtHandler) -{ - m_control = new wxCheckBox(parent, id, wxEmptyString, - wxDefaultPosition, wxDefaultSize, - wxNO_BORDER); - - wxGridCellEditor::Create(parent, id, evtHandler); -} - -void wxGridCellBoolEditor::SetSize(const wxRect& r) -{ - bool resize = false; - wxSize size = m_control->GetSize(); - wxCoord minSize = wxMin(r.width, r.height); - - // check if the checkbox is not too big/small for this cell - wxSize sizeBest = m_control->GetBestSize(); - if ( !(size == sizeBest) ) - { - // reset to default size if it had been made smaller - size = sizeBest; - - resize = true; - } - - if ( size.x >= minSize || size.y >= minSize ) - { - // leave 1 pixel margin - size.x = size.y = minSize - 2; - - resize = true; - } - - if ( resize ) - { - m_control->SetSize(size); - } - - // position it in the centre of the rectangle (TODO: support alignment?) - -#if defined(__WXGTK__) || defined (__WXMOTIF__) - // the checkbox without label still has some space to the right in wxGTK, - // so shift it to the right - size.x -= 8; -#elif defined(__WXMSW__) - // here too, but in other way - size.x += 1; - size.y -= 2; -#endif - - int hAlign = wxALIGN_CENTRE; - int vAlign = wxALIGN_CENTRE; - if (GetCellAttr()) - GetCellAttr()->GetAlignment(& hAlign, & vAlign); - - int x = 0, y = 0; - if (hAlign == wxALIGN_LEFT) - { - x = r.x + 2; - -#ifdef __WXMSW__ - x += 2; -#endif - - y = r.y + r.height / 2 - size.y / 2; - } - else if (hAlign == wxALIGN_RIGHT) - { - x = r.x + r.width - size.x - 2; - y = r.y + r.height / 2 - size.y / 2; - } - else if (hAlign == wxALIGN_CENTRE) - { - x = r.x + r.width / 2 - size.x / 2; - y = r.y + r.height / 2 - size.y / 2; - } - - m_control->Move(x, y); -} - -void wxGridCellBoolEditor::Show(bool show, wxGridCellAttr *attr) -{ - m_control->Show(show); - - if ( show ) - { - wxColour colBg = attr ? attr->GetBackgroundColour() : *wxLIGHT_GREY; - CBox()->SetBackgroundColour(colBg); - } -} - -void wxGridCellBoolEditor::BeginEdit(int row, int col, wxGrid* grid) -{ - wxASSERT_MSG(m_control, - wxT("The wxGridCellEditor must be created first!")); - - if (grid->GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL)) - { - m_value = grid->GetTable()->GetValueAsBool(row, col); - } - else - { - wxString cellval( grid->GetTable()->GetValue(row, col) ); - - if ( cellval == ms_stringValues[false] ) - m_value = false; - else if ( cellval == ms_stringValues[true] ) - m_value = true; - else - { - // do not try to be smart here and convert it to true or false - // because we'll still overwrite it with something different and - // this risks to be very surprising for the user code, let them - // know about it - wxFAIL_MSG( wxT("invalid value for a cell with bool editor!") ); - } - } - - CBox()->SetValue(m_value); - CBox()->SetFocus(); -} - -bool wxGridCellBoolEditor::EndEdit(int WXUNUSED(row), - int WXUNUSED(col), - const wxGrid* WXUNUSED(grid), - const wxString& WXUNUSED(oldval), - wxString *newval) -{ - bool value = CBox()->GetValue(); - if ( value == m_value ) - return false; - - m_value = value; - - if ( newval ) - *newval = GetValue(); - - return true; -} - -void wxGridCellBoolEditor::ApplyEdit(int row, int col, wxGrid* grid) -{ - wxGridTableBase * const table = grid->GetTable(); - if ( table->CanSetValueAs(row, col, wxGRID_VALUE_BOOL) ) - table->SetValueAsBool(row, col, m_value); - else - table->SetValue(row, col, GetValue()); -} - -void wxGridCellBoolEditor::Reset() -{ - wxASSERT_MSG(m_control, - wxT("The wxGridCellEditor must be created first!")); - - CBox()->SetValue(m_value); -} - -void wxGridCellBoolEditor::StartingClick() -{ - CBox()->SetValue(!CBox()->GetValue()); -} - -bool wxGridCellBoolEditor::IsAcceptedKey(wxKeyEvent& event) -{ - if ( wxGridCellEditor::IsAcceptedKey(event) ) - { - int keycode = event.GetKeyCode(); - switch ( keycode ) - { - case WXK_SPACE: - case '+': - case '-': - return true; - } - } - - return false; -} - -void wxGridCellBoolEditor::StartingKey(wxKeyEvent& event) -{ - int keycode = event.GetKeyCode(); - switch ( keycode ) - { - case WXK_SPACE: - CBox()->SetValue(!CBox()->GetValue()); - break; - - case '+': - CBox()->SetValue(true); - break; - - case '-': - CBox()->SetValue(false); - break; - } -} - -wxString wxGridCellBoolEditor::GetValue() const -{ - return ms_stringValues[CBox()->GetValue()]; -} - -/* static */ void -wxGridCellBoolEditor::UseStringValues(const wxString& valueTrue, - const wxString& valueFalse) -{ - ms_stringValues[false] = valueFalse; - ms_stringValues[true] = valueTrue; -} - -/* static */ bool -wxGridCellBoolEditor::IsTrueValue(const wxString& value) -{ - return value == ms_stringValues[true]; -} - -#endif // wxUSE_CHECKBOX - -#if wxUSE_COMBOBOX - -// ---------------------------------------------------------------------------- -// wxGridCellChoiceEditor -// ---------------------------------------------------------------------------- - -wxGridCellChoiceEditor::wxGridCellChoiceEditor(const wxArrayString& choices, - bool allowOthers) - : m_choices(choices), - m_allowOthers(allowOthers) { } - -wxGridCellChoiceEditor::wxGridCellChoiceEditor(size_t count, - const wxString choices[], - bool allowOthers) - : m_allowOthers(allowOthers) -{ - if ( count ) - { - m_choices.Alloc(count); - for ( size_t n = 0; n < count; n++ ) - { - m_choices.Add(choices[n]); - } - } -} - -wxGridCellEditor *wxGridCellChoiceEditor::Clone() const -{ - wxGridCellChoiceEditor *editor = new wxGridCellChoiceEditor; - editor->m_allowOthers = m_allowOthers; - editor->m_choices = m_choices; - - return editor; -} - -void wxGridCellChoiceEditor::Create(wxWindow* parent, - wxWindowID id, - wxEvtHandler* evtHandler) -{ - int style = wxTE_PROCESS_ENTER | - wxTE_PROCESS_TAB | - wxBORDER_NONE; - - if ( !m_allowOthers ) - style |= wxCB_READONLY; - m_control = new wxComboBox(parent, id, wxEmptyString, - wxDefaultPosition, wxDefaultSize, - m_choices, - style); - - wxGridCellEditor::Create(parent, id, evtHandler); -} - -void wxGridCellChoiceEditor::SetSize(const wxRect& rect) -{ - wxASSERT_MSG(m_control, - wxT("The wxGridCellChoiceEditor must be created first!")); - - // Check that the height is not too small to fit the combobox. - wxRect rectTallEnough = rect; - const wxSize bestSize = m_control->GetBestSize(); - const wxCoord diffY = bestSize.GetHeight() - rectTallEnough.GetHeight(); - if ( diffY > 0 ) - { - // Do make it tall enough. - rectTallEnough.height += diffY; - - // Also centre the effective rectangle vertically with respect to the - // original one. - rectTallEnough.y -= diffY/2; - } - //else: The rectangle provided is already tall enough. - - wxGridCellEditor::SetSize(rectTallEnough); -} - -void wxGridCellChoiceEditor::PaintBackground(wxDC& dc, - const wxRect& rectCell, - const wxGridCellAttr& attr) -{ - // as we fill the entire client area, don't do anything here to minimize - // flicker - - // TODO: It doesn't actually fill the client area since the height of a - // combo always defaults to the standard. Until someone has time to - // figure out the right rectangle to paint, just do it the normal way. - wxGridCellEditor::PaintBackground(dc, rectCell, attr); -} - -void wxGridCellChoiceEditor::BeginEdit(int row, int col, wxGrid* grid) -{ - wxASSERT_MSG(m_control, - wxT("The wxGridCellEditor must be created first!")); - - wxGridCellEditorEvtHandler* evtHandler = NULL; - if (m_control) - evtHandler = wxDynamicCast(m_control->GetEventHandler(), wxGridCellEditorEvtHandler); - - // Don't immediately end if we get a kill focus event within BeginEdit - if (evtHandler) - evtHandler->SetInSetFocus(true); - - m_value = grid->GetTable()->GetValue(row, col); - - Reset(); // this updates combo box to correspond to m_value - - Combo()->SetFocus(); - -#ifdef __WXOSX_COCOA__ - // This is a work around for the combobox being simply dismissed when a - // choice is made in it under OS X. The bug is almost certainly due to a - // problem in focus events generation logic but it's not obvious to fix and - // for now this at least allows to use wxGrid. - Combo()->Popup(); -#endif - - if (evtHandler) - { - // When dropping down the menu, a kill focus event - // happens after this point, so we can't reset the flag yet. -#if !defined(__WXGTK20__) - evtHandler->SetInSetFocus(false); -#endif - } -} - -bool wxGridCellChoiceEditor::EndEdit(int WXUNUSED(row), - int WXUNUSED(col), - const wxGrid* WXUNUSED(grid), - const wxString& WXUNUSED(oldval), - wxString *newval) -{ - const wxString value = Combo()->GetValue(); - if ( value == m_value ) - return false; - - m_value = value; - - if ( newval ) - *newval = value; - - return true; -} - -void wxGridCellChoiceEditor::ApplyEdit(int row, int col, wxGrid* grid) -{ - grid->GetTable()->SetValue(row, col, m_value); -} - -void wxGridCellChoiceEditor::Reset() -{ - if (m_allowOthers) - { - Combo()->SetValue(m_value); - Combo()->SetInsertionPointEnd(); - } - else // the combobox is read-only - { - // find the right position, or default to the first if not found - int pos = Combo()->FindString(m_value); - if (pos == wxNOT_FOUND) - pos = 0; - Combo()->SetSelection(pos); - } -} - -void wxGridCellChoiceEditor::SetParameters(const wxString& params) -{ - if ( !params ) - { - // what can we do? - return; - } - - m_choices.Empty(); - - wxStringTokenizer tk(params, wxT(',')); - while ( tk.HasMoreTokens() ) - { - m_choices.Add(tk.GetNextToken()); - } -} - -// return the value in the text control -wxString wxGridCellChoiceEditor::GetValue() const -{ - return Combo()->GetValue(); -} - -#endif // wxUSE_COMBOBOX - -#if wxUSE_COMBOBOX - -// ---------------------------------------------------------------------------- -// wxGridCellEnumEditor -// ---------------------------------------------------------------------------- - -// A cell editor which displays an enum number as a textual equivalent. eg -// data in cell is 0,1,2 ... n the cell could be displayed as -// "John","Fred"..."Bob" in the combo choice box - -wxGridCellEnumEditor::wxGridCellEnumEditor(const wxString& choices) - :wxGridCellChoiceEditor() -{ - m_index = -1; - - if (!choices.empty()) - SetParameters(choices); -} - -wxGridCellEditor *wxGridCellEnumEditor::Clone() const -{ - wxGridCellEnumEditor *editor = new wxGridCellEnumEditor(); - editor->m_index = m_index; - return editor; -} - -void wxGridCellEnumEditor::BeginEdit(int row, int col, wxGrid* grid) -{ - wxASSERT_MSG(m_control, - wxT("The wxGridCellEnumEditor must be Created first!")); - - wxGridCellEditorEvtHandler* evtHandler = NULL; - if (m_control) - evtHandler = wxDynamicCast(m_control->GetEventHandler(), wxGridCellEditorEvtHandler); - - // Don't immediately end if we get a kill focus event within BeginEdit - if (evtHandler) - evtHandler->SetInSetFocus(true); - - wxGridTableBase *table = grid->GetTable(); - - if ( table->CanGetValueAs(row, col, wxGRID_VALUE_NUMBER) ) - { - m_index = table->GetValueAsLong(row, col); - } - else - { - wxString startValue = table->GetValue(row, col); - if (startValue.IsNumber() && !startValue.empty()) - { - startValue.ToLong(&m_index); - } - else - { - m_index = -1; - } - } - - Combo()->SetSelection(m_index); - Combo()->SetFocus(); - -#ifdef __WXOSX_COCOA__ - // This is a work around for the combobox being simply dismissed when a - // choice is made in it under OS X. The bug is almost certainly due to a - // problem in focus events generation logic but it's not obvious to fix and - // for now this at least allows to use wxGrid. - Combo()->Popup(); -#endif - - if (evtHandler) - { - // When dropping down the menu, a kill focus event - // happens after this point, so we can't reset the flag yet. -#if !defined(__WXGTK20__) - evtHandler->SetInSetFocus(false); -#endif - } -} - -bool wxGridCellEnumEditor::EndEdit(int WXUNUSED(row), - int WXUNUSED(col), - const wxGrid* WXUNUSED(grid), - const wxString& WXUNUSED(oldval), - wxString *newval) -{ - long idx = Combo()->GetSelection(); - if ( idx == m_index ) - return false; - - m_index = idx; - - if ( newval ) - newval->Printf("%ld", m_index); - - return true; -} - -void wxGridCellEnumEditor::ApplyEdit(int row, int col, wxGrid* grid) -{ - wxGridTableBase * const table = grid->GetTable(); - if ( table->CanSetValueAs(row, col, wxGRID_VALUE_NUMBER) ) - table->SetValueAsLong(row, col, m_index); - else - table->SetValue(row, col, wxString::Format("%ld", m_index)); -} - -#endif // wxUSE_COMBOBOX - -// ---------------------------------------------------------------------------- -// wxGridCellAutoWrapStringEditor -// ---------------------------------------------------------------------------- - -void -wxGridCellAutoWrapStringEditor::Create(wxWindow* parent, - wxWindowID id, - wxEvtHandler* evtHandler) -{ - wxGridCellTextEditor::DoCreate(parent, id, evtHandler, - wxTE_MULTILINE | wxTE_RICH); -} - - -#endif // wxUSE_GRID diff --git a/Externals/wxWidgets3/src/generic/gridsel.cpp b/Externals/wxWidgets3/src/generic/gridsel.cpp deleted file mode 100644 index c6cf59f389..0000000000 --- a/Externals/wxWidgets3/src/generic/gridsel.cpp +++ /dev/null @@ -1,1238 +0,0 @@ -/////////////////////////////////////////////////////////////////////////// -// Name: src/generic/gridsel.cpp -// Purpose: wxGridSelection -// Author: Stefan Neis -// Modified by: -// Created: 20/02/1999 -// Copyright: (c) Stefan Neis (Stefan.Neis@t-online.de) -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx/wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#if wxUSE_GRID - -#include "wx/generic/gridsel.h" - - -// Some explanation for the members of the class: -// m_cellSelection stores individual selected cells -// -- this is only used if m_selectionMode == wxGridSelectCells -// m_blockSelectionTopLeft and m_blockSelectionBottomRight -// store the upper left and lower right corner of selected Blocks -// m_rowSelection and m_colSelection store individual selected -// rows and columns; maybe those are superfluous and should be -// treated as blocks? - -wxGridSelection::wxGridSelection( wxGrid * grid, - wxGrid::wxGridSelectionModes sel ) -{ - m_grid = grid; - m_selectionMode = sel; -} - -bool wxGridSelection::IsSelection() -{ - return ( m_cellSelection.GetCount() || m_blockSelectionTopLeft.GetCount() || - m_rowSelection.GetCount() || m_colSelection.GetCount() ); -} - -bool wxGridSelection::IsInSelection( int row, int col ) -{ - size_t count; - - // First check whether the given cell is individually selected - // (if m_selectionMode is wxGridSelectCells). - if ( m_selectionMode == wxGrid::wxGridSelectCells ) - { - count = m_cellSelection.GetCount(); - for ( size_t n = 0; n < count; n++ ) - { - wxGridCellCoords& coords = m_cellSelection[n]; - if ( row == coords.GetRow() && col == coords.GetCol() ) - return true; - } - } - - // Now check whether the given cell is - // contained in one of the selected blocks. - count = m_blockSelectionTopLeft.GetCount(); - for ( size_t n = 0; n < count; n++ ) - { - wxGridCellCoords& coords1 = m_blockSelectionTopLeft[n]; - wxGridCellCoords& coords2 = m_blockSelectionBottomRight[n]; - if ( BlockContainsCell(coords1.GetRow(), coords1.GetCol(), - coords2.GetRow(), coords2.GetCol(), - row, col ) ) - return true; - } - - // Now check whether the given cell is - // contained in one of the selected rows - // (unless we are in column selection mode). - if ( m_selectionMode != wxGrid::wxGridSelectColumns ) - { - count = m_rowSelection.GetCount(); - for ( size_t n = 0; n < count; n++ ) - { - if ( row == m_rowSelection[n] ) - return true; - } - } - - // Now check whether the given cell is - // contained in one of the selected columns - // (unless we are in row selection mode). - if ( m_selectionMode != wxGrid::wxGridSelectRows ) - { - count = m_colSelection.GetCount(); - for ( size_t n = 0; n < count; n++ ) - { - if ( col == m_colSelection[n] ) - return true; - } - } - - return false; -} - -// Change the selection mode -void wxGridSelection::SetSelectionMode( wxGrid::wxGridSelectionModes selmode ) -{ - // if selection mode is unchanged return immediately - if (selmode == m_selectionMode) - return; - - if ( m_selectionMode != wxGrid::wxGridSelectCells ) - { - // if changing form row to column selection - // or vice versa, clear the selection. - if ( selmode != wxGrid::wxGridSelectCells ) - ClearSelection(); - - m_selectionMode = selmode; - } - else - { - // if changing from cell selection to something else, - // promote selected cells/blocks to whole rows/columns. - size_t n; - while ( ( n = m_cellSelection.GetCount() ) > 0 ) - { - n--; - wxGridCellCoords& coords = m_cellSelection[n]; - int row = coords.GetRow(); - int col = coords.GetCol(); - m_cellSelection.RemoveAt(n); - if (selmode == wxGrid::wxGridSelectRows) - SelectRow( row ); - else // selmode == wxGridSelectColumns) - SelectCol( col ); - } - - // Note that m_blockSelectionTopLeft's size may be changing! - for (n = 0; n < m_blockSelectionTopLeft.GetCount(); n++) - { - wxGridCellCoords& coords = m_blockSelectionTopLeft[n]; - int topRow = coords.GetRow(); - int leftCol = coords.GetCol(); - coords = m_blockSelectionBottomRight[n]; - int bottomRow = coords.GetRow(); - int rightCol = coords.GetCol(); - - if (selmode == wxGrid::wxGridSelectRows) - { - if (leftCol != 0 || rightCol != m_grid->GetNumberCols() - 1 ) - { - m_blockSelectionTopLeft.RemoveAt(n); - m_blockSelectionBottomRight.RemoveAt(n); - SelectBlockNoEvent( topRow, 0, - bottomRow, m_grid->GetNumberCols() - 1); - } - } - else // selmode == wxGridSelectColumns) - { - if (topRow != 0 || bottomRow != m_grid->GetNumberRows() - 1 ) - { - m_blockSelectionTopLeft.RemoveAt(n); - m_blockSelectionBottomRight.RemoveAt(n); - SelectBlockNoEvent(0, leftCol, - m_grid->GetNumberRows() - 1, rightCol); - } - } - } - - m_selectionMode = selmode; - } -} - -void wxGridSelection::SelectRow(int row, const wxKeyboardState& kbd) -{ - if ( m_selectionMode == wxGrid::wxGridSelectColumns ) - return; - - size_t count, n; - - // Remove single cells contained in newly selected block. - if ( m_selectionMode == wxGrid::wxGridSelectCells ) - { - count = m_cellSelection.GetCount(); - for ( n = 0; n < count; n++ ) - { - wxGridCellCoords& coords = m_cellSelection[n]; - if ( BlockContainsCell( row, 0, row, m_grid->GetNumberCols() - 1, - coords.GetRow(), coords.GetCol() ) ) - { - m_cellSelection.RemoveAt(n); - n--; - count--; - } - } - } - - // Simplify list of selected blocks (if possible) - count = m_blockSelectionTopLeft.GetCount(); - bool done = false; - - for ( n = 0; n < count; n++ ) - { - wxGridCellCoords& coords1 = m_blockSelectionTopLeft[n]; - wxGridCellCoords& coords2 = m_blockSelectionBottomRight[n]; - - // Remove block if it is a subset of the row - if ( coords1.GetRow() == row && row == coords2.GetRow() ) - { - m_blockSelectionTopLeft.RemoveAt(n); - m_blockSelectionBottomRight.RemoveAt(n); - n--; - count--; - } - else if ( coords1.GetCol() == 0 && - coords2.GetCol() == m_grid->GetNumberCols() - 1 ) - { - // silently return, if row is contained in block - if ( coords1.GetRow() <= row && row <= coords2.GetRow() ) - return; - // expand block, if it touched row - else if ( coords1.GetRow() == row + 1) - { - coords1.SetRow(row); - done = true; - } - else if ( coords2.GetRow() == row - 1) - { - coords2.SetRow(row); - done = true; - } - } - } - - // Unless we successfully handled the row, - // check whether row is already selected. - if ( !done ) - { - count = m_rowSelection.GetCount(); - for ( n = 0; n < count; n++ ) - { - if ( row == m_rowSelection[n] ) - return; - } - - // Add row to selection - m_rowSelection.Add(row); - } - - // Update View: - if ( !m_grid->GetBatchCount() ) - { - wxRect r = m_grid->BlockToDeviceRect( wxGridCellCoords( row, 0 ), - wxGridCellCoords( row, m_grid->GetNumberCols() - 1 ) ); - ((wxWindow *)m_grid->m_gridWin)->Refresh( false, &r ); - } - - // Send Event - wxGridRangeSelectEvent gridEvt( m_grid->GetId(), - wxEVT_GRID_RANGE_SELECT, - m_grid, - wxGridCellCoords( row, 0 ), - wxGridCellCoords( row, m_grid->GetNumberCols() - 1 ), - true, - kbd); - - m_grid->GetEventHandler()->ProcessEvent( gridEvt ); -} - -void wxGridSelection::SelectCol(int col, const wxKeyboardState& kbd) -{ - if ( m_selectionMode == wxGrid::wxGridSelectRows ) - return; - size_t count, n; - - // Remove single cells contained in newly selected block. - if ( m_selectionMode == wxGrid::wxGridSelectCells ) - { - count = m_cellSelection.GetCount(); - for ( n = 0; n < count; n++ ) - { - wxGridCellCoords& coords = m_cellSelection[n]; - if ( BlockContainsCell( 0, col, m_grid->GetNumberRows() - 1, col, - coords.GetRow(), coords.GetCol() ) ) - { - m_cellSelection.RemoveAt(n); - n--; - count--; - } - } - } - - // Simplify list of selected blocks (if possible) - count = m_blockSelectionTopLeft.GetCount(); - bool done = false; - for ( n = 0; n < count; n++ ) - { - wxGridCellCoords& coords1 = m_blockSelectionTopLeft[n]; - wxGridCellCoords& coords2 = m_blockSelectionBottomRight[n]; - - // Remove block if it is a subset of the column - if ( coords1.GetCol() == col && col == coords2.GetCol() ) - { - m_blockSelectionTopLeft.RemoveAt(n); - m_blockSelectionBottomRight.RemoveAt(n); - n--; - count--; - } - else if ( coords1.GetRow() == 0 && - coords2.GetRow() == m_grid->GetNumberRows() - 1 ) - { - // silently return, if row is contained in block - if ( coords1.GetCol() <= col && col <= coords2.GetCol() ) - return; - // expand block, if it touched col - else if ( coords1.GetCol() == col + 1) - { - coords1.SetCol(col); - done = true; - } - else if ( coords2.GetCol() == col - 1) - { - coords2.SetCol(col); - done = true; - } - } - } - - // Unless we successfully handled the column, - // Check whether col is already selected. - if ( !done ) - { - count = m_colSelection.GetCount(); - for ( n = 0; n < count; n++ ) - { - if ( col == m_colSelection[n] ) - return; - } - - // Add col to selection - m_colSelection.Add(col); - } - - // Update View: - if ( !m_grid->GetBatchCount() ) - { - wxRect r = m_grid->BlockToDeviceRect( wxGridCellCoords( 0, col ), - wxGridCellCoords( m_grid->GetNumberRows() - 1, col ) ); - ((wxWindow *)m_grid->m_gridWin)->Refresh( false, &r ); - } - - // Send Event - wxGridRangeSelectEvent gridEvt( m_grid->GetId(), - wxEVT_GRID_RANGE_SELECT, - m_grid, - wxGridCellCoords( 0, col ), - wxGridCellCoords( m_grid->GetNumberRows() - 1, col ), - true, - kbd ); - - m_grid->GetEventHandler()->ProcessEvent( gridEvt ); -} - -void wxGridSelection::SelectBlock( int topRow, int leftCol, - int bottomRow, int rightCol, - const wxKeyboardState& kbd, - bool sendEvent ) -{ - // Fix the coordinates of the block if needed. - switch ( m_selectionMode ) - { - default: - wxFAIL_MSG( "unknown selection mode" ); - wxFALLTHROUGH; - - case wxGrid::wxGridSelectCells: - // nothing to do -- in this mode arbitrary blocks can be selected - break; - - case wxGrid::wxGridSelectRows: - leftCol = 0; - rightCol = m_grid->GetNumberCols() - 1; - break; - - case wxGrid::wxGridSelectColumns: - topRow = 0; - bottomRow = m_grid->GetNumberRows() - 1; - break; - - case wxGrid::wxGridSelectRowsOrColumns: - // block selection doesn't make sense for this mode, we could only - // select the entire grid but this wouldn't be useful - return; - } - - if ( topRow > bottomRow ) - { - int temp = topRow; - topRow = bottomRow; - bottomRow = temp; - } - - if ( leftCol > rightCol ) - { - int temp = leftCol; - leftCol = rightCol; - rightCol = temp; - } - - // Handle single cell selection in SelectCell. - // (MB: added check for selection mode here to prevent - // crashes if, for example, we are select rows and the - // grid only has 1 col) - if ( m_selectionMode == wxGrid::wxGridSelectCells && - topRow == bottomRow && leftCol == rightCol ) - { - SelectCell( topRow, leftCol, kbd, sendEvent ); - } - - size_t count, n; - - if ( m_selectionMode == wxGrid::wxGridSelectRows ) - { - // find out which rows are already selected: - wxArrayInt alreadyselected; - alreadyselected.Add(0,bottomRow-topRow+1); - for( n = 0; n < m_rowSelection.GetCount(); n++) - { - int row = m_rowSelection[n]; - if( (row >= topRow) && (row <= bottomRow) ) - { - alreadyselected[ row - topRow ]=1; - } - } - - // add the newly selected rows: - for ( int row = topRow; row <= bottomRow; row++ ) - { - if ( alreadyselected[ row - topRow ] == 0 ) - { - m_rowSelection.Add( row ); - } - } - } - else if ( m_selectionMode == wxGrid::wxGridSelectColumns ) - { - // find out which columns are already selected: - wxArrayInt alreadyselected; - alreadyselected.Add(0,rightCol-leftCol+1); - for( n = 0; n < m_colSelection.GetCount(); n++) - { - int col = m_colSelection[n]; - if( (col >= leftCol) && (col <= rightCol) ) - { - alreadyselected[ col - leftCol ]=1; - } - } - - // add the newly selected columns: - for ( int col = leftCol; col <= rightCol; col++ ) - { - if ( alreadyselected[ col - leftCol ] == 0 ) - { - m_colSelection.Add( col ); - } - } - } - else - { - // Remove single cells contained in newly selected block. - if ( m_selectionMode == wxGrid::wxGridSelectCells ) - { - count = m_cellSelection.GetCount(); - for ( n = 0; n < count; n++ ) - { - wxGridCellCoords& coords = m_cellSelection[n]; - if ( BlockContainsCell( topRow, leftCol, bottomRow, rightCol, - coords.GetRow(), coords.GetCol() ) ) - { - m_cellSelection.RemoveAt(n); - n--; - count--; - } - } - } - - // If a block containing the selection is already selected, return, - // if a block contained in the selection is found, remove it. - - count = m_blockSelectionTopLeft.GetCount(); - for ( n = 0; n < count; n++ ) - { - wxGridCellCoords& coords1 = m_blockSelectionTopLeft[n]; - wxGridCellCoords& coords2 = m_blockSelectionBottomRight[n]; - - switch ( BlockContain( coords1.GetRow(), coords1.GetCol(), - coords2.GetRow(), coords2.GetCol(), - topRow, leftCol, bottomRow, rightCol ) ) - { - case 1: - return; - - case -1: - m_blockSelectionTopLeft.RemoveAt(n); - m_blockSelectionBottomRight.RemoveAt(n); - n--; - count--; - break; - - default: - break; - } - } - - // If a row containing the selection is already selected, return, - // if a row contained in newly selected block is found, remove it. - count = m_rowSelection.GetCount(); - for ( n = 0; n < count; n++ ) - { - switch ( BlockContain( m_rowSelection[n], 0, - m_rowSelection[n], m_grid->GetNumberCols() - 1, - topRow, leftCol, bottomRow, rightCol ) ) - { - case 1: - return; - - case -1: - m_rowSelection.RemoveAt(n); - n--; - count--; - break; - - default: - break; - } - } - - // Same for columns. - count = m_colSelection.GetCount(); - for ( n = 0; n < count; n++ ) - { - switch ( BlockContain( 0, m_colSelection[n], - m_grid->GetNumberRows() - 1, m_colSelection[n], - topRow, leftCol, bottomRow, rightCol ) ) - { - case 1: - return; - - case -1: - m_colSelection.RemoveAt(n); - n--; - count--; - break; - - default: - break; - } - } - - m_blockSelectionTopLeft.Add( wxGridCellCoords( topRow, leftCol ) ); - m_blockSelectionBottomRight.Add( wxGridCellCoords( bottomRow, rightCol ) ); - } - // Update View: - if ( !m_grid->GetBatchCount() ) - { - wxRect r = m_grid->BlockToDeviceRect( wxGridCellCoords( topRow, leftCol ), - wxGridCellCoords( bottomRow, rightCol ) ); - ((wxWindow *)m_grid->m_gridWin)->Refresh( false, &r ); - } - - // Send Event, if not disabled. - if ( sendEvent ) - { - wxGridRangeSelectEvent gridEvt( m_grid->GetId(), - wxEVT_GRID_RANGE_SELECT, - m_grid, - wxGridCellCoords( topRow, leftCol ), - wxGridCellCoords( bottomRow, rightCol ), - true, - kbd); - m_grid->GetEventHandler()->ProcessEvent( gridEvt ); - } -} - -void wxGridSelection::SelectCell( int row, int col, - const wxKeyboardState& kbd, - bool sendEvent ) -{ - if ( IsInSelection ( row, col ) ) - return; - - wxGridCellCoords selectedTopLeft, selectedBottomRight; - if ( m_selectionMode == wxGrid::wxGridSelectRows ) - { - m_rowSelection.Add( row ); - selectedTopLeft = wxGridCellCoords( row, 0 ); - selectedBottomRight = wxGridCellCoords( row, m_grid->GetNumberCols() - 1 ); - } - else if ( m_selectionMode == wxGrid::wxGridSelectColumns ) - { - m_colSelection.Add( col ); - selectedTopLeft = wxGridCellCoords( 0, col ); - selectedBottomRight = wxGridCellCoords( m_grid->GetNumberRows() - 1, col ); - } - else - { - m_cellSelection.Add( wxGridCellCoords( row, col ) ); - selectedTopLeft = wxGridCellCoords( row, col ); - selectedBottomRight = wxGridCellCoords( row, col ); - } - - // Update View: - if ( !m_grid->GetBatchCount() ) - { - wxRect r = m_grid->BlockToDeviceRect( - selectedTopLeft, - selectedBottomRight ); - ((wxWindow *)m_grid->m_gridWin)->Refresh( false, &r ); - } - - // Send event - if (sendEvent) - { - wxGridRangeSelectEvent gridEvt( m_grid->GetId(), - wxEVT_GRID_RANGE_SELECT, - m_grid, - selectedTopLeft, - selectedBottomRight, - true, - kbd); - m_grid->GetEventHandler()->ProcessEvent( gridEvt ); - } -} - -void -wxGridSelection::ToggleCellSelection(int row, int col, - const wxKeyboardState& kbd) -{ - // if the cell is not selected, select it - if ( !IsInSelection ( row, col ) ) - { - SelectCell(row, col, kbd); - - return; - } - - // otherwise deselect it. This can be simple or more or - // less difficult, depending on how the cell is selected. - size_t count, n; - - // The simplest case: The cell is contained in m_cellSelection - // Then it can't be contained in rows/cols/block (since those - // would remove the cell from m_cellSelection on creation), so - // we just have to remove it from m_cellSelection. - - if ( m_selectionMode == wxGrid::wxGridSelectCells ) - { - count = m_cellSelection.GetCount(); - for ( n = 0; n < count; n++ ) - { - const wxGridCellCoords& sel = m_cellSelection[n]; - if ( row == sel.GetRow() && col == sel.GetCol() ) - { - wxGridCellCoords coords = m_cellSelection[n]; - m_cellSelection.RemoveAt(n); - if ( !m_grid->GetBatchCount() ) - { - wxRect r = m_grid->BlockToDeviceRect( coords, coords ); - ((wxWindow *)m_grid->m_gridWin)->Refresh( false, &r ); - } - - // Send event - wxGridRangeSelectEvent gridEvt( m_grid->GetId(), - wxEVT_GRID_RANGE_SELECT, - m_grid, - wxGridCellCoords( row, col ), - wxGridCellCoords( row, col ), - false, - kbd ); - m_grid->GetEventHandler()->ProcessEvent( gridEvt ); - - return; - } - } - } - - // The most difficult case: The cell is member of one or even several - // blocks. Split each such block in up to 4 new parts, that don't - // contain the cell to be selected, like this: - // |---------------------------| - // | | - // | part 1 | - // | | - // |---------------------------| - // | part 3 |x| part 4 | - // |---------------------------| - // | | - // | part 2 | - // | | - // |---------------------------| - // (The x marks the newly deselected cell). - // Note: in row selection mode, we only need part1 and part2; - // in column selection mode, we only need part 3 and part4, - // which are expanded to whole columns automatically! - - count = m_blockSelectionTopLeft.GetCount(); - for ( n = 0; n < count; n++ ) - { - wxGridCellCoords& coords1 = m_blockSelectionTopLeft[n]; - wxGridCellCoords& coords2 = m_blockSelectionBottomRight[n]; - int topRow = coords1.GetRow(); - int leftCol = coords1.GetCol(); - int bottomRow = coords2.GetRow(); - int rightCol = coords2.GetCol(); - - if ( BlockContainsCell( topRow, leftCol, bottomRow, rightCol, row, col ) ) - { - // remove the block - m_blockSelectionTopLeft.RemoveAt(n); - m_blockSelectionBottomRight.RemoveAt(n); - n--; - count--; - - // add up to 4 smaller blocks and set update region - if ( m_selectionMode != wxGrid::wxGridSelectColumns ) - { - if ( topRow < row ) - SelectBlockNoEvent(topRow, leftCol, row - 1, rightCol); - if ( bottomRow > row ) - SelectBlockNoEvent(row + 1, leftCol, bottomRow, rightCol); - } - - if ( m_selectionMode != wxGrid::wxGridSelectRows ) - { - if ( leftCol < col ) - SelectBlockNoEvent(row, leftCol, row, col - 1); - if ( rightCol > col ) - SelectBlockNoEvent(row, col + 1, row, rightCol); - } - } - } - - bool rowSelectionWasChanged = false; - // remove a cell from a row, adding up to two new blocks - if ( m_selectionMode != wxGrid::wxGridSelectColumns ) - { - count = m_rowSelection.GetCount(); - for ( n = 0; n < count; n++ ) - { - if ( m_rowSelection[n] == row ) - { - m_rowSelection.RemoveAt(n); - n--; - count--; - - rowSelectionWasChanged = true; - - if (m_selectionMode == wxGrid::wxGridSelectCells) - { - if ( col > 0 ) - SelectBlockNoEvent(row, 0, row, col - 1); - if ( col < m_grid->GetNumberCols() - 1 ) - SelectBlockNoEvent( row, col + 1, - row, m_grid->GetNumberCols() - 1); - } - } - } - } - - bool colSelectionWasChanged = false; - // remove a cell from a column, adding up to two new blocks - if ( m_selectionMode != wxGrid::wxGridSelectRows ) - { - count = m_colSelection.GetCount(); - for ( n = 0; n < count; n++ ) - { - if ( m_colSelection[n] == col ) - { - m_colSelection.RemoveAt(n); - n--; - count--; - - colSelectionWasChanged = true; - - if (m_selectionMode == wxGrid::wxGridSelectCells) - { - if ( row > 0 ) - SelectBlockNoEvent(0, col, row - 1, col); - if ( row < m_grid->GetNumberRows() - 1 ) - SelectBlockNoEvent(row + 1, col, - m_grid->GetNumberRows() - 1, col); - } - } - } - } - - // Refresh the screen and send the event; according to m_selectionMode, - // we need to either update only the cell, or the whole row/column. - wxRect r; - if ( m_selectionMode == wxGrid::wxGridSelectCells ) - { - if ( !m_grid->GetBatchCount() ) - { - r = m_grid->BlockToDeviceRect( - wxGridCellCoords( row, col ), - wxGridCellCoords( row, col ) ); - ((wxWindow *)m_grid->m_gridWin)->Refresh( false, &r ); - } - - wxGridRangeSelectEvent gridEvt( m_grid->GetId(), - wxEVT_GRID_RANGE_SELECT, - m_grid, - wxGridCellCoords( row, col ), - wxGridCellCoords( row, col ), - false, - kbd ); - m_grid->GetEventHandler()->ProcessEvent( gridEvt ); - } - else // rows/columns selection mode - { - if ( m_selectionMode != wxGrid::wxGridSelectColumns && - rowSelectionWasChanged ) - { - int numCols = m_grid->GetNumberCols(); - for ( int colFrom = 0, colTo = 0; colTo <= numCols; ++colTo ) - { - if ( m_colSelection.Index(colTo) >= 0 || colTo == numCols ) - { - if ( colFrom < colTo ) - { - if ( !m_grid->GetBatchCount() ) - { - r = m_grid->BlockToDeviceRect( - wxGridCellCoords( row, colFrom ), - wxGridCellCoords( row, colTo-1 ) ); - ((wxWindow *)m_grid->m_gridWin)->Refresh( false, &r ); - } - - wxGridRangeSelectEvent gridEvt( m_grid->GetId(), - wxEVT_GRID_RANGE_SELECT, - m_grid, - wxGridCellCoords( row, colFrom ), - wxGridCellCoords( row, colTo - 1 ), - false, - kbd ); - m_grid->GetEventHandler()->ProcessEvent( gridEvt ); - } - - colFrom = colTo + 1; - } - } - } - - if ( m_selectionMode != wxGrid::wxGridSelectRows && - colSelectionWasChanged ) - { - int numRows = m_grid->GetNumberRows(); - for ( int rowFrom = 0, rowTo = 0; rowTo <= numRows; ++rowTo ) - { - if ( m_rowSelection.Index(rowTo) >= 0 || rowTo == numRows ) - { - if (rowFrom < rowTo) - { - if ( !m_grid->GetBatchCount() ) - { - r = m_grid->BlockToDeviceRect( - wxGridCellCoords( rowFrom, col ), - wxGridCellCoords( rowTo - 1, col ) ); - ((wxWindow *)m_grid->m_gridWin)->Refresh( false, &r ); - } - - wxGridRangeSelectEvent gridEvt( m_grid->GetId(), - wxEVT_GRID_RANGE_SELECT, - m_grid, - wxGridCellCoords( rowFrom, col ), - wxGridCellCoords( rowTo - 1, col ), - false, - kbd ); - m_grid->GetEventHandler()->ProcessEvent( gridEvt ); - } - - rowFrom = rowTo + 1; - } - } - } - } -} - -void wxGridSelection::ClearSelection() -{ - size_t n; - wxRect r; - wxGridCellCoords coords1, coords2; - - // deselect all individual cells and update the screen - if ( m_selectionMode == wxGrid::wxGridSelectCells ) - { - while ( ( n = m_cellSelection.GetCount() ) > 0) - { - n--; - coords1 = m_cellSelection[n]; - m_cellSelection.RemoveAt(n); - if ( !m_grid->GetBatchCount() ) - { - r = m_grid->BlockToDeviceRect( coords1, coords1 ); - ((wxWindow *)m_grid->m_gridWin)->Refresh( false, &r ); - -#ifdef __WXMAC__ - ((wxWindow *)m_grid->m_gridWin)->Update(); -#endif - } - } - } - - // deselect all blocks and update the screen - while ( ( n = m_blockSelectionTopLeft.GetCount() ) > 0) - { - n--; - coords1 = m_blockSelectionTopLeft[n]; - coords2 = m_blockSelectionBottomRight[n]; - m_blockSelectionTopLeft.RemoveAt(n); - m_blockSelectionBottomRight.RemoveAt(n); - if ( !m_grid->GetBatchCount() ) - { - r = m_grid->BlockToDeviceRect( coords1, coords2 ); - ((wxWindow *)m_grid->m_gridWin)->Refresh( false, &r ); - -#ifdef __WXMAC__ - ((wxWindow *)m_grid->m_gridWin)->Update(); -#endif - } - } - - // deselect all rows and update the screen - if ( m_selectionMode != wxGrid::wxGridSelectColumns ) - { - while ( ( n = m_rowSelection.GetCount() ) > 0) - { - n--; - int row = m_rowSelection[n]; - m_rowSelection.RemoveAt(n); - if ( !m_grid->GetBatchCount() ) - { - r = m_grid->BlockToDeviceRect( wxGridCellCoords( row, 0 ), - wxGridCellCoords( row, m_grid->GetNumberCols() - 1 ) ); - ((wxWindow *)m_grid->m_gridWin)->Refresh( false, &r ); - -#ifdef __WXMAC__ - ((wxWindow *)m_grid->m_gridWin)->Update(); -#endif - } - } - } - - // deselect all columns and update the screen - if ( m_selectionMode != wxGrid::wxGridSelectRows ) - { - while ( ( n = m_colSelection.GetCount() ) > 0) - { - n--; - int col = m_colSelection[n]; - m_colSelection.RemoveAt(n); - if ( !m_grid->GetBatchCount() ) - { - r = m_grid->BlockToDeviceRect( wxGridCellCoords( 0, col ), - wxGridCellCoords( m_grid->GetNumberRows() - 1, col ) ); - ((wxWindow *)m_grid->m_gridWin)->Refresh( false, &r ); - -#ifdef __WXMAC__ - ((wxWindow *)m_grid->m_gridWin)->Update(); -#endif - } - } - } - - // One deselection event, indicating deselection of _all_ cells. - // (No finer grained events for each of the smaller regions - // deselected above!) - wxGridRangeSelectEvent gridEvt( m_grid->GetId(), - wxEVT_GRID_RANGE_SELECT, - m_grid, - wxGridCellCoords( 0, 0 ), - wxGridCellCoords( - m_grid->GetNumberRows() - 1, - m_grid->GetNumberCols() - 1 ), - false ); - - m_grid->GetEventHandler()->ProcessEvent(gridEvt); -} - - -void wxGridSelection::UpdateRows( size_t pos, int numRows ) -{ - size_t count = m_cellSelection.GetCount(); - size_t n; - for ( n = 0; n < count; n++ ) - { - wxGridCellCoords& coords = m_cellSelection[n]; - wxCoord row = coords.GetRow(); - if ((size_t)row >= pos) - { - if (numRows > 0) - { - // If rows inserted, increase row counter where necessary - coords.SetRow(row + numRows); - } - else if (numRows < 0) - { - // If rows deleted ... - if ((size_t)row >= pos - numRows) - { - // ...either decrement row counter (if row still exists)... - coords.SetRow(row + numRows); - } - else - { - // ...or remove the attribute - m_cellSelection.RemoveAt(n); - n--; - count--; - } - } - } - } - - count = m_blockSelectionTopLeft.GetCount(); - for ( n = 0; n < count; n++ ) - { - wxGridCellCoords& coords1 = m_blockSelectionTopLeft[n]; - wxGridCellCoords& coords2 = m_blockSelectionBottomRight[n]; - wxCoord row1 = coords1.GetRow(); - wxCoord row2 = coords2.GetRow(); - - if ((size_t)row2 >= pos) - { - if (numRows > 0) - { - // If rows inserted, increase row counter where necessary - coords2.SetRow( row2 + numRows ); - if ((size_t)row1 >= pos) - coords1.SetRow( row1 + numRows ); - } - else if (numRows < 0) - { - // If rows deleted ... - if ((size_t)row2 >= pos - numRows) - { - // ...either decrement row counter (if row still exists)... - coords2.SetRow( row2 + numRows ); - if ((size_t)row1 >= pos) - coords1.SetRow( wxMax(row1 + numRows, (int)pos) ); - - } - else - { - if ((size_t)row1 >= pos) - { - // ...or remove the attribute - m_blockSelectionTopLeft.RemoveAt(n); - m_blockSelectionBottomRight.RemoveAt(n); - n--; - count--; - } - else - coords2.SetRow( pos ); - } - } - } - } - - count = m_rowSelection.GetCount(); - for ( n = 0; n < count; n++ ) - { - int rowOrCol_ = m_rowSelection[n]; - - if ((size_t) rowOrCol_ >= pos) - { - if ( numRows > 0 ) - { - m_rowSelection[n] += numRows; - } - else if ( numRows < 0 ) - { - if ((size_t)rowOrCol_ >= (pos - numRows)) - m_rowSelection[n] += numRows; - else - { - m_rowSelection.RemoveAt( n ); - n--; - count--; - } - } - } - } - // No need to touch selected columns, unless we removed _all_ - // rows, in this case, we remove all columns from the selection. - - if ( !m_grid->GetNumberRows() ) - m_colSelection.Clear(); -} - - -void wxGridSelection::UpdateCols( size_t pos, int numCols ) -{ - size_t count = m_cellSelection.GetCount(); - size_t n; - - for ( n = 0; n < count; n++ ) - { - wxGridCellCoords& coords = m_cellSelection[n]; - wxCoord col = coords.GetCol(); - if ((size_t)col >= pos) - { - if (numCols > 0) - { - // If rows inserted, increase row counter where necessary - coords.SetCol(col + numCols); - } - else if (numCols < 0) - { - // If rows deleted ... - if ((size_t)col >= pos - numCols) - { - // ...either decrement row counter (if row still exists)... - coords.SetCol(col + numCols); - } - else - { - // ...or remove the attribute - m_cellSelection.RemoveAt(n); - n--; - count--; - } - } - } - } - - count = m_blockSelectionTopLeft.GetCount(); - for ( n = 0; n < count; n++ ) - { - wxGridCellCoords& coords1 = m_blockSelectionTopLeft[n]; - wxGridCellCoords& coords2 = m_blockSelectionBottomRight[n]; - wxCoord col1 = coords1.GetCol(); - wxCoord col2 = coords2.GetCol(); - - if ((size_t)col2 >= pos) - { - if (numCols > 0) - { - // If rows inserted, increase row counter where necessary - coords2.SetCol(col2 + numCols); - if ((size_t)col1 >= pos) - coords1.SetCol(col1 + numCols); - } - else if (numCols < 0) - { - // If cols deleted ... - if ((size_t)col2 >= pos - numCols) - { - // ...either decrement col counter (if col still exists)... - coords2.SetCol(col2 + numCols); - if ( (size_t) col1 >= pos) - coords1.SetCol( wxMax(col1 + numCols, (int)pos) ); - - } - else - { - if ((size_t)col1 >= pos) - { - // ...or remove the attribute - m_blockSelectionTopLeft.RemoveAt(n); - m_blockSelectionBottomRight.RemoveAt(n); - n--; - count--; - } - else - coords2.SetCol(pos); - } - } - } - } - - count = m_colSelection.GetCount(); - for ( n = 0; n < count; n++ ) - { - int rowOrCol = m_colSelection[n]; - - if ((size_t)rowOrCol >= pos) - { - if ( numCols > 0 ) - m_colSelection[n] += numCols; - else if ( numCols < 0 ) - { - if ((size_t)rowOrCol >= (pos - numCols)) - m_colSelection[n] += numCols; - else - { - m_colSelection.RemoveAt( n ); - n--; - count--; - } - } - } - } - - // No need to touch selected rows, unless we removed _all_ - // columns, in this case, we remove all rows from the selection. - if ( !m_grid->GetNumberCols() ) - m_rowSelection.Clear(); -} - -int wxGridSelection::BlockContain( int topRow1, int leftCol1, - int bottomRow1, int rightCol1, - int topRow2, int leftCol2, - int bottomRow2, int rightCol2 ) -// returns 1, if Block1 contains Block2, -// -1, if Block2 contains Block1, -// 0, otherwise -{ - if ( topRow1 <= topRow2 && bottomRow2 <= bottomRow1 && - leftCol1 <= leftCol2 && rightCol2 <= rightCol1 ) - return 1; - else if ( topRow2 <= topRow1 && bottomRow1 <= bottomRow2 && - leftCol2 <= leftCol1 && rightCol1 <= rightCol2 ) - return -1; - - return 0; -} - -#endif diff --git a/Externals/wxWidgets3/src/generic/headerctrlg.cpp b/Externals/wxWidgets3/src/generic/headerctrlg.cpp deleted file mode 100644 index cc720c8617..0000000000 --- a/Externals/wxWidgets3/src/generic/headerctrlg.cpp +++ /dev/null @@ -1,720 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/generic/headerctrlg.cpp -// Purpose: generic wxHeaderCtrl implementation -// Author: Vadim Zeitlin -// Created: 2008-12-03 -// Copyright: (c) 2008 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// for compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_HEADERCTRL - -#include "wx/headerctrl.h" - -#ifdef wxHAS_GENERIC_HEADERCTRL - -#include "wx/dcbuffer.h" -#include "wx/renderer.h" - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -namespace -{ - -const unsigned COL_NONE = (unsigned)-1; - -} // anonymous namespace - -// ============================================================================ -// wxHeaderCtrl implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxHeaderCtrl creation -// ---------------------------------------------------------------------------- - -void wxHeaderCtrl::Init() -{ - m_numColumns = 0; - m_hover = - m_colBeingResized = - m_colBeingReordered = COL_NONE; - m_dragOffset = 0; - m_scrollOffset = 0; -} - -bool wxHeaderCtrl::Create(wxWindow *parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) -{ - if ( !wxHeaderCtrlBase::Create(parent, id, pos, size, - style, wxDefaultValidator, name) ) - return false; - - // tell the system to not paint the background at all to avoid flicker as - // we paint the entire window area in our OnPaint() - SetBackgroundStyle(wxBG_STYLE_CUSTOM); - - return true; -} - -wxHeaderCtrl::~wxHeaderCtrl() -{ -} - -// ---------------------------------------------------------------------------- -// wxHeaderCtrl columns manipulation -// ---------------------------------------------------------------------------- - -void wxHeaderCtrl::DoSetCount(unsigned int count) -{ - // update the column indices order array before changing m_numColumns - DoResizeColumnIndices(m_colIndices, count); - - m_numColumns = count; - - InvalidateBestSize(); - Refresh(); -} - -unsigned int wxHeaderCtrl::DoGetCount() const -{ - return m_numColumns; -} - -void wxHeaderCtrl::DoUpdate(unsigned int idx) -{ - InvalidateBestSize(); - - // we need to refresh not only this column but also the ones after it in - // case it was shown or hidden or its width changed -- it would be nice to - // avoid doing this unnecessary by storing the old column width (TODO) - RefreshColsAfter(idx); -} - -// ---------------------------------------------------------------------------- -// wxHeaderCtrl scrolling -// ---------------------------------------------------------------------------- - -void wxHeaderCtrl::DoScrollHorz(int dx) -{ - m_scrollOffset += dx; - - // don't call our own version which calls this function! - wxControl::ScrollWindow(dx, 0); -} - -// ---------------------------------------------------------------------------- -// wxHeaderCtrl geometry -// ---------------------------------------------------------------------------- - -wxSize wxHeaderCtrl::DoGetBestSize() const -{ - wxWindow *win = GetParent(); - int height = wxRendererNative::Get().GetHeaderButtonHeight( win ); - - // the vertical size is rather arbitrary but it looks better if we leave - // some space around the text - const wxSize size(IsEmpty() ? wxHeaderCtrlBase::DoGetBestSize().x - : GetColEnd(GetColumnCount() - 1), - height ); // (7*GetCharHeight())/4); - CacheBestSize(size); - return size; -} - -int wxHeaderCtrl::GetColStart(unsigned int idx) const -{ - int pos = m_scrollOffset; - for ( unsigned n = 0; ; n++ ) - { - const unsigned i = m_colIndices[n]; - if ( i == idx ) - break; - - const wxHeaderColumn& col = GetColumn(i); - if ( col.IsShown() ) - pos += col.GetWidth(); - } - - return pos; -} - -int wxHeaderCtrl::GetColEnd(unsigned int idx) const -{ - int x = GetColStart(idx); - - return x + GetColumn(idx).GetWidth(); -} - -unsigned int wxHeaderCtrl::FindColumnAtPoint(int x, bool *onSeparator) const -{ - int pos = 0; - const unsigned count = GetColumnCount(); - for ( unsigned n = 0; n < count; n++ ) - { - const unsigned idx = m_colIndices[n]; - const wxHeaderColumn& col = GetColumn(idx); - if ( col.IsHidden() ) - continue; - - pos += col.GetWidth(); - - // if the column is resizable, check if we're approximatively over the - // line separating it from the next column - // - // TODO: don't hardcode sensitivity - if ( col.IsResizeable() && abs(x - pos) < 8 ) - { - if ( onSeparator ) - *onSeparator = true; - return idx; - } - - // inside this column? - if ( x < pos ) - { - if ( onSeparator ) - *onSeparator = false; - return idx; - } - } - - if ( onSeparator ) - *onSeparator = false; - return COL_NONE; -} - -// ---------------------------------------------------------------------------- -// wxHeaderCtrl repainting -// ---------------------------------------------------------------------------- - -void wxHeaderCtrl::RefreshCol(unsigned int idx) -{ - wxRect rect = GetClientRect(); - rect.x += GetColStart(idx); - rect.width = GetColumn(idx).GetWidth(); - - RefreshRect(rect); -} - -void wxHeaderCtrl::RefreshColIfNotNone(unsigned int idx) -{ - if ( idx != COL_NONE ) - RefreshCol(idx); -} - -void wxHeaderCtrl::RefreshColsAfter(unsigned int idx) -{ - wxRect rect = GetClientRect(); - const int ofs = GetColStart(idx); - rect.x += ofs; - rect.width -= ofs; - - RefreshRect(rect); -} - -// ---------------------------------------------------------------------------- -// wxHeaderCtrl dragging/resizing/reordering -// ---------------------------------------------------------------------------- - -bool wxHeaderCtrl::IsResizing() const -{ - return m_colBeingResized != COL_NONE; -} - -bool wxHeaderCtrl::IsReordering() const -{ - return m_colBeingReordered != COL_NONE; -} - -void wxHeaderCtrl::ClearMarkers() -{ - wxClientDC dc(this); - - wxDCOverlay dcover(m_overlay, &dc); - dcover.Clear(); -} - -void wxHeaderCtrl::EndDragging() -{ - // We currently only use markers for reordering, not for resizing - if (IsReordering()) - { - ClearMarkers(); - m_overlay.Reset(); - } - - // don't use the special dragging cursor any more - SetCursor(wxNullCursor); -} - -void wxHeaderCtrl::CancelDragging() -{ - wxASSERT_MSG( IsDragging(), - "shouldn't be called if we're not dragging anything" ); - - EndDragging(); - - unsigned int& col = IsResizing() ? m_colBeingResized : m_colBeingReordered; - - wxHeaderCtrlEvent event(wxEVT_HEADER_DRAGGING_CANCELLED, GetId()); - event.SetEventObject(this); - event.SetColumn(col); - - GetEventHandler()->ProcessEvent(event); - - col = COL_NONE; -} - -int wxHeaderCtrl::ConstrainByMinWidth(unsigned int col, int& xPhysical) -{ - const int xStart = GetColStart(col); - - // notice that GetMinWidth() returns 0 if there is no minimal width so it - // still makes sense to use it even in this case - const int xMinEnd = xStart + GetColumn(col).GetMinWidth(); - - if ( xPhysical < xMinEnd ) - xPhysical = xMinEnd; - - return xPhysical - xStart; -} - -void wxHeaderCtrl::StartOrContinueResizing(unsigned int col, int xPhysical) -{ - wxHeaderCtrlEvent event(IsResizing() ? wxEVT_HEADER_RESIZING - : wxEVT_HEADER_BEGIN_RESIZE, - GetId()); - event.SetEventObject(this); - event.SetColumn(col); - - event.SetWidth(ConstrainByMinWidth(col, xPhysical)); - - if ( GetEventHandler()->ProcessEvent(event) && !event.IsAllowed() ) - { - if ( IsResizing() ) - { - ReleaseMouse(); - CancelDragging(); - } - //else: nothing to do -- we just don't start to resize - } - else // go ahead with resizing - { - if ( !IsResizing() ) - { - m_colBeingResized = col; - SetCursor(wxCursor(wxCURSOR_SIZEWE)); - CaptureMouse(); - } - //else: we had already done the above when we started - - } -} - -void wxHeaderCtrl::EndResizing(int xPhysical) -{ - wxASSERT_MSG( IsResizing(), "shouldn't be called if we're not resizing" ); - - EndDragging(); - - ReleaseMouse(); - - wxHeaderCtrlEvent event(wxEVT_HEADER_END_RESIZE, GetId()); - event.SetEventObject(this); - event.SetColumn(m_colBeingResized); - event.SetWidth(ConstrainByMinWidth(m_colBeingResized, xPhysical)); - - GetEventHandler()->ProcessEvent(event); - - m_colBeingResized = COL_NONE; -} - -void wxHeaderCtrl::UpdateReorderingMarker(int xPhysical) -{ - wxClientDC dc(this); - - wxDCOverlay dcover(m_overlay, &dc); - dcover.Clear(); - - dc.SetPen(*wxBLUE); - dc.SetBrush(*wxTRANSPARENT_BRUSH); - - // draw the phantom position of the column being dragged - int x = xPhysical - m_dragOffset; - int y = GetClientSize().y; - dc.DrawRectangle(x, 0, - GetColumn(m_colBeingReordered).GetWidth(), y); - - // and also a hint indicating where it is going to be inserted if it's - // dropped now - unsigned int col = FindColumnAtPoint(xPhysical); - if ( col != COL_NONE ) - { - static const int DROP_MARKER_WIDTH = 4; - - dc.SetBrush(*wxBLUE); - dc.DrawRectangle(GetColEnd(col) - DROP_MARKER_WIDTH/2, 0, - DROP_MARKER_WIDTH, y); - } -} - -void wxHeaderCtrl::StartReordering(unsigned int col, int xPhysical) -{ - wxHeaderCtrlEvent event(wxEVT_HEADER_BEGIN_REORDER, GetId()); - event.SetEventObject(this); - event.SetColumn(col); - - if ( GetEventHandler()->ProcessEvent(event) && !event.IsAllowed() ) - { - // don't start dragging it, nothing to do otherwise - return; - } - - m_dragOffset = xPhysical - GetColStart(col); - - m_colBeingReordered = col; - SetCursor(wxCursor(wxCURSOR_HAND)); - CaptureMouse(); - - // do not call UpdateReorderingMarker() here: we don't want to give - // feedback for reordering until the user starts to really move the mouse - // as he might want to just click on the column and not move it at all -} - -bool wxHeaderCtrl::EndReordering(int xPhysical) -{ - wxASSERT_MSG( IsReordering(), "shouldn't be called if we're not reordering" ); - - EndDragging(); - - ReleaseMouse(); - - const int colOld = m_colBeingReordered, - colNew = FindColumnAtPoint(xPhysical); - - m_colBeingReordered = COL_NONE; - - if ( xPhysical - GetColStart(colOld) == m_dragOffset ) - return false; - - if ( colNew != colOld ) - { - wxHeaderCtrlEvent event(wxEVT_HEADER_END_REORDER, GetId()); - event.SetEventObject(this); - event.SetColumn(colOld); - - const unsigned pos = GetColumnPos(FindColumnAtPoint(xPhysical)); - event.SetNewOrder(pos); - - if ( !GetEventHandler()->ProcessEvent(event) || event.IsAllowed() ) - { - // do reorder the columns - DoMoveCol(colOld, pos); - } - } - - // whether we moved the column or not, the user did move the mouse and so - // did try to do it so return true - return true; -} - -// ---------------------------------------------------------------------------- -// wxHeaderCtrl column reordering -// ---------------------------------------------------------------------------- - -void wxHeaderCtrl::DoSetColumnsOrder(const wxArrayInt& order) -{ - m_colIndices = order; - Refresh(); -} - -wxArrayInt wxHeaderCtrl::DoGetColumnsOrder() const -{ - return m_colIndices; -} - -void wxHeaderCtrl::DoMoveCol(unsigned int idx, unsigned int pos) -{ - MoveColumnInOrderArray(m_colIndices, idx, pos); - - Refresh(); -} - -// ---------------------------------------------------------------------------- -// wxHeaderCtrl event handlers -// ---------------------------------------------------------------------------- - -wxBEGIN_EVENT_TABLE(wxHeaderCtrl, wxHeaderCtrlBase) - EVT_PAINT(wxHeaderCtrl::OnPaint) - - EVT_MOUSE_EVENTS(wxHeaderCtrl::OnMouse) - - EVT_MOUSE_CAPTURE_LOST(wxHeaderCtrl::OnCaptureLost) - - EVT_KEY_DOWN(wxHeaderCtrl::OnKeyDown) -wxEND_EVENT_TABLE() - -void wxHeaderCtrl::OnPaint(wxPaintEvent& WXUNUSED(event)) -{ - int w, h; - GetClientSize(&w, &h); - -#ifdef __WXGTK__ -// int vw; -// GetVirtualSize(&vw, NULL); -#endif - - wxAutoBufferedPaintDC dc(this); - - dc.SetBackground(GetBackgroundColour()); - dc.Clear(); - - // account for the horizontal scrollbar offset in the parent window - dc.SetDeviceOrigin(m_scrollOffset, 0); - - const unsigned int count = m_numColumns; - int xpos = 0; - for ( unsigned int i = 0; i < count; i++ ) - { - const unsigned idx = m_colIndices[i]; - const wxHeaderColumn& col = GetColumn(idx); - if ( col.IsHidden() ) - continue; - - int colWidth = col.GetWidth(); - - wxHeaderSortIconType sortArrow; - if ( col.IsSortKey() ) - { - sortArrow = col.IsSortOrderAscending() ? wxHDR_SORT_ICON_UP - : wxHDR_SORT_ICON_DOWN; - } - else // not sorting by this column - { - sortArrow = wxHDR_SORT_ICON_NONE; - } - - int state = 0; - if ( IsEnabled() ) - { - if ( idx == m_hover ) - state = wxCONTROL_CURRENT; - } - else // disabled - { - state = wxCONTROL_DISABLED; - } - - if (i == 0) - state |= wxCONTROL_SPECIAL; - - wxHeaderButtonParams params; - params.m_labelText = col.GetTitle(); - params.m_labelBitmap = col.GetBitmap(); - params.m_labelAlignment = col.GetAlignment(); - -#ifdef __WXGTK__ - if (i == count-1) - { -// colWidth = wxMax( colWidth, vw - xpos ); - state |= wxCONTROL_DIRTY; - } -#endif - - wxRendererNative::Get().DrawHeaderButton - ( - this, - dc, - wxRect(xpos, 0, colWidth, h), - state, - sortArrow, - ¶ms - ); - - xpos += colWidth; - } -} - -void wxHeaderCtrl::OnCaptureLost(wxMouseCaptureLostEvent& WXUNUSED(event)) -{ - if ( IsDragging() ) - CancelDragging(); -} - -void wxHeaderCtrl::OnKeyDown(wxKeyEvent& event) -{ - if ( event.GetKeyCode() == WXK_ESCAPE ) - { - if ( IsDragging() ) - { - ReleaseMouse(); - CancelDragging(); - - return; - } - } - - event.Skip(); -} - -void wxHeaderCtrl::OnMouse(wxMouseEvent& mevent) -{ - // do this in advance to allow simply returning if we're not interested, - // we'll undo it if we do handle the event below - mevent.Skip(); - - - // account for the control displacement - const int xPhysical = mevent.GetX(); - const int xLogical = xPhysical - m_scrollOffset; - - // first deal with the [continuation of any] dragging operations in - // progress - if ( IsResizing() ) - { - if ( mevent.LeftUp() ) - EndResizing(xPhysical); - else // update the live separator position - StartOrContinueResizing(m_colBeingResized, xPhysical); - - return; - } - - if ( IsReordering() ) - { - if ( !mevent.LeftUp() ) - { - // update the column position - UpdateReorderingMarker(xPhysical); - - return; - } - - // finish reordering and continue to generate a click event below if we - // didn't really reorder anything - if ( EndReordering(xPhysical) ) - return; - } - - - // find if the event is over a column at all - bool onSeparator; - const unsigned col = mevent.Leaving() - ? (onSeparator = false, COL_NONE) - : FindColumnAtPoint(xLogical, &onSeparator); - - - // update the highlighted column if it changed - if ( col != m_hover ) - { - const unsigned hoverOld = m_hover; - m_hover = col; - - RefreshColIfNotNone(hoverOld); - RefreshColIfNotNone(m_hover); - } - - // update mouse cursor as it moves around - if ( mevent.Moving() ) - { - SetCursor(onSeparator ? wxCursor(wxCURSOR_SIZEWE) : wxNullCursor); - return; - } - - // all the other events only make sense when they happen over a column - if ( col == COL_NONE ) - return; - - - // enter various dragging modes on left mouse press - if ( mevent.LeftDown() ) - { - if ( onSeparator ) - { - // start resizing the column - wxASSERT_MSG( !IsResizing(), "reentering column resize mode?" ); - StartOrContinueResizing(col, xPhysical); - } - else // on column itself - { - // start dragging the column - wxASSERT_MSG( !IsReordering(), "reentering column move mode?" ); - - StartReordering(col, xPhysical); - } - - return; - } - - // determine the type of header event corresponding to click events - wxEventType evtType = wxEVT_NULL; - const bool click = mevent.ButtonUp(), - dblclk = mevent.ButtonDClick(); - if ( click || dblclk ) - { - switch ( mevent.GetButton() ) - { - case wxMOUSE_BTN_LEFT: - // treat left double clicks on separator specially - if ( onSeparator && dblclk ) - { - evtType = wxEVT_HEADER_SEPARATOR_DCLICK; - } - else // not double click on separator - { - evtType = click ? wxEVT_HEADER_CLICK - : wxEVT_HEADER_DCLICK; - } - break; - - case wxMOUSE_BTN_RIGHT: - evtType = click ? wxEVT_HEADER_RIGHT_CLICK - : wxEVT_HEADER_RIGHT_DCLICK; - break; - - case wxMOUSE_BTN_MIDDLE: - evtType = click ? wxEVT_HEADER_MIDDLE_CLICK - : wxEVT_HEADER_MIDDLE_DCLICK; - break; - - default: - // ignore clicks from other mouse buttons - ; - } - } - - if ( evtType == wxEVT_NULL ) - return; - - wxHeaderCtrlEvent event(evtType, GetId()); - event.SetEventObject(this); - event.SetColumn(col); - - if ( GetEventHandler()->ProcessEvent(event) ) - mevent.Skip(false); -} - -#endif // wxHAS_GENERIC_HEADERCTRL - -#endif // wxUSE_HEADERCTRL diff --git a/Externals/wxWidgets3/src/generic/helpext.cpp b/Externals/wxWidgets3/src/generic/helpext.cpp deleted file mode 100644 index f4e769eb27..0000000000 --- a/Externals/wxWidgets3/src/generic/helpext.cpp +++ /dev/null @@ -1,483 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/generic/helpext.cpp -// Purpose: an external help controller for wxWidgets -// Author: Karsten Ballueder -// Modified by: -// Created: 04/01/98 -// Copyright: (c) Karsten Ballueder -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_HELP - -#ifndef WX_PRECOMP - #include "wx/list.h" - #include "wx/string.h" - #include "wx/utils.h" - #include "wx/intl.h" - #include "wx/msgdlg.h" - #include "wx/choicdlg.h" - #include "wx/log.h" -#endif - -#include "wx/filename.h" -#include "wx/textfile.h" -#include "wx/generic/helpext.h" - -#include -#include -#include - -#if !defined(__WINDOWS__) - #include -#endif - -#ifdef __WXMSW__ -#include -#include "wx/msw/winundef.h" -#endif - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -// Name for map file. -#define WXEXTHELP_MAPFILE wxT("wxhelp.map") - -// Character introducing comments/documentation field in map file. -#define WXEXTHELP_COMMENTCHAR ';' - -// The ID of the Contents section -#define WXEXTHELP_CONTENTS_ID 0 - -// Name of environment variable to set help browser. -#define WXEXTHELP_ENVVAR_BROWSER wxT("WX_HELPBROWSER") - -// Is browser a netscape browser? -#define WXEXTHELP_ENVVAR_BROWSERISNETSCAPE wxT("WX_HELPBROWSER_NS") - -wxIMPLEMENT_CLASS(wxExtHelpController, wxHelpControllerBase); - -wxExtHelpController::wxExtHelpController(wxWindow* parentWindow) - : wxHelpControllerBase(parentWindow) -{ - m_MapList = NULL; - m_NumOfEntries = 0; - m_BrowserIsNetscape = false; - - wxChar *browser = wxGetenv(WXEXTHELP_ENVVAR_BROWSER); - if (browser) - { - m_BrowserName = browser; - browser = wxGetenv(WXEXTHELP_ENVVAR_BROWSERISNETSCAPE); - m_BrowserIsNetscape = browser && (wxAtoi(browser) != 0); - } -} - -wxExtHelpController::~wxExtHelpController() -{ - DeleteList(); -} - -#if WXWIN_COMPATIBILITY_2_8 -void wxExtHelpController::SetBrowser(const wxString& browsername, bool isNetscape) -{ - m_BrowserName = browsername; - m_BrowserIsNetscape = isNetscape; -} -#endif - -void wxExtHelpController::SetViewer(const wxString& viewer, long flags) -{ - m_BrowserName = viewer; - m_BrowserIsNetscape = (flags & wxHELP_NETSCAPE) != 0; -} - -bool wxExtHelpController::DisplayHelp(const wxString &relativeURL) -{ - // construct hte URL to open -- it's just a file - wxString url(wxT("file://") + m_helpDir); - url << wxFILE_SEP_PATH << relativeURL; - - // use the explicit browser program if specified - if ( !m_BrowserName.empty() ) - { - if ( m_BrowserIsNetscape ) - { - wxString command; - command << m_BrowserName - << wxT(" -remote openURL(") << url << wxT(')'); - if ( wxExecute(command, wxEXEC_SYNC) != -1 ) - return true; - } - - if ( wxExecute(m_BrowserName + wxT(' ') + url, wxEXEC_SYNC) != -1 ) - return true; - } - //else: either no browser explicitly specified or we failed to open it - - // just use default browser - return wxLaunchDefaultBrowser(url); -} - -class wxExtHelpMapEntry : public wxObject -{ -public: - int entryid; - wxString url; - wxString doc; - - wxExtHelpMapEntry(int iid, wxString const &iurl, wxString const &idoc) - { entryid = iid; url = iurl; doc = idoc; } -}; - -void wxExtHelpController::DeleteList() -{ - if (m_MapList) - { - wxList::compatibility_iterator node = m_MapList->GetFirst(); - while (node) - { - delete (wxExtHelpMapEntry *)node->GetData(); - m_MapList->Erase(node); - node = m_MapList->GetFirst(); - } - - wxDELETE(m_MapList); - } -} - -// This must be called to tell the controller where to find the documentation. -// @param file - NOT a filename, but a directory name. -// @return true on success -bool wxExtHelpController::Initialize(const wxString& file) -{ - return LoadFile(file); -} - -bool wxExtHelpController::ParseMapFileLine(const wxString& line) -{ - const wxChar *p = line.c_str(); - - // skip whitespace - while ( isascii(*p) && wxIsspace(*p) ) - p++; - - // skip empty lines and comments - if ( *p == wxT('\0') || *p == WXEXTHELP_COMMENTCHAR ) - return true; - - // the line is of the form "num url" so we must have an integer now - wxChar *end; - const unsigned long id = wxStrtoul(p, &end, 0); - - if ( end == p ) - return false; - - p = end; - while ( isascii(*p) && wxIsspace(*p) ) - p++; - - // next should be the URL - wxString url; - url.reserve(line.length()); - while ( isascii(*p) && !wxIsspace(*p) ) - url += *p++; - - while ( isascii(*p) && wxIsspace(*p) ) - p++; - - // and finally the optional description of the entry after comment - wxString doc; - if ( *p == WXEXTHELP_COMMENTCHAR ) - { - p++; - while ( isascii(*p) && wxIsspace(*p) ) - p++; - doc = p; - } - - m_MapList->Append(new wxExtHelpMapEntry(id, url, doc)); - m_NumOfEntries++; - - return true; -} - -// file is a misnomer as it's the name of the base help directory -bool wxExtHelpController::LoadFile(const wxString& file) -{ - wxFileName helpDir(wxFileName::DirName(file)); - helpDir.MakeAbsolute(); - - bool dirExists = false; - -#if wxUSE_INTL - // If a locale is set, look in file/localename, i.e. If passed - // "/usr/local/myapp/help" and the current wxLocale is set to be "de", then - // look in "/usr/local/myapp/help/de/" first and fall back to - // "/usr/local/myapp/help" if that doesn't exist. - const wxLocale * const loc = wxGetLocale(); - if ( loc ) - { - wxString locName = loc->GetName(); - - // the locale is in general of the form xx_YY.zzzz, try the full firm - // first and then also more general ones - wxFileName helpDirLoc(helpDir); - helpDirLoc.AppendDir(locName); - dirExists = helpDirLoc.DirExists(); - - if ( ! dirExists ) - { - // try without encoding - const wxString locNameWithoutEncoding = locName.BeforeLast(wxT('.')); - if ( !locNameWithoutEncoding.empty() ) - { - helpDirLoc = helpDir; - helpDirLoc.AppendDir(locNameWithoutEncoding); - dirExists = helpDirLoc.DirExists(); - } - } - - if ( !dirExists ) - { - // try without country part - wxString locNameWithoutCountry = locName.BeforeLast(wxT('_')); - if ( !locNameWithoutCountry.empty() ) - { - helpDirLoc = helpDir; - helpDirLoc.AppendDir(locNameWithoutCountry); - dirExists = helpDirLoc.DirExists(); - } - } - - if ( dirExists ) - helpDir = helpDirLoc; - } -#endif // wxUSE_INTL - - if ( ! dirExists && !helpDir.DirExists() ) - { - wxLogError(_("Help directory \"%s\" not found."), - helpDir.GetFullPath().c_str()); - return false; - } - - const wxFileName mapFile(helpDir.GetFullPath(), WXEXTHELP_MAPFILE); - if ( ! mapFile.FileExists() ) - { - wxLogError(_("Help file \"%s\" not found."), - mapFile.GetFullPath().c_str()); - return false; - } - - DeleteList(); - m_MapList = new wxList; - m_NumOfEntries = 0; - - wxTextFile input; - if ( !input.Open(mapFile.GetFullPath()) ) - return false; - - for ( wxString& line = input.GetFirstLine(); - !input.Eof(); - line = input.GetNextLine() ) - { - if ( !ParseMapFileLine(line) ) - { - wxLogWarning(_("Line %lu of map file \"%s\" has invalid syntax, skipped."), - (unsigned long)input.GetCurrentLine(), - mapFile.GetFullPath().c_str()); - } - } - - if ( !m_NumOfEntries ) - { - wxLogError(_("No valid mappings found in the file \"%s\"."), - mapFile.GetFullPath().c_str()); - return false; - } - - m_helpDir = helpDir.GetFullPath(); // now it's valid - return true; -} - - -bool wxExtHelpController::DisplayContents() -{ - if (! m_NumOfEntries) - return false; - - wxString contents; - wxList::compatibility_iterator node = m_MapList->GetFirst(); - wxExtHelpMapEntry *entry; - while (node) - { - entry = (wxExtHelpMapEntry *)node->GetData(); - if (entry->entryid == WXEXTHELP_CONTENTS_ID) - { - contents = entry->url; - break; - } - - node = node->GetNext(); - } - - bool rc = false; - wxString file; - file << m_helpDir << wxFILE_SEP_PATH << contents; - if (file.Contains(wxT('#'))) - file = file.BeforeLast(wxT('#')); - if ( wxFileExists(file) ) - rc = DisplaySection(WXEXTHELP_CONTENTS_ID); - - // if not found, open homemade toc: - return rc ? true : KeywordSearch(wxEmptyString); -} - -bool wxExtHelpController::DisplaySection(int sectionNo) -{ - if (! m_NumOfEntries) - return false; - - wxBusyCursor b; // display a busy cursor - wxList::compatibility_iterator node = m_MapList->GetFirst(); - wxExtHelpMapEntry *entry; - while (node) - { - entry = (wxExtHelpMapEntry *)node->GetData(); - if (entry->entryid == sectionNo) - return DisplayHelp(entry->url); - node = node->GetNext(); - } - - return false; -} - -bool wxExtHelpController::DisplaySection(const wxString& section) -{ - bool isFilename = (section.Find(wxT(".htm")) != -1); - - if (isFilename) - return DisplayHelp(section); - else - return KeywordSearch(section); -} - -bool wxExtHelpController::DisplayBlock(long blockNo) -{ - return DisplaySection((int)blockNo); -} - -bool wxExtHelpController::KeywordSearch(const wxString& k, - wxHelpSearchMode WXUNUSED(mode)) -{ - if (! m_NumOfEntries) - return false; - - wxString *choices = new wxString[m_NumOfEntries]; - wxString *urls = new wxString[m_NumOfEntries]; - - int idx = 0; - bool rc = false; - bool showAll = k.empty(); - - wxList::compatibility_iterator node = m_MapList->GetFirst(); - - { - // display a busy cursor - wxBusyCursor b; - wxString compA, compB; - wxExtHelpMapEntry *entry; - - // we compare case insensitive - if (! showAll) - { - compA = k; - compA.LowerCase(); - } - - while (node) - { - entry = (wxExtHelpMapEntry *)node->GetData(); - compB = entry->doc; - - bool testTarget = ! compB.empty(); - if (testTarget && ! showAll) - { - compB.LowerCase(); - testTarget = compB.Contains(compA); - } - - if (testTarget) - { - urls[idx] = entry->url; - // doesn't work: - // choices[idx] = (**i).doc.Contains((**i).doc.Before(WXEXTHELP_COMMENTCHAR)); - //if (choices[idx].empty()) // didn't contain the ';' - // choices[idx] = (**i).doc; - choices[idx] = wxEmptyString; - for (int j=0; ; j++) - { - wxChar targetChar = entry->doc.c_str()[j]; - if ((targetChar == 0) || (targetChar == WXEXTHELP_COMMENTCHAR)) - break; - - choices[idx] << targetChar; - } - - idx++; - } - - node = node->GetNext(); - } - } - - switch (idx) - { - case 0: - wxMessageBox(_("No entries found.")); - break; - - case 1: - rc = DisplayHelp(urls[0]); - break; - - default: - if (showAll) - idx = wxGetSingleChoiceIndex(_("Help Index"), - _("Help Index"), - idx, choices); - else - idx = wxGetSingleChoiceIndex(_("Relevant entries:"), - _("Entries found"), - idx, choices); - - if (idx >= 0) - rc = DisplayHelp(urls[idx]); - break; - } - - delete [] urls; - delete [] choices; - - return rc; -} - - -bool wxExtHelpController::Quit() -{ - return true; -} - -void wxExtHelpController::OnQuit() -{ -} - -#endif // wxUSE_HELP diff --git a/Externals/wxWidgets3/src/generic/htmllbox.cpp b/Externals/wxWidgets3/src/generic/htmllbox.cpp deleted file mode 100644 index 507badf53b..0000000000 --- a/Externals/wxWidgets3/src/generic/htmllbox.cpp +++ /dev/null @@ -1,732 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/generic/htmllbox.cpp -// Purpose: implementation of wxHtmlListBox -// Author: Vadim Zeitlin -// Modified by: -// Created: 31.05.03 -// Copyright: (c) 2003 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#ifndef WX_PRECOMP - #include "wx/dcclient.h" -#endif //WX_PRECOMP - -#if wxUSE_HTML - -#include "wx/htmllbox.h" - -#include "wx/html/htmlcell.h" -#include "wx/html/winpars.h" - -// this hack forces the linker to always link in m_* files -#include "wx/html/forcelnk.h" -FORCE_WXHTML_MODULES() - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -// small border always added to the cells: -static const wxCoord CELL_BORDER = 2; - -const char wxHtmlListBoxNameStr[] = "htmlListBox"; -const char wxSimpleHtmlListBoxNameStr[] = "simpleHtmlListBox"; - -// ============================================================================ -// private classes -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxHtmlListBoxCache -// ---------------------------------------------------------------------------- - -// this class is used by wxHtmlListBox to cache the parsed representation of -// the items to avoid doing it anew each time an item must be drawn -class wxHtmlListBoxCache -{ -private: - // invalidate a single item, used by Clear() and InvalidateRange() - void InvalidateItem(size_t n) - { - m_items[n] = (size_t)-1; - wxDELETE(m_cells[n]); - } - -public: - wxHtmlListBoxCache() - { - for ( size_t n = 0; n < SIZE; n++ ) - { - m_items[n] = (size_t)-1; - m_cells[n] = NULL; - } - - m_next = 0; - } - - ~wxHtmlListBoxCache() - { - for ( size_t n = 0; n < SIZE; n++ ) - { - delete m_cells[n]; - } - } - - // completely invalidate the cache - void Clear() - { - for ( size_t n = 0; n < SIZE; n++ ) - { - InvalidateItem(n); - } - } - - // return the cached cell for this index or NULL if none - wxHtmlCell *Get(size_t item) const - { - for ( size_t n = 0; n < SIZE; n++ ) - { - if ( m_items[n] == item ) - return m_cells[n]; - } - - return NULL; - } - - // returns true if we already have this item cached - bool Has(size_t item) const { return Get(item) != NULL; } - - // ensure that the item is cached - void Store(size_t item, wxHtmlCell *cell) - { - delete m_cells[m_next]; - m_cells[m_next] = cell; - m_items[m_next] = item; - - // advance to the next item wrapping around if there are no more - if ( ++m_next == SIZE ) - m_next = 0; - } - - // forget the cached value of the item(s) between the given ones (inclusive) - void InvalidateRange(size_t from, size_t to) - { - for ( size_t n = 0; n < SIZE; n++ ) - { - if ( m_items[n] >= from && m_items[n] <= to ) - { - InvalidateItem(n); - } - } - } - -private: - // the max number of the items we cache - enum { SIZE = 50 }; - - // the index of the LRU (oldest) cell - size_t m_next; - - // the parsed representation of the cached item or NULL - wxHtmlCell *m_cells[SIZE]; - - // the index of the currently cached item (only valid if m_cells != NULL) - size_t m_items[SIZE]; -}; - -// ---------------------------------------------------------------------------- -// wxHtmlListBoxStyle -// ---------------------------------------------------------------------------- - -// just forward wxDefaultHtmlRenderingStyle callbacks to the main class so that -// they could be overridden by the user code -class wxHtmlListBoxStyle : public wxDefaultHtmlRenderingStyle -{ -public: - wxHtmlListBoxStyle(const wxHtmlListBox& hlbox) : m_hlbox(hlbox) { } - - virtual wxColour GetSelectedTextColour(const wxColour& colFg) wxOVERRIDE - { - // by default wxHtmlListBox doesn't implement GetSelectedTextColour() - // and returns wxNullColour from it, so use the default HTML colour for - // selection - wxColour col = m_hlbox.GetSelectedTextColour(colFg); - if ( !col.IsOk() ) - { - col = wxDefaultHtmlRenderingStyle::GetSelectedTextColour(colFg); - } - - return col; - } - - virtual wxColour GetSelectedTextBgColour(const wxColour& colBg) wxOVERRIDE - { - wxColour col = m_hlbox.GetSelectedTextBgColour(colBg); - if ( !col.IsOk() ) - { - col = wxDefaultHtmlRenderingStyle::GetSelectedTextBgColour(colBg); - } - - return col; - } - -private: - const wxHtmlListBox& m_hlbox; - - wxDECLARE_NO_COPY_CLASS(wxHtmlListBoxStyle); -}; - -// ---------------------------------------------------------------------------- -// event tables -// ---------------------------------------------------------------------------- - -wxBEGIN_EVENT_TABLE(wxHtmlListBox, wxVListBox) - EVT_SIZE(wxHtmlListBox::OnSize) - EVT_MOTION(wxHtmlListBox::OnMouseMove) - EVT_LEFT_DOWN(wxHtmlListBox::OnLeftDown) -wxEND_EVENT_TABLE() - -// ============================================================================ -// implementation -// ============================================================================ - -wxIMPLEMENT_ABSTRACT_CLASS(wxHtmlListBox, wxVListBox); - - -// ---------------------------------------------------------------------------- -// wxHtmlListBox creation -// ---------------------------------------------------------------------------- - -wxHtmlListBox::wxHtmlListBox() - : wxHtmlWindowMouseHelper(this) -{ - Init(); -} - -// normal constructor which calls Create() internally -wxHtmlListBox::wxHtmlListBox(wxWindow *parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) - : wxHtmlWindowMouseHelper(this) -{ - Init(); - - (void)Create(parent, id, pos, size, style, name); -} - -void wxHtmlListBox::Init() -{ - m_htmlParser = NULL; - m_htmlRendStyle = new wxHtmlListBoxStyle(*this); - m_cache = new wxHtmlListBoxCache; -} - -bool wxHtmlListBox::Create(wxWindow *parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) -{ - return wxVListBox::Create(parent, id, pos, size, style, name); -} - -wxHtmlListBox::~wxHtmlListBox() -{ - delete m_cache; - - if ( m_htmlParser ) - { - delete m_htmlParser->GetDC(); - delete m_htmlParser; - } - - delete m_htmlRendStyle; -} - -// ---------------------------------------------------------------------------- -// wxHtmlListBox appearance -// ---------------------------------------------------------------------------- - -wxColour -wxHtmlListBox::GetSelectedTextColour(const wxColour& WXUNUSED(colFg)) const -{ - return wxNullColour; -} - -wxColour -wxHtmlListBox::GetSelectedTextBgColour(const wxColour& WXUNUSED(colBg)) const -{ - return GetSelectionBackground(); -} - -// ---------------------------------------------------------------------------- -// wxHtmlListBox items markup -// ---------------------------------------------------------------------------- - -wxString wxHtmlListBox::OnGetItemMarkup(size_t n) const -{ - // we don't even need to wrap the value returned by OnGetItem() inside - // "" and "" because wxHTML can parse it even - // without these tags - return OnGetItem(n); -} - -// ---------------------------------------------------------------------------- -// wxHtmlListBox cache handling -// ---------------------------------------------------------------------------- - -wxHtmlCell* wxHtmlListBox::CreateCellForItem(size_t n) const -{ - if ( !m_htmlParser ) - { - wxHtmlListBox *self = wxConstCast(this, wxHtmlListBox); - - self->m_htmlParser = new wxHtmlWinParser(self); - m_htmlParser->SetDC(new wxClientDC(self)); - m_htmlParser->SetFS(&self->m_filesystem); -#if !wxUSE_UNICODE - if (GetFont().IsOk()) - m_htmlParser->SetInputEncoding(GetFont().GetEncoding()); -#endif - // use system's default GUI font by default: - m_htmlParser->SetStandardFonts(); - } - - wxHtmlContainerCell *cell = (wxHtmlContainerCell *)m_htmlParser-> - Parse(OnGetItemMarkup(n)); - wxCHECK_MSG( cell, NULL, wxT("wxHtmlParser::Parse() returned NULL?") ); - - // set the cell's ID to item's index so that CellCoordsToPhysical() - // can quickly find the item: - cell->SetId(wxString::Format(wxT("%lu"), (unsigned long)n)); - - cell->Layout(GetClientSize().x - 2*GetMargins().x); - - return cell; -} - -void wxHtmlListBox::CacheItem(size_t n) const -{ - if ( !m_cache->Has(n) ) - m_cache->Store(n, CreateCellForItem(n)); -} - -void wxHtmlListBox::OnSize(wxSizeEvent& event) -{ - // we need to relayout all the cached cells - m_cache->Clear(); - - event.Skip(); -} - -void wxHtmlListBox::RefreshRow(size_t line) -{ - m_cache->InvalidateRange(line, line); - - wxVListBox::RefreshRow(line); -} - -void wxHtmlListBox::RefreshRows(size_t from, size_t to) -{ - m_cache->InvalidateRange(from, to); - - wxVListBox::RefreshRows(from, to); -} - -void wxHtmlListBox::RefreshAll() -{ - m_cache->Clear(); - - wxVListBox::RefreshAll(); -} - -void wxHtmlListBox::SetItemCount(size_t count) -{ - // the items are going to change, forget the old ones - m_cache->Clear(); - - wxVListBox::SetItemCount(count); -} - -// ---------------------------------------------------------------------------- -// wxHtmlListBox implementation of wxVListBox pure virtuals -// ---------------------------------------------------------------------------- - -void -wxHtmlListBox::OnDrawBackground(wxDC& dc, const wxRect& rect, size_t n) const -{ - if ( IsSelected(n) ) - { - if ( DoDrawSolidBackground - ( - GetSelectedTextBgColour(GetBackgroundColour()), - dc, - rect, - n - ) ) - { - return; - } - //else: no custom selection background colour, use base class version - } - - wxVListBox::OnDrawBackground(dc, rect, n); -} - -void wxHtmlListBox::OnDrawItem(wxDC& dc, const wxRect& rect, size_t n) const -{ - CacheItem(n); - - wxHtmlCell *cell = m_cache->Get(n); - wxCHECK_RET( cell, wxT("this cell should be cached!") ); - - wxHtmlRenderingInfo htmlRendInfo; - - // draw the selected cell in selected state ourselves if we're using custom - // colours (to test for this, check the callbacks by passing them any dummy - // (but valid, to avoid asserts) colour): - if ( IsSelected(n) && - (GetSelectedTextColour(*wxBLACK).IsOk() || - GetSelectedTextBgColour(*wxWHITE).IsOk()) ) - { - wxHtmlSelection htmlSel; - htmlSel.Set(wxPoint(0,0), cell, wxPoint(INT_MAX, INT_MAX), cell); - htmlRendInfo.SetSelection(&htmlSel); - htmlRendInfo.SetStyle(m_htmlRendStyle); - htmlRendInfo.GetState().SetSelectionState(wxHTML_SEL_IN); - } - //else: normal item or selected item with default colours, its background - // was already taken care of in the base class - - // note that we can't stop drawing exactly at the window boundary as then - // even the visible cells part could be not drawn, so always draw the - // entire cell - cell->Draw(dc, - rect.x + CELL_BORDER, rect.y + CELL_BORDER, - 0, INT_MAX, htmlRendInfo); -} - -wxCoord wxHtmlListBox::OnMeasureItem(size_t n) const -{ - // Notice that we can't cache the cell here because we could be called from - // some code updating an existing cell which could be displaced from the - // cache if we called CacheItem() and destroyed -- resulting in a crash - // when we return to its method from here, see #16651. - wxHtmlCell * const cell = CreateCellForItem(n); - if ( !cell ) - return 0; - - const wxCoord h = cell->GetHeight() + cell->GetDescent() + 4; - delete cell; - - return h; -} - -// ---------------------------------------------------------------------------- -// wxHtmlListBox implementation of wxHtmlListBoxWinInterface -// ---------------------------------------------------------------------------- - -void wxHtmlListBox::SetHTMLWindowTitle(const wxString& WXUNUSED(title)) -{ - // nothing to do -} - -void wxHtmlListBox::OnHTMLLinkClicked(const wxHtmlLinkInfo& link) -{ - OnLinkClicked(GetItemForCell(link.GetHtmlCell()), link); -} - -void wxHtmlListBox::OnLinkClicked(size_t WXUNUSED(n), - const wxHtmlLinkInfo& link) -{ - wxHtmlLinkEvent event(GetId(), link); - GetEventHandler()->ProcessEvent(event); -} - -wxHtmlOpeningStatus -wxHtmlListBox::OnHTMLOpeningURL(wxHtmlURLType WXUNUSED(type), - const wxString& WXUNUSED(url), - wxString *WXUNUSED(redirect)) const -{ - return wxHTML_OPEN; -} - -wxPoint wxHtmlListBox::HTMLCoordsToWindow(wxHtmlCell *cell, - const wxPoint& pos) const -{ - return CellCoordsToPhysical(pos, cell); -} - -wxWindow* wxHtmlListBox::GetHTMLWindow() { return this; } - -wxColour wxHtmlListBox::GetHTMLBackgroundColour() const -{ - return GetBackgroundColour(); -} - -void wxHtmlListBox::SetHTMLBackgroundColour(const wxColour& WXUNUSED(clr)) -{ - // nothing to do -} - -void wxHtmlListBox::SetHTMLBackgroundImage(const wxBitmap& WXUNUSED(bmpBg)) -{ - // nothing to do -} - -void wxHtmlListBox::SetHTMLStatusText(const wxString& WXUNUSED(text)) -{ - // nothing to do -} - -wxCursor wxHtmlListBox::GetHTMLCursor(HTMLCursor type) const -{ - // we don't want to show text selection cursor in listboxes - if (type == HTMLCursor_Text) - return wxHtmlWindow::GetDefaultHTMLCursor(HTMLCursor_Default); - - // in all other cases, use the same cursor as wxHtmlWindow: - return wxHtmlWindow::GetDefaultHTMLCursor(type); -} - -// ---------------------------------------------------------------------------- -// wxHtmlListBox handling of HTML links -// ---------------------------------------------------------------------------- - -wxPoint wxHtmlListBox::GetRootCellCoords(size_t n) const -{ - wxPoint pos(CELL_BORDER, CELL_BORDER); - pos += GetMargins(); - pos.y += GetRowsHeight(GetVisibleBegin(), n); - return pos; -} - -bool wxHtmlListBox::PhysicalCoordsToCell(wxPoint& pos, wxHtmlCell*& cell) const -{ - int n = VirtualHitTest(pos.y); - if ( n == wxNOT_FOUND ) - return false; - - // convert mouse coordinates to coords relative to item's wxHtmlCell: - pos -= GetRootCellCoords(n); - - CacheItem(n); - cell = m_cache->Get(n); - - return true; -} - -size_t wxHtmlListBox::GetItemForCell(const wxHtmlCell *cell) const -{ - wxCHECK_MSG( cell, 0, wxT("no cell") ); - - cell = cell->GetRootCell(); - - wxCHECK_MSG( cell, 0, wxT("no root cell") ); - - // the cell's ID contains item index, see CacheItem(): - unsigned long n; - if ( !cell->GetId().ToULong(&n) ) - { - wxFAIL_MSG( wxT("unexpected root cell's ID") ); - return 0; - } - - return n; -} - -wxPoint -wxHtmlListBox::CellCoordsToPhysical(const wxPoint& pos, wxHtmlCell *cell) const -{ - return pos + GetRootCellCoords(GetItemForCell(cell)); -} - -void wxHtmlListBox::OnInternalIdle() -{ - wxVListBox::OnInternalIdle(); - - if ( wxHtmlWindowMouseHelper::DidMouseMove() ) - { - wxPoint pos = ScreenToClient(wxGetMousePosition()); - wxHtmlCell *cell; - - if ( !PhysicalCoordsToCell(pos, cell) ) - return; - - wxHtmlWindowMouseHelper::HandleIdle(cell, pos); - } -} - -void wxHtmlListBox::OnMouseMove(wxMouseEvent& event) -{ - wxHtmlWindowMouseHelper::HandleMouseMoved(); - event.Skip(); -} - -void wxHtmlListBox::OnLeftDown(wxMouseEvent& event) -{ - wxPoint pos = event.GetPosition(); - wxHtmlCell *cell; - - if ( !PhysicalCoordsToCell(pos, cell) ) - { - event.Skip(); - return; - } - - if ( !wxHtmlWindowMouseHelper::HandleMouseClick(cell, pos, event) ) - { - // no link was clicked, so let the listbox code handle the click (e.g. - // by selecting another item in the list): - event.Skip(); - } -} - - -// ---------------------------------------------------------------------------- -// wxSimpleHtmlListBox -// ---------------------------------------------------------------------------- - -wxIMPLEMENT_ABSTRACT_CLASS(wxSimpleHtmlListBox, wxHtmlListBox); - - -bool wxSimpleHtmlListBox::Create(wxWindow *parent, wxWindowID id, - const wxPoint& pos, - const wxSize& size, - int n, const wxString choices[], - long style, - const wxValidator& wxVALIDATOR_PARAM(validator), - const wxString& name) -{ - if (!wxHtmlListBox::Create(parent, id, pos, size, style, name)) - return false; - -#if wxUSE_VALIDATORS - SetValidator(validator); -#endif - - Append(n, choices); - - return true; -} - -bool wxSimpleHtmlListBox::Create(wxWindow *parent, wxWindowID id, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style, - const wxValidator& wxVALIDATOR_PARAM(validator), - const wxString& name) -{ - if (!wxHtmlListBox::Create(parent, id, pos, size, style, name)) - return false; - -#if wxUSE_VALIDATORS - SetValidator(validator); -#endif - - Append(choices); - - return true; -} - -wxSimpleHtmlListBox::~wxSimpleHtmlListBox() -{ - wxItemContainer::Clear(); -} - -void wxSimpleHtmlListBox::DoClear() -{ - wxASSERT(m_items.GetCount() == m_HTMLclientData.GetCount()); - - m_items.Clear(); - m_HTMLclientData.Clear(); - - UpdateCount(); -} - -void wxSimpleHtmlListBox::Clear() -{ - DoClear(); -} - -void wxSimpleHtmlListBox::DoDeleteOneItem(unsigned int n) -{ - m_items.RemoveAt(n); - - m_HTMLclientData.RemoveAt(n); - - UpdateCount(); -} - -int wxSimpleHtmlListBox::DoInsertItems(const wxArrayStringsAdapter& items, - unsigned int pos, - void **clientData, - wxClientDataType type) -{ - const unsigned int count = items.GetCount(); - - m_items.Insert(wxEmptyString, pos, count); - m_HTMLclientData.Insert(NULL, pos, count); - - for ( unsigned int i = 0; i < count; ++i, ++pos ) - { - m_items[pos] = items[i]; - AssignNewItemClientData(pos, clientData, i, type); - } - - UpdateCount(); - - return pos - 1; -} - -void wxSimpleHtmlListBox::SetString(unsigned int n, const wxString& s) -{ - wxCHECK_RET( IsValid(n), - wxT("invalid index in wxSimpleHtmlListBox::SetString") ); - - m_items[n]=s; - RefreshRow(n); -} - -wxString wxSimpleHtmlListBox::GetString(unsigned int n) const -{ - wxCHECK_MSG( IsValid(n), wxEmptyString, - wxT("invalid index in wxSimpleHtmlListBox::GetString") ); - - return m_items[n]; -} - -void wxSimpleHtmlListBox::UpdateCount() -{ - wxASSERT(m_items.GetCount() == m_HTMLclientData.GetCount()); - wxHtmlListBox::SetItemCount(m_items.GetCount()); - - // very small optimization: if you need to add lot of items to - // a wxSimpleHtmlListBox be sure to use the - // wxSimpleHtmlListBox::Append(const wxArrayString&) method instead! - if (!this->IsFrozen()) - RefreshAll(); -} - -#endif // wxUSE_HTML diff --git a/Externals/wxWidgets3/src/generic/hyperlinkg.cpp b/Externals/wxWidgets3/src/generic/hyperlinkg.cpp deleted file mode 100644 index 1d0bb412d7..0000000000 --- a/Externals/wxWidgets3/src/generic/hyperlinkg.cpp +++ /dev/null @@ -1,296 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/generic/hyperlinkg.cpp -// Purpose: Hyperlink control -// Author: David Norris , Otto Wyss -// Modified by: Ryan Norton, Francesco Montorsi -// Created: 04/02/2005 -// Copyright: (c) 2005 David Norris -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -//--------------------------------------------------------------------------- -// Pre-compiled header stuff -//--------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_HYPERLINKCTRL - -//--------------------------------------------------------------------------- -// Includes -//--------------------------------------------------------------------------- - -#include "wx/hyperlink.h" - -#ifndef WX_PRECOMP - #include "wx/utils.h" // for wxLaunchDefaultBrowser - #include "wx/dcclient.h" - #include "wx/menu.h" - #include "wx/log.h" - #include "wx/dataobj.h" -#endif - -#include "wx/clipbrd.h" -#include "wx/renderer.h" - -// ============================================================================ -// implementation -// ============================================================================ - -// reserved for internal use only -#define wxHYPERLINK_POPUP_COPY_ID 16384 - -// ---------------------------------------------------------------------------- -// wxGenericHyperlinkCtrl -// ---------------------------------------------------------------------------- - -bool wxGenericHyperlinkCtrl::Create(wxWindow *parent, wxWindowID id, - const wxString& label, const wxString& url, const wxPoint& pos, - const wxSize& size, long style, const wxString& name) -{ - // do validation checks: - CheckParams(label, url, style); - - if ((style & wxHL_ALIGN_LEFT) == 0) - style |= wxFULL_REPAINT_ON_RESIZE; - - if (!wxControl::Create(parent, id, pos, size, style, wxDefaultValidator, name)) - return false; - - // set to non empty strings both the url and the label - SetURL(url.empty() ? label : url); - SetLabel(label.empty() ? url : label); - - Init(); - SetForegroundColour(m_normalColour); - - // by default the font of an hyperlink control is underlined - wxFont f = GetFont(); - f.SetUnderlined(true); - SetFont(f); - - SetInitialSize(size); - - - // connect our event handlers: - // NOTE: since this class is the base class of the GTK+'s native implementation - // of wxHyperlinkCtrl, we cannot use the static macros in wxBEGIN/wxEND_EVENT_TABLE - // blocks, otherwise the GTK+'s native impl of wxHyperlinkCtrl would not - // behave correctly (as we intercept events doing things which interfere - // with GTK+'s native handling): - - Connect( wxEVT_PAINT, wxPaintEventHandler(wxGenericHyperlinkCtrl::OnPaint) ); - Connect( wxEVT_SET_FOCUS, wxFocusEventHandler(wxGenericHyperlinkCtrl::OnFocus) ); - Connect( wxEVT_KILL_FOCUS, wxFocusEventHandler(wxGenericHyperlinkCtrl::OnFocus) ); - Connect( wxEVT_CHAR, wxKeyEventHandler(wxGenericHyperlinkCtrl::OnChar) ); - Connect( wxEVT_LEAVE_WINDOW, wxMouseEventHandler(wxGenericHyperlinkCtrl::OnLeaveWindow) ); - - Connect( wxEVT_LEFT_DOWN, wxMouseEventHandler(wxGenericHyperlinkCtrl::OnLeftDown) ); - Connect( wxEVT_LEFT_UP, wxMouseEventHandler(wxGenericHyperlinkCtrl::OnLeftUp) ); - Connect( wxEVT_MOTION, wxMouseEventHandler(wxGenericHyperlinkCtrl::OnMotion) ); - - ConnectMenuHandlers(); - - return true; -} - -void wxGenericHyperlinkCtrl::Init() -{ - m_rollover = false; - m_clicking = false; - m_visited = false; - - // colours - m_normalColour = *wxBLUE; - m_hoverColour = *wxRED; - m_visitedColour = wxColour("#551a8b"); -} - -void wxGenericHyperlinkCtrl::ConnectMenuHandlers() -{ - // Connect the event handlers for the context menu. - Connect( wxEVT_RIGHT_UP, wxMouseEventHandler(wxGenericHyperlinkCtrl::OnRightUp) ); - Connect( wxHYPERLINK_POPUP_COPY_ID, wxEVT_MENU, - wxCommandEventHandler(wxGenericHyperlinkCtrl::OnPopUpCopy) ); -} - -wxSize wxGenericHyperlinkCtrl::DoGetBestClientSize() const -{ - wxClientDC dc((wxWindow *)this); - return dc.GetTextExtent(GetLabel()); -} - - -void wxGenericHyperlinkCtrl::SetNormalColour(const wxColour &colour) -{ - m_normalColour = colour; - if (!m_visited) - { - SetForegroundColour(m_normalColour); - Refresh(); - } -} - -void wxGenericHyperlinkCtrl::SetVisitedColour(const wxColour &colour) -{ - m_visitedColour = colour; - if (m_visited) - { - SetForegroundColour(m_visitedColour); - Refresh(); - } -} - -void wxGenericHyperlinkCtrl::DoContextMenu(const wxPoint &pos) -{ - wxMenu *menuPopUp = new wxMenu(wxEmptyString, wxMENU_TEAROFF); - menuPopUp->Append(wxHYPERLINK_POPUP_COPY_ID, _("&Copy URL")); - PopupMenu( menuPopUp, pos ); - delete menuPopUp; -} - -wxRect wxGenericHyperlinkCtrl::GetLabelRect() const -{ - // our best size is always the size of the label without borders - wxSize c(GetClientSize()), b(GetBestSize()); - wxPoint offset; - - // the label is always centered vertically - offset.y = (c.GetHeight()-b.GetHeight())/2; - - if (HasFlag(wxHL_ALIGN_CENTRE)) - offset.x = (c.GetWidth()-b.GetWidth())/2; - else if (HasFlag(wxHL_ALIGN_RIGHT)) - offset.x = c.GetWidth()-b.GetWidth(); - else if (HasFlag(wxHL_ALIGN_LEFT)) - offset.x = 0; - return wxRect(offset, b); -} - - - -// ---------------------------------------------------------------------------- -// wxGenericHyperlinkCtrl - event handlers -// ---------------------------------------------------------------------------- - -void wxGenericHyperlinkCtrl::OnPaint(wxPaintEvent& WXUNUSED(event)) -{ - wxPaintDC dc(this); - dc.SetFont(GetFont()); - dc.SetTextForeground(GetForegroundColour()); - dc.SetTextBackground(GetBackgroundColour()); - - dc.DrawText(GetLabel(), GetLabelRect().GetTopLeft()); - if (HasFocus()) - { - wxRendererNative::Get().DrawFocusRect(this, dc, GetClientRect(), wxCONTROL_SELECTED); - } -} - -void wxGenericHyperlinkCtrl::OnFocus(wxFocusEvent& event) -{ - Refresh(); - event.Skip(); -} - -void wxGenericHyperlinkCtrl::OnChar(wxKeyEvent& event) -{ - switch (event.m_keyCode) - { - default: - event.Skip(); - break; - case WXK_SPACE: - case WXK_NUMPAD_SPACE: - SetForegroundColour(m_visitedColour); - m_visited = true; - SendEvent(); - break; - } -} - -void wxGenericHyperlinkCtrl::OnLeftDown(wxMouseEvent& event) -{ - // the left click must start from the hyperlink rect - m_clicking = GetLabelRect().Contains(event.GetPosition()); -} - -void wxGenericHyperlinkCtrl::OnLeftUp(wxMouseEvent& event) -{ - // the click must be started and ended in the hyperlink rect - if (!m_clicking || !GetLabelRect().Contains(event.GetPosition())) - return; - - SetForegroundColour(m_visitedColour); - m_visited = true; - m_clicking = false; - - // send the event - SendEvent(); -} - -void wxGenericHyperlinkCtrl::OnRightUp(wxMouseEvent& event) -{ - if( GetWindowStyle() & wxHL_CONTEXTMENU ) - if ( GetLabelRect().Contains(event.GetPosition()) ) - DoContextMenu(wxPoint(event.m_x, event.m_y)); -} - -void wxGenericHyperlinkCtrl::OnMotion(wxMouseEvent& event) -{ - wxRect textrc = GetLabelRect(); - - if (textrc.Contains(event.GetPosition())) - { - SetCursor(wxCursor(wxCURSOR_HAND)); - SetForegroundColour(m_hoverColour); - m_rollover = true; - Refresh(); - } - else if (m_rollover) - { - SetCursor(*wxSTANDARD_CURSOR); - SetForegroundColour(!m_visited ? m_normalColour : m_visitedColour); - m_rollover = false; - Refresh(); - } -} - -void wxGenericHyperlinkCtrl::OnLeaveWindow(wxMouseEvent& WXUNUSED(event) ) -{ - // NB: when the label rect and the client size rect have the same - // height this function is indispensable to remove the "rollover" - // effect as the OnMotion() event handler could not be called - // in that case moving the mouse out of the label vertically... - - if (m_rollover) - { - SetCursor(*wxSTANDARD_CURSOR); - SetForegroundColour(!m_visited ? m_normalColour : m_visitedColour); - m_rollover = false; - Refresh(); - } -} - -void wxGenericHyperlinkCtrl::OnPopUpCopy( wxCommandEvent& WXUNUSED(event) ) -{ -#if wxUSE_CLIPBOARD - if (!wxTheClipboard->Open()) - return; - - wxTextDataObject *data = new wxTextDataObject( m_url ); - wxTheClipboard->SetData( data ); - wxTheClipboard->Close(); -#endif // wxUSE_CLIPBOARD -} - -#endif // wxUSE_HYPERLINKCTRL diff --git a/Externals/wxWidgets3/src/generic/icon.cpp b/Externals/wxWidgets3/src/generic/icon.cpp deleted file mode 100644 index 53b1c80fee..0000000000 --- a/Externals/wxWidgets3/src/generic/icon.cpp +++ /dev/null @@ -1,46 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/generic/icon.cpp -// Purpose: wxIcon implementation for ports where it's same as wxBitmap -// Author: Julian Smart -// Modified by: -// Created: 17/09/98 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// for compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include "wx/icon.h" - -//----------------------------------------------------------------------------- -// wxIcon -//----------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap); - -wxIcon::wxIcon(const char* const* bits) : - wxBitmap( bits ) -{ -} - -#ifdef wxNEEDS_CHARPP -wxIcon::wxIcon(char **bits) : - wxBitmap( bits ) -{ -} -#endif - -wxIcon::wxIcon() : wxBitmap() -{ -} - -void wxIcon::CopyFromBitmap(const wxBitmap& bmp) -{ - wxIcon *icon = (wxIcon*)(&bmp); - *this = *icon; -} diff --git a/Externals/wxWidgets3/src/generic/imaglist.cpp b/Externals/wxWidgets3/src/generic/imaglist.cpp deleted file mode 100644 index 14c8127a80..0000000000 --- a/Externals/wxWidgets3/src/generic/imaglist.cpp +++ /dev/null @@ -1,261 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/generic/imaglist.cpp -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_IMAGLIST && !defined(wxHAS_NATIVE_IMAGELIST) - -#include "wx/imaglist.h" - -#ifndef WX_PRECOMP - #include "wx/dc.h" - #include "wx/icon.h" - #include "wx/image.h" -#endif - -//----------------------------------------------------------------------------- -// wxImageList -//----------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxGenericImageList, wxObject); -wxIMPLEMENT_DYNAMIC_CLASS(wxImageList, wxGenericImageList); - -wxGenericImageList::wxGenericImageList( int width, int height, bool mask, int initialCount ) -{ - (void)Create(width, height, mask, initialCount); -} - -wxGenericImageList::~wxGenericImageList() -{ - (void)RemoveAll(); -} - -int wxGenericImageList::GetImageCount() const -{ - return m_images.GetCount(); -} - -bool wxGenericImageList::Create( int width, int height, bool WXUNUSED(mask), int WXUNUSED(initialCount) ) -{ - m_width = width; - m_height = height; - - return Create(); -} - -bool wxGenericImageList::Create() -{ - return true; -} - -int wxGenericImageList::Add( const wxBitmap &bitmap ) -{ - wxASSERT_MSG( (bitmap.GetWidth() >= m_width && bitmap.GetHeight() == m_height) - || (m_width == 0 && m_height == 0), - wxT("invalid bitmap size in wxImageList: this might work ") - wxT("on this platform but definitely won't under Windows.") ); - - const int index = int(m_images.GetCount()); - - if (bitmap.IsKindOf(wxCLASSINFO(wxIcon))) - { - m_images.Append( new wxIcon( (const wxIcon&) bitmap ) ); - } - else - { - // Mimic behaviour of Windows ImageList_Add that automatically breaks up the added - // bitmap into sub-images of the correct size - if (m_width > 0 && bitmap.GetWidth() > m_width && bitmap.GetHeight() >= m_height) - { - int numImages = bitmap.GetWidth() / m_width; - for (int subIndex = 0; subIndex < numImages; subIndex++) - { - wxRect rect(m_width * subIndex, 0, m_width, m_height); - wxBitmap tmpBmp = bitmap.GetSubBitmap(rect); - m_images.Append( new wxBitmap(tmpBmp) ); - } - } - else - { - m_images.Append( new wxBitmap(bitmap) ); - } - } - - if (m_width == 0 && m_height == 0) - { - m_width = bitmap.GetWidth(); - m_height = bitmap.GetHeight(); - } - - return index; -} - -int wxGenericImageList::Add( const wxBitmap& bitmap, const wxBitmap& mask ) -{ - wxBitmap bmp(bitmap); - if (mask.IsOk()) - bmp.SetMask(new wxMask(mask)); - return Add(bmp); -} - -int wxGenericImageList::Add( const wxBitmap& bitmap, const wxColour& maskColour ) -{ - wxImage img = bitmap.ConvertToImage(); - img.SetMaskColour(maskColour.Red(), maskColour.Green(), maskColour.Blue()); - return Add(wxBitmap(img)); -} - -const wxBitmap *wxGenericImageList::GetBitmapPtr( int index ) const -{ - wxObjectList::compatibility_iterator node = m_images.Item( index ); - - wxCHECK_MSG( node, NULL, wxT("wrong index in image list") ); - - return (wxBitmap*)node->GetData(); -} - -// Get the bitmap -wxBitmap wxGenericImageList::GetBitmap(int index) const -{ - const wxBitmap* bmp = GetBitmapPtr(index); - if (bmp) - return *bmp; - else - return wxNullBitmap; -} - -// Get the icon -wxIcon wxGenericImageList::GetIcon(int index) const -{ - const wxBitmap* bmp = GetBitmapPtr(index); - if (bmp) - { - wxIcon icon; - icon.CopyFromBitmap(*bmp); - return icon; - } - else - return wxNullIcon; -} - -bool wxGenericImageList::Replace( int index, const wxBitmap &bitmap ) -{ - wxObjectList::compatibility_iterator node = m_images.Item( index ); - - wxCHECK_MSG( node, false, wxT("wrong index in image list") ); - - wxBitmap* newBitmap = (bitmap.IsKindOf(wxCLASSINFO(wxIcon))) ? - new wxBitmap( (const wxIcon&) bitmap ) - : new wxBitmap(bitmap) ; - - if (index == (int) m_images.GetCount() - 1) - { - delete node->GetData(); - m_images.Erase( node ); - m_images.Append( newBitmap ); - } - else - { - wxObjectList::compatibility_iterator next = node->GetNext(); - delete node->GetData(); - m_images.Erase( node ); - m_images.Insert( next, newBitmap ); - } - - return true; -} - -bool wxGenericImageList::Replace( int index, const wxBitmap &bitmap, const wxBitmap &mask ) -{ - wxObjectList::compatibility_iterator node = m_images.Item( index ); - - wxCHECK_MSG( node, false, wxT("wrong index in image list") ); - - wxBitmap* newBitmap = (bitmap.IsKindOf(wxCLASSINFO(wxIcon))) ? - new wxBitmap( (const wxIcon&) bitmap ) - : new wxBitmap(bitmap) ; - - if (index == (int) m_images.GetCount() - 1) - { - delete node->GetData(); - m_images.Erase( node ); - m_images.Append( newBitmap ); - } - else - { - wxObjectList::compatibility_iterator next = node->GetNext(); - delete node->GetData(); - m_images.Erase( node ); - m_images.Insert( next, newBitmap ); - } - - if (mask.IsOk()) - newBitmap->SetMask(new wxMask(mask)); - - return true; -} - -bool wxGenericImageList::Remove( int index ) -{ - wxObjectList::compatibility_iterator node = m_images.Item( index ); - - wxCHECK_MSG( node, false, wxT("wrong index in image list") ); - - delete node->GetData(); - m_images.Erase( node ); - - return true; -} - -bool wxGenericImageList::RemoveAll() -{ - WX_CLEAR_LIST(wxObjectList, m_images); - m_images.Clear(); - - return true; -} - -bool wxGenericImageList::GetSize( int index, int &width, int &height ) const -{ - width = 0; - height = 0; - - wxObjectList::compatibility_iterator node = m_images.Item( index ); - - wxCHECK_MSG( node, false, wxT("wrong index in image list") ); - - wxBitmap *bm = (wxBitmap*)node->GetData(); - width = bm->GetWidth(); - height = bm->GetHeight(); - - return true; -} - -bool wxGenericImageList::Draw( int index, wxDC &dc, int x, int y, - int flags, bool WXUNUSED(solidBackground) ) -{ - wxObjectList::compatibility_iterator node = m_images.Item( index ); - - wxCHECK_MSG( node, false, wxT("wrong index in image list") ); - - wxBitmap *bm = (wxBitmap*)node->GetData(); - - if (bm->IsKindOf(wxCLASSINFO(wxIcon))) - dc.DrawIcon( * ((wxIcon*) bm), x, y); - else - dc.DrawBitmap( *bm, x, y, (flags & wxIMAGELIST_DRAW_TRANSPARENT) > 0 ); - - return true; -} - -#endif // wxUSE_IMAGLIST diff --git a/Externals/wxWidgets3/src/generic/infobar.cpp b/Externals/wxWidgets3/src/generic/infobar.cpp deleted file mode 100644 index 2ca258faf9..0000000000 --- a/Externals/wxWidgets3/src/generic/infobar.cpp +++ /dev/null @@ -1,431 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/generic/infobar.cpp -// Purpose: generic wxInfoBar implementation -// Author: Vadim Zeitlin -// Created: 2009-07-28 -// Copyright: (c) 2009 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// for compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_INFOBAR - -#include "wx/infobar.h" - -#ifndef WX_PRECOMP - #include "wx/bmpbuttn.h" - #include "wx/button.h" - #include "wx/dcmemory.h" - #include "wx/settings.h" - #include "wx/statbmp.h" - #include "wx/stattext.h" - #include "wx/sizer.h" -#endif // WX_PRECOMP - -#include "wx/artprov.h" -#include "wx/scopeguard.h" - -wxBEGIN_EVENT_TABLE(wxInfoBarGeneric, wxInfoBarBase) - EVT_BUTTON(wxID_ANY, wxInfoBarGeneric::OnButton) -wxEND_EVENT_TABLE() - -// ============================================================================ -// implementation -// ============================================================================ - -void wxInfoBarGeneric::Init() -{ - m_icon = NULL; - m_text = NULL; - m_button = NULL; - - m_showEffect = - m_hideEffect = wxSHOW_EFFECT_MAX; - - // use default effect duration - m_effectDuration = 0; -} - -bool wxInfoBarGeneric::Create(wxWindow *parent, wxWindowID winid) -{ - // calling Hide() before Create() ensures that we're created initially - // hidden - Hide(); - if ( !wxWindow::Create(parent, winid) ) - return false; - - // use special, easy to notice, colours - SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_INFOBK)); - - // create the controls: icon, text and the button to dismiss the - // message. - - // the icon is not shown unless it's assigned a valid bitmap - m_icon = new wxStaticBitmap(this, wxID_ANY, wxNullBitmap); - - m_text = new wxStaticText(this, wxID_ANY, ""); - m_text->SetForegroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_INFOTEXT)); - - m_button = wxBitmapButton::NewCloseButton(this, wxID_ANY); - m_button->SetToolTip(_("Hide this notification message.")); - - // center the text inside the sizer with an icon to the left of it and a - // button at the very right - // - // NB: AddButton() relies on the button being the last control in the sizer - // and being preceded by a spacer - wxSizer * const sizer = new wxBoxSizer(wxHORIZONTAL); - sizer->Add(m_icon, wxSizerFlags().Centre().Border()); - sizer->Add(m_text, wxSizerFlags().Centre()); - sizer->AddStretchSpacer(); - sizer->Add(m_button, wxSizerFlags().Centre().Border()); - SetSizer(sizer); - - return true; -} - -bool wxInfoBarGeneric::SetFont(const wxFont& font) -{ - if ( !wxInfoBarBase::SetFont(font) ) - return false; - - // check that we're not called before Create() - if ( m_text ) - m_text->SetFont(font); - - return true; -} - -bool wxInfoBarGeneric::SetForegroundColour(const wxColor& colour) -{ - if ( !wxInfoBarBase::SetForegroundColour(colour) ) - return false; - - if ( m_text ) - m_text->SetForegroundColour(colour); - - return true; -} - -wxInfoBarGeneric::BarPlacement wxInfoBarGeneric::GetBarPlacement() const -{ - wxSizer * const sizer = GetContainingSizer(); - if ( !sizer ) - return BarPlacement_Unknown; - - const wxSizerItemList& siblings = sizer->GetChildren(); - if ( siblings.GetFirst()->GetData()->GetWindow() == this ) - return BarPlacement_Top; - else if ( siblings.GetLast()->GetData()->GetWindow() == this ) - return BarPlacement_Bottom; - else - return BarPlacement_Unknown; -} - -wxShowEffect wxInfoBarGeneric::GetShowEffect() const -{ - if ( m_showEffect != wxSHOW_EFFECT_MAX ) - return m_showEffect; - - switch ( GetBarPlacement() ) - { - case BarPlacement_Top: - return wxSHOW_EFFECT_SLIDE_TO_BOTTOM; - - case BarPlacement_Bottom: - return wxSHOW_EFFECT_SLIDE_TO_TOP; - - default: - wxFAIL_MSG( "unknown info bar placement" ); - wxFALLTHROUGH; - - case BarPlacement_Unknown: - return wxSHOW_EFFECT_NONE; - } -} - -wxShowEffect wxInfoBarGeneric::GetHideEffect() const -{ - if ( m_hideEffect != wxSHOW_EFFECT_MAX ) - return m_hideEffect; - - switch ( GetBarPlacement() ) - { - case BarPlacement_Top: - return wxSHOW_EFFECT_SLIDE_TO_TOP; - - case BarPlacement_Bottom: - return wxSHOW_EFFECT_SLIDE_TO_BOTTOM; - - default: - wxFAIL_MSG( "unknown info bar placement" ); - wxFALLTHROUGH; - - case BarPlacement_Unknown: - return wxSHOW_EFFECT_NONE; - } -} - -void wxInfoBarGeneric::UpdateParent() -{ - wxWindow * const parent = GetParent(); - parent->Layout(); -} - -void wxInfoBarGeneric::DoHide() -{ - HideWithEffect(GetHideEffect(), GetEffectDuration()); - - UpdateParent(); -} - -void wxInfoBarGeneric::DoShow() -{ - // re-layout the parent first so that the window expands into an already - // unoccupied by the other controls area: for this we need to change our - // internal visibility flag to force Layout() to take us into account (an - // alternative solution to this hack would be to temporarily set - // wxRESERVE_SPACE_EVEN_IF_HIDDEN flag but it's not really batter) - - // just change the internal flag indicating that the window is visible, - // without really showing it - wxWindowBase::Show(); - - // adjust the parent layout to account for us - UpdateParent(); - - // reset the flag back before really showing the window or it wouldn't be - // shown at all because it would believe itself already visible - wxWindowBase::Show(false); - - - // finally do really show the window. - ShowWithEffect(GetShowEffect(), GetEffectDuration()); -} - -void wxInfoBarGeneric::ShowMessage(const wxString& msg, int flags) -{ - // first update the controls - const int icon = flags & wxICON_MASK; - if ( !icon || (icon == wxICON_NONE) ) - { - m_icon->Hide(); - } - else // do show an icon - { - m_icon->SetBitmap(wxArtProvider::GetBitmap( - wxArtProvider::GetMessageBoxIconId(flags), - wxART_BUTTON)); - m_icon->Show(); - } - - // notice the use of EscapeMnemonics() to ensure that "&" come through - // correctly - m_text->SetLabel(wxControl::EscapeMnemonics(msg)); - - - // then show this entire window if not done yet - if ( !IsShown() ) - { - DoShow(); - } - else // we're already shown - { - // just update the layout to correspond to the new message - Layout(); - } -} - -void wxInfoBarGeneric::Dismiss() -{ - DoHide(); -} - -void wxInfoBarGeneric::AddButton(wxWindowID btnid, const wxString& label) -{ - wxSizer * const sizer = GetSizer(); - wxCHECK_RET( sizer, "must be created first" ); - - // user-added buttons replace the standard close button so remove it if we - // hadn't done it yet - if ( sizer->Detach(m_button) ) - { - m_button->Hide(); - } - - wxButton * const button = new wxButton(this, btnid, label); - -#ifdef __WXMAC__ - // smaller buttons look better in the (narrow) info bar under OS X - button->SetWindowVariant(wxWINDOW_VARIANT_SMALL); -#endif // __WXMAC__ - - sizer->Add(button, wxSizerFlags().Centre().DoubleBorder()); -} - -size_t wxInfoBarGeneric::GetButtonCount() const -{ - size_t count = 0; - wxSizer * const sizer = GetSizer(); - if ( !sizer ) - return 0; - - // iterate over the sizer items in reverse order - const wxSizerItemList& items = sizer->GetChildren(); - for ( wxSizerItemList::compatibility_iterator node = items.GetLast(); - node != items.GetFirst(); - node = node->GetPrevious() ) - { - const wxSizerItem * const item = node->GetData(); - - // if we reached the spacer separating the buttons from the text - // break the for-loop. - if ( item->IsSpacer() ) - break; - - // if the standard button is shown, there must be no other ones - if ( item->GetWindow() == m_button ) - return 0; - - ++count; - } - - return count; -} - -wxWindowID wxInfoBarGeneric::GetButtonId(size_t idx) const -{ - wxCHECK_MSG( idx < GetButtonCount(), wxID_NONE, - "Invalid infobar button position" ); - - wxSizer * const sizer = GetSizer(); - if ( !sizer ) - return wxID_NONE; - - bool foundSpacer = false; - - size_t count = 0; - const wxSizerItemList& items = sizer->GetChildren(); - for ( wxSizerItemList::compatibility_iterator node = items.GetLast(); - node != items.GetFirst() || node != items.GetLast(); - ) - { - const wxSizerItem * const item = node->GetData(); - - if ( item->IsSpacer() ) - foundSpacer = true; - - if ( foundSpacer ) - { - if ( !item->IsSpacer() ) - { - if ( count == idx ) - { - if ( item->GetWindow() != m_button ) - return item->GetWindow()->GetId(); - } - - ++count; - } - - node = node->GetNext(); - } - else - { - node = node->GetPrevious(); - } - } - - return wxID_NONE; -} - -bool wxInfoBarGeneric::HasButtonId(wxWindowID btnid) const -{ - wxSizer * const sizer = GetSizer(); - if ( !sizer ) - return false; - - // iterate over the sizer items in reverse order to find the last added - // button with this id - const wxSizerItemList& items = sizer->GetChildren(); - for ( wxSizerItemList::compatibility_iterator node = items.GetLast(); - node != items.GetFirst(); - node = node->GetPrevious() ) - { - const wxSizerItem * const item = node->GetData(); - - // if we reached the spacer separating the buttons from the text - // then the wanted ID is not inside. - if ( item->IsSpacer() ) - return false; - - // check if we found our button - if ( item->GetWindow()->GetId() == btnid ) - return true; - } - - return false; -} - -void wxInfoBarGeneric::RemoveButton(wxWindowID btnid) -{ - wxSizer * const sizer = GetSizer(); - wxCHECK_RET( sizer, "must be created first" ); - - // iterate over the sizer items in reverse order to find the last added - // button with this id (ids of all buttons should be unique anyhow but if - // they are repeated removing the last added one probably makes more sense) - const wxSizerItemList& items = sizer->GetChildren(); - for ( wxSizerItemList::compatibility_iterator node = items.GetLast(); - node != items.GetFirst(); - node = node->GetPrevious() ) - { - const wxSizerItem * const item = node->GetData(); - - // if we reached the spacer separating the buttons from the text - // preceding them without finding our button, it must mean it's not - // there at all - if ( item->IsSpacer() ) - { - wxFAIL_MSG( wxString::Format("button with id %d not found", btnid) ); - return; - } - - // check if we found our button - if ( item->GetWindow()->GetId() == btnid ) - { - delete item->GetWindow(); - break; - } - } - - // check if there are any custom buttons left - if ( sizer->GetChildren().GetLast()->GetData()->IsSpacer() ) - { - // if the last item is the spacer, none are left so restore the - // standard close button - sizer->Add(m_button, wxSizerFlags().Centre().DoubleBorder()); - m_button->Show(); - } -} - -void wxInfoBarGeneric::OnButton(wxCommandEvent& WXUNUSED(event)) -{ - DoHide(); -} - -#endif // wxUSE_INFOBAR diff --git a/Externals/wxWidgets3/src/generic/laywin.cpp b/Externals/wxWidgets3/src/generic/laywin.cpp deleted file mode 100644 index b77f26bb5b..0000000000 --- a/Externals/wxWidgets3/src/generic/laywin.cpp +++ /dev/null @@ -1,346 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/generic/laywin.cpp -// Purpose: Implements a simple layout algorithm, plus -// wxSashLayoutWindow which is an example of a window with -// layout-awareness (via event handlers). This is suited to -// IDE-style window layout. -// Author: Julian Smart -// Modified by: -// Created: 04/01/98 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx/wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ -#pragma hdrstop -#endif - -#ifndef WX_PRECOMP - #include "wx/frame.h" -#endif - -#include "wx/laywin.h" -#include "wx/mdi.h" - - -wxIMPLEMENT_DYNAMIC_CLASS(wxQueryLayoutInfoEvent, wxEvent); -wxIMPLEMENT_DYNAMIC_CLASS(wxCalculateLayoutEvent, wxEvent); - -wxDEFINE_EVENT( wxEVT_QUERY_LAYOUT_INFO, wxQueryLayoutInfoEvent ); -wxDEFINE_EVENT( wxEVT_CALCULATE_LAYOUT, wxCalculateLayoutEvent ); - - -// ---------------------------------------------------------------------------- -// wxSashLayoutWindow -// ---------------------------------------------------------------------------- - -#if wxUSE_SASH -wxIMPLEMENT_CLASS(wxSashLayoutWindow, wxSashWindow); -wxBEGIN_EVENT_TABLE(wxSashLayoutWindow, wxSashWindow) - EVT_CALCULATE_LAYOUT(wxSashLayoutWindow::OnCalculateLayout) - EVT_QUERY_LAYOUT_INFO(wxSashLayoutWindow::OnQueryLayoutInfo) -wxEND_EVENT_TABLE() - -bool wxSashLayoutWindow::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, - const wxSize& size, long style, const wxString& name) -{ - return wxSashWindow::Create(parent, id, pos, size, style, name); -} - -void wxSashLayoutWindow::Init() -{ - m_orientation = wxLAYOUT_HORIZONTAL; - m_alignment = wxLAYOUT_TOP; -#ifdef __WXMAC__ - MacSetClipChildren( true ) ; -#endif -} - -// This is the function that wxLayoutAlgorithm calls to ascertain the window -// dimensions. -void wxSashLayoutWindow::OnQueryLayoutInfo(wxQueryLayoutInfoEvent& event) -{ - // int flags = event.GetFlags(); - int requestedLength = event.GetRequestedLength(); - - event.SetOrientation(m_orientation); - event.SetAlignment(m_alignment); - - if (m_orientation == wxLAYOUT_HORIZONTAL) - event.SetSize(wxSize(requestedLength, m_defaultSize.y)); - else - event.SetSize(wxSize(m_defaultSize.x, requestedLength)); -} - -// Called by parent to allow window to take a bit out of the -// client rectangle, and size itself if not in wxLAYOUT_QUERY mode. - -void wxSashLayoutWindow::OnCalculateLayout(wxCalculateLayoutEvent& event) -{ - wxRect clientSize(event.GetRect()); - - int flags = event.GetFlags(); - - if (!IsShown()) - return; - - // Let's assume that all windows stretch the full extent of the window in - // the direction of that window orientation. This will work for non-docking toolbars, - // and the status bar. Note that the windows have to have been created in a certain - // order to work, else you might get a left-aligned window going to the bottom - // of the window, and the status bar appearing to the right of it. The - // status bar would have to be created after or before the toolbar(s). - - wxRect thisRect; - - // Try to stretch - int length = (GetOrientation() == wxLAYOUT_HORIZONTAL) ? clientSize.width : clientSize.height; - wxLayoutOrientation orient = GetOrientation(); - - // We assume that a window that says it's horizontal, wants to be stretched in that - // direction. Is this distinction too fine? Do we assume that any horizontal - // window needs to be stretched in that direction? Possibly. - int whichDimension = (GetOrientation() == wxLAYOUT_HORIZONTAL) ? wxLAYOUT_LENGTH_X : wxLAYOUT_LENGTH_Y; - - wxQueryLayoutInfoEvent infoEvent(GetId()); - infoEvent.SetEventObject(this); - infoEvent.SetRequestedLength(length); - infoEvent.SetFlags(orient | whichDimension); - - if (!GetEventHandler()->ProcessEvent(infoEvent)) - return; - - wxSize sz = infoEvent.GetSize(); - - if (sz.x == 0 && sz.y == 0) // Assume it's invisible - return; - - // Now we know the size it wants to be. We wish to decide where to place it, i.e. - // how it's aligned. - switch (GetAlignment()) - { - case wxLAYOUT_TOP: - { - thisRect.x = clientSize.x; thisRect.y = clientSize.y; - thisRect.width = sz.x; thisRect.height = sz.y; - clientSize.y += thisRect.height; - clientSize.height -= thisRect.height; - break; - } - case wxLAYOUT_LEFT: - { - thisRect.x = clientSize.x; thisRect.y = clientSize.y; - thisRect.width = sz.x; thisRect.height = sz.y; - clientSize.x += thisRect.width; - clientSize.width -= thisRect.width; - break; - } - case wxLAYOUT_RIGHT: - { - thisRect.x = clientSize.x + (clientSize.width - sz.x); thisRect.y = clientSize.y; - thisRect.width = sz.x; thisRect.height = sz.y; - clientSize.width -= thisRect.width; - break; - } - case wxLAYOUT_BOTTOM: - { - thisRect.x = clientSize.x; thisRect.y = clientSize.y + (clientSize.height - sz.y); - thisRect.width = sz.x; thisRect.height = sz.y; - clientSize.height -= thisRect.height; - break; - } - case wxLAYOUT_NONE: - { - break; - } - - } - - if ((flags & wxLAYOUT_QUERY) == 0) - { - // If not in query mode, resize the window. - // TODO: add wxRect& form to wxWindow::SetSize - wxSize sz2 = GetSize(); - wxPoint pos = GetPosition(); - SetSize(thisRect.x, thisRect.y, thisRect.width, thisRect.height); - - // Make sure the sash is erased when the window is resized - if ((pos.x != thisRect.x || pos.y != thisRect.y || sz2.x != thisRect.width || sz2.y != thisRect.height) && - (GetSashVisible(wxSASH_TOP) || GetSashVisible(wxSASH_RIGHT) || GetSashVisible(wxSASH_BOTTOM) || GetSashVisible(wxSASH_LEFT))) - Refresh(true); - - } - - event.SetRect(clientSize); -} -#endif // wxUSE_SASH - - -// ---------------------------------------------------------------------------- -// wxLayoutAlgorithm -// ---------------------------------------------------------------------------- - -#if wxUSE_MDI_ARCHITECTURE - -// Lays out windows for an MDI frame. The MDI client area gets what's left -// over. -bool wxLayoutAlgorithm::LayoutMDIFrame(wxMDIParentFrame* frame, wxRect* r) -{ - int cw, ch; - frame->GetClientSize(& cw, & ch); - - wxRect rect(0, 0, cw, ch); - if (r) - rect = * r; - - wxCalculateLayoutEvent event; - event.SetRect(rect); - - wxWindowList::compatibility_iterator node = frame->GetChildren().GetFirst(); - while (node) - { - wxWindow* win = node->GetData(); - - event.SetId(win->GetId()); - event.SetEventObject(win); - event.SetFlags(0); // ?? - - win->GetEventHandler()->ProcessEvent(event); - - node = node->GetNext(); - } - - wxWindow* clientWindow = frame->GetClientWindow(); - - rect = event.GetRect(); - - clientWindow->SetSize(rect.x, rect.y, rect.width, rect.height); - - return true; -} - -#endif // wxUSE_MDI_ARCHITECTURE - -bool wxLayoutAlgorithm::LayoutFrame(wxFrame* frame, wxWindow* mainWindow) -{ - return LayoutWindow(frame, mainWindow); -} - -// Layout algorithm for any window. mainWindow gets what's left over. -bool wxLayoutAlgorithm::LayoutWindow(wxWindow* parent, wxWindow* mainWindow) -{ - // Test if the parent is a sash window, and if so, - // reduce the available space to allow space for any active edges. - - int leftMargin = 0, rightMargin = 0, topMargin = 0, bottomMargin = 0; -#if wxUSE_SASH - if (wxDynamicCast(parent, wxSashWindow)) - { - wxSashWindow* sashWindow = (wxSashWindow*) parent; - - leftMargin = sashWindow->GetExtraBorderSize(); - rightMargin = sashWindow->GetExtraBorderSize(); - topMargin = sashWindow->GetExtraBorderSize(); - bottomMargin = sashWindow->GetExtraBorderSize(); - - if (sashWindow->GetSashVisible(wxSASH_LEFT)) - leftMargin += sashWindow->GetDefaultBorderSize(); - if (sashWindow->GetSashVisible(wxSASH_RIGHT)) - rightMargin += sashWindow->GetDefaultBorderSize(); - if (sashWindow->GetSashVisible(wxSASH_TOP)) - topMargin += sashWindow->GetDefaultBorderSize(); - if (sashWindow->GetSashVisible(wxSASH_BOTTOM)) - bottomMargin += sashWindow->GetDefaultBorderSize(); - } -#endif // wxUSE_SASH - - int cw, ch; - parent->GetClientSize(& cw, & ch); - - wxRect rect(leftMargin, topMargin, cw - leftMargin - rightMargin, ch - topMargin - bottomMargin); - - wxCalculateLayoutEvent event; - event.SetRect(rect); - - // Find the last layout-aware window, so we can make it fill all remaining - // space. - wxWindow *lastAwareWindow = NULL; - wxWindowList::compatibility_iterator node = parent->GetChildren().GetFirst(); - - while (node) - { - wxWindow* win = node->GetData(); - - if (win->IsShown()) - { - wxCalculateLayoutEvent tempEvent(win->GetId()); - tempEvent.SetEventObject(win); - tempEvent.SetFlags(wxLAYOUT_QUERY); - tempEvent.SetRect(event.GetRect()); - if (win->GetEventHandler()->ProcessEvent(tempEvent)) - lastAwareWindow = win; - } - - node = node->GetNext(); - } - - // Now do a dummy run to see if we have any space left for the final window (fail if not) - node = parent->GetChildren().GetFirst(); - while (node) - { - wxWindow* win = node->GetData(); - - // If mainWindow is NULL and we're at the last window, - // skip this, because we'll simply make it fit the remaining space. - if (win->IsShown() && (win != mainWindow) && (mainWindow != NULL || win != lastAwareWindow)) - { - event.SetId(win->GetId()); - event.SetEventObject(win); - event.SetFlags(wxLAYOUT_QUERY); - - win->GetEventHandler()->ProcessEvent(event); - } - - node = node->GetNext(); - } - - if (event.GetRect().GetWidth() < 0 || event.GetRect().GetHeight() < 0) - return false; - - event.SetRect(rect); - - node = parent->GetChildren().GetFirst(); - while (node) - { - wxWindow* win = node->GetData(); - - // If mainWindow is NULL and we're at the last window, - // skip this, because we'll simply make it fit the remaining space. - if (win->IsShown() && (win != mainWindow) && (mainWindow != NULL || win != lastAwareWindow)) - { - event.SetId(win->GetId()); - event.SetEventObject(win); - event.SetFlags(0); // ?? - - win->GetEventHandler()->ProcessEvent(event); - } - - node = node->GetNext(); - } - - rect = event.GetRect(); - - if (mainWindow) - mainWindow->SetSize(rect.x, rect.y, wxMax(0, rect.width), wxMax(0, rect.height)); - else if (lastAwareWindow) - { - // Fit the remaining space - lastAwareWindow->SetSize(rect.x, rect.y, wxMax(0, rect.width), wxMax(0, rect.height)); - } - - return true; -} - diff --git a/Externals/wxWidgets3/src/generic/listbkg.cpp b/Externals/wxWidgets3/src/generic/listbkg.cpp deleted file mode 100644 index bbb5cd4435..0000000000 --- a/Externals/wxWidgets3/src/generic/listbkg.cpp +++ /dev/null @@ -1,406 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/generic/listbkg.cpp -// Purpose: generic implementation of wxListbook -// Author: Vadim Zeitlin -// Modified by: -// Created: 19.08.03 -// Copyright: (c) 2003 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_LISTBOOK - -#include "wx/listbook.h" - -#ifndef WX_PRECOMP - #include "wx/settings.h" -#endif - -#include "wx/listctrl.h" -#include "wx/statline.h" -#include "wx/imaglist.h" - -// ---------------------------------------------------------------------------- -// event table -// ---------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxListbook, wxBookCtrlBase); - -wxDEFINE_EVENT( wxEVT_LISTBOOK_PAGE_CHANGING, wxBookCtrlEvent ); -wxDEFINE_EVENT( wxEVT_LISTBOOK_PAGE_CHANGED, wxBookCtrlEvent ); - -wxBEGIN_EVENT_TABLE(wxListbook, wxBookCtrlBase) - EVT_SIZE(wxListbook::OnSize) - EVT_LIST_ITEM_SELECTED(wxID_ANY, wxListbook::OnListSelected) -wxEND_EVENT_TABLE() - -// ============================================================================ -// wxListbook implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxListbook creation -// ---------------------------------------------------------------------------- - -bool -wxListbook::Create(wxWindow *parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) -{ - if ( (style & wxBK_ALIGN_MASK) == wxBK_DEFAULT ) - { -#ifdef __WXMAC__ - style |= wxBK_TOP; -#else // !__WXMAC__ - style |= wxBK_LEFT; -#endif // __WXMAC__/!__WXMAC__ - } - - // no border for this control, it doesn't look nice together with - // wxListCtrl border - style &= ~wxBORDER_MASK; - style |= wxBORDER_NONE; - - if ( !wxControl::Create(parent, id, pos, size, style, - wxDefaultValidator, name) ) - return false; - - m_bookctrl = new wxListView - ( - this, - wxID_ANY, - wxDefaultPosition, - wxDefaultSize, - GetListCtrlFlags() - ); - - if ( GetListView()->InReportView() ) - GetListView()->InsertColumn(0, wxS("Pages")); - - // Ensure that we rearrange the items in our list view after all the pages - // are added. - PostSizeEvent(); - - return true; -} - -// ---------------------------------------------------------------------------- -// wxListCtrl flags -// ---------------------------------------------------------------------------- - -long wxListbook::GetListCtrlFlags() const -{ - // We'd like to always use wxLC_ICON mode but it doesn't work with the - // native wxListCtrl under MSW unless we do have icons for all the items, - // so we can't use it if we have no image list. In this case we'd like to - // use wxLC_LIST mode because it works correctly for both horizontally and - // vertically laid out controls, but MSW native wxListCtrl insists on - // creating multiple columns if there are too many items and there doesn't - // seem anything to do about it, so we have to use wxLC_REPORT mode in this - // case there. - - long flags = IsVertical() ? wxLC_ALIGN_LEFT : wxLC_ALIGN_TOP; - if ( GetImageList() ) - { - flags |= wxLC_ICON; - } - else // No images. - { -#ifdef __WXMSW__ - if ( !IsVertical() ) - { - // Notice that we intentionally overwrite the alignment flags here - // by not using "|=", alignment isn't used for report view. - flags = wxLC_REPORT | wxLC_NO_HEADER; - } - else -#endif // __WXMSW__ - { - flags |= wxLC_LIST; - } - -#ifdef __WXQT__ - flags |= wxLC_NO_HEADER; -#endif - } - - // Use single selection in any case. - return flags | wxLC_SINGLE_SEL; -} - -// ---------------------------------------------------------------------------- -// wxListbook geometry management -// ---------------------------------------------------------------------------- - -void wxListbook::OnSize(wxSizeEvent& event) -{ - // arrange the icons before calling SetClientSize(), otherwise it wouldn't - // account for the scrollbars the list control might need and, at least - // under MSW, we'd finish with an ugly looking list control with both - // vertical and horizontal scrollbar (with one of them being added because - // the other one is not accounted for in client size computations) - wxListView * const list = GetListView(); - if ( list ) - { - list->Arrange(); - - const int sel = GetSelection(); - if ( sel != wxNOT_FOUND ) - list->EnsureVisible(sel); - } - - event.Skip(); -} - -int wxListbook::HitTest(const wxPoint& pt, long *flags) const -{ - int pagePos = wxNOT_FOUND; - - if ( flags ) - *flags = wxBK_HITTEST_NOWHERE; - - // convert from listbook control coordinates to list control coordinates - const wxListView * const list = GetListView(); - const wxPoint listPt = list->ScreenToClient(ClientToScreen(pt)); - - // is the point inside list control? - if ( wxRect(list->GetSize()).Contains(listPt) ) - { - int flagsList; - pagePos = list->HitTest(listPt, flagsList); - - if ( flags ) - { - if ( pagePos != wxNOT_FOUND ) - *flags = 0; - - if ( flagsList & (wxLIST_HITTEST_ONITEMICON | - wxLIST_HITTEST_ONITEMSTATEICON ) ) - *flags |= wxBK_HITTEST_ONICON; - - if ( flagsList & wxLIST_HITTEST_ONITEMLABEL ) - *flags |= wxBK_HITTEST_ONLABEL; - } - } - else // not over list control at all - { - if ( flags && GetPageRect().Contains(pt) ) - *flags |= wxBK_HITTEST_ONPAGE; - } - - return pagePos; -} - -void wxListbook::UpdateSize() -{ - // we should find a more elegant way to force a layout than generating this - // dummy event - wxSizeEvent sz(GetSize(), GetId()); - GetEventHandler()->ProcessEvent(sz); -} - -// ---------------------------------------------------------------------------- -// accessing the pages -// ---------------------------------------------------------------------------- - -bool wxListbook::SetPageText(size_t n, const wxString& strText) -{ - GetListView()->SetItemText(n, strText); - - return true; -} - -wxString wxListbook::GetPageText(size_t n) const -{ - return GetListView()->GetItemText(n); -} - -int wxListbook::GetPageImage(size_t n) const -{ - wxListItem item; - item.SetId(n); - - if (GetListView()->GetItem(item)) - { - return item.GetImage(); - } - else - { - return wxNOT_FOUND; - } -} - -bool wxListbook::SetPageImage(size_t n, int imageId) -{ - return GetListView()->SetItemImage(n, imageId); -} - -// ---------------------------------------------------------------------------- -// image list stuff -// ---------------------------------------------------------------------------- - -void wxListbook::SetImageList(wxImageList *imageList) -{ - const long flagsOld = GetListCtrlFlags(); - - wxBookCtrlBase::SetImageList(imageList); - - const long flagsNew = GetListCtrlFlags(); - - wxListView * const list = GetListView(); - - // We may need to change the list control mode if the image list presence - // has changed. - if ( flagsNew != flagsOld ) - { - // Preserve the selection which is lost when changing the mode - const int oldSel = GetSelection(); - - list->SetWindowStyleFlag(flagsNew); - if ( list->InReportView() ) - list->InsertColumn(0, wxS("Pages")); - - // Restore selection - if ( oldSel != wxNOT_FOUND ) - SetSelection(oldSel); - } - - list->SetImageList(imageList, wxIMAGE_LIST_NORMAL); -} - -// ---------------------------------------------------------------------------- -// selection -// ---------------------------------------------------------------------------- - -void wxListbook::UpdateSelectedPage(size_t newsel) -{ - m_selection = newsel; - GetListView()->Select(newsel); - GetListView()->Focus(newsel); -} - -wxBookCtrlEvent* wxListbook::CreatePageChangingEvent() const -{ - return new wxBookCtrlEvent(wxEVT_LISTBOOK_PAGE_CHANGING, m_windowId); -} - -void wxListbook::MakeChangedEvent(wxBookCtrlEvent &event) -{ - event.SetEventType(wxEVT_LISTBOOK_PAGE_CHANGED); -} - - -// ---------------------------------------------------------------------------- -// adding/removing the pages -// ---------------------------------------------------------------------------- - -bool -wxListbook::InsertPage(size_t n, - wxWindow *page, - const wxString& text, - bool bSelect, - int imageId) -{ - if ( !wxBookCtrlBase::InsertPage(n, page, text, bSelect, imageId) ) - return false; - - GetListView()->InsertItem(n, text, imageId); - - // if the inserted page is before the selected one, we must update the - // index of the selected page - if ( int(n) <= m_selection ) - { - // one extra page added - m_selection++; - GetListView()->Select(m_selection); - GetListView()->Focus(m_selection); - } - - if ( !DoSetSelectionAfterInsertion(n, bSelect) ) - page->Hide(); - - UpdateSize(); - - return true; -} - -wxWindow *wxListbook::DoRemovePage(size_t page) -{ - wxWindow *win = wxBookCtrlBase::DoRemovePage(page); - - if ( win ) - { - GetListView()->DeleteItem(page); - - DoSetSelectionAfterRemoval(page); - - GetListView()->Arrange(); - UpdateSize(); - } - - return win; -} - - -bool wxListbook::DeleteAllPages() -{ - GetListView()->DeleteAllItems(); - if (!wxBookCtrlBase::DeleteAllPages()) - return false; - - UpdateSize(); - - return true; -} - -// ---------------------------------------------------------------------------- -// wxListbook events -// ---------------------------------------------------------------------------- - -void wxListbook::OnListSelected(wxListEvent& eventList) -{ - if ( eventList.GetEventObject() != m_bookctrl ) - { - eventList.Skip(); - return; - } - - const int selNew = eventList.GetIndex(); - - if ( selNew == m_selection ) - { - // this event can only come from our own Select(m_selection) below - // which we call when the page change is vetoed, so we should simply - // ignore it - return; - } - - SetSelection(selNew); - - // change wasn't allowed, return to previous state - if (m_selection != selNew) - { - GetListView()->Select(m_selection); - GetListView()->Focus(m_selection); - } -} - -#endif // wxUSE_LISTBOOK diff --git a/Externals/wxWidgets3/src/generic/listctrl.cpp b/Externals/wxWidgets3/src/generic/listctrl.cpp deleted file mode 100644 index ef7aa27c6c..0000000000 --- a/Externals/wxWidgets3/src/generic/listctrl.cpp +++ /dev/null @@ -1,5640 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/generic/listctrl.cpp -// Purpose: generic implementation of wxListCtrl -// Author: Robert Roebling -// Vadim Zeitlin (virtual list control support) -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// TODO -// -// 1. we need to implement searching/sorting for virtual controls somehow -// 2. when changing selection the lines are refreshed twice - - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_LISTCTRL - -#include "wx/listctrl.h" - -#ifndef WX_PRECOMP - #include "wx/scrolwin.h" - #include "wx/timer.h" - #include "wx/settings.h" - #include "wx/dynarray.h" - #include "wx/dcclient.h" - #include "wx/dcscreen.h" - #include "wx/math.h" - #include "wx/settings.h" - #include "wx/sizer.h" -#endif - -#include "wx/imaglist.h" -#include "wx/renderer.h" -#include "wx/generic/private/listctrl.h" -#include "wx/generic/private/widthcalc.h" - -#ifdef __WXMAC__ - #include "wx/osx/private.h" -#endif - -#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) - #include "wx/msw/wrapwin.h" -#endif - -// NOTE: If using the wxListBox visual attributes works everywhere then this can -// be removed, as well as the #else case below. -#define _USE_VISATTR 0 - - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -// // the height of the header window (FIXME: should depend on its font!) -// static const int HEADER_HEIGHT = 23; - -static const int SCROLL_UNIT_X = 15; - -// the spacing between the lines (in report mode) -static const int LINE_SPACING = 0; - -// extra margins around the text label -#ifdef __WXGTK__ -static const int EXTRA_WIDTH = 6; -#else -static const int EXTRA_WIDTH = 4; -#endif - -#ifdef __WXGTK__ -static const int EXTRA_HEIGHT = 6; -#else -static const int EXTRA_HEIGHT = 4; -#endif - -// margin between the window and the items -static const int EXTRA_BORDER_X = 2; -static const int EXTRA_BORDER_Y = 2; - -// offset for the header window -static const int HEADER_OFFSET_X = 0; -static const int HEADER_OFFSET_Y = 0; - -// margin between rows of icons in [small] icon view -static const int MARGIN_BETWEEN_ROWS = 6; - -// when autosizing the columns, add some slack -static const int AUTOSIZE_COL_MARGIN = 10; - -// default width for the header columns -static const int WIDTH_COL_DEFAULT = 80; - -// the space between the image and the text in the report mode -static const int IMAGE_MARGIN_IN_REPORT_MODE = 5; - -// the space between the image and the text in the report mode in header -static const int HEADER_IMAGE_MARGIN_IN_REPORT_MODE = 2; - -// space after a checkbox -static const int MARGIN_AROUND_CHECKBOX = 5; - - -// ---------------------------------------------------------------------------- -// arrays/list implementations -// ---------------------------------------------------------------------------- - -#include "wx/listimpl.cpp" -WX_DEFINE_LIST(wxListItemDataList) - -#include "wx/arrimpl.cpp" -WX_DEFINE_OBJARRAY(wxListLineDataArray) - -#include "wx/listimpl.cpp" -WX_DEFINE_LIST(wxListHeaderDataList) - - -// ---------------------------------------------------------------------------- -// wxListItemData -// ---------------------------------------------------------------------------- - -wxListItemData::~wxListItemData() -{ - // in the virtual list control the attributes are managed by the main - // program, so don't delete them - if ( !m_owner->IsVirtual() ) - delete m_attr; - - delete m_rect; -} - -void wxListItemData::Init() -{ - m_image = -1; - m_data = 0; - - m_attr = NULL; -} - -wxListItemData::wxListItemData(wxListMainWindow *owner) -{ - Init(); - - m_owner = owner; - - if ( owner->InReportView() ) - m_rect = NULL; - else - m_rect = new wxRect; -} - -void wxListItemData::SetItem( const wxListItem &info ) -{ - if ( info.m_mask & wxLIST_MASK_TEXT ) - SetText(info.m_text); - if ( info.m_mask & wxLIST_MASK_IMAGE ) - m_image = info.m_image; - if ( info.m_mask & wxLIST_MASK_DATA ) - m_data = info.m_data; - - if ( info.HasAttributes() ) - { - if ( m_attr ) - m_attr->AssignFrom(*info.GetAttributes()); - else - m_attr = new wxListItemAttr(*info.GetAttributes()); - } - - if ( m_rect ) - { - m_rect->x = - m_rect->y = - m_rect->height = 0; - m_rect->width = info.m_width; - } -} - -void wxListItemData::SetPosition( int x, int y ) -{ - wxCHECK_RET( m_rect, wxT("unexpected SetPosition() call") ); - - m_rect->x = x; - m_rect->y = y; -} - -void wxListItemData::SetSize( int width, int height ) -{ - wxCHECK_RET( m_rect, wxT("unexpected SetSize() call") ); - - if ( width != -1 ) - m_rect->width = width; - if ( height != -1 ) - m_rect->height = height; -} - -bool wxListItemData::IsHit( int x, int y ) const -{ - wxCHECK_MSG( m_rect, false, wxT("can't be called in this mode") ); - - return wxRect(GetX(), GetY(), GetWidth(), GetHeight()).Contains(x, y); -} - -int wxListItemData::GetX() const -{ - wxCHECK_MSG( m_rect, 0, wxT("can't be called in this mode") ); - - return m_rect->x; -} - -int wxListItemData::GetY() const -{ - wxCHECK_MSG( m_rect, 0, wxT("can't be called in this mode") ); - - return m_rect->y; -} - -int wxListItemData::GetWidth() const -{ - wxCHECK_MSG( m_rect, 0, wxT("can't be called in this mode") ); - - return m_rect->width; -} - -int wxListItemData::GetHeight() const -{ - wxCHECK_MSG( m_rect, 0, wxT("can't be called in this mode") ); - - return m_rect->height; -} - -void wxListItemData::GetItem( wxListItem &info ) const -{ - long mask = info.m_mask; - if ( !mask ) - // by default, get everything for backwards compatibility - mask = -1; - - if ( mask & wxLIST_MASK_TEXT ) - info.m_text = m_text; - if ( mask & wxLIST_MASK_IMAGE ) - info.m_image = m_image; - if ( mask & wxLIST_MASK_DATA ) - info.m_data = m_data; - - if ( m_attr ) - { - if ( m_attr->HasTextColour() ) - info.SetTextColour(m_attr->GetTextColour()); - if ( m_attr->HasBackgroundColour() ) - info.SetBackgroundColour(m_attr->GetBackgroundColour()); - if ( m_attr->HasFont() ) - info.SetFont(m_attr->GetFont()); - } -} - -//----------------------------------------------------------------------------- -// wxListHeaderData -//----------------------------------------------------------------------------- - -void wxListHeaderData::Init() -{ - m_mask = 0; - m_image = -1; - m_format = 0; - m_width = 0; - m_xpos = 0; - m_ypos = 0; - m_height = 0; - m_state = 0; -} - -wxListHeaderData::wxListHeaderData() -{ - Init(); -} - -wxListHeaderData::wxListHeaderData( const wxListItem &item ) -{ - Init(); - - SetItem( item ); -} - -void wxListHeaderData::SetItem( const wxListItem &item ) -{ - m_mask = item.m_mask; - - if ( m_mask & wxLIST_MASK_TEXT ) - m_text = item.m_text; - - if ( m_mask & wxLIST_MASK_IMAGE ) - m_image = item.m_image; - - if ( m_mask & wxLIST_MASK_FORMAT ) - m_format = item.m_format; - - if ( m_mask & wxLIST_MASK_WIDTH ) - SetWidth(item.m_width); - - if ( m_mask & wxLIST_MASK_STATE ) - SetState(item.m_state); -} - -void wxListHeaderData::SetPosition( int x, int y ) -{ - m_xpos = x; - m_ypos = y; -} - -void wxListHeaderData::SetHeight( int h ) -{ - m_height = h; -} - -void wxListHeaderData::SetWidth( int w ) -{ - m_width = w < 0 ? WIDTH_COL_DEFAULT : w; -} - -void wxListHeaderData::SetState( int flag ) -{ - m_state = flag; -} - -void wxListHeaderData::SetFormat( int format ) -{ - m_format = format; -} - -bool wxListHeaderData::HasImage() const -{ - return m_image != -1; -} - -bool wxListHeaderData::IsHit( int x, int y ) const -{ - return ((x >= m_xpos) && (x <= m_xpos+m_width) && (y >= m_ypos) && (y <= m_ypos+m_height)); -} - -void wxListHeaderData::GetItem( wxListItem& item ) -{ - long mask = item.m_mask; - if ( !mask ) - { - // by default, get everything for backwards compatibility - mask = -1; - } - - if ( mask & wxLIST_MASK_STATE ) - item.m_state = m_state; - if ( mask & wxLIST_MASK_TEXT ) - item.m_text = m_text; - if ( mask & wxLIST_MASK_IMAGE ) - item.m_image = m_image; - if ( mask & wxLIST_MASK_WIDTH ) - item.m_width = m_width; - if ( mask & wxLIST_MASK_FORMAT ) - item.m_format = m_format; -} - -int wxListHeaderData::GetImage() const -{ - return m_image; -} - -int wxListHeaderData::GetWidth() const -{ - return m_width; -} - -int wxListHeaderData::GetFormat() const -{ - return m_format; -} - -int wxListHeaderData::GetState() const -{ - return m_state; -} - -//----------------------------------------------------------------------------- -// wxListLineData -//----------------------------------------------------------------------------- - -inline int wxListLineData::GetMode() const -{ - return m_owner->GetListCtrl()->GetWindowStyleFlag() & wxLC_MASK_TYPE; -} - -inline bool wxListLineData::InReportView() const -{ - return m_owner->HasFlag(wxLC_REPORT); -} - -inline bool wxListLineData::IsVirtual() const -{ - return m_owner->IsVirtual(); -} - -wxListLineData::wxListLineData( wxListMainWindow *owner ) -{ - m_owner = owner; - - if ( InReportView() ) - m_gi = NULL; - else // !report - m_gi = new GeometryInfo; - - m_highlighted = false; - m_checked = false; - - InitItems( GetMode() == wxLC_REPORT ? m_owner->GetColumnCount() : 1 ); -} - -void wxListLineData::CalculateSize( wxDC *dc, int spacing ) -{ - wxListItemDataList::compatibility_iterator node = m_items.GetFirst(); - wxCHECK_RET( node, wxT("no subitems at all??") ); - - wxListItemData *item = node->GetData(); - - wxString s; - wxCoord lw, lh; - - switch ( GetMode() ) - { - case wxLC_ICON: - case wxLC_SMALL_ICON: - m_gi->m_rectAll.width = spacing; - - s = item->GetText(); - - if ( s.empty() ) - { - lh = - m_gi->m_rectLabel.width = - m_gi->m_rectLabel.height = 0; - } - else // has label - { - dc->GetTextExtent( s, &lw, &lh ); - lw += EXTRA_WIDTH; - lh += EXTRA_HEIGHT; - - m_gi->m_rectAll.height = spacing + lh; - if (lw > spacing) - m_gi->m_rectAll.width = lw; - - m_gi->m_rectLabel.width = lw; - m_gi->m_rectLabel.height = lh; - } - - if (item->HasImage()) - { - int w, h; - m_owner->GetImageSize( item->GetImage(), w, h ); - m_gi->m_rectIcon.width = w + 8; - m_gi->m_rectIcon.height = h + 8; - - if ( m_gi->m_rectIcon.width > m_gi->m_rectAll.width ) - m_gi->m_rectAll.width = m_gi->m_rectIcon.width; - if ( m_gi->m_rectIcon.height + lh > m_gi->m_rectAll.height - 4 ) - m_gi->m_rectAll.height = m_gi->m_rectIcon.height + lh + 4; - } - - if ( item->HasText() ) - { - m_gi->m_rectHighlight.width = m_gi->m_rectLabel.width; - m_gi->m_rectHighlight.height = m_gi->m_rectLabel.height; - } - else // no text, highlight the icon - { - m_gi->m_rectHighlight.width = m_gi->m_rectIcon.width; - m_gi->m_rectHighlight.height = m_gi->m_rectIcon.height; - } - break; - - case wxLC_LIST: - s = item->GetTextForMeasuring(); - - dc->GetTextExtent( s, &lw, &lh ); - lw += EXTRA_WIDTH; - lh += EXTRA_HEIGHT; - - m_gi->m_rectLabel.width = lw; - m_gi->m_rectLabel.height = lh; - - m_gi->m_rectAll.width = lw; - m_gi->m_rectAll.height = lh; - - if (item->HasImage()) - { - int w, h; - m_owner->GetImageSize( item->GetImage(), w, h ); - m_gi->m_rectIcon.width = w; - m_gi->m_rectIcon.height = h; - - m_gi->m_rectAll.width += 4 + w; - if (h > m_gi->m_rectAll.height) - m_gi->m_rectAll.height = h; - } - - m_gi->m_rectHighlight.width = m_gi->m_rectAll.width; - m_gi->m_rectHighlight.height = m_gi->m_rectAll.height; - break; - - case wxLC_REPORT: - wxFAIL_MSG( wxT("unexpected call to SetSize") ); - break; - - default: - wxFAIL_MSG( wxT("unknown mode") ); - break; - } -} - -void wxListLineData::SetPosition( int x, int y, int spacing ) -{ - wxListItemDataList::compatibility_iterator node = m_items.GetFirst(); - wxCHECK_RET( node, wxT("no subitems at all??") ); - - wxListItemData *item = node->GetData(); - - switch ( GetMode() ) - { - case wxLC_ICON: - case wxLC_SMALL_ICON: - m_gi->m_rectAll.x = x; - m_gi->m_rectAll.y = y; - - if ( item->HasImage() ) - { - m_gi->m_rectIcon.x = m_gi->m_rectAll.x + 4 + - (m_gi->m_rectAll.width - m_gi->m_rectIcon.width) / 2; - m_gi->m_rectIcon.y = m_gi->m_rectAll.y + 4; - } - - if ( item->HasText() ) - { - if (m_gi->m_rectAll.width > spacing) - m_gi->m_rectLabel.x = m_gi->m_rectAll.x + (EXTRA_WIDTH/2); - else - m_gi->m_rectLabel.x = m_gi->m_rectAll.x + (EXTRA_WIDTH/2) + (spacing / 2) - (m_gi->m_rectLabel.width / 2); - m_gi->m_rectLabel.y = m_gi->m_rectAll.y + m_gi->m_rectAll.height + 2 - m_gi->m_rectLabel.height; - m_gi->m_rectHighlight.x = m_gi->m_rectLabel.x - 2; - m_gi->m_rectHighlight.y = m_gi->m_rectLabel.y - 2; - } - else // no text, highlight the icon - { - m_gi->m_rectHighlight.x = m_gi->m_rectIcon.x - 4; - m_gi->m_rectHighlight.y = m_gi->m_rectIcon.y - 4; - } - break; - - case wxLC_LIST: - m_gi->m_rectAll.x = x; - m_gi->m_rectAll.y = y; - - m_gi->m_rectHighlight.x = m_gi->m_rectAll.x; - m_gi->m_rectHighlight.y = m_gi->m_rectAll.y; - m_gi->m_rectLabel.y = m_gi->m_rectAll.y + 2; - - if (item->HasImage()) - { - m_gi->m_rectIcon.x = m_gi->m_rectAll.x + 2; - m_gi->m_rectIcon.y = m_gi->m_rectAll.y + 2; - m_gi->m_rectLabel.x = m_gi->m_rectAll.x + 4 + (EXTRA_WIDTH/2) + m_gi->m_rectIcon.width; - } - else - { - m_gi->m_rectLabel.x = m_gi->m_rectAll.x + (EXTRA_WIDTH/2); - } - break; - - case wxLC_REPORT: - wxFAIL_MSG( wxT("unexpected call to SetPosition") ); - break; - - default: - wxFAIL_MSG( wxT("unknown mode") ); - break; - } -} - -void wxListLineData::InitItems( int num ) -{ - for (int i = 0; i < num; i++) - m_items.Append( new wxListItemData(m_owner) ); -} - -void wxListLineData::SetItem( int index, const wxListItem &info ) -{ - wxListItemDataList::compatibility_iterator node = m_items.Item( index ); - wxCHECK_RET( node, wxT("invalid column index in SetItem") ); - - wxListItemData *item = node->GetData(); - item->SetItem( info ); -} - -void wxListLineData::GetItem( int index, wxListItem &info ) -{ - wxListItemDataList::compatibility_iterator node = m_items.Item( index ); - if (node) - { - wxListItemData *item = node->GetData(); - item->GetItem( info ); - } -} - -wxString wxListLineData::GetText(int index) const -{ - wxString s; - - wxListItemDataList::compatibility_iterator node = m_items.Item( index ); - if (node) - { - wxListItemData *item = node->GetData(); - s = item->GetText(); - } - - return s; -} - -void wxListLineData::SetText( int index, const wxString& s ) -{ - wxListItemDataList::compatibility_iterator node = m_items.Item( index ); - if (node) - { - wxListItemData *item = node->GetData(); - item->SetText( s ); - } -} - -void wxListLineData::SetImage( int index, int image ) -{ - wxListItemDataList::compatibility_iterator node = m_items.Item( index ); - wxCHECK_RET( node, wxT("invalid column index in SetImage()") ); - - wxListItemData *item = node->GetData(); - item->SetImage(image); -} - -int wxListLineData::GetImage( int index ) const -{ - wxListItemDataList::compatibility_iterator node = m_items.Item( index ); - wxCHECK_MSG( node, -1, wxT("invalid column index in GetImage()") ); - - wxListItemData *item = node->GetData(); - return item->GetImage(); -} - -wxListItemAttr *wxListLineData::GetAttr() const -{ - wxListItemDataList::compatibility_iterator node = m_items.GetFirst(); - wxCHECK_MSG( node, NULL, wxT("invalid column index in GetAttr()") ); - - wxListItemData *item = node->GetData(); - return item->GetAttr(); -} - -void wxListLineData::SetAttr(wxListItemAttr *attr) -{ - wxListItemDataList::compatibility_iterator node = m_items.GetFirst(); - wxCHECK_RET( node, wxT("invalid column index in SetAttr()") ); - - wxListItemData *item = node->GetData(); - item->SetAttr(attr); -} - -void wxListLineData::ApplyAttributes(wxDC *dc, - const wxRect& rectHL, - bool highlighted, - bool current) -{ - const wxListItemAttr * const attr = GetAttr(); - - wxWindow * const listctrl = m_owner->GetParent(); - - const bool hasFocus = listctrl->HasFocus(); - - // fg colour - - // don't use foreground colour for drawing highlighted items - this might - // make them completely invisible (and there is no way to do bit - // arithmetics on wxColour, unfortunately) - wxColour colText; - if ( highlighted ) - { -#ifdef __WXMAC__ - if ( hasFocus ) - colText = *wxWHITE; - else - colText = *wxBLACK; -#else - if ( hasFocus ) - colText = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT); - else - colText = wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOXHIGHLIGHTTEXT); -#endif - } - else if ( attr && attr->HasTextColour() ) - colText = attr->GetTextColour(); - else - colText = listctrl->GetForegroundColour(); - - dc->SetTextForeground(colText); - - // font - wxFont font; - if ( attr && attr->HasFont() ) - font = attr->GetFont(); - else - font = listctrl->GetFont(); - - dc->SetFont(font); - - // background - if ( highlighted ) - { - // Use the renderer method to ensure that the selected items use the - // native look. - int flags = wxCONTROL_SELECTED; - if ( hasFocus ) - flags |= wxCONTROL_FOCUSED; - if (current) - flags |= wxCONTROL_CURRENT; - wxRendererNative::Get(). - DrawItemSelectionRect( m_owner, *dc, rectHL, flags ); - } - else if ( attr && attr->HasBackgroundColour() ) - { - // Draw the background using the items custom background colour. - dc->SetBrush(attr->GetBackgroundColour()); - dc->SetPen(*wxTRANSPARENT_PEN); - dc->DrawRectangle(rectHL); - } - - // just for debugging to better see where the items are -#if 0 - dc->SetPen(*wxRED_PEN); - dc->SetBrush(*wxTRANSPARENT_BRUSH); - dc->DrawRectangle( m_gi->m_rectAll ); - dc->SetPen(*wxGREEN_PEN); - dc->DrawRectangle( m_gi->m_rectIcon ); -#endif -} - -void wxListLineData::Draw(wxDC *dc, bool current) -{ - wxListItemDataList::compatibility_iterator node = m_items.GetFirst(); - wxCHECK_RET( node, wxT("no subitems at all??") ); - - ApplyAttributes(dc, m_gi->m_rectHighlight, IsHighlighted(), current); - - wxListItemData *item = node->GetData(); - if (item->HasImage()) - { - // centre the image inside our rectangle, this looks nicer when items - // ae aligned in a row - const wxRect& rectIcon = m_gi->m_rectIcon; - - m_owner->DrawImage(item->GetImage(), dc, rectIcon.x, rectIcon.y); - } - - if (item->HasText()) - { - const wxRect& rectLabel = m_gi->m_rectLabel; - - wxDCClipper clipper(*dc, rectLabel); - dc->DrawText(item->GetText(), rectLabel.x, rectLabel.y); - } -} - -void wxListLineData::DrawInReportMode( wxDC *dc, - const wxRect& rect, - const wxRect& rectHL, - bool highlighted, - bool current ) -{ - // TODO: later we should support setting different attributes for - // different columns - to do it, just add "col" argument to - // GetAttr() and move these lines into the loop below - - ApplyAttributes(dc, rectHL, highlighted, current); - - wxCoord x = rect.x + HEADER_OFFSET_X, - yMid = rect.y + rect.height/2; -#ifdef __WXGTK__ - // This probably needs to be done - // on all platforms as the icons - // otherwise nearly touch the border - x += 2; -#endif - - if ( m_owner->HasCheckboxes() ) - { - wxSize cbSize = wxRendererNative::Get().GetCheckBoxSize(m_owner); - int yOffset = (rect.height - cbSize.GetHeight()) / 2; - wxRect rr(wxPoint(x, rect.y + yOffset), cbSize); - rr.x += MARGIN_AROUND_CHECKBOX; - - int flags = 0; - if (m_checked) - flags |= wxCONTROL_CHECKED; - wxRendererNative::Get().DrawCheckBox(m_owner, *dc, rr, flags); - - x += cbSize.GetWidth() + (2 * MARGIN_AROUND_CHECKBOX); - } - - size_t col = 0; - for ( wxListItemDataList::compatibility_iterator node = m_items.GetFirst(); - node; - node = node->GetNext(), col++ ) - { - wxListItemData *item = node->GetData(); - - int width = m_owner->GetColumnWidth(col); - if (col == 0 && m_owner->HasCheckboxes()) - width -= x; - int xOld = x; - x += width; - - width -= 8; - const int wText = width; - wxDCClipper clipper(*dc, xOld, rect.y, wText, rect.height); - - if ( item->HasImage() ) - { - int ix, iy; - m_owner->GetImageSize( item->GetImage(), ix, iy ); - m_owner->DrawImage( item->GetImage(), dc, xOld, yMid - iy/2 ); - - ix += IMAGE_MARGIN_IN_REPORT_MODE; - - xOld += ix; - width -= ix; - } - - if ( item->HasText() ) - DrawTextFormatted(dc, item->GetText(), col, xOld, yMid, width); - } -} - -void wxListLineData::DrawTextFormatted(wxDC *dc, - const wxString& textOrig, - int col, - int x, - int yMid, - int width) -{ - // we don't support displaying multiple lines currently (and neither does - // wxMSW FWIW) so just merge all the lines - wxString text(textOrig); - text.Replace(wxT("\n"), wxT(" ")); - - wxCoord w, h; - dc->GetTextExtent(text, &w, &h); - - const wxCoord y = yMid - (h + 1)/2; - - wxDCClipper clipper(*dc, x, y, width, h); - - // determine if the string can fit inside the current width - if (w <= width) - { - // it can, draw it using the items alignment - wxListItem item; - m_owner->GetColumn(col, item); - switch ( item.GetAlign() ) - { - case wxLIST_FORMAT_LEFT: - // nothing to do - break; - - case wxLIST_FORMAT_RIGHT: - x += width - w; - break; - - case wxLIST_FORMAT_CENTER: - x += (width - w) / 2; - break; - - default: - wxFAIL_MSG( wxT("unknown list item format") ); - break; - } - - dc->DrawText(text, x, y); - } - else // otherwise, truncate and add an ellipsis if possible - { - // determine the base width - wxString ellipsis(wxT("...")); - wxCoord base_w; - dc->GetTextExtent(ellipsis, &base_w, &h); - - // continue until we have enough space or only one character left - wxCoord w_c, h_c; - size_t len = text.length(); - wxString drawntext = text.Left(len); - while (len > 1) - { - dc->GetTextExtent(drawntext.Last(), &w_c, &h_c); - drawntext.RemoveLast(); - len--; - w -= w_c; - if (w + base_w <= width) - break; - } - - // if still not enough space, remove ellipsis characters - while (ellipsis.length() > 0 && w + base_w > width) - { - ellipsis = ellipsis.Left(ellipsis.length() - 1); - dc->GetTextExtent(ellipsis, &base_w, &h); - } - - // now draw the text - dc->DrawText(drawntext, x, y); - dc->DrawText(ellipsis, x + w, y); - } -} - -bool wxListLineData::Highlight( bool on ) -{ - wxCHECK_MSG( !IsVirtual(), false, wxT("unexpected call to Highlight") ); - - if ( on == m_highlighted ) - return false; - - m_highlighted = on; - - return true; -} - -void wxListLineData::ReverseHighlight( void ) -{ - Highlight(!IsHighlighted()); -} - -//----------------------------------------------------------------------------- -// wxListHeaderWindow -//----------------------------------------------------------------------------- - -wxBEGIN_EVENT_TABLE(wxListHeaderWindow,wxWindow) - EVT_PAINT (wxListHeaderWindow::OnPaint) - EVT_MOUSE_EVENTS (wxListHeaderWindow::OnMouse) -wxEND_EVENT_TABLE() - -void wxListHeaderWindow::Init() -{ - m_currentCursor = NULL; - m_isDragging = false; - m_dirty = false; - m_sendSetColumnWidth = false; -} - -wxListHeaderWindow::wxListHeaderWindow() -{ - Init(); - - m_owner = NULL; - m_resizeCursor = NULL; -} - -bool wxListHeaderWindow::Create( wxWindow *win, - wxWindowID id, - wxListMainWindow *owner, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString &name ) -{ - if ( !wxWindow::Create(win, id, pos, size, style, name) ) - return false; - - Init(); - - m_owner = owner; - m_resizeCursor = new wxCursor( wxCURSOR_SIZEWE ); - -#if _USE_VISATTR - wxVisualAttributes attr = wxPanel::GetClassDefaultAttributes(); - SetOwnForegroundColour( attr.colFg ); - SetOwnBackgroundColour( attr.colBg ); - if (!m_hasFont) - SetOwnFont( attr.font ); -#else - SetOwnForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT)); - SetOwnBackgroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE)); - if (!m_hasFont) - SetOwnFont( wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT )); -#endif - - return true; -} - -wxListHeaderWindow::~wxListHeaderWindow() -{ - delete m_resizeCursor; -} - -#ifdef __WXUNIVERSAL__ -#include "wx/univ/renderer.h" -#include "wx/univ/theme.h" -#endif - -// shift the DC origin to match the position of the main window horz -// scrollbar: this allows us to always use logical coords -void wxListHeaderWindow::AdjustDC(wxDC& dc) -{ - wxGenericListCtrl *parent = m_owner->GetListCtrl(); - - int xpix; - parent->GetScrollPixelsPerUnit( &xpix, NULL ); - - int view_start; - parent->GetViewStart( &view_start, NULL ); - - - int org_x = 0; - int org_y = 0; - dc.GetDeviceOrigin( &org_x, &org_y ); - - // account for the horz scrollbar offset -#ifdef __WXGTK__ - if (GetLayoutDirection() == wxLayout_RightToLeft) - { - // Maybe we just have to check for m_signX - // in the DC, but I leave the #ifdef __WXGTK__ - // for now - dc.SetDeviceOrigin( org_x + (view_start * xpix), org_y ); - } - else -#endif - dc.SetDeviceOrigin( org_x - (view_start * xpix), org_y ); -} - -void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) -{ - wxGenericListCtrl *parent = m_owner->GetListCtrl(); - - wxPaintDC dc( this ); - - AdjustDC( dc ); - - dc.SetFont( GetFont() ); - - // width and height of the entire header window - int w, h; - GetClientSize( &w, &h ); - parent->CalcUnscrolledPosition(w, 0, &w, NULL); - - dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT); - dc.SetTextForeground(GetForegroundColour()); - - int x = HEADER_OFFSET_X; - int numColumns = m_owner->GetColumnCount(); - wxListItem item; - for ( int i = 0; i < numColumns && x < w; i++ ) - { - m_owner->GetColumn( i, item ); - int wCol = item.m_width; - - int cw = wCol; - int ch = h; - - int flags = 0; - if (!m_parent->IsEnabled()) - flags |= wxCONTROL_DISABLED; - -// NB: The code below is not really Mac-specific, but since we are close -// to 2.8 release and I don't have time to test on other platforms, I -// defined this only for wxMac. If this behaviour is desired on -// other platforms, please go ahead and revise or remove the #ifdef. -#ifdef __WXMAC__ - if ( !m_owner->IsVirtual() && (item.m_mask & wxLIST_MASK_STATE) && - (item.m_state & wxLIST_STATE_SELECTED) ) - flags |= wxCONTROL_SELECTED; -#endif - - if (i == 0) - flags |= wxCONTROL_SPECIAL; // mark as first column - - wxRendererNative::Get().DrawHeaderButton - ( - this, - dc, - wxRect(x, HEADER_OFFSET_Y, cw, ch), - flags - ); - - // see if we have enough space for the column label - - // for this we need the width of the text - wxCoord wLabel; - wxCoord hLabel; - dc.GetTextExtent(item.GetText(), &wLabel, &hLabel); - wLabel += 2 * EXTRA_WIDTH; - - // and the width of the icon, if any - int ix = 0, iy = 0; // init them just to suppress the compiler warnings - const int image = item.m_image; - wxImageList *imageList; - if ( image != -1 ) - { - imageList = m_owner->GetSmallImageList(); - if ( imageList ) - { - imageList->GetSize(image, ix, iy); - wLabel += ix + HEADER_IMAGE_MARGIN_IN_REPORT_MODE; - } - } - else - { - imageList = NULL; - } - - // ignore alignment if there is not enough space anyhow - int xAligned; - switch ( wLabel < cw ? item.GetAlign() : wxLIST_FORMAT_LEFT ) - { - default: - wxFAIL_MSG( wxT("unknown list item format") ); - wxFALLTHROUGH; - - case wxLIST_FORMAT_LEFT: - xAligned = x; - break; - - case wxLIST_FORMAT_RIGHT: - xAligned = x + cw - wLabel; - break; - - case wxLIST_FORMAT_CENTER: - xAligned = x + (cw - wLabel) / 2; - break; - } - - // draw the text and image clipping them so that they - // don't overwrite the column boundary - wxDCClipper clipper(dc, x, HEADER_OFFSET_Y, cw, h); - - // if we have an image, draw it on the right of the label - if ( imageList ) - { - imageList->Draw - ( - image, - dc, - xAligned + wLabel - ix - HEADER_IMAGE_MARGIN_IN_REPORT_MODE, - HEADER_OFFSET_Y + (h - iy)/2, - wxIMAGELIST_DRAW_TRANSPARENT - ); - } - - dc.DrawText( item.GetText(), - xAligned + EXTRA_WIDTH, (h - hLabel) / 2 ); - - x += wCol; - } - - // Fill in what's missing to the right of the columns, otherwise we will - // leave an unpainted area when columns are removed (and it looks better) - if ( x < w ) - { - wxRendererNative::Get().DrawHeaderButton - ( - this, - dc, - wxRect(x, HEADER_OFFSET_Y, w - x, h), - wxCONTROL_DIRTY // mark as last column - ); - } -} - -void wxListHeaderWindow::OnInternalIdle() -{ - wxWindow::OnInternalIdle(); - - if (m_sendSetColumnWidth) - { - m_owner->SetColumnWidth( m_colToSend, m_widthToSend ); - m_sendSetColumnWidth = false; - } -} - -void wxListHeaderWindow::DrawCurrent() -{ -#if 1 - // m_owner->SetColumnWidth( m_column, m_currentX - m_minX ); - m_sendSetColumnWidth = true; - m_colToSend = m_column; - m_widthToSend = m_currentX - m_minX; -#else - int x1 = m_currentX; - int y1 = 0; - m_owner->ClientToScreen( &x1, &y1 ); - - int x2 = m_currentX; - int y2 = 0; - m_owner->GetClientSize( NULL, &y2 ); - m_owner->ClientToScreen( &x2, &y2 ); - - wxScreenDC dc; - dc.SetLogicalFunction( wxINVERT ); - dc.SetPen( wxPen(*wxBLACK, 2) ); - dc.SetBrush( *wxTRANSPARENT_BRUSH ); - - AdjustDC(dc); - - dc.DrawLine( x1, y1, x2, y2 ); - - dc.SetLogicalFunction( wxCOPY ); - - dc.SetPen( wxNullPen ); - dc.SetBrush( wxNullBrush ); -#endif -} - -void wxListHeaderWindow::OnMouse( wxMouseEvent &event ) -{ - wxGenericListCtrl *parent = m_owner->GetListCtrl(); - - // we want to work with logical coords - int x; - parent->CalcUnscrolledPosition(event.GetX(), 0, &x, NULL); - int y = event.GetY(); - - if (m_isDragging) - { - SendListEvent(wxEVT_LIST_COL_DRAGGING, event.GetPosition()); - - // we don't draw the line beyond our window, but we allow dragging it - // there - int w = 0; - GetClientSize( &w, NULL ); - parent->CalcUnscrolledPosition(w, 0, &w, NULL); - w -= 6; - - // erase the line if it was drawn - if ( m_currentX < w ) - DrawCurrent(); - - if (event.ButtonUp()) - { - ReleaseMouse(); - m_isDragging = false; - m_dirty = true; - m_owner->SetColumnWidth( m_column, m_currentX - m_minX ); - SendListEvent(wxEVT_LIST_COL_END_DRAG, event.GetPosition()); - } - else - { - if (x > m_minX + 7) - m_currentX = x; - else - m_currentX = m_minX + 7; - - // draw in the new location - if ( m_currentX < w ) - DrawCurrent(); - } - } - else // not dragging - { - m_minX = 0; - bool hit_border = false; - - // end of the current column - int xpos = 0; - - // find the column where this event occurred - int col, - countCol = m_owner->GetColumnCount(); - for (col = 0; col < countCol; col++) - { - xpos += m_owner->GetColumnWidth( col ); - m_column = col; - - if ( (abs(x-xpos) < 3) && (y < 22) ) - { - // near the column border - hit_border = true; - break; - } - - if ( x < xpos ) - { - // inside the column - break; - } - - m_minX = xpos; - } - - if ( col == countCol ) - m_column = -1; - - if (event.LeftDown() || event.RightUp()) - { - if (hit_border && event.LeftDown()) - { - if ( SendListEvent(wxEVT_LIST_COL_BEGIN_DRAG, - event.GetPosition()) ) - { - m_isDragging = true; - m_currentX = x; - CaptureMouse(); - DrawCurrent(); - } - //else: column resizing was vetoed by the user code - } - else // click on a column - { - // record the selected state of the columns - if (event.LeftDown()) - { - for (int i=0; i < m_owner->GetColumnCount(); i++) - { - wxListItem colItem; - m_owner->GetColumn(i, colItem); - long state = colItem.GetState(); - if (i == m_column) - colItem.SetState(state | wxLIST_STATE_SELECTED); - else - colItem.SetState(state & ~wxLIST_STATE_SELECTED); - m_owner->SetColumn(i, colItem); - } - } - - SendListEvent( event.LeftDown() - ? wxEVT_LIST_COL_CLICK - : wxEVT_LIST_COL_RIGHT_CLICK, - event.GetPosition()); - } - } - else if (event.Moving()) - { - bool setCursor; - if (hit_border) - { - setCursor = m_currentCursor == wxSTANDARD_CURSOR; - m_currentCursor = m_resizeCursor; - } - else - { - setCursor = m_currentCursor != wxSTANDARD_CURSOR; - m_currentCursor = wxSTANDARD_CURSOR; - } - - if ( setCursor ) - SetCursor(*m_currentCursor); - } - } -} - -bool wxListHeaderWindow::SendListEvent(wxEventType type, const wxPoint& pos) -{ - wxWindow *parent = GetParent(); - wxListEvent le( type, parent->GetId() ); - le.SetEventObject( parent ); - le.m_pointDrag = pos; - - // the position should be relative to the parent window, not - // this one for compatibility with MSW and common sense: the - // user code doesn't know anything at all about this header - // window, so why should it get positions relative to it? - le.m_pointDrag.y -= GetSize().y; - - le.m_col = m_column; - return !parent->GetEventHandler()->ProcessEvent( le ) || le.IsAllowed(); -} - -//----------------------------------------------------------------------------- -// wxListRenameTimer (internal) -//----------------------------------------------------------------------------- - -wxListRenameTimer::wxListRenameTimer( wxListMainWindow *owner ) -{ - m_owner = owner; -} - -void wxListRenameTimer::Notify() -{ - m_owner->OnRenameTimer(); -} - -//----------------------------------------------------------------------------- -// wxListFindTimer (internal) -//----------------------------------------------------------------------------- - -void wxListFindTimer::Notify() -{ - m_owner->OnFindTimer(); -} - -//----------------------------------------------------------------------------- -// wxListTextCtrlWrapper (internal) -//----------------------------------------------------------------------------- - -wxBEGIN_EVENT_TABLE(wxListTextCtrlWrapper, wxEvtHandler) - EVT_CHAR (wxListTextCtrlWrapper::OnChar) - EVT_KEY_UP (wxListTextCtrlWrapper::OnKeyUp) - EVT_KILL_FOCUS (wxListTextCtrlWrapper::OnKillFocus) -wxEND_EVENT_TABLE() - -wxListTextCtrlWrapper::wxListTextCtrlWrapper(wxListMainWindow *owner, - wxTextCtrl *text, - size_t itemEdit) - : m_startValue(owner->GetItemText(itemEdit)), - m_itemEdited(itemEdit) -{ - m_owner = owner; - m_text = text; - m_aboutToFinish = false; - - wxGenericListCtrl *parent = m_owner->GetListCtrl(); - - wxRect rectLabel = owner->GetLineLabelRect(itemEdit); - - parent->CalcScrolledPosition(rectLabel.x, rectLabel.y, - &rectLabel.x, &rectLabel.y); - - m_text->Create(owner, wxID_ANY, m_startValue, - wxPoint(rectLabel.x-4,rectLabel.y-4), - wxSize(rectLabel.width+11,rectLabel.height+8)); - m_text->SetFocus(); - - m_text->PushEventHandler(this); -} - -void wxListTextCtrlWrapper::EndEdit(EndReason reason) -{ - if( m_aboutToFinish ) - { - // We already called Finish which cannot be called - // more than once. - return; - } - - m_aboutToFinish = true; - - switch ( reason ) - { - case End_Accept: - // Notify the owner about the changes - AcceptChanges(); - - // Even if vetoed, close the control (consistent with MSW) - Finish( true ); - break; - - case End_Discard: - m_owner->OnRenameCancelled(m_itemEdited); - - Finish( true ); - break; - - case End_Destroy: - // Don't generate any notifications for the control being destroyed - // and don't set focus to it neither. - Finish(false); - break; - } -} - -void wxListTextCtrlWrapper::Finish( bool setfocus ) -{ - m_text->RemoveEventHandler(this); - m_owner->ResetTextControl( m_text ); - - wxPendingDelete.Append( this ); - - if (setfocus) - m_owner->SetFocus(); -} - -bool wxListTextCtrlWrapper::AcceptChanges() -{ - const wxString value = m_text->GetValue(); - - // notice that we should always call OnRenameAccept() to generate the "end - // label editing" event, even if the user hasn't really changed anything - if ( !m_owner->OnRenameAccept(m_itemEdited, value) ) - { - // vetoed by the user - return false; - } - - // accepted, do rename the item (unless nothing changed) - if ( value != m_startValue ) - m_owner->SetItemText(m_itemEdited, value); - - return true; -} - -void wxListTextCtrlWrapper::OnChar( wxKeyEvent &event ) -{ - if ( !CheckForEndEditKey(event) ) - event.Skip(); -} - -bool wxListTextCtrlWrapper::CheckForEndEditKey(const wxKeyEvent& event) -{ - switch ( event.m_keyCode ) - { - case WXK_RETURN: - EndEdit( End_Accept ); - break; - - case WXK_ESCAPE: - EndEdit( End_Discard ); - break; - - default: - return false; - } - - return true; -} - -void wxListTextCtrlWrapper::OnKeyUp( wxKeyEvent &event ) -{ - if (m_aboutToFinish) - { - // auto-grow the textctrl: - wxSize parentSize = m_owner->GetSize(); - wxPoint myPos = m_text->GetPosition(); - wxSize mySize = m_text->GetSize(); - int sx, sy; - m_text->GetTextExtent(m_text->GetValue() + wxT("MM"), &sx, &sy); - if (myPos.x + sx > parentSize.x) - sx = parentSize.x - myPos.x; - if (mySize.x > sx) - sx = mySize.x; - m_text->SetSize(sx, wxDefaultCoord); - } - - event.Skip(); -} - -void wxListTextCtrlWrapper::OnKillFocus( wxFocusEvent &event ) -{ - if ( !m_aboutToFinish ) - { - m_aboutToFinish = true; - if ( !AcceptChanges() ) - m_owner->OnRenameCancelled( m_itemEdited ); - - Finish( false ); - } - - // We must let the native text control handle focus - event.Skip(); -} - -//----------------------------------------------------------------------------- -// wxListMainWindow -//----------------------------------------------------------------------------- - -wxBEGIN_EVENT_TABLE(wxListMainWindow, wxWindow) - EVT_PAINT (wxListMainWindow::OnPaint) - EVT_MOUSE_EVENTS (wxListMainWindow::OnMouse) - EVT_CHAR_HOOK (wxListMainWindow::OnCharHook) - EVT_CHAR (wxListMainWindow::OnChar) - EVT_KEY_DOWN (wxListMainWindow::OnKeyDown) - EVT_KEY_UP (wxListMainWindow::OnKeyUp) - EVT_SET_FOCUS (wxListMainWindow::OnSetFocus) - EVT_KILL_FOCUS (wxListMainWindow::OnKillFocus) - EVT_SCROLLWIN (wxListMainWindow::OnScroll) - EVT_CHILD_FOCUS (wxListMainWindow::OnChildFocus) -wxEND_EVENT_TABLE() - -void wxListMainWindow::Init() -{ - m_dirty = true; - m_countVirt = 0; - m_lineFrom = - m_lineTo = (size_t)-1; - m_linesPerPage = 0; - - m_headerWidth = - m_lineHeight = 0; - - m_small_image_list = NULL; - m_normal_image_list = NULL; - - m_small_spacing = 30; - m_normal_spacing = 40; - - m_hasFocus = false; - m_dragCount = 0; - m_isCreated = false; - - m_lastOnSame = false; - m_renameTimer = new wxListRenameTimer( this ); - m_findTimer = NULL; - m_findBell = 0; // default is to not ring bell at all - m_textctrlWrapper = NULL; - - m_current = - m_lineLastClicked = - m_lineSelectSingleOnUp = - m_lineBeforeLastClicked = (size_t)-1; - - m_hasCheckboxes = false; -} - -wxListMainWindow::wxListMainWindow() -{ - Init(); - - m_highlightBrush = - m_highlightUnfocusedBrush = NULL; -} - -wxListMainWindow::wxListMainWindow( wxWindow *parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size ) - : wxWindow( parent, id, pos, size, - wxWANTS_CHARS | wxBORDER_NONE ) -{ - Init(); - - m_highlightBrush = new wxBrush - ( - wxSystemSettings::GetColour - ( - wxSYS_COLOUR_HIGHLIGHT - ), - wxBRUSHSTYLE_SOLID - ); - - m_highlightUnfocusedBrush = new wxBrush - ( - wxSystemSettings::GetColour - ( - wxSYS_COLOUR_BTNSHADOW - ), - wxBRUSHSTYLE_SOLID - ); - - wxVisualAttributes attr = wxGenericListCtrl::GetClassDefaultAttributes(); - SetOwnForegroundColour( attr.colFg ); - SetOwnBackgroundColour( attr.colBg ); - if (!m_hasFont) - SetOwnFont( attr.font ); -} - -wxListMainWindow::~wxListMainWindow() -{ - if ( m_textctrlWrapper ) - m_textctrlWrapper->EndEdit(wxListTextCtrlWrapper::End_Destroy); - - DoDeleteAllItems(); - WX_CLEAR_LIST(wxListHeaderDataList, m_columns); - WX_CLEAR_ARRAY(m_aColWidths); - - delete m_highlightBrush; - delete m_highlightUnfocusedBrush; - delete m_renameTimer; - delete m_findTimer; -} - -void wxListMainWindow::SetReportView(bool inReportView) -{ - const size_t count = m_lines.size(); - for ( size_t n = 0; n < count; n++ ) - { - m_lines[n].SetReportView(inReportView); - } -} - -void wxListMainWindow::CacheLineData(size_t line) -{ - wxGenericListCtrl *listctrl = GetListCtrl(); - - wxListLineData *ld = GetDummyLine(); - - size_t countCol = GetColumnCount(); - for ( size_t col = 0; col < countCol; col++ ) - { - ld->SetText(col, listctrl->OnGetItemText(line, col)); - ld->SetImage(col, listctrl->OnGetItemColumnImage(line, col)); - } - - ld->SetAttr(listctrl->OnGetItemAttr(line)); -} - -wxListLineData *wxListMainWindow::GetDummyLine() const -{ - wxASSERT_MSG( !IsEmpty(), wxT("invalid line index") ); - wxASSERT_MSG( IsVirtual(), wxT("GetDummyLine() shouldn't be called") ); - - wxListMainWindow *self = wxConstCast(this, wxListMainWindow); - - // we need to recreate the dummy line if the number of columns in the - // control changed as it would have the incorrect number of fields - // otherwise - if ( !m_lines.IsEmpty() && - m_lines[0].m_items.GetCount() != (size_t)GetColumnCount() ) - { - self->m_lines.Clear(); - } - - if ( m_lines.IsEmpty() ) - { - wxListLineData *line = new wxListLineData(self); - self->m_lines.Add(line); - - // don't waste extra memory -- there never going to be anything - // else/more in this array - self->m_lines.Shrink(); - } - - return &m_lines[0]; -} - -// ---------------------------------------------------------------------------- -// line geometry (report mode only) -// ---------------------------------------------------------------------------- - -wxCoord wxListMainWindow::GetLineHeight() const -{ - // we cache the line height as calling GetTextExtent() is slow - if ( !m_lineHeight ) - { - wxListMainWindow *self = wxConstCast(this, wxListMainWindow); - - wxClientDC dc( self ); - dc.SetFont( GetFont() ); - - wxCoord y; - dc.GetTextExtent(wxT("H"), NULL, &y); - - if ( m_small_image_list && m_small_image_list->GetImageCount() ) - { - int iw = 0, ih = 0; - m_small_image_list->GetSize(0, iw, ih); - y = wxMax(y, ih); - } - - y += EXTRA_HEIGHT; - self->m_lineHeight = y + LINE_SPACING; - } - - return m_lineHeight; -} - -wxCoord wxListMainWindow::GetLineY(size_t line) const -{ - wxASSERT_MSG( InReportView(), wxT("only works in report mode") ); - - return LINE_SPACING + line * GetLineHeight(); -} - -wxRect wxListMainWindow::GetLineRect(size_t line) const -{ - if ( !InReportView() ) - return GetLine(line)->m_gi->m_rectAll; - - wxRect rect; - rect.x = HEADER_OFFSET_X; - rect.y = GetLineY(line); - rect.width = GetHeaderWidth(); - rect.height = GetLineHeight(); - - return rect; -} - -wxRect wxListMainWindow::GetLineLabelRect(size_t line) const -{ - if ( !InReportView() ) - return GetLine(line)->m_gi->m_rectLabel; - - int image_x = 0; - wxListLineData *data = GetLine(line); - wxListItemDataList::compatibility_iterator node = data->m_items.GetFirst(); - if (node) - { - wxListItemData *item = node->GetData(); - if ( item->HasImage() ) - { - int ix, iy; - GetImageSize( item->GetImage(), ix, iy ); - image_x = 3 + ix + IMAGE_MARGIN_IN_REPORT_MODE; - } - } - - wxRect rect; - rect.x = image_x + HEADER_OFFSET_X; - rect.y = GetLineY(line); - rect.width = GetColumnWidth(0) - image_x; - rect.height = GetLineHeight(); - - return rect; -} - -wxRect wxListMainWindow::GetLineIconRect(size_t line) const -{ - if ( !InReportView() ) - return GetLine(line)->m_gi->m_rectIcon; - - wxListLineData *ld = GetLine(line); - wxASSERT_MSG( ld->HasImage(), wxT("should have an image") ); - - wxRect rect; - rect.x = HEADER_OFFSET_X; - rect.y = GetLineY(line); - GetImageSize(ld->GetImage(), rect.width, rect.height); - - return rect; -} - -wxRect wxListMainWindow::GetLineHighlightRect(size_t line) const -{ - return InReportView() ? GetLineRect(line) - : GetLine(line)->m_gi->m_rectHighlight; -} - -long wxListMainWindow::HitTestLine(size_t line, int x, int y) const -{ - wxASSERT_MSG( line < GetItemCount(), wxT("invalid line in HitTestLine") ); - - wxListLineData *ld = GetLine(line); - - if ( ld->HasImage() && GetLineIconRect(line).Contains(x, y) ) - return wxLIST_HITTEST_ONITEMICON; - - // VS: Testing for "ld->HasText() || InReportView()" instead of - // "ld->HasText()" is needed to make empty lines in report view - // possible - if ( ld->HasText() || InReportView() ) - { - wxRect rect = InReportView() ? GetLineRect(line) - : GetLineLabelRect(line); - - if ( rect.Contains(x, y) ) - return wxLIST_HITTEST_ONITEMLABEL; - } - - return 0; -} - -// ---------------------------------------------------------------------------- -// highlight (selection) handling -// ---------------------------------------------------------------------------- - -bool wxListMainWindow::IsHighlighted(size_t line) const -{ - if ( IsVirtual() ) - { - return m_selStore.IsSelected(line); - } - else // !virtual - { - wxListLineData *ld = GetLine(line); - wxCHECK_MSG( ld, false, wxT("invalid index in IsHighlighted") ); - - return ld->IsHighlighted(); - } -} - -void wxListMainWindow::HighlightLines( size_t lineFrom, - size_t lineTo, - bool highlight ) -{ - if ( IsVirtual() ) - { - wxArrayInt linesChanged; - if ( !m_selStore.SelectRange(lineFrom, lineTo, highlight, - &linesChanged) ) - { - // meny items changed state, refresh everything - RefreshLines(lineFrom, lineTo); - } - else // only a few items changed state, refresh only them - { - size_t count = linesChanged.GetCount(); - for ( size_t n = 0; n < count; n++ ) - { - RefreshLine(linesChanged[n]); - } - } - } - else // iterate over all items in non report view - { - for ( size_t line = lineFrom; line <= lineTo; line++ ) - { - if ( HighlightLine(line, highlight) ) - RefreshLine(line); - } - } -} - -bool wxListMainWindow::HighlightLine( size_t line, bool highlight ) -{ - bool changed; - - if ( IsVirtual() ) - { - changed = m_selStore.SelectItem(line, highlight); - } - else // !virtual - { - wxListLineData *ld = GetLine(line); - wxCHECK_MSG( ld, false, wxT("invalid index in HighlightLine") ); - - changed = ld->Highlight(highlight); - } - - if ( changed ) - { - SendNotify( line, highlight ? wxEVT_LIST_ITEM_SELECTED - : wxEVT_LIST_ITEM_DESELECTED ); - } - - return changed; -} - -void wxListMainWindow::RefreshLine( size_t line ) -{ - if ( InReportView() ) - { - size_t visibleFrom, visibleTo; - GetVisibleLinesRange(&visibleFrom, &visibleTo); - - if ( line < visibleFrom || line > visibleTo ) - return; - } - - wxRect rect = GetLineRect(line); - - GetListCtrl()->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); - RefreshRect( rect ); -} - -void wxListMainWindow::RefreshLines( size_t lineFrom, size_t lineTo ) -{ - // we suppose that they are ordered by caller - wxASSERT_MSG( lineFrom <= lineTo, wxT("indices in disorder") ); - - wxASSERT_MSG( lineTo < GetItemCount(), wxT("invalid line range") ); - - if ( InReportView() ) - { - size_t visibleFrom, visibleTo; - GetVisibleLinesRange(&visibleFrom, &visibleTo); - - if ( lineFrom > visibleTo || lineTo < visibleFrom ) - { - // None of these lines are currently visible at all, don't bother - // doing anything. - return; - } - - if ( lineFrom < visibleFrom ) - lineFrom = visibleFrom; - if ( lineTo > visibleTo ) - lineTo = visibleTo; - - wxRect rect; - rect.x = 0; - rect.y = GetLineY(lineFrom); - rect.width = GetClientSize().x; - rect.height = GetLineY(lineTo) - rect.y + GetLineHeight(); - - GetListCtrl()->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); - RefreshRect( rect ); - } - else // !report - { - // TODO: this should be optimized... - for ( size_t line = lineFrom; line <= lineTo; line++ ) - { - RefreshLine(line); - } - } -} - -void wxListMainWindow::RefreshAfter( size_t lineFrom ) -{ - if ( InReportView() ) - { - size_t visibleFrom, visibleTo; - GetVisibleLinesRange(&visibleFrom, &visibleTo); - - if ( lineFrom < visibleFrom ) - lineFrom = visibleFrom; - else if ( lineFrom > visibleTo ) - return; - - wxRect rect; - rect.x = 0; - rect.y = GetLineY(lineFrom); - GetListCtrl()->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); - - wxSize size = GetClientSize(); - rect.width = size.x; - - // refresh till the bottom of the window - rect.height = size.y - rect.y; - - RefreshRect( rect ); - } - else // !report - { - // TODO: how to do it more efficiently? - m_dirty = true; - } -} - -void wxListMainWindow::RefreshSelected() -{ - if ( IsEmpty() ) - return; - - size_t from, to; - if ( InReportView() ) - { - GetVisibleLinesRange(&from, &to); - } - else // !virtual - { - from = 0; - to = GetItemCount() - 1; - } - - if ( HasCurrent() && m_current >= from && m_current <= to ) - RefreshLine(m_current); - - for ( size_t line = from; line <= to; line++ ) - { - // NB: the test works as expected even if m_current == -1 - if ( line != m_current && IsHighlighted(line) ) - RefreshLine(line); - } -} - -void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) -{ - // Note: a wxPaintDC must be constructed even if no drawing is - // done (a Windows requirement). - wxPaintDC dc( this ); - - if ( IsEmpty() ) - { - // nothing to draw or not the moment to draw it - return; - } - - if ( m_dirty ) - RecalculatePositions( false ); - - GetListCtrl()->PrepareDC( dc ); - - int dev_x, dev_y; - GetListCtrl()->CalcScrolledPosition( 0, 0, &dev_x, &dev_y ); - - dc.SetFont( GetFont() ); - - if ( InReportView() ) - { - int lineHeight = GetLineHeight(); - - size_t visibleFrom, visibleTo; - GetVisibleLinesRange(&visibleFrom, &visibleTo); - - wxRect rectLine; - int xOrig = dc.LogicalToDeviceX( 0 ); - int yOrig = dc.LogicalToDeviceY( 0 ); - - // tell the caller cache to cache the data - if ( IsVirtual() ) - { - wxListEvent evCache(wxEVT_LIST_CACHE_HINT, - GetParent()->GetId()); - evCache.SetEventObject( GetParent() ); - evCache.m_oldItemIndex = visibleFrom; - evCache.m_item.m_itemId = - evCache.m_itemIndex = visibleTo; - GetParent()->GetEventHandler()->ProcessEvent( evCache ); - } - - for ( size_t line = visibleFrom; line <= visibleTo; line++ ) - { - rectLine = GetLineRect(line); - - - if ( !IsExposed(rectLine.x + xOrig, rectLine.y + yOrig, - rectLine.width, rectLine.height) ) - { - // don't redraw unaffected lines to avoid flicker - continue; - } - - GetLine(line)->DrawInReportMode( &dc, - rectLine, - GetLineHighlightRect(line), - IsHighlighted(line), - line == m_current ); - } - - if ( HasFlag(wxLC_HRULES) ) - { - wxPen pen(GetRuleColour(), 1, wxPENSTYLE_SOLID); - wxSize clientSize = GetClientSize(); - - size_t i = visibleFrom; - if (i == 0) i = 1; // Don't draw the first one - for ( ; i <= visibleTo; i++ ) - { - dc.SetPen(pen); - dc.SetBrush( *wxTRANSPARENT_BRUSH ); - dc.DrawLine(0 - dev_x, i * lineHeight, - clientSize.x - dev_x, i * lineHeight); - } - - // Draw last horizontal rule - if ( visibleTo == GetItemCount() - 1 ) - { - dc.SetPen( pen ); - dc.SetBrush( *wxTRANSPARENT_BRUSH ); - dc.DrawLine(0 - dev_x, (m_lineTo + 1) * lineHeight, - clientSize.x - dev_x , (m_lineTo + 1) * lineHeight ); - } - } - - // Draw vertical rules if required - if ( HasFlag(wxLC_VRULES) && !IsEmpty() ) - { - wxPen pen(GetRuleColour(), 1, wxPENSTYLE_SOLID); - wxRect firstItemRect, lastItemRect; - - GetItemRect(visibleFrom, firstItemRect); - GetItemRect(visibleTo, lastItemRect); - int x = firstItemRect.GetX(); - dc.SetPen(pen); - dc.SetBrush(* wxTRANSPARENT_BRUSH); - - for (int col = 0; col < GetColumnCount(); col++) - { - int colWidth = GetColumnWidth(col); - x += colWidth; - int x_pos = x - dev_x; - if (col < GetColumnCount()-1) x_pos -= 2; - dc.DrawLine(x_pos, firstItemRect.GetY() - 1 - dev_y, - x_pos, lastItemRect.GetBottom() + 1 - dev_y); - } - } - } - else // !report - { - size_t count = GetItemCount(); - for ( size_t i = 0; i < count; i++ ) - { - GetLine(i)->Draw( &dc, i == m_current ); - } - } - - // DrawFocusRect() is unusable under Mac, it draws outside of the highlight - // rectangle somehow and so leaves traces when the item is not selected any - // more, see #12229. -#ifndef __WXMAC__ - if ( HasCurrent() ) - { - int flags = 0; - if ( IsHighlighted(m_current) ) - flags |= wxCONTROL_SELECTED; - - wxRendererNative::Get(). - DrawFocusRect(this, dc, GetLineHighlightRect(m_current), flags); - } -#endif // !__WXMAC__ -} - -void wxListMainWindow::HighlightAll( bool on ) -{ - if ( IsSingleSel() ) - { - wxASSERT_MSG( !on, wxT("can't do this in a single selection control") ); - - // we just have one item to turn off - if ( HasCurrent() && IsHighlighted(m_current) ) - { - HighlightLine(m_current, false); - RefreshLine(m_current); - } - } - else // multi selection - { - if ( !IsEmpty() ) - HighlightLines(0, GetItemCount() - 1, on); - } -} - -void wxListMainWindow::OnChildFocus(wxChildFocusEvent& WXUNUSED(event)) -{ - // Do nothing here. This prevents the default handler in wxScrolledWindow - // from needlessly scrolling the window when the edit control is - // dismissed. See ticket #9563. -} - -void wxListMainWindow::SendNotify( size_t line, - wxEventType command, - const wxPoint& point ) -{ - wxListEvent le( command, GetParent()->GetId() ); - le.SetEventObject( GetParent() ); - - le.m_item.m_itemId = - le.m_itemIndex = line; - - // set only for events which have position - if ( point != wxDefaultPosition ) - le.m_pointDrag = point; - - // don't try to get the line info for virtual list controls: the main - // program has it anyhow and if we did it would result in accessing all - // the lines, even those which are not visible now and this is precisely - // what we're trying to avoid - if ( !IsVirtual() ) - { - if ( line != (size_t)-1 ) - { - GetLine(line)->GetItem( 0, le.m_item ); - } - //else: this happens for wxEVT_LIST_ITEM_FOCUSED event - } - //else: there may be no more such item - - GetParent()->GetEventHandler()->ProcessEvent( le ); -} - -void wxListMainWindow::ChangeCurrent(size_t current) -{ - m_current = current; - - // as the current item changed, we shouldn't start editing it when the - // "slow click" timer expires as the click happened on another item - if ( m_renameTimer->IsRunning() ) - m_renameTimer->Stop(); - - SendNotify(current, wxEVT_LIST_ITEM_FOCUSED); -} - -wxTextCtrl *wxListMainWindow::EditLabel(long item, wxClassInfo* textControlClass) -{ - wxCHECK_MSG( (item >= 0) && ((size_t)item < GetItemCount()), NULL, - wxT("wrong index in wxGenericListCtrl::EditLabel()") ); - - wxASSERT_MSG( textControlClass->IsKindOf(wxCLASSINFO(wxTextCtrl)), - wxT("EditLabel() needs a text control") ); - - size_t itemEdit = (size_t)item; - - wxListEvent le( wxEVT_LIST_BEGIN_LABEL_EDIT, GetParent()->GetId() ); - le.SetEventObject( GetParent() ); - le.m_item.m_itemId = - le.m_itemIndex = item; - wxListLineData *data = GetLine(itemEdit); - wxCHECK_MSG( data, NULL, wxT("invalid index in EditLabel()") ); - data->GetItem( 0, le.m_item ); - - if ( GetParent()->GetEventHandler()->ProcessEvent( le ) && !le.IsAllowed() ) - { - // vetoed by user code - return NULL; - } - - if ( m_dirty ) - { - // Ensure the display is updated before we start editing. - Update(); - } - - wxTextCtrl * const text = (wxTextCtrl *)textControlClass->CreateObject(); - m_textctrlWrapper = new wxListTextCtrlWrapper(this, text, item); - return m_textctrlWrapper->GetText(); -} - -bool wxListMainWindow::EndEditLabel(bool cancel) -{ - if (!m_textctrlWrapper) - { - return false; - } - - m_textctrlWrapper->EndEdit(cancel ? wxListTextCtrlWrapper::End_Discard : wxListTextCtrlWrapper::End_Accept); - return true; -} - -void wxListMainWindow::OnRenameTimer() -{ - wxCHECK_RET( HasCurrent(), wxT("unexpected rename timer") ); - - EditLabel( m_current ); -} - -bool wxListMainWindow::OnRenameAccept(size_t itemEdit, const wxString& value) -{ - wxListEvent le( wxEVT_LIST_END_LABEL_EDIT, GetParent()->GetId() ); - le.SetEventObject( GetParent() ); - le.m_item.m_itemId = - le.m_itemIndex = itemEdit; - - wxListLineData *data = GetLine(itemEdit); - - wxCHECK_MSG( data, false, wxT("invalid index in OnRenameAccept()") ); - - data->GetItem( 0, le.m_item ); - le.m_item.m_text = value; - return !GetParent()->GetEventHandler()->ProcessEvent( le ) || - le.IsAllowed(); -} - -void wxListMainWindow::OnRenameCancelled(size_t itemEdit) -{ - // let owner know that the edit was cancelled - wxListEvent le( wxEVT_LIST_END_LABEL_EDIT, GetParent()->GetId() ); - - le.SetEditCanceled(true); - - le.SetEventObject( GetParent() ); - le.m_item.m_itemId = - le.m_itemIndex = itemEdit; - - wxListLineData *data = GetLine(itemEdit); - wxCHECK_RET( data, wxT("invalid index in OnRenameCancelled()") ); - - data->GetItem( 0, le.m_item ); - GetEventHandler()->ProcessEvent( le ); -} - -void wxListMainWindow::OnFindTimer() -{ - m_findPrefix.clear(); - if ( m_findBell ) - m_findBell = 1; -} - -void wxListMainWindow::EnableBellOnNoMatch( bool on ) -{ - m_findBell = on; -} - -void wxListMainWindow::OnMouse( wxMouseEvent &event ) -{ -#ifdef __WXMAC__ - // On wxMac we can't depend on the EVT_KILL_FOCUS event to properly - // shutdown the edit control when the mouse is clicked elsewhere on the - // listctrl because the order of events is different (or something like - // that), so explicitly end the edit if it is active. - if ( event.LeftDown() && m_textctrlWrapper ) - m_textctrlWrapper->EndEdit(wxListTextCtrlWrapper::End_Accept); -#endif // __WXMAC__ - - if ( event.LeftDown() ) - { - // Ensure we skip the event to let the system set focus to this window. - event.Skip(); - } - - // Pretend that the event happened in wxListCtrl itself. - wxMouseEvent me(event); - me.SetEventObject( GetParent() ); - me.SetId(GetParent()->GetId()); - if ( GetParent()->GetEventHandler()->ProcessEvent( me )) - return; - - if (event.GetEventType() == wxEVT_MOUSEWHEEL) - { - // let the base class handle mouse wheel events. - event.Skip(); - return; - } - - if ( !HasCurrent() || IsEmpty() ) - { - if (event.RightDown()) - { - SendNotify( (size_t)-1, wxEVT_LIST_ITEM_RIGHT_CLICK, event.GetPosition() ); - - wxContextMenuEvent evtCtx(wxEVT_CONTEXT_MENU, - GetParent()->GetId(), - ClientToScreen(event.GetPosition())); - evtCtx.SetEventObject(GetParent()); - GetParent()->GetEventHandler()->ProcessEvent(evtCtx); - } - return; - } - - if (m_dirty) - return; - - if ( !(event.Dragging() || event.ButtonDown() || event.LeftUp() || - event.ButtonDClick()) ) - return; - - int x = event.GetX(); - int y = event.GetY(); - GetListCtrl()->CalcUnscrolledPosition( x, y, &x, &y ); - - // where did we hit it (if we did)? - long hitResult = 0; - - size_t count = GetItemCount(), - current; - - if ( InReportView() ) - { - current = y / GetLineHeight(); - if ( current < count ) - hitResult = HitTestLine(current, x, y); - } - else // !report - { - // TODO: optimize it too! this is less simple than for report view but - // enumerating all items is still not a way to do it!! - for ( current = 0; current < count; current++ ) - { - hitResult = HitTestLine(current, x, y); - if ( hitResult ) - break; - } - } - - // Update drag events counter first as we must do it even if the mouse is - // not on any item right now as we must keep count in case we started - // dragging from the empty control area but continued to do it over a valid - // item -- in this situation we must not start dragging this item. - if (event.Dragging()) - m_dragCount++; - else - m_dragCount = 0; - - // The only mouse event that can be generated without any valid item is - // wxEVT_LIST_ITEM_RIGHT_CLICK as it can be useful to have a global - // popup menu for the list control itself which should be shown even when - // the user clicks outside of any item. - if ( !hitResult ) - { - // outside of any item - if (event.RightDown()) - { - wxContextMenuEvent evtCtx( - wxEVT_CONTEXT_MENU, - GetParent()->GetId(), - ClientToScreen(event.GetPosition())); - evtCtx.SetEventObject(GetParent()); - GetParent()->GetEventHandler()->ProcessEvent(evtCtx); - } - else - { - // reset the selection and bail out - HighlightAll(false); - } - - return; - } - - if ( event.Dragging() ) - { - if (m_dragCount == 1) - { - // we have to report the raw, physical coords as we want to be - // able to call HitTest(event.m_pointDrag) from the user code to - // get the item being dragged - m_dragStart = event.GetPosition(); - } - - if (m_dragCount != 3) - return; - - int command = event.RightIsDown() ? wxEVT_LIST_BEGIN_RDRAG - : wxEVT_LIST_BEGIN_DRAG; - - SendNotify( m_lineLastClicked, command, m_dragStart ); - - return; - } - - bool forceClick = false; - if (event.ButtonDClick()) - { - if ( m_renameTimer->IsRunning() ) - m_renameTimer->Stop(); - - m_lastOnSame = false; - - if ( current == m_lineLastClicked ) - { - SendNotify( current, wxEVT_LIST_ITEM_ACTIVATED ); - - return; - } - else - { - // The first click was on another item, so don't interpret this as - // a double click, but as a simple click instead - forceClick = true; - } - } - - if (event.LeftUp()) - { - if (m_lineSelectSingleOnUp != (size_t)-1) - { - // select single line - HighlightAll( false ); - ReverseHighlight(m_lineSelectSingleOnUp); - } - - if (m_lastOnSame) - { - if ((current == m_current) && - (hitResult == wxLIST_HITTEST_ONITEMLABEL) && - HasFlag(wxLC_EDIT_LABELS) ) - { - if ( !InReportView() || - GetLineLabelRect(current).Contains(x, y) ) - { - int dclick = wxSystemSettings::GetMetric(wxSYS_DCLICK_MSEC); - m_renameTimer->Start(dclick > 0 ? dclick : 250, true); - } - } - - m_lastOnSame = false; - } - - m_lineSelectSingleOnUp = (size_t)-1; - } - else - { - // This is necessary, because after a DnD operation in - // from and to ourself, the up event is swallowed by the - // DnD code. So on next non-up event (which means here and - // now) m_lineSelectSingleOnUp should be reset. - m_lineSelectSingleOnUp = (size_t)-1; - } - if (event.RightDown()) - { - m_lineBeforeLastClicked = m_lineLastClicked; - m_lineLastClicked = current; - - // If the item is already selected, do not update the selection. - // Multi-selections should not be cleared if a selected item is clicked. - if (!IsHighlighted(current)) - { - HighlightAll(false); - ChangeCurrent(current); - ReverseHighlight(m_current); - } - - SendNotify( current, wxEVT_LIST_ITEM_RIGHT_CLICK, event.GetPosition() ); - - // Allow generation of context menu event - event.Skip(); - } - else if (event.MiddleDown()) - { - SendNotify( current, wxEVT_LIST_ITEM_MIDDLE_CLICK ); - } - else if ( event.LeftDown() || forceClick ) - { - m_lineBeforeLastClicked = m_lineLastClicked; - m_lineLastClicked = current; - - size_t oldCurrent = m_current; - bool oldWasSelected = IsHighlighted(m_current); - - bool cmdModifierDown = event.CmdDown(); - if ( IsSingleSel() || !(cmdModifierDown || event.ShiftDown()) ) - { - if (IsInsideCheckbox(current, x, y)) - { - CheckItem(current, !IsItemChecked(current)); - } - else if (IsSingleSel() || !IsHighlighted(current)) - { - HighlightAll(false); - - ChangeCurrent(current); - - ReverseHighlight(m_current); - } - else // multi sel & current is highlighted & no mod keys - { - m_lineSelectSingleOnUp = current; - ChangeCurrent(current); // change focus - } - } - else // multi sel & either ctrl or shift is down - { - if (cmdModifierDown) - { - ChangeCurrent(current); - - ReverseHighlight(m_current); - } - else if (event.ShiftDown()) - { - ChangeCurrent(current); - - size_t lineFrom = oldCurrent, - lineTo = current; - - if ( lineTo < lineFrom ) - { - lineTo = lineFrom; - lineFrom = m_current; - } - - HighlightLines(lineFrom, lineTo); - } - else // !ctrl, !shift - { - // test in the enclosing if should make it impossible - wxFAIL_MSG( wxT("how did we get here?") ); - } - } - - if (m_current != oldCurrent) - RefreshLine( oldCurrent ); - - // Set the flag telling us whether the next click on this item should - // start editing its label. This should happen if we clicked on the - // current item and it was already selected, i.e. if this click was not - // done to select it. - // - // It should not happen if this was a double click (forceClick is true) - // nor if we hadn't had the focus before as then this click was used to - // give focus to the control. - m_lastOnSame = (m_current == oldCurrent) && oldWasSelected && - !forceClick && HasFocus(); - } -} - -void wxListMainWindow::MoveToItem(size_t item) -{ - if ( item == (size_t)-1 ) - return; - - wxRect rect = GetLineRect(item); - - int client_w, client_h; - GetClientSize( &client_w, &client_h ); - - const int hLine = GetLineHeight(); - - int view_x = SCROLL_UNIT_X * GetListCtrl()->GetScrollPos( wxHORIZONTAL ); - int view_y = hLine * GetListCtrl()->GetScrollPos( wxVERTICAL ); - - if ( InReportView() ) - { - // the next we need the range of lines shown it might be different, - // so recalculate it - ResetVisibleLinesRange(); - - if (rect.y < view_y) - GetListCtrl()->Scroll( -1, rect.y / hLine ); - if (rect.y + rect.height + 5 > view_y + client_h) - GetListCtrl()->Scroll( -1, (rect.y + rect.height - client_h + hLine) / hLine ); - -#if defined(__WXMAC__) || defined(__WXUNIVERSAL__) - // At least on Mac the visible lines value will get reset inside of - // Scroll *before* it actually scrolls the window because of the - // Update() that happens there, so it will still have the wrong value. - // So let's reset it again and wait for it to be recalculated in the - // next paint event. I would expect this problem to show up in wxGTK - // too but couldn't duplicate it there. Perhaps the order of events - // is different... --Robin - // Same in wxUniv/X11 - ResetVisibleLinesRange(); -#endif - } - else // !report - { - int sx = -1, - sy = -1; - - if (rect.x-view_x < 5) - sx = (rect.x - 5) / SCROLL_UNIT_X; - if (rect.x + rect.width - 5 > view_x + client_w) - sx = (rect.x + rect.width - client_w + SCROLL_UNIT_X) / SCROLL_UNIT_X; - - if (rect.y-view_y < 5) - sy = (rect.y - 5) / hLine; - if (rect.y + rect.height - 5 > view_y + client_h) - sy = (rect.y + rect.height - client_h + hLine) / hLine; - - GetListCtrl()->Scroll(sx, sy); - } -} - -bool wxListMainWindow::ScrollList(int WXUNUSED(dx), int dy) -{ - if ( !InReportView() ) - { - // TODO: this should work in all views but is not implemented now - return false; - } - - size_t top, bottom; - GetVisibleLinesRange(&top, &bottom); - - if ( bottom == (size_t)-1 ) - return 0; - - ResetVisibleLinesRange(); - - int hLine = GetLineHeight(); - - GetListCtrl()->Scroll(-1, top + dy / hLine); - -#if defined(__WXMAC__) || defined(__WXUNIVERSAL__) - // see comment in MoveToItem() for why we do this - ResetVisibleLinesRange(); -#endif - - return true; -} - -// ---------------------------------------------------------------------------- -// keyboard handling -// ---------------------------------------------------------------------------- - -void wxListMainWindow::OnArrowChar(size_t newCurrent, const wxKeyEvent& event) -{ - wxCHECK_RET( newCurrent < (size_t)GetItemCount(), - wxT("invalid item index in OnArrowChar()") ); - - size_t oldCurrent = m_current; - - // in single selection we just ignore Shift as we can't select several - // items anyhow - if ( event.ShiftDown() && !IsSingleSel() ) - { - ChangeCurrent(newCurrent); - - // refresh the old focus to remove it - RefreshLine( oldCurrent ); - - // select all the items between the old and the new one - if ( oldCurrent > newCurrent ) - { - newCurrent = oldCurrent; - oldCurrent = m_current; - } - - HighlightLines(oldCurrent, newCurrent); - } - else // !shift - { - // all previously selected items are unselected unless ctrl is held - // in a multiselection control - if ( !event.ControlDown() || IsSingleSel() ) - HighlightAll(false); - - ChangeCurrent(newCurrent); - - // refresh the old focus to remove it - RefreshLine( oldCurrent ); - - // in single selection mode we must always have a selected item - if ( !event.ControlDown() || IsSingleSel() ) - HighlightLine( m_current, true ); - } - - RefreshLine( m_current ); - - MoveToFocus(); -} - -void wxListMainWindow::OnKeyDown( wxKeyEvent &event ) -{ - wxWindow *parent = GetParent(); - - // propagate the key event upwards - wxKeyEvent ke(event); - ke.SetEventObject( parent ); - ke.SetId(GetParent()->GetId()); - if (parent->GetEventHandler()->ProcessEvent( ke )) - return; - - // send a list event - wxListEvent le( wxEVT_LIST_KEY_DOWN, parent->GetId() ); - le.m_item.m_itemId = - le.m_itemIndex = m_current; - if (HasCurrent()) - GetLine(m_current)->GetItem( 0, le.m_item ); - le.m_code = event.GetKeyCode(); - le.SetEventObject( parent ); - if (parent->GetEventHandler()->ProcessEvent( le )) - return; - - event.Skip(); -} - -void wxListMainWindow::OnKeyUp( wxKeyEvent &event ) -{ - wxWindow *parent = GetParent(); - - // propagate the key event upwards - wxKeyEvent ke(event); - ke.SetEventObject( parent ); - ke.SetId(GetParent()->GetId()); - if (parent->GetEventHandler()->ProcessEvent( ke )) - return; - - event.Skip(); -} - -void wxListMainWindow::OnCharHook( wxKeyEvent &event ) -{ - if ( m_textctrlWrapper ) - { - // When an in-place editor is active we should ensure that it always - // gets the key events that are special to it. - if ( m_textctrlWrapper->CheckForEndEditKey(event) ) - { - // Skip the call to wxEvent::Skip() below. - return; - } - } - - event.Skip(); -} - -void wxListMainWindow::OnChar( wxKeyEvent &event ) -{ - wxWindow *parent = GetParent(); - - // propagate the char event upwards - wxKeyEvent ke(event); - ke.SetEventObject( parent ); - ke.SetId(GetParent()->GetId()); - if (parent->GetEventHandler()->ProcessEvent( ke )) - return; - - if ( HandleAsNavigationKey(event) ) - return; - - // no item -> nothing to do - if (!HasCurrent()) - { - event.Skip(); - return; - } - - // don't use m_linesPerPage directly as it might not be computed yet - const int pageSize = GetCountPerPage(); - wxCHECK_RET( pageSize, wxT("should have non zero page size") ); - - if (GetLayoutDirection() == wxLayout_RightToLeft) - { - if (event.GetKeyCode() == WXK_RIGHT) - event.m_keyCode = WXK_LEFT; - else if (event.GetKeyCode() == WXK_LEFT) - event.m_keyCode = WXK_RIGHT; - } - - int keyCode = event.GetKeyCode(); - switch ( keyCode ) - { - case WXK_UP: - if ( m_current > 0 ) - OnArrowChar( m_current - 1, event ); - break; - - case WXK_DOWN: - if ( m_current < (size_t)GetItemCount() - 1 ) - OnArrowChar( m_current + 1, event ); - break; - - case WXK_END: - if (!IsEmpty()) - OnArrowChar( GetItemCount() - 1, event ); - break; - - case WXK_HOME: - if (!IsEmpty()) - OnArrowChar( 0, event ); - break; - - case WXK_PAGEUP: - { - int steps = InReportView() ? pageSize - 1 - : m_current % pageSize; - - int index = m_current - steps; - if (index < 0) - index = 0; - - OnArrowChar( index, event ); - } - break; - - case WXK_PAGEDOWN: - { - int steps = InReportView() - ? pageSize - 1 - : pageSize - (m_current % pageSize) - 1; - - size_t index = m_current + steps; - size_t count = GetItemCount(); - if ( index >= count ) - index = count - 1; - - OnArrowChar( index, event ); - } - break; - - case WXK_LEFT: - if ( !InReportView() ) - { - int index = m_current - pageSize; - if (index < 0) - index = 0; - - OnArrowChar( index, event ); - } - break; - - case WXK_RIGHT: - if ( !InReportView() ) - { - size_t index = m_current + pageSize; - - size_t count = GetItemCount(); - if ( index >= count ) - index = count - 1; - - OnArrowChar( index, event ); - } - break; - - case WXK_SPACE: - if ( IsSingleSel() ) - { - if ( event.ControlDown() ) - { - ReverseHighlight(m_current); - } - else // normal space press - { - SendNotify( m_current, wxEVT_LIST_ITEM_ACTIVATED ); - } - } - else // multiple selection - { - ReverseHighlight(m_current); - } - break; - - case WXK_RETURN: - case WXK_EXECUTE: - SendNotify( m_current, wxEVT_LIST_ITEM_ACTIVATED ); - break; - - default: - if ( !event.HasModifiers() && - ((keyCode >= '0' && keyCode <= '9') || - (keyCode >= 'a' && keyCode <= 'z') || - (keyCode >= 'A' && keyCode <= 'Z') || - (keyCode == '_') || - (keyCode == '+') || - (keyCode == '*') || - (keyCode == '-'))) - { - // find the next item starting with the given prefix - wxChar ch = (wxChar)keyCode; - size_t item; - - // if the same character is typed multiple times then go to the - // next entry starting with that character instead of searching - // for an item starting with multiple copies of this character, - // this is more useful and is how it works under Windows. - if ( m_findPrefix.length() == 1 && m_findPrefix[0] == ch ) - { - item = PrefixFindItem(m_current, ch); - } - else - { - const wxString newPrefix(m_findPrefix + ch); - item = PrefixFindItem(m_current, newPrefix); - if ( item != (size_t)-1 ) - m_findPrefix = newPrefix; - } - - // also start the timer to reset the current prefix if the user - // doesn't press any more alnum keys soon -- we wouldn't want - // to use this prefix for a new item search - if ( !m_findTimer ) - { - m_findTimer = new wxListFindTimer( this ); - } - - // Notice that we should start the timer even if we didn't find - // anything to make sure we reset the search state later. - m_findTimer->Start(wxListFindTimer::DELAY, wxTIMER_ONE_SHOT); - - // restart timer even when there's no match so bell get's reset - if ( item != (size_t)-1 ) - { - // Select the found item and go to it. - HighlightAll(false); - SetItemState(item, - wxLIST_STATE_FOCUSED | wxLIST_STATE_SELECTED, - wxLIST_STATE_FOCUSED | wxLIST_STATE_SELECTED); - - // Reset the bell flag if it had been temporarily disabled - // before. - if ( m_findBell ) - m_findBell = 1; - } - else // No such item - { - // Signal it with a bell if enabled. - if ( m_findBell == 1 ) - { - ::wxBell(); - - // Disable it for the next unsuccessful match, we only - // beep once, this is usually enough and continuing to - // do it would be annoying. - m_findBell = -1; - } - } - } - else - { - event.Skip(); - } - } -} - -// ---------------------------------------------------------------------------- -// focus handling -// ---------------------------------------------------------------------------- - -void wxListMainWindow::OnSetFocus( wxFocusEvent &WXUNUSED(event) ) -{ - if ( GetParent() ) - { - wxFocusEvent event( wxEVT_SET_FOCUS, GetParent()->GetId() ); - event.SetEventObject( GetParent() ); - if ( GetParent()->GetEventHandler()->ProcessEvent( event) ) - return; - } - - // wxGTK sends us EVT_SET_FOCUS events even if we had never got - // EVT_KILL_FOCUS before which means that we finish by redrawing the items - // which are already drawn correctly resulting in horrible flicker - avoid - // it - if ( !m_hasFocus ) - { - m_hasFocus = true; - - RefreshSelected(); - } -} - -void wxListMainWindow::OnKillFocus( wxFocusEvent &WXUNUSED(event) ) -{ - if ( GetParent() ) - { - wxFocusEvent event( wxEVT_KILL_FOCUS, GetParent()->GetId() ); - event.SetEventObject( GetParent() ); - if ( GetParent()->GetEventHandler()->ProcessEvent( event) ) - return; - } - - m_hasFocus = false; - RefreshSelected(); -} - -void wxListMainWindow::DrawImage( int index, wxDC *dc, int x, int y ) -{ - if ( HasFlag(wxLC_ICON) && (m_normal_image_list)) - { - m_normal_image_list->Draw( index, *dc, x, y, wxIMAGELIST_DRAW_TRANSPARENT ); - } - else if ( HasFlag(wxLC_SMALL_ICON) && (m_small_image_list)) - { - m_small_image_list->Draw( index, *dc, x, y, wxIMAGELIST_DRAW_TRANSPARENT ); - } - else if ( HasFlag(wxLC_LIST) && (m_small_image_list)) - { - m_small_image_list->Draw( index, *dc, x, y, wxIMAGELIST_DRAW_TRANSPARENT ); - } - else if ( InReportView() && (m_small_image_list)) - { - m_small_image_list->Draw( index, *dc, x, y, wxIMAGELIST_DRAW_TRANSPARENT ); - } -} - -void wxListMainWindow::GetImageSize( int index, int &width, int &height ) const -{ - if ( HasFlag(wxLC_ICON) && m_normal_image_list ) - { - m_normal_image_list->GetSize( index, width, height ); - } - else if ( HasFlag(wxLC_SMALL_ICON) && m_small_image_list ) - { - m_small_image_list->GetSize( index, width, height ); - } - else if ( HasFlag(wxLC_LIST) && m_small_image_list ) - { - m_small_image_list->GetSize( index, width, height ); - } - else if ( InReportView() && m_small_image_list ) - { - m_small_image_list->GetSize( index, width, height ); - } - else - { - width = - height = 0; - } -} - -void wxListMainWindow::SetImageList( wxImageList *imageList, int which ) -{ - m_dirty = true; - - // calc the spacing from the icon size - int width = 0, height = 0; - - if ((imageList) && (imageList->GetImageCount()) ) - imageList->GetSize(0, width, height); - - if (which == wxIMAGE_LIST_NORMAL) - { - m_normal_image_list = imageList; - m_normal_spacing = width + 8; - } - - if (which == wxIMAGE_LIST_SMALL) - { - m_small_image_list = imageList; - m_small_spacing = width + 14; - m_lineHeight = 0; // ensure that the line height will be recalc'd - } -} - -void wxListMainWindow::SetItemSpacing( int spacing, bool isSmall ) -{ - m_dirty = true; - if (isSmall) - m_small_spacing = spacing; - else - m_normal_spacing = spacing; -} - -int wxListMainWindow::GetItemSpacing( bool isSmall ) -{ - return isSmall ? m_small_spacing : m_normal_spacing; -} - -// ---------------------------------------------------------------------------- -// columns -// ---------------------------------------------------------------------------- - -int -wxListMainWindow::ComputeMinHeaderWidth(const wxListHeaderData* column) const -{ - wxClientDC dc(const_cast(this)); - - int width = dc.GetTextExtent(column->GetText()).x + AUTOSIZE_COL_MARGIN; - - width += 2*EXTRA_WIDTH; - - // check for column header's image availability - const int image = column->GetImage(); - if ( image != -1 ) - { - if ( m_small_image_list ) - { - int ix = 0, iy = 0; - m_small_image_list->GetSize(image, ix, iy); - width += ix + HEADER_IMAGE_MARGIN_IN_REPORT_MODE; - } - } - - return width; -} - -void wxListMainWindow::SetColumn( int col, const wxListItem &item ) -{ - wxListHeaderDataList::compatibility_iterator node = m_columns.Item( col ); - - wxCHECK_RET( node, wxT("invalid column index in SetColumn") ); - - wxListHeaderData *column = node->GetData(); - column->SetItem( item ); - - if ( item.m_width == wxLIST_AUTOSIZE_USEHEADER ) - column->SetWidth(ComputeMinHeaderWidth(column)); - - wxListHeaderWindow *headerWin = GetListCtrl()->m_headerWin; - if ( headerWin ) - headerWin->m_dirty = true; - - m_dirty = true; - - // invalidate it as it has to be recalculated - m_headerWidth = 0; -} - -class wxListCtrlMaxWidthCalculator : public wxMaxWidthCalculatorBase -{ -public: - wxListCtrlMaxWidthCalculator(wxListMainWindow *listmain, unsigned int column) - : wxMaxWidthCalculatorBase(column), - m_listmain(listmain) - { - } - - virtual void UpdateWithRow(int row) wxOVERRIDE - { - wxListLineData *line = m_listmain->GetLine( row ); - wxListItemDataList::compatibility_iterator n = line->m_items.Item( GetColumn() ); - - wxCHECK_RET( n, wxS("no subitem?") ); - - wxListItemData* const itemData = n->GetData(); - - wxListItem item; - itemData->GetItem(item); - - UpdateWithWidth(m_listmain->GetItemWidthWithImage(&item)); - } - -private: - wxListMainWindow* const m_listmain; -}; - - -void wxListMainWindow::SetColumnWidth( int col, int width ) -{ - wxCHECK_RET( col >= 0 && col < GetColumnCount(), - wxT("invalid column index") ); - - wxCHECK_RET( InReportView(), - wxT("SetColumnWidth() can only be called in report mode.") ); - - m_dirty = true; - - wxListHeaderWindow *headerWin = GetListCtrl()->m_headerWin; - if ( headerWin ) - headerWin->m_dirty = true; - - wxListHeaderDataList::compatibility_iterator node = m_columns.Item( col ); - wxCHECK_RET( node, wxT("no column?") ); - - wxListHeaderData *column = node->GetData(); - - size_t count = GetItemCount(); - - if ( width == wxLIST_AUTOSIZE_USEHEADER || width == wxLIST_AUTOSIZE ) - { - wxListCtrlMaxWidthCalculator calculator(this, col); - - calculator.UpdateWithWidth(AUTOSIZE_COL_MARGIN); - - if ( width == wxLIST_AUTOSIZE_USEHEADER ) - calculator.UpdateWithWidth(ComputeMinHeaderWidth(column)); - - // if the cached column width isn't valid then recalculate it - wxColWidthInfo* const pWidthInfo = m_aColWidths.Item(col); - if ( pWidthInfo->bNeedsUpdate ) - { - size_t first_visible, last_visible; - GetVisibleLinesRange(&first_visible, &last_visible); - - calculator.ComputeBestColumnWidth(count, first_visible, last_visible); - pWidthInfo->nMaxWidth = calculator.GetMaxWidth(); - pWidthInfo->bNeedsUpdate = false; - } - else - { - calculator.UpdateWithWidth(pWidthInfo->nMaxWidth); - } - - // expand the last column to fit the client size - // only for AUTOSIZE_USEHEADER to mimic MSW behaviour - int margin = 0; - if ( (width == wxLIST_AUTOSIZE_USEHEADER) && (col == GetColumnCount() - 1) ) - { - margin = GetClientSize().GetX(); - for ( int i = 0; i < col && margin > 0; ++i ) - margin -= m_columns.Item(i)->GetData()->GetWidth(); - } - - width = wxMax(margin, calculator.GetMaxWidth() + AUTOSIZE_COL_MARGIN); - } - - column->SetWidth( width ); - - // invalidate it as it has to be recalculated - m_headerWidth = 0; -} - -int wxListMainWindow::GetHeaderWidth() const -{ - if ( !m_headerWidth ) - { - wxListMainWindow *self = wxConstCast(this, wxListMainWindow); - - size_t count = GetColumnCount(); - for ( size_t col = 0; col < count; col++ ) - { - self->m_headerWidth += GetColumnWidth(col); - } - } - - return m_headerWidth; -} - -void wxListMainWindow::GetColumn( int col, wxListItem &item ) const -{ - wxListHeaderDataList::compatibility_iterator node = m_columns.Item( col ); - wxCHECK_RET( node, wxT("invalid column index in GetColumn") ); - - wxListHeaderData *column = node->GetData(); - column->GetItem( item ); -} - -int wxListMainWindow::GetColumnWidth( int col ) const -{ - wxListHeaderDataList::compatibility_iterator node = m_columns.Item( col ); - wxCHECK_MSG( node, 0, wxT("invalid column index") ); - - wxListHeaderData *column = node->GetData(); - return column->GetWidth(); -} - -// ---------------------------------------------------------------------------- -// item state -// ---------------------------------------------------------------------------- - -void wxListMainWindow::SetItem( wxListItem &item ) -{ - long id = item.m_itemId; - wxCHECK_RET( id >= 0 && (size_t)id < GetItemCount(), - wxT("invalid item index in SetItem") ); - - if ( !IsVirtual() ) - { - wxListLineData *line = GetLine((size_t)id); - line->SetItem( item.m_col, item ); - - // Set item state if user wants - if ( item.m_mask & wxLIST_MASK_STATE ) - SetItemState( item.m_itemId, item.m_state, item.m_state ); - - if (InReportView()) - { - // update the Max Width Cache if needed - int width = GetItemWidthWithImage(&item); - - wxColWidthInfo* const pWidthInfo = m_aColWidths.Item(item.m_col); - if ( width > pWidthInfo->nMaxWidth ) - { - pWidthInfo->nMaxWidth = width; - pWidthInfo->bNeedsUpdate = true; - } - } - } - - // update the item on screen unless we're going to update everything soon - // anyhow - if ( !m_dirty ) - { - wxRect rectItem; - GetItemRect(id, rectItem); - RefreshRect(rectItem); - } -} - -void wxListMainWindow::SetItemStateAll(long state, long stateMask) -{ - if ( IsEmpty() ) - return; - - // first deal with selection - if ( stateMask & wxLIST_STATE_SELECTED ) - { - // set/clear select state - if ( IsVirtual() ) - { - // optimized version for virtual listctrl. - m_selStore.SelectRange(0, GetItemCount() - 1, state == wxLIST_STATE_SELECTED); - Refresh(); - } - else if ( state & wxLIST_STATE_SELECTED ) - { - const long count = GetItemCount(); - for( long i = 0; i < count; i++ ) - { - SetItemState( i, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED ); - } - - } - else - { - // clear for non virtual (somewhat optimized by using GetNextItem()) - long i = -1; - while ( (i = GetNextItem(i, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED)) != -1 ) - { - SetItemState( i, 0, wxLIST_STATE_SELECTED ); - } - } - } - - if ( HasCurrent() && (state == 0) && (stateMask & wxLIST_STATE_FOCUSED) ) - { - // unfocus all: only one item can be focussed, so clearing focus for - // all items is simply clearing focus of the focussed item. - SetItemState(m_current, state, stateMask); - } - //(setting focus to all items makes no sense, so it is not handled here.) -} - -void wxListMainWindow::SetItemState( long litem, long state, long stateMask ) -{ - if ( litem == -1 ) - { - SetItemStateAll(state, stateMask); - return; - } - - wxCHECK_RET( litem >= 0 && (size_t)litem < GetItemCount(), - wxT("invalid list ctrl item index in SetItem") ); - - size_t oldCurrent = m_current; - size_t item = (size_t)litem; // safe because of the check above - - // do we need to change the focus? - if ( stateMask & wxLIST_STATE_FOCUSED ) - { - if ( state & wxLIST_STATE_FOCUSED ) - { - // don't do anything if this item is already focused - if ( item != m_current ) - { - ChangeCurrent(item); - - if ( oldCurrent != (size_t)-1 ) - { - if ( IsSingleSel() ) - { - HighlightLine(oldCurrent, false); - } - - RefreshLine(oldCurrent); - } - - RefreshLine( m_current ); - } - } - else // unfocus - { - // don't do anything if this item is not focused - if ( item == m_current ) - { - ResetCurrent(); - - if ( IsSingleSel() ) - { - // we must unselect the old current item as well or we - // might end up with more than one selected item in a - // single selection control - HighlightLine(oldCurrent, false); - } - - RefreshLine( oldCurrent ); - } - } - } - - // do we need to change the selection state? - if ( stateMask & wxLIST_STATE_SELECTED ) - { - bool on = (state & wxLIST_STATE_SELECTED) != 0; - - if ( IsSingleSel() ) - { - if ( on ) - { - // selecting the item also makes it the focused one in the - // single sel mode - if ( m_current != item ) - { - ChangeCurrent(item); - - if ( oldCurrent != (size_t)-1 ) - { - HighlightLine( oldCurrent, false ); - RefreshLine( oldCurrent ); - } - } - } - else // off - { - // only the current item may be selected anyhow - if ( item != m_current ) - return; - } - } - - if ( HighlightLine(item, on) ) - { - RefreshLine(item); - } - } -} - -int wxListMainWindow::GetItemState( long item, long stateMask ) const -{ - wxCHECK_MSG( item >= 0 && (size_t)item < GetItemCount(), 0, - wxT("invalid list ctrl item index in GetItemState()") ); - - int ret = wxLIST_STATE_DONTCARE; - - if ( stateMask & wxLIST_STATE_FOCUSED ) - { - if ( (size_t)item == m_current ) - ret |= wxLIST_STATE_FOCUSED; - } - - if ( stateMask & wxLIST_STATE_SELECTED ) - { - if ( IsHighlighted(item) ) - ret |= wxLIST_STATE_SELECTED; - } - - return ret; -} - -void wxListMainWindow::GetItem( wxListItem &item ) const -{ - wxCHECK_RET( item.m_itemId >= 0 && (size_t)item.m_itemId < GetItemCount(), - wxT("invalid item index in GetItem") ); - - wxListLineData *line = GetLine((size_t)item.m_itemId); - line->GetItem( item.m_col, item ); - - // Get item state if user wants it - if ( item.m_mask & wxLIST_MASK_STATE ) - item.m_state = GetItemState( item.m_itemId, wxLIST_STATE_SELECTED | - wxLIST_STATE_FOCUSED ); -} - -// ---------------------------------------------------------------------------- -// item count -// ---------------------------------------------------------------------------- - -size_t wxListMainWindow::GetItemCount() const -{ - return IsVirtual() ? m_countVirt : m_lines.GetCount(); -} - -void wxListMainWindow::SetItemCount(long count) -{ - // Update the current item if it's not valid any longer (notice that this - // invalidates it completely if the control is becoming empty, which is the - // right thing to do). - if ( HasCurrent() && m_current >= (size_t)count ) - ChangeCurrent(count - 1); - - m_selStore.SetItemCount(count); - m_countVirt = count; - - ResetVisibleLinesRange(); - - // scrollbars must be reset - m_dirty = true; -} - -int wxListMainWindow::GetSelectedItemCount() const -{ - // deal with the quick case first - if ( IsSingleSel() ) - return HasCurrent() ? IsHighlighted(m_current) : false; - - // virtual controls remmebers all its selections itself - if ( IsVirtual() ) - return m_selStore.GetSelectedCount(); - - // TODO: we probably should maintain the number of items selected even for - // non virtual controls as enumerating all lines is really slow... - size_t countSel = 0; - size_t count = GetItemCount(); - for ( size_t line = 0; line < count; line++ ) - { - if ( GetLine(line)->IsHighlighted() ) - countSel++; - } - - return countSel; -} - -// ---------------------------------------------------------------------------- -// item position/size -// ---------------------------------------------------------------------------- - -wxRect wxListMainWindow::GetViewRect() const -{ - wxASSERT_MSG( !HasFlag(wxLC_LIST), "not implemented for list view" ); - - // we need to find the longest/tallest label - wxCoord xMax = 0, yMax = 0; - const int count = GetItemCount(); - if ( count ) - { - for ( int i = 0; i < count; i++ ) - { - // we need logical, not physical, coordinates here, so use - // GetLineRect() instead of GetItemRect() - wxRect r = GetLineRect(i); - - wxCoord x = r.GetRight(), - y = r.GetBottom(); - - if ( x > xMax ) - xMax = x; - if ( y > yMax ) - yMax = y; - } - } - - // some fudge needed to make it look prettier - xMax += 2 * EXTRA_BORDER_X; - yMax += 2 * EXTRA_BORDER_Y; - - // account for the scrollbars if necessary - const wxSize sizeAll = GetClientSize(); - if ( xMax > sizeAll.x ) - yMax += wxSystemSettings::GetMetric(wxSYS_HSCROLL_Y); - if ( yMax > sizeAll.y ) - xMax += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X); - - return wxRect(0, 0, xMax, yMax); -} - -bool -wxListMainWindow::GetSubItemRect(long item, long subItem, wxRect& rect) const -{ - wxCHECK_MSG( subItem == wxLIST_GETSUBITEMRECT_WHOLEITEM || InReportView(), - false, - wxT("GetSubItemRect only meaningful in report view") ); - wxCHECK_MSG( item >= 0 && (size_t)item < GetItemCount(), false, - wxT("invalid item in GetSubItemRect") ); - - // ensure that we're laid out, otherwise we could return nonsense - if ( m_dirty ) - { - wxConstCast(this, wxListMainWindow)-> - RecalculatePositions(true /* no refresh */); - } - - rect = GetLineRect((size_t)item); - - // Adjust rect to specified column - if ( subItem != wxLIST_GETSUBITEMRECT_WHOLEITEM ) - { - wxCHECK_MSG( subItem >= 0 && subItem < GetColumnCount(), false, - wxT("invalid subItem in GetSubItemRect") ); - - for (int i = 0; i < subItem; i++) - { - rect.x += GetColumnWidth(i); - } - rect.width = GetColumnWidth(subItem); - } - - GetListCtrl()->CalcScrolledPosition(rect.x, rect.y, &rect.x, &rect.y); - - return true; -} - -bool wxListMainWindow::GetItemPosition(long item, wxPoint& pos) const -{ - wxRect rect; - GetItemRect(item, rect); - - pos.x = rect.x; - pos.y = rect.y; - - return true; -} - -// ---------------------------------------------------------------------------- -// checkboxes -// ---------------------------------------------------------------------------- - -bool wxListMainWindow::HasCheckboxes() const -{ - return m_hasCheckboxes; -} - -bool wxListMainWindow::EnableCheckboxes(bool enable) -{ - m_hasCheckboxes = enable; - - m_dirty = true; - m_headerWidth = 0; - Refresh(); - - return true; -} - -void wxListMainWindow::CheckItem(long item, bool state) -{ - wxListLineData *line = GetLine((size_t)item); - line->Check(state); - - RefreshLine(item); - - SendNotify(item, state ? wxEVT_LIST_ITEM_CHECKED - : wxEVT_LIST_ITEM_UNCHECKED); -} - -bool wxListMainWindow::IsItemChecked(long item) const -{ - wxListLineData *line = GetLine((size_t)item); - return line->IsChecked(); -} - -bool wxListMainWindow::IsInsideCheckbox(long item, int x, int y) -{ - if ( HasCheckboxes() ) - { - wxRect lineRect = GetLineRect(item); - wxSize cbSize = wxRendererNative::Get().GetCheckBoxSize(this); - int yOffset = (lineRect.height - cbSize.GetHeight()) / 2; - wxRect rr(wxPoint(MARGIN_AROUND_CHECKBOX, lineRect.y + yOffset), cbSize); - - return rr.Contains(wxPoint(x, y)); - } - - return false; -} - -// ---------------------------------------------------------------------------- -// geometry calculation -// ---------------------------------------------------------------------------- - -void wxListMainWindow::RecalculatePositions(bool noRefresh) -{ - const int lineHeight = GetLineHeight(); - - wxClientDC dc( this ); - dc.SetFont( GetFont() ); - - const size_t count = GetItemCount(); - - int iconSpacing; - if ( HasFlag(wxLC_ICON) && m_normal_image_list ) - iconSpacing = m_normal_spacing; - else if ( HasFlag(wxLC_SMALL_ICON) && m_small_image_list ) - iconSpacing = m_small_spacing; - else - iconSpacing = 0; - - // Note that we do not call GetClientSize() here but - // GetSize() and subtract the border size for sunken - // borders manually. This is technically incorrect, - // but we need to know the client area's size WITHOUT - // scrollbars here. Since we don't know if there are - // any scrollbars, we use GetSize() instead. Another - // solution would be to call SetScrollbars() here to - // remove the scrollbars and call GetClientSize() then, - // but this might result in flicker and - worse - will - // reset the scrollbars to 0 which is not good at all - // if you resize a dialog/window, but don't want to - // reset the window scrolling. RR. - // Furthermore, we actually do NOT subtract the border - // width as 2 pixels is just the extra space which we - // need around the actual content in the window. Other- - // wise the text would e.g. touch the upper border. RR. - int clientWidth, - clientHeight; - GetSize( &clientWidth, &clientHeight ); - - if ( InReportView() ) - { - // all lines have the same height and we scroll one line per step - int entireHeight = count * lineHeight + LINE_SPACING; - - m_linesPerPage = clientHeight / lineHeight; - - ResetVisibleLinesRange(); - - GetListCtrl()->SetScrollbars( SCROLL_UNIT_X, lineHeight, - GetHeaderWidth() / SCROLL_UNIT_X, - (entireHeight + lineHeight - 1) / lineHeight, - GetListCtrl()->GetScrollPos(wxHORIZONTAL), - GetListCtrl()->GetScrollPos(wxVERTICAL), - true ); - } - else // !report - { - // we have 3 different layout strategies: either layout all items - // horizontally/vertically (wxLC_ALIGN_XXX styles explicitly given) or - // to arrange them in top to bottom, left to right (don't ask me why - // not the other way round...) order - if ( HasFlag(wxLC_ALIGN_LEFT | wxLC_ALIGN_TOP) ) - { - int x = EXTRA_BORDER_X; - int y = EXTRA_BORDER_Y; - - wxCoord widthMax = 0; - - size_t i; - for ( i = 0; i < count; i++ ) - { - wxListLineData *line = GetLine(i); - line->CalculateSize( &dc, iconSpacing ); - line->SetPosition( x, y, iconSpacing ); - - wxSize sizeLine = GetLineSize(i); - - if ( HasFlag(wxLC_ALIGN_TOP) ) - { - if ( sizeLine.x > widthMax ) - widthMax = sizeLine.x; - - y += sizeLine.y; - } - else // wxLC_ALIGN_LEFT - { - x += sizeLine.x + MARGIN_BETWEEN_ROWS; - } - } - - if ( HasFlag(wxLC_ALIGN_TOP) ) - { - // traverse the items again and tweak their sizes so that they are - // all the same in a row - for ( i = 0; i < count; i++ ) - { - wxListLineData *line = GetLine(i); - line->m_gi->ExtendWidth(widthMax); - } - } - - GetListCtrl()->SetScrollbars - ( - SCROLL_UNIT_X, - lineHeight, - (x + SCROLL_UNIT_X) / SCROLL_UNIT_X, - (y + lineHeight) / lineHeight, - GetListCtrl()->GetScrollPos( wxHORIZONTAL ), - GetListCtrl()->GetScrollPos( wxVERTICAL ), - true - ); - } - else // "flowed" arrangement, the most complicated case - { - // at first we try without any scrollbars, if the items don't fit into - // the window, we recalculate after subtracting the space taken by the - // scrollbar - - int entireWidth = 0; - - for (int tries = 0; tries < 2; tries++) - { - entireWidth = 2 * EXTRA_BORDER_X; - - if (tries == 1) - { - // Now we have decided that the items do not fit into the - // client area, so we need a scrollbar - entireWidth += SCROLL_UNIT_X; - } - - int x = EXTRA_BORDER_X; - int y = EXTRA_BORDER_Y; - - // Note that "row" here is vertical, i.e. what is called - // "column" in many other places in wxWidgets. - int maxWidthInThisRow = 0; - - m_linesPerPage = 0; - int currentlyVisibleLines = 0; - - for (size_t i = 0; i < count; i++) - { - currentlyVisibleLines++; - wxListLineData *line = GetLine( i ); - line->CalculateSize( &dc, iconSpacing ); - line->SetPosition( x, y, iconSpacing ); - - wxSize sizeLine = GetLineSize( i ); - - if ( maxWidthInThisRow < sizeLine.x ) - maxWidthInThisRow = sizeLine.x; - - y += sizeLine.y; - if (currentlyVisibleLines > m_linesPerPage) - m_linesPerPage = currentlyVisibleLines; - - // Have we reached the end of the row either because no - // more items would fit or because there are simply no more - // items? - if ( y + sizeLine.y >= clientHeight - || i == count - 1) - { - // Adjust all items in this row to have the same - // width to ensure that they all align horizontally in - // icon view. - if ( HasFlag(wxLC_ICON) || HasFlag(wxLC_SMALL_ICON) ) - { - size_t firstRowLine = i - currentlyVisibleLines + 1; - for (size_t j = firstRowLine; j <= i; j++) - { - GetLine(j)->m_gi->ExtendWidth(maxWidthInThisRow); - } - } - - currentlyVisibleLines = 0; - y = EXTRA_BORDER_Y; - maxWidthInThisRow += MARGIN_BETWEEN_ROWS; - x += maxWidthInThisRow; - entireWidth += maxWidthInThisRow; - maxWidthInThisRow = 0; - } - - if ( (tries == 0) && - (entireWidth + SCROLL_UNIT_X > clientWidth) ) - { - clientHeight -= wxSystemSettings:: - GetMetric(wxSYS_HSCROLL_Y); - m_linesPerPage = 0; - break; - } - - if ( i == count - 1 ) - tries = 1; // Everything fits, no second try required. - } - } - - GetListCtrl()->SetScrollbars - ( - SCROLL_UNIT_X, - lineHeight, - (entireWidth + SCROLL_UNIT_X) / SCROLL_UNIT_X, - 0, - GetListCtrl()->GetScrollPos( wxHORIZONTAL ), - 0, - true - ); - } - } - - if ( !noRefresh ) - { - // FIXME: why should we call it from here? - UpdateCurrent(); - - RefreshAll(); - } -} - -void wxListMainWindow::RefreshAll() -{ - m_dirty = false; - Refresh(); - - wxListHeaderWindow *headerWin = GetListCtrl()->m_headerWin; - if ( headerWin && headerWin->m_dirty ) - { - headerWin->m_dirty = false; - headerWin->Refresh(); - } -} - -void wxListMainWindow::UpdateCurrent() -{ - if ( !HasCurrent() && !IsEmpty() ) - ChangeCurrent(0); -} - -long wxListMainWindow::GetNextItem( long item, - int WXUNUSED(geometry), - int state ) const -{ - long ret = item, - max = GetItemCount(); - wxCHECK_MSG( (ret == -1) || (ret < max), -1, - wxT("invalid listctrl index in GetNextItem()") ); - - // notice that we start with the next item (or the first one if item == -1) - // and this is intentional to allow writing a simple loop to iterate over - // all selected items - ret++; - if ( ret == max ) - // this is not an error because the index was OK initially, - // just no such item - return -1; - - if ( !state ) - // any will do - return (size_t)ret; - - size_t count = GetItemCount(); - for ( size_t line = (size_t)ret; line < count; line++ ) - { - if ( (state & wxLIST_STATE_FOCUSED) && (line == m_current) ) - return line; - - if ( (state & wxLIST_STATE_SELECTED) && IsHighlighted(line) ) - return line; - } - - return -1; -} - -// ---------------------------------------------------------------------------- -// deleting stuff -// ---------------------------------------------------------------------------- - -void wxListMainWindow::DeleteItem( long lindex ) -{ - size_t count = GetItemCount(); - - wxCHECK_RET( (lindex >= 0) && ((size_t)lindex < count), - wxT("invalid item index in DeleteItem") ); - - size_t index = (size_t)lindex; - - // we don't need to adjust the index for the previous items - if ( HasCurrent() && m_current >= index ) - { - // if the current item is being deleted, we want the next one to - // become selected - unless there is no next one - so don't adjust - // m_current in this case - if ( m_current != index || m_current == count - 1 ) - m_current--; - } - - if ( InReportView() ) - { - // mark the Column Max Width cache as dirty if the items in the line - // we're deleting contain the Max Column Width - wxListLineData * const line = GetLine(index); - wxListItemDataList::compatibility_iterator n; - wxListItemData *itemData; - wxListItem item; - int itemWidth; - - for (size_t i = 0; i < m_columns.GetCount(); i++) - { - n = line->m_items.Item( i ); - itemData = n->GetData(); - itemData->GetItem(item); - - itemWidth = GetItemWidthWithImage(&item); - - wxColWidthInfo *pWidthInfo = m_aColWidths.Item(i); - if ( itemWidth >= pWidthInfo->nMaxWidth ) - pWidthInfo->bNeedsUpdate = true; - } - - ResetVisibleLinesRange(); - } - - SendNotify( index, wxEVT_LIST_DELETE_ITEM, wxDefaultPosition ); - - if ( IsVirtual() ) - { - m_countVirt--; - m_selStore.OnItemDelete(index); - } - else - { - m_lines.RemoveAt( index ); - } - - // we need to refresh the (vert) scrollbar as the number of items changed - m_dirty = true; - - RefreshAfter(index); -} - -void wxListMainWindow::DeleteColumn( int col ) -{ - wxListHeaderDataList::compatibility_iterator node = m_columns.Item( col ); - - wxCHECK_RET( node, wxT("invalid column index in DeleteColumn()") ); - - m_dirty = true; - delete node->GetData(); - m_columns.Erase( node ); - - if ( !IsVirtual() ) - { - // update all the items - for ( size_t i = 0; i < m_lines.GetCount(); i++ ) - { - wxListLineData * const line = GetLine(i); - - // In the following atypical but possible scenario it can be - // legal to call DeleteColumn() but the items may not have any - // values for it: - // 1. In report view, insert a second column. - // 2. Still in report view, add an item with 2 values. - // 3. Switch to an icon (or list) view. - // 4. Add an item -- necessarily with 1 value only. - // 5. Switch back to report view. - // 6. Call DeleteColumn(). - // So we need to check for this as otherwise we would simply crash - // if this happens. - if ( line->m_items.GetCount() <= static_cast(col) ) - continue; - - wxListItemDataList::compatibility_iterator n = line->m_items.Item( col ); - delete n->GetData(); - line->m_items.Erase(n); - } - } - - if ( InReportView() ) // we only cache max widths when in Report View - { - delete m_aColWidths.Item(col); - m_aColWidths.RemoveAt(col); - } - - // invalidate it as it has to be recalculated - m_headerWidth = 0; -} - -void wxListMainWindow::DoDeleteAllItems() -{ - // We will need to update all columns if any items are inserted again. - if ( InReportView() ) - { - for ( size_t i = 0; i < m_aColWidths.GetCount(); i++ ) - m_aColWidths.Item(i)->bNeedsUpdate = true; - } - - if ( IsEmpty() ) - // nothing to do - in particular, don't send the event - return; - - ResetCurrent(); - - // to make the deletion of all items faster, we don't send the - // notifications for each item deletion in this case but only one event - // for all of them: this is compatible with wxMSW and documented in - // DeleteAllItems() description - - wxListEvent event( wxEVT_LIST_DELETE_ALL_ITEMS, GetParent()->GetId() ); - event.SetEventObject( GetParent() ); - GetParent()->GetEventHandler()->ProcessEvent( event ); - - if ( IsVirtual() ) - { - m_countVirt = 0; - m_selStore.Clear(); - } - - if ( InReportView() ) - ResetVisibleLinesRange(); - - m_lines.Clear(); -} - -void wxListMainWindow::DeleteAllItems() -{ - DoDeleteAllItems(); - - RecalculatePositions(); -} - -void wxListMainWindow::DeleteEverything() -{ - WX_CLEAR_LIST(wxListHeaderDataList, m_columns); - WX_CLEAR_ARRAY(m_aColWidths); - - DeleteAllItems(); -} - -// ---------------------------------------------------------------------------- -// scanning for an item -// ---------------------------------------------------------------------------- - -void wxListMainWindow::EnsureVisible( long index ) -{ - wxCHECK_RET( index >= 0 && (size_t)index < GetItemCount(), - wxT("invalid index in EnsureVisible") ); - - // We have to call this here because the label in question might just have - // been added and its position is not known yet - if ( m_dirty ) - RecalculatePositions(true /* no refresh */); - - MoveToItem((size_t)index); -} - -long wxListMainWindow::FindItem(long start, const wxString& str, bool partial ) -{ - if (str.empty()) - return wxNOT_FOUND; - - long pos = start; - wxString str_upper = str.Upper(); - if (pos < 0) - pos = 0; - - size_t count = GetItemCount(); - for ( size_t i = (size_t)pos; i < count; i++ ) - { - wxListLineData *line = GetLine(i); - wxString line_upper = line->GetText(0).Upper(); - if (!partial) - { - if (line_upper == str_upper ) - return i; - } - else - { - if (line_upper.find(str_upper) == 0) - return i; - } - } - - return wxNOT_FOUND; -} - -long wxListMainWindow::FindItem(long start, wxUIntPtr data) -{ - long pos = start; - if (pos < 0) - pos = 0; - - size_t count = GetItemCount(); - for (size_t i = (size_t)pos; i < count; i++) - { - wxListLineData *line = GetLine(i); - wxListItem item; - line->GetItem( 0, item ); - if (item.m_data == data) - return i; - } - - return wxNOT_FOUND; -} - -long wxListMainWindow::FindItem( const wxPoint& pt ) -{ - size_t topItem; - GetVisibleLinesRange( &topItem, NULL ); - - wxPoint p; - GetItemPosition( GetItemCount() - 1, p ); - if ( p.y == 0 ) - return topItem; - - long id = (long)floor( pt.y * double(GetItemCount() - topItem - 1) / p.y + topItem ); - if ( id >= 0 && id < (long)GetItemCount() ) - return id; - - return wxNOT_FOUND; -} - -long wxListMainWindow::HitTest( int x, int y, int &flags ) const -{ - GetListCtrl()->CalcUnscrolledPosition( x, y, &x, &y ); - - size_t count = GetItemCount(); - - if ( InReportView() ) - { - size_t current = y / GetLineHeight(); - if ( current < count ) - { - flags = HitTestLine(current, x, y); - if ( flags ) - return current; - } - } - else // !report - { - // TODO: optimize it too! this is less simple than for report view but - // enumerating all items is still not a way to do it!! - for ( size_t current = 0; current < count; current++ ) - { - flags = HitTestLine(current, x, y); - if ( flags ) - return current; - } - } - - return wxNOT_FOUND; -} - -// ---------------------------------------------------------------------------- -// adding stuff -// ---------------------------------------------------------------------------- - -void wxListMainWindow::InsertItem( wxListItem &item ) -{ - wxASSERT_MSG( !IsVirtual(), wxT("can't be used with virtual control") ); - - int count = GetItemCount(); - wxCHECK_RET( item.m_itemId >= 0, wxT("invalid item index") ); - - if (item.m_itemId > count) - item.m_itemId = count; - - size_t id = item.m_itemId; - - m_dirty = true; - - if ( InReportView() ) - { - ResetVisibleLinesRange(); - - const unsigned col = item.GetColumn(); - wxCHECK_RET( col < m_aColWidths.size(), "invalid item column" ); - - // calculate the width of the item and adjust the max column width - wxColWidthInfo *pWidthInfo = m_aColWidths.Item(col); - int width = GetItemWidthWithImage(&item); - item.SetWidth(width); - if (width > pWidthInfo->nMaxWidth) - { - pWidthInfo->nMaxWidth = width; - pWidthInfo->bNeedsUpdate = true; - } - } - - wxListLineData *line = new wxListLineData(this); - - line->SetItem( item.m_col, item ); - if ( item.m_mask & wxLIST_MASK_IMAGE ) - { - // Reset the buffered height if it's not big enough for the new image. - int image = item.GetImage(); - if ( m_small_image_list && image != -1 && InReportView() ) - { - int imageWidth, imageHeight; - m_small_image_list->GetSize(image, imageWidth, imageHeight); - - if ( imageHeight > m_lineHeight ) - m_lineHeight = 0; - } - } - - m_lines.Insert( line, id ); - - m_dirty = true; - - // If an item is selected at or below the point of insertion, we need to - // increment the member variables because the current row's index has gone - // up by one - if ( HasCurrent() && m_current >= id ) - m_current++; - - SendNotify(id, wxEVT_LIST_INSERT_ITEM); - - RefreshLines(id, GetItemCount() - 1); -} - -long wxListMainWindow::InsertColumn( long col, const wxListItem &item ) -{ - long idx = -1; - - m_dirty = true; - if ( InReportView() ) - { - wxListHeaderData *column = new wxListHeaderData( item ); - if (item.m_width == wxLIST_AUTOSIZE_USEHEADER) - column->SetWidth(ComputeMinHeaderWidth(column)); - - wxColWidthInfo *colWidthInfo = new wxColWidthInfo(0, IsVirtual()); - - bool insert = (col >= 0) && ((size_t)col < m_columns.GetCount()); - if ( insert ) - { - wxListHeaderDataList::compatibility_iterator - node = m_columns.Item( col ); - m_columns.Insert( node, column ); - m_aColWidths.Insert( colWidthInfo, col ); - idx = col; - } - else - { - idx = m_aColWidths.GetCount(); - m_columns.Append( column ); - m_aColWidths.Add( colWidthInfo ); - } - - if ( !IsVirtual() ) - { - // update all the items - for ( size_t i = 0; i < m_lines.GetCount(); i++ ) - { - wxListLineData * const line = GetLine(i); - wxListItemData * const data = new wxListItemData(this); - if ( insert ) - line->m_items.Insert(col, data); - else - line->m_items.Append(data); - } - } - - // invalidate it as it has to be recalculated - m_headerWidth = 0; - } - return idx; -} - -int wxListMainWindow::GetItemWidthWithImage(wxListItem * item) -{ - int width = 0; - wxClientDC dc(this); - - dc.SetFont( GetFont() ); - - if (item->GetImage() != -1) - { - int ix, iy; - GetImageSize( item->GetImage(), ix, iy ); - width += ix + 5; - } - - if (!item->GetText().empty()) - { - wxCoord w; - dc.GetTextExtent( item->GetText(), &w, NULL ); - width += w; - } - - return width; -} - -// ---------------------------------------------------------------------------- -// sorting -// ---------------------------------------------------------------------------- - -static wxListCtrlCompare list_ctrl_compare_func_2; -static wxIntPtr list_ctrl_compare_data; - -int LINKAGEMODE list_ctrl_compare_func_1( wxListLineData **arg1, wxListLineData **arg2 ) -{ - wxListLineData *line1 = *arg1; - wxListLineData *line2 = *arg2; - wxListItem item; - line1->GetItem( 0, item ); - wxUIntPtr data1 = item.m_data; - line2->GetItem( 0, item ); - wxUIntPtr data2 = item.m_data; - return list_ctrl_compare_func_2( data1, data2, list_ctrl_compare_data ); -} - -void wxListMainWindow::SortItems( wxListCtrlCompare fn, wxIntPtr data ) -{ - // selections won't make sense any more after sorting the items so reset - // them - HighlightAll(false); - ResetCurrent(); - - list_ctrl_compare_func_2 = fn; - list_ctrl_compare_data = data; - m_lines.Sort( list_ctrl_compare_func_1 ); - m_dirty = true; -} - -// ---------------------------------------------------------------------------- -// scrolling -// ---------------------------------------------------------------------------- - -void wxListMainWindow::OnScroll(wxScrollWinEvent& event) -{ - // update our idea of which lines are shown when we redraw the window the - // next time - ResetVisibleLinesRange(); - - if ( event.GetOrientation() == wxHORIZONTAL && HasHeader() ) - { - wxGenericListCtrl* lc = GetListCtrl(); - wxCHECK_RET( lc, wxT("no listctrl window?") ); - - if (lc->m_headerWin) // when we use wxLC_NO_HEADER, m_headerWin==NULL - { - lc->m_headerWin->Refresh(); - lc->m_headerWin->Update(); - } - } -} - -int wxListMainWindow::GetCountPerPage() const -{ - if ( !m_linesPerPage ) - { - wxConstCast(this, wxListMainWindow)-> - m_linesPerPage = GetClientSize().y / GetLineHeight(); - } - - return m_linesPerPage; -} - -void wxListMainWindow::GetVisibleLinesRange(size_t *from, size_t *to) -{ - wxASSERT_MSG( InReportView(), wxT("this is for report mode only") ); - - if ( m_lineFrom == (size_t)-1 ) - { - size_t count = GetItemCount(); - if ( count ) - { - m_lineFrom = GetListCtrl()->GetScrollPos(wxVERTICAL); - - // this may happen if SetScrollbars() hadn't been called yet - if ( m_lineFrom >= count ) - m_lineFrom = count - 1; - - // we redraw one extra line but this is needed to make the redrawing - // logic work when there is a fractional number of lines on screen - m_lineTo = m_lineFrom + m_linesPerPage; - if ( m_lineTo >= count ) - m_lineTo = count - 1; - } - else // empty control - { - m_lineFrom = 0; - m_lineTo = (size_t)-1; - } - } - - wxASSERT_MSG( IsEmpty() || - (m_lineFrom <= m_lineTo && m_lineTo < GetItemCount()), - wxT("GetVisibleLinesRange() returns incorrect result") ); - - if ( from ) - *from = m_lineFrom; - if ( to ) - *to = m_lineTo; -} - -size_t -wxListMainWindow::PrefixFindItem(size_t idParent, - const wxString& prefixOrig) const -{ - // if no items then just return - if ( idParent == (size_t)-1 ) - return idParent; - - // match is case insensitive as this is more convenient to the user: having - // to press Shift-letter to go to the item starting with a capital letter - // would be too bothersome - wxString prefix = prefixOrig.Lower(); - - // determine the starting point: we shouldn't take the current item (this - // allows to switch between two items starting with the same letter just by - // pressing it) but we shouldn't jump to the next one if the user is - // continuing to type as otherwise he might easily skip the item he wanted - size_t itemid = idParent; - if ( prefix.length() == 1 ) - { - itemid += 1; - } - - // look for the item starting with the given prefix after it - while ( ( itemid < (size_t)GetItemCount() ) && - !GetLine(itemid)->GetText(0).Lower().StartsWith(prefix) ) - { - itemid += 1; - } - - // if we haven't found anything... - if ( !( itemid < (size_t)GetItemCount() ) ) - { - // ... wrap to the beginning - itemid = 0; - - // and try all the items (stop when we get to the one we started from) - while ( ( itemid < (size_t)GetItemCount() ) && itemid != idParent && - !GetLine(itemid)->GetText(0).Lower().StartsWith(prefix) ) - { - itemid += 1; - } - // If we haven't found the item, id will be (size_t)-1, as per - // documentation - if ( !( itemid < (size_t)GetItemCount() ) || - ( ( itemid == idParent ) && - !GetLine(itemid)->GetText(0).Lower().StartsWith(prefix) ) ) - { - itemid = (size_t)-1; - } - } - - return itemid; -} - -// ------------------------------------------------------------------------------------- -// wxGenericListCtrl -// ------------------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxGenericListCtrl, wxControl); - -wxBEGIN_EVENT_TABLE(wxGenericListCtrl,wxListCtrlBase) - EVT_SIZE(wxGenericListCtrl::OnSize) - EVT_SCROLLWIN(wxGenericListCtrl::OnScroll) -wxEND_EVENT_TABLE() - -void wxGenericListCtrl::Init() -{ - m_imageListNormal = NULL; - m_imageListSmall = NULL; - m_imageListState = NULL; - - m_ownsImageListNormal = - m_ownsImageListSmall = - m_ownsImageListState = false; - - m_mainWin = NULL; - m_headerWin = NULL; -} - -wxGenericListCtrl::~wxGenericListCtrl() -{ - if (m_ownsImageListNormal) - delete m_imageListNormal; - if (m_ownsImageListSmall) - delete m_imageListSmall; - if (m_ownsImageListState) - delete m_imageListState; -} - -void wxGenericListCtrl::CreateOrDestroyHeaderWindowAsNeeded() -{ - bool needs_header = HasHeader(); - bool has_header = (m_headerWin != NULL); - - if (needs_header == has_header) - return; - - if (needs_header) - { - // Notice that we must initialize m_headerWin first, and create the - // real window only later, so that the test in the beginning of the - // function blocks repeated creation of the header as it could happen - // before via wxNavigationEnabled::AddChild() -> ToggleWindowStyle() -> - // SetWindowStyleFlag(). - m_headerWin = new wxListHeaderWindow(); - m_headerWin->Create - ( - this, wxID_ANY, m_mainWin, - wxPoint(0,0), - wxSize - ( - GetClientSize().x, - wxRendererNative::Get().GetHeaderButtonHeight(this) - ), - wxTAB_TRAVERSAL - ); - -#if defined( __WXMAC__ ) - static wxFont font( wxOSX_SYSTEM_FONT_SMALL ); - m_headerWin->SetFont( font ); -#endif - - GetSizer()->Prepend( m_headerWin, 0, wxGROW ); - } - else - { - GetSizer()->Detach( m_headerWin ); - - wxDELETE(m_headerWin); - } -} - -bool wxGenericListCtrl::Create(wxWindow *parent, - wxWindowID id, - const wxPoint &pos, - const wxSize &size, - long style, - const wxValidator &validator, - const wxString &name) -{ - Init(); - - // just like in other ports, an assert will fail if the user doesn't give any type style: - wxASSERT_MSG( (style & wxLC_MASK_TYPE), - wxT("wxListCtrl style should have exactly one mode bit set") ); - - if ( !wxListCtrlBase::Create( parent, id, pos, size, - style | wxVSCROLL | wxHSCROLL, - validator, name ) ) - return false; - - m_mainWin = new wxListMainWindow(this, wxID_ANY, wxPoint(0, 0), size); - - SetTargetWindow( m_mainWin ); - - // We use the cursor keys for moving the selection, not scrolling, so call - // this method to ensure wxScrollHelperEvtHandler doesn't catch all - // keyboard events forwarded to us from wxListMainWindow. - DisableKeyboardScrolling(); - - wxBoxSizer *sizer = new wxBoxSizer( wxVERTICAL ); - sizer->Add( m_mainWin, 1, wxGROW ); - SetSizer( sizer ); - - CreateOrDestroyHeaderWindowAsNeeded(); - - SetInitialSize(size); - - return true; -} - -wxBorder wxGenericListCtrl::GetDefaultBorder() const -{ - return wxBORDER_THEME; -} - -#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) -WXLRESULT wxGenericListCtrl::MSWWindowProc(WXUINT nMsg, - WXWPARAM wParam, - WXLPARAM lParam) -{ - WXLRESULT rc = wxListCtrlBase::MSWWindowProc(nMsg, wParam, lParam); - - // we need to process arrows ourselves for scrolling - if ( nMsg == WM_GETDLGCODE ) - { - rc |= DLGC_WANTARROWS; - } - - return rc; -} -#endif // __WXMSW__ - -wxSize wxGenericListCtrl::GetSizeAvailableForScrollTarget(const wxSize& size) -{ - wxSize newsize = size; - if (m_headerWin) - newsize.y -= m_headerWin->GetSize().y; - - return newsize; -} - -void wxGenericListCtrl::OnScroll(wxScrollWinEvent& event) -{ - // update our idea of which lines are shown when we redraw - // the window the next time - m_mainWin->ResetVisibleLinesRange(); - - if ( event.GetOrientation() == wxHORIZONTAL && HasHeader() ) - { - m_headerWin->Refresh(); - m_headerWin->Update(); - } - - // Let the window be scrolled as usual by the default handler. - event.Skip(); -} - -bool wxGenericListCtrl::HasCheckboxes() const -{ - if (!InReportView()) - return false; - - return m_mainWin->HasCheckboxes(); -} - -bool wxGenericListCtrl::EnableCheckboxes(bool enable) -{ - if (!InReportView()) - return false; - - return m_mainWin->EnableCheckboxes(enable); -} - -void wxGenericListCtrl::CheckItem(long item, bool state) -{ - if (InReportView()) - m_mainWin->CheckItem(item, state); -} - -bool wxGenericListCtrl::IsItemChecked(long item) const -{ - if (!InReportView()) - return false; - - return m_mainWin->IsItemChecked(item); -} - -void wxGenericListCtrl::SetSingleStyle( long style, bool add ) -{ - wxASSERT_MSG( !(style & wxLC_VIRTUAL), - wxT("wxLC_VIRTUAL can't be [un]set") ); - - long flag = GetWindowStyle(); - - if (add) - { - if (style & wxLC_MASK_TYPE) - flag &= ~(wxLC_MASK_TYPE | wxLC_VIRTUAL); - if (style & wxLC_MASK_ALIGN) - flag &= ~wxLC_MASK_ALIGN; - if (style & wxLC_MASK_SORT) - flag &= ~wxLC_MASK_SORT; - } - - if (add) - flag |= style; - else - flag &= ~style; - - // some styles can be set without recreating everything (as happens in - // SetWindowStyleFlag() which calls wxListMainWindow::DeleteEverything()) - if ( !(style & ~(wxLC_HRULES | wxLC_VRULES)) ) - { - Refresh(); - wxWindow::SetWindowStyleFlag(flag); - } - else - { - SetWindowStyleFlag( flag ); - } -} - -void wxGenericListCtrl::SetWindowStyleFlag( long flag ) -{ - // we add wxHSCROLL and wxVSCROLL in ctor unconditionally and it never - // makes sense to remove them as we'll always add scrollbars anyhow when - // needed - flag |= wxHSCROLL | wxVSCROLL; - - const bool wasInReportView = HasFlag(wxLC_REPORT); - - // update the window style first so that the header is created or destroyed - // corresponding to the new style - wxWindow::SetWindowStyleFlag( flag ); - - if (m_mainWin) - { - const bool inReportView = (flag & wxLC_REPORT) != 0; - if ( inReportView != wasInReportView ) - { - // we need to notify the main window about this change as it must - // update its data structures - m_mainWin->SetReportView(inReportView); - } - - // m_mainWin->DeleteEverything(); wxMSW doesn't do that - - CreateOrDestroyHeaderWindowAsNeeded(); - - GetSizer()->Layout(); - } -} - -bool wxGenericListCtrl::GetColumn(int col, wxListItem &item) const -{ - m_mainWin->GetColumn( col, item ); - return true; -} - -bool wxGenericListCtrl::SetColumn( int col, const wxListItem& item ) -{ - m_mainWin->SetColumn( col, item ); - return true; -} - -int wxGenericListCtrl::GetColumnWidth( int col ) const -{ - return m_mainWin->GetColumnWidth( col ); -} - -bool wxGenericListCtrl::SetColumnWidth( int col, int width ) -{ - m_mainWin->SetColumnWidth( col, width ); - return true; -} - -int wxGenericListCtrl::GetCountPerPage() const -{ - return m_mainWin->GetCountPerPage(); // different from Windows ? -} - -bool wxGenericListCtrl::GetItem( wxListItem &info ) const -{ - m_mainWin->GetItem( info ); - return true; -} - -bool wxGenericListCtrl::SetItem( wxListItem &info ) -{ - m_mainWin->SetItem( info ); - return true; -} - -long wxGenericListCtrl::SetItem( long index, int col, const wxString& label, int imageId ) -{ - wxListItem info; - info.m_text = label; - info.m_mask = wxLIST_MASK_TEXT; - info.m_itemId = index; - info.m_col = col; - if ( imageId > -1 ) - { - info.m_image = imageId; - info.m_mask |= wxLIST_MASK_IMAGE; - } - - m_mainWin->SetItem(info); - return true; -} - -int wxGenericListCtrl::GetItemState( long item, long stateMask ) const -{ - return m_mainWin->GetItemState( item, stateMask ); -} - -bool wxGenericListCtrl::SetItemState( long item, long state, long stateMask ) -{ - m_mainWin->SetItemState( item, state, stateMask ); - return true; -} - -bool -wxGenericListCtrl::SetItemImage( long item, int image, int WXUNUSED(selImage) ) -{ - return SetItemColumnImage(item, 0, image); -} - -bool -wxGenericListCtrl::SetItemColumnImage( long item, long column, int image ) -{ - wxListItem info; - info.m_image = image; - info.m_mask = wxLIST_MASK_IMAGE; - info.m_itemId = item; - info.m_col = column; - m_mainWin->SetItem( info ); - return true; -} - -wxString wxGenericListCtrl::GetItemText( long item, int col ) const -{ - return m_mainWin->GetItemText(item, col); -} - -void wxGenericListCtrl::SetItemText( long item, const wxString& str ) -{ - m_mainWin->SetItemText(item, str); -} - -wxUIntPtr wxGenericListCtrl::GetItemData( long item ) const -{ - wxListItem info; - info.m_mask = wxLIST_MASK_DATA; - info.m_itemId = item; - m_mainWin->GetItem( info ); - return info.m_data; -} - -bool wxGenericListCtrl::SetItemPtrData( long item, wxUIntPtr data ) -{ - wxListItem info; - info.m_mask = wxLIST_MASK_DATA; - info.m_itemId = item; - info.m_data = data; - m_mainWin->SetItem( info ); - return true; -} - -wxRect wxGenericListCtrl::GetViewRect() const -{ - return m_mainWin->GetViewRect(); -} - -bool wxGenericListCtrl::GetItemRect(long item, wxRect& rect, int code) const -{ - return GetSubItemRect(item, wxLIST_GETSUBITEMRECT_WHOLEITEM, rect, code); -} - -bool wxGenericListCtrl::GetSubItemRect(long item, - long subItem, - wxRect& rect, - int WXUNUSED(code)) const -{ - if ( !m_mainWin->GetSubItemRect( item, subItem, rect ) ) - return false; - - if ( m_mainWin->HasHeader() ) - rect.y += m_headerWin->GetSize().y + 1; - - return true; -} - -bool wxGenericListCtrl::GetItemPosition( long item, wxPoint& pos ) const -{ - m_mainWin->GetItemPosition( item, pos ); - return true; -} - -bool wxGenericListCtrl::SetItemPosition( long WXUNUSED(item), const wxPoint& WXUNUSED(pos) ) -{ - return false; -} - -int wxGenericListCtrl::GetItemCount() const -{ - return m_mainWin->GetItemCount(); -} - -int wxGenericListCtrl::GetColumnCount() const -{ - return m_mainWin->GetColumnCount(); -} - -void wxGenericListCtrl::SetItemSpacing( int spacing, bool isSmall ) -{ - m_mainWin->SetItemSpacing( spacing, isSmall ); -} - -wxSize wxGenericListCtrl::GetItemSpacing() const -{ - const int spacing = m_mainWin->GetItemSpacing(HasFlag(wxLC_SMALL_ICON)); - - return wxSize(spacing, spacing); -} - -void wxGenericListCtrl::SetItemTextColour( long item, const wxColour &col ) -{ - wxListItem info; - info.m_itemId = item; - info.SetTextColour( col ); - m_mainWin->SetItem( info ); -} - -wxColour wxGenericListCtrl::GetItemTextColour( long item ) const -{ - wxListItem info; - info.m_itemId = item; - m_mainWin->GetItem( info ); - return info.GetTextColour(); -} - -void wxGenericListCtrl::SetItemBackgroundColour( long item, const wxColour &col ) -{ - wxListItem info; - info.m_itemId = item; - info.SetBackgroundColour( col ); - m_mainWin->SetItem( info ); -} - -wxColour wxGenericListCtrl::GetItemBackgroundColour( long item ) const -{ - wxListItem info; - info.m_itemId = item; - m_mainWin->GetItem( info ); - return info.GetBackgroundColour(); -} - -void wxGenericListCtrl::SetItemFont( long item, const wxFont &f ) -{ - wxListItem info; - info.m_itemId = item; - info.SetFont( f ); - m_mainWin->SetItem( info ); -} - -wxFont wxGenericListCtrl::GetItemFont( long item ) const -{ - wxListItem info; - info.m_itemId = item; - m_mainWin->GetItem( info ); - return info.GetFont(); -} - -int wxGenericListCtrl::GetSelectedItemCount() const -{ - return m_mainWin->GetSelectedItemCount(); -} - -wxColour wxGenericListCtrl::GetTextColour() const -{ - return GetForegroundColour(); -} - -void wxGenericListCtrl::SetTextColour(const wxColour& col) -{ - SetForegroundColour(col); -} - -long wxGenericListCtrl::GetTopItem() const -{ - size_t top; - m_mainWin->GetVisibleLinesRange(&top, NULL); - return (long)top; -} - -long wxGenericListCtrl::GetNextItem( long item, int geom, int state ) const -{ - return m_mainWin->GetNextItem( item, geom, state ); -} - -wxImageList *wxGenericListCtrl::GetImageList(int which) const -{ - if (which == wxIMAGE_LIST_NORMAL) - return m_imageListNormal; - else if (which == wxIMAGE_LIST_SMALL) - return m_imageListSmall; - else if (which == wxIMAGE_LIST_STATE) - return m_imageListState; - - return NULL; -} - -void wxGenericListCtrl::SetImageList( wxImageList *imageList, int which ) -{ - if ( which == wxIMAGE_LIST_NORMAL ) - { - if (m_ownsImageListNormal) - delete m_imageListNormal; - m_imageListNormal = imageList; - m_ownsImageListNormal = false; - } - else if ( which == wxIMAGE_LIST_SMALL ) - { - if (m_ownsImageListSmall) - delete m_imageListSmall; - m_imageListSmall = imageList; - m_ownsImageListSmall = false; - } - else if ( which == wxIMAGE_LIST_STATE ) - { - if (m_ownsImageListState) - delete m_imageListState; - m_imageListState = imageList; - m_ownsImageListState = false; - } - - m_mainWin->SetImageList( imageList, which ); -} - -void wxGenericListCtrl::AssignImageList(wxImageList *imageList, int which) -{ - SetImageList(imageList, which); - if ( which == wxIMAGE_LIST_NORMAL ) - m_ownsImageListNormal = true; - else if ( which == wxIMAGE_LIST_SMALL ) - m_ownsImageListSmall = true; - else if ( which == wxIMAGE_LIST_STATE ) - m_ownsImageListState = true; -} - -bool wxGenericListCtrl::Arrange( int WXUNUSED(flag) ) -{ - return 0; -} - -bool wxGenericListCtrl::DeleteItem( long item ) -{ - m_mainWin->DeleteItem( item ); - return true; -} - -bool wxGenericListCtrl::DeleteAllItems() -{ - m_mainWin->DeleteAllItems(); - return true; -} - -bool wxGenericListCtrl::DeleteAllColumns() -{ - size_t count = m_mainWin->m_columns.GetCount(); - for ( size_t n = 0; n < count; n++ ) - DeleteColumn( 0 ); - return true; -} - -void wxGenericListCtrl::ClearAll() -{ - m_mainWin->DeleteEverything(); -} - -bool wxGenericListCtrl::DeleteColumn( int col ) -{ - m_mainWin->DeleteColumn( col ); - - // if we don't have the header any longer, we need to relayout the window - // if ( !GetColumnCount() ) - - - // Ensure that the non-existent columns are really removed from display. - Refresh(); - - return true; -} - -wxTextCtrl *wxGenericListCtrl::EditLabel(long item, - wxClassInfo* textControlClass) -{ - return m_mainWin->EditLabel( item, textControlClass ); -} - -bool wxGenericListCtrl::EndEditLabel(bool cancel) -{ - return m_mainWin->EndEditLabel(cancel); -} - -wxTextCtrl *wxGenericListCtrl::GetEditControl() const -{ - return m_mainWin->GetEditControl(); -} - -bool wxGenericListCtrl::EnsureVisible( long item ) -{ - m_mainWin->EnsureVisible( item ); - return true; -} - -long wxGenericListCtrl::FindItem( long start, const wxString& str, bool partial ) -{ - return m_mainWin->FindItem( start, str, partial ); -} - -long wxGenericListCtrl::FindItem( long start, wxUIntPtr data ) -{ - return m_mainWin->FindItem( start, data ); -} - -long wxGenericListCtrl::FindItem( long WXUNUSED(start), const wxPoint& pt, - int WXUNUSED(direction)) -{ - return m_mainWin->FindItem( pt ); -} - -// TODO: sub item hit testing -long wxGenericListCtrl::HitTest(const wxPoint& point, int& flags, long *) const -{ - return m_mainWin->HitTest( (int)point.x, (int)point.y, flags ); -} - -long wxGenericListCtrl::InsertItem( wxListItem& info ) -{ - m_mainWin->InsertItem( info ); - return info.m_itemId; -} - -long wxGenericListCtrl::InsertItem( long index, const wxString &label ) -{ - wxListItem info; - info.m_text = label; - info.m_mask = wxLIST_MASK_TEXT; - info.m_itemId = index; - return InsertItem( info ); -} - -long wxGenericListCtrl::InsertItem( long index, int imageIndex ) -{ - wxListItem info; - info.m_mask = wxLIST_MASK_IMAGE; - info.m_image = imageIndex; - info.m_itemId = index; - return InsertItem( info ); -} - -long wxGenericListCtrl::InsertItem( long index, const wxString &label, int imageIndex ) -{ - wxListItem info; - info.m_text = label; - info.m_image = imageIndex; - info.m_mask = wxLIST_MASK_TEXT; - if (imageIndex > -1) - info.m_mask |= wxLIST_MASK_IMAGE; - info.m_itemId = index; - return InsertItem( info ); -} - -long wxGenericListCtrl::DoInsertColumn( long col, const wxListItem &item ) -{ - wxCHECK_MSG( InReportView(), -1, wxT("can't add column in non report mode") ); - - long idx = m_mainWin->InsertColumn( col, item ); - - // NOTE: if wxLC_NO_HEADER was given, then we are in report view mode but - // still have m_headerWin==NULL - if (m_headerWin) - m_headerWin->Refresh(); - - return idx; -} - -bool wxGenericListCtrl::ScrollList( int dx, int dy ) -{ - return m_mainWin->ScrollList(dx, dy); -} - -// Sort items. -// fn is a function which takes 3 long arguments: item1, item2, data. -// item1 is the long data associated with a first item (NOT the index). -// item2 is the long data associated with a second item (NOT the index). -// data is the same value as passed to SortItems. -// The return value is a negative number if the first item should precede the second -// item, a positive number of the second item should precede the first, -// or zero if the two items are equivalent. -// data is arbitrary data to be passed to the sort function. - -bool wxGenericListCtrl::SortItems( wxListCtrlCompare fn, wxIntPtr data ) -{ - m_mainWin->SortItems( fn, data ); - return true; -} - -// ---------------------------------------------------------------------------- -// event handlers -// ---------------------------------------------------------------------------- - -void wxGenericListCtrl::OnSize(wxSizeEvent& WXUNUSED(event)) -{ - if (!m_mainWin) return; - - // We need to override OnSize so that our scrolled - // window a) does call Layout() to use sizers for - // positioning the controls but b) does not query - // the sizer for their size and use that for setting - // the scrollable area as set that ourselves by - // calling SetScrollbar() further down. - - Layout(); - - m_mainWin->RecalculatePositions(); - - AdjustScrollbars(); -} - -void wxGenericListCtrl::OnInternalIdle() -{ - wxWindow::OnInternalIdle(); - - if (m_mainWin->m_dirty) - m_mainWin->RecalculatePositions(); -} - -// ---------------------------------------------------------------------------- -// font/colours -// ---------------------------------------------------------------------------- - -bool wxGenericListCtrl::SetBackgroundColour( const wxColour &colour ) -{ - if ( !wxWindow::SetBackgroundColour( colour ) ) - return false; - - if (m_mainWin) - { - m_mainWin->SetBackgroundColour( colour ); - m_mainWin->m_dirty = true; - } - - return true; -} - -bool wxGenericListCtrl::SetForegroundColour( const wxColour &colour ) -{ - if ( !wxWindow::SetForegroundColour( colour ) ) - return false; - - if (m_mainWin) - { - m_mainWin->SetForegroundColour( colour ); - m_mainWin->m_dirty = true; - } - - return true; -} - -bool wxGenericListCtrl::SetFont( const wxFont &font ) -{ - if ( !wxWindow::SetFont( font ) ) - return false; - - if (m_mainWin) - { - m_mainWin->SetFont( font ); - m_mainWin->m_dirty = true; - } - - if (m_headerWin) - { - m_headerWin->SetFont( font ); - // CalculateAndSetHeaderHeight(); - } - - Refresh(); - - return true; -} - -// static -wxVisualAttributes -wxGenericListCtrl::GetClassDefaultAttributes(wxWindowVariant variant) -{ -#if _USE_VISATTR - // Use the same color scheme as wxListBox - return wxListBox::GetClassDefaultAttributes(variant); -#else - wxUnusedVar(variant); - wxVisualAttributes attr; - attr.colFg = wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOXTEXT); - attr.colBg = wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX); - attr.font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); - return attr; -#endif -} - -// ---------------------------------------------------------------------------- -// methods forwarded to m_mainWin -// ---------------------------------------------------------------------------- - -#if wxUSE_DRAG_AND_DROP - -void wxGenericListCtrl::SetDropTarget( wxDropTarget *dropTarget ) -{ - m_mainWin->SetDropTarget( dropTarget ); -} - -wxDropTarget *wxGenericListCtrl::GetDropTarget() const -{ - return m_mainWin->GetDropTarget(); -} - -#endif - -bool wxGenericListCtrl::SetCursor( const wxCursor &cursor ) -{ - return m_mainWin ? m_mainWin->wxWindow::SetCursor(cursor) : false; -} - -wxColour wxGenericListCtrl::GetBackgroundColour() const -{ - return m_mainWin ? m_mainWin->GetBackgroundColour() : wxColour(); -} - -wxColour wxGenericListCtrl::GetForegroundColour() const -{ - return m_mainWin ? m_mainWin->GetForegroundColour() : wxColour(); -} - -bool wxGenericListCtrl::DoPopupMenu( wxMenu *menu, int x, int y ) -{ -#if wxUSE_MENUS - return m_mainWin->PopupMenu( menu, x, y ); -#else - return false; -#endif -} - -wxSize wxGenericListCtrl::DoGetBestClientSize() const -{ - // The base class version can compute the best size in report view only. - wxSize sizeBest = wxListCtrlBase::DoGetBestClientSize(); - - if ( !InReportView() ) - { - // Ensure that our minimal width is at least big enough to show all our - // items. This is important for wxListbook to size itself correctly. - - // Remember the offset of the first item: this corresponds to the - // margins around the item so we will add it to the minimal size below - // to ensure that we have equal margins on all sides. - wxPoint ofs; - - // We can iterate over all items as there shouldn't be too many of them - // in non-report view. If it ever becomes a problem, we could examine - // just the first few items probably, the determination of the best - // size is less important if we will need scrollbars anyhow. - for ( int n = 0; n < GetItemCount(); n++ ) - { - const wxRect itemRect = m_mainWin->GetLineRect(n); - if ( !n ) - { - // Remember the position of the first item as all the rest are - // offset by at least this number of pixels too. - ofs = itemRect.GetPosition(); - } - - sizeBest.IncTo(itemRect.GetSize()); - } - - sizeBest.IncBy(2*ofs); - - - // If we have the scrollbars we need to account for them too. And to - // make sure the scrollbars status is up to date we need to call this - // function to set them. - m_mainWin->RecalculatePositions(true /* no refresh */); - - // Unfortunately we can't use wxWindow::HasScrollbar() here as we need - // to use m_mainWin client/virtual size for determination of whether we - // use scrollbars and not the size of this window itself. Maybe that - // function should be extended to work correctly in the case when our - // scrollbars manage a different window from this one but currently it - // doesn't work. - const wxSize sizeClient = m_mainWin->GetClientSize(); - const wxSize sizeVirt = m_mainWin->GetVirtualSize(); - - if ( sizeVirt.x > sizeClient.x /* HasScrollbar(wxHORIZONTAL) */ ) - sizeBest.y += wxSystemSettings::GetMetric(wxSYS_HSCROLL_Y); - - if ( sizeVirt.y > sizeClient.y /* HasScrollbar(wxVERTICAL) */ ) - sizeBest.x += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X); - } - - return sizeBest; -} - -// ---------------------------------------------------------------------------- -// virtual list control support -// ---------------------------------------------------------------------------- - -wxString wxGenericListCtrl::OnGetItemText(long WXUNUSED(item), long WXUNUSED(col)) const -{ - // this is a pure virtual function, in fact - which is not really pure - // because the controls which are not virtual don't need to implement it - wxFAIL_MSG( wxT("wxGenericListCtrl::OnGetItemText not supposed to be called") ); - - return wxEmptyString; -} - -int wxGenericListCtrl::OnGetItemImage(long WXUNUSED(item)) const -{ - wxCHECK_MSG(!GetImageList(wxIMAGE_LIST_SMALL), - -1, - wxT("List control has an image list, OnGetItemImage or OnGetItemColumnImage should be overridden.")); - return -1; -} - -int wxGenericListCtrl::OnGetItemColumnImage(long item, long column) const -{ - if (!column) - return OnGetItemImage(item); - - return -1; -} - -void wxGenericListCtrl::SetItemCount(long count) -{ - wxASSERT_MSG( IsVirtual(), wxT("this is for virtual controls only") ); - - m_mainWin->SetItemCount(count); -} - -void wxGenericListCtrl::RefreshItem(long item) -{ - m_mainWin->RefreshLine(item); -} - -void wxGenericListCtrl::RefreshItems(long itemFrom, long itemTo) -{ - m_mainWin->RefreshLines(itemFrom, itemTo); -} - -void wxGenericListCtrl::EnableBellOnNoMatch( bool on ) -{ - m_mainWin->EnableBellOnNoMatch(on); -} - -// Generic wxListCtrl is more or less a container for two other -// windows which drawings are done upon. These are namely -// 'm_headerWin' and 'm_mainWin'. -// Here we override 'virtual wxWindow::Refresh()' to mimic the -// behaviour wxListCtrl has under wxMSW. -// -void wxGenericListCtrl::Refresh(bool eraseBackground, const wxRect *rect) -{ - if (!rect) - { - // The easy case, no rectangle specified. - if (m_headerWin) - m_headerWin->Refresh(eraseBackground); - - if (m_mainWin) - m_mainWin->Refresh(eraseBackground); - } - else - { - // Refresh the header window - if (m_headerWin) - { - wxRect rectHeader = m_headerWin->GetRect(); - rectHeader.Intersect(*rect); - if (rectHeader.GetWidth() && rectHeader.GetHeight()) - { - int x, y; - m_headerWin->GetPosition(&x, &y); - rectHeader.Offset(-x, -y); - m_headerWin->Refresh(eraseBackground, &rectHeader); - } - } - - // Refresh the main window - if (m_mainWin) - { - wxRect rectMain = m_mainWin->GetRect(); - rectMain.Intersect(*rect); - if (rectMain.GetWidth() && rectMain.GetHeight()) - { - int x, y; - m_mainWin->GetPosition(&x, &y); - rectMain.Offset(-x, -y); - m_mainWin->Refresh(eraseBackground, &rectMain); - } - } - } -} - -void wxGenericListCtrl::Update() -{ - if ( m_mainWin ) - { - if ( m_mainWin->m_dirty ) - m_mainWin->RecalculatePositions(); - - m_mainWin->Update(); - } - - if ( m_headerWin ) - m_headerWin->Update(); -} - -#endif // wxUSE_LISTCTRL diff --git a/Externals/wxWidgets3/src/generic/logg.cpp b/Externals/wxWidgets3/src/generic/logg.cpp deleted file mode 100644 index 36c832d389..0000000000 --- a/Externals/wxWidgets3/src/generic/logg.cpp +++ /dev/null @@ -1,1070 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/generic/logg.cpp -// Purpose: wxLog-derived classes which need GUI support (the rest is in -// src/common/log.cpp) -// Author: Vadim Zeitlin -// Modified by: -// Created: 20.09.99 (extracted from src/common/log.cpp) -// Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#ifndef WX_PRECOMP - #include "wx/app.h" - #include "wx/button.h" - #include "wx/intl.h" - #include "wx/log.h" - #include "wx/menu.h" - #include "wx/frame.h" - #include "wx/filedlg.h" - #include "wx/msgdlg.h" - #include "wx/textctrl.h" - #include "wx/sizer.h" - #include "wx/statbmp.h" - #include "wx/settings.h" - #include "wx/wxcrtvararg.h" -#endif // WX_PRECOMP - -#if wxUSE_LOGGUI || wxUSE_LOGWINDOW - -#include "wx/file.h" -#include "wx/clipbrd.h" -#include "wx/dataobj.h" -#include "wx/textfile.h" -#include "wx/statline.h" -#include "wx/artprov.h" -#include "wx/collpane.h" -#include "wx/arrstr.h" -#include "wx/msgout.h" -#include "wx/scopeguard.h" - -#ifdef __WXMSW__ - // for OutputDebugString() - #include "wx/msw/private.h" -#endif // Windows - - -#if wxUSE_LOG_DIALOG - #include "wx/listctrl.h" - #include "wx/imaglist.h" - #include "wx/image.h" -#endif // wxUSE_LOG_DIALOG/!wxUSE_LOG_DIALOG - -#include "wx/time.h" - -#define CAN_SAVE_FILES (wxUSE_FILE && wxUSE_FILEDLG) - -// ---------------------------------------------------------------------------- -// private classes -// ---------------------------------------------------------------------------- - -#if wxUSE_LOG_DIALOG - -// this function is a wrapper around strftime(3) -// allows to exclude the usage of wxDateTime -static wxString TimeStamp(const wxString& format, time_t t) -{ - wxChar buf[4096]; - struct tm tm; - if ( !wxStrftime(buf, WXSIZEOF(buf), format, wxLocaltime_r(&t, &tm)) ) - { - // buffer is too small? - wxFAIL_MSG(wxT("strftime() failed")); - } - return wxString(buf); -} - - -class wxLogDialog : public wxDialog -{ -public: - wxLogDialog(wxWindow *parent, - const wxArrayString& messages, - const wxArrayInt& severity, - const wxArrayLong& timess, - const wxString& caption, - long style); - virtual ~wxLogDialog(); - - // event handlers - void OnOk(wxCommandEvent& event); -#if wxUSE_CLIPBOARD - void OnCopy(wxCommandEvent& event); -#endif // wxUSE_CLIPBOARD -#if CAN_SAVE_FILES - void OnSave(wxCommandEvent& event); -#endif // CAN_SAVE_FILES - void OnListItemActivated(wxListEvent& event); - -private: - // create controls needed for the details display - void CreateDetailsControls(wxWindow *); - - // if necessary truncates the given string and adds an ellipsis - wxString EllipsizeString(const wxString &text) - { - if (ms_maxLength > 0 && - text.length() > ms_maxLength) - { - wxString ret(text); - ret.Truncate(ms_maxLength); - ret << "..."; - return ret; - } - - return text; - } - -#if CAN_SAVE_FILES || wxUSE_CLIPBOARD - // return the contents of the dialog as a multiline string - wxString GetLogMessages() const; -#endif // CAN_SAVE_FILES || wxUSE_CLIPBOARD - - - // the data for the listctrl - wxArrayString m_messages; - wxArrayInt m_severity; - wxArrayLong m_times; - - // the controls which are not shown initially (but only when details - // button is pressed) - wxListCtrl *m_listctrl; - - // the translated "Details" string - static wxString ms_details; - - // the maximum length of the log message - static size_t ms_maxLength; - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_NO_COPY_CLASS(wxLogDialog); -}; - -wxBEGIN_EVENT_TABLE(wxLogDialog, wxDialog) - EVT_BUTTON(wxID_OK, wxLogDialog::OnOk) -#if wxUSE_CLIPBOARD - EVT_BUTTON(wxID_COPY, wxLogDialog::OnCopy) -#endif // wxUSE_CLIPBOARD -#if CAN_SAVE_FILES - EVT_BUTTON(wxID_SAVE, wxLogDialog::OnSave) -#endif // CAN_SAVE_FILES - EVT_LIST_ITEM_ACTIVATED(wxID_ANY, wxLogDialog::OnListItemActivated) -wxEND_EVENT_TABLE() - -#endif // wxUSE_LOG_DIALOG - -// ---------------------------------------------------------------------------- -// private functions -// ---------------------------------------------------------------------------- - -#if CAN_SAVE_FILES - -// pass an uninitialized file object, the function will ask the user for the -// filename and try to open it, returns true on success (file was opened), -// false if file couldn't be opened/created and -1 if the file selection -// dialog was cancelled -static int OpenLogFile(wxFile& file, wxString *filename = NULL, wxWindow *parent = NULL); - -#endif // CAN_SAVE_FILES - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxLogGui implementation (FIXME MT-unsafe) -// ---------------------------------------------------------------------------- - -#if wxUSE_LOGGUI - -wxLogGui::wxLogGui() -{ - Clear(); -} - -void wxLogGui::Clear() -{ - m_bErrors = - m_bWarnings = - m_bHasMessages = false; - - m_aMessages.Empty(); - m_aSeverity.Empty(); - m_aTimes.Empty(); -} - -int wxLogGui::GetSeverityIcon() const -{ - return m_bErrors ? wxICON_STOP - : m_bWarnings ? wxICON_EXCLAMATION - : wxICON_INFORMATION; -} - -wxString wxLogGui::GetTitle() const -{ - wxString titleFormat; - switch ( GetSeverityIcon() ) - { - case wxICON_STOP: - titleFormat = _("%s Error"); - break; - - case wxICON_EXCLAMATION: - titleFormat = _("%s Warning"); - break; - - default: - wxFAIL_MSG( "unexpected icon severity" ); - wxFALLTHROUGH; - - case wxICON_INFORMATION: - titleFormat = _("%s Information"); - } - - return wxString::Format(titleFormat, wxTheApp->GetAppDisplayName()); -} - -void -wxLogGui::DoShowSingleLogMessage(const wxString& message, - const wxString& title, - int style) -{ - wxMessageBox(message, title, wxOK | style); -} - -void -wxLogGui::DoShowMultipleLogMessages(const wxArrayString& messages, - const wxArrayInt& severities, - const wxArrayLong& times, - const wxString& title, - int style) -{ -#if wxUSE_LOG_DIALOG - wxLogDialog dlg(NULL, - messages, severities, times, - title, style); - - // clear the message list before showing the dialog because while it's - // shown some new messages may appear - Clear(); - - (void)dlg.ShowModal(); -#else // !wxUSE_LOG_DIALOG - // start from the most recent message - wxString message; - const size_t nMsgCount = messages.size(); - message.reserve(nMsgCount*100); - for ( size_t n = nMsgCount; n > 0; n-- ) { - message << m_aMessages[n - 1] << wxT("\n"); - } - - DoShowSingleLogMessage(message, title, style); -#endif // wxUSE_LOG_DIALOG/!wxUSE_LOG_DIALOG -} - -void wxLogGui::Flush() -{ - wxLog::Flush(); - - if ( !m_bHasMessages ) - return; - - // do it right now to block any new calls to Flush() while we're here - m_bHasMessages = false; - - // note that this must be done before examining m_aMessages as it may log - // yet another message - const unsigned repeatCount = LogLastRepeatIfNeeded(); - - const size_t nMsgCount = m_aMessages.size(); - - if ( repeatCount > 0 ) - { - m_aMessages[nMsgCount - 1] << " (" << m_aMessages[nMsgCount - 2] << ")"; - } - - const wxString title = GetTitle(); - const int style = GetSeverityIcon(); - - // avoid showing other log dialogs until we're done with the dialog we're - // showing right now: nested modal dialogs make for really bad UI! - Suspend(); - - // and ensure that we allow showing the log again afterwards, even if an - // exception is thrown - wxON_BLOCK_EXIT0(wxLog::Resume); - - if ( nMsgCount == 1 ) - { - // make a copy before calling Clear() - const wxString message(m_aMessages[0]); - Clear(); - - DoShowSingleLogMessage(message, title, style); - } - else // more than one message - { - wxArrayString messages; - wxArrayInt severities; - wxArrayLong times; - - messages.swap(m_aMessages); - severities.swap(m_aSeverity); - times.swap(m_aTimes); - - Clear(); - - DoShowMultipleLogMessages(messages, severities, times, title, style); - } -} - -// log all kinds of messages -void wxLogGui::DoLogRecord(wxLogLevel level, - const wxString& msg, - const wxLogRecordInfo& info) -{ - switch ( level ) - { - case wxLOG_Info: - case wxLOG_Message: - { - m_aMessages.Add(msg); - m_aSeverity.Add(wxLOG_Message); - m_aTimes.Add((long)info.timestamp); - m_bHasMessages = true; - } - break; - - case wxLOG_Status: -#if wxUSE_STATUSBAR - { - wxFrame *pFrame = NULL; - - // check if the frame was passed to us explicitly - wxUIntPtr ptr = 0; - if ( info.GetNumValue(wxLOG_KEY_FRAME, &ptr) ) - { - pFrame = static_cast(wxUIntToPtr(ptr)); - } - - // find the top window and set it's status text if it has any - if ( pFrame == NULL ) { - wxWindow *pWin = wxTheApp->GetTopWindow(); - if ( wxDynamicCast(pWin, wxFrame) ) { - pFrame = (wxFrame *)pWin; - } - } - - if ( pFrame && pFrame->GetStatusBar() ) - pFrame->SetStatusText(msg); - } -#endif // wxUSE_STATUSBAR - break; - - case wxLOG_Error: - if ( !m_bErrors ) { -#if !wxUSE_LOG_DIALOG - // discard earlier informational messages if this is the 1st - // error because they might not make sense any more and showing - // them in a message box might be confusing - m_aMessages.Empty(); - m_aSeverity.Empty(); - m_aTimes.Empty(); -#endif // wxUSE_LOG_DIALOG - m_bErrors = true; - } - wxFALLTHROUGH; - - case wxLOG_Warning: - if ( !m_bErrors ) { - // for the warning we don't discard the info messages - m_bWarnings = true; - } - - m_aMessages.Add(msg); - m_aSeverity.Add((int)level); - m_aTimes.Add((long)info.timestamp); - m_bHasMessages = true; - break; - - case wxLOG_Debug: - case wxLOG_Trace: - // let the base class deal with debug/trace messages - wxLog::DoLogRecord(level, msg, info); - break; - - case wxLOG_FatalError: - case wxLOG_Max: - // fatal errors are shown immediately and terminate the program so - // we should never see them here - wxFAIL_MSG("unexpected log level"); - break; - - case wxLOG_Progress: - case wxLOG_User: - // just ignore those: passing them to the base class would result - // in asserts from DoLogText() because DoLogTextAtLevel() would - // call it as it doesn't know how to handle these levels otherwise - break; - } -} - -#endif // wxUSE_LOGGUI - -// ---------------------------------------------------------------------------- -// wxLogWindow and wxLogFrame implementation -// ---------------------------------------------------------------------------- - -#if wxUSE_LOGWINDOW - -// log frame class -// --------------- -class wxLogFrame : public wxFrame -{ -public: - // ctor & dtor - wxLogFrame(wxWindow *pParent, wxLogWindow *log, const wxString& szTitle); - virtual ~wxLogFrame(); - - // Don't prevent the application from exiting if just this frame remains. - virtual bool ShouldPreventAppExit() const wxOVERRIDE { return false; } - - // menu callbacks - void OnClose(wxCommandEvent& event); - void OnCloseWindow(wxCloseEvent& event); -#if CAN_SAVE_FILES - void OnSave(wxCommandEvent& event); -#endif // CAN_SAVE_FILES - void OnClear(wxCommandEvent& event); - - // do show the message in the text control - void ShowLogMessage(const wxString& message) - { - m_pTextCtrl->AppendText(message + wxS('\n')); - } - -private: - // use standard ids for our commands! - enum - { - Menu_Close = wxID_CLOSE, - Menu_Save = wxID_SAVE, - Menu_Clear = wxID_CLEAR - }; - - // common part of OnClose() and OnCloseWindow() - void DoClose(); - - wxTextCtrl *m_pTextCtrl; - wxLogWindow *m_log; - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_NO_COPY_CLASS(wxLogFrame); -}; - -wxBEGIN_EVENT_TABLE(wxLogFrame, wxFrame) - // wxLogWindow menu events - EVT_MENU(Menu_Close, wxLogFrame::OnClose) -#if CAN_SAVE_FILES - EVT_MENU(Menu_Save, wxLogFrame::OnSave) -#endif // CAN_SAVE_FILES - EVT_MENU(Menu_Clear, wxLogFrame::OnClear) - - EVT_CLOSE(wxLogFrame::OnCloseWindow) -wxEND_EVENT_TABLE() - -wxLogFrame::wxLogFrame(wxWindow *pParent, wxLogWindow *log, const wxString& szTitle) - : wxFrame(pParent, wxID_ANY, szTitle) -{ - m_log = log; - - m_pTextCtrl = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, - wxDefaultSize, - wxTE_MULTILINE | - wxHSCROLL | - // needed for Win32 to avoid 65Kb limit but it doesn't work well - // when using RichEdit 2.0 which we always do in the Unicode build -#if !wxUSE_UNICODE - wxTE_RICH | -#endif // !wxUSE_UNICODE - wxTE_READONLY); - -#if wxUSE_MENUS - // create menu - wxMenuBar *pMenuBar = new wxMenuBar; - wxMenu *pMenu = new wxMenu; -#if CAN_SAVE_FILES - pMenu->Append(Menu_Save, _("Save &As..."), _("Save log contents to file")); -#endif // CAN_SAVE_FILES - pMenu->Append(Menu_Clear, _("C&lear"), _("Clear the log contents")); - pMenu->AppendSeparator(); - pMenu->Append(Menu_Close, _("&Close"), _("Close this window")); - pMenuBar->Append(pMenu, _("&Log")); - SetMenuBar(pMenuBar); -#endif // wxUSE_MENUS - -#if wxUSE_STATUSBAR - // status bar for menu prompts - CreateStatusBar(); -#endif // wxUSE_STATUSBAR -} - -void wxLogFrame::DoClose() -{ - if ( m_log->OnFrameClose(this) ) - { - // instead of closing just hide the window to be able to Show() it - // later - Show(false); - } -} - -void wxLogFrame::OnClose(wxCommandEvent& WXUNUSED(event)) -{ - DoClose(); -} - -void wxLogFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event)) -{ - DoClose(); -} - -#if CAN_SAVE_FILES -void wxLogFrame::OnSave(wxCommandEvent& WXUNUSED(event)) -{ - wxString filename; - wxFile file; - int rc = OpenLogFile(file, &filename, this); - if ( rc == -1 ) - { - // cancelled - return; - } - - bool bOk = rc != 0; - - // retrieve text and save it - // ------------------------- - int nLines = m_pTextCtrl->GetNumberOfLines(); - for ( int nLine = 0; bOk && nLine < nLines; nLine++ ) { - bOk = file.Write(m_pTextCtrl->GetLineText(nLine) + - wxTextFile::GetEOL()); - } - - if ( bOk ) - bOk = file.Close(); - - if ( !bOk ) { - wxLogError(_("Can't save log contents to file.")); - } - else { - wxLogStatus((wxFrame*)this, _("Log saved to the file '%s'."), filename.c_str()); - } -} -#endif // CAN_SAVE_FILES - -void wxLogFrame::OnClear(wxCommandEvent& WXUNUSED(event)) -{ - m_pTextCtrl->Clear(); -} - -wxLogFrame::~wxLogFrame() -{ - m_log->OnFrameDelete(this); -} - -// wxLogWindow -// ----------- - -wxLogWindow::wxLogWindow(wxWindow *pParent, - const wxString& szTitle, - bool bShow, - bool bDoPass) -{ - // Initialize it to NULL to ensure that we don't crash if any log messages - // are generated before the frame is fully created (while this doesn't - // happen normally, it might, in principle). - m_pLogFrame = NULL; - - PassMessages(bDoPass); - - m_pLogFrame = new wxLogFrame(pParent, this, szTitle); - - if ( bShow ) - m_pLogFrame->Show(); -} - -void wxLogWindow::Show(bool bShow) -{ - m_pLogFrame->Show(bShow); -} - -void wxLogWindow::DoLogTextAtLevel(wxLogLevel level, const wxString& msg) -{ - if ( !m_pLogFrame ) - return; - - // don't put trace messages in the text window for 2 reasons: - // 1) there are too many of them - // 2) they may provoke other trace messages (e.g. wxMSW code uses - // wxLogTrace to log Windows messages and adding text to the control - // sends more of them) thus sending a program into an infinite loop - if ( level == wxLOG_Trace ) - return; - - m_pLogFrame->ShowLogMessage(msg); -} - -wxFrame *wxLogWindow::GetFrame() const -{ - return m_pLogFrame; -} - -bool wxLogWindow::OnFrameClose(wxFrame * WXUNUSED(frame)) -{ - // allow to close - return true; -} - -void wxLogWindow::OnFrameDelete(wxFrame * WXUNUSED(frame)) -{ - m_pLogFrame = NULL; -} - -wxLogWindow::~wxLogWindow() -{ - // may be NULL if log frame already auto destroyed itself - delete m_pLogFrame; -} - -#endif // wxUSE_LOGWINDOW - -// ---------------------------------------------------------------------------- -// wxLogDialog -// ---------------------------------------------------------------------------- - -#if wxUSE_LOG_DIALOG - -wxString wxLogDialog::ms_details; -size_t wxLogDialog::ms_maxLength = 0; - -wxLogDialog::wxLogDialog(wxWindow *parent, - const wxArrayString& messages, - const wxArrayInt& severity, - const wxArrayLong& times, - const wxString& caption, - long style) - : wxDialog(parent, wxID_ANY, caption, - wxDefaultPosition, wxDefaultSize, - wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) -{ - // init the static variables: - - if ( ms_details.empty() ) - { - // ensure that we won't loop here if wxGetTranslation() - // happens to pop up a Log message while translating this :-) - ms_details = wxTRANSLATE("&Details"); - ms_details = wxGetTranslation(ms_details); - } - - if ( ms_maxLength == 0 ) - { - ms_maxLength = (2 * wxGetDisplaySize().x/3) / GetCharWidth(); - } - - size_t count = messages.GetCount(); - m_messages.Alloc(count); - m_severity.Alloc(count); - m_times.Alloc(count); - - for ( size_t n = 0; n < count; n++ ) - { - m_messages.Add(messages[n]); - m_severity.Add(severity[n]); - m_times.Add(times[n]); - } - - m_listctrl = NULL; - - bool isPda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA); - - // create the controls which are always shown and layout them: we use - // sizers even though our window is not resizable to calculate the size of - // the dialog properly - wxBoxSizer *sizerTop = new wxBoxSizer(wxVERTICAL); - wxBoxSizer *sizerAll = new wxBoxSizer(isPda ? wxVERTICAL : wxHORIZONTAL); - - if (!isPda) - { - wxStaticBitmap *icon = new wxStaticBitmap - ( - this, - wxID_ANY, - wxArtProvider::GetMessageBoxIcon(style) - ); - sizerAll->Add(icon, wxSizerFlags().Centre()); - } - - // create the text sizer with a minimal size so that we are sure it won't be too small - wxString message = EllipsizeString(messages.Last()); - wxSizer *szText = CreateTextSizer(message); - szText->SetMinSize(wxMin(300, wxGetDisplaySize().x / 3), -1); - - sizerAll->Add(szText, wxSizerFlags(1).Centre().Border(wxLEFT | wxRIGHT)); - - wxButton *btnOk = new wxButton(this, wxID_OK); - sizerAll->Add(btnOk, wxSizerFlags().Centre()); - - sizerTop->Add(sizerAll, wxSizerFlags().Expand().Border()); - - - // add the details pane -#if wxUSE_COLLPANE - wxCollapsiblePane * const - collpane = new wxCollapsiblePane(this, wxID_ANY, ms_details); - sizerTop->Add(collpane, wxSizerFlags(1).Expand().Border()); - - wxWindow *win = collpane->GetPane(); -#else - wxPanel* win = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, - wxBORDER_NONE); -#endif - wxSizer * const paneSz = new wxBoxSizer(wxVERTICAL); - - CreateDetailsControls(win); - - paneSz->Add(m_listctrl, wxSizerFlags(1).Expand().Border(wxTOP)); - -#if wxUSE_CLIPBOARD || CAN_SAVE_FILES - wxBoxSizer * const btnSizer = new wxBoxSizer(wxHORIZONTAL); - - wxSizerFlags flagsBtn; - flagsBtn.Border(wxLEFT); - -#if wxUSE_CLIPBOARD - btnSizer->Add(new wxButton(win, wxID_COPY), flagsBtn); -#endif // wxUSE_CLIPBOARD - -#if CAN_SAVE_FILES - btnSizer->Add(new wxButton(win, wxID_SAVE), flagsBtn); -#endif // CAN_SAVE_FILES - - paneSz->Add(btnSizer, wxSizerFlags().Right().Border(wxTOP|wxBOTTOM)); -#endif // wxUSE_CLIPBOARD || CAN_SAVE_FILES - - win->SetSizer(paneSz); - paneSz->SetSizeHints(win); - - SetSizerAndFit(sizerTop); - - Centre(); - - if (isPda) - { - // Move up the screen so that when we expand the dialog, - // there's enough space. - Move(wxPoint(GetPosition().x, GetPosition().y / 2)); - } -} - -void wxLogDialog::CreateDetailsControls(wxWindow *parent) -{ - wxString fmt = wxLog::GetTimestamp(); - bool hasTimeStamp = !fmt.IsEmpty(); - - // create the list ctrl now - m_listctrl = new wxListCtrl(parent, wxID_ANY, - wxDefaultPosition, wxDefaultSize, - wxBORDER_SIMPLE | - wxLC_REPORT | - wxLC_NO_HEADER | - wxLC_SINGLE_SEL); - - // no need to translate these strings as they're not shown to the - // user anyhow (we use wxLC_NO_HEADER style) - m_listctrl->InsertColumn(0, wxT("Message")); - - if (hasTimeStamp) - m_listctrl->InsertColumn(1, wxT("Time")); - - // prepare the imagelist - static const int ICON_SIZE = 16; - wxImageList *imageList = new wxImageList(ICON_SIZE, ICON_SIZE); - - // order should be the same as in the switch below! - static const char* const icons[] = - { - wxART_ERROR, - wxART_WARNING, - wxART_INFORMATION - }; - - bool loadedIcons = true; - - for ( size_t icon = 0; icon < WXSIZEOF(icons); icon++ ) - { - wxBitmap bmp = wxArtProvider::GetBitmap(icons[icon], wxART_MESSAGE_BOX, - wxSize(ICON_SIZE, ICON_SIZE)); - - // This may very well fail if there are insufficient colours available. - // Degrade gracefully. - if ( !bmp.IsOk() ) - { - loadedIcons = false; - - break; - } - - imageList->Add(bmp); - } - - m_listctrl->SetImageList(imageList, wxIMAGE_LIST_SMALL); - - // fill the listctrl - size_t count = m_messages.GetCount(); - for ( size_t n = 0; n < count; n++ ) - { - int image; - - if ( loadedIcons ) - { - switch ( m_severity[n] ) - { - case wxLOG_Error: - image = 0; - break; - - case wxLOG_Warning: - image = 1; - break; - - default: - image = 2; - } - } - else // failed to load images - { - image = -1; - } - - wxString msg = m_messages[n]; - msg.Replace(wxT("\n"), wxT(" ")); - msg = EllipsizeString(msg); - - m_listctrl->InsertItem(n, msg, image); - - if (hasTimeStamp) - m_listctrl->SetItem(n, 1, TimeStamp(fmt, (time_t)m_times[n])); - } - - // let the columns size themselves - m_listctrl->SetColumnWidth(0, wxLIST_AUTOSIZE); - if (hasTimeStamp) - m_listctrl->SetColumnWidth(1, wxLIST_AUTOSIZE); - - // calculate an approximately nice height for the listctrl - int height = GetCharHeight()*(count + 4); - - // but check that the dialog won't fall fown from the screen - // - // we use GetMinHeight() to get the height of the dialog part without the - // details and we consider that the "Save" button below and the separator - // line (and the margins around it) take about as much, hence double it - int heightMax = wxGetDisplaySize().y - GetPosition().y - 2*GetMinHeight(); - - // we should leave a margin - heightMax *= 9; - heightMax /= 10; - - m_listctrl->SetSize(wxDefaultCoord, wxMin(height, heightMax)); -} - -void wxLogDialog::OnListItemActivated(wxListEvent& event) -{ - // show the activated item in a message box - // This allow the user to correctly display the logs which are longer - // than the listctrl and thus gets truncated or those which contains - // newlines. - - // NB: don't do: - // wxString str = m_listctrl->GetItemText(event.GetIndex()); - // as there's a 260 chars limit on the items inside a wxListCtrl in wxMSW. - wxString str = m_messages[event.GetIndex()]; - - // wxMessageBox will nicely handle the '\n' in the string (if any) - // and supports long strings - wxMessageBox(str, wxT("Log message"), wxOK, this); -} - -void wxLogDialog::OnOk(wxCommandEvent& WXUNUSED(event)) -{ - EndModal(wxID_OK); -} - -#if CAN_SAVE_FILES || wxUSE_CLIPBOARD - -wxString wxLogDialog::GetLogMessages() const -{ - wxString fmt = wxLog::GetTimestamp(); - if ( fmt.empty() ) - { - // use the default format - fmt = "%c"; - } - - const size_t count = m_messages.GetCount(); - - wxString text; - text.reserve(count*m_messages[0].length()); - for ( size_t n = 0; n < count; n++ ) - { - text << TimeStamp(fmt, (time_t)m_times[n]) - << ": " - << m_messages[n] - << wxTextFile::GetEOL(); - } - - return text; -} - -#endif // CAN_SAVE_FILES || wxUSE_CLIPBOARD - -#if wxUSE_CLIPBOARD - -void wxLogDialog::OnCopy(wxCommandEvent& WXUNUSED(event)) -{ - wxClipboardLocker clip; - if ( !clip || - !wxTheClipboard->AddData(new wxTextDataObject(GetLogMessages())) ) - { - wxLogError(_("Failed to copy dialog contents to the clipboard.")); - } -} - -#endif // wxUSE_CLIPBOARD - -#if CAN_SAVE_FILES - -void wxLogDialog::OnSave(wxCommandEvent& WXUNUSED(event)) -{ - wxFile file; - int rc = OpenLogFile(file, NULL, this); - if ( rc == -1 ) - { - // cancelled - return; - } - - if ( !rc || !file.Write(GetLogMessages()) || !file.Close() ) - { - wxLogError(_("Can't save log contents to file.")); - } -} - -#endif // CAN_SAVE_FILES - -wxLogDialog::~wxLogDialog() -{ - if ( m_listctrl ) - { - delete m_listctrl->GetImageList(wxIMAGE_LIST_SMALL); - } -} - -#endif // wxUSE_LOG_DIALOG - -#if CAN_SAVE_FILES - -// pass an uninitialized file object, the function will ask the user for the -// filename and try to open it, returns true on success (file was opened), -// false if file couldn't be opened/created and -1 if the file selection -// dialog was cancelled -static int OpenLogFile(wxFile& file, wxString *pFilename, wxWindow *parent) -{ - // get the file name - // ----------------- - wxString filename = wxSaveFileSelector(wxT("log"), wxT("txt"), wxT("log.txt"), parent); - if ( !filename ) { - // cancelled - return -1; - } - - // open file - // --------- - bool bOk = true; // suppress warning about it being possible uninitialized - if ( wxFile::Exists(filename) ) { - bool bAppend = false; - wxString strMsg; - strMsg.Printf(_("Append log to file '%s' (choosing [No] will overwrite it)?"), - filename.c_str()); - switch ( wxMessageBox(strMsg, _("Question"), - wxICON_QUESTION | wxYES_NO | wxCANCEL) ) { - case wxYES: - bAppend = true; - break; - - case wxNO: - bAppend = false; - break; - - case wxCANCEL: - return -1; - - default: - wxFAIL_MSG(_("invalid message box return value")); - } - - if ( bAppend ) { - bOk = file.Open(filename, wxFile::write_append); - } - else { - bOk = file.Create(filename, true /* overwrite */); - } - } - else { - bOk = file.Create(filename); - } - - if ( pFilename ) - *pFilename = filename; - - return bOk; -} - -#endif // CAN_SAVE_FILES - -#endif // !(wxUSE_LOGGUI || wxUSE_LOGWINDOW) - -#if wxUSE_LOG && wxUSE_TEXTCTRL - -// ---------------------------------------------------------------------------- -// wxLogTextCtrl implementation -// ---------------------------------------------------------------------------- - -wxLogTextCtrl::wxLogTextCtrl(wxTextCtrl *pTextCtrl) -{ - m_pTextCtrl = pTextCtrl; -} - -void wxLogTextCtrl::DoLogText(const wxString& msg) -{ - m_pTextCtrl->AppendText(msg + wxS('\n')); -} - -#endif // wxUSE_LOG && wxUSE_TEXTCTRL diff --git a/Externals/wxWidgets3/src/generic/markuptext.cpp b/Externals/wxWidgets3/src/generic/markuptext.cpp deleted file mode 100644 index 6516e791c0..0000000000 --- a/Externals/wxWidgets3/src/generic/markuptext.cpp +++ /dev/null @@ -1,253 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/generic/markuptext.cpp -// Purpose: wxMarkupText implementation -// Author: Vadim Zeitlin -// Created: 2011-02-21 -// Copyright: (c) 2011 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// for compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_MARKUP - -#ifndef WX_PRECOMP - #include "wx/gdicmn.h" - #include "wx/control.h" - #include "wx/dc.h" -#endif // WX_PRECOMP - -#include "wx/generic/private/markuptext.h" - -#include "wx/private/markupparserattr.h" - -namespace -{ - -// ---------------------------------------------------------------------------- -// wxMarkupParserMeasureOutput: measure the extends of a markup string. -// ---------------------------------------------------------------------------- - -class wxMarkupParserMeasureOutput : public wxMarkupParserAttrOutput -{ -public: - // Initialize the base class with the font to use. As we don't care about - // colours (which don't affect the text measurements), don't bother to - // specify them at all. - wxMarkupParserMeasureOutput(wxDC& dc, int *visibleHeight) - : wxMarkupParserAttrOutput(dc.GetFont(), wxColour(), wxColour()), - m_dc(dc), - m_visibleHeight(visibleHeight) - { - if ( visibleHeight ) - *visibleHeight = 0; - } - - const wxSize& GetSize() const { return m_size; } - - - virtual void OnText(const wxString& text_) wxOVERRIDE - { - const wxString text(wxControl::RemoveMnemonics(text_)); - - // TODO-MULTILINE-MARKUP: Must use GetMultiLineTextExtent(). - const wxSize size = m_dc.GetTextExtent(text); - - m_size.x += size.x; - if ( size.y > m_size.y ) - m_size.y = size.y; - - if ( m_visibleHeight ) - { - wxFontMetrics tm = m_dc.GetFontMetrics(); - int visibleHeight = tm.ascent - tm.internalLeading; - if ( *m_visibleHeight < visibleHeight ) - *m_visibleHeight = visibleHeight; - } - } - - virtual void OnAttrStart(const Attr& attr) wxOVERRIDE - { - m_dc.SetFont(attr.font); - } - - virtual void OnAttrEnd(const Attr& WXUNUSED(attr)) wxOVERRIDE - { - m_dc.SetFont(GetFont()); - } - -private: - wxDC& m_dc; - - // The values that we compute. - wxSize m_size; - int * const m_visibleHeight; // may be NULL - - wxDECLARE_NO_COPY_CLASS(wxMarkupParserMeasureOutput); -}; - -// ---------------------------------------------------------------------------- -// wxMarkupParserRenderOutput: render a markup string. -// ---------------------------------------------------------------------------- - -class wxMarkupParserRenderOutput : public wxMarkupParserAttrOutput -{ -public: - // Notice that the bottom of rectangle passed to our ctor is used as the - // baseline for the text we draw, i.e. it needs to be adjusted to exclude - // descent by the caller. - wxMarkupParserRenderOutput(wxDC& dc, - const wxRect& rect, - int flags) - : wxMarkupParserAttrOutput(dc.GetFont(), - dc.GetTextForeground(), - wxColour()), - m_dc(dc), - m_rect(rect), - m_flags(flags) - { - m_pos = m_rect.x; - - // We don't initialize the base class initial text background colour to - // the valid value because we want to be able to detect when we revert - // to the "absence of background colour" and set the background mode to - // be transparent in OnAttrStart() below. But do remember it to be able - // to restore it there later -- this doesn't affect us as the text - // background isn't used anyhow when the background mode is transparent - // but it might affect the caller if it sets the background mode to - // opaque and draws some text after using us. - m_origTextBackground = dc.GetTextBackground(); - } - - virtual void OnText(const wxString& text_) wxOVERRIDE - { - wxString text; - int indexAccel = wxControl::FindAccelIndex(text_, &text); - if ( !(m_flags & wxMarkupText::Render_ShowAccels) ) - indexAccel = wxNOT_FOUND; - - // Adjust the position (unfortunately we need to do this manually as - // there is no notion of current text position in wx API) rectangle to - // ensure that all text segments use the same baseline (as there is - // nothing equivalent to Windows SetTextAlign(TA_BASELINE) neither). - wxRect rect(m_rect); - rect.x = m_pos; - - int descent; - m_dc.GetTextExtent(text, &rect.width, &rect.height, &descent); - rect.height -= descent; - rect.y += m_rect.height - rect.height; - - wxRect bounds; - m_dc.DrawLabel(text, wxBitmap(), - rect, wxALIGN_LEFT | wxALIGN_TOP, - indexAccel, - &bounds); - - // TODO-MULTILINE-MARKUP: Must update vertical position too. - m_pos += bounds.width; - } - - virtual void OnAttrStart(const Attr& attr) wxOVERRIDE - { - m_dc.SetFont(attr.font); - if ( attr.foreground.IsOk() ) - m_dc.SetTextForeground(attr.foreground); - - if ( attr.background.IsOk() ) - { - // Setting the background colour is not enough, we must also change - // the mode to ensure that it is actually used. - m_dc.SetBackgroundMode(wxSOLID); - m_dc.SetTextBackground(attr.background); - } - } - - virtual void OnAttrEnd(const Attr& attr) wxOVERRIDE - { - // We always restore the font because we always change it... - m_dc.SetFont(GetFont()); - - // ...but we only need to restore the colours if we had changed them. - if ( attr.foreground.IsOk() ) - m_dc.SetTextForeground(GetAttr().foreground); - - if ( attr.background.IsOk() ) - { - wxColour background = GetAttr().background; - if ( !background.IsOk() ) - { - // Invalid background colour indicates that the background - // should actually be made transparent and in this case the - // actual value of background colour doesn't matter but we also - // restore it just in case, see comment in the ctor. - m_dc.SetBackgroundMode(wxTRANSPARENT); - background = m_origTextBackground; - } - - m_dc.SetTextBackground(background); - } - } - -private: - wxDC& m_dc; - const wxRect m_rect; - const int m_flags; - - wxColour m_origTextBackground; - - // Current horizontal text output position. - // - // TODO-MULTILINE-MARKUP: Must keep vertical position too. - int m_pos; - - wxDECLARE_NO_COPY_CLASS(wxMarkupParserRenderOutput); -}; - -} // anonymous namespace - -// ============================================================================ -// wxMarkupText implementation -// ============================================================================ - -wxSize wxMarkupText::Measure(wxDC& dc, int *visibleHeight) const -{ - wxMarkupParserMeasureOutput out(dc, visibleHeight); - wxMarkupParser parser(out); - if ( !parser.Parse(m_markup) ) - { - wxFAIL_MSG( "Invalid markup" ); - return wxDefaultSize; - } - - return out.GetSize(); -} - -void wxMarkupText::Render(wxDC& dc, const wxRect& rect, int flags) -{ - // We want to center the above-baseline parts of the letter vertically, so - // we use the visible height and not the total height (which includes - // descent and internal leading) here. - int visibleHeight; - wxRect rectText(rect.GetPosition(), Measure(dc, &visibleHeight)); - rectText.height = visibleHeight; - - wxMarkupParserRenderOutput out(dc, rectText.CentreIn(rect), flags); - wxMarkupParser parser(out); - parser.Parse(m_markup); -} - -#endif // wxUSE_MARKUP diff --git a/Externals/wxWidgets3/src/generic/mask.cpp b/Externals/wxWidgets3/src/generic/mask.cpp deleted file mode 100644 index 27fbbc6e96..0000000000 --- a/Externals/wxWidgets3/src/generic/mask.cpp +++ /dev/null @@ -1,75 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/generic/mask.cpp -// Purpose: generic wxMask implementation -// Author: Vadim Zeitlin -// Created: 2006-09-28 -// Copyright: (c) 2006 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// for compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#ifndef WX_PRECOMP - #include "wx/bitmap.h" - #include "wx/image.h" -#endif // WX_PRECOMP - -#if wxUSE_GENERIC_MASK - -// ============================================================================ -// wxMask implementation -// ============================================================================ - -wxIMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject); - -void wxMask::FreeData() -{ - m_bitmap = wxNullBitmap; -} - -bool wxMask::InitFromColour(const wxBitmap& bitmap, const wxColour& colour) -{ -#if wxUSE_IMAGE - const wxColour clr(bitmap.QuantizeColour(colour)); - - wxImage imgSrc(bitmap.ConvertToImage()); - imgSrc.SetMask(false); - wxImage image(imgSrc.ConvertToMono(clr.Red(), clr.Green(), clr.Blue())); - if ( !image.IsOk() ) - return false; - - m_bitmap = wxBitmap(image, 1); - - return m_bitmap.IsOk(); -#else // !wxUSE_IMAGE - wxUnusedVar(bitmap); - wxUnusedVar(colour); - - return false; -#endif // wxUSE_IMAGE/!wxUSE_IMAGE -} - -bool wxMask::InitFromMonoBitmap(const wxBitmap& bitmap) -{ - wxCHECK_MSG( bitmap.IsOk(), false, wxT("Invalid bitmap") ); - wxCHECK_MSG( bitmap.GetDepth() == 1, false, wxT("Cannot create mask from colour bitmap") ); - - m_bitmap = bitmap; - - return true; -} - -#endif // wxUSE_GENERIC_MASK diff --git a/Externals/wxWidgets3/src/generic/mdig.cpp b/Externals/wxWidgets3/src/generic/mdig.cpp deleted file mode 100644 index a4f2117104..0000000000 --- a/Externals/wxWidgets3/src/generic/mdig.cpp +++ /dev/null @@ -1,642 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/generic/mdig.cpp -// Purpose: Generic MDI (Multiple Document Interface) classes -// Author: Hans Van Leemputten -// Modified by: 2008-10-31 Vadim Zeitlin: derive from the base classes -// Created: 29/07/2002 -// Copyright: (c) 2002 Hans Van Leemputten -// (c) 2008 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// =========================================================================== -// declarations -// =========================================================================== - -// --------------------------------------------------------------------------- -// headers -// --------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_MDI - -#ifndef WX_PRECOMP - #include "wx/menu.h" - #include "wx/intl.h" - #include "wx/log.h" -#endif //WX_PRECOMP - -#include "wx/mdi.h" -#include "wx/generic/mdig.h" -#include "wx/notebook.h" -#include "wx/scopeguard.h" - -#include "wx/stockitem.h" - -enum MDI_MENU_ID -{ - wxWINDOWCLOSE = 4001, - wxWINDOWCLOSEALL, - wxWINDOWNEXT, - wxWINDOWPREV -}; - -//----------------------------------------------------------------------------- -// wxGenericMDIParentFrame -//----------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxGenericMDIParentFrame, wxFrame); - -wxBEGIN_EVENT_TABLE(wxGenericMDIParentFrame, wxFrame) - EVT_CLOSE(wxGenericMDIParentFrame::OnClose) -#if wxUSE_MENUS - EVT_MENU(wxID_ANY, wxGenericMDIParentFrame::OnWindowMenu) -#endif -wxEND_EVENT_TABLE() - -void wxGenericMDIParentFrame::Init() -{ -#if wxUSE_MENUS - m_pMyMenuBar = NULL; -#endif // wxUSE_MENUS -} - -wxGenericMDIParentFrame::~wxGenericMDIParentFrame() -{ - // Make sure the client window is destructed before the menu bars are! - wxDELETE(m_clientWindow); - -#if wxUSE_MENUS - wxDELETE(m_pMyMenuBar); - - RemoveWindowMenu(GetMenuBar()); -#endif // wxUSE_MENUS -} - -bool wxGenericMDIParentFrame::Create(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) -{ - // this style can be used to prevent a window from having the standard MDI - // "Window" menu - if ( !(style & wxFRAME_NO_WINDOW_MENU) ) - { -#if wxUSE_MENUS - m_windowMenu = new wxMenu; - - m_windowMenu->Append(wxWINDOWCLOSE, _("Cl&ose")); - m_windowMenu->Append(wxWINDOWCLOSEALL, _("Close All")); - m_windowMenu->AppendSeparator(); - m_windowMenu->Append(wxWINDOWNEXT, _("&Next")); - m_windowMenu->Append(wxWINDOWPREV, _("&Previous")); -#endif // wxUSE_MENUS - } - - // the scrolling styles don't make sense neither for us nor for our client - // window (to which they're supposed to apply) - style &= ~(wxHSCROLL | wxVSCROLL); - - if ( !wxFrame::Create( parent, id, title, pos, size, style, name ) ) - return false; - - wxGenericMDIClientWindow * const client = OnCreateGenericClient(); - if ( !client->CreateGenericClient(this) ) - return false; - - m_clientWindow = client; - - return true; -} - -wxGenericMDIClientWindow *wxGenericMDIParentFrame::OnCreateGenericClient() -{ - return new wxGenericMDIClientWindow; -} - -bool wxGenericMDIParentFrame::CloseAll() -{ - wxGenericMDIClientWindow * const client = GetGenericClientWindow(); - if ( !client ) - return true; // none of the windows left - - wxBookCtrlBase * const book = client->GetBookCtrl(); - while ( book->GetPageCount() ) - { - wxGenericMDIChildFrame * const child = client->GetChild(0); - if ( !child->Close() ) - { - // it refused to close, don't close the remaining ones neither - return false; - } - } - - return true; -} - -#if wxUSE_MENUS -void wxGenericMDIParentFrame::SetWindowMenu(wxMenu* pMenu) -{ - // Replace the window menu from the currently loaded menu bar. - wxMenuBar *pMenuBar = GetMenuBar(); - - if (m_windowMenu) - { - RemoveWindowMenu(pMenuBar); - - wxDELETE(m_windowMenu); - } - - if (pMenu) - { - m_windowMenu = pMenu; - - AddWindowMenu(pMenuBar); - } -} - -void wxGenericMDIParentFrame::SetMenuBar(wxMenuBar *pMenuBar) -{ - // Remove the Window menu from the old menu bar - RemoveWindowMenu(GetMenuBar()); - // Add the Window menu to the new menu bar. - AddWindowMenu(pMenuBar); - - wxFrame::SetMenuBar(pMenuBar); -} -#endif // wxUSE_MENUS - -void wxGenericMDIParentFrame::WXSetChildMenuBar(wxGenericMDIChildFrame *pChild) -{ -#if wxUSE_MENUS - if (pChild == NULL) - { - // No Child, set Our menu bar back. - SetMenuBar(m_pMyMenuBar); - - // Make sure we know our menu bar is in use - m_pMyMenuBar = NULL; - } - else - { - if (pChild->GetMenuBar() == NULL) - return; - - // Do we need to save the current bar? - if (m_pMyMenuBar == NULL) - m_pMyMenuBar = GetMenuBar(); - - SetMenuBar(pChild->GetMenuBar()); - } -#endif // wxUSE_MENUS -} - -wxGenericMDIClientWindow * -wxGenericMDIParentFrame::GetGenericClientWindow() const -{ - return static_cast(m_clientWindow); -} - -wxBookCtrlBase *wxGenericMDIParentFrame::GetBookCtrl() const -{ - wxGenericMDIClientWindow * const client = GetGenericClientWindow(); - return client ? client->GetBookCtrl() : NULL; -} - -void wxGenericMDIParentFrame::AdvanceActive(bool forward) -{ - wxBookCtrlBase * const book = GetBookCtrl(); - if ( book ) - book->AdvanceSelection(forward); -} - -void wxGenericMDIParentFrame::WXUpdateChildTitle(wxGenericMDIChildFrame *child) -{ - wxGenericMDIClientWindow * const client = GetGenericClientWindow(); - - const int pos = client->FindChild(child); - if ( pos == wxNOT_FOUND ) - return; - - client->GetBookCtrl()->SetPageText(pos, child->GetTitle()); -} - -void wxGenericMDIParentFrame::WXActivateChild(wxGenericMDIChildFrame *child) -{ - wxGenericMDIClientWindow * const client = GetGenericClientWindow(); - - const int pos = client->FindChild(child); - if ( pos == wxNOT_FOUND ) - return; - - client->GetBookCtrl()->SetSelection(pos); -} - -void wxGenericMDIParentFrame::WXRemoveChild(wxGenericMDIChildFrame *child) -{ - const bool removingActive = WXIsActiveChild(child); - if ( removingActive ) - { - SetActiveChild(NULL); - WXSetChildMenuBar(NULL); - } - - wxGenericMDIClientWindow * const client = GetGenericClientWindow(); - wxCHECK_RET( client, "should have client window" ); - - wxBookCtrlBase * const book = client->GetBookCtrl(); - - // Remove page if still there - int pos = client->FindChild(child); - if ( pos != wxNOT_FOUND ) - { - if ( book->RemovePage(pos) ) - book->Refresh(); - } - - if ( removingActive ) - { - // Set the new selection to a remaining page - const size_t count = book->GetPageCount(); - if ( count > (size_t)pos ) - { - book->SetSelection(pos); - } - else - { - if ( count > 0 ) - book->SetSelection(count - 1); - } - } -} - -bool -wxGenericMDIParentFrame::WXIsActiveChild(wxGenericMDIChildFrame *child) const -{ - return static_cast(GetActiveChild()) == child; -} - -#if wxUSE_MENUS -void wxGenericMDIParentFrame::RemoveWindowMenu(wxMenuBar *pMenuBar) -{ - if (pMenuBar && m_windowMenu) - { - // Remove old window menu - int pos = pMenuBar->FindMenu(_("&Window")); - if (pos != wxNOT_FOUND) - { - wxASSERT(m_windowMenu == pMenuBar->GetMenu(pos)); // DBG:: We're going to delete the wrong menu!!! - pMenuBar->Remove(pos); - } - } -} - -void wxGenericMDIParentFrame::AddWindowMenu(wxMenuBar *pMenuBar) -{ - if (pMenuBar && m_windowMenu) - { - int pos = pMenuBar->FindMenu(wxGetStockLabel(wxID_HELP,false)); - if (pos == wxNOT_FOUND) - { - pMenuBar->Append(m_windowMenu, _("&Window")); - } - else - { - pMenuBar->Insert(pos, m_windowMenu, _("&Window")); - } - } -} - -void wxGenericMDIParentFrame::OnWindowMenu(wxCommandEvent &event) -{ - switch ( event.GetId() ) - { - case wxWINDOWCLOSE: - if ( m_currentChild ) - m_currentChild->Close(); - break; - - case wxWINDOWCLOSEALL: - CloseAll(); - break; - - case wxWINDOWNEXT: - ActivateNext(); - break; - - case wxWINDOWPREV: - ActivatePrevious(); - break; - - default: - event.Skip(); - } -} -#endif // wxUSE_MENUS - -void wxGenericMDIParentFrame::OnClose(wxCloseEvent& event) -{ - if ( !CloseAll() ) - event.Veto(); - else - event.Skip(); -} - -bool wxGenericMDIParentFrame::ProcessEvent(wxEvent& event) -{ - if ( m_currentChild ) - { - // the menu events should be given to the child as we show its menu bar - // as our own - const wxEventType eventType = event.GetEventType(); - if ( eventType == wxEVT_MENU || - eventType == wxEVT_UPDATE_UI ) - { - // set the flag indicating that this event was forwarded to the - // child from the parent and so shouldn't be propagated upwards if - // not processed to avoid infinite loop - m_childHandler = m_currentChild; - wxON_BLOCK_EXIT_NULL(m_childHandler); - - if ( m_currentChild->ProcessWindowEvent(event) ) - return true; - } - } - - return wxMDIParentFrameBase::ProcessEvent(event); -} - -// ---------------------------------------------------------------------------- -// wxGenericMDIChildFrame -// ---------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxGenericMDIChildFrame, wxFrame); - -wxBEGIN_EVENT_TABLE(wxGenericMDIChildFrame, wxFrame) - EVT_MENU_HIGHLIGHT_ALL(wxGenericMDIChildFrame::OnMenuHighlight) - - EVT_CLOSE(wxGenericMDIChildFrame::OnClose) -wxEND_EVENT_TABLE() - -void wxGenericMDIChildFrame::Init() -{ -#if wxUSE_MENUS - m_pMenuBar = NULL; -#endif // wxUSE_MENUS - -#if !wxUSE_GENERIC_MDI_AS_NATIVE - m_mdiParentGeneric = NULL; -#endif -} - -wxGenericMDIChildFrame::~wxGenericMDIChildFrame() -{ - wxGenericMDIParentFrame * const parent = GetGenericMDIParent(); - - // it could happen that we don't have a valid parent if we hadn't been ever - // really created -- but in this case there is nothing else to do neither - if ( parent ) - parent->WXRemoveChild(this); - -#if wxUSE_MENUS - delete m_pMenuBar; -#endif // wxUSE_MENUS -} - -bool wxGenericMDIChildFrame::Create(wxGenericMDIParentFrame *parent, - wxWindowID id, - const wxString& title, - const wxPoint& WXUNUSED(pos), - const wxSize& size, - long WXUNUSED(style), - const wxString& name) -{ - // unfortunately we can't use the base class m_mdiParent field unless - // wxGenericMDIParentFrame is wxMDIParentFrame -#if wxUSE_GENERIC_MDI_AS_NATIVE - m_mdiParent = parent; -#else // generic != native - // leave m_mdiParent NULL, we don't have it - m_mdiParentGeneric = parent; -#endif - - wxBookCtrlBase * const book = parent->GetBookCtrl(); - - wxASSERT_MSG( book, "Missing MDI client window." ); - - // note that we ignore the styles, none of the usual TLW styles apply to - // this (child) window - if ( !wxWindow::Create(book, id, wxDefaultPosition, size, 0, name) ) - return false; - - m_title = title; - book->AddPage(this, title, true); - - return true; -} - -#if wxUSE_MENUS -void wxGenericMDIChildFrame::SetMenuBar( wxMenuBar *menu_bar ) -{ - wxMenuBar *pOldMenuBar = m_pMenuBar; - m_pMenuBar = menu_bar; - - if (m_pMenuBar) - { - wxGenericMDIParentFrame *parent = GetGenericMDIParent(); - - if ( parent ) - { - m_pMenuBar->SetParent(parent); - - if ( parent->WXIsActiveChild(this) ) - { - // Replace current menu bars - if (pOldMenuBar) - parent->WXSetChildMenuBar(NULL); - parent->WXSetChildMenuBar(this); - } - } - } -} - -wxMenuBar *wxGenericMDIChildFrame::GetMenuBar() const -{ - return m_pMenuBar; -} -#endif // wxUSE_MENUS - -void wxGenericMDIChildFrame::SetTitle(const wxString& title) -{ - m_title = title; - - wxGenericMDIParentFrame * const parent = GetGenericMDIParent(); - if ( parent ) - parent->WXUpdateChildTitle(this); - //else: it's ok, we might be not created yet -} - -void wxGenericMDIChildFrame::Activate() -{ - wxGenericMDIParentFrame * const parent = GetGenericMDIParent(); - - wxCHECK_RET( parent, "can't activate MDI child without parent" ); - parent->WXActivateChild(this); -} - -void wxGenericMDIChildFrame::OnMenuHighlight(wxMenuEvent& event) -{ - wxGenericMDIParentFrame * const parent = GetGenericMDIParent(); - if ( parent) - { - // we don't have any help text for this item, - // but may be the MDI frame does? - parent->OnMenuHighlight(event); - } -} - -void wxGenericMDIChildFrame::OnClose(wxCloseEvent& WXUNUSED(event)) -{ - // we're not a TLW so don't delay the destruction of this window - delete this; -} - -bool wxGenericMDIChildFrame::TryAfter(wxEvent& event) -{ - // we shouldn't propagate the event to the parent if we received it from it - // in the first place - wxGenericMDIParentFrame * const parent = GetGenericMDIParent(); - if ( parent && parent->WXIsInsideChildHandler(this) ) - return false; - - return wxTDIChildFrame::TryAfter(event); -} - -// ---------------------------------------------------------------------------- -// wxGenericMDIClientWindow -// ---------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxGenericMDIClientWindow, wxWindow); - -bool -wxGenericMDIClientWindow::CreateGenericClient(wxWindow *parent) -{ - if ( !wxWindow::Create(parent, wxID_ANY) ) - return false; - - m_notebook = new wxNotebook(this, wxID_ANY); - m_notebook->Connect - ( - wxEVT_NOTEBOOK_PAGE_CHANGED, - wxNotebookEventHandler( - wxGenericMDIClientWindow::OnPageChanged), - NULL, - this - ); - - // now that we have a notebook to resize, hook up OnSize() too - Connect(wxEVT_SIZE, wxSizeEventHandler(wxGenericMDIClientWindow::OnSize)); - - return true; -} - -wxBookCtrlBase *wxGenericMDIClientWindow::GetBookCtrl() const -{ - return m_notebook; -} - -wxGenericMDIChildFrame *wxGenericMDIClientWindow::GetChild(size_t pos) const -{ - return static_cast(GetBookCtrl()->GetPage(pos)); -} - -int wxGenericMDIClientWindow::FindChild(wxGenericMDIChildFrame *child) const -{ - wxBookCtrlBase * const book = GetBookCtrl(); - const size_t count = book->GetPageCount(); - for ( size_t pos = 0; pos < count; pos++ ) - { - if ( book->GetPage(pos) == child ) - return pos; - } - - return wxNOT_FOUND; -} - -void wxGenericMDIClientWindow::PageChanged(int oldSelection, int newSelection) -{ - // Don't do anything if nothing changed - if (oldSelection == newSelection) - return; - - // Again check if we really need to do this... - if (newSelection != -1) - { - wxGenericMDIChildFrame * const child = GetChild(newSelection); - - if ( child->GetGenericMDIParent()->WXIsActiveChild(child) ) - return; - } - - // Notify old active child that it has been deactivated - if (oldSelection != -1) - { - wxGenericMDIChildFrame * const oldChild = GetChild(oldSelection); - if (oldChild) - { - wxActivateEvent event(wxEVT_ACTIVATE, false, oldChild->GetId()); - event.SetEventObject( oldChild ); - oldChild->GetEventHandler()->ProcessEvent(event); - } - } - - // Notify new active child that it has been activated - if (newSelection != -1) - { - wxGenericMDIChildFrame * const activeChild = GetChild(newSelection); - if ( activeChild ) - { - wxActivateEvent event(wxEVT_ACTIVATE, true, activeChild->GetId()); - event.SetEventObject( activeChild ); - activeChild->GetEventHandler()->ProcessEvent(event); - - wxGenericMDIParentFrame * const - parent = activeChild->GetGenericMDIParent(); - - if ( parent ) - { - // this is a dirty hack as activeChild is not really a - // wxMDIChildFrame at all but we still want to store it in the - // base class m_currentChild field and this will work as long - // as we only use as wxMDIChildFrameBase pointer (which it is) - parent->SetActiveChild( - reinterpret_cast(activeChild)); - parent->WXSetChildMenuBar(activeChild); - } - } - } -} - -void wxGenericMDIClientWindow::OnPageChanged(wxBookCtrlEvent& event) -{ - PageChanged(event.GetOldSelection(), event.GetSelection()); - - event.Skip(); -} - -void wxGenericMDIClientWindow::OnSize(wxSizeEvent& WXUNUSED(event)) -{ - m_notebook->SetSize(GetClientSize()); -} - -#endif // wxUSE_MDI - diff --git a/Externals/wxWidgets3/src/generic/msgdlgg.cpp b/Externals/wxWidgets3/src/generic/msgdlgg.cpp deleted file mode 100644 index 132a00d90c..0000000000 --- a/Externals/wxWidgets3/src/generic/msgdlgg.cpp +++ /dev/null @@ -1,278 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/generic/msgdlgg.cpp -// Purpose: wxGenericMessageDialog -// Author: Julian Smart, Robert Roebling -// Modified by: -// Created: 04/01/98 -// Copyright: (c) Julian Smart and Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ -#pragma hdrstop -#endif - -#if wxUSE_MSGDLG - -#ifndef WX_PRECOMP - #include "wx/utils.h" - #include "wx/dialog.h" - #include "wx/button.h" - #include "wx/stattext.h" - #include "wx/statbmp.h" - #include "wx/layout.h" - #include "wx/intl.h" - #include "wx/icon.h" - #include "wx/sizer.h" - #include "wx/app.h" - #include "wx/settings.h" -#endif - -#include -#include - -#define __WX_COMPILING_MSGDLGG_CPP__ 1 -#include "wx/msgdlg.h" -#include "wx/artprov.h" -#include "wx/textwrapper.h" -#include "wx/modalhook.h" - -#if wxUSE_STATLINE - #include "wx/statline.h" -#endif - -// ---------------------------------------------------------------------------- -// wxTitleTextWrapper: simple class to create wrapped text in "title font" -// ---------------------------------------------------------------------------- - -class wxTitleTextWrapper : public wxTextSizerWrapper -{ -public: - wxTitleTextWrapper(wxWindow *win) - : wxTextSizerWrapper(win) - { - } - -protected: - virtual wxWindow *OnCreateLine(const wxString& s) wxOVERRIDE - { - wxWindow * const win = wxTextSizerWrapper::OnCreateLine(s); - - win->SetFont(win->GetFont().Larger().MakeBold()); - - return win; - } -}; - -// ---------------------------------------------------------------------------- -// icons -// ---------------------------------------------------------------------------- - -wxBEGIN_EVENT_TABLE(wxGenericMessageDialog, wxDialog) - EVT_BUTTON(wxID_YES, wxGenericMessageDialog::OnYes) - EVT_BUTTON(wxID_NO, wxGenericMessageDialog::OnNo) - EVT_BUTTON(wxID_HELP, wxGenericMessageDialog::OnHelp) - EVT_BUTTON(wxID_CANCEL, wxGenericMessageDialog::OnCancel) -wxEND_EVENT_TABLE() - -wxIMPLEMENT_CLASS(wxGenericMessageDialog, wxDialog); - -wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent, - const wxString& message, - const wxString& caption, - long style, - const wxPoint& pos) - : wxMessageDialogBase(GetParentForModalDialog(parent, style), - message, - caption, - style), - m_pos(pos) -{ - m_created = false; -} - -wxSizer *wxGenericMessageDialog::CreateMsgDlgButtonSizer() -{ - if ( HasCustomLabels() ) - { - wxStdDialogButtonSizer * const sizerStd = new wxStdDialogButtonSizer; - - wxButton *btnDef = NULL; - - if ( m_dialogStyle & wxOK ) - { - btnDef = new wxButton(this, wxID_OK, GetCustomOKLabel()); - sizerStd->AddButton(btnDef); - } - - if ( m_dialogStyle & wxCANCEL ) - { - wxButton * const - cancel = new wxButton(this, wxID_CANCEL, GetCustomCancelLabel()); - sizerStd->AddButton(cancel); - - if ( m_dialogStyle & wxCANCEL_DEFAULT ) - btnDef = cancel; - } - - if ( m_dialogStyle & wxYES_NO ) - { - wxButton * const - yes = new wxButton(this, wxID_YES, GetCustomYesLabel()); - sizerStd->AddButton(yes); - - wxButton * const - no = new wxButton(this, wxID_NO, GetCustomNoLabel()); - sizerStd->AddButton(no); - if ( m_dialogStyle & wxNO_DEFAULT ) - btnDef = no; - else if ( !btnDef ) - btnDef = yes; - } - - if ( m_dialogStyle & wxHELP ) - { - wxButton * const - help = new wxButton(this, wxID_HELP, GetCustomHelpLabel()); - sizerStd->AddButton(help); - } - - if ( btnDef ) - { - btnDef->SetDefault(); - btnDef->SetFocus(); - } - - sizerStd->Realize(); - - return CreateSeparatedSizer(sizerStd); - } - - // Use standard labels for all buttons - return CreateSeparatedButtonSizer - ( - m_dialogStyle & (wxOK | wxCANCEL | wxHELP | wxYES_NO | - wxNO_DEFAULT | wxCANCEL_DEFAULT) - ); -} - -void wxGenericMessageDialog::DoCreateMsgdialog() -{ - wxDialog::Create(m_parent, wxID_ANY, m_caption, m_pos, wxDefaultSize, wxDEFAULT_DIALOG_STYLE); - - wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL ); - - wxBoxSizer *icon_text = new wxBoxSizer( wxHORIZONTAL ); - -#if wxUSE_STATBMP - // 1) icon - if (m_dialogStyle & wxICON_MASK) - { - wxStaticBitmap *icon = new wxStaticBitmap - ( - this, - wxID_ANY, - wxArtProvider::GetMessageBoxIcon(m_dialogStyle) - ); - if ( wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA ) - topsizer->Add( icon, 0, wxTOP|wxLEFT|wxRIGHT | wxALIGN_LEFT, 10 ); - else - icon_text->Add(icon, wxSizerFlags().Top().Border(wxRIGHT, 20)); - } -#endif // wxUSE_STATBMP - -#if wxUSE_STATTEXT - // 2) text - - wxBoxSizer * const textsizer = new wxBoxSizer(wxVERTICAL); - - // We want to show the main message in a different font to make it stand - // out if the extended message is used as well. This looks better and is - // more consistent with the native dialogs under MSW and GTK. - wxString lowerMessage; - if ( !m_extendedMessage.empty() ) - { - wxTitleTextWrapper titleWrapper(this); - textsizer->Add(CreateTextSizer(GetMessage(), titleWrapper), - wxSizerFlags().Border(wxBOTTOM, 20)); - - lowerMessage = GetExtendedMessage(); - } - else // no extended message - { - lowerMessage = GetMessage(); - } - - textsizer->Add(CreateTextSizer(lowerMessage)); - - icon_text->Add(textsizer, 0, wxALIGN_CENTER, 10); - topsizer->Add( icon_text, 1, wxLEFT|wxRIGHT|wxTOP, 10 ); -#endif // wxUSE_STATTEXT - - // 3) optional checkbox and detailed text - AddMessageDialogCheckBox( topsizer ); - AddMessageDialogDetails( topsizer ); - - // 4) buttons - wxSizer *sizerBtn = CreateMsgDlgButtonSizer(); - if ( sizerBtn ) - topsizer->Add(sizerBtn, 0, wxEXPAND | wxALL, 10 ); - - SetAutoLayout( true ); - SetSizer( topsizer ); - - topsizer->SetSizeHints( this ); - topsizer->Fit( this ); - wxSize size( GetSize() ); - if (size.x < size.y*3/2) - { - size.x = size.y*3/2; - SetSize( size ); - } - - Centre( wxBOTH | wxCENTER_FRAME); -} - -void wxGenericMessageDialog::OnYes(wxCommandEvent& WXUNUSED(event)) -{ - EndModal( wxID_YES ); -} - -void wxGenericMessageDialog::OnNo(wxCommandEvent& WXUNUSED(event)) -{ - EndModal( wxID_NO ); -} - -void wxGenericMessageDialog::OnHelp(wxCommandEvent& WXUNUSED(event)) -{ - EndModal( wxID_HELP ); -} - -void wxGenericMessageDialog::OnCancel(wxCommandEvent& WXUNUSED(event)) -{ - // Allow cancellation via ESC/Close button except if - // only YES and NO are specified. - const long style = GetMessageDialogStyle(); - if ( (style & wxYES_NO) != wxYES_NO || (style & wxCANCEL) ) - { - EndModal( wxID_CANCEL ); - } -} - -int wxGenericMessageDialog::ShowModal() -{ - WX_HOOK_MODAL_DIALOG(); - - if ( !m_created ) - { - m_created = true; - DoCreateMsgdialog(); - } - - return wxMessageDialogBase::ShowModal(); -} - -#endif // wxUSE_MSGDLG diff --git a/Externals/wxWidgets3/src/generic/notebook.cpp b/Externals/wxWidgets3/src/generic/notebook.cpp deleted file mode 100644 index 01c4e29fdb..0000000000 --- a/Externals/wxWidgets3/src/generic/notebook.cpp +++ /dev/null @@ -1,755 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/generic/notebook.cpp -// Purpose: generic implementation of wxNotebook -// Author: Julian Smart -// Modified by: -// Created: 17/09/98 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_NOTEBOOK - -#include "wx/notebook.h" - -#ifndef WX_PRECOMP - #include "wx/string.h" - #include "wx/log.h" - #include "wx/dcclient.h" - #include "wx/settings.h" -#endif - -#include "wx/imaglist.h" -#include "wx/generic/tabg.h" - -// ---------------------------------------------------------------------------- -// macros -// ---------------------------------------------------------------------------- - -// check that the page index is valid -#define IS_VALID_PAGE(nPage) ((nPage) < GetPageCount()) - -// ---------------------------------------------------------------------------- -// event table -// ---------------------------------------------------------------------------- - -wxBEGIN_EVENT_TABLE(wxNotebook, wxBookCtrlBase) - EVT_NOTEBOOK_PAGE_CHANGED(wxID_ANY, wxNotebook::OnSelChange) - EVT_SIZE(wxNotebook::OnSize) - EVT_PAINT(wxNotebook::OnPaint) - EVT_MOUSE_EVENTS(wxNotebook::OnMouseEvent) - EVT_SET_FOCUS(wxNotebook::OnSetFocus) - EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey) -wxEND_EVENT_TABLE() - -// ============================================================================ -// implementation -// ============================================================================ - -// ============================================================================ -// Private class -// ============================================================================ - -WX_DECLARE_HASH_MAP(int, wxNotebookPage*, wxIntegerHash, wxIntegerEqual, - wxIntToNotebookPageHashMap); - -WX_DECLARE_HASH_MAP(wxNotebookPage*, int, wxPointerHash, wxPointerEqual, - wxNotebookPageToIntHashMap); - -// This reuses wxTabView to draw the tabs. -class WXDLLEXPORT wxNotebookTabView: public wxTabView -{ - wxDECLARE_DYNAMIC_CLASS(wxNotebookTabView); -public: - wxNotebookTabView(wxNotebook* notebook, long style = wxTAB_STYLE_DRAW_BOX | wxTAB_STYLE_COLOUR_INTERIOR); - virtual ~wxNotebookTabView(void); - - // Called when a tab is activated - virtual void OnTabActivate(int activateId, int deactivateId); - // Allows vetoing - virtual bool OnTabPreActivate(int activateId, int deactivateId); - - // map integer ids used by wxTabView to wxNotebookPage pointers - int GetId(wxNotebookPage *page); - wxNotebookPage *GetPage(int id) { return m_idToPage[id]; } - -protected: - wxNotebook* m_notebook; - -private: - wxIntToNotebookPageHashMap m_idToPage; - wxNotebookPageToIntHashMap m_pageToId; - int m_nextid; -}; - -static int GetPageId(wxTabView *tabview, wxNotebookPage *page) -{ - return static_cast(tabview)->GetId(page); -} - -// ---------------------------------------------------------------------------- -// wxNotebook construction -// ---------------------------------------------------------------------------- - -// common part of all ctors -void wxNotebook::Init() -{ - m_tabView = NULL; - m_selection = -1; -} - -// default for dynamic class -wxNotebook::wxNotebook() -{ - Init(); -} - -// the same arguments as for wxControl -wxNotebook::wxNotebook(wxWindow *parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) -{ - Init(); - - Create(parent, id, pos, size, style, name); -} - -// Create() function -bool wxNotebook::Create(wxWindow *parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) -{ - // base init - SetName(name); - - if ( (style & wxBK_ALIGN_MASK) == wxBK_DEFAULT ) - style |= wxBK_TOP; - - m_windowId = id == wxID_ANY ? NewControlId() : id; - - if (!wxControl::Create(parent, id, pos, size, style|wxNO_BORDER, wxDefaultValidator, name)) - return false; - - SetTabView(new wxNotebookTabView(this)); - - return true; -} - -// dtor -wxNotebook::~wxNotebook() -{ - delete m_tabView; -} - -// ---------------------------------------------------------------------------- -// wxNotebook accessors -// ---------------------------------------------------------------------------- -int wxNotebook::GetRowCount() const -{ - // TODO - return 0; -} - -int wxNotebook::SetSelection(size_t nPage) -{ - wxASSERT( IS_VALID_PAGE(nPage) ); - - wxNotebookPage* pPage = GetPage(nPage); - - m_tabView->SetTabSelection(GetPageId(m_tabView, pPage)); - - // TODO - return 0; -} - -int wxNotebook::ChangeSelection(size_t nPage) -{ - // FIXME: currently it does generate events too - return SetSelection(nPage); -} - -#if 0 -void wxNotebook::AdvanceSelection(bool bForward) -{ - int nSel = GetSelection(); - int nMax = GetPageCount() - 1; - if ( bForward ) - SetSelection(nSel == nMax ? 0 : nSel + 1); - else - SetSelection(nSel == 0 ? nMax : nSel - 1); -} -#endif - -bool wxNotebook::SetPageText(size_t nPage, const wxString& strText) -{ - wxASSERT( IS_VALID_PAGE(nPage) ); - - wxNotebookPage* page = GetPage(nPage); - if (page) - { - m_tabView->SetTabText(GetPageId(m_tabView, page), strText); - Refresh(); - return true; - } - - return false; -} - -wxString wxNotebook::GetPageText(size_t nPage) const -{ - wxASSERT( IS_VALID_PAGE(nPage) ); - - wxNotebookPage* page = ((wxNotebook*)this)->GetPage(nPage); - if (page) - return m_tabView->GetTabText(GetPageId(m_tabView, page)); - else - return wxEmptyString; -} - -int wxNotebook::GetPageImage(size_t WXUNUSED_UNLESS_DEBUG(nPage)) const -{ - wxASSERT( IS_VALID_PAGE(nPage) ); - - // TODO - return 0; -} - -bool wxNotebook::SetPageImage(size_t WXUNUSED_UNLESS_DEBUG(nPage), - int WXUNUSED(nImage)) -{ - wxASSERT( IS_VALID_PAGE(nPage) ); - - // TODO - return false; -} - -// set the size (the same for all pages) -void wxNotebook::SetPageSize(const wxSize& WXUNUSED(size)) -{ - // TODO -} - -// set the padding between tabs (in pixels) -void wxNotebook::SetPadding(const wxSize& WXUNUSED(padding)) -{ - // TODO -} - -// set the size of the tabs for wxNB_FIXEDWIDTH controls -void wxNotebook::SetTabSize(const wxSize& WXUNUSED(sz)) -{ - // TODO -} - -// ---------------------------------------------------------------------------- -// wxNotebook operations -// ---------------------------------------------------------------------------- - -// remove one page from the notebook and delete it -bool wxNotebook::DeletePage(size_t nPage) -{ - wxCHECK( IS_VALID_PAGE(nPage), false ); - - if (m_selection != -1) - { - m_pages[m_selection]->Show(false); - m_pages[m_selection]->Lower(); - } - - wxNotebookPage* pPage = GetPage(nPage); - - m_tabView->RemoveTab(GetPageId(m_tabView, pPage)); - - m_pages.Remove(pPage); - delete pPage; - - if (m_pages.GetCount() == 0) - { - m_selection = -1; - m_tabView->SetTabSelection(-1, false); - } - else if (m_selection > -1) - { - m_selection = -1; - - m_tabView->SetTabSelection(GetPageId(m_tabView, GetPage(0)), false); - - if (m_selection != 0) - ChangePage(-1, 0); - } - - RefreshLayout(false); - - return true; -} - -bool wxNotebook::DeletePage(wxNotebookPage* page) -{ - int pagePos = FindPagePosition(page); - if (pagePos > -1) - return DeletePage(pagePos); - else - return false; -} - -bool wxNotebook::RemovePage(size_t nPage) -{ - return DoRemovePage(nPage) != NULL; -} - -// remove one page from the notebook -wxWindow* wxNotebook::DoRemovePage(size_t nPage) -{ - wxCHECK( IS_VALID_PAGE(nPage), NULL ); - - m_pages[nPage]->Show(false); - // m_pages[nPage]->Lower(); - - wxNotebookPage* pPage = GetPage(nPage); - - m_tabView->RemoveTab(GetPageId(m_tabView, pPage)); - - m_pages.Remove(pPage); - - if (m_pages.GetCount() == 0) - { - m_selection = -1; - m_tabView->SetTabSelection(-1, true); - } - else if (m_selection > -1) - { - // Only change the selection if the page we - // deleted was the selection. - if (nPage == (size_t)m_selection) - { - m_selection = -1; - // Select the first tab. Generates a ChangePage. - m_tabView->SetTabSelection(0, true); - } - else - { - // We must adjust which tab we think is selected. - // If greater than the page we deleted, it must be moved down - // a notch. - if (size_t(m_selection) > nPage) - m_selection -- ; - } - } - - RefreshLayout(false); - - return pPage; -} - -bool wxNotebook::RemovePage(wxNotebookPage* page) -{ - int pagePos = FindPagePosition(page); - if (pagePos > -1) - return RemovePage(pagePos); - else - return false; -} - -// Find the position of the wxNotebookPage, -1 if not found. -int wxNotebook::FindPagePosition(wxNotebookPage* page) const -{ - size_t nPageCount = GetPageCount(); - size_t nPage; - for ( nPage = 0; nPage < nPageCount; nPage++ ) - if (m_pages[nPage] == page) - return nPage; - return -1; -} - -// remove all pages -bool wxNotebook::DeleteAllPages() -{ - m_tabView->ClearTabs(true); - - size_t nPageCount = GetPageCount(); - size_t nPage; - for ( nPage = 0; nPage < nPageCount; nPage++ ) - delete m_pages[nPage]; - - m_pages.Clear(); - - return true; -} - -// same as AddPage() but does it at given position -bool wxNotebook::InsertPage(size_t nPage, - wxNotebookPage *pPage, - const wxString& strText, - bool bSelect, - int WXUNUSED(imageId)) -{ - wxASSERT( pPage != NULL ); - wxCHECK( IS_VALID_PAGE(nPage) || nPage == GetPageCount(), false ); - - m_tabView->AddTab(GetPageId(m_tabView, pPage), strText); - - if (!bSelect) - pPage->Show(false); - - // save the pointer to the page - m_pages.Insert(pPage, nPage); - - if (bSelect) - { - // This will cause ChangePage to be called, via OnSelPage - - m_tabView->SetTabSelection(GetPageId(m_tabView, pPage), true); - } - - // some page must be selected: either this one or the first one if there is - // still no selection - if ( m_selection == -1 ) - ChangePage(-1, 0); - - RefreshLayout(false); - - return true; -} - -// ---------------------------------------------------------------------------- -// wxNotebook callbacks -// ---------------------------------------------------------------------------- - -// @@@ OnSize() is used for setting the font when it's called for the first -// time because doing it in ::Create() doesn't work (for unknown reasons) -void wxNotebook::OnSize(wxSizeEvent& event) -{ - static bool s_bFirstTime = true; - if ( s_bFirstTime ) { - // TODO: any first-time-size processing. - s_bFirstTime = false; - } - - RefreshLayout(); - - // Processing continues to next OnSize - event.Skip(); -} - -// This was supposed to cure the non-display of the notebook -// until the user resizes the window. -// What's going on? -void wxNotebook::OnInternalIdle() -{ - wxWindow::OnInternalIdle(); - -#if 0 - static bool s_bFirstTime = true; - if ( s_bFirstTime ) { - /* - wxSize sz(GetSize()); - sz.x ++; - SetSize(sz); - sz.x --; - SetSize(sz); - */ - - /* - wxSize sz(GetSize()); - wxSizeEvent sizeEvent(sz, GetId()); - sizeEvent.SetEventObject(this); - GetEventHandler()->ProcessEvent(sizeEvent); - Refresh(); - */ - s_bFirstTime = false; - } -#endif -} - -// Implementation: calculate the layout of the view rect -// and resize the children if required -bool wxNotebook::RefreshLayout(bool force) -{ - if (m_tabView) - { - wxRect oldRect = m_tabView->GetViewRect(); - - int cw, ch; - GetClientSize(& cw, & ch); - - int tabHeight = m_tabView->GetTotalTabHeight(); - wxRect rect; - rect.x = 4; - rect.y = tabHeight + 4; - rect.width = cw - 8; - rect.height = ch - 4 - rect.y ; - - m_tabView->SetViewRect(rect); - - m_tabView->LayoutTabs(); - - // Need to do it a 2nd time to get the tab height with - // the new view width, since changing the view width changes the - // tab layout. - tabHeight = m_tabView->GetTotalTabHeight(); - rect.x = 4; - rect.y = tabHeight + 4; - rect.width = cw - 8; - rect.height = ch - 4 - rect.y ; - - m_tabView->SetViewRect(rect); - - m_tabView->LayoutTabs(); - - if (!force && (rect == oldRect)) - return false; - - // fit the notebook page to the tab control's display area - - size_t nCount = m_pages.Count(); - for ( size_t nPage = 0; nPage < nCount; nPage++ ) { - wxNotebookPage *pPage = m_pages[nPage]; - wxRect clientRect = GetAvailableClientSize(); - if (pPage->IsShown()) - { - pPage->SetSize(clientRect.x, clientRect.y, clientRect.width, clientRect.height); - if ( pPage->GetAutoLayout() ) - pPage->Layout(); - } - } - Refresh(); - } - return true; -} - -void wxNotebook::OnSelChange(wxBookCtrlEvent& event) -{ - // is it our tab control? - if ( event.GetEventObject() == this ) - { - if (event.GetSelection() != m_selection) - ChangePage(event.GetOldSelection(), event.GetSelection()); - } - - // we want to give others a chance to process this message as well - event.Skip(); -} - -void wxNotebook::OnSetFocus(wxFocusEvent& event) -{ - // set focus to the currently selected page if any - if ( m_selection != -1 ) - m_pages[m_selection]->SetFocus(); - - event.Skip(); -} - -void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event) -{ - if ( event.IsWindowChange() ) - { - // change pages - AdvanceSelection(event.GetDirection()); - } - else { - // pass to the parent - if ( GetParent() ) - { - event.SetCurrentFocus(this); - GetParent()->ProcessWindowEvent(event); - } - } -} - -// ---------------------------------------------------------------------------- -// wxNotebook base class virtuals -// ---------------------------------------------------------------------------- - -// override these 2 functions to do nothing: everything is done in OnSize - -void wxNotebook::SetConstraintSizes(bool /* recurse */) -{ - // don't set the sizes of the pages - their correct size is not yet known - wxControl::SetConstraintSizes(false); -} - -bool wxNotebook::DoPhase(int /* nPhase */) -{ - return true; -} - -void wxNotebook::Command(wxCommandEvent& WXUNUSED(event)) -{ - wxFAIL_MSG(wxT("wxNotebook::Command not implemented")); -} - -// ---------------------------------------------------------------------------- -// wxNotebook helper functions -// ---------------------------------------------------------------------------- - -// hide the currently active panel and show the new one -void wxNotebook::ChangePage(int nOldSel, int nSel) -{ - // cout << "ChangePage: " << nOldSel << ", " << nSel << "\n"; - wxASSERT( nOldSel != nSel ); // impossible - - if ( nOldSel != -1 ) { - m_pages[nOldSel]->Show(false); - m_pages[nOldSel]->Lower(); - } - - wxNotebookPage *pPage = m_pages[nSel]; - - wxRect clientRect = GetAvailableClientSize(); - pPage->SetSize(clientRect.x, clientRect.y, clientRect.width, clientRect.height); - - Refresh(); - - pPage->Show(true); - pPage->Raise(); - pPage->SetFocus(); - - m_selection = nSel; -} - -void wxNotebook::OnMouseEvent(wxMouseEvent& event) -{ - if (m_tabView) - m_tabView->OnEvent(event); -} - -void wxNotebook::OnPaint(wxPaintEvent& WXUNUSED(event) ) -{ - wxPaintDC dc(this); - if (m_tabView) - m_tabView->Draw(dc); -} - -wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage) const -{ - // MBN: since the total tab height is really a function of the - // width, this should really call - // GetTotalTabHeightPretendingWidthIs(), but the current - // implementation will suffice, provided the wxNotebook has been - // created with a sensible initial width. - return wxSize( sizePage.x + 12, - sizePage.y + m_tabView->GetTotalTabHeight() + 6 + 4 ); -} - -wxRect wxNotebook::GetAvailableClientSize() -{ - int cw, ch; - GetClientSize(& cw, & ch); - - int tabHeight = m_tabView->GetTotalTabHeight(); - - // TODO: these margins should be configurable. - wxRect rect; - rect.x = 6; - rect.y = tabHeight + 6; - rect.width = cw - 12; - rect.height = ch - 4 - rect.y ; - - return rect; -} - -/* - * wxNotebookTabView - */ - -wxIMPLEMENT_CLASS(wxNotebookTabView, wxTabView); - -wxNotebookTabView::wxNotebookTabView(wxNotebook *notebook, long style) - : wxTabView(style), m_nextid(1) -{ - m_notebook = notebook; - - m_notebook->SetTabView(this); - - SetWindow(m_notebook); -} - -wxNotebookTabView::~wxNotebookTabView(void) -{ -} - -int wxNotebookTabView::GetId(wxNotebookPage *page) -{ - int& id = m_pageToId[page]; - - if (!id) - { - id = m_nextid++; - m_idToPage[id] = page; - } - - return id; -} - -// Called when a tab is activated -void wxNotebookTabView::OnTabActivate(int activateId, int deactivateId) -{ - if (!m_notebook) - return; - - wxBookCtrlEvent event(wxEVT_NOTEBOOK_PAGE_CHANGED, m_notebook->GetId()); - - // Translate from wxTabView's ids (which aren't position-dependent) - // to wxNotebook's (which are). - wxNotebookPage* pActive = GetPage(activateId); - wxNotebookPage* pDeactive = GetPage(deactivateId); - - int activatePos = m_notebook->FindPagePosition(pActive); - int deactivatePos = m_notebook->FindPagePosition(pDeactive); - - event.SetEventObject(m_notebook); - event.SetSelection(activatePos); - event.SetOldSelection(deactivatePos); - m_notebook->GetEventHandler()->ProcessEvent(event); -} - -// Allows Vetoing -bool wxNotebookTabView::OnTabPreActivate(int activateId, int deactivateId) -{ - bool retval = true; - - if (m_notebook) - { - wxBookCtrlEvent event(wxEVT_NOTEBOOK_PAGE_CHANGING, m_notebook->GetId()); - - // Translate from wxTabView's ids (which aren't position-dependent) - // to wxNotebook's (which are). - wxNotebookPage* pActive = GetPage(activateId); - wxNotebookPage* pDeactive = GetPage(deactivateId); - - int activatePos = m_notebook->FindPagePosition(pActive); - int deactivatePos = m_notebook->FindPagePosition(pDeactive); - - event.SetEventObject(m_notebook); - event.SetSelection(activatePos); - event.SetOldSelection(deactivatePos); - if (m_notebook->GetEventHandler()->ProcessEvent(event)) - { - retval = event.IsAllowed(); - } - } - return retval; -} - -#endif // wxUSE_NOTEBOOK diff --git a/Externals/wxWidgets3/src/generic/notifmsgg.cpp b/Externals/wxWidgets3/src/generic/notifmsgg.cpp deleted file mode 100644 index 0d5b3c1461..0000000000 --- a/Externals/wxWidgets3/src/generic/notifmsgg.cpp +++ /dev/null @@ -1,527 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/generic/notifmsgg.cpp -// Purpose: generic implementation of wxGenericNotificationMessage -// Author: Vadim Zeitlin -// Created: 2007-11-24 -// Copyright: (c) 2007 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// for compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_NOTIFICATION_MESSAGE - -#ifndef WX_PRECOMP - #include "wx/frame.h" - #include "wx/timer.h" - #include "wx/sizer.h" - #include "wx/statbmp.h" - #include "wx/settings.h" - #include "wx/panel.h" -#endif //WX_PRECOMP - -#include "wx/artprov.h" -#include "wx/bmpbuttn.h" - -// even if the platform has the native implementation, we still normally want -// to use the generic one (unless it's totally unsuitable for the target UI) -// because it may provide more features, so include -// wx/generic/notifmsg.h to get wxGenericNotificationMessage declaration even -// if wx/notifmsg.h only declares wxNotificationMessage itself (if it already -// uses the generic version, the second inclusion will do no harm) -#include "wx/notifmsg.h" -#include "wx/generic/notifmsg.h" -#include "wx/generic/private/notifmsg.h" -#include "wx/display.h" -#include "wx/textwrapper.h" - -// ---------------------------------------------------------------------------- -// wxNotificationMessageWindow -// ---------------------------------------------------------------------------- - -class wxNotificationMessageWindow : public wxFrame -{ -public: - wxNotificationMessageWindow(wxGenericNotificationMessageImpl* notificationImpl); - - virtual ~wxNotificationMessageWindow(); - - void Set(int timeout); - - bool Hide(); - - void SetMessageTitle(const wxString& title); - - void SetMessage(const wxString& message); - - void SetMessageIcon(const wxIcon& icon); - - bool AddAction(wxWindowID actionid, const wxString &label); - -private: - void OnClose(wxCloseEvent& event); - void OnTimer(wxTimerEvent& event); - void OnNotificationClicked(wxMouseEvent& event); - void OnNotificationMouseEnter(wxMouseEvent& event); - void OnNotificationMouseLeave(wxMouseEvent& event); - void OnCloseClicked(wxCommandEvent& event); - void OnActionButtonClicked(wxCommandEvent& event); - - // Dialog elements - wxPanel* m_messagePanel; - wxStaticBitmap* m_messageBmp; - wxStaticText* m_messageText; - wxStaticText* m_messageTitle; - wxBitmapButton* m_closeBtn; - wxBoxSizer* m_buttonSizer; - - wxTimer m_timer; - int m_timeout; - long m_timeoutTargetTime; - int m_mouseActiveCount; - - wxGenericNotificationMessageImpl* m_notificationImpl; - - void PrepareNotificationControl(wxWindow* ctrl, bool handleClick = true); - - static wxPoint ms_presentationPos; - - static int ms_presentationDirection; - - static wxVector ms_visibleNotifications; - - static void AddVisibleNotification(wxNotificationMessageWindow* notif); - - static void RemoveVisibleNotification(wxNotificationMessageWindow* notif); - - static void ResizeAndFitVisibleNotifications(); - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_NO_COPY_CLASS(wxNotificationMessageWindow); -}; - -int wxNotificationMessageWindow::ms_presentationDirection = 0; -wxPoint wxNotificationMessageWindow::ms_presentationPos = wxDefaultPosition; - -// ============================================================================ -// wxNotificationMessageWindow implementation -// ============================================================================ - -wxBEGIN_EVENT_TABLE(wxNotificationMessageWindow, wxFrame) - EVT_CLOSE(wxNotificationMessageWindow::OnClose) - - EVT_TIMER(wxID_ANY, wxNotificationMessageWindow::OnTimer) -wxEND_EVENT_TABLE() - -wxVector wxNotificationMessageWindow::ms_visibleNotifications; - -wxNotificationMessageWindow::wxNotificationMessageWindow(wxGenericNotificationMessageImpl* notificationImpl) - : wxFrame(NULL, wxID_ANY, _("Notice"), - wxDefaultPosition, wxDefaultSize, - wxBORDER_NONE | wxFRAME_TOOL_WINDOW | wxSTAY_ON_TOP /* no caption, no border styles */), - m_timer(this), - m_mouseActiveCount(0), - m_notificationImpl(notificationImpl) -{ - m_buttonSizer = NULL; - - SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNSHADOW)); - - m_messagePanel = new wxPanel(this, wxID_ANY); - wxSizer * const msgSizer = new wxBoxSizer(wxHORIZONTAL); - m_messagePanel->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)); - m_messagePanel->SetSizer(msgSizer); - PrepareNotificationControl(m_messagePanel); - - // Add message icon to layout - m_messageBmp = new wxStaticBitmap - ( - m_messagePanel, - wxID_ANY, - wxArtProvider::GetMessageBoxIcon(wxICON_INFORMATION) - ); - m_messageBmp->Hide(); - PrepareNotificationControl(m_messageBmp); - msgSizer->Add(m_messageBmp, wxSizerFlags().Centre().DoubleBorder()); - - // Create title and message sizers - wxSizer* textSizer = new wxBoxSizer(wxVERTICAL); - - m_messageTitle = new wxStaticText(m_messagePanel, wxID_ANY, wxString()); - m_messageTitle->SetFont(m_messageTitle->GetFont().MakeBold()); - textSizer->Add(m_messageTitle, wxSizerFlags(0).Border()); - m_messageTitle->Hide(); - PrepareNotificationControl(m_messageTitle); - - m_messageText = new wxStaticText(m_messagePanel, wxID_ANY, wxString()); - textSizer->Add(m_messageText, wxSizerFlags(0).Border(wxLEFT | wxRIGHT | wxBOTTOM)); - PrepareNotificationControl(m_messageText); - - msgSizer->Add(textSizer, wxSizerFlags(1).Center()); - - // Add a single close button if no actions are specified - m_closeBtn = wxBitmapButton::NewCloseButton(m_messagePanel, wxID_ANY); - msgSizer->Add(m_closeBtn, wxSizerFlags(0).Border(wxALL, 3).Top()); - m_closeBtn->Bind(wxEVT_BUTTON, &wxNotificationMessageWindow::OnCloseClicked, this); - PrepareNotificationControl(m_closeBtn, false); - - wxSizer * const sizerTop = new wxBoxSizer(wxHORIZONTAL); - sizerTop->Add(m_messagePanel, wxSizerFlags().Border(wxALL, FromDIP(1))); - SetSizer(sizerTop); -} - -wxNotificationMessageWindow::~wxNotificationMessageWindow() -{ - RemoveVisibleNotification(this); -} - -void wxNotificationMessageWindow::PrepareNotificationControl(wxWindow* ctrl, bool handleClick) -{ - ctrl->Bind(wxEVT_ENTER_WINDOW, &wxNotificationMessageWindow::OnNotificationMouseEnter, this); - ctrl->Bind(wxEVT_LEAVE_WINDOW, &wxNotificationMessageWindow::OnNotificationMouseLeave, this); - - if ( handleClick ) - ctrl->Bind(wxEVT_LEFT_DOWN, &wxNotificationMessageWindow::OnNotificationClicked, this); -} - -void wxNotificationMessageWindow::SetMessageTitle(const wxString& title) -{ - m_messageTitle->SetLabelText(title); - m_messageTitle->Show(!title.empty()); -} - -void wxNotificationMessageWindow::SetMessage(const wxString& message) -{ - m_messageText->SetLabelText(message); - m_messageText->Show(!message.empty()); -} - -void wxNotificationMessageWindow::SetMessageIcon(const wxIcon& icon) -{ - m_messageBmp->SetBitmap(icon); - m_messageBmp->Show(icon.IsOk()); -} - -bool wxNotificationMessageWindow::AddAction(wxWindowID actionid, const wxString &label) -{ - wxSizer* msgSizer = m_messagePanel->GetSizer(); - if ( m_buttonSizer == NULL ) - { - msgSizer->Detach(m_closeBtn); - m_closeBtn->Hide(); - m_buttonSizer = new wxBoxSizer(wxVERTICAL); - msgSizer->Add(m_buttonSizer, wxSizerFlags(0).Center().Border()); - } - - wxButton* actionButton = new wxButton(m_messagePanel, actionid, label); - actionButton->Bind(wxEVT_BUTTON, &wxNotificationMessageWindow::OnActionButtonClicked, this); - PrepareNotificationControl(actionButton, false); - int borderDir = (m_buttonSizer->GetChildren().empty()) ? 0 : wxTOP; - m_buttonSizer->Add(actionButton, wxSizerFlags(0).Border(borderDir).Expand()); - - return true; -} - - -bool wxNotificationMessageWindow::Hide() -{ - if ( m_timer.IsRunning() ) - m_timer.Stop(); - - RemoveVisibleNotification(this); - return wxFrame::HideWithEffect(wxSHOW_EFFECT_BLEND); -} - -void wxNotificationMessageWindow::Set(int timeout) -{ - Layout(); - Fit(); - - AddVisibleNotification(this); - - if ( timeout != wxGenericNotificationMessage::Timeout_Never ) - { - // wxTimer uses ms, timeout is in seconds - m_timer.Start(500); - m_timeout = timeout; - m_timeoutTargetTime = wxGetUTCTime() + timeout; - } - else if ( m_timer.IsRunning() ) - { - m_timer.Stop(); - } -} - -void wxNotificationMessageWindow::OnClose(wxCloseEvent& WXUNUSED(event)) -{ - wxCommandEvent evt(wxEVT_NOTIFICATION_MESSAGE_DISMISSED); - m_notificationImpl->ProcessNotificationEvent(evt); - - if ( m_timer.IsRunning() ) - m_timer.Stop(); - - m_notificationImpl->Close(); -} - -void wxNotificationMessageWindow::OnTimer(wxTimerEvent& WXUNUSED(event)) -{ - if ( m_mouseActiveCount > 0 ) - { - m_timeoutTargetTime = wxGetUTCTime() + m_timeout; - } - else if ( m_timeoutTargetTime != -1 && - wxGetUTCTime() >= m_timeoutTargetTime ) - { - m_notificationImpl->Close(); - } -} - -void wxNotificationMessageWindow::OnNotificationClicked(wxMouseEvent& WXUNUSED(event)) -{ - wxCommandEvent evt(wxEVT_NOTIFICATION_MESSAGE_CLICK); - m_notificationImpl->ProcessNotificationEvent(evt); - - m_notificationImpl->Close(); -} - -void wxNotificationMessageWindow::OnNotificationMouseEnter(wxMouseEvent& WXUNUSED(event)) -{ - m_mouseActiveCount++; -} - -void wxNotificationMessageWindow::OnNotificationMouseLeave(wxMouseEvent& WXUNUSED(event)) -{ - m_mouseActiveCount--; -} - -void wxNotificationMessageWindow::OnCloseClicked(wxCommandEvent& WXUNUSED(event)) -{ - wxCommandEvent evt(wxEVT_NOTIFICATION_MESSAGE_DISMISSED); - m_notificationImpl->ProcessNotificationEvent(evt); - - m_notificationImpl->Close(); -} - -void wxNotificationMessageWindow::OnActionButtonClicked(wxCommandEvent& event) -{ - wxCommandEvent evt(wxEVT_NOTIFICATION_MESSAGE_ACTION, event.GetId()); - m_notificationImpl->ProcessNotificationEvent(evt); - - m_notificationImpl->Close(); -} - -void wxNotificationMessageWindow::AddVisibleNotification(wxNotificationMessageWindow* notif) -{ - bool found = false; - for ( wxVector::iterator it = ms_visibleNotifications.begin(); - it != ms_visibleNotifications.end(); it++ ) - { - if ( *it == notif ) - { - found = true; - break; - } - } - - if ( !found ) - ms_visibleNotifications.push_back(notif); - - ResizeAndFitVisibleNotifications(); -} - -void wxNotificationMessageWindow::RemoveVisibleNotification(wxNotificationMessageWindow* notif) -{ - for ( wxVector::iterator it = ms_visibleNotifications.begin(); - it != ms_visibleNotifications.end(); it++ ) - { - if ( *it == notif ) - { - ms_visibleNotifications.erase(it); - break; - } - } - ResizeAndFitVisibleNotifications(); -} - -void wxNotificationMessageWindow::ResizeAndFitVisibleNotifications() -{ - if ( ms_presentationDirection == 0 ) - { - // Determine presentation position - - wxDisplay display; - wxRect clientArea = display.GetClientArea(); - wxRect geom = display.GetGeometry(); - if ( clientArea.y > 0 ) // Taskbar is at top - { - ms_presentationDirection = 1; - ms_presentationPos = clientArea.GetTopRight(); - } - else if ( clientArea.GetHeight() != geom.GetHeight() ) // Taskbar at bottom - { - ms_presentationDirection = -1; - ms_presentationPos = clientArea.GetBottomRight(); - } - else // Default to upper right screen corner with some padding - { - ms_presentationDirection = 1; - ms_presentationPos.x = geom.GetWidth() - 30; - ms_presentationPos.y = 30; - } - } - - int maxWidth = -1; - - // Determine max width - for (wxVector::iterator notif = ms_visibleNotifications.begin(); - notif != ms_visibleNotifications.end(); ++notif) - { - wxSize notifSize = (*notif)->GetSize(); - if ( notifSize.GetWidth() > maxWidth ) - maxWidth = notifSize.GetWidth(); - } - - int notifPadding = 2; - - wxPoint presentPos = ms_presentationPos; - presentPos.x -= notifPadding + maxWidth; - - int prevNotifHeight = 0; - - for (wxVector::iterator notif = ms_visibleNotifications.begin(); - notif != ms_visibleNotifications.end(); ++notif) - { - // Modify existing maxwidth - wxSize notifSize = (*notif)->GetSize(); - if ( notifSize.GetWidth() < maxWidth ) - { - notifSize.SetWidth(maxWidth); - (*notif)->SetSize(notifSize); - (*notif)->Layout(); - } - - if ( ms_presentationDirection > 0 ) - { - presentPos.y += (notifPadding + prevNotifHeight); - prevNotifHeight = notifSize.GetHeight(); - } - else - { - presentPos.y -= (notifPadding + notifSize.GetHeight()); - } - - (*notif)->SetPosition(presentPos); - } -} - -// ============================================================================ -// wxGenericNotificationMessage implementation -// ============================================================================ - -/* static */ void wxGenericNotificationMessage::SetDefaultTimeout(int timeout) -{ - wxGenericNotificationMessageImpl::SetDefaultTimeout(timeout); -} - -void wxGenericNotificationMessage::Init() -{ - m_impl = new wxGenericNotificationMessageImpl(this); -} - -// ---------------------------------------------------------------------------- -// wxGenericNotificationMessageImpl -// ---------------------------------------------------------------------------- - -int wxGenericNotificationMessageImpl::ms_timeout = 3; - -wxGenericNotificationMessageImpl::wxGenericNotificationMessageImpl(wxNotificationMessageBase* notification) : - wxNotificationMessageImpl(notification) -{ - m_window = new wxNotificationMessageWindow(this); -} - -wxGenericNotificationMessageImpl::~wxGenericNotificationMessageImpl() -{ - m_window->Destroy(); -} - -/* static */ void wxGenericNotificationMessageImpl::SetDefaultTimeout(int timeout) -{ - wxASSERT_MSG(timeout > 0, - "negative or zero default timeout doesn't make sense"); - - ms_timeout = timeout; -} - -bool wxGenericNotificationMessageImpl::Show(int timeout) -{ - if ( timeout == wxNotificationMessageBase::Timeout_Auto ) - { - timeout = GetDefaultTimeout(); - } - - SetActive(true); - m_window->Set(timeout); - - m_window->ShowWithEffect(wxSHOW_EFFECT_BLEND); - - return true; -} - -bool wxGenericNotificationMessageImpl::Close() -{ - if ( !m_window ) - return false; - - m_window->Hide(); - - SetActive(false); - - return true; -} - -void wxGenericNotificationMessageImpl::SetTitle(const wxString& title) -{ - m_window->SetMessageTitle(title); -} - -void wxGenericNotificationMessageImpl::SetMessage(const wxString& message) -{ - m_window->SetMessage(message); -} - -void wxGenericNotificationMessageImpl::SetParent(wxWindow *WXUNUSED(parent)) -{ - -} - -void wxGenericNotificationMessageImpl::SetFlags(int flags) -{ - m_window->SetMessageIcon( wxArtProvider::GetMessageBoxIcon(flags) ); -} - -void wxGenericNotificationMessageImpl::SetIcon(const wxIcon& icon) -{ - m_window->SetMessageIcon(icon); -} - -bool wxGenericNotificationMessageImpl::AddAction(wxWindowID actionid, const wxString &label) -{ - return m_window->AddAction(actionid, label); -} - - -#endif // wxUSE_NOTIFICATION_MESSAGE diff --git a/Externals/wxWidgets3/src/generic/numdlgg.cpp b/Externals/wxWidgets3/src/generic/numdlgg.cpp deleted file mode 100644 index 17c15f8788..0000000000 --- a/Externals/wxWidgets3/src/generic/numdlgg.cpp +++ /dev/null @@ -1,191 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/generic/numdlgg.cpp -// Purpose: wxGetNumberFromUser implementation -// Author: Vadim Zeitlin -// Modified by: -// Created: 23.07.99 -// Copyright: (c) Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_NUMBERDLG - -#ifndef WX_PRECOMP - #include - - #include "wx/utils.h" - #include "wx/dialog.h" - #include "wx/button.h" - #include "wx/stattext.h" - #include "wx/textctrl.h" - #include "wx/intl.h" - #include "wx/sizer.h" -#endif - -#if wxUSE_STATLINE - #include "wx/statline.h" -#endif - -#if wxUSE_SPINCTRL -#include "wx/spinctrl.h" -#endif - -// this is where wxGetNumberFromUser() is declared -#include "wx/numdlg.h" - -#if !wxUSE_SPINCTRL - // wxTextCtrl will do instead of wxSpinCtrl if we don't have it - #define wxSpinCtrl wxTextCtrl -#endif - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxNumberEntryDialog -// ---------------------------------------------------------------------------- - -wxBEGIN_EVENT_TABLE(wxNumberEntryDialog, wxDialog) - EVT_BUTTON(wxID_OK, wxNumberEntryDialog::OnOK) - EVT_BUTTON(wxID_CANCEL, wxNumberEntryDialog::OnCancel) -wxEND_EVENT_TABLE() - -wxIMPLEMENT_CLASS(wxNumberEntryDialog, wxDialog); - -bool wxNumberEntryDialog::Create(wxWindow *parent, - const wxString& message, - const wxString& prompt, - const wxString& caption, - long value, - long min, - long max, - const wxPoint& pos) -{ - if ( !wxDialog::Create(GetParentForModalDialog(parent, 0), - wxID_ANY, caption, - pos, wxDefaultSize) ) - { - return false; - } - - m_value = value; - m_max = max; - m_min = min; - - wxBeginBusyCursor(); - - wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL ); -#if wxUSE_STATTEXT - // 1) text message - topsizer->Add( CreateTextSizer( message ), 0, wxALL, 10 ); -#endif - - // 2) prompt and text ctrl - wxBoxSizer *inputsizer = new wxBoxSizer( wxHORIZONTAL ); - -#if wxUSE_STATTEXT - // prompt if any - if (!prompt.empty()) - inputsizer->Add( new wxStaticText( this, wxID_ANY, prompt ), 0, wxCENTER | wxLEFT, 10 ); -#endif - - // spin ctrl - wxString valStr; - valStr.Printf(wxT("%ld"), m_value); -#if wxUSE_SPINCTRL - m_spinctrl = new wxSpinCtrl(this, wxID_ANY, valStr, wxDefaultPosition, wxSize( 140, wxDefaultCoord ), wxSP_ARROW_KEYS, (int)m_min, (int)m_max, (int)m_value); -#else - m_spinctrl = new wxTextCtrl(this, wxID_ANY, valStr, wxDefaultPosition, wxSize( 140, wxDefaultCoord )); -#endif - inputsizer->Add( m_spinctrl, 1, wxCENTER | wxLEFT | wxRIGHT, 10 ); - // add both - topsizer->Add( inputsizer, 0, wxEXPAND | wxLEFT|wxRIGHT, 5 ); - - // 3) buttons if any - wxSizer *buttonSizer = CreateSeparatedButtonSizer(wxOK | wxCANCEL); - if ( buttonSizer ) - { - topsizer->Add(buttonSizer, wxSizerFlags().Expand().DoubleBorder()); - } - - SetSizer( topsizer ); - SetAutoLayout( true ); - - topsizer->SetSizeHints( this ); - topsizer->Fit( this ); - - Centre( wxBOTH ); - - m_spinctrl->SetSelection(-1, -1); - m_spinctrl->SetFocus(); - - wxEndBusyCursor(); - - return true; -} - -void wxNumberEntryDialog::OnOK(wxCommandEvent& WXUNUSED(event)) -{ -#if !wxUSE_SPINCTRL - wxString tmp = m_spinctrl->GetValue(); - if ( wxSscanf(tmp, wxT("%ld"), &m_value) != 1 ) - EndModal(wxID_CANCEL); - else -#else - m_value = m_spinctrl->GetValue(); -#endif - if ( m_value < m_min || m_value > m_max ) - { - // not a number or out of range - m_value = -1; - EndModal(wxID_CANCEL); - } - - EndModal(wxID_OK); -} - -void wxNumberEntryDialog::OnCancel(wxCommandEvent& WXUNUSED(event)) -{ - EndModal(wxID_CANCEL); -} - -// ---------------------------------------------------------------------------- -// global functions -// ---------------------------------------------------------------------------- - -// wxGetTextFromUser is in utilscmn.cpp - -long wxGetNumberFromUser(const wxString& msg, - const wxString& prompt, - const wxString& title, - long value, - long min, - long max, - wxWindow *parent, - const wxPoint& pos) -{ - wxNumberEntryDialog dialog(parent, msg, prompt, title, - value, min, max, pos); - if (dialog.ShowModal() == wxID_OK) - return dialog.GetValue(); - - return -1; -} - -#endif // wxUSE_NUMBERDLG diff --git a/Externals/wxWidgets3/src/generic/odcombo.cpp b/Externals/wxWidgets3/src/generic/odcombo.cpp deleted file mode 100644 index 71cc3ad5f8..0000000000 --- a/Externals/wxWidgets3/src/generic/odcombo.cpp +++ /dev/null @@ -1,1210 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/generic/odcombo.cpp -// Purpose: wxOwnerDrawnComboBox, wxVListBoxComboPopup -// Author: Jaakko Salli -// Modified by: -// Created: Apr-30-2006 -// Copyright: (c) 2005 Jaakko Salli -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_ODCOMBOBOX - -#include "wx/odcombo.h" - -#ifndef WX_PRECOMP - #include "wx/log.h" - #include "wx/combobox.h" - #include "wx/dcclient.h" - #include "wx/settings.h" - #include "wx/dialog.h" - #include "wx/textctrl.h" -#endif - -#include "wx/combo.h" - -// ============================================================================ -// implementation -// ============================================================================ - -// time in milliseconds before partial completion buffer drops -#define wxODCB_PARTIAL_COMPLETION_TIME 1000 - -// ---------------------------------------------------------------------------- -// wxVListBoxComboPopup is a wxVListBox customized to act as a popup control -// -// ---------------------------------------------------------------------------- - - -wxBEGIN_EVENT_TABLE(wxVListBoxComboPopup, wxVListBox) - EVT_MOTION(wxVListBoxComboPopup::OnMouseMove) - EVT_KEY_DOWN(wxVListBoxComboPopup::OnKey) - EVT_CHAR(wxVListBoxComboPopup::OnChar) - EVT_LEFT_UP(wxVListBoxComboPopup::OnLeftClick) -wxEND_EVENT_TABLE() - - -void wxVListBoxComboPopup::Init() -{ - m_widestWidth = 0; - m_widestItem = -1; - m_widthsDirty = false; - m_findWidest = false; - m_itemHeight = 0; - m_value = -1; - m_itemHover = -1; - m_clientDataItemsType = wxClientData_None; - m_partialCompletionString = wxEmptyString; -} - -bool wxVListBoxComboPopup::Create(wxWindow* parent) -{ - if ( !wxVListBox::Create(parent, - wxID_ANY, - wxDefaultPosition, - wxDefaultSize, - wxBORDER_SIMPLE | wxLB_INT_HEIGHT | wxWANTS_CHARS) ) - return false; - - m_useFont = m_combo->GetFont(); - - wxVListBox::SetItemCount(m_strings.GetCount()); - - // TODO: Move this to SetFont - m_itemHeight = GetCharHeight() + 0; - - return true; -} - -wxVListBoxComboPopup::~wxVListBoxComboPopup() -{ - Clear(); -} - -void wxVListBoxComboPopup::SetFocus() -{ - // Suppress SetFocus() warning by simply not calling it. This combo popup - // has already been designed with the assumption that SetFocus() may not - // do anything useful, so it really doesn't need to be called. -#ifdef __WXMSW__ - // -#else - wxVListBox::SetFocus(); -#endif -} - -bool wxVListBoxComboPopup::LazyCreate() -{ - // NB: There is a bug with wxVListBox that can be avoided by creating - // it later (bug causes empty space to be shown if initial selection - // is at the end of a list longer than the control can show at once). - return true; -} - -// paint the control itself -void wxVListBoxComboPopup::PaintComboControl( wxDC& dc, const wxRect& rect ) -{ - if ( !(m_combo->GetWindowStyle() & wxODCB_STD_CONTROL_PAINT) ) - { - int flags = wxODCB_PAINTING_CONTROL; - - if ( m_combo->ShouldDrawFocus() ) - flags |= wxODCB_PAINTING_SELECTED; - - OnDrawBg(dc, rect, m_value, flags); - - if ( m_value >= 0 ) - { - OnDrawItem(dc,rect,m_value,flags); - return; - } - } - - wxComboPopup::PaintComboControl(dc,rect); -} - -void wxVListBoxComboPopup::OnDrawItem(wxDC& dc, const wxRect& rect, size_t n) const -{ - // TODO: Maybe this code could be moved to wxVListBox::OnPaint? - dc.SetFont(m_useFont); - - int flags = 0; - - // Set correct text colour for selected items - if ( wxVListBox::GetSelection() == (int) n ) - { - dc.SetTextForeground( wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT) ); - flags |= wxODCB_PAINTING_SELECTED; - } - else - { - dc.SetTextForeground( wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT) ); - } - - OnDrawItem(dc,rect,(int)n,flags); -} - -wxCoord wxVListBoxComboPopup::OnMeasureItem(size_t n) const -{ - wxOwnerDrawnComboBox* combo = (wxOwnerDrawnComboBox*) m_combo; - - wxASSERT_MSG( wxDynamicCast(combo, wxOwnerDrawnComboBox), - wxT("you must subclass wxVListBoxComboPopup for drawing and measuring methods") ); - - wxCoord h = combo->OnMeasureItem(n); - if ( h < 0 ) - h = m_itemHeight; - return h; -} - -wxCoord wxVListBoxComboPopup::OnMeasureItemWidth(size_t n) const -{ - wxOwnerDrawnComboBox* combo = (wxOwnerDrawnComboBox*) m_combo; - - wxASSERT_MSG( wxDynamicCast(combo, wxOwnerDrawnComboBox), - wxT("you must subclass wxVListBoxComboPopup for drawing and measuring methods") ); - - return combo->OnMeasureItemWidth(n); -} - -void wxVListBoxComboPopup::OnDrawBg( wxDC& dc, - const wxRect& rect, - int item, - int flags ) const -{ - wxOwnerDrawnComboBox* combo = (wxOwnerDrawnComboBox*) m_combo; - - wxASSERT_MSG( wxDynamicCast(combo, wxOwnerDrawnComboBox), - wxT("you must subclass wxVListBoxComboPopup for drawing and measuring methods") ); - - if ( IsCurrent((size_t)item) && !(flags & wxODCB_PAINTING_CONTROL) ) - flags |= wxODCB_PAINTING_SELECTED; - - combo->OnDrawBackground(dc,rect,item,flags); -} - -void wxVListBoxComboPopup::OnDrawBackground(wxDC& dc, const wxRect& rect, size_t n) const -{ - OnDrawBg(dc,rect,(int)n,0); -} - -// This is called from wxVListBoxComboPopup::OnDrawItem, with text colour and font prepared -void wxVListBoxComboPopup::OnDrawItem( wxDC& dc, const wxRect& rect, int item, int flags ) const -{ - wxOwnerDrawnComboBox* combo = (wxOwnerDrawnComboBox*) m_combo; - - wxASSERT_MSG( wxDynamicCast(combo, wxOwnerDrawnComboBox), - wxT("you must subclass wxVListBoxComboPopup for drawing and measuring methods") ); - - combo->OnDrawItem(dc,rect,item,flags); -} - -void wxVListBoxComboPopup::DismissWithEvent() -{ - StopPartialCompletion(); - - int selection = wxVListBox::GetSelection(); - - Dismiss(); - - if ( selection != wxNOT_FOUND ) - m_stringValue = m_strings[selection]; - else - m_stringValue = wxEmptyString; - - if ( m_stringValue != m_combo->GetValue() ) - m_combo->SetValueByUser(m_stringValue); - - m_value = selection; - - SendComboBoxEvent(selection); -} - -void wxVListBoxComboPopup::SendComboBoxEvent( int selection ) -{ - wxCommandEvent evt(wxEVT_COMBOBOX,m_combo->GetId()); - - evt.SetEventObject(m_combo); - - evt.SetInt(selection); - - // Set client data, if any - if ( selection >= 0 && (int)m_clientDatas.GetCount() > selection ) - { - void* clientData = m_clientDatas[selection]; - if ( m_clientDataItemsType == wxClientData_Object ) - evt.SetClientObject((wxClientData*)clientData); - else - evt.SetClientData(clientData); - } - - m_combo->GetEventHandler()->AddPendingEvent(evt); -} - -// returns true if key was consumed -bool wxVListBoxComboPopup::HandleKey( int keycode, bool saturate, wxChar keychar ) -{ - const int itemCount = GetCount(); - - // keys do nothing in the empty control and returning immediately avoids - // using invalid indices below - if ( !itemCount ) - return false; - - int value = m_value; - int comboStyle = m_combo->GetWindowStyle(); - - if ( keychar > 0 ) - { - // we have character equivalent of the keycode; filter out these that - // are not printable characters - if ( !wxIsprint(keychar) ) - keychar = 0; - } - - const bool readOnly = (comboStyle & wxCB_READONLY) != 0; - - if ( keycode == WXK_DOWN || keycode == WXK_NUMPAD_DOWN || ( keycode == WXK_RIGHT && readOnly ) ) - { - value++; - StopPartialCompletion(); - } - else if ( keycode == WXK_UP || keycode == WXK_NUMPAD_UP || ( keycode == WXK_LEFT && readOnly ) ) - { - value--; - StopPartialCompletion(); - } - else if ( keycode == WXK_PAGEDOWN || keycode == WXK_NUMPAD_PAGEDOWN ) - { - value+=10; - StopPartialCompletion(); - } - else if ( keycode == WXK_PAGEUP || keycode == WXK_NUMPAD_PAGEUP ) - { - value-=10; - StopPartialCompletion(); - } - else if ( ( keycode == WXK_HOME || keycode == WXK_NUMPAD_HOME ) && readOnly ) - { - value=0; - StopPartialCompletion(); - } - else if ( ( keycode == WXK_END || keycode == WXK_NUMPAD_END ) && readOnly ) - { - value=itemCount-1; - StopPartialCompletion(); - } - else if ( keychar && readOnly ) - { - // Try partial completion - - // find the new partial completion string -#if wxUSE_TIMER - if (m_partialCompletionTimer.IsRunning()) - m_partialCompletionString+=wxString(keychar); - else -#endif // wxUSE_TIMER - m_partialCompletionString=wxString(keychar); - - // now search through the values to see if this is found - int found = -1; - unsigned int length=m_partialCompletionString.length(); - int i; - for (i=0; i= length) && (! m_partialCompletionString.CmpNoCase(item.Left(length)))) - { - found=i; - break; - } - } - - if (found<0) - { - StopPartialCompletion(); - ::wxBell(); - return true; // to stop the first value being set - } - else - { - value=i; -#if wxUSE_TIMER - m_partialCompletionTimer.Start(wxODCB_PARTIAL_COMPLETION_TIME, true); -#endif // wxUSE_TIMER - } - } - else - return false; - - if ( saturate ) - { - if ( value >= itemCount ) - value = itemCount - 1; - else if ( value < 0 ) - value = 0; - } - else - { - if ( value >= itemCount ) - value -= itemCount; - else if ( value < 0 ) - value += itemCount; - } - - if ( value == m_value ) - // Even if value was same, don't skip the event - // (good for consistency) - return true; - - if ( value >= 0 ) - m_combo->ChangeValue(m_strings[value]); - - // The m_combo->SetValue() call above sets m_value to the index of this - // string. But if there are more identical string, the index is of the - // first occurrence, which may be wrong, so set the index explicitly here, - // _after_ the SetValue() call. - m_value = value; - - SendComboBoxEvent(m_value); - - return true; -} - -// stop partial completion -void wxVListBoxComboPopup::StopPartialCompletion() -{ - m_partialCompletionString = wxEmptyString; -#if wxUSE_TIMER - m_partialCompletionTimer.Stop(); -#endif // wxUSE_TIMER -} - -void wxVListBoxComboPopup::OnComboDoubleClick() -{ - // Cycle on dclick (disable saturation to allow true cycling). - if ( !::wxGetKeyState(WXK_SHIFT) ) - HandleKey(WXK_DOWN,false); - else - HandleKey(WXK_UP,false); -} - -void wxVListBoxComboPopup::OnComboKeyEvent( wxKeyEvent& event ) -{ - // Saturated key movement on - if ( !HandleKey(event.GetKeyCode(), true) ) - event.Skip(); -} - -void wxVListBoxComboPopup::OnComboCharEvent( wxKeyEvent& event ) -{ - // unlike in OnComboKeyEvent, wxEVT_CHAR contains meaningful - // printable character information, so pass it -#if wxUSE_UNICODE - const wxChar charcode = event.GetUnicodeKey(); -#else - const wxChar charcode = (wxChar)event.GetKeyCode(); -#endif - - if ( !HandleKey(event.GetKeyCode(), true, charcode) ) - event.Skip(); -} - -void wxVListBoxComboPopup::OnPopup() -{ - // *must* set value after size is set (this is because of a vlbox bug) - wxVListBox::SetSelection(m_value); -} - -void wxVListBoxComboPopup::OnMouseMove(wxMouseEvent& event) -{ - event.Skip(); - - // Move selection to cursor if it is inside the popup - - int y = event.GetPosition().y; - int fromBottom = GetClientSize().y - y; - - // Since in any case we need to find out if the last item is only - // partially visible, we might just as well replicate the HitTest - // loop here. - const size_t lineMax = GetVisibleEnd(); - for ( size_t line = GetVisibleBegin(); line < lineMax; line++ ) - { - y -= OnGetRowHeight(line); - if ( y < 0 ) - { - // Only change selection if item is fully visible - if ( (y + fromBottom) >= 0 ) - { - wxVListBox::SetSelection((int)line); - return; - } - } - } -} - -void wxVListBoxComboPopup::OnLeftClick(wxMouseEvent& WXUNUSED(event)) -{ - DismissWithEvent(); -} - -void wxVListBoxComboPopup::OnKey(wxKeyEvent& event) -{ - // Hide popup if certain key or key combination was pressed - if ( m_combo->IsKeyPopupToggle(event) ) - { - StopPartialCompletion(); - Dismiss(); - } - else if ( event.AltDown() ) - { - // On both wxGTK and wxMSW, pressing Alt down seems to - // completely freeze things in popup (ie. arrow keys and - // enter won't work). - return; - } - // Select item if ENTER is pressed - else if ( event.GetKeyCode() == WXK_RETURN || event.GetKeyCode() == WXK_NUMPAD_ENTER ) - { - DismissWithEvent(); - } - else - { - // completion is handled in OnChar() below - event.Skip(); - } -} - -void wxVListBoxComboPopup::OnChar(wxKeyEvent& event) -{ - if ( m_combo->GetWindowStyle() & wxCB_READONLY ) - { - // Process partial completion key codes here, but not the arrow keys as - // the base class will do that for us -#if wxUSE_UNICODE - const wxChar charcode = event.GetUnicodeKey(); -#else - const wxChar charcode = (wxChar)event.GetKeyCode(); -#endif - if ( wxIsprint(charcode) ) - { - OnComboCharEvent(event); - SetSelection(m_value); // ensure the highlight bar moves - return; // don't skip the event - } - } - - event.Skip(); -} - -void wxVListBoxComboPopup::Insert( const wxString& item, int pos ) -{ - // Need to change selection? - wxString strValue; - if ( !(m_combo->GetWindowStyle() & wxCB_READONLY) && - m_combo->GetValue() == item ) - { - m_value = pos; - } - - m_strings.Insert(item,pos); - if ( (int)m_clientDatas.size() >= pos ) - m_clientDatas.Insert(NULL, pos); - - m_widths.Insert(-1,pos); - m_widthsDirty = true; - - if ( IsCreated() ) - wxVListBox::SetItemCount( wxVListBox::GetItemCount()+1 ); -} - -int wxVListBoxComboPopup::Append(const wxString& item) -{ - int pos = (int)m_strings.GetCount(); - - if ( m_combo->GetWindowStyle() & wxCB_SORT ) - { - // Find position - // TODO: Could be optimized with binary search - wxArrayString strings = m_strings; - unsigned int i; - - for ( i=0; i n ) - return m_clientDatas[n]; - - return NULL; -} - -void wxVListBoxComboPopup::Delete( unsigned int item ) -{ - // Remove client data, if set - if ( m_clientDatas.GetCount() ) - { - if ( m_clientDataItemsType == wxClientData_Object ) - delete (wxClientData*) m_clientDatas[item]; - - m_clientDatas.RemoveAt(item); - } - - m_strings.RemoveAt(item); - m_widths.RemoveAt(item); - - if ( (int)item == m_widestItem ) - m_findWidest = true; - - int sel = GetSelection(); - - if ( IsCreated() ) - wxVListBox::SetItemCount( wxVListBox::GetItemCount()-1 ); - - // Fix selection - if ( (int)item < sel ) - SetSelection(sel-1); - else if ( (int)item == sel ) - SetSelection(wxNOT_FOUND); -} - -int wxVListBoxComboPopup::FindString(const wxString& s, bool bCase) const -{ - return m_strings.Index(s, bCase); -} - -bool wxVListBoxComboPopup::FindItem(const wxString& item, wxString* trueItem) -{ - int idx = m_strings.Index(item, false); - if ( idx == wxNOT_FOUND ) - return false; - if ( trueItem != NULL ) - *trueItem = m_strings[idx]; - return true; -} - -unsigned int wxVListBoxComboPopup::GetCount() const -{ - return m_strings.GetCount(); -} - -wxString wxVListBoxComboPopup::GetString( int item ) const -{ - return m_strings[item]; -} - -void wxVListBoxComboPopup::SetString( int item, const wxString& str ) -{ - m_strings[item] = str; - ItemWidthChanged(item); -} - -wxString wxVListBoxComboPopup::GetStringValue() const -{ - return m_stringValue; -} - -void wxVListBoxComboPopup::SetSelection( int item ) -{ - wxCHECK_RET( item == wxNOT_FOUND || ((unsigned int)item < GetCount()), - wxT("invalid index in wxVListBoxComboPopup::SetSelection") ); - - m_value = item; - - if ( item >= 0 ) - m_stringValue = m_strings[item]; - else - m_stringValue = wxEmptyString; - - if ( IsCreated() ) - wxVListBox::SetSelection(item); -} - -int wxVListBoxComboPopup::GetSelection() const -{ - return m_value; -} - -void wxVListBoxComboPopup::SetStringValue( const wxString& value ) -{ - int index = m_strings.Index(value); - - m_stringValue = value; - - if ( index >= 0 && index < (int)wxVListBox::GetItemCount() ) - { - wxVListBox::SetSelection(index); - m_value = index; - } -} - -void wxVListBoxComboPopup::CalcWidths() -{ - bool doFindWidest = m_findWidest; - - // Measure items with dirty width. - if ( m_widthsDirty ) - { - unsigned int i; - unsigned int n = m_widths.GetCount(); - int dirtyHandled = 0; - wxArrayInt& widths = m_widths; - - // I think using wxDC::GetTextExtent is faster than - // wxWindow::GetTextExtent (assuming same dc is used - // for all calls, as we do here). - wxClientDC dc(m_combo); - if ( !m_useFont.IsOk() ) - m_useFont = m_combo->GetFont(); - dc.SetFont(m_useFont); - - for ( i=0; i= m_widestWidth ) - { - m_widestWidth = x; - m_widestItem = (int)i; - } - else if ( (int)i == m_widestItem ) - { - // Width of previously widest item has been decreased, so - // we'll have to check all to find current widest item. - doFindWidest = true; - } - - dirtyHandled++; - } - } - - m_widthsDirty = false; - } - - if ( doFindWidest ) - { - unsigned int i; - unsigned int n = m_widths.GetCount(); - - int bestWidth = -1; - int bestIndex = -1; - - for ( i=0; i bestWidth ) - { - bestIndex = (int)i; - bestWidth = w; - } - } - - m_widestWidth = bestWidth; - m_widestItem = bestIndex; - - m_findWidest = false; - } -} - -wxSize wxVListBoxComboPopup::GetAdjustedSize( int minWidth, int prefHeight, int maxHeight ) -{ - int height = 250; - - maxHeight -= 2; // Must take borders into account - - if ( m_strings.GetCount() ) - { - if ( prefHeight > 0 ) - height = prefHeight; - - if ( height > maxHeight ) - height = maxHeight; - - int totalHeight = GetTotalHeight(); // + 3; - - // Take borders into account on Mac or scrollbars always appear -#if defined(__WXMAC__) - totalHeight += 2; -#endif - if ( height >= totalHeight ) - { - height = totalHeight; - } - else - { - // Adjust height to a multiple of the height of the first item - // NB: Calculations that take variable height into account - // are unnecessary. - int fih = GetLineHeight(0); - height -= height % fih; - } - } - else - height = 50; - - CalcWidths(); - - // Take scrollbar into account in width calculations - int widestWidth = m_widestWidth + wxSystemSettings::GetMetric(wxSYS_VSCROLL_X); - return wxSize(minWidth > widestWidth ? minWidth : widestWidth, - height+2); -} - -//void wxVListBoxComboPopup::Populate( int n, const wxString choices[] ) -void wxVListBoxComboPopup::Populate( const wxArrayString& choices ) -{ - int i; - - int n = choices.GetCount(); - - for ( i=0; iGetWindowStyle() & wxCB_SORT ) - m_strings.Sort(); - - // Find initial selection - wxString strValue = m_combo->GetValue(); - if ( !strValue.empty() ) - m_value = m_strings.Index(strValue); -} - -// ---------------------------------------------------------------------------- -// wxOwnerDrawnComboBox -// ---------------------------------------------------------------------------- - - -wxBEGIN_EVENT_TABLE(wxOwnerDrawnComboBox, wxComboCtrl) -wxEND_EVENT_TABLE() - -void wxOwnerDrawnComboBox::Init() -{ -} - -bool wxOwnerDrawnComboBox::Create(wxWindow *parent, - wxWindowID id, - const wxString& value, - const wxPoint& pos, - const wxSize& size, - long style, - const wxValidator& validator, - const wxString& name) -{ - return wxComboCtrl::Create(parent,id,value,pos,size,style,validator,name); -} - -wxOwnerDrawnComboBox::wxOwnerDrawnComboBox(wxWindow *parent, - wxWindowID id, - const wxString& value, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style, - const wxValidator& validator, - const wxString& name) -{ - Init(); - - Create(parent,id,value,pos,size,choices,style, validator, name); -} - -bool wxOwnerDrawnComboBox::Create(wxWindow *parent, - wxWindowID id, - const wxString& value, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style, - const wxValidator& validator, - const wxString& name) -{ - m_initChs = choices; - //wxCArrayString chs(choices); - - //return Create(parent, id, value, pos, size, chs.GetCount(), - // chs.GetStrings(), style, validator, name); - return Create(parent, id, value, pos, size, 0, - NULL, style, validator, name); -} - -bool wxOwnerDrawnComboBox::Create(wxWindow *parent, - wxWindowID id, - const wxString& value, - const wxPoint& pos, - const wxSize& size, - int n, - const wxString choices[], - long style, - const wxValidator& validator, - const wxString& name) -{ - - if ( !Create(parent, id, value, pos, size, style, - validator, name) ) - { - return false; - } - - int i; - for ( i=0; iClearClientDatas(); -} - -void wxOwnerDrawnComboBox::DoSetPopupControl(wxComboPopup* popup) -{ - if ( !popup ) - { - popup = new wxVListBoxComboPopup(); - } - - wxComboCtrl::DoSetPopupControl(popup); - - wxASSERT(popup); - - // Add initial choices to the wxVListBox - if ( !GetVListBoxComboPopup()->GetCount() ) - { - GetVListBoxComboPopup()->Populate(m_initChs); - m_initChs.Clear(); - } -} - -// ---------------------------------------------------------------------------- -// wxOwnerDrawnComboBox item manipulation methods -// ---------------------------------------------------------------------------- - -void wxOwnerDrawnComboBox::DoClear() -{ - EnsurePopupControl(); - - GetVListBoxComboPopup()->Clear(); - - // NB: This really needs to be SetValue() instead of ChangeValue(), - // as wxTextEntry API expects an event to be sent. - SetValue(wxEmptyString); -} - -void wxOwnerDrawnComboBox::Clear() -{ - DoClear(); - SetClientDataType(wxClientData_None); -} - -void wxOwnerDrawnComboBox::DoDeleteOneItem(unsigned int n) -{ - wxCHECK_RET( IsValid(n), wxT("invalid index in wxOwnerDrawnComboBox::Delete") ); - - if ( GetSelection() == (int) n ) - ChangeValue(wxEmptyString); - - GetVListBoxComboPopup()->Delete(n); -} - -unsigned int wxOwnerDrawnComboBox::GetCount() const -{ - if ( !m_popupInterface ) - return m_initChs.GetCount(); - - return GetVListBoxComboPopup()->GetCount(); -} - -wxString wxOwnerDrawnComboBox::GetString(unsigned int n) const -{ - wxCHECK_MSG( IsValid(n), wxEmptyString, wxT("invalid index in wxOwnerDrawnComboBox::GetString") ); - - if ( !m_popupInterface ) - return m_initChs.Item(n); - - return GetVListBoxComboPopup()->GetString(n); -} - -void wxOwnerDrawnComboBox::SetString(unsigned int n, const wxString& s) -{ - EnsurePopupControl(); - - wxCHECK_RET( IsValid(n), wxT("invalid index in wxOwnerDrawnComboBox::SetString") ); - - GetVListBoxComboPopup()->SetString(n,s); -} - -int wxOwnerDrawnComboBox::FindString(const wxString& s, bool bCase) const -{ - if ( !m_popupInterface ) - return m_initChs.Index(s, bCase); - - return GetVListBoxComboPopup()->FindString(s, bCase); -} - -void wxOwnerDrawnComboBox::Select(int n) -{ - EnsurePopupControl(); - - wxCHECK_RET( (n == wxNOT_FOUND) || IsValid(n), wxT("invalid index in wxOwnerDrawnComboBox::Select") ); - - GetVListBoxComboPopup()->SetSelection(n); - - wxString str; - if ( n >= 0 ) - str = GetVListBoxComboPopup()->GetString(n); - - // Refresh text portion in control - if ( m_text ) - m_text->ChangeValue( str ); - else - m_valueString = str; - - Refresh(); -} - -int wxOwnerDrawnComboBox::GetSelection() const -{ - if ( !m_popupInterface ) - return m_initChs.Index(m_valueString); - - return GetVListBoxComboPopup()->GetSelection(); -} - -void wxOwnerDrawnComboBox::GetSelection(long *from, long *to) const -{ - wxComboCtrl::GetSelection(from, to); -} - -int wxOwnerDrawnComboBox::DoInsertItems(const wxArrayStringsAdapter& items, - unsigned int pos, - void **clientData, - wxClientDataType type) -{ - EnsurePopupControl(); - - const unsigned int count = items.GetCount(); - - if ( HasFlag(wxCB_SORT) ) - { - int n = pos; - - for ( unsigned int i = 0; i < count; ++i ) - { - n = GetVListBoxComboPopup()->Append(items[i]); - AssignNewItemClientData(n, clientData, i, type); - } - - return n; - } - else - { - for ( unsigned int i = 0; i < count; ++i, ++pos ) - { - GetVListBoxComboPopup()->Insert(items[i], pos); - AssignNewItemClientData(pos, clientData, i, type); - } - - return pos - 1; - } -} - -void wxOwnerDrawnComboBox::DoSetItemClientData(unsigned int n, void* clientData) -{ - EnsurePopupControl(); - - GetVListBoxComboPopup()->SetItemClientData(n, clientData, - GetClientDataType()); -} - -void* wxOwnerDrawnComboBox::DoGetItemClientData(unsigned int n) const -{ - if ( !m_popupInterface ) - return NULL; - - return GetVListBoxComboPopup()->GetItemClientData(n); -} - -// ---------------------------------------------------------------------------- -// wxOwnerDrawnComboBox item drawing and measuring default implementations -// ---------------------------------------------------------------------------- - -void wxOwnerDrawnComboBox::OnDrawItem( wxDC& dc, - const wxRect& rect, - int item, - int flags ) const -{ - if ( flags & wxODCB_PAINTING_CONTROL ) - { - wxString text; - - if ( !ShouldUseHintText() ) - { - text = GetValue(); - } - else - { - text = GetHint(); - wxColour col = wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT); - dc.SetTextForeground(col); - } - - dc.DrawText( text, - rect.x + GetMargins().x, - (rect.height-dc.GetCharHeight())/2 + rect.y ); - } - else - { - dc.DrawText( GetVListBoxComboPopup()->GetString(item), rect.x + 2, rect.y ); - } -} - -wxCoord wxOwnerDrawnComboBox::OnMeasureItem( size_t WXUNUSED(item) ) const -{ - return -1; -} - -wxCoord wxOwnerDrawnComboBox::OnMeasureItemWidth( size_t WXUNUSED(item) ) const -{ - return -1; -} - -wxSize wxOwnerDrawnComboBox::DoGetBestSize() const -{ - if ( GetCount() == 0 ) - return wxComboCtrlBase::DoGetBestSize(); - - wxOwnerDrawnComboBox* odc = const_cast(this); - // TODO: this class may also have GetHightestItemHeight() and - // GetHightestItem() methods, and so set the whole (edit part + arrow) - // control's height according with this max height, not only max width. - return GetSizeFromTextSize(odc->GetWidestItemWidth()); -} - -void wxOwnerDrawnComboBox::OnDrawBackground(wxDC& dc, - const wxRect& rect, - int WXUNUSED(item), - int flags) const -{ - // We need only to explicitly draw background for items - // that should have selected background. Also, call PrepareBackground - // always when painting the control so that clipping is done properly. - - if ( (flags & wxODCB_PAINTING_SELECTED) || - ((flags & wxODCB_PAINTING_CONTROL) && HasFlag(wxCB_READONLY)) ) - { - int bgFlags = wxCONTROL_SELECTED; - - if ( !(flags & wxODCB_PAINTING_CONTROL) ) - bgFlags |= wxCONTROL_ISSUBMENU; - - PrepareBackground(dc, rect, bgFlags); - } -} - -#endif // wxUSE_ODCOMBOBOX diff --git a/Externals/wxWidgets3/src/generic/paletteg.cpp b/Externals/wxWidgets3/src/generic/paletteg.cpp deleted file mode 100644 index 41de19195a..0000000000 --- a/Externals/wxWidgets3/src/generic/paletteg.cpp +++ /dev/null @@ -1,157 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/generic/paletteg.cpp -// Purpose: -// Author: Robert Roebling -// Created: 01/02/97 -// Copyright: (c) 1998 Robert Roebling and Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if defined(__BORLANDC__) - #pragma hdrstop -#endif - -#if wxUSE_PALETTE - -#include "wx/palette.h" - -//----------------------------------------------------------------------------- -// wxPalette -//----------------------------------------------------------------------------- - -struct wxPaletteEntry -{ - unsigned char red, green, blue; -}; - -class wxPaletteRefData : public wxGDIRefData -{ -public: - wxPaletteRefData(); - wxPaletteRefData(const wxPaletteRefData& palette); - virtual ~wxPaletteRefData(); - - int m_count; - wxPaletteEntry *m_entries; -}; - -wxPaletteRefData::wxPaletteRefData() -{ - m_count = 0; - m_entries = NULL; -} - -wxPaletteRefData::wxPaletteRefData(const wxPaletteRefData& palette) -{ - m_count = palette.m_count; - m_entries = new wxPaletteEntry[m_count]; - for ( int i = 0; i < m_count; i++ ) - m_entries[i] = palette.m_entries[i]; -} - -wxPaletteRefData::~wxPaletteRefData() -{ - delete[] m_entries; -} - -//----------------------------------------------------------------------------- - -#define M_PALETTEDATA ((wxPaletteRefData *)m_refData) - -wxIMPLEMENT_DYNAMIC_CLASS(wxPalette,wxGDIObject); - -wxPalette::wxPalette() -{ - m_refData = NULL; -} - -wxPalette::wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue) -{ - Create(n, red, green, blue); -} - -wxPalette::~wxPalette() -{ -} - -int wxPalette::GetColoursCount() const -{ - if (m_refData) - return M_PALETTEDATA->m_count; - - return 0; -} - -bool wxPalette::Create(int n, - const unsigned char *red, - const unsigned char *green, - const unsigned char *blue) -{ - UnRef(); - m_refData = new wxPaletteRefData(); - - M_PALETTEDATA->m_count = n; - M_PALETTEDATA->m_entries = new wxPaletteEntry[n]; - - wxPaletteEntry *e = M_PALETTEDATA->m_entries; - for (int i = 0; i < n; i++, e++) - { - e->red = red[i]; - e->green = green[i]; - e->blue = blue[i]; - } - - return true; -} - -int wxPalette::GetPixel( unsigned char red, - unsigned char green, - unsigned char blue ) const -{ - if (!m_refData) return wxNOT_FOUND; - - int closest = 0; - double d,distance = 1000.0; // max. dist is 256 - - wxPaletteEntry *e = M_PALETTEDATA->m_entries; - for (int i = 0; i < M_PALETTEDATA->m_count; i++, e++) - { - if ((d = 0.299 * abs(red - e->red) + - 0.587 * abs(green - e->green) + - 0.114 * abs(blue - e->blue)) < distance) { - distance = d; - closest = i; - } - } - return closest; -} - -bool wxPalette::GetRGB(int pixel, - unsigned char *red, - unsigned char *green, - unsigned char *blue) const -{ - if (!m_refData) return false; - if (pixel >= M_PALETTEDATA->m_count) return false; - - wxPaletteEntry& p = M_PALETTEDATA->m_entries[pixel]; - if (red) *red = p.red; - if (green) *green = p.green; - if (blue) *blue = p.blue; - return true; -} - -wxGDIRefData *wxPalette::CreateGDIRefData() const -{ - return new wxPaletteRefData; -} - -wxGDIRefData *wxPalette::CloneGDIRefData(const wxGDIRefData *data) const -{ - return new wxPaletteRefData(*static_cast(data)); -} - -#endif // wxUSE_PALETTE diff --git a/Externals/wxWidgets3/src/generic/preferencesg.cpp b/Externals/wxWidgets3/src/generic/preferencesg.cpp deleted file mode 100644 index fc6fc0cc34..0000000000 --- a/Externals/wxWidgets3/src/generic/preferencesg.cpp +++ /dev/null @@ -1,263 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/generic/preferencesg.cpp -// Purpose: Implementation of wxPreferencesEditor. -// Author: Vaclav Slavik -// Created: 2013-02-19 -// Copyright: (c) 2013 Vaclav Slavik -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// for compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_PREFERENCES_EDITOR - -#include "wx/private/preferences.h" - -#ifndef wxHAS_PREF_EDITOR_NATIVE - -#include "wx/app.h" -#include "wx/dialog.h" -#include "wx/notebook.h" -#include "wx/sizer.h" -#include "wx/sharedptr.h" -#include "wx/scopedptr.h" -#include "wx/scopeguard.h" -#include "wx/vector.h" - -namespace -{ - -class wxGenericPrefsDialog : public wxDialog -{ -public: - wxGenericPrefsDialog(wxWindow *parent, const wxString& title) - : wxDialog(parent, wxID_ANY, title, - wxDefaultPosition, wxDefaultSize, - wxDEFAULT_FRAME_STYLE & ~(wxRESIZE_BORDER | wxMAXIMIZE_BOX | wxMINIMIZE_BOX)) - { - wxSizer *sizer = new wxBoxSizer(wxVERTICAL); - - m_notebook = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNB_MULTILINE); - sizer->Add(m_notebook, wxSizerFlags(1).Expand().DoubleBorder()); - -#ifdef __WXGTK__ - SetEscapeId(wxID_CLOSE); - sizer->Add(CreateButtonSizer(wxCLOSE), wxSizerFlags().Expand().DoubleBorder(wxBOTTOM)); -#else - sizer->Add(CreateButtonSizer(wxOK | wxCANCEL), - wxSizerFlags().Expand().DoubleBorder(wxLEFT|wxRIGHT|wxBOTTOM)); -#endif - SetSizer(sizer); - } - - void AddPage(wxPreferencesPage *page) - { - wxWindow *win = page->CreateWindow(m_notebook); - m_notebook->AddPage(win, page->GetName()); - } - - int GetSelectedPage() const - { - return m_notebook->GetSelection(); - } - - void SelectPage(int page) - { - m_notebook->ChangeSelection(page); - } - - bool ShouldPreventAppExit() const wxOVERRIDE - { - return false; - } - -private: - wxNotebook *m_notebook; -}; - - -class wxGenericPreferencesEditorImplBase : public wxPreferencesEditorImpl -{ -public: - void SetTitle(const wxString& title) - { - m_title = title; - } - - virtual void AddPage(wxPreferencesPage* page) - { - m_pages.push_back(wxSharedPtr(page)); - } - -protected: - wxGenericPrefsDialog *CreateDialog(wxWindow *parent) - { - if ( m_title.empty() ) - { - // Use the default title, which should include the application name - // under both MSW and GTK (and OSX uses its own native - // implementation anyhow). - m_title.Printf(_("%s Preferences"), wxTheApp->GetAppDisplayName()); - } - - wxGenericPrefsDialog *dlg = new wxGenericPrefsDialog(parent, m_title); - - // TODO: Don't create all pages immediately like this, do it on demand - // when a page is selected in the notebook (as is done on OS X). - // - // Currently, creating all pages is necessary so that the notebook - // can determine its best size. We'll need to extend - // wxPreferencesPage with a GetBestSize() virtual method to make - // it possible to defer the creation. - for ( Pages::const_iterator i = m_pages.begin(); - i != m_pages.end(); - ++i ) - { - dlg->AddPage(i->get()); - } - - dlg->Fit(); - - return dlg; - } - - typedef wxVector< wxSharedPtr > Pages; - Pages m_pages; - -private: - wxString m_title; -}; - - -#ifdef wxHAS_PREF_EDITOR_MODELESS - -class wxModelessPreferencesEditorImpl : public wxGenericPreferencesEditorImplBase -{ -public: - virtual ~wxModelessPreferencesEditorImpl() - { - // m_win may already be destroyed if this destructor is called from - // wxApp's destructor. In that case, all windows -- including this - // one -- would already be destroyed by now. - if ( m_win ) - m_win->Destroy(); - } - - virtual void Show(wxWindow* parent) - { - if ( !m_win ) - { - wxWindow *win = CreateDialog(parent); - win->Show(); - m_win = win; - } - else - { - // Ideally, we'd reparent the dialog under 'parent', but it's - // probably not worth the hassle. We know the old parent is still - // valid, because otherwise Dismiss() would have been called and - // m_win cleared. - m_win->Raise(); - } - } - - virtual void Dismiss() - { - if ( m_win ) - { - m_win->Close(/*force=*/true); - m_win = NULL; - } - } - -private: - wxWeakRef m_win; -}; - -inline -wxGenericPreferencesEditorImplBase* NewGenericImpl() -{ - return new wxModelessPreferencesEditorImpl; -} - -#else // !wxHAS_PREF_EDITOR_MODELESS - -class wxModalPreferencesEditorImpl : public wxGenericPreferencesEditorImplBase -{ -public: - wxModalPreferencesEditorImpl() - { - m_dlg = NULL; - m_currentPage = -1; - } - - virtual void Show(wxWindow* parent) - { - wxScopedPtr dlg(CreateDialog(parent)); - - // Store it for Dismiss() but ensure that the pointer is reset to NULL - // when the dialog is destroyed on leaving this function. - m_dlg = dlg.get(); - wxON_BLOCK_EXIT_NULL(m_dlg); - - // Restore the previously selected page, if any. - if ( m_currentPage != -1 ) - dlg->SelectPage(m_currentPage); - - // Don't remember the last selected page if the dialog was cancelled. - if ( dlg->ShowModal() != wxID_CANCEL ) - m_currentPage = dlg->GetSelectedPage(); - } - - virtual void Dismiss() - { - if ( m_dlg ) - { - m_dlg->EndModal(wxID_CANCEL); - m_dlg = NULL; - } - } - -private: - wxGenericPrefsDialog* m_dlg; - int m_currentPage; - - wxDECLARE_NO_COPY_CLASS(wxModalPreferencesEditorImpl); -}; - -inline -wxGenericPreferencesEditorImplBase* NewGenericImpl() -{ - return new wxModalPreferencesEditorImpl; -} - -#endif // !wxHAS_PREF_EDITOR_MODELESS - -} // anonymous namespace - -/*static*/ -wxPreferencesEditorImpl* wxPreferencesEditorImpl::Create(const wxString& title) -{ - wxGenericPreferencesEditorImplBase* const impl = NewGenericImpl(); - - impl->SetTitle(title); - - return impl; -} - -#endif // !wxHAS_PREF_EDITOR_NATIVE - -#endif // wxUSE_PREFERENCES_EDITOR diff --git a/Externals/wxWidgets3/src/generic/printps.cpp b/Externals/wxWidgets3/src/generic/printps.cpp deleted file mode 100644 index cedf7278f7..0000000000 --- a/Externals/wxWidgets3/src/generic/printps.cpp +++ /dev/null @@ -1,371 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/generic/printps.cpp -// Purpose: Postscript print/preview framework -// Author: Julian Smart -// Modified by: -// Created: 04/01/98 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#if wxUSE_PRINTING_ARCHITECTURE && wxUSE_POSTSCRIPT && (!defined(__WXMSW__) || wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW) - -#ifndef WX_PRECOMP - #include "wx/utils.h" - #include "wx/dc.h" - #include "wx/app.h" - #include "wx/msgdlg.h" - #include "wx/intl.h" - #include "wx/progdlg.h" - #include "wx/log.h" - #include "wx/dcprint.h" -#endif - -#include "wx/generic/printps.h" -#include "wx/printdlg.h" -#include "wx/generic/prntdlgg.h" -#include "wx/progdlg.h" -#include "wx/paper.h" - -#include - -// ---------------------------------------------------------------------------- -// wxWin macros -// ---------------------------------------------------------------------------- - - wxIMPLEMENT_DYNAMIC_CLASS(wxPostScriptPrinter, wxPrinterBase); - wxIMPLEMENT_CLASS(wxPostScriptPrintPreview, wxPrintPreviewBase); - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// Printer -// ---------------------------------------------------------------------------- - -wxPostScriptPrinter::wxPostScriptPrinter(wxPrintDialogData *data) - : wxPrinterBase(data) -{ -} - -wxPostScriptPrinter::~wxPostScriptPrinter() -{ -} - -bool wxPostScriptPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt) -{ - sm_abortIt = false; - sm_abortWindow = NULL; - - if (!printout) - { - sm_lastError = wxPRINTER_ERROR; - return false; - } - - if (m_printDialogData.GetMinPage() < 1) - m_printDialogData.SetMinPage(1); - if (m_printDialogData.GetMaxPage() < 1) - m_printDialogData.SetMaxPage(9999); - - // Create a suitable device context - wxDC *dc; - if (prompt) - { - dc = PrintDialog(parent); - if (!dc) - return false; - } - else - { - dc = new wxPostScriptDC(GetPrintDialogData().GetPrintData()); - } - - // May have pressed cancel. - if (!dc || !dc->IsOk()) - { - if (dc) delete dc; - sm_lastError = wxPRINTER_ERROR; - return false; - } - - wxSize ScreenPixels = wxGetDisplaySize(); - wxSize ScreenMM = wxGetDisplaySizeMM(); - - printout->SetPPIScreen( (int) ((ScreenPixels.GetWidth() * 25.4) / ScreenMM.GetWidth()), - (int) ((ScreenPixels.GetHeight() * 25.4) / ScreenMM.GetHeight()) ); - printout->SetPPIPrinter( dc->GetResolution(), - dc->GetResolution() ); - - // Set printout parameters - printout->SetDC(dc); - - int w, h; - dc->GetSize(&w, &h); - printout->SetPageSizePixels((int)w, (int)h); - printout->SetPaperRectPixels(wxRect(0, 0, w, h)); - int mw, mh; - dc->GetSizeMM(&mw, &mh); - printout->SetPageSizeMM((int)mw, (int)mh); - - // Create an abort window - wxBeginBusyCursor(); - - printout->OnPreparePrinting(); - - // Get some parameters from the printout, if defined - int fromPage, toPage; - int minPage, maxPage; - printout->GetPageInfo(&minPage, &maxPage, &fromPage, &toPage); - - if (maxPage == 0) - { - sm_lastError = wxPRINTER_ERROR; - wxEndBusyCursor(); - return false; - } - - // Only set min and max, because from and to have been - // set by the user - m_printDialogData.SetMinPage(minPage); - m_printDialogData.SetMaxPage(maxPage); - - if (m_printDialogData.GetFromPage() < minPage) - m_printDialogData.SetFromPage( minPage ); - if (m_printDialogData.GetToPage() > maxPage) - m_printDialogData.SetToPage( maxPage ); - - int - pagesPerCopy = m_printDialogData.GetToPage()-m_printDialogData.GetFromPage()+1, - totalPages = pagesPerCopy * m_printDialogData.GetNoCopies(), - printedPages = 0; - // Open the progress bar dialog - wxProgressDialog *progressDialog = new wxProgressDialog ( - printout->GetTitle(), - _("Printing..."), - totalPages, - parent, - wxPD_CAN_ABORT|wxPD_AUTO_HIDE|wxPD_APP_MODAL); - - printout->OnBeginPrinting(); - - sm_lastError = wxPRINTER_NO_ERROR; - - bool keepGoing = true; - - int copyCount; - for (copyCount = 1; copyCount <= m_printDialogData.GetNoCopies(); copyCount ++) - { - if (!printout->OnBeginDocument(m_printDialogData.GetFromPage(), m_printDialogData.GetToPage())) - { - wxEndBusyCursor(); - wxLogError(_("Could not start printing.")); - sm_lastError = wxPRINTER_ERROR; - break; - } - if (sm_abortIt) - { - sm_lastError = wxPRINTER_CANCELLED; - break; - } - - int pn; - for (pn = m_printDialogData.GetFromPage(); keepGoing && (pn <= m_printDialogData.GetToPage()) && printout->HasPage(pn); - pn++) - { - if (sm_abortIt) - { - keepGoing = false; - sm_lastError = wxPRINTER_CANCELLED; - break; - } - else - { - wxString msg; - msg.Printf(_("Printing page %d..."), printedPages+1); - if(progressDialog->Update(printedPages++, msg)) - { - dc->StartPage(); - printout->OnPrintPage(pn); - dc->EndPage(); - } - else - { - sm_abortIt = true; - sm_lastError = wxPRINTER_CANCELLED; - keepGoing = false; - } - } - wxYield(); - } - printout->OnEndDocument(); - } - - printout->OnEndPrinting(); - delete progressDialog; - - wxEndBusyCursor(); - - delete dc; - - return (sm_lastError == wxPRINTER_NO_ERROR); -} - -wxDC* wxPostScriptPrinter::PrintDialog(wxWindow *parent) -{ - wxDC* dc = NULL; - - wxGenericPrintDialog dialog( parent, &m_printDialogData ); - if (dialog.ShowModal() == wxID_OK) - { - dc = dialog.GetPrintDC(); - m_printDialogData = dialog.GetPrintDialogData(); - - if (dc == NULL) - sm_lastError = wxPRINTER_ERROR; - else - sm_lastError = wxPRINTER_NO_ERROR; - } - else - sm_lastError = wxPRINTER_CANCELLED; - - return dc; -} - -bool wxPostScriptPrinter::Setup(wxWindow *WXUNUSED(parent)) -{ -#if 0 - wxGenericPrintDialog* dialog = new wxGenericPrintDialog(parent, & m_printDialogData); - dialog->GetPrintDialogData().SetSetupDialog(true); - - int ret = dialog->ShowModal(); - - if (ret == wxID_OK) - { - m_printDialogData = dialog->GetPrintDialogData(); - } - - dialog->Destroy(); - - return (ret == wxID_OK); -#endif - - return false; -} - -// ---------------------------------------------------------------------------- -// Print preview -// ---------------------------------------------------------------------------- - -void wxPostScriptPrintPreview::Init(wxPrintout * WXUNUSED(printout), - wxPrintout * WXUNUSED(printoutForPrinting)) -{ - // Have to call it here since base constructor can't call it - DetermineScaling(); -} - -wxPostScriptPrintPreview::wxPostScriptPrintPreview(wxPrintout *printout, - wxPrintout *printoutForPrinting, - wxPrintDialogData *data) - : wxPrintPreviewBase(printout, printoutForPrinting, data) -{ - Init(printout, printoutForPrinting); -} - -wxPostScriptPrintPreview::wxPostScriptPrintPreview(wxPrintout *printout, - wxPrintout *printoutForPrinting, - wxPrintData *data) - : wxPrintPreviewBase(printout, printoutForPrinting, data) -{ - Init(printout, printoutForPrinting); -} - -wxPostScriptPrintPreview::~wxPostScriptPrintPreview() -{ -} - -bool wxPostScriptPrintPreview::Print(bool interactive) -{ - if (!m_printPrintout) - return false; - - // Assume that on Unix, the preview may use the PostScript - // (generic) version, but printing using the native system is required. - // TODO: make a generic print preview class from which wxPostScriptPrintPreview - // is derived. -#ifdef __UNIX__ - wxPrinter printer(& m_printDialogData); -#else - wxPostScriptPrinter printer(& m_printDialogData); -#endif - return printer.Print(m_previewFrame, m_printPrintout, interactive); -} - -void wxPostScriptPrintPreview::DetermineScaling() -{ - wxPaperSize paperType = m_printDialogData.GetPrintData().GetPaperId(); - if (paperType == wxPAPER_NONE) - paperType = wxPAPER_NONE; - - wxPrintPaperType *paper = wxThePrintPaperDatabase->FindPaperType(paperType); - if (!paper) - paper = wxThePrintPaperDatabase->FindPaperType(wxPAPER_A4); - - if (paper) - { - int resolution = 600; // TODO, this is correct, but get this from wxPSDC somehow - - const wxSize screenPPI = wxGetDisplayPPI(); - int logPPIScreenX = screenPPI.GetWidth(); - int logPPIScreenY = screenPPI.GetHeight(); - int logPPIPrinterX = resolution; - int logPPIPrinterY = resolution; - - m_previewPrintout->SetPPIScreen( logPPIScreenX, logPPIScreenY ); - m_previewPrintout->SetPPIPrinter( logPPIPrinterX, logPPIPrinterY ); - - wxSize sizeDevUnits(paper->GetSizeDeviceUnits()); - sizeDevUnits.x = (wxCoord)((float)sizeDevUnits.x * resolution / 72.0); - sizeDevUnits.y = (wxCoord)((float)sizeDevUnits.y * resolution / 72.0); - wxSize sizeTenthsMM(paper->GetSize()); - wxSize sizeMM(sizeTenthsMM.x / 10, sizeTenthsMM.y / 10); - - // If in landscape mode, we need to swap the width and height. - if ( m_printDialogData.GetPrintData().GetOrientation() == wxLANDSCAPE ) - { - m_pageWidth = sizeDevUnits.y; - m_pageHeight = sizeDevUnits.x; - m_previewPrintout->SetPageSizeMM(sizeMM.y, sizeMM.x); - } - else - { - m_pageWidth = sizeDevUnits.x; - m_pageHeight = sizeDevUnits.y; - m_previewPrintout->SetPageSizeMM(sizeMM.x, sizeMM.y); - } - m_previewPrintout->SetPageSizePixels(m_pageWidth, m_pageHeight); - m_previewPrintout->SetPaperRectPixels(wxRect(0, 0, m_pageWidth, m_pageHeight)); - - // At 100%, the page should look about page-size on the screen. - m_previewScaleX = float(logPPIScreenX) / logPPIPrinterX; - m_previewScaleY = float(logPPIScreenY) / logPPIPrinterY; - } -} - -#endif diff --git a/Externals/wxWidgets3/src/generic/prntdlgg.cpp b/Externals/wxWidgets3/src/generic/prntdlgg.cpp deleted file mode 100644 index 5140283de9..0000000000 --- a/Externals/wxWidgets3/src/generic/prntdlgg.cpp +++ /dev/null @@ -1,1102 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/generic/prntdlgg.cpp -// Purpose: Generic print dialogs -// Author: Julian Smart -// Modified by: -// Created: 04/01/98 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_PRINTING_ARCHITECTURE && (!defined(__WXMSW__) || wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW) - -#include "wx/generic/prntdlgg.h" - -#ifndef WX_PRECOMP - #include "wx/utils.h" - #include "wx/dc.h" - #include "wx/stattext.h" - #include "wx/statbox.h" - #include "wx/button.h" - #include "wx/checkbox.h" - #include "wx/textctrl.h" - #include "wx/radiobox.h" - #include "wx/filedlg.h" - #include "wx/combobox.h" - #include "wx/intl.h" - #include "wx/sizer.h" - #include "wx/cmndata.h" -#endif - -#if wxUSE_STATLINE - #include "wx/statline.h" -#endif - -#if wxUSE_POSTSCRIPT - #include "wx/generic/dcpsg.h" -#endif - -#include "wx/prntbase.h" -#include "wx/printdlg.h" -#include "wx/paper.h" -#include "wx/filename.h" -#include "wx/tokenzr.h" -#include "wx/imaglist.h" - -#include -#include - -#ifndef __WXUNIVERSAL__ - -#if wxUSE_GTKPRINT - #include "wx/link.h" - wxFORCE_LINK_MODULE(gtk_print) -#endif - -#endif // !wxUniv - -// ---------------------------------------------------------------------------- -// global vars -// ---------------------------------------------------------------------------- - -extern wxPrintPaperDatabase *wxThePrintPaperDatabase; - -#if wxUSE_POSTSCRIPT - -//---------------------------------------------------------------------------- -// wxPostScriptNativeData -//---------------------------------------------------------------------------- - -wxIMPLEMENT_CLASS(wxPostScriptPrintNativeData, wxPrintNativeDataBase); - -wxPostScriptPrintNativeData::wxPostScriptPrintNativeData() -{ - m_previewCommand = wxEmptyString; -#ifdef __VMS__ - m_printerCommand = wxT("print"); - m_printerOptions = wxT("/nonotify/queue=psqueue"); - m_afmPath = wxT("sys$ps_font_metrics:"); -#endif - -#ifdef __WXMSW__ - m_printerCommand = wxT("print"); - m_printerOptions = wxEmptyString; - m_afmPath = wxT("c:\\windows\\system\\"); -#endif - -#if !defined(__VMS__) && !defined(__WXMSW__) - m_printerCommand = wxT("lpr"); - m_printerOptions = wxEmptyString; - m_afmPath = wxEmptyString; -#endif - - m_printerScaleX = 1.0; - m_printerScaleY = 1.0; - m_printerTranslateX = 0; - m_printerTranslateY = 0; -} - -wxPostScriptPrintNativeData::~wxPostScriptPrintNativeData() -{ -} - -bool wxPostScriptPrintNativeData::TransferTo( wxPrintData &WXUNUSED(data) ) -{ - return true; -} - -bool wxPostScriptPrintNativeData::TransferFrom( const wxPrintData &WXUNUSED(data) ) -{ - return true; -} - -// ---------------------------------------------------------------------------- -// Generic print dialog for non-Windows printing use. -// ---------------------------------------------------------------------------- - -wxIMPLEMENT_CLASS(wxGenericPrintDialog, wxPrintDialogBase); - -wxBEGIN_EVENT_TABLE(wxGenericPrintDialog, wxPrintDialogBase) - EVT_BUTTON(wxID_OK, wxGenericPrintDialog::OnOK) - EVT_BUTTON(wxPRINTID_SETUP, wxGenericPrintDialog::OnSetup) - EVT_RADIOBOX(wxPRINTID_RANGE, wxGenericPrintDialog::OnRange) -wxEND_EVENT_TABLE() - -wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent, - wxPrintDialogData* data) - : wxPrintDialogBase(GetParentForModalDialog(parent, 0), - wxID_ANY, _("Print"), - wxPoint(0,0), wxSize(600, 600), - wxDEFAULT_DIALOG_STYLE | - wxTAB_TRAVERSAL) -{ - if ( data ) - m_printDialogData = *data; - - Init(parent); -} - -wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent, - wxPrintData* data) - : wxPrintDialogBase(GetParentForModalDialog(parent, 0), - wxID_ANY, _("Print"), - wxPoint(0,0), wxSize(600, 600), - wxDEFAULT_DIALOG_STYLE | - wxTAB_TRAVERSAL) -{ - if ( data ) - m_printDialogData = *data; - - Init(parent); -} - -void wxGenericPrintDialog::Init(wxWindow * WXUNUSED(parent)) -{ - // wxDialog::Create(parent, wxID_ANY, _("Print"), wxPoint(0,0), wxSize(600, 600), - // wxDEFAULT_DIALOG_STYLE | wxTAB_TRAVERSAL); - - wxBoxSizer *mainsizer = new wxBoxSizer( wxVERTICAL ); - - // 1) top row - - wxPrintFactory* factory = wxPrintFactory::GetFactory(); - - wxStaticBoxSizer *topsizer = new wxStaticBoxSizer( - new wxStaticBox( this, wxID_ANY, _( "Printer options" ) ), wxHORIZONTAL ); - wxFlexGridSizer *flex = new wxFlexGridSizer( 2 ); - flex->AddGrowableCol( 1 ); - topsizer->Add( flex, 1, wxGROW ); - - m_printToFileCheckBox = new wxCheckBox( this, wxPRINTID_PRINTTOFILE, _("Print to File") ); - flex->Add( m_printToFileCheckBox, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - m_setupButton = new wxButton(this, wxPRINTID_SETUP, _("Setup...") ); - flex->Add( m_setupButton, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); - - if (!factory->HasPrintSetupDialog()) - m_setupButton->Enable( false ); - - if (factory->HasPrinterLine()) - { - flex->Add( new wxStaticText( this, wxID_ANY, _("Printer:") ), - 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - flex->Add( new wxStaticText( this, wxID_ANY, factory->CreatePrinterLine() ), - 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - } - - if (factory->HasStatusLine()) - { - flex->Add( new wxStaticText( this, wxID_ANY, _("Status:") ), - 0, wxALIGN_CENTER_VERTICAL|(wxALL-wxTOP), 5 ); - flex->Add( new wxStaticText( this, wxID_ANY, factory->CreateStatusLine() ), - 0, wxALIGN_CENTER_VERTICAL|(wxALL-wxTOP), 5 ); - } - - mainsizer->Add( topsizer, 0, wxLEFT|wxTOP|wxRIGHT|wxGROW, 10 ); - - // 2) middle row with radio box - - wxString *choices = new wxString[2]; - choices[0] = _("All"); - choices[1] = _("Pages"); - - m_fromText = NULL; - m_toText = NULL; - m_rangeRadioBox = NULL; - - if (m_printDialogData.GetFromPage() != 0) - { - m_rangeRadioBox = new wxRadioBox(this, wxPRINTID_RANGE, _("Print Range"), - wxDefaultPosition, wxDefaultSize, - 2, choices); - m_rangeRadioBox->SetSelection(1); - - mainsizer->Add( m_rangeRadioBox, 0, wxLEFT|wxTOP|wxRIGHT, 10 ); - } - - // 3) bottom row - - wxBoxSizer *bottomsizer = new wxBoxSizer( wxHORIZONTAL ); - - if (m_printDialogData.GetFromPage() != 0) - { - bottomsizer->Add( new wxStaticText(this, wxPRINTID_STATIC, _("From:") ), 0, wxCENTER|wxALL, 5 ); - m_fromText = new wxTextCtrl(this, wxPRINTID_FROM, wxEmptyString, wxDefaultPosition, wxSize(40, wxDefaultCoord)); - bottomsizer->Add( m_fromText, 1, wxCENTER|wxRIGHT, 10 ); - - bottomsizer->Add( new wxStaticText(this, wxPRINTID_STATIC, _("To:") ), 0, wxCENTER|wxALL, 5); - m_toText = new wxTextCtrl(this, wxPRINTID_TO, wxEmptyString, wxDefaultPosition, wxSize(40, wxDefaultCoord)); - bottomsizer->Add( m_toText, 1, wxCENTER|wxRIGHT, 10 ); - } - - bottomsizer->Add( new wxStaticText(this, wxPRINTID_STATIC, _("Copies:") ), 0, wxCENTER|wxALL, 5 ); - m_noCopiesText = new wxTextCtrl(this, wxPRINTID_COPIES, wxEmptyString, wxPoint(252, 130), wxSize(40, wxDefaultCoord)); - bottomsizer->Add( m_noCopiesText, 1, wxCENTER|wxRIGHT, 10 ); - - mainsizer->Add( bottomsizer, 0, wxTOP|wxLEFT|wxRIGHT, 12 ); - - // 4) buttons - - wxSizer *sizerBtn = CreateSeparatedButtonSizer( wxOK|wxCANCEL); - if ( sizerBtn ) - mainsizer->Add(sizerBtn, 0, wxEXPAND|wxALL, 10 ); - - SetAutoLayout( true ); - SetSizer( mainsizer ); - - mainsizer->Fit( this ); - Centre(wxBOTH); - - // Calls wxWindow::OnInitDialog and then wxGenericPrintDialog::TransferDataToWindow - InitDialog(); - delete[] choices; -} - -int wxGenericPrintDialog::ShowModal() -{ - return wxDialog::ShowModal(); -} - -wxGenericPrintDialog::~wxGenericPrintDialog() -{ -} - -void wxGenericPrintDialog::OnOK(wxCommandEvent& WXUNUSED(event)) -{ - TransferDataFromWindow(); - - // An empty 'to' field signals printing just the - // 'from' page. - if (m_printDialogData.GetToPage() < 1) - m_printDialogData.SetToPage(m_printDialogData.GetFromPage()); - - // There are some interactions between the global setup data - // and the standard print dialog. The global printing 'mode' - // is determined by whether the user checks Print to file - // or not. - if (m_printDialogData.GetPrintToFile()) - { - m_printDialogData.GetPrintData().SetPrintMode(wxPRINT_MODE_FILE); - - wxFileName fname( m_printDialogData.GetPrintData().GetFilename() ); - - wxFileDialog dialog( this, _("PostScript file"), - fname.GetPath(), fname.GetFullName(), wxT("*.ps"), wxFD_SAVE | wxFD_OVERWRITE_PROMPT ); - if (dialog.ShowModal() != wxID_OK) return; - - m_printDialogData.GetPrintData().SetFilename( dialog.GetPath() ); - } - else - { - m_printDialogData.GetPrintData().SetPrintMode(wxPRINT_MODE_PRINTER); - } - - EndModal(wxID_OK); -} - -void wxGenericPrintDialog::OnRange(wxCommandEvent& event) -{ - if (!m_fromText) return; - - if (event.GetInt() == 0) - { - m_fromText->Enable(false); - m_toText->Enable(false); - } - else if (event.GetInt() == 1) - { - m_fromText->Enable(true); - m_toText->Enable(true); - } -} - -void wxGenericPrintDialog::OnSetup(wxCommandEvent& WXUNUSED(event)) -{ - wxPrintFactory* factory = wxPrintFactory::GetFactory(); - - if (factory->HasPrintSetupDialog()) - { - // The print setup dialog should change the - // print data in-place if not cancelled. - wxDialog *dialog = factory->CreatePrintSetupDialog( this, &m_printDialogData.GetPrintData() ); - dialog->ShowModal(); - dialog->Destroy(); - } -} - -bool wxGenericPrintDialog::TransferDataToWindow() -{ - if(m_printDialogData.GetFromPage() != 0) - { - if(m_fromText) - { - if (m_printDialogData.GetEnablePageNumbers()) - { - m_fromText->Enable(true); - m_toText->Enable(true); - if (m_printDialogData.GetFromPage() > 0) - m_fromText->SetValue(wxString::Format(wxT("%d"), m_printDialogData.GetFromPage())); - if (m_printDialogData.GetToPage() > 0) - m_toText->SetValue(wxString::Format(wxT("%d"), m_printDialogData.GetToPage())); - if(m_rangeRadioBox) - { - if (m_printDialogData.GetAllPages() || m_printDialogData.GetFromPage() == 0) - m_rangeRadioBox->SetSelection(0); - else - m_rangeRadioBox->SetSelection(1); - } - } - else - { - m_fromText->Enable(false); - m_toText->Enable(false); - if(m_rangeRadioBox) - { - m_rangeRadioBox->SetSelection(0); - m_rangeRadioBox->wxRadioBox::Enable(1, false); - } - } - } - } - m_noCopiesText->SetValue( - wxString::Format(wxT("%d"), m_printDialogData.GetNoCopies())); - - m_printToFileCheckBox->SetValue(m_printDialogData.GetPrintToFile()); - m_printToFileCheckBox->Enable(m_printDialogData.GetEnablePrintToFile()); - return true; -} - -bool wxGenericPrintDialog::TransferDataFromWindow() -{ - long res = 0; - if(m_printDialogData.GetFromPage() != -1) - { - if (m_printDialogData.GetEnablePageNumbers()) - { - if(m_fromText) - { - wxString value = m_fromText->GetValue(); - if (value.ToLong( &res )) - m_printDialogData.SetFromPage( res ); - } - if(m_toText) - { - wxString value = m_toText->GetValue(); - if (value.ToLong( &res )) - m_printDialogData.SetToPage( res ); - } - } - if(m_rangeRadioBox) - { - if (m_rangeRadioBox->GetSelection() == 0) - { - m_printDialogData.SetAllPages(true); - - // This means all pages, more or less - m_printDialogData.SetFromPage(1); - m_printDialogData.SetToPage(32000); - } - else - m_printDialogData.SetAllPages(false); - } - } - else - { // continuous printing - m_printDialogData.SetFromPage(1); - m_printDialogData.SetToPage(32000); - } - - wxString value = m_noCopiesText->GetValue(); - if (value.ToLong( &res )) - m_printDialogData.SetNoCopies( res ); - - m_printDialogData.SetPrintToFile(m_printToFileCheckBox->GetValue()); - - return true; -} - -wxDC *wxGenericPrintDialog::GetPrintDC() -{ - return new wxPostScriptDC(GetPrintDialogData().GetPrintData()); -} - -// ---------------------------------------------------------------------------- -// Generic print setup dialog -// ---------------------------------------------------------------------------- - -wxIMPLEMENT_CLASS(wxGenericPrintSetupDialog, wxDialog); - -wxBEGIN_EVENT_TABLE(wxGenericPrintSetupDialog, wxDialog) - EVT_LIST_ITEM_ACTIVATED(wxPRINTID_PRINTER, wxGenericPrintSetupDialog::OnPrinter) -wxEND_EVENT_TABLE() - -wxGenericPrintSetupDialog::wxGenericPrintSetupDialog(wxWindow *parent, wxPrintData* data): -wxDialog(parent, wxID_ANY, _("Print Setup"), wxPoint(0,0), wxSize(600, 600), wxDEFAULT_DIALOG_STYLE|wxTAB_TRAVERSAL) -{ - Init(data); -} - -/* XPM */ -static const char* const check_xpm[] = { -/* width height ncolors chars_per_pixel */ -"16 16 3 1", -/* colors */ -" s None c None", -"X c #000000", -". c #808080", -/* pixels */ -" ", -" ", -" ", -" .. ", -" XX ", -" XX. ", -" .XX ", -" XX ", -" X XX. ", -" XX .XX ", -" XX XX ", -" XXXX. ", -" XX. ", -" . ", -" ", -" " -}; - - -void wxGenericPrintSetupDialog::Init(wxPrintData* data) -{ - if ( data ) - m_printData = *data; - - m_targetData = data; - - wxBoxSizer *main_sizer = new wxBoxSizer( wxVERTICAL ); - - // printer selection - - wxStaticBoxSizer *printer_sizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Printer") ), wxVERTICAL ); - main_sizer->Add( printer_sizer, 0, wxALL|wxGROW, 10 ); - - m_printerListCtrl = new wxListCtrl( this, wxPRINTID_PRINTER, - wxDefaultPosition, wxSize(wxDefaultCoord,100), wxLC_REPORT|wxLC_SINGLE_SEL|wxSUNKEN_BORDER ); - wxImageList *image_list = new wxImageList; - image_list->Add( wxBitmap(check_xpm) ); - m_printerListCtrl->AssignImageList( image_list, wxIMAGE_LIST_SMALL ); - - m_printerListCtrl->InsertColumn( 0, wxT(" "), wxLIST_FORMAT_LEFT, 20 ); - m_printerListCtrl->InsertColumn( 1, wxT("Printer"), wxLIST_FORMAT_LEFT, 150 ); - m_printerListCtrl->InsertColumn( 2, wxT("Device"), wxLIST_FORMAT_LEFT, 150 ); - m_printerListCtrl->InsertColumn( 3, wxT("Status"), wxLIST_FORMAT_LEFT, 80 ); - - wxListItem item; - item.SetMask( wxLIST_MASK_TEXT ); - item.SetColumn( 1 ); - item.SetText( _("Default printer") ); - item.SetId( m_printerListCtrl->InsertItem( item ) ); - - if (data->GetPrinterName().empty()) - { - wxListItem item2; - item2.SetId( item.GetId() ); - item2.SetMask( wxLIST_MASK_IMAGE ); - item2.SetImage( 0 ); - m_printerListCtrl->SetItem( item2 ); - // also select item - m_printerListCtrl->SetItemState( item.GetId(), wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED ); - } - - item.SetId( 1+ item.GetId() ); - - wxArrayString errors; - wxArrayString output; - long res = wxExecute( wxT("lpstat -v"), output, errors, wxEXEC_NODISABLE ); - if (res >= 0 && errors.GetCount() == 0) - { - size_t i; - for (i = 0; i < output.GetCount(); i++) - { - wxStringTokenizer tok( output[i], wxT(" ") ); - wxString tmp = tok.GetNextToken(); // "device" - if (tmp != wxT("device")) - break; // the lpstat syntax must have changed. - tmp = tok.GetNextToken(); // "for" - if (tmp != wxT("for")) - break; // the lpstat syntax must have changed. - tmp = tok.GetNextToken(); // "hp_deskjet930c:" - if (tmp[tmp.length()-1] == wxT(':')) - tmp.Remove(tmp.length()-1,1); - wxString name = tmp; - item.SetText( name ); - item.SetId( m_printerListCtrl->InsertItem( item ) ); - tmp = tok.GetNextToken(); // "parallel:/dev/lp0" - item.SetColumn( 2 ); - item.SetText( tmp ); - m_printerListCtrl->SetItem( item ); - if (data->GetPrinterName() == name) - { - wxListItem item2; - item2.SetId( item.GetId() ); - item2.SetMask( wxLIST_MASK_IMAGE ); - item2.SetImage( 0 ); - m_printerListCtrl->SetItem( item2 ); - // also select item - m_printerListCtrl->SetItemState( item.GetId(), wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED ); - } - - wxString command = wxT("lpstat -p "); - command += name; - wxArrayString errors2; - wxArrayString output2; - res = wxExecute( command, output2, errors2, wxEXEC_NODISABLE ); - if (res >= 0 && errors2.GetCount() == 0 && output2.GetCount() > 0) - { - tmp = output2[0]; // "printer hp_deskjet930c is idle. enable since ..." - int pos = tmp.Find( wxT('.') ); - if (pos != wxNOT_FOUND) - tmp.Remove( (size_t)pos, tmp.length()-(size_t)pos ); - wxStringTokenizer tok2( tmp, wxT(" ") ); - tmp = tok2.GetNextToken(); // "printer" - tmp = tok2.GetNextToken(); // "hp_deskjet930c" - tmp = wxEmptyString; - while (tok2.HasMoreTokens()) - { - tmp += tok2.GetNextToken(); - tmp += wxT(" "); - } - item.SetColumn( 3 ); - item.SetText( tmp ); - m_printerListCtrl->SetItem( item ); - } - - item.SetColumn( 1 ); - item.SetId( 1+ item.GetId() ); - } - } - - - printer_sizer->Add( m_printerListCtrl, 0, wxALL|wxGROW, 5 ); - - wxBoxSizer *item1 = new wxBoxSizer( wxHORIZONTAL ); - main_sizer->Add( item1, 0, wxALL, 5 ); - - // printer options (on the left) - - wxBoxSizer *item2 = new wxBoxSizer( wxVERTICAL ); - - wxStaticBox *item4 = new wxStaticBox( this, wxPRINTID_STATIC, _("Paper size") ); - wxStaticBoxSizer *item3 = new wxStaticBoxSizer( item4, wxVERTICAL ); - - m_paperTypeChoice = CreatePaperTypeChoice(); - item3->Add( m_paperTypeChoice, 0, wxALIGN_CENTER|wxALL, 5 ); - - item2->Add( item3, 0, wxALIGN_CENTER|wxALL, 5 ); - - wxString strs6[] = - { - _("Portrait"), - _("Landscape") - }; - m_orientationRadioBox= new wxRadioBox( this, wxPRINTID_ORIENTATION, _("Orientation"), wxDefaultPosition, wxDefaultSize, 2, strs6, 1, wxRA_SPECIFY_ROWS ); - item2->Add( m_orientationRadioBox, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - wxStaticBox *item8 = new wxStaticBox( this, wxID_ANY, _("Options") ); - wxStaticBoxSizer *item7 = new wxStaticBoxSizer( item8, wxHORIZONTAL ); - - m_colourCheckBox = new wxCheckBox( this, wxPRINTID_PRINTCOLOUR, _("Print in colour") ); - item7->Add( m_colourCheckBox, 0, wxALIGN_CENTER|wxALL, 5 ); - - item2->Add( item7, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - item1->Add( item2, 0, wxALIGN_CENTER_HORIZONTAL, 5 ); - - // spooling options (on the right) - - wxStaticBox *item11 = new wxStaticBox( this, wxID_ANY, _("Print spooling") ); - wxStaticBoxSizer *item10 = new wxStaticBoxSizer( item11, wxVERTICAL ); - - wxStaticText *item12 = new wxStaticText( this, wxID_ANY, _("Printer command:") ); - item10->Add( item12, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - wxBoxSizer *item13 = new wxBoxSizer( wxHORIZONTAL ); - - item13->Add( 20, 20, 0, wxALIGN_CENTER|wxALL, 5 ); - - m_printerCommandText = new wxTextCtrl( this, wxPRINTID_COMMAND, wxEmptyString, wxDefaultPosition, wxSize(160,wxDefaultCoord) ); - item13->Add( m_printerCommandText, 0, wxALIGN_CENTER|wxALL, 5 ); - - item10->Add( item13, 0, wxALIGN_CENTER|wxALL, 0 ); - - wxStaticText *item15 = new wxStaticText( this, wxID_ANY, _("Printer options:") ); - item10->Add( item15, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - wxBoxSizer *item16 = new wxBoxSizer( wxHORIZONTAL ); - - item16->Add( 20, 20, 0, wxALIGN_CENTER|wxALL, 5 ); - - m_printerOptionsText = new wxTextCtrl( this, wxPRINTID_OPTIONS, wxEmptyString, wxDefaultPosition, wxSize(160,wxDefaultCoord) ); - item16->Add( m_printerOptionsText, 0, wxALIGN_CENTER|wxALL, 5 ); - - item10->Add( item16, 0, wxALIGN_CENTER|wxALL, 0 ); - - item1->Add( item10, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 ); - - -#if wxUSE_STATLINE - // static line - main_sizer->Add( new wxStaticLine( this, wxID_ANY ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 ); -#endif - - // buttons - - main_sizer->Add( CreateButtonSizer( wxOK|wxCANCEL), 0, wxEXPAND|wxALL, 10 ); - - SetAutoLayout( true ); - SetSizer( main_sizer ); - - main_sizer->Fit( this ); - Centre(wxBOTH); - - - Fit(); - Centre(wxBOTH); - - InitDialog(); -} - -wxGenericPrintSetupDialog::~wxGenericPrintSetupDialog() -{ -} - -void wxGenericPrintSetupDialog::OnPrinter(wxListEvent& event) -{ - // Delete check mark - for (long item = 0; item < m_printerListCtrl->GetItemCount(); item++) - m_printerListCtrl->SetItemImage( item, -1 ); - - m_printerListCtrl->SetItemImage( event.GetIndex(), 0 ); - - if (event.GetIndex() == 0) - { - m_printerCommandText->SetValue( wxT("lpr") ); - } - else - { - wxListItem li; - li.SetColumn( 1 ); - li.SetMask( wxLIST_MASK_TEXT ); - li.SetId( event.GetIndex() ); - m_printerListCtrl->GetItem( li ); - m_printerCommandText->SetValue( wxT("lpr -P") + li.GetText() ); - } -} - -bool wxGenericPrintSetupDialog::TransferDataToWindow() -{ - wxPostScriptPrintNativeData *data = - (wxPostScriptPrintNativeData *) m_printData.GetNativeData(); - - if (m_printerCommandText && !data->GetPrinterCommand().empty()) - m_printerCommandText->SetValue(data->GetPrinterCommand()); - if (m_printerOptionsText && !data->GetPrinterOptions().empty()) - m_printerOptionsText->SetValue(data->GetPrinterOptions()); - if (m_colourCheckBox) - m_colourCheckBox->SetValue(m_printData.GetColour()); - - if (m_orientationRadioBox) - { - if (m_printData.GetOrientation() == wxPORTRAIT) - m_orientationRadioBox->SetSelection(0); - else - m_orientationRadioBox->SetSelection(1); - } - return true; -} - -bool wxGenericPrintSetupDialog::TransferDataFromWindow() -{ - wxPostScriptPrintNativeData *data = - (wxPostScriptPrintNativeData *) m_printData.GetNativeData(); - - // find selected printer - long id = m_printerListCtrl->GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED ); - if (id == 0) - { - m_printData.SetPrinterName( wxEmptyString ); - } - else - { - wxListItem item; - item.SetId( id ); - item.SetMask( wxLIST_MASK_TEXT ); - item.SetColumn( 1 ); - m_printerListCtrl->GetItem( item ); - m_printData.SetPrinterName( item.GetText() ); - } - - if (m_printerCommandText) - data->SetPrinterCommand(m_printerCommandText->GetValue()); - if (m_printerOptionsText) - data->SetPrinterOptions(m_printerOptionsText->GetValue()); - if (m_colourCheckBox) - m_printData.SetColour(m_colourCheckBox->GetValue()); - if (m_orientationRadioBox) - { - int sel = m_orientationRadioBox->GetSelection(); - if (sel == 0) - m_printData.SetOrientation(wxPORTRAIT); - else - m_printData.SetOrientation(wxLANDSCAPE); - } - if (m_paperTypeChoice) - { - int selectedItem = m_paperTypeChoice->GetSelection(); - if (selectedItem != -1) - { - wxPrintPaperType *paper = wxThePrintPaperDatabase->Item(selectedItem); - if (paper != NULL) - m_printData.SetPaperId( paper->GetId()); - } - } - - if (m_targetData) - *m_targetData = m_printData; - - return true; -} - -wxComboBox *wxGenericPrintSetupDialog::CreatePaperTypeChoice() -{ - size_t n = wxThePrintPaperDatabase->GetCount(); - wxString *choices = new wxString [n]; - size_t sel = 0; - - for (size_t i = 0; i < n; i++) - { - wxPrintPaperType *paper = wxThePrintPaperDatabase->Item(i); - choices[i] = paper->GetName(); - if (m_printData.GetPaperId() == paper->GetId()) - sel = i; - } - - int width = 250; - - wxComboBox *choice = new wxComboBox( this, - wxPRINTID_PAPERSIZE, - _("Paper size"), - wxDefaultPosition, - wxSize(width, wxDefaultCoord), - n, choices ); - - delete[] choices; - - choice->SetSelection(sel); - return choice; -} - -#endif // wxUSE_POSTSCRIPT - -// ---------------------------------------------------------------------------- -// Generic page setup dialog -// ---------------------------------------------------------------------------- - -wxIMPLEMENT_CLASS(wxGenericPageSetupDialog, wxPageSetupDialogBase); - -wxBEGIN_EVENT_TABLE(wxGenericPageSetupDialog, wxPageSetupDialogBase) - EVT_BUTTON(wxPRINTID_SETUP, wxGenericPageSetupDialog::OnPrinter) -wxEND_EVENT_TABLE() - -wxGenericPageSetupDialog::wxGenericPageSetupDialog( wxWindow *parent, - wxPageSetupDialogData* data) - : wxPageSetupDialogBase( parent, - wxID_ANY, - _("Page setup"), - wxPoint(0,0), - wxSize(600, 600), - wxDEFAULT_DIALOG_STYLE|wxTAB_TRAVERSAL ) -{ - if (data) - m_pageData = *data; - - int textWidth = 80; - - wxBoxSizer *mainsizer = new wxBoxSizer( wxVERTICAL ); - - // 1) top - wxStaticBoxSizer *topsizer = new wxStaticBoxSizer( - new wxStaticBox(this,wxPRINTID_STATIC, _("Paper size")), wxHORIZONTAL ); - - size_t n = wxThePrintPaperDatabase->GetCount(); - wxString *choices = new wxString [n]; - - for (size_t i = 0; i < n; i++) - { - wxPrintPaperType *paper = wxThePrintPaperDatabase->Item(i); - choices[i] = paper->GetName(); - } - - m_paperTypeChoice = new wxComboBox( this, - wxPRINTID_PAPERSIZE, - _("Paper size"), - wxDefaultPosition, - wxSize(300, wxDefaultCoord), - n, choices ); - topsizer->Add( m_paperTypeChoice, 1, wxEXPAND|wxALL, 5 ); -// m_paperTypeChoice->SetSelection(sel); - - mainsizer->Add( topsizer, 0, wxTOP|wxLEFT|wxRIGHT | wxEXPAND, 10 ); - - // 2) middle sizer with radio box - - wxString *choices2 = new wxString[2]; - choices2[0] = _("Portrait"); - choices2[1] = _("Landscape"); - m_orientationRadioBox = new wxRadioBox(this, wxPRINTID_ORIENTATION, _("Orientation"), - wxDefaultPosition, wxDefaultSize, 2, choices2, 2); - m_orientationRadioBox->SetSelection(0); - - mainsizer->Add( m_orientationRadioBox, 0, wxTOP|wxLEFT|wxRIGHT, 10 ); - - // 3) margins - - wxBoxSizer *table = new wxBoxSizer( wxHORIZONTAL ); - - wxBoxSizer *column1 = new wxBoxSizer( wxVERTICAL ); - column1->Add( new wxStaticText(this, wxPRINTID_STATIC, _("Left margin (mm):")),1,wxALL|wxALIGN_RIGHT,5 ); - column1->Add( new wxStaticText(this, wxPRINTID_STATIC, _("Top margin (mm):")),1,wxALL|wxALIGN_RIGHT,5 ); - table->Add( column1, 0, wxALL | wxEXPAND, 5 ); - - wxBoxSizer *column2 = new wxBoxSizer( wxVERTICAL ); - m_marginLeftText = new wxTextCtrl(this, wxPRINTID_LEFTMARGIN, wxEmptyString, wxDefaultPosition, wxSize(textWidth, wxDefaultCoord)); - m_marginTopText = new wxTextCtrl(this, wxPRINTID_TOPMARGIN, wxEmptyString, wxDefaultPosition, wxSize(textWidth, wxDefaultCoord)); - column2->Add( m_marginLeftText, 1, wxALL, 5 ); - column2->Add( m_marginTopText, 1, wxALL, 5 ); - table->Add( column2, 0, wxRIGHT|wxTOP|wxBOTTOM | wxEXPAND, 5 ); - - wxBoxSizer *column3 = new wxBoxSizer( wxVERTICAL ); - column3->Add( new wxStaticText(this, wxPRINTID_STATIC, _("Right margin (mm):")),1,wxALL|wxALIGN_RIGHT,5 ); - column3->Add( new wxStaticText(this, wxPRINTID_STATIC, _("Bottom margin (mm):")),1,wxALL|wxALIGN_RIGHT,5 ); - table->Add( column3, 0, wxALL | wxEXPAND, 5 ); - - wxBoxSizer *column4 = new wxBoxSizer( wxVERTICAL ); - m_marginRightText = new wxTextCtrl(this, wxPRINTID_RIGHTMARGIN, wxEmptyString, wxDefaultPosition, wxSize(textWidth, wxDefaultCoord)); - m_marginBottomText = new wxTextCtrl(this, wxPRINTID_BOTTOMMARGIN, wxEmptyString, wxDefaultPosition, wxSize(textWidth, wxDefaultCoord)); - column4->Add( m_marginRightText, 1, wxALL, 5 ); - column4->Add( m_marginBottomText, 1, wxALL, 5 ); - table->Add( column4, 0, wxRIGHT|wxTOP|wxBOTTOM | wxEXPAND, 5 ); - - mainsizer->Add( table, 0 ); - -#if wxUSE_STATLINE - // 5) static line - mainsizer->Add( new wxStaticLine( this, wxID_ANY ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 ); -#endif - - // 6) buttons - - wxSizer* buttonsizer = CreateButtonSizer( wxOK|wxCANCEL); - - if (wxPrintFactory::GetFactory()->HasPrintSetupDialog()) - { - m_printerButton = new wxButton(this, wxPRINTID_SETUP, _("Printer...") ); - buttonsizer->Add( m_printerButton, 0, wxLEFT|wxRIGHT, 10 ); - if ( !m_pageData.GetEnablePrinter() ) - m_printerButton->Enable(false); - } - else - { - m_printerButton = NULL; - } - - // if (m_printData.GetEnableHelp()) - // wxButton *helpButton = new wxButton(this, (wxFunction)wxGenericPageSetupHelpProc, _("Help"), wxDefaultCoord, wxDefaultCoord, buttonWidth, buttonHeight); - mainsizer->Add( buttonsizer, 0, wxEXPAND|wxALL, 10 ); - - - SetAutoLayout( true ); - SetSizer( mainsizer ); - - mainsizer->Fit( this ); - Centre(wxBOTH); - - InitDialog(); - - delete[] choices; - delete [] choices2; -} - -wxGenericPageSetupDialog::~wxGenericPageSetupDialog() -{ -} - -wxPageSetupDialogData& wxGenericPageSetupDialog::GetPageSetupDialogData() -{ - return m_pageData; -} - -bool wxGenericPageSetupDialog::TransferDataToWindow() -{ - if (m_marginLeftText) - m_marginLeftText->SetValue(wxString::Format(wxT("%d"), m_pageData.GetMarginTopLeft().x)); - if (m_marginTopText) - m_marginTopText->SetValue(wxString::Format(wxT("%d"), m_pageData.GetMarginTopLeft().y)); - if (m_marginRightText) - m_marginRightText->SetValue(wxString::Format(wxT("%d"), m_pageData.GetMarginBottomRight().x)); - if (m_marginBottomText) - m_marginBottomText->SetValue(wxString::Format(wxT("%d"), m_pageData.GetMarginBottomRight().y)); - - if (m_orientationRadioBox) - { - if (m_pageData.GetPrintData().GetOrientation() == wxPORTRAIT) - m_orientationRadioBox->SetSelection(0); - else - m_orientationRadioBox->SetSelection(1); - } - - // Find the paper type from either the current paper size in the wxPageSetupDialogData, or - // failing that, the id in the wxPrintData object. - - wxPrintPaperType* type = wxThePrintPaperDatabase->FindPaperType( - wxSize(m_pageData.GetPaperSize().x * 10, m_pageData.GetPaperSize().y * 10)); - - if (!type && m_pageData.GetPrintData().GetPaperId() != wxPAPER_NONE) - type = wxThePrintPaperDatabase->FindPaperType(m_pageData.GetPrintData().GetPaperId()); - - if (type) - { - m_paperTypeChoice->SetStringSelection(type->GetName()); - } - - return true; -} - -bool wxGenericPageSetupDialog::TransferDataFromWindow() -{ - if (m_marginLeftText && m_marginTopText) - { - int left = wxAtoi( m_marginLeftText->GetValue().c_str() ); - int top = wxAtoi( m_marginTopText->GetValue().c_str() ); - m_pageData.SetMarginTopLeft( wxPoint(left,top) ); - } - if (m_marginRightText && m_marginBottomText) - { - int right = wxAtoi( m_marginRightText->GetValue().c_str() ); - int bottom = wxAtoi( m_marginBottomText->GetValue().c_str() ); - m_pageData.SetMarginBottomRight( wxPoint(right,bottom) ); - } - - if (m_orientationRadioBox) - { - int sel = m_orientationRadioBox->GetSelection(); - if (sel == 0) - { - m_pageData.GetPrintData().SetOrientation(wxPORTRAIT); - } - else - { - m_pageData.GetPrintData().SetOrientation(wxLANDSCAPE); - } - } - - if (m_paperTypeChoice) - { - int selectedItem = m_paperTypeChoice->GetSelection(); - if (selectedItem != -1) - { - wxPrintPaperType *paper = wxThePrintPaperDatabase->Item(selectedItem); - if ( paper ) - { - m_pageData.SetPaperSize(wxSize(paper->GetWidth()/10, paper->GetHeight()/10)); - m_pageData.GetPrintData().SetPaperId(paper->GetId()); - } - } - } - - return true; -} - -wxComboBox *wxGenericPageSetupDialog::CreatePaperTypeChoice(int *x, int *y) -{ -/* - if (!wxThePrintPaperDatabase) - { - wxThePrintPaperDatabase = new wxPrintPaperDatabase; - wxThePrintPaperDatabase->CreateDatabase(); - } -*/ - - size_t n = wxThePrintPaperDatabase->GetCount(); - wxString *choices = new wxString [n]; - - for (size_t i = 0; i < n; i++) - { - wxPrintPaperType *paper = wxThePrintPaperDatabase->Item(i); - choices[i] = paper->GetName(); - } - - (void) new wxStaticText(this, wxPRINTID_STATIC, _("Paper size"), wxPoint(*x, *y)); - *y += 25; - - wxComboBox *choice = new wxComboBox( this, - wxPRINTID_PAPERSIZE, - _("Paper size"), - wxPoint(*x, *y), - wxSize(300, wxDefaultCoord), - n, choices ); - *y += 35; - delete[] choices; - -// choice->SetSelection(sel); - return choice; -} - -void wxGenericPageSetupDialog::OnPrinter(wxCommandEvent& WXUNUSED(event)) -{ - // We no longer query GetPrintMode, so we can eliminate the need - // to call SetPrintMode. - // This has the limitation that we can't explicitly call the PostScript - // print setup dialog from the generic Page Setup dialog under Windows, - // but since this choice would only happen when trying to do PostScript - // printing under Windows (and only in 16-bit Windows which - // doesn't have a Windows-specific page setup dialog) it's worth it. - - // First save the current settings, so the wxPrintData object is up to date. - TransferDataFromWindow(); - - // Transfer the current print settings from this dialog to the page setup dialog. - -#if 0 - // Use print factory later - - wxPrintDialogData data; - data = GetPageSetupData().GetPrintData(); - data.SetSetupDialog(true); - wxPrintDialog printDialog(this, & data); - printDialog.ShowModal(); - - // Transfer the page setup print settings from the page dialog to this dialog again, in case - // the page setup dialog changed something. - GetPageSetupData().GetPrintData() = printDialog.GetPrintDialogData().GetPrintData(); - GetPageSetupData().CalculatePaperSizeFromId(); // Make sure page size reflects the id in wxPrintData - - // Now update the dialog in case the page setup dialog changed some of our settings. - TransferDataToWindow(); -#endif -} - -#endif diff --git a/Externals/wxWidgets3/src/generic/progdlgg.cpp b/Externals/wxWidgets3/src/generic/progdlgg.cpp deleted file mode 100644 index e61586b2c9..0000000000 --- a/Externals/wxWidgets3/src/generic/progdlgg.cpp +++ /dev/null @@ -1,777 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/generic/progdlgg.cpp -// Purpose: wxGenericProgressDialog class -// Author: Karsten Ballueder -// Modified by: -// Created: 09.05.1999 -// Copyright: (c) Karsten Ballueder -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_PROGRESSDLG - -#ifndef WX_PRECOMP - #include "wx/utils.h" - #include "wx/frame.h" - #include "wx/button.h" - #include "wx/stattext.h" - #include "wx/sizer.h" - #include "wx/event.h" - #include "wx/gauge.h" - #include "wx/intl.h" - #include "wx/dcclient.h" - #include "wx/timer.h" - #include "wx/settings.h" - #include "wx/app.h" -#endif - -#include "wx/progdlg.h" -#include "wx/evtloop.h" - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -#define LAYOUT_MARGIN 8 - -static const int wxID_SKIP = 32000; // whatever - -// ---------------------------------------------------------------------------- -// event tables -// ---------------------------------------------------------------------------- - -wxBEGIN_EVENT_TABLE(wxGenericProgressDialog, wxDialog) - EVT_BUTTON(wxID_CANCEL, wxGenericProgressDialog::OnCancel) - EVT_BUTTON(wxID_SKIP, wxGenericProgressDialog::OnSkip) - - EVT_CLOSE(wxGenericProgressDialog::OnClose) -wxEND_EVENT_TABLE() - -// ============================================================================ -// wxGenericProgressDialog implementation -// ============================================================================ - -wxIMPLEMENT_CLASS(wxProgressDialog, wxDialog) - -// ---------------------------------------------------------------------------- -// wxGenericProgressDialog creation -// ---------------------------------------------------------------------------- - -void wxGenericProgressDialog::Init() -{ - // we may disappear at any moment, let the others know about it - SetExtraStyle(GetExtraStyle() | wxWS_EX_TRANSIENT); - - // Initialize all our members that we always use (even when we don't - // create a valid window in this class). - - m_pdStyle = 0; - m_parentTop = NULL; - - m_gauge = NULL; - m_msg = NULL; - m_elapsed = - m_estimated = - m_remaining = NULL; - - m_state = Uncancelable; - m_maximum = 0; - - m_timeStart = wxGetCurrentTime(); - m_timeStop = (unsigned long)-1; - m_break = 0; - - m_skip = false; - - m_btnAbort = - m_btnSkip = NULL; - - m_display_estimated = - m_last_timeupdate = - m_ctdelay = 0; - - m_delay = 3; - - m_winDisabler = NULL; - m_tempEventLoop = NULL; - - SetWindowStyle(wxDEFAULT_DIALOG_STYLE); -} - -wxGenericProgressDialog::wxGenericProgressDialog() - : wxDialog() -{ - Init(); -} - -wxGenericProgressDialog::wxGenericProgressDialog(const wxString& title, - const wxString& message, - int maximum, - wxWindow *parent, - int style) - : wxDialog() -{ - Init(); - - Create( title, message, maximum, parent, style ); -} - -void wxGenericProgressDialog::SetTopParent(wxWindow* parent) -{ - m_parentTop = GetParentForModalDialog(parent, GetWindowStyle()); -} - -bool wxGenericProgressDialog::Create( const wxString& title, - const wxString& message, - int maximum, - wxWindow *parent, - int style ) -{ - SetTopParent(parent); - - m_parentTop = wxGetTopLevelParent(parent); - m_pdStyle = style; - - wxWindow* const - realParent = GetParentForModalDialog(parent, GetWindowStyle()); - - if (!wxDialog::Create(realParent, wxID_ANY, title, wxDefaultPosition, wxDefaultSize, GetWindowStyle())) - return false; - - SetMaximum(maximum); - - // We need a running event loop in order to update the dialog and be able - // to process clicks on its buttons, so ensure that there is one running - // even if this means we have to start it ourselves (this happens most - // commonly during the program initialization, e.g. for the progress - // dialogs shown from overridden wxApp::OnInit()). - if ( !wxEventLoopBase::GetActive() ) - { - m_tempEventLoop = new wxEventLoop; - wxEventLoop::SetActive(m_tempEventLoop); - } - -#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) - // we have to remove the "Close" button from the title bar then as it is - // confusing to have it - it doesn't work anyhow - // - // FIXME: should probably have a (extended?) window style for this - if ( !HasPDFlag(wxPD_CAN_ABORT) ) - { - EnableCloseButton(false); - } -#endif // wxMSW - - m_state = HasPDFlag(wxPD_CAN_ABORT) ? Continue : Uncancelable; - - // top-level sizerTop - wxSizer * const sizerTop = new wxBoxSizer(wxVERTICAL); - - m_msg = new wxStaticText(this, wxID_ANY, message); - sizerTop->Add(m_msg, 0, wxLEFT | wxRIGHT | wxTOP, 2*LAYOUT_MARGIN); - - int gauge_style = wxGA_HORIZONTAL; - if ( style & wxPD_SMOOTH ) - gauge_style |= wxGA_SMOOTH; - gauge_style |= wxGA_PROGRESS; - -#ifdef __WXMSW__ - maximum /= m_factor; -#endif - - m_gauge = new wxGauge - ( - this, - wxID_ANY, - maximum, - wxDefaultPosition, - // make the progress bar sufficiently long - wxSize(wxMin(wxGetClientDisplayRect().width/3, 300), -1), - gauge_style - ); - - sizerTop->Add(m_gauge, 0, wxLEFT | wxRIGHT | wxTOP | wxEXPAND, 2*LAYOUT_MARGIN); - m_gauge->SetValue(0); - - // create the estimated/remaining/total time zones if requested - m_elapsed = - m_estimated = - m_remaining = NULL; - - // also count how many labels we really have - size_t nTimeLabels = 0; - - wxSizer * const sizerLabels = new wxFlexGridSizer(2); - - if ( style & wxPD_ELAPSED_TIME ) - { - nTimeLabels++; - - m_elapsed = CreateLabel(GetElapsedLabel(), sizerLabels); - } - - if ( style & wxPD_ESTIMATED_TIME ) - { - nTimeLabels++; - - m_estimated = CreateLabel(GetEstimatedLabel(), sizerLabels); - } - - if ( style & wxPD_REMAINING_TIME ) - { - nTimeLabels++; - - m_remaining = CreateLabel(GetRemainingLabel(), sizerLabels); - } - sizerTop->Add(sizerLabels, 0, wxALIGN_CENTER_HORIZONTAL | wxTOP, LAYOUT_MARGIN); - - wxStdDialogButtonSizer *buttonSizer = wxDialog::CreateStdDialogButtonSizer(0); - - const int borderFlags = wxALL; - - wxSizerFlags sizerFlags - = wxSizerFlags().Border(borderFlags, LAYOUT_MARGIN); - - if ( HasPDFlag(wxPD_CAN_SKIP) ) - { - m_btnSkip = new wxButton(this, wxID_SKIP, _("&Skip")); - - buttonSizer->SetNegativeButton(m_btnSkip); - } - - if ( HasPDFlag(wxPD_CAN_ABORT) ) - { - m_btnAbort = new wxButton(this, wxID_CANCEL); - - buttonSizer->SetCancelButton(m_btnAbort); - } - - if ( !HasPDFlag(wxPD_CAN_SKIP | wxPD_CAN_ABORT) ) - buttonSizer->AddSpacer(LAYOUT_MARGIN); - - buttonSizer->Realize(); - - sizerTop->Add(buttonSizer, sizerFlags.Expand()); - - SetSizerAndFit(sizerTop); - - Centre(wxCENTER_FRAME | wxBOTH); - - DisableOtherWindows(); - - Show(); - Enable(); - - // this one can be initialized even if the others are unknown for now - // - // NB: do it after calling Layout() to keep the labels correctly aligned - if ( m_elapsed ) - { - SetTimeLabel(0, m_elapsed); - } - - Update(); - return true; -} - -void wxGenericProgressDialog::UpdateTimeEstimates(int value, - unsigned long &elapsedTime, - unsigned long &estimatedTime, - unsigned long &remainingTime) -{ - unsigned long elapsed = wxGetCurrentTime() - m_timeStart; - if ( value != 0 && (m_last_timeupdate < elapsed || value == m_maximum) ) - { - m_last_timeupdate = elapsed; - unsigned long estimated = m_break + - (unsigned long)(( (double) (elapsed-m_break) * m_maximum ) / ((double)value)) ; - if ( estimated > m_display_estimated - && m_ctdelay >= 0 - ) - { - ++m_ctdelay; - } - else if ( estimated < m_display_estimated - && m_ctdelay <= 0 - ) - { - --m_ctdelay; - } - else - { - m_ctdelay = 0; - } - if ( m_ctdelay >= m_delay // enough confirmations for a higher value - || m_ctdelay <= (m_delay*-1) // enough confirmations for a lower value - || value == m_maximum // to stay consistent - || elapsed > m_display_estimated // to stay consistent - || ( elapsed > 0 && elapsed < 4 ) // additional updates in the beginning - ) - { - m_display_estimated = estimated; - m_ctdelay = 0; - } - } - - if ( value != 0 ) - { - long display_remaining = m_display_estimated - elapsed; - if ( display_remaining < 0 ) - { - display_remaining = 0; - } - - estimatedTime = m_display_estimated; - remainingTime = display_remaining; - } - - elapsedTime = elapsed; -} - -// static -wxString wxGenericProgressDialog::GetFormattedTime(unsigned long timeInSec) -{ - wxString timeAsHMS; - - if ( timeInSec == (unsigned long)-1 ) - { - timeAsHMS = _("Unknown"); - } - else - { - unsigned hours = timeInSec / 3600; - unsigned minutes = (timeInSec % 3600) / 60; - unsigned seconds = timeInSec % 60; - timeAsHMS.Printf("%u:%02u:%02u", hours, minutes, seconds); - } - - return timeAsHMS; -} - -wxStaticText * -wxGenericProgressDialog::CreateLabel(const wxString& text, wxSizer *sizer) -{ - wxStaticText *label = new wxStaticText(this, wxID_ANY, text); - wxStaticText *value = new wxStaticText(this, wxID_ANY, _("unknown")); - - // select placement most native or nice on target GUI -#if defined(__WXMSW__) || defined(__WXMAC__) || defined(__WXGTK20__) - // value and time centered in one row - sizer->Add(label, 1, wxALIGN_RIGHT | wxTOP | wxRIGHT, LAYOUT_MARGIN); - sizer->Add(value, 1, wxALIGN_LEFT | wxTOP, LAYOUT_MARGIN); -#else - // value and time to the right in one row - sizer->Add(label); - sizer->Add(value, 0, wxLEFT, LAYOUT_MARGIN); -#endif - - return value; -} - -// ---------------------------------------------------------------------------- -// wxGenericProgressDialog operations -// ---------------------------------------------------------------------------- - -bool -wxGenericProgressDialog::Update(int value, const wxString& newmsg, bool *skip) -{ - if ( !DoBeforeUpdate(skip) ) - return false; - - wxCHECK_MSG( m_gauge, false, "dialog should be fully created" ); - -#ifdef __WXMSW__ - value /= m_factor; -#endif // __WXMSW__ - - wxASSERT_MSG( value <= m_maximum, wxT("invalid progress value") ); - - m_gauge->SetValue(value); - - UpdateMessage(newmsg); - - if ( (m_elapsed || m_remaining || m_estimated) && (value != 0) ) - { - unsigned long elapsed; - unsigned long display_remaining; - - UpdateTimeEstimates( value, - elapsed, - m_display_estimated, - display_remaining ); - - SetTimeLabel(elapsed, m_elapsed); - SetTimeLabel(m_display_estimated, m_estimated); - SetTimeLabel(display_remaining, m_remaining); - } - - if ( value == m_maximum ) - { - if ( m_state == Finished ) - { - // ignore multiple calls to Update(m_maximum): it may sometimes be - // troublesome to ensure that Update() is not called twice with the - // same value (e.g. because of the rounding errors) and if we don't - // return now we're going to generate asserts below - return true; - } - - // so that we return true below and that out [Cancel] handler knew what - // to do - m_state = Finished; - if( !HasPDFlag(wxPD_AUTO_HIDE) ) - { - EnableClose(); - DisableSkip(); -#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) - EnableCloseButton(); -#endif // __WXMSW__ - - if ( newmsg.empty() ) - { - // also provide the finishing message if the application didn't - m_msg->SetLabel(_("Done.")); - } - - // allow the window to repaint: - // NOTE: since we yield only for UI events with this call, there - // should be no side-effects - wxEventLoopBase::GetActive()->YieldFor(wxEVT_CATEGORY_UI); - - // NOTE: this call results in a new event loop being created - // and to a call to ProcessPendingEvents() (which may generate - // unwanted re-entrancies). - (void)ShowModal(); - } - else // auto hide - { - // reenable other windows before hiding this one because otherwise - // Windows wouldn't give the focus back to the window which had - // been previously focused because it would still be disabled - ReenableOtherWindows(); - - Hide(); - } - } - else // not at maximum yet - { - DoAfterUpdate(); - } - - // update the display in case yielding above didn't do it - Update(); - - return m_state != Canceled; -} - -bool wxGenericProgressDialog::Pulse(const wxString& newmsg, bool *skip) -{ - if ( !DoBeforeUpdate(skip) ) - return false; - - wxCHECK_MSG( m_gauge, false, "dialog should be fully created" ); - - // show a bit of progress - m_gauge->Pulse(); - - UpdateMessage(newmsg); - - if (m_elapsed || m_remaining || m_estimated) - { - unsigned long elapsed = wxGetCurrentTime() - m_timeStart; - - SetTimeLabel(elapsed, m_elapsed); - SetTimeLabel((unsigned long)-1, m_estimated); - SetTimeLabel((unsigned long)-1, m_remaining); - } - - DoAfterUpdate(); - - return m_state != Canceled; -} - -bool wxGenericProgressDialog::DoBeforeUpdate(bool *skip) -{ - // we have to yield because not only we want to update the display but - // also to process the clicks on the cancel and skip buttons - // NOTE: using YieldFor() this call shouldn't give re-entrancy problems - // for event handlers not interested to UI/user-input events. - wxEventLoopBase::GetActive()->YieldFor(wxEVT_CATEGORY_UI|wxEVT_CATEGORY_USER_INPUT); - - Update(); - - if ( m_skip && skip && !*skip ) - { - *skip = true; - m_skip = false; - EnableSkip(); - } - - return m_state != Canceled; -} - -void wxGenericProgressDialog::DoAfterUpdate() -{ - // allow the window to repaint: - // NOTE: since we yield only for UI events with this call, there - // should be no side-effects - wxEventLoopBase::GetActive()->YieldFor(wxEVT_CATEGORY_UI); -} - -void wxGenericProgressDialog::Resume() -{ - m_state = Continue; - m_ctdelay = m_delay; // force an update of the elapsed/estimated/remaining time - m_break += wxGetCurrentTime()-m_timeStop; - - EnableAbort(); - EnableSkip(); - m_skip = false; -} - -bool wxGenericProgressDialog::Show( bool show ) -{ - // reenable other windows before hiding this one because otherwise - // Windows wouldn't give the focus back to the window which had - // been previously focused because it would still be disabled - if(!show) - ReenableOtherWindows(); - - return wxDialog::Show(show); -} - -int wxGenericProgressDialog::GetValue() const -{ - wxCHECK_MSG( m_gauge, -1, "dialog should be fully created" ); - - return m_gauge->GetValue(); -} - -int wxGenericProgressDialog::GetRange() const -{ - return m_maximum; -} - -wxString wxGenericProgressDialog::GetMessage() const -{ - return m_msg->GetLabel(); -} - -void wxGenericProgressDialog::SetRange(int maximum) -{ - wxCHECK_RET( m_gauge, "dialog should be fully created" ); - - wxCHECK_RET( maximum > 0, "Invalid range" ); - - m_gauge->SetRange(maximum); - - SetMaximum(maximum); -} - -void wxGenericProgressDialog::SetMaximum(int maximum) -{ - m_maximum = maximum; - -#if defined(__WXMSW__) - // we can't have values > 65,536 in the progress control under Windows, so - // scale everything down - m_factor = m_maximum / 65536 + 1; -#endif // __WXMSW__ -} - - -bool wxGenericProgressDialog::WasCancelled() const -{ - return HasPDFlag(wxPD_CAN_ABORT) && m_state == Canceled; -} - -bool wxGenericProgressDialog::WasSkipped() const -{ - return HasPDFlag(wxPD_CAN_SKIP) && m_skip; -} - -// static -void wxGenericProgressDialog::SetTimeLabel(unsigned long val, - wxStaticText *label) -{ - if ( label ) - { - wxString s; - - if (val != (unsigned long)-1) - { - s = GetFormattedTime(val); - } - else - { - s = _("Unknown"); - } - - if ( s != label->GetLabel() ) - label->SetLabel(s); - } -} - -// ---------------------------------------------------------------------------- -// event handlers -// ---------------------------------------------------------------------------- - -void wxGenericProgressDialog::OnCancel(wxCommandEvent& event) -{ - if ( m_state == Finished ) - { - // this means that the count down is already finished and we're being - // shown as a modal dialog - so just let the default handler do the job - event.Skip(); - } - else - { - // request to cancel was received, the next time Update() is called we - // will handle it - m_state = Canceled; - - // update the buttons state immediately so that the user knows that the - // request has been noticed - DisableAbort(); - DisableSkip(); - - // save the time when the dialog was stopped - m_timeStop = wxGetCurrentTime(); - } -} - -void wxGenericProgressDialog::OnSkip(wxCommandEvent& WXUNUSED(event)) -{ - DisableSkip(); - m_skip = true; -} - -void wxGenericProgressDialog::OnClose(wxCloseEvent& event) -{ - if ( m_state == Uncancelable ) - { - // can't close this dialog - event.Veto(); - } - else if ( m_state == Finished ) - { - // let the default handler close the window as we already terminated - event.Skip(); - } - else - { - // next Update() will notice it - m_state = Canceled; - DisableAbort(); - DisableSkip(); - - m_timeStop = wxGetCurrentTime(); - } -} - -// ---------------------------------------------------------------------------- -// destruction -// ---------------------------------------------------------------------------- - -wxGenericProgressDialog::~wxGenericProgressDialog() -{ - // normally this should have been already done, but just in case - ReenableOtherWindows(); - - if ( m_tempEventLoop ) - { - wxEventLoopBase::SetActive(NULL); - delete m_tempEventLoop; - } -} - -void wxGenericProgressDialog::DisableOtherWindows() -{ - if ( HasPDFlag(wxPD_APP_MODAL) ) - { - m_winDisabler = new wxWindowDisabler(this); - } - else - { - if ( m_parentTop ) - m_parentTop->Disable(); - m_winDisabler = NULL; - } -} - -void wxGenericProgressDialog::ReenableOtherWindows() -{ - if ( HasPDFlag(wxPD_APP_MODAL) ) - { - wxDELETE(m_winDisabler); - } - else - { - if ( m_parentTop ) - m_parentTop->Enable(); - } -} - -// ---------------------------------------------------------------------------- -// private functions -// ---------------------------------------------------------------------------- - -void wxGenericProgressDialog::EnableSkip(bool enable) -{ - if ( HasPDFlag(wxPD_CAN_SKIP) ) - { - if(m_btnSkip) - m_btnSkip->Enable(enable); - } -} - -void wxGenericProgressDialog::EnableAbort(bool enable) -{ - if( HasPDFlag(wxPD_CAN_ABORT) ) - { - if(m_btnAbort) - m_btnAbort->Enable(enable); - } -} - -void wxGenericProgressDialog::EnableClose() -{ - if(HasPDFlag(wxPD_CAN_ABORT)) - { - if(m_btnAbort) - { - m_btnAbort->Enable(); - m_btnAbort->SetLabel(_("Close")); - } - } -} - -void wxGenericProgressDialog::UpdateMessage(const wxString &newmsg) -{ - if ( !newmsg.empty() && newmsg != m_msg->GetLabel() ) - { - m_msg->SetLabel(newmsg); - - // allow the window to repaint: - // NOTE: since we yield only for UI events with this call, there - // should be no side-effects - wxEventLoopBase::GetActive()->YieldFor(wxEVT_CATEGORY_UI); - } -} - -#endif // wxUSE_PROGRESSDLG diff --git a/Externals/wxWidgets3/src/generic/propdlg.cpp b/Externals/wxWidgets3/src/generic/propdlg.cpp deleted file mode 100644 index 264a194dec..0000000000 --- a/Externals/wxWidgets3/src/generic/propdlg.cpp +++ /dev/null @@ -1,184 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/generic/propdlg.cpp -// Purpose: wxPropertySheetDialog -// Author: Julian Smart -// Modified by: -// Created: 2005-03-12 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_BOOKCTRL - -#ifndef WX_PRECOMP - #include "wx/button.h" - #include "wx/sizer.h" - #include "wx/intl.h" - #include "wx/log.h" - #include "wx/msgdlg.h" -#endif - -#include "wx/bookctrl.h" - -#if wxUSE_NOTEBOOK -#include "wx/notebook.h" -#endif -#if wxUSE_CHOICEBOOK -#include "wx/choicebk.h" -#endif -#if wxUSE_TOOLBOOK -#include "wx/toolbook.h" -#endif -#if wxUSE_LISTBOOK -#include "wx/listbook.h" -#endif -#if wxUSE_TREEBOOK -#include "wx/treebook.h" -#endif - -#include "wx/generic/propdlg.h" -#include "wx/sysopt.h" - -//----------------------------------------------------------------------------- -// wxPropertySheetDialog -//----------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxPropertySheetDialog, wxDialog); - -wxBEGIN_EVENT_TABLE(wxPropertySheetDialog, wxDialog) - EVT_IDLE(wxPropertySheetDialog::OnIdle) -wxEND_EVENT_TABLE() - -bool wxPropertySheetDialog::Create(wxWindow* parent, wxWindowID id, const wxString& title, - const wxPoint& pos, const wxSize& sz, long style, - const wxString& name) -{ - parent = GetParentForModalDialog(parent, style); - - if (!wxDialog::Create(parent, id, title, pos, sz, style|wxCLIP_CHILDREN, name)) - return false; - - wxBoxSizer *topSizer = new wxBoxSizer( wxVERTICAL ); - SetSizer(topSizer); - - // This gives more space around the edges - m_innerSizer = new wxBoxSizer( wxVERTICAL ); - - topSizer->Add(m_innerSizer, 1, wxGROW|wxALL, m_sheetOuterBorder); - - m_bookCtrl = CreateBookCtrl(); - AddBookCtrl(m_innerSizer); - - return true; -} - -void wxPropertySheetDialog::Init() -{ - m_sheetStyle = wxPROPSHEET_DEFAULT; - m_innerSizer = NULL; - m_bookCtrl = NULL; - m_sheetOuterBorder = 2; - m_sheetInnerBorder = 5; -} - -// Layout the dialog, to be called after pages have been created -void wxPropertySheetDialog::LayoutDialog(int centreFlags) -{ - GetSizer()->Fit(this); - GetSizer()->SetSizeHints(this); - if (centreFlags) - Centre(centreFlags); -} - -// Creates the buttons, if any -void wxPropertySheetDialog::CreateButtons(int flags) -{ - wxSizer *buttonSizer = CreateButtonSizer(flags); - if( buttonSizer ) - { - m_innerSizer->Add( buttonSizer, wxSizerFlags().Expand().Border(wxALL, 2) ); - m_innerSizer->AddSpacer(2); - } -} - -// Creates the book control -wxBookCtrlBase* wxPropertySheetDialog::CreateBookCtrl() -{ - int style = wxCLIP_CHILDREN | wxBK_DEFAULT; - - wxBookCtrlBase* bookCtrl = NULL; - -#if wxUSE_NOTEBOOK - if (GetSheetStyle() & wxPROPSHEET_NOTEBOOK) - bookCtrl = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style ); -#endif -#if wxUSE_CHOICEBOOK - if (GetSheetStyle() & wxPROPSHEET_CHOICEBOOK) - bookCtrl = new wxChoicebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style ); -#endif -#if wxUSE_TOOLBOOK -#if defined(__WXMAC__) && wxUSE_TOOLBAR && wxUSE_BMPBUTTON - if (GetSheetStyle() & wxPROPSHEET_BUTTONTOOLBOOK) - bookCtrl = new wxToolbook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style|wxTBK_BUTTONBAR ); - else -#endif - if ((GetSheetStyle() & wxPROPSHEET_TOOLBOOK) || (GetSheetStyle() & wxPROPSHEET_BUTTONTOOLBOOK)) - bookCtrl = new wxToolbook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style ); -#endif -#if wxUSE_LISTBOOK - if (GetSheetStyle() & wxPROPSHEET_LISTBOOK) - bookCtrl = new wxListbook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style ); -#endif -#if wxUSE_TREEBOOK - if (GetSheetStyle() & wxPROPSHEET_TREEBOOK) - bookCtrl = new wxTreebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style ); -#endif - if (!bookCtrl) - bookCtrl = new wxBookCtrl(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style ); - - if (GetSheetStyle() & wxPROPSHEET_SHRINKTOFIT) - bookCtrl->SetFitToCurrentPage(true); - - return bookCtrl; -} - -// Adds the book control to the inner sizer. -void wxPropertySheetDialog::AddBookCtrl(wxSizer* sizer) -{ - sizer->Add( m_bookCtrl, wxSizerFlags(1).Expand().Border(wxALL, m_sheetInnerBorder) ); -} - -// Resize dialog if necessary -void wxPropertySheetDialog::OnIdle(wxIdleEvent& event) -{ - event.Skip(); - - if ((GetSheetStyle() & wxPROPSHEET_SHRINKTOFIT) && GetBookCtrl()) - { - int sel = GetBookCtrl()->GetSelection(); - if (sel != -1 && sel != m_selectedPage) - { - GetBookCtrl()->InvalidateBestSize(); - InvalidateBestSize(); - SetSizeHints(-1, -1, -1, -1); - - m_selectedPage = sel; - LayoutDialog(0); - } - } -} - -// Override function in base -wxWindow* wxPropertySheetDialog::GetContentWindow() const -{ - return GetBookCtrl(); -} - -#endif // wxUSE_BOOKCTRL diff --git a/Externals/wxWidgets3/src/generic/regiong.cpp b/Externals/wxWidgets3/src/generic/regiong.cpp deleted file mode 100644 index 8249dcf0b3..0000000000 --- a/Externals/wxWidgets3/src/generic/regiong.cpp +++ /dev/null @@ -1,1933 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/generic/regiong.cpp -// Purpose: generic wxRegion class -// Author: David Elliott -// Modified by: -// Created: 2004/04/12 -// Copyright: (c) 2004 David Elliott -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include "wx/region.h" - -#ifndef WX_PRECOMP - #include "wx/utils.h" -#endif - -// ======================================================================== -// Classes to interface with X.org code -// ======================================================================== - -typedef struct Box -{ - wxCoord x1, x2, y1, y2; -} Box, BOX, BoxRec, *BoxPtr; - -typedef struct REGION *Region; - -struct REGION -{ -public: - // Default constructor initializes nothing - REGION() {} - - REGION(const wxRect& rect) - { - rects = &extents; - numRects = 1; - extents.x1 = rect.x; - extents.y1 = rect.y; - extents.x2 = rect.x + rect.width; - extents.y2 = rect.y + rect.height; - size = 1; - } - - BoxPtr GetBox(int i) - { - return i < numRects ? rects + i : NULL; - } - - // X.org methods - static bool XClipBox( - Region r, - wxRect *rect); - static bool XOffsetRegion( - register Region pRegion, - register int x, - register int y); - static bool XIntersectRegion( - Region reg1, - Region reg2, /* source regions */ - register Region newReg); /* destination Region */ - static bool XUnionRegion( - Region reg1, - Region reg2, /* source regions */ - Region newReg); /* destination Region */ - static bool XSubtractRegion( - Region regM, - Region regS, - register Region regD); - static bool XXorRegion(Region sra, Region srb, Region dr); - static bool XEmptyRegion( - Region r); - static bool XEqualRegion(Region r1, Region r2); - static bool XPointInRegion( - Region pRegion, - int x, int y); - static wxRegionContain XRectInRegion( - register Region region, - int rx, int ry, - unsigned int rwidth, unsigned int rheight); - -protected: - static Region XCreateRegion(void); - static void miSetExtents ( - Region pReg); - static bool XDestroyRegion(Region r); - static int miIntersectO ( - register Region pReg, - register BoxPtr r1, - BoxPtr r1End, - register BoxPtr r2, - BoxPtr r2End, - wxCoord y1, - wxCoord y2); - static void miRegionCopy( - register Region dstrgn, - register Region rgn); - static int miCoalesce( - register Region pReg, /* Region to coalesce */ - int prevStart, /* Index of start of previous band */ - int curStart); /* Index of start of current band */ - static void miRegionOp( - register Region newReg, /* Place to store result */ - Region reg1, /* First region in operation */ - Region reg2, /* 2d region in operation */ - int (*overlapFunc)( - register Region pReg, - register BoxPtr r1, - BoxPtr r1End, - register BoxPtr r2, - BoxPtr r2End, - wxCoord y1, - wxCoord y2), /* Function to call for over- - * lapping bands */ - int (*nonOverlap1Func)( - register Region pReg, - register BoxPtr r, - BoxPtr rEnd, - register wxCoord y1, - register wxCoord y2), /* Function to call for non- - * overlapping bands in region - * 1 */ - int (*nonOverlap2Func)( - register Region pReg, - register BoxPtr r, - BoxPtr rEnd, - register wxCoord y1, - register wxCoord y2)); /* Function to call for non- - * overlapping bands in region - * 2 */ - static int miUnionNonO ( - register Region pReg, - register BoxPtr r, - BoxPtr rEnd, - register wxCoord y1, - register wxCoord y2); - static int miUnionO ( - register Region pReg, - register BoxPtr r1, - BoxPtr r1End, - register BoxPtr r2, - BoxPtr r2End, - register wxCoord y1, - register wxCoord y2); - static int miSubtractNonO1 ( - register Region pReg, - register BoxPtr r, - BoxPtr rEnd, - register wxCoord y1, - register wxCoord y2); - static int miSubtractO ( - register Region pReg, - register BoxPtr r1, - BoxPtr r1End, - register BoxPtr r2, - BoxPtr r2End, - register wxCoord y1, - register wxCoord y2); -protected: - long size; - long numRects; - Box *rects; - Box extents; -}; - -// ======================================================================== -// wxRegionRefData -// ======================================================================== - -class wxRegionRefData : public wxGDIRefData, - public REGION -{ -public: - wxRegionRefData() - : wxGDIRefData(), - REGION() - { - size = 1; - numRects = 0; - rects = ( BOX * )malloc( (unsigned) sizeof( BOX )); - extents.x1 = 0; - extents.x2 = 0; - extents.y1 = 0; - extents.y2 = 0; - } - - wxRegionRefData(const wxPoint& topLeft, const wxPoint& bottomRight) - : wxGDIRefData(), - REGION() - { - rects = (BOX*)malloc(sizeof(BOX)); - size = 1; - numRects = 1; - extents.x1 = topLeft.x; - extents.y1 = topLeft.y; - extents.x2 = bottomRight.x; - extents.y2 = bottomRight.y; - *rects = extents; - } - - wxRegionRefData(const wxRect& rect) - : wxGDIRefData(), - REGION(rect) - { - rects = (BOX*)malloc(sizeof(BOX)); - *rects = extents; - } - - wxRegionRefData(const wxRegionRefData& refData) - : wxGDIRefData(), - REGION() - { - size = refData.size; - numRects = refData.numRects; - rects = (Box*)malloc(numRects*sizeof(Box)); - memcpy(rects, refData.rects, numRects*sizeof(Box)); - extents = refData.extents; - } - - virtual ~wxRegionRefData() - { - free(rects); - } - -private: - // Don't allow this - wxRegionRefData(const REGION&); -}; - -// ======================================================================== -// wxRegionGeneric -// ======================================================================== -//wxIMPLEMENT_DYNAMIC_CLASS(wxRegionGeneric, wxGDIObject); - -#define M_REGIONDATA ((wxRegionRefData *)m_refData) -#define M_REGIONDATA_OF(rgn) ((wxRegionRefData *)(rgn.m_refData)) - -// ---------------------------------------------------------------------------- -// wxRegionGeneric construction -// ---------------------------------------------------------------------------- - -wxRegionGeneric::wxRegionGeneric() -{ -} - -wxRegionGeneric::~wxRegionGeneric() -{ -} - -wxRegionGeneric::wxRegionGeneric(wxCoord x, wxCoord y, wxCoord w, wxCoord h) -{ - m_refData = new wxRegionRefData(wxRect(x,y,w,h)); -} - -wxRegionGeneric::wxRegionGeneric(const wxRect& rect) -{ - m_refData = new wxRegionRefData(rect); -} - -wxRegionGeneric::wxRegionGeneric(const wxPoint& topLeft, const wxPoint& bottomRight) -{ - m_refData = new wxRegionRefData(topLeft, bottomRight); -} - -wxRegionGeneric::wxRegionGeneric(const wxBitmap& bmp) -{ - wxFAIL_MSG("NOT IMPLEMENTED: wxRegionGeneric::wxRegionGeneric(const wxBitmap& bmp)"); -} - -wxRegionGeneric::wxRegionGeneric(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle) -{ - wxFAIL_MSG("NOT IMPLEMENTED: wxRegionGeneric::wxRegionGeneric(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle)"); -} - -wxRegionGeneric::wxRegionGeneric(const wxBitmap& bmp, const wxColour& transp, int tolerance) -{ - wxFAIL_MSG("NOT IMPLEMENTED: wxRegionGeneric::wxRegionGeneric(const wxBitmap& bmp, const wxColour& transp, int tolerance)"); -} - -void wxRegionGeneric::Clear() -{ - UnRef(); - if (!m_refData) - m_refData = new wxRegionRefData(wxRect(0,0,0,0)); -} - -wxGDIRefData *wxRegionGeneric::CreateGDIRefData() const -{ - return new wxRegionRefData; -} - -wxGDIRefData *wxRegionGeneric::CloneGDIRefData(const wxGDIRefData *data) const -{ - return new wxRegionRefData(*(wxRegionRefData *)data); -} - -bool wxRegionGeneric::DoIsEqual(const wxRegion& region) const -{ - return REGION::XEqualRegion(M_REGIONDATA,M_REGIONDATA_OF(region)); -} - -bool wxRegionGeneric::DoGetBox(wxCoord& x, wxCoord& y, wxCoord&w, wxCoord &h) const -{ - if ( !m_refData ) - return false; - - wxRect rect; - REGION::XClipBox(M_REGIONDATA,&rect); - x = rect.x; - y = rect.y; - w = rect.width; - h = rect.height; - return true; -} - -// ---------------------------------------------------------------------------- -// wxRegionGeneric operations -// ---------------------------------------------------------------------------- - -bool wxRegionGeneric::DoUnionWithRect(const wxRect& rect) -{ - if ( rect.IsEmpty() ) - { - // nothing to do - return true; - } - - AllocExclusive(); - REGION region(rect); - return REGION::XUnionRegion(®ion,M_REGIONDATA,M_REGIONDATA); -} - -bool wxRegionGeneric::DoUnionWithRegion(const wxRegion& region) -{ - AllocExclusive(); - return REGION::XUnionRegion(M_REGIONDATA_OF(region),M_REGIONDATA,M_REGIONDATA); -} - -bool wxRegionGeneric::DoIntersect(const wxRegion& region) -{ - AllocExclusive(); - return REGION::XIntersectRegion(M_REGIONDATA_OF(region),M_REGIONDATA,M_REGIONDATA); -} - -bool wxRegionGeneric::DoSubtract(const wxRegion& region) -{ - if ( region.IsEmpty() ) - { - // nothing to do - return true; - } - - return REGION::XSubtractRegion(M_REGIONDATA_OF(region),M_REGIONDATA,M_REGIONDATA); -} - -bool wxRegionGeneric::DoXor(const wxRegion& region) -{ - AllocExclusive(); - return REGION::XXorRegion(M_REGIONDATA_OF(region),M_REGIONDATA,M_REGIONDATA); -} - -bool wxRegionGeneric::DoOffset(wxCoord x, wxCoord y) -{ - AllocExclusive(); - return REGION::XOffsetRegion(M_REGIONDATA, x, y); -} - -// ---------------------------------------------------------------------------- -// wxRegionGeneric comparison -// ---------------------------------------------------------------------------- - -bool wxRegionGeneric::IsEmpty() const -{ - wxASSERT(m_refData); - return REGION::XEmptyRegion(M_REGIONDATA); -} - -// Does the region contain the point (x,y)? -wxRegionContain wxRegionGeneric::DoContainsPoint(wxCoord x, wxCoord y) const -{ - wxASSERT(m_refData); - return REGION::XPointInRegion(M_REGIONDATA,x,y) ? wxInRegion : wxOutRegion; -} - -// Does the region contain the rectangle rect? -wxRegionContain wxRegionGeneric::DoContainsRect(const wxRect& rect) const -{ - wxASSERT(m_refData); - return REGION::XRectInRegion(M_REGIONDATA,rect.x,rect.y,rect.width,rect.height); -} - -// ======================================================================== -// wxRegionIteratorGeneric -// ======================================================================== -//wxIMPLEMENT_DYNAMIC_CLASS(wxRegionIteratorGeneric, wxObject); - -wxRegionIteratorGeneric::wxRegionIteratorGeneric() -{ - m_current = 0; -} - -wxRegionIteratorGeneric::wxRegionIteratorGeneric(const wxRegionGeneric& region) -: m_region(region) -{ - m_current = 0; -} - -wxRegionIteratorGeneric::wxRegionIteratorGeneric(const wxRegionIteratorGeneric& iterator) -: m_region(iterator.m_region) -{ - m_current = iterator.m_current; -} - -void wxRegionIteratorGeneric::Reset(const wxRegionGeneric& region) -{ - m_region = region; - m_current = 0; -} - -bool wxRegionIteratorGeneric::HaveRects() const -{ - return M_REGIONDATA_OF(m_region)->GetBox(m_current); -} - -wxRegionIteratorGeneric& wxRegionIteratorGeneric::operator++() -{ - ++m_current; - return *this; -} - -wxRegionIteratorGeneric wxRegionIteratorGeneric::operator++(int) -{ - wxRegionIteratorGeneric copy(*this); - ++*this; - return copy; -} - -wxRect wxRegionIteratorGeneric::GetRect() const -{ - wxASSERT(m_region.m_refData); - const Box *box = M_REGIONDATA_OF(m_region)->GetBox(m_current); - wxASSERT(box); - return wxRect - ( box->x1 - , box->y1 - , box->x2 - box->x1 - , box->y2 - box->y1 - ); -} - -long wxRegionIteratorGeneric::GetX() const -{ - wxASSERT(m_region.m_refData); - const Box *box = M_REGIONDATA_OF(m_region)->GetBox(m_current); - wxASSERT(box); - return box->x1; -} - -long wxRegionIteratorGeneric::GetY() const -{ - wxASSERT(m_region.m_refData); - const Box *box = M_REGIONDATA_OF(m_region)->GetBox(m_current); - wxASSERT(box); - return box->y1; -} - -long wxRegionIteratorGeneric::GetW() const -{ - wxASSERT(m_region.m_refData); - const Box *box = M_REGIONDATA_OF(m_region)->GetBox(m_current); - wxASSERT(box); - return box->x2 - box->x1; -} - -long wxRegionIteratorGeneric::GetH() const -{ - wxASSERT(m_region.m_refData); - const Box *box = M_REGIONDATA_OF(m_region)->GetBox(m_current); - wxASSERT(box); - return box->y2 - box->y1; -} - -wxRegionIteratorGeneric::~wxRegionIteratorGeneric() -{ -} - - -// ======================================================================== -// The guts (from X.org) -// ======================================================================== - -/************************************************************************ - -Copyright 1987, 1988, 1998 The Open Group - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that -copyright notice and this permission notice appear in supporting -documentation. - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of The Open Group shall not be -used in advertising or otherwise to promote the sale, use or other dealings -in this Software without prior written authorization from The Open Group. - - -Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts. - - All Rights Reserved - -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, -provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in -supporting documentation, and that the name of Digital not be -used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. - -DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING -ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL -DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR -ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, -WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, -ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS -SOFTWARE. - -************************************************************************/ - -/* 1 if two BOXs overlap. - * 0 if two BOXs do not overlap. - * Remember, x2 and y2 are not in the region - */ -#define EXTENTCHECK(r1, r2) \ - ((r1)->x2 > (r2)->x1 && \ - (r1)->x1 < (r2)->x2 && \ - (r1)->y2 > (r2)->y1 && \ - (r1)->y1 < (r2)->y2) - -/* - * Check to see if there is enough memory in the present region. - */ -#define MEMCHECK(reg, rect, firstrect){\ - if ((reg)->numRects >= ((reg)->size - 1)){\ - (firstrect) = (BOX *) realloc \ - ((char *)(firstrect), (unsigned) (2 * (sizeof(BOX)) * ((reg)->size)));\ - if ((firstrect) == 0)\ - return(0);\ - (reg)->size *= 2;\ - (rect) = &(firstrect)[(reg)->numRects];\ - }\ - } - -#define EMPTY_REGION(pReg) pReg->numRects = 0 - -#define REGION_NOT_EMPTY(pReg) pReg->numRects - -#define INBOX(r, x, y) \ - ( ( ((r).x2 > x)) && \ - ( ((r).x1 <= x)) && \ - ( ((r).y2 > y)) && \ - ( ((r).y1 <= y)) ) - -/* - * The functions in this file implement the Region abstraction, similar to one - * used in the X11 sample server. A Region is simply an area, as the name - * implies, and is implemented as a "y-x-banded" array of rectangles. To - * explain: Each Region is made up of a certain number of rectangles sorted - * by y coordinate first, and then by x coordinate. - * - * Furthermore, the rectangles are banded such that every rectangle with a - * given upper-left y coordinate (y1) will have the same lower-right y - * coordinate (y2) and vice versa. If a rectangle has scanlines in a band, it - * will span the entire vertical distance of the band. This means that some - * areas that could be merged into a taller rectangle will be represented as - * several shorter rectangles to account for shorter rectangles to its left - * or right but within its "vertical scope". - * - * An added constraint on the rectangles is that they must cover as much - * horizontal area as possible. E.g. no two rectangles in a band are allowed - * to touch. - * - * Whenever possible, bands will be merged together to cover a greater vertical - * distance (and thus reduce the number of rectangles). Two bands can be merged - * only if the bottom of one touches the top of the other and they have - * rectangles in the same places (of the same width, of course). This maintains - * the y-x-banding that's so nice to have... - */ - -/* Create a new empty region */ -Region REGION::XCreateRegion(void) -{ - Region temp = new REGION; - - if (!temp) - return (Region) NULL; - - temp->rects = ( BOX * )malloc( (unsigned) sizeof( BOX )); - - if (!temp->rects) - { - delete temp; - return (Region) NULL; - } - temp->numRects = 0; - temp->extents.x1 = 0; - temp->extents.y1 = 0; - temp->extents.x2 = 0; - temp->extents.y2 = 0; - temp->size = 1; - return( temp ); -} - -bool REGION::XClipBox(Region r, wxRect *rect) -{ - rect->x = r->extents.x1; - rect->y = r->extents.y1; - rect->width = r->extents.x2 - r->extents.x1; - rect->height = r->extents.y2 - r->extents.y1; - return true; -} - -/*- - *----------------------------------------------------------------------- - * miSetExtents -- - * Reset the extents of a region to what they should be. Called by - * miSubtract and miIntersect b/c they can't figure it out along the - * way or do so easily, as miUnion can. - * - * Results: - * None. - * - * Side Effects: - * The region's 'extents' structure is overwritten. - * - *----------------------------------------------------------------------- - */ -void REGION:: -miSetExtents (Region pReg) -{ - BoxPtr pBox, pBoxEnd, pExtents; - - if (pReg->numRects == 0) - { - pReg->extents.x1 = 0; - pReg->extents.y1 = 0; - pReg->extents.x2 = 0; - pReg->extents.y2 = 0; - return; - } - - pExtents = &pReg->extents; - pBox = pReg->rects; - pBoxEnd = &pBox[pReg->numRects - 1]; - - /* - * Since pBox is the first rectangle in the region, it must have the - * smallest y1 and since pBoxEnd is the last rectangle in the region, - * it must have the largest y2, because of banding. Initialize x1 and - * x2 from pBox and pBoxEnd, resp., as good things to initialize them - * to... - */ - pExtents->x1 = pBox->x1; - pExtents->y1 = pBox->y1; - pExtents->x2 = pBoxEnd->x2; - pExtents->y2 = pBoxEnd->y2; - - wxASSERT_LEVEL_2(pExtents->y1 < pExtents->y2); - while (pBox <= pBoxEnd) - { - if (pBox->x1 < pExtents->x1) - { - pExtents->x1 = pBox->x1; - } - if (pBox->x2 > pExtents->x2) - { - pExtents->x2 = pBox->x2; - } - pBox++; - } - wxASSERT_LEVEL_2(pExtents->x1 < pExtents->x2); -} - -bool REGION:: -XDestroyRegion( - Region r) -{ - free( (char *) r->rects ); - delete r; - return true; -} - -/* TranslateRegion(pRegion, x, y) - translates in place - added by raymond -*/ - -bool REGION:: -XOffsetRegion( - register Region pRegion, - register int x, - register int y) -{ - int nbox; - BOX *pbox; - - pbox = pRegion->rects; - nbox = pRegion->numRects; - - while(nbox--) - { - pbox->x1 += x; - pbox->x2 += x; - pbox->y1 += y; - pbox->y2 += y; - pbox++; - } - pRegion->extents.x1 += x; - pRegion->extents.x2 += x; - pRegion->extents.y1 += y; - pRegion->extents.y2 += y; - return 1; -} - -/*====================================================================== - * Region Intersection - *====================================================================*/ -/*- - *----------------------------------------------------------------------- - * miIntersectO -- - * Handle an overlapping band for miIntersect. - * - * Results: - * None. - * - * Side Effects: - * Rectangles may be added to the region. - * - *----------------------------------------------------------------------- - */ -/* static void*/ -int REGION:: -miIntersectO ( - register Region pReg, - register BoxPtr r1, - BoxPtr r1End, - register BoxPtr r2, - BoxPtr r2End, - wxCoord y1, - wxCoord y2) -{ - wxCoord x1; - wxCoord x2; - BoxPtr pNextRect; - - pNextRect = &pReg->rects[pReg->numRects]; - - while ((r1 != r1End) && (r2 != r2End)) - { - x1 = wxMax(r1->x1,r2->x1); - x2 = wxMin(r1->x2,r2->x2); - - /* - * If there's any overlap between the two rectangles, add that - * overlap to the new region. - * There's no need to check for subsumption because the only way - * such a need could arise is if some region has two rectangles - * right next to each other. Since that should never happen... - */ - if (x1 < x2) - { - wxASSERT_LEVEL_2(y1rects); - pNextRect->x1 = x1; - pNextRect->y1 = y1; - pNextRect->x2 = x2; - pNextRect->y2 = y2; - pReg->numRects += 1; - pNextRect++; - wxASSERT_LEVEL_2(pReg->numRects <= pReg->size); - } - - /* - * Need to advance the pointers. Shift the one that extends - * to the right the least, since the other still has a chance to - * overlap with that region's next rectangle, if you see what I mean. - */ - if (r1->x2 < r2->x2) - { - r1++; - } - else if (r2->x2 < r1->x2) - { - r2++; - } - else - { - r1++; - r2++; - } - } - return 0; /* lint */ -} - -bool REGION:: -XIntersectRegion( - Region reg1, - Region reg2, /* source regions */ - register Region newReg) /* destination Region */ -{ - /* check for trivial reject */ - if ( (!(reg1->numRects)) || (!(reg2->numRects)) || - (!EXTENTCHECK(®1->extents, ®2->extents))) - newReg->numRects = 0; - else - miRegionOp (newReg, reg1, reg2, - miIntersectO, NULL, NULL); - - /* - * Can't alter newReg's extents before we call miRegionOp because - * it might be one of the source regions and miRegionOp depends - * on the extents of those regions being the same. Besides, this - * way there's no checking against rectangles that will be nuked - * due to coalescing, so we have to examine fewer rectangles. - */ - miSetExtents(newReg); - return 1; -} - -void REGION:: -miRegionCopy( - register Region dstrgn, - register Region rgn) - -{ - if (dstrgn != rgn) /* don't want to copy to itself */ - { - if (dstrgn->size < rgn->numRects) - { - if (dstrgn->rects) - { - BOX *prevRects = dstrgn->rects; - - dstrgn->rects = (BOX *) - realloc((char *) dstrgn->rects, - (unsigned) rgn->numRects * (sizeof(BOX))); - if (!dstrgn->rects) - { - free(prevRects); - return; - } - } - dstrgn->size = rgn->numRects; - } - dstrgn->numRects = rgn->numRects; - dstrgn->extents.x1 = rgn->extents.x1; - dstrgn->extents.y1 = rgn->extents.y1; - dstrgn->extents.x2 = rgn->extents.x2; - dstrgn->extents.y2 = rgn->extents.y2; - - memcpy((char *) dstrgn->rects, (char *) rgn->rects, - (int) (rgn->numRects * sizeof(BOX))); - } -} - -/*====================================================================== - * Generic Region Operator - *====================================================================*/ - -/*- - *----------------------------------------------------------------------- - * miCoalesce -- - * Attempt to merge the boxes in the current band with those in the - * previous one. Used only by miRegionOp. - * - * Results: - * The new index for the previous band. - * - * Side Effects: - * If coalescing takes place: - * - rectangles in the previous band will have their y2 fields - * altered. - * - pReg->numRects will be decreased. - * - *----------------------------------------------------------------------- - */ -/* static int*/ -int REGION:: -miCoalesce( - register Region pReg, /* Region to coalesce */ - int prevStart, /* Index of start of previous band */ - int curStart) /* Index of start of current band */ -{ - BoxPtr pPrevBox; /* Current box in previous band */ - BoxPtr pCurBox; /* Current box in current band */ - BoxPtr pRegEnd; /* End of region */ - int curNumRects; /* Number of rectangles in current - * band */ - int prevNumRects; /* Number of rectangles in previous - * band */ - int bandY1; /* Y1 coordinate for current band */ - - pRegEnd = &pReg->rects[pReg->numRects]; - - pPrevBox = &pReg->rects[prevStart]; - prevNumRects = curStart - prevStart; - - /* - * Figure out how many rectangles are in the current band. Have to do - * this because multiple bands could have been added in miRegionOp - * at the end when one region has been exhausted. - */ - pCurBox = &pReg->rects[curStart]; - bandY1 = pCurBox->y1; - for (curNumRects = 0; - (pCurBox != pRegEnd) && (pCurBox->y1 == bandY1); - curNumRects++) - { - pCurBox++; - } - - if (pCurBox != pRegEnd) - { - /* - * If more than one band was added, we have to find the start - * of the last band added so the next coalescing job can start - * at the right place... (given when multiple bands are added, - * this may be pointless -- see above). - */ - pRegEnd--; - while (pRegEnd[-1].y1 == pRegEnd->y1) - { - pRegEnd--; - } - curStart = pRegEnd - pReg->rects; - pRegEnd = pReg->rects + pReg->numRects; - } - - if ((curNumRects == prevNumRects) && (curNumRects != 0)) - { - pCurBox -= curNumRects; - /* - * The bands may only be coalesced if the bottom of the previous - * matches the top scanline of the current. - */ - if (pPrevBox->y2 == pCurBox->y1) - { - /* - * Make sure the bands have boxes in the same places. This - * assumes that boxes have been added in such a way that they - * cover the most area possible. I.e. two boxes in a band must - * have some horizontal space between them. - */ - do - { - if ((pPrevBox->x1 != pCurBox->x1) || - (pPrevBox->x2 != pCurBox->x2)) - { - /* - * The bands don't line up so they can't be coalesced. - */ - return (curStart); - } - pPrevBox++; - pCurBox++; - prevNumRects -= 1; - } while (prevNumRects != 0); - - pReg->numRects -= curNumRects; - pCurBox -= curNumRects; - pPrevBox -= curNumRects; - - /* - * The bands may be merged, so set the bottom y of each box - * in the previous band to that of the corresponding box in - * the current band. - */ - do - { - pPrevBox->y2 = pCurBox->y2; - pPrevBox++; - pCurBox++; - curNumRects -= 1; - } while (curNumRects != 0); - - /* - * If only one band was added to the region, we have to backup - * curStart to the start of the previous band. - * - * If more than one band was added to the region, copy the - * other bands down. The assumption here is that the other bands - * came from the same region as the current one and no further - * coalescing can be done on them since it's all been done - * already... curStart is already in the right place. - */ - if (pCurBox == pRegEnd) - { - curStart = prevStart; - } - else - { - do - { - *pPrevBox++ = *pCurBox++; - } while (pCurBox != pRegEnd); - } - - } - } - return (curStart); -} - -/*- - *----------------------------------------------------------------------- - * miRegionOp -- - * Apply an operation to two regions. Called by miUnion, miInverse, - * miSubtract, miIntersect... - * - * Results: - * None. - * - * Side Effects: - * The new region is overwritten. - * - * Notes: - * The idea behind this function is to view the two regions as sets. - * Together they cover a rectangle of area that this function divides - * into horizontal bands where points are covered only by one region - * or by both. For the first case, the nonOverlapFunc is called with - * each the band and the band's upper and lower extents. For the - * second, the overlapFunc is called to process the entire band. It - * is responsible for clipping the rectangles in the band, though - * this function provides the boundaries. - * At the end of each band, the new region is coalesced, if possible, - * to reduce the number of rectangles in the region. - * - *----------------------------------------------------------------------- - */ -/* static void*/ -void REGION:: -miRegionOp( - register Region newReg, /* Place to store result */ - Region reg1, /* First region in operation */ - Region reg2, /* 2d region in operation */ - int (*overlapFunc)( - register Region pReg, - register BoxPtr r1, - BoxPtr r1End, - register BoxPtr r2, - BoxPtr r2End, - wxCoord y1, - wxCoord y2), /* Function to call for over- - * lapping bands */ - int (*nonOverlap1Func)( - register Region pReg, - register BoxPtr r, - BoxPtr rEnd, - register wxCoord y1, - register wxCoord y2), /* Function to call for non- - * overlapping bands in region - * 1 */ - int (*nonOverlap2Func)( - register Region pReg, - register BoxPtr r, - BoxPtr rEnd, - register wxCoord y1, - register wxCoord y2)) /* Function to call for non- - * overlapping bands in region - * 2 */ -{ - BoxPtr r1; /* Pointer into first region */ - BoxPtr r2; /* Pointer into 2d region */ - BoxPtr r1End; /* End of 1st region */ - BoxPtr r2End; /* End of 2d region */ - wxCoord ybot; /* Bottom of intersection */ - wxCoord ytop; /* Top of intersection */ - BoxPtr oldRects; /* Old rects for newReg */ - int prevBand; /* Index of start of - * previous band in newReg */ - int curBand; /* Index of start of current - * band in newReg */ - BoxPtr r1BandEnd; /* End of current band in r1 */ - BoxPtr r2BandEnd; /* End of current band in r2 */ - wxCoord top; /* Top of non-overlapping - * band */ - wxCoord bot; /* Bottom of non-overlapping - * band */ - - /* - * Initialization: - * set r1, r2, r1End and r2End appropriately, preserve the important - * parts of the destination region until the end in case it's one of - * the two source regions, then mark the "new" region empty, allocating - * another array of rectangles for it to use. - */ - r1 = reg1->rects; - r2 = reg2->rects; - r1End = r1 + reg1->numRects; - r2End = r2 + reg2->numRects; - - oldRects = newReg->rects; - - EMPTY_REGION(newReg); - - /* - * Allocate a reasonable number of rectangles for the new region. The idea - * is to allocate enough so the individual functions don't need to - * reallocate and copy the array, which is time consuming, yet we don't - * have to worry about using too much memory. I hope to be able to - * nuke the realloc() at the end of this function eventually. - */ - newReg->size = wxMax(reg1->numRects,reg2->numRects) * 2; - - newReg->rects = (BoxPtr)malloc((unsigned) (sizeof(BoxRec) * newReg->size)); - - if (!newReg->rects) - { - newReg->size = 0; - return; - } - - /* - * Initialize ybot and ytop. - * In the upcoming loop, ybot and ytop serve different functions depending - * on whether the band being handled is an overlapping or non-overlapping - * band. - * In the case of a non-overlapping band (only one of the regions - * has points in the band), ybot is the bottom of the most recent - * intersection and thus clips the top of the rectangles in that band. - * ytop is the top of the next intersection between the two regions and - * serves to clip the bottom of the rectangles in the current band. - * For an overlapping band (where the two regions intersect), ytop clips - * the top of the rectangles of both regions and ybot clips the bottoms. - */ - if (reg1->extents.y1 < reg2->extents.y1) - ybot = reg1->extents.y1; - else - ybot = reg2->extents.y1; - - /* - * prevBand serves to mark the start of the previous band so rectangles - * can be coalesced into larger rectangles. qv. miCoalesce, above. - * In the beginning, there is no previous band, so prevBand == curBand - * (curBand is set later on, of course, but the first band will always - * start at index 0). prevBand and curBand must be indices because of - * the possible expansion, and resultant moving, of the new region's - * array of rectangles. - */ - prevBand = 0; - - do - { - curBand = newReg->numRects; - - /* - * This algorithm proceeds one source-band (as opposed to a - * destination band, which is determined by where the two regions - * intersect) at a time. r1BandEnd and r2BandEnd serve to mark the - * rectangle after the last one in the current band for their - * respective regions. - */ - r1BandEnd = r1; - while ((r1BandEnd != r1End) && (r1BandEnd->y1 == r1->y1)) - { - r1BandEnd++; - } - - r2BandEnd = r2; - while ((r2BandEnd != r2End) && (r2BandEnd->y1 == r2->y1)) - { - r2BandEnd++; - } - - /* - * First handle the band that doesn't intersect, if any. - * - * Note that attention is restricted to one band in the - * non-intersecting region at once, so if a region has n - * bands between the current position and the next place it overlaps - * the other, this entire loop will be passed through n times. - */ - if (r1->y1 < r2->y1) - { - top = wxMax(r1->y1,ybot); - bot = wxMin(r1->y2,r2->y1); - - if ((top != bot) && (nonOverlap1Func != NULL)) - { - (* nonOverlap1Func) (newReg, r1, r1BandEnd, top, bot); - } - - ytop = r2->y1; - } - else if (r2->y1 < r1->y1) - { - top = wxMax(r2->y1,ybot); - bot = wxMin(r2->y2,r1->y1); - - if ((top != bot) && (nonOverlap2Func != NULL)) - { - (* nonOverlap2Func) (newReg, r2, r2BandEnd, top, bot); - } - - ytop = r1->y1; - } - else - { - ytop = r1->y1; - } - - /* - * If any rectangles got added to the region, try and coalesce them - * with rectangles from the previous band. Note we could just do - * this test in miCoalesce, but some machines incur a not - * inconsiderable cost for function calls, so... - */ - if (newReg->numRects != curBand) - { - prevBand = miCoalesce (newReg, prevBand, curBand); - } - - /* - * Now see if we've hit an intersecting band. The two bands only - * intersect if ybot > ytop - */ - ybot = wxMin(r1->y2, r2->y2); - curBand = newReg->numRects; - if (ybot > ytop) - { - (* overlapFunc) (newReg, r1, r1BandEnd, r2, r2BandEnd, ytop, ybot); - - } - - if (newReg->numRects != curBand) - { - prevBand = miCoalesce (newReg, prevBand, curBand); - } - - /* - * If we've finished with a band (y2 == ybot) we skip forward - * in the region to the next band. - */ - if (r1->y2 == ybot) - { - r1 = r1BandEnd; - } - if (r2->y2 == ybot) - { - r2 = r2BandEnd; - } - } while ((r1 != r1End) && (r2 != r2End)); - - /* - * Deal with whichever region still has rectangles left. - */ - curBand = newReg->numRects; - if (r1 != r1End) - { - if (nonOverlap1Func != NULL) - { - do - { - r1BandEnd = r1; - while ((r1BandEnd < r1End) && (r1BandEnd->y1 == r1->y1)) - { - r1BandEnd++; - } - (* nonOverlap1Func) (newReg, r1, r1BandEnd, - wxMax(r1->y1,ybot), r1->y2); - r1 = r1BandEnd; - } while (r1 != r1End); - } - } - else if ((r2 != r2End) && (nonOverlap2Func != NULL)) - { - do - { - r2BandEnd = r2; - while ((r2BandEnd < r2End) && (r2BandEnd->y1 == r2->y1)) - { - r2BandEnd++; - } - (* nonOverlap2Func) (newReg, r2, r2BandEnd, - wxMax(r2->y1,ybot), r2->y2); - r2 = r2BandEnd; - } while (r2 != r2End); - } - - if (newReg->numRects != curBand) - { - (void) miCoalesce (newReg, prevBand, curBand); - } - - /* - * A bit of cleanup. To keep regions from growing without bound, - * we shrink the array of rectangles to match the new number of - * rectangles in the region. This never goes to 0, however... - * - * Only do this stuff if the number of rectangles allocated is more than - * twice the number of rectangles in the region (a simple optimization...). - */ - if (newReg->numRects < (newReg->size >> 1)) - { - if (REGION_NOT_EMPTY(newReg)) - { - BoxPtr prev_rects = newReg->rects; - newReg->size = newReg->numRects; - newReg->rects = (BoxPtr) realloc ((char *) newReg->rects, - (unsigned) (sizeof(BoxRec) * newReg->size)); - if (! newReg->rects) - newReg->rects = prev_rects; - } - else - { - /* - * No point in doing the extra work involved in an realloc if - * the region is empty - */ - newReg->size = 1; - free((char *) newReg->rects); - newReg->rects = (BoxPtr) malloc(sizeof(BoxRec)); - } - } - free ((char *) oldRects); - return; -} - -/*====================================================================== - * Region Union - *====================================================================*/ - -/*- - *----------------------------------------------------------------------- - * miUnionNonO -- - * Handle a non-overlapping band for the union operation. Just - * Adds the rectangles into the region. Doesn't have to check for - * subsumption or anything. - * - * Results: - * None. - * - * Side Effects: - * pReg->numRects is incremented and the final rectangles overwritten - * with the rectangles we're passed. - * - *----------------------------------------------------------------------- - */ -/* static void*/ -int REGION:: -miUnionNonO ( - register Region pReg, - register BoxPtr r, - BoxPtr rEnd, - register wxCoord y1, - register wxCoord y2) -{ - BoxPtr pNextRect; - - pNextRect = &pReg->rects[pReg->numRects]; - - wxASSERT_LEVEL_2(y1 < y2); - - while (r != rEnd) - { - wxASSERT_LEVEL_2(r->x1 < r->x2); - MEMCHECK(pReg, pNextRect, pReg->rects); - pNextRect->x1 = r->x1; - pNextRect->y1 = y1; - pNextRect->x2 = r->x2; - pNextRect->y2 = y2; - pReg->numRects += 1; - pNextRect++; - - wxASSERT_LEVEL_2(pReg->numRects<=pReg->size); - r++; - } - return 0; /* lint */ -} - - -/*- - *----------------------------------------------------------------------- - * miUnionO -- - * Handle an overlapping band for the union operation. Picks the - * left-most rectangle each time and merges it into the region. - * - * Results: - * None. - * - * Side Effects: - * Rectangles are overwritten in pReg->rects and pReg->numRects will - * be changed. - * - *----------------------------------------------------------------------- - */ - -/* static void*/ -int REGION:: -miUnionO ( - register Region pReg, - register BoxPtr r1, - BoxPtr r1End, - register BoxPtr r2, - BoxPtr r2End, - register wxCoord y1, - register wxCoord y2) -{ - BoxPtr pNextRect; - - pNextRect = &pReg->rects[pReg->numRects]; - -#define MERGERECT(r) \ - if ((pReg->numRects != 0) && \ - (pNextRect[-1].y1 == y1) && \ - (pNextRect[-1].y2 == y2) && \ - (pNextRect[-1].x2 >= r->x1)) \ - { \ - if (pNextRect[-1].x2 < r->x2) \ - { \ - pNextRect[-1].x2 = r->x2; \ - wxASSERT_LEVEL_2(pNextRect[-1].x1rects); \ - pNextRect->y1 = y1; \ - pNextRect->y2 = y2; \ - pNextRect->x1 = r->x1; \ - pNextRect->x2 = r->x2; \ - pReg->numRects += 1; \ - pNextRect += 1; \ - } \ - wxASSERT_LEVEL_2(pReg->numRects<=pReg->size);\ - r++; - - wxASSERT_LEVEL_2 (y1x1 < r2->x1) - { - MERGERECT(r1); - } - else - { - MERGERECT(r2); - } - } - - if (r1 != r1End) - { - do - { - MERGERECT(r1); - } while (r1 != r1End); - } - else while (r2 != r2End) - { - MERGERECT(r2); - } - return 0; /* lint */ -} - -bool REGION:: -XUnionRegion( - Region reg1, - Region reg2, /* source regions */ - Region newReg) /* destination Region */ -{ - /* checks all the simple cases */ - - /* - * Region 1 and 2 are the same or region 1 is empty - */ - if ( (reg1 == reg2) || (!(reg1->numRects)) ) - { - if (newReg != reg2) - miRegionCopy(newReg, reg2); - return 1; - } - - /* - * if nothing to union (region 2 empty) - */ - if (!(reg2->numRects)) - { - if (newReg != reg1) - miRegionCopy(newReg, reg1); - return 1; - } - - /* - * Region 1 completely subsumes region 2 - */ - if ((reg1->numRects == 1) && - (reg1->extents.x1 <= reg2->extents.x1) && - (reg1->extents.y1 <= reg2->extents.y1) && - (reg1->extents.x2 >= reg2->extents.x2) && - (reg1->extents.y2 >= reg2->extents.y2)) - { - if (newReg != reg1) - miRegionCopy(newReg, reg1); - return 1; - } - - /* - * Region 2 completely subsumes region 1 - */ - if ((reg2->numRects == 1) && - (reg2->extents.x1 <= reg1->extents.x1) && - (reg2->extents.y1 <= reg1->extents.y1) && - (reg2->extents.x2 >= reg1->extents.x2) && - (reg2->extents.y2 >= reg1->extents.y2)) - { - if (newReg != reg2) - miRegionCopy(newReg, reg2); - return 1; - } - - miRegionOp (newReg, reg1, reg2, miUnionO, - miUnionNonO, miUnionNonO); - - newReg->extents.x1 = wxMin(reg1->extents.x1, reg2->extents.x1); - newReg->extents.y1 = wxMin(reg1->extents.y1, reg2->extents.y1); - newReg->extents.x2 = wxMax(reg1->extents.x2, reg2->extents.x2); - newReg->extents.y2 = wxMax(reg1->extents.y2, reg2->extents.y2); - - return 1; -} - -/*====================================================================== - * Region Subtraction - *====================================================================*/ - -/*- - *----------------------------------------------------------------------- - * miSubtractNonO -- - * Deal with non-overlapping band for subtraction. Any parts from - * region 2 we discard. Anything from region 1 we add to the region. - * - * Results: - * None. - * - * Side Effects: - * pReg may be affected. - * - *----------------------------------------------------------------------- - */ -/* static void*/ -int REGION:: -miSubtractNonO1 ( - register Region pReg, - register BoxPtr r, - BoxPtr rEnd, - register wxCoord y1, - register wxCoord y2) -{ - BoxPtr pNextRect; - - pNextRect = &pReg->rects[pReg->numRects]; - - wxASSERT_LEVEL_2(y1x1x2); - MEMCHECK(pReg, pNextRect, pReg->rects); - pNextRect->x1 = r->x1; - pNextRect->y1 = y1; - pNextRect->x2 = r->x2; - pNextRect->y2 = y2; - pReg->numRects += 1; - pNextRect++; - - wxASSERT_LEVEL_2(pReg->numRects <= pReg->size); - - r++; - } - return 0; /* lint */ -} - -/*- - *----------------------------------------------------------------------- - * miSubtractO -- - * Overlapping band subtraction. x1 is the left-most point not yet - * checked. - * - * Results: - * None. - * - * Side Effects: - * pReg may have rectangles added to it. - * - *----------------------------------------------------------------------- - */ -/* static void*/ -int REGION:: -miSubtractO ( - register Region pReg, - register BoxPtr r1, - BoxPtr r1End, - register BoxPtr r2, - BoxPtr r2End, - register wxCoord y1, - register wxCoord y2) -{ - BoxPtr pNextRect; - int x1; - - x1 = r1->x1; - - wxASSERT_LEVEL_2(y1rects[pReg->numRects]; - - while ((r1 != r1End) && (r2 != r2End)) - { - if (r2->x2 <= x1) - { - /* - * Subtrahend missed the boat: go to next subtrahend. - */ - r2++; - } - else if (r2->x1 <= x1) - { - /* - * Subtrahend precedes minuend: nuke left edge of minuend. - */ - x1 = r2->x2; - if (x1 >= r1->x2) - { - /* - * Minuend completely covered: advance to next minuend and - * reset left fence to edge of new minuend. - */ - r1++; - if (r1 != r1End) - x1 = r1->x1; - } - else - { - /* - * Subtrahend now used up since it doesn't extend beyond - * minuend - */ - r2++; - } - } - else if (r2->x1 < r1->x2) - { - /* - * Left part of subtrahend covers part of minuend: add uncovered - * part of minuend to region and skip to next subtrahend. - */ - wxASSERT_LEVEL_2(x1x1); - MEMCHECK(pReg, pNextRect, pReg->rects); - pNextRect->x1 = x1; - pNextRect->y1 = y1; - pNextRect->x2 = r2->x1; - pNextRect->y2 = y2; - pReg->numRects += 1; - pNextRect++; - - wxASSERT_LEVEL_2(pReg->numRects<=pReg->size); - - x1 = r2->x2; - if (x1 >= r1->x2) - { - /* - * Minuend used up: advance to new... - */ - r1++; - if (r1 != r1End) - x1 = r1->x1; - } - else - { - /* - * Subtrahend used up - */ - r2++; - } - } - else - { - /* - * Minuend used up: add any remaining piece before advancing. - */ - if (r1->x2 > x1) - { - MEMCHECK(pReg, pNextRect, pReg->rects); - pNextRect->x1 = x1; - pNextRect->y1 = y1; - pNextRect->x2 = r1->x2; - pNextRect->y2 = y2; - pReg->numRects += 1; - pNextRect++; - wxASSERT_LEVEL_2(pReg->numRects<=pReg->size); - } - r1++; - if (r1 != r1End) - x1 = r1->x1; - } - } - - /* - * Add remaining minuend rectangles to region. - */ - while (r1 != r1End) - { - wxASSERT_LEVEL_2(x1x2); - MEMCHECK(pReg, pNextRect, pReg->rects); - pNextRect->x1 = x1; - pNextRect->y1 = y1; - pNextRect->x2 = r1->x2; - pNextRect->y2 = y2; - pReg->numRects += 1; - pNextRect++; - - wxASSERT_LEVEL_2(pReg->numRects<=pReg->size); - - r1++; - if (r1 != r1End) - { - x1 = r1->x1; - } - } - return 0; /* lint */ -} - -/*- - *----------------------------------------------------------------------- - * miSubtract -- - * Subtract regS from regM and leave the result in regD. - * S stands for subtrahend, M for minuend and D for difference. - * - * Results: - * true. - * - * Side Effects: - * regD is overwritten. - * - *----------------------------------------------------------------------- - */ - -bool REGION::XSubtractRegion(Region regM, Region regS, register Region regD) -{ - /* check for trivial reject */ - if ( (!(regM->numRects)) || (!(regS->numRects)) || - (!EXTENTCHECK(®M->extents, ®S->extents)) ) - { - miRegionCopy(regD, regM); - return true; - } - - miRegionOp (regD, regM, regS, miSubtractO, - miSubtractNonO1, NULL); - - /* - * Can't alter newReg's extents before we call miRegionOp because - * it might be one of the source regions and miRegionOp depends - * on the extents of those regions being the unaltered. Besides, this - * way there's no checking against rectangles that will be nuked - * due to coalescing, so we have to examine fewer rectangles. - */ - miSetExtents (regD); - return true; -} - -bool REGION::XXorRegion(Region sra, Region srb, Region dr) -{ - Region tra = XCreateRegion(); - - wxCHECK_MSG( tra, false, wxT("region not created") ); - - Region trb = XCreateRegion(); - - wxCHECK_MSG( trb, false, wxT("region not created") ); - - (void) XSubtractRegion(sra,srb,tra); - (void) XSubtractRegion(srb,sra,trb); - (void) XUnionRegion(tra,trb,dr); - XDestroyRegion(tra); - XDestroyRegion(trb); - return 0; -} - -/* - * Check to see if the region is empty. Assumes a region is passed - * as a parameter - */ -bool REGION::XEmptyRegion(Region r) -{ - if( r->numRects == 0 ) return true; - else return false; -} - -/* - * Check to see if two regions are equal - */ -bool REGION::XEqualRegion(Region r1, Region r2) -{ - int i; - - if( r1->numRects != r2->numRects ) return false; - else if( r1->numRects == 0 ) return true; - else if ( r1->extents.x1 != r2->extents.x1 ) return false; - else if ( r1->extents.x2 != r2->extents.x2 ) return false; - else if ( r1->extents.y1 != r2->extents.y1 ) return false; - else if ( r1->extents.y2 != r2->extents.y2 ) return false; - else for( i=0; i < r1->numRects; i++ ) { - if ( r1->rects[i].x1 != r2->rects[i].x1 ) return false; - else if ( r1->rects[i].x2 != r2->rects[i].x2 ) return false; - else if ( r1->rects[i].y1 != r2->rects[i].y1 ) return false; - else if ( r1->rects[i].y2 != r2->rects[i].y2 ) return false; - } - return true; -} - -bool REGION::XPointInRegion(Region pRegion, int x, int y) -{ - int i; - - if (pRegion->numRects == 0) - return false; - if (!INBOX(pRegion->extents, x, y)) - return false; - for (i=0; inumRects; i++) - { - if (INBOX (pRegion->rects[i], x, y)) - return true; - } - return false; -} - -wxRegionContain REGION::XRectInRegion(register Region region, - int rx, int ry, - unsigned int rwidth, - unsigned int rheight) -{ - BoxPtr pbox; - BoxPtr pboxEnd; - Box rect; - BoxPtr prect = ▭ - int partIn, partOut; - - prect->x1 = rx; - prect->y1 = ry; - prect->x2 = rwidth + rx; - prect->y2 = rheight + ry; - - /* this is (just) a useful optimization */ - if ((region->numRects == 0) || !EXTENTCHECK(®ion->extents, prect)) - return(wxOutRegion); - - partOut = false; - partIn = false; - - /* can stop when both partOut and partIn are true, or we reach prect->y2 */ - for (pbox = region->rects, pboxEnd = pbox + region->numRects; - pbox < pboxEnd; - pbox++) - { - - if (pbox->y2 <= ry) - continue; /* getting up to speed or skipping remainder of band */ - - if (pbox->y1 > ry) - { - partOut = true; /* missed part of rectangle above */ - if (partIn || (pbox->y1 >= prect->y2)) - break; - ry = pbox->y1; /* x guaranteed to be == prect->x1 */ - } - - if (pbox->x2 <= rx) - continue; /* not far enough over yet */ - - if (pbox->x1 > rx) - { - partOut = true; /* missed part of rectangle to left */ - if (partIn) - break; - } - - if (pbox->x1 < prect->x2) - { - partIn = true; /* definitely overlap */ - if (partOut) - break; - } - - if (pbox->x2 >= prect->x2) - { - ry = pbox->y2; /* finished with this band */ - if (ry >= prect->y2) - break; - rx = prect->x1; /* reset x out to left again */ - } else - { - /* - * Because boxes in a band are maximal width, if the first box - * to overlap the rectangle doesn't completely cover it in that - * band, the rectangle must be partially out, since some of it - * will be uncovered in that band. partIn will have been set true - * by now... - */ - break; - } - - } - - return(partIn ? ((ry < prect->y2) ? wxPartRegion : wxInRegion) : - wxOutRegion); -} diff --git a/Externals/wxWidgets3/src/generic/renderg.cpp b/Externals/wxWidgets3/src/generic/renderg.cpp deleted file mode 100644 index b76c96b9bf..0000000000 --- a/Externals/wxWidgets3/src/generic/renderg.cpp +++ /dev/null @@ -1,983 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/generic/renderg.cpp -// Purpose: generic implementation of wxRendererNative (for any platform) -// Author: Vadim Zeitlin -// Modified by: -// Created: 20.07.2003 -// Copyright: (c) 2003 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// for compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include "wx/renderer.h" - -#ifndef WX_PRECOMP - #include "wx/string.h" - #include "wx/dc.h" - #include "wx/settings.h" - #include "wx/gdicmn.h" - #include "wx/module.h" - #include "wx/control.h" -#endif //WX_PRECOMP - -#include "wx/dcmirror.h" -#include "wx/math.h" -#include "wx/splitter.h" - -#ifdef __WXMAC__ - #include "wx/osx/private.h" -#endif - -#ifdef __WINDOWS__ - // We only need it to get ::MulDiv() declaration, used by wxMulDivInt32(). - #include "wx/msw/wrapwin.h" -#endif - -// ---------------------------------------------------------------------------- -// wxRendererGeneric: our wxRendererNative implementation -// ---------------------------------------------------------------------------- - -class WXDLLEXPORT wxRendererGeneric : public wxRendererNative -{ -public: - wxRendererGeneric(); - - virtual int DrawHeaderButton(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags = 0, - wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE, - wxHeaderButtonParams* params = NULL) wxOVERRIDE; - - virtual int DrawHeaderButtonContents(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags = 0, - wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE, - wxHeaderButtonParams* params = NULL) wxOVERRIDE; - - virtual int GetHeaderButtonHeight(wxWindow *win) wxOVERRIDE; - - virtual int GetHeaderButtonMargin(wxWindow *win) wxOVERRIDE; - - virtual void DrawTreeItemButton(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags = 0) wxOVERRIDE; - - virtual void DrawSplitterBorder(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags = 0) wxOVERRIDE; - - virtual void DrawSplitterSash(wxWindow *win, - wxDC& dc, - const wxSize& size, - wxCoord position, - wxOrientation orient, - int flags = 0) wxOVERRIDE; - - virtual void DrawComboBoxDropButton(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags = 0) wxOVERRIDE; - - virtual void DrawDropArrow(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags = 0) wxOVERRIDE; - - virtual void DrawCheckBox(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags = 0) wxOVERRIDE; - - virtual wxSize GetCheckBoxSize(wxWindow *win) wxOVERRIDE; - - virtual void DrawPushButton(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags = 0) wxOVERRIDE; - - virtual void DrawCollapseButton(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags = 0) wxOVERRIDE; - - virtual wxSize GetCollapseButtonSize(wxWindow *win, wxDC& dc) wxOVERRIDE; - - virtual void DrawItemSelectionRect(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags = 0) wxOVERRIDE; - - virtual void DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0) wxOVERRIDE; - - virtual void DrawChoice(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0) wxOVERRIDE; - - virtual void DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0) wxOVERRIDE; - - virtual void DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0) wxOVERRIDE; - - virtual void DrawRadioBitmap(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0) wxOVERRIDE; - -#ifdef wxHAS_DRAW_TITLE_BAR_BITMAP - virtual void DrawTitleBarBitmap(wxWindow *win, - wxDC& dc, - const wxRect& rect, - wxTitleBarButton button, - int flags = 0) wxOVERRIDE; -#endif // wxHAS_DRAW_TITLE_BAR_BITMAP - - virtual void DrawGauge(wxWindow* win, wxDC& dc, const wxRect& rect, int value, int max, int flags = 0) wxOVERRIDE; - - virtual void DrawItemText(wxWindow* win, - wxDC& dc, - const wxString& text, - const wxRect& rect, - int align = wxALIGN_LEFT | wxALIGN_TOP, - int flags = 0, - wxEllipsizeMode ellipsizeMode = wxELLIPSIZE_END) wxOVERRIDE; - - virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win) wxOVERRIDE; - - virtual wxRendererVersion GetVersion() const wxOVERRIDE - { - return wxRendererVersion(wxRendererVersion::Current_Version, - wxRendererVersion::Current_Age); - } - - - // Cleanup by deleting standard renderer - static void Cleanup(); - - // Get the generic object - static wxRendererGeneric* DoGetGeneric(); - -protected: - // draw the rectange using the first pen for the left and top sides and - // the second one for the bottom and right ones - void DrawShadedRect(wxDC& dc, wxRect *rect, - const wxPen& pen1, const wxPen& pen2); - - // the standard pens - wxPen m_penBlack, - m_penDarkGrey, - m_penLightGrey, - m_penHighlight; - - static wxRendererGeneric* sm_rendererGeneric; -}; - -// ---------------------------------------------------------------------------- -// misc. drawing functions -// ---------------------------------------------------------------------------- - -// Draw focus rect for individual cell. Unlike native focus rect, we render -// this in foreground text color (typically white) to enhance contrast and -// make it visible. -static void DrawSelectedCellFocusRect(wxDC& dc, const wxRect& rect) -{ - // (This code is based on wxRendererGeneric::DrawFocusRect and modified.) - - // draw the pixels manually because the "dots" in wxPen with wxDOT style - // may be short traits and not really dots - // - // note that to behave in the same manner as DrawRect(), we must exclude - // the bottom and right borders from the rectangle - wxCoord x1 = rect.GetLeft(), - y1 = rect.GetTop(), - x2 = rect.GetRight(), - y2 = rect.GetBottom(); - - wxDCPenChanger pen(dc, wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT)); - - wxCoord z; - for (z = x1 + 1; z < x2; z += 2) - dc.DrawPoint(z, rect.GetTop()); - - wxCoord shift = z == x2 ? 0 : 1; - for (z = y1 + shift; z < y2; z += 2) - dc.DrawPoint(x2, z); - - shift = z == y2 ? 0 : 1; - for (z = x2 - shift; z > x1; z -= 2) - dc.DrawPoint(z, y2); - - shift = z == x1 ? 0 : 1; - for (z = y2 - shift; z > y1; z -= 2) - dc.DrawPoint(x1, z); -} - -// ============================================================================ -// wxRendererGeneric implementation -// ============================================================================ - -// Get the generic object -wxRendererGeneric* wxRendererGeneric::DoGetGeneric() -{ - if (!sm_rendererGeneric) - sm_rendererGeneric = new wxRendererGeneric; - return sm_rendererGeneric; -} - -// ---------------------------------------------------------------------------- -// wxRendererGeneric creation -// ---------------------------------------------------------------------------- - -/* static */ -wxRendererNative& wxRendererNative::GetGeneric() -{ - return * wxRendererGeneric::DoGetGeneric(); -} - -void wxRendererGeneric::Cleanup() -{ - wxDELETE(sm_rendererGeneric); -} - -wxRendererGeneric* wxRendererGeneric::sm_rendererGeneric = NULL; - -wxRendererGeneric::wxRendererGeneric() - : m_penBlack(wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW)), - m_penDarkGrey(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW)), - m_penLightGrey(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)), - m_penHighlight(wxSystemSettings::GetColour(wxSYS_COLOUR_3DHIGHLIGHT)) -{ -} - -// ---------------------------------------------------------------------------- -// wxRendererGeneric helpers -// ---------------------------------------------------------------------------- - -void -wxRendererGeneric::DrawShadedRect(wxDC& dc, - wxRect *rect, - const wxPen& pen1, - const wxPen& pen2) -{ - // draw the rectangle - dc.SetPen(pen1); - dc.DrawLine(rect->GetLeft(), rect->GetTop(), - rect->GetLeft(), rect->GetBottom()); - dc.DrawLine(rect->GetLeft() + 1, rect->GetTop(), - rect->GetRight(), rect->GetTop()); - dc.SetPen(pen2); - dc.DrawLine(rect->GetRight(), rect->GetTop(), - rect->GetRight(), rect->GetBottom()); - dc.DrawLine(rect->GetLeft(), rect->GetBottom(), - rect->GetRight() + 1, rect->GetBottom()); - - // adjust the rect - rect->Inflate(-1); -} - -// ---------------------------------------------------------------------------- -// tree/list ctrl drawing -// ---------------------------------------------------------------------------- - -int -wxRendererGeneric::DrawHeaderButton(wxWindow* win, - wxDC& dc, - const wxRect& rect, - int flags, - wxHeaderSortIconType sortArrow, - wxHeaderButtonParams* params) -{ - const wxCoord x = rect.x, - y = rect.y, - w = rect.width, - h = rect.height; - - dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE))); - dc.SetPen(*wxTRANSPARENT_PEN); - dc.DrawRectangle(rect); - - dc.SetBrush(*wxTRANSPARENT_BRUSH); - - dc.SetPen(m_penBlack); - dc.DrawLine( x+w-1, y, x+w-1, y+h ); // right (outer) - dc.DrawLine( x, y+h-1, x+w, y+h-1 ); // bottom (outer) - - dc.SetPen(m_penDarkGrey); - dc.DrawLine( x+w-2, y+1, x+w-2, y+h-1 ); // right (inner) - dc.DrawLine( x+1, y+h-2, x+w-1, y+h-2 ); // bottom (inner) - - dc.SetPen(m_penHighlight); - dc.DrawLine( x, y, x, y+h-1 ); // left (outer) - dc.DrawLine( x, y, x+w-1, y ); // top (outer) - - return DrawHeaderButtonContents(win, dc, rect, flags, sortArrow, params); -} - - -int -wxRendererGeneric::DrawHeaderButtonContents(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags, - wxHeaderSortIconType sortArrow, - wxHeaderButtonParams* params) -{ - int labelWidth = 0; - - // Mark this item as selected. For the generic version we'll just draw an - // underline - if ( flags & wxCONTROL_SELECTED ) - { - // draw a line at the bottom of the header button, overlaying the - // native hot-tracking line (on XP) - const int penwidth = 3; - int y = rect.y + rect.height + 1 - penwidth; - wxColour c = (params && params->m_selectionColour.IsOk()) ? - params->m_selectionColour : wxColour(0x66, 0x66, 0x66); - wxPen pen(c, penwidth); - pen.SetCap(wxCAP_BUTT); - dc.SetPen(pen); - dc.DrawLine(rect.x, y, rect.x + rect.width, y); - } - - // Draw an up or down arrow - int arrowSpace = 0; - if (sortArrow != wxHDR_SORT_ICON_NONE ) - { - wxRect ar = rect; - - // make a rect for the arrow - ar.SetSize(wxWindow::FromDIP(wxSize(8, 4), win)); - ar.y += (rect.height - ar.height)/2; - ar.x = ar.x + rect.width - 3*ar.width/2; - arrowSpace = 3*ar.width/2; // space to preserve when drawing the label - - wxPoint triPt[3]; - if ( sortArrow & wxHDR_SORT_ICON_UP ) - { - triPt[0].x = ar.width / 2; - triPt[0].y = 0; - triPt[1].x = ar.width; - triPt[1].y = ar.height; - triPt[2].x = 0; - triPt[2].y = ar.height; - } - else - { - triPt[0].x = 0; - triPt[0].y = 0; - triPt[1].x = ar.width; - triPt[1].y = 0; - triPt[2].x = ar.width / 2; - triPt[2].y = ar.height; - } - - wxColour c = (params && params->m_arrowColour.IsOk()) ? - params->m_arrowColour : wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW); - - wxDCPenChanger setPen(dc, c); - wxDCBrushChanger setBrush(dc, c); - - wxDCClipper clip(dc, rect); - dc.DrawPolygon( 3, triPt, ar.x, ar.y); - } - labelWidth += arrowSpace; - - int bmpWidth = 0; - - // draw the bitmap if there is one - if ( params && params->m_labelBitmap.IsOk() ) - { - int w = params->m_labelBitmap.GetWidth(); - int h = params->m_labelBitmap.GetHeight(); - - const int margin = 1; // an extra pixel on either side of the bitmap - - bmpWidth = w + 2*margin; - labelWidth += bmpWidth; - - int x = rect.x + margin; - const int y = rect.y + wxMax(1, (rect.height - h) / 2); - - const int extraSpace = rect.width - labelWidth; - if ( params->m_labelText.empty() && extraSpace > 0 ) - { - // use the alignment flags - switch (params->m_labelAlignment) - { - default: - case wxALIGN_LEFT: - break; - - case wxALIGN_CENTER: - x += extraSpace/2; - break; - - case wxALIGN_RIGHT: - x += extraSpace; - break; - } - } - - wxDCClipper clip(dc, rect); - dc.DrawBitmap(params->m_labelBitmap, x, y, true); - } - - // Draw a label if one is given - if ( params && !params->m_labelText.empty() ) - { - const int margin = 5; // number of pixels to reserve on either side of the label - labelWidth += 2*margin; - - wxFont font = params->m_labelFont.IsOk() ? - params->m_labelFont : win->GetFont(); - wxColour clr = params->m_labelColour.IsOk() ? - params->m_labelColour : win->GetForegroundColour(); - - wxString label( params->m_labelText ); - - dc.SetFont(font); - dc.SetTextForeground(clr); - dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT); - - int tw, th, td; - dc.GetTextExtent( label, &tw, &th, &td); - - int x = rect.x + bmpWidth + margin; - const int y = rect.y + wxMax(0, (rect.height - (th+td)) / 2); - - // truncate and add an ellipsis (...) if the text is too wide. - const int availWidth = rect.width - labelWidth; -#if wxUSE_CONTROLS - if ( tw > availWidth ) - { - label = wxControl::Ellipsize(label, - dc, - wxELLIPSIZE_END, - availWidth, - wxELLIPSIZE_FLAGS_NONE); - tw = dc.GetTextExtent(label).x; - } - else // enough space, we can respect alignment -#endif // wxUSE_CONTROLS - { - switch (params->m_labelAlignment) - { - default: - case wxALIGN_LEFT: - break; - - case wxALIGN_CENTER: - x += (availWidth - tw)/2; - break; - - case wxALIGN_RIGHT: - x += availWidth - tw; - break; - } - } - - dc.DrawText(label, x, y); - - labelWidth += tw; - } - - return labelWidth; -} - - -int wxRendererGeneric::GetHeaderButtonHeight(wxWindow *win) -{ - // Copied and adapted from src/generic/listctrl.cpp - const int HEADER_OFFSET_Y = 1; - const int EXTRA_HEIGHT = 4; - - int w=0, h=14, d=0; - if (win) - win->GetTextExtent(wxT("Hg"), &w, &h, &d); - - return h + d + 2 * HEADER_OFFSET_Y + EXTRA_HEIGHT; -} - -int wxRendererGeneric::GetHeaderButtonMargin(wxWindow *WXUNUSED(win)) -{ - return 5; -} - - -// draw the plus or minus sign -void -wxRendererGeneric::DrawTreeItemButton(wxWindow * WXUNUSED(win), - wxDC& dc, - const wxRect& rect, - int flags) -{ - // store settings - wxDCPenChanger penChanger(dc, *wxGREY_PEN); - wxDCBrushChanger brushChanger(dc, *wxWHITE_BRUSH); - - dc.DrawRectangle(rect); - - // black lines - const wxCoord xMiddle = rect.x + rect.width/2; - const wxCoord yMiddle = rect.y + rect.height/2; - - // half of the length of the horz lines in "-" and "+" - const wxCoord halfWidth = rect.width/2 - 2; - dc.SetPen(*wxBLACK_PEN); - dc.DrawLine(xMiddle - halfWidth, yMiddle, - xMiddle + halfWidth + 1, yMiddle); - - if ( !(flags & wxCONTROL_EXPANDED) ) - { - // turn "-" into "+" - const wxCoord halfHeight = rect.height/2 - 2; - dc.DrawLine(xMiddle, yMiddle - halfHeight, - xMiddle, yMiddle + halfHeight + 1); - } -} - -// ---------------------------------------------------------------------------- -// sash drawing -// ---------------------------------------------------------------------------- - -wxSplitterRenderParams -wxRendererGeneric::GetSplitterParams(const wxWindow *win) -{ - // see below - wxCoord sashWidth, - border; - - if ( win->HasFlag(wxSP_3DSASH) ) - sashWidth = 7; - else if ( win->HasFlag(wxSP_NOSASH) ) - sashWidth = 0; - else // no 3D effect - sashWidth = 3; - - if ( win->HasFlag(wxSP_3DBORDER) ) - border = 2; - else // no 3D effect - border = 0; - - return wxSplitterRenderParams(sashWidth, border, false); -} - -void -wxRendererGeneric::DrawSplitterBorder(wxWindow *win, - wxDC& dc, - const wxRect& rectOrig, - int WXUNUSED(falgs)) -{ - if ( win->HasFlag(wxSP_3DBORDER) ) - { - wxRect rect = rectOrig; - DrawShadedRect(dc, &rect, m_penDarkGrey, m_penHighlight); - DrawShadedRect(dc, &rect, m_penBlack, m_penLightGrey); - } -} - -void -wxRendererGeneric::DrawSplitterSash(wxWindow *win, - wxDC& dcReal, - const wxSize& sizeReal, - wxCoord position, - wxOrientation orient, - int WXUNUSED(flags)) -{ - // to avoid duplicating the same code for horizontal and vertical sashes, - // simply mirror the DC instead if needed (i.e. if horz splitter) - wxMirrorDC dc(dcReal, orient != wxVERTICAL); - wxSize size = dc.Reflect(sizeReal); - - - // we draw a Win32-like grey sash with possible 3D border here: - // - // ---- this is position - // / - // v - // dWGGGDd - // GWGGGDB - // GWGGGDB where G is light grey (face) - // GWGGGDB W white (light) - // GWGGGDB D dark grey (shadow) - // GWGGGDB B black (dark shadow) - // GWGGGDB - // GWGGGDB and lower letters are our border (already drawn) - // GWGGGDB - // wWGGGDd - // - // only the middle 3 columns are drawn unless wxSP_3D is specified - - const wxCoord h = size.y; - wxCoord offset = 0; - - // If we're drawing the border, draw the sash 3d lines shorter - if ( win->HasFlag(wxSP_3DBORDER) ) - { - offset = 1; - } - - dc.SetPen(*wxTRANSPARENT_PEN); - - if ( win->HasFlag(wxSP_3DSASH) ) - { - // Draw the 3D sash - dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE))); - dc.DrawRectangle(position + 2, 0, 3, h); - - dc.SetPen(m_penLightGrey); - dc.DrawLine(position, offset, position, h - offset); - - dc.SetPen(m_penHighlight); - dc.DrawLine(position + 1, 0, position + 1, h); - - dc.SetPen(m_penDarkGrey); - dc.DrawLine(position + 5, 0, position + 5, h); - - dc.SetPen(m_penBlack); - dc.DrawLine(position + 6, offset, position + 6, h - offset); - } - else - { - // Draw a flat sash - dc.SetBrush(wxBrush(win->GetBackgroundColour())); - dc.DrawRectangle(position, 0, 3, h); - } -} - -// ---------------------------------------------------------------------------- -// button drawing -// ---------------------------------------------------------------------------- - -void -wxRendererGeneric::DrawComboBoxDropButton(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags) -{ - DrawPushButton(win,dc,rect,flags); - DrawDropArrow(win,dc,rect,flags); -} - -void -wxRendererGeneric::DrawDropArrow(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int WXUNUSED(flags)) -{ - // This generic implementation should be good - // enough for Windows platforms (including XP). - - int arrowHalf = rect.width/5; - int rectMid = rect.width / 2; - int arrowTopY = (rect.height/2) - (arrowHalf/2); - - // This should always result in arrow with odd width. - wxPoint pt[] = - { - wxPoint(rectMid - arrowHalf, arrowTopY), - wxPoint(rectMid + arrowHalf, arrowTopY), - wxPoint(rectMid, arrowTopY + arrowHalf) - }; - dc.SetBrush(wxBrush(win->GetForegroundColour())); - dc.SetPen(wxPen(win->GetForegroundColour())); - dc.DrawPolygon(WXSIZEOF(pt), pt, rect.x, rect.y); -} - -void -wxRendererGeneric::DrawCheckBox(wxWindow *WXUNUSED(win), - wxDC& dc, - const wxRect& rect, - int flags) -{ - dc.SetPen(*(flags & wxCONTROL_DISABLED ? wxGREY_PEN : wxBLACK_PEN)); - dc.SetBrush( *wxTRANSPARENT_BRUSH ); - dc.DrawRectangle(rect); - - if ( flags & wxCONTROL_CHECKED ) - { - dc.DrawCheckMark(rect.Deflate(2, 2)); - } -} - -wxSize wxRendererGeneric::GetCheckBoxSize(wxWindow *win) -{ - return win->FromDIP(wxSize(16, 16)); -} - -void -wxRendererGeneric::DrawPushButton(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags) -{ - // Don't try anything too fancy. It'll just turn out looking - // out-of-place on most platforms. - wxColour bgCol = flags & wxCONTROL_DISABLED ? - wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE) : - win->GetBackgroundColour(); - dc.SetBrush(wxBrush(bgCol)); - dc.SetPen(wxPen(bgCol)); - dc.DrawRectangle(rect); -} - -void -wxRendererGeneric::DrawCollapseButton(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags) -{ - int arrowHalf = rect.width / 5; - int rectMid = rect.width / 2; - int arrowTopY = (rect.height / 2) - (arrowHalf / 2); - - wxPoint pt[3]; - if (flags & wxCONTROL_EXPANDED) - { - // This should always result in arrow with odd width. - pt[0] = wxPoint(rectMid - arrowHalf, arrowTopY); - pt[1] = wxPoint(rectMid + arrowHalf, arrowTopY); - pt[2] = wxPoint(rectMid, arrowTopY + arrowHalf); - } - else - { - // This should always result in arrow with odd height. - pt[0] = wxPoint(arrowTopY, rectMid - arrowHalf); - pt[1] = wxPoint(arrowTopY + arrowHalf, rectMid); - pt[2] = wxPoint(arrowTopY, rectMid + arrowHalf); - } - - dc.SetBrush(wxBrush(win->GetForegroundColour())); - dc.SetPen(wxPen(win->GetForegroundColour())); - dc.DrawPolygon(WXSIZEOF(pt), pt, rect.x, rect.y); -} - -wxSize wxRendererGeneric::GetCollapseButtonSize(wxWindow *WXUNUSED(win), wxDC& WXUNUSED(dc)) -{ - return wxSize(18, 18); -} - -void -wxRendererGeneric::DrawItemSelectionRect(wxWindow * WXUNUSED(win), - wxDC& dc, - const wxRect& rect, - int flags) -{ - wxBrush brush; - if ( flags & wxCONTROL_SELECTED ) - { - if ( flags & wxCONTROL_FOCUSED ) - { - brush = wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT)); - } - else // !focused - { - brush = wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNSHADOW)); - } - } - else // !selected - { - brush = *wxTRANSPARENT_BRUSH; - } - - dc.SetBrush(brush); - bool drawFocusRect = (flags & wxCONTROL_CURRENT) && (flags & wxCONTROL_FOCUSED); - - if ( drawFocusRect && !(flags & wxCONTROL_CELL) ) - dc.SetPen( *wxBLACK_PEN ); - else - dc.SetPen( *wxTRANSPARENT_PEN ); - - dc.DrawRectangle( rect ); - - if ( drawFocusRect && (flags & wxCONTROL_CELL) ) - { - wxRect focusRect(rect); - focusRect.Deflate(1); - - DrawSelectedCellFocusRect(dc, focusRect); - } -} - -void -wxRendererGeneric::DrawFocusRect(wxWindow* WXUNUSED(win), wxDC& dc, const wxRect& rect, int WXUNUSED(flags)) -{ - // draw the pixels manually because the "dots" in wxPen with wxDOT style - // may be short traits and not really dots - // - // note that to behave in the same manner as DrawRect(), we must exclude - // the bottom and right borders from the rectangle - wxCoord x1 = rect.GetLeft(), - y1 = rect.GetTop(), - x2 = rect.GetRight(), - y2 = rect.GetBottom(); - - dc.SetPen(m_penBlack); - -#ifdef __WXMAC__ - dc.SetLogicalFunction(wxCOPY); -#else - // this seems to be closer than what Windows does than wxINVERT although - // I'm still not sure if it's correct - dc.SetLogicalFunction(wxAND_REVERSE); -#endif - - wxCoord z; - for ( z = x1 + 1; z < x2; z += 2 ) - dc.DrawPoint(z, rect.GetTop()); - - wxCoord shift = z == x2 ? 0 : 1; - for ( z = y1 + shift; z < y2; z += 2 ) - dc.DrawPoint(x2, z); - - shift = z == y2 ? 0 : 1; - for ( z = x2 - shift; z > x1; z -= 2 ) - dc.DrawPoint(z, y2); - - shift = z == x1 ? 0 : 1; - for ( z = y2 - shift; z > y1; z -= 2 ) - dc.DrawPoint(x1, z); - - dc.SetLogicalFunction(wxCOPY); -} - -void wxRendererGeneric::DrawChoice(wxWindow* WXUNUSED(win), wxDC& WXUNUSED(dc), - const wxRect& WXUNUSED(rect), int WXUNUSED(flags)) -{ - wxFAIL_MSG("UNIMPLEMENTED: wxRendererGeneric::DrawChoice"); -} - -void wxRendererGeneric::DrawComboBox(wxWindow* WXUNUSED(win), wxDC& WXUNUSED(dc), - const wxRect& WXUNUSED(rect), int WXUNUSED(flags)) -{ - wxFAIL_MSG("UNIMPLEMENTED: wxRendererGeneric::DrawComboBox"); -} - -void wxRendererGeneric::DrawRadioBitmap(wxWindow* WXUNUSED(win), wxDC& WXUNUSED(dc), - const wxRect& WXUNUSED(rect), int WXUNUSED(flags)) -{ - wxFAIL_MSG("UNIMPLEMENTED: wxRendererGeneric::DrawRadioBitmap"); -} - -void wxRendererGeneric::DrawTextCtrl(wxWindow* WXUNUSED(win), - wxDC& dc, - const wxRect& rect, - int WXUNUSED(flags)) -{ - wxColour fill; - wxColour bdr; - { - fill = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW); - bdr = *wxBLACK; - } - - dc.SetPen(bdr); - dc.SetBrush(fill); - dc.DrawRectangle(rect); -} - -#ifdef wxHAS_DRAW_TITLE_BAR_BITMAP - -void wxRendererGeneric::DrawTitleBarBitmap(wxWindow * WXUNUSED(win), - wxDC& WXUNUSED(dc), - const wxRect& WXUNUSED(rect), - wxTitleBarButton WXUNUSED(button), - int WXUNUSED(flags)) -{ - // no need to fail here, if wxHAS_DRAW_TITLE_BAR_BITMAP is defined this - // will be implemented in the native renderer and this version is never - // going to be used -- but we still need to define it to allow - // instantiation of this class (which would have been pure virtual - // otherwise) -} - -#endif // wxHAS_DRAW_TITLE_BAR_BITMAP - -void wxRendererGeneric::DrawGauge(wxWindow* win, - wxDC& dc, - const wxRect& rect, - int value, - int max, - int WXUNUSED(flags)) -{ - // Use same background as text controls. - DrawTextCtrl(win, dc, rect); - - // Calculate the progress bar size. - wxRect progRect(rect); - progRect.Deflate(2); - progRect.width = wxMulDivInt32(progRect.width, value, max); - - dc.SetBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT)); - dc.SetPen(*wxTRANSPARENT_PEN); - dc.DrawRectangle(progRect); -} - -void -wxRendererGeneric::DrawItemText(wxWindow* WXUNUSED(win), - wxDC& dc, - const wxString& text, - const wxRect& rect, - int align, - int flags, - wxEllipsizeMode ellipsizeMode) -{ - // Determine text color - wxColour textColour; - if ( flags & wxCONTROL_SELECTED ) - { - if ( flags & wxCONTROL_FOCUSED ) - { - textColour = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT); - } - else // !focused - { - textColour = wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOXTEXT); - } - } - else if ( flags & wxCONTROL_DISABLED ) - { - textColour = wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT); - } - - // Be careful to avoid using the default flags here as otherwise any - // ampersands in the text would be consumed (and tabs expanded). - const wxString paintText = wxControl::Ellipsize(text, dc, - ellipsizeMode, - rect.GetWidth(), - wxELLIPSIZE_FLAGS_NONE); - - // Draw text taking care not to change its colour if it had been set by the - // caller for a normal item to allow having items in non-default colours. - if ( textColour.IsOk() ) - dc.SetTextForeground(textColour); - dc.SetTextBackground(wxTransparentColour); - dc.DrawLabel(paintText, rect, align); -} - -// ---------------------------------------------------------------------------- -// A module to allow cleanup of generic renderer. -// ---------------------------------------------------------------------------- - -class wxGenericRendererModule: public wxModule -{ - wxDECLARE_DYNAMIC_CLASS(wxGenericRendererModule); -public: - wxGenericRendererModule() {} - bool OnInit() wxOVERRIDE { return true; } - void OnExit() wxOVERRIDE { wxRendererGeneric::Cleanup(); } -}; - -wxIMPLEMENT_DYNAMIC_CLASS(wxGenericRendererModule, wxModule); diff --git a/Externals/wxWidgets3/src/generic/richmsgdlgg.cpp b/Externals/wxWidgets3/src/generic/richmsgdlgg.cpp deleted file mode 100644 index c74e380f57..0000000000 --- a/Externals/wxWidgets3/src/generic/richmsgdlgg.cpp +++ /dev/null @@ -1,89 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/generic/richmsgdlgg.cpp -// Purpose: wxGenericRichMessageDialog -// Author: Rickard Westerlund -// Created: 2010-07-04 -// Copyright: (c) 2010 wxWidgets team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ -#pragma hdrstop -#endif - -#if wxUSE_RICHMSGDLG - -#ifndef WX_PRECOMP - #include "wx/checkbox.h" - #include "wx/stattext.h" - #include "wx/sizer.h" -#endif - -#include "wx/collpane.h" -#include "wx/richmsgdlg.h" - -wxIMPLEMENT_CLASS(wxRichMessageDialog, wxDialog) - -// ---------------------------------------------------------------------------- -// Events and handlers -// ---------------------------------------------------------------------------- - -wxBEGIN_EVENT_TABLE(wxGenericRichMessageDialog, wxRichMessageDialogBase) - EVT_COLLAPSIBLEPANE_CHANGED(wxID_ANY, - wxGenericRichMessageDialog::OnPaneChanged) -wxEND_EVENT_TABLE() - -void wxGenericRichMessageDialog::OnPaneChanged(wxCollapsiblePaneEvent& event) -{ - if ( event.GetCollapsed() ) - m_detailsPane->SetLabel( m_detailsExpanderCollapsedLabel ); - else - m_detailsPane->SetLabel( m_detailsExpanderExpandedLabel ); -} - -// ---------------------------------------------------------------------------- -// wxGenericRichMessageDialog -// ---------------------------------------------------------------------------- - -void wxGenericRichMessageDialog::AddMessageDialogCheckBox(wxSizer *sizer) -{ - if ( !m_checkBoxText.empty() ) - { - m_checkBox = new wxCheckBox(this, wxID_ANY, m_checkBoxText); - m_checkBox->SetValue(m_checkBoxValue); - - sizer->Add(m_checkBox, wxSizerFlags().Left().Border(wxLEFT|wxTOP, 10)); - } -} - -void wxGenericRichMessageDialog::AddMessageDialogDetails(wxSizer *sizer) -{ - if ( !m_detailedText.empty() ) - { - wxSizer *sizerDetails = new wxBoxSizer( wxHORIZONTAL ); - - m_detailsPane = - new wxCollapsiblePane( this, -1, m_detailsExpanderCollapsedLabel ); - - // add the detailed text - wxWindow *windowPane = m_detailsPane->GetPane(); - wxSizer *sizerPane = new wxBoxSizer( wxHORIZONTAL ); - sizerPane->Add( new wxStaticText( windowPane, -1, m_detailedText ) ); - windowPane->SetSizer( sizerPane ); - - sizerDetails->Add( m_detailsPane, wxSizerFlags().Right().Expand() ); - sizer->Add( sizerDetails, 0, wxTOP|wxLEFT|wxRIGHT | wxALIGN_LEFT, 10 ); - } -} - -bool wxGenericRichMessageDialog::IsCheckBoxChecked() const -{ - // This function can be called before the dialog is shown and hence before - // the check box is created. - return m_checkBox ? m_checkBox->IsChecked() : m_checkBoxValue; -} - -#endif // wxUSE_RICHMSGDLG diff --git a/Externals/wxWidgets3/src/generic/richtooltipg.cpp b/Externals/wxWidgets3/src/generic/richtooltipg.cpp deleted file mode 100644 index 0b3ed6a4bf..0000000000 --- a/Externals/wxWidgets3/src/generic/richtooltipg.cpp +++ /dev/null @@ -1,711 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/generic/richtooltipg.cpp -// Purpose: Implementation of wxRichToolTip. -// Author: Vadim Zeitlin -// Created: 2011-10-07 -// Copyright: (c) 2011 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// for compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_RICHTOOLTIP - -#ifndef WX_PRECOMP - #include "wx/dcmemory.h" - #include "wx/icon.h" - #include "wx/region.h" - #include "wx/settings.h" - #include "wx/sizer.h" - #include "wx/statbmp.h" - #include "wx/stattext.h" - #include "wx/timer.h" - #include "wx/utils.h" -#endif // WX_PRECOMP - -#include "wx/private/richtooltip.h" -#include "wx/generic/private/richtooltip.h" - -#include "wx/artprov.h" -#include "wx/custombgwin.h" -#include "wx/display.h" -#include "wx/graphics.h" -#include "wx/popupwin.h" -#include "wx/textwrapper.h" - -#ifdef __WXMSW__ - #include "wx/msw/uxtheme.h" - - static const int TTP_BALLOONTITLE = 4; - - static const int TMT_TEXTCOLOR = 3803; - static const int TMT_GRADIENTCOLOR1 = 3810; - static const int TMT_GRADIENTCOLOR2 = 3811; -#endif - -// ---------------------------------------------------------------------------- -// wxRichToolTipPopup: the popup window used by wxRichToolTip. -// ---------------------------------------------------------------------------- - -class wxRichToolTipPopup : - public wxCustomBackgroundWindow -{ -public: - wxRichToolTipPopup(wxWindow* parent, - const wxString& title, - const wxString& message, - const wxIcon& icon, - wxTipKind tipKind, - const wxFont& titleFont_) : - m_timer(this) - { - Create(parent, wxFRAME_SHAPED); - - - wxBoxSizer* const sizerTitle = new wxBoxSizer(wxHORIZONTAL); - if ( icon.IsOk() ) - { - sizerTitle->Add(new wxStaticBitmap(this, wxID_ANY, icon), - wxSizerFlags().Centre().Border(wxRIGHT)); - } - //else: Simply don't show any icon. - - wxStaticText* const labelTitle = new wxStaticText(this, wxID_ANY, ""); - labelTitle->SetLabelText(title); - - wxFont titleFont(titleFont_); - if ( !titleFont.IsOk() ) - { - // Determine the appropriate title font for the current platform. - titleFont = labelTitle->GetFont(); - -#ifdef __WXMSW__ - // When using themes MSW tooltips use larger bluish version of the - // normal font. - wxUxThemeEngine* const theme = GetTooltipTheme(); - if ( theme ) - { - titleFont.MakeLarger(); - - COLORREF c; - if ( FAILED(theme->GetThemeColor - ( - wxUxThemeHandle(parent, L"TOOLTIP"), - TTP_BALLOONTITLE, - 0, - TMT_TEXTCOLOR, - &c - )) ) - { - // Use the standard value of this colour as fallback. - c = 0x993300; - } - - labelTitle->SetForegroundColour(wxRGBToColour(c)); - } - else -#endif // __WXMSW__ - { - // Everything else, including "classic" MSW look uses just the - // bold version of the base font. - titleFont.MakeBold(); - } - } - - labelTitle->SetFont(titleFont); - sizerTitle->Add(labelTitle, wxSizerFlags().Centre()); - - wxBoxSizer* const sizerTop = new wxBoxSizer(wxVERTICAL); - sizerTop->Add(sizerTitle, - wxSizerFlags().DoubleBorder(wxLEFT|wxRIGHT|wxTOP)); - - // Use a spacer as we don't want to have a double border between the - // elements, just a simple one will do. - sizerTop->AddSpacer(wxSizerFlags::GetDefaultBorder()); - - wxTextSizerWrapper wrapper(this); - wxSizer* sizerText = wrapper.CreateSizer(message, -1 /* No wrapping */); - -#ifdef __WXMSW__ - if ( icon.IsOk() && GetTooltipTheme() ) - { - // Themed tooltips under MSW align the text with the title, not - // with the icon, so use a helper horizontal sizer in this case. - wxBoxSizer* const sizerTextIndent = new wxBoxSizer(wxHORIZONTAL); - sizerTextIndent->AddSpacer(icon.GetWidth()); - sizerTextIndent->Add(sizerText, - wxSizerFlags().Border(wxLEFT).Centre()); - - sizerText = sizerTextIndent; - } -#endif // !__WXMSW__ - sizerTop->Add(sizerText, - wxSizerFlags().DoubleBorder(wxLEFT|wxRIGHT|wxBOTTOM) - .Centre()); - - SetSizer(sizerTop); - - const int offsetY = SetTipShapeAndSize(tipKind, GetBestSize()); - if ( offsetY > 0 ) - { - // Offset our contents by the tip height to make it appear in the - // main rectangle. - sizerTop->PrependSpacer(offsetY); - } - - Layout(); - } - - void SetBackgroundColours(wxColour colStart, wxColour colEnd) - { - if ( !colStart.IsOk() ) - { - // Determine the best colour(s) to use on our own. -#ifdef __WXMSW__ - wxUxThemeEngine* const theme = GetTooltipTheme(); - if ( theme ) - { - wxUxThemeHandle hTheme(GetParent(), L"TOOLTIP"); - - COLORREF c1, c2; - if ( FAILED(theme->GetThemeColor - ( - hTheme, - TTP_BALLOONTITLE, - 0, - TMT_GRADIENTCOLOR1, - &c1 - )) || - FAILED(theme->GetThemeColor - ( - hTheme, - TTP_BALLOONTITLE, - 0, - TMT_GRADIENTCOLOR2, - &c2 - )) ) - { - c1 = 0xffffff; - c2 = 0xf0e5e4; - } - - colStart = wxRGBToColour(c1); - colEnd = wxRGBToColour(c2); - } - else -#endif // __WXMSW__ - { - colStart = wxSystemSettings::GetColour(wxSYS_COLOUR_INFOBK); - } - } - - if ( colEnd.IsOk() ) - { - // Use gradient-filled background bitmap. - const wxSize size = GetClientSize(); - wxBitmap bmp(size); - { - wxMemoryDC dc(bmp); - dc.Clear(); - dc.GradientFillLinear(size, colStart, colEnd, wxDOWN); - } - - SetBackgroundBitmap(bmp); - } - else // Use solid colour. - { - SetBackgroundColour(colStart); - } - } - - void SetPosition(const wxRect* rect) - { - wxPoint pos; - - if ( !rect || rect->IsEmpty() ) - pos = GetTipPoint(); - else - pos = GetParent()->ClientToScreen( wxPoint( rect->x + rect->width / 2, rect->y + rect->height / 2 ) ); - - // We want our anchor point to coincide with this position so offset - // the position of the top left corner passed to Move() accordingly. - pos -= m_anchorPos; - - Move(pos, wxSIZE_NO_ADJUSTMENTS); - } - - void DoShow() - { - Popup(); - } - - void SetTimeoutAndShow(unsigned timeout, unsigned delay) - { - if ( !timeout && !delay ) - { - DoShow(); - return; - } - - Connect(wxEVT_TIMER, wxTimerEventHandler(wxRichToolTipPopup::OnTimer)); - - m_timeout = timeout; // set for use in OnTimer if we have a delay - m_delayShow = delay != 0; - - if ( !m_delayShow ) - DoShow(); - - m_timer.Start((delay ? delay : timeout), true /* one shot */); - } - -protected: - virtual void OnDismiss() wxOVERRIDE - { - Destroy(); - } - -private: -#ifdef __WXMSW__ - // Returns non-NULL theme only if we're using Win7-style tooltips. - static wxUxThemeEngine* GetTooltipTheme() - { - // Even themed applications under XP still use "classic" tooltips. - if ( wxGetWinVersion() <= wxWinVersion_XP ) - return NULL; - - return wxUxThemeEngine::GetIfActive(); - } -#endif // __WXMSW__ - - // For now we just hard code the tip height, would be nice to do something - // smarter in the future. - static int GetTipHeight() - { -#ifdef __WXMSW__ - if ( GetTooltipTheme() ) - return 20; -#endif // __WXMSW__ - - return 15; - } - - // Get the point to which our tip should point. - wxPoint GetTipPoint() const - { - // Currently we always use the middle of the window. It seems that MSW - // native tooltips use a different point but it's not really clear how - // do they determine it nor whether it's worth the trouble to emulate - // their behaviour. - const wxRect r = GetParent()->GetScreenRect(); - return wxPoint(r.x + r.width/2, r.y + r.height/2); - } - - // Choose the correct orientation depending on the window position. - // - // Also use the tip kind appropriate for the current environment. For MSW - // the right triangles are used and for Mac the equilateral ones as this is - // the prevailing kind under these systems. For everything else we go with - // right triangles as well but without any real rationale so this could be - // tweaked in the future. - wxTipKind GetBestTipKind() const - { - const wxPoint pos = GetTipPoint(); - - // Use GetFromWindow() and not GetFromPoint() here to try to get the - // correct display even if the tip point itself is not visible. - int dpy = wxDisplay::GetFromWindow(GetParent()); - if ( dpy == wxNOT_FOUND ) - dpy = 0; // What else can we do? - - const wxRect rectDpy = wxDisplay(dpy).GetClientArea(); - -#ifdef __WXMAC__ - return pos.y > rectDpy.height/2 ? wxTipKind_Bottom : wxTipKind_Top; -#else // !__WXMAC__ - return pos.y > rectDpy.height/2 - ? pos.x > rectDpy.width/2 - ? wxTipKind_BottomRight - : wxTipKind_BottomLeft - : pos.x > rectDpy.width/2 - ? wxTipKind_TopRight - : wxTipKind_TopLeft; -#endif // __WXMAC__/!__WXMAC__ - } - - // Set the size and shape of the tip window and returns the offset of its - // content area from the top (horizontal offset is always 0 currently). - int SetTipShapeAndSize(wxTipKind tipKind, const wxSize& contentSize) - { -#if wxUSE_GRAPHICS_CONTEXT - wxSize size = contentSize; - - // The size is the vertical size and the offset is the distance from - // edge for asymmetric tips, currently hard-coded to be the same as the - // size. - const int tipSize = GetTipHeight(); - const int tipOffset = tipSize; - - // The horizontal position of the tip. - int x = -1; - - // The vertical coordinates of the tip base and apex. - int yBase = -1, - yApex = -1; - - // The offset of the content part of the window. - int dy = -1; - - // Define symbolic names for the rectangle corners and mid-way points - // that we use below in an attempt to make the code more clear. Notice - // that these values must be consecutive as we iterate over them. - enum RectPoint - { - RectPoint_TopLeft, - RectPoint_Top, - RectPoint_TopRight, - RectPoint_Right, - RectPoint_BotRight, - RectPoint_Bot, - RectPoint_BotLeft, - RectPoint_Left, - RectPoint_Max - }; - - // The starting point for AddArcToPoint() calls below, we iterate over - // all RectPoints from it. - RectPoint pointStart = RectPoint_Max; - - - // Hard-coded radius of the round main rectangle corners. - const double RADIUS = 5; - - // Create a path defining the shape of the tooltip window. - wxGraphicsPath - path = wxGraphicsRenderer::GetDefaultRenderer()->CreatePath(); - - if ( tipKind == wxTipKind_Auto ) - tipKind = GetBestTipKind(); - - // Points defining the tip shape (in clockwise order as we must end at - // tipPoints[0] after drawing the rectangle outline in this order). - wxPoint2DDouble tipPoints[3]; - - switch ( tipKind ) - { - case wxTipKind_Auto: - wxFAIL_MSG( "Impossible kind value" ); - break; - - case wxTipKind_TopLeft: - x = tipOffset; - yApex = 0; - yBase = tipSize; - dy = tipSize; - - tipPoints[0] = wxPoint2DDouble(x, yBase); - tipPoints[1] = wxPoint2DDouble(x, yApex); - tipPoints[2] = wxPoint2DDouble(x + tipSize, yBase); - - pointStart = RectPoint_TopRight; - break; - - case wxTipKind_TopRight: - x = size.x - tipOffset; - yApex = 0; - yBase = tipSize; - dy = tipSize; - - tipPoints[0] = wxPoint2DDouble(x - tipSize, yBase); - tipPoints[1] = wxPoint2DDouble(x, yApex); - tipPoints[2] = wxPoint2DDouble(x, yBase); - - pointStart = RectPoint_TopRight; - break; - - case wxTipKind_BottomLeft: - x = tipOffset; - yApex = size.y + tipSize; - yBase = size.y; - dy = 0; - - tipPoints[0] = wxPoint2DDouble(x + tipSize, yBase); - tipPoints[1] = wxPoint2DDouble(x, yApex); - tipPoints[2] = wxPoint2DDouble(x, yBase); - - pointStart = RectPoint_BotLeft; - break; - - case wxTipKind_BottomRight: - x = size.x - tipOffset; - yApex = size.y + tipSize; - yBase = size.y; - dy = 0; - - tipPoints[0] = wxPoint2DDouble(x, yBase); - tipPoints[1] = wxPoint2DDouble(x, yApex); - tipPoints[2] = wxPoint2DDouble(x - tipSize, yBase); - - pointStart = RectPoint_BotLeft; - break; - - case wxTipKind_Top: - x = size.x/2; - yApex = 0; - yBase = tipSize; - dy = tipSize; - - { - // A half-side of an equilateral triangle is its altitude - // divided by sqrt(3) ~= 1.73. - const double halfside = tipSize/1.73; - - tipPoints[0] = wxPoint2DDouble(x - halfside, yBase); - tipPoints[1] = wxPoint2DDouble(x, yApex); - tipPoints[2] = wxPoint2DDouble(x + halfside, yBase); - } - - pointStart = RectPoint_TopRight; - break; - - case wxTipKind_Bottom: - x = size.x/2; - yApex = size.y + tipSize; - yBase = size.y; - dy = 0; - - { - const double halfside = tipSize/1.73; - - tipPoints[0] = wxPoint2DDouble(x + halfside, yBase); - tipPoints[1] = wxPoint2DDouble(x, yApex); - tipPoints[2] = wxPoint2DDouble(x - halfside, yBase); - } - - pointStart = RectPoint_BotLeft; - break; - - case wxTipKind_None: - x = size.x/2; - dy = 0; - - path.AddRoundedRectangle(0, 0, size.x, size.y, RADIUS); - break; - } - - wxASSERT_MSG( dy != -1, wxS("Unknown tip kind?") ); - - size.y += tipSize; - SetSize(size); - - if ( tipKind != wxTipKind_None ) - { - path.MoveToPoint(tipPoints[0]); - path.AddLineToPoint(tipPoints[1]); - path.AddLineToPoint(tipPoints[2]); - - const double xLeft = 0.; - const double xMid = size.x/2.; - const double xRight = size.x; - - const double yTop = dy; - const double yMid = (dy + size.y)/2.; - const double yBot = dy + contentSize.y; - - wxPoint2DDouble rectPoints[RectPoint_Max]; - rectPoints[RectPoint_TopLeft] = wxPoint2DDouble(xLeft, yTop); - rectPoints[RectPoint_Top] = wxPoint2DDouble(xMid, yTop); - rectPoints[RectPoint_TopRight] = wxPoint2DDouble(xRight, yTop); - rectPoints[RectPoint_Right] = wxPoint2DDouble(xRight, yMid); - rectPoints[RectPoint_BotRight] = wxPoint2DDouble(xRight, yBot); - rectPoints[RectPoint_Bot] = wxPoint2DDouble(xMid, yBot); - rectPoints[RectPoint_BotLeft] = wxPoint2DDouble(xLeft, yBot); - rectPoints[RectPoint_Left] = wxPoint2DDouble(xLeft, yMid); - - // Iterate over all rectangle rectPoints for the first 3 corners. - unsigned n = pointStart; - for ( unsigned corner = 0; corner < 3; corner++ ) - { - const wxPoint2DDouble& pt1 = rectPoints[n]; - - n = (n + 1) % RectPoint_Max; - - const wxPoint2DDouble& pt2 = rectPoints[n]; - - path.AddArcToPoint(pt1.m_x, pt1.m_y, pt2.m_x, pt2.m_y, RADIUS); - - n = (n + 1) % RectPoint_Max; - } - - // Last one wraps to the first point of the tip. - const wxPoint2DDouble& pt1 = rectPoints[n]; - const wxPoint2DDouble& pt2 = tipPoints[0]; - - path.AddArcToPoint(pt1.m_x, pt1.m_y, pt2.m_x, pt2.m_y, RADIUS); - - path.CloseSubpath(); - } - - SetShape(path); -#else // !wxUSE_GRAPHICS_CONTEXT - wxUnusedVar(tipKind); - - int x = contentSize.x/2, - yApex = 0, - dy = 0; - - SetSize(contentSize); -#endif // wxUSE_GRAPHICS_CONTEXT/!wxUSE_GRAPHICS_CONTEXT - - m_anchorPos.x = x; - m_anchorPos.y = yApex; - - return dy; - } - - // Timer event handler hides the tooltip when the timeout expires. - void OnTimer(wxTimerEvent& WXUNUSED(event)) - { - if ( !m_delayShow ) - { - // Doing "Notify" here ensures that our OnDismiss() is called and so we - // also Destroy() ourselves. We could use Dismiss() and call Destroy() - // explicitly from here as well. - DismissAndNotify(); - - return; - } - - m_delayShow = false; - - if ( m_timeout ) - m_timer.Start(m_timeout, true); - - DoShow(); - } - - - // The anchor point offset if we show a tip or the middle of the top side - // otherwise. - wxPoint m_anchorPos; - - // The timer counting down the time until we're hidden. - wxTimer m_timer; - - // We will need to accesss the timeout period when delaying showing tooltip. - int m_timeout; - - // If true, delay showing the tooltip. - bool m_delayShow; - - wxDECLARE_NO_COPY_CLASS(wxRichToolTipPopup); -}; - -// ---------------------------------------------------------------------------- -// wxRichToolTipGenericImpl: generic implementation of wxRichToolTip. -// ---------------------------------------------------------------------------- - -void -wxRichToolTipGenericImpl::SetBackgroundColour(const wxColour& col, - const wxColour& colEnd) -{ - m_colStart = col; - m_colEnd = colEnd; -} - -void wxRichToolTipGenericImpl::SetCustomIcon(const wxIcon& icon) -{ - m_icon = icon; -} - -void wxRichToolTipGenericImpl::SetStandardIcon(int icon) -{ - switch ( icon & wxICON_MASK ) - { - case wxICON_WARNING: - case wxICON_ERROR: - case wxICON_INFORMATION: - // Although we don't use this icon in a list, we need a smallish - // icon here and not an icon of a typical message box size so use - // wxART_LIST to get it. - m_icon = wxArtProvider::GetIcon - ( - wxArtProvider::GetMessageBoxIconId(icon), - wxART_LIST - ); - break; - - case wxICON_QUESTION: - wxFAIL_MSG("Question icon doesn't make sense for a tooltip"); - break; - - case wxICON_NONE: - m_icon = wxNullIcon; - break; - } -} - -void wxRichToolTipGenericImpl::SetTimeout(unsigned millisecondsTimeout, - unsigned millisecondsDelay) -{ - m_delay = millisecondsDelay; - m_timeout = millisecondsTimeout; -} - -void wxRichToolTipGenericImpl::SetTipKind(wxTipKind tipKind) -{ - m_tipKind = tipKind; -} - -void wxRichToolTipGenericImpl::SetTitleFont(const wxFont& font) -{ - m_titleFont = font; -} - -void wxRichToolTipGenericImpl::ShowFor(wxWindow* win, const wxRect* rect) -{ - // Set the focus to the window the tooltip refers to to make it look active. - win->SetFocus(); - - wxRichToolTipPopup* const popup = new wxRichToolTipPopup - ( - win, - m_title, - m_message, - m_icon, - m_tipKind, - m_titleFont - ); - - popup->SetBackgroundColours(m_colStart, m_colEnd); - - popup->SetPosition(rect); - // show or start the timer to delay showing the popup - popup->SetTimeoutAndShow( m_timeout, m_delay ); -} - -// Currently only wxMSW provides a native implementation. -#ifndef __WXMSW__ - -/* static */ -wxRichToolTipImpl* -wxRichToolTipImpl::Create(const wxString& title, const wxString& message) -{ - return new wxRichToolTipGenericImpl(title, message); -} - -#endif // !__WXMSW__ - -#endif // wxUSE_RICHTOOLTIP diff --git a/Externals/wxWidgets3/src/generic/sashwin.cpp b/Externals/wxWidgets3/src/generic/sashwin.cpp deleted file mode 100644 index c5ba834f32..0000000000 --- a/Externals/wxWidgets3/src/generic/sashwin.cpp +++ /dev/null @@ -1,707 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/generic/sashwin.cpp -// Purpose: wxSashWindow implementation. A sash window has an optional -// sash on each edge, allowing it to be dragged. An event -// is generated when the sash is released. -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_SASH - -#include "wx/sashwin.h" - -#ifndef WX_PRECOMP - #include "wx/dialog.h" - #include "wx/frame.h" - #include "wx/settings.h" - #include "wx/dcclient.h" - #include "wx/dcscreen.h" - #include "wx/math.h" -#endif - -#include - -#include "wx/laywin.h" - -wxDEFINE_EVENT( wxEVT_SASH_DRAGGED, wxSashEvent ); - -wxIMPLEMENT_DYNAMIC_CLASS(wxSashWindow, wxWindow); -wxIMPLEMENT_DYNAMIC_CLASS(wxSashEvent, wxCommandEvent); - -wxBEGIN_EVENT_TABLE(wxSashWindow, wxWindow) - EVT_PAINT(wxSashWindow::OnPaint) - EVT_SIZE(wxSashWindow::OnSize) - EVT_MOUSE_EVENTS(wxSashWindow::OnMouseEvent) -#if defined( __WXMSW__ ) || defined( __WXMAC__) - EVT_SET_CURSOR(wxSashWindow::OnSetCursor) -#endif // __WXMSW__ || __WXMAC__ - -wxEND_EVENT_TABLE() - -bool wxSashWindow::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, - const wxSize& size, long style, const wxString& name) -{ - return wxWindow::Create(parent, id, pos, size, style, name); -} - -wxSashWindow::~wxSashWindow() -{ - delete m_sashCursorWE; - delete m_sashCursorNS; -} - -void wxSashWindow::Init() -{ - m_draggingEdge = wxSASH_NONE; - m_dragMode = wxSASH_DRAG_NONE; - m_oldX = 0; - m_oldY = 0; - m_firstX = 0; - m_firstY = 0; - m_borderSize = 3; - m_extraBorderSize = 0; - m_minimumPaneSizeX = 0; - m_minimumPaneSizeY = 0; - m_maximumPaneSizeX = 10000; - m_maximumPaneSizeY = 10000; - m_sashCursorWE = new wxCursor(wxCURSOR_SIZEWE); - m_sashCursorNS = new wxCursor(wxCURSOR_SIZENS); - m_mouseCaptured = false; - m_currentCursor = NULL; - - // Eventually, we'll respond to colour change messages - InitColours(); -} - -void wxSashWindow::OnPaint(wxPaintEvent& WXUNUSED(event)) -{ - wxPaintDC dc(this); - - DrawBorders(dc); - DrawSashes(dc); -} - -void wxSashWindow::OnMouseEvent(wxMouseEvent& event) -{ - wxCoord x = 0, y = 0; - event.GetPosition(&x, &y); - - wxSashEdgePosition sashHit = SashHitTest(x, y); - - if (event.LeftDown()) - { - CaptureMouse(); - m_mouseCaptured = true; - - if ( sashHit != wxSASH_NONE ) - { - // Required for X to specify that - // that we wish to draw on top of all windows - // - and we optimise by specifying the area - // for creating the overlap window. - // Find the first frame or dialog and use this to specify - // the area to draw on. - wxWindow* parent = this; - - while (parent && !wxDynamicCast(parent, wxDialog) && - !wxDynamicCast(parent, wxFrame)) - parent = parent->GetParent(); - - wxScreenDC::StartDrawingOnTop(parent); - - // We don't say we're dragging yet; we leave that - // decision for the Dragging() branch, to ensure - // the user has dragged a little bit. - m_dragMode = wxSASH_DRAG_LEFT_DOWN; - m_draggingEdge = sashHit; - m_firstX = x; - m_firstY = y; - - if ( (sashHit == wxSASH_LEFT) || (sashHit == wxSASH_RIGHT) ) - { - if (m_currentCursor != m_sashCursorWE) - { - SetCursor(*m_sashCursorWE); - } - m_currentCursor = m_sashCursorWE; - } - else - { - if (m_currentCursor != m_sashCursorNS) - { - SetCursor(*m_sashCursorNS); - } - m_currentCursor = m_sashCursorNS; - } - } - } - else if ( event.LeftUp() && m_dragMode == wxSASH_DRAG_LEFT_DOWN ) - { - // Wasn't a proper drag - if (m_mouseCaptured) - ReleaseMouse(); - m_mouseCaptured = false; - - wxScreenDC::EndDrawingOnTop(); - m_dragMode = wxSASH_DRAG_NONE; - m_draggingEdge = wxSASH_NONE; - } - else if (event.LeftUp() && m_dragMode == wxSASH_DRAG_DRAGGING) - { - // We can stop dragging now and see what we've got. - m_dragMode = wxSASH_DRAG_NONE; - if (m_mouseCaptured) - ReleaseMouse(); - m_mouseCaptured = false; - - // Erase old tracker - DrawSashTracker(m_draggingEdge, m_oldX, m_oldY); - - // End drawing on top (frees the window used for drawing - // over the screen) - wxScreenDC::EndDrawingOnTop(); - - int w, h; - GetSize(&w, &h); - int xp, yp; - GetPosition(&xp, &yp); - - wxSashEdgePosition edge = m_draggingEdge; - m_draggingEdge = wxSASH_NONE; - - wxRect dragRect; - wxSashDragStatus status = wxSASH_STATUS_OK; - - // the new height and width of the window - if -1, it didn't change - int newHeight = wxDefaultCoord, - newWidth = wxDefaultCoord; - - // NB: x and y may be negative and they're relative to the sash window - // upper left corner, while xp and yp are expressed in the parent - // window system of coordinates, so adjust them! After this - // adjustment, all coordinates are relative to the parent window. - y += yp; - x += xp; - - switch (edge) - { - case wxSASH_TOP: - if ( y > yp + h ) - { - // top sash shouldn't get below the bottom one - status = wxSASH_STATUS_OUT_OF_RANGE; - } - else - { - newHeight = h - (y - yp); - } - break; - - case wxSASH_BOTTOM: - if ( y < yp ) - { - // bottom sash shouldn't get above the top one - status = wxSASH_STATUS_OUT_OF_RANGE; - } - else - { - newHeight = y - yp; - } - break; - - case wxSASH_LEFT: - if ( x > xp + w ) - { - // left sash shouldn't get beyond the right one - status = wxSASH_STATUS_OUT_OF_RANGE; - } - else - { - newWidth = w - (x - xp); - } - break; - - case wxSASH_RIGHT: - if ( x < xp ) - { - // and the right sash, finally, shouldn't be beyond the - // left one - status = wxSASH_STATUS_OUT_OF_RANGE; - } - else - { - newWidth = x - xp; - } - break; - - case wxSASH_NONE: - // can this happen at all? - break; - } - - if ( newHeight == wxDefaultCoord ) - { - // didn't change - newHeight = h; - } - else - { - // make sure it's in m_minimumPaneSizeY..m_maximumPaneSizeY range - newHeight = wxMax(newHeight, m_minimumPaneSizeY); - newHeight = wxMin(newHeight, m_maximumPaneSizeY); - } - - if ( newWidth == wxDefaultCoord ) - { - // didn't change - newWidth = w; - } - else - { - // make sure it's in m_minimumPaneSizeY..m_maximumPaneSizeY range - newWidth = wxMax(newWidth, m_minimumPaneSizeX); - newWidth = wxMin(newWidth, m_maximumPaneSizeX); - } - - dragRect = wxRect(x, y, newWidth, newHeight); - - wxSashEvent eventSash(GetId(), edge); - eventSash.SetEventObject(this); - eventSash.SetDragStatus(status); - eventSash.SetDragRect(dragRect); - GetEventHandler()->ProcessEvent(eventSash); - } - else if ( event.LeftUp() ) - { - if (m_mouseCaptured) - ReleaseMouse(); - m_mouseCaptured = false; - } - else if ((event.Moving() || event.Leaving()) && !event.Dragging()) - { - // Just change the cursor if required - if ( sashHit != wxSASH_NONE ) - { - if ( (sashHit == wxSASH_LEFT) || (sashHit == wxSASH_RIGHT) ) - { - if (m_currentCursor != m_sashCursorWE) - { - SetCursor(*m_sashCursorWE); - } - m_currentCursor = m_sashCursorWE; - } - else - { - if (m_currentCursor != m_sashCursorNS) - { - SetCursor(*m_sashCursorNS); - } - m_currentCursor = m_sashCursorNS; - } - } - else - { - SetCursor(wxNullCursor); - m_currentCursor = NULL; - } - } - else if ( event.Dragging() && - ((m_dragMode == wxSASH_DRAG_DRAGGING) || - (m_dragMode == wxSASH_DRAG_LEFT_DOWN)) ) - { - if ( (m_draggingEdge == wxSASH_LEFT) || (m_draggingEdge == wxSASH_RIGHT) ) - { - if (m_currentCursor != m_sashCursorWE) - { - SetCursor(*m_sashCursorWE); - } - m_currentCursor = m_sashCursorWE; - } - else - { - if (m_currentCursor != m_sashCursorNS) - { - SetCursor(*m_sashCursorNS); - } - m_currentCursor = m_sashCursorNS; - } - - if (m_dragMode == wxSASH_DRAG_LEFT_DOWN) - { - m_dragMode = wxSASH_DRAG_DRAGGING; - DrawSashTracker(m_draggingEdge, x, y); - } - else - { - if ( m_dragMode == wxSASH_DRAG_DRAGGING ) - { - // Erase old tracker - DrawSashTracker(m_draggingEdge, m_oldX, m_oldY); - - // Draw new one - DrawSashTracker(m_draggingEdge, x, y); - } - } - m_oldX = x; - m_oldY = y; - } - else if ( event.LeftDClick() ) - { - // Nothing - } - else - { - } -} - -void wxSashWindow::OnSize(wxSizeEvent& WXUNUSED(event)) -{ - SizeWindows(); -} - -wxSashEdgePosition wxSashWindow::SashHitTest(int x, int y, int WXUNUSED(tolerance)) -{ - int cx, cy; - GetClientSize(& cx, & cy); - - int i; - for (i = 0; i < 4; i++) - { - wxSashEdge& edge = m_sashes[i]; - wxSashEdgePosition position = (wxSashEdgePosition) i ; - - if (edge.m_show) - { - switch (position) - { - case wxSASH_TOP: - { - if (y >= 0 && y <= GetEdgeMargin(position)) - return wxSASH_TOP; - break; - } - case wxSASH_RIGHT: - { - if ((x >= cx - GetEdgeMargin(position)) && (x <= cx)) - return wxSASH_RIGHT; - break; - } - case wxSASH_BOTTOM: - { - if ((y >= cy - GetEdgeMargin(position)) && (y <= cy)) - return wxSASH_BOTTOM; - break; - } - case wxSASH_LEFT: - { - if ((x <= GetEdgeMargin(position)) && (x >= 0)) - return wxSASH_LEFT; - break; - } - case wxSASH_NONE: - { - break; - } - } - } - } - return wxSASH_NONE; -} - -// Draw 3D effect borders -void wxSashWindow::DrawBorders(wxDC& dc) -{ - int w, h; - GetClientSize(&w, &h); - - wxPen mediumShadowPen(m_mediumShadowColour, 1, wxPENSTYLE_SOLID); - wxPen darkShadowPen(m_darkShadowColour, 1, wxPENSTYLE_SOLID); - wxPen lightShadowPen(m_lightShadowColour, 1, wxPENSTYLE_SOLID); - wxPen hilightPen(m_hilightColour, 1, wxPENSTYLE_SOLID); - - if ( GetWindowStyleFlag() & wxSW_3DBORDER ) - { - dc.SetPen(mediumShadowPen); - dc.DrawLine(0, 0, w-1, 0); - dc.DrawLine(0, 0, 0, h - 1); - - dc.SetPen(darkShadowPen); - dc.DrawLine(1, 1, w-2, 1); - dc.DrawLine(1, 1, 1, h-2); - - dc.SetPen(hilightPen); - dc.DrawLine(0, h-1, w-1, h-1); - dc.DrawLine(w-1, 0, w-1, h); // Surely the maximum y pos. should be h - 1. - /// Anyway, h is required for MSW. - - dc.SetPen(lightShadowPen); - dc.DrawLine(w-2, 1, w-2, h-2); // Right hand side - dc.DrawLine(1, h-2, w-1, h-2); // Bottom - } - else if ( GetWindowStyleFlag() & wxSW_BORDER ) - { - dc.SetBrush(*wxTRANSPARENT_BRUSH); - dc.SetPen(*wxBLACK_PEN); - dc.DrawRectangle(0, 0, w-1, h-1); - } - - dc.SetPen(wxNullPen); - dc.SetBrush(wxNullBrush); -} - -void wxSashWindow::DrawSashes(wxDC& dc) -{ - int i; - for (i = 0; i < 4; i++) - if (m_sashes[i].m_show) - DrawSash((wxSashEdgePosition) i, dc); -} - -// Draw the sash -void wxSashWindow::DrawSash(wxSashEdgePosition edge, wxDC& dc) -{ - int w, h; - GetClientSize(&w, &h); - - wxPen facePen(m_faceColour, 1, wxPENSTYLE_SOLID); - wxBrush faceBrush(m_faceColour, wxBRUSHSTYLE_SOLID); - wxPen mediumShadowPen(m_mediumShadowColour, 1, wxPENSTYLE_SOLID); - wxPen darkShadowPen(m_darkShadowColour, 1, wxPENSTYLE_SOLID); - wxPen lightShadowPen(m_lightShadowColour, 1, wxPENSTYLE_SOLID); - wxPen hilightPen(m_hilightColour, 1, wxPENSTYLE_SOLID); - wxColour blackClr(0, 0, 0); - wxColour whiteClr(255, 255, 255); - wxPen blackPen(blackClr, 1, wxPENSTYLE_SOLID); - wxPen whitePen(whiteClr, 1, wxPENSTYLE_SOLID); - - if ( edge == wxSASH_LEFT || edge == wxSASH_RIGHT ) - { - int sashPosition = (edge == wxSASH_LEFT) ? 0 : ( w - GetEdgeMargin(edge) ); - - dc.SetPen(facePen); - dc.SetBrush(faceBrush); - dc.DrawRectangle(sashPosition, 0, GetEdgeMargin(edge), h); - - if (GetWindowStyleFlag() & wxSW_3DSASH) - { - if (edge == wxSASH_LEFT) - { - // Draw a dark grey line on the left to indicate that the - // sash is raised - dc.SetPen(mediumShadowPen); - dc.DrawLine(GetEdgeMargin(edge), 0, GetEdgeMargin(edge), h); - } - else - { - // Draw a highlight line on the right to indicate that the - // sash is raised - dc.SetPen(hilightPen); - dc.DrawLine(w - GetEdgeMargin(edge), 0, w - GetEdgeMargin(edge), h); - } - } - } - else // top or bottom - { - int sashPosition = (edge == wxSASH_TOP) ? 0 : ( h - GetEdgeMargin(edge) ); - - dc.SetPen(facePen); - dc.SetBrush(faceBrush); - dc.DrawRectangle(0, sashPosition, w, GetEdgeMargin(edge)); - - if (GetWindowStyleFlag() & wxSW_3DSASH) - { - if (edge == wxSASH_BOTTOM) - { - // Draw a highlight line on the bottom to indicate that the - // sash is raised - dc.SetPen(hilightPen); - dc.DrawLine(0, h - GetEdgeMargin(edge), w, h - GetEdgeMargin(edge)); - } - else - { - // Draw a drak grey line on the top to indicate that the - // sash is raised - dc.SetPen(mediumShadowPen); - dc.DrawLine(1, GetEdgeMargin(edge), w-1, GetEdgeMargin(edge)); - } - } - } - - dc.SetPen(wxNullPen); - dc.SetBrush(wxNullBrush); -} - -// Draw the sash tracker (for whilst moving the sash) -void wxSashWindow::DrawSashTracker(wxSashEdgePosition edge, int x, int y) -{ - int w, h; - GetClientSize(&w, &h); - - wxScreenDC screenDC; - int x1, y1; - int x2, y2; - - if ( edge == wxSASH_LEFT || edge == wxSASH_RIGHT ) - { - x1 = x; y1 = 2; - x2 = x; y2 = h-2; - - if ( (edge == wxSASH_LEFT) && (x1 > w) ) - { - x1 = w; x2 = w; - } - else if ( (edge == wxSASH_RIGHT) && (x1 < 0) ) - { - x1 = 0; x2 = 0; - } - } - else - { - x1 = 2; y1 = y; - x2 = w-2; y2 = y; - - if ( (edge == wxSASH_TOP) && (y1 > h) ) - { - y1 = h; - y2 = h; - } - else if ( (edge == wxSASH_BOTTOM) && (y1 < 0) ) - { - y1 = 0; - y2 = 0; - } - } - - ClientToScreen(&x1, &y1); - ClientToScreen(&x2, &y2); - - wxPen sashTrackerPen(*wxBLACK, 2, wxPENSTYLE_SOLID); - - screenDC.SetLogicalFunction(wxINVERT); - screenDC.SetPen(sashTrackerPen); - screenDC.SetBrush(*wxTRANSPARENT_BRUSH); - - screenDC.DrawLine(x1, y1, x2, y2); - - screenDC.SetLogicalFunction(wxCOPY); - - screenDC.SetPen(wxNullPen); - screenDC.SetBrush(wxNullBrush); -} - -// Position and size subwindows. -// Note that the border size applies to each subwindow, not -// including the edges next to the sash. -void wxSashWindow::SizeWindows() -{ - int cw, ch; - GetClientSize(&cw, &ch); - - if (GetChildren().GetCount() == 1) - { - wxWindow* child = GetChildren().GetFirst()->GetData(); - - int x = 0; - int y = 0; - int width = cw; - int height = ch; - - // Top - if (m_sashes[0].m_show) - { - y = m_borderSize; - height -= m_borderSize; - } - y += m_extraBorderSize; - - // Left - if (m_sashes[3].m_show) - { - x = m_borderSize; - width -= m_borderSize; - } - x += m_extraBorderSize; - - // Right - if (m_sashes[1].m_show) - { - width -= m_borderSize; - } - width -= 2*m_extraBorderSize; - - // Bottom - if (m_sashes[2].m_show) - { - height -= m_borderSize; - } - height -= 2*m_extraBorderSize; - - child->SetSize(x, y, width, height); - } - else if (GetChildren().GetCount() > 1) - { - // Perhaps multiple children are themselves sash windows. - // TODO: this doesn't really work because the subwindows sizes/positions - // must be set to leave a gap for the parent's sash (hit-test and decorations). - // Perhaps we can allow for this within LayoutWindow, testing whether the parent - // is a sash window, and if so, allowing some space for the edges. - wxLayoutAlgorithm layout; - layout.LayoutWindow(this); - } - - wxClientDC dc(this); - DrawBorders(dc); - DrawSashes(dc); -} - -// Initialize colours -void wxSashWindow::InitColours() -{ - // Shadow colours - m_faceColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); - m_mediumShadowColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW); - m_darkShadowColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW); - m_lightShadowColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT); - m_hilightColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DHILIGHT); -} - -void wxSashWindow::SetSashVisible(wxSashEdgePosition edge, bool sash) -{ - m_sashes[edge].m_show = sash; - if (sash) - m_sashes[edge].m_margin = m_borderSize; - else - m_sashes[edge].m_margin = 0; -} - -#if defined( __WXMSW__ ) || defined( __WXMAC__) - -// this is currently called (and needed) under MSW only... -void wxSashWindow::OnSetCursor(wxSetCursorEvent& event) -{ - // if we don't do it, the resizing cursor might be set for child window: - // and like this we explicitly say that our cursor should not be used for - // children windows which overlap us - - if ( SashHitTest(event.GetX(), event.GetY()) != wxSASH_NONE) - { - // default processing is ok - event.Skip(); - } - //else: do nothing, in particular, don't call Skip() -} - -#endif // __WXMSW__ || __WXMAC__ - -#endif // wxUSE_SASH diff --git a/Externals/wxWidgets3/src/generic/scrlwing.cpp b/Externals/wxWidgets3/src/generic/scrlwing.cpp deleted file mode 100644 index 6315f5a97f..0000000000 --- a/Externals/wxWidgets3/src/generic/scrlwing.cpp +++ /dev/null @@ -1,1566 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/generic/scrlwing.cpp -// Purpose: wxScrolledWindow implementation -// Author: Julian Smart -// Modified by: Vadim Zeitlin on 31.08.00: wxScrollHelper allows to implement. -// Ron Lee on 10.4.02: virtual size / auto scrollbars et al. -// Created: 01/02/97 -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include "wx/scrolwin.h" - -#ifndef WX_PRECOMP - #include "wx/utils.h" - #include "wx/panel.h" - #include "wx/dcclient.h" - #include "wx/timer.h" - #include "wx/sizer.h" - #include "wx/settings.h" -#endif - -#ifdef __WXMAC__ -#include "wx/scrolbar.h" -#endif - -#ifdef __WXMSW__ - #include // for DLGC_WANTARROWS - #include "wx/msw/winundef.h" -#endif - -#ifdef __WXMOTIF__ -// For wxRETAINED implementation -#ifdef __VMS__ //VMS's Xm.h is not (yet) compatible with C++ - //This code switches off the compiler warnings -# pragma message disable nosimpint -#endif -#include -#ifdef __VMS__ -# pragma message enable nosimpint -#endif -#endif - -/* - TODO PROPERTIES - style wxHSCROLL | wxVSCROLL -*/ - -// ---------------------------------------------------------------------------- -// wxScrollHelperEvtHandler: intercept the events from the window and forward -// them to wxScrollHelper -// ---------------------------------------------------------------------------- - -class WXDLLEXPORT wxScrollHelperEvtHandler : public wxEvtHandler -{ -public: - wxScrollHelperEvtHandler(wxScrollHelperBase *scrollHelper) - { - m_scrollHelper = scrollHelper; - } - - virtual bool ProcessEvent(wxEvent& event) wxOVERRIDE; - -private: - wxScrollHelperBase *m_scrollHelper; - - wxDECLARE_NO_COPY_CLASS(wxScrollHelperEvtHandler); -}; - -#if wxUSE_TIMER -// ---------------------------------------------------------------------------- -// wxAutoScrollTimer: the timer used to generate a stream of scroll events when -// a captured mouse is held outside the window -// ---------------------------------------------------------------------------- - -class wxAutoScrollTimer : public wxTimer -{ -public: - wxAutoScrollTimer(wxWindow *winToScroll, - wxScrollHelperBase *scroll, - wxEventType eventTypeToSend, - int pos, int orient); - - virtual void Notify() wxOVERRIDE; - -private: - wxWindow *m_win; - wxScrollHelperBase *m_scrollHelper; - wxEventType m_eventType; - int m_pos, - m_orient; - - wxDECLARE_NO_COPY_CLASS(wxAutoScrollTimer); -}; - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxAutoScrollTimer -// ---------------------------------------------------------------------------- - -wxAutoScrollTimer::wxAutoScrollTimer(wxWindow *winToScroll, - wxScrollHelperBase *scroll, - wxEventType eventTypeToSend, - int pos, int orient) -{ - m_win = winToScroll; - m_scrollHelper = scroll; - m_eventType = eventTypeToSend; - m_pos = pos; - m_orient = orient; -} - -void wxAutoScrollTimer::Notify() -{ - // only do all this as long as the window is capturing the mouse - if ( wxWindow::GetCapture() != m_win ) - { - Stop(); - } - else // we still capture the mouse, continue generating events - { - // first scroll the window if we are allowed to do it - wxScrollWinEvent event1(m_eventType, m_pos, m_orient); - event1.SetEventObject(m_win); - event1.SetId(m_win->GetId()); - if ( m_scrollHelper->SendAutoScrollEvents(event1) && - m_win->GetEventHandler()->ProcessEvent(event1) ) - { - // and then send a pseudo mouse-move event to refresh the selection - wxMouseEvent event2(wxEVT_MOTION); - event2.SetPosition(wxGetMousePosition()); - - // the mouse event coordinates should be client, not screen as - // returned by wxGetMousePosition - wxWindow *parentTop = m_win; - while ( parentTop->GetParent() ) - parentTop = parentTop->GetParent(); - wxPoint ptOrig = parentTop->GetPosition(); - event2.m_x -= ptOrig.x; - event2.m_y -= ptOrig.y; - - event2.SetEventObject(m_win); - - wxMouseState mouseState = wxGetMouseState(); - - event2.m_leftDown = mouseState.LeftIsDown(); - event2.m_middleDown = mouseState.MiddleIsDown(); - event2.m_rightDown = mouseState.RightIsDown(); - - event2.m_shiftDown = mouseState.ShiftDown(); - event2.m_controlDown = mouseState.ControlDown(); - event2.m_altDown = mouseState.AltDown(); - event2.m_metaDown = mouseState.MetaDown(); - - m_win->GetEventHandler()->ProcessEvent(event2); - } - else // can't scroll further, stop - { - Stop(); - } - } -} -#endif - -// ---------------------------------------------------------------------------- -// wxScrollHelperEvtHandler -// ---------------------------------------------------------------------------- - -// Notice that this method is currently duplicated in the method with the same -// name in wxVarScrollHelperEvtHandler class, until this is fixed, the other -// copy of the method needs to be modified every time this version is. -bool wxScrollHelperEvtHandler::ProcessEvent(wxEvent& event) -{ - wxEventType evType = event.GetEventType(); - - // Pass it on to the real handler: notice that we must not call - // ProcessEvent() on this object itself as it wouldn't pass it to the next - // handler (i.e. the real window) if we're called from a previous handler - // (as indicated by "process here only" flag being set) and we do want to - // execute the handler defined in the window we're associated with right - // now, without waiting until TryAfter() is called from wxEvtHandler. - bool processed = m_nextHandler->ProcessEvent(event); - - // always process the size events ourselves, even if the user code handles - // them as well, as we need to AdjustScrollbars() - // - // NB: it is important to do it after processing the event in the normal - // way as HandleOnSize() may generate a wxEVT_SIZE itself if the - // scrollbar[s] (dis)appear and it should be seen by the user code - // after this one - if ( evType == wxEVT_SIZE ) - { - m_scrollHelper->HandleOnSize((wxSizeEvent &)event); - return true; - } - - // For wxEVT_PAINT the user code can either handle this event as usual or - // override virtual OnDraw(), so if the event hasn't been handled we need - // to call this virtual function ourselves. - if ( -#ifndef __WXUNIVERSAL__ - // in wxUniversal "processed" will always be true, because - // all windows use the paint event to draw themselves. - // In this case we can't use this flag to determine if a custom - // paint event handler already drew our window and we just - // call OnDraw() anyway. - !processed && -#endif // !__WXUNIVERSAL__ - evType == wxEVT_PAINT ) - { - m_scrollHelper->HandleOnPaint((wxPaintEvent &)event); - return true; - } - - // If the user code handled this event, it should prevent the default - // handling from taking place, so don't do anything else in this case. - if ( processed ) - return true; - - if ( evType == wxEVT_CHILD_FOCUS ) - { - m_scrollHelper->HandleOnChildFocus((wxChildFocusEvent &)event); - return true; - } - - // reset the skipped flag (which might have been set to true in - // ProcessEvent() above) to be able to test it below - bool wasSkipped = event.GetSkipped(); - if ( wasSkipped ) - event.Skip(false); - - if ( evType == wxEVT_SCROLLWIN_TOP || - evType == wxEVT_SCROLLWIN_BOTTOM || - evType == wxEVT_SCROLLWIN_LINEUP || - evType == wxEVT_SCROLLWIN_LINEDOWN || - evType == wxEVT_SCROLLWIN_PAGEUP || - evType == wxEVT_SCROLLWIN_PAGEDOWN || - evType == wxEVT_SCROLLWIN_THUMBTRACK || - evType == wxEVT_SCROLLWIN_THUMBRELEASE ) - { - m_scrollHelper->HandleOnScroll((wxScrollWinEvent &)event); - if ( !event.GetSkipped() ) - { - // it makes sense to indicate that we processed the message as we - // did scroll the window (and also notice that wxAutoScrollTimer - // relies on our return value to stop scrolling when we are at top - // or bottom already) - processed = true; - wasSkipped = false; - } - } - - if ( evType == wxEVT_ENTER_WINDOW ) - { - m_scrollHelper->HandleOnMouseEnter((wxMouseEvent &)event); - } - else if ( evType == wxEVT_LEAVE_WINDOW ) - { - m_scrollHelper->HandleOnMouseLeave((wxMouseEvent &)event); - } -#if wxUSE_MOUSEWHEEL - // Use GTK's own scroll wheel handling in GtkScrolledWindow -#ifndef __WXGTK20__ - else if ( evType == wxEVT_MOUSEWHEEL ) - { - m_scrollHelper->HandleOnMouseWheel((wxMouseEvent &)event); - return true; - } -#endif -#endif // wxUSE_MOUSEWHEEL - else if ( evType == wxEVT_CHAR ) - { - m_scrollHelper->HandleOnChar((wxKeyEvent &)event); - if ( !event.GetSkipped() ) - { - processed = true; - wasSkipped = false; - } - } - - event.Skip(wasSkipped); - - // We called ProcessEvent() on the next handler, meaning that we explicitly - // worked around the request to process the event in this handler only. As - // explained above, this is unfortunately really necessary but the trouble - // is that the event will continue to be post-processed by the previous - // handler resulting in duplicate calls to event handlers. Call the special - // function below to prevent this from happening, base class DoTryChain() - // will check for it and behave accordingly. - // - // And if we're not called from DoTryChain(), this won't do anything anyhow. - event.DidntHonourProcessOnlyIn(); - - return processed; -} - -// ============================================================================ -// wxAnyScrollHelperBase and wxScrollHelperBase implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxAnyScrollHelperBase -// ---------------------------------------------------------------------------- - -wxAnyScrollHelperBase::wxAnyScrollHelperBase(wxWindow* win) -{ - wxASSERT_MSG( win, wxT("associated window can't be NULL in wxScrollHelper") ); - - m_win = win; - m_targetWindow = NULL; - - m_kbdScrollingEnabled = true; -} - -// ---------------------------------------------------------------------------- -// wxScrollHelperBase construction -// ---------------------------------------------------------------------------- - -wxScrollHelperBase::wxScrollHelperBase(wxWindow *win) - : wxAnyScrollHelperBase(win) -{ - m_xScrollPixelsPerLine = - m_yScrollPixelsPerLine = - m_xScrollPosition = - m_yScrollPosition = - m_xScrollLines = - m_yScrollLines = - m_xScrollLinesPerPage = - m_yScrollLinesPerPage = 0; - - m_xScrollingEnabled = - m_yScrollingEnabled = true; - - m_scaleX = - m_scaleY = 1.0; -#if wxUSE_MOUSEWHEEL - m_wheelRotation = 0; -#endif - - m_timerAutoScroll = NULL; - - m_handler = NULL; - - m_win->SetScrollHelper(static_cast(this)); - - // by default, the associated window is also the target window - DoSetTargetWindow(win); -} - -wxScrollHelperBase::~wxScrollHelperBase() -{ - StopAutoScrolling(); - - DeleteEvtHandler(); -} - -// ---------------------------------------------------------------------------- -// setting scrolling parameters -// ---------------------------------------------------------------------------- - -void wxScrollHelperBase::SetScrollbars(int pixelsPerUnitX, - int pixelsPerUnitY, - int noUnitsX, - int noUnitsY, - int xPos, - int yPos, - bool noRefresh) -{ - // Convert positions expressed in scroll units to positions in pixels. - int xPosInPixels = (xPos + m_xScrollPosition)*m_xScrollPixelsPerLine, - yPosInPixels = (yPos + m_yScrollPosition)*m_yScrollPixelsPerLine; - - bool do_refresh = - ( - (noUnitsX != 0 && m_xScrollLines == 0) || - (noUnitsX < m_xScrollLines && xPosInPixels > pixelsPerUnitX * noUnitsX) || - - (noUnitsY != 0 && m_yScrollLines == 0) || - (noUnitsY < m_yScrollLines && yPosInPixels > pixelsPerUnitY * noUnitsY) || - (xPos != m_xScrollPosition) || - (yPos != m_yScrollPosition) - ); - - m_xScrollPixelsPerLine = pixelsPerUnitX; - m_yScrollPixelsPerLine = pixelsPerUnitY; - m_xScrollPosition = xPos; - m_yScrollPosition = yPos; - - int w = noUnitsX * pixelsPerUnitX; - int h = noUnitsY * pixelsPerUnitY; - - // For better backward compatibility we set persisting limits - // here not just the size. It makes SetScrollbars 'sticky' - // emulating the old non-autoscroll behaviour. - // m_targetWindow->SetVirtualSizeHints( w, h ); - - // The above should arguably be deprecated, this however we still need. - - // take care not to set 0 virtual size, 0 means that we don't have any - // scrollbars and hence we should use the real size instead of the virtual - // one which is indicated by using wxDefaultCoord - m_targetWindow->SetVirtualSize( w ? w : wxDefaultCoord, - h ? h : wxDefaultCoord); - - if (do_refresh && !noRefresh) - m_targetWindow->Refresh(true, GetScrollRect()); - -#ifndef __WXUNIVERSAL__ - // If the target is not the same as the window with the scrollbars, - // then we need to update the scrollbars here, since they won't have - // been updated by SetVirtualSize(). - if ( m_targetWindow != m_win ) -#endif // !__WXUNIVERSAL__ - { - AdjustScrollbars(); - } -#ifndef __WXUNIVERSAL__ - else - { - // otherwise this has been done by AdjustScrollbars, above - } -#endif // !__WXUNIVERSAL__ -} - -// ---------------------------------------------------------------------------- -// [target] window handling -// ---------------------------------------------------------------------------- - -void wxScrollHelperBase::DeleteEvtHandler() -{ - // search for m_handler in the handler list - if ( m_win && m_handler ) - { - if ( m_win->RemoveEventHandler(m_handler) ) - { - delete m_handler; - } - //else: something is very wrong, so better [maybe] leak memory than - // risk a crash because of double deletion - - m_handler = NULL; - } -} - -void wxScrollHelperBase::DoSetTargetWindow(wxWindow *target) -{ - m_targetWindow = target; -#ifdef __WXMAC__ - target->MacSetClipChildren( true ) ; -#endif - - // install the event handler which will intercept the events we're - // interested in (but only do it for our real window, not the target window - // which we scroll - we don't need to hijack its events) - if ( m_targetWindow == m_win ) - { - // if we already have a handler, delete it first - DeleteEvtHandler(); - - m_handler = new wxScrollHelperEvtHandler(this); - m_targetWindow->PushEventHandler(m_handler); - } -} - -void wxScrollHelperBase::SetTargetWindow(wxWindow *target) -{ - wxCHECK_RET( target, wxT("target window must not be NULL") ); - - if ( target == m_targetWindow ) - return; - - DoSetTargetWindow(target); -} - -// ---------------------------------------------------------------------------- -// scrolling implementation itself -// ---------------------------------------------------------------------------- - -void wxScrollHelperBase::HandleOnScroll(wxScrollWinEvent& event) -{ - int nScrollInc = CalcScrollInc(event); - if ( nScrollInc == 0 ) - { - // can't scroll further - event.Skip(); - - return; - } - - bool needsRefresh = false; - int dx = 0, - dy = 0; - int orient = event.GetOrientation(); - if (orient == wxHORIZONTAL) - { - if ( m_xScrollingEnabled ) - { - dx = -m_xScrollPixelsPerLine * nScrollInc; - } - else - { - needsRefresh = true; - } - } - else - { - if ( m_yScrollingEnabled ) - { - dy = -m_yScrollPixelsPerLine * nScrollInc; - } - else - { - needsRefresh = true; - } - } - - if ( !needsRefresh ) - { - // flush all pending repaints before we change m_{x,y}ScrollPosition, as - // otherwise invalidated area could be updated incorrectly later when - // ScrollWindow() makes sure they're repainted before scrolling them -#ifdef __WXMAC__ - // wxWindowMac is taking care of making sure the update area is correctly - // set up, while not forcing an immediate redraw -#else - m_targetWindow->Update(); -#endif - } - - if (orient == wxHORIZONTAL) - { - m_xScrollPosition += nScrollInc; - m_win->SetScrollPos(wxHORIZONTAL, m_xScrollPosition); - } - else - { - m_yScrollPosition += nScrollInc; - m_win->SetScrollPos(wxVERTICAL, m_yScrollPosition); - } - - if ( needsRefresh ) - { - m_targetWindow->Refresh(true, GetScrollRect()); - } - else - { - m_targetWindow->ScrollWindow(dx, dy, GetScrollRect()); - } -} - -int wxScrollHelperBase::CalcScrollInc(wxScrollWinEvent& event) -{ - int pos = event.GetPosition(); - int orient = event.GetOrientation(); - - int nScrollInc = 0; - if (event.GetEventType() == wxEVT_SCROLLWIN_TOP) - { - if (orient == wxHORIZONTAL) - nScrollInc = - m_xScrollPosition; - else - nScrollInc = - m_yScrollPosition; - } else - if (event.GetEventType() == wxEVT_SCROLLWIN_BOTTOM) - { - if (orient == wxHORIZONTAL) - nScrollInc = m_xScrollLines - m_xScrollPosition; - else - nScrollInc = m_yScrollLines - m_yScrollPosition; - } else - if (event.GetEventType() == wxEVT_SCROLLWIN_LINEUP) - { - nScrollInc = -1; - } else - if (event.GetEventType() == wxEVT_SCROLLWIN_LINEDOWN) - { - nScrollInc = 1; - } else - if (event.GetEventType() == wxEVT_SCROLLWIN_PAGEUP) - { - if (orient == wxHORIZONTAL) - nScrollInc = -GetScrollPageSize(wxHORIZONTAL); - else - nScrollInc = -GetScrollPageSize(wxVERTICAL); - } else - if (event.GetEventType() == wxEVT_SCROLLWIN_PAGEDOWN) - { - if (orient == wxHORIZONTAL) - nScrollInc = GetScrollPageSize(wxHORIZONTAL); - else - nScrollInc = GetScrollPageSize(wxVERTICAL); - } else - if ((event.GetEventType() == wxEVT_SCROLLWIN_THUMBTRACK) || - (event.GetEventType() == wxEVT_SCROLLWIN_THUMBRELEASE)) - { - if (orient == wxHORIZONTAL) - nScrollInc = pos - m_xScrollPosition; - else - nScrollInc = pos - m_yScrollPosition; - } - - if (orient == wxHORIZONTAL) - { - if ( m_xScrollPosition + nScrollInc < 0 ) - { - // As -ve as we can go - nScrollInc = -m_xScrollPosition; - } - else // check for the other bound - { - const int posMax = m_xScrollLines - m_xScrollLinesPerPage; - if ( m_xScrollPosition + nScrollInc > posMax ) - { - // As +ve as we can go - nScrollInc = posMax - m_xScrollPosition; - } - } - } - else // wxVERTICAL - { - if ( m_yScrollPosition + nScrollInc < 0 ) - { - // As -ve as we can go - nScrollInc = -m_yScrollPosition; - } - else // check for the other bound - { - const int posMax = m_yScrollLines - m_yScrollLinesPerPage; - if ( m_yScrollPosition + nScrollInc > posMax ) - { - // As +ve as we can go - nScrollInc = posMax - m_yScrollPosition; - } - } - } - - return nScrollInc; -} - -void wxScrollHelperBase::DoPrepareDC(wxDC& dc) -{ - wxPoint pt = dc.GetDeviceOrigin(); -#ifdef __WXGTK__ - // It may actually be correct to always query - // the m_sign from the DC here, but I leave the - // #ifdef GTK for now. - if (m_win->GetLayoutDirection() == wxLayout_RightToLeft) - dc.SetDeviceOrigin( pt.x + m_xScrollPosition * m_xScrollPixelsPerLine, - pt.y - m_yScrollPosition * m_yScrollPixelsPerLine ); - else -#endif - dc.SetDeviceOrigin( pt.x - m_xScrollPosition * m_xScrollPixelsPerLine, - pt.y - m_yScrollPosition * m_yScrollPixelsPerLine ); - dc.SetUserScale( m_scaleX, m_scaleY ); -} - -void wxScrollHelperBase::SetScrollRate( int xstep, int ystep ) -{ - int old_x = m_xScrollPixelsPerLine * m_xScrollPosition; - int old_y = m_yScrollPixelsPerLine * m_yScrollPosition; - - m_xScrollPixelsPerLine = xstep; - m_yScrollPixelsPerLine = ystep; - - int new_x = m_xScrollPixelsPerLine * m_xScrollPosition; - int new_y = m_yScrollPixelsPerLine * m_yScrollPosition; - - m_win->SetScrollPos( wxHORIZONTAL, m_xScrollPosition ); - m_win->SetScrollPos( wxVERTICAL, m_yScrollPosition ); - m_targetWindow->ScrollWindow( old_x - new_x, old_y - new_y ); - - AdjustScrollbars(); -} - -void wxScrollHelperBase::GetScrollPixelsPerUnit (int *x_unit, int *y_unit) const -{ - if ( x_unit ) - *x_unit = m_xScrollPixelsPerLine; - if ( y_unit ) - *y_unit = m_yScrollPixelsPerLine; -} - - -int wxScrollHelperBase::GetScrollLines( int orient ) const -{ - if ( orient == wxHORIZONTAL ) - return m_xScrollLines; - else - return m_yScrollLines; -} - -int wxScrollHelperBase::GetScrollPageSize(int orient) const -{ - if ( orient == wxHORIZONTAL ) - return m_xScrollLinesPerPage; - else - return m_yScrollLinesPerPage; -} - -void wxScrollHelperBase::SetScrollPageSize(int orient, int pageSize) -{ - if ( orient == wxHORIZONTAL ) - m_xScrollLinesPerPage = pageSize; - else - m_yScrollLinesPerPage = pageSize; -} - -void wxScrollHelperBase::EnableScrolling (bool x_scroll, bool y_scroll) -{ - m_xScrollingEnabled = x_scroll; - m_yScrollingEnabled = y_scroll; -} - -// Where the current view starts from -void wxScrollHelperBase::DoGetViewStart (int *x, int *y) const -{ - if ( x ) - *x = m_xScrollPosition; - if ( y ) - *y = m_yScrollPosition; -} - -void wxScrollHelperBase::DoCalcScrolledPosition(int x, int y, - int *xx, int *yy) const -{ - if ( xx ) - *xx = x - m_xScrollPosition * m_xScrollPixelsPerLine; - if ( yy ) - *yy = y - m_yScrollPosition * m_yScrollPixelsPerLine; -} - -void wxScrollHelperBase::DoCalcUnscrolledPosition(int x, int y, - int *xx, int *yy) const -{ - if ( xx ) - *xx = x + m_xScrollPosition * m_xScrollPixelsPerLine; - if ( yy ) - *yy = y + m_yScrollPosition * m_yScrollPixelsPerLine; -} - -// ---------------------------------------------------------------------------- -// geometry -// ---------------------------------------------------------------------------- - -bool wxScrollHelperBase::ScrollLayout() -{ - if ( m_win->GetSizer() && m_targetWindow == m_win ) - { - // If we're the scroll target, take into account the - // virtual size and scrolled position of the window. - - int x = 0, y = 0, w = 0, h = 0; - CalcScrolledPosition(0,0, &x,&y); - m_win->GetVirtualSize(&w, &h); - m_win->GetSizer()->SetDimension(x, y, w, h); - return true; - } - - // fall back to default for LayoutConstraints - return m_win->wxWindow::Layout(); -} - -void wxScrollHelperBase::ScrollDoSetVirtualSize(int x, int y) -{ - m_win->wxWindow::DoSetVirtualSize( x, y ); - AdjustScrollbars(); - - if (m_win->GetAutoLayout()) - m_win->Layout(); -} - -// wxWindow's GetBestVirtualSize returns the actual window size, -// whereas we want to return the virtual size -wxSize wxScrollHelperBase::ScrollGetBestVirtualSize() const -{ - wxSize clientSize(m_win->GetClientSize()); - if ( m_win->GetSizer() ) - clientSize.IncTo(m_win->GetSizer()->CalcMin()); - - return clientSize; -} - -// ---------------------------------------------------------------------------- -// event handlers -// ---------------------------------------------------------------------------- - -// Default OnSize resets scrollbars, if any -void wxScrollHelperBase::HandleOnSize(wxSizeEvent& WXUNUSED(event)) -{ - if ( m_targetWindow->GetAutoLayout() ) - { - wxSize size = m_targetWindow->GetBestVirtualSize(); - - // This will call ::Layout() and ::AdjustScrollbars() - m_win->SetVirtualSize( size ); - } - else - { - AdjustScrollbars(); - } -} - -// This calls OnDraw, having adjusted the origin according to the current -// scroll position -void wxAnyScrollHelperBase::HandleOnPaint(wxPaintEvent& WXUNUSED(event)) -{ - // don't use m_targetWindow here, this is always called for ourselves - wxPaintDC dc(m_win); - DoPrepareDC(dc); - - OnDraw(dc); -} - -// kbd handling: notice that we use OnChar() and not OnKeyDown() for -// compatibility here - if we used OnKeyDown(), the programs which process -// arrows themselves in their OnChar() would never get the message and like -// this they always have the priority -void wxAnyScrollHelperBase::HandleOnChar(wxKeyEvent& event) -{ - if ( !m_kbdScrollingEnabled ) - { - event.Skip(); - return; - } - - // prepare the event this key press maps to - wxScrollWinEvent newEvent; - - newEvent.SetPosition(0); - newEvent.SetEventObject(m_win); - newEvent.SetId(m_win->GetId()); - - // this is the default, it's changed to wxHORIZONTAL below if needed - newEvent.SetOrientation(wxVERTICAL); - - // some key events result in scrolling in both horizontal and vertical - // direction, e.g. Ctrl-{Home,End}, if this flag is true we should generate - // a second event in horizontal direction in addition to the primary one - bool sendHorizontalToo = false; - - switch ( event.GetKeyCode() ) - { - case WXK_PAGEUP: - newEvent.SetEventType(wxEVT_SCROLLWIN_PAGEUP); - break; - - case WXK_PAGEDOWN: - newEvent.SetEventType(wxEVT_SCROLLWIN_PAGEDOWN); - break; - - case WXK_HOME: - newEvent.SetEventType(wxEVT_SCROLLWIN_TOP); - - sendHorizontalToo = event.ControlDown(); - break; - - case WXK_END: - newEvent.SetEventType(wxEVT_SCROLLWIN_BOTTOM); - - sendHorizontalToo = event.ControlDown(); - break; - - case WXK_LEFT: - newEvent.SetOrientation(wxHORIZONTAL); - wxFALLTHROUGH; - - case WXK_UP: - newEvent.SetEventType(wxEVT_SCROLLWIN_LINEUP); - break; - - case WXK_RIGHT: - newEvent.SetOrientation(wxHORIZONTAL); - wxFALLTHROUGH; - - case WXK_DOWN: - newEvent.SetEventType(wxEVT_SCROLLWIN_LINEDOWN); - break; - - default: - // not a scrolling key - event.Skip(); - return; - } - - m_win->ProcessWindowEvent(newEvent); - - if ( sendHorizontalToo ) - { - newEvent.SetOrientation(wxHORIZONTAL); - m_win->ProcessWindowEvent(newEvent); - } -} - -// ---------------------------------------------------------------------------- -// autoscroll stuff: these functions deal with sending fake scroll events when -// a captured mouse is being held outside the window -// ---------------------------------------------------------------------------- - -bool wxScrollHelperBase::SendAutoScrollEvents(wxScrollWinEvent& event) const -{ - // only send the event if the window is scrollable in this direction - wxWindow *win = (wxWindow *)event.GetEventObject(); - return win->HasScrollbar(event.GetOrientation()); -} - -void wxScrollHelperBase::StopAutoScrolling() -{ -#if wxUSE_TIMER - wxDELETE(m_timerAutoScroll); -#endif -} - -void wxScrollHelperBase::HandleOnMouseEnter(wxMouseEvent& event) -{ - StopAutoScrolling(); - - event.Skip(); -} - -void wxScrollHelperBase::HandleOnMouseLeave(wxMouseEvent& event) -{ - // don't prevent the usual processing of the event from taking place - event.Skip(); - - // when a captured mouse leave a scrolled window we start generate - // scrolling events to allow, for example, extending selection beyond the - // visible area in some controls - if ( wxWindow::GetCapture() == m_targetWindow ) - { - // where is the mouse leaving? - int pos, orient; - wxPoint pt = event.GetPosition(); - if ( pt.x < 0 ) - { - orient = wxHORIZONTAL; - pos = 0; - } - else if ( pt.y < 0 ) - { - orient = wxVERTICAL; - pos = 0; - } - else // we're lower or to the right of the window - { - wxSize size = m_targetWindow->GetClientSize(); - if ( pt.x > size.x ) - { - orient = wxHORIZONTAL; - pos = m_xScrollLines; - } - else if ( pt.y > size.y ) - { - orient = wxVERTICAL; - pos = m_yScrollLines; - } - else // this should be impossible - { - // but seems to happen sometimes under wxMSW - maybe it's a bug - // there but for now just ignore it - - //wxFAIL_MSG( wxT("can't understand where has mouse gone") ); - - return; - } - } - - // only start the auto scroll timer if the window can be scrolled in - // this direction - if ( !m_targetWindow->HasScrollbar(orient) ) - return; - -#if wxUSE_TIMER - delete m_timerAutoScroll; - m_timerAutoScroll = new wxAutoScrollTimer - ( - m_targetWindow, this, - pos == 0 ? wxEVT_SCROLLWIN_LINEUP - : wxEVT_SCROLLWIN_LINEDOWN, - pos, - orient - ); - m_timerAutoScroll->Start(50); // FIXME: make configurable -#else - wxUnusedVar(pos); -#endif - } -} - -#if wxUSE_MOUSEWHEEL - -void wxScrollHelperBase::HandleOnMouseWheel(wxMouseEvent& event) -{ - m_wheelRotation += event.GetWheelRotation(); - int lines = m_wheelRotation / event.GetWheelDelta(); - m_wheelRotation -= lines * event.GetWheelDelta(); - - if (lines != 0) - { - - wxScrollWinEvent newEvent; - - newEvent.SetPosition(0); - newEvent.SetOrientation( event.GetWheelAxis() == 0 ? wxVERTICAL : wxHORIZONTAL); - newEvent.SetEventObject(m_win); - - if ( event.GetWheelAxis() == wxMOUSE_WHEEL_HORIZONTAL ) - lines = -lines; - - if (event.IsPageScroll()) - { - if (lines > 0) - newEvent.SetEventType(wxEVT_SCROLLWIN_PAGEUP); - else - newEvent.SetEventType(wxEVT_SCROLLWIN_PAGEDOWN); - - m_win->GetEventHandler()->ProcessEvent(newEvent); - } - else - { - lines *= event.GetLinesPerAction(); - if (lines > 0) - newEvent.SetEventType(wxEVT_SCROLLWIN_LINEUP); - else - newEvent.SetEventType(wxEVT_SCROLLWIN_LINEDOWN); - - int times = abs(lines); - for (; times > 0; times--) - m_win->GetEventHandler()->ProcessEvent(newEvent); - } - } -} - -#endif // wxUSE_MOUSEWHEEL - -void wxScrollHelperBase::HandleOnChildFocus(wxChildFocusEvent& event) -{ - // this event should be processed by all windows in parenthood chain, - // e.g. so that nested wxScrolledWindows work correctly - event.Skip(); - - // find the immediate child under which the window receiving focus is: - wxWindow *win = event.GetWindow(); - - if ( win == m_targetWindow ) - return; // nothing to do - -#if defined( __WXOSX__ ) && wxUSE_SCROLLBAR - if (wxDynamicCast(win, wxScrollBar)) - return; -#endif - - // Fixing ticket: http://trac.wxwidgets.org/ticket/9563 - // When a child inside a wxControlContainer receives a focus, the - // wxControlContainer generates an artificial wxChildFocusEvent for - // itself, telling its parent that 'it' received the focus. The effect is - // that this->HandleOnChildFocus is called twice, first with the - // artificial wxChildFocusEvent and then with the original event. We need - // to ignore the artificial event here or otherwise HandleOnChildFocus - // would first scroll the target window to make the entire - // wxControlContainer visible and immediately afterwards scroll the target - // window again to make the child widget visible. This leads to ugly - // flickering when using nested wxPanels/wxScrolledWindows. - // - // Ignore this event if 'win' is derived from wxControlContainer AND its - // parent is the m_targetWindow AND 'win' is not actually reciving the - // focus (win != FindFocus). TODO: This affects all wxControlContainer - // objects, but wxControlContainer is not part of the wxWidgets RTTI and - // so wxDynamicCast(win, wxControlContainer) does not compile. Find a way - // to determine if 'win' derives from wxControlContainer. Until then, - // testing if 'win' derives from wxPanel will probably get >90% of all - // cases. - - wxWindow *actual_focus=wxWindow::FindFocus(); - if (win != actual_focus && - wxDynamicCast(win, wxPanel) != 0 && - win->GetParent() == m_targetWindow) - // if win is a wxPanel and receives the focus, it should not be - // scrolled into view - return; - - const wxRect viewRect(m_targetWindow->GetClientRect()); - - // For composite controls such as wxComboCtrl we should try to fit the - // entire control inside the visible area of the target window, not just - // the focused child of the control. Otherwise we'd make only the textctrl - // part of a wxComboCtrl visible and the button would still be outside the - // scrolled area. But do so only if the parent fits *entirely* inside the - // scrolled window. In other situations, such as nested wxPanel or - // wxScrolledWindows, the parent might be way too big to fit inside the - // scrolled window. If that is the case, then make only the focused window - // visible - if ( win->GetParent() != m_targetWindow) - { - wxWindow *parent=win->GetParent(); - wxSize parent_size=parent->GetSize(); - if (parent_size.GetWidth() <= viewRect.GetWidth() && - parent_size.GetHeight() <= viewRect.GetHeight()) - // make the immediate parent visible instead of the focused control - win=parent; - } - - // make win position relative to the m_targetWindow viewing area instead of - // its parent - const wxRect - winRect(m_targetWindow->ScreenToClient(win->GetScreenPosition()), - win->GetSize()); - - // check if it's fully visible - if ( viewRect.Contains(winRect) ) - { - // it is, nothing to do - return; - } - - // check if we can make it fully visible: this is only possible if it's not - // larger than our view area - if ( winRect.GetWidth() > viewRect.GetWidth() || - winRect.GetHeight() > viewRect.GetHeight() ) - { - // we can't make it fit so avoid scrolling it at all, this is only - // going to be confusing and not helpful - return; - } - - - // do make the window fit inside the view area by scrolling to it - int stepx, stepy; - GetScrollPixelsPerUnit(&stepx, &stepy); - - int startx, starty; - GetViewStart(&startx, &starty); - - // first in vertical direction: - if ( stepy > 0 ) - { - int diff = 0; - - if ( winRect.GetTop() < 0 ) - { - diff = winRect.GetTop(); - } - else if ( winRect.GetBottom() > viewRect.GetHeight() ) - { - diff = winRect.GetBottom() - viewRect.GetHeight() + 1; - // round up to next scroll step if we can't get exact position, - // so that the window is fully visible: - diff += stepy - 1; - } - - starty = (starty * stepy + diff) / stepy; - } - - // then horizontal: - if ( stepx > 0 ) - { - int diff = 0; - - if ( winRect.GetLeft() < 0 ) - { - diff = winRect.GetLeft(); - } - else if ( winRect.GetRight() > viewRect.GetWidth() ) - { - diff = winRect.GetRight() - viewRect.GetWidth() + 1; - // round up to next scroll step if we can't get exact position, - // so that the window is fully visible: - diff += stepx - 1; - } - - startx = (startx * stepx + diff) / stepx; - } - - Scroll(startx, starty); -} - - -#ifdef wxHAS_GENERIC_SCROLLWIN - -// ---------------------------------------------------------------------------- -// wxScrollHelper implementation -// ---------------------------------------------------------------------------- - -wxScrollHelper::wxScrollHelper(wxWindow *winToScroll) - : wxScrollHelperBase(winToScroll) -{ - m_xVisibility = - m_yVisibility = wxSHOW_SB_DEFAULT; - m_adjustScrollFlagReentrancy = 0; -} - -bool wxScrollHelper::IsScrollbarShown(int orient) const -{ - wxScrollbarVisibility visibility = orient == wxHORIZONTAL ? m_xVisibility - : m_yVisibility; - - return visibility != wxSHOW_SB_NEVER; -} - -void wxScrollHelper::DoShowScrollbars(wxScrollbarVisibility horz, - wxScrollbarVisibility vert) -{ - if ( horz != m_xVisibility || vert != m_yVisibility ) - { - m_xVisibility = horz; - m_yVisibility = vert; - - AdjustScrollbars(); - } -} - -void -wxScrollHelper::DoAdjustScrollbar(int orient, - int clientSize, - int virtSize, - int pixelsPerUnit, - int& scrollUnits, - int& scrollPosition, - int& scrollLinesPerPage, - wxScrollbarVisibility visibility) -{ - // scroll lines per page: if 0, no scrolling is needed - // check if we need scrollbar in this direction at all - if ( pixelsPerUnit == 0 || clientSize >= virtSize ) - { - // scrolling is disabled or unnecessary - scrollUnits = - scrollPosition = 0; - scrollLinesPerPage = 0; - } - else // might need scrolling - { - // Round up integer division to catch any "leftover" client space. - scrollUnits = (virtSize + pixelsPerUnit - 1) / pixelsPerUnit; - - // Calculate the number of fully scroll units - scrollLinesPerPage = clientSize / pixelsPerUnit; - - if ( scrollLinesPerPage >= scrollUnits ) - { - // we're big enough to not need scrolling - scrollUnits = - scrollPosition = 0; - scrollLinesPerPage = 0; - } - else // we do need a scrollbar - { - if ( scrollLinesPerPage < 1 ) - scrollLinesPerPage = 1; - - // Correct position if greater than extent of canvas minus - // the visible portion of it or if below zero - const int posMax = scrollUnits - scrollLinesPerPage; - if ( scrollPosition > posMax ) - scrollPosition = posMax; - else if ( scrollPosition < 0 ) - scrollPosition = 0; - } - } - - // in wxSHOW_SB_NEVER case don't show the scrollbar even if it's needed, in - // wxSHOW_SB_ALWAYS case show the scrollbar even if it's not needed by - // passing a special range value to SetScrollbar() - int range; - switch ( visibility ) - { - case wxSHOW_SB_NEVER: - range = 0; - break; - - case wxSHOW_SB_ALWAYS: - range = scrollUnits ? scrollUnits : -1; - break; - - default: - wxFAIL_MSG( wxS("unknown scrollbar visibility") ); - wxFALLTHROUGH; - - case wxSHOW_SB_DEFAULT: - range = scrollUnits; - break; - - } - - m_win->SetScrollbar(orient, scrollPosition, scrollLinesPerPage, range); -} - -void wxScrollHelper::AdjustScrollbars() -{ - wxRecursionGuard guard(m_adjustScrollFlagReentrancy); - if ( guard.IsInside() ) - { - // don't reenter AdjustScrollbars() while another call to - // AdjustScrollbars() is in progress because this may lead to calling - // ScrollWindow() twice and this can really happen under MSW if - // SetScrollbar() call below adds or removes the scrollbar which - // changes the window size and hence results in another - // AdjustScrollbars() call - return; - } - - int oldXScroll = m_xScrollPosition; - int oldYScroll = m_yScrollPosition; - - // we may need to readjust the scrollbars several times as enabling one of - // them reduces the area available for the window contents and so can make - // the other scrollbar necessary now although it wasn't necessary before - // - // VZ: normally this loop should be over in at most 2 iterations, I don't - // know why do we need 5 of them - for ( int iterationCount = 0; iterationCount < 5; iterationCount++ ) - { - wxSize clientSize = GetTargetSize(); - const wxSize virtSize = m_targetWindow->GetVirtualSize(); - - // this block of code tries to work around the following problem: the - // window could have been just resized to have enough space to show its - // full contents without the scrollbars, but its client size could be - // not big enough because it does have the scrollbars right now and so - // the scrollbars would remain even though we don't need them any more - // - // to prevent this from happening, check if we have enough space for - // everything without the scrollbars and explicitly disable them then - const wxSize availSize = GetSizeAvailableForScrollTarget( - m_win->GetSize() - m_win->GetWindowBorderSize()); - if ( availSize != clientSize ) - { - if ( availSize.x >= virtSize.x && availSize.y >= virtSize.y ) - { - // this will be enough to make the scrollbars disappear below - // and then the client size will indeed become equal to the - // full available size - clientSize = availSize; - } - } - - - DoAdjustScrollbar(wxHORIZONTAL, - clientSize.x, - virtSize.x, - m_xScrollPixelsPerLine, - m_xScrollLines, - m_xScrollPosition, - m_xScrollLinesPerPage, - m_xVisibility); - - DoAdjustScrollbar(wxVERTICAL, - clientSize.y, - virtSize.y, - m_yScrollPixelsPerLine, - m_yScrollLines, - m_yScrollPosition, - m_yScrollLinesPerPage, - m_yVisibility); - - - // If a scrollbar (dis)appeared as a result of this, we need to adjust - // them again but if the client size didn't change, then we're done - if ( GetTargetSize() == clientSize ) - break; - } - -#ifdef __WXMOTIF__ - // Sorry, some Motif-specific code to implement a backing pixmap - // for the wxRETAINED style. Implementing a backing store can't - // be entirely generic because it relies on the wxWindowDC implementation - // to duplicate X drawing calls for the backing pixmap. - - if ( m_targetWindow->GetWindowStyle() & wxRETAINED ) - { - Display* dpy = XtDisplay((Widget)m_targetWindow->GetMainWidget()); - - int totalPixelWidth = m_xScrollLines * m_xScrollPixelsPerLine; - int totalPixelHeight = m_yScrollLines * m_yScrollPixelsPerLine; - if (m_targetWindow->GetBackingPixmap() && - !((m_targetWindow->GetPixmapWidth() == totalPixelWidth) && - (m_targetWindow->GetPixmapHeight() == totalPixelHeight))) - { - XFreePixmap (dpy, (Pixmap) m_targetWindow->GetBackingPixmap()); - m_targetWindow->SetBackingPixmap((WXPixmap) 0); - } - - if (!m_targetWindow->GetBackingPixmap() && - (m_xScrollLines != 0) && (m_yScrollLines != 0)) - { - int depth = wxDisplayDepth(); - m_targetWindow->SetPixmapWidth(totalPixelWidth); - m_targetWindow->SetPixmapHeight(totalPixelHeight); - m_targetWindow->SetBackingPixmap((WXPixmap) XCreatePixmap (dpy, RootWindow (dpy, DefaultScreen (dpy)), - m_targetWindow->GetPixmapWidth(), m_targetWindow->GetPixmapHeight(), depth)); - } - - } -#endif // Motif - - if (oldXScroll != m_xScrollPosition) - { - if (m_xScrollingEnabled) - m_targetWindow->ScrollWindow( m_xScrollPixelsPerLine * (oldXScroll - m_xScrollPosition), 0, - GetScrollRect() ); - else - m_targetWindow->Refresh(true, GetScrollRect()); - } - - if (oldYScroll != m_yScrollPosition) - { - if (m_yScrollingEnabled) - m_targetWindow->ScrollWindow( 0, m_yScrollPixelsPerLine * (oldYScroll-m_yScrollPosition), - GetScrollRect() ); - else - m_targetWindow->Refresh(true, GetScrollRect()); - } -} - -void wxScrollHelper::DoScroll( int x_pos, int y_pos ) -{ - if (!m_targetWindow) - return; - - if (((x_pos == -1) || (x_pos == m_xScrollPosition)) && - ((y_pos == -1) || (y_pos == m_yScrollPosition))) return; - - int w = 0, h = 0; - GetTargetSize(&w, &h); - - // compute new position: - int new_x = m_xScrollPosition; - int new_y = m_yScrollPosition; - - if ((x_pos != -1) && (m_xScrollPixelsPerLine)) - { - new_x = x_pos; - - // Calculate page size i.e. number of scroll units you get on the - // current client window - int noPagePositions = w/m_xScrollPixelsPerLine; - if (noPagePositions < 1) noPagePositions = 1; - - // Correct position if greater than extent of canvas minus - // the visible portion of it or if below zero - new_x = wxMin( m_xScrollLines-noPagePositions, new_x ); - new_x = wxMax( 0, new_x ); - } - if ((y_pos != -1) && (m_yScrollPixelsPerLine)) - { - new_y = y_pos; - - // Calculate page size i.e. number of scroll units you get on the - // current client window - int noPagePositions = h/m_yScrollPixelsPerLine; - if (noPagePositions < 1) noPagePositions = 1; - - // Correct position if greater than extent of canvas minus - // the visible portion of it or if below zero - new_y = wxMin( m_yScrollLines-noPagePositions, new_y ); - new_y = wxMax( 0, new_y ); - } - - if ( new_x == m_xScrollPosition && new_y == m_yScrollPosition ) - return; // nothing to do, the position didn't change - - // flush all pending repaints before we change m_{x,y}ScrollPosition, as - // otherwise invalidated area could be updated incorrectly later when - // ScrollWindow() makes sure they're repainted before scrolling them - m_targetWindow->Update(); - - // update the position and scroll the window now: - if (m_xScrollPosition != new_x) - { - int old_x = m_xScrollPosition; - m_xScrollPosition = new_x; - m_win->SetScrollPos( wxHORIZONTAL, new_x ); - m_targetWindow->ScrollWindow( (old_x-new_x)*m_xScrollPixelsPerLine, 0, - GetScrollRect() ); - } - - if (m_yScrollPosition != new_y) - { - int old_y = m_yScrollPosition; - m_yScrollPosition = new_y; - m_win->SetScrollPos( wxVERTICAL, new_y ); - m_targetWindow->ScrollWindow( 0, (old_y-new_y)*m_yScrollPixelsPerLine, - GetScrollRect() ); - } -} - -#endif // wxHAS_GENERIC_SCROLLWIN - -// ---------------------------------------------------------------------------- -// wxScrolled and wxScrolledWindow implementation -// ---------------------------------------------------------------------------- - -wxSize wxScrolledT_Helper::FilterBestSize(const wxWindow *win, - const wxScrollHelper *helper, - const wxSize& origBest) -{ - // NB: We don't do this in WX_FORWARD_TO_SCROLL_HELPER, because not - // all scrollable windows should behave like this, only those that - // contain children controls within scrollable area - // (i.e., wxScrolledWindow) and other some scrollable windows may - // have different DoGetBestSize() implementation (e.g. wxTreeCtrl). - - wxSize best = origBest; - - if ( win->GetAutoLayout() ) - { - // Only use the content to set the window size in the direction - // where there's no scrolling; otherwise we're going to get a huge - // window in the direction in which scrolling is enabled - int ppuX, ppuY; - helper->GetScrollPixelsPerUnit(&ppuX, &ppuY); - - // NB: This code used to use *current* size if min size wasn't - // specified, presumably to get some reasonable (i.e., larger than - // minimal) size. But that's a wrong thing to do in GetBestSize(), - // so we use minimal size as specified. If the app needs some - // minimal size for its scrolled window, it should set it and put - // the window into sizer as expandable so that it can use all space - // available to it. - // - // See also https://github.com/wxWidgets/wxWidgets/commit/7e0f7539 - - wxSize minSize = win->GetMinSize(); - - if ( ppuX > 0 ) - best.x = minSize.x + wxSystemSettings::GetMetric(wxSYS_VSCROLL_X); - - if ( ppuY > 0 ) - best.y = minSize.y + wxSystemSettings::GetMetric(wxSYS_HSCROLL_Y); - } - - return best; -} - -#ifdef __WXMSW__ -WXLRESULT wxScrolledT_Helper::FilterMSWWindowProc(WXUINT nMsg, WXLRESULT rc) -{ - // we need to process arrows ourselves for scrolling - if ( nMsg == WM_GETDLGCODE ) - { - rc |= DLGC_WANTARROWS; - } - return rc; -} -#endif // __WXMSW__ - -// NB: skipping wxScrolled in wxRTTI information because being a template, -// it doesn't and can't implement wxRTTI support -wxIMPLEMENT_DYNAMIC_CLASS(wxScrolledWindow, wxPanel); diff --git a/Externals/wxWidgets3/src/generic/selstore.cpp b/Externals/wxWidgets3/src/generic/selstore.cpp deleted file mode 100644 index af2dd12a41..0000000000 --- a/Externals/wxWidgets3/src/generic/selstore.cpp +++ /dev/null @@ -1,333 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/generic/selstore.cpp -// Purpose: wxSelectionStore implementation -// Author: Vadim Zeitlin -// Modified by: -// Created: 08.06.03 (extracted from src/generic/listctrl.cpp) -// Copyright: (c) 2000-2003 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include "wx/selstore.h" - -// ============================================================================ -// wxSelectionStore -// ============================================================================ - -const unsigned wxSelectionStore::NO_SELECTION = static_cast(-1); - -// ---------------------------------------------------------------------------- -// tests -// ---------------------------------------------------------------------------- - -bool wxSelectionStore::IsSelected(unsigned item) const -{ - bool isSel = m_itemsSel.Index(item) != wxNOT_FOUND; - - // if the default state is to be selected, being in m_itemsSel means that - // the item is not selected, so we have to inverse the logic - return m_defaultState ? !isSel : isSel; -} - -// ---------------------------------------------------------------------------- -// Select*() -// ---------------------------------------------------------------------------- - -bool wxSelectionStore::SelectItem(unsigned item, bool select) -{ - // search for the item ourselves as like this we get the index where to - // insert it later if needed, so we do only one search in the array instead - // of two (adding item to a sorted array requires a search) - size_t index = m_itemsSel.IndexForInsert(item); - bool isSel = index < m_itemsSel.GetCount() && m_itemsSel[index] == item; - - if ( select != m_defaultState ) - { - if ( !isSel ) - { - m_itemsSel.AddAt(item, index); - - return true; - } - } - else // reset to default state - { - if ( isSel ) - { - m_itemsSel.RemoveAt(index); - return true; - } - } - - return false; -} - -bool wxSelectionStore::SelectRange(unsigned itemFrom, unsigned itemTo, - bool select, - wxArrayInt *itemsChanged) -{ - // 100 is hardcoded but it shouldn't matter much: the important thing is - // that we don't refresh everything when really few (e.g. 1 or 2) items - // change state - static const unsigned MANY_ITEMS = 100; - - wxASSERT_MSG( itemFrom <= itemTo, wxT("should be in order") ); - - // are we going to have more [un]selected items than the other ones? - if ( itemTo - itemFrom > m_count/2 ) - { - if ( select != m_defaultState ) - { - // the default state now becomes the same as 'select' - m_defaultState = select; - - // so all the old selections (which had state select) shouldn't be - // selected any more, but all the other ones should - wxSelectedIndices selOld = m_itemsSel; - m_itemsSel.Empty(); - - // TODO: it should be possible to optimize the searches a bit - // knowing the possible range - - unsigned item; - for ( item = 0; item < itemFrom; item++ ) - { - if ( selOld.Index(item) == wxNOT_FOUND ) - m_itemsSel.Add(item); - } - - for ( item = itemTo + 1; item < m_count; item++ ) - { - if ( selOld.Index(item) == wxNOT_FOUND ) - m_itemsSel.Add(item); - } - - // many items (> half) changed state - itemsChanged = NULL; - } - else // select == m_defaultState - { - // get the inclusive range of items between itemFrom and itemTo - size_t count = m_itemsSel.GetCount(), - start = m_itemsSel.IndexForInsert(itemFrom), - end = m_itemsSel.IndexForInsert(itemTo); - - if ( start == count || m_itemsSel[start] < itemFrom ) - { - start++; - } - - if ( end == count || m_itemsSel[end] > itemTo ) - { - end--; - } - - if ( start <= end ) - { - // delete all of them (from end to avoid changing indices) - for ( int i = end; i >= (int)start; i-- ) - { - if ( itemsChanged ) - { - if ( itemsChanged->GetCount() > MANY_ITEMS ) - { - // stop counting (see comment below) - itemsChanged = NULL; - } - else - { - itemsChanged->Add(m_itemsSel[i]); - } - } - - m_itemsSel.RemoveAt(i); - } - } - } - } - else // "few" items change state - { - if ( itemsChanged ) - { - itemsChanged->Empty(); - } - - // just add the items to the selection - for ( unsigned item = itemFrom; item <= itemTo; item++ ) - { - if ( SelectItem(item, select) && itemsChanged ) - { - itemsChanged->Add(item); - - if ( itemsChanged->GetCount() > MANY_ITEMS ) - { - // stop counting them, we'll just eat gobs of memory - // for nothing at all - faster to refresh everything in - // this case - itemsChanged = NULL; - } - } - } - } - - // we set it to NULL if there are many items changing state - return itemsChanged != NULL; -} - -// ---------------------------------------------------------------------------- -// callbacks -// ---------------------------------------------------------------------------- - -void wxSelectionStore::OnItemsInserted(unsigned item, unsigned numItems) -{ - const size_t count = m_itemsSel.GetCount(); - - size_t idx = m_itemsSel.IndexForInsert(item); - - for ( size_t i = idx; i < count; i++ ) - { - m_itemsSel[i] += numItems; - } - - if ( m_defaultState ) - { - // All newly inserted items are not selected, so if the default state - // is to be selected, we need to manually add them to the deselected - // items indices. - for ( unsigned n = item; n < item + numItems; n++ ) - { - m_itemsSel.AddAt(item, idx++); - } - } - - m_count += numItems; -} - -void wxSelectionStore::OnItemDelete(unsigned item) -{ - size_t count = m_itemsSel.GetCount(), - i = m_itemsSel.IndexForInsert(item); - - if ( i < count && m_itemsSel[i] == item ) - { - // this item itself was in m_itemsSel, remove it from there - m_itemsSel.RemoveAt(i); - - count--; - } - - // and adjust the index of all which follow it - while ( i < count ) - { - // all following elements must be greater than the one we deleted - wxASSERT_MSG( m_itemsSel[i] > item, wxT("logic error") ); - - m_itemsSel[i++]--; - } - - m_count--; -} - -bool wxSelectionStore::OnItemsDeleted(unsigned item, unsigned numItems) -{ - bool anyDeletedInSelItems = false, - allDeletedInSelItems = true; - - size_t i = m_itemsSel.IndexForInsert(item); - - const unsigned firstAfterDeleted = item + numItems; - while ( i < m_itemsSel.size() ) - { - if ( m_itemsSel[i] < firstAfterDeleted ) - { - // This item is going to be deleted, so remove it from the - // selected indices entirely. Notice that we do not update i here - // as it now refers to the next element. - m_itemsSel.RemoveAt(i); - - anyDeletedInSelItems = true; - } - else - { - // This item remains, just update its index. - m_itemsSel[i++] -= numItems; - - allDeletedInSelItems = false; - } - } - - m_count -= numItems; - - return m_defaultState ? allDeletedInSelItems : anyDeletedInSelItems; -} - - -void wxSelectionStore::SetItemCount(unsigned count) -{ - // forget about all items whose indices are now invalid if the size - // decreased - if ( count < m_count ) - { - for ( size_t i = m_itemsSel.GetCount(); i > 0; i-- ) - { - if ( m_itemsSel[i - 1] >= count ) - m_itemsSel.RemoveAt(i - 1); - } - } - - // remember the new number of items - m_count = count; -} - -// ---------------------------------------------------------------------------- -// Iteration -// ---------------------------------------------------------------------------- - -unsigned wxSelectionStore::GetFirstSelectedItem(IterationState& cookie) const -{ - cookie = 0; - - return GetNextSelectedItem(cookie); -} - -unsigned wxSelectionStore::GetNextSelectedItem(IterationState& cookie) const -{ - if ( m_defaultState ) - { - // We have no choice but to iterate over all items in this case. It - // shouldn't be that bad in practice because (almost) all items are - // supposed to be selected if m_defaultState == true anyhow. - for ( unsigned item = cookie; ; item++ ) - { - if ( item >= m_count ) - return NO_SELECTION; - - if ( IsSelected(item) ) - { - cookie = item + 1; - return item; - } - } - } - else // Simple case when we directly have the selected items. - { - if ( cookie >= m_itemsSel.size() ) - return NO_SELECTION; - - return m_itemsSel[cookie++]; - } -} diff --git a/Externals/wxWidgets3/src/generic/spinctlg.cpp b/Externals/wxWidgets3/src/generic/spinctlg.cpp deleted file mode 100644 index f48ff32c2d..0000000000 --- a/Externals/wxWidgets3/src/generic/spinctlg.cpp +++ /dev/null @@ -1,706 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/generic/spinctlg.cpp -// Purpose: implements wxSpinCtrl as a composite control -// Author: Vadim Zeitlin -// Modified by: -// Created: 29.01.01 -// Copyright: (c) 2001 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#ifndef WX_PRECOMP - #include "wx/textctrl.h" -#endif //WX_PRECOMP - -#include "wx/spinctrl.h" -#include "wx/tooltip.h" - -#if wxUSE_SPINCTRL - -wxIMPLEMENT_DYNAMIC_CLASS(wxSpinDoubleEvent, wxNotifyEvent); - -// There are port-specific versions for the wxSpinCtrl, so exclude the -// contents of this file in those cases -#if !defined(wxHAS_NATIVE_SPINCTRL) || !defined(wxHAS_NATIVE_SPINCTRLDOUBLE) - -#include "wx/spinbutt.h" - -#if wxUSE_SPINBTN - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -// The margin between the text control and the spin: the value here is the same -// as the margin between the spin button and its "buddy" text control in wxMSW -// so the generic control looks similarly to the native one there, we might -// need to use different value for the other platforms (and maybe even -// determine it dynamically?). -static const wxCoord MARGIN = 1; - -#define SPINCTRLBUT_MAX 32000 // large to avoid wrap around trouble - -// ---------------------------------------------------------------------------- -// wxSpinCtrlTextGeneric: text control used by spin control -// ---------------------------------------------------------------------------- - -class wxSpinCtrlTextGeneric : public wxTextCtrl -{ -public: - wxSpinCtrlTextGeneric(wxSpinCtrlGenericBase *spin, const wxString& value, long style=0) - : wxTextCtrl(spin, wxID_ANY, value, wxDefaultPosition, wxDefaultSize, - // This is tricky: we want to honour any alignment flags - // but not wxALIGN_CENTER_VERTICAL because it's the same - // as wxTE_PASSWORD and we definitely don't want to show - // asterisks in spin control. - style & (wxALIGN_MASK | wxTE_PROCESS_ENTER) & ~wxTE_PASSWORD) - { - m_spin = spin; - - // remove the default minsize, the spinctrl will have one instead - SetSizeHints(wxDefaultCoord, wxDefaultCoord); - } - - virtual ~wxSpinCtrlTextGeneric() - { - // MSW sends extra kill focus event on destroy - if (m_spin) - m_spin->m_textCtrl = NULL; - - m_spin = NULL; - } - - void OnChar( wxKeyEvent &event ) - { - if ( !m_spin->ProcessWindowEvent(event) ) - event.Skip(); - } - - void OnTextEvent(wxCommandEvent& event) - { - wxCommandEvent eventCopy(event); - eventCopy.SetEventObject(m_spin); - eventCopy.SetId(m_spin->GetId()); - m_spin->ProcessWindowEvent(eventCopy); - } - - void OnKillFocus(wxFocusEvent& event) - { - if (m_spin) - m_spin->ProcessWindowEvent(event); - - event.Skip(); - } - - wxSpinCtrlGenericBase *m_spin; - -private: - wxDECLARE_EVENT_TABLE(); -}; - -wxBEGIN_EVENT_TABLE(wxSpinCtrlTextGeneric, wxTextCtrl) - EVT_CHAR(wxSpinCtrlTextGeneric::OnChar) - - // Forward the text events to wxSpinCtrl itself adjusting them slightly in - // the process. - EVT_TEXT(wxID_ANY, wxSpinCtrlTextGeneric::OnTextEvent) - - // And we need to forward this one too as wxSpinCtrl is supposed to - // generate it if wxTE_PROCESS_ENTER is used with it (and if it isn't, - // we're never going to get EVT_TEXT_ENTER in the first place). - EVT_TEXT_ENTER(wxID_ANY, wxSpinCtrlTextGeneric::OnTextEvent) - - EVT_KILL_FOCUS(wxSpinCtrlTextGeneric::OnKillFocus) -wxEND_EVENT_TABLE() - -// ---------------------------------------------------------------------------- -// wxSpinCtrlButtonGeneric: spin button used by spin control -// ---------------------------------------------------------------------------- - -class wxSpinCtrlButtonGeneric : public wxSpinButton -{ -public: - wxSpinCtrlButtonGeneric(wxSpinCtrlGenericBase *spin, int style) - : wxSpinButton(spin, wxID_ANY, wxDefaultPosition, - wxDefaultSize, style | wxSP_VERTICAL) - { - m_spin = spin; - - SetRange(-SPINCTRLBUT_MAX, SPINCTRLBUT_MAX); - - // remove the default minsize, the spinctrl will have one instead - SetSizeHints(wxDefaultCoord, wxDefaultCoord); - } - - void OnSpinButton(wxSpinEvent& event) - { - if (m_spin) - m_spin->OnSpinButton(event); - } - - wxSpinCtrlGenericBase *m_spin; - -private: - wxDECLARE_EVENT_TABLE(); -}; - -wxBEGIN_EVENT_TABLE(wxSpinCtrlButtonGeneric, wxSpinButton) - EVT_SPIN_UP( wxID_ANY, wxSpinCtrlButtonGeneric::OnSpinButton) - EVT_SPIN_DOWN(wxID_ANY, wxSpinCtrlButtonGeneric::OnSpinButton) -wxEND_EVENT_TABLE() - -// ============================================================================ -// wxSpinCtrlGenericBase -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxSpinCtrlGenericBase creation -// ---------------------------------------------------------------------------- - -void wxSpinCtrlGenericBase::Init() -{ - m_value = 0; - m_min = 0; - m_max = 100; - m_increment = 1; - m_snap_to_ticks = false; - - m_spin_value = 0; - - m_textCtrl = NULL; - m_spinButton = NULL; -} - -bool wxSpinCtrlGenericBase::Create(wxWindow *parent, - wxWindowID id, - const wxString& value, - const wxPoint& pos, const wxSize& size, - long style, - double min, double max, double initial, - double increment, - const wxString& name) -{ - // don't use borders for this control itself, it wouldn't look good with - // the text control borders (but we might want to use style border bits to - // select the text control style) - if ( !wxControl::Create(parent, id, wxDefaultPosition, wxDefaultSize, - (style & ~wxBORDER_MASK) | wxBORDER_NONE, - wxDefaultValidator, name) ) - { - return false; - } - - m_value = initial; - m_min = min; - m_max = max; - m_increment = increment; - - // the string value overrides the numeric one (for backwards compatibility - // reasons and also because it is simpler to specify the string value which - // comes much sooner in the list of arguments and leave the initial - // parameter unspecified) - if ( !value.empty() ) - { - double d; - if ( DoTextToValue(value, &d) ) - m_value = d; - } - - m_textCtrl = new wxSpinCtrlTextGeneric(this, DoValueToText(m_value), style); - m_spinButton = new wxSpinCtrlButtonGeneric(this, style); - -#if wxUSE_TOOLTIPS - m_textCtrl->SetToolTip(GetToolTipText()); - m_spinButton->SetToolTip(GetToolTipText()); -#endif // wxUSE_TOOLTIPS - - m_spin_value = m_spinButton->GetValue(); - - SetInitialSize(size); - Move(pos); - - return true; -} - -wxSpinCtrlGenericBase::~wxSpinCtrlGenericBase() -{ - // delete the controls now, don't leave them alive even though they would - // still be eventually deleted by our parent - but it will be too late, the - // user code expects them to be gone now - - if (m_textCtrl) - { - // null this since MSW sends KILL_FOCUS on deletion, see ~wxSpinCtrlTextGeneric - wxDynamicCast(m_textCtrl, wxSpinCtrlTextGeneric)->m_spin = NULL; - - wxSpinCtrlTextGeneric *text = (wxSpinCtrlTextGeneric*)m_textCtrl; - m_textCtrl = NULL; - delete text; - } - - wxDELETE(m_spinButton); -} - -wxWindowList wxSpinCtrlGenericBase::GetCompositeWindowParts() const -{ - wxWindowList parts; - parts.push_back(m_textCtrl); - parts.push_back(m_spinButton); - return parts; -} - -// ---------------------------------------------------------------------------- -// geometry -// ---------------------------------------------------------------------------- - -wxSize wxSpinCtrlGenericBase::DoGetBestSize() const -{ - return DoGetSizeFromTextSize(m_textCtrl->GetBestSize().x, -1); -} - -wxSize wxSpinCtrlGenericBase::DoGetSizeFromTextSize(int xlen, int ylen) const -{ - wxSize sizeBtn = m_spinButton->GetBestSize(); - wxSize totalS( m_textCtrl->GetBestSize() ); - - wxSize tsize(xlen + sizeBtn.x + MARGIN, totalS.y); -#if defined(__WXMSW__) - tsize.IncBy(4*totalS.y/10 + 4, 0); -#elif defined(__WXGTK__) - tsize.IncBy(totalS.y + 10, 0); -#endif // MSW GTK - - // Check if the user requested a non-standard height. - if ( ylen > 0 ) - tsize.IncBy(0, ylen - GetCharHeight()); - - return tsize; -} - -void wxSpinCtrlGenericBase::DoMoveWindow(int x, int y, int width, int height) -{ - wxControl::DoMoveWindow(x, y, width, height); - - // position the subcontrols inside the client area - wxSize sizeBtn = m_spinButton->GetSize(); - - wxCoord wText = width - sizeBtn.x - MARGIN; - m_textCtrl->SetSize(0, 0, wText, height); - m_spinButton->SetSize(0 + wText + MARGIN, 0, wxDefaultCoord, height); -} - -// ---------------------------------------------------------------------------- -// operations forwarded to the subcontrols -// ---------------------------------------------------------------------------- - -void wxSpinCtrlGenericBase::SetFocus() -{ - if ( m_textCtrl ) - m_textCtrl->SetFocus(); -} - -#ifdef __WXMSW__ - -void wxSpinCtrlGenericBase::DoEnable(bool enable) -{ - wxSpinCtrlBase::DoEnable(enable); -} - -#endif // __WXMSW__ - -bool wxSpinCtrlGenericBase::Enable(bool enable) -{ - if ( !wxSpinCtrlBase::Enable(enable) ) - return false; - - m_spinButton->Enable(enable); - m_textCtrl->Enable(enable); - - return true; -} - -bool wxSpinCtrlGenericBase::Show(bool show) -{ - if ( !wxControl::Show(show) ) - return false; - - // under GTK Show() is called the first time before we are fully - // constructed - if ( m_spinButton ) - { - m_spinButton->Show(show); - m_textCtrl->Show(show); - } - - return true; -} - - -bool wxSpinCtrlGenericBase::SetBackgroundColour(const wxColour& colour) -{ - // We need to provide this otherwise the entire composite window - // background and therefore the between component spaces - // will be changed. - if ( m_textCtrl ) - return m_textCtrl->SetBackgroundColour(colour); - - return true; -} - -// ---------------------------------------------------------------------------- -// Handle sub controls events -// ---------------------------------------------------------------------------- - -wxBEGIN_EVENT_TABLE(wxSpinCtrlGenericBase, wxSpinCtrlBase) - EVT_CHAR(wxSpinCtrlGenericBase::OnTextChar) - EVT_KILL_FOCUS(wxSpinCtrlGenericBase::OnTextLostFocus) -wxEND_EVENT_TABLE() - -void wxSpinCtrlGenericBase::OnSpinButton(wxSpinEvent& event) -{ - event.Skip(); - - // Pressing the spin button should also give the focus to the text part of - // the control, at least this is how the native control behaves under MSW. - SetFocus(); - - // Sync the textctrl since the user expects that the button will modify - // what they see in the textctrl. - SyncSpinToText(SendEvent_None); - - int spin_value = event.GetPosition(); - double step = (event.GetEventType() == wxEVT_SCROLL_LINEUP) ? 1 : -1; - - // Use the spinbutton's acceleration, if any, but not if wrapping around - if (((spin_value >= 0) && (m_spin_value >= 0)) || ((spin_value <= 0) && (m_spin_value <= 0))) - step *= abs(spin_value - m_spin_value); - - double value = AdjustToFitInRange(m_value + step*m_increment); - - // Ignore the edges when it wraps since the up/down event may be opposite - // They are in GTK and Mac - if (abs(spin_value - m_spin_value) > SPINCTRLBUT_MAX) - { - m_spin_value = spin_value; - return; - } - - m_spin_value = spin_value; - - // Notify about the change in wxTextCtrl too. - if ( DoSetValue(value, SendEvent_Text) ) - DoSendEvent(); -} - -void wxSpinCtrlGenericBase::OnTextLostFocus(wxFocusEvent& event) -{ - SyncSpinToText(SendEvent_Text); - DoSendEvent(); - - event.Skip(); -} - -void wxSpinCtrlGenericBase::OnTextChar(wxKeyEvent& event) -{ - if ( !HasFlag(wxSP_ARROW_KEYS) ) - { - event.Skip(); - return; - } - - double value = m_value; - switch ( event.GetKeyCode() ) - { - case WXK_UP : - value += m_increment; - break; - - case WXK_DOWN : - value -= m_increment; - break; - - case WXK_PAGEUP : - value += m_increment * 10.0; - break; - - case WXK_PAGEDOWN : - value -= m_increment * 10.0; - break; - - default: - event.Skip(); - return; - } - - value = AdjustToFitInRange(value); - - SyncSpinToText(SendEvent_None); - - // No need to send event, it was already generated by wxTextCtrl itself. - if ( DoSetValue(value, SendEvent_None) ) - DoSendEvent(); -} - -// ---------------------------------------------------------------------------- -// Textctrl functions -// ---------------------------------------------------------------------------- - -bool wxSpinCtrlGenericBase::SyncSpinToText(SendEvent sendEvent) -{ - if ( !m_textCtrl || !m_textCtrl->IsModified() ) - return false; - - double textValue; - if ( DoTextToValue(m_textCtrl->GetValue(), &textValue) ) - { - if (textValue > m_max) - textValue = m_max; - else if (textValue < m_min) - textValue = m_min; - } - else // text contents is not a valid number at all - { - // replace its contents with the last valid value - textValue = m_value; - } - - // we must always set the value here, even if it's equal to m_value, as - // otherwise we could be left with an out of range value when leaving the - // text control and the current value is already m_max for example - return DoSetValue(textValue, sendEvent); -} - -// ---------------------------------------------------------------------------- -// changing value and range -// ---------------------------------------------------------------------------- - -void wxSpinCtrlGenericBase::SetValue(const wxString& text) -{ - wxCHECK_RET( m_textCtrl, wxT("invalid call to wxSpinCtrl::SetValue") ); - - double val; - if ( DoTextToValue(text, &val) && InRange(val) ) - { - DoSetValue(val, SendEvent_None); - } - else // not a number at all or out of range - { - m_textCtrl->ChangeValue(text); - m_textCtrl->SelectAll(); - } -} - -bool wxSpinCtrlGenericBase::DoSetValue(double val, SendEvent sendEvent) -{ - wxCHECK_MSG( m_textCtrl, false, wxT("invalid call to wxSpinCtrl::SetValue") ); - - if ( val < m_min ) - val = m_min; - if ( val > m_max ) - val = m_max; - - if ( m_snap_to_ticks && (m_increment != 0) ) - { - double snap_value = val / m_increment; - - if (wxFinite(snap_value)) // FIXME what to do about a failure? - { - if ((snap_value - floor(snap_value)) < (ceil(snap_value) - snap_value)) - val = floor(snap_value) * m_increment; - else - val = ceil(snap_value) * m_increment; - } - } - - wxString str(DoValueToText(val)); - - if ((val != m_value) || (str != m_textCtrl->GetValue())) - { - if ( !DoTextToValue(str, &m_value ) ) // wysiwyg for textctrl - m_value = val; - - switch ( sendEvent ) - { - case SendEvent_None: - m_textCtrl->ChangeValue(str); - break; - - case SendEvent_Text: - m_textCtrl->SetValue(str); - break; - } - - m_textCtrl->SelectAll(); - m_textCtrl->DiscardEdits(); - return true; - } - - return false; -} - -double wxSpinCtrlGenericBase::AdjustToFitInRange(double value) const -{ - if (value < m_min) - value = HasFlag(wxSP_WRAP) ? m_max : m_min; - if (value > m_max) - value = HasFlag(wxSP_WRAP) ? m_min : m_max; - - return value; -} - -void wxSpinCtrlGenericBase::DoSetRange(double min, double max) -{ - m_min = min; - if ( m_value < m_min ) - DoSetValue(m_min, SendEvent_None); - m_max = max; - if ( m_value > m_max ) - DoSetValue(m_max, SendEvent_None); -} - -void wxSpinCtrlGenericBase::DoSetIncrement(double inc) -{ - m_increment = inc; -} - -void wxSpinCtrlGenericBase::SetSnapToTicks(bool snap_to_ticks) -{ - m_snap_to_ticks = snap_to_ticks; - DoSetValue(m_value, SendEvent_None); -} - -void wxSpinCtrlGenericBase::SetSelection(long from, long to) -{ - wxCHECK_RET( m_textCtrl, wxT("invalid call to wxSpinCtrl::SetSelection") ); - - m_textCtrl->SetSelection(from, to); -} - -#ifndef wxHAS_NATIVE_SPINCTRL - -//----------------------------------------------------------------------------- -// wxSpinCtrl -//----------------------------------------------------------------------------- - -bool wxSpinCtrl::SetBase(int base) -{ - // Currently we only support base 10 and 16. We could add support for base - // 8 quite easily but wxMSW doesn't support it natively so don't bother. - if ( base != 10 && base != 16 ) - return false; - - if ( base == m_base ) - return true; - - // Update the current control contents to show in the new base: be careful - // to call DoTextToValue() before changing the base... - double val; - const bool hasValidVal = DoTextToValue(m_textCtrl->GetValue(), &val); - - m_base = base; - - // ... but DoValueToText() after doing it. - if ( hasValidVal ) - m_textCtrl->ChangeValue(DoValueToText(val)); - - return true; -} - -void wxSpinCtrl::DoSendEvent() -{ - wxSpinEvent event( wxEVT_SPINCTRL, GetId()); - event.SetEventObject( this ); - event.SetPosition((int)(m_value + 0.5)); // FIXME should be SetValue - event.SetString(m_textCtrl->GetValue()); - GetEventHandler()->ProcessEvent( event ); -} - -bool wxSpinCtrl::DoTextToValue(const wxString& text, double *val) -{ - long lval; - if ( !text.ToLong(&lval, GetBase()) ) - return false; - - *val = static_cast(lval); - - return true; -} - -wxString wxSpinCtrl::DoValueToText(double val) -{ - switch ( GetBase() ) - { - case 16: - return wxPrivate::wxSpinCtrlFormatAsHex(static_cast(val), - GetMax()); - - default: - wxFAIL_MSG( wxS("Unsupported spin control base") ); - wxFALLTHROUGH; - - case 10: - return wxString::Format("%ld", static_cast(val)); - } -} - -#endif // !wxHAS_NATIVE_SPINCTRL - -//----------------------------------------------------------------------------- -// wxSpinCtrlDouble -//----------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxSpinCtrlDouble, wxSpinCtrlGenericBase); - -void wxSpinCtrlDouble::DoSendEvent() -{ - wxSpinDoubleEvent event( wxEVT_SPINCTRLDOUBLE, GetId()); - event.SetEventObject( this ); - event.SetValue(m_value); - event.SetString(m_textCtrl->GetValue()); - GetEventHandler()->ProcessEvent( event ); -} - -bool wxSpinCtrlDouble::DoTextToValue(const wxString& text, double *val) -{ - return text.ToDouble(val); -} - -wxString wxSpinCtrlDouble::DoValueToText(double val) -{ - return wxString::Format(m_format, val); -} - -void wxSpinCtrlDouble::SetDigits(unsigned digits) -{ - wxCHECK_RET( digits <= 20, "too many digits for wxSpinCtrlDouble" ); - - if ( digits == m_digits ) - return; - - m_digits = digits; - - m_format.Printf(wxT("%%0.%ulf"), digits); - - DoSetValue(m_value, SendEvent_None); -} - -#endif // wxUSE_SPINBTN - -#endif // !wxPort-with-native-spinctrl - -#endif // wxUSE_SPINCTRL diff --git a/Externals/wxWidgets3/src/generic/splash.cpp b/Externals/wxWidgets3/src/generic/splash.cpp deleted file mode 100644 index 9d52d9aad4..0000000000 --- a/Externals/wxWidgets3/src/generic/splash.cpp +++ /dev/null @@ -1,212 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/generic/splash.cpp -// Purpose: wxSplashScreen class -// Author: Julian Smart -// Modified by: -// Created: 28/6/2000 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx/wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_SPLASH - -#ifdef __WXGTK20__ - #include -#endif - -#include "wx/splash.h" - -#ifndef WX_PRECOMP - #include "wx/dcmemory.h" - #include "wx/dcclient.h" -#endif - - -// ---------------------------------------------------------------------------- -// wxSplashScreen -// ---------------------------------------------------------------------------- - -#define wxSPLASH_TIMER_ID 9999 - -wxIMPLEMENT_DYNAMIC_CLASS(wxSplashScreen, wxFrame); -wxBEGIN_EVENT_TABLE(wxSplashScreen, wxFrame) - EVT_TIMER(wxSPLASH_TIMER_ID, wxSplashScreen::OnNotify) - EVT_CLOSE(wxSplashScreen::OnCloseWindow) -wxEND_EVENT_TABLE() - -void wxSplashScreen::Init() -{ - m_window = NULL; - - wxEvtHandler::AddFilter(this); -} - -/* Note that unless we pass a non-default size to the frame, SetClientSize - * won't work properly under Windows, and the splash screen frame is sized - * slightly too small. - */ - -wxSplashScreen::wxSplashScreen(const wxBitmap& bitmap, long splashStyle, int milliseconds, - wxWindow* parent, wxWindowID id, const wxPoint& pos, - const wxSize& size, long style) - : wxFrame(parent, id, wxEmptyString, wxPoint(0,0), wxSize(100, 100), - style | wxFRAME_TOOL_WINDOW | wxFRAME_NO_TASKBAR) -{ - Init(); - - // splash screen must not be used as parent by the other windows because it - // is going to disappear soon, indicate it by giving it this special style - SetExtraStyle(GetExtraStyle() | wxWS_EX_TRANSIENT); - -#if defined(__WXGTK20__) - gtk_window_set_type_hint(GTK_WINDOW(m_widget), - GDK_WINDOW_TYPE_HINT_SPLASHSCREEN); -#endif - - m_splashStyle = splashStyle; - m_milliseconds = milliseconds; - - m_window = new wxSplashScreenWindow(bitmap, this, wxID_ANY, pos, size, wxNO_BORDER); - - SetClientSize(bitmap.GetWidth(), bitmap.GetHeight()); - - if (m_splashStyle & wxSPLASH_CENTRE_ON_PARENT) - CentreOnParent(); - else if (m_splashStyle & wxSPLASH_CENTRE_ON_SCREEN) - CentreOnScreen(); - - if (m_splashStyle & wxSPLASH_TIMEOUT) - { - m_timer.SetOwner(this, wxSPLASH_TIMER_ID); - m_timer.Start(milliseconds, true); - } - - Show(true); - m_window->SetFocus(); -#if defined( __WXMSW__ ) || defined(__WXMAC__) - Update(); // Without this, you see a blank screen for an instant -#elif defined(__WXGTK20__) - // we don't need to do anything at least on wxGTK with GTK+ 2.12.9 -#else - wxYieldIfNeeded(); // Should eliminate this -#endif -} - -wxSplashScreen::~wxSplashScreen() -{ - m_timer.Stop(); - - wxEvtHandler::RemoveFilter(this); -} - -int wxSplashScreen::FilterEvent(wxEvent& event) -{ - const wxEventType t = event.GetEventType(); - if ( t == wxEVT_KEY_DOWN || - t == wxEVT_LEFT_DOWN || - t == wxEVT_RIGHT_DOWN || - t == wxEVT_MIDDLE_DOWN ) - Close(true); - - return -1; -} - -void wxSplashScreen::OnNotify(wxTimerEvent& WXUNUSED(event)) -{ - Close(true); -} - -void wxSplashScreen::OnCloseWindow(wxCloseEvent& WXUNUSED(event)) -{ - m_timer.Stop(); - this->Destroy(); -} - -// ---------------------------------------------------------------------------- -// wxSplashScreenWindow -// ---------------------------------------------------------------------------- - -wxBEGIN_EVENT_TABLE(wxSplashScreenWindow, wxWindow) -#ifdef __WXGTK__ - EVT_PAINT(wxSplashScreenWindow::OnPaint) -#endif - EVT_ERASE_BACKGROUND(wxSplashScreenWindow::OnEraseBackground) -wxEND_EVENT_TABLE() - -wxSplashScreenWindow::wxSplashScreenWindow(const wxBitmap& bitmap, wxWindow* parent, - wxWindowID id, const wxPoint& pos, - const wxSize& size, long style) - : wxWindow(parent, id, pos, size, style) -{ - m_bitmap = bitmap; - -#if !defined(__WXGTK__) && wxUSE_PALETTE - bool hiColour = (wxDisplayDepth() >= 16) ; - - if (bitmap.GetPalette() && !hiColour) - { - SetPalette(* bitmap.GetPalette()); - } -#endif -} - -// VZ: why don't we do it under wxGTK? -#if !defined(__WXGTK__) && wxUSE_PALETTE - #define USE_PALETTE_IN_SPLASH -#endif - -static void wxDrawSplashBitmap(wxDC& dc, const wxBitmap& bitmap, int WXUNUSED(x), int WXUNUSED(y)) -{ - wxMemoryDC dcMem; - -#ifdef USE_PALETTE_IN_SPLASH - bool hiColour = (wxDisplayDepth() >= 16) ; - - if (bitmap.GetPalette() && !hiColour) - { - dcMem.SetPalette(* bitmap.GetPalette()); - } -#endif // USE_PALETTE_IN_SPLASH - - dcMem.SelectObjectAsSource(bitmap); - dc.Blit(0, 0, bitmap.GetWidth(), bitmap.GetHeight(), &dcMem, 0, 0, wxCOPY, - true /* use mask */); - dcMem.SelectObject(wxNullBitmap); - -#ifdef USE_PALETTE_IN_SPLASH - if (bitmap.GetPalette() && !hiColour) - { - dcMem.SetPalette(wxNullPalette); - } -#endif // USE_PALETTE_IN_SPLASH -} - -void wxSplashScreenWindow::OnPaint(wxPaintEvent& WXUNUSED(event)) -{ - wxPaintDC dc(this); - if (m_bitmap.IsOk()) - wxDrawSplashBitmap(dc, m_bitmap, 0, 0); -} - -void wxSplashScreenWindow::OnEraseBackground(wxEraseEvent& event) -{ - if (event.GetDC() && m_bitmap.IsOk()) - { - wxDrawSplashBitmap(* event.GetDC(), m_bitmap, 0, 0); - } - else - { - wxClientDC dc(this); - if (m_bitmap.IsOk()) - wxDrawSplashBitmap(dc, m_bitmap, 0, 0); - } -} - -#endif // wxUSE_SPLASH diff --git a/Externals/wxWidgets3/src/generic/splitter.cpp b/Externals/wxWidgets3/src/generic/splitter.cpp deleted file mode 100644 index cae9e6c5ae..0000000000 --- a/Externals/wxWidgets3/src/generic/splitter.cpp +++ /dev/null @@ -1,1058 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/generic/splitter.cpp -// Purpose: wxSplitterWindow implementation -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_SPLITTER - -#include "wx/splitter.h" - -#ifndef WX_PRECOMP - #include "wx/string.h" - #include "wx/utils.h" - #include "wx/log.h" - - #include "wx/dcclient.h" - #include "wx/dcscreen.h" - - #include "wx/window.h" - #include "wx/dialog.h" - #include "wx/frame.h" - - #include "wx/settings.h" -#endif - -#include "wx/renderer.h" - -#include - -wxDEFINE_EVENT( wxEVT_SPLITTER_SASH_POS_CHANGED, wxSplitterEvent ); -wxDEFINE_EVENT( wxEVT_SPLITTER_SASH_POS_CHANGING, wxSplitterEvent ); -wxDEFINE_EVENT( wxEVT_SPLITTER_DOUBLECLICKED, wxSplitterEvent ); -wxDEFINE_EVENT( wxEVT_SPLITTER_UNSPLIT, wxSplitterEvent ); - -wxIMPLEMENT_DYNAMIC_CLASS(wxSplitterWindow, wxWindow); - -/* - TODO PROPERTIES - style wxSP_3D - sashpos (long , 0 ) - minsize (long -1 ) - object, object_ref - orientation -*/ - -wxIMPLEMENT_DYNAMIC_CLASS(wxSplitterEvent, wxNotifyEvent); - -wxBEGIN_EVENT_TABLE(wxSplitterWindow, wxWindow) - EVT_PAINT(wxSplitterWindow::OnPaint) - EVT_SIZE(wxSplitterWindow::OnSize) - EVT_MOUSE_EVENTS(wxSplitterWindow::OnMouseEvent) - EVT_MOUSE_CAPTURE_LOST(wxSplitterWindow::OnMouseCaptureLost) - -#if defined( __WXMSW__ ) || defined( __WXMAC__) - EVT_SET_CURSOR(wxSplitterWindow::OnSetCursor) -#endif // wxMSW -wxEND_EVENT_TABLE() - -static bool IsLive(wxSplitterWindow* wnd) -{ - // with wxSP_LIVE_UPDATE style the splitter windows are always resized - // following the mouse movement while it drags the sash, without it we only - // draw the sash at the new position but only resize the windows when the - // dragging is finished -#if defined( __WXMAC__ ) && defined(TARGET_API_MAC_OSX) && TARGET_API_MAC_OSX == 1 - return true; // Mac can't paint outside paint event - always need live mode -#else - return wnd->HasFlag(wxSP_LIVE_UPDATE); -#endif -} - -bool wxSplitterWindow::Create(wxWindow *parent, wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) -{ - // allow TABbing from one window to the other - style |= wxTAB_TRAVERSAL; - - if ( !wxWindow::Create(parent, id, pos, size, style, name) ) - return false; - - m_lastSize = GetClientSize(); - - m_permitUnsplitAlways = (style & wxSP_PERMIT_UNSPLIT) != 0; - - // FIXME: with this line the background is not erased at all under GTK1, - // so temporary avoid it there -#if !defined(__WXGTK__) || defined(__WXGTK20__) - // don't erase the splitter background, it's pointless as we overwrite it - // anyhow - SetBackgroundStyle(wxBG_STYLE_CUSTOM); -#endif - - return true; -} - -void wxSplitterWindow::Init() -{ - m_splitMode = wxSPLIT_VERTICAL; - m_permitUnsplitAlways = true; - m_windowOne = NULL; - m_windowTwo = NULL; - m_dragMode = wxSPLIT_DRAG_NONE; - m_oldX = 0; - m_oldY = 0; - m_sashStart = 0; - m_sashPosition = 0; - m_requestedSashPosition = INT_MAX; - m_sashGravity = 0.0; - m_lastSize = wxSize(0,0); - m_minimumPaneSize = 0; - m_sashCursorWE = wxCursor(wxCURSOR_SIZEWE); - m_sashCursorNS = wxCursor(wxCURSOR_SIZENS); - m_sashTrackerPen = new wxPen(*wxBLACK, 2, wxPENSTYLE_SOLID); - - m_needUpdating = false; - m_isHot = false; -} - -wxSplitterWindow::~wxSplitterWindow() -{ - delete m_sashTrackerPen; -} - -// ---------------------------------------------------------------------------- -// entering/leaving sash -// ---------------------------------------------------------------------------- - -void wxSplitterWindow::RedrawIfHotSensitive(bool isHot) -{ - if ( wxRendererNative::Get().GetSplitterParams(this).isHotSensitive ) - { - m_isHot = isHot; - - wxClientDC dc(this); - DrawSash(dc); - } - //else: we don't change our appearance, don't redraw to avoid flicker -} - -void wxSplitterWindow::OnEnterSash() -{ - SetResizeCursor(); - - RedrawIfHotSensitive(true); -} - -void wxSplitterWindow::OnLeaveSash() -{ - SetCursor(*wxSTANDARD_CURSOR); - - RedrawIfHotSensitive(false); -} - -void wxSplitterWindow::SetResizeCursor() -{ - SetCursor(m_splitMode == wxSPLIT_VERTICAL ? m_sashCursorWE - : m_sashCursorNS); -} - -// ---------------------------------------------------------------------------- -// other event handlers -// ---------------------------------------------------------------------------- - -void wxSplitterWindow::OnPaint(wxPaintEvent& WXUNUSED(event)) -{ - wxPaintDC dc(this); -#ifdef __WXOSX__ - // as subpanels might have a transparent background we must erase the background - // at least on OSX, otherwise traces of the sash will remain - // test with: splitter sample->replace right window - dc.Clear(); -#endif - - DrawSash(dc); -} - -void wxSplitterWindow::OnInternalIdle() -{ - wxWindow::OnInternalIdle(); - - // We may need to update the children sizes if we're in the middle of - // a live update as indicated by m_needUpdating. The other possible case, - // when we have a requested but not yet set sash position (as indicated - // by m_requestedSashPosition having a valid value) is handled by OnSize. - if ( m_needUpdating ) - { - m_needUpdating = false; - SizeWindows(); - } -} - -void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event) -{ - int x = (int)event.GetX(), - y = (int)event.GetY(); - - if ( GetWindowStyle() & wxSP_NOSASH ) - { - event.Skip(); - return; - } - - bool isLive = IsLive(this); - - if (event.LeftDown()) - { - if ( SashHitTest(x, y) ) - { - // Start the drag now - m_dragMode = wxSPLIT_DRAG_DRAGGING; - - // Capture mouse and set the cursor - CaptureMouse(); - SetResizeCursor(); - - if ( !isLive ) - { - // remember the initial sash position and draw the initial - // shadow sash - m_sashPositionCurrent = m_sashPosition; - - m_oldX = (m_splitMode == wxSPLIT_VERTICAL ? m_sashPositionCurrent : x); - m_oldY = (m_splitMode != wxSPLIT_VERTICAL ? m_sashPositionCurrent : y); - DrawSashTracker(m_oldX, m_oldY); - } - - m_ptStart = wxPoint(x,y); - m_sashStart = m_sashPosition; - return; - } - } - else if (event.LeftUp() && m_dragMode == wxSPLIT_DRAG_DRAGGING) - { - // We can stop dragging now and see what we've got. - m_dragMode = wxSPLIT_DRAG_NONE; - - // Release mouse and unset the cursor - ReleaseMouse(); - SetCursor(* wxSTANDARD_CURSOR); - - // exit if unsplit after doubleclick - if ( !IsSplit() ) - { - return; - } - - // Erase old tracker - if ( !isLive ) - { - DrawSashTracker(m_oldX, m_oldY); - } - - // the position of the click doesn't exactly correspond to - // m_sashPosition, rather it changes it by the distance by which the - // mouse has moved - int diff = m_splitMode == wxSPLIT_VERTICAL ? x - m_ptStart.x : y - m_ptStart.y; - - int posSashNew = OnSashPositionChanging(m_sashStart + diff); - if ( posSashNew == -1 ) - { - // change not allowed - return; - } - - if ( m_permitUnsplitAlways || m_minimumPaneSize == 0 ) - { - // Deal with possible unsplit scenarios - if ( posSashNew == 0 ) - { - // We remove the first window from the view - wxWindow *removedWindow = m_windowOne; - m_windowOne = m_windowTwo; - m_windowTwo = NULL; - OnUnsplit(removedWindow); - wxSplitterEvent eventUnsplit(wxEVT_SPLITTER_UNSPLIT, this); - eventUnsplit.m_data.win = removedWindow; - (void)DoSendEvent(eventUnsplit); - SetSashPositionAndNotify(0); - } - else if ( posSashNew == GetWindowSize() ) - { - // We remove the second window from the view - wxWindow *removedWindow = m_windowTwo; - m_windowTwo = NULL; - OnUnsplit(removedWindow); - wxSplitterEvent eventUnsplit(wxEVT_SPLITTER_UNSPLIT, this); - eventUnsplit.m_data.win = removedWindow; - (void)DoSendEvent(eventUnsplit); - SetSashPositionAndNotify(0); - } - else - { - SetSashPositionAndNotify(posSashNew); - } - } - else - { - SetSashPositionAndNotify(posSashNew); - } - - SizeWindows(); - } // left up && dragging - else if ((event.Moving() || event.Leaving() || event.Entering()) && (m_dragMode == wxSPLIT_DRAG_NONE)) - { - if ( event.Leaving() || !SashHitTest(x, y) ) - OnLeaveSash(); - else - OnEnterSash(); - } - else if (event.Dragging() && (m_dragMode == wxSPLIT_DRAG_DRAGGING)) - { - int diff = m_splitMode == wxSPLIT_VERTICAL ? x - m_ptStart.x : y - m_ptStart.y; - - int posSashNew = OnSashPositionChanging(m_sashStart + diff); - if ( posSashNew == -1 ) - { - // change not allowed - return; - } - - if ( !isLive ) - { - if ( posSashNew == m_sashPositionCurrent ) - return; - - m_sashPositionCurrent = posSashNew; - - // Erase old tracker - DrawSashTracker(m_oldX, m_oldY); - - m_oldX = (m_splitMode == wxSPLIT_VERTICAL ? m_sashPositionCurrent : x); - m_oldY = (m_splitMode != wxSPLIT_VERTICAL ? m_sashPositionCurrent : y); - -#ifdef __WXMSW__ - // As we captured the mouse, we may get the mouse events from outside - // our window - for example, negative values in x, y. This has a weird - // consequence under MSW where we use unsigned values sometimes and - // signed ones other times: the coordinates turn as big positive - // numbers and so the sash is drawn on the *right* side of the window - // instead of the left (or bottom instead of top). Correct this. - if ( (short)m_oldX < 0 ) - m_oldX = 0; - if ( (short)m_oldY < 0 ) - m_oldY = 0; -#endif // __WXMSW__ - - // Draw new one - DrawSashTracker(m_oldX, m_oldY); - } - else - { - if ( posSashNew == m_sashPosition ) - return; - - DoSetSashPosition(posSashNew); - - // in live mode, the new position is the actual sash position, clear requested position! - m_requestedSashPosition = INT_MAX; - m_needUpdating = true; - } - } - else if ( event.LeftDClick() && m_windowTwo ) - { - OnDoubleClickSash(x, y); - } - else - { - event.Skip(); - } -} - -void wxSplitterWindow::OnMouseCaptureLost(wxMouseCaptureLostEvent& WXUNUSED(event)) -{ - if (m_dragMode != wxSPLIT_DRAG_DRAGGING) - return; - - m_dragMode = wxSPLIT_DRAG_NONE; - - SetCursor(* wxSTANDARD_CURSOR); - - // Erase old tracker - if ( !IsLive(this) ) - { - DrawSashTracker(m_oldX, m_oldY); - } -} - -void wxSplitterWindow::OnSize(wxSizeEvent& event) -{ - // only process this message if we're not iconized - otherwise iconizing - // and restoring a window containing the splitter has a funny side effect - // of changing the splitter position! - wxWindow *parent = wxGetTopLevelParent(this); - bool iconized; - - wxTopLevelWindow *winTop = wxDynamicCast(parent, wxTopLevelWindow); - if ( winTop ) - { - iconized = winTop->IsIconized(); - } - else - { - wxFAIL_MSG(wxT("should have a top level parent!")); - - iconized = false; - } - - if ( iconized ) - { - m_lastSize = wxSize(0,0); - - event.Skip(); - - return; - } - - const wxSize curSize = event.GetSize(); - - // Update the sash position if needed. - // - // Notice that we shouldn't do this if the sash position requested by user - // couldn't be set yet as it would never be taken into account at all if we - // modified it before this happens. - if ( m_windowTwo && m_requestedSashPosition == INT_MAX ) - { - int size = m_splitMode == wxSPLIT_VERTICAL ? curSize.x : curSize.y; - - int old_size = m_splitMode == wxSPLIT_VERTICAL ? m_lastSize.x : m_lastSize.y; - - // Don't do anything if the size didn't really change. - if ( size != old_size ) - { - int newPosition = -1; - - // Apply gravity if we use it. - int delta = (int) ( (size - old_size)*m_sashGravity ); - if ( delta != 0 ) - { - newPosition = m_sashPosition + delta; - if( newPosition < m_minimumPaneSize ) - newPosition = m_minimumPaneSize; - } - - // Also check if the second window became too small. - newPosition = AdjustSashPosition(newPosition == -1 - ? m_sashPosition - : newPosition); - if ( newPosition != m_sashPosition ) - SetSashPositionAndNotify(newPosition); - } - } - - m_lastSize = curSize; - - SizeWindows(); -} - -void wxSplitterWindow::SetSashGravity(double gravity) -{ - wxCHECK_RET( gravity >= 0. && gravity <= 1., - wxT("invalid gravity value") ); - - m_sashGravity = gravity; -} - -bool wxSplitterWindow::SashHitTest(int x, int y) -{ - if ( m_windowTwo == NULL || m_sashPosition == 0) - return false; // No sash - - int z = m_splitMode == wxSPLIT_VERTICAL ? x : y; - int hitMax = m_sashPosition + GetSashSize() - 1; - - return z >= m_sashPosition && z <= hitMax; -} - -void wxSplitterWindow::SetSashInvisible(bool invisible) -{ - if ( IsSashInvisible() != invisible ) - ToggleWindowStyle(wxSP_NOSASH); -} - -int wxSplitterWindow::GetSashSize() const -{ - return IsSashInvisible() ? 0 : GetDefaultSashSize(); -} - -int wxSplitterWindow::GetDefaultSashSize() const -{ - return wxRendererNative::Get().GetSplitterParams(this).widthSash; -} - -int wxSplitterWindow::GetBorderSize() const -{ - return wxRendererNative::Get().GetSplitterParams(this).border; -} - -// Draw the sash -void wxSplitterWindow::DrawSash(wxDC& dc) -{ - if (HasFlag(wxSP_3DBORDER)) - wxRendererNative::Get().DrawSplitterBorder - ( - this, - dc, - GetClientRect() - ); - - // don't draw sash if we're not split - if ( m_sashPosition == 0 || !m_windowTwo ) - return; - - // nor if we're configured to not show it - if ( IsSashInvisible() ) - return; - - wxRendererNative::Get().DrawSplitterSash - ( - this, - dc, - GetClientSize(), - m_sashPosition, - m_splitMode == wxSPLIT_VERTICAL ? wxVERTICAL - : wxHORIZONTAL, - m_isHot ? (int)wxCONTROL_CURRENT : 0 - ); -} - -// Draw the sash tracker (for whilst moving the sash) -void wxSplitterWindow::DrawSashTracker(int x, int y) -{ - int w, h; - GetClientSize(&w, &h); - - wxScreenDC screenDC; - int x1, y1; - int x2, y2; - - if ( m_splitMode == wxSPLIT_VERTICAL ) - { - x1 = x2 = wxClip(x, 0, w) + m_sashTrackerPen->GetWidth()/2; - y1 = 2; - y2 = h-2; - } - else - { - y1 = y2 = wxClip(y, 0, h) + m_sashTrackerPen->GetWidth()/2; - x1 = 2; - x2 = w-2; - } - - ClientToScreen(&x1, &y1); - ClientToScreen(&x2, &y2); - - screenDC.SetLogicalFunction(wxINVERT); - screenDC.SetPen(*m_sashTrackerPen); - screenDC.SetBrush(*wxTRANSPARENT_BRUSH); - - screenDC.DrawLine(x1, y1, x2, y2); - - screenDC.SetLogicalFunction(wxCOPY); -} - -int wxSplitterWindow::GetWindowSize() const -{ - wxSize size = GetClientSize(); - - return m_splitMode == wxSPLIT_VERTICAL ? size.x : size.y; -} - -int wxSplitterWindow::AdjustSashPosition(int sashPos) const -{ - wxWindow *win; - - win = GetWindow1(); - if ( win ) - { - // the window shouldn't be smaller than its own minimal size nor - // smaller than the minimual pane size specified for this splitter - int minSize = m_splitMode == wxSPLIT_VERTICAL ? win->GetMinWidth() - : win->GetMinHeight(); - - if ( minSize == -1 || m_minimumPaneSize > minSize ) - minSize = m_minimumPaneSize; - - minSize += GetBorderSize(); - - if ( sashPos < minSize ) - sashPos = minSize; - } - - win = GetWindow2(); - if ( win ) - { - int minSize = m_splitMode == wxSPLIT_VERTICAL ? win->GetMinWidth() - : win->GetMinHeight(); - - if ( minSize == -1 || m_minimumPaneSize > minSize ) - minSize = m_minimumPaneSize; - - int maxSize = GetWindowSize() - minSize - GetBorderSize() - GetSashSize(); - if ( maxSize > 0 && sashPos > maxSize && maxSize >= m_minimumPaneSize) - sashPos = maxSize; - } - - return sashPos; -} - -bool wxSplitterWindow::DoSetSashPosition(int sashPos) -{ - int newSashPosition = AdjustSashPosition(sashPos); - - if ( newSashPosition == m_sashPosition ) - return false; - - m_sashPosition = newSashPosition; - - return true; -} - -void wxSplitterWindow::SetSashPositionAndNotify(int sashPos) -{ - // we must reset the request here, otherwise the sash would be stuck at - // old position if the user attempted to move the sash after invalid - // (e.g. smaller than minsize) sash position was requested using - // SetSashPosition(): - m_requestedSashPosition = INT_MAX; - - // note that we must send the event in any case, i.e. even if the sash - // position hasn't changed and DoSetSashPosition() returns false because we - // must generate a CHANGED event at the end of resizing - DoSetSashPosition(sashPos); - - wxSplitterEvent event(wxEVT_SPLITTER_SASH_POS_CHANGED, this); - event.m_data.pos = m_sashPosition; - - (void)DoSendEvent(event); -} - -// Position and size subwindows. -// Note that the border size applies to each subwindow, not -// including the edges next to the sash. -void wxSplitterWindow::SizeWindows() -{ - int oldSashPosition = m_sashPosition; - - // check if we have delayed setting the real sash position - if ( m_requestedSashPosition != INT_MAX ) - { - int newSashPosition = ConvertSashPosition(m_requestedSashPosition); - if ( newSashPosition != m_sashPosition ) - { - DoSetSashPosition(newSashPosition); - } - - if ( newSashPosition <= m_sashPosition - && newSashPosition >= m_sashPosition - GetBorderSize() ) - { - // don't update it any more - m_requestedSashPosition = INT_MAX; - } - } - - int w, h; - GetClientSize(&w, &h); - - if ( GetWindow1() && !GetWindow2() ) - { - GetWindow1()->SetSize(GetBorderSize(), GetBorderSize(), - w - 2*GetBorderSize(), h - 2*GetBorderSize()); - } - else if ( GetWindow1() && GetWindow2() ) - { - const int border = GetBorderSize(), - sash = GetSashSize(); - - int size1 = GetSashPosition() - border, - size2 = GetSashPosition() + sash; - - int x2, y2, w1, h1, w2, h2; - if ( GetSplitMode() == wxSPLIT_VERTICAL ) - { - w1 = size1; - w2 = w - 2*border - sash - w1; - if (w2 < 0) - w2 = 0; - h2 = h - 2*border; - if (h2 < 0) - h2 = 0; - h1 = h2; - x2 = size2; - y2 = border; - } - else // horz splitter - { - w2 = w - 2*border; - if (w2 < 0) - w2 = 0; - w1 = w2; - h1 = size1; - h2 = h - 2*border - sash - h1; - if (h2 < 0) - h2 = 0; - x2 = border; - y2 = size2; - } - - GetWindow2()->SetSize(x2, y2, w2, h2); - GetWindow1()->SetSize(border, border, w1, h1); - } - - if ( oldSashPosition != m_sashPosition ) - { - wxClientDC dc(this); - DrawSash(dc); - } -} - -// Set pane for unsplit window -void wxSplitterWindow::Initialize(wxWindow *window) -{ - wxASSERT_MSG( (!window || window->GetParent() == this), - wxT("windows in the splitter should have it as parent!") ); - - if (window && !window->IsShown()) - window->Show(); - - m_windowOne = window; - m_windowTwo = NULL; - DoSetSashPosition(0); -} - -// Associates the given window with window 2, drawing the appropriate sash -// and changing the split mode. -// Does nothing and returns false if the window is already split. -bool wxSplitterWindow::DoSplit(wxSplitMode mode, - wxWindow *window1, wxWindow *window2, - int sashPosition) -{ - if ( IsSplit() ) - return false; - - wxCHECK_MSG( window1 && window2, false, - wxT("cannot split with NULL window(s)") ); - - wxCHECK_MSG( window1->GetParent() == this && window2->GetParent() == this, false, - wxT("windows in the splitter should have it as parent!") ); - - if (! window1->IsShown()) - window1->Show(); - if (! window2->IsShown()) - window2->Show(); - - m_splitMode = mode; - m_windowOne = window1; - m_windowTwo = window2; - - - SetSashPosition(sashPosition, true); - return true; -} - -int wxSplitterWindow::ConvertSashPosition(int sashPosition) const -{ - if ( sashPosition > 0 ) - { - return sashPosition; - } - else if ( sashPosition < 0 ) - { - // It's negative so adding is subtracting - return GetWindowSize() + sashPosition; - } - else // sashPosition == 0 - { - // default, put it in the centre - return GetWindowSize() / 2; - } -} - -// Remove the specified (or second) window from the view -// Doesn't actually delete the window. -bool wxSplitterWindow::Unsplit(wxWindow *toRemove) -{ - if ( ! IsSplit() ) - return false; - - wxWindow *win; - if ( toRemove == NULL || toRemove == m_windowTwo) - { - win = m_windowTwo ; - m_windowTwo = NULL; - } - else if ( toRemove == m_windowOne ) - { - win = m_windowOne ; - m_windowOne = m_windowTwo; - m_windowTwo = NULL; - } - else - { - wxFAIL_MSG(wxT("splitter: attempt to remove a non-existent window")); - - return false; - } - - OnUnsplit(win); - DoSetSashPosition(0); - SizeWindows(); - - return true; -} - -// Replace a window with another one -bool wxSplitterWindow::ReplaceWindow(wxWindow *winOld, wxWindow *winNew) -{ - wxCHECK_MSG( winOld, false, wxT("use one of Split() functions instead") ); - wxCHECK_MSG( winNew, false, wxT("use Unsplit() functions instead") ); - - if ( winOld == m_windowTwo ) - { - m_windowTwo = winNew; - } - else if ( winOld == m_windowOne ) - { - m_windowOne = winNew; - } - else - { - wxFAIL_MSG(wxT("splitter: attempt to replace a non-existent window")); - - return false; - } - - SizeWindows(); - - return true; -} - -void wxSplitterWindow::SetMinimumPaneSize(int min) -{ - m_minimumPaneSize = min; - int pos = m_requestedSashPosition != INT_MAX ? m_requestedSashPosition : m_sashPosition; - SetSashPosition(pos); // re-check limits -} - -void wxSplitterWindow::SetSashPosition(int position, bool redraw) -{ - // remember the sash position we want to set for later if we can't set it - // right now (e.g. because the window is too small) - m_requestedSashPosition = position; - - DoSetSashPosition(ConvertSashPosition(position)); - - if ( redraw ) - { - SizeWindows(); - } -} - -// Make sure the child window sizes are updated. This is useful -// for reducing flicker by updating the sizes before a -// window is shown, if you know the overall size is correct. -void wxSplitterWindow::UpdateSize() -{ - SizeWindows(); -} - -bool wxSplitterWindow::DoSendEvent(wxSplitterEvent& event) -{ - return !GetEventHandler()->ProcessEvent(event) || event.IsAllowed(); -} - -wxSize wxSplitterWindow::DoGetBestSize() const -{ - // get best sizes of subwindows - wxSize size1, size2; - if ( m_windowOne ) - size1 = m_windowOne->GetEffectiveMinSize(); - if ( m_windowTwo ) - size2 = m_windowTwo->GetEffectiveMinSize(); - - // sum them - // - // pSash points to the size component to which sash size must be added - int *pSash; - wxSize sizeBest; - if ( m_splitMode == wxSPLIT_VERTICAL ) - { - sizeBest.y = wxMax(size1.y, size2.y); - sizeBest.x = wxMax(size1.x, m_minimumPaneSize) + - wxMax(size2.x, m_minimumPaneSize); - - pSash = &sizeBest.x; - } - else // wxSPLIT_HORIZONTAL - { - sizeBest.x = wxMax(size1.x, size2.x); - sizeBest.y = wxMax(size1.y, m_minimumPaneSize) + - wxMax(size2.y, m_minimumPaneSize); - - pSash = &sizeBest.y; - } - - // account for the sash if the window is actually split - if ( m_windowOne && m_windowTwo ) - *pSash += GetSashSize(); - - // account for the border too - int border = 2*GetBorderSize(); - sizeBest.x += border; - sizeBest.y += border; - - return sizeBest; -} - -// --------------------------------------------------------------------------- -// wxSplitterWindow virtual functions: they now just generate the events -// --------------------------------------------------------------------------- - -bool wxSplitterWindow::OnSashPositionChange(int WXUNUSED(newSashPosition)) -{ - // always allow by default - return true; -} - -int wxSplitterWindow::OnSashPositionChanging(int newSashPosition) -{ - // If within UNSPLIT_THRESHOLD from edge, set to edge to cause closure. - const int UNSPLIT_THRESHOLD = 4; - - // first of all, check if OnSashPositionChange() doesn't forbid this change - if ( !OnSashPositionChange(newSashPosition) ) - { - // it does - return -1; - } - - // Obtain relevant window dimension for bottom / right threshold check - int window_size = GetWindowSize(); - - bool unsplit_scenario = false; - if ( m_permitUnsplitAlways || m_minimumPaneSize == 0 ) - { - // Do edge detection if unsplit premitted - if ( newSashPosition <= UNSPLIT_THRESHOLD ) - { - // threshold top / left check - newSashPosition = 0; - unsplit_scenario = true; - } - if ( newSashPosition >= window_size - UNSPLIT_THRESHOLD ) - { - // threshold bottom/right check - newSashPosition = window_size; - unsplit_scenario = true; - } - } - - if ( !unsplit_scenario ) - { - // If resultant pane would be too small, enlarge it - newSashPosition = AdjustSashPosition(newSashPosition); - - // If the result is out of bounds it means minimum size is too big, - // so split window in half as best compromise. - if ( newSashPosition < 0 || newSashPosition > window_size ) - newSashPosition = window_size / 2; - } - - // now let the event handler have it - // - // FIXME: shouldn't we do it before the adjustments above so as to ensure - // that the sash position is always reasonable? - wxSplitterEvent event(wxEVT_SPLITTER_SASH_POS_CHANGING, this); - event.m_data.pos = newSashPosition; - - if ( !DoSendEvent(event) ) - { - // the event handler vetoed the change - newSashPosition = -1; - } - else - { - // it could have been changed by it - newSashPosition = event.GetSashPosition(); - } - - return newSashPosition; -} - -// Called when the sash is double-clicked. The default behaviour is to remove -// the sash if the minimum pane size is zero. -void wxSplitterWindow::OnDoubleClickSash(int x, int y) -{ - wxCHECK_RET(m_windowTwo, wxT("splitter: no window to remove")); - - // new code should handle events instead of using the virtual functions - wxSplitterEvent event(wxEVT_SPLITTER_DOUBLECLICKED, this); - event.m_data.pt.x = x; - event.m_data.pt.y = y; - if ( DoSendEvent(event) ) - { - if ( GetMinimumPaneSize() == 0 || m_permitUnsplitAlways ) - { - wxWindow* win = m_windowTwo; - if ( Unsplit(win) ) - { - wxSplitterEvent unsplitEvent(wxEVT_SPLITTER_UNSPLIT, this); - unsplitEvent.m_data.win = win; - (void)DoSendEvent(unsplitEvent); - } - } - } - //else: blocked by user -} - -void wxSplitterWindow::OnUnsplit(wxWindow *winRemoved) -{ - // call this before calling the event handler which may delete the window - winRemoved->Show(false); -} - -#if defined( __WXMSW__ ) || defined( __WXMAC__) - -// this is currently called (and needed) under MSW only... -void wxSplitterWindow::OnSetCursor(wxSetCursorEvent& event) -{ - // if we don't do it, the resizing cursor might be set for child window: - // and like this we explicitly say that our cursor should not be used for - // children windows which overlap us - - if ( SashHitTest(event.GetX(), event.GetY()) ) - { - // default processing is ok - event.Skip(); - } - //else: do nothing, in particular, don't call Skip() -} - -#endif // wxMSW || wxMac - -#endif // wxUSE_SPLITTER - diff --git a/Externals/wxWidgets3/src/generic/srchctlg.cpp b/Externals/wxWidgets3/src/generic/srchctlg.cpp deleted file mode 100644 index eed9aa7348..0000000000 --- a/Externals/wxWidgets3/src/generic/srchctlg.cpp +++ /dev/null @@ -1,1246 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/generic/srchctlg.cpp -// Purpose: implements wxSearchCtrl as a composite control -// Author: Vince Harron -// Created: 2006-02-19 -// Copyright: Vince Harron -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_SEARCHCTRL - -#include "wx/srchctrl.h" - -#ifndef WX_PRECOMP - #include "wx/button.h" - #include "wx/dcclient.h" - #include "wx/menu.h" - #include "wx/dcmemory.h" -#endif //WX_PRECOMP - -#if !wxUSE_NATIVE_SEARCH_CONTROL - -#include "wx/image.h" - -#define WXMAX(a,b) ((a)>(b)?(a):(b)) - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -// the margin between the text control and the search/cancel buttons -static const wxCoord MARGIN = 2; - -#define LIGHT_STEP 160 - -// ---------------------------------------------------------------------------- -// wxSearchTextCtrl: text control used by search control -// ---------------------------------------------------------------------------- - -class wxSearchTextCtrl : public wxTextCtrl -{ -public: - wxSearchTextCtrl(wxSearchCtrl *search, const wxString& value, int style) - : wxTextCtrl(search, wxID_ANY, value, wxDefaultPosition, wxDefaultSize, - (style & ~wxBORDER_MASK) | wxNO_BORDER) - { - m_search = search; - - SetHint(_("Search")); - - // Ensure that our best size is recomputed using our overridden - // DoGetBestSize(). - InvalidateBestSize(); - } - - virtual wxWindow* GetMainWindowOfCompositeControl() wxOVERRIDE - { - return m_search; - } - - // provide access to the base class protected methods to wxSearchCtrl which - // needs to forward to them - void DoSetValue(const wxString& value, int flags) wxOVERRIDE - { - wxTextCtrl::DoSetValue(value, flags); - } - - bool DoLoadFile(const wxString& file, int fileType) wxOVERRIDE - { - return wxTextCtrl::DoLoadFile(file, fileType); - } - - bool DoSaveFile(const wxString& file, int fileType) wxOVERRIDE - { - return wxTextCtrl::DoSaveFile(file, fileType); - } - -protected: - void OnText(wxCommandEvent& eventText) - { - wxCommandEvent event(eventText); - event.SetEventObject(m_search); - event.SetId(m_search->GetId()); - - m_search->GetEventHandler()->ProcessEvent(event); - } - - void OnTextUrl(wxTextUrlEvent& eventText) - { - // copy constructor is disabled for some reason? - //wxTextUrlEvent event(eventText); - wxTextUrlEvent event( - m_search->GetId(), - eventText.GetMouseEvent(), - eventText.GetURLStart(), - eventText.GetURLEnd() - ); - event.SetEventObject(m_search); - - m_search->GetEventHandler()->ProcessEvent(event); - } - -#ifdef __WXMSW__ - // We increase the text control height to be the same as for the controls - // with border as this is what we actually need here because even though - // this control itself is borderless, it's inside wxSearchCtrl which does - // have the border and so should have the same height as the normal text - // entries with border. - // - // This is a bit ugly and it would arguably be better to use whatever size - // the base class version returns and just centre the text vertically in - // the search control but I failed to modify the code in LayoutControls() - // to do this easily and as there is much in that code I don't understand - // (notably what is the logic for buttons sizing?) I prefer to not touch it - // at all. - virtual wxSize DoGetBestSize() const - { - const long flags = GetWindowStyleFlag(); - wxSearchTextCtrl* const self = const_cast(this); - - self->SetWindowStyleFlag((flags & ~wxBORDER_MASK) | wxBORDER_DEFAULT); - wxSize size = wxTextCtrl::DoGetBestSize(); - - // The calculation for no external borders in wxTextCtrl::DoGetSizeFromTextSize also - // removes any padding around the value, which is wrong for this situation. So we - // can't use wxBORDER_NONE to calculate a good height, in which case we just have to - // assume a border in the code above and then subtract the space that would be taken up - // by a themed border (the thin blue border and the white internal border). - size.y -= 4; - - self->SetWindowStyleFlag(flags); - - return size; - } -#endif // __WXMSW__ - -private: - wxSearchCtrl* m_search; - - wxDECLARE_EVENT_TABLE(); -}; - -wxBEGIN_EVENT_TABLE(wxSearchTextCtrl, wxTextCtrl) - EVT_TEXT(wxID_ANY, wxSearchTextCtrl::OnText) - EVT_TEXT_ENTER(wxID_ANY, wxSearchTextCtrl::OnText) - EVT_TEXT_URL(wxID_ANY, wxSearchTextCtrl::OnTextUrl) - EVT_TEXT_MAXLEN(wxID_ANY, wxSearchTextCtrl::OnText) -wxEND_EVENT_TABLE() - -// ---------------------------------------------------------------------------- -// wxSearchButton: search button used by search control -// ---------------------------------------------------------------------------- - -class wxSearchButton : public wxControl -{ -public: - wxSearchButton(wxSearchCtrl *search, int eventType, const wxBitmap& bmp) - : wxControl(search, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNO_BORDER), - m_search(search), - m_eventType(eventType), - m_bmp(bmp) - { } - - void SetBitmapLabel(const wxBitmap& label) - { - m_bmp = label; - InvalidateBestSize(); - } - - // The buttons in wxSearchCtrl shouldn't accept focus from keyboard because - // this would interfere with the usual TAB processing: the user expects - // that pressing TAB in the search control should switch focus to the next - // control and not give it to the button inside the same control. Besides, - // the search button can be already activated by pressing "Enter" so there - // is really no reason for it to be able to get focus from keyboard. - virtual bool AcceptsFocusFromKeyboard() const wxOVERRIDE { return false; } - - virtual wxWindow* GetMainWindowOfCompositeControl() wxOVERRIDE - { - return m_search; - } - -protected: - wxSize DoGetBestSize() const wxOVERRIDE - { - return wxSize(m_bmp.GetWidth(), m_bmp.GetHeight()); - } - - void OnLeftUp(wxMouseEvent&) - { - wxCommandEvent event(m_eventType, m_search->GetId()); - event.SetEventObject(m_search); - - if ( m_eventType == wxEVT_SEARCHCTRL_SEARCH_BTN ) - { - // it's convenient to have the string to search for directly in the - // event instead of having to retrieve it from the control in the - // event handler code later, so provide it here - event.SetString(m_search->GetValue()); - } - - GetEventHandler()->ProcessEvent(event); - - m_search->SetFocus(); - -#if wxUSE_MENUS - if ( m_eventType == wxEVT_SEARCHCTRL_SEARCH_BTN ) - { - // this happens automatically, just like on Mac OS X - m_search->PopupSearchMenu(); - } -#endif // wxUSE_MENUS - } - - void OnPaint(wxPaintEvent&) - { - wxPaintDC dc(this); - dc.DrawBitmap(m_bmp, 0,0, true); - } - - -private: - wxSearchCtrl *m_search; - wxEventType m_eventType; - wxBitmap m_bmp; - - wxDECLARE_EVENT_TABLE(); -}; - -wxBEGIN_EVENT_TABLE(wxSearchButton, wxControl) - EVT_LEFT_UP(wxSearchButton::OnLeftUp) - EVT_PAINT(wxSearchButton::OnPaint) -wxEND_EVENT_TABLE() - -wxBEGIN_EVENT_TABLE(wxSearchCtrl, wxSearchCtrlBase) - EVT_SEARCHCTRL_CANCEL_BTN(wxID_ANY, wxSearchCtrl::OnCancelButton) - EVT_SET_FOCUS(wxSearchCtrl::OnSetFocus) - EVT_SIZE(wxSearchCtrl::OnSize) -wxEND_EVENT_TABLE() - -wxIMPLEMENT_DYNAMIC_CLASS(wxSearchCtrl, wxSearchCtrlBase); - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxSearchCtrl creation -// ---------------------------------------------------------------------------- - -// creation -// -------- - -wxSearchCtrl::wxSearchCtrl() -{ - Init(); -} - -wxSearchCtrl::wxSearchCtrl(wxWindow *parent, wxWindowID id, - const wxString& value, - const wxPoint& pos, - const wxSize& size, - long style, - const wxValidator& validator, - const wxString& name) -{ - Init(); - - Create(parent, id, value, pos, size, style, validator, name); -} - -void wxSearchCtrl::Init() -{ - m_text = NULL; - m_searchButton = NULL; - m_cancelButton = NULL; -#if wxUSE_MENUS - m_menu = NULL; -#endif // wxUSE_MENUS - - m_searchButtonVisible = true; - m_cancelButtonVisible = false; - - m_searchBitmapUser = false; - m_cancelBitmapUser = false; -#if wxUSE_MENUS - m_searchMenuBitmapUser = false; -#endif // wxUSE_MENUS -} - -bool wxSearchCtrl::Create(wxWindow *parent, wxWindowID id, - const wxString& value, - const wxPoint& pos, - const wxSize& size, - long style, - const wxValidator& validator, - const wxString& name) -{ - // force border style for more native appearance - style &= ~wxBORDER_MASK; -#ifdef __WXGTK__ - style |= wxBORDER_SUNKEN; -#elif defined(__WXMSW__) - // Don't set the style explicitly, let GetDefaultBorder() work it out, unless - // we will get a sunken border (e.g. on Windows 200) in which case we must - // override with a simple border. - if (GetDefaultBorder() == wxBORDER_SUNKEN) - style |= wxBORDER_SIMPLE; -#else - style |= wxBORDER_SIMPLE; -#endif - if ( !wxSearchCtrlBaseBaseClass::Create(parent, id, pos, size, - style, validator, name) ) - { - return false; - } - - m_text = new wxSearchTextCtrl(this, value, style); - - m_searchButton = new wxSearchButton(this, - wxEVT_SEARCHCTRL_SEARCH_BTN, - m_searchBitmap); - m_cancelButton = new wxSearchButton(this, - wxEVT_SEARCHCTRL_CANCEL_BTN, - m_cancelBitmap); - - SetBackgroundColour( m_text->GetBackgroundColour() ); - - RecalcBitmaps(); - - SetInitialSize(size); - Move(pos); - return true; -} - -wxSearchCtrl::~wxSearchCtrl() -{ - delete m_text; - delete m_searchButton; - delete m_cancelButton; -#if wxUSE_MENUS - delete m_menu; -#endif // wxUSE_MENUS -} - - -// search control specific interfaces -#if wxUSE_MENUS - -void wxSearchCtrl::SetMenu( wxMenu* menu ) -{ - if ( menu == m_menu ) - { - // no change - return; - } - bool hadMenu = (m_menu != NULL); - delete m_menu; - m_menu = menu; - - if ( m_menu && !hadMenu ) - { - m_searchButton->SetBitmapLabel(m_searchMenuBitmap); - m_searchButton->Refresh(); - } - else if ( !m_menu && hadMenu ) - { - m_searchButton->SetBitmapLabel(m_searchBitmap); - if ( m_searchButtonVisible ) - { - m_searchButton->Refresh(); - } - } - LayoutControls(); -} - -wxMenu* wxSearchCtrl::GetMenu() -{ - return m_menu; -} - -#endif // wxUSE_MENUS - -void wxSearchCtrl::ShowSearchButton( bool show ) -{ - if ( m_searchButtonVisible == show ) - { - // no change - return; - } - m_searchButtonVisible = show; - if ( m_searchButtonVisible ) - { - RecalcBitmaps(); - } - - LayoutControls(); -} - -bool wxSearchCtrl::IsSearchButtonVisible() const -{ - return m_searchButtonVisible; -} - - -void wxSearchCtrl::ShowCancelButton( bool show ) -{ - if ( m_cancelButtonVisible == show ) - { - // no change - return; - } - m_cancelButtonVisible = show; - - LayoutControls(); -} - -bool wxSearchCtrl::IsCancelButtonVisible() const -{ - return m_cancelButtonVisible; -} - -void wxSearchCtrl::SetDescriptiveText(const wxString& text) -{ - m_text->SetHint(text); -} - -wxString wxSearchCtrl::GetDescriptiveText() const -{ - return m_text->GetHint(); -} - -// ---------------------------------------------------------------------------- -// geometry -// ---------------------------------------------------------------------------- - -wxSize wxSearchCtrl::DoGetBestClientSize() const -{ - wxSize sizeText = m_text->GetBestSize(); - wxSize sizeSearch(0,0); - wxSize sizeCancel(0,0); - int searchMargin = 0; - int cancelMargin = 0; - if ( m_searchButtonVisible || HasMenu() ) - { - sizeSearch = m_searchButton->GetBestSize(); - searchMargin = MARGIN; - } - if ( m_cancelButtonVisible ) - { - sizeCancel = m_cancelButton->GetBestSize(); - cancelMargin = MARGIN; - } - - int horizontalBorder = 1 + ( sizeText.y - sizeText.y * 14 / 21 ) / 2; - - // buttons are square and equal to the height of the text control - int height = sizeText.y; - return wxSize(sizeSearch.x + searchMargin + sizeText.x + cancelMargin + sizeCancel.x + 2*horizontalBorder, - height); -} - -void wxSearchCtrl::DoMoveWindow(int x, int y, int width, int height) -{ - wxSearchCtrlBase::DoMoveWindow(x, y, width, height); - - LayoutControls(); -} - -void wxSearchCtrl::LayoutControls() -{ - if ( !m_text ) - return; - - const wxSize sizeTotal = GetClientSize(); - int width = sizeTotal.x, - height = sizeTotal.y; - - wxSize sizeText = m_text->GetBestSize(); - // make room for the search menu & clear button - int horizontalBorder = 1 + ( sizeText.y - sizeText.y * 14 / 21 ) / 2; - int x = horizontalBorder; - width -= horizontalBorder*2; - - wxSize sizeSearch(0,0); - wxSize sizeCancel(0,0); - int searchMargin = 0; - int cancelMargin = 0; - if ( m_searchButtonVisible || HasMenu() ) - { - sizeSearch = m_searchButton->GetBestSize(); - searchMargin = MARGIN; - } - if ( m_cancelButtonVisible ) - { - sizeCancel = m_cancelButton->GetBestSize(); - cancelMargin = MARGIN; - } - m_searchButton->Show( m_searchButtonVisible || HasMenu() ); - m_cancelButton->Show( m_cancelButtonVisible ); - - if ( sizeSearch.x + sizeCancel.x > width ) - { - sizeSearch.x = width/2; - sizeCancel.x = width/2; - searchMargin = 0; - cancelMargin = 0; - } - wxCoord textWidth = width - sizeSearch.x - sizeCancel.x - searchMargin - cancelMargin - 1; - if (textWidth < 0) textWidth = 0; - - // position the subcontrols inside the client area - - m_searchButton->SetSize(x, (height - sizeSearch.y) / 2, - sizeSearch.x, height); - x += sizeSearch.x; - x += searchMargin; - -#ifdef __WXMSW__ - // The text control is too high up on Windows; normally a text control looks OK because - // of the white border that's part of the theme border. We can also remove a pixel from - // the height to fit the text control in, because the padding in EDIT_HEIGHT_FROM_CHAR_HEIGHT - // is already generous. - int textY = 1; -#else - int textY = 0; -#endif - - m_text->SetSize(x, textY, textWidth, height-textY); - x += textWidth; - x += cancelMargin; - - m_cancelButton->SetSize(x, (height - sizeCancel.y) / 2, - sizeCancel.x, height); -} - -wxWindowList wxSearchCtrl::GetCompositeWindowParts() const -{ - wxWindowList parts; - parts.push_back(m_text); - parts.push_back(m_searchButton); - parts.push_back(m_cancelButton); - return parts; -} - -// accessors -// --------- - -wxString wxSearchCtrl::DoGetValue() const -{ - return m_text->GetValue(); -} -wxString wxSearchCtrl::GetRange(long from, long to) const -{ - return m_text->GetRange(from, to); -} - -int wxSearchCtrl::GetLineLength(long lineNo) const -{ - return m_text->GetLineLength(lineNo); -} -wxString wxSearchCtrl::GetLineText(long lineNo) const -{ - return m_text->GetLineText(lineNo); -} -int wxSearchCtrl::GetNumberOfLines() const -{ - return m_text->GetNumberOfLines(); -} - -bool wxSearchCtrl::IsModified() const -{ - return m_text->IsModified(); -} -bool wxSearchCtrl::IsEditable() const -{ - return m_text->IsEditable(); -} - -// more readable flag testing methods -bool wxSearchCtrl::IsSingleLine() const -{ - return m_text->IsSingleLine(); -} -bool wxSearchCtrl::IsMultiLine() const -{ - return m_text->IsMultiLine(); -} - -// If the return values from and to are the same, there is no selection. -void wxSearchCtrl::GetSelection(long* from, long* to) const -{ - m_text->GetSelection(from, to); -} - -wxString wxSearchCtrl::GetStringSelection() const -{ - return m_text->GetStringSelection(); -} - -// operations -// ---------- - -// editing -void wxSearchCtrl::Clear() -{ - m_text->Clear(); -} -void wxSearchCtrl::Replace(long from, long to, const wxString& value) -{ - m_text->Replace(from, to, value); -} -void wxSearchCtrl::Remove(long from, long to) -{ - m_text->Remove(from, to); -} - -// load/save the controls contents from/to the file -bool wxSearchCtrl::LoadFile(const wxString& file) -{ - return m_text->LoadFile(file); -} -bool wxSearchCtrl::SaveFile(const wxString& file) -{ - return m_text->SaveFile(file); -} - -// sets/clears the dirty flag -void wxSearchCtrl::MarkDirty() -{ - m_text->MarkDirty(); -} -void wxSearchCtrl::DiscardEdits() -{ - m_text->DiscardEdits(); -} - -// set the max number of characters which may be entered in a single line -// text control -void wxSearchCtrl::SetMaxLength(unsigned long len) -{ - m_text->SetMaxLength(len); -} - -// writing text inserts it at the current position, appending always -// inserts it at the end -void wxSearchCtrl::WriteText(const wxString& text) -{ - m_text->WriteText(text); -} -void wxSearchCtrl::AppendText(const wxString& text) -{ - m_text->AppendText(text); -} - -// insert the character which would have resulted from this key event, -// return true if anything has been inserted -bool wxSearchCtrl::EmulateKeyPress(const wxKeyEvent& event) -{ - return m_text->EmulateKeyPress(event); -} - -// text control under some platforms supports the text styles: these -// methods allow to apply the given text style to the given selection or to -// set/get the style which will be used for all appended text -bool wxSearchCtrl::SetStyle(long start, long end, const wxTextAttr& style) -{ - return m_text->SetStyle(start, end, style); -} -bool wxSearchCtrl::GetStyle(long position, wxTextAttr& style) -{ - return m_text->GetStyle(position, style); -} -bool wxSearchCtrl::SetDefaultStyle(const wxTextAttr& style) -{ - return m_text->SetDefaultStyle(style); -} -const wxTextAttr& wxSearchCtrl::GetDefaultStyle() const -{ - return m_text->GetDefaultStyle(); -} - -// translate between the position (which is just an index in the text ctrl -// considering all its contents as a single strings) and (x, y) coordinates -// which represent column and line. -long wxSearchCtrl::XYToPosition(long x, long y) const -{ - return m_text->XYToPosition(x, y); -} -bool wxSearchCtrl::PositionToXY(long pos, long *x, long *y) const -{ - return m_text->PositionToXY(pos, x, y); -} - -void wxSearchCtrl::ShowPosition(long pos) -{ - m_text->ShowPosition(pos); -} - -// find the character at position given in pixels -// -// NB: pt is in device coords (not adjusted for the client area origin nor -// scrolling) -wxTextCtrlHitTestResult wxSearchCtrl::HitTest(const wxPoint& pt, long *pos) const -{ - return m_text->HitTest(pt, pos); -} -wxTextCtrlHitTestResult wxSearchCtrl::HitTest(const wxPoint& pt, - wxTextCoord *col, - wxTextCoord *row) const -{ - return m_text->HitTest(pt, col, row); -} - -// Clipboard operations -void wxSearchCtrl::Copy() -{ - m_text->Copy(); -} -void wxSearchCtrl::Cut() -{ - m_text->Cut(); -} -void wxSearchCtrl::Paste() -{ - m_text->Paste(); -} - -bool wxSearchCtrl::CanCopy() const -{ - return m_text->CanCopy(); -} -bool wxSearchCtrl::CanCut() const -{ - return m_text->CanCut(); -} -bool wxSearchCtrl::CanPaste() const -{ - return m_text->CanPaste(); -} - -// Undo/redo -void wxSearchCtrl::Undo() -{ - m_text->Undo(); -} -void wxSearchCtrl::Redo() -{ - m_text->Redo(); -} - -bool wxSearchCtrl::CanUndo() const -{ - return m_text->CanUndo(); -} -bool wxSearchCtrl::CanRedo() const -{ - return m_text->CanRedo(); -} - -// Insertion point -void wxSearchCtrl::SetInsertionPoint(long pos) -{ - m_text->SetInsertionPoint(pos); -} -void wxSearchCtrl::SetInsertionPointEnd() -{ - m_text->SetInsertionPointEnd(); -} -long wxSearchCtrl::GetInsertionPoint() const -{ - return m_text->GetInsertionPoint(); -} -long wxSearchCtrl::GetLastPosition() const -{ - return m_text->GetLastPosition(); -} - -void wxSearchCtrl::SetSelection(long from, long to) -{ - m_text->SetSelection(from, to); -} -void wxSearchCtrl::SelectAll() -{ - m_text->SelectAll(); -} - -void wxSearchCtrl::SetEditable(bool editable) -{ - m_text->SetEditable(editable); -} - -bool wxSearchCtrl::SetFont(const wxFont& font) -{ - if ( !wxSearchCtrlBase::SetFont(font) ) - return false; - - // Recreate the bitmaps as their size may have changed. - RecalcBitmaps(); - - return true; -} - -bool wxSearchCtrl::SetBackgroundColour(const wxColour& colour) -{ - if ( !wxSearchCtrlBase::SetBackgroundColour(colour) ) - return false; - - // When the background changes, re-render the bitmaps so that the correct - // colour shows in their "transparent" area. - RecalcBitmaps(); - - return true; -} - -// search control generic only -void wxSearchCtrl::SetSearchBitmap( const wxBitmap& bitmap ) -{ - m_searchBitmap = bitmap; - m_searchBitmapUser = bitmap.IsOk(); - if ( m_searchBitmapUser ) - { - if ( m_searchButton && !HasMenu() ) - { - m_searchButton->SetBitmapLabel( m_searchBitmap ); - } - } - else - { - // the user bitmap was just cleared, generate one - RecalcBitmaps(); - } -} - -#if wxUSE_MENUS - -void wxSearchCtrl::SetSearchMenuBitmap( const wxBitmap& bitmap ) -{ - m_searchMenuBitmap = bitmap; - m_searchMenuBitmapUser = bitmap.IsOk(); - if ( m_searchMenuBitmapUser ) - { - if ( m_searchButton && m_menu ) - { - m_searchButton->SetBitmapLabel( m_searchMenuBitmap ); - } - } - else - { - // the user bitmap was just cleared, generate one - RecalcBitmaps(); - } -} - -#endif // wxUSE_MENUS - -void wxSearchCtrl::SetCancelBitmap( const wxBitmap& bitmap ) -{ - m_cancelBitmap = bitmap; - m_cancelBitmapUser = bitmap.IsOk(); - if ( m_cancelBitmapUser ) - { - if ( m_cancelButton ) - { - m_cancelButton->SetBitmapLabel( m_cancelBitmap ); - } - } - else - { - // the user bitmap was just cleared, generate one - RecalcBitmaps(); - } -} - -#if 0 - -// override streambuf method -#if wxHAS_TEXT_WINDOW_STREAM -int overflow(int i); -#endif // wxHAS_TEXT_WINDOW_STREAM - -// stream-like insertion operators: these are always available, whether we -// were, or not, compiled with streambuf support -wxTextCtrl& operator<<(const wxString& s); -wxTextCtrl& operator<<(int i); -wxTextCtrl& operator<<(long i); -wxTextCtrl& operator<<(float f); -wxTextCtrl& operator<<(double d); -wxTextCtrl& operator<<(const wxChar c); -#endif - -void wxSearchCtrl::DoSetValue(const wxString& value, int flags) -{ - m_text->DoSetValue(value, flags); -} - -bool wxSearchCtrl::DoLoadFile(const wxString& file, int fileType) -{ - return m_text->DoLoadFile(file, fileType); -} - -bool wxSearchCtrl::DoSaveFile(const wxString& file, int fileType) -{ - return m_text->DoSaveFile(file, fileType); -} - -// do the window-specific processing after processing the update event -void wxSearchCtrl::DoUpdateWindowUI(wxUpdateUIEvent& event) -{ - wxSearchCtrlBase::DoUpdateWindowUI(event); -} - -bool wxSearchCtrl::ShouldInheritColours() const -{ - return true; -} - -// icons are rendered at 3-8 times larger than necessary and downscaled for -// antialiasing -static int GetMultiplier() -{ - int depth = ::wxDisplayDepth(); - - if ( depth >= 24 ) - { - return 8; - } - return 6; -} - -static void RescaleBitmap(wxBitmap& bmp, const wxSize& sizeNeeded) -{ - wxCHECK_RET( sizeNeeded.IsFullySpecified(), wxS("New size must be given") ); - -#if wxUSE_IMAGE - wxImage img = bmp.ConvertToImage(); - img.Rescale(sizeNeeded.x, sizeNeeded.y); - bmp = wxBitmap(img); -#else // !wxUSE_IMAGE - // Fallback method of scaling the bitmap - wxBitmap newBmp(sizeNeeded, bmp.GetDepth()); -#if defined(__WXMSW__) || defined(__WXOSX__) - // wxBitmap::UseAlpha() is used only on wxMSW and wxOSX. - newBmp.UseAlpha(bmp.HasAlpha()); -#endif // __WXMSW__ || __WXOSX__ - { - wxMemoryDC dc(newBmp); - double scX = (double)sizeNeeded.GetWidth() / bmp.GetWidth(); - double scY = (double)sizeNeeded.GetHeight() / bmp.GetHeight(); - dc.SetUserScale(scX, scY); - dc.DrawBitmap(bmp, 0, 0); - } - bmp = newBmp; -#endif // wxUSE_IMAGE/!wxUSE_IMAGE -} - -wxBitmap wxSearchCtrl::RenderSearchBitmap( int x, int y, bool renderDrop ) -{ - wxColour bg = GetBackgroundColour(); - wxColour fg = GetForegroundColour().ChangeLightness(LIGHT_STEP-20); - - //=============================================================================== - // begin drawing code - //=============================================================================== - // image stats - - // force width:height ratio - if ( 14*x > y*20 ) - { - // x is too big - x = y*20/14; - } - else - { - // y is too big - y = x*14/20; - } - - // glass 11x11, top left corner - // handle (9,9)-(13,13) - // drop (13,16)-(19,6)-(16,9) - - int multiplier = GetMultiplier(); - int penWidth = multiplier * 2; - - penWidth = penWidth * x / 20; - - wxBitmap bitmap( multiplier*x, multiplier*y ); - wxMemoryDC mem; - mem.SelectObject(bitmap); - - // clear background - mem.SetBrush( wxBrush(bg) ); - mem.SetPen( wxPen(bg) ); - mem.DrawRectangle(0,0,bitmap.GetWidth(),bitmap.GetHeight()); - - // draw drop glass - mem.SetBrush( wxBrush(fg) ); - mem.SetPen( wxPen(fg) ); - int glassBase = 5 * x / 20; - int glassFactor = 2*glassBase + 1; - int radius = multiplier*glassFactor/2; - mem.DrawCircle(radius,radius,radius); - mem.SetBrush( wxBrush(bg) ); - mem.SetPen( wxPen(bg) ); - mem.DrawCircle(radius,radius,radius-penWidth); - - // draw handle - int lineStart = radius + (radius-penWidth/2) * 707 / 1000; // 707 / 1000 = 0.707 = 1/sqrt(2); - - mem.SetPen( wxPen(fg) ); - mem.SetBrush( wxBrush(fg) ); - int handleCornerShift = penWidth * 707 / 1000 / 2; // 707 / 1000 = 0.707 = 1/sqrt(2); - handleCornerShift = WXMAX( handleCornerShift, 1 ); - int handleBase = 4 * x / 20; - int handleLength = 2*handleBase+1; - wxPoint handlePolygon[] = - { - wxPoint(-handleCornerShift,+handleCornerShift), - wxPoint(+handleCornerShift,-handleCornerShift), - wxPoint(multiplier*handleLength/2+handleCornerShift,multiplier*handleLength/2-handleCornerShift), - wxPoint(multiplier*handleLength/2-handleCornerShift,multiplier*handleLength/2+handleCornerShift), - }; - mem.DrawPolygon(WXSIZEOF(handlePolygon),handlePolygon,lineStart,lineStart); - - // draw drop triangle - int triangleX = 13 * x / 20; - int triangleY = 5 * x / 20; - int triangleBase = 3 * x / 20; - int triangleFactor = triangleBase*2+1; - if ( renderDrop ) - { - wxPoint dropPolygon[] = - { - wxPoint(multiplier*0,multiplier*0), // triangle left - wxPoint(multiplier*triangleFactor-1,multiplier*0), // triangle right - wxPoint(multiplier*triangleFactor/2,multiplier*triangleFactor/2), // triangle bottom - }; - mem.DrawPolygon(WXSIZEOF(dropPolygon),dropPolygon,multiplier*triangleX,multiplier*triangleY); - } - mem.SelectObject(wxNullBitmap); - - //=============================================================================== - // end drawing code - //=============================================================================== - - if ( multiplier != 1 ) - { - RescaleBitmap(bitmap, wxSize(x, y)); - } - if ( !renderDrop ) - { - // Trim the edge where the arrow would have gone - bitmap = bitmap.GetSubBitmap(wxRect(0,0, y,y)); - } - - return bitmap; -} - -wxBitmap wxSearchCtrl::RenderCancelBitmap( int x, int y ) -{ - wxColour bg = GetBackgroundColour(); - wxColour fg = GetForegroundColour().ChangeLightness(LIGHT_STEP); - - //=============================================================================== - // begin drawing code - //=============================================================================== - // image stats - - // total size 14x14 - // force 1:1 ratio - if ( x > y ) - { - // x is too big - x = y; - } - else - { - // y is too big - y = x; - } - - // 14x14 circle - // cross line starts (4,4)-(10,10) - // drop (13,16)-(19,6)-(16,9) - - int multiplier = GetMultiplier(); - - int penWidth = multiplier * x / 14; - - wxBitmap bitmap( multiplier*x, multiplier*y ); - wxMemoryDC mem; - mem.SelectObject(bitmap); - - // clear background - mem.SetBrush( wxBrush(bg) ); - mem.SetPen( wxPen(bg) ); - mem.DrawRectangle(0,0,bitmap.GetWidth(),bitmap.GetHeight()); - - // draw drop glass - mem.SetBrush( wxBrush(fg) ); - mem.SetPen( wxPen(fg) ); - int radius = multiplier*x/2; - mem.DrawCircle(radius,radius,radius); - - // draw cross - int lineStartBase = 4 * x / 14; - int lineLength = x - 2*lineStartBase; - - mem.SetPen( wxPen(bg) ); - mem.SetBrush( wxBrush(bg) ); - int handleCornerShift = penWidth/2; - handleCornerShift = WXMAX( handleCornerShift, 1 ); - wxPoint handlePolygon[] = - { - wxPoint(-handleCornerShift,+handleCornerShift), - wxPoint(+handleCornerShift,-handleCornerShift), - wxPoint(multiplier*lineLength+handleCornerShift,multiplier*lineLength-handleCornerShift), - wxPoint(multiplier*lineLength-handleCornerShift,multiplier*lineLength+handleCornerShift), - }; - mem.DrawPolygon(WXSIZEOF(handlePolygon),handlePolygon,multiplier*lineStartBase,multiplier*lineStartBase); - wxPoint handlePolygon2[] = - { - wxPoint(+handleCornerShift,+handleCornerShift), - wxPoint(-handleCornerShift,-handleCornerShift), - wxPoint(multiplier*lineLength-handleCornerShift,-multiplier*lineLength-handleCornerShift), - wxPoint(multiplier*lineLength+handleCornerShift,-multiplier*lineLength+handleCornerShift), - }; - mem.DrawPolygon(WXSIZEOF(handlePolygon2),handlePolygon2,multiplier*lineStartBase,multiplier*(x-lineStartBase)); - - //=============================================================================== - // end drawing code - //=============================================================================== - - if ( multiplier != 1 ) - { - RescaleBitmap(bitmap, wxSize(x, y)); - } - - return bitmap; -} - -void wxSearchCtrl::RecalcBitmaps() -{ - if ( !m_text ) - { - return; - } - wxSize sizeText = m_text->GetBestSize(); - - int bitmapHeight = sizeText.y - 4; - int bitmapWidth = sizeText.y * 20 / 14; - - if ( !m_searchBitmapUser ) - { - if ( - !m_searchBitmap.IsOk() || - m_searchBitmap.GetHeight() != bitmapHeight || - m_searchBitmap.GetWidth() != bitmapWidth - ) - { - m_searchBitmap = RenderSearchBitmap(bitmapWidth,bitmapHeight,false); - if ( !HasMenu() ) - { - m_searchButton->SetBitmapLabel(m_searchBitmap); - } - } - // else this bitmap was set by user, don't alter - } - -#if wxUSE_MENUS - if ( !m_searchMenuBitmapUser ) - { - if ( - !m_searchMenuBitmap.IsOk() || - m_searchMenuBitmap.GetHeight() != bitmapHeight || - m_searchMenuBitmap.GetWidth() != bitmapWidth - ) - { - m_searchMenuBitmap = RenderSearchBitmap(bitmapWidth,bitmapHeight,true); - if ( m_menu ) - { - m_searchButton->SetBitmapLabel(m_searchMenuBitmap); - } - } - // else this bitmap was set by user, don't alter - } -#endif // wxUSE_MENUS - - if ( !m_cancelBitmapUser ) - { - if ( - !m_cancelBitmap.IsOk() || - m_cancelBitmap.GetHeight() != bitmapHeight || - m_cancelBitmap.GetWidth() != bitmapHeight - ) - { - m_cancelBitmap = RenderCancelBitmap(bitmapHeight,bitmapHeight); // square - m_cancelButton->SetBitmapLabel(m_cancelBitmap); - } - // else this bitmap was set by user, don't alter - } -} - -void wxSearchCtrl::OnCancelButton( wxCommandEvent& event ) -{ - m_text->Clear(); - event.Skip(); -} - -void wxSearchCtrl::OnSetFocus( wxFocusEvent& /*event*/ ) -{ - if ( m_text ) - { - m_text->SetFocus(); - } -} - -void wxSearchCtrl::OnSize( wxSizeEvent& WXUNUSED(event) ) -{ - LayoutControls(); -} - -#if wxUSE_MENUS - -void wxSearchCtrl::PopupSearchMenu() -{ - if ( m_menu ) - { - wxSize size = GetSize(); - PopupMenu( m_menu, 0, size.y ); - } -} - -#endif // wxUSE_MENUS - -#endif // !wxUSE_NATIVE_SEARCH_CONTROL - -#endif // wxUSE_SEARCHCTRL diff --git a/Externals/wxWidgets3/src/generic/statbmpg.cpp b/Externals/wxWidgets3/src/generic/statbmpg.cpp deleted file mode 100644 index 285c86d798..0000000000 --- a/Externals/wxWidgets3/src/generic/statbmpg.cpp +++ /dev/null @@ -1,103 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/generic/statbmpg.cpp -// Purpose: wxGenericStaticBitmap -// Author: Marcin Wojdyr, Stefan Csomor -// Created: 2008-06-16 -// Copyright: wxWidgets developers -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#include "wx/wxprec.h" - -#if wxUSE_STATBMP - -#ifndef WX_PRECOMP - #include "wx/dcclient.h" -#endif - -#include "wx/generic/statbmpg.h" - -#if wxUSE_GRAPHICS_CONTEXT - #include "wx/graphics.h" - #include "wx/scopedptr.h" -#else - #include "wx/image.h" - #include "wx/math.h" -#endif - -bool wxGenericStaticBitmap::Create(wxWindow *parent, wxWindowID id, - const wxBitmap& bitmap, - const wxPoint& pos, const wxSize& size, - long style, const wxString& name) -{ - if (! wxControl::Create(parent, id, pos, size, style, - wxDefaultValidator, name)) - return false; - m_scaleMode = Scale_None; - SetBitmap(bitmap); - Connect(wxEVT_PAINT, wxPaintEventHandler(wxGenericStaticBitmap::OnPaint)); - return true; -} - -void wxGenericStaticBitmap::OnPaint(wxPaintEvent& WXUNUSED(event)) -{ - if ( !m_bitmap.IsOk() ) - return; - - wxPaintDC dc(this); - const wxSize drawSize = GetClientSize(); - const wxSize bmpSize = m_bitmap.GetSize(); - wxDouble w = 0; - wxDouble h = 0; - switch ( m_scaleMode ) - { - case Scale_None: - dc.DrawBitmap(m_bitmap, 0, 0, true); - return; - case Scale_Fill: - w = drawSize.x; - h = drawSize.y; - break; - case Scale_AspectFill: - case Scale_AspectFit: - { - wxDouble scaleFactor; - wxDouble scaleX = (wxDouble)drawSize.x / (wxDouble)bmpSize.x; - wxDouble scaleY = (wxDouble)drawSize.y / (wxDouble)bmpSize.y; - if ( ( m_scaleMode == Scale_AspectFit && scaleY < scaleX ) || - ( m_scaleMode == Scale_AspectFill && scaleY > scaleX ) ) - scaleFactor = scaleY; - else - scaleFactor = scaleX; - - w = bmpSize.x * scaleFactor; - h = bmpSize.y * scaleFactor; - - break; - } - } - - wxASSERT_MSG(w, wxS("Unknown scale mode")); - - wxDouble x = (drawSize.x - w) / 2; - wxDouble y = (drawSize.y - h) / 2; -#if wxUSE_GRAPHICS_CONTEXT - wxScopedPtr const - gc(wxGraphicsRenderer::GetDefaultRenderer()->CreateContext(dc)); - gc->DrawBitmap(m_bitmap, x, y, w, h); -#else - wxImage img = m_bitmap.ConvertToImage(); - img.Rescale(wxRound(w), wxRound(h), wxIMAGE_QUALITY_HIGH); - dc.DrawBitmap(wxBitmap(img), wxRound(x), wxRound(y), true); -#endif -} - -// under OSX_cocoa is a define, avoid duplicate info -#ifndef wxGenericStaticBitmap - -wxIMPLEMENT_DYNAMIC_CLASS(wxGenericStaticBitmap, wxStaticBitmapBase); - -#endif - -#endif // wxUSE_STATBMP - diff --git a/Externals/wxWidgets3/src/generic/statline.cpp b/Externals/wxWidgets3/src/generic/statline.cpp deleted file mode 100644 index a36445889b..0000000000 --- a/Externals/wxWidgets3/src/generic/statline.cpp +++ /dev/null @@ -1,85 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/generic/statline.cpp -// Purpose: a generic wxStaticLine class -// Author: Vadim Zeitlin -// Created: 28.06.99 -// Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/wxprec.h" - -// For compilers that support precompilation, includes "wx.h". - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_STATLINE - -#include "wx/statline.h" - -#ifndef WX_PRECOMP - #include "wx/statbox.h" -#endif - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxStaticLine -// ---------------------------------------------------------------------------- - -bool wxStaticLine::Create( wxWindow *parent, - wxWindowID id, - const wxPoint &pos, - const wxSize &size, - long style, - const wxString &name) -{ - m_statbox = NULL; - - if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) ) - return false; - - // ok, this is ugly but it's better than nothing: use a thin static box to - // emulate static line - - wxSize sizeReal = AdjustSize(size); - - m_statbox = new wxStaticBox(parent, id, wxEmptyString, pos, sizeReal, style, name); - - return true; -} - -wxStaticLine::~wxStaticLine() -{ - delete m_statbox; -} - -WXWidget wxStaticLine::GetMainWidget() const -{ - return m_statbox->GetMainWidget(); -} - -void wxStaticLine::DoSetSize(int x, int y, int width, int height, int sizeFlags) -{ - m_statbox->SetSize(x, y, width, height, sizeFlags); -} - -void wxStaticLine::DoMoveWindow(int x, int y, int width, int height) -{ - m_statbox->SetSize(x, y, width, height); -} - -#endif - // wxUSE_STATLINE diff --git a/Externals/wxWidgets3/src/generic/stattextg.cpp b/Externals/wxWidgets3/src/generic/stattextg.cpp deleted file mode 100644 index a8b4b5c150..0000000000 --- a/Externals/wxWidgets3/src/generic/stattextg.cpp +++ /dev/null @@ -1,166 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/generic/stattextg.cpp -// Purpose: wxGenericStaticText -// Author: Marcin Wojdyr -// Created: 2008-06-26 -// Copyright: Marcin Wojdyr -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_STATTEXT - -#ifndef WX_PRECOMP - #include "wx/dcclient.h" - #include "wx/settings.h" - #include "wx/validate.h" -#endif - -#include "wx/generic/stattextg.h" - -#if wxUSE_MARKUP - #include "wx/generic/private/markuptext.h" -#endif // wxUSE_MARKUP - -wxIMPLEMENT_DYNAMIC_CLASS(wxGenericStaticText, wxStaticTextBase); - - -bool wxGenericStaticText::Create(wxWindow *parent, - wxWindowID id, - const wxString &label, - const wxPoint &pos, - const wxSize &size, - long style, - const wxString &name) -{ - if ( !wxControl::Create(parent, id, pos, size, style, - wxDefaultValidator, name) ) - return false; - - SetLabel(label); - SetInitialSize(size); - Connect(wxEVT_PAINT, wxPaintEventHandler(wxGenericStaticText::OnPaint)); - return true; -} - -wxGenericStaticText::~wxGenericStaticText() -{ -#if wxUSE_MARKUP - delete m_markupText; -#endif // wxUSE_MARKUP -} - -void wxGenericStaticText::DoDrawLabel(wxDC& dc, const wxRect& rect) -{ -#if wxUSE_MARKUP - if ( m_markupText ) - m_markupText->Render(dc, rect, wxMarkupText::Render_ShowAccels); - else -#endif // wxUSE_MARKUP - dc.DrawLabel(m_label, rect, GetAlignment(), m_mnemonic); -} - -void wxGenericStaticText::OnPaint(wxPaintEvent& WXUNUSED(event)) -{ - wxPaintDC dc(this); - - wxRect rect = GetClientRect(); - if ( !IsEnabled() ) - { - // draw shadow of the text - dc.SetTextForeground( - wxSystemSettings::GetColour(wxSYS_COLOUR_BTNHIGHLIGHT)); - wxRect rectShadow = rect; - rectShadow.Offset(1, 1); - DoDrawLabel(dc, rectShadow); - dc.SetTextForeground( - wxSystemSettings::GetColour(wxSYS_COLOUR_BTNSHADOW)); - } - DoDrawLabel(dc, rect); -} - - -wxSize wxGenericStaticText::DoGetBestClientSize() const -{ - wxClientDC dc(wxConstCast(this, wxGenericStaticText)); - -#if wxUSE_MARKUP - if ( m_markupText ) - return m_markupText->Measure(dc); -#endif // wxUSE_MARKUP - - return dc.GetMultiLineTextExtent(GetLabel()); -} - -void wxGenericStaticText::SetLabel(const wxString& label) -{ - wxControl::SetLabel(label); - DoSetLabel(GetEllipsizedLabel()); - - InvalidateBestSize(); - - if ( !IsEllipsized() ) - AutoResizeIfNecessary(); - -#if wxUSE_MARKUP - if ( m_markupText ) - { - delete m_markupText; - m_markupText = NULL; - } -#endif // wxUSE_MARKUP - - Refresh(); -} - -void wxGenericStaticText::DoSetLabel(const wxString& label) -{ - m_mnemonic = FindAccelIndex(label, &m_label); -} - -#if wxUSE_MARKUP - -bool wxGenericStaticText::DoSetLabelMarkup(const wxString& markup) -{ - if ( !wxStaticTextBase::DoSetLabelMarkup(markup) ) - return false; - - if ( !m_markupText ) - m_markupText = new wxMarkupText(markup); - else - m_markupText->SetMarkup(markup); - - AutoResizeIfNecessary(); - - Refresh(); - - return true; -} - -#endif // wxUSE_MARKUP - -bool wxGenericStaticText::SetFont(const wxFont &font) -{ - if ( !wxControl::SetFont(font) ) - return false; - - AutoResizeIfNecessary(); - - Refresh(); - return true; -} - -void wxGenericStaticText::DoSetSize(int x, int y, int width, int height, - int sizeFlags) -{ - wxStaticTextBase::DoSetSize(x, y, width, height, sizeFlags); - UpdateLabel(); -} - - -#endif // wxUSE_STATTEXT diff --git a/Externals/wxWidgets3/src/generic/statusbr.cpp b/Externals/wxWidgets3/src/generic/statusbr.cpp deleted file mode 100644 index 46af9b0877..0000000000 --- a/Externals/wxWidgets3/src/generic/statusbr.cpp +++ /dev/null @@ -1,560 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/generic/statusbr.cpp -// Purpose: wxStatusBarGeneric class implementation -// Author: Julian Smart -// Modified by: Francesco Montorsi -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_STATUSBAR - -#include "wx/statusbr.h" - -#ifndef WX_PRECOMP - #include "wx/settings.h" - #include "wx/dcclient.h" - #include "wx/toplevel.h" - #include "wx/control.h" -#endif - -#ifdef __WXGTK20__ - #include - #include "wx/gtk/private.h" - #include "wx/gtk/private/gtk2-compat.h" -#endif - -// we only have to do it here when we use wxStatusBarGeneric in addition to the -// standard wxStatusBar class, if wxStatusBarGeneric is the same as -// wxStatusBar, then the corresponding wxIMPLEMENT_DYNAMIC_CLASS is already in -// common/statbar.cpp -#if defined(__WXMAC__) || \ - (defined(wxUSE_NATIVE_STATUSBAR) && wxUSE_NATIVE_STATUSBAR) - #include "wx/generic/statusbr.h" - - wxIMPLEMENT_DYNAMIC_CLASS(wxStatusBarGeneric, wxWindow); -#endif // wxUSE_NATIVE_STATUSBAR - -// Default status border dimensions -#define wxTHICK_LINE_BORDER 2 - -// Margin between the field text and the field rect -#define wxFIELD_TEXT_MARGIN 2 - -// ---------------------------------------------------------------------------- -// GTK+ signal handler -// ---------------------------------------------------------------------------- - -#if defined( __WXGTK20__ ) -#if GTK_CHECK_VERSION(2,12,0) -extern "C" { -static -gboolean statusbar_query_tooltip(GtkWidget* WXUNUSED(widget), - gint x, - gint y, - gboolean WXUNUSED(keyboard_mode), - GtkTooltip *tooltip, - wxStatusBar* statbar) -{ - int n = statbar->GetFieldFromPoint(wxPoint(x,y)); - if (n == wxNOT_FOUND) - return FALSE; - - // should we show the tooltip for the n-th pane of the statusbar? - if (!statbar->GetField(n).IsEllipsized()) - return FALSE; // no, it's not useful - - const wxString& str = statbar->GetStatusText(n); - if (str.empty()) - return FALSE; - - gtk_tooltip_set_text(tooltip, wxGTK_CONV_SYS(str)); - return TRUE; -} -} -#endif -#endif - -// ---------------------------------------------------------------------------- -// wxStatusBarGeneric -// ---------------------------------------------------------------------------- - -wxBEGIN_EVENT_TABLE(wxStatusBarGeneric, wxWindow) - EVT_PAINT(wxStatusBarGeneric::OnPaint) - EVT_SIZE(wxStatusBarGeneric::OnSize) -#ifdef __WXGTK20__ - EVT_LEFT_DOWN(wxStatusBarGeneric::OnLeftDown) - EVT_RIGHT_DOWN(wxStatusBarGeneric::OnRightDown) -#endif - EVT_SYS_COLOUR_CHANGED(wxStatusBarGeneric::OnSysColourChanged) -wxEND_EVENT_TABLE() - -void wxStatusBarGeneric::Init() -{ - m_borderX = wxTHICK_LINE_BORDER; - m_borderY = wxTHICK_LINE_BORDER; -} - -wxStatusBarGeneric::~wxStatusBarGeneric() -{ -} - -bool wxStatusBarGeneric::Create(wxWindow *parent, - wxWindowID id, - long style, - const wxString& name) -{ - style |= wxTAB_TRAVERSAL | wxFULL_REPAINT_ON_RESIZE; - if ( !wxWindow::Create(parent, id, - wxDefaultPosition, wxDefaultSize, - style, name) ) - return false; - - // The status bar should have a themed background - SetThemeEnabled( true ); - - InitColours(); - - int height = (int)((11*GetCharHeight())/10 + 2*GetBorderY()); - SetSize(wxDefaultCoord, wxDefaultCoord, wxDefaultCoord, height); - - SetFieldsCount(1); - -#if defined( __WXGTK20__ ) -#if GTK_CHECK_VERSION(2,12,0) - if (HasFlag(wxSTB_SHOW_TIPS) -#ifndef __WXGTK3__ - && gtk_check_version(2,12,0) == NULL -#endif - ) - { - g_object_set(m_widget, "has-tooltip", TRUE, NULL); - g_signal_connect(m_widget, "query-tooltip", - G_CALLBACK(statusbar_query_tooltip), this); - } -#endif -#endif - - return true; -} - -wxSize wxStatusBarGeneric::DoGetBestSize() const -{ - int width, height; - - // best width is the width of the parent - if (GetParent()) - GetParent()->GetClientSize(&width, NULL); - else - width = 80; // a dummy value - - // best height is as calculated above in Create() - height = (int)((11*GetCharHeight())/10 + 2*GetBorderY()); - - return wxSize(width, height); -} - -void wxStatusBarGeneric::DoUpdateStatusText(int number) -{ - wxRect rect; - GetFieldRect(number, rect); - - Refresh(true, &rect); - - // it's common to show some text in the status bar before starting a - // relatively lengthy operation, ensure that the text is shown to the - // user immediately and not after the lengthy operation end - Update(); -} - -void wxStatusBarGeneric::SetStatusWidths(int n, const int widths_field[]) -{ - // only set status widths when n == number of statuswindows - wxCHECK_RET( (size_t)n == m_panes.GetCount(), wxT("status bar field count mismatch") ); - - wxStatusBarBase::SetStatusWidths(n, widths_field); - - // update cache - DoUpdateFieldWidths(); -} - -void wxStatusBarGeneric::DoUpdateFieldWidths() -{ - m_lastClientSize = GetClientSize(); - - // recompute the cache of the field widths if the status bar width has changed - m_widthsAbs = CalculateAbsWidths(m_lastClientSize.x); -} - -bool wxStatusBarGeneric::ShowsSizeGrip() const -{ - if ( !HasFlag(wxSTB_SIZEGRIP) ) - return false; - - wxTopLevelWindow * const - tlw = wxDynamicCast(wxGetTopLevelParent(GetParent()), wxTopLevelWindow); - return tlw && !tlw->IsMaximized() && tlw->HasFlag(wxRESIZE_BORDER); -} - -void wxStatusBarGeneric::DrawFieldText(wxDC& dc, const wxRect& rect, int i, int textHeight) -{ - wxString text(GetStatusText(i)); - if (text.empty()) - return; // optimization - - int xpos = rect.x + wxFIELD_TEXT_MARGIN, - maxWidth = rect.width - 2*wxFIELD_TEXT_MARGIN, - ypos = (int) (((rect.height - textHeight) / 2) + rect.y + 0.5); - - if (ShowsSizeGrip()) - { - // don't write text over the size grip: - // NOTE: overloading DoGetClientSize() and GetClientAreaOrigin() wouldn't - // work because the adjustment needs to be done only when drawing - // the field text and not also when drawing the background, the - // size grip itself, etc - if ((GetLayoutDirection() == wxLayout_RightToLeft && i == 0) || - (GetLayoutDirection() != wxLayout_RightToLeft && - i == (int)m_panes.GetCount()-1)) - { - const wxRect& gripRc = GetSizeGripRect(); - - // NOTE: we don't need any special treatment wrt to the layout direction - // since DrawText() will automatically adjust the origin of the - // text accordingly to the layout in use - - maxWidth -= gripRc.width; - } - } - - // eventually ellipsize the text so that it fits the field width - - wxEllipsizeMode ellmode = (wxEllipsizeMode)-1; - if (HasFlag(wxSTB_ELLIPSIZE_START)) ellmode = wxELLIPSIZE_START; - else if (HasFlag(wxSTB_ELLIPSIZE_MIDDLE)) ellmode = wxELLIPSIZE_MIDDLE; - else if (HasFlag(wxSTB_ELLIPSIZE_END)) ellmode = wxELLIPSIZE_END; - - if (ellmode == (wxEllipsizeMode)-1) - { - // if we have the wxSTB_SHOW_TIPS we must set the ellipsized flag even if - // we don't ellipsize the text but just truncate it - if (HasFlag(wxSTB_SHOW_TIPS)) - SetEllipsizedFlag(i, dc.GetTextExtent(text).GetWidth() > maxWidth); - - dc.SetClippingRegion(rect); - } - else - { - text = wxControl::Ellipsize(text, dc, - ellmode, - maxWidth, - wxELLIPSIZE_FLAGS_EXPAND_TABS); - // Ellipsize() will do something only if necessary - - // update the ellipsization status for this pane; this is used later to - // decide whether a tooltip should be shown or not for this pane - // (if we have wxSTB_SHOW_TIPS) - SetEllipsizedFlag(i, text != GetStatusText(i)); - } - -#if defined( __WXGTK__ ) || defined(__WXMAC__) - xpos++; - ypos++; -#endif - - // draw the text - dc.DrawText(text, xpos, ypos); - - if (ellmode == (wxEllipsizeMode)-1) - dc.DestroyClippingRegion(); -} - -void wxStatusBarGeneric::DrawField(wxDC& dc, int i, int textHeight) -{ - wxRect rect; - GetFieldRect(i, rect); - - if (rect.GetWidth() <= 0) - return; // happens when the status bar is shrunk in a very small area! - - int style = m_panes[i].GetStyle(); - if (style == wxSB_RAISED || style == wxSB_SUNKEN) - { - // Draw border - // For wxSB_SUNKEN: paint a grey background, plus 3-d border (one black rectangle) - // Inside this, left and top sides (dark grey). Bottom and right (white). - // Reverse it for wxSB_RAISED - - dc.SetPen((style == wxSB_RAISED) ? m_mediumShadowPen : m_hilightPen); - - // Right and bottom lines - dc.DrawLine(rect.x + rect.width, rect.y, - rect.x + rect.width, rect.y + rect.height); - dc.DrawLine(rect.x + rect.width, rect.y + rect.height, - rect.x, rect.y + rect.height); - - dc.SetPen((style == wxSB_RAISED) ? m_hilightPen : m_mediumShadowPen); - - // Left and top lines - dc.DrawLine(rect.x, rect.y + rect.height, - rect.x, rect.y); - dc.DrawLine(rect.x, rect.y, - rect.x + rect.width, rect.y); - } - - DrawFieldText(dc, rect, i, textHeight); -} - -bool wxStatusBarGeneric::GetFieldRect(int n, wxRect& rect) const -{ - wxCHECK_MSG( (n >= 0) && ((size_t)n < m_panes.GetCount()), false, - wxT("invalid status bar field index") ); - - // We can be called from the user-defined EVT_SIZE handler in which case - // the widths haven't been updated yet and we need to do it now. This is - // not very efficient as we keep testing the size but there is no other way - // to make the code needing the up-to-date fields sizes in its EVT_SIZE to - // work. - if ( GetClientSize().x != m_lastClientSize.x ) - { - const_cast(this)->DoUpdateFieldWidths(); - } - - if (m_widthsAbs.IsEmpty()) - return false; - - rect.x = 0; - for ( int i = 0; i < n; i++ ) - rect.x += m_widthsAbs[i]; - rect.x += m_borderX; - - rect.y = m_borderY; - rect.width = m_widthsAbs[n] - 2*m_borderX; - rect.height = m_lastClientSize.y - 2*m_borderY; - - return true; -} - -int wxStatusBarGeneric::GetFieldFromPoint(const wxPoint& pt) const -{ - if (m_widthsAbs.IsEmpty()) - return wxNOT_FOUND; - - // NOTE: we explicitly don't take in count the borders since they are only - // useful when rendering the status text, not for hit-test computations - - if (pt.y <= 0 || pt.y >= m_lastClientSize.y) - return wxNOT_FOUND; - - int x = 0; - for ( size_t i = 0; i < m_panes.GetCount(); i++ ) - { - if (pt.x > x && pt.x < x+m_widthsAbs[i]) - return i; - - x += m_widthsAbs[i]; - } - - return wxNOT_FOUND; -} - -void wxStatusBarGeneric::InitColours() -{ - m_mediumShadowPen = wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW)); - m_hilightPen = wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DHILIGHT)); -} - -void wxStatusBarGeneric::SetMinHeight(int height) -{ - // check that this min height is not less than minimal height for the - // current font (min height is as calculated above in Create() except for border) - int minHeight = (int)((11*GetCharHeight())/10); - - if ( height > minHeight ) - SetSize(wxDefaultCoord, wxDefaultCoord, wxDefaultCoord, height + 2*m_borderY); -} - -wxRect wxStatusBarGeneric::GetSizeGripRect() const -{ - int width, height; - wxWindow::DoGetClientSize(&width, &height); - - if (GetLayoutDirection() == wxLayout_RightToLeft) - return wxRect(2, 2, height-2, height-4); - else - return wxRect(width-height-2, 2, height-2, height-4); -} - -// ---------------------------------------------------------------------------- -// wxStatusBarGeneric - event handlers -// ---------------------------------------------------------------------------- - -void wxStatusBarGeneric::OnPaint(wxPaintEvent& WXUNUSED(event) ) -{ - wxPaintDC dc(this); - -#ifdef __WXGTK20__ - // Draw grip first - if ( ShowsSizeGrip() ) - { - const wxRect& rc = GetSizeGripRect(); -#ifdef __WXGTK3__ - GtkWidget* toplevel = gtk_widget_get_toplevel(m_widget); - GdkRectangle rect; - wxGCC_WARNING_SUPPRESS(deprecated-declarations) - if (toplevel && (!gtk_window_get_resize_grip_area(GTK_WINDOW(toplevel), &rect) || - rect.width == 0 || rect.height == 0)) - wxGCC_WARNING_RESTORE() - { - GtkStyleContext* sc = gtk_widget_get_style_context(toplevel); - gtk_style_context_save(sc); - gtk_style_context_add_class(sc, GTK_STYLE_CLASS_GRIP); - GtkJunctionSides sides = GTK_JUNCTION_CORNER_BOTTOMRIGHT; - if (GetLayoutDirection() == wxLayout_RightToLeft) - sides = GTK_JUNCTION_CORNER_BOTTOMLEFT; - gtk_style_context_set_junction_sides(sc, sides); - gtk_render_handle(sc, - static_cast(dc.GetImpl()->GetCairoContext()), - rc.x, rc.y, rc.width, rc.height); - gtk_style_context_restore(sc); - } -#else - GdkWindowEdge edge = - GetLayoutDirection() == wxLayout_RightToLeft ? GDK_WINDOW_EDGE_SOUTH_WEST : - GDK_WINDOW_EDGE_SOUTH_EAST; - gtk_paint_resize_grip(gtk_widget_get_style(m_widget), - GTKGetDrawingWindow(), - gtk_widget_get_state(m_widget), - NULL, - m_widget, - "statusbar", - edge, - rc.x, rc.y, rc.width, rc.height ); -#endif - } -#endif // __WXGTK20__ - - if (GetFont().IsOk()) - dc.SetFont(GetFont()); - - // compute char height only once for all panes: - int textHeight = dc.GetCharHeight(); - - dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT); - for (size_t i = 0; i < m_panes.GetCount(); i ++) - DrawField(dc, i, textHeight); -} - -void wxStatusBarGeneric::OnSysColourChanged(wxSysColourChangedEvent& event) -{ - InitColours(); - - // Propagate the event to the non-top-level children - wxWindow::OnSysColourChanged(event); -} - -#ifdef __WXGTK20__ -void wxStatusBarGeneric::OnLeftDown(wxMouseEvent& event) -{ - int width, height; - GetClientSize(&width, &height); - - GtkWidget* ancestor = gtk_widget_get_toplevel(m_widget); -#ifdef __WXGTK3__ - GdkRectangle rect; - wxGCC_WARNING_SUPPRESS(deprecated-declarations) - if (ancestor && gtk_window_get_resize_grip_area(GTK_WINDOW(ancestor), &rect) && - rect.width && rect.height) - wxGCC_WARNING_RESTORE() - { - ancestor = NULL; - } -#endif - - if (ancestor && ShowsSizeGrip() && event.GetX() > width - height) - { - GdkWindow *source = GTKGetDrawingWindow(); - - int org_x = 0; - int org_y = 0; - gdk_window_get_origin( source, &org_x, &org_y ); - - if (GetLayoutDirection() == wxLayout_RightToLeft) - { - gtk_window_begin_resize_drag (GTK_WINDOW (ancestor), - GDK_WINDOW_EDGE_SOUTH_WEST, - 1, - org_x - event.GetX() + GetSize().x , - org_y + event.GetY(), - 0); - } - else - { - gtk_window_begin_resize_drag (GTK_WINDOW (ancestor), - GDK_WINDOW_EDGE_SOUTH_EAST, - 1, - org_x + event.GetX(), - org_y + event.GetY(), - 0); - } - } - else - { - event.Skip( true ); - } -} - -void wxStatusBarGeneric::OnRightDown(wxMouseEvent& event) -{ - int width, height; - GetClientSize(&width, &height); - - GtkWidget* ancestor = gtk_widget_get_toplevel(m_widget); -#ifdef __WXGTK3__ - GdkRectangle rect; - wxGCC_WARNING_SUPPRESS(deprecated-declarations) - if (ancestor && gtk_window_get_resize_grip_area(GTK_WINDOW(ancestor), &rect) && - rect.width && rect.height) - wxGCC_WARNING_RESTORE() - { - ancestor = NULL; - } -#endif - - if (ancestor && ShowsSizeGrip() && event.GetX() > width - height) - { - GdkWindow *source = GTKGetDrawingWindow(); - - int org_x = 0; - int org_y = 0; - gdk_window_get_origin( source, &org_x, &org_y ); - - gtk_window_begin_move_drag (GTK_WINDOW (ancestor), - 2, - org_x + event.GetX(), - org_y + event.GetY(), - 0); - } - else - { - event.Skip( true ); - } -} -#endif // __WXGTK20__ - -void wxStatusBarGeneric::OnSize(wxSizeEvent& event) -{ - DoUpdateFieldWidths(); - - event.Skip(); -} - -#endif // wxUSE_STATUSBAR diff --git a/Externals/wxWidgets3/src/generic/tabg.cpp b/Externals/wxWidgets3/src/generic/tabg.cpp deleted file mode 100644 index 2580a9aece..0000000000 --- a/Externals/wxWidgets3/src/generic/tabg.cpp +++ /dev/null @@ -1,1288 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/generic/tabg.cpp -// Purpose: Generic tabbed dialogs; used by wxMotif's wxNotebook -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#ifndef WX_PRECOMP - #include "wx/settings.h" - #include "wx/intl.h" - #include "wx/dcclient.h" - #include "wx/math.h" -#endif - -#include -#include -#include - -#include "wx/generic/tabg.h" -#include "wx/listimpl.cpp" - -WX_DEFINE_LIST(wxTabLayerList) - -// not defined: use old, square tab implementation (fills in tabs) -// defined: use new, rounded tab implementation (doesn't colour in tabs) -// #define wxUSE_NEW_METHOD - -wxIMPLEMENT_DYNAMIC_CLASS(wxTabControl, wxObject); - -// wxIMPLEMENT_DYNAMIC_CLASS(wxTabLayer, wxList); - -wxTabControl::wxTabControl(wxTabView *v) -{ - m_view = v; - m_isSelected = false; - m_offsetX = 0; - m_offsetY = 0; - m_width = 0; - m_height = 0; - m_id = 0; - m_rowPosition = 0; - m_colPosition = 0; -} - -wxTabControl::~wxTabControl(void) -{ -} - -void wxTabControl::OnDraw(wxDC& dc, bool lastInRow) -{ - // Old, but in some ways better (drawing opaque tabs) -#ifndef wxUSE_NEW_METHOD - if (!m_view) - return; - - // Top-left of tab view area - int viewX = m_view->GetViewRect().x; - int viewY = m_view->GetViewRect().y; - - // Top-left of tab control - int tabX = GetX() + viewX; - int tabY = GetY() + viewY; - int tabHeightInc = 0; - if (m_isSelected) - { - tabHeightInc = (m_view->GetTabSelectionHeight() - m_view->GetTabHeight()); - tabY -= tabHeightInc; - } - - dc.SetPen(*wxTRANSPARENT_PEN); - - // Draw grey background - if (m_view->GetTabStyle() & wxTAB_STYLE_COLOUR_INTERIOR) - { - if(m_view->GetBackgroundBrush()) - dc.SetBrush(*m_view->GetBackgroundBrush()); - - // Add 1 because the pen is transparent. Under Motif, may be different. -#ifdef __WXMOTIF__ - dc.DrawRectangle(tabX, tabY, (GetWidth()+1), (GetHeight() + tabHeightInc)); -#else - dc.DrawRectangle(tabX, tabY, (GetWidth()+1), (GetHeight() + 1 + tabHeightInc)); -#endif - } - - // Draw highlight and shadow - dc.SetPen(*m_view->GetHighlightPen()); - - // Calculate the top of the tab beneath. It's the height of the tab, MINUS - // a bit if the tab below happens to be selected. Check. - wxTabControl *tabBeneath = NULL; - int subtractThis = 0; - if (GetColPosition() > 0) - tabBeneath = m_view->FindTabControlForPosition(GetColPosition() - 1, GetRowPosition()); - if (tabBeneath && tabBeneath->IsSelected()) - subtractThis = (m_view->GetTabSelectionHeight() - m_view->GetTabHeight()); - - // Vertical highlight: if first tab, draw to bottom of view - if (tabX == m_view->GetViewRect().x && (m_view->GetTabStyle() & wxTAB_STYLE_DRAW_BOX)) - dc.DrawLine(tabX, tabY, tabX, (m_view->GetViewRect().y + m_view->GetViewRect().height)); - else if (tabX == m_view->GetViewRect().x) - // Not box drawing, just to top of view. - dc.DrawLine(tabX, tabY, tabX, (m_view->GetViewRect().y)); - else - dc.DrawLine(tabX, tabY, tabX, (tabY + GetHeight() + tabHeightInc - subtractThis)); - - dc.DrawLine(tabX, tabY, (tabX + GetWidth()), tabY); - dc.SetPen(*m_view->GetShadowPen()); - - // Test if we're outside the right-hand edge of the view area - if (((tabX + GetWidth()) >= m_view->GetViewRect().x + m_view->GetViewRect().width) && (m_view->GetTabStyle() & wxTAB_STYLE_DRAW_BOX)) - { - int bottomY = m_view->GetViewRect().y + m_view->GetViewRect().height + GetY() + m_view->GetTabHeight() + m_view->GetTopMargin(); - // Add a tab height since we wish to draw to the bottom of the view. - dc.DrawLine((tabX + GetWidth()), tabY, - (tabX + GetWidth()), bottomY); - - // Calculate the far-right of the view, since we don't wish to - // draw inside that - int rightOfView = m_view->GetViewRect().x + m_view->GetViewRect().width + 1; - - // Draw the horizontal bit to connect to the view rectangle - dc.DrawLine((wxMax((tabX + GetWidth() - m_view->GetHorizontalTabOffset()), rightOfView)), (bottomY-1), - (tabX + GetWidth()), (bottomY-1)); - - // Draw black line to emphasize shadow - dc.SetPen(*wxBLACK_PEN); - dc.DrawLine((tabX + GetWidth() + 1), (tabY+1), - (tabX + GetWidth() + 1), bottomY); - - // Draw the horizontal bit to connect to the view rectangle - dc.DrawLine((wxMax((tabX + GetWidth() - m_view->GetHorizontalTabOffset()), rightOfView)), (bottomY), - (tabX + GetWidth() + 1), (bottomY)); - } - else - { - if (lastInRow) - { - // 25/5/97 UNLESS it's less than the max number of positions in this row - - int topY = m_view->GetViewRect().y - m_view->GetTopMargin(); - - int maxPositions = ((wxTabLayer *)m_view->GetLayers().Item(0)->GetData())->GetCount(); - - // Only down to the bottom of the tab, not to the top of the view - if ( GetRowPosition() < (maxPositions - 1) ) - topY = tabY + GetHeight() + tabHeightInc; - -#ifdef __WXMOTIF__ - topY -= 1; -#endif - - // Shadow - dc.DrawLine((tabX + GetWidth()), tabY, (tabX + GetWidth()), topY); - // Draw black line to emphasize shadow - dc.SetPen(*wxBLACK_PEN); - dc.DrawLine((tabX + GetWidth() + 1), (tabY+1), (tabX + GetWidth() + 1), - topY); - } - else - { - // Calculate the top of the tab beneath. It's the height of the tab, MINUS - // a bit if the tab below (and next col along) happens to be selected. Check. - wxTabControl *tabBeneath = NULL; - int subtractThis = 0; - if (GetColPosition() > 0) - tabBeneath = m_view->FindTabControlForPosition(GetColPosition() - 1, GetRowPosition() + 1); - if (tabBeneath && tabBeneath->IsSelected()) - subtractThis = (m_view->GetTabSelectionHeight() - m_view->GetTabHeight()); - -#ifdef __WXMOTIF__ - subtractThis += 1; -#endif - - // Draw only to next tab down. - dc.DrawLine((tabX + GetWidth()), tabY, - (tabX + GetWidth()), (tabY + GetHeight() + tabHeightInc - subtractThis)); - - // Draw black line to emphasize shadow - dc.SetPen(*wxBLACK_PEN); - dc.DrawLine((tabX + GetWidth() + 1), (tabY+1), (tabX + GetWidth() + 1), - (tabY + GetHeight() + tabHeightInc - subtractThis)); - } - } - - // Draw centered text - int textY = tabY + m_view->GetVerticalTabTextSpacing() + tabHeightInc; - - if (m_isSelected) - dc.SetFont(* m_view->GetSelectedTabFont()); - else - dc.SetFont(* GetFont()); - - wxColour col(m_view->GetTextColour()); - dc.SetTextForeground(col); - dc.SetBackgroundMode(wxTRANSPARENT); - wxCoord textWidth, textHeight; - dc.GetTextExtent(GetLabel(), &textWidth, &textHeight); - - int textX = (int)(tabX + (GetWidth() - textWidth)/2.0); - if (textX < (tabX + 2)) - textX = (tabX + 2); - - dc.SetClippingRegion(tabX, tabY, GetWidth(), GetHeight()); - dc.DrawText(GetLabel(), textX, textY); - dc.DestroyClippingRegion(); - - if (m_isSelected) - { - dc.SetPen(*m_view->GetHighlightPen()); - - // Draw white highlight from the tab's left side to the left hand edge of the view - dc.DrawLine(m_view->GetViewRect().x, (tabY + GetHeight() + tabHeightInc), - tabX, (tabY + GetHeight() + tabHeightInc)); - - // Draw white highlight from the tab's right side to the right hand edge of the view - dc.DrawLine((tabX + GetWidth()), (tabY + GetHeight() + tabHeightInc), - m_view->GetViewRect().x + m_view->GetViewRect().width, (tabY + GetHeight() + tabHeightInc)); - } -#else - // New HEL version with rounder tabs - - if (!m_view) return; - - int tabInc = 0; - if (m_isSelected) - { - tabInc = m_view->GetTabSelectionHeight() - m_view->GetTabHeight(); - } - int tabLeft = GetX() + m_view->GetViewRect().x; - int tabTop = GetY() + m_view->GetViewRect().y - tabInc; - int tabRight = tabLeft + m_view->GetTabWidth(); - int left = m_view->GetViewRect().x; - int top = tabTop + m_view->GetTabHeight() + tabInc; - int right = left + m_view->GetViewRect().width; - int bottom = top + m_view->GetViewRect().height; - - if (m_isSelected) - { - // TAB is selected - draw TAB and the View's full outline - - dc.SetPen(*(m_view->GetHighlightPen())); - wxPoint pnts[10]; - int n = 0; - pnts[n].x = left; pnts[n++].y = bottom; - pnts[n].x = left; pnts[n++].y = top; - pnts[n].x = tabLeft; pnts[n++].y = top; - pnts[n].x = tabLeft; pnts[n++].y = tabTop + 2; - pnts[n].x = tabLeft + 2; pnts[n++].y = tabTop; - pnts[n].x = tabRight - 1; pnts[n++].y = tabTop; - dc.DrawLines(n, pnts); - if (!lastInRow) - { - dc.DrawLine( - (tabRight + 2), - top, - right, - top - ); - } - - dc.SetPen(*(m_view->GetShadowPen())); - dc.DrawLine( - tabRight, - tabTop + 2, - tabRight, - top - ); - dc.DrawLine( - right, - top, - right, - bottom - ); - dc.DrawLine( - right, - bottom, - left, - bottom - ); - - dc.SetPen(*wxBLACK_PEN); - dc.DrawPoint( - tabRight, - tabTop + 1 - ); - dc.DrawPoint( - tabRight + 1, - tabTop + 2 - ); - if (lastInRow) - { - dc.DrawLine( - tabRight + 1, - bottom, - tabRight + 1, - tabTop + 1 - ); - } - else - { - dc.DrawLine( - tabRight + 1, - tabTop + 2, - tabRight + 1, - top - ); - dc.DrawLine( - right + 1, - top, - right + 1, - bottom + 1 - ); - } - dc.DrawLine( - right + 1, - bottom + 1, - left + 1, - bottom + 1 - ); - } - else - { - // TAB is not selected - just draw TAB outline and RH edge - // if the TAB is the last in the row - - int maxPositions = ((wxTabLayer*)m_view->GetLayers().Item(0)->GetData())->GetCount(); - wxTabControl* tabBelow = 0; - wxTabControl* tabBelowRight = 0; - if (GetColPosition() > 0) - { - tabBelow = m_view->FindTabControlForPosition( - GetColPosition() - 1, - GetRowPosition() - ); - } - if (!lastInRow && GetColPosition() > 0) - { - tabBelowRight = m_view->FindTabControlForPosition( - GetColPosition() - 1, - GetRowPosition() + 1 - ); - } - - float raisedTop = top - m_view->GetTabSelectionHeight() + - m_view->GetTabHeight(); - - dc.SetPen(*(m_view->GetHighlightPen())); - wxPoint pnts[10]; - int n = 0; - - pnts[n].x = tabLeft; - - if (tabBelow && tabBelow->IsSelected()) - { - pnts[n++].y = (long)raisedTop; - } - else - { - pnts[n++].y = top; - } - pnts[n].x = tabLeft; pnts[n++].y = tabTop + 2; - pnts[n].x = tabLeft + 2; pnts[n++].y = tabTop; - pnts[n].x = tabRight - 1; pnts[n++].y = tabTop; - dc.DrawLines(n, pnts); - - dc.SetPen(*(m_view->GetShadowPen())); - if (GetRowPosition() >= maxPositions - 1) - { - dc.DrawLine( - tabRight, - (tabTop + 2), - tabRight, - bottom - ); - dc.DrawLine( - tabRight, - bottom, - (tabRight - m_view->GetHorizontalTabOffset()), - bottom - ); - } - else - { - if (tabBelowRight && tabBelowRight->IsSelected()) - { - dc.DrawLine( - tabRight, - (long)raisedTop, - tabRight, - tabTop + 1 - ); - } - else - { - dc.DrawLine( - tabRight, - top - 1, - tabRight, - tabTop + 1 - ); - } - } - - dc.SetPen(*wxBLACK_PEN); - dc.DrawPoint( - tabRight, - tabTop + 1 - ); - dc.DrawPoint( - tabRight + 1, - tabTop + 2 - ); - if (GetRowPosition() >= maxPositions - 1) - { - // draw right hand edge to bottom of view - dc.DrawLine( - tabRight + 1, - bottom + 1, - tabRight + 1, - tabTop + 2 - ); - dc.DrawLine( - tabRight + 1, - bottom + 1, - (tabRight - m_view->GetHorizontalTabOffset()), - bottom + 1 - ); - } - else - { - // draw right hand edge of TAB - if (tabBelowRight && tabBelowRight->IsSelected()) - { - dc.DrawLine( - tabRight + 1, - (long)(raisedTop - 1), - tabRight + 1, - tabTop + 2 - ); - } - else - { - dc.DrawLine( - tabRight + 1, - top - 1, - tabRight + 1, - tabTop + 2 - ); - } - } - } - - // Draw centered text - dc.SetPen(*wxBLACK_PEN); - if (m_isSelected) - { - dc.SetFont(*(m_view->GetSelectedTabFont())); - } - else - { - dc.SetFont(*(GetFont())); - } - - wxColour col(m_view->GetTextColour()); - dc.SetTextForeground(col); - dc.SetBackgroundMode(wxTRANSPARENT); - long textWidth, textHeight; - dc.GetTextExtent(GetLabel(), &textWidth, &textHeight); - - float textX = (tabLeft + tabRight - textWidth) / 2; - float textY = (tabInc + tabTop + m_view->GetVerticalTabTextSpacing()); - - dc.DrawText(GetLabel(), (long)textX, (long)textY); -#endif -} - -bool wxTabControl::HitTest(int x, int y) const -{ - // Top-left of tab control - int tabX1 = GetX() + m_view->GetViewRect().x; - int tabY1 = GetY() + m_view->GetViewRect().y; - - // Bottom-right - int tabX2 = tabX1 + GetWidth(); - int tabY2 = tabY1 + GetHeight(); - - if (x >= tabX1 && y >= tabY1 && x <= tabX2 && y <= tabY2) - return true; - else - return false; -} - -wxIMPLEMENT_DYNAMIC_CLASS(wxTabView, wxObject); - -wxTabView::wxTabView(long style) -{ - m_noTabs = 0; - m_tabStyle = style; - m_tabSelection = -1; - m_tabHeight = 20; - m_tabSelectionHeight = m_tabHeight + 2; - m_tabWidth = 80; - m_tabHorizontalOffset = 10; - m_tabHorizontalSpacing = 2; - m_tabVerticalTextSpacing = 3; - m_topMargin = 5; - m_tabViewRect.x = 20; - m_tabViewRect.y = 20; - m_tabViewRect.width = 300; - m_tabViewRect.x = 300; - m_highlightColour = *wxWHITE; - m_shadowColour = wxColour(128, 128, 128); - // m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE); - m_textColour = *wxBLACK; - m_highlightPen = wxWHITE_PEN; - m_shadowPen = wxGREY_PEN; - // SetBackgroundColour(m_backgroundColour); - m_tabFont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); - m_tabSelectedFont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); - m_window = NULL; -} - -wxTabView::~wxTabView() -{ - ClearTabs(true); -} - -// Automatically positions tabs -// TODO: this should just add the tab to a list, and then -// a layout function (e.g. Realize) should be called when all tabs have been added. -// The view rect could easily change as the view window is resized. -wxTabControl *wxTabView::AddTab(int id, const wxString& label, wxTabControl *existingTab) -{ - // First, find which layer we should be adding to. - wxTabLayerList::compatibility_iterator node = m_layers.GetLast(); - if (!node) - { - wxTabLayer *newLayer = new wxTabLayer; - node = m_layers.Append(newLayer); - } - // Check if adding another tab control would go off the - // right-hand edge of the layer. - wxTabLayer *tabLayer = (wxTabLayer *)node->GetData(); - wxList::compatibility_iterator lastTabNode = tabLayer->GetLast(); - if (lastTabNode) - { - wxTabControl *lastTab = (wxTabControl *)lastTabNode->GetData(); - // Start another layer (row). - // Tricky choice: can't just check if will be overlapping the edge, because - // this happens anyway for 2nd and subsequent rows. - // Should check this for 1st row, and then subsequent rows should not exceed 1st - // in length. - if (((tabLayer == m_layers.GetFirst()->GetData()) && ((lastTab->GetX() + 2*lastTab->GetWidth() + GetHorizontalTabSpacing()) - > GetViewRect().width)) || - ((tabLayer != m_layers.GetFirst()->GetData()) && (tabLayer->GetCount() == ((wxTabLayer *)m_layers.GetFirst()->GetData())->GetCount()))) - { - tabLayer = new wxTabLayer; - m_layers.Append(tabLayer); - lastTabNode = wxList::compatibility_iterator(); - } - } - int layer = m_layers.GetCount() - 1; - - wxTabControl *tabControl = existingTab; - if (!existingTab) - tabControl = OnCreateTabControl(); - tabControl->SetRowPosition(tabLayer->GetCount()); - tabControl->SetColPosition(layer); - - wxTabControl *lastTab = NULL; - if (lastTabNode) - lastTab = (wxTabControl *)lastTabNode->GetData(); - - // Top of new tab - int verticalOffset = (- GetTopMargin()) - ((layer+1)*GetTabHeight()); - // Offset from view top-left - int horizontalOffset = 0; - if (!lastTab) - horizontalOffset = layer*GetHorizontalTabOffset(); - else - horizontalOffset = lastTab->GetX() + GetTabWidth() + GetHorizontalTabSpacing(); - - tabControl->SetPosition(horizontalOffset, verticalOffset); - tabControl->SetSize(GetTabWidth(), GetTabHeight()); - tabControl->SetId(id); - tabControl->SetLabel(label); - tabControl->SetFont(* GetTabFont()); - - tabLayer->Append(tabControl); - m_noTabs ++; - - return tabControl; -} - -// Remove the tab without deleting the window -bool wxTabView::RemoveTab(int id) -{ - wxTabLayerList::compatibility_iterator layerNode = m_layers.GetFirst(); - while (layerNode) - { - wxTabLayer *layer = (wxTabLayer *)layerNode->GetData(); - wxList::compatibility_iterator tabNode = layer->GetFirst(); - while (tabNode) - { - wxTabControl *tab = (wxTabControl *)tabNode->GetData(); - if (tab->GetId() == id) - { - if (id == m_tabSelection) - m_tabSelection = -1; - delete tab; - layer->Erase(tabNode); - m_noTabs --; - - // The layout has changed - LayoutTabs(); - return true; - } - tabNode = tabNode->GetNext(); - } - layerNode = layerNode->GetNext(); - } - return false; -} - -bool wxTabView::SetTabText(int id, const wxString& label) -{ - wxTabControl* control = FindTabControlForId(id); - if (!control) - return false; - control->SetLabel(label); - return true; -} - -wxString wxTabView::GetTabText(int id) const -{ - wxTabControl* control = FindTabControlForId(id); - if (!control) - return wxEmptyString; - else - return control->GetLabel(); -} - -// Returns the total height of the tabs component -- this may be several -// times the height of a tab, if there are several tab layers (rows). -int wxTabView::GetTotalTabHeight() -{ - int minY = 0; - - wxTabLayerList::compatibility_iterator layerNode = m_layers.GetFirst(); - while (layerNode) - { - wxTabLayer *layer = (wxTabLayer *)layerNode->GetData(); - wxList::compatibility_iterator tabNode = layer->GetFirst(); - while (tabNode) - { - wxTabControl *tab = (wxTabControl *)tabNode->GetData(); - - if (tab->GetY() < minY) - minY = tab->GetY(); - - tabNode = tabNode->GetNext(); - } - layerNode = layerNode->GetNext(); - } - - return - minY; -} - -void wxTabView::ClearTabs(bool deleteTabs) -{ - wxTabLayerList::compatibility_iterator layerNode = m_layers.GetFirst(); - while (layerNode) - { - wxTabLayer *layer = (wxTabLayer *)layerNode->GetData(); - wxList::compatibility_iterator tabNode = layer->GetFirst(); - while (tabNode) - { - wxTabControl *tab = (wxTabControl *)tabNode->GetData(); - if (deleteTabs) - delete tab; - wxList::compatibility_iterator next = tabNode->GetNext(); - layer->Erase(tabNode); - tabNode = next; - } - wxTabLayerList::compatibility_iterator nextLayerNode = layerNode->GetNext(); - delete layer; - m_layers.Erase(layerNode); - layerNode = nextLayerNode; - } - m_noTabs = 0; - m_tabSelection = -1; -} - - -// Layout tabs (optional, e.g. if resizing window) -void wxTabView::LayoutTabs(void) -{ - // Make a list of the tab controls, deleting the wxTabLayers. - wxList controls; - - wxTabLayerList::compatibility_iterator layerNode = m_layers.GetFirst(); - while (layerNode) - { - wxTabLayer *layer = (wxTabLayer *)layerNode->GetData(); - wxList::compatibility_iterator tabNode = layer->GetFirst(); - while (tabNode) - { - wxTabControl *tab = (wxTabControl *)tabNode->GetData(); - controls.Append(tab); - wxList::compatibility_iterator next = tabNode->GetNext(); - layer->Erase(tabNode); - tabNode = next; - } - wxTabLayerList::compatibility_iterator nextLayerNode = layerNode->GetNext(); - delete layer; - m_layers.Erase(layerNode); - layerNode = nextLayerNode; - } - - wxTabControl *lastTab = NULL; - - wxTabLayer *currentLayer = new wxTabLayer; - m_layers.Append(currentLayer); - - wxList::compatibility_iterator node = controls.GetFirst(); - while (node) - { - wxTabControl *tabControl = (wxTabControl *)node->GetData(); - if (lastTab) - { - // Start another layer (row). - // Tricky choice: can't just check if will be overlapping the edge, because - // this happens anyway for 2nd and subsequent rows. - // Should check this for 1st row, and then subsequent rows should not exceed 1st - // in length. - if (((currentLayer == m_layers.GetFirst()->GetData()) && ((lastTab->GetX() + 2*lastTab->GetWidth() + GetHorizontalTabSpacing()) - > GetViewRect().width)) || - ((currentLayer != m_layers.GetFirst()->GetData()) && (currentLayer->GetCount() == ((wxTabLayer *)m_layers.GetFirst()->GetData())->GetCount()))) - { - currentLayer = new wxTabLayer; - m_layers.Append(currentLayer); - lastTab = NULL; - } - } - - int layer = m_layers.GetCount() - 1; - - tabControl->SetRowPosition(currentLayer->GetCount()); - tabControl->SetColPosition(layer); - - // Top of new tab - int verticalOffset = (- GetTopMargin()) - ((layer+1)*GetTabHeight()); - // Offset from view top-left - int horizontalOffset = 0; - if (!lastTab) - horizontalOffset = layer*GetHorizontalTabOffset(); - else - horizontalOffset = lastTab->GetX() + GetTabWidth() + GetHorizontalTabSpacing(); - - tabControl->SetPosition(horizontalOffset, verticalOffset); - tabControl->SetSize(GetTabWidth(), GetTabHeight()); - - currentLayer->Append(tabControl); - lastTab = tabControl; - - node = node->GetNext(); - } - - // Move the selected tab to the bottom - wxTabControl *control = FindTabControlForId(m_tabSelection); - if (control) - MoveSelectionTab(control); - -} - -// Draw all tabs -void wxTabView::Draw(wxDC& dc) -{ - // Don't draw anything if there are no tabs. - if (GetNumberOfTabs() == 0) - return; - - // Draw top margin area (beneath tabs and above view area) - if (GetTabStyle() & wxTAB_STYLE_COLOUR_INTERIOR) - { - dc.SetPen(*wxTRANSPARENT_PEN); - if(GetBackgroundBrush()) - dc.SetBrush(*GetBackgroundBrush()); - - // Add 1 because the pen is transparent. Under Motif, may be different. - dc.DrawRectangle( - m_tabViewRect.x, - (m_tabViewRect.y - m_topMargin), - (m_tabViewRect.width + 1), - (m_topMargin + 1) - ); - } - - // Draw layers in reverse order - wxTabLayerList::compatibility_iterator node = m_layers.GetLast(); - while (node) - { - wxTabLayer *layer = (wxTabLayer *)node->GetData(); - wxList::compatibility_iterator node2 = layer->GetFirst(); - while (node2) - { - wxTabControl *control = (wxTabControl *)node2->GetData(); - control->OnDraw(dc, (!node2->GetNext())); - node2 = node2->GetNext(); - } - - node = node->GetPrevious(); - } - - -#ifndef wxUSE_NEW_METHOD - if (GetTabStyle() & wxTAB_STYLE_DRAW_BOX) - { - dc.SetPen(* GetShadowPen()); - - // Draw bottom line - dc.DrawLine( - (GetViewRect().x + 1), - (GetViewRect().y + GetViewRect().height), - (GetViewRect().x + GetViewRect().width + 1), - (GetViewRect().y + GetViewRect().height) - ); - - // Draw right line - dc.DrawLine( - (GetViewRect().x + GetViewRect().width), - (GetViewRect().y - GetTopMargin() + 1), - (GetViewRect().x + GetViewRect().width), - (GetViewRect().y + GetViewRect().height) - ); - - dc.SetPen(* wxBLACK_PEN); - - // Draw bottom line - dc.DrawLine( - (GetViewRect().x), - (GetViewRect().y + GetViewRect().height + 1), -#if defined(__WXMOTIF__) - (GetViewRect().x + GetViewRect().width + 1), -#else - (GetViewRect().x + GetViewRect().width + 2), -#endif - - (GetViewRect().y + GetViewRect().height + 1) - ); - - // Draw right line - dc.DrawLine( - (GetViewRect().x + GetViewRect().width + 1), - (GetViewRect().y - GetTopMargin()), - (GetViewRect().x + GetViewRect().width + 1), - (GetViewRect().y + GetViewRect().height + 1) - ); - } -#endif -} - -// Process mouse event, return false if we didn't process it -bool wxTabView::OnEvent(wxMouseEvent& event) -{ - if (!event.LeftDown()) - return false; - - wxCoord x, y; - event.GetPosition(&x, &y); - - wxTabControl *hitControl = NULL; - - wxTabLayerList::compatibility_iterator node = m_layers.GetFirst(); - while (node) - { - wxTabLayer *layer = (wxTabLayer *)node->GetData(); - wxList::compatibility_iterator node2 = layer->GetFirst(); - while (node2) - { - wxTabControl *control = (wxTabControl *)node2->GetData(); - if (control->HitTest((int)x, (int)y)) - { - hitControl = control; - node = wxTabLayerList::compatibility_iterator(); - node2 = wxList::compatibility_iterator(); - } - else - node2 = node2->GetNext(); - } - - if (node) - node = node->GetNext(); - } - - if (!hitControl) - return false; - - wxTabControl *currentTab = FindTabControlForId(m_tabSelection); - - if (hitControl == currentTab) - return false; - - ChangeTab(hitControl); - - return true; -} - -bool wxTabView::ChangeTab(wxTabControl *control) -{ - wxTabControl *currentTab = FindTabControlForId(m_tabSelection); - int oldTab = -1; - if (currentTab) - oldTab = currentTab->GetId(); - - if (control == currentTab) - return true; - - if (m_layers.GetCount() == 0) - return false; - - if (!OnTabPreActivate(control->GetId(), oldTab)) - return false; - - // Move the tab to the bottom - MoveSelectionTab(control); - - if (currentTab) - currentTab->SetSelected(false); - - control->SetSelected(true); - m_tabSelection = control->GetId(); - - OnTabActivate(control->GetId(), oldTab); - - // Leave window refresh for the implementing window - - return true; -} - -// Move the selected tab to the bottom layer, if necessary, -// without calling app activation code -bool wxTabView::MoveSelectionTab(wxTabControl *control) -{ - if (m_layers.GetCount() == 0) - return false; - - wxTabLayer *firstLayer = (wxTabLayer *)m_layers.GetFirst()->GetData(); - - // Find what column this tab is at, so we can swap with the one at the bottom. - // If we're on the bottom layer, then no need to swap. - if (!firstLayer->Member(control)) - { - // Do a swap - int col = 0; - wxList::compatibility_iterator thisNode = FindTabNodeAndColumn(control, &col); - if (!thisNode) - return false; - wxList::compatibility_iterator otherNode = firstLayer->Item(col); - if (!otherNode) - return false; - - // If this is already in the bottom layer, return now - if (otherNode == thisNode) - return true; - - wxTabControl *otherTab = (wxTabControl *)otherNode->GetData(); - - // We now have pointers to the tab to be changed to, - // and the tab on the first layer. Swap tab structures and - // position details. - - int thisX = control->GetX(); - int thisY = control->GetY(); - int thisColPos = control->GetColPosition(); - int otherX = otherTab->GetX(); - int otherY = otherTab->GetY(); - int otherColPos = otherTab->GetColPosition(); - - control->SetPosition(otherX, otherY); - control->SetColPosition(otherColPos); - otherTab->SetPosition(thisX, thisY); - otherTab->SetColPosition(thisColPos); - - // Swap the data for the nodes - thisNode->SetData(otherTab); - otherNode->SetData(control); - } - return true; -} - -// Called when a tab is activated -void wxTabView::OnTabActivate(int /*activateId*/, int /*deactivateId*/) -{ -} - -void wxTabView::SetHighlightColour(const wxColour& col) -{ - m_highlightColour = col; - m_highlightPen = wxThePenList->FindOrCreatePen(col); -} - -void wxTabView::SetShadowColour(const wxColour& col) -{ - m_shadowColour = col; - m_shadowPen = wxThePenList->FindOrCreatePen(col); -} - -void wxTabView::SetBackgroundColour(const wxColour& col) -{ - m_backgroundColour = col; - m_backgroundPen = wxThePenList->FindOrCreatePen(col); - m_backgroundBrush = wxTheBrushList->FindOrCreateBrush(col); -} - -// this may be called with sel = zero (which doesn't match any page) -// when wxMotif deletes a page -// so return the first tab... - -void wxTabView::SetTabSelection(int sel, bool activateTool) -{ - if ( sel==m_tabSelection ) - return; - - int oldSel = m_tabSelection; - wxTabControl *control = FindTabControlForId(sel); - if (sel == 0) sel=control->GetId(); - wxTabControl *oldControl = FindTabControlForId(m_tabSelection); - - if (!OnTabPreActivate(sel, oldSel)) - return; - - if (control) - control->SetSelected((sel != -1)); // TODO ?? - else if (sel != -1) - { - wxFAIL_MSG(_("Could not find tab for id")); - return; - } - - if (oldControl) - oldControl->SetSelected(false); - - m_tabSelection = sel; - - if (control) - MoveSelectionTab(control); - - if (activateTool) - OnTabActivate(sel, oldSel); -} - -// Find tab control for id -// this may be called with zero (which doesn't match any page) -// so return the first control... -wxTabControl *wxTabView::FindTabControlForId(int id) const -{ - wxTabLayerList::compatibility_iterator node1 = m_layers.GetFirst(); - while (node1) - { - wxTabLayer *layer = (wxTabLayer *)node1->GetData(); - wxList::compatibility_iterator node2 = layer->GetFirst(); - while (node2) - { - wxTabControl *control = (wxTabControl *)node2->GetData(); - if (control->GetId() == id || id == 0) - return control; - node2 = node2->GetNext(); - } - node1 = node1->GetNext(); - } - return NULL; -} - -// Find tab control for layer, position (starting from zero) -wxTabControl *wxTabView::FindTabControlForPosition(int layer, int position) const -{ - wxTabLayerList::compatibility_iterator node1 = m_layers.Item(layer); - if (!node1) - return NULL; - wxTabLayer *tabLayer = (wxTabLayer *)node1->GetData(); - wxList::compatibility_iterator node2 = tabLayer->Item(position); - if (!node2) - return NULL; - return (wxTabControl *)node2->GetData(); -} - -// Find the node and the column at which this control is positioned. -wxList::compatibility_iterator wxTabView::FindTabNodeAndColumn(wxTabControl *control, int *col) const -{ - wxTabLayerList::compatibility_iterator node1 = m_layers.GetFirst(); - while (node1) - { - wxTabLayer *layer = (wxTabLayer *)node1->GetData(); - int c = 0; - wxList::compatibility_iterator node2 = layer->GetFirst(); - while (node2) - { - wxTabControl *cnt = (wxTabControl *)node2->GetData(); - if (cnt == control) - { - *col = c; - return node2; - } - node2 = node2->GetNext(); - c ++; - } - node1 = node1->GetNext(); - } - return wxList::compatibility_iterator(); -} - -int wxTabView::CalculateTabWidth(int noTabs, bool adjustView) -{ - m_tabWidth = (int)((m_tabViewRect.width - ((noTabs - 1)*GetHorizontalTabSpacing()))/noTabs); - if (adjustView) - { - m_tabViewRect.width = noTabs*m_tabWidth + ((noTabs-1)*GetHorizontalTabSpacing()); - } - return m_tabWidth; -} - -/* - * wxTabbedDialog - */ - -wxIMPLEMENT_CLASS(wxTabbedDialog, wxDialog); - -wxBEGIN_EVENT_TABLE(wxTabbedDialog, wxDialog) - EVT_CLOSE(wxTabbedDialog::OnCloseWindow) - EVT_MOUSE_EVENTS(wxTabbedDialog::OnMouseEvent) - EVT_PAINT(wxTabbedDialog::OnPaint) -wxEND_EVENT_TABLE() - -wxTabbedDialog::wxTabbedDialog(wxWindow *parent, wxWindowID id, - const wxString& title, - const wxPoint& pos, const wxSize& size, - long windowStyle, const wxString& name): - wxDialog(parent, id, title, pos, size, windowStyle, name) -{ - m_tabView = NULL; -} - -wxTabbedDialog::~wxTabbedDialog(void) -{ - if (m_tabView) - delete m_tabView; -} - -void wxTabbedDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event) ) -{ - Destroy(); -} - -void wxTabbedDialog::OnMouseEvent(wxMouseEvent& event ) -{ - if (m_tabView) - m_tabView->OnEvent(event); -} - -void wxTabbedDialog::OnPaint(wxPaintEvent& WXUNUSED(event) ) -{ - wxPaintDC dc(this); - if (m_tabView) - m_tabView->Draw(dc); -} - -/* - * wxTabbedPanel - */ - -wxIMPLEMENT_CLASS(wxTabbedPanel, wxPanel); - -wxBEGIN_EVENT_TABLE(wxTabbedPanel, wxPanel) - EVT_MOUSE_EVENTS(wxTabbedPanel::OnMouseEvent) - EVT_PAINT(wxTabbedPanel::OnPaint) -wxEND_EVENT_TABLE() - -wxTabbedPanel::wxTabbedPanel(wxWindow *parent, wxWindowID id, const wxPoint& pos, - const wxSize& size, long windowStyle, const wxString& name): - wxPanel(parent, id, pos, size, windowStyle, name) -{ - m_tabView = NULL; -} - -wxTabbedPanel::~wxTabbedPanel(void) -{ - delete m_tabView; -} - -void wxTabbedPanel::OnMouseEvent(wxMouseEvent& event) -{ - if (m_tabView) - m_tabView->OnEvent(event); -} - -void wxTabbedPanel::OnPaint(wxPaintEvent& WXUNUSED(event) ) -{ - wxPaintDC dc(this); - if (m_tabView) - m_tabView->Draw(dc); -} - -/* - * wxPanelTabView - */ - -wxIMPLEMENT_CLASS(wxPanelTabView, wxTabView); - -wxPanelTabView::wxPanelTabView(wxPanel *pan, long style) - : wxTabView(style) -{ - m_panel = pan; - m_currentWindow = NULL; - - if (m_panel->IsKindOf(wxCLASSINFO(wxTabbedDialog))) - ((wxTabbedDialog *)m_panel)->SetTabView(this); - else if (m_panel->IsKindOf(wxCLASSINFO(wxTabbedPanel))) - ((wxTabbedPanel *)m_panel)->SetTabView(this); - - SetWindow(m_panel); -} - -wxPanelTabView::~wxPanelTabView(void) -{ - ClearWindows(true); -} - -// Called when a tab is activated -void wxPanelTabView::OnTabActivate(int activateId, int deactivateId) -{ - if (!m_panel) - return; - - wxWindow *oldWindow = ((deactivateId == -1) ? 0 : GetTabWindow(deactivateId)); - wxWindow *newWindow = GetTabWindow(activateId); - - if (oldWindow) - oldWindow->Show(false); - if (newWindow) - newWindow->Show(true); - - m_panel->Refresh(); -} - - -void wxPanelTabView::AddTabWindow(int id, wxWindow *window) -{ - wxASSERT(m_tabWindows.find(id) == m_tabWindows.end()); - m_tabWindows[id] = window; - window->Show(false); -} - -wxWindow *wxPanelTabView::GetTabWindow(int id) const -{ - wxIntToWindowHashMap::const_iterator it = m_tabWindows.find(id); - return it == m_tabWindows.end() ? NULL : it->second; -} - -void wxPanelTabView::ClearWindows(bool deleteWindows) -{ - if (deleteWindows) - WX_CLEAR_HASH_MAP(wxIntToWindowHashMap, m_tabWindows); - m_tabWindows.clear(); -} - -void wxPanelTabView::ShowWindowForTab(int id) -{ - wxWindow *newWindow = GetTabWindow(id); - if (newWindow == m_currentWindow) - return; - if (m_currentWindow) - m_currentWindow->Show(false); - newWindow->Show(true); - newWindow->Refresh(); -} - diff --git a/Externals/wxWidgets3/src/generic/textdlgg.cpp b/Externals/wxWidgets3/src/generic/textdlgg.cpp deleted file mode 100644 index 979d7cc9e6..0000000000 --- a/Externals/wxWidgets3/src/generic/textdlgg.cpp +++ /dev/null @@ -1,233 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/generic/textdlgg.cpp -// Purpose: wxTextEntryDialog -// Author: Julian Smart -// Modified by: -// Created: 04/01/98 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_TEXTDLG - -#include "wx/generic/textdlgg.h" - -#ifndef WX_PRECOMP - #include "wx/utils.h" - #include "wx/dialog.h" - #include "wx/button.h" - #include "wx/stattext.h" - #include "wx/textctrl.h" - #include "wx/intl.h" - #include "wx/sizer.h" -#endif - -#if wxUSE_STATLINE - #include "wx/statline.h" -#endif - -const char wxGetTextFromUserPromptStr[] = "Input Text"; -const char wxGetPasswordFromUserPromptStr[] = "Enter Password"; - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -static const int wxID_TEXT = 3000; - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxTextEntryDialog -// ---------------------------------------------------------------------------- - -wxBEGIN_EVENT_TABLE(wxTextEntryDialog, wxDialog) - EVT_BUTTON(wxID_OK, wxTextEntryDialog::OnOK) -wxEND_EVENT_TABLE() - -wxIMPLEMENT_CLASS(wxTextEntryDialog, wxDialog); - -bool wxTextEntryDialog::Create(wxWindow *parent, - const wxString& message, - const wxString& caption, - const wxString& value, - long style, - const wxPoint& pos) -{ - // Do not pass style to GetParentForModalDialog() as wxDIALOG_NO_PARENT - // has the same numeric value as wxTE_MULTILINE and so attempting to create - // a dialog for editing multiline text would also prevent it from having a - // parent which is undesirable. As it is, we can't create a text entry - // dialog without a parent which is not ideal neither but is a much less - // important problem. - if ( !wxDialog::Create(GetParentForModalDialog(parent, 0), - wxID_ANY, caption, - pos, wxDefaultSize, - wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) ) - { - return false; - } - - m_dialogStyle = style; - m_value = value; - - wxBeginBusyCursor(); - - wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL ); - - wxSizerFlags flagsBorder2; - flagsBorder2.DoubleBorder(); - -#if wxUSE_STATTEXT - // 1) text message - topsizer->Add(CreateTextSizer(message), flagsBorder2); -#endif - - // 2) text ctrl - m_textctrl = new wxTextCtrl(this, wxID_TEXT, value, - wxDefaultPosition, wxSize(300, wxDefaultCoord), - style & ~wxTextEntryDialogStyle); - - topsizer->Add(m_textctrl, - wxSizerFlags(style & wxTE_MULTILINE ? 1 : 0). - Expand(). - TripleBorder(wxLEFT | wxRIGHT)); - - // 3) buttons if any - wxSizer *buttonSizer = CreateSeparatedButtonSizer(style & (wxOK | wxCANCEL)); - if ( buttonSizer ) - { - topsizer->Add(buttonSizer, wxSizerFlags(flagsBorder2).Expand()); - } - - SetAutoLayout( true ); - SetSizer( topsizer ); - - topsizer->SetSizeHints( this ); - topsizer->Fit( this ); - - if ( style & wxCENTRE ) - Centre( wxBOTH ); - - m_textctrl->SelectAll(); - m_textctrl->SetFocus(); - - wxEndBusyCursor(); - - return true; -} - -bool wxTextEntryDialog::TransferDataToWindow() -{ - if ( m_textctrl ) - { - m_textctrl->SetValue(m_value); - } - - return wxDialog::TransferDataToWindow(); -} - -bool wxTextEntryDialog::TransferDataFromWindow() -{ - if ( m_textctrl ) - { - m_value = m_textctrl->GetValue(); - } - - return wxDialog::TransferDataFromWindow(); -} - -void wxTextEntryDialog::OnOK(wxCommandEvent& WXUNUSED(event) ) -{ - if ( Validate() && TransferDataFromWindow() ) - { - EndModal( wxID_OK ); - } -} - -void wxTextEntryDialog::SetMaxLength(unsigned long len) -{ - if ( m_textctrl ) - { - m_textctrl->SetMaxLength(len); - } -} - -void wxTextEntryDialog::SetValue(const wxString& val) -{ - m_value = val; - - if ( m_textctrl ) - { - m_textctrl->SetValue(val); - } -} - -void wxTextEntryDialog::ForceUpper() -{ - if ( m_textctrl ) - { - m_textctrl->ForceUpper(); - } -} - -#if wxUSE_VALIDATORS - -#if WXWIN_COMPATIBILITY_2_8 -void wxTextEntryDialog::SetTextValidator( long style ) -{ - SetTextValidator((wxTextValidatorStyle)style); -} -#endif - -void wxTextEntryDialog::SetTextValidator( wxTextValidatorStyle style ) -{ - SetTextValidator(wxTextValidator(style)); -} - -void wxTextEntryDialog::SetTextValidator( const wxTextValidator& validator ) -{ - if ( m_textctrl ) - { - m_textctrl->SetValidator( validator ); - } -} - -#endif // wxUSE_VALIDATORS - -// ---------------------------------------------------------------------------- -// wxPasswordEntryDialog -// ---------------------------------------------------------------------------- - -wxIMPLEMENT_CLASS(wxPasswordEntryDialog, wxTextEntryDialog); - -bool wxPasswordEntryDialog::Create(wxWindow *parent, - const wxString& message, - const wxString& caption, - const wxString& value, - long style, - const wxPoint& pos) -{ - // Only change from wxTextEntryDialog is the password style - return wxTextEntryDialog::Create(parent, message, caption, value, - style | wxTE_PASSWORD, pos); -} - -#endif // wxUSE_TEXTDLG diff --git a/Externals/wxWidgets3/src/generic/textmeasure.cpp b/Externals/wxWidgets3/src/generic/textmeasure.cpp deleted file mode 100644 index 55bb735d9c..0000000000 --- a/Externals/wxWidgets3/src/generic/textmeasure.cpp +++ /dev/null @@ -1,68 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/generic/textmeasure.cpp -// Purpose: -// Author: Vadim Zeitlin -// Created: 2012-10-17 -// Copyright: (c) 2012 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// for compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#ifndef WX_PRECOMP - #include "wx/window.h" - #include "wx/dc.h" -#endif //WX_PRECOMP - -#include "wx/private/textmeasure.h" - -#if wxUSE_GENERIC_TEXTMEASURE - -// ============================================================================ -// wxTextMeasure generic implementation -// ============================================================================ - -// We assume that the ports not providing platform-specific wxTextMeasure -// implementation implement the corresponding functions in their wxDC and -// wxWindow classes, so forward back to them instead of using wxTextMeasure -// from there, as usual. -void wxTextMeasure::DoGetTextExtent(const wxString& string, - wxCoord *width, - wxCoord *height, - wxCoord *descent, - wxCoord *externalLeading) -{ - if ( m_dc ) - { - m_dc->GetTextExtent(string, width, height, - descent, externalLeading, m_font); - } - else if ( m_win ) - { - m_win->GetTextExtent(string, width, height, - descent, externalLeading, m_font); - } - //else: we already asserted in the ctor, don't do it any more -} - -bool wxTextMeasure::DoGetPartialTextExtents(const wxString& text, - wxArrayInt& widths, - double scaleX) -{ - return wxTextMeasureBase::DoGetPartialTextExtents(text, widths, scaleX); -} - -#endif // wxUSE_GENERIC_TEXTMEASURE diff --git a/Externals/wxWidgets3/src/generic/timectrlg.cpp b/Externals/wxWidgets3/src/generic/timectrlg.cpp deleted file mode 100644 index e474338db6..0000000000 --- a/Externals/wxWidgets3/src/generic/timectrlg.cpp +++ /dev/null @@ -1,685 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/generic/timectrl.cpp -// Purpose: Generic implementation of wxTimePickerCtrl. -// Author: Paul Breen, Vadim Zeitlin -// Created: 2011-09-22 -// Copyright: (c) 2011 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// for compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_TIMEPICKCTRL - -#ifndef WX_PRECOMP - #include "wx/textctrl.h" - #include "wx/utils.h" // wxMax() -#endif // WX_PRECOMP - -#include "wx/timectrl.h" - -// This class is only compiled if there is no native version or if we -// explicitly want to use both the native and generic one (this is useful for -// testing but not much otherwise and so by default we don't use the generic -// implementation if a native one is available). -#if !defined(wxHAS_NATIVE_TIMEPICKERCTRL) || wxUSE_TIMEPICKCTRL_GENERIC - -#include "wx/generic/timectrl.h" - -#include "wx/dateevt.h" -#include "wx/spinbutt.h" - -#ifndef wxHAS_NATIVE_TIMEPICKERCTRL -wxIMPLEMENT_DYNAMIC_CLASS(wxTimePickerCtrl, wxControl); -#endif - -// ---------------------------------------------------------------------------- -// Constants -// ---------------------------------------------------------------------------- - -enum -{ - // Horizontal margin between the text and spin control. - HMARGIN_TEXT_SPIN = 2 -}; - -// ---------------------------------------------------------------------------- -// wxTimePickerGenericImpl: used to implement wxTimePickerCtrlGeneric -// ---------------------------------------------------------------------------- - -class wxTimePickerGenericImpl : public wxEvtHandler -{ -public: - wxTimePickerGenericImpl(wxTimePickerCtrlGeneric* ctrl) - { - m_text = new wxTextCtrl(ctrl, wxID_ANY, wxString()); - - // As this text can't be edited, don't use the standard cursor for it - // to avoid misleading the user. Ideally we'd also hide the caret but - // this is not currently supported by wxTextCtrl. - m_text->SetCursor(wxCURSOR_ARROW); - - m_btn = new wxSpinButton(ctrl, wxID_ANY, - wxDefaultPosition, wxDefaultSize, - wxSP_VERTICAL | wxSP_WRAP); - - m_currentField = Field_Hour; - m_isFirstDigit = true; - - // We don't support arbitrary formats currently as this requires - // significantly more work both here and also in wxLocale::GetInfo(). - // - // For now just use either "%H:%M:%S" or "%I:%M:%S %p". It would be - // nice to add support to "%k" and "%l" (hours with leading blanks - // instead of zeros) too as this is the most common unsupported case in - // practice. -#if wxUSE_XLOCALE - m_useAMPM = wxLocale::GetInfo(wxLOCALE_TIME_FMT).Contains("%p"); -#else - m_useAMPM = false; -#endif - - m_text->Connect - ( - wxEVT_SET_FOCUS, - wxFocusEventHandler(wxTimePickerGenericImpl::OnTextSetFocus), - NULL, - this - ); - m_text->Connect - ( - wxEVT_KEY_DOWN, - wxKeyEventHandler(wxTimePickerGenericImpl::OnTextKeyDown), - NULL, - this - ); - m_text->Connect - ( - wxEVT_LEFT_DOWN, - wxMouseEventHandler(wxTimePickerGenericImpl::OnTextClick), - NULL, - this - ); - - m_btn->Connect - ( - wxEVT_SPIN_UP, - wxSpinEventHandler(wxTimePickerGenericImpl::OnArrowUp), - NULL, - this - ); - m_btn->Connect - ( - wxEVT_SPIN_DOWN, - wxSpinEventHandler(wxTimePickerGenericImpl::OnArrowDown), - NULL, - this - ); - } - - // Set the new value. - void SetValue(const wxDateTime& time) - { - m_time = time.IsValid() ? time : wxDateTime::Now(); - - // Ensure that the date part doesn't correspond to a DST change date as - // time is discontinuous then resulting in many problems, e.g. it's - // impossible to even enter 2:00:00 at the beginning of summer time - // date as this time doesn't exist. By using Jan 1, on which nobody - // changes DST, we avoid all such problems. - wxDateTime::Tm tm = m_time.GetTm(); - tm.mday = - tm.yday = 1; - tm.mon = wxDateTime::Jan; - m_time.Set(tm); - - UpdateTextWithoutEvent(); - } - - - // The text part of the control. - wxTextCtrl* m_text; - - // The spin button used to change the text fields. - wxSpinButton* m_btn; - - // The current time (date part is ignored). - wxDateTime m_time; - -private: - // The logical fields of the text control (AM/PM one may not be present). - enum Field - { - Field_Hour, - Field_Min, - Field_Sec, - Field_AMPM, - Field_Max - }; - - // Direction of change of time fields. - enum Direction - { - // Notice that the enum elements values matter. - Dir_Down = -1, - Dir_Up = +1 - }; - - // A range of character positions ("from" is inclusive, "to" -- exclusive). - struct CharRange - { - int from, - to; - }; - - // Event handlers for various events in our controls. - void OnTextSetFocus(wxFocusEvent& event) - { - HighlightCurrentField(); - - event.Skip(); - } - - // Keyboard interface here is modelled over MSW native control and may need - // adjustments for other platforms. - void OnTextKeyDown(wxKeyEvent& event) - { - const int key = event.GetKeyCode(); - - switch ( key ) - { - case WXK_DOWN: - ChangeCurrentFieldBy1(Dir_Down); - break; - - case WXK_UP: - ChangeCurrentFieldBy1(Dir_Up); - break; - - case WXK_LEFT: - CycleCurrentField(Dir_Down); - break; - - case WXK_RIGHT: - CycleCurrentField(Dir_Up); - break; - - case WXK_HOME: - ResetCurrentField(Dir_Down); - break; - - case WXK_END: - ResetCurrentField(Dir_Up); - break; - - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': - // The digits work in all keys except AM/PM. - if ( m_currentField != Field_AMPM ) - { - AppendDigitToCurrentField(key - '0'); - } - break; - - case 'A': - case 'P': - // These keys only work to toggle AM/PM field. - if ( m_currentField == Field_AMPM ) - { - unsigned hour = m_time.GetHour(); - if ( key == 'A' ) - { - if ( hour >= 12 ) - hour -= 12; - } - else // PM - { - if ( hour < 12 ) - hour += 12; - } - - if ( hour != m_time.GetHour() ) - { - m_time.SetHour(hour); - UpdateText(); - } - } - break; - - // Do not skip the other events, just consume them to prevent the - // user from editing the text directly. - } - } - - void OnTextClick(wxMouseEvent& event) - { - Field field = Field_Max; // Initialize just to suppress warnings. - long pos; - switch ( m_text->HitTest(event.GetPosition(), &pos) ) - { - case wxTE_HT_UNKNOWN: - // Don't do anything, it's better than doing something wrong. - return; - - case wxTE_HT_BEFORE: - // Select the first field. - field = Field_Hour; - break; - - case wxTE_HT_ON_TEXT: - // Find the field containing this position. - for ( field = Field_Hour; field <= GetLastField(); ) - { - const CharRange range = GetFieldRange(field); - - // Normally the "to" end is exclusive but we want to give - // focus to some field when the user clicks between them so - // count it as part of the preceding field here. - if ( range.from <= pos && pos <= range.to ) - break; - - field = static_cast(field + 1); - } - break; - - case wxTE_HT_BELOW: - // This shouldn't happen for single line control. - wxFAIL_MSG( "Unreachable" ); - // fall through - - case wxTE_HT_BEYOND: - // Select the last field. - field = GetLastField(); - break; - } - - ChangeCurrentField(field); - } - - void OnArrowUp(wxSpinEvent& WXUNUSED(event)) - { - ChangeCurrentFieldBy1(Dir_Up); - } - - void OnArrowDown(wxSpinEvent& WXUNUSED(event)) - { - ChangeCurrentFieldBy1(Dir_Down); - } - - - // Get the range of the given field in character positions ("from" is - // inclusive, "to" exclusive). - static CharRange GetFieldRange(Field field) - { - // Currently we can just hard code the ranges as they are the same for - // both supported formats, if we want to support arbitrary formats in - // the future, we'd need to determine them dynamically by examining the - // format here. - static const CharRange ranges[] = - { - { 0, 2 }, - { 3, 5 }, - { 6, 8 }, - { 9, 11}, - }; - - wxCOMPILE_TIME_ASSERT( WXSIZEOF(ranges) == Field_Max, - FieldRangesMismatch ); - - return ranges[field]; - } - - // Get the last field used depending on m_useAMPM. - Field GetLastField() const - { - return m_useAMPM ? Field_AMPM : Field_Sec; - } - - // Change the current field. For convenience, accept int field here as this - // allows us to use arithmetic operations in the caller. - void ChangeCurrentField(int field) - { - if ( field == m_currentField ) - return; - - wxCHECK_RET( field <= GetLastField(), "Invalid field" ); - - m_currentField = static_cast(field); - m_isFirstDigit = true; - - HighlightCurrentField(); - } - - // Go to the next (Dir_Up) or previous (Dir_Down) field, wrapping if - // necessary. - void CycleCurrentField(Direction dir) - { - const unsigned numFields = GetLastField() + 1; - - ChangeCurrentField((m_currentField + numFields + dir) % numFields); - } - - // Select the currently actively field. - void HighlightCurrentField() - { - m_text->SetFocus(); - - const CharRange range = GetFieldRange(m_currentField); - - m_text->SetSelection(range.from, range.to); - } - - // Decrement or increment the value of the current field (wrapping if - // necessary). - void ChangeCurrentFieldBy1(Direction dir) - { - switch ( m_currentField ) - { - case Field_Hour: - m_time.SetHour((m_time.GetHour() + 24 + dir) % 24); - break; - - case Field_Min: - m_time.SetMinute((m_time.GetMinute() + 60 + dir) % 60); - break; - - case Field_Sec: - m_time.SetSecond((m_time.GetSecond() + 60 + dir) % 60); - break; - - case Field_AMPM: - m_time.SetHour((m_time.GetHour() + 12) % 24); - break; - - case Field_Max: - wxFAIL_MSG( "Invalid field" ); - return; - } - - UpdateText(); - } - - // Set the current field to its minimal or maximal value. - void ResetCurrentField(Direction dir) - { - switch ( m_currentField ) - { - case Field_Hour: - case Field_AMPM: - // In 12-hour mode setting the hour to the minimal value - // also changes the suffix to AM and, correspondingly, - // setting it to the maximal one changes the suffix to PM. - // And, for consistency with the native MSW behaviour, we - // also do the same thing when changing AM/PM field itself, - // so change hours in any case. - m_time.SetHour(dir == Dir_Down ? 0 : 23); - break; - - case Field_Min: - m_time.SetMinute(dir == Dir_Down ? 0 : 59); - break; - - case Field_Sec: - m_time.SetSecond(dir == Dir_Down ? 0 : 59); - break; - - case Field_Max: - wxFAIL_MSG( "Invalid field" ); - } - - UpdateText(); - } - - // Append the given digit (from 0 to 9) to the current value of the current - // field. - void AppendDigitToCurrentField(int n) - { - bool moveToNextField = false; - - if ( !m_isFirstDigit ) - { - // The first digit simply replaces the existing field contents, - // but the second one should be combined with the previous one, - // otherwise entering 2-digit numbers would be impossible. - int currentValue = 0, - maxValue = 0; - - switch ( m_currentField ) - { - case Field_Hour: - currentValue = m_time.GetHour(); - maxValue = 23; - break; - - case Field_Min: - currentValue = m_time.GetMinute(); - maxValue = 59; - break; - - case Field_Sec: - currentValue = m_time.GetSecond(); - maxValue = 59; - break; - - case Field_AMPM: - case Field_Max: - wxFAIL_MSG( "Invalid field" ); - return; - } - - // Check if the new value is acceptable. If not, we just handle - // this digit as if it were the first one. - int newValue = currentValue*10 + n; - if ( newValue < maxValue ) - { - n = newValue; - - // If we're not on the seconds field, advance to the next one. - // This makes it more convenient to enter times as you can just - // press all digits one after one without touching the cursor - // arrow keys at all. - // - // Notice that MSW native control doesn't do this but it seems - // so useful that we intentionally diverge from it here. - moveToNextField = true; - - // We entered both digits so the next one will be "first" again. - m_isFirstDigit = true; - } - } - else // First digit entered. - { - // The next one won't be first any more. - m_isFirstDigit = false; - } - - switch ( m_currentField ) - { - case Field_Hour: - m_time.SetHour(n); - break; - - case Field_Min: - m_time.SetMinute(n); - break; - - case Field_Sec: - m_time.SetSecond(n); - break; - - case Field_AMPM: - case Field_Max: - wxFAIL_MSG( "Invalid field" ); - } - - if ( moveToNextField && m_currentField < Field_Sec ) - CycleCurrentField(Dir_Up); - - UpdateText(); - } - - // Update the text value to correspond to the current time. By default also - // generate an event but this can be avoided by calling the "WithoutEvent" - // variant. - void UpdateText() - { - UpdateTextWithoutEvent(); - - wxWindow* const ctrl = m_text->GetParent(); - - wxDateEvent event(ctrl, m_time, wxEVT_TIME_CHANGED); - ctrl->HandleWindowEvent(event); - } - - void UpdateTextWithoutEvent() - { - m_text->SetValue(m_time.Format(m_useAMPM ? "%I:%M:%S %p" : "%H:%M:%S")); - - HighlightCurrentField(); - } - - - // The current field of the text control: this is the one affected by - // pressing arrow keys or spin button. - Field m_currentField; - - // Flag indicating whether we use AM/PM indicator or not. - bool m_useAMPM; - - // Flag indicating whether the next digit pressed by user will be the first - // digit of the current field or the second one. This is necessary because - // the first digit replaces the current field contents while the second one - // is appended to it (if possible, e.g. pressing '7' in a field already - // containing '8' will still replace it as "78" would be invalid). - bool m_isFirstDigit; - - wxDECLARE_NO_COPY_CLASS(wxTimePickerGenericImpl); -}; - -// ============================================================================ -// wxTimePickerCtrlGeneric implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxTimePickerCtrlGeneric creation -// ---------------------------------------------------------------------------- - -void wxTimePickerCtrlGeneric::Init() -{ - m_impl = NULL; -} - -bool -wxTimePickerCtrlGeneric::Create(wxWindow *parent, - wxWindowID id, - const wxDateTime& date, - const wxPoint& pos, - const wxSize& size, - long style, - const wxValidator& validator, - const wxString& name) -{ - // The text control we use already has a border, so we don't need one - // ourselves. - style &= ~wxBORDER_MASK; - style |= wxBORDER_NONE; - - if ( !Base::Create(parent, id, pos, size, style, validator, name) ) - return false; - - m_impl = new wxTimePickerGenericImpl(this); - m_impl->SetValue(date); - - InvalidateBestSize(); - SetInitialSize(size); - - return true; -} - -wxTimePickerCtrlGeneric::~wxTimePickerCtrlGeneric() -{ - delete m_impl; -} - -wxWindowList wxTimePickerCtrlGeneric::GetCompositeWindowParts() const -{ - wxWindowList parts; - if ( m_impl ) - { - parts.push_back(m_impl->m_text); - parts.push_back(m_impl->m_btn); - } - return parts; -} - -// ---------------------------------------------------------------------------- -// wxTimePickerCtrlGeneric value -// ---------------------------------------------------------------------------- - -void wxTimePickerCtrlGeneric::SetValue(const wxDateTime& date) -{ - wxCHECK_RET( m_impl, "Must create first" ); - - m_impl->SetValue(date); -} - -wxDateTime wxTimePickerCtrlGeneric::GetValue() const -{ - wxCHECK_MSG( m_impl, wxDateTime(), "Must create first" ); - - return m_impl->m_time; -} - -// ---------------------------------------------------------------------------- -// wxTimePickerCtrlGeneric geometry -// ---------------------------------------------------------------------------- - -void wxTimePickerCtrlGeneric::DoMoveWindow(int x, int y, int width, int height) -{ - Base::DoMoveWindow(x, y, width, height); - - if ( !m_impl ) - return; - - const int widthBtn = m_impl->m_btn->GetSize().x; - const int widthText = wxMax(width - widthBtn - HMARGIN_TEXT_SPIN, 0); - - m_impl->m_text->SetSize(0, 0, widthText, height); - m_impl->m_btn->SetSize(widthText + HMARGIN_TEXT_SPIN, 0, widthBtn, height); -} - -wxSize wxTimePickerCtrlGeneric::DoGetBestSize() const -{ - if ( !m_impl ) - return Base::DoGetBestSize(); - - wxSize size = m_impl->m_text->GetBestSize(); - size.x += m_impl->m_btn->GetBestSize().x + HMARGIN_TEXT_SPIN; - - return size; -} - -#endif // !wxHAS_NATIVE_TIMEPICKERCTRL || wxUSE_TIMEPICKCTRL_GENERIC - -#endif // wxUSE_TIMEPICKCTRL diff --git a/Externals/wxWidgets3/src/generic/timer.cpp b/Externals/wxWidgets3/src/generic/timer.cpp deleted file mode 100644 index b037400524..0000000000 --- a/Externals/wxWidgets3/src/generic/timer.cpp +++ /dev/null @@ -1,254 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/generic/timer.cpp -// Purpose: wxTimer implementation -// Author: Vaclav Slavik -// Copyright: (c) Vaclav Slavik -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -// ---------------------------------------------------------------------------- -// NB: when using generic wxTimer implementation in your port, you *must* call -// wxTimer::NotifyTimers() often enough. The ideal place for this -// is in wxEventLoop::Dispatch(). -// ---------------------------------------------------------------------------- - -#if wxUSE_TIMER - -#ifndef WX_PRECOMP - #include "wx/log.h" - #include "wx/module.h" -#endif - -#include "wx/apptrait.h" -#include "wx/generic/private/timer.h" - -// ---------------------------------------------------------------------------- -// Time input function -// ---------------------------------------------------------------------------- - -#define GetMillisecondsTime wxGetLocalTimeMillis - -typedef wxLongLong wxTimerTick_t; - -#if wxUSE_LONGLONG_WX - #define wxTimerTickFmtSpec wxLongLongFmtSpec "d" - #define wxTimerTickPrintfArg(tt) (tt.GetValue()) -#else // using native wxLongLong - #define wxTimerTickFmtSpec wxT("s") - #define wxTimerTickPrintfArg(tt) (tt.ToString().c_str()) -#endif // wx/native long long - -inline bool wxTickGreaterEqual(wxTimerTick_t x, wxTimerTick_t y) -{ - return x >= y; -} - -// ---------------------------------------------------------------------------- -// helper structures and wxTimerScheduler -// ---------------------------------------------------------------------------- - -class wxTimerDesc -{ -public: - wxTimerDesc(wxGenericTimerImpl *t) : - timer(t), running(false), next(NULL), prev(NULL), - shotTime(0), deleteFlag(NULL) {} - - wxGenericTimerImpl *timer; - bool running; - wxTimerDesc *next, *prev; - wxTimerTick_t shotTime; - volatile bool *deleteFlag; // see comment in ~wxTimer -}; - -class wxTimerScheduler -{ -public: - wxTimerScheduler() : m_timers(NULL) {} - - void QueueTimer(wxTimerDesc *desc, wxTimerTick_t when = 0); - void RemoveTimer(wxTimerDesc *desc); - void NotifyTimers(); - -private: - wxTimerDesc *m_timers; -}; - -void wxTimerScheduler::QueueTimer(wxTimerDesc *desc, wxTimerTick_t when) -{ - if ( desc->running ) - return; // already scheduled - - if ( when == 0 ) - when = GetMillisecondsTime() + desc->timer->GetInterval(); - desc->shotTime = when; - desc->running = true; - - wxLogTrace( wxT("timer"), - wxT("queued timer %p at tick %") wxTimerTickFmtSpec, - desc->timer, wxTimerTickPrintfArg(when)); - - if ( m_timers ) - { - wxTimerDesc *d = m_timers; - while ( d->next && d->next->shotTime < when ) d = d->next; - desc->next = d->next; - desc->prev = d; - if ( d->next ) - d->next->prev = desc; - d->next = desc; - } - else - { - m_timers = desc; - desc->prev = desc->next = NULL; - } -} - -void wxTimerScheduler::RemoveTimer(wxTimerDesc *desc) -{ - desc->running = false; - if ( desc == m_timers ) - m_timers = desc->next; - if ( desc->prev ) - desc->prev->next = desc->next; - if ( desc->next ) - desc->next->prev = desc->prev; - desc->prev = desc->next = NULL; -} - -void wxTimerScheduler::NotifyTimers() -{ - if ( m_timers ) - { - bool oneShot; - volatile bool timerDeleted; - wxTimerTick_t now = GetMillisecondsTime(); - - for ( wxTimerDesc *desc = m_timers; desc; desc = desc->next ) - { - if ( desc->running && wxTickGreaterEqual(now, desc->shotTime) ) - { - oneShot = desc->timer->IsOneShot(); - RemoveTimer(desc); - - timerDeleted = false; - desc->deleteFlag = &timerDeleted; - desc->timer->Notify(); - - if ( !timerDeleted ) - { - wxLogTrace( wxT("timer"), - wxT("notified timer %p sheduled for %") - wxTimerTickFmtSpec, - desc->timer, - wxTimerTickPrintfArg(desc->shotTime) ); - - desc->deleteFlag = NULL; - if ( !oneShot ) - QueueTimer(desc, now + desc->timer->GetInterval()); - } - else - { - desc = m_timers; - if (!desc) - break; - } - } - } - } -} - - -// ---------------------------------------------------------------------------- -// wxTimer -// ---------------------------------------------------------------------------- - -wxTimerScheduler *gs_scheduler = NULL; - -void wxGenericTimerImpl::Init() -{ - if ( !gs_scheduler ) - gs_scheduler = new wxTimerScheduler; - m_desc = new wxTimerDesc(this); -} - -wxGenericTimerImpl::~wxGenericTimerImpl() -{ - wxLogTrace( wxT("timer"), wxT("destroying timer %p..."), this); - if ( IsRunning() ) - Stop(); - - // NB: this is a hack: wxTimerScheduler must have some way of knowing - // that wxTimer object was deleted under its hands -- this may - // happen if somebody is really nasty and deletes the timer - // from wxTimer::Notify() - if ( m_desc->deleteFlag != NULL ) - *m_desc->deleteFlag = true; - - delete m_desc; - wxLogTrace( wxT("timer"), wxT(" ...done destroying timer %p..."), this); -} - -bool wxGenericTimerImpl::IsRunning() const -{ - return m_desc->running; -} - -bool wxGenericTimerImpl::Start(int millisecs, bool oneShot) -{ - wxLogTrace( wxT("timer"), wxT("started timer %p: %i ms, oneshot=%i"), - this, millisecs, oneShot); - - if ( !wxTimerImpl::Start(millisecs, oneShot) ) - return false; - - gs_scheduler->QueueTimer(m_desc); - return true; -} - -void wxGenericTimerImpl::Stop() -{ - if ( !m_desc->running ) return; - - gs_scheduler->RemoveTimer(m_desc); -} - -/*static*/ void wxGenericTimerImpl::NotifyTimers() -{ - if ( gs_scheduler ) - gs_scheduler->NotifyTimers(); -} - - - -// A module to deallocate memory properly: -class wxTimerModule: public wxModule -{ - wxDECLARE_DYNAMIC_CLASS(wxTimerModule); -public: - wxTimerModule() {} - bool OnInit() { return true; } - void OnExit() { wxDELETE(gs_scheduler); } -}; - -wxIMPLEMENT_DYNAMIC_CLASS(wxTimerModule, wxModule); - -// ---------------------------------------------------------------------------- -// wxGUIAppTraits -// ---------------------------------------------------------------------------- - -wxTimerImpl *wxGUIAppTraits::CreateTimerImpl(wxTimer *timer) -{ - return new wxGenericTimerImpl(timer); -} - - -#endif //wxUSE_TIMER diff --git a/Externals/wxWidgets3/src/generic/tipdlg.cpp b/Externals/wxWidgets3/src/generic/tipdlg.cpp deleted file mode 100644 index aaece5895c..0000000000 --- a/Externals/wxWidgets3/src/generic/tipdlg.cpp +++ /dev/null @@ -1,305 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/generic/tipdlg.cpp -// Purpose: implementation of wxTipDialog -// Author: Vadim Zeitlin -// Modified by: -// Created: 28.06.99 -// Copyright: (c) Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_STARTUP_TIPS - -#ifndef WX_PRECOMP - #include "wx/button.h" - #include "wx/checkbox.h" - #include "wx/statbox.h" - #include "wx/dialog.h" - #include "wx/icon.h" - #include "wx/intl.h" - #include "wx/textctrl.h" - #include "wx/statbmp.h" - #include "wx/stattext.h" - #include "wx/sizer.h" - #include "wx/settings.h" -#endif // WX_PRECOMP - -#include "wx/statline.h" -#include "wx/artprov.h" - -#include "wx/tipdlg.h" - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -static const int wxID_NEXT_TIP = 32000; // whatever - -// ---------------------------------------------------------------------------- -// private classes -// ---------------------------------------------------------------------------- - -// an implementation which takes the tips from the text file - each line -// represents a tip -#if wxUSE_TEXTFILE -class WXDLLIMPEXP_ADV wxFileTipProvider : public wxTipProvider -{ -public: - wxFileTipProvider(const wxString& filename, size_t currentTip); - - virtual wxString GetTip() wxOVERRIDE; - -private: - wxTextFile m_textfile; - - wxDECLARE_NO_COPY_CLASS(wxFileTipProvider); -}; -#endif // wxUSE_TEXTFILE - -#ifdef __WIN32__ -// TODO an implementation which takes the tips from the given registry key -class WXDLLIMPEXP_ADV wxRegTipProvider : public wxTipProvider -{ -public: - wxRegTipProvider(const wxString& keyname); - - virtual wxString GetTip(); -}; - -// Empty implementation for now to keep the linker happy -wxString wxRegTipProvider::GetTip() -{ - return wxEmptyString; -} - -#endif // __WIN32__ - -// the dialog we show in wxShowTip() -class WXDLLIMPEXP_ADV wxTipDialog : public wxDialog -{ -public: - wxTipDialog(wxWindow *parent, - wxTipProvider *tipProvider, - bool showAtStartup); - - // the tip dialog has "Show tips on startup" checkbox - return true if it - // was checked (or wasn't unchecked) - bool ShowTipsOnStartup() const { return m_checkbox->GetValue(); } - - // sets the (next) tip text - void SetTipText() { m_text->SetValue(m_tipProvider->GetTip()); } - - // "Next" button handler - void OnNextTip(wxCommandEvent& WXUNUSED(event)) { SetTipText(); } - -private: - wxTipProvider *m_tipProvider; - - wxTextCtrl *m_text; - wxCheckBox *m_checkbox; - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_NO_COPY_CLASS(wxTipDialog); -}; - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxFileTipProvider -// ---------------------------------------------------------------------------- -#if wxUSE_TEXTFILE -wxFileTipProvider::wxFileTipProvider(const wxString& filename, - size_t currentTip) - : wxTipProvider(currentTip), m_textfile(filename) -{ - m_textfile.Open(); -} - -wxString wxFileTipProvider::GetTip() -{ - size_t count = m_textfile.GetLineCount(); - if ( !count ) - { - return _("Tips not available, sorry!"); - } - - wxString tip; - - // Comments start with a # symbol. - // Loop reading lines until get the first one that isn't a comment. - // The max number of loop executions is the number of lines in the - // textfile so that can't go into an infinite loop in the [oddball] - // case of a comment-only tips file. - for ( size_t i=0; i < count; i++ ) - { - // The current tip may be at the last line of the textfile, (or - // past it, if the number of lines in the textfile changed, such - // as changing to a different textfile, with less tips). So check - // to see at last line of text file, (or past it)... - if ( m_currentTip >= count ) - { - // .. and if so, wrap back to line 0. - m_currentTip = 0; - } - - // Read the tip, and increment the current tip counter. - tip = m_textfile.GetLine(m_currentTip++); - - // Break if tip isn't a comment, and isn't an empty string - // (or only stray space characters). - if ( !tip.StartsWith(wxT("#")) && (tip.Trim() != wxEmptyString) ) - { - break; - } - } - - // If tip starts with '_(', then it is a gettext string of format - // _("My \"global\" tip text") so first strip off the leading '_("'... - if ( tip.StartsWith(wxT("_(\"" ), &tip)) - { - //...and strip off the trailing '")'... - tip = tip.BeforeLast(wxT('\"')); - // ...and replace escaped quotes - tip.Replace(wxT("\\\""), wxT("\"")); - - // and translate it as requested - tip = wxGetTranslation(tip); - } - - return tip; -} -#endif // wxUSE_TEXTFILE - -// ---------------------------------------------------------------------------- -// wxTipDialog -// ---------------------------------------------------------------------------- - -wxBEGIN_EVENT_TABLE(wxTipDialog, wxDialog) - EVT_BUTTON(wxID_NEXT_TIP, wxTipDialog::OnNextTip) -wxEND_EVENT_TABLE() - -wxTipDialog::wxTipDialog(wxWindow *parent, - wxTipProvider *tipProvider, - bool showAtStartup) - : wxDialog(GetParentForModalDialog(parent, 0), wxID_ANY, _("Tip of the Day"), - wxDefaultPosition, wxDefaultSize, - wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER - ) -{ - m_tipProvider = tipProvider; - bool isPda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA); - - // 1) create all controls in tab order - - wxStaticText *text = new wxStaticText(this, wxID_ANY, _("Did you know...")); - - if (!isPda) - { - wxFont font = text->GetFont(); - font.SetPointSize(int(1.6 * font.GetPointSize())); - font.SetWeight(wxFONTWEIGHT_BOLD); - text->SetFont(font); - } - - m_text = new wxTextCtrl(this, wxID_ANY, wxEmptyString, - wxDefaultPosition, wxSize(200, 160), - wxTE_MULTILINE | - wxTE_READONLY | - wxTE_NO_VSCROLL | - wxTE_RICH2 | // a hack to get rid of vert scrollbar - wxDEFAULT_CONTROL_BORDER - ); -#if defined(__WXMSW__) - m_text->SetFont(wxFont(12, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL)); -#endif - - wxIcon icon = wxArtProvider::GetIcon(wxART_TIP, wxART_CMN_DIALOG); - wxStaticBitmap *bmp = new wxStaticBitmap(this, wxID_ANY, icon); - - m_checkbox = new wxCheckBox(this, wxID_ANY, _("&Show tips at startup")); - m_checkbox->SetValue(showAtStartup); - m_checkbox->SetFocus(); - - wxButton *btnNext = new wxButton(this, wxID_NEXT_TIP, _("&Next Tip")); - - wxButton *btnClose = new wxButton(this, wxID_CLOSE); - SetAffirmativeId(wxID_CLOSE); - - - // 2) put them in boxes - - wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL ); - - wxBoxSizer *icon_text = new wxBoxSizer( wxHORIZONTAL ); - icon_text->Add( bmp, 0, wxCENTER ); - icon_text->Add( text, 1, wxCENTER | wxLEFT, 20 ); - topsizer->Add( icon_text, 0, wxEXPAND | wxALL, 10 ); - - topsizer->Add( m_text, 1, wxEXPAND | wxLEFT|wxRIGHT, 10 ); - - wxBoxSizer *bottom = new wxBoxSizer( wxHORIZONTAL ); - if (isPda) - topsizer->Add( m_checkbox, 0, wxCENTER|wxTOP ); - else - bottom->Add( m_checkbox, 0, wxCENTER ); - - if (!isPda) - bottom->Add( 10,10,1 ); - bottom->Add( btnNext, 0, wxCENTER | wxLEFT, 10 ); - bottom->Add( btnClose, 0, wxCENTER | wxLEFT, 10 ); - - if (isPda) - topsizer->Add( bottom, 0, wxCENTER | wxALL, 5 ); - else - topsizer->Add( bottom, 0, wxEXPAND | wxALL, 10 ); - - SetTipText(); - - SetSizer( topsizer ); - - topsizer->SetSizeHints( this ); - topsizer->Fit( this ); - - Centre(wxBOTH | wxCENTER_FRAME); -} - -// ---------------------------------------------------------------------------- -// our public interface -// ---------------------------------------------------------------------------- - -#if wxUSE_TEXTFILE -wxTipProvider *wxCreateFileTipProvider(const wxString& filename, - size_t currentTip) -{ - return new wxFileTipProvider(filename, currentTip); -} -#endif // wxUSE_TEXTFILE - -bool wxShowTip(wxWindow *parent, - wxTipProvider *tipProvider, - bool showAtStartup) -{ - wxTipDialog dlg(parent, tipProvider, showAtStartup); - dlg.ShowModal(); - - return dlg.ShowTipsOnStartup(); -} - -#endif // wxUSE_STARTUP_TIPS diff --git a/Externals/wxWidgets3/src/generic/tipwin.cpp b/Externals/wxWidgets3/src/generic/tipwin.cpp deleted file mode 100644 index b022ac3c4f..0000000000 --- a/Externals/wxWidgets3/src/generic/tipwin.cpp +++ /dev/null @@ -1,386 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/generic/tipwin.cpp -// Purpose: implementation of wxTipWindow -// Author: Vadim Zeitlin -// Modified by: -// Created: 10.09.00 -// Copyright: (c) 2000 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx/wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_TIPWINDOW - -#include "wx/tipwin.h" - -#ifndef WX_PRECOMP - #include "wx/dcclient.h" - #include "wx/timer.h" - #include "wx/settings.h" -#endif // WX_PRECOMP - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -static const wxCoord TEXT_MARGIN_X = 3; -static const wxCoord TEXT_MARGIN_Y = 3; - -// ---------------------------------------------------------------------------- -// wxTipWindowView -// ---------------------------------------------------------------------------- - -// Viewer window to put in the frame -class WXDLLEXPORT wxTipWindowView : public wxWindow -{ -public: - wxTipWindowView(wxWindow *parent); - - // event handlers - void OnPaint(wxPaintEvent& event); - void OnMouseClick(wxMouseEvent& event); - void OnMouseMove(wxMouseEvent& event); - -#if !wxUSE_POPUPWIN - void OnKillFocus(wxFocusEvent& event); -#endif // wxUSE_POPUPWIN - - // calculate the client rect we need to display the text - void Adjust(const wxString& text, wxCoord maxLength); - -private: - wxTipWindow* m_parent; - -#if !wxUSE_POPUPWIN - long m_creationTime; -#endif // !wxUSE_POPUPWIN - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_NO_COPY_CLASS(wxTipWindowView); -}; - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// event tables -// ---------------------------------------------------------------------------- - -wxBEGIN_EVENT_TABLE(wxTipWindow, wxTipWindowBase) - EVT_LEFT_DOWN(wxTipWindow::OnMouseClick) - EVT_RIGHT_DOWN(wxTipWindow::OnMouseClick) - EVT_MIDDLE_DOWN(wxTipWindow::OnMouseClick) - -#if !wxUSE_POPUPWIN - EVT_KILL_FOCUS(wxTipWindow::OnKillFocus) - EVT_ACTIVATE(wxTipWindow::OnActivate) -#endif // !wxUSE_POPUPWIN -wxEND_EVENT_TABLE() - -wxBEGIN_EVENT_TABLE(wxTipWindowView, wxWindow) - EVT_PAINT(wxTipWindowView::OnPaint) - - EVT_LEFT_DOWN(wxTipWindowView::OnMouseClick) - EVT_RIGHT_DOWN(wxTipWindowView::OnMouseClick) - EVT_MIDDLE_DOWN(wxTipWindowView::OnMouseClick) - - EVT_MOTION(wxTipWindowView::OnMouseMove) - -#if !wxUSE_POPUPWIN - EVT_KILL_FOCUS(wxTipWindowView::OnKillFocus) -#endif // !wxUSE_POPUPWIN -wxEND_EVENT_TABLE() - -// ---------------------------------------------------------------------------- -// wxTipWindow -// ---------------------------------------------------------------------------- - -wxTipWindow::wxTipWindow(wxWindow *parent, - const wxString& text, - wxCoord maxLength, - wxTipWindow** windowPtr, - wxRect *rectBounds) -#if wxUSE_POPUPWIN - : wxPopupTransientWindow(parent) -#else - : wxFrame(parent, wxID_ANY, wxEmptyString, - wxDefaultPosition, wxDefaultSize, - wxNO_BORDER | wxFRAME_NO_TASKBAR ) -#endif -{ - SetTipWindowPtr(windowPtr); - if ( rectBounds ) - { - SetBoundingRect(*rectBounds); - } - - // set colours - SetForegroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_INFOTEXT)); - SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_INFOBK)); - - // set size, position and show it - m_view = new wxTipWindowView(this); - m_view->Adjust(text, maxLength); - m_view->SetFocus(); - - int x, y; - wxGetMousePosition(&x, &y); - - // we want to show the tip below the mouse, not over it - // - // NB: the reason we use "/ 2" here is that we don't know where the current - // cursors hot spot is... it would be nice if we could find this out - // though - y += wxSystemSettings::GetMetric(wxSYS_CURSOR_Y) / 2; - -#if wxUSE_POPUPWIN - Position(wxPoint(x, y), wxSize(0,0)); - Popup(m_view); - #ifdef __WXGTK__ - m_view->CaptureMouse(); - #endif -#else - Move(x, y); - Show(true); -#endif -} - -wxTipWindow::~wxTipWindow() -{ - if ( m_windowPtr ) - { - *m_windowPtr = NULL; - } - #if wxUSE_POPUPWIN - #ifdef __WXGTK__ - if ( m_view->HasCapture() ) - m_view->ReleaseMouse(); - #endif - #endif -} - -void wxTipWindow::OnMouseClick(wxMouseEvent& WXUNUSED(event)) -{ - Close(); -} - -#if wxUSE_POPUPWIN - -void wxTipWindow::OnDismiss() -{ - Close(); -} - -#else // !wxUSE_POPUPWIN - -void wxTipWindow::OnActivate(wxActivateEvent& event) -{ - if (!event.GetActive()) - Close(); -} - -void wxTipWindow::OnKillFocus(wxFocusEvent& WXUNUSED(event)) -{ - // Under Windows at least, we will get this immediately - // because when the view window is focussed, the - // tip window goes out of focus. -#ifdef __WXGTK__ - Close(); -#endif -} - -#endif // wxUSE_POPUPWIN // !wxUSE_POPUPWIN - -void wxTipWindow::SetBoundingRect(const wxRect& rectBound) -{ - m_rectBound = rectBound; -} - -void wxTipWindow::Close() -{ - if ( m_windowPtr ) - { - *m_windowPtr = NULL; - m_windowPtr = NULL; - } - // XXX: Dolphin: Prevents an assertion failure due to Close being called multiple times. - if (!IsShown()) - return; - -#if wxUSE_POPUPWIN - Show(false); - #ifdef __WXGTK__ - if ( m_view->HasCapture() ) - m_view->ReleaseMouse(); - #endif - // Under OS X we get destroyed because of wxEVT_KILL_FOCUS generated by - // Show(false). - #ifndef __WXOSX__ - Destroy(); - #endif -#else - wxFrame::Close(); -#endif -} - -// ---------------------------------------------------------------------------- -// wxTipWindowView -// ---------------------------------------------------------------------------- - -wxTipWindowView::wxTipWindowView(wxWindow *parent) - : wxWindow(parent, wxID_ANY, - wxDefaultPosition, wxDefaultSize, - wxNO_BORDER) -{ - // set colours - SetForegroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_INFOTEXT)); - SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_INFOBK)); - -#if !wxUSE_POPUPWIN - m_creationTime = wxGetLocalTime(); -#endif // !wxUSE_POPUPWIN - - m_parent = (wxTipWindow*)parent; -} - -void wxTipWindowView::Adjust(const wxString& text, wxCoord maxLength) -{ - wxClientDC dc(this); - dc.SetFont(GetFont()); - - // calculate the length: we want each line be no longer than maxLength - // pixels and we only break lines at words boundary - wxString current; - wxCoord height, width, - widthMax = 0; - m_parent->m_heightLine = 0; - - bool breakLine = false; - for ( const wxChar *p = text.c_str(); ; p++ ) - { - if ( *p == wxT('\n') || *p == wxT('\0') ) - { - dc.GetTextExtent(current, &width, &height); - if ( width > widthMax ) - widthMax = width; - - if ( height > m_parent->m_heightLine ) - m_parent->m_heightLine = height; - - m_parent->m_textLines.Add(current); - - if ( !*p ) - { - // end of text - break; - } - - current.clear(); - breakLine = false; - } - else if ( breakLine && (*p == wxT(' ') || *p == wxT('\t')) ) - { - // word boundary - break the line here - m_parent->m_textLines.Add(current); - current.clear(); - breakLine = false; - } - else // line goes on - { - current += *p; - dc.GetTextExtent(current, &width, &height); - if ( width > maxLength ) - breakLine = true; - - if ( width > widthMax ) - widthMax = width; - - if ( height > m_parent->m_heightLine ) - m_parent->m_heightLine = height; - } - } - - // take into account the border size and the margins - width = 2*(TEXT_MARGIN_X + 1) + widthMax; - height = 2*(TEXT_MARGIN_Y + 1) + wx_truncate_cast(wxCoord, m_parent->m_textLines.GetCount())*m_parent->m_heightLine; - m_parent->SetClientSize(width, height); - SetSize(0, 0, width, height); -} - -void wxTipWindowView::OnPaint(wxPaintEvent& WXUNUSED(event)) -{ - wxPaintDC dc(this); - - wxRect rect; - wxSize size = GetClientSize(); - rect.width = size.x; - rect.height = size.y; - - // first filll the background - dc.SetBrush(wxBrush(GetBackgroundColour(), wxBRUSHSTYLE_SOLID)); - dc.SetPen(wxPen(GetForegroundColour(), 1, wxPENSTYLE_SOLID)); - dc.DrawRectangle(rect); - - // and then draw the text line by line - dc.SetTextBackground(GetBackgroundColour()); - dc.SetTextForeground(GetForegroundColour()); - dc.SetFont(GetFont()); - - wxPoint pt; - pt.x = TEXT_MARGIN_X; - pt.y = TEXT_MARGIN_Y; - size_t count = m_parent->m_textLines.GetCount(); - for ( size_t n = 0; n < count; n++ ) - { - dc.DrawText(m_parent->m_textLines[n], pt); - - pt.y += m_parent->m_heightLine; - } -} - -void wxTipWindowView::OnMouseClick(wxMouseEvent& WXUNUSED(event)) -{ - m_parent->Close(); -} - -void wxTipWindowView::OnMouseMove(wxMouseEvent& event) -{ - const wxRect& rectBound = m_parent->m_rectBound; - - if ( rectBound.width && - !rectBound.Contains(ClientToScreen(event.GetPosition())) ) - { - // mouse left the bounding rect, disappear - m_parent->Close(); - } - else - { - event.Skip(); - } -} - -#if !wxUSE_POPUPWIN -void wxTipWindowView::OnKillFocus(wxFocusEvent& WXUNUSED(event)) -{ - // Workaround the kill focus event happening just after creation in wxGTK - if (wxGetLocalTime() > m_creationTime + 1) - m_parent->Close(); -} -#endif // !wxUSE_POPUPWIN - -#endif // wxUSE_TIPWINDOW diff --git a/Externals/wxWidgets3/src/generic/toolbkg.cpp b/Externals/wxWidgets3/src/generic/toolbkg.cpp deleted file mode 100644 index 40ea3a99c2..0000000000 --- a/Externals/wxWidgets3/src/generic/toolbkg.cpp +++ /dev/null @@ -1,365 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/generic/toolbkg.cpp -// Purpose: generic implementation of wxToolbook -// Author: Julian Smart -// Modified by: -// Created: 2006-01-29 -// Copyright: (c) 2006 Julian Smart -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_TOOLBOOK - -#ifndef WX_PRECOMP - #include "wx/icon.h" - #include "wx/settings.h" - #include "wx/toolbar.h" -#endif - -#include "wx/imaglist.h" -#include "wx/sysopt.h" -#include "wx/toolbook.h" - -#if defined(__WXMAC__) && wxUSE_TOOLBAR && wxUSE_BMPBUTTON -#include "wx/generic/buttonbar.h" -#endif - -// ---------------------------------------------------------------------------- -// event table -// ---------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxToolbook, wxBookCtrlBase); - -wxDEFINE_EVENT( wxEVT_TOOLBOOK_PAGE_CHANGING, wxBookCtrlEvent ); -wxDEFINE_EVENT( wxEVT_TOOLBOOK_PAGE_CHANGED, wxBookCtrlEvent ); - -wxBEGIN_EVENT_TABLE(wxToolbook, wxBookCtrlBase) - EVT_SIZE(wxToolbook::OnSize) - EVT_TOOL_RANGE(1, 50, wxToolbook::OnToolSelected) - EVT_IDLE(wxToolbook::OnIdle) -wxEND_EVENT_TABLE() - -// ============================================================================ -// wxToolbook implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxToolbook creation -// ---------------------------------------------------------------------------- - -void wxToolbook::Init() -{ - m_needsRealizing = false; -} - -bool wxToolbook::Create(wxWindow *parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) -{ - if ( (style & wxBK_ALIGN_MASK) == wxBK_DEFAULT ) - style |= wxBK_TOP; - - // no border for this control - style &= ~wxBORDER_MASK; - style |= wxBORDER_NONE; - - if ( !wxControl::Create(parent, id, pos, size, style, - wxDefaultValidator, name) ) - return false; - - int tbFlags = wxTB_TEXT | wxTB_FLAT | wxBORDER_NONE; - if ( (style & (wxBK_LEFT | wxBK_RIGHT)) != 0 ) - tbFlags |= wxTB_VERTICAL; - else - tbFlags |= wxTB_HORIZONTAL; - - if ( style & wxTBK_HORZ_LAYOUT ) - tbFlags |= wxTB_HORZ_LAYOUT; - - // TODO: make more configurable - -#if defined(__WXMAC__) && wxUSE_TOOLBAR && wxUSE_BMPBUTTON - if (style & wxTBK_BUTTONBAR) - { - m_bookctrl = new wxButtonToolBar - ( - this, - wxID_ANY, - wxDefaultPosition, - wxDefaultSize, - tbFlags - ); - } - else -#endif - { - m_bookctrl = new wxToolBar - ( - this, - wxID_ANY, - wxDefaultPosition, - wxDefaultSize, - tbFlags | wxTB_NODIVIDER - ); - } - - return true; -} - -// ---------------------------------------------------------------------------- -// wxToolbook geometry management -// ---------------------------------------------------------------------------- - -void wxToolbook::OnSize(wxSizeEvent& event) -{ - if (m_needsRealizing) - Realize(); - - wxBookCtrlBase::OnSize(event); -} - -// ---------------------------------------------------------------------------- -// accessing the pages -// ---------------------------------------------------------------------------- - -bool wxToolbook::SetPageText(size_t n, const wxString& strText) -{ - // Assume tool ids start from 1 - wxToolBarToolBase* tool = GetToolBar()->FindById(n + 1); - if (tool) - { - tool->SetLabel(strText); - return true; - } - else - return false; -} - -wxString wxToolbook::GetPageText(size_t n) const -{ - wxToolBarToolBase* tool = GetToolBar()->FindById(n + 1); - if (tool) - return tool->GetLabel(); - else - return wxEmptyString; -} - -int wxToolbook::GetPageImage(size_t WXUNUSED(n)) const -{ - wxFAIL_MSG( wxT("wxToolbook::GetPageImage() not implemented") ); - - return wxNOT_FOUND; -} - -bool wxToolbook::SetPageImage(size_t n, int imageId) -{ - wxASSERT( GetImageList() != NULL ); - if (!GetImageList()) - return false; - - GetToolBar()->SetToolNormalBitmap(n + 1, GetImageList()->GetBitmap(imageId)); - - return true; -} - -// ---------------------------------------------------------------------------- -// image list stuff -// ---------------------------------------------------------------------------- - -void wxToolbook::SetImageList(wxImageList *imageList) -{ - wxBookCtrlBase::SetImageList(imageList); -} - -// ---------------------------------------------------------------------------- -// selection -// ---------------------------------------------------------------------------- - -wxBookCtrlEvent* wxToolbook::CreatePageChangingEvent() const -{ - return new wxBookCtrlEvent(wxEVT_TOOLBOOK_PAGE_CHANGING, m_windowId); -} - -void wxToolbook::MakeChangedEvent(wxBookCtrlEvent &event) -{ - event.SetEventType(wxEVT_TOOLBOOK_PAGE_CHANGED); -} - -void wxToolbook::UpdateSelectedPage(size_t newsel) -{ - m_selection = newsel; - GetToolBar()->ToggleTool(newsel + 1, true); -} - -// Not part of the wxBookctrl API, but must be called in OnIdle or -// by application to realize the toolbar and select the initial page. -void wxToolbook::Realize() -{ - if (m_needsRealizing) - { - m_needsRealizing = false; - - GetToolBar()->SetToolBitmapSize(m_maxBitmapSize); - - GetToolBar()->Realize(); - } - - if (m_selection == wxNOT_FOUND) - m_selection = 0; - - if (GetPageCount() > 0) - { - int sel = m_selection; - m_selection = wxNOT_FOUND; - SetSelection(sel); - } - - DoSize(); -} - -int wxToolbook::HitTest(const wxPoint& pt, long *flags) const -{ - int pagePos = wxNOT_FOUND; - - if ( flags ) - *flags = wxBK_HITTEST_NOWHERE; - - // convert from wxToolbook coordinates to wxToolBar ones - const wxToolBarBase * const tbar = GetToolBar(); - const wxPoint tbarPt = tbar->ScreenToClient(ClientToScreen(pt)); - - // is the point over the toolbar? - if ( wxRect(tbar->GetSize()).Contains(tbarPt) ) - { - const wxToolBarToolBase * const - tool = tbar->FindToolForPosition(tbarPt.x, tbarPt.y); - - if ( tool ) - { - pagePos = tbar->GetToolPos(tool->GetId()); - if ( flags ) - *flags = wxBK_HITTEST_ONICON | wxBK_HITTEST_ONLABEL; - } - } - else // not over the toolbar - { - if ( flags && GetPageRect().Contains(pt) ) - *flags |= wxBK_HITTEST_ONPAGE; - } - - return pagePos; -} - -void wxToolbook::OnIdle(wxIdleEvent& event) -{ - if (m_needsRealizing) - Realize(); - event.Skip(); -} - -// ---------------------------------------------------------------------------- -// adding/removing the pages -// ---------------------------------------------------------------------------- - -bool wxToolbook::InsertPage(size_t n, - wxWindow *page, - const wxString& text, - bool bSelect, - int imageId) -{ - if ( !wxBookCtrlBase::InsertPage(n, page, text, bSelect, imageId) ) - return false; - - m_needsRealizing = true; - - wxASSERT(GetImageList() != NULL); - - if (!GetImageList()) - return false; - - // TODO: make sure all platforms can convert between icon and bitmap, - // and/or test whether the image is a bitmap or an icon. -#ifdef __WXMAC__ - wxBitmap bitmap = GetImageList()->GetBitmap(imageId); -#else - // On Windows, we can lose information by using GetBitmap, so extract icon instead - wxIcon icon = GetImageList()->GetIcon(imageId); - wxBitmap bitmap; - bitmap.CopyFromIcon(icon); -#endif - - m_maxBitmapSize.x = wxMax(bitmap.GetWidth(), m_maxBitmapSize.x); - m_maxBitmapSize.y = wxMax(bitmap.GetHeight(), m_maxBitmapSize.y); - - GetToolBar()->SetToolBitmapSize(m_maxBitmapSize); - GetToolBar()->AddRadioTool(n + 1, text, bitmap, wxNullBitmap, text); - - if (bSelect) - { - GetToolBar()->ToggleTool(n, true); - m_selection = n; - } - else - page->Hide(); - - InvalidateBestSize(); - return true; -} - -wxWindow *wxToolbook::DoRemovePage(size_t page) -{ - wxWindow *win = wxBookCtrlBase::DoRemovePage(page); - - if ( win ) - { - GetToolBar()->DeleteTool(page + 1); - - DoSetSelectionAfterRemoval(page); - } - - return win; -} - - -bool wxToolbook::DeleteAllPages() -{ - GetToolBar()->ClearTools(); - return wxBookCtrlBase::DeleteAllPages(); -} - -// ---------------------------------------------------------------------------- -// wxToolbook events -// ---------------------------------------------------------------------------- - -void wxToolbook::OnToolSelected(wxCommandEvent& event) -{ - const int selNew = event.GetId() - 1; - - if ( selNew == m_selection ) - { - // this event can only come from our own Select(m_selection) below - // which we call when the page change is vetoed, so we should simply - // ignore it - return; - } - - SetSelection(selNew); - - // change wasn't allowed, return to previous state - if (m_selection != selNew) - { - GetToolBar()->ToggleTool(m_selection, false); - } -} - -#endif // wxUSE_TOOLBOOK diff --git a/Externals/wxWidgets3/src/generic/treebkg.cpp b/Externals/wxWidgets3/src/generic/treebkg.cpp deleted file mode 100644 index 7e3599564d..0000000000 --- a/Externals/wxWidgets3/src/generic/treebkg.cpp +++ /dev/null @@ -1,764 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/generic/treebkg.cpp -// Purpose: generic implementation of wxTreebook -// Author: Evgeniy Tarassov, Vadim Zeitlin -// Modified by: -// Created: 2005-09-15 -// Copyright: (c) 2005 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_TREEBOOK - -#include "wx/treebook.h" - -#ifndef WX_PRECOMP - #include "wx/settings.h" -#endif - -#include "wx/imaglist.h" - -// ---------------------------------------------------------------------------- -// various wxWidgets macros -// ---------------------------------------------------------------------------- - -// check that the page index is valid -#define IS_VALID_PAGE(nPage) ((nPage) < DoInternalGetPageCount()) - -// ---------------------------------------------------------------------------- -// event table -// ---------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxTreebook, wxBookCtrlBase); - -wxDEFINE_EVENT( wxEVT_TREEBOOK_PAGE_CHANGING, wxBookCtrlEvent ); -wxDEFINE_EVENT( wxEVT_TREEBOOK_PAGE_CHANGED, wxBookCtrlEvent ); -wxDEFINE_EVENT( wxEVT_TREEBOOK_NODE_COLLAPSED, wxBookCtrlEvent ); -wxDEFINE_EVENT( wxEVT_TREEBOOK_NODE_EXPANDED, wxBookCtrlEvent ); - -wxBEGIN_EVENT_TABLE(wxTreebook, wxBookCtrlBase) - EVT_TREE_SEL_CHANGED (wxID_ANY, wxTreebook::OnTreeSelectionChange) - EVT_TREE_ITEM_EXPANDED (wxID_ANY, wxTreebook::OnTreeNodeExpandedCollapsed) - EVT_TREE_ITEM_COLLAPSED(wxID_ANY, wxTreebook::OnTreeNodeExpandedCollapsed) -wxEND_EVENT_TABLE() - -// ============================================================================ -// wxTreebook implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxTreebook creation -// ---------------------------------------------------------------------------- - -void wxTreebook::Init() -{ - m_selection = - m_actualSelection = wxNOT_FOUND; -} - -bool -wxTreebook::Create(wxWindow *parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) -{ - // Check the style flag to have either wxTBK_RIGHT or wxTBK_LEFT - if ( (style & wxBK_ALIGN_MASK) == wxBK_DEFAULT ) - { - style |= wxBK_LEFT; - } - style |= wxTAB_TRAVERSAL; - - // no border for this control, it doesn't look nice together with the tree - style &= ~wxBORDER_MASK; - style |= wxBORDER_NONE; - - if ( !wxControl::Create(parent, id, pos, size, - style, wxDefaultValidator, name) ) - return false; - - m_bookctrl = new wxTreeCtrl - ( - this, - wxID_ANY, - wxDefaultPosition, - wxDefaultSize, - wxBORDER_THEME | - wxTR_DEFAULT_STYLE | - wxTR_HIDE_ROOT | - wxTR_SINGLE - ); - GetTreeCtrl()->SetQuickBestSize(false); // do full size calculation - GetTreeCtrl()->AddRoot(wxEmptyString); // label doesn't matter, it's hidden - -#ifdef __WXMSW__ - // We need to add dummy size event to force possible scrollbar hiding - wxSizeEvent evt; - GetEventHandler()->AddPendingEvent(evt); -#endif - - return true; -} - - -// insert a new page just before the pagePos -bool wxTreebook::InsertPage(size_t pagePos, - wxWindow *page, - const wxString& text, - bool bSelect, - int imageId) -{ - return DoInsertPage(pagePos, page, text, bSelect, imageId); -} - -bool wxTreebook::InsertSubPage(size_t pagePos, - wxWindow *page, - const wxString& text, - bool bSelect, - int imageId) -{ - return DoInsertSubPage(pagePos, page, text, bSelect, imageId); -} - -bool wxTreebook::AddPage(wxWindow *page, const wxString& text, bool bSelect, - int imageId) -{ - return DoInsertPage(m_treeIds.GetCount(), page, text, bSelect, imageId); -} - -// insertion time is linear to the number of top-pages -bool wxTreebook::AddSubPage(wxWindow *page, const wxString& text, bool bSelect, int imageId) -{ - return DoAddSubPage(page, text, bSelect, imageId); -} - - -bool wxTreebook::DoInsertPage(size_t pagePos, - wxWindow *page, - const wxString& text, - bool bSelect, - int imageId) -{ - wxCHECK_MSG( pagePos <= DoInternalGetPageCount(), false, - wxT("Invalid treebook page position") ); - - if ( !wxBookCtrlBase::InsertPage(pagePos, page, text, bSelect, imageId) ) - return false; - - wxTreeCtrl *tree = GetTreeCtrl(); - wxTreeItemId newId; - if ( pagePos == DoInternalGetPageCount() ) - { - // append the page to the end - wxTreeItemId rootId = tree->GetRootItem(); - - newId = tree->AppendItem(rootId, text, imageId); - } - else // insert the new page before the given one - { - wxTreeItemId nodeId = m_treeIds[pagePos]; - - wxTreeItemId previousId = tree->GetPrevSibling(nodeId); - wxTreeItemId parentId = tree->GetItemParent(nodeId); - - if ( previousId.IsOk() ) - { - // insert before the sibling - previousId - newId = tree->InsertItem(parentId, previousId, text, imageId); - } - else // no prev siblings -- insert as a first child - { - wxASSERT_MSG( parentId.IsOk(), wxT( "Tree has no root node?" ) ); - - newId = tree->PrependItem(parentId, text, imageId); - } - } - - if ( !newId.IsOk() ) - { - //something wrong -> cleaning and returning with false - (void)wxBookCtrlBase::DoRemovePage(pagePos); - - wxFAIL_MSG( wxT("Failed to insert treebook page") ); - return false; - } - - DoInternalAddPage(pagePos, page, newId); - - DoUpdateSelection(bSelect, pagePos); - - return true; -} - -bool wxTreebook::DoAddSubPage(wxWindow *page, const wxString& text, bool bSelect, int imageId) -{ - wxTreeCtrl *tree = GetTreeCtrl(); - - wxTreeItemId rootId = tree->GetRootItem(); - - wxTreeItemId lastNodeId = tree->GetLastChild(rootId); - - wxCHECK_MSG( lastNodeId.IsOk(), false, - wxT("Can't insert sub page when there are no pages") ); - - // now calculate its position (should we save/update it too?) - size_t newPos = tree->GetCount() - - (tree->GetChildrenCount(lastNodeId, true) + 1); - - return DoInsertSubPage(newPos, page, text, bSelect, imageId); -} - -bool wxTreebook::DoInsertSubPage(size_t pagePos, - wxTreebookPage *page, - const wxString& text, - bool bSelect, - int imageId) -{ - wxTreeItemId parentId = DoInternalGetPage(pagePos); - wxCHECK_MSG( parentId.IsOk(), false, wxT("invalid tree item") ); - - wxTreeCtrl *tree = GetTreeCtrl(); - - size_t newPos = pagePos + tree->GetChildrenCount(parentId, true) + 1; - wxASSERT_MSG( newPos <= DoInternalGetPageCount(), - wxT("Internal error in tree insert point calculation") ); - - if ( !wxBookCtrlBase::InsertPage(newPos, page, text, bSelect, imageId) ) - return false; - - wxTreeItemId newId = tree->AppendItem(parentId, text, imageId); - - if ( !newId.IsOk() ) - { - (void)wxBookCtrlBase::DoRemovePage(newPos); - - wxFAIL_MSG( wxT("Failed to insert treebook page") ); - return false; - } - - DoInternalAddPage(newPos, page, newId); - - DoUpdateSelection(bSelect, newPos); - - return true; -} - -bool wxTreebook::DeletePage(size_t pagePos) -{ - wxCHECK_MSG( IS_VALID_PAGE(pagePos), false, wxT("Invalid tree index") ); - - wxTreebookPage *oldPage = DoRemovePage(pagePos); - if ( !oldPage ) - return false; - - delete oldPage; - - return true; -} - -wxTreebookPage *wxTreebook::DoRemovePage(size_t pagePos) -{ - wxTreeItemId pageId = DoInternalGetPage(pagePos); - wxCHECK_MSG( pageId.IsOk(), NULL, wxT("Invalid tree index") ); - - wxTreebookPage * oldPage = GetPage(pagePos); - wxTreeCtrl *tree = GetTreeCtrl(); - - size_t subCount = tree->GetChildrenCount(pageId, true); - wxASSERT_MSG ( IS_VALID_PAGE(pagePos + subCount), - wxT("Internal error in wxTreebook::DoRemovePage") ); - - // here we are going to delete ALL the pages in the range - // [pagePos, pagePos + subCount] -- the page and its children - - // deleting all the pages from the base class - for ( size_t i = 0; i <= subCount; ++i ) - { - wxTreebookPage *page = wxBookCtrlBase::DoRemovePage(pagePos); - - // don't delete the page itself though -- it will be deleted in - // DeletePage() when we return - if ( i ) - { - delete page; - } - } - - DoInternalRemovePageRange(pagePos, subCount); - - tree->DeleteChildren( pageId ); - tree->Delete( pageId ); - - return oldPage; -} - -bool wxTreebook::DeleteAllPages() -{ - wxBookCtrlBase::DeleteAllPages(); - m_treeIds.Clear(); - m_selection = - m_actualSelection = wxNOT_FOUND; - - wxTreeCtrl *tree = GetTreeCtrl(); - tree->DeleteChildren(tree->GetRootItem()); - - return true; -} - -void wxTreebook::DoInternalAddPage(size_t newPos, - wxTreebookPage *page, - wxTreeItemId pageId) -{ - wxASSERT_MSG( newPos <= m_treeIds.GetCount(), wxT("Ivalid index passed to wxTreebook::DoInternalAddPage") ); - - // hide newly inserted page initially (it will be shown when selected) - if ( page ) - page->Hide(); - - if ( newPos == m_treeIds.GetCount() ) - { - // append - m_treeIds.Add(pageId); - } - else // insert - { - m_treeIds.Insert(pageId, newPos); - - if ( m_selection != wxNOT_FOUND && newPos <= (size_t)m_selection ) - { - // selection has been moved one unit toward the end - ++m_selection; - if ( m_actualSelection != wxNOT_FOUND ) - ++m_actualSelection; - } - else if ( m_actualSelection != wxNOT_FOUND && - newPos <= (size_t)m_actualSelection ) - { - DoSetSelection(m_selection); - } - } -} - -void wxTreebook::DoInternalRemovePageRange(size_t pagePos, size_t subCount) -{ - // Attention: this function is only for a situation when we delete a node - // with all its children so pagePos is the node's index and subCount is the - // node children count - wxASSERT_MSG( pagePos + subCount < m_treeIds.GetCount(), - wxT("Ivalid page index") ); - - wxTreeItemId pageId = m_treeIds[pagePos]; - - m_treeIds.RemoveAt(pagePos, subCount + 1); - - if ( m_selection != wxNOT_FOUND ) - { - if ( (size_t)m_selection > pagePos + subCount) - { - // selection is far after the deleted page, so just update the index and move on - m_selection -= 1 + subCount; - if ( m_actualSelection != wxNOT_FOUND) - { - m_actualSelection -= subCount + 1; - } - } - else if ( (size_t)m_selection >= pagePos ) - { - wxTreeCtrl *tree = GetTreeCtrl(); - - // as selected page is going to be deleted, try to select the next - // sibling if exists, if not then the parent - wxTreeItemId nodeId = tree->GetNextSibling(pageId); - - m_selection = wxNOT_FOUND; - m_actualSelection = wxNOT_FOUND; - - if ( nodeId.IsOk() ) - { - // selecting next siblings - tree->SelectItem(nodeId); - } - else // no next sibling, select the parent - { - wxTreeItemId parentId = tree->GetItemParent(pageId); - - if ( parentId.IsOk() && parentId != tree->GetRootItem() ) - { - tree->SelectItem(parentId); - } - else // parent is root - { - // we can't select it as it's hidden - DoUpdateSelection(false, wxNOT_FOUND); - } - } - } - else if ( m_actualSelection != wxNOT_FOUND && - (size_t)m_actualSelection >= pagePos ) - { - // nothing to do -- selection is before the deleted node, but - // actually shown page (the first (sub)child with page != NULL) is - // already deleted - m_actualSelection = m_selection; - - // send event as documented - DoSetSelection(m_selection, SetSelection_SendEvent); - } - //else: nothing to do -- selection is before the deleted node - } - else - { - DoUpdateSelection(false, wxNOT_FOUND); - } -} - - -void wxTreebook::DoUpdateSelection(bool bSelect, int newPos) -{ - int newSelPos; - if ( bSelect ) - { - newSelPos = newPos; - } - else if ( m_selection == wxNOT_FOUND && DoInternalGetPageCount() > 0 ) - { - newSelPos = 0; - } - else - { - newSelPos = wxNOT_FOUND; - } - - if ( newSelPos != wxNOT_FOUND ) - { - SetSelection((size_t)newSelPos); - } -} - -wxTreeItemId wxTreebook::DoInternalGetPage(size_t pagePos) const -{ - if ( pagePos >= m_treeIds.GetCount() ) - { - // invalid position but ok here, in this internal function, don't assert - // (the caller will do it) - return wxTreeItemId(); - } - - return m_treeIds[pagePos]; -} - -int wxTreebook::DoInternalFindPageById(wxTreeItemId pageId) const -{ - const size_t count = m_treeIds.GetCount(); - for ( size_t i = 0; i < count; ++i ) - { - if ( m_treeIds[i] == pageId ) - return i; - } - - return wxNOT_FOUND; -} - -bool wxTreebook::IsNodeExpanded(size_t pagePos) const -{ - wxTreeItemId pageId = DoInternalGetPage(pagePos); - - wxCHECK_MSG( pageId.IsOk(), false, wxT("invalid tree item") ); - - return GetTreeCtrl()->IsExpanded(pageId); -} - -bool wxTreebook::ExpandNode(size_t pagePos, bool expand) -{ - wxTreeItemId pageId = DoInternalGetPage(pagePos); - - wxCHECK_MSG( pageId.IsOk(), false, wxT("invalid tree item") ); - - if ( expand ) - { - GetTreeCtrl()->Expand( pageId ); - } - else // collapse - { - GetTreeCtrl()->Collapse( pageId ); - - // rely on the events generated by wxTreeCtrl to update selection - } - - return true; -} - -int wxTreebook::GetPageParent(size_t pagePos) const -{ - wxTreeItemId nodeId = DoInternalGetPage( pagePos ); - wxCHECK_MSG( nodeId.IsOk(), wxNOT_FOUND, wxT("Invalid page index spacified!") ); - - const wxTreeItemId parent = GetTreeCtrl()->GetItemParent( nodeId ); - - return parent.IsOk() ? DoInternalFindPageById(parent) : wxNOT_FOUND; -} - -bool wxTreebook::SetPageText(size_t n, const wxString& strText) -{ - wxTreeItemId pageId = DoInternalGetPage(n); - - wxCHECK_MSG( pageId.IsOk(), false, wxT("invalid tree item") ); - - GetTreeCtrl()->SetItemText(pageId, strText); - - return true; -} - -wxString wxTreebook::GetPageText(size_t n) const -{ - wxTreeItemId pageId = DoInternalGetPage(n); - - wxCHECK_MSG( pageId.IsOk(), wxString(), wxT("invalid tree item") ); - - return GetTreeCtrl()->GetItemText(pageId); -} - -int wxTreebook::GetPageImage(size_t n) const -{ - wxTreeItemId pageId = DoInternalGetPage(n); - - wxCHECK_MSG( pageId.IsOk(), wxNOT_FOUND, wxT("invalid tree item") ); - - return GetTreeCtrl()->GetItemImage(pageId); -} - -bool wxTreebook::SetPageImage(size_t n, int imageId) -{ - wxTreeItemId pageId = DoInternalGetPage(n); - - wxCHECK_MSG( pageId.IsOk(), false, wxT("invalid tree item") ); - - GetTreeCtrl()->SetItemImage(pageId, imageId); - - return true; -} - -int wxTreebook::DoSetSelection(size_t pagePos, int flags) -{ - wxCHECK_MSG( IS_VALID_PAGE(pagePos), wxNOT_FOUND, - wxT("invalid page index in wxListbook::DoSetSelection()") ); - wxASSERT_MSG( GetPageCount() == DoInternalGetPageCount(), - wxT("wxTreebook logic error: m_treeIds and m_pages not in sync!")); - - wxBookCtrlEvent event(wxEVT_TREEBOOK_PAGE_CHANGING, m_windowId); - const int oldSel = m_selection; - wxTreeCtrl *tree = GetTreeCtrl(); - bool allowed = false; - - if (flags & SetSelection_SendEvent) - { - event.SetEventObject(this); - event.SetSelection(pagePos); - event.SetOldSelection(m_selection); - - // don't send the event if the old and new pages are the same; do send it - // otherwise and be prepared for it to be vetoed - allowed = (int)pagePos == m_selection || - !GetEventHandler()->ProcessEvent(event) || - event.IsAllowed(); - } - - if ( !(flags & SetSelection_SendEvent) || allowed ) - { - // hide the previously shown page - wxTreebookPage * const oldPage = DoGetCurrentPage(); - if ( oldPage ) - oldPage->Hide(); - - // then show the new one - m_selection = pagePos; - wxTreebookPage *page = wxBookCtrlBase::GetPage(m_selection); - if ( !page ) - { - // find the next page suitable to be shown: the first (grand)child - // of this one with a non-NULL associated page - wxTreeItemId childId = m_treeIds[pagePos]; - int actualPagePos = pagePos; - while ( !page && childId.IsOk() ) - { - wxTreeItemIdValue cookie; - childId = tree->GetFirstChild( childId, cookie ); - if ( childId.IsOk() ) - { - page = wxBookCtrlBase::GetPage(++actualPagePos); - } - } - - m_actualSelection = page ? actualPagePos : m_selection; - } - - if ( page ) - page->Show(); - - tree->SelectItem(DoInternalGetPage(pagePos)); - - if (flags & SetSelection_SendEvent) - { - // notify about the (now completed) page change - event.SetEventType(wxEVT_TREEBOOK_PAGE_CHANGED); - (void)GetEventHandler()->ProcessEvent(event); - } - } - else if ( (flags & SetSelection_SendEvent) && !allowed) // page change vetoed - { - // tree selection might have already had changed - if ( oldSel != wxNOT_FOUND ) - tree->SelectItem(DoInternalGetPage(oldSel)); - } - - return oldSel; -} - -wxTreebookPage *wxTreebook::DoGetCurrentPage() const -{ - if ( m_selection == wxNOT_FOUND ) - return NULL; - - wxTreebookPage *page = wxBookCtrlBase::GetPage(m_selection); - if ( !page && m_actualSelection != wxNOT_FOUND ) - { - page = wxBookCtrlBase::GetPage(m_actualSelection); - } - - return page; -} - -void wxTreebook::SetImageList(wxImageList *imageList) -{ - wxBookCtrlBase::SetImageList(imageList); - GetTreeCtrl()->SetImageList(imageList); -} - -void wxTreebook::AssignImageList(wxImageList *imageList) -{ - wxBookCtrlBase::AssignImageList(imageList); - GetTreeCtrl()->SetImageList(imageList); -} - -// ---------------------------------------------------------------------------- -// event handlers -// ---------------------------------------------------------------------------- - -void wxTreebook::OnTreeSelectionChange(wxTreeEvent& event) -{ - if ( event.GetEventObject() != m_bookctrl ) - { - event.Skip(); - return; - } - - wxTreeItemId newId = event.GetItem(); - - if ( (m_selection == wxNOT_FOUND && - (!newId.IsOk() || newId == GetTreeCtrl()->GetRootItem())) || - (m_selection != wxNOT_FOUND && newId == m_treeIds[m_selection]) ) - { - // this event can only come when we modify the tree selection ourselves - // so we should simply ignore it - return; - } - - int newPos = DoInternalFindPageById(newId); - - if ( newPos != wxNOT_FOUND ) - SetSelection( newPos ); -} - -void wxTreebook::OnTreeNodeExpandedCollapsed(wxTreeEvent & event) -{ - if ( event.GetEventObject() != m_bookctrl ) - { - event.Skip(); - return; - } - - wxTreeItemId nodeId = event.GetItem(); - if ( !nodeId.IsOk() || nodeId == GetTreeCtrl()->GetRootItem() ) - return; - int pagePos = DoInternalFindPageById(nodeId); - wxCHECK_RET( pagePos != wxNOT_FOUND, wxT("Internal problem in wxTreebook!..") ); - - wxBookCtrlEvent ev(GetTreeCtrl()->IsExpanded(nodeId) - ? wxEVT_TREEBOOK_NODE_EXPANDED - : wxEVT_TREEBOOK_NODE_COLLAPSED, - m_windowId); - - ev.SetSelection(pagePos); - ev.SetOldSelection(pagePos); - ev.SetEventObject(this); - - GetEventHandler()->ProcessEvent(ev); -} - -// ---------------------------------------------------------------------------- -// wxTreebook geometry management -// ---------------------------------------------------------------------------- - -int wxTreebook::HitTest(wxPoint const & pt, long * flags) const -{ - int pagePos = wxNOT_FOUND; - - if ( flags ) - *flags = wxBK_HITTEST_NOWHERE; - - // convert from wxTreebook coorindates to wxTreeCtrl ones - const wxTreeCtrl * const tree = GetTreeCtrl(); - const wxPoint treePt = tree->ScreenToClient(ClientToScreen(pt)); - - // is it over the tree? - if ( wxRect(tree->GetSize()).Contains(treePt) ) - { - int flagsTree; - wxTreeItemId id = tree->HitTest(treePt, flagsTree); - - if ( id.IsOk() && (flagsTree & wxTREE_HITTEST_ONITEM) ) - { - pagePos = DoInternalFindPageById(id); - } - - if ( flags ) - { - if ( pagePos != wxNOT_FOUND ) - *flags = 0; - - if ( flagsTree & (wxTREE_HITTEST_ONITEMBUTTON | - wxTREE_HITTEST_ONITEMICON | - wxTREE_HITTEST_ONITEMSTATEICON) ) - *flags |= wxBK_HITTEST_ONICON; - - if ( flagsTree & wxTREE_HITTEST_ONITEMLABEL ) - *flags |= wxBK_HITTEST_ONLABEL; - } - } - else // not over the tree - { - if ( flags && GetPageRect().Contains( pt ) ) - *flags |= wxBK_HITTEST_ONPAGE; - } - - return pagePos; -} - -#endif // wxUSE_TREEBOOK diff --git a/Externals/wxWidgets3/src/generic/treectlg.cpp b/Externals/wxWidgets3/src/generic/treectlg.cpp deleted file mode 100644 index aa8a7dc0da..0000000000 --- a/Externals/wxWidgets3/src/generic/treectlg.cpp +++ /dev/null @@ -1,4162 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/generic/treectlg.cpp -// Purpose: generic tree control implementation -// Author: Robert Roebling -// Created: 01/02/97 -// Modified: 22/10/98 - almost total rewrite, simpler interface (VZ) -// Copyright: (c) 1998 Robert Roebling and Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================= -// declarations -// ============================================================================= - -// ----------------------------------------------------------------------------- -// headers -// ----------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_TREECTRL - -#include "wx/treectrl.h" - -#ifndef WX_PRECOMP - #include "wx/dcclient.h" - #include "wx/timer.h" - #include "wx/settings.h" - #include "wx/listbox.h" - #include "wx/textctrl.h" -#endif - -#include "wx/generic/treectlg.h" -#include "wx/imaglist.h" - -#include "wx/renderer.h" - -#ifdef __WXMAC__ - #include "wx/osx/private.h" -#endif - -// ----------------------------------------------------------------------------- -// array types -// ----------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxGenericTreeItem; - -WX_DEFINE_ARRAY_PTR(wxGenericTreeItem *, wxArrayGenericTreeItems); - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -static const int NO_IMAGE = -1; - -static const int PIXELS_PER_UNIT = 10; - -// the margin between the item state image and the item normal image -static const int MARGIN_BETWEEN_STATE_AND_IMAGE = 2; - -// the margin between the item image and the item text -static const int MARGIN_BETWEEN_IMAGE_AND_TEXT = 4; - -// ----------------------------------------------------------------------------- -// private classes -// ----------------------------------------------------------------------------- - -// timer used for enabling in-place edit -class WXDLLEXPORT wxTreeRenameTimer: public wxTimer -{ -public: - // start editing the current item after half a second (if the mouse hasn't - // been clicked/moved) - enum { DELAY = 500 }; - - wxTreeRenameTimer( wxGenericTreeCtrl *owner ); - - virtual void Notify() wxOVERRIDE; - -private: - wxGenericTreeCtrl *m_owner; - - wxDECLARE_NO_COPY_CLASS(wxTreeRenameTimer); -}; - -// control used for in-place edit -class WXDLLEXPORT wxTreeTextCtrl: public wxTextCtrl -{ -public: - wxTreeTextCtrl(wxGenericTreeCtrl *owner, wxGenericTreeItem *item); - - void EndEdit( bool discardChanges ); - - const wxGenericTreeItem* item() const { return m_itemEdited; } - -protected: - void OnChar( wxKeyEvent &event ); - void OnKeyUp( wxKeyEvent &event ); - void OnKillFocus( wxFocusEvent &event ); - - bool AcceptChanges(); - void Finish( bool setfocus ); - -private: - wxGenericTreeCtrl *m_owner; - wxGenericTreeItem *m_itemEdited; - wxString m_startValue; - bool m_aboutToFinish; - - wxDECLARE_EVENT_TABLE(); - wxDECLARE_NO_COPY_CLASS(wxTreeTextCtrl); -}; - -// timer used to clear wxGenericTreeCtrl::m_findPrefix if no key was pressed -// for a sufficiently long time -class WXDLLEXPORT wxTreeFindTimer : public wxTimer -{ -public: - // reset the current prefix after half a second of inactivity - enum { DELAY = 500 }; - - wxTreeFindTimer( wxGenericTreeCtrl *owner ) { m_owner = owner; } - - virtual void Notify() wxOVERRIDE { m_owner->ResetFindState(); } - -private: - wxGenericTreeCtrl *m_owner; - - wxDECLARE_NO_COPY_CLASS(wxTreeFindTimer); -}; - -// a tree item -class WXDLLEXPORT wxGenericTreeItem -{ -public: - // ctors & dtor - wxGenericTreeItem() - { - m_data = NULL; - m_widthText = - m_heightText = -1; - } - - wxGenericTreeItem( wxGenericTreeItem *parent, - const wxString& text, - int image, - int selImage, - wxTreeItemData *data ); - - ~wxGenericTreeItem(); - - // trivial accessors - wxArrayGenericTreeItems& GetChildren() { return m_children; } - - const wxString& GetText() const { return m_text; } - int GetImage(wxTreeItemIcon which = wxTreeItemIcon_Normal) const - { return m_images[which]; } - wxTreeItemData *GetData() const { return m_data; } - int GetState() const { return m_state; } - - // returns the current image for the item (depending on its - // selected/expanded/whatever state) - int GetCurrentImage() const; - - void SetText(const wxString& text) - { - m_text = text; - - ResetTextSize(); - } - - void SetImage(int image, wxTreeItemIcon which) - { - m_images[which] = image; - m_width = 0; - } - - void SetData(wxTreeItemData *data) { m_data = data; } - void SetState(int state) { m_state = state; m_width = 0; } - - void SetHasPlus(bool has = true) { m_hasPlus = has; } - - void SetBold(bool bold) - { - m_isBold = bold; - - ResetTextSize(); - } - - int GetX() const { return m_x; } - int GetY() const { return m_y; } - - void SetX(int x) { m_x = x; } - void SetY(int y) { m_y = y; } - - int GetHeight() const { return m_height; } - int GetWidth() const { return m_width; } - - int GetTextHeight() const - { - wxASSERT_MSG( m_heightText != -1, "must call CalculateSize() first" ); - - return m_heightText; - } - - int GetTextWidth() const - { - wxASSERT_MSG( m_widthText != -1, "must call CalculateSize() first" ); - - return m_widthText; - } - - wxGenericTreeItem *GetParent() const { return m_parent; } - - // sets the items font for the specified DC if it uses any special font or - // simply returns false otherwise - bool SetFont(wxGenericTreeCtrl *control, wxDC& dc) const - { - wxFont font; - - wxTreeItemAttr * const attr = GetAttributes(); - if ( attr && attr->HasFont() ) - font = attr->GetFont(); - else if ( IsBold() ) - font = control->m_boldFont; - else - return false; - - dc.SetFont(font); - return true; - } - - // operations - - // deletes all children notifying the treectrl about it - void DeleteChildren(wxGenericTreeCtrl *tree); - - // get count of all children (and grand children if 'recursively') - size_t GetChildrenCount(bool recursively = true) const; - - void Insert(wxGenericTreeItem *child, size_t index) - { m_children.Insert(child, index); } - - // calculate and cache the item size using either the provided DC (which is - // supposed to have wxGenericTreeCtrl::m_normalFont selected into it!) or a - // wxClientDC on the control window - void CalculateSize(wxGenericTreeCtrl *control, wxDC& dc) - { DoCalculateSize(control, dc, true /* dc uses normal font */); } - void CalculateSize(wxGenericTreeCtrl *control); - - void GetSize( int &x, int &y, const wxGenericTreeCtrl* ); - - void ResetSize() { m_width = 0; } - void ResetTextSize() { m_width = 0; m_widthText = -1; } - void RecursiveResetSize(); - void RecursiveResetTextSize(); - - // return the item at given position (or NULL if no item), onButton is - // true if the point belongs to the item's button, otherwise it lies - // on the item's label - wxGenericTreeItem *HitTest( const wxPoint& point, - const wxGenericTreeCtrl *, - int &flags, - int level ); - - void Expand() { m_isCollapsed = false; } - void Collapse() { m_isCollapsed = true; } - - void SetHilight( bool set = true ) { m_hasHilight = set; } - - // status inquiries - bool HasChildren() const { return !m_children.IsEmpty(); } - bool IsSelected() const { return m_hasHilight != 0; } - bool IsExpanded() const { return !m_isCollapsed; } - bool HasPlus() const { return m_hasPlus || HasChildren(); } - bool IsBold() const { return m_isBold != 0; } - - // attributes - // get them - may be NULL - wxTreeItemAttr *GetAttributes() const { return m_attr; } - // get them ensuring that the pointer is not NULL - wxTreeItemAttr& Attr() - { - if ( !m_attr ) - { - m_attr = new wxTreeItemAttr; - m_ownsAttr = true; - } - return *m_attr; - } - // set them - void SetAttributes(wxTreeItemAttr *attr) - { - if ( m_ownsAttr ) delete m_attr; - m_attr = attr; - m_ownsAttr = false; - m_width = 0; - m_widthText = -1; - } - // set them and delete when done - void AssignAttributes(wxTreeItemAttr *attr) - { - SetAttributes(attr); - m_ownsAttr = true; - m_width = 0; - m_widthText = -1; - } - -private: - // calculate the size of this item, i.e. set m_width, m_height and - // m_widthText and m_heightText properly - // - // if dcUsesNormalFont is true, the current dc font must be the normal tree - // control font - void DoCalculateSize(wxGenericTreeCtrl *control, - wxDC& dc, - bool dcUsesNormalFont); - - // since there can be very many of these, we save size by chosing - // the smallest representation for the elements and by ordering - // the members to avoid padding. - wxString m_text; // label to be rendered for item - int m_widthText; - int m_heightText; - - wxTreeItemData *m_data; // user-provided data - - int m_state; // item state - - wxArrayGenericTreeItems m_children; // list of children - wxGenericTreeItem *m_parent; // parent of this item - - wxTreeItemAttr *m_attr; // attributes??? - - // tree ctrl images for the normal, selected, expanded and - // expanded+selected states - int m_images[wxTreeItemIcon_Max]; - - wxCoord m_x; // (virtual) offset from top - wxCoord m_y; // (virtual) offset from left - int m_width; // width of this item - int m_height; // height of this item - - // use bitfields to save size - unsigned int m_isCollapsed :1; - unsigned int m_hasHilight :1; // same as focused - unsigned int m_hasPlus :1; // used for item which doesn't have - // children but has a [+] button - unsigned int m_isBold :1; // render the label in bold font - unsigned int m_ownsAttr :1; // delete attribute when done - - wxDECLARE_NO_COPY_CLASS(wxGenericTreeItem); -}; - -// ============================================================================= -// implementation -// ============================================================================= - -// ---------------------------------------------------------------------------- -// private functions -// ---------------------------------------------------------------------------- - -// translate the key or mouse event flags to the type of selection we're -// dealing with -static void EventFlagsToSelType(long style, - bool shiftDown, - bool ctrlDown, - bool &is_multiple, - bool &extended_select, - bool &unselect_others) -{ - is_multiple = (style & wxTR_MULTIPLE) != 0; - extended_select = shiftDown && is_multiple; - unselect_others = !(extended_select || (ctrlDown && is_multiple)); -} - -// check if the given item is under another one -static bool -IsDescendantOf(const wxGenericTreeItem *parent, const wxGenericTreeItem *item) -{ - while ( item ) - { - if ( item == parent ) - { - // item is a descendant of parent - return true; - } - - item = item->GetParent(); - } - - return false; -} - -// ----------------------------------------------------------------------------- -// wxTreeRenameTimer (internal) -// ----------------------------------------------------------------------------- - -wxTreeRenameTimer::wxTreeRenameTimer( wxGenericTreeCtrl *owner ) -{ - m_owner = owner; -} - -void wxTreeRenameTimer::Notify() -{ - m_owner->OnRenameTimer(); -} - -//----------------------------------------------------------------------------- -// wxTreeTextCtrl (internal) -//----------------------------------------------------------------------------- - -wxBEGIN_EVENT_TABLE(wxTreeTextCtrl,wxTextCtrl) - EVT_CHAR (wxTreeTextCtrl::OnChar) - EVT_KEY_UP (wxTreeTextCtrl::OnKeyUp) - EVT_KILL_FOCUS (wxTreeTextCtrl::OnKillFocus) -wxEND_EVENT_TABLE() - -wxTreeTextCtrl::wxTreeTextCtrl(wxGenericTreeCtrl *owner, - wxGenericTreeItem *itm) - : m_itemEdited(itm), m_startValue(itm->GetText()) -{ - m_owner = owner; - m_aboutToFinish = false; - - wxRect rect; - m_owner->GetBoundingRect(m_itemEdited, rect, true); - - // corrects position and size for better appearance -#ifdef __WXMSW__ - rect.x -= 5; - rect.width += 10; -#elif defined(__WXGTK__) - rect.x -= 5; - rect.y -= 2; - rect.width += 8; - rect.height += 4; -#endif // platforms - - (void)Create(m_owner, wxID_ANY, m_startValue, - rect.GetPosition(), rect.GetSize()); - - SelectAll(); -} - -void wxTreeTextCtrl::EndEdit(bool discardChanges) -{ - if ( m_aboutToFinish ) - { - // We already called Finish which cannot be called - // more than once. - return; - } - - m_aboutToFinish = true; - - if ( discardChanges ) - { - m_owner->OnRenameCancelled(m_itemEdited); - - Finish( true ); - } - else - { - // Notify the owner about the changes - AcceptChanges(); - - // Even if vetoed, close the control (consistent with MSW) - Finish( true ); - } -} - -bool wxTreeTextCtrl::AcceptChanges() -{ - const wxString value = GetValue(); - - if ( value == m_startValue ) - { - // nothing changed, always accept - // when an item remains unchanged, the owner - // needs to be notified that the user decided - // not to change the tree item label, and that - // the edit has been cancelled - - m_owner->OnRenameCancelled(m_itemEdited); - return true; - } - - if ( !m_owner->OnRenameAccept(m_itemEdited, value) ) - { - // vetoed by the user - return false; - } - - // accepted, do rename the item - m_owner->SetItemText(m_itemEdited, value); - - return true; -} - -void wxTreeTextCtrl::Finish( bool setfocus ) -{ - m_owner->ResetTextControl(); - -#ifdef __WXMAC__ - // On wxMac, modal event loops avoid deleting pending objects. - // Hide control so it does not remain visible e.g. if the tree - // control is used in a dialog. - Hide(); -#endif - - wxPendingDelete.Append(this); - - if (setfocus) - m_owner->SetFocus(); -} - -void wxTreeTextCtrl::OnChar( wxKeyEvent &event ) -{ - switch ( event.m_keyCode ) - { - case WXK_RETURN: - EndEdit( false ); - break; - - case WXK_ESCAPE: - EndEdit( true ); - break; - - default: - event.Skip(); - } -} - -void wxTreeTextCtrl::OnKeyUp( wxKeyEvent &event ) -{ - if ( !m_aboutToFinish ) - { - // auto-grow the textctrl: - wxSize parentSize = m_owner->GetSize(); - wxPoint myPos = GetPosition(); - wxSize mySize = GetSize(); - int sx, sy; - GetTextExtent(GetValue() + wxT("M"), &sx, &sy); - if (myPos.x + sx > parentSize.x) - sx = parentSize.x - myPos.x; - if (mySize.x > sx) - sx = mySize.x; - SetSize(sx, wxDefaultCoord); - } - - event.Skip(); -} - -void wxTreeTextCtrl::OnKillFocus( wxFocusEvent &event ) -{ - if ( !m_aboutToFinish ) - { - m_aboutToFinish = true; - if ( !AcceptChanges() ) - m_owner->OnRenameCancelled( m_itemEdited ); - - Finish( false ); - } - - // We should let the native text control handle focus, too. - event.Skip(); -} - -// ----------------------------------------------------------------------------- -// wxGenericTreeItem -// ----------------------------------------------------------------------------- - -wxGenericTreeItem::wxGenericTreeItem(wxGenericTreeItem *parent, - const wxString& text, - int image, int selImage, - wxTreeItemData *data) - : m_text(text) -{ - m_images[wxTreeItemIcon_Normal] = image; - m_images[wxTreeItemIcon_Selected] = selImage; - m_images[wxTreeItemIcon_Expanded] = NO_IMAGE; - m_images[wxTreeItemIcon_SelectedExpanded] = NO_IMAGE; - - m_data = data; - m_state = wxTREE_ITEMSTATE_NONE; - m_x = m_y = 0; - - m_isCollapsed = true; - m_hasHilight = false; - m_hasPlus = false; - m_isBold = false; - - m_parent = parent; - - m_attr = NULL; - m_ownsAttr = false; - - // We don't know the height here yet. - m_width = 0; - m_height = 0; - - m_widthText = -1; - m_heightText = -1; -} - -wxGenericTreeItem::~wxGenericTreeItem() -{ - delete m_data; - - if (m_ownsAttr) delete m_attr; - - wxASSERT_MSG( m_children.IsEmpty(), - "must call DeleteChildren() before deleting the item" ); -} - -void wxGenericTreeItem::DeleteChildren(wxGenericTreeCtrl *tree) -{ - size_t count = m_children.GetCount(); - for ( size_t n = 0; n < count; n++ ) - { - wxGenericTreeItem *child = m_children[n]; - tree->SendDeleteEvent(child); - - child->DeleteChildren(tree); - if ( child == tree->m_select_me ) - tree->m_select_me = NULL; - delete child; - } - - m_children.Empty(); -} - -size_t wxGenericTreeItem::GetChildrenCount(bool recursively) const -{ - size_t count = m_children.GetCount(); - if ( !recursively ) - return count; - - size_t total = count; - for (size_t n = 0; n < count; ++n) - { - total += m_children[n]->GetChildrenCount(); - } - - return total; -} - -void wxGenericTreeItem::GetSize( int &x, int &y, - const wxGenericTreeCtrl *theButton ) -{ - int bottomY=m_y+theButton->GetLineHeight(this); - if ( y < bottomY ) y = bottomY; - int width = m_x + m_width; - if ( x < width ) x = width; - - if (IsExpanded()) - { - size_t count = m_children.GetCount(); - for ( size_t n = 0; n < count; ++n ) - { - m_children[n]->GetSize( x, y, theButton ); - } - } -} - -wxGenericTreeItem *wxGenericTreeItem::HitTest(const wxPoint& point, - const wxGenericTreeCtrl *theCtrl, - int &flags, - int level) -{ - // for a hidden root node, don't evaluate it, but do evaluate children - if ( !(level == 0 && theCtrl->HasFlag(wxTR_HIDE_ROOT)) ) - { - // evaluate the item - int h = theCtrl->GetLineHeight(this); - if ((point.y > m_y) && (point.y < m_y + h)) - { - int y_mid = m_y + h/2; - if (point.y < y_mid ) - flags |= wxTREE_HITTEST_ONITEMUPPERPART; - else - flags |= wxTREE_HITTEST_ONITEMLOWERPART; - - int xCross = m_x - theCtrl->GetSpacing(); -#ifdef __WXMAC__ - // according to the drawing code the triangels are drawn - // at -4 , -4 from the position up to +10/+10 max - if ((point.x > xCross-4) && (point.x < xCross+10) && - (point.y > y_mid-4) && (point.y < y_mid+10) && - HasPlus() && theCtrl->HasButtons() ) -#else - // 5 is the size of the plus sign - if ((point.x > xCross-6) && (point.x < xCross+6) && - (point.y > y_mid-6) && (point.y < y_mid+6) && - HasPlus() && theCtrl->HasButtons() ) -#endif - { - flags |= wxTREE_HITTEST_ONITEMBUTTON; - return this; - } - - if ((point.x >= m_x) && (point.x <= m_x+m_width)) - { - int image_w = -1; - int image_h; - - // assuming every image (normal and selected) has the same size! - if ( (GetImage() != NO_IMAGE) && theCtrl->m_imageListNormal ) - { - theCtrl->m_imageListNormal->GetSize(GetImage(), - image_w, image_h); - } - - int state_w = -1; - int state_h; - - if ( (GetState() != wxTREE_ITEMSTATE_NONE) && - theCtrl->m_imageListState ) - { - theCtrl->m_imageListState->GetSize(GetState(), - state_w, state_h); - } - - if ((state_w != -1) && (point.x <= m_x + state_w + 1)) - flags |= wxTREE_HITTEST_ONITEMSTATEICON; - else if ((image_w != -1) && - (point.x <= m_x + - (state_w != -1 ? state_w + - MARGIN_BETWEEN_STATE_AND_IMAGE - : 0) - + image_w + 1)) - flags |= wxTREE_HITTEST_ONITEMICON; - else - flags |= wxTREE_HITTEST_ONITEMLABEL; - - return this; - } - - if (point.x < m_x) - flags |= wxTREE_HITTEST_ONITEMINDENT; - if (point.x > m_x+m_width) - flags |= wxTREE_HITTEST_ONITEMRIGHT; - - return this; - } - - // if children are expanded, fall through to evaluate them - if (m_isCollapsed) return NULL; - } - - // evaluate children - size_t count = m_children.GetCount(); - for ( size_t n = 0; n < count; n++ ) - { - wxGenericTreeItem *res = m_children[n]->HitTest( point, - theCtrl, - flags, - level + 1 ); - if ( res != NULL ) - return res; - } - - return NULL; -} - -int wxGenericTreeItem::GetCurrentImage() const -{ - int image = NO_IMAGE; - if ( IsExpanded() ) - { - if ( IsSelected() ) - { - image = GetImage(wxTreeItemIcon_SelectedExpanded); - } - - if ( image == NO_IMAGE ) - { - // we usually fall back to the normal item, but try just the - // expanded one (and not selected) first in this case - image = GetImage(wxTreeItemIcon_Expanded); - } - } - else // not expanded - { - if ( IsSelected() ) - image = GetImage(wxTreeItemIcon_Selected); - } - - // maybe it doesn't have the specific image we want, - // try the default one instead - if ( image == NO_IMAGE ) image = GetImage(); - - return image; -} - -void wxGenericTreeItem::CalculateSize(wxGenericTreeCtrl* control) -{ - // check if we need to do anything before creating the DC - if ( m_width != 0 ) - return; - - wxClientDC dc(control); - DoCalculateSize(control, dc, false /* normal font not used */); -} - -void -wxGenericTreeItem::DoCalculateSize(wxGenericTreeCtrl* control, - wxDC& dc, - bool dcUsesNormalFont) -{ - if ( m_width != 0 ) // Size known, nothing to do - return; - - if ( m_widthText == -1 ) - { - bool fontChanged; - if ( SetFont(control, dc) ) - { - fontChanged = true; - } - else // we have no special font - { - if ( !dcUsesNormalFont ) - { - // but we do need to ensure that the normal font is used: notice - // that this doesn't count as changing the font as we don't need - // to restore it - dc.SetFont(control->m_normalFont); - } - - fontChanged = false; - } - - dc.GetTextExtent( GetText(), &m_widthText, &m_heightText ); - - // restore normal font if the DC used it previously and we changed it - if ( fontChanged ) - dc.SetFont(control->m_normalFont); - } - - int text_h = m_heightText + 2; - - int image_h = 0, image_w = 0; - int image = GetCurrentImage(); - if ( image != NO_IMAGE && control->m_imageListNormal ) - { - control->m_imageListNormal->GetSize(image, image_w, image_h); - image_w += MARGIN_BETWEEN_IMAGE_AND_TEXT; - } - - int state_h = 0, state_w = 0; - int state = GetState(); - if ( state != wxTREE_ITEMSTATE_NONE && control->m_imageListState ) - { - control->m_imageListState->GetSize(state, state_w, state_h); - if ( image_w != 0 ) - state_w += MARGIN_BETWEEN_STATE_AND_IMAGE; - else - state_w += MARGIN_BETWEEN_IMAGE_AND_TEXT; - } - - int img_h = wxMax(state_h, image_h); - m_height = wxMax(img_h, text_h); - - if (m_height < 30) - m_height += 2; // at least 2 pixels - else - m_height += m_height / 10; // otherwise 10% extra spacing - - if (m_height > control->m_lineHeight) - control->m_lineHeight = m_height; - - m_width = state_w + image_w + m_widthText + 2; -} - -void wxGenericTreeItem::RecursiveResetSize() -{ - m_width = 0; - - const size_t count = m_children.Count(); - for (size_t i = 0; i < count; i++ ) - m_children[i]->RecursiveResetSize(); -} - -void wxGenericTreeItem::RecursiveResetTextSize() -{ - m_width = 0; - m_widthText = -1; - - const size_t count = m_children.Count(); - for (size_t i = 0; i < count; i++ ) - m_children[i]->RecursiveResetTextSize(); -} - -// ----------------------------------------------------------------------------- -// wxGenericTreeCtrl implementation -// ----------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxGenericTreeCtrl, wxControl); - -wxBEGIN_EVENT_TABLE(wxGenericTreeCtrl, wxTreeCtrlBase) - EVT_PAINT (wxGenericTreeCtrl::OnPaint) - EVT_SIZE (wxGenericTreeCtrl::OnSize) - EVT_MOUSE_EVENTS (wxGenericTreeCtrl::OnMouse) - EVT_KEY_DOWN (wxGenericTreeCtrl::OnKeyDown) - EVT_CHAR (wxGenericTreeCtrl::OnChar) - EVT_SET_FOCUS (wxGenericTreeCtrl::OnSetFocus) - EVT_KILL_FOCUS (wxGenericTreeCtrl::OnKillFocus) - EVT_TREE_ITEM_GETTOOLTIP(wxID_ANY, wxGenericTreeCtrl::OnGetToolTip) -wxEND_EVENT_TABLE() - -// ----------------------------------------------------------------------------- -// construction/destruction -// ----------------------------------------------------------------------------- - -void wxGenericTreeCtrl::Init() -{ - m_current = - m_key_current = - m_anchor = - m_select_me = NULL; - m_hasFocus = false; - m_dirty = false; - - m_lineHeight = 10; - m_indent = 15; - m_spacing = 18; - - m_hilightBrush = new wxBrush - ( - wxSystemSettings::GetColour - ( - wxSYS_COLOUR_HIGHLIGHT - ), - wxBRUSHSTYLE_SOLID - ); - - m_hilightUnfocusedBrush = new wxBrush - ( - wxSystemSettings::GetColour - ( - wxSYS_COLOUR_BTNSHADOW - ), - wxBRUSHSTYLE_SOLID - ); - - m_imageListButtons = NULL; - m_ownsImageListButtons = false; - - m_dragCount = 0; - m_isDragging = false; - m_dropTarget = m_oldSelection = NULL; - m_underMouse = NULL; - m_textCtrl = NULL; - - m_renameTimer = NULL; - - m_findTimer = NULL; - m_findBell = 0; // default is to not ring bell at all - - m_dropEffectAboveItem = false; - - m_dndEffect = NoEffect; - m_dndEffectItem = NULL; - - m_lastOnSame = false; - -#if defined( __WXMAC__ ) - m_normalFont = wxFont(wxOSX_SYSTEM_FONT_VIEWS); -#else - m_normalFont = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT ); -#endif - m_boldFont = m_normalFont.Bold(); -} - -bool wxGenericTreeCtrl::Create(wxWindow *parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style, - const wxValidator& validator, - const wxString& name ) -{ -#ifdef __WXMAC__ - if (style & wxTR_HAS_BUTTONS) - style |= wxTR_NO_LINES; -#endif // __WXMAC__ - -#ifdef __WXGTK20__ - if (style & wxTR_HAS_BUTTONS) - style |= wxTR_NO_LINES; -#endif - - if ( !wxControl::Create( parent, id, pos, size, - style|wxHSCROLL|wxVSCROLL|wxWANTS_CHARS, - validator, - name ) ) - return false; - - // If the tree display has no buttons, but does have - // connecting lines, we can use a narrower layout. - // It may not be a good idea to force this... - if (!HasButtons() && !HasFlag(wxTR_NO_LINES)) - { - m_indent= 10; - m_spacing = 10; - } - - wxVisualAttributes attr = GetDefaultAttributes(); - SetOwnForegroundColour( attr.colFg ); - SetOwnBackgroundColour( attr.colBg ); - if (!m_hasFont) - SetOwnFont(attr.font); - - // this is a misnomer: it's called "dotted pen" but uses (default) wxSOLID - // style because we apparently get performance problems when using dotted - // pen for drawing in some ports -- but under MSW it seems to work fine -#ifdef __WXMSW__ - m_dottedPen = wxPen(*wxLIGHT_GREY, 0, wxPENSTYLE_DOT); -#else - m_dottedPen = *wxGREY_PEN; -#endif - - SetInitialSize(size); - - return true; -} - -wxGenericTreeCtrl::~wxGenericTreeCtrl() -{ - delete m_hilightBrush; - delete m_hilightUnfocusedBrush; - - DeleteAllItems(); - - delete m_renameTimer; - delete m_findTimer; - - if (m_ownsImageListButtons) - delete m_imageListButtons; -} - -void wxGenericTreeCtrl::EnableBellOnNoMatch( bool on ) -{ - m_findBell = on; -} - -// ----------------------------------------------------------------------------- -// accessors -// ----------------------------------------------------------------------------- - -unsigned int wxGenericTreeCtrl::GetCount() const -{ - if ( !m_anchor ) - { - // the tree is empty - return 0; - } - - unsigned int count = m_anchor->GetChildrenCount(); - if ( !HasFlag(wxTR_HIDE_ROOT) ) - { - // take the root itself into account - count++; - } - - return count; -} - -void wxGenericTreeCtrl::SetIndent(unsigned int indent) -{ - m_indent = (unsigned short) indent; - m_dirty = true; -} - -size_t -wxGenericTreeCtrl::GetChildrenCount(const wxTreeItemId& item, - bool recursively) const -{ - wxCHECK_MSG( item.IsOk(), 0u, wxT("invalid tree item") ); - - return ((wxGenericTreeItem*) item.m_pItem)->GetChildrenCount(recursively); -} - -void wxGenericTreeCtrl::SetWindowStyleFlag(long styles) -{ - // Do not try to expand the root node if it hasn't been created yet - if (m_anchor && !HasFlag(wxTR_HIDE_ROOT) && (styles & wxTR_HIDE_ROOT)) - { - // if we will hide the root, make sure children are visible - m_anchor->SetHasPlus(); - m_anchor->Expand(); - CalculatePositions(); - } - - // right now, just sets the styles. Eventually, we may - // want to update the inherited styles, but right now - // none of the parents has updatable styles - m_windowStyle = styles; - m_dirty = true; -} - -// ----------------------------------------------------------------------------- -// functions to work with tree items -// ----------------------------------------------------------------------------- - -wxString wxGenericTreeCtrl::GetItemText(const wxTreeItemId& item) const -{ - wxCHECK_MSG( item.IsOk(), wxEmptyString, wxT("invalid tree item") ); - - return ((wxGenericTreeItem*) item.m_pItem)->GetText(); -} - -int wxGenericTreeCtrl::GetItemImage(const wxTreeItemId& item, - wxTreeItemIcon which) const -{ - wxCHECK_MSG( item.IsOk(), -1, wxT("invalid tree item") ); - - return ((wxGenericTreeItem*) item.m_pItem)->GetImage(which); -} - -wxTreeItemData *wxGenericTreeCtrl::GetItemData(const wxTreeItemId& item) const -{ - wxCHECK_MSG( item.IsOk(), NULL, wxT("invalid tree item") ); - - return ((wxGenericTreeItem*) item.m_pItem)->GetData(); -} - -int wxGenericTreeCtrl::DoGetItemState(const wxTreeItemId& item) const -{ - wxCHECK_MSG( item.IsOk(), wxTREE_ITEMSTATE_NONE, wxT("invalid tree item") ); - - wxGenericTreeItem *pItem = (wxGenericTreeItem*) item.m_pItem; - return pItem->GetState(); -} - -wxColour wxGenericTreeCtrl::GetItemTextColour(const wxTreeItemId& item) const -{ - wxCHECK_MSG( item.IsOk(), wxNullColour, wxT("invalid tree item") ); - - wxGenericTreeItem *pItem = (wxGenericTreeItem*) item.m_pItem; - return pItem->Attr().GetTextColour(); -} - -wxColour -wxGenericTreeCtrl::GetItemBackgroundColour(const wxTreeItemId& item) const -{ - wxCHECK_MSG( item.IsOk(), wxNullColour, wxT("invalid tree item") ); - - wxGenericTreeItem *pItem = (wxGenericTreeItem*) item.m_pItem; - return pItem->Attr().GetBackgroundColour(); -} - -wxFont wxGenericTreeCtrl::GetItemFont(const wxTreeItemId& item) const -{ - wxCHECK_MSG( item.IsOk(), wxNullFont, wxT("invalid tree item") ); - - wxGenericTreeItem *pItem = (wxGenericTreeItem*) item.m_pItem; - return pItem->Attr().GetFont(); -} - -void -wxGenericTreeCtrl::SetItemText(const wxTreeItemId& item, const wxString& text) -{ - wxCHECK_RET( item.IsOk(), wxT("invalid tree item") ); - - wxGenericTreeItem *pItem = (wxGenericTreeItem*) item.m_pItem; - pItem->SetText(text); - pItem->CalculateSize(this); - RefreshLine(pItem); -} - -void wxGenericTreeCtrl::SetItemImage(const wxTreeItemId& item, - int image, - wxTreeItemIcon which) -{ - wxCHECK_RET( item.IsOk(), wxT("invalid tree item") ); - - wxGenericTreeItem *pItem = (wxGenericTreeItem*) item.m_pItem; - pItem->SetImage(image, which); - pItem->CalculateSize(this); - RefreshLine(pItem); -} - -void -wxGenericTreeCtrl::SetItemData(const wxTreeItemId& item, wxTreeItemData *data) -{ - wxCHECK_RET( item.IsOk(), wxT("invalid tree item") ); - - if (data) - data->SetId( item ); - - ((wxGenericTreeItem*) item.m_pItem)->SetData(data); -} - -void wxGenericTreeCtrl::DoSetItemState(const wxTreeItemId& item, int state) -{ - wxCHECK_RET( item.IsOk(), wxT("invalid tree item") ); - - wxGenericTreeItem *pItem = (wxGenericTreeItem*) item.m_pItem; - pItem->SetState(state); - pItem->CalculateSize(this); - RefreshLine(pItem); -} - -void wxGenericTreeCtrl::SetItemHasChildren(const wxTreeItemId& item, bool has) -{ - wxCHECK_RET( item.IsOk(), wxT("invalid tree item") ); - - wxGenericTreeItem *pItem = (wxGenericTreeItem*) item.m_pItem; - pItem->SetHasPlus(has); - RefreshLine(pItem); -} - -void wxGenericTreeCtrl::SetItemBold(const wxTreeItemId& item, bool bold) -{ - wxCHECK_RET( item.IsOk(), wxT("invalid tree item") ); - - // avoid redrawing the tree if no real change - wxGenericTreeItem *pItem = (wxGenericTreeItem*) item.m_pItem; - if ( pItem->IsBold() != bold ) - { - pItem->SetBold(bold); - - // recalculate the item size as bold and non bold fonts have different - // widths - pItem->CalculateSize(this); - RefreshLine(pItem); - } -} - -void wxGenericTreeCtrl::SetItemDropHighlight(const wxTreeItemId& item, - bool highlight) -{ - wxCHECK_RET( item.IsOk(), wxT("invalid tree item") ); - - wxColour fg, bg; - - if (highlight) - { - bg = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT); - fg = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT); - } - - wxGenericTreeItem *pItem = (wxGenericTreeItem*) item.m_pItem; - pItem->Attr().SetTextColour(fg); - pItem->Attr().SetBackgroundColour(bg); - RefreshLine(pItem); -} - -void wxGenericTreeCtrl::SetItemTextColour(const wxTreeItemId& item, - const wxColour& col) -{ - wxCHECK_RET( item.IsOk(), wxT("invalid tree item") ); - - wxGenericTreeItem *pItem = (wxGenericTreeItem*) item.m_pItem; - pItem->Attr().SetTextColour(col); - RefreshLine(pItem); -} - -void wxGenericTreeCtrl::SetItemBackgroundColour(const wxTreeItemId& item, - const wxColour& col) -{ - wxCHECK_RET( item.IsOk(), wxT("invalid tree item") ); - - wxGenericTreeItem *pItem = (wxGenericTreeItem*) item.m_pItem; - pItem->Attr().SetBackgroundColour(col); - RefreshLine(pItem); -} - -void -wxGenericTreeCtrl::SetItemFont(const wxTreeItemId& item, const wxFont& font) -{ - wxCHECK_RET( item.IsOk(), wxT("invalid tree item") ); - - wxGenericTreeItem *pItem = (wxGenericTreeItem*) item.m_pItem; - pItem->Attr().SetFont(font); - pItem->ResetTextSize(); - pItem->CalculateSize(this); - RefreshLine(pItem); -} - -bool wxGenericTreeCtrl::SetFont( const wxFont &font ) -{ - wxTreeCtrlBase::SetFont(font); - - m_normalFont = font; - m_boldFont = m_normalFont.Bold(); - - if (m_anchor) - m_anchor->RecursiveResetTextSize(); - - return true; -} - - -// ----------------------------------------------------------------------------- -// item status inquiries -// ----------------------------------------------------------------------------- - -bool wxGenericTreeCtrl::IsVisible(const wxTreeItemId& item) const -{ - wxCHECK_MSG( item.IsOk(), false, wxT("invalid tree item") ); - - // Hidden root item is never visible. - if ( item == GetRootItem() && HasFlag(wxTR_HIDE_ROOT) ) - return false; - - // An item is only visible if it's not a descendant of a collapsed item - wxGenericTreeItem *pItem = (wxGenericTreeItem*) item.m_pItem; - wxGenericTreeItem* parent = pItem->GetParent(); - while (parent) - { - if (!parent->IsExpanded()) - return false; - parent = parent->GetParent(); - } - - int startX, startY; - GetViewStart(& startX, & startY); - - wxSize clientSize = GetClientSize(); - - wxRect rect; - if (!GetBoundingRect(item, rect)) - return false; - if (rect.GetWidth() == 0 || rect.GetHeight() == 0) - return false; - if (rect.GetBottom() < 0 || rect.GetTop() > clientSize.y) - return false; - if (rect.GetRight() < 0 || rect.GetLeft() > clientSize.x) - return false; - - return true; -} - -bool wxGenericTreeCtrl::ItemHasChildren(const wxTreeItemId& item) const -{ - wxCHECK_MSG( item.IsOk(), false, wxT("invalid tree item") ); - - // consider that the item does have children if it has the "+" button: it - // might not have them (if it had never been expanded yet) but then it - // could have them as well and it's better to err on this side rather than - // disabling some operations which are restricted to the items with - // children for an item which does have them - return ((wxGenericTreeItem*) item.m_pItem)->HasPlus(); -} - -bool wxGenericTreeCtrl::IsExpanded(const wxTreeItemId& item) const -{ - wxCHECK_MSG( item.IsOk(), false, wxT("invalid tree item") ); - - return ((wxGenericTreeItem*) item.m_pItem)->IsExpanded(); -} - -bool wxGenericTreeCtrl::IsSelected(const wxTreeItemId& item) const -{ - wxCHECK_MSG( item.IsOk(), false, wxT("invalid tree item") ); - - return ((wxGenericTreeItem*) item.m_pItem)->IsSelected(); -} - -bool wxGenericTreeCtrl::IsBold(const wxTreeItemId& item) const -{ - wxCHECK_MSG( item.IsOk(), false, wxT("invalid tree item") ); - - return ((wxGenericTreeItem*) item.m_pItem)->IsBold(); -} - -// ----------------------------------------------------------------------------- -// navigation -// ----------------------------------------------------------------------------- - -wxTreeItemId wxGenericTreeCtrl::GetItemParent(const wxTreeItemId& item) const -{ - wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") ); - - return ((wxGenericTreeItem*) item.m_pItem)->GetParent(); -} - -wxTreeItemId wxGenericTreeCtrl::GetFirstChild(const wxTreeItemId& item, - wxTreeItemIdValue& cookie) const -{ - wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") ); - - cookie = 0; - return GetNextChild(item, cookie); -} - -wxTreeItemId wxGenericTreeCtrl::GetNextChild(const wxTreeItemId& item, - wxTreeItemIdValue& cookie) const -{ - wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") ); - - wxArrayGenericTreeItems& - children = ((wxGenericTreeItem*) item.m_pItem)->GetChildren(); - - // it's ok to cast cookie to size_t, we never have indices big enough to - // overflow "void *" - size_t *pIndex = (size_t *)&cookie; - if ( *pIndex < children.GetCount() ) - { - return children.Item((*pIndex)++); - } - else - { - // there are no more of them - return wxTreeItemId(); - } -} - -wxTreeItemId wxGenericTreeCtrl::GetLastChild(const wxTreeItemId& item) const -{ - wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") ); - - wxArrayGenericTreeItems& - children = ((wxGenericTreeItem*) item.m_pItem)->GetChildren(); - return children.IsEmpty() ? wxTreeItemId() : wxTreeItemId(children.Last()); -} - -wxTreeItemId wxGenericTreeCtrl::GetNextSibling(const wxTreeItemId& item) const -{ - wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") ); - - wxGenericTreeItem *i = (wxGenericTreeItem*) item.m_pItem; - wxGenericTreeItem *parent = i->GetParent(); - if ( parent == NULL ) - { - // root item doesn't have any siblings - return wxTreeItemId(); - } - - wxArrayGenericTreeItems& siblings = parent->GetChildren(); - int index = siblings.Index(i); - wxASSERT( index != wxNOT_FOUND ); // I'm not a child of my parent? - - size_t n = (size_t)(index + 1); - return n == siblings.GetCount() ? wxTreeItemId() - : wxTreeItemId(siblings[n]); -} - -wxTreeItemId wxGenericTreeCtrl::GetPrevSibling(const wxTreeItemId& item) const -{ - wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") ); - - wxGenericTreeItem *i = (wxGenericTreeItem*) item.m_pItem; - wxGenericTreeItem *parent = i->GetParent(); - if ( parent == NULL ) - { - // root item doesn't have any siblings - return wxTreeItemId(); - } - - wxArrayGenericTreeItems& siblings = parent->GetChildren(); - int index = siblings.Index(i); - wxASSERT( index != wxNOT_FOUND ); // I'm not a child of my parent? - - return index == 0 ? wxTreeItemId() - : wxTreeItemId(siblings[(size_t)(index - 1)]); -} - -// Only for internal use right now, but should probably be public -wxTreeItemId wxGenericTreeCtrl::GetNext(const wxTreeItemId& item) const -{ - wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") ); - - wxGenericTreeItem *i = (wxGenericTreeItem*) item.m_pItem; - - // First see if there are any children. - wxArrayGenericTreeItems& children = i->GetChildren(); - if (children.GetCount() > 0) - { - return children.Item(0); - } - else - { - // Try a sibling of this or ancestor instead - wxTreeItemId p = item; - wxTreeItemId toFind; - do - { - toFind = GetNextSibling(p); - p = GetItemParent(p); - } while (p.IsOk() && !toFind.IsOk()); - return toFind; - } -} - -wxTreeItemId wxGenericTreeCtrl::GetFirstVisibleItem() const -{ - wxTreeItemId itemid = GetRootItem(); - if (!itemid.IsOk()) - return itemid; - - do - { - if (IsVisible(itemid)) - return itemid; - itemid = GetNext(itemid); - } while (itemid.IsOk()); - - return wxTreeItemId(); -} - -wxTreeItemId wxGenericTreeCtrl::GetNextVisible(const wxTreeItemId& item) const -{ - wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") ); - wxASSERT_MSG( IsVisible(item), wxT("this item itself should be visible") ); - - wxTreeItemId id = item; - if (id.IsOk()) - { - while (id = GetNext(id), id.IsOk()) - { - if (IsVisible(id)) - return id; - } - } - return wxTreeItemId(); -} - -wxTreeItemId wxGenericTreeCtrl::GetPrevVisible(const wxTreeItemId& item) const -{ - wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") ); - wxASSERT_MSG( IsVisible(item), wxT("this item itself should be visible") ); - - // find out the starting point - wxTreeItemId prevItem = GetPrevSibling(item); - if ( !prevItem.IsOk() ) - { - prevItem = GetItemParent(item); - } - - // find the first visible item after it - while ( prevItem.IsOk() && !IsVisible(prevItem) ) - { - prevItem = GetNext(prevItem); - if ( !prevItem.IsOk() || prevItem == item ) - { - // there are no visible items before item - return wxTreeItemId(); - } - } - - // from there we must be able to navigate until this item - while ( prevItem.IsOk() ) - { - const wxTreeItemId nextItem = GetNextVisible(prevItem); - if ( !nextItem.IsOk() || nextItem == item ) - break; - - prevItem = nextItem; - } - - return prevItem; -} - -// called by wxTextTreeCtrl when it marks itself for deletion -void wxGenericTreeCtrl::ResetTextControl() -{ - m_textCtrl = NULL; -} - -void wxGenericTreeCtrl::ResetFindState() -{ - m_findPrefix.clear(); - if ( m_findBell ) - m_findBell = 1; -} - -// find the first item starting with the given prefix after the given item -wxTreeItemId wxGenericTreeCtrl::FindItem(const wxTreeItemId& idParent, - const wxString& prefixOrig) const -{ - // match is case insensitive as this is more convenient to the user: having - // to press Shift-letter to go to the item starting with a capital letter - // would be too bothersome - wxString prefix = prefixOrig.Lower(); - - // determine the starting point: we shouldn't take the current item (this - // allows to switch between two items starting with the same letter just by - // pressing it) but we shouldn't jump to the next one if the user is - // continuing to type as otherwise he might easily skip the item he wanted - wxTreeItemId itemid = idParent; - if ( prefix.length() == 1 ) - { - itemid = GetNext(itemid); - } - - // look for the item starting with the given prefix after it - while ( itemid.IsOk() && !GetItemText(itemid).Lower().StartsWith(prefix) ) - { - itemid = GetNext(itemid); - } - - // if we haven't found anything... - if ( !itemid.IsOk() ) - { - // ... wrap to the beginning - itemid = GetRootItem(); - if ( HasFlag(wxTR_HIDE_ROOT) ) - { - // can't select virtual root - itemid = GetNext(itemid); - } - - // and try all the items (stop when we get to the one we started from) - while ( itemid.IsOk() && itemid != idParent && - !GetItemText(itemid).Lower().StartsWith(prefix) ) - { - itemid = GetNext(itemid); - } - // If we haven't found the item but wrapped back to the one we started - // from, id.IsOk() must be false - if ( itemid == idParent ) - { - itemid = wxTreeItemId(); - } - } - - return itemid; -} - -// ----------------------------------------------------------------------------- -// operations -// ----------------------------------------------------------------------------- - -wxTreeItemId wxGenericTreeCtrl::DoInsertItem(const wxTreeItemId& parentId, - size_t previous, - const wxString& text, - int image, - int selImage, - wxTreeItemData *data) -{ - wxGenericTreeItem *parent = (wxGenericTreeItem*) parentId.m_pItem; - if ( !parent ) - { - // should we give a warning here? - return AddRoot(text, image, selImage, data); - } - - m_dirty = true; // do this first so stuff below doesn't cause flicker - - wxGenericTreeItem *item = - new wxGenericTreeItem( parent, text, image, selImage, data ); - - if ( data != NULL ) - { - data->m_pItem = item; - } - - parent->Insert( item, previous == (size_t)-1 ? parent->GetChildren().size() - : previous ); - - InvalidateBestSize(); - return item; -} - -wxTreeItemId wxGenericTreeCtrl::AddRoot(const wxString& text, - int image, - int selImage, - wxTreeItemData *data) -{ - wxCHECK_MSG( !m_anchor, wxTreeItemId(), "tree can have only one root" ); - - m_dirty = true; // do this first so stuff below doesn't cause flicker - - m_anchor = new wxGenericTreeItem(NULL, text, - image, selImage, data); - if ( data != NULL ) - { - data->m_pItem = m_anchor; - } - - if (HasFlag(wxTR_HIDE_ROOT)) - { - // if root is hidden, make sure we can navigate - // into children - m_anchor->SetHasPlus(); - m_anchor->Expand(); - CalculatePositions(); - } - - if (!HasFlag(wxTR_MULTIPLE)) - { - m_current = m_key_current = m_anchor; - m_current->SetHilight( true ); - } - - InvalidateBestSize(); - return m_anchor; -} - -wxTreeItemId wxGenericTreeCtrl::DoInsertAfter(const wxTreeItemId& parentId, - const wxTreeItemId& idPrevious, - const wxString& text, - int image, int selImage, - wxTreeItemData *data) -{ - wxGenericTreeItem *parent = (wxGenericTreeItem*) parentId.m_pItem; - if ( !parent ) - { - // should we give a warning here? - return AddRoot(text, image, selImage, data); - } - - int index = -1; - if (idPrevious.IsOk()) - { - index = parent->GetChildren().Index( - (wxGenericTreeItem*) idPrevious.m_pItem); - wxASSERT_MSG( index != wxNOT_FOUND, - "previous item in wxGenericTreeCtrl::InsertItem() " - "is not a sibling" ); - } - - return DoInsertItem(parentId, (size_t)++index, text, image, selImage, data); -} - - -void wxGenericTreeCtrl::SendDeleteEvent(wxGenericTreeItem *item) -{ - wxTreeEvent event(wxEVT_TREE_DELETE_ITEM, this, item); - GetEventHandler()->ProcessEvent( event ); -} - -// Don't leave edit or selection on a child which is about to disappear -void wxGenericTreeCtrl::ChildrenClosing(wxGenericTreeItem* item) -{ - if ( m_textCtrl && item != m_textCtrl->item() && - IsDescendantOf(item, m_textCtrl->item()) ) - { - m_textCtrl->EndEdit( true ); - } - - if ( item != m_key_current && IsDescendantOf(item, m_key_current) ) - { - m_key_current = NULL; - } - - if ( IsDescendantOf(item, m_select_me) ) - { - m_select_me = item; - } - - if ( item != m_current && IsDescendantOf(item, m_current) ) - { - m_current->SetHilight( false ); - m_current = NULL; - m_select_me = item; - } -} - -void wxGenericTreeCtrl::DeleteChildren(const wxTreeItemId& itemId) -{ - m_dirty = true; // do this first so stuff below doesn't cause flicker - - wxGenericTreeItem *item = (wxGenericTreeItem*) itemId.m_pItem; - ChildrenClosing(item); - item->DeleteChildren(this); - InvalidateBestSize(); -} - -void wxGenericTreeCtrl::Delete(const wxTreeItemId& itemId) -{ - m_dirty = true; // do this first so stuff below doesn't cause flicker - - wxGenericTreeItem *item = (wxGenericTreeItem*) itemId.m_pItem; - - if (m_textCtrl != NULL && IsDescendantOf(item, m_textCtrl->item())) - { - // can't delete the item being edited, cancel editing it first - m_textCtrl->EndEdit( true ); - } - - wxGenericTreeItem *parent = item->GetParent(); - - // if the selected item will be deleted, select the parent ... - wxGenericTreeItem *to_be_selected = parent; - if (parent) - { - // .. unless there is a next sibling like wxMSW does it - int pos = parent->GetChildren().Index( item ); - if ((int)(parent->GetChildren().GetCount()) > pos+1) - to_be_selected = parent->GetChildren().Item( pos+1 ); - } - - // don't keep stale pointers around! - if ( IsDescendantOf(item, m_key_current) ) - { - // Don't silently change the selection: - // do it properly in idle time, so event - // handlers get called. - - // m_key_current = parent; - m_key_current = NULL; - } - - // m_select_me records whether we need to select - // a different item, in idle time. - if ( m_select_me && IsDescendantOf(item, m_select_me) ) - { - m_select_me = to_be_selected; - } - - if ( IsDescendantOf(item, m_current) ) - { - // Don't silently change the selection: - // do it properly in idle time, so event - // handlers get called. - - // m_current = parent; - m_current = NULL; - m_select_me = to_be_selected; - } - - // remove the item from the tree - if ( parent ) - { - parent->GetChildren().Remove( item ); // remove by value - } - else // deleting the root - { - // nothing will be left in the tree - m_anchor = NULL; - } - - // and delete all of its children and the item itself now - item->DeleteChildren(this); - SendDeleteEvent(item); - - if (item == m_select_me) - m_select_me = NULL; - - delete item; - - InvalidateBestSize(); -} - -void wxGenericTreeCtrl::DeleteAllItems() -{ - if ( m_anchor ) - { - Delete(m_anchor); - } -} - -void wxGenericTreeCtrl::Expand(const wxTreeItemId& itemId) -{ - wxGenericTreeItem *item = (wxGenericTreeItem*) itemId.m_pItem; - - wxCHECK_RET( item, wxT("invalid item in wxGenericTreeCtrl::Expand") ); - wxCHECK_RET( !HasFlag(wxTR_HIDE_ROOT) || itemId != GetRootItem(), - wxT("can't expand hidden root") ); - - if ( !item->HasPlus() ) - return; - - if ( item->IsExpanded() ) - return; - - wxTreeEvent event(wxEVT_TREE_ITEM_EXPANDING, this, item); - - if ( GetEventHandler()->ProcessEvent( event ) && !event.IsAllowed() ) - { - // cancelled by program - return; - } - - item->Expand(); - if ( !IsFrozen() ) - { - CalculatePositions(); - - RefreshSubtree(item); - } - else // frozen - { - m_dirty = true; - } - - event.SetEventType(wxEVT_TREE_ITEM_EXPANDED); - GetEventHandler()->ProcessEvent( event ); -} - -void wxGenericTreeCtrl::Collapse(const wxTreeItemId& itemId) -{ - wxCHECK_RET( !HasFlag(wxTR_HIDE_ROOT) || itemId != GetRootItem(), - wxT("can't collapse hidden root") ); - - wxGenericTreeItem *item = (wxGenericTreeItem*) itemId.m_pItem; - - if ( !item->IsExpanded() ) - return; - - wxTreeEvent event(wxEVT_TREE_ITEM_COLLAPSING, this, item); - if ( GetEventHandler()->ProcessEvent( event ) && !event.IsAllowed() ) - { - // cancelled by program - return; - } - - ChildrenClosing(item); - item->Collapse(); - -#if 0 // TODO why should items be collapsed recursively? - wxArrayGenericTreeItems& children = item->GetChildren(); - size_t count = children.GetCount(); - for ( size_t n = 0; n < count; n++ ) - { - Collapse(children[n]); - } -#endif - - CalculatePositions(); - - RefreshSubtree(item); - - event.SetEventType(wxEVT_TREE_ITEM_COLLAPSED); - GetEventHandler()->ProcessEvent( event ); -} - -void wxGenericTreeCtrl::CollapseAndReset(const wxTreeItemId& item) -{ - Collapse(item); - DeleteChildren(item); -} - -void wxGenericTreeCtrl::Toggle(const wxTreeItemId& itemId) -{ - wxGenericTreeItem *item = (wxGenericTreeItem*) itemId.m_pItem; - - if (item->IsExpanded()) - Collapse(itemId); - else - Expand(itemId); -} - -void wxGenericTreeCtrl::Unselect() -{ - if (m_current) - { - m_current->SetHilight( false ); - RefreshLine( m_current ); - - m_current = NULL; - m_select_me = NULL; - } -} - -void wxGenericTreeCtrl::ClearFocusedItem() -{ - wxTreeItemId item = GetFocusedItem(); - if ( item.IsOk() ) - SelectItem(item, false); - - m_current = NULL; -} - -void wxGenericTreeCtrl::SetFocusedItem(const wxTreeItemId& item) -{ - wxCHECK_RET( item.IsOk(), wxT("invalid tree item") ); - - SelectItem(item, true); -} - -void wxGenericTreeCtrl::UnselectAllChildren(wxGenericTreeItem *item) -{ - if (item->IsSelected()) - { - item->SetHilight(false); - RefreshLine(item); - } - - if (item->HasChildren()) - { - wxArrayGenericTreeItems& children = item->GetChildren(); - size_t count = children.GetCount(); - for ( size_t n = 0; n < count; ++n ) - { - UnselectAllChildren(children[n]); - } - } -} - -void wxGenericTreeCtrl::UnselectAll() -{ - wxTreeItemId rootItem = GetRootItem(); - - // the tree might not have the root item at all - if ( rootItem ) - { - UnselectAllChildren((wxGenericTreeItem*) rootItem.m_pItem); - } -} - -void wxGenericTreeCtrl::SelectChildren(const wxTreeItemId& parent) -{ - wxCHECK_RET( HasFlag(wxTR_MULTIPLE), - "this only works with multiple selection controls" ); - - UnselectAll(); - - if ( !HasChildren(parent) ) - return; - - - wxArrayGenericTreeItems& - children = ((wxGenericTreeItem*) parent.m_pItem)->GetChildren(); - size_t count = children.GetCount(); - - wxGenericTreeItem * - item = (wxGenericTreeItem*) ((wxTreeItemId)children[0]).m_pItem; - wxTreeEvent event(wxEVT_TREE_SEL_CHANGING, this, item); - event.m_itemOld = m_current; - - if ( GetEventHandler()->ProcessEvent( event ) && !event.IsAllowed() ) - return; - - for ( size_t n = 0; n < count; ++n ) - { - m_current = m_key_current = children[n]; - m_current->SetHilight(true); - RefreshSelected(); - } - - - event.SetEventType(wxEVT_TREE_SEL_CHANGED); - GetEventHandler()->ProcessEvent( event ); -} - - -// Recursive function ! -// To stop we must have crt_itemGetParent(); - - if (parent == NULL) // This is root item - return TagAllChildrenUntilLast(crt_item, last_item, select); - - wxArrayGenericTreeItems& children = parent->GetChildren(); - int index = children.Index(crt_item); - wxASSERT( index != wxNOT_FOUND ); // I'm not a child of my parent? - - size_t count = children.GetCount(); - for (size_t n=(size_t)(index+1); nSetHilight(select); - RefreshLine(crt_item); - - if (crt_item==last_item) - return true; - - // We should leave the not shown children of collapsed items alone. - if (crt_item->HasChildren() && crt_item->IsExpanded()) - { - wxArrayGenericTreeItems& children = crt_item->GetChildren(); - size_t count = children.GetCount(); - for ( size_t n = 0; n < count; ++n ) - { - if (TagAllChildrenUntilLast(children[n], last_item, select)) - return true; - } - } - - return false; -} - -void -wxGenericTreeCtrl::SelectItemRange(wxGenericTreeItem *item1, - wxGenericTreeItem *item2) -{ - m_select_me = NULL; - - // item2 is not necessary after item1 - // choice first' and 'last' between item1 and item2 - wxGenericTreeItem *first= (item1->GetY()GetY()) ? item1 : item2; - wxGenericTreeItem *last = (item1->GetY()GetY()) ? item2 : item1; - - bool select = m_current->IsSelected(); - - if ( TagAllChildrenUntilLast(first,last,select) ) - return; - - TagNextChildren(first,last,select); -} - -void wxGenericTreeCtrl::DoSelectItem(const wxTreeItemId& itemId, - bool unselect_others, - bool extended_select) -{ - wxCHECK_RET( itemId.IsOk(), wxT("invalid tree item") ); - - m_select_me = NULL; - - bool is_single=!(GetWindowStyleFlag() & wxTR_MULTIPLE); - wxGenericTreeItem *item = (wxGenericTreeItem*) itemId.m_pItem; - - //wxCHECK_RET( ( (!unselect_others) && is_single), - // wxT("this is a single selection tree") ); - - // to keep going anyhow !!! - if (is_single) - { - if (item->IsSelected()) - return; // nothing to do - unselect_others = true; - extended_select = false; - } - else if ( unselect_others && item->IsSelected() ) - { - // selection change if there is more than one item currently selected - wxArrayTreeItemIds selected_items; - if ( GetSelections(selected_items) == 1 ) - return; - } - - wxTreeEvent event(wxEVT_TREE_SEL_CHANGING, this, item); - event.m_itemOld = m_current; - // TODO : Here we don't send any selection mode yet ! - - if ( GetEventHandler()->ProcessEvent( event ) && !event.IsAllowed() ) - return; - - wxTreeItemId parent = GetItemParent( itemId ); - while (parent.IsOk()) - { - if (!IsExpanded(parent)) - Expand( parent ); - - parent = GetItemParent( parent ); - } - - // ctrl press - if (unselect_others) - { - if (is_single) Unselect(); // to speed up thing - else UnselectAll(); - } - - // shift press - if (extended_select) - { - if ( !m_current ) - { - m_current = - m_key_current = (wxGenericTreeItem*) GetRootItem().m_pItem; - } - - // don't change the mark (m_current) - SelectItemRange(m_current, item); - } - else - { - bool select = true; // the default - - // Check if we need to toggle hilight (ctrl mode) - if (!unselect_others) - select=!item->IsSelected(); - - m_current = m_key_current = item; - m_current->SetHilight(select); - RefreshLine( m_current ); - } - - // This can cause idle processing to select the root - // if no item is selected, so it must be after the - // selection is set - EnsureVisible( itemId ); - - event.SetEventType(wxEVT_TREE_SEL_CHANGED); - GetEventHandler()->ProcessEvent( event ); -} - -void wxGenericTreeCtrl::SelectItem(const wxTreeItemId& itemId, bool select) -{ - wxGenericTreeItem * const item = (wxGenericTreeItem*) itemId.m_pItem; - wxCHECK_RET( item, wxT("SelectItem(): invalid tree item") ); - - if ( select ) - { - if ( !item->IsSelected() ) - DoSelectItem(itemId, !HasFlag(wxTR_MULTIPLE)); - } - else // deselect - { - wxTreeEvent event(wxEVT_TREE_SEL_CHANGING, this, item); - if ( GetEventHandler()->ProcessEvent( event ) && !event.IsAllowed() ) - return; - - item->SetHilight(false); - RefreshLine(item); - - event.SetEventType(wxEVT_TREE_SEL_CHANGED); - GetEventHandler()->ProcessEvent( event ); - } -} - -void wxGenericTreeCtrl::FillArray(wxGenericTreeItem *item, - wxArrayTreeItemIds &array) const -{ - if ( item->IsSelected() ) - array.Add(wxTreeItemId(item)); - - if ( item->HasChildren() ) - { - wxArrayGenericTreeItems& children = item->GetChildren(); - size_t count = children.GetCount(); - for ( size_t n = 0; n < count; ++n ) - FillArray(children[n], array); - } -} - -size_t wxGenericTreeCtrl::GetSelections(wxArrayTreeItemIds &array) const -{ - array.Empty(); - wxTreeItemId idRoot = GetRootItem(); - if ( idRoot.IsOk() ) - { - FillArray((wxGenericTreeItem*) idRoot.m_pItem, array); - } - //else: the tree is empty, so no selections - - return array.GetCount(); -} - -void wxGenericTreeCtrl::EnsureVisible(const wxTreeItemId& item) -{ - wxCHECK_RET( item.IsOk(), wxT("invalid tree item") ); - - if (!item.IsOk()) return; - - wxGenericTreeItem *gitem = (wxGenericTreeItem*) item.m_pItem; - - // first expand all parent branches - wxGenericTreeItem *parent = gitem->GetParent(); - - if ( HasFlag(wxTR_HIDE_ROOT) ) - { - while ( parent && parent != m_anchor ) - { - Expand(parent); - parent = parent->GetParent(); - } - } - else - { - while ( parent ) - { - Expand(parent); - parent = parent->GetParent(); - } - } - - //if (parent) CalculatePositions(); - - ScrollTo(item); -} - -void wxGenericTreeCtrl::ScrollTo(const wxTreeItemId &item) -{ - if (!item.IsOk()) - return; - - // update the control before scrolling it - if (m_dirty) - { -#if defined( __WXMSW__ ) - Update(); -#elif defined(__WXMAC__) - Update(); - DoDirtyProcessing(); -#else - DoDirtyProcessing(); -#endif - } - - wxGenericTreeItem *gitem = (wxGenericTreeItem*) item.m_pItem; - - int itemY = gitem->GetY(); - - int start_x = 0; - int start_y = 0; - GetViewStart( &start_x, &start_y ); - - const int clientHeight = GetClientSize().y; - - const int itemHeight = GetLineHeight(gitem) + 2; - - if ( itemY + itemHeight > start_y*PIXELS_PER_UNIT + clientHeight ) - { - // need to scroll down by enough to show this item fully - itemY += itemHeight - clientHeight; - - // because itemY below will be divided by PIXELS_PER_UNIT it may - // be rounded down, with the result of the item still only being - // partially visible, so make sure we are rounding up - itemY += PIXELS_PER_UNIT - 1; - } - else if ( itemY > start_y*PIXELS_PER_UNIT ) - { - // item is already fully visible, don't do anything - return; - } - //else: scroll up to make this item the top one displayed - - Scroll(-1, itemY/PIXELS_PER_UNIT); -} - -// FIXME: tree sorting functions are not reentrant and not MT-safe! -static wxGenericTreeCtrl *s_treeBeingSorted = NULL; - -static int LINKAGEMODE tree_ctrl_compare_func(wxGenericTreeItem **item1, - wxGenericTreeItem **item2) -{ - wxCHECK_MSG( s_treeBeingSorted, 0, - "bug in wxGenericTreeCtrl::SortChildren()" ); - - return s_treeBeingSorted->OnCompareItems(*item1, *item2); -} - -void wxGenericTreeCtrl::SortChildren(const wxTreeItemId& itemId) -{ - wxCHECK_RET( itemId.IsOk(), wxT("invalid tree item") ); - - wxGenericTreeItem *item = (wxGenericTreeItem*) itemId.m_pItem; - - wxCHECK_RET( !s_treeBeingSorted, - wxT("wxGenericTreeCtrl::SortChildren is not reentrant") ); - - wxArrayGenericTreeItems& children = item->GetChildren(); - if ( children.GetCount() > 1 ) - { - m_dirty = true; - - s_treeBeingSorted = this; - children.Sort(tree_ctrl_compare_func); - s_treeBeingSorted = NULL; - } - //else: don't make the tree dirty as nothing changed -} - -void wxGenericTreeCtrl::CalculateLineHeight() -{ - wxClientDC dc(this); - m_lineHeight = (int)(dc.GetCharHeight() + 4); - - if ( m_imageListNormal ) - { - // Calculate a m_lineHeight value from the normal Image sizes. - // May be toggle off. Then wxGenericTreeCtrl will spread when - // necessary (which might look ugly). - int n = m_imageListNormal->GetImageCount(); - for (int i = 0; i < n ; i++) - { - int width = 0, height = 0; - m_imageListNormal->GetSize(i, width, height); - if (height > m_lineHeight) m_lineHeight = height; - } - } - - if ( m_imageListState ) - { - // Calculate a m_lineHeight value from the state Image sizes. - // May be toggle off. Then wxGenericTreeCtrl will spread when - // necessary (which might look ugly). - int n = m_imageListState->GetImageCount(); - for (int i = 0; i < n ; i++) - { - int width = 0, height = 0; - m_imageListState->GetSize(i, width, height); - if (height > m_lineHeight) m_lineHeight = height; - } - } - - if (m_imageListButtons) - { - // Calculate a m_lineHeight value from the Button image sizes. - // May be toggle off. Then wxGenericTreeCtrl will spread when - // necessary (which might look ugly). - int n = m_imageListButtons->GetImageCount(); - for (int i = 0; i < n ; i++) - { - int width = 0, height = 0; - m_imageListButtons->GetSize(i, width, height); - if (height > m_lineHeight) m_lineHeight = height; - } - } - - if (m_lineHeight < 30) - m_lineHeight += 2; // at least 2 pixels - else - m_lineHeight += m_lineHeight/10; // otherwise 10% extra spacing -} - -void wxGenericTreeCtrl::SetImageList(wxImageList *imageList) -{ - if (m_ownsImageListNormal) delete m_imageListNormal; - m_imageListNormal = imageList; - m_ownsImageListNormal = false; - m_dirty = true; - - if (m_anchor) - m_anchor->RecursiveResetSize(); - - // Don't do any drawing if we're setting the list to NULL, - // since we may be in the process of deleting the tree control. - if (imageList) - CalculateLineHeight(); -} - -void wxGenericTreeCtrl::SetStateImageList(wxImageList *imageList) -{ - if (m_ownsImageListState) delete m_imageListState; - m_imageListState = imageList; - m_ownsImageListState = false; - m_dirty = true; - - if (m_anchor) - m_anchor->RecursiveResetSize(); - - // Don't do any drawing if we're setting the list to NULL, - // since we may be in the process of deleting the tree control. - if (imageList) - CalculateLineHeight(); -} - -void wxGenericTreeCtrl::SetButtonsImageList(wxImageList *imageList) -{ - if (m_ownsImageListButtons) delete m_imageListButtons; - m_imageListButtons = imageList; - m_ownsImageListButtons = false; - m_dirty = true; - - if (m_anchor) - m_anchor->RecursiveResetSize(); - - CalculateLineHeight(); -} - -void wxGenericTreeCtrl::AssignButtonsImageList(wxImageList *imageList) -{ - SetButtonsImageList(imageList); - m_ownsImageListButtons = true; -} - -// ----------------------------------------------------------------------------- -// helpers -// ----------------------------------------------------------------------------- - -void wxGenericTreeCtrl::AdjustMyScrollbars() -{ - if (m_anchor) - { - int x = 0, y = 0; - m_anchor->GetSize( x, y, this ); - y += PIXELS_PER_UNIT+2; // one more scrollbar unit + 2 pixels - x += PIXELS_PER_UNIT+2; // one more scrollbar unit + 2 pixels - int x_pos = GetScrollPos( wxHORIZONTAL ); - int y_pos = GetScrollPos( wxVERTICAL ); - SetScrollbars( PIXELS_PER_UNIT, PIXELS_PER_UNIT, - x/PIXELS_PER_UNIT, y/PIXELS_PER_UNIT, - x_pos, y_pos ); - } - else - { - SetScrollbars( 0, 0, 0, 0 ); - } -} - -int wxGenericTreeCtrl::GetLineHeight(wxGenericTreeItem *item) const -{ - if (GetWindowStyleFlag() & wxTR_HAS_VARIABLE_ROW_HEIGHT) - return item->GetHeight(); - else - return m_lineHeight; -} - -void wxGenericTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc) -{ - item->SetFont(this, dc); - item->CalculateSize(this, dc); - - wxCoord text_h = item->GetTextHeight(); - - int image_h = 0, image_w = 0; - int image = item->GetCurrentImage(); - if ( image != NO_IMAGE ) - { - if ( m_imageListNormal ) - { - m_imageListNormal->GetSize(image, image_w, image_h); - image_w += MARGIN_BETWEEN_IMAGE_AND_TEXT; - } - else - { - image = NO_IMAGE; - } - } - - int state_h = 0, state_w = 0; - int state = item->GetState(); - if ( state != wxTREE_ITEMSTATE_NONE ) - { - if ( m_imageListState ) - { - m_imageListState->GetSize(state, state_w, state_h); - if ( image_w != 0 ) - state_w += MARGIN_BETWEEN_STATE_AND_IMAGE; - else - state_w += MARGIN_BETWEEN_IMAGE_AND_TEXT; - } - else - { - state = wxTREE_ITEMSTATE_NONE; - } - } - - int total_h = GetLineHeight(item); - bool drawItemBackground = false, - hasBgColour = false; - - if ( item->IsSelected() ) - { - dc.SetBrush(*(m_hasFocus ? m_hilightBrush : m_hilightUnfocusedBrush)); - drawItemBackground = true; - } - else - { - wxColour colBg; - wxTreeItemAttr * const attr = item->GetAttributes(); - if ( attr && attr->HasBackgroundColour() ) - { - drawItemBackground = - hasBgColour = true; - colBg = attr->GetBackgroundColour(); - } - else - { - colBg = GetBackgroundColour(); - } - dc.SetBrush(wxBrush(colBg, wxBRUSHSTYLE_SOLID)); - } - - int offset = HasFlag(wxTR_ROW_LINES) ? 1 : 0; - - if ( HasFlag(wxTR_FULL_ROW_HIGHLIGHT) ) - { - int x, w, h; - x=0; - GetVirtualSize(&w, &h); - wxRect rect( x, item->GetY()+offset, w, total_h-offset); - if (!item->IsSelected()) - { - dc.DrawRectangle(rect); - } - else - { - int flags = wxCONTROL_SELECTED; - if (m_hasFocus) - flags |= wxCONTROL_FOCUSED; - if ((item == m_current) && (m_hasFocus)) - flags |= wxCONTROL_CURRENT; - - wxRendererNative::Get(). - DrawItemSelectionRect(this, dc, rect, flags); - } - } - else // no full row highlight - { - if ( item->IsSelected() && - (state != wxTREE_ITEMSTATE_NONE || image != NO_IMAGE) ) - { - // If it's selected, and there's an state image or normal image, - // then we should take care to leave the area under the image - // painted in the background colour. - wxRect rect( item->GetX() + state_w + image_w - 2, - item->GetY() + offset, - item->GetWidth() - state_w - image_w + 2, - total_h - offset ); -#if !defined(__WXGTK20__) && !defined(__WXMAC__) - dc.DrawRectangle( rect ); -#else - rect.x -= 1; - rect.width += 2; - - int flags = wxCONTROL_SELECTED; - if (m_hasFocus) - flags |= wxCONTROL_FOCUSED; - if ((item == m_current) && (m_hasFocus)) - flags |= wxCONTROL_CURRENT; - wxRendererNative::Get(). - DrawItemSelectionRect(this, dc, rect, flags); -#endif - } - // On GTK+ 2, drawing a 'normal' background is wrong for themes that - // don't allow backgrounds to be customized. Not drawing the background, - // except for custom item backgrounds, works for both kinds of theme. - else if (drawItemBackground) - { - wxRect rect( item->GetX() + state_w + image_w - 2, - item->GetY() + offset, - item->GetWidth() - state_w - image_w + 2, - total_h - offset ); - if ( hasBgColour ) - { - dc.DrawRectangle( rect ); - } - else // no specific background colour - { - rect.x -= 1; - rect.width += 2; - - int flags = wxCONTROL_SELECTED; - if (m_hasFocus) - flags |= wxCONTROL_FOCUSED; - if ((item == m_current) && (m_hasFocus)) - flags |= wxCONTROL_CURRENT; - wxRendererNative::Get(). - DrawItemSelectionRect(this, dc, rect, flags); - } - } - } - - if ( state != wxTREE_ITEMSTATE_NONE ) - { - dc.SetClippingRegion( item->GetX(), item->GetY(), state_w, total_h ); - m_imageListState->Draw( state, dc, - item->GetX(), - item->GetY() + - (total_h > state_h ? (total_h-state_h)/2 - : 0), - wxIMAGELIST_DRAW_TRANSPARENT ); - dc.DestroyClippingRegion(); - } - - if ( image != NO_IMAGE ) - { - dc.SetClippingRegion(item->GetX() + state_w, item->GetY(), - image_w, total_h); - m_imageListNormal->Draw( image, dc, - item->GetX() + state_w, - item->GetY() + - (total_h > image_h ? (total_h-image_h)/2 - : 0), - wxIMAGELIST_DRAW_TRANSPARENT ); - dc.DestroyClippingRegion(); - } - - dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT); - int extraH = (total_h > text_h) ? (total_h - text_h)/2 : 0; - dc.DrawText( item->GetText(), - (wxCoord)(state_w + image_w + item->GetX()), - (wxCoord)(item->GetY() + extraH)); - - // restore normal font - dc.SetFont( m_normalFont ); - - if (item == m_dndEffectItem) - { - dc.SetPen( *wxBLACK_PEN ); - // DnD visual effects - switch (m_dndEffect) - { - case BorderEffect: - { - dc.SetBrush(*wxTRANSPARENT_BRUSH); - int w = item->GetWidth() + 2; - int h = total_h + 2; - dc.DrawRectangle( item->GetX() - 1, item->GetY() - 1, w, h); - break; - } - case AboveEffect: - { - int x = item->GetX(), - y = item->GetY(); - dc.DrawLine( x, y, x + item->GetWidth(), y); - break; - } - case BelowEffect: - { - int x = item->GetX(), - y = item->GetY(); - y += total_h - 1; - dc.DrawLine( x, y, x + item->GetWidth(), y); - break; - } - case NoEffect: - break; - } - } -} - -void -wxGenericTreeCtrl::PaintLevel(wxGenericTreeItem *item, - wxDC &dc, - int level, - int &y) -{ - int x = level*m_indent; - if (!HasFlag(wxTR_HIDE_ROOT)) - { - x += m_indent; - } - else if (level == 0) - { - // always expand hidden root - int origY = y; - wxArrayGenericTreeItems& children = item->GetChildren(); - int count = children.GetCount(); - if (count > 0) - { - int n = 0, oldY; - do { - oldY = y; - PaintLevel(children[n], dc, 1, y); - } while (++n < count); - - if ( !HasFlag(wxTR_NO_LINES) && HasFlag(wxTR_LINES_AT_ROOT) - && count > 0 ) - { - // draw line down to last child - origY += GetLineHeight(children[0])>>1; - oldY += GetLineHeight(children[n-1])>>1; - dc.DrawLine(3, origY, 3, oldY); - } - } - return; - } - - item->SetX(x+m_spacing); - item->SetY(y); - - int h = GetLineHeight(item); - int y_top = y; - int y_mid = y_top + (h>>1); - y += h; - - int exposed_x = dc.LogicalToDeviceX(0); - int exposed_y = dc.LogicalToDeviceY(y_top); - - if (IsExposed(exposed_x, exposed_y, 10000, h)) // 10000 = very much - { - const wxPen *pen = -#ifndef __WXMAC__ - // don't draw rect outline if we already have the - // background color under Mac - (item->IsSelected() && m_hasFocus) ? wxBLACK_PEN : -#endif // !__WXMAC__ - wxTRANSPARENT_PEN; - - wxColour colText; - if ( item->IsSelected() ) - { -#ifdef __WXMAC__ - colText = *wxWHITE; -#else - if (m_hasFocus) - colText = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT); - else - colText = wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOXHIGHLIGHTTEXT); -#endif - } - else - { - wxTreeItemAttr *attr = item->GetAttributes(); - if (attr && attr->HasTextColour()) - colText = attr->GetTextColour(); - else - colText = GetForegroundColour(); - } - - // prepare to draw - dc.SetTextForeground(colText); - dc.SetPen(*pen); - - // draw - PaintItem(item, dc); - - if (HasFlag(wxTR_ROW_LINES)) - { - // if the background colour is white, choose a - // contrasting color for the lines - dc.SetPen(*((GetBackgroundColour() == *wxWHITE) - ? wxMEDIUM_GREY_PEN : wxWHITE_PEN)); - dc.DrawLine(0, y_top, 10000, y_top); - dc.DrawLine(0, y, 10000, y); - } - - // restore DC objects - dc.SetBrush(*wxWHITE_BRUSH); - dc.SetPen(m_dottedPen); - dc.SetTextForeground(*wxBLACK); - - if ( !HasFlag(wxTR_NO_LINES) ) - { - // draw the horizontal line here - int x_start = x; - if (x > (signed)m_indent) - x_start -= m_indent; - else if (HasFlag(wxTR_LINES_AT_ROOT)) - x_start = 3; - dc.DrawLine(x_start, y_mid, x + m_spacing, y_mid); - } - - // should the item show a button? - if ( item->HasPlus() && HasButtons() ) - { - if ( m_imageListButtons ) - { - // draw the image button here - int image_h = 0, - image_w = 0; - int image = item->IsExpanded() ? wxTreeItemIcon_Expanded - : wxTreeItemIcon_Normal; - if ( item->IsSelected() ) - image += wxTreeItemIcon_Selected - wxTreeItemIcon_Normal; - - m_imageListButtons->GetSize(image, image_w, image_h); - int xx = x - image_w/2; - int yy = y_mid - image_h/2; - - wxDCClipper clip(dc, xx, yy, image_w, image_h); - m_imageListButtons->Draw(image, dc, xx, yy, - wxIMAGELIST_DRAW_TRANSPARENT); - } - else // no custom buttons - { - static const int wImage = 9; - static const int hImage = 9; - - int flag = 0; - if (item->IsExpanded()) - flag |= wxCONTROL_EXPANDED; - if (item == m_underMouse) - flag |= wxCONTROL_CURRENT; - - wxRendererNative::Get().DrawTreeItemButton - ( - this, - dc, - wxRect(x - wImage/2, - y_mid - hImage/2, - wImage, hImage), - flag - ); - } - } - } - - if (item->IsExpanded()) - { - wxArrayGenericTreeItems& children = item->GetChildren(); - int count = children.GetCount(); - if (count > 0) - { - int n = 0, oldY; - ++level; - do { - oldY = y; - PaintLevel(children[n], dc, level, y); - } while (++n < count); - - if (!HasFlag(wxTR_NO_LINES) && count > 0) - { - // draw line down to last child - oldY += GetLineHeight(children[n-1])>>1; - if (HasButtons()) y_mid += 5; - - // Only draw the portion of the line that is visible, in case - // it is huge - wxCoord xOrigin=0, yOrigin=0, width, height; - dc.GetDeviceOrigin(&xOrigin, &yOrigin); - yOrigin = abs(yOrigin); - GetClientSize(&width, &height); - - // Move end points to the beginning/end of the view? - if (y_mid < yOrigin) - y_mid = yOrigin; - if (oldY > yOrigin + height) - oldY = yOrigin + height; - - // after the adjustments if y_mid is larger than oldY then the - // line isn't visible at all so don't draw anything - if (y_mid < oldY) - dc.DrawLine(x, y_mid, x, oldY); - } - } - } -} - -void wxGenericTreeCtrl::DrawDropEffect(wxGenericTreeItem *item) -{ - if ( item ) - { - if ( item->HasPlus() ) - { - // it's a folder, indicate it by a border - DrawBorder(item); - } - else - { - // draw a line under the drop target because the item will be - // dropped there - DrawLine(item, !m_dropEffectAboveItem ); - } - - SetCursor(*wxSTANDARD_CURSOR); - } - else - { - // can't drop here - SetCursor(wxCURSOR_NO_ENTRY); - } -} - -void wxGenericTreeCtrl::DrawBorder(const wxTreeItemId &item) -{ - wxCHECK_RET( item.IsOk(), "invalid item in wxGenericTreeCtrl::DrawLine" ); - - wxGenericTreeItem *i = (wxGenericTreeItem*) item.m_pItem; - - if (m_dndEffect == NoEffect) - { - m_dndEffect = BorderEffect; - m_dndEffectItem = i; - } - else - { - m_dndEffect = NoEffect; - m_dndEffectItem = NULL; - } - - wxRect rect( i->GetX()-1, i->GetY()-1, i->GetWidth()+2, GetLineHeight(i)+2 ); - CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); - RefreshRect( rect ); -} - -void wxGenericTreeCtrl::DrawLine(const wxTreeItemId &item, bool below) -{ - wxCHECK_RET( item.IsOk(), "invalid item in wxGenericTreeCtrl::DrawLine" ); - - wxGenericTreeItem *i = (wxGenericTreeItem*) item.m_pItem; - - if (m_dndEffect == NoEffect) - { - if (below) - m_dndEffect = BelowEffect; - else - m_dndEffect = AboveEffect; - m_dndEffectItem = i; - } - else - { - m_dndEffect = NoEffect; - m_dndEffectItem = NULL; - } - - wxRect rect( i->GetX()-1, i->GetY()-1, i->GetWidth()+2, GetLineHeight(i)+2 ); - CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); - RefreshRect( rect ); -} - -// ----------------------------------------------------------------------------- -// wxWidgets callbacks -// ----------------------------------------------------------------------------- - -void wxGenericTreeCtrl::OnSize( wxSizeEvent &event ) -{ -#ifdef __WXGTK__ - if (HasFlag( wxTR_FULL_ROW_HIGHLIGHT) && m_current) - RefreshLine( m_current ); -#endif - - event.Skip(true); -} - -void wxGenericTreeCtrl::OnPaint( wxPaintEvent &WXUNUSED(event) ) -{ - wxPaintDC dc(this); - PrepareDC( dc ); - - if ( !m_anchor) - return; - - dc.SetFont( m_normalFont ); - dc.SetPen( m_dottedPen ); - - // this is now done dynamically - //if(GetImageList() == NULL) - // m_lineHeight = (int)(dc.GetCharHeight() + 4); - - int y = 2; - PaintLevel( m_anchor, dc, 0, y ); -} - -void wxGenericTreeCtrl::OnSetFocus( wxFocusEvent &event ) -{ - m_hasFocus = true; - - RefreshSelected(); - - event.Skip(); -} - -void wxGenericTreeCtrl::OnKillFocus( wxFocusEvent &event ) -{ - m_hasFocus = false; - - RefreshSelected(); - - event.Skip(); -} - -void wxGenericTreeCtrl::OnKeyDown( wxKeyEvent &event ) -{ - // send a tree event - wxTreeEvent te( wxEVT_TREE_KEY_DOWN, this); - te.m_evtKey = event; - if ( GetEventHandler()->ProcessEvent( te ) ) - return; - - event.Skip(); -} - -void wxGenericTreeCtrl::OnChar( wxKeyEvent &event ) -{ - if ( (m_current == 0) || (m_key_current == 0) ) - { - event.Skip(); - return; - } - - // how should the selection work for this event? - bool is_multiple, extended_select, unselect_others; - EventFlagsToSelType(GetWindowStyleFlag(), - event.ShiftDown(), - event.CmdDown(), - is_multiple, extended_select, unselect_others); - - if (GetLayoutDirection() == wxLayout_RightToLeft) - { - if (event.GetKeyCode() == WXK_RIGHT) - event.m_keyCode = WXK_LEFT; - else if (event.GetKeyCode() == WXK_LEFT) - event.m_keyCode = WXK_RIGHT; - } - - // + : Expand - // - : Collaspe - // * : Expand all/Collapse all - // ' ' | return : activate - // up : go up (not last children!) - // down : go down - // left : go to parent - // right : open if parent and go next - // home : go to root - // end : go to last item without opening parents - // alnum : start or continue searching for the item with this prefix - int keyCode = event.GetKeyCode(); - -#ifdef __WXOSX__ - // Make the keys work as they do in the native control: - // right => expand - // left => collapse if current item is expanded - if (keyCode == WXK_RIGHT) - { - keyCode = '+'; - } - else if (keyCode == WXK_LEFT && IsExpanded(m_current)) - { - keyCode = '-'; - } -#endif // __WXOSX__ - - switch ( keyCode ) - { - case '+': - case WXK_ADD: - if (m_current->HasPlus() && !IsExpanded(m_current)) - { - Expand(m_current); - } - break; - - case '*': - case WXK_MULTIPLY: - if ( !IsExpanded(m_current) ) - { - // expand all - ExpandAllChildren(m_current); - break; - } - wxFALLTHROUGH;//else: fall through to Collapse() it - - case '-': - case WXK_SUBTRACT: - if (IsExpanded(m_current)) - { - Collapse(m_current); - } - break; - - case WXK_MENU: - { - // Use the item's bounding rectangle to determine position for - // the event - wxRect ItemRect; - GetBoundingRect(m_current, ItemRect, true); - - wxTreeEvent - eventMenu(wxEVT_TREE_ITEM_MENU, this, m_current); - // Use the left edge, vertical middle - eventMenu.m_pointDrag = wxPoint(ItemRect.GetX(), - ItemRect.GetY() + - ItemRect.GetHeight() / 2); - GetEventHandler()->ProcessEvent( eventMenu ); - } - break; - - case ' ': - case WXK_RETURN: - if ( !event.HasModifiers() ) - { - wxTreeEvent - eventAct(wxEVT_TREE_ITEM_ACTIVATED, this, m_current); - GetEventHandler()->ProcessEvent( eventAct ); - } - - // in any case, also generate the normal key event for this key, - // even if we generated the ACTIVATED event above: this is what - // wxMSW does and it makes sense because you might not want to - // process ACTIVATED event at all and handle Space and Return - // directly (and differently) which would be impossible otherwise - event.Skip(); - break; - - // up goes to the previous sibling or to the last - // of its children if it's expanded - case WXK_UP: - { - wxTreeItemId prev = GetPrevSibling( m_key_current ); - if (!prev) - { - prev = GetItemParent( m_key_current ); - if ((prev == GetRootItem()) && HasFlag(wxTR_HIDE_ROOT)) - { - break; // don't go to root if it is hidden - } - if (prev) - { - wxTreeItemIdValue cookie; - wxTreeItemId current = m_key_current; - // TODO: Huh? If we get here, we'd better be the first - // child of our parent. How else could it be? - if (current == GetFirstChild( prev, cookie )) - { - // otherwise we return to where we came from - DoSelectItem(prev, - unselect_others, - extended_select); - m_key_current = (wxGenericTreeItem*) prev.m_pItem; - break; - } - } - } - if (prev) - { - while ( IsExpanded(prev) && HasChildren(prev) ) - { - wxTreeItemId child = GetLastChild(prev); - if ( child ) - { - prev = child; - } - } - - DoSelectItem( prev, unselect_others, extended_select ); - m_key_current=(wxGenericTreeItem*) prev.m_pItem; - } - } - break; - - // left arrow goes to the parent - case WXK_LEFT: - { - wxTreeItemId prev = GetItemParent( m_current ); - if ((prev == GetRootItem()) && HasFlag(wxTR_HIDE_ROOT)) - { - // don't go to root if it is hidden - prev = GetPrevSibling( m_current ); - } - if (prev) - { - DoSelectItem( prev, unselect_others, extended_select ); - } - } - break; - - case WXK_RIGHT: - // right arrow just expand the item will be fine - if (m_current != GetRootItem().m_pItem || !HasFlag(wxTR_HIDE_ROOT)) - Expand(m_current); - //else: don't try to expand hidden root item (which can be the - // current one when the tree is empty) - break; - - case WXK_DOWN: - { - if (IsExpanded(m_key_current) && HasChildren(m_key_current)) - { - wxTreeItemIdValue cookie; - wxTreeItemId child = GetFirstChild( m_key_current, cookie ); - if ( !child ) - break; - - DoSelectItem( child, unselect_others, extended_select ); - m_key_current=(wxGenericTreeItem*) child.m_pItem; - } - else - { - wxTreeItemId next = GetNextSibling( m_key_current ); - if (!next) - { - wxTreeItemId current = m_key_current; - while (current.IsOk() && !next) - { - current = GetItemParent( current ); - if (current) next = GetNextSibling( current ); - } - } - if (next) - { - DoSelectItem( next, unselect_others, extended_select ); - m_key_current=(wxGenericTreeItem*) next.m_pItem; - } - } - } - break; - - // selects the last visible tree item - case WXK_END: - { - wxTreeItemId last = GetRootItem(); - - while ( last.IsOk() && IsExpanded(last) ) - { - wxTreeItemId lastChild = GetLastChild(last); - - // it may happen if the item was expanded but then all of - // its children have been deleted - so IsExpanded() returned - // true, but GetLastChild() returned invalid item - if ( !lastChild ) - break; - - last = lastChild; - } - - if ( last.IsOk() ) - { - DoSelectItem( last, unselect_others, extended_select ); - } - } - break; - - // selects the root item - case WXK_HOME: - { - wxTreeItemId prev = GetRootItem(); - if (!prev) - break; - - if ( HasFlag(wxTR_HIDE_ROOT) ) - { - wxTreeItemIdValue cookie; - prev = GetFirstChild(prev, cookie); - if (!prev) - break; - } - - DoSelectItem( prev, unselect_others, extended_select ); - } - break; - - default: - // do not use wxIsalnum() here - if ( !event.HasModifiers() && - ((keyCode >= '0' && keyCode <= '9') || - (keyCode >= 'a' && keyCode <= 'z') || - (keyCode >= 'A' && keyCode <= 'Z') || - (keyCode == '_'))) - { - // find the next item starting with the given prefix - wxChar ch = (wxChar)keyCode; - wxTreeItemId id; - - // if the same character is typed multiple times then go to the - // next entry starting with that character instead of searching - // for an item starting with multiple copies of this character, - // this is more useful and is how it works under Windows. - if ( m_findPrefix.length() == 1 && m_findPrefix[0] == ch ) - { - id = FindItem(m_current, ch); - } - else - { - const wxString newPrefix(m_findPrefix + ch); - id = FindItem(m_current, newPrefix); - if ( id.IsOk() ) - m_findPrefix = newPrefix; - } - - // also start the timer to reset the current prefix if the user - // doesn't press any more alnum keys soon -- we wouldn't want - // to use this prefix for a new item search - if ( !m_findTimer ) - { - m_findTimer = new wxTreeFindTimer(this); - } - - // Notice that we should start the timer even if we didn't find - // anything to make sure we reset the search state later. - m_findTimer->Start(wxTreeFindTimer::DELAY, wxTIMER_ONE_SHOT); - - if ( id.IsOk() ) - { - SelectItem(id); - - // Reset the bell flag if it had been temporarily disabled - // before. - if ( m_findBell ) - m_findBell = 1; - } - else // No such item - { - // Signal it with a bell if enabled. - if ( m_findBell == 1 ) - { - ::wxBell(); - - // Disable it for the next unsuccessful match, we only - // beep once, this is usually enough and continuing to - // do it would be annoying. - m_findBell = -1; - } - } - } - else - { - event.Skip(); - } - } -} - -wxTreeItemId -wxGenericTreeCtrl::DoTreeHitTest(const wxPoint& point, int& flags) const -{ - int w, h; - GetSize(&w, &h); - flags=0; - if (point.x<0) flags |= wxTREE_HITTEST_TOLEFT; - if (point.x>w) flags |= wxTREE_HITTEST_TORIGHT; - if (point.y<0) flags |= wxTREE_HITTEST_ABOVE; - if (point.y>h) flags |= wxTREE_HITTEST_BELOW; - if (flags) return wxTreeItemId(); - - if (m_anchor == NULL) - { - flags = wxTREE_HITTEST_NOWHERE; - return wxTreeItemId(); - } - - wxGenericTreeItem *hit = m_anchor->HitTest(CalcUnscrolledPosition(point), - this, flags, 0); - if (hit == NULL) - { - flags = wxTREE_HITTEST_NOWHERE; - return wxTreeItemId(); - } - return hit; -} - -// get the bounding rectangle of the item (or of its label only) -bool wxGenericTreeCtrl::GetBoundingRect(const wxTreeItemId& item, - wxRect& rect, - bool textOnly) const -{ - wxCHECK_MSG( item.IsOk(), false, - "invalid item in wxGenericTreeCtrl::GetBoundingRect" ); - - wxGenericTreeItem *i = (wxGenericTreeItem*) item.m_pItem; - - if ( textOnly ) - { - int image_h = 0, image_w = 0; - int image = ((wxGenericTreeItem*) item.m_pItem)->GetCurrentImage(); - if ( image != NO_IMAGE && m_imageListNormal ) - { - m_imageListNormal->GetSize( image, image_w, image_h ); - image_w += MARGIN_BETWEEN_IMAGE_AND_TEXT; - } - - int state_h = 0, state_w = 0; - int state = ((wxGenericTreeItem*) item.m_pItem)->GetState(); - if ( state != wxTREE_ITEMSTATE_NONE && m_imageListState ) - { - m_imageListState->GetSize( state, state_w, state_h ); - if ( image_w != 0 ) - state_w += MARGIN_BETWEEN_STATE_AND_IMAGE; - else - state_w += MARGIN_BETWEEN_IMAGE_AND_TEXT; - } - - rect.x = i->GetX() + state_w + image_w; - rect.width = i->GetWidth() - state_w - image_w; - - } - else // the entire line - { - rect.x = 0; - rect.width = GetClientSize().x; - } - - rect.y = i->GetY(); - rect.height = GetLineHeight(i); - - // we have to return the logical coordinates, not physical ones - rect.SetTopLeft(CalcScrolledPosition(rect.GetTopLeft())); - - return true; -} - -wxTextCtrl *wxGenericTreeCtrl::EditLabel(const wxTreeItemId& item, - wxClassInfo * WXUNUSED(textCtrlClass)) -{ - wxCHECK_MSG( item.IsOk(), NULL, wxT("can't edit an invalid item") ); - - wxGenericTreeItem *itemEdit = (wxGenericTreeItem *)item.m_pItem; - - wxTreeEvent te(wxEVT_TREE_BEGIN_LABEL_EDIT, this, itemEdit); - if ( GetEventHandler()->ProcessEvent( te ) && !te.IsAllowed() ) - { - // vetoed by user - return NULL; - } - - // We have to call this here because the label in - // question might just have been added and no screen - // update taken place. - if ( m_dirty ) - DoDirtyProcessing(); - - // TODO: use textCtrlClass here to create the control of correct class - m_textCtrl = new wxTreeTextCtrl(this, itemEdit); - - m_textCtrl->SetFocus(); - - return m_textCtrl; -} - -// returns a pointer to the text edit control if the item is being -// edited, NULL otherwise (it's assumed that no more than one item may -// be edited simultaneously) -wxTextCtrl* wxGenericTreeCtrl::GetEditControl() const -{ - return m_textCtrl; -} - -void wxGenericTreeCtrl::EndEditLabel(const wxTreeItemId& WXUNUSED(item), - bool discardChanges) -{ - if (m_textCtrl) - { - m_textCtrl->EndEdit(discardChanges); - } -} - -bool wxGenericTreeCtrl::OnRenameAccept(wxGenericTreeItem *item, - const wxString& value) -{ - wxTreeEvent le(wxEVT_TREE_END_LABEL_EDIT, this, item); - le.m_label = value; - le.m_editCancelled = false; - - return !GetEventHandler()->ProcessEvent( le ) || le.IsAllowed(); -} - -void wxGenericTreeCtrl::OnRenameCancelled(wxGenericTreeItem *item) -{ - // let owner know that the edit was cancelled - wxTreeEvent le(wxEVT_TREE_END_LABEL_EDIT, this, item); - le.m_label = wxEmptyString; - le.m_editCancelled = true; - - GetEventHandler()->ProcessEvent( le ); -} - -void wxGenericTreeCtrl::OnRenameTimer() -{ - EditLabel( m_current ); -} - -void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event ) -{ - if ( !m_anchor )return; - - wxPoint pt = CalcUnscrolledPosition(event.GetPosition()); - - // Is the mouse over a tree item button? - int flags = 0; - wxGenericTreeItem *thisItem = m_anchor->HitTest(pt, this, flags, 0); - wxGenericTreeItem *underMouse = thisItem; -#if wxUSE_TOOLTIPS - bool underMouseChanged = (underMouse != m_underMouse) ; -#endif // wxUSE_TOOLTIPS - - if ((underMouse) && - (flags & wxTREE_HITTEST_ONITEMBUTTON) && - (!event.LeftIsDown()) && - (!m_isDragging) && - (!m_renameTimer || !m_renameTimer->IsRunning())) - { - } - else - { - underMouse = NULL; - } - - if (underMouse != m_underMouse) - { - if (m_underMouse) - { - // unhighlight old item - wxGenericTreeItem *tmp = m_underMouse; - m_underMouse = NULL; - RefreshLine( tmp ); - } - - m_underMouse = underMouse; - if (m_underMouse) - RefreshLine( m_underMouse ); - } - -#if wxUSE_TOOLTIPS - // Determines what item we are hovering over and need a tooltip for - wxTreeItemId hoverItem = thisItem; - - // We do not want a tooltip if we are dragging, or if the rename timer is - // running - if ( underMouseChanged && - hoverItem.IsOk() && - !m_isDragging && - (!m_renameTimer || !m_renameTimer->IsRunning()) ) - { - // Ask the tree control what tooltip (if any) should be shown - wxTreeEvent - hevent(wxEVT_TREE_ITEM_GETTOOLTIP, this, hoverItem); - - // setting a tooltip upon leaving a view is getting the tooltip displayed - // on the neighbouring view ... -#ifdef __WXOSX__ - if ( event.Leaving() ) - SetToolTip(NULL); - else -#endif - if ( GetEventHandler()->ProcessEvent(hevent) ) - { - // If the user permitted the tooltip change, update it, otherwise - // remove any old tooltip we might have. - if ( hevent.IsAllowed() ) - SetToolTip(hevent.m_label); - else - SetToolTip(NULL); - } - } -#endif - - // we process left mouse up event (enables in-place edit), middle/right down - // (pass to the user code), left dbl click (activate item) and - // dragging/moving events for items drag-and-drop - if ( !(event.LeftDown() || - event.LeftUp() || - event.MiddleDown() || - event.RightDown() || - event.LeftDClick() || - event.Dragging() || - ((event.Moving() || event.RightUp()) && m_isDragging)) ) - { - event.Skip(); - - return; - } - - - flags = 0; - wxGenericTreeItem *item = m_anchor->HitTest(pt, this, flags, 0); - - if ( event.Dragging() && !m_isDragging ) - { - if (m_dragCount == 0) - m_dragStart = pt; - - m_dragCount++; - - if (m_dragCount != 3) - { - // wait until user drags a bit further... - return; - } - - wxEventType command = event.RightIsDown() - ? wxEVT_TREE_BEGIN_RDRAG - : wxEVT_TREE_BEGIN_DRAG; - - wxTreeEvent nevent(command, this, m_current); - nevent.SetPoint(CalcScrolledPosition(pt)); - - // by default the dragging is not supported, the user code must - // explicitly allow the event for it to take place - nevent.Veto(); - - if ( GetEventHandler()->ProcessEvent(nevent) && nevent.IsAllowed() ) - { - // we're going to drag this item - m_isDragging = true; - - // remember the old cursor because we will change it while - // dragging - m_oldCursor = m_cursor; - - // in a single selection control, hide the selection temporarily - if ( !(GetWindowStyleFlag() & wxTR_MULTIPLE) ) - { - m_oldSelection = (wxGenericTreeItem*) GetSelection().m_pItem; - - if ( m_oldSelection ) - { - m_oldSelection->SetHilight(false); - RefreshLine(m_oldSelection); - } - } - - CaptureMouse(); - } - } - else if ( event.Dragging() ) - { - if ( item != m_dropTarget ) - { - // unhighlight the previous drop target - DrawDropEffect(m_dropTarget); - - m_dropTarget = item; - - // highlight the current drop target if any - DrawDropEffect(m_dropTarget); - -#if defined(__WXMSW__) || defined(__WXMAC__) || defined(__WXGTK20__) - Update(); -#else - // TODO: remove this call or use wxEventLoopBase::GetActive()->YieldFor(wxEVT_CATEGORY_UI) - // instead (needs to be tested!) - wxYieldIfNeeded(); -#endif - } - } - else if ( (event.LeftUp() || event.RightUp()) && m_isDragging ) - { - ReleaseMouse(); - - // erase the highlighting - DrawDropEffect(m_dropTarget); - - if ( m_oldSelection ) - { - m_oldSelection->SetHilight(true); - RefreshLine(m_oldSelection); - m_oldSelection = NULL; - } - - // generate the drag end event - wxTreeEvent eventEndDrag(wxEVT_TREE_END_DRAG, this, item); - - eventEndDrag.m_pointDrag = CalcScrolledPosition(pt); - - (void)GetEventHandler()->ProcessEvent(eventEndDrag); - - m_isDragging = false; - m_dropTarget = NULL; - - SetCursor(m_oldCursor); - -#if defined( __WXMSW__ ) || defined(__WXMAC__) || defined(__WXGTK20__) - Update(); -#else - // TODO: remove this call or use wxEventLoopBase::GetActive()->YieldFor(wxEVT_CATEGORY_UI) - // instead (needs to be tested!) - wxYieldIfNeeded(); -#endif - } - else - { - // If we got to this point, we are not dragging or moving the mouse. - // Because the code in carbon/toplevel.cpp will only set focus to the - // tree if we skip for EVT_LEFT_DOWN, we MUST skip this event here for - // focus to work. - // We skip even if we didn't hit an item because we still should - // restore focus to the tree control even if we didn't exactly hit an - // item. - if ( event.LeftDown() ) - { - event.Skip(); - } - - // here we process only the messages which happen on tree items - - m_dragCount = 0; - - if (item == NULL) return; /* we hit the blank area */ - - if ( event.RightDown() ) - { - // If the item is already selected, do not update the selection. - // Multi-selections should not be cleared if a selected item is - // clicked. - if (!IsSelected(item)) - { - DoSelectItem(item, true, false); - } - - wxTreeEvent - nevent(wxEVT_TREE_ITEM_RIGHT_CLICK, this, item); - nevent.m_pointDrag = CalcScrolledPosition(pt); - event.Skip(!GetEventHandler()->ProcessEvent(nevent)); - - // Consistent with MSW (for now), send the ITEM_MENU *after* - // the RIGHT_CLICK event. TODO: This behaviour may change. - wxTreeEvent nevent2(wxEVT_TREE_ITEM_MENU, this, item); - nevent2.m_pointDrag = CalcScrolledPosition(pt); - GetEventHandler()->ProcessEvent(nevent2); - } - else if ( event.MiddleDown() ) - { - wxTreeEvent - nevent(wxEVT_TREE_ITEM_MIDDLE_CLICK, this, item); - nevent.m_pointDrag = CalcScrolledPosition(pt); - event.Skip(!GetEventHandler()->ProcessEvent(nevent)); - } - else if ( event.LeftUp() ) - { - if (flags & wxTREE_HITTEST_ONITEMSTATEICON) - { - wxTreeEvent - nevent(wxEVT_TREE_STATE_IMAGE_CLICK, this, item); - GetEventHandler()->ProcessEvent(nevent); - } - - // this facilitates multiple-item drag-and-drop - - if ( /* item && */ HasFlag(wxTR_MULTIPLE)) - { - wxArrayTreeItemIds selections; - size_t count = GetSelections(selections); - - if (count > 1 && - !event.CmdDown() && - !event.ShiftDown()) - { - DoSelectItem(item, true, false); - } - } - - if ( m_lastOnSame ) - { - if ( (item == m_current) && - (flags & wxTREE_HITTEST_ONITEMLABEL) && - HasFlag(wxTR_EDIT_LABELS) ) - { - if ( m_renameTimer ) - { - if ( m_renameTimer->IsRunning() ) - m_renameTimer->Stop(); - } - else - { - m_renameTimer = new wxTreeRenameTimer( this ); - } - - m_renameTimer->Start( wxTreeRenameTimer::DELAY, true ); - } - - m_lastOnSame = false; - } - } - else // !RightDown() && !MiddleDown() && !LeftUp() - { - // ==> LeftDown() || LeftDClick() - if ( event.LeftDown() ) - { - // If we click on an already selected item but do it to return - // the focus to the control, it shouldn't start editing the - // item label because it's too easy to start editing - // accidentally (and also because nobody else does it like - // this). So only set this flag, used to decide whether we - // should start editing the label later, if we already have - // focus. - m_lastOnSame = item == m_current && HasFocus(); - } - - if ( flags & wxTREE_HITTEST_ONITEMBUTTON ) - { - // only toggle the item for a single click, double click on - // the button doesn't do anything (it toggles the item twice) - if ( event.LeftDown() ) - { - Toggle( item ); - } - - // don't select the item if the button was clicked - return; - } - - - // clear the previously selected items, if the - // user clicked outside of the present selection. - // otherwise, perform the deselection on mouse-up. - // this allows multiple drag and drop to work. - // but if Cmd is down, toggle selection of the clicked item - if (!IsSelected(item) || event.CmdDown()) - { - // how should the selection work for this event? - bool is_multiple, extended_select, unselect_others; - EventFlagsToSelType(GetWindowStyleFlag(), - event.ShiftDown(), - event.CmdDown(), - is_multiple, - extended_select, - unselect_others); - - DoSelectItem(item, unselect_others, extended_select); - } - - - // For some reason, Windows isn't recognizing a left double-click, - // so we need to simulate it here. Allow 200 milliseconds for now. - if ( event.LeftDClick() ) - { - // double clicking should not start editing the item label - if ( m_renameTimer ) - m_renameTimer->Stop(); - - m_lastOnSame = false; - - // send activate event first - wxTreeEvent - nevent(wxEVT_TREE_ITEM_ACTIVATED, this, item); - nevent.m_pointDrag = CalcScrolledPosition(pt); - if ( !GetEventHandler()->ProcessEvent( nevent ) ) - { - // if the user code didn't process the activate event, - // handle it ourselves by toggling the item when it is - // double clicked - if ( item->HasPlus() ) - { - Toggle(item); - } - } - } - } - } -} - -void wxGenericTreeCtrl::OnInternalIdle() -{ - wxWindow::OnInternalIdle(); - - // Check if we need to select the root item - // because nothing else has been selected. - // Delaying it means that we can invoke event handlers - // as required, when a first item is selected. - if (!HasFlag(wxTR_MULTIPLE) && !GetSelection().IsOk()) - { - if (m_select_me) - SelectItem(m_select_me); - else if (GetRootItem().IsOk()) - SelectItem(GetRootItem()); - } - - // after all changes have been done to the tree control, - // actually redraw the tree when everything is over - if (m_dirty) - DoDirtyProcessing(); -} - -void -wxGenericTreeCtrl::CalculateLevel(wxGenericTreeItem *item, - wxDC &dc, - int level, - int &y ) -{ - int x = level*m_indent; - if (!HasFlag(wxTR_HIDE_ROOT)) - { - x += m_indent; - } - else if (level == 0) - { - // a hidden root is not evaluated, but its - // children are always calculated - goto Recurse; - } - - item->CalculateSize(this, dc); - - // set its position - item->SetX( x+m_spacing ); - item->SetY( y ); - y += GetLineHeight(item); - - if ( !item->IsExpanded() ) - { - // we don't need to calculate collapsed branches - return; - } - - Recurse: - wxArrayGenericTreeItems& children = item->GetChildren(); - size_t n, count = children.GetCount(); - ++level; - for (n = 0; n < count; ++n ) - CalculateLevel( children[n], dc, level, y ); // recurse -} - -void wxGenericTreeCtrl::CalculatePositions() -{ - if ( !m_anchor ) return; - - wxClientDC dc(this); - PrepareDC( dc ); - - dc.SetFont( m_normalFont ); - - dc.SetPen( m_dottedPen ); - //if(GetImageList() == NULL) - // m_lineHeight = (int)(dc.GetCharHeight() + 4); - - int y = 2; - CalculateLevel( m_anchor, dc, 0, y ); // start recursion -} - -void wxGenericTreeCtrl::Refresh(bool eraseBackground, const wxRect *rect) -{ - if ( !IsFrozen() ) - wxTreeCtrlBase::Refresh(eraseBackground, rect); -} - -void wxGenericTreeCtrl::RefreshSubtree(wxGenericTreeItem *item) -{ - if (m_dirty || IsFrozen() ) - return; - - wxSize client = GetClientSize(); - - wxRect rect; - CalcScrolledPosition(0, item->GetY(), NULL, &rect.y); - rect.width = client.x; - rect.height = client.y; - - Refresh(true, &rect); - - AdjustMyScrollbars(); -} - -void wxGenericTreeCtrl::RefreshLine( wxGenericTreeItem *item ) -{ - if (m_dirty || IsFrozen() ) - return; - - wxRect rect; - CalcScrolledPosition(0, item->GetY(), NULL, &rect.y); - rect.width = GetClientSize().x; - rect.height = GetLineHeight(item); //dc.GetCharHeight() + 6; - - Refresh(true, &rect); -} - -void wxGenericTreeCtrl::RefreshSelected() -{ - if (IsFrozen()) - return; - - // TODO: this is awfully inefficient, we should keep the list of all - // selected items internally, should be much faster - if ( m_anchor ) - RefreshSelectedUnder(m_anchor); -} - -void wxGenericTreeCtrl::RefreshSelectedUnder(wxGenericTreeItem *item) -{ - if (IsFrozen()) - return; - - if ( item->IsSelected() ) - RefreshLine(item); - - const wxArrayGenericTreeItems& children = item->GetChildren(); - size_t count = children.GetCount(); - for ( size_t n = 0; n < count; n++ ) - { - RefreshSelectedUnder(children[n]); - } -} - -void wxGenericTreeCtrl::DoThaw() -{ - wxTreeCtrlBase::DoThaw(); - - if ( m_dirty ) - DoDirtyProcessing(); - else - Refresh(); -} - -// ---------------------------------------------------------------------------- -// changing colours: we need to refresh the tree control -// ---------------------------------------------------------------------------- - -bool wxGenericTreeCtrl::SetBackgroundColour(const wxColour& colour) -{ - if ( !wxWindow::SetBackgroundColour(colour) ) - return false; - - Refresh(); - - return true; -} - -bool wxGenericTreeCtrl::SetForegroundColour(const wxColour& colour) -{ - if ( !wxWindow::SetForegroundColour(colour) ) - return false; - - Refresh(); - - return true; -} - -void wxGenericTreeCtrl::OnGetToolTip( wxTreeEvent &event ) -{ -#if wxUSE_TOOLTIPS - wxTreeItemId itemId = event.GetItem(); - const wxGenericTreeItem* const pItem = (wxGenericTreeItem*)itemId.m_pItem; - - // Check if the item fits into the client area: - if ( pItem->GetX() + pItem->GetWidth() > GetClientSize().x ) - { - // If it doesn't, show its full text in the tooltip. - event.SetLabel(pItem->GetText()); - } - else -#endif // wxUSE_TOOLTIPS - { - // veto processing the event, nixing any tooltip - event.Veto(); - } -} - - -// NOTE: If using the wxListBox visual attributes works everywhere then this can -// be removed, as well as the #else case below. -#define _USE_VISATTR 0 - -//static -wxVisualAttributes -#if _USE_VISATTR -wxGenericTreeCtrl::GetClassDefaultAttributes(wxWindowVariant variant) -#else -wxGenericTreeCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) -#endif -{ -#if _USE_VISATTR - // Use the same color scheme as wxListBox - return wxListBox::GetClassDefaultAttributes(variant); -#else - wxVisualAttributes attr; - attr.colFg = wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOXTEXT); - attr.colBg = wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX); - attr.font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); - return attr; -#endif -} - -void wxGenericTreeCtrl::DoDirtyProcessing() -{ - if (IsFrozen()) - return; - - m_dirty = false; - - CalculatePositions(); - Refresh(); - AdjustMyScrollbars(); -} - -wxSize wxGenericTreeCtrl::DoGetBestSize() const -{ - // make sure all positions are calculated as normally this only done during - // idle time but we need them for base class DoGetBestSize() to return the - // correct result - wxConstCast(this, wxGenericTreeCtrl)->CalculatePositions(); - - wxSize size = wxTreeCtrlBase::DoGetBestSize(); - - // there seems to be an implicit extra border around the items, although - // I'm not really sure where does it come from -- but without this, the - // scrollbars appear in a tree with default/best size - size.IncBy(4, 4); - - // and the border has to be rounded up to a multiple of PIXELS_PER_UNIT or - // scrollbars still appear - const wxSize& borderSize = GetWindowBorderSize(); - - int dx = (size.x - borderSize.x) % PIXELS_PER_UNIT; - if ( dx ) - size.x += PIXELS_PER_UNIT - dx; - int dy = (size.y - borderSize.y) % PIXELS_PER_UNIT; - if ( dy ) - size.y += PIXELS_PER_UNIT - dy; - - // we need to update the cache too as the base class cached its own value - CacheBestSize(size); - - return size; -} - -#endif // wxUSE_TREECTRL diff --git a/Externals/wxWidgets3/src/generic/treelist.cpp b/Externals/wxWidgets3/src/generic/treelist.cpp deleted file mode 100644 index e93a708790..0000000000 --- a/Externals/wxWidgets3/src/generic/treelist.cpp +++ /dev/null @@ -1,1686 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/generic/treelist.cpp -// Purpose: Generic wxTreeListCtrl implementation. -// Author: Vadim Zeitlin -// Created: 2011-08-19 -// Copyright: (c) 2011 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// Declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// Headers -// ---------------------------------------------------------------------------- - -// for compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_TREELISTCTRL - -#ifndef WX_PRECOMP - #include "wx/dc.h" -#endif // WX_PRECOMP - -#include "wx/treelist.h" - -#include "wx/dataview.h" -#include "wx/renderer.h" -#include "wx/scopedarray.h" -#include "wx/scopedptr.h" - -// ---------------------------------------------------------------------------- -// Constants -// ---------------------------------------------------------------------------- - -const char wxTreeListCtrlNameStr[] = "wxTreeListCtrl"; - -const wxTreeListItem wxTLI_FIRST(reinterpret_cast(-1)); -const wxTreeListItem wxTLI_LAST(reinterpret_cast(-2)); - -// ---------------------------------------------------------------------------- -// wxTreeListModelNode: a node in the internal tree representation. -// ---------------------------------------------------------------------------- - -class wxTreeListModelNode -{ -public: - wxTreeListModelNode(wxTreeListModelNode* parent, - const wxString& text = wxString(), - int imageClosed = wxWithImages::NO_IMAGE, - int imageOpened = wxWithImages::NO_IMAGE, - wxClientData* data = NULL) - : m_text(text), - m_parent(parent) - { - m_child = - m_next = NULL; - - m_imageClosed = imageClosed; - m_imageOpened = imageOpened; - - m_checkedState = wxCHK_UNCHECKED; - - m_data = data; - - m_columnsTexts = NULL; - } - - // Destroying the node also (recursively) destroys its children. - ~wxTreeListModelNode() - { - for ( wxTreeListModelNode* node = m_child; node; ) - { - wxTreeListModelNode* child = node; - node = node->m_next; - delete child; - } - - delete m_data; - - delete [] m_columnsTexts; - } - - - // Public fields for the first column text and other simple attributes: - // there is no need to have accessors/mutators for those as there is no - // encapsulation anyhow, all of those are exposed in our public API. - wxString m_text; - - int m_imageClosed, - m_imageOpened; - - wxCheckBoxState m_checkedState; - - - // Accessors for the fields that are not directly exposed. - - // Client data is owned by us so delete the old value when setting the new - // one. - wxClientData* GetClientData() const { return m_data; } - void SetClientData(wxClientData* data) { delete m_data; m_data = data; } - - // Setting or getting the non-first column text. Getting is simple but you - // need to call HasColumnsTexts() first as the column data is only - // allocated on demand. And when setting the text we require to be given - // the total number of columns as we allocate the entire array at once, - // this is more efficient than using dynamically-expandable wxVector that - // we know won't be needed as the number of columns is usually fixed. But - // if it does change, our OnInsertColumn() must be called. - // - // Notice the presence of -1 everywhere in these methods: this is because - // the text for the first column is always stored in m_text and so we don't - // store it in m_columnsTexts. - - bool HasColumnsTexts() const { return m_columnsTexts != NULL; } - const wxString& GetColumnText(unsigned col) const - { - return m_columnsTexts[col - 1]; - } - - void SetColumnText(const wxString& text, unsigned col, unsigned numColumns) - { - if ( !m_columnsTexts ) - m_columnsTexts = new wxString[numColumns - 1]; - - m_columnsTexts[col - 1] = text; - } - - void OnInsertColumn(unsigned col, unsigned numColumns) - { - wxASSERT_MSG( col, "Shouldn't be called for the first column" ); - - // Nothing to do if we don't have any text. - if ( !m_columnsTexts ) - return; - - wxScopedArray oldTexts(m_columnsTexts); - m_columnsTexts = new wxString[numColumns - 1]; - - // In the loop below n is the index in the new column texts array and m - // is the index in the old one. - for ( unsigned n = 1, m = 1; n < numColumns - 1; n++, m++ ) - { - if ( n == col ) - { - // Leave the new array text initially empty and just adjust the - // index (to compensate for "m++" done by the loop anyhow). - m--; - } - else // Not the newly inserted column. - { - // Copy the old text value. - m_columnsTexts[n - 1] = oldTexts[m - 1]; - } - } - } - - void OnDeleteColumn(unsigned col, unsigned numColumns) - { - wxASSERT_MSG( col, "Shouldn't be called for the first column" ); - - if ( !m_columnsTexts ) - return; - - wxScopedArray oldTexts(m_columnsTexts); - m_columnsTexts = new wxString[numColumns - 2]; - - // As above, n is the index in the new column texts array and m is the - // index in the old one. - for ( unsigned n = 1, m = 1; n < numColumns - 1; n++, m++ ) - { - if ( m == col ) - { - // Skip copying the deleted column and keep the new index the - // same (so compensate for "n++" done in the loop). - n--; - } - else // Not the deleted column. - { - m_columnsTexts[n - 1] = oldTexts[m - 1]; - } - } - } - - void OnClearColumns() - { - if ( m_columnsTexts ) - { - delete [] m_columnsTexts; - m_columnsTexts = NULL; - } - } - - - // Functions for modifying the tree. - - // Insert the given item as the first child of this one. The parent pointer - // must have been already set correctly at creation and we take ownership - // of the pointer and will delete it later. - void InsertChild(wxTreeListModelNode* child) - { - wxASSERT( child->m_parent == this ); - - // Our previous first child becomes the next sibling of the new child. - child->m_next = m_child; - m_child = child; - } - - // Insert the given item as our next sibling. As above, the item must have - // the correct parent pointer and we take ownership of it. - void InsertNext(wxTreeListModelNode* next) - { - wxASSERT( next->m_parent == m_parent ); - - next->m_next = m_next; - m_next = next; - } - - // Remove the first child of this item from the tree and delete it. - void DeleteChild() - { - wxTreeListModelNode* const oldChild = m_child; - m_child = m_child->m_next; - delete oldChild; - } - - // Remove the next sibling of this item from the tree and deletes it. - void DeleteNext() - { - wxTreeListModelNode* const oldNext = m_next; - m_next = m_next->m_next; - delete oldNext; - } - - - // Functions for tree traversal. All of them can return NULL. - - // Only returns NULL when called on the root item. - wxTreeListModelNode* GetParent() const { return m_parent; } - - // Returns the first child of this item. - wxTreeListModelNode* GetChild() const { return m_child; } - - // Returns the next sibling of this item. - wxTreeListModelNode* GetNext() const { return m_next; } - - // Unlike the previous two functions, this one is not a simple accessor - // (hence it's not called "GetSomething") but computes the next node after - // this one in tree order. - wxTreeListModelNode* NextInTree() const - { - if ( m_child ) - return m_child; - - if ( m_next ) - return m_next; - - // Recurse upwards until we find the next sibling. - for ( wxTreeListModelNode* node = m_parent; node; node = node->m_parent ) - { - if ( node->m_next ) - return node->m_next; - } - - return NULL; - } - - -private: - // The (never changing after creation) parent of this node and the possibly - // NULL pointers to its first child and next sibling. - wxTreeListModelNode* const m_parent; - wxTreeListModelNode* m_child; - wxTreeListModelNode* m_next; - - // Client data pointer owned by the control. May be NULL. - wxClientData* m_data; - - // Array of column values for all the columns except the first one. May be - // NULL if no values had been set for them. - wxString* m_columnsTexts; -}; - -// ---------------------------------------------------------------------------- -// wxTreeListModel: wxDataViewModel implementation used by wxTreeListCtrl. -// ---------------------------------------------------------------------------- - -class wxTreeListModel : public wxDataViewModel -{ -public: - typedef wxTreeListModelNode Node; - - // Unlike a general wxDataViewModel, this model can only be used with a - // single control at once. The main reason for this is that we need to - // support different icons for opened and closed items and the item state - // is associated with the control, not the model, so our GetValue() is also - // bound to it (otherwise, what would it return for an item expanded in one - // associated control and collapsed in another one?). - wxTreeListModel(wxTreeListCtrl* treelist); - virtual ~wxTreeListModel(); - - - // Helpers for converting between wxDataViewItem and wxTreeListItem. These - // methods simply cast the pointer to/from wxDataViewItem except for the - // root node that we handle specially unless explicitly disabled. - // - // The advantage of using them is that they're greppable and stand out - // better, hopefully making the code more clear. - Node* FromNonRootDVI(wxDataViewItem dvi) const - { - return static_cast(dvi.GetID()); - } - - Node* FromDVI(wxDataViewItem dvi) const - { - if ( !dvi.IsOk() ) - return m_root; - - return FromNonRootDVI(dvi); - } - - wxDataViewItem ToNonRootDVI(Node* node) const - { - return wxDataViewItem(node); - } - - wxDataViewItem ToDVI(Node* node) const - { - // Our root item must be represented as NULL at wxDVC level to map to - // its own invisible root. - if ( !node->GetParent() ) - return wxDataViewItem(); - - return ToNonRootDVI(node); - } - - - // Methods called by wxTreeListCtrl. - void InsertColumn(unsigned col); - void DeleteColumn(unsigned col); - void ClearColumns(); - - Node* InsertItem(Node* parent, - Node* previous, - const wxString& text, - int imageClosed, - int imageOpened, - wxClientData* data); - void DeleteItem(Node* item); - void DeleteAllItems(); - - Node* GetRootItem() const { return m_root; } - - const wxString& GetItemText(Node* item, unsigned col) const; - void SetItemText(Node* item, unsigned col, const wxString& text); - void SetItemImage(Node* item, int closed, int opened); - wxClientData* GetItemData(Node* item) const; - void SetItemData(Node* item, wxClientData* data); - - void CheckItem(Node* item, wxCheckBoxState checkedState); - void ToggleItem(wxDataViewItem item); - - - // Implement the base class pure virtual methods. - virtual unsigned GetColumnCount() const wxOVERRIDE; - virtual wxString GetColumnType(unsigned col) const wxOVERRIDE; - virtual void GetValue(wxVariant& variant, - const wxDataViewItem& item, - unsigned col) const wxOVERRIDE; - virtual bool SetValue(const wxVariant& variant, - const wxDataViewItem& item, - unsigned col) wxOVERRIDE; - virtual wxDataViewItem GetParent(const wxDataViewItem& item) const wxOVERRIDE; - virtual bool IsContainer(const wxDataViewItem& item) const wxOVERRIDE; - virtual bool HasContainerColumns(const wxDataViewItem& item) const wxOVERRIDE; - virtual unsigned GetChildren(const wxDataViewItem& item, - wxDataViewItemArray& children) const wxOVERRIDE; - virtual bool IsListModel() const wxOVERRIDE { return m_isFlat; } - virtual int Compare(const wxDataViewItem& item1, - const wxDataViewItem& item2, - unsigned col, - bool ascending) const wxOVERRIDE; - -private: - // The control we're associated with. - wxTreeListCtrl* const m_treelist; - - // The unique invisible root element. - Node* const m_root; - - // Number of columns we maintain. - unsigned m_numColumns; - - // Set to false as soon as we have more than one level, i.e. as soon as any - // items with non-root item as parent are added (and currently never reset - // after this). - bool m_isFlat; -}; - -// ============================================================================ -// wxDataViewCheckIconText[Renderer]: special renderer for our first column. -// ============================================================================ - -// Currently this class is private but it could be extracted and made part of -// public API later as could be used directly with wxDataViewCtrl as well. -namespace -{ - -const char* CHECK_ICON_TEXT_TYPE = "wxDataViewCheckIconText"; - -// The value used by wxDataViewCheckIconTextRenderer -class wxDataViewCheckIconText : public wxDataViewIconText -{ -public: - wxDataViewCheckIconText(const wxString& text = wxString(), - const wxIcon& icon = wxNullIcon, - wxCheckBoxState checkedState = wxCHK_UNDETERMINED) - : wxDataViewIconText(text, icon), - m_checkedState(checkedState) - { - } - - wxDataViewCheckIconText(const wxDataViewCheckIconText& other) - : wxDataViewIconText(other), - m_checkedState(other.m_checkedState) - { - } - - // There is no encapsulation anyhow, so just expose this field directly. - wxCheckBoxState m_checkedState; - - -private: - wxDECLARE_DYNAMIC_CLASS(wxDataViewCheckIconText); -}; - -wxIMPLEMENT_DYNAMIC_CLASS(wxDataViewCheckIconText, wxDataViewIconText); - -DECLARE_VARIANT_OBJECT(wxDataViewCheckIconText) -IMPLEMENT_VARIANT_OBJECT(wxDataViewCheckIconText) - - -class wxDataViewCheckIconTextRenderer : public wxDataViewCustomRenderer -{ -public: - wxDataViewCheckIconTextRenderer() - : wxDataViewCustomRenderer(CHECK_ICON_TEXT_TYPE, - wxDATAVIEW_CELL_ACTIVATABLE) - { - } - - virtual bool SetValue(const wxVariant& value) wxOVERRIDE - { - m_value << value; - return true; - } - - virtual bool GetValue(wxVariant& WXUNUSED(value)) const wxOVERRIDE - { - return false; - } - - wxSize GetSize() const wxOVERRIDE - { - wxSize size = GetCheckSize(); - size.x += MARGIN_CHECK_ICON; - - if ( m_value.GetIcon().IsOk() ) - { - const wxSize sizeIcon = m_value.GetIcon().GetSize(); - if ( sizeIcon.y > size.y ) - size.y = sizeIcon.y; - - size.x += sizeIcon.x + MARGIN_ICON_TEXT; - } - - wxString text = m_value.GetText(); - if ( text.empty() ) - text = "Dummy"; - - const wxSize sizeText = GetTextExtent(text); - if ( sizeText.y > size.y ) - size.y = sizeText.y; - - size.x += sizeText.x; - - return size; - } - - virtual bool Render(wxRect cell, wxDC* dc, int state) wxOVERRIDE - { - // Draw the checkbox first. - int renderFlags = 0; - switch ( m_value.m_checkedState ) - { - case wxCHK_UNCHECKED: - break; - - case wxCHK_CHECKED: - renderFlags |= wxCONTROL_CHECKED; - break; - - case wxCHK_UNDETERMINED: - renderFlags |= wxCONTROL_UNDETERMINED; - break; - } - - if ( state & wxDATAVIEW_CELL_PRELIT ) - renderFlags |= wxCONTROL_CURRENT; - - const wxSize sizeCheck = GetCheckSize(); - - wxRect rectCheck(cell.GetPosition(), sizeCheck); - rectCheck = rectCheck.CentreIn(cell, wxVERTICAL); - - wxRendererNative::Get().DrawCheckBox - ( - GetView(), *dc, rectCheck, renderFlags - ); - - // Then the icon, if any. - int xoffset = sizeCheck.x + MARGIN_CHECK_ICON; - - const wxIcon& icon = m_value.GetIcon(); - if ( icon.IsOk() ) - { - const wxSize sizeIcon = icon.GetSize(); - wxRect rectIcon(cell.GetPosition(), sizeIcon); - rectIcon.x += xoffset; - rectIcon = rectIcon.CentreIn(cell, wxVERTICAL); - - dc->DrawIcon(icon, rectIcon.GetPosition()); - - xoffset += sizeIcon.x + MARGIN_ICON_TEXT; - } - - // Finally the text. - RenderText(m_value.GetText(), xoffset, cell, dc, state); - - return true; - } - - // Event handlers toggling the items checkbox if it was clicked. - virtual bool ActivateCell(const wxRect& WXUNUSED(cell), - wxDataViewModel *model, - const wxDataViewItem & item, - unsigned int WXUNUSED(col), - const wxMouseEvent *mouseEvent) wxOVERRIDE - { - if ( mouseEvent ) - { - if ( !wxRect(GetCheckSize()).Contains(mouseEvent->GetPosition()) ) - return false; - } - - static_cast(model)->ToggleItem(item); - return true; - } - -protected: - wxSize GetCheckSize() const - { - return wxRendererNative::Get().GetCheckBoxSize(GetView()); - } - -private: - // Just some arbitrary constants defining margins, in pixels. - enum - { - MARGIN_CHECK_ICON = 3, - MARGIN_ICON_TEXT = 4 - }; - - wxDataViewCheckIconText m_value; -}; - -} // anonymous namespace - -// ============================================================================ -// wxTreeListModel implementation -// ============================================================================ - -wxTreeListModel::wxTreeListModel(wxTreeListCtrl* treelist) - : m_treelist(treelist), - m_root(new Node(NULL)) -{ - m_numColumns = 0; - m_isFlat = true; -} - -wxTreeListModel::~wxTreeListModel() -{ - delete m_root; -} - -void wxTreeListModel::InsertColumn(unsigned col) -{ - m_numColumns++; - - // There is no need to update anything when inserting the first column. - if ( m_numColumns == 1 ) - return; - - // Update all the items as they may have texts for the old columns. - for ( Node* node = m_root->GetChild(); node; node = node->NextInTree() ) - { - node->OnInsertColumn(col, m_numColumns); - } -} - -void wxTreeListModel::DeleteColumn(unsigned col) -{ - wxCHECK_RET( col < m_numColumns, "Invalid column index" ); - - // Update all the items to remove the text for the non first columns. - if ( col > 0 ) - { - for ( Node* node = m_root->GetChild(); node; node = node->NextInTree() ) - { - node->OnDeleteColumn(col, m_numColumns); - } - } - - m_numColumns--; -} - -void wxTreeListModel::ClearColumns() -{ - m_numColumns = 0; - - for ( Node* node = m_root->GetChild(); node; node = node->NextInTree() ) - { - node->OnClearColumns(); - } -} - -wxTreeListModelNode* -wxTreeListModel::InsertItem(Node* parent, - Node* previous, - const wxString& text, - int imageClosed, - int imageOpened, - wxClientData* data) -{ - wxCHECK_MSG( parent, NULL, - "Must have a valid parent (maybe GetRootItem()?)" ); - - wxCHECK_MSG( previous, NULL, - "Must have a valid previous item (maybe wxTLI_FIRST/LAST?)" ); - - if ( m_isFlat && parent != m_root ) - { - // Not flat any more, this is a second level child. - m_isFlat = false; - } - - wxScopedPtr - newItem(new Node(parent, text, imageClosed, imageOpened, data)); - - // If we have no children at all, then inserting as last child is the same - // as inserting as the first one so check for it here too. - if ( previous == wxTLI_FIRST || - (previous == wxTLI_LAST && !parent->GetChild()) ) - { - parent->InsertChild(newItem.get()); - } - else // Not the first item, find the previous one. - { - if ( previous == wxTLI_LAST ) - { - previous = parent->GetChild(); - - // Find the last child. - for ( ;; ) - { - Node* const next = previous->GetNext(); - if ( !next ) - break; - - previous = next; - } - } - else // We already have the previous item. - { - // Just check it's under the correct parent. - wxCHECK_MSG( previous->GetParent() == parent, NULL, - "Previous item is not under the right parent" ); - } - - previous->InsertNext(newItem.get()); - } - - ItemAdded(ToDVI(parent), ToDVI(newItem.get())); - - // The item was successfully inserted in the tree and so will be deleted by - // it, we can detach it now. - return newItem.release(); -} - -void wxTreeListModel::DeleteItem(Node* item) -{ - wxCHECK_RET( item, "Invalid item" ); - - wxCHECK_RET( item != m_root, "Can't delete the root item" ); - - Node* const parent = item->GetParent(); - - Node* previous = parent->GetChild(); - if ( previous == item ) - { - parent->DeleteChild(); - } - else // Not the first child of its parent. - { - // Find the sibling just before it. - for ( ;; ) - { - Node* const next = previous->GetNext(); - if ( next == item ) - break; - - wxCHECK_RET( next, "Item not a child of its parent?" ); - - previous = next; - } - - previous->DeleteNext(); - } - - // Note that the item is already deleted by now, so we can't use it in any - // way, e.g. by calling ToDVI(item) which does dereference the pointer, but - // ToNonRootDVI() that we use here does not. - ItemDeleted(ToDVI(parent), ToNonRootDVI(item)); -} - -void wxTreeListModel::DeleteAllItems() -{ - while ( m_root->GetChild() ) - { - m_root->DeleteChild(); - } - - Cleared(); -} - -const wxString& wxTreeListModel::GetItemText(Node* item, unsigned col) const -{ - // Returning root item text here is bogus, it just happens to be an always - // empty string we can return reference to. - wxCHECK_MSG( item, m_root->m_text, "Invalid item" ); - - // Notice that asking for the text of a column of an item that doesn't have - // any column texts is not an error so we simply return an empty string in - // this case. - return col == 0 ? item->m_text - : item->HasColumnsTexts() ? item->GetColumnText(col) - : m_root->m_text; -} - -void wxTreeListModel::SetItemText(Node* item, unsigned col, const wxString& text) -{ - wxCHECK_RET( item, "Invalid item" ); - - if ( col == 0 ) - item->m_text = text; - else - item->SetColumnText(text, col, m_numColumns); - - ValueChanged(ToDVI(item), col); -} - -void wxTreeListModel::SetItemImage(Node* item, int closed, int opened) -{ - wxCHECK_RET( item, "Invalid item" ); - - item->m_imageClosed = closed; - item->m_imageOpened = opened; - - ValueChanged(ToDVI(item), 0); -} - -wxClientData* wxTreeListModel::GetItemData(Node* item) const -{ - wxCHECK_MSG( item, NULL, "Invalid item" ); - - return item->GetClientData(); -} - -void wxTreeListModel::SetItemData(Node* item, wxClientData* data) -{ - wxCHECK_RET( item, "Invalid item" ); - - item->SetClientData(data); -} - -void wxTreeListModel::CheckItem(Node* item, wxCheckBoxState checkedState) -{ - wxCHECK_RET( item, "Invalid item" ); - - item->m_checkedState = checkedState; - - ItemChanged(ToDVI(item)); -} - -void wxTreeListModel::ToggleItem(wxDataViewItem dvi) -{ - Node* const item = FromDVI(dvi); - - wxCHECK_RET( item, "Invalid item" ); - - const wxCheckBoxState stateOld = item->m_checkedState; - - // If the 3rd state is user-settable then the cycle is - // unchecked->checked->undetermined. - switch ( stateOld ) - { - case wxCHK_CHECKED: - item->m_checkedState = m_treelist->HasFlag(wxTL_USER_3STATE) - ? wxCHK_UNDETERMINED - : wxCHK_UNCHECKED; - break; - - case wxCHK_UNDETERMINED: - // Whether 3rd state is user-settable or not, the next state is - // unchecked. - item->m_checkedState = wxCHK_UNCHECKED; - break; - - case wxCHK_UNCHECKED: - item->m_checkedState = wxCHK_CHECKED; - break; - } - - ItemChanged(ToDVI(item)); - - m_treelist->OnItemToggled(item, stateOld); -} - -unsigned wxTreeListModel::GetColumnCount() const -{ - return m_numColumns; -} - -wxString wxTreeListModel::GetColumnType(unsigned col) const -{ - if ( col == 0 ) - { - return m_treelist->HasFlag(wxTL_CHECKBOX) - ? wxS("wxDataViewCheckIconText") - : wxS("wxDataViewIconText"); - } - else // All the other columns contain just text. - { - return wxS("string"); - } -} - -void -wxTreeListModel::GetValue(wxVariant& variant, - const wxDataViewItem& item, - unsigned col) const -{ - Node* const node = FromDVI(item); - - if ( col == 0 ) - { - // Determine the correct image to use depending on the item state. - int image = wxWithImages::NO_IMAGE; - if ( m_treelist->IsExpanded(node) ) - image = node->m_imageOpened; - - if ( image == wxWithImages::NO_IMAGE ) - image = node->m_imageClosed; - - wxIcon icon = m_treelist->GetImage(image); - - if ( m_treelist->HasFlag(wxTL_CHECKBOX) ) - variant << wxDataViewCheckIconText(node->m_text, icon, - node->m_checkedState); - else - variant << wxDataViewIconText(node->m_text, icon); - } - else - { - // Notice that we must still assign wxString to wxVariant to ensure - // that it at least has the correct type. - wxString text; - if ( node->HasColumnsTexts() ) - text = node->GetColumnText(col); - - variant = text; - } -} - -bool -wxTreeListModel::SetValue(const wxVariant& WXUNUSED(variant), - const wxDataViewItem& WXUNUSED(item), - unsigned WXUNUSED(col)) -{ - // We are not editable currently. - return false; -} - -wxDataViewItem wxTreeListModel::GetParent(const wxDataViewItem& item) const -{ - Node* const node = FromDVI(item); - - return ToDVI(node->GetParent()); -} - -bool wxTreeListModel::IsContainer(const wxDataViewItem& item) const -{ - // FIXME: In the generic (and native OS X) versions we implement this - // method normally, i.e. only items with children are containers. - // But for the native GTK version we must pretend that all items are - // containers because otherwise adding children to them later would - // fail because wxGTK code calls IsContainer() too early (when - // adding the item itself) and we can't know whether we're container - // or not by then. Luckily, always returning true doesn't have any - // serious drawbacks for us. -#ifdef __WXGTK__ - wxUnusedVar(item); - - return true; -#else - Node* const node = FromDVI(item); - - return node->GetChild() != NULL; -#endif -} - -bool -wxTreeListModel::HasContainerColumns(const wxDataViewItem& WXUNUSED(item)) const -{ - return true; -} - -unsigned -wxTreeListModel::GetChildren(const wxDataViewItem& item, - wxDataViewItemArray& children) const -{ - Node* const node = FromDVI(item); - - unsigned numChildren = 0; - for ( Node* child = node->GetChild(); child; child = child->GetNext() ) - { - children.push_back(ToDVI(child)); - numChildren++; - } - - return numChildren; -} - -int -wxTreeListModel::Compare(const wxDataViewItem& item1, - const wxDataViewItem& item2, - unsigned col, - bool ascending) const -{ - // Compare using default alphabetical order if no custom comparator. - wxTreeListItemComparator* const comp = m_treelist->m_comparator; - if ( !comp ) - return wxDataViewModel::Compare(item1, item2, col, ascending); - - // Forward comparison to the comparator: - int result = comp->Compare(m_treelist, col, FromDVI(item1), FromDVI(item2)); - - // And adjust by the sort order if necessary. - if ( !ascending ) - result = -result; - - return result; -} - -// ============================================================================ -// wxTreeListCtrl implementation -// ============================================================================ - -wxBEGIN_EVENT_TABLE(wxTreeListCtrl, wxWindow) - EVT_DATAVIEW_SELECTION_CHANGED(wxID_ANY, wxTreeListCtrl::OnSelectionChanged) - EVT_DATAVIEW_ITEM_EXPANDING(wxID_ANY, wxTreeListCtrl::OnItemExpanding) - EVT_DATAVIEW_ITEM_EXPANDED(wxID_ANY, wxTreeListCtrl::OnItemExpanded) - EVT_DATAVIEW_ITEM_ACTIVATED(wxID_ANY, wxTreeListCtrl::OnItemActivated) - EVT_DATAVIEW_ITEM_CONTEXT_MENU(wxID_ANY, wxTreeListCtrl::OnItemContextMenu) - EVT_DATAVIEW_COLUMN_SORTED(wxID_ANY, wxTreeListCtrl::OnColumnSorted) - - EVT_SIZE(wxTreeListCtrl::OnSize) -wxEND_EVENT_TABLE() - -// ---------------------------------------------------------------------------- -// Creation -// ---------------------------------------------------------------------------- - -void wxTreeListCtrl::Init() -{ - m_view = NULL; - m_model = NULL; - m_comparator = NULL; -} - -bool wxTreeListCtrl::Create(wxWindow* parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) -{ - if ( style & wxTL_USER_3STATE ) - style |= wxTL_3STATE; - - if ( style & wxTL_3STATE ) - style |= wxTL_CHECKBOX; - - // Create the window itself and wxDataViewCtrl used by it. - if ( !wxWindow::Create(parent, id, - pos, size, - style, name) ) - { - return false; - } - - m_view = new wxDataViewCtrl; - long styleDataView = HasFlag(wxTL_MULTIPLE) ? wxDV_MULTIPLE - : wxDV_SINGLE; - if ( HasFlag(wxTL_NO_HEADER) ) - styleDataView |= wxDV_NO_HEADER; - - if ( !m_view->Create(this, wxID_ANY, - wxPoint(0, 0), GetClientSize(), - styleDataView) ) - { - delete m_view; - m_view = NULL; - - return false; - } - - - // Set up the model for wxDataViewCtrl. - m_model = new wxTreeListModel(this); - m_view->AssociateModel(m_model); - - return true; -} - -wxTreeListCtrl::~wxTreeListCtrl() -{ - if ( m_model ) - m_model->DecRef(); -} - -wxWindowList wxTreeListCtrl::GetCompositeWindowParts() const -{ - wxWindowList parts; - parts.push_back(m_view); - return parts; -} - -// ---------------------------------------------------------------------------- -// Columns -// ---------------------------------------------------------------------------- - -int -wxTreeListCtrl::DoInsertColumn(const wxString& title, - int pos, - int width, - wxAlignment align, - int flags) -{ - wxCHECK_MSG( m_view, wxNOT_FOUND, "Must Create() first" ); - - const unsigned oldNumColumns = m_view->GetColumnCount(); - - if ( pos == wxNOT_FOUND ) - pos = oldNumColumns; - - wxDataViewRenderer* renderer; - if ( pos == 0 ) - { - // Inserting the first column which is special as it uses a different - // renderer. - - // Also, currently it can be done only once. - wxCHECK_MSG( !oldNumColumns, wxNOT_FOUND, - "Inserting column at position 0 currently not supported" ); - - if ( HasFlag(wxTL_CHECKBOX) ) - { - // Use our custom renderer to show the checkbox. - renderer = new wxDataViewCheckIconTextRenderer; - } - else // We still need a special renderer to show the icons. - { - renderer = new wxDataViewIconTextRenderer; - } - } - else // Not the first column. - { - // All the other ones use a simple text renderer. - renderer = new wxDataViewTextRenderer; - } - - wxDataViewColumn* - column = new wxDataViewColumn(title, renderer, pos, width, align, flags); - - m_model->InsertColumn(pos); - - m_view->InsertColumn(pos, column); - - return pos; -} - -unsigned wxTreeListCtrl::GetColumnCount() const -{ - return m_view ? m_view->GetColumnCount() : 0u; -} - -bool wxTreeListCtrl::DeleteColumn(unsigned col) -{ - wxCHECK_MSG( col < GetColumnCount(), false, "Invalid column index" ); - - if ( !m_view->DeleteColumn(m_view->GetColumn(col)) ) - return false; - - m_model->DeleteColumn(col); - - return true; -} - -void wxTreeListCtrl::ClearColumns() -{ - // Don't assert here, clearing columns of the control before it's created - // can be considered valid (just useless). - if ( !m_model ) - return; - - m_view->ClearColumns(); - - m_model->ClearColumns(); -} - -void wxTreeListCtrl::SetColumnWidth(unsigned col, int width) -{ - wxCHECK_RET( col < GetColumnCount(), "Invalid column index" ); - - wxDataViewColumn* const column = m_view->GetColumn(col); - wxCHECK_RET( column, "No such column?" ); - - column->SetWidth(width); -} - -int wxTreeListCtrl::GetColumnWidth(unsigned col) const -{ - wxCHECK_MSG( col < GetColumnCount(), -1, "Invalid column index" ); - - wxDataViewColumn* column = m_view->GetColumn(col); - wxCHECK_MSG( column, -1, "No such column?" ); - - return column->GetWidth(); -} - -int wxTreeListCtrl::WidthFor(const wxString& text) const -{ - return GetTextExtent(text).x; -} - -// ---------------------------------------------------------------------------- -// Items -// ---------------------------------------------------------------------------- - -wxTreeListItem -wxTreeListCtrl::DoInsertItem(wxTreeListItem parent, - wxTreeListItem previous, - const wxString& text, - int imageClosed, - int imageOpened, - wxClientData* data) -{ - wxCHECK_MSG( m_model, wxTreeListItem(), "Must create first" ); - - return wxTreeListItem(m_model->InsertItem(parent, previous, text, - imageClosed, imageOpened, data)); -} - -void wxTreeListCtrl::DeleteItem(wxTreeListItem item) -{ - wxCHECK_RET( m_model, "Must create first" ); - - m_model->DeleteItem(item); -} - -void wxTreeListCtrl::DeleteAllItems() -{ - if ( m_model ) - m_model->DeleteAllItems(); -} - -// ---------------------------------------------------------------------------- -// Tree navigation -// ---------------------------------------------------------------------------- - -// The simple accessors in this section are implemented directly using -// wxTreeListModelNode methods, without passing by the model. This is just a -// shortcut and avoids us the trouble of defining more trivial methods in -// wxTreeListModel. - -wxTreeListItem wxTreeListCtrl::GetRootItem() const -{ - wxCHECK_MSG( m_model, wxTreeListItem(), "Must create first" ); - - return m_model->GetRootItem(); -} - -wxTreeListItem wxTreeListCtrl::GetItemParent(wxTreeListItem item) const -{ - wxCHECK_MSG( item.IsOk(), wxTreeListItem(), "Invalid item" ); - - return item->GetParent(); -} - -wxTreeListItem wxTreeListCtrl::GetFirstChild(wxTreeListItem item) const -{ - wxCHECK_MSG( item.IsOk(), wxTreeListItem(), "Invalid item" ); - - return item->GetChild(); -} - -wxTreeListItem -wxTreeListCtrl::GetNextSibling(wxTreeListItem item) const -{ - wxCHECK_MSG( item.IsOk(), wxTreeListItem(), "Invalid item" ); - - return item->GetNext(); -} - -wxTreeListItem wxTreeListCtrl::GetNextItem(wxTreeListItem item) const -{ - wxCHECK_MSG( item.IsOk(), wxTreeListItem(), "Invalid item" ); - - return item->NextInTree(); -} - -// ---------------------------------------------------------------------------- -// Item attributes -// ---------------------------------------------------------------------------- - -const wxString& -wxTreeListCtrl::GetItemText(wxTreeListItem item, unsigned col) const -{ - // We can't use wxCHECK_MSG() here because we don't have any empty string - // reference to return so we use a static variable that exists just for the - // purpose of this check -- and so we put it in its own scope so that it's - // never even created during normal program execution. - if ( !m_model || col >= m_model->GetColumnCount() ) - { - static wxString s_empty; - - if ( !m_model ) - { - wxFAIL_MSG( "Must create first" ); - } - else if ( col >= m_model->GetColumnCount() ) - { - wxFAIL_MSG( "Invalid column index" ); - } - - return s_empty; - } - - return m_model->GetItemText(item, col); -} - -void -wxTreeListCtrl::SetItemText(wxTreeListItem item, - unsigned col, - const wxString& text) -{ - wxCHECK_RET( m_model, "Must create first" ); - wxCHECK_RET( col < m_model->GetColumnCount(), "Invalid column index" ); - - m_model->SetItemText(item, col, text); -} - -void wxTreeListCtrl::SetItemImage(wxTreeListItem item, int closed, int opened) -{ - wxCHECK_RET( m_model, "Must create first" ); - - if ( closed != NO_IMAGE || opened != NO_IMAGE ) - { - wxImageList* const imageList = GetImageList(); - wxCHECK_RET( imageList, "Can't set images without image list" ); - - const int imageCount = imageList->GetImageCount(); - - wxCHECK_RET( closed < imageCount, "Invalid image index" ); - wxCHECK_RET( opened < imageCount, "Invalid opened image index" ); - } - - m_model->SetItemImage(item, closed, opened); -} - -wxClientData* wxTreeListCtrl::GetItemData(wxTreeListItem item) const -{ - wxCHECK_MSG( m_model, NULL, "Must create first" ); - - return m_model->GetItemData(item); -} - -void wxTreeListCtrl::SetItemData(wxTreeListItem item, wxClientData* data) -{ - wxCHECK_RET( m_model, "Must create first" ); - - m_model->SetItemData(item, data); -} - -// ---------------------------------------------------------------------------- -// Expanding and collapsing -// ---------------------------------------------------------------------------- - -void wxTreeListCtrl::Expand(wxTreeListItem item) -{ - wxCHECK_RET( m_view, "Must create first" ); - - m_view->Expand(m_model->ToDVI(item)); -} - -void wxTreeListCtrl::Collapse(wxTreeListItem item) -{ - wxCHECK_RET( m_view, "Must create first" ); - - m_view->Collapse(m_model->ToDVI(item)); -} - -bool wxTreeListCtrl::IsExpanded(wxTreeListItem item) const -{ - wxCHECK_MSG( m_view, false, "Must create first" ); - - return m_view->IsExpanded(m_model->ToDVI(item)); -} - -// ---------------------------------------------------------------------------- -// Selection -// ---------------------------------------------------------------------------- - -wxTreeListItem wxTreeListCtrl::GetSelection() const -{ - wxCHECK_MSG( m_view, wxTreeListItem(), "Must create first" ); - - wxCHECK_MSG( !HasFlag(wxTL_MULTIPLE), wxTreeListItem(), - "Must use GetSelections() with multi-selection controls!" ); - - const wxDataViewItem dvi = m_view->GetSelection(); - - return m_model->FromNonRootDVI(dvi); -} - -unsigned wxTreeListCtrl::GetSelections(wxTreeListItems& selections) const -{ - wxCHECK_MSG( m_view, 0, "Must create first" ); - - wxDataViewItemArray selectionsDV; - const unsigned numSelected = m_view->GetSelections(selectionsDV); - selections.resize(numSelected); - for ( unsigned n = 0; n < numSelected; n++ ) - selections[n] = m_model->FromNonRootDVI(selectionsDV[n]); - - return numSelected; -} - -void wxTreeListCtrl::Select(wxTreeListItem item) -{ - wxCHECK_RET( m_view, "Must create first" ); - - m_view->Select(m_model->ToNonRootDVI(item)); -} - -void wxTreeListCtrl::Unselect(wxTreeListItem item) -{ - wxCHECK_RET( m_view, "Must create first" ); - - m_view->Unselect(m_model->ToNonRootDVI(item)); -} - -bool wxTreeListCtrl::IsSelected(wxTreeListItem item) const -{ - wxCHECK_MSG( m_view, false, "Must create first" ); - - return m_view->IsSelected(m_model->ToNonRootDVI(item)); -} - -void wxTreeListCtrl::SelectAll() -{ - wxCHECK_RET( m_view, "Must create first" ); - - m_view->SelectAll(); -} - -void wxTreeListCtrl::UnselectAll() -{ - wxCHECK_RET( m_view, "Must create first" ); - - m_view->UnselectAll(); -} - -void wxTreeListCtrl::EnsureVisible(wxTreeListItem item) -{ - wxCHECK_RET( m_view, "Must create first" ); - - m_view->EnsureVisible(m_model->ToDVI(item)); -} - - -// ---------------------------------------------------------------------------- -// Checkbox handling -// ---------------------------------------------------------------------------- - -void wxTreeListCtrl::CheckItem(wxTreeListItem item, wxCheckBoxState state) -{ - wxCHECK_RET( m_model, "Must create first" ); - - m_model->CheckItem(item, state); -} - -void -wxTreeListCtrl::CheckItemRecursively(wxTreeListItem item, wxCheckBoxState state) -{ - wxCHECK_RET( m_model, "Must create first" ); - - m_model->CheckItem(item, state); - - for ( wxTreeListItem child = GetFirstChild(item); - child.IsOk(); - child = GetNextSibling(child) ) - { - CheckItemRecursively(child, state); - } -} - -void wxTreeListCtrl::UpdateItemParentStateRecursively(wxTreeListItem item) -{ - wxCHECK_RET( item.IsOk(), "Invalid item" ); - - wxASSERT_MSG( HasFlag(wxTL_3STATE), "Can only be used with wxTL_3STATE" ); - - for ( ;; ) - { - wxTreeListItem parent = GetItemParent(item); - if ( parent == GetRootItem() ) - { - // There is no checked state associated with the root item. - return; - } - - // Set parent state to the state of this item if all the other children - // have the same state too. Otherwise make it indeterminate. - const wxCheckBoxState stateItem = GetCheckedState(item); - CheckItem(parent, AreAllChildrenInState(parent, stateItem) - ? stateItem - : wxCHK_UNDETERMINED); - - // And do the same thing with the parent's parent too. - item = parent; - } -} - -wxCheckBoxState wxTreeListCtrl::GetCheckedState(wxTreeListItem item) const -{ - wxCHECK_MSG( item.IsOk(), wxCHK_UNDETERMINED, "Invalid item" ); - - return item->m_checkedState; -} - -bool -wxTreeListCtrl::AreAllChildrenInState(wxTreeListItem item, - wxCheckBoxState state) const -{ - wxCHECK_MSG( item.IsOk(), false, "Invalid item" ); - - for ( wxTreeListItem child = GetFirstChild(item); - child.IsOk(); - child = GetNextSibling(child) ) - { - if ( GetCheckedState(child) != state ) - return false; - } - - return true; -} - -// ---------------------------------------------------------------------------- -// Sorting -// ---------------------------------------------------------------------------- - -void wxTreeListCtrl::SetSortColumn(unsigned col, bool ascendingOrder) -{ - wxCHECK_RET( col < m_view->GetColumnCount(), "Invalid column index" ); - - m_view->GetColumn(col)->SetSortOrder(ascendingOrder); -} - -bool wxTreeListCtrl::GetSortColumn(unsigned* col, bool* ascendingOrder) -{ - const unsigned numColumns = m_view->GetColumnCount(); - for ( unsigned n = 0; n < numColumns; n++ ) - { - wxDataViewColumn* const column = m_view->GetColumn(n); - if ( column->IsSortKey() ) - { - if ( col ) - *col = n; - - if ( ascendingOrder ) - *ascendingOrder = column->IsSortOrderAscending(); - - return true; - } - } - - return false; -} - -void wxTreeListCtrl::SetItemComparator(wxTreeListItemComparator* comparator) -{ - m_comparator = comparator; -} - -// ---------------------------------------------------------------------------- -// Events -// ---------------------------------------------------------------------------- - -void wxTreeListCtrl::SendItemEvent(wxEventType evt, wxDataViewEvent& eventDV) -{ - wxTreeListEvent eventTL(evt, this, m_model->FromDVI(eventDV.GetItem())); - - if ( !ProcessWindowEvent(eventTL) ) - { - eventDV.Skip(); - return; - } - - if ( !eventTL.IsAllowed() ) - { - eventDV.Veto(); - } -} - -void wxTreeListCtrl::SendColumnEvent(wxEventType evt, wxDataViewEvent& eventDV) -{ - wxTreeListEvent eventTL(evt, this, wxTreeListItem()); - eventTL.SetColumn(eventDV.GetColumn()); - - if ( !ProcessWindowEvent(eventTL) ) - { - eventDV.Skip(); - return; - } - - if ( !eventTL.IsAllowed() ) - { - eventDV.Veto(); - } -} - -void -wxTreeListCtrl::OnItemToggled(wxTreeListItem item, wxCheckBoxState stateOld) -{ - wxTreeListEvent event(wxEVT_TREELIST_ITEM_CHECKED, this, item); - event.SetOldCheckedState(stateOld); - - ProcessWindowEvent(event); -} - -void wxTreeListCtrl::OnSelectionChanged(wxDataViewEvent& event) -{ - SendItemEvent(wxEVT_TREELIST_SELECTION_CHANGED, event); -} - -void wxTreeListCtrl::OnItemExpanding(wxDataViewEvent& event) -{ - SendItemEvent(wxEVT_TREELIST_ITEM_EXPANDING, event); -} - -void wxTreeListCtrl::OnItemExpanded(wxDataViewEvent& event) -{ - SendItemEvent(wxEVT_TREELIST_ITEM_EXPANDED, event); -} - -void wxTreeListCtrl::OnItemActivated(wxDataViewEvent& event) -{ - SendItemEvent(wxEVT_TREELIST_ITEM_ACTIVATED, event); -} - -void wxTreeListCtrl::OnItemContextMenu(wxDataViewEvent& event) -{ - SendItemEvent(wxEVT_TREELIST_ITEM_CONTEXT_MENU, event); -} - -void wxTreeListCtrl::OnColumnSorted(wxDataViewEvent& event) -{ - SendColumnEvent(wxEVT_TREELIST_COLUMN_SORTED, event); -} - -// ---------------------------------------------------------------------------- -// Geometry -// ---------------------------------------------------------------------------- - -void wxTreeListCtrl::OnSize(wxSizeEvent& event) -{ - event.Skip(); - - if ( m_view ) - { - // Resize the real control to cover our entire client area. - const wxRect rect = GetClientRect(); - m_view->SetSize(rect); - -#ifdef wxHAS_GENERIC_DATAVIEWCTRL - // The generic implementation doesn't refresh itself immediately which - // is annoying during "live resizing", so do it forcefully here to - // ensure that the items are re-laid out and the focus rectangle is - // redrawn correctly (instead of leaving traces) while our size is - // being changed. - wxWindow* const view = GetView(); - view->Refresh(); - view->Update(); -#endif // wxHAS_GENERIC_DATAVIEWCTRL - - // Resize the first column to take the remaining available space. - const unsigned numColumns = GetColumnCount(); - if ( !numColumns ) - return; - - // There is a bug in generic wxDataViewCtrl: if the column width sums - // up to the total size, horizontal scrollbar (unnecessarily) appears, - // so subtract a bit to ensure this doesn't happen. - int remainingWidth = rect.width - 5; - for ( unsigned n = 1; n < GetColumnCount(); n++ ) - { - remainingWidth -= GetColumnWidth(n); - if ( remainingWidth <= 0 ) - { - // There is not enough space, as we're not going to give the - // first column negative width anyhow, just don't do anything. - return; - } - } - - SetColumnWidth(0, remainingWidth); - } -} - -wxWindow* wxTreeListCtrl::GetView() const -{ -#ifdef wxHAS_GENERIC_DATAVIEWCTRL - return m_view->GetMainWindow(); -#else - return m_view; -#endif -} - -// ============================================================================ -// wxTreeListEvent implementation -// ============================================================================ - -wxIMPLEMENT_DYNAMIC_CLASS(wxTreeListEvent, wxNotifyEvent); - -#define wxDEFINE_TREELIST_EVENT(name) \ - wxDEFINE_EVENT(wxEVT_TREELIST_##name, wxTreeListEvent) - -wxDEFINE_TREELIST_EVENT(SELECTION_CHANGED); -wxDEFINE_TREELIST_EVENT(ITEM_EXPANDING); -wxDEFINE_TREELIST_EVENT(ITEM_EXPANDED); -wxDEFINE_TREELIST_EVENT(ITEM_CHECKED); -wxDEFINE_TREELIST_EVENT(ITEM_ACTIVATED); -wxDEFINE_TREELIST_EVENT(ITEM_CONTEXT_MENU); -wxDEFINE_TREELIST_EVENT(COLUMN_SORTED); - -#undef wxDEFINE_TREELIST_EVENT - -#endif // wxUSE_TREELISTCTRL diff --git a/Externals/wxWidgets3/src/generic/vlbox.cpp b/Externals/wxWidgets3/src/generic/vlbox.cpp deleted file mode 100644 index 60c524dbd2..0000000000 --- a/Externals/wxWidgets3/src/generic/vlbox.cpp +++ /dev/null @@ -1,740 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/generic/vlbox.cpp -// Purpose: implementation of wxVListBox -// Author: Vadim Zeitlin -// Modified by: -// Created: 31.05.03 -// Copyright: (c) 2003 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_LISTBOX - -#include "wx/vlbox.h" - -#ifndef WX_PRECOMP - #include "wx/settings.h" - #include "wx/dcclient.h" - #include "wx/listbox.h" -#endif //WX_PRECOMP - -#include "wx/dcbuffer.h" -#include "wx/selstore.h" -#include "wx/renderer.h" - -// ---------------------------------------------------------------------------- -// event tables -// ---------------------------------------------------------------------------- - -wxBEGIN_EVENT_TABLE(wxVListBox, wxVScrolledWindow) - EVT_PAINT(wxVListBox::OnPaint) - - EVT_KEY_DOWN(wxVListBox::OnKeyDown) - EVT_LEFT_DOWN(wxVListBox::OnLeftDown) - EVT_LEFT_DCLICK(wxVListBox::OnLeftDClick) - - EVT_SET_FOCUS(wxVListBox::OnSetOrKillFocus) - EVT_KILL_FOCUS(wxVListBox::OnSetOrKillFocus) - - EVT_SIZE(wxVListBox::OnSize) -wxEND_EVENT_TABLE() - -// ============================================================================ -// implementation -// ============================================================================ - -wxIMPLEMENT_ABSTRACT_CLASS(wxVListBox, wxVScrolledWindow); -const char wxVListBoxNameStr[] = "wxVListBox"; - -// ---------------------------------------------------------------------------- -// wxVListBox creation -// ---------------------------------------------------------------------------- - -void wxVListBox::Init() -{ - m_current = - m_anchor = wxNOT_FOUND; - m_selStore = NULL; -} - -bool wxVListBox::Create(wxWindow *parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) -{ -#ifdef __WXMSW__ - if ( (style & wxBORDER_MASK) == wxDEFAULT ) - style |= wxBORDER_THEME; -#endif - - style |= wxWANTS_CHARS | wxFULL_REPAINT_ON_RESIZE; - if ( !wxVScrolledWindow::Create(parent, id, pos, size, style, name) ) - return false; - - if ( style & wxLB_MULTIPLE ) - m_selStore = new wxSelectionStore; - - // make sure the native widget has the right colour since we do - // transparent drawing by default - SetBackgroundColour(GetBackgroundColour()); - - // leave m_colBgSel in an invalid state: it means for OnDrawBackground() - // to use wxRendererNative instead of painting selection bg ourselves - m_colBgSel = wxNullColour; - - // flicker-free drawing requires this - SetBackgroundStyle(wxBG_STYLE_CUSTOM); - - return true; -} - -wxVListBox::~wxVListBox() -{ - delete m_selStore; -} - -void wxVListBox::SetItemCount(size_t count) -{ - // don't leave the current index invalid - if ( m_current != wxNOT_FOUND && (size_t)m_current >= count ) - m_current = count - 1; // also ok when count == 0 as wxNOT_FOUND == -1 - - if ( m_selStore ) - { - // tell the selection store that our number of items has changed - m_selStore->SetItemCount(count); - } - - SetRowCount(count); -} - -// ---------------------------------------------------------------------------- -// selection handling -// ---------------------------------------------------------------------------- - -bool wxVListBox::IsSelected(size_t line) const -{ - return m_selStore ? m_selStore->IsSelected(line) : (int)line == m_current; -} - -bool wxVListBox::Select(size_t item, bool select) -{ - wxCHECK_MSG( m_selStore, false, - wxT("Select() may only be used with multiselection listbox") ); - - wxCHECK_MSG( item < GetItemCount(), false, - wxT("Select(): invalid item index") ); - - bool changed = m_selStore->SelectItem(item, select); - if ( changed ) - { - // selection really changed - RefreshRow(item); - } - - DoSetCurrent(item); - - return changed; -} - -bool wxVListBox::SelectRange(size_t from, size_t to) -{ - wxCHECK_MSG( m_selStore, false, - wxT("SelectRange() may only be used with multiselection listbox") ); - - // make sure items are in correct order - if ( from > to ) - { - size_t tmp = from; - from = to; - to = tmp; - } - - wxCHECK_MSG( to < GetItemCount(), false, - wxT("SelectRange(): invalid item index") ); - - wxArrayInt changed; - if ( !m_selStore->SelectRange(from, to, true, &changed) ) - { - // too many items have changed, we didn't record them in changed array - // so we have no choice but to refresh everything between from and to - RefreshRows(from, to); - } - else // we've got the indices of the changed items - { - const size_t count = changed.GetCount(); - if ( !count ) - { - // nothing changed - return false; - } - - // refresh just the lines which have really changed - for ( size_t n = 0; n < count; n++ ) - { - RefreshRow(changed[n]); - } - } - - // something changed - return true; -} - -bool wxVListBox::DoSelectAll(bool select) -{ - wxCHECK_MSG( m_selStore, false, - wxT("SelectAll may only be used with multiselection listbox") ); - - size_t count = GetItemCount(); - if ( count ) - { - wxArrayInt changed; - if ( !m_selStore->SelectRange(0, count - 1, select) || - !changed.IsEmpty() ) - { - Refresh(); - - // something changed - return true; - } - } - - return false; -} - -bool wxVListBox::DoSetCurrent(int current) -{ - wxASSERT_MSG( current == wxNOT_FOUND || - (current >= 0 && (size_t)current < GetItemCount()), - wxT("wxVListBox::DoSetCurrent(): invalid item index") ); - - if ( current == m_current ) - { - // nothing to do - return false; - } - - if ( m_current != wxNOT_FOUND ) - RefreshRow(m_current); - - m_current = current; - - if ( m_current != wxNOT_FOUND ) - { - // if the line is not visible at all, we scroll it into view but we - // don't need to refresh it -- it will be redrawn anyhow - if ( !IsVisible(m_current) ) - { - ScrollToRow(m_current); - } - else // line is at least partly visible - { - // it is, indeed, only partly visible, so scroll it into view to - // make it entirely visible - // BUT scrolling down when m_current is first visible makes it - // completely hidden, so that is even worse - while ( (size_t)m_current + 1 == GetVisibleRowsEnd() && - (size_t)m_current != GetVisibleRowsBegin() && - ScrollToRow(GetVisibleBegin() + 1) ) ; - - // but in any case refresh it as even if it was only partly visible - // before we need to redraw it entirely as its background changed - RefreshRow(m_current); - } - } - - return true; -} - -void wxVListBox::InitEvent(wxCommandEvent& event, int n) -{ - event.SetEventObject(this); - event.SetInt(n); -} - -void wxVListBox::SendSelectedEvent() -{ - wxASSERT_MSG( m_current != wxNOT_FOUND, - wxT("SendSelectedEvent() shouldn't be called") ); - - wxCommandEvent event(wxEVT_LISTBOX, GetId()); - InitEvent(event, m_current); - (void)GetEventHandler()->ProcessEvent(event); -} - -void wxVListBox::SetSelection(int selection) -{ - wxCHECK_RET( selection == wxNOT_FOUND || - (selection >= 0 && (size_t)selection < GetItemCount()), - wxT("wxVListBox::SetSelection(): invalid item index") ); - - if ( HasMultipleSelection() ) - { - if (selection != wxNOT_FOUND) - Select(selection); - else - DeselectAll(); - m_anchor = selection; - } - - DoSetCurrent(selection); -} - -size_t wxVListBox::GetSelectedCount() const -{ - return m_selStore ? m_selStore->GetSelectedCount() - : m_current == wxNOT_FOUND ? 0 : 1; -} - -int wxVListBox::GetFirstSelected(unsigned long& cookie) const -{ - cookie = 0; - - return GetNextSelected(cookie); -} - -int wxVListBox::GetNextSelected(unsigned long& cookie) const -{ - wxCHECK_MSG( m_selStore, wxNOT_FOUND, - wxT("GetFirst/NextSelected() may only be used with multiselection listboxes") ); - - while ( cookie < GetItemCount() ) - { - if ( IsSelected(cookie++) ) - return cookie - 1; - } - - return wxNOT_FOUND; -} - -void wxVListBox::RefreshSelected() -{ - // only refresh those items which are currently visible and selected: - for ( size_t n = GetVisibleBegin(), end = GetVisibleEnd(); n < end; n++ ) - { - if ( IsSelected(n) ) - RefreshRow(n); - } -} - -wxRect wxVListBox::GetItemRect(size_t n) const -{ - wxRect itemrect; - - // check that this item is visible - const size_t lineMax = GetVisibleEnd(); - if ( n >= lineMax ) - return itemrect; - size_t line = GetVisibleBegin(); - if ( n < line ) - return itemrect; - - while ( line <= n ) - { - itemrect.y += itemrect.height; - itemrect.height = OnGetRowHeight(line); - - line++; - } - - itemrect.width = GetClientSize().x; - - return itemrect; -} - -// ---------------------------------------------------------------------------- -// wxVListBox appearance parameters -// ---------------------------------------------------------------------------- - -void wxVListBox::SetMargins(const wxPoint& pt) -{ - if ( pt != m_ptMargins ) - { - m_ptMargins = pt; - - Refresh(); - } -} - -void wxVListBox::SetSelectionBackground(const wxColour& col) -{ - m_colBgSel = col; -} - -// ---------------------------------------------------------------------------- -// wxVListBox painting -// ---------------------------------------------------------------------------- - -wxCoord wxVListBox::OnGetRowHeight(size_t line) const -{ - return OnMeasureItem(line) + 2*m_ptMargins.y; -} - -void wxVListBox::OnDrawSeparator(wxDC& WXUNUSED(dc), - wxRect& WXUNUSED(rect), - size_t WXUNUSED(n)) const -{ -} - -bool -wxVListBox::DoDrawSolidBackground(const wxColour& col, - wxDC& dc, - const wxRect& rect, - size_t n) const -{ - if ( !col.IsOk() ) - return false; - - // we need to render selected and current items differently - const bool isSelected = IsSelected(n), - isCurrent = IsCurrent(n); - if ( isSelected || isCurrent ) - { - if ( isSelected ) - { - dc.SetBrush(wxBrush(col, wxBRUSHSTYLE_SOLID)); - } - else // !selected - { - dc.SetBrush(*wxTRANSPARENT_BRUSH); - } - dc.SetPen(*(isCurrent ? wxBLACK_PEN : wxTRANSPARENT_PEN)); - dc.DrawRectangle(rect); - } - //else: do nothing for the normal items - - return true; -} - -void wxVListBox::OnDrawBackground(wxDC& dc, const wxRect& rect, size_t n) const -{ - // use wxRendererNative for more native look unless we use custom bg colour - if ( !DoDrawSolidBackground(m_colBgSel, dc, rect, n) ) - { - int flags = 0; - if ( IsSelected(n) ) - flags |= wxCONTROL_SELECTED; - if ( IsCurrent(n) ) - flags |= wxCONTROL_CURRENT; - if ( wxWindow::FindFocus() == const_cast(this) ) - flags |= wxCONTROL_FOCUSED; - - wxRendererNative::Get().DrawItemSelectionRect( - const_cast(this), dc, rect, flags); - } -} - -void wxVListBox::OnPaint(wxPaintEvent& WXUNUSED(event)) -{ - wxSize clientSize = GetClientSize(); - - wxAutoBufferedPaintDC dc(this); - - // the update rectangle - wxRect rectUpdate = GetUpdateClientRect(); - - // fill it with background colour - dc.SetBackground(GetBackgroundColour()); - dc.Clear(); - - // the bounding rectangle of the current line - wxRect rectRow; - rectRow.width = clientSize.x; - - // iterate over all visible lines - const size_t lineMax = GetVisibleEnd(); - for ( size_t line = GetVisibleBegin(); line < lineMax; line++ ) - { - const wxCoord hRow = OnGetRowHeight(line); - - rectRow.height = hRow; - - // and draw the ones which intersect the update rect - if ( rectRow.Intersects(rectUpdate) ) - { - // don't allow drawing outside of the lines rectangle - wxDCClipper clip(dc, rectRow); - - wxRect rect = rectRow; - OnDrawBackground(dc, rect, line); - - OnDrawSeparator(dc, rect, line); - - rect.Deflate(m_ptMargins.x, m_ptMargins.y); - OnDrawItem(dc, rect, line); - } - else // no intersection - { - if ( rectRow.GetTop() > rectUpdate.GetBottom() ) - { - // we are already below the update rect, no need to continue - // further - break; - } - //else: the next line may intersect the update rect - } - - rectRow.y += hRow; - } -} - -void wxVListBox::OnSetOrKillFocus(wxFocusEvent& WXUNUSED(event)) -{ - // we need to repaint the selection when we get the focus since - // wxRendererNative in general draws the focused selection differently - // from the unfocused selection (see OnDrawItem): - RefreshSelected(); -} - -void wxVListBox::OnSize(wxSizeEvent& event) -{ - UpdateScrollbar(); - event.Skip(); -} - -// ============================================================================ -// wxVListBox keyboard/mouse handling -// ============================================================================ - -void wxVListBox::DoHandleItemClick(int item, int flags) -{ - // has anything worth telling the client code about happened? - bool notify = false; - - if ( HasMultipleSelection() ) - { - // select the iteem clicked? - bool select = true; - - // NB: the keyboard interface we implement here corresponds to - // wxLB_EXTENDED rather than wxLB_MULTIPLE but this one makes more - // sense IMHO - if ( flags & ItemClick_Shift ) - { - if ( m_current != wxNOT_FOUND ) - { - if ( m_anchor == wxNOT_FOUND ) - m_anchor = m_current; - - select = false; - - // only the range from the selection anchor to new m_current - // must be selected - if ( DeselectAll() ) - notify = true; - - if ( SelectRange(m_anchor, item) ) - notify = true; - } - //else: treat it as ordinary click/keypress - } - else // Shift not pressed - { - m_anchor = item; - - if ( flags & ItemClick_Ctrl ) - { - select = false; - - if ( !(flags & ItemClick_Kbd) ) - { - Toggle(item); - - // the status of the item has definitely changed - notify = true; - } - //else: Ctrl-arrow pressed, don't change selection - } - //else: behave as in single selection case - } - - if ( select ) - { - // make the clicked item the only selection - if ( DeselectAll() ) - notify = true; - - if ( Select(item) ) - notify = true; - } - } - - // in any case the item should become the current one - if ( DoSetCurrent(item) ) - { - if ( !HasMultipleSelection() ) - { - // this has also changed the selection for single selection case - notify = true; - } - } - - if ( notify ) - { - // notify the user about the selection change - SendSelectedEvent(); - } - //else: nothing changed at all -} - -// ---------------------------------------------------------------------------- -// keyboard handling -// ---------------------------------------------------------------------------- - -void wxVListBox::OnKeyDown(wxKeyEvent& event) -{ - // flags for DoHandleItemClick() - int flags = ItemClick_Kbd; - - int current; - switch ( event.GetKeyCode() ) - { - case WXK_HOME: - case WXK_NUMPAD_HOME: - current = 0; - break; - - case WXK_END: - case WXK_NUMPAD_END: - current = GetRowCount() - 1; - break; - - case WXK_DOWN: - case WXK_NUMPAD_DOWN: - if ( m_current == (int)GetRowCount() - 1 ) - return; - - current = m_current + 1; - break; - - case WXK_UP: - case WXK_NUMPAD_UP: - if ( m_current == wxNOT_FOUND ) - current = GetRowCount() - 1; - else if ( m_current != 0 ) - current = m_current - 1; - else // m_current == 0 - return; - break; - - case WXK_PAGEDOWN: - case WXK_NUMPAD_PAGEDOWN: - PageDown(); - current = GetVisibleBegin(); - break; - - case WXK_PAGEUP: - case WXK_NUMPAD_PAGEUP: - if ( m_current == (int)GetVisibleBegin() ) - { - PageUp(); - } - - current = GetVisibleBegin(); - break; - - case WXK_SPACE: - // hack: pressing space should work like a mouse click rather than - // like a keyboard arrow press, so trick DoHandleItemClick() in - // thinking we were clicked - flags &= ~ItemClick_Kbd; - current = m_current; - break; - -#ifdef __WXMSW__ - case WXK_TAB: - // Since we are using wxWANTS_CHARS we need to send navigation - // events for the tabs on MSW - HandleAsNavigationKey(event); - // fall through to default -#endif - default: - event.Skip(); - current = 0; // just to silent the stupid compiler warnings - wxUnusedVar(current); - return; - } - - if ( event.ShiftDown() ) - flags |= ItemClick_Shift; - if ( event.ControlDown() ) - flags |= ItemClick_Ctrl; - - DoHandleItemClick(current, flags); -} - -// ---------------------------------------------------------------------------- -// wxVListBox mouse handling -// ---------------------------------------------------------------------------- - -void wxVListBox::OnLeftDown(wxMouseEvent& event) -{ - SetFocus(); - - int item = VirtualHitTest(event.GetPosition().y); - - if ( item != wxNOT_FOUND ) - { - int flags = 0; - if ( event.ShiftDown() ) - flags |= ItemClick_Shift; - - if ( event.ControlDown() ) - flags |= ItemClick_Ctrl; - - DoHandleItemClick(item, flags); - } -} - -void wxVListBox::OnLeftDClick(wxMouseEvent& eventMouse) -{ - int item = VirtualHitTest(eventMouse.GetPosition().y); - if ( item != wxNOT_FOUND ) - { - - // if item double-clicked was not yet selected, then treat - // this event as a left-click instead - if ( item == m_current ) - { - wxCommandEvent event(wxEVT_LISTBOX_DCLICK, GetId()); - InitEvent(event, item); - (void)GetEventHandler()->ProcessEvent(event); - } - else - { - OnLeftDown(eventMouse); - } - - } -} - - -// ---------------------------------------------------------------------------- -// use the same default attributes as wxListBox -// ---------------------------------------------------------------------------- - -//static -wxVisualAttributes -wxVListBox::GetClassDefaultAttributes(wxWindowVariant variant) -{ - return wxListBox::GetClassDefaultAttributes(variant); -} - -#endif diff --git a/Externals/wxWidgets3/src/generic/vscroll.cpp b/Externals/wxWidgets3/src/generic/vscroll.cpp deleted file mode 100644 index 995f4d2c7a..0000000000 --- a/Externals/wxWidgets3/src/generic/vscroll.cpp +++ /dev/null @@ -1,1059 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/generic/vscroll.cpp -// Purpose: wxVScrolledWindow implementation -// Author: Vadim Zeitlin -// Modified by: Brad Anderson, David Warkentin -// Created: 30.05.03 -// Copyright: (c) 2003 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ -#pragma hdrstop -#endif - -#ifndef WX_PRECOMP - #include "wx/dc.h" - #include "wx/sizer.h" -#endif - -#include "wx/vscroll.h" - -#include "wx/utils.h" // For wxMin/wxMax(). - -// ============================================================================ -// wxVarScrollHelperEvtHandler declaration -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxScrollHelperEvtHandler: intercept the events from the window and forward -// them to wxVarScrollHelperBase -// ---------------------------------------------------------------------------- - -class WXDLLEXPORT wxVarScrollHelperEvtHandler : public wxEvtHandler -{ -public: - wxVarScrollHelperEvtHandler(wxVarScrollHelperBase *scrollHelper) - { - m_scrollHelper = scrollHelper; - } - - virtual bool ProcessEvent(wxEvent& event) wxOVERRIDE; - -private: - wxVarScrollHelperBase *m_scrollHelper; - - wxDECLARE_NO_COPY_CLASS(wxVarScrollHelperEvtHandler); -}; - -// ============================================================================ -// wxVarScrollHelperEvtHandler implementation -// ============================================================================ - -// FIXME: This method totally duplicates a method with the same name in -// wxScrollHelperEvtHandler, we really should merge them by reusing the -// common parts in wxAnyScrollHelperBase. -bool wxVarScrollHelperEvtHandler::ProcessEvent(wxEvent& event) -{ - wxEventType evType = event.GetEventType(); - - // Pass it on to the real handler: notice that we must not call - // ProcessEvent() on this object itself as it wouldn't pass it to the next - // handler (i.e. the real window) if we're called from a previous handler - // (as indicated by "process here only" flag being set) and we do want to - // execute the handler defined in the window we're associated with right - // now, without waiting until TryAfter() is called from wxEvtHandler. - bool processed = m_nextHandler->ProcessEvent(event); - - // always process the size events ourselves, even if the user code handles - // them as well, as we need to AdjustScrollbars() - // - // NB: it is important to do it after processing the event in the normal - // way as HandleOnSize() may generate a wxEVT_SIZE itself if the - // scrollbar[s] (dis)appear and it should be seen by the user code - // after this one - if ( evType == wxEVT_SIZE ) - { - m_scrollHelper->HandleOnSize((wxSizeEvent &)event); - return true; - } - - // For wxEVT_PAINT the user code can either handle this event as usual or - // override virtual OnDraw(), so if the event hasn't been handled we need - // to call this virtual function ourselves. - if ( -#ifndef __WXUNIVERSAL__ - // in wxUniversal "processed" will always be true, because - // all windows use the paint event to draw themselves. - // In this case we can't use this flag to determine if a custom - // paint event handler already drew our window and we just - // call OnDraw() anyway. - !processed && -#endif // !__WXUNIVERSAL__ - evType == wxEVT_PAINT ) - { - m_scrollHelper->HandleOnPaint((wxPaintEvent &)event); - return true; - } - - // If the user code handled this event, it should prevent the default - // handling from taking place, so don't do anything else in this case. - if ( processed ) - return true; - - // reset the skipped flag (which might have been set to true in - // ProcessEvent() above) to be able to test it below - bool wasSkipped = event.GetSkipped(); - if ( wasSkipped ) - event.Skip(false); - - if ( evType == wxEVT_SCROLLWIN_TOP || - evType == wxEVT_SCROLLWIN_BOTTOM || - evType == wxEVT_SCROLLWIN_LINEUP || - evType == wxEVT_SCROLLWIN_LINEDOWN || - evType == wxEVT_SCROLLWIN_PAGEUP || - evType == wxEVT_SCROLLWIN_PAGEDOWN || - evType == wxEVT_SCROLLWIN_THUMBTRACK || - evType == wxEVT_SCROLLWIN_THUMBRELEASE ) - { - m_scrollHelper->HandleOnScroll((wxScrollWinEvent &)event); - if ( !event.GetSkipped() ) - { - // it makes sense to indicate that we processed the message as we - // did scroll the window (and also notice that wxAutoScrollTimer - // relies on our return value to stop scrolling when we are at top - // or bottom already) - processed = true; - wasSkipped = false; - } - } -#if wxUSE_MOUSEWHEEL - // Use GTK's own scroll wheel handling in GtkScrolledWindow -#ifndef __WXGTK20__ - else if ( evType == wxEVT_MOUSEWHEEL ) - { - m_scrollHelper->HandleOnMouseWheel((wxMouseEvent &)event); - return true; - } -#endif -#endif // wxUSE_MOUSEWHEEL - else if ( evType == wxEVT_CHAR && - (m_scrollHelper->GetOrientation() == wxVERTICAL) ) - { - m_scrollHelper->HandleOnChar((wxKeyEvent &)event); - if ( !event.GetSkipped() ) - { - processed = true; - wasSkipped = false; - } - } - - event.Skip(wasSkipped); - - // We called ProcessEvent() on the next handler, meaning that we explicitly - // worked around the request to process the event in this handler only. As - // explained above, this is unfortunately really necessary but the trouble - // is that the event will continue to be post-processed by the previous - // handler resulting in duplicate calls to event handlers. Call the special - // function below to prevent this from happening, base class DoTryChain() - // will check for it and behave accordingly. - // - // And if we're not called from DoTryChain(), this won't do anything anyhow. - event.DidntHonourProcessOnlyIn(); - - return processed; -} - - -// ============================================================================ -// wxVarScrollHelperBase implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxVarScrollHelperBase initialization -// ---------------------------------------------------------------------------- - -wxVarScrollHelperBase::wxVarScrollHelperBase(wxWindow *win) - : wxAnyScrollHelperBase(win) -{ -#if wxUSE_MOUSEWHEEL - m_sumWheelRotation = 0; -#endif - - m_unitMax = 0; - m_sizeTotal = 0; - m_unitFirst = 0; - - m_physicalScrolling = true; - m_handler = NULL; - - // by default, the associated window is also the target window - DoSetTargetWindow(win); -} - -wxVarScrollHelperBase::~wxVarScrollHelperBase() -{ - DeleteEvtHandler(); -} - -// ---------------------------------------------------------------------------- -// wxVarScrollHelperBase various helpers -// ---------------------------------------------------------------------------- - -void -wxVarScrollHelperBase::AssignOrient(wxCoord& x, - wxCoord& y, - wxCoord first, - wxCoord second) -{ - if ( GetOrientation() == wxVERTICAL ) - { - x = first; - y = second; - } - else // horizontal - { - x = second; - y = first; - } -} - -void -wxVarScrollHelperBase::IncOrient(wxCoord& x, wxCoord& y, wxCoord inc) -{ - if ( GetOrientation() == wxVERTICAL ) - y += inc; - else - x += inc; -} - -wxCoord wxVarScrollHelperBase::DoEstimateTotalSize() const -{ - // estimate the total height: it is impossible to call - // OnGetUnitSize() for every unit because there may be too many of - // them, so we just make a guess using some units in the beginning, - // some in the end and some in the middle - static const size_t NUM_UNITS_TO_SAMPLE = 10; - - wxCoord sizeTotal; - if ( m_unitMax < 3*NUM_UNITS_TO_SAMPLE ) - { - // in this case, full calculations are faster and more correct than - // guessing - sizeTotal = GetUnitsSize(0, m_unitMax); - } - else // too many units to calculate exactly - { - // look at some units in the beginning/middle/end - sizeTotal = - GetUnitsSize(0, NUM_UNITS_TO_SAMPLE) + - GetUnitsSize(m_unitMax - NUM_UNITS_TO_SAMPLE, - m_unitMax) + - GetUnitsSize(m_unitMax/2 - NUM_UNITS_TO_SAMPLE/2, - m_unitMax/2 + NUM_UNITS_TO_SAMPLE/2); - - // use the height of the units we looked as the average - sizeTotal = (wxCoord) - (((float)sizeTotal / (3*NUM_UNITS_TO_SAMPLE)) * m_unitMax); - } - - return sizeTotal; -} - -wxCoord wxVarScrollHelperBase::GetUnitsSize(size_t unitMin, size_t unitMax) const -{ - if ( unitMin == unitMax ) - return 0; - else if ( unitMin > unitMax ) - return -GetUnitsSize(unitMax, unitMin); - //else: unitMin < unitMax - - // let the user code know that we're going to need all these units - OnGetUnitsSizeHint(unitMin, unitMax); - - // sum up their sizes - wxCoord size = 0; - for ( size_t unit = unitMin; unit < unitMax; ++unit ) - { - size += OnGetUnitSize(unit); - } - - return size; -} - -size_t wxVarScrollHelperBase::FindFirstVisibleFromLast(size_t unitLast, bool full) const -{ - const wxCoord sWindow = GetOrientationTargetSize(); - - // go upwards until we arrive at a unit such that unitLast is not visible - // any more when it is shown - size_t unitFirst = unitLast; - wxCoord s = 0; - for ( ;; ) - { - s += OnGetUnitSize(unitFirst); - - if ( s > sWindow ) - { - // for this unit to be fully visible we need to go one unit - // down, but if it is enough for it to be only partly visible then - // this unit will do as well - if ( full ) - { - ++unitFirst; - } - - break; - } - - if ( !unitFirst ) - break; - - --unitFirst; - } - - return unitFirst; -} - -size_t wxVarScrollHelperBase::GetNewScrollPosition(wxScrollWinEvent& event) const -{ - wxEventType evtType = event.GetEventType(); - - if ( evtType == wxEVT_SCROLLWIN_TOP ) - { - return 0; - } - else if ( evtType == wxEVT_SCROLLWIN_BOTTOM ) - { - return m_unitMax; - } - else if ( evtType == wxEVT_SCROLLWIN_LINEUP ) - { - return m_unitFirst ? m_unitFirst - 1 : 0; - } - else if ( evtType == wxEVT_SCROLLWIN_LINEDOWN ) - { - return m_unitFirst + 1; - } - else if ( evtType == wxEVT_SCROLLWIN_PAGEUP ) - { - // Page up should do at least as much as line up. - return wxMin(FindFirstVisibleFromLast(m_unitFirst), - m_unitFirst ? m_unitFirst - 1 : 0); - } - else if ( evtType == wxEVT_SCROLLWIN_PAGEDOWN ) - { - // And page down should do at least as much as line down. - if ( GetVisibleEnd() ) - return wxMax(GetVisibleEnd() - 1, m_unitFirst + 1); - else - return wxMax(GetVisibleEnd(), m_unitFirst + 1); - } - else if ( evtType == wxEVT_SCROLLWIN_THUMBRELEASE ) - { - return event.GetPosition(); - } - else if ( evtType == wxEVT_SCROLLWIN_THUMBTRACK ) - { - return event.GetPosition(); - } - - // unknown scroll event? - wxFAIL_MSG( wxT("unknown scroll event type?") ); - return 0; -} - -void wxVarScrollHelperBase::UpdateScrollbar() -{ - // if there is nothing to scroll, remove the scrollbar - if ( !m_unitMax ) - { - RemoveScrollbar(); - return; - } - - // see how many units can we fit on screen - const wxCoord sWindow = GetOrientationTargetSize(); - - // do vertical calculations - wxCoord s = 0; - size_t unit; - for ( unit = m_unitFirst; unit < m_unitMax; ++unit ) - { - if ( s > sWindow ) - break; - - s += OnGetUnitSize(unit); - } - - m_nUnitsVisible = unit - m_unitFirst; - - int unitsPageSize = m_nUnitsVisible; - if ( s > sWindow ) - { - // last unit is only partially visible, we still need the scrollbar and - // so we have to "fix" pageSize because if it is equal to m_unitMax - // the scrollbar is not shown at all under MSW - --unitsPageSize; - } - - // set the scrollbar parameters to reflect this - m_win->SetScrollbar(GetOrientation(), m_unitFirst, unitsPageSize, m_unitMax); -} - -void wxVarScrollHelperBase::RemoveScrollbar() -{ - m_unitFirst = 0; - m_nUnitsVisible = m_unitMax; - m_win->SetScrollbar(GetOrientation(), 0, 0, 0); -} - -void wxVarScrollHelperBase::DeleteEvtHandler() -{ - // search for m_handler in the handler list - if ( m_win && m_handler ) - { - if ( m_win->RemoveEventHandler(m_handler) ) - { - delete m_handler; - } - //else: something is very wrong, so better [maybe] leak memory than - // risk a crash because of double deletion - - m_handler = NULL; - } -} - -void wxVarScrollHelperBase::DoSetTargetWindow(wxWindow *target) -{ - m_targetWindow = target; -#ifdef __WXMAC__ - target->MacSetClipChildren( true ) ; -#endif - - // install the event handler which will intercept the events we're - // interested in (but only do it for our real window, not the target window - // which we scroll - we don't need to hijack its events) - if ( m_targetWindow == m_win ) - { - // if we already have a handler, delete it first - DeleteEvtHandler(); - - m_handler = new wxVarScrollHelperEvtHandler(this); - m_targetWindow->PushEventHandler(m_handler); - } -} - -// ---------------------------------------------------------------------------- -// wxVarScrollHelperBase operations -// ---------------------------------------------------------------------------- - -void wxVarScrollHelperBase::SetTargetWindow(wxWindow *target) -{ - wxCHECK_RET( target, wxT("target window must not be NULL") ); - - if ( target == m_targetWindow ) - return; - - DoSetTargetWindow(target); -} - -void wxVarScrollHelperBase::SetUnitCount(size_t count) -{ - // save the number of units - m_unitMax = count; - - // and our estimate for their total height - m_sizeTotal = EstimateTotalSize(); - - // ScrollToUnit() will update the scrollbar itself if it changes the unit - // we pass to it because it's out of [new] range - size_t oldScrollPos = m_unitFirst; - DoScrollToUnit(m_unitFirst); - if ( oldScrollPos == m_unitFirst ) - { - // but if it didn't do it, we still need to update the scrollbar to - // reflect the changed number of units ourselves - UpdateScrollbar(); - } -} - -void wxVarScrollHelperBase::RefreshUnit(size_t unit) -{ - // is this unit visible? - if ( !IsVisible(unit) ) - { - // no, it is useless to do anything - return; - } - - // calculate the rect occupied by this unit on screen - wxRect rect; - AssignOrient(rect.width, rect.height, - GetNonOrientationTargetSize(), OnGetUnitSize(unit)); - - for ( size_t n = GetVisibleBegin(); n < unit; ++n ) - { - IncOrient(rect.x, rect.y, OnGetUnitSize(n)); - } - - // do refresh it - m_targetWindow->RefreshRect(rect); -} - -void wxVarScrollHelperBase::RefreshUnits(size_t from, size_t to) -{ - wxASSERT_MSG( from <= to, wxT("RefreshUnits(): empty range") ); - - // clump the range to just the visible units -- it is useless to refresh - // the other ones - if ( from < GetVisibleBegin() ) - from = GetVisibleBegin(); - - if ( to > GetVisibleEnd() ) - to = GetVisibleEnd(); - - // calculate the rect occupied by these units on screen - int orient_size = 0, - orient_pos = 0; - - int nonorient_size = GetNonOrientationTargetSize(); - - for ( size_t nBefore = GetVisibleBegin(); - nBefore < from; - nBefore++ ) - { - orient_pos += OnGetUnitSize(nBefore); - } - - for ( size_t nBetween = from; nBetween <= to; nBetween++ ) - { - orient_size += OnGetUnitSize(nBetween); - } - - wxRect rect; - AssignOrient(rect.x, rect.y, 0, orient_pos); - AssignOrient(rect.width, rect.height, nonorient_size, orient_size); - - // do refresh it - m_targetWindow->RefreshRect(rect); -} - -void wxVarScrollHelperBase::RefreshAll() -{ - UpdateScrollbar(); - - m_targetWindow->Refresh(); -} - -bool wxVarScrollHelperBase::ScrollLayout() -{ - if ( m_targetWindow->GetSizer() && m_physicalScrolling ) - { - // adjust the sizer dimensions/position taking into account the - // virtual size and scrolled position of the window. - - int x, y; - AssignOrient(x, y, 0, -GetScrollOffset()); - - int w, h; - m_targetWindow->GetVirtualSize(&w, &h); - - m_targetWindow->GetSizer()->SetDimension(x, y, w, h); - return true; - } - - // fall back to default for LayoutConstraints - return m_targetWindow->wxWindow::Layout(); -} - -int wxVarScrollHelperBase::VirtualHitTest(wxCoord coord) const -{ - const size_t unitMax = GetVisibleEnd(); - for ( size_t unit = GetVisibleBegin(); unit < unitMax; ++unit ) - { - coord -= OnGetUnitSize(unit); - if ( coord < 0 ) - return unit; - } - - return wxNOT_FOUND; -} - -// ---------------------------------------------------------------------------- -// wxVarScrollHelperBase scrolling -// ---------------------------------------------------------------------------- - -bool wxVarScrollHelperBase::DoScrollToUnit(size_t unit) -{ - if ( !m_unitMax ) - { - // we're empty, code below doesn't make sense in this case - return false; - } - - // determine the real first unit to scroll to: we shouldn't scroll beyond - // the end - size_t unitFirstLast = FindFirstVisibleFromLast(m_unitMax - 1, true); - if ( unit > unitFirstLast ) - unit = unitFirstLast; - - // anything to do? - if ( unit == m_unitFirst ) - { - // no - return false; - } - - - // remember the currently shown units for the refresh code below - size_t unitFirstOld = GetVisibleBegin(), - unitLastOld = GetVisibleEnd(); - - m_unitFirst = unit; - - - // the size of scrollbar thumb could have changed - UpdateScrollbar(); - - // finally refresh the display -- but only redraw as few units as possible - // to avoid flicker. We can't do this if we have children because they - // won't be scrolled - if ( m_targetWindow->GetChildren().empty() && - (GetVisibleBegin() >= unitLastOld || GetVisibleEnd() <= unitFirstOld) ) - { - // the simplest case: we don't have any old units left, just redraw - // everything - m_targetWindow->Refresh(); - } - else // scroll the window - { - // Avoid scrolling visible parts of the screen on Mac -#ifdef __WXMAC__ - if (m_physicalScrolling && m_targetWindow->IsShownOnScreen()) -#else - if ( m_physicalScrolling ) -#endif - { - wxCoord dx = 0, - dy = GetUnitsSize(GetVisibleBegin(), unitFirstOld); - - if ( GetOrientation() == wxHORIZONTAL ) - { - wxCoord tmp = dx; - dx = dy; - dy = tmp; - } - - m_targetWindow->ScrollWindow(dx, dy); - } - else // !m_physicalScrolling - { - // we still need to invalidate but we can't use ScrollWindow - // because physical scrolling is disabled (the user either didn't - // want children scrolled and/or doesn't want pixels to be - // physically scrolled). - m_targetWindow->Refresh(); - } - } - - return true; -} - -bool wxVarScrollHelperBase::DoScrollUnits(int units) -{ - units += m_unitFirst; - if ( units < 0 ) - units = 0; - - return DoScrollToUnit(units); -} - -bool wxVarScrollHelperBase::DoScrollPages(int pages) -{ - bool didSomething = false; - - while ( pages ) - { - int unit; - if ( pages > 0 ) - { - unit = GetVisibleEnd(); - if ( unit ) - --unit; - --pages; - } - else // pages < 0 - { - unit = FindFirstVisibleFromLast(GetVisibleEnd()); - ++pages; - } - - didSomething = DoScrollToUnit(unit); - } - - return didSomething; -} - -// ---------------------------------------------------------------------------- -// event handling -// ---------------------------------------------------------------------------- - -void wxVarScrollHelperBase::HandleOnSize(wxSizeEvent& event) -{ - if ( m_unitMax ) - { - // sometimes change in varscrollable window's size can result in - // unused empty space after the last item. Fix it by decrementing - // first visible item position according to the available space. - - // determine free space - const wxCoord sWindow = GetOrientationTargetSize(); - wxCoord s = 0; - size_t unit; - for ( unit = m_unitFirst; unit < m_unitMax; ++unit ) - { - if ( s > sWindow ) - break; - - s += OnGetUnitSize(unit); - } - wxCoord freeSpace = sWindow - s; - - // decrement first visible item index as long as there is free space - size_t idealUnitFirst; - for ( idealUnitFirst = m_unitFirst; - idealUnitFirst > 0; - idealUnitFirst-- ) - { - wxCoord us = OnGetUnitSize(idealUnitFirst-1); - if ( freeSpace < us ) - break; - freeSpace -= us; - } - m_unitFirst = idealUnitFirst; - } - - UpdateScrollbar(); - - event.Skip(); -} - -void wxVarScrollHelperBase::HandleOnScroll(wxScrollWinEvent& event) -{ - if (GetOrientation() != event.GetOrientation()) - { - event.Skip(); - return; - } - - DoScrollToUnit(GetNewScrollPosition(event)); - -#ifdef __WXMAC__ - UpdateMacScrollWindow(); -#endif // __WXMAC__ -} - -void wxVarScrollHelperBase::DoPrepareDC(wxDC& dc) -{ - if ( m_physicalScrolling ) - { - wxPoint pt = dc.GetDeviceOrigin(); - - IncOrient(pt.x, pt.y, -GetScrollOffset()); - - dc.SetDeviceOrigin(pt.x, pt.y); - } -} - -int wxVarScrollHelperBase::DoCalcScrolledPosition(int coord) const -{ - return coord - GetScrollOffset(); -} - -int wxVarScrollHelperBase::DoCalcUnscrolledPosition(int coord) const -{ - return coord + GetScrollOffset(); -} - -#if wxUSE_MOUSEWHEEL - -void wxVarScrollHelperBase::HandleOnMouseWheel(wxMouseEvent& event) -{ - // we only want to process wheel events for vertical implementations. - // There is no way to determine wheel orientation (and on MSW horizontal - // wheel rotation just fakes scroll events, rather than sending a MOUSEWHEEL - // event). - if ( GetOrientation() != wxVERTICAL ) - return; - - m_sumWheelRotation += event.GetWheelRotation(); - int delta = event.GetWheelDelta(); - - // how much to scroll this time - int units_to_scroll = -(m_sumWheelRotation/delta); - if ( !units_to_scroll ) - return; - - m_sumWheelRotation += units_to_scroll*delta; - - if ( !event.IsPageScroll() ) - DoScrollUnits( units_to_scroll*event.GetLinesPerAction() ); - else // scroll pages instead of units - DoScrollPages( units_to_scroll ); -} - -#endif // wxUSE_MOUSEWHEEL - - -// ============================================================================ -// wxVarHVScrollHelper implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxVarHVScrollHelper operations -// ---------------------------------------------------------------------------- - -void wxVarHVScrollHelper::SetRowColumnCount(size_t rowCount, size_t columnCount) -{ - SetRowCount(rowCount); - SetColumnCount(columnCount); -} - -bool wxVarHVScrollHelper::ScrollToRowColumn(size_t row, size_t column) -{ - bool result = false; - result |= ScrollToRow(row); - result |= ScrollToColumn(column); - return result; -} - -void wxVarHVScrollHelper::RefreshRowColumn(size_t row, size_t column) -{ - // is this unit visible? - if ( !IsRowVisible(row) || !IsColumnVisible(column) ) - { - // no, it is useless to do anything - return; - } - - // calculate the rect occupied by this cell on screen - wxRect v_rect, h_rect; - v_rect.height = OnGetRowHeight(row); - h_rect.width = OnGetColumnWidth(column); - - size_t n; - - for ( n = GetVisibleRowsBegin(); n < row; n++ ) - { - v_rect.y += OnGetRowHeight(n); - } - - for ( n = GetVisibleColumnsBegin(); n < column; n++ ) - { - h_rect.x += OnGetColumnWidth(n); - } - - // refresh but specialize the behaviour if we have a single target window - if ( wxVarVScrollHelper::GetTargetWindow() == wxVarHScrollHelper::GetTargetWindow() ) - { - v_rect.x = h_rect.x; - v_rect.width = h_rect.width; - wxVarVScrollHelper::GetTargetWindow()->RefreshRect(v_rect); - } - else - { - v_rect.x = 0; - v_rect.width = wxVarVScrollHelper::GetNonOrientationTargetSize(); - h_rect.y = 0; - h_rect.width = wxVarHScrollHelper::GetNonOrientationTargetSize(); - - wxVarVScrollHelper::GetTargetWindow()->RefreshRect(v_rect); - wxVarHScrollHelper::GetTargetWindow()->RefreshRect(h_rect); - } -} - -void wxVarHVScrollHelper::RefreshRowsColumns(size_t fromRow, size_t toRow, - size_t fromColumn, size_t toColumn) -{ - wxASSERT_MSG( fromRow <= toRow || fromColumn <= toColumn, - wxT("RefreshRowsColumns(): empty range") ); - - // clump the range to just the visible units -- it is useless to refresh - // the other ones - if ( fromRow < GetVisibleRowsBegin() ) - fromRow = GetVisibleRowsBegin(); - - if ( toRow > GetVisibleRowsEnd() ) - toRow = GetVisibleRowsEnd(); - - if ( fromColumn < GetVisibleColumnsBegin() ) - fromColumn = GetVisibleColumnsBegin(); - - if ( toColumn > GetVisibleColumnsEnd() ) - toColumn = GetVisibleColumnsEnd(); - - // calculate the rect occupied by these units on screen - wxRect v_rect, h_rect; - size_t nBefore, nBetween; - - for ( nBefore = GetVisibleRowsBegin(); - nBefore < fromRow; - nBefore++ ) - { - v_rect.y += OnGetRowHeight(nBefore); - } - - for ( nBetween = fromRow; nBetween <= toRow; nBetween++ ) - { - v_rect.height += OnGetRowHeight(nBetween); - } - - for ( nBefore = GetVisibleColumnsBegin(); - nBefore < fromColumn; - nBefore++ ) - { - h_rect.x += OnGetColumnWidth(nBefore); - } - - for ( nBetween = fromColumn; nBetween <= toColumn; nBetween++ ) - { - h_rect.width += OnGetColumnWidth(nBetween); - } - - // refresh but specialize the behaviour if we have a single target window - if ( wxVarVScrollHelper::GetTargetWindow() == wxVarHScrollHelper::GetTargetWindow() ) - { - v_rect.x = h_rect.x; - v_rect.width = h_rect.width; - wxVarVScrollHelper::GetTargetWindow()->RefreshRect(v_rect); - } - else - { - v_rect.x = 0; - v_rect.width = wxVarVScrollHelper::GetNonOrientationTargetSize(); - h_rect.y = 0; - h_rect.width = wxVarHScrollHelper::GetNonOrientationTargetSize(); - - wxVarVScrollHelper::GetTargetWindow()->RefreshRect(v_rect); - wxVarHScrollHelper::GetTargetWindow()->RefreshRect(h_rect); - } -} - -wxPosition wxVarHVScrollHelper::VirtualHitTest(wxCoord x, wxCoord y) const -{ - return wxPosition(wxVarVScrollHelper::VirtualHitTest(y), - wxVarHScrollHelper::VirtualHitTest(x)); -} - -void wxVarHVScrollHelper::DoPrepareDC(wxDC& dc) -{ - wxVarVScrollHelper::DoPrepareDC(dc); - wxVarHScrollHelper::DoPrepareDC(dc); -} - -bool wxVarHVScrollHelper::ScrollLayout() -{ - bool layout_result = false; - layout_result |= wxVarVScrollHelper::ScrollLayout(); - layout_result |= wxVarHScrollHelper::ScrollLayout(); - return layout_result; -} - -wxSize wxVarHVScrollHelper::GetRowColumnCount() const -{ - return wxSize(GetColumnCount(), GetRowCount()); -} - -wxPosition wxVarHVScrollHelper::GetVisibleBegin() const -{ - return wxPosition(GetVisibleRowsBegin(), GetVisibleColumnsBegin()); -} - -wxPosition wxVarHVScrollHelper::GetVisibleEnd() const -{ - return wxPosition(GetVisibleRowsEnd(), GetVisibleColumnsEnd()); -} - -bool wxVarHVScrollHelper::IsVisible(size_t row, size_t column) const -{ - return IsRowVisible(row) && IsColumnVisible(column); -} - - -// ============================================================================ -// wx[V/H/HV]ScrolledWindow implementations -// ============================================================================ - -wxIMPLEMENT_ABSTRACT_CLASS(wxVScrolledWindow, wxPanel); -wxIMPLEMENT_ABSTRACT_CLASS(wxHScrolledWindow, wxPanel); -wxIMPLEMENT_ABSTRACT_CLASS(wxHVScrolledWindow, wxPanel); - - -#if WXWIN_COMPATIBILITY_2_8 - -// =========================================================================== -// wxVarVScrollLegacyAdaptor -// =========================================================================== - -size_t wxVarVScrollLegacyAdaptor::GetFirstVisibleLine() const -{ return GetVisibleRowsBegin(); } - -size_t wxVarVScrollLegacyAdaptor::GetLastVisibleLine() const -{ return GetVisibleRowsEnd() - 1; } - -size_t wxVarVScrollLegacyAdaptor::GetLineCount() const -{ return GetRowCount(); } - -void wxVarVScrollLegacyAdaptor::SetLineCount(size_t count) -{ SetRowCount(count); } - -void wxVarVScrollLegacyAdaptor::RefreshLine(size_t line) -{ RefreshRow(line); } - -void wxVarVScrollLegacyAdaptor::RefreshLines(size_t from, size_t to) -{ RefreshRows(from, to); } - -bool wxVarVScrollLegacyAdaptor::ScrollToLine(size_t line) -{ return ScrollToRow(line); } - -bool wxVarVScrollLegacyAdaptor::ScrollLines(int lines) -{ return ScrollRows(lines); } - -bool wxVarVScrollLegacyAdaptor::ScrollPages(int pages) -{ return ScrollRowPages(pages); } - -wxCoord wxVarVScrollLegacyAdaptor::OnGetLineHeight(size_t WXUNUSED(n)) const -{ - wxFAIL_MSG( wxT("OnGetLineHeight() must be overridden if OnGetRowHeight() isn't!") ); - return -1; -} - -void wxVarVScrollLegacyAdaptor::OnGetLinesHint(size_t WXUNUSED(lineMin), - size_t WXUNUSED(lineMax)) const -{ -} - -wxCoord wxVarVScrollLegacyAdaptor::OnGetRowHeight(size_t n) const -{ - return OnGetLineHeight(n); -} - -void wxVarVScrollLegacyAdaptor::OnGetRowsHeightHint(size_t rowMin, - size_t rowMax) const -{ - OnGetLinesHint(rowMin, rowMax); -} - -#endif // WXWIN_COMPATIBILITY_2_8 diff --git a/Externals/wxWidgets3/src/generic/wizard.cpp b/Externals/wxWidgets3/src/generic/wizard.cpp deleted file mode 100644 index d877d14cf8..0000000000 --- a/Externals/wxWidgets3/src/generic/wizard.cpp +++ /dev/null @@ -1,1012 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/generic/wizard.cpp -// Purpose: generic implementation of wxWizard class -// Author: Vadim Zeitlin -// Modified by: Robert Cavanaugh -// 1) Added capability for wxWizardPage to accept resources -// 2) Added "Help" button handler stub -// 3) Fixed ShowPage() bug on displaying bitmaps -// Robert Vazan (sizers) -// Created: 15.08.99 -// Copyright: (c) 1999 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_WIZARDDLG - -#ifndef WX_PRECOMP - #include "wx/dynarray.h" - #include "wx/intl.h" - #include "wx/statbmp.h" - #include "wx/button.h" - #include "wx/settings.h" - #include "wx/sizer.h" -#endif //WX_PRECOMP - -#include "wx/statline.h" - -#include "wx/scrolwin.h" -#include "wx/wizard.h" -#include "wx/dcmemory.h" - -// ---------------------------------------------------------------------------- -// wxWizardSizer -// ---------------------------------------------------------------------------- - -class wxWizardSizer : public wxSizer -{ -public: - wxWizardSizer(wxWizard *owner); - - virtual wxSizerItem *Insert(size_t index, wxSizerItem *item) wxOVERRIDE; - - virtual void RecalcSizes() wxOVERRIDE; - virtual wxSize CalcMin() wxOVERRIDE; - - // get the max size of all wizard pages - wxSize GetMaxChildSize(); - - // return the border which can be either set using wxWizard::SetBorder() or - // have default value - int GetBorder() const; - - // hide the pages which we temporarily "show" when they're added to this - // sizer (see Insert()) - void HidePages(); - -private: - wxSize SiblingSize(wxSizerItem *child); - - wxWizard *m_owner; - wxSize m_childSize; -}; - -// ---------------------------------------------------------------------------- -// event tables and such -// ---------------------------------------------------------------------------- - -wxDEFINE_EVENT( wxEVT_WIZARD_PAGE_CHANGED, wxWizardEvent ); -wxDEFINE_EVENT( wxEVT_WIZARD_PAGE_CHANGING, wxWizardEvent ); -wxDEFINE_EVENT( wxEVT_WIZARD_BEFORE_PAGE_CHANGED, wxWizardEvent ); -wxDEFINE_EVENT( wxEVT_WIZARD_CANCEL, wxWizardEvent ); -wxDEFINE_EVENT( wxEVT_WIZARD_FINISHED, wxWizardEvent ); -wxDEFINE_EVENT( wxEVT_WIZARD_HELP, wxWizardEvent ); -wxDEFINE_EVENT( wxEVT_WIZARD_PAGE_SHOWN, wxWizardEvent ); - -wxBEGIN_EVENT_TABLE(wxWizard, wxDialog) - EVT_BUTTON(wxID_CANCEL, wxWizard::OnCancel) - EVT_BUTTON(wxID_BACKWARD, wxWizard::OnBackOrNext) - EVT_BUTTON(wxID_FORWARD, wxWizard::OnBackOrNext) - EVT_BUTTON(wxID_HELP, wxWizard::OnHelp) - - EVT_WIZARD_PAGE_CHANGED(wxID_ANY, wxWizard::OnWizEvent) - EVT_WIZARD_PAGE_CHANGING(wxID_ANY, wxWizard::OnWizEvent) - EVT_WIZARD_CANCEL(wxID_ANY, wxWizard::OnWizEvent) - EVT_WIZARD_FINISHED(wxID_ANY, wxWizard::OnWizEvent) - EVT_WIZARD_HELP(wxID_ANY, wxWizard::OnWizEvent) -wxEND_EVENT_TABLE() - -wxIMPLEMENT_DYNAMIC_CLASS(wxWizard, wxDialog); - -/* - TODO PROPERTIES : - wxWizard - extstyle - title -*/ - -wxIMPLEMENT_ABSTRACT_CLASS(wxWizardPage, wxPanel); -wxIMPLEMENT_DYNAMIC_CLASS(wxWizardPageSimple, wxWizardPage); -wxIMPLEMENT_DYNAMIC_CLASS(wxWizardEvent, wxNotifyEvent); - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxWizardPage -// ---------------------------------------------------------------------------- - -void wxWizardPage::Init() -{ - m_bitmap = wxNullBitmap; -} - -wxWizardPage::wxWizardPage(wxWizard *parent, - const wxBitmap& bitmap) -{ - Create(parent, bitmap); -} - -bool wxWizardPage::Create(wxWizard *parent, - const wxBitmap& bitmap) -{ - if ( !wxPanel::Create(parent, wxID_ANY) ) - return false; - - m_bitmap = bitmap; - - // initially the page is hidden, it's shown only when it becomes current - Hide(); - - return true; -} - -// ---------------------------------------------------------------------------- -// wxWizardPageSimple -// ---------------------------------------------------------------------------- - -wxWizardPage *wxWizardPageSimple::GetPrev() const -{ - return m_prev; -} - -wxWizardPage *wxWizardPageSimple::GetNext() const -{ - return m_next; -} - -// ---------------------------------------------------------------------------- -// wxWizardSizer -// ---------------------------------------------------------------------------- - -wxWizardSizer::wxWizardSizer(wxWizard *owner) - : m_owner(owner), - m_childSize(wxDefaultSize) -{ -} - -wxSizerItem *wxWizardSizer::Insert(size_t index, wxSizerItem *item) -{ - m_owner->m_usingSizer = true; - - if ( item->IsWindow() ) - { - // we must pretend that the window is shown as otherwise it wouldn't be - // taken into account for the layout -- but avoid really showing it, so - // just set the internal flag instead of calling wxWindow::Show() - item->GetWindow()->wxWindowBase::Show(); - } - - return wxSizer::Insert(index, item); -} - -void wxWizardSizer::HidePages() -{ - for ( wxSizerItemList::compatibility_iterator node = GetChildren().GetFirst(); - node; - node = node->GetNext() ) - { - wxSizerItem * const item = node->GetData(); - if ( item->IsWindow() ) - item->GetWindow()->wxWindowBase::Show(false); - } -} - -void wxWizardSizer::RecalcSizes() -{ - // Effect of this function depends on m_owner->m_page and - // it should be called whenever it changes (wxWizard::ShowPage) - if ( m_owner->m_page ) - { - m_owner->m_page->SetSize(wxRect(m_position, m_size)); - } -} - -wxSize wxWizardSizer::CalcMin() -{ - return m_owner->GetPageSize(); -} - -wxSize wxWizardSizer::GetMaxChildSize() -{ - wxSize maxOfMin; - - for ( wxSizerItemList::compatibility_iterator childNode = m_children.GetFirst(); - childNode; - childNode = childNode->GetNext() ) - { - wxSizerItem *child = childNode->GetData(); - maxOfMin.IncTo(child->CalcMin()); - maxOfMin.IncTo(SiblingSize(child)); - } - - if ( m_owner->m_started ) - { - m_childSize = maxOfMin; - } - - return maxOfMin; -} - -int wxWizardSizer::GetBorder() const -{ - return m_owner->m_border; -} - -wxSize wxWizardSizer::SiblingSize(wxSizerItem *child) -{ - wxSize maxSibling; - - if ( child->IsWindow() ) - { - wxWizardPage *page = wxDynamicCast(child->GetWindow(), wxWizardPage); - if ( page ) - { - for ( wxWizardPage *sibling = page->GetNext(); - sibling; - sibling = sibling->GetNext() ) - { - if ( sibling->GetSizer() ) - { - maxSibling.IncTo(sibling->GetSizer()->CalcMin()); - } - } - } - } - - return maxSibling; -} - -// ---------------------------------------------------------------------------- -// generic wxWizard implementation -// ---------------------------------------------------------------------------- - -void wxWizard::Init() -{ - m_posWizard = wxDefaultPosition; - m_page = NULL; - m_firstpage = NULL; - m_btnPrev = m_btnNext = NULL; - m_statbmp = NULL; - m_sizerBmpAndPage = NULL; - m_sizerPage = NULL; - m_border = 5; - m_started = false; - m_wasModal = false; - m_usingSizer = false; - m_bitmapBackgroundColour = *wxWHITE; - m_bitmapPlacement = 0; - m_bitmapMinimumWidth = 115; -} - -bool wxWizard::Create(wxWindow *parent, - int id, - const wxString& title, - const wxBitmap& bitmap, - const wxPoint& pos, - long style) -{ - bool result = wxDialog::Create(parent,id,title,pos,wxDefaultSize,style); - - m_posWizard = pos; - m_bitmap = bitmap ; - - DoCreateControls(); - - return result; -} - -wxWizard::~wxWizard() -{ - // normally we don't have to delete this sizer as it's deleted by the - // associated window but if we never used it or didn't set it as the window - // sizer yet, do delete it manually - if ( !m_usingSizer || !m_started ) - delete m_sizerPage; -} - -void wxWizard::AddBitmapRow(wxBoxSizer *mainColumn) -{ - m_sizerBmpAndPage = new wxBoxSizer(wxHORIZONTAL); - mainColumn->Add( - m_sizerBmpAndPage, - 1, // Vertically stretchable - wxEXPAND // Horizontal stretching, no border - ); - mainColumn->Add(0,5, - 0, // No vertical stretching - wxEXPAND // No border, (mostly useless) horizontal stretching - ); - -#if wxUSE_STATBMP - if ( m_bitmap.IsOk() ) - { - wxSize bitmapSize(wxDefaultSize); - if (GetBitmapPlacement()) - bitmapSize.x = GetMinimumBitmapWidth(); - - m_statbmp = new wxStaticBitmap(this, wxID_ANY, m_bitmap, wxDefaultPosition, bitmapSize); - m_sizerBmpAndPage->Add( - m_statbmp, - 0, // No horizontal stretching - wxALL, // Border all around, top alignment - 5 // Border width - ); - m_sizerBmpAndPage->Add( - 5,0, - 0, // No horizontal stretching - wxEXPAND // No border, (mostly useless) vertical stretching - ); - } -#endif - - // Added to m_sizerBmpAndPage later - m_sizerPage = new wxWizardSizer(this); -} - -void wxWizard::AddStaticLine(wxBoxSizer *mainColumn) -{ -#if wxUSE_STATLINE - mainColumn->Add( - new wxStaticLine(this, wxID_ANY), - 0, // Vertically unstretchable - wxEXPAND | wxALL, // Border all around, horizontally stretchable - 5 // Border width - ); - mainColumn->Add(0,5, - 0, // No vertical stretching - wxEXPAND // No border, (mostly useless) horizontal stretching - ); -#else - (void)mainColumn; -#endif // wxUSE_STATLINE -} - -void wxWizard::AddBackNextPair(wxBoxSizer *buttonRow) -{ - wxASSERT_MSG( m_btnNext && m_btnPrev, - wxT("You must create the buttons before calling ") - wxT("wxWizard::AddBackNextPair") ); - - wxBoxSizer *backNextPair = new wxBoxSizer(wxHORIZONTAL); - buttonRow->Add( - backNextPair, - 0, // No horizontal stretching - wxALL, // Border all around - 5 // Border width - ); - - backNextPair->Add(m_btnPrev); - backNextPair->Add(10, 0, - 0, // No horizontal stretching - wxEXPAND // No border, (mostly useless) vertical stretching - ); - backNextPair->Add(m_btnNext); -} - -void wxWizard::AddButtonRow(wxBoxSizer *mainColumn) -{ - // the order in which the buttons are created determines the TAB order - at least under MSWindows... - // although the 'back' button appears before the 'next' button, a more userfriendly tab order is - // to activate the 'next' button first (create the next button before the back button). - // The reason is: The user will repeatedly enter information in the wizard pages and then wants to - // press 'next'. If a user uses mostly the keyboard, he would have to skip the 'back' button - // every time. This is annoying. There is a second reason: RETURN acts as TAB. If the 'next' - // button comes first in the TAB order, the user can enter information very fast using the RETURN - // key to TAB to the next entry field and page. This would not be possible, if the 'back' button - // was created before the 'next' button. - - bool isPda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA); - int buttonStyle = isPda ? wxBU_EXACTFIT : 0; - - wxBoxSizer *buttonRow = new wxBoxSizer(wxHORIZONTAL); -#ifdef __WXMAC__ - if (GetExtraStyle() & wxWIZARD_EX_HELPBUTTON) - mainColumn->Add( - buttonRow, - 0, // Vertically unstretchable - wxEXPAND - ); - else -#endif - mainColumn->Add( - buttonRow, - 0, // Vertically unstretchable - wxALIGN_RIGHT // Right aligned, no border - ); - - // Desired TAB order is 'next', 'cancel', 'help', 'back'. This makes the 'back' button the last control on the page. - // Create the buttons in the right order... - wxButton *btnHelp=0; -#ifdef __WXMAC__ - if (GetExtraStyle() & wxWIZARD_EX_HELPBUTTON) - btnHelp=new wxButton(this, wxID_HELP, wxEmptyString, wxDefaultPosition, wxDefaultSize, buttonStyle); -#endif - - m_btnNext = new wxButton(this, wxID_FORWARD, _("&Next >")); - wxButton *btnCancel=new wxButton(this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, buttonStyle); -#ifndef __WXMAC__ - if (GetExtraStyle() & wxWIZARD_EX_HELPBUTTON) - btnHelp=new wxButton(this, wxID_HELP, _("&Help"), wxDefaultPosition, wxDefaultSize, buttonStyle); -#endif - m_btnPrev = new wxButton(this, wxID_BACKWARD, _("< &Back"), wxDefaultPosition, wxDefaultSize, buttonStyle); - - if (btnHelp) - { - buttonRow->Add( - btnHelp, - 0, // Horizontally unstretchable - wxALL, // Border all around, top aligned - 5 // Border width - ); -#ifdef __WXMAC__ - // Put stretchable space between help button and others - buttonRow->Add(0, 0, 1, wxALIGN_CENTRE, 0); -#endif - } - - AddBackNextPair(buttonRow); - - buttonRow->Add( - btnCancel, - 0, // Horizontally unstretchable - wxALL, // Border all around, top aligned - 5 // Border width - ); -} - -void wxWizard::DoCreateControls() -{ - // do nothing if the controls were already created - if ( WasCreated() ) - return; - - bool isPda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA); - - // Horizontal stretching, and if not PDA, border all around - int mainColumnSizerFlags = isPda ? wxEXPAND : wxALL|wxEXPAND ; - - // wxWindow::SetSizer will be called at end - wxBoxSizer *windowSizer = new wxBoxSizer(wxVERTICAL); - - wxBoxSizer *mainColumn = new wxBoxSizer(wxVERTICAL); - windowSizer->Add( - mainColumn, - 1, // Vertical stretching - mainColumnSizerFlags, - 5 // Border width - ); - - AddBitmapRow(mainColumn); - - if (!isPda) - AddStaticLine(mainColumn); - - AddButtonRow(mainColumn); - - SetSizer(windowSizer); -} - -void wxWizard::SetPageSize(const wxSize& size) -{ - wxCHECK_RET(!m_started, wxT("wxWizard::SetPageSize after RunWizard")); - m_sizePage = size; -} - -void wxWizard::FitToPage(const wxWizardPage *page) -{ - wxCHECK_RET(!m_started, wxT("wxWizard::FitToPage after RunWizard")); - - while ( page ) - { - wxSize size = page->GetBestSize(); - - m_sizePage.IncTo(size); - - page = page->GetNext(); - } -} - -bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward) -{ - wxASSERT_MSG( page != m_page, wxT("this is useless") ); - - wxSizerFlags flags(1); - flags.Border(wxALL, m_border).Expand(); - - if ( !m_started ) - { - if ( m_usingSizer ) - { - m_sizerBmpAndPage->Add(m_sizerPage, flags); - - // now that our layout is computed correctly, hide the pages - // artificially shown in wxWizardSizer::Insert() back again - m_sizerPage->HidePages(); - } - } - - - // remember the old bitmap (if any) to compare with the new one later - wxBitmap bmpPrev; - - // check for previous page - if ( m_page ) - { - // send the event to the old page - wxWizardEvent event(wxEVT_WIZARD_PAGE_CHANGING, GetId(), - goingForward, m_page); - if ( m_page->GetEventHandler()->ProcessEvent(event) && - !event.IsAllowed() ) - { - // vetoed by the page - return false; - } - - m_page->Hide(); - - bmpPrev = m_page->GetBitmap(); - - if ( !m_usingSizer ) - m_sizerBmpAndPage->Detach(m_page); - } - - // is this the end? - if ( !page ) - { - // terminate successfully - if ( IsModal() ) - { - EndModal(wxID_OK); - } - else - { - SetReturnCode(wxID_OK); - Hide(); - } - - // and notify the user code (this is especially useful for modeless - // wizards) - wxWizardEvent event(wxEVT_WIZARD_FINISHED, GetId(), false, m_page); - (void)GetEventHandler()->ProcessEvent(event); - - m_page = NULL; - - return true; - } - - // notice that we change m_page only here so that wxEVT_WIZARD_FINISHED - // event above could still use the correct (i.e. old) value of m_page - m_page = page; - - // position and show the new page - (void)m_page->TransferDataToWindow(); - - if ( m_usingSizer ) - { - // wxWizardSizer::RecalcSizes wants to be called when m_page changes - m_sizerPage->RecalcSizes(); - } - else // pages are not managed by the sizer - { - m_sizerBmpAndPage->Add(m_page, flags); - m_sizerBmpAndPage->SetItemMinSize(m_page, GetPageSize()); - } - -#if wxUSE_STATBMP - // update the bitmap if:it changed - wxBitmap bmp; - if ( m_statbmp ) - { - bmp = m_page->GetBitmap(); - if ( !bmp.IsOk() ) - bmp = m_bitmap; - - if ( !bmpPrev.IsOk() ) - bmpPrev = m_bitmap; - - if (!GetBitmapPlacement()) - { - if ( !bmp.IsSameAs(bmpPrev) ) - m_statbmp->SetBitmap(bmp); - } - } -#endif // wxUSE_STATBMP - - - // and update the buttons state - m_btnPrev->Enable(m_page != m_firstpage); - - const bool hasNext = HasNextPage(m_page); - const wxString label = hasNext ? _("&Next >") : _("&Finish"); - if ( label != m_btnNext->GetLabel() ) - m_btnNext->SetLabel(label); - - m_btnNext->SetDefault(); - - - // send the change event to the new page now - wxWizardEvent event(wxEVT_WIZARD_PAGE_CHANGED, GetId(), goingForward, m_page); - (void)m_page->GetEventHandler()->ProcessEvent(event); - - // and finally show it - m_page->Show(); - m_page->SetFocus(); - - if ( !m_usingSizer ) - m_sizerBmpAndPage->Layout(); - - if ( !m_started ) - { - m_started = true; - - DoWizardLayout(); - } - - if (GetBitmapPlacement() && m_statbmp) - { - ResizeBitmap(bmp); - - if ( !bmp.IsSameAs(bmpPrev) ) - m_statbmp->SetBitmap(bmp); - - if (m_usingSizer) - m_sizerPage->RecalcSizes(); - } - - wxWizardEvent pageShownEvent(wxEVT_WIZARD_PAGE_SHOWN, GetId(), - goingForward, m_page); - m_page->GetEventHandler()->ProcessEvent(pageShownEvent); - - return true; -} - -/// Do fit, and adjust to screen size if necessary -void wxWizard::DoWizardLayout() -{ - if ( wxSystemSettings::GetScreenType() > wxSYS_SCREEN_PDA ) - { - if (CanDoLayoutAdaptation()) - DoLayoutAdaptation(); - else - GetSizer()->SetSizeHints(this); - - if ( m_posWizard == wxDefaultPosition ) - CentreOnScreen(); - } - - SetLayoutAdaptationDone(true); -} - -bool wxWizard::RunWizard(wxWizardPage *firstPage) -{ - wxCHECK_MSG( firstPage, false, wxT("can't run empty wizard") ); - - m_firstpage = firstPage; - - // can't return false here because there is no old page - (void)ShowPage(firstPage, true /* forward */); - - m_wasModal = true; - - return ShowModal() == wxID_OK; -} - -wxWizardPage *wxWizard::GetCurrentPage() const -{ - return m_page; -} - -wxSize wxWizard::GetPageSize() const -{ - // default width and height of the page - int DEFAULT_PAGE_WIDTH, - DEFAULT_PAGE_HEIGHT; - if ( wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA ) - { - // Make the default page size small enough to fit on screen - DEFAULT_PAGE_WIDTH = wxSystemSettings::GetMetric(wxSYS_SCREEN_X) / 2; - DEFAULT_PAGE_HEIGHT = wxSystemSettings::GetMetric(wxSYS_SCREEN_Y) / 2; - } - else // !PDA - { - DEFAULT_PAGE_WIDTH = - DEFAULT_PAGE_HEIGHT = 270; - } - - // start with default minimal size - wxSize pageSize(DEFAULT_PAGE_WIDTH, DEFAULT_PAGE_HEIGHT); - - // make the page at least as big as specified by user - pageSize.IncTo(m_sizePage); - - if ( m_statbmp ) - { - // make the page at least as tall as the bitmap - pageSize.IncTo(wxSize(0, m_bitmap.GetHeight())); - } - - if ( m_usingSizer ) - { - // make it big enough to contain all pages added to the sizer - pageSize.IncTo(m_sizerPage->GetMaxChildSize()); - } - - return pageSize; -} - -wxSizer *wxWizard::GetPageAreaSizer() const -{ - return m_sizerPage; -} - -void wxWizard::SetBorder(int border) -{ - wxCHECK_RET(!m_started, wxT("wxWizard::SetBorder after RunWizard")); - - m_border = border; -} - -void wxWizard::OnCancel(wxCommandEvent& WXUNUSED(eventUnused)) -{ - // this function probably can never be called when we don't have an active - // page, but a small extra check won't hurt - wxWindow *win = m_page ? (wxWindow *)m_page : (wxWindow *)this; - - wxWizardEvent event(wxEVT_WIZARD_CANCEL, GetId(), false, m_page); - if ( !win->GetEventHandler()->ProcessEvent(event) || event.IsAllowed() ) - { - // no objections - close the dialog - if(IsModal()) - { - EndModal(wxID_CANCEL); - } - else - { - SetReturnCode(wxID_CANCEL); - Hide(); - } - } - //else: request to Cancel ignored -} - -void wxWizard::OnBackOrNext(wxCommandEvent& event) -{ - wxASSERT_MSG( (event.GetEventObject() == m_btnNext) || - (event.GetEventObject() == m_btnPrev), - wxT("unknown button") ); - - wxCHECK_RET( m_page, wxT("should have a valid current page") ); - - // ask the current page first: notice that we do it before calling - // GetNext/Prev() because the data transferred from the controls of the page - // may change the value returned by these methods - if ( !m_page->Validate() || !m_page->TransferDataFromWindow() ) - { - // the page data is incorrect, don't do anything - return; - } - - bool forward = event.GetEventObject() == m_btnNext; - - // Give the application a chance to set state which may influence GetNext()/GetPrev() - wxWizardEvent eventPreChanged(wxEVT_WIZARD_BEFORE_PAGE_CHANGED, GetId(), forward, m_page); - (void)m_page->GetEventHandler()->ProcessEvent(eventPreChanged); - - if (!eventPreChanged.IsAllowed()) - return; - - wxWizardPage *page; - if ( forward ) - { - page = m_page->GetNext(); - } - else // back - { - page = m_page->GetPrev(); - - wxASSERT_MSG( page, wxT("\"GetEventHandler()->ProcessEvent(eventHelp); - } -} - -void wxWizard::OnWizEvent(wxWizardEvent& event) -{ - // the dialogs have wxWS_EX_BLOCK_EVENTS style on by default but we want to - // propagate wxEVT_WIZARD_XXX to the parent (if any), so do it manually - if ( !(GetExtraStyle() & wxWS_EX_BLOCK_EVENTS) ) - { - // the event will be propagated anyhow - event.Skip(); - } - else - { - wxWindow *parent = GetParent(); - - if ( !parent || !parent->GetEventHandler()->ProcessEvent(event) ) - { - event.Skip(); - } - } - - if ( ( !m_wasModal ) && - event.IsAllowed() && - ( event.GetEventType() == wxEVT_WIZARD_FINISHED || - event.GetEventType() == wxEVT_WIZARD_CANCEL - ) - ) - { - Destroy(); - } -} - -void wxWizard::SetBitmap(const wxBitmap& bitmap) -{ - m_bitmap = bitmap; - if (m_statbmp) - m_statbmp->SetBitmap(m_bitmap); -} - -// ---------------------------------------------------------------------------- -// wxWizardEvent -// ---------------------------------------------------------------------------- - -wxWizardEvent::wxWizardEvent(wxEventType type, int id, bool direction, wxWizardPage* page) - : wxNotifyEvent(type, id) -{ - // Modified 10-20-2001 Robert Cavanaugh - // add the active page to the event data - m_direction = direction; - m_page = page; -} - -/// Do the adaptation -bool wxWizard::DoLayoutAdaptation() -{ - wxWindowList windows; - wxWindowList pages; - - // Make all the pages (that use sizers) scrollable - for ( wxSizerItemList::compatibility_iterator node = m_sizerPage->GetChildren().GetFirst(); node; node = node->GetNext() ) - { - wxSizerItem * const item = node->GetData(); - if ( item->IsWindow() ) - { - wxWizardPage* page = wxDynamicCast(item->GetWindow(), wxWizardPage); - if (page) - { - while (page) - { - if (!pages.Find(page) && page->GetSizer()) - { - // Create a scrolled window and reparent - wxScrolledWindow* scrolledWindow = new wxScrolledWindow(page, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL|wxVSCROLL|wxHSCROLL|wxBORDER_NONE); - wxSizer* oldSizer = page->GetSizer(); - - wxSizer* newSizer = new wxBoxSizer(wxVERTICAL); - newSizer->Add(scrolledWindow,1, wxEXPAND, 0); - - page->SetSizer(newSizer, false /* don't delete the old sizer */); - - scrolledWindow->SetSizer(oldSizer); - - wxStandardDialogLayoutAdapter::DoReparentControls(page, scrolledWindow); - - pages.Append(page); - windows.Append(scrolledWindow); - } - page = page->GetNext(); - } - } - } - } - - wxStandardDialogLayoutAdapter::DoFitWithScrolling(this, windows); - - // Size event doesn't get sent soon enough on wxGTK - DoLayout(); - - SetLayoutAdaptationDone(true); - - return true; -} - -bool wxWizard::ResizeBitmap(wxBitmap& bmp) -{ - if (!GetBitmapPlacement()) - return false; - - if (bmp.IsOk()) - { - wxSize pageSize = m_sizerPage->GetSize(); - if (pageSize == wxSize(0,0)) - pageSize = GetPageSize(); - int bitmapWidth = wxMax(bmp.GetWidth(), GetMinimumBitmapWidth()); - int bitmapHeight = pageSize.y; - - if (!m_statbmp->GetBitmap().IsOk() || m_statbmp->GetBitmap().GetHeight() != bitmapHeight) - { - wxBitmap bitmap(bitmapWidth, bitmapHeight); - { - wxMemoryDC dc; - dc.SelectObject(bitmap); - dc.SetBackground(wxBrush(m_bitmapBackgroundColour)); - dc.Clear(); - - if (GetBitmapPlacement() & wxWIZARD_TILE) - { - TileBitmap(wxRect(0, 0, bitmapWidth, bitmapHeight), dc, bmp); - } - else - { - int x, y; - - if (GetBitmapPlacement() & wxWIZARD_HALIGN_LEFT) - x = 0; - else if (GetBitmapPlacement() & wxWIZARD_HALIGN_RIGHT) - x = bitmapWidth - bmp.GetWidth(); - else - x = (bitmapWidth - bmp.GetWidth())/2; - - if (GetBitmapPlacement() & wxWIZARD_VALIGN_TOP) - y = 0; - else if (GetBitmapPlacement() & wxWIZARD_VALIGN_BOTTOM) - y = bitmapHeight - bmp.GetHeight(); - else - y = (bitmapHeight - bmp.GetHeight())/2; - - dc.DrawBitmap(bmp, x, y, true); - dc.SelectObject(wxNullBitmap); - } - } - - bmp = bitmap; - } - } - - return true; -} - -bool wxWizard::TileBitmap(const wxRect& rect, wxDC& dc, const wxBitmap& bitmap) -{ - int w = bitmap.GetWidth(); - int h = bitmap.GetHeight(); - - wxMemoryDC dcMem; - - dcMem.SelectObjectAsSource(bitmap); - - int i, j; - for (i = rect.x; i < rect.x + rect.width; i += w) - { - for (j = rect.y; j < rect.y + rect.height; j+= h) - dc.Blit(i, j, bitmap.GetWidth(), bitmap.GetHeight(), & dcMem, 0, 0); - } - dcMem.SelectObject(wxNullBitmap); - - return true; -} - -#endif // wxUSE_WIZARDDLG diff --git a/Externals/wxWidgets3/src/gtk/aboutdlg.cpp b/Externals/wxWidgets3/src/gtk/aboutdlg.cpp deleted file mode 100644 index e65eb41d24..0000000000 --- a/Externals/wxWidgets3/src/gtk/aboutdlg.cpp +++ /dev/null @@ -1,246 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/aboutdlg.cpp -// Purpose: native GTK+ wxAboutBox() implementation -// Author: Vadim Zeitlin -// Created: 2006-10-08 -// Copyright: (c) 2006 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// for compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if wxUSE_ABOUTDLG - -#include "wx/aboutdlg.h" - -#ifndef WX_PRECOMP - #include "wx/window.h" -#endif //WX_PRECOMP - -#include -#include "wx/gtk/private.h" -#include "wx/gtk/private/gtk2-compat.h" - -// ---------------------------------------------------------------------------- -// GtkArray: temporary array of GTK strings -// ---------------------------------------------------------------------------- - -namespace -{ - -class GtkArray -{ -public: - // Create empty GtkArray - GtkArray() : m_strings(0), m_count(0) - { - } - - // Create GtkArray from wxArrayString. Note that the created object is - // only valid as long as 'a' is! - GtkArray(const wxArrayString& a) - { - m_count = a.size(); - m_strings = new const gchar *[m_count + 1]; - - for ( size_t n = 0; n < m_count; n++ ) - { -#if wxUSE_UNICODE - // notice that there is no need to copy the string pointer here - // because this class is used only as a temporary and during its - // existence the pointer persists in wxString which uses it either - // for internal representation (in wxUSE_UNICODE_UTF8 case) or as - // cached m_convertedToChar (in wxUSE_UNICODE_WCHAR case) - m_strings[n] = wxGTK_CONV_SYS(a[n]); -#else // !wxUSE_UNICODE - // and in ANSI build we can simply borrow the pointer from - // wxCharBuffer (which owns it in this case) instead of copying it - // but we then become responsible for freeing it - m_strings[n] = wxGTK_CONV_SYS(a[n]).release(); -#endif // wxUSE_UNICODE/!wxUSE_UNICODE - } - - // array must be NULL-terminated - m_strings[m_count] = NULL; - } - - operator const gchar **() const { return m_strings; } - - ~GtkArray() - { -#if !wxUSE_UNICODE - for ( size_t n = 0; n < m_count; n++ ) - free(const_cast(m_strings[n])); -#endif - - delete [] m_strings; - } - -private: - const gchar **m_strings; - size_t m_count; - - wxDECLARE_NO_COPY_CLASS(GtkArray); -}; - -} // anonymous namespace - -// ============================================================================ -// implementation -// ============================================================================ - -// GTK+ about dialog is modeless, keep track of it in this variable -static GtkAboutDialog *gs_aboutDialog = NULL; - -extern "C" { -static void wxGtkAboutDialogOnClose(GtkAboutDialog *about) -{ - gtk_widget_destroy(GTK_WIDGET(about)); - if ( about == gs_aboutDialog ) - gs_aboutDialog = NULL; -} -} - -#ifdef __WXGTK3__ -extern "C" { -static gboolean activate_link(GtkAboutDialog*, const char* link, void* dontIgnore) -{ - if (dontIgnore) - { - wxLaunchDefaultBrowser(wxGTK_CONV_BACK_SYS(link)); - return true; - } - return false; -} -} -#else -extern "C" { -static void wxGtkAboutDialogOnLink(GtkAboutDialog*, const char* link, void*) -{ - wxLaunchDefaultBrowser(wxGTK_CONV_BACK_SYS(link)); -} -} -#endif - -void wxAboutBox(const wxAboutDialogInfo& info, wxWindow* parent) -{ - // don't create another dialog if one is already present - if ( !gs_aboutDialog ) - gs_aboutDialog = GTK_ABOUT_DIALOG(gtk_about_dialog_new()); - - GtkAboutDialog * const dlg = gs_aboutDialog; - gtk_about_dialog_set_program_name(dlg, wxGTK_CONV_SYS(info.GetName())); - if ( info.HasVersion() ) - gtk_about_dialog_set_version(dlg, wxGTK_CONV_SYS(info.GetVersion())); - else - gtk_about_dialog_set_version(dlg, NULL); - if ( info.HasCopyright() ) - gtk_about_dialog_set_copyright(dlg, wxGTK_CONV_SYS(info.GetCopyrightToDisplay())); - else - gtk_about_dialog_set_copyright(dlg, NULL); - if ( info.HasDescription() ) - gtk_about_dialog_set_comments(dlg, wxGTK_CONV_SYS(info.GetDescription())); - else - gtk_about_dialog_set_comments(dlg, NULL); - if ( info.HasLicence() ) - gtk_about_dialog_set_license(dlg, wxGTK_CONV_SYS(info.GetLicence())); - else - gtk_about_dialog_set_license(dlg, NULL); - - wxIcon icon = info.GetIcon(); - if ( icon.IsOk() ) - gtk_about_dialog_set_logo(dlg, info.GetIcon().GetPixbuf()); - - if ( info.HasWebSite() ) - { -#ifdef __WXGTK3__ - g_signal_connect(dlg, "activate-link", G_CALLBACK(activate_link), dlg); -#else - // NB: must be called before gtk_about_dialog_set_website() as - // otherwise it has no effect (although GTK+ docs don't mention - // this...) - gtk_about_dialog_set_url_hook(wxGtkAboutDialogOnLink, NULL, NULL); -#endif - - gtk_about_dialog_set_website(dlg, wxGTK_CONV_SYS(info.GetWebSiteURL())); - gtk_about_dialog_set_website_label - ( - dlg, - wxGTK_CONV_SYS(info.GetWebSiteDescription()) - ); - } - else - { - gtk_about_dialog_set_website(dlg, NULL); - gtk_about_dialog_set_website_label(dlg, NULL); -#ifdef __WXGTK3__ - g_signal_connect(dlg, "activate-link", G_CALLBACK(activate_link), NULL); -#else - gtk_about_dialog_set_url_hook(NULL, NULL, NULL); -#endif - } - - if ( info.HasDevelopers() ) - gtk_about_dialog_set_authors(dlg, GtkArray(info.GetDevelopers())); - else - gtk_about_dialog_set_authors(dlg, GtkArray()); - if ( info.HasDocWriters() ) - gtk_about_dialog_set_documenters(dlg, GtkArray(info.GetDocWriters())); - else - gtk_about_dialog_set_documenters(dlg, GtkArray()); - if ( info.HasArtists() ) - gtk_about_dialog_set_artists(dlg, GtkArray(info.GetArtists())); - else - gtk_about_dialog_set_artists(dlg, GtkArray()); - - wxString transCredits; - if ( info.HasTranslators() ) - { - const wxArrayString& translators = info.GetTranslators(); - const size_t count = translators.size(); - for ( size_t n = 0; n < count; n++ ) - { - transCredits << translators[n] << wxT('\n'); - } - } - else // no translators explicitly specified - { - // maybe we have translator credits in the message catalog? - wxString translator = _("translator-credits"); - - // gtk_about_dialog_set_translator_credits() is smart enough to - // detect if "translator-credits" is untranslated and hide the - // translators tab in that case, however it will still show the - // "credits" button, (at least GTK 2.10.6) even if there are no - // credits informations at all, so we still need to do the check - // ourselves - if ( translator != wxT("translator-credits") ) // untranslated! - transCredits = translator; - } - - if ( !transCredits.empty() ) - gtk_about_dialog_set_translator_credits(dlg, wxGTK_CONV_SYS(transCredits)); - else - gtk_about_dialog_set_translator_credits(dlg, NULL); - - g_signal_connect(dlg, "response", - G_CALLBACK(wxGtkAboutDialogOnClose), NULL); - - GtkWindow* gtkParent = NULL; - if (parent && parent->m_widget) - gtkParent = (GtkWindow*)gtk_widget_get_ancestor(parent->m_widget, GTK_TYPE_WINDOW); - gtk_window_set_transient_for(GTK_WINDOW(dlg), gtkParent); - - gtk_window_present(GTK_WINDOW(dlg)); -} - -#endif // wxUSE_ABOUTDLG diff --git a/Externals/wxWidgets3/src/gtk/activityindicator.cpp b/Externals/wxWidgets3/src/gtk/activityindicator.cpp deleted file mode 100644 index c64d84601a..0000000000 --- a/Externals/wxWidgets3/src/gtk/activityindicator.cpp +++ /dev/null @@ -1,168 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/activityindicator.cpp -// Purpose: wxActivityIndicator implementation for wxGTK. -// Author: Vadim Zeitlin -// Created: 2015-03-05 -// Copyright: (c) 2015 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// for compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_ACTIVITYINDICATOR && defined(__WXGTK220__) - -#include "wx/activityindicator.h" - -#include "wx/math.h" - -#include - -// Macro return the specified expression only if GTK+ run time version is less -// than 2.20 and compiling it only if it is less than 3.0 (which is why this -// has to be a macro and not a function). -#if defined(__WXGTK220__) && !defined(__WXGTK3__) - #define RETURN_IF_NO_GTK_SPINNER(expr) \ - if ( gtk_check_version(2, 20, 0) != 0 ) { return expr; } -#else - #define RETURN_IF_NO_GTK_SPINNER(expr) -#endif - -// ============================================================================ -// implementation -// ============================================================================ - -wxIMPLEMENT_DYNAMIC_CLASS(wxActivityIndicator, wxControl); - -bool -wxActivityIndicator::Create(wxWindow* parent, - wxWindowID winid, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) -{ - RETURN_IF_NO_GTK_SPINNER( - wxActivityIndicatorGeneric::Create(parent, winid, pos, size, style, name) - ) - - if ( !PreCreation(parent, pos, size) || - !CreateBase(parent, winid, pos, size, style, name) ) - return false; - - m_widget = gtk_spinner_new(); - g_object_ref(m_widget); - - m_parent->DoAddChild(this); - - PostCreation(size); - - return true; -} - -void wxActivityIndicator::Start() -{ - RETURN_IF_NO_GTK_SPINNER( wxActivityIndicatorGeneric::Start() ) - - wxCHECK_RET( m_widget, wxS("Must be created first") ); - - gtk_spinner_start(GTK_SPINNER(m_widget)); -} - -void wxActivityIndicator::Stop() -{ - RETURN_IF_NO_GTK_SPINNER( wxActivityIndicatorGeneric::Stop() ) - - wxCHECK_RET( m_widget, wxS("Must be created first") ); - - gtk_spinner_stop(GTK_SPINNER(m_widget)); -} - -bool wxActivityIndicator::IsRunning() const -{ - RETURN_IF_NO_GTK_SPINNER( wxActivityIndicatorGeneric::IsRunning() ) - - if ( !m_widget ) - return false; - - gboolean b; - g_object_get(m_widget, "active", &b, NULL); - - return b != 0; -} - -wxSize wxActivityIndicator::DoGetBestClientSize() const -{ - RETURN_IF_NO_GTK_SPINNER( wxActivityIndicatorGeneric::DoGetBestClientSize() ) - - if ( !m_widget ) - return wxDefaultSize; - - gint w, h; - -#ifdef __WXGTK3__ - // gtk_widget_get_preferred_size() seems to return the size based on the - // current size of the widget and also always returns 0 if it is hidden, - // so ask GtkSpinner for its preferred size directly instead of using it. - GtkWidgetClass* const wc = GTK_WIDGET_GET_CLASS(m_widget); - - // We're not interested in the natural size (and it's the same as minimal - // one anyhow currently), but we still need a non-NULL pointer for it. - gint dummy; - wc->get_preferred_width(m_widget, &w, &dummy); - wc->get_preferred_height(m_widget, &h, &dummy); -#else // GTK+ 2 - // GTK+ 2 doesn't return any valid preferred size for this control, so we - // use the size of something roughly equivalent to it. - gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &w, &h); -#endif // GTK+ 3/2 - - // Adjust for the window variant: note that the default size in GTK+ 3 is - // really small (12px until ~3.10, 16px since then), so we use this size as - // the small size and double it for the normal size. - double factor = 0.; - switch ( GetWindowVariant() ) - { - case wxWINDOW_VARIANT_MAX: - wxFAIL_MSG(wxS("Invalid window variant")); - wxFALLTHROUGH; - - case wxWINDOW_VARIANT_NORMAL: - factor = 2.; - break; - - case wxWINDOW_VARIANT_SMALL: - factor = 1.; - break; - - case wxWINDOW_VARIANT_MINI: - factor = 0.75; - break; - - case wxWINDOW_VARIANT_LARGE: - // GTK+ 3.11+ limits GtkSpinner size to twice its minimal size, so - // the effective factor here is actually just 2, i.e. the same as - // for the normal size, but use something larger just in case GTK+ - // changes its mind again later. - factor = 2.5; - break; - } - - wxASSERT_MSG( !wxIsSameDouble(factor, 0), wxS("Unknown window variant") ); - - return wxSize(wxRound(w*factor), wxRound(h*factor)); -} - -#endif // wxUSE_ACTIVITYINDICATOR diff --git a/Externals/wxWidgets3/src/gtk/animate.cpp b/Externals/wxWidgets3/src/gtk/animate.cpp deleted file mode 100644 index a36a16f33d..0000000000 --- a/Externals/wxWidgets3/src/gtk/animate.cpp +++ /dev/null @@ -1,465 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/animate.cpp -// Purpose: wxAnimation and wxAnimationCtrl -// Author: Francesco Montorsi -// Modified By: -// Created: 24/09/2006 -// Copyright: (c) Francesco Montorsi -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if wxUSE_ANIMATIONCTRL && !defined(__WXUNIVERSAL__) - -#include "wx/animate.h" - -#ifndef WX_PRECOMP - #include "wx/image.h" - #include "wx/log.h" - #include "wx/stream.h" -#endif - -#include "wx/wfstream.h" -#include "wx/gtk/private.h" - -#include - - -// ============================================================================ -// implementation -// ============================================================================ - -void gdk_pixbuf_area_updated(GdkPixbufLoader *loader, - gint WXUNUSED(x), - gint WXUNUSED(y), - gint WXUNUSED(width), - gint WXUNUSED(height), - wxAnimation *anim) -{ - if (anim && anim->GetPixbuf() == NULL) - { - // we need to set the pixbuf only if this is the first time this signal - // has been called! - anim->SetPixbuf(gdk_pixbuf_loader_get_animation(loader)); - } -} - - -//----------------------------------------------------------------------------- -// wxAnimation -//----------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxAnimation, wxAnimationBase); - -wxAnimation::wxAnimation(const wxAnimation& that) - : base_type(that) -{ - m_pixbuf = that.m_pixbuf; - if (m_pixbuf) - g_object_ref(m_pixbuf); -} - -wxAnimation::wxAnimation(GdkPixbufAnimation *p) -{ - m_pixbuf = p; - if ( m_pixbuf ) - g_object_ref(m_pixbuf); -} - -wxAnimation& wxAnimation::operator=(const wxAnimation& that) -{ - if (this != &that) - { - base_type::operator=(that); - UnRef(); - m_pixbuf = that.m_pixbuf; - if (m_pixbuf) - g_object_ref(m_pixbuf); - } - return *this; -} - -bool wxAnimation::LoadFile(const wxString &name, wxAnimationType WXUNUSED(type)) -{ - UnRef(); - m_pixbuf = gdk_pixbuf_animation_new_from_file(wxGTK_CONV_FN(name), NULL); - return IsOk(); -} - -bool wxAnimation::Load(wxInputStream &stream, wxAnimationType type) -{ - UnRef(); - - char anim_type[12]; - switch (type) - { - case wxANIMATION_TYPE_GIF: - strcpy(anim_type, "gif"); - break; - - case wxANIMATION_TYPE_ANI: - strcpy(anim_type, "ani"); - break; - - default: - anim_type[0] = '\0'; - break; - } - - // create a GdkPixbufLoader - GError *error = NULL; - GdkPixbufLoader *loader; - if (type != wxANIMATION_TYPE_INVALID && type != wxANIMATION_TYPE_ANY) - loader = gdk_pixbuf_loader_new_with_type(anim_type, &error); - else - loader = gdk_pixbuf_loader_new(); - - if (!loader || - error != NULL) // even if the loader was allocated, an error could have happened - { - wxLogDebug(wxT("Could not create the loader for '%s' animation type: %s"), - anim_type, error->message); - return false; - } - - // connect to loader signals - g_signal_connect(loader, "area-updated", G_CALLBACK(gdk_pixbuf_area_updated), this); - - guchar buf[2048]; - bool data_written = false; - while (stream.IsOk()) - { - // read a chunk of data - if (!stream.Read(buf, sizeof(buf)) && - stream.GetLastError() != wxSTREAM_EOF) // EOF is OK for now - { - // gdk_pixbuf_loader_close wants the GError == NULL - gdk_pixbuf_loader_close(loader, NULL); - return false; - } - - // fetch all data into the loader - if (!gdk_pixbuf_loader_write(loader, buf, stream.LastRead(), &error)) - { - wxLogDebug(wxT("Could not write to the loader: %s"), error->message); - - // gdk_pixbuf_loader_close wants the GError == NULL - gdk_pixbuf_loader_close(loader, NULL); - return false; - } - - data_written = true; - } - - if (!data_written) - { - wxLogDebug("Could not read data from the stream..."); - return false; - } - - // load complete: gdk_pixbuf_loader_close will now check if the data we - // wrote inside the pixbuf loader does make sense and will give an error - // if it doesn't (because of a truncated file, corrupted data or whatelse) - if (!gdk_pixbuf_loader_close(loader, &error)) - { - wxLogDebug(wxT("Could not close the loader: %s"), error->message); - return false; - } - - // wait until we get the last area_updated signal - return data_written; -} - -wxImage wxAnimation::GetFrame(unsigned int WXUNUSED(frame)) const -{ - return wxNullImage; -} - -wxSize wxAnimation::GetSize() const -{ - return wxSize(gdk_pixbuf_animation_get_width(m_pixbuf), - gdk_pixbuf_animation_get_height(m_pixbuf)); -} - -void wxAnimation::UnRef() -{ - if (m_pixbuf) - g_object_unref(m_pixbuf); - m_pixbuf = NULL; -} - -void wxAnimation::SetPixbuf(GdkPixbufAnimation* p) -{ - UnRef(); - m_pixbuf = p; - if (m_pixbuf) - g_object_ref(m_pixbuf); -} - -//----------------------------------------------------------------------------- -// wxAnimationCtrl -//----------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxAnimationCtrl, wxAnimationCtrlBase); -wxBEGIN_EVENT_TABLE(wxAnimationCtrl, wxAnimationCtrlBase) - EVT_TIMER(wxID_ANY, wxAnimationCtrl::OnTimer) -wxEND_EVENT_TABLE() - -void wxAnimationCtrl::Init() -{ - m_anim = NULL; - m_iter = NULL; - m_bPlaying = false; -} - -bool wxAnimationCtrl::Create( wxWindow *parent, wxWindowID id, - const wxAnimation& anim, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) -{ - if (!PreCreation( parent, pos, size ) || - !base_type::CreateBase(parent, id, pos, size, style & wxWINDOW_STYLE_MASK, - wxDefaultValidator, name)) - { - wxFAIL_MSG( wxT("wxAnimationCtrl creation failed") ); - return false; - } - - SetWindowStyle(style); - - m_widget = gtk_image_new(); - g_object_ref(m_widget); - - m_parent->DoAddChild( this ); - - PostCreation(size); - SetInitialSize(size); - - if (anim.IsOk()) - SetAnimation(anim); - - // init the timer used for animation - m_timer.SetOwner(this); - - return true; -} - -wxAnimationCtrl::~wxAnimationCtrl() -{ - ResetAnim(); - ResetIter(); -} - -bool wxAnimationCtrl::LoadFile(const wxString &filename, wxAnimationType type) -{ - wxFileInputStream fis(filename); - if (!fis.IsOk()) - return false; - return Load(fis, type); -} - -bool wxAnimationCtrl::Load(wxInputStream& stream, wxAnimationType type) -{ - wxAnimation anim; - if ( !anim.Load(stream, type) || !anim.IsOk() ) - return false; - - SetAnimation(anim); - return true; -} - -void wxAnimationCtrl::SetAnimation(const wxAnimation &anim) -{ - if (IsPlaying()) - Stop(); - - ResetAnim(); - ResetIter(); - - // copy underlying GdkPixbuf object - m_anim = anim.GetPixbuf(); - - // m_anim may be null in case wxNullAnimation has been passed - if (m_anim) - { - // add a reference to the GdkPixbufAnimation - g_object_ref(m_anim); - - if (!this->HasFlag(wxAC_NO_AUTORESIZE)) - FitToAnimation(); - } - - DisplayStaticImage(); -} - -void wxAnimationCtrl::FitToAnimation() -{ - if (!m_anim) - return; - - int w = gdk_pixbuf_animation_get_width(m_anim), - h = gdk_pixbuf_animation_get_height(m_anim); - - // update our size to fit animation - SetSize(w, h); -} - -void wxAnimationCtrl::ResetAnim() -{ - if (m_anim) - g_object_unref(m_anim); - m_anim = NULL; -} - -void wxAnimationCtrl::ResetIter() -{ - if (m_iter) - g_object_unref(m_iter); - m_iter = NULL; -} - -bool wxAnimationCtrl::Play() -{ - if (m_anim == NULL) - return false; - - // init the iterator and start a one-shot timer - ResetIter(); - m_iter = gdk_pixbuf_animation_get_iter (m_anim, NULL); - m_bPlaying = true; - - // gdk_pixbuf_animation_iter_get_delay_time() may return -1 which means - // that the timer should not start - int n = gdk_pixbuf_animation_iter_get_delay_time(m_iter); - if (n >= 0) - m_timer.Start(n, true); - - return true; -} - -void wxAnimationCtrl::Stop() -{ - // leave current frame displayed until Play() is called again - if (IsPlaying()) - m_timer.Stop(); - m_bPlaying = false; - - ResetIter(); - DisplayStaticImage(); -} - -void wxAnimationCtrl::DisplayStaticImage() -{ - wxASSERT(!IsPlaying()); - - // m_bmpStaticReal will be updated only if necessary... - UpdateStaticImage(); - - if (m_bmpStaticReal.IsOk()) - { - // show inactive bitmap - gtk_image_set_from_pixbuf(GTK_IMAGE(m_widget), - m_bmpStaticReal.GetPixbuf()); - } - else - { - if (m_anim) - { - // even if not clearly documented, gdk_pixbuf_animation_get_static_image() - // always returns the first frame of the animation - gtk_image_set_from_pixbuf(GTK_IMAGE(m_widget), - gdk_pixbuf_animation_get_static_image(m_anim)); - } - else - { - ClearToBackgroundColour(); - } - } -} - -bool wxAnimationCtrl::IsPlaying() const -{ - // NB: we cannot just return m_timer.IsRunning() as this would not - // be safe as e.g. if we are displaying a frame forever, - // then we are "officially" still playing the animation, but - // the timer is not running anymore... - return m_bPlaying; -} - -wxSize wxAnimationCtrl::DoGetBestSize() const -{ - if (m_anim && !this->HasFlag(wxAC_NO_AUTORESIZE)) - { - return wxSize(gdk_pixbuf_animation_get_width(m_anim), - gdk_pixbuf_animation_get_height(m_anim)); - } - - return wxSize(100,100); -} - -void wxAnimationCtrl::ClearToBackgroundColour() -{ - wxSize sz = GetClientSize(); - GdkPixbuf *newpix = gdk_pixbuf_new(GDK_COLORSPACE_RGB, false, 8, - sz.GetWidth(), sz.GetHeight()); - if (!newpix) - return; - - wxColour clr = GetBackgroundColour(); - guint32 col = (clr.Red() << 24) | (clr.Green() << 16) | (clr.Blue() << 8); - gdk_pixbuf_fill(newpix, col); - - gtk_image_set_from_pixbuf(GTK_IMAGE(m_widget), newpix); - g_object_unref(newpix); -} - -bool wxAnimationCtrl::SetBackgroundColour( const wxColour &colour ) -{ - // wxWindowGTK::SetBackgroundColour works but since our m_widget is a GtkImage - // it won't show the background colour unlike the user would expect. - // Thus we clear the GtkImage contents to the background colour... - if (!wxControl::SetBackgroundColour(colour)) - return false; - - // if not playing the change must take place immediately but - // remember that the inactive bitmap has higher priority over the background - // colour; DisplayStaticImage() will handle that - if ( !IsPlaying() ) - DisplayStaticImage(); - - return true; -} - - -//----------------------------------------------------------------------------- -// wxAnimationCtrl - event handlers -//----------------------------------------------------------------------------- - -void wxAnimationCtrl::OnTimer(wxTimerEvent& WXUNUSED(ev)) -{ - wxASSERT(m_iter != NULL); - - // gdk_pixbuf_animation_iter_advance() will automatically restart - // the animation, if necessary and we have no way to know !! - if (gdk_pixbuf_animation_iter_advance(m_iter, NULL)) - { - // start a new one-shot timer - int n = gdk_pixbuf_animation_iter_get_delay_time(m_iter); - if (n >= 0) - m_timer.Start(n, true); - - gtk_image_set_from_pixbuf(GTK_IMAGE(m_widget), - gdk_pixbuf_animation_iter_get_pixbuf(m_iter)); - } - else - { - // no need to update the m_widget yet - m_timer.Start(10, true); - } -} - -#endif // wxUSE_ANIMATIONCTRL diff --git a/Externals/wxWidgets3/src/gtk/anybutton.cpp b/Externals/wxWidgets3/src/gtk/anybutton.cpp deleted file mode 100644 index 16e7b4a22d..0000000000 --- a/Externals/wxWidgets3/src/gtk/anybutton.cpp +++ /dev/null @@ -1,429 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/anybutton.cpp -// Purpose: -// Author: Robert Roebling -// Created: 1998-05-20 (extracted from button.cpp) -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef wxHAS_ANY_BUTTON - -#ifndef WX_PRECOMP - #include "wx/anybutton.h" -#endif - -#include "wx/stockitem.h" - -#include -#include "wx/gtk/private/gtk2-compat.h" - -// ---------------------------------------------------------------------------- -// GTK callbacks -// ---------------------------------------------------------------------------- - -extern "C" -{ - -static void -wxgtk_button_enter_callback(GtkWidget *WXUNUSED(widget), wxAnyButton *button) -{ - if ( button->GTKShouldIgnoreEvent() ) - return; - - button->GTKMouseEnters(); -} - -static void -wxgtk_button_leave_callback(GtkWidget *WXUNUSED(widget), wxAnyButton *button) -{ - if ( button->GTKShouldIgnoreEvent() ) - return; - - button->GTKMouseLeaves(); -} - -static void -wxgtk_button_press_callback(GtkWidget *WXUNUSED(widget), wxAnyButton *button) -{ - if ( button->GTKShouldIgnoreEvent() ) - return; - - button->GTKPressed(); -} - -static void -wxgtk_button_released_callback(GtkWidget *WXUNUSED(widget), wxAnyButton *button) -{ - if ( button->GTKShouldIgnoreEvent() ) - return; - - button->GTKReleased(); -} - -} // extern "C" - -//----------------------------------------------------------------------------- -// wxAnyButton -//----------------------------------------------------------------------------- - -bool wxAnyButton::Enable( bool enable ) -{ - if (!base_type::Enable(enable)) - return false; - - gtk_widget_set_sensitive(gtk_bin_get_child(GTK_BIN(m_widget)), enable); - - if (enable) - GTKFixSensitivity(); - - GTKUpdateBitmap(); - - return true; -} - -GdkWindow *wxAnyButton::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const -{ - return gtk_button_get_event_window(GTK_BUTTON(m_widget)); -} - -// static -wxVisualAttributes -wxAnyButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) -{ - return GetDefaultAttributesFromGTKWidget(gtk_button_new()); -} - -// ---------------------------------------------------------------------------- -// bitmaps support -// ---------------------------------------------------------------------------- - -void wxAnyButton::GTKMouseEnters() -{ - m_isCurrent = true; - - GTKUpdateBitmap(); -} - -void wxAnyButton::GTKMouseLeaves() -{ - m_isCurrent = false; - - GTKUpdateBitmap(); -} - -void wxAnyButton::GTKPressed() -{ - m_isPressed = true; - - GTKUpdateBitmap(); -} - -void wxAnyButton::GTKReleased() -{ - m_isPressed = false; - - GTKUpdateBitmap(); -} - -void wxAnyButton::GTKOnFocus(wxFocusEvent& event) -{ - event.Skip(); - - GTKUpdateBitmap(); -} - -wxAnyButton::State wxAnyButton::GTKGetCurrentBitmapState() const -{ - if ( !IsThisEnabled() ) - { - if ( m_bitmaps[State_Disabled].IsOk() ) - return State_Disabled; - } - else - { - if ( m_isPressed && m_bitmaps[State_Pressed].IsOk() ) - return State_Pressed; - - if ( m_isCurrent && m_bitmaps[State_Current].IsOk() ) - return State_Current; - - if ( HasFocus() && m_bitmaps[State_Focused].IsOk() ) - return State_Focused; - } - - // Fall back on the normal state: which still might be different from - // State_Normal for the toggle buttons, so the check for bitmap validity is - // still needed. - const State normalState = GetNormalState(); - if ( m_bitmaps[normalState].IsOk() ) - return normalState; - - // And if nothing else can (or should) be used, finally fall back to the - // normal state which is the only one guaranteed to have a bitmap (if we're - // using bitmaps at all and we're only called in this case). - return State_Normal; -} - -void wxAnyButton::GTKUpdateBitmap() -{ - // if we don't show bitmaps at all, there is nothing to update - if ( m_bitmaps[State_Normal].IsOk() ) - { - // if we do show them, this will return a state for which we do have a - // valid bitmap - State state = GTKGetCurrentBitmapState(); - - GTKDoShowBitmap(m_bitmaps[state]); - } -} - -void wxAnyButton::GTKDoShowBitmap(const wxBitmap& bitmap) -{ - wxASSERT_MSG( bitmap.IsOk(), "invalid bitmap" ); - - GtkWidget *image; - if ( DontShowLabel() ) - { - image = gtk_bin_get_child(GTK_BIN(m_widget)); - } - else // have both label and bitmap - { - image = gtk_button_get_image(GTK_BUTTON(m_widget)); - } - - wxCHECK_RET( image && GTK_IS_IMAGE(image), "must have image widget" ); - - gtk_image_set_from_pixbuf(GTK_IMAGE(image), bitmap.GetPixbuf()); -} - -wxBitmap wxAnyButton::DoGetBitmap(State which) const -{ - return m_bitmaps[which]; -} - -void wxAnyButton::DoSetBitmap(const wxBitmap& bitmap, State which) -{ - switch ( which ) - { - case State_Normal: - if ( DontShowLabel() ) - { - // we only have the bitmap in this button, never remove it but - // do invalidate the best size when the bitmap (and presumably - // its size) changes - InvalidateBestSize(); - } - // normal image is special: setting it enables images for the button and - // resetting it to nothing disables all of them - else - { - GtkWidget *image = gtk_button_get_image(GTK_BUTTON(m_widget)); - if ( image && !bitmap.IsOk() ) - { - gtk_container_remove(GTK_CONTAINER(m_widget), image); - } - else if ( !image && bitmap.IsOk() ) - { - image = gtk_image_new(); - gtk_button_set_image(GTK_BUTTON(m_widget), image); - - // Setting the image recreates the label, so we need to - // reapply the styles to it to preserve the existing text - // font and colour if they're different from defaults. - GTKApplyWidgetStyle(); - } - else // image presence or absence didn't change - { - // don't invalidate best size below - break; - } - - InvalidateBestSize(); - } - break; - - case State_Pressed: - if ( bitmap.IsOk() ) - { - if ( !m_bitmaps[which].IsOk() ) - { - // we need to install the callbacks to be notified about - // the button pressed state change - g_signal_connect - ( - m_widget, - "pressed", - G_CALLBACK(wxgtk_button_press_callback), - this - ); - - g_signal_connect - ( - m_widget, - "released", - G_CALLBACK(wxgtk_button_released_callback), - this - ); - } - } - else // no valid bitmap - { - if ( m_bitmaps[which].IsOk() ) - { - // we don't need to be notified about the button pressed - // state changes any more - g_signal_handlers_disconnect_by_func - ( - m_widget, - (gpointer)wxgtk_button_press_callback, - this - ); - - g_signal_handlers_disconnect_by_func - ( - m_widget, - (gpointer)wxgtk_button_released_callback, - this - ); - - // also make sure we don't remain stuck in pressed state - if ( m_isPressed ) - { - m_isPressed = false; - GTKUpdateBitmap(); - } - } - } - break; - - case State_Current: - // the logic here is the same as above for State_Pressed: we need - // to connect the handlers if we must be notified about the changes - // in the button current state and we disconnect them when/if we - // don't need them any more - if ( bitmap.IsOk() ) - { - if ( !m_bitmaps[which].IsOk() ) - { - g_signal_connect - ( - m_widget, - "enter", - G_CALLBACK(wxgtk_button_enter_callback), - this - ); - - g_signal_connect - ( - m_widget, - "leave", - G_CALLBACK(wxgtk_button_leave_callback), - this - ); - } - } - else // no valid bitmap - { - if ( m_bitmaps[which].IsOk() ) - { - g_signal_handlers_disconnect_by_func - ( - m_widget, - (gpointer)wxgtk_button_enter_callback, - this - ); - - g_signal_handlers_disconnect_by_func - ( - m_widget, - (gpointer)wxgtk_button_leave_callback, - this - ); - - if ( m_isCurrent ) - { - m_isCurrent = false; - GTKUpdateBitmap(); - } - } - } - break; - - case State_Focused: - if ( bitmap.IsOk() ) - { - Connect(wxEVT_SET_FOCUS, - wxFocusEventHandler(wxAnyButton::GTKOnFocus)); - Connect(wxEVT_KILL_FOCUS, - wxFocusEventHandler(wxAnyButton::GTKOnFocus)); - } - else // no valid focused bitmap - { - Disconnect(wxEVT_SET_FOCUS, - wxFocusEventHandler(wxAnyButton::GTKOnFocus)); - Disconnect(wxEVT_KILL_FOCUS, - wxFocusEventHandler(wxAnyButton::GTKOnFocus)); - } - break; - - default: - // no callbacks to connect/disconnect - ; - } - - m_bitmaps[which] = bitmap; - - // update the bitmap immediately if necessary, otherwise it will be done - // when the bitmap for the corresponding state is needed the next time by - // GTKUpdateBitmap() - if ( bitmap.IsOk() && which == GTKGetCurrentBitmapState() ) - { - GTKDoShowBitmap(bitmap); - } -} - -void wxAnyButton::DoSetBitmapPosition(wxDirection dir) -{ -#ifdef __WXGTK210__ - if ( !gtk_check_version(2,10,0) ) - { - GtkPositionType gtkpos; - switch ( dir ) - { - default: - wxFAIL_MSG( "invalid position" ); - // fall through - - case wxLEFT: - gtkpos = GTK_POS_LEFT; - break; - - case wxRIGHT: - gtkpos = GTK_POS_RIGHT; - break; - - case wxTOP: - gtkpos = GTK_POS_TOP; - break; - - case wxBOTTOM: - gtkpos = GTK_POS_BOTTOM; - break; - } - - gtk_button_set_image_position(GTK_BUTTON(m_widget), gtkpos); - - // As in DoSetBitmap() above, the above call can invalidate the label - // style, so reapply it to preserve its font and colour. - GTKApplyWidgetStyle(); - - InvalidateBestSize(); - } -#endif // GTK+ 2.10+ -} - -#endif // wxHAS_ANY_BUTTON diff --git a/Externals/wxWidgets3/src/gtk/app.cpp b/Externals/wxWidgets3/src/gtk/app.cpp deleted file mode 100644 index 517541ea2e..0000000000 --- a/Externals/wxWidgets3/src/gtk/app.cpp +++ /dev/null @@ -1,555 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/app.cpp -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling, Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#include "wx/app.h" - -#ifndef WX_PRECOMP - #include "wx/intl.h" - #include "wx/log.h" - #include "wx/utils.h" - #include "wx/memory.h" - #include "wx/font.h" -#endif - -#include "wx/thread.h" - -#ifdef __WXGPE__ - #include -#endif - -#include "wx/apptrait.h" -#include "wx/fontmap.h" - -#include -#include "wx/gtk/private.h" - -//----------------------------------------------------------------------------- -// link GnomeVFS -//----------------------------------------------------------------------------- - -#if wxUSE_MIMETYPE && wxUSE_LIBGNOMEVFS - #include "wx/link.h" - wxFORCE_LINK_MODULE(gnome_vfs) -#endif - -//----------------------------------------------------------------------------- -// local functions -//----------------------------------------------------------------------------- - -// One-shot signal emission hook, to install idle handler. -extern "C" { -static gboolean -wx_emission_hook(GSignalInvocationHint*, guint, const GValue*, gpointer data) -{ - wxApp* app = wxTheApp; - if (app != NULL) - app->WakeUpIdle(); - bool* hook_installed = (bool*)data; - // record that hook is not installed - *hook_installed = false; - // remove hook - return false; -} -} - -// Add signal emission hooks, to re-install idle handler when needed. -static void wx_add_idle_hooks() -{ - // "event" hook - { - static bool hook_installed; - if (!hook_installed) - { - static guint sig_id; - if (sig_id == 0) - sig_id = g_signal_lookup("event", GTK_TYPE_WIDGET); - hook_installed = true; - g_signal_add_emission_hook( - sig_id, 0, wx_emission_hook, &hook_installed, NULL); - } - } - // "size_allocate" hook - // Needed to match the behaviour of the old idle system, - // but probably not necessary. - { - static bool hook_installed; - if (!hook_installed) - { - static guint sig_id; - if (sig_id == 0) - sig_id = g_signal_lookup("size_allocate", GTK_TYPE_WIDGET); - hook_installed = true; - g_signal_add_emission_hook( - sig_id, 0, wx_emission_hook, &hook_installed, NULL); - } - } -} - -extern "C" { -static gboolean wxapp_idle_callback(gpointer) -{ - return wxTheApp->DoIdle(); -} -} - -// 0: no change, 1: focus in, 2: focus out -static int gs_focusChange; - -extern "C" { -static gboolean -wx_focus_event_hook(GSignalInvocationHint*, unsigned, const GValue* param_values, void* data) -{ - // If focus change on TLW - if (GTK_IS_WINDOW(g_value_peek_pointer(param_values))) - gs_focusChange = GPOINTER_TO_INT(data); - - return true; -} -} - -bool wxApp::DoIdle() -{ - guint id_save; - { - // Allow another idle source to be added while this one is busy. - // Needed if an idle event handler runs a new event loop, - // for example by showing a dialog. -#if wxUSE_THREADS - wxMutexLocker lock(m_idleMutex); -#endif - id_save = m_idleSourceId; - m_idleSourceId = 0; - wx_add_idle_hooks(); - -#if wxDEBUG_LEVEL - // don't generate the idle events while the assert modal dialog is shown, - // this matches the behaviour of wxMSW - if (m_isInAssert) - return false; -#endif - } - - gdk_threads_enter(); - - if (gs_focusChange) { - SetActive(gs_focusChange == 1, NULL); - gs_focusChange = 0; - } - - bool needMore; - do { - ProcessPendingEvents(); - - needMore = ProcessIdle(); - } while (needMore && gtk_events_pending() == 0); - gdk_threads_leave(); - -#if wxUSE_THREADS - wxMutexLocker lock(m_idleMutex); -#endif - - bool keepSource = false; - // if a new idle source has not been added, either as a result of idle - // processing above or by another thread calling WakeUpIdle() - if (m_idleSourceId == 0) - { - // if more idle processing was requested or pending events have appeared - if (needMore || HasPendingEvents()) - { - // keep this source installed - m_idleSourceId = id_save; - keepSource = true; - } - else // add hooks and remove this source - wx_add_idle_hooks(); - } - // else remove this source, leave new one installed - // we must keep an idle source, otherwise a wakeup could be lost - - return keepSource; -} - -//----------------------------------------------------------------------------- -// wxApp -//----------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler); - -wxApp::wxApp() -{ - m_isInAssert = false; - m_idleSourceId = 0; -} - -wxApp::~wxApp() -{ -} - -bool wxApp::SetNativeTheme(const wxString& theme) -{ -#ifdef __WXGTK3__ - wxUnusedVar(theme); - return false; -#else - wxString path; - path = gtk_rc_get_theme_dir(); - path += "/"; - path += theme.utf8_str(); - path += "/gtk-2.0/gtkrc"; - - if ( wxFileExists(path.utf8_str()) ) - gtk_rc_add_default_file(path.utf8_str()); - else if ( wxFileExists(theme.utf8_str()) ) - gtk_rc_add_default_file(theme.utf8_str()); - else - { - wxLogWarning("Theme \"%s\" not available.", theme); - - return false; - } - - gtk_rc_reparse_all_for_settings(gtk_settings_get_default(), TRUE); - - return true; -#endif -} - -bool wxApp::OnInitGui() -{ - if ( !wxAppBase::OnInitGui() ) - return false; - -#ifndef __WXGTK3__ - // if this is a wxGLApp (derived from wxApp), and we've already - // chosen a specific visual, then derive the GdkVisual from that - if ( GetXVisualInfo() ) - { - GdkVisual* vis = gtk_widget_get_default_visual(); - - GdkColormap *colormap = gdk_colormap_new( vis, FALSE ); - gtk_widget_set_default_colormap( colormap ); - } - else - { - // On some machines, the default visual is just 256 colours, so - // we make sure we get the best. This can sometimes be wasteful. - if (m_useBestVisual) - { - if (m_forceTrueColour) - { - GdkVisual* visual = gdk_visual_get_best_with_both( 24, GDK_VISUAL_TRUE_COLOR ); - if (!visual) - { - wxLogError(wxT("Unable to initialize TrueColor visual.")); - return false; - } - GdkColormap *colormap = gdk_colormap_new( visual, FALSE ); - gtk_widget_set_default_colormap( colormap ); - } - else - { - if (gdk_visual_get_best() != gdk_visual_get_system()) - { - GdkVisual* visual = gdk_visual_get_best(); - GdkColormap *colormap = gdk_colormap_new( visual, FALSE ); - gtk_widget_set_default_colormap( colormap ); - } - } - } - } -#endif - - return true; -} - -// use unusual names for the parameters to avoid conflict with wxApp::arg[cv] -bool wxApp::Initialize(int& argc_, wxChar **argv_) -{ - if ( !wxAppBase::Initialize(argc_, argv_) ) - return false; - -#if wxUSE_THREADS - if (!g_thread_supported()) - { - // g_thread_init() does nothing and is deprecated in recent glib but - // might still be needed in the older versions, which are the only ones - // for which this code is going to be executed (as g_thread_supported() - // is always TRUE in these recent glib versions anyhow). - wxGCC_WARNING_SUPPRESS(deprecated-declarations) - g_thread_init(NULL); - wxGCC_WARNING_RESTORE() - gdk_threads_init(); - } -#endif // wxUSE_THREADS - - // gtk+ 2.0 supports Unicode through UTF-8 strings - wxConvCurrent = &wxConvUTF8; - -#ifdef __UNIX__ - // decide which conversion to use for the file names - - // (1) this variable exists for the sole purpose of specifying the encoding - // of the filenames for GTK+ programs, so use it if it is set - wxString encName(wxGetenv(wxT("G_FILENAME_ENCODING"))); - encName = encName.BeforeFirst(wxT(',')); - if (encName.CmpNoCase(wxT("@locale")) == 0) - encName.clear(); - encName.MakeUpper(); - if (encName.empty()) - { -#if wxUSE_INTL - // (2) if a non default locale is set, assume that the user wants his - // filenames in this locale too - encName = wxLocale::GetSystemEncodingName().Upper(); - - // But don't consider ASCII in this case. - if ( !encName.empty() ) - { -#if wxUSE_FONTMAP - wxFontEncoding enc = wxFontMapperBase::GetEncodingFromName(encName); - if ( enc == wxFONTENCODING_DEFAULT ) -#else // !wxUSE_FONTMAP - if ( encName == wxT("US-ASCII") ) -#endif // wxUSE_FONTMAP/!wxUSE_FONTMAP - { - // This means US-ASCII when returned from GetEncodingFromName(). - encName.clear(); - } - } -#endif // wxUSE_INTL - - // (3) finally use UTF-8 by default - if ( encName.empty() ) - encName = wxT("UTF-8"); - wxSetEnv(wxT("G_FILENAME_ENCODING"), encName); - } - - static wxConvBrokenFileNames fileconv(encName); - wxConvFileName = &fileconv; -#endif // __UNIX__ - - - bool init_result; - int i; - -#if wxUSE_UNICODE - // gtk_init() wants UTF-8, not wchar_t, so convert - char **argvGTK = new char *[argc_ + 1]; - for ( i = 0; i < argc_; i++ ) - { - argvGTK[i] = wxStrdupA(wxConvUTF8.cWX2MB(argv_[i])); - } - - argvGTK[argc_] = NULL; - - int argcGTK = argc_; - - // Prevent gtk_init_check() from changing the locale automatically for - // consistency with the other ports that don't do it. If necessary, - // wxApp::SetCLocale() may be explicitly called. - gtk_disable_setlocale(); - -#ifdef __WXGPE__ - init_result = true; // is there a _check() version of this? - gpe_application_init( &argcGTK, &argvGTK ); -#else - init_result = gtk_init_check( &argcGTK, &argvGTK ) != 0; -#endif - - if ( argcGTK != argc_ ) - { - // we have to drop the parameters which were consumed by GTK+ - for ( i = 0; i < argcGTK; i++ ) - { - while ( strcmp(wxConvUTF8.cWX2MB(argv_[i]), argvGTK[i]) != 0 ) - { - memmove(argv_ + i, argv_ + i + 1, (argc_ - i)*sizeof(*argv_)); - } - } - - argc_ = argcGTK; - argv_[argc_] = NULL; - } - //else: gtk_init() didn't modify our parameters - - // free our copy - for ( i = 0; i < argcGTK; i++ ) - { - free(argvGTK[i]); - } - - delete [] argvGTK; -#else // !wxUSE_UNICODE - // gtk_init() shouldn't actually change argv_ itself (just its contents) so - // it's ok to pass pointer to it - init_result = gtk_init_check( &argc_, &argv_ ); -#endif // wxUSE_UNICODE/!wxUSE_UNICODE - - // update internal arg[cv] as GTK+ may have removed processed options: - this->argc = argc_; - this->argv = argv_; - - if ( m_traits ) - { - // if there are still GTK+ standard options unparsed in the command - // line, it means that they were not syntactically correct and GTK+ - // already printed a warning on the command line and we should now - // exit: - wxArrayString opt, desc; - m_traits->GetStandardCmdLineOptions(opt, desc); - - for ( i = 0; i < argc_; i++ ) - { - // leave just the names of the options with values - const wxString str = wxString(argv_[i]).BeforeFirst('='); - - for ( size_t j = 0; j < opt.size(); j++ ) - { - // remove the leading spaces from the option string as it does - // have them - if ( opt[j].Trim(false).BeforeFirst('=') == str ) - { - // a GTK+ option can be left on the command line only if - // there was an error in (or before, in another standard - // options) it, so abort, just as we do if incorrect - // program option is given - wxLogError(_("Invalid GTK+ command line option, use \"%s --help\""), - argv_[0]); - return false; - } - } - } - } - - if ( !init_result ) - { - wxLogError(_("Unable to initialize GTK+, is DISPLAY set properly?")); - return false; - } - - // we cannot enter threads before gtk_init is done - gdk_threads_enter(); - -#if wxUSE_INTL - wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding()); -#endif - - // make sure GtkWidget type is loaded, signal emission hooks need it - const GType widgetType = GTK_TYPE_WIDGET; - g_type_class_ref(widgetType); - - // focus in/out hooks used for generating wxEVT_ACTIVATE_APP - g_signal_add_emission_hook( - g_signal_lookup("focus_in_event", widgetType), - 0, wx_focus_event_hook, GINT_TO_POINTER(1), NULL); - g_signal_add_emission_hook( - g_signal_lookup("focus_out_event", widgetType), - 0, wx_focus_event_hook, GINT_TO_POINTER(2), NULL); - - WakeUpIdle(); - - return true; -} - -void wxApp::CleanUp() -{ - if (m_idleSourceId != 0) - g_source_remove(m_idleSourceId); - - // release reference acquired by Initialize() - gpointer gt = g_type_class_peek(GTK_TYPE_WIDGET); - if (gt != NULL) - g_type_class_unref(gt); - - gdk_threads_leave(); - - wxAppBase::CleanUp(); -} - -void wxApp::WakeUpIdle() -{ -#if wxUSE_THREADS - wxMutexLocker lock(m_idleMutex); -#endif - if (m_idleSourceId == 0) - m_idleSourceId = g_idle_add_full(G_PRIORITY_LOW, wxapp_idle_callback, NULL, NULL); -} - -// Checking for pending events requires first removing our idle source, -// otherwise it will cause the check to always return true. -bool wxApp::EventsPending() -{ -#if wxUSE_THREADS - wxMutexLocker lock(m_idleMutex); -#endif - if (m_idleSourceId != 0) - { - g_source_remove(m_idleSourceId); - m_idleSourceId = 0; - wx_add_idle_hooks(); - } - return gtk_events_pending() != 0; -} - -void wxApp::OnAssertFailure(const wxChar *file, - int line, - const wxChar* func, - const wxChar* cond, - const wxChar *msg) -{ - // there is no need to do anything if asserts are disabled in this build - // anyhow -#if wxDEBUG_LEVEL - // block wx idle events while assert dialog is showing - m_isInAssert = true; - - wxAppBase::OnAssertFailure(file, line, func, cond, msg); - - m_isInAssert = false; -#else // !wxDEBUG_LEVEL - wxUnusedVar(file); - wxUnusedVar(line); - wxUnusedVar(func); - wxUnusedVar(cond); - wxUnusedVar(msg); -#endif // wxDEBUG_LEVEL/!wxDEBUG_LEVEL -} - -#if wxUSE_THREADS -void wxGUIAppTraits::MutexGuiEnter() -{ - gdk_threads_enter(); -} - -void wxGUIAppTraits::MutexGuiLeave() -{ - gdk_threads_leave(); -} -#endif // wxUSE_THREADS - -/* static */ -bool wxApp::GTKIsUsingGlobalMenu() -{ - static int s_isUsingGlobalMenu = -1; - if ( s_isUsingGlobalMenu == -1 ) - { - // Currently we just check for this environment variable because this - // is how support for the global menu is implemented under Ubuntu. - // - // If we ever get false positives, we could also check for - // XDG_CURRENT_DESKTOP env var being set to "Unity". - wxString proxy; - s_isUsingGlobalMenu = wxGetEnv("UBUNTU_MENUPROXY", &proxy) && - !proxy.empty() && proxy != "0"; - } - - return s_isUsingGlobalMenu == 1; -} diff --git a/Externals/wxWidgets3/src/gtk/artgtk.cpp b/Externals/wxWidgets3/src/gtk/artgtk.cpp deleted file mode 100644 index ba56942264..0000000000 --- a/Externals/wxWidgets3/src/gtk/artgtk.cpp +++ /dev/null @@ -1,379 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/artgtk.cpp -// Purpose: stock wxArtProvider instance with native GTK+ stock icons -// Author: Vaclav Slavik -// Modified by: -// Created: 2004-08-22 -// Copyright: (c) Vaclav Slavik, 2004 -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// --------------------------------------------------------------------------- -// headers -// --------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if defined(__BORLANDC__) - #pragma hdrstop -#endif - -#include "wx/artprov.h" - -#include -#include "wx/gtk/private.h" - -#if !GTK_CHECK_VERSION(2,8,0) - #define GTK_STOCK_FULLSCREEN "gtk-fullscreen" -#endif - -// ---------------------------------------------------------------------------- -// wxGTK2ArtProvider -// ---------------------------------------------------------------------------- - -class wxGTK2ArtProvider : public wxArtProvider -{ -protected: - virtual wxBitmap CreateBitmap(const wxArtID& id, const wxArtClient& client, - const wxSize& size) wxOVERRIDE; - virtual wxIconBundle CreateIconBundle(const wxArtID& id, - const wxArtClient& client) wxOVERRIDE; -}; - -/*static*/ void wxArtProvider::InitNativeProvider() -{ - PushBack(new wxGTK2ArtProvider); -} - -// ---------------------------------------------------------------------------- -// CreateBitmap routine -// ---------------------------------------------------------------------------- - -namespace -{ - -wxString wxArtIDToStock(const wxArtID& id) -{ - #define ART(wxid, gtkid) \ - if (id == wxid) return gtkid; - - ART(wxART_ERROR, GTK_STOCK_DIALOG_ERROR) - ART(wxART_INFORMATION, GTK_STOCK_DIALOG_INFO) - ART(wxART_WARNING, GTK_STOCK_DIALOG_WARNING) - ART(wxART_QUESTION, GTK_STOCK_DIALOG_QUESTION) - - //ART(wxART_HELP_SIDE_PANEL, ) - ART(wxART_HELP_SETTINGS, GTK_STOCK_SELECT_FONT) - //ART(wxART_HELP_BOOK, ) - ART(wxART_HELP_FOLDER, GTK_STOCK_DIRECTORY) - ART(wxART_HELP_PAGE, GTK_STOCK_FILE) - ART(wxART_MISSING_IMAGE, GTK_STOCK_MISSING_IMAGE) - ART(wxART_ADD_BOOKMARK, GTK_STOCK_ADD) - ART(wxART_DEL_BOOKMARK, GTK_STOCK_REMOVE) - ART(wxART_GO_BACK, GTK_STOCK_GO_BACK) - ART(wxART_GO_FORWARD, GTK_STOCK_GO_FORWARD) - ART(wxART_GO_UP, GTK_STOCK_GO_UP) - ART(wxART_GO_DOWN, GTK_STOCK_GO_DOWN) - ART(wxART_GO_TO_PARENT, GTK_STOCK_GO_UP) - ART(wxART_GO_HOME, GTK_STOCK_HOME) - ART(wxART_GOTO_FIRST, GTK_STOCK_GOTO_FIRST) - ART(wxART_GOTO_LAST, GTK_STOCK_GOTO_LAST) - ART(wxART_FILE_OPEN, GTK_STOCK_OPEN) - ART(wxART_PRINT, GTK_STOCK_PRINT) - ART(wxART_HELP, GTK_STOCK_HELP) - ART(wxART_TIP, GTK_STOCK_DIALOG_INFO) - //ART(wxART_REPORT_VIEW, ) - //ART(wxART_LIST_VIEW, ) - //ART(wxART_NEW_DIR, ) - ART(wxART_FOLDER, GTK_STOCK_DIRECTORY) - ART(wxART_FOLDER_OPEN, GTK_STOCK_DIRECTORY) - //ART(wxART_GO_DIR_UP, ) - ART(wxART_EXECUTABLE_FILE, GTK_STOCK_EXECUTE) - ART(wxART_NORMAL_FILE, GTK_STOCK_FILE) - ART(wxART_TICK_MARK, GTK_STOCK_APPLY) - ART(wxART_CROSS_MARK, GTK_STOCK_CANCEL) - - ART(wxART_FLOPPY, GTK_STOCK_FLOPPY) - ART(wxART_CDROM, GTK_STOCK_CDROM) - ART(wxART_HARDDISK, GTK_STOCK_HARDDISK) - ART(wxART_REMOVABLE, GTK_STOCK_HARDDISK) - - ART(wxART_FILE_SAVE, GTK_STOCK_SAVE) - ART(wxART_FILE_SAVE_AS, GTK_STOCK_SAVE_AS) - - ART(wxART_COPY, GTK_STOCK_COPY) - ART(wxART_CUT, GTK_STOCK_CUT) - ART(wxART_PASTE, GTK_STOCK_PASTE) - ART(wxART_DELETE, GTK_STOCK_DELETE) - ART(wxART_NEW, GTK_STOCK_NEW) - - ART(wxART_UNDO, GTK_STOCK_UNDO) - ART(wxART_REDO, GTK_STOCK_REDO) - - ART(wxART_PLUS, GTK_STOCK_ADD) - ART(wxART_MINUS, GTK_STOCK_REMOVE) - - ART(wxART_CLOSE, GTK_STOCK_CLOSE) - ART(wxART_QUIT, GTK_STOCK_QUIT) - - ART(wxART_FIND, GTK_STOCK_FIND) - ART(wxART_FIND_AND_REPLACE, GTK_STOCK_FIND_AND_REPLACE) - ART(wxART_FULL_SCREEN, GTK_STOCK_FULLSCREEN) - - #undef ART - - // allow passing GTK+ stock IDs to wxArtProvider -- if a recognized wx - // ID wasn't found, pass it to GTK+ in the hope it is a GTK+ or theme - // icon name: - return id; -} - -GtkIconSize ArtClientToIconSize(const wxArtClient& client) -{ - if (client == wxART_TOOLBAR) - return GTK_ICON_SIZE_LARGE_TOOLBAR; - else if (client == wxART_MENU || client == wxART_FRAME_ICON) - return GTK_ICON_SIZE_MENU; - else if (client == wxART_CMN_DIALOG || client == wxART_MESSAGE_BOX) - return GTK_ICON_SIZE_DIALOG; - else if (client == wxART_BUTTON) - return GTK_ICON_SIZE_BUTTON; - else - return GTK_ICON_SIZE_INVALID; // this is arbitrary -} - -GtkIconSize FindClosestIconSize(const wxSize& size) -{ - #define NUM_SIZES 6 - static struct - { - GtkIconSize icon; - gint x, y; - } s_sizes[NUM_SIZES]; - static bool s_sizesInitialized = false; - - if (!s_sizesInitialized) - { - s_sizes[0].icon = GTK_ICON_SIZE_MENU; - s_sizes[1].icon = GTK_ICON_SIZE_SMALL_TOOLBAR; - s_sizes[2].icon = GTK_ICON_SIZE_LARGE_TOOLBAR; - s_sizes[3].icon = GTK_ICON_SIZE_BUTTON; - s_sizes[4].icon = GTK_ICON_SIZE_DND; - s_sizes[5].icon = GTK_ICON_SIZE_DIALOG; - for (size_t i = 0; i < NUM_SIZES; i++) - { - gtk_icon_size_lookup(s_sizes[i].icon, - &s_sizes[i].x, &s_sizes[i].y); - } - s_sizesInitialized = true; - } - - GtkIconSize best = GTK_ICON_SIZE_DIALOG; // presumably largest - unsigned distance = INT_MAX; - for (size_t i = 0; i < NUM_SIZES; i++) - { - // only use larger bitmaps, scaling down looks better than scaling up: - if (size.x > s_sizes[i].x || size.y > s_sizes[i].y) - continue; - - unsigned dist = (size.x - s_sizes[i].x) * (size.x - s_sizes[i].x) + - (size.y - s_sizes[i].y) * (size.y - s_sizes[i].y); - if (dist == 0) - return s_sizes[i].icon; - else if (dist < distance) - { - distance = dist; - best = s_sizes[i].icon; - } - } - return best; -} - -GdkPixbuf *CreateStockIcon(const char *stockid, GtkIconSize size) -{ - // FIXME: This code is not 100% correct, because stock pixmap are - // context-dependent and may be affected by theme engine, the - // correct value can only be obtained for given GtkWidget object. - // - // Fool-proof implementation of stock bitmaps would extend wxBitmap - // with "stock-id" representation (in addition to pixmap and pixbuf - // ones) and would convert it to pixbuf when rendered. - - GtkWidget* widget = wxGTKPrivate::GetButtonWidget(); -#ifdef __WXGTK3__ - GtkStyleContext* sc = gtk_widget_get_style_context(widget); - GtkIconSet* iconset = gtk_style_context_lookup_icon_set(sc, stockid); - GdkPixbuf* pixbuf = NULL; - if (iconset) - pixbuf = gtk_icon_set_render_icon_pixbuf(iconset, sc, size); - return pixbuf; -#else - GtkStyle* style = gtk_widget_get_style(widget); - GtkIconSet* iconset = gtk_style_lookup_icon_set(style, stockid); - - if (!iconset) - return NULL; - - return gtk_icon_set_render_icon(iconset, style, - gtk_widget_get_default_direction(), - GTK_STATE_NORMAL, size, NULL, NULL); -#endif -} - -GdkPixbuf *CreateThemeIcon(const char *iconname, int size) -{ - return gtk_icon_theme_load_icon - ( - gtk_icon_theme_get_default(), - iconname, - size, - (GtkIconLookupFlags)0, - NULL - ); -} - - -// creates either stock or theme icon -GdkPixbuf *CreateGtkIcon(const char *icon_name, - GtkIconSize stock_size, const wxSize& pixel_size) -{ - // try stock GTK+ icon first - GdkPixbuf *pixbuf = CreateStockIcon(icon_name, stock_size); - if ( pixbuf ) - return pixbuf; - - // if that fails, try theme icon - wxSize size(pixel_size); - if ( pixel_size == wxDefaultSize ) - gtk_icon_size_lookup(stock_size, &size.x, &size.y); - return CreateThemeIcon(icon_name, size.x); -} - -template -wxIconBundle DoCreateIconBundle(const char *stockid, - const SizeType *sizes_from, - const SizeType *sizes_to, - LoaderFunc get_icon) - -{ - wxIconBundle bundle; - - for ( const SizeType *i = sizes_from; i != sizes_to; ++i ) - { - GdkPixbuf *pixbuf = get_icon(stockid, *i); - if ( !pixbuf ) - continue; - - wxIcon icon; - icon.CopyFromBitmap(wxBitmap(pixbuf)); - bundle.AddIcon(icon); - } - - return bundle; -} - -} // anonymous namespace - -wxBitmap wxGTK2ArtProvider::CreateBitmap(const wxArtID& id, - const wxArtClient& client, - const wxSize& size) -{ - const wxString stockid = wxArtIDToStock(id); - - GtkIconSize stocksize = (size == wxDefaultSize) ? - ArtClientToIconSize(client) : - FindClosestIconSize(size); - // we must have some size, this is arbitrary - if (stocksize == GTK_ICON_SIZE_INVALID) - stocksize = GTK_ICON_SIZE_BUTTON; - - GdkPixbuf *pixbuf = CreateGtkIcon(stockid.utf8_str(), stocksize, size); - - if (pixbuf && size != wxDefaultSize && - (size.x != gdk_pixbuf_get_width(pixbuf) || - size.y != gdk_pixbuf_get_height(pixbuf))) - { - GdkPixbuf *p2 = gdk_pixbuf_scale_simple(pixbuf, size.x, size.y, - GDK_INTERP_BILINEAR); - if (p2) - { - g_object_unref (pixbuf); - pixbuf = p2; - } - } - - return wxBitmap(pixbuf); -} - -wxIconBundle -wxGTK2ArtProvider::CreateIconBundle(const wxArtID& id, - const wxArtClient& WXUNUSED(client)) -{ - wxIconBundle bundle; - const wxString stockid = wxArtIDToStock(id); - - // try to load the bundle as stock icon first - GtkWidget* widget = wxGTKPrivate::GetButtonWidget(); -#ifdef __WXGTK3__ - GtkStyleContext* sc = gtk_widget_get_style_context(widget); - GtkIconSet* iconset = gtk_style_context_lookup_icon_set(sc, stockid.utf8_str()); -#else - GtkStyle* style = gtk_widget_get_style(widget); - GtkIconSet* iconset = gtk_style_lookup_icon_set(style, stockid.utf8_str()); -#endif - if ( iconset ) - { - GtkIconSize *sizes; - gint n_sizes; - gtk_icon_set_get_sizes(iconset, &sizes, &n_sizes); - bundle = DoCreateIconBundle - ( - stockid.utf8_str(), - sizes, sizes + n_sizes, - &CreateStockIcon - ); - g_free(sizes); - return bundle; - } - - // otherwise try icon themes - gint *sizes = gtk_icon_theme_get_icon_sizes - ( - gtk_icon_theme_get_default(), - stockid.utf8_str() - ); - if ( !sizes ) - return bundle; - - gint *last = sizes; - while ( *last ) - last++; - - bundle = DoCreateIconBundle - ( - stockid.utf8_str(), - sizes, last, - &CreateThemeIcon - ); - g_free(sizes); - - return bundle; -} - -// ---------------------------------------------------------------------------- -// wxArtProvider::GetNativeSizeHint() -// ---------------------------------------------------------------------------- - -/*static*/ -wxSize wxArtProvider::GetNativeSizeHint(const wxArtClient& client) -{ - // Gtk has specific sizes for each client, see artgtk.cpp - GtkIconSize gtk_size = ArtClientToIconSize(client); - // no size hints for this client - if (gtk_size == GTK_ICON_SIZE_INVALID) - return wxDefaultSize; - gint width, height; - gtk_icon_size_lookup( gtk_size, &width, &height); - return wxSize(width, height); -} diff --git a/Externals/wxWidgets3/src/gtk/assertdlg_gtk.cpp b/Externals/wxWidgets3/src/gtk/assertdlg_gtk.cpp deleted file mode 100644 index 8f24ef6746..0000000000 --- a/Externals/wxWidgets3/src/gtk/assertdlg_gtk.cpp +++ /dev/null @@ -1,504 +0,0 @@ -/* /////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/assertdlg_gtk.cpp -// Purpose: GtkAssertDialog -// Author: Francesco Montorsi -// Copyright: (c) 2006 Francesco Montorsi -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////// */ - -#include "wx/wxprec.h" - -#if wxDEBUG_LEVEL - -#include -#include "wx/gtk/assertdlg_gtk.h" -#include "wx/gtk/private/gtk2-compat.h" - -#include - -/* ---------------------------------------------------------------------------- - Constants - ---------------------------------------------------------------------------- */ - -/* - NB: when changing order of the columns also update the gtk_list_store_new() call - in gtk_assert_dialog_create_backtrace_list_model() function - */ -#define STACKFRAME_LEVEL_COLIDX 0 -#define FUNCTION_PROTOTYPE_COLIDX 1 -#define SOURCE_FILE_COLIDX 2 -#define LINE_NUMBER_COLIDX 3 - -/* ---------------------------------------------------------------------------- - GtkAssertDialog helpers - ---------------------------------------------------------------------------- */ - -static -GtkWidget *gtk_assert_dialog_add_button_to (GtkBox *box, const gchar *label, - const gchar *stock) -{ - /* create the button */ - GtkWidget *button = gtk_button_new_with_mnemonic (label); - gtk_widget_set_can_default(button, true); - - /* add a stock icon inside it */ - GtkWidget *image = gtk_image_new_from_stock (stock, GTK_ICON_SIZE_BUTTON); - gtk_button_set_image (GTK_BUTTON (button), image); - - /* add to the given (container) widget */ - if (box) - gtk_box_pack_end (box, button, FALSE, TRUE, 8); - - return button; -} - -static -GtkWidget *gtk_assert_dialog_add_button (GtkAssertDialog *dlg, const gchar *label, - const gchar *stock, gint response_id) -{ - /* create the button */ - GtkWidget* button = gtk_assert_dialog_add_button_to(NULL, label, stock); - - /* add the button to the dialog's action area */ - gtk_dialog_add_action_widget (GTK_DIALOG (dlg), button, response_id); - - return button; -} - -#if wxUSE_STACKWALKER - -static -void gtk_assert_dialog_append_text_column (GtkWidget *treeview, const gchar *name, int index) -{ - GtkCellRenderer *renderer; - GtkTreeViewColumn *column; - - renderer = gtk_cell_renderer_text_new (); - column = gtk_tree_view_column_new_with_attributes (name, renderer, - "text", index, NULL); - gtk_tree_view_insert_column (GTK_TREE_VIEW (treeview), column, index); - gtk_tree_view_column_set_resizable (column, TRUE); - gtk_tree_view_column_set_reorderable (column, TRUE); -} - -static -GtkWidget *gtk_assert_dialog_create_backtrace_list_model () -{ - GtkListStore *store; - GtkWidget *treeview; - - /* create list store */ - store = gtk_list_store_new (4, - G_TYPE_UINT, /* stack frame number */ - G_TYPE_STRING, /* function prototype */ - G_TYPE_STRING, /* source file name */ - G_TYPE_STRING); /* line number */ - - /* create the tree view */ - treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL(store)); - g_object_unref (store); - gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE); - - /* append columns */ - gtk_assert_dialog_append_text_column(treeview, "#", STACKFRAME_LEVEL_COLIDX); - gtk_assert_dialog_append_text_column(treeview, "Function Prototype", FUNCTION_PROTOTYPE_COLIDX); - gtk_assert_dialog_append_text_column(treeview, "Source file", SOURCE_FILE_COLIDX); - gtk_assert_dialog_append_text_column(treeview, "Line #", LINE_NUMBER_COLIDX); - - return treeview; -} - -static -void gtk_assert_dialog_process_backtrace (GtkAssertDialog *dlg) -{ - /* set busy cursor */ - GdkWindow *parent = gtk_widget_get_window(GTK_WIDGET(dlg)); - GdkDisplay* display = gdk_window_get_display(parent); - GdkCursor* cur = gdk_cursor_new_for_display(display, GDK_WATCH); - gdk_window_set_cursor (parent, cur); - gdk_flush (); - - (*dlg->callback)(dlg->userdata); - - /* toggle busy cursor */ - gdk_window_set_cursor (parent, NULL); -#ifdef __WXGTK3__ - g_object_unref(cur); -#else - gdk_cursor_unref (cur); -#endif -} - -extern "C" { -/* ---------------------------------------------------------------------------- - GtkAssertDialog signal handlers - ---------------------------------------------------------------------------- */ - -static void gtk_assert_dialog_expander_callback(GtkWidget*, GtkAssertDialog* dlg) -{ - /* status is not yet updated so we need to invert it to get the new one */ - gboolean expanded = !gtk_expander_get_expanded (GTK_EXPANDER(dlg->expander)); - gtk_window_set_resizable (GTK_WINDOW (dlg), expanded); - - if (dlg->callback == NULL) /* was the backtrace already processed? */ - return; - - gtk_assert_dialog_process_backtrace (dlg); - - /* mark the work as done (so that next activate we won't call the callback again) */ - dlg->callback = NULL; -} - -static void gtk_assert_dialog_save_backtrace_callback(GtkWidget*, GtkAssertDialog* dlg) -{ - GtkWidget *dialog; - - dialog = gtk_file_chooser_dialog_new ("Save assert info to file", GTK_WINDOW(dlg), - GTK_FILE_CHOOSER_ACTION_SAVE, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, - NULL); - - if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) - { - char *filename, *msg, *backtrace; - FILE *fp; - - filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); - if ( filename ) - { - msg = gtk_assert_dialog_get_message (dlg); - backtrace = gtk_assert_dialog_get_backtrace (dlg); - - /* open the file and write all info inside it */ - fp = fopen (filename, "w"); - if (fp) - { - fprintf (fp, "ASSERT INFO:\n%s\n\nBACKTRACE:\n%s", msg, backtrace); - fclose (fp); - } - - g_free (filename); - g_free (msg); - g_free (backtrace); - } - } - - gtk_widget_destroy (dialog); -} - -static void gtk_assert_dialog_copy_callback(GtkWidget*, GtkAssertDialog* dlg) -{ - char *msg, *backtrace; - GtkClipboard *clipboard; - GString *str; - - msg = gtk_assert_dialog_get_message (dlg); - backtrace = gtk_assert_dialog_get_backtrace (dlg); - - /* combine both in a single string */ - str = g_string_new(""); - g_string_printf (str, "ASSERT INFO:\n%s\n\nBACKTRACE:\n%s\n\n", msg, backtrace); - - /* copy everything in default clipboard */ - clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD); - gtk_clipboard_set_text (clipboard, str->str, str->len); - - /* copy everything in primary clipboard too */ - clipboard = gtk_clipboard_get (GDK_SELECTION_PRIMARY); - gtk_clipboard_set_text (clipboard, str->str, str->len); - - g_free (msg); - g_free (backtrace); - g_string_free (str, TRUE); -} -} // extern "C" - -#endif // wxUSE_STACKWALKER - -extern "C" { -static void gtk_assert_dialog_continue_callback(GtkWidget*, GtkAssertDialog* dlg) -{ - gint response = - gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(dlg->shownexttime)) ? - GTK_ASSERT_DIALOG_CONTINUE : GTK_ASSERT_DIALOG_CONTINUE_SUPPRESSING; - - gtk_dialog_response (GTK_DIALOG(dlg), response); -} -} // extern "C" - -/* ---------------------------------------------------------------------------- - GtkAssertDialogClass implementation - ---------------------------------------------------------------------------- */ - -extern "C" { -static void gtk_assert_dialog_init(GTypeInstance* instance, void*); -} - -GType gtk_assert_dialog_get_type() -{ - static GType assert_dialog_type; - - if (!assert_dialog_type) - { - const GTypeInfo assert_dialog_info = - { - sizeof (GtkAssertDialogClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - NULL, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (GtkAssertDialog), - 16, /* n_preallocs */ - gtk_assert_dialog_init, - NULL - }; - assert_dialog_type = g_type_register_static (GTK_TYPE_DIALOG, "GtkAssertDialog", &assert_dialog_info, (GTypeFlags)0); - } - - return assert_dialog_type; -} - -extern "C" { -static void gtk_assert_dialog_init(GTypeInstance* instance, void*) -{ - GtkAssertDialog* dlg = GTK_ASSERT_DIALOG(instance); - GtkWidget *continuebtn; - - { - GtkWidget *vbox, *hbox, *image; - - /* start the main vbox */ - gtk_widget_push_composite_child (); - vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8); - gtk_container_set_border_width (GTK_CONTAINER(vbox), 8); - gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dlg))), vbox, true, true, 5); - - - /* add the icon+message hbox */ - hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); - gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0); - - /* icon */ - image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_ERROR, GTK_ICON_SIZE_DIALOG); - gtk_box_pack_start (GTK_BOX(hbox), image, FALSE, FALSE, 12); - - { - GtkWidget *vbox2, *info; - - /* message */ - vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); - gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 0); - info = gtk_label_new ("An assertion failed!"); - gtk_box_pack_start (GTK_BOX(vbox2), info, TRUE, TRUE, 8); - - /* assert message */ - dlg->message = gtk_label_new (NULL); - gtk_label_set_selectable (GTK_LABEL (dlg->message), TRUE); - gtk_label_set_line_wrap (GTK_LABEL (dlg->message), TRUE); - gtk_label_set_justify (GTK_LABEL (dlg->message), GTK_JUSTIFY_LEFT); - gtk_widget_set_size_request (GTK_WIDGET(dlg->message), 450, -1); - - gtk_box_pack_end (GTK_BOX(vbox2), GTK_WIDGET(dlg->message), TRUE, TRUE, 8); - } - -#if wxUSE_STACKWALKER - /* add the expander */ - dlg->expander = gtk_expander_new_with_mnemonic ("Back_trace:"); - gtk_box_pack_start (GTK_BOX(vbox), dlg->expander, TRUE, TRUE, 0); - g_signal_connect (dlg->expander, "activate", - G_CALLBACK(gtk_assert_dialog_expander_callback), dlg); -#endif // wxUSE_STACKWALKER - } -#if wxUSE_STACKWALKER - { - GtkWidget *hbox, *vbox, *button, *sw; - - /* create expander's vbox */ - vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); - gtk_container_add (GTK_CONTAINER (dlg->expander), vbox); - - /* add a scrollable window under the expander */ - sw = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), GTK_SHADOW_ETCHED_IN); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_AUTOMATIC, - GTK_POLICY_AUTOMATIC); - gtk_box_pack_start (GTK_BOX(vbox), sw, TRUE, TRUE, 8); - - /* add the treeview to the scrollable window */ - dlg->treeview = gtk_assert_dialog_create_backtrace_list_model (); - gtk_widget_set_size_request (GTK_WIDGET(dlg->treeview), -1, 180); - gtk_container_add (GTK_CONTAINER (sw), dlg->treeview); - - /* create button's hbox */ - hbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL); - gtk_box_pack_end (GTK_BOX(vbox), hbox, FALSE, FALSE, 0); - gtk_button_box_set_layout (GTK_BUTTON_BOX(hbox), GTK_BUTTONBOX_END); - - /* add the buttons */ - button = gtk_assert_dialog_add_button_to (GTK_BOX(hbox), "Save to _file", - GTK_STOCK_SAVE); - g_signal_connect (button, "clicked", - G_CALLBACK(gtk_assert_dialog_save_backtrace_callback), dlg); - - button = gtk_assert_dialog_add_button_to (GTK_BOX(hbox), "Copy to clip_board", - GTK_STOCK_COPY); - g_signal_connect (button, "clicked", G_CALLBACK(gtk_assert_dialog_copy_callback), dlg); - } -#endif // wxUSE_STACKWALKER - - /* add the checkbutton */ - dlg->shownexttime = gtk_check_button_new_with_mnemonic("Show this _dialog the next time"); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(dlg->shownexttime), TRUE); - gtk_box_pack_end(GTK_BOX(gtk_dialog_get_action_area(GTK_DIALOG(dlg))), dlg->shownexttime, false, true, 8); - - /* add the stop button */ - gtk_assert_dialog_add_button (dlg, "_Stop", GTK_STOCK_QUIT, GTK_ASSERT_DIALOG_STOP); - - /* add the continue button */ - continuebtn = gtk_assert_dialog_add_button (dlg, "_Continue", GTK_STOCK_YES, GTK_ASSERT_DIALOG_CONTINUE); - gtk_dialog_set_default_response (GTK_DIALOG (dlg), GTK_ASSERT_DIALOG_CONTINUE); - g_signal_connect (continuebtn, "clicked", G_CALLBACK(gtk_assert_dialog_continue_callback), dlg); - - /* complete creation */ - dlg->callback = NULL; - dlg->userdata = NULL; - - /* the resizable property of this window is modified by the expander: - when it's collapsed, the window must be non-resizable! */ - gtk_window_set_resizable (GTK_WINDOW (dlg), FALSE); - gtk_widget_pop_composite_child (); - gtk_widget_show_all (GTK_WIDGET(dlg)); -} -} - -/* ---------------------------------------------------------------------------- - GtkAssertDialog public API - ---------------------------------------------------------------------------- */ - -gchar *gtk_assert_dialog_get_message (GtkAssertDialog *dlg) -{ - /* NOTES: - 1) returned string must g_free()d ! - 2) Pango markup is automatically stripped off by GTK - */ - return g_strdup (gtk_label_get_text (GTK_LABEL(dlg->message))); -} - -#if wxUSE_STACKWALKER - -gchar *gtk_assert_dialog_get_backtrace (GtkAssertDialog *dlg) -{ - gchar *function, *sourcefile, *linenum; - guint count; - - GtkTreeModel *model; - GtkTreeIter iter; - GString *string; - - g_return_val_if_fail (GTK_IS_ASSERT_DIALOG (dlg), NULL); - model = gtk_tree_view_get_model (GTK_TREE_VIEW(dlg->treeview)); - string = g_string_new(""); - - /* iterate over the list */ - if (!gtk_tree_model_get_iter_first (model, &iter)) - return NULL; - - do - { - /* append this stack frame's info to the string */ - gtk_tree_model_get(model, &iter, - STACKFRAME_LEVEL_COLIDX, &count, - FUNCTION_PROTOTYPE_COLIDX, &function, - SOURCE_FILE_COLIDX, &sourcefile, - LINE_NUMBER_COLIDX, &linenum, - -1); - - g_string_append_printf(string, "[%u] %s", - count, function); - if (sourcefile[0] != '\0') - g_string_append_printf (string, " %s", sourcefile); - if (linenum[0] != '\0') - g_string_append_printf (string, ":%s", linenum); - g_string_append (string, "\n"); - - g_free (function); - g_free (sourcefile); - g_free (linenum); - - } while (gtk_tree_model_iter_next (model, &iter)); - - /* returned string must g_free()d */ - return g_string_free (string, FALSE); -} - -#endif // wxUSE_STACKWALKER - -void gtk_assert_dialog_set_message(GtkAssertDialog *dlg, const gchar *msg) -{ - /* prepend and append the tag - NOTE: g_markup_printf_escaped() is not used because it's available - only for glib >= 2.4 */ - gchar *escaped_msg = g_markup_escape_text (msg, -1); - gchar *decorated_msg = g_strdup_printf ("%s", escaped_msg); - - g_return_if_fail (GTK_IS_ASSERT_DIALOG (dlg)); - gtk_label_set_markup (GTK_LABEL(dlg->message), decorated_msg); - - g_free (decorated_msg); - g_free (escaped_msg); -} - -#if wxUSE_STACKWALKER - -void gtk_assert_dialog_set_backtrace_callback(GtkAssertDialog *assertdlg, - GtkAssertDialogStackFrameCallback callback, - void *userdata) -{ - assertdlg->callback = callback; - assertdlg->userdata = userdata; -} - -void gtk_assert_dialog_append_stack_frame(GtkAssertDialog *dlg, - const gchar *function, - const gchar *sourcefile, - guint line_number) -{ - GtkTreeModel *model; - GtkTreeIter iter; - GString *linenum; - gint count; - - g_return_if_fail (GTK_IS_ASSERT_DIALOG (dlg)); - model = gtk_tree_view_get_model (GTK_TREE_VIEW(dlg->treeview)); - - /* how many items are in the list up to now ? */ - count = gtk_tree_model_iter_n_children (model, NULL); - - linenum = g_string_new(""); - if ( line_number != 0 ) - g_string_printf (linenum, "%u", line_number); - - /* add data to the list store */ - gtk_list_store_append (GTK_LIST_STORE(model), &iter); - gtk_list_store_set (GTK_LIST_STORE(model), &iter, - STACKFRAME_LEVEL_COLIDX, count+1, /* start from 1 and not from 0 */ - FUNCTION_PROTOTYPE_COLIDX, function, - SOURCE_FILE_COLIDX, sourcefile, - LINE_NUMBER_COLIDX, linenum->str, - -1); - - g_string_free (linenum, TRUE); -} - -#endif // wxUSE_STACKWALKER - -GtkWidget *gtk_assert_dialog_new(void) -{ - void* dialog = g_object_new(GTK_TYPE_ASSERT_DIALOG, NULL); - - return GTK_WIDGET (dialog); -} - -#endif // wxDEBUG_LEVEL diff --git a/Externals/wxWidgets3/src/gtk/bdiag.xbm b/Externals/wxWidgets3/src/gtk/bdiag.xbm deleted file mode 100644 index 6b3ba001e9..0000000000 --- a/Externals/wxWidgets3/src/gtk/bdiag.xbm +++ /dev/null @@ -1,6 +0,0 @@ -#define bdiag_width 16 -#define bdiag_height 16 -static unsigned char bdiag_bits[] = { - 0x80, 0x80, 0x40, 0x40, 0x20, 0x20, 0x10, 0x10, 0x08, 0x08, 0x04, 0x04, - 0x02, 0x02, 0x01, 0x01, 0x80, 0x80, 0x40, 0x40, 0x20, 0x20, 0x10, 0x10, - 0x08, 0x08, 0x04, 0x04, 0x02, 0x02, 0x01, 0x01}; diff --git a/Externals/wxWidgets3/src/gtk/bitmap.cpp b/Externals/wxWidgets3/src/gtk/bitmap.cpp deleted file mode 100644 index 5e57df7410..0000000000 --- a/Externals/wxWidgets3/src/gtk/bitmap.cpp +++ /dev/null @@ -1,1564 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/bitmap.cpp -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#include "wx/bitmap.h" - -#ifndef WX_PRECOMP - #include "wx/icon.h" - #include "wx/image.h" - #include "wx/colour.h" - #include "wx/cursor.h" -#endif - -#include "wx/rawbmp.h" - -#include "wx/gtk/private/object.h" -#include "wx/gtk/private.h" - -#include - -GdkWindow* wxGetTopLevelGDK(); - -#ifndef __WXGTK3__ -static void PixmapToPixbuf(GdkPixmap* pixmap, GdkPixbuf* pixbuf, int w, int h) -{ - gdk_pixbuf_get_from_drawable(pixbuf, pixmap, NULL, 0, 0, 0, 0, w, h); - if (gdk_drawable_get_depth(pixmap) == 1) - { - // invert to match XBM convention - guchar* p = gdk_pixbuf_get_pixels(pixbuf); - const int inc = 3 + int(gdk_pixbuf_get_has_alpha(pixbuf) != 0); - const int rowpad = gdk_pixbuf_get_rowstride(pixbuf) - w * inc; - for (int y = h; y; y--, p += rowpad) - for (int x = w; x; x--, p += inc) - { - // pixels are either (0,0,0) or (0xff,0xff,0xff) - p[0] = ~p[0]; - p[1] = ~p[1]; - p[2] = ~p[2]; - } - } -} - -static void MaskToAlpha(GdkPixmap* mask, GdkPixbuf* pixbuf, int w, int h) -{ - GdkPixbuf* mask_pixbuf = gdk_pixbuf_get_from_drawable( - NULL, mask, NULL, 0, 0, 0, 0, w, h); - guchar* p = gdk_pixbuf_get_pixels(pixbuf) + 3; - const guchar* mask_data = gdk_pixbuf_get_pixels(mask_pixbuf); - const int rowpad = gdk_pixbuf_get_rowstride(pixbuf) - w * 4; - const int mask_rowpad = gdk_pixbuf_get_rowstride(mask_pixbuf) - w * 3; - for (int y = h; y; y--, p += rowpad, mask_data += mask_rowpad) - { - for (int x = w; x; x--, p += 4, mask_data += 3) - { - *p = 255; - // no need to test all 3 components, - // pixels are either (0,0,0) or (0xff,0xff,0xff) - if (mask_data[0] == 0) - *p = 0; - } - } - g_object_unref(mask_pixbuf); -} -#endif - -//----------------------------------------------------------------------------- -// wxMask -//----------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxMask, wxMaskBase); - -wxMask::wxMask() -{ - m_bitmap = NULL; -} - -wxMask::wxMask(const wxMask& mask) -{ -#ifdef __WXGTK3__ - m_bitmap = NULL; - if (mask.m_bitmap) - { - const int w = cairo_image_surface_get_width(mask.m_bitmap); - const int h = cairo_image_surface_get_height(mask.m_bitmap); - m_bitmap = cairo_image_surface_create(CAIRO_FORMAT_A8, w, h); - const guchar* src = cairo_image_surface_get_data(mask.m_bitmap); - guchar* dst = cairo_image_surface_get_data(m_bitmap); - const int stride = cairo_image_surface_get_stride(m_bitmap); - wxASSERT(stride == cairo_image_surface_get_stride(mask.m_bitmap)); - memcpy(dst, src, stride * h); - cairo_surface_mark_dirty(m_bitmap); - } -#else - if ( !mask.m_bitmap ) - { - m_bitmap = NULL; - return; - } - - // create a copy of an existing mask - gint w, h; - gdk_drawable_get_size(mask.m_bitmap, &w, &h); - m_bitmap = gdk_pixmap_new(mask.m_bitmap, w, h, 1); - - wxGtkObject gc(gdk_gc_new(m_bitmap)); - gdk_draw_drawable(m_bitmap, gc, mask.m_bitmap, 0, 0, 0, 0, -1, -1); -#endif -} - -wxMask::wxMask( const wxBitmap& bitmap, const wxColour& colour ) -{ - m_bitmap = NULL; - InitFromColour(bitmap, colour); -} - -#if wxUSE_PALETTE -wxMask::wxMask( const wxBitmap& bitmap, int paletteIndex ) -{ - m_bitmap = NULL; - Create( bitmap, paletteIndex ); -} -#endif // wxUSE_PALETTE - -wxMask::wxMask( const wxBitmap& bitmap ) -{ - m_bitmap = NULL; - InitFromMonoBitmap(bitmap); -} - -#ifdef __WXGTK3__ -wxMask::wxMask(cairo_surface_t* bitmap) -#else -wxMask::wxMask(GdkPixmap* bitmap) -#endif -{ - m_bitmap = bitmap; -} - -wxMask::~wxMask() -{ - if (m_bitmap) - { -#ifdef __WXGTK3__ - cairo_surface_destroy(m_bitmap); -#else - g_object_unref (m_bitmap); -#endif - } -} - -void wxMask::FreeData() -{ - if (m_bitmap) - { -#ifdef __WXGTK3__ - cairo_surface_destroy(m_bitmap); -#else - g_object_unref (m_bitmap); -#endif - m_bitmap = NULL; - } -} - -bool wxMask::InitFromColour(const wxBitmap& bitmap, const wxColour& colour) -{ - const int w = bitmap.GetWidth(); - const int h = bitmap.GetHeight(); - -#ifdef __WXGTK3__ - m_bitmap = cairo_image_surface_create(CAIRO_FORMAT_A8, w, h); - GdkPixbuf* pixbuf = bitmap.GetPixbufNoMask(); - const guchar* src = gdk_pixbuf_get_pixels(pixbuf); - guchar* dst = cairo_image_surface_get_data(m_bitmap); - const int stride_src = gdk_pixbuf_get_rowstride(pixbuf); - const int stride_dst = cairo_image_surface_get_stride(m_bitmap); - const int src_inc = gdk_pixbuf_get_n_channels(pixbuf); - const guchar r = colour.Red(); - const guchar g = colour.Green(); - const guchar b = colour.Blue(); - for (int j = 0; j < h; j++, src += stride_src, dst += stride_dst) - { - const guchar* s = src; - for (int i = 0; i < w; i++, s += src_inc) - { - dst[i] = 0xff; - if (s[0] == r && s[1] == g && s[2] == b) - dst[i] = 0; - } - } - cairo_surface_mark_dirty(m_bitmap); -#else - // create mask as XBM format bitmap - - // one bit per pixel, each row starts on a byte boundary - const size_t out_size = size_t((w + 7) / 8) * unsigned(h); - wxByte* out = new wxByte[out_size]; - // set bits are unmasked - memset(out, 0xff, out_size); - unsigned bit_index = 0; - if (bitmap.HasPixbuf()) - { - const wxByte r_mask = colour.Red(); - const wxByte g_mask = colour.Green(); - const wxByte b_mask = colour.Blue(); - GdkPixbuf* pixbuf = bitmap.GetPixbuf(); - const wxByte* in = gdk_pixbuf_get_pixels(pixbuf); - const int inc = 3 + int(gdk_pixbuf_get_has_alpha(pixbuf) != 0); - const int rowpadding = gdk_pixbuf_get_rowstride(pixbuf) - inc * w; - for (int y = 0; y < h; y++, in += rowpadding) - { - for (int x = 0; x < w; x++, in += inc, bit_index++) - if (in[0] == r_mask && in[1] == g_mask && in[2] == b_mask) - out[bit_index >> 3] ^= 1 << (bit_index & 7); - // move index to next byte boundary - bit_index = (bit_index + 7) & ~7u; - } - } - else - { - GdkImage* image = gdk_drawable_get_image(bitmap.GetPixmap(), 0, 0, w, h); - GdkColormap* colormap = gdk_image_get_colormap(image); - guint32 mask_pixel; - if (colormap == NULL) - // mono bitmap, white is pixel value 0 - mask_pixel = guint32(colour.Red() != 255 || colour.Green() != 255 || colour.Blue() != 255); - else - { - wxColor c(colour); - c.CalcPixel(colormap); - mask_pixel = c.GetPixel(); - } - for (int y = 0; y < h; y++) - { - for (int x = 0; x < w; x++, bit_index++) - if (gdk_image_get_pixel(image, x, y) == mask_pixel) - out[bit_index >> 3] ^= 1 << (bit_index & 7); - bit_index = (bit_index + 7) & ~7u; - } - g_object_unref(image); - } - m_bitmap = gdk_bitmap_create_from_data(wxGetTopLevelGDK(), (char*)out, w, h); - delete[] out; -#endif - return true; -} - -bool wxMask::InitFromMonoBitmap(const wxBitmap& bitmap) -{ - if (!bitmap.IsOk()) return false; - - wxCHECK_MSG( bitmap.GetDepth() == 1, false, wxT("Cannot create mask from colour bitmap") ); - -#ifdef __WXGTK3__ - InitFromColour(bitmap, *wxBLACK); -#else - m_bitmap = gdk_pixmap_new(wxGetTopLevelGDK(), bitmap.GetWidth(), bitmap.GetHeight(), 1); - - if (!m_bitmap) return false; - - wxGtkObject gc(gdk_gc_new( m_bitmap )); - gdk_gc_set_function(gc, GDK_COPY_INVERT); - gdk_draw_drawable(m_bitmap, gc, bitmap.GetPixmap(), 0, 0, 0, 0, bitmap.GetWidth(), bitmap.GetHeight()); -#endif - - return true; -} - -wxBitmap wxMask::GetBitmap() const -{ - wxBitmap bitmap; - if (m_bitmap) - { -#ifdef __WXGTK3__ - cairo_surface_t* mask = m_bitmap; - const int w = cairo_image_surface_get_width(mask); - const int h = cairo_image_surface_get_height(mask); - GdkPixbuf* pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, false, 8, w, h); - const guchar* src = cairo_image_surface_get_data(mask); - guchar* dst = gdk_pixbuf_get_pixels(pixbuf); - const int stride_src = cairo_image_surface_get_stride(mask); - const int stride_dst = gdk_pixbuf_get_rowstride(pixbuf); - for (int j = 0; j < h; j++, src += stride_src, dst += stride_dst) - { - guchar* d = dst; - for (int i = 0; i < w; i++, d += 3) - { - d[0] = src[i]; - d[1] = src[i]; - d[2] = src[i]; - } - } - bitmap = wxBitmap(pixbuf, 1); -#else - GdkPixmap* mask = m_bitmap; - int w, h; - gdk_drawable_get_size(mask, &w, &h); - GdkPixmap* pixmap = gdk_pixmap_new(mask, w, h, -1); - GdkGC* gc = gdk_gc_new(pixmap); - gdk_gc_set_function(gc, GDK_COPY_INVERT); - gdk_draw_drawable(pixmap, gc, mask, 0, 0, 0, 0, w, h); - g_object_unref(gc); - bitmap = wxBitmap(pixmap); -#endif - } - return bitmap; -} - -#ifdef __WXGTK3__ -wxMask::operator cairo_surface_t*() const -#else -wxMask::operator GdkPixmap*() const -#endif -{ - return m_bitmap; -} - -//----------------------------------------------------------------------------- -// wxBitmapRefData -//----------------------------------------------------------------------------- - -class wxBitmapRefData: public wxGDIRefData -{ -public: - wxBitmapRefData(int width, int height, int depth); - virtual ~wxBitmapRefData(); - - virtual bool IsOk() const wxOVERRIDE; - -#ifdef __WXGTK3__ - GdkPixbuf* m_pixbufMask; - GdkPixbuf* m_pixbufNoMask; - cairo_surface_t* m_surface; - double m_scaleFactor; -#else - GdkPixmap *m_pixmap; - GdkPixbuf *m_pixbuf; -#endif - wxMask *m_mask; - int m_width; - int m_height; - int m_bpp; -#ifndef __WXGTK3__ - bool m_alphaRequested; -#endif - - // We don't provide a copy ctor as copying m_pixmap and m_pixbuf properly - // is expensive and we don't want to do it implicitly (and possibly - // accidentally). wxBitmap::CloneGDIRefData() which does need to do it does - // it explicitly itself. - wxDECLARE_NO_COPY_CLASS(wxBitmapRefData); -}; - -wxBitmapRefData::wxBitmapRefData(int width, int height, int depth) -{ -#ifdef __WXGTK3__ - m_pixbufMask = NULL; - m_pixbufNoMask = NULL; - m_surface = NULL; - m_scaleFactor = 1; -#else - m_pixmap = NULL; - m_pixbuf = NULL; -#endif - m_mask = NULL; - m_width = width; - m_height = height; - m_bpp = depth; -#ifdef __WXGTK3__ - if (m_bpp != 1 && m_bpp != 32) - m_bpp = 24; -#else - if (m_bpp < 0) - m_bpp = gdk_drawable_get_depth(wxGetTopLevelGDK()); - m_alphaRequested = depth == 32; -#endif -} - -wxBitmapRefData::~wxBitmapRefData() -{ -#ifdef __WXGTK3__ - if (m_pixbufMask) - g_object_unref(m_pixbufMask); - if (m_pixbufNoMask) - g_object_unref(m_pixbufNoMask); - if (m_surface) - cairo_surface_destroy(m_surface); -#else - if (m_pixmap) - g_object_unref (m_pixmap); - if (m_pixbuf) - g_object_unref (m_pixbuf); -#endif - delete m_mask; -} - -bool wxBitmapRefData::IsOk() const -{ - return m_bpp != 0; -} - -//----------------------------------------------------------------------------- -// wxBitmap -//----------------------------------------------------------------------------- - -#define M_BMPDATA static_cast(m_refData) - -wxIMPLEMENT_DYNAMIC_CLASS(wxBitmap,wxGDIObject); - -wxBitmap::wxBitmap(const wxString &filename, wxBitmapType type) -{ - LoadFile(filename, type); -} - -wxBitmap::wxBitmap(const char bits[], int width, int height, int depth) -{ - wxASSERT(depth == 1); - if (width > 0 && height > 0 && depth == 1) - { - m_refData = new wxBitmapRefData(width, height, 1); -#ifdef __WXGTK3__ - GdkPixbuf* pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, false, 8, width, height); - M_BMPDATA->m_pixbufNoMask = pixbuf; - const char* src = bits; - guchar* dst = gdk_pixbuf_get_pixels(pixbuf); - const int stride_src = (width + 7) / 8; - const int rowinc_dst = gdk_pixbuf_get_rowstride(pixbuf) - 3 * width; - for (int j = 0; j < width; j++, src += stride_src, dst += rowinc_dst) - { - for (int i = 0; i < height; i++) - { - guchar c = 0xff; - if (src[i >> 3] & (1 << (i & 7))) - c = 0; - *dst++ = c; - *dst++ = c; - *dst++ = c; - } - } -#else - M_BMPDATA->m_pixmap = gdk_bitmap_create_from_data( - wxGetTopLevelGDK(), bits, width, height); -#endif - } -} - -wxBitmap::wxBitmap(const char* const* bits) -{ - wxCHECK2_MSG(bits != NULL, return, wxT("invalid bitmap data")); - -#if wxUSE_IMAGE - *this = wxBitmap(wxImage(bits)); -#elif defined __WXGTK3__ - GdkPixbuf* pixbuf = gdk_pixbuf_new_from_xpm_data(const_cast(bits)); - if (pixbuf) - { - m_refData = new wxBitmapRefData( - gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf), - gdk_pixbuf_get_n_channels(pixbuf) * 8); - M_BMPDATA->m_pixbufNoMask = pixbuf; - wxASSERT(M_BMPDATA->m_bpp == 32 || !gdk_pixbuf_get_has_alpha(M_BMPDATA->m_pixbufNoMask)); - } -#else - GdkBitmap* mask = NULL; - GdkPixmap* pixmap = gdk_pixmap_create_from_xpm_d( - wxGetTopLevelGDK(), &mask, NULL, const_cast(bits)); - if (pixmap) - { - int width, height; - gdk_drawable_get_size(pixmap, &width, &height); - m_refData = new wxBitmapRefData(width, height, -1); - M_BMPDATA->m_pixmap = pixmap; - if (mask) - { - M_BMPDATA->m_mask = new wxMask(mask); - } - } -#endif -} - -wxBitmap::wxBitmap(GdkPixbuf* pixbuf, int depth) -{ - if (pixbuf) - { - if (depth != 1) - depth = gdk_pixbuf_get_n_channels(pixbuf) * 8; - wxBitmapRefData* bmpData = new wxBitmapRefData( - gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf), - depth); - m_refData = bmpData; -#ifdef __WXGTK3__ - bmpData->m_pixbufNoMask = pixbuf; -#else - bmpData->m_pixbuf = pixbuf; -#endif - } -} - -#ifndef __WXGTK3__ -wxBitmap::wxBitmap(GdkPixmap* pixmap) -{ - if (pixmap) - { - int w, h; - gdk_drawable_get_size(pixmap, &w, &h); - wxBitmapRefData* bmpData = - new wxBitmapRefData(w, h, gdk_drawable_get_depth(pixmap)); - m_refData = bmpData; - bmpData->m_pixmap = pixmap; - } -} -#endif - -wxBitmap::wxBitmap(const wxCursor& cursor) -{ -#if GTK_CHECK_VERSION(2,8,0) - if (gtk_check_version(2,8,0) == NULL) - { - GdkPixbuf *pixbuf = gdk_cursor_get_image(cursor.GetCursor()); - *this = wxBitmap(pixbuf); - } -#else - wxUnusedVar(cursor); -#endif -} - -wxBitmap::~wxBitmap() -{ -} - -bool wxBitmap::Create( int width, int height, int depth ) -{ - UnRef(); - wxCHECK_MSG(width > 0 && height > 0, false, "invalid bitmap size"); - m_refData = new wxBitmapRefData(width, height, depth); - return true; -} - -#ifdef __WXGTK3__ -static void CopyImageData( - guchar* dst, int dstChannels, int dstStride, - const guchar* src, int srcChannels, int srcStride, - int w, int h) -{ - if (dstChannels == srcChannels) - { - if (dstStride == srcStride) - memcpy(dst, src, size_t(dstStride) * h); - else - { - const int stride = dstStride < srcStride ? dstStride : srcStride; - for (int j = 0; j < h; j++, src += srcStride, dst += dstStride) - memcpy(dst, src, stride); - } - } - else - { - for (int j = 0; j < h; j++, src += srcStride, dst += dstStride) - { - guchar* d = dst; - const guchar* s = src; - if (dstChannels == 4) - { - for (int i = 0; i < w; i++, d += 4, s += 3) - { - d[0] = s[0]; - d[1] = s[1]; - d[2] = s[2]; - d[3] = 0xff; - } - } - else - { - for (int i = 0; i < w; i++, d += 3, s += 4) - { - d[0] = s[0]; - d[1] = s[1]; - d[2] = s[2]; - } - } - } - } -} -#endif - -#if wxUSE_IMAGE -#ifdef __WXGTK3__ -wxBitmap::wxBitmap(const wxImage& image, int depth, double scale) -{ - wxCHECK_RET(image.IsOk(), "invalid image"); - - const int w = image.GetWidth(); - const int h = image.GetHeight(); - const guchar* alpha = image.GetAlpha(); - if (depth < 0) - depth = alpha ? 32 : 24; - else if (depth != 1 && depth != 32) - depth = 24; - wxBitmapRefData* bmpData = new wxBitmapRefData(w, h, depth); - bmpData->m_scaleFactor = scale; - m_refData = bmpData; - GdkPixbuf* pixbuf_dst = gdk_pixbuf_new(GDK_COLORSPACE_RGB, depth == 32, 8, w, h); - bmpData->m_pixbufNoMask = pixbuf_dst; - wxASSERT(bmpData->m_bpp == 32 || !gdk_pixbuf_get_has_alpha(bmpData->m_pixbufNoMask)); - const guchar* src = image.GetData(); - - guchar* dst = gdk_pixbuf_get_pixels(pixbuf_dst); - const int dstStride = gdk_pixbuf_get_rowstride(pixbuf_dst); - CopyImageData(dst, gdk_pixbuf_get_n_channels(pixbuf_dst), dstStride, src, 3, 3 * w, w, h); - - if (depth == 32 && alpha) - { - for (int j = 0; j < h; j++, dst += dstStride) - for (int i = 0; i < w; i++) - dst[i * 4 + 3] = *alpha++; - } - if (image.HasMask()) - { - const guchar r = image.GetMaskRed(); - const guchar g = image.GetMaskGreen(); - const guchar b = image.GetMaskBlue(); - cairo_surface_t* surface = cairo_image_surface_create(CAIRO_FORMAT_A8, w, h); - const int stride = cairo_image_surface_get_stride(surface); - dst = cairo_image_surface_get_data(surface); - memset(dst, 0xff, stride * h); - for (int j = 0; j < h; j++, dst += stride) - for (int i = 0; i < w; i++, src += 3) - if (src[0] == r && src[1] == g && src[2] == b) - dst[i] = 0; - cairo_surface_mark_dirty(surface); - bmpData->m_mask = new wxMask(surface); - } -} -#else -wxBitmap::wxBitmap(const wxImage& image, int depth, double WXUNUSED(scale)) -{ - wxCHECK_RET(image.IsOk(), "invalid image"); - - if (depth == 32 || (depth == -1 && image.HasAlpha())) - CreateFromImageAsPixbuf(image); - else - // otherwise create pixmap, if alpha is present it will be converted to mask - CreateFromImageAsPixmap(image, depth); -} - -bool wxBitmap::CreateFromImageAsPixmap(const wxImage& image, int depth) -{ - const int w = image.GetWidth(); - const int h = image.GetHeight(); - if (depth == 1) - { - // create XBM format bitmap - - // one bit per pixel, each row starts on a byte boundary - const size_t out_size = size_t((w + 7) / 8) * unsigned(h); - wxByte* out = new wxByte[out_size]; - // set bits are black - memset(out, 0xff, out_size); - const wxByte* in = image.GetData(); - unsigned bit_index = 0; - for (int y = 0; y < h; y++) - { - for (int x = 0; x < w; x++, in += 3, bit_index++) - if (in[0] == 255 && in[1] == 255 && in[2] == 255) - out[bit_index >> 3] ^= 1 << (bit_index & 7); - // move index to next byte boundary - bit_index = (bit_index + 7) & ~7u; - } - SetPixmap(gdk_bitmap_create_from_data(wxGetTopLevelGDK(), (char*)out, w, h)); - delete[] out; - - if (!M_BMPDATA) // SetPixmap may have failed - return false; - } - else - { - SetPixmap(gdk_pixmap_new(wxGetTopLevelGDK(), w, h, depth)); - if (!M_BMPDATA) - return false; - - wxGtkObject gc(gdk_gc_new(M_BMPDATA->m_pixmap)); - gdk_draw_rgb_image( - M_BMPDATA->m_pixmap, gc, - 0, 0, w, h, - GDK_RGB_DITHER_NONE, image.GetData(), w * 3); - } - - const wxByte* alpha = image.GetAlpha(); - if (alpha != NULL || image.HasMask()) - { - // create mask as XBM format bitmap - - const size_t out_size = size_t((w + 7) / 8) * unsigned(h); - wxByte* out = new wxByte[out_size]; - memset(out, 0xff, out_size); - unsigned bit_index = 0; - if (alpha != NULL) - { - for (int y = 0; y < h; y++) - { - for (int x = 0; x < w; x++, bit_index++) - if (*alpha++ < wxIMAGE_ALPHA_THRESHOLD) - out[bit_index >> 3] ^= 1 << (bit_index & 7); - bit_index = (bit_index + 7) & ~7u; - } - } - else - { - const wxByte r_mask = image.GetMaskRed(); - const wxByte g_mask = image.GetMaskGreen(); - const wxByte b_mask = image.GetMaskBlue(); - const wxByte* in = image.GetData(); - for (int y = 0; y < h; y++) - { - for (int x = 0; x < w; x++, in += 3, bit_index++) - if (in[0] == r_mask && in[1] == g_mask && in[2] == b_mask) - out[bit_index >> 3] ^= 1 << (bit_index & 7); - bit_index = (bit_index + 7) & ~7u; - } - } - SetMask(new wxMask(gdk_bitmap_create_from_data(M_BMPDATA->m_pixmap, (char*)out, w, h))); - delete[] out; - } - return IsOk(); -} - -bool wxBitmap::CreateFromImageAsPixbuf(const wxImage& image) -{ - int width = image.GetWidth(); - int height = image.GetHeight(); - - Create(width, height, 32); - GdkPixbuf* pixbuf = GetPixbuf(); - if (!pixbuf) - return false; - - // Copy the data: - const unsigned char* in = image.GetData(); - unsigned char *out = gdk_pixbuf_get_pixels(pixbuf); - unsigned char *alpha = image.GetAlpha(); - - int rowpad = gdk_pixbuf_get_rowstride(pixbuf) - 4 * width; - - for (int y = 0; y < height; y++, out += rowpad) - { - for (int x = 0; x < width; x++, out += 4, in += 3) - { - out[0] = in[0]; - out[1] = in[1]; - out[2] = in[2]; - if (alpha) - out[3] = *alpha++; - } - } - - return true; -} -#endif - -wxImage wxBitmap::ConvertToImage() const -{ -#ifdef __WXGTK3__ - wxImage image; - wxCHECK_MSG(IsOk(), image, "invalid bitmap"); - wxBitmapRefData* bmpData = M_BMPDATA; - const int w = bmpData->m_width; - const int h = bmpData->m_height; - image.Create(w, h, false); - guchar* dst = image.GetData(); - GdkPixbuf* pixbuf_src = NULL; - if (bmpData->m_pixbufNoMask) - pixbuf_src = bmpData->m_pixbufNoMask; - else if (bmpData->m_surface) - { - pixbuf_src = gdk_pixbuf_get_from_surface(bmpData->m_surface, 0, 0, w, h); - bmpData->m_pixbufNoMask = pixbuf_src; - wxASSERT(bmpData->m_bpp == 32 || !gdk_pixbuf_get_has_alpha(bmpData->m_pixbufNoMask)); - } - if (pixbuf_src) - { - const guchar* src = gdk_pixbuf_get_pixels(pixbuf_src); - const int srcStride = gdk_pixbuf_get_rowstride(pixbuf_src); - const int srcChannels = gdk_pixbuf_get_n_channels(pixbuf_src); - CopyImageData(dst, 3, 3 * w, src, srcChannels, srcStride, w, h); - - if (srcChannels == 4) - { - image.SetAlpha(); - guchar* alpha = image.GetAlpha(); - for (int j = 0; j < h; j++, src += srcStride) - { - const guchar* s = src; - for (int i = 0; i < w; i++, s += 4) - *alpha++ = s[3]; - } - } - } - cairo_surface_t* maskSurf = NULL; - if (bmpData->m_mask) - maskSurf = *bmpData->m_mask; - if (maskSurf) - { - const guchar r = 1; - const guchar g = 2; - const guchar b = 3; - image.SetMaskColour(r, g, b); - wxASSERT(cairo_image_surface_get_format(maskSurf) == CAIRO_FORMAT_A8); - const int stride = cairo_image_surface_get_stride(maskSurf); - const guchar* src = cairo_image_surface_get_data(maskSurf); - for (int j = 0; j < h; j++, src += stride) - { - for (int i = 0; i < w; i++, dst += 3) - if (src[i] == 0) - { - dst[0] = r; - dst[1] = g; - dst[2] = b; - } - else if (dst[0] == r && dst[1] == g && dst[2] == b) - dst[2]--; - } - } -#else - wxCHECK_MSG( IsOk(), wxNullImage, wxT("invalid bitmap") ); - - const int w = GetWidth(); - const int h = GetHeight(); - wxImage image(w, h, false); - unsigned char *data = image.GetData(); - - wxCHECK_MSG(data != NULL, wxNullImage, wxT("couldn't create image") ); - - // prefer pixbuf if available, it will preserve alpha and should be quicker - if (HasPixbuf()) - { - GdkPixbuf *pixbuf = GetPixbuf(); - unsigned char* alpha = NULL; - if (gdk_pixbuf_get_has_alpha(pixbuf)) - { - image.SetAlpha(); - alpha = image.GetAlpha(); - } - const unsigned char* in = gdk_pixbuf_get_pixels(pixbuf); - unsigned char *out = data; - const int inc = 3 + int(alpha != NULL); - const int rowpad = gdk_pixbuf_get_rowstride(pixbuf) - inc * w; - - for (int y = 0; y < h; y++, in += rowpad) - { - for (int x = 0; x < w; x++, in += inc, out += 3) - { - out[0] = in[0]; - out[1] = in[1]; - out[2] = in[2]; - if (alpha != NULL) - *alpha++ = in[3]; - } - } - } - else - { - GdkPixmap* pixmap = GetPixmap(); - GdkPixmap* pixmap_invert = NULL; - if (GetDepth() == 1) - { - // mono bitmaps are inverted, i.e. 0 is white - pixmap_invert = gdk_pixmap_new(pixmap, w, h, 1); - wxGtkObject gc(gdk_gc_new(pixmap_invert)); - gdk_gc_set_function(gc, GDK_COPY_INVERT); - gdk_draw_drawable(pixmap_invert, gc, pixmap, 0, 0, 0, 0, w, h); - pixmap = pixmap_invert; - } - // create a pixbuf which shares data with the wxImage - GdkPixbuf* pixbuf = gdk_pixbuf_new_from_data( - data, GDK_COLORSPACE_RGB, false, 8, w, h, 3 * w, NULL, NULL); - - gdk_pixbuf_get_from_drawable(pixbuf, pixmap, NULL, 0, 0, 0, 0, w, h); - - g_object_unref(pixbuf); - if (pixmap_invert != NULL) - g_object_unref(pixmap_invert); - } - // convert mask, unless there is already alpha - if (GetMask() && !image.HasAlpha()) - { - // we hard code the mask colour for now but we could also make an - // effort (and waste time) to choose a colour not present in the - // image already to avoid having to fudge the pixels below -- - // whether it's worth to do it is unclear however - const int MASK_RED = 1; - const int MASK_GREEN = 2; - const int MASK_BLUE = 3; - const int MASK_BLUE_REPLACEMENT = 2; - - image.SetMaskColour(MASK_RED, MASK_GREEN, MASK_BLUE); - GdkImage* image_mask = gdk_drawable_get_image(*GetMask(), 0, 0, w, h); - - for (int y = 0; y < h; y++) - { - for (int x = 0; x < w; x++, data += 3) - { - if (gdk_image_get_pixel(image_mask, x, y) == 0) - { - data[0] = MASK_RED; - data[1] = MASK_GREEN; - data[2] = MASK_BLUE; - } - else if (data[0] == MASK_RED && data[1] == MASK_GREEN && data[2] == MASK_BLUE) - { - // we have to fudge the colour a bit to prevent - // this pixel from appearing transparent - data[2] = MASK_BLUE_REPLACEMENT; - } - } - } - g_object_unref(image_mask); - } -#endif - - return image; -} - -#endif // wxUSE_IMAGE - -int wxBitmap::GetHeight() const -{ - wxCHECK_MSG( IsOk(), -1, wxT("invalid bitmap") ); - - return M_BMPDATA->m_height; -} - -int wxBitmap::GetWidth() const -{ - wxCHECK_MSG( IsOk(), -1, wxT("invalid bitmap") ); - - return M_BMPDATA->m_width; -} - -int wxBitmap::GetDepth() const -{ - wxCHECK_MSG( IsOk(), -1, wxT("invalid bitmap") ); - - return M_BMPDATA->m_bpp; -} - -wxMask *wxBitmap::GetMask() const -{ - wxCHECK_MSG( IsOk(), NULL, wxT("invalid bitmap") ); - - return M_BMPDATA->m_mask; -} - -void wxBitmap::SetMask( wxMask *mask ) -{ - wxCHECK_RET( IsOk(), wxT("invalid bitmap") ); - - AllocExclusive(); - delete M_BMPDATA->m_mask; - M_BMPDATA->m_mask = mask; -} - -bool wxBitmap::CopyFromIcon(const wxIcon& icon) -{ - *this = icon; - return IsOk(); -} - -#ifdef __WXGTK3__ -bool wxBitmap::CreateScaled(int w, int h, int depth, double scale) -{ - Create(int(w * scale), int(h * scale), depth); - M_BMPDATA->m_scaleFactor = scale; - return true; -} - -double wxBitmap::GetScaleFactor() const -{ - return M_BMPDATA->m_scaleFactor; -} - -static cairo_surface_t* GetSubSurface(cairo_surface_t* surface, const wxRect& rect) -{ - cairo_surface_flush(surface); - const cairo_format_t format = cairo_image_surface_get_format(surface); - int x = rect.x; - if (format != CAIRO_FORMAT_A8) - x *= 4; - cairo_surface_t* subSurface = cairo_image_surface_create(format, rect.width, rect.height); - const int srcStride = cairo_image_surface_get_stride(surface); - const int dstStride = cairo_image_surface_get_stride(subSurface); - const guchar* src = cairo_image_surface_get_data(surface) + rect.y * srcStride + x; - guchar* dst = cairo_image_surface_get_data(subSurface); - for (int j = 0; j < rect.height; j++, src += srcStride, dst += dstStride) - memcpy(dst, src, dstStride); - cairo_surface_mark_dirty(subSurface); - return subSurface; -} -#endif - -wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const -{ - wxBitmap ret; - - wxCHECK_MSG(IsOk(), ret, wxT("invalid bitmap")); - - const int w = rect.width; - const int h = rect.height; - const wxBitmapRefData* bmpData = M_BMPDATA; - - wxCHECK_MSG(rect.x >= 0 && rect.y >= 0 && - rect.x + w <= bmpData->m_width && - rect.y + h <= bmpData->m_height, - ret, wxT("invalid bitmap region")); - - wxBitmapRefData * const newRef = new wxBitmapRefData(w, h, bmpData->m_bpp); - ret.m_refData = newRef; - -#ifdef __WXGTK3__ - newRef->m_scaleFactor = bmpData->m_scaleFactor; - if (bmpData->m_pixbufNoMask) - { - GdkPixbuf* pixbuf = gdk_pixbuf_new_subpixbuf(bmpData->m_pixbufNoMask, rect.x, rect.y, w, h); - newRef->m_pixbufNoMask = gdk_pixbuf_copy(pixbuf); - wxASSERT(newRef->m_bpp == 32 || !gdk_pixbuf_get_has_alpha(newRef->m_pixbufNoMask)); - g_object_unref(pixbuf); - } - else if (bmpData->m_surface) - newRef->m_surface = GetSubSurface(bmpData->m_surface, rect); - - cairo_surface_t* maskSurf = NULL; - if (bmpData->m_mask) - maskSurf = *bmpData->m_mask; - if (maskSurf) - { - newRef->m_mask = new wxMask(GetSubSurface(maskSurf, rect)); - } -#else - if (bmpData->m_pixbuf) - { - GdkPixbuf* pixbuf = - gdk_pixbuf_new_subpixbuf(bmpData->m_pixbuf, rect.x, rect.y, w, h); - newRef->m_pixbuf = gdk_pixbuf_copy(pixbuf); - g_object_unref(pixbuf); - } - if (bmpData->m_pixmap) - { - newRef->m_pixmap = gdk_pixmap_new(bmpData->m_pixmap, w, h, -1); - GdkGC* gc = gdk_gc_new(newRef->m_pixmap); - gdk_draw_drawable( - newRef->m_pixmap, gc, bmpData->m_pixmap, rect.x, rect.y, 0, 0, w, h); - g_object_unref(gc); - } - GdkPixmap* mask = NULL; - if (bmpData->m_mask) - mask = *bmpData->m_mask; - if (mask) - { - GdkPixmap* sub_mask = gdk_pixmap_new(mask, w, h, 1); - newRef->m_mask = new wxMask(sub_mask); - GdkGC* gc = gdk_gc_new(sub_mask); - gdk_draw_drawable( - sub_mask, gc, mask, rect.x, rect.y, 0, 0, w, h); - g_object_unref(gc); - } -#endif - - return ret; -} - -bool wxBitmap::SaveFile( const wxString &name, wxBitmapType type, const wxPalette *WXUNUSED(palette) ) const -{ - wxCHECK_MSG( IsOk(), false, wxT("invalid bitmap") ); - - const char* type_name = NULL; - switch (type) - { - case wxBITMAP_TYPE_ANI: type_name = "ani"; break; - case wxBITMAP_TYPE_BMP: type_name = "bmp"; break; - case wxBITMAP_TYPE_GIF: type_name = "gif"; break; - case wxBITMAP_TYPE_ICO: type_name = "ico"; break; - case wxBITMAP_TYPE_JPEG: type_name = "jpeg"; break; - case wxBITMAP_TYPE_PCX: type_name = "pcx"; break; - case wxBITMAP_TYPE_PNG: type_name = "png"; break; - case wxBITMAP_TYPE_PNM: type_name = "pnm"; break; - case wxBITMAP_TYPE_TGA: type_name = "tga"; break; - case wxBITMAP_TYPE_TIFF: type_name = "tiff"; break; - case wxBITMAP_TYPE_XBM: type_name = "xbm"; break; - case wxBITMAP_TYPE_XPM: type_name = "xpm"; break; - default: break; - } - if (type_name && - gdk_pixbuf_save(GetPixbuf(), wxGTK_CONV_FN(name), type_name, NULL, NULL)) - { - return true; - } -#if wxUSE_IMAGE - return ConvertToImage().SaveFile(name, type); -#else - return false; -#endif -} - -bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type ) -{ - GdkPixbuf* pixbuf = gdk_pixbuf_new_from_file(wxGTK_CONV_FN(name), NULL); - if (pixbuf) - { - *this = wxBitmap(pixbuf); - return true; - } -#if wxUSE_IMAGE - wxImage image; - if (image.LoadFile(name, type) && image.IsOk()) - { - *this = wxBitmap(image); - return true; - } -#else - wxUnusedVar(type); -#endif - return false; -} - -#if wxUSE_PALETTE -wxPalette *wxBitmap::GetPalette() const -{ - return NULL; -} - -void wxBitmap::SetPalette(const wxPalette& WXUNUSED(palette)) -{ - // TODO -} -#endif // wxUSE_PALETTE - -void wxBitmap::SetHeight( int height ) -{ - AllocExclusive(); - M_BMPDATA->m_height = height; -} - -void wxBitmap::SetWidth( int width ) -{ - AllocExclusive(); - M_BMPDATA->m_width = width; -} - -void wxBitmap::SetDepth( int depth ) -{ - AllocExclusive(); - M_BMPDATA->m_bpp = depth; -} - -#ifndef __WXGTK3__ -void wxBitmap::SetPixmap( GdkPixmap *pixmap ) -{ - UnRef(); - - if (!pixmap) - return; - - int w, h; - gdk_drawable_get_size(pixmap, &w, &h); - wxBitmapRefData* bmpData = new wxBitmapRefData(w, h, 0); - m_refData = bmpData; - bmpData->m_pixmap = pixmap; - bmpData->m_bpp = gdk_drawable_get_depth(pixmap); -} - -GdkPixmap *wxBitmap::GetPixmap() const -{ - wxCHECK_MSG( IsOk(), NULL, wxT("invalid bitmap") ); - - wxBitmapRefData* bmpData = M_BMPDATA; - if (bmpData->m_pixmap) - return bmpData->m_pixmap; - - if (bmpData->m_pixbuf) - { - GdkPixmap* pixmap = NULL; - GdkPixmap** mask_pixmap = NULL; - if (gdk_pixbuf_get_has_alpha(bmpData->m_pixbuf)) - { - // make new mask from alpha - mask_pixmap = &pixmap; - } - gdk_pixbuf_render_pixmap_and_mask( - bmpData->m_pixbuf, &bmpData->m_pixmap, mask_pixmap, 128); - if (pixmap) - { - delete bmpData->m_mask; - bmpData->m_mask = new wxMask(pixmap); - } - } - else - { - bmpData->m_pixmap = gdk_pixmap_new(wxGetTopLevelGDK(), - bmpData->m_width, bmpData->m_height, bmpData->m_bpp == 1 ? 1 : -1); - } - return bmpData->m_pixmap; -} - -bool wxBitmap::HasPixmap() const -{ - wxCHECK_MSG( IsOk(), false, wxT("invalid bitmap") ); - - return M_BMPDATA->m_pixmap != NULL; -} -#endif - -#ifdef __WXGTK3__ -GdkPixbuf* wxBitmap::GetPixbufNoMask() const -{ - wxCHECK_MSG(IsOk(), NULL, "invalid bitmap"); - - wxBitmapRefData* bmpData = M_BMPDATA; - GdkPixbuf* pixbuf = bmpData->m_pixbufNoMask; - if (pixbuf) - return pixbuf; - - const int w = bmpData->m_width; - const int h = bmpData->m_height; - if (bmpData->m_surface) - pixbuf = gdk_pixbuf_get_from_surface(bmpData->m_surface, 0, 0, w, h); - else - pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, bmpData->m_bpp == 32, 8, w, h); - bmpData->m_pixbufNoMask = pixbuf; - wxASSERT(bmpData->m_bpp == 32 || !gdk_pixbuf_get_has_alpha(bmpData->m_pixbufNoMask)); - - return pixbuf; -} - -// helper to set up a simulated depth 1 surface -static void SetSourceSurface1(const wxBitmapRefData* bmpData, cairo_t* cr, int x, int y, const wxColour* fg, const wxColour* bg) -{ - GdkPixbuf* pixbuf = gdk_pixbuf_copy(bmpData->m_pixbufNoMask); - const int w = bmpData->m_width; - const int h = bmpData->m_height; - const int stride = gdk_pixbuf_get_rowstride(pixbuf); - const int channels = gdk_pixbuf_get_n_channels(pixbuf); - guchar* dst = gdk_pixbuf_get_pixels(pixbuf); - guchar fg_r = 0, fg_g = 0, fg_b = 0; - if (fg && fg->IsOk()) - { - fg_r = fg->Red(); - fg_g = fg->Green(); - fg_b = fg->Blue(); - } - guchar bg_r = 255, bg_g = 255, bg_b = 255; - if (bg && bg->IsOk()) - { - bg_r = bg->Red(); - bg_g = bg->Green(); - bg_b = bg->Blue(); - } - for (int j = 0; j < h; j++, dst += stride) - { - guchar* d = dst; - for (int i = 0; i < w; i++, d += channels) - if (d[0]) - { - d[0] = bg_r; - d[1] = bg_g; - d[2] = bg_b; - } - else - { - d[0] = fg_r; - d[1] = fg_g; - d[2] = fg_b; - } - } - gdk_cairo_set_source_pixbuf(cr, pixbuf, x, y); - g_object_unref(pixbuf); -} - -void wxBitmap::SetSourceSurface(cairo_t* cr, int x, int y, const wxColour* fg, const wxColour* bg) const -{ - wxBitmapRefData* bmpData = M_BMPDATA; - if (bmpData->m_surface) - { - cairo_set_source_surface(cr, bmpData->m_surface, x, y); - return; - } - wxCHECK_RET(bmpData->m_pixbufNoMask, "no bitmap data"); - if (bmpData->m_bpp == 1) - SetSourceSurface1(bmpData, cr, x, y, fg, bg); - else - { - gdk_cairo_set_source_pixbuf(cr, bmpData->m_pixbufNoMask, x, y); - cairo_pattern_get_surface(cairo_get_source(cr), &bmpData->m_surface); - cairo_surface_reference(bmpData->m_surface); - } -} - -cairo_t* wxBitmap::CairoCreate() const -{ - wxCHECK_MSG(IsOk(), NULL, "invalid bitmap"); - - wxBitmapRefData* bmpData = M_BMPDATA; - cairo_t* cr; - if (bmpData->m_surface) - cr = cairo_create(bmpData->m_surface); - else - { - GdkPixbuf* pixbuf = bmpData->m_pixbufNoMask; - const bool useAlpha = bmpData->m_bpp == 32 || (pixbuf && gdk_pixbuf_get_has_alpha(pixbuf)); - bmpData->m_surface = cairo_image_surface_create( - useAlpha ? CAIRO_FORMAT_ARGB32 : CAIRO_FORMAT_RGB24, - bmpData->m_width, bmpData->m_height); - cr = cairo_create(bmpData->m_surface); - if (pixbuf) - { - gdk_cairo_set_source_pixbuf(cr, pixbuf, 0, 0); - cairo_paint(cr); - cairo_set_source_rgb(cr, 0, 0, 0); - } - } - if (bmpData->m_pixbufNoMask) - { - g_object_unref(bmpData->m_pixbufNoMask); - bmpData->m_pixbufNoMask = NULL; - } - if (bmpData->m_pixbufMask) - { - g_object_unref(bmpData->m_pixbufMask); - bmpData->m_pixbufMask = NULL; - } - wxASSERT(cr && cairo_status(cr) == 0); - if (!wxIsSameDouble(bmpData->m_scaleFactor, 1)) - cairo_scale(cr, bmpData->m_scaleFactor, bmpData->m_scaleFactor); - return cr; -} - -void wxBitmap::Draw(cairo_t* cr, int x, int y, bool useMask, const wxColour* fg, const wxColour* bg) const -{ - wxCHECK_RET(IsOk(), "invalid bitmap"); - - wxBitmapRefData* bmpData = M_BMPDATA; - if (!wxIsSameDouble(bmpData->m_scaleFactor, 1)) - { - cairo_translate(cr, x, y); - const double scale = 1 / bmpData->m_scaleFactor; - cairo_scale(cr, scale, scale); - x = 0; - y = 0; - } - SetSourceSurface(cr, x, y, fg, bg); - cairo_pattern_set_filter(cairo_get_source(cr), CAIRO_FILTER_NEAREST); - cairo_surface_t* mask = NULL; - if (useMask && bmpData->m_mask) - mask = *bmpData->m_mask; - if (mask) - cairo_mask_surface(cr, mask, x, y); - else - cairo_paint(cr); -} -#endif - -GdkPixbuf *wxBitmap::GetPixbuf() const -{ - wxCHECK_MSG( IsOk(), NULL, wxT("invalid bitmap") ); - - wxBitmapRefData* bmpData = M_BMPDATA; -#ifdef __WXGTK3__ - if (bmpData->m_pixbufMask) - return bmpData->m_pixbufMask; - - if (bmpData->m_pixbufNoMask == NULL) - GetPixbufNoMask(); - cairo_surface_t* mask = NULL; - if (bmpData->m_mask) - mask = *bmpData->m_mask; - if (mask == NULL) - return bmpData->m_pixbufNoMask; - - const int w = bmpData->m_width; - const int h = bmpData->m_height; - bmpData->m_pixbufMask = gdk_pixbuf_new(GDK_COLORSPACE_RGB, true, 8, w, h); - - guchar* dst = gdk_pixbuf_get_pixels(bmpData->m_pixbufMask); - const int dstStride = gdk_pixbuf_get_rowstride(bmpData->m_pixbufMask); - CopyImageData(dst, 4, dstStride, - gdk_pixbuf_get_pixels(bmpData->m_pixbufNoMask), - gdk_pixbuf_get_n_channels(bmpData->m_pixbufNoMask), - gdk_pixbuf_get_rowstride(bmpData->m_pixbufNoMask), - w, h); - - const guchar* src = cairo_image_surface_get_data(mask); - const int srcStride = cairo_image_surface_get_stride(mask); - for (int j = 0; j < h; j++, src += srcStride, dst += dstStride) - for (int i = 0; i < w; i++) - if (src[i] == 0) - dst[i * 4 + 3] = 0; - - return bmpData->m_pixbufMask; -#else - if (bmpData->m_pixbuf) - return bmpData->m_pixbuf; - - const int w = bmpData->m_width; - const int h = bmpData->m_height; - GdkPixmap* mask = NULL; - if (bmpData->m_mask) - mask = *bmpData->m_mask; - const bool useAlpha = bmpData->m_alphaRequested || mask; - bmpData->m_pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, useAlpha, 8, w, h); - if (bmpData->m_pixmap) - PixmapToPixbuf(bmpData->m_pixmap, bmpData->m_pixbuf, w, h); - if (mask) - MaskToAlpha(mask, bmpData->m_pixbuf, w, h); - return bmpData->m_pixbuf; -#endif -} - -#ifndef __WXGTK3__ -bool wxBitmap::HasPixbuf() const -{ - wxCHECK_MSG( IsOk(), false, wxT("invalid bitmap") ); - - return M_BMPDATA->m_pixbuf != NULL; -} - -void wxBitmap::PurgeOtherRepresentations(wxBitmap::Representation keep) -{ - if (keep == Pixmap && HasPixbuf()) - { - g_object_unref (M_BMPDATA->m_pixbuf); - M_BMPDATA->m_pixbuf = NULL; - } - if (keep == Pixbuf && HasPixmap()) - { - g_object_unref (M_BMPDATA->m_pixmap); - M_BMPDATA->m_pixmap = NULL; - } -} -#endif - -#ifdef wxHAS_RAW_BITMAP -void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp) -{ - void* bits = NULL; -#ifdef __WXGTK3__ - GdkPixbuf* pixbuf = GetPixbufNoMask(); - if ((bpp == 32) == (gdk_pixbuf_get_has_alpha(pixbuf) != 0)) - { - bits = gdk_pixbuf_get_pixels(pixbuf); - wxBitmapRefData* bmpData = M_BMPDATA; - data.m_width = bmpData->m_width; - data.m_height = bmpData->m_height; - data.m_stride = gdk_pixbuf_get_rowstride(pixbuf); - if (bmpData->m_pixbufMask) - { - g_object_unref(bmpData->m_pixbufMask); - bmpData->m_pixbufMask = NULL; - } - if (bmpData->m_surface) - { - cairo_surface_destroy(bmpData->m_surface); - bmpData->m_surface = NULL; - } - } -#else - GdkPixbuf *pixbuf = GetPixbuf(); - - // Pixmap will get out of date when our pixbuf is accessed directly, so - // ensure we don't keep the old data in it. - PurgeOtherRepresentations(Pixbuf); - - const bool hasAlpha = HasAlpha(); - - // allow access if bpp is valid and matches existence of alpha - if ( pixbuf && ((bpp == 24 && !hasAlpha) || (bpp == 32 && hasAlpha)) ) - { - data.m_height = gdk_pixbuf_get_height( pixbuf ); - data.m_width = gdk_pixbuf_get_width( pixbuf ); - data.m_stride = gdk_pixbuf_get_rowstride( pixbuf ); - bits = gdk_pixbuf_get_pixels(pixbuf); - } -#endif - return bits; -} - -void wxBitmap::UngetRawData(wxPixelDataBase& WXUNUSED(data)) -{ -} -#endif // wxHAS_RAW_BITMAP - -bool wxBitmap::HasAlpha() const -{ - const wxBitmapRefData* bmpData = M_BMPDATA; -#ifdef __WXGTK3__ - return bmpData && bmpData->m_bpp == 32; -#else - return bmpData && (bmpData->m_alphaRequested || - (bmpData->m_pixbuf && gdk_pixbuf_get_has_alpha(bmpData->m_pixbuf))); -#endif -} - -wxGDIRefData* wxBitmap::CreateGDIRefData() const -{ - return new wxBitmapRefData(0, 0, 0); -} - -wxGDIRefData* wxBitmap::CloneGDIRefData(const wxGDIRefData* data) const -{ - const wxBitmapRefData* oldRef = static_cast(data); - wxBitmapRefData * const newRef = new wxBitmapRefData(oldRef->m_width, - oldRef->m_height, - oldRef->m_bpp); -#ifdef __WXGTK3__ - newRef->m_scaleFactor = oldRef->m_scaleFactor; - if (oldRef->m_pixbufNoMask) - newRef->m_pixbufNoMask = gdk_pixbuf_copy(oldRef->m_pixbufNoMask); - if (oldRef->m_surface) - { - const int w = oldRef->m_width; - const int h = oldRef->m_height; - cairo_surface_t* surface = cairo_image_surface_create( - cairo_image_surface_get_format(oldRef->m_surface), w, h); - newRef->m_surface = surface; - cairo_surface_flush(oldRef->m_surface); - const guchar* src = cairo_image_surface_get_data(oldRef->m_surface); - guchar* dst = cairo_image_surface_get_data(surface); - const int stride = cairo_image_surface_get_stride(surface); - wxASSERT(stride == cairo_image_surface_get_stride(oldRef->m_surface)); - memcpy(dst, src, stride * h); - cairo_surface_mark_dirty(surface); - } -#else - if (oldRef->m_pixmap != NULL) - { - newRef->m_pixmap = gdk_pixmap_new( - oldRef->m_pixmap, oldRef->m_width, oldRef->m_height, - // use pixmap depth, m_bpp may not match - gdk_drawable_get_depth(oldRef->m_pixmap)); - wxGtkObject gc(gdk_gc_new(newRef->m_pixmap)); - gdk_draw_drawable( - newRef->m_pixmap, gc, oldRef->m_pixmap, 0, 0, 0, 0, -1, -1); - } - if (oldRef->m_pixbuf != NULL) - { - newRef->m_pixbuf = gdk_pixbuf_copy(oldRef->m_pixbuf); - } -#endif - if (oldRef->m_mask != NULL) - { - newRef->m_mask = new wxMask(*oldRef->m_mask); - } - - return newRef; -} - -/* static */ void wxBitmap::InitStandardHandlers() -{ - // TODO: Insert handler based on GdkPixbufs handler later -} diff --git a/Externals/wxWidgets3/src/gtk/bmpbuttn.cpp b/Externals/wxWidgets3/src/gtk/bmpbuttn.cpp deleted file mode 100644 index cf429bd2fe..0000000000 --- a/Externals/wxWidgets3/src/gtk/bmpbuttn.cpp +++ /dev/null @@ -1,40 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/bmpbuttn.cpp -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if wxUSE_BMPBUTTON - -#include "wx/bmpbuttn.h" - -bool wxBitmapButton::Create(wxWindow *parent, - wxWindowID id, - const wxBitmap& bitmap, - const wxPoint& pos, - const wxSize& size, - long style, - const wxValidator& validator, - const wxString& name) -{ - if ( !wxBitmapButtonBase::Create(parent, id, pos, size, style, - validator, name) ) - return false; - - if ( bitmap.IsOk() ) - { - SetBitmapLabel(bitmap); - - // we need to adjust the size after setting the bitmap as it may be too - // big for the default button size - SetInitialSize(size); - } - - return true; -} -#endif // wxUSE_BMPBUTTON diff --git a/Externals/wxWidgets3/src/gtk/bmpcbox.cpp b/Externals/wxWidgets3/src/gtk/bmpcbox.cpp deleted file mode 100644 index 43d522c08a..0000000000 --- a/Externals/wxWidgets3/src/gtk/bmpcbox.cpp +++ /dev/null @@ -1,383 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/bmpcbox.cpp -// Purpose: wxBitmapComboBox -// Author: Jaakko Salli -// Created: 2008-05-19 -// Copyright: (c) 2008 Jaakko Salli -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_BITMAPCOMBOBOX - -#include "wx/bmpcbox.h" - -#ifndef WX_PRECOMP - #include "wx/log.h" -#endif - -#include -#include "wx/gtk/private.h" - -// ============================================================================ -// implementation -// ============================================================================ - - -wxIMPLEMENT_DYNAMIC_CLASS(wxBitmapComboBox, wxComboBox); - - -// ---------------------------------------------------------------------------- -// wxBitmapComboBox creation -// ---------------------------------------------------------------------------- - -void wxBitmapComboBox::Init() -{ - m_bitmapCellIndex = 0; - m_stringCellIndex = 1; - m_bitmapSize = wxSize(-1, -1); -} - -wxBitmapComboBox::wxBitmapComboBox(wxWindow *parent, - wxWindowID id, - const wxString& value, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style, - const wxValidator& validator, - const wxString& name) - : wxComboBox(), - wxBitmapComboBoxBase() -{ - Init(); - - Create(parent,id,value,pos,size,choices,style,validator,name); -} - -bool wxBitmapComboBox::Create(wxWindow *parent, - wxWindowID id, - const wxString& value, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style, - const wxValidator& validator, - const wxString& name) -{ - wxCArrayString chs(choices); - return Create(parent, id, value, pos, size, chs.GetCount(), - chs.GetStrings(), style, validator, name); -} - -bool wxBitmapComboBox::Create(wxWindow *parent, - wxWindowID id, - const wxString& value, - const wxPoint& pos, - const wxSize& size, - int n, - const wxString choices[], - long style, - const wxValidator& validator, - const wxString& name) -{ - if ( !wxComboBox::Create(parent, id, value, pos, size, - n, choices, style, validator, name) ) - return false; - - // Select 'value' in entry-less mode - if ( !GetEntry() ) - { - int i = FindString(value); - if (i != wxNOT_FOUND) - SetSelection(i); - } - - return true; -} - -void wxBitmapComboBox::GTKCreateComboBoxWidget() -{ - GtkListStore *store; - - store = gtk_list_store_new( 2, G_TYPE_OBJECT, G_TYPE_STRING ); - - if ( HasFlag(wxCB_READONLY) ) - { - m_widget = gtk_combo_box_new_with_model( GTK_TREE_MODEL(store) ); - } - else - { -#ifdef __WXGTK3__ - m_widget = gtk_combo_box_new_with_model_and_entry(GTK_TREE_MODEL(store)); - gtk_combo_box_set_entry_text_column(GTK_COMBO_BOX(m_widget), m_stringCellIndex); -#else - m_widget = gtk_combo_box_entry_new_with_model( GTK_TREE_MODEL(store), m_stringCellIndex ); -#endif - m_entry = GTK_ENTRY(gtk_bin_get_child(GTK_BIN(m_widget))); - gtk_editable_set_editable(GTK_EDITABLE(m_entry), true); - } - g_object_ref(m_widget); - - // This must be called as gtk_combo_box_entry_new_with_model adds - // automatically adds one text column. - gtk_cell_layout_clear( GTK_CELL_LAYOUT(m_widget) ); - - GtkCellRenderer* imageRenderer = gtk_cell_renderer_pixbuf_new(); - gtk_cell_layout_pack_start( GTK_CELL_LAYOUT(m_widget), - imageRenderer, FALSE); - gtk_cell_layout_add_attribute( GTK_CELL_LAYOUT(m_widget), - imageRenderer, "pixbuf", 0); - - GtkCellRenderer* textRenderer = gtk_cell_renderer_text_new(); - gtk_cell_layout_pack_end( GTK_CELL_LAYOUT(m_widget), - textRenderer, TRUE ); - gtk_cell_layout_add_attribute( GTK_CELL_LAYOUT(m_widget), - textRenderer, "text", 1); -} - -wxBitmapComboBox::~wxBitmapComboBox() -{ -} - -GtkWidget* wxBitmapComboBox::GetConnectWidget() -{ - if ( GetEntry() ) - return wxComboBox::GetConnectWidget(); - - return wxChoice::GetConnectWidget(); -} - -GdkWindow *wxBitmapComboBox::GTKGetWindow(wxArrayGdkWindows& windows) const -{ - if ( GetEntry() ) - return wxComboBox::GTKGetWindow(windows); - - return wxChoice::GTKGetWindow(windows); -} - -wxSize wxBitmapComboBox::DoGetBestSize() const -{ - wxSize best = wxComboBox::DoGetBestSize(); - - int delta = GetBitmapSize().y - GetCharHeight(); - if ( delta > 0 ) - { - best.y += delta; - CacheBestSize(best); - } - return best; -} - -// ---------------------------------------------------------------------------- -// Item manipulation -// ---------------------------------------------------------------------------- - -void wxBitmapComboBox::SetItemBitmap(unsigned int n, const wxBitmap& bitmap) -{ - if ( bitmap.IsOk() ) - { - if ( m_bitmapSize.x < 0 ) - { - m_bitmapSize.x = bitmap.GetWidth(); - m_bitmapSize.y = bitmap.GetHeight(); - } - - GtkComboBox* combobox = GTK_COMBO_BOX( m_widget ); - GtkTreeModel *model = gtk_combo_box_get_model( combobox ); - GtkTreeIter iter; - - if ( gtk_tree_model_iter_nth_child( model, &iter, NULL, n ) ) - { - GValue value0 = G_VALUE_INIT; - g_value_init( &value0, G_TYPE_OBJECT ); - g_value_set_object( &value0, bitmap.GetPixbuf() ); - gtk_list_store_set_value( GTK_LIST_STORE(model), &iter, - m_bitmapCellIndex, &value0 ); - g_value_unset( &value0 ); - } - } -} - -wxBitmap wxBitmapComboBox::GetItemBitmap(unsigned int n) const -{ - wxBitmap bitmap; - - GtkComboBox* combobox = GTK_COMBO_BOX( m_widget ); - GtkTreeModel *model = gtk_combo_box_get_model( combobox ); - GtkTreeIter iter; - - if (gtk_tree_model_iter_nth_child (model, &iter, NULL, n)) - { - GValue value = G_VALUE_INIT; - gtk_tree_model_get_value( model, &iter, - m_bitmapCellIndex, &value ); - GdkPixbuf* pixbuf = (GdkPixbuf*) g_value_get_object( &value ); - if ( pixbuf ) - { - g_object_ref( pixbuf ); - bitmap = wxBitmap(pixbuf); - } - g_value_unset( &value ); - } - - return bitmap; -} - -int wxBitmapComboBox::Append(const wxString& item, const wxBitmap& bitmap) -{ - const int n = wxComboBox::Append(item); - if ( n != wxNOT_FOUND ) - SetItemBitmap(n, bitmap); - return n; -} - -int wxBitmapComboBox::Append(const wxString& item, const wxBitmap& bitmap, - void *clientData) -{ - const int n = wxComboBox::Append(item, clientData); - if ( n != wxNOT_FOUND ) - SetItemBitmap(n, bitmap); - return n; -} - -int wxBitmapComboBox::Append(const wxString& item, const wxBitmap& bitmap, - wxClientData *clientData) -{ - const int n = wxComboBox::Append(item, clientData); - if ( n != wxNOT_FOUND ) - SetItemBitmap(n, bitmap); - return n; -} - -int wxBitmapComboBox::Insert(const wxString& item, - const wxBitmap& bitmap, - unsigned int pos) -{ - const int n = wxComboBox::Insert(item, pos); - if ( n != wxNOT_FOUND ) - SetItemBitmap(n, bitmap); - return n; -} - -int wxBitmapComboBox::Insert(const wxString& item, const wxBitmap& bitmap, - unsigned int pos, wxClientData *clientData) -{ - const int n = wxComboBox::Insert(item, pos, clientData); - if ( n != wxNOT_FOUND ) - SetItemBitmap(n, bitmap); - return n; -} - -int wxBitmapComboBox::Insert(const wxString& item, const wxBitmap& bitmap, - unsigned int pos, void *clientData) -{ - const int n = wxComboBox::Insert(item, pos, clientData); - if ( n != wxNOT_FOUND ) - SetItemBitmap(n, bitmap); - return n; -} - -void wxBitmapComboBox::GTKInsertComboBoxTextItem( unsigned int n, const wxString& text ) -{ - GtkComboBox* combobox = GTK_COMBO_BOX( m_widget ); - GtkTreeModel *model = gtk_combo_box_get_model( combobox ); - GtkListStore *store = GTK_LIST_STORE( model ); - GtkTreeIter iter; - - gtk_list_store_insert( store, &iter, n ); - - GValue value = G_VALUE_INIT; - g_value_init( &value, G_TYPE_STRING ); - g_value_set_string( &value, wxGTK_CONV( text ) ); - gtk_list_store_set_value( store, &iter, m_stringCellIndex, &value ); - g_value_unset( &value ); -} - -// ---------------------------------------------------------------------------- -// wxTextEntry interface override -// ---------------------------------------------------------------------------- - -void wxBitmapComboBox::WriteText(const wxString& value) -{ - if ( GetEntry() ) - wxComboBox::WriteText(value); - else - SetStringSelection(value); -} - -wxString wxBitmapComboBox::GetValue() const -{ - if ( GetEntry() ) - return wxComboBox::GetValue(); - - return GetStringSelection(); -} - -void wxBitmapComboBox::Remove(long from, long to) -{ - if ( GetEntry() ) - wxComboBox::Remove(from, to); -} - -void wxBitmapComboBox::SetInsertionPoint(long pos) -{ - if ( GetEntry() ) - wxComboBox::SetInsertionPoint(pos); -} - -long wxBitmapComboBox::GetInsertionPoint() const -{ - if ( GetEntry() ) - return wxComboBox::GetInsertionPoint(); - - return 0; - } -long wxBitmapComboBox::GetLastPosition() const -{ - if ( GetEntry() ) - return wxComboBox::GetLastPosition(); - - return 0; - } - -void wxBitmapComboBox::SetSelection(long from, long to) -{ - if ( GetEntry() ) - wxComboBox::SetSelection(from, to); -} - -void wxBitmapComboBox::GetSelection(long *from, long *to) const -{ - if ( GetEntry() ) - wxComboBox::GetSelection(from, to); -} - -bool wxBitmapComboBox::IsEditable() const -{ - if ( GetEntry() ) - return wxTextEntry::IsEditable(); - - return false; -} - -void wxBitmapComboBox::SetEditable(bool editable) -{ - if ( GetEntry() ) - wxComboBox::SetEditable(editable); -} - -#endif // wxUSE_BITMAPCOMBOBOX diff --git a/Externals/wxWidgets3/src/gtk/brush.cpp b/Externals/wxWidgets3/src/gtk/brush.cpp deleted file mode 100644 index 4fe673d2bc..0000000000 --- a/Externals/wxWidgets3/src/gtk/brush.cpp +++ /dev/null @@ -1,157 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/brush.cpp -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#include "wx/brush.h" - -#ifndef WX_PRECOMP - #include "wx/bitmap.h" - #include "wx/colour.h" -#endif - -//----------------------------------------------------------------------------- -// wxBrush -//----------------------------------------------------------------------------- - -class wxBrushRefData: public wxGDIRefData -{ -public: - wxBrushRefData(const wxColour& colour = wxNullColour, wxBrushStyle style = wxBRUSHSTYLE_SOLID) - { - m_style = style; - m_colour = colour; - } - - wxBrushRefData( const wxBrushRefData& data ) - : wxGDIRefData() - { - m_style = data.m_style; - m_stipple = data.m_stipple; - m_colour = data.m_colour; - } - - bool operator == (const wxBrushRefData& data) const - { - return (m_style == data.m_style && - m_stipple.IsSameAs(data.m_stipple) && - m_colour == data.m_colour); - } - - wxBrushStyle m_style; - wxColour m_colour; - wxBitmap m_stipple; -}; - -//----------------------------------------------------------------------------- - -#define M_BRUSHDATA ((wxBrushRefData *)m_refData) - -wxIMPLEMENT_DYNAMIC_CLASS(wxBrush,wxGDIObject); - -wxBrush::wxBrush( const wxColour &colour, wxBrushStyle style ) -{ - m_refData = new wxBrushRefData(colour, style); -} - -wxBrush::wxBrush(const wxColour& col, int style) -{ - m_refData = new wxBrushRefData(col, (wxBrushStyle)style); -} - -wxBrush::wxBrush( const wxBitmap &stippleBitmap ) -{ - wxBrushStyle style = wxBRUSHSTYLE_STIPPLE; - if (stippleBitmap.GetMask()) - style = wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE; - - m_refData = new wxBrushRefData(*wxBLACK, style); - M_BRUSHDATA->m_stipple = stippleBitmap; -} - -wxBrush::~wxBrush() -{ - // m_refData unrefed in ~wxObject -} - -wxGDIRefData *wxBrush::CreateGDIRefData() const -{ - return new wxBrushRefData; -} - -wxGDIRefData *wxBrush::CloneGDIRefData(const wxGDIRefData *data) const -{ - return new wxBrushRefData(*(wxBrushRefData *)data); -} - -bool wxBrush::operator==(const wxBrush& brush) const -{ - if (m_refData == brush.m_refData) return true; - - if (!m_refData || !brush.m_refData) return false; - - return ( *(wxBrushRefData*)m_refData == *(wxBrushRefData*)brush.m_refData ); -} - -wxBrushStyle wxBrush::GetStyle() const -{ - wxCHECK_MSG( IsOk(), wxBRUSHSTYLE_INVALID, wxT("invalid brush") ); - - return M_BRUSHDATA->m_style; -} - -wxColour wxBrush::GetColour() const -{ - wxCHECK_MSG( IsOk(), wxNullColour, wxT("invalid brush") ); - - return M_BRUSHDATA->m_colour; -} - -wxBitmap *wxBrush::GetStipple() const -{ - wxCHECK_MSG( IsOk(), NULL, wxT("invalid brush") ); - - return &M_BRUSHDATA->m_stipple; -} - -void wxBrush::SetColour( const wxColour& col ) -{ - AllocExclusive(); - - M_BRUSHDATA->m_colour = col; -} - -void wxBrush::SetColour( unsigned char r, unsigned char g, unsigned char b ) -{ - AllocExclusive(); - - M_BRUSHDATA->m_colour.Set( r, g, b ); -} - -void wxBrush::SetStyle( wxBrushStyle style ) -{ - AllocExclusive(); - - M_BRUSHDATA->m_style = style; -} - -void wxBrush::SetStipple( const wxBitmap& stipple ) -{ - AllocExclusive(); - - M_BRUSHDATA->m_stipple = stipple; - if (M_BRUSHDATA->m_stipple.GetMask()) - { - M_BRUSHDATA->m_style = wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE; - } - else - { - M_BRUSHDATA->m_style = wxBRUSHSTYLE_STIPPLE; - } -} diff --git a/Externals/wxWidgets3/src/gtk/button.cpp b/Externals/wxWidgets3/src/gtk/button.cpp deleted file mode 100644 index 0dbe3a70c0..0000000000 --- a/Externals/wxWidgets3/src/gtk/button.cpp +++ /dev/null @@ -1,334 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/button.cpp -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if wxUSE_BUTTON - -#ifndef WX_PRECOMP - #include "wx/button.h" -#endif - -#include "wx/stockitem.h" - -#include -#include "wx/gtk/private.h" -#include "wx/gtk/private/gtk2-compat.h" -#include "wx/gtk/private/list.h" - -// ---------------------------------------------------------------------------- -// GTK callbacks -// ---------------------------------------------------------------------------- - -extern "C" -{ - -static void -wxgtk_button_clicked_callback(GtkWidget *WXUNUSED(widget), wxButton *button) -{ - if ( button->GTKShouldIgnoreEvent() ) - return; - - wxCommandEvent event(wxEVT_BUTTON, button->GetId()); - event.SetEventObject(button); - button->HandleWindowEvent(event); -} - -//----------------------------------------------------------------------------- -// "style_set" from m_widget -//----------------------------------------------------------------------------- - -static void -wxgtk_button_style_set_callback(GtkWidget* widget, GtkStyle*, wxButton* win) -{ - /* the default button has a border around it */ - wxWindow* parent = win->GetParent(); - if (parent && parent->m_wxwindow && gtk_widget_get_can_default(widget)) - { - GtkBorder* border = NULL; - gtk_widget_style_get(widget, "default_border", &border, NULL); - if (border) - { - win->MoveWindow( - win->m_x - border->left, - win->m_y - border->top, - win->m_width + border->left + border->right, - win->m_height + border->top + border->bottom); - gtk_border_free(border); - } - } -} - -} // extern "C" - -//----------------------------------------------------------------------------- -// wxButton -//----------------------------------------------------------------------------- - -bool wxButton::Create(wxWindow *parent, - wxWindowID id, - const wxString &label, - const wxPoint& pos, - const wxSize& size, - long style, - const wxValidator& validator, - const wxString& name) -{ - if (!PreCreation( parent, pos, size ) || - !CreateBase( parent, id, pos, size, style, validator, name )) - { - wxFAIL_MSG( wxT("wxButton creation failed") ); - return false; - } - - // create either a standard button with text label (which may still contain - // an image under GTK+ 2.6+) or a bitmap-only button if we don't have any - // label - const bool - useLabel = !(style & wxBU_NOTEXT) && (!label.empty() || wxIsStockID(id)); - if ( useLabel ) - { - m_widget = gtk_button_new_with_mnemonic(""); - } - else // no label, suppose we will have a bitmap - { - m_widget = gtk_button_new(); - - GtkWidget *image = gtk_image_new(); - gtk_widget_show(image); - gtk_container_add(GTK_CONTAINER(m_widget), image); - } - - g_object_ref(m_widget); - - float x_alignment = 0.5; - if (HasFlag(wxBU_LEFT)) - x_alignment = 0.0; - else if (HasFlag(wxBU_RIGHT)) - x_alignment = 1.0; - - float y_alignment = 0.5; - if (HasFlag(wxBU_TOP)) - y_alignment = 0.0; - else if (HasFlag(wxBU_BOTTOM)) - y_alignment = 1.0; - - gtk_button_set_alignment(GTK_BUTTON(m_widget), x_alignment, y_alignment); - - if ( useLabel ) - SetLabel(label); - - if (style & wxNO_BORDER) - gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE ); - - g_signal_connect_after (m_widget, "clicked", - G_CALLBACK (wxgtk_button_clicked_callback), - this); - - g_signal_connect_after (m_widget, "style_set", - G_CALLBACK (wxgtk_button_style_set_callback), - this); - - m_parent->DoAddChild( this ); - - PostCreation(size); - - return true; -} - - -wxWindow *wxButton::SetDefault() -{ - wxWindow *oldDefault = wxButtonBase::SetDefault(); - - gtk_widget_set_can_default(m_widget, TRUE); - gtk_widget_grab_default( m_widget ); - - // resize for default border - wxgtk_button_style_set_callback( m_widget, NULL, this ); - - return oldDefault; -} - -/* static */ -wxSize wxButtonBase::GetDefaultSize() -{ - static wxSize size = wxDefaultSize; - if (size == wxDefaultSize) - { - // NB: Default size of buttons should be same as size of stock - // buttons as used in most GTK+ apps. Unfortunately it's a little - // tricky to obtain this size: stock button's size may be smaller - // than size of button in GtkButtonBox and vice versa, - // GtkButtonBox's minimal button size may be smaller than stock - // button's size. We have to retrieve both values and combine them. - - GtkWidget *wnd = gtk_window_new(GTK_WINDOW_TOPLEVEL); - GtkWidget *box = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL); - GtkWidget *btn = gtk_button_new_from_stock(GTK_STOCK_CANCEL); - gtk_container_add(GTK_CONTAINER(box), btn); - gtk_container_add(GTK_CONTAINER(wnd), box); - GtkRequisition req; - gtk_widget_get_preferred_size(btn, NULL, &req); - - gint minwidth, minheight; - gtk_widget_style_get(box, - "child-min-width", &minwidth, - "child-min-height", &minheight, - NULL); - - size.x = wxMax(minwidth, req.width); - size.y = wxMax(minheight, req.height); - - gtk_widget_destroy(wnd); - } - return size; -} - -void wxButton::SetLabel( const wxString &lbl ) -{ - wxCHECK_RET( m_widget != NULL, wxT("invalid button") ); - - wxString label(lbl); - - if (label.empty() && wxIsStockID(m_windowId)) - label = wxGetStockLabel(m_windowId); - - wxAnyButton::SetLabel(label); - - // don't use label if it was explicitly disabled - if ( HasFlag(wxBU_NOTEXT) ) - return; - - if (wxIsStockID(m_windowId) && wxIsStockLabel(m_windowId, label)) - { - const char *stock = wxGetStockGtkID(m_windowId); - if (stock) - { - gtk_button_set_label(GTK_BUTTON(m_widget), stock); - gtk_button_set_use_stock(GTK_BUTTON(m_widget), TRUE); - return; - } - } - - // this call is necessary if the button had been initially created without - // a (text) label -- then we didn't use gtk_button_new_with_mnemonic() and - // so "use-underline" GtkButton property remained unset - gtk_button_set_use_underline(GTK_BUTTON(m_widget), TRUE); - const wxString labelGTK = GTKConvertMnemonics(label); - gtk_button_set_label(GTK_BUTTON(m_widget), wxGTK_CONV(labelGTK)); - gtk_button_set_use_stock(GTK_BUTTON(m_widget), FALSE); - - GTKApplyWidgetStyle( false ); -} - -#if wxUSE_MARKUP -bool wxButton::DoSetLabelMarkup(const wxString& markup) -{ - wxCHECK_MSG( m_widget != NULL, false, "invalid button" ); - - const wxString stripped = RemoveMarkup(markup); - if ( stripped.empty() && !markup.empty() ) - return false; - - wxControl::SetLabel(stripped); - - GtkLabel * const label = GTKGetLabel(); - wxCHECK_MSG( label, false, "no label in this button?" ); - - GTKSetLabelWithMarkupForLabel(label, markup); - - return true; -} - -GtkLabel *wxButton::GTKGetLabel() const -{ - GtkWidget* child = gtk_bin_get_child(GTK_BIN(m_widget)); - if ( GTK_IS_ALIGNMENT(child) ) - { - GtkWidget* box = gtk_bin_get_child(GTK_BIN(child)); - GtkLabel* label = NULL; - wxGtkList list(gtk_container_get_children(GTK_CONTAINER(box))); - for (GList* item = list; item; item = item->next) - { - if (GTK_IS_LABEL(item->data)) - label = GTK_LABEL(item->data); - } - - return label; - } - - return GTK_LABEL(child); -} -#endif // wxUSE_MARKUP - -void wxButton::DoApplyWidgetStyle(GtkRcStyle *style) -{ - GTKApplyStyle(m_widget, style); - GtkWidget* child = gtk_bin_get_child(GTK_BIN(m_widget)); - GTKApplyStyle(child, style); - - // for buttons with images, the path to the label is (at least in 2.12) - // GtkButton -> GtkAlignment -> GtkHBox -> GtkLabel - if ( GTK_IS_ALIGNMENT(child) ) - { - GtkWidget* box = gtk_bin_get_child(GTK_BIN(child)); - if ( GTK_IS_BOX(box) ) - { - wxGtkList list(gtk_container_get_children(GTK_CONTAINER(box))); - for (GList* item = list; item; item = item->next) - { - GTKApplyStyle(GTK_WIDGET(item->data), style); - } - } - } -} - -wxSize wxButton::DoGetBestSize() const -{ - // the default button in wxGTK is bigger than the other ones because of an - // extra border around it, but we don't want to take it into account in - // our size calculations (otherwise the result is visually ugly), so - // always return the size of non default button from here - const bool isDefault = gtk_widget_has_default(m_widget) != 0; - if ( isDefault ) - { - // temporarily unset default flag - gtk_widget_set_can_default(m_widget, FALSE); - } - - wxSize ret( wxAnyButton::DoGetBestSize() ); - - if ( isDefault ) - { - // set it back again - gtk_widget_set_can_default(m_widget, TRUE); - } - - if (!HasFlag(wxBU_EXACTFIT)) - { - wxSize defaultSize = GetDefaultSize(); - if (ret.x < defaultSize.x) - ret.x = defaultSize.x; - if (ret.y < defaultSize.y) - ret.y = defaultSize.y; - } - - CacheBestSize(ret); - return ret; -} - -// static -wxVisualAttributes -wxButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) -{ - return GetDefaultAttributesFromGTKWidget(gtk_button_new()); -} - -#endif // wxUSE_BUTTON diff --git a/Externals/wxWidgets3/src/gtk/calctrl.cpp b/Externals/wxWidgets3/src/gtk/calctrl.cpp deleted file mode 100644 index aa325ae0b6..0000000000 --- a/Externals/wxWidgets3/src/gtk/calctrl.cpp +++ /dev/null @@ -1,252 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/calctrl.cpp -// Purpose: implementation of the wxGtkCalendarCtrl -// Author: Marcin Wojdyr -// Copyright: (c) 2008 Marcin Wojdyr -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_CALENDARCTRL - -#ifndef WX_PRECOMP -#endif //WX_PRECOMP - -#include "wx/calctrl.h" - -#include - -extern "C" { - -static void gtk_day_selected_callback(GtkWidget *WXUNUSED(widget), - wxGtkCalendarCtrl *cal) -{ - cal->GTKGenerateEvent(wxEVT_CALENDAR_SEL_CHANGED); -} - -static void gtk_day_selected_double_click_callback(GtkWidget *WXUNUSED(widget), - wxGtkCalendarCtrl *cal) -{ - cal->GTKGenerateEvent(wxEVT_CALENDAR_DOUBLECLICKED); -} - -static void gtk_month_changed_callback(GtkWidget *WXUNUSED(widget), - wxGtkCalendarCtrl *cal) -{ - cal->GTKGenerateEvent(wxEVT_CALENDAR_PAGE_CHANGED); -} - -// callbacks that send deprecated events - -static void gtk_prev_month_callback(GtkWidget *WXUNUSED(widget), - wxGtkCalendarCtrl *cal) -{ - cal->GTKGenerateEvent(wxEVT_CALENDAR_MONTH_CHANGED); -} - -static void gtk_prev_year_callback(GtkWidget *WXUNUSED(widget), - wxGtkCalendarCtrl *cal) -{ - cal->GTKGenerateEvent(wxEVT_CALENDAR_YEAR_CHANGED); -} - -} - -// ---------------------------------------------------------------------------- -// wxGtkCalendarCtrl -// ---------------------------------------------------------------------------- - - -bool wxGtkCalendarCtrl::Create(wxWindow *parent, - wxWindowID id, - const wxDateTime& date, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) -{ - if (!PreCreation(parent, pos, size) || - !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name)) - { - wxFAIL_MSG(wxT("wxGtkCalendarCtrl creation failed")); - return false; - } - - m_widget = gtk_calendar_new(); - g_object_ref(m_widget); - SetDate(date.IsValid() ? date : wxDateTime::Today()); - - if (style & wxCAL_NO_MONTH_CHANGE) - g_object_set (G_OBJECT (m_widget), "no-month-change", true, NULL); - if (style & wxCAL_SHOW_WEEK_NUMBERS) - g_object_set (G_OBJECT (m_widget), "show-week-numbers", true, NULL); - - g_signal_connect_after(m_widget, "day-selected", - G_CALLBACK (gtk_day_selected_callback), - this); - g_signal_connect_after(m_widget, "day-selected-double-click", - G_CALLBACK (gtk_day_selected_double_click_callback), - this); - g_signal_connect_after(m_widget, "month-changed", - G_CALLBACK (gtk_month_changed_callback), - this); - - // connect callbacks that send deprecated events - g_signal_connect_after(m_widget, "prev-month", - G_CALLBACK (gtk_prev_month_callback), - this); - g_signal_connect_after(m_widget, "next-month", - G_CALLBACK (gtk_prev_month_callback), - this); - g_signal_connect_after(m_widget, "prev-year", - G_CALLBACK (gtk_prev_year_callback), - this); - g_signal_connect_after(m_widget, "next-year", - G_CALLBACK (gtk_prev_year_callback), - this); - - m_parent->DoAddChild(this); - - PostCreation(size); - - return true; -} - -void wxGtkCalendarCtrl::GTKGenerateEvent(wxEventType type) -{ - // First check if the new date is in the specified range. - wxDateTime dt = GetDate(); - if ( !IsInValidRange(dt) ) - { - if ( m_validStart.IsValid() && dt < m_validStart ) - dt = m_validStart; - else - dt = m_validEnd; - - SetDate(dt); - - return; - } - - if ( type == wxEVT_CALENDAR_SEL_CHANGED ) - { - // Don't generate this event if the new date is the same as the old - // one. - if ( m_selectedDate == dt ) - return; - - m_selectedDate = dt; - - GenerateEvent(type); - - // Also send the deprecated event together with the new one. - GenerateEvent(wxEVT_CALENDAR_DAY_CHANGED); - } - else - { - GenerateEvent(type); - } -} - -bool wxGtkCalendarCtrl::IsInValidRange(const wxDateTime& dt) const -{ - return (!m_validStart.IsValid() || m_validStart <= dt) && - (!m_validEnd.IsValid() || dt <= m_validEnd); -} - -bool -wxGtkCalendarCtrl::SetDateRange(const wxDateTime& lowerdate, - const wxDateTime& upperdate) -{ - if ( lowerdate.IsValid() && upperdate.IsValid() && lowerdate >= upperdate ) - return false; - - m_validStart = lowerdate; - m_validEnd = upperdate; - - return true; -} - -bool -wxGtkCalendarCtrl::GetDateRange(wxDateTime *lowerdate, - wxDateTime *upperdate) const -{ - if ( lowerdate ) - *lowerdate = m_validStart; - if ( upperdate ) - *upperdate = m_validEnd; - - return m_validStart.IsValid() || m_validEnd.IsValid(); -} - - -bool wxGtkCalendarCtrl::EnableMonthChange(bool enable) -{ - if ( !wxCalendarCtrlBase::EnableMonthChange(enable) ) - return false; - - g_object_set (G_OBJECT (m_widget), "no-month-change", !enable, NULL); - - return true; -} - - -bool wxGtkCalendarCtrl::SetDate(const wxDateTime& date) -{ - if ( date.IsValid() && !IsInValidRange(date) ) - return false; - - g_signal_handlers_block_by_func(m_widget, - (gpointer) gtk_day_selected_callback, this); - g_signal_handlers_block_by_func(m_widget, - (gpointer) gtk_month_changed_callback, this); - - m_selectedDate = date; - int year = date.GetYear(); - int month = date.GetMonth(); - int day = date.GetDay(); - gtk_calendar_select_month(GTK_CALENDAR(m_widget), month, year); - gtk_calendar_select_day(GTK_CALENDAR(m_widget), day); - - g_signal_handlers_unblock_by_func( m_widget, - (gpointer) gtk_month_changed_callback, this); - g_signal_handlers_unblock_by_func( m_widget, - (gpointer) gtk_day_selected_callback, this); - - return true; -} - -wxDateTime wxGtkCalendarCtrl::GetDate() const -{ - guint year, monthGTK, day; - gtk_calendar_get_date(GTK_CALENDAR(m_widget), &year, &monthGTK, &day); - - // GTK may return an invalid date, this happens at least when switching the - // month (or the year in case of February in a leap year) and the new month - // has fewer days than the currently selected one making the currently - // selected day invalid, e.g. just choosing May 31 and going back a month - // results in the date being (non existent) April 31 when we're called from - // gtk_prev_month_callback(). We need to manually work around this to avoid - // asserts from wxDateTime ctor. - const wxDateTime::Month month = static_cast(monthGTK); - const guint dayMax = wxDateTime::GetNumberOfDays(month, year); - if ( day > dayMax ) - day = dayMax; - - return wxDateTime(day, month, year); -} - -void wxGtkCalendarCtrl::Mark(size_t day, bool mark) -{ - if (mark) - gtk_calendar_mark_day(GTK_CALENDAR(m_widget), day); - else - gtk_calendar_unmark_day(GTK_CALENDAR(m_widget), day); -} - -#endif // wxUSE_CALENDARCTRL diff --git a/Externals/wxWidgets3/src/gtk/cdiag.xbm b/Externals/wxWidgets3/src/gtk/cdiag.xbm deleted file mode 100644 index e0502f2303..0000000000 --- a/Externals/wxWidgets3/src/gtk/cdiag.xbm +++ /dev/null @@ -1,6 +0,0 @@ -#define cdiag_width 16 -#define cdiag_height 16 -static unsigned char cdiag_bits[] = { - 0x81, 0x81, 0x42, 0x42, 0x24, 0x24, 0x18, 0x18, 0x18, 0x18, 0x24, 0x24, - 0x42, 0x42, 0x81, 0x81, 0x81, 0x81, 0x42, 0x42, 0x24, 0x24, 0x18, 0x18, - 0x18, 0x18, 0x24, 0x24, 0x42, 0x42, 0x81, 0x81}; diff --git a/Externals/wxWidgets3/src/gtk/checkbox.cpp b/Externals/wxWidgets3/src/gtk/checkbox.cpp deleted file mode 100644 index 166d37cf02..0000000000 --- a/Externals/wxWidgets3/src/gtk/checkbox.cpp +++ /dev/null @@ -1,244 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/checkbox.cpp -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if wxUSE_CHECKBOX - -#include "wx/checkbox.h" - -#include -#include "wx/gtk/private/gtk2-compat.h" -#include "wx/gtk/private/eventsdisabler.h" - -//----------------------------------------------------------------------------- -// data -//----------------------------------------------------------------------------- - -extern bool g_blockEventsOnDrag; - -//----------------------------------------------------------------------------- -// "clicked" -//----------------------------------------------------------------------------- - -extern "C" { -static void gtk_checkbox_toggled_callback(GtkWidget *widget, wxCheckBox *cb) -{ - if (g_blockEventsOnDrag) return; - - // Transitions for 3state checkbox must be done manually, GTK's checkbox - // is 2state with additional "undetermined state" flag which isn't - // changed automatically: - if (cb->Is3State()) - { - GtkToggleButton *toggle = GTK_TOGGLE_BUTTON(widget); - - if (cb->Is3rdStateAllowedForUser()) - { - // The 3 states cycle like this when clicked: - // checked -> undetermined -> unchecked -> checked -> ... - bool active = gtk_toggle_button_get_active(toggle) != 0; - bool inconsistent = gtk_toggle_button_get_inconsistent(toggle) != 0; - - wxGtkEventsDisabler noEvents(cb); - - if (!active && !inconsistent) - { - // checked -> undetermined - gtk_toggle_button_set_active(toggle, true); - gtk_toggle_button_set_inconsistent(toggle, true); - } - else if (!active && inconsistent) - { - // undetermined -> unchecked - gtk_toggle_button_set_inconsistent(toggle, false); - } - else if (active && !inconsistent) - { - // unchecked -> checked - // nothing to do - } - else - { - wxFAIL_MSG(wxT("3state wxCheckBox in unexpected state!")); - } - } - else - { - // user's action unsets undetermined state: - gtk_toggle_button_set_inconsistent(toggle, false); - } - } - - wxCommandEvent event(wxEVT_CHECKBOX, cb->GetId()); - event.SetInt(cb->Get3StateValue()); - event.SetEventObject(cb); - cb->HandleWindowEvent(event); -} -} - -//----------------------------------------------------------------------------- -// wxCheckBox -//----------------------------------------------------------------------------- - -wxCheckBox::wxCheckBox() -{ - m_widgetCheckbox = NULL; -} - -wxCheckBox::~wxCheckBox() -{ - if (m_widgetCheckbox && m_widgetCheckbox != m_widget) - GTKDisconnect(m_widgetCheckbox); -} - -bool wxCheckBox::Create(wxWindow *parent, - wxWindowID id, - const wxString &label, - const wxPoint &pos, - const wxSize &size, - long style, - const wxValidator& validator, - const wxString &name ) -{ - WXValidateStyle( &style ); - if (!PreCreation( parent, pos, size ) || - !CreateBase( parent, id, pos, size, style, validator, name )) - { - wxFAIL_MSG( wxT("wxCheckBox creation failed") ); - return false; - } - - if ( style & wxALIGN_RIGHT ) - { - // VZ: as I don't know a way to create a right aligned checkbox with - // GTK we will create a checkbox without label and a label at the - // left of it - m_widgetCheckbox = gtk_check_button_new(); - - m_widgetLabel = gtk_label_new(""); - gtk_misc_set_alignment(GTK_MISC(m_widgetLabel), 0.0, 0.5); - - m_widget = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); - gtk_box_pack_start(GTK_BOX(m_widget), m_widgetLabel, FALSE, FALSE, 3); - gtk_box_pack_start(GTK_BOX(m_widget), m_widgetCheckbox, FALSE, FALSE, 3); - - gtk_widget_show( m_widgetLabel ); - gtk_widget_show( m_widgetCheckbox ); - } - else - { - m_widgetCheckbox = gtk_check_button_new_with_label(""); - m_widgetLabel = gtk_bin_get_child(GTK_BIN(m_widgetCheckbox)); - m_widget = m_widgetCheckbox; - } - g_object_ref(m_widget); - SetLabel( label ); - - g_signal_connect (m_widgetCheckbox, "toggled", - G_CALLBACK (gtk_checkbox_toggled_callback), this); - - m_parent->DoAddChild( this ); - - PostCreation(size); - - return true; -} - -void wxCheckBox::GTKDisableEvents() -{ - g_signal_handlers_block_by_func(m_widgetCheckbox, - (gpointer) gtk_checkbox_toggled_callback, this); -} - -void wxCheckBox::GTKEnableEvents() -{ - g_signal_handlers_unblock_by_func(m_widgetCheckbox, - (gpointer) gtk_checkbox_toggled_callback, this); -} - -void wxCheckBox::SetValue( bool state ) -{ - wxCHECK_RET( m_widgetCheckbox != NULL, wxT("invalid checkbox") ); - - if (state == GetValue()) - return; - - wxGtkEventsDisabler noEvents(this); - gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(m_widgetCheckbox), state ); -} - -bool wxCheckBox::GetValue() const -{ - wxCHECK_MSG( m_widgetCheckbox != NULL, false, wxT("invalid checkbox") ); - - return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(m_widgetCheckbox)) != 0; -} - -void wxCheckBox::DoSet3StateValue(wxCheckBoxState state) -{ - SetValue(state != wxCHK_UNCHECKED); - gtk_toggle_button_set_inconsistent(GTK_TOGGLE_BUTTON(m_widgetCheckbox), - state == wxCHK_UNDETERMINED); -} - -wxCheckBoxState wxCheckBox::DoGet3StateValue() const -{ - if (gtk_toggle_button_get_inconsistent(GTK_TOGGLE_BUTTON(m_widgetCheckbox))) - { - return wxCHK_UNDETERMINED; - } - else - { - return GetValue() ? wxCHK_CHECKED : wxCHK_UNCHECKED; - } -} - -void wxCheckBox::SetLabel( const wxString& label ) -{ - wxCHECK_RET( m_widgetLabel != NULL, wxT("invalid checkbox") ); - - // save the label inside m_label in case user calls GetLabel() later - wxControl::SetLabel(label); - - GTKSetLabelForLabel(GTK_LABEL(m_widgetLabel), label); -} - -bool wxCheckBox::Enable( bool enable ) -{ - if (!base_type::Enable(enable)) - return false; - - gtk_widget_set_sensitive( m_widgetLabel, enable ); - - if (enable) - GTKFixSensitivity(); - - return true; -} - -void wxCheckBox::DoApplyWidgetStyle(GtkRcStyle *style) -{ - GTKApplyStyle(m_widgetCheckbox, style); - GTKApplyStyle(m_widgetLabel, style); -} - -GdkWindow *wxCheckBox::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const -{ - return gtk_button_get_event_window(GTK_BUTTON(m_widgetCheckbox)); -} - -// static -wxVisualAttributes -wxCheckBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) -{ - return GetDefaultAttributesFromGTKWidget(gtk_check_button_new()); -} - -#endif diff --git a/Externals/wxWidgets3/src/gtk/checklst.cpp b/Externals/wxWidgets3/src/gtk/checklst.cpp deleted file mode 100644 index 4105ce2716..0000000000 --- a/Externals/wxWidgets3/src/gtk/checklst.cpp +++ /dev/null @@ -1,151 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/checklst.cpp -// Purpose: -// Author: Robert Roebling -// Modified by: Ryan Norton (Native GTK2.0+ checklist) -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if wxUSE_CHECKLISTBOX - -#include "wx/checklst.h" - -#include -#include "wx/gtk/private.h" -#include "wx/gtk/private/treeview.h" - -//----------------------------------------------------------------------------- -// "toggled" -//----------------------------------------------------------------------------- -extern "C" { -static void gtk_checklist_toggled(GtkCellRendererToggle * WXUNUSED(renderer), - gchar *stringpath, - wxCheckListBox *listbox) -{ - wxCHECK_RET( listbox->m_treeview != NULL, wxT("invalid listbox") ); - - wxGtkTreePath path(stringpath); - wxCommandEvent new_event( wxEVT_CHECKLISTBOX, - listbox->GetId() ); - new_event.SetEventObject( listbox ); - new_event.SetInt( gtk_tree_path_get_indices(path)[0] ); - new_event.SetString( listbox->GetString( new_event.GetInt() )); - listbox->Check( new_event.GetInt(), !listbox->IsChecked(new_event.GetInt())); - listbox->HandleWindowEvent( new_event ); -} -} - -//----------------------------------------------------------------------------- -// wxCheckListBox -//----------------------------------------------------------------------------- - -wxCheckListBox::wxCheckListBox() : wxCheckListBoxBase() -{ - m_hasCheckBoxes = true; -} - -wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id, - const wxPoint& pos, - const wxSize& size, - int nStrings, - const wxString *choices, - long style, - const wxValidator& validator, - const wxString& name ) -{ - m_hasCheckBoxes = true; - wxListBox::Create( parent, id, pos, size, nStrings, choices, style, validator, name ); -} - -wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style, - const wxValidator& validator, - const wxString& name ) -{ - m_hasCheckBoxes = true; - wxListBox::Create( parent, id, pos, size, choices, - style, validator, name ); -} - -void wxCheckListBox::DoCreateCheckList() -{ - //Create the checklist in our treeview and set up events for it - GtkCellRenderer* renderer = - gtk_cell_renderer_toggle_new(); - GtkTreeViewColumn* column = - gtk_tree_view_column_new_with_attributes( "", renderer, - "active", 0, - NULL ); - gtk_tree_view_column_set_fixed_width(column, 22); - - gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); - gtk_tree_view_column_set_clickable(column, TRUE); - - g_signal_connect (renderer, "toggled", - G_CALLBACK (gtk_checklist_toggled), - this); - - gtk_tree_view_append_column(m_treeview, column); -} - -bool wxCheckListBox::IsChecked(unsigned int index) const -{ - wxCHECK_MSG( m_treeview != NULL, false, wxT("invalid checklistbox") ); - - GtkTreeIter iter; - gboolean res = gtk_tree_model_iter_nth_child( - GTK_TREE_MODEL(m_liststore), - &iter, NULL, //NULL = parent = get first - index - ); - if(!res) - return false; - - GValue value = G_VALUE_INIT; - gtk_tree_model_get_value(GTK_TREE_MODEL(m_liststore), - &iter, - 0, //column - &value); - - return g_value_get_boolean(&value) != 0; -} - -void wxCheckListBox::Check(unsigned int index, bool check) -{ - wxCHECK_RET( m_treeview != NULL, wxT("invalid checklistbox") ); - - GtkTreeIter iter; - gboolean res = gtk_tree_model_iter_nth_child( - GTK_TREE_MODEL(m_liststore), - &iter, NULL, //NULL = parent = get first - index - ); - if(!res) - return; - - gtk_list_store_set(m_liststore, - &iter, - 0, //column - check ? TRUE : FALSE, -1); -} - -int wxCheckListBox::GetItemHeight() const -{ - wxCHECK_MSG( m_treeview != NULL, 0, wxT("invalid listbox")); - - gint height; - gtk_tree_view_column_cell_get_size( - gtk_tree_view_get_column(m_treeview, 0), - NULL, NULL, NULL, NULL, - &height); - return height; -} - -#endif //wxUSE_CHECKLISTBOX diff --git a/Externals/wxWidgets3/src/gtk/choice.cpp b/Externals/wxWidgets3/src/gtk/choice.cpp deleted file mode 100644 index de01dfaed1..0000000000 --- a/Externals/wxWidgets3/src/gtk/choice.cpp +++ /dev/null @@ -1,377 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/choice.cpp -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#include "wx/wxprec.h" - -#if wxUSE_CHOICE || wxUSE_COMBOBOX - -#include "wx/choice.h" - -#ifndef WX_PRECOMP - #include "wx/arrstr.h" -#endif - -#include -#include "wx/gtk/private.h" -#include "wx/gtk/private/gtk2-compat.h" -#include "wx/gtk/private/eventsdisabler.h" - -// ---------------------------------------------------------------------------- -// GTK callbacks -// ---------------------------------------------------------------------------- - -extern "C" { - -static void -gtk_choice_changed_callback( GtkWidget *WXUNUSED(widget), wxChoice *choice ) -{ - choice->SendSelectionChangedEvent(wxEVT_CHOICE); -} - -} - -//----------------------------------------------------------------------------- -// wxChoice -//----------------------------------------------------------------------------- - -void wxChoice::Init() -{ - m_strings = NULL; - m_stringCellIndex = 0; -} - -bool wxChoice::Create( wxWindow *parent, wxWindowID id, - const wxPoint &pos, const wxSize &size, - const wxArrayString& choices, - long style, const wxValidator& validator, - const wxString &name ) -{ - wxCArrayString chs(choices); - - return Create( parent, id, pos, size, chs.GetCount(), chs.GetStrings(), - style, validator, name ); -} - -bool wxChoice::Create( wxWindow *parent, wxWindowID id, - const wxPoint &pos, const wxSize &size, - int n, const wxString choices[], - long style, const wxValidator& validator, - const wxString &name ) -{ - if (!PreCreation( parent, pos, size ) || - !CreateBase( parent, id, pos, size, style, validator, name )) - { - wxFAIL_MSG( wxT("wxChoice creation failed") ); - return false; - } - - if ( IsSorted() ) - { - // if our m_strings != NULL, Append() will check for it and insert - // items in the correct order - m_strings = new wxGtkCollatedArrayString; - } - -#ifdef __WXGTK3__ - m_widget = gtk_combo_box_text_new(); -#else - m_widget = gtk_combo_box_new_text(); -#endif - g_object_ref(m_widget); - - Append(n, choices); - - m_parent->DoAddChild( this ); - - PostCreation(size); - - g_signal_connect_after (m_widget, "changed", - G_CALLBACK (gtk_choice_changed_callback), this); - - return true; -} - -wxChoice::~wxChoice() -{ - delete m_strings; -} - -void wxChoice::GTKInsertComboBoxTextItem( unsigned int n, const wxString& text ) -{ -#ifdef __WXGTK3__ - gtk_combo_box_text_insert_text(GTK_COMBO_BOX_TEXT(m_widget), n, wxGTK_CONV(text)); -#else - gtk_combo_box_insert_text( GTK_COMBO_BOX( m_widget ), n, wxGTK_CONV( text ) ); -#endif -} - -int wxChoice::DoInsertItems(const wxArrayStringsAdapter & items, - unsigned int pos, - void **clientData, wxClientDataType type) -{ - wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid control") ); - - wxASSERT_MSG( !IsSorted() || (pos == GetCount()), - wxT("In a sorted choice data could only be appended")); - - const int count = items.GetCount(); - - int n = wxNOT_FOUND; - - for ( int i = 0; i < count; ++i ) - { - n = pos + i; - // If sorted, use this wxSortedArrayStrings to determine - // the right insertion point - if (m_strings) - n = m_strings->Add(items[i]); - - GTKInsertComboBoxTextItem( n, items[i] ); - - m_clientData.Insert( NULL, n ); - AssignNewItemClientData(n, clientData, i, type); - } - - InvalidateBestSize(); - - return n; -} - -void wxChoice::DoSetItemClientData(unsigned int n, void* clientData) -{ - m_clientData[n] = clientData; -} - -void* wxChoice::DoGetItemClientData(unsigned int n) const -{ - return m_clientData[n]; -} - -void wxChoice::DoClear() -{ - wxCHECK_RET( m_widget != NULL, wxT("invalid control") ); - - wxGtkEventsDisabler noEvents(this); - - GtkComboBox* combobox = GTK_COMBO_BOX( m_widget ); - GtkTreeModel* model = gtk_combo_box_get_model( combobox ); - gtk_list_store_clear(GTK_LIST_STORE(model)); - - m_clientData.Clear(); - - if (m_strings) - m_strings->Clear(); - - InvalidateBestSize(); -} - -void wxChoice::DoDeleteOneItem(unsigned int n) -{ - wxCHECK_RET( m_widget != NULL, wxT("invalid control") ); - wxCHECK_RET( IsValid(n), wxT("invalid index in wxChoice::Delete") ); - - GtkComboBox* combobox = GTK_COMBO_BOX( m_widget ); - GtkTreeModel* model = gtk_combo_box_get_model( combobox ); - GtkListStore* store = GTK_LIST_STORE(model); - GtkTreeIter iter; - if ( !gtk_tree_model_iter_nth_child(model, &iter, NULL, n) ) - { - // This is really not supposed to happen for a valid index. - wxFAIL_MSG(wxS("Item unexpectedly not found.")); - return; - } - gtk_list_store_remove( store, &iter ); - - m_clientData.RemoveAt( n ); - if ( m_strings ) - m_strings->RemoveAt( n ); - - InvalidateBestSize(); -} - -int wxChoice::FindString( const wxString &item, bool bCase ) const -{ - wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, wxT("invalid control") ); - - GtkComboBox* combobox = GTK_COMBO_BOX( m_widget ); - GtkTreeModel* model = gtk_combo_box_get_model( combobox ); - GtkTreeIter iter; - gtk_tree_model_get_iter_first( model, &iter ); - if (!gtk_list_store_iter_is_valid(GTK_LIST_STORE(model), &iter )) - return -1; - int count = 0; - do - { - GValue value = G_VALUE_INIT; - gtk_tree_model_get_value( model, &iter, m_stringCellIndex, &value ); - wxString str = wxGTK_CONV_BACK( g_value_get_string( &value ) ); - g_value_unset( &value ); - - if (item.IsSameAs( str, bCase ) ) - return count; - - count++; - } - while ( gtk_tree_model_iter_next(model, &iter) ); - - return wxNOT_FOUND; -} - -int wxChoice::GetSelection() const -{ - return gtk_combo_box_get_active( GTK_COMBO_BOX( m_widget ) ); -} - -void wxChoice::SetString(unsigned int n, const wxString &text) -{ - wxCHECK_RET( m_widget != NULL, wxT("invalid control") ); - - GtkComboBox* combobox = GTK_COMBO_BOX( m_widget ); - wxCHECK_RET( IsValid(n), wxT("invalid index") ); - - GtkTreeModel *model = gtk_combo_box_get_model( combobox ); - GtkTreeIter iter; - if (gtk_tree_model_iter_nth_child (model, &iter, NULL, n)) - { - GValue value = G_VALUE_INIT; - g_value_init( &value, G_TYPE_STRING ); - g_value_set_string( &value, wxGTK_CONV( text ) ); - gtk_list_store_set_value( GTK_LIST_STORE(model), &iter, m_stringCellIndex, &value ); - g_value_unset( &value ); - } - - InvalidateBestSize(); -} - -wxString wxChoice::GetString(unsigned int n) const -{ - wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid control") ); - - wxString str; - - GtkComboBox* combobox = GTK_COMBO_BOX( m_widget ); - GtkTreeModel *model = gtk_combo_box_get_model( combobox ); - GtkTreeIter iter; - if (gtk_tree_model_iter_nth_child (model, &iter, NULL, n)) - { - GValue value = G_VALUE_INIT; - gtk_tree_model_get_value( model, &iter, m_stringCellIndex, &value ); - wxString tmp = wxGTK_CONV_BACK( g_value_get_string( &value ) ); - g_value_unset( &value ); - return tmp; - } - - return str; -} - -unsigned int wxChoice::GetCount() const -{ - wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid control") ); - - GtkComboBox* combobox = GTK_COMBO_BOX( m_widget ); - GtkTreeModel* model = gtk_combo_box_get_model( combobox ); - GtkTreeIter iter; - gtk_tree_model_get_iter_first( model, &iter ); - if (!gtk_list_store_iter_is_valid(GTK_LIST_STORE(model), &iter )) - return 0; - unsigned int ret = 1; - while (gtk_tree_model_iter_next( model, &iter )) - ret++; - return ret; -} - -void wxChoice::SetSelection( int n ) -{ - wxCHECK_RET( m_widget != NULL, wxT("invalid control") ); - - wxGtkEventsDisabler noEvents(this); - - GtkComboBox* combobox = GTK_COMBO_BOX( m_widget ); - gtk_combo_box_set_active( combobox, n ); -} - -void wxChoice::SetColumns(int n) -{ - gtk_combo_box_set_wrap_width(GTK_COMBO_BOX(m_widget), n); -} - -int wxChoice::GetColumns() const -{ - return gtk_combo_box_get_wrap_width(GTK_COMBO_BOX(m_widget)); -} - -void wxChoice::GTKDisableEvents() -{ - g_signal_handlers_block_by_func(m_widget, - (gpointer) gtk_choice_changed_callback, this); -} - -void wxChoice::GTKEnableEvents() -{ - g_signal_handlers_unblock_by_func(m_widget, - (gpointer) gtk_choice_changed_callback, this); -} - -GdkWindow *wxChoice::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const -{ - return gtk_widget_get_window(m_widget); -} - -wxSize wxChoice::DoGetBestSize() const -{ - // Get the height of the control from GTK+ itself, but use our own version - // to compute the width large enough to show all our strings as GTK+ - // doesn't seem to take the control contents into account. - return GetSizeFromTextSize(wxChoiceBase::DoGetBestSize().x); -} - -wxSize wxChoice::DoGetSizeFromTextSize(int xlen, int ylen) const -{ - wxASSERT_MSG( m_widget, wxS("GetSizeFromTextSize called before creation") ); - - // a GtkEntry for wxComboBox and a GtkCellView for wxChoice - GtkWidget* childPart = gtk_bin_get_child(GTK_BIN(m_widget)); - - // Set a as small as possible size for the control, so preferred sizes - // return "natural" sizes, not taking into account the previous ones (which - // seems to be GTK+3 behaviour) - gtk_widget_set_size_request(m_widget, 0, 0); - - // We are interested in the difference of sizes between the whole contol - // and its child part. I.e. arrow, separators, etc. - GtkRequisition req; - gtk_widget_get_preferred_size(childPart, NULL, &req); - wxSize totalS = GTKGetPreferredSize(m_widget); - - wxSize tsize(xlen + totalS.x - req.width, totalS.y); - - // For a wxChoice, not for wxComboBox, add some margins - if ( !GTK_IS_ENTRY(childPart) ) - tsize.IncBy(5, 0); - - // Perhaps the user wants something different from CharHeight - if ( ylen > 0 ) - tsize.IncBy(0, ylen - GetCharHeight()); - - return tsize; -} - -void wxChoice::DoApplyWidgetStyle(GtkRcStyle *style) -{ - GTKApplyStyle(m_widget, style); - GTKApplyStyle(gtk_bin_get_child(GTK_BIN(m_widget)), style); -} - -// static -wxVisualAttributes -wxChoice::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) -{ - return GetDefaultAttributesFromGTKWidget(gtk_combo_box_new()); -} - -#endif // wxUSE_CHOICE || wxUSE_COMBOBOX diff --git a/Externals/wxWidgets3/src/gtk/clipbrd.cpp b/Externals/wxWidgets3/src/gtk/clipbrd.cpp deleted file mode 100644 index 1777b25a06..0000000000 --- a/Externals/wxWidgets3/src/gtk/clipbrd.cpp +++ /dev/null @@ -1,771 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/clipbrd.cpp -// Purpose: wxClipboard implementation for wxGTK -// Author: Robert Roebling, Vadim Zeitlin -// Copyright: (c) 1998 Robert Roebling -// (c) 2007 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if wxUSE_CLIPBOARD - -#include "wx/clipbrd.h" - -#ifndef WX_PRECOMP - #include "wx/app.h" - #include "wx/log.h" - #include "wx/utils.h" - #include "wx/dataobj.h" -#endif - -#include "wx/scopedarray.h" -#include "wx/scopeguard.h" -#include "wx/evtloop.h" - -#include "wx/gtk/private.h" - -typedef wxScopedArray wxDataFormatArray; - -// ---------------------------------------------------------------------------- -// data -// ---------------------------------------------------------------------------- - -static GdkAtom g_clipboardAtom = 0; -static GdkAtom g_targetsAtom = 0; -static GdkAtom g_timestampAtom = 0; - -#if wxUSE_UNICODE -extern GdkAtom g_altTextAtom; -#endif - -// the trace mask we use with wxLogTrace() - call -// wxLog::AddTraceMask(TRACE_CLIPBOARD) to enable the trace messages from here -// (there will be a *lot* of them!) -#define TRACE_CLIPBOARD wxT("clipboard") - -// ---------------------------------------------------------------------------- -// wxClipboardSync: used to perform clipboard operations synchronously -// ---------------------------------------------------------------------------- - -// constructing this object on stack will wait wait until the latest clipboard -// operation is finished on block exit -// -// notice that there can be no more than one such object alive at any moment, -// i.e. reentrancies are not allowed -class wxClipboardSync -{ -public: - wxClipboardSync(wxClipboard& clipboard) - { - wxASSERT_MSG( !ms_clipboard, wxT("reentrancy in clipboard code") ); - ms_clipboard = &clipboard; - } - - ~wxClipboardSync() - { -#if wxUSE_CONSOLE_EVENTLOOP - // ensure that there is a running event loop: this might not be the - // case if we're called before the main event loop startup - wxEventLoopGuarantor ensureEventLoop; -#endif - while (ms_clipboard) - wxEventLoopBase::GetActive()->YieldFor(wxEVT_CATEGORY_CLIPBOARD); - } - - // this method must be called by GTK+ callbacks to indicate that we got the - // result for our clipboard operation - static void OnDone(wxClipboard * WXUNUSED_UNLESS_DEBUG(clipboard)) - { - wxASSERT_MSG( clipboard == ms_clipboard, - wxT("got notification for alien clipboard") ); - - ms_clipboard = NULL; - } - - // this method should be called if it's possible that no async clipboard - // operation is currently in progress (like it can be the case when the - // clipboard is cleared but not because we asked about it), it should only - // be called if such situation is expected -- otherwise call OnDone() which - // would assert in this case - static void OnDoneIfInProgress(wxClipboard *clipboard) - { - if ( ms_clipboard ) - OnDone(clipboard); - } - -private: - static wxClipboard *ms_clipboard; - - wxDECLARE_NO_COPY_CLASS(wxClipboardSync); -}; - -wxClipboard *wxClipboardSync::ms_clipboard = NULL; - -// ============================================================================ -// clipboard callbacks implementation -// ============================================================================ - -//----------------------------------------------------------------------------- -// "selection_received" for targets -//----------------------------------------------------------------------------- - -extern "C" { -static void -targets_selection_received( GtkWidget *WXUNUSED(widget), - GtkSelectionData *selection_data, - guint32 WXUNUSED(time), - wxClipboard *clipboard ) -{ - if ( !clipboard ) - return; - - wxON_BLOCK_EXIT1(wxClipboardSync::OnDone, clipboard); - - if (!selection_data) - return; - - const int selection_data_length = gtk_selection_data_get_length(selection_data); - if (selection_data_length <= 0) - return; - - // make sure we got the data in the correct form - GdkAtom type = gtk_selection_data_get_data_type(selection_data); - if ( type != GDK_SELECTION_TYPE_ATOM ) - { - if ( strcmp(wxGtkString(gdk_atom_name(type)), "TARGETS") != 0 ) - { - wxLogTrace( TRACE_CLIPBOARD, - wxT("got unsupported clipboard target") ); - - return; - } - } - - // it's not really a format, of course, but we can reuse its GetId() method - // to format this atom as string - wxDataFormat clip(gtk_selection_data_get_selection(selection_data)); - wxLogTrace( TRACE_CLIPBOARD, - wxT("Received available formats for clipboard %s"), - clip.GetId().c_str() ); - - // the atoms we received, holding a list of targets (= formats) - const GdkAtom* const atoms = (GdkAtom*)gtk_selection_data_get_data(selection_data); - for (size_t i = 0; i < selection_data_length / sizeof(GdkAtom); i++) - { - const wxDataFormat format(atoms[i]); - - wxLogTrace(TRACE_CLIPBOARD, wxT("\t%s"), format.GetId().c_str()); - - if ( clipboard->GTKOnTargetReceived(format) ) - return; - } -} -} - -bool wxClipboard::GTKOnTargetReceived(const wxDataFormat& format) -{ - if ( format != m_targetRequested ) - return false; - - m_formatSupported = true; - return true; -} - -//----------------------------------------------------------------------------- -// "selection_received" for the actual data -//----------------------------------------------------------------------------- - -extern "C" { -static void -selection_received( GtkWidget *WXUNUSED(widget), - GtkSelectionData *selection_data, - guint32 WXUNUSED(time), - wxClipboard *clipboard ) -{ - if ( !clipboard ) - return; - - wxON_BLOCK_EXIT1(wxClipboardSync::OnDone, clipboard); - - if (!selection_data || gtk_selection_data_get_length(selection_data) <= 0) - return; - - clipboard->GTKOnSelectionReceived(*selection_data); -} -} - -//----------------------------------------------------------------------------- -// "selection_clear" -//----------------------------------------------------------------------------- - -extern "C" { -static gint -selection_clear_clip( GtkWidget *WXUNUSED(widget), GdkEventSelection *event ) -{ - wxClipboard * const clipboard = wxTheClipboard; - if ( !clipboard ) - return TRUE; - - // notice the use of OnDoneIfInProgress() here instead of just OnDone(): - // it's perfectly possible that we're receiving this notification from GTK+ - // even though we hadn't cleared the clipboard ourselves but because - // another application (or even another window in the same program) - // acquired it - wxON_BLOCK_EXIT1(wxClipboardSync::OnDoneIfInProgress, clipboard); - - wxClipboard::Kind kind; - if (event->selection == GDK_SELECTION_PRIMARY) - { - wxLogTrace(TRACE_CLIPBOARD, wxT("Lost primary selection" )); - - kind = wxClipboard::Primary; - } - else if (event->selection == g_clipboardAtom) - { - wxLogTrace(TRACE_CLIPBOARD, wxT("Lost clipboard" )); - - kind = wxClipboard::Clipboard; - } - else // some other selection, we're not concerned - { - return FALSE; - } - - // the clipboard is no longer in our hands, we don't need data any more - clipboard->GTKClearData(kind); - - return TRUE; -} -} - -//----------------------------------------------------------------------------- -// selection handler for supplying data -//----------------------------------------------------------------------------- - -extern "C" { -static void -selection_handler( GtkWidget *WXUNUSED(widget), - GtkSelectionData *selection_data, - guint WXUNUSED(info), - guint WXUNUSED(time), - gpointer signal_data ) -{ - wxClipboard * const clipboard = wxTheClipboard; - if ( !clipboard ) - return; - - wxDataObject * const data = clipboard->GTKGetDataObject( - gtk_selection_data_get_selection(selection_data)); - if ( !data ) - return; - - // ICCCM says that TIMESTAMP is a required atom. - // In particular, it satisfies Klipper, which polls - // TIMESTAMP to see if the clipboards content has changed. - // It shall return the time which was used to set the data. - if (gtk_selection_data_get_target(selection_data) == g_timestampAtom) - { - guint timestamp = GPOINTER_TO_UINT (signal_data); - gtk_selection_data_set(selection_data, - GDK_SELECTION_TYPE_INTEGER, - 32, - (guchar*)&(timestamp), - sizeof(timestamp)); - wxLogTrace(TRACE_CLIPBOARD, - wxT("Clipboard TIMESTAMP requested, returning timestamp=%u"), - timestamp); - return; - } - - wxDataFormat format(gtk_selection_data_get_target(selection_data)); - - wxLogTrace(TRACE_CLIPBOARD, - wxT("clipboard data in format %s, GtkSelectionData is target=%s type=%s selection=%s timestamp=%u"), - format.GetId().c_str(), - wxString::FromAscii(wxGtkString(gdk_atom_name(gtk_selection_data_get_target(selection_data)))).c_str(), - wxString::FromAscii(wxGtkString(gdk_atom_name(gtk_selection_data_get_data_type(selection_data)))).c_str(), - wxString::FromAscii(wxGtkString(gdk_atom_name(gtk_selection_data_get_selection(selection_data)))).c_str(), - GPOINTER_TO_UINT( signal_data ) - ); - - if ( !data->IsSupportedFormat( format ) ) - return; - - int size = data->GetDataSize( format ); - if ( !size ) - return; - - wxCharBuffer buf(size - 1); // it adds 1 internally (for NUL) - - // text data must be returned in UTF8 if format is wxDF_UNICODETEXT - if ( !data->GetDataHere(format, buf.data()) ) - return; - - // use UTF8_STRING format if requested in Unicode build but just plain - // STRING one in ANSI or if explicitly asked in Unicode -#if wxUSE_UNICODE - if (format == wxDataFormat(wxDF_UNICODETEXT)) - { - gtk_selection_data_set_text( - selection_data, - (const gchar*)buf.data(), - size ); - } - else -#endif // wxUSE_UNICODE - { - gtk_selection_data_set( - selection_data, - format.GetFormatId(), - 8*sizeof(gchar), - (const guchar*)buf.data(), - size ); - } -} -} - -void wxClipboard::GTKOnSelectionReceived(const GtkSelectionData& sel) -{ - wxCHECK_RET( m_receivedData, wxT("should be inside GetData()") ); - - const wxDataFormat format(gtk_selection_data_get_target(const_cast(&sel))); - wxLogTrace(TRACE_CLIPBOARD, wxT("Received selection %s"), - format.GetId().c_str()); - - if ( !m_receivedData->IsSupportedFormat(format, wxDataObject::Set) ) - return; - - m_receivedData->SetData(format, - gtk_selection_data_get_length(const_cast(&sel)), - gtk_selection_data_get_data(const_cast(&sel))); - m_formatSupported = true; -} - -//----------------------------------------------------------------------------- -// asynchronous "selection_received" for targets -//----------------------------------------------------------------------------- - -extern "C" { -static void -async_targets_selection_received( GtkWidget *WXUNUSED(widget), - GtkSelectionData *selection_data, - guint32 WXUNUSED(time), - wxClipboard *clipboard ) -{ - if ( !clipboard ) // Assert? - return; - - if (!clipboard->m_sink) - return; - - wxClipboardEvent *event = new wxClipboardEvent(wxEVT_CLIPBOARD_CHANGED); - event->SetEventObject( clipboard ); - - int selection_data_length = 0; - if (selection_data) - selection_data_length = gtk_selection_data_get_length(selection_data); - - if (selection_data_length <= 0) - { - clipboard->m_sink->QueueEvent( event ); - clipboard->m_sink.Release(); - return; - } - - // make sure we got the data in the correct form - GdkAtom type = gtk_selection_data_get_data_type(selection_data); - if ( type != GDK_SELECTION_TYPE_ATOM ) - { - if ( strcmp(wxGtkString(gdk_atom_name(type)), "TARGETS") != 0 ) - { - wxLogTrace( TRACE_CLIPBOARD, - wxT("got unsupported clipboard target") ); - - clipboard->m_sink->QueueEvent( event ); - clipboard->m_sink.Release(); - return; - } - } - - // it's not really a format, of course, but we can reuse its GetId() method - // to format this atom as string - wxDataFormat clip(gtk_selection_data_get_selection(selection_data)); - wxLogTrace( TRACE_CLIPBOARD, - wxT("Received available formats for clipboard %s"), - clip.GetId().c_str() ); - - // the atoms we received, holding a list of targets (= formats) - const GdkAtom* const atoms = (GdkAtom*)gtk_selection_data_get_data(selection_data); - for (size_t i = 0; i < selection_data_length / sizeof(GdkAtom); i++) - { - const wxDataFormat format(atoms[i]); - - wxLogTrace(TRACE_CLIPBOARD, wxT("\t%s"), format.GetId().c_str()); - - event->AddFormat( format ); - } - - clipboard->m_sink->QueueEvent( event ); - clipboard->m_sink.Release(); -} -} - -// ============================================================================ -// wxClipboard implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxClipboard ctor/dtor -// ---------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxClipboard,wxObject); - -wxClipboard::wxClipboard() -{ - m_idSelectionGetHandler = 0; - - m_open = false; - - m_dataPrimary = - m_dataClipboard = - m_receivedData = NULL; - - m_formatSupported = false; - m_targetRequested = 0; - - // we use m_targetsWidget to query what formats are available - m_targetsWidget = gtk_window_new( GTK_WINDOW_POPUP ); - gtk_widget_realize( m_targetsWidget ); - - g_signal_connect (m_targetsWidget, "selection_received", - G_CALLBACK (targets_selection_received), this); - - // we use m_targetsWidgetAsync to query what formats are available asynchronously - m_targetsWidgetAsync = gtk_window_new( GTK_WINDOW_POPUP ); - gtk_widget_realize( m_targetsWidgetAsync ); - - g_signal_connect (m_targetsWidgetAsync, "selection_received", - G_CALLBACK (async_targets_selection_received), this); - - // we use m_clipboardWidget to get and to offer data - m_clipboardWidget = gtk_window_new( GTK_WINDOW_POPUP ); - gtk_widget_realize( m_clipboardWidget ); - - g_signal_connect (m_clipboardWidget, "selection_received", - G_CALLBACK (selection_received), this); - - g_signal_connect (m_clipboardWidget, "selection_clear_event", - G_CALLBACK (selection_clear_clip), NULL); - - // initialize atoms we use if not done yet - if ( !g_clipboardAtom ) - g_clipboardAtom = gdk_atom_intern( "CLIPBOARD", FALSE ); - if ( !g_targetsAtom ) - g_targetsAtom = gdk_atom_intern ("TARGETS", FALSE); - if ( !g_timestampAtom ) - g_timestampAtom = gdk_atom_intern ("TIMESTAMP", FALSE); -} - -wxClipboard::~wxClipboard() -{ - Clear(); - - gtk_widget_destroy( m_clipboardWidget ); - gtk_widget_destroy( m_targetsWidget ); -} - -// ---------------------------------------------------------------------------- -// wxClipboard helper functions -// ---------------------------------------------------------------------------- - -GdkAtom wxClipboard::GTKGetClipboardAtom() const -{ - return m_usePrimary ? (GdkAtom)GDK_SELECTION_PRIMARY - : g_clipboardAtom; -} - -void wxClipboard::GTKClearData(Kind kind) -{ - wxDataObject *&data = Data(kind); - wxDELETE(data); -} - -bool wxClipboard::SetSelectionOwner(bool set) -{ - bool rc = gtk_selection_owner_set - ( - set ? m_clipboardWidget : NULL, - GTKGetClipboardAtom(), - (guint32)GDK_CURRENT_TIME - ) != 0; - - if ( !rc ) - { - wxLogTrace(TRACE_CLIPBOARD, wxT("Failed to %sset selection owner"), - set ? wxT("") : wxT("un")); - } - - return rc; -} - -void wxClipboard::AddSupportedTarget(GdkAtom atom) -{ - gtk_selection_add_target - ( - m_clipboardWidget, - GTKGetClipboardAtom(), - atom, - 0 // info (same as client data) unused - ); -} - -bool wxClipboard::IsSupportedAsync(wxEvtHandler *sink) -{ - if (m_sink.get()) - return false; // currently busy, come back later - - wxCHECK_MSG( sink, false, wxT("no sink given") ); - - m_sink = sink; - gtk_selection_convert( m_targetsWidgetAsync, - GTKGetClipboardAtom(), - g_targetsAtom, - (guint32) GDK_CURRENT_TIME ); - - return true; -} - -bool wxClipboard::DoIsSupported(const wxDataFormat& format) -{ - wxCHECK_MSG( format, false, wxT("invalid clipboard format") ); - - wxLogTrace(TRACE_CLIPBOARD, wxT("Checking if format %s is available"), - format.GetId().c_str()); - - // these variables will be used by our GTKOnTargetReceived() - m_targetRequested = format; - m_formatSupported = false; - - // block until m_formatSupported is set from targets_selection_received - // callback - { - wxClipboardSync sync(*this); - - gtk_selection_convert( m_targetsWidget, - GTKGetClipboardAtom(), - g_targetsAtom, - (guint32) GDK_CURRENT_TIME ); - } - - return m_formatSupported; -} - -// ---------------------------------------------------------------------------- -// wxClipboard public API implementation -// ---------------------------------------------------------------------------- - -void wxClipboard::Clear() -{ - gtk_selection_clear_targets( m_clipboardWidget, GTKGetClipboardAtom() ); - - if ( gdk_selection_owner_get(GTKGetClipboardAtom()) == - gtk_widget_get_window(m_clipboardWidget) ) - { - wxClipboardSync sync(*this); - - // this will result in selection_clear_clip callback being called and - // it will free our data - SetSelectionOwner(false); - } - - m_targetRequested = 0; - m_formatSupported = false; -} - -bool wxClipboard::Open() -{ - wxCHECK_MSG( !m_open, false, wxT("clipboard already open") ); - - m_open = true; - - return true; -} - -bool wxClipboard::SetData( wxDataObject *data ) -{ - wxCHECK_MSG( m_open, false, wxT("clipboard not open") ); - - wxCHECK_MSG( data, false, wxT("data is invalid") ); - - Clear(); - - return AddData( data ); -} - -bool wxClipboard::AddData( wxDataObject *data ) -{ - wxCHECK_MSG( m_open, false, wxT("clipboard not open") ); - - wxCHECK_MSG( data, false, wxT("data is invalid") ); - - // we can only store one wxDataObject so clear the old one - Clear(); - - Data() = data; - - // get formats from wxDataObjects - const size_t count = data->GetFormatCount(); - wxDataFormatArray formats(count); - data->GetAllFormats(formats.get()); - - // always provide TIMESTAMP as a target, see comments in selection_handler - // for explanation - AddSupportedTarget(g_timestampAtom); - - for ( size_t i = 0; i < count; i++ ) - { - const wxDataFormat format(formats[i]); - - wxLogTrace(TRACE_CLIPBOARD, wxT("Adding support for %s"), - format.GetId().c_str()); - - AddSupportedTarget(format); - } - - if ( !m_idSelectionGetHandler ) - { - m_idSelectionGetHandler = g_signal_connect ( - m_clipboardWidget, "selection_get", - G_CALLBACK (selection_handler), - GUINT_TO_POINTER (gtk_get_current_event_time()) ); - } - - // tell the world we offer clipboard data - return SetSelectionOwner(); -} - -void wxClipboard::Close() -{ - wxCHECK_RET( m_open, wxT("clipboard not open") ); - - m_open = false; -} - -bool wxClipboard::IsOpened() const -{ - return m_open; -} - -bool wxClipboard::IsSupported( const wxDataFormat& format ) -{ - if ( DoIsSupported(format) ) - return true; - -#if wxUSE_UNICODE - if ( format == wxDF_UNICODETEXT ) - { - // also with plain STRING format - return DoIsSupported(g_altTextAtom); - } -#endif // wxUSE_UNICODE - - return false; -} - -bool wxClipboard::GetData( wxDataObject& data ) -{ - wxCHECK_MSG( m_open, false, wxT("clipboard not open") ); - - // get all supported formats from wxDataObjects: notice that we are setting - // the object data, so we need them in "Set" direction - const size_t count = data.GetFormatCount(wxDataObject::Set); - wxDataFormatArray formats(count); - data.GetAllFormats(formats.get(), wxDataObject::Set); - - for ( size_t i = 0; i < count; i++ ) - { - const wxDataFormat format(formats[i]); - - // is this format supported by clipboard ? - if ( !DoIsSupported(format) ) - continue; - - wxLogTrace(TRACE_CLIPBOARD, wxT("Requesting format %s"), - format.GetId().c_str()); - - // these variables will be used by our GTKOnSelectionReceived() - m_receivedData = &data; - m_formatSupported = false; - - { - wxClipboardSync sync(*this); - - gtk_selection_convert(m_clipboardWidget, - GTKGetClipboardAtom(), - format, - (guint32) GDK_CURRENT_TIME ); - } // wait until we get the results - - /* - Normally this is a true error as we checked for the presence of such - data before, but there are applications that may return an empty - string (e.g. Gnumeric-1.6.1 on Linux if an empty cell is copied) - which would produce a false error message here, so we check for the - size of the string first. With ANSI, GetDataSize returns an extra - value (for the closing null?), with unicode, the exact number of - tokens is given (that is more than 1 for non-ASCII characters) - (tested with Gnumeric-1.6.1 and OpenOffice.org-2.0.2) - */ -#if wxUSE_UNICODE - if ( format != wxDF_UNICODETEXT || data.GetDataSize(format) > 0 ) -#else // !UNICODE - if ( format != wxDF_TEXT || data.GetDataSize(format) > 1 ) -#endif // UNICODE / !UNICODE - { - wxCHECK_MSG( m_formatSupported, false, - wxT("error retrieving data from clipboard") ); - } - - return true; - } - - wxLogTrace(TRACE_CLIPBOARD, wxT("GetData(): format not found")); - - return false; -} - -wxDataObject* wxClipboard::GTKGetDataObject( GdkAtom atom ) -{ - if ( atom == GDK_NONE ) - return Data(); - - if ( atom == GDK_SELECTION_PRIMARY ) - { - wxLogTrace(TRACE_CLIPBOARD, wxT("Primary selection requested" )); - - return Data( wxClipboard::Primary ); - } - else if ( atom == g_clipboardAtom ) - { - wxLogTrace(TRACE_CLIPBOARD, wxT("Clipboard data requested" )); - - return Data( wxClipboard::Clipboard ); - } - else // some other selection, we're not concerned - { - return (wxDataObject*)NULL; - } -} - -#endif // wxUSE_CLIPBOARD diff --git a/Externals/wxWidgets3/src/gtk/clrpicker.cpp b/Externals/wxWidgets3/src/gtk/clrpicker.cpp deleted file mode 100644 index 14cff5db3e..0000000000 --- a/Externals/wxWidgets3/src/gtk/clrpicker.cpp +++ /dev/null @@ -1,110 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/clrpicker.cpp -// Purpose: implementation of wxColourButton -// Author: Francesco Montorsi -// Modified By: -// Created: 15/04/2006 -// Copyright: (c) Francesco Montorsi -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if wxUSE_COLOURPICKERCTRL - -#include "wx/clrpicker.h" - -#include - -// ============================================================================ -// implementation -// ============================================================================ - -//----------------------------------------------------------------------------- -// "color-set" -//----------------------------------------------------------------------------- - -extern "C" { -static void gtk_clrbutton_setcolor_callback(GtkColorButton *widget, - wxColourButton *p) -{ - // update the m_colour member of the wxColourButton - wxASSERT(p); -#ifdef __WXGTK3__ - GdkRGBA gdkColor; - gtk_color_button_get_rgba(widget, &gdkColor); -#else - GdkColor gdkColor; - gtk_color_button_get_color(widget, &gdkColor); -#endif - p->GTKSetColour(gdkColor); - - // fire the colour-changed event - wxColourPickerEvent event(p, p->GetId(), p->GetColour()); - p->HandleWindowEvent(event); -} -} - -//----------------------------------------------------------------------------- -// wxColourButton -//----------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxColourButton, wxButton); - -bool wxColourButton::Create( wxWindow *parent, wxWindowID id, - const wxColour &col, - const wxPoint &pos, const wxSize &size, - long style, const wxValidator& validator, - const wxString &name ) -{ - if (!PreCreation( parent, pos, size ) || - !wxControl::CreateBase(parent, id, pos, size, style, validator, name)) - { - wxFAIL_MSG( wxT("wxColourButton creation failed") ); - return false; - } - - m_colour = col; -#ifdef __WXGTK3__ - m_widget = gtk_color_button_new_with_rgba(m_colour); -#else - m_widget = gtk_color_button_new_with_color( m_colour.GetColor() ); -#endif - g_object_ref(m_widget); - - // Display opacity slider - g_object_set(G_OBJECT(m_widget), "use-alpha", - static_cast(style & wxCLRP_SHOW_ALPHA), NULL); - // GtkColourButton signals - g_signal_connect(m_widget, "color-set", - G_CALLBACK(gtk_clrbutton_setcolor_callback), this); - - - m_parent->DoAddChild( this ); - - PostCreation(size); - SetInitialSize(size); - - return true; -} - -wxColourButton::~wxColourButton() -{ -} - -void wxColourButton::UpdateColour() -{ -#ifdef __WXGTK3__ - gtk_color_button_set_rgba(GTK_COLOR_BUTTON(m_widget), m_colour); -#else - gtk_color_button_set_color(GTK_COLOR_BUTTON(m_widget), m_colour.GetColor()); -#endif -} - -#endif // wxUSE_COLOURPICKERCTRL diff --git a/Externals/wxWidgets3/src/gtk/collpane.cpp b/Externals/wxWidgets3/src/gtk/collpane.cpp deleted file mode 100644 index 9d67ea4ca6..0000000000 --- a/Externals/wxWidgets3/src/gtk/collpane.cpp +++ /dev/null @@ -1,287 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/collpane.cpp -// Purpose: wxCollapsiblePane -// Author: Francesco Montorsi -// Modified By: -// Created: 8/10/2006 -// Copyright: (c) Francesco Montorsi -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if wxUSE_COLLPANE && !defined(__WXUNIVERSAL__) - -#include "wx/collpane.h" -#include "wx/toplevel.h" -#include "wx/sizer.h" -#include "wx/panel.h" - -#include -#include "wx/gtk/private.h" -#include "wx/gtk/private/gtk2-compat.h" - -// the lines below duplicate the same definitions in collpaneg.cpp, if we have -// another implementation of this class we should extract them to a common file - -const char wxCollapsiblePaneNameStr[] = "collapsiblePane"; - -wxDEFINE_EVENT( wxEVT_COLLAPSIBLEPANE_CHANGED, wxCollapsiblePaneEvent ); - -wxIMPLEMENT_DYNAMIC_CLASS(wxCollapsiblePaneEvent, wxCommandEvent); - -// ============================================================================ -// implementation -// ============================================================================ - -//----------------------------------------------------------------------------- -// "notify::expanded" signal -//----------------------------------------------------------------------------- - -extern "C" { - -static void -gtk_collapsiblepane_expanded_callback(GObject * WXUNUSED(object), - GParamSpec * WXUNUSED(param_spec), - wxCollapsiblePane *p) -{ - // NB: unlike for the "activate" signal, when this callback is called, if - // we try to query the "collapsed" status through p->IsCollapsed(), we - // get the right value. I.e. here p->IsCollapsed() will return false if - // this callback has been called at the end of a collapsed->expanded - // transition and viceversa. Inside the "activate" signal callback - // p->IsCollapsed() would return the wrong value! - - wxSize sz; - if ( p->IsExpanded() ) - { - // NB: we cannot use the p->GetBestSize() or p->GetMinSize() functions - // here as they would return the size for the collapsed expander - // even if the collapsed->expanded transition has already been - // completed; we solve this problem doing: - - sz = p->m_szCollapsed; - - wxSize panesz = p->GetPane()->GetBestSize(); - sz.x = wxMax(sz.x, panesz.x); - sz.y += gtk_expander_get_spacing(GTK_EXPANDER(p->m_widget)) + panesz.y; - } - else // collapsed - { - // same problem described above: using p->Get[Best|Min]Size() here we - // would get the size of the control when it is expanded even if the - // expanded->collapsed transition should be complete now... - // So, we use the size cached at control-creation time... - sz = p->m_szCollapsed; - } - - // VERY IMPORTANT: - // just calling - // p->OnStateChange(sz); - // here would work work BUT: - // 1) in the expanded->collapsed transition it provokes a lot of flickering - // 2) in the collapsed->expanded transition using the "Change status" wxButton - // in samples/collpane application some strange warnings would be generated - // by the "clearlooks" theme, if that's your theme. - // - // So we prefer to use some GTK+ native optimized calls, which prevent too many resize - // calculations to happen. Note that the following code has been very carefully designed - // and tested - be VERY careful when changing it! - - // 1) need to update our size hints - // NB: this function call won't actually do any long operation - // (redraw/relayout/resize) so that it's flicker-free - p->SetMinSize(sz); - - if (p->HasFlag(wxCP_NO_TLW_RESIZE)) - { - // fire an event - wxCollapsiblePaneEvent ev(p, p->GetId(), p->IsCollapsed()); - p->HandleWindowEvent(ev); - - // the user asked to explicitly handle the resizing itself... - return; - } - - wxTopLevelWindow * - top = wxDynamicCast(wxGetTopLevelParent(p), wxTopLevelWindow); - if ( top && top->GetSizer() ) - { - // 2) recalculate minimal size of the top window - sz = top->GetSizer()->CalcMin(); - - if (top->m_mainWidget) - { - // 3) MAGIC HACK: if you ever used GtkExpander in a GTK+ program - // you know that this magic call is required to make it possible - // to shrink the top level window in the expanded->collapsed - // transition. This may be sometimes undesired but *is* - // necessary and if you look carefully, all GTK+ programs using - // GtkExpander perform this trick (e.g. the standard "open file" - // dialog of GTK+>=2.4 is not resizable when the expander is - // collapsed!) - gtk_window_set_resizable (GTK_WINDOW (top->m_widget), p->IsExpanded()); - - // 4) set size hints - top->SetMinClientSize(sz); - - // 5) set size - top->SetClientSize(sz); - } - } - - if ( p->m_bIgnoreNextChange ) - { - // change generated programmatically - do not send an event! - p->m_bIgnoreNextChange = false; - return; - } - - // fire an event - wxCollapsiblePaneEvent ev(p, p->GetId(), p->IsCollapsed()); - p->HandleWindowEvent(ev); -} -} - -void wxCollapsiblePane::AddChildGTK(wxWindowGTK* child) -{ - // should be used only once to insert the "pane" into the - // GtkExpander widget. wxGenericCollapsiblePane::DoAddChild() will check if - // it has been called only once (and in any case we would get a warning - // from the following call as GtkExpander is a GtkBin and can contain only - // a single child!). - gtk_container_add(GTK_CONTAINER(m_widget), child->m_widget); -} - -//----------------------------------------------------------------------------- -// wxCollapsiblePane -//----------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxCollapsiblePane, wxControl); - -wxBEGIN_EVENT_TABLE(wxCollapsiblePane, wxCollapsiblePaneBase) - EVT_SIZE(wxCollapsiblePane::OnSize) -wxEND_EVENT_TABLE() - -bool wxCollapsiblePane::Create(wxWindow *parent, - wxWindowID id, - const wxString& label, - const wxPoint& pos, - const wxSize& size, - long style, - const wxValidator& val, - const wxString& name) -{ - m_bIgnoreNextChange = false; - - if ( !PreCreation( parent, pos, size ) || - !wxControl::CreateBase(parent, id, pos, size, style, val, name) ) - { - wxFAIL_MSG( wxT("wxCollapsiblePane creation failed") ); - return false; - } - - m_widget = - gtk_expander_new_with_mnemonic(wxGTK_CONV(GTKConvertMnemonics(label))); - g_object_ref(m_widget); - - // see the gtk_collapsiblepane_expanded_callback comments to understand why - // we connect to the "notify::expanded" signal instead of the more common - // "activate" one - g_signal_connect(m_widget, "notify::expanded", - G_CALLBACK(gtk_collapsiblepane_expanded_callback), this); - - // this the real "pane" - m_pPane = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, - wxTAB_TRAVERSAL|wxNO_BORDER, wxS("wxCollapsiblePanePane")); - - m_parent->DoAddChild( this ); - - PostCreation(size); - - // we should blend into our parent background - const wxColour bg = parent->GetBackgroundColour(); - SetBackgroundColour(bg); - m_pPane->SetBackgroundColour(bg); - - // remember the size of this control when it's collapsed - m_szCollapsed = GetBestSize(); - - return true; -} - -wxSize wxCollapsiblePane::DoGetBestSize() const -{ - wxASSERT_MSG( m_widget, wxT("DoGetBestSize called before creation") ); - - // notice that we do not cache our best size here as it changes - // all times the user expands/hide our pane - return GTKGetPreferredSize(m_widget); -} - -void wxCollapsiblePane::Collapse(bool collapse) -{ - // optimization - if (IsCollapsed() == collapse) - return; - - // do not send event in next signal handler call - m_bIgnoreNextChange = true; - gtk_expander_set_expanded(GTK_EXPANDER(m_widget), !collapse); -} - -bool wxCollapsiblePane::IsCollapsed() const -{ - return !gtk_expander_get_expanded(GTK_EXPANDER(m_widget)); -} - -void wxCollapsiblePane::SetLabel(const wxString &str) -{ - gtk_expander_set_label(GTK_EXPANDER(m_widget), - wxGTK_CONV(GTKConvertMnemonics(str))); - - // FIXME: we need to update our collapsed width in some way but using GetBestSize() - // we may get the size of the control with the pane size summed up if we are expanded! - //m_szCollapsed.x = GetBestSize().x; -} - -void wxCollapsiblePane::OnSize(wxSizeEvent &ev) -{ -#if 0 // for debug only - wxClientDC dc(this); - dc.SetPen(*wxBLACK_PEN); - dc.SetBrush(*wxTRANSPARENT_BRUSH); - dc.DrawRectangle(wxPoint(0,0), GetSize()); - dc.SetPen(*wxRED_PEN); - dc.DrawRectangle(wxPoint(0,0), GetBestSize()); -#endif - - // here we need to resize the pane window otherwise, even if the GtkExpander container - // is expanded or shrunk, the pane window won't be updated! - int h = ev.GetSize().y - m_szCollapsed.y; - if (h < 0) h = 0; - m_pPane->SetSize(ev.GetSize().x, h); - - // we need to explicitly call m_pPane->Layout() or else it won't correctly relayout - // (even if SetAutoLayout(true) has been called on it!) - m_pPane->Layout(); -} - - -GdkWindow *wxCollapsiblePane::GTKGetWindow(wxArrayGdkWindows& windows) const -{ - GtkWidget *label = gtk_expander_get_label_widget( GTK_EXPANDER(m_widget) ); - windows.Add(gtk_widget_get_window(label)); - windows.Add(gtk_widget_get_window(m_widget)); - - return NULL; -} - -#endif // wxUSE_COLLPANE && !defined(__WXUNIVERSAL__) - diff --git a/Externals/wxWidgets3/src/gtk/colordlg.cpp b/Externals/wxWidgets3/src/gtk/colordlg.cpp deleted file mode 100644 index 4fd714213b..0000000000 --- a/Externals/wxWidgets3/src/gtk/colordlg.cpp +++ /dev/null @@ -1,167 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/colordlg.cpp -// Purpose: Native wxColourDialog for GTK+ -// Author: Vaclav Slavik -// Modified by: -// Created: 2004/06/04 -// Copyright: (c) Vaclav Slavik, 2004 -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_COLOURDLG - -#include "wx/colordlg.h" - -#ifndef WX_PRECOMP - #include "wx/intl.h" -#endif - -#include -#include "wx/gtk/private.h" -#include "wx/gtk/private/gtk2-compat.h" -#include "wx/gtk/private/dialogcount.h" - -extern "C" { -static void response(GtkDialog*, int response_id, wxColourDialog* win) -{ - win->EndModal(response_id == GTK_RESPONSE_OK ? wxID_OK : wxID_CANCEL); -} -} - -wxIMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog); - -wxColourDialog::wxColourDialog(wxWindow *parent, wxColourData *data) -{ - Create(parent, data); -} - -bool wxColourDialog::Create(wxWindow *parent, wxColourData *data) -{ - if (data) - m_data = *data; - - m_parent = GetParentForModalDialog(parent, 0); - GtkWindow * const parentGTK = m_parent ? GTK_WINDOW(m_parent->m_widget) - : NULL; - - wxString title(_("Choose colour")); - m_widget = gtk_color_selection_dialog_new(wxGTK_CONV(title)); - - g_object_ref(m_widget); - - if ( parentGTK ) - { - gtk_window_set_transient_for(GTK_WINDOW(m_widget), parentGTK); - } - - GtkColorSelection* sel = GTK_COLOR_SELECTION( - gtk_color_selection_dialog_get_color_selection( - GTK_COLOR_SELECTION_DIALOG(m_widget))); - gtk_color_selection_set_has_palette(sel, true); - gtk_color_selection_set_has_opacity_control(sel, m_data.GetChooseAlpha()); - - return true; -} - -int wxColourDialog::ShowModal() -{ - ColourDataToDialog(); - - gulong id = g_signal_connect(m_widget, "response", G_CALLBACK(response), this); - int rc = wxDialog::ShowModal(); - g_signal_handler_disconnect(m_widget, id); - - if (rc == wxID_OK) - DialogToColourData(); - - return rc; -} - -void wxColourDialog::ColourDataToDialog() -{ - GtkColorSelection* sel = GTK_COLOR_SELECTION( - gtk_color_selection_dialog_get_color_selection( - GTK_COLOR_SELECTION_DIALOG(m_widget))); - - const wxColour& color = m_data.GetColour(); - if (color.IsOk()) - { -#ifdef __WXGTK3__ - gtk_color_selection_set_current_rgba(sel, color); -#else - gtk_color_selection_set_current_color(sel, color.GetColor()); - // Convert alpha range: [0,255] -> [0,65535] - gtk_color_selection_set_current_alpha(sel, 257*color.Alpha()); -#endif - } - - // setup the palette: - - GdkColor colors[wxColourData::NUM_CUSTOM]; - gint n_colors = 0; - for (unsigned i = 0; i < WXSIZEOF(colors); i++) - { - wxColour c = m_data.GetCustomColour(i); - if (c.IsOk()) - { - colors[n_colors] = *c.GetColor(); - n_colors++; - } - } - - wxGtkString pal(gtk_color_selection_palette_to_string(colors, n_colors)); - - GtkSettings *settings = gtk_widget_get_settings(GTK_WIDGET(sel)); - g_object_set(settings, "gtk-color-palette", pal.c_str(), NULL); -} - -void wxColourDialog::DialogToColourData() -{ - GtkColorSelection* sel = GTK_COLOR_SELECTION( - gtk_color_selection_dialog_get_color_selection( - GTK_COLOR_SELECTION_DIALOG(m_widget))); - -#ifdef __WXGTK3__ - GdkRGBA clr; - gtk_color_selection_get_current_rgba(sel, &clr); - m_data.SetColour(clr); -#else - GdkColor clr; - gtk_color_selection_get_current_color(sel, &clr); - // Set RGB colour - wxColour cRGB(clr); - guint16 alpha = gtk_color_selection_get_current_alpha(sel); - // Set RGBA colour (convert alpha range: [0,65535] -> [0,255]). - wxColour cRGBA(cRGB.Red(), cRGB.Green(), cRGB.Blue(), alpha/257); - m_data.SetColour(cRGBA); -#endif - - // Extract custom palette: - - GtkSettings *settings = gtk_widget_get_settings(GTK_WIDGET(sel)); - gchar *pal; - g_object_get(settings, "gtk-color-palette", &pal, NULL); - - GdkColor *colors; - gint n_colors; - if (gtk_color_selection_palette_from_string(pal, &colors, &n_colors)) - { - for (int i = 0; i < n_colors && i < wxColourData::NUM_CUSTOM; i++) - { - m_data.SetCustomColour(i, wxColour(colors[i])); - } - g_free(colors); - } - - g_free(pal); -} - -#endif // wxUSE_COLOURDLG - diff --git a/Externals/wxWidgets3/src/gtk/colour.cpp b/Externals/wxWidgets3/src/gtk/colour.cpp deleted file mode 100644 index 5f99b1897b..0000000000 --- a/Externals/wxWidgets3/src/gtk/colour.cpp +++ /dev/null @@ -1,279 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/colour.cpp -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#include "wx/colour.h" - -#include -#include "wx/gtk/private.h" - -//----------------------------------------------------------------------------- -// wxColour -//----------------------------------------------------------------------------- - -class wxColourRefData : public wxGDIRefData -{ -public: -#ifdef __WXGTK3__ - wxColourRefData(const GdkRGBA& gdkRGBA) - : m_gdkRGBA(gdkRGBA) - { - m_gdkColor.red = guint16(gdkRGBA.red * 65535); - m_gdkColor.green = guint16(gdkRGBA.green * 65535); - m_gdkColor.blue = guint16(gdkRGBA.blue * 65535); - m_alpha = wxByte(gdkRGBA.alpha * 255 + 0.5); - } - wxColourRefData(const GdkColor& gdkColor) - : m_gdkColor(gdkColor) - { - m_gdkRGBA.red = gdkColor.red / 65535.0; - m_gdkRGBA.green = gdkColor.green / 65535.0; - m_gdkRGBA.blue = gdkColor.blue / 65535.0; - m_gdkRGBA.alpha = 1; - m_alpha = 255; - } - wxColourRefData(guchar red, guchar green, guchar blue, guchar alpha) - { - m_gdkRGBA.red = red / 255.0; - m_gdkRGBA.green = green / 255.0; - m_gdkRGBA.blue = blue / 255.0; - m_gdkRGBA.alpha = alpha / 255.0; - m_gdkColor.red = (guint16(red) << 8) + red; - m_gdkColor.green = (guint16(green) << 8) + green; - m_gdkColor.blue = (guint16(blue) << 8) + blue; - m_alpha = alpha; - } - GdkRGBA m_gdkRGBA; - GdkColor m_gdkColor; -#else - wxColourRefData(guint16 red, guint16 green, guint16 blue, wxByte alpha = 0xff) - { - m_color.red = - m_red = red; - m_color.green = - m_green = green; - m_color.blue = - m_blue = blue; - m_alpha = alpha; - m_color.pixel = 0; - m_colormap = NULL; - } - - virtual ~wxColourRefData() - { - FreeColour(); - } - - void FreeColour(); - void AllocColour( GdkColormap* cmap ); - - GdkColor m_color; - GdkColormap *m_colormap; - // gdk_colormap_alloc_color may change the RGB values in m_color, so we need separate copies - guint16 m_red; - guint16 m_green; - guint16 m_blue; -#endif - wxByte m_alpha; - - wxDECLARE_NO_COPY_CLASS(wxColourRefData); -}; - -#ifndef __WXGTK3__ -void wxColourRefData::FreeColour() -{ - if (m_colormap) - { - gdk_colormap_free_colors(m_colormap, &m_color, 1); - m_colormap = NULL; - m_color.pixel = 0; - } -} - -void wxColourRefData::AllocColour( GdkColormap *cmap ) -{ - if (m_colormap != cmap) - { - FreeColour(); - - m_color.red = m_red; - m_color.green = m_green; - m_color.blue = m_blue; - if (gdk_colormap_alloc_color(cmap, &m_color, FALSE, TRUE)) - { - m_colormap = cmap; - } - } -} -#endif - -//----------------------------------------------------------------------------- - -#define M_COLDATA static_cast(m_refData) - -// GDK's values are in 0..65535 range, ours are in 0..255 -#define SHIFT 8 - -#ifdef __WXGTK3__ -wxColour::wxColour(const GdkRGBA& gdkRGBA) -{ - m_refData = new wxColourRefData(gdkRGBA); -} - -wxColour::wxColour(const GdkColor& gdkColor) -{ - m_refData = new wxColourRefData(gdkColor); -} -#else -wxColour::wxColour(const GdkColor& gdkColor) -{ - m_refData = new wxColourRefData(gdkColor.red, gdkColor.green, gdkColor.blue); -} -#endif - -wxColour::~wxColour() -{ -} - -bool wxColour::operator == ( const wxColour& col ) const -{ - if (m_refData == col.m_refData) - return true; - - if (!m_refData || !col.m_refData) - return false; - - wxColourRefData* refData = M_COLDATA; - wxColourRefData* that_refData = static_cast(col.m_refData); -#ifdef __WXGTK3__ - return refData->m_gdkColor.red == that_refData->m_gdkColor.red && - refData->m_gdkColor.green == that_refData->m_gdkColor.green && - refData->m_gdkColor.blue == that_refData->m_gdkColor.blue && -#else - return refData->m_red == that_refData->m_red && - refData->m_green == that_refData->m_green && - refData->m_blue == that_refData->m_blue && -#endif - refData->m_alpha == that_refData->m_alpha; -} - -void wxColour::InitRGBA(unsigned char red, unsigned char green, unsigned char blue, - unsigned char alpha) -{ - UnRef(); - -#ifdef __WXGTK3__ - m_refData = new wxColourRefData(red, green, blue, alpha); -#else - m_refData = new wxColourRefData( - (guint16(red) << SHIFT) + red, - (guint16(green) << SHIFT) + green, - (guint16(blue) << SHIFT) + blue, - alpha); -#endif -} - -unsigned char wxColour::Red() const -{ - wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") ); - -#ifdef __WXGTK3__ - return wxByte(M_COLDATA->m_gdkColor.red >> 8); -#else - return wxByte(M_COLDATA->m_red >> SHIFT); -#endif -} - -unsigned char wxColour::Green() const -{ - wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") ); - -#ifdef __WXGTK3__ - return wxByte(M_COLDATA->m_gdkColor.green >> 8); -#else - return wxByte(M_COLDATA->m_green >> SHIFT); -#endif -} - -unsigned char wxColour::Blue() const -{ - wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") ); - -#ifdef __WXGTK3__ - return wxByte(M_COLDATA->m_gdkColor.blue >> 8); -#else - return wxByte(M_COLDATA->m_blue >> SHIFT); -#endif -} - -unsigned char wxColour::Alpha() const -{ - wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") ); - - return M_COLDATA->m_alpha; -} - -#ifndef __WXGTK3__ -void wxColour::CalcPixel( GdkColormap *cmap ) -{ - if (!IsOk()) return; - - M_COLDATA->AllocColour( cmap ); -} - -int wxColour::GetPixel() const -{ - wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") ); - - return M_COLDATA->m_color.pixel; -} -#endif - -const GdkColor *wxColour::GetColor() const -{ - wxCHECK_MSG( IsOk(), NULL, wxT("invalid colour") ); - -#ifdef __WXGTK3__ - return &M_COLDATA->m_gdkColor; -#else - return &M_COLDATA->m_color; -#endif -} - -#ifdef __WXGTK3__ -wxColour::operator const GdkRGBA*() const -{ - const GdkRGBA* c = NULL; - if (IsOk()) - c = &M_COLDATA->m_gdkRGBA; - return c; -} -#endif - -bool wxColour::FromString(const wxString& str) -{ -#ifdef __WXGTK3__ - GdkRGBA gdkRGBA; - if (gdk_rgba_parse(&gdkRGBA, wxGTK_CONV_SYS(str))) - { - *this = wxColour(gdkRGBA); - return true; - } -#else - GdkColor colGDK; - if ( gdk_color_parse( wxGTK_CONV_SYS( str ), &colGDK ) ) - { - *this = wxColour(colGDK); - return true; - } -#endif - - return wxColourBase::FromString(str); -} diff --git a/Externals/wxWidgets3/src/gtk/combobox.cpp b/Externals/wxWidgets3/src/gtk/combobox.cpp deleted file mode 100644 index 6782de03f5..0000000000 --- a/Externals/wxWidgets3/src/gtk/combobox.cpp +++ /dev/null @@ -1,441 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/combobox.cpp -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if wxUSE_COMBOBOX - -#include "wx/combobox.h" - -#ifndef WX_PRECOMP - #include "wx/intl.h" - #include "wx/settings.h" - #include "wx/textctrl.h" // for wxEVT_TEXT - #include "wx/arrstr.h" -#endif - -#include -#include "wx/gtk/private.h" -#include "wx/gtk/private/gtk2-compat.h" - -// ---------------------------------------------------------------------------- -// GTK callbacks -// ---------------------------------------------------------------------------- - -extern "C" { -static void -gtkcombobox_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo ) -{ - wxCommandEvent event( wxEVT_TEXT, combo->GetId() ); - event.SetString( combo->GetValue() ); - event.SetEventObject( combo ); - combo->HandleWindowEvent( event ); -} - -static void -gtkcombobox_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo ) -{ - combo->SendSelectionChangedEvent(wxEVT_COMBOBOX); -} - -static void -gtkcombobox_popupshown_callback(GObject *WXUNUSED(gobject), - GParamSpec *WXUNUSED(param_spec), - wxComboBox *combo) -{ - gboolean isShown; - g_object_get( combo->m_widget, "popup-shown", &isShown, NULL ); - wxCommandEvent event( isShown ? wxEVT_COMBOBOX_DROPDOWN - : wxEVT_COMBOBOX_CLOSEUP, - combo->GetId() ); - event.SetEventObject( combo ); - -#ifndef __WXGTK3__ - // Process the close up event once the combobox is already closed with GTK+ - // 2, otherwise changing the combobox from its handler result in errors. - if ( !isShown ) - { - combo->GetEventHandler()->AddPendingEvent( event ); - } - else -#endif // GTK+ < 3 - { - combo->HandleWindowEvent( event ); - } -} - -} - -//----------------------------------------------------------------------------- -// wxComboBox -//----------------------------------------------------------------------------- - -wxBEGIN_EVENT_TABLE(wxComboBox, wxChoice) - EVT_CHAR(wxComboBox::OnChar) - - EVT_MENU(wxID_CUT, wxComboBox::OnCut) - EVT_MENU(wxID_COPY, wxComboBox::OnCopy) - EVT_MENU(wxID_PASTE, wxComboBox::OnPaste) - EVT_MENU(wxID_UNDO, wxComboBox::OnUndo) - EVT_MENU(wxID_REDO, wxComboBox::OnRedo) - EVT_MENU(wxID_CLEAR, wxComboBox::OnDelete) - EVT_MENU(wxID_SELECTALL, wxComboBox::OnSelectAll) - - EVT_UPDATE_UI(wxID_CUT, wxComboBox::OnUpdateCut) - EVT_UPDATE_UI(wxID_COPY, wxComboBox::OnUpdateCopy) - EVT_UPDATE_UI(wxID_PASTE, wxComboBox::OnUpdatePaste) - EVT_UPDATE_UI(wxID_UNDO, wxComboBox::OnUpdateUndo) - EVT_UPDATE_UI(wxID_REDO, wxComboBox::OnUpdateRedo) - EVT_UPDATE_UI(wxID_CLEAR, wxComboBox::OnUpdateDelete) - EVT_UPDATE_UI(wxID_SELECTALL, wxComboBox::OnUpdateSelectAll) -wxEND_EVENT_TABLE() - -wxComboBox::~wxComboBox() -{ - if (m_entry) - GTKDisconnect(m_entry); -} - -void wxComboBox::Init() -{ - m_entry = NULL; -} - -bool wxComboBox::Create( wxWindow *parent, wxWindowID id, - const wxString& value, - const wxPoint& pos, const wxSize& size, - const wxArrayString& choices, - long style, const wxValidator& validator, - const wxString& name ) -{ - wxCArrayString chs(choices); - - return Create( parent, id, value, pos, size, chs.GetCount(), - chs.GetStrings(), style, validator, name ); -} - -bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value, - const wxPoint& pos, const wxSize& size, - int n, const wxString choices[], - long style, const wxValidator& validator, - const wxString& name ) -{ - if (!PreCreation( parent, pos, size ) || - !CreateBase( parent, id, pos, size, style, validator, name )) - { - wxFAIL_MSG( wxT("wxComboBox creation failed") ); - return false; - } - - if (HasFlag(wxCB_SORT)) - m_strings = new wxGtkCollatedArrayString(); - - GTKCreateComboBoxWidget(); - - if (HasFlag(wxBORDER_NONE)) - { - // Doesn't seem to work - // g_object_set (m_widget, "has-frame", FALSE, NULL); - } - - GtkEntry * const entry = GetEntry(); - - if ( entry ) - { - // Set it up to trigger default item on enter key press - gtk_entry_set_activates_default( entry, - !HasFlag(wxTE_PROCESS_ENTER) ); - - gtk_editable_set_editable(GTK_EDITABLE(entry), true); - } - - Append(n, choices); - - m_parent->DoAddChild( this ); - - if ( entry ) - m_focusWidget = GTK_WIDGET( entry ); - - PostCreation(size); - - if ( entry ) - { - if (style & wxCB_READONLY) - { - // this will assert and do nothing if the value is not in our list - // of strings which is the desired behaviour (for consistency with - // wxMSW and also because it doesn't make sense to have a string - // which is not a possible choice in a read-only combobox) - SetStringSelection(value); - gtk_editable_set_editable(GTK_EDITABLE(entry), false); - } - else // editable combobox - { - // any value is accepted, even if it's not in our list - gtk_entry_set_text( entry, wxGTK_CONV(value) ); - } - - g_signal_connect_after (entry, "changed", - G_CALLBACK (gtkcombobox_text_changed_callback), this); - - GTKConnectInsertTextSignal(entry); - GTKConnectClipboardSignals(GTK_WIDGET(entry)); - } - - g_signal_connect_after (m_widget, "changed", - G_CALLBACK (gtkcombobox_changed_callback), this); - -#ifndef __WXGTK3__ - if ( !gtk_check_version(2,10,0) ) -#endif - { - g_signal_connect (m_widget, "notify::popup-shown", - G_CALLBACK (gtkcombobox_popupshown_callback), this); - } - - return true; -} - -void wxComboBox::GTKCreateComboBoxWidget() -{ -#ifdef __WXGTK3__ - m_widget = gtk_combo_box_text_new_with_entry(); -#else - m_widget = gtk_combo_box_entry_new_text(); -#endif - g_object_ref(m_widget); - - m_entry = GTK_ENTRY(gtk_bin_get_child(GTK_BIN(m_widget))); -} - -GtkEditable *wxComboBox::GetEditable() const -{ - return GTK_EDITABLE(gtk_bin_get_child(GTK_BIN(m_widget))); -} - -void wxComboBox::OnChar( wxKeyEvent &event ) -{ - switch ( event.GetKeyCode() ) - { - case WXK_RETURN: - if ( HasFlag(wxTE_PROCESS_ENTER) && GetEntry() ) - { - // GTK automatically selects an item if its in the list - wxCommandEvent eventEnter(wxEVT_TEXT_ENTER, GetId()); - eventEnter.SetString( GetValue() ); - eventEnter.SetInt( GetSelection() ); - eventEnter.SetEventObject( this ); - - if ( HandleWindowEvent(eventEnter) ) - { - // Catch GTK event so that GTK doesn't open the drop - // down list upon RETURN. - return; - } - } - break; - } - - event.Skip(); -} - -void wxComboBox::EnableTextChangedEvents(bool enable) -{ - if ( !GetEntry() ) - return; - - if ( enable ) - { - g_signal_handlers_unblock_by_func(gtk_bin_get_child(GTK_BIN(m_widget)), - (gpointer)gtkcombobox_text_changed_callback, this); - } - else // disable - { - g_signal_handlers_block_by_func(gtk_bin_get_child(GTK_BIN(m_widget)), - (gpointer)gtkcombobox_text_changed_callback, this); - } -} - -void wxComboBox::GTKDisableEvents() -{ - EnableTextChangedEvents(false); - - g_signal_handlers_block_by_func(m_widget, - (gpointer)gtkcombobox_changed_callback, this); - g_signal_handlers_block_by_func(m_widget, - (gpointer)gtkcombobox_popupshown_callback, this); -} - -void wxComboBox::GTKEnableEvents() -{ - EnableTextChangedEvents(true); - - g_signal_handlers_unblock_by_func(m_widget, - (gpointer)gtkcombobox_changed_callback, this); - g_signal_handlers_unblock_by_func(m_widget, - (gpointer)gtkcombobox_popupshown_callback, this); -} - -GtkWidget* wxComboBox::GetConnectWidget() -{ - return GTK_WIDGET( GetEntry() ); -} - -GdkWindow* wxComboBox::GTKGetWindow(wxArrayGdkWindows& /* windows */) const -{ -#ifdef __WXGTK3__ - return GTKFindWindow(GTK_WIDGET(GetEntry())); -#else - return gtk_entry_get_text_window(GetEntry()); -#endif -} - -// static -wxVisualAttributes -wxComboBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) -{ -#ifdef __WXGTK3__ - return GetDefaultAttributesFromGTKWidget(gtk_combo_box_new_with_entry(), true); -#else - return GetDefaultAttributesFromGTKWidget(gtk_combo_box_entry_new(), true); -#endif -} - -void wxComboBox::Clear() -{ - wxTextEntry::Clear(); - wxItemContainer::Clear(); -} - -void wxComboBox::SetValue(const wxString& value) -{ - if ( HasFlag(wxCB_READONLY) ) - SetStringSelection(value); - else - wxTextEntry::SetValue(value); -} - -void wxComboBox::SetString(unsigned int n, const wxString& text) -{ - wxChoice::SetString(n, text); - - if ( static_cast(n) == GetSelection() ) - { - // We also need to update the currently shown text, for consistency - // with wxMSW and also because it makes sense as leaving the old string - // in the text but not in the list would be confusing to the user. - SetValue(text); - - // And we need to keep the selection unchanged, modifying the item is - // not supposed to deselect it. - SetSelection(n); - } -} - -// ---------------------------------------------------------------------------- -// standard event handling -// ---------------------------------------------------------------------------- - -void wxComboBox::OnCut(wxCommandEvent& WXUNUSED(event)) -{ - Cut(); -} - -void wxComboBox::OnCopy(wxCommandEvent& WXUNUSED(event)) -{ - Copy(); -} - -void wxComboBox::OnPaste(wxCommandEvent& WXUNUSED(event)) -{ - Paste(); -} - -void wxComboBox::OnUndo(wxCommandEvent& WXUNUSED(event)) -{ - Undo(); -} - -void wxComboBox::OnRedo(wxCommandEvent& WXUNUSED(event)) -{ - Redo(); -} - -void wxComboBox::OnDelete(wxCommandEvent& WXUNUSED(event)) -{ - RemoveSelection(); -} - -void wxComboBox::OnSelectAll(wxCommandEvent& WXUNUSED(event)) -{ - SelectAll(); -} - -void wxComboBox::OnUpdateCut(wxUpdateUIEvent& event) -{ - event.Enable( CanCut() ); -} - -void wxComboBox::OnUpdateCopy(wxUpdateUIEvent& event) -{ - event.Enable( CanCopy() ); -} - -void wxComboBox::OnUpdatePaste(wxUpdateUIEvent& event) -{ - event.Enable( CanPaste() ); -} - -void wxComboBox::OnUpdateUndo(wxUpdateUIEvent& event) -{ - event.Enable( CanUndo() ); -} - -void wxComboBox::OnUpdateRedo(wxUpdateUIEvent& event) -{ - event.Enable( CanRedo() ); -} - -void wxComboBox::OnUpdateDelete(wxUpdateUIEvent& event) -{ - event.Enable(HasSelection() && IsEditable()) ; -} - -void wxComboBox::OnUpdateSelectAll(wxUpdateUIEvent& event) -{ - event.Enable(!wxTextEntry::IsEmpty()); -} - -void wxComboBox::Popup() -{ - gtk_combo_box_popup( GTK_COMBO_BOX(m_widget) ); -} - -void wxComboBox::Dismiss() -{ - gtk_combo_box_popdown( GTK_COMBO_BOX(m_widget) ); -} - -wxSize wxComboBox::DoGetSizeFromTextSize(int xlen, int ylen) const -{ - wxSize tsize( wxChoice::DoGetSizeFromTextSize(xlen, ylen) ); - - GtkEntry* entry = GetEntry(); - if (entry) - { - // Add the margins we have previously set, but only the horizontal border - // as vertical one has been taken account in the previous call. - // Also get other GTK+ margins. - tsize.IncBy(GTKGetEntryMargins(entry).x, 0); - } - - return tsize; -} - -#endif // wxUSE_COMBOBOX diff --git a/Externals/wxWidgets3/src/gtk/control.cpp b/Externals/wxWidgets3/src/gtk/control.cpp deleted file mode 100644 index bc1ee187eb..0000000000 --- a/Externals/wxWidgets3/src/gtk/control.cpp +++ /dev/null @@ -1,370 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/control.cpp -// Purpose: wxControl implementation for wxGTK -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling, Julian Smart and Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if wxUSE_CONTROLS - -#include "wx/control.h" - -#ifndef WX_PRECOMP - #include "wx/log.h" - #include "wx/settings.h" -#endif - -#include "wx/fontutil.h" -#include "wx/utils.h" -#include "wx/sysopt.h" - -#include -#include "wx/gtk/private.h" -#include "wx/gtk/private/mnemonics.h" - -// ============================================================================ -// wxControl implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxControl creation -// ---------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxControl, wxWindow); - -wxControl::wxControl() -{ -} - -bool wxControl::Create( wxWindow *parent, - wxWindowID id, - const wxPoint &pos, - const wxSize &size, - long style, - const wxValidator& wxVALIDATOR_PARAM(validator), - const wxString &name ) -{ - bool ret = wxWindow::Create(parent, id, pos, size, style, name); - -#if wxUSE_VALIDATORS - SetValidator(validator); -#endif - - return ret; -} - -#ifdef __WXGTK3__ -bool wxControl::SetFont(const wxFont& font) -{ - const bool changed = base_type::SetFont(font); - if (changed && !gtk_widget_get_realized(m_widget) && gtk_check_version(3,5,0)) - { - // GTK defers sending "style-updated" until widget is realized, but - // GetBestSize() won't compute correct result until the signal is sent, - // so we have to do it now - // But don't bother for GTK > 3.4, the change won't take effect until - // GTK updates it's style cache - g_signal_emit_by_name(m_widget, "style-updated"); - } - return changed; -} -#endif - -wxSize wxControl::DoGetBestSize() const -{ - // Do not return any arbitrary default value... - wxASSERT_MSG( m_widget, wxT("DoGetBestSize called before creation") ); - - wxSize best; - if (m_wxwindow) - { - // this is not a native control, size_request is likely to be (0,0) - best = wxControlBase::DoGetBestSize(); - } - else - { - best = GTKGetPreferredSize(m_widget); - } - - return best; -} - -void wxControl::PostCreation(const wxSize& size) -{ - wxWindow::PostCreation(); - -#ifndef __WXGTK3__ - // NB: GetBestSize needs to know the style, otherwise it will assume - // default font and if the user uses a different font, determined - // best size will be different (typically, smaller) than the desired - // size. This call ensure that a style is available at the time - // GetBestSize is called. - gtk_widget_ensure_style(m_widget); -#endif - - SetInitialSize(size); -} - -// ---------------------------------------------------------------------------- -// Work around a GTK+ bug whereby button is insensitive after being -// enabled -// ---------------------------------------------------------------------------- - -// Fix sensitivity due to bug in GTK+ < 2.14 -void wxControl::GTKFixSensitivity(bool WXUNUSED_IN_GTK3(onlyIfUnderMouse)) -{ -#ifndef __WXGTK3__ - if (gtk_check_version(2,14,0) -#if wxUSE_SYSTEM_OPTIONS - && (wxSystemOptions::GetOptionInt(wxT("gtk.control.disable-sensitivity-fix")) != 1) -#endif - ) - { - if (!onlyIfUnderMouse || GetScreenRect().Contains(wxGetMousePosition())) - { - Hide(); - Show(); - } - } -#endif -} - -// ---------------------------------------------------------------------------- -// wxControl dealing with labels -// ---------------------------------------------------------------------------- - -void wxControl::GTKSetLabelForLabel(GtkLabel *w, const wxString& label) -{ - const wxString labelGTK = GTKConvertMnemonics(label); - gtk_label_set_text_with_mnemonic(w, wxGTK_CONV(labelGTK)); -} - -#if wxUSE_MARKUP - -void wxControl::GTKSetLabelWithMarkupForLabel(GtkLabel *w, const wxString& label) -{ - const wxString labelGTK = GTKConvertMnemonicsWithMarkup(label); - gtk_label_set_markup_with_mnemonic(w, wxGTK_CONV(labelGTK)); -} - -#endif // wxUSE_MARKUP - -// ---------------------------------------------------------------------------- -// GtkFrame helpers -// -// GtkFrames do in fact support mnemonics in GTK2+ but not through -// gtk_frame_set_label, rather you need to use a custom label widget -// instead (idea gleaned from the native gtk font dialog code in GTK) -// ---------------------------------------------------------------------------- - -GtkWidget* wxControl::GTKCreateFrame(const wxString& label) -{ - const wxString labelGTK = GTKConvertMnemonics(label); - GtkWidget* labelwidget = gtk_label_new_with_mnemonic(wxGTK_CONV(labelGTK)); - gtk_widget_show(labelwidget); // without this it won't show... - - GtkWidget* framewidget = gtk_frame_new(NULL); - gtk_frame_set_label_widget(GTK_FRAME(framewidget), labelwidget); - - return framewidget; // note that the label is already set so you'll - // only need to call wxControl::SetLabel afterwards -} - -void wxControl::GTKSetLabelForFrame(GtkFrame *w, const wxString& label) -{ - wxControlBase::SetLabel(label); - - GtkLabel* labelwidget = GTK_LABEL(gtk_frame_get_label_widget(w)); - GTKSetLabelForLabel(labelwidget, label); -} - -void wxControl::GTKFrameApplyWidgetStyle(GtkFrame* w, GtkRcStyle* style) -{ - GTKApplyStyle(GTK_WIDGET(w), style); - GTKApplyStyle(gtk_frame_get_label_widget(w), style); -} - -void wxControl::GTKFrameSetMnemonicWidget(GtkFrame* w, GtkWidget* widget) -{ - GtkLabel* labelwidget = GTK_LABEL(gtk_frame_get_label_widget(w)); - - gtk_label_set_mnemonic_widget(labelwidget, widget); -} - -// ---------------------------------------------------------------------------- -// worker function implementing GTK*Mnemonics() functions -// ---------------------------------------------------------------------------- - -/* static */ -wxString wxControl::GTKRemoveMnemonics(const wxString& label) -{ - return wxGTKRemoveMnemonics(label); -} - -/* static */ -wxString wxControl::GTKConvertMnemonics(const wxString& label) -{ - return wxConvertMnemonicsToGTK(label); -} - -/* static */ -wxString wxControl::GTKConvertMnemonicsWithMarkup(const wxString& label) -{ - return wxConvertMnemonicsToGTKMarkup(label); -} - -// ---------------------------------------------------------------------------- -// wxControl styles (a.k.a. attributes) -// ---------------------------------------------------------------------------- - -wxVisualAttributes wxControl::GetDefaultAttributes() const -{ - return GetDefaultAttributesFromGTKWidget(m_widget, - UseGTKStyleBase()); -} - -// static -wxVisualAttributes -wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* widget, - bool WXUNUSED_IN_GTK3(useBase), - int state) -{ - wxVisualAttributes attr; - - GtkWidget* tlw = NULL; - if (gtk_widget_get_parent(widget) == NULL) - { - tlw = gtk_window_new(GTK_WINDOW_TOPLEVEL); - gtk_container_add(GTK_CONTAINER(tlw), widget); - } - -#ifdef __WXGTK3__ - GtkStateFlags stateFlag = GTK_STATE_FLAG_NORMAL; - if (state) - { - wxASSERT(state == GTK_STATE_ACTIVE); - stateFlag = GTK_STATE_FLAG_ACTIVE; - } - GtkStyleContext* sc = gtk_widget_get_style_context(widget); - GdkRGBA *fc, *bc; - wxNativeFontInfo info; - gtk_style_context_set_state(sc, stateFlag); - gtk_style_context_get(sc, stateFlag, - "color", &fc, "background-color", &bc, - GTK_STYLE_PROPERTY_FONT, &info.description, NULL); - attr.colFg = wxColour(*fc); - attr.colBg = wxColour(*bc); - attr.font = wxFont(info); - gdk_rgba_free(fc); - gdk_rgba_free(bc); -#else - GtkStyle* style; - - style = gtk_rc_get_style(widget); - if (!style) - style = gtk_widget_get_default_style(); - - if (style) - { - // get the style's colours - attr.colFg = wxColour(style->fg[state]); - if (useBase) - attr.colBg = wxColour(style->base[state]); - else - attr.colBg = wxColour(style->bg[state]); - - // get the style's font - if (!style->font_desc) - style = gtk_widget_get_default_style(); - if (style && style->font_desc) - { - wxNativeFontInfo info; - info.description = style->font_desc; - attr.font = wxFont(info); - info.description = NULL; - } - } - else - attr = wxWindow::GetClassDefaultAttributes(wxWINDOW_VARIANT_NORMAL); -#endif - - if (!attr.font.IsOk()) - { - GtkSettings *settings = gtk_settings_get_default(); - gchar *font_name = NULL; - g_object_get ( settings, - "gtk-font-name", - &font_name, - NULL); - if (!font_name) - attr.font = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT ); - else - { - attr.font = wxFont(wxString::FromUTF8(font_name)); - g_free(font_name); - } - } - - if (tlw) - gtk_widget_destroy(tlw); - - return attr; -} - -// This is not the same as GetBestSize() because that size may have -// been recalculated and cached by us. We want GTK+ information. -wxSize wxControl::GTKGetPreferredSize(GtkWidget* widget) const -{ - GtkRequisition req; -#ifdef __WXGTK3__ - int w, h; - gtk_widget_get_size_request(widget, &w, &h); - gtk_widget_set_size_request(widget, -1, -1); - gtk_widget_get_preferred_size(widget, NULL, &req); - gtk_widget_set_size_request(widget, w, h); -#else - GTK_WIDGET_GET_CLASS(widget)->size_request(widget, &req); -#endif - - return wxSize(req.width, req.height); -} - -wxPoint wxControl::GTKGetEntryMargins(GtkEntry* entry) const -{ - wxPoint marg(0, 0); - -#ifndef __WXGTK3__ -#if GTK_CHECK_VERSION(2,10,0) - // The margins we have previously set - const GtkBorder* border = NULL; - if (gtk_check_version(2,10,0) == NULL) - border = gtk_entry_get_inner_border(entry); - - if ( border ) - { - marg.x = border->left + border->right; - marg.y = border->top + border->bottom; - } -#endif // GTK+ 2.10+ -#else // GTK+ 3 - // Gtk3 does not use inner border, but StyleContext and CSS - // TODO: implement it, starting with wxTextEntry::DoSetMargins() -#endif // GTK+ 2/3 - - int x, y; - gtk_entry_get_layout_offsets(entry, &x, &y); - // inner borders are included. Substract them so we can get other margins - x -= marg.x; - y -= marg.y; - marg.x += 2 * x + 2; - marg.y += 2 * y + 2; - - return marg; -} - - -#endif // wxUSE_CONTROLS diff --git a/Externals/wxWidgets3/src/gtk/cross.xbm b/Externals/wxWidgets3/src/gtk/cross.xbm deleted file mode 100644 index 2930c572e4..0000000000 --- a/Externals/wxWidgets3/src/gtk/cross.xbm +++ /dev/null @@ -1,6 +0,0 @@ -#define cross_width 16 -#define cross_height 16 -static unsigned char cross_bits[] = { - 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0xFF, 0xFF, 0x08, 0x08, 0x08, 0x08, - 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0xFF, 0xFF, - 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, }; diff --git a/Externals/wxWidgets3/src/gtk/cursor.cpp b/Externals/wxWidgets3/src/gtk/cursor.cpp deleted file mode 100644 index 9973fe9f14..0000000000 --- a/Externals/wxWidgets3/src/gtk/cursor.cpp +++ /dev/null @@ -1,420 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/cursor.cpp -// Purpose: wxCursor implementation -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#include "wx/cursor.h" - -#ifndef WX_PRECOMP - #include "wx/window.h" - #include "wx/image.h" - #include "wx/bitmap.h" - #include "wx/log.h" -#endif // WX_PRECOMP - -#include -#include "wx/gtk/private/object.h" -#include "wx/gtk/private/gtk2-compat.h" - -GdkWindow* wxGetTopLevelGDK(); - -//----------------------------------------------------------------------------- -// wxCursorRefData -//----------------------------------------------------------------------------- - -class wxCursorRefData: public wxGDIRefData -{ -public: - wxCursorRefData(); - virtual ~wxCursorRefData(); - - virtual bool IsOk() const wxOVERRIDE { return m_cursor != NULL; } - - GdkCursor *m_cursor; - -private: - // There is no way to copy m_cursor so we can't implement a copy ctor - // properly. - wxDECLARE_NO_COPY_CLASS(wxCursorRefData); -}; - -wxCursorRefData::wxCursorRefData() -{ - m_cursor = NULL; -} - -wxCursorRefData::~wxCursorRefData() -{ - if (m_cursor) - { -#ifdef __WXGTK3__ - g_object_unref(m_cursor); -#else - gdk_cursor_unref(m_cursor); -#endif - } -} - -//----------------------------------------------------------------------------- -// wxCursor -//----------------------------------------------------------------------------- - -#define M_CURSORDATA static_cast(m_refData) - -wxIMPLEMENT_DYNAMIC_CLASS(wxCursor, wxGDIObject); - -wxCursor::wxCursor() -{ -} - -#if wxUSE_IMAGE -wxCursor::wxCursor(const wxString& cursor_file, - wxBitmapType type, - int hotSpotX, int hotSpotY) -{ - wxImage img; - if (!img.LoadFile(cursor_file, type)) - return; - - // eventually set the hotspot: - if (!img.HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X)) - img.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X, hotSpotX); - if (!img.HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y)) - img.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y, hotSpotY); - - InitFromImage(img); -} - -wxCursor::wxCursor(const wxImage& img) -{ - InitFromImage(img); -} -#endif - -wxCursor::wxCursor(const char bits[], int width, int height, - int hotSpotX, int hotSpotY, - const char maskBits[], const wxColour *fg, const wxColour *bg) -{ - m_refData = new wxCursorRefData; - if (hotSpotX < 0 || hotSpotX >= width) - hotSpotX = 0; - if (hotSpotY < 0 || hotSpotY >= height) - hotSpotY = 0; -#ifdef __WXGTK3__ - wxBitmap bitmap(bits, width, height); - if (maskBits) - bitmap.SetMask(new wxMask(wxBitmap(maskBits, width, height))); - GdkPixbuf* pixbuf = bitmap.GetPixbuf(); - if (fg || bg) - { - const int stride = gdk_pixbuf_get_rowstride(pixbuf); - const int n_channels = gdk_pixbuf_get_n_channels(pixbuf); - guchar* data = gdk_pixbuf_get_pixels(pixbuf); - for (int j = 0; j < height; j++, data += stride) - { - guchar* p = data; - for (int i = 0; i < width; i++, p += n_channels) - { - if (p[0]) - { - if (fg) - { - p[0] = fg->Red(); - p[1] = fg->Green(); - p[2] = fg->Blue(); - } - } - else - { - if (bg) - { - p[0] = bg->Red(); - p[1] = bg->Green(); - p[2] = bg->Blue(); - } - } - } - } - } - M_CURSORDATA->m_cursor = gdk_cursor_new_from_pixbuf( - gdk_window_get_display(wxGetTopLevelGDK()), pixbuf, hotSpotX, hotSpotY); -#else - if (!maskBits) - maskBits = bits; - if (!fg) - fg = wxBLACK; - if (!bg) - bg = wxWHITE; - - GdkBitmap* data = gdk_bitmap_create_from_data( - wxGetTopLevelGDK(), const_cast(bits), width, height); - GdkBitmap* mask = gdk_bitmap_create_from_data( - wxGetTopLevelGDK(), const_cast(maskBits), width, height); - - M_CURSORDATA->m_cursor = gdk_cursor_new_from_pixmap( - data, mask, fg->GetColor(), bg->GetColor(), - hotSpotX, hotSpotY ); - - g_object_unref (data); - g_object_unref (mask); -#endif -} - -wxCursor::~wxCursor() -{ -} - -wxPoint wxCursor::GetHotSpot() const -{ -#if GTK_CHECK_VERSION(2,8,0) - if (GetCursor()) - { - if (gtk_check_version(2,8,0) == NULL) - { - GdkPixbuf *pixbuf = gdk_cursor_get_image(GetCursor()); - if (pixbuf) - { - wxPoint hotSpot = wxDefaultPosition; - const gchar* opt_xhot = gdk_pixbuf_get_option(pixbuf, "x_hot"); - const gchar* opt_yhot = gdk_pixbuf_get_option(pixbuf, "y_hot"); - if (opt_xhot && opt_yhot) - { - const int xhot = atoi(opt_xhot); - const int yhot = atoi(opt_yhot); - hotSpot = wxPoint(xhot, yhot); - } - g_object_unref(pixbuf); - return hotSpot; - } - } - } -#endif - - return wxDefaultPosition; -} - -void wxCursor::InitFromStock( wxStockCursor cursorId ) -{ - m_refData = new wxCursorRefData(); - - GdkCursorType gdk_cur = GDK_LEFT_PTR; - switch (cursorId) - { -#ifdef __WXGTK3__ - case wxCURSOR_BLANK: gdk_cur = GDK_BLANK_CURSOR; break; -#else - case wxCURSOR_BLANK: - { - const char bits[] = { 0 }; - const GdkColor color = { 0, 0, 0, 0 }; - - GdkPixmap *pixmap = gdk_bitmap_create_from_data(NULL, bits, 1, 1); - M_CURSORDATA->m_cursor = gdk_cursor_new_from_pixmap(pixmap, - pixmap, - &color, - &color, - 0, 0); - g_object_unref(pixmap); - } - return; -#endif - case wxCURSOR_ARROW: // fall through to default - case wxCURSOR_DEFAULT: gdk_cur = GDK_LEFT_PTR; break; - case wxCURSOR_RIGHT_ARROW: gdk_cur = GDK_RIGHT_PTR; break; - case wxCURSOR_HAND: gdk_cur = GDK_HAND2; break; - case wxCURSOR_CROSS: gdk_cur = GDK_CROSSHAIR; break; - case wxCURSOR_SIZEWE: gdk_cur = GDK_SB_H_DOUBLE_ARROW; break; - case wxCURSOR_SIZENS: gdk_cur = GDK_SB_V_DOUBLE_ARROW; break; - case wxCURSOR_ARROWWAIT: - case wxCURSOR_WAIT: - case wxCURSOR_WATCH: gdk_cur = GDK_WATCH; break; - case wxCURSOR_SIZING: gdk_cur = GDK_SIZING; break; - case wxCURSOR_SPRAYCAN: gdk_cur = GDK_SPRAYCAN; break; - case wxCURSOR_IBEAM: gdk_cur = GDK_XTERM; break; - case wxCURSOR_PENCIL: gdk_cur = GDK_PENCIL; break; - case wxCURSOR_NO_ENTRY: gdk_cur = GDK_PIRATE; break; - case wxCURSOR_SIZENWSE: - case wxCURSOR_SIZENESW: gdk_cur = GDK_FLEUR; break; - case wxCURSOR_QUESTION_ARROW: gdk_cur = GDK_QUESTION_ARROW; break; - case wxCURSOR_PAINT_BRUSH: gdk_cur = GDK_SPRAYCAN; break; - case wxCURSOR_MAGNIFIER: gdk_cur = GDK_PLUS; break; - case wxCURSOR_CHAR: gdk_cur = GDK_XTERM; break; - case wxCURSOR_LEFT_BUTTON: gdk_cur = GDK_LEFTBUTTON; break; - case wxCURSOR_MIDDLE_BUTTON: gdk_cur = GDK_MIDDLEBUTTON; break; - case wxCURSOR_RIGHT_BUTTON: gdk_cur = GDK_RIGHTBUTTON; break; - case wxCURSOR_BULLSEYE: gdk_cur = GDK_TARGET; break; - - case wxCURSOR_POINT_LEFT: gdk_cur = GDK_SB_LEFT_ARROW; break; - case wxCURSOR_POINT_RIGHT: gdk_cur = GDK_SB_RIGHT_ARROW; break; -/* - case wxCURSOR_DOUBLE_ARROW: gdk_cur = GDK_DOUBLE_ARROW; break; - case wxCURSOR_CROSS_REVERSE: gdk_cur = GDK_CROSS_REVERSE; break; - case wxCURSOR_BASED_ARROW_UP: gdk_cur = GDK_BASED_ARROW_UP; break; - case wxCURSOR_BASED_ARROW_DOWN: gdk_cur = GDK_BASED_ARROW_DOWN; break; -*/ - - default: - wxFAIL_MSG(wxT("unsupported cursor type")); - // will use the standard one - break; - } - - GdkDisplay* display = gdk_window_get_display(wxGetTopLevelGDK()); - M_CURSORDATA->m_cursor = gdk_cursor_new_for_display(display, gdk_cur); -} - -#if wxUSE_IMAGE - -void wxCursor::InitFromImage( const wxImage & image ) -{ - const int w = image.GetWidth(); - const int h = image.GetHeight(); - const guchar* alpha = image.GetAlpha(); - const bool hasMask = image.HasMask(); - int hotSpotX = image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X); - int hotSpotY = image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y); - if (hotSpotX < 0 || hotSpotX > w) hotSpotX = 0; - if (hotSpotY < 0 || hotSpotY > h) hotSpotY = 0; - GdkPixbuf* pixbuf = gdk_pixbuf_new_from_data(image.GetData(), GDK_COLORSPACE_RGB, false, 8, w, h, w * 3, NULL, NULL); - if (alpha || hasMask) - { - guchar r = 0, g = 0, b = 0; - if (hasMask) - { - r = image.GetMaskRed(); - g = image.GetMaskGreen(); - b = image.GetMaskBlue(); - } - GdkPixbuf* pixbuf0 = pixbuf; - pixbuf = gdk_pixbuf_add_alpha(pixbuf, hasMask, r, g, b); - g_object_unref(pixbuf0); - if (alpha) - { - guchar* d = gdk_pixbuf_get_pixels(pixbuf); - const int stride = gdk_pixbuf_get_rowstride(pixbuf); - for (int j = 0; j < h; j++, d += stride) - for (int i = 0; i < w; i++, alpha++) - if (d[4 * i + 3]) - d[4 * i + 3] = *alpha; - } - } - m_refData = new wxCursorRefData; - M_CURSORDATA->m_cursor = gdk_cursor_new_from_pixbuf( - gdk_window_get_display(wxGetTopLevelGDK()), pixbuf, hotSpotX, hotSpotY); - g_object_unref(pixbuf); -} - -#endif // wxUSE_IMAGE - -GdkCursor *wxCursor::GetCursor() const -{ - GdkCursor* cursor = NULL; - if (m_refData) - cursor = M_CURSORDATA->m_cursor; - return cursor; -} - -wxGDIRefData *wxCursor::CreateGDIRefData() const -{ - return new wxCursorRefData; -} - -wxGDIRefData * -wxCursor::CloneGDIRefData(const wxGDIRefData * WXUNUSED(data)) const -{ - // TODO: We can't clone GDK cursors at the moment. To do this we'd need - // to remember the original data from which the cursor was created - // (i.e. standard cursor type or the bitmap) or use - // gdk_cursor_get_cursor_type() (which is in 2.22+ only) and - // gdk_cursor_get_image(). - wxFAIL_MSG( wxS("Cloning cursors is not implemented in wxGTK.") ); - - return new wxCursorRefData; -} - -//----------------------------------------------------------------------------- -// busy cursor routines -//----------------------------------------------------------------------------- - -wxCursor g_globalCursor; -wxCursor g_busyCursor; -static wxCursor gs_storedCursor; -static int gs_busyCount = 0; - -const wxCursor& wxBusyCursor::GetStoredCursor() -{ - return gs_storedCursor; -} - -const wxCursor wxBusyCursor::GetBusyCursor() -{ - return g_busyCursor; -} - -static void UpdateCursors(wxWindow* win, bool isBusyOrGlobalCursor) -{ - win->GTKUpdateCursor(isBusyOrGlobalCursor); - const wxWindowList& children = win->GetChildren(); - wxWindowList::const_iterator i = children.begin(); - for (size_t n = children.size(); n--; ++i) - UpdateCursors(*i, isBusyOrGlobalCursor); -} - -static void SetGlobalCursor(const wxCursor& cursor) -{ - GdkCursor* gdk_cursor = cursor.GetCursor(); - GdkDisplay* display = NULL; - wxWindowList::const_iterator i = wxTopLevelWindows.begin(); - for (size_t n = wxTopLevelWindows.size(); n--; ++i) - { - wxWindow* win = *i; - GdkWindow* window; - if (win->m_widget && (window = gtk_widget_get_window(win->m_widget))) - { - gdk_window_set_cursor(window, gdk_cursor); - UpdateCursors(win, gdk_cursor != NULL); - if (display == NULL) - display = gdk_window_get_display(window); - } - } - if (display) - gdk_display_flush(display); -} - -void wxBeginBusyCursor(const wxCursor* cursor) -{ - if (gs_busyCount++ == 0) - { - g_busyCursor = *cursor; - gs_storedCursor = g_globalCursor; - SetGlobalCursor(*cursor); - } -} - -void wxEndBusyCursor() -{ - if (gs_busyCount && --gs_busyCount == 0) - { - g_globalCursor = gs_storedCursor; - gs_storedCursor = - g_busyCursor = wxCursor(); - SetGlobalCursor(g_globalCursor); - } -} - -bool wxIsBusy() -{ - return gs_busyCount > 0; -} - -void wxSetCursor( const wxCursor& cursor ) -{ - g_globalCursor = cursor; - SetGlobalCursor(cursor); -} diff --git a/Externals/wxWidgets3/src/gtk/dataobj.cpp b/Externals/wxWidgets3/src/gtk/dataobj.cpp deleted file mode 100644 index afdea3f3ee..0000000000 --- a/Externals/wxWidgets3/src/gtk/dataobj.cpp +++ /dev/null @@ -1,527 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/dataobj.cpp -// Purpose: wxDataObject class -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if wxUSE_DATAOBJ - -#include "wx/dataobj.h" - -#ifndef WX_PRECOMP - #include "wx/log.h" - #include "wx/app.h" - #include "wx/image.h" -#endif - -#include "wx/mstream.h" -#include "wx/uri.h" - -#include "wx/gtk/private.h" - -//------------------------------------------------------------------------- -// global data -//------------------------------------------------------------------------- - -GdkAtom g_textAtom = 0; -GdkAtom g_altTextAtom = 0; -GdkAtom g_pngAtom = 0; -GdkAtom g_fileAtom = 0; -GdkAtom g_htmlAtom = 0; - -//------------------------------------------------------------------------- -// wxDataFormat -//------------------------------------------------------------------------- - -wxDataFormat::wxDataFormat() -{ - // do *not* call PrepareFormats() from here for 2 reasons: - // - // 1. we will have time to do it later because some other Set function - // must be called before we really need them - // - // 2. doing so prevents us from declaring global wxDataFormats because - // calling PrepareFormats (and thus gdk_atom_intern) before GDK is - // initialised will result in a crash - m_type = wxDF_INVALID; - m_format = (GdkAtom) 0; -} - -wxDataFormat::wxDataFormat( wxDataFormatId type ) -{ - PrepareFormats(); - SetType( type ); -} - -void wxDataFormat::InitFromString( const wxString &id ) -{ - PrepareFormats(); - SetId( id ); -} - -wxDataFormat::wxDataFormat( NativeFormat format ) -{ - PrepareFormats(); - SetId( format ); -} - -void wxDataFormat::SetType( wxDataFormatId type ) -{ - PrepareFormats(); - - m_type = type; - -#if wxUSE_UNICODE - if (m_type == wxDF_UNICODETEXT) - m_format = g_textAtom; - else if (m_type == wxDF_TEXT) - m_format = g_altTextAtom; -#else // !wxUSE_UNICODE - // notice that we don't map wxDF_UNICODETEXT to g_textAtom here, this - // would lead the code elsewhere to treat data objects with this format as - // containing UTF-8 data which is not true - if (m_type == wxDF_TEXT) - m_format = g_textAtom; -#endif // wxUSE_UNICODE/!wxUSE_UNICODE - else - if (m_type == wxDF_BITMAP) - m_format = g_pngAtom; - else - if (m_type == wxDF_FILENAME) - m_format = g_fileAtom; - else - if (m_type == wxDF_HTML) - m_format = g_htmlAtom; - else - { - wxFAIL_MSG( wxT("invalid dataformat") ); - } -} - -wxDataFormatId wxDataFormat::GetType() const -{ - return m_type; -} - -wxString wxDataFormat::GetId() const -{ - wxGtkString atom_name(gdk_atom_name(m_format)); - return wxString::FromAscii(atom_name); -} - -void wxDataFormat::SetId( NativeFormat format ) -{ - PrepareFormats(); - m_format = format; - - if (m_format == g_textAtom) -#if wxUSE_UNICODE - m_type = wxDF_UNICODETEXT; -#else - m_type = wxDF_TEXT; -#endif - else - if (m_format == g_altTextAtom) - m_type = wxDF_TEXT; - else - if (m_format == g_pngAtom) - m_type = wxDF_BITMAP; - else - if (m_format == g_fileAtom) - m_type = wxDF_FILENAME; - else - if (m_format == g_htmlAtom) - m_type = wxDF_HTML; - else - m_type = wxDF_PRIVATE; -} - -void wxDataFormat::SetId( const wxString& id ) -{ - PrepareFormats(); - m_type = wxDF_PRIVATE; - m_format = gdk_atom_intern( id.ToAscii(), FALSE ); -} - -void wxDataFormat::PrepareFormats() -{ - // VZ: GNOME included in RedHat 6.1 uses the MIME types below and not the - // atoms STRING and file:ALL as the old code was, but normal X apps - // use STRING for text selection when transferring the data via - // clipboard, for example, so do use STRING for now (GNOME apps will - // probably support STRING as well for compatibility anyhow), but use - // text/uri-list for file dnd because compatibility is not important - // here (with whom?) - if (!g_textAtom) - { -#if wxUSE_UNICODE - g_textAtom = gdk_atom_intern( "UTF8_STRING", FALSE ); - g_altTextAtom = gdk_atom_intern( "STRING", FALSE ); -#else - g_textAtom = gdk_atom_intern( "STRING" /* "text/plain" */, FALSE ); -#endif - } - if (!g_pngAtom) - g_pngAtom = gdk_atom_intern( "image/png", FALSE ); - if (!g_fileAtom) - g_fileAtom = gdk_atom_intern( "text/uri-list", FALSE ); - if (!g_htmlAtom) - g_htmlAtom = gdk_atom_intern( "text/html", FALSE ); -} - -//------------------------------------------------------------------------- -// wxDataObject -//------------------------------------------------------------------------- - -wxDataObject::wxDataObject() -{ -} - -wxDataObject::~wxDataObject() -{ - // dtor is empty but needed for Darwin and AIX -- otherwise it doesn't link -} - -bool wxDataObject::IsSupportedFormat(const wxDataFormat& format, Direction dir) const -{ - size_t nFormatCount = GetFormatCount(dir); - if ( nFormatCount == 1 ) - { - return format == GetPreferredFormat(); - } - else - { - wxDataFormat *formats = new wxDataFormat[nFormatCount]; - GetAllFormats(formats,dir); - - size_t n; - for ( n = 0; n < nFormatCount; n++ ) - { - if ( formats[n] == format ) - break; - } - - delete [] formats; - - // found? - return n < nFormatCount; - } -} - -// ---------------------------------------------------------------------------- -// wxTextDataObject -// ---------------------------------------------------------------------------- - -#if wxUSE_UNICODE - -void -wxTextDataObject::GetAllFormats(wxDataFormat *formats, - wxDataObjectBase::Direction WXUNUSED(dir)) const -{ - *formats++ = GetPreferredFormat(); - *formats = g_altTextAtom; -} - -#endif // wxUSE_UNICODE - -// ---------------------------------------------------------------------------- -// wxFileDataObject -// ---------------------------------------------------------------------------- - -bool wxFileDataObject::GetDataHere(void *buf) const -{ - char* out = static_cast(buf); - - for (size_t i = 0; i < m_filenames.GetCount(); i++) - { - char* uri = g_filename_to_uri(m_filenames[i].mbc_str(), 0, 0); - if (uri) - { - size_t const len = strlen(uri); - memcpy(out, uri, len); - out += len; - *(out++) = '\r'; - *(out++) = '\n'; - g_free(uri); - } - } - *out = 0; - - return true; -} - -size_t wxFileDataObject::GetDataSize() const -{ - size_t res = 0; - - for (size_t i = 0; i < m_filenames.GetCount(); i++) - { - char* uri = g_filename_to_uri(m_filenames[i].mbc_str(), 0, 0); - if (uri) { - res += strlen(uri) + 2; // Including "\r\n" - g_free(uri); - } - } - - return res + 1; -} - -bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *buf) -{ - // we get data in the text/uri-list format, i.e. as a sequence of URIs - // (filenames prefixed by "file:") delimited by "\r\n". size includes - // the trailing zero (in theory, not for Nautilus in early GNOME - // versions). - - m_filenames.Empty(); - - const gchar *nexttemp = (const gchar*) buf; - for ( ; ; ) - { - int len = 0; - const gchar *temp = nexttemp; - for (;;) - { - if (temp[len] == 0) - { - if (len > 0) - { - // if an app omits '\r''\n' - nexttemp = temp+len; - break; - } - - return true; - } - if (temp[len] == '\r') - { - if (temp[len+1] == '\n') - nexttemp = temp+len+2; - else - nexttemp = temp+len+1; - break; - } - len++; - } - - if (len == 0) - break; - - // required to give it a trailing zero - gchar *uri = g_strndup( temp, len ); - - gchar *fn = g_filename_from_uri( uri, NULL, NULL ); - - g_free( uri ); - - if (fn) - { - AddFile( wxConvFileName->cMB2WX( fn ) ); - g_free( fn ); - } - } - - return true; -} - -void wxFileDataObject::AddFile( const wxString &filename ) -{ - m_filenames.Add( filename ); -} - -// ---------------------------------------------------------------------------- -// wxBitmapDataObject -// ---------------------------------------------------------------------------- - -wxBitmapDataObject::wxBitmapDataObject() -{ - Init(); -} - -wxBitmapDataObject::wxBitmapDataObject( const wxBitmap& bitmap ) - : wxBitmapDataObjectBase(bitmap) -{ - Init(); - - DoConvertToPng(); -} - -wxBitmapDataObject::~wxBitmapDataObject() -{ - Clear(); -} - -void wxBitmapDataObject::SetBitmap( const wxBitmap &bitmap ) -{ - ClearAll(); - - wxBitmapDataObjectBase::SetBitmap(bitmap); - - DoConvertToPng(); -} - -bool wxBitmapDataObject::GetDataHere(void *buf) const -{ - if ( !m_pngSize ) - { - wxFAIL_MSG( wxT("attempt to copy empty bitmap failed") ); - - return false; - } - - memcpy(buf, m_pngData, m_pngSize); - - return true; -} - -bool wxBitmapDataObject::SetData(size_t size, const void *buf) -{ - Clear(); - - wxCHECK_MSG( wxImage::FindHandler(wxBITMAP_TYPE_PNG) != NULL, - false, wxT("You must call wxImage::AddHandler(new wxPNGHandler); to be able to use clipboard with bitmaps!") ); - - m_pngSize = size; - m_pngData = malloc(m_pngSize); - - memcpy(m_pngData, buf, m_pngSize); - - wxMemoryInputStream mstream((char*) m_pngData, m_pngSize); - wxImage image; - if ( !image.LoadFile( mstream, wxBITMAP_TYPE_PNG ) ) - { - return false; - } - - m_bitmap = wxBitmap(image); - - return m_bitmap.IsOk(); -} - -void wxBitmapDataObject::DoConvertToPng() -{ - if ( !m_bitmap.IsOk() ) - return; - - wxCHECK_RET( wxImage::FindHandler(wxBITMAP_TYPE_PNG) != NULL, - wxT("You must call wxImage::AddHandler(new wxPNGHandler); to be able to use clipboard with bitmaps!") ); - - wxImage image = m_bitmap.ConvertToImage(); - - wxCountingOutputStream count; - image.SaveFile(count, wxBITMAP_TYPE_PNG); - - m_pngSize = count.GetSize() + 100; // sometimes the size seems to vary ??? - m_pngData = malloc(m_pngSize); - - wxMemoryOutputStream mstream((char*) m_pngData, m_pngSize); - image.SaveFile(mstream, wxBITMAP_TYPE_PNG); -} - -// ---------------------------------------------------------------------------- -// wxURLDataObject -// ---------------------------------------------------------------------------- - -class wxTextURIListDataObject : public wxDataObjectSimple -{ -public: - wxTextURIListDataObject(const wxString& url) - : wxDataObjectSimple(wxDataFormat(g_fileAtom)), - m_url(url) - { - } - - const wxString& GetURL() const { return m_url; } - void SetURL(const wxString& url) { m_url = url; } - - - virtual size_t GetDataSize() const wxOVERRIDE - { - // It is not totally clear whether we should include "\r\n" at the end - // of the string if there is only one URL or not, but not doing it - // doesn't seem to create any problems, so keep things simple. - return strlen(m_url.utf8_str()) + 1; - } - - virtual bool GetDataHere(void *buf) const wxOVERRIDE - { - char* const dst = static_cast(buf); - - strcpy(dst, m_url.utf8_str()); - - return true; - } - - virtual bool SetData(size_t len, const void *buf) wxOVERRIDE - { - const char* const src = static_cast(buf); - - // The string might be "\r\n"-terminated but this is not necessarily - // the case (e.g. when dragging an URL from Firefox, it isn't). - if ( len > 1 && src[len - 1] == '\n' ) - { - if ( len > 2 && src[len - 2] == '\r' ) - len--; - - len--; - } - - m_url = wxString::FromUTF8(src, len); - - return true; - } - - // Must provide overloads to avoid hiding them (and warnings about it) - virtual size_t GetDataSize(const wxDataFormat&) const wxOVERRIDE - { - return GetDataSize(); - } - virtual bool GetDataHere(const wxDataFormat&, void *buf) const wxOVERRIDE - { - return GetDataHere(buf); - } - virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) wxOVERRIDE - { - return SetData(len, buf); - } - -private: - wxString m_url; -}; - -wxURLDataObject::wxURLDataObject(const wxString& url) : - m_dobjURIList(new wxTextURIListDataObject(url)), - m_dobjText(new wxTextDataObject(url)) -{ - // Use both URL-specific format and a plain text one to ensure that URLs - // can be pasted into any application. - Add(m_dobjURIList, true /* preferred */); - Add(m_dobjText); -} - -void wxURLDataObject::SetURL(const wxString& url) -{ - m_dobjURIList->SetURL(url); - m_dobjText->SetText(url); -} - -wxString wxURLDataObject::GetURL() const -{ - if ( GetReceivedFormat() == g_fileAtom ) - { - // If we received the URL as an URI, use it. - return m_dobjURIList->GetURL(); - } - else // Otherwise we either got it as text or didn't get anything yet. - { - // In either case using the text format should be fine. - return m_dobjText->GetText(); - } -} - -#endif // wxUSE_DATAOBJ diff --git a/Externals/wxWidgets3/src/gtk/dataview.cpp b/Externals/wxWidgets3/src/gtk/dataview.cpp deleted file mode 100644 index 7b73d1a9ba..0000000000 --- a/Externals/wxWidgets3/src/gtk/dataview.cpp +++ /dev/null @@ -1,5242 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/dataview.cpp -// Purpose: wxDataViewCtrl GTK+2 implementation -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if wxUSE_DATAVIEWCTRL - -#include "wx/dataview.h" - -#ifndef wxUSE_GENERICDATAVIEWCTRL - -#ifndef WX_PRECOMP - #include "wx/log.h" - #include "wx/dcclient.h" - #include "wx/sizer.h" - #include "wx/settings.h" - #include "wx/crt.h" -#endif - -#include "wx/stockitem.h" -#include "wx/popupwin.h" -#include "wx/listimpl.cpp" - -#include "wx/gtk/dc.h" -#ifndef __WXGTK3__ -#include "wx/gtk/dcclient.h" -#endif - -#include -#include "wx/gtk/private.h" -#include "wx/gtk/private/event.h" -#include "wx/gtk/private/gdkconv.h" -#include "wx/gtk/private/gtk2-compat.h" -#include "wx/gtk/private/list.h" -#include "wx/gtk/private/treeview.h" -using namespace wxGTKImpl; - -class wxGtkDataViewModelNotifier; - -#ifdef __WXGTK3__ - #define wxConstGdkRect const GdkRectangle -#else - #define wxConstGdkRect GdkRectangle -#endif - -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- - -static wxDataViewCtrlInternal *gs_internal = NULL; - -class wxGtkTreeModelNode; - -extern "C" { -typedef struct _GtkWxTreeModel GtkWxTreeModel; -} - -// ---------------------------------------------------------------------------- -// wxGtkTreePathList: self-destroying list of GtkTreePath objects. -// ---------------------------------------------------------------------------- - -class wxGtkTreePathList : public wxGtkList -{ -public: - // Ctor takes ownership of the list. - explicit wxGtkTreePathList(GList* list) - : wxGtkList(list) - { - } - - ~wxGtkTreePathList() - { - // Delete the list contents, wxGtkList will delete the list itself. - g_list_foreach(m_list, (GFunc)gtk_tree_path_free, NULL); - } -}; - -// ---------------------------------------------------------------------------- -// wxGtkTreeSelectionLock: prevent selection from changing during the -// lifetime of this object -// ---------------------------------------------------------------------------- - -// Implementation note: it could be expected that setting the selection -// function in this class ctor and resetting it back to the old value in its -// dtor would work, However in GTK+2 gtk_tree_selection_get_select_function() -// can't be passed NULL (see https://bugzilla.gnome.org/show_bug.cgi?id=626276 -// which was only fixed in 2.90.5-304-g316b9da) so we can't do this. -// -// Instead, we always use the selection function (which -// imposes extra overhead, albeit minimal one, on all selection operations) and -// just set/reset the flag telling it whether it should allow or forbid the -// selection. -// -// Also notice that currently only a single object of this class may exist at -// any given moment. It's just simpler like this and we don't need anything -// more for now. - -extern "C" { -static -gboolean wxdataview_selection_func(GtkTreeSelection * WXUNUSED(selection), - GtkTreeModel * WXUNUSED(model), - GtkTreePath * WXUNUSED(path), - gboolean WXUNUSED(path_currently_selected), - gpointer data) -{ - return data == NULL; -} -} - -class wxGtkTreeSelectionLock -{ -public: - wxGtkTreeSelectionLock(GtkTreeSelection *selection) - : m_selection(selection) - { - wxASSERT_MSG( !ms_instance, "this class is not reentrant currently" ); - - ms_instance = this; - - if ( ms_firstTime ) - { - ms_firstTime = false; - CheckCurrentSelectionFunc(NULL); - } - else - { - CheckCurrentSelectionFunc(wxdataview_selection_func); - } - - // Pass some non-NULL pointer as "data" for the callback, it doesn't - // matter what it is as long as it's non-NULL. - gtk_tree_selection_set_select_function(selection, - wxdataview_selection_func, - this, - NULL); - } - - ~wxGtkTreeSelectionLock() - { - CheckCurrentSelectionFunc(wxdataview_selection_func); - - gtk_tree_selection_set_select_function(m_selection, - wxdataview_selection_func, - NULL, - NULL); - - ms_instance = NULL; - } - -private: - void CheckCurrentSelectionFunc(GtkTreeSelectionFunc func) - { - // We can only use gtk_tree_selection_get_select_function() with 2.14+ - // so check for its availability both during compile- and run-time. -#if GTK_CHECK_VERSION(2, 14, 0) -#ifndef __WXGTK3__ - if ( gtk_check_version(2, 14, 0) != NULL ) - return; -#endif - - // If this assert is triggered, it means the code elsewhere has called - // gtk_tree_selection_set_select_function() but currently doing this - // breaks this class so the code here needs to be changed. - wxASSERT_MSG - ( - gtk_tree_selection_get_select_function(m_selection) == func, - "selection function has changed unexpectedly, review this code!" - ); -#endif // GTK+ 2.14+ - - wxUnusedVar(func); - } - - static wxGtkTreeSelectionLock *ms_instance; - static bool ms_firstTime; - - GtkTreeSelection * const m_selection; - - wxDECLARE_NO_COPY_CLASS(wxGtkTreeSelectionLock); -}; - -wxGtkTreeSelectionLock *wxGtkTreeSelectionLock::ms_instance = NULL; -bool wxGtkTreeSelectionLock::ms_firstTime = true; - -//----------------------------------------------------------------------------- -// wxDataViewCtrlInternal -//----------------------------------------------------------------------------- - -WX_DECLARE_LIST(wxDataViewItem, ItemList); -WX_DEFINE_LIST(ItemList) - -class wxDataViewCtrlInternal -{ -public: - wxDataViewCtrlInternal( wxDataViewCtrl *owner, wxDataViewModel *wx_model ); - ~wxDataViewCtrlInternal(); - - // model iface - GtkTreeModelFlags get_flags(); - gboolean get_iter( GtkTreeIter *iter, GtkTreePath *path ); - GtkTreePath *get_path( GtkTreeIter *iter); - gboolean iter_next( GtkTreeIter *iter ); - gboolean iter_children( GtkTreeIter *iter, GtkTreeIter *parent); - gboolean iter_has_child( GtkTreeIter *iter ); - gint iter_n_children( GtkTreeIter *iter ); - gboolean iter_nth_child( GtkTreeIter *iter, GtkTreeIter *parent, gint n ); - gboolean iter_parent( GtkTreeIter *iter, GtkTreeIter *child ); - - // dnd iface - - bool EnableDragSource( const wxDataFormat &format ); - bool EnableDropTarget( const wxDataFormat &format ); - - gboolean row_draggable( GtkTreeDragSource *drag_source, GtkTreePath *path ); - gboolean drag_data_delete( GtkTreeDragSource *drag_source, GtkTreePath* path ); - gboolean drag_data_get( GtkTreeDragSource *drag_source, GtkTreePath *path, - GtkSelectionData *selection_data ); - gboolean drag_data_received( GtkTreeDragDest *drag_dest, GtkTreePath *dest, - GtkSelectionData *selection_data ); - gboolean row_drop_possible( GtkTreeDragDest *drag_dest, GtkTreePath *dest_path, - GtkSelectionData *selection_data ); - - // notifactions from wxDataViewModel - bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item ); - bool ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item ); - bool ItemChanged( const wxDataViewItem &item ); - bool ValueChanged( const wxDataViewItem &item, unsigned int model_column ); - bool Cleared(); - bool BeforeReset(); - bool AfterReset(); - void Resort(); - - // sorting interface - void SetSortOrder( GtkSortType sort_order ) { m_sort_order = sort_order; } - GtkSortType GetSortOrder() const { return m_sort_order; } - - void SetSortColumn( int column ) { m_sort_column = column; } - int GetSortColumn() const { return m_sort_column; } - - void SetDataViewSortColumn( wxDataViewColumn *column ) { m_dataview_sort_column = column; } - wxDataViewColumn *GetDataViewSortColumn() { return m_dataview_sort_column; } - - bool IsSorted() const { return m_sort_column >= 0; } - - // Should we be sorted either because we have a configured sort column or - // because we have a default sort order? - bool ShouldBeSorted() const - { - return IsSorted() || GetDataViewModel()->HasDefaultCompare(); - } - - - // accessors - wxDataViewModel* GetDataViewModel() { return m_wx_model; } - const wxDataViewModel* GetDataViewModel() const { return m_wx_model; } - wxDataViewCtrl* GetOwner() { return m_owner; } - GtkWxTreeModel* GetGtkModel() { return m_gtk_model; } - - // item can be deleted already in the model - int GetIndexOf( const wxDataViewItem &parent, const wxDataViewItem &item ); - - void OnInternalIdle(); - -protected: - void InitTree(); - void ScheduleRefresh(); - - wxGtkTreeModelNode *FindNode( const wxDataViewItem &item ); - wxGtkTreeModelNode *FindNode( GtkTreeIter *iter ); - wxGtkTreeModelNode *FindParentNode( const wxDataViewItem &item ); - wxGtkTreeModelNode *FindParentNode( GtkTreeIter *iter ); - void BuildBranch( wxGtkTreeModelNode *branch ); - -private: - wxGtkTreeModelNode *m_root; - wxDataViewModel *m_wx_model; - GtkWxTreeModel *m_gtk_model; - wxDataViewCtrl *m_owner; - GtkSortType m_sort_order; - wxDataViewColumn *m_dataview_sort_column; - int m_sort_column; - - GtkTargetEntry m_dragSourceTargetEntry; - wxCharBuffer m_dragSourceTargetEntryTarget; - wxDataObject *m_dragDataObject; - - GtkTargetEntry m_dropTargetTargetEntry; - wxCharBuffer m_dropTargetTargetEntryTarget; - wxDataObject *m_dropDataObject; - - wxGtkDataViewModelNotifier *m_notifier; - - bool m_dirty; -}; - - -//----------------------------------------------------------------------------- -// wxGtkTreeModelNode -//----------------------------------------------------------------------------- - -static -int LINKAGEMODE wxGtkTreeModelChildCmp( void** id1, void** id2 ) -{ - int ret = gs_internal->GetDataViewModel()->Compare( wxDataViewItem(*id1), wxDataViewItem(*id2), - gs_internal->GetSortColumn(), (gs_internal->GetSortOrder() == GTK_SORT_ASCENDING) ); - - return ret; -} - -WX_DEFINE_ARRAY_PTR( wxGtkTreeModelNode*, wxGtkTreeModelNodes ); -WX_DEFINE_ARRAY_PTR( void*, wxGtkTreeModelChildren ); - -class wxGtkTreeModelNode -{ -public: - wxGtkTreeModelNode( wxGtkTreeModelNode* parent, const wxDataViewItem &item, - wxDataViewCtrlInternal *internal ) - { - m_parent = parent; - m_item = item; - m_internal = internal; - } - - ~wxGtkTreeModelNode() - { - size_t count = m_nodes.GetCount(); - size_t i; - for (i = 0; i < count; i++) - { - wxGtkTreeModelNode *child = m_nodes.Item( i ); - delete child; - } - } - - void AddNode( wxGtkTreeModelNode* child ) - { - m_nodes.Add( child ); - - void *id = child->GetItem().GetID(); - - m_children.Add( id ); - - if (m_internal->ShouldBeSorted()) - { - gs_internal = m_internal; - m_children.Sort( &wxGtkTreeModelChildCmp ); - } - } - - void InsertNode( wxGtkTreeModelNode* child, unsigned pos ) - { - if (m_internal->ShouldBeSorted()) - { - AddNode(child); - return; - } - - void *id = child->GetItem().GetID(); - - // Insert into m_nodes so that the order of nodes in m_nodes is the - // same as the order of their corresponding IDs in m_children: - const unsigned int count = m_nodes.GetCount(); - bool inserted = false; - for (unsigned i = 0; i < count; i++) - { - wxGtkTreeModelNode *node = m_nodes[i]; - int posInChildren = m_children.Index(node->GetItem().GetID()); - if ( (unsigned)posInChildren >= pos ) - { - m_nodes.Insert(child, i); - inserted = true; - break; - } - } - if ( !inserted ) - m_nodes.Add(child); - - m_children.Insert( id, pos ); - } - - void AddLeaf( void* id ) - { - InsertLeaf(id, m_children.size()); - } - - void InsertLeaf( void* id, unsigned pos ) - { - m_children.Insert( id, pos ); - - if (m_internal->ShouldBeSorted()) - { - gs_internal = m_internal; - m_children.Sort( &wxGtkTreeModelChildCmp ); - } - } - - void DeleteChild( void* id ) - { - m_children.Remove( id ); - - unsigned int count = m_nodes.GetCount(); - unsigned int pos; - for (pos = 0; pos < count; pos++) - { - wxGtkTreeModelNode *node = m_nodes.Item( pos ); - if (node->GetItem().GetID() == id) - { - m_nodes.RemoveAt( pos ); - delete node; - break; - } - } - } - - // returns position of child node for given item in children list or wxNOT_FOUND - int FindChildByItem(const wxDataViewItem& item) const - { - const void* itemId = item.GetID(); - const wxGtkTreeModelChildren& nodes = m_children; - const int len = nodes.size(); - for ( int i = 0; i < len; i++ ) - { - if ( nodes[i] == itemId ) - return i; - } - return wxNOT_FOUND; - } - - wxGtkTreeModelNode* GetParent() - { return m_parent; } - wxGtkTreeModelNodes &GetNodes() - { return m_nodes; } - wxGtkTreeModelChildren &GetChildren() - { return m_children; } - - unsigned int GetChildCount() const { return m_children.GetCount(); } - unsigned int GetNodesCount() const { return m_nodes.GetCount(); } - - wxDataViewItem &GetItem() { return m_item; } - wxDataViewCtrlInternal *GetInternal() { return m_internal; } - - void Resort(); - -private: - wxGtkTreeModelNode *m_parent; - wxGtkTreeModelNodes m_nodes; - wxGtkTreeModelChildren m_children; - wxDataViewItem m_item; - wxDataViewCtrlInternal *m_internal; -}; - - -//----------------------------------------------------------------------------- -// data -//----------------------------------------------------------------------------- - -extern bool g_blockEventsOnDrag; - -//----------------------------------------------------------------------------- -// define new GTK+ class wxGtkTreeModel -//----------------------------------------------------------------------------- - -extern "C" { - -#define GTK_TYPE_WX_TREE_MODEL (gtk_wx_tree_model_get_type ()) -#define GTK_WX_TREE_MODEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_WX_TREE_MODEL, GtkWxTreeModel)) -#define GTK_IS_WX_TREE_MODEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_WX_TREE_MODEL)) -#define GTK_IS_WX_TREE_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_WX_TREE_MODEL)) - -GType gtk_wx_tree_model_get_type (void); - -struct _GtkWxTreeModel -{ - GObject parent; - - /*< private >*/ - gint stamp; - wxDataViewCtrlInternal *internal; -}; - -static GtkWxTreeModel *wxgtk_tree_model_new (void); -static void wxgtk_tree_model_init (GTypeInstance* instance, void*); - -static void wxgtk_tree_model_tree_model_init (void* g_iface, void*); -static void wxgtk_tree_model_sortable_init (void* g_iface, void*); -static void wxgtk_tree_model_drag_source_init(void* g_iface, void*); -static void wxgtk_tree_model_drag_dest_init (void* g_iface, void*); - -static GtkTreeModelFlags wxgtk_tree_model_get_flags (GtkTreeModel *tree_model); -static gint wxgtk_tree_model_get_n_columns (GtkTreeModel *tree_model); -static GType wxgtk_tree_model_get_column_type (GtkTreeModel *tree_model, - gint index); -static gboolean wxgtk_tree_model_get_iter (GtkTreeModel *tree_model, - GtkTreeIter *iter, - GtkTreePath *path); -static GtkTreePath *wxgtk_tree_model_get_path (GtkTreeModel *tree_model, - GtkTreeIter *iter); -static void wxgtk_tree_model_get_value (GtkTreeModel *tree_model, - GtkTreeIter *iter, - gint column, - GValue *value); -static gboolean wxgtk_tree_model_iter_next (GtkTreeModel *tree_model, - GtkTreeIter *iter); -static gboolean wxgtk_tree_model_iter_children (GtkTreeModel *tree_model, - GtkTreeIter *iter, - GtkTreeIter *parent); -static gboolean wxgtk_tree_model_iter_has_child (GtkTreeModel *tree_model, - GtkTreeIter *iter); -static gint wxgtk_tree_model_iter_n_children (GtkTreeModel *tree_model, - GtkTreeIter *iter); -static gboolean wxgtk_tree_model_iter_nth_child (GtkTreeModel *tree_model, - GtkTreeIter *iter, - GtkTreeIter *parent, - gint n); -static gboolean wxgtk_tree_model_iter_parent (GtkTreeModel *tree_model, - GtkTreeIter *iter, - GtkTreeIter *child); - -/* sortable */ -static gboolean wxgtk_tree_model_get_sort_column_id (GtkTreeSortable *sortable, - gint *sort_column_id, - GtkSortType *order); -static void wxgtk_tree_model_set_sort_column_id (GtkTreeSortable *sortable, - gint sort_column_id, - GtkSortType order); -static void wxgtk_tree_model_set_sort_func (GtkTreeSortable *sortable, - gint sort_column_id, - GtkTreeIterCompareFunc func, - gpointer data, - GDestroyNotify destroy); -static void wxgtk_tree_model_set_default_sort_func (GtkTreeSortable *sortable, - GtkTreeIterCompareFunc func, - gpointer data, - GDestroyNotify destroy); -static gboolean wxgtk_tree_model_has_default_sort_func (GtkTreeSortable *sortable); - -/* drag'n'drop */ -static gboolean wxgtk_tree_model_row_draggable (GtkTreeDragSource *drag_source, - GtkTreePath *path); -static gboolean wxgtk_tree_model_drag_data_delete (GtkTreeDragSource *drag_source, - GtkTreePath *path); -static gboolean wxgtk_tree_model_drag_data_get (GtkTreeDragSource *drag_source, - GtkTreePath *path, - GtkSelectionData *selection_data); -static gboolean wxgtk_tree_model_drag_data_received (GtkTreeDragDest *drag_dest, - GtkTreePath *dest, - GtkSelectionData *selection_data); -static gboolean wxgtk_tree_model_row_drop_possible (GtkTreeDragDest *drag_dest, - GtkTreePath *dest_path, - GtkSelectionData *selection_data); - -GType -gtk_wx_tree_model_get_type (void) -{ - static GType tree_model_type = 0; - - if (!tree_model_type) - { - const GTypeInfo tree_model_info = - { - sizeof (GObjectClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - NULL, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (GtkWxTreeModel), - 0, - wxgtk_tree_model_init, - NULL - }; - - static const GInterfaceInfo tree_model_iface_info = - { - wxgtk_tree_model_tree_model_init, - NULL, - NULL - }; - - static const GInterfaceInfo sortable_iface_info = - { - wxgtk_tree_model_sortable_init, - NULL, - NULL - }; - - static const GInterfaceInfo drag_source_iface_info = - { - wxgtk_tree_model_drag_source_init, - NULL, - NULL - }; - - static const GInterfaceInfo drag_dest_iface_info = - { - wxgtk_tree_model_drag_dest_init, - NULL, - NULL - }; - - tree_model_type = g_type_register_static (G_TYPE_OBJECT, "GtkWxTreeModel", - &tree_model_info, (GTypeFlags)0 ); - - g_type_add_interface_static (tree_model_type, - GTK_TYPE_TREE_MODEL, - &tree_model_iface_info); - g_type_add_interface_static (tree_model_type, - GTK_TYPE_TREE_SORTABLE, - &sortable_iface_info); - g_type_add_interface_static (tree_model_type, - GTK_TYPE_TREE_DRAG_DEST, - &drag_dest_iface_info); - g_type_add_interface_static (tree_model_type, - GTK_TYPE_TREE_DRAG_SOURCE, - &drag_source_iface_info); - } - - return tree_model_type; -} - -static GtkWxTreeModel * -wxgtk_tree_model_new(void) -{ - GtkWxTreeModel *retval = (GtkWxTreeModel *) g_object_new (GTK_TYPE_WX_TREE_MODEL, NULL); - return retval; -} - -static void -wxgtk_tree_model_tree_model_init(void* g_iface, void*) -{ - GtkTreeModelIface* iface = static_cast(g_iface); - iface->get_flags = wxgtk_tree_model_get_flags; - iface->get_n_columns = wxgtk_tree_model_get_n_columns; - iface->get_column_type = wxgtk_tree_model_get_column_type; - iface->get_iter = wxgtk_tree_model_get_iter; - iface->get_path = wxgtk_tree_model_get_path; - iface->get_value = wxgtk_tree_model_get_value; - iface->iter_next = wxgtk_tree_model_iter_next; - iface->iter_children = wxgtk_tree_model_iter_children; - iface->iter_has_child = wxgtk_tree_model_iter_has_child; - iface->iter_n_children = wxgtk_tree_model_iter_n_children; - iface->iter_nth_child = wxgtk_tree_model_iter_nth_child; - iface->iter_parent = wxgtk_tree_model_iter_parent; -} - -static void -wxgtk_tree_model_sortable_init(void* g_iface, void*) -{ - GtkTreeSortableIface* iface = static_cast(g_iface); - iface->get_sort_column_id = wxgtk_tree_model_get_sort_column_id; - iface->set_sort_column_id = wxgtk_tree_model_set_sort_column_id; - iface->set_sort_func = wxgtk_tree_model_set_sort_func; - iface->set_default_sort_func = wxgtk_tree_model_set_default_sort_func; - iface->has_default_sort_func = wxgtk_tree_model_has_default_sort_func; -} - -static void -wxgtk_tree_model_drag_source_init(void* g_iface, void*) -{ - GtkTreeDragSourceIface* iface = static_cast(g_iface); - iface->row_draggable = wxgtk_tree_model_row_draggable; - iface->drag_data_delete = wxgtk_tree_model_drag_data_delete; - iface->drag_data_get = wxgtk_tree_model_drag_data_get; -} - -static void -wxgtk_tree_model_drag_dest_init(void* g_iface, void*) -{ - GtkTreeDragDestIface* iface = static_cast(g_iface); - iface->drag_data_received = wxgtk_tree_model_drag_data_received; - iface->row_drop_possible = wxgtk_tree_model_row_drop_possible; -} - -static void -wxgtk_tree_model_init(GTypeInstance* instance, void*) -{ - GtkWxTreeModel* tree_model = GTK_WX_TREE_MODEL(instance); - tree_model->internal = NULL; - tree_model->stamp = g_random_int(); -} - -} // extern "C" - -//----------------------------------------------------------------------------- -// implement callbacks from wxGtkTreeModel class by letting -// them call the methods of wxWidgets' wxDataViewModel -//----------------------------------------------------------------------------- - -static GtkTreeModelFlags -wxgtk_tree_model_get_flags (GtkTreeModel *tree_model) -{ - GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model; - g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), (GtkTreeModelFlags)0 ); - - return wxtree_model->internal->get_flags(); -} - -static gint -wxgtk_tree_model_get_n_columns (GtkTreeModel *tree_model) -{ - GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model; - g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), 0); - - return wxtree_model->internal->GetDataViewModel()->GetColumnCount(); -} - -static GType -wxgtk_tree_model_get_column_type (GtkTreeModel *tree_model, - gint index) -{ - GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model; - g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), G_TYPE_INVALID); - - GType gtype = G_TYPE_INVALID; - - wxString wxtype = wxtree_model->internal->GetDataViewModel()->GetColumnType( (unsigned int) index ); - - if (wxtype == wxT("string")) - gtype = G_TYPE_STRING; - else - { - gtype = G_TYPE_POINTER; - // wxFAIL_MSG( wxT("non-string columns not supported for searching yet") ); - } - - return gtype; -} - -static gboolean -wxgtk_tree_model_get_iter (GtkTreeModel *tree_model, - GtkTreeIter *iter, - GtkTreePath *path) -{ - GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model; - g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE); - g_return_val_if_fail (gtk_tree_path_get_depth (path) > 0, FALSE); - - return wxtree_model->internal->get_iter( iter, path ); -} - -static GtkTreePath * -wxgtk_tree_model_get_path (GtkTreeModel *tree_model, - GtkTreeIter *iter) -{ - GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model; - g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), NULL); - g_return_val_if_fail (iter->stamp == GTK_WX_TREE_MODEL (wxtree_model)->stamp, NULL); - - return wxtree_model->internal->get_path( iter ); -} - -static void -wxgtk_tree_model_get_value (GtkTreeModel *tree_model, - GtkTreeIter *iter, - gint column, - GValue *value) -{ - GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model; - g_return_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model) ); - - wxDataViewModel *model = wxtree_model->internal->GetDataViewModel(); - wxString mtype = model->GetColumnType( (unsigned int) column ); - if (mtype == wxT("string")) - { - wxVariant variant; - g_value_init( value, G_TYPE_STRING ); - wxDataViewItem item( (void*) iter->user_data ); - model->GetValue( variant, item, (unsigned int) column ); - - g_value_set_string( value, variant.GetString().utf8_str() ); - } - else - { - wxFAIL_MSG( wxT("non-string columns not supported yet") ); - } -} - -static gboolean -wxgtk_tree_model_iter_next (GtkTreeModel *tree_model, - GtkTreeIter *iter) -{ - GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model; - - // This happens when clearing the view by calling .._set_model( NULL ); - if (iter->stamp == 0) return FALSE; - - g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE); - g_return_val_if_fail (wxtree_model->stamp == iter->stamp, FALSE); - - return wxtree_model->internal->iter_next( iter ); -} - -static gboolean -wxgtk_tree_model_iter_children (GtkTreeModel *tree_model, - GtkTreeIter *iter, - GtkTreeIter *parent) -{ - GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model; - g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE); - if (parent) - { - g_return_val_if_fail (wxtree_model->stamp == parent->stamp, FALSE); - } - - return wxtree_model->internal->iter_children( iter, parent ); -} - -static gboolean -wxgtk_tree_model_iter_has_child (GtkTreeModel *tree_model, - GtkTreeIter *iter) -{ - GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model; - g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE); - g_return_val_if_fail (wxtree_model->stamp == iter->stamp, FALSE); - - return wxtree_model->internal->iter_has_child( iter ); -} - -static gint -wxgtk_tree_model_iter_n_children (GtkTreeModel *tree_model, - GtkTreeIter *iter) -{ - GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model; - g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), 0); - g_return_val_if_fail ( !iter || wxtree_model->stamp == iter->stamp, 0); - - return wxtree_model->internal->iter_n_children( iter ); -} - -static gboolean -wxgtk_tree_model_iter_nth_child (GtkTreeModel *tree_model, - GtkTreeIter *iter, - GtkTreeIter *parent, - gint n) -{ - GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model; - g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE); - - return wxtree_model->internal->iter_nth_child( iter, parent, n ); -} - -static gboolean -wxgtk_tree_model_iter_parent (GtkTreeModel *tree_model, - GtkTreeIter *iter, - GtkTreeIter *child) -{ - GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model; - g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE); - g_return_val_if_fail (wxtree_model->stamp == child->stamp, FALSE); - - return wxtree_model->internal->iter_parent( iter, child ); -} - -/* drag'n'drop iface */ -static gboolean -wxgtk_tree_model_row_draggable (GtkTreeDragSource *drag_source, - GtkTreePath *path) -{ - GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) drag_source; - g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE); - - return wxtree_model->internal->row_draggable( drag_source, path ); -} - -static gboolean -wxgtk_tree_model_drag_data_delete (GtkTreeDragSource *drag_source, - GtkTreePath *path) -{ - GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) drag_source; - g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE); - - return wxtree_model->internal->drag_data_delete( drag_source, path ); -} - -static gboolean -wxgtk_tree_model_drag_data_get (GtkTreeDragSource *drag_source, - GtkTreePath *path, - GtkSelectionData *selection_data) -{ - GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) drag_source; - g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE); - -#if 0 - wxPrintf( "drag_get_data\n"); - - wxGtkString atom_selection(gdk_atom_name(selection_data->selection)); - wxPrintf( "selection %s\n", wxString::FromAscii(atom_selection) ); - - wxGtkString atom_target(gdk_atom_name(selection_data->target)); - wxPrintf( "target %s\n", wxString::FromAscii(atom_target) ); - - wxGtkString atom_type(gdk_atom_name(selection_data->type)); - wxPrintf( "type %s\n", wxString::FromAscii(atom_type) ); - - wxPrintf( "format %d\n", selection_data->format ); -#endif - - return wxtree_model->internal->drag_data_get( drag_source, path, selection_data ); -} - -static gboolean -wxgtk_tree_model_drag_data_received (GtkTreeDragDest *drag_dest, - GtkTreePath *dest, - GtkSelectionData *selection_data) -{ - GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) drag_dest; - g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE); - - return wxtree_model->internal->drag_data_received( drag_dest, dest, selection_data ); -} - -static gboolean -wxgtk_tree_model_row_drop_possible (GtkTreeDragDest *drag_dest, - GtkTreePath *dest_path, - GtkSelectionData *selection_data) -{ - GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) drag_dest; - g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE); - - return wxtree_model->internal->row_drop_possible( drag_dest, dest_path, selection_data ); -} - -/* sortable iface */ -static gboolean -wxgtk_tree_model_get_sort_column_id (GtkTreeSortable *sortable, - gint *sort_column_id, - GtkSortType *order) -{ - GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) sortable; - - g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (sortable), FALSE); - - if (!wxtree_model->internal->IsSorted()) - { - if (sort_column_id) - *sort_column_id = -1; - - return TRUE; - } - - - if (sort_column_id) - *sort_column_id = wxtree_model->internal->GetSortColumn(); - - if (order) - *order = wxtree_model->internal->GetSortOrder(); - - return TRUE; -} - -wxDataViewColumn *gs_lastLeftClickHeader = NULL; - -static void -wxgtk_tree_model_set_sort_column_id (GtkTreeSortable *sortable, - gint sort_column_id, - GtkSortType order) -{ - GtkWxTreeModel *tree_model = (GtkWxTreeModel *) sortable; - g_return_if_fail (GTK_IS_WX_TREE_MODEL (sortable) ); - - tree_model->internal->SetDataViewSortColumn( gs_lastLeftClickHeader ); - - if ((sort_column_id != (gint) tree_model->internal->GetSortColumn()) || - (order != tree_model->internal->GetSortOrder())) - { - tree_model->internal->SetSortColumn( sort_column_id ); - tree_model->internal->SetSortOrder( order ); - - gtk_tree_sortable_sort_column_changed (sortable); - - tree_model->internal->GetDataViewModel()->Resort(); - } - - if (gs_lastLeftClickHeader) - { - wxDataViewCtrl *dv = tree_model->internal->GetOwner(); - wxDataViewEvent event( wxEVT_DATAVIEW_COLUMN_SORTED, dv->GetId() ); - event.SetDataViewColumn( gs_lastLeftClickHeader ); - event.SetModel( dv->GetModel() ); - dv->HandleWindowEvent( event ); - } - - gs_lastLeftClickHeader = NULL; -} - -static void -wxgtk_tree_model_set_sort_func (GtkTreeSortable *sortable, - gint WXUNUSED(sort_column_id), - GtkTreeIterCompareFunc func, - gpointer WXUNUSED(data), - GDestroyNotify WXUNUSED(destroy)) -{ - g_return_if_fail (GTK_IS_WX_TREE_MODEL (sortable) ); - g_return_if_fail (func != NULL); -} - -static void -wxgtk_tree_model_set_default_sort_func (GtkTreeSortable *sortable, - GtkTreeIterCompareFunc func, - gpointer WXUNUSED(data), - GDestroyNotify WXUNUSED(destroy)) -{ - g_return_if_fail (GTK_IS_WX_TREE_MODEL (sortable) ); - g_return_if_fail (func != NULL); - - //wxPrintf( "wxgtk_tree_model_set_default_sort_func\n" ); - // TODO: remove this code -} - -static gboolean -wxgtk_tree_model_has_default_sort_func (GtkTreeSortable *sortable) -{ - g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (sortable), FALSE ); - - return FALSE; -} - -//----------------------------------------------------------------------------- -// define new GTK+ class GtkWxRendererText -//----------------------------------------------------------------------------- - -extern "C" { - -#define GTK_TYPE_WX_CELL_RENDERER_TEXT (gtk_wx_cell_renderer_text_get_type ()) -#define GTK_WX_CELL_RENDERER_TEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_WX_CELL_RENDERER_TEXT, GtkWxCellRendererText)) -#define GTK_IS_WX_CELL_RENDERER_TEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_WX_CELL_RENDERER_TEXT)) -#define GTK_IS_WX_CELL_RENDERER_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_WX_CELL_RENDERER_TEXT)) - -GType gtk_wx_cell_renderer_text_get_type (void); - -typedef struct _GtkWxCellRendererText GtkWxCellRendererText; - -struct _GtkWxCellRendererText -{ - GtkCellRendererText parent; - - wxDataViewRenderer *wx_renderer; -}; - -static GtkWxCellRendererText *gtk_wx_cell_renderer_text_new (void); -static void gtk_wx_cell_renderer_text_init ( - GTypeInstance* instance, void*); -static void gtk_wx_cell_renderer_text_class_init( - void* klass, void*); -static GtkCellEditable *gtk_wx_cell_renderer_text_start_editing( - GtkCellRenderer *cell, - GdkEvent *event, - GtkWidget *widget, - const gchar *path, - wxConstGdkRect *background_area, - wxConstGdkRect *cell_area, - GtkCellRendererState flags ); - - -static GObjectClass *text_cell_parent_class = NULL; - -} // extern "C" - -GType -gtk_wx_cell_renderer_text_get_type (void) -{ - static GType cell_wx_type = 0; - - if (!cell_wx_type) - { - const GTypeInfo cell_wx_info = - { - sizeof (GtkCellRendererTextClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - gtk_wx_cell_renderer_text_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (GtkWxCellRendererText), - 0, /* n_preallocs */ - gtk_wx_cell_renderer_text_init, - NULL - }; - - cell_wx_type = g_type_register_static( GTK_TYPE_CELL_RENDERER_TEXT, - "GtkWxCellRendererText", &cell_wx_info, (GTypeFlags)0 ); - } - - return cell_wx_type; -} - -static void -gtk_wx_cell_renderer_text_init(GTypeInstance* instance, void*) -{ - GtkWxCellRendererText* cell = GTK_WX_CELL_RENDERER_TEXT(instance); - cell->wx_renderer = NULL; -} - -static void -gtk_wx_cell_renderer_text_class_init(void* klass, void*) -{ - GtkCellRendererClass *cell_class = GTK_CELL_RENDERER_CLASS (klass); - - text_cell_parent_class = (GObjectClass*) g_type_class_peek_parent (klass); - - cell_class->start_editing = gtk_wx_cell_renderer_text_start_editing; -} - -GtkWxCellRendererText* -gtk_wx_cell_renderer_text_new (void) -{ - return (GtkWxCellRendererText*) g_object_new (GTK_TYPE_WX_CELL_RENDERER_TEXT, NULL); -} - -static GtkCellEditable *gtk_wx_cell_renderer_text_start_editing( - GtkCellRenderer *gtk_renderer, - GdkEvent *gdk_event, - GtkWidget *widget, - const gchar *path, - wxConstGdkRect *background_area, - wxConstGdkRect *cell_area, - GtkCellRendererState flags ) -{ - GtkWxCellRendererText *wxgtk_renderer = (GtkWxCellRendererText *) gtk_renderer; - wxDataViewRenderer *wx_renderer = wxgtk_renderer->wx_renderer; - wxDataViewColumn *column = wx_renderer->GetOwner(); - - wxDataViewItem - item(column->GetOwner()->GTKPathToItem(wxGtkTreePath(path))); - - wxDataViewCtrl *dv = column->GetOwner(); - wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_START_EDITING, dv->GetId() ); - event.SetDataViewColumn( column ); - event.SetModel( dv->GetModel() ); - event.SetColumn( column->GetModelColumn() ); - event.SetItem( item ); - dv->HandleWindowEvent( event ); - - if (event.IsAllowed()) - return GTK_CELL_RENDERER_CLASS(text_cell_parent_class)-> - start_editing( gtk_renderer, gdk_event, widget, path, background_area, cell_area, flags ); - else - return NULL; -} - -// ---------------------------------------------------------------------------- -// GTK+ class GtkWxCellEditorBin: needed only to implement GtkCellEditable for -// our editor widgets which don't necessarily implement it on their own. -// ---------------------------------------------------------------------------- - -enum -{ - CELL_EDITOR_BIN_PROP_0, - CELL_EDITOR_BIN_PROP_EDITING_CANCELED -}; - -extern "C" { - -#define GTK_TYPE_WX_CELL_EDITOR_BIN (gtk_wx_cell_editor_bin_get_type ()) -#define GTK_WX_CELL_EDITOR_BIN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_WX_CELL_EDITOR_BIN, GtkWxCellEditorBin)) -#define GTK_IS_WX_CELL_EDITOR_BIN(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_WX_CELL_EDITOR_BIN)) -#define GTK_IS_WX_CELL_EDITOR_BIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_WX_CELL_EDITOR_BIN)) - -GType gtk_wx_cell_editor_bin_get_type(); - -struct GtkWxCellEditorBin -{ - GtkBin parent; - - // The actual user-created editor. - wxWindow* editor; -}; - -static GtkWidget* gtk_wx_cell_editor_bin_new(wxWindow* editor); -static void gtk_wx_cell_editor_bin_init(GTypeInstance* instance, void*); -static void gtk_wx_cell_editor_bin_class_init(void* klass, void*); -static void gtk_wx_cell_editor_bin_get_property(GObject*, guint, GValue*, GParamSpec*); -static void gtk_wx_cell_editor_bin_set_property(GObject*, guint, const GValue*, GParamSpec*); - -static void gtk_wx_cell_editor_bin_cell_editable_init(void* g_iface, void*); -static void gtk_wx_cell_editor_bin_cell_editable_start_editing( - GtkCellEditable *cell_editable, - GdkEvent *event); - -} - -GType -gtk_wx_cell_editor_bin_get_type() -{ - static GType cell_editor_bin_type = 0; - - if ( !cell_editor_bin_type ) - { - const GTypeInfo cell_editor_bin_info = - { - sizeof (GtkBinClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - gtk_wx_cell_editor_bin_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (GtkWxCellEditorBin), - 0, /* n_preallocs */ - gtk_wx_cell_editor_bin_init, - NULL - }; - - cell_editor_bin_type = g_type_register_static( GTK_TYPE_BIN, - "GtkWxCellEditorBin", &cell_editor_bin_info, (GTypeFlags)0 ); - - - static const GInterfaceInfo cell_editable_iface_info = - { - gtk_wx_cell_editor_bin_cell_editable_init, - NULL, - NULL - }; - - g_type_add_interface_static (cell_editor_bin_type, - GTK_TYPE_CELL_EDITABLE, - &cell_editable_iface_info); - } - - return cell_editor_bin_type; -} - -static void -gtk_wx_cell_editor_bin_init(GTypeInstance* instance, void*) -{ - GtkWxCellEditorBin* const bin = GTK_WX_CELL_EDITOR_BIN(instance); - bin->editor = NULL; -} - -static void gtk_wx_cell_editor_bin_class_init(void* klass, void*) -{ - GObjectClass* const oclass = G_OBJECT_CLASS(klass); - - oclass->set_property = gtk_wx_cell_editor_bin_set_property; - oclass->get_property = gtk_wx_cell_editor_bin_get_property; - - g_object_class_override_property(oclass, - CELL_EDITOR_BIN_PROP_EDITING_CANCELED, - "editing-canceled"); -} - -// We need to provide these virtual methods as we must support the -// editing-canceled property, but they don't seem to be actually ever called, -// so it's not clear if we must implement them and how. For now just do -// nothing. - -static void -gtk_wx_cell_editor_bin_get_property(GObject*, guint, GValue*, GParamSpec*) -{ -} - -static void -gtk_wx_cell_editor_bin_set_property(GObject*, guint, const GValue*, GParamSpec*) -{ -} - -GtkWidget* -gtk_wx_cell_editor_bin_new(wxWindow* editor) -{ - if ( !editor ) - return NULL; - - GtkWxCellEditorBin* const - bin = (GtkWxCellEditorBin*)g_object_new (GTK_TYPE_WX_CELL_EDITOR_BIN, NULL); - - bin->editor = editor; - gtk_container_add(GTK_CONTAINER(bin), editor->m_widget); - - return GTK_WIDGET(bin); -} - -// GtkCellEditable interface implementation for GtkWxCellEditorBin - -static void -gtk_wx_cell_editor_bin_cell_editable_init(void* g_iface, void*) -{ - GtkCellEditableIface* iface = static_cast(g_iface); - iface->start_editing = gtk_wx_cell_editor_bin_cell_editable_start_editing; -} - -static void -gtk_wx_cell_editor_bin_cell_editable_start_editing(GtkCellEditable *cell_editable, - GdkEvent *event) -{ - GtkWxCellEditorBin* const bin = (GtkWxCellEditorBin *)cell_editable; - - // If we have an editable widget inside the editor, forward to it. - for ( wxWindow* win = bin->editor; win; ) - { - GtkWidget* const widget = win->m_widget; - if ( GTK_IS_CELL_EDITABLE(widget) ) - { - gtk_cell_editable_start_editing(GTK_CELL_EDITABLE(widget), event); - break; - } - - if ( win == bin->editor ) - win = win->GetChildren().front(); - else - win = win->GetNextSibling(); - } -} - -//----------------------------------------------------------------------------- -// define new GTK+ class GtkWxCellRenderer -//----------------------------------------------------------------------------- - -extern "C" { - -#define GTK_TYPE_WX_CELL_RENDERER (gtk_wx_cell_renderer_get_type ()) -#define GTK_WX_CELL_RENDERER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_WX_CELL_RENDERER, GtkWxCellRenderer)) -#define GTK_IS_WX_CELL_RENDERER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_WX_CELL_RENDERER)) -#define GTK_IS_WX_CELL_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_WX_CELL_RENDERER)) - -GType gtk_wx_cell_renderer_get_type (void); - -typedef struct _GtkWxCellRenderer GtkWxCellRenderer; - -struct _GtkWxCellRenderer -{ - GtkCellRenderer parent; - - /*< private >*/ - wxDataViewCustomRenderer *cell; - - // Non null only while editing. - GtkWidget* editor_bin; -}; - -static GtkCellRenderer *gtk_wx_cell_renderer_new (void); -static void gtk_wx_cell_renderer_init ( - GTypeInstance* instance, void*); -static void gtk_wx_cell_renderer_class_init( - void* klass, void*); -static void gtk_wx_cell_renderer_get_size ( - GtkCellRenderer *cell, - GtkWidget *widget, - wxConstGdkRect *rectangle, - gint *x_offset, - gint *y_offset, - gint *width, - gint *height ); -static void gtk_wx_cell_renderer_render ( - GtkCellRenderer *cell, -#ifdef __WXGTK3__ - cairo_t* cr, -#else - GdkWindow *window, -#endif - GtkWidget *widget, - wxConstGdkRect *background_area, - wxConstGdkRect *cell_area, -#ifndef __WXGTK3__ - GdkRectangle *expose_area, -#endif - GtkCellRendererState flags ); -static gboolean gtk_wx_cell_renderer_activate( - GtkCellRenderer *cell, - GdkEvent *event, - GtkWidget *widget, - const gchar *path, - wxConstGdkRect *background_area, - wxConstGdkRect *cell_area, - GtkCellRendererState flags ); -static GtkCellEditable *gtk_wx_cell_renderer_start_editing( - GtkCellRenderer *cell, - GdkEvent *event, - GtkWidget *widget, - const gchar *path, - wxConstGdkRect *background_area, - wxConstGdkRect *cell_area, - GtkCellRendererState flags ); - -} // extern "C" - -GType -gtk_wx_cell_renderer_get_type (void) -{ - static GType cell_wx_type = 0; - - if (!cell_wx_type) - { - const GTypeInfo cell_wx_info = - { - sizeof (GtkCellRendererClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - gtk_wx_cell_renderer_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (GtkWxCellRenderer), - 0, /* n_preallocs */ - gtk_wx_cell_renderer_init, - NULL - }; - - cell_wx_type = g_type_register_static( GTK_TYPE_CELL_RENDERER, - "GtkWxCellRenderer", &cell_wx_info, (GTypeFlags)0 ); - } - - return cell_wx_type; -} - -static void -gtk_wx_cell_renderer_init(GTypeInstance* instance, void*) -{ - GtkWxCellRenderer* cell = GTK_WX_CELL_RENDERER(instance); - cell->cell = NULL; - cell->editor_bin = NULL; -} - -static void -gtk_wx_cell_renderer_class_init(void* klass, void*) -{ - GtkCellRendererClass *cell_class = GTK_CELL_RENDERER_CLASS (klass); - - cell_class->get_size = gtk_wx_cell_renderer_get_size; - cell_class->render = gtk_wx_cell_renderer_render; - cell_class->activate = gtk_wx_cell_renderer_activate; - cell_class->start_editing = gtk_wx_cell_renderer_start_editing; -} - -GtkCellRenderer* -gtk_wx_cell_renderer_new (void) -{ - return (GtkCellRenderer*) g_object_new (GTK_TYPE_WX_CELL_RENDERER, NULL); -} - -static GtkCellEditable *gtk_wx_cell_renderer_start_editing( - GtkCellRenderer *renderer, - GdkEvent *WXUNUSED(event), - GtkWidget *widget, - const gchar *path, - wxConstGdkRect *WXUNUSED(background_area), - wxConstGdkRect *cell_area, - GtkCellRendererState WXUNUSED(flags) ) -{ - GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer; - wxDataViewCustomRenderer *cell = wxrenderer->cell; - - // Renderer doesn't support in-place editing - if (!cell->HasEditorCtrl()) - return NULL; - - // An in-place editing control is still around - if (cell->GetEditorCtrl()) - return NULL; - - GdkRectangle rect; - gtk_wx_cell_renderer_get_size (renderer, widget, cell_area, - &rect.x, - &rect.y, - &rect.width, - &rect.height); - - rect.x += cell_area->x; - rect.y += cell_area->y; -// rect.width -= renderer->xpad * 2; -// rect.height -= renderer->ypad * 2; - -// wxRect renderrect(wxRectFromGDKRect(&rect)); - wxRect renderrect(wxRectFromGDKRect(cell_area)); - - wxDataViewItem - item(cell->GetOwner()->GetOwner()->GTKPathToItem(wxGtkTreePath(path))); - - if (!cell->StartEditing(item, renderrect)) - return NULL; - - wxrenderer->editor_bin = gtk_wx_cell_editor_bin_new(cell->GetEditorCtrl()); - gtk_widget_show(wxrenderer->editor_bin); - - return GTK_CELL_EDITABLE(wxrenderer->editor_bin); -} - -static void -gtk_wx_cell_renderer_get_size (GtkCellRenderer *renderer, - GtkWidget *WXUNUSED(widget), - wxConstGdkRect *cell_area, - gint *x_offset, - gint *y_offset, - gint *width, - gint *height) -{ - GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer; - wxDataViewCustomRenderer *cell = wxrenderer->cell; - - wxSize size = cell->GetSize(); - - wxDataViewCtrl * const ctrl = cell->GetOwner()->GetOwner(); - - // Uniform row height, if specified, overrides the value returned by the - // renderer. - if ( !ctrl->HasFlag(wxDV_VARIABLE_LINE_HEIGHT) ) - { - const int uniformHeight = ctrl->GTKGetUniformRowHeight(); - if ( uniformHeight > 0 ) - size.y = uniformHeight; - } - - int xpad, ypad; - gtk_cell_renderer_get_padding(renderer, &xpad, &ypad); - int calc_width = xpad * 2 + size.x; - int calc_height = ypad * 2 + size.y; - - if (x_offset) - *x_offset = 0; - if (y_offset) - *y_offset = 0; - - if (cell_area && size.x > 0 && size.y > 0) - { - float xalign, yalign; - gtk_cell_renderer_get_alignment(renderer, &xalign, &yalign); - if (x_offset) - { - *x_offset = int(xalign * (cell_area->width - calc_width - 2 * xpad)); - *x_offset = MAX(*x_offset, 0) + xpad; - } - if (y_offset) - { - *y_offset = int(yalign * (cell_area->height - calc_height - 2 * ypad)); - *y_offset = MAX(*y_offset, 0) + ypad; - } - } - - if (width) - *width = calc_width; - - if (height) - *height = calc_height; -} - -struct wxDataViewCustomRenderer::GTKRenderParams -{ -#ifdef __WXGTK3__ - cairo_t* cr; -#else - GdkWindow* window; - GdkRectangle* expose_area; -#endif - GtkWidget* widget; - wxConstGdkRect* background_area; - int flags; -}; - -static void -gtk_wx_cell_renderer_render (GtkCellRenderer *renderer, -#ifdef __WXGTK3__ - cairo_t* cr, -#else - GdkWindow *window, -#endif - GtkWidget *widget, - wxConstGdkRect *background_area, - wxConstGdkRect *cell_area, -#ifndef __WXGTK3__ - GdkRectangle *expose_area, -#endif - GtkCellRendererState flags) - -{ - GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer; - wxDataViewCustomRenderer *cell = wxrenderer->cell; - - wxDataViewCustomRenderer::GTKRenderParams renderParams; -#ifdef __WXGTK3__ - renderParams.cr = cr; -#else - renderParams.window = window; - renderParams.expose_area = expose_area; -#endif - renderParams.widget = widget; - renderParams.background_area = background_area; - renderParams.flags = flags; - cell->GTKSetRenderParams(&renderParams); - - wxRect rect(wxRectFromGDKRect(cell_area)); - int xpad, ypad; - gtk_cell_renderer_get_padding(renderer, &xpad, &ypad); - rect = rect.Deflate(xpad, ypad); - - wxDC* dc = cell->GetDC(); -#ifdef __WXGTK3__ - wxGraphicsContext* context = dc->GetGraphicsContext(); - void* nativeContext = NULL; - if (context) - nativeContext = context->GetNativeContext(); - if (cr != nativeContext) - { - cairo_reference(cr); - dc->SetGraphicsContext(wxGraphicsContext::CreateFromNative(cr)); - } -#else - wxWindowDCImpl *impl = (wxWindowDCImpl *) dc->GetImpl(); - - // Reinitialize wxWindowDC's GDK window if drawing occurs into a different - // window such as a DnD drop window. - if (window != impl->m_gdkwindow) - { - impl->Destroy(); - impl->m_gdkwindow = window; - impl->SetUpDC(); - } -#endif - - int state = 0; - if (flags & GTK_CELL_RENDERER_SELECTED) - state |= wxDATAVIEW_CELL_SELECTED; - if (flags & GTK_CELL_RENDERER_PRELIT) - state |= wxDATAVIEW_CELL_PRELIT; - if (flags & GTK_CELL_RENDERER_INSENSITIVE) - state |= wxDATAVIEW_CELL_INSENSITIVE; - if (flags & GTK_CELL_RENDERER_FOCUSED) - state |= wxDATAVIEW_CELL_FOCUSED; - cell->WXCallRender( rect, dc, state ); - - cell->GTKSetRenderParams(NULL); -#ifdef __WXGTK3__ - dc->SetGraphicsContext(NULL); -#endif -} - -static gboolean -gtk_wx_cell_renderer_activate( - GtkCellRenderer *renderer, - GdkEvent *event, - GtkWidget *widget, - const gchar *path, - wxConstGdkRect *WXUNUSED(background_area), - wxConstGdkRect *cell_area, - GtkCellRendererState WXUNUSED(flags) ) -{ - GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer; - wxDataViewCustomRenderer *cell = wxrenderer->cell; - - GdkRectangle rect; - gtk_wx_cell_renderer_get_size (renderer, widget, cell_area, - &rect.x, - &rect.y, - &rect.width, - &rect.height); - - rect.x += cell_area->x; - rect.y += cell_area->y; - int xpad, ypad; - gtk_cell_renderer_get_padding(renderer, &xpad, &ypad); - rect.width -= xpad * 2; - rect.height -= ypad * 2; - - wxRect renderrect(wxRectFromGDKRect(&rect)); - - wxDataViewCtrl * const ctrl = cell->GetOwner()->GetOwner(); - wxDataViewModel *model = ctrl->GetModel(); - - wxDataViewItem item(ctrl->GTKPathToItem(wxGtkTreePath(path))); - - unsigned int model_col = cell->GetOwner()->GetModelColumn(); - - if ( !event ) - { - // activated by - return cell->ActivateCell(renderrect, model, item, model_col, NULL); - } - else if ( event->type == GDK_BUTTON_PRESS ) - { - GdkEventButton *button_event = (GdkEventButton*)event; - if ( button_event->button == 1 ) - { - wxMouseEvent mouse_event(wxEVT_LEFT_DOWN); - InitMouseEvent(ctrl, mouse_event, button_event); - - mouse_event.m_x -= renderrect.x; - mouse_event.m_y -= renderrect.y; - - return cell->ActivateCell(renderrect, model, item, model_col, &mouse_event); - } - } - - wxLogDebug("unexpected event type in gtk_wx_cell_renderer_activate()"); - return false; -} - -// --------------------------------------------------------- -// wxGtkDataViewModelNotifier -// --------------------------------------------------------- - -class wxGtkDataViewModelNotifier: public wxDataViewModelNotifier -{ -public: - wxGtkDataViewModelNotifier( wxDataViewModel *wx_model, wxDataViewCtrlInternal *internal ); - ~wxGtkDataViewModelNotifier(); - - virtual bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item ) wxOVERRIDE; - virtual bool ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item ) wxOVERRIDE; - virtual bool ItemChanged( const wxDataViewItem &item ) wxOVERRIDE; - virtual bool ValueChanged( const wxDataViewItem &item, unsigned int model_column ) wxOVERRIDE; - virtual bool Cleared() wxOVERRIDE; - virtual void Resort() wxOVERRIDE; - virtual bool BeforeReset() wxOVERRIDE; - virtual bool AfterReset() wxOVERRIDE; - - void UpdateLastCount(); - -private: - wxDataViewModel *m_wx_model; - wxDataViewCtrlInternal *m_internal; -}; - -// --------------------------------------------------------- -// wxGtkDataViewListModelNotifier -// --------------------------------------------------------- - -wxGtkDataViewModelNotifier::wxGtkDataViewModelNotifier( - wxDataViewModel *wx_model, wxDataViewCtrlInternal *internal ) -{ - m_wx_model = wx_model; - m_internal = internal; -} - -wxGtkDataViewModelNotifier::~wxGtkDataViewModelNotifier() -{ - m_wx_model = NULL; - m_internal = NULL; -} - -bool wxGtkDataViewModelNotifier::ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item ) -{ - m_internal->ItemAdded( parent, item ); - GtkWxTreeModel *wxgtk_model = m_internal->GetGtkModel(); - - GtkTreeIter iter; - iter.stamp = wxgtk_model->stamp; - iter.user_data = item.GetID(); - - wxGtkTreePath path(wxgtk_tree_model_get_path( - GTK_TREE_MODEL(wxgtk_model), &iter )); - gtk_tree_model_row_inserted( - GTK_TREE_MODEL(wxgtk_model), path, &iter); - - return true; -} - -bool wxGtkDataViewModelNotifier::ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item ) -{ - GtkWxTreeModel *wxgtk_model = m_internal->GetGtkModel(); -#if 0 - // using _get_path for a deleted item cannot be - // a good idea - GtkTreeIter iter; - iter.stamp = wxgtk_model->stamp; - iter.user_data = (gpointer) item.GetID(); - wxGtkTreePath path(wxgtk_tree_model_get_path( - GTK_TREE_MODEL(wxgtk_model), &iter )); -#else - // so get the path from the parent - GtkTreeIter parentIter; - parentIter.stamp = wxgtk_model->stamp; - parentIter.user_data = (gpointer) parent.GetID(); - wxGtkTreePath parentPath(wxgtk_tree_model_get_path( - GTK_TREE_MODEL(wxgtk_model), &parentIter )); - - // and add the final index ourselves - wxGtkTreePath path(gtk_tree_path_copy(parentPath)); - int index = m_internal->GetIndexOf( parent, item ); - gtk_tree_path_append_index( path, index ); -#endif - - m_internal->ItemDeleted( parent, item ); - - gtk_tree_model_row_deleted( - GTK_TREE_MODEL(wxgtk_model), path ); - - // Did we remove the last child, causing 'parent' to become a leaf? - if ( !m_wx_model->IsContainer(parent) ) - { - gtk_tree_model_row_has_child_toggled - ( - GTK_TREE_MODEL(wxgtk_model), - parentPath, - &parentIter - ); - } - - return true; -} - -void wxGtkDataViewModelNotifier::Resort() -{ - m_internal->Resort(); -} - -bool wxGtkDataViewModelNotifier::ItemChanged( const wxDataViewItem &item ) -{ - GtkWxTreeModel *wxgtk_model = m_internal->GetGtkModel(); - - GtkTreeIter iter; - iter.stamp = wxgtk_model->stamp; - iter.user_data = (gpointer) item.GetID(); - - wxGtkTreePath path(wxgtk_tree_model_get_path( - GTK_TREE_MODEL(wxgtk_model), &iter )); - gtk_tree_model_row_changed( - GTK_TREE_MODEL(wxgtk_model), path, &iter ); - - m_internal->ItemChanged( item ); - - return true; -} - -bool wxGtkDataViewModelNotifier::ValueChanged( const wxDataViewItem &item, unsigned int model_column ) -{ - GtkWxTreeModel *wxgtk_model = m_internal->GetGtkModel(); - wxDataViewCtrl *ctrl = m_internal->GetOwner(); - - // This adds GTK+'s missing MVC logic for ValueChanged - unsigned int index; - for (index = 0; index < ctrl->GetColumnCount(); index++) - { - wxDataViewColumn *column = ctrl->GetColumn( index ); - if (column->GetModelColumn() == model_column) - { - GtkTreeView *widget = GTK_TREE_VIEW(ctrl->GtkGetTreeView()); - GtkTreeViewColumn *gcolumn = GTK_TREE_VIEW_COLUMN(column->GetGtkHandle()); - - // Don't attempt to refresh not yet realized tree, it is useless - // and results in GTK errors. - if ( gtk_widget_get_realized(ctrl->GtkGetTreeView()) ) - { - // Get cell area - GtkTreeIter iter; - iter.stamp = wxgtk_model->stamp; - iter.user_data = (gpointer) item.GetID(); - wxGtkTreePath path(wxgtk_tree_model_get_path( - GTK_TREE_MODEL(wxgtk_model), &iter )); - GdkRectangle cell_area; - gtk_tree_view_get_cell_area( widget, path, gcolumn, &cell_area ); - - // Don't try to redraw the column if it's invisible, this just - // results in "BUG" messages from pixman_region32_init_rect() - // and would be useful even if it didn't anyhow. - if ( cell_area.width > 0 && cell_area.height > 0 ) - { -#ifdef __WXGTK3__ - GtkAdjustment* hadjust = gtk_scrollable_get_hadjustment(GTK_SCROLLABLE(widget)); -#else - GtkAdjustment* hadjust = gtk_tree_view_get_hadjustment( widget ); -#endif - double d = gtk_adjustment_get_value( hadjust ); - int xdiff = (int) d; - - GtkAllocation a; - gtk_widget_get_allocation(GTK_WIDGET(gtk_tree_view_column_get_button(gcolumn)), &a); - int ydiff = a.height; - // Redraw - gtk_widget_queue_draw_area( GTK_WIDGET(widget), - cell_area.x - xdiff, ydiff + cell_area.y, cell_area.width, cell_area.height ); - } - } - - m_internal->ValueChanged( item, model_column ); - - return true; - } - } - - return false; -} - -bool wxGtkDataViewModelNotifier::BeforeReset() -{ - GtkWidget *treeview = m_internal->GetOwner()->GtkGetTreeView(); - gtk_tree_view_set_model( GTK_TREE_VIEW(treeview), NULL ); - - return true; -} - -bool wxGtkDataViewModelNotifier::AfterReset() -{ - GtkWidget *treeview = m_internal->GetOwner()->GtkGetTreeView(); - GtkWxTreeModel *wxgtk_model = m_internal->GetGtkModel(); - - m_internal->Cleared(); - - gtk_tree_view_set_model( GTK_TREE_VIEW(treeview), GTK_TREE_MODEL(wxgtk_model) ); - - return true; -} - -bool wxGtkDataViewModelNotifier::Cleared() -{ - GtkWxTreeModel *wxgtk_model = m_internal->GetGtkModel(); - - // There is no call to tell the model that everything - // has been deleted so call row_deleted() for every - // child of root... - - int count = m_internal->iter_n_children( NULL ); // number of children of root - - GtkTreePath *path = gtk_tree_path_new_first(); // points to root - - int i; - for (i = 0; i < count; i++) - gtk_tree_model_row_deleted( GTK_TREE_MODEL(wxgtk_model), path ); - - gtk_tree_path_free( path ); - - m_internal->Cleared(); - - return true; -} - -// --------------------------------------------------------- -// wxDataViewRenderer -// --------------------------------------------------------- - -static void -wxgtk_cell_editable_editing_done( GtkCellEditable *WXUNUSED(editable), - wxDataViewRenderer *wxrenderer ) -{ - wxrenderer->FinishEditing(); -} - -static void -wxgtk_renderer_editing_started( GtkCellRenderer *WXUNUSED(cell), GtkCellEditable *editable, - gchar *path, wxDataViewRenderer *wxrenderer ) -{ - if (!editable) - return; - - wxDataViewColumn *column = wxrenderer->GetOwner(); - wxDataViewCtrl *dv = column->GetOwner(); - wxDataViewItem item(dv->GTKPathToItem(wxGtkTreePath(path))); - wxrenderer->NotifyEditingStarted(item); - - if (GTK_IS_CELL_EDITABLE(editable)) - { - g_signal_connect (editable, "editing_done", - G_CALLBACK (wxgtk_cell_editable_editing_done), - (gpointer) wxrenderer ); - - } -} - - -wxIMPLEMENT_ABSTRACT_CLASS(wxDataViewRenderer, wxDataViewRendererBase); - -wxDataViewRenderer::wxDataViewRenderer( const wxString &varianttype, wxDataViewCellMode mode, - int align ) : - wxDataViewRendererBase( varianttype, mode, align ) -{ - m_renderer = NULL; - m_mode = mode; - - // we haven't changed them yet - m_usingDefaultAttrs = true; - - // NOTE: SetMode() and SetAlignment() needs to be called in the renderer's ctor, - // after the m_renderer pointer has been initialized -} - -bool wxDataViewRenderer::FinishEditing() -{ - wxWindow* editorCtrl = m_editorCtrl; - - bool ret = wxDataViewRendererBase::FinishEditing(); - - if (editorCtrl && wxGetTopLevelParent(editorCtrl)->IsBeingDeleted()) - { - // remove editor widget before editor control is deleted, - // to prevent several GTK warnings - gtk_cell_editable_remove_widget(GTK_CELL_EDITABLE(GtkGetEditorWidget())); - // delete editor control now, if it is deferred multiple erroneous - // focus-out events will occur, causing debug warnings - delete editorCtrl; - } - return ret; -} - -void wxDataViewRenderer::GtkPackIntoColumn(GtkTreeViewColumn *column) -{ - gtk_tree_view_column_pack_end( column, m_renderer, TRUE /* expand */); -} - -void wxDataViewRenderer::GtkInitHandlers() -{ - { - g_signal_connect (m_renderer, "editing_started", - G_CALLBACK (wxgtk_renderer_editing_started), - this); - } -} - -GtkWidget* wxDataViewRenderer::GtkGetEditorWidget() const -{ - return GetEditorCtrl()->m_widget; -} - -void wxDataViewRenderer::SetMode( wxDataViewCellMode mode ) -{ - m_mode = mode; - - GtkSetMode(mode); -} - -void wxDataViewRenderer::SetEnabled(bool enabled) -{ - // a) this sets the appearance to disabled grey and should only be done for - // the active cells which are disabled, not for the cells which can never - // be edited at all - if ( GetMode() != wxDATAVIEW_CELL_INERT ) - { - GValue gvalue = G_VALUE_INIT; - g_value_init( &gvalue, G_TYPE_BOOLEAN ); - g_value_set_boolean( &gvalue, enabled ); - g_object_set_property( G_OBJECT(m_renderer), "sensitive", &gvalue ); - g_value_unset( &gvalue ); - } - - // b) this actually disables the control/renderer - GtkSetMode(enabled ? GetMode() : wxDATAVIEW_CELL_INERT); -} - -void wxDataViewRenderer::GtkSetMode( wxDataViewCellMode mode ) -{ - GtkCellRendererMode gtkMode; - switch (mode) - { - case wxDATAVIEW_CELL_INERT: - gtkMode = GTK_CELL_RENDERER_MODE_INERT; - break; - - case wxDATAVIEW_CELL_ACTIVATABLE: - gtkMode = GTK_CELL_RENDERER_MODE_ACTIVATABLE; - break; - - case wxDATAVIEW_CELL_EDITABLE: - gtkMode = GTK_CELL_RENDERER_MODE_EDITABLE; - break; - - default: - wxFAIL_MSG( "unknown wxDataViewCellMode value" ); - return; - } - - GValue gvalue = G_VALUE_INIT; - g_value_init( &gvalue, gtk_cell_renderer_mode_get_type() ); - g_value_set_enum( &gvalue, gtkMode ); - g_object_set_property( G_OBJECT(m_renderer), "mode", &gvalue ); - g_value_unset( &gvalue ); -} - -wxDataViewCellMode wxDataViewRenderer::GetMode() const -{ - return m_mode; -} - -void wxDataViewRenderer::GtkApplyAlignment(GtkCellRenderer *renderer) -{ - int align = m_alignment; - - // query alignment from column ? - if (align == -1) - { - // None there yet - if (GetOwner() == NULL) - return; - - align = GetOwner()->GetAlignment(); - align |= wxALIGN_CENTRE_VERTICAL; - } - - // horizontal alignment: - - gfloat xalign = 0.0; - if (align & wxALIGN_RIGHT) - xalign = 1.0; - else if (align & wxALIGN_CENTER_HORIZONTAL) - xalign = 0.5; - - GValue gvalue = G_VALUE_INIT; - g_value_init( &gvalue, G_TYPE_FLOAT ); - g_value_set_float( &gvalue, xalign ); - g_object_set_property( G_OBJECT(renderer), "xalign", &gvalue ); - g_value_unset( &gvalue ); - - // vertical alignment: - - gfloat yalign = 0.0; - if (align & wxALIGN_BOTTOM) - yalign = 1.0; - else if (align & wxALIGN_CENTER_VERTICAL) - yalign = 0.5; - - GValue gvalue2 = G_VALUE_INIT; - g_value_init( &gvalue2, G_TYPE_FLOAT ); - g_value_set_float( &gvalue2, yalign ); - g_object_set_property( G_OBJECT(renderer), "yalign", &gvalue2 ); - g_value_unset( &gvalue2 ); -} - -void wxDataViewRenderer::SetAlignment( int align ) -{ - m_alignment = align; - GtkUpdateAlignment(); -} - -int wxDataViewRenderer::GetAlignment() const -{ - return m_alignment; -} - -void wxDataViewRenderer::EnableEllipsize(wxEllipsizeMode mode) -{ - GtkCellRendererText * const rend = GtkGetTextRenderer(); - if ( !rend ) - return; - - // we use the same values in wxEllipsizeMode as PangoEllipsizeMode so we - // can just cast between them - GValue gvalue = G_VALUE_INIT; - g_value_init( &gvalue, PANGO_TYPE_ELLIPSIZE_MODE ); - g_value_set_enum( &gvalue, static_cast(mode) ); - g_object_set_property( G_OBJECT(rend), "ellipsize", &gvalue ); - g_value_unset( &gvalue ); -} - -wxEllipsizeMode wxDataViewRenderer::GetEllipsizeMode() const -{ - GtkCellRendererText * const rend = GtkGetTextRenderer(); - if ( !rend ) - return wxELLIPSIZE_NONE; - - GValue gvalue = G_VALUE_INIT; - g_value_init( &gvalue, PANGO_TYPE_ELLIPSIZE_MODE ); - g_object_get_property( G_OBJECT(rend), "ellipsize", &gvalue ); - wxEllipsizeMode - mode = static_cast(g_value_get_enum( &gvalue )); - g_value_unset( &gvalue ); - - return mode; -} - -void -wxDataViewRenderer::GtkOnTextEdited(const char *itempath, const wxString& str) -{ - wxVariant value(str); - if (!Validate( value )) - return; - - wxDataViewItem - item(GetOwner()->GetOwner()->GTKPathToItem(wxGtkTreePath(itempath))); - - GtkOnCellChanged(value, item, GetOwner()->GetModelColumn()); -} - -void -wxDataViewRenderer::GtkOnCellChanged(const wxVariant& value, - const wxDataViewItem& item, - unsigned col) -{ - wxDataViewModel *model = GetOwner()->GetOwner()->GetModel(); - model->ChangeValue( value, item, col ); -} - -void wxDataViewRenderer::SetAttr(const wxDataViewItemAttr& WXUNUSED(attr)) -{ - // There is no way to apply attributes to an arbitrary renderer, so we - // simply can't do anything here. -} - -// --------------------------------------------------------- -// wxDataViewTextRenderer -// --------------------------------------------------------- - -extern "C" -{ - -static void wxGtkTextRendererEditedCallback( GtkCellRendererText *WXUNUSED(renderer), - gchar *arg1, gchar *arg2, gpointer user_data ) -{ - wxDataViewRenderer *cell = (wxDataViewRenderer*) user_data; - - cell->GtkOnTextEdited(arg1, wxGTK_CONV_BACK_FONT( - arg2, cell->GetOwner()->GetOwner()->GetFont())); -} - -} - -namespace -{ - -// helper function used by wxDataViewTextRenderer and -// wxDataViewCustomRenderer::RenderText(): it applies the attributes to the -// given text renderer -void GtkApplyAttr(GtkCellRendererText *renderer, const wxDataViewItemAttr& attr) -{ - if (attr.HasColour()) - { - const GdkColor * const gcol = attr.GetColour().GetColor(); - - GValue gvalue = G_VALUE_INIT; - g_value_init( &gvalue, GDK_TYPE_COLOR ); - g_value_set_boxed( &gvalue, gcol ); - g_object_set_property( G_OBJECT(renderer), "foreground_gdk", &gvalue ); - g_value_unset( &gvalue ); - } - else - { - GValue gvalue = G_VALUE_INIT; - g_value_init( &gvalue, G_TYPE_BOOLEAN ); - g_value_set_boolean( &gvalue, FALSE ); - g_object_set_property( G_OBJECT(renderer), "foreground-set", &gvalue ); - g_value_unset( &gvalue ); - } - - if (attr.GetItalic()) - { - GValue gvalue = G_VALUE_INIT; - g_value_init( &gvalue, PANGO_TYPE_STYLE ); - g_value_set_enum( &gvalue, PANGO_STYLE_ITALIC ); - g_object_set_property( G_OBJECT(renderer), "style", &gvalue ); - g_value_unset( &gvalue ); - } - else - { - GValue gvalue = G_VALUE_INIT; - g_value_init( &gvalue, G_TYPE_BOOLEAN ); - g_value_set_boolean( &gvalue, FALSE ); - g_object_set_property( G_OBJECT(renderer), "style-set", &gvalue ); - g_value_unset( &gvalue ); - } - - - if (attr.GetBold()) - { - GValue gvalue = G_VALUE_INIT; - g_value_init( &gvalue, PANGO_TYPE_WEIGHT ); - g_value_set_enum( &gvalue, PANGO_WEIGHT_BOLD ); - g_object_set_property( G_OBJECT(renderer), "weight", &gvalue ); - g_value_unset( &gvalue ); - } - else - { - GValue gvalue = G_VALUE_INIT; - g_value_init( &gvalue, G_TYPE_BOOLEAN ); - g_value_set_boolean( &gvalue, FALSE ); - g_object_set_property( G_OBJECT(renderer), "weight-set", &gvalue ); - g_value_unset( &gvalue ); - } - -#if 0 - if (attr.HasBackgroundColour()) - { - wxColour colour = attr.GetBackgroundColour(); - const GdkColor * const gcol = colour.GetColor(); - - GValue gvalue = G_VALUE_INIT; - g_value_init( &gvalue, GDK_TYPE_COLOR ); - g_value_set_boxed( &gvalue, gcol ); - g_object_set_property( G_OBJECT(renderer), "cell-background_gdk", &gvalue ); - g_value_unset( &gvalue ); - } - else - { - GValue gvalue = G_VALUE_INIT; - g_value_init( &gvalue, G_TYPE_BOOLEAN ); - g_value_set_boolean( &gvalue, FALSE ); - g_object_set_property( G_OBJECT(renderer), "cell-background-set", &gvalue ); - g_value_unset( &gvalue ); - } -#endif -} - -} // anonymous namespace - -wxIMPLEMENT_CLASS(wxDataViewTextRenderer, wxDataViewRenderer); - -wxDataViewTextRenderer::wxDataViewTextRenderer( const wxString &varianttype, wxDataViewCellMode mode, - int align ) : - wxDataViewRenderer( varianttype, mode, align ) -{ - GtkWxCellRendererText *text_renderer = gtk_wx_cell_renderer_text_new(); - text_renderer->wx_renderer = this; - m_renderer = (GtkCellRenderer*) text_renderer; - - if (mode & wxDATAVIEW_CELL_EDITABLE) - { - GValue gvalue = G_VALUE_INIT; - g_value_init( &gvalue, G_TYPE_BOOLEAN ); - g_value_set_boolean( &gvalue, true ); - g_object_set_property( G_OBJECT(m_renderer), "editable", &gvalue ); - g_value_unset( &gvalue ); - - g_signal_connect_after( m_renderer, "edited", G_CALLBACK(wxGtkTextRendererEditedCallback), this ); - - GtkInitHandlers(); - } - - SetMode(mode); - SetAlignment(align); -} - -bool wxDataViewTextRenderer::SetTextValue(const wxString& str) -{ - GValue gvalue = G_VALUE_INIT; - g_value_init( &gvalue, G_TYPE_STRING ); - g_value_set_string( &gvalue, wxGTK_CONV_FONT( str, GetOwner()->GetOwner()->GetFont() ) ); - g_object_set_property( G_OBJECT(m_renderer), "text", &gvalue ); - g_value_unset( &gvalue ); - - return true; -} - -bool wxDataViewTextRenderer::GetTextValue(wxString& str) const -{ - GValue gvalue = G_VALUE_INIT; - g_value_init( &gvalue, G_TYPE_STRING ); - g_object_get_property( G_OBJECT(m_renderer), "text", &gvalue ); - str = wxGTK_CONV_BACK_FONT( g_value_get_string( &gvalue ), const_cast(this)->GetOwner()->GetOwner()->GetFont() ); - g_value_unset( &gvalue ); - - return true; -} - -void wxDataViewTextRenderer::SetAlignment( int align ) -{ - wxDataViewRenderer::SetAlignment(align); - -#ifndef __WXGTK3__ - if (gtk_check_version(2,10,0)) - return; -#endif - - // horizontal alignment: - PangoAlignment pangoAlign = PANGO_ALIGN_LEFT; - if (align & wxALIGN_RIGHT) - pangoAlign = PANGO_ALIGN_RIGHT; - else if (align & wxALIGN_CENTER_HORIZONTAL) - pangoAlign = PANGO_ALIGN_CENTER; - - GValue gvalue = G_VALUE_INIT; - g_value_init( &gvalue, gtk_cell_renderer_mode_get_type() ); - g_value_set_enum( &gvalue, pangoAlign ); - g_object_set_property( G_OBJECT(m_renderer), "alignment", &gvalue ); - g_value_unset( &gvalue ); -} - -void wxDataViewTextRenderer::SetAttr(const wxDataViewItemAttr& attr) -{ - // An optimization: don't bother resetting the attributes if we're already - // using the defaults. - if ( attr.IsDefault() && m_usingDefaultAttrs ) - return; - - GtkApplyAttr(GtkGetTextRenderer(), attr); - - m_usingDefaultAttrs = attr.IsDefault(); -} - -GtkCellRendererText *wxDataViewTextRenderer::GtkGetTextRenderer() const -{ - return GTK_CELL_RENDERER_TEXT(m_renderer); -} - -// --------------------------------------------------------- -// wxDataViewBitmapRenderer -// --------------------------------------------------------- - -namespace -{ - -// set "pixbuf" property on the given renderer -void SetPixbufProp(GtkCellRenderer *renderer, GdkPixbuf *pixbuf) -{ - GValue gvalue = G_VALUE_INIT; - g_value_init( &gvalue, G_TYPE_OBJECT ); - g_value_set_object( &gvalue, pixbuf ); - g_object_set_property( G_OBJECT(renderer), "pixbuf", &gvalue ); - g_value_unset( &gvalue ); -} - -} // anonymous namespace - -wxIMPLEMENT_CLASS(wxDataViewBitmapRenderer, wxDataViewRenderer); - -wxDataViewBitmapRenderer::wxDataViewBitmapRenderer( const wxString &varianttype, wxDataViewCellMode mode, - int align ) : - wxDataViewRenderer( varianttype, mode, align ) -{ - m_renderer = gtk_cell_renderer_pixbuf_new(); - - SetMode(mode); - SetAlignment(align); -} - -bool wxDataViewBitmapRenderer::SetValue( const wxVariant &value ) -{ - if (value.GetType() == wxT("wxBitmap")) - { - wxBitmap bitmap; - bitmap << value; - - // GetPixbuf() may create a Pixbuf representation in the wxBitmap - // object (and it will stay there and remain owned by wxBitmap) - SetPixbufProp(m_renderer, bitmap.GetPixbuf()); - } - else if (value.GetType() == wxT("wxIcon")) - { - wxIcon icon; - icon << value; - - SetPixbufProp(m_renderer, icon.GetPixbuf()); - } - else - { - return false; - } - - return true; -} - -bool wxDataViewBitmapRenderer::GetValue( wxVariant &WXUNUSED(value) ) const -{ - return false; -} - -// --------------------------------------------------------- -// wxDataViewToggleRenderer -// --------------------------------------------------------- - -extern "C" { -static void wxGtkToggleRendererToggledCallback( GtkCellRendererToggle *renderer, - gchar *path, gpointer user_data ); -} - -static void wxGtkToggleRendererToggledCallback( GtkCellRendererToggle *renderer, - gchar *path, gpointer user_data ) -{ - wxDataViewToggleRenderer *cell = (wxDataViewToggleRenderer*) user_data; - - // get old value - GValue gvalue = G_VALUE_INIT; - g_value_init( &gvalue, G_TYPE_BOOLEAN ); - g_object_get_property( G_OBJECT(renderer), "active", &gvalue ); - // invert it - wxVariant value = !g_value_get_boolean( &gvalue ); - g_value_unset( &gvalue ); - - if (!cell->Validate( value )) - return; - - wxDataViewCtrl * const ctrl = cell->GetOwner()->GetOwner(); - wxDataViewModel *model = ctrl->GetModel(); - - wxDataViewItem item(ctrl->GTKPathToItem(wxGtkTreePath(path))); - - unsigned int model_col = cell->GetOwner()->GetModelColumn(); - - model->ChangeValue( value, item, model_col ); -} - -wxIMPLEMENT_CLASS(wxDataViewToggleRenderer, wxDataViewRenderer); - -wxDataViewToggleRenderer::wxDataViewToggleRenderer( const wxString &varianttype, - wxDataViewCellMode mode, int align ) : - wxDataViewRenderer( varianttype, mode, align ) -{ - m_renderer = (GtkCellRenderer*) gtk_cell_renderer_toggle_new(); - - if (mode & wxDATAVIEW_CELL_ACTIVATABLE) - { - g_signal_connect_after( m_renderer, "toggled", - G_CALLBACK(wxGtkToggleRendererToggledCallback), this ); - } - else - { - GValue gvalue = G_VALUE_INIT; - g_value_init( &gvalue, G_TYPE_BOOLEAN ); - g_value_set_boolean( &gvalue, false ); - g_object_set_property( G_OBJECT(m_renderer), "activatable", &gvalue ); - g_value_unset( &gvalue ); - } - - SetMode(mode); - SetAlignment(align); -} - -bool wxDataViewToggleRenderer::SetValue( const wxVariant &value ) -{ - bool tmp = value; - - GValue gvalue = G_VALUE_INIT; - g_value_init( &gvalue, G_TYPE_BOOLEAN ); - g_value_set_boolean( &gvalue, tmp ); - g_object_set_property( G_OBJECT(m_renderer), "active", &gvalue ); - g_value_unset( &gvalue ); - - return true; -} - -bool wxDataViewToggleRenderer::GetValue( wxVariant &value ) const -{ - GValue gvalue = G_VALUE_INIT; - g_value_init( &gvalue, G_TYPE_BOOLEAN ); - g_object_get_property( G_OBJECT(m_renderer), "active", &gvalue ); - value = g_value_get_boolean( &gvalue ) != 0; - g_value_unset( &gvalue ); - - return true; -} - -// --------------------------------------------------------- -// wxDataViewCustomRenderer -// --------------------------------------------------------- - -#ifndef __WXGTK3__ -class wxDataViewCtrlDCImpl: public wxWindowDCImpl -{ -public: - wxDataViewCtrlDCImpl( wxDC *owner, wxDataViewCtrl *window ) : - wxWindowDCImpl( owner ) - { - GtkWidget *widget = window->m_treeview; - // Set later - m_gdkwindow = NULL; - - m_window = window; - - m_context = window->GTKGetPangoDefaultContext(); - m_layout = pango_layout_new( m_context ); - m_fontdesc = pango_font_description_copy(gtk_widget_get_style(widget)->font_desc); - - m_cmap = gtk_widget_get_colormap( widget ? widget : window->m_widget ); - - // Set m_gdkwindow later - // SetUpDC(); - } -}; - -class wxDataViewCtrlDC: public wxWindowDC -{ -public: - wxDataViewCtrlDC( wxDataViewCtrl *window ) : - wxWindowDC( new wxDataViewCtrlDCImpl( this, window ) ) - { } -}; -#endif - -// --------------------------------------------------------- -// wxDataViewCustomRenderer -// --------------------------------------------------------- - -wxIMPLEMENT_CLASS(wxDataViewCustomRenderer, wxDataViewRenderer); - -wxDataViewCustomRenderer::wxDataViewCustomRenderer( const wxString &varianttype, - wxDataViewCellMode mode, - int align, - bool no_init ) - : wxDataViewCustomRendererBase( varianttype, mode, align ) -{ - m_dc = NULL; - m_text_renderer = NULL; - m_renderParams = NULL; - - if (no_init) - m_renderer = NULL; - else - Init(mode, align); -} - -void wxDataViewCustomRenderer::GtkInitTextRenderer() -{ - m_text_renderer = GTK_CELL_RENDERER_TEXT(gtk_cell_renderer_text_new()); - g_object_ref_sink(m_text_renderer); - - GtkApplyAlignment(GTK_CELL_RENDERER(m_text_renderer)); - gtk_cell_renderer_set_padding(GTK_CELL_RENDERER(m_text_renderer), 0, 0); -} - -GtkCellRendererText *wxDataViewCustomRenderer::GtkGetTextRenderer() const -{ - if ( !m_text_renderer ) - { - // we create it on demand so need to do it even from a const function - const_cast(this)->GtkInitTextRenderer(); - } - - return m_text_renderer; -} - -GtkWidget* wxDataViewCustomRenderer::GtkGetEditorWidget() const -{ - return GTK_WX_CELL_RENDERER(m_renderer)->editor_bin; -} - -void wxDataViewCustomRenderer::RenderText( const wxString &text, - int xoffset, - wxRect cell, - wxDC *WXUNUSED(dc), - int WXUNUSED(state) ) -{ - - GtkCellRendererText * const textRenderer = GtkGetTextRenderer(); - - GValue gvalue = G_VALUE_INIT; - g_value_init( &gvalue, G_TYPE_STRING ); - g_value_set_string( &gvalue, wxGTK_CONV_FONT( text, GetOwner()->GetOwner()->GetFont() ) ); - g_object_set_property( G_OBJECT(textRenderer), "text", &gvalue ); - g_value_unset( &gvalue ); - - GtkApplyAttr(textRenderer, GetAttr()); - - GdkRectangle cell_area; - wxRectToGDKRect(cell, cell_area); - cell_area.x += xoffset; - cell_area.width -= xoffset; - - gtk_cell_renderer_render( GTK_CELL_RENDERER(textRenderer), -#ifdef __WXGTK3__ - m_renderParams->cr, -#else - m_renderParams->window, -#endif - m_renderParams->widget, - m_renderParams->background_area, - &cell_area, -#ifndef __WXGTK3__ - m_renderParams->expose_area, -#endif - GtkCellRendererState(m_renderParams->flags)); -} - -bool wxDataViewCustomRenderer::Init(wxDataViewCellMode mode, int align) -{ - GtkWxCellRenderer *renderer = (GtkWxCellRenderer *) gtk_wx_cell_renderer_new(); - renderer->cell = this; - - m_renderer = (GtkCellRenderer*) renderer; - - SetMode(mode); - SetAlignment(align); - - GtkInitHandlers(); - - return true; -} - -wxDataViewCustomRenderer::~wxDataViewCustomRenderer() -{ - if (m_dc) - delete m_dc; - - if (m_text_renderer) - g_object_unref(m_text_renderer); -} - -wxDC *wxDataViewCustomRenderer::GetDC() -{ - if (m_dc == NULL) - { - wxDataViewCtrl* ctrl = NULL; - wxDataViewColumn* column = GetOwner(); - if (column) - ctrl = column->GetOwner(); -#ifdef __WXGTK3__ - wxASSERT(m_renderParams); - cairo_t* cr = m_renderParams->cr; - wxASSERT(cr && cairo_status(cr) == 0); - m_dc = new wxGTKCairoDC(cr, ctrl); -#else - if (ctrl == NULL) - return NULL; - m_dc = new wxDataViewCtrlDC(ctrl); -#endif - } - - return m_dc; -} - -// --------------------------------------------------------- -// wxDataViewProgressRenderer -// --------------------------------------------------------- - -wxIMPLEMENT_CLASS(wxDataViewProgressRenderer, wxDataViewCustomRenderer); - -wxDataViewProgressRenderer::wxDataViewProgressRenderer( const wxString &label, - const wxString &varianttype, wxDataViewCellMode mode, int align ) : - wxDataViewCustomRenderer( varianttype, mode, align, true ) -{ - m_label = label; - m_value = 0; - m_renderer = (GtkCellRenderer*) gtk_cell_renderer_progress_new(); - - SetMode(mode); - SetAlignment(align); - -#if !wxUSE_UNICODE - // We can't initialize the renderer just yet because we don't have the - // pointer to the column that uses this renderer yet and so attempt to - // dereference GetOwner() to get the font that is used as a source of - // encoding in multibyte-to-Unicode conversion in GTKSetLabel() in - // non-Unicode builds would crash. So simply remember to do it later. - if ( !m_label.empty() ) - m_needsToSetLabel = true; - else -#endif // !wxUSE_UNICODE - { - GTKSetLabel(); - } -} - -wxDataViewProgressRenderer::~wxDataViewProgressRenderer() -{ -} - -void wxDataViewProgressRenderer::GTKSetLabel() -{ - GValue gvalue = G_VALUE_INIT; - g_value_init( &gvalue, G_TYPE_STRING ); - - // Take care to not use GetOwner() here if the label is empty, we can be - // called from ctor when GetOwner() is still NULL in this case. - wxScopedCharBuffer buf; - if ( m_label.empty() ) - buf = wxScopedCharBuffer::CreateNonOwned(""); - else - buf = wxGTK_CONV_FONT(m_label, GetOwner()->GetOwner()->GetFont()); - - g_value_set_string( &gvalue, buf); - g_object_set_property( G_OBJECT(m_renderer), "text", &gvalue ); - g_value_unset( &gvalue ); - -#if !wxUSE_UNICODE - m_needsToSetLabel = false; -#endif // !wxUSE_UNICODE -} - -bool wxDataViewProgressRenderer::SetValue( const wxVariant &value ) -{ -#if !wxUSE_UNICODE - if ( m_needsToSetLabel ) - GTKSetLabel(); -#endif // !wxUSE_UNICODE - - gint tmp = (long) value; - GValue gvalue = G_VALUE_INIT; - g_value_init( &gvalue, G_TYPE_INT ); - g_value_set_int( &gvalue, tmp ); - g_object_set_property( G_OBJECT(m_renderer), "value", &gvalue ); - g_value_unset( &gvalue ); - - return true; -} - -bool wxDataViewProgressRenderer::GetValue( wxVariant &WXUNUSED(value) ) const -{ - return false; -} - -bool wxDataViewProgressRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) ) -{ - double pct = (double)m_value / 100.0; - wxRect bar = cell; - bar.width = (int)(cell.width * pct); - dc->SetPen( *wxTRANSPARENT_PEN ); - dc->SetBrush( *wxBLUE_BRUSH ); - dc->DrawRectangle( bar ); - - dc->SetBrush( *wxTRANSPARENT_BRUSH ); - dc->SetPen( *wxBLACK_PEN ); - dc->DrawRectangle( cell ); - - return true; -} - -wxSize wxDataViewProgressRenderer::GetSize() const -{ - return wxSize(40,12); -} - -// ------------------------------------- -// wxDataViewChoiceRenderer -// ------------------------------------- - -wxDataViewChoiceRenderer::wxDataViewChoiceRenderer( const wxArrayString &choices, - wxDataViewCellMode mode, int alignment ) : - wxDataViewCustomRenderer( "string", mode, alignment, true ) -{ - m_choices = choices; - m_renderer = (GtkCellRenderer*) gtk_cell_renderer_combo_new(); - GtkListStore *store = gtk_list_store_new( 1, G_TYPE_STRING ); - for (size_t n = 0; n < m_choices.GetCount(); n++) - { - gtk_list_store_insert_with_values( - store, NULL, n, 0, - static_cast(m_choices[n].utf8_str()), -1 ); - } - - g_object_set (m_renderer, - "model", store, - "text-column", 0, - "has-entry", FALSE, - NULL); - - bool editable = (mode & wxDATAVIEW_CELL_EDITABLE) != 0; - g_object_set (m_renderer, "editable", editable, NULL); - - SetAlignment(alignment); - - g_signal_connect_after( m_renderer, "edited", G_CALLBACK(wxGtkTextRendererEditedCallback), this ); - - GtkInitHandlers(); -} - -bool wxDataViewChoiceRenderer::Render( wxRect rect, wxDC *dc, int state ) -{ - RenderText( m_data, 0, rect, dc, state ); - return true; -} - -wxSize wxDataViewChoiceRenderer::GetSize() const -{ - return wxSize(70,20); -} - -bool wxDataViewChoiceRenderer::SetValue( const wxVariant &value ) -{ - GValue gvalue = G_VALUE_INIT; - g_value_init( &gvalue, G_TYPE_STRING ); - g_value_set_string(&gvalue, - wxGTK_CONV_FONT(value.GetString(), - GetOwner()->GetOwner()->GetFont())); - g_object_set_property( G_OBJECT(m_renderer), "text", &gvalue ); - g_value_unset( &gvalue ); - - return true; -} - -bool wxDataViewChoiceRenderer::GetValue( wxVariant &value ) const -{ - GValue gvalue = G_VALUE_INIT; - g_value_init( &gvalue, G_TYPE_STRING ); - g_object_get_property( G_OBJECT(m_renderer), "text", &gvalue ); - wxString temp = wxGTK_CONV_BACK_FONT(g_value_get_string(&gvalue), - GetOwner()->GetOwner()->GetFont()); - g_value_unset( &gvalue ); - value = temp; - - return true; -} - -void wxDataViewChoiceRenderer::SetAlignment( int align ) -{ - wxDataViewCustomRenderer::SetAlignment(align); - -#ifndef __WXGTK3__ - if (gtk_check_version(2,10,0)) - return; -#endif - - // horizontal alignment: - PangoAlignment pangoAlign = PANGO_ALIGN_LEFT; - if (align & wxALIGN_RIGHT) - pangoAlign = PANGO_ALIGN_RIGHT; - else if (align & wxALIGN_CENTER_HORIZONTAL) - pangoAlign = PANGO_ALIGN_CENTER; - - GValue gvalue = G_VALUE_INIT; - g_value_init( &gvalue, gtk_cell_renderer_mode_get_type() ); - g_value_set_enum( &gvalue, pangoAlign ); - g_object_set_property( G_OBJECT(m_renderer), "alignment", &gvalue ); - g_value_unset( &gvalue ); -} - -// ---------------------------------------------------------------------------- -// wxDataViewChoiceByIndexRenderer -// ---------------------------------------------------------------------------- - -wxDataViewChoiceByIndexRenderer::wxDataViewChoiceByIndexRenderer( const wxArrayString &choices, - wxDataViewCellMode mode, int alignment ) : - wxDataViewChoiceRenderer( choices, mode, alignment ) -{ - m_variantType = wxS("long"); -} - -void wxDataViewChoiceByIndexRenderer::GtkOnTextEdited(const char *itempath, const wxString& str) -{ - wxVariant value( (long) GetChoices().Index( str ) ); - - if (!Validate( value )) - return; - - wxDataViewItem - item(GetOwner()->GetOwner()->GTKPathToItem(wxGtkTreePath(itempath))); - - GtkOnCellChanged(value, item, GetOwner()->GetModelColumn()); -} - -bool wxDataViewChoiceByIndexRenderer::SetValue( const wxVariant &value ) -{ - wxVariant string_value = GetChoice( value.GetLong() ); - return wxDataViewChoiceRenderer::SetValue( string_value ); -} - -bool wxDataViewChoiceByIndexRenderer::GetValue( wxVariant &value ) const -{ - wxVariant string_value; - if (!wxDataViewChoiceRenderer::GetValue( string_value )) - return false; - - value = (long) GetChoices().Index( string_value.GetString() ); - return true; -} - -// --------------------------------------------------------- -// wxDataViewIconTextRenderer -// --------------------------------------------------------- - -wxIMPLEMENT_CLASS(wxDataViewIconTextRenderer, wxDataViewCustomRenderer); - -wxDataViewIconTextRenderer::wxDataViewIconTextRenderer - ( - const wxString &varianttype, - wxDataViewCellMode mode, - int align - ) - : wxDataViewTextRenderer(varianttype, mode, align) -{ - m_rendererIcon = gtk_cell_renderer_pixbuf_new(); -} - -wxDataViewIconTextRenderer::~wxDataViewIconTextRenderer() -{ -} - -void wxDataViewIconTextRenderer::GtkPackIntoColumn(GtkTreeViewColumn *column) -{ - // add the icon renderer first - gtk_tree_view_column_pack_start(column, m_rendererIcon, FALSE /* !expand */); - - // add the text renderer too - wxDataViewRenderer::GtkPackIntoColumn(column); -} - -bool wxDataViewIconTextRenderer::SetValue( const wxVariant &value ) -{ - m_value << value; - - SetTextValue(m_value.GetText()); - - const wxIcon& icon = m_value.GetIcon(); - SetPixbufProp(m_rendererIcon, icon.IsOk() ? icon.GetPixbuf() : NULL); - - return true; -} - -bool wxDataViewIconTextRenderer::GetValue(wxVariant& value) const -{ - wxString str; - if ( !GetTextValue(str) ) - return false; - - // user doesn't have any way to edit the icon so leave it unchanged - value << wxDataViewIconText(str, m_value.GetIcon()); - - return true; -} - -void -wxDataViewIconTextRenderer::GtkOnCellChanged(const wxVariant& value, - const wxDataViewItem& item, - unsigned col) -{ - // we receive just the text part of our value as it's the only one which - // can be edited, but we need the full wxDataViewIconText value for the - // model - wxVariant valueIconText; - valueIconText << wxDataViewIconText(value.GetString(), m_value.GetIcon()); - wxDataViewTextRenderer::GtkOnCellChanged(valueIconText, item, col); -} - -// --------------------------------------------------------- -// wxDataViewColumn -// --------------------------------------------------------- - - -static gboolean -gtk_dataview_header_button_press_callback( GtkWidget *WXUNUSED(widget), - GdkEventButton *gdk_event, - wxDataViewColumn *column ) -{ - if (gdk_event->type != GDK_BUTTON_PRESS) - return FALSE; - - if (gdk_event->button == 1) - { - gs_lastLeftClickHeader = column; - - wxDataViewCtrl *dv = column->GetOwner(); - wxDataViewEvent event( wxEVT_DATAVIEW_COLUMN_HEADER_CLICK, dv->GetId() ); - event.SetDataViewColumn( column ); - event.SetModel( dv->GetModel() ); - if (dv->HandleWindowEvent( event )) - return FALSE; - } - - if (gdk_event->button == 3) - { - wxDataViewCtrl *dv = column->GetOwner(); - wxDataViewEvent event( wxEVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK, dv->GetId() ); - event.SetDataViewColumn( column ); - event.SetModel( dv->GetModel() ); - if (dv->HandleWindowEvent( event )) - return FALSE; - } - - return FALSE; -} - -extern "C" -{ - -static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *WXUNUSED(column), - GtkCellRenderer *renderer, - GtkTreeModel *model, - GtkTreeIter *iter, - gpointer data ) -{ - g_return_if_fail (GTK_IS_WX_TREE_MODEL (model)); - GtkWxTreeModel *tree_model = (GtkWxTreeModel *) model; - - wxDataViewRenderer *cell = (wxDataViewRenderer*) data; - - wxDataViewItem item( (void*) iter->user_data ); - const unsigned column = cell->GetOwner()->GetModelColumn(); - - wxDataViewModel *wx_model = tree_model->internal->GetDataViewModel(); - - if (!wx_model->IsVirtualListModel()) - { - gboolean visible; - if (wx_model->IsContainer( item )) - { - visible = wx_model->HasContainerColumns( item ) || (column == 0); - } - else - { - visible = true; - } - - GValue gvalue = G_VALUE_INIT; - g_value_init( &gvalue, G_TYPE_BOOLEAN ); - g_value_set_boolean( &gvalue, visible ); - g_object_set_property( G_OBJECT(renderer), "visible", &gvalue ); - g_value_unset( &gvalue ); - - if ( !visible ) - return; - } - - cell->PrepareForItem(wx_model, item, column); -} - -} // extern "C" - -#include -WX_DEFINE_LIST(wxDataViewColumnList) - -wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewRenderer *cell, - unsigned int model_column, int width, - wxAlignment align, int flags ) - : wxDataViewColumnBase( cell, model_column ) -{ - Init( align, flags, width ); - - SetTitle( title ); -} - -wxDataViewColumn::wxDataViewColumn( const wxBitmap &bitmap, wxDataViewRenderer *cell, - unsigned int model_column, int width, - wxAlignment align, int flags ) - : wxDataViewColumnBase( bitmap, cell, model_column ) -{ - Init( align, flags, width ); - - SetBitmap( bitmap ); -} - -void wxDataViewColumn::Init(wxAlignment align, int flags, int width) -{ - m_isConnected = false; - - GtkTreeViewColumn *column = gtk_tree_view_column_new(); - m_column = (GtkWidget*) column; - - SetFlags( flags ); - SetAlignment( align ); - - SetWidth( width ); - - // Create container for icon and label - GtkWidget* box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 1); - gtk_widget_show( box ); - // gtk_container_set_border_width((GtkContainer*)box, 2); - m_image = gtk_image_new(); - gtk_box_pack_start(GTK_BOX(box), m_image, FALSE, FALSE, 1); - m_label = gtk_label_new(""); - gtk_box_pack_end( GTK_BOX(box), GTK_WIDGET(m_label), FALSE, FALSE, 1 ); - gtk_tree_view_column_set_widget( column, box ); - - wxDataViewRenderer * const colRenderer = GetRenderer(); - GtkCellRenderer * const cellRenderer = colRenderer->GetGtkHandle(); - - colRenderer->GtkPackIntoColumn(column); - - gtk_tree_view_column_set_cell_data_func( column, cellRenderer, - wxGtkTreeCellDataFunc, (gpointer) colRenderer, NULL ); -} - -void wxDataViewColumn::OnInternalIdle() -{ - if (m_isConnected) - return; - - if (gtk_widget_get_realized(GetOwner()->m_treeview)) - { - GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column); - GtkWidget* button = gtk_tree_view_column_get_button(column); - if (button) - { - g_signal_connect(button, "button_press_event", - G_CALLBACK (gtk_dataview_header_button_press_callback), this); - - // otherwise the event will be blocked by GTK+ - gtk_tree_view_column_set_clickable( column, TRUE ); - - m_isConnected = true; - } - } -} - -void wxDataViewColumn::SetOwner( wxDataViewCtrl *owner ) -{ - wxDataViewColumnBase::SetOwner( owner ); - - GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column); - - gtk_tree_view_column_set_title( column, wxGTK_CONV_FONT(GetTitle(), GetOwner()->GetFont() ) ); -} - -void wxDataViewColumn::SetTitle( const wxString &title ) -{ - wxDataViewCtrl *ctrl = GetOwner(); - gtk_label_set_text( GTK_LABEL(m_label), ctrl ? wxGTK_CONV_FONT(title, ctrl->GetFont()) - : wxGTK_CONV_SYS(title) ); - if (title.empty()) - gtk_widget_hide( m_label ); - else - gtk_widget_show( m_label ); -} - -wxString wxDataViewColumn::GetTitle() const -{ - return wxGTK_CONV_BACK_FONT( - gtk_label_get_text( GTK_LABEL(m_label) ), - GetOwner()->GetFont() - ); -} - -void wxDataViewColumn::SetBitmap( const wxBitmap &bitmap ) -{ - wxDataViewColumnBase::SetBitmap( bitmap ); - - if (bitmap.IsOk()) - { - GtkImage *gtk_image = GTK_IMAGE(m_image); - - gtk_image_set_from_pixbuf(GTK_IMAGE(gtk_image), bitmap.GetPixbuf()); - gtk_widget_show( m_image ); - } - else - { - gtk_widget_hide( m_image ); - } -} - -void wxDataViewColumn::SetHidden( bool hidden ) -{ - gtk_tree_view_column_set_visible( GTK_TREE_VIEW_COLUMN(m_column), !hidden ); -} - -void wxDataViewColumn::SetResizeable( bool resizable ) -{ - gtk_tree_view_column_set_resizable( GTK_TREE_VIEW_COLUMN(m_column), resizable ); -} - -void wxDataViewColumn::SetAlignment( wxAlignment align ) -{ - GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column); - - gfloat xalign = 0.0; - if (align == wxALIGN_RIGHT) - xalign = 1.0; - if (align == wxALIGN_CENTER_HORIZONTAL || - align == wxALIGN_CENTER) - xalign = 0.5; - - gtk_tree_view_column_set_alignment( column, xalign ); - - if (m_renderer && m_renderer->GetAlignment() == -1) - m_renderer->GtkUpdateAlignment(); -} - -wxAlignment wxDataViewColumn::GetAlignment() const -{ - gfloat xalign = gtk_tree_view_column_get_alignment( GTK_TREE_VIEW_COLUMN(m_column) ); - - if (xalign == 1.0) - return wxALIGN_RIGHT; - if (xalign == 0.5) - return wxALIGN_CENTER_HORIZONTAL; - - return wxALIGN_LEFT; -} - -void wxDataViewColumn::SetSortable( bool sortable ) -{ - GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column); - - if ( sortable ) - { - gtk_tree_view_column_set_sort_column_id( column, GetModelColumn() ); - } - else - { - gtk_tree_view_column_set_sort_column_id( column, -1 ); - gtk_tree_view_column_set_sort_indicator( column, FALSE ); - gtk_tree_view_column_set_clickable( column, FALSE ); - } -} - -bool wxDataViewColumn::IsSortable() const -{ - GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column); - return gtk_tree_view_column_get_clickable( column ) != 0; -} - -bool wxDataViewColumn::IsSortKey() const -{ - GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column); - return gtk_tree_view_column_get_sort_indicator( column ) != 0; -} - -bool wxDataViewColumn::IsResizeable() const -{ - GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column); - return gtk_tree_view_column_get_resizable( column ) != 0; -} - -bool wxDataViewColumn::IsHidden() const -{ - GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column); - return !gtk_tree_view_column_get_visible( column ); -} - -void wxDataViewColumn::SetSortOrder( bool ascending ) -{ - GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column); - - GtkSortType order = GTK_SORT_DESCENDING; - if (ascending) - order = GTK_SORT_ASCENDING; - - gtk_tree_view_column_set_sort_order(column, order); - gtk_tree_view_column_set_sort_indicator( column, TRUE ); - - wxDataViewCtrlInternal* internal = m_owner->GtkGetInternal(); - internal->SetSortOrder(order); - internal->SetSortColumn(m_model_column); - internal->SetDataViewSortColumn(this); -} - -bool wxDataViewColumn::IsSortOrderAscending() const -{ - GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column); - - return (gtk_tree_view_column_get_sort_order( column ) != GTK_SORT_DESCENDING); -} - -void wxDataViewColumn::SetMinWidth( int width ) -{ - gtk_tree_view_column_set_min_width( GTK_TREE_VIEW_COLUMN(m_column), width ); -} - -int wxDataViewColumn::GetMinWidth() const -{ - return gtk_tree_view_column_get_min_width( GTK_TREE_VIEW_COLUMN(m_column) ); -} - -int wxDataViewColumn::GetWidth() const -{ - return gtk_tree_view_column_get_width( GTK_TREE_VIEW_COLUMN(m_column) ); -} - -void wxDataViewColumn::SetWidth( int width ) -{ - // Notice that we don't have anything to do for wxCOL_WIDTH_DEFAULT and - // wxCOL_WIDTH_AUTOSIZE as the native control tries to use the appropriate - // width by default anyhow, don't use GTK_TREE_VIEW_COLUMN_AUTOSIZE to - // force it because, as mentioned in GTK+ documentation, it's completely - // inappropriate for controls with a lot of items (because it's O(N)) and - // it would also prevent the user from resizing the column manually which - // we want to allow for resizeable columns. - if ( width >= 0 ) - { - gtk_tree_view_column_set_sizing( GTK_TREE_VIEW_COLUMN(m_column), GTK_TREE_VIEW_COLUMN_FIXED ); - gtk_tree_view_column_set_fixed_width( GTK_TREE_VIEW_COLUMN(m_column), width ); - } -} - -void wxDataViewColumn::SetReorderable( bool reorderable ) -{ - gtk_tree_view_column_set_reorderable( GTK_TREE_VIEW_COLUMN(m_column), reorderable ); -} - -bool wxDataViewColumn::IsReorderable() const -{ - return gtk_tree_view_column_get_reorderable( GTK_TREE_VIEW_COLUMN(m_column) ) != 0; -} - -//----------------------------------------------------------------------------- -// wxGtkTreeModelNode -//----------------------------------------------------------------------------- - -#if 0 -class wxGtkTreeModelChildWithPos -{ -public: - unsigned int pos; - void *id; -}; - -static -int wxGtkTreeModelChildWithPosCmp( const void* data1, const void* data2, const void* user_data ) -{ - const wxGtkTreeModelChildWithPos* child1 = (const wxGtkTreeModelChildWithPos*) data1; - const wxGtkTreeModelChildWithPos* child2 = (const wxGtkTreeModelChildWithPos*) data2; - const wxDataViewCtrlInternal *internal = (const wxDataViewCtrlInternal *) user_data; - int ret = internal->GetDataViewModel()->Compare( child1->id, child2->id, - internal->GetSortColumn(), (internal->GetSortOrder() == GTK_SORT_DESCENDING) ); - - return ret; -} -#else -static -int LINKAGEMODE wxGtkTreeModelChildPtrCmp( void*** data1, void*** data2 ) -{ - return gs_internal->GetDataViewModel()->Compare( wxDataViewItem(**data1), wxDataViewItem(**data2), - gs_internal->GetSortColumn(), (gs_internal->GetSortOrder() == GTK_SORT_ASCENDING) ); -} - -WX_DEFINE_ARRAY_PTR( void**, wxGtkTreeModelChildrenPtr ); -#endif - -void wxGtkTreeModelNode::Resort() -{ - size_t child_count = GetChildCount(); - if (child_count == 0) - return; - - size_t node_count = GetNodesCount(); - - if (child_count == 1) - { - if (node_count == 1) - { - wxGtkTreeModelNode *node = m_nodes.Item( 0 ); - node->Resort(); - } - return; - } - - gint *new_order = new gint[child_count]; - -#if 1 - // m_children has the original *void - // ptrs points to these - wxGtkTreeModelChildrenPtr ptrs; - size_t i; - for (i = 0; i < child_count; i++) - ptrs.Add( &(m_children[i]) ); - // Sort the ptrs - gs_internal = m_internal; - ptrs.Sort( &wxGtkTreeModelChildPtrCmp ); - - wxGtkTreeModelChildren temp; - void** base_ptr = &(m_children[0]); - // Transfer positions to new_order array and - // IDs to temp - for (i = 0; i < child_count; i++) - { - new_order[i] = ptrs[i] - base_ptr; - temp.Add( *ptrs[i] ); - } - - // Transfer IDs back to m_children - m_children.Clear(); - WX_APPEND_ARRAY( temp, m_children ); -#endif -#if 0 - // Too slow - - // Build up array with IDs and original positions - wxGtkTreeModelChildWithPos* temp = new wxGtkTreeModelChildWithPos[child_count]; - size_t i; - for (i = 0; i < child_count; i++) - { - temp[i].pos = i; - temp[i].id = m_children[i]; - } - // Sort array keeping original positions - wxQsort( temp, child_count, sizeof(wxGtkTreeModelChildWithPos), - &wxGtkTreeModelChildWithPosCmp, m_internal ); - // Transfer positions to new_order array and - // IDs to m_children - m_children.Clear(); - for (i = 0; i < child_count; i++) - { - new_order[i] = temp[i].pos; - m_children.Add( temp[i].id ); - } - // Delete array - delete [] temp; -#endif - -#if 0 - // Too slow - - wxGtkTreeModelChildren temp; - WX_APPEND_ARRAY( temp, m_children ); - - gs_internal = m_internal; - m_children.Sort( &wxGtkTreeModelChildCmp ); - - unsigned int pos; - for (pos = 0; pos < child_count; pos++) - { - void *id = m_children.Item( pos ); - int old_pos = temp.Index( id ); - new_order[pos] = old_pos; - } -#endif - - GtkTreeModel *gtk_tree_model = GTK_TREE_MODEL( m_internal->GetGtkModel() ); - - GtkTreeIter iter; - iter.user_data = GetItem().GetID(); - iter.stamp = m_internal->GetGtkModel()->stamp; - - gtk_tree_model_rows_reordered( gtk_tree_model, - wxGtkTreePath(m_internal->get_path(&iter)), &iter, new_order ); - - delete [] new_order; - - unsigned int pos; - for (pos = 0; pos < node_count; pos++) - { - wxGtkTreeModelNode *node = m_nodes.Item( pos ); - node->Resort(); - } -} - -//----------------------------------------------------------------------------- -// wxDataViewCtrlInternal -//----------------------------------------------------------------------------- - -wxDataViewCtrlInternal::wxDataViewCtrlInternal( wxDataViewCtrl *owner, wxDataViewModel *wx_model ) -{ - m_owner = owner; - m_wx_model = wx_model; - - m_root = NULL; - m_sort_order = GTK_SORT_ASCENDING; - m_sort_column = -1; - m_dataview_sort_column = NULL; - - m_dragDataObject = NULL; - m_dropDataObject = NULL; - - m_dirty = false; - - m_gtk_model = wxgtk_tree_model_new(); - m_gtk_model->internal = this; - - m_notifier = new wxGtkDataViewModelNotifier( wx_model, this ); - - wx_model->AddNotifier( m_notifier ); - - // g_object_unref( gtk_model ); ??? - - if (!m_wx_model->IsVirtualListModel()) - InitTree(); - - gtk_tree_view_set_model( GTK_TREE_VIEW(m_owner->GtkGetTreeView()), GTK_TREE_MODEL(m_gtk_model) ); -} - -wxDataViewCtrlInternal::~wxDataViewCtrlInternal() -{ - m_wx_model->RemoveNotifier( m_notifier ); - - // remove the model from the GtkTreeView before it gets destroyed - gtk_tree_view_set_model( GTK_TREE_VIEW( m_owner->GtkGetTreeView() ), NULL ); - - g_object_unref( m_gtk_model ); - - delete m_dragDataObject; - delete m_dropDataObject; -} - -void wxDataViewCtrlInternal::ScheduleRefresh() -{ - m_dirty = true; -} - -void wxDataViewCtrlInternal::OnInternalIdle() -{ - if (m_dirty) - { - GtkWidget *widget = m_owner->GtkGetTreeView(); - gtk_widget_queue_draw( widget ); - m_dirty = false; - } -} - -void wxDataViewCtrlInternal::InitTree() -{ - wxDataViewItem item; - m_root = new wxGtkTreeModelNode( NULL, item, this ); - - BuildBranch( m_root ); -} - -void wxDataViewCtrlInternal::BuildBranch( wxGtkTreeModelNode *node ) -{ - if (node->GetChildCount() == 0) - { - wxDataViewItemArray children; - unsigned int count = m_wx_model->GetChildren( node->GetItem(), children ); - - unsigned int pos; - for (pos = 0; pos < count; pos++) - { - wxDataViewItem child = children[pos]; - - if (m_wx_model->IsContainer( child )) - node->AddNode( new wxGtkTreeModelNode( node, child, this ) ); - else - node->AddLeaf( child.GetID() ); - - // Don't send any events here - } - } -} - -// GTK+ dnd iface - -bool wxDataViewCtrlInternal::EnableDragSource( const wxDataFormat &format ) -{ - wxGtkString atom_str( gdk_atom_name( format ) ); - m_dragSourceTargetEntryTarget = wxCharBuffer( atom_str ); - - m_dragSourceTargetEntry.target = m_dragSourceTargetEntryTarget.data(); - m_dragSourceTargetEntry.flags = 0; - m_dragSourceTargetEntry.info = static_cast(-1); - - gtk_tree_view_enable_model_drag_source( GTK_TREE_VIEW(m_owner->GtkGetTreeView() ), - GDK_BUTTON1_MASK, &m_dragSourceTargetEntry, 1, (GdkDragAction) GDK_ACTION_COPY ); - - return true; -} - -bool wxDataViewCtrlInternal::EnableDropTarget( const wxDataFormat &format ) -{ - wxGtkString atom_str( gdk_atom_name( format ) ); - m_dropTargetTargetEntryTarget = wxCharBuffer( atom_str ); - - m_dropTargetTargetEntry.target = m_dropTargetTargetEntryTarget.data(); - m_dropTargetTargetEntry.flags = 0; - m_dropTargetTargetEntry.info = static_cast(-1); - - gtk_tree_view_enable_model_drag_dest( GTK_TREE_VIEW(m_owner->GtkGetTreeView() ), - &m_dropTargetTargetEntry, 1, (GdkDragAction) GDK_ACTION_COPY ); - - return true; -} - -gboolean wxDataViewCtrlInternal::row_draggable( GtkTreeDragSource *WXUNUSED(drag_source), - GtkTreePath *path ) -{ - delete m_dragDataObject; - m_dragDataObject = NULL; - - wxDataViewItem item(GetOwner()->GTKPathToItem(path)); - if ( !item ) - return FALSE; - - wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_BEGIN_DRAG, m_owner->GetId() ); - event.SetEventObject( m_owner ); - event.SetItem( item ); - event.SetModel( m_wx_model ); - gint x, y; - gtk_widget_get_pointer(m_owner->GtkGetTreeView(), &x, &y); - event.SetPosition(x, y); - if (!m_owner->HandleWindowEvent( event )) - return FALSE; - - if (!event.IsAllowed()) - return FALSE; - - wxDataObject *obj = event.GetDataObject(); - if (!obj) - return FALSE; - - m_dragDataObject = obj; - - return TRUE; -} - -gboolean -wxDataViewCtrlInternal::drag_data_delete(GtkTreeDragSource *WXUNUSED(drag_source), - GtkTreePath *WXUNUSED(path)) -{ - return FALSE; -} - -gboolean wxDataViewCtrlInternal::drag_data_get( GtkTreeDragSource *WXUNUSED(drag_source), - GtkTreePath *path, GtkSelectionData *selection_data ) -{ - wxDataViewItem item(GetOwner()->GTKPathToItem(path)); - if ( !item ) - return FALSE; - - GdkAtom target = gtk_selection_data_get_target(selection_data); - if (!m_dragDataObject->IsSupported(target)) - return FALSE; - - size_t size = m_dragDataObject->GetDataSize(target); - if (size == 0) - return FALSE; - - void *buf = malloc( size ); - - gboolean res = FALSE; - if (m_dragDataObject->GetDataHere(target, buf)) - { - res = TRUE; - - gtk_selection_data_set(selection_data, target, - 8, (const guchar*) buf, size ); - } - - free( buf ); - - return res; -} - -gboolean -wxDataViewCtrlInternal::drag_data_received(GtkTreeDragDest *WXUNUSED(drag_dest), - GtkTreePath *path, - GtkSelectionData *selection_data) -{ - wxDataViewItem item(GetOwner()->GTKPathToItem(path)); - - wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_DROP, m_owner->GetId() ); - event.SetEventObject( m_owner ); - event.SetItem( item ); - event.SetModel( m_wx_model ); - event.SetDataFormat(gtk_selection_data_get_target(selection_data)); - event.SetDataSize(gtk_selection_data_get_length(selection_data)); - event.SetDataBuffer(const_cast(gtk_selection_data_get_data(selection_data))); - if (!m_owner->HandleWindowEvent( event )) - return FALSE; - - if (!event.IsAllowed()) - return FALSE; - - return TRUE; -} - -gboolean -wxDataViewCtrlInternal::row_drop_possible(GtkTreeDragDest *WXUNUSED(drag_dest), - GtkTreePath *path, - GtkSelectionData *selection_data) -{ - wxDataViewItem item(GetOwner()->GTKPathToItem(path)); - - wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_DROP_POSSIBLE, m_owner->GetId() ); - event.SetEventObject( m_owner ); - event.SetItem( item ); - event.SetModel( m_wx_model ); - event.SetDataFormat(gtk_selection_data_get_target(selection_data)); - event.SetDataSize(gtk_selection_data_get_length(selection_data)); - if (!m_owner->HandleWindowEvent( event )) - return FALSE; - - if (!event.IsAllowed()) - return FALSE; - - return TRUE; -} - -// notifications from wxDataViewModel - -bool wxDataViewCtrlInternal::Cleared() -{ - if (m_root) - { - delete m_root; - m_root = NULL; - } - - InitTree(); - - ScheduleRefresh(); - - return true; -} - -void wxDataViewCtrlInternal::Resort() -{ - if (!m_wx_model->IsVirtualListModel()) - m_root->Resort(); - - ScheduleRefresh(); -} - -bool wxDataViewCtrlInternal::ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item ) -{ - if (!m_wx_model->IsVirtualListModel()) - { - wxGtkTreeModelNode *parent_node = FindNode( parent ); - wxCHECK_MSG(parent_node, false, - "Did you forget a call to ItemAdded()? The parent node is unknown to the wxGtkTreeModel"); - - wxDataViewItemArray modelSiblings; - m_wx_model->GetChildren(parent, modelSiblings); - const int modelSiblingsSize = modelSiblings.size(); - - int posInModel = modelSiblings.Index(item, /*fromEnd=*/true); - wxCHECK_MSG( posInModel != wxNOT_FOUND, false, "adding non-existent item?" ); - - const wxGtkTreeModelChildren& nodeSiblings = parent_node->GetChildren(); - const int nodeSiblingsSize = nodeSiblings.size(); - - int nodePos = 0; - - if ( posInModel == modelSiblingsSize - 1 ) - { - nodePos = nodeSiblingsSize; - } - else if ( modelSiblingsSize == nodeSiblingsSize + 1 ) - { - // This is the simple case when our node tree already matches the - // model and only this one item is missing. - nodePos = posInModel; - } - else - { - // It's possible that a larger discrepancy between the model and - // our realization exists. This can happen e.g. when adding a bunch - // of items to the model and then calling ItemsAdded() just once - // afterwards. In this case, we must find the right position by - // looking at sibling items. - - // append to the end if we won't find a better position: - nodePos = nodeSiblingsSize; - - for ( int nextItemPos = posInModel + 1; - nextItemPos < modelSiblingsSize; - nextItemPos++ ) - { - int nextNodePos = parent_node->FindChildByItem(modelSiblings[nextItemPos]); - if ( nextNodePos != wxNOT_FOUND ) - { - nodePos = nextNodePos; - break; - } - } - } - - if (m_wx_model->IsContainer( item )) - parent_node->InsertNode( new wxGtkTreeModelNode( parent_node, item, this ), nodePos ); - else - parent_node->InsertLeaf( item.GetID(), nodePos ); - } - - ScheduleRefresh(); - - return true; -} - -bool wxDataViewCtrlInternal::ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item ) -{ - if (!m_wx_model->IsVirtualListModel()) - { - wxGtkTreeModelNode *parent_node = FindNode( parent ); - wxASSERT_MSG(parent_node, - "Did you forget a call to ItemAdded()? The parent node is unknown to the wxGtkTreeModel"); - - parent_node->DeleteChild( item.GetID() ); - } - - ScheduleRefresh(); - - return true; -} - -bool wxDataViewCtrlInternal::ItemChanged( const wxDataViewItem &item ) -{ - wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_VALUE_CHANGED, m_owner->GetId() ); - event.SetEventObject( m_owner ); - event.SetModel( m_owner->GetModel() ); - event.SetItem( item ); - m_owner->HandleWindowEvent( event ); - - return true; -} - -bool wxDataViewCtrlInternal::ValueChanged( const wxDataViewItem &item, unsigned int view_column ) -{ - wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_VALUE_CHANGED, m_owner->GetId() ); - event.SetEventObject( m_owner ); - event.SetModel( m_owner->GetModel() ); - event.SetColumn( view_column ); - event.SetDataViewColumn( GetOwner()->GetColumn(view_column) ); - event.SetItem( item ); - m_owner->HandleWindowEvent( event ); - - return true; -} - -// GTK+ model iface - -GtkTreeModelFlags wxDataViewCtrlInternal::get_flags() -{ - int flags = 0; - - if ( m_wx_model->IsListModel() ) - flags |= GTK_TREE_MODEL_LIST_ONLY; - - if ( !m_wx_model->IsVirtualListModel() ) - flags |= GTK_TREE_MODEL_ITERS_PERSIST; - - return GtkTreeModelFlags(flags); -} - -gboolean wxDataViewCtrlInternal::get_iter( GtkTreeIter *iter, GtkTreePath *path ) -{ - - if (m_wx_model->IsVirtualListModel()) - { - wxDataViewVirtualListModel *wx_model = (wxDataViewVirtualListModel*) m_wx_model; - - unsigned int i = (unsigned int)gtk_tree_path_get_indices (path)[0]; - - if (i >= wx_model->GetCount()) - return FALSE; - - iter->stamp = m_gtk_model->stamp; - // user_data is just the index +1 - iter->user_data = wxUIntToPtr(i+1); - - return TRUE; - } - else - { - int depth = gtk_tree_path_get_depth( path ); - - wxGtkTreeModelNode *node = m_root; - - int i; - for (i = 0; i < depth; i++) - { - BuildBranch( node ); - - gint pos = gtk_tree_path_get_indices (path)[i]; - if (pos < 0) return FALSE; - if ((size_t)pos >= node->GetChildCount()) return FALSE; - - void* id = node->GetChildren().Item( (size_t) pos ); - - if (i == depth-1) - { - iter->stamp = m_gtk_model->stamp; - iter->user_data = id; - return TRUE; - } - - size_t count = node->GetNodes().GetCount(); - size_t pos2; - for (pos2 = 0; pos2 < count; pos2++) - { - wxGtkTreeModelNode *child_node = node->GetNodes().Item( pos2 ); - if (child_node->GetItem().GetID() == id) - { - node = child_node; - break; - } - } - } - } - - return FALSE; -} - -GtkTreePath *wxDataViewCtrlInternal::get_path( GtkTreeIter *iter ) -{ - // When this is called from ItemDeleted(), the item is already - // deleted in the model. - - GtkTreePath *retval = gtk_tree_path_new (); - - if (m_wx_model->IsVirtualListModel()) - { - // iter is root, add nothing - if (!iter->user_data) - return retval; - - // user_data is just the index +1 - int i = ( (wxUIntPtr) iter->user_data ) -1; - gtk_tree_path_append_index (retval, i); - } - else - { - void *id = iter->user_data; - - wxGtkTreeModelNode *node = FindParentNode( iter ); - while (node) - { - int pos = node->GetChildren().Index( id ); - - gtk_tree_path_prepend_index( retval, pos ); - - id = node->GetItem().GetID(); - node = node->GetParent(); - } - } - - return retval; -} - -gboolean wxDataViewCtrlInternal::iter_next( GtkTreeIter *iter ) -{ - if (m_wx_model->IsVirtualListModel()) - { - wxDataViewVirtualListModel *wx_model = (wxDataViewVirtualListModel*) m_wx_model; - - // user_data is just the index +1 - int n = ( (wxUIntPtr) iter->user_data ) -1; - - if (n == -1) - { - iter->user_data = NULL; - return FALSE; - } - - if (n >= (int) wx_model->GetCount()-1) - { - iter->user_data = NULL; - return FALSE; - } - - // user_data is just the index +1 (+2 because we need the next) - iter->user_data = wxUIntToPtr(n+2); - } - else - { - wxGtkTreeModelNode *parent = FindParentNode( iter ); - if( parent == NULL ) - { - iter->user_data = NULL; - return FALSE; - } - - int pos = parent->GetChildren().Index( iter->user_data ); - - if (pos == (int) parent->GetChildCount()-1) - { - iter->user_data = NULL; - return FALSE; - } - - iter->user_data = parent->GetChildren().Item( pos+1 ); - } - - return TRUE; -} - -gboolean wxDataViewCtrlInternal::iter_children( GtkTreeIter *iter, GtkTreeIter *parent ) -{ - if (m_wx_model->IsVirtualListModel()) - { - // this is a list, nodes have no children - if (parent) - return FALSE; - - iter->stamp = m_gtk_model->stamp; - iter->user_data = (gpointer) 1; - - return TRUE; - } - else - { - if (iter == NULL) - { - if (m_root->GetChildCount() == 0) return FALSE; - iter->stamp = m_gtk_model->stamp; - iter->user_data = (gpointer) m_root->GetChildren().Item( 0 ); - return TRUE; - } - - - wxDataViewItem item; - if (parent) - item = wxDataViewItem( (void*) parent->user_data ); - - if (!m_wx_model->IsContainer( item )) - return FALSE; - - wxGtkTreeModelNode *parent_node = FindNode( parent ); - wxASSERT_MSG(parent_node, - "Did you forget a call to ItemAdded()? The parent node is unknown to the wxGtkTreeModel"); - - BuildBranch( parent_node ); - - if (parent_node->GetChildCount() == 0) - return FALSE; - - iter->stamp = m_gtk_model->stamp; - iter->user_data = (gpointer) parent_node->GetChildren().Item( 0 ); - } - - return TRUE; -} - -gboolean wxDataViewCtrlInternal::iter_has_child( GtkTreeIter *iter ) -{ - if (m_wx_model->IsVirtualListModel()) - { - wxDataViewVirtualListModel *wx_model = (wxDataViewVirtualListModel*) m_wx_model; - - if (iter == NULL) - return (wx_model->GetCount() > 0); - - // this is a list, nodes have no children - return FALSE; - } - else - { - if (iter == NULL) - return (m_root->GetChildCount() > 0); - - wxDataViewItem item( (void*) iter->user_data ); - - bool is_container = m_wx_model->IsContainer( item ); - - if (!is_container) - return FALSE; - - wxGtkTreeModelNode *node = FindNode( iter ); - wxASSERT_MSG(node, - "Did you forget a call to ItemAdded()? The iterator is unknown to the wxGtkTreeModel"); - - BuildBranch( node ); - - return (node->GetChildCount() > 0); - } -} - -gint wxDataViewCtrlInternal::iter_n_children( GtkTreeIter *iter ) -{ - if (m_wx_model->IsVirtualListModel()) - { - wxDataViewVirtualListModel *wx_model = (wxDataViewVirtualListModel*) m_wx_model; - - if (iter == NULL) - return (gint) wx_model->GetCount(); - - return 0; - } - else - { - if (iter == NULL) - return m_root->GetChildCount(); - - wxDataViewItem item( (void*) iter->user_data ); - - if (!m_wx_model->IsContainer( item )) - return 0; - - wxGtkTreeModelNode *parent_node = FindNode( iter ); - wxASSERT_MSG(parent_node, - "Did you forget a call to ItemAdded()? The parent node is unknown to the wxGtkTreeModel"); - - BuildBranch( parent_node ); - - return parent_node->GetChildCount(); - } -} - -gboolean wxDataViewCtrlInternal::iter_nth_child( GtkTreeIter *iter, GtkTreeIter *parent, gint n ) -{ - if (m_wx_model->IsVirtualListModel()) - { - wxDataViewVirtualListModel *wx_model = (wxDataViewVirtualListModel*) m_wx_model; - - if (parent) - return FALSE; - - if (n < 0) - return FALSE; - - if (n >= (gint) wx_model->GetCount()) - return FALSE; - - iter->stamp = m_gtk_model->stamp; - // user_data is just the index +1 - iter->user_data = wxUIntToPtr(n+1); - - return TRUE; - } - else - { - void* id = NULL; - if (parent) id = (void*) parent->user_data; - wxDataViewItem item( id ); - - if (!m_wx_model->IsContainer( item )) - return FALSE; - - wxGtkTreeModelNode *parent_node = FindNode( parent ); - wxASSERT_MSG(parent_node, - "Did you forget a call to ItemAdded()? The parent node is unknown to the wxGtkTreeModel"); - - BuildBranch( parent_node ); - - iter->stamp = m_gtk_model->stamp; - iter->user_data = parent_node->GetChildren().Item( n ); - - return TRUE; - } -} - -gboolean wxDataViewCtrlInternal::iter_parent( GtkTreeIter *iter, GtkTreeIter *child ) -{ - if (m_wx_model->IsVirtualListModel()) - { - return FALSE; - } - else - { - wxGtkTreeModelNode *node = FindParentNode( child ); - if (!node) - return FALSE; - - iter->stamp = m_gtk_model->stamp; - iter->user_data = (gpointer) node->GetItem().GetID(); - - return TRUE; - } -} - -// item can be deleted already in the model -int wxDataViewCtrlInternal::GetIndexOf( const wxDataViewItem &parent, const wxDataViewItem &item ) -{ - if (m_wx_model->IsVirtualListModel()) - { - return wxPtrToUInt(item.GetID()) - 1; - } - else - { - wxGtkTreeModelNode *parent_node = FindNode( parent ); - wxGtkTreeModelChildren &children = parent_node->GetChildren(); - size_t j; - for (j = 0; j < children.GetCount(); j++) - { - if (children[j] == item.GetID()) - return j; - } - } - return -1; -} - - -static wxGtkTreeModelNode* -wxDataViewCtrlInternal_FindNode( wxDataViewModel * model, wxGtkTreeModelNode *treeNode, const wxDataViewItem &item ) -{ - if( model == NULL ) - return NULL; - - ItemList list; - list.DeleteContents( true ); - wxDataViewItem it( item ); - - while( it.IsOk() ) - { - wxDataViewItem * pItem = new wxDataViewItem( it ); - list.Insert( pItem ); - it = model->GetParent( it ); - } - - wxGtkTreeModelNode * node = treeNode; - for( ItemList::compatibility_iterator n = list.GetFirst(); n; n = n->GetNext() ) - { - if( node && node->GetNodes().GetCount() != 0 ) - { - int len = node->GetNodes().GetCount(); - wxGtkTreeModelNodes &nodes = node->GetNodes(); - int j = 0; - for( ; j < len; j ++) - { - if( nodes[j]->GetItem() == *(n->GetData())) - { - node = nodes[j]; - break; - } - } - - if( j == len ) - { - return NULL; - } - } - else - return NULL; - } - return node; - -} - -wxGtkTreeModelNode *wxDataViewCtrlInternal::FindNode( GtkTreeIter *iter ) -{ - if (!iter) - return m_root; - - wxDataViewItem item( (void*) iter->user_data ); - if (!item.IsOk()) - return m_root; - - wxGtkTreeModelNode *result = wxDataViewCtrlInternal_FindNode( m_wx_model, m_root, item ); - -/* - if (!result) - { - wxLogDebug( "Not found %p", iter->user_data ); - char *crash = NULL; - *crash = 0; - } - // TODO: remove this code -*/ - - return result; -} - -wxGtkTreeModelNode *wxDataViewCtrlInternal::FindNode( const wxDataViewItem &item ) -{ - if (!item.IsOk()) - return m_root; - - wxGtkTreeModelNode *result = wxDataViewCtrlInternal_FindNode( m_wx_model, m_root, item ); - -/* - if (!result) - { - wxLogDebug( "Not found %p", item.GetID() ); - char *crash = NULL; - *crash = 0; - } - // TODO: remove this code -*/ - - return result; -} - -static wxGtkTreeModelNode* -wxDataViewCtrlInternal_FindParentNode( wxDataViewModel * model, wxGtkTreeModelNode *treeNode, const wxDataViewItem &item ) -{ - if( model == NULL ) - return NULL; - - ItemList list; - list.DeleteContents( true ); - if( !item.IsOk() ) - return NULL; - - wxDataViewItem it( model->GetParent( item ) ); - while( it.IsOk() ) - { - wxDataViewItem * pItem = new wxDataViewItem( it ); - list.Insert( pItem ); - it = model->GetParent( it ); - } - - wxGtkTreeModelNode * node = treeNode; - for( ItemList::compatibility_iterator n = list.GetFirst(); n; n = n->GetNext() ) - { - if( node && node->GetNodes().GetCount() != 0 ) - { - int len = node->GetNodes().GetCount(); - wxGtkTreeModelNodes nodes = node->GetNodes(); - int j = 0; - for( ; j < len; j ++) - { - if( nodes[j]->GetItem() == *(n->GetData())) - { - node = nodes[j]; - break; - } - } - - if( j == len ) - { - return NULL; - } - } - else - return NULL; - } - //Examine whether the node is item's parent node - int len = node->GetChildCount(); - for( int i = 0; i < len ; i ++ ) - { - if( node->GetChildren().Item( i ) == item.GetID() ) - return node; - } - return NULL; -} - -wxGtkTreeModelNode *wxDataViewCtrlInternal::FindParentNode( GtkTreeIter *iter ) -{ - if (!iter) - return NULL; - - wxDataViewItem item( (void*) iter->user_data ); - if (!item.IsOk()) - return NULL; - - return wxDataViewCtrlInternal_FindParentNode( m_wx_model, m_root, item ); -} - -wxGtkTreeModelNode *wxDataViewCtrlInternal::FindParentNode( const wxDataViewItem &item ) -{ - if (!item.IsOk()) - return NULL; - - return wxDataViewCtrlInternal_FindParentNode( m_wx_model, m_root, item ); -} - -//----------------------------------------------------------------------------- -// wxDataViewCtrl signal callbacks -//----------------------------------------------------------------------------- - -static void -wxdataview_selection_changed_callback( GtkTreeSelection* WXUNUSED(selection), wxDataViewCtrl *dv ) -{ - if (!gtk_widget_get_realized(dv->m_widget)) - return; - - wxDataViewEvent event( wxEVT_DATAVIEW_SELECTION_CHANGED, dv->GetId() ); - event.SetEventObject( dv ); - event.SetItem( dv->GetSelection() ); - event.SetModel( dv->GetModel() ); - dv->HandleWindowEvent( event ); -} - -static void -wxdataview_row_activated_callback( GtkTreeView* WXUNUSED(treeview), GtkTreePath *path, - GtkTreeViewColumn *WXUNUSED(column), wxDataViewCtrl *dv ) -{ - wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_ACTIVATED, dv->GetId() ); - - wxDataViewItem item(dv->GTKPathToItem(path)); - event.SetItem( item ); - event.SetModel( dv->GetModel() ); - dv->HandleWindowEvent( event ); -} - -static gboolean -wxdataview_test_expand_row_callback( GtkTreeView* WXUNUSED(treeview), GtkTreeIter* iter, - GtkTreePath *WXUNUSED(path), wxDataViewCtrl *dv ) -{ - wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_EXPANDING, dv->GetId() ); - - wxDataViewItem item( (void*) iter->user_data );; - event.SetItem( item ); - event.SetModel( dv->GetModel() ); - dv->HandleWindowEvent( event ); - - return !event.IsAllowed(); -} - -static void -wxdataview_row_expanded_callback( GtkTreeView* WXUNUSED(treeview), GtkTreeIter* iter, - GtkTreePath *WXUNUSED(path), wxDataViewCtrl *dv ) -{ - wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_EXPANDED, dv->GetId() ); - - wxDataViewItem item( (void*) iter->user_data );; - event.SetItem( item ); - event.SetModel( dv->GetModel() ); - dv->HandleWindowEvent( event ); -} - -static gboolean -wxdataview_test_collapse_row_callback( GtkTreeView* WXUNUSED(treeview), GtkTreeIter* iter, - GtkTreePath *WXUNUSED(path), wxDataViewCtrl *dv ) -{ - wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_COLLAPSING, dv->GetId() ); - - wxDataViewItem item( (void*) iter->user_data );; - event.SetItem( item ); - event.SetModel( dv->GetModel() ); - dv->HandleWindowEvent( event ); - - return !event.IsAllowed(); -} - -static void -wxdataview_row_collapsed_callback( GtkTreeView* WXUNUSED(treeview), GtkTreeIter* iter, - GtkTreePath *WXUNUSED(path), wxDataViewCtrl *dv ) -{ - wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_COLLAPSED, dv->GetId() ); - - wxDataViewItem item( (void*) iter->user_data );; - event.SetItem( item ); - event.SetModel( dv->GetModel() ); - dv->HandleWindowEvent( event ); -} - -//----------------------------------------------------------------------------- - // wxDataViewCtrl -//----------------------------------------------------------------------------- - -void wxDataViewCtrl::AddChildGTK(wxWindowGTK*) -{ - // this is for cell editing controls, which will be - // made children of the GtkTreeView automatically -} - - -//----------------------------------------------------------------------------- -// "motion_notify_event" -//----------------------------------------------------------------------------- - -static gboolean -gtk_dataview_motion_notify_callback( GtkWidget *WXUNUSED(widget), - GdkEventMotion *gdk_event, - wxDataViewCtrl *dv ) -{ - int x = gdk_event->x; - int y = gdk_event->y; - if (gdk_event->is_hint) - { -#ifdef __WXGTK3__ - gdk_window_get_device_position(gdk_event->window, gdk_event->device, &x, &y, NULL); -#else - gdk_window_get_pointer(gdk_event->window, &x, &y, NULL); -#endif - } - - wxGtkTreePath path; - GtkTreeViewColumn *column = NULL; - gint cell_x = 0; - gint cell_y = 0; - if (gtk_tree_view_get_path_at_pos( - GTK_TREE_VIEW(dv->GtkGetTreeView()), - x, y, - path.ByRef(), - &column, - &cell_x, - &cell_y)) - { - if (path) - { - GtkTreeIter iter; - dv->GtkGetInternal()->get_iter( &iter, path ); - } - } - - - return FALSE; -} - -//----------------------------------------------------------------------------- -// "button_press_event" -//----------------------------------------------------------------------------- - -static gboolean -gtk_dataview_button_press_callback( GtkWidget *WXUNUSED(widget), - GdkEventButton *gdk_event, - wxDataViewCtrl *dv ) -{ - if ((gdk_event->button == 3) && (gdk_event->type == GDK_BUTTON_PRESS)) - { - wxGtkTreePath path; - GtkTreeViewColumn *column = NULL; - gint cell_x = 0; - gint cell_y = 0; - gtk_tree_view_get_path_at_pos - ( - GTK_TREE_VIEW(dv->GtkGetTreeView()), - (int) gdk_event->x, (int) gdk_event->y, - path.ByRef(), - &column, - &cell_x, - &cell_y - ); - - // If the right click is on an item that isn't selected, select it, as is - // commonly done. Do not do it if the item under mouse is already selected, - // because it could be a part of multi-item selection. - GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(dv->GtkGetTreeView())); - if ( !gtk_tree_selection_path_is_selected(selection, path) ) - { - gtk_tree_selection_unselect_all(selection); - gtk_tree_selection_select_path(selection, path); - } - - wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_CONTEXT_MENU, dv->GetId() ); - if (path) - event.SetItem(dv->GTKPathToItem(path)); - event.SetModel( dv->GetModel() ); - return dv->HandleWindowEvent( event ); - } - - return FALSE; -} - -wxIMPLEMENT_DYNAMIC_CLASS(wxDataViewCtrl, wxDataViewCtrlBase); - -wxDataViewCtrl::~wxDataViewCtrl() -{ - // Stop editing before destroying the control to remove any event handlers - // which are added when editing started: if we didn't do this, the base - // class dtor would assert as it checks for any leftover handlers. - if ( m_treeview ) - { - GtkTreeViewColumn *col; - gtk_tree_view_get_cursor(GTK_TREE_VIEW(m_treeview), NULL, &col); - - wxDataViewColumn * const wxcol = FromGTKColumn(col); - if ( wxcol ) - { - // This won't do anything if we're not editing it - wxcol->GetRenderer()->CancelEditing(); - } - - GTKDisconnect(m_treeview); - GtkTreeSelection* selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(m_treeview)); - if (selection) - GTKDisconnect(selection); - } - - m_cols.Clear(); - - delete m_internal; -} - -void wxDataViewCtrl::Init() -{ - m_treeview = NULL; - m_internal = NULL; - - m_cols.DeleteContents( true ); - - m_uniformRowHeight = -1; -} - -bool wxDataViewCtrl::Create(wxWindow *parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style, - const wxValidator& validator, - const wxString& name) -{ - if (!PreCreation( parent, pos, size ) || - !CreateBase( parent, id, pos, size, style, validator, name )) - { - wxFAIL_MSG( wxT("wxDataViewCtrl creation failed") ); - return false; - } - - m_widget = gtk_scrolled_window_new (NULL, NULL); - g_object_ref(m_widget); - - GTKScrolledWindowSetBorder(m_widget, style); - - m_treeview = gtk_tree_view_new(); - gtk_container_add (GTK_CONTAINER (m_widget), m_treeview); - - m_focusWidget = GTK_WIDGET(m_treeview); - - bool fixed = (style & wxDV_VARIABLE_LINE_HEIGHT) == 0; - gtk_tree_view_set_fixed_height_mode( GTK_TREE_VIEW(m_treeview), fixed ); - - if (style & wxDV_MULTIPLE) - { - GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) ); - gtk_tree_selection_set_mode( selection, GTK_SELECTION_MULTIPLE ); - } - - gtk_tree_view_set_headers_visible( GTK_TREE_VIEW(m_treeview), (style & wxDV_NO_HEADER) == 0 ); - -#ifdef __WXGTK210__ -#ifndef __WXGTK3__ - if (!gtk_check_version(2,10,0)) -#endif - { - GtkTreeViewGridLines grid = GTK_TREE_VIEW_GRID_LINES_NONE; - - if ((style & wxDV_HORIZ_RULES) != 0 && - (style & wxDV_VERT_RULES) != 0) - grid = GTK_TREE_VIEW_GRID_LINES_BOTH; - else if (style & wxDV_VERT_RULES) - grid = GTK_TREE_VIEW_GRID_LINES_VERTICAL; - else if (style & wxDV_HORIZ_RULES) - grid = GTK_TREE_VIEW_GRID_LINES_HORIZONTAL; - - if (grid != GTK_TREE_VIEW_GRID_LINES_NONE) - gtk_tree_view_set_grid_lines( GTK_TREE_VIEW(m_treeview), grid ); - } -#endif - - gtk_tree_view_set_rules_hint( GTK_TREE_VIEW(m_treeview), (style & wxDV_ROW_LINES) != 0 ); - - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (m_widget), - GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_widget_show (m_treeview); - - m_parent->DoAddChild( this ); - - PostCreation(size); - - GtkEnableSelectionEvents(); - - g_signal_connect_after (m_treeview, "row-activated", - G_CALLBACK (wxdataview_row_activated_callback), this); - - g_signal_connect (m_treeview, "test-collapse-row", - G_CALLBACK (wxdataview_test_collapse_row_callback), this); - - g_signal_connect_after (m_treeview, "row-collapsed", - G_CALLBACK (wxdataview_row_collapsed_callback), this); - - g_signal_connect (m_treeview, "test-expand-row", - G_CALLBACK (wxdataview_test_expand_row_callback), this); - - g_signal_connect_after (m_treeview, "row-expanded", - G_CALLBACK (wxdataview_row_expanded_callback), this); - - g_signal_connect (m_treeview, "motion_notify_event", - G_CALLBACK (gtk_dataview_motion_notify_callback), this); - - g_signal_connect (m_treeview, "button_press_event", - G_CALLBACK (gtk_dataview_button_press_callback), this); - - return true; -} - -wxDataViewItem wxDataViewCtrl::GTKPathToItem(GtkTreePath *path) const -{ - GtkTreeIter iter; - return wxDataViewItem(path && m_internal->get_iter(&iter, path) - ? iter.user_data - : NULL); -} - -void wxDataViewCtrl::OnInternalIdle() -{ - wxWindow::OnInternalIdle(); - - if ( !m_internal ) - return; - - m_internal->OnInternalIdle(); - - unsigned int cols = GetColumnCount(); - unsigned int i; - for (i = 0; i < cols; i++) - { - wxDataViewColumn *col = GetColumn( i ); - col->OnInternalIdle(); - } - - if (m_ensureVisibleDefered.IsOk()) - { - ExpandAncestors(m_ensureVisibleDefered); - GtkTreeIter iter; - iter.user_data = (gpointer) m_ensureVisibleDefered.GetID(); - wxGtkTreePath path(m_internal->get_path( &iter )); - gtk_tree_view_scroll_to_cell( GTK_TREE_VIEW(m_treeview), path, NULL, false, 0.0, 0.0 ); - m_ensureVisibleDefered = wxDataViewItem(0); - } -} - -bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model ) -{ - wxDELETE(m_internal); - - if (!wxDataViewCtrlBase::AssociateModel( model )) - return false; - - if ( model ) - m_internal = new wxDataViewCtrlInternal( this, model ); - - return true; -} - -bool wxDataViewCtrl::EnableDragSource( const wxDataFormat &format ) -{ - wxCHECK_MSG( m_internal, false, "model must be associated before calling EnableDragSource" ); - return m_internal->EnableDragSource( format ); -} - -bool wxDataViewCtrl::EnableDropTarget( const wxDataFormat &format ) -{ - wxCHECK_MSG( m_internal, false, "model must be associated before calling EnableDragTarget" ); - return m_internal->EnableDropTarget( format ); -} - -bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col ) -{ - if (!wxDataViewCtrlBase::AppendColumn(col)) - return false; - - m_cols.Append( col ); - - if (gtk_tree_view_column_get_sizing( GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) ) != - GTK_TREE_VIEW_COLUMN_FIXED) - { - gtk_tree_view_set_fixed_height_mode( GTK_TREE_VIEW(m_treeview), FALSE ); - } - - gtk_tree_view_append_column( GTK_TREE_VIEW(m_treeview), - GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) ); - - return true; -} - -bool wxDataViewCtrl::PrependColumn( wxDataViewColumn *col ) -{ - if (!wxDataViewCtrlBase::PrependColumn(col)) - return false; - - m_cols.Insert( col ); - - if (gtk_tree_view_column_get_sizing( GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) ) != - GTK_TREE_VIEW_COLUMN_FIXED) - { - gtk_tree_view_set_fixed_height_mode( GTK_TREE_VIEW(m_treeview), FALSE ); - } - - gtk_tree_view_insert_column( GTK_TREE_VIEW(m_treeview), - GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()), 0 ); - - return true; -} - -bool wxDataViewCtrl::InsertColumn( unsigned int pos, wxDataViewColumn *col ) -{ - if (!wxDataViewCtrlBase::InsertColumn(pos,col)) - return false; - - m_cols.Insert( pos, col ); - - if (gtk_tree_view_column_get_sizing( GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) ) != - GTK_TREE_VIEW_COLUMN_FIXED) - { - gtk_tree_view_set_fixed_height_mode( GTK_TREE_VIEW(m_treeview), FALSE ); - } - - gtk_tree_view_insert_column( GTK_TREE_VIEW(m_treeview), - GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()), pos ); - - return true; -} - -unsigned int wxDataViewCtrl::GetColumnCount() const -{ - return m_cols.GetCount(); -} - -wxDataViewColumn* wxDataViewCtrl::FromGTKColumn(GtkTreeViewColumn *gtk_col) const -{ - if ( !gtk_col ) - return NULL; - - wxDataViewColumnList::const_iterator iter; - for (iter = m_cols.begin(); iter != m_cols.end(); ++iter) - { - wxDataViewColumn *col = *iter; - if (GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) == gtk_col) - { - return col; - } - } - - wxFAIL_MSG( "No matching column?" ); - - return NULL; -} - -wxDataViewColumn* wxDataViewCtrl::GetColumn( unsigned int pos ) const -{ - GtkTreeViewColumn *gtk_col = gtk_tree_view_get_column( GTK_TREE_VIEW(m_treeview), pos ); - - return FromGTKColumn(gtk_col); -} - -bool wxDataViewCtrl::DeleteColumn( wxDataViewColumn *column ) -{ - gtk_tree_view_remove_column( GTK_TREE_VIEW(m_treeview), - GTK_TREE_VIEW_COLUMN(column->GetGtkHandle()) ); - - m_cols.DeleteObject( column ); - - return true; -} - -bool wxDataViewCtrl::ClearColumns() -{ - wxDataViewColumnList::iterator iter; - for (iter = m_cols.begin(); iter != m_cols.end(); ++iter) - { - wxDataViewColumn *col = *iter; - gtk_tree_view_remove_column( GTK_TREE_VIEW(m_treeview), - GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) ); - } - - m_cols.Clear(); - - return true; -} - -int wxDataViewCtrl::GetColumnPosition( const wxDataViewColumn *column ) const -{ - GtkTreeViewColumn *gtk_column = GTK_TREE_VIEW_COLUMN(column->GetGtkHandle()); - - wxGtkList list(gtk_tree_view_get_columns(GTK_TREE_VIEW(m_treeview))); - - return g_list_index( list, (gconstpointer) gtk_column ); -} - -wxDataViewColumn *wxDataViewCtrl::GetSortingColumn() const -{ - wxCHECK_MSG( m_internal, NULL, "model must be associated before calling GetSortingColumn" ); - return m_internal->GetDataViewSortColumn(); -} - -void wxDataViewCtrl::Expand( const wxDataViewItem & item ) -{ - GtkTreeIter iter; - iter.user_data = item.GetID(); - wxGtkTreePath path(m_internal->get_path( &iter )); - gtk_tree_view_expand_row( GTK_TREE_VIEW(m_treeview), path, false ); -} - -void wxDataViewCtrl::Collapse( const wxDataViewItem & item ) -{ - wxCHECK_RET( m_internal, "model must be associated before calling Collapse" ); - - GtkTreeIter iter; - iter.user_data = item.GetID(); - wxGtkTreePath path(m_internal->get_path( &iter )); - gtk_tree_view_collapse_row( GTK_TREE_VIEW(m_treeview), path ); -} - -bool wxDataViewCtrl::IsExpanded( const wxDataViewItem & item ) const -{ - wxCHECK_MSG( m_internal, false, "model must be associated before calling IsExpanded" ); - - GtkTreeIter iter; - iter.user_data = item.GetID(); - wxGtkTreePath path(m_internal->get_path( &iter )); - return gtk_tree_view_row_expanded( GTK_TREE_VIEW(m_treeview), path ) != 0; -} - -wxDataViewItem wxDataViewCtrl::DoGetCurrentItem() const -{ - // The tree doesn't have any current item if it hadn't been created yet but - // it's arguably not an error to call this function in this case so just - // return an invalid item without asserting. - if ( !m_treeview || !m_internal ) - return wxDataViewItem(); - - wxGtkTreePath path; - gtk_tree_view_get_cursor(GTK_TREE_VIEW(m_treeview), path.ByRef(), NULL); - - return GTKPathToItem(path); -} - -void wxDataViewCtrl::DoSetCurrentItem(const wxDataViewItem& item) -{ - wxCHECK_RET( m_treeview, - "Current item can't be set before creating the control." ); - wxCHECK_RET( m_internal, "model must be associated before setting current item" ); - - // We need to make sure the model knows about this item or the path would - // be invalid and gtk_tree_view_set_cursor() would silently do nothing. - ExpandAncestors(item); - - // We also need to preserve the existing selection from changing. - // Unfortunately the only way to do it seems to use our own selection - // function and forbid any selection changes during set cursor call. - wxGtkTreeSelectionLock - lock(gtk_tree_view_get_selection(GTK_TREE_VIEW(m_treeview))); - - // Do move the cursor now. - GtkTreeIter iter; - iter.user_data = item.GetID(); - wxGtkTreePath path(m_internal->get_path( &iter )); - - gtk_tree_view_set_cursor(GTK_TREE_VIEW(m_treeview), path, NULL, FALSE); -} - -wxDataViewColumn *wxDataViewCtrl::GetCurrentColumn() const -{ - // The tree doesn't have any current item if it hadn't been created yet but - // it's arguably not an error to call this function in this case so just - // return NULL without asserting. - if ( !m_treeview ) - return NULL; - - GtkTreeViewColumn *col; - gtk_tree_view_get_cursor(GTK_TREE_VIEW(m_treeview), NULL, &col); - return FromGTKColumn(col); -} - -void wxDataViewCtrl::EditItem(const wxDataViewItem& item, const wxDataViewColumn *column) -{ - wxCHECK_RET( m_treeview, - "item can't be edited before creating the control." ); - wxCHECK_RET( m_internal, "model must be associated before editing an item" ); - wxCHECK_RET( item.IsOk(), "invalid item" ); - wxCHECK_RET( column, "no column provided" ); - - // We need to make sure the model knows about this item or the path would - // be invalid and gtk_tree_view_set_cursor() would silently do nothing. - ExpandAncestors(item); - - GtkTreeViewColumn *gcolumn = GTK_TREE_VIEW_COLUMN(column->GetGtkHandle()); - - // We also need to preserve the existing selection from changing. - // Unfortunately the only way to do it seems to use our own selection - // function and forbid any selection changes during set cursor call. - wxGtkTreeSelectionLock - lock(gtk_tree_view_get_selection(GTK_TREE_VIEW(m_treeview))); - - // Do move the cursor now. - GtkTreeIter iter; - iter.user_data = item.GetID(); - wxGtkTreePath path(m_internal->get_path( &iter )); - - gtk_tree_view_set_cursor(GTK_TREE_VIEW(m_treeview), path, gcolumn, TRUE); -} - -int wxDataViewCtrl::GetSelectedItemsCount() const -{ - GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) ); - - return gtk_tree_selection_count_selected_rows(selection); -} - -int wxDataViewCtrl::GetSelections( wxDataViewItemArray & sel ) const -{ - wxCHECK_MSG( m_internal, 0, "model must be associated before calling GetSelections" ); - - sel.Clear(); - - GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) ); - if (HasFlag(wxDV_MULTIPLE)) - { - GtkTreeModel *model; - wxGtkTreePathList list(gtk_tree_selection_get_selected_rows(selection, &model)); - - for ( GList* current = list; current; current = g_list_next(current) ) - { - GtkTreePath *path = (GtkTreePath*) current->data; - - sel.Add(GTKPathToItem(path)); - } - } - else - { - GtkTreeIter iter; - if (gtk_tree_selection_get_selected( selection, NULL, &iter )) - { - sel.Add( wxDataViewItem(iter.user_data) ); - } - } - - return sel.size(); -} - -void wxDataViewCtrl::SetSelections( const wxDataViewItemArray & sel ) -{ - wxCHECK_RET( m_internal, "model must be associated before calling SetSelections" ); - - GtkDisableSelectionEvents(); - - GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) ); - - gtk_tree_selection_unselect_all( selection ); - - wxDataViewItem last_parent; - - size_t i; - for (i = 0; i < sel.GetCount(); i++) - { - wxDataViewItem item = sel[i]; - wxDataViewItem parent = GetModel()->GetParent( item ); - if (parent) - { - if (parent != last_parent) - ExpandAncestors(item); - } - last_parent = parent; - - GtkTreeIter iter; - iter.stamp = m_internal->GetGtkModel()->stamp; - iter.user_data = (gpointer) item.GetID(); - gtk_tree_selection_select_iter( selection, &iter ); - } - - GtkEnableSelectionEvents(); -} - -void wxDataViewCtrl::Select( const wxDataViewItem & item ) -{ - wxCHECK_RET( m_internal, "model must be associated before calling Select" ); - - ExpandAncestors(item); - - GtkDisableSelectionEvents(); - - GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) ); - - GtkTreeIter iter; - iter.stamp = m_internal->GetGtkModel()->stamp; - iter.user_data = (gpointer) item.GetID(); - gtk_tree_selection_select_iter( selection, &iter ); - - GtkEnableSelectionEvents(); -} - -void wxDataViewCtrl::Unselect( const wxDataViewItem & item ) -{ - wxCHECK_RET( m_internal, "model must be associated before calling Unselect" ); - - GtkDisableSelectionEvents(); - - GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) ); - - GtkTreeIter iter; - iter.stamp = m_internal->GetGtkModel()->stamp; - iter.user_data = (gpointer) item.GetID(); - gtk_tree_selection_unselect_iter( selection, &iter ); - - GtkEnableSelectionEvents(); -} - -bool wxDataViewCtrl::IsSelected( const wxDataViewItem & item ) const -{ - wxCHECK_MSG( m_internal, false, "model must be associated before calling IsSelected" ); - - GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) ); - - GtkTreeIter iter; - iter.stamp = m_internal->GetGtkModel()->stamp; - iter.user_data = (gpointer) item.GetID(); - - return gtk_tree_selection_iter_is_selected( selection, &iter ) != 0; -} - -void wxDataViewCtrl::SelectAll() -{ - GtkDisableSelectionEvents(); - - GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) ); - - gtk_tree_selection_select_all( selection ); - - GtkEnableSelectionEvents(); -} - -void wxDataViewCtrl::UnselectAll() -{ - GtkDisableSelectionEvents(); - - GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) ); - - gtk_tree_selection_unselect_all( selection ); - - GtkEnableSelectionEvents(); -} - -void wxDataViewCtrl::EnsureVisible(const wxDataViewItem& item, - const wxDataViewColumn *WXUNUSED(column)) -{ - wxCHECK_RET( m_internal, "model must be associated before calling EnsureVisible" ); - - m_ensureVisibleDefered = item; - ExpandAncestors(item); - - GtkTreeIter iter; - iter.user_data = (gpointer) item.GetID(); - wxGtkTreePath path(m_internal->get_path( &iter )); - gtk_tree_view_scroll_to_cell( GTK_TREE_VIEW(m_treeview), path, NULL, false, 0.0, 0.0 ); -} - -void wxDataViewCtrl::HitTest(const wxPoint& point, - wxDataViewItem& item, - wxDataViewColumn *& column) const -{ - wxCHECK_RET( m_internal, "model must be associated before calling HitTest" ); - - // gtk_tree_view_get_dest_row_at_pos() is the right one. But it does not tell the column. - // gtk_tree_view_get_path_at_pos() is the wrong function. It doesn't mind the header but returns column. - // See http://mail.gnome.org/archives/gtkmm-list/2005-January/msg00080.html - // So we have to use both of them. - item = wxDataViewItem(0); - column = NULL; - wxGtkTreePath path, pathScratch; - GtkTreeViewColumn* GtkColumn = NULL; - GtkTreeViewDropPosition pos = GTK_TREE_VIEW_DROP_INTO_OR_AFTER; - gint cell_x = 0; - gint cell_y = 0; - - // cannot directly call GtkGetTreeView(), HitTest is const and so is this pointer - wxDataViewCtrl* self = const_cast(this); // ugly workaround, self is NOT const - GtkTreeView* treeView = GTK_TREE_VIEW(self->GtkGetTreeView()); - - // is there possibly a better suited function to get the column? - gtk_tree_view_get_path_at_pos( // and this is the wrong call but it delivers the column - treeView, - (int) point.x, (int) point.y, - pathScratch.ByRef(), - &GtkColumn, // here we get the GtkColumn - &cell_x, - &cell_y ); - - if ( GtkColumn != NULL ) - { - // we got GTK column - // the right call now which takes the header into account - gtk_tree_view_get_dest_row_at_pos( treeView, (int) point.x, (int) point.y, path.ByRef(), &pos); - - if (path) - item = wxDataViewItem(GTKPathToItem(path)); - // else we got a GTK column but the position is not over an item, e.g. below last item - for ( unsigned int i=0, cols=GetColumnCount(); iGetGtkHandle()) == GtkColumn ) - { - column = col; // here we get the wx column - break; - } - } - } - // else no column and thus no item, both null -} - -wxRect -wxDataViewCtrl::GetItemRect(const wxDataViewItem& WXUNUSED(item), - const wxDataViewColumn *WXUNUSED(column)) const -{ - return wxRect(); -} - -bool wxDataViewCtrl::SetRowHeight(int rowHeight) -{ - m_uniformRowHeight = rowHeight; - return true; -} - -void wxDataViewCtrl::DoSetExpanderColumn() -{ - gtk_tree_view_set_expander_column( GTK_TREE_VIEW(m_treeview), - GTK_TREE_VIEW_COLUMN( GetExpanderColumn()->GetGtkHandle() ) ); -} - -void wxDataViewCtrl::DoSetIndent() -{ -#if GTK_CHECK_VERSION(2, 12, 0) - if ( gtk_check_version(2, 12, 0) == NULL ) - { - gtk_tree_view_set_level_indentation(GTK_TREE_VIEW(m_treeview), GetIndent()); - } -#endif // GTK+ 2.12+ -} - -void wxDataViewCtrl::GtkDisableSelectionEvents() -{ - GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) ); - g_signal_handlers_disconnect_by_func( selection, - (gpointer) (wxdataview_selection_changed_callback), this); -} - -void wxDataViewCtrl::GtkEnableSelectionEvents() -{ - GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) ); - g_signal_connect_after (selection, "changed", - G_CALLBACK (wxdataview_selection_changed_callback), this); -} - -// ---------------------------------------------------------------------------- -// visual attributes stuff -// ---------------------------------------------------------------------------- - -// static -wxVisualAttributes -wxDataViewCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) -{ - return GetDefaultAttributesFromGTKWidget(gtk_tree_view_new()); -} - -void wxDataViewCtrl::DoApplyWidgetStyle(GtkRcStyle *style) -{ - wxDataViewCtrlBase::DoApplyWidgetStyle(style); - GTKApplyStyle(m_treeview, style); -} - -#endif // !wxUSE_GENERICDATAVIEWCTRL - -#endif // wxUSE_DATAVIEWCTRL diff --git a/Externals/wxWidgets3/src/gtk/dc.cpp b/Externals/wxWidgets3/src/gtk/dc.cpp deleted file mode 100644 index e87585b6d5..0000000000 --- a/Externals/wxWidgets3/src/gtk/dc.cpp +++ /dev/null @@ -1,427 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/dc.cpp -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __WXGTK3__ - -#include "wx/window.h" -#include "wx/dcclient.h" -#include "wx/dcmemory.h" -#include "wx/dcscreen.h" -#include "wx/icon.h" -#include "wx/gtk/dc.h" - -#include - -wxGTKCairoDCImpl::wxGTKCairoDCImpl(wxDC* owner) - : base_type(owner) -{ - m_width = 0; - m_height = 0; -} - -wxGTKCairoDCImpl::wxGTKCairoDCImpl(wxDC* owner, int) - : base_type(owner, 0) -{ - m_width = 0; - m_height = 0; -} - -wxGTKCairoDCImpl::wxGTKCairoDCImpl(wxDC* owner, double scaleFactor) - : base_type(owner, 0) -{ - m_width = 0; - m_height = 0; - m_contentScaleFactor = scaleFactor; -} - -wxGTKCairoDCImpl::wxGTKCairoDCImpl(wxDC* owner, wxWindow* window) - : base_type(owner, 0) -{ - m_window = window; - m_font = window->GetFont(); - m_textForegroundColour = window->GetForegroundColour(); - m_textBackgroundColour = window->GetBackgroundColour(); - m_width = 0; - m_height = 0; - m_contentScaleFactor = window->GetContentScaleFactor(); -} - -void wxGTKCairoDCImpl::DoDrawBitmap(const wxBitmap& bitmap, int x, int y, bool useMask) -{ - wxCHECK_RET(IsOk(), "invalid DC"); - - cairo_t* cr = NULL; - if (m_graphicContext) - cr = static_cast(m_graphicContext->GetNativeContext()); - if (cr) - { - cairo_save(cr); - bitmap.Draw(cr, x, y, useMask, &m_textForegroundColour, &m_textBackgroundColour); - cairo_restore(cr); - } -} - -void wxGTKCairoDCImpl::DoDrawIcon(const wxIcon& icon, int x, int y) -{ - DoDrawBitmap(icon, x, y, true); -} - -#if wxUSE_IMAGE -bool wxDoFloodFill(wxDC* dc, int x, int y, const wxColour& col, wxFloodFillStyle style); - -bool wxGTKCairoDCImpl::DoFloodFill(int x, int y, const wxColour& col, wxFloodFillStyle style) -{ - return wxDoFloodFill(GetOwner(), x, y, col, style); -} -#endif - -wxBitmap wxGTKCairoDCImpl::DoGetAsBitmap(const wxRect* /*subrect*/) const -{ - wxFAIL_MSG("DoGetAsBitmap not implemented"); - return wxBitmap(); -} - -bool wxGTKCairoDCImpl::DoGetPixel(int x, int y, wxColour* col) const -{ - if (col) - { - cairo_t* cr = NULL; - if (m_graphicContext) - cr = static_cast(m_graphicContext->GetNativeContext()); - if (cr) - { - cairo_surface_t* surface = cairo_get_target(cr); - x = LogicalToDeviceX(x); - y = LogicalToDeviceY(y); - GdkPixbuf* pixbuf = gdk_pixbuf_get_from_surface(surface, x, y, 1, 1); - if (pixbuf) - { - const guchar* src = gdk_pixbuf_get_pixels(pixbuf); - col->Set(src[0], src[1], src[2]); - g_object_unref(pixbuf); - return true; - } - *col = wxColour(); - } - } - return false; -} - -void wxGTKCairoDCImpl::DoGetSize(int* width, int* height) const -{ - if (width) - *width = m_width; - if (height) - *height = m_height; -} - -bool wxGTKCairoDCImpl::DoStretchBlit(int xdest, int ydest, int dstWidth, int dstHeight, wxDC* source, int xsrc, int ysrc, int srcWidth, int srcHeight, wxRasterOperationMode rop, bool useMask, int xsrcMask, int ysrcMask) -{ - wxCHECK_MSG(IsOk(), false, "invalid DC"); - wxCHECK_MSG(source && source->IsOk(), false, "invalid source DC"); - - cairo_t* cr = NULL; - if (m_graphicContext) - cr = static_cast(m_graphicContext->GetNativeContext()); - cairo_t* cr_src = NULL; - wxGraphicsContext* gc_src = source->GetGraphicsContext(); - if (gc_src) - cr_src = static_cast(gc_src->GetNativeContext()); - - if (cr == NULL || cr_src == NULL) - return false; - - const int xsrc_dev = source->LogicalToDeviceX(xsrc); - const int ysrc_dev = source->LogicalToDeviceY(ysrc); - - cairo_surface_t* surface = cairo_get_target(cr_src); - cairo_surface_flush(surface); - cairo_save(cr); - cairo_translate(cr, xdest, ydest); - cairo_rectangle(cr, 0, 0, dstWidth, dstHeight); - double sx, sy; - source->GetUserScale(&sx, &sy); - cairo_scale(cr, dstWidth / (sx * srcWidth), dstHeight / (sy * srcHeight)); - cairo_set_source_surface(cr, surface, -xsrc_dev, -ysrc_dev); - const wxRasterOperationMode rop_save = m_logicalFunction; - SetLogicalFunction(rop); - cairo_pattern_set_filter(cairo_get_source(cr), CAIRO_FILTER_NEAREST); - cairo_surface_t* maskSurf = NULL; - if (useMask) - { - const wxBitmap& bitmap = source->GetImpl()->GetSelectedBitmap(); - if (bitmap.IsOk()) - { - wxMask* mask = bitmap.GetMask(); - if (mask) - maskSurf = *mask; - } - } - if (maskSurf) - { - int xsrcMask_dev = xsrc_dev; - int ysrcMask_dev = ysrc_dev; - if (xsrcMask != -1) - xsrcMask_dev = source->LogicalToDeviceX(xsrcMask); - if (ysrcMask != -1) - ysrcMask_dev = source->LogicalToDeviceY(ysrcMask); - cairo_clip(cr); - cairo_mask_surface(cr, maskSurf, -xsrcMask_dev, -ysrcMask_dev); - } - else - { - cairo_fill(cr); - } - cairo_restore(cr); - m_logicalFunction = rop_save; - return true; -} - -void* wxGTKCairoDCImpl::GetCairoContext() const -{ - cairo_t* cr = NULL; - if (m_graphicContext) - cr = static_cast(m_graphicContext->GetNativeContext()); - return cr; -} -//----------------------------------------------------------------------------- - -wxWindowDCImpl::wxWindowDCImpl(wxWindowDC* owner, wxWindow* window) - : base_type(owner, window) -{ - GtkWidget* widget = window->m_wxwindow; - if (widget == NULL) - widget = window->m_widget; - GdkWindow* gdkWindow = NULL; - if (widget) - { - gdkWindow = gtk_widget_get_window(widget); - m_ok = true; - } - if (gdkWindow) - { - cairo_t* cr = gdk_cairo_create(gdkWindow); - wxGraphicsContext* gc = wxGraphicsContext::CreateFromNative(cr); - gc->EnableOffset(m_contentScaleFactor <= 1); - SetGraphicsContext(gc); - GtkAllocation a; - gtk_widget_get_allocation(widget, &a); - int x, y; - if (gtk_widget_get_has_window(widget)) - { - m_width = gdk_window_get_width(gdkWindow); - m_height = gdk_window_get_height(gdkWindow); - x = m_width - a.width; - y = m_height - a.height; - } - else - { - m_width = a.width; - m_height = a.height; - x = a.x; - y = a.y; - cairo_rectangle(cr, a.x, a.y, a.width, a.height); - cairo_clip(cr); - } - if (x || y) - SetDeviceLocalOrigin(x, y); - } - else - SetGraphicsContext(wxGraphicsContext::Create()); -} -//----------------------------------------------------------------------------- - -wxClientDCImpl::wxClientDCImpl(wxClientDC* owner, wxWindow* window) - : base_type(owner, window) -{ - GtkWidget* widget = window->m_wxwindow; - if (widget == NULL) - widget = window->m_widget; - GdkWindow* gdkWindow = NULL; - if (widget) - { - gdkWindow = gtk_widget_get_window(widget); - m_ok = true; - } - if (gdkWindow) - { - cairo_t* cr = gdk_cairo_create(gdkWindow); - wxGraphicsContext* gc = wxGraphicsContext::CreateFromNative(cr); - gc->EnableOffset(m_contentScaleFactor <= 1); - SetGraphicsContext(gc); - if (gtk_widget_get_has_window(widget)) - { - m_width = gdk_window_get_width(gdkWindow); - m_height = gdk_window_get_height(gdkWindow); - } - else - { - GtkAllocation a; - gtk_widget_get_allocation(widget, &a); - m_width = a.width; - m_height = a.height; - cairo_rectangle(cr, a.x, a.y, a.width, a.height); - cairo_clip(cr); - SetDeviceLocalOrigin(a.x, a.y); - } - } - else - SetGraphicsContext(wxGraphicsContext::Create()); -} -//----------------------------------------------------------------------------- - -wxPaintDCImpl::wxPaintDCImpl(wxPaintDC* owner, wxWindow* window) - : base_type(owner, window) -{ - cairo_t* cr = window->GTKPaintContext(); - wxCHECK_RET(cr, "using wxPaintDC without being in a native paint event"); - GdkWindow* gdkWindow = gtk_widget_get_window(window->m_wxwindow); - m_width = gdk_window_get_width(gdkWindow); - m_height = gdk_window_get_height(gdkWindow); - cairo_reference(cr); - wxGraphicsContext* gc = wxGraphicsContext::CreateFromNative(cr); - gc->EnableOffset(m_contentScaleFactor <= 1); - SetGraphicsContext(gc); -} -//----------------------------------------------------------------------------- - -wxScreenDCImpl::wxScreenDCImpl(wxScreenDC* owner) - : base_type(owner, 0) -{ - GdkWindow* window = gdk_get_default_root_window(); - m_width = gdk_window_get_width(window); - m_height = gdk_window_get_height(window); - cairo_t* cr = gdk_cairo_create(window); - wxGraphicsContext* gc = wxGraphicsContext::CreateFromNative(cr); - gc->EnableOffset(m_contentScaleFactor <= 1); - SetGraphicsContext(gc); -} -//----------------------------------------------------------------------------- - -wxMemoryDCImpl::wxMemoryDCImpl(wxMemoryDC* owner) - : base_type(owner) -{ - m_ok = false; -} - -wxMemoryDCImpl::wxMemoryDCImpl(wxMemoryDC* owner, wxBitmap& bitmap) - : base_type(owner, 0) - , m_bitmap(bitmap) -{ - Setup(); -} - -wxMemoryDCImpl::wxMemoryDCImpl(wxMemoryDC* owner, wxDC*) - : base_type(owner) -{ - m_ok = false; -} - -wxBitmap wxMemoryDCImpl::DoGetAsBitmap(const wxRect* subrect) const -{ - return subrect ? m_bitmap.GetSubBitmap(*subrect) : m_bitmap; -} - -void wxMemoryDCImpl::DoSelect(const wxBitmap& bitmap) -{ - m_bitmap = bitmap; - Setup(); -} - -const wxBitmap& wxMemoryDCImpl::GetSelectedBitmap() const -{ - return m_bitmap; -} - -wxBitmap& wxMemoryDCImpl::GetSelectedBitmap() -{ - return m_bitmap; -} - -void wxMemoryDCImpl::Setup() -{ - wxGraphicsContext* gc = NULL; - m_ok = m_bitmap.IsOk(); - if (m_ok) - { - m_width = int(m_bitmap.GetScaledWidth()); - m_height = int(m_bitmap.GetScaledHeight()); - m_contentScaleFactor = m_bitmap.GetScaleFactor(); - cairo_t* cr = m_bitmap.CairoCreate(); - gc = wxGraphicsContext::CreateFromNative(cr); - gc->EnableOffset(m_contentScaleFactor <= 1); - } - SetGraphicsContext(gc); -} -//----------------------------------------------------------------------------- - -wxGTKCairoDC::wxGTKCairoDC(cairo_t* cr, wxWindow* window) - : base_type(new wxGTKCairoDCImpl(this, window->GetContentScaleFactor())) -{ - cairo_reference(cr); - wxGraphicsContext* gc = wxGraphicsContext::CreateFromNative(cr); - gc->EnableOffset(window->GetContentScaleFactor() <= 1); - SetGraphicsContext(gc); -} - -#else - -#include "wx/gtk/dc.h" - -//----------------------------------------------------------------------------- -// wxGTKDCImpl -//----------------------------------------------------------------------------- - -wxIMPLEMENT_ABSTRACT_CLASS(wxGTKDCImpl, wxDCImpl); - -wxGTKDCImpl::wxGTKDCImpl( wxDC *owner ) - : wxDCImpl( owner ) -{ - m_ok = FALSE; - - m_pen = *wxBLACK_PEN; - m_font = *wxNORMAL_FONT; - m_brush = *wxWHITE_BRUSH; -} - -wxGTKDCImpl::~wxGTKDCImpl() -{ -} - -void wxGTKDCImpl::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) -{ - m_clipping = TRUE; - m_clipX1 = x; - m_clipY1 = y; - m_clipX2 = x + width; - m_clipY2 = y + height; -} - -// --------------------------------------------------------------------------- -// get DC capabilities -// --------------------------------------------------------------------------- - -void wxGTKDCImpl::DoGetSizeMM( int* width, int* height ) const -{ - int w = 0; - int h = 0; - GetOwner()->GetSize( &w, &h ); - if (width) *width = int( double(w) / (m_userScaleX*m_mm_to_pix_x) ); - if (height) *height = int( double(h) / (m_userScaleY*m_mm_to_pix_y) ); -} - -// Resolution in pixels per logical inch -wxSize wxGTKDCImpl::GetPPI() const -{ - // TODO (should probably be pure virtual) - return wxSize(0, 0); -} -#endif diff --git a/Externals/wxWidgets3/src/gtk/dcclient.cpp b/Externals/wxWidgets3/src/gtk/dcclient.cpp deleted file mode 100644 index 1a3d60cc8e..0000000000 --- a/Externals/wxWidgets3/src/gtk/dcclient.cpp +++ /dev/null @@ -1,2128 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/dcclient.cpp -// Purpose: wxWindowDCImpl implementation -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling, Chris Breeze -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#include "wx/gtk/dcclient.h" - -#ifndef WX_PRECOMP - #include "wx/window.h" - #include "wx/log.h" - #include "wx/dcmemory.h" - #include "wx/math.h" - #include "wx/image.h" - #include "wx/module.h" -#endif - -#include "wx/fontutil.h" - -#include "wx/gtk/private.h" -#include "wx/gtk/private/object.h" -#include "wx/private/textmeasure.h" - -//----------------------------------------------------------------------------- -// local defines -//----------------------------------------------------------------------------- - -#define XLOG2DEV(x) LogicalToDeviceX(x) -#define XLOG2DEVREL(x) LogicalToDeviceXRel(x) -#define YLOG2DEV(y) LogicalToDeviceY(y) -#define YLOG2DEVREL(y) LogicalToDeviceYRel(y) - -#define USE_PAINT_REGION 1 - -//----------------------------------------------------------------------------- -// local data -//----------------------------------------------------------------------------- - -#include "bdiag.xbm" -#include "fdiag.xbm" -#include "cdiag.xbm" -#include "horiz.xbm" -#include "verti.xbm" -#include "cross.xbm" - -static GdkPixmap* hatches[wxBRUSHSTYLE_LAST_HATCH - wxBRUSHSTYLE_FIRST_HATCH + 1]; - -//----------------------------------------------------------------------------- -// constants -//----------------------------------------------------------------------------- - -static const double RAD2DEG = 180.0 / M_PI; - -// ---------------------------------------------------------------------------- -// private functions -// ---------------------------------------------------------------------------- - -static inline double dmax(double a, double b) { return a > b ? a : b; } -static inline double dmin(double a, double b) { return a < b ? a : b; } - -static GdkPixmap* GetHatch(int style) -{ - wxASSERT(style >= wxBRUSHSTYLE_FIRST_HATCH && style <= wxBRUSHSTYLE_LAST_HATCH); - const int i = style - wxBRUSHSTYLE_FIRST_HATCH; - if (hatches[i] == NULL) - { - // This macro creates a bitmap from an XBM file included above. Notice - // the need for the cast because gdk_bitmap_create_from_data() doesn't - // accept unsigned data but the arrays in XBM need to be unsigned to - // avoid warnings (and even errors in C+0x mode) from g++. -#define CREATE_FROM_XBM_DATA(name) \ - gdk_bitmap_create_from_data \ - ( \ - NULL, \ - reinterpret_cast(name ## _bits), \ - name ## _width, \ - name ## _height \ - ) - - switch (style) - { - case wxBRUSHSTYLE_BDIAGONAL_HATCH: - hatches[i] = CREATE_FROM_XBM_DATA(bdiag); - break; - case wxBRUSHSTYLE_CROSSDIAG_HATCH: - hatches[i] = CREATE_FROM_XBM_DATA(cdiag); - break; - case wxBRUSHSTYLE_CROSS_HATCH: - hatches[i] = CREATE_FROM_XBM_DATA(cross); - break; - case wxBRUSHSTYLE_FDIAGONAL_HATCH: - hatches[i] = CREATE_FROM_XBM_DATA(fdiag); - break; - case wxBRUSHSTYLE_HORIZONTAL_HATCH: - hatches[i] = CREATE_FROM_XBM_DATA(horiz); - break; - case wxBRUSHSTYLE_VERTICAL_HATCH: - hatches[i] = CREATE_FROM_XBM_DATA(verti); - break; - } - -#undef CREATE_FROM_XBM_DATA - } - return hatches[i]; -} - -//----------------------------------------------------------------------------- -// Implement Pool of Graphic contexts. Creating them takes too much time. -//----------------------------------------------------------------------------- - -enum wxPoolGCType -{ - wxGC_ERROR = 0, - wxTEXT_MONO, - wxBG_MONO, - wxPEN_MONO, - wxBRUSH_MONO, - wxTEXT_COLOUR, - wxBG_COLOUR, - wxPEN_COLOUR, - wxBRUSH_COLOUR, - wxTEXT_SCREEN, - wxBG_SCREEN, - wxPEN_SCREEN, - wxBRUSH_SCREEN, - wxTEXT_COLOUR_ALPHA, - wxBG_COLOUR_ALPHA, - wxPEN_COLOUR_ALPHA, - wxBRUSH_COLOUR_ALPHA -}; - -struct wxGC -{ - GdkGC *m_gc; - wxPoolGCType m_type; - bool m_used; -}; - -#define GC_POOL_ALLOC_SIZE 100 - -static int wxGCPoolSize = 0; - -static wxGC *wxGCPool = NULL; - -static void wxInitGCPool() -{ - // This really could wait until the first call to - // wxGetPoolGC, but we will make the first allocation - // now when other initialization is being performed. - - // Set initial pool size. - wxGCPoolSize = GC_POOL_ALLOC_SIZE; - - // Allocate initial pool. - wxGCPool = (wxGC *)malloc(wxGCPoolSize * sizeof(wxGC)); - if (wxGCPool == NULL) - { - // If we cannot malloc, then fail with error - // when debug is enabled. If debug is not enabled, - // the problem will eventually get caught - // in wxGetPoolGC. - wxFAIL_MSG( wxT("Cannot allocate GC pool") ); - return; - } - - // Zero initial pool. - memset(wxGCPool, 0, wxGCPoolSize * sizeof(wxGC)); -} - -static void wxCleanUpGCPool() -{ - for (int i = 0; i < wxGCPoolSize; i++) - { - if (wxGCPool[i].m_gc) - g_object_unref (wxGCPool[i].m_gc); - } - - free(wxGCPool); - wxGCPool = NULL; - wxGCPoolSize = 0; -} - -static GdkGC* wxGetPoolGC( GdkWindow *window, wxPoolGCType type ) -{ - wxGC *pptr; - - // Look for an available GC. - for (int i = 0; i < wxGCPoolSize; i++) - { - if (!wxGCPool[i].m_gc) - { - wxGCPool[i].m_gc = gdk_gc_new( window ); - gdk_gc_set_exposures( wxGCPool[i].m_gc, FALSE ); - wxGCPool[i].m_type = type; - wxGCPool[i].m_used = false; - } - if ((!wxGCPool[i].m_used) && (wxGCPool[i].m_type == type)) - { - wxGCPool[i].m_used = true; - return wxGCPool[i].m_gc; - } - } - - // We did not find an available GC. - // We need to grow the GC pool. - pptr = (wxGC *)realloc(wxGCPool, - (wxGCPoolSize + GC_POOL_ALLOC_SIZE)*sizeof(wxGC)); - if (pptr != NULL) - { - // Initialize newly allocated pool. - wxGCPool = pptr; - memset(&wxGCPool[wxGCPoolSize], 0, - GC_POOL_ALLOC_SIZE*sizeof(wxGC)); - - // Initialize entry we will return. - wxGCPool[wxGCPoolSize].m_gc = gdk_gc_new( window ); - gdk_gc_set_exposures( wxGCPool[wxGCPoolSize].m_gc, FALSE ); - wxGCPool[wxGCPoolSize].m_type = type; - wxGCPool[wxGCPoolSize].m_used = true; - - // Set new value of pool size. - wxGCPoolSize += GC_POOL_ALLOC_SIZE; - - // Return newly allocated entry. - return wxGCPool[wxGCPoolSize-GC_POOL_ALLOC_SIZE].m_gc; - } - - // The realloc failed. Fall through to error. - wxFAIL_MSG( wxT("No GC available") ); - - return NULL; -} - -static void wxFreePoolGC( GdkGC *gc ) -{ - for (int i = 0; i < wxGCPoolSize; i++) - { - if (wxGCPool[i].m_gc == gc) - { - wxGCPool[i].m_used = false; - return; - } - } - - wxFAIL_MSG( wxT("Wrong GC") ); -} - -//----------------------------------------------------------------------------- -// wxWindowDC -//----------------------------------------------------------------------------- - -wxIMPLEMENT_ABSTRACT_CLASS(wxWindowDCImpl, wxGTKDCImpl); - -wxWindowDCImpl::wxWindowDCImpl( wxDC *owner ) : - wxGTKDCImpl( owner ) -{ - m_gdkwindow = NULL; - m_penGC = NULL; - m_brushGC = NULL; - m_textGC = NULL; - m_bgGC = NULL; - m_cmap = NULL; - m_isScreenDC = false; - m_context = NULL; - m_layout = NULL; - m_fontdesc = NULL; -} - -wxWindowDCImpl::wxWindowDCImpl( wxDC *owner, wxWindow *window ) : - wxGTKDCImpl( owner ) -{ - wxASSERT_MSG( window, wxT("DC needs a window") ); - - m_gdkwindow = NULL; - m_penGC = NULL; - m_brushGC = NULL; - m_textGC = NULL; - m_bgGC = NULL; - m_cmap = NULL; - m_isScreenDC = false; - m_font = window->GetFont(); - - GtkWidget *widget = window->m_wxwindow; - m_gdkwindow = window->GTKGetDrawingWindow(); - - // Some controls don't have m_wxwindow - like wxStaticBox, but the user - // code should still be able to create wxClientDCs for them - if ( !widget ) - { - widget = window->m_widget; - - wxCHECK_RET(widget, "DC needs a widget"); - - m_gdkwindow = widget->window; - if (!gtk_widget_get_has_window(widget)) - SetDeviceLocalOrigin(widget->allocation.x, widget->allocation.y); - } - - m_context = window->GTKGetPangoDefaultContext(); - m_layout = pango_layout_new( m_context ); - m_fontdesc = pango_font_description_copy( widget->style->font_desc ); - - // Window not realized ? - if (!m_gdkwindow) - { - // Don't report problems as per MSW. - m_ok = true; - - return; - } - - m_cmap = gtk_widget_get_colormap(widget); - - SetUpDC(); - - /* this must be done after SetUpDC, bacause SetUpDC calls the - repective SetBrush, SetPen, SetBackground etc functions - to set up the DC. SetBackground call m_owner->SetBackground - and this might not be desired as the standard dc background - is white whereas a window might assume gray to be the - standard (as e.g. wxStatusBar) */ - - m_window = window; - - if (m_window && m_window->m_wxwindow && - (m_window->GetLayoutDirection() == wxLayout_RightToLeft)) - { - // reverse sense - m_signX = -1; - - // origin in the upper right corner - m_deviceOriginX = m_window->GetClientSize().x; - } -} - -wxWindowDCImpl::~wxWindowDCImpl() -{ - Destroy(); - - if (m_layout) - g_object_unref (m_layout); - if (m_fontdesc) - pango_font_description_free( m_fontdesc ); -} - -void wxWindowDCImpl::SetUpDC( bool isMemDC ) -{ - m_ok = true; - - wxASSERT_MSG( !m_penGC, wxT("GCs already created") ); - - bool done = false; - - if ((isMemDC) && (GetSelectedBitmap().IsOk())) - { - if (GetSelectedBitmap().GetDepth() == 1) - { - m_penGC = wxGetPoolGC( m_gdkwindow, wxPEN_MONO ); - m_brushGC = wxGetPoolGC( m_gdkwindow, wxBRUSH_MONO ); - m_textGC = wxGetPoolGC( m_gdkwindow, wxTEXT_MONO ); - m_bgGC = wxGetPoolGC( m_gdkwindow, wxBG_MONO ); - done = true; - } - } - - if (!done) - { - if (m_isScreenDC) - { - m_penGC = wxGetPoolGC( m_gdkwindow, wxPEN_SCREEN ); - m_brushGC = wxGetPoolGC( m_gdkwindow, wxBRUSH_SCREEN ); - m_textGC = wxGetPoolGC( m_gdkwindow, wxTEXT_SCREEN ); - m_bgGC = wxGetPoolGC( m_gdkwindow, wxBG_SCREEN ); - } -#if GTK_CHECK_VERSION(2,12,0) - // gdk_screen_get_rgba_colormap was added in 2.8, but this code is for - // compositing which requires 2.12 - else if (gtk_check_version(2,12,0) == NULL && - m_cmap == gdk_screen_get_rgba_colormap(gdk_colormap_get_screen(m_cmap))) - { - m_penGC = wxGetPoolGC( m_gdkwindow, wxPEN_COLOUR_ALPHA ); - m_brushGC = wxGetPoolGC( m_gdkwindow, wxBRUSH_COLOUR_ALPHA ); - m_textGC = wxGetPoolGC( m_gdkwindow, wxTEXT_COLOUR_ALPHA ); - m_bgGC = wxGetPoolGC( m_gdkwindow, wxBG_COLOUR_ALPHA ); - } -#endif - else - { - m_penGC = wxGetPoolGC( m_gdkwindow, wxPEN_COLOUR ); - m_brushGC = wxGetPoolGC( m_gdkwindow, wxBRUSH_COLOUR ); - m_textGC = wxGetPoolGC( m_gdkwindow, wxTEXT_COLOUR ); - m_bgGC = wxGetPoolGC( m_gdkwindow, wxBG_COLOUR ); - } - } - - /* background colour */ - m_backgroundBrush = *wxWHITE_BRUSH; - m_backgroundBrush.GetColour().CalcPixel( m_cmap ); - const GdkColor *bg_col = m_backgroundBrush.GetColour().GetColor(); - - /* m_textGC */ - m_textForegroundColour.CalcPixel( m_cmap ); - gdk_gc_set_foreground( m_textGC, m_textForegroundColour.GetColor() ); - - m_textBackgroundColour.CalcPixel( m_cmap ); - gdk_gc_set_background( m_textGC, m_textBackgroundColour.GetColor() ); - - gdk_gc_set_fill( m_textGC, GDK_SOLID ); - - gdk_gc_set_colormap( m_textGC, m_cmap ); - - /* m_penGC */ - m_pen.GetColour().CalcPixel( m_cmap ); - gdk_gc_set_foreground( m_penGC, m_pen.GetColour().GetColor() ); - gdk_gc_set_background( m_penGC, bg_col ); - - gdk_gc_set_line_attributes( m_penGC, 0, GDK_LINE_SOLID, GDK_CAP_NOT_LAST, GDK_JOIN_ROUND ); - - /* m_brushGC */ - m_brush.GetColour().CalcPixel( m_cmap ); - gdk_gc_set_foreground( m_brushGC, m_brush.GetColour().GetColor() ); - gdk_gc_set_background( m_brushGC, bg_col ); - - gdk_gc_set_fill( m_brushGC, GDK_SOLID ); - - /* m_bgGC */ - gdk_gc_set_background( m_bgGC, bg_col ); - gdk_gc_set_foreground( m_bgGC, bg_col ); - - gdk_gc_set_fill( m_bgGC, GDK_SOLID ); - - /* ROPs */ - gdk_gc_set_function( m_textGC, GDK_COPY ); - gdk_gc_set_function( m_brushGC, GDK_COPY ); - gdk_gc_set_function( m_penGC, GDK_COPY ); - - /* clipping */ - gdk_gc_set_clip_rectangle( m_penGC, NULL ); - gdk_gc_set_clip_rectangle( m_brushGC, NULL ); - gdk_gc_set_clip_rectangle( m_textGC, NULL ); - gdk_gc_set_clip_rectangle( m_bgGC, NULL ); -} - -void wxWindowDCImpl::DoGetSize( int* width, int* height ) const -{ - wxCHECK_RET( m_window, wxT("GetSize() doesn't work without window") ); - - m_window->GetSize(width, height); -} - -bool wxWindowDCImpl::DoFloodFill(wxCoord x, wxCoord y, - const wxColour& col, wxFloodFillStyle style) -{ -#if wxUSE_IMAGE - extern bool wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y, - const wxColour & col, wxFloodFillStyle style); - - return wxDoFloodFill( GetOwner(), x, y, col, style); -#else - wxUnusedVar(x); - wxUnusedVar(y); - wxUnusedVar(col); - wxUnusedVar(style); - - return false; -#endif -} - -bool wxWindowDCImpl::DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const -{ - GdkImage* image = NULL; - if (m_gdkwindow) - { - const int x = LogicalToDeviceX(x1); - const int y = LogicalToDeviceY(y1); - wxRect rect; - gdk_drawable_get_size(m_gdkwindow, &rect.width, &rect.height); - if (rect.Contains(x, y)) - image = gdk_drawable_get_image(m_gdkwindow, x, y, 1, 1); - } - if (image == NULL) - { - *col = wxColour(); - return false; - } - GdkColormap* colormap = gdk_image_get_colormap(image); - const unsigned pixel = gdk_image_get_pixel(image, 0, 0); - if (colormap == NULL) - *col = pixel ? m_textForegroundColour : m_textBackgroundColour; - else - { - GdkColor c; - gdk_colormap_query_color(colormap, pixel, &c); - col->Set(c.red >> 8, c.green >> 8, c.blue >> 8); - } - g_object_unref(image); - return true; -} - -void wxWindowDCImpl::DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 ) -{ - wxCHECK_RET( IsOk(), wxT("invalid window dc") ); - - if ( m_pen.IsNonTransparent() ) - { - if (m_gdkwindow) - gdk_draw_line( m_gdkwindow, m_penGC, XLOG2DEV(x1), YLOG2DEV(y1), XLOG2DEV(x2), YLOG2DEV(y2) ); - - CalcBoundingBox(x1, y1); - CalcBoundingBox(x2, y2); - } -} - -void wxWindowDCImpl::DoCrossHair( wxCoord x, wxCoord y ) -{ - wxCHECK_RET( IsOk(), wxT("invalid window dc") ); - - if ( m_pen.IsNonTransparent() ) - { - int w = 0; - int h = 0; - GetOwner()->GetSize( &w, &h ); - wxCoord xx = XLOG2DEV(x); - wxCoord yy = YLOG2DEV(y); - if (m_gdkwindow) - { - gdk_draw_line( m_gdkwindow, m_penGC, 0, yy, XLOG2DEVREL(w), yy ); - gdk_draw_line( m_gdkwindow, m_penGC, xx, 0, xx, YLOG2DEVREL(h) ); - } - } -} - -void wxWindowDCImpl::DrawingSetup(GdkGC*& gc, bool& originChanged) -{ - gc = m_brushGC; - GdkPixmap* pixmap = NULL; - const int style = m_brush.GetStyle(); - - if (style == wxBRUSHSTYLE_STIPPLE || style == wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE) - { - const wxBitmap* stipple = m_brush.GetStipple(); - if (stipple->IsOk()) - { - if (style == wxBRUSHSTYLE_STIPPLE) - pixmap = stipple->GetPixmap(); - else if (stipple->GetMask()) - { - pixmap = stipple->GetPixmap(); - gc = m_textGC; - } - } - } - else if (m_brush.IsHatch()) - { - pixmap = GetHatch(style); - } - - int origin_x = 0; - int origin_y = 0; - if (pixmap) - { - int w, h; - gdk_drawable_get_size(pixmap, &w, &h); - origin_x = m_deviceOriginX % w; - origin_y = m_deviceOriginY % h; - } - - originChanged = origin_x || origin_y; - if (originChanged) - gdk_gc_set_ts_origin(gc, origin_x, origin_y); -} - -void wxWindowDCImpl::DoDrawArc( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, - wxCoord xc, wxCoord yc ) -{ - wxCHECK_RET( IsOk(), wxT("invalid window dc") ); - - wxCoord xx1 = XLOG2DEV(x1); - wxCoord yy1 = YLOG2DEV(y1); - wxCoord xx2 = XLOG2DEV(x2); - wxCoord yy2 = YLOG2DEV(y2); - wxCoord xxc = XLOG2DEV(xc); - wxCoord yyc = YLOG2DEV(yc); - double dx = xx1 - xxc; - double dy = yy1 - yyc; - double radius = sqrt((double)(dx*dx+dy*dy)); - wxCoord r = (wxCoord)radius; - double radius1, radius2; - - if (xx1 == xx2 && yy1 == yy2) - { - radius1 = 0.0; - radius2 = 360.0; - } - else if ( wxIsNullDouble(radius) ) - { - radius1 = - radius2 = 0.0; - } - else - { - radius1 = (xx1 - xxc == 0) ? - (yy1 - yyc < 0) ? 90.0 : -90.0 : - -atan2(double(yy1-yyc), double(xx1-xxc)) * RAD2DEG; - radius2 = (xx2 - xxc == 0) ? - (yy2 - yyc < 0) ? 90.0 : -90.0 : - -atan2(double(yy2-yyc), double(xx2-xxc)) * RAD2DEG; - } - wxCoord alpha1 = wxCoord(radius1 * 64.0); - wxCoord alpha2 = wxCoord((radius2 - radius1) * 64.0); - while (alpha2 <= 0) alpha2 += 360*64; - while (alpha1 > 360*64) alpha1 -= 360*64; - - if (m_gdkwindow) - { - if ( m_brush.IsNonTransparent() ) - { - GdkGC* gc; - bool originChanged; - DrawingSetup(gc, originChanged); - - gdk_draw_arc(m_gdkwindow, gc, true, xxc-r, yyc-r, 2*r, 2*r, alpha1, alpha2); - - if (originChanged) - gdk_gc_set_ts_origin(gc, 0, 0); - } - - if ( m_pen.IsNonTransparent() ) - { - gdk_draw_arc( m_gdkwindow, m_penGC, FALSE, xxc-r, yyc-r, 2*r,2*r, alpha1, alpha2 ); - - if ( m_brush.IsNonTransparent() && (alpha2 - alpha1 != 360*64) ) - { - gdk_draw_line( m_gdkwindow, m_penGC, xx1, yy1, xxc, yyc ); - gdk_draw_line( m_gdkwindow, m_penGC, xxc, yyc, xx2, yy2 ); - } - } - } - - CalcBoundingBox (x1, y1); - CalcBoundingBox (x2, y2); -} - -void wxWindowDCImpl::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord width, wxCoord height, double sa, double ea ) -{ - wxCHECK_RET( IsOk(), wxT("invalid window dc") ); - - wxCoord xx = XLOG2DEV(x); - wxCoord yy = YLOG2DEV(y); - wxCoord ww = m_signX * XLOG2DEVREL(width); - wxCoord hh = m_signY * YLOG2DEVREL(height); - - // CMB: handle -ve width and/or height - if (ww < 0) { ww = -ww; xx = xx - ww; } - if (hh < 0) { hh = -hh; yy = yy - hh; } - - if (m_gdkwindow) - { - wxCoord start = wxCoord(sa * 64.0); - wxCoord end = wxCoord((ea-sa) * 64.0); - // We want to draw always in the counter-clokwise direction. - if (end < 0) - { - end = end % (360*64) + 360*64; - } - // If end angle equals start engle we want to draw a full ellipse. - if (end == 0) - { - end = 360*64; - } - - if ( m_brush.IsNonTransparent() ) - { - GdkGC* gc; - bool originChanged; - DrawingSetup(gc, originChanged); - - gdk_draw_arc(m_gdkwindow, gc, true, xx, yy, ww, hh, start, end); - - if (originChanged) - gdk_gc_set_ts_origin(gc, 0, 0); - } - - if ( m_pen.IsNonTransparent() ) - gdk_draw_arc( m_gdkwindow, m_penGC, FALSE, xx, yy, ww, hh, start, end ); - } - - CalcBoundingBox (x, y); - CalcBoundingBox (x + width, y + height); -} - -void wxWindowDCImpl::DoDrawPoint( wxCoord x, wxCoord y ) -{ - wxCHECK_RET( IsOk(), wxT("invalid window dc") ); - - if ( m_pen.IsNonTransparent() && m_gdkwindow ) - gdk_draw_point( m_gdkwindow, m_penGC, XLOG2DEV(x), YLOG2DEV(y) ); - - CalcBoundingBox (x, y); -} - -void wxWindowDCImpl::DoDrawLines( int n, const wxPoint points[], wxCoord xoffset, wxCoord yoffset ) -{ - wxCHECK_RET( IsOk(), wxT("invalid window dc") ); - - if (n <= 0) return; - - if ( m_pen.IsTransparent() ) - return; - - //Check, if scaling is necessary - const bool doScale = - xoffset != 0 || yoffset != 0 || XLOG2DEV(10) != 10 || YLOG2DEV(10) != 10; - - // GdkPoint and wxPoint have the same memory layout, so we can cast one to the other - const GdkPoint* gpts = reinterpret_cast(points); - GdkPoint* gpts_alloc = NULL; - - if (doScale) - { - gpts_alloc = new GdkPoint[n]; - gpts = gpts_alloc; - } - - for (int i = 0; i < n; i++) - { - if (doScale) - { - gpts_alloc[i].x = XLOG2DEV(points[i].x + xoffset); - gpts_alloc[i].y = YLOG2DEV(points[i].y + yoffset); - } - CalcBoundingBox(points[i].x + xoffset, points[i].y + yoffset); - } - - if (m_gdkwindow) - gdk_draw_lines( m_gdkwindow, m_penGC, (GdkPoint*) gpts, n); - - delete[] gpts_alloc; -} - -void wxWindowDCImpl::DoDrawPolygon( int n, const wxPoint points[], - wxCoord xoffset, wxCoord yoffset, - wxPolygonFillMode WXUNUSED(fillStyle) ) -{ - wxCHECK_RET( IsOk(), wxT("invalid window dc") ); - - if (n <= 0) return; - - //Check, if scaling is necessary - const bool doScale = - xoffset != 0 || yoffset != 0 || XLOG2DEV(10) != 10 || YLOG2DEV(10) != 10; - - // GdkPoint and wxPoint have the same memory layout, so we can cast one to the other - const GdkPoint* gdkpoints = reinterpret_cast(points); - GdkPoint* gdkpoints_alloc = NULL; - - if (doScale) - { - gdkpoints_alloc = new GdkPoint[n]; - gdkpoints = gdkpoints_alloc; - } - - int i; - for (i = 0 ; i < n ; i++) - { - if (doScale) - { - gdkpoints_alloc[i].x = XLOG2DEV(points[i].x + xoffset); - gdkpoints_alloc[i].y = YLOG2DEV(points[i].y + yoffset); - } - CalcBoundingBox(points[i].x + xoffset, points[i].y + yoffset); - } - - if (m_gdkwindow) - { - if ( m_brush.IsNonTransparent() ) - { - GdkGC* gc; - bool originChanged; - DrawingSetup(gc, originChanged); - - gdk_draw_polygon(m_gdkwindow, gc, true, (GdkPoint*) gdkpoints, n); - - if (originChanged) - gdk_gc_set_ts_origin(gc, 0, 0); - } - - if ( m_pen.IsNonTransparent() ) - { -/* - for (i = 0 ; i < n ; i++) - { - gdk_draw_line( m_gdkwindow, m_penGC, - gdkpoints[i%n].x, - gdkpoints[i%n].y, - gdkpoints[(i+1)%n].x, - gdkpoints[(i+1)%n].y); - } -*/ - gdk_draw_polygon( m_gdkwindow, m_penGC, FALSE, (GdkPoint*) gdkpoints, n ); - - } - } - - delete[] gdkpoints_alloc; -} - -void wxWindowDCImpl::DoDrawRectangle( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) -{ - wxCHECK_RET( IsOk(), wxT("invalid window dc") ); - - wxCoord xx = XLOG2DEV(x); - wxCoord yy = YLOG2DEV(y); - wxCoord ww = m_signX * XLOG2DEVREL(width); - wxCoord hh = m_signY * YLOG2DEVREL(height); - - // CMB: draw nothing if transformed w or h is 0 - if (ww == 0 || hh == 0) return; - - // CMB: handle -ve width and/or height - if (ww < 0) { ww = -ww; xx = xx - ww; } - if (hh < 0) { hh = -hh; yy = yy - hh; } - - if (m_gdkwindow) - { - if ( m_brush.IsNonTransparent() ) - { - GdkGC* gc; - bool originChanged; - DrawingSetup(gc, originChanged); - - gdk_draw_rectangle(m_gdkwindow, gc, true, xx, yy, ww, hh); - - if (originChanged) - gdk_gc_set_ts_origin(gc, 0, 0); - } - - if ( m_pen.IsNonTransparent() ) - { - gdk_draw_rectangle(m_gdkwindow, m_penGC, false, xx, yy, ww - 1, hh - 1); - } - } - - CalcBoundingBox( x, y ); - CalcBoundingBox( x + width, y + height ); -} - -void wxWindowDCImpl::DoDrawRoundedRectangle( wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius ) -{ - wxCHECK_RET( IsOk(), wxT("invalid window dc") ); - - if (radius < 0.0) radius = - radius * ((width < height) ? width : height); - - wxCoord xx = XLOG2DEV(x); - wxCoord yy = YLOG2DEV(y); - wxCoord ww = m_signX * XLOG2DEVREL(width); - wxCoord hh = m_signY * YLOG2DEVREL(height); - wxCoord rr = XLOG2DEVREL((wxCoord)radius); - - // CMB: handle -ve width and/or height - if (ww < 0) { ww = -ww; xx = xx - ww; } - if (hh < 0) { hh = -hh; yy = yy - hh; } - - // CMB: if radius is zero use DrawRectangle() instead to avoid - // X drawing errors with small radii - if (rr == 0) - { - DoDrawRectangle( x, y, width, height ); - return; - } - - // CMB: draw nothing if transformed w or h is 0 - if (ww == 0 || hh == 0) return; - - // CMB: adjust size if outline is drawn otherwise the result is - // 1 pixel too wide and high - if ( m_pen.IsNonTransparent() ) - { - ww--; - hh--; - } - - if (m_gdkwindow) - { - // CMB: ensure dd is not larger than rectangle otherwise we - // get an hour glass shape - wxCoord dd = 2 * rr; - if (dd > ww) dd = ww; - if (dd > hh) dd = hh; - rr = dd / 2; - - if ( m_brush.IsNonTransparent() ) - { - GdkGC* gc; - bool originChanged; - DrawingSetup(gc, originChanged); - - gdk_draw_rectangle(m_gdkwindow, gc, true, xx+rr, yy, ww-dd+1, hh); - gdk_draw_rectangle(m_gdkwindow, gc, true, xx, yy+rr, ww, hh-dd+1); - gdk_draw_arc(m_gdkwindow, gc, true, xx, yy, dd, dd, 90*64, 90*64); - gdk_draw_arc(m_gdkwindow, gc, true, xx+ww-dd, yy, dd, dd, 0, 90*64); - gdk_draw_arc(m_gdkwindow, gc, true, xx+ww-dd, yy+hh-dd, dd, dd, 270*64, 90*64); - gdk_draw_arc(m_gdkwindow, gc, true, xx, yy+hh-dd, dd, dd, 180*64, 90*64); - - if (originChanged) - gdk_gc_set_ts_origin(gc, 0, 0); - } - - if ( m_pen.IsNonTransparent() ) - { - gdk_draw_line( m_gdkwindow, m_penGC, xx+rr+1, yy, xx+ww-rr, yy ); - gdk_draw_line( m_gdkwindow, m_penGC, xx+rr+1, yy+hh, xx+ww-rr, yy+hh ); - gdk_draw_line( m_gdkwindow, m_penGC, xx, yy+rr+1, xx, yy+hh-rr ); - gdk_draw_line( m_gdkwindow, m_penGC, xx+ww, yy+rr+1, xx+ww, yy+hh-rr ); - gdk_draw_arc( m_gdkwindow, m_penGC, FALSE, xx, yy, dd, dd, 90*64, 90*64 ); - gdk_draw_arc( m_gdkwindow, m_penGC, FALSE, xx+ww-dd, yy, dd, dd, 0, 90*64 ); - gdk_draw_arc( m_gdkwindow, m_penGC, FALSE, xx+ww-dd, yy+hh-dd, dd, dd, 270*64, 90*64 ); - gdk_draw_arc( m_gdkwindow, m_penGC, FALSE, xx, yy+hh-dd, dd, dd, 180*64, 90*64 ); - } - } - - // this ignores the radius - CalcBoundingBox( x, y ); - CalcBoundingBox( x + width, y + height ); -} - -void wxWindowDCImpl::DoDrawEllipse( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) -{ - wxCHECK_RET( IsOk(), wxT("invalid window dc") ); - - wxCoord xx = XLOG2DEV(x); - wxCoord yy = YLOG2DEV(y); - wxCoord ww = m_signX * XLOG2DEVREL(width); - wxCoord hh = m_signY * YLOG2DEVREL(height); - - // CMB: handle -ve width and/or height - if (ww < 0) { ww = -ww; xx = xx - ww; } - if (hh < 0) { hh = -hh; yy = yy - hh; } - - if (m_gdkwindow) - { - if ( m_brush.IsNonTransparent() ) - { - GdkGC* gc; - bool originChanged; - DrawingSetup(gc, originChanged); - - // If the pen is transparent pen we increase the size - // for better compatibility with other platforms. - if (m_pen.IsTransparent()) - { - ++ww; - ++hh; - } - - gdk_draw_arc(m_gdkwindow, gc, true, xx, yy, ww, hh, 0, 360*64); - - if (originChanged) - gdk_gc_set_ts_origin(gc, 0, 0); - } - - if ( m_pen.IsNonTransparent() ) - gdk_draw_arc( m_gdkwindow, m_penGC, false, xx, yy, ww, hh, 0, 360*64 ); - } - - CalcBoundingBox( x, y ); - CalcBoundingBox( x + width, y + height ); -} - -void wxWindowDCImpl::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y ) -{ - // VZ: egcs 1.0.3 refuses to compile this without cast, no idea why - DoDrawBitmap( (const wxBitmap&)icon, x, y, true ); -} - -// scale a pixbuf -static GdkPixbuf* -Scale(GdkPixbuf* pixbuf, int dst_w, int dst_h, double sx, double sy) -{ - GdkPixbuf* pixbuf_scaled = gdk_pixbuf_new( - GDK_COLORSPACE_RGB, gdk_pixbuf_get_has_alpha(pixbuf), 8, dst_w, dst_h); - gdk_pixbuf_scale(pixbuf, pixbuf_scaled, - 0, 0, dst_w, dst_h, 0, 0, sx, sy, GDK_INTERP_NEAREST); - return pixbuf_scaled; -} - -// scale part of a pixmap using pixbuf scaling -static GdkPixbuf* -Scale(GdkPixmap* pixmap, int x, int y, int w, int h, int dst_w, int dst_h, double sx, double sy) -{ - GdkPixbuf* pixbuf = gdk_pixbuf_get_from_drawable( - NULL, pixmap, NULL, x, y, 0, 0, w, h); - GdkPixbuf* pixbuf2 = Scale(pixbuf, dst_w, dst_h, sx, sy); - g_object_unref(pixbuf); - return pixbuf2; -} - -// scale part of a mask pixmap -static GdkPixmap* -ScaleMask(GdkPixmap* mask, int x, int y, int w, int h, int dst_w, int dst_h, double sx, double sy) -{ - GdkPixbuf* pixbuf = Scale(mask, x, y, w, h, dst_w, dst_h, sx, sy); - - // convert black and white pixbuf back to a mono pixmap - const unsigned out_rowstride = (dst_w + 7) / 8; - const size_t data_size = out_rowstride * size_t(dst_h); - char* data = new char[data_size]; - char* out = data; - const guchar* row = gdk_pixbuf_get_pixels(pixbuf); - const int rowstride = gdk_pixbuf_get_rowstride(pixbuf); - memset(data, 0, data_size); - for (int j = 0; j < dst_h; j++, row += rowstride, out += out_rowstride) - { - const guchar* in = row; - for (int i = 0; i < dst_w; i++, in += 3) - if (*in) - out[i >> 3] |= 1 << (i & 7); - } - g_object_unref(pixbuf); - GdkPixmap* pixmap = gdk_bitmap_create_from_data(mask, data, dst_w, dst_h); - delete[] data; - return pixmap; -} - -// Make a new mask from part of a mask and a clip region. -static GdkPixmap* -ClipMask(GdkPixmap* mask, GdkRegion* clipRegion, int x, int y, int dst_x, int dst_y, int w, int h) -{ - GdkGCValues gcValues; - gcValues.foreground.pixel = 0; - GdkGC* gc = gdk_gc_new_with_values(mask, &gcValues, GDK_GC_FOREGROUND); - GdkPixmap* pixmap = gdk_pixmap_new(mask, w, h, 1); - // clear new mask, so clipped areas will be masked - gdk_draw_rectangle(pixmap, gc, true, 0, 0, w, h); - gdk_gc_set_clip_region(gc, clipRegion); - gdk_gc_set_clip_origin(gc, -dst_x, -dst_y); - // draw old mask onto new one, with clip - gdk_draw_drawable(pixmap, gc, mask, x, y, 0, 0, w, h); - g_object_unref(gc); - return pixmap; -} - -// make a color pixmap from part of a mono one, using text fg/bg colors -GdkPixmap* -wxWindowDCImpl::MonoToColor(GdkPixmap* monoPixmap, int x, int y, int w, int h) const -{ - GdkPixmap* pixmap = gdk_pixmap_new(m_gdkwindow, w, h, -1); - GdkGCValues gcValues; - gcValues.foreground.pixel = m_textForegroundColour.GetColor()->pixel; - gcValues.background.pixel = m_textBackgroundColour.GetColor()->pixel; - gcValues.stipple = monoPixmap; - gcValues.fill = GDK_OPAQUE_STIPPLED; - gcValues.ts_x_origin = -x; - gcValues.ts_y_origin = -y; - GdkGC* gc = gdk_gc_new_with_values(pixmap, &gcValues, GdkGCValuesMask( - GDK_GC_FOREGROUND | GDK_GC_BACKGROUND | GDK_GC_STIPPLE | GDK_GC_FILL | - GDK_GC_TS_X_ORIGIN | GDK_GC_TS_Y_ORIGIN)); - gdk_draw_rectangle(pixmap, gc, true, 0, 0, w, h); - g_object_unref(gc); - return pixmap; -} - -void wxWindowDCImpl::DoDrawBitmap( const wxBitmap &bitmap, - wxCoord x, wxCoord y, - bool useMask ) -{ - wxCHECK_RET( IsOk(), wxT("invalid window dc") ); - wxCHECK_RET( bitmap.IsOk(), wxT("invalid bitmap") ); - - if (!m_gdkwindow) return; - - const int w = bitmap.GetWidth(); - const int h = bitmap.GetHeight(); - - // notice that as the bitmap is not drawn upside down (or right to left) - // even if the corresponding axis direction is inversed, we need to take it - // into account when calculating its bounding box - CalcBoundingBox(x, y); - CalcBoundingBox(x + m_signX*w, y + m_signY*h); - - // device coords - int xx = LogicalToDeviceX(x); - const int yy = LogicalToDeviceY(y); - const int ww = LogicalToDeviceXRel(w); - const int hh = LogicalToDeviceYRel(h); - - if (m_window && m_window->GetLayoutDirection() == wxLayout_RightToLeft) - xx -= ww; - - GdkRegion* const clipRegion = m_currentClippingRegion.GetRegion(); - // determine clip region overlap - int overlap = wxInRegion; - if (clipRegion) - { - overlap = m_currentClippingRegion.Contains(xx, yy, ww, hh); - if (overlap == wxOutRegion) - return; - } - - const bool isScaled = ww != w || hh != h; - const bool hasAlpha = bitmap.HasAlpha(); - GdkGC* const use_gc = m_penGC; - - GdkPixmap* mask = NULL; - // mask does not work when drawing a pixbuf with alpha - if (useMask && !hasAlpha) - { - wxMask* m = bitmap.GetMask(); - if (m) - mask = *m; - } - - GdkPixmap* mask_new = NULL; - if (mask) - { - if (isScaled) - { - mask = ScaleMask(mask, 0, 0, w, h, ww, hh, m_scaleX, m_scaleY); - mask_new = mask; - } - if (overlap == wxPartRegion) - { - // need a new mask that also masks the clipped area, - // because gc can't have both a mask and a clip region - mask = ClipMask(mask, clipRegion, 0, 0, xx, yy, ww, hh); - if (mask_new) - g_object_unref(mask_new); - mask_new = mask; - } - gdk_gc_set_clip_mask(use_gc, mask); - gdk_gc_set_clip_origin(use_gc, xx, yy); - } - - // determine whether to use pixmap or pixbuf - GdkPixmap* pixmap = NULL; - GdkPixmap* pixmap_new = NULL; - GdkPixbuf* pixbuf = NULL; - GdkPixbuf* pixbuf_new = NULL; - if (bitmap.HasPixmap()) - pixmap = bitmap.GetPixmap(); - if (pixmap && gdk_drawable_get_depth(pixmap) == 1) - { - if (gdk_drawable_get_depth(m_gdkwindow) != 1) - { - // convert mono pixmap to color using text fg/bg colors - pixmap = MonoToColor(pixmap, 0, 0, w, h); - pixmap_new = pixmap; - } - } - else if (hasAlpha || pixmap == NULL) - pixbuf = bitmap.GetPixbuf(); - - if (isScaled) - { - if (pixbuf) - pixbuf = Scale(pixbuf, ww, hh, m_scaleX, m_scaleY); - else - pixbuf = Scale(pixmap, 0, 0, w, h, ww, hh, m_scaleX, m_scaleY); - - pixbuf_new = pixbuf; - } - - if (pixbuf) - { - gdk_draw_pixbuf(m_gdkwindow, use_gc, pixbuf, - 0, 0, xx, yy, ww, hh, GDK_RGB_DITHER_NORMAL, 0, 0); - } - else - { - gdk_draw_drawable(m_gdkwindow, use_gc, pixmap, 0, 0, xx, yy, ww, hh); - } - - if (pixbuf_new) - g_object_unref(pixbuf_new); - if (pixmap_new) - g_object_unref(pixmap_new); - if (mask) - { - gdk_gc_set_clip_region(use_gc, clipRegion); - - // Notice that we can only release the mask now, we can't do it before - // the calls to gdk_draw_xxx() above as they crash with BadPixmap X - // error with GTK+ 2.16 and earlier. - if (mask_new) - g_object_unref(mask_new); - } -} - -bool wxWindowDCImpl::DoBlit( wxCoord xdest, wxCoord ydest, - wxCoord width, wxCoord height, - wxDC *source, - wxCoord xsrc, wxCoord ysrc, - wxRasterOperationMode logical_func, - bool useMask, - wxCoord xsrcMask, wxCoord ysrcMask ) -{ - wxCHECK_MSG( IsOk(), false, wxT("invalid window dc") ); - wxCHECK_MSG( source, false, wxT("invalid source dc") ); - - if (!m_gdkwindow) return false; - - GdkDrawable* srcDrawable = NULL; - GdkPixmap* mask = NULL; - wxMemoryDC* memDC = wxDynamicCast(source, wxMemoryDC); - if (memDC) - { - const wxBitmap& bitmap = memDC->GetSelectedBitmap(); - if (!bitmap.IsOk()) - return false; - srcDrawable = bitmap.GetPixmap(); - if (useMask) - { - wxMask* m = bitmap.GetMask(); - if (m) - mask = *m; - } - } - else - { - wxDCImpl* impl = source->GetImpl(); - wxWindowDCImpl* gtk_impl = wxDynamicCast(impl, wxWindowDCImpl); - if (gtk_impl) - srcDrawable = gtk_impl->GetGDKWindow(); - if (srcDrawable == NULL) - return false; - } - - CalcBoundingBox(xdest, ydest); - CalcBoundingBox(xdest + width, ydest + height); - - // source device coords - int src_x = source->LogicalToDeviceX(xsrc); - int src_y = source->LogicalToDeviceY(ysrc); - int src_w = source->LogicalToDeviceXRel(width); - int src_h = source->LogicalToDeviceYRel(height); - - // Clip source rect to source dc. - // Only necessary when scaling, to avoid GDK errors when - // converting to pixbuf, but no harm in always doing it. - // If source rect changes, it also changes the dest rect. - wxRect clip; - gdk_drawable_get_size(srcDrawable, &clip.width, &clip.height); - clip.Intersect(wxRect(src_x, src_y, src_w, src_h)); - if (src_w != clip.width || src_h != clip.height) - { - if (clip.width == 0) - return true; - - src_w = clip.width; - src_h = clip.height; - width = source->DeviceToLogicalXRel(src_w); - height = source->DeviceToLogicalYRel(src_h); - if (src_x != clip.x || src_y != clip.y) - { - xdest += source->DeviceToLogicalXRel(clip.x - src_x); - ydest += source->DeviceToLogicalYRel(clip.y - src_y); - src_x = clip.x; - src_y = clip.y; - } - } - - // destination device coords - const int dst_x = LogicalToDeviceX(xdest); - const int dst_y = LogicalToDeviceY(ydest); - const int dst_w = LogicalToDeviceXRel(width); - const int dst_h = LogicalToDeviceYRel(height); - - GdkRegion* const clipRegion = m_currentClippingRegion.GetRegion(); - // determine dest clip region overlap - int overlap = wxInRegion; - if (clipRegion) - { - overlap = m_currentClippingRegion.Contains(dst_x, dst_y, dst_w, dst_h); - if (overlap == wxOutRegion) - return true; - } - - const bool isScaled = src_w != dst_w || src_h != dst_h; - double scale_x = 0; - double scale_y = 0; - if (isScaled) - { - // get source to dest scale - double usx, usy, lsx, lsy; - source->GetUserScale(&usx, &usy); - source->GetLogicalScale(&lsx, &lsy); - scale_x = m_scaleX / (usx * lsx); - scale_y = m_scaleY / (usy * lsy); - } - - GdkGC* const use_gc = m_penGC; - - GdkPixmap* mask_new = NULL; - if (mask) - { - int srcMask_x = src_x; - int srcMask_y = src_y; - if (xsrcMask != -1 || ysrcMask != -1) - { - srcMask_x = source->LogicalToDeviceX(xsrcMask); - srcMask_y = source->LogicalToDeviceY(ysrcMask); - } - if (isScaled) - { - mask = ScaleMask(mask, srcMask_x, srcMask_y, - src_w, src_h, dst_w, dst_h, scale_x, scale_y); - mask_new = mask; - srcMask_x = 0; - srcMask_y = 0; - } - if (overlap == wxPartRegion) - { - // need a new mask that also masks the clipped area, - // because gc can't have both a mask and a clip region - mask = ClipMask(mask, clipRegion, - srcMask_x, srcMask_y, dst_x, dst_y, dst_w, dst_h); - if (mask_new) - g_object_unref(mask_new); - mask_new = mask; - srcMask_x = 0; - srcMask_y = 0; - } - gdk_gc_set_clip_mask(use_gc, mask); - gdk_gc_set_clip_origin(use_gc, dst_x - srcMask_x, dst_y - srcMask_y); - } - - GdkPixmap* pixmap = NULL; - if (gdk_drawable_get_depth(srcDrawable) == 1 && - (gdk_drawable_get_depth(m_gdkwindow) != 1 || isScaled)) - { - // Convert mono pixmap to color using text fg/bg colors. - // Scaling/drawing is simpler if this is done first. - pixmap = MonoToColor(srcDrawable, src_x, src_y, src_w, src_h); - srcDrawable = pixmap; - src_x = 0; - src_y = 0; - } - - const wxRasterOperationMode logical_func_save = m_logicalFunction; - SetLogicalFunction(logical_func); - if (memDC == NULL) - gdk_gc_set_subwindow(use_gc, GDK_INCLUDE_INFERIORS); - - if (isScaled) - { - GdkPixbuf* pixbuf = Scale(srcDrawable, - src_x, src_y, src_w, src_h, dst_w, dst_h, scale_x, scale_y); - gdk_draw_pixbuf(m_gdkwindow, use_gc, pixbuf, - 0, 0, dst_x, dst_y, dst_w, dst_h, GDK_RGB_DITHER_NONE, 0, 0); - g_object_unref(pixbuf); - } - else - { - gdk_draw_drawable(m_gdkwindow, use_gc, srcDrawable, - src_x, src_y, dst_x, dst_y, dst_w, dst_h); - } - - SetLogicalFunction(logical_func_save); - if (memDC == NULL) - gdk_gc_set_subwindow(use_gc, GDK_CLIP_BY_CHILDREN); - - if (pixmap) - g_object_unref(pixmap); - if (mask) - { - gdk_gc_set_clip_region(use_gc, clipRegion); - // see comment at end of DoDrawBitmap() - if (mask_new) - g_object_unref(mask_new); - } - - return true; -} - -void wxWindowDCImpl::DoDrawText(const wxString& text, - wxCoord xLogical, - wxCoord yLogical) -{ - DoDrawRotatedText(text, xLogical, yLogical, 0); -} - -void wxWindowDCImpl::DoDrawRotatedText(const wxString& text, int xLogical, int yLogical, double angle) -{ - if (!m_gdkwindow || text.empty()) - return; - - wxCHECK_RET( IsOk(), wxT("invalid window dc") ); - - pango_layout_set_text(m_layout, wxGTK_CONV(text), -1); - const bool setAttrs = m_font.GTKSetPangoAttrs(m_layout); - - const GdkColor* bg_col = NULL; - if (m_backgroundMode == wxBRUSHSTYLE_SOLID) - bg_col = m_textBackgroundColour.GetColor(); - - PangoMatrix matrix = PANGO_MATRIX_INIT; - if (!wxIsSameDouble(m_scaleX, 1) || !wxIsSameDouble(m_scaleY, 1) || !wxIsNullDouble(angle)) - { - pango_matrix_scale(&matrix, m_scaleX, m_scaleY); - pango_matrix_rotate(&matrix, angle); - pango_context_set_matrix(m_context, &matrix); - pango_layout_context_changed(m_layout); - } - - int w, h; - pango_layout_get_pixel_size(m_layout, &w, &h); - - int x = LogicalToDeviceX(xLogical); - int y = LogicalToDeviceY(yLogical); - if (m_window && m_window->GetLayoutDirection() == wxLayout_RightToLeft) - x -= LogicalToDeviceXRel(w); - - if (wxIsNullDouble(angle)) - { - CalcBoundingBox(xLogical, yLogical); - CalcBoundingBox(xLogical + w, yLogical + h); - } - else - { - // To be compatible with MSW, the rotation axis must be in the old - // top-left corner. - // Calculate the vertices of the rotated rectangle containing the text, - // relative to the old top-left vertex. - // the rectangle vertices are counted clockwise with the first one - // being at (0, 0) - double x2 = w * matrix.xx; - double y2 = w * matrix.yx; - double x4 = h * matrix.xy; - double y4 = h * matrix.yy; - double x3 = x4 + x2; - double y3 = y4 + y2; - // Then we calculate max and min of the rotated rectangle. - wxCoord maxX = (wxCoord)(dmax(dmax(0, x2), dmax(x3, x4)) + 0.5), - maxY = (wxCoord)(dmax(dmax(0, y2), dmax(y3, y4)) + 0.5), - minX = (wxCoord)(dmin(dmin(0, x2), dmin(x3, x4)) - 0.5), - minY = (wxCoord)(dmin(dmin(0, y2), dmin(y3, y4)) - 0.5); - x += minX; - y += minY; - CalcBoundingBox(DeviceToLogicalX(x), DeviceToLogicalY(y)); - CalcBoundingBox(DeviceToLogicalX(x + maxX - minX), DeviceToLogicalY(y + maxY - minY)); - } - - gdk_draw_layout_with_colors(m_gdkwindow, m_textGC, x, y, m_layout, NULL, bg_col); - - pango_context_set_matrix(m_context, NULL); - if (setAttrs) - pango_layout_set_attributes(m_layout, NULL); -} - -void wxWindowDCImpl::DoGetTextExtent(const wxString &string, - wxCoord *width, wxCoord *height, - wxCoord *descent, wxCoord *externalLeading, - const wxFont *theFont) const -{ - // ensure we work with a valid font - const wxFont *fontToUse; - if ( !theFont || !theFont->IsOk() ) - fontToUse = &m_font; - else - fontToUse = theFont; - - wxCHECK_RET( fontToUse->IsOk(), wxT("invalid font") ); - - wxTextMeasure txm(GetOwner(), fontToUse); - txm.GetTextExtent(string, width, height, descent, externalLeading); -} - - -bool wxWindowDCImpl::DoGetPartialTextExtents(const wxString& text, - wxArrayInt& widths) const -{ - wxCHECK_MSG( m_font.IsOk(), false, wxT("Invalid font") ); - - wxTextMeasure txm(GetOwner(), &m_font); - return txm.GetPartialTextExtents(text, widths, m_scaleX); -} - - -wxCoord wxWindowDCImpl::GetCharWidth() const -{ - pango_layout_set_text( m_layout, "H", 1 ); - int w; - pango_layout_get_pixel_size( m_layout, &w, NULL ); - return w; -} - -wxCoord wxWindowDCImpl::GetCharHeight() const -{ - PangoFontMetrics *metrics = pango_context_get_metrics (m_context, m_fontdesc, pango_context_get_language(m_context)); - wxCHECK_MSG( metrics, -1, wxT("failed to get pango font metrics") ); - - wxCoord h = PANGO_PIXELS (pango_font_metrics_get_descent (metrics) + - pango_font_metrics_get_ascent (metrics)); - pango_font_metrics_unref (metrics); - return h; -} - -void wxWindowDCImpl::Clear() -{ - wxCHECK_RET( IsOk(), wxT("invalid window dc") ); - - if (!m_gdkwindow) return; - - int width,height; - DoGetSize( &width, &height ); - gdk_draw_rectangle( m_gdkwindow, m_bgGC, TRUE, 0, 0, width, height ); -} - -void wxWindowDCImpl::SetFont( const wxFont &font ) -{ - m_font = font; - - if (m_font.IsOk()) - { - if (m_fontdesc) - pango_font_description_free( m_fontdesc ); - - m_fontdesc = pango_font_description_copy( m_font.GetNativeFontInfo()->description ); - - - if (m_window) - { - PangoContext *oldContext = m_context; - - m_context = m_window->GTKGetPangoDefaultContext(); - - // If we switch back/forth between different contexts - // we also have to create a new layout. I think so, - // at least, and it doesn't hurt to do it. - if (oldContext != m_context) - { - if (m_layout) - g_object_unref (m_layout); - - m_layout = pango_layout_new( m_context ); - } - } - - pango_layout_set_font_description( m_layout, m_fontdesc ); - } -} - -void wxWindowDCImpl::SetPen( const wxPen &pen ) -{ - wxCHECK_RET( IsOk(), wxT("invalid window dc") ); - - if (m_pen == pen) return; - - m_pen = pen; - - if (!m_pen.IsOk()) return; - - if (!m_gdkwindow) return; - - gint width = m_pen.GetWidth(); - if (width <= 0) - { - // CMB: if width is non-zero scale it with the dc - width = 1; - } - else - { - // X doesn't allow different width in x and y and so we take - // the average - double w = 0.5 + - ( fabs((double) XLOG2DEVREL(width)) + - fabs((double) YLOG2DEVREL(width)) ) / 2.0; - width = (int)w; - if ( !width ) - { - // width can't be 0 or an internal GTK error occurs inside - // gdk_gc_set_dashes() below - width = 1; - } - } - - static const wxGTKDash dotted[] = {1, 1}; - static const wxGTKDash short_dashed[] = {2, 2}; - static const wxGTKDash wxCoord_dashed[] = {2, 4}; - static const wxGTKDash dotted_dashed[] = {3, 3, 1, 3}; - - // We express dash pattern in pen width unit, so we are - // independent of zoom factor and so on... - int req_nb_dash; - const wxGTKDash *req_dash; - - GdkLineStyle lineStyle = GDK_LINE_ON_OFF_DASH; - switch (m_pen.GetStyle()) - { - case wxPENSTYLE_USER_DASH: - req_nb_dash = m_pen.GetDashCount(); - req_dash = (wxGTKDash*)m_pen.GetDash(); - break; - case wxPENSTYLE_DOT: - req_nb_dash = 2; - req_dash = dotted; - break; - case wxPENSTYLE_LONG_DASH: - req_nb_dash = 2; - req_dash = wxCoord_dashed; - break; - case wxPENSTYLE_SHORT_DASH: - req_nb_dash = 2; - req_dash = short_dashed; - break; - case wxPENSTYLE_DOT_DASH: - req_nb_dash = 4; - req_dash = dotted_dashed; - break; - - case wxPENSTYLE_TRANSPARENT: - case wxPENSTYLE_STIPPLE_MASK_OPAQUE: - case wxPENSTYLE_STIPPLE: - case wxPENSTYLE_SOLID: - default: - lineStyle = GDK_LINE_SOLID; - req_dash = NULL; - req_nb_dash = 0; - break; - } - - if (req_dash && req_nb_dash) - { - wxGTKDash *real_req_dash = new wxGTKDash[req_nb_dash]; - if (real_req_dash) - { - for (int i = 0; i < req_nb_dash; i++) - real_req_dash[i] = req_dash[i] * width; - gdk_gc_set_dashes( m_penGC, 0, real_req_dash, req_nb_dash ); - delete[] real_req_dash; - } - else - { - // No Memory. We use non-scaled dash pattern... - gdk_gc_set_dashes( m_penGC, 0, (wxGTKDash*)req_dash, req_nb_dash ); - } - } - - GdkCapStyle capStyle = GDK_CAP_ROUND; - switch (m_pen.GetCap()) - { - case wxCAP_PROJECTING: { capStyle = GDK_CAP_PROJECTING; break; } - case wxCAP_BUTT: { capStyle = GDK_CAP_BUTT; break; } - case wxCAP_ROUND: - default: - if (width <= 1) - { - width = 0; - capStyle = GDK_CAP_NOT_LAST; - } - break; - } - - GdkJoinStyle joinStyle = GDK_JOIN_ROUND; - switch (m_pen.GetJoin()) - { - case wxJOIN_BEVEL: { joinStyle = GDK_JOIN_BEVEL; break; } - case wxJOIN_MITER: { joinStyle = GDK_JOIN_MITER; break; } - case wxJOIN_ROUND: - default: - break; - } - if (width < 3) - { - // width 2 rounded join looks bad on X11 (missing one corner pixel) - joinStyle = GDK_JOIN_MITER; - } - - gdk_gc_set_line_attributes( m_penGC, width, lineStyle, capStyle, joinStyle ); - - m_pen.GetColour().CalcPixel( m_cmap ); - gdk_gc_set_foreground( m_penGC, m_pen.GetColour().GetColor() ); -} - -void wxWindowDCImpl::SetBrush( const wxBrush &brush ) -{ - wxCHECK_RET( IsOk(), wxT("invalid window dc") ); - - if (m_brush == brush) return; - - m_brush = brush; - - if (!m_brush.IsOk()) return; - - if (!m_gdkwindow) return; - - m_brush.GetColour().CalcPixel( m_cmap ); - gdk_gc_set_foreground( m_brushGC, m_brush.GetColour().GetColor() ); - - gdk_gc_set_fill( m_brushGC, GDK_SOLID ); - - if ((m_brush.GetStyle() == wxBRUSHSTYLE_STIPPLE) && (m_brush.GetStipple()->IsOk())) - { - if (m_brush.GetStipple()->GetDepth() != 1) - { - gdk_gc_set_fill( m_brushGC, GDK_TILED ); - gdk_gc_set_tile( m_brushGC, m_brush.GetStipple()->GetPixmap() ); - } - else - { - gdk_gc_set_fill( m_brushGC, GDK_STIPPLED ); - gdk_gc_set_stipple( m_brushGC, m_brush.GetStipple()->GetPixmap() ); - } - } - - if ((m_brush.GetStyle() == wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE) && (m_brush.GetStipple()->GetMask())) - { - gdk_gc_set_fill( m_textGC, GDK_OPAQUE_STIPPLED); - gdk_gc_set_stipple( m_textGC, *m_brush.GetStipple()->GetMask() ); - } - - if (m_brush.IsHatch()) - { - gdk_gc_set_fill( m_brushGC, GDK_STIPPLED ); - gdk_gc_set_stipple(m_brushGC, GetHatch(m_brush.GetStyle())); - } -} - -void wxWindowDCImpl::SetBackground( const wxBrush &brush ) -{ - /* CMB 21/7/98: Added SetBackground. Sets background brush - * for Clear() and bg colour for shapes filled with cross-hatch brush */ - - wxCHECK_RET( IsOk(), wxT("invalid window dc") ); - - if (m_backgroundBrush == brush) return; - - m_backgroundBrush = brush; - - if (!m_backgroundBrush.IsOk()) return; - - if (!m_gdkwindow) return; - - wxColor color = m_backgroundBrush.GetColour(); - color.CalcPixel(m_cmap); - const GdkColor* gdkColor = color.GetColor(); - gdk_gc_set_background(m_brushGC, gdkColor); - gdk_gc_set_background(m_penGC, gdkColor); - gdk_gc_set_background(m_bgGC, gdkColor); - gdk_gc_set_foreground(m_bgGC, gdkColor); - - - gdk_gc_set_fill( m_bgGC, GDK_SOLID ); - - if (m_backgroundBrush.GetStyle() == wxBRUSHSTYLE_STIPPLE) - { - const wxBitmap* stipple = m_backgroundBrush.GetStipple(); - if (stipple->IsOk()) - { - if (stipple->GetDepth() != 1) - { - gdk_gc_set_fill(m_bgGC, GDK_TILED); - gdk_gc_set_tile(m_bgGC, stipple->GetPixmap()); - } - else - { - gdk_gc_set_fill(m_bgGC, GDK_STIPPLED); - gdk_gc_set_stipple(m_bgGC, stipple->GetPixmap()); - } - } - } - else if (m_backgroundBrush.IsHatch()) - { - gdk_gc_set_fill( m_bgGC, GDK_STIPPLED ); - gdk_gc_set_stipple(m_bgGC, GetHatch(m_backgroundBrush.GetStyle())); - } -} - -void wxWindowDCImpl::SetLogicalFunction( wxRasterOperationMode function ) -{ - wxCHECK_RET( IsOk(), wxT("invalid window dc") ); - - if (m_logicalFunction == function) - return; - - // VZ: shouldn't this be a CHECK? - if (!m_gdkwindow) - return; - - GdkFunction mode; - switch (function) - { - case wxXOR: mode = GDK_XOR; break; - case wxINVERT: mode = GDK_INVERT; break; - case wxOR_REVERSE: mode = GDK_OR_REVERSE; break; - case wxAND_REVERSE: mode = GDK_AND_REVERSE; break; - case wxCLEAR: mode = GDK_CLEAR; break; - case wxSET: mode = GDK_SET; break; - case wxOR_INVERT: mode = GDK_OR_INVERT; break; - case wxAND: mode = GDK_AND; break; - case wxOR: mode = GDK_OR; break; - case wxEQUIV: mode = GDK_EQUIV; break; - case wxNAND: mode = GDK_NAND; break; - case wxAND_INVERT: mode = GDK_AND_INVERT; break; - case wxCOPY: mode = GDK_COPY; break; - case wxNO_OP: mode = GDK_NOOP; break; - case wxSRC_INVERT: mode = GDK_COPY_INVERT; break; - case wxNOR: mode = GDK_NOR; break; - default: - wxFAIL_MSG("unknown mode"); - return; - } - - m_logicalFunction = function; - - gdk_gc_set_function( m_penGC, mode ); - gdk_gc_set_function( m_brushGC, mode ); - - // to stay compatible with wxMSW, we don't apply ROPs to the text - // operations (i.e. DrawText/DrawRotatedText). - // True, but mono-bitmaps use the m_textGC and they use ROPs as well. - gdk_gc_set_function( m_textGC, mode ); -} - -void wxWindowDCImpl::SetTextForeground( const wxColour &col ) -{ - wxCHECK_RET( IsOk(), wxT("invalid window dc") ); - - // don't set m_textForegroundColour to an invalid colour as we'd crash - // later then (we use m_textForegroundColour.GetColor() without checking - // in a few places) - if ( !col.IsOk() || (m_textForegroundColour == col) ) - return; - - m_textForegroundColour = col; - - if ( m_gdkwindow ) - { - m_textForegroundColour.CalcPixel( m_cmap ); - gdk_gc_set_foreground( m_textGC, m_textForegroundColour.GetColor() ); - } -} - -void wxWindowDCImpl::SetTextBackground( const wxColour &col ) -{ - wxCHECK_RET( IsOk(), wxT("invalid window dc") ); - - // same as above - if ( !col.IsOk() || (m_textBackgroundColour == col) ) - return; - - m_textBackgroundColour = col; - - if ( m_gdkwindow ) - { - m_textBackgroundColour.CalcPixel( m_cmap ); - gdk_gc_set_background( m_textGC, m_textBackgroundColour.GetColor() ); - } -} - -void wxWindowDCImpl::SetBackgroundMode( int mode ) -{ - wxCHECK_RET( IsOk(), wxT("invalid window dc") ); - - m_backgroundMode = mode; -} - -void wxWindowDCImpl::SetPalette( const wxPalette& WXUNUSED(palette) ) -{ - wxFAIL_MSG( wxT("wxWindowDCImpl::SetPalette not implemented") ); -} - -void wxWindowDCImpl::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) -{ - wxCHECK_RET( IsOk(), wxT("invalid window dc") ); - - if (!m_gdkwindow) return; - - wxRect rect; - rect.x = XLOG2DEV(x); - rect.y = YLOG2DEV(y); - rect.width = XLOG2DEVREL(width); - rect.height = YLOG2DEVREL(height); - - if (m_window && m_window->m_wxwindow && - (m_window->GetLayoutDirection() == wxLayout_RightToLeft)) - { - rect.x -= rect.width; - } - - DoSetDeviceClippingRegion(wxRegion(rect)); -} - -void wxWindowDCImpl::DoSetDeviceClippingRegion( const wxRegion ®ion ) -{ - wxCHECK_RET( IsOk(), wxT("invalid window dc") ); - - if (region.Empty()) - { - DestroyClippingRegion(); - return; - } - - if (!m_gdkwindow) return; - - if (!m_currentClippingRegion.IsNull()) - m_currentClippingRegion.Intersect( region ); - else - m_currentClippingRegion.Union( region ); - -#if USE_PAINT_REGION - if (!m_paintClippingRegion.IsNull()) - m_currentClippingRegion.Intersect( m_paintClippingRegion ); -#endif - - wxCoord xx, yy, ww, hh; - m_currentClippingRegion.GetBox( xx, yy, ww, hh ); - wxGTKDCImpl::DoSetClippingRegion( xx, yy, ww, hh ); - - GdkRegion* gdkRegion = m_currentClippingRegion.GetRegion(); - gdk_gc_set_clip_region(m_penGC, gdkRegion); - gdk_gc_set_clip_region(m_brushGC, gdkRegion); - gdk_gc_set_clip_region(m_textGC, gdkRegion); - gdk_gc_set_clip_region(m_bgGC, gdkRegion); -} - -void wxWindowDCImpl::DestroyClippingRegion() -{ - wxCHECK_RET( IsOk(), wxT("invalid window dc") ); - - wxDCImpl::DestroyClippingRegion(); - - m_currentClippingRegion.Clear(); - -#if USE_PAINT_REGION - if (!m_paintClippingRegion.IsEmpty()) - m_currentClippingRegion.Union( m_paintClippingRegion ); -#endif - - if (!m_gdkwindow) return; - - GdkRegion* gdkRegion = NULL; - if (!m_currentClippingRegion.IsEmpty()) - gdkRegion = m_currentClippingRegion.GetRegion(); - - gdk_gc_set_clip_region(m_penGC, gdkRegion); - gdk_gc_set_clip_region(m_brushGC, gdkRegion); - gdk_gc_set_clip_region(m_textGC, gdkRegion); - gdk_gc_set_clip_region(m_bgGC, gdkRegion); -} - -void wxWindowDCImpl::Destroy() -{ - if (m_penGC) wxFreePoolGC( m_penGC ); - m_penGC = NULL; - if (m_brushGC) wxFreePoolGC( m_brushGC ); - m_brushGC = NULL; - if (m_textGC) wxFreePoolGC( m_textGC ); - m_textGC = NULL; - if (m_bgGC) wxFreePoolGC( m_bgGC ); - m_bgGC = NULL; -} - -void wxWindowDCImpl::SetDeviceOrigin( wxCoord x, wxCoord y ) -{ - m_deviceOriginX = x; - m_deviceOriginY = y; - - ComputeScaleAndOrigin(); -} - -void wxWindowDCImpl::SetAxisOrientation( bool xLeftRight, bool yBottomUp ) -{ - m_signX = (xLeftRight ? 1 : -1); - m_signY = (yBottomUp ? -1 : 1); - - if (m_window && m_window->m_wxwindow && - (m_window->GetLayoutDirection() == wxLayout_RightToLeft)) - m_signX = -m_signX; - - ComputeScaleAndOrigin(); -} - -void wxWindowDCImpl::ComputeScaleAndOrigin() -{ - const wxRealPoint origScale(m_scaleX, m_scaleY); - - wxDCImpl::ComputeScaleAndOrigin(); - - // if scale has changed call SetPen to recalculate the line width - if ( wxRealPoint(m_scaleX, m_scaleY) != origScale && m_pen.IsOk() ) - { - // this is a bit artificial, but we need to force wxDC to think the pen - // has changed - wxPen pen = m_pen; - m_pen = wxNullPen; - SetPen( pen ); - } -} - -// Resolution in pixels per logical inch -wxSize wxWindowDCImpl::GetPPI() const -{ - return wxSize( (int) (m_mm_to_pix_x * 25.4 + 0.5), (int) (m_mm_to_pix_y * 25.4 + 0.5)); -} - -int wxWindowDCImpl::GetDepth() const -{ - return gdk_drawable_get_depth(m_gdkwindow); -} - -//----------------------------------------------------------------------------- -// wxClientDCImpl -//----------------------------------------------------------------------------- - -wxIMPLEMENT_ABSTRACT_CLASS(wxClientDCImpl, wxWindowDCImpl); - -wxClientDCImpl::wxClientDCImpl( wxDC *owner ) - : wxWindowDCImpl( owner ) -{ -} - -wxClientDCImpl::wxClientDCImpl( wxDC *owner, wxWindow *win ) - : wxWindowDCImpl( owner, win ) -{ - wxCHECK_RET( win, wxT("NULL window in wxClientDCImpl::wxClientDC") ); - -#ifdef __WXUNIVERSAL__ - wxPoint ptOrigin = win->GetClientAreaOrigin(); - SetDeviceOrigin(ptOrigin.x, ptOrigin.y); - wxSize size = win->GetClientSize(); - DoSetClippingRegion(0, 0, size.x, size.y); -#endif - // __WXUNIVERSAL__ -} - -void wxClientDCImpl::DoGetSize(int *width, int *height) const -{ - wxCHECK_RET( m_window, wxT("GetSize() doesn't work without window") ); - - m_window->GetClientSize(width, height); -} - -//----------------------------------------------------------------------------- -// wxPaintDCImpl -//----------------------------------------------------------------------------- - -wxIMPLEMENT_ABSTRACT_CLASS(wxPaintDCImpl, wxClientDCImpl); - -// Limit the paint region to the window size. Sometimes -// the paint region is too big, and this risks X11 errors -static void wxLimitRegionToSize(wxRegion& region, const wxSize& sz) -{ - wxRect originalRect = region.GetBox(); - wxRect rect(originalRect); - if (rect.width + rect.x > sz.x) - rect.width = sz.x - rect.x; - if (rect.height + rect.y > sz.y) - rect.height = sz.y - rect.y; - if (rect != originalRect) - { - region = wxRegion(rect); - wxLogTrace(wxT("painting"), wxT("Limiting region from %d, %d, %d, %d to %d, %d, %d, %d\n"), - originalRect.x, originalRect.y, originalRect.width, originalRect.height, - rect.x, rect.y, rect.width, rect.height); - } -} - -wxPaintDCImpl::wxPaintDCImpl( wxDC *owner ) - : wxClientDCImpl( owner ) -{ -} - -wxPaintDCImpl::wxPaintDCImpl( wxDC *owner, wxWindow *win ) - : wxClientDCImpl( owner, win ) -{ -#if USE_PAINT_REGION - if (!win->m_clipPaintRegion) - return; - - wxSize sz = win->GetSize(); - m_paintClippingRegion = win->m_nativeUpdateRegion; - wxLimitRegionToSize(m_paintClippingRegion, sz); - - GdkRegion *region = m_paintClippingRegion.GetRegion(); - if ( region ) - { - m_currentClippingRegion.Union( m_paintClippingRegion ); - wxLimitRegionToSize(m_currentClippingRegion, sz); - - if (sz.x <= 0 || sz.y <= 0) - return ; - - gdk_gc_set_clip_region( m_penGC, region ); - gdk_gc_set_clip_region( m_brushGC, region ); - gdk_gc_set_clip_region( m_textGC, region ); - gdk_gc_set_clip_region( m_bgGC, region ); - } -#endif -} - -// ---------------------------------------------------------------------------- -// wxDCModule -// ---------------------------------------------------------------------------- - -class wxDCModule : public wxModule -{ -public: - bool OnInit() wxOVERRIDE; - void OnExit() wxOVERRIDE; - -private: - wxDECLARE_DYNAMIC_CLASS(wxDCModule); -}; - -wxIMPLEMENT_DYNAMIC_CLASS(wxDCModule, wxModule); - -bool wxDCModule::OnInit() -{ - wxInitGCPool(); - return true; -} - -void wxDCModule::OnExit() -{ - wxCleanUpGCPool(); - - for (int i = wxBRUSHSTYLE_LAST_HATCH - wxBRUSHSTYLE_FIRST_HATCH; i--; ) - { - if (hatches[i]) - g_object_unref(hatches[i]); - } -} diff --git a/Externals/wxWidgets3/src/gtk/dcmemory.cpp b/Externals/wxWidgets3/src/gtk/dcmemory.cpp deleted file mode 100644 index a75c8ed21d..0000000000 --- a/Externals/wxWidgets3/src/gtk/dcmemory.cpp +++ /dev/null @@ -1,170 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/dcmemory.cpp -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#include "wx/gtk/dcmemory.h" - -#include - -//----------------------------------------------------------------------------- -// wxMemoryDCImpl -//----------------------------------------------------------------------------- - -wxIMPLEMENT_ABSTRACT_CLASS(wxMemoryDCImpl, wxWindowDCImpl); - -wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner ) - : wxWindowDCImpl( owner ) -{ - Init(); -} - -wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap) - : wxWindowDCImpl( owner ) -{ - Init(); - DoSelect(bitmap); -} - -wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxDC *WXUNUSED(dc) ) - : wxWindowDCImpl( owner ) -{ - Init(); -} - -wxMemoryDCImpl::~wxMemoryDCImpl() -{ - g_object_unref(m_context); -} - -void wxMemoryDCImpl::Init() -{ - m_ok = false; - - m_cmap = gtk_widget_get_default_colormap(); - - m_context = gdk_pango_context_get(); - // Note: The Sun customised version of Pango shipping with Solaris 10 - // crashes if the language is left NULL (see bug 1374114) - pango_context_set_language( m_context, gtk_get_default_language() ); - m_layout = pango_layout_new( m_context ); - m_fontdesc = pango_font_description_copy( pango_context_get_font_description( m_context ) ); -} - -void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap ) -{ - Destroy(); - - m_selected = bitmap; - if (m_selected.IsOk()) - { - m_gdkwindow = m_selected.GetPixmap(); - - m_selected.PurgeOtherRepresentations(wxBitmap::Pixmap); - - SetUpDC( true ); - } - else - { - m_ok = false; - m_gdkwindow = NULL; - } -} - -void wxMemoryDCImpl::SetPen( const wxPen& penOrig ) -{ - wxPen pen( penOrig ); - if ( m_selected.IsOk() && - m_selected.GetDepth() == 1 && - (pen != *wxTRANSPARENT_PEN) ) - { - pen.SetColour( pen.GetColour() == *wxWHITE ? *wxBLACK : *wxWHITE ); - } - - wxWindowDCImpl::SetPen( pen ); -} - -void wxMemoryDCImpl::SetBrush( const wxBrush& brushOrig ) -{ - wxBrush brush( brushOrig ); - if ( m_selected.IsOk() && - m_selected.GetDepth() == 1 && - (brush != *wxTRANSPARENT_BRUSH) ) - { - brush.SetColour( brush.GetColour() == *wxWHITE ? *wxBLACK : *wxWHITE); - } - - wxWindowDCImpl::SetBrush( brush ); -} - -void wxMemoryDCImpl::SetBackground( const wxBrush& brushOrig ) -{ - wxBrush brush(brushOrig); - - if ( m_selected.IsOk() && - m_selected.GetDepth() == 1 && - (brush != *wxTRANSPARENT_BRUSH) ) - { - brush.SetColour( brush.GetColour() == *wxWHITE ? *wxBLACK : *wxWHITE ); - } - - wxWindowDCImpl::SetBackground( brush ); -} - -void wxMemoryDCImpl::SetTextForeground( const wxColour& col ) -{ - if ( m_selected.IsOk() && m_selected.GetDepth() == 1 ) - wxWindowDCImpl::SetTextForeground( col == *wxWHITE ? *wxBLACK : *wxWHITE); - else - wxWindowDCImpl::SetTextForeground( col ); -} - -void wxMemoryDCImpl::SetTextBackground( const wxColour &col ) -{ - if (m_selected.IsOk() && m_selected.GetDepth() == 1) - wxWindowDCImpl::SetTextBackground( col == *wxWHITE ? *wxBLACK : *wxWHITE ); - else - wxWindowDCImpl::SetTextBackground( col ); -} - -void wxMemoryDCImpl::DoGetSize( int *width, int *height ) const -{ - if (m_selected.IsOk()) - { - if (width) (*width) = m_selected.GetWidth(); - if (height) (*height) = m_selected.GetHeight(); - } - else - { - if (width) (*width) = 0; - if (height) (*height) = 0; - } -} - -wxBitmap wxMemoryDCImpl::DoGetAsBitmap(const wxRect *subrect) const -{ - wxBitmap bmp = GetSelectedBitmap(); - return subrect ? bmp.GetSubBitmap(*subrect) : bmp; -} - -const wxBitmap& wxMemoryDCImpl::GetSelectedBitmap() const -{ - return m_selected; -} - -wxBitmap& wxMemoryDCImpl::GetSelectedBitmap() -{ - return m_selected; -} - -void* wxMemoryDCImpl::GetHandle() const -{ - const wxBitmap& bmp = GetSelectedBitmap(); - return bmp.GetPixmap(); -} diff --git a/Externals/wxWidgets3/src/gtk/dcscreen.cpp b/Externals/wxWidgets3/src/gtk/dcscreen.cpp deleted file mode 100644 index c895c9e200..0000000000 --- a/Externals/wxWidgets3/src/gtk/dcscreen.cpp +++ /dev/null @@ -1,64 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/dcscreen.cpp -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#include "wx/gtk/dcscreen.h" - -#include - -//----------------------------------------------------------------------------- -// wxScreenDCImpl -//----------------------------------------------------------------------------- - -wxIMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl, wxWindowDCImpl); - -wxScreenDCImpl::wxScreenDCImpl( wxScreenDC *owner ) - : wxWindowDCImpl( owner ) -{ - Init(); -} - -void wxScreenDCImpl::Init() -{ - m_ok = false; - m_cmap = gdk_colormap_get_system(); - m_gdkwindow = gdk_get_default_root_window(); - - m_context = gdk_pango_context_get(); - // Note: The Sun customised version of Pango shipping with Solaris 10 - // crashes if the language is left NULL (see bug 1374114) - pango_context_set_language( m_context, gtk_get_default_language() ); - m_layout = pango_layout_new( m_context ); -// m_fontdesc = pango_font_description_copy( widget->style->font_desc ); - - m_isScreenDC = true; - - SetUpDC(); - - gdk_gc_set_subwindow( m_penGC, GDK_INCLUDE_INFERIORS ); - gdk_gc_set_subwindow( m_brushGC, GDK_INCLUDE_INFERIORS ); - gdk_gc_set_subwindow( m_textGC, GDK_INCLUDE_INFERIORS ); - gdk_gc_set_subwindow( m_bgGC, GDK_INCLUDE_INFERIORS ); -} - -wxScreenDCImpl::~wxScreenDCImpl() -{ - g_object_unref(m_context); - - gdk_gc_set_subwindow( m_penGC, GDK_CLIP_BY_CHILDREN ); - gdk_gc_set_subwindow( m_brushGC, GDK_CLIP_BY_CHILDREN ); - gdk_gc_set_subwindow( m_textGC, GDK_CLIP_BY_CHILDREN ); - gdk_gc_set_subwindow( m_bgGC, GDK_CLIP_BY_CHILDREN ); -} - -void wxScreenDCImpl::DoGetSize(int *width, int *height) const -{ - wxDisplaySize(width, height); -} diff --git a/Externals/wxWidgets3/src/gtk/descrip.mms b/Externals/wxWidgets3/src/gtk/descrip.mms deleted file mode 100644 index d35c8a6bf0..0000000000 --- a/Externals/wxWidgets3/src/gtk/descrip.mms +++ /dev/null @@ -1,270 +0,0 @@ -#***************************************************************************** -# * -# Make file for VMS * -# Author : J.Jansen (joukj@hrem.nano.tudelft.nl) * -# Date : 21 April 2015 * -# * -#***************************************************************************** -.first - define wx [--.include.wx] - -.ifdef __WXUNIVERSAL__ -CXX_DEFINE = /define=(__WXGTK__=1,__WXUNIVERSAL__==1)/float=ieee\ - /name=(as_is,short)/ieee=denorm/assume=(nostdnew,noglobal_array_new) -CC_DEFINE = /define=(__WXGTK__=1,__WXUNIVERSAL__==1)/float=ieee\ - /name=(as_is,short)/ieee=denorm -.else -.ifdef __WXGTK2__ -CXX_DEFINE = /define=(__WXGTK__=1,VMS_GTK2==1)/float=ieee\ - /name=(as_is,short)/ieee=denorm/assume=(nostdnew,noglobal_array_new) -CC_DEFINE = /define=(__WXGTK__=1,VMS_GTK2==1)/float=ieee\ - /name=(as_is,short)/ieee=denorm -.else -CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/iee=denorm\ - /assume=(nostdnew,noglobal_array_new) -CC_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/iee=denorm -.endif -.endif - -.suffixes : .cpp - -.cpp.obj : - cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp -.c.obj : - cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c - -OBJECTS = \ - animate.obj,\ - app.obj,\ - artgtk.obj,\ - bitmap.obj,\ - brush.obj,\ - clipbrd.obj,\ - colordlg.obj,\ - colour.obj,\ - collpane.obj,\ - cursor.obj,\ - dataobj.obj,\ - dc.obj,\ - dcclient.obj,\ - dcmemory.obj,\ - dcscreen.obj,\ - dnd.obj,\ - evtloop.obj,\ - filedlg.obj,\ - font.obj,\ - glcanvas.obj,\ - sockgtk.obj,\ - minifram.obj,\ - pen.obj,\ - popupwin.obj,\ - renderer.obj,\ - region.obj,\ - settings.obj,\ - timer.obj,\ - tooltip.obj,\ - toplevel.obj,\ - utilsgtk.obj,\ - window.obj - -OBJECTS0= \ - bmpbuttn.obj,\ - button.obj,\ - checkbox.obj,\ - checklst.obj,\ - choice.obj,\ - combobox.obj,\ - control.obj,\ - dialog.obj,\ - fontdlg.obj,\ - frame.obj,\ - gauge.obj,\ - listbox.obj,\ - mdi.obj,\ - menu.obj,\ - notebook.obj,\ - radiobox.obj,\ - radiobut.obj,\ - scrolbar.obj,\ - scrolwin.obj,\ - slider.obj,\ - spinbutt.obj,\ - spinctrl.obj,\ - statbmp.obj,\ - statbox.obj,\ - statline.obj,\ - stattext.obj,\ - toolbar.obj,\ - textctrl.obj,\ - tglbtn.obj,\ - msgdlg.obj,\ - treeentry_gtk.obj,textentry.obj,filectrl.obj,print.obj,win_gtk.obj,\ - mnemonics.obj,private.obj,assertdlg_gtk.obj,infobar.obj,anybutton.obj,\ - nonownedwnd.obj,textmeasure.obj,display.obj,activityindicator.obj - -SOURCES =\ - animate.cpp,\ - app.cpp,\ - artgtk.cpp, \ - bitmap.cpp,\ - bmpbuttn.cpp,\ - brush.cpp,\ - button.cpp,\ - checkbox.cpp,\ - checklst.cpp,\ - choice.cpp,\ - clipbrd.cpp,\ - colordlg.cpp,\ - colour.cpp,\ - collpane.cpp,\ - combobox.cpp,\ - control.cpp,\ - cursor.cpp,\ - dataobj.cpp,\ - dc.cpp,\ - dcclient.cpp,\ - dcmemory.cpp,\ - dcscreen.cpp,\ - dialog.cpp,\ - dnd.cpp,\ - evtloop.cpp,\ - filedlg.cpp,\ - font.cpp,\ - fontdlg.cpp,\ - frame.cpp,\ - gauge.cpp,\ - glcanvas.cpp,\ - sockgtk.cpp,\ - listbox.cpp,\ - mdi.cpp,\ - menu.cpp,\ - minifram.cpp,\ - msgdlg.cpp,\ - notebook.cpp,\ - pen.cpp,\ - popupwin.cpp,\ - radiobox.cpp,\ - radiobut.cpp,\ - renderer.cpp,\ - region.cpp,\ - scrolbar.cpp,\ - scrolwin.cpp,\ - settings.cpp,\ - slider.cpp,\ - spinbutt.cpp,\ - spinctrl.cpp,\ - statbmp.cpp,\ - statbox.cpp,\ - statline.cpp,\ - stattext.cpp,\ - toolbar.cpp,\ - textctrl.cpp,\ - tglbtn.cpp,\ - timer.cpp,\ - tooltip.cpp,\ - toplevel.cpp,\ - utilsgtk.cpp,\ - window.cpp,\ - treeentry_gtk.c,textentry.cpp,filectrl.cpp,print.cpp,win_gtk.cpp,\ - mnemonics.cpp,private.cpp,assertdlg_gtk.cpp,infobar.cpp,anybutton.cpp,\ - nonownedwnd.cpp,textmeasure.cpp,display.cpp - -all : $(SOURCES) - $(MMS)$(MMSQUALIFIERS) $(OBJECTS) -.ifdef __WXUNIVERSAL__ - library [--.lib]libwx_gtk_univ.olb $(OBJECTS) - If f$getsyi("HW_MODEL") .le. 2048 then library [--.lib]libwx_gtk_univ.olb [.CXX_REPOSITORY]*.obj -.else -.ifdef __WXGTK2__ - library [--.lib]libwx_gtk2.olb $(OBJECTS) - If f$getsyi("HW_MODEL") .le. 2048 then library [--.lib]libwx_gtk2.olb [.CXX_REPOSITORY]*.obj - $(MMS)$(MMSQUALIFIERS) $(OBJECTS0) - library [--.lib]libwx_gtk2.olb $(OBJECTS0) -.else - library [--.lib]libwx_gtk.olb $(OBJECTS) - If f$getsyi("HW_MODEL") .le. 2048 then library [--.lib]libwx_gtk.olb [.CXX_REPOSITORY]*.obj - $(MMS)$(MMSQUALIFIERS) $(OBJECTS0) - library [--.lib]libwx_gtk.olb $(OBJECTS0) -.endif -.endif - -$(OBJECTS) : [--.include.wx]setup.h -$(OBJECTS0) : [--.include.wx]setup.h - -animate.obj : animate.cpp -app.obj : app.cpp -artgtk.obj : artgtk.cpp -bitmap.obj : bitmap.cpp -bmpbuttn.obj : bmpbuttn.cpp -brush.obj : brush.cpp -button.obj : button.cpp -checkbox.obj : checkbox.cpp -checklst.obj : checklst.cpp -choice.obj : choice.cpp -clipbrd.obj :clipbrd.cpp -colordlg.obj : colordlg.cpp -colour.obj : colour.cpp -collpane.obj : collpane.cpp -combobox.obj : combobox.cpp -control.obj : control.cpp -cursor.obj : cursor.cpp -dataobj.obj : dataobj.cpp -dc.obj : dc.cpp -dcclient.obj : dcclient.cpp -dcmemory.obj : dcmemory.cpp -dcscreen.obj : dcscreen.cpp -dialog.obj : dialog.cpp -dnd.obj : dnd.cpp -evtloop.obj : evtloop.cpp -filedlg.obj : filedlg.cpp -font.obj : font.cpp -fontdlg.obj : fontdlg.cpp -frame.obj : frame.cpp -gauge.obj : gauge.cpp -glcanvas.obj : glcanvas.cpp -sockgtk.obj : sockgtk.cpp -listbox.obj : listbox.cpp -msgdlg.obj : msgdlg.cpp -mdi.obj : mdi.cpp -menu.obj : menu.cpp -minifram.obj : minifram.cpp -notebook.obj : notebook.cpp -pen.obj : pen.cpp -popupwin.obj : popupwin.cpp -radiobox.obj : radiobox.cpp -radiobut.obj : radiobut.cpp -renderer.obj : renderer.cpp -region.obj : region.cpp -scrolbar.obj : scrolbar.cpp -scrolwin.obj : scrolwin.cpp -settings.obj : settings.cpp -slider.obj : slider.cpp -spinbutt.obj : spinbutt.cpp -spinctrl.obj : spinctrl.cpp -statbmp.obj : statbmp.cpp -statbox.obj : statbox.cpp -statline.obj : statline.cpp -stattext.obj : stattext.cpp -toolbar.obj : toolbar.cpp -textctrl.obj : textctrl.cpp -tglbtn.obj : tglbtn.cpp -timer.obj : timer.cpp -tooltip.obj : tooltip.cpp -toplevel.obj : toplevel.cpp -utilsgtk.obj : utilsgtk.cpp -window.obj : window.cpp -treeentry_gtk.obj : treeentry_gtk.c - cc $(CFLAGS)$(CC_DEFINE)/warn=disab=CHAROVERFL $(MMS$TARGET_NAME).c -textentry.obj : textentry.cpp -filectrl.obj : filectrl.cpp -print.obj : print.cpp -win_gtk.obj : win_gtk.cpp -mnemonics.obj : mnemonics.cpp -private.obj : private.cpp -assertdlg_gtk.obj : assertdlg_gtk.cpp -infobar.obj : infobar.cpp -anybutton.obj : anybutton.cpp -nonownedwnd.obj : nonownedwnd.cpp -textmeasure.obj : textmeasure.cpp -display.obj : display.cpp -activityindicator.obj : activityindicator.cpp diff --git a/Externals/wxWidgets3/src/gtk/dialog.cpp b/Externals/wxWidgets3/src/gtk/dialog.cpp deleted file mode 100644 index b57b9b4992..0000000000 --- a/Externals/wxWidgets3/src/gtk/dialog.cpp +++ /dev/null @@ -1,211 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/dialog.cpp -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#include "wx/dialog.h" - -#ifndef WX_PRECOMP -#endif // WX_PRECOMP - -#include "wx/evtloop.h" - -#include "wx/scopedptr.h" -#include "wx/modalhook.h" - -#include -#include "wx/gtk/private/gtk2-compat.h" -#include "wx/gtk/private/dialogcount.h" - -wxDEFINE_TIED_SCOPED_PTR_TYPE(wxGUIEventLoop) - - -//----------------------------------------------------------------------------- -// wxDialog -//----------------------------------------------------------------------------- - -void wxDialog::Init() -{ - m_modalLoop = NULL; - m_modalShowing = false; -} - -wxDialog::wxDialog( wxWindow *parent, - wxWindowID id, const wxString &title, - const wxPoint &pos, const wxSize &size, - long style, const wxString &name ) -{ - Init(); - - (void)Create( parent, id, title, pos, size, style, name ); -} - -bool wxDialog::Create( wxWindow *parent, - wxWindowID id, const wxString &title, - const wxPoint &pos, const wxSize &size, - long style, const wxString &name ) -{ - SetExtraStyle(GetExtraStyle() | wxTOPLEVEL_EX_DIALOG); - - // all dialogs should have tab traversal enabled - style |= wxTAB_TRAVERSAL; - - return wxTopLevelWindow::Create(parent, id, title, pos, size, style, name); -} - -bool wxDialog::Show( bool show ) -{ - if (!show && IsModal()) - { - EndModal( wxID_CANCEL ); - } - - if (show && CanDoLayoutAdaptation()) - DoLayoutAdaptation(); - - bool ret = wxDialogBase::Show(show); - - if (show) - InitDialog(); - - return ret; -} - -wxDialog::~wxDialog() -{ - // if the dialog is modal, this will end its event loop - if ( IsModal() ) - EndModal(wxID_CANCEL); -} - -bool wxDialog::IsModal() const -{ - return m_modalShowing; -} - -// Workaround for Ubuntu overlay scrollbar, which adds our GtkWindow to a -// private window group in a GtkScrollbar realize handler. This breaks the grab -// done by gtk_window_set_modal(), and allows menus and toolbars in the parent -// frame to remain active. So, we install an emission hook on the "realize" -// signal while showing a modal dialog. For any realize on a GtkScrollbar, -// we check the top level parent to see if it has an explicitly set window -// group that is not the same as its transient parent. If we find this, we -// put the top level back in the same window group as its transient parent, and -// re-add the grab. -// Ubuntu 12.04 and 12.10 are known to have this problem. - -// need 2.10 for gtk_window_get_group() -#if GTK_CHECK_VERSION(2,10,0) -extern "C" { -static gboolean -realize_hook(GSignalInvocationHint*, unsigned, const GValue* param_values, void*) -{ - void* p = g_value_peek_pointer(param_values); - if (GTK_IS_SCROLLBAR(p)) - { - GtkWindow* toplevel = GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(p))); - GtkWindow* transient_parent = gtk_window_get_transient_for(toplevel); - if (transient_parent && gtk_window_has_group(toplevel)) - { - GtkWindowGroup* group = gtk_window_get_group(toplevel); - GtkWindowGroup* group_parent = gtk_window_get_group(transient_parent); - if (group != group_parent) - { - gtk_window_group_add_window(group_parent, toplevel); - gtk_grab_add(GTK_WIDGET(toplevel)); - } - } - } - return true; -} -} -#endif // GTK 2.10 - -int wxDialog::ShowModal() -{ - WX_HOOK_MODAL_DIALOG(); - - wxASSERT_MSG( !IsModal(), "ShowModal() can't be called twice" ); - - // release the mouse if it's currently captured as the window having it - // will be disabled when this dialog is shown -- but will still keep the - // capture making it impossible to do anything in the modal dialog itself - GTKReleaseMouseAndNotify(); - - wxWindow * const parent = GetParentForModalDialog(); - if ( parent ) - { - gtk_window_set_transient_for( GTK_WINDOW(m_widget), - GTK_WINDOW(parent->m_widget) ); - } - -#if GTK_CHECK_VERSION(2,10,0) - unsigned sigId = 0; - gulong hookId = 0; -#ifndef __WXGTK3__ - // Ubuntu overlay scrollbar uses at least GTK 2.24 - if (gtk_check_version(2,24,0) == NULL) -#endif - { - sigId = g_signal_lookup("realize", GTK_TYPE_WIDGET); - hookId = g_signal_add_emission_hook(sigId, 0, realize_hook, NULL, NULL); - } -#endif - - // NOTE: this will cause a gtk_grab_add() during Show() - gtk_window_set_modal(GTK_WINDOW(m_widget), true); - - Show( true ); - - m_modalShowing = true; - - wxOpenModalDialogLocker modalLock; - - // Prevent the widget from being destroyed if the user closes the window. - // Needed for derived classes which bypass wxTLW::Create(), and therefore - // the wxTLW "delete-event" handler is not connected - gulong handler_id = g_signal_connect( - m_widget, "delete-event", G_CALLBACK(gtk_true), this); - - // Run modal dialog event loop. - { - wxGUIEventLoopTiedPtr modal(&m_modalLoop, new wxGUIEventLoop()); - m_modalLoop->Run(); - } - - g_signal_handler_disconnect(m_widget, handler_id); -#if GTK_CHECK_VERSION(2,10,0) - if (sigId) - g_signal_remove_emission_hook(sigId, hookId); -#endif - - gtk_window_set_modal(GTK_WINDOW(m_widget), FALSE); - - return GetReturnCode(); -} - -void wxDialog::EndModal( int retCode ) -{ - SetReturnCode( retCode ); - - if (!IsModal()) - { - wxFAIL_MSG( "either wxDialog:EndModal called twice or ShowModal wasn't called" ); - return; - } - - m_modalShowing = false; - - // Ensure Exit() is only called once. The dialog's event loop may be terminated - // externally due to an uncaught exception. - if (m_modalLoop && m_modalLoop->IsRunning()) - m_modalLoop->Exit(); - - Show( false ); -} diff --git a/Externals/wxWidgets3/src/gtk/dirdlg.cpp b/Externals/wxWidgets3/src/gtk/dirdlg.cpp deleted file mode 100644 index c47abbd0f0..0000000000 --- a/Externals/wxWidgets3/src/gtk/dirdlg.cpp +++ /dev/null @@ -1,163 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/dirdlg.cpp -// Purpose: native implementation of wxDirDialog -// Author: Robert Roebling, Zbigniew Zagorski, Mart Raudsepp, Francesco Montorsi -// Copyright: (c) 1998 Robert Roebling, 2004 Zbigniew Zagorski, 2005 Mart Raudsepp -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - - - -/* - NOTE: the GtkFileChooser interface can be used both for wxFileDialog and for wxDirDialog. - Thus following code is very similar (even if not identic) to src/gtk/filedlg.cpp - If you find a problem in this code, remember to check also that file ! -*/ - - - -#if wxUSE_DIRDLG - -#include "wx/dirdlg.h" - -#ifndef WX_PRECOMP - #include "wx/intl.h" - #include "wx/filedlg.h" -#endif - -#include "wx/gtk/private.h" - -extern "C" { -static void gtk_dirdialog_response_callback(GtkWidget * WXUNUSED(w), - gint response, - wxDirDialog *dialog) -{ - if (response == GTK_RESPONSE_ACCEPT) - dialog->GTKOnAccept(); - else // GTK_RESPONSE_CANCEL or GTK_RESPONSE_NONE - dialog->GTKOnCancel(); -} -} - -//----------------------------------------------------------------------------- -// wxDirDialog -//----------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxDirDialog, wxDialog); - -wxDirDialog::wxDirDialog(wxWindow* parent, - const wxString& title, - const wxString& defaultPath, - long style, - const wxPoint& pos, - const wxSize& WXUNUSED(sz), - const wxString& WXUNUSED(name)) -{ - Create(parent, title, defaultPath, style, pos); -} - -bool wxDirDialog::Create(wxWindow* parent, - const wxString& title, - const wxString& defaultPath, - long style, - const wxPoint& pos, - const wxSize& WXUNUSED(sz), - const wxString& WXUNUSED(name)) -{ - m_message = title; - - parent = GetParentForModalDialog(parent, style); - - if (!PreCreation(parent, pos, wxDefaultSize) || - !CreateBase(parent, wxID_ANY, pos, wxDefaultSize, style, - wxDefaultValidator, wxT("dirdialog"))) - { - wxFAIL_MSG( wxT("wxDirDialog creation failed") ); - return false; - } - - GtkWindow* gtk_parent = NULL; - if (parent) - gtk_parent = GTK_WINDOW( gtk_widget_get_toplevel(parent->m_widget) ); - - m_widget = gtk_file_chooser_dialog_new( - wxGTK_CONV(m_message), - gtk_parent, - GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, - NULL); - g_object_ref(m_widget); - - gtk_dialog_set_default_response(GTK_DIALOG(m_widget), GTK_RESPONSE_ACCEPT); -#if GTK_CHECK_VERSION(2,18,0) -#ifndef __WXGTK3__ - if (gtk_check_version(2,18,0) == NULL) -#endif - { - gtk_file_chooser_set_create_folders( - GTK_FILE_CHOOSER(m_widget), (style & wxDD_DIR_MUST_EXIST) == 0); - } -#endif - - // local-only property could be set to false to allow non-local files to be loaded. - // In that case get/set_uri(s) should be used instead of get/set_filename(s) everywhere - // and the GtkFileChooserDialog should probably also be created with a backend, - // e.g. "gnome-vfs", "default", ... (gtk_file_chooser_dialog_new_with_backend). - // Currently local-only is kept as the default - true: - // gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(m_widget), true); - - g_signal_connect (m_widget, "response", - G_CALLBACK (gtk_dirdialog_response_callback), this); - - if ( !defaultPath.empty() ) - SetPath(defaultPath); - - return true; -} - -void wxDirDialog::GTKOnAccept() -{ - wxGtkString str(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(m_widget))); - m_selectedDirectory = wxString::FromUTF8(str); - - // change to the directory where the user went if asked - if (HasFlag(wxDD_CHANGE_DIR)) - { - wxSetWorkingDirectory(m_selectedDirectory); - } - - EndDialog(wxID_OK); -} - -void wxDirDialog::GTKOnCancel() -{ - EndDialog(wxID_CANCEL); -} - -void wxDirDialog::DoSetSize(int x, int y, int width, int height, int sizeFlags) -{ - if (!m_wxwindow) - return; - - wxDirDialogBase::DoSetSize( x, y, width, height, sizeFlags ); -} - -void wxDirDialog::SetPath(const wxString& dir) -{ - if (wxDirExists(dir)) - { - gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget), - wxGTK_CONV_FN(dir)); - } -} - -wxString wxDirDialog::GetPath() const -{ - return m_selectedDirectory; -} - -#endif // wxUSE_DIRDLG diff --git a/Externals/wxWidgets3/src/gtk/display.cpp b/Externals/wxWidgets3/src/gtk/display.cpp deleted file mode 100644 index f30e2037f7..0000000000 --- a/Externals/wxWidgets3/src/gtk/display.cpp +++ /dev/null @@ -1,239 +0,0 @@ -/////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/display.cpp -// Author: Paul Cornett -// Created: 2014-04-17 -// Copyright: (c) 2014 Paul Cornett -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#include "wx/wxprec.h" - -#if wxUSE_DISPLAY - #include "wx/display.h" - #include "wx/display_impl.h" -#endif -#include "wx/utils.h" // wxClientDisplayRect - -#include -#ifdef GDK_WINDOWING_X11 - #include -#endif -#include "wx/gtk/private/gtk2-compat.h" - -GdkWindow* wxGetTopLevelGDK(); - -//----------------------------------------------------------------------------- - -#ifdef GDK_WINDOWING_X11 -void wxGetWorkAreaX11(Screen* screen, int& x, int& y, int& width, int& height); -#endif - -#ifndef __WXGTK3__ -static inline int wx_gdk_screen_get_primary_monitor(GdkScreen* screen) -{ - int monitor = 0; -#if GTK_CHECK_VERSION(2,20,0) - if (gtk_check_version(2,20,0) == NULL) - monitor = gdk_screen_get_primary_monitor(screen); -#endif - return monitor; -} -#define gdk_screen_get_primary_monitor wx_gdk_screen_get_primary_monitor -#endif // !__WXGTK3__ - -static inline void -wx_gdk_screen_get_monitor_workarea(GdkScreen* screen, int monitor, GdkRectangle* dest) -{ -#if GTK_CHECK_VERSION(3,4,0) - if (gtk_check_version(3,4,0) == NULL) - gdk_screen_get_monitor_workarea(screen, monitor, dest); - else -#endif - { - gdk_screen_get_monitor_geometry(screen, monitor, dest); -#ifdef GDK_WINDOWING_X11 -#ifdef __WXGTK3__ - if (GDK_IS_X11_SCREEN(screen)) -#endif - { - GdkRectangle rect = { 0 }; - wxGetWorkAreaX11(GDK_SCREEN_XSCREEN(screen), - rect.x, rect.y, rect.width, rect.height); - // in case _NET_WORKAREA result is too large - if (rect.width && rect.height) - gdk_rectangle_intersect(dest, &rect, dest); - } -#endif // GDK_WINDOWING_X11 - } -} -#define gdk_screen_get_monitor_workarea wx_gdk_screen_get_monitor_workarea - -void wxClientDisplayRect(int* x, int* y, int* width, int* height) -{ - GdkRectangle rect; - GdkWindow* window = wxGetTopLevelGDK(); - GdkScreen* screen = gdk_window_get_screen(window); - int monitor = gdk_screen_get_monitor_at_window(screen, window); - gdk_screen_get_monitor_workarea(screen, monitor, &rect); - if (x) - *x = rect.x; - if (y) - *y = rect.y; - if (width) - *width = rect.width; - if (height) - *height = rect.height; -} -//----------------------------------------------------------------------------- - -#if wxUSE_DISPLAY -class wxDisplayFactoryGTK: public wxDisplayFactory -{ -public: - virtual wxDisplayImpl* CreateDisplay(unsigned n) wxOVERRIDE; - virtual unsigned GetCount() wxOVERRIDE; - virtual int GetFromPoint(const wxPoint& pt) wxOVERRIDE; -}; - -class wxDisplayImplGTK: public wxDisplayImpl -{ - typedef wxDisplayImpl base_type; -public: - wxDisplayImplGTK(unsigned i); - virtual wxRect GetGeometry() const wxOVERRIDE; - virtual wxRect GetClientArea() const wxOVERRIDE; - virtual wxString GetName() const wxOVERRIDE; - virtual bool IsPrimary() const wxOVERRIDE; - virtual wxArrayVideoModes GetModes(const wxVideoMode& mode) const wxOVERRIDE; - virtual wxVideoMode GetCurrentMode() const wxOVERRIDE; - virtual bool ChangeMode(const wxVideoMode& mode) wxOVERRIDE; - - GdkScreen* const m_screen; -}; - -static inline GdkScreen* GetScreen() -{ - return gdk_window_get_screen(wxGetTopLevelGDK()); -} -//----------------------------------------------------------------------------- - -wxDisplayImpl* wxDisplayFactoryGTK::CreateDisplay(unsigned n) -{ - return new wxDisplayImplGTK(n); -} - -unsigned wxDisplayFactoryGTK::GetCount() -{ - return gdk_screen_get_n_monitors(GetScreen()); -} - -int wxDisplayFactoryGTK::GetFromPoint(const wxPoint& pt) -{ - GdkScreen* screen = GetScreen(); - int monitor = gdk_screen_get_monitor_at_point(screen, pt.x, pt.y); - GdkRectangle rect; - gdk_screen_get_monitor_geometry(screen, monitor, &rect); - if (!wxRect(rect.x, rect.y, rect.width, rect.height).Contains(pt)) - monitor = wxNOT_FOUND; - return monitor; -} -//----------------------------------------------------------------------------- - -wxDisplayImplGTK::wxDisplayImplGTK(unsigned i) - : base_type(i) - , m_screen(GetScreen()) -{ -} - -wxRect wxDisplayImplGTK::GetGeometry() const -{ - GdkRectangle rect; - gdk_screen_get_monitor_geometry(m_screen, m_index, &rect); - return wxRect(rect.x, rect.y, rect.width, rect.height); -} - -wxRect wxDisplayImplGTK::GetClientArea() const -{ - GdkRectangle rect; - gdk_screen_get_monitor_workarea(m_screen, m_index, &rect); - return wxRect(rect.x, rect.y, rect.width, rect.height); -} - -wxString wxDisplayImplGTK::GetName() const -{ - return wxString(); -} - -bool wxDisplayImplGTK::IsPrimary() const -{ - return gdk_screen_get_primary_monitor(m_screen) == int(m_index); -} - -#ifdef GDK_WINDOWING_X11 -wxArrayVideoModes wxXF86VidMode_GetModes(const wxVideoMode& mode, Display* pDisplay, int nScreen); -wxVideoMode wxXF86VidMode_GetCurrentMode(Display* display, int nScreen); -bool wxXF86VidMode_ChangeMode(const wxVideoMode& mode, Display* display, int nScreen); -wxArrayVideoModes wxX11_GetModes(const wxDisplayImpl* impl, const wxVideoMode& modeMatch, Display* display); -#endif - -wxArrayVideoModes wxDisplayImplGTK::GetModes(const wxVideoMode& mode) const -{ - wxArrayVideoModes modes; -#ifdef GDK_WINDOWING_X11 -#ifdef __WXGTK3__ - if (GDK_IS_X11_SCREEN(m_screen)) -#endif - { - Display* display = GDK_DISPLAY_XDISPLAY(gdk_screen_get_display(m_screen)); -#ifdef HAVE_X11_EXTENSIONS_XF86VMODE_H - int nScreen = gdk_x11_screen_get_screen_number(m_screen); - modes = wxXF86VidMode_GetModes(mode, display, nScreen); -#else - modes = wxX11_GetModes(this, mode, display); -#endif - } -#else - wxUnusedVar(mode); -#endif - return modes; -} - -wxVideoMode wxDisplayImplGTK::GetCurrentMode() const -{ - wxVideoMode mode; -#if defined(GDK_WINDOWING_X11) && defined(HAVE_X11_EXTENSIONS_XF86VMODE_H) -#ifdef __WXGTK3__ - if (GDK_IS_X11_SCREEN(m_screen)) -#endif - { - Display* display = GDK_DISPLAY_XDISPLAY(gdk_screen_get_display(m_screen)); - int nScreen = gdk_x11_screen_get_screen_number(m_screen); - mode = wxXF86VidMode_GetCurrentMode(display, nScreen); - } -#endif - return mode; -} - -bool wxDisplayImplGTK::ChangeMode(const wxVideoMode& mode) -{ - bool success = false; -#if defined(GDK_WINDOWING_X11) && defined(HAVE_X11_EXTENSIONS_XF86VMODE_H) -#ifdef __WXGTK3__ - if (GDK_IS_X11_SCREEN(m_screen)) -#endif - { - Display* display = GDK_DISPLAY_XDISPLAY(gdk_screen_get_display(m_screen)); - int nScreen = gdk_x11_screen_get_screen_number(m_screen); - success = wxXF86VidMode_ChangeMode(mode, display, nScreen); - } -#else - wxUnusedVar(mode); -#endif - return success; -} - -wxDisplayFactory* wxDisplay::CreateFactory() -{ - return new wxDisplayFactoryGTK; -} -#endif // wxUSE_DISPLAY diff --git a/Externals/wxWidgets3/src/gtk/dnd.cpp b/Externals/wxWidgets3/src/gtk/dnd.cpp deleted file mode 100644 index ddcf5cd0d1..0000000000 --- a/Externals/wxWidgets3/src/gtk/dnd.cpp +++ /dev/null @@ -1,919 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/dnd.cpp -// Purpose: wxDropTarget class -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if wxUSE_DRAG_AND_DROP - -#include "wx/dnd.h" - -#ifndef WX_PRECOMP - #include "wx/intl.h" - #include "wx/log.h" - #include "wx/app.h" - #include "wx/utils.h" - #include "wx/window.h" - #include "wx/gdicmn.h" -#endif - -#include "wx/scopeguard.h" - -#include -#include "wx/gtk/private/gtk2-compat.h" - -//---------------------------------------------------------------------------- -// global data -//---------------------------------------------------------------------------- - -extern bool g_blockEventsOnDrag; - -// the flags used for the last DoDragDrop() -static long gs_flagsForDrag = 0; - -// the trace mask we use with wxLogTrace() - call -// wxLog::AddTraceMask(TRACE_DND) to enable the trace messages from here -// (there are quite a few of them, so don't enable this by default) -#define TRACE_DND "dnd" - -// global variables because GTK+ DnD want to have the -// mouse event that caused it -extern GdkEvent *g_lastMouseEvent; -extern int g_lastButtonNumber; - -//---------------------------------------------------------------------------- -// standard icons -//---------------------------------------------------------------------------- - -/* Copyright (c) Julian Smart */ -static const char * page_xpm[] = { -/* columns rows colors chars-per-pixel */ -"32 32 37 1", -"5 c #7198D9", -", c #769CDA", -"2 c #DCE6F6", -"i c #FFFFFF", -"e c #779DDB", -": c #9AB6E4", -"9 c #EAF0FA", -"- c #B1C7EB", -"$ c #6992D7", -"y c #F7F9FD", -"= c #BED0EE", -"q c #F0F5FC", -"; c #A8C0E8", -"@ c #366BC2", -" c None", -"u c #FDFEFF", -"8 c #5987D3", -"* c #C4D5F0", -"7 c #7CA0DC", -"O c #487BCE", -"< c #6B94D7", -"& c #CCDAF2", -"> c #89A9DF", -"3 c #5584D1", -"w c #82A5DE", -"1 c #3F74CB", -"+ c #3A70CA", -". c #3569BF", -"% c #D2DFF4", -"# c #3366BB", -"r c #F5F8FD", -"0 c #FAFCFE", -"4 c #DFE8F7", -"X c #5E8AD4", -"o c #5282D0", -"t c #B8CCEC", -"6 c #E5EDF9", -/* pixels */ -" ", -" ", -" ", -" ", -" ", -" .XXXooOO++@# ", -" $%&*=-;::>,<1 ", -" $2%&*=-;::><:3 ", -" $42%&*=-;::<&:3 ", -" 56477<<<<8<<9&:X ", -" 59642%&*=-;<09&:5 ", -" 5q9642%&*=-<<<<<# ", -" 5qqw777<<<<<88:>+ ", -" erqq9642%&*=t;::+ ", -" eyrqq9642%&*=t;:O ", -" eyywwww777<<<GTKSetDragContext( context ); - - /* we don't need return values. this event is just for - information */ - drop_target->OnLeave(); - - /* this has to be done because GDK has no "drag_enter" event */ - drop_target->m_firstMotion = true; - - /* after this, invalidate the drop_target's GdkDragContext */ - drop_target->GTKSetDragContext( NULL ); -} -} - -// ---------------------------------------------------------------------------- -// "drag_motion" -// ---------------------------------------------------------------------------- - -extern "C" { -static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget), - GdkDragContext *context, - gint x, - gint y, - guint time, - wxDropTarget *drop_target ) -{ - /* Owen Taylor: "if the coordinates not in a drop zone, - return FALSE, otherwise call gtk_drag_status() and - return TRUE" */ - -#if 0 - wxPrintf( "motion\n" ); - GList *tmp_list; - for (tmp_list = context->targets; tmp_list; tmp_list = tmp_list->next) - { - wxString atom = wxString::FromAscii( gdk_atom_name (GDK_POINTER_TO_ATOM (tmp_list->data)) ); - wxPrintf( "Atom: %s\n", atom ); - } -#endif - - // Inform the wxDropTarget about the current GdkDragContext. - // This is only valid for the duration of this call. - drop_target->GTKSetDragContext( context ); - - // Does the source actually accept the data type? - if (drop_target->GTKGetMatchingPair() == (GdkAtom) 0) - { - drop_target->GTKSetDragContext( NULL ); - return FALSE; - } - - wxDragResult suggested_action = drop_target->GTKFigureOutSuggestedAction(); - - wxDragResult result = wxDragNone; - - if (drop_target->m_firstMotion) - { - // the first "drag_motion" event substitutes a "drag_enter" event - result = drop_target->OnEnter( x, y, suggested_action ); - } - else - { - // give program a chance to react (i.e. to say no by returning FALSE) - result = drop_target->OnDragOver( x, y, suggested_action ); - } - - GdkDragAction result_action = GDK_ACTION_DEFAULT; - if (result == wxDragCopy) - result_action = GDK_ACTION_COPY; - else if (result == wxDragLink) - result_action = GDK_ACTION_LINK; - else - result_action = GDK_ACTION_MOVE; - - // is result action actually supported - bool ret = (result_action != GDK_ACTION_DEFAULT) && - (gdk_drag_context_get_actions(context) & result_action); - - if (ret) - gdk_drag_status( context, result_action, time ); - - // after this, invalidate the drop_target's GdkDragContext - drop_target->GTKSetDragContext( NULL ); - - // this has to be done because GDK has no "drag_enter" event - drop_target->m_firstMotion = false; - - return ret; -} -} - -// ---------------------------------------------------------------------------- -// "drag_drop" -// ---------------------------------------------------------------------------- - -extern "C" { -static gboolean target_drag_drop( GtkWidget *widget, - GdkDragContext *context, - gint x, - gint y, - guint time, - wxDropTarget *drop_target ) -{ - /* Owen Taylor: "if the drop is not in a drop zone, - return FALSE, otherwise, if you aren't accepting - the drop, call gtk_drag_finish() with success == FALSE - otherwise call gtk_drag_data_get()" */ - - /* inform the wxDropTarget about the current GdkDragContext. - this is only valid for the duration of this call */ - drop_target->GTKSetDragContext( context ); - - // Does the source actually accept the data type? - if (drop_target->GTKGetMatchingPair() == (GdkAtom) 0) - { - // cancel the whole thing - gtk_drag_finish( context, - FALSE, // no success - FALSE, // don't delete data on dropping side - time ); - - drop_target->GTKSetDragContext( NULL ); - - drop_target->m_firstMotion = true; - - return FALSE; - } - - /* inform the wxDropTarget about the current drag widget. - this is only valid for the duration of this call */ - drop_target->GTKSetDragWidget( widget ); - - /* inform the wxDropTarget about the current drag time. - this is only valid for the duration of this call */ - drop_target->GTKSetDragTime( time ); - - /* reset the block here as someone might very well - show a dialog as a reaction to a drop and this - wouldn't work without events */ - g_blockEventsOnDrag = false; - - bool ret = drop_target->OnDrop( x, y ); - - if (!ret) - { - wxLogTrace(TRACE_DND, wxT( "Drop target: OnDrop returned FALSE") ); - - /* cancel the whole thing */ - gtk_drag_finish( context, - FALSE, /* no success */ - FALSE, /* don't delete data on dropping side */ - time ); - } - else - { - wxLogTrace(TRACE_DND, wxT( "Drop target: OnDrop returned true") ); - - GdkAtom format = drop_target->GTKGetMatchingPair(); - - // this does happen somehow, see bug 555111 - wxCHECK_MSG( format, FALSE, wxT("no matching GdkAtom for format?") ); - - /* this should trigger an "drag_data_received" event */ - gtk_drag_get_data( widget, - context, - format, - time ); - } - - /* after this, invalidate the drop_target's GdkDragContext */ - drop_target->GTKSetDragContext( NULL ); - - /* after this, invalidate the drop_target's drag widget */ - drop_target->GTKSetDragWidget( NULL ); - - /* this has to be done because GDK has no "drag_enter" event */ - drop_target->m_firstMotion = true; - - return ret; -} -} - -// ---------------------------------------------------------------------------- -// "drag_data_received" -// ---------------------------------------------------------------------------- - -extern "C" { -static void target_drag_data_received( GtkWidget *WXUNUSED(widget), - GdkDragContext *context, - gint x, - gint y, - GtkSelectionData *data, - guint WXUNUSED(info), - guint time, - wxDropTarget *drop_target ) -{ - /* Owen Taylor: "call gtk_drag_finish() with - success == TRUE" */ - - if (gtk_selection_data_get_length(data) <= 0 || gtk_selection_data_get_format(data) != 8) - { - /* negative data length and non 8-bit data format - qualifies for junk */ - gtk_drag_finish (context, FALSE, FALSE, time); - - return; - } - - wxLogTrace(TRACE_DND, wxT( "Drop target: data received event") ); - - /* inform the wxDropTarget about the current GtkSelectionData. - this is only valid for the duration of this call */ - drop_target->GTKSetDragData( data ); - - wxDragResult result = ConvertFromGTK(gdk_drag_context_get_selected_action(context)); - - if ( wxIsDragResultOk( drop_target->OnData( x, y, result ) ) ) - { - wxLogTrace(TRACE_DND, wxT( "Drop target: OnData returned true") ); - - /* tell GTK that data transfer was successful */ - gtk_drag_finish( context, TRUE, FALSE, time ); - } - else - { - wxLogTrace(TRACE_DND, wxT( "Drop target: OnData returned FALSE") ); - - /* tell GTK that data transfer was not successful */ - gtk_drag_finish( context, FALSE, FALSE, time ); - } - - /* after this, invalidate the drop_target's drag data */ - drop_target->GTKSetDragData( NULL ); -} -} - -//---------------------------------------------------------------------------- -// wxDropTarget -//---------------------------------------------------------------------------- - -wxDropTarget::wxDropTarget( wxDataObject *data ) - : wxDropTargetBase( data ) -{ - m_firstMotion = true; - m_dragContext = NULL; - m_dragWidget = NULL; - m_dragData = NULL; - m_dragTime = 0; -} - -wxDragResult wxDropTarget::OnDragOver( wxCoord WXUNUSED(x), - wxCoord WXUNUSED(y), - wxDragResult def ) -{ - return def; -} - -bool wxDropTarget::OnDrop( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y) ) -{ - return true; -} - -wxDragResult wxDropTarget::OnData( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), - wxDragResult def ) -{ - return GetData() ? def : wxDragNone; -} - -wxDragResult wxDropTarget::GTKFigureOutSuggestedAction() -{ - if (!m_dragContext) - return wxDragError; - - // GTK+ always supposes that we want to copy the data by default while we - // might want to move it, so examine not only suggested_action - which is - // only good if we don't have our own preferences - but also the actions - // field - wxDragResult suggested_action = wxDragNone; - const GdkDragAction actions = gdk_drag_context_get_actions(m_dragContext); - if (GetDefaultAction() == wxDragNone) - { - // use default action set by wxDropSource::DoDragDrop() - if ( (gs_flagsForDrag & wxDrag_DefaultMove) == wxDrag_DefaultMove && - (actions & GDK_ACTION_MOVE)) - { - // move is requested by the program and allowed by GTK+ - do it, even - // though suggested_action may be currently wxDragCopy - suggested_action = wxDragMove; - } - else // use whatever GTK+ says we should - { - suggested_action = ConvertFromGTK(gdk_drag_context_get_suggested_action(m_dragContext)); - -#if 0 - // RR: I don't understand the code below: if the drag comes from - // a different app, the gs_flagsForDrag is invalid; if it - // comes from the same wx app, then GTK+ hopefully won't - // suggest something we didn't allow in the frist place - // in DoDrop() - if ( (suggested_action == wxDragMove) && !(gs_flagsForDrag & wxDrag_AllowMove) ) - { - // we're requested to move but we can't - suggested_action = wxDragCopy; - } -#endif - } - } - else if (GetDefaultAction() == wxDragMove && - (actions & GDK_ACTION_MOVE)) - { - - suggested_action = wxDragMove; - } - else - { - if (actions & GDK_ACTION_COPY) - suggested_action = wxDragCopy; - else if (actions & GDK_ACTION_MOVE) - suggested_action = wxDragMove; - else if (actions & GDK_ACTION_LINK) - suggested_action = wxDragLink; - else - suggested_action = wxDragNone; - } - - return suggested_action; -} - -wxDataFormat wxDropTarget::GetMatchingPair() -{ - return wxDataFormat( GTKGetMatchingPair() ); -} - -GdkAtom wxDropTarget::GTKGetMatchingPair(bool quiet) -{ - if (!m_dataObject) - return (GdkAtom) 0; - - if (!m_dragContext) - return (GdkAtom) 0; - - const GList* child = gdk_drag_context_list_targets(m_dragContext); - while (child) - { - GdkAtom formatAtom = (GdkAtom)(child->data); - wxDataFormat format( formatAtom ); - - if ( !quiet ) - { - wxLogTrace(TRACE_DND, wxT("Drop target: drag has format: %s"), - format.GetId().c_str()); - } - - if (m_dataObject->IsSupportedFormat( format )) - return formatAtom; - - child = child->next; - } - - return (GdkAtom) 0; -} - -bool wxDropTarget::GetData() -{ - if (!m_dragData) - return false; - - if (!m_dataObject) - return false; - - wxDataFormat dragFormat(gtk_selection_data_get_target(m_dragData)); - - if (!m_dataObject->IsSupportedFormat( dragFormat )) - return false; - - m_dataObject->SetData(dragFormat, - (size_t)gtk_selection_data_get_length(m_dragData), - (const void*)gtk_selection_data_get_data(m_dragData)); - - return true; -} - -void wxDropTarget::GtkUnregisterWidget( GtkWidget *widget ) -{ - wxCHECK_RET( widget != NULL, wxT("unregister widget is NULL") ); - - gtk_drag_dest_unset( widget ); - - g_signal_handlers_disconnect_by_func (widget, - (gpointer) target_drag_leave, this); - g_signal_handlers_disconnect_by_func (widget, - (gpointer) target_drag_motion, this); - g_signal_handlers_disconnect_by_func (widget, - (gpointer) target_drag_drop, this); - g_signal_handlers_disconnect_by_func (widget, - (gpointer) target_drag_data_received, this); -} - -void wxDropTarget::GtkRegisterWidget( GtkWidget *widget ) -{ - wxCHECK_RET( widget != NULL, wxT("register widget is NULL") ); - - /* gtk_drag_dest_set() determines what default behaviour we'd like - GTK to supply. we don't want to specify out targets (=formats) - or actions in advance (i.e. not GTK_DEST_DEFAULT_MOTION and - not GTK_DEST_DEFAULT_DROP). instead we react individually to - "drag_motion" and "drag_drop" events. this makes it possible - to allow dropping on only a small area. we should set - GTK_DEST_DEFAULT_HIGHLIGHT as this will switch on the nice - highlighting if dragging over standard controls, but this - seems to be broken without the other two. */ - - gtk_drag_dest_set( widget, - (GtkDestDefaults) 0, /* no default behaviour */ - NULL, /* we don't supply any formats here */ - 0, /* number of targets = 0 */ - (GdkDragAction) 0 ); /* we don't supply any actions here */ - - g_signal_connect (widget, "drag_leave", - G_CALLBACK (target_drag_leave), this); - - g_signal_connect (widget, "drag_motion", - G_CALLBACK (target_drag_motion), this); - - g_signal_connect (widget, "drag_drop", - G_CALLBACK (target_drag_drop), this); - - g_signal_connect (widget, "drag_data_received", - G_CALLBACK (target_drag_data_received), this); -} - -//---------------------------------------------------------------------------- -// "drag_data_get" -//---------------------------------------------------------------------------- - -extern "C" { -static void -source_drag_data_get (GtkWidget *WXUNUSED(widget), - GdkDragContext *context, - GtkSelectionData *selection_data, - guint WXUNUSED(info), - guint WXUNUSED(time), - wxDropSource *drop_source ) -{ - wxDataFormat format(gtk_selection_data_get_target(selection_data)); - - wxLogTrace(TRACE_DND, wxT("Drop source: format requested: %s"), - format.GetId().c_str()); - - drop_source->m_retValue = wxDragError; - - wxDataObject *data = drop_source->GetDataObject(); - - if (!data) - { - wxLogTrace(TRACE_DND, wxT("Drop source: no data object") ); - return; - } - - if (!data->IsSupportedFormat(format)) - { - wxLogTrace(TRACE_DND, wxT("Drop source: unsupported format") ); - return; - } - - if (data->GetDataSize(format) == 0) - { - wxLogTrace(TRACE_DND, wxT("Drop source: empty data") ); - return; - } - - size_t size = data->GetDataSize(format); - -// printf( "data size: %d.\n", (int)data_size ); - - guchar *d = new guchar[size]; - - if (!data->GetDataHere( format, (void*)d )) - { - delete[] d; - return; - } - - drop_source->m_retValue = ConvertFromGTK(gdk_drag_context_get_selected_action(context)); - - gtk_selection_data_set( selection_data, - gtk_selection_data_get_target(selection_data), - 8, // 8-bit - d, - size ); - - delete[] d; -} -} - -//---------------------------------------------------------------------------- -// "drag_end" -//---------------------------------------------------------------------------- - -extern "C" { -static void source_drag_end( GtkWidget *WXUNUSED(widget), - GdkDragContext *WXUNUSED(context), - wxDropSource *drop_source ) -{ - drop_source->m_waiting = false; -} -} - -//----------------------------------------------------------------------------- -// "configure_event" from m_iconWindow -//----------------------------------------------------------------------------- - -extern "C" { -static gint -gtk_dnd_window_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *WXUNUSED(event), wxDropSource *source ) -{ - source->GiveFeedback(ConvertFromGTK(gdk_drag_context_get_selected_action(source->m_dragContext))); - - return 0; -} -} - -//--------------------------------------------------------------------------- -// wxDropSource -//--------------------------------------------------------------------------- - -wxDropSource::wxDropSource(wxWindow *win, - const wxIcon &iconCopy, - const wxIcon &iconMove, - const wxIcon &iconNone) -{ - m_waiting = true; - - m_iconWindow = NULL; - - m_window = win; - m_widget = win->m_widget; - if (win->m_wxwindow) m_widget = win->m_wxwindow; - - m_retValue = wxDragNone; - - SetIcons(iconCopy, iconMove, iconNone); -} - -wxDropSource::wxDropSource(wxDataObject& data, - wxWindow *win, - const wxIcon &iconCopy, - const wxIcon &iconMove, - const wxIcon &iconNone) -{ - m_waiting = true; - - SetData( data ); - - m_iconWindow = NULL; - - m_window = win; - m_widget = win->m_widget; - if (win->m_wxwindow) m_widget = win->m_wxwindow; - - m_retValue = wxDragNone; - - SetIcons(iconCopy, iconMove, iconNone); -} - -void wxDropSource::SetIcons(const wxIcon &iconCopy, - const wxIcon &iconMove, - const wxIcon &iconNone) -{ - m_iconCopy = iconCopy; - m_iconMove = iconMove; - m_iconNone = iconNone; - - if ( !m_iconCopy.IsOk() ) - m_iconCopy = wxIcon(page_xpm); - if ( !m_iconMove.IsOk() ) - m_iconMove = m_iconCopy; - if ( !m_iconNone.IsOk() ) - m_iconNone = m_iconCopy; -} - -wxDropSource::~wxDropSource() -{ -} - -void wxDropSource::PrepareIcon( int action, GdkDragContext *context ) -{ - // get the right icon to display - wxIcon *icon = NULL; - if ( action & GDK_ACTION_MOVE ) - icon = &m_iconMove; - else if ( action & GDK_ACTION_COPY ) - icon = &m_iconCopy; - else - icon = &m_iconNone; - -#ifndef __WXGTK3__ - GdkBitmap *mask; - if ( icon->GetMask() ) - mask = *icon->GetMask(); - else - mask = NULL; - - GdkPixmap *pixmap = icon->GetPixmap(); - - GdkColormap *colormap = gtk_widget_get_colormap( m_widget ); - gtk_widget_push_colormap (colormap); -#endif - - m_iconWindow = gtk_window_new (GTK_WINDOW_POPUP); - gtk_widget_set_events (m_iconWindow, GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK); - gtk_widget_set_app_paintable (m_iconWindow, TRUE); - -#ifdef __WXGTK3__ - gtk_widget_set_visual(m_iconWindow, gtk_widget_get_visual(m_widget)); -#else - gtk_widget_pop_colormap (); -#endif - - gtk_widget_set_size_request (m_iconWindow, icon->GetWidth(), icon->GetHeight()); - gtk_widget_realize (m_iconWindow); - - g_signal_connect (m_iconWindow, "configure_event", - G_CALLBACK (gtk_dnd_window_configure_callback), this); - -#ifdef __WXGTK3__ - cairo_t* cr = gdk_cairo_create(gtk_widget_get_window(m_iconWindow)); - icon->SetSourceSurface(cr, 0, 0); - cairo_pattern_t* pattern = cairo_get_source(cr); - gdk_window_set_background_pattern(gtk_widget_get_window(m_iconWindow), pattern); - cairo_destroy(cr); - cairo_surface_t* mask = NULL; - if (icon->GetMask()) - mask = *icon->GetMask(); - if (mask) - { - cairo_region_t* region = gdk_cairo_region_create_from_surface(mask); - gtk_widget_shape_combine_region(m_iconWindow, region); - cairo_region_destroy(region); - } -#else - gdk_window_set_back_pixmap(gtk_widget_get_window(m_iconWindow), pixmap, false); - - if (mask) - gtk_widget_shape_combine_mask (m_iconWindow, mask, 0, 0); -#endif - - gtk_drag_set_icon_widget( context, m_iconWindow, 0, 0 ); -} - -wxDragResult wxDropSource::DoDragDrop(int flags) -{ - wxCHECK_MSG( m_data && m_data->GetFormatCount(), wxDragNone, - wxT("Drop source: no data") ); - - // still in drag - if (g_blockEventsOnDrag) - return wxDragNone; - - // don't start dragging if no button is down - if (g_lastButtonNumber == 0) - return wxDragNone; - - // we can only start a drag after a mouse event - if (g_lastMouseEvent == NULL) - return wxDragNone; - - GTKConnectDragSignals(); - wxON_BLOCK_EXIT_OBJ0(*this, wxDropSource::GTKDisconnectDragSignals); - - m_waiting = true; - - GtkTargetList *target_list = gtk_target_list_new( NULL, 0 ); - - wxDataFormat *array = new wxDataFormat[ m_data->GetFormatCount() ]; - m_data->GetAllFormats( array ); - size_t count = m_data->GetFormatCount(); - for (size_t i = 0; i < count; i++) - { - GdkAtom atom = array[i]; - wxLogTrace(TRACE_DND, wxT("Drop source: Supported atom %s"), - gdk_atom_name( atom )); - gtk_target_list_add( target_list, atom, 0, 0 ); - } - delete[] array; - - int allowed_actions = GDK_ACTION_COPY; - if ( flags & wxDrag_AllowMove ) - allowed_actions |= GDK_ACTION_MOVE; - - // VZ: as we already use g_blockEventsOnDrag it shouldn't be that bad - // to use a global to pass the flags to the drop target but I'd - // surely prefer a better way to do it - gs_flagsForDrag = flags; - - m_retValue = wxDragCancel; - - GdkDragContext *context = gtk_drag_begin( m_widget, - target_list, - (GdkDragAction)allowed_actions, - g_lastButtonNumber, // number of mouse button which started drag - (GdkEvent*) g_lastMouseEvent ); - - if ( !context ) - { - // this can happen e.g. if gdk_pointer_grab() failed - return wxDragError; - } - - m_dragContext = context; - - PrepareIcon( allowed_actions, context ); - - while (m_waiting) - gtk_main_iteration(); - - g_signal_handlers_disconnect_by_func (m_iconWindow, - (gpointer) gtk_dnd_window_configure_callback, this); - - return m_retValue; -} - -void wxDropSource::GTKConnectDragSignals() -{ - if (!m_widget) - return; - - g_blockEventsOnDrag = true; - - g_signal_connect (m_widget, "drag_data_get", - G_CALLBACK (source_drag_data_get), this); - g_signal_connect (m_widget, "drag_end", - G_CALLBACK (source_drag_end), this); - -} - -void wxDropSource::GTKDisconnectDragSignals() -{ - if (!m_widget) - return; - - g_blockEventsOnDrag = false; - - g_signal_handlers_disconnect_by_func (m_widget, - (gpointer) source_drag_data_get, - this); - g_signal_handlers_disconnect_by_func (m_widget, - (gpointer) source_drag_end, - this); -} - -#endif - // wxUSE_DRAG_AND_DROP diff --git a/Externals/wxWidgets3/src/gtk/eggtrayicon.c b/Externals/wxWidgets3/src/gtk/eggtrayicon.c deleted file mode 100644 index bd048ae634..0000000000 --- a/Externals/wxWidgets3/src/gtk/eggtrayicon.c +++ /dev/null @@ -1,640 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* eggtrayicon.c - * Copyright (C) 2002 Anders Carlsson - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -/* - -Permission to use this file under wxWindows licence given by -copyright holder: --------- -From andersca@gnu.org Tue Dec 9 13:01:56 2003 -Return-path: -Envelope-to: vasek@localhost -Delivery-date: Tue, 09 Dec 2003 13:04:35 +0100 -Received: from localhost - ([127.0.0.1] helo=amavis ident=amavis) - by armitage with esmtp (Exim 3.35 #1) - id 1ATgbS-0001Gs-00 - for vasek@localhost; Tue, 09 Dec 2003 13:04:35 +0100 -Received: from armitage ([127.0.0.1]) - by amavis (armitage [127.0.0.1]) (amavisd-new, port 10024) with ESMTP - id 04227-09 for ; - Tue, 9 Dec 2003 13:04:11 +0100 (CET) -Received: from localhost ([127.0.0.1] ident=fetchmail) - by armitage with esmtp (Exim 3.35 #1) - id 1ATgb5-0001GY-00 - for vasek@localhost; Tue, 09 Dec 2003 13:04:11 +0100 -Delivered-To: alias-email-slavikvaclav@seznam.cz -Received: from pop3.seznam.cz [212.80.76.45] - by localhost with POP3 (fetchmail-5.9.11) - for vasek@localhost (single-drop); Tue, 09 Dec 2003 13:04:11 +0100 (CET) -Received: (qmail 9861 invoked from network); 9 Dec 2003 12:02:17 -0000 -Received: from unknown (HELO maxipes.logix.cz) (81.0.234.97) - by buster.go.seznam.cz with SMTP; 9 Dec 2003 12:02:17 -0000 -Received: by maxipes.logix.cz (Postfix, from userid 604) - id 37E6D29A51; Tue, 9 Dec 2003 13:02:16 +0100 (CET) -X-Original-To: vaclav.slavik@matfyz.cz -Received: from mail.csbnet.se (glutus.csbnet.se [193.11.248.2]) - by maxipes.logix.cz (Postfix) with ESMTP id 90D6A29A51 - for ; Tue, 9 Dec 2003 13:02:15 +0100 (CET) -Received: by mail.csbnet.se (Postfix, from userid 8) - id 7AA7F10A6D7; Tue, 9 Dec 2003 13:02:14 +0100 (CET) -Received: from carbon.csbnet.se (carbon.csbnet.se [193.11.248.180]) - by mail.csbnet.se (Postfix) with ESMTP id A190F10A71D - for ; Tue, 9 Dec 2003 13:01:56 +0100 (CET) -Subject: Re: eggtrayicon.{c,h} licensing -From: Anders Carlsson -To: Vaclav Slavik -In-Reply-To: <200312091142.54542.vaclav.slavik@matfyz.cz> -References: <200312091142.54542.vaclav.slavik@matfyz.cz> -Content-Type: text/plain -Message-Id: <1070971316.30989.0.camel@carbon.csbnet.se> -Mime-Version: 1.0 -X-Mailer: Ximian Evolution 1.5 -Date: Tue, 09 Dec 2003 13:01:56 +0100 -Content-Transfer-Encoding: 7bit -X-Scanned-By: CLAM (openantivirus DB) antivirus scanner at mail.csbnet.se -X-Virus-Scanned: by amavisd-new-20030616-p5 (Debian) at armitage -X-Spam-Status: No, hits=-4.9 tagged_above=-999.0 required=6.3 tests=BAYES_00 -X-Spam-Level: -Status: R -X-Status: N -X-KMail-EncryptionState: -X-KMail-SignatureState: - -On tis, 2003-12-09 at 11:42 +0100, Vaclav Slavik wrote: -> Hi, -> -> I'm working on the wxWindows cross-platform GUI toolkit -> (http://www.wxwindows.org) which uses GTK+ and it would save me a lot -> of time if I could use your eggtrayicon code to implement tray icons -> on X11. Unfortunately I can't use it right now because it is not part -> of any library we could depend on (as we do depend on GTK+) and would -> have to be included in our sources and it is under the LGPL license. -> The problem is that wxWindows' license is more permissive (see -> http://www.opensource.org/licenses/wxwindows.php for details) and so -> I can't take your code and put it under wxWindows License. And I -> can't put code that can't be used under the terms of wxWindows -> License into wxWindows either. Do you think it would be possible to -> get permission to include eggtrayicon under wxWindows license? -> -> Thanks, -> Vaclav -> - -Sure, that's fine by me. - -Anders --------- -*/ - - -#include "wx/platform.h" - -#if wxUSE_TASKBARICON - -#include -#if GTK_CHECK_VERSION(2, 1, 0) - -#include -#include "eggtrayicon.h" - -#include -#if defined (GDK_WINDOWING_X11) -#include -#include -#elif defined (GDK_WINDOWING_WIN32) -#include -#endif - - -#define SYSTEM_TRAY_REQUEST_DOCK 0 -#define SYSTEM_TRAY_BEGIN_MESSAGE 1 -#define SYSTEM_TRAY_CANCEL_MESSAGE 2 - -#define SYSTEM_TRAY_ORIENTATION_HORZ 0 -#define SYSTEM_TRAY_ORIENTATION_VERT 1 - -enum { - PROP_0, - PROP_ORIENTATION -}; - -static GtkPlugClass *parent_class = NULL; - -static void egg_tray_icon_init (EggTrayIcon *icon); -static void egg_tray_icon_class_init (EggTrayIconClass *klass); - -static void egg_tray_icon_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec); - -static void egg_tray_icon_realize (GtkWidget *widget); -static void egg_tray_icon_unrealize (GtkWidget *widget); - -static void egg_tray_icon_add (GtkContainer *container, - GtkWidget *widget); - -#ifdef GDK_WINDOWING_X11 -static void egg_tray_icon_update_manager_window (EggTrayIcon *icon, - gboolean dock_if_realized); -static void egg_tray_icon_manager_window_destroyed (EggTrayIcon *icon); -#endif - -GType -egg_tray_icon_get_type (void) -{ - static GType our_type = 0; - - if (our_type == 0) - { - static const GTypeInfo our_info = - { - sizeof (EggTrayIconClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) egg_tray_icon_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (EggTrayIcon), - 0, /* n_preallocs */ - (GInstanceInitFunc) egg_tray_icon_init - }; - - our_type = g_type_register_static (GTK_TYPE_PLUG, "EggTrayIcon", &our_info, 0); - } - - return our_type; -} - -static void -egg_tray_icon_init (EggTrayIcon *icon) -{ - icon->stamp = 1; - icon->orientation = GTK_ORIENTATION_HORIZONTAL; - - gtk_widget_add_events (GTK_WIDGET (icon), GDK_PROPERTY_CHANGE_MASK); -} - -static void -egg_tray_icon_class_init (EggTrayIconClass *klass) -{ - GObjectClass *gobject_class = (GObjectClass *)klass; - GtkWidgetClass *widget_class = (GtkWidgetClass *)klass; - GtkContainerClass *container_class = (GtkContainerClass *)klass; - - parent_class = g_type_class_peek_parent (klass); - - gobject_class->get_property = egg_tray_icon_get_property; - - widget_class->realize = egg_tray_icon_realize; - widget_class->unrealize = egg_tray_icon_unrealize; - - container_class->add = egg_tray_icon_add; - - g_object_class_install_property (gobject_class, - PROP_ORIENTATION, - g_param_spec_enum ("orientation", - "Orientation", - "The orientation of the tray.", - GTK_TYPE_ORIENTATION, - GTK_ORIENTATION_HORIZONTAL, - G_PARAM_READABLE)); -} - -static void -egg_tray_icon_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) -{ - EggTrayIcon *icon = EGG_TRAY_ICON (object); - - switch (prop_id) - { - case PROP_ORIENTATION: - g_value_set_enum (value, icon->orientation); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -#ifdef GDK_WINDOWING_X11 - -static void -egg_tray_icon_get_orientation_property (EggTrayIcon *icon) -{ - Display *xdisplay; - Atom type; - int format; - union { - gulong *prop; - guchar *prop_ch; - } prop = { NULL }; - gulong nitems; - gulong bytes_after; - int error, result; - - g_assert (icon->manager_window != None); - - xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon))); - - gdk_error_trap_push (); - type = None; - result = XGetWindowProperty (xdisplay, - icon->manager_window, - icon->orientation_atom, - 0, G_MAXLONG, FALSE, - XA_CARDINAL, - &type, &format, &nitems, - &bytes_after, &(prop.prop_ch)); - error = gdk_error_trap_pop (); - - if (error || result != Success) - return; - - if (type == XA_CARDINAL) - { - GtkOrientation orientation; - - orientation = (prop.prop [0] == SYSTEM_TRAY_ORIENTATION_HORZ) ? - GTK_ORIENTATION_HORIZONTAL : - GTK_ORIENTATION_VERTICAL; - - if (icon->orientation != orientation) - { - icon->orientation = orientation; - - g_object_notify (G_OBJECT (icon), "orientation"); - } - } - - if (prop.prop) - XFree (prop.prop); -} - -static GdkFilterReturn -egg_tray_icon_manager_filter (GdkXEvent *xevent, GdkEvent *event, gpointer user_data) -{ - EggTrayIcon *icon = user_data; - XEvent *xev = (XEvent *)xevent; - - if (xev->xany.type == ClientMessage && - xev->xclient.message_type == icon->manager_atom && - xev->xclient.data.l[1] == icon->selection_atom) - { - egg_tray_icon_update_manager_window (icon, TRUE); - } - else if (xev->xany.window == icon->manager_window) - { - if (xev->xany.type == PropertyNotify && - xev->xproperty.atom == icon->orientation_atom) - { - egg_tray_icon_get_orientation_property (icon); - } - if (xev->xany.type == DestroyNotify) - { - egg_tray_icon_manager_window_destroyed (icon); - } - } - return GDK_FILTER_CONTINUE; -} - -#endif - -static void -egg_tray_icon_unrealize (GtkWidget *widget) -{ -#ifdef GDK_WINDOWING_X11 - EggTrayIcon *icon = EGG_TRAY_ICON (widget); - GdkWindow *root_window; - - if (icon->manager_window != None) - { - GdkWindow *gdkwin; - - gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (widget), - icon->manager_window); - - gdk_window_remove_filter (gdkwin, egg_tray_icon_manager_filter, icon); - } - - root_window = gdk_screen_get_root_window (gtk_widget_get_screen (widget)); - - gdk_window_remove_filter (root_window, egg_tray_icon_manager_filter, icon); - - if (GTK_WIDGET_CLASS (parent_class)->unrealize) - (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget); -#endif -} - -#ifdef GDK_WINDOWING_X11 - -static void -egg_tray_icon_send_manager_message (EggTrayIcon *icon, - long message, - Window window, - long data1, - long data2, - long data3) -{ - XClientMessageEvent ev; - Display *display; - - ev.type = ClientMessage; - ev.window = window; - ev.message_type = icon->system_tray_opcode_atom; - ev.format = 32; - ev.data.l[0] = gdk_x11_get_server_time (GTK_WIDGET (icon)->window); - ev.data.l[1] = message; - ev.data.l[2] = data1; - ev.data.l[3] = data2; - ev.data.l[4] = data3; - - display = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon))); - - gdk_error_trap_push (); - XSendEvent (display, - icon->manager_window, False, NoEventMask, (XEvent *)&ev); - XSync (display, False); - gdk_error_trap_pop (); -} - -static void -egg_tray_icon_send_dock_request (EggTrayIcon *icon) -{ - egg_tray_icon_send_manager_message (icon, - SYSTEM_TRAY_REQUEST_DOCK, - icon->manager_window, - gtk_plug_get_id (GTK_PLUG (icon)), - 0, 0); -} - -static void -egg_tray_icon_update_manager_window (EggTrayIcon *icon, - gboolean dock_if_realized) -{ - Display *xdisplay; - - if (icon->manager_window != None) - return; - - xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon))); - - XGrabServer (xdisplay); - - icon->manager_window = XGetSelectionOwner (xdisplay, - icon->selection_atom); - - if (icon->manager_window != None) - XSelectInput (xdisplay, - icon->manager_window, StructureNotifyMask|PropertyChangeMask); - - XUngrabServer (xdisplay); - XFlush (xdisplay); - - if (icon->manager_window != None) - { - GdkWindow *gdkwin; - - gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)), - icon->manager_window); - - gdk_window_add_filter (gdkwin, egg_tray_icon_manager_filter, icon); - - if (dock_if_realized && GTK_WIDGET_REALIZED (icon)) - egg_tray_icon_send_dock_request (icon); - - egg_tray_icon_get_orientation_property (icon); - } -} - -static void -egg_tray_icon_manager_window_destroyed (EggTrayIcon *icon) -{ - GdkWindow *gdkwin; - - g_return_if_fail (icon->manager_window != None); - - gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)), - icon->manager_window); - - gdk_window_remove_filter (gdkwin, egg_tray_icon_manager_filter, icon); - - icon->manager_window = None; - - egg_tray_icon_update_manager_window (icon, TRUE); -} - -#endif - -static gboolean -transparent_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer user_data) -{ - gdk_window_clear_area (widget->window, event->area.x, event->area.y, - event->area.width, event->area.height); - return FALSE; -} - -static void -make_transparent_again (GtkWidget *widget, GtkStyle *previous_style, - gpointer user_data) -{ - gdk_window_set_back_pixmap (widget->window, NULL, TRUE); -} - -static void -make_transparent (GtkWidget *widget, gpointer user_data) -{ - if (GTK_WIDGET_NO_WINDOW (widget) || GTK_WIDGET_APP_PAINTABLE (widget)) - return; - - gtk_widget_set_app_paintable (widget, TRUE); - gtk_widget_set_double_buffered (widget, FALSE); - gdk_window_set_back_pixmap (widget->window, NULL, TRUE); - g_signal_connect (widget, "expose_event", - G_CALLBACK (transparent_expose_event), NULL); - g_signal_connect_after (widget, "style_set", - G_CALLBACK (make_transparent_again), NULL); -} - -static void -egg_tray_icon_realize (GtkWidget *widget) -{ -#ifdef GDK_WINDOWING_X11 - EggTrayIcon *icon = EGG_TRAY_ICON (widget); - GdkScreen *screen; - GdkDisplay *display; - Display *xdisplay; - char buffer[256]; - GdkWindow *root_window; - - if (GTK_WIDGET_CLASS (parent_class)->realize) - GTK_WIDGET_CLASS (parent_class)->realize (widget); - - make_transparent (widget, NULL); - - screen = gtk_widget_get_screen (widget); - display = gdk_screen_get_display (screen); - xdisplay = gdk_x11_display_get_xdisplay (display); - - /* Now see if there's a manager window around */ - g_snprintf (buffer, sizeof (buffer), - "_NET_SYSTEM_TRAY_S%d", - gdk_screen_get_number (screen)); - - icon->selection_atom = XInternAtom (xdisplay, buffer, False); - - icon->manager_atom = XInternAtom (xdisplay, "MANAGER", False); - - icon->system_tray_opcode_atom = XInternAtom (xdisplay, - "_NET_SYSTEM_TRAY_OPCODE", - False); - - icon->orientation_atom = XInternAtom (xdisplay, - "_NET_SYSTEM_TRAY_ORIENTATION", - False); - - egg_tray_icon_update_manager_window (icon, FALSE); - egg_tray_icon_send_dock_request (icon); - - root_window = gdk_screen_get_root_window (screen); - - /* Add a root window filter so that we get changes on MANAGER */ - gdk_window_add_filter (root_window, - egg_tray_icon_manager_filter, icon); -#endif -} - -static void -egg_tray_icon_add (GtkContainer *container, GtkWidget *widget) -{ - g_signal_connect (widget, "realize", - G_CALLBACK (make_transparent), NULL); - GTK_CONTAINER_CLASS (parent_class)->add (container, widget); -} - -EggTrayIcon * -egg_tray_icon_new_for_screen (GdkScreen *screen, const char *name) -{ - g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL); - - return g_object_new (EGG_TYPE_TRAY_ICON, "screen", screen, "title", name, NULL); -} - -EggTrayIcon* -egg_tray_icon_new (const gchar *name) -{ - return g_object_new (EGG_TYPE_TRAY_ICON, "title", name, NULL); -} - -guint -egg_tray_icon_send_message (EggTrayIcon *icon, - gint timeout, - const gchar *message, - gint len) -{ - guint stamp; - - g_return_val_if_fail (EGG_IS_TRAY_ICON (icon), 0); - g_return_val_if_fail (timeout >= 0, 0); - g_return_val_if_fail (message != NULL, 0); - -#ifdef GDK_WINDOWING_X11 - if (icon->manager_window == None) - return 0; -#endif - - if (len < 0) - len = strlen (message); - - stamp = icon->stamp++; - -#ifdef GDK_WINDOWING_X11 - /* Get ready to send the message */ - egg_tray_icon_send_manager_message (icon, SYSTEM_TRAY_BEGIN_MESSAGE, - icon->manager_window, - timeout, len, stamp); - - /* Now to send the actual message */ - gdk_error_trap_push (); - while (len > 0) - { - XClientMessageEvent ev; - Display *xdisplay; - - xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon))); - - ev.type = ClientMessage; - ev.window = icon->manager_window; - ev.format = 8; - ev.message_type = XInternAtom (xdisplay, - "_NET_SYSTEM_TRAY_MESSAGE_DATA", False); - if (len > 20) - { - memcpy (&ev.data, message, 20); - len -= 20; - message += 20; - } - else - { - memcpy (&ev.data, message, len); - len = 0; - } - - XSendEvent (xdisplay, - icon->manager_window, False, StructureNotifyMask, (XEvent *)&ev); - XSync (xdisplay, False); - } - gdk_error_trap_pop (); -#endif - - return stamp; -} - -void -egg_tray_icon_cancel_message (EggTrayIcon *icon, - guint id) -{ - g_return_if_fail (EGG_IS_TRAY_ICON (icon)); - g_return_if_fail (id > 0); -#ifdef GDK_WINDOWING_X11 - egg_tray_icon_send_manager_message (icon, SYSTEM_TRAY_CANCEL_MESSAGE, - (Window)gtk_plug_get_id (GTK_PLUG (icon)), - id, 0, 0); -#endif -} - -GtkOrientation -egg_tray_icon_get_orientation (EggTrayIcon *icon) -{ - g_return_val_if_fail (EGG_IS_TRAY_ICON (icon), GTK_ORIENTATION_HORIZONTAL); - - return icon->orientation; -} - - - - - -#endif /* GTK_CHECK_VERSION(2, 1, 0) */ -#endif /* wxUSE_TASKBARICON */ diff --git a/Externals/wxWidgets3/src/gtk/eggtrayicon.h b/Externals/wxWidgets3/src/gtk/eggtrayicon.h deleted file mode 100644 index aee0346af4..0000000000 --- a/Externals/wxWidgets3/src/gtk/eggtrayicon.h +++ /dev/null @@ -1,85 +0,0 @@ -/* - Permission to use this file under wxWindows licence granted by - the copyright holder, see eggtrayicon.c for details. - */ - -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* eggtrayicon.h - * Copyright (C) 2002 Anders Carlsson - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef __EGG_TRAY_ICON_H__ -#define __EGG_TRAY_ICON_H__ - -#include -#ifdef GDK_WINDOWING_X11 -#include -#endif - -G_BEGIN_DECLS - -#define EGG_TYPE_TRAY_ICON (egg_tray_icon_get_type ()) -#define EGG_TRAY_ICON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_TRAY_ICON, EggTrayIcon)) -#define EGG_TRAY_ICON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_TRAY_ICON, EggTrayIconClass)) -#define EGG_IS_TRAY_ICON(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EGG_TYPE_TRAY_ICON)) -#define EGG_IS_TRAY_ICON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_TRAY_ICON)) -#define EGG_TRAY_ICON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EGG_TYPE_TRAY_ICON, EggTrayIconClass)) - -typedef struct _EggTrayIcon EggTrayIcon; -typedef struct _EggTrayIconClass EggTrayIconClass; - -struct _EggTrayIcon -{ - GtkPlug parent_instance; - - guint stamp; - -#ifdef GDK_WINDOWING_X11 - Atom selection_atom; - Atom manager_atom; - Atom system_tray_opcode_atom; - Atom orientation_atom; - Window manager_window; -#endif - GtkOrientation orientation; -}; - -struct _EggTrayIconClass -{ - GtkPlugClass parent_class; -}; - -GType egg_tray_icon_get_type (void); - -EggTrayIcon *egg_tray_icon_new_for_screen (GdkScreen *screen, - const gchar *name); - -EggTrayIcon *egg_tray_icon_new (const gchar *name); - -guint egg_tray_icon_send_message (EggTrayIcon *icon, - gint timeout, - const char *message, - gint len); -void egg_tray_icon_cancel_message (EggTrayIcon *icon, - guint id); - -GtkOrientation egg_tray_icon_get_orientation (EggTrayIcon *icon); - -G_END_DECLS - -#endif /* __EGG_TRAY_ICON_H__ */ diff --git a/Externals/wxWidgets3/src/gtk/evtloop.cpp b/Externals/wxWidgets3/src/gtk/evtloop.cpp deleted file mode 100644 index 9e7a2f44d2..0000000000 --- a/Externals/wxWidgets3/src/gtk/evtloop.cpp +++ /dev/null @@ -1,400 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/evtloop.cpp -// Purpose: implements wxEventLoop for GTK+ -// Author: Vadim Zeitlin -// Created: 10.07.01 -// Copyright: (c) 2001 Vadim Zeitlin -// (c) 2013 Rob Bresalier, Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include "wx/evtloop.h" -#include "wx/evtloopsrc.h" - -#ifndef WX_PRECOMP - #include "wx/app.h" - #include "wx/log.h" -#endif // WX_PRECOMP - -#include "wx/private/eventloopsourcesmanager.h" -#include "wx/apptrait.h" - -#include -#include "wx/gtk/private/gtk2-compat.h" - -GdkWindow* wxGetTopLevelGDK(); - -// ============================================================================ -// wxEventLoop implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxEventLoop running and exiting -// ---------------------------------------------------------------------------- - -wxGUIEventLoop::wxGUIEventLoop() -{ - m_exitcode = 0; -} - -int wxGUIEventLoop::DoRun() -{ - guint loopLevel = gtk_main_level(); - - // This is placed inside of a loop to take into account nested - // event loops. For example, inside this event loop, we may receive - // Exit() for a different event loop (which we are currently inside of) - // That Exit() will cause this gtk_main() to exit so we need to re-enter it. - while ( !m_shouldExit ) - { - gtk_main(); - } - - // Force the enclosing event loop to also exit to see if it is done in case - // that event loop had Exit() called inside of the just ended loop. If it - // is not time yet for that event loop to exit, it will be executed again - // due to the while() loop on m_shouldExit(). - // - // This is unnecessary if we are the top level loop, i.e. loop of level 0. - if ( loopLevel ) - { - gtk_main_quit(); - } - - OnExit(); - -#if wxUSE_EXCEPTIONS - // Rethrow any exceptions which could have been produced by the handlers - // ran by the event loop. - if ( wxTheApp ) - wxTheApp->RethrowStoredException(); -#endif // wxUSE_EXCEPTIONS - - return m_exitcode; -} - -void wxGUIEventLoop::ScheduleExit(int rc) -{ - wxCHECK_RET( IsInsideRun(), wxT("can't call ScheduleExit() if not started") ); - - m_exitcode = rc; - - m_shouldExit = true; - - gtk_main_quit(); -} - -void wxGUIEventLoop::WakeUp() -{ - // TODO: idle events handling should really be done by wxEventLoop itself - // but for now it's completely in gtk/app.cpp so just call there when - // we have wxTheApp and hope that it doesn't matter that we do - // nothing when we don't... - if ( wxTheApp ) - wxTheApp->WakeUpIdle(); -} - -// ---------------------------------------------------------------------------- -// wxEventLoop adding & removing sources -// ---------------------------------------------------------------------------- - -#if wxUSE_EVENTLOOP_SOURCE - -extern "C" -{ -static gboolean wx_on_channel_event(GIOChannel *channel, - GIOCondition condition, - gpointer data) -{ - wxUnusedVar(channel); // Unused if !wxUSE_LOG || !wxDEBUG_LEVEL - - wxLogTrace(wxTRACE_EVT_SOURCE, - "wx_on_channel_event, fd=%d, condition=%08x", - g_io_channel_unix_get_fd(channel), condition); - - wxEventLoopSourceHandler * const - handler = static_cast(data); - - if ( (condition & G_IO_IN) || (condition & G_IO_PRI) || (condition & G_IO_HUP) ) - handler->OnReadWaiting(); - - if (condition & G_IO_OUT) - handler->OnWriteWaiting(); - - if ( (condition & G_IO_ERR) || (condition & G_IO_NVAL) ) - handler->OnExceptionWaiting(); - - // we never want to remove source here, so always return true - // - // The source may have been removed by the handler, so it may be - // a good idea to return FALSE when the source has already been - // removed. However, that would involve somehow informing this function - // that the source was removed, which is not trivial to implement - // and handle all cases. It has been found through testing - // that if the source was removed by the handler, that even if we - // return TRUE here, the source/callback will not get called again. - return TRUE; -} -} - -class wxGUIEventLoopSourcesManager : public wxEventLoopSourcesManagerBase -{ -public: - virtual wxEventLoopSource* - AddSourceForFD(int fd, wxEventLoopSourceHandler *handler, int flags) wxOVERRIDE - { - wxCHECK_MSG( fd != -1, NULL, "can't monitor invalid fd" ); - - int condition = 0; - if ( flags & wxEVENT_SOURCE_INPUT ) - condition |= G_IO_IN | G_IO_PRI | G_IO_HUP; - if ( flags & wxEVENT_SOURCE_OUTPUT ) - condition |= G_IO_OUT; - if ( flags & wxEVENT_SOURCE_EXCEPTION ) - condition |= G_IO_ERR | G_IO_NVAL; - - GIOChannel* channel = g_io_channel_unix_new(fd); - const unsigned sourceId = g_io_add_watch - ( - channel, - (GIOCondition)condition, - &wx_on_channel_event, - handler - ); - // it was ref'd by g_io_add_watch() so we can unref it here - g_io_channel_unref(channel); - - if ( !sourceId ) - return NULL; - - wxLogTrace(wxTRACE_EVT_SOURCE, - "Adding event loop source for fd=%d with GTK id=%u", - fd, sourceId); - - - return new wxGTKEventLoopSource(sourceId, handler, flags); - } -}; - -wxEventLoopSourcesManagerBase* wxGUIAppTraits::GetEventLoopSourcesManager() -{ - static wxGUIEventLoopSourcesManager s_eventLoopSourcesManager; - - return &s_eventLoopSourcesManager; -} - -wxGTKEventLoopSource::~wxGTKEventLoopSource() -{ - wxLogTrace(wxTRACE_EVT_SOURCE, - "Removing event loop source with GTK id=%u", m_sourceId); - - g_source_remove(m_sourceId); -} - -#endif // wxUSE_EVENTLOOP_SOURCE - -// ---------------------------------------------------------------------------- -// wxEventLoop message processing dispatching -// ---------------------------------------------------------------------------- - -bool wxGUIEventLoop::Pending() const -{ - if ( wxTheApp ) - { - // this avoids false positives from our idle source - return wxTheApp->EventsPending(); - } - - return gtk_events_pending() != 0; -} - -bool wxGUIEventLoop::Dispatch() -{ - wxCHECK_MSG( IsRunning(), false, wxT("can't call Dispatch() if not running") ); - - // gtk_main_iteration() returns TRUE only if gtk_main_quit() was called - return !gtk_main_iteration(); -} - -extern "C" { -static gboolean wx_event_loop_timeout(void* data) -{ - bool* expired = static_cast(data); - *expired = true; - - // return FALSE to remove this timeout - return FALSE; -} -} - -int wxGUIEventLoop::DispatchTimeout(unsigned long timeout) -{ - bool expired = false; - const unsigned id = g_timeout_add(timeout, wx_event_loop_timeout, &expired); - bool quit = gtk_main_iteration() != 0; - - if ( expired ) - return -1; - - g_source_remove(id); - - return !quit; -} - -//----------------------------------------------------------------------------- -// YieldFor -//----------------------------------------------------------------------------- - -extern "C" { -static void wxgtk_main_do_event(GdkEvent* event, void* data) -{ - // categorize the GDK event according to wxEventCategory. - // See http://library.gnome.org/devel/gdk/unstable/gdk-Events.html#GdkEventType - // for more info. - - // NOTE: GDK_* constants which were not present in the GDK2.0 can be tested for - // only at compile-time; when running the program (compiled with a recent GDK) - // on a system with an older GDK lib we can be sure there won't be problems - // because event->type will never assume those values corresponding to - // new event types (since new event types are always added in GDK with non - // conflicting values for ABI compatibility). - - // Some events (currently only a single one) may be used for more than one - // category, so we need 2 variables. The second one will remain "unknown" - // in most cases. - wxEventCategory cat = wxEVT_CATEGORY_UNKNOWN, - cat2 = wxEVT_CATEGORY_UNKNOWN; - switch (event->type) - { - case GDK_SELECTION_REQUEST: - case GDK_SELECTION_NOTIFY: - case GDK_SELECTION_CLEAR: - case GDK_OWNER_CHANGE: - cat = wxEVT_CATEGORY_CLIPBOARD; - break; - - case GDK_KEY_PRESS: - case GDK_KEY_RELEASE: - case GDK_BUTTON_PRESS: - case GDK_2BUTTON_PRESS: - case GDK_3BUTTON_PRESS: - case GDK_BUTTON_RELEASE: - case GDK_SCROLL: // generated from mouse buttons - case GDK_CLIENT_EVENT: - cat = wxEVT_CATEGORY_USER_INPUT; - break; - - case GDK_PROPERTY_NOTIFY: - // This one is special: it can be used for UI purposes but also for - // clipboard operations, so allow it in both cases (we probably could - // examine the event itself to distinguish between the two cases but - // this would be unnecessarily complicated). - cat2 = wxEVT_CATEGORY_CLIPBOARD; - // Fall through. - - case GDK_PROXIMITY_IN: - case GDK_PROXIMITY_OUT: - - case GDK_MOTION_NOTIFY: - case GDK_ENTER_NOTIFY: - case GDK_LEAVE_NOTIFY: - case GDK_VISIBILITY_NOTIFY: - - case GDK_FOCUS_CHANGE: - case GDK_CONFIGURE: - case GDK_WINDOW_STATE: - case GDK_SETTING: - case GDK_DELETE: - case GDK_DESTROY: - - case GDK_EXPOSE: -#ifndef __WXGTK3__ - case GDK_NO_EXPOSE: -#endif - case GDK_MAP: - case GDK_UNMAP: - - case GDK_DRAG_ENTER: - case GDK_DRAG_LEAVE: - case GDK_DRAG_MOTION: - case GDK_DRAG_STATUS: - case GDK_DROP_START: - case GDK_DROP_FINISHED: -#if GTK_CHECK_VERSION(2,8,0) - case GDK_GRAB_BROKEN: -#endif -#if GTK_CHECK_VERSION(2,14,0) - case GDK_DAMAGE: -#endif - cat = wxEVT_CATEGORY_UI; - break; - - default: - cat = wxEVT_CATEGORY_UNKNOWN; - break; - } - - wxGUIEventLoop* evtloop = static_cast(data); - - // is this event allowed now? - if (evtloop->IsEventAllowedInsideYield(cat) || - (cat2 != wxEVT_CATEGORY_UNKNOWN && - evtloop->IsEventAllowedInsideYield(cat2))) - { - // process it now - gtk_main_do_event(event); - } - else if (event->type != GDK_NOTHING) - { - // process it later (but make a copy; the caller will free the event - // pointer) - evtloop->StoreGdkEventForLaterProcessing(gdk_event_copy(event)); - } -} -} - -void wxGUIEventLoop::DoYieldFor(long eventsToProcess) -{ - // temporarily replace the global GDK event handler with our function, which - // categorizes the events and using m_eventsToProcessInsideYield decides - // if an event should be processed immediately or not - // NOTE: this approach is better than using gdk_display_get_event() because - // gtk_main_iteration() does more than just calling gdk_display_get_event() - // and then call gtk_main_do_event()! - // In particular in this way we also process input from sources like - // GIOChannels (this is needed for e.g. wxGUIAppTraits::WaitForChild). - gdk_event_handler_set(wxgtk_main_do_event, this, NULL); - while (Pending()) // avoid false positives from our idle source - gtk_main_iteration(); - gdk_event_handler_set ((GdkEventFunc)gtk_main_do_event, NULL, NULL); - - wxEventLoopBase::DoYieldFor(eventsToProcess); - - // put all unprocessed GDK events back in the queue - GdkDisplay* disp = gdk_window_get_display(wxGetTopLevelGDK()); - for (size_t i=0; im_widget = w; -} - -wxString wxGtkFileChooser::GetPath() const -{ - wxGtkString str( gtk_file_chooser_get_filename( m_widget ) ); - - wxString string; - if (str) - string = wxString::FromUTF8(str); - return string; -} - -void wxGtkFileChooser::GetFilenames( wxArrayString& files ) const -{ - GetPaths( files ); - for ( size_t n = 0; n < files.GetCount(); ++n ) - { - const wxFileName file( files[n] ); - files[n] = file.GetFullName(); - } -} - -void wxGtkFileChooser::GetPaths( wxArrayString& paths ) const -{ - paths.Empty(); - if ( gtk_file_chooser_get_select_multiple( m_widget ) ) - { - GSList *gpathsi = gtk_file_chooser_get_filenames( m_widget ); - GSList *gpaths = gpathsi; - while ( gpathsi ) - { - wxString file(wxString::FromUTF8(static_cast(gpathsi->data))); - paths.Add( file ); - g_free( gpathsi->data ); - gpathsi = gpathsi->next; - } - - g_slist_free( gpaths ); - } - else - paths.Add( GetPath() ); -} - -bool wxGtkFileChooser::SetPath( const wxString& path ) -{ - if ( path.empty() ) - return true; - - switch ( gtk_file_chooser_get_action( m_widget ) ) - { - case GTK_FILE_CHOOSER_ACTION_SAVE: - { - wxFileName fn(path); - - const wxString fname = fn.GetFullName(); - gtk_file_chooser_set_current_name( m_widget, fname.utf8_str() ); - - // set the initial file name and/or directory - const wxString dir = fn.GetPath(); - return gtk_file_chooser_set_current_folder( m_widget, - dir.utf8_str() ) != 0; - } - - case GTK_FILE_CHOOSER_ACTION_OPEN: - return gtk_file_chooser_set_filename( m_widget, path.utf8_str() ) != 0; - - case GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER: - case GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER: - break; - } - - wxFAIL_MSG( "Unexpected file chooser type" ); - - return false; -} - -bool wxGtkFileChooser::SetDirectory( const wxString& dir ) -{ - return gtk_file_chooser_set_current_folder( m_widget, dir.utf8_str() ) != 0; -} - -wxString wxGtkFileChooser::GetDirectory() const -{ - const wxGtkString str( gtk_file_chooser_get_current_folder( m_widget ) ); - return wxString::FromUTF8(str); -} - -wxString wxGtkFileChooser::GetFilename() const -{ - return wxFileName( GetPath() ).GetFullName(); -} - -void wxGtkFileChooser::SetWildcard( const wxString& wildCard ) -{ - m_wildcards.Empty(); - - // parse filters - wxArrayString wildDescriptions, wildFilters; - - if ( !wxParseCommonDialogsFilter( wildCard, wildDescriptions, wildFilters ) ) - { - wxFAIL_MSG( wxT( "wxGtkFileChooser::SetWildcard - bad wildcard string" ) ); - } - else - { - // Parsing went fine. Set m_wildCard to be returned by wxGtkFileChooserBase::GetWildcard - GtkFileChooser* chooser = m_widget; - - // empty current filter list: - GSList* ifilters = gtk_file_chooser_list_filters( chooser ); - GSList* filters = ifilters; - - m_ignoreNextFilterEvent = true; - wxON_BLOCK_EXIT_SET(m_ignoreNextFilterEvent, false); - - while ( ifilters ) - { - gtk_file_chooser_remove_filter( chooser, GTK_FILE_FILTER( ifilters->data ) ); - ifilters = ifilters->next; - } - g_slist_free( filters ); - - if (!wildCard.empty()) - { - // add parsed to GtkChooser - for ( size_t n = 0; n < wildFilters.GetCount(); ++n ) - { - GtkFileFilter* filter = gtk_file_filter_new(); - - gtk_file_filter_set_name( filter, wxGTK_CONV_SYS( wildDescriptions[n] ) ); - - wxStringTokenizer exttok( wildFilters[n], wxT( ";" ) ); - - int n1 = 1; - while ( exttok.HasMoreTokens() ) - { - wxString token = exttok.GetNextToken(); - gtk_file_filter_add_pattern( filter, wxGTK_CONV_SYS( token ) ); - - if (n1 == 1) - m_wildcards.Add( token ); // Only add first pattern to list, used later when saving - n1++; - } - - gtk_file_chooser_add_filter( chooser, filter ); - } - - // Reset the filter index - SetFilterIndex( 0 ); - } - } -} - -void wxGtkFileChooser::SetFilterIndex( int filterIndex ) -{ - gpointer filter; - GtkFileChooser *chooser = m_widget; - GSList *filters = gtk_file_chooser_list_filters( chooser ); - - filter = g_slist_nth_data( filters, filterIndex ); - - if ( filter != NULL ) - { - gtk_file_chooser_set_filter( chooser, GTK_FILE_FILTER( filter ) ); - } - else - { - wxFAIL_MSG( wxT( "wxGtkFileChooser::SetFilterIndex - bad filter index" ) ); - } - - g_slist_free( filters ); -} - -int wxGtkFileChooser::GetFilterIndex() const -{ - GtkFileChooser *chooser = m_widget; - GtkFileFilter *filter = gtk_file_chooser_get_filter( chooser ); - GSList *filters = gtk_file_chooser_list_filters( chooser ); - const gint index = g_slist_index( filters, filter ); - g_slist_free( filters ); - - if ( index == -1 ) - { - wxFAIL_MSG( wxT( "wxGtkFileChooser::GetFilterIndex - bad filter index returned by gtk+" ) ); - return 0; - } - else - return index; -} - -bool wxGtkFileChooser::HasFilterChoice() const -{ - return gtk_file_chooser_get_filter( m_widget ) != NULL; -} - -//----------------------------------------------------------------------------- -// end wxGtkFileChooser Implementation -//----------------------------------------------------------------------------- - -#if wxUSE_FILECTRL - -// gtk signal handlers - -extern "C" -{ - static void - gtkfilechooserwidget_file_activated_callback( GtkWidget *WXUNUSED( widget ), wxGtkFileCtrl *fileCtrl ) - { - GenerateFileActivatedEvent( fileCtrl, fileCtrl ); - } -} - -extern "C" -{ - static void - gtkfilechooserwidget_selection_changed_callback( GtkWidget *WXUNUSED( widget ), wxGtkFileCtrl *fileCtrl ) - { - // check next selection event and ignore it if it has 0 files - // because such events are redundantly generated by gtk. - if ( fileCtrl->m_checkNextSelEvent ) - { - wxArrayString filenames; - fileCtrl->GetFilenames( filenames ); - - if ( filenames.Count() != 0 ) - fileCtrl->m_checkNextSelEvent = false; - } - - if ( !fileCtrl->m_checkNextSelEvent ) - GenerateSelectionChangedEvent( fileCtrl, fileCtrl ); - } -} - -extern "C" -{ - static void - gtkfilechooserwidget_folder_changed_callback( GtkWidget *WXUNUSED( widget ), wxGtkFileCtrl *fileCtrl ) - { - if ( fileCtrl->m_ignoreNextFolderChangeEvent ) - { - fileCtrl->m_ignoreNextFolderChangeEvent = false; - } - else - { - GenerateFolderChangedEvent( fileCtrl, fileCtrl ); - } - - fileCtrl->m_checkNextSelEvent = true; - } -} - -extern "C" -{ - static void - gtkfilechooserwidget_notify_callback( GObject *WXUNUSED( gobject ), GParamSpec *arg1, wxGtkFileCtrl *fileCtrl ) - { - const char *name = g_param_spec_get_name (arg1); - if ( strcmp( name, "filter" ) == 0 && - fileCtrl->HasFilterChoice() && - !fileCtrl->GTKShouldIgnoreNextFilterEvent() ) - { - GenerateFilterChangedEvent( fileCtrl, fileCtrl ); - } - } -} - -// wxGtkFileCtrl implementation - -wxIMPLEMENT_DYNAMIC_CLASS(wxGtkFileCtrl, wxControl); - -wxGtkFileCtrl::~wxGtkFileCtrl() -{ - if (m_fcWidget) - GTKDisconnect(m_fcWidget); -} - -void wxGtkFileCtrl::Init() -{ - m_checkNextSelEvent = false; - - // ignore the first folder change event which is fired upon startup. - m_ignoreNextFolderChangeEvent = true; -} - -bool wxGtkFileCtrl::Create( wxWindow *parent, - wxWindowID id, - const wxString& defaultDirectory, - const wxString& defaultFileName, - const wxString& wildCard, - long style, - const wxPoint& pos, - const wxSize& size, - const wxString& name ) -{ - if ( !PreCreation( parent, pos, size ) || - !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ) ) - { - wxFAIL_MSG( wxT( "wxGtkFileCtrl creation failed" ) ); - return false; - } - - GtkFileChooserAction gtkAction = GTK_FILE_CHOOSER_ACTION_OPEN; - - if ( style & wxFC_SAVE ) - gtkAction = GTK_FILE_CHOOSER_ACTION_SAVE; - - m_widget = gtk_alignment_new ( 0, 0, 1, 1 ); - g_object_ref(m_widget); - m_fcWidget = GTK_FILE_CHOOSER( gtk_file_chooser_widget_new(gtkAction) ); - gtk_widget_show ( GTK_WIDGET( m_fcWidget ) ); - gtk_container_add ( GTK_CONTAINER ( m_widget ), GTK_WIDGET( m_fcWidget ) ); - - m_focusWidget = GTK_WIDGET( m_fcWidget ); - - g_signal_connect ( m_fcWidget, "file-activated", - G_CALLBACK ( gtkfilechooserwidget_file_activated_callback ), - this ); - - g_signal_connect ( m_fcWidget, "current-folder-changed", - G_CALLBACK ( gtkfilechooserwidget_folder_changed_callback ), - this ); - - g_signal_connect ( m_fcWidget, "selection-changed", - G_CALLBACK ( gtkfilechooserwidget_selection_changed_callback ), - this ); - - g_signal_connect ( m_fcWidget, "notify", - G_CALLBACK ( gtkfilechooserwidget_notify_callback ), - this ); - - m_fc.SetWidget( m_fcWidget ); - - if ( style & wxFC_MULTIPLE ) - gtk_file_chooser_set_select_multiple( m_fcWidget, true ); - - SetWildcard( wildCard ); - - // if defaultDir is specified it should contain the directory and - // defaultFileName should contain the default name of the file, however if - // directory is not given, defaultFileName contains both - wxFileName fn; - if ( defaultDirectory.empty() ) - fn.Assign( defaultFileName ); - else if ( !defaultFileName.empty() ) - fn.Assign( defaultDirectory, defaultFileName ); - else - fn.AssignDir( defaultDirectory ); - - // set the initial file name and/or directory - const wxString dir = fn.GetPath(); - if ( !dir.empty() ) - { - gtk_file_chooser_set_current_folder( m_fcWidget, - wxGTK_CONV_FN(dir) ); - } - - const wxString fname = fn.GetFullName(); - if ( style & wxFC_SAVE ) - { - if ( !fname.empty() ) - { - gtk_file_chooser_set_current_name( m_fcWidget, - wxGTK_CONV_FN(fname) ); - } - } - else // wxFC_OPEN - { - if ( !fname.empty() ) - { - gtk_file_chooser_set_filename( m_fcWidget, - wxGTK_CONV_FN(fn.GetFullPath()) ); - } - } - - m_parent->DoAddChild( this ); - - PostCreation( size ); - - return TRUE; -} - -bool wxGtkFileCtrl::SetPath( const wxString& path ) -{ - return m_fc.SetPath( path ); -} - -bool wxGtkFileCtrl::SetDirectory( const wxString& dir ) -{ - return m_fc.SetDirectory( dir ); -} - -bool wxGtkFileCtrl::SetFilename( const wxString& name ) -{ - if ( HasFlag( wxFC_SAVE ) ) - { - gtk_file_chooser_set_current_name( m_fcWidget, wxGTK_CONV( name ) ); - return true; - } - else - return SetPath( wxFileName( GetDirectory(), name ).GetFullPath() ); -} - -void wxGtkFileCtrl::SetWildcard( const wxString& wildCard ) -{ - m_wildCard = wildCard; - - m_fc.SetWildcard( wildCard ); -} - -void wxGtkFileCtrl::SetFilterIndex( int filterIndex ) -{ - m_fc.SetFilterIndex( filterIndex ); -} - -wxString wxGtkFileCtrl::GetPath() const -{ - return m_fc.GetPath(); -} - -void wxGtkFileCtrl::GetPaths( wxArrayString& paths ) const -{ - m_fc.GetPaths( paths ); -} - -wxString wxGtkFileCtrl::GetDirectory() const -{ - return m_fc.GetDirectory(); -} - -wxString wxGtkFileCtrl::GetFilename() const -{ - return m_fc.GetFilename(); -} - -void wxGtkFileCtrl::GetFilenames( wxArrayString& files ) const -{ - m_fc.GetFilenames( files ); -} - -void wxGtkFileCtrl::ShowHidden(bool show) -{ - gtk_file_chooser_set_show_hidden(m_fcWidget, show); -} - -#endif // wxUSE_FILECTRL - -#endif // wxUSE_FILECTRL && !defined(__WXUNIVERSAL__) diff --git a/Externals/wxWidgets3/src/gtk/filedlg.cpp b/Externals/wxWidgets3/src/gtk/filedlg.cpp deleted file mode 100644 index 4a66029edc..0000000000 --- a/Externals/wxWidgets3/src/gtk/filedlg.cpp +++ /dev/null @@ -1,487 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/filedlg.cpp -// Purpose: native implementation of wxFileDialog -// Author: Robert Roebling, Zbigniew Zagorski, Mart Raudsepp -// Copyright: (c) 1998 Robert Roebling, 2004 Zbigniew Zagorski, 2005 Mart Raudsepp -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if wxUSE_FILEDLG - -#include "wx/filedlg.h" - -#ifndef WX_PRECOMP - #include "wx/intl.h" - #include "wx/log.h" - #include "wx/msgdlg.h" -#endif - -#include -#include "wx/gtk/private.h" - -#ifdef __UNIX__ -#include // chdir -#endif - -#include "wx/filename.h" // wxFilename -#include "wx/tokenzr.h" // wxStringTokenizer -#include "wx/filefn.h" // ::wxGetCwd -#include "wx/modalhook.h" - -//----------------------------------------------------------------------------- -// "clicked" for OK-button -//----------------------------------------------------------------------------- - -extern "C" { -static void gtk_filedialog_ok_callback(GtkWidget *widget, wxFileDialog *dialog) -{ - int style = dialog->GetWindowStyle(); - wxGtkString filename(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget))); - - // gtk version numbers must be identical with the one in ctor (that calls set_do_overwrite_confirmation) -#ifndef __WXGTK3__ -#if GTK_CHECK_VERSION(2,7,3) - if (gtk_check_version(2, 7, 3) != NULL) -#endif - { - if ((style & wxFD_SAVE) && (style & wxFD_OVERWRITE_PROMPT)) - { - if ( g_file_test(filename, G_FILE_TEST_EXISTS) ) - { - wxString msg; - - msg.Printf( - _("File '%s' already exists, do you really want to overwrite it?"), - wxString::FromUTF8(filename)); - - wxMessageDialog dlg(dialog, msg, _("Confirm"), - wxYES_NO | wxICON_QUESTION); - if (dlg.ShowModal() != wxID_YES) - return; - } - } - } -#endif - - if (style & wxFD_FILE_MUST_EXIST) - { - if ( !g_file_test(filename, G_FILE_TEST_EXISTS) ) - { - wxMessageDialog dlg( dialog, _("Please choose an existing file."), - _("Error"), wxOK| wxICON_ERROR); - dlg.ShowModal(); - return; - } - } - - // change to the directory where the user went if asked - if (style & wxFD_CHANGE_DIR) - { - // Use chdir to not care about filename encodings - wxGtkString folder(g_path_get_dirname(filename)); - if ( chdir(folder) != 0 ) - { - wxLogSysError(_("Changing current directory to \"%s\" failed"), - wxString::FromUTF8(folder)); - } - } - - wxCommandEvent event(wxEVT_BUTTON, wxID_OK); - event.SetEventObject(dialog); - dialog->HandleWindowEvent(event); -} -} - -//----------------------------------------------------------------------------- -// "clicked" for Cancel-button -//----------------------------------------------------------------------------- - -extern "C" -{ - -static void -gtk_filedialog_cancel_callback(GtkWidget * WXUNUSED(w), wxFileDialog *dialog) -{ - wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL); - event.SetEventObject(dialog); - dialog->HandleWindowEvent(event); -} - -static void gtk_filedialog_response_callback(GtkWidget *w, - gint response, - wxFileDialog *dialog) -{ - if (response == GTK_RESPONSE_ACCEPT) - gtk_filedialog_ok_callback(w, dialog); - else // GTK_RESPONSE_CANCEL or GTK_RESPONSE_NONE - gtk_filedialog_cancel_callback(w, dialog); -} - -static void gtk_filedialog_selchanged_callback(GtkFileChooser *chooser, - wxFileDialog *dialog) -{ - wxGtkString filename(gtk_file_chooser_get_preview_filename(chooser)); - - dialog->GTKSelectionChanged(wxString::FromUTF8(filename)); -} - - -static void gtk_filedialog_update_preview_callback(GtkFileChooser *chooser, - gpointer user_data) -{ - GtkWidget *preview = GTK_WIDGET(user_data); - - wxGtkString filename(gtk_file_chooser_get_preview_filename(chooser)); - - if ( !filename ) - return; - - GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file_at_size(filename, 128, 128, NULL); - gboolean have_preview = pixbuf != NULL; - - gtk_image_set_from_pixbuf(GTK_IMAGE(preview), pixbuf); - if ( pixbuf ) - g_object_unref (pixbuf); - - gtk_file_chooser_set_preview_widget_active(chooser, have_preview); -} - -} // extern "C" - -void wxFileDialog::AddChildGTK(wxWindowGTK* child) -{ - // allow dialog to be resized smaller horizontally - gtk_widget_set_size_request( - child->m_widget, child->GetMinWidth(), child->m_height); - - gtk_file_chooser_set_extra_widget( - GTK_FILE_CHOOSER(m_widget), child->m_widget); -} - -//----------------------------------------------------------------------------- -// wxFileDialog -//----------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxFileDialog, wxFileDialogBase); - -wxBEGIN_EVENT_TABLE(wxFileDialog,wxFileDialogBase) - EVT_BUTTON(wxID_OK, wxFileDialog::OnFakeOk) - EVT_SIZE(wxFileDialog::OnSize) -wxEND_EVENT_TABLE() - -wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message, - const wxString& defaultDir, - const wxString& defaultFileName, - const wxString& wildCard, - long style, const wxPoint& pos, - const wxSize& sz, - const wxString& name) - : wxFileDialogBase() -{ - Create(parent, message, defaultDir, defaultFileName, wildCard, style, pos, sz, name); -} - -bool wxFileDialog::Create(wxWindow *parent, const wxString& message, - const wxString& defaultDir, - const wxString& defaultFileName, - const wxString& wildCard, - long style, const wxPoint& pos, - const wxSize& sz, - const wxString& name) -{ - parent = GetParentForModalDialog(parent, style); - - if (!wxFileDialogBase::Create(parent, message, defaultDir, defaultFileName, - wildCard, style, pos, sz, name)) - { - return false; - } - - if (!PreCreation(parent, pos, wxDefaultSize) || - !CreateBase(parent, wxID_ANY, pos, wxDefaultSize, style, - wxDefaultValidator, wxT("filedialog"))) - { - wxFAIL_MSG( wxT("wxFileDialog creation failed") ); - return false; - } - - GtkFileChooserAction gtk_action; - GtkWindow* gtk_parent = NULL; - if (parent) - gtk_parent = GTK_WINDOW( gtk_widget_get_toplevel(parent->m_widget) ); - - const gchar* ok_btn_stock; - if ( style & wxFD_SAVE ) - { - gtk_action = GTK_FILE_CHOOSER_ACTION_SAVE; - ok_btn_stock = GTK_STOCK_SAVE; - } - else - { - gtk_action = GTK_FILE_CHOOSER_ACTION_OPEN; - ok_btn_stock = GTK_STOCK_OPEN; - } - - m_widget = gtk_file_chooser_dialog_new( - wxGTK_CONV(m_message), - gtk_parent, - gtk_action, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - ok_btn_stock, GTK_RESPONSE_ACCEPT, - NULL); - g_object_ref(m_widget); - GtkFileChooser* file_chooser = GTK_FILE_CHOOSER(m_widget); - - m_fc.SetWidget(file_chooser); - - gtk_dialog_set_default_response(GTK_DIALOG(m_widget), GTK_RESPONSE_ACCEPT); - - if ( style & wxFD_MULTIPLE ) - gtk_file_chooser_set_select_multiple(file_chooser, true); - - // local-only property could be set to false to allow non-local files to be - // loaded. In that case get/set_uri(s) should be used instead of - // get/set_filename(s) everywhere and the GtkFileChooserDialog should - // probably also be created with a backend, e.g. "gnome-vfs", "default", ... - // (gtk_file_chooser_dialog_new_with_backend). Currently local-only is kept - // as the default - true: - // gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(m_widget), true); - - g_signal_connect (m_widget, "response", - G_CALLBACK (gtk_filedialog_response_callback), this); - - g_signal_connect (m_widget, "selection-changed", - G_CALLBACK (gtk_filedialog_selchanged_callback), this); - - // deal with extensions/filters - SetWildcard(wildCard); - - wxString defaultFileNameWithExt = defaultFileName; - if ( !wildCard.empty() && !defaultFileName.empty() && - !wxFileName(defaultFileName).HasExt() ) - { - // append the default extension, if any, to the initial file name: GTK - // won't do it for us by default (unlike e.g. MSW) - const wxFileName fnWC(m_fc.GetCurrentWildCard()); - if ( fnWC.HasExt() ) - { - // Notice that we shouldn't append the extension if it's a wildcard - // because this is not useful: the user would need to change it to use - // some fixed extension anyhow. - const wxString& ext = fnWC.GetExt(); - if ( ext.find_first_of("?*") == wxString::npos ) - defaultFileNameWithExt << "." << ext; - } - } - - - // if defaultDir is specified it should contain the directory and - // defaultFileName should contain the default name of the file, however if - // directory is not given, defaultFileName contains both - wxFileName fn; - if ( defaultDir.empty() ) - fn.Assign(defaultFileNameWithExt); - else if ( !defaultFileNameWithExt.empty() ) - fn.Assign(defaultDir, defaultFileNameWithExt); - else - fn.AssignDir(defaultDir); - - // set the initial file name and/or directory - fn.MakeAbsolute(); // GTK+ needs absolute path - const wxString dir = fn.GetPath(); - if ( !dir.empty() ) - { - gtk_file_chooser_set_current_folder(file_chooser, wxGTK_CONV_FN(dir)); - } - - const wxString fname = fn.GetFullName(); - if ( style & wxFD_SAVE ) - { - if ( !fname.empty() ) - { - gtk_file_chooser_set_current_name(file_chooser, wxGTK_CONV_FN(fname)); - } - -#if GTK_CHECK_VERSION(2,7,3) - if ((style & wxFD_OVERWRITE_PROMPT) -#ifndef __WXGTK3__ - && gtk_check_version(2,7,3) == NULL -#endif - ) - { - gtk_file_chooser_set_do_overwrite_confirmation(file_chooser, true); - } -#endif - } - else // wxFD_OPEN - { - if ( !fname.empty() ) - { - gtk_file_chooser_set_filename(file_chooser, - wxGTK_CONV_FN(fn.GetFullPath())); - } - } - - if ( style & wxFD_PREVIEW ) - { - GtkWidget *previewImage = gtk_image_new(); - - gtk_file_chooser_set_preview_widget(file_chooser, previewImage); - g_signal_connect(m_widget, "update-preview", - G_CALLBACK(gtk_filedialog_update_preview_callback), - previewImage); - } - - return true; -} - -wxFileDialog::~wxFileDialog() -{ - if (m_extraControl) - { - // get chooser to drop its reference right now, allowing wxWindow dtor - // to verify that ref count drops to zero - gtk_file_chooser_set_extra_widget( - GTK_FILE_CHOOSER(m_widget), NULL); - } -} - -void wxFileDialog::OnFakeOk(wxCommandEvent& WXUNUSED(event)) -{ - // Update the current directory from here, accessing it later may not work - // due to the strange way GtkFileChooser works. - wxGtkString - str(gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(m_widget))); - m_dir = wxString::FromUTF8(str); - - EndDialog(wxID_OK); -} - -int wxFileDialog::ShowModal() -{ - WX_HOOK_MODAL_DIALOG(); - - CreateExtraControl(); - - return wxDialog::ShowModal(); -} - -void wxFileDialog::DoSetSize(int WXUNUSED(x), int WXUNUSED(y), - int WXUNUSED(width), int WXUNUSED(height), - int WXUNUSED(sizeFlags)) -{ -} - -void wxFileDialog::OnSize(wxSizeEvent&) -{ - // avoid calling DoLayout(), which will set the (wrong) size of - // m_extraControl, its size is managed by GtkFileChooser -} - -wxString wxFileDialog::GetPath() const -{ - return m_fc.GetPath(); -} - -void wxFileDialog::GetFilenames(wxArrayString& files) const -{ - m_fc.GetFilenames( files ); -} - -void wxFileDialog::GetPaths(wxArrayString& paths) const -{ - m_fc.GetPaths( paths ); -} - -void wxFileDialog::SetMessage(const wxString& message) -{ - m_message = message; - SetTitle(message); -} - -void wxFileDialog::SetPath(const wxString& path) -{ - wxFileDialogBase::SetPath(path); - - // Don't do anything if no path is specified, in particular don't set the - // path to m_dir below as this would result in opening the dialog in the - // parent directory of this one instead of m_dir itself. - if ( path.empty() ) - return; - - // we need an absolute path for GTK native chooser so ensure that we have - // it: use the initial directory if it was set or just CWD otherwise (this - // is the default behaviour if m_dir is empty) - wxFileName fn(path); - fn.MakeAbsolute(m_dir); - m_fc.SetPath(fn.GetFullPath()); -} - -void wxFileDialog::SetDirectory(const wxString& dir) -{ - wxFileDialogBase::SetDirectory(dir); - - m_fc.SetDirectory(dir); -} - -void wxFileDialog::SetFilename(const wxString& name) -{ - wxFileDialogBase::SetFilename(name); - - if (HasFdFlag(wxFD_SAVE)) - { - gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget), wxGTK_CONV(name)); - } - - else - { - wxString path( GetDirectory() ); - if (path.empty()) - { - // SetPath() fires an assert if fed other than filepaths - return; - } - SetPath(wxFileName(path, name).GetFullPath()); - } -} - -wxString wxFileDialog::GetFilename() const -{ - wxString currentFilename( m_fc.GetFilename() ); - if (currentFilename.empty()) - { - // m_fc.GetFilename() will return empty until the dialog has been shown - // in which case use any previously provided value - currentFilename = m_fileName; - } - return currentFilename; -} - -void wxFileDialog::SetWildcard(const wxString& wildCard) -{ - wxFileDialogBase::SetWildcard(wildCard); - m_fc.SetWildcard( GetWildcard() ); -} - -void wxFileDialog::SetFilterIndex(int filterIndex) -{ - m_fc.SetFilterIndex( filterIndex); -} - -int wxFileDialog::GetFilterIndex() const -{ - return m_fc.GetFilterIndex(); -} - -void wxFileDialog::GTKSelectionChanged(const wxString& filename) -{ - m_currentlySelectedFilename = filename; - - if (m_extraControl) - m_extraControl->UpdateWindowUI(wxUPDATE_UI_RECURSE); -} - -#endif // wxUSE_FILEDLG diff --git a/Externals/wxWidgets3/src/gtk/filehistory.cpp b/Externals/wxWidgets3/src/gtk/filehistory.cpp deleted file mode 100644 index 7c1075ff81..0000000000 --- a/Externals/wxWidgets3/src/gtk/filehistory.cpp +++ /dev/null @@ -1,58 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/filehistory.cpp -// Purpose: GTK+ bits for wxFileHistory class -// Author: Vaclav Slavik -// Created: 2010-05-06 -// Copyright: (c) 2010 Vaclav Slavik -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include "wx/filehistory.h" - -#if wxUSE_FILE_HISTORY - -#include "wx/filename.h" - -#include -#include -#include "wx/gtk/private/string.h" -#include "wx/gtk/private.h" - -// ============================================================================ -// implementation -// ============================================================================ - -void wxFileHistory::AddFileToHistory(const wxString& file) -{ - wxFileHistoryBase::AddFileToHistory(file); - -#ifdef __WXGTK210__ - const wxString fullPath = wxFileName(file).GetFullPath(); -#ifndef __WXGTK3__ - if ( !gtk_check_version(2,10,0) ) -#endif - { - wxGtkString uri(g_filename_to_uri(wxGTK_CONV_FN(fullPath), NULL, NULL)); - - if ( uri ) - gtk_recent_manager_add_item(gtk_recent_manager_get_default(), uri); - } -#endif -} - -#endif // wxUSE_FILE_HISTORY diff --git a/Externals/wxWidgets3/src/gtk/filepicker.cpp b/Externals/wxWidgets3/src/gtk/filepicker.cpp deleted file mode 100644 index 3e82198416..0000000000 --- a/Externals/wxWidgets3/src/gtk/filepicker.cpp +++ /dev/null @@ -1,334 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/filepicker.cpp -// Purpose: implementation of wxFileButton and wxDirButton -// Author: Francesco Montorsi -// Modified By: -// Created: 15/04/2006 -// Copyright: (c) Francesco Montorsi -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if wxUSE_FILEPICKERCTRL - -#ifndef WX_PRECOMP - #include "wx/log.h" -#endif - -#include "wx/filepicker.h" -#include "wx/tooltip.h" - -#include -#include "wx/gtk/private.h" - -// ============================================================================ -// implementation -// ============================================================================ - -//----------------------------------------------------------------------------- -// wxFileButton -//----------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxFileButton, wxButton); - -bool wxFileButton::Create( wxWindow *parent, wxWindowID id, - const wxString &label, const wxString &path, - const wxString &message, const wxString &wildcard, - const wxPoint &pos, const wxSize &size, - long style, const wxValidator& validator, - const wxString &name ) -{ - // we can't use the native button for wxFLP_SAVE pickers as it can only - // open existing files and there is no way to create a new file using it - if (!(style & wxFLP_SAVE) && !(style & wxFLP_USE_TEXTCTRL)) - { - // VERY IMPORTANT: this code is identical to relative code in wxDirButton; - // if you find a problem here, fix it also in wxDirButton ! - - if (!PreCreation( parent, pos, size ) || - !wxControl::CreateBase(parent, id, pos, size, style & wxWINDOW_STYLE_MASK, - validator, name)) - { - wxFAIL_MSG( wxT("wxFileButton creation failed") ); - return false; - } - - // create the dialog associated with this button - // NB: unlike generic implementation, native GTK implementation needs to create - // the filedialog here as it needs to use gtk_file_chooser_button_new_with_dialog() - SetWindowStyle(style); - m_path = path; - m_message = message; - m_wildcard = wildcard; - if ((m_dialog = CreateDialog()) == NULL) - return false; - - // little trick used to avoid problems when there are other GTK windows 'grabbed': - // GtkFileChooserDialog won't be responsive to user events if there is another - // window which called gtk_grab_add (and this happens if e.g. a wxDialog is running - // in modal mode in the application - see wxDialogGTK::ShowModal). - // An idea could be to put the grab on the m_dialog->m_widget when the GtkFileChooserButton - // is clicked and then remove it as soon as the user closes the dialog itself. - // Unfortunately there's no way to hook in the 'clicked' event of the GtkFileChooserButton, - // thus we add grab on m_dialog->m_widget when it's shown and remove it when it's - // hidden simply using its "show" and "hide" events - clean & simple :) - g_signal_connect(m_dialog->m_widget, "show", G_CALLBACK(gtk_grab_add), NULL); - g_signal_connect(m_dialog->m_widget, "hide", G_CALLBACK(gtk_grab_remove), NULL); - - // use as label the currently selected file - m_widget = gtk_file_chooser_button_new_with_dialog( m_dialog->m_widget ); - g_object_ref(m_widget); - - // we need to know when the dialog has been dismissed clicking OK... - // NOTE: the "clicked" signal is not available for a GtkFileChooserButton - // thus we are forced to use wxFileDialog's event - m_dialog->Connect(wxEVT_BUTTON, - wxCommandEventHandler(wxFileButton::OnDialogOK), - NULL, this); - - m_parent->DoAddChild( this ); - - PostCreation(size); - SetInitialSize(size); - } - else - return wxGenericFileButton::Create(parent, id, label, path, message, wildcard, - pos, size, style, validator, name); - return true; -} - -wxFileButton::~wxFileButton() -{ - if ( m_dialog ) - { - // when m_dialog is deleted, it will destroy the widget it is sharing - // with GtkFileChooserButton, which results in a bunch of Gtk-CRITICAL - // errors from GtkFileChooserButton. To avoid this, call gtk_widget_destroy() - // on GtkFileChooserButton first (our base dtor will do it again, but - // that does no harm). m_dialog holds a reference to the shared widget, - // so it won't go away until m_dialog base dtor unrefs it. - gtk_widget_destroy(m_widget); - delete m_dialog; - } -} - -void wxFileButton::OnDialogOK(wxCommandEvent& ev) -{ - // the wxFileDialog associated with the GtkFileChooserButton has been closed - // using the OK button, thus the selected file has changed... - if (ev.GetId() == wxID_OK) - { - // ...update our path - UpdatePathFromDialog(m_dialog); - - // ...and fire an event - wxFileDirPickerEvent event(wxEVT_FILEPICKER_CHANGED, this, GetId(), m_path); - HandleWindowEvent(event); - } -} - -void wxFileButton::SetPath(const wxString &str) -{ - m_path = str; - - if (m_dialog) - UpdateDialogPath(m_dialog); -} - -void wxFileButton::SetInitialDirectory(const wxString& dir) -{ - if (m_dialog) - { - // Only change the directory if the default file name doesn't have any - // directory in it, otherwise it takes precedence. - if ( m_path.find_first_of(wxFileName::GetPathSeparators()) == - wxString::npos ) - { - static_cast(m_dialog)->SetDirectory(dir); - } - } - else - wxGenericFileButton::SetInitialDirectory(dir); -} - -#endif // wxUSE_FILEPICKERCTRL - -#if wxUSE_DIRPICKERCTRL - -#ifdef __UNIX__ -#include // chdir -#endif - -//----------------------------------------------------------------------------- -// "file-set" -//----------------------------------------------------------------------------- - -extern "C" { -static void file_set(GtkFileChooser* widget, wxDirButton* p) -{ - // NB: it's important to use gtk_file_chooser_get_filename instead of - // gtk_file_chooser_get_current_folder (see GTK docs) ! - wxGtkString filename(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget))); - p->GTKUpdatePath(filename); - - // since GtkFileChooserButton when used to pick directories also uses a combobox, - // maybe that the current folder has been changed but not through the GtkFileChooserDialog - // and thus the 'gtk_filedialog_ok_callback' could have not been called... - // thus we need to make sure the current working directory is updated if wxDIRP_CHANGE_DIR - // style was given. - if (p->HasFlag(wxDIRP_CHANGE_DIR)) - { - if ( chdir(filename) != 0 ) - { - wxLogSysError(_("Changing current directory to \"%s\" failed"), - wxString::FromUTF8(filename)); - } - } - - // ...and fire an event - wxFileDirPickerEvent event(wxEVT_DIRPICKER_CHANGED, p, p->GetId(), p->GetPath()); - p->HandleWindowEvent(event); -} -} - -//----------------------------------------------------------------------------- -// "selection-changed" -//----------------------------------------------------------------------------- - -extern "C" { -static void selection_changed(GtkFileChooser* chooser, wxDirButton* win) -{ - char* filename = gtk_file_chooser_get_filename(chooser); - - if (wxString::FromUTF8(filename) == win->GetPath()) - win->m_bIgnoreNextChange = false; - else if (!win->m_bIgnoreNextChange) - file_set(chooser, win); - - g_free(filename); -} -} - -//----------------------------------------------------------------------------- -// wxDirButtonGTK -//----------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxDirButton, wxButton); - -bool wxDirButton::Create( wxWindow *parent, wxWindowID id, - const wxString &label, const wxString &path, - const wxString &message, const wxString &wildcard, - const wxPoint &pos, const wxSize &size, - long style, const wxValidator& validator, - const wxString &name ) -{ - if (!(style & wxDIRP_USE_TEXTCTRL)) - { - // VERY IMPORTANT: this code is identic to relative code in wxFileButton; - // if you find a problem here, fix it also in wxFileButton ! - - if (!PreCreation( parent, pos, size ) || - !wxControl::CreateBase(parent, id, pos, size, style & wxWINDOW_STYLE_MASK, - validator, name)) - { - wxFAIL_MSG( wxT("wxDirButtonGTK creation failed") ); - return false; - } - - // create the dialog associated with this button - SetWindowStyle(style); - m_message = message; - m_wildcard = wildcard; - if ((m_dialog = CreateDialog()) == NULL) - return false; - - // little trick used to avoid problems when there are other GTK windows 'grabbed': - // GtkFileChooserDialog won't be responsive to user events if there is another - // window which called gtk_grab_add (and this happens if e.g. a wxDialog is running - // in modal mode in the application - see wxDialogGTK::ShowModal). - // An idea could be to put the grab on the m_dialog->m_widget when the GtkFileChooserButton - // is clicked and then remove it as soon as the user closes the dialog itself. - // Unfortunately there's no way to hook in the 'clicked' event of the GtkFileChooserButton, - // thus we add grab on m_dialog->m_widget when it's shown and remove it when it's - // hidden simply using its "show" and "hide" events - clean & simple :) - g_signal_connect(m_dialog->m_widget, "show", G_CALLBACK(gtk_grab_add), NULL); - g_signal_connect(m_dialog->m_widget, "hide", G_CALLBACK(gtk_grab_remove), NULL); - - - // NOTE: we deliberately ignore the given label as GtkFileChooserButton - // use as label the currently selected file - m_widget = gtk_file_chooser_button_new_with_dialog( m_dialog->m_widget ); - g_object_ref(m_widget); - SetPath(path); - -#ifdef __WXGTK3__ - if (gtk_check_version(3,8,0) == NULL) - g_signal_connect(m_widget, "file_set", G_CALLBACK(file_set), this); - else -#endif - { - // prior to GTK+ 3.8 neither "file-set" nor "current-folder-changed" will be - // emitted when the user selects one of the special folders from the combobox - g_signal_connect(m_widget, "selection_changed", - G_CALLBACK(selection_changed), this); - } - - m_parent->DoAddChild( this ); - - PostCreation(size); - SetInitialSize(size); - } - else - return wxGenericDirButton::Create(parent, id, label, path, message, wildcard, - pos, size, style, validator, name); - return true; -} - -wxDirButton::~wxDirButton() -{ - if (m_dialog) - { - // see ~wxFileButton() comment - gtk_widget_destroy(m_widget); - delete m_dialog; - } -} - -void wxDirButton::GTKUpdatePath(const char *gtkpath) -{ - m_path = wxString::FromUTF8(gtkpath); -} -void wxDirButton::SetPath(const wxString& str) -{ - if ( m_path == str ) - return; - - m_path = str; - - m_bIgnoreNextChange = true; - - if (GTK_IS_FILE_CHOOSER(m_widget)) - gtk_file_chooser_set_filename((GtkFileChooser*)m_widget, str.utf8_str()); - else if (m_dialog) - UpdateDialogPath(m_dialog); -} - -void wxDirButton::SetInitialDirectory(const wxString& dir) -{ - if (m_dialog) - { - if (m_path.empty()) - static_cast(m_dialog)->SetPath(dir); - } - else - wxGenericDirButton::SetInitialDirectory(dir); -} - -#endif // wxUSE_DIRPICKERCTRL diff --git a/Externals/wxWidgets3/src/gtk/font.cpp b/Externals/wxWidgets3/src/gtk/font.cpp deleted file mode 100644 index 54ec1b403c..0000000000 --- a/Externals/wxWidgets3/src/gtk/font.cpp +++ /dev/null @@ -1,553 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/font.cpp -// Purpose: wxFont for wxGTK -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling and Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#include "wx/font.h" - -#ifndef WX_PRECOMP - #include "wx/log.h" - #include "wx/utils.h" - #include "wx/settings.h" - #include "wx/gdicmn.h" -#endif - -#include "wx/fontutil.h" -#include "wx/tokenzr.h" - -#include "wx/gtk/private.h" - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -// the default size (in points) for the fonts -static const int wxDEFAULT_FONT_SIZE = 12; - -// ---------------------------------------------------------------------------- -// wxFontRefData -// ---------------------------------------------------------------------------- - -class wxFontRefData : public wxGDIRefData -{ -public: - // from broken down font parameters, also default ctor - wxFontRefData(int size = -1, - wxFontFamily family = wxFONTFAMILY_DEFAULT, - wxFontStyle style = wxFONTSTYLE_NORMAL, - wxFontWeight weight = wxFONTWEIGHT_NORMAL, - bool underlined = false, - bool strikethrough = false, - const wxString& faceName = wxEmptyString, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT); - - wxFontRefData(const wxString& nativeFontInfoString); - - // copy ctor - wxFontRefData( const wxFontRefData& data ); - - virtual ~wxFontRefData(); - - // setters: all of them also take care to modify m_nativeFontInfo if we - // have it so as to not lose the information not carried by our fields - void SetPointSize(int pointSize); - void SetFamily(wxFontFamily family); - void SetStyle(wxFontStyle style); - void SetWeight(wxFontWeight weight); - void SetUnderlined(bool underlined); - void SetStrikethrough(bool strikethrough); - bool SetFaceName(const wxString& facename); - void SetEncoding(wxFontEncoding encoding); - - // and this one also modifies all the other font data fields - void SetNativeFontInfo(const wxNativeFontInfo& info); - -protected: - // common part of all ctors - void Init(int pointSize, - wxFontFamily family, - wxFontStyle style, - wxFontWeight weight, - bool underlined, - bool strikethrough, - const wxString& faceName, - wxFontEncoding encoding); - - // set all fields from (already initialized and valid) m_nativeFontInfo - void InitFromNative(); - -private: - // The native font info: basically a PangoFontDescription, plus - // 'underlined' and 'strikethrough' attributes not supported by Pango. - wxNativeFontInfo m_nativeFontInfo; - - friend class wxFont; -}; - -#define M_FONTDATA ((wxFontRefData*)m_refData) - -// ---------------------------------------------------------------------------- -// wxFontRefData -// ---------------------------------------------------------------------------- - -void wxFontRefData::Init(int pointSize, - wxFontFamily family, - wxFontStyle style, - wxFontWeight weight, - bool underlined, - bool strikethrough, - const wxString& faceName, - wxFontEncoding WXUNUSED(encoding)) -{ - // Old code could wrongly specify wxDEFAULT instead of -1 or wxNORMAL or, - // preferably, wxFONTSTYLE_NORMAL or wxFONTWEIGHT_NORMAL, continue handling - // this for compatibility. - if ( pointSize == wxDEFAULT ) - pointSize = -1; - - if ( static_cast(style) == wxDEFAULT ) - style = wxFONTSTYLE_NORMAL; - - if ( static_cast(weight) == wxDEFAULT ) - weight = wxFONTWEIGHT_NORMAL; - - if (family == wxFONTFAMILY_DEFAULT) - family = wxFONTFAMILY_SWISS; - - // Create native font info - m_nativeFontInfo.description = pango_font_description_new(); - - // And set its values - if (!faceName.empty()) - { - pango_font_description_set_family( m_nativeFontInfo.description, - wxGTK_CONV_SYS(faceName) ); - } - else - { - SetFamily(family); - } - - SetStyle( style ); - SetPointSize( pointSize == -1 ? wxDEFAULT_FONT_SIZE : pointSize ); - SetWeight( weight ); - SetUnderlined( underlined ); - SetStrikethrough( strikethrough ); -} - -void wxFontRefData::InitFromNative() -{ - // Get native info - PangoFontDescription *desc = m_nativeFontInfo.description; - - // Pango sometimes needs to have a size - int pango_size = pango_font_description_get_size( desc ); - if (pango_size == 0) - m_nativeFontInfo.SetPointSize(wxDEFAULT_FONT_SIZE); -} - -wxFontRefData::wxFontRefData( const wxFontRefData& data ) - : wxGDIRefData(), - m_nativeFontInfo(data.m_nativeFontInfo) -{ -} - -wxFontRefData::wxFontRefData(int size, wxFontFamily family, wxFontStyle style, - wxFontWeight weight, bool underlined, bool strikethrough, - const wxString& faceName, - wxFontEncoding encoding) -{ - Init(size, family, style, weight, underlined, strikethrough, faceName, encoding); -} - -wxFontRefData::wxFontRefData(const wxString& nativeFontInfoString) -{ - m_nativeFontInfo.FromString( nativeFontInfoString ); - - InitFromNative(); -} - -wxFontRefData::~wxFontRefData() -{ -} - -// ---------------------------------------------------------------------------- -// wxFontRefData SetXXX() -// ---------------------------------------------------------------------------- - -void wxFontRefData::SetPointSize(int pointSize) -{ - m_nativeFontInfo.SetPointSize(pointSize); -} - -/* - NOTE: disabled because pango_font_description_set_absolute_size() and - wxDC::GetCharHeight() do not mix well: setting with the former a pixel - size of "30" makes the latter return 36... - Besides, we need to return GetPointSize() a point size value even if - SetPixelSize() was used and this would require further changes - (and use of pango_font_description_get_size_is_absolute in some places). - -bool wxFontRefData::SetPixelSize(const wxSize& pixelSize) -{ - wxCHECK_MSG( pixelSize.GetWidth() >= 0 && pixelSize.GetHeight() > 0, false, - "Negative values for the pixel size or zero pixel height are not allowed" ); - - if (wx_pango_version_check(1,8,0) != NULL || - pixelSize.GetWidth() != 0) - { - // NOTE: pango_font_description_set_absolute_size() only sets the font height; - // if the user set the pixel width of the font explicitly or the pango - // library is too old, we cannot proceed - return false; - } - - pango_font_description_set_absolute_size( m_nativeFontInfo.description, - pixelSize.GetHeight() * PANGO_SCALE ); - - return true; -} -*/ - -void wxFontRefData::SetFamily(wxFontFamily family) -{ - m_nativeFontInfo.SetFamily(family); -} - -void wxFontRefData::SetStyle(wxFontStyle style) -{ - m_nativeFontInfo.SetStyle(style); -} - -void wxFontRefData::SetWeight(wxFontWeight weight) -{ - m_nativeFontInfo.SetWeight(weight); -} - -void wxFontRefData::SetUnderlined(bool underlined) -{ - m_nativeFontInfo.SetUnderlined(underlined); -} - -void wxFontRefData::SetStrikethrough(bool strikethrough) -{ - m_nativeFontInfo.SetStrikethrough(strikethrough); -} - -bool wxFontRefData::SetFaceName(const wxString& facename) -{ - return m_nativeFontInfo.SetFaceName(facename); -} - -void wxFontRefData::SetEncoding(wxFontEncoding WXUNUSED(encoding)) -{ - // with GTK+ 2 Pango always uses UTF8 internally, we cannot change it -} - -void wxFontRefData::SetNativeFontInfo(const wxNativeFontInfo& info) -{ - m_nativeFontInfo = info; - - // set all the other font parameters from the native font info - InitFromNative(); -} - -// ---------------------------------------------------------------------------- -// wxFont creation -// ---------------------------------------------------------------------------- - -wxFont::wxFont(const wxNativeFontInfo& info) -{ - Create( info.GetPointSize(), - info.GetFamily(), - info.GetStyle(), - info.GetWeight(), - info.GetUnderlined(), - info.GetFaceName(), - info.GetEncoding() ); - - if ( info.GetStrikethrough() ) - SetStrikethrough(true); -} - -wxFont::wxFont(const wxFontInfo& info) -{ - m_refData = new wxFontRefData(info.GetPointSize(), - info.GetFamily(), - info.GetStyle(), - info.GetWeight(), - info.IsUnderlined(), - info.IsStrikethrough(), - info.GetFaceName(), - info.GetEncoding()); - - wxSize pixelSize = info.GetPixelSize(); - if ( pixelSize != wxDefaultSize ) - SetPixelSize(pixelSize); -} - -bool wxFont::Create( int pointSize, - wxFontFamily family, - wxFontStyle style, - wxFontWeight weight, - bool underlined, - const wxString& face, - wxFontEncoding encoding ) -{ - UnRef(); - - m_refData = new wxFontRefData(pointSize, family, style, weight, - underlined, false, face, encoding); - - return true; -} - -bool wxFont::Create(const wxString& fontname) -{ - // VZ: does this really happen? - if ( fontname.empty() ) - { - *this = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); - - return true; - } - - m_refData = new wxFontRefData(fontname); - - return true; -} - -wxFont::~wxFont() -{ -} - -// ---------------------------------------------------------------------------- -// accessors -// ---------------------------------------------------------------------------- - -int wxFont::GetPointSize() const -{ - wxCHECK_MSG( IsOk(), 0, wxT("invalid font") ); - - return M_FONTDATA->m_nativeFontInfo.GetPointSize(); -} - -wxString wxFont::GetFaceName() const -{ - wxCHECK_MSG( IsOk(), wxEmptyString, wxT("invalid font") ); - - return M_FONTDATA->m_nativeFontInfo.GetFaceName(); -} - -wxFontFamily wxFont::DoGetFamily() const -{ - return M_FONTDATA->m_nativeFontInfo.GetFamily(); -} - -wxFontStyle wxFont::GetStyle() const -{ - wxCHECK_MSG( IsOk(), wxFONTSTYLE_MAX, wxT("invalid font") ); - - return M_FONTDATA->m_nativeFontInfo.GetStyle(); -} - -wxFontWeight wxFont::GetWeight() const -{ - wxCHECK_MSG( IsOk(), wxFONTWEIGHT_MAX, wxT("invalid font") ); - - return M_FONTDATA->m_nativeFontInfo.GetWeight(); -} - -bool wxFont::GetUnderlined() const -{ - wxCHECK_MSG( IsOk(), false, wxT("invalid font") ); - - return M_FONTDATA->m_nativeFontInfo.GetUnderlined(); -} - -bool wxFont::GetStrikethrough() const -{ - wxCHECK_MSG( IsOk(), false, wxT("invalid font") ); - - return M_FONTDATA->m_nativeFontInfo.GetStrikethrough(); -} - -wxFontEncoding wxFont::GetEncoding() const -{ - wxCHECK_MSG( IsOk(), wxFONTENCODING_SYSTEM, wxT("invalid font") ); - - return wxFONTENCODING_UTF8; - // Pango always uses UTF8... see also SetEncoding() -} - -const wxNativeFontInfo *wxFont::GetNativeFontInfo() const -{ - wxCHECK_MSG( IsOk(), NULL, wxT("invalid font") ); - - return &(M_FONTDATA->m_nativeFontInfo); -} - -bool wxFont::IsFixedWidth() const -{ - wxCHECK_MSG( IsOk(), false, wxT("invalid font") ); - - return wxFontBase::IsFixedWidth(); -} - -// ---------------------------------------------------------------------------- -// change font attributes -// ---------------------------------------------------------------------------- - -void wxFont::SetPointSize(int pointSize) -{ - AllocExclusive(); - - M_FONTDATA->SetPointSize(pointSize); -} - -void wxFont::SetFamily(wxFontFamily family) -{ - AllocExclusive(); - - M_FONTDATA->SetFamily(family); -} - -void wxFont::SetStyle(wxFontStyle style) -{ - AllocExclusive(); - - M_FONTDATA->SetStyle(style); -} - -void wxFont::SetWeight(wxFontWeight weight) -{ - AllocExclusive(); - - M_FONTDATA->SetWeight(weight); -} - -bool wxFont::SetFaceName(const wxString& faceName) -{ - AllocExclusive(); - - return M_FONTDATA->SetFaceName(faceName) && - wxFontBase::SetFaceName(faceName); -} - -void wxFont::SetUnderlined(bool underlined) -{ - AllocExclusive(); - - M_FONTDATA->SetUnderlined(underlined); -} - -void wxFont::SetStrikethrough(bool strikethrough) -{ - AllocExclusive(); - - M_FONTDATA->SetStrikethrough(strikethrough); -} - -void wxFont::SetEncoding(wxFontEncoding encoding) -{ - AllocExclusive(); - - M_FONTDATA->SetEncoding(encoding); -} - -void wxFont::DoSetNativeFontInfo( const wxNativeFontInfo& info ) -{ - AllocExclusive(); - - M_FONTDATA->SetNativeFontInfo( info ); -} - -wxGDIRefData* wxFont::CreateGDIRefData() const -{ - return new wxFontRefData; -} - -wxGDIRefData* wxFont::CloneGDIRefData(const wxGDIRefData* data) const -{ - return new wxFontRefData(*static_cast(data)); -} - -bool wxFont::GTKSetPangoAttrs(PangoLayout* layout) const -{ - if (!IsOk() || !(GetUnderlined() || GetStrikethrough())) - return false; - - PangoAttrList* attrs = pango_attr_list_new(); - PangoAttribute* a; - -#ifndef __WXGTK3__ - if (wx_pango_version_check(1,16,0)) - { - // a PangoLayout which has leading/trailing spaces with underlined font - // is not correctly drawn by this pango version: Pango won't underline the spaces. - // This can be a problem; e.g. wxHTML rendering of underlined text relies on - // this behaviour. To workaround this problem, we use a special hack here - // suggested by pango maintainer Behdad Esfahbod: we prepend and append two - // empty space characters and give them a dummy colour attribute. - // This will force Pango to underline the leading/trailing spaces, too. - - const char* text = pango_layout_get_text(layout); - const size_t n = strlen(text); - if ((n > 0 && text[0] == ' ') || (n > 1 && text[n - 1] == ' ')) - { - wxCharBuffer buf(n + 6); - // copy the leading U+200C ZERO WIDTH NON-JOINER encoded in UTF8 format - memcpy(buf.data(), "\342\200\214", 3); - // copy the user string - memcpy(buf.data() + 3, text, n); - // copy the trailing U+200C ZERO WIDTH NON-JOINER encoded in UTF8 format - memcpy(buf.data() + 3 + n, "\342\200\214", 3); - - pango_layout_set_text(layout, buf, n + 6); - - // Add dummy attributes (use colour as it's invisible anyhow for 0 - // width spaces) to ensure that the spaces in the beginning/end of the - // string are underlined too. - a = pango_attr_foreground_new(0x0057, 0x52A9, 0xD614); - a->start_index = 0; - a->end_index = 3; - pango_attr_list_insert(attrs, a); - - a = pango_attr_foreground_new(0x0057, 0x52A9, 0xD614); - a->start_index = n + 3; - a->end_index = n + 6; - pango_attr_list_insert(attrs, a); - } - } -#endif // !__WXGTK3__ - - if (GetUnderlined()) - { - a = pango_attr_underline_new(PANGO_UNDERLINE_SINGLE); - pango_attr_list_insert(attrs, a); - } - if (GetStrikethrough()) - { - a = pango_attr_strikethrough_new(true); - pango_attr_list_insert(attrs, a); - } - - pango_layout_set_attributes(layout, attrs); - pango_attr_list_unref(attrs); - - return true; -} diff --git a/Externals/wxWidgets3/src/gtk/fontdlg.cpp b/Externals/wxWidgets3/src/gtk/fontdlg.cpp deleted file mode 100644 index 3f651fbe63..0000000000 --- a/Externals/wxWidgets3/src/gtk/fontdlg.cpp +++ /dev/null @@ -1,135 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/fontdlg.cpp -// Purpose: wxFontDialog -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if wxUSE_FONTDLG && !defined(__WXGPE__) - -#include "wx/fontdlg.h" - -#ifndef WX_PRECOMP - #include "wx/intl.h" -#endif - -#include "wx/fontutil.h" -#include "wx/gtk/private.h" - -//----------------------------------------------------------------------------- -// "response" -//----------------------------------------------------------------------------- - -extern "C" { -static void response(GtkDialog* dialog, int response_id, wxFontDialog* win) -{ - int rc = wxID_CANCEL; - if (response_id == GTK_RESPONSE_OK) - { - rc = wxID_OK; -#if GTK_CHECK_VERSION(3,2,0) - if (gtk_check_version(3,2,0) == NULL) - { - wxNativeFontInfo info; - info.description = gtk_font_chooser_get_font_desc(GTK_FONT_CHOOSER(dialog)); - win->GetFontData().SetChosenFont(wxFont(info)); - } - else -#endif - { - wxGCC_WARNING_SUPPRESS(deprecated-declarations) - GtkFontSelectionDialog* sel = GTK_FONT_SELECTION_DIALOG(dialog); - wxGtkString name(gtk_font_selection_dialog_get_font_name(sel)); - win->GetFontData().SetChosenFont(wxFont(wxString::FromUTF8(name))); - wxGCC_WARNING_RESTORE() - } - } - - if (win->IsModal()) - win->EndModal(rc); - else - win->Show(false); -} -} - -//----------------------------------------------------------------------------- -// wxFontDialog -//----------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog); - -bool wxFontDialog::DoCreate(wxWindow *parent) -{ - parent = GetParentForModalDialog(parent, 0); - - if (!PreCreation( parent, wxDefaultPosition, wxDefaultSize ) || - !CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE, - wxDefaultValidator, wxT("fontdialog") )) - { - wxFAIL_MSG( wxT("wxFontDialog creation failed") ); - return false; - } - - const wxString message(_("Choose font")); - GtkWindow* gtk_parent = NULL; - if (parent) - gtk_parent = GTK_WINDOW(parent->m_widget); - -#if GTK_CHECK_VERSION(3,2,0) -#if GLIB_CHECK_VERSION(2, 34, 0) - g_type_ensure(PANGO_TYPE_FONT_FACE); -#endif - if (gtk_check_version(3,2,0) == NULL) - m_widget = gtk_font_chooser_dialog_new(wxGTK_CONV(message), gtk_parent); - else -#endif - { - wxGCC_WARNING_SUPPRESS(deprecated-declarations) - m_widget = gtk_font_selection_dialog_new(wxGTK_CONV(message)); - if (gtk_parent) - gtk_window_set_transient_for(GTK_WINDOW(m_widget), gtk_parent); - wxGCC_WARNING_RESTORE() - } - g_object_ref(m_widget); - - g_signal_connect(m_widget, "response", G_CALLBACK(response), this); - - wxFont font = m_fontData.GetInitialFont(); - if( font.IsOk() ) - { - const wxNativeFontInfo *info = font.GetNativeFontInfo(); - - if ( info ) - { -#if GTK_CHECK_VERSION(3,2,0) - if (gtk_check_version(3,2,0) == NULL) - gtk_font_chooser_set_font_desc(GTK_FONT_CHOOSER(m_widget), info->description); - else -#endif - { - wxGCC_WARNING_SUPPRESS(deprecated-declarations) - const wxString& fontname = info->ToString(); - GtkFontSelectionDialog* sel = GTK_FONT_SELECTION_DIALOG(m_widget); - gtk_font_selection_dialog_set_font_name(sel, wxGTK_CONV(fontname)); - wxGCC_WARNING_RESTORE() - } - } - else - { - // this is not supposed to happen! - wxFAIL_MSG(wxT("font is ok but no native font info?")); - } - } - - return true; -} - -wxFontDialog::~wxFontDialog() -{ -} - -#endif // wxUSE_FONTDLG && !__WXGPE__ diff --git a/Externals/wxWidgets3/src/gtk/fontpicker.cpp b/Externals/wxWidgets3/src/gtk/fontpicker.cpp deleted file mode 100644 index e5f98b64c8..0000000000 --- a/Externals/wxWidgets3/src/gtk/fontpicker.cpp +++ /dev/null @@ -1,113 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/fontpicker.cpp -// Purpose: implementation of wxFontButton -// Author: Francesco Montorsi -// Modified By: -// Created: 15/04/2006 -// Copyright: (c) Francesco Montorsi -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if wxUSE_FONTPICKERCTRL - -#include "wx/fontpicker.h" - -#include "wx/fontutil.h" // for wxNativeFontInfo -#include "wx/gtk/private.h" - -// ============================================================================ -// implementation -// ============================================================================ - -//----------------------------------------------------------------------------- -// "font-set" -//----------------------------------------------------------------------------- - -extern "C" { -static void gtk_fontbutton_setfont_callback(GtkFontButton *widget, - wxFontButton *p) -{ - // update the m_selectedFont member of the wxFontButton - wxASSERT(p); - p->SetNativeFontInfo(gtk_font_button_get_font_name(widget)); - - // fire the colour-changed event - wxFontPickerEvent event(p, p->GetId(), p->GetSelectedFont()); - p->HandleWindowEvent(event); -} -} - -//----------------------------------------------------------------------------- -// wxFontButton -//----------------------------------------------------------------------------- - -wxIMPLEMENT_DYNAMIC_CLASS(wxFontButton, wxButton); - -bool wxFontButton::Create( wxWindow *parent, wxWindowID id, - const wxFont &initial, - const wxPoint &pos, const wxSize &size, - long style, const wxValidator& validator, - const wxString &name ) -{ - if (!PreCreation( parent, pos, size ) || - !wxControl::CreateBase(parent, id, pos, size, style, validator, name)) - { - wxFAIL_MSG( wxT("wxFontButton creation failed") ); - return false; - } - - m_widget = gtk_font_button_new(); - g_object_ref(m_widget); - - // set initial font - m_selectedFont = initial.IsOk() ? initial : *wxNORMAL_FONT; - UpdateFont(); - - // honour the fontbutton styles - bool showall = (style & wxFNTP_FONTDESC_AS_LABEL) != 0, - usefont = (style & wxFNTP_USEFONT_FOR_LABEL) != 0; - gtk_font_button_set_show_style(GTK_FONT_BUTTON(m_widget), showall); - gtk_font_button_set_show_size(GTK_FONT_BUTTON(m_widget), showall); - - gtk_font_button_set_use_size(GTK_FONT_BUTTON(m_widget), usefont); - gtk_font_button_set_use_font(GTK_FONT_BUTTON(m_widget), usefont); - - // GtkFontButton signals - g_signal_connect(m_widget, "font-set", - G_CALLBACK(gtk_fontbutton_setfont_callback), this); - - - m_parent->DoAddChild( this ); - - PostCreation(size); - SetInitialSize(size); - - return true; -} - -wxFontButton::~wxFontButton() -{ -} - -void wxFontButton::UpdateFont() -{ - const wxNativeFontInfo *info = m_selectedFont.GetNativeFontInfo(); - wxASSERT_MSG( info, wxT("The fontbutton's internal font is not valid ?") ); - - const wxString& fontname = info->ToString(); - gtk_font_button_set_font_name(GTK_FONT_BUTTON(m_widget), wxGTK_CONV(fontname)); -} - -void wxFontButton::SetNativeFontInfo(const char* gtkdescription) -{ - m_selectedFont.SetNativeFontInfo(wxString::FromUTF8(gtkdescription)); -} -#endif // wxUSE_FONTPICKERCTRL diff --git a/Externals/wxWidgets3/src/gtk/frame.cpp b/Externals/wxWidgets3/src/gtk/frame.cpp deleted file mode 100644 index 1361cde8e0..0000000000 --- a/Externals/wxWidgets3/src/gtk/frame.cpp +++ /dev/null @@ -1,377 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/frame.cpp -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#include "wx/frame.h" - -#ifndef WX_PRECOMP - #include "wx/menu.h" - #include "wx/toolbar.h" - #include "wx/statusbr.h" -#endif // WX_PRECOMP - -#include -#include "wx/gtk/private/gtk2-compat.h" - -// ---------------------------------------------------------------------------- -// event tables -// ---------------------------------------------------------------------------- - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxFrame creation -// ---------------------------------------------------------------------------- - -void wxFrame::Init() -{ - m_fsSaveFlag = 0; -} - -bool wxFrame::Create( wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos, - const wxSize& sizeOrig, - long style, - const wxString &name ) -{ - return wxFrameBase::Create(parent, id, title, pos, sizeOrig, style, name); -} - -// ---------------------------------------------------------------------------- -// overridden wxWindow methods -// ---------------------------------------------------------------------------- - -void wxFrame::DoGetClientSize( int *width, int *height ) const -{ - wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); - - wxFrameBase::DoGetClientSize(width, height); - - if (m_useCachedClientSize) - return; - - if (height) - { -#if wxUSE_MENUS_NATIVE - // menu bar - if (m_frameMenuBar && m_frameMenuBar->IsShown()) - { - int h; - gtk_widget_get_preferred_height(m_frameMenuBar->m_widget, NULL, &h); - *height -= h; - } -#endif // wxUSE_MENUS_NATIVE - -#if wxUSE_STATUSBAR - // status bar - if (m_frameStatusBar && m_frameStatusBar->IsShown()) - *height -= m_frameStatusBar->m_height; -#endif // wxUSE_STATUSBAR - } - -#if wxUSE_TOOLBAR - // tool bar - if (m_frameToolBar && m_frameToolBar->IsShown()) - { - if (m_frameToolBar->IsVertical()) - { - if (width) - { - int w; - gtk_widget_get_preferred_width(m_frameToolBar->m_widget, NULL, &w); - *width -= w; - } - } - else - { - if (height) - { - int h; - gtk_widget_get_preferred_height(m_frameToolBar->m_widget, NULL, &h); - *height -= h; - } - } - } -#endif // wxUSE_TOOLBAR - - if (width != NULL && *width < 0) - *width = 0; - if (height != NULL && *height < 0) - *height = 0; -} - -#if wxUSE_MENUS && wxUSE_ACCEL -// Helper for wxCreateAcceleratorTableForMenuBar -static void wxAddAccelerators(wxList& accelEntries, wxMenu* menu) -{ - size_t i; - for (i = 0; i < menu->GetMenuItems().GetCount(); i++) - { - wxMenuItem* item = (wxMenuItem*) menu->GetMenuItems().Item(i)->GetData(); - if (item->GetSubMenu()) - { - wxAddAccelerators(accelEntries, item->GetSubMenu()); - } - else if (!item->GetItemLabel().IsEmpty()) - { - wxAcceleratorEntry* entry = wxAcceleratorEntry::Create(item->GetItemLabel()); - if (entry) - { - entry->Set(entry->GetFlags(), entry->GetKeyCode(), item->GetId()); - accelEntries.Append((wxObject*) entry); - } - } - } -} - -// Create an accelerator table consisting of all the accelerators -// from the menubar in the given menus -static wxAcceleratorTable wxCreateAcceleratorTableForMenuBar(wxMenuBar* menuBar) -{ - wxList accelEntries; - - size_t i; - for (i = 0; i < menuBar->GetMenuCount(); i++) - { - wxAddAccelerators(accelEntries, menuBar->GetMenu(i)); - } - - size_t n = accelEntries.GetCount(); - - if (n == 0) - return wxAcceleratorTable(); - - wxAcceleratorEntry* entries = new wxAcceleratorEntry[n]; - - for (i = 0; i < accelEntries.GetCount(); i++) - { - wxAcceleratorEntry* entry = (wxAcceleratorEntry*) accelEntries.Item(i)->GetData(); - entries[i] = (*entry); - delete entry; - - } - - wxAcceleratorTable table(n, entries); - delete[] entries; - - return table; -} -#endif // wxUSE_MENUS && wxUSE_ACCEL - -bool wxFrame::ShowFullScreen(bool show, long style) -{ - if (!wxFrameBase::ShowFullScreen(show, style)) - return false; - -#if wxUSE_MENUS && wxUSE_ACCEL - if (show && GetMenuBar()) - { - wxAcceleratorTable table(wxCreateAcceleratorTableForMenuBar(GetMenuBar())); - if (table.IsOk()) - SetAcceleratorTable(table); - } -#endif // wxUSE_MENUS && wxUSE_ACCEL - - wxWindow* const bar[] = { -#if wxUSE_MENUS - m_frameMenuBar, -#else - NULL, -#endif -#if wxUSE_TOOLBAR - m_frameToolBar, -#else - NULL, -#endif -#if wxUSE_STATUSBAR - m_frameStatusBar, -#else - NULL, -#endif - }; - const long fsNoBar[] = { - wxFULLSCREEN_NOMENUBAR, wxFULLSCREEN_NOTOOLBAR, wxFULLSCREEN_NOSTATUSBAR - }; - for (int i = 0; i < 3; i++) - { - if (show) - { - if (bar[i] && (style & fsNoBar[i])) - { - if (bar[i]->IsShown()) - bar[i]->Show(false); - else - style &= ~fsNoBar[i]; - } - } - else - { - if (bar[i] && (m_fsSaveFlag & fsNoBar[i])) - bar[i]->Show(true); - } - } - if (show) - m_fsSaveFlag = style; - - return true; -} - -bool wxFrame::SendIdleEvents(wxIdleEvent& event) -{ - bool needMore = wxFrameBase::SendIdleEvents(event); - -#if wxUSE_MENUS - if (m_frameMenuBar && m_frameMenuBar->SendIdleEvents(event)) - needMore = true; -#endif -#if wxUSE_TOOLBAR - if (m_frameToolBar && m_frameToolBar->SendIdleEvents(event)) - needMore = true; -#endif -#if wxUSE_STATUSBAR - if (m_frameStatusBar && m_frameStatusBar->SendIdleEvents(event)) - needMore = true; -#endif - - return needMore; -} - -// ---------------------------------------------------------------------------- -// menu/tool/status bar stuff -// ---------------------------------------------------------------------------- - -#if wxUSE_MENUS_NATIVE - -void wxFrame::DetachMenuBar() -{ - wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); - wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid frame") ); - - if ( m_frameMenuBar ) - { - g_object_ref( m_frameMenuBar->m_widget ); - - gtk_container_remove( GTK_CONTAINER(m_mainWidget), m_frameMenuBar->m_widget ); - } - - wxFrameBase::DetachMenuBar(); - - // make sure next size_allocate causes a wxSizeEvent - m_useCachedClientSize = false; - m_clientWidth = 0; -} - -void wxFrame::AttachMenuBar( wxMenuBar *menuBar ) -{ - wxFrameBase::AttachMenuBar(menuBar); - - if (m_frameMenuBar) - { - // menubar goes into top of vbox (m_mainWidget) - gtk_box_pack_start( - GTK_BOX(m_mainWidget), menuBar->m_widget, false, false, 0); - gtk_box_reorder_child(GTK_BOX(m_mainWidget), menuBar->m_widget, 0); - - // reset size request to allow native sizing to work - gtk_widget_set_size_request(menuBar->m_widget, -1, -1); - - gtk_widget_show( m_frameMenuBar->m_widget ); - } - // make sure next size_allocate causes a wxSizeEvent - m_useCachedClientSize = false; - m_clientWidth = 0; -} -#endif // wxUSE_MENUS_NATIVE - -#if wxUSE_TOOLBAR - -void wxFrame::SetToolBar(wxToolBar *toolbar) -{ - m_frameToolBar = toolbar; - if (toolbar) - { - gtk_container_remove( - GTK_CONTAINER(gtk_widget_get_parent(toolbar->m_widget)), toolbar->m_widget); - if (toolbar->IsVertical()) - { - // Vertical toolbar and m_wxwindow go into an hbox, inside the - // vbox (m_mainWidget). hbox is created on demand. - GtkWidget* hbox = gtk_widget_get_parent(m_wxwindow); - if (hbox == m_mainWidget) - { - hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); - gtk_widget_show(hbox); - gtk_box_pack_start(GTK_BOX(m_mainWidget), hbox, true, true, 0); - g_object_ref(m_wxwindow); - gtk_container_remove(GTK_CONTAINER(m_mainWidget), m_wxwindow); - gtk_box_pack_start(GTK_BOX(hbox), m_wxwindow, true, true, 0); - g_object_unref(m_wxwindow); - } - gtk_box_pack_start(GTK_BOX(hbox), toolbar->m_widget, false, false, 0); - - int pos = 0; // left - if (toolbar->HasFlag(wxTB_RIGHT)) - pos = 1; // right - gtk_box_reorder_child(GTK_BOX(hbox), toolbar->m_widget, pos); - } - else - { - // Horizontal toolbar goes into vbox (m_mainWidget) - gtk_box_pack_start(GTK_BOX(m_mainWidget), toolbar->m_widget, false, false, 0); - - int pos = 0; // top - if (m_frameMenuBar) - pos = 1; // below menubar - if (toolbar->HasFlag(wxTB_BOTTOM)) - pos += 2; // below client area (m_wxwindow) - gtk_box_reorder_child( - GTK_BOX(m_mainWidget), toolbar->m_widget, pos); - } - // reset size request to allow native sizing to work - gtk_widget_set_size_request(toolbar->m_widget, -1, -1); - } - // make sure next size_allocate causes a wxSizeEvent - m_useCachedClientSize = false; - m_clientWidth = 0; -} - -#endif // wxUSE_TOOLBAR - -#if wxUSE_STATUSBAR - -void wxFrame::SetStatusBar(wxStatusBar *statbar) -{ - m_frameStatusBar = statbar; - if (statbar) - { - // statusbar goes into bottom of vbox (m_mainWidget) - gtk_container_remove( - GTK_CONTAINER(gtk_widget_get_parent(statbar->m_widget)), statbar->m_widget); - gtk_box_pack_end(GTK_BOX(m_mainWidget), statbar->m_widget, false, false, 0); - // make sure next size_allocate on statusbar causes a size event - statbar->m_useCachedClientSize = false; - statbar->m_clientWidth = 0; - int h = -1; - if (statbar->m_wxwindow) - { - // statusbar is not a native widget, need to set height request - h = statbar->m_height; - } - gtk_widget_set_size_request(statbar->m_widget, -1, h); - } - // make sure next size_allocate causes a wxSizeEvent - m_useCachedClientSize = false; - m_clientWidth = 0; -} -#endif // wxUSE_STATUSBAR diff --git a/Externals/wxWidgets3/src/gtk/gauge.cpp b/Externals/wxWidgets3/src/gtk/gauge.cpp deleted file mode 100644 index 7c8c1c9cd4..0000000000 --- a/Externals/wxWidgets3/src/gtk/gauge.cpp +++ /dev/null @@ -1,134 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/gauge.cpp -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if wxUSE_GAUGE - -#include "wx/gauge.h" - -#include - -//----------------------------------------------------------------------------- -// wxGauge -//----------------------------------------------------------------------------- - -bool wxGauge::Create( wxWindow *parent, - wxWindowID id, - int range, - const wxPoint& pos, - const wxSize& size, - long style, - const wxValidator& validator, - const wxString& name ) -{ - if (!PreCreation( parent, pos, size ) || - !CreateBase( parent, id, pos, size, style, validator, name )) - { - wxFAIL_MSG( wxT("wxGauge creation failed") ); - return false; - } - - m_rangeMax = range; - - m_widget = gtk_progress_bar_new(); - g_object_ref(m_widget); - if ( style & wxGA_VERTICAL ) - { -#ifdef __WXGTK3__ - gtk_orientable_set_orientation(GTK_ORIENTABLE(m_widget), GTK_ORIENTATION_VERTICAL); - gtk_progress_bar_set_inverted(GTK_PROGRESS_BAR(m_widget), true); -#else - gtk_progress_bar_set_orientation( GTK_PROGRESS_BAR(m_widget), - GTK_PROGRESS_BOTTOM_TO_TOP ); -#endif - } - - // when using the gauge in indeterminate mode, we need this: - gtk_progress_bar_set_pulse_step(GTK_PROGRESS_BAR (m_widget), 0.05); - - m_parent->DoAddChild( this ); - - PostCreation(size); - SetInitialSize(size); - - return true; -} - -void wxGauge::DoSetGauge() -{ - wxASSERT_MSG( 0 <= m_gaugePos && m_gaugePos <= m_rangeMax, - wxT("invalid gauge position in DoSetGauge()") ); - - gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (m_widget), - m_rangeMax ? ((double)m_gaugePos)/m_rangeMax : 0.0); -} - -wxSize wxGauge::DoGetBestSize() const -{ - wxSize best; - if (HasFlag(wxGA_VERTICAL)) - best = wxSize(28, 100); - else - best = wxSize(100, 28); - CacheBestSize(best); - return best; -} - -void wxGauge::SetRange( int range ) -{ - m_rangeMax = range; - if (m_gaugePos > m_rangeMax) - m_gaugePos = m_rangeMax; - - DoSetGauge(); -} - -void wxGauge::SetValue( int pos ) -{ - wxCHECK_RET( pos <= m_rangeMax, wxT("invalid value in wxGauge::SetValue()") ); - - m_gaugePos = pos; - - DoSetGauge(); -} - -int wxGauge::GetRange() const -{ - return m_rangeMax; -} - -int wxGauge::GetValue() const -{ - return m_gaugePos; -} - -void wxGauge::Pulse() -{ - gtk_progress_bar_pulse(GTK_PROGRESS_BAR (m_widget)); -} - -wxVisualAttributes wxGauge::GetDefaultAttributes() const -{ - // Visible gauge colours use a different colour state - return GetDefaultAttributesFromGTKWidget(m_widget, - UseGTKStyleBase(), - GTK_STATE_ACTIVE); - -} - -// static -wxVisualAttributes -wxGauge::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) -{ - return GetDefaultAttributesFromGTKWidget(gtk_progress_bar_new(), - false, GTK_STATE_ACTIVE); -} - -#endif // wxUSE_GAUGE diff --git a/Externals/wxWidgets3/src/gtk/glcanvas.cpp b/Externals/wxWidgets3/src/gtk/glcanvas.cpp deleted file mode 100644 index 1e68741ca0..0000000000 --- a/Externals/wxWidgets3/src/gtk/glcanvas.cpp +++ /dev/null @@ -1,354 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/glcanvas.cpp -// Purpose: wxGLCanvas, for using OpenGL/Mesa with wxWidgets and GTK -// Author: Robert Roebling -// Modified by: -// Created: 17/08/98 -// Copyright: (c) Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if wxUSE_GLCANVAS - -#include "wx/glcanvas.h" - -#include -#include -#include "wx/gtk/private/gtk2-compat.h" - -#if WXWIN_COMPATIBILITY_2_8 - -//----------------------------------------------------------------------------- -// "realize" from m_wxwindow: used to create m_glContext implicitly -//----------------------------------------------------------------------------- - -extern "C" { -static void -gtk_glwindow_realized_callback( GtkWidget *WXUNUSED(widget), wxGLCanvas *win ) -{ - win->GTKInitImplicitContext(); -} -} - -#endif // WXWIN_COMPATIBILITY_2_8 - -//----------------------------------------------------------------------------- -// "map" from m_wxwindow -//----------------------------------------------------------------------------- - -#ifndef __WXGTK3__ -extern "C" { -static void -gtk_glwindow_map_callback( GtkWidget * WXUNUSED(widget), wxGLCanvas *win ) -{ - wxPaintEvent event( win->GetId() ); - event.SetEventObject( win ); - win->HandleWindowEvent( event ); - - win->m_exposed = false; - win->GetUpdateRegion().Clear(); -} -} -#endif - -//----------------------------------------------------------------------------- -// "expose_event" of m_wxwindow -//----------------------------------------------------------------------------- - -extern "C" { -#ifdef __WXGTK3__ -static gboolean draw(GtkWidget*, cairo_t* cr, wxGLCanvas* win) -{ - win->m_exposed = true; - if (win->m_cairoPaintContext == NULL) - { - win->m_cairoPaintContext = cr; - cairo_reference(cr); - } - double x1, y1, x2, y2; - cairo_clip_extents(cr, &x1, &y1, &x2, &y2); - win->GetUpdateRegion().Union(int(x1), int(y1), int(x2 - x1), int(y2 - y1)); - return false; -} -#else -static gboolean -gtk_glwindow_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExpose *gdk_event, wxGLCanvas *win ) -{ - win->m_exposed = true; - - win->GetUpdateRegion().Union( gdk_event->area.x, - gdk_event->area.y, - gdk_event->area.width, - gdk_event->area.height ); - return false; -} -#endif -} - -//----------------------------------------------------------------------------- -// "size_allocate" of m_wxwindow -//----------------------------------------------------------------------------- - -extern "C" { -static void -gtk_glcanvas_size_callback(GtkWidget *WXUNUSED(widget), - GtkAllocation * WXUNUSED(alloc), - wxGLCanvas *win) -{ - wxSizeEvent event( wxSize(win->m_width,win->m_height), win->GetId() ); - event.SetEventObject( win ); - win->HandleWindowEvent( event ); -} -} - -//----------------------------------------------------------------------------- -// emission hook for "parent-set" -//----------------------------------------------------------------------------- - -extern "C" { -static gboolean -parent_set_hook(GSignalInvocationHint*, guint, const GValue* param_values, void* data) -{ - wxGLCanvas* win = (wxGLCanvas*)data; - if (g_value_peek_pointer(¶m_values[0]) == win->m_wxwindow) - { - const XVisualInfo* xvi = win->GetXVisualInfo(); - GdkVisual* visual = gtk_widget_get_visual(win->m_wxwindow); - if (GDK_VISUAL_XVISUAL(visual)->visualid != xvi->visualid) - { - GdkScreen* screen = gtk_widget_get_screen(win->m_wxwindow); - visual = gdk_x11_screen_lookup_visual(screen, xvi->visualid); -#ifdef __WXGTK3__ - gtk_widget_set_visual(win->m_wxwindow, visual); -#else - GdkColormap* colormap = gdk_colormap_new(visual, false); - gtk_widget_set_colormap(win->m_wxwindow, colormap); - g_object_unref(colormap); -#endif - } - // remove hook - return false; - } - return true; -} -} - -//--------------------------------------------------------------------------- -// wxGlCanvas -//--------------------------------------------------------------------------- - -wxIMPLEMENT_CLASS(wxGLCanvas, wxWindow); - -wxGLCanvas::wxGLCanvas(wxWindow *parent, - const wxGLAttributes& dispAttrs, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name, - const wxPalette& palette) -#if WXWIN_COMPATIBILITY_2_8 - : m_createImplicitContext(false) -#endif -{ - Create(parent, dispAttrs, id, pos, size, style, name, palette); -} - -wxGLCanvas::wxGLCanvas(wxWindow *parent, - wxWindowID id, - const int *attribList, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name, - const wxPalette& palette) -#if WXWIN_COMPATIBILITY_2_8 - : m_createImplicitContext(false) -#endif -{ - Create(parent, id, pos, size, style, name, attribList, palette); -} - -#if WXWIN_COMPATIBILITY_2_8 - -wxGLCanvas::wxGLCanvas(wxWindow *parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name, - const int *attribList, - const wxPalette& palette) - : m_createImplicitContext(true) -{ - m_sharedContext = NULL; - m_sharedContextOf = NULL; - - Create(parent, id, pos, size, style, name, attribList, palette); -} - -wxGLCanvas::wxGLCanvas(wxWindow *parent, - const wxGLContext *shared, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name, - const int *attribList, - const wxPalette& palette) - : m_createImplicitContext(true) -{ - m_sharedContext = const_cast(shared); - - Create(parent, id, pos, size, style, name, attribList, palette); -} - -wxGLCanvas::wxGLCanvas(wxWindow *parent, - const wxGLCanvas *shared, - wxWindowID id, - const wxPoint& pos, const wxSize& size, - long style, const wxString& name, - const int *attribList, - const wxPalette& palette ) - : m_createImplicitContext(true) -{ - m_sharedContext = NULL; - m_sharedContextOf = const_cast(shared); - - Create(parent, id, pos, size, style, name, attribList, palette); -} - -#endif // WXWIN_COMPATIBILITY_2_8 - -bool wxGLCanvas::Create(wxWindow *parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name, - const int *attribList, - const wxPalette& palette) -{ - // Separate 'GLXFBConfig/XVisual' attributes. - // Also store context attributes for wxGLContext ctor - wxGLAttributes dispAttrs; - if ( ! ParseAttribList(attribList, dispAttrs, &m_GLCTXAttrs) ) - return false; - - return Create(parent, dispAttrs, id, pos, size, style, name, palette); -} - -bool wxGLCanvas::Create(wxWindow *parent, - const wxGLAttributes& dispAttrs, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name, - const wxPalette& palette) -{ -#if wxUSE_PALETTE - wxASSERT_MSG( !palette.IsOk(), wxT("palettes not supported") ); -#endif // wxUSE_PALETTE - wxUnusedVar(palette); // Unused when wxDEBUG_LEVEL==0 - - m_exposed = false; - m_noExpose = true; - m_nativeSizeEvent = true; -#ifdef __WXGTK3__ - m_cairoPaintContext = NULL; - m_backgroundStyle = wxBG_STYLE_PAINT; -#endif - - if ( !InitVisual(dispAttrs) ) - return false; - - // watch for the "parent-set" signal on m_wxwindow so we can set colormap - // before m_wxwindow is realized (which will occur before - // wxWindow::Create() returns if parent is already visible) - unsigned sig_id = g_signal_lookup("parent-set", GTK_TYPE_WIDGET); - g_signal_add_emission_hook(sig_id, 0, parent_set_hook, this, NULL); - - wxWindow::Create( parent, id, pos, size, style, name ); - - gtk_widget_set_double_buffered(m_wxwindow, false); - -#if WXWIN_COMPATIBILITY_2_8 - g_signal_connect(m_wxwindow, "realize", G_CALLBACK(gtk_glwindow_realized_callback), this); -#endif // WXWIN_COMPATIBILITY_2_8 -#ifdef __WXGTK3__ - g_signal_connect(m_wxwindow, "draw", G_CALLBACK(draw), this); -#else - g_signal_connect(m_wxwindow, "map", G_CALLBACK(gtk_glwindow_map_callback), this); - g_signal_connect(m_wxwindow, "expose_event", G_CALLBACK(gtk_glwindow_expose_callback), this); -#endif - g_signal_connect(m_widget, "size_allocate", G_CALLBACK(gtk_glcanvas_size_callback), this); - -#if WXWIN_COMPATIBILITY_2_8 - // if our parent window is already visible, we had been realized before we - // connected to the "realize" signal and hence our m_glContext hasn't been - // initialized yet and we have to do it now - if (gtk_widget_get_realized(m_wxwindow)) - gtk_glwindow_realized_callback( m_wxwindow, this ); -#endif // WXWIN_COMPATIBILITY_2_8 - -#ifndef __WXGTK3__ - if (gtk_widget_get_mapped(m_wxwindow)) - gtk_glwindow_map_callback( m_wxwindow, this ); -#endif - - return true; -} - -bool wxGLCanvas::SetBackgroundStyle(wxBackgroundStyle /* style */) -{ - return false; -} - -Window wxGLCanvas::GetXWindow() const -{ - GdkWindow* window = GTKGetDrawingWindow(); - return window ? GDK_WINDOW_XID(window) : 0; -} - -void wxGLCanvas::OnInternalIdle() -{ - if (m_exposed) - { -#ifdef __WXGTK3__ - GTKSendPaintEvents(m_cairoPaintContext); - cairo_destroy(m_cairoPaintContext); - m_cairoPaintContext = NULL; -#else - wxPaintEvent event( GetId() ); - event.SetEventObject( this ); - HandleWindowEvent( event ); -#endif - - m_exposed = false; - GetUpdateRegion().Clear(); - } - - wxWindow::OnInternalIdle(); -} - -#if WXWIN_COMPATIBILITY_2_8 - -void wxGLCanvas::GTKInitImplicitContext() -{ - if ( !m_glContext && m_createImplicitContext ) - { - wxGLContext *share = m_sharedContext; - if ( !share && m_sharedContextOf ) - share = m_sharedContextOf->m_glContext; - - m_glContext = new wxGLContext(this, share); - } -} - -#endif // WXWIN_COMPATIBILITY_2_8 - -#endif // wxUSE_GLCANVAS diff --git a/Externals/wxWidgets3/src/gtk/gnome/gvfs.cpp b/Externals/wxWidgets3/src/gtk/gnome/gvfs.cpp deleted file mode 100644 index 94986b7cc9..0000000000 --- a/Externals/wxWidgets3/src/gtk/gnome/gvfs.cpp +++ /dev/null @@ -1,165 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/gnome/gvfs.cpp -// Author: Robert Roebling -// Purpose: Implement GNOME VFS support -// Created: 03/17/06 -// Copyright: Robert Roebling -// Licence: wxWindows Licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx/wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_MIMETYPE && wxUSE_LIBGNOMEVFS - -#include "wx/gtk/gnome/gvfs.h" - -#ifndef WX_PRECOMP - #include "wx/log.h" - #include "wx/module.h" -#endif - -#include "wx/mimetype.h" -#include "wx/dynlib.h" - -#include - -#include "wx/link.h" -wxFORCE_LINK_THIS_MODULE(gnome_vfs) - -//---------------------------------------------------------------------------- -// wxGnomeVFSLibrary -//---------------------------------------------------------------------------- - -class wxGnomeVFSLibrary -{ -public: - wxGnomeVFSLibrary(); - ~wxGnomeVFSLibrary(); - bool IsOk(); - -private: - bool InitializeMethods(); - - wxDynamicLibrary m_libGnomeVFS; - - // only true if we successfully loaded the library above - // - // don't rename this field, it's used by wxDL_XXX macros internally - bool m_ok; - -public: - wxDL_METHOD_DEFINE( gboolean, gnome_vfs_init, - (), (), FALSE ) - wxDL_VOIDMETHOD_DEFINE( gnome_vfs_shutdown, - (), () ) - - wxDL_METHOD_DEFINE( GnomeVFSResult, gnome_vfs_mime_set_icon, - (const char *mime_type, const char *filename), (mime_type, filename), GNOME_VFS_OK ) -}; - -wxGnomeVFSLibrary::wxGnomeVFSLibrary() -{ - wxLogNull log; - - m_libGnomeVFS.Load("libgnomevfs-2.so.0"); - m_ok = m_libGnomeVFS.IsLoaded() && InitializeMethods(); -} - -wxGnomeVFSLibrary::~wxGnomeVFSLibrary() -{ - // we crash on exit later (i.e. after main() finishes) if we unload this - // library, apparently it inserts some hooks in other libraries to which we - // link implicitly (GTK+ itself?) which are not uninstalled when it's - // unloaded resulting in this crash, so just leave it in memory -- it's a - // lesser evil - m_libGnomeVFS.Detach(); -} - -bool wxGnomeVFSLibrary::IsOk() -{ - return m_ok; -} - -bool wxGnomeVFSLibrary::InitializeMethods() -{ - wxDL_METHOD_LOAD( m_libGnomeVFS, gnome_vfs_init ); - wxDL_METHOD_LOAD( m_libGnomeVFS, gnome_vfs_shutdown ); - - return true; -} - -static wxGnomeVFSLibrary* gs_lgvfs = NULL; - -//---------------------------------------------------------------------------- -// wxGnomeVFSMimeTypesManagerFactory -//---------------------------------------------------------------------------- - -wxMimeTypesManagerImpl *wxGnomeVFSMimeTypesManagerFactory::CreateMimeTypesManagerImpl() -{ - return new wxGnomeVFSMimeTypesManagerImpl; -} - - -//---------------------------------------------------------------------------- -// wxGnomeVFSMimeTypesManagerImpl -//---------------------------------------------------------------------------- - -bool wxGnomeVFSMimeTypesManagerImpl::DoAssociation(const wxString& strType, - const wxString& strIcon, - wxMimeTypeCommands *entry, - const wxArrayString& strExtensions, - const wxString& strDesc) -{ - return AddToMimeData - ( - strType, - strIcon, - entry, - strExtensions, - strDesc, - true - ) != wxNOT_FOUND; -} - -//---------------------------------------------------------------------------- -// wxGnomeVFSModule -//---------------------------------------------------------------------------- - -class wxGnomeVFSModule: public wxModule -{ -public: - wxGnomeVFSModule() {} - bool OnInit(); - void OnExit(); - -private: - wxDECLARE_DYNAMIC_CLASS(wxGnomeVFSModule); -}; - -bool wxGnomeVFSModule::OnInit() -{ - gs_lgvfs = new wxGnomeVFSLibrary; - if (gs_lgvfs->IsOk()) - { - if (gs_lgvfs->gnome_vfs_init()) - wxMimeTypesManagerFactory::Set( new wxGnomeVFSMimeTypesManagerFactory ); - } - return true; -} - -void wxGnomeVFSModule::OnExit() -{ - if (gs_lgvfs->IsOk()) - gs_lgvfs->gnome_vfs_shutdown(); - - delete gs_lgvfs; -} - -wxIMPLEMENT_DYNAMIC_CLASS(wxGnomeVFSModule, wxModule); - -#endif // wxUSE_LIBGNOMEVFS && wxUSE_MIMETYPE diff --git a/Externals/wxWidgets3/src/gtk/horiz.xbm b/Externals/wxWidgets3/src/gtk/horiz.xbm deleted file mode 100644 index 94de3f9dcf..0000000000 --- a/Externals/wxWidgets3/src/gtk/horiz.xbm +++ /dev/null @@ -1,6 +0,0 @@ -#define horiz_width 16 -#define horiz_height 16 -static unsigned char horiz_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; diff --git a/Externals/wxWidgets3/src/gtk/hyperlink.cpp b/Externals/wxWidgets3/src/gtk/hyperlink.cpp deleted file mode 100644 index aaead3dc88..0000000000 --- a/Externals/wxWidgets3/src/gtk/hyperlink.cpp +++ /dev/null @@ -1,417 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/hyperlink.cpp -// Purpose: Hyperlink control -// Author: Francesco Montorsi -// Created: 14/2/2007 -// Copyright: (c) 2007 Francesco Montorsi -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// -------------------------------------------------------------------------- -// headers -// -------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_HYPERLINKCTRL && defined(__WXGTK210__) && !defined(__WXUNIVERSAL__) - -#include "wx/hyperlink.h" - -#ifndef WX_PRECOMP -#endif - -#include -#include "wx/gtk/private.h" - -#ifdef __WXGTK3__ - #include "wx/gtk/private/object.h" -#endif - -// ---------------------------------------------------------------------------- -// local functions -// ---------------------------------------------------------------------------- - -static inline bool UseNative() -{ - // native gtk_link_button widget is only available in GTK+ 2.10 and later -#ifdef __WXGTK3__ - return true; -#else - return !gtk_check_version(2, 10, 0); -#endif -} - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// "clicked" -// ---------------------------------------------------------------------------- - -#ifdef __WXGTK3__ -extern "C" { -static gboolean activate_link(GtkWidget*, wxHyperlinkCtrl* win) -{ - win->SetVisited(true); - win->SendEvent(); - return true; -} -} -#else -static GSList* gs_hyperlinkctrl_list; -extern "C" { -static void clicked_hook(GtkLinkButton* button, const char*, void*) -{ - for (GSList* p = gs_hyperlinkctrl_list; p; p = p->next) - { - wxHyperlinkCtrl* win = static_cast(p->data); - if (win->m_widget == (GtkWidget*)button) - { - win->SetVisited(true); - win->SendEvent(); - return; - } - } - gtk_link_button_set_uri_hook(NULL, NULL, NULL); - GTK_BUTTON_GET_CLASS(button)->clicked(GTK_BUTTON(button)); - gtk_link_button_set_uri_hook(clicked_hook, NULL, NULL); -} -} -#endif - -#ifdef __WXGTK3__ - -// Used to store GtkCssProviders we need to change the link colours with GTK+3. -class wxHyperlinkCtrlColData -{ -public: - wxHyperlinkCtrlColData() : - m_normalLinkCssProvider(gtk_css_provider_new()), - m_visitedLinkCssProvider(gtk_css_provider_new()) - {} - - wxGtkObject m_normalLinkCssProvider; - wxGtkObject m_visitedLinkCssProvider; -}; - -#endif // __WXGTK3__ - -// ---------------------------------------------------------------------------- -// wxHyperlinkCtrl -// ---------------------------------------------------------------------------- - -wxHyperlinkCtrl::wxHyperlinkCtrl() -{ -} - -wxHyperlinkCtrl::wxHyperlinkCtrl(wxWindow *parent, - wxWindowID id, - const wxString& label, - const wxString& url, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) -{ - (void)Create(parent, id, label, url, pos, size, style, name); -} - -wxHyperlinkCtrl::~wxHyperlinkCtrl() -{ -#ifndef __WXGTK3__ - gs_hyperlinkctrl_list = g_slist_remove(gs_hyperlinkctrl_list, this); -#endif -} - -bool wxHyperlinkCtrl::Create(wxWindow *parent, wxWindowID id, - const wxString& label, const wxString& url, const wxPoint& pos, - const wxSize& size, long style, const wxString& name) -{ - if ( UseNative() ) - { - // do validation checks: - CheckParams(label, url, style); - - if (!PreCreation( parent, pos, size ) || - !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name )) - { - wxFAIL_MSG( wxT("wxHyperlinkCtrl creation failed") ); - return false; - } - - m_widget = gtk_link_button_new("asdfsaf asdfdsaf asdfdsa"); - g_object_ref(m_widget); - - // alignment - float x_alignment = 0.5; - if (HasFlag(wxHL_ALIGN_LEFT)) - x_alignment = 0.0; - else if (HasFlag(wxHL_ALIGN_RIGHT)) - x_alignment = 1.0; - - wxGCC_WARNING_SUPPRESS(deprecated-declarations) - gtk_button_set_alignment(GTK_BUTTON(m_widget), x_alignment, 0.5); - wxGCC_WARNING_RESTORE() - - // set to non empty strings both the url and the label - SetURL(url.empty() ? label : url); - SetLabel(label.empty() ? url : label); - -#ifdef __WXGTK3__ - g_signal_connect(m_widget, "activate_link", G_CALLBACK(activate_link), this); -#else - gs_hyperlinkctrl_list = g_slist_prepend(gs_hyperlinkctrl_list, this); - gtk_link_button_set_uri_hook(clicked_hook, NULL, NULL); -#endif - - m_parent->DoAddChild( this ); - - PostCreation(size); - - // wxWindowGTK will connect to the enter_notify and leave_notify GTK+ signals - // thus overriding GTK+'s internal signal handlers which set the cursor of - // the widget - thus we need to manually set it here: - SetCursor(wxCursor(wxCURSOR_HAND)); - } - else - return wxGenericHyperlinkCtrl::Create(parent, id, label, url, pos, size, style, name); - - return true; -} - -wxSize wxHyperlinkCtrl::DoGetBestSize() const -{ - if ( UseNative() ) - return wxControl::DoGetBestSize(); - return wxGenericHyperlinkCtrl::DoGetBestSize(); -} - -wxSize wxHyperlinkCtrl::DoGetBestClientSize() const -{ - if ( UseNative() ) - return wxControl::DoGetBestClientSize(); - return wxGenericHyperlinkCtrl::DoGetBestClientSize(); -} - -void wxHyperlinkCtrl::SetLabel(const wxString &label) -{ - if ( UseNative() ) - { - wxControl::SetLabel(label); - const wxString labelGTK = GTKConvertMnemonics(label); - gtk_button_set_label(GTK_BUTTON(m_widget), wxGTK_CONV(labelGTK)); - } - else - wxGenericHyperlinkCtrl::SetLabel(label); -} - -void wxHyperlinkCtrl::SetURL(const wxString &uri) -{ - if ( UseNative() ) - gtk_link_button_set_uri(GTK_LINK_BUTTON(m_widget), wxGTK_CONV(uri)); - else - wxGenericHyperlinkCtrl::SetURL(uri); -} - -wxString wxHyperlinkCtrl::GetURL() const -{ - if ( UseNative() ) - { - const gchar *str = gtk_link_button_get_uri(GTK_LINK_BUTTON(m_widget)); - return wxString::FromUTF8(str); - } - - return wxGenericHyperlinkCtrl::GetURL(); -} - -void wxHyperlinkCtrl::DoSetLinkColour(LinkKind linkKind, const wxColour& colour) -{ -#ifdef __WXGTK3__ - if ( !m_colData ) - m_colData.reset(new wxHyperlinkCtrlColData()); - - const char* cssProp = NULL; - GtkCssProvider* cssProvider = NULL; - switch ( linkKind ) - { - case Link_Normal: - cssProp = "link-color"; - cssProvider = m_colData->m_normalLinkCssProvider; - break; - - case Link_Visited: - cssProp = "visited-link-color"; - cssProvider = m_colData->m_visitedLinkCssProvider; - break; - } - - wxCHECK_RET( cssProvider, wxS("unknown link kind") ); - - const GdkRGBA *col = colour; - - wxGtkString - css(g_strdup_printf("* { %s: %s; }", cssProp, gdk_rgba_to_string(col))); - ApplyCssStyle(cssProvider, css); -#else // !__WXGTK3__ - // simply do nothing: GTK+ does not allow us to change it :( - wxUnusedVar(linkKind); - wxUnusedVar(colour); -#endif -} - -void wxHyperlinkCtrl::SetNormalColour(const wxColour &colour) -{ - if ( UseNative() ) - DoSetLinkColour(Link_Normal, colour); - else - wxGenericHyperlinkCtrl::SetNormalColour(colour); -} - -wxColour wxHyperlinkCtrl::GetNormalColour() const -{ - wxColour ret; - if ( UseNative() ) - { -#ifdef __WXGTK3__ - GdkRGBA *link_color = NULL; - gtk_widget_style_get(m_widget, "link-color", &link_color, NULL); - - if ( link_color ) - { - ret = wxColour(*link_color); - gdk_rgba_free (link_color); - } -#else // !__WXGTK3__ - GdkColor* link_color; - GdkColor color = { 0, 0, 0, 0xeeee }; - - GtkWidget* widget = gtk_bin_get_child(GTK_BIN(m_widget)); - wxGCC_WARNING_SUPPRESS(deprecated-declarations) - gtk_widget_ensure_style(widget); - gtk_widget_style_get(widget, "link-color", &link_color, NULL); - if (link_color) - { - color = *link_color; - gdk_color_free(link_color); - } - wxGCC_WARNING_RESTORE() - ret = wxColour(color); -#endif // __WXGTK3__/!__WXGTK3__ - } - else - ret = wxGenericHyperlinkCtrl::GetNormalColour(); - - return ret; -} - -void wxHyperlinkCtrl::SetVisitedColour(const wxColour &colour) -{ - if ( UseNative() ) - { - DoSetLinkColour(Link_Visited, colour); - } - else - wxGenericHyperlinkCtrl::SetVisitedColour(colour); -} - -wxColour wxHyperlinkCtrl::GetVisitedColour() const -{ - wxColour ret; - if ( UseNative() ) - { -#ifdef __WXGTK3__ - GdkRGBA *link_color = NULL; - gtk_widget_style_get(m_widget, "visited-link-color", &link_color, NULL); - - if ( link_color ) - { - ret = wxColour(*link_color); - gdk_rgba_free (link_color); - } -#else // !__WXGTK3__ - GdkColor* link_color; - GdkColor color = { 0, 0x5555, 0x1a1a, 0x8b8b }; - - GtkWidget* widget = gtk_bin_get_child(GTK_BIN(m_widget)); - wxGCC_WARNING_SUPPRESS(deprecated-declarations) - gtk_widget_ensure_style(widget); - gtk_widget_style_get(widget, "visited-link-color", &link_color, NULL); - if (link_color) - { - color = *link_color; - gdk_color_free(link_color); - } - wxGCC_WARNING_RESTORE() - ret = wxColour(color); -#endif // __WXGTK3__/!__WXGTK3__ - } - else - ret = base_type::GetVisitedColour(); - - return ret; -} - -void wxHyperlinkCtrl::SetVisited(bool visited) -{ - base_type::SetVisited(visited); -#if GTK_CHECK_VERSION(2,14,0) -#ifndef __WXGTK3__ - if (gtk_check_version(2,14,0) == NULL) -#endif - { - gtk_link_button_set_visited(GTK_LINK_BUTTON(m_widget), visited); - } -#endif -} - -bool wxHyperlinkCtrl::GetVisited() const -{ -#if GTK_CHECK_VERSION(2,14,0) -#ifndef __WXGTK3__ - if (gtk_check_version(2,14,0) == NULL) -#endif - { - return gtk_link_button_get_visited(GTK_LINK_BUTTON(m_widget)) != 0; - } -#endif - return base_type::GetVisited(); -} - -void wxHyperlinkCtrl::SetHoverColour(const wxColour &colour) -{ - if ( UseNative() ) - { - // simply do nothing: GTK+ does not allow us to change it :( - } - else - wxGenericHyperlinkCtrl::SetHoverColour(colour); -} - -wxColour wxHyperlinkCtrl::GetHoverColour() const -{ - if ( UseNative() ) - { - // hover colour == normal colour for native GTK+ widget - return GetNormalColour(); - } - - return wxGenericHyperlinkCtrl::GetHoverColour(); -} - -GdkWindow *wxHyperlinkCtrl::GTKGetWindow(wxArrayGdkWindows& windows) const -{ - return UseNative() ? gtk_button_get_event_window(GTK_BUTTON(m_widget)) - : wxGenericHyperlinkCtrl::GTKGetWindow(windows); -} - -#endif // wxUSE_HYPERLINKCTRL && GTK+ 2.10+ diff --git a/Externals/wxWidgets3/src/gtk/infobar.cpp b/Externals/wxWidgets3/src/gtk/infobar.cpp deleted file mode 100644 index 2f7ea108b2..0000000000 --- a/Externals/wxWidgets3/src/gtk/infobar.cpp +++ /dev/null @@ -1,321 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/infobar.cpp -// Purpose: wxInfoBar implementation for GTK -// Author: Vadim Zeitlin -// Created: 2009-09-27 -// Copyright: (c) 2009 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// for compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include "wx/infobar.h" - -#if wxUSE_INFOBAR && defined(wxHAS_NATIVE_INFOBAR) - -#ifndef WX_PRECOMP -#endif // WX_PRECOMP - -#include "wx/vector.h" -#include "wx/stockitem.h" - -#include "wx/gtk/private.h" -#include "wx/gtk/private/messagetype.h" - -// ---------------------------------------------------------------------------- -// local classes -// ---------------------------------------------------------------------------- - -class wxInfoBarGTKImpl -{ -public: - wxInfoBarGTKImpl() - { - m_label = NULL; - m_close = NULL; - } - - // label for the text shown in the bar - GtkWidget *m_label; - - // the default close button, NULL if not needed (m_buttons is not empty) or - // not created yet - GtkWidget *m_close; - - // information about the buttons added using AddButton() - struct Button - { - Button(GtkWidget *button_, int id_) - : button(button_), - id(id_) - { - } - - GtkWidget *button; - int id; - }; - typedef wxVector